This commit was manufactured by cvs2svn to create tag 'rtems-4-0-0'.4.0.0

Sprout from master 1998-10-28 17:38:22 UTC Joel Sherrill <joel.sherrill@OARcorp.com> 'changed version to 4.0.0'
Delete:
    c/build-tools/README
    c/build-tools/cklength.c
    c/build-tools/eolstrip.c
    c/build-tools/install-if-change.in
    c/build-tools/lock-directory.in
    c/build-tools/packhex.c
    c/build-tools/rcs-clean.in
    c/build-tools/search-id.sh
    c/build-tools/unhex.c
    c/build-tools/unlock-directory.in
    c/src/ada-tests/mptests/mp01/config.h
    c/src/ada-tests/mptests/mp01/mp01.adb
    c/src/ada-tests/mptests/mp01/mptest.adb
    c/src/ada-tests/mptests/mp01/mptest.ads
    c/src/ada-tests/mptests/mp01/node1/mp01.scn
    c/src/ada-tests/mptests/mp01/node1/mptest-per_node_configuration.adb
    c/src/ada-tests/mptests/mp01/node2/mp01.scn
    c/src/ada-tests/mptests/mp01/node2/mptest-per_node_configuration.adb
    c/src/ada-tests/mptests/mp02/mptest.adb
    c/src/ada-tests/mptests/mp02/mptest.ads
    c/src/ada-tests/mptests/mp02/node1/mp02.scn
    c/src/ada-tests/mptests/mp02/node1/mptest-per_node_configuration.adb
    c/src/ada-tests/mptests/mp02/node2/mp02.scn
    c/src/ada-tests/mptests/mp02/node2/mptest-per_node_configuration.adb
    c/src/ada-tests/mptests/mp03/mptest.adb
    c/src/ada-tests/mptests/mp03/mptest.ads
    c/src/ada-tests/mptests/mp03/node1/mp03.scn
    c/src/ada-tests/mptests/mp03/node1/mptest-per_node_configuration.adb
    c/src/ada-tests/mptests/mp03/node2/mp03.scn
    c/src/ada-tests/mptests/mp03/node2/mptest-per_node_configuration.adb
    c/src/ada-tests/mptests/mp04/mptest.adb
    c/src/ada-tests/mptests/mp04/mptest.ads
    c/src/ada-tests/mptests/mp04/node1/mp04.scn
    c/src/ada-tests/mptests/mp04/node1/mptest-per_node_configuration.adb
    c/src/ada-tests/mptests/mp04/node2/mp04.scn
    c/src/ada-tests/mptests/mp04/node2/mptest-per_node_configuration.adb
    c/src/ada-tests/mptests/mp05/mptest.adb
    c/src/ada-tests/mptests/mp05/mptest.ads
    c/src/ada-tests/mptests/mp05/node1/mp05.scn
    c/src/ada-tests/mptests/mp05/node1/mptest-per_node_configuration.adb
    c/src/ada-tests/mptests/mp05/node2/mp05.scn
    c/src/ada-tests/mptests/mp05/node2/mptest-per_node_configuration.adb
    c/src/ada-tests/mptests/mp06/mptest.adb
    c/src/ada-tests/mptests/mp06/mptest.ads
    c/src/ada-tests/mptests/mp06/node1/mp06.scn
    c/src/ada-tests/mptests/mp06/node1/mptest-per_node_configuration.adb
    c/src/ada-tests/mptests/mp06/node2/mp06.scn
    c/src/ada-tests/mptests/mp06/node2/mptest-per_node_configuration.adb
    c/src/ada-tests/mptests/mp07/mptest.adb
    c/src/ada-tests/mptests/mp07/mptest.ads
    c/src/ada-tests/mptests/mp07/node1/mp07.scn
    c/src/ada-tests/mptests/mp07/node1/mptest-per_node_configuration.adb
    c/src/ada-tests/mptests/mp07/node2/mp07.scn
    c/src/ada-tests/mptests/mp07/node2/mptest-per_node_configuration.adb
    c/src/ada-tests/mptests/mp08/mptest.adb
    c/src/ada-tests/mptests/mp08/mptest.ads
    c/src/ada-tests/mptests/mp08/node1/mp08.scn
    c/src/ada-tests/mptests/mp08/node1/mptest-per_node_configuration.adb
    c/src/ada-tests/mptests/mp08/node2/mp08.scn
    c/src/ada-tests/mptests/mp08/node2/mptest-per_node_configuration.adb
    c/src/ada-tests/mptests/mp09/mptest.adb
    c/src/ada-tests/mptests/mp09/mptest.ads
    c/src/ada-tests/mptests/mp09/node1/mp09.scn
    c/src/ada-tests/mptests/mp09/node1/mptest-per_node_configuration.adb
    c/src/ada-tests/mptests/mp09/node2/mp09.scn
    c/src/ada-tests/mptests/mp09/node2/mptest-per_node_configuration.adb
    c/src/ada-tests/mptests/mp10/mptest.adb
    c/src/ada-tests/mptests/mp10/mptest.ads
    c/src/ada-tests/mptests/mp10/node1/mp10.scn
    c/src/ada-tests/mptests/mp10/node1/mptest-per_node_configuration.adb
    c/src/ada-tests/mptests/mp10/node2/mp10.scn
    c/src/ada-tests/mptests/mp10/node2/mptest-per_node_configuration.adb
    c/src/ada-tests/mptests/mp11/mptest.adb
    c/src/ada-tests/mptests/mp11/mptest.ads
    c/src/ada-tests/mptests/mp11/node1/mp11.scn
    c/src/ada-tests/mptests/mp11/node1/mptest-per_node_configuration.adb
    c/src/ada-tests/mptests/mp11/node2/mp11.scn
    c/src/ada-tests/mptests/mp11/node2/mptest-per_node_configuration.adb
    c/src/ada-tests/mptests/mp12/mptest.adb
    c/src/ada-tests/mptests/mp12/mptest.ads
    c/src/ada-tests/mptests/mp12/node1/mp12.scn
    c/src/ada-tests/mptests/mp12/node1/mptest-per_node_configuration.adb
    c/src/ada-tests/mptests/mp12/node2/mp12.scn
    c/src/ada-tests/mptests/mp12/node2/mptest-per_node_configuration.adb
    c/src/ada-tests/mptests/mp13/mptest.adb
    c/src/ada-tests/mptests/mp13/mptest.ads
    c/src/ada-tests/mptests/mp13/node1/mp13.scn
    c/src/ada-tests/mptests/mp13/node1/mptest-per_node_configuration.adb
    c/src/ada-tests/mptests/mp13/node2/mp13.scn
    c/src/ada-tests/mptests/mp13/node2/mptest-per_node_configuration.adb
    c/src/ada-tests/mptests/mp14/mptest.adb
    c/src/ada-tests/mptests/mp14/mptest.ads
    c/src/ada-tests/mptests/mp14/node1/mp14.scn
    c/src/ada-tests/mptests/mp14/node1/mptest-per_node_configuration.adb
    c/src/ada-tests/mptests/mp14/node2/mp14.scn
    c/src/ada-tests/mptests/mp14/node2/mptest-per_node_configuration.adb
    c/src/ada-tests/samples/base_mp/mptest.adb
    c/src/ada-tests/samples/base_mp/mptest.ads
    c/src/ada-tests/samples/base_mp/node1/base_mp.scn
    c/src/ada-tests/samples/base_mp/node1/mptest-per_node_configuration.adb
    c/src/ada-tests/samples/base_mp/node2/base_mp.scn
    c/src/ada-tests/samples/base_mp/node2/mptest-per_node_configuration.adb
    c/src/ada-tests/samples/base_sp/base_sp.adb
    c/src/ada-tests/samples/base_sp/base_sp.scn
    c/src/ada-tests/samples/base_sp/config.h
    c/src/ada-tests/samples/base_sp/sptest.adb
    c/src/ada-tests/samples/base_sp/sptest.ads
    c/src/ada-tests/samples/hello/config.h
    c/src/ada-tests/samples/hello/hello.adb
    c/src/ada-tests/samples/hello/hello.scn
    c/src/ada-tests/samples/hello/sptest.adb
    c/src/ada-tests/samples/hello/sptest.ads
    c/src/ada-tests/samples/ticker/config.h
    c/src/ada-tests/samples/ticker/sptest.adb
    c/src/ada-tests/samples/ticker/sptest.ads
    c/src/ada-tests/samples/ticker/ticker.adb
    c/src/ada-tests/samples/ticker/ticker.scn
    c/src/ada-tests/sptests/sp01/config.h
    c/src/ada-tests/sptests/sp01/sp01.adb
    c/src/ada-tests/sptests/sp01/sp01.scn
    c/src/ada-tests/sptests/sp01/sptest.adb
    c/src/ada-tests/sptests/sp01/sptest.ads
    c/src/ada-tests/sptests/sp02/config.h
    c/src/ada-tests/sptests/sp02/sp02.adb
    c/src/ada-tests/sptests/sp02/sp02.scn
    c/src/ada-tests/sptests/sp02/sptest.adb
    c/src/ada-tests/sptests/sp02/sptest.ads
    c/src/ada-tests/sptests/sp03/config.h
    c/src/ada-tests/sptests/sp03/sp03.adb
    c/src/ada-tests/sptests/sp03/sp03.scn
    c/src/ada-tests/sptests/sp03/sptest.adb
    c/src/ada-tests/sptests/sp03/sptest.ads
    c/src/ada-tests/sptests/sp04/README
    c/src/ada-tests/sptests/sp04/config.h
    c/src/ada-tests/sptests/sp04/sp04.adb
    c/src/ada-tests/sptests/sp04/sp04.scn
    c/src/ada-tests/sptests/sp04/sptest.adb
    c/src/ada-tests/sptests/sp04/sptest.ads
    c/src/ada-tests/sptests/sp05/config.h
    c/src/ada-tests/sptests/sp05/sp05.adb
    c/src/ada-tests/sptests/sp05/sp05.scn
    c/src/ada-tests/sptests/sp05/sptest.adb
    c/src/ada-tests/sptests/sp05/sptest.ads
    c/src/ada-tests/sptests/sp06/config.h
    c/src/ada-tests/sptests/sp06/sp06.adb
    c/src/ada-tests/sptests/sp06/sp06.scn
    c/src/ada-tests/sptests/sp06/sptest.adb
    c/src/ada-tests/sptests/sp06/sptest.ads
    c/src/ada-tests/sptests/sp07/config.h
    c/src/ada-tests/sptests/sp07/sp07.adb
    c/src/ada-tests/sptests/sp07/sp07.scn
    c/src/ada-tests/sptests/sp07/sptest.adb
    c/src/ada-tests/sptests/sp07/sptest.ads
    c/src/ada-tests/sptests/sp08/config.h
    c/src/ada-tests/sptests/sp08/sp08.adb
    c/src/ada-tests/sptests/sp08/sp08.scn
    c/src/ada-tests/sptests/sp08/sptest.adb
    c/src/ada-tests/sptests/sp08/sptest.ads
    c/src/ada-tests/sptests/sp09/config.h
    c/src/ada-tests/sptests/sp09/sp09.adb
    c/src/ada-tests/sptests/sp09/sp09.scn
    c/src/ada-tests/sptests/sp09/sptest.adb
    c/src/ada-tests/sptests/sp09/sptest.ads
    c/src/ada-tests/sptests/sp11/config.h
    c/src/ada-tests/sptests/sp11/sp11.adb
    c/src/ada-tests/sptests/sp11/sp11.scn
    c/src/ada-tests/sptests/sp11/sptest.adb
    c/src/ada-tests/sptests/sp11/sptest.ads
    c/src/ada-tests/sptests/sp12/config.h
    c/src/ada-tests/sptests/sp12/sp12.adb
    c/src/ada-tests/sptests/sp12/sp12.scn
    c/src/ada-tests/sptests/sp12/sptest.adb
    c/src/ada-tests/sptests/sp12/sptest.ads
    c/src/ada-tests/sptests/sp13/config.h
    c/src/ada-tests/sptests/sp13/sp13.adb
    c/src/ada-tests/sptests/sp13/sp13.scn
    c/src/ada-tests/sptests/sp13/sptest.adb
    c/src/ada-tests/sptests/sp13/sptest.ads
    c/src/ada-tests/sptests/sp14/config.h
    c/src/ada-tests/sptests/sp14/sp14.adb
    c/src/ada-tests/sptests/sp14/sp14.scn
    c/src/ada-tests/sptests/sp14/sptest.adb
    c/src/ada-tests/sptests/sp14/sptest.ads
    c/src/ada-tests/sptests/sp15/config.h
    c/src/ada-tests/sptests/sp15/sp15.adb
    c/src/ada-tests/sptests/sp15/sp15.scn
    c/src/ada-tests/sptests/sp15/sptest.adb
    c/src/ada-tests/sptests/sp15/sptest.ads
    c/src/ada-tests/sptests/sp16/config.h
    c/src/ada-tests/sptests/sp16/sp16.adb
    c/src/ada-tests/sptests/sp16/sp16.scn
    c/src/ada-tests/sptests/sp16/sptest.adb
    c/src/ada-tests/sptests/sp16/sptest.ads
    c/src/ada-tests/sptests/sp17/config.h
    c/src/ada-tests/sptests/sp17/sp17.adb
    c/src/ada-tests/sptests/sp17/sp17.scn
    c/src/ada-tests/sptests/sp17/sptest.adb
    c/src/ada-tests/sptests/sp17/sptest.ads
    c/src/ada-tests/sptests/sp19/README
    c/src/ada-tests/sptests/sp19/config.h
    c/src/ada-tests/sptests/sp19/sp19.adb
    c/src/ada-tests/sptests/sp19/sp19.scn
    c/src/ada-tests/sptests/sp19/sptest.ads
    c/src/ada-tests/sptests/sp20/config.h
    c/src/ada-tests/sptests/sp20/sp20.adb
    c/src/ada-tests/sptests/sp20/sp20.scn
    c/src/ada-tests/sptests/sp20/sptest.adb
    c/src/ada-tests/sptests/sp20/sptest.ads
    c/src/ada-tests/sptests/sp21/config.h
    c/src/ada-tests/sptests/sp21/sp21.adb
    c/src/ada-tests/sptests/sp21/sp21.scn
    c/src/ada-tests/sptests/sp21/sptest.adb
    c/src/ada-tests/sptests/sp21/sptest.ads
    c/src/ada-tests/sptests/sp22/config.h
    c/src/ada-tests/sptests/sp22/sp22.adb
    c/src/ada-tests/sptests/sp22/sp22.scn
    c/src/ada-tests/sptests/sp22/sptest.adb
    c/src/ada-tests/sptests/sp22/sptest.ads
    c/src/ada-tests/sptests/sp23/config.h
    c/src/ada-tests/sptests/sp23/sp23.adb
    c/src/ada-tests/sptests/sp23/sp23.scn
    c/src/ada-tests/sptests/sp23/sptest.adb
    c/src/ada-tests/sptests/sp23/sptest.ads
    c/src/ada-tests/sptests/sp24/config.h
    c/src/ada-tests/sptests/sp24/sp24.adb
    c/src/ada-tests/sptests/sp24/sp24.scn
    c/src/ada-tests/sptests/sp24/sptest.adb
    c/src/ada-tests/sptests/sp24/sptest.ads
    c/src/ada-tests/sptests/sp25/config.h
    c/src/ada-tests/sptests/sp25/sp25.adb
    c/src/ada-tests/sptests/sp25/sp25.scn
    c/src/ada-tests/sptests/sp25/sptest.adb
    c/src/ada-tests/sptests/sp25/sptest.ads
    c/src/ada-tests/sptests/spsize/spsize.adb
    c/src/ada-tests/sptests/spsize/sptest.adb
    c/src/ada-tests/sptests/spsize/sptest.ads
    c/src/ada-tests/support/address_io.adb
    c/src/ada-tests/support/address_io.ads
    c/src/ada-tests/support/float_io.ads
    c/src/ada-tests/support/fp.inc
    c/src/ada-tests/support/init.c
    c/src/ada-tests/support/integer.inc
    c/src/ada-tests/support/rtems_calling_overhead.ads
    c/src/ada-tests/support/status_io.ads
    c/src/ada-tests/support/test_support.adb
    c/src/ada-tests/support/test_support.ads
    c/src/ada-tests/support/time_test_support.adb
    c/src/ada-tests/support/time_test_support.ads
    c/src/ada-tests/support/timer_driver.adb
    c/src/ada-tests/support/timer_driver.ads
    c/src/ada-tests/support/unsigned32_io.ads
    c/src/ada-tests/tmtests/tm01/config.h
    c/src/ada-tests/tmtests/tm01/tm01.adb
    c/src/ada-tests/tmtests/tm01/tmtest.adb
    c/src/ada-tests/tmtests/tm01/tmtest.ads
    c/src/ada-tests/tmtests/tm02/config.h
    c/src/ada-tests/tmtests/tm02/tm02.adb
    c/src/ada-tests/tmtests/tm02/tmtest.adb
    c/src/ada-tests/tmtests/tm02/tmtest.ads
    c/src/ada-tests/tmtests/tm03/config.h
    c/src/ada-tests/tmtests/tm03/tm03.adb
    c/src/ada-tests/tmtests/tm03/tmtest.adb
    c/src/ada-tests/tmtests/tm03/tmtest.ads
    c/src/ada-tests/tmtests/tm04/config.h
    c/src/ada-tests/tmtests/tm04/tm04.adb
    c/src/ada-tests/tmtests/tm04/tmtest.adb
    c/src/ada-tests/tmtests/tm04/tmtest.ads
    c/src/ada-tests/tmtests/tm05/config.h
    c/src/ada-tests/tmtests/tm05/tm05.adb
    c/src/ada-tests/tmtests/tm05/tmtest.adb
    c/src/ada-tests/tmtests/tm05/tmtest.ads
    c/src/ada-tests/tmtests/tm06/config.h
    c/src/ada-tests/tmtests/tm06/tm06.adb
    c/src/ada-tests/tmtests/tm06/tmtest.adb
    c/src/ada-tests/tmtests/tm06/tmtest.ads
    c/src/ada-tests/tmtests/tm07/config.h
    c/src/ada-tests/tmtests/tm07/tm07.adb
    c/src/ada-tests/tmtests/tm07/tmtest.adb
    c/src/ada-tests/tmtests/tm07/tmtest.ads
    c/src/ada-tests/tmtests/tm08/config.h
    c/src/ada-tests/tmtests/tm08/tm08.adb
    c/src/ada-tests/tmtests/tm08/tmtest.adb
    c/src/ada-tests/tmtests/tm08/tmtest.ads
    c/src/ada-tests/tmtests/tm09/config.h
    c/src/ada-tests/tmtests/tm09/tm09.adb
    c/src/ada-tests/tmtests/tm09/tmtest.adb
    c/src/ada-tests/tmtests/tm09/tmtest.ads
    c/src/ada-tests/tmtests/tm10/config.h
    c/src/ada-tests/tmtests/tm10/tm10.adb
    c/src/ada-tests/tmtests/tm10/tmtest.adb
    c/src/ada-tests/tmtests/tm10/tmtest.ads
    c/src/ada-tests/tmtests/tm11/config.h
    c/src/ada-tests/tmtests/tm11/tm11.adb
    c/src/ada-tests/tmtests/tm11/tmtest.adb
    c/src/ada-tests/tmtests/tm11/tmtest.ads
    c/src/ada-tests/tmtests/tm12/config.h
    c/src/ada-tests/tmtests/tm12/tm12.adb
    c/src/ada-tests/tmtests/tm12/tmtest.adb
    c/src/ada-tests/tmtests/tm12/tmtest.ads
    c/src/ada-tests/tmtests/tm13/config.h
    c/src/ada-tests/tmtests/tm13/tm13.adb
    c/src/ada-tests/tmtests/tm13/tmtest.adb
    c/src/ada-tests/tmtests/tm13/tmtest.ads
    c/src/ada-tests/tmtests/tm14/config.h
    c/src/ada-tests/tmtests/tm14/tm14.adb
    c/src/ada-tests/tmtests/tm14/tmtest.adb
    c/src/ada-tests/tmtests/tm14/tmtest.ads
    c/src/ada-tests/tmtests/tm15/config.h
    c/src/ada-tests/tmtests/tm15/tm15.adb
    c/src/ada-tests/tmtests/tm15/tmtest.adb
    c/src/ada-tests/tmtests/tm15/tmtest.ads
    c/src/ada-tests/tmtests/tm16/config.h
    c/src/ada-tests/tmtests/tm16/tm16.adb
    c/src/ada-tests/tmtests/tm16/tmtest.adb
    c/src/ada-tests/tmtests/tm16/tmtest.ads
    c/src/ada-tests/tmtests/tm17/config.h
    c/src/ada-tests/tmtests/tm17/tm17.adb
    c/src/ada-tests/tmtests/tm17/tmtest.adb
    c/src/ada-tests/tmtests/tm17/tmtest.ads
    c/src/ada-tests/tmtests/tm18/config.h
    c/src/ada-tests/tmtests/tm18/tm18.adb
    c/src/ada-tests/tmtests/tm18/tmtest.adb
    c/src/ada-tests/tmtests/tm18/tmtest.ads
    c/src/ada-tests/tmtests/tm19/config.h
    c/src/ada-tests/tmtests/tm19/tm19.adb
    c/src/ada-tests/tmtests/tm19/tmtest.adb
    c/src/ada-tests/tmtests/tm19/tmtest.ads
    c/src/ada-tests/tmtests/tm20/config.h
    c/src/ada-tests/tmtests/tm20/tm20.adb
    c/src/ada-tests/tmtests/tm20/tmtest.adb
    c/src/ada-tests/tmtests/tm20/tmtest.ads
    c/src/ada-tests/tmtests/tm21/config.h
    c/src/ada-tests/tmtests/tm21/tm21.adb
    c/src/ada-tests/tmtests/tm21/tmtest.adb
    c/src/ada-tests/tmtests/tm21/tmtest.ads
    c/src/ada-tests/tmtests/tm22/config.h
    c/src/ada-tests/tmtests/tm22/tm22.adb
    c/src/ada-tests/tmtests/tm22/tmtest.adb
    c/src/ada-tests/tmtests/tm22/tmtest.ads
    c/src/ada-tests/tmtests/tm23/config.h
    c/src/ada-tests/tmtests/tm23/tm23.adb
    c/src/ada-tests/tmtests/tm23/tmtest.adb
    c/src/ada-tests/tmtests/tm23/tmtest.ads
    c/src/ada-tests/tmtests/tm24/config.h
    c/src/ada-tests/tmtests/tm24/tm24.adb
    c/src/ada-tests/tmtests/tm24/tmtest.adb
    c/src/ada-tests/tmtests/tm24/tmtest.ads
    c/src/ada-tests/tmtests/tm25/config.h
    c/src/ada-tests/tmtests/tm25/tm25.adb
    c/src/ada-tests/tmtests/tm25/tmtest.adb
    c/src/ada-tests/tmtests/tm25/tmtest.ads
    c/src/ada-tests/tmtests/tm26/README
    c/src/ada-tests/tmtests/tm26/config.h
    c/src/ada-tests/tmtests/tm26/tm26.adb
    c/src/ada-tests/tmtests/tm26/tmtest.adp
    c/src/ada-tests/tmtests/tm26/tmtest.ads
    c/src/ada-tests/tmtests/tm27/README
    c/src/ada-tests/tmtests/tm27/config.h
    c/src/ada-tests/tmtests/tm27/tm27.adb
    c/src/ada-tests/tmtests/tm27/tmtest.adb
    c/src/ada-tests/tmtests/tm27/tmtest.ads
    c/src/ada-tests/tmtests/tm28/config.h
    c/src/ada-tests/tmtests/tm28/tm28.adb
    c/src/ada-tests/tmtests/tm28/tmtest.adb
    c/src/ada-tests/tmtests/tm28/tmtest.ads
    c/src/ada-tests/tmtests/tm29/config.h
    c/src/ada-tests/tmtests/tm29/tm29.adb
    c/src/ada-tests/tmtests/tm29/tmtest.adb
    c/src/ada-tests/tmtests/tm29/tmtest.ads
    c/src/ada-tests/tmtests/tmck/config.h
    c/src/ada-tests/tmtests/tmck/tmck.adb
    c/src/ada-tests/tmtests/tmck/tmtest.adb
    c/src/ada-tests/tmtests/tmck/tmtest.ads
    c/src/ada-tests/tmtests/tmoverhd/README
    c/src/ada-tests/tmtests/tmoverhd/config.h
    c/src/ada-tests/tmtests/tmoverhd/dummy_rtems.adb
    c/src/ada-tests/tmtests/tmoverhd/dummy_rtems.ads
    c/src/ada-tests/tmtests/tmoverhd/tmoverhd.adb
    c/src/ada-tests/tmtests/tmoverhd/tmtest.adb
    c/src/ada-tests/tmtests/tmoverhd/tmtest.ads
    c/src/ada/rtems.adb
    c/src/ada/rtems.ads
    c/src/exec/libcsupport/include/chain.h
    c/src/exec/libcsupport/include/clockdrv.h
    c/src/exec/libcsupport/include/console.h
    c/src/exec/libcsupport/include/iosupp.h
    c/src/exec/libcsupport/include/motorola/mc68230.h
    c/src/exec/libcsupport/include/motorola/mc68681.h
    c/src/exec/libcsupport/include/ringbuf.h
    c/src/exec/libcsupport/include/rtems/assoc.h
    c/src/exec/libcsupport/include/rtems/error.h
    c/src/exec/libcsupport/include/rtems/libcsupport.h
    c/src/exec/libcsupport/include/rtems/libio.h
    c/src/exec/libcsupport/include/spurious.h
    c/src/exec/libcsupport/include/sys/filio.h
    c/src/exec/libcsupport/include/sys/ioctl.h
    c/src/exec/libcsupport/include/sys/sockio.h
    c/src/exec/libcsupport/include/sys/termios.h
    c/src/exec/libcsupport/include/sys/utsname.h
    c/src/exec/libcsupport/include/timerdrv.h
    c/src/exec/libcsupport/include/vmeintr.h
    c/src/exec/libcsupport/include/zilog/z8036.h
    c/src/exec/libcsupport/include/zilog/z8530.h
    c/src/exec/libcsupport/include/zilog/z8536.h
    c/src/exec/libcsupport/src/README
    c/src/exec/libcsupport/src/__brk.c
    c/src/exec/libcsupport/src/__gettod.c
    c/src/exec/libcsupport/src/__times.c
    c/src/exec/libcsupport/src/assoc.c
    c/src/exec/libcsupport/src/closedir.c
    c/src/exec/libcsupport/src/error.c
    c/src/exec/libcsupport/src/getdents.c
    c/src/exec/libcsupport/src/hosterr.c
    c/src/exec/libcsupport/src/libio.c
    c/src/exec/libcsupport/src/malloc.c
    c/src/exec/libcsupport/src/newlibc.c
    c/src/exec/libcsupport/src/no_libc.c
    c/src/exec/libcsupport/src/opendir.c
    c/src/exec/libcsupport/src/readdir.c
    c/src/exec/libcsupport/src/rewinddir.c
    c/src/exec/libcsupport/src/scandir.c
    c/src/exec/libcsupport/src/seekdir.c
    c/src/exec/libcsupport/src/tcdrain.c
    c/src/exec/libcsupport/src/telldir.c
    c/src/exec/libcsupport/src/termios.c
    c/src/exec/libcsupport/src/unixlibc.c
    c/src/exec/libcsupport/src/utsname.c
    c/src/exec/libnetworking/README
    c/src/exec/libnetworking/arpa/ftp.h
    c/src/exec/libnetworking/arpa/inet.h
    c/src/exec/libnetworking/arpa/nameser.h
    c/src/exec/libnetworking/arpa/nameser_compat.h
    c/src/exec/libnetworking/arpa/telnet.h
    c/src/exec/libnetworking/bpfilter.h
    c/src/exec/libnetworking/kern/kern_subr.c
    c/src/exec/libnetworking/kern/uipc_domain.c
    c/src/exec/libnetworking/kern/uipc_mbuf.c
    c/src/exec/libnetworking/kern/uipc_socket.c
    c/src/exec/libnetworking/kern/uipc_socket2.c
    c/src/exec/libnetworking/lib/README
    c/src/exec/libnetworking/lib/getprotoby.c
    c/src/exec/libnetworking/lib/syslog.c
    c/src/exec/libnetworking/lib/tftpDriver.c
    c/src/exec/libnetworking/libc/addr2ascii.3
    c/src/exec/libnetworking/libc/addr2ascii.c
    c/src/exec/libnetworking/libc/ascii2addr.c
    c/src/exec/libnetworking/libc/base64.c
    c/src/exec/libnetworking/libc/byteorder.3
    c/src/exec/libnetworking/libc/ether_addr.c
    c/src/exec/libnetworking/libc/ethers.3
    c/src/exec/libnetworking/libc/gethostbydns.c
    c/src/exec/libnetworking/libc/gethostbyht.c
    c/src/exec/libnetworking/libc/gethostbyname.3
    c/src/exec/libnetworking/libc/gethostbynis.c
    c/src/exec/libnetworking/libc/gethostnamadr.c
    c/src/exec/libnetworking/libc/gethostname.c
    c/src/exec/libnetworking/libc/getnetbydns.c
    c/src/exec/libnetworking/libc/getnetbyht.c
    c/src/exec/libnetworking/libc/getnetbynis.c
    c/src/exec/libnetworking/libc/getnetent.3
    c/src/exec/libnetworking/libc/getnetnamadr.c
    c/src/exec/libnetworking/libc/getproto.c
    c/src/exec/libnetworking/libc/getprotoent.3
    c/src/exec/libnetworking/libc/getprotoent.c
    c/src/exec/libnetworking/libc/getprotoname.c
    c/src/exec/libnetworking/libc/getservbyname.c
    c/src/exec/libnetworking/libc/getservbyport.c
    c/src/exec/libnetworking/libc/getservent.3
    c/src/exec/libnetworking/libc/getservent.c
    c/src/exec/libnetworking/libc/herror.c
    c/src/exec/libnetworking/libc/inet.3
    c/src/exec/libnetworking/libc/inet_addr.c
    c/src/exec/libnetworking/libc/inet_lnaof.c
    c/src/exec/libnetworking/libc/inet_makeaddr.c
    c/src/exec/libnetworking/libc/inet_net_ntop.c
    c/src/exec/libnetworking/libc/inet_net_pton.c
    c/src/exec/libnetworking/libc/inet_neta.c
    c/src/exec/libnetworking/libc/inet_netof.c
    c/src/exec/libnetworking/libc/inet_network.c
    c/src/exec/libnetworking/libc/inet_ntoa.c
    c/src/exec/libnetworking/libc/inet_ntop.c
    c/src/exec/libnetworking/libc/inet_pton.c
    c/src/exec/libnetworking/libc/iso_addr.3
    c/src/exec/libnetworking/libc/iso_addr.c
    c/src/exec/libnetworking/libc/linkaddr.3
    c/src/exec/libnetworking/libc/linkaddr.c
    c/src/exec/libnetworking/libc/map_v4v6.c
    c/src/exec/libnetworking/libc/ns.3
    c/src/exec/libnetworking/libc/ns_addr.c
    c/src/exec/libnetworking/libc/ns_name.c
    c/src/exec/libnetworking/libc/ns_netint.c
    c/src/exec/libnetworking/libc/ns_ntoa.c
    c/src/exec/libnetworking/libc/ns_parse.c
    c/src/exec/libnetworking/libc/ns_print.c
    c/src/exec/libnetworking/libc/ns_ttl.c
    c/src/exec/libnetworking/libc/nsap_addr.c
    c/src/exec/libnetworking/libc/rcmd.3
    c/src/exec/libnetworking/libc/rcmd.c
    c/src/exec/libnetworking/libc/recv.c
    c/src/exec/libnetworking/libc/res_comp.c
    c/src/exec/libnetworking/libc/res_config.h
    c/src/exec/libnetworking/libc/res_data.c
    c/src/exec/libnetworking/libc/res_debug.c
    c/src/exec/libnetworking/libc/res_init.c
    c/src/exec/libnetworking/libc/res_mkquery.c
    c/src/exec/libnetworking/libc/res_mkupdate.c
    c/src/exec/libnetworking/libc/res_query.c
    c/src/exec/libnetworking/libc/res_send.c
    c/src/exec/libnetworking/libc/res_stubs.c
    c/src/exec/libnetworking/libc/res_update.c
    c/src/exec/libnetworking/libc/resolver.3
    c/src/exec/libnetworking/libc/send.c
    c/src/exec/libnetworking/libc/strsep.c
    c/src/exec/libnetworking/loop.h
    c/src/exec/libnetworking/machine/conf.h
    c/src/exec/libnetworking/machine/cpu.h
    c/src/exec/libnetworking/machine/cpufunc.h
    c/src/exec/libnetworking/machine/endian.h
    c/src/exec/libnetworking/machine/in_cksum.h
    c/src/exec/libnetworking/machine/limits.h
    c/src/exec/libnetworking/machine/param.h
    c/src/exec/libnetworking/machine/types.h
    c/src/exec/libnetworking/machine/vmparam.h
    c/src/exec/libnetworking/net/bpf.h
    c/src/exec/libnetworking/net/ethernet.h
    c/src/exec/libnetworking/net/if.c
    c/src/exec/libnetworking/net/if.h
    c/src/exec/libnetworking/net/if_arp.h
    c/src/exec/libnetworking/net/if_dl.h
    c/src/exec/libnetworking/net/if_ethersubr.c
    c/src/exec/libnetworking/net/if_llc.h
    c/src/exec/libnetworking/net/if_loop.c
    c/src/exec/libnetworking/net/if_types.h
    c/src/exec/libnetworking/net/netisr.h
    c/src/exec/libnetworking/net/radix.c
    c/src/exec/libnetworking/net/radix.h
    c/src/exec/libnetworking/net/raw_cb.c
    c/src/exec/libnetworking/net/raw_cb.h
    c/src/exec/libnetworking/net/raw_usrreq.c
    c/src/exec/libnetworking/net/route.c
    c/src/exec/libnetworking/net/route.h
    c/src/exec/libnetworking/net/rtsock.c
    c/src/exec/libnetworking/netdb.h
    c/src/exec/libnetworking/netinet/icmp_var.h
    c/src/exec/libnetworking/netinet/if_ether.c
    c/src/exec/libnetworking/netinet/if_ether.h
    c/src/exec/libnetworking/netinet/igmp.c
    c/src/exec/libnetworking/netinet/igmp.h
    c/src/exec/libnetworking/netinet/igmp_var.h
    c/src/exec/libnetworking/netinet/in.c
    c/src/exec/libnetworking/netinet/in.h
    c/src/exec/libnetworking/netinet/in_cksum.c
    c/src/exec/libnetworking/netinet/in_cksum_i386.c
    c/src/exec/libnetworking/netinet/in_cksum_m68k.c
    c/src/exec/libnetworking/netinet/in_pcb.c
    c/src/exec/libnetworking/netinet/in_pcb.h
    c/src/exec/libnetworking/netinet/in_proto.c
    c/src/exec/libnetworking/netinet/in_rmx.c
    c/src/exec/libnetworking/netinet/in_systm.h
    c/src/exec/libnetworking/netinet/in_var.h
    c/src/exec/libnetworking/netinet/ip.h
    c/src/exec/libnetworking/netinet/ip_divert.c
    c/src/exec/libnetworking/netinet/ip_fw.c
    c/src/exec/libnetworking/netinet/ip_fw.h
    c/src/exec/libnetworking/netinet/ip_icmp.c
    c/src/exec/libnetworking/netinet/ip_icmp.h
    c/src/exec/libnetworking/netinet/ip_input.c
    c/src/exec/libnetworking/netinet/ip_mroute.c
    c/src/exec/libnetworking/netinet/ip_mroute.h
    c/src/exec/libnetworking/netinet/ip_output.c
    c/src/exec/libnetworking/netinet/ip_var.h
    c/src/exec/libnetworking/netinet/raw_ip.c
    c/src/exec/libnetworking/netinet/tcp.h
    c/src/exec/libnetworking/netinet/tcp_debug.c
    c/src/exec/libnetworking/netinet/tcp_debug.h
    c/src/exec/libnetworking/netinet/tcp_fsm.h
    c/src/exec/libnetworking/netinet/tcp_input.c
    c/src/exec/libnetworking/netinet/tcp_output.c
    c/src/exec/libnetworking/netinet/tcp_seq.h
    c/src/exec/libnetworking/netinet/tcp_subr.c
    c/src/exec/libnetworking/netinet/tcp_timer.c
    c/src/exec/libnetworking/netinet/tcp_timer.h
    c/src/exec/libnetworking/netinet/tcp_usrreq.c
    c/src/exec/libnetworking/netinet/tcp_var.h
    c/src/exec/libnetworking/netinet/tcpip.h
    c/src/exec/libnetworking/netinet/udp.h
    c/src/exec/libnetworking/netinet/udp_usrreq.c
    c/src/exec/libnetworking/netinet/udp_var.h
    c/src/exec/libnetworking/nfs/bootp_subr.c
    c/src/exec/libnetworking/nfs/krpc.h
    c/src/exec/libnetworking/nfs/nfs.h
    c/src/exec/libnetworking/nfs/nfsdiskless.h
    c/src/exec/libnetworking/nfs/nfsproto.h
    c/src/exec/libnetworking/nfs/rpcv2.h
    c/src/exec/libnetworking/nfs/xdr_subs.h
    c/src/exec/libnetworking/opt_ipfw.h
    c/src/exec/libnetworking/opt_mrouting.h
    c/src/exec/libnetworking/opt_tcpdebug.h
    c/src/exec/libnetworking/poll.h
    c/src/exec/libnetworking/resolv.h
    c/src/exec/libnetworking/rtems/issetugid.c
    c/src/exec/libnetworking/rtems/rtems_bootp.c
    c/src/exec/libnetworking/rtems/rtems_bsdnet.h
    c/src/exec/libnetworking/rtems/rtems_bsdnet_internal.h
    c/src/exec/libnetworking/rtems/rtems_glue.c
    c/src/exec/libnetworking/rtems/rtems_showicmpstat.c
    c/src/exec/libnetworking/rtems/rtems_showifstat.c
    c/src/exec/libnetworking/rtems/rtems_showipstat.c
    c/src/exec/libnetworking/rtems/rtems_showmbuf.c
    c/src/exec/libnetworking/rtems/rtems_showroute.c
    c/src/exec/libnetworking/rtems/rtems_showtcpstat.c
    c/src/exec/libnetworking/rtems/rtems_showudpstat.c
    c/src/exec/libnetworking/rtems/rtems_syscall.c
    c/src/exec/libnetworking/rtems/sghostname.c
    c/src/exec/libnetworking/rtems/tftp.h
    c/src/exec/libnetworking/sys/buf.h
    c/src/exec/libnetworking/sys/callout.h
    c/src/exec/libnetworking/sys/conf.h
    c/src/exec/libnetworking/sys/domain.h
    c/src/exec/libnetworking/sys/kernel.h
    c/src/exec/libnetworking/sys/libkern.h
    c/src/exec/libnetworking/sys/malloc.h
    c/src/exec/libnetworking/sys/mbuf.h
    c/src/exec/libnetworking/sys/mount.h
    c/src/exec/libnetworking/sys/param.h
    c/src/exec/libnetworking/sys/proc.h
    c/src/exec/libnetworking/sys/protosw.h
    c/src/exec/libnetworking/sys/queue.h
    c/src/exec/libnetworking/sys/reboot.h
    c/src/exec/libnetworking/sys/resourcevar.h
    c/src/exec/libnetworking/sys/rtprio.h
    c/src/exec/libnetworking/sys/select.h
    c/src/exec/libnetworking/sys/signalvar.h
    c/src/exec/libnetworking/sys/socket.h
    c/src/exec/libnetworking/sys/socketvar.h
    c/src/exec/libnetworking/sys/sysctl.h
    c/src/exec/libnetworking/sys/syslimits.h
    c/src/exec/libnetworking/sys/syslog.h
    c/src/exec/libnetworking/sys/systm.h
    c/src/exec/libnetworking/sys/ttydefaults.h
    c/src/exec/libnetworking/sys/ucred.h
    c/src/exec/libnetworking/sys/uio.h
    c/src/exec/libnetworking/syslog.h
    c/src/exec/libnetworking/vm/vm.h
    c/src/exec/libnetworking/vm/vm_extern.h
    c/src/exec/libnetworking/vm/vm_kern.h
    c/src/exec/libnetworking/vm/vm_param.h
    c/src/exec/posix/include/aio.h
    c/src/exec/posix/include/devctl.h
    c/src/exec/posix/include/intr.h
    c/src/exec/posix/include/limits.h
    c/src/exec/posix/include/mqueue.h
    c/src/exec/posix/include/pthread.h
    c/src/exec/posix/include/rtems/posix/Makefile.in
    c/src/exec/posix/include/rtems/posix/cancel.h
    c/src/exec/posix/include/rtems/posix/cond.h
    c/src/exec/posix/include/rtems/posix/condmp.h
    c/src/exec/posix/include/rtems/posix/config.h
    c/src/exec/posix/include/rtems/posix/intr.h
    c/src/exec/posix/include/rtems/posix/key.h
    c/src/exec/posix/include/rtems/posix/mqueue.h
    c/src/exec/posix/include/rtems/posix/mqueuemp.h
    c/src/exec/posix/include/rtems/posix/mutex.h
    c/src/exec/posix/include/rtems/posix/mutexmp.h
    c/src/exec/posix/include/rtems/posix/posixapi.h
    c/src/exec/posix/include/rtems/posix/priority.h
    c/src/exec/posix/include/rtems/posix/psignal.h
    c/src/exec/posix/include/rtems/posix/pthread.h
    c/src/exec/posix/include/rtems/posix/pthreadmp.h
    c/src/exec/posix/include/rtems/posix/semaphore.h
    c/src/exec/posix/include/rtems/posix/semaphoremp.h
    c/src/exec/posix/include/rtems/posix/seterr.h
    c/src/exec/posix/include/rtems/posix/threadsup.h
    c/src/exec/posix/include/rtems/posix/time.h
    c/src/exec/posix/include/sched.h
    c/src/exec/posix/include/semaphore.h
    c/src/exec/posix/include/sys/Makefile.in
    c/src/exec/posix/include/sys/utsname.h
    c/src/exec/posix/include/unistd.h
    c/src/exec/posix/include/wrap/Makefile.in
    c/src/exec/posix/inline/rtems/posix/Makefile.in
    c/src/exec/posix/inline/rtems/posix/cond.inl
    c/src/exec/posix/inline/rtems/posix/intr.inl
    c/src/exec/posix/inline/rtems/posix/key.inl
    c/src/exec/posix/inline/rtems/posix/mqueue.inl
    c/src/exec/posix/inline/rtems/posix/mutex.inl
    c/src/exec/posix/inline/rtems/posix/priority.inl
    c/src/exec/posix/inline/rtems/posix/pthread.inl
    c/src/exec/posix/inline/rtems/posix/semaphore.inl
    c/src/exec/posix/macros/rtems/posix/Makefile.in
    c/src/exec/rtems/include/rtems.h
    c/src/exec/rtems/include/rtems/rtems/Makefile.in
    c/src/exec/rtems/include/rtems/rtems/asr.h
    c/src/exec/rtems/include/rtems/rtems/attr.h
    c/src/exec/rtems/include/rtems/rtems/clock.h
    c/src/exec/rtems/include/rtems/rtems/config.h
    c/src/exec/rtems/include/rtems/rtems/dpmem.h
    c/src/exec/rtems/include/rtems/rtems/event.h
    c/src/exec/rtems/include/rtems/rtems/eventmp.h
    c/src/exec/rtems/include/rtems/rtems/eventset.h
    c/src/exec/rtems/include/rtems/rtems/intr.h
    c/src/exec/rtems/include/rtems/rtems/message.h
    c/src/exec/rtems/include/rtems/rtems/modes.h
    c/src/exec/rtems/include/rtems/rtems/mp.h
    c/src/exec/rtems/include/rtems/rtems/msgmp.h
    c/src/exec/rtems/include/rtems/rtems/options.h
    c/src/exec/rtems/include/rtems/rtems/part.h
    c/src/exec/rtems/include/rtems/rtems/partmp.h
    c/src/exec/rtems/include/rtems/rtems/ratemon.h
    c/src/exec/rtems/include/rtems/rtems/region.h
    c/src/exec/rtems/include/rtems/rtems/regionmp.h
    c/src/exec/rtems/include/rtems/rtems/rtemsapi.h
    c/src/exec/rtems/include/rtems/rtems/sem.h
    c/src/exec/rtems/include/rtems/rtems/semmp.h
    c/src/exec/rtems/include/rtems/rtems/signal.h
    c/src/exec/rtems/include/rtems/rtems/signalmp.h
    c/src/exec/rtems/include/rtems/rtems/status.h
    c/src/exec/rtems/include/rtems/rtems/support.h
    c/src/exec/rtems/include/rtems/rtems/taskmp.h
    c/src/exec/rtems/include/rtems/rtems/tasks.h
    c/src/exec/rtems/include/rtems/rtems/timer.h
    c/src/exec/rtems/include/rtems/rtems/types.h
    c/src/exec/rtems/inline/rtems/rtems/Makefile.in
    c/src/exec/rtems/inline/rtems/rtems/asr.inl
    c/src/exec/rtems/inline/rtems/rtems/attr.inl
    c/src/exec/rtems/inline/rtems/rtems/dpmem.inl
    c/src/exec/rtems/inline/rtems/rtems/event.inl
    c/src/exec/rtems/inline/rtems/rtems/eventset.inl
    c/src/exec/rtems/inline/rtems/rtems/message.inl
    c/src/exec/rtems/inline/rtems/rtems/modes.inl
    c/src/exec/rtems/inline/rtems/rtems/options.inl
    c/src/exec/rtems/inline/rtems/rtems/part.inl
    c/src/exec/rtems/inline/rtems/rtems/ratemon.inl
    c/src/exec/rtems/inline/rtems/rtems/region.inl
    c/src/exec/rtems/inline/rtems/rtems/sem.inl
    c/src/exec/rtems/inline/rtems/rtems/status.inl
    c/src/exec/rtems/inline/rtems/rtems/support.inl
    c/src/exec/rtems/inline/rtems/rtems/tasks.inl
    c/src/exec/rtems/inline/rtems/rtems/timer.inl
    c/src/exec/rtems/macros/rtems/rtems/Makefile.in
    c/src/exec/rtems/macros/rtems/rtems/asr.inl
    c/src/exec/rtems/macros/rtems/rtems/attr.inl
    c/src/exec/rtems/macros/rtems/rtems/dpmem.inl
    c/src/exec/rtems/macros/rtems/rtems/event.inl
    c/src/exec/rtems/macros/rtems/rtems/eventset.inl
    c/src/exec/rtems/macros/rtems/rtems/message.inl
    c/src/exec/rtems/macros/rtems/rtems/modes.inl
    c/src/exec/rtems/macros/rtems/rtems/options.inl
    c/src/exec/rtems/macros/rtems/rtems/part.inl
    c/src/exec/rtems/macros/rtems/rtems/ratemon.inl
    c/src/exec/rtems/macros/rtems/rtems/region.inl
    c/src/exec/rtems/macros/rtems/rtems/sem.inl
    c/src/exec/rtems/macros/rtems/rtems/status.inl
    c/src/exec/rtems/macros/rtems/rtems/support.inl
    c/src/exec/rtems/macros/rtems/rtems/tasks.inl
    c/src/exec/rtems/macros/rtems/rtems/timer.inl
    c/src/exec/rtems/src/rtclock.c
    c/src/exec/rtems/src/rtemstimer.c
    c/src/exec/sapi/include/confdefs.h
    c/src/exec/sapi/include/rtems/Makefile.in
    c/src/exec/sapi/include/rtems/README
    c/src/exec/sapi/include/rtems/config.h
    c/src/exec/sapi/include/rtems/directives.h
    c/src/exec/sapi/include/rtems/extension.h
    c/src/exec/sapi/include/rtems/fatal.h
    c/src/exec/sapi/include/rtems/init.h
    c/src/exec/sapi/include/rtems/io.h
    c/src/exec/sapi/include/rtems/mptables.h
    c/src/exec/sapi/include/rtems/sptables.h
    c/src/exec/sapi/inline/rtems/Makefile.in
    c/src/exec/sapi/inline/rtems/extension.inl
    c/src/exec/sapi/macros/rtems/Makefile.in
    c/src/exec/sapi/macros/rtems/extension.inl
    c/src/exec/score/cpu/mips/asm.h
    c/src/exec/score/cpu/mips/cpu.c
    c/src/exec/score/cpu/mips/cpu_asm.S
    c/src/exec/score/cpu/mips/cpu_asm.h
    c/src/exec/score/cpu/mips/idtcpu.h
    c/src/exec/score/cpu/mips/idtmon.h
    c/src/exec/score/cpu/mips/iregdef.h
    c/src/exec/score/cpu/mips/rtems.c
    c/src/exec/score/cpu/sh/ispsh7032.c
    c/src/exec/score/include/rtems/debug.h
    c/src/exec/score/include/rtems/score/Makefile.in
    c/src/exec/score/include/rtems/score/address.h
    c/src/exec/score/include/rtems/score/apiext.h
    c/src/exec/score/include/rtems/score/bitfield.h
    c/src/exec/score/include/rtems/score/chain.h
    c/src/exec/score/include/rtems/score/context.h
    c/src/exec/score/include/rtems/score/copyrt.h
    c/src/exec/score/include/rtems/score/coremsg.h
    c/src/exec/score/include/rtems/score/coremutex.h
    c/src/exec/score/include/rtems/score/coresem.h
    c/src/exec/score/include/rtems/score/heap.h
    c/src/exec/score/include/rtems/score/interr.h
    c/src/exec/score/include/rtems/score/isr.h
    c/src/exec/score/include/rtems/score/mpci.h
    c/src/exec/score/include/rtems/score/mppkt.h
    c/src/exec/score/include/rtems/score/object.h
    c/src/exec/score/include/rtems/score/objectmp.h
    c/src/exec/score/include/rtems/score/priority.h
    c/src/exec/score/include/rtems/score/stack.h
    c/src/exec/score/include/rtems/score/states.h
    c/src/exec/score/include/rtems/score/sysstate.h
    c/src/exec/score/include/rtems/score/thread.h
    c/src/exec/score/include/rtems/score/threadmp.h
    c/src/exec/score/include/rtems/score/threadq.h
    c/src/exec/score/include/rtems/score/tod.h
    c/src/exec/score/include/rtems/score/tqdata.h
    c/src/exec/score/include/rtems/score/userext.h
    c/src/exec/score/include/rtems/score/watchdog.h
    c/src/exec/score/include/rtems/score/wkspace.h
    c/src/exec/score/include/rtems/system.h
    c/src/exec/score/inline/rtems/score/Makefile.in
    c/src/exec/score/inline/rtems/score/address.inl
    c/src/exec/score/inline/rtems/score/chain.inl
    c/src/exec/score/inline/rtems/score/coremsg.inl
    c/src/exec/score/inline/rtems/score/coremutex.inl
    c/src/exec/score/inline/rtems/score/coresem.inl
    c/src/exec/score/inline/rtems/score/heap.inl
    c/src/exec/score/inline/rtems/score/isr.inl
    c/src/exec/score/inline/rtems/score/mppkt.inl
    c/src/exec/score/inline/rtems/score/object.inl
    c/src/exec/score/inline/rtems/score/objectmp.inl
    c/src/exec/score/inline/rtems/score/priority.inl
    c/src/exec/score/inline/rtems/score/stack.inl
    c/src/exec/score/inline/rtems/score/states.inl
    c/src/exec/score/inline/rtems/score/sysstate.inl
    c/src/exec/score/inline/rtems/score/thread.inl
    c/src/exec/score/inline/rtems/score/threadmp.inl
    c/src/exec/score/inline/rtems/score/tod.inl
    c/src/exec/score/inline/rtems/score/tqdata.inl
    c/src/exec/score/inline/rtems/score/userext.inl
    c/src/exec/score/inline/rtems/score/watchdog.inl
    c/src/exec/score/inline/rtems/score/wkspace.inl
    c/src/exec/score/macros/rtems/score/Makefile.in
    c/src/exec/score/macros/rtems/score/README
    c/src/exec/score/macros/rtems/score/address.inl
    c/src/exec/score/macros/rtems/score/chain.inl
    c/src/exec/score/macros/rtems/score/coremsg.inl
    c/src/exec/score/macros/rtems/score/coremutex.inl
    c/src/exec/score/macros/rtems/score/coresem.inl
    c/src/exec/score/macros/rtems/score/heap.inl
    c/src/exec/score/macros/rtems/score/isr.inl
    c/src/exec/score/macros/rtems/score/mppkt.inl
    c/src/exec/score/macros/rtems/score/object.inl
    c/src/exec/score/macros/rtems/score/objectmp.inl
    c/src/exec/score/macros/rtems/score/priority.inl
    c/src/exec/score/macros/rtems/score/stack.inl
    c/src/exec/score/macros/rtems/score/states.inl
    c/src/exec/score/macros/rtems/score/sysstate.inl
    c/src/exec/score/macros/rtems/score/thread.inl
    c/src/exec/score/macros/rtems/score/threadmp.inl
    c/src/exec/score/macros/rtems/score/tod.inl
    c/src/exec/score/macros/rtems/score/tqdata.inl
    c/src/exec/score/macros/rtems/score/userext.inl
    c/src/exec/score/macros/rtems/score/watchdog.inl
    c/src/exec/score/macros/rtems/score/wkspace.inl
    c/src/exec/score/src/coretod.c
    c/src/lib/include/rtems/assoc.h
    c/src/lib/include/rtems/error.h
    c/src/lib/include/rtems/libcsupport.h
    c/src/lib/include/rtems/libio.h
    c/src/lib/include/sys/filio.h
    c/src/lib/include/sys/ioctl.h
    c/src/lib/include/sys/sockio.h
    c/src/lib/include/sys/utsname.h
    c/src/lib/libbsp/a29k/portsw/start/Makefile.in
    c/src/lib/libbsp/a29k/portsw/start/amd.ah
    c/src/lib/libbsp/a29k/portsw/start/pswmacro.ah
    c/src/lib/libbsp/a29k/portsw/start/register.ah
    c/src/lib/libbsp/i386/shared/irq/idt.c
    c/src/lib/libbsp/i960/cvme961/start/Makefile.in
    c/src/lib/libbsp/m68k/efi332/start/Makefile.in
    c/src/lib/libbsp/m68k/efi332/start/start.c
    c/src/lib/libbsp/m68k/efi68k/start/Makefile.in
    c/src/lib/libbsp/m68k/efi68k/start/start.c
    c/src/lib/libbsp/m68k/gen68302/start/Makefile.in
    c/src/lib/libbsp/m68k/gen68302/start/start302.s
    c/src/lib/libbsp/m68k/gen68340/start/Makefile.in
    c/src/lib/libbsp/m68k/gen68340/start/start340.s
    c/src/lib/libbsp/m68k/gen68340/start/startfor340only.s
    c/src/lib/libbsp/m68k/gen68360/start/Makefile.in
    c/src/lib/libbsp/m68k/gen68360/start/start360.s
    c/src/lib/libbsp/m68k/ods68302/start/Makefile.in
    c/src/lib/libbsp/m68k/ods68302/start/cpuboot.c
    c/src/lib/libbsp/m68k/ods68302/start/debugreset.S
    c/src/lib/libbsp/m68k/ods68302/start/reset.S
    c/src/lib/libbsp/m68k/ods68302/startup/cpuboot.c
    c/src/lib/libbsp/mips/README
    c/src/lib/libbsp/mips/p4000/README
    c/src/lib/libbsp/mips/p4000/bsp_specs
    c/src/lib/libbsp/mips/p4000/console/console.c
    c/src/lib/libbsp/mips/p4000/console/led.S
    c/src/lib/libbsp/mips/p4000/include/bsp.h
    c/src/lib/libbsp/mips/p4000/include/coverhd.h
    c/src/lib/libbsp/mips/p4000/liblnk/lnklib.S
    c/src/lib/libbsp/mips/p4000/start/start.S
    c/src/lib/libbsp/mips/p4000/startup/bspclean.c
    c/src/lib/libbsp/mips/p4000/startup/bspstart.c
    c/src/lib/libbsp/mips/p4000/startup/ghlinkcmds
    c/src/lib/libbsp/mips/p4000/startup/idtmem.S
    c/src/lib/libbsp/mips/p4000/startup/idttlb.S
    c/src/lib/libbsp/mips/p4000/startup/inittlb.c
    c/src/lib/libbsp/mips/p4000/startup/linkcmds
    c/src/lib/libbsp/mips/p4000/startup/setvec.c
    c/src/lib/libbsp/mips/p4000/times
    c/src/lib/libbsp/mips64orion/p4000/start/Makefile.in
    c/src/lib/libbsp/mips64orion/p4000/start/start.S
    c/src/lib/libbsp/powerpc/dmv177/Makefile.in
    c/src/lib/libbsp/powerpc/dmv177/QUIRKS
    c/src/lib/libbsp/powerpc/dmv177/README
    c/src/lib/libbsp/powerpc/dmv177/README.net
    c/src/lib/libbsp/powerpc/dmv177/STATUS
    c/src/lib/libbsp/powerpc/dmv177/bsp_specs
    c/src/lib/libbsp/powerpc/dmv177/cable.doc
    c/src/lib/libbsp/powerpc/dmv177/clock/Makefile.in
    c/src/lib/libbsp/powerpc/dmv177/clock/clock.c
    c/src/lib/libbsp/powerpc/dmv177/console/Makefile.in
    c/src/lib/libbsp/powerpc/dmv177/console/config.c
    c/src/lib/libbsp/powerpc/dmv177/console/conscfg.c
    c/src/lib/libbsp/powerpc/dmv177/console/debugio.c
    c/src/lib/libbsp/powerpc/dmv177/include/Makefile.in
    c/src/lib/libbsp/powerpc/dmv177/include/bsp.h
    c/src/lib/libbsp/powerpc/dmv177/include/coverhd.h
    c/src/lib/libbsp/powerpc/dmv177/include/dmv170.h
    c/src/lib/libbsp/powerpc/dmv177/scv64/Makefile.in
    c/src/lib/libbsp/powerpc/dmv177/scv64/scv64.c
    c/src/lib/libbsp/powerpc/dmv177/sonic/Makefile.in
    c/src/lib/libbsp/powerpc/dmv177/sonic/sonic.c
    c/src/lib/libbsp/powerpc/dmv177/sonic/sonic.h
    c/src/lib/libbsp/powerpc/dmv177/start/Makefile.in
    c/src/lib/libbsp/powerpc/dmv177/start/start.s
    c/src/lib/libbsp/powerpc/dmv177/startup/Makefile.in
    c/src/lib/libbsp/powerpc/dmv177/startup/bspclean.c
    c/src/lib/libbsp/powerpc/dmv177/startup/bspstart.c
    c/src/lib/libbsp/powerpc/dmv177/startup/genpvec.c
    c/src/lib/libbsp/powerpc/dmv177/startup/linkcmds
    c/src/lib/libbsp/powerpc/dmv177/startup/setvec.c
    c/src/lib/libbsp/powerpc/dmv177/startup/vmeintr.c
    c/src/lib/libbsp/powerpc/dmv177/timer/Makefile.in
    c/src/lib/libbsp/powerpc/dmv177/timer/timer.c
    c/src/lib/libbsp/powerpc/dmv177/times
    c/src/lib/libbsp/powerpc/dmv177/tod/Makefile.in
    c/src/lib/libbsp/powerpc/dmv177/tod/config.c
    c/src/lib/libbsp/powerpc/dmv177/tod/todcfg.c
    c/src/lib/libbsp/powerpc/dmv177/wrapup/Makefile.in
    c/src/lib/libbsp/powerpc/psim/start/Makefile.in
    c/src/lib/libbsp/powerpc/psim/start/startsim.s
    c/src/lib/libbsp/sh/gensh1/start/Makefile.in
    c/src/lib/libbsp/shared/console.c
    c/src/lib/libbsp/shared/tod.c
    c/src/lib/libbsp/shared/tod.h
    c/src/lib/libbsp/shmdr/shm_driver.h
    c/src/lib/libbsp/sparc/erc32/start/Makefile.in
    c/src/lib/libbsp/sparc/erc32/start/startsis.s
    c/src/lib/libc/assoc.c
    c/src/lib/libc/assoc.h
    c/src/lib/libc/error.c
    c/src/lib/libc/error.h
    c/src/lib/libc/utsname.c
    c/src/lib/libchip/Makefile.in
    c/src/lib/libchip/rtc/Makefile.in
    c/src/lib/libchip/rtc/README.ds1643
    c/src/lib/libchip/rtc/README.icm7170
    c/src/lib/libchip/rtc/README.m48t08
    c/src/lib/libchip/rtc/README.m48t18
    c/src/lib/libchip/rtc/STATUS
    c/src/lib/libchip/rtc/icm7170.c
    c/src/lib/libchip/rtc/icm7170.h
    c/src/lib/libchip/rtc/icm7170_reg.c
    c/src/lib/libchip/rtc/icm7170_reg2.c
    c/src/lib/libchip/rtc/icm7170_reg4.c
    c/src/lib/libchip/rtc/icm7170_reg8.c
    c/src/lib/libchip/rtc/m48t08.c
    c/src/lib/libchip/rtc/m48t08.h
    c/src/lib/libchip/rtc/m48t08_reg.c
    c/src/lib/libchip/rtc/m48t08_reg2.c
    c/src/lib/libchip/rtc/m48t08_reg4.c
    c/src/lib/libchip/rtc/m48t08_reg8.c
    c/src/lib/libchip/rtc/rtc.h
    c/src/lib/libchip/rtc/rtcprobe.c
    c/src/lib/libchip/serial/Makefile.in
    c/src/lib/libchip/serial/README
    c/src/lib/libchip/serial/README.mc68681
    c/src/lib/libchip/serial/README.ns16550
    c/src/lib/libchip/serial/README.xr88681
    c/src/lib/libchip/serial/README.z85c30
    c/src/lib/libchip/serial/STATUS
    c/src/lib/libchip/serial/mc68681.c
    c/src/lib/libchip/serial/mc68681.h
    c/src/lib/libchip/serial/mc68681_baud.c
    c/src/lib/libchip/serial/mc68681_p.h
    c/src/lib/libchip/serial/mc68681_reg.c
    c/src/lib/libchip/serial/mc68681_reg2.c
    c/src/lib/libchip/serial/mc68681_reg4.c
    c/src/lib/libchip/serial/mc68681_reg8.c
    c/src/lib/libchip/serial/ns16550.c
    c/src/lib/libchip/serial/ns16550.h
    c/src/lib/libchip/serial/ns16550_p.h
    c/src/lib/libchip/serial/serial.h
    c/src/lib/libchip/serial/serprobe.c
    c/src/lib/libchip/serial/sersupp.h
    c/src/lib/libchip/serial/termios_baud2index.c
    c/src/lib/libchip/serial/termios_baud2num.c
    c/src/lib/libchip/serial/z85c30.c
    c/src/lib/libchip/serial/z85c30.h
    c/src/lib/libchip/serial/z85c30_p.h
    c/src/lib/libchip/serial/z85c30_reg.c
    c/src/lib/libcpu/i386/idt.c
    c/src/lib/libcpu/m68k/shared/misc/memcpy.c
    c/src/lib/libcpu/mips/clock/ckinit.c
    c/src/lib/libcpu/mips/clock/clock.S
    c/src/lib/libcpu/mips/clock/clock.h
    c/src/lib/libcpu/mips/timer/gettime.S
    c/src/lib/libcpu/mips/timer/timer.c
    c/src/lib/libcpu/sh/sh7032/score/cpu_asm.c
    c/src/lib/libcpu/sh/sh7032/score/ispsh7032.c
    c/src/lib/libcpu/sh/sh7045/score/cpu_asm.c
    c/src/lib/libcpu/sparc/include/erc32.h
    c/src/libchip/rtc/Makefile.in
    c/src/libchip/rtc/README.ds1643
    c/src/libchip/rtc/README.icm7170
    c/src/libchip/rtc/README.m48t08
    c/src/libchip/rtc/README.m48t18
    c/src/libchip/rtc/STATUS
    c/src/libchip/rtc/icm7170.c
    c/src/libchip/rtc/icm7170.h
    c/src/libchip/rtc/icm7170_reg.c
    c/src/libchip/rtc/icm7170_reg2.c
    c/src/libchip/rtc/icm7170_reg4.c
    c/src/libchip/rtc/icm7170_reg8.c
    c/src/libchip/rtc/m48t08.c
    c/src/libchip/rtc/m48t08.h
    c/src/libchip/rtc/m48t08_reg.c
    c/src/libchip/rtc/m48t08_reg2.c
    c/src/libchip/rtc/m48t08_reg4.c
    c/src/libchip/rtc/m48t08_reg8.c
    c/src/libchip/rtc/rtc.h
    c/src/libchip/rtc/rtcprobe.c
    c/src/libchip/serial/Makefile.in
    c/src/libchip/serial/README
    c/src/libchip/serial/README.mc68681
    c/src/libchip/serial/README.ns16550
    c/src/libchip/serial/README.xr88681
    c/src/libchip/serial/README.z85c30
    c/src/libchip/serial/STATUS
    c/src/libchip/serial/mc68681.c
    c/src/libchip/serial/mc68681.h
    c/src/libchip/serial/mc68681_baud.c
    c/src/libchip/serial/mc68681_p.h
    c/src/libchip/serial/mc68681_reg.c
    c/src/libchip/serial/mc68681_reg2.c
    c/src/libchip/serial/mc68681_reg4.c
    c/src/libchip/serial/mc68681_reg8.c
    c/src/libchip/serial/ns16550.c
    c/src/libchip/serial/ns16550.h
    c/src/libchip/serial/ns16550_p.h
    c/src/libchip/serial/serial.h
    c/src/libchip/serial/serprobe.c
    c/src/libchip/serial/sersupp.h
    c/src/libchip/serial/termios_baud2index.c
    c/src/libchip/serial/termios_baud2num.c
    c/src/libchip/serial/z85c30.c
    c/src/libchip/serial/z85c30.h
    c/src/libchip/serial/z85c30_p.h
    c/src/libchip/serial/z85c30_reg.c
    c/src/libchip/shmdr/README
    c/src/libchip/shmdr/addlq.c
    c/src/libchip/shmdr/cnvpkt.c
    c/src/libchip/shmdr/dump.c
    c/src/libchip/shmdr/fatal.c
    c/src/libchip/shmdr/getlq.c
    c/src/libchip/shmdr/getpkt.c
    c/src/libchip/shmdr/init.c
    c/src/libchip/shmdr/initlq.c
    c/src/libchip/shmdr/intr.c
    c/src/libchip/shmdr/mpci.h
    c/src/libchip/shmdr/mpisr.c
    c/src/libchip/shmdr/poll.c
    c/src/libchip/shmdr/receive.c
    c/src/libchip/shmdr/retpkt.c
    c/src/libchip/shmdr/send.c
    c/src/libchip/shmdr/setckvec.c
    c/src/libchip/shmdr/shm_driver.h
    c/src/libmisc/README
    c/src/libmisc/assoc/Makefile.in
    c/src/libmisc/assoc/assoc.c
    c/src/libmisc/assoc/assoc.h
    c/src/libmisc/cpuuse/Makefile.in
    c/src/libmisc/cpuuse/README
    c/src/libmisc/cpuuse/cpuuse.c
    c/src/libmisc/cpuuse/cpuuse.h
    c/src/libmisc/cpuuse/internal.h
    c/src/libmisc/error/Makefile.in
    c/src/libmisc/error/error.c
    c/src/libmisc/error/error.h
    c/src/libmisc/monitor/Makefile.in
    c/src/libmisc/monitor/README
    c/src/libmisc/monitor/mon-command.c
    c/src/libmisc/monitor/mon-config.c
    c/src/libmisc/monitor/mon-dname.c
    c/src/libmisc/monitor/mon-driver.c
    c/src/libmisc/monitor/mon-extension.c
    c/src/libmisc/monitor/mon-itask.c
    c/src/libmisc/monitor/mon-manager.c
    c/src/libmisc/monitor/mon-monitor.c
    c/src/libmisc/monitor/mon-mpci.c
    c/src/libmisc/monitor/mon-object.c
    c/src/libmisc/monitor/mon-prmisc.c
    c/src/libmisc/monitor/mon-queue.c
    c/src/libmisc/monitor/mon-server.c
    c/src/libmisc/monitor/mon-symbols.c
    c/src/libmisc/monitor/mon-task.c
    c/src/libmisc/monitor/monitor.h
    c/src/libmisc/monitor/symbols.h
    c/src/libmisc/rtmonuse/Makefile.in
    c/src/libmisc/rtmonuse/rtmonuse.c
    c/src/libmisc/rtmonuse/rtmonuse.h
    c/src/libmisc/stackchk/Makefile.in
    c/src/libmisc/stackchk/README
    c/src/libmisc/stackchk/check.c
    c/src/libmisc/stackchk/internal.h
    c/src/libmisc/stackchk/stackchk.h
    c/src/libmisc/wrapup/Makefile.in
    c/src/libnetworking/CHANGELOG
    c/src/libnetworking/Makefile.in
    c/src/libnetworking/README
    c/src/libnetworking/arpa/ftp.h
    c/src/libnetworking/arpa/inet.h
    c/src/libnetworking/arpa/nameser.h
    c/src/libnetworking/arpa/nameser_compat.h
    c/src/libnetworking/arpa/telnet.h
    c/src/libnetworking/bpfilter.h
    c/src/libnetworking/include/Makefile.in
    c/src/libnetworking/kern/Makefile.in
    c/src/libnetworking/kern/kern_subr.c
    c/src/libnetworking/kern/uipc_domain.c
    c/src/libnetworking/kern/uipc_mbuf.c
    c/src/libnetworking/kern/uipc_socket.c
    c/src/libnetworking/kern/uipc_socket2.c
    c/src/libnetworking/lib/Makefile.in
    c/src/libnetworking/lib/README
    c/src/libnetworking/lib/getprotoby.c
    c/src/libnetworking/lib/syslog.c
    c/src/libnetworking/lib/tftpDriver.c
    c/src/libnetworking/libc/Makefile.in
    c/src/libnetworking/libc/addr2ascii.3
    c/src/libnetworking/libc/addr2ascii.c
    c/src/libnetworking/libc/ascii2addr.c
    c/src/libnetworking/libc/base64.c
    c/src/libnetworking/libc/byteorder.3
    c/src/libnetworking/libc/ether_addr.c
    c/src/libnetworking/libc/ethers.3
    c/src/libnetworking/libc/gethostbydns.c
    c/src/libnetworking/libc/gethostbyht.c
    c/src/libnetworking/libc/gethostbyname.3
    c/src/libnetworking/libc/gethostbynis.c
    c/src/libnetworking/libc/gethostnamadr.c
    c/src/libnetworking/libc/gethostname.c
    c/src/libnetworking/libc/getnetbydns.c
    c/src/libnetworking/libc/getnetbyht.c
    c/src/libnetworking/libc/getnetbynis.c
    c/src/libnetworking/libc/getnetent.3
    c/src/libnetworking/libc/getnetnamadr.c
    c/src/libnetworking/libc/getproto.c
    c/src/libnetworking/libc/getprotoent.3
    c/src/libnetworking/libc/getprotoent.c
    c/src/libnetworking/libc/getprotoname.c
    c/src/libnetworking/libc/getservbyname.c
    c/src/libnetworking/libc/getservbyport.c
    c/src/libnetworking/libc/getservent.3
    c/src/libnetworking/libc/getservent.c
    c/src/libnetworking/libc/herror.c
    c/src/libnetworking/libc/inet.3
    c/src/libnetworking/libc/inet_addr.c
    c/src/libnetworking/libc/inet_lnaof.c
    c/src/libnetworking/libc/inet_makeaddr.c
    c/src/libnetworking/libc/inet_net_ntop.c
    c/src/libnetworking/libc/inet_net_pton.c
    c/src/libnetworking/libc/inet_neta.c
    c/src/libnetworking/libc/inet_netof.c
    c/src/libnetworking/libc/inet_network.c
    c/src/libnetworking/libc/inet_ntoa.c
    c/src/libnetworking/libc/inet_ntop.c
    c/src/libnetworking/libc/inet_pton.c
    c/src/libnetworking/libc/iso_addr.3
    c/src/libnetworking/libc/iso_addr.c
    c/src/libnetworking/libc/linkaddr.3
    c/src/libnetworking/libc/linkaddr.c
    c/src/libnetworking/libc/map_v4v6.c
    c/src/libnetworking/libc/ns.3
    c/src/libnetworking/libc/ns_addr.c
    c/src/libnetworking/libc/ns_name.c
    c/src/libnetworking/libc/ns_netint.c
    c/src/libnetworking/libc/ns_ntoa.c
    c/src/libnetworking/libc/ns_parse.c
    c/src/libnetworking/libc/ns_print.c
    c/src/libnetworking/libc/ns_ttl.c
    c/src/libnetworking/libc/nsap_addr.c
    c/src/libnetworking/libc/rcmd.3
    c/src/libnetworking/libc/rcmd.c
    c/src/libnetworking/libc/recv.c
    c/src/libnetworking/libc/res_comp.c
    c/src/libnetworking/libc/res_config.h
    c/src/libnetworking/libc/res_data.c
    c/src/libnetworking/libc/res_debug.c
    c/src/libnetworking/libc/res_init.c
    c/src/libnetworking/libc/res_mkquery.c
    c/src/libnetworking/libc/res_mkupdate.c
    c/src/libnetworking/libc/res_query.c
    c/src/libnetworking/libc/res_send.c
    c/src/libnetworking/libc/res_stubs.c
    c/src/libnetworking/libc/res_update.c
    c/src/libnetworking/libc/resolver.3
    c/src/libnetworking/libc/send.c
    c/src/libnetworking/libc/strsep.c
    c/src/libnetworking/loop.h
    c/src/libnetworking/machine/conf.h
    c/src/libnetworking/machine/cpu.h
    c/src/libnetworking/machine/cpufunc.h
    c/src/libnetworking/machine/endian.h
    c/src/libnetworking/machine/in_cksum.h
    c/src/libnetworking/machine/limits.h
    c/src/libnetworking/machine/param.h
    c/src/libnetworking/machine/types.h
    c/src/libnetworking/machine/vmparam.h
    c/src/libnetworking/net/Makefile.in
    c/src/libnetworking/net/bpf.h
    c/src/libnetworking/net/ethernet.h
    c/src/libnetworking/net/if.c
    c/src/libnetworking/net/if.h
    c/src/libnetworking/net/if_arp.h
    c/src/libnetworking/net/if_dl.h
    c/src/libnetworking/net/if_ethersubr.c
    c/src/libnetworking/net/if_llc.h
    c/src/libnetworking/net/if_loop.c
    c/src/libnetworking/net/if_types.h
    c/src/libnetworking/net/netisr.h
    c/src/libnetworking/net/radix.c
    c/src/libnetworking/net/radix.h
    c/src/libnetworking/net/raw_cb.c
    c/src/libnetworking/net/raw_cb.h
    c/src/libnetworking/net/raw_usrreq.c
    c/src/libnetworking/net/route.c
    c/src/libnetworking/net/route.h
    c/src/libnetworking/net/rtsock.c
    c/src/libnetworking/netdb.h
    c/src/libnetworking/netinet/Makefile.in
    c/src/libnetworking/netinet/icmp_var.h
    c/src/libnetworking/netinet/if_ether.c
    c/src/libnetworking/netinet/if_ether.h
    c/src/libnetworking/netinet/igmp.c
    c/src/libnetworking/netinet/igmp.h
    c/src/libnetworking/netinet/igmp_var.h
    c/src/libnetworking/netinet/in.c
    c/src/libnetworking/netinet/in.h
    c/src/libnetworking/netinet/in_cksum.c
    c/src/libnetworking/netinet/in_cksum_i386.c
    c/src/libnetworking/netinet/in_cksum_m68k.c
    c/src/libnetworking/netinet/in_pcb.c
    c/src/libnetworking/netinet/in_pcb.h
    c/src/libnetworking/netinet/in_proto.c
    c/src/libnetworking/netinet/in_rmx.c
    c/src/libnetworking/netinet/in_systm.h
    c/src/libnetworking/netinet/in_var.h
    c/src/libnetworking/netinet/ip.h
    c/src/libnetworking/netinet/ip_divert.c
    c/src/libnetworking/netinet/ip_fw.c
    c/src/libnetworking/netinet/ip_fw.h
    c/src/libnetworking/netinet/ip_icmp.c
    c/src/libnetworking/netinet/ip_icmp.h
    c/src/libnetworking/netinet/ip_input.c
    c/src/libnetworking/netinet/ip_mroute.c
    c/src/libnetworking/netinet/ip_mroute.h
    c/src/libnetworking/netinet/ip_output.c
    c/src/libnetworking/netinet/ip_var.h
    c/src/libnetworking/netinet/raw_ip.c
    c/src/libnetworking/netinet/tcp.h
    c/src/libnetworking/netinet/tcp_debug.c
    c/src/libnetworking/netinet/tcp_debug.h
    c/src/libnetworking/netinet/tcp_fsm.h
    c/src/libnetworking/netinet/tcp_input.c
    c/src/libnetworking/netinet/tcp_output.c
    c/src/libnetworking/netinet/tcp_seq.h
    c/src/libnetworking/netinet/tcp_subr.c
    c/src/libnetworking/netinet/tcp_timer.c
    c/src/libnetworking/netinet/tcp_timer.h
    c/src/libnetworking/netinet/tcp_usrreq.c
    c/src/libnetworking/netinet/tcp_var.h
    c/src/libnetworking/netinet/tcpip.h
    c/src/libnetworking/netinet/udp.h
    c/src/libnetworking/netinet/udp_usrreq.c
    c/src/libnetworking/netinet/udp_var.h
    c/src/libnetworking/nfs/Makefile.in
    c/src/libnetworking/nfs/bootp_subr.c
    c/src/libnetworking/nfs/krpc.h
    c/src/libnetworking/nfs/nfs.h
    c/src/libnetworking/nfs/nfsdiskless.h
    c/src/libnetworking/nfs/nfsproto.h
    c/src/libnetworking/nfs/rpcv2.h
    c/src/libnetworking/nfs/xdr_subs.h
    c/src/libnetworking/opt_ipfw.h
    c/src/libnetworking/opt_mrouting.h
    c/src/libnetworking/opt_tcpdebug.h
    c/src/libnetworking/poll.h
    c/src/libnetworking/resolv.h
    c/src/libnetworking/rtems/Makefile.in
    c/src/libnetworking/rtems/issetugid.c
    c/src/libnetworking/rtems/rtems_bootp.c
    c/src/libnetworking/rtems/rtems_bsdnet.h
    c/src/libnetworking/rtems/rtems_bsdnet_internal.h
    c/src/libnetworking/rtems/rtems_glue.c
    c/src/libnetworking/rtems/rtems_showicmpstat.c
    c/src/libnetworking/rtems/rtems_showifstat.c
    c/src/libnetworking/rtems/rtems_showipstat.c
    c/src/libnetworking/rtems/rtems_showmbuf.c
    c/src/libnetworking/rtems/rtems_showroute.c
    c/src/libnetworking/rtems/rtems_showtcpstat.c
    c/src/libnetworking/rtems/rtems_showudpstat.c
    c/src/libnetworking/rtems/rtems_syscall.c
    c/src/libnetworking/rtems/sghostname.c
    c/src/libnetworking/rtems/tftp.h
    c/src/libnetworking/sys/buf.h
    c/src/libnetworking/sys/callout.h
    c/src/libnetworking/sys/cdefs.h
    c/src/libnetworking/sys/conf.h
    c/src/libnetworking/sys/domain.h
    c/src/libnetworking/sys/filio.h
    c/src/libnetworking/sys/ioccom.h
    c/src/libnetworking/sys/ioctl.h
    c/src/libnetworking/sys/kernel.h
    c/src/libnetworking/sys/libkern.h
    c/src/libnetworking/sys/malloc.h
    c/src/libnetworking/sys/mbuf.h
    c/src/libnetworking/sys/mount.h
    c/src/libnetworking/sys/param.h
    c/src/libnetworking/sys/proc.h
    c/src/libnetworking/sys/protosw.h
    c/src/libnetworking/sys/queue.h
    c/src/libnetworking/sys/reboot.h
    c/src/libnetworking/sys/resourcevar.h
    c/src/libnetworking/sys/rtprio.h
    c/src/libnetworking/sys/select.h
    c/src/libnetworking/sys/signalvar.h
    c/src/libnetworking/sys/socket.h
    c/src/libnetworking/sys/socketvar.h
    c/src/libnetworking/sys/sockio.h
    c/src/libnetworking/sys/sysctl.h
    c/src/libnetworking/sys/syslimits.h
    c/src/libnetworking/sys/syslog.h
    c/src/libnetworking/sys/systm.h
    c/src/libnetworking/sys/ttycom.h
    c/src/libnetworking/sys/ttydefaults.h
    c/src/libnetworking/sys/ucred.h
    c/src/libnetworking/sys/uio.h
    c/src/libnetworking/syslog.h
    c/src/libnetworking/vm/vm.h
    c/src/libnetworking/vm/vm_extern.h
    c/src/libnetworking/vm/vm_kern.h
    c/src/libnetworking/vm/vm_param.h
    c/src/libnetworking/wrapup/Makefile.in
    c/src/librtems++/README
    c/src/librtems++/include/rtems++/rtemsEvent.h
    c/src/librtems++/include/rtems++/rtemsInterrupt.h
    c/src/librtems++/include/rtems++/rtemsMessageQueue.h
    c/src/librtems++/include/rtems++/rtemsSemaphore.h
    c/src/librtems++/include/rtems++/rtemsStatusCode.h
    c/src/librtems++/include/rtems++/rtemsTask.h
    c/src/librtems++/include/rtems++/rtemsTaskMode.h
    c/src/librtems++/include/rtems++/rtemsTimer.h
    c/src/librtems++/src/Makefile.in
    c/src/librtems++/src/rtemsEvent.cc
    c/src/librtems++/src/rtemsInterrupt.cc
    c/src/librtems++/src/rtemsMessageQueue.cc
    c/src/librtems++/src/rtemsSemaphore.cc
    c/src/librtems++/src/rtemsStatusCode.cc
    c/src/librtems++/src/rtemsTask.cc
    c/src/librtems++/src/rtemsTimer.cc
    c/src/make/README
    c/src/make/compilers/gcc-target-default.cfg
    c/src/make/directory.cfg
    c/src/make/host.cfg.in
    c/src/make/lib.cfg
    c/src/optman/rtems/no-dpmem.c
    c/src/optman/rtems/no-event.c
    c/src/optman/rtems/no-mp.c
    c/src/optman/rtems/no-msg.c
    c/src/optman/rtems/no-part.c
    c/src/optman/rtems/no-region.c
    c/src/optman/rtems/no-rtmon.c
    c/src/optman/rtems/no-sem.c
    c/src/optman/rtems/no-signal.c
    c/src/optman/rtems/no-timer.c
    c/src/optman/sapi/no-ext.c
    c/src/optman/sapi/no-io.c
    c/src/tests/psxtests/include/pmacros.h
    c/src/wrapup/Makefile.in
    cpukit/ada/rtems.adb
    cpukit/ada/rtems.ads
    cpukit/libcsupport/include/chain.h
    cpukit/libcsupport/include/clockdrv.h
    cpukit/libcsupport/include/console.h
    cpukit/libcsupport/include/iosupp.h
    cpukit/libcsupport/include/motorola/mc68230.h
    cpukit/libcsupport/include/motorola/mc68681.h
    cpukit/libcsupport/include/ringbuf.h
    cpukit/libcsupport/include/rtems/assoc.h
    cpukit/libcsupport/include/rtems/error.h
    cpukit/libcsupport/include/rtems/libcsupport.h
    cpukit/libcsupport/include/rtems/libio.h
    cpukit/libcsupport/include/spurious.h
    cpukit/libcsupport/include/sys/filio.h
    cpukit/libcsupport/include/sys/ioctl.h
    cpukit/libcsupport/include/sys/sockio.h
    cpukit/libcsupport/include/sys/termios.h
    cpukit/libcsupport/include/sys/utsname.h
    cpukit/libcsupport/include/timerdrv.h
    cpukit/libcsupport/include/vmeintr.h
    cpukit/libcsupport/include/zilog/z8036.h
    cpukit/libcsupport/include/zilog/z8530.h
    cpukit/libcsupport/include/zilog/z8536.h
    cpukit/libcsupport/src/README
    cpukit/libcsupport/src/__brk.c
    cpukit/libcsupport/src/__gettod.c
    cpukit/libcsupport/src/__times.c
    cpukit/libcsupport/src/assoc.c
    cpukit/libcsupport/src/closedir.c
    cpukit/libcsupport/src/error.c
    cpukit/libcsupport/src/getdents.c
    cpukit/libcsupport/src/hosterr.c
    cpukit/libcsupport/src/libio.c
    cpukit/libcsupport/src/malloc.c
    cpukit/libcsupport/src/newlibc.c
    cpukit/libcsupport/src/no_libc.c
    cpukit/libcsupport/src/opendir.c
    cpukit/libcsupport/src/readdir.c
    cpukit/libcsupport/src/rewinddir.c
    cpukit/libcsupport/src/scandir.c
    cpukit/libcsupport/src/seekdir.c
    cpukit/libcsupport/src/tcdrain.c
    cpukit/libcsupport/src/telldir.c
    cpukit/libcsupport/src/termios.c
    cpukit/libcsupport/src/unixlibc.c
    cpukit/libcsupport/src/utsname.c
    cpukit/libmisc/README
    cpukit/libmisc/cpuuse/README
    cpukit/libmisc/cpuuse/cpuuse.c
    cpukit/libmisc/cpuuse/cpuuse.h
    cpukit/libmisc/monitor/README
    cpukit/libmisc/monitor/mon-command.c
    cpukit/libmisc/monitor/mon-config.c
    cpukit/libmisc/monitor/mon-dname.c
    cpukit/libmisc/monitor/mon-driver.c
    cpukit/libmisc/monitor/mon-extension.c
    cpukit/libmisc/monitor/mon-itask.c
    cpukit/libmisc/monitor/mon-manager.c
    cpukit/libmisc/monitor/mon-monitor.c
    cpukit/libmisc/monitor/mon-mpci.c
    cpukit/libmisc/monitor/mon-object.c
    cpukit/libmisc/monitor/mon-prmisc.c
    cpukit/libmisc/monitor/mon-queue.c
    cpukit/libmisc/monitor/mon-server.c
    cpukit/libmisc/monitor/mon-symbols.c
    cpukit/libmisc/monitor/mon-task.c
    cpukit/libmisc/monitor/monitor.h
    cpukit/libmisc/monitor/symbols.h
    cpukit/libmisc/rtmonuse/rtmonuse.c
    cpukit/libmisc/rtmonuse/rtmonuse.h
    cpukit/libmisc/stackchk/README
    cpukit/libmisc/stackchk/check.c
    cpukit/libmisc/stackchk/internal.h
    cpukit/libmisc/stackchk/stackchk.h
    cpukit/libnetworking/README
    cpukit/libnetworking/arpa/ftp.h
    cpukit/libnetworking/arpa/inet.h
    cpukit/libnetworking/arpa/nameser.h
    cpukit/libnetworking/arpa/nameser_compat.h
    cpukit/libnetworking/arpa/telnet.h
    cpukit/libnetworking/bpfilter.h
    cpukit/libnetworking/kern/kern_subr.c
    cpukit/libnetworking/kern/uipc_domain.c
    cpukit/libnetworking/kern/uipc_mbuf.c
    cpukit/libnetworking/kern/uipc_socket.c
    cpukit/libnetworking/kern/uipc_socket2.c
    cpukit/libnetworking/lib/README
    cpukit/libnetworking/lib/getprotoby.c
    cpukit/libnetworking/lib/syslog.c
    cpukit/libnetworking/lib/tftpDriver.c
    cpukit/libnetworking/libc/addr2ascii.3
    cpukit/libnetworking/libc/addr2ascii.c
    cpukit/libnetworking/libc/ascii2addr.c
    cpukit/libnetworking/libc/base64.c
    cpukit/libnetworking/libc/byteorder.3
    cpukit/libnetworking/libc/ether_addr.c
    cpukit/libnetworking/libc/ethers.3
    cpukit/libnetworking/libc/gethostbydns.c
    cpukit/libnetworking/libc/gethostbyht.c
    cpukit/libnetworking/libc/gethostbyname.3
    cpukit/libnetworking/libc/gethostbynis.c
    cpukit/libnetworking/libc/gethostnamadr.c
    cpukit/libnetworking/libc/gethostname.c
    cpukit/libnetworking/libc/getnetbydns.c
    cpukit/libnetworking/libc/getnetbyht.c
    cpukit/libnetworking/libc/getnetbynis.c
    cpukit/libnetworking/libc/getnetent.3
    cpukit/libnetworking/libc/getnetnamadr.c
    cpukit/libnetworking/libc/getproto.c
    cpukit/libnetworking/libc/getprotoent.3
    cpukit/libnetworking/libc/getprotoent.c
    cpukit/libnetworking/libc/getprotoname.c
    cpukit/libnetworking/libc/getservbyname.c
    cpukit/libnetworking/libc/getservbyport.c
    cpukit/libnetworking/libc/getservent.3
    cpukit/libnetworking/libc/getservent.c
    cpukit/libnetworking/libc/herror.c
    cpukit/libnetworking/libc/inet.3
    cpukit/libnetworking/libc/inet_addr.c
    cpukit/libnetworking/libc/inet_lnaof.c
    cpukit/libnetworking/libc/inet_makeaddr.c
    cpukit/libnetworking/libc/inet_net_ntop.c
    cpukit/libnetworking/libc/inet_net_pton.c
    cpukit/libnetworking/libc/inet_neta.c
    cpukit/libnetworking/libc/inet_netof.c
    cpukit/libnetworking/libc/inet_network.c
    cpukit/libnetworking/libc/inet_ntoa.c
    cpukit/libnetworking/libc/inet_ntop.c
    cpukit/libnetworking/libc/inet_pton.c
    cpukit/libnetworking/libc/iso_addr.3
    cpukit/libnetworking/libc/iso_addr.c
    cpukit/libnetworking/libc/linkaddr.3
    cpukit/libnetworking/libc/linkaddr.c
    cpukit/libnetworking/libc/map_v4v6.c
    cpukit/libnetworking/libc/ns.3
    cpukit/libnetworking/libc/ns_addr.c
    cpukit/libnetworking/libc/ns_name.c
    cpukit/libnetworking/libc/ns_netint.c
    cpukit/libnetworking/libc/ns_ntoa.c
    cpukit/libnetworking/libc/ns_parse.c
    cpukit/libnetworking/libc/ns_print.c
    cpukit/libnetworking/libc/ns_ttl.c
    cpukit/libnetworking/libc/nsap_addr.c
    cpukit/libnetworking/libc/rcmd.3
    cpukit/libnetworking/libc/rcmd.c
    cpukit/libnetworking/libc/recv.c
    cpukit/libnetworking/libc/res_comp.c
    cpukit/libnetworking/libc/res_config.h
    cpukit/libnetworking/libc/res_data.c
    cpukit/libnetworking/libc/res_debug.c
    cpukit/libnetworking/libc/res_init.c
    cpukit/libnetworking/libc/res_mkquery.c
    cpukit/libnetworking/libc/res_mkupdate.c
    cpukit/libnetworking/libc/res_query.c
    cpukit/libnetworking/libc/res_send.c
    cpukit/libnetworking/libc/res_stubs.c
    cpukit/libnetworking/libc/res_update.c
    cpukit/libnetworking/libc/resolver.3
    cpukit/libnetworking/libc/send.c
    cpukit/libnetworking/libc/strsep.c
    cpukit/libnetworking/loop.h
    cpukit/libnetworking/machine/conf.h
    cpukit/libnetworking/machine/cpu.h
    cpukit/libnetworking/machine/cpufunc.h
    cpukit/libnetworking/machine/endian.h
    cpukit/libnetworking/machine/in_cksum.h
    cpukit/libnetworking/machine/limits.h
    cpukit/libnetworking/machine/param.h
    cpukit/libnetworking/machine/types.h
    cpukit/libnetworking/machine/vmparam.h
    cpukit/libnetworking/net/bpf.h
    cpukit/libnetworking/net/ethernet.h
    cpukit/libnetworking/net/if.c
    cpukit/libnetworking/net/if.h
    cpukit/libnetworking/net/if_arp.h
    cpukit/libnetworking/net/if_dl.h
    cpukit/libnetworking/net/if_ethersubr.c
    cpukit/libnetworking/net/if_llc.h
    cpukit/libnetworking/net/if_loop.c
    cpukit/libnetworking/net/if_types.h
    cpukit/libnetworking/net/netisr.h
    cpukit/libnetworking/net/radix.c
    cpukit/libnetworking/net/radix.h
    cpukit/libnetworking/net/raw_cb.c
    cpukit/libnetworking/net/raw_cb.h
    cpukit/libnetworking/net/raw_usrreq.c
    cpukit/libnetworking/net/route.c
    cpukit/libnetworking/net/route.h
    cpukit/libnetworking/net/rtsock.c
    cpukit/libnetworking/netdb.h
    cpukit/libnetworking/netinet/icmp_var.h
    cpukit/libnetworking/netinet/if_ether.c
    cpukit/libnetworking/netinet/if_ether.h
    cpukit/libnetworking/netinet/igmp.c
    cpukit/libnetworking/netinet/igmp.h
    cpukit/libnetworking/netinet/igmp_var.h
    cpukit/libnetworking/netinet/in.c
    cpukit/libnetworking/netinet/in.h
    cpukit/libnetworking/netinet/in_cksum.c
    cpukit/libnetworking/netinet/in_cksum_i386.c
    cpukit/libnetworking/netinet/in_cksum_i386.h
    cpukit/libnetworking/netinet/in_cksum_m68k.c
    cpukit/libnetworking/netinet/in_cksum_m68k.h
    cpukit/libnetworking/netinet/in_pcb.c
    cpukit/libnetworking/netinet/in_pcb.h
    cpukit/libnetworking/netinet/in_proto.c
    cpukit/libnetworking/netinet/in_rmx.c
    cpukit/libnetworking/netinet/in_systm.h
    cpukit/libnetworking/netinet/in_var.h
    cpukit/libnetworking/netinet/ip.h
    cpukit/libnetworking/netinet/ip_divert.c
    cpukit/libnetworking/netinet/ip_fw.c
    cpukit/libnetworking/netinet/ip_fw.h
    cpukit/libnetworking/netinet/ip_icmp.c
    cpukit/libnetworking/netinet/ip_icmp.h
    cpukit/libnetworking/netinet/ip_input.c
    cpukit/libnetworking/netinet/ip_mroute.c
    cpukit/libnetworking/netinet/ip_mroute.h
    cpukit/libnetworking/netinet/ip_output.c
    cpukit/libnetworking/netinet/ip_var.h
    cpukit/libnetworking/netinet/raw_ip.c
    cpukit/libnetworking/netinet/tcp.h
    cpukit/libnetworking/netinet/tcp_debug.c
    cpukit/libnetworking/netinet/tcp_debug.h
    cpukit/libnetworking/netinet/tcp_fsm.h
    cpukit/libnetworking/netinet/tcp_input.c
    cpukit/libnetworking/netinet/tcp_output.c
    cpukit/libnetworking/netinet/tcp_seq.h
    cpukit/libnetworking/netinet/tcp_subr.c
    cpukit/libnetworking/netinet/tcp_timer.c
    cpukit/libnetworking/netinet/tcp_timer.h
    cpukit/libnetworking/netinet/tcp_usrreq.c
    cpukit/libnetworking/netinet/tcp_var.h
    cpukit/libnetworking/netinet/tcpip.h
    cpukit/libnetworking/netinet/udp.h
    cpukit/libnetworking/netinet/udp_usrreq.c
    cpukit/libnetworking/netinet/udp_var.h
    cpukit/libnetworking/nfs/bootp_subr.c
    cpukit/libnetworking/nfs/krpc.h
    cpukit/libnetworking/nfs/nfs.h
    cpukit/libnetworking/nfs/nfsdiskless.h
    cpukit/libnetworking/nfs/nfsproto.h
    cpukit/libnetworking/nfs/rpcv2.h
    cpukit/libnetworking/nfs/xdr_subs.h
    cpukit/libnetworking/opt_ipfw.h
    cpukit/libnetworking/opt_mrouting.h
    cpukit/libnetworking/opt_tcpdebug.h
    cpukit/libnetworking/poll.h
    cpukit/libnetworking/resolv.h
    cpukit/libnetworking/rtems/issetugid.c
    cpukit/libnetworking/rtems/rtems_bootp.c
    cpukit/libnetworking/rtems/rtems_bsdnet.h
    cpukit/libnetworking/rtems/rtems_bsdnet_internal.h
    cpukit/libnetworking/rtems/rtems_glue.c
    cpukit/libnetworking/rtems/rtems_showicmpstat.c
    cpukit/libnetworking/rtems/rtems_showifstat.c
    cpukit/libnetworking/rtems/rtems_showipstat.c
    cpukit/libnetworking/rtems/rtems_showmbuf.c
    cpukit/libnetworking/rtems/rtems_showroute.c
    cpukit/libnetworking/rtems/rtems_showtcpstat.c
    cpukit/libnetworking/rtems/rtems_showudpstat.c
    cpukit/libnetworking/rtems/rtems_syscall.c
    cpukit/libnetworking/rtems/sghostname.c
    cpukit/libnetworking/rtems/tftp.h
    cpukit/libnetworking/sys/buf.h
    cpukit/libnetworking/sys/callout.h
    cpukit/libnetworking/sys/conf.h
    cpukit/libnetworking/sys/domain.h
    cpukit/libnetworking/sys/kernel.h
    cpukit/libnetworking/sys/libkern.h
    cpukit/libnetworking/sys/malloc.h
    cpukit/libnetworking/sys/mbuf.h
    cpukit/libnetworking/sys/mount.h
    cpukit/libnetworking/sys/param.h
    cpukit/libnetworking/sys/proc.h
    cpukit/libnetworking/sys/protosw.h
    cpukit/libnetworking/sys/queue.h
    cpukit/libnetworking/sys/reboot.h
    cpukit/libnetworking/sys/resourcevar.h
    cpukit/libnetworking/sys/rtprio.h
    cpukit/libnetworking/sys/select.h
    cpukit/libnetworking/sys/signalvar.h
    cpukit/libnetworking/sys/socket.h
    cpukit/libnetworking/sys/socketvar.h
    cpukit/libnetworking/sys/sysctl.h
    cpukit/libnetworking/sys/syslimits.h
    cpukit/libnetworking/sys/syslog.h
    cpukit/libnetworking/sys/systm.h
    cpukit/libnetworking/sys/ttydefaults.h
    cpukit/libnetworking/sys/ucred.h
    cpukit/libnetworking/sys/uio.h
    cpukit/libnetworking/syslog.h
    cpukit/libnetworking/vm/vm.h
    cpukit/libnetworking/vm/vm_extern.h
    cpukit/libnetworking/vm/vm_kern.h
    cpukit/libnetworking/vm/vm_param.h
    cpukit/posix/include/aio.h
    cpukit/posix/include/devctl.h
    cpukit/posix/include/intr.h
    cpukit/posix/include/mqueue.h
    cpukit/posix/include/rtems/posix/cancel.h
    cpukit/posix/include/rtems/posix/cond.h
    cpukit/posix/include/rtems/posix/condmp.h
    cpukit/posix/include/rtems/posix/config.h
    cpukit/posix/include/rtems/posix/intr.h
    cpukit/posix/include/rtems/posix/key.h
    cpukit/posix/include/rtems/posix/mqueue.h
    cpukit/posix/include/rtems/posix/mqueuemp.h
    cpukit/posix/include/rtems/posix/mutex.h
    cpukit/posix/include/rtems/posix/mutexmp.h
    cpukit/posix/include/rtems/posix/posixapi.h
    cpukit/posix/include/rtems/posix/priority.h
    cpukit/posix/include/rtems/posix/psignal.h
    cpukit/posix/include/rtems/posix/pthread.h
    cpukit/posix/include/rtems/posix/pthreadmp.h
    cpukit/posix/include/rtems/posix/semaphore.h
    cpukit/posix/include/rtems/posix/semaphoremp.h
    cpukit/posix/include/rtems/posix/threadsup.h
    cpukit/posix/include/rtems/posix/time.h
    cpukit/posix/include/sched.h
    cpukit/posix/include/semaphore.h
    cpukit/posix/inline/rtems/posix/cond.inl
    cpukit/posix/inline/rtems/posix/intr.inl
    cpukit/posix/inline/rtems/posix/key.inl
    cpukit/posix/inline/rtems/posix/mqueue.inl
    cpukit/posix/inline/rtems/posix/mutex.inl
    cpukit/posix/inline/rtems/posix/priority.inl
    cpukit/posix/inline/rtems/posix/pthread.inl
    cpukit/posix/inline/rtems/posix/semaphore.inl
    cpukit/posix/src/adasupp.c
    cpukit/posix/src/aio.c
    cpukit/posix/src/cancel.c
    cpukit/posix/src/cond.c
    cpukit/posix/src/devctl.c
    cpukit/posix/src/execl.c
    cpukit/posix/src/execle.c
    cpukit/posix/src/execlp.c
    cpukit/posix/src/execv.c
    cpukit/posix/src/execve.c
    cpukit/posix/src/execvp.c
    cpukit/posix/src/fork.c
    cpukit/posix/src/getpid.c
    cpukit/posix/src/intr.c
    cpukit/posix/src/key.c
    cpukit/posix/src/mqueue.c
    cpukit/posix/src/mutex.c
    cpukit/posix/src/psignal.c
    cpukit/posix/src/pthread.c
    cpukit/posix/src/pthreadatfork.c
    cpukit/posix/src/ptimer.c
    cpukit/posix/src/sched.c
    cpukit/posix/src/semaphore.c
    cpukit/posix/src/time.c
    cpukit/posix/src/types.c
    cpukit/posix/src/wait.c
    cpukit/posix/src/waitpid.c
    cpukit/rtems/include/rtems.h
    cpukit/rtems/include/rtems/rtems/asr.h
    cpukit/rtems/include/rtems/rtems/attr.h
    cpukit/rtems/include/rtems/rtems/clock.h
    cpukit/rtems/include/rtems/rtems/config.h
    cpukit/rtems/include/rtems/rtems/dpmem.h
    cpukit/rtems/include/rtems/rtems/event.h
    cpukit/rtems/include/rtems/rtems/eventmp.h
    cpukit/rtems/include/rtems/rtems/eventset.h
    cpukit/rtems/include/rtems/rtems/intr.h
    cpukit/rtems/include/rtems/rtems/message.h
    cpukit/rtems/include/rtems/rtems/modes.h
    cpukit/rtems/include/rtems/rtems/mp.h
    cpukit/rtems/include/rtems/rtems/msgmp.h
    cpukit/rtems/include/rtems/rtems/options.h
    cpukit/rtems/include/rtems/rtems/part.h
    cpukit/rtems/include/rtems/rtems/partmp.h
    cpukit/rtems/include/rtems/rtems/ratemon.h
    cpukit/rtems/include/rtems/rtems/region.h
    cpukit/rtems/include/rtems/rtems/regionmp.h
    cpukit/rtems/include/rtems/rtems/rtemsapi.h
    cpukit/rtems/include/rtems/rtems/sem.h
    cpukit/rtems/include/rtems/rtems/semmp.h
    cpukit/rtems/include/rtems/rtems/signal.h
    cpukit/rtems/include/rtems/rtems/signalmp.h
    cpukit/rtems/include/rtems/rtems/status.h
    cpukit/rtems/include/rtems/rtems/support.h
    cpukit/rtems/include/rtems/rtems/taskmp.h
    cpukit/rtems/include/rtems/rtems/tasks.h
    cpukit/rtems/include/rtems/rtems/timer.h
    cpukit/rtems/include/rtems/rtems/types.h
    cpukit/rtems/inline/rtems/rtems/asr.inl
    cpukit/rtems/inline/rtems/rtems/attr.inl
    cpukit/rtems/inline/rtems/rtems/dpmem.inl
    cpukit/rtems/inline/rtems/rtems/event.inl
    cpukit/rtems/inline/rtems/rtems/eventset.inl
    cpukit/rtems/inline/rtems/rtems/message.inl
    cpukit/rtems/inline/rtems/rtems/modes.inl
    cpukit/rtems/inline/rtems/rtems/options.inl
    cpukit/rtems/inline/rtems/rtems/part.inl
    cpukit/rtems/inline/rtems/rtems/ratemon.inl
    cpukit/rtems/inline/rtems/rtems/region.inl
    cpukit/rtems/inline/rtems/rtems/sem.inl
    cpukit/rtems/inline/rtems/rtems/status.inl
    cpukit/rtems/inline/rtems/rtems/support.inl
    cpukit/rtems/inline/rtems/rtems/tasks.inl
    cpukit/rtems/inline/rtems/rtems/timer.inl
    cpukit/rtems/macros/rtems/rtems/asr.inl
    cpukit/rtems/macros/rtems/rtems/attr.inl
    cpukit/rtems/macros/rtems/rtems/dpmem.inl
    cpukit/rtems/macros/rtems/rtems/event.inl
    cpukit/rtems/macros/rtems/rtems/eventset.inl
    cpukit/rtems/macros/rtems/rtems/message.inl
    cpukit/rtems/macros/rtems/rtems/modes.inl
    cpukit/rtems/macros/rtems/rtems/options.inl
    cpukit/rtems/macros/rtems/rtems/part.inl
    cpukit/rtems/macros/rtems/rtems/ratemon.inl
    cpukit/rtems/macros/rtems/rtems/region.inl
    cpukit/rtems/macros/rtems/rtems/sem.inl
    cpukit/rtems/macros/rtems/rtems/status.inl
    cpukit/rtems/macros/rtems/rtems/support.inl
    cpukit/rtems/macros/rtems/rtems/tasks.inl
    cpukit/rtems/macros/rtems/rtems/timer.inl
    cpukit/rtems/src/attr.c
    cpukit/rtems/src/dpmem.c
    cpukit/rtems/src/event.c
    cpukit/rtems/src/eventmp.c
    cpukit/rtems/src/intr.c
    cpukit/rtems/src/intrbody.c
    cpukit/rtems/src/mp.c
    cpukit/rtems/src/msg.c
    cpukit/rtems/src/msgmp.c
    cpukit/rtems/src/part.c
    cpukit/rtems/src/partmp.c
    cpukit/rtems/src/ratemon.c
    cpukit/rtems/src/region.c
    cpukit/rtems/src/regionmp.c
    cpukit/rtems/src/rtclock.c
    cpukit/rtems/src/rtemstimer.c
    cpukit/rtems/src/sem.c
    cpukit/rtems/src/semmp.c
    cpukit/rtems/src/signal.c
    cpukit/rtems/src/signalmp.c
    cpukit/rtems/src/taskmp.c
    cpukit/rtems/src/tasks.c
    cpukit/sapi/include/confdefs.h
    cpukit/sapi/include/rtems/README
    cpukit/sapi/include/rtems/config.h
    cpukit/sapi/include/rtems/extension.h
    cpukit/sapi/include/rtems/fatal.h
    cpukit/sapi/include/rtems/init.h
    cpukit/sapi/include/rtems/io.h
    cpukit/sapi/include/rtems/mptables.h
    cpukit/sapi/inline/rtems/extension.inl
    cpukit/sapi/macros/rtems/extension.inl
    cpukit/sapi/src/debug.c
    cpukit/sapi/src/exinit.c
    cpukit/sapi/src/extension.c
    cpukit/sapi/src/fatal.c
    cpukit/sapi/src/io.c
    cpukit/sapi/src/posixapi.c
    cpukit/sapi/src/rtemsapi.c
    cpukit/score/cpu/a29k/amd.ah
    cpukit/score/cpu/a29k/asm.h
    cpukit/score/cpu/a29k/cpu.c
    cpukit/score/cpu/a29k/pswmacro.ah
    cpukit/score/cpu/a29k/register.ah
    cpukit/score/cpu/hppa1.1/cpu.c
    cpukit/score/cpu/i386/asm.h
    cpukit/score/cpu/i386/cpu.c
    cpukit/score/cpu/i386/rtems/asm.h
    cpukit/score/cpu/i960/asm.h
    cpukit/score/cpu/i960/cpu.c
    cpukit/score/cpu/m68k/asm.h
    cpukit/score/cpu/m68k/cpu.c
    cpukit/score/cpu/m68k/m68302.h
    cpukit/score/cpu/m68k/m68360.h
    cpukit/score/cpu/m68k/memcpy.c
    cpukit/score/cpu/m68k/qsm.h
    cpukit/score/cpu/m68k/rtems/asm.h
    cpukit/score/cpu/m68k/rtems/m68k/m68302.h
    cpukit/score/cpu/m68k/rtems/m68k/m68360.h
    cpukit/score/cpu/m68k/rtems/m68k/qsm.h
    cpukit/score/cpu/m68k/rtems/m68k/sim.h
    cpukit/score/cpu/m68k/sim.h
    cpukit/score/cpu/mips/asm.h
    cpukit/score/cpu/mips/cpu.c
    cpukit/score/cpu/mips/cpu_asm.S
    cpukit/score/cpu/mips/idtcpu.h
    cpukit/score/cpu/mips/iregdef.h
    cpukit/score/cpu/mips/rtems/asm.h
    cpukit/score/cpu/mips/rtems/mips/idtcpu.h
    cpukit/score/cpu/mips/rtems/mips/iregdef.h
    cpukit/score/cpu/mips64orion/asm.h
    cpukit/score/cpu/mips64orion/cpu.c
    cpukit/score/cpu/mips64orion/cpu_asm.S
    cpukit/score/cpu/mips64orion/cpu_asm.h
    cpukit/score/cpu/mips64orion/idtcpu.h
    cpukit/score/cpu/mips64orion/idtmon.h
    cpukit/score/cpu/mips64orion/iregdef.h
    cpukit/score/cpu/no_cpu/asm.h
    cpukit/score/cpu/no_cpu/cpu.c
    cpukit/score/cpu/no_cpu/cpu_asm.c
    cpukit/score/cpu/no_cpu/rtems/asm.h
    cpukit/score/cpu/sh/asm.h
    cpukit/score/cpu/sh/cpu.c
    cpukit/score/cpu/sh/rtems/asm.h
    cpukit/score/cpu/sparc/README
    cpukit/score/cpu/sparc/asm.h
    cpukit/score/cpu/sparc/cpu.c
    cpukit/score/cpu/sparc/rtems/asm.h
    cpukit/score/cpu/unix/cpu.c
    cpukit/score/include/rtems/debug.h
    cpukit/score/include/rtems/score/address.h
    cpukit/score/include/rtems/score/apiext.h
    cpukit/score/include/rtems/score/bitfield.h
    cpukit/score/include/rtems/score/chain.h
    cpukit/score/include/rtems/score/context.h
    cpukit/score/include/rtems/score/copyrt.h
    cpukit/score/include/rtems/score/coremsg.h
    cpukit/score/include/rtems/score/coremutex.h
    cpukit/score/include/rtems/score/coresem.h
    cpukit/score/include/rtems/score/heap.h
    cpukit/score/include/rtems/score/interr.h
    cpukit/score/include/rtems/score/isr.h
    cpukit/score/include/rtems/score/mpci.h
    cpukit/score/include/rtems/score/mppkt.h
    cpukit/score/include/rtems/score/object.h
    cpukit/score/include/rtems/score/objectmp.h
    cpukit/score/include/rtems/score/priority.h
    cpukit/score/include/rtems/score/stack.h
    cpukit/score/include/rtems/score/states.h
    cpukit/score/include/rtems/score/sysstate.h
    cpukit/score/include/rtems/score/thread.h
    cpukit/score/include/rtems/score/threadmp.h
    cpukit/score/include/rtems/score/threadq.h
    cpukit/score/include/rtems/score/tod.h
    cpukit/score/include/rtems/score/tqdata.h
    cpukit/score/include/rtems/score/userext.h
    cpukit/score/include/rtems/score/watchdog.h
    cpukit/score/include/rtems/score/wkspace.h
    cpukit/score/include/rtems/system.h
    cpukit/score/inline/rtems/score/address.inl
    cpukit/score/inline/rtems/score/chain.inl
    cpukit/score/inline/rtems/score/coremsg.inl
    cpukit/score/inline/rtems/score/coremutex.inl
    cpukit/score/inline/rtems/score/coresem.inl
    cpukit/score/inline/rtems/score/heap.inl
    cpukit/score/inline/rtems/score/isr.inl
    cpukit/score/inline/rtems/score/mppkt.inl
    cpukit/score/inline/rtems/score/object.inl
    cpukit/score/inline/rtems/score/objectmp.inl
    cpukit/score/inline/rtems/score/priority.inl
    cpukit/score/inline/rtems/score/stack.inl
    cpukit/score/inline/rtems/score/states.inl
    cpukit/score/inline/rtems/score/sysstate.inl
    cpukit/score/inline/rtems/score/thread.inl
    cpukit/score/inline/rtems/score/threadmp.inl
    cpukit/score/inline/rtems/score/tod.inl
    cpukit/score/inline/rtems/score/tqdata.inl
    cpukit/score/inline/rtems/score/userext.inl
    cpukit/score/inline/rtems/score/watchdog.inl
    cpukit/score/inline/rtems/score/wkspace.inl
    cpukit/score/macros/README
    cpukit/score/macros/rtems/score/README
    cpukit/score/macros/rtems/score/address.inl
    cpukit/score/macros/rtems/score/chain.inl
    cpukit/score/macros/rtems/score/coremsg.inl
    cpukit/score/macros/rtems/score/coremutex.inl
    cpukit/score/macros/rtems/score/coresem.inl
    cpukit/score/macros/rtems/score/heap.inl
    cpukit/score/macros/rtems/score/isr.inl
    cpukit/score/macros/rtems/score/mppkt.inl
    cpukit/score/macros/rtems/score/object.inl
    cpukit/score/macros/rtems/score/objectmp.inl
    cpukit/score/macros/rtems/score/priority.inl
    cpukit/score/macros/rtems/score/stack.inl
    cpukit/score/macros/rtems/score/states.inl
    cpukit/score/macros/rtems/score/sysstate.inl
    cpukit/score/macros/rtems/score/thread.inl
    cpukit/score/macros/rtems/score/threadmp.inl
    cpukit/score/macros/rtems/score/tod.inl
    cpukit/score/macros/rtems/score/tqdata.inl
    cpukit/score/macros/rtems/score/userext.inl
    cpukit/score/macros/rtems/score/watchdog.inl
    cpukit/score/macros/rtems/score/wkspace.inl
    cpukit/score/src/apiext.c
    cpukit/score/src/chain.c
    cpukit/score/src/coremsg.c
    cpukit/score/src/coremutex.c
    cpukit/score/src/coresem.c
    cpukit/score/src/coretod.c
    cpukit/score/src/heap.c
    cpukit/score/src/interr.c
    cpukit/score/src/isr.c
    cpukit/score/src/mpci.c
    cpukit/score/src/object.c
    cpukit/score/src/objectmp.c
    cpukit/score/src/thread.c
    cpukit/score/src/threadmp.c
    cpukit/score/src/threadq.c
    cpukit/score/src/userext.c
    cpukit/score/src/watchdog.c
    cpukit/score/src/wkspace.c
    cpukit/zlib/doc/rfc1950.txt
    cpukit/zlib/doc/rfc1951.txt
    cpukit/zlib/doc/rfc1952.txt
    doc/HELP.html
    doc/Make.config
    doc/Makefile
    doc/README
    doc/TODO
    doc/ada_user/Makefile
    doc/ada_user/ada_user.texi
    doc/ada_user/example.texi
    doc/archgrey.gif
    doc/bsp_howto/Makefile
    doc/bsp_howto/analog.t
    doc/bsp_howto/bsp_howto.texi
    doc/bsp_howto/clock.t
    doc/bsp_howto/console.t
    doc/bsp_howto/discrete.t
    doc/bsp_howto/init.t
    doc/bsp_howto/intro.t
    doc/bsp_howto/linkcmds.t
    doc/bsp_howto/makefiles.t
    doc/bsp_howto/network.t
    doc/bsp_howto/nvmem.t
    doc/bsp_howto/rtc.t
    doc/bsp_howto/shmsupp.t
    doc/bsp_howto/support.t
    doc/bsp_howto/target.t
    doc/bsp_howto/timer.t
    doc/common/cpright.texi
    doc/common/oaronly.jpg
    doc/common/setup.texi
    doc/common/timemac.texi
    doc/common/timetbl.t
    doc/common/timing.t
    doc/common/treedef.tex
    doc/common/up-arrow.gif
    doc/common/wksheets.t
    doc/develenv/Makefile
    doc/develenv/compile.texi
    doc/develenv/develenv.texi
    doc/develenv/direct.texi
    doc/develenv/intro.texi
    doc/develenv/sample.texi
    doc/develenv/utils.texi
    doc/do_docs
    doc/index.html
    doc/networking/Makefile
    doc/networking/driver.t
    doc/networking/networkapp.t
    doc/networking/networking.eps
    doc/networking/networking.gif
    doc/networking/networking.texi
    doc/networking/networktasks.t
    doc/networking/preface.texi
    doc/networking/testing.t
    doc/new_chapters/Makefile
    doc/new_chapters/STATUS
    doc/new_chapters/adminiface.t
    doc/new_chapters/base.t
    doc/new_chapters/cancel.t
    doc/new_chapters/clock.t
    doc/new_chapters/cond.t
    doc/new_chapters/confspace.t
    doc/new_chapters/cspecific.t
    doc/new_chapters/device.t
    doc/new_chapters/dumpcontrol.t
    doc/new_chapters/eventlog.t
    doc/new_chapters/files.t
    doc/new_chapters/gen_section
    doc/new_chapters/io.t
    doc/new_chapters/key.t
    doc/new_chapters/memorymgmt.t
    doc/new_chapters/message.t
    doc/new_chapters/mutex.t
    doc/new_chapters/posix_users.texi
    doc/new_chapters/preface.texi
    doc/new_chapters/procenv.t
    doc/new_chapters/process.t
    doc/new_chapters/sched.t
    doc/new_chapters/semaphores.t
    doc/new_chapters/signal.t
    doc/new_chapters/systemdb.t
    doc/new_chapters/thread.t
    doc/oaronly.jpg
    doc/posix1003.1/Makefile
    doc/posix1003.1/ch01.t
    doc/posix1003.1/ch02.t
    doc/posix1003.1/ch03.t
    doc/posix1003.1/ch04.t
    doc/posix1003.1/ch05.t
    doc/posix1003.1/ch06.t
    doc/posix1003.1/ch07.t
    doc/posix1003.1/ch08.t
    doc/posix1003.1/ch09.t
    doc/posix1003.1/ch10.t
    doc/posix1003.1/ch11.t
    doc/posix1003.1/ch12.t
    doc/posix1003.1/ch13.t
    doc/posix1003.1/ch14.t
    doc/posix1003.1/ch15.t
    doc/posix1003.1/ch16.t
    doc/posix1003.1/ch17.t
    doc/posix1003.1/ch18.t
    doc/posix1003.1/posix1003_1.texi
    doc/posix1003.1/preface.texi
    doc/posix1003.1/summarize
    doc/posix_users/Makefile
    doc/posix_users/base.texi
    doc/posix_users/clock.texi
    doc/posix_users/cond.texi
    doc/posix_users/key.texi
    doc/posix_users/mutex.texi
    doc/posix_users/posix_users.texi
    doc/posix_users/preface.texi
    doc/posix_users/sched.texi
    doc/posix_users/signal.texi
    doc/posix_users/thread.texi
    doc/relnotes/Makefile
    doc/relnotes/install.texi
    doc/relnotes/intro.texi
    doc/relnotes/probrep.texi
    doc/relnotes/relnotes.texi
    doc/relnotes/status.texi
    doc/rtems_footer.html
    doc/rtems_header.html
    doc/rtems_support.html
    doc/src2html/Makefile
    doc/src2html/RTEMS.test
    doc/started/Makefile
    doc/started/buildc.t
    doc/started/buildrt.t
    doc/started/gdb.t
    doc/started/intro.t
    doc/started/nt.t
    doc/started/pictures/bit_ada.jpg
    doc/started/pictures/bit_ada.vsd
    doc/started/pictures/bit_c.jpg
    doc/started/pictures/bit_c.vsd
    doc/started/pictures/scfile10.jpg
    doc/started/pictures/scfile10.vsd
    doc/started/pictures/scfile11.jpg
    doc/started/pictures/scfile11.vsd
    doc/started/pictures/scfile12.jpg
    doc/started/pictures/scfile12.vsd
    doc/started/pictures/scfile13.jpg
    doc/started/pictures/scfile13.vsd
    doc/started/pictures/scsfile1.jpg
    doc/started/pictures/scsfile1.vsd
    doc/started/pictures/scsfile2.jpg
    doc/started/pictures/scsfile2.vsd
    doc/started/pictures/scsfile3.jpg
    doc/started/pictures/scsfile3.vsd
    doc/started/pictures/scsfile4.jpg
    doc/started/pictures/scsfile4.vsd
    doc/started/pictures/scsfile5.jpg
    doc/started/pictures/scsfile5.vsd
    doc/started/pictures/scsfile6.jpg
    doc/started/pictures/scsfile6.vsd
    doc/started/pictures/scsfile7.jpg
    doc/started/pictures/scsfile7.vsd
    doc/started/pictures/scsfile8.jpg
    doc/started/pictures/scsfile8.vsd
    doc/started/pictures/scsfile9.jpg
    doc/started/pictures/scsfile9.vsd
    doc/started/pictures/sfile12c.jpg
    doc/started/pictures/sfile12c.vsd
    doc/started/require.t
    doc/started/sample.t
    doc/started/started.texi
    doc/started/versions.texi
    doc/started_ada/Makefile
    doc/started_ada/buildada.t
    doc/started_ada/buildrt.t
    doc/started_ada/gdb.t
    doc/started_ada/intro.t
    doc/started_ada/require.t
    doc/started_ada/sample.t
    doc/started_ada/started_ada.texi
    doc/started_ada/versions.texi
    doc/supplements/hppa1_1/Makefile
    doc/supplements/hppa1_1/SIMHPPA_TIMES
    doc/supplements/hppa1_1/bsp.t
    doc/supplements/hppa1_1/callconv.t
    doc/supplements/hppa1_1/cpumodel.t
    doc/supplements/hppa1_1/cputable.t
    doc/supplements/hppa1_1/fatalerr.t
    doc/supplements/hppa1_1/hppa1_1.texi
    doc/supplements/hppa1_1/intr_NOTIMES.t
    doc/supplements/hppa1_1/memmodel.t
    doc/supplements/hppa1_1/preface.texi
    doc/supplements/hppa1_1/timeSIMHPPA.t
    doc/supplements/i386/FORCE386_TIMES
    doc/supplements/i386/Makefile
    doc/supplements/i386/bsp.t
    doc/supplements/i386/callconv.t
    doc/supplements/i386/cpumodel.t
    doc/supplements/i386/cputable.t
    doc/supplements/i386/fatalerr.t
    doc/supplements/i386/i386.texi
    doc/supplements/i386/intr_NOTIMES.t
    doc/supplements/i386/memmodel.t
    doc/supplements/i386/preface.texi
    doc/supplements/i386/timeFORCE386.t
    doc/supplements/i960/CVME961_TIMES
    doc/supplements/i960/Makefile
    doc/supplements/i960/bsp.t
    doc/supplements/i960/callconv.t
    doc/supplements/i960/cpumodel.t
    doc/supplements/i960/cputable.t
    doc/supplements/i960/fatalerr.t
    doc/supplements/i960/i960.texi
    doc/supplements/i960/intr_NOTIMES.t
    doc/supplements/i960/memmodel.t
    doc/supplements/i960/preface.texi
    doc/supplements/i960/timeCVME961.t
    doc/supplements/m68k/MVME136_TIMES
    doc/supplements/m68k/Makefile
    doc/supplements/m68k/bsp.t
    doc/supplements/m68k/callconv.t
    doc/supplements/m68k/cpumodel.t
    doc/supplements/m68k/cputable.t
    doc/supplements/m68k/fatalerr.t
    doc/supplements/m68k/intr_NOTIMES.t
    doc/supplements/m68k/m68k.texi
    doc/supplements/m68k/memmodel.t
    doc/supplements/m68k/preface.texi
    doc/supplements/m68k/timeMVME136.t
    doc/supplements/m68k/timedata.t
    doc/supplements/powerpc/DMV177_TIMES
    doc/supplements/powerpc/Makefile
    doc/supplements/powerpc/PSIM_TIMES
    doc/supplements/powerpc/bsp.t
    doc/supplements/powerpc/callconv.t
    doc/supplements/powerpc/cpumodel.t
    doc/supplements/powerpc/cputable.t
    doc/supplements/powerpc/fatalerr.t
    doc/supplements/powerpc/intr_NOTIMES.t
    doc/supplements/powerpc/memmodel.t
    doc/supplements/powerpc/powerpc.texi
    doc/supplements/powerpc/preface.texi
    doc/supplements/powerpc/timeDMV177.t
    doc/supplements/powerpc/timePSIM.t
    doc/supplements/sh/callconv.texi
    doc/supplements/sparc/ERC32_TIMES
    doc/supplements/sparc/Makefile
    doc/supplements/sparc/bsp.t
    doc/supplements/sparc/callconv.t
    doc/supplements/sparc/cpumodel.t
    doc/supplements/sparc/cputable.t
    doc/supplements/sparc/fatalerr.t
    doc/supplements/sparc/intr_NOTIMES.t
    doc/supplements/sparc/memmodel.t
    doc/supplements/sparc/preface.texi
    doc/supplements/sparc/sparc.texi
    doc/supplements/sparc/timeERC32.t
    doc/supplements/template/BSP_TIMES
    doc/supplements/template/Makefile
    doc/supplements/template/bsp.t
    doc/supplements/template/callconv.t
    doc/supplements/template/cpumodel.t
    doc/supplements/template/cputable.t
    doc/supplements/template/fatalerr.t
    doc/supplements/template/intr_NOTIMES.t
    doc/supplements/template/memmodel.t
    doc/supplements/template/preface.texi
    doc/supplements/template/template.texi
    doc/supplements/template/timeBSP.t
    doc/texinfo/texinfo.tex
    doc/tools/bmenu/Makefile
    doc/tools/bmenu/address.h
    doc/tools/bmenu/address.inl
    doc/tools/bmenu/base.h
    doc/tools/bmenu/chain.c
    doc/tools/bmenu/chain.h
    doc/tools/bmenu/chain.inl
    doc/tools/bmenu/isr.h
    doc/tools/bmenu/main.c
    doc/tools/bmenu/system.h
    doc/tools/bmenu/testdoc.texi
    doc/tools/pdl2texi/Drive.d
    doc/tools/pdl2texi/Makefile
    doc/tools/pdl2texi/address.h
    doc/tools/pdl2texi/address.inl
    doc/tools/pdl2texi/afcc.texi
    doc/tools/pdl2texi/base.h
    doc/tools/pdl2texi/chain.c
    doc/tools/pdl2texi/chain.h
    doc/tools/pdl2texi/chain.inl
    doc/tools/pdl2texi/drive.d
    doc/tools/pdl2texi/isr.h
    doc/tools/pdl2texi/main.c
    doc/tools/pdl2texi/s.d
    doc/tools/pdl2texi/sample.d
    doc/tools/pdl2texi/system.h
    doc/tools/pdl2texi/t1.d
    doc/tools/pdl2texi/test_cases/avdas.d
    doc/tools/pdl2texi/test_cases/enum.d
    doc/tools/pdl2texi/test_cases/enumbad.d
    doc/tools/pdl2texi/test_cases/table.d
    doc/tools/src2html/Makefile
    doc/tools/src2html1.4a/Ctags/C.c
    doc/tools/src2html1.4a/Ctags/Makefile
    doc/tools/src2html1.4a/Ctags/ctags.1
    doc/tools/src2html1.4a/Ctags/ctags.c
    doc/tools/src2html1.4a/Ctags/ctags.h
    doc/tools/src2html1.4a/Ctags/fortran.c
    doc/tools/src2html1.4a/Ctags/lisp.c
    doc/tools/src2html1.4a/Ctags/print.c
    doc/tools/src2html1.4a/Ctags/strerror.c
    doc/tools/src2html1.4a/Ctags/tree.c
    doc/tools/src2html1.4a/Ctags/yacc.c
    doc/tools/src2html1.4a/Ctags/z.c
    doc/tools/src2html1.4a/FreeBSD/FreeBSD.hdr
    doc/tools/src2html1.4a/FreeBSD/FreeBSD.s2h
    doc/tools/src2html1.4a/FreeBSD/conf.hdr
    doc/tools/src2html1.4a/FreeBSD/ddb.hdr
    doc/tools/src2html1.4a/FreeBSD/i386.i386.hdr
    doc/tools/src2html1.4a/FreeBSD/i386.include.hdr
    doc/tools/src2html1.4a/FreeBSD/i386.isa.hdr
    doc/tools/src2html1.4a/FreeBSD/i386.stand.hdr
    doc/tools/src2html1.4a/FreeBSD/kern.hdr
    doc/tools/src2html1.4a/FreeBSD/net.hdr
    doc/tools/src2html1.4a/FreeBSD/netinet.hdr
    doc/tools/src2html1.4a/FreeBSD/nfs.hdr
    doc/tools/src2html1.4a/FreeBSD/stand.hdr
    doc/tools/src2html1.4a/FreeBSD/sys.hdr
    doc/tools/src2html1.4a/FreeBSD/ufs.hdr
    doc/tools/src2html1.4a/FreeBSD/vm.hdr
    doc/tools/src2html1.4a/Readme
    doc/tools/src2html1.4a/ctags-emacs/README
    doc/tools/src2html1.4a/ctags-emacs/ctags
    doc/tools/src2html1.4a/ctags-emacs/etags.c-ada-patch
    doc/tools/src2html1.4a/ctags-wr
    doc/tools/src2html1.4a/src2html
    doc/tools/src2html1.4a/src2html.1
    doc/tools/src2html1.4a/src2html.cgi
    doc/tools/texi2www/Makefile
    doc/tools/texi2www/archive/texi2www-960103.tgz
    doc/tools/texi2www/dir-arrow.gif
    doc/tools/texi2www/missing-arrow.gif
    doc/tools/texi2www/next-arrow.gif
    doc/tools/texi2www/prev-arrow.gif
    doc/tools/texi2www/texi2dvi
    doc/tools/texi2www/texi2www
    doc/tools/texi2www/texi2www.texi
    doc/tools/texi2www/up-arrow.gif
    doc/tools/update
    doc/tools/word-replace
    doc/user/Makefile
    doc/user/bsp.t
    doc/user/c_user.texi
    doc/user/clock.t
    doc/user/concepts.t
    doc/user/conf.t
    doc/user/dirstat.texi
    doc/user/dpmem.t
    doc/user/event.t
    doc/user/example.texi
    doc/user/fatal.t
    doc/user/glossary.texi
    doc/user/init.t
    doc/user/intr.t
    doc/user/io.t
    doc/user/mp.t
    doc/user/msg.t
    doc/user/overview.t
    doc/user/part.t
    doc/user/preface.texi
    doc/user/region.t
    doc/user/rtemsarc.gif
    doc/user/rtemspie.gif
    doc/user/rtmon.t
    doc/user/schedule.t
    doc/user/sem.t
    doc/user/signal.t
    doc/user/states.gif
    doc/user/task.t
    doc/user/timer.t
    doc/user/userext.t
    make/custom/dmv177.cfg
    testsuites/PROBLEMS
    testsuites/README
    testsuites/libtests/README
    testsuites/libtests/cpuuse/cpuuse.scn
    testsuites/libtests/cpuuse/init.c
    testsuites/libtests/cpuuse/system.h
    testsuites/libtests/cpuuse/task1.c
    testsuites/libtests/cpuuse/task2.c
    testsuites/libtests/cpuuse/task3.c
    testsuites/libtests/cpuuse/tswitch.c
    testsuites/libtests/malloctest/init.c
    testsuites/libtests/malloctest/system.h
    testsuites/libtests/malloctest/task1.c
    testsuites/libtests/monitor/init.c
    testsuites/libtests/monitor/system.h
    testsuites/libtests/rtems++/Init.cc
    testsuites/libtests/rtems++/System.h
    testsuites/libtests/rtems++/Task1.cc
    testsuites/libtests/rtems++/Task2.cc
    testsuites/libtests/rtems++/Task3.cc
    testsuites/libtests/rtems++/rtems++.doc
    testsuites/libtests/rtems++/rtems++.scn
    testsuites/libtests/rtmonuse/getall.c
    testsuites/libtests/rtmonuse/init.c
    testsuites/libtests/rtmonuse/rtmonuse.scn
    testsuites/libtests/rtmonuse/system.h
    testsuites/libtests/rtmonuse/task1.c
    testsuites/libtests/stackchk/blow.c
    testsuites/libtests/stackchk/init.c
    testsuites/libtests/stackchk/stackchk.scn
    testsuites/libtests/stackchk/system.h
    testsuites/libtests/stackchk/task1.c
    testsuites/libtests/termios/README
    testsuites/libtests/termios/init.c
    testsuites/mptests/README
    testsuites/mptests/mp01/init.c
    testsuites/mptests/mp01/node1/mp01.doc
    testsuites/mptests/mp01/node1/mp01.scn
    testsuites/mptests/mp01/node2/mp01.doc
    testsuites/mptests/mp01/node2/mp01.scn
    testsuites/mptests/mp01/system.h
    testsuites/mptests/mp01/task1.c
    testsuites/mptests/mp02/init.c
    testsuites/mptests/mp02/node1/mp02.doc
    testsuites/mptests/mp02/node1/mp02.scn
    testsuites/mptests/mp02/node2/mp02.doc
    testsuites/mptests/mp02/node2/mp02.scn
    testsuites/mptests/mp02/system.h
    testsuites/mptests/mp02/task1.c
    testsuites/mptests/mp03/delay.c
    testsuites/mptests/mp03/init.c
    testsuites/mptests/mp03/node1/mp03.doc
    testsuites/mptests/mp03/node1/mp03.scn
    testsuites/mptests/mp03/node2/mp03.doc
    testsuites/mptests/mp03/node2/mp03.scn
    testsuites/mptests/mp03/system.h
    testsuites/mptests/mp03/task1.c
    testsuites/mptests/mp04/init.c
    testsuites/mptests/mp04/node1/mp04.doc
    testsuites/mptests/mp04/node1/mp04.scn
    testsuites/mptests/mp04/node2/mp04.doc
    testsuites/mptests/mp04/node2/mp04.scn
    testsuites/mptests/mp04/system.h
    testsuites/mptests/mp04/task1.c
    testsuites/mptests/mp05/asr.c
    testsuites/mptests/mp05/init.c
    testsuites/mptests/mp05/node1/mp05.doc
    testsuites/mptests/mp05/node1/mp05.scn
    testsuites/mptests/mp05/node2/mp05.doc
    testsuites/mptests/mp05/node2/mp05.scn
    testsuites/mptests/mp05/system.h
    testsuites/mptests/mp05/task1.c
    testsuites/mptests/mp06/init.c
    testsuites/mptests/mp06/node1/mp06.doc
    testsuites/mptests/mp06/node1/mp06.scn
    testsuites/mptests/mp06/node2/mp06.doc
    testsuites/mptests/mp06/node2/mp06.scn
    testsuites/mptests/mp06/system.h
    testsuites/mptests/mp06/task1.c
    testsuites/mptests/mp07/init.c
    testsuites/mptests/mp07/node1/mp07.doc
    testsuites/mptests/mp07/node1/mp07.scn
    testsuites/mptests/mp07/node2/mp07.doc
    testsuites/mptests/mp07/node2/mp07.scn
    testsuites/mptests/mp07/system.h
    testsuites/mptests/mp07/task1.c
    testsuites/mptests/mp08/init.c
    testsuites/mptests/mp08/node1/mp08.doc
    testsuites/mptests/mp08/node1/mp08.scn
    testsuites/mptests/mp08/node2/mp08.doc
    testsuites/mptests/mp08/node2/mp08.scn
    testsuites/mptests/mp08/system.h
    testsuites/mptests/mp08/task1.c
    testsuites/mptests/mp09/init.c
    testsuites/mptests/mp09/node1/mp09.doc
    testsuites/mptests/mp09/node1/mp09.scn
    testsuites/mptests/mp09/node2/mp09.doc
    testsuites/mptests/mp09/node2/mp09.scn
    testsuites/mptests/mp09/recvmsg.c
    testsuites/mptests/mp09/sendmsg.c
    testsuites/mptests/mp09/system.h
    testsuites/mptests/mp09/task1.c
    testsuites/mptests/mp10/init.c
    testsuites/mptests/mp10/node1/mp10.doc
    testsuites/mptests/mp10/node1/mp10.scn
    testsuites/mptests/mp10/node2/mp10.doc
    testsuites/mptests/mp10/node2/mp10.scn
    testsuites/mptests/mp10/system.h
    testsuites/mptests/mp10/task1.c
    testsuites/mptests/mp10/task2.c
    testsuites/mptests/mp10/task3.c
    testsuites/mptests/mp11/init.c
    testsuites/mptests/mp11/node1/mp11.doc
    testsuites/mptests/mp11/node1/mp11.scn
    testsuites/mptests/mp11/node2/mp11.doc
    testsuites/mptests/mp11/node2/mp11.scn
    testsuites/mptests/mp11/system.h
    testsuites/mptests/mp12/init.c
    testsuites/mptests/mp12/node1/mp12.doc
    testsuites/mptests/mp12/node1/mp12.scn
    testsuites/mptests/mp12/node2/mp12.doc
    testsuites/mptests/mp12/node2/mp12.scn
    testsuites/mptests/mp12/system.h
    testsuites/mptests/mp13/init.c
    testsuites/mptests/mp13/node1/mp13.doc
    testsuites/mptests/mp13/node1/mp13.scn
    testsuites/mptests/mp13/node2/mp13.doc
    testsuites/mptests/mp13/node2/mp13.scn
    testsuites/mptests/mp13/system.h
    testsuites/mptests/mp13/task1.c
    testsuites/mptests/mp13/task2.c
    testsuites/mptests/mp14/delay.c
    testsuites/mptests/mp14/evtask1.c
    testsuites/mptests/mp14/evtmtask.c
    testsuites/mptests/mp14/exit.c
    testsuites/mptests/mp14/init.c
    testsuites/mptests/mp14/msgtask1.c
    testsuites/mptests/mp14/node1/mp14.doc
    testsuites/mptests/mp14/node1/mp14.scn
    testsuites/mptests/mp14/node2/mp14.doc
    testsuites/mptests/mp14/node2/mp14.scn
    testsuites/mptests/mp14/pttask1.c
    testsuites/mptests/mp14/smtask1.c
    testsuites/mptests/mp14/system.h
    testsuites/psxtests/include/pmacros.h
    testsuites/psxtests/psx01/init.c
    testsuites/psxtests/psx01/psx01.scn
    testsuites/psxtests/psx01/system.h
    testsuites/psxtests/psx01/task.c
    testsuites/psxtests/psx02/init.c
    testsuites/psxtests/psx02/psx02.scn
    testsuites/psxtests/psx02/system.h
    testsuites/psxtests/psx02/task.c
    testsuites/psxtests/psx03/init.c
    testsuites/psxtests/psx03/psx03.scn
    testsuites/psxtests/psx03/system.h
    testsuites/psxtests/psx03/task.c
    testsuites/psxtests/psx04/init.c
    testsuites/psxtests/psx04/psx04.scn
    testsuites/psxtests/psx04/system.h
    testsuites/psxtests/psx04/task1.c
    testsuites/psxtests/psx04/task2.c
    testsuites/psxtests/psx04/task3.c
    testsuites/psxtests/psx05/init.c
    testsuites/psxtests/psx05/psx05.scn
    testsuites/psxtests/psx05/system.h
    testsuites/psxtests/psx05/task.c
    testsuites/psxtests/psx05/task2.c
    testsuites/psxtests/psx05/task3.c
    testsuites/psxtests/psx06/init.c
    testsuites/psxtests/psx06/psx06.scn
    testsuites/psxtests/psx06/system.h
    testsuites/psxtests/psx06/task.c
    testsuites/psxtests/psx06/task2.c
    testsuites/psxtests/psx07/init.c
    testsuites/psxtests/psx07/psx07.scn
    testsuites/psxtests/psx07/system.h
    testsuites/psxtests/psx07/task.c
    testsuites/psxtests/psx08/init.c
    testsuites/psxtests/psx08/psx08.scn
    testsuites/psxtests/psx08/system.h
    testsuites/psxtests/psx08/task2.c
    testsuites/psxtests/psx09/init.c
    testsuites/psxtests/psx09/psx09.scn
    testsuites/psxtests/psx09/system.h
    testsuites/psxtests/psx10/init.c
    testsuites/psxtests/psx10/psx10.scn
    testsuites/psxtests/psx10/system.h
    testsuites/psxtests/psx10/task.c
    testsuites/psxtests/psx10/task2.c
    testsuites/psxtests/psx10/task3.c
    testsuites/psxtests/psx11/init.c
    testsuites/psxtests/psx11/psx11.scn
    testsuites/psxtests/psx11/system.h
    testsuites/psxtests/psx11/task.c
    testsuites/psxtests/psx12/init.c
    testsuites/psxtests/psx12/psx12.scn
    testsuites/psxtests/psx12/system.h
    testsuites/psxtests/psx12/task.c
    testsuites/psxtests/psxhdrs/clock01.c
    testsuites/psxtests/psxhdrs/clock02.c
    testsuites/psxtests/psxhdrs/clock03.c
    testsuites/psxtests/psxhdrs/clock04.c
    testsuites/psxtests/psxhdrs/clock05.c
    testsuites/psxtests/psxhdrs/clock06.c
    testsuites/psxtests/psxhdrs/cond01.c
    testsuites/psxtests/psxhdrs/cond02.c
    testsuites/psxtests/psxhdrs/cond03.c
    testsuites/psxtests/psxhdrs/cond04.c
    testsuites/psxtests/psxhdrs/cond05.c
    testsuites/psxtests/psxhdrs/cond06.c
    testsuites/psxtests/psxhdrs/cond07.c
    testsuites/psxtests/psxhdrs/cond08.c
    testsuites/psxtests/psxhdrs/cond09.c
    testsuites/psxtests/psxhdrs/cond10.c
    testsuites/psxtests/psxhdrs/key01.c
    testsuites/psxtests/psxhdrs/key02.c
    testsuites/psxtests/psxhdrs/key03.c
    testsuites/psxtests/psxhdrs/key04.c
    testsuites/psxtests/psxhdrs/mutex01.c
    testsuites/psxtests/psxhdrs/mutex02.c
    testsuites/psxtests/psxhdrs/mutex03.c
    testsuites/psxtests/psxhdrs/mutex04.c
    testsuites/psxtests/psxhdrs/mutex05.c
    testsuites/psxtests/psxhdrs/mutex06.c
    testsuites/psxtests/psxhdrs/mutex07.c
    testsuites/psxtests/psxhdrs/mutex08.c
    testsuites/psxtests/psxhdrs/mutex09.c
    testsuites/psxtests/psxhdrs/mutex10.c
    testsuites/psxtests/psxhdrs/mutex11.c
    testsuites/psxtests/psxhdrs/mutex12.c
    testsuites/psxtests/psxhdrs/mutex13.c
    testsuites/psxtests/psxhdrs/mutex14.c
    testsuites/psxtests/psxhdrs/mutex15.c
    testsuites/psxtests/psxhdrs/mutex16.c
    testsuites/psxtests/psxhdrs/proc01.c
    testsuites/psxtests/psxhdrs/proc02.c
    testsuites/psxtests/psxhdrs/proc03.c
    testsuites/psxtests/psxhdrs/proc04.c
    testsuites/psxtests/psxhdrs/proc05.c
    testsuites/psxtests/psxhdrs/proc06.c
    testsuites/psxtests/psxhdrs/proc07.c
    testsuites/psxtests/psxhdrs/proc08.c
    testsuites/psxtests/psxhdrs/proc09.c
    testsuites/psxtests/psxhdrs/proc10.c
    testsuites/psxtests/psxhdrs/proc11.c
    testsuites/psxtests/psxhdrs/proc12.c
    testsuites/psxtests/psxhdrs/proc13.c
    testsuites/psxtests/psxhdrs/proc14.c
    testsuites/psxtests/psxhdrs/pthread01.c
    testsuites/psxtests/psxhdrs/pthread02.c
    testsuites/psxtests/psxhdrs/pthread03.c
    testsuites/psxtests/psxhdrs/pthread04.c
    testsuites/psxtests/psxhdrs/pthread05.c
    testsuites/psxtests/psxhdrs/pthread06.c
    testsuites/psxtests/psxhdrs/pthread07.c
    testsuites/psxtests/psxhdrs/pthread08.c
    testsuites/psxtests/psxhdrs/pthread09.c
    testsuites/psxtests/psxhdrs/pthread10.c
    testsuites/psxtests/psxhdrs/pthread11.c
    testsuites/psxtests/psxhdrs/pthread12.c
    testsuites/psxtests/psxhdrs/pthread13.c
    testsuites/psxtests/psxhdrs/pthread14.c
    testsuites/psxtests/psxhdrs/pthread15.c
    testsuites/psxtests/psxhdrs/pthread16.c
    testsuites/psxtests/psxhdrs/pthread17.c
    testsuites/psxtests/psxhdrs/pthread18.c
    testsuites/psxtests/psxhdrs/pthread19.c
    testsuites/psxtests/psxhdrs/pthread20.c
    testsuites/psxtests/psxhdrs/pthread21.c
    testsuites/psxtests/psxhdrs/pthread22.c
    testsuites/psxtests/psxhdrs/pthread23.c
    testsuites/psxtests/psxhdrs/pthread24.c
    testsuites/psxtests/psxhdrs/pthread25.c
    testsuites/psxtests/psxhdrs/pthread26.c
    testsuites/psxtests/psxhdrs/pthread27.c
    testsuites/psxtests/psxhdrs/pthread28.c
    testsuites/psxtests/psxhdrs/pthread29.c
    testsuites/psxtests/psxhdrs/pthread30.c
    testsuites/psxtests/psxhdrs/pthread31.c
    testsuites/psxtests/psxhdrs/pthread32.c
    testsuites/psxtests/psxhdrs/pthread33.c
    testsuites/psxtests/psxhdrs/pthread34.c
    testsuites/psxtests/psxhdrs/pthread35.c
    testsuites/psxtests/psxhdrs/pthread36.c
    testsuites/psxtests/psxhdrs/sched01.c
    testsuites/psxtests/psxhdrs/sched02.c
    testsuites/psxtests/psxhdrs/sched03.c
    testsuites/psxtests/psxhdrs/sched04.c
    testsuites/psxtests/psxhdrs/sched05.c
    testsuites/psxtests/psxhdrs/sched06.c
    testsuites/psxtests/psxhdrs/sched07.c
    testsuites/psxtests/psxhdrs/sched08.c
    testsuites/psxtests/psxhdrs/signal01.c
    testsuites/psxtests/psxhdrs/signal02.c
    testsuites/psxtests/psxhdrs/signal03.c
    testsuites/psxtests/psxhdrs/signal04.c
    testsuites/psxtests/psxhdrs/signal05.c
    testsuites/psxtests/psxhdrs/signal06.c
    testsuites/psxtests/psxhdrs/signal07.c
    testsuites/psxtests/psxhdrs/signal08.c
    testsuites/psxtests/psxhdrs/signal09.c
    testsuites/psxtests/psxhdrs/signal10.c
    testsuites/psxtests/psxhdrs/signal11.c
    testsuites/psxtests/psxhdrs/signal12.c
    testsuites/psxtests/psxhdrs/signal13.c
    testsuites/psxtests/psxhdrs/signal14.c
    testsuites/psxtests/psxhdrs/signal15.c
    testsuites/psxtests/psxhdrs/signal16.c
    testsuites/psxtests/psxhdrs/signal17.c
    testsuites/psxtests/psxhdrs/signal18.c
    testsuites/psxtests/psxhdrs/signal19.c
    testsuites/psxtests/psxhdrs/signal20.c
    testsuites/psxtests/psxhdrs/signal21.c
    testsuites/psxtests/psxhdrs/signal22.c
    testsuites/psxtests/psxhdrs/time01.c
    testsuites/psxtests/psxhdrs/time02.c
    testsuites/psxtests/psxhdrs/time03.c
    testsuites/psxtests/psxhdrs/time04.c
    testsuites/psxtests/psxhdrs/time05.c
    testsuites/psxtests/psxhdrs/time06.c
    testsuites/psxtests/psxhdrs/time07.c
    testsuites/psxtests/psxhdrs/time08.c
    testsuites/psxtests/psxhdrs/time09.c
    testsuites/psxtests/psxhdrs/time10.c
    testsuites/psxtests/psxhdrs/time11.c
    testsuites/psxtests/psxhdrs/time12.c
    testsuites/psxtests/psxhdrs/time13.c
    testsuites/psxtests/psxhdrs/timer01.c
    testsuites/psxtests/psxhdrs/timer02.c
    testsuites/psxtests/psxhdrs/timer03.c
    testsuites/psxtests/psxhdrs/timer04.c
    testsuites/psxtests/psxhdrs/timer05.c
    testsuites/psxtests/psxhdrs/timer06.c
    testsuites/samples/README
    testsuites/samples/base_mp/apptask.c
    testsuites/samples/base_mp/init.c
    testsuites/samples/base_mp/node1/base_mp.doc
    testsuites/samples/base_mp/node1/base_mp.scn
    testsuites/samples/base_mp/node2/base_mp.doc
    testsuites/samples/base_mp/node2/base_mp.scn
    testsuites/samples/base_mp/system.h
    testsuites/samples/base_sp/apptask.c
    testsuites/samples/base_sp/base_sp.doc
    testsuites/samples/base_sp/base_sp.scn
    testsuites/samples/base_sp/init.c
    testsuites/samples/base_sp/system.h
    testsuites/samples/cdtest/cdtest.scn
    testsuites/samples/cdtest/init.c
    testsuites/samples/cdtest/main.cc
    testsuites/samples/cdtest/system.h
    testsuites/samples/hello/hello.doc
    testsuites/samples/hello/hello.scn
    testsuites/samples/hello/init.c
    testsuites/samples/hello/system.h
    testsuites/samples/paranoia/init.c
    testsuites/samples/paranoia/paranoia.c
    testsuites/samples/paranoia/paranoia.doc
    testsuites/samples/paranoia/system.h
    testsuites/samples/ticker/init.c
    testsuites/samples/ticker/system.h
    testsuites/samples/ticker/tasks.c
    testsuites/samples/ticker/ticker.doc
    testsuites/samples/ticker/ticker.scn
    testsuites/sptests/README
    testsuites/sptests/sp01/init.c
    testsuites/sptests/sp01/sp01.doc
    testsuites/sptests/sp01/sp01.scn
    testsuites/sptests/sp01/system.h
    testsuites/sptests/sp01/task1.c
    testsuites/sptests/sp02/init.c
    testsuites/sptests/sp02/preempt.c
    testsuites/sptests/sp02/sp02.doc
    testsuites/sptests/sp02/sp02.scn
    testsuites/sptests/sp02/system.h
    testsuites/sptests/sp02/task1.c
    testsuites/sptests/sp02/task2.c
    testsuites/sptests/sp02/task3.c
    testsuites/sptests/sp03/init.c
    testsuites/sptests/sp03/sp03.doc
    testsuites/sptests/sp03/sp03.scn
    testsuites/sptests/sp03/system.h
    testsuites/sptests/sp03/task1.c
    testsuites/sptests/sp03/task2.c
    testsuites/sptests/sp04/init.c
    testsuites/sptests/sp04/sp04.doc
    testsuites/sptests/sp04/sp04.scn
    testsuites/sptests/sp04/system.h
    testsuites/sptests/sp04/task1.c
    testsuites/sptests/sp04/task2.c
    testsuites/sptests/sp04/task3.c
    testsuites/sptests/sp04/tswitch.c
    testsuites/sptests/sp05/init.c
    testsuites/sptests/sp05/sp05.doc
    testsuites/sptests/sp05/sp05.scn
    testsuites/sptests/sp05/system.h
    testsuites/sptests/sp05/task1.c
    testsuites/sptests/sp05/task2.c
    testsuites/sptests/sp05/task3.c
    testsuites/sptests/sp06/init.c
    testsuites/sptests/sp06/sp06.doc
    testsuites/sptests/sp06/sp06.scn
    testsuites/sptests/sp06/system.h
    testsuites/sptests/sp06/task1.c
    testsuites/sptests/sp06/task2.c
    testsuites/sptests/sp06/task3.c
    testsuites/sptests/sp07/init.c
    testsuites/sptests/sp07/sp07.doc
    testsuites/sptests/sp07/sp07.scn
    testsuites/sptests/sp07/system.h
    testsuites/sptests/sp07/task1.c
    testsuites/sptests/sp07/task2.c
    testsuites/sptests/sp07/task3.c
    testsuites/sptests/sp07/task4.c
    testsuites/sptests/sp07/taskexit.c
    testsuites/sptests/sp07/tcreate.c
    testsuites/sptests/sp07/tdelete.c
    testsuites/sptests/sp07/trestart.c
    testsuites/sptests/sp07/tstart.c
    testsuites/sptests/sp08/init.c
    testsuites/sptests/sp08/sp08.doc
    testsuites/sptests/sp08/sp08.scn
    testsuites/sptests/sp08/system.h
    testsuites/sptests/sp08/task1.c
    testsuites/sptests/sp09/delay.c
    testsuites/sptests/sp09/init.c
    testsuites/sptests/sp09/isr.c
    testsuites/sptests/sp09/screen01.c
    testsuites/sptests/sp09/screen02.c
    testsuites/sptests/sp09/screen03.c
    testsuites/sptests/sp09/screen04.c
    testsuites/sptests/sp09/screen05.c
    testsuites/sptests/sp09/screen06.c
    testsuites/sptests/sp09/screen07.c
    testsuites/sptests/sp09/screen08.c
    testsuites/sptests/sp09/screen09.c
    testsuites/sptests/sp09/screen10.c
    testsuites/sptests/sp09/screen11.c
    testsuites/sptests/sp09/screen12.c
    testsuites/sptests/sp09/screen13.c
    testsuites/sptests/sp09/screen14.c
    testsuites/sptests/sp09/sp09.doc
    testsuites/sptests/sp09/sp09.scn
    testsuites/sptests/sp09/system.h
    testsuites/sptests/sp09/task1.c
    testsuites/sptests/sp09/task2.c
    testsuites/sptests/sp09/task3.c
    testsuites/sptests/sp09/task4.c
    testsuites/sptests/sp11/init.c
    testsuites/sptests/sp11/sp11.doc
    testsuites/sptests/sp11/sp11.scn
    testsuites/sptests/sp11/system.h
    testsuites/sptests/sp11/task1.c
    testsuites/sptests/sp11/task2.c
    testsuites/sptests/sp11/timer.c
    testsuites/sptests/sp12/init.c
    testsuites/sptests/sp12/pridrv.c
    testsuites/sptests/sp12/pritask.c
    testsuites/sptests/sp12/sp12.doc
    testsuites/sptests/sp12/sp12.scn
    testsuites/sptests/sp12/system.h
    testsuites/sptests/sp12/task1.c
    testsuites/sptests/sp12/task2.c
    testsuites/sptests/sp12/task3.c
    testsuites/sptests/sp12/task4.c
    testsuites/sptests/sp12/task5.c
    testsuites/sptests/sp13/fillbuff.c
    testsuites/sptests/sp13/init.c
    testsuites/sptests/sp13/putbuff.c
    testsuites/sptests/sp13/sp13.doc
    testsuites/sptests/sp13/sp13.scn
    testsuites/sptests/sp13/system.h
    testsuites/sptests/sp13/task1.c
    testsuites/sptests/sp13/task2.c
    testsuites/sptests/sp13/task3.c
    testsuites/sptests/sp14/asr.c
    testsuites/sptests/sp14/init.c
    testsuites/sptests/sp14/sp14.doc
    testsuites/sptests/sp14/sp14.scn
    testsuites/sptests/sp14/system.h
    testsuites/sptests/sp14/task1.c
    testsuites/sptests/sp14/task2.c
    testsuites/sptests/sp15/init.c
    testsuites/sptests/sp15/sp15.doc
    testsuites/sptests/sp15/sp15.scn
    testsuites/sptests/sp15/system.h
    testsuites/sptests/sp15/task1.c
    testsuites/sptests/sp16/init.c
    testsuites/sptests/sp16/sp16.doc
    testsuites/sptests/sp16/sp16.scn
    testsuites/sptests/sp16/system.h
    testsuites/sptests/sp16/task1.c
    testsuites/sptests/sp16/task2.c
    testsuites/sptests/sp16/task3.c
    testsuites/sptests/sp16/task4.c
    testsuites/sptests/sp16/task5.c
    testsuites/sptests/sp17/asr.c
    testsuites/sptests/sp17/init.c
    testsuites/sptests/sp17/sp17.doc
    testsuites/sptests/sp17/sp17.scn
    testsuites/sptests/sp17/system.h
    testsuites/sptests/sp17/task1.c
    testsuites/sptests/sp17/task2.c
    testsuites/sptests/sp19/first.c
    testsuites/sptests/sp19/fptask.c
    testsuites/sptests/sp19/fptest.h
    testsuites/sptests/sp19/init.c
    testsuites/sptests/sp19/inttest.h
    testsuites/sptests/sp19/sp19.doc
    testsuites/sptests/sp19/sp19.scn
    testsuites/sptests/sp19/system.h
    testsuites/sptests/sp19/task1.c
    testsuites/sptests/sp20/getall.c
    testsuites/sptests/sp20/init.c
    testsuites/sptests/sp20/sp20.doc
    testsuites/sptests/sp20/sp20.scn
    testsuites/sptests/sp20/system.h
    testsuites/sptests/sp20/task1.c
    testsuites/sptests/sp21/init.c
    testsuites/sptests/sp21/sp21.doc
    testsuites/sptests/sp21/sp21.scn
    testsuites/sptests/sp21/system.h
    testsuites/sptests/sp21/task1.c
    testsuites/sptests/sp22/delay.c
    testsuites/sptests/sp22/init.c
    testsuites/sptests/sp22/prtime.c
    testsuites/sptests/sp22/sp22.doc
    testsuites/sptests/sp22/sp22.scn
    testsuites/sptests/sp22/system.h
    testsuites/sptests/sp22/task1.c
    testsuites/sptests/sp23/init.c
    testsuites/sptests/sp23/sp23.doc
    testsuites/sptests/sp23/sp23.scn
    testsuites/sptests/sp23/system.h
    testsuites/sptests/sp23/task1.c
    testsuites/sptests/sp24/init.c
    testsuites/sptests/sp24/resume.c
    testsuites/sptests/sp24/sp24.doc
    testsuites/sptests/sp24/sp24.scn
    testsuites/sptests/sp24/system.h
    testsuites/sptests/sp24/task1.c
    testsuites/sptests/sp25/init.c
    testsuites/sptests/sp25/sp25.doc
    testsuites/sptests/sp25/sp25.scn
    testsuites/sptests/sp25/system.h
    testsuites/sptests/sp25/task1.c
    testsuites/sptests/spfatal/fatal.c
    testsuites/sptests/spfatal/init.c
    testsuites/sptests/spfatal/puterr.c
    testsuites/sptests/spfatal/spfatal.doc
    testsuites/sptests/spfatal/spfatal.scn
    testsuites/sptests/spfatal/system.h
    testsuites/sptests/spfatal/task1.c
    testsuites/sptests/spsize/getint.c
    testsuites/sptests/spsize/init.c
    testsuites/sptests/spsize/size.c
    testsuites/sptests/spsize/system.h
    testsuites/support/include/tmacros.h
    testsuites/tmtests/README
    testsuites/tmtests/include/timesys.h
    testsuites/tmtests/tm01/system.h
    testsuites/tmtests/tm01/task1.c
    testsuites/tmtests/tm01/tm01.doc
    testsuites/tmtests/tm02/system.h
    testsuites/tmtests/tm02/task1.c
    testsuites/tmtests/tm02/tm02.doc
    testsuites/tmtests/tm03/system.h
    testsuites/tmtests/tm03/task1.c
    testsuites/tmtests/tm03/tm03.doc
    testsuites/tmtests/tm04/system.h
    testsuites/tmtests/tm04/task1.c
    testsuites/tmtests/tm04/tm04.doc
    testsuites/tmtests/tm05/system.h
    testsuites/tmtests/tm05/task1.c
    testsuites/tmtests/tm05/tm05.doc
    testsuites/tmtests/tm06/system.h
    testsuites/tmtests/tm06/task1.c
    testsuites/tmtests/tm06/tm06.doc
    testsuites/tmtests/tm07/system.h
    testsuites/tmtests/tm07/task1.c
    testsuites/tmtests/tm07/tm07.doc
    testsuites/tmtests/tm08/system.h
    testsuites/tmtests/tm08/task1.c
    testsuites/tmtests/tm08/tm08.doc
    testsuites/tmtests/tm09/system.h
    testsuites/tmtests/tm09/task1.c
    testsuites/tmtests/tm09/tm09.doc
    testsuites/tmtests/tm10/system.h
    testsuites/tmtests/tm10/task1.c
    testsuites/tmtests/tm10/tm10.doc
    testsuites/tmtests/tm11/system.h
    testsuites/tmtests/tm11/task1.c
    testsuites/tmtests/tm11/tm11.doc
    testsuites/tmtests/tm12/system.h
    testsuites/tmtests/tm12/task1.c
    testsuites/tmtests/tm12/tm12.doc
    testsuites/tmtests/tm13/system.h
    testsuites/tmtests/tm13/task1.c
    testsuites/tmtests/tm13/tm13.doc
    testsuites/tmtests/tm14/system.h
    testsuites/tmtests/tm14/task1.c
    testsuites/tmtests/tm14/tm14.doc
    testsuites/tmtests/tm15/system.h
    testsuites/tmtests/tm15/task1.c
    testsuites/tmtests/tm15/tm15.doc
    testsuites/tmtests/tm16/system.h
    testsuites/tmtests/tm16/task1.c
    testsuites/tmtests/tm16/tm16.doc
    testsuites/tmtests/tm17/system.h
    testsuites/tmtests/tm17/task1.c
    testsuites/tmtests/tm17/tm17.doc
    testsuites/tmtests/tm18/system.h
    testsuites/tmtests/tm18/task1.c
    testsuites/tmtests/tm18/tm18.doc
    testsuites/tmtests/tm19/system.h
    testsuites/tmtests/tm19/task1.c
    testsuites/tmtests/tm19/tm19.doc
    testsuites/tmtests/tm20/system.h
    testsuites/tmtests/tm20/task1.c
    testsuites/tmtests/tm20/tm20.doc
    testsuites/tmtests/tm21/system.h
    testsuites/tmtests/tm21/task1.c
    testsuites/tmtests/tm21/tm21.doc
    testsuites/tmtests/tm22/system.h
    testsuites/tmtests/tm22/task1.c
    testsuites/tmtests/tm22/tm22.doc
    testsuites/tmtests/tm23/system.h
    testsuites/tmtests/tm23/task1.c
    testsuites/tmtests/tm23/tm23.doc
    testsuites/tmtests/tm24/system.h
    testsuites/tmtests/tm24/task1.c
    testsuites/tmtests/tm24/tm24.doc
    testsuites/tmtests/tm25/system.h
    testsuites/tmtests/tm25/task1.c
    testsuites/tmtests/tm25/tm25.doc
    testsuites/tmtests/tm26/fptest.h
    testsuites/tmtests/tm26/system.h
    testsuites/tmtests/tm26/task1.c
    testsuites/tmtests/tm26/tm26.doc
    testsuites/tmtests/tm27/system.h
    testsuites/tmtests/tm27/task1.c
    testsuites/tmtests/tm27/tm27.doc
    testsuites/tmtests/tm28/system.h
    testsuites/tmtests/tm28/task1.c
    testsuites/tmtests/tm28/tm28.doc
    testsuites/tmtests/tm29/system.h
    testsuites/tmtests/tm29/task1.c
    testsuites/tmtests/tm29/tm29.doc
    testsuites/tmtests/tmck/system.h
    testsuites/tmtests/tmck/task1.c
    testsuites/tmtests/tmck/tmck.doc
    testsuites/tmtests/tmoverhd/dumrtems.h
    testsuites/tmtests/tmoverhd/empty.c
    testsuites/tmtests/tmoverhd/system.h
    testsuites/tmtests/tmoverhd/testtask.c
    testsuites/tmtests/tmoverhd/tmoverhd.doc
    tools/build/Makefile.in
    tools/build/README
    tools/build/binpatch.c
    tools/build/cklength.c
    tools/build/eolstrip.c
    tools/build/install-if-change.in
    tools/build/lock-directory.in
    tools/build/os/Makefile.in
    tools/build/os/msdos/Makefile.in
    tools/build/os/msdos/README
    tools/build/os/msdos/cklength.uue
    tools/build/os/msdos/fixtimer.c
    tools/build/os/msdos/fixtimer.uue
    tools/build/os/msdos/ifc.c
    tools/build/os/msdos/ifc_exe.uue
    tools/build/packhex.c
    tools/build/rcs-clean.in
    tools/build/scripts/Makefile.in
    tools/build/scripts/README
    tools/build/scripts/install-if-change.in
    tools/build/scripts/lock-directory.in
    tools/build/scripts/rcs-clean.in
    tools/build/scripts/search-id.sh
    tools/build/scripts/unlock-directory.in
    tools/build/search-id.sh
    tools/build/src/Makefile.in
    tools/build/src/cklength.c
    tools/build/src/config.h.in
    tools/build/src/eolstrip.c
    tools/build/src/packhex.c
    tools/build/src/unhex.c
    tools/build/unhex.c
    tools/build/unlock-directory.in
    tools/cpu/Makefile.in
    tools/cpu/generic/Makefile.in
    tools/cpu/generic/size_rtems.in
    tools/cpu/hppa1.1/genoffsets.c
    tools/cpu/sh/AUTHORS
    tools/cpu/sh/COPYING
    tools/cpu/sh/Makefile.in
    tools/cpu/sh/TODO
    tools/cpu/sh/sci.c
    tools/cpu/sh/sci.h
    tools/cpu/sh/shgen.c
    tools/cpu/unix/Makefile.in
    tools/cpu/unix/gensize.c
    tools/update/310_to_320_list
    tools/update/Makefile.in
    tools/update/README
    tools/update/update.in
    tools/update/word-replace.in

3087 files changed, 0 insertions, 521441 deletions

diff --git a/c/build-tools/README b/c/build-tools/README
deleted file mode 100644
index 0738a5830e..0000000000
--- a/c/build-tools/README
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-#  $Id$
-#
-
-Misc. support tools for RTEMS workspaces.
-More will be added later as they are converted from Teamware
-to CVS.
-
-install-if-change
-    Smart install script that also can append suffixes as it
-    installs (suffixes used for debug and profile variants).
-    Requires bash or ksh.
-
-rcs-clean
-    deletes all files from the current directory that can be
-    re-created from RCS.  Careful to not delete locked files.
-    May be used by 'gmake clobber'
-
-lock-directory
-unlock-directory
-    traverse a directory structure making it unwritable.
-    Useful to keep people from accidentally overwriting
-    "released" trees if they get confused about which
-    module they have loaded.
diff --git a/c/build-tools/cklength.c b/c/build-tools/cklength.c
deleted file mode 100644
index 624bf25e70..0000000000
--- a/c/build-tools/cklength.c
+++ /dev/null
@@ -1,377 +0,0 @@
-/*
- *  cklength - check the length of lines in a file
- *
- *  This program check to see if the files passed to it on the command line
- *  contain a line which exceeds the maximum allowable length.  The default
- *  maximum line length is 80.
- *
- *  usage:  cklength  [ -v ] [ arg ... ] files...
- *           -l length   -- maximum line length
- *           -v          -- verbose
- *
- * $Id$
- */
-
-#define GETOPTARGS "l:nNv"
-
-char *USAGE = "\
-usage:  cklength  [ -v ] [ arg ... ] files... \n\
-            -l length   -- maximum line length\n\
-            -n          -- report line numbers for offending lines\n\
-            -N          -- report line numbers and length for offending lines\n\
-            -v          -- verbose\n\
-\n\
-Print the name of files which have at least 1 line which exceeds the\n\
-maximum line length.  The default maximum line length is 80.\n\
-";
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <memory.h>
-#include <stdarg.h>
-#include <errno.h>
-
-#include "config.h"
-
-#ifndef VMS
-#ifndef HAVE_STRERROR
-extern int sys_nerr;
-extern char *sys_errlist[];
-
-#define strerror( _err ) \
-  ((_err) < sys_nerr) ? sys_errlist [(_err)] : "unknown error"
-
-#else   /* HAVE_STRERROR */
-char *strerror ();
-#endif
-#else   /* VMS */
-char *strerror (int,...);
-#endif
-
-
-#define BUFFER_SIZE     512
-
-#define SUCCESS         0
-#define FAILURE         -1
-#define Failed(x)       (((int) (x)) == FAILURE)
-#define TRUE    1
-#define FALSE   0
-#define STREQ(a,b)      (strcmp(a,b) == 0)
-#define NUMELEMS(arr)   (sizeof(arr) / sizeof(arr[0]))
-
-/*
- * Definitions for unsigned "ints"; especially for use in data structures
- *  that will be shared among (potentially) different cpu's (we punt on
- *  byte ordering problems tho)
- */
-
-typedef unsigned char   u8;
-typedef unsigned short  u16;
-typedef unsigned long   u32;
-
-/*
- * vars controlled by command line options
- */
-
-int verbose = FALSE;                    /* be verbose */
-int report_line_numbers = FALSE;        /* report line numbers of offenders */
-int report_line_length = FALSE;         /* report line length of offenders */
-
-int line_length = 80;                   /* maximum allowable line length */
-
-extern char *optarg;                    /* getopt(3) control vars */
-extern int optind, opterr;
-
-char *progname;                         /* for error() */
-
-int process(char *arg);
-void error(int errn, ...);
-long getparm(char *s, long min, long max, char *msg);
-
-#define ERR_ERRNO  (1<<((sizeof(int) * 8) - 2)) /* hi bit; use 'errno' */
-#define ERR_FATAL  (ERR_ERRNO / 2)              /* fatal error ; no return */
-#define ERR_ABORT  (ERR_ERRNO / 4)              /* fatal error ; abort */
-#define ERR_MASK   (ERR_ERRNO | ERR_FATAL | ERR_ABORT) /* all */
-
-#define stol(p) strtol(p, (char **) NULL, 0)
-int  Open(), Read(), Write();
-
-int main(
-  int argc,
-  char **argv
-)
-{
-    register int c;
-    int showusage = FALSE;                      /* usage error? */
-    int rc = 0;
-
-    /*
-     * figure out invocation leaf-name
-     */
-
-    if ((progname = strrchr(argv[0], '/')) == (char *) NULL)
-        progname = argv[0];
-    else
-        progname++;
-
-    argv[0] = progname;                         /* for getopt err reporting */
-
-    /*
-     *  Check options and arguments.
-     */
-
-    opterr = 0;                                 /* we'll report all errors */
-    while ((c = getopt(argc, argv, GETOPTARGS)) != EOF)
-        switch (c)
-        {
-            case 'l':                            /* line length */
-                line_length = atoi( optarg );
-                if ( line_length < 0 || line_length > BUFFER_SIZE )
-                  error(ERR_FATAL, "(%d) is illegal line length\n",line_length);
-                break;
-
-            case 'n':                           /* toggle report_line_numbers */
-                report_line_numbers = ! report_line_numbers;
-                break;
-
-            case 'N':                           /* toggle both reports */
-                report_line_numbers = ! report_line_numbers;
-                report_line_length  = ! report_line_length;
-                break;
-
-            case 'v':                           /* toggle verbose */
-                verbose = ! verbose;
-                break;
-
-            case '?':
-                showusage = TRUE;
-        }
-
-    if (showusage)
-    {
-        (void) fprintf(stderr, "%s", USAGE);
-        exit(1);
-    }
-
-    /*
-     *  traverse and process the arguments
-     */
-
-    for ( ; argv[optind]; optind++)
-        if (Failed(process(argv[optind])))
-            rc = FAILURE;
-
-    return rc;
-}
-
-
-/*
- * process(arg)
- */
-
-int
-process(char *arg)
-{
-  FILE   *in;
-  char   *bptr;
-  char    buffer[ BUFFER_SIZE ];
-  int     line_number;
-  int     length;
-  int     count;
-  int     rc = SUCCESS;  /* succeed by default */
-
-  in = fopen( arg, "r" );
-  if (!in)
-    error( ERR_ERRNO | ERR_FATAL, "Unable to open file (%s)\n", arg );
-
-  count = 0;
-
-  for ( line_number=1 ; ; line_number++ ) {
-    bptr = fgets( buffer, BUFFER_SIZE, in );
-    if (!bptr)
-      break;
-
-    /*
-     *  Don't count the carriage return.
-     */
-
-    length = strlen( buffer ) - 1;
-
-    if ( length <= line_length )
-      continue;
-
-    if ( count == 0 ) {
-      fprintf( stderr, "%s\n", arg );
-      if ( !report_line_numbers )
-        break;
-    }
-
-    if ( verbose )
-      fprintf( stderr, "TOO LONG:%d: %s\n", line_number, buffer );
-
-    if ( report_line_numbers ) {
-      if ( report_line_length )
-        fprintf( stderr, "%d: %d\n" , line_number, length );
-      else
-        fprintf( stderr, "%d\n" , line_number );
-    }
-
-    count++;
-
-  }
-
-  fclose( in );
-  return rc;
-}
-
-/*
- * error(errn, arglist)
- *      report an error to stderr using printf(3) conventions.
- *      Any output is preceded by '<progname>: '
- *
- * Uses ERR_FATAL bit to request exit(errn)
- *      ERR_ABORT to request abort()
- *      ERR_ERRNO to indicate use of errno instead of argument.
- *
- * If resulting 'errn' is non-zero, it is assumed to be an 'errno' and its
- *      associated error message is appended to the output.
- */
-
-/*VARARGS*/
-
-void
-error(int error_flag, ...)
-{
-    va_list arglist;
-    register char *format;
-    int local_errno;
-
-    extern int errno;
-
-    (void) fflush(stdout);          /* in case stdout/stderr same */
-
-    local_errno = error_flag & ~ERR_MASK;
-    if (error_flag & ERR_ERRNO)     /* use errno? */
-        local_errno = errno;
-
-    va_start(arglist, error_flag);
-    format = va_arg(arglist, char *);
-    (void) fprintf(stderr, "%s: ", progname);
-    (void) vfprintf(stderr, format, arglist);
-    va_end(arglist);
-
-    if (local_errno)
-      (void) fprintf(stderr, " (%s)\n", strerror(local_errno));
-
-    (void) fflush(stderr);
-
-    if (error_flag & (ERR_FATAL | ERR_ABORT))
-    {
-        if (error_flag & ERR_FATAL)
-        {
-            error(0, "fatal error, exiting");
-            exit(local_errno ? local_errno : 1);
-        }
-        else
-        {
-            error(0, "fatal error, aborting");
-            abort();
-        }
-    }
-}
-
-long
-getparm(char *s,
-        long min,
-        long max,
-        char *msg)
-{
-    long val;
-
-    if ( ! strchr("0123456789-", *s))
-    {
-        error(ERR_FATAL, "'%s' is not a number", s);
-        return min;
-    }
-
-    val = strtol(s, (char **) NULL, 0);
-    if ((val < min) || (val > max))
-    {
-        if (min == max)
-            error(ERR_FATAL, "%s can only be %ld", s, min);
-        else
-            error(ERR_FATAL, "%s must be between %ld and %ld", msg, min, max);
-    }
-
-    return val;
-}
-
-
-/*
- * Open()
- *      Perform open(2), returning the file descriptor.  Prints
- *      error message if open fails.
- */
-
-int
-Open(char *file,
-     int oflag,
-     int mode)
-{
-    int O_fd;
-
-    if (Failed(O_fd = open(file, oflag, mode)))
-        error(
-          ERR_ERRNO | ERR_FATAL,
-          "open('%s', 0x%x, 0%o) failed", file, oflag, mode
-        );
-
-    return O_fd;
-}
-
-/*
- * Read()
- *      Perform read(2); prints error message if fails.
- */
-
-int
-Read(int file,
-     char *buffer,
-     unsigned int count)
-{
-    int nbytes;
-
-    if (Failed(nbytes = read(file, buffer, count)))
-        error(
-          ERR_ERRNO | ERR_FATAL,
-          "read(%d, 0x%x, %d) failed", file, buffer, count
-         );
-
-    return nbytes;
-}
-
-/*
- * Write()
- *      Perform write(2); prints error message if fails.
- */
-
-int
-Write(int file,
-      char *buffer,
-      unsigned int count)
-{
-    int nbytes;
-
-    if (Failed(nbytes = write(file, buffer, count)))
-        error(
-          ERR_ERRNO | ERR_FATAL,
-          "write(%d, 0x%x, %d) failed", file, buffer, count
-        );
-
-    return nbytes;
-}
diff --git a/c/build-tools/eolstrip.c b/c/build-tools/eolstrip.c
deleted file mode 100644
index c944ae6663..0000000000
--- a/c/build-tools/eolstrip.c
+++ /dev/null
@@ -1,366 +0,0 @@
-/*
- *  eolstrip - strip white space from end of lines
- *
- *  This program strips the white space from the end of every line in the
- *  specified program.
- *
- *  usage:  eolstrip  [ -v ] [ arg ... ] files...
- *           -v          -- verbose
- *
- * $Id$
- */
-
-#define GETOPTARGS "vt"
-
-char *USAGE = "\
-usage:  cklength  [ -v ] [ arg ... ] files... \n\
-            -v          -- verbose\n\
-            -t          -- test only .. DO NOT OVERWRITE FILE!!!\n\
-\n\
-Strip the white space from the end of every line on the list of files.\n\
-";
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <memory.h>
-#include <stdarg.h>
-#include <errno.h>
-
-#include "config.h"
-
-#ifndef VMS
-#ifndef HAVE_STRERROR
-extern int sys_nerr;
-extern char *sys_errlist[];
-
-#define strerror( _err ) \
-  ((_err) < sys_nerr) ? sys_errlist [(_err)] : "unknown error"
-
-#else   /* HAVE_STRERROR */
-char *strerror ();
-#endif
-#else   /* VMS */
-char *strerror (int,...);
-#endif
-
-
-#define BUFFER_SIZE     2048
-#define MAX_PATH        2048
-
-#define SUCCESS         0
-#define FAILURE         -1
-#define Failed(x)       (((int) (x)) == FAILURE)
-#define TRUE    1
-#define FALSE   0
-#define STREQ(a,b)      (strcmp(a,b) == 0)
-#define NUMELEMS(arr)   (sizeof(arr) / sizeof(arr[0]))
-
-/*
- * Definitions for unsigned "ints"; especially for use in data structures
- *  that will be shared among (potentially) different cpu's (we punt on
- *  byte ordering problems tho)
- */
-
-typedef unsigned char   u8;
-typedef unsigned short  u16;
-typedef unsigned long   u32;
-
-/*
- * vars controlled by command line options
- */
-
-int verbose = FALSE;                    /* be verbose */
-int test_only = FALSE;                  /* test only */
-
-extern char *optarg;                    /* getopt(3) control vars */
-extern int optind, opterr;
-
-char *progname;                         /* for error() */
-
-int process(char *arg);
-void error(int errn, ...);
-long getparm(char *s, long min, long max, char *msg);
-
-#define ERR_ERRNO  (1<<((sizeof(int) * 8) - 2)) /* hi bit; use 'errno' */
-#define ERR_FATAL  (ERR_ERRNO / 2)              /* fatal error ; no return */
-#define ERR_ABORT  (ERR_ERRNO / 4)              /* fatal error ; abort */
-#define ERR_MASK   (ERR_ERRNO | ERR_FATAL | ERR_ABORT) /* all */
-
-#define stol(p) strtol(p, (char **) NULL, 0)
-int  Open(), Read(), Write();
-
-int main(
-  int argc,
-  char **argv
-)
-{
-    register int c;
-    int showusage = FALSE;                      /* usage error? */
-    int rc = 0;
-
-    /*
-     * figure out invocation leaf-name
-     */
-
-    if ((progname = strrchr(argv[0], '/')) == (char *) NULL)
-        progname = argv[0];
-    else
-        progname++;
-
-    argv[0] = progname;                         /* for getopt err reporting */
-
-    /*
-     *  Check options and arguments.
-     */
-
-    opterr = 0;                                 /* we'll report all errors */
-    while ((c = getopt(argc, argv, GETOPTARGS)) != EOF)
-        switch (c)
-        {
-            case 't':                           /* toggle test only mode */
-                test_only = ! test_only;
-                break;
-
-            case 'v':                           /* toggle verbose */
-                verbose = ! verbose;
-                break;
-
-            case '?':
-                showusage = TRUE;
-        }
-
-    if (showusage)
-    {
-        (void) fprintf(stderr, "%s", USAGE);
-        exit(1);
-    }
-
-    /*
-     *  traverse and process the arguments
-     */
-
-    for ( ; argv[optind]; optind++)
-        if (Failed(process(argv[optind])))
-            rc = FAILURE;
-
-    return rc;
-}
-
-
-/*
- * process(arg)
- */
-
-int
-process(char *arg)
-{
-  FILE   *in;
-  FILE   *out = (FILE *) 0;
-  char    outname[ MAX_PATH ];
-  char   *bptr;
-  char    buffer[ BUFFER_SIZE ];
-  int     length;
-  int     line_number;
-  int     rc = SUCCESS;  /* succeed by default */
-
-  in = fopen( arg, "r" );
-  if (!in)
-    error( ERR_ERRNO | ERR_FATAL, "Unable to open file (%s)\n", arg );
-
-  if ( !test_only ) {
-    sprintf( outname, "%s.eoltmp", arg );
-
-    out = fopen( outname, "w" );
-    if (!out)
-      error( ERR_ERRNO | ERR_FATAL, "Unable to open file (%s)\n", arg );
-  }
-
-  if ( verbose )
-    fprintf( stderr, "Processing %s\n", arg );
-
-  for ( line_number=1 ; ; line_number++ ) {
-    bptr = fgets( buffer, BUFFER_SIZE, in );
-    if (!bptr)
-      break;
-
-    /*
-     *  Don't count the carriage return.
-     */
-
-    length = strlen( buffer ) - 1;
-
-    if ( buffer[ length ] != '\n' )
-      error(ERR_ERRNO|ERR_FATAL, "Line %d too long in %s\n", line_number, arg);
-
-    while ( isspace( (int) buffer[ length ] ) )
-      buffer[ length-- ] = '\0';
-
-    if ( test_only ) {
-      fprintf( stderr, "%s\n", arg );
-      break;
-    }
-
-    fprintf( out, "%s\n", buffer );
-  }
-
-  fclose( in );
-  if ( !test_only ) {
-    fclose( out );
-    rename( outname, arg );
-  }
-  return rc;
-}
-
-/*
- * error(errn, arglist)
- *      report an error to stderr using printf(3) conventions.
- *      Any output is preceded by '<progname>: '
- *
- * Uses ERR_FATAL bit to request exit(errn)
- *      ERR_ABORT to request abort()
- *      ERR_ERRNO to indicate use of errno instead of argument.
- *
- * If resulting 'errn' is non-zero, it is assumed to be an 'errno' and its
- *      associated error message is appended to the output.
- */
-
-/*VARARGS*/
-
-void
-error(int error_flag, ...)
-{
-    va_list arglist;
-    register char *format;
-    int local_errno;
-
-    extern int errno;
-
-    (void) fflush(stdout);          /* in case stdout/stderr same */
-
-    local_errno = error_flag & ~ERR_MASK;
-    if (error_flag & ERR_ERRNO)     /* use errno? */
-        local_errno = errno;
-
-    va_start(arglist, error_flag);
-    format = va_arg(arglist, char *);
-    (void) fprintf(stderr, "%s: ", progname);
-    (void) vfprintf(stderr, format, arglist);
-    va_end(arglist);
-
-    if (local_errno)
-      (void) fprintf(stderr, " (%s)\n", strerror(local_errno));
-    else
-      (void) fprintf(stderr, "\n");
-
-    (void) fflush(stderr);
-
-    if (error_flag & (ERR_FATAL | ERR_ABORT))
-    {
-        if (error_flag & ERR_FATAL)
-        {
-            error(0, "fatal error, exiting");
-            exit(local_errno ? local_errno : 1);
-        }
-        else
-        {
-            error(0, "fatal error, aborting");
-            abort();
-        }
-    }
-}
-
-long
-getparm(char *s,
-        long min,
-        long max,
-        char *msg)
-{
-    long val;
-
-    if ( ! strchr("0123456789-", *s))
-    {
-        error(ERR_FATAL, "'%s' is not a number", s);
-        return min;
-    }
-
-    val = strtol(s, (char **) NULL, 0);
-    if ((val < min) || (val > max))
-    {
-        if (min == max)
-            error(ERR_FATAL, "%s can only be %ld", s, min);
-        else
-            error(ERR_FATAL, "%s must be between %ld and %ld", msg, min, max);
-    }
-
-    return val;
-}
-
-
-/*
- * Open()
- *      Perform open(2), returning the file descriptor.  Prints
- *      error message if open fails.
- */
-
-int
-Open(char *file,
-     int oflag,
-     int mode)
-{
-    int O_fd;
-
-    if (Failed(O_fd = open(file, oflag, mode)))
-        error(
-          ERR_ERRNO | ERR_FATAL,
-          "open('%s', 0x%x, 0%o) failed", file, oflag, mode
-        );
-
-    return O_fd;
-}
-
-/*
- * Read()
- *      Perform read(2); prints error message if fails.
- */
-
-int
-Read(int file,
-     char *buffer,
-     unsigned int count)
-{
-    int nbytes;
-
-    if (Failed(nbytes = read(file, buffer, count)))
-        error(
-          ERR_ERRNO | ERR_FATAL,
-          "read(%d, 0x%x, %d) failed", file, buffer, count
-        );
-
-    return nbytes;
-}
-
-/*
- * Write()
- *      Perform write(2); prints error message if fails.
- */
-
-int
-Write(int file,
-      char *buffer,
-      unsigned int count)
-{
-    int nbytes;
-
-    if (Failed(nbytes = write(file, buffer, count)))
-        error(
-          ERR_ERRNO | ERR_FATAL,
-          "write(%d, 0x%x, %d) failed", file, buffer, count
-        );
-
-    return nbytes;
-}
diff --git a/c/build-tools/install-if-change.in b/c/build-tools/install-if-change.in
deleted file mode 100644
index b2f3cb04bb..0000000000
--- a/c/build-tools/install-if-change.in
+++ /dev/null
@@ -1,142 +0,0 @@
-#!@KSH@ -p
-#
-# Either bash or ksh will be ok for this; requires (( )) arithmetic
-#  (-p above just says to not parse $ENV file; makes it faster for
-#   those of us who set $ENV)
-#
-# install files if they have changed by running 'cmp', then 'install'
-#   as necessary.
-#
-#  Optionally, can append a suffix before last existing suffix (if any)
-#
-# NOTE
-#   We avoid using typical install(1M) programs since they have
-#   large variability across systems and we also need to support ou
-#   -V option.
-#   So we just copy and chmod by hand.
-#
-# $Id$
-#
-
-progname=`basename $0`
-#progname=${0##*/}        # fast basename hack for ksh, bash
-
-USAGE=\
-"usage: $progname [ -vmV ] file [ file ... ] dest-directory-or-file
-	-v	    -- verbose
-        -V suffix   -- suffix to append to targets (before any . suffix)
-                        eg: -V _g would change 'foo' to 'foo_g' and
-                                               'libfoo.a' to 'libfoo_g.a'
-        -m mode     -- mode for new file(s)"
-
-fatal() {
-    if [ "$1" ]
-    then
-        echo $* >&2
-    fi
-    echo "$USAGE" 1>&2
-    exit 1
-}
-
-#
-# process the options
-#
-
-verbose=""
-suffix=""
-mode=""
-
-while getopts vm:V: OPT
-do
-    case "$OPT" in
-	v)
-	    verbose="yes";;
-        V)
-            eval suffix=$OPTARG;;
-        m)
-            mode="$OPTARG";;
-        *)
-            fatal
-    esac
-done
-
-shiftcount=`expr $OPTIND - 1`
-shift $shiftcount
-
-args=$*
-
-#
-# Separate source file(s) from dest directory or file
-#
-
-files=""
-dest=""
-for d in $args
-do
-    files="$files $dest"
-    dest=$d
-done
-
-if [ ! "$files" ] || [ ! "$dest" ]
-then
-    fatal "missing files or invalid destination"
-fi
-
-#
-# Process the arguments
-#
-
-targets=""
-for f in $files
-do
-    # leaf=`basename $f`
-    leaf=${f##*/}        # fast basename hack for ksh, bash
-
-    target=$dest
-    if [ -d $dest ]
-    then
-        # if we were given a suffix, then add it as appropriate
-        if [ "$suffix" ]
-        then
-            case $f in
-                *.*)
-                    # leaf=`echo $leaf |
-                    #   /bin/sed "s/\([~\.]*\)\.\(.*\)$/\1$suffix.\2/"`
-                    # ksh,bash hack for above sed script
-                    leaf=${leaf%%.*}$suffix.${leaf#*.}
-
-                    [ "$verbose" = "yes" ] &&
-                      echo "$progname: $f will be installed as $leaf"
-                    ;;
-                *)
-                    leaf=$leaf$suffix;;
-            esac
-        fi
-        target=$target/$leaf
-    fi
-
-    [ ! -r $f ] && fatal "can not read $f"
-
-    if cmp -s $f $target
-    then
-        [ "$verbose" = "yes" ] && echo "'$f' not newer than '$target'"
-    else
-        [ "$verbose" = "yes" ] && echo "rm -f $target"
-        rm -f $target
-        echo "cp -p $f $target"
-        cp -p $f $target || exit 1
-        targets="$targets $target"    # keep list for chmod below
-    fi
-done
-
-if [ "$mode" -a "$targets" ]
-then
-     [ "$verbose" = "yes" ] && echo "chmod $mode $targets"
-     chmod $mode $targets
-fi
-
-exit 0
-
-# Local Variables: ***
-# mode:ksh ***
-# End: ***
diff --git a/c/build-tools/lock-directory.in b/c/build-tools/lock-directory.in
deleted file mode 100644
index 1c205cdec0..0000000000
--- a/c/build-tools/lock-directory.in
+++ /dev/null
@@ -1,43 +0,0 @@
-#!@KSH@
-#
-# $Id$
-#
-# Make a directory write protected
-# Used to write protect the install point after a build
-# to prevent inadvertant overwriting.
-#
-
-# is a particular command available on this machine?
-#
-cmd_avail()
-{
-    set -- `type $1 2>&1`
-    if [ "$2" = "not" -a "$3" = "found" ] || [ "$3" = "not" -a "$4" = "found" ]
-    then
-        return 1
-    else
-        return 0
-    fi
-}
-
-lock_directory() {
-    l_dir=$1/.			# get any symlink out of the way using '.'
-    if [ -d $l_dir ]
-    then
-        find $l_dir -type d -perm -0200 -print | $XARGS chmod -w
-    fi
-}
-
-# Use gnu xargs if available; faster, more reliable in general
-XARGS=xargs
-cmd_avail gxargs && XARGS=gxargs
-
-for dir
-do
-    lock_directory $dir
-done
-
-# Local Variables: ***
-# mode:ksh ***
-# End: ***
-
diff --git a/c/build-tools/packhex.c b/c/build-tools/packhex.c
deleted file mode 100644
index 3b85a7c927..0000000000
--- a/c/build-tools/packhex.c
+++ /dev/null
@@ -1,565 +0,0 @@
-
-/*****  P A C K H E X . C  ************************************************
- *
- *   Packhex is a hex-file compaction utility.  It attempts to concatenate
- *   hex records to produce more size-efficient packaging.
- *
- *   Limitations: Input files must be correctly formatted.  This utility
- *                is not robust enough to detect hex-record formatting
- *                errors.
- *
- *   Published:   May 1993 Embedded Systems Programming magazine
- *                "Creating Faster Hex Files"
- *
- *   URL:         ESP magazine: http://www.embedded.com
- *                Source Code:  ftp://ftp.mfi.com/pub/espmag/1993/pakhex.zip
- *
- *   Author:      Mark Gringrich
- *
- *   Compiler:    Microsoft C 6.0
- *                cl /F 1000 packhex.c
- *
- *
- *   $Id$
- *
- **************************************************************************/
-
-
-/* #define SMALLER_RECORDS */
-#ifdef SMALLER_RECORDS
-#define MAX_LEN_S1_RECS 128
-#define MAX_LEN_S2_RECS 128
-#define MAX_LEN_S3_RECS 128
-#else
-#define MAX_LEN_S1_RECS 252
-#define MAX_LEN_S2_RECS 251
-#define MAX_LEN_S3_RECS 250
-#endif
-
-
-/*--------------------------------- includes ---------------------------------*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "config.h"
-
-#ifndef VMS
-#ifndef HAVE_STRERROR
-extern int sys_nerr;
-extern char *sys_errlist[];
-
-#define strerror( _err ) \
-  ((_err) < sys_nerr) ? sys_errlist [(_err)] : "unknown error"
-
-#else   /* HAVE_STRERROR */
-char *strerror ();
-#endif
-#else   /* VMS */
-char *strerror (int,...);
-#endif
-
-#if defined(__unix__) && !defined(EXIT_FAILURE)
-#define EXIT_FAILURE -1
-#define EXIT_SUCCESS  0
-#endif
-
-/*--------------------------------- defines ----------------------------------*/
-
-#define YES                   1
-#define MAX_LINE_SIZE       600
-#define EOS                 '\0'
-
-
-/*---------------------------------- macros ----------------------------------*/
-
-/* Convert ASCII hexadecimal digit to value. */
-
-#define HEX_DIGIT( C )   ( ( ( ( C ) > '9' ) ? ( C ) + 25 : ( C ) ) & 0xF )
-
-
-/*--------------------------------- typedefs ---------------------------------*/
-
-typedef unsigned char   Boolean;
-typedef unsigned char   Uchar;
-typedef unsigned int    Uint;
-typedef unsigned long   Ulong;
-
-typedef struct   /* Functions and constant returning Hex-record vital stats. */
-{
-    Boolean    ( *is_data_record  )( char *              );
-    Ulong      ( *get_address     )( char *              );
-    Uint       ( *get_data_count  )( char *              );
-    const Uint    max_data_count;
-    char      *( *get_data_start  )( char *              );
-    void       ( *put_data_record )( Uint, Ulong, char * );
-} Rec_vitals;
-
-
-/*--------------------------- function prototypes ----------------------------*/
-
-Rec_vitals  * identify_first_data_record( char *, int );
-Ulong         get_ndigit_hex( char *, int );
-
-
-/*----------------------------- Intel Hex format -----------------------------*/
-
-/*
- *    Intel Hex data-record layout
- *
- *    :aabbbbccd...dee
- *
- *    :      - header character
- *    aa     - record data byte count, a 2-digit hex value
- *    bbbb   - record address, a 4-digit hex value
- *    cc     - record type, a 2-digit hex value:
- *              "00" is a data record
- *              "01" is an end-of-data record
- *              "02" is an extended-address record
- *              "03" is a start record
- *    d...d  - data (always an even number of chars)
- *    ee     - record checksum, a 2-digit hex value
- *             checksum = 2's complement
- *                 [ (sum of bytes: aabbbbccd...d) modulo 256 ]
- */
-
-
-Boolean is_intel_data_rec( char * rec_str )
-{
-    return( ( rec_str[ 0 ] == ':' )  &&  ( rec_str[ 8 ] == '0' ) );
-}
-
-Uint get_intel_rec_data_count( char * rec_str )
-{
-    return( ( Uint ) get_ndigit_hex( rec_str + 1, 2 ) );
-}
-
-Ulong get_intel_rec_address( char * rec_str )
-{
-    return( get_ndigit_hex( rec_str + 3, 4 ) );
-}
-
-char * get_intel_rec_data_start( char * rec_str )
-{
-    return( rec_str + 9 );
-}
-
-void put_intel_data_rec( Uint count, Ulong address, char * data_str )
-{
-    char    *ptr;
-    Uint    sum = count + ( address >> 8 & 0xff ) + ( address & 0xff );
-
-    for ( ptr = data_str ; *ptr != EOS ; ptr += 2 )
-        sum += ( Uint ) get_ndigit_hex( ptr, 2 );
-
-    printf(
-      ":%02X%04lX00%s%02X\n", count, address, data_str, (~sum + 1) & 0xff
-    );
-}
-
-
-Rec_vitals  intel_hex =
-{
-    is_intel_data_rec,
-    get_intel_rec_address,
-    get_intel_rec_data_count,
-    255,                        /* Maximum data bytes in a record. */
-    get_intel_rec_data_start,
-    put_intel_data_rec
-};
-
-
-/*------------------------- Motorola S1-record format ------------------------*/
-
-/*
- *    Motorola S-record data-record layout
- *
- *    Sabbc...cd...dee
- *
- *    S      - header character
- *    a      - record type, a 1-digit value:
- *               "0" is a header record
- *               "1" is a 2-byte-address data record
- *               "2" is a 3-byte-address data record
- *               "3" is a 4-byte-address data record
- *               "7" is a 4-byte-address end-of-data record
- *               "8" is a 3-byte-address end-of-data record
- *               "9" is a 2-byte-address end-of-data record
- *    bb     - record length in bytes, a 2-digit hex value
- *             (record length doesn't count the header/type
- *              chars and checksum byte)
- *    c...c  - record address, a 4-, 6-, or 8-digit value,
- *               depending on record type
- *    d...d  - data (always an even number of chars)
- *    ee     - record checksum, a 2-digit hex value
- *             checksum = 1's complement
- *             [ (sum of all bytes: bbc..cd...d) modulo 256 ]
- */
-
-#define S1_COUNT_OFFSET         3
-
-
-Boolean is_moto_s1_data_rec( char * rec_str )
-{
-    return ( ( rec_str[ 0 ] == 'S' )  &&  ( rec_str[ 1 ] == '1' ) );
-}
-
-Uint get_moto_s1_rec_data_count( char * rec_str )
-{
-    return( ( Uint ) get_ndigit_hex( rec_str + 2, 2 ) - S1_COUNT_OFFSET );
-}
-
-Ulong get_moto_s1_rec_address( char * rec_str )
-{
-    return( get_ndigit_hex( rec_str + 4, 4 ) );
-}
-
-char * get_moto_s1_rec_data_start( char * rec_str )
-{
-    return( rec_str + 8 );
-}
-
-void put_moto_s1_data_rec( Uint count, Ulong address, char * data_str )
-{
-    char   *ptr;
-    Uint    sum = S1_COUNT_OFFSET + count +
-                    ( address >> 8 & 0xff ) + ( address & 0xff );
-
-    for ( ptr = data_str ; *ptr != EOS ; ptr += 2 )
-        sum += ( Uint ) get_ndigit_hex( ptr, 2 );
-
-    printf(
-      "S1%02X%04lX%s%02X\n",
-      count + S1_COUNT_OFFSET, address, data_str, ~sum & 0xff
-    );
-}
-
-
-Rec_vitals  motorola_s1_rec =
-{
-    is_moto_s1_data_rec,
-    get_moto_s1_rec_address,
-    get_moto_s1_rec_data_count,
-    MAX_LEN_S1_RECS,            /* Maximum data bytes in a record. */
-    get_moto_s1_rec_data_start,
-    put_moto_s1_data_rec
-};
-
-
-/*------------------------- Motorola S2-record format ------------------------*/
-
-#define S2_COUNT_OFFSET         4
-
-Boolean is_moto_s2_data_rec( char * rec_str )
-{
-    return ( ( rec_str[ 0 ] == 'S' )  &&  ( rec_str[ 1 ] == '2' ) );
-}
-
-Uint get_moto_s2_rec_data_count( char * rec_str )
-{
-    return( ( Uint ) get_ndigit_hex( rec_str + 2, 2 ) - S2_COUNT_OFFSET );
-}
-
-Ulong get_moto_s2_rec_address( char * rec_str )
-{
-    return( get_ndigit_hex( rec_str + 4, 6 ) );
-}
-
-char * get_moto_s2_rec_data_start( char * rec_str )
-{
-    return( rec_str + 10 );
-}
-
-void put_moto_s2_data_rec( Uint count, Ulong address, char * data_str )
-{
-    char    *ptr;
-    Uint    sum = S2_COUNT_OFFSET + count + ( address >> 16 & 0xff ) +
-                                            ( address >>  8 & 0xff ) +
-                                            ( address       & 0xff );
-
-    for ( ptr = data_str ; *ptr != EOS ; ptr += 2 )
-        sum += ( Uint ) get_ndigit_hex( ptr, 2 );
-
-    printf(
-      "S2%02X%06lX%s%02X\n",
-      count + S2_COUNT_OFFSET, address, data_str, ~sum & 0xff
-    );
-}
-
-
-Rec_vitals  motorola_s2_rec =
-{
-    is_moto_s2_data_rec,
-    get_moto_s2_rec_address,
-    get_moto_s2_rec_data_count,
-    MAX_LEN_S2_RECS,            /* Maximum data bytes in a record. */
-    get_moto_s2_rec_data_start,
-    put_moto_s2_data_rec
-};
-
-
-/*------------------------- Motorola S3-record format ------------------------*/
-
-#define S3_COUNT_OFFSET         5
-
-Boolean is_moto_s3_data_rec( char * rec_str )
-{
-    return ( ( rec_str[ 0 ] == 'S' )  &&  ( rec_str[ 1 ] == '3' ) );
-}
-
-Uint get_moto_s3_rec_data_count( char * rec_str )
-{
-    return( ( Uint ) get_ndigit_hex( rec_str + 2, 2 ) - S3_COUNT_OFFSET );
-}
-
-Ulong get_moto_s3_rec_address( char * rec_str )
-{
-    return( get_ndigit_hex( rec_str + 4, 8 ) );
-}
-
-char * get_moto_s3_rec_data_start( char * rec_str )
-{
-    return( rec_str + 12 );
-}
-
-void put_moto_s3_data_rec( Uint count, Ulong address, char * data_str )
-{
-    char    *ptr;
-    Uint     sum = S3_COUNT_OFFSET + count + ( address >> 24 & 0xff ) +
-                                             ( address >> 16 & 0xff ) +
-                                             ( address >>  8 & 0xff ) +
-                                             ( address       & 0xff );
-
-    for ( ptr = data_str ; *ptr != EOS ; ptr += 2 )
-        sum += ( Uint ) get_ndigit_hex( ptr, 2 );
-
-    printf(
-      "S3%02X%08lX%s%02X\n",
-      count + S3_COUNT_OFFSET, address, data_str, ~sum & 0xff
-   );
-}
-
-
-Rec_vitals  motorola_s3_rec =
-{
-    is_moto_s3_data_rec,
-    get_moto_s3_rec_address,
-    get_moto_s3_rec_data_count,
-    MAX_LEN_S3_RECS,            /* Maximum data bytes in a record. */
-    get_moto_s3_rec_data_start,
-    put_moto_s3_data_rec
-};
-
-
-/*-------------------- Put your favorite hex format here ---------------------*/
-
-/*
- *    * * *  The following is a template for an additional hex format:  * * *
- *
- *
- *    Boolean is_X_data_rec( char * rec_str ) {}
- *
- *    Uint get_X_rec_data_count( char * rec_str ) {}
- *
- *    Ulong get_X_rec_address( char * rec_str ) {}
- *
- *    char * get_X_rec_data_start( char * rec_str ) {}
- *
- *    void put_X_data_rec( Uint count, Ulong address, char * data_str ) {}
- *
- *    Rec_vitals  X_rec =
- *    {
- *        is_X_data_rec,
- *        get_X_rec_address,
- *        get_X_rec_data_count,
- *        MAXIMUM DATA BYTES IN A RECORD,
- *        get_X_rec_data_start,
- *        put_X_data_rec
- *    };
- *
- */
-
-/*----------------------------------------------------------------------------*/
-
-
-/*
- *   Put address of additional Rec_vitals structures
- *   in this array, before the NULL entry.
- */
-
-Rec_vitals  *formats[] =
-{
-    &intel_hex,
-    &motorola_s1_rec,
-    &motorola_s2_rec,
-    &motorola_s3_rec,
-    ( Rec_vitals * ) NULL
-};
-
-
-/****   main   *****************************************************************
-*
-*
-*       Expects: Nothing (no command-line parameters).
-*
-*       Returns: Exit status (EXIT_SUCCESS or EXIT_FAILURE).
-*
-*       Reads hex records on the standard input and attempts to
-*       splice adjacent data fields together.  Results appear on
-*       the standard output.
-*
-*******************************************************************************/
-
-int main(
-  int argc,
-  char **argv
-)
-{
-
-    char       inbuff[ MAX_LINE_SIZE ], outbuff[ MAX_LINE_SIZE ];
-    char       *in_dptr, *out_dptr;
-    int        d_total, d_count, d_excess, n;
-    int        length;
-    Ulong      in_rec_addr, out_rec_addr = 0;
-    Rec_vitals *rptr;
-
-
-    /* Sift through file until first hex record is identified.    */
-
-    rptr = identify_first_data_record( inbuff, MAX_LINE_SIZE );
-    if ( rptr == NULL )
-    {
-        fputs( "No hex records found.\n", stderr );
-        exit( EXIT_FAILURE );
-    }
-
-
-    /* Attempt data-record splicing until end-of-file is reached. */
-    d_total = 0;
-    for (;;) {
-        if ( rptr->is_data_record( inbuff ) == YES )
-        { /* Input record is a data record. */
-            d_count     = rptr->get_data_count( inbuff );
-            in_rec_addr = rptr->get_address( inbuff );
-            in_dptr     = rptr->get_data_start( inbuff );
-
-            if ( d_total == 0  ||  in_rec_addr != out_rec_addr + d_total )
-            { /* Begin a new output record. */
-                if ( d_total != 0 )
-                    rptr->put_data_record( d_total, out_rec_addr, outbuff );
-                out_dptr     = outbuff;
-                n = d_total  = d_count;
-                out_rec_addr = in_rec_addr;
-            }
-            else if
-              ( ( d_excess = d_total + d_count - rptr->max_data_count ) > 0 )
-            { /* Output a maximum-length record, then start a new record. */
-                strncat( outbuff, in_dptr, 2 * ( d_count - d_excess ) );
-                rptr->put_data_record(
-                  rptr->max_data_count, out_rec_addr, outbuff
-                );
-                in_dptr      += 2 * ( d_count - d_excess );
-                out_dptr      = outbuff;
-                n = d_total   = d_excess;
-                out_rec_addr += rptr->max_data_count;
-            }
-            else
-            { /* Append input record's data field with accumulated data. */
-                out_dptr = outbuff + ( 2 * d_total );
-                d_total += n = d_count;
-            }
-            strncpy( out_dptr, in_dptr, 2 * n );
-            out_dptr[ 2 * n ] = EOS;
-        }
-        else
-        { /* Not a data record;
-           * flush accumulated data then echo non-data record.
-           */
-            if ( d_total != 0 )
-            {
-                rptr->put_data_record( d_total, out_rec_addr, outbuff );
-                d_total = 0;
-            }
-            puts( inbuff );
-        }
-
-        inbuff[ MAX_LINE_SIZE - 1 ] = '\0';
-        if ( !fgets( inbuff, MAX_LINE_SIZE, stdin ) )
-           break;
-        if ( inbuff[ MAX_LINE_SIZE - 1 ] ) {
-           fprintf( stderr, "Input line too long" );
-           exit( 1 );
-        }
-        length = strlen(inbuff);
-        inbuff[length - 1] = '\0';
-        
-    }
-
-
-    return ( EXIT_SUCCESS );
-
-}
-
-
-/****   identify_first_data_record   *******************************************
-*
-*       Expects: Pointer to hex-record line buffer.
-*
-*       Returns: Pointer to hex-record structure (NULL if no match found).
-*
-*       Reads the standard input, line by line, searching for a valid
-*       record header character.  If a valid header is found, a pointer
-*       to the hex-record's type structure is returned, otherwise NULL.
-*
-*       The input-stream pointer is left pointing to the first valid hex record.
-*
-*******************************************************************************/
-
-Rec_vitals * identify_first_data_record( char * buff_ptr, int max_length )
-{
-    Rec_vitals  ** ptr;
-    int            length;
-
-
-
-    for ( ;; ) {
-
-        buff_ptr[ max_length - 1 ] = '\0';
-        if ( !fgets( buff_ptr, max_length, stdin ) )
-           break;
-        if ( buff_ptr[ max_length - 1 ] ) {
-           fprintf( stderr, "Input line too long" );
-           exit( 1 );
-        }
-        length = strlen(buff_ptr);
-        buff_ptr[length - 1] = '\0';
-
-        for ( ptr = formats ; *ptr != ( Rec_vitals * ) NULL ; ptr++ )
-            if ( ( *ptr )->is_data_record( buff_ptr ) == YES )
-                return( *ptr );        /* Successful return.        */
-
-        puts( buff_ptr );              /* Echo non-hex-record line. */
-    }
-
-    return( ( Rec_vitals * ) NULL );   /* Unsuccessful return.      */
-}
-
-
-/****   get_ndigit_hex   *******************************************************
-*
-*       Expects: Pointer to first ASCII hexadecimal digit, number of digits.
-*
-*       Returns: Value of hexadecimal string as an unsigned long.
-*
-*******************************************************************************/
-
-Ulong get_ndigit_hex( char * cptr, int digits )
-{
-    Ulong    value;
-
-    for ( value = 0 ; --digits >= 0 ; cptr++ )
-        value = ( value * 16L ) + HEX_DIGIT( *cptr );
-
-    return( value );
-}
diff --git a/c/build-tools/rcs-clean.in b/c/build-tools/rcs-clean.in
deleted file mode 100644
index 83fed05128..0000000000
--- a/c/build-tools/rcs-clean.in
+++ /dev/null
@@ -1,73 +0,0 @@
-#!@KSH@ -p
-#
-#  $Id$
-#
-# Delete all files from the current directory that can be recreated
-#  via RCS 'co' commonds
-# Used by 'make clobber'
-#
-
-progname=${0##*/}        # fast basename hack for ksh, bash
-
-USAGE=\
-"usage: $progname [ -v ]"
-
-fatal() {
-    if [ "$1" ]
-    then
-        echo $* >&2
-    fi
-    echo "$USAGE" 1>&2
-    exit 1
-}
-
-#
-# process the options
-#
-
-verbose=""
-
-while getopts v OPT
-do
-    case "$OPT" in
-	v)
-	    verbose="yes";;
-        *)
-            fatal
-    esac
-done
-
-let $((shiftcount = $OPTIND - 1))
-shift $shiftcount
-
-args=$*
-[ "$args" ] && fatal
-
-[ -d RCS/. ] || exit 0
-
-# there is probably a better way to do this
-
-rcs_files=`echo RCS/*,v | sed -e 's?RCS/??g' -e's/,v//g'`
-
-kills=""
-for f in $rcs_files
-do
-   # build list of all files in RCS/*,v that are *not* locked
-   if [ -f $f ] && [ ! -w $f ] && [ -f RCS/$f,v ]
-   then
-        locked=`rlog -L -R $f`
-        [ "$locked" = "" ] && kills="$kills $f"
-   fi
-done
-
-if [ "$kills" ]
-then
-     [ "$verbose" ] && echo rm -f $kills
-     rm -f $kills
-fi
-
-exit 0
-
-# Local Variables: ***
-# mode:ksh ***
-# End: ***
diff --git a/c/build-tools/search-id.sh b/c/build-tools/search-id.sh
deleted file mode 100644
index a94d2d7cc9..0000000000
--- a/c/build-tools/search-id.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-#
-#  $Id$
-#
-
-find $1 -type f -a ! -name "*.scn" -a ! -name "bsp_specs" -a \
-	-print  > /tmp/$$.0
-find $1 -type f -a ! -name "*.scn" -a ! -name "bsp_specs" -a \
-	-exec grep -l '$Id' {} \;  > /tmp/$$.1
-
-diff /tmp/$$.0 /tmp/$$.1 > /tmp/$$.2
-
-grep "<" /tmp/$$.2 | sed 's/< //' >&1
-
-rm -f /tmp/$$*
diff --git a/c/build-tools/unhex.c b/c/build-tools/unhex.c
deleted file mode 100644
index 6a75a13ae7..0000000000
--- a/c/build-tools/unhex.c
+++ /dev/null
@@ -1,738 +0,0 @@
-/*
- * unhex
- *      convert a hex file to binary equivalent.  If more than one file name
- *      is given, then the output will be logically concatenated together.
- *      stdin and stdout are defaults. Verbose will enable checksum output.
- *
- *  Supported input formats are Intel hex, Motorola S records, and TI 'B'
- *  records.
- *
- * Intel hex input format is
- *      Byte
- *       1          Colon :
- *       2..3       Record length, eg: "20"
- *       4..7       load address nibbles
- *       8..9       record type: "00" (data) or "02" base addr
- *       10..x      data bytes in ascii-hex
- *       x+1..x+2   cksum (2's compl of (len+addr+data))
- *       x+3        \n -- newline
- *
- *  $Id$
- */
-
-char *USAGE = "\
-usage:    unhex [-va] [ -o file ] [ file [file ... ] ]\n\
-                -v          -- verbose\n\
-                -a base     -- 1st byte of output corresponds to this address\n\
-                -l          -- linear, just writes data out\n\
-                -o file     -- output file; must not be input file\n\
-                -F k_bits   -- \"holes\" in input will be filled with 0xFF's\n\
-                                  up to \"k_bits\" * 1024 bits\n\
-";
-
-#include <stdio.h>
-#include <fcntl.h>
-#include <ctype.h>
-#include <string.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <errno.h>
-
-#include "config.h"
-
-#ifndef VMS
-#ifndef HAVE_STRERROR
-extern int sys_nerr;
-extern char *sys_errlist[];
-
-#define strerror( _err ) \
-  ((_err) < sys_nerr) ? sys_errlist [(_err)] : "unknown error"
-
-#else   /* HAVE_STRERROR */
-char *strerror ();
-#endif
-#else   /* VMS */
-char *strerror (int,...);
-#endif
-
-
-#define OK      0
-#define FAILURE (-1)
-#define Failed(x)       ((x) == FAILURE)
-#define TRUE    1
-#define FALSE   0
-typedef char bool;
-#define STREQ(a,b)      (strcmp(a,b) == 0)
-
-typedef unsigned char u8;
-typedef unsigned short u16;
-typedef unsigned long u32;
-
-/*
- * Pick out designated bytes
- */
-
-#define B0(x)       ((x) & 0xff)
-#define B1(x)       B0((x) >> 8)
-#define B2(x)       B0((x) >> 16)
-#define B3(x)       B0((x) >> 24)
-
-typedef struct buffer_rec {
-    u32 dl_destaddr;
-    u32 dl_jumpaddr;
-    int dl_count;
-    u8  dl_buf[512];
-} buffer_rec;
-
-/*
- * vars controlled by command line options
- */
-
-bool verbose = FALSE;                   /* be verbose */
-bool linear = FALSE;                    /* just write out linear data */
-char *outfilename = "-";                /* default output is stdout */
-u32 base = 0L;                         /* base address */
-u32 FFfill = 0L;                       /* how far to fill w 0xFF's */
-
-extern char *optarg;                    /* getopt(3) control vars */
-extern int optind;
-
-char *progname;                         /* for error() */
-
-void error(int errn, ...);
-#define ERR_ERRNO  (1<<((sizeof(int) * 8) - 2)) /* hi bit; use 'errno' */
-#define ERR_FATAL  (ERR_ERRNO / 2)              /* error is fatal; no return */
-#define ERR_ABORT  (ERR_ERRNO / 4)              /* error is fatal; abort */
-#define ERR_MASK   (ERR_ERRNO | ERR_FATAL | ERR_ABORT) /* all */
-
-#ifdef HAVE_STRTOUL
-#define stol(p) strtoul(p, (char **) NULL, 0)
-#else
-#define stol(p) strtol(p, (char **) NULL, 0)
-#endif
- 
-int   unhex(FILE *ifp, char *inm, FILE *ofp, char *onm);
-int   convert_Intel_records(FILE *ifp, char *inm, FILE *ofp, char *onm);
-int   convert_S_records(FILE *ifp, char *inm, FILE *ofp, char *onm);
-int   convert_TI_records(FILE *ifp, char *inm, FILE *ofp, char *onm);
-void  write_record(buffer_rec *tb, FILE *fp);
-int   getnibble(char **p);
-int   getbyte(char **p);
-long  getNbytes(char **p, int n);
-void  badformat(char *s, char *fname, char *msg);
-
-#define get1bytes(p)    ((int) getbyte(p))
-#define get2bytes(p)    ((int) getNbytes(p, 2))
-#define get3bytes(p)    getNbytes(p, 3)
-#define get4bytes(p)    getNbytes(p, 4)
-
-char *BADADDR = "Invalid record address";
-char *BADLEN  = "Invalid record length";
-char *BADBASE = "Bad base or starting address";
-char *BADFMT =  "Unrecognized record type";
-char *BADDATA = "Invalid data byte";
-char *BADCSUM = "Invalid checksum";
-char *MISCSUM = "Checksum mismatch";
-char *BADTYPE = "Unrecognized record type";
-char *MISTYPE = "Incompatible record types";
-
-int main(
-  int argc,
-  char **argv
-)
-{
-    register int c;
-    bool showusage = FALSE;                     /* usage error? */
-    int rc = 0;
-    FILE *outfp, *infp;
-
-    /*
-     * figure out invocation leaf-name
-     */
-
-    if ((progname = strrchr(argv[0], '/')) == (char *) NULL)
-        progname = argv[0];
-    else
-        progname++;
-
-    argv[0] = progname;                         /* for getopt err reporting */
-
-    /*
-     *  Check options and arguments.
-     */
-
-    progname = argv[0];
-    while ((c = getopt(argc, argv, "F:a:o:vl")) != EOF)
-        switch (c)
-        {
-            case 'a':                           /* base address */
-                base = stol(optarg);
-                break;
-
-            case 'l':                           /* linear output */
-                linear = TRUE;
-                break;
-
-            case 'v':                           /* toggle verbose */
-                verbose = ! verbose;
-                break;
-
-            case 'o':                           /* output file */
-                outfilename = optarg;
-                break;
-
-            case 'F':                           /* 0xFF fill amount (bytes) */
-                FFfill = stol(optarg) * 1024L / 8L;
-                break;
-
-            case '?':
-                showusage = TRUE;
-        }
-
-    if (showusage)
-    {
-        (void) fprintf(stderr, "%s", USAGE);
-        exit(1);
-    }
-
-    if (linear && (base != 0))
-    {
-        error(0, "-l and -a may not be specified in combination");
-        exit(1);
-    }
-
-    if (STREQ(outfilename, "-"))
-    {
-        outfp = stdout;
-        outfilename = "stdout";
-    }
-    else
-        if ((outfp = fopen(outfilename, "w")) == (FILE *) NULL)
-        {
-            error(-1, "couldn't open '%s' for output", outfilename);
-            exit(1);
-        }
-
-    /*
-     * Now process the input files (or stdin, if none specified)
-     */
-
-    if (argv[optind] == (char *) NULL)          /* just stdin */
-        exit(unhex(stdin, "stdin", outfp, outfilename));
-    else
-        for (; (optarg = argv[optind]); optind++)
-        {
-            if (STREQ(optarg, "-"))
-                rc += unhex(stdin, "stdin", outfp, outfilename);
-            else
-            {
-                if ((infp = fopen(optarg, "r")) == (FILE *) NULL)
-                {
-                    error(-1, "couldn't open '%s' for input", optarg);
-                    exit(1);
-                }
-                rc += unhex(infp, optarg, outfp, outfilename);
-            }
-        }
-
-    return(rc);
-}
-
-u16 filesum;
-
-int
-unhex(FILE *ifp,
-      char *inm,
-      FILE *ofp,
-      char *onm)
-{
-    int c;
-
-    filesum = 0;
-
-    /*
-     * Make sure holes will be filled with 0xFF's if requested.  We
-     *  do this the easy way by just filling the file with FF's before
-     *  getting started.  To do it more optimally would be quite a bit
-     *  more difficult since the user can skip around as much as he/she
-     *  likes in the input hex file addressing.
-     *
-     *  We'll clean this up later (after this program has run) with
-     *  'stripffs'
-     */
-
-    if (FFfill)
-    {
-        (void) fseek(ofp, 0, 0);
-        for (c = FFfill; c > 0; c--)
-            (void) fputc(0xFF, ofp);
-    }
-
-    /*
-     * Read the first char from file and determine record types
-     */
-
-    if ((c = getc(ifp)) != EOF)
-    {
-        ungetc(c, ifp);
-        switch(c)
-        {
-            case 'S':
-                convert_S_records(ifp, inm, ofp, onm);
-                break;
-
-            case ':':
-                convert_Intel_records(ifp, inm, ofp, onm);
-                break;
-
-            case '9':
-            case 'B':
-                convert_TI_records(ifp, inm, ofp, onm);
-                break;
-
-            default:
-            {
-                char tmp[2];
-                tmp[0] = c; tmp[1] = 0;
-                badformat(tmp, inm, BADFMT);
-            }
-        }
-    }
-
-    if (verbose)
-        fprintf(stderr, "'%s' checksum is 0x%04x\n", inm, filesum);
-
-    return 0;
-}
-
-int
-convert_Intel_records(
-    FILE *ifp,
-    char *inm,
-    FILE *ofp,
-    char *onm)
-{
-    char buff[512];
-    char *p;
-    u8 cksum;
-    int incksum;
-    int c;
-    int rectype;                    /* record type */
-    int len;                        /* data length of current line */
-    u32 addr;
-    u32 base_address = 0;
-    bool endrecord = FALSE;
-    buffer_rec tb;
-
-    while ( ! endrecord && (fgets(buff, sizeof(buff), ifp)))
-    {
-        p = &buff[0];
-
-        if (p[strlen(p)-1] == '\n')                 /* get rid of newline */
-            p[strlen(p)-1] = '\0';
-
-        if (p[strlen(p)-1] == '\r')                 /* get rid of any CR */
-            p[strlen(p)-1] = '\0';
-
-        tb.dl_count = 0;
-
-        if (*p != ':')
-            badformat(p, inm, BADFMT);
-        p++;
-
-        if ((len = getbyte(&p)) == -1)      /* record len */
-            badformat(buff, inm, BADLEN);
-
-        if ((addr = get2bytes(&p)) == -1L)          /* record addr */
-            badformat(buff, inm, BADADDR);
-
-        rectype = getbyte(&p);
-
-        cksum = len + B0(addr) + B1(addr) + rectype;
-
-        switch (rectype)
-        {
-            case 0x00:                  /* normal data record */
-                tb.dl_destaddr = base_address + addr;
-                while (len--)
-                {
-                    if ((c = getbyte(&p)) == -1)
-                        badformat(buff, inm, BADDATA);
-                    cksum += c;
-                    filesum += c;
-                    tb.dl_buf[tb.dl_count++] = c;
-                }
-                break;
-
-            case 0x01:                  /* execution start address */
-                base_address = addr;
-                endrecord = TRUE;
-                break;
-
-            case 0x02:                  /* new base */
-                if ((base_address = get2bytes(&p)) == -1L)
-                    badformat(buff, inm, BADBASE);
-                cksum += B0(base_address) + B1(base_address);
-                base_address <<= 4;
-                break;
-
-            case 0x03:                  /* seg/off execution start address */
-            {
-                u32 seg, off;
-
-                seg = get2bytes(&p);
-                off = get2bytes(&p);
-                if ((seg == -1L) || (off == -1L))
-                    badformat(buff, inm, BADADDR);
-
-                cksum += B0(seg) + B1(seg) + B0(off) + B1(off);
-
-                tb.dl_jumpaddr = (seg << 4) + off;
-                break;
-            }
-
-            default:
-                error(0, "unknown Intel-hex record type: 0x%02x", rectype);
-                badformat(buff, inm, BADTYPE);
-        }
-
-        /*
-         * Verify checksums are correct in file.
-         */
-
-        cksum = (-cksum) & 0xff;
-        if ((incksum = getbyte(&p)) == -1)
-            badformat(buff, inm, BADCSUM);
-        if (((u8) incksum) != cksum)
-            badformat(buff, inm, MISCSUM);
-
-        if (tb.dl_count)
-            write_record(&tb, ofp);
-    }
-    return 0;
-}
-
-int
-convert_S_records(
-    FILE *ifp,
-    char *inm,
-    FILE *ofp,
-    char *onm)
-{
-    char buff[512];
-    char *p;
-    u8 cksum;
-    int incksum;
-    int c;
-    int len;                        /* data length of current line */
-    int rectype;                    /* record type */
-    u32 addr;
-    bool endrecord = FALSE;
-    buffer_rec tb;
-
-    while ( ! endrecord && (fgets(buff, sizeof(buff), ifp)))
-    {
-        p = &buff[0];
-
-        if (p[strlen(p)-1] == '\n')                 /* get rid of newline */
-            p[strlen(p)-1] = '\0';
-
-        if (p[strlen(p)-1] == '\r')                 /* get rid of any CR */
-            p[strlen(p)-1] = '\0';
-
-        tb.dl_count = 0;
-
-        if (*p != 'S')
-            badformat(p, inm, BADFMT);
-        p++;
-
-        if ((rectype = getnibble(&p)) == -1)        /* record type */
-            badformat(buff, inm, BADTYPE);
-
-        if ((len = getbyte(&p)) == -1)              /* record len */
-            badformat(buff, inm, BADLEN);
-        cksum = len;
-
-        switch (rectype)
-        {
-            case 0x00:                  /* comment field, ignored */
-                goto write_it;
-
-            case 0x01:                          /* data record, 16 bit addr */
-                if ((addr = get2bytes(&p)) == -1L)
-                    badformat(buff, inm, BADADDR);
-                len -= 3;
-                goto doit;
-
-            case 0x02:                          /* ... 24 bit addr */
-                if ((addr = get3bytes(&p)) == -1L)
-                    badformat(buff, inm, BADADDR);
-                len -= 4;
-                goto doit;
-
-            case 0x03:                          /* ... 32 bit addr */
-                if ((addr = get4bytes(&p)) == -1L)
-                    badformat(buff, inm, BADADDR);
-                len -= 5;
-    doit:
-                cksum += B0(addr) + B1(addr) + B2(addr) + B3(addr);
-
-                tb.dl_destaddr = addr;
-                while (len--)
-                {
-                    if ((c = getbyte(&p)) == -1)
-                        badformat(buff, inm, BADDATA);
-                    cksum += c;
-                    filesum += c;
-                    tb.dl_buf[tb.dl_count++] = c;
-                }
-                break;
-
-            case 0x07:                  /* 32 bit end record */
-                if ((addr = get4bytes(&p)) == -1L)
-                    badformat(buff, inm, BADADDR);
-                goto end_rec;
-
-            case 0x08:                  /* 24 bit end record */
-                if ((addr = get3bytes(&p)) == -1L)
-                    badformat(buff, inm, BADADDR);
-                goto end_rec;
-
-            case 0x09:                  /* 16 bit end record */
-                if ((addr = get2bytes(&p)) == -1L)
-                    badformat(buff, inm, BADADDR);
-
-end_rec:
-                cksum += B0(addr) + B1(addr) + B2(addr) + B3(addr);
-                tb.dl_jumpaddr = addr;
-                break;
-
-            default:
-                error(0, "unknown Motorola-S record type: 0x%02x", rectype);
-                badformat(buff, inm, BADTYPE);
-                break;
-        }
-
-        /*
-         * Verify checksums are correct in file.
-         */
-
-        cksum = (~cksum) & 0xff;
-        if ((incksum = getbyte(&p)) == -1)
-            badformat(buff, inm, BADCSUM);
-        if (((u8) incksum) != cksum)
-            badformat(buff, inm, MISCSUM);
-
-write_it:
-        if (tb.dl_count)
-            write_record(&tb, ofp);
-    }
-    return 0;
-}
-
-int
-convert_TI_records(
-    FILE *ifp,
-    char *inm,
-    FILE *ofp,
-    char *onm)
-{
-    char buff[512];
-    char *p;
-    int c;
-    bool endrecord = FALSE;
-    bool eol;
-    buffer_rec tb;
-
-    while ( ! endrecord && (fgets(buff, sizeof(buff), ifp)))
-    {
-        if (p[strlen(p)-1] == '\n')                 /* get rid of newline */
-            p[strlen(p)-1] = '\0';
-
-        if (p[strlen(p)-1] == '\r')                 /* get rid of any CR */
-            p[strlen(p)-1] = '\0';
-
-        tb.dl_count = 0;
-
-        p = &buff[0];
-        eol = FALSE;
-        while ( ! eol && ! endrecord)
-        {
-            switch (*p++)
-            {
-                case '9':
-                    if (tb.dl_count)
-                        write_record(&tb, ofp);
-                    tb.dl_destaddr = get2bytes(&p);
-                    break;
-
-                case 'B':
-                    c = getbyte(&p);
-                    filesum += c;
-                    tb.dl_buf[tb.dl_count++] = c;
-                    c = getbyte(&p);
-                    filesum += c;
-                    tb.dl_buf[tb.dl_count++] = c;
-                    break;
-
-                case 'F':
-                    eol = TRUE;
-                    break;
-
-                case ':':
-                    endrecord = TRUE;
-                    break;
-
-                default:
-                    badformat(p, inm, BADFMT);
-            }
-        }
-        if (tb.dl_count)
-            write_record(&tb, ofp);
-    }
-    return 0;
-}
-
-void
-write_record(buffer_rec *tb,
-             FILE *fp)
-{
-    if ( ! linear)
-    {
-        if (tb->dl_destaddr < base)
-            error(ERR_FATAL, "record at address 0x%x precedes base of 0x%x",
-                     tb->dl_destaddr, base);
-        (void) fseek(fp, tb->dl_destaddr - base, 0);
-    }
-
-    (void) fwrite(tb->dl_buf, tb->dl_count, 1, fp);
-    tb->dl_destaddr += tb->dl_count;
-    tb->dl_count = 0;
-}
-
-int
-getnibble(char **p)
-{
-    register int val;
-
-    **p = toupper(**p);
-    switch (**p)
-    {
-        case '0': case '1': case '2': case '3': case '4':
-        case '5': case '6': case '7': case '8': case '9':
-            val = **p - '0';
-            break;
-
-        case 'A': case 'B': case 'C': case 'D': case 'E': case 'F':
-            val = 10 + (**p - 'A');
-            break;
-
-        default:
-            return(-1);
-    }
-    *p += 1;
-
-    return(val & 0x0f);
-}
-
-int
-getbyte(char **p)
-{
-    int n0, n1;
-
-    if ((n0 = getnibble(p)) == -1)
-        return(-1);
-    if ((n1 = getnibble(p)) == -1)
-        return(-1);
-
-    return(((n0 << 4) + n1) & 0xff);
-}
-
-long
-getNbytes(char **p,
-          int n)
-{
-    int t;
-    u32 val = 0;
-
-    while (n--)
-    {
-        if ((t = getbyte(p)) == -1)
-            return(-1L);
-        val <<= 8;
-        val += t;
-    }
-
-    return(val);
-}
-
-void
-badformat(char *s,
-          char *fname,
-          char *msg)
-{
-    if (s[strlen(s)-1] == '\n')             /* get rid of newline */
-        s[strlen(s)-1] = '\0';
-    error(0, "line '%s'::\n\tfrom file '%s'; %s", s, fname, msg);
-    exit(1);
-}
-
-/*
- * error(errn, arglist)
- *      report an error to stderr using printf(3) conventions.
- *      Any output is preceded by '<progname>: '
- *
- * Uses ERR_EXIT  bit to request exit(errn)
- *      ERR_ABORT to request abort()
- *      ERR_ERRNO to indicate use of errno instead of argument.
- *
- * If resulting 'errn' is non-zero, it is assumed to be an 'errno' and its
- *      associated error message is appended to the output.
- */
-
-/*VARARGS*/
-
-void
-error(int error_flag, ...)
-{
-    va_list arglist;
-    register char *format;
-    int local_errno;
-
-    extern int errno;
-
-    (void) fflush(stdout);          /* in case stdout/stderr same */
-
-    local_errno = error_flag & ~ERR_MASK;
-    if (error_flag & ERR_ERRNO)     /* use errno? */
-        local_errno = errno;
-
-    va_start(arglist, error_flag);
-    format = va_arg(arglist, char *);
-    (void) fprintf(stderr, "%s: ", progname);
-    (void) vfprintf(stderr, format, arglist);
-    va_end(arglist);
-
-    if (local_errno)
-      (void) fprintf(stderr, " (%s)\n", strerror(local_errno));
-    else
-      (void) fprintf(stderr, "\n");
-
-    (void) fflush(stderr);
-
-    if (error_flag & (ERR_FATAL | ERR_ABORT))
-    {
-        if (error_flag & ERR_FATAL)
-        {
-            error(0, "fatal error, exiting");
-            exit(local_errno ? local_errno : 1);
-        }
-        else
-        {
-            error(0, "fatal error, aborting");
-            abort();
-        }
-    }
-}
-
diff --git a/c/build-tools/unlock-directory.in b/c/build-tools/unlock-directory.in
deleted file mode 100644
index c63ceff881..0000000000
--- a/c/build-tools/unlock-directory.in
+++ /dev/null
@@ -1,41 +0,0 @@
-#!@KSH@
-#
-# $Id$
-#
-# Unlock a directory processed by lock_directory
-#
-
-# is a particular command available on this machine?
-#
-cmd_avail()
-{
-    set -- `type $1 2>&1`
-    if [ "$2" = "not" -a "$3" = "found" ] || [ "$3" = "not" -a "$4" = "found" ]
-    then
-        return 1
-    else
-        return 0
-    fi
-}
-
-unlock_directory() {
-    ul_dir=$1/.  		# get any symlink out of the way using '.'
-    if [ -d $ul_dir ]
-    then
-        find $ul_dir -type d ! -perm -0222 -print | $XARGS -t chmod +w
-    fi
-}
-
-# Use gnu xargs if available; faster, more reliable in general
-XARGS=xargs
-cmd_avail gxargs && XARGS=gxargs
-
-for dir
-do
-    unlock_directory $dir
-done
-
-# Local Variables: ***
-# mode:ksh ***
-# End: ***
-
diff --git a/c/src/ada-tests/mptests/mp01/config.h b/c/src/ada-tests/mptests/mp01/config.h
deleted file mode 100644
index 513e94359d..0000000000
--- a/c/src/ada-tests/mptests/mp01/config.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*  config.h
- *
- *  This include file defines the Configuration Table for this test.
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-/* configuration information */
-
-#define CONFIGURE_MPTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#define CONFIGURE_MAXIMUM_POSIX_THREADS              10
-#define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
-#define CONFIGURE_MAXIMUM_POSIX_MUTEXES              20
-#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES  10
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/c/src/ada-tests/mptests/mp01/mp01.adb b/c/src/ada-tests/mptests/mp01/mp01.adb
deleted file mode 100644
index 0b1e0a0eba..0000000000
--- a/c/src/ada-tests/mptests/mp01/mp01.adb
+++ /dev/null
@@ -1,57 +0,0 @@
---
---  MAIN / BODY
---
---  DESCRIPTION:
---
---  This is the entry point for Test MP01 of the Multiprocessor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-with MPTEST;
-with TEST_SUPPORT;
-
-procedure MP01 is
-  INIT_ID : RTEMS.ID;
-  STATUS  : RTEMS.STATUS_CODES;
-begin
-
-   RTEMS.TASK_CREATE(
-      RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
-      1,
-      RTEMS.MINIMUM_STACK_SIZE,
-      RTEMS.NO_PREEMPT,
-      RTEMS.GLOBAL,
-      INIT_ID,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
-
-
-   RTEMS.TASK_START(
-      INIT_ID,
-      MPTEST.INIT'ACCESS,
-      0,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
-
-   loop
-      delay 120.0;
-   end loop;
-
-end MP01;
-
diff --git a/c/src/ada-tests/mptests/mp01/mptest.adb b/c/src/ada-tests/mptests/mp01/mptest.adb
deleted file mode 100644
index 3f3fbe6c30..0000000000
--- a/c/src/ada-tests/mptests/mp01/mptest.adb
+++ /dev/null
@@ -1,235 +0,0 @@
---
---  MPTEST / BODY
---
---  DESCRIPTION:
---
---  This package is the implementation for Test 1 of the RTEMS
---  Multiprocessor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with INTERFACES; use INTERFACES;
-with RTEMS;
-with TEST_SUPPORT;
-with TEXT_IO;
-with UNSIGNED32_IO;
-
-package body MPTEST is
-
-   package body PER_NODE_CONFIGURATION is separate;
-
---PAGE
---
---  INIT
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      C      : RTEMS.CHARACTER;
-      TIME   : RTEMS.TIME_OF_DAY;
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT( "*** TEST 1 -- NODE " );
-      UNSIGNED32_IO.PUT(
-         MPTEST.MULTIPROCESSING_CONFIGURATION.NODE,
-         WIDTH => 1
-      );
-      TEXT_IO.PUT_LINE( " ***" );
-     
-      if MPTEST.MULTIPROCESSING_CONFIGURATION.NODE /= 1 then
-         C := 'S';
-      else
-         C := 'M';
-      end if;
-
-      MPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME(  C, 'A', '1', ' ' );
-      MPTEST.TASK_NAME( 2 ) := RTEMS.BUILD_NAME(  C, 'A', '2', ' ' );
-      MPTEST.TASK_NAME( 3 ) := RTEMS.BUILD_NAME(  C, 'A', '3', ' ' );
-
-      TIME := ( 1988, 12, 31, 9, 0, 0, 0 );
-
-      RTEMS.CLOCK_SET( TIME, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_SET" );
-
-      TEXT_IO.PUT_LINE( "Creating task 1 (Global)" );
-
-      RTEMS.TASK_CREATE( 
-         MPTEST.TASK_NAME( 1 ), 
-         1, 
-         2048, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.GLOBAL,
-         MPTEST.TASK_ID( 1 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA1" );
-
-      TEXT_IO.PUT_LINE( "Creating task 2 (Global)" );
-
-      RTEMS.TASK_CREATE( 
-         MPTEST.TASK_NAME( 2 ), 
-         1, 
-         2048, 
-         RTEMS.TIMESLICE,
-         RTEMS.GLOBAL,
-         MPTEST.TASK_ID( 2 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA2" );
-
-      TEXT_IO.PUT_LINE( "Creating task 3 (Local)" );
-
-      RTEMS.TASK_CREATE( 
-         MPTEST.TASK_NAME( 3 ), 
-         1, 
-         2048, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         MPTEST.TASK_ID( 3 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA3" );
-
-      RTEMS.TASK_START(
-         MPTEST.TASK_ID( 1 ),
-         MPTEST.TEST_TASK'ACCESS,
-         0,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA1" );
-
-      RTEMS.TASK_START(
-         MPTEST.TASK_ID( 2 ),
-         MPTEST.TEST_TASK'ACCESS,
-         0,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA2" );
-
-      RTEMS.TASK_START(
-         MPTEST.TASK_ID( 3 ),
-         MPTEST.TEST_TASK'ACCESS,
-         0,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA3" );
-
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
-
-   end INIT;
-
---PAGE
---
---  TEST_TASK
---
-
-   procedure TEST_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      TIME   : RTEMS.TIME_OF_DAY;
-      TID    : RTEMS.ID;
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      RTEMS.TASK_IDENT( RTEMS.SELF, RTEMS.SEARCH_ALL_NODES, TID, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_IDENT OF SELF" );
-   
-      RTEMS.CLOCK_GET( RTEMS.CLOCK_GET_TOD, TIME'ADDRESS, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET" );
-
-      TEST_SUPPORT.PUT_NAME( 
-         MPTEST.TASK_NAME( TEST_SUPPORT.TASK_NUMBER( TID ) ),
-         FALSE
-      );
-
-      TEST_SUPPORT.PRINT_TIME( "- clock_get - ", TIME, "" );
-      TEXT_IO.NEW_LINE;
-
-      RTEMS.TASK_WAKE_AFTER( 
-         TEST_SUPPORT.TASK_NUMBER( TID ) * 5 * 
-           TEST_SUPPORT.TICKS_PER_SECOND, 
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
-          
-      RTEMS.CLOCK_GET( RTEMS.CLOCK_GET_TOD, TIME'ADDRESS, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET" );
-
-      TEST_SUPPORT.PUT_NAME( 
-         MPTEST.TASK_NAME( TEST_SUPPORT.TASK_NUMBER( TID ) ),
-         FALSE
-      );
-
-      TEST_SUPPORT.PRINT_TIME( "- clock_get - ", TIME, "" );
-      TEXT_IO.NEW_LINE;
-
-      if TEST_SUPPORT.TASK_NUMBER( TID ) = 1 then         -- TASK 1
-
-         TEST_SUPPORT.PUT_NAME( 
-            MPTEST.TASK_NAME( TEST_SUPPORT.TASK_NUMBER( TID ) ),
-            FALSE
-         );
-
-         TEXT_IO.PUT_LINE( " - deleting self" );
-
-         RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
-
-      else if TEST_SUPPORT.TASK_NUMBER( TID ) = 2 then    -- TASK 2
-
-         TEST_SUPPORT.PUT_NAME( MPTEST.TASK_NAME( 2 ), FALSE );
-         TEXT_IO.PUT( " - waiting to be deleted by " );
-         TEST_SUPPORT.PUT_NAME( MPTEST.TASK_NAME( 3 ), TRUE );
-
-         loop
-            TEST_SUPPORT.DO_NOTHING;   -- can't be optimized away
-         end loop;
-
-      else                                                -- TASK 3
-
-         TEST_SUPPORT.PUT_NAME( MPTEST.TASK_NAME( 3 ), FALSE );
-         TEXT_IO.PUT( " - getting TID of " );
-         TEST_SUPPORT.PUT_NAME( MPTEST.TASK_NAME( 2 ), TRUE );
-         
-         RTEMS.TASK_IDENT( 
-            MPTEST.TASK_NAME( 2 ),
-            RTEMS.SEARCH_ALL_NODES,
-            TID,
-            STATUS
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_IDENT OF TA2" );
-
-         TEST_SUPPORT.PUT_NAME( MPTEST.TASK_NAME( 3 ), FALSE );
-         TEXT_IO.PUT( " - deleting " );
-         TEST_SUPPORT.PUT_NAME( MPTEST.TASK_NAME( 2 ), TRUE );
-
-         RTEMS.TASK_DELETE( TID, STATUS );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF TA2" );
-
-      end if;
-      end if;
-
-      TEXT_IO.PUT_LINE( "*** END OF TEST 1 ***" );
-
-      RTEMS.SHUTDOWN_EXECUTIVE( 0 );
-
-   end TEST_TASK;
-
-end MPTEST;
diff --git a/c/src/ada-tests/mptests/mp01/mptest.ads b/c/src/ada-tests/mptests/mp01/mptest.ads
deleted file mode 100644
index 42bf917bb1..0000000000
--- a/c/src/ada-tests/mptests/mp01/mptest.ads
+++ /dev/null
@@ -1,164 +0,0 @@
---
---  MPTEST / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package is the specification for Test 1 of the RTEMS
---  Multiprocessor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with BSP_MPCI;
-with RTEMS;
-
-package MPTEST is
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS tasks created
---  by this test.
---
-
-   TASK_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.ID;
-   TASK_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.NAME;
-
---
---  INIT
---
---  DESCRIPTION:
---
---  This RTEMS task initializes the application.
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TEST_TASK
---
---  DESCRIPTION:
---
---  This is the body of the RTEMS tasks which constitute this test.
---
-
-   procedure TEST_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  This is the Driver Address Table for this test.
---
-
-   DEVICE_DRIVERS : aliased RTEMS.DRIVER_ADDRESS_TABLE( 1 .. 1 ) :=
-   (1=>
-      (
-        CLOCK_DRIVER.INITIALIZE'ACCESS,              -- Initialization
-        RTEMS.NO_DRIVER_ENTRY,                       -- Open
-        RTEMS.NO_DRIVER_ENTRY,                       -- Close
-        RTEMS.NO_DRIVER_ENTRY,                       -- Read
-        RTEMS.NO_DRIVER_ENTRY,                       -- Write
-        RTEMS.NO_DRIVER_ENTRY                        -- Control
-      )
-   );
-
---
---  This is the Initialization Tasks Table for this test.
---
-
-   INITIALIZATION_TASKS : aliased RTEMS.INITIALIZATION_TASKS_TABLE( 1 .. 1 ) := 
-   (1=>
-     (
-       RTEMS.BUILD_NAME( 'U', 'I', '1', ' ' ),        -- task name
-       2048,                                          -- stack size
-       1,                                             -- priority
-       RTEMS.GLOBAL,                                  -- attributes
-       MPTEST.INIT'ACCESS,                            -- entry point
-       RTEMS.NO_PREEMPT,                              -- initial mode
-       0                                              -- argument list
-     )
-   );
-
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
---                             BEGIN SUBPACKAGE                           --
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
-
-   --
-   --  MPTEST.PER_NODE_CONFIGURATION / SPECIFICATION
-   --
-   --  DESCRIPTION:
-   --
-   --  This package is the specification for the subpackage
-   --  which will define the per node configuration parameters.
-   --
-   
-   package PER_NODE_CONFIGURATION is
-
-   --
-   --  LOCAL_NODE_NUMBER
-   --
-   --  DESCRIPTION:
-   --
-   --  This function returns the node number for this node.
-   --
-
-      function LOCAL_NODE_NUMBER 
-      return RTEMS.UNSIGNED32;
-  
-      pragma INLINE ( LOCAL_NODE_NUMBER );
-
-   end PER_NODE_CONFIGURATION;
-  
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
---                              END SUBPACKAGE                            --
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
-
---
---  This is the Multiprocessor Configuration Table for this test.
---
-
-   MULTIPROCESSING_CONFIGURATION : aliased RTEMS.MULTIPROCESSING_TABLE := (
-      MPTEST.PER_NODE_CONFIGURATION.LOCAL_NODE_NUMBER,
-      2,                         -- maximum # nodes in system 
-      33,                        -- maximum # global objects
-      33                         -- maximum # proxies
-    );
-
---
---  This is the Configuration Table for this test.
---
-
-   CONFIGURATION : aliased RTEMS.CONFIGURATION_TABLE := (
-      RTEMS.NULL_ADDRESS,        -- will be replaced by BSP
-      64 * 1024,                 -- executive RAM size
-      10,                        -- maximum # tasks
-      0,                         -- maximum # timers
-      0,                         -- maximum # semaphores
-      0,                         -- maximum # message queues
-      0,                         -- maximum # messages
-      0,                         -- maximum # partitions
-      0,                         -- maximum # regions
-      0,                         -- maximum # dp memory areas
-      0,                         -- maximum # periods
-      0,                         -- maximum # user extensions
-      RTEMS.MILLISECONDS_TO_MICROSECONDS(10), -- # us in a tick
-      50                         -- # ticks in a timeslice
-  );
-
-end MPTEST;
diff --git a/c/src/ada-tests/mptests/mp01/node1/mp01.scn b/c/src/ada-tests/mptests/mp01/node1/mp01.scn
deleted file mode 100644
index d7495bfa0d..0000000000
--- a/c/src/ada-tests/mptests/mp01/node1/mp01.scn
+++ /dev/null
@@ -1,15 +0,0 @@
-*** TEST 1 -- NODE 1 ***
-Creating task 1 (Global)
-Creating task 2 (Global)
-Creating task 3 (Local)
-MA1 - clock_get -  9: 0: 0   12/31/1988
-MA2 - clock_get -  9: 0: 0   12/31/1988
-MA3 - clock_get -  9: 0: 0   12/31/1988
-MA1 - clock_get -  9: 0: 5   12/31/1988
-MA1 - deleting self
-MA2 - clock_get -  9: 0:10   12/31/1988
-MA2 - waiting to be deleted by MA3
-MA3 - clock_get -  9: 0:15   12/31/1988
-MA3 - getting TID of MA2
-MA3 - deleting MA2
-*** END OF TEST 1 ***
diff --git a/c/src/ada-tests/mptests/mp01/node1/mptest-per_node_configuration.adb b/c/src/ada-tests/mptests/mp01/node1/mptest-per_node_configuration.adb
deleted file mode 100644
index 7df5087537..0000000000
--- a/c/src/ada-tests/mptests/mp01/node1/mptest-per_node_configuration.adb
+++ /dev/null
@@ -1,43 +0,0 @@
---
---  MPTEST.PER_NODE_CONFIGURATION / BODY
---
---  DESCRIPTION:
---
---  This package is the specification for the subpackage
---  which will define the per node configuration parameters.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-
-separate ( MPTEST )
-
-package body PER_NODE_CONFIGURATION is
-
---PAGE
---
---  LOCAL_NODE_NUMBER
---
-
-   function LOCAL_NODE_NUMBER 
-   return RTEMS.UNSIGNED32 is
-   begin
-
-      return 1;
-
-   end LOCAL_NODE_NUMBER;
-
-end PER_NODE_CONFIGURATION;
diff --git a/c/src/ada-tests/mptests/mp01/node2/mp01.scn b/c/src/ada-tests/mptests/mp01/node2/mp01.scn
deleted file mode 100644
index 98047240f3..0000000000
--- a/c/src/ada-tests/mptests/mp01/node2/mp01.scn
+++ /dev/null
@@ -1,15 +0,0 @@
-*** TEST 1 -- NODE 2 ***
-Creating task 1 (Global)
-Creating task 2 (Global)
-Creating task 3 (Local)
-SA1 - clock_get -  9: 0: 0   12/31/1988
-SA2 - clock_get -  9: 0: 0   12/31/1988
-SA3 - clock_get -  9: 0: 0   12/31/1988
-SA1 - clock_get -  9: 0: 5   12/31/1988
-SA1 - deleting self
-SA2 - clock_get -  9: 0:10   12/31/1988
-SA2 - waiting to be deleted by SA3
-SA3 - clock_get -  9: 0:15   12/31/1988
-SA3 - getting TID of SA2
-SA3 - deleting SA2
-*** END OF TEST 1 ***
diff --git a/c/src/ada-tests/mptests/mp01/node2/mptest-per_node_configuration.adb b/c/src/ada-tests/mptests/mp01/node2/mptest-per_node_configuration.adb
deleted file mode 100644
index e127cc5573..0000000000
--- a/c/src/ada-tests/mptests/mp01/node2/mptest-per_node_configuration.adb
+++ /dev/null
@@ -1,43 +0,0 @@
---
---  MPTEST.PER_NODE_CONFIGURATION / BODY
---
---  DESCRIPTION:
---
---  This package is the specification for the subpackage
---  which will define the per node configuration parameters.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-
-separate ( MPTEST )
-
-package body PER_NODE_CONFIGURATION is
-
---PAGE
---
---  LOCAL_NODE_NUMBER
---
-
-   function LOCAL_NODE_NUMBER 
-   return RTEMS.UNSIGNED32 is
-   begin
-
-      return 2;
-
-   end LOCAL_NODE_NUMBER;
-
-end PER_NODE_CONFIGURATION;
diff --git a/c/src/ada-tests/mptests/mp02/mptest.adb b/c/src/ada-tests/mptests/mp02/mptest.adb
deleted file mode 100644
index 44b6d564ad..0000000000
--- a/c/src/ada-tests/mptests/mp02/mptest.adb
+++ /dev/null
@@ -1,213 +0,0 @@
---
---  MPTEST / BODY
---
---  DESCRIPTION:
---
---  This package is the implementation for Test 2 of the RTEMS
---  Multiprocessor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with INTERFACES; use INTERFACES;
-with RTEMS;
-with TEST_SUPPORT;
-with TEXT_IO;
-with UNSIGNED32_IO;
-
-package body MPTEST is
-
-   package body PER_NODE_CONFIGURATION is separate;
-
---PAGE
---
---  INIT
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT( "*** TEST 2 -- NODE " );
-      UNSIGNED32_IO.PUT(
-         MPTEST.MULTIPROCESSING_CONFIGURATION.NODE,
-         WIDTH => 1
-      );
-      TEXT_IO.PUT_LINE( " ***" );
-
-      MPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME(  '1', '1', '1', ' ' );
-      MPTEST.TASK_NAME( 2 ) := RTEMS.BUILD_NAME(  '2', '2', '2', ' ' );
-
-      TEXT_IO.PUT_LINE( "Creating test task (Global)" );
-
-      RTEMS.TASK_CREATE( 
-         MPTEST.TASK_NAME( MPTEST.MULTIPROCESSING_CONFIGURATION.NODE ),
-         1, 
-         2048, 
-         RTEMS.NO_PREEMPT,
-         RTEMS.GLOBAL,
-         MPTEST.TASK_ID( 1 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE" );
-
-      RTEMS.TASK_START(
-         MPTEST.TASK_ID( 1 ),
-         MPTEST.TEST_TASK'ACCESS,
-         0,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START" );
-
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
-
-   end INIT;
-
---PAGE
---
---  TEST_TASK
---
-
-   procedure TEST_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      TID         : RTEMS.ID;
-      TEST_TID    : RTEMS.ID;
-      REMOTE_TID  : RTEMS.ID;
-      REMOTE_NODE : RTEMS.UNSIGNED32;
-      NOTE        : RTEMS.UNSIGNED32;
-      STATUS      : RTEMS.STATUS_CODES;
-   begin
-
-      RTEMS.TASK_IDENT( RTEMS.SELF, RTEMS.SEARCH_ALL_NODES, TID, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_IDENT OF SELF" );
-   
-      if MPTEST.MULTIPROCESSING_CONFIGURATION.NODE = 1 then
-         REMOTE_NODE := 2;
-      else
-         REMOTE_NODE := 1;
-      end if;
-    
-      TEXT_IO.PUT_LINE( "Getting TID of remote task (all nodes)" );
-
-      loop
-
-         RTEMS.TASK_IDENT( 
-            MPTEST.TASK_NAME( REMOTE_NODE ),
-            RTEMS.SEARCH_ALL_NODES,
-            REMOTE_TID,
-            STATUS
-         );
-
-         exit when RTEMS.IS_STATUS_SUCCESSFUL( STATUS );
-
-      end loop;
-
-      --
-      --  We just got this ID above so looping is not necessary.
-      --
-
-      TEXT_IO.PUT_LINE( "Getting TID of remote task (1 node)" );
-      RTEMS.TASK_IDENT( 
-         MPTEST.TASK_NAME( REMOTE_NODE ),
-         REMOTE_NODE,
-         TEST_TID,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_IDENT" );
-
-      if TEST_TID /= REMOTE_TID then
-         TEXT_IO.PUT_LINE( "task_ident tid's do not match!!" );
-         RTEMS.SHUTDOWN_EXECUTIVE( 0 );
-      end if;
-
-      RTEMS.TASK_DELETE( REMOTE_TID, STATUS );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.ILLEGAL_ON_REMOTE_OBJECT,
-         "task_delete of remote task"
-      );
-      TEXT_IO.PUT_LINE( 
-         "task_delete of remote task returned the correct error" 
-      );
-          
-      RTEMS.TASK_START( REMOTE_TID, MPTEST.TEST_TASK'ACCESS, 0, STATUS );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.ILLEGAL_ON_REMOTE_OBJECT,
-         "task_start of remote task"
-      );
-      TEXT_IO.PUT_LINE( 
-         "task_start of remote task returned the correct error" 
-      );
-          
-      RTEMS.TASK_RESTART( REMOTE_TID, 0, STATUS );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.ILLEGAL_ON_REMOTE_OBJECT,
-         "task_restart of remote task"
-      );
-      TEXT_IO.PUT_LINE( 
-         "task_restart of remote task returned the correct error" 
-      );
-          
-   
-      TEXT_IO.PUT( "Setting notepad " );
-      UNSIGNED32_IO.PUT( RTEMS.GET_NODE( TID ), WIDTH=>1 );
-      TEXT_IO.PUT( " of the remote task to " );
-      UNSIGNED32_IO.PUT( RTEMS.GET_NODE( TID ), WIDTH=>1 );
-      TEXT_IO.NEW_LINE;
-      RTEMS.TASK_SET_NOTE( 
-         REMOTE_TID, 
-         RTEMS.GET_NODE( TID ),
-         RTEMS.GET_NODE( TID ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SET_NOTE" );
-
-      TEXT_IO.PUT_LINE( "Getting a notepad of the remote task" );
-      RTEMS.TASK_GET_NOTE( 
-         REMOTE_TID, 
-         RTEMS.GET_NODE( TID ),
-         NOTE,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_GET_NOTE" );
-
-      if NOTE = RTEMS.GET_NODE( TID ) then
-         TEXT_IO.PUT_LINE( "Remote notepad set and read correctly" );
-      else
-         TEXT_IO.PUT(
-            "FAILURE!!! Remote notepad was not set and read correctly ("
-         );
-         UNSIGNED32_IO.PUT( NOTE );
-         TEXT_IO.PUT( ", " );
-         UNSIGNED32_IO.PUT( RTEMS.GET_NODE( TID ) );
-         TEXT_IO.PUT_LINE( ")" );
-
-      end if;
-
-      RTEMS.TASK_DELETE( REMOTE_TID, STATUS );
-      TEXT_IO.PUT_LINE( "*** END OF TEST 2 ***" );
-
-      RTEMS.SHUTDOWN_EXECUTIVE( 0 );
-
-   end TEST_TASK;
-
-end MPTEST;
diff --git a/c/src/ada-tests/mptests/mp02/mptest.ads b/c/src/ada-tests/mptests/mp02/mptest.ads
deleted file mode 100644
index 82e7aacbb3..0000000000
--- a/c/src/ada-tests/mptests/mp02/mptest.ads
+++ /dev/null
@@ -1,164 +0,0 @@
---
---  MPTEST / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package is the specification for Test 2 of the RTEMS
---  Multiprocessor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with BSP_MPCI;
-with RTEMS;
-
-package MPTEST is
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS tasks created
---  by this test.
---
-
-   TASK_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.ID;
-   TASK_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.NAME;
-
---
---  INIT
---
---  DESCRIPTION:
---
---  This RTEMS task initializes the application.
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TEST_TASK
---
---  DESCRIPTION:
---
---  This is the body of the RTEMS tasks which constitute this test.
---
-
-   procedure TEST_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  This is the Driver Address Table for this test.
---
-
-   DEVICE_DRIVERS : aliased RTEMS.DRIVER_ADDRESS_TABLE( 1 .. 1 ) :=
-   (1=>
-      (
-        CLOCK_DRIVER.INITIALIZE'ACCESS,              -- Initialization
-        RTEMS.NO_DRIVER_ENTRY,                       -- Open
-        RTEMS.NO_DRIVER_ENTRY,                       -- Close
-        RTEMS.NO_DRIVER_ENTRY,                       -- Read
-        RTEMS.NO_DRIVER_ENTRY,                       -- Write
-        RTEMS.NO_DRIVER_ENTRY                        -- Control
-      )
-   );
-
---
---  This is the Initialization Tasks Table for this test.
---
-
-   INITIALIZATION_TASKS : aliased RTEMS.INITIALIZATION_TASKS_TABLE( 1 .. 1 ) := 
-   (1=>
-     (
-       RTEMS.BUILD_NAME( 'U', 'I', '1', ' ' ),        -- task name
-       2048,                                          -- stack size
-       1,                                             -- priority
-       RTEMS.DEFAULT_ATTRIBUTES,                      -- attributes
-       MPTEST.INIT'ACCESS,                            -- entry point
-       RTEMS.NO_PREEMPT,                              -- initial mode
-       0                                              -- argument list
-     )
-   );
-
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
---                             BEGIN SUBPACKAGE                           --
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
-
-   --
-   --  MPTEST.PER_NODE_CONFIGURATION / SPECIFICATION
-   --
-   --  DESCRIPTION:
-   --
-   --  This package is the specification for the subpackage
-   --  which will define the per node configuration parameters.
-   --
-   
-   package PER_NODE_CONFIGURATION is
-
-   --
-   --  LOCAL_NODE_NUMBER
-   --
-   --  DESCRIPTION:
-   --
-   --  This function returns the node number for this node.
-   --
-
-      function LOCAL_NODE_NUMBER 
-      return RTEMS.UNSIGNED32;
-  
-      pragma INLINE ( LOCAL_NODE_NUMBER );
-
-   end PER_NODE_CONFIGURATION;
-  
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
---                              END SUBPACKAGE                            --
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
-
---
---  This is the Multiprocessor Configuration Table for this test.
---
-
-   MULTIPROCESSING_CONFIGURATION : aliased RTEMS.MULTIPROCESSING_TABLE := (
-      MPTEST.PER_NODE_CONFIGURATION.LOCAL_NODE_NUMBER,
-      2,                         -- maximum # nodes in system 
-      32,                        -- maximum # global objects
-      32                         -- maximum # proxies
-    );
-
---
---  This is the Configuration Table for this test.
---
-
-   CONFIGURATION : aliased RTEMS.CONFIGURATION_TABLE := (
-      RTEMS.NULL_ADDRESS,        -- will be replaced by BSP
-      64 * 1024,                 -- executive RAM size
-      10,                        -- maximum # tasks
-      0,                         -- maximum # timers
-      0,                         -- maximum # semaphores
-      0,                         -- maximum # message queues
-      0,                         -- maximum # messages
-      0,                         -- maximum # partitions
-      0,                         -- maximum # regions
-      0,                         -- maximum # dp memory areas
-      0,                         -- maximum # periods
-      0,                         -- maximum # user extensions
-      RTEMS.MILLISECONDS_TO_MICROSECONDS(10), -- # us in a tick
-      50                         -- # ticks in a timeslice
-  );
-
-end MPTEST;
diff --git a/c/src/ada-tests/mptests/mp02/node1/mp02.scn b/c/src/ada-tests/mptests/mp02/node1/mp02.scn
deleted file mode 100644
index 91b57321f7..0000000000
--- a/c/src/ada-tests/mptests/mp02/node1/mp02.scn
+++ /dev/null
@@ -1,11 +0,0 @@
-*** TEST 2 -- NODE 1 ***
-Creating test task (Global)
-Getting TID of remote task (all nodes)
-Getting TID of remote task (1 node)
-task_delete of remote task returned the correct error
-task_start of remote task returned the correct error
-task_restart of remote task returned the correct error
-Setting notepad 1 of the remote task to 1
-Getting a notepad of the remote task
-Remote notepad set and read correctly
-*** END OF TEST 2 ***
diff --git a/c/src/ada-tests/mptests/mp02/node1/mptest-per_node_configuration.adb b/c/src/ada-tests/mptests/mp02/node1/mptest-per_node_configuration.adb
deleted file mode 100644
index 7df5087537..0000000000
--- a/c/src/ada-tests/mptests/mp02/node1/mptest-per_node_configuration.adb
+++ /dev/null
@@ -1,43 +0,0 @@
---
---  MPTEST.PER_NODE_CONFIGURATION / BODY
---
---  DESCRIPTION:
---
---  This package is the specification for the subpackage
---  which will define the per node configuration parameters.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-
-separate ( MPTEST )
-
-package body PER_NODE_CONFIGURATION is
-
---PAGE
---
---  LOCAL_NODE_NUMBER
---
-
-   function LOCAL_NODE_NUMBER 
-   return RTEMS.UNSIGNED32 is
-   begin
-
-      return 1;
-
-   end LOCAL_NODE_NUMBER;
-
-end PER_NODE_CONFIGURATION;
diff --git a/c/src/ada-tests/mptests/mp02/node2/mp02.scn b/c/src/ada-tests/mptests/mp02/node2/mp02.scn
deleted file mode 100644
index 14239a546d..0000000000
--- a/c/src/ada-tests/mptests/mp02/node2/mp02.scn
+++ /dev/null
@@ -1,11 +0,0 @@
-*** TEST 2 -- NODE 2 ***
-Creating test task (Global)
-Getting TID of remote task (all nodes)
-Getting TID of remote task (1 node)
-task_delete of remote task returned the correct error
-task_start of remote task returned the correct error
-task_restart of remote task returned the correct error
-Setting notepad 2 of the remote task to 2
-Getting a notepad of the remote task
-Remote notepad set and read correctly
-*** END OF TEST 2 ***
diff --git a/c/src/ada-tests/mptests/mp02/node2/mptest-per_node_configuration.adb b/c/src/ada-tests/mptests/mp02/node2/mptest-per_node_configuration.adb
deleted file mode 100644
index e127cc5573..0000000000
--- a/c/src/ada-tests/mptests/mp02/node2/mptest-per_node_configuration.adb
+++ /dev/null
@@ -1,43 +0,0 @@
---
---  MPTEST.PER_NODE_CONFIGURATION / BODY
---
---  DESCRIPTION:
---
---  This package is the specification for the subpackage
---  which will define the per node configuration parameters.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-
-separate ( MPTEST )
-
-package body PER_NODE_CONFIGURATION is
-
---PAGE
---
---  LOCAL_NODE_NUMBER
---
-
-   function LOCAL_NODE_NUMBER 
-   return RTEMS.UNSIGNED32 is
-   begin
-
-      return 2;
-
-   end LOCAL_NODE_NUMBER;
-
-end PER_NODE_CONFIGURATION;
diff --git a/c/src/ada-tests/mptests/mp03/mptest.adb b/c/src/ada-tests/mptests/mp03/mptest.adb
deleted file mode 100644
index ea662c3422..0000000000
--- a/c/src/ada-tests/mptests/mp03/mptest.adb
+++ /dev/null
@@ -1,277 +0,0 @@
---
---  MPTEST / BODY
---
---  DESCRIPTION:
---
---  This package is the implementation for Test 3 of the RTEMS
---  Multiprocessor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with INTERFACES; use INTERFACES;
-with RTEMS;
-with TEST_SUPPORT;
-with TEXT_IO;
-with UNSIGNED32_IO;
-
-package body MPTEST is
-
-   package body PER_NODE_CONFIGURATION is separate;
-
---PAGE
---
---  INIT
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT( "*** TEST 3 -- NODE " );
-      UNSIGNED32_IO.PUT(
-         MPTEST.MULTIPROCESSING_CONFIGURATION.NODE,
-         WIDTH => 1
-      );
-      TEXT_IO.PUT_LINE( " ***" );
-     
-      MPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME(  '1', '1', '1', ' ' );
-      MPTEST.TASK_NAME( 2 ) := RTEMS.BUILD_NAME(  '2', '2', '2', ' ' );
-
-      TEXT_IO.PUT_LINE( "Creating Test_task (Global)" );
-      RTEMS.TASK_CREATE( 
-         MPTEST.TASK_NAME( MPTEST.MULTIPROCESSING_CONFIGURATION.NODE ), 
-         1, 
-         2048, 
-         RTEMS.NO_PREEMPT,
-         RTEMS.GLOBAL,
-         MPTEST.TASK_ID( 1 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE" );
-
-      TEXT_IO.PUT_LINE( "Starting Test_task (Global)" );
-      RTEMS.TASK_START(
-         MPTEST.TASK_ID( 1 ),
-         MPTEST.TEST_TASK'ACCESS,
-         0,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START" );
-
-      MPTEST.TIMER_NAME( 1 ) := RTEMS.BUILD_NAME(  'T', 'M', '1', ' ' );
-
-      RTEMS.TIMER_CREATE( 
-         MPTEST.TIMER_NAME( 1 ), 
-         MPTEST.TIMER_ID( 1 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_CREATE" );
-
-      TEXT_IO.PUT_LINE( "Deleting initialization task" );
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
-
-   end INIT;
-
---PAGE
---
---  DELAYED_SEND_EVENT
---
-
-   procedure DELAYED_SEND_EVENT (
-      IGNORED_ID      : in     RTEMS.ID;
-      IGNORED_ADDRESS : in     RTEMS.ADDRESS
-   ) is
-      STATUS  : RTEMS.STATUS_CODES;
-   begin
-
-      RTEMS.EVENT_SEND( MPTEST.TASK_ID( 1 ), RTEMS.EVENT_16, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "EVENT_SEND" );
-
-   end DELAYED_SEND_EVENT;
-
---PAGE
---
---  TEST_TASK
---
-
-   procedure TEST_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      TID         : RTEMS.ID;
-      STATUS      : RTEMS.STATUS_CODES;
-   begin
-
-      RTEMS.TASK_IDENT( RTEMS.SELF, RTEMS.SEARCH_ALL_NODES, TID, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_IDENT OF SELF" );
-   
-      TEXT_IO.PUT_LINE( "Getting TID of remote task" );
-      if MPTEST.MULTIPROCESSING_CONFIGURATION.NODE = 1 then
-         MPTEST.REMOTE_NODE := 2;
-      else
-         MPTEST.REMOTE_NODE := 1;
-      end if;
-
-      TEXT_IO.PUT( "Remote task's name is : " );
-      TEST_SUPPORT.PUT_NAME( MPTEST.TASK_NAME( MPTEST.REMOTE_NODE ), TRUE );
-
-      loop
-
-         RTEMS.TASK_IDENT( 
-            MPTEST.TASK_NAME( MPTEST.REMOTE_NODE ),
-            RTEMS.SEARCH_ALL_NODES,
-            MPTEST.REMOTE_TID,
-            STATUS
-         );
-
-         exit when RTEMS.IS_STATUS_SUCCESSFUL( STATUS );
-
-      end loop;
-
-      RTEMS.TIMER_FIRE_AFTER( 
-         MPTEST.TIMER_ID( 1 ), 
-         10 * TEST_SUPPORT.TICKS_PER_SECOND, 
-         MPTEST.DELAYED_SEND_EVENT'ACCESS,
-         RTEMS.NULL_ADDRESS,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_FIRE_AFTER" );
-
-      MPTEST.TEST_TASK_SUPPORT( 1 );
-
-      RTEMS.TIMER_FIRE_AFTER( 
-         MPTEST.TIMER_ID( 1 ), 
-         11 * TEST_SUPPORT.TICKS_PER_SECOND, 
-         MPTEST.DELAYED_SEND_EVENT'ACCESS,
-         RTEMS.NULL_ADDRESS,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_FIRE_AFTER" );
-
-      if MPTEST.MULTIPROCESSING_CONFIGURATION.NODE = 2 then
-         
-         RTEMS.TASK_WAKE_AFTER( 
-            2 * TEST_SUPPORT.TICKS_PER_SECOND,
-            STATUS
-         );
-        TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
-
-      end if;
-
-      MPTEST.TEST_TASK_SUPPORT( 2 );
-
-      TEXT_IO.PUT_LINE( "*** END OF TEST 3 ***" );
-
-      RTEMS.SHUTDOWN_EXECUTIVE( 0 );
-
-   end TEST_TASK;
-
---PAGE
--- 
---  TEST_TASK_SUPPORT
---
-
-
-   procedure TEST_TASK_SUPPORT (
-      NODE : in    RTEMS.UNSIGNED32
-   ) is
-      EVENTS : RTEMS.EVENT_SET;
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      if MPTEST.MULTIPROCESSING_CONFIGURATION.NODE = NODE then
-
-         loop
-
-            RTEMS.EVENT_RECEIVE( 
-               RTEMS.EVENT_16,
-               RTEMS.NO_WAIT,
-               RTEMS.NO_TIMEOUT,
-               EVENTS,
-               STATUS
-            );
-
-            exit when RTEMS.ARE_STATUSES_EQUAL( RTEMS.SUCCESSFUL, STATUS );
-
-            TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( 
-               STATUS,
-               RTEMS.UNSATISFIED,
-               "EVENT_RECEIVE"
-            );
-
-            RTEMS.TASK_WAKE_AFTER( 
-               2 * TEST_SUPPORT.TICKS_PER_SECOND, 
-               STATUS
-            );
-            TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
-
-            TEST_SUPPORT.PUT_NAME( MPTEST.TASK_NAME( NODE ), FALSE );
-            TEXT_IO.PUT_LINE( " - Suspending remote task" );
-            RTEMS.TASK_SUSPEND( MPTEST.REMOTE_TID, STATUS );
-            TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SUSPEND" );
-
-            RTEMS.TASK_WAKE_AFTER( 
-               2 * TEST_SUPPORT.TICKS_PER_SECOND, 
-               STATUS
-            );
-            TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
-
-            TEST_SUPPORT.PUT_NAME( MPTEST.TASK_NAME( NODE ), FALSE );
-            TEXT_IO.PUT_LINE( " - Resuming remote task" );
-
-            RTEMS.TASK_RESUME( MPTEST.REMOTE_TID, STATUS );
-            TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_RESUME" );
-
-         end loop;
-
-      else
-
-         loop
-
-            RTEMS.EVENT_RECEIVE( 
-               RTEMS.EVENT_16,
-               RTEMS.NO_WAIT,
-               RTEMS.NO_TIMEOUT,
-               EVENTS,
-               STATUS
-            );
-
-            exit when RTEMS.ARE_STATUSES_EQUAL( RTEMS.SUCCESSFUL, STATUS );
-
-            TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( 
-               STATUS,
-               RTEMS.UNSATISFIED,
-               "EVENT_RECEIVE"
-            );
-
-            TEST_SUPPORT.PUT_NAME( MPTEST.TASK_NAME( REMOTE_NODE ), FALSE );
-            TEXT_IO.PUT_LINE( " - have I been suspended???" ); 
-            RTEMS.TASK_WAKE_AFTER( 
-               TEST_SUPPORT.TICKS_PER_SECOND / 2,
-               STATUS
-            );
-            TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
-
-         end loop;
-
-      end if;
-
-   end TEST_TASK_SUPPORT;
-
-end MPTEST;
diff --git a/c/src/ada-tests/mptests/mp03/mptest.ads b/c/src/ada-tests/mptests/mp03/mptest.ads
deleted file mode 100644
index 5542682111..0000000000
--- a/c/src/ada-tests/mptests/mp03/mptest.ads
+++ /dev/null
@@ -1,214 +0,0 @@
---
---  MPTEST / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package is the specification for Test 3 of the RTEMS
---  Multiprocessor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with BSP_MPCI;
-with RTEMS;
-
-package MPTEST is
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS tasks created
---  by this test.
---
-
-   TASK_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.ID;
-   TASK_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.NAME;
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS timers created
---  by this test.
---
-
-   TIMER_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 2 ) of RTEMS.ID;
-   TIMER_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 2 ) of RTEMS.NAME;
-
---
---  This variable contains the ID of the remote task with which this
---  test interacts.
---
-
-   REMOTE_TID  : RTEMS.ID;
-
---
---  This variable contains the node on which the remote task with which 
---  this test interacts resides.
---
-
-   REMOTE_NODE : RTEMS.UNSIGNED32;
-
---
---  INIT
---
---  DESCRIPTION:
---
---  This RTEMS task initializes the application.
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  DELAYED_SEND_EVENT
---
---  DESCRIPTION:
---
---  This subprogram is a timer service routine which sends an 
---  event set to a waiting task.
---
-
-   procedure DELAYED_SEND_EVENT (
-      IGNORED_ID      : in     RTEMS.ID;  
-      IGNORED_ADDRESS : in     RTEMS.ADDRESS 
-   );
-
---
---  TEST_TASK
---
---  DESCRIPTION:
---
---  This is the body of the RTEMS tasks which constitute this test.
---
-
-   procedure TEST_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TEST_TASK_SUPPORT
---
---  DESCRIPTION:
---
---  This subprogram performs the bulk of the test.  Based on the NODE
---  specified, this subprogram loops suspending/resuming a remote task
---  or waiting for itself to be suspended/resumed.
---
-
-   procedure TEST_TASK_SUPPORT (
-      NODE : in     RTEMS.UNSIGNED32
-   );
-
---
---  This is the Driver Address Table for this test.
---
-
-   DEVICE_DRIVERS : aliased RTEMS.DRIVER_ADDRESS_TABLE( 1 .. 1 ) :=
-   (1=>
-      (
-        CLOCK_DRIVER.INITIALIZE'ACCESS,              -- Initialization
-        RTEMS.NO_DRIVER_ENTRY,                       -- Open
-        RTEMS.NO_DRIVER_ENTRY,                       -- Close
-        RTEMS.NO_DRIVER_ENTRY,                       -- Read
-        RTEMS.NO_DRIVER_ENTRY,                       -- Write
-        RTEMS.NO_DRIVER_ENTRY                        -- Control
-      )
-   );
-
---
---  This is the Initialization Tasks Table for this test.
---
-
-   INITIALIZATION_TASKS : aliased RTEMS.INITIALIZATION_TASKS_TABLE( 1 .. 1 ) := 
-   (1=>
-     (
-       RTEMS.BUILD_NAME( 'U', 'I', '1', ' ' ),        -- task name
-       2048,                                          -- stack size
-       1,                                             -- priority
-       RTEMS.DEFAULT_ATTRIBUTES,                      -- attributes
-       MPTEST.INIT'ACCESS,                            -- entry point
-       RTEMS.NO_PREEMPT,                              -- initial mode
-       0                                              -- argument list
-     )
-   );
-
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
---                             BEGIN SUBPACKAGE                           --
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
-
-   --
-   --  MPTEST.PER_NODE_CONFIGURATION / SPECIFICATION
-   --
-   --  DESCRIPTION:
-   --
-   --  This package is the specification for the subpackage
-   --  which will define the per node configuration parameters.
-   --
-   
-   package PER_NODE_CONFIGURATION is
-
-   --
-   --  LOCAL_NODE_NUMBER
-   --
-   --  DESCRIPTION:
-   --
-   --  This function returns the node number for this node.
-   --
-
-      function LOCAL_NODE_NUMBER 
-      return RTEMS.UNSIGNED32;
-  
-      pragma INLINE ( LOCAL_NODE_NUMBER );
-
-   end PER_NODE_CONFIGURATION;
-  
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
---                              END SUBPACKAGE                            --
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
-
---
---  This is the Multiprocessor Configuration Table for this test.
---
-
-   MULTIPROCESSING_CONFIGURATION : aliased RTEMS.MULTIPROCESSING_TABLE := (
-      MPTEST.PER_NODE_CONFIGURATION.LOCAL_NODE_NUMBER,
-      2,                         -- maximum # nodes in system 
-      32,                        -- maximum # global objects
-      32                         -- maximum # proxies
-    );
-
---
---  This is the Configuration Table for this test.
---
-
-   CONFIGURATION : aliased RTEMS.CONFIGURATION_TABLE := (
-      RTEMS.NULL_ADDRESS,        -- will be replaced by BSP
-      64 * 1024,                 -- executive RAM size
-      10,                        -- maximum # tasks
-      1,                         -- maximum # timers
-      0,                         -- maximum # semaphores
-      0,                         -- maximum # message queues
-      0,                         -- maximum # messages
-      0,                         -- maximum # partitions
-      0,                         -- maximum # regions
-      0,                         -- maximum # dp memory areas
-      0,                         -- maximum # periods
-      0,                         -- maximum # user extensions
-      RTEMS.MILLISECONDS_TO_MICROSECONDS(10), -- # us in a tick
-      50                         -- # ticks in a timeslice
-  );
-
-end MPTEST;
diff --git a/c/src/ada-tests/mptests/mp03/node1/mp03.scn b/c/src/ada-tests/mptests/mp03/node1/mp03.scn
deleted file mode 100644
index d749db49e2..0000000000
--- a/c/src/ada-tests/mptests/mp03/node1/mp03.scn
+++ /dev/null
@@ -1,28 +0,0 @@
-*** TEST 3 -- NODE 1 ***
-Creating Test_task (Global)
-Starting Test_task (Global)
-Deleting initialization task
-Getting TID of remote task
-Remote task's name is : 222
-111  - Suspending remote task
-111  - Resuming remote task
-111  - Suspending remote task
-111  - Resuming remote task
-111  - Suspending remote task
-111  - Resuming remote task
-222  - have I been suspended???
-222  - have I been suspended???
-222  - have I been suspended???
-222  - have I been suspended???
-222  - have I been suspended???
-222  - have I been suspended???
-222  - have I been suspended???
-222  - have I been suspended???
-222  - have I been suspended???
-222  - have I been suspended???
-222  - have I been suspended???
-222  - have I been suspended???
-222  - have I been suspended???
-222  - have I been suspended???
-*** END OF TEST 3 ***
-
diff --git a/c/src/ada-tests/mptests/mp03/node1/mptest-per_node_configuration.adb b/c/src/ada-tests/mptests/mp03/node1/mptest-per_node_configuration.adb
deleted file mode 100644
index 7df5087537..0000000000
--- a/c/src/ada-tests/mptests/mp03/node1/mptest-per_node_configuration.adb
+++ /dev/null
@@ -1,43 +0,0 @@
---
---  MPTEST.PER_NODE_CONFIGURATION / BODY
---
---  DESCRIPTION:
---
---  This package is the specification for the subpackage
---  which will define the per node configuration parameters.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-
-separate ( MPTEST )
-
-package body PER_NODE_CONFIGURATION is
-
---PAGE
---
---  LOCAL_NODE_NUMBER
---
-
-   function LOCAL_NODE_NUMBER 
-   return RTEMS.UNSIGNED32 is
-   begin
-
-      return 1;
-
-   end LOCAL_NODE_NUMBER;
-
-end PER_NODE_CONFIGURATION;
diff --git a/c/src/ada-tests/mptests/mp03/node2/mp03.scn b/c/src/ada-tests/mptests/mp03/node2/mp03.scn
deleted file mode 100644
index 56298f5b8d..0000000000
--- a/c/src/ada-tests/mptests/mp03/node2/mp03.scn
+++ /dev/null
@@ -1,28 +0,0 @@
-*** TEST 3 -- NODE 2 ***
-Creating Test_task (Global)
-Starting Test_task (Global)
-Deleting initialization task
-Getting TID of remote task
-Remote task's name is : 111
-111  - have I been suspended???
-111  - have I been suspended???
-111  - have I been suspended???
-111  - have I been suspended???
-111  - have I been suspended???
-111  - have I been suspended???
-111  - have I been suspended???
-111  - have I been suspended???
-111  - have I been suspended???
-111  - have I been suspended???
-111  - have I been suspended???
-111  - have I been suspended???
-111  - have I been suspended???
-111  - have I been suspended???
-222  - Suspending remote task
-222  - Resuming remote task
-222  - Suspending remote task
-222  - Resuming remote task
-222  - Suspending remote task
-222  - Resuming remote task
-*** END OF TEST 3 ***
-
diff --git a/c/src/ada-tests/mptests/mp03/node2/mptest-per_node_configuration.adb b/c/src/ada-tests/mptests/mp03/node2/mptest-per_node_configuration.adb
deleted file mode 100644
index e127cc5573..0000000000
--- a/c/src/ada-tests/mptests/mp03/node2/mptest-per_node_configuration.adb
+++ /dev/null
@@ -1,43 +0,0 @@
---
---  MPTEST.PER_NODE_CONFIGURATION / BODY
---
---  DESCRIPTION:
---
---  This package is the specification for the subpackage
---  which will define the per node configuration parameters.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-
-separate ( MPTEST )
-
-package body PER_NODE_CONFIGURATION is
-
---PAGE
---
---  LOCAL_NODE_NUMBER
---
-
-   function LOCAL_NODE_NUMBER 
-   return RTEMS.UNSIGNED32 is
-   begin
-
-      return 2;
-
-   end LOCAL_NODE_NUMBER;
-
-end PER_NODE_CONFIGURATION;
diff --git a/c/src/ada-tests/mptests/mp04/mptest.adb b/c/src/ada-tests/mptests/mp04/mptest.adb
deleted file mode 100644
index c44f521eaa..0000000000
--- a/c/src/ada-tests/mptests/mp04/mptest.adb
+++ /dev/null
@@ -1,169 +0,0 @@
---
---  MPTEST / BODY
---
---  DESCRIPTION:
---
---  This package is the implementation for Test 4 of the RTEMS
---  Multiprocessor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with INTERFACES; use INTERFACES;
-with RTEMS;
-with TEST_SUPPORT;
-with TEXT_IO;
-with UNSIGNED32_IO;
-
-package body MPTEST is
-
-   package body PER_NODE_CONFIGURATION is separate;
-
---PAGE
---
---  INIT
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT( "*** TEST 4 -- NODE " );
-      UNSIGNED32_IO.PUT(
-         MPTEST.MULTIPROCESSING_CONFIGURATION.NODE,
-         WIDTH => 1
-      );
-      TEXT_IO.PUT_LINE( " ***" );
-
-      MPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME(  '1', '1', '1', ' ' );
-      MPTEST.TASK_NAME( 2 ) := RTEMS.BUILD_NAME(  '2', '2', '2', ' ' );
-
-      TEXT_IO.PUT_LINE( "Creating Test_task (Global)" );
-
-      RTEMS.TASK_CREATE( 
-         MPTEST.TASK_NAME( MPTEST.MULTIPROCESSING_CONFIGURATION.NODE ), 
-         MPTEST.MULTIPROCESSING_CONFIGURATION.NODE, 
-         2048, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.GLOBAL,
-         MPTEST.TASK_ID( 1 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE" );
-
-      TEXT_IO.PUT_LINE( "Starting Test_task (Global)" );
-
-      RTEMS.TASK_START(
-         MPTEST.TASK_ID( 1 ),
-         MPTEST.TEST_TASK'ACCESS,
-         0,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START" );
-
-      TEXT_IO.PUT_LINE( "Deleting initialization task" );
-
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
-
-   end INIT;
-
---PAGE
---
---  TEST_TASK
---
-
-   procedure TEST_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      TID                 : RTEMS.ID;
-      PREVIOUS_PRIORITY   : RTEMS.TASK_PRIORITY;
-      PREVIOUS_PRIORITY_1 : RTEMS.TASK_PRIORITY;
-      STATUS              : RTEMS.STATUS_CODES;
-   begin
-
-      RTEMS.TASK_IDENT( RTEMS.SELF, RTEMS.SEARCH_ALL_NODES, TID, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_IDENT OF SELF" );
-   
-      TEXT_IO.PUT_LINE( "Getting TID of remote task" );
-      if MPTEST.MULTIPROCESSING_CONFIGURATION.NODE = 1 then
-         MPTEST.REMOTE_NODE := 2;
-      else
-         MPTEST.REMOTE_NODE := 1;
-      end if;
-
-      TEXT_IO.PUT( "Remote task's name is : " );
-      TEST_SUPPORT.PUT_NAME( MPTEST.TASK_NAME( MPTEST.REMOTE_NODE ), TRUE );
-
-      loop
-
-         RTEMS.TASK_IDENT( 
-            MPTEST.TASK_NAME( MPTEST.REMOTE_NODE ),
-            RTEMS.SEARCH_ALL_NODES,
-            MPTEST.REMOTE_TID,
-            STATUS
-         );
-
-         exit when RTEMS.IS_STATUS_SUCCESSFUL( STATUS );
-
-      end loop;
-
-      RTEMS.TASK_SET_PRIORITY(
-         MPTEST.REMOTE_TID,
-         MPTEST.MULTIPROCESSING_CONFIGURATION.NODE,
-         PREVIOUS_PRIORITY,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SET_PRIORITY" );
-
-      if PREVIOUS_PRIORITY /= MPTEST.REMOTE_NODE then
-
-         TEXT_IO.PUT( "Remote priority (0x" );
-         UNSIGNED32_IO.PUT( PREVIOUS_PRIORITY, BASE => 16 );
-         TEXT_IO.PUT( "does not match remote node (0x" );
-         UNSIGNED32_IO.PUT( MPTEST.REMOTE_NODE, BASE => 16 );
-         TEXT_IO.PUT_LINE( ")!!!" );
-
-         RTEMS.SHUTDOWN_EXECUTIVE( 16#F00000# );
-
-      end if;
-
-      loop
-
-         RTEMS.TASK_SET_PRIORITY(
-            RTEMS.SELF,
-            RTEMS.CURRENT_PRIORITY,
-            PREVIOUS_PRIORITY_1,
-            STATUS
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SET_PRIORITY" );
-
-         exit when PREVIOUS_PRIORITY_1 = MPTEST.REMOTE_NODE;
-
-      end loop;
-
-
-      TEXT_IO.PUT_LINE( "Local task priority has been set" );
-
-      TEXT_IO.PUT_LINE( "*** END OF TEST 4 ***" );
-
-      RTEMS.SHUTDOWN_EXECUTIVE( 0 );
-
-   end TEST_TASK;
-
-end MPTEST;
diff --git a/c/src/ada-tests/mptests/mp04/mptest.ads b/c/src/ada-tests/mptests/mp04/mptest.ads
deleted file mode 100644
index 2541ff5a93..0000000000
--- a/c/src/ada-tests/mptests/mp04/mptest.ads
+++ /dev/null
@@ -1,178 +0,0 @@
---
---  MPTEST / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package is the specification for Test 4 of the RTEMS
---  Multiprocessor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with BSP_MPCI;
-with RTEMS;
-
-package MPTEST is
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS tasks created
---  by this test.
---
-
-   TASK_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.ID;
-   TASK_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.NAME;
-
---
---  This variable contains the ID of the remote task with which this
---  test interacts.
---
-
-   REMOTE_TID  : RTEMS.ID;
-
---
---  This variable contains the node on which the remote task with which 
---  this test interacts resides.
---
-
-   REMOTE_NODE : RTEMS.UNSIGNED32;
-
---
---  INIT
---
---  DESCRIPTION:
---
---  This RTEMS task initializes the application.
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TEST_TASK
---
---  DESCRIPTION:
---
---  This is the body of the RTEMS tasks which constitute this test.
---
-
-   procedure TEST_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  This is the Driver Address Table for this test.
---
-
-   DEVICE_DRIVERS : aliased RTEMS.DRIVER_ADDRESS_TABLE( 1 .. 1 ) :=
-   (1=>
-      (
-        CLOCK_DRIVER.INITIALIZE'ACCESS,              -- Initialization
-        RTEMS.NO_DRIVER_ENTRY,                       -- Open
-        RTEMS.NO_DRIVER_ENTRY,                       -- Close
-        RTEMS.NO_DRIVER_ENTRY,                       -- Read
-        RTEMS.NO_DRIVER_ENTRY,                       -- Write
-        RTEMS.NO_DRIVER_ENTRY                        -- Control
-      )
-   );
-
---
---  This is the Initialization Tasks Table for this test.
---
-
-   INITIALIZATION_TASKS : aliased RTEMS.INITIALIZATION_TASKS_TABLE( 1 .. 1 ) := 
-   (1=>
-     (
-       RTEMS.BUILD_NAME( 'U', 'I', '1', ' ' ),        -- task name
-       2048,                                          -- stack size
-       1,                                             -- priority
-       RTEMS.DEFAULT_ATTRIBUTES,                      -- attributes
-       MPTEST.INIT'ACCESS,                            -- entry point
-       RTEMS.NO_PREEMPT,                              -- initial mode
-       0                                              -- argument list
-     )
-   );
-
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
---                             BEGIN SUBPACKAGE                           --
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
-
-   --
-   --  MPTEST.PER_NODE_CONFIGURATION / SPECIFICATION
-   --
-   --  DESCRIPTION:
-   --
-   --  This package is the specification for the subpackage
-   --  which will define the per node configuration parameters.
-   --
-   
-   package PER_NODE_CONFIGURATION is
-
-   --
-   --  LOCAL_NODE_NUMBER
-   --
-   --  DESCRIPTION:
-   --
-   --  This function returns the node number for this node.
-   --
-
-      function LOCAL_NODE_NUMBER 
-      return RTEMS.UNSIGNED32;
-  
-      pragma INLINE ( LOCAL_NODE_NUMBER );
-
-   end PER_NODE_CONFIGURATION;
-  
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
---                              END SUBPACKAGE                            --
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
-
---
---  This is the Multiprocessor Configuration Table for this test.
---
-
-   MULTIPROCESSING_CONFIGURATION : aliased RTEMS.MULTIPROCESSING_TABLE := (
-      MPTEST.PER_NODE_CONFIGURATION.LOCAL_NODE_NUMBER,
-      2,                         -- maximum # nodes in system 
-      32,                        -- maximum # global objects
-      32                         -- maximum # proxies
-    );
-
---
---  This is the Configuration Table for this test.
---
-
-   CONFIGURATION : aliased RTEMS.CONFIGURATION_TABLE := (
-      RTEMS.NULL_ADDRESS,        -- will be replaced by BSP
-      64 * 1024,                 -- executive RAM size
-      10,                        -- maximum # tasks
-      1,                         -- maximum # timers
-      0,                         -- maximum # semaphores
-      0,                         -- maximum # message queues
-      0,                         -- maximum # messages
-      0,                         -- maximum # partitions
-      0,                         -- maximum # regions
-      0,                         -- maximum # dp memory areas
-      0,                         -- maximum # periods
-      0,                         -- maximum # user extensions
-      RTEMS.MILLISECONDS_TO_MICROSECONDS(10), -- # us in a tick
-      50                         -- # ticks in a timeslice
-  );
-
-end MPTEST;
diff --git a/c/src/ada-tests/mptests/mp04/node1/mp04.scn b/c/src/ada-tests/mptests/mp04/node1/mp04.scn
deleted file mode 100644
index e9518f3ac2..0000000000
--- a/c/src/ada-tests/mptests/mp04/node1/mp04.scn
+++ /dev/null
@@ -1,8 +0,0 @@
-*** TEST 4 -- NODE 1 ***
-Creating Test_task (Global)
-Starting Test_task (Global)
-Deleting initialization task
-Getting TID of remote task
-Remote task's name is : 222
-Local task priority has been set
-*** END OF TEST 4 ***
diff --git a/c/src/ada-tests/mptests/mp04/node1/mptest-per_node_configuration.adb b/c/src/ada-tests/mptests/mp04/node1/mptest-per_node_configuration.adb
deleted file mode 100644
index 7df5087537..0000000000
--- a/c/src/ada-tests/mptests/mp04/node1/mptest-per_node_configuration.adb
+++ /dev/null
@@ -1,43 +0,0 @@
---
---  MPTEST.PER_NODE_CONFIGURATION / BODY
---
---  DESCRIPTION:
---
---  This package is the specification for the subpackage
---  which will define the per node configuration parameters.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-
-separate ( MPTEST )
-
-package body PER_NODE_CONFIGURATION is
-
---PAGE
---
---  LOCAL_NODE_NUMBER
---
-
-   function LOCAL_NODE_NUMBER 
-   return RTEMS.UNSIGNED32 is
-   begin
-
-      return 1;
-
-   end LOCAL_NODE_NUMBER;
-
-end PER_NODE_CONFIGURATION;
diff --git a/c/src/ada-tests/mptests/mp04/node2/mp04.scn b/c/src/ada-tests/mptests/mp04/node2/mp04.scn
deleted file mode 100644
index 8ccfcfef79..0000000000
--- a/c/src/ada-tests/mptests/mp04/node2/mp04.scn
+++ /dev/null
@@ -1,8 +0,0 @@
-*** TEST 4 -- NODE 2 ***
-Creating Test_task (Global)
-Starting Test_task (Global)
-Deleting initialization task
-Getting TID of remote task
-Remote task's name is : 111
-Local task priority has been set
-*** END OF TEST 4 ***
diff --git a/c/src/ada-tests/mptests/mp04/node2/mptest-per_node_configuration.adb b/c/src/ada-tests/mptests/mp04/node2/mptest-per_node_configuration.adb
deleted file mode 100644
index e127cc5573..0000000000
--- a/c/src/ada-tests/mptests/mp04/node2/mptest-per_node_configuration.adb
+++ /dev/null
@@ -1,43 +0,0 @@
---
---  MPTEST.PER_NODE_CONFIGURATION / BODY
---
---  DESCRIPTION:
---
---  This package is the specification for the subpackage
---  which will define the per node configuration parameters.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-
-separate ( MPTEST )
-
-package body PER_NODE_CONFIGURATION is
-
---PAGE
---
---  LOCAL_NODE_NUMBER
---
-
-   function LOCAL_NODE_NUMBER 
-   return RTEMS.UNSIGNED32 is
-   begin
-
-      return 2;
-
-   end LOCAL_NODE_NUMBER;
-
-end PER_NODE_CONFIGURATION;
diff --git a/c/src/ada-tests/mptests/mp05/mptest.adb b/c/src/ada-tests/mptests/mp05/mptest.adb
deleted file mode 100644
index 2bab2ddbb7..0000000000
--- a/c/src/ada-tests/mptests/mp05/mptest.adb
+++ /dev/null
@@ -1,252 +0,0 @@
---
---  MPTEST / BODY
---
---  DESCRIPTION:
---
---  This package is the implementation for Test 5 of the RTEMS
---  Multiprocessor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with INTERFACES; use INTERFACES;
-with RTEMS;
-with TEST_SUPPORT;
-with TEXT_IO;
-with UNSIGNED32_IO;
-
-package body MPTEST is
-
-   package body PER_NODE_CONFIGURATION is separate;
-
---PAGE
---
---  INIT
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT( "*** TEST 5 -- NODE " );
-      UNSIGNED32_IO.PUT(
-         MPTEST.MULTIPROCESSING_CONFIGURATION.NODE,
-         WIDTH => 1
-      );
-      TEXT_IO.PUT_LINE( " ***" );
-
-      MPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME(  '1', '1', '1', ' ' );
-      MPTEST.TASK_NAME( 2 ) := RTEMS.BUILD_NAME(  '2', '2', '2', ' ' );
-
-      TEXT_IO.PUT_LINE( "Creating Test_task (Global)" );
-
-      RTEMS.TASK_CREATE( 
-         MPTEST.TASK_NAME( MPTEST.MULTIPROCESSING_CONFIGURATION.NODE ), 
-         1,
-         2048, 
-         RTEMS.TIMESLICE,
-         RTEMS.GLOBAL,
-         MPTEST.TASK_ID( 1 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE" );
-
-      TEXT_IO.PUT_LINE( "Starting Test_task (Global)" );
-
-      RTEMS.TASK_START(
-         MPTEST.TASK_ID( 1 ),
-         MPTEST.TEST_TASK'ACCESS,
-         0,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START" );
-
-      MPTEST.TIMER_NAME( 1 ) := RTEMS.BUILD_NAME(  'T', 'M', '1', ' ' );
-      MPTEST.TIMER_NAME( 2 ) := RTEMS.BUILD_NAME(  'T', 'M', '2', ' ' );
-
-      RTEMS.TIMER_CREATE(
-         MPTEST.TIMER_NAME( MPTEST.MULTIPROCESSING_CONFIGURATION.NODE ),
-         MPTEST.TIMER_ID( 1 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_CREATE" );
-
-      TEXT_IO.PUT_LINE( "Deleting initialization task" );
-
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
-
-   end INIT;
-
---PAGE
---
---  PROCESS_ASR
---
-
-   procedure PROCESS_ASR (
-      SIGNAL : in     RTEMS.SIGNAL_SET
-   )
-   is 
-   begin
-
-      if SIGNAL /= MPTEST.EXPECTED_SIGNAL then
-
-         TEXT_IO.PUT( "ERROR: I was expecting signal 0x" );
-         UNSIGNED32_IO.PUT( EXPECTED_SIGNAL, BASE => 16 );
-         TEXT_IO.PUT( " got 0x" );
-         UNSIGNED32_IO.PUT( SIGNAL, BASE => 16 );
-         TEXT_IO.NEW_LINE;
-
-         RTEMS.FATAL_ERROR_OCCURRED( 16#000F_0000# );
-
-      end if;
-
-      MPTEST.SIGNAL_CAUGHT := TRUE;
-
-   end PROCESS_ASR;
-
---PAGE
---
---  STOP_TEST_TSR
---
-
-   procedure STOP_TEST_TSR (
-      IGNORED_ID      : in     RTEMS.ID;
-      IGNORED_ADDRESS : in     RTEMS.ADDRESS
-   ) is
-   begin
-
-      MPTEST.STOP_TEST := TRUE;
-
-   end STOP_TEST_TSR;
-
---PAGE
---
---  TEST_TASK
---
-
-   procedure TEST_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS  : RTEMS.STATUS_CODES;
-   begin
-
-      MPTEST.STOP_TEST := FALSE;
-
-      MPTEST.SIGNAL_CAUGHT := FALSE;
-      MPTEST.SIGNAL_COUNT  := 0;
-
-      TEXT_IO.PUT_LINE( "signal_catch: initializing signal catcher" );
-      RTEMS.SIGNAL_CATCH( 
-         MPTEST.PROCESS_ASR'ACCESS, 
-         RTEMS.NO_ASR + RTEMS.NO_PREEMPT,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SIGNAL_CATCH" );
-
-      if MPTEST.MULTIPROCESSING_CONFIGURATION.NODE = 1 then
-         MPTEST.REMOTE_NODE     := 2;
-         MPTEST.REMOTE_SIGNAL   := RTEMS.SIGNAL_18;
-         MPTEST.EXPECTED_SIGNAL := RTEMS.SIGNAL_17;
-      else
-         MPTEST.REMOTE_NODE     := 1;
-         MPTEST.REMOTE_SIGNAL   := RTEMS.SIGNAL_17;
-         MPTEST.EXPECTED_SIGNAL := RTEMS.SIGNAL_18;
-      end if;
-
-      TEXT_IO.PUT( "Remote task's name is : " );
-      TEST_SUPPORT.PUT_NAME( MPTEST.TASK_NAME( MPTEST.REMOTE_NODE ), TRUE );
-
-      TEXT_IO.PUT_LINE( "Getting TID of remote task" );
-      loop
-
-         RTEMS.TASK_IDENT( 
-            MPTEST.TASK_NAME( MPTEST.REMOTE_NODE ),
-            RTEMS.SEARCH_ALL_NODES,
-            MPTEST.REMOTE_TID,
-            STATUS
-         );
-
-         exit when RTEMS.IS_STATUS_SUCCESSFUL( STATUS );
-
-      end loop;
-
-      RTEMS.TIMER_FIRE_AFTER(
-         MPTEST.TIMER_ID( 1 ),
-         3 * TEST_SUPPORT.TICKS_PER_SECOND,
-         MPTEST.STOP_TEST_TSR'ACCESS,
-         RTEMS.NULL_ADDRESS,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_FIRE_AFTER" );
-
-      if MPTEST.MULTIPROCESSING_CONFIGURATION.NODE = 1 then
-
-         TEXT_IO.PUT_LINE( "Sending signal to remote task" );
-         loop
-            RTEMS.SIGNAL_SEND(
-               MPTEST.REMOTE_TID,
-               MPTEST.REMOTE_SIGNAL,
-               STATUS
-            );
-
-            exit when RTEMS.IS_STATUS_SUCCESSFUL( STATUS );
-
-            exit when not RTEMS.ARE_STATUSES_EQUAL( STATUS, RTEMS.NOT_DEFINED );
-   
-         end loop;
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SIGNAL_SEND" );
-
-      end if;
-
-      loop
- 
-         exit when MPTEST.STOP_TEST = TRUE;
-
-         if MPTEST.SIGNAL_CAUGHT = TRUE then
-
-            MPTEST.SIGNAL_CAUGHT := FALSE;
-            MPTEST.SIGNAL_COUNT  := MPTEST.SIGNAL_COUNT + 1;
-
-            if MPTEST.SIGNAL_COUNT >= MPTEST.SIGNALS_PER_DOT then
-
-               MPTEST.SIGNAL_COUNT := 0;
-
-               TEST_SUPPORT.PUT_DOT( "." );
-
-            end if;
-
-            RTEMS.SIGNAL_SEND(
-               MPTEST.REMOTE_TID,
-               MPTEST.REMOTE_SIGNAL,
-               STATUS
-            );
-            TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SIGNAL_SEND" );
-
-         end if;
-
-      end loop;
-
-      TEXT_IO.NEW_LINE;
-      TEXT_IO.PUT_LINE( "*** END OF TEST 5 ***" );
-
-      RTEMS.SHUTDOWN_EXECUTIVE( 0 );
-
-   end TEST_TASK;
-
-end MPTEST;
diff --git a/c/src/ada-tests/mptests/mp05/mptest.ads b/c/src/ada-tests/mptests/mp05/mptest.ads
deleted file mode 100644
index 9f95ede392..0000000000
--- a/c/src/ada-tests/mptests/mp05/mptest.ads
+++ /dev/null
@@ -1,243 +0,0 @@
---
---  MPTEST / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package is the specification for Test 5 of the RTEMS
---  Multiprocessor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with BSP_MPCI;
-with RTEMS;
-
-package MPTEST is
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS tasks created
---  by this test.
---
-
-   TASK_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.ID;
-   TASK_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.NAME;
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS timers created
---  by this test.
---
-
-   TIMER_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 2 ) of RTEMS.ID;
-   TIMER_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 2 ) of RTEMS.NAME;
-
---
---  This variable is set when the test should stop executing.
---
-   STOP_TEST : RTEMS.BOOLEAN;
-
---
---  This variable contains the ID of the remote task with which this
---  test interacts.
---
-
-   REMOTE_TID  : RTEMS.ID;
-
---
---  This variable contains the node on which the remote task with which 
---  this test interacts resides.
---
-
-   REMOTE_NODE : RTEMS.UNSIGNED32;
-
---
---  This is the signal set which is sent to the task on the other node.
---
-
-   REMOTE_SIGNAL : RTEMS.SIGNAL_SET;
-
---
---  This is the signal set the task on this node expects to receive
---  from the other node.
---
-
-   EXPECTED_SIGNAL : RTEMS.SIGNAL_SET;
-
---
---  These keep track of if a signal set has been caught and how many 
---  signal sets have been caught cumulative.
---
-
-   SIGNAL_CAUGHT : RTEMS.BOOLEAN;
-   SIGNAL_COUNT  : RTEMS.UNSIGNED32;
-
---
---  The number of signals to process per dot printed out.
---
-
-   SIGNALS_PER_DOT : constant RTEMS.UNSIGNED32 := 15;
-
---
---  INIT
---
---  DESCRIPTION:
---
---  This RTEMS task initializes the application.
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  PROCESS_ASR
---
---  DESCRIPTION:
---
---  This subprogram is an ASR for TEST_TASK.
---
-
-   procedure PROCESS_ASR (
-      SIGNAL : in     RTEMS.SIGNAL_SET
-   );
-
---
---  STOP_TEST_TSR
---
---  DESCRIPTION:
---
---  This subprogram is a TSR which sets the "stop test" flag.
---
- 
-   procedure STOP_TEST_TSR (
-      IGNORED_ID      : in     RTEMS.ID;
-      IGNORED_ADDRESS : in     RTEMS.ADDRESS
-   );
-
---
---  TEST_TASK
---
---  DESCRIPTION:
---
---  This is the body of the RTEMS tasks which constitute this test.
---
-
-   procedure TEST_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  This is the Driver Address Table for this test.
---
-
-   DEVICE_DRIVERS : aliased RTEMS.DRIVER_ADDRESS_TABLE( 1 .. 1 ) :=
-   (1=>
-      (
-        CLOCK_DRIVER.INITIALIZE'ACCESS,              -- Initialization
-        RTEMS.NO_DRIVER_ENTRY,                       -- Open
-        RTEMS.NO_DRIVER_ENTRY,                       -- Close
-        RTEMS.NO_DRIVER_ENTRY,                       -- Read
-        RTEMS.NO_DRIVER_ENTRY,                       -- Write
-        RTEMS.NO_DRIVER_ENTRY                        -- Control
-      )
-   );
-
---
---  This is the Initialization Tasks Table for this test.
---
-
-   INITIALIZATION_TASKS : aliased RTEMS.INITIALIZATION_TASKS_TABLE( 1 .. 1 ) := 
-   (1=>
-     (
-       RTEMS.BUILD_NAME( 'U', 'I', '1', ' ' ),        -- task name
-       2048,                                          -- stack size
-       1,                                             -- priority
-       RTEMS.DEFAULT_ATTRIBUTES,                      -- attributes
-       MPTEST.INIT'ACCESS,                            -- entry point
-       RTEMS.NO_PREEMPT,                              -- initial mode
-       0                                              -- argument list
-     )
-   );
-
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
---                             BEGIN SUBPACKAGE                           --
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
-
-   --
-   --  MPTEST.PER_NODE_CONFIGURATION / SPECIFICATION
-   --
-   --  DESCRIPTION:
-   --
-   --  This package is the specification for the subpackage
-   --  which will define the per node configuration parameters.
-   --
-   
-   package PER_NODE_CONFIGURATION is
-
-   --
-   --  LOCAL_NODE_NUMBER
-   --
-   --  DESCRIPTION:
-   --
-   --  This function returns the node number for this node.
-   --
-
-      function LOCAL_NODE_NUMBER 
-      return RTEMS.UNSIGNED32;
-  
-      pragma INLINE ( LOCAL_NODE_NUMBER );
-
-   end PER_NODE_CONFIGURATION;
-  
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
---                              END SUBPACKAGE                            --
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
-
---
---  This is the Multiprocessor Configuration Table for this test.
---
-
-   MULTIPROCESSING_CONFIGURATION : aliased RTEMS.MULTIPROCESSING_TABLE := (
-      MPTEST.PER_NODE_CONFIGURATION.LOCAL_NODE_NUMBER,
-      2,                         -- maximum # nodes in system 
-      32,                        -- maximum # global objects
-      32                         -- maximum # proxies
-    );
-
---
---  This is the Configuration Table for this test.
---
-
-   CONFIGURATION : aliased RTEMS.CONFIGURATION_TABLE := (
-      RTEMS.NULL_ADDRESS,        -- will be replaced by BSP
-      64 * 1024,                 -- executive RAM size
-      10,                        -- maximum # tasks
-      1,                         -- maximum # timers
-      2,                         -- maximum # semaphores
-      0,                         -- maximum # message queues
-      0,                         -- maximum # messages
-      0,                         -- maximum # partitions
-      0,                         -- maximum # regions
-      0,                         -- maximum # dp memory areas
-      0,                         -- maximum # periods
-      0,                         -- maximum # user extensions
-      RTEMS.MILLISECONDS_TO_MICROSECONDS(10), -- # us in a tick
-      50                         -- # ticks in a timeslice
-  );
-
-end MPTEST;
diff --git a/c/src/ada-tests/mptests/mp05/node1/mp05.scn b/c/src/ada-tests/mptests/mp05/node1/mp05.scn
deleted file mode 100644
index 6f0ea4b639..0000000000
--- a/c/src/ada-tests/mptests/mp05/node1/mp05.scn
+++ /dev/null
@@ -1,11 +0,0 @@
-*** TEST 5 -- NODE 1 ***
-Creating Test_task (Global)
-Starting Test_task (Global)
-Deleting initialization task
-signal_catch: initializing signal catcher
-Remote task's name is : 222
-Getting TID of remote task
-Sending signal to remote task
-....................................................   
-....................................................   
-*** END OF TEST 5 ***
diff --git a/c/src/ada-tests/mptests/mp05/node1/mptest-per_node_configuration.adb b/c/src/ada-tests/mptests/mp05/node1/mptest-per_node_configuration.adb
deleted file mode 100644
index 7df5087537..0000000000
--- a/c/src/ada-tests/mptests/mp05/node1/mptest-per_node_configuration.adb
+++ /dev/null
@@ -1,43 +0,0 @@
---
---  MPTEST.PER_NODE_CONFIGURATION / BODY
---
---  DESCRIPTION:
---
---  This package is the specification for the subpackage
---  which will define the per node configuration parameters.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-
-separate ( MPTEST )
-
-package body PER_NODE_CONFIGURATION is
-
---PAGE
---
---  LOCAL_NODE_NUMBER
---
-
-   function LOCAL_NODE_NUMBER 
-   return RTEMS.UNSIGNED32 is
-   begin
-
-      return 1;
-
-   end LOCAL_NODE_NUMBER;
-
-end PER_NODE_CONFIGURATION;
diff --git a/c/src/ada-tests/mptests/mp05/node2/mp05.scn b/c/src/ada-tests/mptests/mp05/node2/mp05.scn
deleted file mode 100644
index 1fb18c132b..0000000000
--- a/c/src/ada-tests/mptests/mp05/node2/mp05.scn
+++ /dev/null
@@ -1,10 +0,0 @@
-*** TEST 5 -- NODE 2 ***
-Creating Test_task (Global)
-Starting Test_task (Global)
-Deleting initialization task
-signal_catch: initializing signal catcher
-Remote task's name is : 111
-Getting TID of remote task
-....................................................   
-....................................................   
-*** END OF TEST 5 ***
diff --git a/c/src/ada-tests/mptests/mp05/node2/mptest-per_node_configuration.adb b/c/src/ada-tests/mptests/mp05/node2/mptest-per_node_configuration.adb
deleted file mode 100644
index e127cc5573..0000000000
--- a/c/src/ada-tests/mptests/mp05/node2/mptest-per_node_configuration.adb
+++ /dev/null
@@ -1,43 +0,0 @@
---
---  MPTEST.PER_NODE_CONFIGURATION / BODY
---
---  DESCRIPTION:
---
---  This package is the specification for the subpackage
---  which will define the per node configuration parameters.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-
-separate ( MPTEST )
-
-package body PER_NODE_CONFIGURATION is
-
---PAGE
---
---  LOCAL_NODE_NUMBER
---
-
-   function LOCAL_NODE_NUMBER 
-   return RTEMS.UNSIGNED32 is
-   begin
-
-      return 2;
-
-   end LOCAL_NODE_NUMBER;
-
-end PER_NODE_CONFIGURATION;
diff --git a/c/src/ada-tests/mptests/mp06/mptest.adb b/c/src/ada-tests/mptests/mp06/mptest.adb
deleted file mode 100644
index 56a0841e20..0000000000
--- a/c/src/ada-tests/mptests/mp06/mptest.adb
+++ /dev/null
@@ -1,257 +0,0 @@
---
---  MPTEST / BODY
---
---  DESCRIPTION:
---
---  This package is the implementation for Test 6 of the RTEMS
---  Multiprocessor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with INTERFACES; use INTERFACES;
-with RTEMS;
-with TEST_SUPPORT;
-with TEXT_IO;
-with UNSIGNED32_IO;
-
-package body MPTEST is
-
-   package body PER_NODE_CONFIGURATION is separate;
-
---PAGE
---
---  INIT
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT( "*** TEST 6 -- NODE " );
-      UNSIGNED32_IO.PUT(
-         MPTEST.MULTIPROCESSING_CONFIGURATION.NODE,
-         WIDTH => 1
-      );
-      TEXT_IO.PUT_LINE( " ***" );
-
-      MPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME(  '1', '1', '1', ' ' );
-      MPTEST.TASK_NAME( 2 ) := RTEMS.BUILD_NAME(  '2', '2', '2', ' ' );
-
-      TEXT_IO.PUT_LINE( "Creating Test_task (Global)" );
-
-      RTEMS.TASK_CREATE( 
-         MPTEST.TASK_NAME( MPTEST.MULTIPROCESSING_CONFIGURATION.NODE ), 
-         MPTEST.MULTIPROCESSING_CONFIGURATION.NODE, 
-         2048, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.GLOBAL,
-         MPTEST.TASK_ID( 1 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE" );
-
-      TEXT_IO.PUT_LINE( "Starting Test_task (Global)" );
-
-      RTEMS.TASK_START(
-         MPTEST.TASK_ID( 1 ),
-         MPTEST.TEST_TASK'ACCESS,
-         0,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START" );
-
-      MPTEST.TIMER_NAME( 1 ) := RTEMS.BUILD_NAME(  'T', 'M', '1', ' ' );
-      MPTEST.TIMER_NAME( 2 ) := RTEMS.BUILD_NAME(  'T', 'M', '2', ' ' );
-
-      RTEMS.TIMER_CREATE(
-         MPTEST.TIMER_NAME( MPTEST.MULTIPROCESSING_CONFIGURATION.NODE ),
-         MPTEST.TIMER_ID( 1 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_CREATE" );
-
-      TEXT_IO.PUT_LINE( "Deleting initialization task" );
-
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
-
-   end INIT;
-
---PAGE
---
---  STOP_TEST_TSR
---
- 
-   procedure STOP_TEST_TSR (
-      IGNORED1 : in     RTEMS.ID;
-      IGNORED2 : in     RTEMS.ADDRESS
-   ) is
-   begin
- 
-      MPTEST.STOP_TEST := TRUE;
- 
-   end STOP_TEST_TSR;
- 
---PAGE
---
---  TEST_TASK
---
-
-   procedure TEST_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      COUNT                    : RTEMS.UNSIGNED32;
-      EVENT_OUT                : RTEMS.EVENT_SET;
-      EVENT_FOR_THIS_ITERATION : RTEMS.EVENT_SET;
-      STATUS                   : RTEMS.STATUS_CODES;
-   begin
-
-      MPTEST.STOP_TEST := FALSE;
-
-      if MPTEST.MULTIPROCESSING_CONFIGURATION.NODE = 1 then
-         MPTEST.REMOTE_NODE     := 2;
-      else
-         MPTEST.REMOTE_NODE     := 1;
-      end if;
-
-      TEXT_IO.PUT( "Remote task's name is : " );
-      TEST_SUPPORT.PUT_NAME( MPTEST.TASK_NAME( MPTEST.REMOTE_NODE ), TRUE );
-
-      TEXT_IO.PUT_LINE( "Getting TID of remote task" );
-
-      loop
-
-         RTEMS.TASK_IDENT( 
-            MPTEST.TASK_NAME( MPTEST.REMOTE_NODE ),
-            RTEMS.SEARCH_ALL_NODES,
-            MPTEST.REMOTE_TID,
-            STATUS
-         );
-
-         exit when RTEMS.IS_STATUS_SUCCESSFUL( STATUS );
-
-      end loop;
-
-      if MPTEST.MULTIPROCESSING_CONFIGURATION.NODE = 1 then
-         TEXT_IO.PUT_LINE( "Sending events to remote task" );
-      else
-         TEXT_IO.PUT_LINE( "Receiving events from remote task" );
-      end if;
-
-      RTEMS.TIMER_FIRE_AFTER(
-         MPTEST.TIMER_ID( 1 ),
-         5 * TEST_SUPPORT.TICKS_PER_SECOND,
-         MPTEST.STOP_TEST_TSR'ACCESS,
-         RTEMS.NULL_ADDRESS,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_FIRE_AFTER" );
- 
-      COUNT := 0;
-
-      loop
- 
-         exit when MPTEST.STOP_TEST = TRUE;
-
-         EVENT_FOR_THIS_ITERATION := 
-            MPTEST.EVENT_SET_TABLE( 
-               INTEGER( COUNT ) mod MPTEST.EVENT_SET_TABLE'LAST + 1
-            );
-
-         if MPTEST.MULTIPROCESSING_CONFIGURATION.NODE = 1 then
-
-            RTEMS.EVENT_SEND( 
-               MPTEST.REMOTE_TID,
-               EVENT_FOR_THIS_ITERATION,
-               STATUS
-            );
-            TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "EVENT_SEND" );
-
-         else
-
-            RTEMS.EVENT_RECEIVE( 
-               EVENT_FOR_THIS_ITERATION,
-               RTEMS.DEFAULT_OPTIONS,
-               1 * TEST_SUPPORT.TICKS_PER_SECOND,
-               EVENT_OUT,
-               STATUS
-            );
-
-            if RTEMS.ARE_STATUSES_EQUAL( STATUS, RTEMS.TIMEOUT ) then
-               TEXT_IO.NEW_LINE( 1 );
-
-               if MPTEST.MULTIPROCESSING_CONFIGURATION.NODE = 2 then
-                  TEXT_IO.PUT_LINE(
-                     "Correct behavior if the other node exitted."
-                  );
-               else
-                  TEXT_IO.PUT_LINE(
-                     "ERROR... node 1 died"
-                  );
-               end if;
-
-               exit;
-
-            else
-
-               TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "EVENT_RECEIVE" );
-
-            end if;
-
-         end if;
-
-         if (COUNT mod MPTEST.MAXIMUM_DOTS) = 0 then
-
-            TEST_SUPPORT.PUT_DOT( "." );
-
-         end if;
-
-         COUNT := COUNT + 1;
-
-      end loop;
-
-      TEXT_IO.NEW_LINE;
-
-      if MPTEST.MULTIPROCESSING_CONFIGURATION.NODE = 2 then
-
-         RTEMS.EVENT_RECEIVE( 
-            RTEMS.EVENT_16,
-            RTEMS.DEFAULT_OPTIONS,
-            1 * TEST_SUPPORT.TICKS_PER_SECOND,
-            EVENT_OUT,
-            STATUS
-         );
-         TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( 
-            RTEMS.TIMEOUT,
-            STATUS,
-            "EVENT_RECEIVE"
-         );
-
-         TEXT_IO.NEW_LINE;
-         TEXT_IO.PUT_LINE( "event_receive - correctly returned TIMEOUT" );
-
-      end if;
-
-      TEXT_IO.PUT_LINE( "*** END OF TEST 6 ***" );
-
-      RTEMS.SHUTDOWN_EXECUTIVE( 0 );
-
-   end TEST_TASK;
-
-end MPTEST;
diff --git a/c/src/ada-tests/mptests/mp06/mptest.ads b/c/src/ada-tests/mptests/mp06/mptest.ads
deleted file mode 100644
index f7fb4f599d..0000000000
--- a/c/src/ada-tests/mptests/mp06/mptest.ads
+++ /dev/null
@@ -1,250 +0,0 @@
---
---  MPTEST / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package is the specification for Test 6 of the RTEMS
---  Multiprocessor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with BSP_MPCI;
-with RTEMS;
-
-package MPTEST is
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS tasks created
---  by this test.
---
-
-   TASK_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.ID;
-   TASK_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.NAME;
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS timers created
---  by this test.
---
- 
-   TIMER_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 2 ) of RTEMS.ID;
-   TIMER_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 2 ) of RTEMS.NAME;
- 
---
---  This variable is set when the test should stop executing.
---
-   STOP_TEST : RTEMS.BOOLEAN;
-
---
---  This variable contains the ID of the remote task with which this
---  test interacts.
---
-
-   REMOTE_TID  : RTEMS.ID;
-
---
---  This variable contains the node on which the remote task with which 
---  this test interacts resides.
---
-
-   REMOTE_NODE : RTEMS.UNSIGNED32;
-
---
---  The number of signals to process per dot printed out.
---
-
-   MAXIMUM_DOTS : constant RTEMS.UNSIGNED32 := 25;
-
---
---  The following is a table of the event sets which consist of
---  a single event.  This test cycles through all of these
---  events.
--- 
-
-   EVENT_SET_TABLE : constant array ( 0 .. 30 ) of RTEMS.EVENT_SET := (
-      RTEMS.EVENT_0,
-      RTEMS.EVENT_1,
-      RTEMS.EVENT_2,
-      RTEMS.EVENT_3,
-      RTEMS.EVENT_4,
-      RTEMS.EVENT_5,
-      RTEMS.EVENT_6,
-      RTEMS.EVENT_7,
-      RTEMS.EVENT_8,
-      RTEMS.EVENT_9,
-      RTEMS.EVENT_10,
-      RTEMS.EVENT_11,
-      RTEMS.EVENT_12,
-      RTEMS.EVENT_13,
-      RTEMS.EVENT_14,
-      RTEMS.EVENT_15,
-      RTEMS.EVENT_16,
-      RTEMS.EVENT_17,
-      RTEMS.EVENT_18,
-      RTEMS.EVENT_19,
-      RTEMS.EVENT_20,
-      RTEMS.EVENT_21,
-      RTEMS.EVENT_22,
-      RTEMS.EVENT_23,
-      RTEMS.EVENT_24,
-      RTEMS.EVENT_25,
-      RTEMS.EVENT_26,
-      RTEMS.EVENT_27,
-      RTEMS.EVENT_28,
-      RTEMS.EVENT_29,
-      RTEMS.EVENT_30
-   );
-
---
---  INIT
---
---  DESCRIPTION:
---
---  This RTEMS task initializes the application.
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  STOP_TEST_TSR
---
---  DESCRIPTION:
---
---  This subprogram is a TSR which sets the "stop test" flag.
---
- 
-   procedure STOP_TEST_TSR (
-      IGNORED1 : in     RTEMS.ID;
-      IGNORED2 : in     RTEMS.ADDRESS
-   );
-
---
---  TEST_TASK
---
---  DESCRIPTION:
---
---  This is the body of the RTEMS tasks which constitute this test.
---
-
-   procedure TEST_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  This is the Driver Address Table for this test.
---
-
-   DEVICE_DRIVERS : aliased RTEMS.DRIVER_ADDRESS_TABLE( 1 .. 1 ) :=
-   (1=>
-      (
-        CLOCK_DRIVER.INITIALIZE'ACCESS,              -- Initialization
-        RTEMS.NO_DRIVER_ENTRY,                       -- Open
-        RTEMS.NO_DRIVER_ENTRY,                       -- Close
-        RTEMS.NO_DRIVER_ENTRY,                       -- Read
-        RTEMS.NO_DRIVER_ENTRY,                       -- Write
-        RTEMS.NO_DRIVER_ENTRY                        -- Control
-      )
-   );
-
---
---  This is the Initialization Tasks Table for this test.
---
-
-   INITIALIZATION_TASKS : aliased RTEMS.INITIALIZATION_TASKS_TABLE( 1 .. 1 ) := 
-   (1=>
-     (
-       RTEMS.BUILD_NAME( 'U', 'I', '1', ' ' ),        -- task name
-       2048,                                          -- stack size
-       1,                                             -- priority
-       RTEMS.DEFAULT_ATTRIBUTES,                      -- attributes
-       MPTEST.INIT'ACCESS,                            -- entry point
-       RTEMS.NO_PREEMPT,                              -- initial mode
-       0                                              -- argument list
-     )
-   );
-
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
---                             BEGIN SUBPACKAGE                           --
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
-
-   --
-   --  MPTEST.PER_NODE_CONFIGURATION / SPECIFICATION
-   --
-   --  DESCRIPTION:
-   --
-   --  This package is the specification for the subpackage
-   --  which will define the per node configuration parameters.
-   --
-   
-   package PER_NODE_CONFIGURATION is
-
-   --
-   --  LOCAL_NODE_NUMBER
-   --
-   --  DESCRIPTION:
-   --
-   --  This function returns the node number for this node.
-   --
-
-      function LOCAL_NODE_NUMBER 
-      return RTEMS.UNSIGNED32;
-  
-      pragma INLINE ( LOCAL_NODE_NUMBER );
-
-   end PER_NODE_CONFIGURATION;
-  
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
---                              END SUBPACKAGE                            --
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
-
---
---  This is the Multiprocessor Configuration Table for this test.
---
-
-   MULTIPROCESSING_CONFIGURATION : aliased RTEMS.MULTIPROCESSING_TABLE := (
-      MPTEST.PER_NODE_CONFIGURATION.LOCAL_NODE_NUMBER,
-      2,                         -- maximum # nodes in system 
-      32,                        -- maximum # global objects
-      32                         -- maximum # proxies
-    );
-
---
---  This is the Configuration Table for this test.
---
-
-   CONFIGURATION : aliased RTEMS.CONFIGURATION_TABLE := (
-      RTEMS.NULL_ADDRESS,        -- will be replaced by BSP
-      64 * 1024,                 -- executive RAM size
-      10,                        -- maximum # tasks
-      1,                         -- maximum # timers
-      2,                         -- maximum # semaphores
-      0,                         -- maximum # message queues
-      0,                         -- maximum # messages
-      0,                         -- maximum # partitions
-      0,                         -- maximum # regions
-      0,                         -- maximum # dp memory areas
-      0,                         -- maximum # periods
-      0,                         -- maximum # user extensions
-      RTEMS.MILLISECONDS_TO_MICROSECONDS(10), -- # us in a tick
-      50                         -- # ticks in a timeslice
-  );
-
-end MPTEST;
diff --git a/c/src/ada-tests/mptests/mp06/node1/mp06.scn b/c/src/ada-tests/mptests/mp06/node1/mp06.scn
deleted file mode 100644
index 71da651eca..0000000000
--- a/c/src/ada-tests/mptests/mp06/node1/mp06.scn
+++ /dev/null
@@ -1,10 +0,0 @@
-*** TEST 6 -- NODE 1 ***
-Creating Test_task (Global)
-Starting Test_task (Global)
-Deleting initialization task
-Remote task's name is : 222
-Getting TID of remote task
-Sending events to remote task
-....................................................   
-....................................................   
-*** END OF TEST 6 ***
diff --git a/c/src/ada-tests/mptests/mp06/node1/mptest-per_node_configuration.adb b/c/src/ada-tests/mptests/mp06/node1/mptest-per_node_configuration.adb
deleted file mode 100644
index 7df5087537..0000000000
--- a/c/src/ada-tests/mptests/mp06/node1/mptest-per_node_configuration.adb
+++ /dev/null
@@ -1,43 +0,0 @@
---
---  MPTEST.PER_NODE_CONFIGURATION / BODY
---
---  DESCRIPTION:
---
---  This package is the specification for the subpackage
---  which will define the per node configuration parameters.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-
-separate ( MPTEST )
-
-package body PER_NODE_CONFIGURATION is
-
---PAGE
---
---  LOCAL_NODE_NUMBER
---
-
-   function LOCAL_NODE_NUMBER 
-   return RTEMS.UNSIGNED32 is
-   begin
-
-      return 1;
-
-   end LOCAL_NODE_NUMBER;
-
-end PER_NODE_CONFIGURATION;
diff --git a/c/src/ada-tests/mptests/mp06/node2/mp06.scn b/c/src/ada-tests/mptests/mp06/node2/mp06.scn
deleted file mode 100644
index da449041b4..0000000000
--- a/c/src/ada-tests/mptests/mp06/node2/mp06.scn
+++ /dev/null
@@ -1,11 +0,0 @@
-*** TEST 6 -- NODE 2 ***
-Creating Test_task (Global)
-Starting Test_task (Global)
-Deleting initialization task
-Remote task's name is : 111
-Getting TID of remote task
-Receiving events from remote task
-....................................................   
-....................................................   
-event_receive - correctly returned TIMEOUT
-*** END OF TEST 6 ***
diff --git a/c/src/ada-tests/mptests/mp06/node2/mptest-per_node_configuration.adb b/c/src/ada-tests/mptests/mp06/node2/mptest-per_node_configuration.adb
deleted file mode 100644
index e127cc5573..0000000000
--- a/c/src/ada-tests/mptests/mp06/node2/mptest-per_node_configuration.adb
+++ /dev/null
@@ -1,43 +0,0 @@
---
---  MPTEST.PER_NODE_CONFIGURATION / BODY
---
---  DESCRIPTION:
---
---  This package is the specification for the subpackage
---  which will define the per node configuration parameters.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-
-separate ( MPTEST )
-
-package body PER_NODE_CONFIGURATION is
-
---PAGE
---
---  LOCAL_NODE_NUMBER
---
-
-   function LOCAL_NODE_NUMBER 
-   return RTEMS.UNSIGNED32 is
-   begin
-
-      return 2;
-
-   end LOCAL_NODE_NUMBER;
-
-end PER_NODE_CONFIGURATION;
diff --git a/c/src/ada-tests/mptests/mp07/mptest.adb b/c/src/ada-tests/mptests/mp07/mptest.adb
deleted file mode 100644
index 2f86bb310c..0000000000
--- a/c/src/ada-tests/mptests/mp07/mptest.adb
+++ /dev/null
@@ -1,210 +0,0 @@
---
---  MPTEST / BODY
---
---  DESCRIPTION:
---
---  This package is the implementation for Test 7 of the RTEMS
---  Multiprocessor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with INTERFACES; use INTERFACES;
-with RTEMS;
-with TEST_SUPPORT;
-with TEXT_IO;
-with UNSIGNED32_IO;
-
-package body MPTEST is
-
-   package body PER_NODE_CONFIGURATION is separate;
-
---PAGE
---
---  INIT
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT( "*** TEST 7 -- NODE " );
-      UNSIGNED32_IO.PUT(
-         MPTEST.MULTIPROCESSING_CONFIGURATION.NODE,
-         WIDTH => 1
-      );
-      TEXT_IO.PUT_LINE( " ***" );
-
-      MPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME(  '1', '1', '1', ' ' );
-      MPTEST.TASK_NAME( 2 ) := RTEMS.BUILD_NAME(  '2', '2', '2', ' ' );
-
-      TEXT_IO.PUT_LINE( "Creating Test_task (Global)" );
-      RTEMS.TASK_CREATE( 
-         MPTEST.TASK_NAME( MPTEST.MULTIPROCESSING_CONFIGURATION.NODE ), 
-         MPTEST.MULTIPROCESSING_CONFIGURATION.NODE, 
-         2048, 
-         RTEMS.TIMESLICE,
-         RTEMS.GLOBAL,
-         MPTEST.TASK_ID( 1 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE" );
-
-      TEXT_IO.PUT_LINE( "Starting Test_task (Global)" );
-      RTEMS.TASK_START(
-         MPTEST.TASK_ID( 1 ),
-         MPTEST.TEST_TASK'ACCESS,
-         0,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START" );
-
-      MPTEST.TIMER_NAME( 1 ) := RTEMS.BUILD_NAME(  'T', 'M', '1', ' ' );
-
-      RTEMS.TIMER_CREATE(
-         MPTEST.TIMER_NAME( 1 ),
-         MPTEST.TIMER_ID( 1 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_CREATE" );
-
-      TEXT_IO.PUT_LINE( "Deleting initialization task" );
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
-
-   end INIT;
-
---PAGE
---
---  STOP_TEST_TSR
---
- 
-   procedure STOP_TEST_TSR (
-      IGNORED1 : in     RTEMS.ID;
-      IGNORED2 : in     RTEMS.ADDRESS
-   ) is
-   begin
- 
-      MPTEST.STOP_TEST := TRUE;
- 
-   end STOP_TEST_TSR;
- 
---PAGE
---
---  TEST_TASK
---
-
-   procedure TEST_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      COUNT     : RTEMS.UNSIGNED32;
-      EVENT_OUT : RTEMS.EVENT_SET;
-      STATUS    : RTEMS.STATUS_CODES;
-   begin
-
-      MPTEST.STOP_TEST := FALSE;
-
-      if MPTEST.MULTIPROCESSING_CONFIGURATION.NODE = 1 then
-         MPTEST.REMOTE_NODE := 2;
-      else
-         MPTEST.REMOTE_NODE := 1;
-      end if;
-
-      TEXT_IO.PUT( "Remote task's name is : " );
-      TEST_SUPPORT.PUT_NAME( MPTEST.TASK_NAME( MPTEST.REMOTE_NODE ), TRUE );
-
-      TEXT_IO.PUT_LINE( "Getting TID of remote task" );
-      loop
-         RTEMS.TASK_IDENT( 
-            MPTEST.TASK_NAME( MPTEST.REMOTE_NODE ),
-            RTEMS.SEARCH_ALL_NODES,
-            MPTEST.REMOTE_TID,
-            STATUS
-         );
-
-         exit when RTEMS.ARE_STATUSES_EQUAL( STATUS, RTEMS.SUCCESSFUL ); 
-
-      end loop;
-
-      if MPTEST.MULTIPROCESSING_CONFIGURATION.NODE = 1 then
-
-         TEXT_IO.PUT_LINE( "Sending first event to remote task" );
-         RTEMS.EVENT_SEND( 
-            MPTEST.REMOTE_TID,
-            RTEMS.EVENT_16,
-            STATUS
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "EVENT_SEND" );
-
-      end if;
-
-      RTEMS.TIMER_FIRE_AFTER(
-         MPTEST.TIMER_ID( 1 ),
-         5 * TEST_SUPPORT.TICKS_PER_SECOND,
-         MPTEST.STOP_TEST_TSR'ACCESS,
-         RTEMS.NULL_ADDRESS,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_FIRE_AFTER" );
-
-      loop
-
-         exit when MPTEST.STOP_TEST = TRUE;
-
-         for COUNT in 1 .. MPTEST.PER_DOT
-         loop
-
-            RTEMS.EVENT_RECEIVE( 
-               RTEMS.EVENT_16,
-               RTEMS.DEFAULT_OPTIONS,
-               TEST_SUPPORT.TICKS_PER_SECOND,
-               EVENT_OUT,
-               STATUS
-            );
-            if RTEMS.ARE_STATUSES_EQUAL( STATUS, RTEMS.TIMEOUT ) then
-               TEXT_IO.NEW_LINE;
-               TEXT_IO.PUT_LINE(
-                   "TA1 - TIMEOUT .. probably OK if the other node exits"
-               );
-               exit;
-            else
-               TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "EVENT_RECEIVE" );
-            end if;
-
-            RTEMS.EVENT_SEND( 
-               MPTEST.REMOTE_TID,
-               RTEMS.EVENT_16,
-               STATUS
-            );
-            TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "EVENT_SEND" );
-
-         end loop;
-
-         TEST_SUPPORT.PUT_DOT( "." );
-
-      end loop;
-
-      TEXT_IO.NEW_LINE;
-
-      TEXT_IO.PUT_LINE( "*** END OF TEST 7 ***" );
-
-      RTEMS.SHUTDOWN_EXECUTIVE( 0 );
-
-   end TEST_TASK;
-
-end MPTEST;
diff --git a/c/src/ada-tests/mptests/mp07/mptest.ads b/c/src/ada-tests/mptests/mp07/mptest.ads
deleted file mode 100644
index 6640261d88..0000000000
--- a/c/src/ada-tests/mptests/mp07/mptest.ads
+++ /dev/null
@@ -1,210 +0,0 @@
---
---  MPTEST / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package is the specification for Test 7 of the RTEMS
---  Multiprocessor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with BSP_MPCI;
-with RTEMS;
-
-package MPTEST is
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS tasks created
---  by this test.
---
-
-   TASK_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.ID;
-   TASK_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.NAME;
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS timers created
---  by this test.
---
-
-   TIMER_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 2 ) of RTEMS.ID;
-   TIMER_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 2 ) of RTEMS.NAME;
-
---
---  This variable is set when the test should stop executing.
---
-   STOP_TEST : RTEMS.BOOLEAN;
-
---
---  This variable contains the ID of the remote task with which this
---  test interacts.
---
-
-   REMOTE_TID  : RTEMS.ID;
-
---
---  This variable contains the node on which the remote task with which 
---  this test interacts resides.
---
-
-   REMOTE_NODE : RTEMS.UNSIGNED32;
-
---
---  The number of events to process per dot printed out.
---
-
-   PER_DOT : constant RTEMS.UNSIGNED32 := 100;
-
---
---  INIT
---
---  DESCRIPTION:
---
---  This RTEMS task initializes the application.
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  STOP_TEST_TSR
---
---  DESCRIPTION:
---
---  This subprogram is a TSR which sets the "stop test" flag.
---
- 
-   procedure STOP_TEST_TSR (
-      IGNORED1 : in     RTEMS.ID;
-      IGNORED2 : in     RTEMS.ADDRESS
-   );
-
---
---  TEST_TASK
---
---  DESCRIPTION:
---
---  This is the body of the RTEMS tasks which constitute this test.
---
-
-   procedure TEST_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  This is the Driver Address Table for this test.
---
-
-   DEVICE_DRIVERS : aliased RTEMS.DRIVER_ADDRESS_TABLE( 1 .. 1 ) :=
-   (1=>
-      (
-        CLOCK_DRIVER.INITIALIZE'ACCESS,              -- Initialization
-        RTEMS.NO_DRIVER_ENTRY,                       -- Open
-        RTEMS.NO_DRIVER_ENTRY,                       -- Close
-        RTEMS.NO_DRIVER_ENTRY,                       -- Read
-        RTEMS.NO_DRIVER_ENTRY,                       -- Write
-        RTEMS.NO_DRIVER_ENTRY                        -- Control
-      )
-   );
-
---
---  This is the Initialization Tasks Table for this test.
---
-
-   INITIALIZATION_TASKS : aliased RTEMS.INITIALIZATION_TASKS_TABLE( 1 .. 1 ) := 
-   (1=>
-     (
-       RTEMS.BUILD_NAME( 'U', 'I', '1', ' ' ),        -- task name
-       2048,                                          -- stack size
-       1,                                             -- priority
-       RTEMS.DEFAULT_ATTRIBUTES,                      -- attributes
-       MPTEST.INIT'ACCESS,                            -- entry point
-       RTEMS.NO_PREEMPT,                              -- initial mode
-       0                                              -- argument list
-     )
-   );
-
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
---                             BEGIN SUBPACKAGE                           --
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
-
-   --
-   --  MPTEST.PER_NODE_CONFIGURATION / SPECIFICATION
-   --
-   --  DESCRIPTION:
-   --
-   --  This package is the specification for the subpackage
-   --  which will define the per node configuration parameters.
-   --
-   
-   package PER_NODE_CONFIGURATION is
-
-   --
-   --  LOCAL_NODE_NUMBER
-   --
-   --  DESCRIPTION:
-   --
-   --  This function returns the node number for this node.
-   --
-
-      function LOCAL_NODE_NUMBER 
-      return RTEMS.UNSIGNED32;
-  
-      pragma INLINE ( LOCAL_NODE_NUMBER );
-
-   end PER_NODE_CONFIGURATION;
-  
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
---                              END SUBPACKAGE                            --
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
-
---
---  This is the Multiprocessor Configuration Table for this test.
---
-
-   MULTIPROCESSING_CONFIGURATION : aliased RTEMS.MULTIPROCESSING_TABLE := (
-      MPTEST.PER_NODE_CONFIGURATION.LOCAL_NODE_NUMBER,
-      2,                         -- maximum # nodes in system 
-      32,                        -- maximum # global objects
-      32                         -- maximum # proxies
-    );
-
---
---  This is the Configuration Table for this test.
---
-
-   CONFIGURATION : aliased RTEMS.CONFIGURATION_TABLE := (
-      RTEMS.NULL_ADDRESS,        -- will be replaced by BSP
-      64 * 1024,                 -- executive RAM size
-      10,                        -- maximum # tasks
-      1,                         -- maximum # timers
-      2,                         -- maximum # semaphores
-      0,                         -- maximum # message queues
-      0,                         -- maximum # messages
-      0,                         -- maximum # partitions
-      0,                         -- maximum # regions
-      0,                         -- maximum # dp memory areas
-      0,                         -- maximum # periods
-      0,                         -- maximum # user extensions
-      RTEMS.MILLISECONDS_TO_MICROSECONDS(10), -- # us in a tick
-      50                         -- # ticks in a timeslice
-  );
-
-end MPTEST;
diff --git a/c/src/ada-tests/mptests/mp07/node1/mp07.scn b/c/src/ada-tests/mptests/mp07/node1/mp07.scn
deleted file mode 100644
index 71e0956329..0000000000
--- a/c/src/ada-tests/mptests/mp07/node1/mp07.scn
+++ /dev/null
@@ -1,10 +0,0 @@
-*** TEST 7 -- NODE 1 ***
-Creating Test_task (Global)
-Starting Test_task (Global)
-Deleting initialization task
-Remote task's name is : 222
-Getting TID of remote task
-Sending first event to remote task
-....................................................   
-....................................................   
-*** END OF TEST 7 ***
diff --git a/c/src/ada-tests/mptests/mp07/node1/mptest-per_node_configuration.adb b/c/src/ada-tests/mptests/mp07/node1/mptest-per_node_configuration.adb
deleted file mode 100644
index 7df5087537..0000000000
--- a/c/src/ada-tests/mptests/mp07/node1/mptest-per_node_configuration.adb
+++ /dev/null
@@ -1,43 +0,0 @@
---
---  MPTEST.PER_NODE_CONFIGURATION / BODY
---
---  DESCRIPTION:
---
---  This package is the specification for the subpackage
---  which will define the per node configuration parameters.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-
-separate ( MPTEST )
-
-package body PER_NODE_CONFIGURATION is
-
---PAGE
---
---  LOCAL_NODE_NUMBER
---
-
-   function LOCAL_NODE_NUMBER 
-   return RTEMS.UNSIGNED32 is
-   begin
-
-      return 1;
-
-   end LOCAL_NODE_NUMBER;
-
-end PER_NODE_CONFIGURATION;
diff --git a/c/src/ada-tests/mptests/mp07/node2/mp07.scn b/c/src/ada-tests/mptests/mp07/node2/mp07.scn
deleted file mode 100644
index c31011e85c..0000000000
--- a/c/src/ada-tests/mptests/mp07/node2/mp07.scn
+++ /dev/null
@@ -1,9 +0,0 @@
-*** TEST 7 -- NODE 2 ***
-Creating Test_task (Global)
-Starting Test_task (Global)
-Deleting initialization task
-Remote task's name is : 111
-Getting TID of remote task
-....................................................   
-....................................................   
-*** END OF TEST 7 ***
diff --git a/c/src/ada-tests/mptests/mp07/node2/mptest-per_node_configuration.adb b/c/src/ada-tests/mptests/mp07/node2/mptest-per_node_configuration.adb
deleted file mode 100644
index e127cc5573..0000000000
--- a/c/src/ada-tests/mptests/mp07/node2/mptest-per_node_configuration.adb
+++ /dev/null
@@ -1,43 +0,0 @@
---
---  MPTEST.PER_NODE_CONFIGURATION / BODY
---
---  DESCRIPTION:
---
---  This package is the specification for the subpackage
---  which will define the per node configuration parameters.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-
-separate ( MPTEST )
-
-package body PER_NODE_CONFIGURATION is
-
---PAGE
---
---  LOCAL_NODE_NUMBER
---
-
-   function LOCAL_NODE_NUMBER 
-   return RTEMS.UNSIGNED32 is
-   begin
-
-      return 2;
-
-   end LOCAL_NODE_NUMBER;
-
-end PER_NODE_CONFIGURATION;
diff --git a/c/src/ada-tests/mptests/mp08/mptest.adb b/c/src/ada-tests/mptests/mp08/mptest.adb
deleted file mode 100644
index e07fa1dc4c..0000000000
--- a/c/src/ada-tests/mptests/mp08/mptest.adb
+++ /dev/null
@@ -1,207 +0,0 @@
---
---  MPTEST / BODY
---
---  DESCRIPTION:
---
---  This package is the implementation for Test 8 of the RTEMS
---  Multiprocessor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with INTERFACES; use INTERFACES;
-with RTEMS;
-with TEST_SUPPORT;
-with TEXT_IO;
-with UNSIGNED32_IO;
-
-package body MPTEST is
-
-   package body PER_NODE_CONFIGURATION is separate;
-
---PAGE
---
---  INIT
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT( "*** TEST 8 -- NODE " );
-      UNSIGNED32_IO.PUT(
-         MPTEST.MULTIPROCESSING_CONFIGURATION.NODE,
-         WIDTH => 1
-      );
-      TEXT_IO.PUT_LINE( " ***" );
-
-      MPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME(  '1', '1', '1', ' ' );
-      MPTEST.TASK_NAME( 2 ) := RTEMS.BUILD_NAME(  '2', '2', '2', ' ' );
-
-      MPTEST.SEMAPHORE_NAME( 1 ) := RTEMS.BUILD_NAME(  'S', 'E', 'M', ' ' );
-
-      if MPTEST.MULTIPROCESSING_CONFIGURATION.NODE = 1 then
-
-         TEXT_IO.PUT_LINE( "Creating Semaphore(Global)" );
-
-         RTEMS.SEMAPHORE_CREATE(
-            MPTEST.SEMAPHORE_NAME( 1 ),
-            1,
-            RTEMS.GLOBAL,
-            MPTEST.SEMAPHORE_ID( 1 ),
-            STATUS
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_CREATE" );
-
-      end if;
-
-      TEXT_IO.PUT_LINE( "Creating Test_task (Global)" );
-      RTEMS.TASK_CREATE( 
-         MPTEST.TASK_NAME( MPTEST.MULTIPROCESSING_CONFIGURATION.NODE ), 
-         MPTEST.MULTIPROCESSING_CONFIGURATION.NODE, 
-         2048, 
-         RTEMS.TIMESLICE,
-         RTEMS.GLOBAL,
-         MPTEST.TASK_ID( 1 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE" );
-
-      TEXT_IO.PUT_LINE( "Starting Test_task (Global)" );
-      RTEMS.TASK_START(
-         MPTEST.TASK_ID( 1 ),
-         MPTEST.TEST_TASK'ACCESS,
-         0,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START" );
-
-      TEXT_IO.PUT_LINE( "Deleting initialization task" );
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
-
-   end INIT;
-
---PAGE
---
---  TEST_TASK
---
-
-   procedure TEST_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      DOTS                     : RTEMS.UNSIGNED32;
-      COUNT                    : RTEMS.UNSIGNED32;
-      STATUS                   : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.PUT_LINE( "Getting SMID of semaphore" );
-      loop
-
-         RTEMS.SEMAPHORE_IDENT( 
-            MPTEST.SEMAPHORE_NAME( 1 ),
-            RTEMS.SEARCH_ALL_NODES,
-            MPTEST.SEMAPHORE_ID( 1 ),
-            STATUS
-         );
-
-         exit when RTEMS.IS_STATUS_SUCCESSFUL( STATUS );
-
-      end loop;
-
-      if MPTEST.MULTIPROCESSING_CONFIGURATION.NODE = 2 then
-
-         RTEMS.SEMAPHORE_DELETE(
-            MPTEST.SEMAPHORE_ID( 1 ),
-            STATUS
-         );
-         TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( 
-            STATUS, 
-            RTEMS.ILLEGAL_ON_REMOTE_OBJECT,
-            "SEMAPHORE_DELETE" 
-         );
-
-         TEXT_IO.PUT_LINE(
-            "semaphore_delete correctly returned ILLEGAL_ON_REMOTE_OBJECT"
-         );
-
-      end if;
-
-      COUNT := 0;
-
-      loop
-
-         TEST_SUPPORT.PUT_DOT( "p" );
-
-         RTEMS.SEMAPHORE_OBTAIN(
-            MPTEST.SEMAPHORE_ID( 1 ),
-            RTEMS.DEFAULT_OPTIONS,
-            RTEMS.NO_TIMEOUT,
-            STATUS
-         );
-
-         if not RTEMS.IS_STATUS_SUCCESSFUL( STATUS ) then
-
-            TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( 
-               STATUS, 
-               RTEMS.OBJECT_WAS_DELETED,
-               "SEMAPHORE_OBTAIN" 
-            );
-
-            TEXT_IO.NEW_LINE;
-
-            TEXT_IO.PUT_LINE( "Global semaphore deleted" );
-
-            TEXT_IO.PUT_LINE( "*** END OF TEST 8 ***" );
-
-            RTEMS.SHUTDOWN_EXECUTIVE( 0 );
-
-         end if;
-
-         COUNT := COUNT + 1;
-
-         if MPTEST.MULTIPROCESSING_CONFIGURATION.NODE = 1 and then
-            COUNT >= 1000 then
-
-            RTEMS.TASK_WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
-            TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
-
-            TEXT_IO.NEW_LINE;
-
-            TEXT_IO.PUT_LINE( "Deleting global semaphore" );
-
-            RTEMS.SEMAPHORE_DELETE( MPTEST.SEMAPHORE_ID( 1 ), STATUS );
-            TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_DELETE" );
-
-            TEXT_IO.PUT_LINE( "*** END OF TEST 8 ***" );
-
-            RTEMS.SHUTDOWN_EXECUTIVE( 0 );
-
-         end if;
-
-         TEST_SUPPORT.PUT_DOT( "v" );
-
-         RTEMS.SEMAPHORE_RELEASE( MPTEST.SEMAPHORE_ID( 1 ), STATUS );
-
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_RELEASE" );
-
-      end loop;
-
-   end TEST_TASK;
-
-end MPTEST;
diff --git a/c/src/ada-tests/mptests/mp08/mptest.ads b/c/src/ada-tests/mptests/mp08/mptest.ads
deleted file mode 100644
index 8467cbe217..0000000000
--- a/c/src/ada-tests/mptests/mp08/mptest.ads
+++ /dev/null
@@ -1,192 +0,0 @@
---
---  MPTEST / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package is the specification for Test 8 of the RTEMS
---  Multiprocessor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with BSP_MPCI;
-with RTEMS;
-
-package MPTEST is
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS tasks created
---  by this test.
---
-
-   TASK_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.ID;
-   TASK_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.NAME;
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS semaphores created
---  by this test.
---
-
-   SEMAPHORE_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 2 ) of RTEMS.ID;
-   SEMAPHORE_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 2 ) of RTEMS.NAME;
-
---
---  This variable contains the ID of the remote task with which this
---  test interacts.
---
-
-   REMOTE_TID  : RTEMS.ID;
-
---
---  This variable contains the node on which the remote task with which 
---  this test interacts resides.
---
-
-   REMOTE_NODE : RTEMS.UNSIGNED32;
-
---
---  The number of events to process per dot printed out.
---
-
-   PER_DOT : constant RTEMS.UNSIGNED32 := 100;
-
---
---  INIT
---
---  DESCRIPTION:
---
---  This RTEMS task initializes the application.
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TEST_TASK
---
---  DESCRIPTION:
---
---  This is the body of the RTEMS tasks which constitute this test.
---
-
-   procedure TEST_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  This is the Driver Address Table for this test.
---
-
-   DEVICE_DRIVERS : aliased RTEMS.DRIVER_ADDRESS_TABLE( 1 .. 1 ) :=
-   (1=>
-      (
-        CLOCK_DRIVER.INITIALIZE'ACCESS,              -- Initialization
-        RTEMS.NO_DRIVER_ENTRY,                       -- Open
-        RTEMS.NO_DRIVER_ENTRY,                       -- Close
-        RTEMS.NO_DRIVER_ENTRY,                       -- Read
-        RTEMS.NO_DRIVER_ENTRY,                       -- Write
-        RTEMS.NO_DRIVER_ENTRY                        -- Control
-      )
-   );
-
---
---  This is the Initialization Tasks Table for this test.
---
-
-   INITIALIZATION_TASKS : aliased RTEMS.INITIALIZATION_TASKS_TABLE( 1 .. 1 ) := 
-   (1=>
-     (
-       RTEMS.BUILD_NAME( 'U', 'I', '1', ' ' ),        -- task name
-       2048,                                          -- stack size
-       1,                                             -- priority
-       RTEMS.DEFAULT_ATTRIBUTES,                      -- attributes
-       MPTEST.INIT'ACCESS,                            -- entry point
-       RTEMS.NO_PREEMPT,                              -- initial mode
-       0                                              -- argument list
-     )
-   );
-
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
---                             BEGIN SUBPACKAGE                           --
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
-
-   --
-   --  MPTEST.PER_NODE_CONFIGURATION / SPECIFICATION
-   --
-   --  DESCRIPTION:
-   --
-   --  This package is the specification for the subpackage
-   --  which will define the per node configuration parameters.
-   --
-   
-   package PER_NODE_CONFIGURATION is
-
-   --
-   --  LOCAL_NODE_NUMBER
-   --
-   --  DESCRIPTION:
-   --
-   --  This function returns the node number for this node.
-   --
-
-      function LOCAL_NODE_NUMBER 
-      return RTEMS.UNSIGNED32;
-  
-      pragma INLINE ( LOCAL_NODE_NUMBER );
-
-   end PER_NODE_CONFIGURATION;
-  
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
---                              END SUBPACKAGE                            --
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
-
---
---  This is the Multiprocessor Configuration Table for this test.
---
-
-   MULTIPROCESSING_CONFIGURATION : aliased RTEMS.MULTIPROCESSING_TABLE := (
-      MPTEST.PER_NODE_CONFIGURATION.LOCAL_NODE_NUMBER,
-      2,                         -- maximum # nodes in system 
-      32,                        -- maximum # global objects
-      32                         -- maximum # proxies
-    );
-
---
---  This is the Configuration Table for this test.
---
-
-   CONFIGURATION : aliased RTEMS.CONFIGURATION_TABLE := (
-      RTEMS.NULL_ADDRESS,        -- will be replaced by BSP
-      64 * 1024,                 -- executive RAM size
-      10,                        -- maximum # tasks
-      1,                         -- maximum # timers
-      1,                         -- maximum # semaphores
-      0,                         -- maximum # message queues
-      0,                         -- maximum # messages
-      0,                         -- maximum # partitions
-      0,                         -- maximum # regions
-      0,                         -- maximum # dp memory areas
-      0,                         -- maximum # periods
-      0,                         -- maximum # user extensions
-      RTEMS.MILLISECONDS_TO_MICROSECONDS(10), -- # us in a tick
-      50                         -- # ticks in a timeslice
-  );
-
-end MPTEST;
diff --git a/c/src/ada-tests/mptests/mp08/node1/mp08.scn b/c/src/ada-tests/mptests/mp08/node1/mp08.scn
deleted file mode 100644
index ba9f089e96..0000000000
--- a/c/src/ada-tests/mptests/mp08/node1/mp08.scn
+++ /dev/null
@@ -1,9 +0,0 @@
-*** TEST 8 -- NODE 1 ***
-Creating Test_task (Global)
-Starting Test_task (Global)
-Deleting initialization task
-Getting SMID of semaphore
-pvpvpvpvpvp....... 
-(continued) pvp 
-Deleting global semaphore
-*** END OF TEST 8 ***
diff --git a/c/src/ada-tests/mptests/mp08/node1/mptest-per_node_configuration.adb b/c/src/ada-tests/mptests/mp08/node1/mptest-per_node_configuration.adb
deleted file mode 100644
index 7df5087537..0000000000
--- a/c/src/ada-tests/mptests/mp08/node1/mptest-per_node_configuration.adb
+++ /dev/null
@@ -1,43 +0,0 @@
---
---  MPTEST.PER_NODE_CONFIGURATION / BODY
---
---  DESCRIPTION:
---
---  This package is the specification for the subpackage
---  which will define the per node configuration parameters.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-
-separate ( MPTEST )
-
-package body PER_NODE_CONFIGURATION is
-
---PAGE
---
---  LOCAL_NODE_NUMBER
---
-
-   function LOCAL_NODE_NUMBER 
-   return RTEMS.UNSIGNED32 is
-   begin
-
-      return 1;
-
-   end LOCAL_NODE_NUMBER;
-
-end PER_NODE_CONFIGURATION;
diff --git a/c/src/ada-tests/mptests/mp08/node2/mp08.scn b/c/src/ada-tests/mptests/mp08/node2/mp08.scn
deleted file mode 100644
index 8ac712ae93..0000000000
--- a/c/src/ada-tests/mptests/mp08/node2/mp08.scn
+++ /dev/null
@@ -1,10 +0,0 @@
-*** TEST 8 -- NODE 2 ***
-Creating Test_task (Global)
-Starting Test_task (Global)
-Deleting initialization task
-Getting SMID of semaphore
-semaphore_delete correctly returned ILLEGAL_ON_REMOTE_OBJECT
-pvpvpvpvpvp....... 
-(continued) pvp 
-Global semaphore deleted
-*** END OF TEST 8 ***
diff --git a/c/src/ada-tests/mptests/mp08/node2/mptest-per_node_configuration.adb b/c/src/ada-tests/mptests/mp08/node2/mptest-per_node_configuration.adb
deleted file mode 100644
index e127cc5573..0000000000
--- a/c/src/ada-tests/mptests/mp08/node2/mptest-per_node_configuration.adb
+++ /dev/null
@@ -1,43 +0,0 @@
---
---  MPTEST.PER_NODE_CONFIGURATION / BODY
---
---  DESCRIPTION:
---
---  This package is the specification for the subpackage
---  which will define the per node configuration parameters.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-
-separate ( MPTEST )
-
-package body PER_NODE_CONFIGURATION is
-
---PAGE
---
---  LOCAL_NODE_NUMBER
---
-
-   function LOCAL_NODE_NUMBER 
-   return RTEMS.UNSIGNED32 is
-   begin
-
-      return 2;
-
-   end LOCAL_NODE_NUMBER;
-
-end PER_NODE_CONFIGURATION;
diff --git a/c/src/ada-tests/mptests/mp09/mptest.adb b/c/src/ada-tests/mptests/mp09/mptest.adb
deleted file mode 100644
index f8f0f594d0..0000000000
--- a/c/src/ada-tests/mptests/mp09/mptest.adb
+++ /dev/null
@@ -1,381 +0,0 @@
---
---  MPTEST / BODY
---
---  DESCRIPTION:
---
---  This package is the implementation for Test 9 of the RTEMS
---  Multiprocessor Test Suite.
---
---  DEPENDENCIES:
---
---
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with INTERFACES; use INTERFACES;
-with RTEMS;
-with TEST_SUPPORT;
-with TEXT_IO;
-with UNSIGNED32_IO;
-
-package body MPTEST is
-
-   package body PER_NODE_CONFIGURATION is separate;
-
---PAGE
---
---  INIT
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT( "*** TEST 9 -- NODE " );
-      UNSIGNED32_IO.PUT(
-         MPTEST.MULTIPROCESSING_CONFIGURATION.NODE,
-         WIDTH => 1
-      );
-      TEXT_IO.PUT_LINE( " ***" );
-
-      MPTEST.RECEIVE_BUFFER :=
-         RTEMS.TO_BUFFER_POINTER( MPTEST.RECEIVE_BUFFER_AREA'ADDRESS );
-
-      MPTEST.BUFFER_1 :=
-         RTEMS.TO_BUFFER_POINTER( MPTEST.BUFFER_AREA_1'ADDRESS );
-
-      MPTEST.BUFFER_2 :=
-         RTEMS.TO_BUFFER_POINTER( MPTEST.BUFFER_AREA_2'ADDRESS );
-
-      MPTEST.BUFFER_3 :=
-         RTEMS.TO_BUFFER_POINTER( MPTEST.BUFFER_AREA_3'ADDRESS );
-
-      MPTEST.BUFFER_4 :=
-         RTEMS.TO_BUFFER_POINTER( MPTEST.BUFFER_AREA_4'ADDRESS );
-
-      MPTEST.FILL_BUFFER( "123456789012345 ", MPTEST.BUFFER_AREA_1 );
-      MPTEST.FILL_BUFFER( "abcdefghijklmno ", MPTEST.BUFFER_AREA_2 );
-      MPTEST.FILL_BUFFER( "ABCDEFGHIJKLMNO ", MPTEST.BUFFER_AREA_3 );
-      MPTEST.FILL_BUFFER( "PQRSTUVWXYZ(){} ", MPTEST.BUFFER_AREA_4 );
-
-      MPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME(  '1', '1', '1', ' ' );
-      MPTEST.TASK_NAME( 2 ) := RTEMS.BUILD_NAME(  '2', '2', '2', ' ' );
-
-      MPTEST.QUEUE_NAME( 1 ) := RTEMS.BUILD_NAME(  'M', 'S', 'G', ' ' );
-
-      if MPTEST.MULTIPROCESSING_CONFIGURATION.NODE = 1 then
-
-         TEXT_IO.PUT_LINE( "Creating Message Queue (Global)" );
-         RTEMS.MESSAGE_QUEUE_CREATE(
-            MPTEST.QUEUE_NAME( 1 ),
-            3,
-            RTEMS.GLOBAL + RTEMS.LIMIT,
-            MPTEST.QUEUE_ID( 1 ),
-            STATUS
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_CREATE" );
-
-      end if;
-
-      TEXT_IO.PUT_LINE( "Creating Test_task (local)" );
-      RTEMS.TASK_CREATE(
-         MPTEST.TASK_NAME( MPTEST.MULTIPROCESSING_CONFIGURATION.NODE ),
-         MPTEST.MULTIPROCESSING_CONFIGURATION.NODE,
-         2048,
-         RTEMS.TIMESLICE,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         MPTEST.TASK_ID( 1 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE" );
-
-      TEXT_IO.PUT_LINE( "Starting Test_task (local)" );
-      RTEMS.TASK_START(
-         MPTEST.TASK_ID( 1 ),
-         MPTEST.TEST_TASK'ACCESS,
-         0,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START" );
-
-      TEXT_IO.PUT_LINE( "Deleting initialization task" );
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
-
-   end INIT;
-
---PAGE
---
---  SEND_MESSAGES
---
-
-   procedure SEND_MESSAGES is
-      BROADCAST_COUNT     : RTEMS.UNSIGNED32;
-      STATUS              : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.PUT( "message_queue_send : " );
-      MPTEST.PUT_BUFFER( MPTEST.BUFFER_AREA_1 );
-      TEXT_IO.NEW_LINE;
-
-      RTEMS.MESSAGE_QUEUE_SEND(
-         MPTEST.QUEUE_ID( 1 ),
-         MPTEST.BUFFER_1,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_SEND" );
-
-      TEXT_IO.PUT_LINE( "Delaying for a second" );
-      RTEMS.TASK_WAKE_AFTER(
-         1 * TEST_SUPPORT.TICKS_PER_SECOND,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
-
-      TEXT_IO.PUT( "message_queue_urgent : " );
-      MPTEST.PUT_BUFFER( MPTEST.BUFFER_AREA_2 );
-      TEXT_IO.NEW_LINE;
-
-      RTEMS.MESSAGE_QUEUE_URGENT(
-         MPTEST.QUEUE_ID( 1 ),
-         MPTEST.BUFFER_2,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_URGENT" );
-
-      TEXT_IO.PUT_LINE( "Delaying for a second" );
-      RTEMS.TASK_WAKE_AFTER(
-         1 * TEST_SUPPORT.TICKS_PER_SECOND,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
-
-      TEXT_IO.PUT( "message_queue_broadcast : " );
-      MPTEST.PUT_BUFFER( MPTEST.BUFFER_AREA_3 );
-      TEXT_IO.NEW_LINE;
-
-      RTEMS.MESSAGE_QUEUE_BROADCAST(
-         MPTEST.QUEUE_ID( 1 ),
-         MPTEST.BUFFER_3,
-         BROADCAST_COUNT,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_BROADCAST" );
-
-      TEXT_IO.PUT_LINE( "Delaying for a second" );
-      RTEMS.TASK_WAKE_AFTER(
-         1 * TEST_SUPPORT.TICKS_PER_SECOND,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
-
-   end SEND_MESSAGES;
-
---PAGE
---
---  RECEIVE_MESSAGES
---
-
-   procedure RECEIVE_MESSAGES is
-      INDEX               : RTEMS.UNSIGNED32;
-      STATUS              : RTEMS.STATUS_CODES;
-   begin
-
-      for INDEX in 1 .. 3
-      loop
-
-         TEXT_IO.PUT_LINE( "Receiving message ..." );
-         RTEMS.MESSAGE_QUEUE_RECEIVE(
-            MPTEST.QUEUE_ID( 1 ),
-            MPTEST.RECEIVE_BUFFER,
-            RTEMS.DEFAULT_OPTIONS,
-            RTEMS.NO_TIMEOUT,
-            STATUS
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_RECEIVE" );
-
-         TEXT_IO.PUT( "Received : " );
-         MPTEST.PUT_BUFFER( MPTEST.RECEIVE_BUFFER_AREA );
-         TEXT_IO.NEW_LINE;
-
-      end loop;
-
-      TEXT_IO.PUT_LINE( "Receiver delaying for a second" );
-
-      RTEMS.TASK_WAKE_AFTER( 1 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
-
-   end RECEIVE_MESSAGES;
-
---PAGE
---
---  FILL_BUFFER
---
-
---
--- Depends on tricks to make the copy work.
---
-
-   procedure FILL_BUFFER (
-      SOURCE : in     STRING;
-      BUFFER :    out RTEMS.BUFFER
-   ) is
-      SOURCE_BUFFER : RTEMS.BUFFER_POINTER;
-   begin
-
-      SOURCE_BUFFER := RTEMS.TO_BUFFER_POINTER(
-                          SOURCE( SOURCE'FIRST )'ADDRESS
-                       );
-
-      BUFFER.FIELD1 := SOURCE_BUFFER.FIELD1;
-      BUFFER.FIELD2 := SOURCE_BUFFER.FIELD2;
-      BUFFER.FIELD3 := SOURCE_BUFFER.FIELD3;
-      BUFFER.FIELD4 := SOURCE_BUFFER.FIELD4;
-
-   end FILL_BUFFER;
-
---PAGE
---
---  PUT_BUFFER
---
-
---
--- Depends on tricks to make the output work.
---
-
-   procedure PUT_BUFFER (
-      BUFFER : in     RTEMS.BUFFER
-   ) is
-   begin
-
-      TEST_SUPPORT.PUT_NAME( BUFFER.FIELD1, FALSE );
-      TEST_SUPPORT.PUT_NAME( BUFFER.FIELD2, FALSE );
-      TEST_SUPPORT.PUT_NAME( BUFFER.FIELD3, FALSE );
-      TEST_SUPPORT.PUT_NAME( BUFFER.FIELD4, FALSE );
-
-   end PUT_BUFFER;
-
---PAGE
---
---  TEST_TASK
---
-
-   procedure TEST_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      COUNT   : RTEMS.UNSIGNED32;
-      STATUS  : RTEMS.STATUS_CODES;
-   begin
-
-      RTEMS.TASK_WAKE_AFTER( 1 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
-
-      TEXT_IO.PUT_LINE( "Getting QID of message queue" );
-
-      loop
-
-         RTEMS.MESSAGE_QUEUE_IDENT(
-            MPTEST.QUEUE_NAME( 1 ),
-            RTEMS.SEARCH_ALL_NODES,
-            MPTEST.QUEUE_ID( 1 ),
-            STATUS
-         );
-
-         exit when RTEMS.IS_STATUS_SUCCESSFUL( STATUS );
-
-      end loop;
-
-      if MPTEST.MULTIPROCESSING_CONFIGURATION.NODE = 2 then
-
-         RTEMS.MESSAGE_QUEUE_DELETE( MPTEST.QUEUE_ID( 1 ), STATUS );
-
-         TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-            STATUS,
-            RTEMS.ILLEGAL_ON_REMOTE_OBJECT,
-            "MESSAGE_QUEUE_DELETE"
-         );
-
-         TEXT_IO.PUT_LINE(
-         "message_queue_delete correctly returned ILLEGAL_ON_REMOTE_OBJECT"
-         );
-
-         MPTEST.SEND_MESSAGES;
-
-         MPTEST.RECEIVE_MESSAGES;
-
-         TEXT_IO.PUT_LINE( "Flushing remote empty queue" );
-         RTEMS.MESSAGE_QUEUE_FLUSH( MPTEST.QUEUE_ID( 1 ), COUNT, STATUS );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_FLUSH" );
-         UNSIGNED32_IO.PUT( COUNT, WIDTH => 1 );
-         TEXT_IO.PUT_LINE(
-            " messages were flushed from remote empty queue"
-         );
-
-         TEXT_IO.PUT_LINE(
-            "Send messages to be flushed from remote queue"
-         );
-         RTEMS.MESSAGE_QUEUE_SEND(
-            MPTEST.QUEUE_ID( 1 ),
-            MPTEST.BUFFER_1,
-            STATUS
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_SEND" );
-
-         TEXT_IO.PUT_LINE( "Flushing remote queue" );
-         RTEMS.MESSAGE_QUEUE_FLUSH( MPTEST.QUEUE_ID( 1 ), COUNT, STATUS );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_FLUSH" );
-         UNSIGNED32_IO.PUT( COUNT, WIDTH => 1 );
-         TEXT_IO.PUT_LINE(
-            " messages were flushed from the remote queue"
-         );
-
-         TEXT_IO.PUT_LINE( "Waiting for message queue to be deleted" );
-         RTEMS.MESSAGE_QUEUE_RECEIVE(
-            MPTEST.QUEUE_ID( 1 ),
-            MPTEST.RECEIVE_BUFFER,
-            RTEMS.DEFAULT_OPTIONS,
-            RTEMS.NO_TIMEOUT,
-            STATUS
-         );
-         TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-            STATUS,
-            RTEMS.OBJECT_WAS_DELETED,
-            "MESSAGE_QUEUE_FLUSH"
-         );
-
-      else
-
-         MPTEST.RECEIVE_MESSAGES;
-
-         MPTEST.SEND_MESSAGES;
-
-         RTEMS.TASK_WAKE_AFTER(
-            5 * TEST_SUPPORT.TICKS_PER_SECOND,
-            STATUS
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
-
-         RTEMS.MESSAGE_QUEUE_DELETE( MPTEST.QUEUE_ID( 1 ), STATUS );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_DELETE" );
-
-      end if;
-
-      TEXT_IO.PUT_LINE( "*** END OF TEST 9 ***" );
-
-      RTEMS.SHUTDOWN_EXECUTIVE( 0 );
-
-   end TEST_TASK;
-
-end MPTEST;
diff --git a/c/src/ada-tests/mptests/mp09/mptest.ads b/c/src/ada-tests/mptests/mp09/mptest.ads
deleted file mode 100644
index b981b4664c..0000000000
--- a/c/src/ada-tests/mptests/mp09/mptest.ads
+++ /dev/null
@@ -1,254 +0,0 @@
---
---  MPTEST / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package is the specification for Test 9 of the RTEMS
---  Multiprocessor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with BSP_MPCI;
-with RTEMS;
-
-package MPTEST is
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS tasks created
---  by this test.
---
-
-   TASK_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.ID;
-   TASK_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.NAME;
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS message 
---  queues created by this test.
---
-
-   QUEUE_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 2 ) of RTEMS.ID;
-   QUEUE_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 2 ) of RTEMS.NAME;
-
---
---  The following are message buffers used to contain the test messages
---  and pointers to those buffers.
---
-
-   RECEIVE_BUFFER_AREA : RTEMS.BUFFER;
-   BUFFER_AREA_1       : RTEMS.BUFFER;
-   BUFFER_AREA_2       : RTEMS.BUFFER;
-   BUFFER_AREA_3       : RTEMS.BUFFER;
-   BUFFER_AREA_4       : RTEMS.BUFFER;
-
-   RECEIVE_BUFFER : RTEMS.BUFFER_POINTER;
-   BUFFER_1       : RTEMS.BUFFER_POINTER;
-   BUFFER_2       : RTEMS.BUFFER_POINTER;
-   BUFFER_3       : RTEMS.BUFFER_POINTER;
-   BUFFER_4       : RTEMS.BUFFER_POINTER;
-
---
---  This variable contains the ID of the remote task with which this
---  test interacts.
---
-
-   REMOTE_TID  : RTEMS.ID;
-
---
---  This variable contains the node on which the remote task with which 
---  this test interacts resides.
---
-
-   REMOTE_NODE : RTEMS.UNSIGNED32;
-
---
---  The number of events to process per dot printed out.
---
-
-   PER_DOT : constant RTEMS.UNSIGNED32 := 100;
-
---
---  INIT
---
---  DESCRIPTION:
---
---  This RTEMS task initializes the application.
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  SEND_MESSAGES
---
---  This subprogram prints and sends a sequence of three test messages.
---  One of the messages is sent, one is urgent, and one is broadcast.
---  A one second pause is between each the sending of each message.
---
-
-   procedure SEND_MESSAGES;
-
---
---  RECEIVE_MESSAGES
---
---  This subprogram receives and prints a sequence of three test messages.
---
-
-   procedure RECEIVE_MESSAGES;
-
---
---  FILL_BUFFER
---
---  DESCRIPTION:
---
---  This subprogram takes the SOURCE input string and places
---  up to the first sixteen characters of that string into
---  the message BUFFER.
---
- 
-   procedure FILL_BUFFER (
-      SOURCE : in     STRING;
-      BUFFER :    out RTEMS.BUFFER
-   );
- 
---
---  PUT_BUFFER
---
---  DESCRIPTION:
---
---  This subprogram prints the specified message BUFFER.
---
- 
-   procedure PUT_BUFFER (
-      BUFFER : in     RTEMS.BUFFER
-   );
-
---
---  TEST_TASK
---
---  DESCRIPTION:
---
---  This is the body of the RTEMS tasks which constitute this test.
---
-
-   procedure TEST_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  This is the Driver Address Table for this test.
---
-
-   DEVICE_DRIVERS : aliased RTEMS.DRIVER_ADDRESS_TABLE( 1 .. 1 ) :=
-   (1=>
-      (
-        CLOCK_DRIVER.INITIALIZE'ACCESS,              -- Initialization
-        RTEMS.NO_DRIVER_ENTRY,                       -- Open
-        RTEMS.NO_DRIVER_ENTRY,                       -- Close
-        RTEMS.NO_DRIVER_ENTRY,                       -- Read
-        RTEMS.NO_DRIVER_ENTRY,                       -- Write
-        RTEMS.NO_DRIVER_ENTRY                        -- Control
-      )
-   );
-
---
---  This is the Initialization Tasks Table for this test.
---
-
-   INITIALIZATION_TASKS : aliased RTEMS.INITIALIZATION_TASKS_TABLE( 1 .. 1 ) := 
-   (1=>
-     (
-       RTEMS.BUILD_NAME( 'U', 'I', '1', ' ' ),        -- task name
-       2048,                                          -- stack size
-       1,                                             -- priority
-       RTEMS.DEFAULT_ATTRIBUTES,                      -- attributes
-       MPTEST.INIT'ACCESS,                            -- entry point
-       RTEMS.NO_PREEMPT,                              -- initial mode
-       0                                              -- argument list
-     )
-   );
-
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
---                             BEGIN SUBPACKAGE                           --
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
-
-   --
-   --  MPTEST.PER_NODE_CONFIGURATION / SPECIFICATION
-   --
-   --  DESCRIPTION:
-   --
-   --  This package is the specification for the subpackage
-   --  which will define the per node configuration parameters.
-   --
-   
-   package PER_NODE_CONFIGURATION is
-
-   --
-   --  LOCAL_NODE_NUMBER
-   --
-   --  DESCRIPTION:
-   --
-   --  This function returns the node number for this node.
-   --
-
-      function LOCAL_NODE_NUMBER 
-      return RTEMS.UNSIGNED32;
-  
-      pragma INLINE ( LOCAL_NODE_NUMBER );
-
-   end PER_NODE_CONFIGURATION;
-  
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
---                              END SUBPACKAGE                            --
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
-
---
---  This is the Multiprocessor Configuration Table for this test.
---
-
-   MULTIPROCESSING_CONFIGURATION : aliased RTEMS.MULTIPROCESSING_TABLE := (
-      MPTEST.PER_NODE_CONFIGURATION.LOCAL_NODE_NUMBER,
-      2,                         -- maximum # nodes in system 
-      32,                        -- maximum # global objects
-      32                         -- maximum # proxies
-    );
-
---
---  This is the Configuration Table for this test.
---
-
-   CONFIGURATION : aliased RTEMS.CONFIGURATION_TABLE := (
-      RTEMS.NULL_ADDRESS,        -- will be replaced by BSP
-      64 * 1024,                 -- executive RAM size
-      10,                        -- maximum # tasks
-      0,                         -- maximum # timers
-      0,                         -- maximum # semaphores
-      1,                         -- maximum # message queues
-      1,                         -- maximum # messages
-      0,                         -- maximum # partitions
-      0,                         -- maximum # regions
-      0,                         -- maximum # dp memory areas
-      0,                         -- maximum # periods
-      0,                         -- maximum # user extensions
-      RTEMS.MILLISECONDS_TO_MICROSECONDS(10), -- # us in a tick
-      50                         -- # ticks in a timeslice
-  );
-
-end MPTEST;
diff --git a/c/src/ada-tests/mptests/mp09/node1/mp09.scn b/c/src/ada-tests/mptests/mp09/node1/mp09.scn
deleted file mode 100644
index 167d6e18a5..0000000000
--- a/c/src/ada-tests/mptests/mp09/node1/mp09.scn
+++ /dev/null
@@ -1,20 +0,0 @@
-*** TEST 9 -- NODE 1 ***
-Creating Message Queue (Global)
-Creating Test_task (local)
-Starting Test_task (local)
-Deleting initialization task
-Getting QID of message queue
-Receiving message ...
-Received : 123456789012345
-Receiving message ...
-Received : abcdefghijklmno
-Receiving message ...
-Received : ABCDEFGHIJKLMNO
-Receiver delaying for a second
-message_queue_send : 123456789012345
-Delaying for a second
-message_queue_urgent : abcdefghijklmno
-Delaying for a second
-message_queue_broadcast : ABCDEFGHIJKLMNO
-Delaying for a second
-*** END OF TEST 9 ***
diff --git a/c/src/ada-tests/mptests/mp09/node1/mptest-per_node_configuration.adb b/c/src/ada-tests/mptests/mp09/node1/mptest-per_node_configuration.adb
deleted file mode 100644
index 7df5087537..0000000000
--- a/c/src/ada-tests/mptests/mp09/node1/mptest-per_node_configuration.adb
+++ /dev/null
@@ -1,43 +0,0 @@
---
---  MPTEST.PER_NODE_CONFIGURATION / BODY
---
---  DESCRIPTION:
---
---  This package is the specification for the subpackage
---  which will define the per node configuration parameters.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-
-separate ( MPTEST )
-
-package body PER_NODE_CONFIGURATION is
-
---PAGE
---
---  LOCAL_NODE_NUMBER
---
-
-   function LOCAL_NODE_NUMBER 
-   return RTEMS.UNSIGNED32 is
-   begin
-
-      return 1;
-
-   end LOCAL_NODE_NUMBER;
-
-end PER_NODE_CONFIGURATION;
diff --git a/c/src/ada-tests/mptests/mp09/node2/mp09.scn b/c/src/ada-tests/mptests/mp09/node2/mp09.scn
deleted file mode 100644
index 4cd8a7bff7..0000000000
--- a/c/src/ada-tests/mptests/mp09/node2/mp09.scn
+++ /dev/null
@@ -1,26 +0,0 @@
-*** TEST 9 -- NODE 2 ***
-Creating Test_task (local)
-Starting Test_task (local)
-Deleting initialization task
-Getting QID of message queue
-message_queue_delete correctly returned ILLEGAL_ON_REMOTE_OBJECT
-message_queue_send : 123456789012345 
-Delaying for a second
-message_queue_urgent : abcdefghijklmno 
-Delaying for a second
-message_queue_broadcast : ABCDEFGHIJKLMNO 
-Delaying for a second
-Receiving message ...
-Received : 123456789012345 
-Receiving message ...
-Received : abcdefghijklmno 
-Receiving message ...
-Received : ABCDEFGHIJKLMNO 
-Receiver delaying for a second
-Flushing remote empty queue
-0 messages were flushed from remote empty queue
-Send messages to be flushed from remote queue
-Flushing remote queue
-1 messages were flushed from the remote queue
-Waiting for message queue to be deleted
-*** END OF TEST 9 ***
diff --git a/c/src/ada-tests/mptests/mp09/node2/mptest-per_node_configuration.adb b/c/src/ada-tests/mptests/mp09/node2/mptest-per_node_configuration.adb
deleted file mode 100644
index e127cc5573..0000000000
--- a/c/src/ada-tests/mptests/mp09/node2/mptest-per_node_configuration.adb
+++ /dev/null
@@ -1,43 +0,0 @@
---
---  MPTEST.PER_NODE_CONFIGURATION / BODY
---
---  DESCRIPTION:
---
---  This package is the specification for the subpackage
---  which will define the per node configuration parameters.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-
-separate ( MPTEST )
-
-package body PER_NODE_CONFIGURATION is
-
---PAGE
---
---  LOCAL_NODE_NUMBER
---
-
-   function LOCAL_NODE_NUMBER 
-   return RTEMS.UNSIGNED32 is
-   begin
-
-      return 2;
-
-   end LOCAL_NODE_NUMBER;
-
-end PER_NODE_CONFIGURATION;
diff --git a/c/src/ada-tests/mptests/mp10/mptest.adb b/c/src/ada-tests/mptests/mp10/mptest.adb
deleted file mode 100644
index 011d1f83e7..0000000000
--- a/c/src/ada-tests/mptests/mp10/mptest.adb
+++ /dev/null
@@ -1,301 +0,0 @@
---
---  MPTEST / BODY
---
---  DESCRIPTION:
---
---  This package is the implementation for Test 10 of the RTEMS
---  Multiprocessor Test Suite.
---
---  DEPENDENCIES:
---
---
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with INTERFACES; use INTERFACES;
-with RTEMS;
-with TEST_SUPPORT;
-with TEXT_IO;
-with UNSIGNED32_IO;
-
-package body MPTEST is
-
-   package body PER_NODE_CONFIGURATION is separate;
-
---PAGE
---
---  INIT
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT( "*** TEST 10 -- NODE " );
-      UNSIGNED32_IO.PUT(
-         MPTEST.MULTIPROCESSING_CONFIGURATION.NODE,
-         WIDTH => 1
-      );
-      TEXT_IO.PUT_LINE( " ***" );
-
-
-      MPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME(  'T', 'A', '1', ' ' );
-      MPTEST.TASK_NAME( 2 ) := RTEMS.BUILD_NAME(  'T', 'A', '2', ' ' );
-      MPTEST.TASK_NAME( 3 ) := RTEMS.BUILD_NAME(  'S', 'A', '3', ' ' );
-
-      MPTEST.QUEUE_NAME( 1 ) := RTEMS.BUILD_NAME(  'M', 'S', 'G', ' ' );
-
-      MPTEST.SEMAPHORE_NAME( 1 ) := RTEMS.BUILD_NAME(  'S', 'E', 'M', ' ' );
-
-      if MPTEST.MULTIPROCESSING_CONFIGURATION.NODE = 1 then
-
-         TEXT_IO.PUT_LINE( "Creating Message Queue (Global)" );
-         RTEMS.MESSAGE_QUEUE_CREATE(
-            MPTEST.QUEUE_NAME( 1 ),
-            3,
-            RTEMS.GLOBAL + RTEMS.LIMIT,
-            MPTEST.QUEUE_ID( 1 ),
-            STATUS
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_CREATE" );
-
-         TEXT_IO.PUT_LINE( "Creating Semaphore (Global)" );
-         RTEMS.SEMAPHORE_CREATE(
-            MPTEST.SEMAPHORE_NAME( 1 ),
-            0,
-            RTEMS.GLOBAL + RTEMS.PRIORITY,
-            MPTEST.SEMAPHORE_ID( 1 ),
-            STATUS
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_CREATE" );
-
-         RTEMS.TASK_WAKE_AFTER( 10 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
-
-      else
-
-         TEXT_IO.PUT_LINE( "Creating Test_task 1 (local)" );
-         RTEMS.TASK_CREATE(
-            MPTEST.TASK_NAME( 1 ),
-            1,
-            2048,
-            RTEMS.TIMESLICE,
-            RTEMS.DEFAULT_ATTRIBUTES,
-            MPTEST.TASK_ID( 1 ),
-            STATUS
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE" );
-
-         TEXT_IO.PUT_LINE( "Starting Test_task 1 (local)" );
-         RTEMS.TASK_START(
-            MPTEST.TASK_ID( 1 ),
-            MPTEST.TEST_TASK_1'ACCESS,
-            0,
-            STATUS
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START" );
-
-         TEXT_IO.PUT_LINE( "Creating Test_task 2 (local)" );
-         RTEMS.TASK_CREATE(
-            MPTEST.TASK_NAME( 2 ),
-            1,
-            2048,
-            RTEMS.TIMESLICE,
-            RTEMS.DEFAULT_ATTRIBUTES,
-            MPTEST.TASK_ID( 2 ),
-            STATUS
-         );   
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE" );
- 
-         TEXT_IO.PUT_LINE( "Starting Test_task 2 (local)" );
-         RTEMS.TASK_START(
-            MPTEST.TASK_ID( 2 ),
-            MPTEST.TEST_TASK_2'ACCESS,
-            0,
-            STATUS
-         );   
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START" );
-
-         TEXT_IO.PUT_LINE( "Creating Test_task 3 (local)" );
-         RTEMS.TASK_CREATE(
-            MPTEST.TASK_NAME( 3 ),
-            1,
-            2048,
-            RTEMS.TIMESLICE,
-            RTEMS.DEFAULT_ATTRIBUTES,
-            MPTEST.TASK_ID( 3 ),
-            STATUS
-         );   
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE" );
- 
-         TEXT_IO.PUT_LINE( "Starting Test_task 3 (local)" );
-         RTEMS.TASK_START(
-            MPTEST.TASK_ID( 3 ),
-            MPTEST.TEST_TASK_3'ACCESS,
-            0,
-            STATUS
-         );   
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START" );
-
-         TEXT_IO.PUT_LINE( "Sleeping for 1 second ..." );
-         RTEMS.TASK_WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
-
-         TEXT_IO.PUT_LINE( "Deleting Test_task 2" );
-         RTEMS.TASK_DELETE( MPTEST.TASK_ID( 2 ), STATUS );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF 2" );
-
-         TEXT_IO.PUT_LINE( "Deleting Test_task 1" );
-         RTEMS.TASK_DELETE( MPTEST.TASK_ID( 1 ), STATUS );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF 1" );
-
-         TEXT_IO.PUT_LINE( "Restarting Test_task 3" );
-         RTEMS.TASK_RESTART( MPTEST.TASK_ID( 3 ), 1, STATUS );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_RESTART OF 3" );
-
-      end if;
-
-      TEXT_IO.PUT_LINE( "*** END OF TEST 10 ***" );
-
-      RTEMS.SHUTDOWN_EXECUTIVE( 0 );
-
-   end INIT;
-
---PAGE
---
---  TEST_TASK_1
---
-
-   procedure TEST_TASK_1 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      COUNT               : RTEMS.UNSIGNED32;
-      RECEIVE_BUFFER_AREA : RTEMS.BUFFER;
-      RECEIVE_BUFFER      : RTEMS.BUFFER_POINTER;
-      STATUS              : RTEMS.STATUS_CODES;
-   begin
-
-      RECEIVE_BUFFER :=
-         RTEMS.TO_BUFFER_POINTER( RECEIVE_BUFFER_AREA'ADDRESS );
-
-      TEXT_IO.PUT_LINE( "Getting QID of message queue" );
-
-      loop
-
-         RTEMS.MESSAGE_QUEUE_IDENT(
-            MPTEST.QUEUE_NAME( 1 ),
-            RTEMS.SEARCH_ALL_NODES,
-            MPTEST.QUEUE_ID( 1 ),
-            STATUS
-         );
-
-         exit when RTEMS.IS_STATUS_SUCCESSFUL( STATUS );
-
-      end loop;
-
-      TEXT_IO.PUT_LINE( "Attempting to receive message ..." );
-      RTEMS.MESSAGE_QUEUE_RECEIVE(
-         MPTEST.QUEUE_ID( 1 ),
-         RECEIVE_BUFFER,
-         RTEMS.DEFAULT_OPTIONS,
-         RTEMS.NO_TIMEOUT,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_RECEIVE" );
-
-   end TEST_TASK_1;
-
---PAGE
---
---  TEST_TASK_2
---
- 
-   procedure TEST_TASK_2 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS : RTEMS.STATUS_CODES;
-   begin 
- 
-      TEXT_IO.PUT_LINE( "Getting SMID of semaphore" );
-
-      loop
-
-         RTEMS.SEMAPHORE_IDENT(
-            MPTEST.SEMAPHORE_NAME( 1 ),
-            RTEMS.SEARCH_ALL_NODES,
-            MPTEST.SEMAPHORE_ID( 1 ),
-            STATUS
-         ); 
- 
-         exit when RTEMS.IS_STATUS_SUCCESSFUL( STATUS );
-
-      end loop;
-
-      TEXT_IO.PUT_LINE( "Attempting to acquire semaphore ..." );
-      RTEMS.SEMAPHORE_OBTAIN(
-         MPTEST.SEMAPHORE_ID( 1 ),
-         RTEMS.DEFAULT_OPTIONS,
-         RTEMS.NO_TIMEOUT,
-         STATUS
-      ); 
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_OBTAIN" );
- 
-   end TEST_TASK_2;
-
---PAGE 
--- 
---  TEST_TASK_3
--- 
-  
-   procedure TEST_TASK_3 ( 
-      RESTART : in     RTEMS.TASK_ARGUMENT 
-   ) is 
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      if RESTART = 1 then
-
-         RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); 
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE" );
-
-      end if;
-
-      TEXT_IO.PUT_LINE( "Getting SMID of semaphore" );
-
-      loop
-
-         RTEMS.SEMAPHORE_IDENT(
-            MPTEST.SEMAPHORE_NAME( 1 ),
-            RTEMS.SEARCH_ALL_NODES,
-            MPTEST.SEMAPHORE_ID( 1 ),
-            STATUS    
-         ); 
-
-         exit when RTEMS.IS_STATUS_SUCCESSFUL( STATUS );
-
-      end loop;
-
-      TEXT_IO.PUT_LINE( "Attempting to acquire semaphore ..." );
-      RTEMS.SEMAPHORE_OBTAIN(
-         MPTEST.SEMAPHORE_ID( 1 ),
-         RTEMS.DEFAULT_OPTIONS,
-         RTEMS.NO_TIMEOUT, 
-         STATUS  
-      );  
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_OBTAIN" );
-  
-   end TEST_TASK_3; 
- 
-end MPTEST;
diff --git a/c/src/ada-tests/mptests/mp10/mptest.ads b/c/src/ada-tests/mptests/mp10/mptest.ads
deleted file mode 100644
index a574adf43f..0000000000
--- a/c/src/ada-tests/mptests/mp10/mptest.ads
+++ /dev/null
@@ -1,224 +0,0 @@
---
---  MPTEST / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package is the specification for Test 10 of the RTEMS
---  Multiprocessor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with BSP_MPCI;
-with RTEMS;
-
-package MPTEST is
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS tasks created
---  by this test.
---
-
-   TASK_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.ID;
-   TASK_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.NAME;
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS message 
---  queues created by this test.
---
-
-   QUEUE_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 2 ) of RTEMS.ID;
-   QUEUE_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 2 ) of RTEMS.NAME;
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS semaphore
---  created by this test.
---
-
-   SEMAPHORE_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 2 ) of RTEMS.ID;
-   SEMAPHORE_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 2 ) of RTEMS.NAME;
-
---
---  This variable contains the ID of the remote task with which this
---  test interacts.
---
-
-   REMOTE_TID  : RTEMS.ID;
-
---
---  This variable contains the node on which the remote task with which 
---  this test interacts resides.
---
-
-   REMOTE_NODE : RTEMS.UNSIGNED32;
-
---
---  The number of events to process per dot printed out.
---
-
-   PER_DOT : constant RTEMS.UNSIGNED32 := 100;
-
---
---  INIT
---
---  DESCRIPTION:
---
---  This RTEMS task initializes the application.
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TEST_TASK_1
---
---  DESCRIPTION:
---
---  This is the body of one of the RTEMS tasks which constitute this test.
---
-
-   procedure TEST_TASK_1 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TEST_TASK_2  
---
---  DESCRIPTION: 
---
---  This is the body of one of the RTEMS tasks which constitute this test.
---
- 
-   procedure TEST_TASK_2 ( 
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TEST_TASK_3  
---
---  DESCRIPTION: 
---
---  This is the body of one of the RTEMS tasks which constitute this test.
---
- 
-   procedure TEST_TASK_3 ( 
-      RESTART : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  This is the Driver Address Table for this test.
---
-
-   DEVICE_DRIVERS : aliased RTEMS.DRIVER_ADDRESS_TABLE( 1 .. 1 ) :=
-   (1=>
-      (
-        CLOCK_DRIVER.INITIALIZE'ACCESS,              -- Initialization
-        RTEMS.NO_DRIVER_ENTRY,                       -- Open
-        RTEMS.NO_DRIVER_ENTRY,                       -- Close
-        RTEMS.NO_DRIVER_ENTRY,                       -- Read
-        RTEMS.NO_DRIVER_ENTRY,                       -- Write
-        RTEMS.NO_DRIVER_ENTRY                        -- Control
-      )
-   );
-
---
---  This is the Initialization Tasks Table for this test.
---
-
-   INITIALIZATION_TASKS : aliased RTEMS.INITIALIZATION_TASKS_TABLE( 1 .. 1 ) := 
-   (1=>
-     (
-       RTEMS.BUILD_NAME( 'U', 'I', '1', ' ' ),        -- task name
-       2048,                                          -- stack size
-       1,                                             -- priority
-       RTEMS.DEFAULT_ATTRIBUTES,                      -- attributes
-       MPTEST.INIT'ACCESS,                            -- entry point
-       RTEMS.NO_PREEMPT,                              -- initial mode
-       0                                              -- argument list
-     )
-   );
-
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
---                             BEGIN SUBPACKAGE                           --
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
-
-   --
-   --  MPTEST.PER_NODE_CONFIGURATION / SPECIFICATION
-   --
-   --  DESCRIPTION:
-   --
-   --  This package is the specification for the subpackage
-   --  which will define the per node configuration parameters.
-   --
-   
-   package PER_NODE_CONFIGURATION is
-
-   --
-   --  LOCAL_NODE_NUMBER
-   --
-   --  DESCRIPTION:
-   --
-   --  This function returns the node number for this node.
-   --
-
-      function LOCAL_NODE_NUMBER 
-      return RTEMS.UNSIGNED32;
-  
-      pragma INLINE ( LOCAL_NODE_NUMBER );
-
-   end PER_NODE_CONFIGURATION;
-  
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
---                              END SUBPACKAGE                            --
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
-
---
---  This is the Multiprocessor Configuration Table for this test.
---
-
-   MULTIPROCESSING_CONFIGURATION : aliased RTEMS.MULTIPROCESSING_TABLE := (
-      MPTEST.PER_NODE_CONFIGURATION.LOCAL_NODE_NUMBER,
-      2,                         -- maximum # nodes in system 
-      32,                        -- maximum # global objects
-      32                         -- maximum # proxies
-    );
-
---
---  This is the Configuration Table for this test.
---
-
-   CONFIGURATION : aliased RTEMS.CONFIGURATION_TABLE := (
-      RTEMS.NULL_ADDRESS,        -- will be replaced by BSP
-      64 * 1024,                 -- executive RAM size
-      10,                        -- maximum # tasks
-      0,                         -- maximum # timers
-      1,                         -- maximum # semaphores
-      1,                         -- maximum # message queues
-      0,                         -- maximum # messages
-      0,                         -- maximum # partitions
-      0,                         -- maximum # regions
-      0,                         -- maximum # dp memory areas
-      0,                         -- maximum # periods
-      0,                         -- maximum # user extensions
-      RTEMS.MILLISECONDS_TO_MICROSECONDS(10), -- # us in a tick
-      50                         -- # ticks in a timeslice
-  );
-
-end MPTEST;
diff --git a/c/src/ada-tests/mptests/mp10/node1/mp10.scn b/c/src/ada-tests/mptests/mp10/node1/mp10.scn
deleted file mode 100644
index deeafc0a9a..0000000000
--- a/c/src/ada-tests/mptests/mp10/node1/mp10.scn
+++ /dev/null
@@ -1,4 +0,0 @@
-*** TEST 10 -- NODE 1 ***
-Creating Message Queue (Global)
-Creating Semaphore (Global)
-*** END OF TEST 10 ***
diff --git a/c/src/ada-tests/mptests/mp10/node1/mptest-per_node_configuration.adb b/c/src/ada-tests/mptests/mp10/node1/mptest-per_node_configuration.adb
deleted file mode 100644
index 7df5087537..0000000000
--- a/c/src/ada-tests/mptests/mp10/node1/mptest-per_node_configuration.adb
+++ /dev/null
@@ -1,43 +0,0 @@
---
---  MPTEST.PER_NODE_CONFIGURATION / BODY
---
---  DESCRIPTION:
---
---  This package is the specification for the subpackage
---  which will define the per node configuration parameters.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-
-separate ( MPTEST )
-
-package body PER_NODE_CONFIGURATION is
-
---PAGE
---
---  LOCAL_NODE_NUMBER
---
-
-   function LOCAL_NODE_NUMBER 
-   return RTEMS.UNSIGNED32 is
-   begin
-
-      return 1;
-
-   end LOCAL_NODE_NUMBER;
-
-end PER_NODE_CONFIGURATION;
diff --git a/c/src/ada-tests/mptests/mp10/node2/mp10.scn b/c/src/ada-tests/mptests/mp10/node2/mp10.scn
deleted file mode 100644
index c0337fdacf..0000000000
--- a/c/src/ada-tests/mptests/mp10/node2/mp10.scn
+++ /dev/null
@@ -1,18 +0,0 @@
-*** TEST 10 -- NODE 2 ***
-Creating Test_task 1 (local)
-Starting Test_task 1 (local)
-Creating Test_task 2 (local)
-Starting Test_task 2 (local)
-Creating Test_task 3 (local)
-Starting Test_task 3 (local)
-Sleeping for 1 second ...
-Getting QID of message queue
-Attempting to receive message ...
-Getting SMID of semaphore
-Attempting to acquire semaphore ...
-Getting SMID of semaphore
-Attempting to acquire semaphore ...
-Deleting Test_task 2
-Deleting Test_task 1
-Restarting Test_task 3
-*** END OF TEST 10 ***
diff --git a/c/src/ada-tests/mptests/mp10/node2/mptest-per_node_configuration.adb b/c/src/ada-tests/mptests/mp10/node2/mptest-per_node_configuration.adb
deleted file mode 100644
index e127cc5573..0000000000
--- a/c/src/ada-tests/mptests/mp10/node2/mptest-per_node_configuration.adb
+++ /dev/null
@@ -1,43 +0,0 @@
---
---  MPTEST.PER_NODE_CONFIGURATION / BODY
---
---  DESCRIPTION:
---
---  This package is the specification for the subpackage
---  which will define the per node configuration parameters.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-
-separate ( MPTEST )
-
-package body PER_NODE_CONFIGURATION is
-
---PAGE
---
---  LOCAL_NODE_NUMBER
---
-
-   function LOCAL_NODE_NUMBER 
-   return RTEMS.UNSIGNED32 is
-   begin
-
-      return 2;
-
-   end LOCAL_NODE_NUMBER;
-
-end PER_NODE_CONFIGURATION;
diff --git a/c/src/ada-tests/mptests/mp11/mptest.adb b/c/src/ada-tests/mptests/mp11/mptest.adb
deleted file mode 100644
index c94ca43eaa..0000000000
--- a/c/src/ada-tests/mptests/mp11/mptest.adb
+++ /dev/null
@@ -1,138 +0,0 @@
---
---  MPTEST / BODY
---
---  DESCRIPTION:
---
---  This package is the implementation for Test 11 of the RTEMS
---  Multiprocessor Test Suite.
---
---  DEPENDENCIES:
---
---
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with INTERFACES; use INTERFACES;
-with RTEMS;
-with TEST_SUPPORT;
-with TEXT_IO;
-with UNSIGNED32_IO;
-
-package body MPTEST is
-
-   package body PER_NODE_CONFIGURATION is separate;
-
---PAGE
---
---  INIT
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT( "*** TEST 11 -- NODE " );
-      UNSIGNED32_IO.PUT(
-         MPTEST.MULTIPROCESSING_CONFIGURATION.NODE,
-         WIDTH => 1
-      );
-      TEXT_IO.PUT_LINE( " ***" );
-
-      MPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME(  '1', '1', '1', ' ' );
-      MPTEST.TASK_NAME( 2 ) := RTEMS.BUILD_NAME(  '2', '2', '2', ' ' );
-
-      MPTEST.QUEUE_NAME( 1 ) := RTEMS.BUILD_NAME(  'M', 'S', 'G', ' ' );
-
-      MPTEST.SEMAPHORE_NAME( 1 ) := RTEMS.BUILD_NAME(  'S', 'E', 'M', ' ' );
-
-      MPTEST.PARTITION_NAME( 1 ) := RTEMS.BUILD_NAME(  'P', 'A', 'R', ' ' );
-
-      if MPTEST.MULTIPROCESSING_CONFIGURATION.NODE = 1 then
-
-         TEXT_IO.PUT_LINE( "Attempting to create Test_task (Global)" );
-         RTEMS.TASK_CREATE(
-            MPTEST.TASK_NAME( 1 ),
-            1,
-            2048,
-            RTEMS.DEFAULT_MODES,
-            RTEMS.GLOBAL,
-            MPTEST.TASK_ID( 1 ),
-            STATUS
-         );
-         TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-            STATUS,
-            RTEMS.TOO_MANY,
-            "TASK_CREATE"
-         );
-         TEXT_IO.PUT_LINE( "task_create correctly returned TOO_MANY" );
-
-         TEXT_IO.PUT_LINE( "Attempting to create Message Queue (Global)" );
-         RTEMS.MESSAGE_QUEUE_CREATE(
-            MPTEST.QUEUE_NAME( 1 ),
-            3,
-            RTEMS.GLOBAL + RTEMS.LIMIT,
-            MPTEST.QUEUE_ID( 1 ),
-            STATUS
-         );
-         TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-            STATUS,
-            RTEMS.TOO_MANY,
-            "MESSAGE_QUEUE_CREATE"
-         );
-         TEXT_IO.PUT_LINE( 
-            "message_queue_create correctly returned TOO_MANY"
-         );
-
-         TEXT_IO.PUT_LINE( "Creating Semaphore (Global)" );
-         RTEMS.SEMAPHORE_CREATE(
-            MPTEST.SEMAPHORE_NAME( 1 ),
-            1,
-            RTEMS.GLOBAL,
-            MPTEST.SEMAPHORE_ID( 1 ),
-            STATUS
-         );
-         TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-            STATUS, 
-            RTEMS.TOO_MANY, 
-            "SEMAPHORE_CREATE"
-         );
-         TEXT_IO.PUT_LINE( "semaphore_create correctly returned TOO_MANY" );
-
-         TEXT_IO.PUT_LINE( "Creating Partition (Global)" );
-         RTEMS.PARTITION_CREATE(
-            MPTEST.PARTITION_NAME( 1 ),
-            MPTEST.PARTITION_AREA( 0 )'ADDRESS,
-            128,
-            64,
-            RTEMS.GLOBAL,
-            MPTEST.PARTITION_ID( 1 ),
-            STATUS
-         );
-         TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-            STATUS,
-            RTEMS.TOO_MANY,
-            "PARTITION_CREATE"
-         );
-         TEXT_IO.PUT_LINE( "partition_create correctly returned TOO_MANY" );
-
-      end if;
-
-      TEXT_IO.PUT_LINE( "*** END OF TEST 11 ***" );
-
-      RTEMS.SHUTDOWN_EXECUTIVE( 0 );
-
-   end INIT; 
- 
-end MPTEST;
diff --git a/c/src/ada-tests/mptests/mp11/mptest.ads b/c/src/ada-tests/mptests/mp11/mptest.ads
deleted file mode 100644
index 6d54d45084..0000000000
--- a/c/src/ada-tests/mptests/mp11/mptest.ads
+++ /dev/null
@@ -1,184 +0,0 @@
---
---  MPTEST / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package is the specification for Test 11 of the RTEMS
---  Multiprocessor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with BSP_MPCI;
-with RTEMS;
-
-package MPTEST is
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS tasks created
---  by this test.
---
-
-   TASK_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.ID;
-   TASK_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.NAME;
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS message 
---  queues created by this test.
---
-
-   QUEUE_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 2 ) of RTEMS.ID;
-   QUEUE_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 2 ) of RTEMS.NAME;
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS semaphore
---  created by this test.
---
-
-   SEMAPHORE_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 2 ) of RTEMS.ID;
-   SEMAPHORE_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 2 ) of RTEMS.NAME;
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS partition
---  created by this test.
---
-
-   PARTITION_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 2 ) of RTEMS.ID;
-   PARTITION_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 2 ) of RTEMS.NAME;
-
---
---  This is the area used for the partition.
---
-
-   PARTITION_AREA : 
-      array ( RTEMS.UNSIGNED32 range 0 .. 1023 ) of RTEMS.UNSIGNED8;
-   for PARTITION_AREA'ALIGNMENT use RTEMS.STRUCTURE_ALIGNMENT;
-
---
---  INIT
---
---  DESCRIPTION:
---
---  This RTEMS task initializes the application.
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  This is the Driver Address Table for this test.
---
-
-   DEVICE_DRIVERS : aliased RTEMS.DRIVER_ADDRESS_TABLE( 1 .. 1 ) :=
-   (1=>
-      (
-        CLOCK_DRIVER.INITIALIZE'ACCESS,              -- Initialization
-        RTEMS.NO_DRIVER_ENTRY,                       -- Open
-        RTEMS.NO_DRIVER_ENTRY,                       -- Close
-        RTEMS.NO_DRIVER_ENTRY,                       -- Read
-        RTEMS.NO_DRIVER_ENTRY,                       -- Write
-        RTEMS.NO_DRIVER_ENTRY                        -- Control
-      )
-   );
-
---
---  This is the Initialization Tasks Table for this test.
---
-
-   INITIALIZATION_TASKS : aliased RTEMS.INITIALIZATION_TASKS_TABLE( 1 .. 1 ) := 
-   (1=>
-     (
-       RTEMS.BUILD_NAME( 'U', 'I', '1', ' ' ),        -- task name
-       2048,                                          -- stack size
-       1,                                             -- priority
-       RTEMS.DEFAULT_ATTRIBUTES,                      -- attributes
-       MPTEST.INIT'ACCESS,                            -- entry point
-       RTEMS.NO_PREEMPT,                              -- initial mode
-       0                                              -- argument list
-     )
-   );
-
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
---                             BEGIN SUBPACKAGE                           --
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
-
-   --
-   --  MPTEST.PER_NODE_CONFIGURATION / SPECIFICATION
-   --
-   --  DESCRIPTION:
-   --
-   --  This package is the specification for the subpackage
-   --  which will define the per node configuration parameters.
-   --
-   
-   package PER_NODE_CONFIGURATION is
-
-   --
-   --  LOCAL_NODE_NUMBER
-   --
-   --  DESCRIPTION:
-   --
-   --  This function returns the node number for this node.
-   --
-
-      function LOCAL_NODE_NUMBER 
-      return RTEMS.UNSIGNED32;
-  
-      pragma INLINE ( LOCAL_NODE_NUMBER );
-
-   end PER_NODE_CONFIGURATION;
-  
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
---                              END SUBPACKAGE                            --
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
-
---
---  This is the Multiprocessor Configuration Table for this test.
---
-
-   MULTIPROCESSING_CONFIGURATION : aliased RTEMS.MULTIPROCESSING_TABLE := (
-      MPTEST.PER_NODE_CONFIGURATION.LOCAL_NODE_NUMBER,
-      2,                         -- maximum # nodes in system 
-      0,                         -- maximum # global objects
-      0                          -- maximum # proxies
-    );
-
---
---  This is the Configuration Table for this test.
---
-
-   CONFIGURATION : aliased RTEMS.CONFIGURATION_TABLE := (
-      RTEMS.NULL_ADDRESS,        -- will be replaced by BSP
-      64 * 1024,                 -- executive RAM size
-      10,                        -- maximum # tasks
-      0,                         -- maximum # timers
-      1,                         -- maximum # semaphores
-      1,                         -- maximum # message queues
-      0,                         -- maximum # messages
-      1,                         -- maximum # partitions
-      0,                         -- maximum # regions
-      0,                         -- maximum # dp memory areas
-      0,                         -- maximum # periods
-      0,                         -- maximum # user extensions
-      RTEMS.MILLISECONDS_TO_MICROSECONDS(10), -- # us in a tick
-      50                         -- # ticks in a timeslice
-  );
-
-end MPTEST;
diff --git a/c/src/ada-tests/mptests/mp11/node1/mp11.scn b/c/src/ada-tests/mptests/mp11/node1/mp11.scn
deleted file mode 100644
index 013426bf91..0000000000
--- a/c/src/ada-tests/mptests/mp11/node1/mp11.scn
+++ /dev/null
@@ -1,10 +0,0 @@
-*** TEST 11 -- NODE 1 ***
-Attempting to create Test_task (Global)
-task_create correctly returned TOO_MANY
-Attempting to create Message Queue (Global)
-message_queue_create correctly returned TOO_MANY
-Creating Semaphore (Global)
-semaphore_create correctly returned TOO_MANY
-Creating Partition (Global)
-partition_create correctly returned TOO_MANY
-*** END OF TEST 11 ***
diff --git a/c/src/ada-tests/mptests/mp11/node1/mptest-per_node_configuration.adb b/c/src/ada-tests/mptests/mp11/node1/mptest-per_node_configuration.adb
deleted file mode 100644
index 7df5087537..0000000000
--- a/c/src/ada-tests/mptests/mp11/node1/mptest-per_node_configuration.adb
+++ /dev/null
@@ -1,43 +0,0 @@
---
---  MPTEST.PER_NODE_CONFIGURATION / BODY
---
---  DESCRIPTION:
---
---  This package is the specification for the subpackage
---  which will define the per node configuration parameters.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-
-separate ( MPTEST )
-
-package body PER_NODE_CONFIGURATION is
-
---PAGE
---
---  LOCAL_NODE_NUMBER
---
-
-   function LOCAL_NODE_NUMBER 
-   return RTEMS.UNSIGNED32 is
-   begin
-
-      return 1;
-
-   end LOCAL_NODE_NUMBER;
-
-end PER_NODE_CONFIGURATION;
diff --git a/c/src/ada-tests/mptests/mp11/node2/mp11.scn b/c/src/ada-tests/mptests/mp11/node2/mp11.scn
deleted file mode 100644
index 49bd8a3219..0000000000
--- a/c/src/ada-tests/mptests/mp11/node2/mp11.scn
+++ /dev/null
@@ -1,2 +0,0 @@
-*** TEST 11 -- NODE 2 ***
-*** END OF TEST 11 ***
diff --git a/c/src/ada-tests/mptests/mp11/node2/mptest-per_node_configuration.adb b/c/src/ada-tests/mptests/mp11/node2/mptest-per_node_configuration.adb
deleted file mode 100644
index e127cc5573..0000000000
--- a/c/src/ada-tests/mptests/mp11/node2/mptest-per_node_configuration.adb
+++ /dev/null
@@ -1,43 +0,0 @@
---
---  MPTEST.PER_NODE_CONFIGURATION / BODY
---
---  DESCRIPTION:
---
---  This package is the specification for the subpackage
---  which will define the per node configuration parameters.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-
-separate ( MPTEST )
-
-package body PER_NODE_CONFIGURATION is
-
---PAGE
---
---  LOCAL_NODE_NUMBER
---
-
-   function LOCAL_NODE_NUMBER 
-   return RTEMS.UNSIGNED32 is
-   begin
-
-      return 2;
-
-   end LOCAL_NODE_NUMBER;
-
-end PER_NODE_CONFIGURATION;
diff --git a/c/src/ada-tests/mptests/mp12/mptest.adb b/c/src/ada-tests/mptests/mp12/mptest.adb
deleted file mode 100644
index e99006ec72..0000000000
--- a/c/src/ada-tests/mptests/mp12/mptest.adb
+++ /dev/null
@@ -1,152 +0,0 @@
---
---  MPTEST / BODY
---
---  DESCRIPTION:
---
---  This package is the implementation for Test 12 of the RTEMS
---  Multiprocessor Test Suite.
---
---  DEPENDENCIES:
---
---
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with INTERFACES; use INTERFACES;
-with RTEMS;
-with TEST_SUPPORT;
-with TEXT_IO;
-with UNSIGNED32_IO;
-
-package body MPTEST is
-
-   package body PER_NODE_CONFIGURATION is separate;
-
---PAGE
---
---  INIT
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      BUFFER_ADDRESS : RTEMS.ADDRESS;
-      STATUS         : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT( "*** TEST 12 -- NODE " );
-      UNSIGNED32_IO.PUT(
-         MPTEST.MULTIPROCESSING_CONFIGURATION.NODE,
-         WIDTH => 1
-      );
-      TEXT_IO.PUT_LINE( " ***" );
-
-      MPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME(  '1', '1', '1', ' ' );
-      MPTEST.TASK_NAME( 2 ) := RTEMS.BUILD_NAME(  '2', '2', '2', ' ' );
-
-      MPTEST.PARTITION_NAME( 1 ) := RTEMS.BUILD_NAME(  'P', 'A', 'R', ' ' );
-
-      TEXT_IO.PUT_LINE( "Got to the initialization task" );
-
-      if MPTEST.MULTIPROCESSING_CONFIGURATION.NODE = 2 then
-
-         RTEMS.TASK_WAKE_AFTER( 1 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
-
-         TEXT_IO.PUT_LINE( "Getting ID of remote Partition (Global)" );
-
-         loop
-
-            RTEMS.PARTITION_IDENT(
-               MPTEST.PARTITION_NAME( 1 ),
-               RTEMS.SEARCH_ALL_NODES,
-               MPTEST.PARTITION_ID( 1 ),
-               STATUS
-            );
-
-            exit when RTEMS.IS_STATUS_SUCCESSFUL( STATUS );
-
-         end loop;
-
-         TEXT_IO.PUT_LINE( 
-            "Attempting to delete remote Partition (Global)"
-         );
-
-         RTEMS.PARTITION_DELETE( MPTEST.PARTITION_ID( 1 ), STATUS ); 
-         TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( 
-            STATUS, 
-            RTEMS.ILLEGAL_ON_REMOTE_OBJECT,
-            "PARTITION_DELETE" 
-         );
-
-         TEXT_IO.PUT_LINE( 
-            "partition_delete correctly returned ILLEGAL_ON_REMOTE_OBJECT!!"
-         );
-
-         TEXT_IO.PUT_LINE( "Obtaining a buffer from the global partition" );
-
-         RTEMS.PARTITION_GET_BUFFER(
-            MPTEST.PARTITION_ID( 1 ),
-            BUFFER_ADDRESS,
-            STATUS
-         ); 
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "PARTITION_GET_BUFFER" );
-         TEXT_IO.PUT( "Address returned was : " );
-         UNSIGNED32_IO.PUT(
-            RTEMS.SUBTRACT( BUFFER_ADDRESS, RTEMS.NULL_ADDRESS ),
-            WIDTH => 8,
-            BASE => 16
-         );
-         TEXT_IO.NEW_LINE;
-
-         RTEMS.PARTITION_RETURN_BUFFER(
-            MPTEST.PARTITION_ID( 1 ),
-            BUFFER_ADDRESS,
-            STATUS
-         ); 
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "PARTITION_RETURN_BUFFER" );
-
-         RTEMS.TASK_WAKE_AFTER( 2 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
-
-      else
-
-         TEXT_IO.PUT_LINE( "Creating Partition (Global)" );
-         RTEMS.PARTITION_CREATE(
-            MPTEST.PARTITION_NAME( 1 ),
-            MPTEST.PARTITION_AREA( 0 )'ADDRESS,
-            128,
-            64,
-            RTEMS.GLOBAL,
-            MPTEST.PARTITION_ID( 1 ),
-            STATUS
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "PARTITION_CREATE" );
-
-         TEXT_IO.PUT_LINE( "Sleeping for three seconds" );
-         RTEMS.TASK_WAKE_AFTER( 3 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
-
-         TEXT_IO.PUT_LINE( "Deleting Partition (Global)" );
-         RTEMS.PARTITION_DELETE( MPTEST.PARTITION_ID( 1 ), STATUS );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "PARTITION_DELETE" );
-
-      end if;
-
-      TEXT_IO.PUT_LINE( "*** END OF TEST 12 ***" );
-
-      RTEMS.SHUTDOWN_EXECUTIVE( 0 );
-
-   end INIT;
-
-end MPTEST;
diff --git a/c/src/ada-tests/mptests/mp12/mptest.ads b/c/src/ada-tests/mptests/mp12/mptest.ads
deleted file mode 100644
index bc6b0d8827..0000000000
--- a/c/src/ada-tests/mptests/mp12/mptest.ads
+++ /dev/null
@@ -1,182 +0,0 @@
---
---  MPTEST / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package is the specification for Test 12 of the RTEMS
---  Multiprocessor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with BSP_MPCI;
-with RTEMS;
-
-package MPTEST is
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS tasks created
---  by this test.
---
-
-   TASK_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.ID;
-   TASK_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.NAME;
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS semaphore
---  created by this test.
---
-
-   PARTITION_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 2 ) of RTEMS.ID;
-   PARTITION_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 2 ) of RTEMS.NAME;
-
---
---  This variable contains the ID of the remote task with which this
---  test interacts.
---
-
-   REMOTE_TID  : RTEMS.ID;
-
---
---  This variable contains the node on which the remote task with which 
---  this test interacts resides.
---
-
-   REMOTE_NODE : RTEMS.UNSIGNED32;
-
---
---  INIT
---
---  DESCRIPTION:
---
---  This RTEMS task initializes the application.
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  This is the area used for the partition.
---
-
-   PARTITION_AREA : 
-      array ( RTEMS.UNSIGNED32 range 0 .. 1023 ) of RTEMS.UNSIGNED8;
-   for PARTITION_AREA'ALIGNMENT use RTEMS.STRUCTURE_ALIGNMENT;
-
---
---  This is the Driver Address Table for this test.
---
-
-   DEVICE_DRIVERS : aliased RTEMS.DRIVER_ADDRESS_TABLE( 1 .. 1 ) :=
-   (1=>
-      (
-        CLOCK_DRIVER.INITIALIZE'ACCESS,              -- Initialization
-        RTEMS.NO_DRIVER_ENTRY,                       -- Open
-        RTEMS.NO_DRIVER_ENTRY,                       -- Close
-        RTEMS.NO_DRIVER_ENTRY,                       -- Read
-        RTEMS.NO_DRIVER_ENTRY,                       -- Write
-        RTEMS.NO_DRIVER_ENTRY                        -- Control
-      )
-   );
-
---
---  This is the Initialization Tasks Table for this test.
---
-
-   INITIALIZATION_TASKS : aliased RTEMS.INITIALIZATION_TASKS_TABLE( 1 .. 1 ) := 
-   (1=>
-     (
-       RTEMS.BUILD_NAME( 'U', 'I', '1', ' ' ),        -- task name
-       2048,                                          -- stack size
-       1,                                             -- priority
-       RTEMS.DEFAULT_ATTRIBUTES,                      -- attributes
-       MPTEST.INIT'ACCESS,                            -- entry point
-       RTEMS.NO_PREEMPT,                              -- initial mode
-       0                                              -- argument list
-     )
-   );
-
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
---                             BEGIN SUBPACKAGE                           --
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
-
-   --
-   --  MPTEST.PER_NODE_CONFIGURATION / SPECIFICATION
-   --
-   --  DESCRIPTION:
-   --
-   --  This package is the specification for the subpackage
-   --  which will define the per node configuration parameters.
-   --
-   
-   package PER_NODE_CONFIGURATION is
-
-   --
-   --  LOCAL_NODE_NUMBER
-   --
-   --  DESCRIPTION:
-   --
-   --  This function returns the node number for this node.
-   --
-
-      function LOCAL_NODE_NUMBER 
-      return RTEMS.UNSIGNED32;
-  
-      pragma INLINE ( LOCAL_NODE_NUMBER );
-
-   end PER_NODE_CONFIGURATION;
-  
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
---                              END SUBPACKAGE                            --
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
-
---
---  This is the Multiprocessor Configuration Table for this test.
---
-
-   MULTIPROCESSING_CONFIGURATION : aliased RTEMS.MULTIPROCESSING_TABLE := (
-      MPTEST.PER_NODE_CONFIGURATION.LOCAL_NODE_NUMBER,
-      2,                         -- maximum # nodes in system 
-      32,                        -- maximum # global objects
-      32                         -- maximum # proxies
-    );
-
---
---  This is the Configuration Table for this test.
---
-
-   CONFIGURATION : aliased RTEMS.CONFIGURATION_TABLE := (
-      RTEMS.NULL_ADDRESS,        -- will be replaced by BSP
-      64 * 1024,                 -- executive RAM size
-      10,                        -- maximum # tasks
-      0,                         -- maximum # timers
-      0,                         -- maximum # semaphores
-      0,                         -- maximum # message queues
-      0,                         -- maximum # messages
-      1,                         -- maximum # partitions
-      0,                         -- maximum # regions
-      0,                         -- maximum # dp memory areas
-      0,                         -- maximum # periods
-      0,                         -- maximum # user extensions
-      RTEMS.MILLISECONDS_TO_MICROSECONDS(10), -- # us in a tick
-      50                         -- # ticks in a timeslice
-  );
-
-end MPTEST;
diff --git a/c/src/ada-tests/mptests/mp12/node1/mp12.scn b/c/src/ada-tests/mptests/mp12/node1/mp12.scn
deleted file mode 100644
index 40646722eb..0000000000
--- a/c/src/ada-tests/mptests/mp12/node1/mp12.scn
+++ /dev/null
@@ -1,6 +0,0 @@
-*** TEST 12 -- NODE 1 ***
-Got to the initialization task
-Creating Partition (Global)
-Sleeping for three seconds
-Deleting Partition (Global)
-*** END OF TEST 12 ***
diff --git a/c/src/ada-tests/mptests/mp12/node1/mptest-per_node_configuration.adb b/c/src/ada-tests/mptests/mp12/node1/mptest-per_node_configuration.adb
deleted file mode 100644
index 7df5087537..0000000000
--- a/c/src/ada-tests/mptests/mp12/node1/mptest-per_node_configuration.adb
+++ /dev/null
@@ -1,43 +0,0 @@
---
---  MPTEST.PER_NODE_CONFIGURATION / BODY
---
---  DESCRIPTION:
---
---  This package is the specification for the subpackage
---  which will define the per node configuration parameters.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-
-separate ( MPTEST )
-
-package body PER_NODE_CONFIGURATION is
-
---PAGE
---
---  LOCAL_NODE_NUMBER
---
-
-   function LOCAL_NODE_NUMBER 
-   return RTEMS.UNSIGNED32 is
-   begin
-
-      return 1;
-
-   end LOCAL_NODE_NUMBER;
-
-end PER_NODE_CONFIGURATION;
diff --git a/c/src/ada-tests/mptests/mp12/node2/mp12.scn b/c/src/ada-tests/mptests/mp12/node2/mp12.scn
deleted file mode 100644
index 2189ae9959..0000000000
--- a/c/src/ada-tests/mptests/mp12/node2/mp12.scn
+++ /dev/null
@@ -1,9 +0,0 @@
-*** TEST 12 -- NODE 2 ***
-Got to the initialization task
-Getting ID of remote Partition (Global)
-Attempting to delete remote Partition (Global)
-partition_delete correctly returned ILLEGAL_ON_REMOTE_OBJECT!!
-Obtaining a buffer from the global partition
-Address returned was : 0x200f0000
-NOTE: Address printed will probably differ!!!
-*** END OF TEST 12 ***
diff --git a/c/src/ada-tests/mptests/mp12/node2/mptest-per_node_configuration.adb b/c/src/ada-tests/mptests/mp12/node2/mptest-per_node_configuration.adb
deleted file mode 100644
index e127cc5573..0000000000
--- a/c/src/ada-tests/mptests/mp12/node2/mptest-per_node_configuration.adb
+++ /dev/null
@@ -1,43 +0,0 @@
---
---  MPTEST.PER_NODE_CONFIGURATION / BODY
---
---  DESCRIPTION:
---
---  This package is the specification for the subpackage
---  which will define the per node configuration parameters.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-
-separate ( MPTEST )
-
-package body PER_NODE_CONFIGURATION is
-
---PAGE
---
---  LOCAL_NODE_NUMBER
---
-
-   function LOCAL_NODE_NUMBER 
-   return RTEMS.UNSIGNED32 is
-   begin
-
-      return 2;
-
-   end LOCAL_NODE_NUMBER;
-
-end PER_NODE_CONFIGURATION;
diff --git a/c/src/ada-tests/mptests/mp13/mptest.adb b/c/src/ada-tests/mptests/mp13/mptest.adb
deleted file mode 100644
index 33aebf6cd8..0000000000
--- a/c/src/ada-tests/mptests/mp13/mptest.adb
+++ /dev/null
@@ -1,328 +0,0 @@
---
---  MPTEST / BODY
---
---  DESCRIPTION:
---
---  This package is the implementation for Test 13 of the RTEMS
---  Multiprocessor Test Suite.
---
---  DEPENDENCIES:
---
---
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with INTERFACES; use INTERFACES;
-with RTEMS;
-with TEST_SUPPORT;
-with TEXT_IO;
-with UNSIGNED32_IO;
-
-package body MPTEST is
-
-   package body PER_NODE_CONFIGURATION is separate;
-
---PAGE
---
---  INIT
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT( "*** TEST 13 -- NODE " );
-      UNSIGNED32_IO.PUT(
-         MPTEST.MULTIPROCESSING_CONFIGURATION.NODE,
-         WIDTH => 1
-      );
-      TEXT_IO.PUT_LINE( " ***" );
-
-      MPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME(  '1', '1', '1', ' ' );
-      MPTEST.TASK_NAME( 2 ) := RTEMS.BUILD_NAME(  '2', '2', '2', ' ' );
-
-      MPTEST.QUEUE_NAME( 1 ) := RTEMS.BUILD_NAME(  'M', 'S', 'G', ' ' );
-
-      MPTEST.SEMAPHORE_NAME( 1 ) := RTEMS.BUILD_NAME(  'S', 'E', 'M', ' ' );
-
-      if MPTEST.MULTIPROCESSING_CONFIGURATION.NODE = 1 then
-
-         TEXT_IO.PUT_LINE( "Creating Message Queue (Global)" );
-         RTEMS.MESSAGE_QUEUE_CREATE(
-            MPTEST.QUEUE_NAME( 1 ),
-            3,
-            RTEMS.GLOBAL + RTEMS.LIMIT,
-            MPTEST.QUEUE_ID( 1 ),
-            STATUS
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_CREATE" );
-
-         TEXT_IO.PUT_LINE( "Creating Semaphore (Global)" );
-         RTEMS.SEMAPHORE_CREATE(
-            MPTEST.SEMAPHORE_NAME( 1 ),
-            1,
-            RTEMS.GLOBAL + RTEMS.PRIORITY,
-            MPTEST.SEMAPHORE_ID( 1 ),
-            STATUS
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_CREATE" );
-
-         RTEMS.SEMAPHORE_OBTAIN(
-            MPTEST.SEMAPHORE_ID( 1 ),
-            RTEMS.DEFAULT_OPTIONS,
-            RTEMS.NO_TIMEOUT,
-            STATUS
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_OBTAIN" );
-
-      end if;
-
-      TEXT_IO.PUT_LINE( "Creating Test_task 1 (local)" );
-         RTEMS.TASK_CREATE(
-         MPTEST.TASK_NAME( 1 ),
-         1,
-         2048,
-         RTEMS.TIMESLICE,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         MPTEST.TASK_ID( 1 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE" );
-
-      TEXT_IO.PUT_LINE( "Starting Test_task 1 (local)" );
-      RTEMS.TASK_START(
-         MPTEST.TASK_ID( 1 ),
-         MPTEST.TEST_TASK_1'ACCESS,
-         0,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START" );
-
-      TEXT_IO.PUT_LINE( "Creating Test_task 2 (local)" );
-      RTEMS.TASK_CREATE(
-         MPTEST.TASK_NAME( 2 ),
-         1,
-         2048,
-         RTEMS.TIMESLICE,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         MPTEST.TASK_ID( 2 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE" );
-
-      TEXT_IO.PUT_LINE( "Starting Test_task 2 (local)" );
-      RTEMS.TASK_START(
-         MPTEST.TASK_ID( 2 ),
-         MPTEST.TEST_TASK_2'ACCESS,
-         0,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START" );
-
-      if MPTEST.MULTIPROCESSING_CONFIGURATION.NODE = 1 then
-
-         RTEMS.TASK_WAKE_AFTER( 5 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
-
-         TEXT_IO.PUT_LINE( "*** END OF TEST 13 ***" );
-
-         RTEMS.SHUTDOWN_EXECUTIVE( 0 );
-
-      end if;
-
-      TEXT_IO.PUT_LINE( "Deleting initialization task" );
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
-
-   end INIT;
-
---PAGE
---
---  TEST_TASK_1
---
-
-   procedure TEST_TASK_1 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      COUNT               : RTEMS.UNSIGNED32;
-      RECEIVE_BUFFER_AREA : RTEMS.BUFFER;
-      RECEIVE_BUFFER      : RTEMS.BUFFER_POINTER;
-      STATUS              : RTEMS.STATUS_CODES;
-   begin
-
-      RECEIVE_BUFFER :=
-         RTEMS.TO_BUFFER_POINTER( RECEIVE_BUFFER_AREA'ADDRESS );
-
-      TEXT_IO.PUT_LINE( "Getting QID of message queue" );
-
-      loop
-
-         RTEMS.MESSAGE_QUEUE_IDENT(
-            MPTEST.QUEUE_NAME( 1 ),
-            RTEMS.SEARCH_ALL_NODES,
-            MPTEST.QUEUE_ID( 1 ),
-            STATUS
-         );
-
-         exit when RTEMS.IS_STATUS_SUCCESSFUL( STATUS );
-
-      end loop;
-
-      if MPTEST.MULTIPROCESSING_CONFIGURATION.NODE = 1 then
-
-         TEXT_IO.PUT_LINE( "Receiving message ..." );
-         RTEMS.MESSAGE_QUEUE_RECEIVE(
-            MPTEST.QUEUE_ID( 1 ),
-            RECEIVE_BUFFER,
-            RTEMS.DEFAULT_OPTIONS,
-            RTEMS.NO_TIMEOUT,
-            STATUS
-         );
-         TEXT_IO.PUT_LINE( "How did I get back from here???" );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_RECEIVE" );
-
-      end if;
-
-      RTEMS.TASK_WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
-
-      TEXT_IO.PUT_LINE( "Receiving message ..." );
-      RTEMS.MESSAGE_QUEUE_RECEIVE(
-         MPTEST.QUEUE_ID( 1 ),
-         RECEIVE_BUFFER,
-         RTEMS.DEFAULT_OPTIONS,
-         2 * TEST_SUPPORT.TICKS_PER_SECOND,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.TIMEOUT,
-         "MESSAGE_QUEUE_RECEIVE"
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.TIMEOUT,
-         "MESSAGE_QUEUE_OBTAIN"
-      );
-
-      TEXT_IO.PUT_LINE(
-         "message_queue_receive correctly returned TIMEOUT"
-      );
-
-      TEXT_IO.PUT_LINE( "Deleting self" );
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
-
-   end TEST_TASK_1;
-
---PAGE
---
---  TEST_TASK_2
---
-
-   procedure TEST_TASK_2 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.PUT_LINE( "Getting SMID of semaphore" );
-
-      loop
-
-         RTEMS.SEMAPHORE_IDENT(
-            MPTEST.SEMAPHORE_NAME( 1 ),
-            RTEMS.SEARCH_ALL_NODES,
-            MPTEST.SEMAPHORE_ID( 1 ),
-            STATUS
-         );
-
-         exit when RTEMS.IS_STATUS_SUCCESSFUL( STATUS );
-
-      end loop;
-
-      if MPTEST.MULTIPROCESSING_CONFIGURATION.NODE = 1 then
-
-         RTEMS.TASK_WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
-
-         TEXT_IO.PUT_LINE( "Releasing semaphore ..." );
-         RTEMS.SEMAPHORE_RELEASE( MPTEST.SEMAPHORE_ID( 1 ), STATUS );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_RELEASE" );
-
-         RTEMS.TASK_WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND / 2, STATUS );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
-
-         TEXT_IO.PUT_LINE( "Getting semaphore ..." );
-         RTEMS.SEMAPHORE_OBTAIN(
-            MPTEST.SEMAPHORE_ID( 1 ),
-            RTEMS.DEFAULT_OPTIONS,
-            RTEMS.NO_TIMEOUT,
-            STATUS
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_OBTAIN" );
-
-         TEXT_IO.PUT_LINE( "Getting semaphore ..." );
-         RTEMS.SEMAPHORE_OBTAIN(
-            MPTEST.SEMAPHORE_ID( 1 ),
-            RTEMS.DEFAULT_OPTIONS,
-            RTEMS.NO_TIMEOUT,
-            STATUS
-         );
-         TEXT_IO.PUT_LINE( "How did I get back from here???" );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_OBTAIN" );
-
-      end if;
-
-      RTEMS.TASK_WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND / 2, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
-
-      TEXT_IO.PUT_LINE( "Getting semaphore ..." );
-      RTEMS.SEMAPHORE_OBTAIN(
-         MPTEST.SEMAPHORE_ID( 1 ),
-         RTEMS.DEFAULT_OPTIONS,
-         RTEMS.NO_TIMEOUT,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_OBTAIN" );
-
-      TEXT_IO.PUT_LINE( "Releasing semaphore ..." );
-      RTEMS.SEMAPHORE_RELEASE( MPTEST.SEMAPHORE_ID( 1 ), STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_RELEASE" );
-
-      RTEMS.TASK_WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
-
-      TEXT_IO.PUT_LINE( "Getting semaphore ..." );
-      RTEMS.SEMAPHORE_OBTAIN(
-         MPTEST.SEMAPHORE_ID( 1 ),
-         RTEMS.DEFAULT_OPTIONS,
-         2 * TEST_SUPPORT.TICKS_PER_SECOND,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.TIMEOUT,
-         "SEMAPHORE_OBTAIN"
-      );
-      TEXT_IO.PUT_LINE( "semaphore_obtain correctly returned TIMEOUT" );
-
-      TEXT_IO.PUT_LINE( "*** END OF TEST 13 ***" );
-
-      RTEMS.SHUTDOWN_EXECUTIVE( 0 );
-
-   end TEST_TASK_2;
-
-end MPTEST;
diff --git a/c/src/ada-tests/mptests/mp13/mptest.ads b/c/src/ada-tests/mptests/mp13/mptest.ads
deleted file mode 100644
index 1575c5adeb..0000000000
--- a/c/src/ada-tests/mptests/mp13/mptest.ads
+++ /dev/null
@@ -1,206 +0,0 @@
---
---  MPTEST / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package is the specification for Test 13 of the RTEMS
---  Multiprocessor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with BSP_MPCI;
-with RTEMS;
-
-package MPTEST is
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS tasks created
---  by this test.
---
-
-   TASK_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.ID;
-   TASK_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.NAME;
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS message 
---  queues created by this test.
---
-
-   QUEUE_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 2 ) of RTEMS.ID;
-   QUEUE_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 2 ) of RTEMS.NAME;
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS semaphore
---  created by this test.
---
-
-   SEMAPHORE_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 2 ) of RTEMS.ID;
-   SEMAPHORE_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 2 ) of RTEMS.NAME;
-
---
---  This variable contains the ID of the remote task with which this
---  test interacts.
---
-
-   REMOTE_TID  : RTEMS.ID;
-
---
---  This variable contains the node on which the remote task with which 
---  this test interacts resides.
---
-
-   REMOTE_NODE : RTEMS.UNSIGNED32;
-
---
---  INIT
---
---  DESCRIPTION:
---
---  This RTEMS task initializes the application.
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TEST_TASK_1
---
---  DESCRIPTION:
---
---  This is the body of one of the RTEMS tasks which constitute this test.
---
-
-   procedure TEST_TASK_1 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TEST_TASK_2  
---
---  DESCRIPTION: 
---
---  This is the body of one of the RTEMS tasks which constitute this test.
---
- 
-   procedure TEST_TASK_2 ( 
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  This is the Driver Address Table for this test.
---
-
-   DEVICE_DRIVERS : aliased RTEMS.DRIVER_ADDRESS_TABLE( 1 .. 1 ) :=
-   (1=>
-      (
-        CLOCK_DRIVER.INITIALIZE'ACCESS,              -- Initialization
-        RTEMS.NO_DRIVER_ENTRY,                       -- Open
-        RTEMS.NO_DRIVER_ENTRY,                       -- Close
-        RTEMS.NO_DRIVER_ENTRY,                       -- Read
-        RTEMS.NO_DRIVER_ENTRY,                       -- Write
-        RTEMS.NO_DRIVER_ENTRY                        -- Control
-      )
-   );
-
---
---  This is the Initialization Tasks Table for this test.
---
-
-   INITIALIZATION_TASKS : aliased RTEMS.INITIALIZATION_TASKS_TABLE( 1 .. 1 ) := 
-   (1=>
-     (
-       RTEMS.BUILD_NAME( 'U', 'I', '1', ' ' ),        -- task name
-       2048,                                          -- stack size
-       1,                                             -- priority
-       RTEMS.DEFAULT_ATTRIBUTES,                      -- attributes
-       MPTEST.INIT'ACCESS,                            -- entry point
-       RTEMS.NO_PREEMPT,                              -- initial mode
-       0                                              -- argument list
-     )
-   );
-
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
---                             BEGIN SUBPACKAGE                           --
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
-
-   --
-   --  MPTEST.PER_NODE_CONFIGURATION / SPECIFICATION
-   --
-   --  DESCRIPTION:
-   --
-   --  This package is the specification for the subpackage
-   --  which will define the per node configuration parameters.
-   --
-   
-   package PER_NODE_CONFIGURATION is
-
-   --
-   --  LOCAL_NODE_NUMBER
-   --
-   --  DESCRIPTION:
-   --
-   --  This function returns the node number for this node.
-   --
-
-      function LOCAL_NODE_NUMBER 
-      return RTEMS.UNSIGNED32;
-  
-      pragma INLINE ( LOCAL_NODE_NUMBER );
-
-   end PER_NODE_CONFIGURATION;
-  
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
---                              END SUBPACKAGE                            --
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
-
---
---  This is the Multiprocessor Configuration Table for this test.
---
-
-   MULTIPROCESSING_CONFIGURATION : aliased RTEMS.MULTIPROCESSING_TABLE := (
-      MPTEST.PER_NODE_CONFIGURATION.LOCAL_NODE_NUMBER,
-      2,                         -- maximum # nodes in system 
-      32,                        -- maximum # global objects
-      32                         -- maximum # proxies
-    );
-
---
---  This is the Configuration Table for this test.
---
-
-   CONFIGURATION : aliased RTEMS.CONFIGURATION_TABLE := (
-      RTEMS.NULL_ADDRESS,        -- will be replaced by BSP
-      64 * 1024,                 -- executive RAM size
-      10,                        -- maximum # tasks
-      0,                         -- maximum # timers
-      1,                         -- maximum # semaphores
-      1,                         -- maximum # message queues
-      0,                         -- maximum # messages
-      0,                         -- maximum # partitions
-      0,                         -- maximum # regions
-      0,                         -- maximum # dp memory areas
-      0,                         -- maximum # periods
-      0,                         -- maximum # user extensions
-      RTEMS.MILLISECONDS_TO_MICROSECONDS(10), -- # us in a tick
-      50                         -- # ticks in a timeslice
-  );
-
-end MPTEST;
diff --git a/c/src/ada-tests/mptests/mp13/node1/mp13.scn b/c/src/ada-tests/mptests/mp13/node1/mp13.scn
deleted file mode 100644
index d3bd11f65e..0000000000
--- a/c/src/ada-tests/mptests/mp13/node1/mp13.scn
+++ /dev/null
@@ -1,14 +0,0 @@
-*** TEST 13 -- NODE 1 ***
-Creating Message Queue (Global)
-Creating Semaphore (Global)
-Creating Test_task 1 (local)
-Starting Test_task 1 (local)
-Creating Test_task 2 (local)
-Starting Test_task 2 (local)
-Getting QID of message queue
-Receiving message ...
-Getting SMID of semaphore
-Releasing semaphore ...
-Getting semaphore ...
-Getting semaphore ...
-*** END OF TEST 13 ***
diff --git a/c/src/ada-tests/mptests/mp13/node1/mptest-per_node_configuration.adb b/c/src/ada-tests/mptests/mp13/node1/mptest-per_node_configuration.adb
deleted file mode 100644
index 7df5087537..0000000000
--- a/c/src/ada-tests/mptests/mp13/node1/mptest-per_node_configuration.adb
+++ /dev/null
@@ -1,43 +0,0 @@
---
---  MPTEST.PER_NODE_CONFIGURATION / BODY
---
---  DESCRIPTION:
---
---  This package is the specification for the subpackage
---  which will define the per node configuration parameters.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-
-separate ( MPTEST )
-
-package body PER_NODE_CONFIGURATION is
-
---PAGE
---
---  LOCAL_NODE_NUMBER
---
-
-   function LOCAL_NODE_NUMBER 
-   return RTEMS.UNSIGNED32 is
-   begin
-
-      return 1;
-
-   end LOCAL_NODE_NUMBER;
-
-end PER_NODE_CONFIGURATION;
diff --git a/c/src/ada-tests/mptests/mp13/node2/mp13.scn b/c/src/ada-tests/mptests/mp13/node2/mp13.scn
deleted file mode 100644
index 3254046292..0000000000
--- a/c/src/ada-tests/mptests/mp13/node2/mp13.scn
+++ /dev/null
@@ -1,16 +0,0 @@
-*** TEST 13 -- NODE 2 ***
-Creating Test_task 1 (local)
-Starting Test_task 1 (local)
-Creating Test_task 2 (local)
-Starting Test_task 2 (local)
-Deleting initialization task
-Getting QID of message queue
-Getting SMID of semaphore
-Getting semaphore ...
-Releasing semaphore ...
-Receiving message ...
-Getting semaphore ...
-message_queue_receive correctly returned TIMEOUT
-Deleting self
-semaphore_obtain correctly returned TIMEOUT
-*** END OF TEST 13 ***
diff --git a/c/src/ada-tests/mptests/mp13/node2/mptest-per_node_configuration.adb b/c/src/ada-tests/mptests/mp13/node2/mptest-per_node_configuration.adb
deleted file mode 100644
index e127cc5573..0000000000
--- a/c/src/ada-tests/mptests/mp13/node2/mptest-per_node_configuration.adb
+++ /dev/null
@@ -1,43 +0,0 @@
---
---  MPTEST.PER_NODE_CONFIGURATION / BODY
---
---  DESCRIPTION:
---
---  This package is the specification for the subpackage
---  which will define the per node configuration parameters.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-
-separate ( MPTEST )
-
-package body PER_NODE_CONFIGURATION is
-
---PAGE
---
---  LOCAL_NODE_NUMBER
---
-
-   function LOCAL_NODE_NUMBER 
-   return RTEMS.UNSIGNED32 is
-   begin
-
-      return 2;
-
-   end LOCAL_NODE_NUMBER;
-
-end PER_NODE_CONFIGURATION;
diff --git a/c/src/ada-tests/mptests/mp14/mptest.adb b/c/src/ada-tests/mptests/mp14/mptest.adb
deleted file mode 100644
index e43aec8ae5..0000000000
--- a/c/src/ada-tests/mptests/mp14/mptest.adb
+++ /dev/null
@@ -1,764 +0,0 @@
---
---  MPTEST / BODY
---
---  DESCRIPTION:
---
---  This package is the implementation for Test 14 of the RTEMS
---  Multiprocessor Test Suite.
---
---  DEPENDENCIES:
---
---
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with INTERFACES; use INTERFACES;
-with BSP;
-with BSP_MPCI;
-with RTEMS;
-with TEST_SUPPORT;
-with TEXT_IO;
-with UNSIGNED32_IO;
-
-package body MPTEST is
-
-   package body PER_NODE_CONFIGURATION is separate;
-
---PAGE
---
---  STOP_TEST_TSR
---
- 
-   procedure STOP_TEST_TSR (
-      IGNORED_ID      : in     RTEMS.ID;
-      IGNORED_ADDRESS : in     RTEMS.ADDRESS
-   ) is
-   begin
- 
-      MPTEST.STOP_TEST := TRUE;
- 
-   end STOP_TEST_TSR;
- 
---PAGE
---
---  EXIT_TEST
---
- 
-   procedure EXIT_TEST is
-      OLD_MODE : RTEMS.MODE;
-      STATUS   : RTEMS.STATUS_CODES;
-   begin
- 
-      RTEMS.TASK_MODE( RTEMS.NO_PREEMPT, RTEMS.PREEMPT_MASK, OLD_MODE, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_MODE" );
-
-      BSP_MPCI.PRINT_STATISTICS;
-
-      RTEMS.SHUTDOWN_EXECUTIVE( 0 );
- 
-   end EXIT_TEST;
- 
---PAGE
---
---  INIT
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      INDEX             : RTEMS.UNSIGNED32;
-      STATUS            : RTEMS.STATUS_CODES;
-      PREVIOUS_PRIORITY : RTEMS.TASK_PRIORITY;
-   begin
-
-      TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT( "*** TEST 14 -- NODE " );
-      UNSIGNED32_IO.PUT(
-         MPTEST.MULTIPROCESSING_CONFIGURATION.NODE,
-         WIDTH => 1
-      );
-      TEXT_IO.PUT_LINE( " ***" );
-
-      MPTEST.STOP_TIMER_NAME := RTEMS.BUILD_NAME( 'S', 'T', 'O', 'P' );
-
-      MPTEST.STOP_TEST := FALSE;
-
-      RTEMS.TIMER_CREATE(
-         MPTEST.STOP_TIMER_NAME,
-         MPTEST.STOP_TIMER_ID,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_CREATE" );
-
-      RTEMS.TIMER_FIRE_AFTER(
-         MPTEST.STOP_TIMER_ID,
-         BSP.MAXIMUM_LONG_TEST_DURATION * TEST_SUPPORT.TICKS_PER_SECOND,
-         MPTEST.STOP_TEST_TSR'ACCESS,
-         RTEMS.NULL_ADDRESS,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_FIRE_AFTER" );
- 
-      MPTEST.EVENT_TASK_NAME( 1 ) := RTEMS.BUILD_NAME(  '1', '1', '1', ' ' );
-      MPTEST.EVENT_TASK_NAME( 2 ) := RTEMS.BUILD_NAME(  '2', '2', '2', ' ' );
-
-      MPTEST.QUEUE_TASK_NAME( 1 ) := RTEMS.BUILD_NAME(  'M', 'T', '1', ' ' );
-      MPTEST.QUEUE_TASK_NAME( 2 ) := RTEMS.BUILD_NAME(  'M', 'T', '2', ' ' );
-
-      MPTEST.PARTITION_TASK_NAME( 1 ) := 
-         RTEMS.BUILD_NAME(  'P', 'T', '1', ' ' );
-      MPTEST.PARTITION_TASK_NAME( 2 ) := 
-         RTEMS.BUILD_NAME(  'P', 'T', '2', ' ' );
-
-      MPTEST.SEMAPHORE_TASK_NAME( 1 ) := 
-         RTEMS.BUILD_NAME(  'S', 'M', '1', ' ' );
-      MPTEST.SEMAPHORE_TASK_NAME( 2 ) := 
-         RTEMS.BUILD_NAME(  'S', 'M', '2', ' ' );
-
-      MPTEST.SEMAPHORE_NAME( 1 ) := RTEMS.BUILD_NAME(  'S', 'E', 'M', ' ' );
-
-      MPTEST.QUEUE_NAME( 1 ) := RTEMS.BUILD_NAME(  'M', 'S', 'G', ' ' );
-
-      MPTEST.PARTITION_NAME( 1 ) := RTEMS.BUILD_NAME(  'P', 'A', 'R', ' ' );
-
-      MPTEST.TIMER_NAME( 1 ) := RTEMS.BUILD_NAME(  'T', 'M', 'R', ' ' );
-
-      for INDEX in MPTEST.BUFFERS'FIRST .. MPTEST.BUFFERS'LAST
-      loop
-
-         MPTEST.BUFFERS( INDEX ) :=
-            RTEMS.TO_BUFFER_POINTER( MPTEST.BUFFER_AREAS( INDEX )'ADDRESS );
-
-      end loop;
-
-      if MPTEST.MULTIPROCESSING_CONFIGURATION.NODE = 1 then
-
-         TEXT_IO.PUT_LINE( "Creating Semaphore (Global)" );
-         RTEMS.SEMAPHORE_CREATE(
-            MPTEST.SEMAPHORE_NAME( 1 ),
-            1,
-            RTEMS.GLOBAL,
-            MPTEST.SEMAPHORE_ID( 1 ),
-            STATUS
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_CREATE" );
-
-         TEXT_IO.PUT_LINE( "Creating Message Queue (Global)" );
-         RTEMS.MESSAGE_QUEUE_CREATE(
-            MPTEST.QUEUE_NAME( 1 ),
-            1,
-            RTEMS.GLOBAL,
-            MPTEST.QUEUE_ID( 1 ),
-            STATUS
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_CREATE" );
-
-         TEXT_IO.PUT_LINE( "Creating Partition (Global)" );
-         RTEMS.PARTITION_CREATE(
-            MPTEST.PARTITION_NAME( 1 ),
-            MPTEST.PARTITION_AREA( 0 )'ADDRESS,
-            16#8000#,
-            16#3000#,
-            RTEMS.GLOBAL,
-            MPTEST.PARTITION_ID( 1 ),
-            STATUS
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "PARTITION_CREATE" );
-
-      end if;
-
-      TEXT_IO.PUT_LINE( "Creating Event task (Global)" );
-      RTEMS.TASK_CREATE(
-         MPTEST.EVENT_TASK_NAME(
-            MPTEST.MULTIPROCESSING_CONFIGURATION.NODE
-         ),
-         2,
-         2048,
-         RTEMS.TIMESLICE,
-         RTEMS.GLOBAL,
-         MPTEST.EVENT_TASK_ID( 1 ),
-         STATUS
-      ); 
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE" );
-
-      TEXT_IO.PUT_LINE( "Starting Event task (Global)" );
-      RTEMS.TASK_START(
-         MPTEST.EVENT_TASK_ID( 1 ),
-         MPTEST.TEST_TASK'ACCESS,
-         0,
-         STATUS
-      ); 
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START" );
-
-      TEXT_IO.PUT_LINE( "Creating Semaphore task (Global)" );
-      RTEMS.TASK_CREATE(
-         MPTEST.SEMAPHORE_TASK_NAME(
-            MPTEST.MULTIPROCESSING_CONFIGURATION.NODE
-         ),
-         2,
-         2048,
-         RTEMS.TIMESLICE,
-         RTEMS.GLOBAL,
-         MPTEST.SEMAPHORE_TASK_ID( 1 ),
-         STATUS
-      ); 
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE" );
-
-      TEXT_IO.PUT_LINE( "Starting Semaphore task (Global)" );
-      RTEMS.TASK_START(
-         MPTEST.SEMAPHORE_TASK_ID( 1 ),
-         MPTEST.SEMAPHORE_TASK'ACCESS,
-         0,
-         STATUS
-      ); 
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START" );
-
-      TEXT_IO.PUT_LINE( "Creating Message Queue task (Global)" );
-      RTEMS.TASK_CREATE(
-         MPTEST.QUEUE_TASK_NAME(
-            MPTEST.MULTIPROCESSING_CONFIGURATION.NODE
-         ),
-         2,
-         2048,
-         RTEMS.TIMESLICE,
-         RTEMS.GLOBAL,
-         MPTEST.QUEUE_TASK_ID( 1 ),
-         STATUS
-      ); 
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE" );
-
-      TEXT_IO.PUT_LINE( "Starting Message Queue task (Global)" );
-      RTEMS.TASK_START(
-         MPTEST.QUEUE_TASK_ID( 1 ),
-         MPTEST.MESSAGE_QUEUE_TASK'ACCESS,
-         1,                          -- index of buffer
-         STATUS
-      ); 
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START" );
-
-      TEXT_IO.PUT_LINE( "Creating Partition task (Global)" );
-      RTEMS.TASK_CREATE(
-         MPTEST.PARTITION_TASK_NAME(
-            MPTEST.MULTIPROCESSING_CONFIGURATION.NODE 
-         ),
-         2,
-         2048,
-         RTEMS.TIMESLICE,
-         RTEMS.GLOBAL,
-         MPTEST.PARTITION_TASK_ID( 1 ),
-         STATUS
-      ); 
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE" );
-
-      TEXT_IO.PUT_LINE( "Starting Partition task (Global)" );
-      RTEMS.TASK_START(
-         MPTEST.PARTITION_TASK_ID( 1 ),
-         MPTEST.PARTITION_TASK'ACCESS,
-         0,
-         STATUS
-      ); 
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START" );
-    
-      RTEMS.TASK_SET_PRIORITY( RTEMS.SELF, 2, PREVIOUS_PRIORITY, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SET_PRIORITY" );
-
-      MPTEST.DELAYED_EVENTS_TASK( 1 );
-
-   end INIT;
-
---
---  DELAYED_SEND_EVENT
---
---  DESCRIPTION:
---
---  This subprogram is a timer service routine which sends an
---  event set to a waiting task.
---
-
-   procedure DELAYED_SEND_EVENT (
-      TIMER_ID        : in     RTEMS.ID;
-      IGNORED_ADDRESS : in     RTEMS.ADDRESS
-   ) is
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      RTEMS.EVENT_SEND(
-         MPTEST.TASK_ID( RTEMS.GET_INDEX( TIMER_ID ) ),
-         RTEMS.EVENT_16,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "EVENT_SEND" );
-
-   end DELAYED_SEND_EVENT;
- 
---
---  TEST_TASK
---
---  DESCRIPTION:
---
---  This is one of the test tasks.
---
- 
-   procedure TEST_TASK ( 
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      REMOTE_NODE : RTEMS.UNSIGNED32;
-      REMOTE_TID  : RTEMS.ID;
-      COUNT       : RTEMS.UNSIGNED32;
-      EVENT_OUT   : RTEMS.EVENT_SET;
-      STATUS      : RTEMS.STATUS_CODES;
-   begin
-
-      if MPTEST.MULTIPROCESSING_CONFIGURATION.NODE = 1 then
-         REMOTE_NODE := 2;
-      else
-         REMOTE_NODE := 1;
-      end if;
-
-      TEXT_IO.PUT_LINE( "About to go to sleep!" );
-      RTEMS.TASK_WAKE_AFTER( 1 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
-      TEXT_IO.PUT_LINE( "Waking up!" );
- 
-      TEXT_IO.PUT( "Remote task's name is : " );
-      TEST_SUPPORT.PUT_NAME( MPTEST.EVENT_TASK_NAME( REMOTE_NODE ), TRUE );
-
-      TEXT_IO.PUT_LINE( "Getting TID of remote task" );
-
-      loop
-
-         RTEMS.TASK_IDENT(
-            MPTEST.EVENT_TASK_NAME( REMOTE_NODE ),
-            RTEMS.SEARCH_ALL_NODES,
-            REMOTE_TID,
-            STATUS
-         ); 
-
-         exit when RTEMS.IS_STATUS_SUCCESSFUL( STATUS );
-
-         TEXT_IO.PUT_LINE( "task_ident" );
-
-      end loop;
-
-      if MPTEST.MULTIPROCESSING_CONFIGURATION.NODE = 1 then
-         TEXT_IO.PUT_LINE( "Sending events to remote task" );
-
-         loop
-            exit when MPTEST.STOP_TEST = TRUE;
-
-            for COUNT in 1 .. MPTEST.EVENT_TASK_DOT_COUNT
-            loop
-               RTEMS.EVENT_SEND(
-                  REMOTE_TID,
-                  RTEMS.EVENT_16,
-                  STATUS
-               );
-               TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "EVENT_SEND" );
-
-               exit when MPTEST.STOP_TEST = TRUE;
-
-            end loop;
-
-            TEST_SUPPORT.PUT_DOT( "e" );
-  
-         end loop;
-
-      end if;
-          
-      TEXT_IO.PUT_LINE( "Receiving events from remote task" );
-
-      loop
-         exit when MPTEST.STOP_TEST = TRUE;
-
-         for COUNT in 1 .. MPTEST.EVENT_TASK_DOT_COUNT 
-         loop 
-            exit when MPTEST.STOP_TEST = TRUE;
-
-            RTEMS.EVENT_RECEIVE(
-               RTEMS.EVENT_16,
-               RTEMS.DEFAULT_OPTIONS,
-               RTEMS.NO_TIMEOUT,
-               EVENT_OUT,
-               STATUS 
-            );   
-            TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "EVENT_RECEIVE" );
-
-         end loop;
- 
-         TEST_SUPPORT.PUT_DOT( "e" );
- 
-      end loop;
-
-      MPTEST.EXIT_TEST;
- 
-   end TEST_TASK;
- 
--- 
---  DELAYED_EVENTS_TASK 
--- 
---  DESCRIPTION: 
--- 
---  This is one of the test tasks. 
--- 
-  
-   procedure DELAYED_EVENTS_TASK (  
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT 
-   ) is
-      COUNT         : RTEMS.UNSIGNED32;
-      PREVIOUS_MODE : RTEMS.MODE;
-      EVENTS_OUT    : RTEMS.EVENT_SET;
-      STATUS        : RTEMS.STATUS_CODES;
-   begin
-
-      RTEMS.TASK_MODE(
-         RTEMS.PREEMPT + RTEMS.TIMESLICE,
-         RTEMS.PREEMPT_MASK + RTEMS.TIMESLICE_MASK,
-         PREVIOUS_MODE,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_MODE" );
- 
-      RTEMS.TIMER_CREATE(
-         MPTEST.TIMER_NAME( 1 ),
-         MPTEST.TIMER_ID( 1 ),
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_CREATE" );
-
-      RTEMS.TASK_IDENT(
-         RTEMS.SELF,
-         RTEMS.SEARCH_ALL_NODES,
-         MPTEST.TASK_ID( RTEMS.GET_INDEX( MPTEST.TIMER_ID( 1 ) ) ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_IDENTS" );
-
-      loop
-
-         for COUNT in 1 .. MPTEST.DELAYED_EVENT_DOT_COUNT 
-         loop 
-            RTEMS.TIMER_FIRE_AFTER(
-               MPTEST.TIMER_ID( 1 ),
-               1,
-               MPTEST.DELAYED_SEND_EVENT'ACCESS,
-               RTEMS.NULL_ADDRESS,
-               STATUS 
-            );
-            TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_FIRE_AFTER" );
-
-            RTEMS.EVENT_RECEIVE(
-               RTEMS.EVENT_16,
-               RTEMS.DEFAULT_OPTIONS,
-               RTEMS.NO_TIMEOUT,
-               EVENTS_OUT,
-               STATUS 
-            );   
-            TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "EVENT_RECEIVE" );
-
-         end loop;
- 
-         TEST_SUPPORT.PUT_DOT( "." );
- 
-      end loop;
- 
-      MPTEST.EXIT_TEST;
-      
-   end DELAYED_EVENTS_TASK; 
- 
--- 
---  MESSAGE_QUEUE_TASK 
--- 
---  DESCRIPTION: 
--- 
---  This is one of the test tasks. 
--- 
-  
-   procedure MESSAGE_QUEUE_TASK (  
-      INDEX : in     RTEMS.TASK_ARGUMENT 
-   ) is
-      COUNT          : RTEMS.UNSIGNED32;
-      YIELD_COUNT    : RTEMS.UNSIGNED32;
-      OVERFLOW_COUNT : RTEMS.UNSIGNED32_POINTER;
-      BUFFER_COUNT   : RTEMS.UNSIGNED32_POINTER;
-      STATUS         : RTEMS.STATUS_CODES;
-   begin
-
-      MPTEST.BUFFERS( INDEX ).FIELD1 := 0;
-      MPTEST.BUFFERS( INDEX ).FIELD2 := 0;
-      MPTEST.BUFFERS( INDEX ).FIELD3 := 0;
-      MPTEST.BUFFERS( INDEX ).FIELD4 := 0;
-
-      TEXT_IO.PUT_LINE( "Getting ID of message queue" );
-
-      loop
-
-         RTEMS.MESSAGE_QUEUE_IDENT(
-            MPTEST.QUEUE_NAME( 1 ),
-            RTEMS.SEARCH_ALL_NODES,
-            MPTEST.QUEUE_ID( 1 ),
-            STATUS
-         );
-         exit when RTEMS.IS_STATUS_SUCCESSFUL( STATUS );
-
-         TEXT_IO.PUT_LINE( "message_queue_ident FAILED!!" );
-
-      end loop;
-
-      if MPTEST.MULTIPROCESSING_CONFIGURATION.NODE = 1 then
-
-         RTEMS.MESSAGE_QUEUE_SEND(
-            MPTEST.QUEUE_ID( 1 ),
-            MPTEST.BUFFERS( INDEX ),
-            STATUS
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_SEND" );
-
-         OVERFLOW_COUNT := RTEMS.TO_UNSIGNED32_POINTER( 
-                              MPTEST.BUFFERS( INDEX ).FIELD1'ADDRESS
-                           );
-                
-         BUFFER_COUNT := RTEMS.TO_UNSIGNED32_POINTER( 
-                              MPTEST.BUFFERS( INDEX ).FIELD2'ADDRESS
-                           );
-                
-      else
-
-         OVERFLOW_COUNT := RTEMS.TO_UNSIGNED32_POINTER( 
-                              MPTEST.BUFFERS( INDEX ).FIELD3'ADDRESS
-                           );
-                
-         BUFFER_COUNT := RTEMS.TO_UNSIGNED32_POINTER( 
-                              MPTEST.BUFFERS( INDEX ).FIELD4'ADDRESS
-                           );
-
-      end if;
-
-      loop
-
-         exit when MPTEST.STOP_TEST = TRUE;
-
-         YIELD_COUNT := 100;
-
-         for COUNT in 1 .. MPTEST.MESSAGE_DOT_COUNT
-         loop
-
-           exit when MPTEST.STOP_TEST = TRUE;
-
-            RTEMS.MESSAGE_QUEUE_RECEIVE(
-               MPTEST.QUEUE_ID( 1 ),
-               MPTEST.BUFFERS( INDEX ),
-               RTEMS.DEFAULT_OPTIONS,
-               RTEMS.NO_TIMEOUT,
-               STATUS
-            );
-            TEST_SUPPORT.DIRECTIVE_FAILED( 
-               STATUS, 
-               "MESSAGE_QUEUE_RECEIVE" 
-            );
-
-            if BUFFER_COUNT.ALL = RTEMS.UNSIGNED32'LAST then
-               BUFFER_COUNT.ALL   := 0;
-               OVERFLOW_COUNT.ALL := OVERFLOW_COUNT.ALL + 1;
-            else
-               BUFFER_COUNT.ALL := BUFFER_COUNT.ALL + 1;
-            end if;
-
-            RTEMS.MESSAGE_QUEUE_SEND(
-               MPTEST.QUEUE_ID( 1 ),
-               MPTEST.BUFFERS( INDEX ),
-               STATUS
-            );
-            TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_SEND" );
-
-            if MPTEST.STOP_TEST = FALSE then
-               if MPTEST.MULTIPROCESSING_CONFIGURATION.NODE = 1 then
-
-                  YIELD_COUNT := YIELD_COUNT - 1;
-
-                  if YIELD_COUNT = 0 then
-
-                     RTEMS.TASK_WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS );
-                     TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "YIELD" );
-
-                     YIELD_COUNT := 100;
-
-                  end if;
-
-               end if;
-
-            end if;
-         
-         end loop;
-
-         TEST_SUPPORT.PUT_DOT( "m" );
-
-      end loop;
-
-      MPTEST.EXIT_TEST;
-
-   end MESSAGE_QUEUE_TASK;
- 
--- 
---  PARTITION_TASK 
---
---  DESCRIPTION: 
--- 
---  This is one of the test tasks. 
--- 
-  
-   procedure PARTITION_TASK (  
-      IGNORED : in     RTEMS.TASK_ARGUMENT 
-   ) is
-      COUNT  : RTEMS.UNSIGNED32;
-      BUFFER : RTEMS.ADDRESS;
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.PUT_LINE( "Getting ID of partition" );
- 
-      loop
-
-         RTEMS.PARTITION_IDENT(
-            MPTEST.PARTITION_NAME( 1 ),
-            RTEMS.SEARCH_ALL_NODES,
-            MPTEST.PARTITION_ID( 1 ),
-            STATUS
-         );
-         exit when RTEMS.IS_STATUS_SUCCESSFUL( STATUS );
-
-         TEXT_IO.PUT_LINE( "partition_ident FAILED!!" );
-
-      end loop;
-
-      loop
-
-         exit when MPTEST.STOP_TEST = TRUE;
-
-         for COUNT in 1 .. MPTEST.PARTITION_DOT_COUNT
-         loop
-
-            exit when MPTEST.STOP_TEST = TRUE;
-
-            RTEMS.PARTITION_GET_BUFFER(
-               MPTEST.PARTITION_ID( 1 ),
-               BUFFER,
-               STATUS
-            );
-            TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "PARTITION_GET_BUFFER" );
-
-            RTEMS.PARTITION_RETURN_BUFFER(
-               MPTEST.PARTITION_ID( 1 ),
-               BUFFER,
-               STATUS
-            );
-            TEST_SUPPORT.DIRECTIVE_FAILED( 
-               STATUS, 
-               "PARTITION_RETURN_BUFFER" 
-            );
-
-            if MPTEST.MULTIPROCESSING_CONFIGURATION.NODE = 1 then
-
-               RTEMS.TASK_WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS );
-               TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "YIELD" );
-
-            end if;
-
-         end loop;
-
-         TEST_SUPPORT.PUT_DOT( "p" );
-
-      end loop;
-
-      MPTEST.EXIT_TEST;
-
-   end PARTITION_TASK; 
- 
--- 
---  SEMAPHORE_TASK 
--- 
---  DESCRIPTION: 
--- 
---  This is one of the test tasks. 
--- 
-  
-   procedure SEMAPHORE_TASK (  
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT 
-   ) is
-      COUNT          : RTEMS.UNSIGNED32;
-      YIELD_COUNT    : RTEMS.UNSIGNED32;
-      STATUS         : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.PUT_LINE( "Getting ID of semaphore" );
-
-      loop
-
-         RTEMS.SEMAPHORE_IDENT(
-            MPTEST.SEMAPHORE_NAME( 1 ),
-            RTEMS.SEARCH_ALL_NODES,
-            MPTEST.SEMAPHORE_ID( 1 ),
-            STATUS
-         );
-         exit when RTEMS.IS_STATUS_SUCCESSFUL( STATUS );
-
-         TEXT_IO.PUT_LINE( "semaphore_ident FAILED!!" );
-
-      end loop;
-
-      loop
-
-         YIELD_COUNT := 100;
-
-         exit when MPTEST.STOP_TEST = TRUE;
-
-         for COUNT in 1 .. MPTEST.SEMAPHORE_DOT_COUNT
-         loop
-
-            exit when MPTEST.STOP_TEST = TRUE;
-
-            RTEMS.SEMAPHORE_OBTAIN(
-               MPTEST.SEMAPHORE_ID( 1 ),
-               RTEMS.DEFAULT_OPTIONS,
-               RTEMS.NO_TIMEOUT,
-               STATUS
-            );
-            TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_OBTAIN" );
-
-            RTEMS.SEMAPHORE_RELEASE( MPTEST.SEMAPHORE_ID( 1 ), STATUS );
-            TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_RELEASE" );
-
-            if MPTEST.MULTIPROCESSING_CONFIGURATION.NODE = 1 then
-
-               YIELD_COUNT := YIELD_COUNT - 1;
-
-               if YIELD_COUNT = 0 then
-
-                  RTEMS.TASK_WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS );
-                  TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "YIELD" );
-
-                  YIELD_COUNT := 100;
-
-               end if;
-
-            end if;
-         
-         end loop;
-
-         TEST_SUPPORT.PUT_DOT( "s" );
-
-      end loop;
-
-      MPTEST.EXIT_TEST;
-
-   end SEMAPHORE_TASK; 
- 
-end MPTEST;
diff --git a/c/src/ada-tests/mptests/mp14/mptest.ads b/c/src/ada-tests/mptests/mp14/mptest.ads
deleted file mode 100644
index 83786f5fe0..0000000000
--- a/c/src/ada-tests/mptests/mp14/mptest.ads
+++ /dev/null
@@ -1,347 +0,0 @@
---
---  MPTEST / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package is the specification for Test 14 of the RTEMS
---  Multiprocessor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with BSP_MPCI;
-with RTEMS;
-
-package MPTEST is
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS tasks created
---  by this test for passing event sets.
---
-
-   TASK_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 4 ) of RTEMS.ID;
-   TASK_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 4 ) of RTEMS.NAME;
---
---  These arrays contain the IDs and NAMEs of all RTEMS tasks created
---  by this test for passing event sets.
---
-
-   EVENT_TASK_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 4 ) of RTEMS.ID;
-   EVENT_TASK_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 4 ) of RTEMS.NAME;
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS tasks created
---  by this test for manipulating semaphores.
---
-
-   SEMAPHORE_TASK_ID   : 
-      array ( RTEMS.UNSIGNED32 range 1 .. 4 ) of RTEMS.ID;
-   SEMAPHORE_TASK_NAME : 
-      array ( RTEMS.UNSIGNED32 range 1 .. 4 ) of RTEMS.NAME;
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS tasks created
---  by this test for passing messages.
---
-
-   QUEUE_TASK_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 4 ) of RTEMS.ID;
-   QUEUE_TASK_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 4 ) of RTEMS.NAME;
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS tasks created
---  by this test for manipulating the global partitions.
---
-
-   PARTITION_TASK_ID   : 
-      array ( RTEMS.UNSIGNED32 range 1 .. 4 ) of RTEMS.ID;
-   PARTITION_TASK_NAME : 
-      array ( RTEMS.UNSIGNED32 range 1 .. 4 ) of RTEMS.NAME;
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS partitions
---  created by this test.
---
-
-   PARTITION_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 4 ) of RTEMS.ID;
-   PARTITION_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 4 ) of RTEMS.NAME;
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS semaphores
---  created by this test.
---
-
-   SEMAPHORE_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 4 ) of RTEMS.ID;
-   SEMAPHORE_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 4 ) of RTEMS.NAME;
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS message_queues
---  created by this test.
---
-
-   QUEUE_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 4 ) of RTEMS.ID;
-   QUEUE_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 4 ) of RTEMS.NAME;
-
---
---
---  These arrays contain the IDs and NAMEs of all RTEMS timers
---  created by this test.
---
-
-   TIMER_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 4 ) of RTEMS.ID;
-   TIMER_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 4 ) of RTEMS.NAME;
-
---
---  The following are message buffers used to contain the test messages
---  and pointers to those buffers.
---
-
-   BUFFER_AREAS : array (  RTEMS.UNSIGNED32 range 1 .. 4 ) of RTEMS.BUFFER;
-   BUFFERS      : 
-      array (  RTEMS.UNSIGNED32 range 1 .. 4 ) of RTEMS.BUFFER_POINTER;
-
---
---  This is the area used for the partition.
---
-
-   PARTITION_AREA : 
-      array ( RTEMS.UNSIGNED32 range 0 .. 16#7FFF# ) of RTEMS.UNSIGNED8;
-   for PARTITION_AREA'ALIGNMENT use RTEMS.STRUCTURE_ALIGNMENT;
-
---
---  The following constants control the flow of "dot" indicators
---  from the various test componenents.
---
-
-   EVENT_TASK_DOT_COUNT    : constant RTEMS.UNSIGNED32 := 100;
-   EVENT_SEND_DOT_COUNT    : constant RTEMS.UNSIGNED32 := 100;
-   DELAYED_EVENT_DOT_COUNT : constant RTEMS.UNSIGNED32 := 1000;
-   MESSAGE_DOT_COUNT       : constant RTEMS.UNSIGNED32 := 200;
-   PARTITION_DOT_COUNT     : constant RTEMS.UNSIGNED32 := 200;
-   SEMAPHORE_DOT_COUNT     : constant RTEMS.UNSIGNED32 := 200;
-
---
---  These contain the IDs and NAMEs of the RTEMS timers used
---  by this test to stop.
---
- 
-   STOP_TIMER_ID   : RTEMS.ID;
-   STOP_TIMER_NAME : RTEMS.NAME;
- 
---
---  This variable is set when the test should stop executing.
---
-
-   STOP_TEST : RTEMS.BOOLEAN;
- 
---
---  EXIT_TEST
---
---  DESCRIPTION:
---
---  This subprogram is invoked to stop this test.
---
- 
-   procedure EXIT_TEST;
-
---
---  DELAYED_SEND_EVENT
---
---  DESCRIPTION:
---
---  This subprogram is a timer service routine which sends an
---  event set to a waiting task.
---
- 
-   procedure DELAYED_SEND_EVENT (
-      TIMER_ID        : in     RTEMS.ID;
-      IGNORED_ADDRESS : in     RTEMS.ADDRESS 
-   );
-
---
---  INIT
---
---  DESCRIPTION:
---
---  This RTEMS task initializes the application.
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TEST_TASK
---
---  DESCRIPTION:
---
---  This is one of the test tasks.
---
-
-   procedure TEST_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  DELAYED_EVENTS_TASK
---
---  DESCRIPTION:
---
---  This is one of the test tasks.
---
- 
-   procedure DELAYED_EVENTS_TASK ( 
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  MESSAGE_QUEUE_TASK
---
---  DESCRIPTION:
---
---  This is one of the test tasks.
---
- 
-   procedure MESSAGE_QUEUE_TASK ( 
-      INDEX : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  PARTITION_TASK
---
---  DESCRIPTION:
---
---  This is one of the test tasks.
---
- 
-   procedure PARTITION_TASK ( 
-      IGNORED : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  SEMAPHORE_TASK
---
---  DESCRIPTION:
---
---  This is one of the test tasks.
---
- 
-   procedure SEMAPHORE_TASK ( 
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  This is the Driver Address Table for this test.
---
-
-   DEVICE_DRIVERS : aliased RTEMS.DRIVER_ADDRESS_TABLE( 1 .. 1 ) :=
-   (1=>
-      (
-        CLOCK_DRIVER.INITIALIZE'ACCESS,              -- Initialization
-        RTEMS.NO_DRIVER_ENTRY,                       -- Open
-        RTEMS.NO_DRIVER_ENTRY,                       -- Close
-        RTEMS.NO_DRIVER_ENTRY,                       -- Read
-        RTEMS.NO_DRIVER_ENTRY,                       -- Write
-        RTEMS.NO_DRIVER_ENTRY                        -- Control
-      )
-   );
-
---
---  This is the Initialization Tasks Table for this test.
---
-
-   INITIALIZATION_TASKS : aliased RTEMS.INITIALIZATION_TASKS_TABLE( 1 .. 1 ) := 
-   (1=>
-     (
-       RTEMS.BUILD_NAME( 'U', 'I', '1', ' ' ),        -- task name
-       2048,                                          -- stack size
-       1,                                             -- priority
-       RTEMS.DEFAULT_ATTRIBUTES,                      -- attributes
-       MPTEST.INIT'ACCESS,                            -- entry point
-       RTEMS.TIMESLICE,                              -- initial mode
-       0                                              -- argument list
-     )
-   );
-
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
---                             BEGIN SUBPACKAGE                           --
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
-
-   --
-   --  MPTEST.PER_NODE_CONFIGURATION / SPECIFICATION
-   --
-   --  DESCRIPTION:
-   --
-   --  This package is the specification for the subpackage
-   --  which will define the per node configuration parameters.
-   --
-   
-   package PER_NODE_CONFIGURATION is
-
-   --
-   --  LOCAL_NODE_NUMBER
-   --
-   --  DESCRIPTION:
-   --
-   --  This function returns the node number for this node.
-   --
-
-      function LOCAL_NODE_NUMBER 
-      return RTEMS.UNSIGNED32;
-  
-      pragma INLINE ( LOCAL_NODE_NUMBER );
-
-   end PER_NODE_CONFIGURATION;
-  
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
---                              END SUBPACKAGE                            --
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
-
---
---  This is the Multiprocessor Configuration Table for this test.
---
-
-   MULTIPROCESSING_CONFIGURATION : aliased RTEMS.MULTIPROCESSING_TABLE := (
-      MPTEST.PER_NODE_CONFIGURATION.LOCAL_NODE_NUMBER,
-      2,                         -- maximum # nodes in system 
-      32,                        -- maximum # global objects
-      32                         -- maximum # proxies
-    );
-
---
---  This is the Configuration Table for this test.
---
-
-   CONFIGURATION : aliased RTEMS.CONFIGURATION_TABLE := (
-      RTEMS.NULL_ADDRESS,        -- will be replaced by BSP
-      64 * 1024,                 -- executive RAM size
-      10,                        -- maximum # tasks
-      12,                        -- maximum # timers
-      1,                         -- maximum # semaphores
-      1,                         -- maximum # message queues
-      1,                         -- maximum # messages
-      1,                         -- maximum # partitions
-      0,                         -- maximum # regions
-      0,                         -- maximum # dp memory areas
-      0,                         -- maximum # periods
-      0,                         -- maximum # user extensions
-      RTEMS.MILLISECONDS_TO_MICROSECONDS(10), -- # us in a tick
-      1                          -- # ticks in a timeslice
-  );
-
-end MPTEST;
diff --git a/c/src/ada-tests/mptests/mp14/node1/mp14.scn b/c/src/ada-tests/mptests/mp14/node1/mp14.scn
deleted file mode 100644
index d1b6feefe9..0000000000
--- a/c/src/ada-tests/mptests/mp14/node1/mp14.scn
+++ /dev/null
@@ -1,33 +0,0 @@
-*** TEST 14 -- NODE 1 ***
-Creating Semaphore (Global)
-Creating Message Queue (Global)
-Creating Partition (Global)
-Creating Event task (Global)
-Starting  Event task (Global)
-Creating Semaphore task (Global)
-About to go to sleep!
-Starting  Semaphore task (Global)
-Creating Message Queue task (Global)
-Getting SMID of semaphore
-Starting  Message Queue task (Global)
-Creating Partition task (Global)
-Getting ID of msg queue
-Starting  Partition task (Global)
-Getting ID of partition
-Waking up!
-Remote task's name is : 222
-Getting TID of remote task
-Sending events to remote task
-<stream of following characters>
-. - indicates 100 iterations of 
-tm_evafter of 1 tick and event_receive.
-e - indicates that 100 
-events have been sent to the remote task.
-m - indicates 100 iterations of 
-message_queue_send and message_queue_receive.
-p - indicates 100 iterations of 
-partition_get_buffer and partition_return_buffer.
-s - indicates 100 iterations of 
-semaphore_obtain and semaphore_release.
-NOTE: The characters in the stream could begin to appear whenever any
-task is started.
diff --git a/c/src/ada-tests/mptests/mp14/node1/mptest-per_node_configuration.adb b/c/src/ada-tests/mptests/mp14/node1/mptest-per_node_configuration.adb
deleted file mode 100644
index 7df5087537..0000000000
--- a/c/src/ada-tests/mptests/mp14/node1/mptest-per_node_configuration.adb
+++ /dev/null
@@ -1,43 +0,0 @@
---
---  MPTEST.PER_NODE_CONFIGURATION / BODY
---
---  DESCRIPTION:
---
---  This package is the specification for the subpackage
---  which will define the per node configuration parameters.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-
-separate ( MPTEST )
-
-package body PER_NODE_CONFIGURATION is
-
---PAGE
---
---  LOCAL_NODE_NUMBER
---
-
-   function LOCAL_NODE_NUMBER 
-   return RTEMS.UNSIGNED32 is
-   begin
-
-      return 1;
-
-   end LOCAL_NODE_NUMBER;
-
-end PER_NODE_CONFIGURATION;
diff --git a/c/src/ada-tests/mptests/mp14/node2/mp14.scn b/c/src/ada-tests/mptests/mp14/node2/mp14.scn
deleted file mode 100644
index a245b11faa..0000000000
--- a/c/src/ada-tests/mptests/mp14/node2/mp14.scn
+++ /dev/null
@@ -1,28 +0,0 @@
-*** TEST 14 -- NODE 2 ***
-Creating Event task (Global)
-Starting  Event task (Global)
-Creating Semaphore task (Global)
-About to go to sleep!
-Starting  Semaphore task (Global)
-Creating Message Queue task (Global)
-Getting SMID of semaphore
-Starting  Message Queue task (Global)
-Creating Partition task (Global)
-Getting ID of msg queue
-Starting  Partition task (Global)
-Getting ID of partition
-Waking up!
-Remote task's name is : 111
-Getting TID of remote task
-Receiving events from remote task
-<stream of following characters>
-. - indicates 100 iterations of 
-tm_evafter of 1 tick and event_receive.
-e - indicates that 100 
-events have been sent to the remote task.
-m - indicates 100 iterations of 
-message_queue_send and message_queue_receive.
-p - indicates 100 iterations of 
-partition_get_buffer and partition_return_buffer.
-s - indicates 100 iterations of 
-semaphore_obtain and semaphore_release.
diff --git a/c/src/ada-tests/mptests/mp14/node2/mptest-per_node_configuration.adb b/c/src/ada-tests/mptests/mp14/node2/mptest-per_node_configuration.adb
deleted file mode 100644
index e127cc5573..0000000000
--- a/c/src/ada-tests/mptests/mp14/node2/mptest-per_node_configuration.adb
+++ /dev/null
@@ -1,43 +0,0 @@
---
---  MPTEST.PER_NODE_CONFIGURATION / BODY
---
---  DESCRIPTION:
---
---  This package is the specification for the subpackage
---  which will define the per node configuration parameters.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-
-separate ( MPTEST )
-
-package body PER_NODE_CONFIGURATION is
-
---PAGE
---
---  LOCAL_NODE_NUMBER
---
-
-   function LOCAL_NODE_NUMBER 
-   return RTEMS.UNSIGNED32 is
-   begin
-
-      return 2;
-
-   end LOCAL_NODE_NUMBER;
-
-end PER_NODE_CONFIGURATION;
diff --git a/c/src/ada-tests/samples/base_mp/mptest.adb b/c/src/ada-tests/samples/base_mp/mptest.adb
deleted file mode 100644
index 61990654b4..0000000000
--- a/c/src/ada-tests/samples/base_mp/mptest.adb
+++ /dev/null
@@ -1,108 +0,0 @@
---
---  MPTEST / BODY
---
---  DESCRIPTION:
---
---  This package is the implementation for Test 1 of the RTEMS
---  Multiprocessor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with INTERFACES; use INTERFACES;
-with RTEMS;
-with TEST_SUPPORT;
-with TEXT_IO;
-with UNSIGNED32_IO;
-
-package body MPTEST is
-
-   package body PER_NODE_CONFIGURATION is separate;
-
---PAGE
---
---  INIT
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      C      : RTEMS.CHARACTER;
-      TIME   : RTEMS.TIME_OF_DAY;
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT( "*** SAMPLE MULTIPROCESSOR APPLICATION ***" );
-      TEXT_IO.PUT( "Creating and starting an application task" );
-
-
-      MPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME(  'T', 'A', '1', ' ' );
-
-      RTEMS.TASK_CREATE( 
-         MPTEST.TASK_NAME( 1 ), 
-         1, 
-         2048, 
-         RTEMS.INTERRUPT_LEVEL( 0 ),
-         RTEMS.DEFAULT_ATTRIBUTES,
-         MPTEST.TASK_ID( 1 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA1" );
-
-      RTEMS.TASK_START(
-         MPTEST.TASK_ID( 1 ),
-         MPTEST.APPLICATION_TASK'ACCESS,
-         0,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA1" );
-
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
-
-   end INIT;
-
---PAGE
---
---  APPLICATION_TASK
---
-
-   procedure APPLICATION_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      TIME   : RTEMS.TIME_OF_DAY;
-      TID    : RTEMS.ID;
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      RTEMS.TASK_IDENT( RTEMS.SELF, RTEMS.SEARCH_ALL_NODES, TID, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_IDENT OF SELF" );
-   
-      TEXT_IO.PUT( "This task was invoked with node argument (" );
-      UNSIGNED32_IO.PUT( ARGUMENT );
-      TEXT_IO.PUT_LINE( ")" );
-
-      TEXT_IO.PUT( "This task has the id of  0x" );
-      UNSIGNED32_IO.PUT( TID, BASE => 16 );
-      TEXT_IO.NEW_LINE;
- 
-      TEXT_IO.PUT_LINE( "*** END OF SAMPLE MULTIPROCESSOR APPLICATION  ***" );
-
-      RTEMS.SHUTDOWN_EXECUTIVE( 0 );
-
-   end APPLICATION_TASK;
-
-end MPTEST;
diff --git a/c/src/ada-tests/samples/base_mp/mptest.ads b/c/src/ada-tests/samples/base_mp/mptest.ads
deleted file mode 100644
index 7b76581a62..0000000000
--- a/c/src/ada-tests/samples/base_mp/mptest.ads
+++ /dev/null
@@ -1,166 +0,0 @@
---
---  MPTEST / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package is the specification for Test 1 of the RTEMS
---  Multiprocessor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with BSP_MPCI;
-with RTEMS;
-
-package MPTEST is
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS tasks created
---  by this test.
---
-
-   TASK_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.ID;
-   TASK_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.NAME;
-
---
---  INIT
---
---  DESCRIPTION:
---
---  This RTEMS task initializes the application.
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  APPLICATION_TASK
---
---  DESCRIPTION:
---
---  This routine is as an example of an application task which
---  prints a message including its RTEMS task id.  This task
---  then invokes exit to return to the monitor.
---
-
-   procedure APPLICATION_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  This is the Driver Address Table for this test.
---
-
-   DEVICE_DRIVERS : aliased RTEMS.DRIVER_ADDRESS_TABLE( 1 .. 1 ) :=
-   (1=>
-      (
-        CLOCK_DRIVER.INITIALIZE'ACCESS,              -- Initialization
-        RTEMS.NO_DRIVER_ENTRY,                       -- Open
-        RTEMS.NO_DRIVER_ENTRY,                       -- Close
-        RTEMS.NO_DRIVER_ENTRY,                       -- Read
-        RTEMS.NO_DRIVER_ENTRY,                       -- Write
-        RTEMS.NO_DRIVER_ENTRY                        -- Control
-      )
-   );
-
---
---  This is the Initialization Tasks Table for this test.
---
-
-   INITIALIZATION_TASKS : aliased RTEMS.INITIALIZATION_TASKS_TABLE( 1 .. 1 ) := 
-   (1=>
-     (
-       RTEMS.BUILD_NAME( 'U', 'I', '1', ' ' ),        -- task name
-       2048,                                          -- stack size
-       1,                                             -- priority
-       RTEMS.GLOBAL,                                  -- attributes
-       MPTEST.INIT'ACCESS,                            -- entry point
-       RTEMS.NO_PREEMPT,                              -- initial mode
-       0                                              -- argument list
-     )
-   );
-
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
---                             BEGIN SUBPACKAGE                           --
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
-
-   --
-   --  MPTEST.PER_NODE_CONFIGURATION / SPECIFICATION
-   --
-   --  DESCRIPTION:
-   --
-   --  This package is the specification for the subpackage
-   --  which will define the per node configuration parameters.
-   --
-   
-   package PER_NODE_CONFIGURATION is
-
-   --
-   --  LOCAL_NODE_NUMBER
-   --
-   --  DESCRIPTION:
-   --
-   --  This function returns the node number for this node.
-   --
-
-      function LOCAL_NODE_NUMBER 
-      return RTEMS.UNSIGNED32;
-  
-      pragma INLINE ( LOCAL_NODE_NUMBER );
-
-   end PER_NODE_CONFIGURATION;
-  
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
---                              END SUBPACKAGE                            --
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
-
---
---  This is the Multiprocessor Configuration Table for this test.
---
-
-   MULTIPROCESSING_CONFIGURATION : aliased RTEMS.MULTIPROCESSING_TABLE := (
-      MPTEST.PER_NODE_CONFIGURATION.LOCAL_NODE_NUMBER,
-      2,                         -- maximum # nodes in system 
-      33,                        -- maximum # global objects
-      33                         -- maximum # proxies
-    );
-
---
---  This is the Configuration Table for this test.
---
-
-   CONFIGURATION : aliased RTEMS.CONFIGURATION_TABLE := (
-      RTEMS.NULL_ADDRESS,        -- will be replaced by BSP
-      64 * 1024,                 -- executive RAM size
-      10,                        -- maximum # tasks
-      0,                         -- maximum # timers
-      0,                         -- maximum # semaphores
-      0,                         -- maximum # message queues
-      0,                         -- maximum # messages
-      0,                         -- maximum # partitions
-      0,                         -- maximum # regions
-      0,                         -- maximum # dp memory areas
-      0,                         -- maximum # periods
-      0,                         -- maximum # user extensions
-      RTEMS.MILLISECONDS_TO_MICROSECONDS(10), -- # us in a tick
-      50                         -- # ticks in a timeslice
-  );
-
-end MPTEST;
diff --git a/c/src/ada-tests/samples/base_mp/node1/base_mp.scn b/c/src/ada-tests/samples/base_mp/node1/base_mp.scn
deleted file mode 100644
index a2d2f359be..0000000000
--- a/c/src/ada-tests/samples/base_mp/node1/base_mp.scn
+++ /dev/null
@@ -1,5 +0,0 @@
-*** SAMPLE MULTIPROCESSOR APPLICATION ***
-Creating and starting an application task
-This task was invoked with the node argument (1)
-This task has the id of 0x10002
-*** END OF SAMPLE MULTIPROCESSOR APPLICATION ***
diff --git a/c/src/ada-tests/samples/base_mp/node1/mptest-per_node_configuration.adb b/c/src/ada-tests/samples/base_mp/node1/mptest-per_node_configuration.adb
deleted file mode 100644
index 7df5087537..0000000000
--- a/c/src/ada-tests/samples/base_mp/node1/mptest-per_node_configuration.adb
+++ /dev/null
@@ -1,43 +0,0 @@
---
---  MPTEST.PER_NODE_CONFIGURATION / BODY
---
---  DESCRIPTION:
---
---  This package is the specification for the subpackage
---  which will define the per node configuration parameters.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-
-separate ( MPTEST )
-
-package body PER_NODE_CONFIGURATION is
-
---PAGE
---
---  LOCAL_NODE_NUMBER
---
-
-   function LOCAL_NODE_NUMBER 
-   return RTEMS.UNSIGNED32 is
-   begin
-
-      return 1;
-
-   end LOCAL_NODE_NUMBER;
-
-end PER_NODE_CONFIGURATION;
diff --git a/c/src/ada-tests/samples/base_mp/node2/base_mp.scn b/c/src/ada-tests/samples/base_mp/node2/base_mp.scn
deleted file mode 100644
index 95bc96a808..0000000000
--- a/c/src/ada-tests/samples/base_mp/node2/base_mp.scn
+++ /dev/null
@@ -1,5 +0,0 @@
-*** SAMPLE MULTIPROCESSOR APPLICATION ***
-Creating and starting an application task
-This task was invoked with the node argument (2)
-This task has the id of 0x20002
-*** END OF SAMPLE MULTIPROCESSOR APPLICATION ***
diff --git a/c/src/ada-tests/samples/base_mp/node2/mptest-per_node_configuration.adb b/c/src/ada-tests/samples/base_mp/node2/mptest-per_node_configuration.adb
deleted file mode 100644
index e127cc5573..0000000000
--- a/c/src/ada-tests/samples/base_mp/node2/mptest-per_node_configuration.adb
+++ /dev/null
@@ -1,43 +0,0 @@
---
---  MPTEST.PER_NODE_CONFIGURATION / BODY
---
---  DESCRIPTION:
---
---  This package is the specification for the subpackage
---  which will define the per node configuration parameters.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-
-separate ( MPTEST )
-
-package body PER_NODE_CONFIGURATION is
-
---PAGE
---
---  LOCAL_NODE_NUMBER
---
-
-   function LOCAL_NODE_NUMBER 
-   return RTEMS.UNSIGNED32 is
-   begin
-
-      return 2;
-
-   end LOCAL_NODE_NUMBER;
-
-end PER_NODE_CONFIGURATION;
diff --git a/c/src/ada-tests/samples/base_sp/base_sp.adb b/c/src/ada-tests/samples/base_sp/base_sp.adb
deleted file mode 100644
index 0800b3da48..0000000000
--- a/c/src/ada-tests/samples/base_sp/base_sp.adb
+++ /dev/null
@@ -1,58 +0,0 @@
---
---  MAIN / BODY
---
---  DESCRIPTION:
---
---  This is the entry point for Base Single Process Example of the
---  Sample Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-with SPTEST;
-with TEST_SUPPORT;
-
-procedure Base_SP is
-  INIT_ID : RTEMS.ID;
-  STATUS  : RTEMS.STATUS_CODES;
-begin
-
-   RTEMS.TASK_CREATE(
-      RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
-      1,
-      RTEMS.MINIMUM_STACK_SIZE,
-      RTEMS.NO_PREEMPT,
-      RTEMS.DEFAULT_ATTRIBUTES,
-      INIT_ID,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
-
-
-   RTEMS.TASK_START(
-      INIT_ID,
-      SPTEST.INIT'ACCESS,
-      0,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
-
-   loop
-      delay 120.0;
-   end loop;
-
-end Base_SP;
-
diff --git a/c/src/ada-tests/samples/base_sp/base_sp.scn b/c/src/ada-tests/samples/base_sp/base_sp.scn
deleted file mode 100644
index 90794be60c..0000000000
--- a/c/src/ada-tests/samples/base_sp/base_sp.scn
+++ /dev/null
@@ -1,4 +0,0 @@
-*** SAMPLE SINGLE PROCESSOR APPLICATION ***
-Creating and starting an application task
-Application task was invoked with argument (0) and has id of 0x10002
-*** END OF SAMPLE SINGLE PROCESSOR APPLICATION ***
diff --git a/c/src/ada-tests/samples/base_sp/config.h b/c/src/ada-tests/samples/base_sp/config.h
deleted file mode 100644
index bfb614cd4e..0000000000
--- a/c/src/ada-tests/samples/base_sp/config.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*  config.h
- *
- *  This include file defines the Configuration Table for this test.
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-/* configuration information */
-
-#define CONFIGURE_SPTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#define CONFIGURE_MAXIMUM_POSIX_THREADS              10
-#define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
-#define CONFIGURE_MAXIMUM_POSIX_MUTEXES              20
-#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES  10
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/c/src/ada-tests/samples/base_sp/sptest.adb b/c/src/ada-tests/samples/base_sp/sptest.adb
deleted file mode 100644
index 5ae17e18da..0000000000
--- a/c/src/ada-tests/samples/base_sp/sptest.adb
+++ /dev/null
@@ -1,98 +0,0 @@
---
---  SPTEST / BODY
---
---  DESCRIPTION:
---
---  This package is the implementation of Test 1 of the RTEMS
---  Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with INTERFACES; use INTERFACES;
-with RTEMS;
-with TEST_SUPPORT;
-with TEXT_IO;
-with UNSIGNED32_IO;
-
-package body SPTEST is
-
---PAGE
--- 
---  INIT
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** SAMPLE SINGLE PROCESSOR APPLICATION ***" );
-      TEXT_IO.PUT_LINE( "Creating and starting an application task" );
-
-      SPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME(  'T', 'A', '1', ' ' );
-
-      RTEMS.TASK_CREATE( 
-         SPTEST.TASK_NAME( 1 ), 
-         1, 
-         2048, 
-         RTEMS.INTERRUPT_LEVEL( 0 ),
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.TASK_ID( 1 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA1" );
-
-      RTEMS.TASK_START(
-         SPTEST.TASK_ID( 1 ),
-         SPTEST.APPLICATION_TASK'ACCESS,
-         0,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA1" );
-
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
-
-   end INIT;
-
---PAGE
--- 
---  APPLICATION_TASK
---
-
-   procedure APPLICATION_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      TID    : RTEMS.ID;
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      RTEMS.TASK_IDENT( RTEMS.SELF, RTEMS.SEARCH_ALL_NODES, TID, STATUS );
-   
-      TEXT_IO.PUT( "Application task was invoked with argument (" );
-      UNSIGNED32_IO.PUT( ARGUMENT );
-      TEXT_IO.PUT( ") and has id of 0x" );
-      UNSIGNED32_IO.PUT( TID, BASE => 16 );
-
-      TEXT_IO.PUT_LINE( "*** END OF SAMPLE SINGLE PROCESSOR APPLICATION ***" );
-
-      RTEMS.SHUTDOWN_EXECUTIVE( 0 );
-
-   end APPLICATION_TASK;
-
-end SPTEST;
diff --git a/c/src/ada-tests/samples/base_sp/sptest.ads b/c/src/ada-tests/samples/base_sp/sptest.ads
deleted file mode 100644
index 62ed876e9f..0000000000
--- a/c/src/ada-tests/samples/base_sp/sptest.ads
+++ /dev/null
@@ -1,60 +0,0 @@
---
---  SPTEST / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package is the specification for Test 1 of the RTEMS
---  Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-
-package SPTEST is
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS tasks created
---  by this test.
---
-
-   TASK_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.ID;
-   TASK_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.NAME;
-
---
---  INIT
---
---  DESCRIPTION:
---
---  This RTEMS task initializes the application.
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  APPLICATION_TASK
---
---  DESCRIPTION:
---
---  This is the body of the RTEMS task which constitutes this test.
---
-
-   procedure APPLICATION_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
-end SPTEST;
diff --git a/c/src/ada-tests/samples/hello/config.h b/c/src/ada-tests/samples/hello/config.h
deleted file mode 100644
index 32dae5a93d..0000000000
--- a/c/src/ada-tests/samples/hello/config.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*  config.h
- *
- *  This include file defines the Configuration Table for this test.
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-/* configuration information */
-
-#define CONFIGURE_SPTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#define CONFIGURE_MAXIMUM_POSIX_THREADS              10
-#define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
-#define CONFIGURE_MAXIMUM_POSIX_MUTEXES              20
-#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES  10
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/c/src/ada-tests/samples/hello/hello.adb b/c/src/ada-tests/samples/hello/hello.adb
deleted file mode 100644
index d2fa9d1155..0000000000
--- a/c/src/ada-tests/samples/hello/hello.adb
+++ /dev/null
@@ -1,57 +0,0 @@
---
---  MAIN / BODY
---
---  DESCRIPTION:
---
---  This is the entry point for Test Hello of the Sample Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-with SPTEST;
-with TEST_SUPPORT;
-
-procedure Hello is
-  INIT_ID : RTEMS.ID;
-  STATUS  : RTEMS.STATUS_CODES;
-begin
-
-   RTEMS.TASK_CREATE(
-      RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
-      1,
-      RTEMS.MINIMUM_STACK_SIZE,
-      RTEMS.NO_PREEMPT,
-      RTEMS.DEFAULT_ATTRIBUTES,
-      INIT_ID,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
-
-
-   RTEMS.TASK_START(
-      INIT_ID,
-      SPTEST.INIT'ACCESS,
-      0,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
-
-   loop
-      delay 120.0;
-   end loop;
-
-end Hello;
-
diff --git a/c/src/ada-tests/samples/hello/hello.scn b/c/src/ada-tests/samples/hello/hello.scn
deleted file mode 100644
index d9e92d81d5..0000000000
--- a/c/src/ada-tests/samples/hello/hello.scn
+++ /dev/null
@@ -1,3 +0,0 @@
-*** HELLO WORLD TEST ***
-Hello World
-*** END OF HELLO WORLD TEST ***
diff --git a/c/src/ada-tests/samples/hello/sptest.adb b/c/src/ada-tests/samples/hello/sptest.adb
deleted file mode 100644
index db2add4365..0000000000
--- a/c/src/ada-tests/samples/hello/sptest.adb
+++ /dev/null
@@ -1,52 +0,0 @@
---
---  SPTEST / BODY
---
---  DESCRIPTION:
---
---  This package is the implementation of Test 1 of the RTEMS
---  Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with INTERFACES; use INTERFACES;
-with RTEMS;
-with TEST_SUPPORT;
-with TEXT_IO;
-
-package body SPTEST is
-
---PAGE
--- 
---  INIT
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      TIME   : RTEMS.TIME_OF_DAY;
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** HELLO WORLD TEST ***" );
-      TEXT_IO.PUT_LINE( "Hello World" );
-      TEXT_IO.PUT_LINE( "*** END OF HELLO WORLD TEST ***" );
-
-      RTEMS.SHUTDOWN_EXECUTIVE( 0 );
-
-   end INIT;
-
-end SPTEST;
diff --git a/c/src/ada-tests/samples/hello/sptest.ads b/c/src/ada-tests/samples/hello/sptest.ads
deleted file mode 100644
index e632f1a499..0000000000
--- a/c/src/ada-tests/samples/hello/sptest.ads
+++ /dev/null
@@ -1,48 +0,0 @@
---
---  SPTEST / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package is the specification for the Hello World Test of the RTEMS
---  Sample Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-
-package SPTEST is
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS tasks created
---  by this test.
---
-
-   TASK_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.ID;
-   TASK_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.NAME;
-
---
---  INIT
---
---  DESCRIPTION:
---
---  This RTEMS task initializes the application.
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
-end SPTEST;
diff --git a/c/src/ada-tests/samples/ticker/config.h b/c/src/ada-tests/samples/ticker/config.h
deleted file mode 100644
index bfb614cd4e..0000000000
--- a/c/src/ada-tests/samples/ticker/config.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*  config.h
- *
- *  This include file defines the Configuration Table for this test.
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-/* configuration information */
-
-#define CONFIGURE_SPTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#define CONFIGURE_MAXIMUM_POSIX_THREADS              10
-#define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
-#define CONFIGURE_MAXIMUM_POSIX_MUTEXES              20
-#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES  10
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/c/src/ada-tests/samples/ticker/sptest.adb b/c/src/ada-tests/samples/ticker/sptest.adb
deleted file mode 100644
index c755f3783d..0000000000
--- a/c/src/ada-tests/samples/ticker/sptest.adb
+++ /dev/null
@@ -1,162 +0,0 @@
---
---  SPTEST / BODY
---
---  DESCRIPTION:
---
---  This package is the implementation of Test 1 of the RTEMS
---  Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with INTERFACES; use INTERFACES;
-with RTEMS;
-with TEST_SUPPORT;
-with TEXT_IO;
-
-package body SPTEST is
-
---PAGE
--- 
---  INIT
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      TIME   : RTEMS.TIME_OF_DAY;
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** TEST 1 ***" );
-
-      TIME := ( 1988, 12, 31, 9, 0, 0, 0 );
-
-      RTEMS.CLOCK_SET( TIME, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_SET" );
-
-      SPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME(  'T', 'A', '1', ' ' );
-      SPTEST.TASK_NAME( 2 ) := RTEMS.BUILD_NAME(  'T', 'A', '2', ' ' );
-      SPTEST.TASK_NAME( 3 ) := RTEMS.BUILD_NAME(  'T', 'A', '3', ' ' );
-
-      RTEMS.TASK_CREATE( 
-         SPTEST.TASK_NAME( 1 ), 
-         1, 
-         2048, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.TASK_ID( 1 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA1" );
-
-      RTEMS.TASK_CREATE( 
-         SPTEST.TASK_NAME( 2 ), 
-         1, 
-         2048, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.TASK_ID( 2 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA2" );
-
-      RTEMS.TASK_CREATE( 
-         SPTEST.TASK_NAME( 3 ), 
-         1, 
-         2048, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.TASK_ID( 3 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA3" );
-
-      RTEMS.TASK_START(
-         SPTEST.TASK_ID( 1 ),
-         SPTEST.TASK_1_THROUGH_3'ACCESS,
-         0,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA1" );
-
-      RTEMS.TASK_START(
-         SPTEST.TASK_ID( 2 ),
-         SPTEST.TASK_1_THROUGH_3'ACCESS,
-         0,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA2" );
-
-      RTEMS.TASK_START(
-         SPTEST.TASK_ID( 3 ),
-         SPTEST.TASK_1_THROUGH_3'ACCESS,
-         0,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA3" );
-
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
-
-   end INIT;
-
---PAGE
--- 
---  TASK_1_THROUGH_3
---
-
-   procedure TASK_1_THROUGH_3 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      TID    : RTEMS.ID;
-      TIME   : RTEMS.TIME_OF_DAY;
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      RTEMS.TASK_IDENT( RTEMS.SELF, RTEMS.SEARCH_ALL_NODES, TID, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_IDENT OF SELF" );
-   
-      loop
-
-         RTEMS.CLOCK_GET( RTEMS.CLOCK_GET_TOD, TIME'ADDRESS, STATUS );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET" );
-
-         if TIME.SECOND >= 35 then
-            TEXT_IO.PUT_LINE( "*** END OF CLOCK TICK TEST ***" );
-            RTEMS.SHUTDOWN_EXECUTIVE( 0 );
-         end if;
-
-         TEST_SUPPORT.PUT_NAME( 
-            SPTEST.TASK_NAME( TEST_SUPPORT.TASK_NUMBER( TID ) ),
-            FALSE
-         );
-
-         TEST_SUPPORT.PRINT_TIME( "- clock_get - ", TIME, "" );
-         TEXT_IO.NEW_LINE;
-
-         RTEMS.TASK_WAKE_AFTER( 
-            TEST_SUPPORT.TASK_NUMBER( TID ) * 5 * 
-              TEST_SUPPORT.TICKS_PER_SECOND, 
-            STATUS
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
-          
-      end loop;
-   
-   end TASK_1_THROUGH_3;
-
-end SPTEST;
diff --git a/c/src/ada-tests/samples/ticker/sptest.ads b/c/src/ada-tests/samples/ticker/sptest.ads
deleted file mode 100644
index e03ccd0e64..0000000000
--- a/c/src/ada-tests/samples/ticker/sptest.ads
+++ /dev/null
@@ -1,60 +0,0 @@
---
---  SPTEST / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package is the specification for Test 1 of the RTEMS
---  Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-
-package SPTEST is
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS tasks created
---  by this test.
---
-
-   TASK_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.ID;
-   TASK_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.NAME;
-
---
---  INIT
---
---  DESCRIPTION:
---
---  This RTEMS task initializes the application.
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TASK_1_THROUGH_3
---
---  DESCRIPTION:
---
---  This is the body of the RTEMS tasks which constitute this test.
---
-
-   procedure TASK_1_THROUGH_3 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
-end SPTEST;
diff --git a/c/src/ada-tests/samples/ticker/ticker.adb b/c/src/ada-tests/samples/ticker/ticker.adb
deleted file mode 100644
index dff51ce83b..0000000000
--- a/c/src/ada-tests/samples/ticker/ticker.adb
+++ /dev/null
@@ -1,57 +0,0 @@
---
---  MAIN / BODY
---
---  DESCRIPTION:
---
---  This is the entry point for Test Ticker of the Sample Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-with SPTEST;
-with TEST_SUPPORT;
-
-procedure Ticker is
-  INIT_ID : RTEMS.ID;
-  STATUS  : RTEMS.STATUS_CODES;
-begin
-
-   RTEMS.TASK_CREATE(
-      RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
-      1,
-      RTEMS.MINIMUM_STACK_SIZE,
-      RTEMS.NO_PREEMPT,
-      RTEMS.DEFAULT_ATTRIBUTES,
-      INIT_ID,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
-
-
-   RTEMS.TASK_START(
-      INIT_ID,
-      SPTEST.INIT'ACCESS,
-      0,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
-
-   loop
-      delay 120.0;
-   end loop;
-
-end Ticker;
-
diff --git a/c/src/ada-tests/samples/ticker/ticker.scn b/c/src/ada-tests/samples/ticker/ticker.scn
deleted file mode 100644
index b95fee033f..0000000000
--- a/c/src/ada-tests/samples/ticker/ticker.scn
+++ /dev/null
@@ -1,16 +0,0 @@
-*** CLOCK TICK TEST ***
-TA1 - clock_get -  9: 0: 0   12/31/1988
-TA2 - clock_get -  9: 0: 0   12/31/1988
-TA3 - clock_get -  9: 0: 0   12/31/1988
-TA1 - clock_get -  9: 0: 5   12/31/1988
-TA2 - clock_get -  9: 0:10   12/31/1988
-TA1 - clock_get -  9: 0:10   12/31/1988
-TA1 - clock_get -  9: 0:15   12/31/1988
-TA3 - clock_get -  9: 0:15   12/31/1988
-TA2 - clock_get -  9: 0:20   12/31/1988
-TA1 - clock_get -  9: 0:20   12/31/1988
-TA1 - clock_get -  9: 0:25   12/31/1988
-TA2 - clock_get -  9: 0:30   12/31/1988
-TA1 - clock_get -  9: 0:30   12/31/1988
-TA3 - clock_get -  9: 0:30   12/31/1988
-*** END OF CLOCK TICK TEST ***
diff --git a/c/src/ada-tests/sptests/sp01/config.h b/c/src/ada-tests/sptests/sp01/config.h
deleted file mode 100644
index bfb614cd4e..0000000000
--- a/c/src/ada-tests/sptests/sp01/config.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*  config.h
- *
- *  This include file defines the Configuration Table for this test.
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-/* configuration information */
-
-#define CONFIGURE_SPTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#define CONFIGURE_MAXIMUM_POSIX_THREADS              10
-#define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
-#define CONFIGURE_MAXIMUM_POSIX_MUTEXES              20
-#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES  10
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/c/src/ada-tests/sptests/sp01/sp01.adb b/c/src/ada-tests/sptests/sp01/sp01.adb
deleted file mode 100644
index c1264df6f3..0000000000
--- a/c/src/ada-tests/sptests/sp01/sp01.adb
+++ /dev/null
@@ -1,57 +0,0 @@
---
---  MAIN / BODY
---
---  DESCRIPTION:
---
---  This is the entry point for Test SP01 of the Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-with SPTEST;
-with TEST_SUPPORT;
-
-procedure SP01 is
-  INIT_ID : RTEMS.ID;
-  STATUS  : RTEMS.STATUS_CODES;
-begin
-
-   RTEMS.TASK_CREATE(
-      RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
-      1,
-      RTEMS.MINIMUM_STACK_SIZE,
-      RTEMS.NO_PREEMPT,
-      RTEMS.DEFAULT_ATTRIBUTES,
-      INIT_ID,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
-
-
-   RTEMS.TASK_START(
-      INIT_ID,
-      SPTEST.INIT'ACCESS,
-      0,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
-
-   loop
-      delay 120.0;
-   end loop;
-
-end SP01;
-
diff --git a/c/src/ada-tests/sptests/sp01/sp01.scn b/c/src/ada-tests/sptests/sp01/sp01.scn
deleted file mode 100644
index dac3add1f2..0000000000
--- a/c/src/ada-tests/sptests/sp01/sp01.scn
+++ /dev/null
@@ -1,16 +0,0 @@
-*** TEST 1 ***
-TA1 - clock_get -  9: 0: 0   12/31/1988
-TA2 - clock_get -  9: 0: 0   12/31/1988
-TA3 - clock_get -  9: 0: 0   12/31/1988
-TA1 - clock_get -  9: 0: 5   12/31/1988
-TA2 - clock_get -  9: 0:10   12/31/1988
-TA1 - clock_get -  9: 0:10   12/31/1988
-TA3 - clock_get -  9: 0:15   12/31/1988
-TA1 - clock_get -  9: 0:15   12/31/1988
-TA2 - clock_get -  9: 0:20   12/31/1988
-TA1 - clock_get -  9: 0:20   12/31/1988
-TA1 - clock_get -  9: 0:25   12/31/1988
-TA3 - clock_get -  9: 0:30   12/31/1988
-TA1 - clock_get -  9: 0:30   12/31/1988
-TA2 - clock_get -  9: 0:30   12/31/1988
-*** END OF TEST 1 ***
diff --git a/c/src/ada-tests/sptests/sp01/sptest.adb b/c/src/ada-tests/sptests/sp01/sptest.adb
deleted file mode 100644
index e74a80c0cf..0000000000
--- a/c/src/ada-tests/sptests/sp01/sptest.adb
+++ /dev/null
@@ -1,162 +0,0 @@
---
---  SPTEST / BODY
---
---  DESCRIPTION:
---
---  This package is the implementation of Test 1 of the RTEMS
---  Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with INTERFACES; use INTERFACES;
-with RTEMS;
-with TEST_SUPPORT;
-with TEXT_IO;
-
-package body SPTEST is
-
---PAGE
--- 
---  INIT
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      TIME   : RTEMS.TIME_OF_DAY;
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** TEST 1 ***" );
-
-      TIME := ( 1988, 12, 31, 9, 0, 0, 0 );
-
-      RTEMS.CLOCK_SET( TIME, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_SET" );
-
-      SPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME(  'T', 'A', '1', ' ' );
-      SPTEST.TASK_NAME( 2 ) := RTEMS.BUILD_NAME(  'T', 'A', '2', ' ' );
-      SPTEST.TASK_NAME( 3 ) := RTEMS.BUILD_NAME(  'T', 'A', '3', ' ' );
-
-      RTEMS.TASK_CREATE( 
-         SPTEST.TASK_NAME( 1 ), 
-         1, 
-         2048, 
-         RTEMS.INTERRUPT_LEVEL( 31 ),
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.TASK_ID( 1 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA1" );
-
-      RTEMS.TASK_CREATE( 
-         SPTEST.TASK_NAME( 2 ), 
-         1, 
-         2048, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.TASK_ID( 2 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA2" );
-
-      RTEMS.TASK_CREATE( 
-         SPTEST.TASK_NAME( 3 ), 
-         1, 
-         2048, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.TASK_ID( 3 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA3" );
-
-      RTEMS.TASK_START(
-         SPTEST.TASK_ID( 1 ),
-         SPTEST.TASK_1_THROUGH_3'ACCESS,
-         0,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA1" );
-
-      RTEMS.TASK_START(
-         SPTEST.TASK_ID( 2 ),
-         SPTEST.TASK_1_THROUGH_3'ACCESS,
-         0,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA2" );
-
-      RTEMS.TASK_START(
-         SPTEST.TASK_ID( 3 ),
-         SPTEST.TASK_1_THROUGH_3'ACCESS,
-         0,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA3" );
-
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
-
-   end INIT;
-
---PAGE
--- 
---  TASK_1_THROUGH_3
---
-
-   procedure TASK_1_THROUGH_3 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      TID    : RTEMS.ID;
-      TIME   : RTEMS.TIME_OF_DAY;
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      RTEMS.TASK_IDENT( RTEMS.SELF, RTEMS.SEARCH_ALL_NODES, TID, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_IDENT OF SELF" );
-   
-      loop
-
-         RTEMS.CLOCK_GET( RTEMS.CLOCK_GET_TOD, TIME'ADDRESS, STATUS );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET" );
-
-         if TIME.SECOND >= 35 then
-            TEXT_IO.PUT_LINE( "*** END OF TEST 1 ***" );
-            RTEMS.SHUTDOWN_EXECUTIVE( 0 );
-         end if;
-
-         TEST_SUPPORT.PUT_NAME( 
-            SPTEST.TASK_NAME( TEST_SUPPORT.TASK_NUMBER( TID ) ),
-            FALSE
-         );
-
-         TEST_SUPPORT.PRINT_TIME( "- clock_get - ", TIME, "" );
-         TEXT_IO.NEW_LINE;
-
-         RTEMS.TASK_WAKE_AFTER( 
-            TEST_SUPPORT.TASK_NUMBER( TID ) * 5 * 
-              TEST_SUPPORT.TICKS_PER_SECOND, 
-            STATUS
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
-          
-      end loop;
-   
-   end TASK_1_THROUGH_3;
-
-end SPTEST;
diff --git a/c/src/ada-tests/sptests/sp01/sptest.ads b/c/src/ada-tests/sptests/sp01/sptest.ads
deleted file mode 100644
index e03ccd0e64..0000000000
--- a/c/src/ada-tests/sptests/sp01/sptest.ads
+++ /dev/null
@@ -1,60 +0,0 @@
---
---  SPTEST / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package is the specification for Test 1 of the RTEMS
---  Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-
-package SPTEST is
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS tasks created
---  by this test.
---
-
-   TASK_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.ID;
-   TASK_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.NAME;
-
---
---  INIT
---
---  DESCRIPTION:
---
---  This RTEMS task initializes the application.
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TASK_1_THROUGH_3
---
---  DESCRIPTION:
---
---  This is the body of the RTEMS tasks which constitute this test.
---
-
-   procedure TASK_1_THROUGH_3 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
-end SPTEST;
diff --git a/c/src/ada-tests/sptests/sp02/config.h b/c/src/ada-tests/sptests/sp02/config.h
deleted file mode 100644
index bfb614cd4e..0000000000
--- a/c/src/ada-tests/sptests/sp02/config.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*  config.h
- *
- *  This include file defines the Configuration Table for this test.
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-/* configuration information */
-
-#define CONFIGURE_SPTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#define CONFIGURE_MAXIMUM_POSIX_THREADS              10
-#define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
-#define CONFIGURE_MAXIMUM_POSIX_MUTEXES              20
-#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES  10
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/c/src/ada-tests/sptests/sp02/sp02.adb b/c/src/ada-tests/sptests/sp02/sp02.adb
deleted file mode 100644
index e7c9631161..0000000000
--- a/c/src/ada-tests/sptests/sp02/sp02.adb
+++ /dev/null
@@ -1,57 +0,0 @@
---
---  MAIN / BODY
---
---  DESCRIPTION:
---
---  This is the entry point for Test SP02 of the Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-with SPTEST;
-with TEST_SUPPORT;
-
-procedure SP02 is
-  INIT_ID : RTEMS.ID;
-  STATUS  : RTEMS.STATUS_CODES;
-begin
-
-   RTEMS.TASK_CREATE(
-      RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
-      1,
-      RTEMS.MINIMUM_STACK_SIZE,
-      RTEMS.NO_PREEMPT,
-      RTEMS.DEFAULT_ATTRIBUTES,
-      INIT_ID,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
-
-
-   RTEMS.TASK_START(
-      INIT_ID,
-      SPTEST.INIT'ACCESS,
-      0,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
-
-   loop
-      delay 120.0;
-   end loop;
-
-end SP02;
-
diff --git a/c/src/ada-tests/sptests/sp02/sp02.scn b/c/src/ada-tests/sptests/sp02/sp02.scn
deleted file mode 100644
index 9db0bc4100..0000000000
--- a/c/src/ada-tests/sptests/sp02/sp02.scn
+++ /dev/null
@@ -1,15 +0,0 @@
-*** TEST 2 ***
-INIT - task_wake_after - yielding processor
-PREEMPT - task_delete - deleting self
-INIT - suspending TA2 while middle task on a ready chain
-TA1 - task_wake_after - sleep 1 second
-TA2 - task_wake_after - sleep 1 minute
-TA3 - task_wake_after - sleep 5 seconds
-TA1 - task_ident - tid of TA2 (16#10007#)
-TA1 - task_ident - tid of TA3 (16#10008#)
-TA1 - task_set_priority - set TA3's priority to 2
-TA1 - task_suspend - suspend TA2
-TA1 - task_delete - delete TA2
-TA1 - task_wake_after - sleep for 5 seconds
-TA3 - task_delete - delete self
-*** END OF TEST 2 ***
diff --git a/c/src/ada-tests/sptests/sp02/sptest.adb b/c/src/ada-tests/sptests/sp02/sptest.adb
deleted file mode 100644
index dd2b9172ac..0000000000
--- a/c/src/ada-tests/sptests/sp02/sptest.adb
+++ /dev/null
@@ -1,331 +0,0 @@
---
---  SPTEST / BODY
---
---  DESCRIPTION:
---
---  This package is the implementation of Test 2 of the RTEMS
---  Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with INTERFACES; use INTERFACES;
-with RTEMS;
-with TEST_SUPPORT;
-with TEXT_IO;
-with UNSIGNED32_IO;
-
-package body SPTEST is
-
---PAGE
--- 
---  INIT
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** TEST 2 ***" );
-
-      SPTEST.PREEMPT_TASK_NAME := RTEMS.BUILD_NAME(  'P', 'R', 'M', 'T' );
-
-      RTEMS.TASK_CREATE( 
-         SPTEST.PREEMPT_TASK_NAME,
-         1, 
-         2048, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.PREEMPT_TASK_ID,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF PREEMPT" );
-
-      RTEMS.TASK_START(
-         SPTEST.PREEMPT_TASK_ID,
-         SPTEST.PREEMPT_TASK'ACCESS,
-         0,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF PREEMPT" );
-
-      TEXT_IO.PUT_LINE( "INIT - task_wake_after - yielding processor" );
-      RTEMS.TASK_WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
-
-      SPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME(  'T', 'A', '1', ' ' );
-      SPTEST.TASK_NAME( 2 ) := RTEMS.BUILD_NAME(  'T', 'A', '2', ' ' );
-      SPTEST.TASK_NAME( 3 ) := RTEMS.BUILD_NAME(  'T', 'A', '3', ' ' );
-
-      RTEMS.TASK_CREATE( 
-         SPTEST.TASK_NAME( 1 ), 
-         3, 
-         2048, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.TASK_ID( 1 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA1" );
-
-      RTEMS.TASK_CREATE( 
-         SPTEST.TASK_NAME( 2 ), 
-         3, 
-         2048, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.TASK_ID( 2 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA2" );
-
-      RTEMS.TASK_CREATE( 
-         SPTEST.TASK_NAME( 3 ), 
-         3, 
-         2048, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.TASK_ID( 3 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA3" );
-
-      RTEMS.TASK_START(
-         SPTEST.TASK_ID( 1 ),
-         SPTEST.TASK_1'ACCESS,
-         0,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA1" );
-
-      RTEMS.TASK_START(
-         SPTEST.TASK_ID( 2 ),
-         SPTEST.TASK_2'ACCESS,
-         0,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA2" );
-
-      RTEMS.TASK_START(
-         SPTEST.TASK_ID( 3 ),
-         SPTEST.TASK_3'ACCESS,
-         0,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA3" );
-
-      TEXT_IO.PUT_LINE( 
-         "INIT - suspending TA2 while middle task on a ready chain"
-      );
- 
-      RTEMS.TASK_SUSPEND( SPTEST.TASK_ID( 2 ), STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SUSPEND OF TA2" );
-
-      RTEMS.TASK_DELETE( SPTEST.TASK_ID( 1 ), STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF TA1" );
-
-      RTEMS.TASK_DELETE( SPTEST.TASK_ID( 2 ), STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF TA2" );
-
-      RTEMS.TASK_DELETE( SPTEST.TASK_ID( 3 ), STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF TA3" );
-
-      RTEMS.TASK_CREATE( 
-         SPTEST.TASK_NAME( 1 ), 
-         1, 
-         2048, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.TASK_ID( 1 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA1" );
-
-      RTEMS.TASK_CREATE( 
-         SPTEST.TASK_NAME( 2 ), 
-         3, 
-         2048, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.TASK_ID( 2 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA2" );
-
-      RTEMS.TASK_CREATE( 
-         SPTEST.TASK_NAME( 3 ), 
-         3, 
-         2048, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.TASK_ID( 3 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA3" );
-
-      RTEMS.TASK_START(
-         SPTEST.TASK_ID( 1 ),
-         SPTEST.TASK_1'ACCESS,
-         0,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA1" );
-
-      RTEMS.TASK_START(
-         SPTEST.TASK_ID( 2 ),
-         SPTEST.TASK_2'ACCESS,
-         0,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA2" );
-
-      RTEMS.TASK_START(
-         SPTEST.TASK_ID( 3 ),
-         SPTEST.TASK_3'ACCESS,
-         0,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA3" );
-
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
-
-   end INIT;
-
---PAGE
--- 
---  PREEMPT_TASK
---
-
-   procedure PREEMPT_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS            : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.PUT_LINE( "PREEMPT - task_delete - deleting self" );
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF PREEMPT" );
-
-   end PREEMPT_TASK;
-
---PAGE
--- 
---  TASK_1
---
-
-   procedure TASK_1 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      TID2              : RTEMS.ID;
-      TID3              : RTEMS.ID;
-      STATUS            : RTEMS.STATUS_CODES;
-      PREVIOUS_PRIORITY : RTEMS.TASK_PRIORITY;
-   begin
-
-      TEXT_IO.PUT_LINE( "TA1 - task_wake_after - sleep 1 second" );
-      RTEMS.TASK_WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
-          
-      RTEMS.TASK_IDENT( 
-         SPTEST.TASK_NAME( 2 ), 
-         RTEMS.SEARCH_ALL_NODES, 
-         TID2, 
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_IDENT OF TA2" );
-   
-      TEXT_IO.PUT( "TA1 - task_ident - tid of TA2 (" );
-      UNSIGNED32_IO.PUT( TID2, WIDTH => 8, BASE => 10#16# );
-      TEXT_IO.PUT_LINE( ")" );
-
-      RTEMS.TASK_IDENT( 
-         SPTEST.TASK_NAME( 3 ), 
-         RTEMS.SEARCH_ALL_NODES, 
-         TID3, 
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_IDENT OF TA3" );
-   
-      TEXT_IO.PUT( "TA1 - task_ident - tid of TA3 (" );
-      UNSIGNED32_IO.PUT( TID3, WIDTH => 8, BASE => 10#16# );
-      TEXT_IO.PUT_LINE( ")" );
-
-      RTEMS.TASK_SET_PRIORITY( TID3, 2, PREVIOUS_PRIORITY, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SET_PRIORITY" );
-
-      TEXT_IO.PUT_LINE( 
-         "TA1 - task_set_priority - set TA3's priority to 2"
-      );
-
-      TEXT_IO.PUT_LINE( "TA1 - task_suspend - suspend TA2" );
-      RTEMS.TASK_SUSPEND( TID2, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SUSPEND OF TA2" );
-
-      TEXT_IO.PUT_LINE( "TA1 - task_delete - delete TA2" );
-      RTEMS.TASK_DELETE( TID2, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF TA2" );
-
-      TEXT_IO.PUT_LINE( "TA1 - task_wake_after - sleep for 5 seconds" );
-      RTEMS.TASK_WAKE_AFTER( 5 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
-
-      TEXT_IO.PUT_LINE( "*** END OF TEST 2 ***" );
-      RTEMS.SHUTDOWN_EXECUTIVE( 0 );
-   
-   end TASK_1;
-
---PAGE
--- 
---  TASK_2
---
-
-   procedure TASK_2 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.PUT_LINE( "TA2 - task_wake_after - sleep 1 minute" );
-      RTEMS.TASK_WAKE_AFTER( 60 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER IN TA2" );
-          
-   end TASK_2;
-
---PAGE
--- 
---  TASK_3
---
-
-   procedure TASK_3 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.PUT_LINE( "TA3 - task_wake_after - sleep 5 seconds" );
-      RTEMS.TASK_WAKE_AFTER( 5 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER IN TA3" );
-
-      TEXT_IO.PUT_LINE( "TA3 - task_delete - delete self" );
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF TA3" );
-          
-   end TASK_3;
-
-end SPTEST;
diff --git a/c/src/ada-tests/sptests/sp02/sptest.ads b/c/src/ada-tests/sptests/sp02/sptest.ads
deleted file mode 100644
index 2d5141f540..0000000000
--- a/c/src/ada-tests/sptests/sp02/sptest.ads
+++ /dev/null
@@ -1,99 +0,0 @@
---
---  SPTEST / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package is the specification for Test 2 of the RTEMS
---  Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-
-package SPTEST is
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS tasks created
---  by this test.
---
-
-   TASK_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.ID;
-   TASK_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.NAME;
-
-   PREEMPT_TASK_ID   : RTEMS.ID;
-   PREEMPT_TASK_NAME : RTEMS.NAME;
-
---
---  INIT
---
---  DESCRIPTION:
---
---  This RTEMS task initializes the application.
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  PREEMPT_TASK
---
---  DESCRIPTION:
---
---  This RTEMS task tests the basic preemption capability.
---
-
-   procedure PREEMPT_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TASK_1
---
---  DESCRIPTION:
---
---  This RTEMS task tests some of the capabilities of the Task Manager.
---
-
-   procedure TASK_1 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TASK_2
---
---  DESCRIPTION:
---
---  This RTEMS task tests some of the capabilities of the Task Manager.
---
-
-   procedure TASK_2 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TASK_3
---
---  DESCRIPTION:
---
---  This RTEMS task tests some of the capabilities of the Task Manager.
---
-
-   procedure TASK_3 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
-end SPTEST;
diff --git a/c/src/ada-tests/sptests/sp03/config.h b/c/src/ada-tests/sptests/sp03/config.h
deleted file mode 100644
index bfb614cd4e..0000000000
--- a/c/src/ada-tests/sptests/sp03/config.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*  config.h
- *
- *  This include file defines the Configuration Table for this test.
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-/* configuration information */
-
-#define CONFIGURE_SPTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#define CONFIGURE_MAXIMUM_POSIX_THREADS              10
-#define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
-#define CONFIGURE_MAXIMUM_POSIX_MUTEXES              20
-#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES  10
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/c/src/ada-tests/sptests/sp03/sp03.adb b/c/src/ada-tests/sptests/sp03/sp03.adb
deleted file mode 100644
index 5455671942..0000000000
--- a/c/src/ada-tests/sptests/sp03/sp03.adb
+++ /dev/null
@@ -1,57 +0,0 @@
---
---  MAIN / BODY
---
---  DESCRIPTION:
---
---  This is the entry point for Test SP03 of the Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-with SPTEST;
-with TEST_SUPPORT;
-
-procedure SP03 is
-  INIT_ID : RTEMS.ID;
-  STATUS  : RTEMS.STATUS_CODES;
-begin
-
-   RTEMS.TASK_CREATE(
-      RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
-      1,
-      RTEMS.MINIMUM_STACK_SIZE,
-      RTEMS.NO_PREEMPT,
-      RTEMS.DEFAULT_ATTRIBUTES,
-      INIT_ID,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
-
-
-   RTEMS.TASK_START(
-      INIT_ID,
-      SPTEST.INIT'ACCESS,
-      0,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
-
-   loop
-      delay 120.0;
-   end loop;
-
-end SP03;
-
diff --git a/c/src/ada-tests/sptests/sp03/sp03.scn b/c/src/ada-tests/sptests/sp03/sp03.scn
deleted file mode 100644
index a13d9ae2e6..0000000000
--- a/c/src/ada-tests/sptests/sp03/sp03.scn
+++ /dev/null
@@ -1,26 +0,0 @@
-*** TEST 3 ***
-TA1 sets clock: 9:15: 0   12/31/1988
-TA1 going to sleep:  9:15: 0   12/31/1988
-TA2   9:15: 1   12/31/1988
-TA2   9:15: 2   12/31/1988
-TA2   9:15: 3   12/31/1988
-TA2   9:15: 4   12/31/1988
-TA1 awakened:  9:15: 5   12/31/1988
-TA1 going to sleep:  9:15: 5   12/31/1988
-TA2   9:15: 5   12/31/1988
-TA2   9:15: 6   12/31/1988
-TA2   9:15: 7   12/31/1988
-TA2   9:15: 8   12/31/1988
-TA2   9:15: 9   12/31/1988
-TA1 awakened:  9:15:10   12/31/1988
-TA1 going to sleep:  9:15:10   12/31/1988
-TA2   9:15:10   12/31/1988
-TA2   9:15:11   12/31/1988
-TA2   9:15:12   12/31/1988
-TA2   9:15:13   12/31/1988
-TA2   9:15:14   12/31/1988
-TA1 awakened:  9:15:15   12/31/1988
-TA1 going to sleep:  9:15:15   12/31/1988
-TA2    9:15:15   12/31/1988
-TA2    9:15:16   12/31/1988
-*** END OF TEST 3 ***
diff --git a/c/src/ada-tests/sptests/sp03/sptest.adb b/c/src/ada-tests/sptests/sp03/sptest.adb
deleted file mode 100644
index 789740f0c3..0000000000
--- a/c/src/ada-tests/sptests/sp03/sptest.adb
+++ /dev/null
@@ -1,173 +0,0 @@
---
---  SPTEST / BODY
---
---  DESCRIPTION:
---
---  This package is the implementation of Test 3 of the RTEMS
---  Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with INTERFACES; use INTERFACES;
-with RTEMS;
-with TEST_SUPPORT;
-with TEXT_IO;
-
-package body SPTEST is
-
---PAGE
--- 
---  INIT
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      TIME   : RTEMS.TIME_OF_DAY;
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** TEST 3 ***" );
-
-      SPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME(  'T', 'A', '1', ' ' );
-      SPTEST.TASK_NAME( 2 ) := RTEMS.BUILD_NAME(  'T', 'A', '2', ' ' );
-
-      RTEMS.TASK_CREATE( 
-         SPTEST.TASK_NAME( 1 ), 
-         1, 
-         RTEMS.MINIMUM_STACK_SIZE, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.TASK_ID( 1 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA1" );
-
-      RTEMS.TASK_CREATE( 
-         SPTEST.TASK_NAME( 2 ), 
-         1, 
-         RTEMS.MINIMUM_STACK_SIZE, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.TASK_ID( 2 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA2" );
-
-      RTEMS.TASK_START(
-         SPTEST.TASK_ID( 1 ),
-         SPTEST.TASK_1'ACCESS,
-         0,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA1" );
-
-      RTEMS.TASK_START(
-         SPTEST.TASK_ID( 2 ),
-         SPTEST.TASK_2'ACCESS,
-         0,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA2" );
-
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
-
-   end INIT;
-
---PAGE
--- 
---  TASK_1
---
-
-   procedure TASK_1 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      TIME   : RTEMS.TIME_OF_DAY;
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      TIME := ( 1988, 12, 31, 9, 15, 0, 0 );
-
-      RTEMS.CLOCK_SET( TIME, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_SET" );
-
-      TEST_SUPPORT.PUT_NAME( SPTEST.TASK_NAME( 1 ), FALSE );
-      TEST_SUPPORT.PRINT_TIME( "sets clock: ", TIME, "" );
-      TEXT_IO.NEW_LINE;
-
-      loop
-
-         RTEMS.CLOCK_GET( RTEMS.CLOCK_GET_TOD, TIME'ADDRESS, STATUS );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET" );
-
-         TEST_SUPPORT.PUT_NAME( SPTEST.TASK_NAME( 1 ), FALSE );
-         TEST_SUPPORT.PRINT_TIME( "going to sleep: ", TIME, "" );
-         TEXT_IO.NEW_LINE;
-
-         TIME.SECOND := TIME.SECOND + 5;
-         TIME.MINUTE := TIME.MINUTE + (TIME.SECOND / 60 );
-         TIME.SECOND := TIME.SECOND mod 60;
-         TIME.HOUR   := TIME.HOUR + (TIME.MINUTE / 60 );
-         TIME.MINUTE := TIME.MINUTE mod 60;
-         TIME.HOUR   := TIME.HOUR mod 24;
-
-         RTEMS.TASK_WAKE_WHEN( TIME, STATUS );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_WHEN" );
-          
-         TEST_SUPPORT.PUT_NAME( SPTEST.TASK_NAME( 1 ), FALSE );
-         TEST_SUPPORT.PRINT_TIME( "awakened: ", TIME, "" );
-         TEXT_IO.NEW_LINE;
-
-      end loop;
-   
-   end TASK_1;
-
---PAGE
--- 
---  TASK_2
---
-
-   procedure TASK_2 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      TIME   : RTEMS.TIME_OF_DAY;
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      loop
-
-         RTEMS.TASK_WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
-          
-         RTEMS.CLOCK_GET( RTEMS.CLOCK_GET_TOD, TIME'ADDRESS, STATUS );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET" );
-
-         if TIME.SECOND >= 17 then
-            TEXT_IO.PUT_LINE( "*** END OF TEST 3 ***" );
-            RTEMS.SHUTDOWN_EXECUTIVE( 0 );
-         end if;
-
-         TEST_SUPPORT.PUT_NAME( SPTEST.TASK_NAME( 2 ), FALSE );
-         TEST_SUPPORT.PRINT_TIME( " ", TIME, "" );
-         TEXT_IO.NEW_LINE;
-
-      end loop;
-
-   end TASK_2;
-
-end SPTEST;
diff --git a/c/src/ada-tests/sptests/sp03/sptest.ads b/c/src/ada-tests/sptests/sp03/sptest.ads
deleted file mode 100644
index fda2add5e2..0000000000
--- a/c/src/ada-tests/sptests/sp03/sptest.ads
+++ /dev/null
@@ -1,74 +0,0 @@
---
---  SPTEST / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package is the specification for Test 3 of the RTEMS
---  Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-
-package SPTEST is
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS tasks created
---  by this test.
---
-
-   TASK_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.ID;
-   TASK_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.NAME;
-
---
---  INIT
---
---  DESCRIPTION:
---
---  This RTEMS task initializes the application.
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TASK_1
---
---  DESCRIPTION:
---
---  This RTEMS task tests the TASK_WAKE_WHEN directive of 
---  the Task Manager.
---
-
-   procedure TASK_1 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TASK_1
---
---  DESCRIPTION:
---
---  This RTEMS task tests the TASK_WAKE_AFTER directive of 
---  the Task Manager.
---
-
-   procedure TASK_2 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
-end SPTEST;
diff --git a/c/src/ada-tests/sptests/sp04/README b/c/src/ada-tests/sptests/sp04/README
deleted file mode 100644
index 6928aaea49..0000000000
--- a/c/src/ada-tests/sptests/sp04/README
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-#  $Id$
-#
-
-This test is broken as it is currently implemented.  It is illegal for
-a task to do Ada IO during a extension since the Ada run-time uses
-locks to safeguard data structures.  Dispatching is disabled and the
-call to Text_IO in the Switch extension will lock the system up.
-
-The proper solution is to have the Switch extension lock task and
-time when it a switch occurs and have a single task print this
-information as necessary.
-
diff --git a/c/src/ada-tests/sptests/sp04/config.h b/c/src/ada-tests/sptests/sp04/config.h
deleted file mode 100644
index 8a9352ccc9..0000000000
--- a/c/src/ada-tests/sptests/sp04/config.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*  config.h
- *
- *  This include file defines the Configuration Table for this test.
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-/* configuration information */
-
-#define CONFIGURE_SPTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_MAXIMUM_USER_EXTENSIONS     1
-#define CONFIGURE_TICKS_PER_TIMESLICE       100
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#define CONFIGURE_MAXIMUM_POSIX_THREADS              10
-#define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
-#define CONFIGURE_MAXIMUM_POSIX_MUTEXES              20
-#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES  10
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/c/src/ada-tests/sptests/sp04/sp04.adb b/c/src/ada-tests/sptests/sp04/sp04.adb
deleted file mode 100644
index 511ccb36a5..0000000000
--- a/c/src/ada-tests/sptests/sp04/sp04.adb
+++ /dev/null
@@ -1,57 +0,0 @@
---
---  MAIN / BODY
---
---  DESCRIPTION:
---
---  This is the entry point for Test SP04 of the Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-with SPTEST;
-with TEST_SUPPORT;
-
-procedure SP04 is
-  INIT_ID : RTEMS.ID;
-  STATUS  : RTEMS.STATUS_CODES;
-begin
-
-   RTEMS.TASK_CREATE(
-      RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
-      1,
-      RTEMS.MINIMUM_STACK_SIZE,
-      RTEMS.NO_PREEMPT,
-      RTEMS.DEFAULT_ATTRIBUTES,
-      INIT_ID,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
-
-
-   RTEMS.TASK_START(
-      INIT_ID,
-      SPTEST.INIT'ACCESS,
-      0,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
-
-   loop
-      delay 120.0;
-   end loop;
-
-end SP04;
-
diff --git a/c/src/ada-tests/sptests/sp04/sp04.scn b/c/src/ada-tests/sptests/sp04/sp04.scn
deleted file mode 100644
index dc075e2b94..0000000000
--- a/c/src/ada-tests/sptests/sp04/sp04.scn
+++ /dev/null
@@ -1,23 +0,0 @@
-*** TEST 4 ***
-TA1 -  9:15: 0   12/31/1988
-TA1 - task_suspend - on Task 2
-TA1 - task_suspend - on Task 3
-TA1 - killing time
-TA1 - task_resume - on Task 2
-TA1 - task_resume - on Task 3
-TA2 -  9:15: 4   12/31/1988
-TA3 -  9:15: 5   12/31/1988
-TA1 -  9:15: 6   12/31/1988
-TA2 -  9:15: 7   12/31/1988
-TA3 -  9:15: 8   12/31/1988
-TA1 -  9:15: 9   12/31/1988
-TA1 - task_mode - change mode to NO PREEMPT
-TA1 -  9:15:10   12/31/1988
-TA1 -  9:15:11   12/31/1988
-TA1 -  9:15:12   12/31/1988
-TA1 -  9:15:13   12/31/1988
-TA1 -  9:15:14   12/31/1988
-TA1 -  9:15:15   12/31/1988
-TA1 - task_mode - change mode to PREEMPT
-TA2 -  9:15:16   12/31/1988
-*** END OF TEST 4 ***
diff --git a/c/src/ada-tests/sptests/sp04/sptest.adb b/c/src/ada-tests/sptests/sp04/sptest.adb
deleted file mode 100644
index 8056f9225e..0000000000
--- a/c/src/ada-tests/sptests/sp04/sptest.adb
+++ /dev/null
@@ -1,317 +0,0 @@
---
---  SPTEST / BODY
---
---  DESCRIPTION:
---
---  This package is the implementation of Test 4 of the RTEMS
---  Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with INTERFACES; use INTERFACES;
-with RTEMS;
-with TEST_SUPPORT;
-with TEXT_IO;
-
-package body SPTEST is
-
---PAGE
--- 
---  INIT
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      TIME   : RTEMS.TIME_OF_DAY;
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** TEST 4 ***" );
-
-      TIME := ( 1988, 12, 31, 9, 15, 0, 0 );
-
-      RTEMS.CLOCK_SET( TIME, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_SET" );
-
-      SPTEST.EXTENSION_NAME( 1 ) := RTEMS.BUILD_NAME(  'E', 'X', 'T', ' ' );
-
-      RTEMS.EXTENSION_CREATE(
-         SPTEST.EXTENSION_NAME( 1 ),
-         SPTEST.EXTENSIONS'ACCESS,
-         EXTENSION_ID( 1 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "EXTENSION_CREATE" );
-
-      SPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME(  'T', 'A', '1', ' ' );
-      SPTEST.TASK_NAME( 2 ) := RTEMS.BUILD_NAME(  'T', 'A', '2', ' ' );
-      SPTEST.TASK_NAME( 3 ) := RTEMS.BUILD_NAME(  'T', 'A', '3', ' ' );
-
-      SPTEST.RUN_COUNT( 1 ) := 0;
-      SPTEST.RUN_COUNT( 2 ) := 0;
-      SPTEST.RUN_COUNT( 3 ) := 0;
-
-      RTEMS.TASK_CREATE( 
-         SPTEST.TASK_NAME( 1 ), 
-         1, 
-         2048, 
-         RTEMS.TIMESLICE,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.TASK_ID( 1 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA1" );
-
-      RTEMS.TASK_CREATE( 
-         SPTEST.TASK_NAME( 2 ), 
-         1, 
-         2048, 
-         RTEMS.TIMESLICE,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.TASK_ID( 2 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA2" );
-
-      RTEMS.TASK_CREATE( 
-         SPTEST.TASK_NAME( 3 ), 
-         1, 
-         2048, 
-         RTEMS.TIMESLICE,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.TASK_ID( 3 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA3" );
-
-      RTEMS.TASK_START(
-         SPTEST.TASK_ID( 1 ),
-         SPTEST.TASK_1'ACCESS,
-         0,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA1" );
-
-      RTEMS.TASK_START(
-         SPTEST.TASK_ID( 2 ),
-         SPTEST.TASK_2'ACCESS,
-         0,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA2" );
-
-      RTEMS.TASK_START(
-         SPTEST.TASK_ID( 3 ),
-         SPTEST.TASK_3'ACCESS,
-         0,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA3" );
-
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
-
-   end INIT;
-
---PAGE
--- 
---  TASK_1
---
-
-   procedure TASK_1 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      SECONDS       : RTEMS.UNSIGNED32;
-      OLD_SECONDS   : RTEMS.UNSIGNED32;
-      STARTED_DELAY : RTEMS.UNSIGNED32;
-      PREVIOUS_MODE : RTEMS.MODE;
-      TIME          : RTEMS.TIME_OF_DAY;
-      START_TIME    : RTEMS.INTERVAL;
-      END_TIME      : RTEMS.INTERVAL;
-      STATUS        : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.PUT_LINE( "TA1 - task_suspend - on Task 2" );
-      RTEMS.TASK_SUSPEND( TASK_ID( 2 ), STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SUSPEND OF TA2" );
- 
-      TEXT_IO.PUT_LINE( "TA1 - task_suspend - on Task 3" );
-      RTEMS.TASK_SUSPEND( TASK_ID( 3 ), STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SUSPEND OF TA3" );
- 
-      TEXT_IO.PUT_LINE( "TA1 - killing time" );
-
-      RTEMS.CLOCK_GET(
-         RTEMS.CLOCK_GET_SECONDS_SINCE_EPOCH,
-         START_TIME'ADDRESS,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET" );
-
-      loop
-         RTEMS.CLOCK_GET(
-            RTEMS.CLOCK_GET_SECONDS_SINCE_EPOCH,
-            END_TIME'ADDRESS,
-            STATUS
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET" );
-
-         exit when END_TIME > (START_TIME + 2);
-      end loop;
-
-      TEXT_IO.PUT_LINE( "TA1 - task_resume - on Task 2" );
-      RTEMS.TASK_RESUME( TASK_ID( 2 ), STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_RESUME OF TA2" );
- 
-      TEXT_IO.PUT_LINE( "TA1 - task_resume - on Task 3" );
-      RTEMS.TASK_RESUME( TASK_ID( 3 ), STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_RESUME OF TA3" );
- 
-      loop
-
-         if SPTEST.RUN_COUNT( 1 ) = 3 then
-
-            TEXT_IO.PUT_LINE( 
-               "TA1 - task_mode - change mode to NO PREEMPT"
-            );
-            RTEMS.TASK_MODE( 
-               RTEMS.NO_PREEMPT, 
-               RTEMS.PREEMPT_MASK, 
-               PREVIOUS_MODE, 
-               STATUS 
-            );
-            TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_MODE" );
-
-            RTEMS.CLOCK_GET( RTEMS.CLOCK_GET_TOD, TIME'ADDRESS, STATUS );
-            TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET" );
-
-            OLD_SECONDS := TIME.SECOND;
-
-            SECONDS := 0;
-            loop
-
-               exit when SECONDS >= 6;
-
-               RTEMS.CLOCK_GET( RTEMS.CLOCK_GET_TOD, TIME'ADDRESS, STATUS );
-               TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET" );
-
-               if TIME.SECOND /= OLD_SECONDS then
-                  OLD_SECONDS := TIME.SECOND;
-                  SECONDS := SECONDS + 1;
-                  TEST_SUPPORT.PRINT_TIME( "TA1 - ", TIME, "" );
-                  TEXT_IO.NEW_LINE;
-               end if;
-
-            end loop;
-
-            TEXT_IO.PUT_LINE( 
-               "TA1 - task_mode - change mode to PREEMPT"
-            );
-
-            RTEMS.TASK_MODE( 
-               RTEMS.PREEMPT, 
-               RTEMS.PREEMPT_MASK, 
-               PREVIOUS_MODE, 
-               STATUS 
-            );
-            TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_MODE" );
-
-<<LOOP_LABEL>>
-            goto LOOP_LABEL;
-
-         end if;
-
-      end loop;
-
-   end TASK_1;
-
---PAGE
--- 
---  TASK_2
---
-
-   procedure TASK_2 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-   begin
-
-<<LOOP_LABEL>>
-         goto LOOP_LABEL;
-
-   end TASK_2;
-
---PAGE
--- 
---  TASK_3
---
-
-   procedure TASK_3 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-   begin
-
-<<LOOP_LABEL>>
-         goto LOOP_LABEL;
-
-   end TASK_3;
-
---PAGE
--- 
---  TASK_SWITCH
---
-
-   procedure TASK_SWITCH (
-      UNUSED : in     RTEMS.TCB_POINTER;
-      HEIR   : in     RTEMS.TCB_POINTER
-   ) is
-      INDEX  : RTEMS.UNSIGNED32;
-      TIME   : RTEMS.TIME_OF_DAY;
-      STATUS : RTEMS.STATUS_CODES;
-      function TCB_To_ID (
-         TCB : RTEMS.TCB_POINTER
-      ) return RTEMS.ID;
-      pragma Import (C, TCB_To_ID, "tcb_to_id" );
-         
-   begin
-
-      --INDEX := TEST_SUPPORT.TASK_NUMBER( HEIR.OBJECT.ID );
-      INDEX := TCB_To_ID( HEIR );
-
-      case INDEX is
-         when 1  | 2 | 3 =>
-            SPTEST.RUN_COUNT( INDEX ) := SPTEST.RUN_COUNT( INDEX ) + 1;
-
-            RTEMS.CLOCK_GET( RTEMS.CLOCK_GET_TOD, TIME'ADDRESS, STATUS );
-            TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET" );
-
-            TEST_SUPPORT.PUT_NAME( SPTEST.TASK_NAME( INDEX ), FALSE );
-            TEST_SUPPORT.PRINT_TIME( "- ", TIME, "" );
-            TEXT_IO.NEW_LINE;
-           
-            if TIME.SECOND >= 16 then
-               TEXT_IO.PUT_LINE( "*** END OF TEST 4 ***" );
-               RTEMS.SHUTDOWN_EXECUTIVE( 0 );
-            end if;
-
-         when others =>
-            NULL;
-      end case;
-
-   end TASK_SWITCH;
-
-end SPTEST;
diff --git a/c/src/ada-tests/sptests/sp04/sptest.ads b/c/src/ada-tests/sptests/sp04/sptest.ads
deleted file mode 100644
index ce3237bedd..0000000000
--- a/c/src/ada-tests/sptests/sp04/sptest.ads
+++ /dev/null
@@ -1,133 +0,0 @@
---
---  SPTEST / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package is the specification for Test 4 of the RTEMS
---  Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-
-package SPTEST is
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS tasks created
---  by this test.
---
-
-   TASK_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.ID;
-   TASK_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.NAME;
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS extensions created
---  by this test.
---
- 
-   EXTENSION_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.ID;
-   EXTENSION_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.NAME;
- 
---
---  This array contains the number of times each of the test tasks has
---  been context switched TO.
---
-
-   RUN_COUNT : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.UNSIGNED32;
-
---
---  INIT
---
---  DESCRIPTION:
---
---  This RTEMS task initializes the application.
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TASK_1
---
---  DESCRIPTION:
---
---  This RTEMS task tests some of the capabilities of the Task Manager.
---
-
-   procedure TASK_1 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TASK_2
---
---  DESCRIPTION:
---
---  This RTEMS task is used as a background task to suspend, resume,
---  and context switch to.
---
-
-   procedure TASK_2 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TASK_3
---
---  DESCRIPTION:
---
---  This RTEMS task is used as a background task to suspend, resume,
---  and context switch to.
---
-
-   procedure TASK_3 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TASK_SWITCH
---
---  DESCRIPTION:
---
---  This subprogram is the TASK_SWITCH extension for this test.
---  It is invoked at each context switch and counts the number
---  of times each application task has been context switched to.
---
-
-   procedure TASK_SWITCH (
-      UNUSED : in     RTEMS.TCB_POINTER;
-      HEIR   : in     RTEMS.TCB_POINTER
-   );
-
---
---  This is the User Extension Table for this test.
---
-
-   EXTENSIONS : aliased RTEMS.EXTENSIONS_TABLE := 
-   (
-        NULL,                                        -- Task create
-        NULL,                                        -- Task start
-        NULL,                                        -- Task restart
-        NULL,                                        -- Task delete
-        SPTEST.TASK_SWITCH'ACCESS,                   -- Task switch
-        NULL,                                        -- Task post switch
-        NULL,                                        -- Task begin
-        NULL,                                        -- Task exitted
-        NULL                                         -- Fatal error
-   );
-
-end SPTEST;
diff --git a/c/src/ada-tests/sptests/sp05/config.h b/c/src/ada-tests/sptests/sp05/config.h
deleted file mode 100644
index 7fc8c7580e..0000000000
--- a/c/src/ada-tests/sptests/sp05/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*  config.h
- *
- *  This include file defines the Configuration Table for this test.
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-/* configuration information */
-
-#define CONFIGURE_SPTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_TICKS_PER_TIMESLICE       100
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#define CONFIGURE_MAXIMUM_POSIX_THREADS              10
-#define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
-#define CONFIGURE_MAXIMUM_POSIX_MUTEXES              20
-#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES  10
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/c/src/ada-tests/sptests/sp05/sp05.adb b/c/src/ada-tests/sptests/sp05/sp05.adb
deleted file mode 100644
index bd6407a0c7..0000000000
--- a/c/src/ada-tests/sptests/sp05/sp05.adb
+++ /dev/null
@@ -1,57 +0,0 @@
---
---  MAIN / BODY
---
---  DESCRIPTION:
---
---  This is the entry point for Test SP05 of the Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-with SPTEST;
-with TEST_SUPPORT;
-
-procedure SP05 is
-  INIT_ID : RTEMS.ID;
-  STATUS  : RTEMS.STATUS_CODES;
-begin
-
-   RTEMS.TASK_CREATE(
-      RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
-      1,
-      RTEMS.MINIMUM_STACK_SIZE,
-      RTEMS.NO_PREEMPT,
-      RTEMS.DEFAULT_ATTRIBUTES,
-      INIT_ID,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
-
-
-   RTEMS.TASK_START(
-      INIT_ID,
-      SPTEST.INIT'ACCESS,
-      0,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
-
-   loop
-      delay 120.0;
-   end loop;
-
-end SP05;
-
diff --git a/c/src/ada-tests/sptests/sp05/sp05.scn b/c/src/ada-tests/sptests/sp05/sp05.scn
deleted file mode 100644
index 59c30a0b97..0000000000
--- a/c/src/ada-tests/sptests/sp05/sp05.scn
+++ /dev/null
@@ -1,48 +0,0 @@
-*** TEST 5 ***
-TA1 - task_wake_after - sleep 5 seconds
-TA2 - task_suspend - suspend self
-TA3 - task_suspend - suspend self
-TA1 - task_suspend - suspend TA3
-TA1 - task_resume  - resume TA2
-TA1 - task_wake_after - sleep 5 seconds
-TA2 - task_wake_after - sleep 1 second
-TA2 - task_wake_after - sleep 1 second
-TA2 - task_wake_after - sleep 1 second
-TA2 - task_wake_after - sleep 1 second
-TA2 - task_wake_after - sleep 1 second
-TA1 - task_suspend - suspend TA2
-TA1 - task_resume - resume TA3
-TA1 - task_wake_after - sleep 5 seconds
-TA3 - task_wake_after - sleep 1 second
-TA3 - task_wake_after - sleep 1 second
-TA3 - task_wake_after - sleep 1 second
-TA3 - task_wake_after - sleep 1 second
-TA3 - task_wake_after - sleep 1 second
-TA1 - task_suspend - suspend TA3
-TA1 - task_resume  - resume TA2
-TA1 - task_wake_after - sleep 5 seconds
-TA2 - task_wake_after - sleep 1 second
-TA2 - task_wake_after - sleep 1 second
-TA2 - task_wake_after - sleep 1 second
-TA2 - task_wake_after - sleep 1 second
-TA2 - task_wake_after - sleep 1 second
-TA1 - task_suspend - suspend TA2
-TA1 - task_resume - resume TA3
-TA1 - task_wake_after - sleep 5 seconds
-TA3 - task_wake_after - sleep 1 second
-TA3 - task_wake_after - sleep 1 second
-TA3 - task_wake_after - sleep 1 second
-TA3 - task_wake_after - sleep 1 second
-TA3 - task_wake_after - sleep 1 second
-TA1 - task_suspend - suspend TA3
-TA1 - task_resume - resume TA2
-TA1 - task_wake_after - sleep 5 seconds
-TA2 - task_wake_after - sleep 1 second
-TA2 - task_wake_after - sleep 1 second
-TA2 - task_wake_after - sleep 1 second
-TA2 - task_wake_after - sleep 1 second
-TA2 - task_wake_after - sleep 1 second
-TA1 - task_suspend - suspend TA2
-TA1 - task_resume - resume TA3
-*** END OF TEST 5 ***
-
diff --git a/c/src/ada-tests/sptests/sp05/sptest.adb b/c/src/ada-tests/sptests/sp05/sptest.adb
deleted file mode 100644
index 22d64fa54f..0000000000
--- a/c/src/ada-tests/sptests/sp05/sptest.adb
+++ /dev/null
@@ -1,229 +0,0 @@
---
---  SPTEST / BODY
---
---  DESCRIPTION:
---
---  This package is the implementation of Test 5 of the RTEMS
---  Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with INTERFACES; use INTERFACES;
-with RTEMS;
-with TEST_SUPPORT;
-with TEXT_IO;
-
-package body SPTEST is
-
---PAGE
--- 
---  INIT
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** TEST 5 ***" );
-
-      SPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME(  'T', 'A', '1', ' ' );
-      SPTEST.TASK_NAME( 2 ) := RTEMS.BUILD_NAME(  'T', 'A', '2', ' ' );
-      SPTEST.TASK_NAME( 3 ) := RTEMS.BUILD_NAME(  'T', 'A', '3', ' ' );
-
-      RTEMS.TASK_CREATE( 
-         SPTEST.TASK_NAME( 1 ), 
-         1, 
-         2048, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.TASK_ID( 1 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA1" );
-
-      RTEMS.TASK_CREATE( 
-         SPTEST.TASK_NAME( 2 ), 
-         1, 
-         2048, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.TASK_ID( 2 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA2" );
-
-      RTEMS.TASK_CREATE( 
-         SPTEST.TASK_NAME( 3 ), 
-         1, 
-         2048, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.TASK_ID( 3 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA3" );
-
-      RTEMS.TASK_START(
-         SPTEST.TASK_ID( 1 ),
-         SPTEST.TASK_1'ACCESS,
-         0,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA1" );
-
-      RTEMS.TASK_START(
-         SPTEST.TASK_ID( 2 ),
-         SPTEST.TASK_2'ACCESS,
-         0,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA2" );
-
-      RTEMS.TASK_START(
-         SPTEST.TASK_ID( 3 ),
-         SPTEST.TASK_3'ACCESS,
-         0,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA3" );
-
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
-
-   end INIT;
-
---PAGE
--- 
---  TASK_1
---
-
-   procedure TASK_1 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      TID2   : RTEMS.ID;
-      TID3   : RTEMS.ID;
-      PASS   : RTEMS.UNSIGNED32;
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      RTEMS.TASK_IDENT( 
-         SPTEST.TASK_NAME( 2 ), 
-         1, 
-         TID2, 
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_IDENT OF TA2" );
-   
-      RTEMS.TASK_IDENT( 
-         SPTEST.TASK_NAME( 3 ), 
-         1, 
-         TID3, 
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_IDENT OF TA3" );
-   
-      for PASS in 1 .. 3
-      loop
-
-         TEXT_IO.PUT_LINE( "TA1 - task_wake_after - sleep 5 seconds" );
-         RTEMS.TASK_WAKE_AFTER( 5 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER OF TA1" );
-         
-         TEXT_IO.PUT_LINE( "TA1 - task_suspend - suspend TA3" );
-         RTEMS.TASK_SUSPEND( TID3, STATUS );
-         if PASS = 1 then
-           TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( 
-              STATUS, 
-              RTEMS.ALREADY_SUSPENDED, 
-              "TASK_SUSPEND OF TA3" 
-           );
-         else
-           TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SUSPEND OF TA3" );
-         end if;
-         
-         TEXT_IO.PUT_LINE( "TA1 - task_resume - resume TA2" );
-         RTEMS.TASK_RESUME( TID2, STATUS );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_RESUME OF TA2" );
-         
-         TEXT_IO.PUT_LINE( "TA1 - task_wake_after - sleep 5 seconds" );
-         RTEMS.TASK_WAKE_AFTER( 5 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
-         
-         TEXT_IO.PUT_LINE( "TA1 - task_suspend - suspend TA2" );
-         RTEMS.TASK_SUSPEND( TID2, STATUS );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SUSPEND OF TA2" );
-         
-         TEXT_IO.PUT_LINE( "TA1 - task_resume - resume TA3" );
-         RTEMS.TASK_RESUME( TID3, STATUS );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_RESUME OF TA3" );
-          
-      end loop;
-
-      TEXT_IO.PUT_LINE( "*** END OF TEST 5 ***" );
-      RTEMS.SHUTDOWN_EXECUTIVE( 0 );
-
-   end TASK_1;
-
---PAGE
--- 
---  TASK_2
---
-
-   procedure TASK_2 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.PUT_LINE( "TA2 - task_suspend - suspend self" );
-      RTEMS.TASK_SUSPEND( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SUSPEND OF TA2" );
-
-      loop
-         TEXT_IO.PUT_LINE( "TA2 - task_wake_after - sleep 1 second" );
-         RTEMS.TASK_WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER OF TA2" );
-      end loop;
-         
-   end TASK_2;
-
---PAGE
--- 
---  TASK_3
---
-
-   procedure TASK_3 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.PUT_LINE( "TA3 - task_suspend - suspend self" );
-      RTEMS.TASK_SUSPEND( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SUSPEND OF TA3" );
-
-      loop
-         TEXT_IO.PUT_LINE( "TA3 - task_wake_after - sleep 1 second" );
-         RTEMS.TASK_WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER OF TA3" );
-      end loop;
-         
-   end TASK_3;
-
-end SPTEST;
diff --git a/c/src/ada-tests/sptests/sp05/sptest.ads b/c/src/ada-tests/sptests/sp05/sptest.ads
deleted file mode 100644
index 74b2e956bc..0000000000
--- a/c/src/ada-tests/sptests/sp05/sptest.ads
+++ /dev/null
@@ -1,84 +0,0 @@
---
---  SPTEST / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package is the specification for Test 5 of the RTEMS
---  Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-
-package SPTEST is
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS tasks created
---  by this test.
---
-
-   TASK_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.ID;
-   TASK_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.NAME;
-
---
---  INIT
---
---  DESCRIPTION:
---
---  This RTEMS task initializes the application.
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TASK_1
---
---  DESCRIPTION:
---
---  This RTEMS task tests some of the capabilities of the Task Manager.
---
-
-   procedure TASK_1 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TASK_2
---
---  DESCRIPTION:
---
---  This RTEMS task tests some of the capabilities of the Task Manager.
---
-
-   procedure TASK_2 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TASK_3
---
---  DESCRIPTION:
---
---  This RTEMS task tests the Message Queue Manager.
---
-
-   procedure TASK_3 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
-end SPTEST;
diff --git a/c/src/ada-tests/sptests/sp06/config.h b/c/src/ada-tests/sptests/sp06/config.h
deleted file mode 100644
index 7fc8c7580e..0000000000
--- a/c/src/ada-tests/sptests/sp06/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*  config.h
- *
- *  This include file defines the Configuration Table for this test.
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-/* configuration information */
-
-#define CONFIGURE_SPTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_TICKS_PER_TIMESLICE       100
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#define CONFIGURE_MAXIMUM_POSIX_THREADS              10
-#define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
-#define CONFIGURE_MAXIMUM_POSIX_MUTEXES              20
-#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES  10
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/c/src/ada-tests/sptests/sp06/sp06.adb b/c/src/ada-tests/sptests/sp06/sp06.adb
deleted file mode 100644
index 8cd49904d7..0000000000
--- a/c/src/ada-tests/sptests/sp06/sp06.adb
+++ /dev/null
@@ -1,57 +0,0 @@
---
---  MAIN / BODY
---
---  DESCRIPTION:
---
---  This is the entry point for Test SP06 of the Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-with SPTEST;
-with TEST_SUPPORT;
-
-procedure SP06 is
-  INIT_ID : RTEMS.ID;
-  STATUS  : RTEMS.STATUS_CODES;
-begin
-
-   RTEMS.TASK_CREATE(
-      RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
-      1,
-      RTEMS.MINIMUM_STACK_SIZE,
-      RTEMS.NO_PREEMPT,
-      RTEMS.DEFAULT_ATTRIBUTES,
-      INIT_ID,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
-
-
-   RTEMS.TASK_START(
-      INIT_ID,
-      SPTEST.INIT'ACCESS,
-      0,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
-
-   loop
-      delay 120.0;
-   end loop;
-
-end SP06;
-
diff --git a/c/src/ada-tests/sptests/sp06/sp06.scn b/c/src/ada-tests/sptests/sp06/sp06.scn
deleted file mode 100644
index 8dc6c6afae..0000000000
--- a/c/src/ada-tests/sptests/sp06/sp06.scn
+++ /dev/null
@@ -1,38 +0,0 @@
-*** TEST 6 ***
-TA1 - is beginning to run
-TA1 - restarting TA3
-TA2 - is beginning to run
-TA2 - task_wake_after - sleep 1/2 second
-TA2 - task_wake_after - sleep 1/2 second
-TA1 - task_restart - restarting TA2
-TA2 - is beginning to run
-TA2 - task_wake_after - sleep 1/2 second
-TA2 - task_wake_after - sleep 1/2 second
-TA1 - task_restart - restarting self
-TA2 - task_wake_after - sleep 1/2 second
-TA1 - is beginning to run
-TA2 - task_wake_after - sleep 1/2 second
-TA1 - task_restart - restarting TA2
-TA2 - is beginning to run
-TA2 - task_wake_after - sleep 1/2 second
-TA2 - task_wake_after - sleep 1/2 second
-TA1 - task_restart - restarting self
-TA2 - task_wake_after - sleep 1/2 second
-TA1 - is beginning to run
-TA2 - task_wake_after - sleep 1/2 second
-TA1 - task_restart - restarting TA2
-TA2 - is beginning to run
-TA2 - task_wake_after - sleep 1/2 second
-TA2 - task_wake_after - sleep 1/2 second
-TA1 - task_restart - restarting self
-TA2 - task_wake_after - sleep 1/2 second
-TA1 - is beginning to run
-TA2 - task_wake_after - sleep 1/2 second
-TA1 - task_restart - restarting TA2
-TA2 - is beginning to run
-TA2 - task_wake_after - sleep 1/2 second
-TA2 - task_wake_after - sleep 1/2 second
-TA1 - task_restart - restarting self
-TA2 - task_wake_after - sleep 1/2 second
-TA1 - is beginning to run
-*** END OF TEST 6 ***
diff --git a/c/src/ada-tests/sptests/sp06/sptest.adb b/c/src/ada-tests/sptests/sp06/sptest.adb
deleted file mode 100644
index db068639c0..0000000000
--- a/c/src/ada-tests/sptests/sp06/sptest.adb
+++ /dev/null
@@ -1,222 +0,0 @@
---
---  SPTEST / BODY
---
---  DESCRIPTION:
---
---  This package is the implementation of Test 6 of the RTEMS
---  Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with INTERFACES; use INTERFACES;
-with RTEMS;
-with TEST_SUPPORT;
-with TEXT_IO;
-
-package body SPTEST is
-
---PAGE
--- 
---  INIT
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS            : RTEMS.STATUS_CODES;
-      PREVIOUS_PRIORITY : RTEMS.TASK_PRIORITY;
-   begin
-
-      TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** TEST 6 ***" );
-
-      SPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME(  'T', 'A', '1', ' ' );
-      SPTEST.TASK_NAME( 2 ) := RTEMS.BUILD_NAME(  'T', 'A', '2', ' ' );
-      SPTEST.TASK_NAME( 3 ) := RTEMS.BUILD_NAME(  'T', 'A', '3', ' ' );
-
-      SPTEST.ARGUMENT := 0;
-      SPTEST.RESTART_ARGUMENT := 1;
-
-      RTEMS.TASK_CREATE( 
-         SPTEST.TASK_NAME( 1 ), 
-         1, 
-         2048, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.TASK_ID( 1 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA1" );
-
-      RTEMS.TASK_CREATE( 
-         SPTEST.TASK_NAME( 2 ), 
-         1, 
-         2048, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.TASK_ID( 2 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA2" );
-
-      RTEMS.TASK_CREATE( 
-         SPTEST.TASK_NAME( 3 ), 
-         10, 
-         2048, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.TASK_ID( 3 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA3" );
-
-      RTEMS.TASK_START(
-         SPTEST.TASK_ID( 1 ),
-         SPTEST.TASK_1'ACCESS,
-         0,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA1" );
-
-      RTEMS.TASK_START(
-         SPTEST.TASK_ID( 2 ),
-         SPTEST.TASK_2'ACCESS,
-         SPTEST.ARGUMENT,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA2" );
-
-      RTEMS.TASK_START(
-         SPTEST.TASK_ID( 3 ),
-         SPTEST.TASK_3'ACCESS,
-         SPTEST.ARGUMENT,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA3" );
-
-      RTEMS.TASK_SET_PRIORITY(
-         SPTEST.TASK_ID( 3 ),
-         5,
-         PREVIOUS_PRIORITY,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SET_PRIORITY OF TA3" );
-
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
-
-   end INIT;
-
---PAGE
--- 
---  TASK_1
---
-
-   procedure TASK_1 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      PASS   : RTEMS.UNSIGNED32;
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.PUT_LINE( "TA1 - is beginning to run" );
-
-      PASS := ARGUMENT + 1;
-
-      if PASS = 5 then
-         TEXT_IO.PUT_LINE( "*** END OF TEST 6 ***" );
-         RTEMS.SHUTDOWN_EXECUTIVE( 0 );
-      end if;
-
-      if PASS = 1 then
-         TEXT_IO.PUT_LINE( "TA1 - restarting TA3" );
-         RTEMS.TASK_RESTART( 
-            SPTEST.TASK_ID( 3 ), 
-            SPTEST.RESTART_ARGUMENT, 
-            STATUS 
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_RESTART OF TA3" );
-
-         RTEMS.TASK_WAKE_AFTER( 2 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
-
-      end if;
-
-      RTEMS.TASK_WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
-
-      TEXT_IO.PUT_LINE( "TA1 - task_restart - restarting TA2" );
-      RTEMS.TASK_RESTART( 
-         SPTEST.TASK_ID( 2 ), 
-         SPTEST.RESTART_ARGUMENT, 
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_RESTART OF TA2" );
-
-      RTEMS.TASK_WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
-
-      TEXT_IO.PUT_LINE( "TA1 - task_restart - restarting self" );
-      RTEMS.TASK_RESTART( SPTEST.TASK_ID( 1 ), PASS, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_RESTART OF SELF" );
-
-   end TASK_1;
-
---PAGE
--- 
---  TASK_2
---
-
-   procedure TASK_2 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.PUT_LINE( "TA2 - is beginning to run" );
-
-      if ARGUMENT = SPTEST.ARGUMENT then
-         RTEMS.TASK_WAKE_AFTER( 2 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
-      end if;
-
-      loop
-
-         TEXT_IO.PUT_LINE( "TA2 - task_wake_after - sleep 1/2 second" );
-         RTEMS.TASK_WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND / 2, STATUS );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
-
-      end loop;
-
-   end TASK_2;
-
---PAGE
--- 
---  TASK_3
---
-
-   procedure TASK_3 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
-
-   end TASK_3;
-
-end SPTEST;
diff --git a/c/src/ada-tests/sptests/sp06/sptest.ads b/c/src/ada-tests/sptests/sp06/sptest.ads
deleted file mode 100644
index 53d4825ec4..0000000000
--- a/c/src/ada-tests/sptests/sp06/sptest.ads
+++ /dev/null
@@ -1,91 +0,0 @@
---
---  SPTEST / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package is the specification for Test 6 of the RTEMS
---  Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-
-package SPTEST is
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS tasks created
---  by this test.
---
-
-   TASK_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.ID;
-   TASK_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.NAME;
-
---
---  The following are used as arguments to the various RTEMS tasks
---  in this test to indicate when a restart should be performed.
-
-   ARGUMENT         : RTEMS.UNSIGNED32;
-   RESTART_ARGUMENT : RTEMS.UNSIGNED32;
-
---
---  INIT
---
---  DESCRIPTION:
---
---  This RTEMS task initializes the application.
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TASK_1
---
---  DESCRIPTION:
---
---  This RTEMS task tests some of the capabilities of the Task Manager.
---
-
-   procedure TASK_1 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TASK_2
---
---  DESCRIPTION:
---
---  This RTEMS task tests some of the capabilities of the Task Manager.
---
-
-   procedure TASK_2 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TASK_3
---
---  DESCRIPTION:
---
---  This RTEMS task tests some of the capabilities of the Task Manager.
---
-
-   procedure TASK_3 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
-end SPTEST;
diff --git a/c/src/ada-tests/sptests/sp07/config.h b/c/src/ada-tests/sptests/sp07/config.h
deleted file mode 100644
index 8a9352ccc9..0000000000
--- a/c/src/ada-tests/sptests/sp07/config.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*  config.h
- *
- *  This include file defines the Configuration Table for this test.
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-/* configuration information */
-
-#define CONFIGURE_SPTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_MAXIMUM_USER_EXTENSIONS     1
-#define CONFIGURE_TICKS_PER_TIMESLICE       100
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#define CONFIGURE_MAXIMUM_POSIX_THREADS              10
-#define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
-#define CONFIGURE_MAXIMUM_POSIX_MUTEXES              20
-#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES  10
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/c/src/ada-tests/sptests/sp07/sp07.adb b/c/src/ada-tests/sptests/sp07/sp07.adb
deleted file mode 100644
index e86ec72e6d..0000000000
--- a/c/src/ada-tests/sptests/sp07/sp07.adb
+++ /dev/null
@@ -1,57 +0,0 @@
---
---  MAIN / BODY
---
---  DESCRIPTION:
---
---  This is the entry point for Test SP07 of the Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-with SPTEST;
-with TEST_SUPPORT;
-
-procedure SP07 is
-  INIT_ID : RTEMS.ID;
-  STATUS  : RTEMS.STATUS_CODES;
-begin
-
-   RTEMS.TASK_CREATE(
-      RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
-      1,
-      RTEMS.MINIMUM_STACK_SIZE,
-      RTEMS.NO_PREEMPT,
-      RTEMS.DEFAULT_ATTRIBUTES,
-      INIT_ID,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
-
-
-   RTEMS.TASK_START(
-      INIT_ID,
-      SPTEST.INIT'ACCESS,
-      0,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
-
-   loop
-      delay 120.0;
-   end loop;
-
-end SP07;
-
diff --git a/c/src/ada-tests/sptests/sp07/sp07.scn b/c/src/ada-tests/sptests/sp07/sp07.scn
deleted file mode 100644
index 3f171037a7..0000000000
--- a/c/src/ada-tests/sptests/sp07/sp07.scn
+++ /dev/null
@@ -1,32 +0,0 @@
-*** TEST 7 ***
-TASKS_CREATE - TA1 - created.
-TASKS_CREATE - TA2 - created.
-TASKS_CREATE - TA3 - created.
-TASKS_CREATE - TA4 - created.
-TASKS_START - TA1 - started.
-TASKS_START - TA2 - started.
-TASKS_START - TA3 - started.
-TASKS_START - TA4 - started.
-TASKS_RESTART - TA3 - restarted.
-INIT - task_set_note - set TA1's NOTEPAD_8 to TA1's initial priority:  4
-INIT - task_set_note - set TA2's NOTEPAD_8 to TA2's initial priority:  4
-<pause>
-TA1 - task_set_priority - get initial priority of self:  4
-TA1 - task_get_note - get NOTEPAD_8 - current priority:  4
-TA1 - task_set_note - set TA2's NOTEPAD_8:  3
-TA1 - task_set_priority - set TA2's priority:  3
-TA2 - task_get_note - get NOTEPAD_8 - current priority:  3
-TA2 - task_set_note - set TA1's NOTEPAD_8:  2
-TA2 - task_set_priority - set TA1's priority:  2
-TA1 - task_get_note - get NOTEPAD_8 - current priority:  2
-TA1 - task_set_note - set TA2's NOTEPAD_8:  1
-TA1 - task_set_priority - set TA2's priority:  1
-TA2 - task_get_note - get NOTEPAD_8 - current priority:  1
-TA2 - task_suspend - suspend TA1
-TA2 - task_set_priority - set priority of TA1 ( blocked )
-TASKS_DELETE - TA2 deleting TA1
-TASKS_DELETE - TA2 deleting TA3
-TASKS_DELETE - TA2 deleting TA2
-TA4 - exitting task
-TASK_EXITTED - user extension invoked correctly
-*** END OF TEST 7 ***
diff --git a/c/src/ada-tests/sptests/sp07/sptest.adb b/c/src/ada-tests/sptests/sp07/sptest.adb
deleted file mode 100644
index 0c46cf1a62..0000000000
--- a/c/src/ada-tests/sptests/sp07/sptest.adb
+++ /dev/null
@@ -1,496 +0,0 @@
---
---  SPTEST / BODY
---
---  DESCRIPTION:
---
---  This package is the implementation of Test 7 of the RTEMS
---  Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with INTERFACES; use INTERFACES;
-with RTEMS;
-with TEST_SUPPORT;
-with TEXT_IO;
-with UNSIGNED32_IO;
-
-package body SPTEST is
-
---PAGE
---
--- TCB_To_ID
---
-
-      function TCB_To_ID (
-         TCB : RTEMS.TCB_POINTER
-      ) return RTEMS.ID;
-      pragma Import (C, TCB_To_ID, "tcb_to_id" );
-
---PAGE
--- 
---  INIT
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      TIME   : RTEMS.TIME_OF_DAY;
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** TEST 7 ***" );
-
-      SPTEST.EXTENSION_NAME( 1 ) := RTEMS.BUILD_NAME(  'E', 'X', 'T', ' ' );
-
-      RTEMS.EXTENSION_CREATE(
-         SPTEST.EXTENSION_NAME( 1 ),
-         SPTEST.EXTENSIONS'ACCESS,
-         EXTENSION_ID( 1 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "EXTENSION_CREATE" );
-
-      SPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME(  'T', 'A', '1', ' ' );
-      SPTEST.TASK_NAME( 2 ) := RTEMS.BUILD_NAME(  'T', 'A', '2', ' ' );
-      SPTEST.TASK_NAME( 3 ) := RTEMS.BUILD_NAME(  'T', 'A', '3', ' ' );
-      SPTEST.TASK_NAME( 4 ) := RTEMS.BUILD_NAME(  'T', 'A', '4', ' ' );
-
-      RTEMS.TASK_CREATE( 
-         SPTEST.TASK_NAME( 1 ), 
-         4, 
-         RTEMS.MINIMUM_STACK_SIZE, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.TASK_ID( 1 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA1" );
-
-      RTEMS.TASK_CREATE( 
-         SPTEST.TASK_NAME( 2 ), 
-         4, 
-         RTEMS.MINIMUM_STACK_SIZE, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.TASK_ID( 2 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA2" );
-
-      RTEMS.TASK_CREATE( 
-         SPTEST.TASK_NAME( 3 ), 
-         250, 
-         RTEMS.MINIMUM_STACK_SIZE, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.TASK_ID( 3 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA3" );
-
-      RTEMS.TASK_CREATE( 
-         SPTEST.TASK_NAME( 4 ), 
-         254, 
-         RTEMS.MINIMUM_STACK_SIZE, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.TASK_ID( 4 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA4" );
-
-      RTEMS.TASK_START(
-         SPTEST.TASK_ID( 1 ),
-         SPTEST.TASK_1'ACCESS,
-         0,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA1" );
-
-      RTEMS.TASK_START(
-         SPTEST.TASK_ID( 2 ),
-         SPTEST.TASK_2'ACCESS,
-         0,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA2" );
-
-      RTEMS.TASK_START(
-         SPTEST.TASK_ID( 3 ),
-         SPTEST.TASK_3'ACCESS,
-         0,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA3" );
-
-      RTEMS.TASK_START(
-         SPTEST.TASK_ID( 4 ),
-         SPTEST.TASK_4'ACCESS,
-         0,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA4" );
-
-      RTEMS.TASK_RESTART( SPTEST.TASK_ID( 3 ), 0, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_RESTART OF TA3" );
-
-      RTEMS.TASK_SET_NOTE( SPTEST.TASK_ID( 1 ), 8, 4, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SET_NOTE OF TA1" );
-      TEXT_IO.PUT( "INIT - task_set_note - set TA1's NOTEPAD_8" ); 
-      TEXT_IO.PUT_LINE( " to TA1's initial priority:  4" );
-      
-      RTEMS.TASK_SET_NOTE( SPTEST.TASK_ID( 2 ), 8, 4, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SET_NOTE OF TA2" );
-      TEXT_IO.PUT( "INIT - task_set_note - set TA2's NOTEPAD_8" ); 
-      TEXT_IO.PUT_LINE( " to TA2's initial priority:  4" );
-
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
-
-   end INIT;
-
---PAGE
--- 
---  TASK_1
---
-
-   procedure TASK_1 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS            : RTEMS.STATUS_CODES;
-      THE_PRIORITY      : RTEMS.TASK_PRIORITY;
-      PREVIOUS_PRIORITY : RTEMS.TASK_PRIORITY;
-   begin
-
-      TEST_SUPPORT.PAUSE;
-
-      RTEMS.TASK_SET_PRIORITY( 
-         RTEMS.SELF, 
-         RTEMS.CURRENT_PRIORITY, 
-         THE_PRIORITY, 
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SET_PRIORITY" );
-      TEXT_IO.PUT( "TA1 - task_set_priority - ");
-      TEXT_IO.PUT( "get initial priority of self: ");
-      UNSIGNED32_IO.PUT( THE_PRIORITY, BASE => 10, WIDTH => 2 );
-      TEXT_IO.NEW_LINE;
-
-      loop
-
-         RTEMS.TASK_GET_NOTE( RTEMS.SELF, 8, THE_PRIORITY, STATUS );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_GET_NOTE" );
-         TEXT_IO.PUT( "TA1 - task_get_note - "); 
-         TEXT_IO.PUT( "get NOTEPAD_8 - current priority: " );
-         UNSIGNED32_IO.PUT( THE_PRIORITY, BASE => 10, WIDTH => 2 );
-         TEXT_IO.NEW_LINE;
-
-         THE_PRIORITY := THE_PRIORITY - 1;
-
-         if THE_PRIORITY = 0 then
-            TEXT_IO.PUT_LINE( "TA1 - task_suspend - suspend TA2" ); 
-            RTEMS.TASK_SUSPEND( SPTEST.TASK_ID( 2 ), STATUS );
-            TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SUSPEND" );
-
-            TEXT_IO.PUT( "TA1 - task_set_priority - ");
-            TEXT_IO.PUT_LINE( "set priority of TA2 ( blocked )");
-            RTEMS.TASK_SET_PRIORITY( 
-               SPTEST.TASK_ID( 2 ), 
-               5, 
-               PREVIOUS_PRIORITY, 
-               STATUS
-            );
-            TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SET_PRIORITY" );
-
-            RTEMS.TASK_DELETE( SPTEST.TASK_ID( 2 ), STATUS );
-            TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF TA2" );
-
-            RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-            TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
-
-         end if;
-
-         TEXT_IO.PUT( "TA1 - task_set_note - set TA2's NOTEPAD_8: " );
-         UNSIGNED32_IO.PUT( THE_PRIORITY, BASE => 10, WIDTH => 2 );
-         TEXT_IO.NEW_LINE;
-         RTEMS.TASK_SET_NOTE( 
-            SPTEST.TASK_ID( 2 ), 
-            8, 
-            THE_PRIORITY, 
-            STATUS
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SET_NOTE" );
-
-         TEXT_IO.PUT("TA1 - task_set_priority - set TA2's priority: ");
-         UNSIGNED32_IO.PUT( THE_PRIORITY, BASE => 10, WIDTH => 2 );
-         TEXT_IO.NEW_LINE;
-         RTEMS.TASK_SET_PRIORITY( 
-            SPTEST.TASK_ID( 2 ), 
-            THE_PRIORITY, 
-            PREVIOUS_PRIORITY, 
-            STATUS
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SET_PRIORITY" );
-
-      end loop;
-   
-   end TASK_1;
-
---PAGE
--- 
---  TASK_2
---
-
-   procedure TASK_2 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS            : RTEMS.STATUS_CODES;
-      THE_PRIORITY      : RTEMS.TASK_PRIORITY;
-      PREVIOUS_PRIORITY : RTEMS.TASK_PRIORITY;
-   begin
-
-      loop
-
-         RTEMS.TASK_GET_NOTE( RTEMS.SELF, 8, THE_PRIORITY, STATUS );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_GET_NOTE" );
-         TEXT_IO.PUT( "TA2 - task_get_note - ");
-         TEXT_IO.PUT( "get NOTEPAD_8 - current priority: " );
-         UNSIGNED32_IO.PUT( THE_PRIORITY, BASE => 10, WIDTH => 2 );
-         TEXT_IO.NEW_LINE;
-
-         THE_PRIORITY := THE_PRIORITY - 1;
-
-         if THE_PRIORITY = 0 then
-            TEXT_IO.PUT_LINE( "TA2 - task_suspend - suspend TA1" ); 
-            RTEMS.TASK_SUSPEND( SPTEST.TASK_ID( 1 ), STATUS );
-            TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SUSPEND" );
-
-            TEXT_IO.PUT( "TA2 - task_set_priority - ");
-            TEXT_IO.PUT_LINE( "set priority of TA1 ( blocked )");
-            RTEMS.TASK_SET_PRIORITY( 
-               SPTEST.TASK_ID( 1 ), 
-               5, 
-               PREVIOUS_PRIORITY, 
-               STATUS
-            );
-            TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SET_PRIORITY" );
-
-            RTEMS.TASK_DELETE( 
-               SPTEST.TASK_ID( 1 ), 
-               STATUS 
-            );                            -- TA1 is blocked
-            TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF TA1" );
-
-            RTEMS.TASK_DELETE( 
-               SPTEST.TASK_ID( 3 ), 
-               STATUS
-            );                            -- TA3 is ready
-            TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF TA3" );
-
-            RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-            TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
-
-         else
-
-            TEXT_IO.PUT( "TA2 - task_set_note - set TA1's NOTEPAD_8: " );
-            UNSIGNED32_IO.PUT( THE_PRIORITY, BASE => 10, WIDTH => 2 );
-            TEXT_IO.NEW_LINE;
-            RTEMS.TASK_SET_NOTE( 
-               SPTEST.TASK_ID( 1 ), 
-               8, 
-               THE_PRIORITY, 
-               STATUS
-            );
-            TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SET_NOTE" );
-
-            TEXT_IO.PUT( "TA2 - task_set_priority - "); 
-            TEXT_IO.PUT( "set TA1's priority: ");
-            UNSIGNED32_IO.PUT( THE_PRIORITY, BASE => 10, WIDTH => 2);
-            TEXT_IO.NEW_LINE;
-            RTEMS.TASK_SET_PRIORITY( 
-               SPTEST.TASK_ID( 1 ), 
-               THE_PRIORITY, 
-               PREVIOUS_PRIORITY, 
-               STATUS
-            );
-            TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SET_PRIORITY" );
-
-         end if;
-
-      end loop;
-   
-   end TASK_2;
-
---PAGE
--- 
---  TASK_3
---
-
-   procedure TASK_3 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-   
-      loop
-
-         RTEMS.TASK_WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
-
-      end loop;
-
-   end TASK_3;
-
---PAGE
--- 
---  TASK_4
---
-
-   procedure TASK_4 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-   begin
-
-      TEXT_IO.PUT_LINE( "TA4 - exitting task" );
-
-   end TASK_4;
-
---PAGE
--- 
---  TASK_EXIT_EXTENSION
---
-
-   procedure TASK_EXIT_EXTENSION (
-      RUNNING_TASK : in     RTEMS.TCB_POINTER
-   ) is
-   begin
-
-      if TEST_SUPPORT.TASK_NUMBER( TCB_To_ID( RUNNING_TASK ) ) > 0 then
-         TEXT_IO.PUT_LINE( "TASK_EXITTED - user extension invoked correctly" );
-      end if;
-
-      TEXT_IO.PUT_LINE( "*** END OF TEST 7 ***" );
-      RTEMS.SHUTDOWN_EXECUTIVE( 0 );
-
-   end TASK_EXIT_EXTENSION;
-
---PAGE
--- 
---  TASK_CREATE_EXTENSION
---
-
-   procedure TASK_CREATE_EXTENSION (
-      UNUSED       : in     RTEMS.TCB_POINTER;
-      CREATED_TASK : in     RTEMS.TCB_POINTER
-   ) is
-   begin
-
-      if TEST_SUPPORT.TASK_NUMBER( TCB_To_ID( CREATED_TASK ) ) > 0 then
-         TEXT_IO.PUT( "TASKS_CREATE - " );
-         TEST_SUPPORT.PUT_NAME( 
-            SPTEST.TASK_NAME( 
-               TEST_SUPPORT.TASK_NUMBER( TCB_To_ID( CREATED_TASK ) )
-            ),
-            FALSE
-         );
-         TEXT_IO.PUT_LINE( "- created." );
-      end if;
-
-   end TASK_CREATE_EXTENSION;
-
---PAGE
--- 
---  TASK_DELETE_EXTENSION
---
-
-   procedure TASK_DELETE_EXTENSION (
-      RUNNING_TASK : in     RTEMS.TCB_POINTER;
-      DELETED_TASK : in     RTEMS.TCB_POINTER
-   ) is
-   begin
-
-      if TEST_SUPPORT.TASK_NUMBER( TCB_To_ID( RUNNING_TASK ) ) > 0 then
-         TEXT_IO.PUT( "TASKS_DELETE - " );
-         TEST_SUPPORT.PUT_NAME( 
-            SPTEST.TASK_NAME( 
-               TEST_SUPPORT.TASK_NUMBER( TCB_To_ID( RUNNING_TASK ) ) 
-            ),
-            FALSE
-         );
-      end if;
-
-      if TEST_SUPPORT.TASK_NUMBER( TCB_To_ID( DELETED_TASK ) ) > 0 then
-         TEXT_IO.PUT( "deleting " );
-         TEST_SUPPORT.PUT_NAME( 
-            SPTEST.TASK_NAME( 
-               TEST_SUPPORT.TASK_NUMBER( TCB_To_ID( DELETED_TASK ) ) 
-            ),
-            TRUE
-         );
-      end if;
-
-   end TASK_DELETE_EXTENSION;
-
---PAGE
--- 
---  TASK_RESTART_EXTENSION
---
-
-   procedure TASK_RESTART_EXTENSION (
-      UNUSED         : in     RTEMS.TCB_POINTER;
-      RESTARTED_TASK : in     RTEMS.TCB_POINTER
-   ) is
-   begin
-
-      if TEST_SUPPORT.TASK_NUMBER( TCB_To_ID( RESTARTED_TASK ) ) > 0 then
-         TEXT_IO.PUT( "TASKS_RESTART - " );
-         TEST_SUPPORT.PUT_NAME( 
-            SPTEST.TASK_NAME( 
-               TEST_SUPPORT.TASK_NUMBER( TCB_To_ID( RESTARTED_TASK ) ) 
-            ),
-            FALSE
-         );
-         TEXT_IO.PUT_LINE( " - restarted." );
-      end if;
-
-   end TASK_RESTART_EXTENSION;
-
---PAGE
--- 
---  TASK_START_EXTENSION
---
-
-   procedure TASK_START_EXTENSION (
-      UNUSED       : in     RTEMS.TCB_POINTER;
-      STARTED_TASK : in     RTEMS.TCB_POINTER
-   ) is
-   begin
-
-      if TEST_SUPPORT.TASK_NUMBER( TCB_To_ID( STARTED_TASK ) ) > 0 then
-         TEXT_IO.PUT( "TASKS_START - " );
-         TEST_SUPPORT.PUT_NAME( 
-            SPTEST.TASK_NAME( 
-               TEST_SUPPORT.TASK_NUMBER( TCB_To_ID( STARTED_TASK ) ) 
-            ),
-            FALSE
-         );
-         TEXT_IO.PUT_LINE( " - started." );
-      end if;
-
-   end TASK_START_EXTENSION;
-
-end SPTEST;
diff --git a/c/src/ada-tests/sptests/sp07/sptest.ads b/c/src/ada-tests/sptests/sp07/sptest.ads
deleted file mode 100644
index 2fcfec1888..0000000000
--- a/c/src/ada-tests/sptests/sp07/sptest.ads
+++ /dev/null
@@ -1,186 +0,0 @@
---
---  SPTEST / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package is the specification for Test 7 of the RTEMS
---  Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-
-package SPTEST is
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS tasks created
---  by this test.
---
-
-   TASK_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 4 ) of RTEMS.ID;
-   TASK_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 4 ) of RTEMS.NAME;
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS extensions created
---  by this test.
---
- 
-   EXTENSION_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.ID;
-   EXTENSION_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.NAME;
- 
---
---  INIT
---
---  DESCRIPTION:
---
---  This RTEMS task initializes the application.
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TASK_1
---
---  DESCRIPTION:
---
---  This RTEMS task tests some of the capabilities of the Task Manager.
---
-
-   procedure TASK_1 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TASK_2
---
---  DESCRIPTION:
---
---  This RTEMS task tests some of the capabilities of the Task Manager.
---
-
-   procedure TASK_2 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TASK_3
---
---  DESCRIPTION:
---
---  This RTEMS task tests some of the capabilities of the Task Manager.
---
-
-   procedure TASK_3 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TASK_4
---
---  DESCRIPTION:
---
---  This RTEMS task tests the Message Queue Manager.
---
-
-   procedure TASK_4 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TASK_CREATE_EXTENSION
---
---  DESCRIPTION:
---
---  This subprogram is the TASK_CREATE extension for this test.
---
-
-   procedure TASK_CREATE_EXTENSION (
-      UNUSED       : in     RTEMS.TCB_POINTER;
-      CREATED_TASK : in     RTEMS.TCB_POINTER
-   );
-
---
---  TASK_DELETE_EXTENSION
---
---  DESCRIPTION:
---
---  This subprogram is the TASK_DELETE extension for this test.
---
-
-   procedure TASK_DELETE_EXTENSION (
-      RUNNING_TASK : in     RTEMS.TCB_POINTER;
-      DELETED_TASK : in     RTEMS.TCB_POINTER
-   );
-
---
---  TASK_RESTART_EXTENSION
---
---  DESCRIPTION:
---
---  This subprogram is the TASK_RESTART extension for this test.
---
-
-   procedure TASK_RESTART_EXTENSION (
-      UNUSED         : in     RTEMS.TCB_POINTER;
-      RESTARTED_TASK : in     RTEMS.TCB_POINTER
-   );
-
---
---  TASK_START_EXTENSION
---
---  DESCRIPTION:
---
---  This subprogram is the TASK_START extension for this test.
---
-
-   procedure TASK_START_EXTENSION (
-      UNUSED       : in     RTEMS.TCB_POINTER;
-      STARTED_TASK : in     RTEMS.TCB_POINTER
-   );
-
---
---  TASK_EXIT_EXTENSION
---
---  DESCRIPTION:
---
---  This subprogram is the TASK_EXIT extension for this test.
---  It is invoked when a RTEMS task exits from its entry point.
---
-
-   procedure TASK_EXIT_EXTENSION (
-      RUNNING_TASK : in     RTEMS.TCB_POINTER
-   );
-
---
---  This is the User Extension Table for this test.
---
-
-   EXTENSIONS : aliased RTEMS.EXTENSIONS_TABLE :=
-   (
-        SPTEST.TASK_CREATE_EXTENSION'ACCESS,         -- Task create
-        SPTEST.TASK_START_EXTENSION'ACCESS,          -- Task start
-        SPTEST.TASK_RESTART_EXTENSION'ACCESS,        -- Task restart
-        SPTEST.TASK_DELETE_EXTENSION'ACCESS,         -- Task delete
-        NULL,                                        -- Task switch
-        NULL,                                        -- Task post switch
-        NULL,                                        -- Task begin
-        SPTEST.TASK_EXIT_EXTENSION'ACCESS,           -- Task exitted
-        NULL                                         -- Fatal error
-   );
-
-end SPTEST;
diff --git a/c/src/ada-tests/sptests/sp08/config.h b/c/src/ada-tests/sptests/sp08/config.h
deleted file mode 100644
index 7fc8c7580e..0000000000
--- a/c/src/ada-tests/sptests/sp08/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*  config.h
- *
- *  This include file defines the Configuration Table for this test.
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-/* configuration information */
-
-#define CONFIGURE_SPTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_TICKS_PER_TIMESLICE       100
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#define CONFIGURE_MAXIMUM_POSIX_THREADS              10
-#define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
-#define CONFIGURE_MAXIMUM_POSIX_MUTEXES              20
-#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES  10
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/c/src/ada-tests/sptests/sp08/sp08.adb b/c/src/ada-tests/sptests/sp08/sp08.adb
deleted file mode 100644
index 2f1a587979..0000000000
--- a/c/src/ada-tests/sptests/sp08/sp08.adb
+++ /dev/null
@@ -1,57 +0,0 @@
---
---  MAIN / BODY
---
---  DESCRIPTION:
---
---  This is the entry point for Test SP08 of the Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-with SPTEST;
-with TEST_SUPPORT;
-
-procedure SP08 is
-  INIT_ID : RTEMS.ID;
-  STATUS  : RTEMS.STATUS_CODES;
-begin
-
-   RTEMS.TASK_CREATE(
-      RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
-      1,
-      RTEMS.MINIMUM_STACK_SIZE,
-      RTEMS.NO_PREEMPT,
-      RTEMS.DEFAULT_ATTRIBUTES,
-      INIT_ID,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
-
-
-   RTEMS.TASK_START(
-      INIT_ID,
-      SPTEST.INIT'ACCESS,
-      0,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
-
-   loop
-      delay 120.0;
-   end loop;
-
-end SP08;
-
diff --git a/c/src/ada-tests/sptests/sp08/sp08.scn b/c/src/ada-tests/sptests/sp08/sp08.scn
deleted file mode 100644
index bc829b849a..0000000000
--- a/c/src/ada-tests/sptests/sp08/sp08.scn
+++ /dev/null
@@ -1,20 +0,0 @@
-*** TEST 8 ***
-TA1 - task_mode - ASR                  - previous mode:     16#0#
-TA1 - task_mode - NO_ASR               - previous mode:     16#0#
-TA1 - task_mode - NO_ASR               - previous mode:   16#400#
-TA1 - task_mode - ASR                  - previous mode:   16#400#
-TA1 - task_mode - NO_TIMESLICE         - previous mode:     16#0#
-TA1 - task_mode - TIMESLICE            - previous mode:     16#0#
-TA1 - task_mode - TIMESLICE            - previous mode:   16#200#
-TA1 - task_mode - NO_TIMESLICE         - previous mode:   16#200#
-TA1 - task_mode - PREEMPT              - previous mode:     16#0#
-TA1 - task_mode - NO_PREEMPT           - previous mode:     16#0#
-TA1 - task_mode - NO_PREEMPT           - previous mode:   16#100#
-TA1 - task_mode - PREEMPT              - previous mode:   16#100#
-TA1 - task_mode - INTERRUPT_LEVEL( 3 ) - previous mode:     16#0#
-TA1 - task_mode - INTERRUPT_LEVEL( 5 ) - previous mode:     16#3#
-TA1 - task_mode - set all modes        - previous mode:     16#5#
-TA1 - task_mode - set all modes        - previous mode:   16#703#
-TA1 - task_mode - clear all modes      - previous mode:   16#703#
-TA1 - task_mode - get current mode     - previous mode:     16#0#
-*** END OF TEST 8 ***
diff --git a/c/src/ada-tests/sptests/sp08/sptest.adb b/c/src/ada-tests/sptests/sp08/sptest.adb
deleted file mode 100644
index 725849df43..0000000000
--- a/c/src/ada-tests/sptests/sp08/sptest.adb
+++ /dev/null
@@ -1,351 +0,0 @@
---
---  SPTEST / BODY
---
---  DESCRIPTION:
---
---  This package is the implementation of Test 8 of the RTEMS
---  Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with INTERFACES; use INTERFACES;
-with RTEMS;
-with TEST_SUPPORT;
-with TEXT_IO;
-with UNSIGNED32_IO;
-
-package body SPTEST is
-
---PAGE
--- 
---  INIT
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** TEST 8 ***" );
-
-      SPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME(  'T', 'A', '1', ' ' );
-
-      RTEMS.TASK_CREATE( 
-         SPTEST.TASK_NAME( 1 ), 
-         1, 
-         2048, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.TASK_ID( 1 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA1" );
-
-      RTEMS.TASK_START(
-         SPTEST.TASK_ID( 1 ),
-         SPTEST.TASK_1'ACCESS,
-         0,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA1" );
-
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
-
-   end INIT;
-
---PAGE
--- 
---  PUT_MODE
---
-
-   procedure PUT_MODE(
-      COMMENT     : in    STRING;
-      OUTPUT_MODE : in    RTEMS.MODE
-   ) is
-   begin
-
-      TEXT_IO.PUT( COMMENT );
-      UNSIGNED32_IO.PUT( OUTPUT_MODE, BASE => 16, WIDTH => 8 );
-      TEXT_IO.NEW_LINE;
-
-   end PUT_MODE;
-
---PAGE
--- 
---  TASK_1
---
-
-   procedure TASK_1 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      PREVIOUS_MODE : RTEMS.MODE;
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
--- BEGINNING OF ASR
-
-      RTEMS.TASK_MODE( 
-         RTEMS.ASR, 
-         RTEMS.ASR_MASK, 
-         PREVIOUS_MODE, 
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_MODE" );
-      SPTEST.PUT_MODE(
-         "TA1 - task_mode - ASR                  - previous mode: ", 
-         PREVIOUS_MODE
-      );
-   
-      RTEMS.TASK_MODE( 
-         RTEMS.NO_ASR, 
-         RTEMS.ASR_MASK, 
-         PREVIOUS_MODE, 
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_MODE" );
-      SPTEST.PUT_MODE(
-         "TA1 - task_mode - NO_ASR               - previous mode: ", 
-         PREVIOUS_MODE
-      );
-   
-      RTEMS.TASK_MODE( 
-         RTEMS.NO_ASR, 
-         RTEMS.ASR_MASK, 
-         PREVIOUS_MODE, 
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_MODE" );
-      SPTEST.PUT_MODE(
-         "TA1 - task_mode - NO_ASR               - previous mode: ", 
-         PREVIOUS_MODE
-      );
-   
-      RTEMS.TASK_MODE( 
-         RTEMS.ASR, 
-         RTEMS.ASR_MASK, 
-         PREVIOUS_MODE, 
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_MODE" );
-      SPTEST.PUT_MODE(
-         "TA1 - task_mode - ASR                  - previous mode: ", 
-         PREVIOUS_MODE
-      );
-   
--- END OF ASR
-
--- BEGINNING OF TIMESLICE
-
-      RTEMS.TASK_MODE( 
-         RTEMS.NO_TIMESLICE, 
-         RTEMS.TIMESLICE_MASK, 
-         PREVIOUS_MODE, 
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_MODE" );
-      SPTEST.PUT_MODE(
-         "TA1 - task_mode - NO_TIMESLICE         - previous mode: ", 
-         PREVIOUS_MODE
-      );
-   
-      RTEMS.TASK_MODE( 
-         RTEMS.TIMESLICE, 
-         RTEMS.TIMESLICE_MASK, 
-         PREVIOUS_MODE, 
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_MODE" );
-      SPTEST.PUT_MODE(
-         "TA1 - task_mode - TIMESLICE            - previous mode: ", 
-         PREVIOUS_MODE
-      );
-   
-      RTEMS.TASK_MODE( 
-         RTEMS.TIMESLICE, 
-         RTEMS.TIMESLICE_MASK, 
-         PREVIOUS_MODE, 
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_MODE" );
-      SPTEST.PUT_MODE(
-         "TA1 - task_mode - TIMESLICE            - previous mode: ", 
-         PREVIOUS_MODE
-      );
-   
-      RTEMS.TASK_MODE( 
-         RTEMS.NO_TIMESLICE, 
-         RTEMS.TIMESLICE_MASK, 
-         PREVIOUS_MODE, 
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_MODE" );
-      SPTEST.PUT_MODE(
-         "TA1 - task_mode - NO_TIMESLICE         - previous mode: ", 
-         PREVIOUS_MODE
-      );
-   
--- END OF TIMESLICE
-
--- BEGINNING OF PREEMPT
-
-      RTEMS.TASK_MODE( 
-         RTEMS.PREEMPT, 
-         RTEMS.PREEMPT_MASK, 
-         PREVIOUS_MODE, 
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_MODE" );
-      SPTEST.PUT_MODE(
-         "TA1 - task_mode - PREEMPT              - previous mode: ", 
-         PREVIOUS_MODE
-      );
-   
-      RTEMS.TASK_MODE( 
-         RTEMS.NO_PREEMPT, 
-         RTEMS.PREEMPT_MASK, 
-         PREVIOUS_MODE, 
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_MODE" );
-      SPTEST.PUT_MODE(
-         "TA1 - task_mode - NO_PREEMPT           - previous mode: ", 
-         PREVIOUS_MODE
-      );
-   
-      RTEMS.TASK_MODE( 
-         RTEMS.NO_PREEMPT, 
-         RTEMS.PREEMPT_MASK, 
-         PREVIOUS_MODE, 
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_MODE" );
-      SPTEST.PUT_MODE(
-         "TA1 - task_mode - NO_PREEMPT           - previous mode: ", 
-         PREVIOUS_MODE
-      );
-   
-      RTEMS.TASK_MODE( 
-         RTEMS.PREEMPT, 
-         RTEMS.PREEMPT_MASK, 
-         PREVIOUS_MODE, 
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_MODE" );
-      SPTEST.PUT_MODE(
-         "TA1 - task_mode - PREEMPT              - previous mode: ", 
-         PREVIOUS_MODE
-      );
-   
--- END OF PREEMPT
-
--- BEGINNING OF INTERRUPT LEVEL
-
-      RTEMS.TASK_MODE( 
-         RTEMS.INTERRUPT_LEVEL( 3 ), 
-         RTEMS.INTERRUPT_MASK, 
-         PREVIOUS_MODE, 
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_MODE" );
-      SPTEST.PUT_MODE(
-         "TA1 - task_mode - INTERRUPT_LEVEL( 3 ) - previous mode: ", 
-         PREVIOUS_MODE
-      );
-   
-      RTEMS.TASK_MODE( 
-         RTEMS.INTERRUPT_LEVEL( 5 ), 
-         RTEMS.INTERRUPT_MASK, 
-         PREVIOUS_MODE, 
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_MODE" );
-      SPTEST.PUT_MODE(
-         "TA1 - task_mode - INTERRUPT_LEVEL( 5 ) - previous mode: ", 
-         PREVIOUS_MODE
-      );
-   
--- END OF INTERRUPT LEVEL
-
--- BEGINNING OF COMBINATIONS
-
-      RTEMS.TASK_MODE( 
-         RTEMS.INTERRUPT_LEVEL( 3 ) + RTEMS.NO_ASR + 
-            RTEMS.TIMESLICE + RTEMS.NO_PREEMPT, 
-         RTEMS.INTERRUPT_MASK + RTEMS.ASR_MASK + 
-            RTEMS.TIMESLICE_MASK + RTEMS.PREEMPT_MASK, 
-         PREVIOUS_MODE, 
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_MODE" );
-      SPTEST.PUT_MODE(
-         "TA1 - task_mode - set all modes        - previous mode: ", 
-         PREVIOUS_MODE
-      );
-   
-      RTEMS.TASK_MODE( 
-         RTEMS.INTERRUPT_LEVEL( 3 ) + RTEMS.NO_ASR + 
-            RTEMS.TIMESLICE + RTEMS.NO_PREEMPT, 
-         RTEMS.INTERRUPT_MASK + RTEMS.ASR_MASK + 
-            RTEMS.TIMESLICE_MASK + RTEMS.PREEMPT_MASK, 
-         PREVIOUS_MODE, 
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_MODE" );
-      SPTEST.PUT_MODE(
-         "TA1 - task_mode - set all modes        - previous mode: ", 
-         PREVIOUS_MODE
-      );
-   
-      RTEMS.TASK_MODE( 
-         RTEMS.INTERRUPT_LEVEL( 0 ) + RTEMS.ASR + 
-            RTEMS.NO_TIMESLICE + RTEMS.PREEMPT, 
-         RTEMS.INTERRUPT_MASK + RTEMS.ASR_MASK + 
-            RTEMS.TIMESLICE_MASK + RTEMS.PREEMPT_MASK, 
-         PREVIOUS_MODE, 
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_MODE" );
-      SPTEST.PUT_MODE(
-         "TA1 - task_mode - clear all modes      - previous mode: ", 
-         PREVIOUS_MODE
-      );
-   
--- END OF COMBINATIONS
-
--- BEGINNING OF CURRENT MODE
-
-      RTEMS.TASK_MODE( 
-         RTEMS.CURRENT_MODE,
-         RTEMS.CURRENT_MODE,
-         PREVIOUS_MODE, 
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_MODE" );
-      SPTEST.PUT_MODE(
-         "TA1 - task_mode - get current mode     - previous mode: ", 
-         PREVIOUS_MODE
-      );
-   
--- END OF CURRENT MODE
-
-      TEXT_IO.PUT_LINE( "*** END OF TEST 8 ***" );
-      RTEMS.SHUTDOWN_EXECUTIVE( 0 );
-   end TASK_1;
-
-end SPTEST;
diff --git a/c/src/ada-tests/sptests/sp08/sptest.ads b/c/src/ada-tests/sptests/sp08/sptest.ads
deleted file mode 100644
index c9f0327172..0000000000
--- a/c/src/ada-tests/sptests/sp08/sptest.ads
+++ /dev/null
@@ -1,74 +0,0 @@
---
---  SPTEST / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package is the specification for Test 8 of the RTEMS
---  Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-
-package SPTEST is
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS tasks created
---  by this test.
---
-
-   TASK_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.ID;
-   TASK_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.NAME;
-
---
---  INIT
---
---  DESCRIPTION:
---
---  This RTEMS task initializes the application.
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  PUT_MODE
---
---  DESCRIPTION:
---
---  This subprogram prints the COMMENT and the OUTPUT_MODE followed
---  by a carriage return.
---
-
-   procedure PUT_MODE(
-      COMMENT     : in    STRING;
-      OUTPUT_MODE : in    RTEMS.MODE
-   );
-
---
---  TASK_1
---
---  DESCRIPTION:
---
---  This RTEMS task tests the TASK_MODE directive of the Task Manager.
---
-
-   procedure TASK_1 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
-end SPTEST;
diff --git a/c/src/ada-tests/sptests/sp09/config.h b/c/src/ada-tests/sptests/sp09/config.h
deleted file mode 100644
index adf05616b7..0000000000
--- a/c/src/ada-tests/sptests/sp09/config.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*  config.h
- *
- *  This include file defines the Configuration Table for this test.
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-/* configuration information */
-
-#define CONFIGURE_SPTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_MAXIMUM_TIMERS              1
-#define CONFIGURE_MAXIMUM_SEMAPHORES          2
-#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES      1
-#define CONFIGURE_MAXIMUM_PARTITIONS          1
-#define CONFIGURE_MAXIMUM_REGIONS             1
-#define CONFIGURE_MAXIMUM_PERIODS             1
-#define CONFIGURE_MAXIMUM_USER_EXTENSIONS     0
-#define CONFIGURE_TICKS_PER_TIMESLICE       100
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#define CONFIGURE_MAXIMUM_POSIX_THREADS              10
-#define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
-#define CONFIGURE_MAXIMUM_POSIX_MUTEXES              20
-#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES  10
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/c/src/ada-tests/sptests/sp09/sp09.adb b/c/src/ada-tests/sptests/sp09/sp09.adb
deleted file mode 100644
index 669b52c1ef..0000000000
--- a/c/src/ada-tests/sptests/sp09/sp09.adb
+++ /dev/null
@@ -1,57 +0,0 @@
---
---  MAIN / BODY
---
---  DESCRIPTION:
---
---  This is the entry point for Test SP09 of the Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-with SPTEST;
-with TEST_SUPPORT;
-
-procedure SP09 is
-  INIT_ID : RTEMS.ID;
-  STATUS  : RTEMS.STATUS_CODES;
-begin
-
-   RTEMS.TASK_CREATE(
-      RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
-      1,
-      RTEMS.MINIMUM_STACK_SIZE,
-      RTEMS.NO_PREEMPT,
-      RTEMS.DEFAULT_ATTRIBUTES,
-      INIT_ID,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
-
-
-   RTEMS.TASK_START(
-      INIT_ID,
-      SPTEST.INIT'ACCESS,
-      0,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
-
-   loop
-      delay 120.0;
-   end loop;
-
-end SP09;
-
diff --git a/c/src/ada-tests/sptests/sp09/sp09.scn b/c/src/ada-tests/sptests/sp09/sp09.scn
deleted file mode 100644
index a82582e51f..0000000000
--- a/c/src/ada-tests/sptests/sp09/sp09.scn
+++ /dev/null
@@ -1,250 +0,0 @@
-*** TEST 9 ***
-INIT - task_create - INVALID_SIZE -- NOT CHECKED
-INIT - task_create - INVALID_PRIORITY
-INIT - task_restart - INCORRECT_STATE
-TA1 - task_delete - INVALID_ID
-TA1 - task_get_note - INVALID_NUMBER -- constraint error
-TA1 - task_get_note - INVALID_ID
-TA1 - task_ident - current task SUCCESSFUL
-TA1 - task_ident - global INVALID_NAME
-TA1 - task_ident - local INVALID_NAME
-TA1 - task_ident - INVALID_NODE
-TA1 - task_restart - INVALID_ID
-TA1 - task_resume - INVALID_ID
-TA1 - task_resume - INCORRECT_STATE
-TA1 - task_set_priority - INVALID_PRIORITY -- constraint error
-TA1 - task_set_priority - INVALID_ID
-TA1 - task_set_note - INVALID_NUMBER -- constraint error 
-TA1 - task_set_note - INVALID_ID
-TA1 - task_start - INVALID_ID
-TA1 - task_start - INCORRECT_STATE
-TA1 - task_suspend - INVALID_ID
-<pause - screen 2>
-TA1 - clock_get - NOT_DEFINED
-TA1 - task_wake_when - NOT_DEFINED
-TA1 - timer_fire_when - NOT_DEFINED
-TA1 - clock_set -  8:30:45    2/ 5/1987 - INVALID_CLOCK
-TA1 - clock_set -  8:30:45   15/ 5/1988 - INVALID_CLOCK
-TA1 - clock_set -  8:30:45    2/32/1988 - INVALID_CLOCK
-TA1 - clock_set - 25:30:45    2/ 5/1988 - INVALID_CLOCK
-TA1 - clock_set -  8:61:45    2/ 5/1988 - INVALID_CLOCK
-TA1 - clock_set -  8:30:61    2/ 5/1988 - INVALID_CLOCK
-TA1 - clock_set -  8:30:45    2/ 5/1988 - INVALID_CLOCK
-TA1 - clock_set -  8:30:45    2/ 5/1988 - SUCCESSFUL
-TA1 - task_wake_when - TICK INVALID - sleep about 3 seconds
-TA1 - task_wake_when - TICK INVALID - woke up SUCCESSFUL
-TA1 - task_wake_when -  8:30:48    2/ 5/1961 - INVALID_CLOCK
-TA1 - task_wake_when - 25:30:48    2/ 5/1988 - INVALID_CLOCK
-TA1 - current time -  8:30:48    2/ 5/1988
-TA1 - task_wake_when -  8:30:48    1/ 5/1988 - INVALID_CLOCK
-<pause - screen 3>
-TA1 - task_create - INVALID_NAME
-TA1 - task_create - stack size - UNSATISFIED
-TA1 - task_create - TA2 created - SUCCESSFUL
-TA1 - task_suspend - suspend TA2 - SUCCESSFUL
-TA1 - task_suspend - suspend TA2 - ALREADY_SUSPENDED
-TA1 - task_resume - TA2 resumed - SUCCESSFUL
-TA1 - task_create - TA3 created - SUCCESSFUL
-TA1 - task_create - 4 created - SUCCESSFUL
-TA1 - task_create - 5 created - SUCCESSFUL
-TA1 - task_create - 6 created - SUCCESSFUL
-TA1 - task_create - 7 created - SUCCESSFUL
-TA1 - task_create - 8 created - SUCCESSFUL
-TA1 - task_create - 9 created - SUCCESSFUL
-TA1 - task_create - 10 created - SUCCESSFUL
-TA1 - task_create - 11 - TOO_MANY
-TA1 - task_create - MP_NOT_CONFIGURED
-<pause - screen 4>
-TA1 - event_receive - UNSATISFIED ( all conditions )
-TA1 - event_receive - UNSATISFIED ( any conditions )
-TA1 - event_receive - timeout in 3 seconds
-TA1 - event_receive - woke with TIMEOUT
-TA1 - event_send - INVALID_ID
-TA1 - task_wake_after - sleep 1 second - SUCCESSFUL
-TA1 - clock_set -  8:30:45    2/ 5/1988 - SUCCESSFUL
-<pause - screen 5>
-TA1 - semaphore_create - INVALID_NAME
-TA1 - semaphore_create - 1 - SUCCESSFUL
-TA1 - semaphore_create - 2 - SUCCESSFUL
-TA1 - semaphore_create - 3 - TOO_MANY
-TA1 - semaphore_create - NOT_DEFINED
-TA1 - semaphore_create - NOT_DEFINED
-TA1 - semaphore_create - INVALID_NUMBER
-TA1 - semaphore_create - MP_NOT_CONFIGURED
-TA1 - semaphore_delete - unknown INVALID_ID
-TA1 - semaphore_delete - local INVALID_ID
-TA1 - semaphore_ident - global INVALID_NAME
-TA1 - semaphore_ident - local INVALID_NAME
-<pause - screen 6>
-TA1 - semaphore_obtain - INVALID_ID
-TA1 - semaphore_obtain - got sem 1 - SUCCESSFUL
-TA1 - semaphore_obtain - UNSATISFIED
-TA1 - semaphore_obtain - timeout in 3 seconds
-TA1 - semaphore_obtain - woke with TIMEOUT
-TA1 - semaphore_release - NOT_OWNER_OF_RESOURCE
-TA1 - semaphore_release - INVALID_ID
-TA1 - task_start - start TA2 - SUCCESSFUL
-TA1 - task_wake_after - yield processor - SUCCESSFUL
-TA2 - semaphore_obtain - sem 1 - WAIT FOREVER
-TA1 - semaphore_delete - delete sem 1 - SUCCESSFUL
-TA1 - semaphore_obtain - binary semaphore
-TA1 - semaphore_delete - delete sem 2 - RESOURCE_IN_USE
-TA1 - task_wake_after - yield processor - SUCCESSFUL
-TA2 - semaphore_obtain - woke up with OBJECT_WAS_DELETED
-TA2 - task_delete - delete self - SUCCESSFUL
-TA1 - task_delete TA2 - already deleted INVALID_ID
-<pause - screen 7>
-TA1 - message_queue_broadcast - INVALID_ID
-TA1 - message_queue_create - Q 1 - INVALID_NAME
-TA1 - message_queue_create - Q 1 - MP_NOT_CONFIGURED
-TA1 - message_queue_create - Q 1 - 2 DEEP - SUCCESSFUL
-TA1 - message_queue_create - Q 2 - TOO_MANY
-TA1 - message_queue_delete - unknown INVALID_ID
-TA1 - message_queue_delete - local INVALID_ID
-TA1 - message_queue_ident - INVALID_NAME
-TA1 - message_queue_flush - INVALID_ID
-TA1 - message_queue_receive - INVALID_ID
-TA1 - message_queue_receive - Q 1 - UNSATISFIED
-TA1 - message_queue_receive - Q 1 - timeout in 3 seconds
-TA1 - message_queue_receive - Q 1 - woke up with TIMEOUT
-TA1 - message_queue_send - INVALID_ID
-TA1 - message_queue_send - BUFFER 1 TO Q 1 - SUCCESSFUL
-TA1 - message_queue_send - BUFFER 2 TO Q 1 - SUCCESSFUL
-TA1 - message_queue_send - BUFFER 3 TO Q 1 - TOO_MANY
-<pause - screen 8>
-TA1 - message_queue_delete - Q 1 - SUCCESSFUL
-TA1 - message_queue_create - Q 1 - 2 DEEP - SUCCESSFUL
-TA1 - message_queue_send - BUFFER 1 TO Q 1 - SUCCESSFUL
-TA1 - message_queue_send - BUFFER 2 TO Q 1 - SUCCESSFUL
-TA1 - message_queue_send - BUFFER 3 TO Q 1 - TOO_MANY
-TA1 - message_queue_delete - Q 1 - SUCCESSFUL
-TA1 - message_queue_create - Q 1 - 3 DEEP - SUCCESSFUL
-TA1 - message_queue_send - BUFFER 1 TO Q 1 - SUCCESSFUL
-TA1 - message_queue_send - BUFFER 2 TO Q 1 - SUCCESSFUL
-TA1 - message_queue_send - BUFFER 3 TO Q 1 - SUCCESSFUL
-TA1 - message_queue_send - BUFFER 4 TO Q 1 - TOO_MANY
-TA1 - message_queue_delete - Q 1 - SUCCESSFUL
-TA1 - message_queue_create - Q 1 - 3 DEEP - SUCCESSFUL
-TA1 - task_start - start TA3 - SUCCESSFUL
-TA1 - task_wake_after - yield processor - SUCCESSFUL
-TA3 - message_queue_receive - Q 1 - WAIT FOREVER
-TA1 - message_queue_delete - delete Q 1 - SUCCESSFUL
-TA1 - task_wake_after - yield processor - SUCCESSFUL
-TA3 - message_queue_receive - woke up with OBJECT_WAS_DELETED
-TA3 - task_delete - delete self - SUCCESSFUL
-<pause - screen 9>
-TA1 - interrupt_catch - INVALID_NUMBER -- constraint error
-TA1 - interrupt_catch - INVALID_ADDRESS
-TA1 - signal_send - INVALID_ID
-TA1 - signal_send - NOT_DEFINED
-TA1 - port_create - INVALID_NAME
-TA1 - port_create - INVALID_ADDRESS
-TA1 - port_create - TOO_MANY
-TA1 - port_delete - INVALID_ID
-TA1 - port_ident - INVALID_NAME
-TA1 - port_internal_to_external - INVALID_ID
-TA1 - port_external_to_internal - INVALID_ID
-<pause - screen 10>
-TA1 - rate_monotonic_create - INVALID_NAME
-TA1 - rate_monotonic_create - SUCCESSFUL
-TA1 - rate_monotonic_create - TOO_MANY
-TA1 - rate_monotonic_ident - INVALID_NAME
-TA1 - rate_monotonic_period - unknown INVALID_ID
-TA1 - rate_monotonic_period - local INVALID_ID
-TA1 - rate_monotonic_period( STATUS ) - NOT_DEFINED
-TA1 - rate_monotonic_period - 100 ticks - SUCCESSFUL
-TA1 - rate_monotonic_period( STATUS ) - SUCCESSFUL
-TA1 - rate_monotonic_period( STATUS ) - TIMEOUT
-TA1 - rate_monotonic_cancel - unknown INVALID_ID
-TA1 - rate_monotonic_cancel - local INVALID_ID
-TA1 - rate_monotonic_cancel - SUCCESSFUL
-TA1 - rate_monotonic_period - 5 ticks - TIMEOUT
-TA1 - task_wake_after - yielding to TA4
-TA4 - rate_monotonic_cancel - NOT_OWNER_OF_RESOURCE
-TA4 - rate_monotonic_period - NOT_OWNER_OF_RESOURCE
-TA4 - task_delete - delete self - SUCCESSFUL
-TA1 - rate_monotonic_delete - unknown INVALID_ID
-TA1 - rate_monotonic_delete - local INVALID_ID
-TA1 - rate_monotonic_delete - SUCCESSFUL
-<pause - screen 11>
-TA1 - partition_create - INVALID_NAME
-TA1 - partition_create - length - INVALID_SIZE
-TA1 - partition_create - buffer size - INVALID_SIZE
-TA1 - partition_create - length < buffer size - INVALID_SIZE
-TA1 - partition_create - MP_NOT_CONFIGURED
-TA1 - partition_create - INVALID_ADDRESS
-TA1 - partition_create - INVALID_SIZE
-TA1 - partition_delete - unknown INVALID_ID
-TA1 - partition_delete - local INVALID_ID
-TA1 - partition_get_buffer - INVALID_ID
-TA1 - partition_ident - INVALID_NAME
-TA1 - partition_return_buffer - INVALID_ID
-TA1 - partition_create - SUCCESSFUL
-TA1 - partition_create - TOO_MANY
-TA1 - partition_get_buffer - SUCCESSFUL
-TA1 - partition_get_buffer - SUCCESSFUL
-TA1 - partition_get_buffer - UNSATISFIED
-TA1 - partition_delete - RESOURCE_IN_USE
-TA1 - partition_return_buffer - INVALID_ADDRESS - out of range
-TA1 - partition_return_buffer - INVALID_ADDRESS - not on boundary
-<pause - screen 12>
-TA1 - region_create - INVALID_NAME
-TA1 - region_create - INVALID_ADDRESS
-TA1 - region_create - INVALID_SIZE
-TA1 - region_create - SUCCESSFUL
-TA1 - region_create - TOO_MANY
-TA1 - region_delete - unknown INVALID_ID
-TA1 - region_delete - local INVALID_ID
-TA1 - region_ident - INVALID_NAME
-TA1 - region_get_segment - INVALID_ID
-TA1 - region_get_segment - INVALID_SIZE
-TA1 - region_get_segment - SUCCESSFUL
-TA1 - region_get_segment - UNSATISFIED
-TA1 - region_get_segment - timeout in 3 seconds
-TA1 - region_get_segment - woke up with TIMEOUT
-TA1 - region_delete - RESOURCE_IN_USE
-TA1 - region_return_segment - INVALID_ID
-TA1 - region_return_segment - INVALID_ADDRESS
-TA1 - debug_disable - DEBUG_REGION
-TA1 - region_return_segment - INVALID_ADDRESS
-TA1 - region_return_segment - INVALID_ADDRESS
-TA1 - debug_enable - DEBUG_REGION
-TA1 - region_extend - INVALID_ID
-TA1 - region_extend - within heap - INVALID_ADDRESS
-TA1 - region_extend - non-contiguous lower - NOT_IMPLEMENTED
-TA1 - region_extend - contiguous lower - NOT_IMPLEMENTED
-TA1 - region_extend - non-contiguous higher - NOT_IMPLEMENTED
-<pause - screen 13>
-TA1 - io_close - INVALID_NUMBER
-TA1 - io_control - INVALID_NUMBER
-TA1 - io_initialize - INVALID_NUMBER
-TA1 - io_open - INVALID_NUMBER
-TA1 - io_read - INVALID_NUMBER
-TA1 - io_write - INVALID_NUMBER
-TA1 - clock_set - 23:59:59   12/31/2000 - SUCCESSFUL
-TA1 - clock_get -  0: 0: 0    1/ 1/2001 - SUCCESSFUL
-TA1 - clock_set - 23:59:59   12/31/1999 - SUCCESSFUL
-TA1 - clock_get -  0: 0: 0    1/ 1/2000 - SUCCESSFUL
-TA1 - clock_set - 23:59:59   12/31/2100 - SUCCESSFUL
-TA1 - clock_get -  0: 0: 0    1/ 1/2101 - SUCCESSFUL
-TA1 - clock_set - 23:59:59   12/31/2099 - SUCCESSFUL
-TA1 - clock_get -  0: 0: 0    1/ 1/2100 - SUCCESSFUL
-TA1 - clock_set - 23:59:59   12/31/1991 - SUCCESSFUL
-TA1 - clock_get -  0: 0: 0    1/ 1/1992 - SUCCESSFUL
-<pause - screen 14>
-TA1 - timer_create - INVALID_NAME
-TA1 - timer_create - 1 - SUCCESSFUL
-TA1 - timer_create - 2 - TOO_MANY
-TA1 - timer_delete - local INVALID_ID
-TA1 - timer_delete - global INVALID_ID
-TA1 - timer_ident - INVALID_NAME
-TA1 - timer_cancel - INVALID_ID
-TA1 - timer_reset - INVALID_ID
-TA1 - timer_reset - NOT_DEFINED
-TA1 - timer_fire_after - INVALID_ID
-TA1 - timer_fire_when - INVALID_ID
-TA1 - timer_fire_after - INVALID_NUMBER
-TA1 - timer_fire_when -  8:30:45  2/ 5/1987 - INVALID_CLOCK
-TA1 - clock_get       -  0: 0: 0  1/ 1/1992
-TA1 - timer_fire_when -  8:30:45  2/ 5/1990 - before INVALID_CLOCK
-*** END OF TEST 9 ***
diff --git a/c/src/ada-tests/sptests/sp09/sptest.adb b/c/src/ada-tests/sptests/sp09/sptest.adb
deleted file mode 100644
index 960b610f77..0000000000
--- a/c/src/ada-tests/sptests/sp09/sptest.adb
+++ /dev/null
@@ -1,3208 +0,0 @@
---
---  SPTEST / BODY
---
---  DESCRIPTION:
---
---  This package is the implementation of Test 9 of the RTEMS
---  Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with INTERFACES; use INTERFACES;
-with RTEMS;
-with TEST_SUPPORT;
-with TEXT_IO;
-
-package body SPTEST is
-
---PAGE
--- 
---  INIT
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** TEST 9 ***" );
-
-      SPTEST.TASK_NAME( 1 )   := RTEMS.BUILD_NAME(  'T', 'A', '1', ' ' );
-      SPTEST.TASK_NAME( 2 )   := RTEMS.BUILD_NAME(  'T', 'A', '2', ' ' );
-      SPTEST.TASK_NAME( 3 )   := RTEMS.BUILD_NAME(  'T', 'A', '3', ' ' );
-      SPTEST.TASK_NAME( 4 )   := RTEMS.BUILD_NAME(  'T', 'A', '4', ' ' );
-      SPTEST.TASK_NAME( 5 )   := RTEMS.BUILD_NAME(  'T', 'A', '5', ' ' );
-      SPTEST.TASK_NAME( 6 )   := RTEMS.BUILD_NAME(  'T', 'A', '6', ' ' );
-      SPTEST.TASK_NAME( 7 )   := RTEMS.BUILD_NAME(  'T', 'A', '7', ' ' );
-      SPTEST.TASK_NAME( 8 )   := RTEMS.BUILD_NAME(  'T', 'A', '8', ' ' );
-      SPTEST.TASK_NAME( 9 )   := RTEMS.BUILD_NAME(  'T', 'A', '9', ' ' );
-      SPTEST.TASK_NAME( 10 )  := RTEMS.BUILD_NAME(  'T', 'A', 'A', ' ' );
-
-      SPTEST.TIMER_NAME( 1 )   := RTEMS.BUILD_NAME(  'T', 'M', '1', ' ' );
-
-      SPTEST.SEMAPHORE_NAME( 1 ) := RTEMS.BUILD_NAME( 'S', 'M', '1', ' ' );
-      SPTEST.SEMAPHORE_NAME( 2 ) := RTEMS.BUILD_NAME( 'S', 'M', '2', ' ' );
-      SPTEST.SEMAPHORE_NAME( 3 ) := RTEMS.BUILD_NAME( 'S', 'M', '3', ' ' );
-
-      SPTEST.QUEUE_NAME( 1 )     := RTEMS.BUILD_NAME( 'M', 'Q', '1', ' ' );
-      SPTEST.QUEUE_NAME( 2 )     := RTEMS.BUILD_NAME( 'M', 'Q', '2', ' ' );
-
-      SPTEST.PARTITION_NAME( 1 ) := RTEMS.BUILD_NAME( 'P', 'T', '1', ' ' );
-
-      SPTEST.REGION_NAME( 1 )    := RTEMS.BUILD_NAME( 'R', 'N', '1', ' ' );
-
-      SPTEST.PORT_NAME( 1 )      := RTEMS.BUILD_NAME( 'D', 'P', '1', ' ' );
-
-      SPTEST.PERIOD_NAME( 1 )    := RTEMS.BUILD_NAME( 'T', 'M', '1', ' ' );
-
---      RTEMS.TASK_CREATE(
---         SPTEST.TASK_NAME( 1 ),
---         4,
---         10,
---         RTEMS.DEFAULT_MODES,
---         RTEMS.DEFAULT_ATTRIBUTES,
---         SPTEST.TASK_ID( 1 ),
---         STATUS
---      );
---       TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
---          STATUS,
---          RTEMS.INVALID_SIZE,
---          "TASK_CREATE WITH ILLEGAL STACK SIZE"
---       );
-      TEXT_IO.PUT_LINE( "INIT - task_create - INVALID_SIZE -- NOT CHECKED" );
-
-      RTEMS.TASK_CREATE(
-         SPTEST.TASK_NAME( 1 ),
-         0,
-         2048,
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.TASK_ID( 1 ),
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_PRIORITY,
-         "TASK_CREATE WITH ILLEGAL PRIORITY"
-      );
-      TEXT_IO.PUT_LINE( "INIT - task_create - INVALID_PRIORITY" );
-
-      RTEMS.TASK_CREATE(
-         SPTEST.TASK_NAME( 1 ),
-         4,
-         2048,
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.TASK_ID( 1 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA1" );
-
-      RTEMS.TASK_RESTART(
-         SPTEST.TASK_ID( 1 ),
-         0,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INCORRECT_STATE,
-         "TASK_RESTART OF DORMANT TASK"
-      );
-      TEXT_IO.PUT_LINE( "INIT - task_restart - INCORRECT_STATE" );
-
-      RTEMS.TASK_START(
-         SPTEST.TASK_ID( 1 ),
-         SPTEST.TASK_1'ACCESS,
-         0,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA1" );
-
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
-
-   end INIT;
-
---PAGE
--- 
---  DELAYED_SUBPROGRAM
---
-
-   procedure DELAYED_SUBPROGRAM (
-      IGNORED_ID      : in     RTEMS.ID;
-      IGNORED_ADDRESS : in     RTEMS.ADDRESS
-   ) is
-   begin
-
-      NULL;
-
-   end DELAYED_SUBPROGRAM;
-
---PAGE
--- 
---  SERVICE_ROUTINE
---
-
-   procedure SERVICE_ROUTINE (
-      IGNORED : in     RTEMS.VECTOR_NUMBER
-   ) is
-   begin
-
-      NULL;
-
-   end SERVICE_ROUTINE;
-
---PAGE
--- 
---  SCREEN_1
---
-
-   procedure SCREEN_1
-   is
-      NOTEPAD_VALUE     : RTEMS.UNSIGNED32;
-      SELF_ID           : RTEMS.ID;
-      PREVIOUS_PRIORITY : RTEMS.TASK_PRIORITY;
-      STATUS            : RTEMS.STATUS_CODES;
-   begin
-
-      RTEMS.TASK_DELETE( 100, STATUS );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_ID,
-         "TASK_DELETE WITH ILLEGAL ID"
-      );
-      TEXT_IO.PUT_LINE( "TA1 - task_delete - INVALID_ID" );
-
---      RTEMS.TASK_GET_NOTE( RTEMS.SELF, 
---                           RTEMS.NOTEPAD_INDEX'LAST + 10, 
---                           NOTEPAD_VALUE, 
---                           STATUS 
---      );
---      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
---         STATUS,
---         RTEMS.INVALID_NUMBER,
---         "TASK_GET_NOTE WITH ILLEGAL NOTEPAD"
---      );
---      TEXT_IO.PUT_LINE( "TA1 - task_get_note - INVALID_NUMBER" );
-      TEXT_IO.PUT_LINE(
-         "TA1 - task_get_note - INVALID_NUMBER -- constraint error"
-      );
-
-      RTEMS.TASK_GET_NOTE( 
-         100, 
-         RTEMS.NOTEPAD_INDEX'LAST, 
-         NOTEPAD_VALUE, 
-         STATUS 
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_ID,
-         "TASK_GET_NOTE WITH ILLEGAL ID"
-      );
-      TEXT_IO.PUT_LINE( "TA1 - task_get_note - INVALID_ID" );
-
-      RTEMS.TASK_IDENT(
-         RTEMS.SELF,
-         RTEMS.SEARCH_ALL_NODES, 
-         SELF_ID,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_IDENT OF SELF" );
-      if SELF_ID /= SPTEST.TASK_ID( 1 ) then
-         TEXT_IO.PUT_LINE( "ERROR - task_ident - incorrect ID returned!" );
-         RTEMS.SHUTDOWN_EXECUTIVE( 0 );
-      end if;
-      TEXT_IO.PUT_LINE(
-         "TA1 - task_ident - current task SUCCESSFUL"
-      );
-
-      RTEMS.TASK_IDENT(
-         100,
-         RTEMS.SEARCH_ALL_NODES,
-         SPTEST.JUNK_ID,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_NAME,
-         "TASK_IDENT WITH ILLEGAL NAME (local)"
-      );
-      TEXT_IO.PUT_LINE( "TA1 - task_ident - global INVALID_NAME" );
-
-      RTEMS.TASK_IDENT( 100, 1, SPTEST.JUNK_ID, STATUS );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_NAME,
-         "TASK_IDENT WITH ILLEGAL NAME (global)"
-      );
-      TEXT_IO.PUT_LINE( "TA1 - task_ident - local INVALID_NAME" );
-
-      RTEMS.TASK_IDENT( 100, 2, SPTEST.JUNK_ID, STATUS );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_NODE,
-         "TASK_IDENT WITH ILLEGAL NODE"
-      );
-      TEXT_IO.PUT_LINE( "TA1 - task_ident - INVALID_NODE" );
-
-      RTEMS.TASK_RESTART( 100, 0, STATUS );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_ID,
-         "TASK_RESTART WITH ILLEGAL ID"
-      );
-      TEXT_IO.PUT_LINE( "TA1 - task_restart - INVALID_ID" );
-
-      RTEMS.TASK_RESUME( 100, STATUS );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_ID,
-         "TASK_RESUME WITH ILLEGAL ID"
-      );
-      TEXT_IO.PUT_LINE( "TA1 - task_resume - INVALID_ID" );
-
-      RTEMS.TASK_RESUME( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INCORRECT_STATE,
-         "TASK_RESUME OF READY TASK"
-      );
-      TEXT_IO.PUT_LINE( "TA1 - task_resume - INCORRECT_STATE" );
-
---      RTEMS.TASK_SET_PRIORITY( RTEMS.SELF, 512, PREVIOUS_PRIORITY, STATUS );
---      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
---         STATUS,
---         RTEMS.INVALID_PRIORITY,
---         "TASK_SET_PRIORITY WITH ILLEGAL PRIORITY"
---      );
---      TEXT_IO.PUT_LINE(
---         "TA1 - task_set_priority - INVALID_PRIORITY"
---      );
-      TEXT_IO.PUT_LINE(
-         "TA1 - task_set_priority - INVALID_PRIORITY -- constraint error"
-      );
-
-      RTEMS.TASK_SET_PRIORITY( 100, 8, PREVIOUS_PRIORITY, STATUS );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_ID,
-         "TASK_SET_PRIORITY WITH ILLEGAL ID"
-      );
-      TEXT_IO.PUT_LINE( "TA1 - task_set_priority - INVALID_ID" );
-
---       RTEMS.TASK_SET_NOTE( RTEMS.SELF, 
---                            RTEMS.NOTEPAD_INDEX'LAST + 10, 
---                            NOTEPAD_VALUE, 
---                            STATUS 
---       );
---       TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
---          STATUS,
---          RTEMS.INVALID_NUMBER,
---          "TASK_SET_NOTE WITH ILLEGAL NOTEPAD"
---       );
---      TEXT_IO.PUT_LINE( "TA1 - task_set_note - INVALID_NUMBER" );
-      TEXT_IO.PUT_LINE(
-         "TA1 - task_set_note - INVALID_NUMBER -- constraint error"
-      );
-
-      RTEMS.TASK_SET_NOTE( 
-         100, 
-         RTEMS.NOTEPAD_INDEX'LAST, 
-         NOTEPAD_VALUE, 
-         STATUS 
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_ID,
-         "TASK_SET_NOTE WITH ILLEGAL ID"
-      );
-      TEXT_IO.PUT_LINE( "TA1 - task_set_note - INVALID_ID" );
-
-      RTEMS.TASK_START( 100, SPTEST.TASK_1'ACCESS, 0, STATUS );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_ID,
-         "TASK_START WITH ILLEGAL ID"
-      );
-      TEXT_IO.PUT_LINE( "TA1 - task_start - INVALID_ID" );
-
-      RTEMS.TASK_START( RTEMS.SELF, SPTEST.TASK_1'ACCESS, 0, STATUS );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INCORRECT_STATE,
-         "TASK_START OF READY TASK"
-      );
-      TEXT_IO.PUT_LINE( "TA1 - task_start - INCORRECT_STATE" );
-
-      RTEMS.TASK_SUSPEND( 100, STATUS );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_ID,
-         "TASK_SUSPEND WITH INVALID ID"
-      );
-      TEXT_IO.PUT_LINE( "TA1 - task_suspend - INVALID_ID" );
-
-   end SCREEN_1;
-
---PAGE
--- 
---  SCREEN_2
---
-
-   procedure SCREEN_2
-   is
-      TIME   : RTEMS.TIME_OF_DAY;
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
--- errors before clock is set
-
-      RTEMS.CLOCK_GET( RTEMS.CLOCK_GET_TOD, TIME'ADDRESS, STATUS );
-     
-      if RTEMS.IS_STATUS_SUCCESSFUL( STATUS ) then
-         TEXT_IO.PUT_LINE(
-            "TA1 - clock_get - NOT_DEFINED -- DID THE BSP SET THE TIME OF DAY?"
-         );
-      else
-         TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-            STATUS,
-            RTEMS.NOT_DEFINED,
-            "CLOCK_GET BEFORE CLOCK IS SET"
-         );
-         TEXT_IO.PUT_LINE( "TA1 - clock_get - NOT_DEFINED" );
-      end if;
-
-      RTEMS.TASK_WAKE_WHEN( TIME, STATUS );
-      if RTEMS.IS_STATUS_SUCCESSFUL( STATUS ) then
-         TEXT_IO.PUT( "TA1 - task_wake_when - NOT_DEFINED -- " );
-         TEXT_IO.PUT_LINE( "DID THE BSP SET THE TIME OF DAY?" );
-      else
-         TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-            STATUS,
-            RTEMS.NOT_DEFINED,
-            "TASK_WAKE_WHEN BEFORE CLOCK IS SET"
-         );
-         TEXT_IO.PUT_LINE( "TA1 - task_wake_when - NOT_DEFINED" );
-      end if;
-
-      RTEMS.TIMER_FIRE_WHEN(
-         0,
-         TIME,
-         SPTEST.DELAYED_SUBPROGRAM'ACCESS,
-         RTEMS.NULL_ADDRESS,
-         STATUS
-      );
-
-      if RTEMS.IS_STATUS_SUCCESSFUL( STATUS ) then
-         TEXT_IO.PUT( "TA1 - task_fire_when - NOT_DEFINED -- " );
-         TEXT_IO.PUT_LINE( "DID THE BSP SET THE TIME OF DAY?" );
-      else
-
-         TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-            STATUS,
-            RTEMS.NOT_DEFINED,
-            "TIMER_FIRE_WHEN BEFORE CLOCK IS SET"
-         );
-         TEXT_IO.PUT_LINE( "TA1 - timer_fire_when - NOT_DEFINED" );
-
-      end if;
-
--- invalid time of day field
-
-      TIME := ( 1987, 2, 5, 8, 30, 45, 0 );
-      TEST_SUPPORT.PRINT_TIME( "TA1 - clock_set - ", TIME, "" );
-      RTEMS.CLOCK_SET( TIME, STATUS );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_CLOCK,
-         "CLOCK_SET WITH INVALID YEAR"
-      );
-      TEXT_IO.PUT_LINE( " - INVALID_CLOCK" );
-
-      TIME := ( 1988, 15, 5, 8, 30, 45, 0 );
-      TEST_SUPPORT.PRINT_TIME( "TA1 - clock_set - ", TIME, "" );
-      RTEMS.CLOCK_SET( TIME, STATUS );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_CLOCK,
-         "CLOCK_SET WITH INVALID MONTH"
-      );
-      TEXT_IO.PUT_LINE( " - INVALID_CLOCK" );
-
-      TIME := ( 1988, 2, 32, 8, 30, 45, 0 );
-      TEST_SUPPORT.PRINT_TIME( "TA1 - clock_set - ", TIME, "" );
-      RTEMS.CLOCK_SET( TIME, STATUS );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_CLOCK,
-         "CLOCK_SET WITH INVALID DAY"
-      );
-      TEXT_IO.PUT_LINE( " - INVALID_CLOCK" );
-
-      TIME := ( 1988, 2, 5, 25, 30, 45, 0 );
-      TEST_SUPPORT.PRINT_TIME( "TA1 - clock_set - ", TIME, "" );
-      RTEMS.CLOCK_SET( TIME, STATUS );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_CLOCK,
-         "CLOCK_SET WITH INVALID HOUR"
-      );
-      TEXT_IO.PUT_LINE( " - INVALID_CLOCK" );
-
-      TIME := ( 1988, 2, 5, 8, 61, 45, 0 );
-      TEST_SUPPORT.PRINT_TIME( "TA1 - clock_set - ", TIME, "" );
-      RTEMS.CLOCK_SET( TIME, STATUS );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_CLOCK,
-         "CLOCK_SET WITH INVALID MINUTE"
-      );
-      TEXT_IO.PUT_LINE( " - INVALID_CLOCK" );
-
-      TIME := ( 1988, 2, 5, 8, 30, 61, 0 );
-      TEST_SUPPORT.PRINT_TIME( "TA1 - clock_set - ", TIME, "" );
-      RTEMS.CLOCK_SET( TIME, STATUS );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_CLOCK,
-         "CLOCK_SET WITH INVALID SECOND"
-      );
-      TEXT_IO.PUT_LINE( " - INVALID_CLOCK" );
-
-      TIME := ( 1988, 2, 5, 8, 30, 45, TEST_SUPPORT.TICKS_PER_SECOND + 1 );
-      TEST_SUPPORT.PRINT_TIME( "TA1 - clock_set - ", TIME, "" );
-      RTEMS.CLOCK_SET( TIME, STATUS );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_CLOCK,
-         "CLOCK_SET WITH INVALID TICKS PER SECOND"
-      );
-      TEXT_IO.PUT_LINE( " - INVALID_CLOCK" );
-
-      TIME := ( 1988, 2, 5, 8, 30, 45, 0 );
-      TEST_SUPPORT.PRINT_TIME( "TA1 - clock_set - ", TIME, "" );
-      RTEMS.CLOCK_SET( TIME, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_SET SUCCESSFUL" );
-      TEXT_IO.PUT_LINE( " - SUCCESSFUL" );
-
--- task_wake_when
-
-      TIME := ( 1988, 2, 5, 8, 30, 48, TEST_SUPPORT.TICKS_PER_SECOND + 1 );
-      TEXT_IO.PUT( "TA1 - task_wake_when - TICK INVALID - " );
-      TEXT_IO.PUT_LINE( "sleep about 3 seconds" );
-      RTEMS.TASK_WAKE_WHEN( TIME, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED(
-         STATUS,
-         "TASK_WAKE_WHEN WITH INVALID TICKS PER SECOND"
-      );
-      TEXT_IO.PUT( "TA1 - task_wake_when - TICK INVALID - " );
-      TEXT_IO.PUT_LINE( "woke up SUCCESSFUL" );
-
-      TIME := ( 1961, 2, 5, 8, 30, 48, 0 );
-      TEST_SUPPORT.PRINT_TIME( "TA1 - task_wake_when - ", TIME, "" );
-      RTEMS.TASK_WAKE_WHEN( TIME, STATUS );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_CLOCK,
-         "TASK_WAKE_WHEN WITH INVALID YEAR"
-      );
-      TEXT_IO.PUT_LINE( " - INVALID_CLOCK" );
-
-      TIME := ( 1988, 2, 5, 25, 30, 48, 0 );
-      TEST_SUPPORT.PRINT_TIME( "TA1 - task_wake_when - ", TIME, "" );
-      RTEMS.TASK_WAKE_WHEN( TIME, STATUS );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_CLOCK,
-         "TASK_WAKE_WHEN WITH INVALID HOUR"
-      );
-      TEXT_IO.PUT_LINE( " - INVALID_CLOCK" );
-
-      RTEMS.CLOCK_GET( RTEMS.CLOCK_GET_TOD, TIME'ADDRESS, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET SUCCESSFUL" );
-      TEST_SUPPORT.PRINT_TIME( "TA1 - current time - ", TIME, "" );
-      TEXT_IO.NEW_LINE;
-
-      TIME.MONTH := 1;
-      TEST_SUPPORT.PRINT_TIME( "TA1 - task_wake_when - ", TIME, "" );
-      RTEMS.TASK_WAKE_WHEN( TIME, STATUS );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_CLOCK,
-         "TASK_WAKE_WHEN BEFORE CURRENT TIME"
-      );
-      TEXT_IO.PUT_LINE( " - INVALID_CLOCK" );
-
-   end SCREEN_2;
-
---PAGE
--- 
---  SCREEN_3
---
-
-   procedure SCREEN_3
-   is
-      TASK_NAME : RTEMS.NAME;
-      STATUS    : RTEMS.STATUS_CODES;
-   begin
-
-      TASK_NAME := 1;
-
-      RTEMS.TASK_CREATE(
-         0,
-         1,
-         2048,
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.JUNK_ID,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_NAME,
-         "TASK_CREATE WITH ILLEGAL NAME"
-      );
-      TEXT_IO.PUT_LINE( 
-         "TA1 - task_create - INVALID_NAME"
-      );
-
-      RTEMS.TASK_CREATE(
-         TASK_NAME,
-         1,
-         RTEMS.CONFIGURATION.WORK_SPACE_SIZE,
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.JUNK_ID,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.UNSATISFIED,
-         "TASK_CREATE WITH A STACK SIZE LARGER THAN THE WORKSPACE"
-      );
-      TEXT_IO.PUT_LINE(
-         "TA1 - task_create - stack size - UNSATISFIED"
-      );
-
-      RTEMS.TASK_CREATE(
-         SPTEST.TASK_NAME( 2 ),
-         4,
-         2048,
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.TASK_ID( 2 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA2" );
-      TEXT_IO.PUT_LINE(
-         "TA1 - task_create - TA2 created - SUCCESSFUL"
-      );
-
-      RTEMS.TASK_SUSPEND( SPTEST.TASK_ID( 2 ), STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SUSPEND OF TA2" );
-      TEXT_IO.PUT_LINE(
-         "TA1 - task_suspend - suspend TA2 - SUCCESSFUL"
-      );
-
-      RTEMS.TASK_SUSPEND( SPTEST.TASK_ID( 2 ), STATUS );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.ALREADY_SUSPENDED,
-         "TASK_SUSPEND ON SUSPENDED TA2"
-      );
-      TEXT_IO.PUT_LINE(
-         "TA1 - task_suspend - suspend TA2 - ALREADY_SUSPENDED"
-      );
-
-      RTEMS.TASK_RESUME( SPTEST.TASK_ID( 2 ), STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_RESUME OF TA2" );
-      TEXT_IO.PUT_LINE(
-         "TA1 - task_resume - TA2 resumed - SUCCESSFUL"
-      );
-
-      RTEMS.TASK_CREATE(
-         SPTEST.TASK_NAME( 3 ),
-         4,
-         2048,
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.TASK_ID( 3 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA3" );
-      TEXT_IO.PUT_LINE(
-         "TA1 - task_create - TA3 created - SUCCESSFUL"
-      );
-
-      RTEMS.TASK_CREATE(
-         SPTEST.TASK_NAME( 4 ),
-         4,
-         2048,
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.TASK_ID( 4 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA4" );
-      TEXT_IO.PUT_LINE(
-         "TA1 - task_create - 4 created - SUCCESSFUL"
-      );
-
-      RTEMS.TASK_CREATE(
-         SPTEST.TASK_NAME( 5 ),
-         4,
-         2048,
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.TASK_ID( 5 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA5" );
-      TEXT_IO.PUT_LINE(
-         "TA1 - task_create - 5 created - SUCCESSFUL"
-      );
-
-      RTEMS.TASK_CREATE(
-         SPTEST.TASK_NAME( 6 ),
-         4,
-         2048,
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.TASK_ID( 6 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA6" );
-      TEXT_IO.PUT_LINE(
-         "TA1 - task_create - 6 created - SUCCESSFUL"
-      );
-
-      RTEMS.TASK_CREATE(
-         SPTEST.TASK_NAME( 7 ),
-         4,
-         2048,
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.TASK_ID( 7 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA7" );
-      TEXT_IO.PUT_LINE(
-         "TA1 - task_create - 7 created - SUCCESSFUL"
-      );
-
-      RTEMS.TASK_CREATE(
-         SPTEST.TASK_NAME( 8 ),
-         4,
-         2048,
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.TASK_ID( 8 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA8" );
-      TEXT_IO.PUT_LINE(
-         "TA1 - task_create - 8 created - SUCCESSFUL"
-      );
-
-      RTEMS.TASK_CREATE(
-         SPTEST.TASK_NAME( 9 ),
-         4,
-         2048,
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.TASK_ID( 9 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA9" );
-      TEXT_IO.PUT_LINE(
-         "TA1 - task_create - 9 created - SUCCESSFUL"
-      );
-
-      RTEMS.TASK_CREATE(
-         SPTEST.TASK_NAME( 10 ),
-         4,
-         2048,
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.TASK_ID( 10 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA10" );
-      TEXT_IO.PUT_LINE(
-         "TA1 - task_create - 10 created - SUCCESSFUL"
-      );
-
-      RTEMS.TASK_CREATE(
-         TASK_NAME,
-         4,
-         2048,
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.JUNK_ID,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.TOO_MANY,
-         "TASK_CREATE FOR TOO MANY TASKS"
-      );
-      TEXT_IO.PUT_LINE( "TA1 - task_create - 11 - TOO_MANY" );
-
-      RTEMS.TASK_CREATE(
-         TASK_NAME,
-         4,
-         2048,
-         RTEMS.DEFAULT_MODES,
-         RTEMS.GLOBAL,
-         SPTEST.JUNK_ID,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.MP_NOT_CONFIGURED,
-         "TASK_CREATE OF GLOBAL TASK IN SINGLE CPU SYSTEM"
-      );
-      TEXT_IO.PUT_LINE( "TA1 - task_create - MP_NOT_CONFIGURED" );
-
-   end SCREEN_3;
-
---PAGE
--- 
---  SCREEN_4
---
-
-   procedure SCREEN_4
-   is
-      EVENT_OUT : RTEMS.EVENT_SET;
-      TIME      : RTEMS.TIME_OF_DAY;
-      STATUS    : RTEMS.STATUS_CODES;
-   begin
-
-      RTEMS.EVENT_RECEIVE(
-         RTEMS.EVENT_16,
-         RTEMS.NO_WAIT,
-         RTEMS.NO_TIMEOUT,
-         EVENT_OUT,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.UNSATISFIED,
-         "EVENT_RECEIVE UNSATISFIED (ALL)"
-      );
-      TEXT_IO.PUT_LINE(
-         "TA1 - event_receive - UNSATISFIED ( all conditions )"
-      );
-
-      RTEMS.EVENT_RECEIVE(
-         RTEMS.EVENT_16,
-         RTEMS.NO_WAIT + RTEMS.EVENT_ANY,
-         RTEMS.NO_TIMEOUT,
-         EVENT_OUT,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.UNSATISFIED,
-         "EVENT_RECEIVE UNSATISFIED (ANY)"
-      );
-      TEXT_IO.PUT_LINE(
-         "TA1 - event_receive - UNSATISFIED ( any conditions )"
-      );
-
-      TEXT_IO.PUT_LINE( "TA1 - event_receive - timeout in 3 seconds" );
-      RTEMS.EVENT_RECEIVE(
-         RTEMS.EVENT_16,
-         RTEMS.DEFAULT_OPTIONS,
-         3 * TEST_SUPPORT.TICKS_PER_SECOND,
-         EVENT_OUT,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.TIMEOUT,
-         "EVENT_RECEIVE AFTER 3 SECOND TIMEOUT"
-      );
-      TEXT_IO.PUT_LINE(
-         "TA1 - event_receive - woke with TIMEOUT"
-      );
-
-      RTEMS.EVENT_SEND(
-         100,
-         RTEMS.EVENT_16,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_ID,
-         "EVENT_SEND WITH ILLEGAL ID"
-      );
-      TEXT_IO.PUT_LINE(
-         "TA1 - event_send - INVALID_ID"
-      );
-
-      TEXT_IO.PUT_LINE( 
-         "TA1 - task_wake_after - sleep 1 second - SUCCESSFUL" 
-      );
-      RTEMS.TASK_WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER (1 SECOND)" );
-
-      TIME := ( 1988, 2, 5, 8, 30, 45, 0 );
-      TEST_SUPPORT.PRINT_TIME( "TA1 - clock_set - ", TIME, "" );
-      RTEMS.CLOCK_SET( TIME, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_SET SUCCESSFUL" );
-      TEXT_IO.PUT_LINE( " - SUCCESSFUL" );
-
-   end SCREEN_4;
-
---PAGE
--- 
---  SCREEN_5
---
-
-   procedure SCREEN_5
-   is
-      STATUS         : RTEMS.STATUS_CODES;
-   begin
-
-      RTEMS.SEMAPHORE_CREATE(
-         0,
-         1,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         RTEMS.NO_PRIORITY,
-         SPTEST.JUNK_ID,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_NAME,
-         "SEMAPHORE_CREATE WITH ILLEGAL NAME"
-      );
-      TEXT_IO.PUT_LINE( "TA1 - semaphore_create - INVALID_NAME" );
-
-      RTEMS.SEMAPHORE_CREATE(
-         SPTEST.SEMAPHORE_NAME( 1 ),
-         1,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         RTEMS.NO_PRIORITY,
-         SPTEST.SEMAPHORE_ID( 1 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED(
-         STATUS,
-         "SEMAPHORE_CREATE SUCCESSFUL"
-      );
-      TEXT_IO.PUT_LINE( "TA1 - semaphore_create - 1 - SUCCESSFUL" );
-
-      RTEMS.SEMAPHORE_CREATE(
-         SPTEST.SEMAPHORE_NAME( 2 ),
-         1,
-         RTEMS.BINARY_SEMAPHORE,
-         RTEMS.NO_PRIORITY,
-         SPTEST.SEMAPHORE_ID( 2 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED(
-         STATUS,
-         "SEMAPHORE_CREATE SUCCESSFUL"
-      );
-      TEXT_IO.PUT_LINE( "TA1 - semaphore_create - 2 - SUCCESSFUL" );
-
-      loop
-         RTEMS.SEMAPHORE_CREATE(
-            SPTEST.SEMAPHORE_NAME( 3 ),
-            1,
-            RTEMS.DEFAULT_ATTRIBUTES,
-            RTEMS.NO_PRIORITY,
-            SPTEST.JUNK_ID,
-            STATUS
-         );
-
-         exit when not RTEMS.ARE_STATUSES_EQUAL( STATUS, RTEMS.SUCCESSFUL );
-      end loop;
-
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.TOO_MANY,
-         "SEMAPHORE_CREATE OF TOO MANY"
-      );
-      TEXT_IO.PUT_LINE( "TA1 - semaphore_create - 3 - TOO_MANY" );
-
-      RTEMS.SEMAPHORE_CREATE(
-         SPTEST.SEMAPHORE_NAME( 1 ),
-         1,
-         RTEMS.INHERIT_PRIORITY + RTEMS.BINARY_SEMAPHORE + RTEMS.FIFO,
-         RTEMS.NO_PRIORITY,
-         SPTEST.JUNK_ID,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.NOT_DEFINED,
-         "SEMAPHORE_CREATE OF FIFO INHERIT PRIORITY"
-      );
-      TEXT_IO.PUT_LINE("TA1 - semaphore_create - NOT_DEFINED");
-
-      RTEMS.SEMAPHORE_CREATE(
-         SPTEST.SEMAPHORE_NAME( 1 ),
-         1,
-         RTEMS.INHERIT_PRIORITY + RTEMS.COUNTING_SEMAPHORE + RTEMS.PRIORITY,
-         RTEMS.NO_PRIORITY,
-         SPTEST.JUNK_ID,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.NOT_DEFINED,
-         "SEMAPHORE_CREATE OF COUNTING_SEMAPHORE INHERIT PRIORITY"
-      );
-      TEXT_IO.PUT_LINE("TA1 - semaphore_create - NOT_DEFINED");
-
-      RTEMS.SEMAPHORE_CREATE(
-         SPTEST.SEMAPHORE_NAME( 1 ),
-         2,
-         RTEMS.BINARY_SEMAPHORE,
-         RTEMS.NO_PRIORITY,
-         SPTEST.JUNK_ID,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_NUMBER,
-         "SEMAPHORE_CREATE OF BINARY_SEMAPHORE with COUNT > 1"
-      );
-      TEXT_IO.PUT_LINE("TA1 - semaphore_create - INVALID_NUMBER");
-
-      RTEMS.SEMAPHORE_CREATE(
-         SPTEST.SEMAPHORE_NAME( 3 ),
-         1,
-         RTEMS.GLOBAL,
-         RTEMS.NO_PRIORITY,
-         SPTEST.JUNK_ID,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.MP_NOT_CONFIGURED,
-         "SEMAPHORE_CREATE OF MP_NOT_CONFIGURED"
-      );
-      TEXT_IO.PUT_LINE("TA1 - semaphore_create - MP_NOT_CONFIGURED");
-
-      RTEMS.SEMAPHORE_DELETE( 100, STATUS );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_ID,
-         "SEMAPHORE_DELETE WITH ILLEGAL ID"
-      );
-      TEXT_IO.PUT_LINE(
-         "TA1 - semaphore_delete - unknown INVALID_ID"
-      );
-
-      RTEMS.SEMAPHORE_DELETE( 16#10100#, STATUS );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_ID,
-         "SEMAPHORE_DELETE WITH LOCAL ILLEGAL ID"
-      );
-      TEXT_IO.PUT_LINE(
-         "TA1 - semaphore_delete - local INVALID_ID"
-      );
-
-      RTEMS.SEMAPHORE_IDENT(
-         100,
-         RTEMS.SEARCH_ALL_NODES,
-         SPTEST.JUNK_ID,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_NAME,
-         "SEMAPHORE_IDENT WITH ILLEGAL NAME (local)"
-      );
-      TEXT_IO.PUT_LINE(
-         "TA1 - semaphore_ident - global INVALID_NAME"
-      );
-
-      RTEMS.SEMAPHORE_IDENT( 100, 1, SPTEST.JUNK_ID, STATUS );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_NAME,
-         "SEMAPHORE_IDENT WITH ILLEGAL NAME (global)"
-      );
-      TEXT_IO.PUT_LINE(
-         "TA1 - semaphore_ident - local INVALID_NAME"
-      );
-
-  end SCREEN_5;
-
---PAGE
--- 
---  SCREEN_6
---
-
-   procedure SCREEN_6
-   is
-      STATUS         : RTEMS.STATUS_CODES;
-   begin
-
-      RTEMS.SEMAPHORE_OBTAIN(
-         100,
-         RTEMS.DEFAULT_OPTIONS,
-         RTEMS.NO_TIMEOUT,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_ID,
-         "SEMAPHORE_OBTAIN WITH ILLEGAL ID"
-      );
-      TEXT_IO.PUT_LINE( "TA1 - semaphore_obtain - INVALID_ID" );
-
-      RTEMS.SEMAPHORE_OBTAIN(
-         SPTEST.SEMAPHORE_ID( 1 ),
-         RTEMS.DEFAULT_OPTIONS,
-         RTEMS.NO_TIMEOUT,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED(STATUS, "SEMAPHORE_OBTAIN SUCCESSFUL");
-      TEXT_IO.PUT_LINE( 
-         "TA1 - semaphore_obtain - got sem 1 - SUCCESSFUL"
-      );
-
-      RTEMS.SEMAPHORE_OBTAIN(
-         SPTEST.SEMAPHORE_ID( 1 ),
-         RTEMS.NO_WAIT,
-         RTEMS.NO_TIMEOUT,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.UNSATISFIED,
-         "SEMAPHORE_OBTAIN NOT AVAILABLE"
-      );
-      TEXT_IO.PUT_LINE( "TA1 - semaphore_obtain - UNSATISFIED" );
-
-      TEXT_IO.PUT_LINE( "TA1 - semaphore_obtain - timeout in 3 seconds" );
-      RTEMS.SEMAPHORE_OBTAIN(
-         SPTEST.SEMAPHORE_ID( 1 ),
-         RTEMS.DEFAULT_OPTIONS,
-         3 * TEST_SUPPORT.TICKS_PER_SECOND,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.TIMEOUT,
-         "SEMAPHORE_OBTAIN NOT AVAILABLE"
-      );
-      TEXT_IO.PUT_LINE(
-         "TA1 - semaphore_obtain - woke with TIMEOUT"
-      );
-
-      RTEMS.SEMAPHORE_RELEASE( SPTEST.SEMAPHORE_ID( 2 ), STATUS );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.NOT_OWNER_OF_RESOURCE,
-         "SEMAPHORE_RELEASE AND NOT OWNER"
-      );
-      TEXT_IO.PUT_LINE( 
-         "TA1 - semaphore_release - NOT_OWNER_OF_RESOURCE"
-      );
-
-      RTEMS.SEMAPHORE_RELEASE( 100, STATUS );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_ID,
-         "SEMAPHORE_RELEASE WITH ILLEGAL ID"
-      );
-      TEXT_IO.PUT_LINE( "TA1 - semaphore_release - INVALID_ID" );
-
-      TEXT_IO.PUT_LINE(
-         "TA1 - task_start - start TA2 - SUCCESSFUL"
-     );
-      RTEMS.TASK_START(
-         SPTEST.TASK_ID( 2 ),
-         SPTEST.TASK_2'ACCESS,
-         0,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA2" );
-
-      TEXT_IO.PUT_LINE( 
-         "TA1 - task_wake_after - yield processor - SUCCESSFUL"
-      );
-      RTEMS.TASK_WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER (yield)" );
-
-      TEXT_IO.PUT_LINE( 
-         "TA1 - semaphore_delete - delete sem 1 - SUCCESSFUL"
-      );
-      RTEMS.SEMAPHORE_DELETE( SPTEST.SEMAPHORE_ID( 1 ), STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_DELETE OF SM1" );
-
-      TEXT_IO.PUT_LINE( "TA1 - semaphore_obtain - binary semaphore" );
-      RTEMS.SEMAPHORE_OBTAIN(
-         SPTEST.SEMAPHORE_ID( 2 ),
-         RTEMS.NO_WAIT,
-         RTEMS.NO_TIMEOUT,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_OBTAIN" );
-
-      TEXT_IO.PUT_LINE( 
-         "TA1 - semaphore_delete - delete sem 2 - RESOURCE_IN_USE"
-      );
-      RTEMS.SEMAPHORE_DELETE( SPTEST.SEMAPHORE_ID( 2 ), STATUS );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( 
-         STATUS, 
-         RTEMS.RESOURCE_IN_USE,
-         "SEMAPHORE_DELETE OF SM2" 
-      );
-
-      TEXT_IO.PUT_LINE( 
-         "TA1 - task_wake_after - yield processor - SUCCESSFUL"
-      );
-      RTEMS.TASK_WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER (yield)" );
-
-      RTEMS.TASK_DELETE( SPTEST.TASK_ID( 2 ), STATUS );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_ID,
-         "TASK_DELETE AFTER THE TASK HAS BEEN DELETED"
-      );
-      TEXT_IO.PUT_LINE( 
-         "TA1 - task_delete TA2 - already deleted INVALID_ID"
-      );
-
-   end SCREEN_6;
-
---PAGE
--- 
---  SCREEN_7
---
-
-   procedure SCREEN_7
-   is
-      BUFFER         : SPTEST.BUFFER;
-      BUFFER_POINTER : RTEMS.ADDRESS;
-      COUNT          : RTEMS.UNSIGNED32;
-      MESSAGE_SIZE   : RTEMS.UNSIGNED32;
-      STATUS         : RTEMS.STATUS_CODES;
-   begin
-
-      BUFFER_POINTER := BUFFER'ADDRESS;
-
-      RTEMS.MESSAGE_QUEUE_BROADCAST(
-         100,
-         BUFFER_POINTER,
-         16,
-         COUNT,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_ID,
-         "MESSAGE_QUEUE_BROADCAST WITH ILLEGAL ID"
-      );
-      TEXT_IO.PUT_LINE(
-         "TA1 - message_queue_broadcast - INVALID_ID"
-      );
-
-      RTEMS.MESSAGE_QUEUE_CREATE(
-         0,
-         3,
-         16,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.JUNK_ID,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_NAME,
-         "MESSAGE_QUEUE_CREATE WITH ILLEGAL NAME"
-      );
-      TEXT_IO.PUT_LINE(
-         "TA1 - message_queue_create - Q 1 - INVALID_NAME"
-      );
-
-      RTEMS.MESSAGE_QUEUE_CREATE(
-         SPTEST.QUEUE_NAME( 1 ),
-         1,
-         16,
-         RTEMS.GLOBAL,
-         SPTEST.JUNK_ID,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.MP_NOT_CONFIGURED,
-         "MESSAGE_QUEUE_CREATE OF MP NOT CONFIGURED"
-      );
-      TEXT_IO.PUT_LINE(
-             "TA1 - message_queue_create - Q 1 - MP_NOT_CONFIGURED");
-
-      RTEMS.MESSAGE_QUEUE_CREATE(
-         SPTEST.QUEUE_NAME( 1 ),
-         2,
-         16,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.QUEUE_ID( 1 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED(
-         STATUS,
-         "MESSAGE_QUEUE_CREATE SUCCESSFUL"
-      );
-      TEXT_IO.PUT_LINE(
-         "TA1 - message_queue_create - Q 1 - 2 DEEP - SUCCESSFUL"
-      );
-
-      RTEMS.MESSAGE_QUEUE_CREATE(
-         SPTEST.QUEUE_NAME( 2 ),
-         1,
-         16,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.JUNK_ID,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.TOO_MANY,
-         "MESSAGE_QUEUE_CREATE OF TOO MANY"
-      );
-      TEXT_IO.PUT_LINE(
-         "TA1 - message_queue_create - Q 2 - TOO_MANY"
-      );
-
-      RTEMS.MESSAGE_QUEUE_DELETE( 100, STATUS );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_ID,
-         "MESSAGE_QUEUE_DELETE WITH ILLEGAL ID"
-      );
-      TEXT_IO.PUT_LINE(
-         "TA1 - message_queue_delete - unknown INVALID_ID"
-      );
-
-      RTEMS.MESSAGE_QUEUE_DELETE( 16#10100#, STATUS );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_ID,
-         "MESSAGE_QUEUE_DELETE WITH LOCAL ILLEGAL ID"
-      );
-      TEXT_IO.PUT_LINE(
-         "TA1 - message_queue_delete - local INVALID_ID"
-      );
-
-      RTEMS.MESSAGE_QUEUE_IDENT(
-         100,
-         RTEMS.SEARCH_ALL_NODES,
-         SPTEST.JUNK_ID,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_NAME,
-         "MESSAGE_QUEUE_IDENT WITH ILLEGAL NAME"
-      );
-      TEXT_IO.PUT_LINE( "TA1 - message_queue_ident - INVALID_NAME" );
-
-      RTEMS.MESSAGE_QUEUE_FLUSH( 100, COUNT, STATUS );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_ID,
-         "MESSAGE_QUEUE_FLUSH WITH ILLEGAL ID"
-      );
-      TEXT_IO.PUT_LINE( "TA1 - message_queue_flush - INVALID_ID" );
-
-      RTEMS.MESSAGE_QUEUE_RECEIVE(
-         100,
-         BUFFER_POINTER,
-         RTEMS.DEFAULT_OPTIONS,
-         RTEMS.NO_TIMEOUT,
-         MESSAGE_SIZE,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_ID,
-         "MESSAGE_QUEUE_RECEIVE WITH ILLEGAL ID"
-      );
-      TEXT_IO.PUT_LINE( "TA1 - message_queue_receive - INVALID_ID" );
-
-      RTEMS.MESSAGE_QUEUE_RECEIVE(
-         SPTEST.QUEUE_ID( 1 ),
-         BUFFER_POINTER,
-         RTEMS.NO_WAIT,
-         RTEMS.NO_TIMEOUT,
-         MESSAGE_SIZE,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.UNSATISFIED,
-         "MESSAGE_QUEUE_RECEIVE UNSATISFIED"
-      );
-      TEXT_IO.PUT_LINE(
-         "TA1 - message_queue_receive - Q 1 - UNSATISFIED"
-      );
-
-      TEXT_IO.PUT_LINE(
-         "TA1 - message_queue_receive - Q 1 - timeout in 3 seconds"
-      );
-      RTEMS.MESSAGE_QUEUE_RECEIVE(
-         SPTEST.QUEUE_ID( 1 ),
-         BUFFER_POINTER,
-         RTEMS.DEFAULT_OPTIONS,
-         3 * TEST_SUPPORT.TICKS_PER_SECOND,
-         MESSAGE_SIZE,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.TIMEOUT,
-         "MESSAGE_QUEUE_RECEIVE 3 SECOND TIMEOUT"
-      );
-      TEXT_IO.PUT_LINE(
-         "TA1 - message_queue_receive - Q 1 - woke up with TIMEOUT"
-      );
-
-      RTEMS.MESSAGE_QUEUE_SEND( 100, BUFFER_POINTER, 16, STATUS );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_ID,
-         "MESSAGE_QUEUE_SEND WITH ILLEGAL ID"
-      );
-      TEXT_IO.PUT_LINE( "TA1 - message_queue_send - INVALID_ID" );
-
-      RTEMS.MESSAGE_QUEUE_SEND(
-         SPTEST.QUEUE_ID( 1 ),
-         BUFFER_POINTER,
-         16,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_SEND" );
-      TEXT_IO.PUT_LINE(
-         "TA1 - message_queue_send - BUFFER 1 TO Q 1 - SUCCESSFUL"
-      );
-
-      RTEMS.MESSAGE_QUEUE_SEND(
-         SPTEST.QUEUE_ID( 1 ),
-         BUFFER_POINTER,
-         16,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_SEND" );
-      TEXT_IO.PUT_LINE(
-         "TA1 - message_queue_send - BUFFER 2 TO Q 1 - SUCCESSFUL"
-      );
-
-      RTEMS.MESSAGE_QUEUE_SEND(
-         SPTEST.QUEUE_ID( 1 ),
-         BUFFER_POINTER,
-         16,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.TOO_MANY,
-         "MESSAGE_QUEUE_SEND TOO MANY TO LIMITED QUEUE"
-      );
-      TEXT_IO.PUT_LINE(
-         "TA1 - message_queue_send - BUFFER 3 TO Q 1 - TOO_MANY"
-      );
-
-   end SCREEN_7;
-
---PAGE
--- 
---  SCREEN_8
---
-
-   procedure SCREEN_8
-   is
-      BUFFER         : SPTEST.BUFFER;
-      BUFFER_POINTER : RTEMS.ADDRESS;
-      STATUS         : RTEMS.STATUS_CODES;
-   begin
-
-      BUFFER_POINTER := BUFFER'ADDRESS;
-
-      RTEMS.MESSAGE_QUEUE_DELETE( SPTEST.QUEUE_ID( 1 ), STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED(
-         STATUS,
-         "MESSAGE_QUEUE_DELETE SUCCESSFUL"
-      );
-      TEXT_IO.PUT_LINE(
-         "TA1 - message_queue_delete - Q 1 - SUCCESSFUL"
-      );
-
-      RTEMS.MESSAGE_QUEUE_CREATE(
-         SPTEST.QUEUE_NAME( 1 ),
-         2,
-         16,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.QUEUE_ID( 1 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED(
-         STATUS,
-         "MESSAGE_QUEUE_CREATE SUCCESSFUL"
-      );
-      TEXT_IO.PUT_LINE(
-         "TA1 - message_queue_create - Q 1 - 2 DEEP - SUCCESSFUL"
-      );
-
-      RTEMS.MESSAGE_QUEUE_SEND(
-         SPTEST.QUEUE_ID( 1 ),
-         BUFFER_POINTER,
-         16,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_SEND" );
-      TEXT_IO.PUT_LINE(
-         "TA1 - message_queue_send - BUFFER 1 TO Q 1 - SUCCESSFUL"
-      );
-
-      RTEMS.MESSAGE_QUEUE_SEND(
-         SPTEST.QUEUE_ID( 1 ),
-         BUFFER_POINTER,
-         16,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_SEND" );
-      TEXT_IO.PUT_LINE(
-         "TA1 - message_queue_send - BUFFER 2 TO Q 1 - SUCCESSFUL"
-      );
-
-      RTEMS.MESSAGE_QUEUE_SEND(
-         SPTEST.QUEUE_ID( 1 ),
-         BUFFER_POINTER,
-         16,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.TOO_MANY,
-         "MESSAGE_QUEUE_SEND TOO MANY TO LIMITED QUEUE"
-      );
-      TEXT_IO.PUT_LINE(
-         "TA1 - message_queue_send - BUFFER 3 TO Q 1 - TOO_MANY"
-      );
-
-      RTEMS.MESSAGE_QUEUE_DELETE( SPTEST.QUEUE_ID( 1 ), STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED(
-         STATUS,
-         "MESSAGE_QUEUE_DELETE SUCCESSFUL"
-      );
-      TEXT_IO.PUT_LINE(
-         "TA1 - message_queue_delete - Q 1 - SUCCESSFUL"
-      );
-
-      RTEMS.MESSAGE_QUEUE_CREATE(
-         SPTEST.QUEUE_NAME( 1 ),
-         3,
-         16,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.QUEUE_ID( 1 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED(
-         STATUS,
-         "MESSAGE_QUEUE_CREATE SUCCESSFUL"
-      );
-      TEXT_IO.PUT_LINE(
-         "TA1 - message_queue_create - Q 1 - 3 DEEP - SUCCESSFUL"
-      );
-
-      RTEMS.MESSAGE_QUEUE_SEND(
-         SPTEST.QUEUE_ID( 1 ),
-         BUFFER_POINTER,
-         16,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_SEND" );
-      TEXT_IO.PUT_LINE(
-         "TA1 - message_queue_send - BUFFER 1 TO Q 1 - SUCCESSFUL"
-      );
-
-      RTEMS.MESSAGE_QUEUE_SEND(
-         SPTEST.QUEUE_ID( 1 ),
-         BUFFER_POINTER,
-         16,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_SEND" );
-      TEXT_IO.PUT_LINE(
-         "TA1 - message_queue_send - BUFFER 2 TO Q 1 - SUCCESSFUL"
-      );
-
-      RTEMS.MESSAGE_QUEUE_SEND(
-         SPTEST.QUEUE_ID( 1 ),
-         BUFFER_POINTER,
-         16,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_SEND" );
-      TEXT_IO.PUT_LINE(
-         "TA1 - message_queue_send - BUFFER 3 TO Q 1 - SUCCESSFUL"
-      );
-
-      RTEMS.MESSAGE_QUEUE_SEND(
-         SPTEST.QUEUE_ID( 1 ),
-         BUFFER_POINTER,
-         16,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.TOO_MANY,
-         "MESSAGE_QUEUE_SEND TOO MANY TO LIMITED QUEUE"
-      );
-      TEXT_IO.PUT_LINE(
-         "TA1 - message_queue_send - BUFFER 4 TO Q 1 - TOO_MANY"
-      );
-
-      RTEMS.MESSAGE_QUEUE_DELETE( SPTEST.QUEUE_ID( 1 ), STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED(
-         STATUS,
-         "MESSAGE_QUEUE_DELETE SUCCESSFUL"
-      );
-      TEXT_IO.PUT_LINE(
-         "TA1 - message_queue_delete - Q 1 - SUCCESSFUL"
-      );
-
-      RTEMS.MESSAGE_QUEUE_CREATE(
-         SPTEST.QUEUE_NAME( 1 ),
-         2,
-         16,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.QUEUE_ID( 1 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED(
-         STATUS,
-         "MESSAGE_QUEUE_CREATE SUCCESSFUL"
-      );
-      TEXT_IO.PUT_LINE(
-         "TA1 - message_queue_create - Q 1 - 3 DEEP - SUCCESSFUL"
-      );
-
-      TEXT_IO.PUT_LINE( 
-         "TA1 - task_start - start TA3 - SUCCESSFUL"
-      );
-      RTEMS.TASK_START(
-         SPTEST.TASK_ID( 3 ),
-         SPTEST.TASK_3'ACCESS,
-         0,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA3" );
-
-      TEXT_IO.PUT_LINE( 
-         "TA1 - task_wake_after - yield processor - SUCCESSFUL"
-      );
-      RTEMS.TASK_WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER (yield)" );
-
-      RTEMS.MESSAGE_QUEUE_DELETE( SPTEST.QUEUE_ID( 1 ), STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED(
-         STATUS,
-         "MESSAGE_QUEUE_DELETE SUCCESSFUL"
-      );
-      TEXT_IO.PUT_LINE(
-         "TA1 - message_queue_delete - delete Q 1 - SUCCESSFUL"
-      );
-
-      TEXT_IO.PUT_LINE( 
-         "TA1 - task_wake_after - yield processor - SUCCESSFUL"
-      );
-      RTEMS.TASK_WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER (yield)" );
-
-   end SCREEN_8;
-
---PAGE
--- 
---  SCREEN_9
---
-
-   procedure SCREEN_9
-   is
-      CONVERTED           : RTEMS.ADDRESS;
-      STATUS              : RTEMS.STATUS_CODES;
-      OLD_SERVICE_ROUTINE : RTEMS.ADDRESS;
-   begin
-
---      RTEMS.INTERRUPT_CATCH( 
---         SPTEST.SERVICE_ROUTINE'ACCESS,
---         500,
---         OLD_SERVICE_ROUTINE,
---         STATUS
---      );
---      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
---         STATUS,
---         RTEMS.INVALID_NUMBER,
---         "INTERRUPT_CATCH WITH INVALID VECTOR"
---      );
---      TEXT_IO.PUT_LINE( "TA1 - interrupt_catch - INVALID_NUMBER" );
-      TEXT_IO.PUT_LINE(
-         "TA1 - interrupt_catch - INVALID_NUMBER -- constraint error"
-      );
-
-      RTEMS.INTERRUPT_CATCH( 
-         RTEMS.NULL_ADDRESS,
-         3,
-         OLD_SERVICE_ROUTINE,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_ADDRESS,
-         "INTERRUPT_CATCH WITH INVALID HANDLER"
-      );
-      TEXT_IO.PUT_LINE( "TA1 - interrupt_catch - INVALID_ADDRESS" );
-
-      RTEMS.SIGNAL_SEND( 100, RTEMS.SIGNAL_1, STATUS );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_ID,
-         "SIGNAL_SEND WITH ILLEGAL ID"
-      );
-      TEXT_IO.PUT_LINE( "TA1 - signal_send - INVALID_ID" );
-
-      RTEMS.SIGNAL_SEND( RTEMS.SELF, RTEMS.SIGNAL_16, STATUS );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.NOT_DEFINED,
-         "SIGNAL_SEND WITH NO HANDLER"
-      );
-      TEXT_IO.PUT_LINE( "TA1 - signal_send - NOT_DEFINED" );
-
-      RTEMS.PORT_CREATE(
-         0,
-         SPTEST.INTERNAL_PORT_AREA'ADDRESS,
-         SPTEST.EXTERNAL_PORT_AREA'ADDRESS,
-         SPTEST.INTERNAL_PORT_AREA'LENGTH,
-         SPTEST.JUNK_ID,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_NAME,
-         "PORT_CREATE WITH ILLEGAL NAME"
-      );
-      TEXT_IO.PUT_LINE( "TA1 - port_create - INVALID_NAME" );
-
-      RTEMS.PORT_CREATE(
-         SPTEST.PORT_NAME( 1 ),
-         SPTEST.INTERNAL_PORT_AREA( 1 )'ADDRESS,
-         SPTEST.EXTERNAL_PORT_AREA'ADDRESS,
-         SPTEST.INTERNAL_PORT_AREA'LENGTH,
-         SPTEST.JUNK_ID,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_ADDRESS,
-         "PORT_CREATE WITH ILLEGAL ADDRESS"
-      );
-      TEXT_IO.PUT_LINE( "TA1 - port_create - INVALID_ADDRESS" );
-
-      RTEMS.PORT_CREATE(
-         SPTEST.PORT_NAME( 1 ),
-         SPTEST.INTERNAL_PORT_AREA'ADDRESS,
-         SPTEST.EXTERNAL_PORT_AREA'ADDRESS,
-         SPTEST.INTERNAL_PORT_AREA'LENGTH,
-         SPTEST.JUNK_ID,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.TOO_MANY,
-         "PORT_CREATE OF TOO MANY"
-      );
-      TEXT_IO.PUT_LINE( "TA1 - port_create - TOO_MANY" );
-
-      RTEMS.PORT_DELETE( 0, STATUS );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_ID,
-         "PORT_DELETE WITH ILLEGAL ID"
-      );
-      TEXT_IO.PUT_LINE( "TA1 - port_delete - INVALID_ID" );
-
-      RTEMS.PORT_IDENT( 0, SPTEST.JUNK_ID, STATUS );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_NAME,
-         "PORT_IDENT WITH ILLEGAL NAME"
-      );
-      TEXT_IO.PUT_LINE( "TA1 - port_ident - INVALID_NAME" );
-
-      RTEMS.PORT_INTERNAL_TO_EXTERNAL(
-         100,
-         SPTEST.INTERNAL_PORT_AREA'ADDRESS,
-         CONVERTED,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_ID,
-         "PORT_INTERNAL_TO_EXTERNAL WITH ILLEGAL ID"
-      );
-      TEXT_IO.PUT_LINE(
-         "TA1 - port_internal_to_external - INVALID_ID"
-      );
-
-      RTEMS.PORT_EXTERNAL_TO_INTERNAL(
-         100,
-         SPTEST.EXTERNAL_PORT_AREA'ADDRESS,
-         CONVERTED,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_ID,
-         "PORT_EXTERNAL_TO_INTERNAL WITH ILLEGAL ID"
-      );
-      TEXT_IO.PUT_LINE(
-         "TA1 - port_external_to_internal - INVALID_ID"
-      );
-
-   end SCREEN_9;
-
---PAGE
--- 
---  SCREEN_10
---
-
-   procedure SCREEN_10
-   is
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      RTEMS.RATE_MONOTONIC_CREATE( 0, SPTEST.JUNK_ID, STATUS );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_NAME,
-         "RATE_MONOTONIC_CREATE WITH ILLEGAL NAME"
-      );
-      TEXT_IO.PUT_LINE(
-         "TA1 - rate_monotonic_create - INVALID_NAME"
-      );
-
-      RTEMS.RATE_MONOTONIC_CREATE(
-         SPTEST.PERIOD_NAME( 1 ),
-         SPTEST.PERIOD_ID( 1 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "RATE_MONOTONIC_CREATE" );
-      TEXT_IO.PUT_LINE(
-         "TA1 - rate_monotonic_create - SUCCESSFUL"
-      );
-
-      RTEMS.RATE_MONOTONIC_CREATE(
-         SPTEST.PERIOD_NAME( 1 ),
-         SPTEST.JUNK_ID,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.TOO_MANY,
-         "RATE_MONOTONIC_CREATE FOR TOO MANY"
-      );
-      TEXT_IO.PUT_LINE( "TA1 - rate_monotonic_create - TOO_MANY" );
-
-      RTEMS.RATE_MONOTONIC_IDENT( 0, SPTEST.JUNK_ID, STATUS );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_NAME,
-         "RATE_MONOTONIC_IDENT WITH ILLEGAL NAME"
-      );
-      TEXT_IO.PUT_LINE(
-         "TA1 - rate_monotonic_ident - INVALID_NAME"
-      );
-
-      RTEMS.RATE_MONOTONIC_PERIOD( 100, 5, STATUS );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_ID,
-         "RATE_MONOTONIC_PERIOD WITH ILLEGAL ID"
-      );
-      TEXT_IO.PUT_LINE(
-         "TA1 - rate_monotonic_period - unknown INVALID_ID"
-      );
-
-      RTEMS.RATE_MONOTONIC_PERIOD( 16#10100#, 5, STATUS );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_ID,
-         "RATE_MONOTONIC_PERIOD WITH ILLEGAL ID"
-      );
-      TEXT_IO.PUT_LINE(
-         "TA1 - rate_monotonic_period - local INVALID_ID"
-      );
-
-      RTEMS.RATE_MONOTONIC_PERIOD(
-         SPTEST.PERIOD_ID( 1 ),
-         RTEMS.PERIOD_STATUS,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.NOT_DEFINED,
-         "RATE_MONOTONIC_PERIOD STATUS NOT DEFINED"
-      );
-      TEXT_IO.PUT_LINE( 
-         "TA1 - rate_monotonic_period( STATUS ) - NOT_DEFINED"
-      );
-
-      RTEMS.RATE_MONOTONIC_PERIOD( SPTEST.PERIOD_ID( 1 ), 100, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED(
-         STATUS,
-         "RATE_MONOTONIC_PERIOD 100 TICKS"
-      );
-      TEXT_IO.PUT( "TA1 - rate_monotonic_period - 100 ticks - " );
-      TEXT_IO.PUT_LINE( "SUCCESSFUL" );
-
-      RTEMS.RATE_MONOTONIC_PERIOD(
-         SPTEST.PERIOD_ID( 1 ),
-         RTEMS.PERIOD_STATUS,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED(
-         STATUS,
-         "RATE_MONOTONIC_PERIOD STATUS"
-      );
-      TEXT_IO.PUT( "TA1 - rate_monotonic_period( STATUS ) - " );
-      TEXT_IO.PUT_LINE( "SUCCESSFUL" );
-
-      loop
-
-         RTEMS.RATE_MONOTONIC_PERIOD(
-            SPTEST.PERIOD_ID( 1 ),
-            RTEMS.PERIOD_STATUS,
-            STATUS
-         );
-
-         exit when RTEMS.ARE_STATUSES_EQUAL( STATUS, RTEMS.TIMEOUT );
-
-         TEST_SUPPORT.DIRECTIVE_FAILED(
-            STATUS,
-            "RATE_MONOTONIC_PERIOD STATUS WAITING FOR TIMEOUT"
-         );
- 
-      end loop;
-      TEXT_IO.PUT( "TA1 - rate_monotonic_period( STATUS ) - " );
-      TEXT_IO.PUT_LINE( "TIMEOUT" );
-
-      RTEMS.RATE_MONOTONIC_CANCEL( 100, STATUS );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_ID,
-         "RATE_MONOTONIC_CANCEL WITH ILLEGAL ID"
-      );
-      TEXT_IO.PUT_LINE(
-         "TA1 - rate_monotonic_cancel - unknown INVALID_ID"
-      );
-
-      RTEMS.RATE_MONOTONIC_CANCEL( 16#10100#, STATUS );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_ID,
-         "RATE_MONOTONIC_CANCEL WITH ILLEGAL ID"
-      );
-      TEXT_IO.PUT_LINE(
-         "TA1 - rate_monotonic_cancel - local INVALID_ID"
-      );
-
-      RTEMS.RATE_MONOTONIC_CANCEL( SPTEST.PERIOD_ID( 1 ), STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "RATE_MONOTONIC_CANCEL" );
-      TEXT_IO.PUT_LINE( "TA1 - rate_monotonic_cancel - SUCCESSFUL" );
-
-      RTEMS.RATE_MONOTONIC_PERIOD( SPTEST.PERIOD_ID( 1 ), 5, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED(
-         STATUS,
-         "RATE_MONOTONIC_PERIOD RESTART"
-      );
-
-      RTEMS.TASK_WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
-
-      RTEMS.RATE_MONOTONIC_PERIOD( SPTEST.PERIOD_ID( 1 ), 5, STATUS );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.TIMEOUT,
-         "RATE_MONOTONIC_PERIOD TIMED OUT"
-      );
-      TEXT_IO.PUT_LINE( 
-         "TA1 - rate_monotonic_period - 5 ticks - TIMEOUT" 
-      );
-
-      RTEMS.TASK_START(
-         SPTEST.TASK_ID( 4 ),
-         SPTEST.TASK_4'ACCESS,
-         0,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA4" );
-
-      TEXT_IO.PUT_LINE( "TA1 - task_wake_after - yielding to TA4" );
-      RTEMS.TASK_WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER (yield)" );
-
-      RTEMS.RATE_MONOTONIC_DELETE( 100, STATUS );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_ID,
-         "RATE_MONOTONIC_DELETE WITH ILLEGAL ID"
-      );
-      TEXT_IO.PUT_LINE(
-         "TA1 - rate_monotonic_delete - unknown INVALID_ID"
-      );
-
-      RTEMS.RATE_MONOTONIC_DELETE( 16#10100#, STATUS );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_ID,
-         "RATE_MONOTONIC_DELETE WITH ILLEGAL ID"
-      );
-      TEXT_IO.PUT_LINE(
-         "TA1 - rate_monotonic_delete - local INVALID_ID"
-      );
-
-      RTEMS.RATE_MONOTONIC_DELETE( SPTEST.PERIOD_ID( 1 ), STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "RATE_MONOTONIC_DELETE" );
-      TEXT_IO.PUT_LINE(
-         "TA1 - rate_monotonic_delete - SUCCESSFUL"
-      );
-
-   end SCREEN_10;
-
---PAGE
--- 
---  SCREEN_11
---
-
-   procedure SCREEN_11
-   is
-      BUFFER_ADDRESS_1 : RTEMS.ADDRESS;
-      BUFFER_ADDRESS_2 : RTEMS.ADDRESS;
-      BUFFER_ADDRESS_3 : RTEMS.ADDRESS;
-      STATUS           : RTEMS.STATUS_CODES;
-   begin
-
-      RTEMS.PARTITION_CREATE(
-         0,
-         SPTEST.PARTITION_GOOD_AREA'ADDRESS,
-         128,
-         40,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.JUNK_ID,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_NAME,
-         "PARTITION_CREATE WITH ILLEGAL NAME"
-      );
-      TEXT_IO.PUT_LINE( "TA1 - partition_create - INVALID_NAME" );
-
-      RTEMS.PARTITION_CREATE(
-         SPTEST.PARTITION_NAME( 1 ),
-         SPTEST.PARTITION_GOOD_AREA'ADDRESS,
-         0,
-         80,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.JUNK_ID,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_SIZE,
-         "PARTITION_CREATE WITH ILLEGAL LENGTH"
-      );
-      TEXT_IO.PUT_LINE(
-         "TA1 - partition_create - length - INVALID_SIZE"
-      );
-
-      RTEMS.PARTITION_CREATE(
-         SPTEST.PARTITION_NAME( 1 ),
-         SPTEST.PARTITION_GOOD_AREA'ADDRESS,
-         128,
-         0,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.JUNK_ID,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_SIZE,
-         "PARTITION_CREATE WITH ILLEGAL BUFFER_SIZE"
-      );
-      TEXT_IO.PUT_LINE( 
-         "TA1 - partition_create - buffer size - INVALID_SIZE" 
-      );
-
-      RTEMS.PARTITION_CREATE(
-         SPTEST.PARTITION_NAME( 1 ),
-         SPTEST.PARTITION_GOOD_AREA'ADDRESS,
-         128,
-         256,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.JUNK_ID,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_SIZE,
-         "PARTITION_CREATE WITH BUFFER_SIZE > LENGTH"
-      );
-      TEXT_IO.PUT_LINE( 
-       "TA1 - partition_create - length < buffer size - INVALID_SIZE"
-      );
-
-      RTEMS.PARTITION_CREATE(
-         SPTEST.PARTITION_NAME( 1 ),
-         SPTEST.PARTITION_GOOD_AREA'ADDRESS,
-         128,
-         64,
-         RTEMS.GLOBAL,
-         SPTEST.JUNK_ID,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.MP_NOT_CONFIGURED,
-         "PARTITION_CREATE OF GLOBAL"
-      );
-      TEXT_IO.PUT_LINE("TA1 - partition_create - MP_NOT_CONFIGURED");
-
-      RTEMS.PARTITION_CREATE(
-         SPTEST.PARTITION_NAME( 1 ),
-         SPTEST.PARTITION_BAD_AREA'ADDRESS,
-         128,
-         64,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.JUNK_ID,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_ADDRESS,
-         "PARTITION_CREATE WITH BAD ADDRESS"
-      );
-      TEXT_IO.PUT_LINE( "TA1 - partition_create - INVALID_ADDRESS" );
-
-      RTEMS.PARTITION_CREATE(
-         SPTEST.PARTITION_NAME( 1 ),
-         SPTEST.PARTITION_GOOD_AREA'ADDRESS,
-         128,
-         34,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.JUNK_ID,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_SIZE,
-         "PARTITION_CREATE WITH UNALIGNED BUFFER_SIZE"
-      );
-      TEXT_IO.PUT_LINE( "TA1 - partition_create - INVALID_SIZE" );
-
-      RTEMS.PARTITION_DELETE( 100, STATUS );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_ID,
-         "PARTITION_DELETE WITH ILLEGAL ID"
-      );
-      TEXT_IO.PUT_LINE(
-         "TA1 - partition_delete - unknown INVALID_ID"
-      );
-
-      RTEMS.PARTITION_DELETE( 16#10100#, STATUS );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_ID,
-         "PARTITION_DELETE WITH ILLEGAL ID"
-      );
-      TEXT_IO.PUT_LINE(
-         "TA1 - partition_delete - local INVALID_ID"
-      );
-
-      RTEMS.PARTITION_GET_BUFFER( 100, BUFFER_ADDRESS_1, STATUS );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_ID,
-         "PARTITION_GET_BUFFER WITH ILLEGAL ID"
-      );
-      TEXT_IO.PUT_LINE( "TA1 - partition_get_buffer - INVALID_ID" );
-
-      RTEMS.PARTITION_IDENT(
-         0,
-         RTEMS.SEARCH_ALL_NODES,
-         SPTEST.JUNK_ID,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_NAME,
-         "PARTITION_IDENT WITH ILLEGAL NAME"
-      );
-      TEXT_IO.PUT_LINE( "TA1 - partition_ident - INVALID_NAME" );
-
-      RTEMS.PARTITION_RETURN_BUFFER( 100, BUFFER_ADDRESS_1, STATUS );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_ID,
-         "PARTITION_RETURN WITH ILLEGAL ID"
-      );
-      TEXT_IO.PUT_LINE(
-         "TA1 - partition_return_buffer - INVALID_ID"
-      );
-
-      RTEMS.PARTITION_CREATE(
-         SPTEST.PARTITION_NAME( 1 ),
-         SPTEST.PARTITION_GOOD_AREA'ADDRESS,
-         128,
-         64,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.PARTITION_ID( 1 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "PARTITION_CREATE" );
-      TEXT_IO.PUT_LINE( "TA1 - partition_create - SUCCESSFUL" );
-
-      RTEMS.PARTITION_CREATE(
-         SPTEST.PARTITION_NAME( 1 ),
-         SPTEST.PARTITION_GOOD_AREA'ADDRESS,
-         128,
-         64,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.JUNK_ID,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.TOO_MANY,
-         "PARTITION_CREATE OF TOO MANY"
-      );
-      TEXT_IO.PUT_LINE( "TA1 - partition_create - TOO_MANY" );
-
-      RTEMS.PARTITION_GET_BUFFER(
-         SPTEST.PARTITION_ID( 1 ),
-         BUFFER_ADDRESS_1,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "PARTITION_GET_BUFFER" );
-      TEXT_IO.PUT_LINE( "TA1 - partition_get_buffer - SUCCESSFUL" );
-
-      RTEMS.PARTITION_GET_BUFFER(
-         SPTEST.PARTITION_ID( 1 ),
-         BUFFER_ADDRESS_2,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "PARTITION_GET_BUFFER" );
-      TEXT_IO.PUT_LINE( "TA1 - partition_get_buffer - SUCCESSFUL" );
-
-      RTEMS.PARTITION_GET_BUFFER(
-         SPTEST.PARTITION_ID( 1 ),
-         BUFFER_ADDRESS_3,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.UNSATISFIED,
-         "PARTITION_GET_BUFFER UNSATISFIED"
-      );
-      TEXT_IO.PUT_LINE( "TA1 - partition_get_buffer - UNSATISFIED" );
-
-      RTEMS.PARTITION_DELETE(
-         SPTEST.PARTITION_ID( 1 ),
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.RESOURCE_IN_USE,
-         "PARTITION_DELETE WITH BUFFERS IN USE"
-      );
-      TEXT_IO.PUT_LINE( "TA1 - partition_delete - RESOURCE_IN_USE" );
-
-      RTEMS.PARTITION_RETURN_BUFFER(
-         SPTEST.PARTITION_ID( 1 ),
-         SPTEST.REGION_GOOD_AREA( 0 )'ADDRESS,  -- NOTE: REGION
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_ADDRESS,
-         "PARTITION_RETURN WITH BUFFER ADDRESS OUT OF PARTITION"
-      );
-      TEXT_IO.PUT( "TA1 - partition_return_buffer - " );
-      TEXT_IO.PUT_LINE( "INVALID_ADDRESS - out of range" );
-
-      RTEMS.PARTITION_RETURN_BUFFER(
-         SPTEST.PARTITION_ID( 1 ),
-         SPTEST.PARTITION_GOOD_AREA( 7 )'ADDRESS,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_ADDRESS,
-         "PARTITION_RETURN WITH BUFFER ADDRESS NOT ON BOUNDARY"
-      );
-      TEXT_IO.PUT( "TA1 - partition_return_buffer - " );
-      TEXT_IO.PUT_LINE( "INVALID_ADDRESS - not on boundary" );
-
-
-   end SCREEN_11;
-
---PAGE
--- 
---  SCREEN_12
---
-
-   procedure SCREEN_12
-   is
-      SEGMENT_ADDRESS_1 : RTEMS.ADDRESS;
-      SEGMENT_ADDRESS_2 : RTEMS.ADDRESS;
-      SEGMENT_ADDRESS_3 : RTEMS.ADDRESS;
-      OFFSET            : RTEMS.UNSIGNED32;
-      GOOD_FRONT_FLAG   : RTEMS.UNSIGNED32;
-      GOOD_BACK_FLAG    : RTEMS.UNSIGNED32;
-      STATUS            : RTEMS.STATUS_CODES;
-   begin
-
-      RTEMS.REGION_CREATE(
-         0,
-         SPTEST.REGION_GOOD_AREA'ADDRESS,
-         16#40#,
-         32,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.JUNK_ID,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_NAME,
-         "REGION_CREATE WITH ILLEGAL NAME"
-      );
-      TEXT_IO.PUT_LINE( "TA1 - region_create - INVALID_NAME" );
-
-      RTEMS.REGION_CREATE(
-         SPTEST.REGION_NAME( 1 ),
-         SPTEST.REGION_BAD_AREA'ADDRESS,
-         16#40#,
-         32,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.JUNK_ID,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_ADDRESS,
-         "REGION_CREATE WITH ILLEGAL ADDRESS"
-      );
-      TEXT_IO.PUT_LINE( "TA1 - region_create - INVALID_ADDRESS" );
-
-      RTEMS.REGION_CREATE(
-         SPTEST.REGION_NAME( 1 ),
-         SPTEST.REGION_GOOD_AREA'ADDRESS,
-         16#40#,
-         34,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.JUNK_ID,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_SIZE,
-         "REGION_CREATE WITH ILLEGAL SIZE"
-      );
-      TEXT_IO.PUT_LINE( "TA1 - region_create - INVALID_SIZE" );
-
-      RTEMS.REGION_CREATE(
-         SPTEST.REGION_NAME( 1 ),
-         SPTEST.REGION_GOOD_AREA( SPTEST.REGION_START_OFFSET )'ADDRESS,
-         SPTEST.REGION_LENGTH,
-         16#40#,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.REGION_ID( 1 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_CREATE" );
-      TEXT_IO.PUT_LINE( "TA1 - region_create - SUCCESSFUL" );
-
-      RTEMS.REGION_CREATE(
-         SPTEST.REGION_NAME( 1 ),
-         SPTEST.REGION_GOOD_AREA'ADDRESS,
-         SPTEST.REGION_LENGTH,
-         16#40#,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.JUNK_ID,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.TOO_MANY,
-         "REGION_CREATE FOR TOO MANY"
-      );
-      TEXT_IO.PUT_LINE( "TA1 - region_create - TOO_MANY" );
-
-      RTEMS.REGION_DELETE( 100, STATUS );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_ID,
-         "REGION_DELETE WITH ILLEGAL ID"
-      );
-      TEXT_IO.PUT_LINE( "TA1 - region_delete - unknown INVALID_ID" );
-
-      RTEMS.REGION_DELETE( 16#10100#, STATUS );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_ID,
-         "REGION_DELETE WITH ILLEGAL ID"
-      );
-      TEXT_IO.PUT_LINE( "TA1 - region_delete - local INVALID_ID" );
-
-      RTEMS.REGION_IDENT( 0, SPTEST.JUNK_ID, STATUS );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_NAME,
-         "REGION_IDENT WITH ILLEGAL NAME"
-      );
-      TEXT_IO.PUT_LINE( "TA1 - region_ident - INVALID_NAME" );
-
-      RTEMS.REGION_GET_SEGMENT(
-         100,
-         16#40#,
-         RTEMS.DEFAULT_OPTIONS,
-         RTEMS.NO_TIMEOUT,
-         SEGMENT_ADDRESS_1,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_ID,
-         "REGION_GET_SEGMENT WITH ILLEGAL ID"
-      );
-      TEXT_IO.PUT_LINE( "TA1 - region_get_segment - INVALID_ID" );
-
-      RTEMS.REGION_GET_SEGMENT(
-         SPTEST.REGION_ID( 1 ),
-         (SPTEST.REGION_GOOD_AREA'SIZE / 8) * 2,
-         RTEMS.DEFAULT_OPTIONS,
-         RTEMS.NO_TIMEOUT,
-         SEGMENT_ADDRESS_1,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_SIZE,
-         "REGION_GET_SEGMENT WITH ILLEGAL SIZE"
-      );
-      TEXT_IO.PUT_LINE( "TA1 - region_get_segment - INVALID_SIZE" );
-
-      RTEMS.REGION_GET_SEGMENT(
-         SPTEST.REGION_ID( 1 ),
-         384,
-         RTEMS.DEFAULT_OPTIONS,
-         RTEMS.NO_TIMEOUT,
-         SEGMENT_ADDRESS_1,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_GET_SEGMENT" );
-      TEXT_IO.PUT_LINE( "TA1 - region_get_segment - SUCCESSFUL" );
-
-      RTEMS.REGION_GET_SEGMENT(
-         SPTEST.REGION_ID( 1 ),
-         SPTEST.REGION_LENGTH / 2,
-         RTEMS.NO_WAIT,
-         RTEMS.NO_TIMEOUT,
-         SEGMENT_ADDRESS_2,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.UNSATISFIED,
-         "REGION_GET_SEGMENT UNSATISFIED"
-      );
-      TEXT_IO.PUT_LINE( "TA1 - region_get_segment - UNSATISFIED" );
-
-      TEXT_IO.PUT_LINE( "TA1 - region_get_segment - timeout in 3 seconds" );
-      RTEMS.REGION_GET_SEGMENT(
-         SPTEST.REGION_ID( 1 ),
-         128,
-         RTEMS.DEFAULT_OPTIONS,
-         3 * TEST_SUPPORT.TICKS_PER_SECOND,
-         SEGMENT_ADDRESS_3,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.TIMEOUT,
-         "REGION_GET_SEGMENT TIMEOUT"
-      );
-      TEXT_IO.PUT_LINE( 
-         "TA1 - region_get_segment - woke up with TIMEOUT" 
-      );
-
-      RTEMS.REGION_DELETE( SPTEST.REGION_ID( 1 ), STATUS );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.RESOURCE_IN_USE,
-         "REGION_DELETE WITH BUFFERS IN USE"
-      );
-      TEXT_IO.PUT_LINE( "TA1 - region_delete - RESOURCE_IN_USE" );
-
-      RTEMS.REGION_RETURN_SEGMENT(
-         100,
-         SEGMENT_ADDRESS_1,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_ID,
-         "REGION_RETURN_SEGMENT WITH ILLEGAL ID"
-      );
-      TEXT_IO.PUT_LINE( "TA1 - region_return_segment - INVALID_ID" );
-
-      RTEMS.REGION_RETURN_SEGMENT(
-         SPTEST.REGION_ID( 1 ),
-         SPTEST.REGION_GOOD_AREA'ADDRESS,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_ADDRESS,
-         "REGION_RETURN_SEGMENT WITH ILLEGAL SEGMENT"
-      );
-      TEXT_IO.PUT_LINE(
-         "TA1 - region_return_segment - INVALID_ADDRESS"
-      );
-
-      -- internal heap errors, subject to change if heap code changes
-
-      TEXT_IO.PUT_LINE( "TA1 - debug_disable - DEBUG_REGION" );
-      RTEMS.DEBUG_DISABLE( RTEMS.DEBUG_REGION );
-
-      OFFSET := 0;
-      GOOD_BACK_FLAG := 0;
-      GOOD_FRONT_FLAG := 0;
-
-      TEXT_IO.PUT_LINE(
-         "TA1 - region_return_segment - INVALID_ADDRESS - SKIPPED"
-      );
-      TEXT_IO.PUT_LINE(
-         "TA1 - region_return_segment - INVALID_ADDRESS - SKIPPED"
-      );
-
-
---      OFFSET := RTEMS.SUBTRACT( 
---                   SEGMENT_ADDRESS_1, 
---                   SPTEST.REGION_GOOD_AREA'ADDRESS
---                ) / 4;
---
---      
---      -- bad FRONT_FLAG error
---
---      GOOD_FRONT_FLAG := SPTEST.REGION_GOOD_AREA( OFFSET - 1 );
---      SPTEST.REGION_GOOD_AREA( OFFSET - 1 ) := GOOD_FRONT_FLAG + 2;
---
---      RTEMS.REGION_RETURN_SEGMENT(
---         SPTEST.REGION_ID( 1 ),
---         SEGMENT_ADDRESS_1,
---         STATUS
---      );
---      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
---         STATUS,
---         RTEMS.INVALID_ADDRESS,
---         "REGION_RETURN_SEGMENT WITH BACK_FLAG /= FRONT_FLAG"
---      );
---      TEXT_IO.PUT_LINE(
---         "TA1 - region_return_segment - INVALID_ADDRESS"
---      );
---
---      SPTEST.REGION_GOOD_AREA( OFFSET - 1 ) := GOOD_FRONT_FLAG;
---
---      -- bad BACK_FLAG error
---
---      GOOD_BACK_FLAG := SPTEST.REGION_GOOD_AREA( OFFSET - 2 );
---      SPTEST.REGION_GOOD_AREA( OFFSET - 2 ) := 1024;
---
---      RTEMS.REGION_RETURN_SEGMENT(
---         SPTEST.REGION_ID( 1 ),
---         SEGMENT_ADDRESS_1,
---         STATUS
---      );
---      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
---         STATUS,
---         RTEMS.INVALID_ADDRESS,
---         "REGION_RETURN_SEGMENT WITH BACK_FLAG /= FRONT_FLAG"
---      );
---      TEXT_IO.PUT_LINE(
---         "TA1 - region_return_segment - INVALID_ADDRESS"
---      );
---
---      SPTEST.REGION_GOOD_AREA( OFFSET - 2 ) := GOOD_BACK_FLAG;
-
-      TEXT_IO.PUT_LINE( "TA1 - debug_enable - DEBUG_REGION" );
-      RTEMS.DEBUG_ENABLE( RTEMS.DEBUG_REGION );
-
-      RTEMS.REGION_EXTEND(
-         100,
-         SPTEST.REGION_GOOD_AREA'ADDRESS,
-         128,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_ID,
-         "REGION_EXTEND WITH INVALID_ID"
-      );
-      TEXT_IO.PUT_LINE(
-         "TA1 - region_extend - INVALID_ID"
-      );
-
-      RTEMS.REGION_EXTEND(
-         SPTEST.REGION_ID( 1 ),
-         SPTEST.REGION_GOOD_AREA( SPTEST.REGION_START_OFFSET + 16 )'ADDRESS,
-         128,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_ADDRESS,
-         "REGION_EXTEND WITH INVALID_ADDRESS"
-      );
-      TEXT_IO.PUT_LINE(
-         "TA1 - region_extend - within heap - INVALID_ADDRESS"
-      );
-
-      RTEMS.REGION_EXTEND(
-         SPTEST.REGION_ID( 1 ),
-         SPTEST.REGION_BAD_AREA'ADDRESS,
-         128,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.NOT_IMPLEMENTED,
-         "REGION_EXTEND WITH NOT_IMPLEMENTED"
-      );
-      TEXT_IO.PUT_LINE(
-         "TA1 - region_extend - non-contiguous lower - NOT_IMPLEMENTED"
-      );
-
-      RTEMS.REGION_EXTEND(
-         SPTEST.REGION_ID( 1 ),
-         SPTEST.REGION_GOOD_AREA( 
-            SPTEST.REGION_START_OFFSET - SPTEST.REGION_LENGTH )'ADDRESS,
-         128,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.NOT_IMPLEMENTED,
-         "REGION_EXTEND WITH NOT_IMPLEMENTED"
-      );
-      TEXT_IO.PUT_LINE(
-         "TA1 - region_extend - contiguous lower - NOT_IMPLEMENTED"
-      );
-
-      RTEMS.REGION_EXTEND(
-         SPTEST.REGION_ID( 1 ),
-         SPTEST.REGION_GOOD_AREA( 
-            SPTEST.REGION_START_OFFSET + SPTEST.REGION_LENGTH + 16 )'ADDRESS,
-         128,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.NOT_IMPLEMENTED,
-         "REGION_EXTEND WITH NOT_IMPLEMENTED"
-      );
-      TEXT_IO.PUT_LINE(
-         "TA1 - region_extend - non-contiguous higher - NOT_IMPLEMENTED"
-      );
-
-   end SCREEN_12;
-
---PAGE
--- 
---  SCREEN_13
---
-
-   procedure SCREEN_13
-   is
-      RESULT : RTEMS.UNSIGNED32;
-      TIME   : RTEMS.TIME_OF_DAY;
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      RTEMS.IO_CLOSE(
-         RTEMS.DEVICE_MAJOR_NUMBER'LAST,
-         0,
-         RTEMS.NULL_ADDRESS,
-         RESULT,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_NUMBER,
-         "IO_CLOSE WITH BAD MAJOR NUMBER"
-      );
-      TEXT_IO.PUT_LINE("TA1 - io_close - INVALID_NUMBER");
-
-      RTEMS.IO_CONTROL(
-         RTEMS.DEVICE_MAJOR_NUMBER'LAST,
-         0,
-         RTEMS.NULL_ADDRESS,
-         RESULT,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_NUMBER,
-         "IO_CONTROL WITH BAD MAJOR NUMBER"
-      );
-      TEXT_IO.PUT_LINE(
-         "TA1 - io_control - INVALID_NUMBER"
-      );
-
-      RTEMS.IO_INITIALIZE(
-         RTEMS.DEVICE_MAJOR_NUMBER'LAST,
-         0,
-         RTEMS.NULL_ADDRESS,
-         RESULT,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_NUMBER,
-         "IO_INITIALIZE WITH BAD MAJOR NUMBER"
-      );
-      TEXT_IO.PUT_LINE(
-         "TA1 - io_initialize - INVALID_NUMBER"
-      );
-
-      RTEMS.IO_OPEN(
-         RTEMS.DEVICE_MAJOR_NUMBER'LAST,
-         0,
-         RTEMS.NULL_ADDRESS,
-         RESULT,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_NUMBER,
-         "IO_OPEN WITH BAD MAJOR NUMBER"
-      );
-      TEXT_IO.PUT_LINE( "TA1 - io_open - INVALID_NUMBER" );
-
-      RTEMS.IO_READ(
-         RTEMS.DEVICE_MAJOR_NUMBER'LAST,
-         0,
-         RTEMS.NULL_ADDRESS,
-         RESULT,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_NUMBER,
-         "IO_READ WITH BAD MAJOR NUMBER"
-      );
-      TEXT_IO.PUT_LINE( "TA1 - io_read - INVALID_NUMBER" );
-
-      RTEMS.IO_WRITE(
-         RTEMS.DEVICE_MAJOR_NUMBER'LAST,
-         0,
-         RTEMS.NULL_ADDRESS,
-         RESULT,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_NUMBER,
-         "IO_WRITE WITH BAD MAJOR NUMBER"
-      );
-      TEXT_IO.PUT_LINE( "TA1 - io_write - INVALID_NUMBER" );
-
-      TIME := ( 2000, 12, 31, 23, 59, 59, 0 );
-      RTEMS.CLOCK_SET( TIME, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_SET SUCCESSFUL" );
-      TEST_SUPPORT.PRINT_TIME(
-         "TA1 - clock_set - ",
-         TIME,
-         " - SUCCESSFUL"
-      );
-      TEXT_IO.NEW_LINE;
-      RTEMS.TASK_WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
-      RTEMS.CLOCK_GET( RTEMS.CLOCK_GET_TOD, TIME'ADDRESS, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET SUCCESSFUL" );
-      TEST_SUPPORT.PRINT_TIME(
-         "TA1 - clock_get - ",
-         TIME,
-         " - SUCCESSFUL"
-      );
-      TEXT_IO.NEW_LINE;
-
-      TIME := ( 1999, 12, 31, 23, 59, 59, 0 );
-      RTEMS.CLOCK_SET( TIME, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_SET SUCCESSFUL" );
-      TEST_SUPPORT.PRINT_TIME(
-         "TA1 - clock_set - ",
-         TIME,
-         " - SUCCESSFUL"
-      );
-      TEXT_IO.NEW_LINE;
-      RTEMS.TASK_WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
-      RTEMS.CLOCK_GET( RTEMS.CLOCK_GET_TOD, TIME'ADDRESS, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET SUCCESSFUL" );
-      TEST_SUPPORT.PRINT_TIME(
-         "TA1 - clock_get - ",
-         TIME,
-         " - SUCCESSFUL"
-      );
-      TEXT_IO.NEW_LINE;
-
-      TIME := ( 2100, 12, 31, 23, 59, 59, 0 );
-      RTEMS.CLOCK_SET( TIME, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_SET SUCCESSFUL" );
-      TEST_SUPPORT.PRINT_TIME(
-         "TA1 - clock_set - ",
-         TIME,
-         " - SUCCESSFUL"
-      );
-      TEXT_IO.NEW_LINE;
-      RTEMS.TASK_WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
-      RTEMS.CLOCK_GET( RTEMS.CLOCK_GET_TOD, TIME'ADDRESS, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET SUCCESSFUL" );
-      TEST_SUPPORT.PRINT_TIME(
-         "TA1 - clock_get - ",
-         TIME,
-         " - SUCCESSFUL"
-      );
-      TEXT_IO.NEW_LINE;
-
-      TIME := ( 2099, 12, 31, 23, 59, 59, 0 );
-      RTEMS.CLOCK_SET( TIME, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_SET SUCCESSFUL" );
-      TEST_SUPPORT.PRINT_TIME(
-         "TA1 - clock_set - ",
-         TIME,
-         " - SUCCESSFUL"
-      );
-      TEXT_IO.NEW_LINE;
-      RTEMS.TASK_WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
-      RTEMS.CLOCK_GET( RTEMS.CLOCK_GET_TOD, TIME'ADDRESS, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET SUCCESSFUL" );
-      TEST_SUPPORT.PRINT_TIME(
-         "TA1 - clock_get - ",
-         TIME,
-         " - SUCCESSFUL"
-      );
-      TEXT_IO.NEW_LINE;
-
-      TIME := ( 1991, 12, 31, 23, 59, 59, 0 );
-      RTEMS.CLOCK_SET( TIME, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_SET SUCCESSFUL" );
-      TEST_SUPPORT.PRINT_TIME(
-         "TA1 - clock_set - ",
-         TIME,
-         " - SUCCESSFUL"
-      );
-      TEXT_IO.NEW_LINE;
-      RTEMS.TASK_WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
-      RTEMS.CLOCK_GET( RTEMS.CLOCK_GET_TOD, TIME'ADDRESS, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET SUCCESSFUL" );
-      TEST_SUPPORT.PRINT_TIME(
-         "TA1 - clock_get - ",
-         TIME,
-         " - SUCCESSFUL"
-      );
-      TEXT_IO.NEW_LINE;
-
-   end SCREEN_13;
-
---PAGE
--- 
---  SCREEN_14
---
-
-   procedure SCREEN_14
-   is
-      TIME   : RTEMS.TIME_OF_DAY;
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      RTEMS.TIMER_CREATE( 0, SPTEST.JUNK_ID, STATUS );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_NAME,
-         "TIMER_CREATE WITH ILLEGAL NAME"
-      );
-      TEXT_IO.PUT_LINE( "TA1 - timer_create - INVALID_NAME" );
-
-      RTEMS.TIMER_CREATE(
-         SPTEST.TIMER_NAME( 1 ),
-         SPTEST.TIMER_ID( 1 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_CREATE" );
-      TEXT_IO.PUT_LINE( "TA1 - timer_create - 1 - SUCCESSFUL" );
-
-      RTEMS.TIMER_CREATE(
-         SPTEST.TIMER_NAME( 1 ),
-         SPTEST.JUNK_ID,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.TOO_MANY,
-         "TIMER_CREATE FOR TOO MANY"
-      );
-      TEXT_IO.PUT_LINE( "TA1 - timer_create - 2 - TOO_MANY" );
-
-      RTEMS.TIMER_DELETE( 100, STATUS );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_ID,
-         "TIMER_DELETE WITH ILLEGAL ID"
-      );
-      TEXT_IO.PUT_LINE( "TA1 - timer_delete - local INVALID_ID" );
-
-      RTEMS.TIMER_DELETE( 16#10100#, STATUS );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_ID,
-         "TIMER_DELETE WITH ILLEGAL ID"
-      );
-      TEXT_IO.PUT_LINE( "TA1 - timer_delete - global INVALID_ID" );
-
-      RTEMS.TIMER_IDENT( 0, SPTEST.JUNK_ID, STATUS );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_NAME,
-         "TIMER_IDENT WITH ILLEGAL NAME"
-      );
-      TEXT_IO.PUT_LINE( "TA1 - timer_ident - INVALID_NAME" );
-
-      RTEMS.TIMER_CANCEL( 16#10100#, STATUS );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_ID,
-         "TIMER_CANCEL WITH ILLEGAL ID"
-      );
-      TEXT_IO.PUT_LINE( "TA1 - timer_cancel - INVALID_ID" );
-
-      RTEMS.TIMER_RESET( 16#10100#, STATUS );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_ID,
-         "TIMER_RESET WITH ILLEGAL ID"
-      );
-      TEXT_IO.PUT_LINE( "TA1 - timer_reset - INVALID_ID" );
-
-      RTEMS.TIMER_RESET( SPTEST.TIMER_ID( 1 ), STATUS );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.NOT_DEFINED,
-         "TIMER_RESET BEFORE INITIATED"
-      );
-      TEXT_IO.PUT_LINE( "TA1 - timer_reset - NOT_DEFINED" );
-
-      RTEMS.TIMER_FIRE_AFTER(
-         16#10100#,
-         5 * TEST_SUPPORT.TICKS_PER_SECOND,
-         SPTEST.DELAYED_SUBPROGRAM'ACCESS,
-         RTEMS.NULL_ADDRESS,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_ID,
-         "TIMER_FIRE_AFTER WITH ILLEGAL ID"
-      );
-      TEXT_IO.PUT_LINE( "TA1 - timer_fire_after - INVALID_ID" );
-
-      TIME := ( 1994, 12, 31, 1, 0, 0, 0 );
-      RTEMS.TIMER_FIRE_WHEN(
-         16#10100#,
-         TIME,
-         SPTEST.DELAYED_SUBPROGRAM'ACCESS,
-         RTEMS.NULL_ADDRESS,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_ID,
-         "TIMER_FIRE_WHEN WITH ILLEGAL ID"
-      );
-      TEXT_IO.PUT_LINE( "TA1 - timer_fire_when - INVALID_ID" );
-
-      RTEMS.TIMER_FIRE_AFTER(
-         SPTEST.TIMER_ID( 1 ),
-         0,
-         SPTEST.DELAYED_SUBPROGRAM'ACCESS,
-         RTEMS.NULL_ADDRESS,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_NUMBER,
-         "TIMER_FIRE_AFTER WITH 0 TICKS"
-      );
-      TEXT_IO.PUT_LINE( "TA1 - timer_fire_after - INVALID_NUMBER" );
-
-      TIME := ( 1987, 2, 5, 8, 30, 45, 0 );
-      RTEMS.TIMER_FIRE_WHEN(
-         SPTEST.TIMER_ID( 1 ),
-         TIME,
-         SPTEST.DELAYED_SUBPROGRAM'ACCESS,
-         RTEMS.NULL_ADDRESS,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_CLOCK,
-         "TIMER_FIRE_WHEN WITH ILLEGAL TIME"
-      );
-      TEST_SUPPORT.PRINT_TIME(
-         "TA1 - timer_fire_when - ",
-         TIME,
-         " - INVALID_CLOCK"
-      );
-      TEXT_IO.NEW_LINE;
-
-      RTEMS.CLOCK_GET( RTEMS.CLOCK_GET_TOD, TIME'ADDRESS, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET SUCCESSFUL" );
-      TEST_SUPPORT.PRINT_TIME( "TA1 - clock_get       - ", TIME, "" );
-      TEXT_IO.NEW_LINE;
-
-      TIME := ( 1990, 2, 5, 8, 30, 45, 0 );
-      RTEMS.TIMER_FIRE_WHEN(
-         SPTEST.TIMER_ID( 1 ),
-         TIME,
-         SPTEST.DELAYED_SUBPROGRAM'ACCESS,
-         RTEMS.NULL_ADDRESS,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.INVALID_CLOCK,
-         "TIMER_FIRE_WHEN BEFORE CURRENT TIME"
-      );
-      TEST_SUPPORT.PRINT_TIME(
-         "TA1 - timer_fire_when - ",
-         TIME,
-         " - before INVALID_CLOCK"
-      );
-      TEXT_IO.NEW_LINE;
-
-   end SCREEN_14;
-
---PAGE
--- 
---  TASK_1
---
-
-   procedure TASK_1 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      SPTEST.SCREEN_1;
-      TEST_SUPPORT.PAUSE_AND_SCREEN_NUMBER( 2 );
-
-      SPTEST.SCREEN_2;
-      TEST_SUPPORT.PAUSE_AND_SCREEN_NUMBER( 3 );
-
-      SPTEST.SCREEN_3;
-      TEST_SUPPORT.PAUSE_AND_SCREEN_NUMBER( 4 );
-
-      SPTEST.SCREEN_4;
-      TEST_SUPPORT.PAUSE_AND_SCREEN_NUMBER( 5 );
-
-      SPTEST.SCREEN_5;
-      TEST_SUPPORT.PAUSE_AND_SCREEN_NUMBER( 6 );
-
-      SPTEST.SCREEN_6;
-      TEST_SUPPORT.PAUSE_AND_SCREEN_NUMBER( 7 );
-
-      SPTEST.SCREEN_7;
-      TEST_SUPPORT.PAUSE_AND_SCREEN_NUMBER( 8 );
-
-      SPTEST.SCREEN_8;
-      TEST_SUPPORT.PAUSE_AND_SCREEN_NUMBER( 9 );
-
-      SPTEST.SCREEN_9;
-      TEST_SUPPORT.PAUSE_AND_SCREEN_NUMBER( 10 );
-
-      SPTEST.SCREEN_10;
-      TEST_SUPPORT.PAUSE_AND_SCREEN_NUMBER( 11 );
-
-      SPTEST.SCREEN_11;
-      TEST_SUPPORT.PAUSE_AND_SCREEN_NUMBER( 12 );
-
-      SPTEST.SCREEN_12;
-      TEST_SUPPORT.PAUSE_AND_SCREEN_NUMBER( 13 );
-
-      SPTEST.SCREEN_13;
-      TEST_SUPPORT.PAUSE_AND_SCREEN_NUMBER( 14 );
-
-      SPTEST.SCREEN_14;
-
-      TEXT_IO.PUT_LINE( "*** END OF TEST 9 ***" );
-      RTEMS.SHUTDOWN_EXECUTIVE( 0 );
-
-   end TASK_1;
-
---PAGE
--- 
---  TASK_2
---
-
-   procedure TASK_2 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.PUT_LINE( "TA2 - semaphore_obtain - sem 1 - WAIT FOREVER" );
-      RTEMS.SEMAPHORE_OBTAIN(
-         SPTEST.SEMAPHORE_ID( 1 ),
-         RTEMS.DEFAULT_OPTIONS,
-         RTEMS.NO_TIMEOUT,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.OBJECT_WAS_DELETED,
-         "SEMAPHORE_OBTAIN WAITING TO BE DELETED"
-      );
-      TEXT_IO.PUT_LINE(
-         "TA2 - semaphore_obtain - woke up with OBJECT_WAS_DELETED"
-      );
-
-      TEXT_IO.PUT_LINE( 
-         "TA2 - task_delete - delete self - SUCCESSFUL" 
-      );
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF TA2" );
-
-   end TASK_2;
-
---PAGE
--- 
---  TASK_3
---
-
-   procedure TASK_3 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      BUFFER         : SPTEST.BUFFER;
-      BUFFER_POINTER : RTEMS.ADDRESS;
-      MESSAGE_SIZE   : RTEMS.UNSIGNED32;
-      STATUS         : RTEMS.STATUS_CODES;
-   begin
-
-      BUFFER_POINTER := BUFFER'ADDRESS;
-
-      TEXT_IO.PUT_LINE(
-         "TA3 - message_queue_receive - Q 1 - WAIT FOREVER"
-      );
-      RTEMS.MESSAGE_QUEUE_RECEIVE(
-         SPTEST.QUEUE_ID( 1 ),
-         BUFFER_POINTER,
-         RTEMS.DEFAULT_OPTIONS,
-         RTEMS.NO_TIMEOUT,
-         MESSAGE_SIZE,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.OBJECT_WAS_DELETED,
-         "MESSAGE_QUEUE_RECEIVE WAITING TO BE DELETED"
-      );
-      TEXT_IO.PUT( "TA3 - message_queue_receive - woke up " );
-      TEXT_IO.PUT_LINE( "with OBJECT_WAS_DELETED" );
-
-      TEXT_IO.PUT_LINE( 
-         "TA3 - task_delete - delete self - SUCCESSFUL" 
-      );
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF TA3" );
-
-   end TASK_3;
-
---PAGE
--- 
---  TASK_4
---
-
-   procedure TASK_4 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      RTEMS.RATE_MONOTONIC_CANCEL(
-         SPTEST.PERIOD_ID( 1 ),
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.NOT_OWNER_OF_RESOURCE,
-         "RATE_MONOTONIC_CANCEL NOT THE OWNER"
-      );
-      TEXT_IO.PUT_LINE(
-         "TA4 - rate_monotonic_cancel - NOT_OWNER_OF_RESOURCE"
-       );
-
-      RTEMS.RATE_MONOTONIC_PERIOD(
-         SPTEST.PERIOD_ID( 1 ),
-         5,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
-         STATUS,
-         RTEMS.NOT_OWNER_OF_RESOURCE,
-         "RATE_MONOTONIC_PERIOD NOT THE OWNER"
-      );
-      TEXT_IO.PUT_LINE(
-         "TA4 - rate_monotonic_period - NOT_OWNER_OF_RESOURCE"
-      );
-
-      TEXT_IO.PUT_LINE(
-         "TA4 - task_delete - delete self - SUCCESSFUL" 
-      );
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF TA4" );
-
-
-   end TASK_4;
-
-end SPTEST;
diff --git a/c/src/ada-tests/sptests/sp09/sptest.ads b/c/src/ada-tests/sptests/sp09/sptest.ads
deleted file mode 100644
index 526b30be67..0000000000
--- a/c/src/ada-tests/sptests/sp09/sptest.ads
+++ /dev/null
@@ -1,402 +0,0 @@
---
---  SPTEST / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package is the specification for Test 9 of the RTEMS
---  Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-with SYSTEM;
-with System.Storage_Elements;
-
-package SPTEST is
-
---
---  Buffer Record similar to that used by RTEMS 3.2.1.  Using this
---  avoids changes to the test.
---
-
-   type BUFFER is
-      record
-         FIELD1 : RTEMS.UNSIGNED32;   -- TEMPORARY UNTIL VARIABLE LENGTH
-         FIELD2 : RTEMS.UNSIGNED32;
-         FIELD3 : RTEMS.UNSIGNED32;
-         FIELD4 : RTEMS.UNSIGNED32;
-      end record;
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS tasks created
---  by this test.
---
-
-   TASK_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 11 ) of RTEMS.ID;
-   TASK_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 11 ) of RTEMS.NAME;
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS timers created
---  by this test.
---
-
-   TIMER_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 1 ) of RTEMS.ID;
-   TIMER_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 1 ) of RTEMS.NAME;
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS semaphores created
---  by this test.
---
-
-   SEMAPHORE_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.ID;
-   SEMAPHORE_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.NAME;
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS message queues 
---  created by this test.
---
-
-   QUEUE_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 2 ) of RTEMS.ID;
-   QUEUE_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 2 ) of RTEMS.NAME;
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS partitions created
---  by this test.
---
-
-   PARTITION_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 1 ) of RTEMS.ID;
-   PARTITION_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 1 ) of RTEMS.NAME;
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS regions created
---  by this test.
---
-
-   REGION_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 1 ) of RTEMS.ID;
-   REGION_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 1 ) of RTEMS.NAME;
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS ports created
---  by this test.
---
-
-   PORT_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 1 ) of RTEMS.ID;
-   PORT_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 1 ) of RTEMS.NAME;
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS periods created
---  by this test.
---
-
-   PERIOD_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 1 ) of RTEMS.ID;
-   PERIOD_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 1 ) of RTEMS.NAME;
-
---
---  This variable is used as the output ID on directives which return
---  an ID but are invoked in a manner which returns a non-SUCCESSFUL
---  status code.
---
-
-   JUNK_ID : RTEMS.ID;
-
---
---  The following area defines a memory area to be used as the
---  internal address space of the port.
--- 
-
-   INTERNAL_PORT_AREA_ADDRESS : constant System.Address :=
-       System.Storage_Elements.To_Address(16#00001000#);
-
-   INTERNAL_PORT_AREA : array ( RTEMS.UNSIGNED32 range 0 .. 255 )
-      of RTEMS.UNSIGNED8;
-   for INTERNAL_PORT_AREA use at INTERNAL_PORT_AREA_ADDRESS;
-
---
---  The following area defines a memory area to be used as the
---  external address space of the port.
--- 
-
-   EXTERNAL_PORT_AREA_ADDRESS : constant System.Address :=
-       System.Storage_Elements.To_Address(16#00002000#);
-
-   EXTERNAL_PORT_AREA : array ( RTEMS.UNSIGNED32 range 0 .. 255 )
-      of RTEMS.UNSIGNED8;
-   for EXTERNAL_PORT_AREA use at EXTERNAL_PORT_AREA_ADDRESS;
-
---
---  The following area defines a memory area to be used as the
---  memory space for a partition.
--- 
-
-   PARTITION_GOOD_AREA : array ( RTEMS.UNSIGNED32 range 0 .. 255 )
-      of RTEMS.UNSIGNED8;
-   for PARTITION_GOOD_AREA'ALIGNMENT use RTEMS.STRUCTURE_ALIGNMENT;
-
---
---  The following area defines a memory area to be used as the
---  memory space for a partition which starts at an invalid address.
--- 
-
-   PARTITION_BAD_AREA_ADDRESS : constant System.Address :=
-       System.Storage_Elements.To_Address(16#00000006#);
-
-   PARTITION_BAD_AREA : array ( RTEMS.UNSIGNED32 range 0 .. 255 )
-      of RTEMS.UNSIGNED8;
-   for PARTITION_BAD_AREA use at PARTITION_BAD_AREA_ADDRESS;
-
---
---  The following area defines a memory area to be used as the
---  memory space for a region and constants used to define the regions
---  starting area and length.
--- 
-
-   REGION_GOOD_AREA : array ( RTEMS.UNSIGNED32 range 0 .. 4095 )
-      of RTEMS.UNSIGNED32;
-   for REGION_GOOD_AREA'ALIGNMENT use RTEMS.STRUCTURE_ALIGNMENT;
-
-   REGION_START_OFFSET : constant RTEMS.UNSIGNED32 := 1024;
-   REGION_LENGTH       : constant RTEMS.UNSIGNED32 := 512;
-
---
---  The following area defines a memory area to be used as the
---  memory space for a region which starts at an invalid address.
--- 
-
-   REGION_BAD_AREA_ADDRESS : constant System.Address :=
-       System.Storage_Elements.To_Address(16#00000006#);
-
-   REGION_BAD_AREA : array ( RTEMS.UNSIGNED32 range 0 .. 255 )
-      of RTEMS.UNSIGNED8;
-   for REGION_BAD_AREA use at REGION_BAD_AREA_ADDRESS;
-
---
---  INIT
---
---  DESCRIPTION:
---
---  This RTEMS task initializes the application.
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  DELAYED_SUBPROGRAM
---
---  DESCRIPTION:
---
---  This subprogram is scheduled as a timer service routine.
---  It performs no actions if it fires.
---
-
-   procedure DELAYED_SUBPROGRAM (
-      IGNORED_ID      : in     RTEMS.ID;  
-      IGNORED_ADDRESS : in     RTEMS.ADDRESS 
-   );
-
---
---  TASK_1
---
---  DESCRIPTION:
---
---  This RTEMS task tests numerous error conditions.
---
-
-   procedure TASK_1 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TASK_2
---
---  DESCRIPTION:
---
---  This RTEMS task tests numerous error conditions.
---
-
-   procedure TASK_2 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TASK_3
---
---  DESCRIPTION:
---
---  This RTEMS task tests numerous error conditions.
---
-
-   procedure TASK_3 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TASK_4
---
---  DESCRIPTION:
---
---  This RTEMS task tests numerous error conditions.
---
-
-   procedure TASK_4 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  SERVICE_ROUTINE
---
---  DESCRIPTION:
---
---  This subprogram serves as a dummy ISR which is installed at an
---  illegal vector number.
---
-
-   procedure SERVICE_ROUTINE (
-      IGNORED : in     RTEMS.VECTOR_NUMBER
-   );
-
---
---  SCREEN_1
---
---  DESCRIPTION:
---
---  This subprogram processes the a single output screen of this test.
---
-
-   procedure SCREEN_1;
-
---
---  SCREEN_2
---
---  DESCRIPTION:
---
---  This subprogram processes the a single output screen of this test.
---
-
-   procedure SCREEN_2;
-
---
---  SCREEN_3
---
---  DESCRIPTION:
---
---  This subprogram processes the a single output screen of this test.
---
-
-   procedure SCREEN_3;
-
---
---  SCREEN_4
---
---  DESCRIPTION:
---
---  This subprogram processes the a single output screen of this test.
---
-
-   procedure SCREEN_4;
-
---
---  SCREEN_5
---
---  DESCRIPTION:
---
---  This subprogram processes the a single output screen of this test.
---
-
-   procedure SCREEN_5;
-
---
---  SCREEN_6
---
---  DESCRIPTION:
---
---  This subprogram processes the a single output screen of this test.
---
-
-   procedure SCREEN_6;
-
---
---  SCREEN_7
---
---  DESCRIPTION:
---
---  This subprogram processes the a single output screen of this test.
---
-
-   procedure SCREEN_7;
-
---
---  SCREEN_8
---
---  DESCRIPTION:
---
---  This subprogram processes the a single output screen of this test.
---
-
-   procedure SCREEN_8;
-
---
---  SCREEN_9
---
---  DESCRIPTION:
---
---  This subprogram processes the a single output screen of this test.
---
-
-   procedure SCREEN_9;
-
---
---  SCREEN_10
---
---  DESCRIPTION:
---
---  This subprogram processes the a single output screen of this test.
---
-
-   procedure SCREEN_10;
-
---
---  SCREEN_11
---
---  DESCRIPTION:
---
---  This subprogram processes the a single output screen of this test.
---
-
-   procedure SCREEN_11;
-
---
---  SCREEN_12
---
---  DESCRIPTION:
---
---  This subprogram processes the a single output screen of this test.
---
-
-   procedure SCREEN_12;
-
---
---  SCREEN_13
---
---  DESCRIPTION:
---
---  This subprogram processes the a single output screen of this test.
---
-
-   procedure SCREEN_13;
-
-end SPTEST;
diff --git a/c/src/ada-tests/sptests/sp11/config.h b/c/src/ada-tests/sptests/sp11/config.h
deleted file mode 100644
index 89529d5b9f..0000000000
--- a/c/src/ada-tests/sptests/sp11/config.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*  config.h
- *
- *  This include file defines the Configuration Table for this test.
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-/* configuration information */
-
-#define CONFIGURE_SPTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_MAXIMUM_TIMERS              6
-#define CONFIGURE_TICKS_PER_TIMESLICE       100
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#define CONFIGURE_MAXIMUM_POSIX_THREADS              10
-#define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
-#define CONFIGURE_MAXIMUM_POSIX_MUTEXES              20
-#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES  10
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/c/src/ada-tests/sptests/sp11/sp11.adb b/c/src/ada-tests/sptests/sp11/sp11.adb
deleted file mode 100644
index 1720830ded..0000000000
--- a/c/src/ada-tests/sptests/sp11/sp11.adb
+++ /dev/null
@@ -1,57 +0,0 @@
---
---  MAIN / BODY
---
---  DESCRIPTION:
---
---  This is the entry point for Test SP11 of the Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-with SPTEST;
-with TEST_SUPPORT;
-
-procedure SP11 is
-  INIT_ID : RTEMS.ID;
-  STATUS  : RTEMS.STATUS_CODES;
-begin
-
-   RTEMS.TASK_CREATE(
-      RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
-      1,
-      RTEMS.MINIMUM_STACK_SIZE,
-      RTEMS.NO_PREEMPT,
-      RTEMS.DEFAULT_ATTRIBUTES,
-      INIT_ID,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
-
-
-   RTEMS.TASK_START(
-      INIT_ID,
-      SPTEST.INIT'ACCESS,
-      0,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
-
-   loop
-      delay 120.0;
-   end loop;
-
-end SP11;
-
diff --git a/c/src/ada-tests/sptests/sp11/sp11.scn b/c/src/ada-tests/sptests/sp11/sp11.scn
deleted file mode 100644
index a23db839bc..0000000000
--- a/c/src/ada-tests/sptests/sp11/sp11.scn
+++ /dev/null
@@ -1,74 +0,0 @@
-*** TEST 11 ***
-TA1 - event_send - send EVENT_16 to TA2
-TA1 - event_receive - waiting forever on EVENT_14 and EVENT_15
-TA2 - event_receive - waiting forever on EVENT_16
-TA2 - EVENT_16 received - eventout => 16#10000#
-TA2 - event_send - send EVENT_14 and EVENT_15 to TA1
-TA2 - event_receive - waiting forever on EVENT_17 or EVENT_18 - EVENT_ANY
-TA1 - EVENT_14 and EVENT_15 received - eventout => 16#C000#
-TA1 - event_send - send EVENT_18 to TA2
-TA1 - event_receive - waiting with 10 second timeout on EVENT_14
-TA2 - EVENT_17 or EVENT_18 received - eventout => 16#40000#
-TA2 - event_send - send EVENT_14 to TA1
-TA2 - clock_set -  8:15: 0    2/12/1988
-TA2 - event_send - sending EVENT_10 to self after 5 seconds
-TA2 - event_receive - waiting forever on EVENT_10
-TA1 - EVENT_14 received - eventout => 16#4000#
-TA1 - event_send - send EVENT_19 to TA2
-TA1 - clock_get -  8:15: 0    2/12/1988
-<pause>
-TA1 - event_send - send EVENT_18 to self after 5 seconds
-TA1 - event_receive - waiting forever on EVENT_18
-TA2 - EVENT_10 received - eventout => 16#400#
-TA2 - clock_get -  8:15: 5   02/12/1988
-TA2 - event_receive - PENDING_EVENTS
-TA2 - eventout => 16#80000#
-TA2 - event_receive - EVENT_19 - NO_WAIT
-TA2 - EVENT_19 received - eventout => 16#80000#
-TA2 - task_delete - deletes self
-TA1 - EVENT_18 received - eventout => 16#40000#
-TA1 - clock_get -  8:15: 5    2/12/1988
-TA1 - event_send - send EVENT_3 to self
-TA1 - event_receive - EVENT_3 or EVENT_22 - NO_WAIT and EVENT_ANY
-TA1 - EVENT_3 received - eventout => 16#8#
-TA1 - event_send - send EVENT_4 to self
-TA1 - event_receive - waiting forever on EVENT_4 or EVENT_5 - EVENT_ANY
-TA1 - EVENT_4 received - eventout => 16#10#
-<pause>
-TA1 - event_send - send EVENT_18 to self after 5 seconds
-TA1 - timer_cancel - cancelling timer for event EVENT_18
-TA1 - event_send - send EVENT_8 to self after 60 seconds
-TA1 - event_send - send EVENT_9 to self after 60 seconds
-TA1 - event_send - send EVENT_10 to self after 60 seconds
-TA1 - timer_cancel - cancelling timer for event EVENT_8
-TA1 - clock_set -  8:15: 0    2/12/1988
-TA1 - event_send - send EVENT_1 every second
-TA1 - EVENT_1 received - eventout => 16#2# - at  8:15: 1    2/12/1988
-TA1 - EVENT_1 received - eventout => 16#2# - at  8:15: 2    2/12/1988
-TA1 - EVENT_1 received - eventout => 16#2# - at  8:15: 3    2/12/1988
-TA1 - timer_cancel - cancelling timer for event EVENT_1
-<pause>
-TA1 - event_send - send EVENT_11 to self in 1 day
-TA1 - event_send - send EVENT_11 to self in 1 day
-TA1 - event_send - send EVENT_11 to self in 2 days
-TA1 - timer_cancel - cancelling EVENT_11 to self in 1 day
-TA1 - timer_cancel - cancelling EVENT_11 to self in 2 days
-TA1 - event_send - resending EVENT_11 to self in 2 days
-TA1 - clock_set -  8:15: 3    2/15/1988
-TA1 - event_receive - waiting forever on EVENT_11
-TA1 - EVENT_11 received - eventout => 16#800#
-<pause>
-TA1 - event_send/event_receive combination
-TA1 - clock_set -  8:15: 0    2/12/1988
-TA1 - event_receive all outstanding events
-TA1 - event_send - send EVENT_10 to self in 1 day
-TA1 - event_send - send EVENT_11 to self in 2 days
-TA1 - clock_set -  7:15: 0  2/12/1988
-TA1 - set time backwards
-TA1 - no events received
-TA1 - clock_set -  7:15: 0  2/14/1988
-TA1 - set time forwards (leave a timer)
-TA1 - EVENT_10 received
-TA1 - event_send - send EVENT_11 to self in 100 ticks
-TA1 - event_send - send EVENT_11 to self in 200 ticks
-*** END OF TEST 11 ***
diff --git a/c/src/ada-tests/sptests/sp11/sptest.adb b/c/src/ada-tests/sptests/sp11/sptest.adb
deleted file mode 100644
index 8ec174abe2..0000000000
--- a/c/src/ada-tests/sptests/sp11/sptest.adb
+++ /dev/null
@@ -1,900 +0,0 @@
---
---  SPTEST / BODY
---
---  DESCRIPTION:
---
---  This package is the implementation of Test 11 of the RTEMS
---  Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with INTERFACES; use INTERFACES;
-with RTEMS;
-with TEST_SUPPORT;
-with TEXT_IO;
-with UNSIGNED32_IO;
-
-package body SPTEST is
-
---PAGE
--- 
---  INIT
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** TEST 11 ***" );
-
-      SPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME(  'T', 'A', '1', ' ' );
-      SPTEST.TASK_NAME( 2 ) := RTEMS.BUILD_NAME(  'T', 'A', '2', ' ' );
-
-      RTEMS.TASK_CREATE( 
-         SPTEST.TASK_NAME( 1 ), 
-         4, 
-         2048, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.TASK_ID( 1 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA1" );
-
-      RTEMS.TASK_CREATE( 
-         SPTEST.TASK_NAME( 2 ), 
-         4, 
-         2048, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.TASK_ID( 2 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA2" );
-
-      RTEMS.TASK_START(
-         SPTEST.TASK_ID( 1 ),
-         SPTEST.TASK_1'ACCESS,
-         0,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA1" );
-
-      RTEMS.TASK_START(
-         SPTEST.TASK_ID( 2 ),
-         SPTEST.TASK_2'ACCESS,
-         0,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA2" );
-
-      SPTEST.TIMER_NAME( 1 ) := RTEMS.BUILD_NAME(  'T', 'M', '1', ' ' );
-      SPTEST.TIMER_NAME( 2 ) := RTEMS.BUILD_NAME(  'T', 'M', '2', ' ' );
-      SPTEST.TIMER_NAME( 3 ) := RTEMS.BUILD_NAME(  'T', 'M', '3', ' ' );
-      SPTEST.TIMER_NAME( 4 ) := RTEMS.BUILD_NAME(  'T', 'M', '4', ' ' );
-      SPTEST.TIMER_NAME( 5 ) := RTEMS.BUILD_NAME(  'T', 'M', '5', ' ' );
-      SPTEST.TIMER_NAME( 6 ) := RTEMS.BUILD_NAME(  'T', 'M', '6', ' ' );
-
-      RTEMS.TIMER_CREATE( 
-         SPTEST.TIMER_NAME( 1 ),
-         SPTEST.TIMER_ID( 1 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_CREATE OF TM1" );
-
-      RTEMS.TIMER_CREATE( 
-         SPTEST.TIMER_NAME( 2 ),
-         SPTEST.TIMER_ID( 2 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_CREATE OF TM2" );
-
-      RTEMS.TIMER_CREATE( 
-         SPTEST.TIMER_NAME( 3 ),
-         SPTEST.TIMER_ID( 3 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_CREATE OF TM3" );
-
-      RTEMS.TIMER_CREATE( 
-         SPTEST.TIMER_NAME( 4 ),
-         SPTEST.TIMER_ID( 4 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_CREATE OF TM4" );
-
-      RTEMS.TIMER_CREATE( 
-         SPTEST.TIMER_NAME( 5 ),
-         SPTEST.TIMER_ID( 5 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_CREATE OF TM5" );
-
-      RTEMS.TIMER_CREATE( 
-         SPTEST.TIMER_NAME( 6 ),
-         SPTEST.TIMER_ID( 6 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_CREATE OF TM6" );
-
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
-
-   end INIT;
-
---PAGE
--- 
---  TASK_1
---
-
-   procedure TASK_1 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      EVENTOUT : RTEMS.EVENT_SET;
-      TIME     : RTEMS.TIME_OF_DAY;
-      STATUS   : RTEMS.STATUS_CODES;
-      INDEX    : RTEMS.UNSIGNED32;
-   begin
-
-      TEXT_IO.PUT_LINE( "TA1 - event_send - send EVENT_16 to TA2" );
-      RTEMS.EVENT_SEND( SPTEST.TASK_ID( 2 ), RTEMS.EVENT_16, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "EVENT_SEND of 16" );
-
-      TEXT_IO.PUT_LINE( 
-         "TA1 - event_receive - waiting forever on EVENT_14 and EVENT_15"
-      );
-      RTEMS.EVENT_RECEIVE( 
-         RTEMS.EVENT_14 + RTEMS.EVENT_15,
-         RTEMS.DEFAULT_OPTIONS,
-         RTEMS.NO_TIMEOUT,
-         EVENTOUT,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "EVENT_RECEIVE of 14 and 15" );
-      TEXT_IO.PUT( "TA1 - EVENT_14 and EVENT_15 received - eventout => ");
-      UNSIGNED32_IO.PUT( EVENTOUT, BASE => 16, WIDTH => 8 );
-      TEXT_IO.NEW_LINE;
-
-      TEXT_IO.PUT_LINE( "TA1 - event_send - send EVENT_18 to TA2" );
-      RTEMS.EVENT_SEND( SPTEST.TASK_ID( 2 ), RTEMS.EVENT_18, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "EVENT_SEND of 18" );
-
-      TEXT_IO.PUT_LINE( 
-         "TA1 - event_receive - waiting with 10 second timeout on EVENT_14"
-      );
-      RTEMS.EVENT_RECEIVE( 
-         RTEMS.EVENT_14,
-         RTEMS.DEFAULT_OPTIONS,
-         10 * TEST_SUPPORT.TICKS_PER_SECOND,
-         EVENTOUT,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "EVENT_RECEIVE of 14" );
-      TEXT_IO.PUT( "TA1 - EVENT_14 received - eventout => ");
-      UNSIGNED32_IO.PUT( EVENTOUT, BASE => 16, WIDTH => 8 );
-      TEXT_IO.NEW_LINE;
-
-      TEXT_IO.PUT_LINE( "TA1 - event_send - send EVENT_19 to TA2" );
-      RTEMS.EVENT_SEND( SPTEST.TASK_ID( 2 ), RTEMS.EVENT_19, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "EVENT_SEND of 19" );
-
-      RTEMS.CLOCK_GET( RTEMS.CLOCK_GET_TOD, TIME'ADDRESS, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TA1 CLOCK_GET" );
-      TEST_SUPPORT.PRINT_TIME( "TA1 - clock_get - ", TIME, "" );
-      TEXT_IO.NEW_LINE;
-
-      TEST_SUPPORT.PAUSE;
-
-      TEXT_IO.PUT_LINE( 
-         "TA1 - event_send - send EVENT_18 to self after 5 seconds"
-      );
-      RTEMS.TIMER_FIRE_AFTER( 
-         SPTEST.TIMER_ID( 1 ),
-         5 * TEST_SUPPORT.TICKS_PER_SECOND,
-         SPTEST.TA1_SEND_18_TO_SELF_5_SECONDS'ACCESS,
-         RTEMS.NULL_ADDRESS,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_FIRE_AFTER 5 seconds" );
-
-      TEXT_IO.PUT_LINE( 
-         "TA1 - event_receive - waiting forever on EVENT_18"
-      );
-      RTEMS.EVENT_RECEIVE( 
-         RTEMS.EVENT_18,
-         RTEMS.DEFAULT_OPTIONS,
-         RTEMS.NO_TIMEOUT,
-         EVENTOUT,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "EVENT_RECEIVE of 18" );
-
-      RTEMS.CLOCK_GET( RTEMS.CLOCK_GET_TOD, TIME'ADDRESS, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TA1 CLOCK_GET" );
-
-      TEXT_IO.PUT( "TA1 - EVENT_18 received - eventout => ");
-      UNSIGNED32_IO.PUT( EVENTOUT, BASE => 16, WIDTH => 8 );
-      TEXT_IO.NEW_LINE;
-
-      TEST_SUPPORT.PRINT_TIME( "TA1 - clock_get - ", TIME, "" );
-      TEXT_IO.NEW_LINE;
-
-      TEXT_IO.PUT_LINE( "TA1 - event_send - send EVENT_3 to self" );
-      RTEMS.EVENT_SEND( RTEMS.SELF, RTEMS.EVENT_3, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "EVENT_SEND of 3" );
-
-      TEXT_IO.PUT_LINE( 
-         "TA1 - event_receive - EVENT_3 or EVENT_22 - NO_WAIT and EVENT_ANY"
-      );
-      RTEMS.EVENT_RECEIVE( 
-         RTEMS.EVENT_3 + RTEMS.EVENT_22,
-         RTEMS.NO_WAIT + RTEMS.EVENT_ANY,
-         RTEMS.NO_TIMEOUT,
-         EVENTOUT,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "EVENT_RECEIVE of 3 and 22" );
-      TEXT_IO.PUT( "TA1 - EVENT_3 received - eventout => ");
-      UNSIGNED32_IO.PUT( EVENTOUT, BASE => 16, WIDTH => 8 );
-      TEXT_IO.NEW_LINE;
-
-      TEXT_IO.PUT_LINE( "TA1 - event_send - send EVENT_4 to self" );
-      RTEMS.EVENT_SEND( RTEMS.SELF, RTEMS.EVENT_4, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "EVENT_SEND of 4" );
-
-      TEXT_IO.PUT_LINE( 
-"TA1 - event_receive - waiting forever on EVENT_4 or EVENT_5 - EVENT_ANY"
-      );
-      RTEMS.EVENT_RECEIVE( 
-         RTEMS.EVENT_4 + RTEMS.EVENT_5,
-         RTEMS.EVENT_ANY,
-         RTEMS.NO_TIMEOUT,
-         EVENTOUT,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "EVENT_RECEIVE of 4 and 5" );
-      TEXT_IO.PUT( "TA1 - EVENT_4 received - eventout => ");
-      UNSIGNED32_IO.PUT( EVENTOUT, BASE => 16, WIDTH => 8 );
-      TEXT_IO.NEW_LINE;
-
-      TEST_SUPPORT.PAUSE;
-
-      TEXT_IO.PUT_LINE( 
-         "TA1 - event_send - send EVENT_18 to self after 5 seconds"
-      );
-      RTEMS.TIMER_FIRE_AFTER( 
-         SPTEST.TIMER_ID( 1 ),
-         5 * TEST_SUPPORT.TICKS_PER_SECOND,
-         SPTEST.TA1_SEND_18_TO_SELF_5_SECONDS'ACCESS,
-         RTEMS.NULL_ADDRESS,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_FIRE_AFTER 5 seconds" );
-
-      TEXT_IO.PUT_LINE( 
-         "TA1 - timer_cancel - cancelling timer for event EVENT_18"
-      );
-      RTEMS.TIMER_CANCEL( SPTEST.TIMER_ID( 1 ), STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_CANCEL" );
-
-      TEXT_IO.PUT_LINE( 
-         "TA1 - event_send - send EVENT_8 to self after 60 seconds"
-      );
-      RTEMS.TIMER_FIRE_AFTER( 
-         SPTEST.TIMER_ID( 1 ),
-         60 * TEST_SUPPORT.TICKS_PER_SECOND,
-         SPTEST.TA1_SEND_8_TO_SELF_60_SECONDS'ACCESS,
-         RTEMS.NULL_ADDRESS,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_FIRE_AFTER 60 secs" );
-
-      TEXT_IO.PUT_LINE( 
-         "TA1 - event_send - send EVENT_9 to self after 60 seconds"
-      );
-      RTEMS.TIMER_FIRE_AFTER( 
-         SPTEST.TIMER_ID( 2 ),
-         60 * TEST_SUPPORT.TICKS_PER_SECOND,
-         SPTEST.TA1_SEND_9_TO_SELF_60_SECONDS'ACCESS,
-         RTEMS.NULL_ADDRESS,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_FIRE_AFTER 60 secs" );
-
-      TEXT_IO.PUT_LINE( 
-         "TA1 - event_send - send EVENT_10 to self after 60 seconds"
-      );
-      RTEMS.TIMER_FIRE_AFTER( 
-         SPTEST.TIMER_ID( 3 ),
-         60 * TEST_SUPPORT.TICKS_PER_SECOND,
-         SPTEST.TA1_SEND_10_TO_SELF'ACCESS,
-         RTEMS.NULL_ADDRESS,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_FIRE_AFTER 60 secs" );
-
-      TEXT_IO.PUT_LINE( 
-         "TA1 - timer_cancel - cancelling timer for event EVENT_8"
-      );
-      RTEMS.TIMER_CANCEL( SPTEST.TIMER_ID( 1 ), STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_CANCEL" );
-
-      TIME := ( 1988, 2, 12, 8, 15, 0, 0 );
-
-      TEST_SUPPORT.PRINT_TIME( "TA1 - clock_set - ", TIME, "" );
-      TEXT_IO.NEW_LINE;
-      RTEMS.CLOCK_SET( TIME, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TA1 CLOCK_SET" );
-
-      TEXT_IO.PUT_LINE( 
-         "TA1 - event_send - send EVENT_1 every second"
-      );
-      RTEMS.TIMER_FIRE_AFTER( 
-         SPTEST.TIMER_ID( 1 ),
-         TEST_SUPPORT.TICKS_PER_SECOND,
-         SPTEST.TA1_SEND_1_TO_SELF_EVERY_SECOND'ACCESS,
-         RTEMS.NULL_ADDRESS,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_FIRE_AFTER 1 SECOND" );
-
-      INDEX := 0;
-
-      loop
-
-         exit when INDEX = 3;
-
-         RTEMS.EVENT_RECEIVE( 
-            RTEMS.EVENT_1,
-            RTEMS.EVENT_ANY,
-            RTEMS.NO_TIMEOUT,
-            EVENTOUT,
-            STATUS
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "EVENT_RECEIVE of 1" );
-
-         RTEMS.CLOCK_GET( RTEMS.CLOCK_GET_TOD, TIME'ADDRESS, STATUS );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TA1 CLOCK_GET" );
-
-         TEXT_IO.PUT( "TA1 - EVENT_1 received - eventout => ");
-         UNSIGNED32_IO.PUT( EVENTOUT, BASE => 16, WIDTH => 8 );
-         TEST_SUPPORT.PRINT_TIME( " - at ", TIME, "" );
-         TEXT_IO.NEW_LINE;
-
-         if INDEX < 2 then
-            RTEMS.TIMER_RESET( SPTEST.TIMER_ID( 1 ), STATUS );
-            TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TA1 TIMER RESET" );
-         end if;
-
-         INDEX := INDEX + 1;
-      end loop;
-
-      TEXT_IO.PUT_LINE( 
-         "TA1 - timer_cancel - cancelling timer for event EVENT_1"
-      );
-      RTEMS.TIMER_CANCEL( SPTEST.TIMER_ID( 1 ), STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_CANCEL" );
-
-      TEST_SUPPORT.PAUSE;
-
-      TIME.DAY := 13;
-      TEXT_IO.PUT_LINE( 
-         "TA1 - event_send - send EVENT_11 to self in 1 day"
-      );
-      RTEMS.TIMER_FIRE_WHEN( 
-         SPTEST.TIMER_ID( 1 ),
-         TIME,
-         SPTEST.TA1_SEND_11_TO_SELF'ACCESS,
-         RTEMS.NULL_ADDRESS,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_FIRE_WHEN 1 day" );
-
-      TIME.HOUR := 7;
-      TEXT_IO.PUT_LINE( 
-         "TA1 - event_send - send EVENT_11 to self in 1 day"
-      );
-      RTEMS.TIMER_FIRE_WHEN( 
-         SPTEST.TIMER_ID( 2 ),
-         TIME,
-         SPTEST.TA1_SEND_11_TO_SELF'ACCESS,
-         RTEMS.NULL_ADDRESS,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_FIRE_WHEN 1 day" );
-      TIME.HOUR := 8;
-
-      TIME.DAY := 14;
-      TEXT_IO.PUT_LINE( 
-         "TA1 - event_send - send EVENT_11 to self in 2 days"
-      );
-      RTEMS.TIMER_FIRE_WHEN( 
-         SPTEST.TIMER_ID( 3 ),
-         TIME,
-         SPTEST.TA1_SEND_11_TO_SELF'ACCESS,
-         RTEMS.NULL_ADDRESS,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_FIRE_WHEN 2 days" );
-
-      TEXT_IO.PUT_LINE( 
-         "TA1 - timer_cancel - cancelling EVENT_11 to self in 1 day"
-      );
-      RTEMS.TIMER_CANCEL( SPTEST.TIMER_ID( 1 ), STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_CANCEL" );
-
-      TEXT_IO.PUT_LINE( 
-         "TA1 - timer_cancel - cancelling EVENT_11 to self in 2 days"
-      );
-      RTEMS.TIMER_CANCEL( SPTEST.TIMER_ID( 3 ), STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_CANCEL" );
-
-      TEXT_IO.PUT_LINE( 
-         "TA1 - event_send - resending EVENT_11 to self in 2 days"
-      );
-      RTEMS.TIMER_FIRE_WHEN( 
-         SPTEST.TIMER_ID( 3 ),
-         TIME,
-         SPTEST.TA1_SEND_11_TO_SELF'ACCESS,
-         RTEMS.NULL_ADDRESS,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_FIRE_WHEN 2 days" );
-
-      TIME.DAY := 15;
-      TEST_SUPPORT.PRINT_TIME( "TA1 - clock_set - ", TIME, "" );
-      TEXT_IO.NEW_LINE;
-      RTEMS.CLOCK_SET( TIME, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TA1 CLOCK_SET" );
-      TEXT_IO.PUT_LINE( 
-         "TA1 - event_receive - waiting forever on EVENT_11"
-      );
-      RTEMS.EVENT_RECEIVE( 
-         RTEMS.EVENT_11,
-         RTEMS.DEFAULT_OPTIONS,
-         RTEMS.NO_TIMEOUT,
-         EVENTOUT,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "EVENT_RECEIVE of 11" );
-      TEXT_IO.PUT( "TA1 - EVENT_11 received - eventout => ");
-      UNSIGNED32_IO.PUT( EVENTOUT, BASE => 16, WIDTH => 8 );
-      TEXT_IO.NEW_LINE;
-
-      TEST_SUPPORT.PAUSE;
-
--- The following code tests the case of deleting a timer ???
-
-      TEXT_IO.PUT_LINE( "TA1 - event_send/event_receive combination" );
-      RTEMS.TIMER_FIRE_AFTER( 
-         SPTEST.TIMER_ID( 1 ),
-         10,
-         SPTEST.TA1_SEND_11_TO_SELF'ACCESS,
-         RTEMS.NULL_ADDRESS,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_FIRE_AFTER 10 ticks" );
-      RTEMS.EVENT_RECEIVE( 
-         RTEMS.EVENT_11,
-         RTEMS.DEFAULT_OPTIONS,
-         11,
-         EVENTOUT,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "EVENT_RECEIVE" );
-
-      TIME := ( 1988, 2, 12, 8, 15, 0, 0 );
-
-      TEST_SUPPORT.PRINT_TIME( "TA1 - clock_set - ", TIME, "" );
-      TEXT_IO.NEW_LINE;
-      RTEMS.CLOCK_SET( TIME, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TA1 CLOCK_SET" );
-
-      TIME.DAY := 13;
-      TEXT_IO.PUT_LINE( 
-         "TA1 - event_receive all outstanding events"
-      );
-      RTEMS.EVENT_RECEIVE(
-         RTEMS.ALL_EVENTS,
-         RTEMS.NO_WAIT + RTEMS.EVENT_ANY,
-         RTEMS.NO_TIMEOUT,
-         EVENTOUT,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( 
-         STATUS, 
-         RTEMS.UNSATISFIED, 
-         "EVENT_RECEIVE all events" 
-      );
-
-      TEXT_IO.PUT_LINE( 
-         "TA1 - event_send - send EVENT_10 to self in 1 day"
-      );
-      RTEMS.TIMER_FIRE_WHEN( 
-         SPTEST.TIMER_ID( 1 ),
-         TIME,
-         SPTEST.TA1_SEND_10_TO_SELF'ACCESS,
-         RTEMS.NULL_ADDRESS,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_FIRE_WHEN 1 day" );
-
-      TIME.DAY := 14;
-      TEXT_IO.PUT_LINE( 
-         "TA1 - event_send - send EVENT_11 to self in 2 days"
-      );
-      RTEMS.TIMER_FIRE_WHEN( 
-         SPTEST.TIMER_ID( 2 ),
-         TIME,
-         SPTEST.TA1_SEND_11_TO_SELF'ACCESS,
-         RTEMS.NULL_ADDRESS,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_FIRE_WHEN 2 days" );
-
-      TIME := ( 1988, 2, 12, 7, 15, 0, 0 );
-
-      TEST_SUPPORT.PRINT_TIME( "TA1 - clock_set - ", TIME, "" );
-      TEXT_IO.NEW_LINE;
-      TEXT_IO.PUT_LINE( "TA1 - set time backwards" );
-      RTEMS.CLOCK_SET( TIME, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TA1 CLOCK_SET" );
-
-      RTEMS.EVENT_RECEIVE( 
-         RTEMS.ALL_EVENTS,
-         RTEMS.NO_WAIT + RTEMS.EVENT_ANY,
-         RTEMS.NO_TIMEOUT,
-         EVENTOUT,
-         STATUS
-      );
-      if EVENTOUT >= RTEMS.EVENT_0 then 
-         TEXT_IO.PUT( "ERROR - " );
-         UNSIGNED32_IO.PUT( EVENTOUT, BASE => 16, WIDTH => 8 );
-         TEXT_IO.PUT_LINE( " events received" );
-      else
-         TEXT_IO.PUT_LINE( "TA1 - no events received" );
-      end if;
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( 
-         STATUS, 
-         RTEMS.UNSATISFIED, 
-         "EVENT_RECEIVE all events" 
-      );
-
-      TIME := ( 1988, 2, 14, 7, 15, 0, 0 );
-
-      TEST_SUPPORT.PRINT_TIME( "TA1 - clock_set - ", TIME, "" );
-      TEXT_IO.NEW_LINE;
-      TEXT_IO.PUT_LINE( "TA1 - set time forwards (leave a timer)" );
-      RTEMS.CLOCK_SET( TIME, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TA1 CLOCK_SET" );
-
-      RTEMS.EVENT_RECEIVE( 
-         RTEMS.ALL_EVENTS,
-         RTEMS.NO_WAIT + RTEMS.EVENT_ANY,
-         RTEMS.NO_TIMEOUT,
-         EVENTOUT,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "EVENT_RECEIVE all events" );
-      if EVENTOUT = RTEMS.EVENT_10 then 
-         TEXT_IO.PUT_LINE( "TA1 - EVENT_10 received" );
-      else
-         TEXT_IO.PUT( "ERROR - " );
-         UNSIGNED32_IO.PUT( EVENTOUT, BASE => 16, WIDTH => 8 );
-         TEXT_IO.PUT_LINE( " events received" );
-      end if;
-         
-      TEXT_IO.PUT_LINE( 
-         "TA1 - event_send - send EVENT_11 to self in 100 ticks"
-      );
-      RTEMS.TIMER_FIRE_AFTER( 
-         SPTEST.TIMER_ID( 1 ),
-         100,
-         SPTEST.TA1_SEND_11_TO_SELF'ACCESS,
-         RTEMS.NULL_ADDRESS,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_FIRE_AFTER 100 ticks" );
-
-      TEXT_IO.PUT_LINE( 
-         "TA1 - event_send - send EVENT_11 to self in 200 ticks"
-      );
-      RTEMS.TIMER_FIRE_AFTER( 
-         SPTEST.TIMER_ID( 2 ),
-         100,
-         SPTEST.TA1_SEND_11_TO_SELF'ACCESS,
-         RTEMS.NULL_ADDRESS,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_FIRE_AFTER 200 ticks" );
-
-      TEXT_IO.PUT_LINE( "*** END OF TEST 11 ***" );
-      RTEMS.SHUTDOWN_EXECUTIVE( 0 );
-
-   end TASK_1;
-
---PAGE
--- 
---  TASK_2
---
-
-   procedure TASK_2 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      EVENTOUT : RTEMS.EVENT_SET;
-      TIME     : RTEMS.TIME_OF_DAY;
-      STATUS   : RTEMS.STATUS_CODES;
-   begin
-
-      RTEMS.TASK_WAKE_AFTER( 1 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
-
-      TEXT_IO.PUT_LINE( 
-         "TA2 - event_receive - waiting forever on EVENT_16"
-      );
-      RTEMS.EVENT_RECEIVE( 
-         RTEMS.EVENT_16,
-         RTEMS.DEFAULT_OPTIONS,
-         RTEMS.NO_TIMEOUT,
-         EVENTOUT,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "EVENT_RECEIVE of 16" );
-      TEXT_IO.PUT( "TA2 - EVENT_16 received - eventout => ");
-      UNSIGNED32_IO.PUT( EVENTOUT, BASE => 16, WIDTH => 8 );
-      TEXT_IO.NEW_LINE;
-
-      TEXT_IO.PUT_LINE( 
-         "TA2 - event_send - send EVENT_14 and EVENT_15 to TA1"
-      );
-      RTEMS.EVENT_SEND( 
-         SPTEST.TASK_ID( 1 ), 
-         RTEMS.EVENT_14 + RTEMS.EVENT_15,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "EVENT_SEND of 14 and 15" );
-
-      TEXT_IO.PUT_LINE( 
-     "TA2 - event_receive - waiting forever on EVENT_17 or EVENT_18 - EVENT_ANY"
-      );
-      RTEMS.EVENT_RECEIVE( 
-         RTEMS.EVENT_17 + RTEMS.EVENT_18,
-         RTEMS.EVENT_ANY,
-         RTEMS.NO_TIMEOUT,
-         EVENTOUT,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "EVENT_RECEIVE of 17 and 18" );
-      TEXT_IO.PUT( "TA2 - EVENT_17 or EVENT_18 received - eventout => ");
-      UNSIGNED32_IO.PUT( EVENTOUT, BASE => 16, WIDTH => 8 );
-      TEXT_IO.NEW_LINE;
-
-      TEXT_IO.PUT_LINE( 
-         "TA2 - event_send - send EVENT_14 to TA1"
-      );
-      RTEMS.EVENT_SEND( 
-         SPTEST.TASK_ID( 1 ), 
-         RTEMS.EVENT_14,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "EVENT_SEND of 14" );
-
-      TIME := ( 1988,  2, 12, 8, 15, 0, 0 );
-
-      TEST_SUPPORT.PRINT_TIME( "TA2 - clock_set - ", TIME, "" );
-      TEXT_IO.NEW_LINE;
-      RTEMS.CLOCK_SET( TIME, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TA2 CLOCK_SET" );
-
-      TIME.SECOND := TIME.SECOND + 5;
-      TEXT_IO.PUT_LINE( 
-         "TA2 - event_send - sending EVENT_10 to self after 5 seconds"
-      );
-      RTEMS.TIMER_FIRE_WHEN( 
-         SPTEST.TIMER_ID( 5 ),
-         TIME,
-         SPTEST.TA2_SEND_10_TO_SELF'ACCESS,
-         RTEMS.NULL_ADDRESS,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_FIRE_WHEN 5 SECONDS" );
-
-      TEXT_IO.PUT_LINE( 
-         "TA2 - event_receive - waiting forever on EVENT_10"
-      );
-      RTEMS.EVENT_RECEIVE( 
-         RTEMS.EVENT_10,
-         RTEMS.DEFAULT_OPTIONS,
-         RTEMS.NO_TIMEOUT,
-         EVENTOUT,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "EVENT_RECEIVE of 10" );
-
-      RTEMS.CLOCK_GET( RTEMS.CLOCK_GET_TOD, TIME'ADDRESS, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TA1 CLOCK_GET" );
-
-      TEXT_IO.PUT( "TA2 - EVENT_10 received - eventout => ");
-      UNSIGNED32_IO.PUT( EVENTOUT, BASE => 16, WIDTH => 8 );
-      TEXT_IO.NEW_LINE;
-
-      TEST_SUPPORT.PRINT_TIME( "TA1 - clock_get - ", TIME, "" );
-      TEXT_IO.NEW_LINE;
-
-      TEXT_IO.PUT_LINE( "TA2 - event_receive - PENDING_EVENTS" );
-      RTEMS.EVENT_RECEIVE( 
-         RTEMS.PENDING_EVENTS,
-         RTEMS.DEFAULT_OPTIONS,
-         RTEMS.NO_TIMEOUT,
-         EVENTOUT,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "EVENT_RECEIVE of 10" );
-      TEXT_IO.PUT( "TA2 - eventout => ");
-      UNSIGNED32_IO.PUT( EVENTOUT, BASE => 16, WIDTH => 8 );
-      TEXT_IO.NEW_LINE;
-
-      TEXT_IO.PUT_LINE( 
-         "TA2 - event_receive - EVENT_19 - NO_WAIT"
-      );
-      RTEMS.EVENT_RECEIVE( 
-         RTEMS.EVENT_19,
-         RTEMS.NO_WAIT,
-         RTEMS.NO_TIMEOUT,
-         EVENTOUT,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "EVENT_RECEIVE of 10" );
-      TEXT_IO.PUT( "TA2 - EVENT_19 received - eventout => ");
-      UNSIGNED32_IO.PUT( EVENTOUT, BASE => 16, WIDTH => 8 );
-      TEXT_IO.NEW_LINE;
-
-      TEXT_IO.PUT_LINE( "TA2 - task_delete - deletes self" );
-      RTEMS.TASK_DELETE( SPTEST.TASK_ID( 2 ), STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE of TA2" );
-
-   end TASK_2;
-
---PAGE
--- 
---  TA1_SEND_18_TO_SELF_5_SECONDS
---
-
-   procedure TA1_SEND_18_TO_SELF_5_SECONDS (
-      IGNORED_ID      : in     RTEMS.ID;
-      IGNORED_ADDRESS : in     RTEMS.ADDRESS
-   )
-   is
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      RTEMS.EVENT_SEND( SPTEST.TASK_ID( 1 ), RTEMS.EVENT_18, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "EVENT_SEND of 18" );
-
-   end TA1_SEND_18_TO_SELF_5_SECONDS;
-
---PAGE
--- 
---  TA1_SEND_8_TO_SELF_60_SECONDS
---
-
-   procedure TA1_SEND_8_TO_SELF_60_SECONDS (
-      IGNORED_ID      : in     RTEMS.ID;
-      IGNORED_ADDRESS : in     RTEMS.ADDRESS
-   )
-   is
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      RTEMS.EVENT_SEND( SPTEST.TASK_ID( 1 ), RTEMS.EVENT_8, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "EVENT_SEND of 8" );
-
-   end TA1_SEND_8_TO_SELF_60_SECONDS;
-
---PAGE
--- 
---  TA1_SEND_9_TO_SELF_60_SECONDS
---
-
-   procedure TA1_SEND_9_TO_SELF_60_SECONDS (
-      IGNORED_ID      : in     RTEMS.ID;
-      IGNORED_ADDRESS : in     RTEMS.ADDRESS
-   )
-   is
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      RTEMS.EVENT_SEND( SPTEST.TASK_ID( 1 ), RTEMS.EVENT_9, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "EVENT_SEND of 9" );
-
-   end TA1_SEND_9_TO_SELF_60_SECONDS;
-
---PAGE
--- 
---  TA1_SEND_10_TO_SELF
---
-
-   procedure TA1_SEND_10_TO_SELF (
-      IGNORED_ID      : in     RTEMS.ID;
-      IGNORED_ADDRESS : in     RTEMS.ADDRESS
-   )
-   is
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      RTEMS.EVENT_SEND( SPTEST.TASK_ID( 1 ), RTEMS.EVENT_10, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "EVENT_SEND of 10" );
-
-   end TA1_SEND_10_TO_SELF;
-
---PAGE
--- 
---  TA1_SEND_1_TO_SELF_EVERY_SECOND
---
-
-   procedure TA1_SEND_1_TO_SELF_EVERY_SECOND (
-      IGNORED_ID      : in     RTEMS.ID;
-      IGNORED_ADDRESS : in     RTEMS.ADDRESS
-   )
-   is
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      RTEMS.EVENT_SEND( SPTEST.TASK_ID( 1 ), RTEMS.EVENT_1, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "EVENT_SEND of 1" );
-
-   end TA1_SEND_1_TO_SELF_EVERY_SECOND;
-
---PAGE
--- 
---  TA1_SEND_11_TO_SELF
---
-
-   procedure TA1_SEND_11_TO_SELF (
-      IGNORED_ID      : in     RTEMS.ID;
-      IGNORED_ADDRESS : in     RTEMS.ADDRESS
-   )
-   is
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      RTEMS.EVENT_SEND( SPTEST.TASK_ID( 1 ), RTEMS.EVENT_11, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "EVENT_SEND of 11" );
-
-   end TA1_SEND_11_TO_SELF;
-
---PAGE
--- 
---  TA2_SEND_10_TO_SELF
---
-
-   procedure TA2_SEND_10_TO_SELF (
-      IGNORED_ID      : in     RTEMS.ID;
-      IGNORED_ADDRESS : in     RTEMS.ADDRESS
-   )
-   is
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      RTEMS.EVENT_SEND( SPTEST.TASK_ID( 2 ), RTEMS.EVENT_10, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "EVENT_SEND of 10" );
-
-   end TA2_SEND_10_TO_SELF;
-
-end SPTEST;
diff --git a/c/src/ada-tests/sptests/sp11/sptest.ads b/c/src/ada-tests/sptests/sp11/sptest.ads
deleted file mode 100644
index c5527218f0..0000000000
--- a/c/src/ada-tests/sptests/sp11/sptest.ads
+++ /dev/null
@@ -1,178 +0,0 @@
---
---  SPTEST / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package is the specification for Test 11 of the RTEMS
---  Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-
-package SPTEST is
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS tasks created
---  by this test.
---
-
-   TASK_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.ID;
-   TASK_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.NAME;
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS timers created
---  by this test.
---
-
-   TIMER_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 6 ) of RTEMS.ID;
-   TIMER_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 6 ) of RTEMS.NAME;
-
---
---  TA1_SEND_18_TO_SELF_5_SECONDS
---
---  DESCRIPTION:
---
---  This subprogram is scheduled to be fired by a timer after 5 seconds
---  and to send EVENT_18 to TASK_1.
---
-
-   procedure TA1_SEND_18_TO_SELF_5_SECONDS (
-      IGNORED_ID      : in     RTEMS.ID;  
-      IGNORED_ADDRESS : in     RTEMS.ADDRESS 
-   ); 
-
---
---  TA1_SEND_8_TO_SELF_60_SECONDS
---
---  DESCRIPTION:
---
---  This subprogram is scheduled to be fired by a timer after 60 seconds
---  and to send EVENT_8 to TASK_1.
---
-
-   procedure TA1_SEND_8_TO_SELF_60_SECONDS (
-      IGNORED_ID      : in     RTEMS.ID;  
-      IGNORED_ADDRESS : in     RTEMS.ADDRESS 
-   ); 
-
---
---  TA1_SEND_9_TO_SELF_5_SECONDS
---
---  DESCRIPTION:
---
---  This subprogram is scheduled to be fired by a timer after 60 seconds
---  and to send EVENT_9 to TASK_1.
---
-
-   procedure TA1_SEND_9_TO_SELF_60_SECONDS (
-      IGNORED_ID      : in     RTEMS.ID;  
-      IGNORED_ADDRESS : in     RTEMS.ADDRESS 
-   ); 
-
---
---  TA1_SEND_10_TO_SELF
---
---  DESCRIPTION:
---
---  This subprogram is scheduled to be fired by a timer after 60 seconds
---  and to send EVENT_10 to TASK_1.
---
-
-   procedure TA1_SEND_10_TO_SELF (
-      IGNORED_ID      : in     RTEMS.ID;  
-      IGNORED_ADDRESS : in     RTEMS.ADDRESS 
-   ); 
-
---
---  TA1_SEND_1_TO_SELF_EVERY_SECOND
---
---  DESCRIPTION:
---
---  This subprogram is scheduled to be fired by a timer every second
---  and to send EVENT_1 to TASK_1 until the timer is cancelled.
---
-
-   procedure TA1_SEND_1_TO_SELF_EVERY_SECOND (
-      IGNORED_ID      : in     RTEMS.ID;  
-      IGNORED_ADDRESS : in     RTEMS.ADDRESS 
-   ); 
-
---
---  TA1_SEND_11_TO_SELF
---
---  DESCRIPTION:
---
---  This subprogram is scheduled to be fired by a timer at a
---  specific time of day and to send EVENT_11 to TASK_1.
---
-
-   procedure TA1_SEND_11_TO_SELF (
-      IGNORED_ID      : in     RTEMS.ID;  
-      IGNORED_ADDRESS : in     RTEMS.ADDRESS 
-   ); 
-
---
---  TA2_SEND_10_TO_SELF
---
---  DESCRIPTION:
---
---  This subprogram is scheduled to be fired by a timer after 5 seconds
---  and to send EVENT_10 to TASK_2.
---
-
-   procedure TA2_SEND_10_TO_SELF (
-      IGNORED_ID      : in     RTEMS.ID;  
-      IGNORED_ADDRESS : in     RTEMS.ADDRESS 
-   ); 
-
---
---  INIT
---
---  DESCRIPTION:
---
---  This RTEMS task initializes the application.
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TASK_1
---
---  DESCRIPTION:
---
---  This RTEMS task tests the Event and Timer Managers.
---
-
-   procedure TASK_1 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TASK_2
---
---  DESCRIPTION:
---
---  This RTEMS task tests the Event and Timer Managers.
---
-
-   procedure TASK_2 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
-end SPTEST;
diff --git a/c/src/ada-tests/sptests/sp12/config.h b/c/src/ada-tests/sptests/sp12/config.h
deleted file mode 100644
index 7feac09c9b..0000000000
--- a/c/src/ada-tests/sptests/sp12/config.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*  config.h
- *
- *  This include file defines the Configuration Table for this test.
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-/* configuration information */
-
-#define CONFIGURE_SPTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_MAXIMUM_SEMAPHORES         10
-#define CONFIGURE_TICKS_PER_TIMESLICE       100
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#define CONFIGURE_MAXIMUM_POSIX_THREADS              10
-#define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
-#define CONFIGURE_MAXIMUM_POSIX_MUTEXES              20
-#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES  10
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/c/src/ada-tests/sptests/sp12/sp12.adb b/c/src/ada-tests/sptests/sp12/sp12.adb
deleted file mode 100644
index a2edd48d5d..0000000000
--- a/c/src/ada-tests/sptests/sp12/sp12.adb
+++ /dev/null
@@ -1,58 +0,0 @@
---
---  MAIN / BODY
---
---  DESCRIPTION:
---
---  This is the entry point for Test SP12 of the Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with Interfaces; use Interfaces;
-with RTEMS;
-with SPTEST;
-with TEST_SUPPORT;
-
-procedure SP12 is
-  INIT_ID : RTEMS.ID;
-  STATUS  : RTEMS.STATUS_CODES;
-begin
-
-   RTEMS.TASK_CREATE(
-      RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
-      1,
-      RTEMS.MINIMUM_STACK_SIZE * 2,
-      RTEMS.NO_PREEMPT,
-      RTEMS.DEFAULT_ATTRIBUTES,
-      INIT_ID,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
-
-
-   RTEMS.TASK_START(
-      INIT_ID,
-      SPTEST.INIT'ACCESS,
-      0,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
-
-   loop
-      delay 120.0;
-   end loop;
-
-end SP12;
-
diff --git a/c/src/ada-tests/sptests/sp12/sp12.scn b/c/src/ada-tests/sptests/sp12/sp12.scn
deleted file mode 100644
index eb0c71f372..0000000000
--- a/c/src/ada-tests/sptests/sp12/sp12.scn
+++ /dev/null
@@ -1,78 +0,0 @@
-*** TEST 12 ***
-INIT - Forward priority queue test
-PRI1 - semaphore_obtain - wait forever on SM2
-PRI2 - semaphore_obtain - wait forever on SM2
-PRI3 - semaphore_obtain - wait forever on SM2
-PRI4 - semaphore_obtain - wait forever on SM2
-PRI5 - semaphore_obtain - wait forever on SM2
-INIT - Backward priority queue test
-PRI5 - semaphore_obtain - wait forever on SM2
-PRI4 - semaphore_obtain - wait forever on SM2
-PRI3 - semaphore_obtain - wait forever on SM2
-PRI2 - semaphore_obtain - wait forever on SM2
-PRI1 - semaphore_obtain - wait forever on SM2
-<pause>
-INIT - Binary Semaphore and Priority Inheritance Test
-INIT - semaphore_create - allocated binary semaphore
-INIT - semaphore_release - allocated binary semaphore
-INIT - semaphore_delete - allocated binary semaphore
-PRI5 - semaphore_obtain - wait forever on SM2
-PRI5 - task_suspend - until all priority tasks blocked
-PDRV - priority of PRI5 is          67
-PRI4 - semaphore_obtain - wait forever on SM2
-PDRV - change priority of PRI5 from          67 to 68
-PDRV - priority of PRI5 is          67
-PRI3 - semaphore_obtain - wait forever on SM2
-PDRV - priority of PRI5 is          67
-PRI2 - semaphore_obtain - wait forever on SM2
-PDRV - priority of PRI5 is          66
-PRI1 - semaphore_obtain - wait forever on SM2
-PDRV - priority of PRI5 is          65
-PDRV - task_resume - PRI5
-PRI5 - task_delete - all tasks waiting on SM2
-PRI5 - semaphore_obtain - nested
-PRI5 - semaphore_release - nested
-PRI5 - semaphore_release - restore priority
-PRI5 - priority of PRI5 is          68
-<pause>
-TA1 - semaphore_ident - smid => 16#10001#
-TA1 - semaphore_obtain - wait forever on SM2
-TA1 - got SM2
-TA1 - semaphore_obtain - wait forever on SM3
-TA1 - got SM3
-TA1 - semaphore_obtain - get SM1 - NO_WAIT
-TA1 - got SM1
-TA1 - task_wake_after - sleep 5 seconds
-TA2 - semaphore_obtain - wait forever on SM1
-TA3 - semaphore_obtain - wait forever on SM2
-<pause>
-TA1 - semaphore_release - release SM1
-TA1 - semaphore_obtain - waiting for SM1 with 10 second timeout
-TA2 - got SM1
-TA2 - semaphore_release - release SM1
-TA2 - task_set_priority - make self highest priority task
-TA2 - semaphore_obtain - wait forever on SM2
-TA1 - got SM1
-TA1 - semaphore_release - release SM2
-TA2 - got SM2
-TA2 - semaphore_release - release SM2
-TA2 - task_delete - delete self
-TA1 - task_wake_after - sleep 5 seconds
-TA3 - got SM2
-TA3 - semaphore_release - release SM2
-TA3 - semaphore_obtain - wait forever on SM3
-<pause>
-TA1 - task_delete - delete TA3
-TA1 - task_wake_after - sleep 5 seconds
-TA4 - semaphore_obtain - wait forever on SM1
-TA5 - semaphore_obtain - wait forever on SM1
-TA1 - task_delete - delete TA4
-TA1 - semaphore_release - release SM1
-TA1 - task_wake_after - sleep 5 seconds
-TA5 - got SM1
-TA5 - semaphore_obtain - wait forever on SM1
-TA1 - semaphore_delete - delete SM1
-TA1 - semaphore_delete - delete SM3
-TA1 - task_delete - delete self
-TA5 - SM1 deleted by TA1
-*** END OF TEST 12 ***
diff --git a/c/src/ada-tests/sptests/sp12/sptest.adb b/c/src/ada-tests/sptests/sp12/sptest.adb
deleted file mode 100644
index e302dacc76..0000000000
--- a/c/src/ada-tests/sptests/sp12/sptest.adb
+++ /dev/null
@@ -1,812 +0,0 @@
---
---  SPTEST / BODY
---
---  DESCRIPTION:
---
---  This package is the implementation of Test 12 of the RTEMS
---  Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with INTERFACES; use INTERFACES;
-with RTEMS;
-with TEST_SUPPORT;
-with TEXT_IO;
-with UNSIGNED32_IO;
-
-package body SPTEST is
-
---PAGE
--- 
---  INIT
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** TEST 12 ***" );
-
-      SPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME(  'T', 'A', '1', ' ' );
-      SPTEST.TASK_NAME( 2 ) := RTEMS.BUILD_NAME(  'T', 'A', '2', ' ' );
-      SPTEST.TASK_NAME( 3 ) := RTEMS.BUILD_NAME(  'T', 'A', '3', ' ' );
-      SPTEST.TASK_NAME( 4 ) := RTEMS.BUILD_NAME(  'T', 'A', '4', ' ' );
-      SPTEST.TASK_NAME( 5 ) := RTEMS.BUILD_NAME(  'T', 'A', '5', ' ' );
-
-      SPTEST.PRIORITY_TASK_NAME( 1 ) := 
-         RTEMS.BUILD_NAME(  'P', 'R', 'I', '1' );
-      SPTEST.PRIORITY_TASK_NAME( 2 ) := 
-         RTEMS.BUILD_NAME(  'P', 'R', 'I', '2' );
-      SPTEST.PRIORITY_TASK_NAME( 3 ) := 
-         RTEMS.BUILD_NAME(  'P', 'R', 'I', '3' );
-      SPTEST.PRIORITY_TASK_NAME( 4 ) := 
-         RTEMS.BUILD_NAME(  'P', 'R', 'I', '4' );
-      SPTEST.PRIORITY_TASK_NAME( 5 ) := 
-         RTEMS.BUILD_NAME(  'P', 'R', 'I', '5' );
-
-      SPTEST.SEMAPHORE_NAME( 1 ) := RTEMS.BUILD_NAME(  'S', 'M', '1', ' ' );
-      SPTEST.SEMAPHORE_NAME( 2 ) := RTEMS.BUILD_NAME(  'S', 'M', '2', ' ' );
-      SPTEST.SEMAPHORE_NAME( 3 ) := RTEMS.BUILD_NAME(  'S', 'M', '3', ' ' );
-
-      RTEMS.SEMAPHORE_CREATE( 
-         SPTEST.SEMAPHORE_NAME( 1 ), 
-         1,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         RTEMS.NO_PRIORITY,
-         SPTEST.SEMAPHORE_ID( 1 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_CREATE OF SM1" );
-
-      RTEMS.SEMAPHORE_CREATE( 
-         SPTEST.SEMAPHORE_NAME( 2 ), 
-         0,
-         RTEMS.PRIORITY,
-         RTEMS.NO_PRIORITY,
-         SPTEST.SEMAPHORE_ID( 2 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_CREATE OF SM2" );
-
-      RTEMS.SEMAPHORE_CREATE( 
-         SPTEST.SEMAPHORE_NAME( 3 ), 
-         1,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         RTEMS.NO_PRIORITY,
-         SPTEST.SEMAPHORE_ID( 3 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_CREATE OF SM3" );
-
-      TEXT_IO.PUT_LINE( "INIT - Forward priority queue test" );
-      SPTEST.PRIORITY_TEST_DRIVER( 0 );
-
-      TEXT_IO.PUT_LINE( "INIT - Backward priority queue test" );
-      SPTEST.PRIORITY_TEST_DRIVER( 32 );
-
-TEST_SUPPORT.PAUSE;
-
-      TEXT_IO.PUT_LINE( 
-        "INIT - Binary Semaphore and Priority Inheritance Test" 
-      );
-
-      RTEMS.SEMAPHORE_DELETE( SPTEST.SEMAPHORE_ID( 2 ), STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_DELETE OF SM2" );
-
-      TEXT_IO.PUT_LINE( 
-        "INIT - semaphore_create - allocated binary semaphore"
-      );
-      RTEMS.SEMAPHORE_CREATE( 
-         SPTEST.SEMAPHORE_NAME( 2 ), 
-         0,
-         RTEMS.BINARY_SEMAPHORE + RTEMS.PRIORITY + RTEMS.INHERIT_PRIORITY,
-         RTEMS.NO_PRIORITY,
-         SPTEST.SEMAPHORE_ID( 2 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_CREATE OF SM2" );
-
-      TEXT_IO.PUT_LINE( 
-        "INIT - semaphore_release - allocated binary semaphore"
-      );
-      RTEMS.SEMAPHORE_RELEASE( SPTEST.SEMAPHORE_ID( 2 ), STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_RELEASE OF SM2" );
-
-      TEXT_IO.PUT_LINE( 
-        "INIT - semaphore_delete - allocated binary semaphore"
-      );
-      RTEMS.SEMAPHORE_DELETE( SPTEST.SEMAPHORE_ID( 2 ), STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_DELETE OF SM2" );
-
-      RTEMS.SEMAPHORE_CREATE( 
-         SPTEST.SEMAPHORE_NAME( 2 ), 
-         1,
-         RTEMS.BINARY_SEMAPHORE + RTEMS.PRIORITY + RTEMS.INHERIT_PRIORITY,
-         RTEMS.NO_PRIORITY,
-         SPTEST.SEMAPHORE_ID( 2 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_CREATE OF SM2" );
-
-      SPTEST.PRIORITY_TEST_DRIVER( 64 );
-
-TEST_SUPPORT.PAUSE;
-
-      RTEMS.SEMAPHORE_DELETE( SPTEST.SEMAPHORE_ID( 2 ), STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_DELETE OF SM2" );
-
-      RTEMS.SEMAPHORE_CREATE( 
-         SPTEST.SEMAPHORE_NAME( 2 ), 
-         0,
-         RTEMS.PRIORITY,
-         RTEMS.NO_PRIORITY,
-         SPTEST.SEMAPHORE_ID( 2 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_CREATE OF SM2" );
-
-      RTEMS.SEMAPHORE_RELEASE( SPTEST.SEMAPHORE_ID( 2 ), STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_RELEASE OF SM2" );
-
-      RTEMS.TASK_CREATE( 
-         SPTEST.TASK_NAME( 1 ), 
-         4, 
-         2048, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.TASK_ID( 1 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA1" );
-
-      RTEMS.TASK_CREATE( 
-         SPTEST.TASK_NAME( 2 ), 
-         4, 
-         2048, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.TASK_ID( 2 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA2" );
-
-      RTEMS.TASK_CREATE( 
-         SPTEST.TASK_NAME( 3 ), 
-         4, 
-         2048, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.TASK_ID( 3 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA3" );
-
-      RTEMS.TASK_START(
-         SPTEST.TASK_ID( 1 ),
-         SPTEST.TASK_1'ACCESS,
-         0,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA1" );
-
-      RTEMS.TASK_START(
-         SPTEST.TASK_ID( 2 ),
-         SPTEST.TASK_2'ACCESS,
-         0,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA2" );
-
-      RTEMS.TASK_START(
-         SPTEST.TASK_ID( 3 ),
-         SPTEST.TASK_3'ACCESS,
-         0,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA3" );
-
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
-
-   end INIT;
-
---PAGE
--- 
---  PRIORITY_TEST_DRIVER
---
-
-   procedure PRIORITY_TEST_DRIVER (
-      PRIORITY_BASE : in     RTEMS.UNSIGNED32
-   ) is 
-      PREVIOUS_PRIORITY : RTEMS.TASK_PRIORITY;
-      STATUS            : RTEMS.STATUS_CODES;
-   begin
-
-      for INDEX in 1 .. 5
-      loop
-
-         case INDEX is
-            when 1 | 2 | 3 => 
-               SPTEST.TASK_PRIORITY( INDEX )  := 
-                  PRIORITY_BASE + RTEMS.TASK_PRIORITY( INDEX );
-            when others    => 
-               SPTEST.TASK_PRIORITY( INDEX )  := PRIORITY_BASE + 3;
-         end case;
-
-         RTEMS.TASK_CREATE( 
-            SPTEST.PRIORITY_TASK_NAME( INDEX ), 
-            SPTEST.TASK_PRIORITY( INDEX ), 
-            2048, 
-            RTEMS.DEFAULT_MODES,
-            RTEMS.DEFAULT_ATTRIBUTES,
-            SPTEST.PRIORITY_TASK_ID( INDEX ),
-            STATUS
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE LOOP" );
-
-      end loop;
-
-      if PRIORITY_BASE = 0 then
-
-         for INDEX in 1 .. 5
-         loop
-
-            RTEMS.TASK_START( 
-               SPTEST.PRIORITY_TASK_ID( INDEX ),
-               SPTEST.PRIORITY_TASK'ACCESS,
-               RTEMS.TASK_ARGUMENT( INDEX ), 
-               STATUS
-            );
-            TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START LOOP" );
-      
-         end loop;
-
-      else
-
-         for INDEX in reverse 1 .. 5
-         loop
-
-            RTEMS.TASK_START( 
-               SPTEST.PRIORITY_TASK_ID( INDEX ),
-               SPTEST.PRIORITY_TASK'ACCESS,
-               RTEMS.TASK_ARGUMENT( INDEX ), 
-               STATUS
-            );
-            TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START LOOP" );
-      
-            RTEMS.TASK_WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
-            TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER LOOP" );
-
-            if PRIORITY_BASE = 64 then
-               if INDEX = 4 then
-                  RTEMS.TASK_SET_PRIORITY( 
-                     SPTEST.PRIORITY_TASK_ID( 5 ),
-                     PRIORITY_BASE + 4,
-                     PREVIOUS_PRIORITY,
-                     STATUS
-                  );
-                  TEXT_IO.PUT( "PDRV - change priority of PRI5 from " );
-                  UNSIGNED32_IO.PUT( PREVIOUS_PRIORITY );
-                  TEXT_IO.PUT( " to " );
-                  UNSIGNED32_IO.PUT( PRIORITY_BASE + 4 );
-                  TEXT_IO.NEW_LINE;
-                  TEST_SUPPORT.DIRECTIVE_FAILED( 
-                     STATUS, 
-                     "PDRV TASK_SET_PRIORITY" 
-                  );
-               end if;
-
-               RTEMS.TASK_SET_PRIORITY( 
-                  SPTEST.PRIORITY_TASK_ID( 5 ),
-                  RTEMS.CURRENT_PRIORITY,
-                  PREVIOUS_PRIORITY,
-                  STATUS
-               );
-               TEXT_IO.PUT( "PDRV - priority of PRI5 is " );
-               UNSIGNED32_IO.PUT( PREVIOUS_PRIORITY );
-               TEXT_IO.NEW_LINE;
-               TEST_SUPPORT.DIRECTIVE_FAILED( 
-                  STATUS, 
-                  "PDRV TASK_SET_PRIORITY" 
-               );
-            end if;
-
-         end loop;
-
-      end if;
-
-      RTEMS.TASK_WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER AFTER LOOP" );
-
-      if PRIORITY_BASE = 0 then
-         for INDEX in 1 .. 5
-         loop
-
-            RTEMS.SEMAPHORE_RELEASE( 
-               SPTEST.SEMAPHORE_ID( 2 ),
-               STATUS
-            );
-            TEST_SUPPORT.DIRECTIVE_FAILED( 
-               STATUS,
-               "SEMAPHORE_RELEASE LOOP"
-            );
-
-         end loop;
-      end if;
-
-      if PRIORITY_BASE = 64 then
-
-         TEXT_IO.PUT_LINE( "PDRV - task_resume - PRI5" );
-         RTEMS.TASK_RESUME( SPTEST.PRIORITY_TASK_ID( 5 ), STATUS );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_RESUME" );
-
-         RTEMS.TASK_WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
-         TEST_SUPPORT.DIRECTIVE_FAILED( 
-           STATUS, 
-           "TASK_WAKE_AFTER SO PRI5 can run" 
-         );
-
-         RTEMS.TASK_DELETE( SPTEST.PRIORITY_TASK_ID( 5 ), STATUS );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF PRI5" );
-      else
-
-         for INDEX in 1 .. 5
-         loop
-
-            RTEMS.TASK_DELETE( 
-               SPTEST.PRIORITY_TASK_ID( INDEX ),
-               STATUS
-            );
-            TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE LOOP" );
-
-         end loop;
-      end if;
-
-
-   end PRIORITY_TEST_DRIVER;
-
---PAGE
--- 
---  PRIORITY_TASK
---
-
-   procedure PRIORITY_TASK (
-      ITS_INDEX : in     RTEMS.TASK_ARGUMENT
-   ) is 
-      TIMEOUT          : RTEMS.INTERVAL;
-      ITS_PRIORITY     : RTEMS.TASK_PRIORITY;
-      CURRENT_PRIORITY : RTEMS.TASK_PRIORITY;
-      STATUS           : RTEMS.STATUS_CODES;
-   begin
-
-      ITS_PRIORITY := SPTEST.TASK_PRIORITY( INTEGER( ITS_INDEX ) );
-
-      if ITS_PRIORITY < 3 then
-         TIMEOUT := 5 * TEST_SUPPORT.TICKS_PER_SECOND;
-      else
-         TIMEOUT := RTEMS.NO_TIMEOUT;
-      end if;
-
-      TEST_SUPPORT.PUT_NAME( PRIORITY_TASK_NAME( INTEGER(ITS_INDEX) ), FALSE );
-      TEXT_IO.PUT_LINE( " - semaphore_obtain - wait forever on SM2" );
-   
-      RTEMS.SEMAPHORE_OBTAIN( 
-         SPTEST.SEMAPHORE_ID( 2 ), 
-         RTEMS.DEFAULT_OPTIONS, 
-         TIMEOUT, 
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_OBTAIN OF SM2" );
-
-      if ITS_PRIORITY < 64 then
-         TEXT_IO.PUT( "PRI" );
-         UNSIGNED32_IO.PUT( ITS_INDEX );
-         TEXT_IO.PUT( " - WHY AM I HERE? (priority = " );
-         UNSIGNED32_IO.PUT( ITS_PRIORITY );
-         TEXT_IO.PUT_LINE( " )" );
-         RTEMS.SHUTDOWN_EXECUTIVE( 0 );
-      end if;
-
-      if ITS_INDEX = 5 then
-         TEXT_IO.PUT_LINE(
-            "PRI5 - task_suspend - until all priority tasks blocked" 
-         );
-      end if;
-
-      RTEMS.TASK_SUSPEND( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SUSPEND" );
-
-      TEXT_IO.PUT_LINE( "PRI5 - task_delete - all tasks waiting on SM2" );
-      for INDEX in 1 .. 4 
-      loop
-
-         RTEMS.TASK_DELETE(  SPTEST.PRIORITY_TASK_ID( INDEX ), STATUS );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE LOOP" );
-
-      end loop;
-
-      TEXT_IO.PUT_LINE( "PRI5 - semaphore_obtain - nested" );
-      RTEMS.SEMAPHORE_OBTAIN( 
-         SPTEST.SEMAPHORE_ID( 2 ), 
-         RTEMS.DEFAULT_OPTIONS, 
-         TIMEOUT, 
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_OBTAIN NESTED" );
-
-      TEXT_IO.PUT_LINE( "PRI5 - semaphore_release - nested" );
-      RTEMS.SEMAPHORE_RELEASE( SPTEST.SEMAPHORE_ID( 2 ), STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_RELEASE NESTED" );
-
-      TEXT_IO.PUT_LINE( "PRI5 - semaphore_release - restore priority" );
-      RTEMS.SEMAPHORE_RELEASE( SPTEST.SEMAPHORE_ID( 2 ), STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_RELEASE" );
-
-      RTEMS.TASK_SET_PRIORITY( 
-         SPTEST.PRIORITY_TASK_ID( 5 ),
-         RTEMS.CURRENT_PRIORITY,
-         CURRENT_PRIORITY,
-         STATUS
-      );
-      TEXT_IO.PUT( "PRI5 - priority of PRI5 is " );
-      UNSIGNED32_IO.PUT( CURRENT_PRIORITY );
-      TEXT_IO.NEW_LINE;
-      TEST_SUPPORT.DIRECTIVE_FAILED( 
-         STATUS, 
-         "PRI5 TASK_SET_PRIORITY CURRENT" 
-      );
-      RTEMS.TASK_SUSPEND( RTEMS.SELF, STATUS );
-
-   end PRIORITY_TASK;
-   
---PAGE
--- 
---  TASK_1
---
-
-   procedure TASK_1 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      SMID   : RTEMS.ID;
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      RTEMS.SEMAPHORE_IDENT( 
-         SPTEST.SEMAPHORE_NAME( 1 ), 
-         RTEMS.SEARCH_ALL_NODES, 
-         SMID, 
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_IDENT OF SM1" );
-      TEXT_IO.PUT( "TA1 - semaphore_ident - smid => " );
-      UNSIGNED32_IO.PUT( SMID, WIDTH => 8, BASE => 16 );
-      TEXT_IO.NEW_LINE;
-
-      TEXT_IO.PUT_LINE( "TA1 - semaphore_obtain - wait forever on SM2" );
-      RTEMS.SEMAPHORE_OBTAIN( 
-         SPTEST.SEMAPHORE_ID( 2 ),
-         RTEMS.DEFAULT_MODES, 
-         RTEMS.NO_TIMEOUT,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_OBTAIN ON SM2" );
-     
-      TEXT_IO.PUT_LINE( "TA1 - got SM2" );
-
-      TEXT_IO.PUT_LINE( "TA1 - semaphore_obtain - wait forever on SM3" );
-      RTEMS.SEMAPHORE_OBTAIN( 
-         SPTEST.SEMAPHORE_ID( 3 ),
-         RTEMS.DEFAULT_MODES, 
-         RTEMS.NO_TIMEOUT,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_OBTAIN ON SM3" );
-     
-      TEXT_IO.PUT_LINE( "TA1 - got SM3" );
-   
-      TEXT_IO.PUT_LINE( "TA1 - semaphore_obtain - get SM1 - NO_WAIT" );
-      RTEMS.SEMAPHORE_OBTAIN( 
-         SPTEST.SEMAPHORE_ID( 1 ),
-         RTEMS.NO_WAIT, 
-         RTEMS.NO_TIMEOUT,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_OBTAIN ON SM1" );
-     
-      TEXT_IO.PUT_LINE( "TA1 - got SM1" );
-
-      TEXT_IO.PUT_LINE( "TA1 - task_wake_after - sleep 5 seconds" );
-      RTEMS.TASK_WAKE_AFTER( 5 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
-
-TEST_SUPPORT.PAUSE;
-
-      TEXT_IO.PUT_LINE( "TA1 - semaphore_release - release SM1" );
-      RTEMS.SEMAPHORE_RELEASE( SPTEST.SEMAPHORE_ID( 1 ), STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_RELEASE ON SM1" );
-     
-      TEXT_IO.PUT_LINE( 
-         "TA1 - semaphore_obtain - waiting for SM1 with 10 second timeout"
-      );
-      RTEMS.SEMAPHORE_OBTAIN( 
-         SPTEST.SEMAPHORE_ID( 1 ),
-         RTEMS.DEFAULT_MODES, 
-         10 * TEST_SUPPORT.TICKS_PER_SECOND,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_OBTAIN ON SM3" );
-     
-      TEXT_IO.PUT_LINE( "TA1 - got SM1" );
-   
-      TEXT_IO.PUT_LINE( "TA1 - semaphore_release - release SM2" );
-      RTEMS.SEMAPHORE_RELEASE( 
-         SPTEST.SEMAPHORE_ID( 2 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_RELEASE ON SM2" );
-
-      TEXT_IO.PUT_LINE( "TA1 - task_wake_after - sleep 5 seconds" );
-      RTEMS.TASK_WAKE_AFTER( 5 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
-
-TEST_SUPPORT.PAUSE;
-
-      TEXT_IO.PUT_LINE( "TA1 - task_delete - delete TA3" );
-      RTEMS.TASK_DELETE( SPTEST.TASK_ID( 3 ), STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF TA3" );
-
-      RTEMS.TASK_CREATE( 
-         SPTEST.TASK_NAME( 4 ), 
-         4, 
-         2048, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.TASK_ID( 4 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA4" );
-
-      RTEMS.TASK_CREATE( 
-         SPTEST.TASK_NAME( 5 ), 
-         4, 
-         2048, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.TASK_ID( 5 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA5" );
-
-      RTEMS.TASK_START(
-         SPTEST.TASK_ID( 4 ),
-         SPTEST.TASK_4'ACCESS,
-         0,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA4" );
-
-      RTEMS.TASK_START(
-         SPTEST.TASK_ID( 5 ),
-         SPTEST.TASK_5'ACCESS,
-         0,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA5" );
-
-      TEXT_IO.PUT_LINE( "TA1 - task_wake_after - sleep 5 seconds" );
-      RTEMS.TASK_WAKE_AFTER( 5 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
-
-      TEXT_IO.PUT_LINE( "TA1 - task_delete - delete TA4" );
-      RTEMS.TASK_DELETE( SPTEST.TASK_ID( 4 ), STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF TA4" );
-
-      TEXT_IO.PUT_LINE( "TA1 - semaphore_release - release SM1" );
-      RTEMS.SEMAPHORE_RELEASE( 
-         SPTEST.SEMAPHORE_ID( 1 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_RELEASE ON SM1" );
-
-      TEXT_IO.PUT_LINE( "TA1 - task_wake_after - sleep 5 seconds" );
-      RTEMS.TASK_WAKE_AFTER( 5 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
-
-      TEXT_IO.PUT_LINE( "TA1 - semaphore_delete - delete SM1" );
-      RTEMS.SEMAPHORE_DELETE( SPTEST.SEMAPHORE_ID( 1 ), STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_DELETE OF SM1" );
-
-      TEXT_IO.PUT_LINE( "TA1 - semaphore_delete - delete SM3" );
-      RTEMS.SEMAPHORE_DELETE( SPTEST.SEMAPHORE_ID( 3 ), STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_DELETE OF SM3" );
-
-      TEXT_IO.PUT_LINE( "TA1 - task_delete - delete self" );
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF TA1" );
-
-   end TASK_1;
-
---PAGE
--- 
---  TASK_2
---
-
-   procedure TASK_2 (
-      ARGUMENT : in    RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS            : RTEMS.STATUS_CODES;
-      PREVIOUS_PRIORITY : RTEMS.TASK_PRIORITY;
-   begin
- 
-      TEXT_IO.PUT_LINE( "TA2 - semaphore_obtain - wait forever on SM1" );
-      RTEMS.SEMAPHORE_OBTAIN( 
-         SPTEST.SEMAPHORE_ID( 1 ),
-         RTEMS.DEFAULT_MODES, 
-         RTEMS.NO_TIMEOUT,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_OBTAIN ON SM1" );
-     
-      TEXT_IO.PUT_LINE( "TA2 - got SM1" );
-   
-      TEXT_IO.PUT_LINE( "TA2 - semaphore_release - release SM1" );
-      RTEMS.SEMAPHORE_RELEASE( 
-         SPTEST.SEMAPHORE_ID( 1 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_RELEASE ON SM1" );
-
-      TEXT_IO.PUT_LINE( 
-         "TA2 - task_set_priority - make self highest priority task" 
-      );
-      RTEMS.TASK_SET_PRIORITY(
-         RTEMS.SELF,
-         3,
-         PREVIOUS_PRIORITY,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SET_PRIORITY ON TA2" );
-     
-      TEXT_IO.PUT_LINE( "TA2 - semaphore_obtain - wait forever on SM2" );
-      RTEMS.SEMAPHORE_OBTAIN( 
-         SPTEST.SEMAPHORE_ID( 2 ),
-         RTEMS.DEFAULT_MODES, 
-         RTEMS.NO_TIMEOUT,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_OBTAIN ON SM2" );
-     
-      TEXT_IO.PUT_LINE( "TA2 - got SM2" );
-   
-      TEXT_IO.PUT_LINE( "TA2 - semaphore_release - release SM2" );
-      RTEMS.SEMAPHORE_RELEASE( 
-         SPTEST.SEMAPHORE_ID( 2 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_RELEASE ON SM2" );
-   
-      TEXT_IO.PUT_LINE( "TA2 - task_delete - delete self" );
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF TA2" );
-
-   end TASK_2;
-
---PAGE
--- 
---  TASK_3
---
-
-   procedure TASK_3 (
-      ARGUMENT : in    RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS : RTEMS.STATUS_CODES;
-   begin
- 
-      TEXT_IO.PUT_LINE( "TA3 - semaphore_obtain - wait forever on SM2" );
-      RTEMS.SEMAPHORE_OBTAIN( 
-         SPTEST.SEMAPHORE_ID( 2 ),
-         RTEMS.DEFAULT_MODES, 
-         RTEMS.NO_TIMEOUT,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_OBTAIN ON SM2" );
-      TEXT_IO.PUT_LINE( "TA3 - got SM2" );
-   
-      TEXT_IO.PUT_LINE( "TA3 - semaphore_release - release SM2" );
-      RTEMS.SEMAPHORE_RELEASE( 
-         SPTEST.SEMAPHORE_ID( 2 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_RELEASE ON SM2" );
-   
-      TEXT_IO.PUT_LINE( "TA3 - semaphore_obtain - wait forever on SM3" );
-      RTEMS.SEMAPHORE_OBTAIN( 
-         SPTEST.SEMAPHORE_ID( 3 ),
-         RTEMS.DEFAULT_MODES, 
-         RTEMS.NO_TIMEOUT,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_OBTAIN ON SM3" );
-     
-   end TASK_3;
-
---PAGE
--- 
---  TASK_4
---
-
-   procedure TASK_4 (
-      ARGUMENT : in    RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS : RTEMS.STATUS_CODES;
-   begin
- 
-      TEXT_IO.PUT_LINE( "TA4 - semaphore_obtain - wait forever on SM1" );
-      RTEMS.SEMAPHORE_OBTAIN( 
-         SPTEST.SEMAPHORE_ID( 1 ),
-         RTEMS.DEFAULT_MODES, 
-         RTEMS.NO_TIMEOUT,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_OBTAIN ON SM1" );
-     
-   end TASK_4;
-
---PAGE
--- 
---  TASK_5
---
-
-   procedure TASK_5 (
-      ARGUMENT : in    RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS : RTEMS.STATUS_CODES;
-   begin
- 
-      TEXT_IO.PUT_LINE( "TA5 - semaphore_obtain - wait forever on SM1" );
-      RTEMS.SEMAPHORE_OBTAIN( 
-         SPTEST.SEMAPHORE_ID( 1 ),
-         RTEMS.DEFAULT_MODES, 
-         RTEMS.NO_TIMEOUT,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_OBTAIN ON SM1" );
-     
-      TEXT_IO.PUT_LINE( "TA5 - got SM1" );
-   
-      TEXT_IO.PUT_LINE( "TA5 - semaphore_obtain - wait forever on SM1" );
-      RTEMS.SEMAPHORE_OBTAIN( 
-         SPTEST.SEMAPHORE_ID( 1 ),
-         RTEMS.DEFAULT_MODES, 
-         RTEMS.NO_TIMEOUT,
-         STATUS
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( 
-         STATUS, 
-         RTEMS.OBJECT_WAS_DELETED, 
-         "SEMAPHORE_OBTAIN ON SM1" 
-      );
-      TEXT_IO.PUT_LINE( "TA5 - SM1 deleted by TA1" );
-    
-      TEXT_IO.PUT_LINE( "*** END OF TEST 12 ***" );
-      RTEMS.SHUTDOWN_EXECUTIVE( 0 );
-   
-   end TASK_5;
-
-end SPTEST;
diff --git a/c/src/ada-tests/sptests/sp12/sptest.ads b/c/src/ada-tests/sptests/sp12/sptest.ads
deleted file mode 100644
index 8d75953069..0000000000
--- a/c/src/ada-tests/sptests/sp12/sptest.ads
+++ /dev/null
@@ -1,142 +0,0 @@
---
---  SPTEST / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package is the specification for Test 12 of the RTEMS
---  Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-
-package SPTEST is
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS tasks created
---  by this test.
---
-
-   TASK_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 5 ) of RTEMS.ID;
-   TASK_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 5 ) of RTEMS.NAME;
-
-   PRIORITY_TASK_ID   : array ( 1 .. 5 ) of RTEMS.ID;
-   PRIORITY_TASK_NAME : array ( 1 .. 5 ) of RTEMS.NAME;
-   TASK_PRIORITY      : array ( 1 .. 5 ) of RTEMS.TASK_PRIORITY;
-
-   SEMAPHORE_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.ID;
-   SEMAPHORE_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.NAME;
-
---
---  INIT
---
---  DESCRIPTION:
---
---  This RTEMS task initializes the application.
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  PRIORITY_TEST_DRIVER
---
---  DESCRIPTION:
---
---  This subprogram creates and starts RTEMS tasks of different priority
---  so that those tasks may exercise the priority blocking algorithm.
---
-
-   procedure PRIORITY_TEST_DRIVER (
-      PRIORITY_BASE : in     RTEMS.UNSIGNED32
-   );
-
---
---  PRIORITY_TASK
---
---  DESCRIPTION:
---
---  Copies of this RTEMS are executed at different priorities and each
---  instantiation blocks on a semaphore with priority blocking.  This
---  is done to exercise the priority blocking algorithms.
---
-
-   procedure PRIORITY_TASK (
-      ITS_INDEX : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TASK_1
---
---  DESCRIPTION:
---
---  This RTEMS task tests the Semaphore Manager.
---
-
-   procedure TASK_1 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TASK_2
---
---  DESCRIPTION:
---
---  This RTEMS task tests the Semaphore Manager.
---
-
-   procedure TASK_2 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TASK_3
---
---  DESCRIPTION:
---
---  This RTEMS task tests the Semaphore Manager.
---
-
-   procedure TASK_3 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TASK_4
---
---  DESCRIPTION:
---
---  This RTEMS task tests the Semaphore Manager.
---
-
-   procedure TASK_4 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TASK_5
---
---  DESCRIPTION:
---
---  This RTEMS task tests the Semaphore Manager.
---
-
-   procedure TASK_5 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
-end SPTEST;
diff --git a/c/src/ada-tests/sptests/sp13/config.h b/c/src/ada-tests/sptests/sp13/config.h
deleted file mode 100644
index 7a1e3fa026..0000000000
--- a/c/src/ada-tests/sptests/sp13/config.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*  config.h
- *
- *  This include file defines the Configuration Table for this test.
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-/* configuration information */
-
-#define CONFIGURE_SPTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES     10
-#define CONFIGURE_TICKS_PER_TIMESLICE       100
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#define CONFIGURE_MAXIMUM_POSIX_THREADS              10
-#define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
-#define CONFIGURE_MAXIMUM_POSIX_MUTEXES              20
-#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES  10
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/c/src/ada-tests/sptests/sp13/sp13.adb b/c/src/ada-tests/sptests/sp13/sp13.adb
deleted file mode 100644
index 3d19379ccd..0000000000
--- a/c/src/ada-tests/sptests/sp13/sp13.adb
+++ /dev/null
@@ -1,57 +0,0 @@
---
---  MAIN / BODY
---
---  DESCRIPTION:
---
---  This is the entry point for Test SP13 of the Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-with SPTEST;
-with TEST_SUPPORT;
-
-procedure SP13 is
-  INIT_ID : RTEMS.ID;
-  STATUS  : RTEMS.STATUS_CODES;
-begin
-
-   RTEMS.TASK_CREATE(
-      RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
-      1,
-      RTEMS.MINIMUM_STACK_SIZE,
-      RTEMS.NO_PREEMPT,
-      RTEMS.DEFAULT_ATTRIBUTES,
-      INIT_ID,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
-
-
-   RTEMS.TASK_START(
-      INIT_ID,
-      SPTEST.INIT'ACCESS,
-      0,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
-
-   loop
-      delay 120.0;
-   end loop;
-
-end SP13;
-
diff --git a/c/src/ada-tests/sptests/sp13/sp13.scn b/c/src/ada-tests/sptests/sp13/sp13.scn
deleted file mode 100644
index ced19af55b..0000000000
--- a/c/src/ada-tests/sptests/sp13/sp13.scn
+++ /dev/null
@@ -1,66 +0,0 @@
-*** TEST 13 ***
-TA1 - message_queue_ident - qid => 16#10001#
-TA1 - message_queue_send - BUFFER 1 TO Q 1
-TA1 - message_queue_send - BUFFER 2 TO Q 1
-TA1 - task_wake_after - sleep 5 seconds
-TA2 - message_queue_receive - receive from queue 1 - NO_WAIT
-TA2 - buffer received: BUFFER 1 TO Q 1
-TA2 - message_queue_receive - receive from queue 1 - WAIT FOREVER
-TA2 - buffer received: BUFFER 2 TO Q 1
-TA2 - message_queue_receive - receive from queue 1 - WAIT FOREVER
-TA3 - message_queue_receive - receive from queue 2 - WAIT FOREVER
-TA1 - message_queue_send - BUFFER 3 TO Q 1
-TA1 - task_wake_after - sleep 5 seconds
-TA2 - buffer received: BUFFER 3 TO Q 1
-TA2 - task_set_priority - make self highest priority task
-TA2 - message_queue_receive - receive from queue 2 - WAIT FOREVER
-<pause>
-TA1 - message_queue_send - BUFFER 1 TO Q 2
-TA2 - buffer received: BUFFER 1 TO Q 2
-TA2 - message_queue_send - BUFFER 2 TO Q 2
-TA2 - message_queue_receive - receive from queue 1 - 10 second timeout
-TA1 - message_queue_receive - receive from queue 1 - 10 second timeout
-TA3 - buffer received: BUFFER 2 TO Q 2
-TA3 - message_queue_broadcast - BUFFER 3 TO Q 1
-TA2 - buffer received: BUFFER 3 TO Q 1
-TA2 - message_queue_receive - receive from queue 3 - WAIT FOREVER
-TA3 - number of tasks awakened =  2
-TA3 - message_queue_receive - receive from queue 3 - WAIT FOREVER
-TA1 - buffer received: BUFFER 3 TO Q 1
-TA1 - task_delete - delete TA2
-TA1 - message_queue_send - BUFFER 1 TO Q 3
-TA1 - task_wake_after - sleep 5 seconds
-TA3 - buffer received: BUFFER 1 TO Q 3
-TA3 - task_delete - delete self
-<pause>
-TA1 - message_queue_send - BUFFER 2 TO Q 3
-TA1 - message_queue_send - BUFFER 3 TO Q 3
-TA1 - message_queue_send - BUFFER 4 TO Q 3
-TA1 - message_queue_urgent - BUFFER 5 TO Q 3
-TA1 - message_queue_receive - receive from queue 3 - WAIT FOREVER
-TA1 - buffer received: BUFFER 5 TO Q 3
-TA1 - message_queue_receive - receive from queue 3 - WAIT FOREVER
-TA1 - buffer received: BUFFER 2 TO Q 3
-TA1 - message_queue_receive - receive from queue 3 - WAIT FOREVER
-TA1 - buffer received: BUFFER 3 TO Q 3
-TA1 - message_queue_receive - receive from queue 3 - WAIT FOREVER
-TA1 - buffer received: BUFFER 4 TO Q 3
-TA1 - message_queue_urgent - BUFFER 3 TO Q 2
-TA1 - message_queue_receive - receive from queue 2 - WAIT FOREVER
-TA1 - buffer received: BUFFER 3 TO Q 2
-<pause>
-TA1 - message_queue_delete - delete queue 1
-TA1 - message_queue_urgent - BUFFER 3 TO Q 2
-TA1 - message_queue_delete - delete queue 2
-TA1 - message_queue_flush - empty Q 3
-TA1 -   0 messages were flushed from Q 3
-TA1 - message_queue_send - BUFFER 1 TO Q 3
-TA1 - message_queue_send - BUFFER 2 TO Q 3
-TA1 - message_queue_send - BUFFER 3 TO Q 3
-TA1 - message_queue_flush - Q 3
-TA1 -   3 messages were flushed from Q 3
-TA1 - message_queue_send - until all message buffers consumed
-TA1 - message_queue_send - all message buffers consumed
-TA1 - message_queue_flush - Q 3
-TA1 - 100 messages were flushed from Q 3
-*** END OF TEST 13 *** 
diff --git a/c/src/ada-tests/sptests/sp13/sptest.adb b/c/src/ada-tests/sptests/sp13/sptest.adb
deleted file mode 100644
index 9190f77e83..0000000000
--- a/c/src/ada-tests/sptests/sp13/sptest.adb
+++ /dev/null
@@ -1,723 +0,0 @@
---
---  SPTEST / BODY
---
---  DESCRIPTION:
---
---  This package is the implementation of Test 13 of the RTEMS
---  Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with INTERFACES; use INTERFACES;
-with RTEMS;
-with TEST_SUPPORT;
-with TEXT_IO;
-with UNSIGNED32_IO;
-
-package body SPTEST is
-
---PAGE
--- 
---  INIT
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** TEST 13 ***" );
-
-      SPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME(  'T', 'A', '1', ' ' );
-      SPTEST.TASK_NAME( 2 ) := RTEMS.BUILD_NAME(  'T', 'A', '2', ' ' );
-      SPTEST.TASK_NAME( 3 ) := RTEMS.BUILD_NAME(  'T', 'A', '3', ' ' );
-
-      RTEMS.TASK_CREATE( 
-         SPTEST.TASK_NAME( 1 ), 
-         4, 
-         2048, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.TASK_ID( 1 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA1" );
-
-      RTEMS.TASK_CREATE( 
-         SPTEST.TASK_NAME( 2 ), 
-         4, 
-         2048, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.TASK_ID( 2 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA2" );
-
-      RTEMS.TASK_CREATE( 
-         SPTEST.TASK_NAME( 3 ), 
-         4, 
-         2048, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.TASK_ID( 3 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA3" );
-
-      RTEMS.TASK_START(
-         SPTEST.TASK_ID( 1 ),
-         SPTEST.TASK_1'ACCESS,
-         0,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA1" );
-
-      RTEMS.TASK_START(
-         SPTEST.TASK_ID( 2 ),
-         SPTEST.TASK_2'ACCESS,
-         0,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA2" );
-
-      RTEMS.TASK_START(
-         SPTEST.TASK_ID( 3 ),
-         SPTEST.TASK_3'ACCESS,
-         0,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA3" );
-
-      SPTEST.QUEUE_NAME( 1 ) := RTEMS.BUILD_NAME(  'Q', '1', ' ', ' ' );
-      SPTEST.QUEUE_NAME( 2 ) := RTEMS.BUILD_NAME(  'Q', '2', ' ', ' ' );
-      SPTEST.QUEUE_NAME( 3 ) := RTEMS.BUILD_NAME(  'Q', '3', ' ', ' ' );
-
-      RTEMS.MESSAGE_QUEUE_CREATE(
-         SPTEST.QUEUE_NAME( 1 ),
-         100,
-         16,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.QUEUE_ID( 1 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "QUEUE_CREATE OF Q1" );
-
-      RTEMS.MESSAGE_QUEUE_CREATE(
-         SPTEST.QUEUE_NAME( 2 ),
-         10,
-         16,
-         RTEMS.PRIORITY,
-         SPTEST.QUEUE_ID( 2 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "QUEUE_CREATE OF Q2" );
-
-      RTEMS.MESSAGE_QUEUE_CREATE(
-         SPTEST.QUEUE_NAME( 3 ),
-         100,
-         16,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.QUEUE_ID( 3 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "QUEUE_CREATE OF Q3" );
-
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
-
-   end INIT;
-
---PAGE
--- 
---  FILL_BUFFER
---
-
---
--- Depends on tricks to make the copy work.
---
-
-   procedure FILL_BUFFER (
-      SOURCE : in     STRING;
-      BUFFER :    out SPTEST.BUFFER
-   ) is
-   begin
-
-      BUFFER.FIELD1 := RTEMS.BUILD_NAME(
-         SOURCE( SOURCE'FIRST ),
-         SOURCE( SOURCE'FIRST + 1 ),
-         SOURCE( SOURCE'FIRST + 2 ),
-         SOURCE( SOURCE'FIRST + 3 )
-      );
-
-      BUFFER.FIELD2 := RTEMS.BUILD_NAME(
-         SOURCE( SOURCE'FIRST + 4 ),
-         SOURCE( SOURCE'FIRST + 5 ),
-         SOURCE( SOURCE'FIRST + 6 ),
-         SOURCE( SOURCE'FIRST + 7 )
-      );
-
-      BUFFER.FIELD3 := RTEMS.BUILD_NAME(
-         SOURCE( SOURCE'FIRST + 8 ),
-         SOURCE( SOURCE'FIRST + 9 ),
-         SOURCE( SOURCE'FIRST + 10 ),
-         SOURCE( SOURCE'FIRST + 11 )
-      );
-
-      BUFFER.FIELD4 := RTEMS.BUILD_NAME(
-         SOURCE( SOURCE'FIRST + 12 ),
-         SOURCE( SOURCE'FIRST + 13 ),
-         SOURCE( SOURCE'FIRST + 14 ),
-         SOURCE( SOURCE'FIRST + 15 )
-      );
-
-   end FILL_BUFFER;
-
---PAGE
--- 
---  PUT_BUFFER
---
-
---
--- Depends on tricks to make the output work.
---
-
-   procedure PUT_BUFFER (
-      BUFFER : in     SPTEST.BUFFER
-   ) is
-   begin
-
-      TEST_SUPPORT.PUT_NAME( BUFFER.FIELD1, FALSE );
-      TEST_SUPPORT.PUT_NAME( BUFFER.FIELD2, FALSE );
-      TEST_SUPPORT.PUT_NAME( BUFFER.FIELD3, FALSE );
-      TEST_SUPPORT.PUT_NAME( BUFFER.FIELD4, FALSE );
-      
-   end PUT_BUFFER;
-
---PAGE
--- 
---  TASK_1
---
-
-   procedure TASK_1 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      QID            : RTEMS.ID;
-      BUFFER         : SPTEST.BUFFER;
-      BUFFER_POINTER : RTEMS.ADDRESS;
-      TIMES          : RTEMS.UNSIGNED32;
-      COUNT          : RTEMS.UNSIGNED32;
-      MESSAGE_SIZE   : RTEMS.UNSIGNED32;
-      STATUS         : RTEMS.STATUS_CODES;
-   begin
-
-      BUFFER_POINTER := BUFFER'ADDRESS;
-
-      RTEMS.MESSAGE_QUEUE_IDENT( 
-         SPTEST.QUEUE_NAME( 1 ), 
-         RTEMS.SEARCH_ALL_NODES, 
-         QID, 
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_IDENT" );
-      TEXT_IO.PUT( "TA1 - message_queue_ident - qid => " );
-      UNSIGNED32_IO.PUT( QID, WIDTH => 8, BASE => 16 );
-      TEXT_IO.NEW_LINE;
-
-      SPTEST.FILL_BUFFER( "BUFFER 1 TO Q 1 ", BUFFER );
-      TEXT_IO.PUT_LINE( "TA1 - message_queue_send - BUFFER 1 TO Q 1" );
-      RTEMS.MESSAGE_QUEUE_SEND( 
-         SPTEST.QUEUE_ID( 1 ), 
-         BUFFER_POINTER, 
-         16,
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_SEND" );
-   
-      SPTEST.FILL_BUFFER( "BUFFER 2 TO Q 1 ", BUFFER );
-      TEXT_IO.PUT_LINE( "TA1 - message_queue_send - BUFFER 2 TO Q 1" );
-      RTEMS.MESSAGE_QUEUE_SEND( 
-         SPTEST.QUEUE_ID( 1 ), 
-         BUFFER_POINTER, 
-         16,
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_SEND" );
-
-      TEXT_IO.PUT_LINE( "TA1 - task_wake_after - sleep 5 seconds" );
-      RTEMS.TASK_WAKE_AFTER( 5 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
-          
-      SPTEST.FILL_BUFFER( "BUFFER 3 TO Q 1 ", BUFFER );
-      TEXT_IO.PUT_LINE( "TA1 - message_queue_send - BUFFER 3 TO Q 1" );
-      RTEMS.MESSAGE_QUEUE_SEND( 
-         SPTEST.QUEUE_ID( 1 ), 
-         BUFFER_POINTER, 
-         16,
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_SEND" );
-
-      TEXT_IO.PUT_LINE( "TA1 - task_wake_after - sleep 5 seconds" );
-      RTEMS.TASK_WAKE_AFTER( 5 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
-          
-TEST_SUPPORT.PAUSE;
-
-      SPTEST.FILL_BUFFER( "BUFFER 1 TO Q 2 ", BUFFER );
-      TEXT_IO.PUT_LINE( "TA1 - message_queue_send - BUFFER 1 TO Q 2" );
-      RTEMS.MESSAGE_QUEUE_SEND( 
-         SPTEST.QUEUE_ID( 2 ), 
-         BUFFER_POINTER, 
-         16,
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_SEND" );
-
-      TEXT_IO.PUT( 
-         "TA1 - message_queue_receive - receive from queue 1 - "
-      );
-      TEXT_IO.PUT_LINE( "10 second timeout" );
-      RTEMS.MESSAGE_QUEUE_RECEIVE(
-         SPTEST.QUEUE_ID( 1 ),
-         BUFFER_POINTER,
-         RTEMS.DEFAULT_OPTIONS,
-         10 * TEST_SUPPORT.TICKS_PER_SECOND,
-         MESSAGE_SIZE,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_RECEIVE" );
-      TEXT_IO.PUT( "TA1 - buffer received: " );
-      SPTEST.PUT_BUFFER( BUFFER );
-      TEXT_IO.NEW_LINE;
-
-      TEXT_IO.PUT_LINE( "TA1 - task_delete - delete TA2" );
-      RTEMS.TASK_DELETE( SPTEST.TASK_ID( 2 ), STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE" );
-
-      SPTEST.FILL_BUFFER( "BUFFER 1 TO Q 3 ", BUFFER );
-      TEXT_IO.PUT_LINE( "TA1 - message_queue_send - BUFFER 1 TO Q 3" );
-      RTEMS.MESSAGE_QUEUE_SEND( 
-         SPTEST.QUEUE_ID( 3 ), 
-         BUFFER_POINTER, 
-         16,
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_SEND" );
-
-      TEXT_IO.PUT_LINE( "TA1 - task_wake_after - sleep 5 seconds" );
-      RTEMS.TASK_WAKE_AFTER( 5 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
-          
-TEST_SUPPORT.PAUSE;
-
-      SPTEST.FILL_BUFFER( "BUFFER 2 TO Q 3 ", BUFFER );
-      TEXT_IO.PUT_LINE( "TA1 - message_queue_send - BUFFER 2 TO Q 3" );
-      RTEMS.MESSAGE_QUEUE_SEND( 
-         SPTEST.QUEUE_ID( 3 ), 
-         BUFFER_POINTER, 
-         16,
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_SEND" );
-
-      SPTEST.FILL_BUFFER( "BUFFER 3 TO Q 3 ", BUFFER );
-      TEXT_IO.PUT_LINE( "TA1 - message_queue_send - BUFFER 3 TO Q 3" );
-      RTEMS.MESSAGE_QUEUE_SEND( 
-         SPTEST.QUEUE_ID( 3 ), 
-         BUFFER_POINTER, 
-         16,
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_SEND" );
-
-      SPTEST.FILL_BUFFER( "BUFFER 4 TO Q 3 ", BUFFER );
-      TEXT_IO.PUT_LINE( "TA1 - message_queue_send - BUFFER 4 TO Q 3" );
-      RTEMS.MESSAGE_QUEUE_SEND( 
-         SPTEST.QUEUE_ID( 3 ), 
-         BUFFER_POINTER, 
-         16,
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_SEND" );
-
-      SPTEST.FILL_BUFFER( "BUFFER 5 TO Q 3 ", BUFFER );
-      TEXT_IO.PUT_LINE( "TA1 - message_queue_urgent - BUFFER 5 TO Q 3" );
-      RTEMS.MESSAGE_QUEUE_URGENT( 
-         SPTEST.QUEUE_ID( 3 ), 
-         BUFFER_POINTER, 
-         16,
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_URGENT" );
-
-      for TIMES in 1 .. 4 
-      loop
-         TEXT_IO.PUT( 
-            "TA1 - message_queue_receive - receive from queue 3 - "
-         );
-         TEXT_IO.PUT_LINE( "WAIT FOREVER" );
-         RTEMS.MESSAGE_QUEUE_RECEIVE(
-            SPTEST.QUEUE_ID( 3 ),
-            BUFFER_POINTER,
-            RTEMS.DEFAULT_OPTIONS,
-            RTEMS.NO_TIMEOUT,
-            MESSAGE_SIZE,
-            STATUS
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_RECEIVE" );
-         TEXT_IO.PUT( "TA1 - buffer received: " );
-         SPTEST.PUT_BUFFER( BUFFER );
-         TEXT_IO.NEW_LINE;
-      end loop;
-
-      SPTEST.FILL_BUFFER( "BUFFER 3 TO Q 2 ", BUFFER );
-      TEXT_IO.PUT_LINE( "TA1 - message_queue_urgent - BUFFER 3 TO Q 2" );
-      RTEMS.MESSAGE_QUEUE_URGENT( 
-         SPTEST.QUEUE_ID( 2 ), 
-         BUFFER_POINTER, 
-         16,
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_URGENT" );
-
-      TEXT_IO.PUT( 
-        "TA1 - message_queue_receive - receive from queue 2 - " 
-      );
-      TEXT_IO.PUT_LINE( "WAIT FOREVER" );
-      RTEMS.MESSAGE_QUEUE_RECEIVE(
-         SPTEST.QUEUE_ID( 2 ),
-         BUFFER_POINTER,
-         RTEMS.DEFAULT_OPTIONS,
-         RTEMS.NO_TIMEOUT,
-         MESSAGE_SIZE,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_RECEIVE" );
-      TEXT_IO.PUT( "TA1 - buffer received: " );
-      SPTEST.PUT_BUFFER( BUFFER );
-      TEXT_IO.NEW_LINE;
-
-TEST_SUPPORT.PAUSE;
-
-      TEXT_IO.PUT_LINE( "TA1 - message_queue_delete - delete queue 1" );
-      RTEMS.MESSAGE_QUEUE_DELETE( SPTEST.QUEUE_ID( 1 ), STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_DELETE" );
-   
-      SPTEST.FILL_BUFFER( "BUFFER 3 TO Q 2 ", BUFFER );
-      TEXT_IO.PUT_LINE( "TA1 - message_queue_urgent - BUFFER 3 TO Q 2" );
-      RTEMS.MESSAGE_QUEUE_URGENT( 
-         SPTEST.QUEUE_ID( 2 ), 
-         BUFFER_POINTER, 
-         16,
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_URGENT" );
-
-      TEXT_IO.PUT_LINE( "TA1 - message_queue_delete - delete queue 2" );
-      RTEMS.MESSAGE_QUEUE_DELETE( SPTEST.QUEUE_ID( 2 ), STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_DELETE" );
-   
-      TEXT_IO.PUT_LINE( "TA1 - message_queue_flush - empty Q 3" );
-      RTEMS.MESSAGE_QUEUE_FLUSH( SPTEST.QUEUE_ID( 3 ), COUNT, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_FLUSH" );
-      TEXT_IO.PUT( "TA1 - " );
-      UNSIGNED32_IO.PUT( COUNT, WIDTH => 3, BASE => 10 );
-      TEXT_IO.PUT_LINE( " messages were flushed from Q 3" );
-     
-      SPTEST.FILL_BUFFER( "BUFFER 1 TO Q 3 ", BUFFER );
-      TEXT_IO.PUT_LINE( "TA1 - message_queue_send - BUFFER 1 TO Q 3" );
-      RTEMS.MESSAGE_QUEUE_SEND( 
-         SPTEST.QUEUE_ID( 3 ), 
-         BUFFER_POINTER, 
-         16,
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_SEND" );
-
-      SPTEST.FILL_BUFFER( "BUFFER 2 TO Q 3 ", BUFFER );
-      TEXT_IO.PUT_LINE( "TA1 - message_queue_send - BUFFER 2 TO Q 3" );
-      RTEMS.MESSAGE_QUEUE_SEND( 
-         SPTEST.QUEUE_ID( 3 ), 
-         BUFFER_POINTER, 
-         16,
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_SEND" );
-
-      SPTEST.FILL_BUFFER( "BUFFER 3 TO Q 3 ", BUFFER );
-      TEXT_IO.PUT_LINE( "TA1 - message_queue_send - BUFFER 3 TO Q 3" );
-      RTEMS.MESSAGE_QUEUE_SEND( 
-         SPTEST.QUEUE_ID( 3 ), 
-         BUFFER_POINTER, 
-         16,
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_SEND" );
-
-      TEXT_IO.PUT_LINE( "TA1 - message_queue_flush - Q 3" );
-      RTEMS.MESSAGE_QUEUE_FLUSH( SPTEST.QUEUE_ID( 3 ), COUNT, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_FLUSH" );
-      TEXT_IO.PUT( "TA1 - " );
-      UNSIGNED32_IO.PUT( COUNT, WIDTH => 3, BASE => 10 );
-      TEXT_IO.PUT_LINE( " messages were flushed from Q 3" );
-     
-      TEXT_IO.PUT_LINE( 
-         "TA1 - message_queue_send - until all message buffers consumed"
-      );
-      loop
-
-         RTEMS.MESSAGE_QUEUE_SEND( 
-            SPTEST.QUEUE_ID( 3 ), 
-            BUFFER_POINTER, 
-            16,
-            STATUS 
-         );
-         
-         exit when RTEMS.ARE_STATUSES_EQUAL( STATUS, RTEMS.TOO_MANY );
-
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_SEND" );
-         
-      end loop;
-
-      TEXT_IO.PUT_LINE( 
-         "TA1 - message_queue_send - all message buffers consumed"
-      );
-
-      TEXT_IO.PUT_LINE( "TA1 - message_queue_flush - Q 3" );
-      RTEMS.MESSAGE_QUEUE_FLUSH( SPTEST.QUEUE_ID( 3 ), COUNT, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_FLUSH" );
-      TEXT_IO.PUT( "TA1 - " );
-      UNSIGNED32_IO.PUT( COUNT, WIDTH => 3, BASE => 10 );
-      TEXT_IO.PUT_LINE( " messages were flushed from Q 3" );
-     
-      TEXT_IO.PUT( "TA1 - ERROR - " );
-      UNSIGNED32_IO.PUT( COUNT, WIDTH => 3, BASE => 10 );
-      TEXT_IO.PUT_LINE( " messages flushed" );
-
-      TEXT_IO.PUT_LINE( "*** END OF TEST 13 ***" );
-      RTEMS.SHUTDOWN_EXECUTIVE( 0 );
-
-   end TASK_1;
-
---PAGE
--- 
---  TASK_2
---
-
-   procedure TASK_2 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      BUFFER            : SPTEST.BUFFER;
-      BUFFER_POINTER    : RTEMS.ADDRESS;
-      PREVIOUS_PRIORITY : RTEMS.TASK_PRIORITY;
-      MESSAGE_SIZE      : RTEMS.UNSIGNED32;
-      STATUS            : RTEMS.STATUS_CODES;
-   begin
-
-      BUFFER_POINTER := BUFFER'ADDRESS;
-
-      TEXT_IO.PUT_LINE( 
-         "TA2 - message_queue_receive - receive from queue 1 - NO_WAIT"
-      );
-      RTEMS.MESSAGE_QUEUE_RECEIVE(
-         SPTEST.QUEUE_ID( 1 ),
-         BUFFER_POINTER,
-         RTEMS.NO_WAIT,
-         RTEMS.NO_TIMEOUT,
-         MESSAGE_SIZE,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_RECEIVE" );
-      TEXT_IO.PUT( "TA2 - buffer received: " );
-      SPTEST.PUT_BUFFER( BUFFER );
-      TEXT_IO.NEW_LINE;
-
-      TEXT_IO.PUT_LINE( 
-         "TA2 - message_queue_receive - receive from queue 1 - WAIT FOREVER"
-      );
-      RTEMS.MESSAGE_QUEUE_RECEIVE(
-         SPTEST.QUEUE_ID( 1 ),
-         BUFFER_POINTER,
-         RTEMS.DEFAULT_OPTIONS,
-         RTEMS.NO_TIMEOUT,
-         MESSAGE_SIZE,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_RECEIVE" );
-      TEXT_IO.PUT( "TA2 - buffer received: " );
-      SPTEST.PUT_BUFFER( BUFFER );
-      TEXT_IO.NEW_LINE;
-
-      TEXT_IO.PUT_LINE( 
-         "TA2 - message_queue_receive - receive from queue 1 - WAIT FOREVER"
-      );
-      RTEMS.MESSAGE_QUEUE_RECEIVE(
-         SPTEST.QUEUE_ID( 1 ),
-         BUFFER_POINTER,
-         RTEMS.DEFAULT_OPTIONS,
-         RTEMS.NO_TIMEOUT,
-         MESSAGE_SIZE,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_RECEIVE" );
-      TEXT_IO.PUT( "TA2 - buffer received: " );
-      SPTEST.PUT_BUFFER( BUFFER );
-      TEXT_IO.NEW_LINE;
-
-      TEXT_IO.PUT_LINE( 
-         "TA2 - task_set_priority - make self highest priority task"
-      );
-      RTEMS.TASK_SET_PRIORITY(
-         RTEMS.SELF,
-         3,
-         PREVIOUS_PRIORITY,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SET_PRIORITY" );
-
-      TEXT_IO.PUT_LINE( 
-         "TA2 - message_queue_receive - receive from queue 2 - WAIT FOREVER"
-      );
-      RTEMS.MESSAGE_QUEUE_RECEIVE(
-         SPTEST.QUEUE_ID( 2 ),
-         BUFFER_POINTER,
-         RTEMS.DEFAULT_OPTIONS,
-         RTEMS.NO_TIMEOUT,
-         MESSAGE_SIZE,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_RECEIVE" );
-      TEXT_IO.PUT( "TA2 - buffer received: " );
-      SPTEST.PUT_BUFFER( BUFFER );
-      TEXT_IO.NEW_LINE;
-
-      SPTEST.FILL_BUFFER( "BUFFER 2 TO Q 2 ", BUFFER );
-      TEXT_IO.PUT_LINE( "TA2 - message_queue_send - BUFFER 2 TO Q 2" );
-      RTEMS.MESSAGE_QUEUE_SEND( 
-         SPTEST.QUEUE_ID( 2 ), 
-         BUFFER_POINTER, 
-         16,
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_SEND" );
-   
-      TEXT_IO.PUT_LINE( 
-    "TA2 - message_queue_receive - receive from queue 1 - 10 second timeout"
-      );
-      RTEMS.MESSAGE_QUEUE_RECEIVE(
-         SPTEST.QUEUE_ID( 1 ),
-         BUFFER_POINTER,
-         RTEMS.DEFAULT_OPTIONS,
-         10 * TEST_SUPPORT.TICKS_PER_SECOND,
-         MESSAGE_SIZE,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_RECEIVE" );
-      TEXT_IO.PUT( "TA2 - buffer received: " );
-      SPTEST.PUT_BUFFER( BUFFER );
-      TEXT_IO.NEW_LINE;
-
-      TEXT_IO.PUT_LINE( 
-         "TA2 - message_queue_receive - receive from queue 3 - WAIT FOREVER"
-      );
-      RTEMS.MESSAGE_QUEUE_RECEIVE(
-         SPTEST.QUEUE_ID( 3 ),
-         BUFFER_POINTER,
-         RTEMS.DEFAULT_OPTIONS,
-         RTEMS.NO_TIMEOUT,
-         MESSAGE_SIZE,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_RECEIVE" );
-      TEXT_IO.PUT( "TA2 - buffer received: " );
-      SPTEST.PUT_BUFFER( BUFFER );
-      TEXT_IO.NEW_LINE;
-
-   end TASK_2;
-
---PAGE
--- 
---  TASK_3
---
-
-   procedure TASK_3 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      BUFFER         : SPTEST.BUFFER;
-      BUFFER_POINTER : RTEMS.ADDRESS;
-      COUNT          : RTEMS.UNSIGNED32;
-      MESSAGE_SIZE   : RTEMS.UNSIGNED32;
-      STATUS         : RTEMS.STATUS_CODES;
-   begin
-
-      BUFFER_POINTER := BUFFER'ADDRESS;
-
-      TEXT_IO.PUT_LINE( 
-         "TA3 - message_queue_receive - receive from queue 2 - WAIT FOREVER"
-      );
-      RTEMS.MESSAGE_QUEUE_RECEIVE(
-         SPTEST.QUEUE_ID( 2 ),
-         BUFFER_POINTER,
-         RTEMS.DEFAULT_OPTIONS,
-         RTEMS.NO_TIMEOUT,
-         MESSAGE_SIZE,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_RECEIVE" );
-      TEXT_IO.PUT( "TA3 - buffer received: " );
-      SPTEST.PUT_BUFFER( BUFFER );
-      TEXT_IO.NEW_LINE;
-
-      SPTEST.FILL_BUFFER( "BUFFER 3 TO Q 1 ", BUFFER );
-      TEXT_IO.PUT_LINE( "TA3 - message_queue_broadcast - BUFFER 3 TO Q 1" );
-      RTEMS.MESSAGE_QUEUE_BROADCAST( 
-         SPTEST.QUEUE_ID( 1 ), 
-         BUFFER_POINTER, 
-         16,
-         COUNT,
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_BROADCAST" );
-      TEXT_IO.PUT( "TA3 - number of tasks awakened = " );
-      UNSIGNED32_IO.PUT( COUNT, WIDTH => 3, BASE => 10 );
-      TEXT_IO.NEW_LINE;
-     
-      TEXT_IO.PUT_LINE( 
-         "TA3 - message_queue_receive - receive from queue 3 - WAIT FOREVER"
-      );
-      RTEMS.MESSAGE_QUEUE_RECEIVE(
-         SPTEST.QUEUE_ID( 3 ),
-         BUFFER_POINTER,
-         RTEMS.DEFAULT_OPTIONS,
-         RTEMS.NO_TIMEOUT,
-         MESSAGE_SIZE,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_RECEIVE" );
-      TEXT_IO.PUT( "TA3 - buffer received: " );
-      SPTEST.PUT_BUFFER( BUFFER );
-      TEXT_IO.NEW_LINE;
-
-      TEXT_IO.PUT_LINE( "TA3 - task_delete - delete self" );
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
-
-   end TASK_3;
-
-end SPTEST;
diff --git a/c/src/ada-tests/sptests/sp13/sptest.ads b/c/src/ada-tests/sptests/sp13/sptest.ads
deleted file mode 100644
index cf53004c3d..0000000000
--- a/c/src/ada-tests/sptests/sp13/sptest.ads
+++ /dev/null
@@ -1,132 +0,0 @@
---
---  SPTEST / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package is the specification for Test 13 of the RTEMS
---  Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-
-package SPTEST is
-
---
---  Buffer Record similar to that used by RTEMS 3.2.1.  Using this
---  avoids changes to the test.
---
-
-   type BUFFER is
-      record
-         FIELD1 : RTEMS.NAME;   -- TEMPORARY UNTIL VARIABLE LENGTH
-         FIELD2 : RTEMS.NAME;
-         FIELD3 : RTEMS.NAME;
-         FIELD4 : RTEMS.NAME;
-      end record;
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS tasks created
---  by this test.
---
-
-   TASK_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.ID;
-   TASK_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.NAME;
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS message
---  queues created by this test.
---
-
-   QUEUE_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.ID;
-   QUEUE_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.NAME;
-
---
---  INIT
---
---  DESCRIPTION:
---
---  This RTEMS task initializes the application.
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  FILL_BUFFER
---
---  DESCRIPTION:
---
---  This subprogram takes the SOURCE input string and places 
---  up to the first sixteen characters of that string into 
---  the message BUFFER.
---
-
-   procedure FILL_BUFFER (
-      SOURCE : in     STRING;
-      BUFFER :    out SPTEST.BUFFER
-   );
-
---
---  PUT_BUFFER
---
---  DESCRIPTION:
---
---  This subprogram prints the specified message BUFFER.
---
-
-   procedure PUT_BUFFER (
-      BUFFER : in     SPTEST.BUFFER
-   );
-
---
---  TASK_1
---
---  DESCRIPTION:
---
---  This RTEMS task tests the Message Queue Manager.
---
-
-   procedure TASK_1 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TASK_2
---
---  DESCRIPTION:
---
---  This RTEMS task tests the Message Queue Manager.
---
-
-   procedure TASK_2 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TASK_3
---
---  DESCRIPTION:
---
---  This RTEMS task tests the Message Queue Manager.
---
-
-   procedure TASK_3 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
-end SPTEST;
diff --git a/c/src/ada-tests/sptests/sp14/config.h b/c/src/ada-tests/sptests/sp14/config.h
deleted file mode 100644
index ed43b85e09..0000000000
--- a/c/src/ada-tests/sptests/sp14/config.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*  config.h
- *
- *  This include file defines the Configuration Table for this test.
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-/* configuration information */
-
-#define CONFIGURE_SPTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_MAXIMUM_TIMERS              1
-#define CONFIGURE_TICKS_PER_TIMESLICE       100
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#define CONFIGURE_MAXIMUM_POSIX_THREADS              10
-#define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
-#define CONFIGURE_MAXIMUM_POSIX_MUTEXES              20
-#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES  10
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/c/src/ada-tests/sptests/sp14/sp14.adb b/c/src/ada-tests/sptests/sp14/sp14.adb
deleted file mode 100644
index 5f6d0819c0..0000000000
--- a/c/src/ada-tests/sptests/sp14/sp14.adb
+++ /dev/null
@@ -1,57 +0,0 @@
---
---  MAIN / BODY
---
---  DESCRIPTION:
---
---  This is the entry point for Test SP14 of the Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-with SPTEST;
-with TEST_SUPPORT;
-
-procedure SP14 is
-  INIT_ID : RTEMS.ID;
-  STATUS  : RTEMS.STATUS_CODES;
-begin
-
-   RTEMS.TASK_CREATE(
-      RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
-      1,
-      RTEMS.MINIMUM_STACK_SIZE,
-      RTEMS.NO_PREEMPT,
-      RTEMS.DEFAULT_ATTRIBUTES,
-      INIT_ID,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
-
-
-   RTEMS.TASK_START(
-      INIT_ID,
-      SPTEST.INIT'ACCESS,
-      0,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
-
-   loop
-      delay 120.0;
-   end loop;
-
-end SP14;
-
diff --git a/c/src/ada-tests/sptests/sp14/sp14.scn b/c/src/ada-tests/sptests/sp14/sp14.scn
deleted file mode 100644
index 5f2cfd70c7..0000000000
--- a/c/src/ada-tests/sptests/sp14/sp14.scn
+++ /dev/null
@@ -1,33 +0,0 @@
-*** TEST 14 ***
-TA1 - signal_catch - INTERRUPT_LEVEL( 3 )
-TA1 - signal_send - SIGNAL_16 to self
-ASR - ENTRY - signal => 16#10000#
-ASR - EXIT  - signal => 16#10000#
-TA1 - signal_send - SIGNAL_0 to self
-ASR - ENTRY - signal =>     16#1#
-ASR - task_wake_after - yield processor
-TA2 - signal_send - SIGNAL_17 to TA1
-TA2 - task_wake_after - yield processor
-ASR - ENTRY - signal => 16#20000#
-ASR - EXIT  - signal => 16#20000#
-ASR - EXIT  - signal =>     16#1#
-TA1 - signal_catch - NO_ASR
-<pause>
-TA1 - signal_send - SIGNAL_1 to self
-ASR - ENTRY - signal =>     16#2#
-ASR - task_wake_after - yield processor
-TA2 - signal_send - SIGNAL_18 and SIGNAL_19 to TA1
-TA2 - task_wake_after - yield processor
-ASR - EXIT  - signal =>     16#2#
-ASR - ENTRY - signal => 16#C0000#
-ASR - EXIT  - signal => 16#C0000#
-TA1 - task_mode - disable ASRs
-TA1 - sending signal to SELF from timer
-TA1 - waiting for signal to arrive
-TA1 - timer routine got the correct arguments
-TA1 - task_mode - enable ASRs
-ASR - ENTRY - signal => 16#8#
-ASR - EXIT  - signal => 16#8#
-TA1 - signal_catch - ASR ADDRESS of NULL
-TA1 - task_delete - delete self
-*** END OF TEST 14 ***
diff --git a/c/src/ada-tests/sptests/sp14/sptest.adb b/c/src/ada-tests/sptests/sp14/sptest.adb
deleted file mode 100644
index d52d0dff15..0000000000
--- a/c/src/ada-tests/sptests/sp14/sptest.adb
+++ /dev/null
@@ -1,330 +0,0 @@
---
---  SPTEST / BODY
---
---  DESCRIPTION:
---
---  This package is the implementation of Test 14 of the RTEMS
---  Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with ADDRESS_IO;
-with RTEMS;
-with TEST_SUPPORT;
-with TEXT_IO;
-with UNSIGNED32_IO;
-with INTERFACES; use INTERFACES;
-
-package body SPTEST is
-
---PAGE
--- 
---  INIT
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      TIME   : RTEMS.TIME_OF_DAY;
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** TEST 14 ***" );
-
-      SPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME(  'T', 'A', '1', ' ' );
-      SPTEST.TASK_NAME( 2 ) := RTEMS.BUILD_NAME(  'T', 'A', '2', ' ' );
-
-      RTEMS.TASK_CREATE( 
-         SPTEST.TASK_NAME( 1 ), 
-         1, 
-         RTEMS.MINIMUM_STACK_SIZE * 2, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.TASK_ID( 1 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA1" );
-
-      RTEMS.TASK_CREATE( 
-         SPTEST.TASK_NAME( 2 ), 
-         1, 
-         RTEMS.MINIMUM_STACK_SIZE * 2, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.TASK_ID( 2 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA2" );
-
-      RTEMS.TASK_START(
-         SPTEST.TASK_ID( 1 ),
-         SPTEST.TASK_1'ACCESS,
-         0,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA1" );
-
-      RTEMS.TASK_START(
-         SPTEST.TASK_ID( 2 ),
-         SPTEST.TASK_2'ACCESS,
-         0,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA2" );
-
-      SPTEST.TIMER_NAME( 1 ) := RTEMS.BUILD_NAME(  'T', 'M', '1', ' ' );
-
-      RTEMS.TIMER_CREATE( 
-         SPTEST.TIMER_NAME( 1 ), 
-         SPTEST.TIMER_ID( 1 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_CREATE OF TM1" );
-
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
-
-   end INIT;
-
---PAGE
--- 
---  SIGNAL_3_TO_TASK_1
---
-
-   procedure SIGNAL_3_TO_TASK_1 (
-      ID      : in     RTEMS.ID;
-      POINTER : in     RTEMS.ADDRESS
-   ) is
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      RTEMS.SIGNAL_SEND( SPTEST.TASK_ID( 1 ), RTEMS.SIGNAL_3, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SIGNAL_SEND of 3" );
-
-      SPTEST.TIMER_GOT_THIS_ID      := ID;
-      SPTEST.TIMER_GOT_THIS_POINTER := POINTER;
-
-      SPTEST.SIGNAL_SENT := TRUE;
-
-   end SIGNAL_3_TO_TASK_1;
-
---PAGE
--- 
---  TASK_1
---
-
-   procedure TASK_1 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      PREVIOUS_MODE : RTEMS.MODE;
-      STATUS        : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.PUT_LINE( "TA1 - signal_catch - INTERRUPT_LEVEL( 3 )" );
-      RTEMS.SIGNAL_CATCH( 
-         SPTEST.PROCESS_ASR'ACCESS, 
-         RTEMS.INTERRUPT_LEVEL( 3 ), 
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SIGNAL_CATCH INTERRUPT(3)" );
-   
-      TEXT_IO.PUT_LINE( "TA1 - signal_send - SIGNAL_16 to self" );
-      RTEMS.SIGNAL_SEND( RTEMS.SELF, RTEMS.SIGNAL_16, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( 
-         STATUS, 
-         "SIGNAL_SEND - SIGNAL_16 to SELF"
-      );
-
-      TEXT_IO.PUT_LINE( "TA1 - signal_send - SIGNAL_0 to self" );
-      RTEMS.SIGNAL_SEND( RTEMS.SELF, RTEMS.SIGNAL_0, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( 
-         STATUS, 
-         "SIGNAL_SEND - SIGNAL_0 to SELF"
-      );
-
-      TEXT_IO.PUT_LINE( "TA1 - signal_catch - NO_ASR" );
-      RTEMS.SIGNAL_CATCH(SPTEST.PROCESS_ASR'ACCESS, RTEMS.NO_ASR, STATUS);
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SIGNAL_CATCH - NO_ASR" );
-
-      TEST_SUPPORT.PAUSE;
-
-      TEXT_IO.PUT_LINE( "TA1 - signal_send - SIGNAL_1 to self" );
-      RTEMS.SIGNAL_SEND( RTEMS.SELF, RTEMS.SIGNAL_1, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( 
-         STATUS, 
-         "SIGNAL_SEND - SIGNAL_1 to SELF"
-      );
-
-      TEXT_IO.PUT_LINE( "TA1 - task_mode - disable ASRs" );
-      RTEMS.TASK_MODE( 
-         RTEMS.NO_ASR, 
-         RTEMS.ASR_MASK, 
-         PREVIOUS_MODE, 
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_MODE" );
-
-      SPTEST.TIMER_GOT_THIS_ID := 0;
-      SPTEST.TIMER_GOT_THIS_POINTER := RTEMS.NULL_ADDRESS;
-
-      TEXT_IO.PUT_LINE( "TA1 - sending signal to SELF from timer" );
-      RTEMS.TIMER_FIRE_AFTER( 
-         SPTEST.TIMER_ID( 1 ),
-         TEST_SUPPORT.TICKS_PER_SECOND / 2,
-         SPTEST.SIGNAL_3_TO_TASK_1'ACCESS,
-         SPTEST.TASK_1'ADDRESS,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_FIRE_AFTER" );
-
-      TEXT_IO.PUT_LINE( "TA1 - waiting for signal to arrive" );
-
-      SPTEST.SIGNAL_SENT := FALSE;
-      SPTEST.ASR_FIRED   := FALSE;
-
-      loop
-         exit when SPTEST.SIGNAL_SENT = TRUE;
-      end loop;
-
-      if SPTEST.TIMER_GOT_THIS_ID = SPTEST.TIMER_ID( 1 ) and then
-         RTEMS.ARE_EQUAL(SPTEST.TIMER_GOT_THIS_POINTER,
-             SPTEST.TASK_1'ADDRESS) then
- 
-         TEXT_IO.PUT_LINE( "TA1 - timer routine got the correct arguments" );
-
-      else
-
-         TEXT_IO.PUT( "TA1 - timer got (" );
-         UNSIGNED32_IO.PUT( SPTEST.TIMER_GOT_THIS_ID  );
-         TEXT_IO.PUT( "," );
-         ADDRESS_IO.PUT( SPTEST.TIMER_GOT_THIS_POINTER  );
-         TEXT_IO.PUT( ") instead of (" );
-         UNSIGNED32_IO.PUT( SPTEST.TIMER_ID( 1 ) );
-         TEXT_IO.PUT( "," );
-         ADDRESS_IO.PUT( SPTEST.TASK_1'ADDRESS  );
-         TEXT_IO.PUT_LINE( ")!!!!" );
-
-      end if;
-
-      TEXT_IO.PUT_LINE( "TA1 - task_mode - enable ASRs" );
-      RTEMS.TASK_MODE( 
-         RTEMS.ASR, 
-         RTEMS.ASR_MASK, 
-         PREVIOUS_MODE, 
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_MODE" );
-
-      TEXT_IO.PUT_LINE( "TA1 - signal_catch - ASR ADDRESS of NULL" );
-      RTEMS.SIGNAL_CATCH( NULL, RTEMS.DEFAULT_MODES, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( 
-         STATUS, 
-         "SIGNAL_CATCH - NULL ADDRESS"
-      );
-   
-      TEXT_IO.PUT_LINE( "TA1 - task_delete - delete self" );
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
-
-   end TASK_1;
-
---PAGE
--- 
---  TASK_2
---
-
-   procedure TASK_2 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.PUT_LINE( "TA2 - signal_send - SIGNAL_17 to TA1" );
-      RTEMS.SIGNAL_SEND( SPTEST.TASK_ID( 1 ), RTEMS.SIGNAL_17, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( 
-         STATUS, 
-         "SIGNAL_SEND - SIGNAL_17 to TA1"
-      );
-
-      TEXT_IO.PUT_LINE( "TA2 - task_wake_after - yield processor" );
-      RTEMS.TASK_WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER YIELD" );
-
-      TEXT_IO.PUT_LINE( 
-         "TA2 - signal_send - SIGNAL_18 and SIGNAL_19 to TA1"
-      );
-      RTEMS.SIGNAL_SEND( 
-         SPTEST.TASK_ID( 1 ), 
-         RTEMS.SIGNAL_18 + RTEMS.SIGNAL_19,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( 
-         STATUS, 
-         "SIGNAL_SEND - SIGNAL_18 and SIGNAL_19 to TA1"
-      );
-
-      TEXT_IO.PUT_LINE( "TA2 - task_wake_after - yield processor" );
-      RTEMS.TASK_WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER YIELD" );
-
-      TEXT_IO.PUT_LINE( "*** END OF TEST 14 ***" );
-      RTEMS.SHUTDOWN_EXECUTIVE( 0 );
-
-   end TASK_2;
-
---PAGE
--- 
---  PROCESS_ASR
---
-
-   procedure PROCESS_ASR (
-      THE_SIGNAL_SET : in     RTEMS.SIGNAL_SET
-   ) is
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.PUT( "ASR - ENTRY - signal => " );
-      UNSIGNED32_IO.PUT( THE_SIGNAL_SET, BASE => 16, WIDTH => 8 );
-      TEXT_IO.NEW_LINE;
-
-      if THE_SIGNAL_SET = RTEMS.SIGNAL_16 or else 
-             THE_SIGNAL_SET = RTEMS.SIGNAL_17 or else 
-             THE_SIGNAL_SET = RTEMS.SIGNAL_18 + RTEMS.SIGNAL_19 then
-         NULL;
-
-      elsif THE_SIGNAL_SET = RTEMS.SIGNAL_0 or else 
-              THE_SIGNAL_SET = RTEMS.SIGNAL_1 then
-         TEXT_IO.PUT_LINE( "ASR - task_wake_after - yield processor" );
-         RTEMS.TASK_WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS );
-         TEST_SUPPORT.DIRECTIVE_FAILED( 
-            STATUS, 
-            "TASK_WAKE_AFTER YIELD"
-         );
-
-      elsif THE_SIGNAL_SET = RTEMS.SIGNAL_3 then
-
-         SPTEST.ASR_FIRED := TRUE;
-
-      end if;
-
-      TEXT_IO.PUT( "ASR - EXIT  - signal => " );
-      UNSIGNED32_IO.PUT( THE_SIGNAL_SET, BASE => 16, WIDTH => 8 );
-      TEXT_IO.NEW_LINE;
-
-   end PROCESS_ASR;
-      
-end SPTEST;
diff --git a/c/src/ada-tests/sptests/sp14/sptest.ads b/c/src/ada-tests/sptests/sp14/sptest.ads
deleted file mode 100644
index d44d9d1b9b..0000000000
--- a/c/src/ada-tests/sptests/sp14/sptest.ads
+++ /dev/null
@@ -1,131 +0,0 @@
---
---  SPTEST / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package is the specification for Test 14 of the RTEMS
---  Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-
-package SPTEST is
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS tasks created
---  by this test.
---
-
-   TASK_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 2 ) of RTEMS.ID;
-   TASK_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 2 ) of RTEMS.NAME;
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS timers created
---  by this test.
---
-
-   TIMER_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 2 ) of RTEMS.ID;
-   TIMER_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 2 ) of RTEMS.NAME;
-
---
---  SIGNAL_SENT is set to TRUE to indicate that a signal set has 
---  been sent from an ISR to the executing task.
---
-
-   SIGNAL_SENT : BOOLEAN;
-   pragma volatile( SIGNAL_SENT );
-
---
---  These hold the arguments passed to the timer service routine.
---
-
-   TIMER_GOT_THIS_ID      : RTEMS.ID;
-   pragma volatile( TIMER_GOT_THIS_ID );
-
-   TIMER_GOT_THIS_POINTER : RTEMS.ADDRESS;
-   pragma volatile( TIMER_GOT_THIS_POINTER );
-
---
---  ASR_FIRED is set to TRUE to indicate that the ASR has executed
---  and was passed the correct signal set.
---
-
-   ASR_FIRED : BOOLEAN;
-   pragma volatile( ASR_FIRED );
-
---
---  INIT
---
---  DESCRIPTION:
---
---  This RTEMS task initializes the application.
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  SIGNAL_3_TO_TASK_1
---
---  DESCRIPTION:
---
---  This subprogram sends signal 3 to TASK_1.
---
-
-   procedure SIGNAL_3_TO_TASK_1 (
-      ID      : in     RTEMS.ID;
-      POINTER : in     RTEMS.ADDRESS
-   );
-
---
---  PROCESS_ASR
---
---  DESCRIPTION:
---
---  This subprogram is an ASR for TASK_1.
---
-
-   procedure PROCESS_ASR (
-      THE_SIGNAL_SET : in     RTEMS.SIGNAL_SET
-   );
-
---
---  TASK_1
---
---  DESCRIPTION:
---
---  This RTEMS task tests the Signal Manager.
---
-
-   procedure TASK_1 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TASK_2
---
---  DESCRIPTION:
---
---  This RTEMS task tests the Signal Manager.
---
-
-   procedure TASK_2 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
-end SPTEST;
diff --git a/c/src/ada-tests/sptests/sp15/config.h b/c/src/ada-tests/sptests/sp15/config.h
deleted file mode 100644
index 8325035a0e..0000000000
--- a/c/src/ada-tests/sptests/sp15/config.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*  config.h
- *
- *  This include file defines the Configuration Table for this test.
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-/* configuration information */
-
-#define CONFIGURE_SPTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_MAXIMUM_PARTITIONS          2
-#define CONFIGURE_TICKS_PER_TIMESLICE       100
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#define CONFIGURE_MAXIMUM_POSIX_THREADS              10
-#define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
-#define CONFIGURE_MAXIMUM_POSIX_MUTEXES              20
-#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES  10
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/c/src/ada-tests/sptests/sp15/sp15.adb b/c/src/ada-tests/sptests/sp15/sp15.adb
deleted file mode 100644
index a848d60d0b..0000000000
--- a/c/src/ada-tests/sptests/sp15/sp15.adb
+++ /dev/null
@@ -1,57 +0,0 @@
---
---  MAIN / BODY
---
---  DESCRIPTION:
---
---  This is the entry point for Test SP15 of the Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-with SPTEST;
-with TEST_SUPPORT;
-
-procedure SP15 is
-  INIT_ID : RTEMS.ID;
-  STATUS  : RTEMS.STATUS_CODES;
-begin
-
-   RTEMS.TASK_CREATE(
-      RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
-      1,
-      RTEMS.MINIMUM_STACK_SIZE,
-      RTEMS.NO_PREEMPT,
-      RTEMS.DEFAULT_ATTRIBUTES,
-      INIT_ID,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
-
-
-   RTEMS.TASK_START(
-      INIT_ID,
-      SPTEST.INIT'ACCESS,
-      0,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
-
-   loop
-      delay 120.0;
-   end loop;
-
-end SP15;
-
diff --git a/c/src/ada-tests/sptests/sp15/sp15.scn b/c/src/ada-tests/sptests/sp15/sp15.scn
deleted file mode 100644
index a0aa0e8149..0000000000
--- a/c/src/ada-tests/sptests/sp15/sp15.scn
+++ /dev/null
@@ -1,16 +0,0 @@
-*** TEST 15 ***
-INIT - partition_create - partition 1
-INIT - partition_create - partition 2
-TA1 - partition_ident - partition 1 id = 16#10001#
-TA1 - partition_ident - partition 2 id = 16#10002#
-TA1 - partition_get_buffer - get buffer 1 from partition 1  -     16#0#
-TA1 - partition_get_buffer - get buffer 2 from partition 1  -   16#200#
-TA1 - partition_get_buffer - get buffer 1 from partition 2  -     16#0#
-TA1 - partition_get_buffer - get buffer 2 from partition 2  -    16#80#
-TA1 - partition_return_buffer - return buffer 1 to partition 1 -     16#0#
-TA1 - partition_return_buffer - return buffer 2 to partition 1 -   16#200#
-TA1 - partition_return_buffer - return buffer 1 to partition 2 -     16#0#
-TA1 - partition_return_buffer - return buffer 2 to partition 2 -    16#80#
-TA1 - partition_delete - delete partition 1
-TA1 - partition_delete - delete partition 2
-*** END OF TEST 15 ***
diff --git a/c/src/ada-tests/sptests/sp15/sptest.adb b/c/src/ada-tests/sptests/sp15/sptest.adb
deleted file mode 100644
index b4835c5210..0000000000
--- a/c/src/ada-tests/sptests/sp15/sptest.adb
+++ /dev/null
@@ -1,284 +0,0 @@
---
---  SPTEST / BODY
---
---  DESCRIPTION:
---
---  This package is the implementation of Test 15 of the RTEMS
---  Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with INTERFACES; use INTERFACES;
-with RTEMS;
-with TEST_SUPPORT;
-with TEXT_IO;
-with UNSIGNED32_IO;
-
-package body SPTEST is
-
---PAGE
--- 
---  INIT
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** TEST 15 ***" );
-
-      SPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME(  'T', 'A', '1', ' ' );
-
-      SPTEST.PARTITION_NAME( 1 ) := RTEMS.BUILD_NAME(  'P', 'T', '1', ' ' );
-      SPTEST.PARTITION_NAME( 2 ) := RTEMS.BUILD_NAME(  'P', 'T', '2', ' ' );
-
-      RTEMS.TASK_CREATE( 
-         SPTEST.TASK_NAME( 1 ), 
-         4, 
-         2048, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.TASK_ID( 1 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA1" );
-
-      RTEMS.TASK_START(
-         SPTEST.TASK_ID( 1 ),
-         SPTEST.TASK_1'ACCESS,
-         0,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA1" );
-
-      TEXT_IO.PUT_LINE( "INIT - partition_create - partition 1" );
-      RTEMS.PARTITION_CREATE(
-         SPTEST.PARTITION_NAME( 1 ),
-         AREA_1'ADDRESS,
-         4096,
-         512,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.PARTITION_ID( 1 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "PARTITION_CREATE OF PT1" );
-
-      TEXT_IO.PUT_LINE( "INIT - partition_create - partition 2" );
-      RTEMS.PARTITION_CREATE(
-         SPTEST.PARTITION_NAME( 2 ),
-         AREA_2'ADDRESS,
-         274,
-         128,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.PARTITION_ID( 2 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "PARTITION_CREATE OF PT2" );
-
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
-
-   end INIT;
-
---PAGE
--- 
---  PUT_ADDRESS_FROM_AREA_1
---
-
-   procedure PUT_ADDRESS_FROM_AREA_1 (
-      TO_BE_PRINTED : in     RTEMS.ADDRESS
-   ) is
-
-   begin
-
-      UNSIGNED32_IO.PUT(
-         RTEMS.SUBTRACT( TO_BE_PRINTED, SPTEST.AREA_1'ADDRESS ),
-         WIDTH => 8,
-         BASE => 16
-      );
-
-   end PUT_ADDRESS_FROM_AREA_1;
-
---PAGE
--- 
---  PUT_ADDRESS_FROM_AREA_2
---
-
-   procedure PUT_ADDRESS_FROM_AREA_2 (
-      TO_BE_PRINTED : in     RTEMS.ADDRESS
-   ) is
-   begin
-
-      UNSIGNED32_IO.PUT(
-         RTEMS.SUBTRACT( TO_BE_PRINTED, SPTEST.AREA_2'ADDRESS ),
-         WIDTH => 8,
-         BASE => 16
-      );
-
-   end PUT_ADDRESS_FROM_AREA_2;
-
---PAGE
--- 
---  TASK_1
---
-
-   procedure TASK_1 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      PTID_1           : RTEMS.ID;
-      PTID_2           : RTEMS.ID;
-      BUFFER_ADDRESS_1 : RTEMS.ADDRESS;
-      BUFFER_ADDRESS_2 : RTEMS.ADDRESS;
-      BUFFER_ADDRESS_3 : RTEMS.ADDRESS;
-      BUFFER_ADDRESS_4 : RTEMS.ADDRESS;
-      STATUS           : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.PUT( "TA1 - partition_ident - partition 1 id = " );
-      RTEMS.PARTITION_IDENT( 
-         SPTEST.PARTITION_NAME( 1 ), 
-         RTEMS.SEARCH_ALL_NODES, 
-         PTID_1, 
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "PARTITION_IDENT OF PT1" );
-      UNSIGNED32_IO.PUT( PTID_1, WIDTH => 8, BASE => 16 );
-      TEXT_IO.NEW_LINE;
-   
-      TEXT_IO.PUT( "TA1 - partition_ident - partition 2 id = " );
-      RTEMS.PARTITION_IDENT( 
-         SPTEST.PARTITION_NAME( 2 ), 
-         RTEMS.SEARCH_ALL_NODES, 
-         PTID_2, 
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "PARTITION_IDENT OF PT2" );
-      UNSIGNED32_IO.PUT( PTID_2, WIDTH => 8, BASE => 16 );
-      TEXT_IO.NEW_LINE;
-
-      TEXT_IO.PUT(
-         "TA1 - partition_get_buffer - get buffer 1 from partition 1 - "
-      );
-      RTEMS.PARTITION_GET_BUFFER( 
-         SPTEST.PARTITION_ID( 1 ), 
-         BUFFER_ADDRESS_1,
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "PARTITION_GET_BUFFER" );
-      SPTEST.PUT_ADDRESS_FROM_AREA_1( BUFFER_ADDRESS_1 );
-      TEXT_IO.NEW_LINE;
-      
-      TEXT_IO.PUT(
-         "TA1 - partition_get_buffer - get buffer 2 from partition 1 - "
-      );
-      RTEMS.PARTITION_GET_BUFFER( 
-         SPTEST.PARTITION_ID( 1 ), 
-         BUFFER_ADDRESS_2,
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "PARTITION_GET_BUFFER" );
-      SPTEST.PUT_ADDRESS_FROM_AREA_1( BUFFER_ADDRESS_2 );
-      TEXT_IO.NEW_LINE;
-      
-      TEXT_IO.PUT(
-         "TA1 - partition_get_buffer - get buffer 1 from partition 2 - "
-      );
-      RTEMS.PARTITION_GET_BUFFER( 
-         SPTEST.PARTITION_ID( 2 ), 
-         BUFFER_ADDRESS_3,
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "PARTITION_GET_BUFFER" );
-      SPTEST.PUT_ADDRESS_FROM_AREA_2( BUFFER_ADDRESS_3 );
-      TEXT_IO.NEW_LINE;
-      
-      TEXT_IO.PUT(
-         "TA1 - partition_get_buffer - get buffer 2 from partition 2 - "
-      );
-      RTEMS.PARTITION_GET_BUFFER( 
-         SPTEST.PARTITION_ID( 2 ), 
-         BUFFER_ADDRESS_4,
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "PARTITION_GET_BUFFER" );
-      SPTEST.PUT_ADDRESS_FROM_AREA_2( BUFFER_ADDRESS_4 );
-      TEXT_IO.NEW_LINE;
-
-      TEXT_IO.PUT(
-         "TA1 - partition_return_buffer - return buffer 1 to partition 1 - "
-      );
-      SPTEST.PUT_ADDRESS_FROM_AREA_1( BUFFER_ADDRESS_1 );
-      TEXT_IO.NEW_LINE;
-      RTEMS.PARTITION_RETURN_BUFFER( 
-         SPTEST.PARTITION_ID( 1 ), 
-         BUFFER_ADDRESS_1,
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "PARTITION_RETURN_BUFFER" );
- 
-      TEXT_IO.PUT(
-         "TA1 - partition_return_buffer - return buffer 2 to partition 1 - "
-      );
-      SPTEST.PUT_ADDRESS_FROM_AREA_1( BUFFER_ADDRESS_2 );
-      TEXT_IO.NEW_LINE;
-      RTEMS.PARTITION_RETURN_BUFFER( 
-         SPTEST.PARTITION_ID( 1 ), 
-         BUFFER_ADDRESS_2,
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "PARTITION_RETURN_BUFFER" );
- 
-      TEXT_IO.PUT(
-         "TA1 - partition_return_buffer - return buffer 1 to partition 2 - "
-      );
-      SPTEST.PUT_ADDRESS_FROM_AREA_2( BUFFER_ADDRESS_3 );
-      TEXT_IO.NEW_LINE;
-      RTEMS.PARTITION_RETURN_BUFFER( 
-         SPTEST.PARTITION_ID( 2 ), 
-         BUFFER_ADDRESS_3,
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "PARTITION_RETURN_BUFFER" );
- 
-      TEXT_IO.PUT(
-         "TA1 - partition_return_buffer - return buffer 2 to partition 2 - "
-      );
-      SPTEST.PUT_ADDRESS_FROM_AREA_2( BUFFER_ADDRESS_4 );
-      TEXT_IO.NEW_LINE;
-      RTEMS.PARTITION_RETURN_BUFFER( 
-         SPTEST.PARTITION_ID( 2 ), 
-         BUFFER_ADDRESS_4,
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "PARTITION_RETURN_BUFFER" );
- 
-      TEXT_IO.PUT_LINE( "TA1 - partition_delete - delete partition 1" );
-      RTEMS.PARTITION_DELETE( SPTEST.PARTITION_ID( 1 ), STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "PARTITION_DELETE OF SELF" );
-
-      TEXT_IO.PUT_LINE( "TA1 - partition_delete - delete partition 2" );
-      RTEMS.PARTITION_DELETE( SPTEST.PARTITION_ID( 2 ), STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "PARTITION_DELETE OF SELF" );
-
-      TEXT_IO.PUT_LINE( "*** END OF TEST 15 ***" );
-      RTEMS.SHUTDOWN_EXECUTIVE( 0 );
-   
-   end TASK_1;
-
-end SPTEST;
diff --git a/c/src/ada-tests/sptests/sp15/sptest.ads b/c/src/ada-tests/sptests/sp15/sptest.ads
deleted file mode 100644
index ea22067451..0000000000
--- a/c/src/ada-tests/sptests/sp15/sptest.ads
+++ /dev/null
@@ -1,118 +0,0 @@
---
---  SPTEST / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package is the specification for Test 15 of the RTEMS
---  Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-
-package SPTEST is
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS tasks created
---  by this test.
---
-
-   TASK_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.ID;
-   TASK_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.NAME;
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS partitions created
---  by this test.
---
-
-   PARTITION_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.ID;
-   PARTITION_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.NAME;
-
---
---  These arrays define the memory areas used for the partitions in
---  this test.
---
-
-   AREA_1 : array ( RTEMS.UNSIGNED32 range 0 .. 4095 ) of RTEMS.UNSIGNED8;
-   for AREA_1'ALIGNMENT use RTEMS.STRUCTURE_ALIGNMENT;
-
-   AREA_2 : array ( RTEMS.UNSIGNED32 range 0 ..  273 ) of RTEMS.UNSIGNED8;
-   for AREA_2'ALIGNMENT use RTEMS.STRUCTURE_ALIGNMENT;
-
-
---
---  INIT
---
---  DESCRIPTION:
---
---  This RTEMS task initializes the application.
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  PUT_ADDRESS_FROM_AREA_1
---
---  DESCRIPTION:
---
---  This subpgram prints the offset of the address TO_BE_PRINTED 
---  from the first byte of AREA_1.
---
---  NOTE:
---
---  This subprogram is used because the actual address of AREA_1
---  varies based upon the size of the executable, the target board,
---  and the target processor.
---
-
-   procedure PUT_ADDRESS_FROM_AREA_1 (
-      TO_BE_PRINTED : in     RTEMS.ADDRESS
-   );
-
---
---  PUT_ADDRESS_FROM_AREA_2
---
---  DESCRIPTION:
---
---  This subprogram prints the offset of the address TO_BE_PRINTED 
---  from the first byte of AREA_2.
---
---  NOTE:
---
---  This subprogram is used because the actual address of AREA_1
---  varies based upon the size of the executable, the target board,
---  and the target processor.
---
-
-   procedure PUT_ADDRESS_FROM_AREA_2 (
-      TO_BE_PRINTED : in     RTEMS.ADDRESS
-   );
-
---
---  TASK_1
---
---  DESCRIPTION:
---
---  This RTEMS task tests the Partition Manager.
---
-
-   procedure TASK_1 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
-end SPTEST;
diff --git a/c/src/ada-tests/sptests/sp16/config.h b/c/src/ada-tests/sptests/sp16/config.h
deleted file mode 100644
index af594bd808..0000000000
--- a/c/src/ada-tests/sptests/sp16/config.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*  config.h
- *
- *  This include file defines the Configuration Table for this test.
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-/* configuration information */
-
-#define CONFIGURE_SPTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_MAXIMUM_REGIONS             4
-#define CONFIGURE_TICKS_PER_TIMESLICE       100
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#define CONFIGURE_MAXIMUM_POSIX_THREADS              10
-#define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
-#define CONFIGURE_MAXIMUM_POSIX_MUTEXES              20
-#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES  10
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/c/src/ada-tests/sptests/sp16/sp16.adb b/c/src/ada-tests/sptests/sp16/sp16.adb
deleted file mode 100644
index cbdc6008ac..0000000000
--- a/c/src/ada-tests/sptests/sp16/sp16.adb
+++ /dev/null
@@ -1,57 +0,0 @@
---
---  MAIN / BODY
---
---  DESCRIPTION:
---
---  This is the entry point for Test SP16 of the Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-with SPTEST;
-with TEST_SUPPORT;
-
-procedure SP16 is
-  INIT_ID : RTEMS.ID;
-  STATUS  : RTEMS.STATUS_CODES;
-begin
-
-   RTEMS.TASK_CREATE(
-      RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
-      1,
-      RTEMS.MINIMUM_STACK_SIZE,
-      RTEMS.NO_PREEMPT,
-      RTEMS.DEFAULT_ATTRIBUTES,
-      INIT_ID,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
-
-
-   RTEMS.TASK_START(
-      INIT_ID,
-      SPTEST.INIT'ACCESS,
-      0,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
-
-   loop
-      delay 120.0;
-   end loop;
-
-end SP16;
-
diff --git a/c/src/ada-tests/sptests/sp16/sp16.scn b/c/src/ada-tests/sptests/sp16/sp16.scn
deleted file mode 100644
index 4706729d3d..0000000000
--- a/c/src/ada-tests/sptests/sp16/sp16.scn
+++ /dev/null
@@ -1,48 +0,0 @@
-*** TEST 16 ***
-TA1 - region_ident - rnid => 16#10001#
-TA1 - region_get_segment - wait on 100 byte segment from region 2
-TA1 - got segment from region 2 - 16#F78#
-TA1 - region_get_segment - wait on 3K segment from region 3
-TA1 - got segment from region 3 - 16#3F8#
-TA1 - region_get_segment - get 3080 byte segment from region 1 - NO_WAIT
-TA1 - got segment from region 1 - 16#378#
-TA1 - task_wake_after - yield processor
-TA2 - region_get_segment - wait on 2K segment from region 1
-TA3 - region_get_segment - wait on 3968 byte segment from region 2
-<pause>
-TA1 - region_return_segment - return segment to region 1 - 16#378#
-TA1 - region_get_segment - wait 10 seconds for 3K segment from region 1
-TA2 - got segment from region 1 - 16#7F8#
-TA2 - region_return_segment - return segment to region 1 - 16#7F8#
-TA2 - task_set_priority - make self highest priority task
-TA2 - region_get_segment - wait on 3968 byte segment from region 2
-TA1 - got segment from region 1 - 16#3F8#
-TA1 - region_return_segment - return segment to region 2 - 16#F78#
-TA2 - got segment from region 2 - 16#8#
-TA2 - region_return_segment - return segment to region 2 - 16#8#
-TA2 - task_delete - delete self
-TA1 - task_wake_after - yield processor
-TA3 - got segment from region 2 - 16#8#
-TA3 - region_get_segment - wait on 2K segment from region 3
-TA1 - task_delete - delete TA3
-<pause>
-TA1 - task_wake_after - yield processor
-TA4 - region_get_segment - wait on 1.5K segment from region 1
-TA5 - region_get_segment - wait on 1.5K segment from region 1
-TA1 - region_return_segment - return segment to region 1 - 16#3F8#
-TA1 - task_wake_after - yield processor
-TA4 - got and returned 16#9F8#
-TA5 - got and returned 16#3F0#
-TA1 - region_get_segment - wait 10 seconds for 3K segment from region 1
-TA1 - got segment from region 1 - 16#3F8#
-TA1 - task_wake_after - sleep 1 second
-TA4 - region_get_segment - wait on 3K segment from region 1
-TA5 - region_get_segment - wait on 3K segment from region 1
-TA1 - task_delete - delete TA4
-TA1 - region_return_segment - return segment to region 1 - 16#3F8#
-TA1 - task_wake_after - yield processor
-TA5 - got segment from region 1 - 16#3F8#
-TA5 - region_return_segment - return segment to region 1 - 16#3F8#
-TA5 - task_delete - delete self
-TA1 - region_delete - delete region 1
-*** END OF TEST 16 ***
diff --git a/c/src/ada-tests/sptests/sp16/sptest.adb b/c/src/ada-tests/sptests/sp16/sptest.adb
deleted file mode 100644
index cfec98d82c..0000000000
--- a/c/src/ada-tests/sptests/sp16/sptest.adb
+++ /dev/null
@@ -1,686 +0,0 @@
---
---  SPTEST / BODY
---
---  DESCRIPTION:
---
---  This package is the implementation of Test 16 of the RTEMS
---  Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with INTERFACES; use INTERFACES;
-with RTEMS;
-with TEST_SUPPORT;
-with TEXT_IO;
-with UNSIGNED32_IO;
-
-package body SPTEST is
-
---PAGE
--- 
---  INIT
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** TEST 16 ***" );
-
-      SPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME(  'T', 'A', '1', ' ' );
-      SPTEST.TASK_NAME( 2 ) := RTEMS.BUILD_NAME(  'T', 'A', '2', ' ' );
-      SPTEST.TASK_NAME( 3 ) := RTEMS.BUILD_NAME(  'T', 'A', '3', ' ' );
-      SPTEST.TASK_NAME( 4 ) := RTEMS.BUILD_NAME(  'T', 'A', '4', ' ' );
-      SPTEST.TASK_NAME( 5 ) := RTEMS.BUILD_NAME(  'T', 'A', '5', ' ' );
-
-      RTEMS.TASK_CREATE( 
-         SPTEST.TASK_NAME( 1 ), 
-         SPTEST.BASE_PRIORITY, 
-         2048, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.TASK_ID( 1 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA1" );
-
-      RTEMS.TASK_CREATE( 
-         SPTEST.TASK_NAME( 2 ), 
-         SPTEST.BASE_PRIORITY, 
-         2048, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.TASK_ID( 2 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA2" );
-
-      RTEMS.TASK_CREATE( 
-         SPTEST.TASK_NAME( 3 ), 
-         SPTEST.BASE_PRIORITY, 
-         2048, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.TASK_ID( 3 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA3" );
-
-      RTEMS.TASK_START(
-         SPTEST.TASK_ID( 1 ),
-         SPTEST.TASK_1'ACCESS,
-         0,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA1" );
-
-      RTEMS.TASK_START(
-         SPTEST.TASK_ID( 2 ),
-         SPTEST.TASK_2'ACCESS,
-         0,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA2" );
-
-      RTEMS.TASK_START(
-         SPTEST.TASK_ID( 3 ),
-         SPTEST.TASK_3'ACCESS,
-         0,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA3" );
-
-      SPTEST.REGION_NAME( 1 ) := RTEMS.BUILD_NAME(  'R', 'N', '1', ' ' );
-      SPTEST.REGION_NAME( 2 ) := RTEMS.BUILD_NAME(  'R', 'N', '1', ' ' );
-      SPTEST.REGION_NAME( 3 ) := RTEMS.BUILD_NAME(  'R', 'N', '1', ' ' );
-
-      RTEMS.REGION_CREATE(
-         SPTEST.REGION_NAME( 1 ), 
-         SPTEST.AREA_1'ADDRESS,
-         4096, 
-         128,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.REGION_ID( 1 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_CREATE OF RN1" );
-
-      RTEMS.REGION_CREATE(
-         SPTEST.REGION_NAME( 2 ), 
-         SPTEST.AREA_2'ADDRESS,
-         4096, 
-         128,
-         RTEMS.PRIORITY,
-         SPTEST.REGION_ID( 2 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_CREATE OF RN2" );
-
-      RTEMS.REGION_CREATE(
-         SPTEST.REGION_NAME( 3 ), 
-         SPTEST.AREA_3'ADDRESS,
-         4096, 
-         128,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.REGION_ID( 3 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_CREATE OF RN3" );
-
- 
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
-
-   end INIT;
-
---PAGE
--- 
---  PUT_ADDRESS_FROM_AREA_1
---
-
-   procedure PUT_ADDRESS_FROM_AREA_1 (
-      TO_BE_PRINTED : in     RTEMS.ADDRESS
-   ) is
-
-   begin
-
-      UNSIGNED32_IO.PUT(
-         RTEMS.SUBTRACT( TO_BE_PRINTED, SPTEST.AREA_1'ADDRESS ),
-         WIDTH => 8,
-         BASE => 16
-      );
-
-   end PUT_ADDRESS_FROM_AREA_1;
-
---PAGE
--- 
---  PUT_ADDRESS_FROM_AREA_2
---
-
-   procedure PUT_ADDRESS_FROM_AREA_2 (
-      TO_BE_PRINTED : in     RTEMS.ADDRESS
-   ) is
-   begin
-
-      UNSIGNED32_IO.PUT(
-         RTEMS.SUBTRACT( TO_BE_PRINTED, SPTEST.AREA_2'ADDRESS ),
-         WIDTH => 8,
-         BASE => 16
-      );
-
-   end PUT_ADDRESS_FROM_AREA_2;
-
---PAGE
--- 
---  PUT_ADDRESS_FROM_AREA_3
---
-
-   procedure PUT_ADDRESS_FROM_AREA_3 (
-      TO_BE_PRINTED : in     RTEMS.ADDRESS
-   ) is
-   begin
-
-      UNSIGNED32_IO.PUT(
-         RTEMS.SUBTRACT( TO_BE_PRINTED, SPTEST.AREA_3'ADDRESS ),
-         WIDTH => 8,
-         BASE => 16
-      );
-
-   end PUT_ADDRESS_FROM_AREA_3;
-
---PAGE
--- 
---  TASK_1
---
-
-   procedure TASK_1 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      RNID              : RTEMS.ID;
-      SEGMENT_ADDRESS_1 : RTEMS.ADDRESS;
-      SEGMENT_ADDRESS_2 : RTEMS.ADDRESS;
-      SEGMENT_ADDRESS_3 : RTEMS.ADDRESS;
-      SEGMENT_ADDRESS_4 : RTEMS.ADDRESS;
-      STATUS            : RTEMS.STATUS_CODES;
-   begin
-
-      RTEMS.REGION_IDENT( SPTEST.REGION_NAME( 1 ), RNID, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_IDENT OF RN1" );
-      TEXT_IO.PUT( "TA1 - region_ident - rnid => " );
-      UNSIGNED32_IO.PUT( RNID, WIDTH => 8, BASE => 16 );
-      TEXT_IO.NEW_LINE;
-       
-      TEXT_IO.PUT( "TA1 - region_get_segment - wait on " );
-      TEXT_IO.PUT_LINE( "100 byte segment from region 2" );
-      RTEMS.REGION_GET_SEGMENT(
-         SPTEST.REGION_ID( 2 ),
-         100,
-         RTEMS.DEFAULT_OPTIONS,
-         RTEMS.NO_TIMEOUT,
-         SEGMENT_ADDRESS_1,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_GET_SEGMENT" );
-      TEXT_IO.PUT( "TA1 - got segment from region 2 - " );
-      SPTEST.PUT_ADDRESS_FROM_AREA_2( SEGMENT_ADDRESS_1 );
-      TEXT_IO.NEW_LINE;
-
-      TEXT_IO.PUT( "TA1 - region_get_segment - wait on " );
-      TEXT_IO.PUT_LINE( "3K segment from region 3" );
-      RTEMS.REGION_GET_SEGMENT(
-         SPTEST.REGION_ID( 3 ),
-         3072,
-         RTEMS.DEFAULT_OPTIONS,
-         RTEMS.NO_TIMEOUT,
-         SEGMENT_ADDRESS_2,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_GET_SEGMENT" );
-      TEXT_IO.PUT( "TA1 - got segment from region 3 - " );
-      SPTEST.PUT_ADDRESS_FROM_AREA_3( SEGMENT_ADDRESS_2 );
-      TEXT_IO.NEW_LINE;
-
-      TEXT_IO.PUT( "TA1 - region_get_segment - get 3080 byte segment " );
-      TEXT_IO.PUT_LINE( "from region 1 - NO_WAIT" );
-      RTEMS.REGION_GET_SEGMENT(
-         SPTEST.REGION_ID( 1 ),
-         3080,
-         RTEMS.NO_WAIT,
-         RTEMS.NO_TIMEOUT,
-         SEGMENT_ADDRESS_3,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_GET_SEGMENT" );
-      TEXT_IO.PUT( "TA1 - got segment from region 1 - " );
-      SPTEST.PUT_ADDRESS_FROM_AREA_1( SEGMENT_ADDRESS_3 );
-      TEXT_IO.NEW_LINE;
-
-      TEXT_IO.PUT_LINE( "TA1 - task_wake_after - yield processor" );
-      RTEMS.TASK_WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
-   
-TEST_SUPPORT.PAUSE;
-
-      TEXT_IO.PUT( 
-         "TA1 - region_return_segment - return segment to region 1 - "
-      );
-      SPTEST.PUT_ADDRESS_FROM_AREA_1( SEGMENT_ADDRESS_3 );
-      RTEMS.REGION_RETURN_SEGMENT(
-         SPTEST.REGION_ID( 1 ),
-         SEGMENT_ADDRESS_3,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_RETURN_SEGMENT" );
-      TEXT_IO.NEW_LINE;
-
-      TEXT_IO.PUT( "TA1 - region_get_segment - wait 10 seconds for 3K " );
-      TEXT_IO.PUT_LINE( "segment from region 1" );
-      RTEMS.REGION_GET_SEGMENT(
-         SPTEST.REGION_ID( 1 ),
-         3072,
-         RTEMS.DEFAULT_OPTIONS,
-         10 * TEST_SUPPORT.TICKS_PER_SECOND,
-         SEGMENT_ADDRESS_4,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_GET_SEGMENT" );
-      TEXT_IO.PUT( "TA1 - got segment from region 1 - " );
-      SPTEST.PUT_ADDRESS_FROM_AREA_1( SEGMENT_ADDRESS_4 );
-      TEXT_IO.NEW_LINE;
-
-      TEXT_IO.PUT( 
-         "TA1 - region_return_segment - return segment to region 2 - "
-      );
-      SPTEST.PUT_ADDRESS_FROM_AREA_2( SEGMENT_ADDRESS_1 );
-      TEXT_IO.NEW_LINE;
-      RTEMS.REGION_RETURN_SEGMENT(
-         SPTEST.REGION_ID( 2 ),
-         SEGMENT_ADDRESS_1,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_RETURN_SEGMENT" );
-
-      TEXT_IO.PUT_LINE( "TA1 - task_wake_after - yield processor" );
-      RTEMS.TASK_WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
-   
-      TEXT_IO.PUT_LINE( "TA1 - task_delete - delete TA3" );
-      RTEMS.TASK_DELETE( SPTEST.TASK_ID( 3 ), STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF TA3" );
-
-TEST_SUPPORT.PAUSE;
-
-      RTEMS.TASK_CREATE( 
-         SPTEST.TASK_NAME( 4 ), 
-         SPTEST.BASE_PRIORITY, 
-         2048, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.TASK_ID( 4 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA4" );
-
-      RTEMS.TASK_CREATE( 
-         SPTEST.TASK_NAME( 5 ), 
-         SPTEST.BASE_PRIORITY, 
-         2048, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.TASK_ID( 5 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA5" );
-
-      RTEMS.TASK_START(
-         SPTEST.TASK_ID( 4 ),
-         SPTEST.TASK_4'ACCESS,
-         0,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA4" );
-
-      RTEMS.TASK_START(
-         SPTEST.TASK_ID( 5 ),
-         SPTEST.TASK_5'ACCESS,
-         0,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA5" );
-
-      TEXT_IO.PUT_LINE( "TA1 - task_wake_after - yield processor" );
-      RTEMS.TASK_WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
-          
-      TEXT_IO.PUT( 
-         "TA1 - region_return_segment - return segment to region 1 - " 
-      );
-      SPTEST.PUT_ADDRESS_FROM_AREA_1( SEGMENT_ADDRESS_4 );
-      RTEMS.REGION_RETURN_SEGMENT(
-         SPTEST.REGION_ID( 1 ),
-         SEGMENT_ADDRESS_4,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_RETURN_SEGMENT" );
-      TEXT_IO.NEW_LINE;
-
-      TEXT_IO.PUT_LINE( "TA1 - task_wake_after - yield processor" );
-      RTEMS.TASK_WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
-   
-      TEXT_IO.PUT( "TA1 - region_get_segment - wait 10 seconds for 3K " );
-      TEXT_IO.PUT_LINE( "segment from region 1" );
-      RTEMS.REGION_GET_SEGMENT(
-         SPTEST.REGION_ID( 1 ),
-         3072,
-         RTEMS.DEFAULT_OPTIONS,
-         10 * TEST_SUPPORT.TICKS_PER_SECOND,
-         SEGMENT_ADDRESS_4,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_GET_SEGMENT" );
-      TEXT_IO.PUT( "TA1 - got segment from region 1 - " );
-      SPTEST.PUT_ADDRESS_FROM_AREA_1( SEGMENT_ADDRESS_4 );
-      TEXT_IO.NEW_LINE;
-
-      TEXT_IO.PUT_LINE( "TA1 - task_wake_after - sleep 1 second" );
-      RTEMS.TASK_WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
-   
-      TEXT_IO.PUT_LINE( "TA1 - task_delete - delete TA4" );
-      RTEMS.TASK_DELETE( SPTEST.TASK_ID( 4 ), STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF TA4" );
-
-      TEXT_IO.PUT( 
-         "TA1 - region_return_segment - return segment to region 1 - " 
-      );
-      SPTEST.PUT_ADDRESS_FROM_AREA_1( SEGMENT_ADDRESS_4 );
-      RTEMS.REGION_RETURN_SEGMENT(
-         SPTEST.REGION_ID( 1 ),
-         SEGMENT_ADDRESS_4,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_RETURN_SEGMENT" );
-      TEXT_IO.NEW_LINE;
-
-      TEXT_IO.PUT_LINE( "TA1 - task_wake_after - yield processor" );
-      RTEMS.TASK_WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
-   
-      TEXT_IO.PUT_LINE( "TA1 - region_delete - delete region 1" );
-      RTEMS.REGION_DELETE( SPTEST.REGION_ID( 1 ), STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_DELETE OF RN1" );
-
-      TEXT_IO.PUT_LINE( "*** END OF TEST 16 ***" );
-      RTEMS.SHUTDOWN_EXECUTIVE( 0 );
-
-   end TASK_1;
-
---PAGE
--- 
---  TASK_2
---
-
-   procedure TASK_2 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      PREVIOUS_PRIORITY : RTEMS.TASK_PRIORITY;
-      SEGMENT_ADDRESS_1 : RTEMS.ADDRESS;
-      SEGMENT_ADDRESS_2 : RTEMS.ADDRESS;
-      STATUS            : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.PUT( "TA2 - region_get_segment - wait on 2K segment " );
-      TEXT_IO.PUT_LINE( "from region 1" );
-      RTEMS.REGION_GET_SEGMENT(
-         SPTEST.REGION_ID( 1 ),
-         2048,
-         RTEMS.DEFAULT_OPTIONS,
-         RTEMS.NO_TIMEOUT,
-         SEGMENT_ADDRESS_1,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_GET_SEGMENT" );
-      TEXT_IO.PUT( "TA2 - got segment from region 1 - " );
-      SPTEST.PUT_ADDRESS_FROM_AREA_1( SEGMENT_ADDRESS_1 );
-      TEXT_IO.NEW_LINE;
-
-      TEXT_IO.PUT( 
-         "TA2 - region_return_segment - return segment to region 1 - "
-      );
-      SPTEST.PUT_ADDRESS_FROM_AREA_1( SEGMENT_ADDRESS_1 );
-      RTEMS.REGION_RETURN_SEGMENT(
-         SPTEST.REGION_ID( 1 ),
-         SEGMENT_ADDRESS_1,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_RETURN_SEGMENT" );
-      TEXT_IO.NEW_LINE;
-
-      TEXT_IO.PUT( "TA2 - task_set_priority - make self " );
-      TEXT_IO.PUT_LINE( "highest priority task" );
-      RTEMS.TASK_SET_PRIORITY(
-         RTEMS.SELF,
-         SPTEST.BASE_PRIORITY - 1,
-         PREVIOUS_PRIORITY,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SET_PRIORITY" );
-
-      TEXT_IO.PUT( 
-         "TA2 - region_get_segment - wait on 3968 byte segment "
-      );
-      TEXT_IO.PUT_LINE( "from region 2" );
-      RTEMS.REGION_GET_SEGMENT(
-         SPTEST.REGION_ID( 2 ),
-         3968,
-         RTEMS.DEFAULT_OPTIONS,
-         RTEMS.NO_TIMEOUT,
-         SEGMENT_ADDRESS_2,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_GET_SEGMENT" );
-      TEXT_IO.PUT( "TA2 - got segment from region 2 - " );
-      SPTEST.PUT_ADDRESS_FROM_AREA_2( SEGMENT_ADDRESS_2 );
-      TEXT_IO.NEW_LINE;
-
-      TEXT_IO.PUT( 
-         "TA2 - region_return_segment - return segment to region 2 - " 
-      );
-      SPTEST.PUT_ADDRESS_FROM_AREA_2( SEGMENT_ADDRESS_2 );
-      RTEMS.REGION_RETURN_SEGMENT(
-         SPTEST.REGION_ID( 2 ),
-         SEGMENT_ADDRESS_2,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_RETURN_SEGMENT" );
-      TEXT_IO.NEW_LINE;
-
-      TEXT_IO.PUT_LINE( "TA2 - task_delete - delete self" );
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF TA2" );
-
-   end TASK_2;
-
---PAGE
--- 
---  TASK_3
---
-
-   procedure TASK_3 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      SEGMENT_ADDRESS_1 : RTEMS.ADDRESS;
-      SEGMENT_ADDRESS_2 : RTEMS.ADDRESS;
-      STATUS            : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.PUT( "TA3 - region_get_segment - wait on 3968 byte segment " );
-      TEXT_IO.PUT_LINE( "from region 2" );
-      RTEMS.REGION_GET_SEGMENT(
-         SPTEST.REGION_ID( 2 ),
-         3968,
-         RTEMS.DEFAULT_OPTIONS,
-         RTEMS.NO_TIMEOUT,
-         SEGMENT_ADDRESS_1,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_GET_SEGMENT" );
-      TEXT_IO.PUT( "TA3 - got segment from region 2 - " );
-      SPTEST.PUT_ADDRESS_FROM_AREA_2( SEGMENT_ADDRESS_1 );
-      TEXT_IO.NEW_LINE;
-
-      TEXT_IO.PUT( "TA3 - region_get_segment - wait on 2K segment " );
-      TEXT_IO.PUT_LINE( "from region 3" );
-      RTEMS.REGION_GET_SEGMENT(
-         SPTEST.REGION_ID( 3 ),
-         2048,
-         RTEMS.DEFAULT_OPTIONS,
-         RTEMS.NO_TIMEOUT,
-         SEGMENT_ADDRESS_2,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_GET_SEGMENT" );
-
-   end TASK_3;
-
---PAGE
--- 
---  TASK_4
---
-
-   procedure TASK_4 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      SEGMENT_ADDRESS_1 : RTEMS.ADDRESS;
-      SEGMENT_ADDRESS_2 : RTEMS.ADDRESS;
-      STATUS            : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.PUT( "TA4 - region_get_segment - wait on 1.5K segment " );
-      TEXT_IO.PUT_LINE( "from region 1" );
-      RTEMS.REGION_GET_SEGMENT(
-         SPTEST.REGION_ID( 1 ),
-         1536,
-         RTEMS.DEFAULT_OPTIONS,
-         RTEMS.NO_TIMEOUT,
-         SEGMENT_ADDRESS_1,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_GET_SEGMENT" );
-
-      RTEMS.REGION_RETURN_SEGMENT(
-         SPTEST.REGION_ID( 1 ),
-         SEGMENT_ADDRESS_1,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_RETURN_SEGMENT" );
-      TEXT_IO.PUT( "TA4 - got and returned " );
-      SPTEST.PUT_ADDRESS_FROM_AREA_1( SEGMENT_ADDRESS_1 );
-      TEXT_IO.NEW_LINE;
-
-      RTEMS.TASK_WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
-
-      TEXT_IO.PUT( "TA4 - region_get_segment - wait on 3K segment " );
-      TEXT_IO.PUT_LINE( "from region 1" );
-      RTEMS.REGION_GET_SEGMENT(
-         SPTEST.REGION_ID( 1 ),
-         3072,
-         RTEMS.DEFAULT_OPTIONS,
-         RTEMS.NO_TIMEOUT,
-         SEGMENT_ADDRESS_2,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_GET_SEGMENT" );
-
-   end TASK_4;
-
---PAGE
--- 
---  TASK_5
---
-
-   procedure TASK_5 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      SEGMENT_ADDRESS_1 : RTEMS.ADDRESS;
-      SEGMENT_ADDRESS_2 : RTEMS.ADDRESS;
-      STATUS            : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.PUT( "TA5 - region_get_segment - wait on 1.5K segment " );
-      TEXT_IO.PUT_LINE( "from region 1" );
-      RTEMS.REGION_GET_SEGMENT(
-         SPTEST.REGION_ID( 1 ),
-         1536,
-         RTEMS.DEFAULT_OPTIONS,
-         RTEMS.NO_TIMEOUT,
-         SEGMENT_ADDRESS_1,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_GET_SEGMENT" );
-
-      RTEMS.REGION_RETURN_SEGMENT(
-         SPTEST.REGION_ID( 1 ),
-         SEGMENT_ADDRESS_1,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_RETURN_SEGMENT" );
-      TEXT_IO.PUT( "TA5 - got and returned " );
-      SPTEST.PUT_ADDRESS_FROM_AREA_1( SEGMENT_ADDRESS_1 );
-      TEXT_IO.NEW_LINE;
-
-      RTEMS.TASK_WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
-
-      TEXT_IO.PUT( "TA5 - region_get_segment - wait on 3K segment " );
-      TEXT_IO.PUT_LINE( "from region 1" );
-      RTEMS.REGION_GET_SEGMENT(
-         SPTEST.REGION_ID( 1 ),
-         3072,
-         RTEMS.DEFAULT_OPTIONS,
-         RTEMS.NO_TIMEOUT,
-         SEGMENT_ADDRESS_2,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_GET_SEGMENT" );
-      TEXT_IO.PUT( "TA5 - got segment from region 1 - " );
-      SPTEST.PUT_ADDRESS_FROM_AREA_1( SEGMENT_ADDRESS_2 );
-      TEXT_IO.NEW_LINE;
-
-      RTEMS.REGION_RETURN_SEGMENT(
-         SPTEST.REGION_ID( 1 ),
-         SEGMENT_ADDRESS_2,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_RETURN_SEGMENT" );
-      TEXT_IO.PUT( 
-         "TA5 - region_return_segment - return segment to region 1 - "
-      );
-      SPTEST.PUT_ADDRESS_FROM_AREA_1( SEGMENT_ADDRESS_2 );
-      TEXT_IO.NEW_LINE;
-
-      TEXT_IO.PUT_LINE( "TA5 - task_delete - delete self" );
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF TA5" );
-
-   end TASK_5;
-
-end SPTEST;
diff --git a/c/src/ada-tests/sptests/sp16/sptest.ads b/c/src/ada-tests/sptests/sp16/sptest.ads
deleted file mode 100644
index a9a8df0881..0000000000
--- a/c/src/ada-tests/sptests/sp16/sptest.ads
+++ /dev/null
@@ -1,195 +0,0 @@
---
---  SPTEST / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package is the specification for Test 16 of the RTEMS
---  Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-
-package SPTEST is
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS tasks created
---  by this test.
---
-
-   TASK_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 5 ) of RTEMS.ID;
-   TASK_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 5 ) of RTEMS.NAME;
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS regions created
---  by this test.
---
-
-   REGION_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.ID;
-   REGION_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.NAME;
-
---
---  The following constant defines the priority of most of the 
---  RTEMS tasks in this test.  This allows one of the tasks to
---  easily set itself to a higher priority than the rest.
---
-
-   BASE_PRIORITY : constant RTEMS.TASK_PRIORITY := 140;
-
---
---  These arrays define the memory areas used for the regions in
---  this test.
---
-
-   AREA_1 : array ( RTEMS.UNSIGNED32 range 0 .. 4095 ) of RTEMS.UNSIGNED8;
-   for AREA_1'ALIGNMENT use RTEMS.STRUCTURE_ALIGNMENT;
-
-   AREA_2 : array ( RTEMS.UNSIGNED32 range 0 .. 4095 ) of RTEMS.UNSIGNED8;
-   for AREA_2'ALIGNMENT use RTEMS.STRUCTURE_ALIGNMENT;
-
-   AREA_3 : array ( RTEMS.UNSIGNED32 range 0 .. 4095 ) of RTEMS.UNSIGNED8;
-   for AREA_3'ALIGNMENT use RTEMS.STRUCTURE_ALIGNMENT;
-
---
---  INIT
---
---  DESCRIPTION:
---
---  This RTEMS task initializes the application.
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  PUT_ADDRESS_FROM_AREA_1
---
---  DESCRIPTION:
---
---  This subprogram prints the offset of the address TO_BE_PRINTED 
---  from the first byte of AREA_1.
---
---  NOTE:
---
---  This subprogram is used because the actual address of AREA_1
---  varies based upon the size of the executable, the target board,
---  and the target processor.
---
-
-   procedure PUT_ADDRESS_FROM_AREA_1 (
-      TO_BE_PRINTED : in     RTEMS.ADDRESS
-   );
-
---
---  PUT_ADDRESS_FROM_AREA_2
---
---  DESCRIPTION:
---
---  This subprogram prints the offset of the address TO_BE_PRINTED 
---  from the first byte of AREA_2.
---
---  NOTE:
---
---  This subprogram is used because the actual address of AREA_2
---  varies based upon the size of the executable, the target board,
---  and the target processor.
---
-
-   procedure PUT_ADDRESS_FROM_AREA_2 (
-      TO_BE_PRINTED : in     RTEMS.ADDRESS
-   );
-
---
---  PUT_ADDRESS_FROM_AREA_3
---
---  DESCRIPTION:
---
---  This subprogram prints the offset of the address TO_BE_PRINTED 
---  from the first byte of AREA_3.
---
---  NOTE:
---
---  This subprogram is used because the actual address of AREA_3
---  varies based upon the size of the executable, the target board,
---  and the target processor.
---
-
-   procedure PUT_ADDRESS_FROM_AREA_3 (
-      TO_BE_PRINTED : in     RTEMS.ADDRESS
-   );
-
---
---  TASK_1
---
---  DESCRIPTION:
---
---  This RTEMS task tests the Region Manager.
---
-
-   procedure TASK_1 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TASK_2
---
---  DESCRIPTION:
---
---  This RTEMS task tests the Region Manager.
---
-
-   procedure TASK_2 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TASK_3
---
---  DESCRIPTION:
---
---  This RTEMS task tests the Region Manager.
---
-
-   procedure TASK_3 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TASK_4
---
---  DESCRIPTION:
---
---  This RTEMS task tests the Region Manager.
---
-
-   procedure TASK_4 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TASK_5
---
---  DESCRIPTION:
---
---  This RTEMS task tests the Region Manager.
---
-
-   procedure TASK_5 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
-end SPTEST;
diff --git a/c/src/ada-tests/sptests/sp17/config.h b/c/src/ada-tests/sptests/sp17/config.h
deleted file mode 100644
index 1e70e8d7b2..0000000000
--- a/c/src/ada-tests/sptests/sp17/config.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*  config.h
- *
- *  This include file defines the Configuration Table for this test.
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-/* configuration information */
-
-#define CONFIGURE_SPTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_MICROSECONDS_PER_TICK   RTEMS_MILLISECONDS_TO_MICROSECONDS(25)
-#define CONFIGURE_TICKS_PER_TIMESLICE     1000
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#define CONFIGURE_MAXIMUM_POSIX_THREADS              10
-#define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
-#define CONFIGURE_MAXIMUM_POSIX_MUTEXES              20
-#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES  10
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/c/src/ada-tests/sptests/sp17/sp17.adb b/c/src/ada-tests/sptests/sp17/sp17.adb
deleted file mode 100644
index 1a0a317af7..0000000000
--- a/c/src/ada-tests/sptests/sp17/sp17.adb
+++ /dev/null
@@ -1,57 +0,0 @@
---
---  MAIN / BODY
---
---  DESCRIPTION:
---
---  This is the entry point for Test SP17 of the Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-with SPTEST;
-with TEST_SUPPORT;
-
-procedure SP17 is
-  INIT_ID : RTEMS.ID;
-  STATUS  : RTEMS.STATUS_CODES;
-begin
-
-   RTEMS.TASK_CREATE(
-      RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
-      1,
-      RTEMS.MINIMUM_STACK_SIZE,
-      RTEMS.NO_PREEMPT,
-      RTEMS.DEFAULT_ATTRIBUTES,
-      INIT_ID,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
-
-
-   RTEMS.TASK_START(
-      INIT_ID,
-      SPTEST.INIT'ACCESS,
-      0,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
-
-   loop
-      delay 120.0;
-   end loop;
-
-end SP17;
-
diff --git a/c/src/ada-tests/sptests/sp17/sp17.scn b/c/src/ada-tests/sptests/sp17/sp17.scn
deleted file mode 100644
index 887284d877..0000000000
--- a/c/src/ada-tests/sptests/sp17/sp17.scn
+++ /dev/null
@@ -1,8 +0,0 @@
-*** TEST 17 ***
-TA2 - Suspending self
-TA1 - signal_catch: initializing signal catcher
-TA1 - Sending signal to self
-TA2 - signal_return preempted correctly
-TA1 - TA2 correctly preempted me
-TA1 - Got Back!!!
-*** END OF TEST 17 ***
diff --git a/c/src/ada-tests/sptests/sp17/sptest.adb b/c/src/ada-tests/sptests/sp17/sptest.adb
deleted file mode 100644
index b1bbc26b3d..0000000000
--- a/c/src/ada-tests/sptests/sp17/sptest.adb
+++ /dev/null
@@ -1,173 +0,0 @@
---
---  SPTEST / BODY
---
---  DESCRIPTION:
---
---  This package is the implementation of Test 17 of the RTEMS
---  Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with INTERFACES; use INTERFACES;
-with RTEMS;
-with TEST_SUPPORT;
-with TEXT_IO;
-
-package body SPTEST is
-
---PAGE
--- 
---  INIT
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** TEST 17 ***" );
-
-      SPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME(  'T', 'A', '1', ' ' );
-      SPTEST.TASK_NAME( 2 ) := RTEMS.BUILD_NAME(  'T', 'A', '2', ' ' );
-
-      SPTEST.TASK_2_PREEMPTED := FALSE;
-
-      RTEMS.TASK_CREATE( 
-         SPTEST.TASK_NAME( 1 ), 
-         2, 
-         2048, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.TASK_ID( 1 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA1" );
-
-      RTEMS.TASK_CREATE( 
-         SPTEST.TASK_NAME( 2 ), 
-         1, 
-         2048, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.TASK_ID( 2 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA2" );
-
-      RTEMS.TASK_START(
-         SPTEST.TASK_ID( 1 ),
-         SPTEST.TASK_1'ACCESS,
-         0,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA1" );
-
-      RTEMS.TASK_START(
-         SPTEST.TASK_ID( 2 ),
-         SPTEST.TASK_2'ACCESS,
-         0,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA2" );
-
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
-
-   end INIT;
-
---PAGE
--- 
---  PROCESS_ASR
---
-
-   procedure PROCESS_ASR (
-      SIGNALS : in     RTEMS.SIGNAL_SET
-   ) is
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      RTEMS.TASK_RESUME( SPTEST.TASK_ID( 2 ), STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "ASR - TASK_RESUME OF TA2" );
-
-   end PROCESS_ASR;
-
---PAGE
--- 
---  TASK_1
---
-
-   procedure TASK_1 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.PUT_LINE( "TA1 - signal_catch: initializing signal catcher" );
-      RTEMS.SIGNAL_CATCH( 
-         SPTEST.PROCESS_ASR'ACCESS, 
-         RTEMS.NO_ASR + RTEMS.NO_PREEMPT,
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SIGNAL_CATCH" );
-
-      TEXT_IO.PUT_LINE( "TA1 - Sending signal to self" );
-      RTEMS.SIGNAL_SEND( 
-         SPTEST.TASK_ID( 1 ),
-         RTEMS.SIGNAL_16,
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SIGNAL_SEND" );
-
-      if SPTEST.TASK_2_PREEMPTED = TRUE then
-         TEXT_IO.PUT_LINE( "TA1 - TA2 correctly preempted me" );
-      end if;
-
-      TEXT_IO.PUT_LINE( "TA1 - Got Back!!!" );
-     
-      TEXT_IO.PUT_LINE( "*** END OF TEST 17 ***" );
-      RTEMS.SHUTDOWN_EXECUTIVE( 0 );
-   
-   end TASK_1;
-
---PAGE
--- 
---  TASK_2
---
-
-   procedure TASK_2 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      SPTEST.TASK_2_PREEMPTED := FALSE;
-
-      TEXT_IO.PUT_LINE( "TA2 - Suspending self" );
-      RTEMS.TASK_SUSPEND( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SUSPEND OF TA2" );
-
-      TEXT_IO.PUT_LINE( "TA2 - signal_return preempted correctly" );
-
-      SPTEST.TASK_2_PREEMPTED := TRUE;
-
-      RTEMS.TASK_SUSPEND( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SUSPEND OF TA2" );
-
-   end TASK_2;
-
-end SPTEST;
diff --git a/c/src/ada-tests/sptests/sp17/sptest.ads b/c/src/ada-tests/sptests/sp17/sptest.ads
deleted file mode 100644
index e6dc2040d5..0000000000
--- a/c/src/ada-tests/sptests/sp17/sptest.ads
+++ /dev/null
@@ -1,93 +0,0 @@
---
---  SPTEST / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package is the specification for Test 17 of the RTEMS
---  Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-
-package SPTEST is
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS tasks created
---  by this test.
---
-
-   TASK_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.ID;
-   TASK_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.NAME;
-
---
---  The following is set to TRUE by TASK_2 when it preempts TASK_1.
---
-
-   TASK_2_PREEMPTED : STANDARD.BOOLEAN;
-
---
---  INIT
---
---  DESCRIPTION:
---
---  This RTEMS task initializes the application.
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  PROCESS_ASR
---
---  DESCRIPTION:
---
---  This subprogram is the ASR for TASK_1.
---
-
-   procedure PROCESS_ASR (
-      SIGNALS : in     RTEMS.SIGNAL_SET
-   );
-
---
---  TASK_1
---
---  DESCRIPTION:
---
---  This RTEMS task tests that when the transfer from the task
---  to the ASR (and vice-versa) is performed, that the new mode 
---  is taken into account.  If this occurs, then TASK_2 will be 
---  able to preempt upon completion of the ASR of TASK_1.
---
-
-   procedure TASK_1 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TASK_2
---
---  DESCRIPTION:
---
---  This RTEMS task is designed to preempt TASK_1.
---
-
-   procedure TASK_2 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
-end SPTEST;
diff --git a/c/src/ada-tests/sptests/sp19/README b/c/src/ada-tests/sptests/sp19/README
deleted file mode 100644
index 07d60c5bc4..0000000000
--- a/c/src/ada-tests/sptests/sp19/README
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-#  $Id$
-#
-
-This is a "problem" test in Ada versus the C equivalent.  In C,
-we used macros to :
-
-  + declare a LOT of local integer and floating point variables
-  + load them with values
-  + check them at certain times
-  + to avoid floating point operations on CPUs w/o hardware support
-
-The macros are not equivalent to subprograms doing the same thing.
-We are trying to insure that the register set is fully utilized and
-checking that it survives context switches.  If the routines are
-subprograms, then calling conventions and scoping rules apply.  Thus
-the variables do not exist throughout the entire life of the task
-as in the C test.
-
-It seems to point out that although the conditional compilation
-and macro capabilities of C are often abused, they do provide
-capabilities which are difficult if not impossible to mimic entirely
-with subprograms.  
diff --git a/c/src/ada-tests/sptests/sp19/config.h b/c/src/ada-tests/sptests/sp19/config.h
deleted file mode 100644
index bfb614cd4e..0000000000
--- a/c/src/ada-tests/sptests/sp19/config.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*  config.h
- *
- *  This include file defines the Configuration Table for this test.
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-/* configuration information */
-
-#define CONFIGURE_SPTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#define CONFIGURE_MAXIMUM_POSIX_THREADS              10
-#define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
-#define CONFIGURE_MAXIMUM_POSIX_MUTEXES              20
-#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES  10
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/c/src/ada-tests/sptests/sp19/sp19.adb b/c/src/ada-tests/sptests/sp19/sp19.adb
deleted file mode 100644
index 61a5107332..0000000000
--- a/c/src/ada-tests/sptests/sp19/sp19.adb
+++ /dev/null
@@ -1,57 +0,0 @@
---
---  MAIN / BODY
---
---  DESCRIPTION:
---
---  This is the entry point for Test SP19 of the Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-with SPTEST;
-with TEST_SUPPORT;
-
-procedure SP19 is
-  INIT_ID : RTEMS.ID;
-  STATUS  : RTEMS.STATUS_CODES;
-begin
-
-   RTEMS.TASK_CREATE(
-      RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
-      1,
-      RTEMS.MINIMUM_STACK_SIZE,
-      RTEMS.NO_PREEMPT,
-      RTEMS.FLOATING_POINT,
-      INIT_ID,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
-
-
-   RTEMS.TASK_START(
-      INIT_ID,
-      SPTEST.INIT'ACCESS,
-      0,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
-
-   loop
-      delay 120.0;
-   end loop;
-
-end SP19;
-
diff --git a/c/src/ada-tests/sptests/sp19/sp19.scn b/c/src/ada-tests/sptests/sp19/sp19.scn
deleted file mode 100644
index 8b7feadb37..0000000000
--- a/c/src/ada-tests/sptests/sp19/sp19.scn
+++ /dev/null
@@ -1,56 +0,0 @@
-*** TEST 19 ***
-FP1  - integer base = (   16#6000#)
-FP1  - float base = ( 6.00060E+03)
-FP1  - integer base = (   16#6000#)
-FP1  - float base = ( 6.00060E+03)
-TA1  - integer base = (   16#1000#)
-TA1  - clock_get -  9: 0: 0   12/31/1988
-TA2  - integer base = (   16#2000#)
-TA2  - clock_get -  9: 0: 0   12/31/1988
-TA3  - integer base = (   16#3000#)
-TA3  - clock_get -  9: 0: 0   12/31/1988
-TA4  - integer base = (   16#4000#)
-TA4  - float base = ( 4.00040E+03)
-TA4  - clock_get -  9: 0: 0   12/31/1988
-TA5  - integer base = (   16#5000#)
-TA5  - float base = ( 5.00050E+03)
-TA5  - clock_get -  9: 0: 0   12/31/1988
-TA4  - clock_get -  9: 0: 1   12/31/1988
-TA5  - clock_get -  9: 0: 1   12/31/1988
-TA4  - clock_get -  9: 0: 2   12/31/1988
-TA5  - clock_get -  9: 0: 2   12/31/1988
-TA4  - clock_get -  9: 0: 3   12/31/1988
-TA5  - clock_get -  9: 0: 3   12/31/1988
-TA4  - clock_get -  9: 0: 4   12/31/1988
-TA5  - clock_get -  9: 0: 4   12/31/1988
-TA1  - clock_get -  9: 0: 5   12/31/1988
-TA4  - clock_get -  9: 0: 5   12/31/1988
-TA5  - clock_get -  9: 0: 5   12/31/1988
-TA4  - clock_get -  9: 0: 6   12/31/1988
-TA5  - clock_get -  9: 0: 6   12/31/1988
-TA4  - clock_get -  9: 0: 7   12/31/1988
-TA5  - clock_get -  9: 0: 7   12/31/1988
-TA4  - clock_get -  9: 0: 8   12/31/1988
-TA5  - clock_get -  9: 0: 8   12/31/1988
-TA4  - clock_get -  9: 0: 9   12/31/1988
-TA5  - clock_get -  9: 0: 9   12/31/1988
-TA2  - clock_get -  9: 0:10   12/31/1988
-TA1  - clock_get -  9: 0:10   12/31/1988
-TA4  - clock_get -  9: 0:10   12/31/1988
-TA5  - clock_get -  9: 0:10   12/31/1988
-TA4  - clock_get -  9: 0:11   12/31/1988
-TA5  - clock_get -  9: 0:11   12/31/1988
-TA4  - clock_get -  9: 0:12   12/31/1988
-TA5  - clock_get -  9: 0:12   12/31/1988
-TA4  - clock_get -  9: 0:13   12/31/1988
-TA5  - clock_get -  9: 0:13   12/31/1988
-TA4  - clock_get -  9: 0:14   12/31/1988
-TA5  - clock_get -  9: 0:14   12/31/1988
-TA1  - clock_get -  9: 0:15   12/31/1988
-TA3  - clock_get -  9: 0:15   12/31/1988
-TA5  - clock_get -  9: 0:15   12/31/1988
-TA4  - clock_get -  9: 0:15   12/31/1988
-TA4 - task_delete - self
-TA5 - task_delete - TA3
-*** END OF TEST 19 ***
-
diff --git a/c/src/ada-tests/sptests/sp19/sptest.ads b/c/src/ada-tests/sptests/sp19/sptest.ads
deleted file mode 100644
index 92d65ffc3d..0000000000
--- a/c/src/ada-tests/sptests/sp19/sptest.ads
+++ /dev/null
@@ -1,102 +0,0 @@
---
---  SPTEST / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package is the specification for Test 19 of the RTEMS
---  Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-
-package SPTEST is
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS tasks created
---  by this test.
---
-
-   TASK_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 6 ) of RTEMS.ID;
-   TASK_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 6 ) of RTEMS.NAME;
-
---
---  This array contains the floating point factors used by the
---  floating point tasks in this test.
---
-
-   FP_FACTORS : array ( RTEMS.UNSIGNED32 range 0 .. 9 ) of FLOAT;
-
---
---  This array contains the integer factors used by the
---  integer tasks in this test.
---
-
-   INTEGER_FACTORS : array ( RTEMS.UNSIGNED32 range 0 .. 9 ) of 
-      RTEMS.UNSIGNED32;
-
---
---  INIT
---
---  DESCRIPTION:
---
---  This RTEMS task initializes the application.
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  FIRST_FP_TASK
---
---  DESCRIPTION:
---
---  This RTEMS task tests the restart and deletion of floating point tasks.
---
-
-   procedure FIRST_FP_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  FP_TASK
---
---  DESCRIPTION:
---
---  This RTEMS task tests the basic capabilities of a floating point
---  task.
---
-
-   procedure FP_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TASK_1
---
---  DESCRIPTION:
---
---  This RTEMS task provides a non-floating point task to test
---  that an application can utilize a mixture of floating point
---  and non-floating point tasks.
---
-
-   procedure TASK_1 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
-end SPTEST;
diff --git a/c/src/ada-tests/sptests/sp20/config.h b/c/src/ada-tests/sptests/sp20/config.h
deleted file mode 100644
index d8e351ae1f..0000000000
--- a/c/src/ada-tests/sptests/sp20/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*  config.h
- *
- *  This include file defines the Configuration Table for this test.
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-/* configuration information */
-
-#define CONFIGURE_SPTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_MAXIMUM_PERIODS             10
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#define CONFIGURE_MAXIMUM_POSIX_THREADS              10
-#define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
-#define CONFIGURE_MAXIMUM_POSIX_MUTEXES              20
-#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES  10
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/c/src/ada-tests/sptests/sp20/sp20.adb b/c/src/ada-tests/sptests/sp20/sp20.adb
deleted file mode 100644
index 0bb685dc1d..0000000000
--- a/c/src/ada-tests/sptests/sp20/sp20.adb
+++ /dev/null
@@ -1,56 +0,0 @@
---
---  MAIN / BODY
---
---  DESCRIPTION:
---
---  This is the entry point for Test SP20 of the Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-with SPTEST;
-with TEST_SUPPORT;
-
-procedure SP20 is
-  INIT_ID : RTEMS.ID;
-  STATUS  : RTEMS.STATUS_CODES;
-begin
-
-   RTEMS.TASK_CREATE(
-      RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
-      10,
-      RTEMS.MINIMUM_STACK_SIZE,
-      RTEMS.DEFAULT_MODES,
-      RTEMS.DEFAULT_ATTRIBUTES,
-      INIT_ID,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
-
-   RTEMS.TASK_START(
-      INIT_ID,
-      SPTEST.INIT'ACCESS,
-      0,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
-
-   loop
-      delay 120.0;
-   end loop;
-
-end SP20;
-
diff --git a/c/src/ada-tests/sptests/sp20/sp20.scn b/c/src/ada-tests/sptests/sp20/sp20.scn
deleted file mode 100644
index ec21e4bdf2..0000000000
--- a/c/src/ada-tests/sptests/sp20/sp20.scn
+++ /dev/null
@@ -1,27 +0,0 @@
-*** TEST 20 ***
-TA1 - rate_monotonic_create id = 16#10001#
-TA1 - rate_monotonic_ident id = 16#10001#
-TA1 - (16#10001#) period 2
-TA2 - rate_monotonic_create id = 16#10002#
-TA2 - rate_monotonic_ident id = 16#10002#
-TA2 - (16#10002#) period 2
-TA3 - rate_monotonic_create id = 16#10003#
-TA3 - rate_monotonic_ident id = 16#10003#
-TA3 - (16#10003#) period 2
-TA4 - rate_monotonic_create id = 16#10004#
-TA4 - rate_monotonic_ident id = 16#10004#
-TA4 - (16#10004#) period 2
-TA5 - rate_monotonic_create id = 16#10005#
-TA5 - rate_monotonic_ident id = 16#10005#
-TA5 - (16#10005#) period 100
-TA5 - PERIODS CHECK OK (1)
-TA5 - PERIODS CHECK OK (2)
-TA5 - PERIODS CHECK OK (3)
-TA5 - PERIODS CHECK OK (4)
-TA5 - PERIODS CHECK OK (5)
-TA5 - PERIODS CHECK OK (6)
-TA5 - PERIODS CHECK OK (7)
-TA5 - PERIODS CHECK OK (8)
-TA5 - PERIODS CHECK OK (9)
-TA5 - PERIODS CHECK OK (10)
-*** END OF TEST 20 ***
diff --git a/c/src/ada-tests/sptests/sp20/sptest.adb b/c/src/ada-tests/sptests/sp20/sptest.adb
deleted file mode 100644
index c12bef23c0..0000000000
--- a/c/src/ada-tests/sptests/sp20/sptest.adb
+++ /dev/null
@@ -1,280 +0,0 @@
---
---  SPTEST / BODY
---
---  DESCRIPTION:
---
---  This package is the implementation of Test 20 of the RTEMS
---  Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with INTERFACES; use INTERFACES;
-with RTEMS;
-with TEST_SUPPORT;
-with TEXT_IO;
-with UNSIGNED32_IO;
-
-package body SPTEST is
-
---PAGE
--- 
---  INIT
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** TEST 20 ***" );
-
-      SPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME(  'T', 'A', '1', ' ' );
-      SPTEST.TASK_NAME( 2 ) := RTEMS.BUILD_NAME(  'T', 'A', '2', ' ' );
-      SPTEST.TASK_NAME( 3 ) := RTEMS.BUILD_NAME(  'T', 'A', '3', ' ' );
-      SPTEST.TASK_NAME( 4 ) := RTEMS.BUILD_NAME(  'T', 'A', '4', ' ' );
-      SPTEST.TASK_NAME( 5 ) := RTEMS.BUILD_NAME(  'T', 'A', '5', ' ' );
-
-      for INDEX in 1 .. 5
-      loop
-
-         SPTEST.COUNT( INDEX ) := 0;
-
-         RTEMS.TASK_CREATE( 
-            SPTEST.TASK_NAME( INDEX ), 
-            SPTEST.PRIORITIES( INDEX ), 
-            4096, 
-            RTEMS.DEFAULT_MODES,
-            RTEMS.DEFAULT_ATTRIBUTES,
-            SPTEST.TASK_ID( INDEX ),
-            STATUS
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE LOOP" );
-
-      end loop;
-
-      for INDEX in 1 .. 5
-      loop
-
-         RTEMS.TASK_START(
-            SPTEST.TASK_ID( INDEX ),
-            SPTEST.TASK_1_THROUGH_5'ACCESS,
-            RTEMS.TASK_ARGUMENT( INDEX ),
-            STATUS
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START LOOP" );
- 
-      end loop;
-
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
-
-   end INIT;
-
---PAGE
--- 
---  TASK_1_THROUGH_5
---
-
-   procedure TASK_1_THROUGH_5 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      RMID      : RTEMS.ID;
-      TEST_RMID : RTEMS.ID;
-      INDEX     : RTEMS.UNSIGNED32;
-      PASS      : RTEMS.UNSIGNED32;
-      FAILED    : RTEMS.UNSIGNED32;
-      STATUS    : RTEMS.STATUS_CODES;
-   begin
-
-      RTEMS.RATE_MONOTONIC_CREATE( ARGUMENT, RMID, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "RATE_MONOTONIC_CREATE" );
-      TEST_SUPPORT.PUT_NAME( SPTEST.TASK_NAME( INTEGER( ARGUMENT ) ), FALSE );
-      TEXT_IO.PUT( "- rate_monotonic_create id = " );
-      UNSIGNED32_IO.PUT( RMID, WIDTH => 8, BASE => 16 );
-      TEXT_IO.NEW_LINE;
- 
-      RTEMS.RATE_MONOTONIC_IDENT( ARGUMENT, TEST_RMID, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "RATE_MONOTONIC_IDENT" );
-      TEST_SUPPORT.PUT_NAME( SPTEST.TASK_NAME( INTEGER( ARGUMENT ) ), FALSE );
-      TEXT_IO.PUT( "- rate_monotonic_ident id = " );
-      UNSIGNED32_IO.PUT( RMID, WIDTH => 8, BASE => 16 );
-      TEXT_IO.NEW_LINE;
-      if TEST_RMID /= RMID then
-         TEXT_IO.PUT_LINE( "RMID's DO NOT MATCH!!!" );
-         RTEMS.SHUTDOWN_EXECUTIVE( 0 );
-      end if; 
-
-      TEST_SUPPORT.PUT_NAME( SPTEST.TASK_NAME( INTEGER( ARGUMENT ) ), FALSE );
-      TEXT_IO.PUT( " - (" );
-      UNSIGNED32_IO.PUT( RMID, WIDTH => 1, BASE => 16 );
-      TEXT_IO.PUT( ") period " );
-      UNSIGNED32_IO.PUT( 
-         SPTEST.PERIODS( INTEGER( ARGUMENT ) ), 
-         WIDTH => 1, 
-         BASE => 10 
-      );
-      TEXT_IO.NEW_LINE;
-       
-      RTEMS.TASK_WAKE_AFTER( 2, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
-   
-      case ARGUMENT is
-         when 1 .. 4 =>
-            loop
-               RTEMS.RATE_MONOTONIC_PERIOD( 
-                  RMID, 
-                  SPTEST.PERIODS( INTEGER( ARGUMENT ) ), 
-                  STATUS
-               );
-
-               TEST_SUPPORT.DIRECTIVE_FAILED( 
-                  STATUS, 
-                  "RATE_MONOTONIC_PERIOD" 
-               );
-
-               SPTEST.COUNT( INTEGER( ARGUMENT ) ) := 
-                  SPTEST.COUNT( INTEGER( ARGUMENT ) ) + 1;
-
-            end loop;
-
-         when 5 =>
-
-            PASS   := 0;
-            FAILED := 0;
-
-            RTEMS.RATE_MONOTONIC_PERIOD( 
-               RMID, 
-               SPTEST.PERIODS( INTEGER( ARGUMENT ) ),
-               STATUS
-            );
-
-            TEST_SUPPORT.DIRECTIVE_FAILED( 
-               STATUS, 
-               "RATE_MONOTONIC_PERIOD 1 OF TA5" 
-            );
-
-            SPTEST.GET_ALL_COUNTERS;
-
-            loop
-
-               RTEMS.RATE_MONOTONIC_PERIOD( 
-                  RMID, 
-                  SPTEST.PERIODS( INTEGER( ARGUMENT ) ),
-                  STATUS
-               );
-
-               TEST_SUPPORT.DIRECTIVE_FAILED( 
-                  STATUS, 
-                  "RATE_MONOTONIC_PERIOD 2 OF TA5" 
-               );
-
-               SPTEST.GET_ALL_COUNTERS;
-
-               for INDEX in 1 .. 4 
-               loop
-
-                  if SPTEST.TEMPORARY_COUNT( INDEX ) /= 
-                        SPTEST.ITERATIONS( INDEX ) then
-
-                     TEXT_IO.PUT( "FAIL -- " );
-                     TEST_SUPPORT.PUT_NAME( 
-                        SPTEST.TASK_NAME( INDEX ),
-                        FALSE
-                     );
-                     TEXT_IO.PUT( "ACTUAL=" );
-                     UNSIGNED32_IO.PUT( 
-                        SPTEST.TEMPORARY_COUNT( INDEX ), 
-                        WIDTH => 3, 
-                        BASE => 10 
-                     );
-                     TEXT_IO.PUT( " EXPECTED=" );
-                     UNSIGNED32_IO.PUT( 
-                        SPTEST.ITERATIONS( INDEX ), 
-                        WIDTH => 3, 
-                        BASE => 10 
-                     );
-                     TEXT_IO.NEW_LINE;
-
-                     FAILED := FAILED + 1;
-
-                  end if;
-
-               end loop;
-
-               if FAILED = 5 then
-                  RTEMS.SHUTDOWN_EXECUTIVE( 0 );
-               end if;
-
-               PASS := PASS + 1;
-               TEXT_IO.PUT( "TA5 - PERIODS CHECK OK (" );
-               UNSIGNED32_IO.PUT( PASS, WIDTH => 1, BASE => 10 );
-               TEXT_IO.PUT_LINE( ")" );
- 
-               if PASS = 10 then
-                  TEXT_IO.PUT_LINE( "*** END OF TEST 20 ***" );
-                  RTEMS.SHUTDOWN_EXECUTIVE( 0 );
-               end if;
-
-            end loop;
- 
-         when others =>
-            NULL;
-            
-      end case;
-
-   end TASK_1_THROUGH_5;
-
---PAGE
--- 
---  GET_ALL_COUNTERS
---
-
-   procedure GET_ALL_COUNTERS
-   is
-      PREVIOUS_MODE : RTEMS.MODE;
-      STATUS        : RTEMS.STATUS_CODES;
-   begin
-
-      RTEMS.TASK_MODE(
-         RTEMS.NO_PREEMPT,
-         RTEMS.PREEMPT_MASK,
-         PREVIOUS_MODE,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_MODE TO NO_PREEMPT" );
-
-      SPTEST.TEMPORARY_COUNT := SPTEST.COUNT;
-
-      for INDEX in 1 .. 5
-      loop
-
-         SPTEST.COUNT( INDEX ) := 0;
-
-      end loop;
-      
-      RTEMS.TASK_MODE(
-         RTEMS.PREEMPT,
-         RTEMS.PREEMPT_MASK,
-         PREVIOUS_MODE,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_MODE TO PREEMPT" );
-
-   end GET_ALL_COUNTERS;
-
-end SPTEST;
diff --git a/c/src/ada-tests/sptests/sp20/sptest.ads b/c/src/ada-tests/sptests/sp20/sptest.ads
deleted file mode 100644
index bfc62ad772..0000000000
--- a/c/src/ada-tests/sptests/sp20/sptest.ads
+++ /dev/null
@@ -1,105 +0,0 @@
---
---  SPTEST / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package is the specification for Test 20 of the RTEMS
---  Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-
-package SPTEST is
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS tasks created
---  by this test.
---
-
-   TASK_ID   : array ( 1 .. 5 ) of RTEMS.ID;
-   TASK_NAME : array ( 1 .. 5 ) of RTEMS.NAME;
-
---
---  These arrays contain the parameters which define the execution
---  characteristics and periods of each instantiation of the 
---  copies of the RTEMS task TASKS_1_THROUGH_5.
---
-
-   PERIODS : constant array ( 1 .. 5 ) 
-     of RTEMS.UNSIGNED32 := ( 2, 2, 2, 2, 100 );
-
-   ITERATIONS : constant array ( 1 .. 5 ) 
-     of RTEMS.UNSIGNED32 := ( 50, 50, 50, 50, 1 );
-
-   PRIORITIES : constant array ( 1 .. 5 ) 
-     of RTEMS.UNSIGNED32 := ( 1, 1, 3, 4, 5 );
-
---
---  The following type defines the array used to manage the 
---  execution counts of each task's period.
---
-
-   type COUNT_ARRAY is array ( 1 .. 5 ) of RTEMS.UNSIGNED32;
-
---
---  These arrays contains the number of periods successfully completed
---  by each of the tasks.  At each of its periods, the fifth task
---  will copy the contents of the COUNT array to TEMPORARY_COUNT,
---  and clear the COUNT array.  The copy is performed to insure
---  that no periods fire while it is verifying the correctness
---  of the test's execution.
---
-
-   COUNT           : SPTEST.COUNT_ARRAY;
-   TEMPORARY_COUNT : SPTEST.COUNT_ARRAY;
-
---
---  INIT
---
---  DESCRIPTION:
---
---  This RTEMS task initializes the application.
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TASK_1_THROUGH_5
---
---  DESCRIPTION:
---
---  These RTEMS tasks test the Rate Monotonic Manager.
---
-
-   procedure TASK_1_THROUGH_5 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  GET_ALL_COUNTERS
---
---  DESCRIPTION:
---
---  This subprogram atomically copies the contents of COUNTER to
---  TEMPORARY_COUNTER.
---
-
-   procedure GET_ALL_COUNTERS;
-
-end SPTEST;
diff --git a/c/src/ada-tests/sptests/sp21/config.h b/c/src/ada-tests/sptests/sp21/config.h
deleted file mode 100644
index 94ca99691d..0000000000
--- a/c/src/ada-tests/sptests/sp21/config.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*  config.h
- *
- *  This include file defines the Configuration Table for this test.
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-/* configuration information */
-
-#define CONFIGURE_SPTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-#define CONFIGURE_TEST_NEEDS_STUB_DRIVER
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#define CONFIGURE_MAXIMUM_POSIX_THREADS              10
-#define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
-#define CONFIGURE_MAXIMUM_POSIX_MUTEXES              20
-#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES  10
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/c/src/ada-tests/sptests/sp21/sp21.adb b/c/src/ada-tests/sptests/sp21/sp21.adb
deleted file mode 100644
index 6084211195..0000000000
--- a/c/src/ada-tests/sptests/sp21/sp21.adb
+++ /dev/null
@@ -1,57 +0,0 @@
---
---  MAIN / BODY
---
---  DESCRIPTION:
---
---  This is the entry point for Test SP21 of the Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-with SPTEST;
-with TEST_SUPPORT;
-
-procedure SP21 is
-  INIT_ID : RTEMS.ID;
-  STATUS  : RTEMS.STATUS_CODES;
-begin
-
-   RTEMS.TASK_CREATE(
-      RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
-      1,
-      RTEMS.MINIMUM_STACK_SIZE,
-      RTEMS.NO_PREEMPT,
-      RTEMS.DEFAULT_ATTRIBUTES,
-      INIT_ID,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
-
-
-   RTEMS.TASK_START(
-      INIT_ID,
-      SPTEST.INIT'ACCESS,
-      0,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
-
-   loop
-      delay 120.0;
-   end loop;
-
-end SP21;
-
diff --git a/c/src/ada-tests/sptests/sp21/sp21.scn b/c/src/ada-tests/sptests/sp21/sp21.scn
deleted file mode 100644
index 86dd4922b4..0000000000
--- a/c/src/ada-tests/sptests/sp21/sp21.scn
+++ /dev/null
@@ -1,19 +0,0 @@
-*** TEST 21 ***
------  TESTING THE NULL DRIVER CHECKS  -----
-TA1 - io_initialize - NULL DRIVER SUCCESSFUL
-TA1 - io_open       - NULL DRIVER SUCCESSFUL
-TA1 - io_close      - NULL DRIVER SUCCESSFUL
-TA1 - io_read       - NULL DRIVER SUCCESSFUL
-TA1 - io_write      - NULL DRIVER SUCCESSFUL
-TA1 - io_control    - NULL DRIVER SUCCESSFUL
------  TESTING THE I/O MANAGER DIRECTIVES  -----
-TA1 - io_initialize - STUB DRIVER SUCCESSFUL
-TA1 - io_open       - STUB DRIVER SUCCESSFUL
-TA1 - io_close      - STUB DRIVER SUCCESSFUL
-TA1 - io_read       - STUB DRIVER SUCCESSFUL
-TA1 - io_write      - STUB DRIVER SUCCESSFUL
-TA1 - io_control    - STUB DRIVER SUCCESSFUL
------  RETURNING INVALID MAJOR NUMBER -----
-TA1 - io_initialize - INVALID_NUMBER
-TA1 - io_open       - INVALID_NUMBER
-*** END OF TEST 21 ***
diff --git a/c/src/ada-tests/sptests/sp21/sptest.adb b/c/src/ada-tests/sptests/sp21/sptest.adb
deleted file mode 100644
index 8ec76a7cf0..0000000000
--- a/c/src/ada-tests/sptests/sp21/sptest.adb
+++ /dev/null
@@ -1,270 +0,0 @@
---
---  SPTEST / BODY
---
---  DESCRIPTION:
---
---  This package is the implementation of Test 21 of the RTEMS
---  Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with INTERFACES; use INTERFACES;
-with RTEMS;
-with TEST_SUPPORT;
-with TEXT_IO;
-
-package body SPTEST is
-
---PAGE
--- 
---  INIT
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** TEST 21 ***" );
-
-      SPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME(  'T', 'A', '1', ' ' );
-
-      RTEMS.TASK_CREATE( 
-         SPTEST.TASK_NAME( 1 ), 
-         1, 
-         2048, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.TASK_ID( 1 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA1" );
-
-      RTEMS.TASK_START(
-         SPTEST.TASK_ID( 1 ),
-         SPTEST.TASK_1'ACCESS,
-         0,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA1" );
-
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
-
-   end INIT;
-
---PAGE
--- 
---  TASK_1
---
-
-   procedure TASK_1 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      RETURN_VALUE : RTEMS.UNSIGNED32;
-      STATUS       : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.PUT_LINE( "----- TESTING THE NULL DRIVER CHECKS -----" );
-
-      RTEMS.IO_INITIALIZE( 
-         SPTEST.NO_DRIVER_MAJOR,
-         0,
-         RTEMS.NULL_ADDRESS,
-         RETURN_VALUE,
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "IO_INITIALIZE" );
-      TEXT_IO.PUT_LINE(
-         "TA1 - io_initialize - NULL DRIVER SUCCESSFUL"
-      );
-   
-      RTEMS.IO_OPEN( 
-         SPTEST.NO_DRIVER_MAJOR,
-         0,
-         RTEMS.NULL_ADDRESS,
-         RETURN_VALUE,
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "IO_OPEN" );
-      TEXT_IO.PUT_LINE(
-         "TA1 - io_open       - NULL DRIVER SUCCESSFUL"
-      );
-   
-      RTEMS.IO_CLOSE( 
-         SPTEST.NO_DRIVER_MAJOR,
-         0,
-         RTEMS.NULL_ADDRESS,
-         RETURN_VALUE,
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "IO_CLOSE" );
-      TEXT_IO.PUT_LINE(
-         "TA1 - io_close      - NULL DRIVER SUCCESSFUL"
-      );
-   
-      RTEMS.IO_READ( 
-         SPTEST.NO_DRIVER_MAJOR,
-         0,
-         RTEMS.NULL_ADDRESS,
-         RETURN_VALUE,
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "IO_READ" );
-      TEXT_IO.PUT_LINE(
-         "TA1 - io_read       - NULL DRIVER SUCCESSFUL"
-      );
-   
-      RTEMS.IO_WRITE( 
-         SPTEST.NO_DRIVER_MAJOR,
-         0,
-         RTEMS.NULL_ADDRESS,
-         RETURN_VALUE,
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "IO_WRITE" );
-      TEXT_IO.PUT_LINE(
-         "TA1 - io_write      - NULL DRIVER SUCCESSFUL"
-      );
-   
-      RTEMS.IO_CONTROL( 
-         SPTEST.NO_DRIVER_MAJOR,
-         0,
-         RTEMS.NULL_ADDRESS,
-         RETURN_VALUE,
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "IO_CONTROL" );
-      TEXT_IO.PUT_LINE(
-         "TA1 - io_control    - NULL DRIVER SUCCESSFUL"
-      );
-   
-      TEXT_IO.PUT_LINE( "----- TESTING THE I/O MANAGER DIRECTIVES -----" );
-
-      RTEMS.IO_INITIALIZE( 
-         SPTEST.STUB_DRIVER_MAJOR,
-         0,
-         RTEMS.NULL_ADDRESS,
-         RETURN_VALUE,
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "IO_INITIALIZE" );
-      TEXT_IO.PUT_LINE(
-         "TA1 - io_initialize - STUB DRIVER SUCCESSFUL"
-      );
-   
-      RTEMS.IO_OPEN( 
-         SPTEST.STUB_DRIVER_MAJOR,
-         0,
-         RTEMS.NULL_ADDRESS,
-         RETURN_VALUE,
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "IO_OPEN" );
-      TEXT_IO.PUT_LINE(
-         "TA1 - io_open       - STUB DRIVER SUCCESSFUL"
-      );
-   
-      RTEMS.IO_CLOSE( 
-         SPTEST.STUB_DRIVER_MAJOR,
-         0,
-         RTEMS.NULL_ADDRESS,
-         RETURN_VALUE,
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "IO_CLOSE" );
-      TEXT_IO.PUT_LINE(
-         "TA1 - io_close      - STUB DRIVER SUCCESSFUL"
-      );
-   
-      RTEMS.IO_READ( 
-         SPTEST.STUB_DRIVER_MAJOR,
-         0,
-         RTEMS.NULL_ADDRESS,
-         RETURN_VALUE,
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "IO_READ" );
-      TEXT_IO.PUT_LINE(
-         "TA1 - io_read       - STUB DRIVER SUCCESSFUL"
-      );
-   
-      RTEMS.IO_WRITE( 
-         SPTEST.STUB_DRIVER_MAJOR,
-         0,
-         RTEMS.NULL_ADDRESS,
-         RETURN_VALUE,
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "IO_WRITE" );
-      TEXT_IO.PUT_LINE(
-         "TA1 - io_write      - STUB DRIVER SUCCESSFUL"
-      );
-   
-      RTEMS.IO_CONTROL( 
-         SPTEST.STUB_DRIVER_MAJOR,
-         0,
-         RTEMS.NULL_ADDRESS,
-         RETURN_VALUE,
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "IO_CONTROL" );
-      TEXT_IO.PUT_LINE(
-         "TA1 - io_control    - STUB DRIVER SUCCESSFUL"
-      );
-
-      TEXT_IO.PUT_LINE( "----- RETURNING INVALID MAJOR NUMBER -----" );
-
-      RTEMS.IO_INITIALIZE( 
-         SPTEST.INVALID_DRIVER_MAJOR,
-         0,
-         RTEMS.NULL_ADDRESS,
-         RETURN_VALUE,
-         STATUS 
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( 
-         STATUS,
-         RTEMS.INVALID_NUMBER, 
-         "IO_INITIALIZE" 
-      );
-      TEXT_IO.PUT_LINE(
-         "TA1 - io_initialize - INVALID_NUMBER"
-      );
-   
-      RTEMS.IO_OPEN( 
-         SPTEST.INVALID_DRIVER_MAJOR,
-         0,
-         RTEMS.NULL_ADDRESS,
-         RETURN_VALUE,
-         STATUS 
-      );
-      TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( 
-         STATUS,
-         RTEMS.INVALID_NUMBER, 
-         "IO_OPEN" 
-      );
-      TEXT_IO.PUT_LINE(
-         "TA1 - io_open       - INVALID_NUMBER"
-      );
-   
-      TEXT_IO.PUT_LINE( "*** END OF TEST 21 ***" );
-      RTEMS.SHUTDOWN_EXECUTIVE( 0 );
-   
-   end TASK_1;
-
-end SPTEST;
diff --git a/c/src/ada-tests/sptests/sp21/sptest.ads b/c/src/ada-tests/sptests/sp21/sptest.ads
deleted file mode 100644
index 04a8ad9c4f..0000000000
--- a/c/src/ada-tests/sptests/sp21/sptest.ads
+++ /dev/null
@@ -1,69 +0,0 @@
---
---  SPTEST / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package is the specification for Test 21 of the RTEMS
---  Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-
-package SPTEST is
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS tasks created
---  by this test.
---
-
-   TASK_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.ID;
-   TASK_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.NAME;
-
---
---  The following constants define the device major numbers
---  utilized by this test.
---
-
-   NO_DRIVER_MAJOR      : constant RTEMS.DEVICE_MAJOR_NUMBER := 3; 
-   INVALID_DRIVER_MAJOR : constant RTEMS.DEVICE_MAJOR_NUMBER := 5;
-   STUB_DRIVER_MAJOR    : constant RTEMS.DEVICE_MAJOR_NUMBER := 2;
-
---
---  INIT
---
---  DESCRIPTION:
---
---  This RTEMS task initializes the application.
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TASK_1
---
---  DESCRIPTION:
---
---  This RTEMS task tests the Input Output Manager.
---
-
-   procedure TASK_1 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
-end SPTEST;
diff --git a/c/src/ada-tests/sptests/sp22/config.h b/c/src/ada-tests/sptests/sp22/config.h
deleted file mode 100644
index 09a09692a8..0000000000
--- a/c/src/ada-tests/sptests/sp22/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*  config.h
- *
- *  This include file defines the Configuration Table for this test.
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-/* configuration information */
-
-#define CONFIGURE_SPTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_MAXIMUM_TIMERS              2
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#define CONFIGURE_MAXIMUM_POSIX_THREADS              10
-#define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
-#define CONFIGURE_MAXIMUM_POSIX_MUTEXES              20
-#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES  10
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/c/src/ada-tests/sptests/sp22/sp22.adb b/c/src/ada-tests/sptests/sp22/sp22.adb
deleted file mode 100644
index 06cb14a01f..0000000000
--- a/c/src/ada-tests/sptests/sp22/sp22.adb
+++ /dev/null
@@ -1,57 +0,0 @@
---
---  MAIN / BODY
---
---  DESCRIPTION:
---
---  This is the entry point for Test SP22 of the Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-with SPTEST;
-with TEST_SUPPORT;
-
-procedure SP22 is
-  INIT_ID : RTEMS.ID;
-  STATUS  : RTEMS.STATUS_CODES;
-begin
-
-   RTEMS.TASK_CREATE(
-      RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
-      1,
-      RTEMS.MINIMUM_STACK_SIZE,
-      RTEMS.NO_PREEMPT,
-      RTEMS.DEFAULT_ATTRIBUTES,
-      INIT_ID,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
-
-
-   RTEMS.TASK_START(
-      INIT_ID,
-      SPTEST.INIT'ACCESS,
-      0,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
-
-   loop
-      delay 120.0;
-   end loop;
-
-end SP22;
-
diff --git a/c/src/ada-tests/sptests/sp22/sp22.scn b/c/src/ada-tests/sptests/sp22/sp22.scn
deleted file mode 100644
index 8422e73141..0000000000
--- a/c/src/ada-tests/sptests/sp22/sp22.scn
+++ /dev/null
@@ -1,29 +0,0 @@
-*** TEST 22 ***
-INIT - timer_create - creating timer 1
-INIT - timer 1 has id (16#10001#)
-TA1 - timer_ident - identing timer 1
-TA1 - timer 1 has id (16#10001#)
-TA1 - clock_get -  9: 0: 0   12/31/1988
-TA1 - timer_after - timer 1 in 3 seconds
-TA1 - task_suspend( SELF ) 
-TA1 - clock_get -  9: 0: 3   12/31/1988
-TA1 - timer_after - timer 1 in 3 seconds
-TA1 - task_wake_after - 1 second
-TA1 - clock_get -  9: 0: 4   12/31/1988
-TA1 - timer_reset - timer 1
-TA1 - task_suspend( SELF )
-TA1 - clock_get -  9: 0: 7   12/31/1988
-<pause>
-TA1 - timer_after - timer 1 in 3 seconds
-TA1 - timer_cancel - timer 1
-TA1 - clock_get -  9: 0: 7   12/31/1988
-TA1 - timer_when - timer 1 in 3 seconds
-TA1 - task_suspend( SELF )
-TA1 - clock_get -  9: 0:10   12/31/1988
-TA1 - timer_when - timer 1 in 3 seconds
-TA1 - task_wake_after - 1 second
-TA1 - clock_get -  9: 0:11   12/31/1988
-TA1 - timer_cancel - timer 1
-TA1 - task_wake_after - YIELD (only task at priority)
-TA1 - timer_delete - timer 1
-*** END OF TEST 22 ***
diff --git a/c/src/ada-tests/sptests/sp22/sptest.adb b/c/src/ada-tests/sptests/sp22/sptest.adb
deleted file mode 100644
index 830dbf9693..0000000000
--- a/c/src/ada-tests/sptests/sp22/sptest.adb
+++ /dev/null
@@ -1,299 +0,0 @@
---
---  SPTEST / BODY
---
---  DESCRIPTION:
---
---  This package is the implementation of Test 22 of the RTEMS
---  Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with INTERFACES; use INTERFACES;
-with RTEMS;
-with TEST_SUPPORT;
-with TEXT_IO;
-with UNSIGNED32_IO;
-
-package body SPTEST is
-
---PAGE
--- 
---  INIT
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      TIME   : RTEMS.TIME_OF_DAY;
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** TEST 22 ***" );
-
-      TIME := ( 1988, 12, 31, 9, 0, 0, 0 );
-
-      RTEMS.CLOCK_SET( TIME, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_SET" );
-
-      SPTEST.TASK_NAME( 1 )  := RTEMS.BUILD_NAME(  'T', 'A', '1', ' ' );
-      SPTEST.TIMER_NAME( 1 ) := RTEMS.BUILD_NAME(  'T', 'M', '1', ' ' );
-
-      RTEMS.TASK_CREATE( 
-         SPTEST.TASK_NAME( 1 ), 
-         1, 
-         2048, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.TASK_ID( 1 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA1" );
-
-      RTEMS.TASK_START(
-         SPTEST.TASK_ID( 1 ),
-         SPTEST.TASK_1'ACCESS,
-         0,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA1" );
-
-      TEXT_IO.PUT_LINE( "INIT - timer_create - creating timer 1" );
-      RTEMS.TIMER_CREATE(
-         SPTEST.TIMER_NAME( 1 ), 
-         SPTEST.TIMER_ID( 1 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_CREATE OF TM1" );
-      TEXT_IO.PUT( "INIT - timer 1 has id (" );
-      UNSIGNED32_IO.PUT( SPTEST.TIMER_ID( 1 ), WIDTH => 8, BASE => 16 );
-      TEXT_IO.PUT_LINE( ")" );
-      
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
-
-   end INIT;
-
---PAGE
--- 
---  DELAYED_RESUME
---
-
-   procedure DELAYED_RESUME (
-      IGNORED_ID      : in     RTEMS.ID;
-      IGNORED_ADDRESS : in     RTEMS.ADDRESS
-   ) is
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      RTEMS.TASK_RESUME( SPTEST.TASK_ID( 1 ), STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_RESUME OF SELF" );
-
-   end DELAYED_RESUME;
-
---PAGE
--- 
---  PRINT_TIME
---
-
-   procedure PRINT_TIME 
-   is
-      TIME   : RTEMS.TIME_OF_DAY;
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      RTEMS.CLOCK_GET( RTEMS.CLOCK_GET_TOD, TIME'ADDRESS, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET" );
-
-      TEST_SUPPORT.PUT_NAME( 
-         SPTEST.TASK_NAME( 1 ),
-         FALSE
-      );
-
-      TEST_SUPPORT.PRINT_TIME( "- clock_get - ", TIME, "" );
-      TEXT_IO.NEW_LINE;
-
-   end PRINT_TIME;
-   
---PAGE
--- 
---  TASK_1
---
-
-   procedure TASK_1 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      TMID   : RTEMS.ID;
-      TIME   : RTEMS.TIME_OF_DAY;
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
--- GET ID
-
-      TEXT_IO.PUT_LINE( "TA1 - timer_ident - identing timer 1" );
-      RTEMS.TIMER_IDENT( SPTEST.TIMER_NAME( 1 ), TMID, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_IDENT OF TM1" );
-      TEXT_IO.PUT( "TA1 - timer 1 has id (" );
-      UNSIGNED32_IO.PUT( SPTEST.TIMER_ID( 1 ), WIDTH => 8, BASE => 16 );
-      TEXT_IO.PUT_LINE( ")" );
-   
--- AFTER WHICH IS ALLOWED TO FIRE
-
-      SPTEST.PRINT_TIME;
-
-      TEXT_IO.PUT_LINE( "TA1 - timer_after - timer 1 in 3 seconds" );
-      RTEMS.TIMER_FIRE_AFTER( 
-         TMID, 
-         3 * TEST_SUPPORT.TICKS_PER_SECOND,
-         SPTEST.DELAYED_RESUME'ACCESS,
-         RTEMS.NULL_ADDRESS,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_FIRE_AFTER" );
-
-      TEXT_IO.PUT_LINE( "TA1 - task_suspend( SELF )" );
-      RTEMS.TASK_SUSPEND( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SUSPEND" );
-          
-      SPTEST.PRINT_TIME;
-
--- AFTER WHICH IS RESET AND ALLOWED TO FIRE
-
-      TEXT_IO.PUT_LINE( "TA1 - timer_after - timer 1 in 3 seconds" );
-      RTEMS.TIMER_FIRE_AFTER( 
-         TMID, 
-         3 * TEST_SUPPORT.TICKS_PER_SECOND,
-         SPTEST.DELAYED_RESUME'ACCESS,
-         RTEMS.NULL_ADDRESS,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_FIRE_AFTER" );
-
-      TEXT_IO.PUT_LINE( "TA1 - task_wake_after - 1 second" );
-      RTEMS.TASK_WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
-          
-      SPTEST.PRINT_TIME;
-
-      TEXT_IO.PUT_LINE( "TA1 - timer_reset - timer 1" );
-      RTEMS.TIMER_RESET( TMID, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_RESET" );
-          
-      TEXT_IO.PUT_LINE( "TA1 - task_suspend( SELF )" );
-      RTEMS.TASK_SUSPEND( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SUSPEND" );
-
-      SPTEST.PRINT_TIME;
-
-TEST_SUPPORT.PAUSE;
-
--- 
--- Reset the time since we do not know how long the user waited
--- before pressing <cr> at the pause.  This insures that the
--- actual output matches the screen.
---
-
-      TIME := ( 1988, 12, 31, 9, 0, 7, 0 );
-
-      RTEMS.CLOCK_SET( TIME, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_SET" );
-
--- after which is canceled
-
-      TEXT_IO.PUT_LINE( "TA1 - timer_after - timer 1 in 3 seconds" );
-      RTEMS.TIMER_FIRE_AFTER( 
-         TMID, 
-         3 * TEST_SUPPORT.TICKS_PER_SECOND,
-         SPTEST.DELAYED_RESUME'ACCESS,
-         RTEMS.NULL_ADDRESS,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_FIRE_AFTER" );
-
-      TEXT_IO.PUT_LINE( "TA1 - timer_cancel - timer 1" );
-      RTEMS.TIMER_CANCEL( TMID, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_CANCEL" );
-          
--- when which is allowed to fire
-
-      SPTEST.PRINT_TIME;
-
-      RTEMS.CLOCK_GET( RTEMS.CLOCK_GET_TOD, TIME'ADDRESS, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET" );
-
-      TIME.SECOND := TIME.SECOND + 3;
-
-      TEXT_IO.PUT_LINE( "TA1 - timer_when - timer 1 in 3 seconds" );
-      RTEMS.TIMER_FIRE_WHEN( 
-         TMID, 
-         TIME,
-         SPTEST.DELAYED_RESUME'ACCESS,
-         RTEMS.NULL_ADDRESS,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_FIRE_WHEN" );
-
-      TEXT_IO.PUT_LINE( "TA1 - task_suspend( SELF )" );
-      RTEMS.TASK_SUSPEND( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SUSPEND" );
-
-      SPTEST.PRINT_TIME;
-
--- when which is canceled
-
-      RTEMS.CLOCK_GET( RTEMS.CLOCK_GET_TOD, TIME'ADDRESS, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET" );
-
-      TIME.SECOND := TIME.SECOND + 3;
-
-      TEXT_IO.PUT_LINE( "TA1 - timer_when - timer 1 in 3 seconds" );
-      RTEMS.TIMER_FIRE_WHEN( 
-         TMID, 
-         TIME,
-         SPTEST.DELAYED_RESUME'ACCESS,
-         RTEMS.NULL_ADDRESS,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_FIRE_WHEN" );
-
-      TEXT_IO.PUT_LINE( "TA1 - task_wake_after - 1 second" );
-      RTEMS.TASK_WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
-          
-      SPTEST.PRINT_TIME;
-
-      TEXT_IO.PUT_LINE( "TA1 - timer_cancel - timer 1" );
-      RTEMS.TIMER_CANCEL( TMID, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_CANCEL" );
-          
--- delete
-          
-      TEXT_IO.PUT_LINE(
-         "TA1 - task_wake_after - YIELD (only task at priority)"
-      );
-      RTEMS.TASK_WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER YIELD" );
-          
-      TEXT_IO.PUT_LINE( "TA1 - timer_delete - timer 1" );
-      RTEMS.TIMER_DELETE( TMID, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_DELETE" );
-          
-      TEXT_IO.PUT_LINE( "*** END OF TEST 22 ***" );
-      RTEMS.SHUTDOWN_EXECUTIVE( 0 );
-   
-   end TASK_1;
-
-end SPTEST;
diff --git a/c/src/ada-tests/sptests/sp22/sptest.ads b/c/src/ada-tests/sptests/sp22/sptest.ads
deleted file mode 100644
index 9401ce1cc0..0000000000
--- a/c/src/ada-tests/sptests/sp22/sptest.ads
+++ /dev/null
@@ -1,92 +0,0 @@
---
---  SPTEST / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package is the specification for Test 22 of the RTEMS
---  Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-
-package SPTEST is
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS tasks created
---  by this test.
---
-
-   TASK_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 1 ) of RTEMS.ID;
-   TASK_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 1 ) of RTEMS.NAME;
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS timers created
---  by this test.
---
-
-   TIMER_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 1 ) of RTEMS.ID;
-   TIMER_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 1 ) of RTEMS.NAME;
-
---
---  INIT
---
---  DESCRIPTION:
---
---  This RTEMS task initializes the application.
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  DELAYED_RESUME
---
---  DESCRIPTION:
---
---  This subprogram is scheduled to be fired as a timer service
---  routine.  When fired this subprogram resumes TASK_1.
---
-
-   procedure DELAYED_RESUME (
-      IGNORED_ID      : in     RTEMS.ID;  
-      IGNORED_ADDRESS : in     RTEMS.ADDRESS 
-   );
-
---
---  PRINT_TIME
---
---  DESCRIPTION:
---
---  This subprogram prints the name of TASK_1 and the current TIME of day.
---
-
-   procedure PRINT_TIME;
-
---
---  TASK_1
---
---  DESCRIPTION:
---
---  This RTEMS task tests the Timer Manager.
---
-
-   procedure TASK_1 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
-end SPTEST;
diff --git a/c/src/ada-tests/sptests/sp23/config.h b/c/src/ada-tests/sptests/sp23/config.h
deleted file mode 100644
index 5e60e5c235..0000000000
--- a/c/src/ada-tests/sptests/sp23/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*  config.h
- *
- *  This include file defines the Configuration Table for this test.
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-/* configuration information */
-
-#define CONFIGURE_SPTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_MAXIMUM_PORTS               1
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#define CONFIGURE_MAXIMUM_POSIX_THREADS              10
-#define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
-#define CONFIGURE_MAXIMUM_POSIX_MUTEXES              20
-#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES  10
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/c/src/ada-tests/sptests/sp23/sp23.adb b/c/src/ada-tests/sptests/sp23/sp23.adb
deleted file mode 100644
index ff3d5c0c4c..0000000000
--- a/c/src/ada-tests/sptests/sp23/sp23.adb
+++ /dev/null
@@ -1,57 +0,0 @@
---
---  MAIN / BODY
---
---  DESCRIPTION:
---
---  This is the entry point for Test SP23 of the Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-with SPTEST;
-with TEST_SUPPORT;
-
-procedure SP23 is
-  INIT_ID : RTEMS.ID;
-  STATUS  : RTEMS.STATUS_CODES;
-begin
-
-   RTEMS.TASK_CREATE(
-      RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
-      1,
-      RTEMS.MINIMUM_STACK_SIZE,
-      RTEMS.NO_PREEMPT,
-      RTEMS.DEFAULT_ATTRIBUTES,
-      INIT_ID,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
-
-
-   RTEMS.TASK_START(
-      INIT_ID,
-      SPTEST.INIT'ACCESS,
-      0,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
-
-   loop
-      delay 120.0;
-   end loop;
-
-end SP23;
-
diff --git a/c/src/ada-tests/sptests/sp23/sp23.scn b/c/src/ada-tests/sptests/sp23/sp23.scn
deleted file mode 100644
index 1a3af24ac7..0000000000
--- a/c/src/ada-tests/sptests/sp23/sp23.scn
+++ /dev/null
@@ -1,9 +0,0 @@
-*** TEST 23 ***
-INIT - port_create - DP1 - internal = 16#1000# external = 16#2000#
-TA1 - port_ident - 16#10001#
-TA1 - port_external_to_internal - external: 16#200E# => internal: 16#100E#
-TA1 - port_internal_to_external - internal: 16#100E# => external: 16#200E#
-TA1 - port_external_to_internal - external: 16#300E# => internal: 16#300E#
-TA1 - port_internal_to_external - internal:  16#50E# => external:  16#50E#
-TA1 - port_delete - DP1
-*** END OF TEST 23 ***
diff --git a/c/src/ada-tests/sptests/sp23/sptest.adb b/c/src/ada-tests/sptests/sp23/sptest.adb
deleted file mode 100644
index 0ff783a197..0000000000
--- a/c/src/ada-tests/sptests/sp23/sptest.adb
+++ /dev/null
@@ -1,179 +0,0 @@
---
---  SPTEST / BODY
---
---  DESCRIPTION:
---
---  This package is the implementation of Test 23 of the RTEMS
---  Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with ADDRESS_IO;
-with INTERFACES; use INTERFACES;
-with RTEMS;
-with TEST_SUPPORT;
-with TEXT_IO;
-with UNSIGNED32_IO;
-
-package body SPTEST is
-
---PAGE
--- 
---  INIT
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      INTERNAL_AREA : RTEMS.ADDRESS;
-      EXTERNAL_AREA : RTEMS.ADDRESS;
-      STATUS        : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** TEST 23 ***" );
-
-      SPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME(  'T', 'A', '1', ' ' );
-
-      RTEMS.TASK_CREATE( 
-         SPTEST.TASK_NAME( 1 ), 
-         1, 
-         2048, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.TASK_ID( 1 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA1" );
-
-      RTEMS.TASK_START(
-         SPTEST.TASK_ID( 1 ),
-         SPTEST.TASK_1'ACCESS,
-         0,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA1" );
-
-      SPTEST.PORT_NAME( 1 ) := RTEMS.BUILD_NAME(  'D', 'P', '1', ' ' );
-
-      INTERNAL_AREA := SPTEST.INTERNAL_PORT_AREA( 0 )'ADDRESS;
-      EXTERNAL_AREA := SPTEST.EXTERNAL_PORT_AREA( 0 )'ADDRESS;
-      RTEMS.PORT_CREATE(
-         SPTEST.PORT_NAME( 1 ), 
-         INTERNAL_AREA,
-         EXTERNAL_AREA,
-         SPTEST.INTERNAL_PORT_AREA'LENGTH,
-         SPTEST.PORT_ID( 1 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "PORT_CREATE OF DP1" );
-      TEXT_IO.PUT( "INIT - port_create - DP1 - internal = " );
-      ADDRESS_IO.PUT( INTERNAL_AREA, WIDTH => 8, BASE => 16 );
-      TEXT_IO.PUT( " external =  " );
-      ADDRESS_IO.PUT( EXTERNAL_AREA, WIDTH => 8, BASE => 16 );
-      TEXT_IO.NEW_LINE;
-   
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
-
-   end INIT;
-
---PAGE
--- 
---  TASK_1
---
-
-   procedure TASK_1 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      DPID            : RTEMS.ID;
-      TO_BE_CONVERTED : RTEMS.ADDRESS; 
-      CONVERTED       : RTEMS.ADDRESS; 
-      STATUS          : RTEMS.STATUS_CODES;
-   begin
-
-      RTEMS.PORT_IDENT( SPTEST.PORT_NAME( 1 ), DPID, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "PORT_IDENT" );
-      TEXT_IO.PUT( "TA1 - port_ident - " );
-      UNSIGNED32_IO.PUT( DPID, WIDTH => 8, BASE => 16 );
-      TEXT_IO.NEW_LINE;
-
-      TO_BE_CONVERTED :=  SPTEST.EXTERNAL_PORT_AREA( 16#E# )'ADDRESS;
-      RTEMS.PORT_EXTERNAL_TO_INTERNAL(
-         SPTEST.PORT_ID( 1 ),
-         TO_BE_CONVERTED,
-         CONVERTED,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "PORT_EXTERNAL_TO_INTERNAL" );
-      TEXT_IO.PUT( "TA1 - port_external_to_internal - external: " );
-      ADDRESS_IO.PUT( TO_BE_CONVERTED, WIDTH => 8, BASE => 16 );
-      TEXT_IO.PUT( " => internal: " );
-      ADDRESS_IO.PUT( CONVERTED, WIDTH => 8, BASE => 16 );
-      TEXT_IO.NEW_LINE;
-   
-      TO_BE_CONVERTED :=  SPTEST.INTERNAL_PORT_AREA( 16#E# )'ADDRESS;
-      RTEMS.PORT_INTERNAL_TO_EXTERNAL(
-         SPTEST.PORT_ID( 1 ),
-         TO_BE_CONVERTED,
-         CONVERTED,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "PORT_INTERNAL_TO_EXTERNAL" );
-      TEXT_IO.PUT( "TA1 - port_internal_to_external - internal: " );
-      ADDRESS_IO.PUT( TO_BE_CONVERTED, WIDTH => 8, BASE => 16 );
-      TEXT_IO.PUT( " => external: " );
-      ADDRESS_IO.PUT( CONVERTED, WIDTH => 8, BASE => 16 );
-      TEXT_IO.NEW_LINE;
-   
-      TO_BE_CONVERTED :=  SPTEST.ABOVE_PORT_AREA( 16#E# )'ADDRESS;
-      RTEMS.PORT_EXTERNAL_TO_INTERNAL(
-         SPTEST.PORT_ID( 1 ),
-         TO_BE_CONVERTED,
-         CONVERTED,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "PORT_EXTERNAL_TO_INTERNAL" );
-      TEXT_IO.PUT( "TA1 - port_external_to_internal - external: " );
-      ADDRESS_IO.PUT( TO_BE_CONVERTED, WIDTH => 8, BASE => 16 );
-      TEXT_IO.PUT( " => internal: " );
-      ADDRESS_IO.PUT( CONVERTED, WIDTH => 8, BASE => 16 );
-      TEXT_IO.NEW_LINE;
-   
-      TO_BE_CONVERTED :=  SPTEST.BELOW_PORT_AREA( 16#E# )'ADDRESS;
-      RTEMS.PORT_INTERNAL_TO_EXTERNAL(
-         SPTEST.PORT_ID( 1 ),
-         TO_BE_CONVERTED,
-         CONVERTED,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "PORT_INTERNAL_TO_EXTERNAL" );
-      TEXT_IO.PUT( "TA1 - port_internal_to_external - internal: " );
-      ADDRESS_IO.PUT( TO_BE_CONVERTED, WIDTH => 8, BASE => 16 );
-      TEXT_IO.PUT( " => external: " );
-      ADDRESS_IO.PUT( CONVERTED, WIDTH => 8, BASE => 16 );
-      TEXT_IO.NEW_LINE;
-   
-      TEXT_IO.PUT_LINE( "TA1 - port_delete - DP1" );
-      RTEMS.PORT_DELETE( SPTEST.PORT_ID( 1 ), STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "PORT_DELETE" );
-
-      TEXT_IO.PUT_LINE( "*** END OF TEST 23 ***" );
-      RTEMS.SHUTDOWN_EXECUTIVE( 0 );
-
-   end TASK_1;
-
-end SPTEST;
diff --git a/c/src/ada-tests/sptests/sp23/sptest.ads b/c/src/ada-tests/sptests/sp23/sptest.ads
deleted file mode 100644
index 9c72b05568..0000000000
--- a/c/src/ada-tests/sptests/sp23/sptest.ads
+++ /dev/null
@@ -1,118 +0,0 @@
---
---  SPTEST / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package is the specification for Test 23 of the RTEMS
---  Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-with SYSTEM;
-with System.Storage_Elements;
-
-package SPTEST is
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS tasks created
---  by this test.
---
-
-   TASK_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 1 ) of RTEMS.ID;
-   TASK_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 1 ) of RTEMS.NAME;
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS ports created
---  by this test.
---
-
-   PORT_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 1 ) of RTEMS.ID;
-   PORT_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 1 ) of RTEMS.NAME;
-
---
---  The following area defines a memory area to be used as the
---  internal address space of the port.
--- 
-
-   INTERNAL_PORT_AREA_ADDRESS : constant System.Address :=
-       System.Storage_Elements.To_Address(16#00001000#);
-
-   INTERNAL_PORT_AREA : array ( RTEMS.UNSIGNED32 range 0 .. 255 )
-      of RTEMS.UNSIGNED8;
-   for INTERNAL_PORT_AREA use at INTERNAL_PORT_AREA_ADDRESS;
-
---
---  The following area defines a memory area to be used as the
---  external address space of the port.
--- 
-
-   EXTERNAL_PORT_AREA_ADDRESS : constant System.Address :=
-       System.Storage_Elements.To_Address(16#00002000#);
-
-   EXTERNAL_PORT_AREA : array ( RTEMS.UNSIGNED32 range 0 .. 255 )
-      of RTEMS.UNSIGNED8;
-   for EXTERNAL_PORT_AREA use at EXTERNAL_PORT_AREA_ADDRESS;
-
---
---  The following area defines a memory area to be used for 
---  addresses which are below the address space of the port.
--- 
-
-   BELOW_PORT_AREA_ADDRESS : constant System.Address :=
-       System.Storage_Elements.To_Address(16#00000500#);
-
-   BELOW_PORT_AREA : array ( RTEMS.UNSIGNED32 range 0 .. 255 )
-      of RTEMS.UNSIGNED8;
-   for BELOW_PORT_AREA use at BELOW_PORT_AREA_ADDRESS;
-
---
---  The following area defines a memory area to be used for 
---  addresses which are above the address space of the port.
--- 
-
-   ABOVE_PORT_AREA_ADDRESS : constant System.Address :=
-       System.Storage_Elements.To_Address(16#00003000#);
-
-   ABOVE_PORT_AREA : array ( RTEMS.UNSIGNED32 range 0 .. 255 )
-      of RTEMS.UNSIGNED8;
-   for ABOVE_PORT_AREA use at ABOVE_PORT_AREA_ADDRESS;
-
---
---  INIT
---
---  DESCRIPTION:
---
---  This RTEMS task initializes the application.
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TASK_1
---
---  DESCRIPTION:
---
---  This RTEMS task tests the Dual Ported Memory Manager.
---
-
-   procedure TASK_1 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
-end SPTEST;
diff --git a/c/src/ada-tests/sptests/sp24/config.h b/c/src/ada-tests/sptests/sp24/config.h
deleted file mode 100644
index ae1c63c601..0000000000
--- a/c/src/ada-tests/sptests/sp24/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*  config.h
- *
- *  This include file defines the Configuration Table for this test.
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-/* configuration information */
-
-#define CONFIGURE_SPTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_MAXIMUM_TIMERS              3
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#define CONFIGURE_MAXIMUM_POSIX_THREADS              10
-#define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
-#define CONFIGURE_MAXIMUM_POSIX_MUTEXES              20
-#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES  10
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/c/src/ada-tests/sptests/sp24/sp24.adb b/c/src/ada-tests/sptests/sp24/sp24.adb
deleted file mode 100644
index d060a5308e..0000000000
--- a/c/src/ada-tests/sptests/sp24/sp24.adb
+++ /dev/null
@@ -1,57 +0,0 @@
---
---  MAIN / BODY
---
---  DESCRIPTION:
---
---  This is the entry point for Test SP24 of the Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-with SPTEST;
-with TEST_SUPPORT;
-
-procedure SP24 is
-  INIT_ID : RTEMS.ID;
-  STATUS  : RTEMS.STATUS_CODES;
-begin
-
-   RTEMS.TASK_CREATE(
-      RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
-      1,
-      RTEMS.MINIMUM_STACK_SIZE,
-      RTEMS.NO_PREEMPT,
-      RTEMS.DEFAULT_ATTRIBUTES,
-      INIT_ID,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
-
-
-   RTEMS.TASK_START(
-      INIT_ID,
-      SPTEST.INIT'ACCESS,
-      0,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
-
-   loop
-      delay 120.0;
-   end loop;
-
-end SP24;
-
diff --git a/c/src/ada-tests/sptests/sp24/sp24.scn b/c/src/ada-tests/sptests/sp24/sp24.scn
deleted file mode 100644
index 374ef9540b..0000000000
--- a/c/src/ada-tests/sptests/sp24/sp24.scn
+++ /dev/null
@@ -1,17 +0,0 @@
-*** TEST 24 ***
-TA1  - clock_get -  9: 0: 0   12/31/1988
-TA2  - clock_get -  9: 0: 0   12/31/1988
-TA3  - clock_get -  9: 0: 0   12/31/1988
-TA1  - clock_get -  9: 0: 5   12/31/1988
-TA2  - clock_get -  9: 0:10   12/31/1988
-TA1  - clock_get -  9: 0:10   12/31/1988
-TA3  - clock_get -  9: 0:15   12/31/1988
-TA1  - clock_get -  9: 0:15   12/31/1988
-TA2  - clock_get -  9: 0:20   12/31/1988
-TA1  - clock_get -  9: 0:20   12/31/1988
-TA1  - clock_get -  9: 0:25   12/31/1988
-TA3  - clock_get -  9: 0:30   12/31/1988
-TA1  - clock_get -  9: 0:30   12/31/1988
-TA2  - clock_get -  9: 0:30   12/31/1988
-*** END OF TEST 24 ***
-
diff --git a/c/src/ada-tests/sptests/sp24/sptest.adb b/c/src/ada-tests/sptests/sp24/sptest.adb
deleted file mode 100644
index b94a27eadb..0000000000
--- a/c/src/ada-tests/sptests/sp24/sptest.adb
+++ /dev/null
@@ -1,171 +0,0 @@
---
---  SPTEST / BODY
---
---  DESCRIPTION:
---
---  This package is the implementation of Test 24 of the RTEMS
---  Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with INTERFACES; use INTERFACES;
-with RTEMS;
-with TEST_SUPPORT;
-with TEXT_IO;
-
-package body SPTEST is
-
---PAGE
--- 
---  INIT
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      TIME   : RTEMS.TIME_OF_DAY;
-      INDEX  : RTEMS.UNSIGNED32;
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** TEST 24 ***" );
-
-      TIME := ( 1988, 12, 31, 9, 0, 0, 0 );
-
-      RTEMS.CLOCK_SET( TIME, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_SET" );
-
-      SPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME(  'T', 'A', '1', ' ' );
-      SPTEST.TASK_NAME( 2 ) := RTEMS.BUILD_NAME(  'T', 'A', '2', ' ' );
-      SPTEST.TASK_NAME( 3 ) := RTEMS.BUILD_NAME(  'T', 'A', '3', ' ' );
-
-      SPTEST.TIMER_NAME( 1 ) := RTEMS.BUILD_NAME(  'T', 'M', '1', ' ' );
-      SPTEST.TIMER_NAME( 2 ) := RTEMS.BUILD_NAME(  'T', 'M', '2', ' ' );
-      SPTEST.TIMER_NAME( 3 ) := RTEMS.BUILD_NAME(  'T', 'M', '3', ' ' );
-
-      for INDEX in 1 .. 3
-      loop
-
-         RTEMS.TASK_CREATE( 
-            SPTEST.TASK_NAME( INDEX ), 
-            1, 
-            2048, 
-            RTEMS.DEFAULT_MODES,
-            RTEMS.DEFAULT_ATTRIBUTES,
-            SPTEST.TASK_ID( INDEX ),
-            STATUS
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE LOOP" );
-
-         RTEMS.TIMER_CREATE(
-            SPTEST.TIMER_NAME( INDEX ), 
-            SPTEST.TIMER_ID( INDEX ),
-            STATUS
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_CREATE LOOP" );
-
-      end loop;
-
-      for INDEX in 1 .. 3
-      loop
-
-         RTEMS.TASK_START(
-            SPTEST.TASK_ID( INDEX ),
-            SPTEST.TASK_1_THROUGH_3'ACCESS,
-            RTEMS.TASK_ARGUMENT( INDEX ),
-            STATUS
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START LOOP" );
-
-      end loop;
-
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
-
-   end INIT;
-
---PAGE
--- 
---  RESUME_TASK
---
-
-   procedure RESUME_TASK (
-      TIMER_ID        : in     RTEMS.ID;
-      IGNORED_ADDRESS : in     RTEMS.ADDRESS
-   ) is
-      TASK_TO_RESUME : RTEMS.ID;
-      STATUS         : RTEMS.STATUS_CODES;
-   begin
-
-      TASK_TO_RESUME := SPTEST.TASK_ID(INTEGER( RTEMS.GET_INDEX( TIMER_ID ) ));
-      RTEMS.TASK_RESUME( TASK_TO_RESUME, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_RESUME" );
-
-   end RESUME_TASK;
-
---PAGE
--- 
---  TASK_1_THROUGH_3
---
-
-   procedure TASK_1_THROUGH_3 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      TID    : RTEMS.ID;
-      TIME   : RTEMS.TIME_OF_DAY;
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      RTEMS.TASK_IDENT( RTEMS.SELF, RTEMS.SEARCH_ALL_NODES, TID, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_IDENT OF SELF" );
-   
-      loop
-
-         RTEMS.TIMER_FIRE_AFTER( 
-            SPTEST.TIMER_ID( INTEGER( ARGUMENT ) ), 
-            TEST_SUPPORT.TASK_NUMBER( TID ) * 5 * 
-              TEST_SUPPORT.TICKS_PER_SECOND, 
-            SPTEST.RESUME_TASK'ACCESS,
-            RTEMS.NULL_ADDRESS,
-            STATUS
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_FIRE_AFTER" );
-
-         RTEMS.CLOCK_GET( RTEMS.CLOCK_GET_TOD, TIME'ADDRESS, STATUS );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET" );
-
-         if TIME.SECOND >= 35 then
-            TEXT_IO.PUT_LINE( "*** END OF TEST 24 ***" );
-            RTEMS.SHUTDOWN_EXECUTIVE( 0 );
-         end if;
-
-         TEST_SUPPORT.PUT_NAME( 
-            SPTEST.TASK_NAME( INTEGER( TEST_SUPPORT.TASK_NUMBER( TID ) ) ),
-            FALSE
-         );
-
-         TEST_SUPPORT.PRINT_TIME( " - clock_get - ", TIME, "" );
-         TEXT_IO.NEW_LINE;
-
-         RTEMS.TASK_SUSPEND( RTEMS.SELF, STATUS ); 
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SUSPEND" );
-          
-      end loop;
-   
-   end TASK_1_THROUGH_3;
-
-end SPTEST;
diff --git a/c/src/ada-tests/sptests/sp24/sptest.ads b/c/src/ada-tests/sptests/sp24/sptest.ads
deleted file mode 100644
index f664be5bd8..0000000000
--- a/c/src/ada-tests/sptests/sp24/sptest.ads
+++ /dev/null
@@ -1,82 +0,0 @@
---
---  SPTEST / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package is the specification for Test 24 of the RTEMS
---  Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-
-package SPTEST is
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS tasks created
---  by this test.
---
-
-   TASK_ID   : array ( 1 .. 3 ) of RTEMS.ID;
-   TASK_NAME : array ( 1 .. 3 ) of RTEMS.NAME;
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS timers created
---  by this test.
---
-
-   TIMER_ID   : array ( 1 .. 3 ) of RTEMS.ID;
-   TIMER_NAME : array ( 1 .. 3 ) of RTEMS.NAME;
-
---
---  INIT
---
---  DESCRIPTION:
---
---  This RTEMS task initializes the application.
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  RESUME_TASK
---
---  DESCRIPTION:
---
---  This subprogram is scheduled as a timer service routine.  When
---  it fires it resumes the task which is mapped to this timer.
---
-
-   procedure RESUME_TASK (
-      TIMER_ID        : in     RTEMS.ID;
-      IGNORED_ADDRESS : in     RTEMS.ADDRESS 
-   );
-
---
---  TASK_1_THROUGH_3
---
---  DESCRIPTION:
---
---  This RTEMS task tests the Timer Manager.
---
-
-   procedure TASK_1_THROUGH_3 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
-end SPTEST;
diff --git a/c/src/ada-tests/sptests/sp25/config.h b/c/src/ada-tests/sptests/sp25/config.h
deleted file mode 100644
index 5d162bd899..0000000000
--- a/c/src/ada-tests/sptests/sp25/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*  config.h
- *
- *  This include file defines the Configuration Table for this test.
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-/* configuration information */
-
-#define CONFIGURE_SPTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_MAXIMUM_REGIONS             1
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#define CONFIGURE_MAXIMUM_POSIX_THREADS              10
-#define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
-#define CONFIGURE_MAXIMUM_POSIX_MUTEXES              20
-#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES  10
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/c/src/ada-tests/sptests/sp25/sp25.adb b/c/src/ada-tests/sptests/sp25/sp25.adb
deleted file mode 100644
index 58e45b339d..0000000000
--- a/c/src/ada-tests/sptests/sp25/sp25.adb
+++ /dev/null
@@ -1,57 +0,0 @@
---
---  MAIN / BODY
---
---  DESCRIPTION:
---
---  This is the entry point for Test SP25 of the Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-with SPTEST;
-with TEST_SUPPORT;
-
-procedure SP25 is
-  INIT_ID : RTEMS.ID;
-  STATUS  : RTEMS.STATUS_CODES;
-begin
-
-   RTEMS.TASK_CREATE(
-      RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
-      1,
-      RTEMS.MINIMUM_STACK_SIZE,
-      RTEMS.NO_PREEMPT,
-      RTEMS.DEFAULT_ATTRIBUTES,
-      INIT_ID,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
-
-
-   RTEMS.TASK_START(
-      INIT_ID,
-      SPTEST.INIT'ACCESS,
-      0,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
-
-   loop
-      delay 120.0;
-   end loop;
-
-end SP25;
-
diff --git a/c/src/ada-tests/sptests/sp25/sp25.scn b/c/src/ada-tests/sptests/sp25/sp25.scn
deleted file mode 100644
index 0b0fbcf102..0000000000
--- a/c/src/ada-tests/sptests/sp25/sp25.scn
+++ /dev/null
@@ -1,29 +0,0 @@
-*** TEST 25 ***
-TA1 - region_ident - rnid => 16#10001#
-TA1 - region_get_segment - wait on 64 byte segment from region 1
-TA1 - got segment from region 1 - 16#F9B8#
-TA1 - region_get_segment - wait on 128 byte segment from region 1
-TA1 - got segment from region 1 - 16#F930#
-TA1 - region_get_segment - wait on 256 byte segment from region 1
-TA1 - got segment from region 1 - 16#F828#
-TA1 - region_get_segment - wait on 512 byte segment from region 1
-TA1 - got segment from region 1 - 16#F620#
-TA1 - region_get_segment - wait on 1024 byte segment from region 1
-TA1 - got segment from region 1 - 16#F218#
-TA1 - region_get_segment - wait on 2048 byte segment from region 1
-TA1 - got segment from region 1 - 16#EA10#
-TA1 - region_get_segment - wait on 4096 byte segment from region 1
-TA1 - got segment from region 1 - 16#DA08#
-TA1 - region_get_segment - wait on 8192 byte segment from region 1
-TA1 - got segment from region 1 - 16#BA00#
-<pause>
-TA1 - region_return_segment - return segment to region 1 - 16#F828#
-TA1 - region_return_segment - return segment to region 1 - 16#F620#
-TA1 - region_return_segment - return segment to region 1 - 16#F9B8#
-TA1 - region_return_segment - return segment to region 1 - 16#F930#
-TA1 - region_return_segment - return segment to region 1 - 16#DA08#
-TA1 - region_return_segment - return segment to region 1 - 16#EA10#
-TA1 - region_return_segment - return segment to region 1 - 16#BA00#
-TA1 - region_return_segment - return segment to region 1 - 16#F218#
-TA1 - region_delete - walks heap if debug enabled
-*** END OF TEST 25 ***
diff --git a/c/src/ada-tests/sptests/sp25/sptest.adb b/c/src/ada-tests/sptests/sp25/sptest.adb
deleted file mode 100644
index a9aace5212..0000000000
--- a/c/src/ada-tests/sptests/sp25/sptest.adb
+++ /dev/null
@@ -1,367 +0,0 @@
---
---  SPTEST / BODY
---
---  DESCRIPTION:
---
---  This package is the implementation of Test 25 of the RTEMS
---  Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with INTERFACES; use INTERFACES;
-with RTEMS;
-with TEST_SUPPORT;
-with TEXT_IO;
-with UNSIGNED32_IO;
-
-package body SPTEST is
-
---PAGE
--- 
---  INIT
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** TEST 25 ***" );
-
-      SPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME(  'T', 'A', '1', ' ' );
-
-      RTEMS.TASK_CREATE( 
-         SPTEST.TASK_NAME( 1 ), 
-         SPTEST.BASE_PRIORITY, 
-         2048, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.TASK_ID( 1 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA1" );
-
-      RTEMS.TASK_START(
-         SPTEST.TASK_ID( 1 ),
-         SPTEST.TASK_1'ACCESS,
-         0,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA1" );
-
-      SPTEST.REGION_NAME( 1 ) := RTEMS.BUILD_NAME(  'R', 'N', '1', ' ' );
-
-      RTEMS.REGION_CREATE(
-         SPTEST.REGION_NAME( 1 ), 
-         SPTEST.AREA_1'ADDRESS,
-         64000, 
-         32,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         SPTEST.REGION_ID( 1 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_CREATE OF RN1" );
-
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
-
-   end INIT;
-
---PAGE
--- 
---  PUT_ADDRESS_FROM_AREA_1
---
-
-   procedure PUT_ADDRESS_FROM_AREA_1 (
-      TO_BE_PRINTED : in     RTEMS.ADDRESS
-   ) is
-
-   begin
-
-      UNSIGNED32_IO.PUT(
-         RTEMS.SUBTRACT( TO_BE_PRINTED, SPTEST.AREA_1'ADDRESS ),
-         WIDTH => 8,
-         BASE => 16
-      );
-
-   end PUT_ADDRESS_FROM_AREA_1;
-
---PAGE
--- 
---  TASK_1
---
-
-   procedure TASK_1 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      RNID              : RTEMS.ID;
-      SEGMENT_ADDRESS_1 : RTEMS.ADDRESS;
-      SEGMENT_ADDRESS_2 : RTEMS.ADDRESS;
-      SEGMENT_ADDRESS_3 : RTEMS.ADDRESS;
-      SEGMENT_ADDRESS_4 : RTEMS.ADDRESS;
-      SEGMENT_ADDRESS_5 : RTEMS.ADDRESS;
-      SEGMENT_ADDRESS_6 : RTEMS.ADDRESS;
-      SEGMENT_ADDRESS_7 : RTEMS.ADDRESS;
-      SEGMENT_ADDRESS_8 : RTEMS.ADDRESS;
-      STATUS            : RTEMS.STATUS_CODES;
-   begin
-
-      RTEMS.REGION_IDENT( SPTEST.REGION_NAME( 1 ), RNID, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_IDENT OF RN1" );
-      TEXT_IO.PUT( "TA1 - region_ident - rnid => " );
-      UNSIGNED32_IO.PUT( RNID, WIDTH => 8, BASE => 16 );
-      TEXT_IO.NEW_LINE;
-       
-      TEXT_IO.PUT( "TA1 - region_get_segment - wait on " );
-      TEXT_IO.PUT_LINE( "64 byte segment from region 1" );
-      RTEMS.REGION_GET_SEGMENT(
-         SPTEST.REGION_ID( 1 ),
-         64,
-         RTEMS.DEFAULT_OPTIONS,
-         RTEMS.NO_TIMEOUT,
-         SEGMENT_ADDRESS_1,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_GET_SEGMENT" );
-      TEXT_IO.PUT( "TA1 - got segment from region 1 - " );
-      SPTEST.PUT_ADDRESS_FROM_AREA_1( SEGMENT_ADDRESS_1 );
-      TEXT_IO.NEW_LINE;
-
-      TEXT_IO.PUT( "TA1 - region_get_segment - wait on " );
-      TEXT_IO.PUT_LINE( "128 byte segment from region 1" );
-      RTEMS.REGION_GET_SEGMENT(
-         SPTEST.REGION_ID( 1 ),
-         128,
-         RTEMS.DEFAULT_OPTIONS,
-         RTEMS.NO_TIMEOUT,
-         SEGMENT_ADDRESS_2,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_GET_SEGMENT" );
-      TEXT_IO.PUT( "TA1 - got segment from region 1 - " );
-      SPTEST.PUT_ADDRESS_FROM_AREA_1( SEGMENT_ADDRESS_2 );
-      TEXT_IO.NEW_LINE;
-
-      TEXT_IO.PUT( "TA1 - region_get_segment - wait on " );
-      TEXT_IO.PUT_LINE( "256 byte segment from region 1" );
-      RTEMS.REGION_GET_SEGMENT(
-         SPTEST.REGION_ID( 1 ),
-         256,
-         RTEMS.DEFAULT_OPTIONS,
-         RTEMS.NO_TIMEOUT,
-         SEGMENT_ADDRESS_3,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_GET_SEGMENT" );
-      TEXT_IO.PUT( "TA1 - got segment from region 1 - " );
-      SPTEST.PUT_ADDRESS_FROM_AREA_1( SEGMENT_ADDRESS_3 );
-      TEXT_IO.NEW_LINE;
-
-      TEXT_IO.PUT( "TA1 - region_get_segment - wait on " );
-      TEXT_IO.PUT_LINE( "512 byte segment from region 1" );
-      RTEMS.REGION_GET_SEGMENT(
-         SPTEST.REGION_ID( 1 ),
-         512,
-         RTEMS.DEFAULT_OPTIONS,
-         RTEMS.NO_TIMEOUT,
-         SEGMENT_ADDRESS_4,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_GET_SEGMENT" );
-      TEXT_IO.PUT( "TA1 - got segment from region 1 - " );
-      SPTEST.PUT_ADDRESS_FROM_AREA_1( SEGMENT_ADDRESS_4 );
-      TEXT_IO.NEW_LINE;
-
-      TEXT_IO.PUT( "TA1 - region_get_segment - wait on " );
-      TEXT_IO.PUT_LINE( "1024 byte segment from region 1" );
-      RTEMS.REGION_GET_SEGMENT(
-         SPTEST.REGION_ID( 1 ),
-         1024,
-         RTEMS.DEFAULT_OPTIONS,
-         RTEMS.NO_TIMEOUT,
-         SEGMENT_ADDRESS_5,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_GET_SEGMENT" );
-      TEXT_IO.PUT( "TA1 - got segment from region 1 - " );
-      SPTEST.PUT_ADDRESS_FROM_AREA_1( SEGMENT_ADDRESS_5 );
-      TEXT_IO.NEW_LINE;
-
-      TEXT_IO.PUT( "TA1 - region_get_segment - wait on " );
-      TEXT_IO.PUT_LINE( "2048 byte segment from region 1" );
-      RTEMS.REGION_GET_SEGMENT(
-         SPTEST.REGION_ID( 1 ),
-         2048,
-         RTEMS.DEFAULT_OPTIONS,
-         RTEMS.NO_TIMEOUT,
-         SEGMENT_ADDRESS_6,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_GET_SEGMENT" );
-      TEXT_IO.PUT( "TA1 - got segment from region 1 - " );
-      SPTEST.PUT_ADDRESS_FROM_AREA_1( SEGMENT_ADDRESS_6 );
-      TEXT_IO.NEW_LINE;
-
-      TEXT_IO.PUT( "TA1 - region_get_segment - wait on " );
-      TEXT_IO.PUT_LINE( "4096 byte segment from region 1" );
-      RTEMS.REGION_GET_SEGMENT(
-         SPTEST.REGION_ID( 1 ),
-         4096,
-         RTEMS.DEFAULT_OPTIONS,
-         RTEMS.NO_TIMEOUT,
-         SEGMENT_ADDRESS_7,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_GET_SEGMENT" );
-      TEXT_IO.PUT( "TA1 - got segment from region 1 - " );
-      SPTEST.PUT_ADDRESS_FROM_AREA_1( SEGMENT_ADDRESS_7 );
-      TEXT_IO.NEW_LINE;
-
-      TEXT_IO.PUT( "TA1 - region_get_segment - wait on " );
-      TEXT_IO.PUT_LINE( "8192 byte segment from region 1" );
-      RTEMS.REGION_GET_SEGMENT(
-         SPTEST.REGION_ID( 1 ),
-         8192,
-         RTEMS.DEFAULT_OPTIONS,
-         RTEMS.NO_TIMEOUT,
-         SEGMENT_ADDRESS_8,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_GET_SEGMENT" );
-      TEXT_IO.PUT( "TA1 - got segment from region 1 - " );
-      SPTEST.PUT_ADDRESS_FROM_AREA_1( SEGMENT_ADDRESS_8 );
-      TEXT_IO.NEW_LINE;
-
-TEST_SUPPORT.PAUSE;
-
-      TEXT_IO.PUT( 
-         "TA1 - region_return_segment - return segment to region 1 - "
-      );
-      SPTEST.PUT_ADDRESS_FROM_AREA_1( SEGMENT_ADDRESS_3 );
-      RTEMS.REGION_RETURN_SEGMENT(
-         SPTEST.REGION_ID( 1 ),
-         SEGMENT_ADDRESS_3,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_RETURN_SEGMENT" );
-      TEXT_IO.NEW_LINE;
-      SEGMENT_ADDRESS_3 := RTEMS.NULL_ADDRESS;
-
-      TEXT_IO.PUT( 
-         "TA1 - region_return_segment - return segment to region 1 - "
-      );
-      SPTEST.PUT_ADDRESS_FROM_AREA_1( SEGMENT_ADDRESS_4 );
-      RTEMS.REGION_RETURN_SEGMENT(
-         SPTEST.REGION_ID( 1 ),
-         SEGMENT_ADDRESS_4,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_RETURN_SEGMENT" );
-      TEXT_IO.NEW_LINE;
-      SEGMENT_ADDRESS_4 := RTEMS.NULL_ADDRESS;
-
-      TEXT_IO.PUT( 
-         "TA1 - region_return_segment - return segment to region 1 - "
-      );
-      SPTEST.PUT_ADDRESS_FROM_AREA_1( SEGMENT_ADDRESS_1 );
-      RTEMS.REGION_RETURN_SEGMENT(
-         SPTEST.REGION_ID( 1 ),
-         SEGMENT_ADDRESS_1,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_RETURN_SEGMENT" );
-      TEXT_IO.NEW_LINE;
-      SEGMENT_ADDRESS_1 := RTEMS.NULL_ADDRESS;
-
-      TEXT_IO.PUT( 
-         "TA1 - region_return_segment - return segment to region 1 - "
-      );
-      SPTEST.PUT_ADDRESS_FROM_AREA_1( SEGMENT_ADDRESS_2 );
-      RTEMS.REGION_RETURN_SEGMENT(
-         SPTEST.REGION_ID( 1 ),
-         SEGMENT_ADDRESS_2,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_RETURN_SEGMENT" );
-      TEXT_IO.NEW_LINE;
-      SEGMENT_ADDRESS_2 := RTEMS.NULL_ADDRESS;
-
-      TEXT_IO.PUT( 
-         "TA1 - region_return_segment - return segment to region 1 - "
-      );
-      SPTEST.PUT_ADDRESS_FROM_AREA_1( SEGMENT_ADDRESS_7 );
-      RTEMS.REGION_RETURN_SEGMENT(
-         SPTEST.REGION_ID( 1 ),
-         SEGMENT_ADDRESS_7,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_RETURN_SEGMENT" );
-      TEXT_IO.NEW_LINE;
-      SEGMENT_ADDRESS_7 := RTEMS.NULL_ADDRESS;
-
-      TEXT_IO.PUT( 
-         "TA1 - region_return_segment - return segment to region 1 - "
-      );
-      SPTEST.PUT_ADDRESS_FROM_AREA_1( SEGMENT_ADDRESS_6 );
-      RTEMS.REGION_RETURN_SEGMENT(
-         SPTEST.REGION_ID( 1 ),
-         SEGMENT_ADDRESS_6,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_RETURN_SEGMENT" );
-      TEXT_IO.NEW_LINE;
-      SEGMENT_ADDRESS_6 := RTEMS.NULL_ADDRESS;
-
-      TEXT_IO.PUT( 
-         "TA1 - region_return_segment - return segment to region 1 - "
-      );
-      SPTEST.PUT_ADDRESS_FROM_AREA_1( SEGMENT_ADDRESS_8 );
-      RTEMS.REGION_RETURN_SEGMENT(
-         SPTEST.REGION_ID( 1 ),
-         SEGMENT_ADDRESS_8,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_RETURN_SEGMENT" );
-      TEXT_IO.NEW_LINE;
-      SEGMENT_ADDRESS_8 := RTEMS.NULL_ADDRESS;
-
-      TEXT_IO.PUT( 
-         "TA1 - region_return_segment - return segment to region 1 - "
-      );
-      SPTEST.PUT_ADDRESS_FROM_AREA_1( SEGMENT_ADDRESS_5 );
-      RTEMS.REGION_RETURN_SEGMENT(
-         SPTEST.REGION_ID( 1 ),
-         SEGMENT_ADDRESS_5,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_RETURN_SEGMENT" );
-      TEXT_IO.NEW_LINE;
-      SEGMENT_ADDRESS_5 := RTEMS.NULL_ADDRESS;
-
-      TEXT_IO.PUT_LINE(
-         "TA1 - region_delete - walks heap if debug enabled"
-      );
-      RTEMS.REGION_DELETE( SPTEST.REGION_ID( 1 ), STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_DELETE OF RN1" );
-
-      TEXT_IO.PUT_LINE( "*** END OF TEST 25 ***" );
-      RTEMS.SHUTDOWN_EXECUTIVE( 0 );
-
-   end TASK_1;
-
-end SPTEST;
diff --git a/c/src/ada-tests/sptests/sp25/sptest.ads b/c/src/ada-tests/sptests/sp25/sptest.ads
deleted file mode 100644
index 516421526f..0000000000
--- a/c/src/ada-tests/sptests/sp25/sptest.ads
+++ /dev/null
@@ -1,103 +0,0 @@
---
---  SPTEST / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package is the specification for Test 25 of the RTEMS
---  Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-
-package SPTEST is
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS tasks created
---  by this test.
---
-
-   TASK_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 2 ) of RTEMS.ID;
-   TASK_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 2 ) of RTEMS.NAME;
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS regions created
---  by this test.
---
-
-   REGION_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 2 ) of RTEMS.ID;
-   REGION_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 2 ) of RTEMS.NAME;
-
---
---  The following constant defines the priority of most of the 
---  RTEMS tasks in this test.  This allows one of the tasks to
---  easily set itself to a higher priority than the rest.
---
-
-   BASE_PRIORITY : constant RTEMS.TASK_PRIORITY := 140;
-
---
---  These arrays define the memory areas used for the regions in
---  this test.
---
-
-   AREA_1 : array ( RTEMS.UNSIGNED32 range 0 .. 64000 ) of RTEMS.UNSIGNED8;
-   for AREA_1'ALIGNMENT use RTEMS.STRUCTURE_ALIGNMENT;
-
---
---  INIT
---
---  DESCRIPTION:
---
---  This RTEMS task initializes the application.
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  PUT_ADDRESS_FROM_AREA_1
---
---  DESCRIPTION:
---
---  This subprogram prints the offset of the address TO_BE_PRINTED 
---  from the first byte of AREA_1.
---
---  NOTE:
---
---  This subprogram is used because the actual address of AREA_1
---  varies based upon the size of the executable, the target board,
---  and the target processor.
---
-
-   procedure PUT_ADDRESS_FROM_AREA_1 (
-      TO_BE_PRINTED : in     RTEMS.ADDRESS
-   );
-
---
---  TASK_1
---
---  DESCRIPTION:
---
---  This RTEMS task tests the Region Manager.
---
-
-   procedure TASK_1 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
-end SPTEST;
diff --git a/c/src/ada-tests/sptests/spsize/spsize.adb b/c/src/ada-tests/sptests/spsize/spsize.adb
deleted file mode 100644
index e6da47f2ba..0000000000
--- a/c/src/ada-tests/sptests/spsize/spsize.adb
+++ /dev/null
@@ -1,57 +0,0 @@
---
---  MAIN / BODY
---
---  DESCRIPTION:
---
---  This is the entry point for Test SPsize of the Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-with SPTEST;
-with TEST_SUPPORT;
-
-procedure SPsize is
-  INIT_ID : RTEMS.ID;
-  STATUS  : RTEMS.STATUS_CODES;
-begin
-
-   RTEMS.TASK_CREATE(
-      RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
-      1,
-      RTEMS.MINIMUM_STACK_SIZE,
-      RTEMS.NO_PREEMPT,
-      RTEMS.DEFAULT_ATTRIBUTES,
-      INIT_ID,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
-
-
-   RTEMS.TASK_START(
-      INIT_ID,
-      SPTEST.INIT'ACCESS,
-      0,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
-
-   loop
-      delay 120.0;
-   end loop;
-
-end SPsize;
-
diff --git a/c/src/ada-tests/sptests/spsize/sptest.adb b/c/src/ada-tests/sptests/spsize/sptest.adb
deleted file mode 100644
index 1080728f8f..0000000000
--- a/c/src/ada-tests/sptests/spsize/sptest.adb
+++ /dev/null
@@ -1,199 +0,0 @@
---
---  SPTEST / BODY
---
---  DESCRIPTION:
---
---  This package is the implementation of Test 1 of the RTEMS
---  Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with INTERFACES; use INTERFACES;
-with RTEMS;
-with RTEMS_TEST_SUPPORT;
-with TEST_SUPPORT;
-with TEXT_IO;
-with UNSIGNED32_IO;
-
-package body SPTEST is
-
-
---PAGE
--- 
---  INIT
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** TEST SIZE ***" );
-
-      SPTEST.PUT_SIZE(
-         "Tasks",
-         TRUE,
-         "maximum_tasks",
-         RTEMS_TEST_SUPPORT.PER_TASK
-      );
-
-      SPTEST.PUT_SIZE(
-         "Timers",
-         TRUE,
-         "maximum_timers",
-         RTEMS_TEST_SUPPORT.PER_TIMER
-      );
-
-      SPTEST.PUT_SIZE(
-         "Semaphores",
-         TRUE,
-         "maximum_semaphores",
-         RTEMS_TEST_SUPPORT.PER_SEMAPHORE
-      );
-
-      SPTEST.PUT_SIZE(
-         "Message Queues",
-         TRUE,
-         "maximum_message_queues",
-         RTEMS_TEST_SUPPORT.PER_MESSAGE_QUEUE
-      );
-
-      SPTEST.PUT_SIZE(
-         "Messages",
-         TRUE,
-         "maximum_messages",
-         RTEMS_TEST_SUPPORT.PER_MESSAGE
-      );
-
-      SPTEST.PUT_SIZE(
-         "Regions",
-         TRUE,
-         "maximum_regions",
-         RTEMS_TEST_SUPPORT.PER_REGION
-      );
-
-      SPTEST.PUT_SIZE(
-         "Partitions",
-         TRUE,
-         "maximum_paritions",
-         RTEMS_TEST_SUPPORT.PER_PARTITION
-      );
-
-      SPTEST.PUT_SIZE(
-         "Ports",
-         TRUE,
-         "maximum_ports",
-         RTEMS_TEST_SUPPORT.PER_PORT
-      );
-
-      SPTEST.PUT_SIZE(
-         "Periods",
-         TRUE,
-         "maximum_periods",
-         RTEMS_TEST_SUPPORT.PER_PERIOD
-      );
-
-      SPTEST.PUT_SIZE(
-         "Extensions",
-         TRUE,
-         "maximum_extensions",
-         RTEMS_TEST_SUPPORT.PER_EXTENSION
-      );
-
-      SPTEST.PUT_SIZE(
-         "Device Drivers",
-         TRUE,
-         "number_of_device_drivers",
-         RTEMS_TEST_SUPPORT.PER_DRIVER
-      );
-
-      SPTEST.PUT_SIZE(
-         "System Requirements",
-         FALSE,
-         REQUIREMENT => RTEMS_TEST_SUPPORT.SYSTEM_REQUIREMENTS
-      );
-
-      SPTEST.PUT_SIZE(
-         "Floating Point Tasks",
-         TRUE,
-         "FP attributes",
-         RTEMS_TEST_SUPPORT.PER_FP_TASK
-      );
-
-      TEXT_IO.PUT_LINE( "User's Tasks' Stacks - " );
-      TEXT_IO.NEW_LINE;
-
-      TEXT_IO.PUT_LINE( "Interrupt Stacks - " );
-      TEXT_IO.NEW_LINE;
-
-      SPTEST.PUT_SIZE(
-         "Global object tables",
-         TRUE,
-         "maximum_nodes",
-         RTEMS_TEST_SUPPORT.PER_NODE
-      );
-
-      SPTEST.PUT_SIZE(
-         "Global objects",
-         TRUE,
-         "maximum_global_objects",
-         RTEMS_TEST_SUPPORT.PER_GLOBAL_OBJECT
-      );
-
-      SPTEST.PUT_SIZE(
-         "Proxies",
-         TRUE,
-         "maximum_proxies",
-         RTEMS_TEST_SUPPORT.PER_PROXY
-      );
-
-      TEXT_IO.PUT_LINE( "*** END OF TEST SIZE ***" );
-      RTEMS.SHUTDOWN_EXECUTIVE( 0 );
-
-   end INIT;
-
---PAGE
---
---  PUT_SIZE
---
-
-   procedure PUT_SIZE (
-      DESCRIPTION    : in     STRING;
-      HAS_FIELD_NAME : in     BOOLEAN;
-      FIELD_NAME     : in     STRING             := "";
-      REQUIREMENT    : in     RTEMS.UNSIGNED32   := 0
-   ) is
-      SPACES : constant STRING := "                              ";
-   begin
-
-      -- 21 is length of longest description (task's stacks)
-
-      TEXT_IO.PUT( DESCRIPTION );
-      TEXT_IO.PUT( SPACES( 1 .. 21 - DESCRIPTION'LENGTH ) );
-      TEXT_IO.PUT( " - " );
-      if HAS_FIELD_NAME = TRUE then
-         TEXT_IO.PUT( FIELD_NAME );
-         TEXT_IO.PUT( " * " );
-      end if;
-      UNSIGNED32_IO.PUT( REQUIREMENT );
-      TEXT_IO.NEW_LINE;
-
-  end PUT_SIZE;
-    
-
-end SPTEST;
diff --git a/c/src/ada-tests/sptests/spsize/sptest.ads b/c/src/ada-tests/sptests/spsize/sptest.ads
deleted file mode 100644
index 312c7e9ead..0000000000
--- a/c/src/ada-tests/sptests/spsize/sptest.ads
+++ /dev/null
@@ -1,56 +0,0 @@
---
---  SPTEST / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package is the specification for Test 1 of the RTEMS
---  Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-
-package SPTEST is
-
---
---  INIT
---
---  DESCRIPTION:
---
---  This RTEMS task initializes the application.
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  PUT_SIZE
---
---  DESCRIPTION:
---
---  This procedure outputs the size information about the specified
---  object in a standard format.
---
-
-   procedure PUT_SIZE (
-      DESCRIPTION    : in     STRING;
-      HAS_FIELD_NAME : in     BOOLEAN;
-      FIELD_NAME     : in     STRING             := "";
-      REQUIREMENT    : in     RTEMS.UNSIGNED32   := 0
-   );
-
-end SPTEST;
diff --git a/c/src/ada-tests/support/address_io.adb b/c/src/ada-tests/support/address_io.adb
deleted file mode 100644
index 9e87ef3ed9..0000000000
--- a/c/src/ada-tests/support/address_io.adb
+++ /dev/null
@@ -1,47 +0,0 @@
---
---  Address_IO / Specification
---
---  DESCRIPTION:
---
---  This package instantiates the IO routines necessary to 
---  perform IO on data of the type System.Address.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with System;
-with System.Storage_Elements;
-with Text_IO;
-
-package body Address_IO is
-
-   procedure Put (
-      Item  : in     System.Address;
-      Width : in     Natural := 8;
-      Base  : in     Natural := 16
-   ) is
-     package Integer_IO is new TEXT_IO.Integer_IO( Integer );
-   begin
-
-      Integer_IO.Put(
-         Integer( System.Storage_Elements.To_Integer( Item ) ),
-         Width,
-         Base
-      );
-
-   end Put;
-
-end Address_IO;
-
diff --git a/c/src/ada-tests/support/address_io.ads b/c/src/ada-tests/support/address_io.ads
deleted file mode 100644
index 3f832b70e0..0000000000
--- a/c/src/ada-tests/support/address_io.ads
+++ /dev/null
@@ -1,35 +0,0 @@
---
---  ADDRESS_IO / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package instantiates the IO routines necessary to 
---  perform IO on data of the type System.Address.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with System;
-
-package Address_IO is
-
-   procedure Put (
-      Item  : in     System.Address;
-      Width : in     Natural := 8;
-      Base  : in     Natural := 16
-   );
-
-end Address_IO;
-
diff --git a/c/src/ada-tests/support/float_io.ads b/c/src/ada-tests/support/float_io.ads
deleted file mode 100644
index 532dc6c447..0000000000
--- a/c/src/ada-tests/support/float_io.ads
+++ /dev/null
@@ -1,27 +0,0 @@
---
---  Float_IO / Specification
---
---  Description:
---
---  This package instantiates the IO routines necessary to 
---  perform IO on data of the type Float.
---
---  Dependencies: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR). 
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with Text_IO;
-
-package Float_IO is new Text_IO.Float_IO( Float );
-
diff --git a/c/src/ada-tests/support/fp.inc b/c/src/ada-tests/support/fp.inc
deleted file mode 100644
index 4fde6b16c1..0000000000
--- a/c/src/ada-tests/support/fp.inc
+++ /dev/null
@@ -1,154 +0,0 @@
---
---  fp.inc
---
---  Macros to produce a large number of LOCAL floating point variables.  This
---  preprocessing is necessary to insure that the variables are
---  scoped properly and to avoid duplicating hundreds of lines
---  of code.
---
---
--- DEFICIENCIES:  
---
--- 1.  This currently does not address whether or not the CPU
---     actually has hardware floating point.  It just does the work.
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR). 
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
-
---
--- private definitions for macro use
---
-
--- macro usage EPSILON()
-define(`EPSILON',`0.0005')
-
--- macro usage FP_CHECK_ONE( value, base, factor )
-define(`FP_CHECK_ONE',`
-  if ( $1 - ( $2 + $3 ) ) > EPSILON or else ( $1 - ( $2 + $3 ) ) < - EPSILON then
-     UNSIGNED32_IO.PUT( TASK_INDEX );
-     TEXT_IO.PUT( ": $1 wrong -- (" );
-     FLOAT_IO.PUT( $1 );
-     TEXT_IO.PUT( " not " );
-     FLOAT_IO.PUT( $2 + $3 );
-     TEXT_IO.PUT_LINE( ")" );
-  end if
-'
-)
-
--- macro usage FP_DECLARE
-define(`FP_DECLARE', `
-  FP01 : FLOAT :=  1.0;
-  FP02 : FLOAT :=  2.0;
-  FP03 : FLOAT :=  3.0;
-  FP04 : FLOAT :=  4.0;
-  FP05 : FLOAT :=  5.0;
-  FP06 : FLOAT :=  6.0;
-  FP07 : FLOAT :=  7.0;
-  FP08 : FLOAT :=  8.0;
-  FP09 : FLOAT :=  9.0;
-  FP10 : FLOAT := 10.0;
-  FP11 : FLOAT := 11.0;
-  FP12 : FLOAT := 12.0;
-  FP13 : FLOAT := 13.0;
-  FP14 : FLOAT := 14.0;
-  FP15 : FLOAT := 15.0;
-  FP16 : FLOAT := 16.0;
-  FP17 : FLOAT := 17.0;
-  FP18 : FLOAT := 18.0;
-  FP19 : FLOAT := 19.0;
-  FP20 : FLOAT := 20.0;
-  FP21 : FLOAT := 21.0;
-  FP22 : FLOAT := 22.0;
-  FP23 : FLOAT := 23.0;
-  FP24 : FLOAT := 24.0;
-  FP25 : FLOAT := 25.0;
-  FP26 : FLOAT := 26.0;
-  FP27 : FLOAT := 27.0;
-  FP28 : FLOAT := 28.0;
-  FP29 : FLOAT := 29.0;
-  FP30 : FLOAT := 30.0;
-  FP31 : FLOAT := 31.0;
-  FP32 : FLOAT := 32.0
-'
-)
-
-
--- macro usage FP_LOAD( factor )
-define(`FP_LOAD',`
-  FP01 := FP01 + $1;
-  FP02 := FP02 + $1;
-  FP03 := FP03 + $1;
-  FP04 := FP04 + $1;
-  FP05 := FP05 + $1;
-  FP06 := FP06 + $1;
-  FP07 := FP07 + $1;
-  FP08 := FP08 + $1;
-  FP09 := FP09 + $1;
-  FP10 := FP10 + $1;
-  FP11 := FP11 + $1;
-  FP12 := FP12 + $1;
-  FP13 := FP13 + $1;
-  FP14 := FP14 + $1;
-  FP15 := FP15 + $1;
-  FP16 := FP16 + $1;
-  FP17 := FP17 + $1;
-  FP18 := FP18 + $1;
-  FP19 := FP19 + $1;
-  FP20 := FP20 + $1;
-  FP21 := FP21 + $1;
-  FP22 := FP22 + $1;
-  FP23 := FP23 + $1;
-  FP24 := FP24 + $1;
-  FP25 := FP25 + $1;
-  FP26 := FP26 + $1;
-  FP27 := FP27 + $1;
-  FP28 := FP28 + $1;
-  FP29 := FP29 + $1;
-  FP30 := FP30 + $1;
-  FP31 := FP31 + $1;
-  FP32 := FP32 + $1
-')
-
--- macro usage FP_CHECK( factor )
-define(`FP_CHECK',`
-  FP_CHECK_ONE( FP01,  1.0, $1 );
-  FP_CHECK_ONE( FP02,  2.0, $1 );
-  FP_CHECK_ONE( FP03,  3.0, $1 );
-  FP_CHECK_ONE( FP04,  4.0, $1 );
-  FP_CHECK_ONE( FP05,  5.0, $1 );
-  FP_CHECK_ONE( FP06,  6.0, $1 );
-  FP_CHECK_ONE( FP07,  7.0, $1 );
-  FP_CHECK_ONE( FP08,  8.0, $1 );
-  FP_CHECK_ONE( FP09,  9.0, $1 );
-  FP_CHECK_ONE( FP10, 10.0, $1 );
-  FP_CHECK_ONE( FP11, 11.0, $1 );
-  FP_CHECK_ONE( FP12, 12.0, $1 );
-  FP_CHECK_ONE( FP13, 13.0, $1 );
-  FP_CHECK_ONE( FP14, 14.0, $1 );
-  FP_CHECK_ONE( FP15, 15.0, $1 );
-  FP_CHECK_ONE( FP16, 16.0, $1 );
-  FP_CHECK_ONE( FP17, 17.0, $1 );
-  FP_CHECK_ONE( FP18, 18.0, $1 );
-  FP_CHECK_ONE( FP19, 19.0, $1 );
-  FP_CHECK_ONE( FP20, 20.0, $1 );
-  FP_CHECK_ONE( FP21, 21.0, $1 );
-  FP_CHECK_ONE( FP22, 22.0, $1 );
-  FP_CHECK_ONE( FP23, 23.0, $1 );
-  FP_CHECK_ONE( FP24, 24.0, $1 );
-  FP_CHECK_ONE( FP25, 25.0, $1 );
-  FP_CHECK_ONE( FP26, 26.0, $1 );
-  FP_CHECK_ONE( FP27, 27.0, $1 );
-  FP_CHECK_ONE( FP28, 28.0, $1 );
-  FP_CHECK_ONE( FP29, 29.0, $1 );
-  FP_CHECK_ONE( FP30, 30.0, $1 );
-  FP_CHECK_ONE( FP31, 31.0, $1 );
-  FP_CHECK_ONE( FP32, 32.0, $1 )
-'
-)
diff --git a/c/src/ada-tests/support/init.c b/c/src/ada-tests/support/init.c
deleted file mode 100644
index de686055de..0000000000
--- a/c/src/ada-tests/support/init.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/* 
- *  COPYRIGHT (c) 1989, 1990, 1991, 1992, 1993, 1994.
- *  On-Line Applications Research Corporation (OAR).
- *  All rights assigned to U.S. Government, 1994.
- *
- *  This material may be reproduced by or for the U.S. Government pursuant
- *  to the copyright license under the clause at DFARS 252.227-7013.  This
- *  notice must appear in all copies of this file and its derivatives.
- *
- *  $Id$
- */
-
-#define __RTEMS_VIOLATE_KERNEL_VISIBILITY__
-#include <bsp.h>
-
-void *POSIX_Init(
-  void *argument
-)
-{
-  extern int gnat_main ( int argc, char **argv, char **envp );
-
-  (void) gnat_main ( 0, 0, 0 );
-
-  exit( 0 );
-}
-
-/*
- *  Only for sp04
- */
-
-rtems_id tcb_to_id(
-  Thread_Control *tcb
-)
-{
-  return tcb->Object.id;
-}
-
-#define CONFIGURE_INIT
-#include "config.h"
diff --git a/c/src/ada-tests/support/integer.inc b/c/src/ada-tests/support/integer.inc
deleted file mode 100644
index b7be26e8b6..0000000000
--- a/c/src/ada-tests/support/integer.inc
+++ /dev/null
@@ -1,145 +0,0 @@
---
---  integer.inc
---
---  Macros to produce a large number of LOCAL integer variables.  This
---  preprocessing is necessary to insure that the variables are
---  scoped properly and to avoid duplicating hundreds of lines
---  of code.
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR). 
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
-
---
--- private definitions for macro use
---
-
--- macro usage INTEGER_CHECK_ONE( value, base, factor )
-define(`INTEGER_CHECK_ONE',`
-  if $1 /= ($2 + $3) then
-     UNSIGNED32_IO.PUT( TASK_INDEX );
-     TEXT_IO.PUT( ": $1 wrong -- (" );
-     UNSIGNED32_IO.PUT( $1, BASE => 16);
-     TEXT_IO.PUT( " not " );
-     UNSIGNED32_IO.PUT( $2, BASE => 16 );
-     TEXT_IO.PUT_LINE( ")" );
-  end if
-'
-)
-
--- macro usage INTEGER_DECLARE
-define(`INTEGER_DECLARE', `
-  INT01 : RTEMS.UNSIGNED32 :=  1;
-  INT02 : RTEMS.UNSIGNED32 :=  2;
-  INT03 : RTEMS.UNSIGNED32 :=  3;
-  INT04 : RTEMS.UNSIGNED32 :=  4;
-  INT05 : RTEMS.UNSIGNED32 :=  5;
-  INT06 : RTEMS.UNSIGNED32 :=  6;
-  INT07 : RTEMS.UNSIGNED32 :=  7;
-  INT08 : RTEMS.UNSIGNED32 :=  8;
-  INT09 : RTEMS.UNSIGNED32 :=  9;
-  INT10 : RTEMS.UNSIGNED32 := 10;
-  INT11 : RTEMS.UNSIGNED32 := 11;
-  INT12 : RTEMS.UNSIGNED32 := 12;
-  INT13 : RTEMS.UNSIGNED32 := 13;
-  INT14 : RTEMS.UNSIGNED32 := 14;
-  INT15 : RTEMS.UNSIGNED32 := 15;
-  INT16 : RTEMS.UNSIGNED32 := 16;
-  INT17 : RTEMS.UNSIGNED32 := 17;
-  INT18 : RTEMS.UNSIGNED32 := 18;
-  INT19 : RTEMS.UNSIGNED32 := 19;
-  INT20 : RTEMS.UNSIGNED32 := 20;
-  INT21 : RTEMS.UNSIGNED32 := 21;
-  INT22 : RTEMS.UNSIGNED32 := 22;
-  INT23 : RTEMS.UNSIGNED32 := 23;
-  INT24 : RTEMS.UNSIGNED32 := 24;
-  INT25 : RTEMS.UNSIGNED32 := 25;
-  INT26 : RTEMS.UNSIGNED32 := 26;
-  INT27 : RTEMS.UNSIGNED32 := 27;
-  INT28 : RTEMS.UNSIGNED32 := 28;
-  INT29 : RTEMS.UNSIGNED32 := 29;
-  INT30 : RTEMS.UNSIGNED32 := 30;
-  INT31 : RTEMS.UNSIGNED32 := 31;
-  INT32 : RTEMS.UNSIGNED32 := 32
-'
-)
-
-
--- macro usage INTEGER_LOAD( factor )
-define(`INTEGER_LOAD',`
-  INT01 := INT01 + $1;
-  INT02 := INT02 + $1;
-  INT03 := INT03 + $1;
-  INT04 := INT04 + $1;
-  INT05 := INT05 + $1;
-  INT06 := INT06 + $1;
-  INT07 := INT07 + $1;
-  INT08 := INT08 + $1;
-  INT09 := INT09 + $1;
-  INT10 := INT10 + $1;
-  INT11 := INT11 + $1;
-  INT12 := INT12 + $1;
-  INT13 := INT13 + $1;
-  INT14 := INT14 + $1;
-  INT15 := INT15 + $1;
-  INT16 := INT16 + $1;
-  INT17 := INT17 + $1;
-  INT18 := INT18 + $1;
-  INT19 := INT19 + $1;
-  INT20 := INT20 + $1;
-  INT21 := INT21 + $1;
-  INT22 := INT22 + $1;
-  INT23 := INT23 + $1;
-  INT24 := INT24 + $1;
-  INT25 := INT25 + $1;
-  INT26 := INT26 + $1;
-  INT27 := INT27 + $1;
-  INT28 := INT28 + $1;
-  INT29 := INT29 + $1;
-  INT30 := INT30 + $1;
-  INT31 := INT31 + $1;
-  INT32 := INT32 + $1
-')
-
--- macro usage INTEGER_CHECK( factor )
-define(`INTEGER_CHECK',`
-  INTEGER_CHECK_ONE( INT01,  1, $1 );
-  INTEGER_CHECK_ONE( INT02,  2, $1 );
-  INTEGER_CHECK_ONE( INT03,  3, $1 );
-  INTEGER_CHECK_ONE( INT04,  4, $1 );
-  INTEGER_CHECK_ONE( INT05,  5, $1 );
-  INTEGER_CHECK_ONE( INT06,  6, $1 );
-  INTEGER_CHECK_ONE( INT07,  7, $1 );
-  INTEGER_CHECK_ONE( INT08,  8, $1 );
-  INTEGER_CHECK_ONE( INT09,  9, $1 );
-  INTEGER_CHECK_ONE( INT10, 10, $1 );
-  INTEGER_CHECK_ONE( INT11, 11, $1 );
-  INTEGER_CHECK_ONE( INT12, 12, $1 );
-  INTEGER_CHECK_ONE( INT13, 13, $1 );
-  INTEGER_CHECK_ONE( INT14, 14, $1 );
-  INTEGER_CHECK_ONE( INT15, 15, $1 );
-  INTEGER_CHECK_ONE( INT16, 16, $1 );
-  INTEGER_CHECK_ONE( INT17, 17, $1 );
-  INTEGER_CHECK_ONE( INT18, 18, $1 );
-  INTEGER_CHECK_ONE( INT19, 19, $1 );
-  INTEGER_CHECK_ONE( INT20, 20, $1 );
-  INTEGER_CHECK_ONE( INT21, 21, $1 );
-  INTEGER_CHECK_ONE( INT22, 22, $1 );
-  INTEGER_CHECK_ONE( INT23, 23, $1 );
-  INTEGER_CHECK_ONE( INT24, 24, $1 );
-  INTEGER_CHECK_ONE( INT25, 25, $1 );
-  INTEGER_CHECK_ONE( INT26, 26, $1 );
-  INTEGER_CHECK_ONE( INT27, 27, $1 );
-  INTEGER_CHECK_ONE( INT28, 28, $1 );
-  INTEGER_CHECK_ONE( INT29, 29, $1 );
-  INTEGER_CHECK_ONE( INT30, 30, $1 );
-  INTEGER_CHECK_ONE( INT31, 31, $1 );
-  INTEGER_CHECK_ONE( INT32, 32, $1 )
-'
-)
diff --git a/c/src/ada-tests/support/rtems_calling_overhead.ads b/c/src/ada-tests/support/rtems_calling_overhead.ads
deleted file mode 100644
index 31bea79ef0..0000000000
--- a/c/src/ada-tests/support/rtems_calling_overhead.ads
+++ /dev/null
@@ -1,105 +0,0 @@
---
---  RTEMS_CALLING_OVERHEAD / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package contains the invocation overhead for each 
---  of the RTEMS directives on the MC68020 Timing Platform.
---  This time is then subtracted from the execution time
---  of each directive as measured by the Timing Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-
-package RTEMS_CALLING_OVERHEAD is
-
-   INITIALIZE_EXECUTIVE      : constant RTEMS.UNSIGNED32 := 0;
-   SHUTDOWN_EXECUTIVE        : constant RTEMS.UNSIGNED32 := 0;
-   TASK_CREATE               : constant RTEMS.UNSIGNED32 := 0;
-   TASK_IDENT                : constant RTEMS.UNSIGNED32 := 0;
-   TASK_START                : constant RTEMS.UNSIGNED32 := 0;
-   TASK_RESTART              : constant RTEMS.UNSIGNED32 := 0;
-   TASK_DELETE               : constant RTEMS.UNSIGNED32 := 0;
-   TASK_SUSPEND              : constant RTEMS.UNSIGNED32 := 0;
-   TASK_RESUME               : constant RTEMS.UNSIGNED32 := 0;
-   TASK_SET_PRIORITY         : constant RTEMS.UNSIGNED32 := 0;
-   TASK_MODE                 : constant RTEMS.UNSIGNED32 := 0;
-   TASK_GET_NOTE             : constant RTEMS.UNSIGNED32 := 0;
-   TASK_SET_NOTE             : constant RTEMS.UNSIGNED32 := 0;
-   TASK_WAKE_WHEN            : constant RTEMS.UNSIGNED32 := 0;
-   TASK_WAKE_AFTER           : constant RTEMS.UNSIGNED32 := 0;
-   INTERRUPT_CATCH           : constant RTEMS.UNSIGNED32 := 0;
-   CLOCK_GET                 : constant RTEMS.UNSIGNED32 := 0;
-   CLOCK_SET                 : constant RTEMS.UNSIGNED32 := 0;
-   CLOCK_TICK                : constant RTEMS.UNSIGNED32 := 0;
-
-   TIMER_CREATE              : constant RTEMS.UNSIGNED32 := 0;
-   TIMER_DELETE              : constant RTEMS.UNSIGNED32 := 0;
-   TIMER_IDENT               : constant RTEMS.UNSIGNED32 := 0;
-   TIMER_FIRE_AFTER          : constant RTEMS.UNSIGNED32 := 0;
-   TIMER_FIRE_WHEN           : constant RTEMS.UNSIGNED32 := 0;
-   TIMER_RESET               : constant RTEMS.UNSIGNED32 := 0;
-   TIMER_CANCEL              : constant RTEMS.UNSIGNED32 := 0;
-   SEMAPHORE_CREATE          : constant RTEMS.UNSIGNED32 := 0;
-   SEMAPHORE_DELETE          : constant RTEMS.UNSIGNED32 := 0;
-   SEMAPHORE_IDENT           : constant RTEMS.UNSIGNED32 := 0;
-   SEMAPHORE_OBTAIN          : constant RTEMS.UNSIGNED32 := 0;
-   SEMAPHORE_RELEASE         : constant RTEMS.UNSIGNED32 := 0;
-   MESSAGE_QUEUE_CREATE      : constant RTEMS.UNSIGNED32 := 0;
-   MESSAGE_QUEUE_IDENT       : constant RTEMS.UNSIGNED32 := 0;
-   MESSAGE_QUEUE_DELETE      : constant RTEMS.UNSIGNED32 := 0;
-   MESSAGE_QUEUE_SEND        : constant RTEMS.UNSIGNED32 := 0;
-   MESSAGE_QUEUE_URGENT      : constant RTEMS.UNSIGNED32 := 0;
-   MESSAGE_QUEUE_BROADCAST   : constant RTEMS.UNSIGNED32 := 0;
-   MESSAGE_QUEUE_RECEIVE     : constant RTEMS.UNSIGNED32 := 0;
-   MESSAGE_QUEUE_FLUSH       : constant RTEMS.UNSIGNED32 := 0;
-
-   EVENT_SEND                : constant RTEMS.UNSIGNED32 := 0;
-   EVENT_RECEIVE             : constant RTEMS.UNSIGNED32 := 0;
-   SIGNAL_CATCH              : constant RTEMS.UNSIGNED32 := 0;
-   SIGNAL_SEND               : constant RTEMS.UNSIGNED32 := 0;
-   PARTITION_CREATE          : constant RTEMS.UNSIGNED32 := 0;
-   PARTITION_IDENT           : constant RTEMS.UNSIGNED32 := 0;
-   PARTITION_DELETE          : constant RTEMS.UNSIGNED32 := 0;
-   PARTITION_GET_BUFFER      : constant RTEMS.UNSIGNED32 := 0;
-   PARTITION_RETURN_BUFFER   : constant RTEMS.UNSIGNED32 := 0;
-   REGION_CREATE             : constant RTEMS.UNSIGNED32 := 0;
-   REGION_IDENT              : constant RTEMS.UNSIGNED32 := 0;
-   REGION_DELETE             : constant RTEMS.UNSIGNED32 := 0;
-   REGION_GET_SEGMENT        : constant RTEMS.UNSIGNED32 := 0;
-   REGION_RETURN_SEGMENT     : constant RTEMS.UNSIGNED32 := 0;
-   PORT_CREATE               : constant RTEMS.UNSIGNED32 := 0;
-   PORT_IDENT                : constant RTEMS.UNSIGNED32 := 0;
-   PORT_DELETE               : constant RTEMS.UNSIGNED32 := 0;
-   PORT_EXTERNAL_TO_INTERNAL : constant RTEMS.UNSIGNED32 := 0;
-   PORT_INTERNAL_TO_EXTERNAL : constant RTEMS.UNSIGNED32 := 0;
-
-   IO_INITIALIZE             : constant RTEMS.UNSIGNED32 := 0;
-   IO_OPEN                   : constant RTEMS.UNSIGNED32 := 0;
-   IO_CLOSE                  : constant RTEMS.UNSIGNED32 := 0;
-   IO_READ                   : constant RTEMS.UNSIGNED32 := 0;
-   IO_WRITE                  : constant RTEMS.UNSIGNED32 := 0;
-   IO_CONTROL                : constant RTEMS.UNSIGNED32 := 0;
-   FATAL_ERROR_OCCURRED      : constant RTEMS.UNSIGNED32 := 0;
-   RATE_MONOTONIC_CREATE     : constant RTEMS.UNSIGNED32 := 0;
-   RATE_MONOTONIC_IDENT      : constant RTEMS.UNSIGNED32 := 0;
-   RATE_MONOTONIC_DELETE     : constant RTEMS.UNSIGNED32 := 0;
-   RATE_MONOTONIC_CANCEL     : constant RTEMS.UNSIGNED32 := 0;
-   RATE_MONOTONIC_PERIOD     : constant RTEMS.UNSIGNED32 := 0;
-   MULTIPROCESSING_ANNOUNCE  : constant RTEMS.UNSIGNED32 := 0;
-
-end RTEMS_CALLING_OVERHEAD;
diff --git a/c/src/ada-tests/support/status_io.ads b/c/src/ada-tests/support/status_io.ads
deleted file mode 100644
index af56ff1a6a..0000000000
--- a/c/src/ada-tests/support/status_io.ads
+++ /dev/null
@@ -1,28 +0,0 @@
---
---  Status_IO / Specification
---
---  DESCRIPTION:
---
---  This package instantiates the IO routines necessary to 
---  perform IO on data of the type Status.CODES.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-with Text_IO;
-
-package Status_IO is new Text_IO.Enumeration_IO( RTEMS.Status_Codes );
-
diff --git a/c/src/ada-tests/support/test_support.adb b/c/src/ada-tests/support/test_support.adb
deleted file mode 100644
index 379f0dfdae..0000000000
--- a/c/src/ada-tests/support/test_support.adb
+++ /dev/null
@@ -1,236 +0,0 @@
---
---  Test_Support / Specification
---
---  DESCRIPTION:
---
---  This package provides routines which aid the Test Suites
---  and simplify their design and operation.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with Interfaces; use Interfaces;
-with RTEMS;
-with Unsigned32_IO;
-with Status_IO;
-with Text_IO;
-
-package body Test_Support is
-
---PAGE
---
---  Fatal_Directive_Status
---
-
-   procedure Fatal_Directive_Status (
-      Status  : in     RTEMS.Status_Codes;
-      Desired : in     RTEMS.Status_Codes;
-      Message : in     String
-   ) is
-   begin
-
-      if not RTEMS.Are_Statuses_Equal( Status, Desired ) then
-
-         Text_IO.Put( Message );
-         Text_IO.Put( " FAILED -- expected " );
-         Status_IO.Put( Desired );
-         Text_IO.Put( " got " );
-         Status_IO.Put( Status );
-         Text_IO.New_Line;
-
-         RTEMS.Fatal_Error_Occurred( RTEMS.Status_Codes'Pos( Status ) );
-
-      end if;
-
-   end Fatal_Directive_Status;
-
---PAGE
---
---  Directive_Failed
---
-
-   procedure Directive_Failed (
-      Status  : in     RTEMS.Status_Codes;
-      Message : in     String
-   ) is
-   begin
-
-      Test_Support.Fatal_Directive_Status(
-         Status, 
-         RTEMS.Successful, 
-         Message 
-      );
-
-   end Directive_Failed;
-
---PAGE
---
---  Print_Time
---
-
-   procedure Print_Time (
-      Prefix      : in     String;
-      Time_Buffer : in     RTEMS.Time_Of_Day;
-      Suffix      : in     String
-   ) is
-   begin
-
-      Text_IO.Put( Prefix );
-      Unsigned32_IO.Put( Time_Buffer.Hour, Width=>2 );
-      Text_IO.Put( ":" );
-      Unsigned32_IO.Put( Time_Buffer.Minute, Width=>2 );
-      Text_IO.Put( ":" );
-      Unsigned32_IO.Put( Time_Buffer.Second, Width=>2 );
-      Text_IO.Put( "   " );
-      Unsigned32_IO.Put( Time_Buffer.Month, Width=>2 );
-      Text_IO.Put( "/" );
-      Unsigned32_IO.Put( Time_Buffer.Day, Width=>2 );
-      Text_IO.Put( "/" );
-      Unsigned32_IO.Put( Time_Buffer.Year, Width=>2 );
-      Text_IO.Put( Suffix );
-
-   end Print_Time;
-
---PAGE
---
---  Put_Dot
---
- 
-   procedure Put_Dot (
-      Buffer : in     String
-   ) is
-   begin
-      Text_IO.Put( Buffer );
-      Text_IO.FLUSH;
-   end Put_Dot;
-
---PAGE
---
---  Pause
---
-
-   procedure Pause is
-      Ignored_String : String( 1 .. 80 );
-      Ignored_Last   : Natural;
-      
-   begin
-
-      -- 
-      --  Really should be a "put" followed by a "flush."
-      -- 
-      Text_IO.Put_Line( "<pause> " );
-      -- Text_IO.Get_Line( Ignored_String, Ignored_Last );
-
-   -- exception
-
-   --    when Text_IO.End_Error =>
-   --    -- ignore this error.  It happens when redirecting input from /dev/null 
-   --    return;
-
-   end Pause;
-
---PAGE
---
---  Pause_And_Screen_Number
---
- 
-   procedure Pause_And_Screen_Number (
-      SCREEN : in    RTEMS.Unsigned32
-   ) is
-      Ignored_String : String( 1 .. 80 );
-      Ignored_Last   : Natural;
-   begin
- 
-      --
-      --  Really should be a "put" followed by a "flush."
-      --
-      Text_IO.Put( "<pause - screen  " );
-      Unsigned32_IO.Put( SCREEN, Width=>2 );
-      Text_IO.Put_Line( "> " );
-   --    Text_IO.Get_Line( Ignored_String, Ignored_Last );
- 
-   -- exception
-
-   --    when Text_IO.End_Error =>
-   --    -- ignore this error.  It happens when redirecting input from /dev/null 
-   --    return;
-
-   end Pause_And_Screen_Number;
-
---PAGE
---
---  Put_Name
---
-
-   procedure Put_Name (
-      Name     : in     RTEMS.Name;
-      New_Line : in     Boolean
-   ) is
-      C1 : Character;
-      C2 : Character;
-      C3 : Character;
-      C4 : Character;
-   begin
-
-      RTEMS.Name_To_Characters( Name, C1, C2, C3, C4 );
-
-      Text_IO.Put( C1 );
-      Text_IO.Put( C2 );
-      Text_IO.Put( C3 );
-      Text_IO.Put( C4 );
-
-      if New_Line = True then
-         Text_IO.New_Line;
-      end if;
-
-   end Put_Name;
- 
---PAGE
---
---  Task_Number
---
-
-   function Task_Number (
-      TID : in     RTEMS.ID
-   ) return RTEMS.Unsigned32 is
-   begin
-
-      return RTEMS.Get_Index( TID ) - 1 -
-        RTEMS.Configuration.RTEMS_API_Configuration.Number_Of_Initialization_Tasks;
-
-   end Task_Number;
-
---PAGE
---
---  Do_Nothing
---
-
-   procedure Do_Nothing is
-   begin
-      NULL;
-   end Do_Nothing;
-   
-
---PAGE
---
---  Milliseconds_Per_Tick
---
-
-   function Milliseconds_Per_Tick 
-   return RTEMS.Unsigned32 is
-   begin
-      return RTEMS.Configuration.Microseconds_Per_Tick / 1000;
-   end Milliseconds_Per_Tick;
-end Test_Support;
diff --git a/c/src/ada-tests/support/test_support.ads b/c/src/ada-tests/support/test_support.ads
deleted file mode 100644
index 4a40da4322..0000000000
--- a/c/src/ada-tests/support/test_support.ads
+++ /dev/null
@@ -1,173 +0,0 @@
---
---  Test_Support / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package provides routines which aid the Test Suites
---  and simplify their design and operation.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with Interfaces; use Interfaces;
-with RTEMS;
-with Text_IO;
-
-package Test_Support is
-
---
---  Fatal_Directive_Status
---
---  DESCRIPTION:
---
---  This subprogram checks if Status is equal to Desired.  If so, it 
---  returns immediately.  Otherwise, it prints the Message along with
---  the Status and Desired status and invokes the Fatal_Error_Occurred
---  directive.
---
-
-   procedure Fatal_Directive_Status (
-      Status  : in     RTEMS.Status_Codes;
-      Desired : in     RTEMS.Status_Codes;
-      Message : in     STRING
-   );
-   pragma Inline ( Fatal_Directive_Status );
-
---  Directive_Failed
---
---  DESCRIPTION:
---
---  This subprogram checks if Status is equal to Successful.  If so, it 
---  returns immediately.  Otherwise, it prints the Message along with
---  the Status and Desired status and invokes the Fatal_Error_Occurred
---
-
-   procedure Directive_Failed (
-      Status  : in     RTEMS.Status_Codes;
-      Message : in     STRING
-   );
-   pragma Inline ( Directive_Failed );
-
---
---  Print_Time
---
---  DESCRIPTION:
---
---  This subprogram prints the Prefix string, following by the
---  time of day in Time_Buffer, followed by the Suffix.
---
-
-   procedure Print_Time (
-      Prefix      : in     STRING;
-      Time_Buffer : in     RTEMS.Time_Of_Day;
-      Suffix      : in     STRING
-   );
-   pragma Inline ( Print_Time );
-
---
---  Put_Dot
---
---  DESCRIPTION:
---
---  This subprogram prints a single character without a carriage return.
---
-
-   procedure Put_Dot ( 
-      Buffer : in     STRING
-   );
-   pragma Inline ( Put_Dot );
-
---
---  Pause
---
---  DESCRIPTION:
---
---  This subprogram is used to pause screen output in the Test Suites
---  until the user presses carriage return.
---
-
-   procedure Pause;
-
---
---  Pause_And_Screen_Number
---
---  DESCRIPTION:
---
---  This subprogram is used to pause screen output  and print the current
---  number in the Test Suites until the user presses carriage return.
---
-
-   procedure Pause_And_Screen_Number (
-      SCREEN : in     RTEMS.Unsigned32
-   );
-
---
---  Put_Name
---
---  DESCRIPTION:
---
---  This subprogram prints the RTEMS object Name.  If New_Line is TRUE, 
---  then a carriage return is printed after the Name.
---
-
-   procedure Put_Name (
-      Name     : in     RTEMS.Name;
-      New_Line : in     Boolean
-   );
- 
---
---  Task_Number
---
---  DESCRIPTION:
---
---  This function returns the task index which the test should use
---  for TID.
---
-
-   function Task_Number (
-      TID : in     RTEMS.ID
-   ) return RTEMS.Unsigned32;
-   pragma Inline ( Task_Number );
-
---
---  Do_Nothing
---
---  DESCRIPTION:
---
---  This procedure is called when a test wishes to use a delay
---  loop and insure that the compiler does not optimize it away.
---
-
-   procedure Do_Nothing;
-
---
---  Ticks_Per_Second is the number of RTEMS clock ticks which
---  occur each second.
---
-
-   Ticks_Per_Second : RTEMS.Interval; 
-   pragma Import (C, Ticks_Per_Second, "_TOD_Ticks_per_second");
-
---
---  Milliseconds_Per_Tick is the number of milliseconds which
---  occur between each RTEMS clock tick.
---
-
-   function Milliseconds_Per_Tick 
-   return RTEMS.Unsigned32;
-
-private
-
-end Test_Support;
diff --git a/c/src/ada-tests/support/time_test_support.adb b/c/src/ada-tests/support/time_test_support.adb
deleted file mode 100644
index 5eba15fa58..0000000000
--- a/c/src/ada-tests/support/time_test_support.adb
+++ /dev/null
@@ -1,77 +0,0 @@
---
---  TIME_TEST_SUPPORT / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package provides routines which aid the individual tests in
---  the Timing Test Suite and simplify their design and operation.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with INTERFACES; use INTERFACES;
-with RTEMS;
-with TEXT_IO;
-with UNSIGNED32_IO;
-
-package body TIME_TEST_SUPPORT is
-
---PAGE
---
---  PUT_TIME
---
-
-   procedure PUT_TIME (
-      MESSAGE          : in     STRING;
-      TOTAL_TIME       : in     RTEMS.UNSIGNED32;
-      ITERATIONS       : in     RTEMS.UNSIGNED32;
-      LOOP_OVERHEAD    : in     RTEMS.UNSIGNED32;
-      CALLING_OVERHEAD : in     RTEMS.UNSIGNED32
-   ) is
-      PER_ITERATION : RTEMS.UNSIGNED32;
-   begin
-
-      PER_ITERATION := (TOTAL_TIME - LOOP_OVERHEAD) / ITERATIONS;
-      PER_ITERATION := PER_ITERATION - CALLING_OVERHEAD;
-
-      if PER_ITERATION = 0 then
-
-         TEXT_IO.PUT( "TOTAL_TIME " );
-         UNSIGNED32_IO.PUT( TOTAL_TIME );
-         TEXT_IO.NEW_LINE; 
-
-         TEXT_IO.PUT( "ITERATIONS " );
-         UNSIGNED32_IO.PUT( ITERATIONS );
-         TEXT_IO.NEW_LINE; 
-
-         TEXT_IO.PUT( "LOOP_OVERHEAD " );
-         UNSIGNED32_IO.PUT( LOOP_OVERHEAD );
-         TEXT_IO.NEW_LINE; 
-
-         TEXT_IO.PUT( "CALLING_OVERHEAD " );
-         UNSIGNED32_IO.PUT( CALLING_OVERHEAD );
-         TEXT_IO.NEW_LINE; 
-
-      end if;
-
-      TEXT_IO.PUT( MESSAGE );
-      TEXT_IO.PUT( " " );
-      UNSIGNED32_IO.PUT( PER_ITERATION );
-      TEXT_IO.NEW_LINE; 
-      TEXT_IO.FLUSH; 
-
-   end PUT_TIME;
-
-end TIME_TEST_SUPPORT;
diff --git a/c/src/ada-tests/support/time_test_support.ads b/c/src/ada-tests/support/time_test_support.ads
deleted file mode 100644
index 6dbacaf69d..0000000000
--- a/c/src/ada-tests/support/time_test_support.ads
+++ /dev/null
@@ -1,54 +0,0 @@
---
---  TIME_TEST_SUPPORT / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package provides routines which aid the individual tests in
---  the Timing Test Suite and simplify their design and operation.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-
-package TIME_TEST_SUPPORT is
-
---
---  The following constants define the number of times a directive
---  will be performed in the Timing Suite.
---
-
-   OPERATION_COUNT : constant RTEMS.UNSIGNED32 := 100;
-   ITERATION_COUNT : constant RTEMS.UNSIGNED32 := 100;
-
---
---  PUT_TIME
---
---  DESCRIPTION:
---
---  This subprogram prints the MESSAGE followed by the length of
---  time which each individual operation took.  All times are
---  in microseconds.
---
-
-   procedure PUT_TIME (
-      MESSAGE          : in     STRING;
-      TOTAL_TIME       : in     RTEMS.UNSIGNED32;
-      ITERATIONS       : in     RTEMS.UNSIGNED32;
-      LOOP_OVERHEAD    : in     RTEMS.UNSIGNED32;
-      CALLING_OVERHEAD : in     RTEMS.UNSIGNED32
-   );
-
-end TIME_TEST_SUPPORT;
diff --git a/c/src/ada-tests/support/timer_driver.adb b/c/src/ada-tests/support/timer_driver.adb
deleted file mode 100644
index caa2374759..0000000000
--- a/c/src/ada-tests/support/timer_driver.adb
+++ /dev/null
@@ -1,45 +0,0 @@
---
---  Timer_Driver / Body
---
---  Description:
---
---  This package is the body for the Timer Driver.
---
---  Dependencies: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-
-package body Timer_Driver is
-
---PAGE
---
---  Set_Find_Average_Overhead
---
---
- 
-   procedure Set_Find_Average_Overhead (
-      Find_Flag : in     Standard.Boolean
-   ) is
-      procedure Set_Find_Average_Overhead_base (
-         Find_Flag : in     RTEMS.Boolean
-      );
-      pragma Import (C, Set_Find_Average_Overhead_base,
-         "Set_find_average_overhead");
-   begin
-      Set_Find_Average_Overhead_base (RTEMS.From_Ada_Boolean (Find_Flag));
-   end Set_Find_Average_Overhead;
-
-end Timer_Driver;
diff --git a/c/src/ada-tests/support/timer_driver.ads b/c/src/ada-tests/support/timer_driver.ads
deleted file mode 100644
index bd7c4891b7..0000000000
--- a/c/src/ada-tests/support/timer_driver.ads
+++ /dev/null
@@ -1,81 +0,0 @@
---
---  Timer_Driver / Specification
---
---  Description:
---
---  This package is the specification for the Timer Driver.
---
---  Dependencies: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-
-package Timer_Driver is
-
---
---  Initialize
---
---  Description:
---
---  This subprogram initializes the hardware timer to start it.
---
-
-   procedure Initialize;
-   pragma Import (C, Initialize, "Timer_initialize");
-
---
---  Read_Timer
---
---  Description:
---
---  This subprogram stops the timer, calculates the length of time
---  in microseconds since the timer was started, and returns that
---  value.
---
-
-   function Read_Timer 
-   return RTEMS.Unsigned32;
-   pragma Import (C, Read_Timer, "Read_timer");
-
---
---  Empty_Function
---
---  Description:
---
---  This subprogram is an empty subprogram.  It is used to
---  insure that a loop will be included in the final executable
---  so that loop overhead can be subtracted from the directive
---  times reported.
---
-
-   procedure Empty_Function;
-   pragma Import (C, Empty_Function, "Empty_function");
-
---
---  Set_Find_Average_Overhead
---
---  Description:
---
---  This subprogram sets the Find_Average_Overhead flag to the
---  the value passed.
---
- 
-   procedure Set_Find_Average_Overhead (
-      Find_Flag : in     Standard.Boolean
-   );
-
-private
-
-end Timer_Driver;
diff --git a/c/src/ada-tests/support/unsigned32_io.ads b/c/src/ada-tests/support/unsigned32_io.ads
deleted file mode 100644
index 4e207461c4..0000000000
--- a/c/src/ada-tests/support/unsigned32_io.ads
+++ /dev/null
@@ -1,28 +0,0 @@
---
---  Unsigned32_IO / Specification
---
---  DESCRIPTION:
---
---  This package instantiates the IO routines necessary to 
---  perform IO on data of the type RTEMS.Unsigned32.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-with Text_IO;
-
-package Unsigned32_IO is new Text_IO.Modular_IO( RTEMS.Unsigned32 );
-
diff --git a/c/src/ada-tests/tmtests/tm01/config.h b/c/src/ada-tests/tmtests/tm01/config.h
deleted file mode 100644
index be54f54955..0000000000
--- a/c/src/ada-tests/tmtests/tm01/config.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*  config.h
- *
- *  This include file defines the Configuration Table for this test.
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-/* configuration information */
-
-#define CONFIGURE_TMTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
-
-#define CONFIGURE_MAXIMUM_TASKS              2
-#define CONFIGURE_MAXIMUM_SEMAPHORES         1
-#define CONFIGURE_TICKS_PER_TIMESLICE        0
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#define CONFIGURE_MAXIMUM_POSIX_THREADS              10
-#define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
-#define CONFIGURE_MAXIMUM_POSIX_MUTEXES              20
-#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES  10
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/c/src/ada-tests/tmtests/tm01/tm01.adb b/c/src/ada-tests/tmtests/tm01/tm01.adb
deleted file mode 100644
index 34671d1495..0000000000
--- a/c/src/ada-tests/tmtests/tm01/tm01.adb
+++ /dev/null
@@ -1,57 +0,0 @@
---
---  MAIN / BODY
---
---  DESCRIPTION:
---
---  This is the entry point for Test TM01 of the Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-with TMTEST;
-with TEST_SUPPORT;
-
-procedure TM01 is
-  INIT_ID : RTEMS.ID;
-  STATUS  : RTEMS.STATUS_CODES;
-begin
-
-   RTEMS.TASK_CREATE(
-      RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
-      1,
-      RTEMS.MINIMUM_STACK_SIZE,
-      RTEMS.NO_PREEMPT,
-      RTEMS.DEFAULT_ATTRIBUTES,
-      INIT_ID,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
-
-
-   RTEMS.TASK_START(
-      INIT_ID,
-      TMTEST.INIT'ACCESS,
-      0,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
-
-   loop
-      delay 120.0;
-   end loop;
-
-end TM01;
-
diff --git a/c/src/ada-tests/tmtests/tm01/tmtest.adb b/c/src/ada-tests/tmtests/tm01/tmtest.adb
deleted file mode 100644
index ba9ab5dee1..0000000000
--- a/c/src/ada-tests/tmtests/tm01/tmtest.adb
+++ /dev/null
@@ -1,276 +0,0 @@
---
---  TMTEST / BODY
---
---  DESCRIPTION:
---
---  This package is the implementation of Test 1 of the RTEMS
---  Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with INTERFACES; use INTERFACES;
-with RTEMS;
-with RTEMS_CALLING_OVERHEAD;
-with TEST_SUPPORT;
-with TEXT_IO;
-with TIME_TEST_SUPPORT;
-with UNSIGNED32_IO;
-
-package body TMTEST is
-
---PAGE
--- 
---  INIT
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** TIME TEST 1 ***" );
-
-      TMTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME(  'T', 'A', '1', ' ' );
-      TMTEST.TASK_NAME( 2 ) := RTEMS.BUILD_NAME(  'T', 'A', '2', ' ' );
-      TMTEST.TASK_NAME( 3 ) := RTEMS.BUILD_NAME(  'T', 'A', '3', ' ' );
-
-      RTEMS.TASK_CREATE( 
-         TMTEST.TASK_NAME( 1 ), 
-         1, 
-         2048, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         TMTEST.TASK_ID( 1 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA1" );
-
-      RTEMS.TASK_START(
-         TMTEST.TASK_ID( 1 ),
-         TMTEST.TASK_1'ACCESS,
-         0,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA1" );
-
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
-
-   end INIT;
-
---PAGE
--- 
---  TASK_1
---
-
-   procedure TASK_1 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      SEMAPHORE_OBTAIN_TIME         : RTEMS.UNSIGNED32;
-      SEMAPHORE_RELEASE_TIME        : RTEMS.UNSIGNED32;
-      SEMAPHORE_OBTAIN_NO_WAIT_TIME : RTEMS.UNSIGNED32;
-      SEMAPHORE_OBTAIN_LOOP_TIME    : RTEMS.UNSIGNED32;
-      SEMAPHORE_RELEASE_LOOP_TIME   : RTEMS.UNSIGNED32;
-      INDEX                         : RTEMS.UNSIGNED32;
-      ITERATIONS                    : RTEMS.UNSIGNED32;
-      NAME                          : RTEMS.NAME;
-      SMID                          : RTEMS.ID;
-      STATUS                        : RTEMS.STATUS_CODES;
-   begin
-
-      NAME := RTEMS.BUILD_NAME(  'S', 'M', '1', ' ' );
-     
-      SEMAPHORE_OBTAIN_TIME         := 0;
-      SEMAPHORE_RELEASE_TIME        := 0;
-      SEMAPHORE_OBTAIN_NO_WAIT_TIME := 0;
-      SEMAPHORE_OBTAIN_LOOP_TIME    := 0;
-      SEMAPHORE_RELEASE_LOOP_TIME   := 0;
-    
--- Time one invocation of SEMAPHORE_CREATE
-
-      TIMER_DRIVER.INITIALIZE;
-
-         RTEMS.SEMAPHORE_CREATE(
-            NAME,
-            TIME_TEST_SUPPORT.OPERATION_COUNT,
-            RTEMS.DEFAULT_ATTRIBUTES,
-            RTEMS.NO_PRIORITY,
-            SMID,
-            STATUS
-         );
-     
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-      
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "SEMAPHORE_CREATE", 
-         TMTEST.END_TIME, 
-         1, 
-         0,
-         RTEMS_CALLING_OVERHEAD.SEMAPHORE_CREATE 
-      );
-
--- Time one invocation of SEMAPHORE_DELETE
-
-      TIMER_DRIVER.INITIALIZE;
-
-         RTEMS.SEMAPHORE_DELETE( SMID, STATUS );
-     
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-      
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "SEMAPHORE_DELETE", 
-         TMTEST.END_TIME, 
-         1, 
-         0,
-         RTEMS_CALLING_OVERHEAD.SEMAPHORE_DELETE 
-      );
-
--- Create semaphore for repeated operations.
-
-      RTEMS.SEMAPHORE_CREATE(
-         NAME,
-         TIME_TEST_SUPPORT.OPERATION_COUNT,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         RTEMS.NO_PRIORITY,
-         SMID,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_CREATE" );
-
--- Perform repeated SEMAPHORE OBTAIN's and RELEASE's 
-     
-      for ITERATIONS in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-      loop
-
-         TIMER_DRIVER.INITIALIZE;
-            for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-            loop
-               TIMER_DRIVER.EMPTY_FUNCTION;
-            end loop;
-         TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-         SEMAPHORE_OBTAIN_LOOP_TIME  := SEMAPHORE_OBTAIN_LOOP_TIME + 
-                                          TMTEST.END_TIME;
-         SEMAPHORE_RELEASE_LOOP_TIME := SEMAPHORE_RELEASE_LOOP_TIME + 
-                                          TMTEST.END_TIME;
-
-         -- Semaphore_obtain (available loop)
-
-         TIMER_DRIVER.INITIALIZE;
-            for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-            loop
-
-               RTEMS.SEMAPHORE_OBTAIN( 
-                  SMID, 
-                  RTEMS.DEFAULT_OPTIONS, 
-                  RTEMS.NO_TIMEOUT, 
-                  STATUS 
-               );
-    
-            end loop;
-
-         TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-         SEMAPHORE_OBTAIN_TIME := SEMAPHORE_OBTAIN_TIME + TMTEST.END_TIME;
-
-         -- Semaphore_release
-
-            TIMER_DRIVER.INITIALIZE;
-     
-               for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-               loop
-
-                  RTEMS.SEMAPHORE_RELEASE( SMID, STATUS );
-     
-               end loop;
-
-            TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-            SEMAPHORE_RELEASE_TIME := SEMAPHORE_RELEASE_TIME + 
-                                        TMTEST.END_TIME;
-
-         -- Semaphore_p (NO_WAIT)
-
-         TIMER_DRIVER.INITIALIZE;
-
-            for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-            loop
-     
-               RTEMS.SEMAPHORE_OBTAIN( 
-                  SMID, 
-                  RTEMS.NO_WAIT, 
-                  RTEMS.NO_TIMEOUT, 
-                  STATUS 
-               );
-
-            end loop;
-     
-         TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-         SEMAPHORE_OBTAIN_NO_WAIT_TIME := 
-            SEMAPHORE_OBTAIN_NO_WAIT_TIME + TMTEST.END_TIME;
-
-         -- Semaphore_v 
-
-            TIMER_DRIVER.INITIALIZE;
-     
-               for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-               loop
-
-                  RTEMS.SEMAPHORE_RELEASE( SMID, STATUS );
-     
-               end loop;
-
-            TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-            SEMAPHORE_RELEASE_TIME := SEMAPHORE_RELEASE_TIME + 
-                                        TMTEST.END_TIME;
-
-      end loop;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "SEMAPHORE_OBTAIN (semaphore available)", 
-         SEMAPHORE_OBTAIN_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT *
-           TIME_TEST_SUPPORT.OPERATION_COUNT,
-         SEMAPHORE_OBTAIN_LOOP_TIME,
-         RTEMS_CALLING_OVERHEAD.SEMAPHORE_OBTAIN 
-      );
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "SEMAPHORE_OBTAIN (NO_WAIT)", 
-         SEMAPHORE_OBTAIN_NO_WAIT_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT *
-           TIME_TEST_SUPPORT.OPERATION_COUNT,
-         SEMAPHORE_OBTAIN_LOOP_TIME,
-         RTEMS_CALLING_OVERHEAD.SEMAPHORE_OBTAIN 
-      );
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "SEMAPHORE_RELEASE (no task waiting)", 
-         SEMAPHORE_RELEASE_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT *
-           TIME_TEST_SUPPORT.OPERATION_COUNT * 2,
-         SEMAPHORE_RELEASE_LOOP_TIME * 2,
-         RTEMS_CALLING_OVERHEAD.SEMAPHORE_RELEASE 
-      );
-      RTEMS.SHUTDOWN_EXECUTIVE( 0 );
-   
-   end TASK_1;
-
-end TMTEST;
diff --git a/c/src/ada-tests/tmtests/tm01/tmtest.ads b/c/src/ada-tests/tmtests/tm01/tmtest.ads
deleted file mode 100644
index 3c8b449675..0000000000
--- a/c/src/ada-tests/tmtests/tm01/tmtest.ads
+++ /dev/null
@@ -1,68 +0,0 @@
---
---  TMTEST / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package is the specification for Test 1 of the RTEMS
---  Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with TIMER_DRIVER;
-with RTEMS;
-
-package TMTEST is
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS tasks created
---  by this test.
---
-
-   TASK_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.ID;
-   TASK_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.NAME;
-
---
---  The following variable is set to the execution time returned
---  by the timer.
---
-
-   END_TIME  : RTEMS.UNSIGNED32;
-
---
---  INIT
---
---  DESCRIPTION:
---
---  This RTEMS task initializes the application.
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TASK_1
---
---  DESCRIPTION:
---
---  This RTEMS task performs the all of the timing operations in this test.
---
-
-   procedure TASK_1 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
-end TMTEST;
diff --git a/c/src/ada-tests/tmtests/tm02/config.h b/c/src/ada-tests/tmtests/tm02/config.h
deleted file mode 100644
index 588ff58466..0000000000
--- a/c/src/ada-tests/tmtests/tm02/config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*  config.h
- *
- *  This include file defines the Configuration Table for this test.
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-/* configuration information */
-
-#define CONFIGURE_TMTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
-
-#define CONFIGURE_MAXIMUM_TASKS              111
-#define CONFIGURE_MAXIMUM_TIMERS             110
-#define CONFIGURE_MAXIMUM_SEMAPHORES         101
-#define CONFIGURE_TICKS_PER_TIMESLICE        0
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#define CONFIGURE_MAXIMUM_POSIX_THREADS              10
-#define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
-#define CONFIGURE_MAXIMUM_POSIX_MUTEXES              20
-#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES  10
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/c/src/ada-tests/tmtests/tm02/tm02.adb b/c/src/ada-tests/tmtests/tm02/tm02.adb
deleted file mode 100644
index ee13a6ddf7..0000000000
--- a/c/src/ada-tests/tmtests/tm02/tm02.adb
+++ /dev/null
@@ -1,57 +0,0 @@
---
---  MAIN / BODY
---
---  DESCRIPTION:
---
---  This is the entry point for Test TM02 of the Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-with TMTEST;
-with TEST_SUPPORT;
-
-procedure TM02 is
-  INIT_ID : RTEMS.ID;
-  STATUS  : RTEMS.STATUS_CODES;
-begin
-
-   RTEMS.TASK_CREATE(
-      RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
-      1,
-      RTEMS.MINIMUM_STACK_SIZE,
-      RTEMS.NO_PREEMPT,
-      RTEMS.DEFAULT_ATTRIBUTES,
-      INIT_ID,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
-
-
-   RTEMS.TASK_START(
-      INIT_ID,
-      TMTEST.INIT'ACCESS,
-      0,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
-
-   loop
-      delay 120.0;
-   end loop;
-
-end TM02;
-
diff --git a/c/src/ada-tests/tmtests/tm02/tmtest.adb b/c/src/ada-tests/tmtests/tm02/tmtest.adb
deleted file mode 100644
index 606661c956..0000000000
--- a/c/src/ada-tests/tmtests/tm02/tmtest.adb
+++ /dev/null
@@ -1,209 +0,0 @@
---
---  TMTEST / BODY
---
---  DESCRIPTION:
---
---  This package is the implementation of Test 2 of the RTEMS
---  Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with INTERFACES; use INTERFACES;
-with RTEMS;
-with RTEMS_CALLING_OVERHEAD;
-with TEST_SUPPORT;
-with TEXT_IO;
-with TIME_TEST_SUPPORT;
-with UNSIGNED32_IO;
-
-package body TMTEST is
-
---PAGE
--- 
---  INIT
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** TIME TEST 2 ***" );
-
-      TMTEST.TEST_INIT;
-
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
-
-   end INIT;
-
---PAGE
--- 
---  TEST_INIT
---
-
-   procedure TEST_INIT is
-      PRIORITY : RTEMS.TASK_PRIORITY;
-      INDEX    : RTEMS.UNSIGNED32;
-      HIGH_ID  : RTEMS.ID;
-      LOW_ID   : RTEMS.ID;
-      TASK_ID  : RTEMS.ID;
-      STATUS   : RTEMS.STATUS_CODES;
-   begin
-
-      PRIORITY := 5;
-
-      RTEMS.TASK_CREATE( 
-         RTEMS.BUILD_NAME( 'H', 'I', 'G', 'H' ),
-         PRIORITY, 
-         1024, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         HIGH_ID,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF HIGH TASK" );
-
-      PRIORITY := PRIORITY + 1;
-
-      RTEMS.TASK_START( 
-         HIGH_ID, 
-         TMTEST.HIGH_TASK'ACCESS, 
-         0, 
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF HIGH TASK" );
-
-      for INDEX in 2 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-      loop
-
-         RTEMS.TASK_CREATE( 
-            RTEMS.BUILD_NAME( 'M', 'I', 'D', ' ' ),
-            PRIORITY, 
-            1024, 
-            RTEMS.DEFAULT_MODES,
-            RTEMS.DEFAULT_ATTRIBUTES,
-            TASK_ID,
-            STATUS
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE MIDDLE" );
-
-         PRIORITY := PRIORITY + 1;
-
-         RTEMS.TASK_START( 
-            TASK_ID, 
-            TMTEST.MIDDLE_TASKS'ACCESS, 
-            0, 
-            STATUS 
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START MIDDLE" );
-
-      end loop;
-
-      RTEMS.TASK_CREATE( 
-         RTEMS.BUILD_NAME( 'L', 'O', 'W', ' ' ),
-         PRIORITY, 
-         2048, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         LOW_ID,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF LOW TASK" );
-
-      RTEMS.TASK_START( LOW_ID, TMTEST.LOW_TASK'ACCESS, 0, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF LOW TASK" );
-
-      RTEMS.SEMAPHORE_CREATE(
-         RTEMS.BUILD_NAME( 'S', 'M', '1', ' ' ),
-         0,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         RTEMS.NO_PRIORITY,
-         TMTEST.SEMAPHORE_ID,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_CREATE OF SM1" );
-
-   end TEST_INIT;
-
---PAGE
--- 
---  HIGH_TASK
---
-
-   procedure HIGH_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS                   : RTEMS.STATUS_CODES;
-   begin
-
-      TIMER_DRIVER.INITIALIZE;
-      RTEMS.SEMAPHORE_OBTAIN(
-         TMTEST.SEMAPHORE_ID,
-         RTEMS.DEFAULT_OPTIONS,
-         RTEMS.NO_TIMEOUT,
-         STATUS
-      );
-
-   end HIGH_TASK;
-
---PAGE
--- 
---  MIDDLE_TASKS
---
-
-   procedure MIDDLE_TASKS (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS                   : RTEMS.STATUS_CODES;
-   begin
-
-      RTEMS.SEMAPHORE_OBTAIN(
-         TMTEST.SEMAPHORE_ID,
-         RTEMS.DEFAULT_OPTIONS,
-         RTEMS.NO_TIMEOUT,
-         STATUS
-      );
-
-   end MIDDLE_TASKS;
-
---PAGE
--- 
---  LOW_TASK
---
-
-   procedure LOW_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS                   : RTEMS.STATUS_CODES;
-   begin
-
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "SEMAPHORE_OBTAIN (blocking)", 
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         0,
-         RTEMS_CALLING_OVERHEAD.SEMAPHORE_OBTAIN 
-      );
-
-      RTEMS.SHUTDOWN_EXECUTIVE( 0 );
-
-   end LOW_TASK;
-
-end TMTEST;
diff --git a/c/src/ada-tests/tmtests/tm02/tmtest.ads b/c/src/ada-tests/tmtests/tm02/tmtest.ads
deleted file mode 100644
index 49e5df7c16..0000000000
--- a/c/src/ada-tests/tmtests/tm02/tmtest.ads
+++ /dev/null
@@ -1,103 +0,0 @@
---
---  TMTEST / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package is the specification for Test 2 of the RTEMS
---  Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with TIMER_DRIVER;
-with RTEMS;
-
-package TMTEST is
-
---
---  The following is the ID of the semaphore used for timing operations.
---
-
-   SEMAPHORE_ID : RTEMS.ID;
-
---
---  The following variable is set to the execution time returned
---  by the timer.
---
-
-   END_TIME  : RTEMS.UNSIGNED32;
-
---
---  INIT
---
---  DESCRIPTION:
---
---  This RTEMS task initializes the application.
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TEST_INIT
---
---  DESCRIPTION:
---
---  This subprogram performs test initialization.
---
-
-   procedure TEST_INIT;
-
---
---  HIGH_TASK
---
---  DESCRIPTION:
---
---  This RTEMS task starts the timer and performs a blocking 
---  SEMAPHORE_OBTAIN.
---
-
-   procedure HIGH_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  MIDDLE_TASKS
---
---  DESCRIPTION:
---
---  These RTEMS task start the timer and performs a blocking 
---  SEMAPHORE_OBTAIN.
---
-
-   procedure MIDDLE_TASKS (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  LOW_TASK
---
---  DESCRIPTION:
---
---  This RTEMS task stops the timer and reports the execution time for
---  a blocking SEMAPHORE_OBTAIN.
---
-
-   procedure LOW_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
-end TMTEST;
diff --git a/c/src/ada-tests/tmtests/tm03/config.h b/c/src/ada-tests/tmtests/tm03/config.h
deleted file mode 100644
index 588ff58466..0000000000
--- a/c/src/ada-tests/tmtests/tm03/config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*  config.h
- *
- *  This include file defines the Configuration Table for this test.
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-/* configuration information */
-
-#define CONFIGURE_TMTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
-
-#define CONFIGURE_MAXIMUM_TASKS              111
-#define CONFIGURE_MAXIMUM_TIMERS             110
-#define CONFIGURE_MAXIMUM_SEMAPHORES         101
-#define CONFIGURE_TICKS_PER_TIMESLICE        0
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#define CONFIGURE_MAXIMUM_POSIX_THREADS              10
-#define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
-#define CONFIGURE_MAXIMUM_POSIX_MUTEXES              20
-#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES  10
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/c/src/ada-tests/tmtests/tm03/tm03.adb b/c/src/ada-tests/tmtests/tm03/tm03.adb
deleted file mode 100644
index 13787b3d97..0000000000
--- a/c/src/ada-tests/tmtests/tm03/tm03.adb
+++ /dev/null
@@ -1,57 +0,0 @@
---
---  MAIN / BODY
---
---  DESCRIPTION:
---
---  This is the entry point for Test TM03 of the Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-with TMTEST;
-with TEST_SUPPORT;
-
-procedure TM03 is
-  INIT_ID : RTEMS.ID;
-  STATUS  : RTEMS.STATUS_CODES;
-begin
-
-   RTEMS.TASK_CREATE(
-      RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
-      1,
-      RTEMS.MINIMUM_STACK_SIZE,
-      RTEMS.NO_PREEMPT,
-      RTEMS.DEFAULT_ATTRIBUTES,
-      INIT_ID,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
-
-
-   RTEMS.TASK_START(
-      INIT_ID,
-      TMTEST.INIT'ACCESS,
-      0,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
-
-   loop
-      delay 120.0;
-   end loop;
-
-end TM03;
-
diff --git a/c/src/ada-tests/tmtests/tm03/tmtest.adb b/c/src/ada-tests/tmtests/tm03/tmtest.adb
deleted file mode 100644
index 192248bbcc..0000000000
--- a/c/src/ada-tests/tmtests/tm03/tmtest.adb
+++ /dev/null
@@ -1,194 +0,0 @@
---
---  TMTEST / BODY
---
---  DESCRIPTION:
---
---  This package is the implementation of Test 3 of the RTEMS
---  Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with INTERFACES; use INTERFACES;
-with RTEMS;
-with RTEMS_CALLING_OVERHEAD;
-with TEST_SUPPORT;
-with TEXT_IO;
-with TIME_TEST_SUPPORT;
-with UNSIGNED32_IO;
-
-package body TMTEST is
-
---PAGE
--- 
---  INIT
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      TASK_ID : RTEMS.ID;
-      STATUS  : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** TIME TEST 3 ***" );
-
-      RTEMS.TASK_CREATE( 
-         RTEMS.BUILD_NAME( 'T', 'A', '1', ' ' ),
-         252, 
-         2048, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         TASK_ID,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TEST_INIT" );
-
-      RTEMS.TASK_START( TASK_ID, TMTEST.TEST_INIT'ACCESS, 0, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TEST_INIT" );
-
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
-
-   end INIT;
-
---PAGE
--- 
---  TEST_INIT
---
-
-   procedure TEST_INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      INDEX    : RTEMS.UNSIGNED32;
-      PRIORITY : RTEMS.TASK_PRIORITY;
-      TASK_ID  : RTEMS.ID;
-      STATUS   : RTEMS.STATUS_CODES;
-   begin
-
-      PRIORITY := 250;
- 
-      RTEMS.SEMAPHORE_CREATE(
-         RTEMS.BUILD_NAME( 'S', 'M', '1', ' ' ),
-         0,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         RTEMS.NO_PRIORITY,
-         TMTEST.SEMAPHORE_ID,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_CREATE OF SM1" );
-
-      for INDEX in 2 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-      loop
-
-         RTEMS.TASK_CREATE( 
-            RTEMS.BUILD_NAME( 'M', 'I', 'D', ' ' ),
-            PRIORITY, 
-            1024, 
-            RTEMS.DEFAULT_MODES,
-            RTEMS.DEFAULT_ATTRIBUTES,
-            TASK_ID,
-            STATUS
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE MIDDLE" );
-
-         PRIORITY := PRIORITY - 1;
-
-         RTEMS.TASK_START( TASK_ID, TMTEST.MIDDLE_TASKS'ACCESS, 0, STATUS );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START MIDDLE" );
-
-      end loop;
-
-      RTEMS.TASK_CREATE( 
-         RTEMS.BUILD_NAME( 'H', 'I', 'G', 'H' ),
-         PRIORITY, 
-         1024, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         TASK_ID,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF HIGH TASK" );
-
-      RTEMS.TASK_START( TASK_ID, TMTEST.HIGH_TASK'ACCESS, 0, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF HIGH TASK" );
-
-      TIMER_DRIVER.INITIALIZE;
-      RTEMS.SEMAPHORE_RELEASE( TMTEST.SEMAPHORE_ID, STATUS );
-
-   end TEST_INIT;
-
---PAGE
--- 
---  MIDDLE_TASKS
---
-
-   procedure MIDDLE_TASKS (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      INDEX    : RTEMS.UNSIGNED32;
-      PRIORITY : RTEMS.TASK_PRIORITY;
-      ID       : RTEMS.ID;
-      STATUS   : RTEMS.STATUS_CODES;
-   begin
-   
-      RTEMS.SEMAPHORE_OBTAIN( 
-         TMTEST.SEMAPHORE_ID, 
-         RTEMS.DEFAULT_OPTIONS,
-         RTEMS.NO_TIMEOUT,
-         STATUS
-      );
-
-      RTEMS.SEMAPHORE_RELEASE( TMTEST.SEMAPHORE_ID, STATUS );
-
-   end MIDDLE_TASKS;
-
---PAGE
--- 
---  HIGH_TASK
---
-
-   procedure HIGH_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      INDEX    : RTEMS.UNSIGNED32;
-      PRIORITY : RTEMS.TASK_PRIORITY;
-      ID       : RTEMS.ID;
-      STATUS   : RTEMS.STATUS_CODES;
-   begin
-   
-      RTEMS.SEMAPHORE_OBTAIN( 
-         TMTEST.SEMAPHORE_ID, 
-         RTEMS.DEFAULT_OPTIONS,
-         RTEMS.NO_TIMEOUT,
-         STATUS
-      );
-
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "SEMAPHORE_RELEASE (preemptive)", 
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         0,
-         RTEMS_CALLING_OVERHEAD.SEMAPHORE_RELEASE
-      );
-
-      RTEMS.SHUTDOWN_EXECUTIVE( 0 );
-
-   end HIGH_TASK;
-
-end TMTEST;
diff --git a/c/src/ada-tests/tmtests/tm03/tmtest.ads b/c/src/ada-tests/tmtests/tm03/tmtest.ads
deleted file mode 100644
index 0090300559..0000000000
--- a/c/src/ada-tests/tmtests/tm03/tmtest.ads
+++ /dev/null
@@ -1,95 +0,0 @@
---
---  TMTEST / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package is the specification for Test 3 of the RTEMS
---  Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with TIMER_DRIVER;
-with RTEMS;
-
-package TMTEST is
-
---
---  The following is the ID of the semaphore used for timing operations.
---
-
-   SEMAPHORE_ID : RTEMS.ID;
-
---
---  The following variable is set to the execution time returned
---  by the timer.
---
-
-   END_TIME  : RTEMS.UNSIGNED32;
-
---
---  INIT
---
---  DESCRIPTION:
---
---  This RTEMS task initializes the application.
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TEST_INIT
---
---  DESCRIPTION:
---
---  This subprogram performs test initialization.  After completion
---  of test initialization, the timer is started and a preemptive
---  SEMAPHORE_RELEASE is performed.
---
-
-   procedure TEST_INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  MIDDLE_TASKS
---
---  DESCRIPTION:
---
---  This RTEMS task performs a blocking SEMAPHORE_OBTAIN.  Once
---  is obtains the semaphore unit and executes again, it performs
---  a preemptive SEMAPHORE_RELEASE.
---
-
-   procedure MIDDLE_TASKS (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  HIGH_TASK
---
---  DESCRIPTION:
---
---  This RTEMS task stops the timer and reports the execution
---  timer for a preemptive SEMAPHORE_RELEASE.
---
-
-   procedure HIGH_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
-end TMTEST;
diff --git a/c/src/ada-tests/tmtests/tm04/config.h b/c/src/ada-tests/tmtests/tm04/config.h
deleted file mode 100644
index e58f7c9923..0000000000
--- a/c/src/ada-tests/tmtests/tm04/config.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*  config.h
- *
- *  This include file defines the Configuration Table for this test.
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-/* configuration information */
-
-#define CONFIGURE_TMTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
-
-#define CONFIGURE_MAXIMUM_TASKS              111
-#define CONFIGURE_MAXIMUM_SEMAPHORES         1
-#define CONFIGURE_TICKS_PER_TIMESLICE        0
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#define CONFIGURE_MAXIMUM_POSIX_THREADS              10
-#define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
-#define CONFIGURE_MAXIMUM_POSIX_MUTEXES              20
-#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES  10
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/c/src/ada-tests/tmtests/tm04/tm04.adb b/c/src/ada-tests/tmtests/tm04/tm04.adb
deleted file mode 100644
index 2207f55dc1..0000000000
--- a/c/src/ada-tests/tmtests/tm04/tm04.adb
+++ /dev/null
@@ -1,57 +0,0 @@
---
---  MAIN / BODY
---
---  DESCRIPTION:
---
---  This is the entry point for Test TM04 of the Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-with TMTEST;
-with TEST_SUPPORT;
-
-procedure TM04 is
-  INIT_ID : RTEMS.ID;
-  STATUS  : RTEMS.STATUS_CODES;
-begin
-
-   RTEMS.TASK_CREATE(
-      RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
-      1,
-      RTEMS.MINIMUM_STACK_SIZE,
-      RTEMS.NO_PREEMPT,
-      RTEMS.DEFAULT_ATTRIBUTES,
-      INIT_ID,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
-
-
-   RTEMS.TASK_START(
-      INIT_ID,
-      TMTEST.INIT'ACCESS,
-      0,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
-
-   loop
-      delay 120.0;
-   end loop;
-
-end TM04;
-
diff --git a/c/src/ada-tests/tmtests/tm04/tmtest.adb b/c/src/ada-tests/tmtests/tm04/tmtest.adb
deleted file mode 100644
index bef30afc6f..0000000000
--- a/c/src/ada-tests/tmtests/tm04/tmtest.adb
+++ /dev/null
@@ -1,501 +0,0 @@
---
---  TMTEST / BODY
---
---  DESCRIPTION:
---
---  This package is the implementation of Test 4 of the RTEMS
---  Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with INTERFACES; use INTERFACES;
-with RTEMS;
-with RTEMS_CALLING_OVERHEAD;
-with TEST_SUPPORT;
-with TEXT_IO;
-with TIME_TEST_SUPPORT;
-with UNSIGNED32_IO;
-
-package body TMTEST is
-
---PAGE
--- 
---  INIT
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS  : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** TIME TEST 4 ***" );
-
-      TMTEST.TEST_INIT;
-
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
-
-   end INIT;
-
---PAGE
--- 
---  TEST_INIT
---
-
-   procedure TEST_INIT
-   is
-      INDEX    : RTEMS.UNSIGNED32;
-      STATUS   : RTEMS.STATUS_CODES;
-   begin
-
-      TMTEST.TASK_COUNT := TIME_TEST_SUPPORT.OPERATION_COUNT;
-
-      for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-      loop
-
-         RTEMS.TASK_CREATE( 
-            RTEMS.BUILD_NAME( 'T', 'I', 'M', 'E' ),
-            10, 
-            1024, 
-            RTEMS.NO_PREEMPT,
-            RTEMS.DEFAULT_ATTRIBUTES,
-            TMTEST.TASK_ID( INDEX ),
-            STATUS
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE LOOP" );
-
-         RTEMS.TASK_START( 
-            TMTEST.TASK_ID( INDEX ),
-            TMTEST.LOW_TASKS'ACCESS, 
-            0, 
-            STATUS 
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START LOOP" );
-
-      end loop;
-
-      RTEMS.SEMAPHORE_CREATE(
-         RTEMS.BUILD_NAME( 'S', 'M', '1', ' ' ),
-         0,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         RTEMS.NO_PRIORITY,
-         TMTEST.SEMAPHORE_ID,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_CREATE OF SM1" );
-
-   end TEST_INIT;
-
---PAGE
--- 
---  HIGHEST_TASK
---
-
-   procedure HIGHEST_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      OLD_PRIORITY : RTEMS.TASK_PRIORITY;
-      STATUS       : RTEMS.STATUS_CODES;
-   begin
-
-      if ARGUMENT = 1 then
-
-         TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-         TIME_TEST_SUPPORT.PUT_TIME( 
-            "TASK_RESTART (blocked, preempt)",
-            TMTEST.END_TIME, 
-            1, 
-            0,
-            RTEMS_CALLING_OVERHEAD.TASK_RESTART
-         );
- 
-         RTEMS.TASK_SET_PRIORITY( RTEMS.SELF, 254, OLD_PRIORITY, STATUS );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SET_PRIORITY" );
-
-      elsif ARGUMENT = 2 then
-
-         TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-         TIME_TEST_SUPPORT.PUT_TIME( 
-            "TASK_RESTART (ready, preempt)",
-            TMTEST.END_TIME, 
-            1, 
-            0,
-            RTEMS_CALLING_OVERHEAD.TASK_RESTART
-         );
-
-         RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE" );
- 
-      else
-
-         RTEMS.SEMAPHORE_OBTAIN( 
-            TMTEST.SEMAPHORE_ID, 
-            RTEMS.DEFAULT_OPTIONS,
-            RTEMS.NO_TIMEOUT,
-            STATUS
-         );
-
-      end if;
-
-   end HIGHEST_TASK;
-
---PAGE
--- 
---  HIGH_TASK
---
-
-   procedure HIGH_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      OLD_PRIORITY : RTEMS.TASK_PRIORITY;
-      INDEX        : RTEMS.UNSIGNED32;
-      OVERHEAD     : RTEMS.UNSIGNED32;
-      NAME         : RTEMS.NAME;
-      STATUS       : RTEMS.STATUS_CODES;
-   begin
- 
-      TIMER_DRIVER.INITIALIZE;
-         RTEMS.TASK_RESTART( TMTEST.HIGHEST_ID, 1, STATUS );
-      -- preempted by Higher_task
-
-      TIMER_DRIVER.INITIALIZE;
-         RTEMS.TASK_RESTART( TMTEST.HIGHEST_ID, 2, STATUS );
-      -- preempted by Higher_task
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            TIMER_DRIVER.EMPTY_FUNCTION;
-         end loop;
-      OVERHEAD := TIMER_DRIVER.READ_TIMER;
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            RTEMS.SEMAPHORE_RELEASE( TMTEST.SEMAPHORE_ID, STATUS );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "SEMAPHORE_RELEASE (readying)",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         RTEMS_CALLING_OVERHEAD.SEMAPHORE_RELEASE
-      );
-
-      for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-      loop
-         RTEMS.TASK_DELETE( TMTEST.TASK_ID( INDEX ), STATUS );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE" );
-      end loop;
-     
-      NAME := RTEMS.BUILD_NAME( 'T', 'I', 'M', 'E' );
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            RTEMS.TASK_CREATE( 
-               NAME,
-               10, 
-               1024, 
-               RTEMS.NO_PREEMPT,
-               RTEMS.DEFAULT_ATTRIBUTES,
-               TMTEST.TASK_ID( INDEX ),
-               STATUS
-            );
-         end loop; 
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "TASK_CREATE",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         RTEMS_CALLING_OVERHEAD.TASK_CREATE
-      );
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            RTEMS.TASK_START( 
-               TMTEST.TASK_ID( INDEX ),
-               TMTEST.LOW_TASKS'ACCESS, 
-               0, 
-               STATUS
-            );
-         end loop; 
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "TASK_START",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         RTEMS_CALLING_OVERHEAD.TASK_START
-      );
-
-      for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-      loop
-         RTEMS.TASK_DELETE( TMTEST.TASK_ID( INDEX ), STATUS );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE LOOP" );
-      end loop;
-     
-      for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-      loop
-         RTEMS.TASK_CREATE( 
-            NAME,
-            250, 
-            1024, 
-            RTEMS.NO_PREEMPT,
-            RTEMS.DEFAULT_ATTRIBUTES,
-            TMTEST.TASK_ID( INDEX ),
-            STATUS
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE LOOP" );
-         RTEMS.TASK_START( 
-            TMTEST.TASK_ID( INDEX ),
-            TMTEST.RESTART_TASK'ACCESS, 
-            0, 
-            STATUS
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START LOOP" );
-         RTEMS.TASK_SUSPEND( TMTEST.TASK_ID( INDEX ), STATUS );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SUSPEND LOOP" );
-      end loop;
-     
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            RTEMS.TASK_RESTART( TMTEST.TASK_ID( INDEX ), 0, STATUS );
-         end loop; 
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "TASK_RESTART (suspended)",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         RTEMS_CALLING_OVERHEAD.TASK_RESTART
-      );
-
-      for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-      loop
-         RTEMS.TASK_SUSPEND( TMTEST.TASK_ID( INDEX ), STATUS );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SUSPEND LOOP" );
-      end loop;
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            RTEMS.TASK_DELETE( TMTEST.TASK_ID( INDEX ), STATUS );
-         end loop; 
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "TASK_DELETE (suspended)",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         RTEMS_CALLING_OVERHEAD.TASK_DELETE
-      );
-
-      for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-      loop
-         RTEMS.TASK_CREATE( 
-            NAME,
-            250, 
-            1024, 
-            RTEMS.DEFAULT_OPTIONS,
-            RTEMS.DEFAULT_ATTRIBUTES,
-            TMTEST.TASK_ID( INDEX ),
-            STATUS
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE LOOP" );
-         RTEMS.TASK_START( 
-            TMTEST.TASK_ID( INDEX ),
-            TMTEST.RESTART_TASK'ACCESS, 
-            0, 
-            STATUS
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START LOOP" );
-      end loop;
-     
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            RTEMS.TASK_RESTART( TMTEST.TASK_ID( INDEX ), 1, STATUS );
-         end loop; 
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "TASK_RESTART (ready)",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         RTEMS_CALLING_OVERHEAD.TASK_RESTART
-      );
-
-      for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-      loop
-         RTEMS.TASK_SET_PRIORITY( 
-            TMTEST.TASK_ID( INDEX ), 
-            5, 
-            OLD_PRIORITY, 
-            STATUS 
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SET_PRIORITY LOOP" );
-      end loop; 
-
-      -- yield processor -- tasks block
-      RTEMS.TASK_WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS ); 
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
-    
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            RTEMS.TASK_RESTART( TMTEST.TASK_ID( INDEX ), 1, STATUS );
-         end loop; 
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "TASK_RESTART (blocked, no preempt)",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         RTEMS_CALLING_OVERHEAD.TASK_RESTART
-      );
-
-      -- yield processor -- tasks block
-      RTEMS.TASK_WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS ); 
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
-    
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            RTEMS.TASK_DELETE( TMTEST.TASK_ID( INDEX ), STATUS );
-         end loop; 
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "TASK_DELETE (blocked)",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         RTEMS_CALLING_OVERHEAD.TASK_DELETE
-      );
-
-      RTEMS.SHUTDOWN_EXECUTIVE( 0 );
-
-   end HIGH_TASK;
-
---PAGE
--- 
---  LOW_TASKS
---
-
-   procedure LOW_TASKS (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      ID         : RTEMS.ID;
-      STATUS     : RTEMS.STATUS_CODES;
-   begin
-   
-      TMTEST.TASK_COUNT := TMTEST.TASK_COUNT - 1;
-
-      if TMTEST.TASK_COUNT = 0 then
-
-         RTEMS.TASK_CREATE( 
-            RTEMS.BUILD_NAME( 'H', 'I', ' ', ' ' ),
-            5, 
-            2048, 
-            RTEMS.DEFAULT_OPTIONS,
-            RTEMS.DEFAULT_ATTRIBUTES,
-            ID,
-            STATUS
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE HI" );
-
-         RTEMS.TASK_START( 
-            ID, 
-            TMTEST.HIGH_TASK'ACCESS, 
-            0, 
-            STATUS 
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START HI" );
-
-
-         RTEMS.TASK_CREATE( 
-            RTEMS.BUILD_NAME( 'H', 'I', 'G', 'H' ),
-            3, 
-            2048, 
-            RTEMS.DEFAULT_OPTIONS,
-            RTEMS.DEFAULT_ATTRIBUTES,
-            TMTEST.HIGHEST_ID,
-            STATUS
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE HIGH" );
-
-         RTEMS.TASK_START( 
-            TMTEST.HIGHEST_ID, 
-            TMTEST.HIGHEST_TASK'ACCESS, 
-            0, 
-            STATUS 
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START HIGH" );
-
-
-      end if;
-
-      RTEMS.SEMAPHORE_OBTAIN( 
-         TMTEST.SEMAPHORE_ID, 
-         RTEMS.DEFAULT_OPTIONS,
-         RTEMS.NO_TIMEOUT,
-         STATUS
-      );
-
-   end LOW_TASKS;
-
---PAGE
--- 
---  RESTART_TASK
---
-
-   procedure RESTART_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      INDEX    : RTEMS.UNSIGNED32;
-      PRIORITY : RTEMS.TASK_PRIORITY;
-      ID       : RTEMS.ID;
-      STATUS   : RTEMS.STATUS_CODES;
-   begin
-   
-      if ARGUMENT = 1 then
-         RTEMS.SEMAPHORE_OBTAIN( 
-            TMTEST.SEMAPHORE_ID, 
-            RTEMS.DEFAULT_OPTIONS,
-            RTEMS.NO_TIMEOUT,
-            STATUS
-         );
-      end if;
-
-   end RESTART_TASK;
-
-end TMTEST;
diff --git a/c/src/ada-tests/tmtests/tm04/tmtest.ads b/c/src/ada-tests/tmtests/tm04/tmtest.ads
deleted file mode 100644
index b4b29555df..0000000000
--- a/c/src/ada-tests/tmtests/tm04/tmtest.ads
+++ /dev/null
@@ -1,161 +0,0 @@
---
---  TMTEST / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package is the specification for Test 4 of the RTEMS
---  Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with TIME_TEST_SUPPORT;
-with TIMER_DRIVER;
-with RTEMS;
-
-package TMTEST is
-
---
---  This array contains the IDs of all RTEMS tasks created by this test.
---
-
-   TASK_ID : array ( RTEMS.UNSIGNED32 
-      range 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT ) of RTEMS.ID;
-
---
---  This variable contains the id of the highest priority task
---  in the system.
--- 
-
-   HIGHEST_ID : RTEMS.ID;
-
---
---  The following is the ID of the semaphore used for timing operations.
---
-
-   SEMAPHORE_ID : RTEMS.ID;
-
---
---  The following is used to perform the same operation 
---  on a group of tasks.
---
-
-   TASK_COUNT : RTEMS.UNSIGNED32;
-
---
---  The following variable is set to the execution time returned
---  by the timer.
---
-
-   END_TIME  : RTEMS.UNSIGNED32;
-
---
---  INIT
---
---  DESCRIPTION:
---
---  This RTEMS task initializes the application.
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TEST_INIT
---
---  DESCRIPTION:
---
---  This subprogram performs test initialization.
---
-
-   procedure TEST_INIT;
-
---
---  HIGHEST_TASK
---
---  DESCRIPTION:
---
---  This RTEMS task is created by one of the LOW_TASKS.  The 
---  first time it executes, it performs a blocking SEMAPHORE_OBTAIN
---  which transfers control of the processor to HIGH_TASK.
---  The first time HIGHEST_TASK is restarted, it stops the
---  timer and reports the execution time for a TASK_RESTART
---  for a blocked task which preempts the caller.  The second 
---  time HIGHEST_TASK is restarted, it stops the timer and reports 
---  the execution time for a TASK_RESTART for a ready task which 
---  has its original priority restored and preempts the caller.  
---
-
-   procedure HIGHEST_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  HIGH_TASK
---
---  DESCRIPTION:
---
---  This RTEMS task is created by one of the LOW_TASKS.   This
---  task restarts HIGHEST_TASK twice.  HIGHEST_TASK is blocked the
---  first time and preempts this task when restarted.  HIGHEST_TASK
---  is ready the second time but has lowered its priority.  When 
---  restarted for the second time, HIGHEST_TASK will have its
---  original priority restored and preempt this task.
---  Once control of the processor is returned to this task after
---  HIGHEST_TASK deletes itself, the following execution times
---  are measured and reported.
---
---    + readying SEMAPHORE_RELEASE 
---    + TASK_CREATE
---    + TASK_START
---    + TASK_RESTART of a suspended task
---    + TASK_DELETE of a suspended task
---    + TASK_RESTART of a ready task
---    + TASK_RESTART of a blocked task which does not cause a preempt
---    + TASK_DELETE of a blocked task
---
-
-   procedure HIGH_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  LOW_TASKS
---
---  DESCRIPTION:
---
---  The last of these RTEMS tasks to execute creates HIGH_TASK
---  and HIGHEST_TASK.  All of these tasks perform a blocking 
---  SEMAPHORE_OBTAIN.
---
-
-   procedure LOW_TASKS (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  RESTART_TASK
---
---  DESCRIPTION:
---
---  This RTEMS task
---
-
-   procedure RESTART_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
-end TMTEST;
diff --git a/c/src/ada-tests/tmtests/tm05/config.h b/c/src/ada-tests/tmtests/tm05/config.h
deleted file mode 100644
index 588ff58466..0000000000
--- a/c/src/ada-tests/tmtests/tm05/config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*  config.h
- *
- *  This include file defines the Configuration Table for this test.
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-/* configuration information */
-
-#define CONFIGURE_TMTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
-
-#define CONFIGURE_MAXIMUM_TASKS              111
-#define CONFIGURE_MAXIMUM_TIMERS             110
-#define CONFIGURE_MAXIMUM_SEMAPHORES         101
-#define CONFIGURE_TICKS_PER_TIMESLICE        0
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#define CONFIGURE_MAXIMUM_POSIX_THREADS              10
-#define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
-#define CONFIGURE_MAXIMUM_POSIX_MUTEXES              20
-#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES  10
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/c/src/ada-tests/tmtests/tm05/tm05.adb b/c/src/ada-tests/tmtests/tm05/tm05.adb
deleted file mode 100644
index 535717a052..0000000000
--- a/c/src/ada-tests/tmtests/tm05/tm05.adb
+++ /dev/null
@@ -1,57 +0,0 @@
---
---  MAIN / BODY
---
---  DESCRIPTION:
---
---  This is the entry point for Test TM05 of the Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-with TMTEST;
-with TEST_SUPPORT;
-
-procedure TM05 is
-  INIT_ID : RTEMS.ID;
-  STATUS  : RTEMS.STATUS_CODES;
-begin
-
-   RTEMS.TASK_CREATE(
-      RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
-      1,
-      RTEMS.MINIMUM_STACK_SIZE,
-      RTEMS.NO_PREEMPT,
-      RTEMS.DEFAULT_ATTRIBUTES,
-      INIT_ID,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
-
-
-   RTEMS.TASK_START(
-      INIT_ID,
-      TMTEST.INIT'ACCESS,
-      0,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
-
-   loop
-      delay 120.0;
-   end loop;
-
-end TM05;
-
diff --git a/c/src/ada-tests/tmtests/tm05/tmtest.adb b/c/src/ada-tests/tmtests/tm05/tmtest.adb
deleted file mode 100644
index 438988615a..0000000000
--- a/c/src/ada-tests/tmtests/tm05/tmtest.adb
+++ /dev/null
@@ -1,174 +0,0 @@
---
---  TMTEST / BODY
---
---  DESCRIPTION:
---
---  This package is the implementation of Test 5 of the RTEMS
---  Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with INTERFACES; use INTERFACES;
-with RTEMS;
-with RTEMS_CALLING_OVERHEAD;
-with TEST_SUPPORT;
-with TEXT_IO;
-with TIME_TEST_SUPPORT;
-with UNSIGNED32_IO;
-
-package body TMTEST is
-
---PAGE
--- 
---  INIT
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      TASK_ID : RTEMS.ID;
-      STATUS  : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** TIME TEST 5 ***" );
-
-      TMTEST.TEST_INIT;
-
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
-
-   end INIT;
-
---PAGE
--- 
---  TEST_INIT
---
-
-   procedure TEST_INIT
-   is
-      INDEX      : RTEMS.UNSIGNED32;
-      TASK_ENTRY : RTEMS.TASK_ENTRY;
-      PRIORITY   : RTEMS.TASK_PRIORITY;
-      STATUS     : RTEMS.STATUS_CODES;
-   begin
-
-      PRIORITY := 250;
-
-      for INDEX in 0 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-      loop
-
-         RTEMS.TASK_CREATE( 
-            RTEMS.BUILD_NAME( 'T', 'I', 'M', 'E' ),
-            PRIORITY, 
-            1024, 
-            RTEMS.DEFAULT_MODES,
-            RTEMS.DEFAULT_ATTRIBUTES,
-            TMTEST.TASK_ID( INDEX ),
-            STATUS
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE LOOP" );
-
-         PRIORITY := PRIORITY - 1;
-
-         if INDEX = 0 then
-            TASK_ENTRY := TMTEST.LOW_TASK'ACCESS;
-         elsif INDEX = TIME_TEST_SUPPORT.OPERATION_COUNT then
-            TASK_ENTRY := TMTEST.HIGH_TASK'ACCESS;
-         else
-            TASK_ENTRY := TMTEST.MIDDLE_TASKS'ACCESS;
-         end if;
-
-         RTEMS.TASK_START( TMTEST.TASK_ID( INDEX ), TASK_ENTRY, 0, STATUS );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START LOOP" );
-
-      end loop;
-
-   end TEST_INIT;
-
---PAGE
--- 
---  HIGH_TASK
---
-
-   procedure HIGH_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS       : RTEMS.STATUS_CODES;
-   begin
-
-      TIMER_DRIVER.INITIALIZE;
-         RTEMS.TASK_SUSPEND( RTEMS.SELF, STATUS );
-
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "TASK_RESUME causing preempt",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         0,
-         RTEMS_CALLING_OVERHEAD.TASK_RESUME
-      );
-
-      RTEMS.SHUTDOWN_EXECUTIVE( 0 );
-
-   end HIGH_TASK;
-
---PAGE
--- 
---  MIDDLE_TASKS
---
-
-   procedure MIDDLE_TASKS (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS       : RTEMS.STATUS_CODES;
-   begin
- 
-      RTEMS.TASK_SUSPEND( RTEMS.SELF, STATUS );
-
-      TMTEST.TASK_INDEX := TMTEST.TASK_INDEX + 1;
-      RTEMS.TASK_RESUME( TMTEST.TASK_ID( TMTEST.TASK_INDEX ), STATUS );
- 
-   end MIDDLE_TASKS;
-
---PAGE
--- 
---  LOW_TASK
---
-
-   procedure LOW_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      ID       : RTEMS.ID;
-      STATUS   : RTEMS.STATUS_CODES;
-   begin
-
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "TASK_SUSPEND self",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         0,
-         RTEMS_CALLING_OVERHEAD.TASK_SUSPEND
-      );
-   
-      TMTEST.TASK_INDEX := 1;
-      TIMER_DRIVER.INITIALIZE;
-      RTEMS.TASK_RESUME( TMTEST.TASK_ID( TMTEST.TASK_INDEX ), STATUS );
-
-   end LOW_TASK;
-
-end TMTEST;
diff --git a/c/src/ada-tests/tmtests/tm05/tmtest.ads b/c/src/ada-tests/tmtests/tm05/tmtest.ads
deleted file mode 100644
index 2bb9b28c8d..0000000000
--- a/c/src/ada-tests/tmtests/tm05/tmtest.ads
+++ /dev/null
@@ -1,113 +0,0 @@
---
---  TMTEST / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package is the specification for Test 5 of the RTEMS
---  Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with TIME_TEST_SUPPORT;
-with TIMER_DRIVER;
-with RTEMS;
-
-package TMTEST is
-
---
---  This array contains the IDs of all RTEMS tasks created by this test.
---
-
-   TASK_ID : array ( RTEMS.UNSIGNED32 
-      range 0 .. TIME_TEST_SUPPORT.OPERATION_COUNT ) of RTEMS.ID;
-
-   TASK_INDEX : RTEMS.UNSIGNED32;
-
---
---  The following variable is set to the execution time returned
---  by the timer.
---
-
-   END_TIME  : RTEMS.UNSIGNED32;
-
---
---  INIT
---
---  DESCRIPTION:
---
---  This RTEMS task initializes the application.
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TEST_INIT
---
---  DESCRIPTION:
---
---  This subprogram performs test initialization.
---
-
-   procedure TEST_INIT;
-
---
---  HIGH_TASK
---
---  DESCRIPTION:
---
---  This RTEMS task is the highest priority task in the system.  
---  It starts the timer and performs a TASK_SUSPEND on SELF.
---  When this task executes again, it stops the timer and
---  reports the execution time for a preemptive TASK_RESUME.
---
-
-   procedure HIGH_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  MIDDLE_TASKS
---
---  DESCRIPTION:
---
---  These RTEMS tasks perform a TASK_SUSPEND on SELF.  When each 
---  task executes again, it performs preemptive TASK_RESUME on
---  a higher priority task.
---
-
-   procedure MIDDLE_TASKS (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  LOW_TASK
---
---  DESCRIPTION:
---
---  This RTEMS task is the lowest priority task in the system.  
---  When this task executes, it stops the timer and reports the 
---  execution time for a blocking TASK_SUSPEND.  After this,
---  it starts the timer and performs a TASK_RESUME on a
---  higher priority task.
---
-
-   procedure LOW_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
-end TMTEST;
diff --git a/c/src/ada-tests/tmtests/tm06/config.h b/c/src/ada-tests/tmtests/tm06/config.h
deleted file mode 100644
index 588ff58466..0000000000
--- a/c/src/ada-tests/tmtests/tm06/config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*  config.h
- *
- *  This include file defines the Configuration Table for this test.
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-/* configuration information */
-
-#define CONFIGURE_TMTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
-
-#define CONFIGURE_MAXIMUM_TASKS              111
-#define CONFIGURE_MAXIMUM_TIMERS             110
-#define CONFIGURE_MAXIMUM_SEMAPHORES         101
-#define CONFIGURE_TICKS_PER_TIMESLICE        0
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#define CONFIGURE_MAXIMUM_POSIX_THREADS              10
-#define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
-#define CONFIGURE_MAXIMUM_POSIX_MUTEXES              20
-#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES  10
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/c/src/ada-tests/tmtests/tm06/tm06.adb b/c/src/ada-tests/tmtests/tm06/tm06.adb
deleted file mode 100644
index c3f0e3ea1b..0000000000
--- a/c/src/ada-tests/tmtests/tm06/tm06.adb
+++ /dev/null
@@ -1,57 +0,0 @@
---
---  MAIN / BODY
---
---  DESCRIPTION:
---
---  This is the entry point for Test TM06 of the Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-with TMTEST;
-with TEST_SUPPORT;
-
-procedure TM06 is
-  INIT_ID : RTEMS.ID;
-  STATUS  : RTEMS.STATUS_CODES;
-begin
-
-   RTEMS.TASK_CREATE(
-      RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
-      1,
-      RTEMS.MINIMUM_STACK_SIZE,
-      RTEMS.NO_PREEMPT,
-      RTEMS.DEFAULT_ATTRIBUTES,
-      INIT_ID,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
-
-
-   RTEMS.TASK_START(
-      INIT_ID,
-      TMTEST.INIT'ACCESS,
-      0,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
-
-   loop
-      delay 120.0;
-   end loop;
-
-end TM06;
-
diff --git a/c/src/ada-tests/tmtests/tm06/tmtest.adb b/c/src/ada-tests/tmtests/tm06/tmtest.adb
deleted file mode 100644
index e8d471cd87..0000000000
--- a/c/src/ada-tests/tmtests/tm06/tmtest.adb
+++ /dev/null
@@ -1,210 +0,0 @@
---
---  TMTEST / BODY
---
---  DESCRIPTION:
---
---  This package is the implementation of Test 6 of the RTEMS
---  Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with INTERFACES; use INTERFACES;
-with RTEMS;
-with RTEMS_CALLING_OVERHEAD;
-with TEST_SUPPORT;
-with TEXT_IO;
-with TIME_TEST_SUPPORT;
-with UNSIGNED32_IO;
-
-package body TMTEST is
-
---PAGE
--- 
---  INIT
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      TASK_ID : RTEMS.ID;
-      STATUS  : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** TIME TEST 6 ***" );
-
-      TMTEST.TEST_INIT;
-
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
-
-   end INIT;
-
---PAGE
--- 
---  TEST_INIT
---
-
-   procedure TEST_INIT
-   is
-      INDEX      : RTEMS.UNSIGNED32;
-      ID         : RTEMS.ID;
-      STATUS     : RTEMS.STATUS_CODES;
-   begin
-
-      TMTEST.TASK_RESTARTED := TIME_TEST_SUPPORT.OPERATION_COUNT;
-
-      RTEMS.TASK_CREATE( 
-         RTEMS.BUILD_NAME( 'T', 'I', 'M', 'E' ),
-         128, 
-         1024, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         ID,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE" );
-
-      RTEMS.TASK_START( ID, TMTEST.TASK_1'ACCESS, 0, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START" );
-
-   end TEST_INIT;
-
---PAGE
--- 
---  TASK_1
---
-
-   procedure TASK_1 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      INDEX        : RTEMS.UNSIGNED32;
-      OVERHEAD     : RTEMS.UNSIGNED32;
-      STATUS       : RTEMS.STATUS_CODES;
-   begin
-
-      if TMTEST.TASK_RESTARTED = TIME_TEST_SUPPORT.OPERATION_COUNT then
-         TIMER_DRIVER.INITIALIZE;
-      end if;
-
-      TMTEST.TASK_RESTARTED := TMTEST.TASK_RESTARTED - 1;
-
-      if TMTEST.TASK_RESTARTED /= 0 then
-         RTEMS.TASK_RESTART( RTEMS.SELF, 0, STATUS );
-      end if;
-
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            TIMER_DRIVER.EMPTY_FUNCTION;
-         end loop;
-      OVERHEAD := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "TASK_RESTART self",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         0,
-         RTEMS_CALLING_OVERHEAD.TASK_RESTART
-      );
-
-      for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-      loop
-
-         RTEMS.TASK_CREATE( 
-            RTEMS.BUILD_NAME( 'T', 'I', 'M', 'E' ),
-            254, 
-            1024, 
-            RTEMS.DEFAULT_MODES,
-            RTEMS.DEFAULT_ATTRIBUTES,
-            TMTEST.TASK_ID( INDEX ),
-            STATUS
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE LOOP" );
-
-         RTEMS.TASK_START( 
-            TMTEST.TASK_ID( INDEX ), 
-            TMTEST.NULL_TASK'ACCESS, 
-            0, 
-            STATUS 
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START LOOP" );
-
-      end loop;
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            RTEMS.TASK_SUSPEND( TMTEST.TASK_ID( INDEX ), STATUS );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "TASK_SUSPEND no preempt",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         RTEMS_CALLING_OVERHEAD.TASK_SUSPEND
-      );
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            RTEMS.TASK_RESUME( TMTEST.TASK_ID( INDEX ), STATUS );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "TASK_RESUME no preempt",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         RTEMS_CALLING_OVERHEAD.TASK_RESUME
-      );
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            RTEMS.TASK_DELETE( TMTEST.TASK_ID( INDEX ), STATUS );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "TASK_DELETE others",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         RTEMS_CALLING_OVERHEAD.TASK_DELETE
-      );
-
-      RTEMS.SHUTDOWN_EXECUTIVE( 0 );
-
-   end TASK_1;
-
---PAGE
--- 
---  NULL_TASK
---
-
-   procedure NULL_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-   begin
-
-      NULL;
-
-   end NULL_TASK;
-
-end TMTEST;
diff --git a/c/src/ada-tests/tmtests/tm06/tmtest.ads b/c/src/ada-tests/tmtests/tm06/tmtest.ads
deleted file mode 100644
index bbeed402cf..0000000000
--- a/c/src/ada-tests/tmtests/tm06/tmtest.ads
+++ /dev/null
@@ -1,104 +0,0 @@
---
---  TMTEST / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package is the specification for Test 6 of the RTEMS
---  Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with TIME_TEST_SUPPORT;
-with TIMER_DRIVER;
-with RTEMS;
-
-package TMTEST is
-
---
---  This array contains the IDs of all RTEMS tasks created by this test.
---
-
-   TASK_ID : array ( RTEMS.UNSIGNED32 
-      range 0 .. TIME_TEST_SUPPORT.OPERATION_COUNT ) of RTEMS.ID;
-
---
---  This variable is used to determine which restart of TASK_1 will start 
---  timer and which will stop the timer and report the execution time.
---
-
-   TASK_RESTARTED : RTEMS.UNSIGNED32;
-
---
---  The following variable is set to the execution time returned
---  by the timer.
---
-
-   END_TIME  : RTEMS.UNSIGNED32;
-
---
---  INIT
---
---  DESCRIPTION:
---
---  This RTEMS task initializes the application.
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TEST_INIT
---
---  DESCRIPTION:
---
---  This subprogram performs test initialization.
---
-
-   procedure TEST_INIT;
-
---
---  TASK_1
---
---  DESCRIPTION:
---
---  This RTEMS task is responsible for measuring and reporting the
---  following directive execution times:
---
---    + TASK_RESTART of SELF
---    + TASK_SUSPEND of another task with no context switch
---    + TASK_RESUME with no preemption
---    + TASK_DELETE of another task
---
-
-   procedure TASK_1 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  NULL_TASK
---
---  DESCRIPTION:
---
---  This RTEMS task has no operations.  It is used to have
---  tasks to perform directives upon. 
---
-
-   procedure NULL_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
-end TMTEST;
diff --git a/c/src/ada-tests/tmtests/tm07/config.h b/c/src/ada-tests/tmtests/tm07/config.h
deleted file mode 100644
index 588ff58466..0000000000
--- a/c/src/ada-tests/tmtests/tm07/config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*  config.h
- *
- *  This include file defines the Configuration Table for this test.
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-/* configuration information */
-
-#define CONFIGURE_TMTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
-
-#define CONFIGURE_MAXIMUM_TASKS              111
-#define CONFIGURE_MAXIMUM_TIMERS             110
-#define CONFIGURE_MAXIMUM_SEMAPHORES         101
-#define CONFIGURE_TICKS_PER_TIMESLICE        0
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#define CONFIGURE_MAXIMUM_POSIX_THREADS              10
-#define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
-#define CONFIGURE_MAXIMUM_POSIX_MUTEXES              20
-#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES  10
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/c/src/ada-tests/tmtests/tm07/tm07.adb b/c/src/ada-tests/tmtests/tm07/tm07.adb
deleted file mode 100644
index dc39b07f1e..0000000000
--- a/c/src/ada-tests/tmtests/tm07/tm07.adb
+++ /dev/null
@@ -1,57 +0,0 @@
---
---  MAIN / BODY
---
---  DESCRIPTION:
---
---  This is the entry point for Test TM07 of the Single Processor Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-with TMTEST;
-with TEST_SUPPORT;
-
-procedure TM07 is
-  INIT_ID : RTEMS.ID;
-  STATUS  : RTEMS.STATUS_CODES;
-begin
-
-   RTEMS.TASK_CREATE(
-      RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
-      1,
-      RTEMS.MINIMUM_STACK_SIZE,
-      RTEMS.NO_PREEMPT,
-      RTEMS.DEFAULT_ATTRIBUTES,
-      INIT_ID,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
-
-
-   RTEMS.TASK_START(
-      INIT_ID,
-      TMTEST.INIT'ACCESS,
-      0,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
-
-   loop
-      delay 120.0;
-   end loop;
-
-end TM07;
-
diff --git a/c/src/ada-tests/tmtests/tm07/tmtest.adb b/c/src/ada-tests/tmtests/tm07/tmtest.adb
deleted file mode 100644
index 12a2402626..0000000000
--- a/c/src/ada-tests/tmtests/tm07/tmtest.adb
+++ /dev/null
@@ -1,179 +0,0 @@
---
---  TMTEST / BODY
---
---  DESCRIPTION:
---
---  This package is the implementation of Test 7 of the RTEMS
---  Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with INTERFACES; use INTERFACES;
-with RTEMS;
-with RTEMS_CALLING_OVERHEAD;
-with TEST_SUPPORT;
-with TEXT_IO;
-with TIME_TEST_SUPPORT;
-with UNSIGNED32_IO;
-
-package body TMTEST is
-
---PAGE
--- 
---  INIT
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      TASK_ID : RTEMS.ID;
-      STATUS  : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** TIME TEST 7 ***" );
-
-      TMTEST.TEST_INIT;
-
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
-
-   end INIT;
-
---PAGE
--- 
---  TEST_INIT
---
-
-   procedure TEST_INIT
-   is
-      INDEX      : RTEMS.UNSIGNED32;
-      TASK_ENTRY : RTEMS.TASK_ENTRY;
-      PRIORITY   : RTEMS.TASK_PRIORITY;
-      STATUS     : RTEMS.STATUS_CODES;
-   begin
-
-      PRIORITY := 250;
-
-      for INDEX in 0 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-      loop
-
-         RTEMS.TASK_CREATE( 
-            RTEMS.BUILD_NAME( 'T', 'I', 'M', 'E' ),
-            PRIORITY, 
-            1024, 
-            RTEMS.DEFAULT_MODES,
-            RTEMS.DEFAULT_ATTRIBUTES,
-            TMTEST.TASK_ID( INDEX ),
-            STATUS
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE LOOP" );
-
-         PRIORITY := PRIORITY - 1;
-
-         if INDEX = 0 then
-            TASK_ENTRY := TMTEST.LOW_TASK'ACCESS;
-         elsif INDEX = TIME_TEST_SUPPORT.OPERATION_COUNT then
-            TASK_ENTRY := TMTEST.HIGH_TASK'ACCESS;
-         else
-            TASK_ENTRY := TMTEST.MIDDLE_TASKS'ACCESS;
-         end if;
-
-         RTEMS.TASK_START( TMTEST.TASK_ID( INDEX ), TASK_ENTRY, 0, STATUS );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START LOOP" );
-
-      end loop;
-
-   end TEST_INIT;
-
---PAGE
--- 
---  HIGH_TASK
---
-
-   procedure HIGH_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      OLD_PRIORITY : RTEMS.TASK_PRIORITY;
-      STATUS       : RTEMS.STATUS_CODES;
-   begin
-
-      if ARGUMENT > 0 then
-         TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-         TIME_TEST_SUPPORT.PUT_TIME( 
-            "TASK_RESTART suspended/preempt",
-            TMTEST.END_TIME, 
-            TIME_TEST_SUPPORT.OPERATION_COUNT, 
-            0,
-            RTEMS_CALLING_OVERHEAD.TASK_RESTART
-         );
-      else
-         RTEMS.TASK_SUSPEND( RTEMS.SELF, STATUS );
-      end if;
-
-      RTEMS.SHUTDOWN_EXECUTIVE( 0 );
-
-   end HIGH_TASK;
-
---PAGE
--- 
---  MIDDLE_TASKS
---
-
-   procedure MIDDLE_TASKS (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS       : RTEMS.STATUS_CODES;
-   begin
- 
-      TMTEST.TASK_INDEX := TMTEST.TASK_INDEX + 1;
-
-      if ARGUMENT > 0 then
-         RTEMS.TASK_RESTART( 
-            TMTEST.TASK_ID( TMTEST.TASK_INDEX ),
-            16#7FFFFFFF#,
-            STATUS
-         );
-      else
-         RTEMS.TASK_SUSPEND( RTEMS.SELF, STATUS );
-      end if;
-
- 
-   end MIDDLE_TASKS;
-
---PAGE
--- 
---  LOW_TASK
---
-
-   procedure LOW_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS   : RTEMS.STATUS_CODES;
-   begin
-
-      TMTEST.TASK_INDEX := 1;
-      TIMER_DRIVER.INITIALIZE;
-
-      RTEMS.TASK_RESTART( 
-         TMTEST.TASK_ID( TMTEST.TASK_INDEX ),
-         16#7FFFFFFF#,
-         STATUS
-      );
-
-   end LOW_TASK;
-
-end TMTEST;
diff --git a/c/src/ada-tests/tmtests/tm07/tmtest.ads b/c/src/ada-tests/tmtests/tm07/tmtest.ads
deleted file mode 100644
index 1e97840005..0000000000
--- a/c/src/ada-tests/tmtests/tm07/tmtest.ads
+++ /dev/null
@@ -1,111 +0,0 @@
---
---  TMTEST / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package is the specification for Test 7 of the RTEMS
---  Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with TIMER_DRIVER;
-with TIME_TEST_SUPPORT;
-with RTEMS;
-
-package TMTEST is
-
---
---  This array contains the IDs of all RTEMS tasks created by this test.
---
-
-   TASK_ID : array ( RTEMS.UNSIGNED32 
-      range 0 .. TIME_TEST_SUPPORT.OPERATION_COUNT ) of RTEMS.ID;
-
-   TASK_INDEX : RTEMS.UNSIGNED32;
-
---
---  The following variable is set to the execution time returned
---  by the timer.
---
-
-   END_TIME  : RTEMS.UNSIGNED32;
-
---
---  INIT
---
---  DESCRIPTION:
---
---  This RTEMS task initializes the application.
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TEST_INIT
---
---  DESCRIPTION:
---
---  This subprogram performs test initialization.
---
-
-   procedure TEST_INIT;
-
---
---  HIGH_TASK
---
---  DESCRIPTION:
---
---  This RTEMS task is the highest priority task in the system.  
---  The first time it executes it suspends itself.  When restarted
---  it stops the timer and reports the time for a TASK_RESTART
---  of a suspended task which results in a preemption.
---
-
-   procedure HIGH_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  MIDDLE_TASKS
---
---  DESCRIPTION:
---
---  These RTEMS tasks suspend themselves the first time they execute.
---  When restarted they perform a TASK_RESTART of a suspended 
---  higher priority task which results in a preemption.
---
-
-   procedure MIDDLE_TASKS (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  LOW_TASK
---
---  DESCRIPTION:
---
---  This RTEMS task is the lowest priority task in the system.  
---  When it executes it starts the timer and restarts a higher
---  priority task which immediately preempts this task.
---
-
-   procedure LOW_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
-end TMTEST;
diff --git a/c/src/ada-tests/tmtests/tm08/config.h b/c/src/ada-tests/tmtests/tm08/config.h
deleted file mode 100644
index 588ff58466..0000000000
--- a/c/src/ada-tests/tmtests/tm08/config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*  config.h
- *
- *  This include file defines the Configuration Table for this test.
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-/* configuration information */
-
-#define CONFIGURE_TMTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
-
-#define CONFIGURE_MAXIMUM_TASKS              111
-#define CONFIGURE_MAXIMUM_TIMERS             110
-#define CONFIGURE_MAXIMUM_SEMAPHORES         101
-#define CONFIGURE_TICKS_PER_TIMESLICE        0
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#define CONFIGURE_MAXIMUM_POSIX_THREADS              10
-#define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
-#define CONFIGURE_MAXIMUM_POSIX_MUTEXES              20
-#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES  10
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/c/src/ada-tests/tmtests/tm08/tm08.adb b/c/src/ada-tests/tmtests/tm08/tm08.adb
deleted file mode 100644
index 03b6a77bb8..0000000000
--- a/c/src/ada-tests/tmtests/tm08/tm08.adb
+++ /dev/null
@@ -1,57 +0,0 @@
---
---  MAIN / BODY
---
---  DESCRIPTION:
---
---  This is the entry point for Test TM08 of the Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-with TMTEST;
-with TEST_SUPPORT;
-
-procedure TM08 is
-  INIT_ID : RTEMS.ID;
-  STATUS  : RTEMS.STATUS_CODES;
-begin
-
-   RTEMS.TASK_CREATE(
-      RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
-      1,
-      RTEMS.MINIMUM_STACK_SIZE,
-      RTEMS.NO_PREEMPT,
-      RTEMS.DEFAULT_ATTRIBUTES,
-      INIT_ID,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
-
-
-   RTEMS.TASK_START(
-      INIT_ID,
-      TMTEST.INIT'ACCESS,
-      0,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
-
-   loop
-      delay 120.0;
-   end loop;
-
-end TM08;
-
diff --git a/c/src/ada-tests/tmtests/tm08/tmtest.adb b/c/src/ada-tests/tmtests/tm08/tmtest.adb
deleted file mode 100644
index 971c7be472..0000000000
--- a/c/src/ada-tests/tmtests/tm08/tmtest.adb
+++ /dev/null
@@ -1,341 +0,0 @@
---
---  TMTEST / BODY
---
---  DESCRIPTION:
---
---  This package is the implementation of Test 8 of the RTEMS
---  Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with INTERFACES; use INTERFACES;
-with RTEMS;
-with RTEMS_CALLING_OVERHEAD;
-with TEST_SUPPORT;
-with TEXT_IO;
-with TIME_TEST_SUPPORT;
-with UNSIGNED32_IO;
-
-package body TMTEST is
-
---PAGE
--- 
---  INIT
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      TASK_ID : RTEMS.ID;
-      STATUS  : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** TIME TEST 8 ***" );
-
-      TMTEST.TEST_INIT;
-
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
-
-   end INIT;
-
---PAGE
--- 
---  TEST_INIT
---
-
-   procedure TEST_INIT
-   is
-      STATUS     : RTEMS.STATUS_CODES;
-   begin
-
-      RTEMS.TASK_CREATE( 
-         1,
-         128, 
-         1024, 
-         RTEMS.DEFAULT_OPTIONS,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         TASK_ID,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE" );
-
-      RTEMS.TASK_START( TASK_ID, TMTEST.TEST_TASK'ACCESS, 0, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START" );
-
-      RTEMS.TASK_CREATE( 
-         1,
-         254, 
-         1024, 
-         RTEMS.DEFAULT_OPTIONS,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         TASK_ID,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE" );
-
-      RTEMS.TASK_START( TASK_ID, TMTEST.TEST_TASK1'ACCESS, 0, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START" );
-
-   end TEST_INIT;
-
---PAGE
--- 
---  TEST_TASK
---
-
-   procedure TEST_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      INDEX        : RTEMS.UNSIGNED32;
-      OVERHEAD     : RTEMS.UNSIGNED32;
-      OLD_PRIORITY : RTEMS.TASK_PRIORITY;
-      OLD_MODE     : RTEMS.MODE;
-      OLD_NOTE     : RTEMS.NOTEPAD_INDEX;
-      TIME         : RTEMS.TIME_OF_DAY;
-      STATUS       : RTEMS.STATUS_CODES;
-   begin
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            TIMER_DRIVER.EMPTY_FUNCTION;
-         end loop;
-      OVERHEAD := TIMER_DRIVER.READ_TIMER;
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            RTEMS.TASK_SET_PRIORITY( 
-               TMTEST.TASK_ID,
-               RTEMS.CURRENT_PRIORITY,
-               OLD_PRIORITY,
-               STATUS
-            );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "TASK_SET_PRIORITY current priority",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         RTEMS_CALLING_OVERHEAD.TASK_SET_PRIORITY
-      );
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            RTEMS.TASK_SET_PRIORITY( 
-               TMTEST.TASK_ID,
-               253,
-               OLD_PRIORITY,
-               STATUS
-            );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "TASK_SET_PRIORITY no preempt",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         RTEMS_CALLING_OVERHEAD.TASK_SET_PRIORITY
-      );
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            RTEMS.TASK_MODE( 
-               RTEMS.CURRENT_MODE,
-               RTEMS.CURRENT_MODE,
-               OLD_MODE,
-               STATUS
-            );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "TASK_MODE (current)",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         RTEMS_CALLING_OVERHEAD.TASK_MODE
-      );
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            RTEMS.TASK_MODE( 
-               RTEMS.INTERRUPT_LEVEL( 1 ),
-               RTEMS.INTERRUPT_MASK,
-               OLD_MODE,
-               STATUS
-            );
-            RTEMS.TASK_MODE( 
-               RTEMS.INTERRUPT_LEVEL( 0 ),
-               RTEMS.INTERRUPT_MASK,
-               OLD_MODE,
-               STATUS
-            );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "TASK_MODE (no reschedule)",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT * 2, 
-         OVERHEAD,
-         RTEMS_CALLING_OVERHEAD.TASK_MODE
-      );
-
-      TIMER_DRIVER.INITIALIZE;
-         RTEMS.TASK_MODE( 
-            RTEMS.NO_ASR,
-            RTEMS.ASR_MASK,
-            OLD_MODE,
-            STATUS
-         );
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "TASK_MODE (reschedule)",
-         TMTEST.END_TIME, 
-         1, 
-         0,
-         RTEMS_CALLING_OVERHEAD.TASK_MODE
-      );
-
-      RTEMS.TASK_MODE( 
-         RTEMS.NO_PREEMPT,
-         RTEMS.PREEMPT_MASK,
-         OLD_MODE,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_MODE" );
-
-      RTEMS.TASK_SET_PRIORITY( 
-         TMTEST.TASK_ID,
-         1,
-         OLD_PRIORITY,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SET_PRIORITY" );
-
-      TIMER_DRIVER.INITIALIZE;
-      RTEMS.TASK_MODE(          -- preempted by TEST_TASK1
-         RTEMS.PREEMPT,
-         RTEMS.PREEMPT_MASK,
-         OLD_MODE,
-         STATUS
-      );
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            RTEMS.TASK_SET_NOTE( 
-               TMTEST.TASK_ID,
-               8,
-               10,
-               STATUS
-            );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "TASK_SET_NOTE ",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         RTEMS_CALLING_OVERHEAD.TASK_SET_NOTE
-      );
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            RTEMS.TASK_GET_NOTE( 
-               TMTEST.TASK_ID,
-               8,
-               OLD_NOTE,
-               STATUS
-            );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "TASK_GET_NOTE ",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         RTEMS_CALLING_OVERHEAD.TASK_GET_NOTE
-      );
-
-      TIME := (1988, 1, 1, 0, 0, 0, 0 );
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            RTEMS.CLOCK_SET( 
-               TIME,
-               STATUS
-            );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "CLOCK_SET",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         RTEMS_CALLING_OVERHEAD.CLOCK_SET
-      );
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            RTEMS.CLOCK_GET( RTEMS.CLOCK_GET_TOD, TIME'ADDRESS, STATUS );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "CLOCK_GET",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         RTEMS_CALLING_OVERHEAD.CLOCK_GET
-      );
-
-      RTEMS.SHUTDOWN_EXECUTIVE( 0 );
-
-   end TEST_TASK;
-
---PAGE
--- 
---  TEST_TASK1
---
-
-   procedure TEST_TASK1 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS       : RTEMS.STATUS_CODES;
-   begin
-
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "TASK_MODE (preemptive) ",
-         TMTEST.END_TIME, 
-         1, 
-         0,
-         RTEMS_CALLING_OVERHEAD.TASK_MODE
-      );
-
-      RTEMS.TASK_SUSPEND( RTEMS.SELF, STATUS );
-
-   end TEST_TASK1;
-
-end TMTEST;
diff --git a/c/src/ada-tests/tmtests/tm08/tmtest.ads b/c/src/ada-tests/tmtests/tm08/tmtest.ads
deleted file mode 100644
index 0eccb2a452..0000000000
--- a/c/src/ada-tests/tmtests/tm08/tmtest.ads
+++ /dev/null
@@ -1,99 +0,0 @@
---
---  TMTEST / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package is the specification for Test 8 of the RTEMS
---  Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with TIMER_DRIVER;
-with RTEMS;
-
-package TMTEST is
-
-   TASK_ID   : RTEMS.ID;
-
---
---  The following variable is set to the execution time returned
---  by the timer.
---
-
-   END_TIME  : RTEMS.UNSIGNED32;
-
---
---  INIT
---
---  DESCRIPTION:
---
---  This RTEMS task initializes the application.
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TEST_INIT
---
---  DESCRIPTION:
---
---  This subprogram performs test initialization.
---
-
-   procedure TEST_INIT;
-
---
---  TEST_TASK
---
---  DESCRIPTION:
---
---  This RTEMS task is responsible for measuring and reporting the
---  following directive execution times:
---
---    + TASK_SET_PRIORITY to obtain the current priority
---    + TASK_SET_PRIORITY which does not require a context switch
---    + TASK_MODE to obtain the current mode
---    + TASK_MODE which does not require a reschedule
---    + TASK_MODE which does require a reschedule
---    + TASK_MODE which causes a preemption *** TEST_TASK1 executes 
---    + TASK_SET_NOTE
---    + TASK_GET_NOTE
---    + CLOCK_SET
---    + CLOCK_GET
---
-
-   procedure TEST_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TEST_TASK2
---
---  DESCRIPTION:
---
---  This RTEMS task is responsible for measuring and reporting the
---  following directive execution times:
---
---    + TASK_MODE which results in a preemption
---
-
-   procedure TEST_TASK1 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
-end TMTEST;
diff --git a/c/src/ada-tests/tmtests/tm09/config.h b/c/src/ada-tests/tmtests/tm09/config.h
deleted file mode 100644
index b0a10b776c..0000000000
--- a/c/src/ada-tests/tmtests/tm09/config.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*  config.h
- *
- *  This include file defines the Configuration Table for this test.
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-/* configuration information */
-
-#define CONFIGURE_TMTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
-
-#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES     1
-#define CONFIGURE_TICKS_PER_TIMESLICE        0
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#define CONFIGURE_MAXIMUM_POSIX_THREADS              10
-#define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
-#define CONFIGURE_MAXIMUM_POSIX_MUTEXES              20
-#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES  10
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/c/src/ada-tests/tmtests/tm09/tm09.adb b/c/src/ada-tests/tmtests/tm09/tm09.adb
deleted file mode 100644
index add60e1e84..0000000000
--- a/c/src/ada-tests/tmtests/tm09/tm09.adb
+++ /dev/null
@@ -1,57 +0,0 @@
---
---  MAIN / BODY
---
---  DESCRIPTION:
---
---  This is the entry point for Test TM09 of the Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-with TMTEST;
-with TEST_SUPPORT;
-
-procedure TM09 is
-  INIT_ID : RTEMS.ID;
-  STATUS  : RTEMS.STATUS_CODES;
-begin
-
-   RTEMS.TASK_CREATE(
-      RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
-      1,
-      RTEMS.MINIMUM_STACK_SIZE,
-      RTEMS.NO_PREEMPT,
-      RTEMS.DEFAULT_ATTRIBUTES,
-      INIT_ID,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
-
-
-   RTEMS.TASK_START(
-      INIT_ID,
-      TMTEST.INIT'ACCESS,
-      0,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
-
-   loop
-      delay 120.0;
-   end loop;
-
-end TM09;
-
diff --git a/c/src/ada-tests/tmtests/tm09/tmtest.adb b/c/src/ada-tests/tmtests/tm09/tmtest.adb
deleted file mode 100644
index 0dd7d9d798..0000000000
--- a/c/src/ada-tests/tmtests/tm09/tmtest.adb
+++ /dev/null
@@ -1,302 +0,0 @@
---
---  TMTEST / BODY
---
---  DESCRIPTION:
---
---  This package is the implementation of Test 9 of the RTEMS
---  Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with INTERFACES; use INTERFACES;
-with RTEMS;
-with RTEMS_CALLING_OVERHEAD;
-with TEST_SUPPORT;
-with TEXT_IO;
-with TIME_TEST_SUPPORT;
-with UNSIGNED32_IO;
-
-package body TMTEST is
-
---PAGE
--- 
---  INIT
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      TASK_ID : RTEMS.ID;
-      STATUS  : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** TIME TEST 9 ***" );
-
-      RTEMS.TASK_CREATE( 
-         1,
-         128, 
-         4096, 
-         RTEMS.DEFAULT_OPTIONS,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         TASK_ID,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE" );
-
-      RTEMS.TASK_START( TASK_ID, TMTEST.TEST_TASK'ACCESS, 0, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START" );
-
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
-
-   end INIT;
-
---PAGE
--- 
---  TEST_TASK
---
-
-   procedure TEST_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS       : RTEMS.STATUS_CODES;
-   begin
-
-      TIMER_DRIVER.INITIALIZE;
-         RTEMS.MESSAGE_QUEUE_CREATE(
-            1,
-            TIME_TEST_SUPPORT.OPERATION_COUNT,
-            16,
-            RTEMS.DEFAULT_OPTIONS,
-            TMTEST.QUEUE_ID,
-            STATUS
-         );
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "MESSAGE_QUEUE_CREATE",
-         TMTEST.END_TIME, 
-         1, 
-         0,
-         RTEMS_CALLING_OVERHEAD.MESSAGE_QUEUE_CREATE
-      );
-
-      TMTEST.QUEUE_TEST;
-
-      TIMER_DRIVER.INITIALIZE;
-         RTEMS.MESSAGE_QUEUE_DELETE(
-            TMTEST.QUEUE_ID,
-            STATUS
-         );
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "MESSAGE_QUEUE_DELETE",
-         TMTEST.END_TIME, 
-         1, 
-         0,
-         RTEMS_CALLING_OVERHEAD.MESSAGE_QUEUE_DELETE
-      );
-
-      RTEMS.SHUTDOWN_EXECUTIVE( 0 );
-
-   end TEST_TASK;
-
---PAGE
--- 
---  QUEUE_TEST
---
-
-   procedure QUEUE_TEST
-   is
-      SEND_LOOP_TIME    : RTEMS.UNSIGNED32;
-      URGENT_LOOP_TIME  : RTEMS.UNSIGNED32;
-      RECEIVE_LOOP_TIME : RTEMS.UNSIGNED32;
-      SEND_TIME         : RTEMS.UNSIGNED32;
-      URGENT_TIME       : RTEMS.UNSIGNED32;
-      RECEIVE_TIME      : RTEMS.UNSIGNED32;
-      EMPTY_FLUSH_TIME  : RTEMS.UNSIGNED32;
-      FLUSH_TIME        : RTEMS.UNSIGNED32;
-      FLUSH_COUNT       : RTEMS.UNSIGNED32;
-      EMPTY_FLUSH_COUNT : RTEMS.UNSIGNED32;
-      INDEX             : RTEMS.UNSIGNED32;
-      ITERATIONS        : RTEMS.UNSIGNED32;
-      LOOP_COUNT        : RTEMS.UNSIGNED32;
-      BUFFER            : TMTEST.BUFFER;
-      BUFFER_POINTER    : RTEMS.ADDRESS;
-      MESSAGE_SIZE      : RTEMS.UNSIGNED32;
-      STATUS            : RTEMS.STATUS_CODES;
-   begin
-
-      SEND_LOOP_TIME    := 0;
-      URGENT_LOOP_TIME  := 0;
-      RECEIVE_LOOP_TIME := 0;
-      SEND_TIME         := 0;
-      URGENT_TIME       := 0;
-      RECEIVE_TIME      := 0;
-      EMPTY_FLUSH_TIME  := 0;
-      FLUSH_TIME        := 0;
-      FLUSH_COUNT       := 0;
-      EMPTY_FLUSH_COUNT := 0;
-
-      BUFFER_POINTER := BUFFER'ADDRESS;
-
-      for ITERATIONS in 1 .. TIME_TEST_SUPPORT.ITERATION_COUNT
-      loop
-
-         TIMER_DRIVER.INITIALIZE;
-            for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-            loop
-               TIMER_DRIVER.EMPTY_FUNCTION;
-            end loop;
-         SEND_LOOP_TIME := SEND_LOOP_TIME + TIMER_DRIVER.READ_TIMER;
-
-         TIMER_DRIVER.INITIALIZE;
-            for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-            loop
-               TIMER_DRIVER.EMPTY_FUNCTION;
-            end loop;
-         URGENT_LOOP_TIME := URGENT_LOOP_TIME + TIMER_DRIVER.READ_TIMER;
-
-         TIMER_DRIVER.INITIALIZE;
-            for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-            loop
-               TIMER_DRIVER.EMPTY_FUNCTION;
-            end loop;
-         RECEIVE_LOOP_TIME := RECEIVE_LOOP_TIME + TIMER_DRIVER.READ_TIMER;
-
-         TIMER_DRIVER.INITIALIZE;
-            for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-            loop
-               RTEMS.MESSAGE_QUEUE_SEND( 
-                  TMTEST.QUEUE_ID,
-                  BUFFER_POINTER,
-                  16,
-                  STATUS
-               );
-            end loop;
-         SEND_TIME := SEND_TIME + TIMER_DRIVER.READ_TIMER;
-
-         TIMER_DRIVER.INITIALIZE;
-            for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-            loop
-               RTEMS.MESSAGE_QUEUE_RECEIVE( 
-                  TMTEST.QUEUE_ID,
-                  BUFFER_POINTER,
-                  RTEMS.DEFAULT_OPTIONS,
-                  RTEMS.NO_TIMEOUT,
-                  MESSAGE_SIZE,
-                  STATUS
-               );
-            end loop;
-         RECEIVE_TIME := RECEIVE_TIME + TIMER_DRIVER.READ_TIMER;
-
-         TIMER_DRIVER.INITIALIZE;
-            for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-            loop
-               RTEMS.MESSAGE_QUEUE_URGENT( 
-                  TMTEST.QUEUE_ID,
-                  BUFFER_POINTER,
-                  16,
-                  STATUS
-               );
-            end loop;
-         URGENT_TIME := URGENT_TIME + TIMER_DRIVER.READ_TIMER;
-
-         TIMER_DRIVER.INITIALIZE;
-            for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-            loop
-               RTEMS.MESSAGE_QUEUE_RECEIVE( 
-                  TMTEST.QUEUE_ID,
-                  BUFFER_POINTER,
-                  RTEMS.DEFAULT_OPTIONS,
-                  RTEMS.NO_TIMEOUT,
-                  MESSAGE_SIZE,
-                  STATUS
-               );
-            end loop;
-         RECEIVE_TIME := RECEIVE_TIME + TIMER_DRIVER.READ_TIMER;
-
-         TIMER_DRIVER.INITIALIZE;
-            RTEMS.MESSAGE_QUEUE_FLUSH( 
-               TMTEST.QUEUE_ID,
-               EMPTY_FLUSH_COUNT,
-               STATUS
-            );
-         EMPTY_FLUSH_TIME := EMPTY_FLUSH_TIME + TIMER_DRIVER.READ_TIMER;
-
-         -- send one message to flush
-         RTEMS.MESSAGE_QUEUE_SEND( 
-            TMTEST.QUEUE_ID, 
-            BUFFER_POINTER, 
-            16,
-            STATUS
-         );
-         TIMER_DRIVER.INITIALIZE;
-            RTEMS.MESSAGE_QUEUE_FLUSH( 
-               TMTEST.QUEUE_ID,
-               FLUSH_COUNT,
-               STATUS
-            );
-         FLUSH_TIME := FLUSH_TIME + TIMER_DRIVER.READ_TIMER;
-
-      end loop;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "MESSAGE_QUEUE_SEND (no tasks waiting)",
-         SEND_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT *
-            TIME_TEST_SUPPORT.ITERATION_COUNT,
-         SEND_LOOP_TIME,
-         RTEMS_CALLING_OVERHEAD.MESSAGE_QUEUE_SEND
-      );
-
-      TIME_TEST_SUPPORT.PUT_TIME(
-         "MESSAGE_QUEUE_URGENT (no tasks waiting)",
-         URGENT_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT *
-            TIME_TEST_SUPPORT.ITERATION_COUNT,
-         URGENT_LOOP_TIME,
-         RTEMS_CALLING_OVERHEAD.MESSAGE_QUEUE_URGENT
-      );
-
-      TIME_TEST_SUPPORT.PUT_TIME(
-         "MESSAGE_QUEUE_RECEIVE (messages available)",
-         RECEIVE_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT *
-            TIME_TEST_SUPPORT.ITERATION_COUNT * 2,
-         RECEIVE_LOOP_TIME * 2,
-         RTEMS_CALLING_OVERHEAD.MESSAGE_QUEUE_RECEIVE
-      );
-
-      TIME_TEST_SUPPORT.PUT_TIME(
-         "MESSAGE_QUEUE_FLUSH (empty queue)",
-         EMPTY_FLUSH_TIME, 
-         TIME_TEST_SUPPORT.ITERATION_COUNT,
-         0,
-         RTEMS_CALLING_OVERHEAD.MESSAGE_QUEUE_FLUSH
-      );
-
-      TIME_TEST_SUPPORT.PUT_TIME(
-         "MESSAGE_QUEUE_FLUSH (messages flushed)",
-         FLUSH_TIME, 
-         TIME_TEST_SUPPORT.ITERATION_COUNT,
-         0,
-         RTEMS_CALLING_OVERHEAD.MESSAGE_QUEUE_FLUSH
-      );
-
-   end QUEUE_TEST;
-
-end TMTEST;
diff --git a/c/src/ada-tests/tmtests/tm09/tmtest.ads b/c/src/ada-tests/tmtests/tm09/tmtest.ads
deleted file mode 100644
index d1a4f3eac1..0000000000
--- a/c/src/ada-tests/tmtests/tm09/tmtest.ads
+++ /dev/null
@@ -1,100 +0,0 @@
---
---  TMTEST / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package is the specification for Test 9 of the RTEMS
---  Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with TIMER_DRIVER;
-with RTEMS;
-
-package TMTEST is
-
---
---  Buffer Record similar to that used by RTEMS 3.2.1.  Using this
---  avoids changes to the test.
---
-
-   type BUFFER is
-      record
-         FIELD1 : RTEMS.UNSIGNED32;   -- TEMPORARY UNTIL VARIABLE LENGTH
-         FIELD2 : RTEMS.UNSIGNED32;
-         FIELD3 : RTEMS.UNSIGNED32;
-         FIELD4 : RTEMS.UNSIGNED32;
-      end record;
-
---
---  The following is the ID of the message queue used for timing operations.
---
-
-   QUEUE_ID  : RTEMS.ID;
-
---
---  The following variable is set to the execution time returned
---  by the timer.
---
-
-   END_TIME  : RTEMS.UNSIGNED32;
-
---
---  INIT
---
---  DESCRIPTION:
---
---  This RTEMS task initializes the application.
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TEST_TASK
---
---  DESCRIPTION:
---
---  This RTEMS task is responsible for measuring and reporting the
---  following directive execution times:
---
---    + MESSAGE_QUEUE_CREATE
---    + MESSAGE_QUEUE_DELETE
---
-
-   procedure TEST_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  QUEUE_TEST
---
---  DESCRIPTION:
---
---  This subprogram is responsible for measuring and reporting the
---  following directive execution times:
---
---    + MESSAGE_QUEUE_SEND with no tasks waiting
---    + MESSAGE_QUEUE_URGENT with no tasks waiting
---    + MESSAGE_QUEUE_RECEIVE with messages available
---    + MESSAGE_QUEUE_FLUSH with an empty message queue
---    + MESSAGE_QUEUE_FLUSH with messages flushed
---
-
-   procedure QUEUE_TEST;
-
-end TMTEST;
diff --git a/c/src/ada-tests/tmtests/tm10/config.h b/c/src/ada-tests/tmtests/tm10/config.h
deleted file mode 100644
index a3748d64ce..0000000000
--- a/c/src/ada-tests/tmtests/tm10/config.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*  config.h
- *
- *  This include file defines the Configuration Table for this test.
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-/* configuration information */
-
-#define CONFIGURE_TMTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
-
-#define CONFIGURE_MAXIMUM_TASKS              110
-#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES     1
-#define CONFIGURE_TICKS_PER_TIMESLICE        0
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#define CONFIGURE_MAXIMUM_POSIX_THREADS              10
-#define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
-#define CONFIGURE_MAXIMUM_POSIX_MUTEXES              20
-#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES  10
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/c/src/ada-tests/tmtests/tm10/tm10.adb b/c/src/ada-tests/tmtests/tm10/tm10.adb
deleted file mode 100644
index 79f725dc0b..0000000000
--- a/c/src/ada-tests/tmtests/tm10/tm10.adb
+++ /dev/null
@@ -1,57 +0,0 @@
---
---  MAIN / BODY
---
---  DESCRIPTION:
---
---  This is the entry point for Test TM10 of the Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-with TMTEST;
-with TEST_SUPPORT;
-
-procedure TM10 is
-  INIT_ID : RTEMS.ID;
-  STATUS  : RTEMS.STATUS_CODES;
-begin
-
-   RTEMS.TASK_CREATE(
-      RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
-      1,
-      RTEMS.MINIMUM_STACK_SIZE,
-      RTEMS.NO_PREEMPT,
-      RTEMS.DEFAULT_ATTRIBUTES,
-      INIT_ID,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
-
-
-   RTEMS.TASK_START(
-      INIT_ID,
-      TMTEST.INIT'ACCESS,
-      0,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
-
-   loop
-      delay 120.0;
-   end loop;
-
-end TM10;
-
diff --git a/c/src/ada-tests/tmtests/tm10/tmtest.adb b/c/src/ada-tests/tmtests/tm10/tmtest.adb
deleted file mode 100644
index 99e776f311..0000000000
--- a/c/src/ada-tests/tmtests/tm10/tmtest.adb
+++ /dev/null
@@ -1,225 +0,0 @@
---
---  TMTEST / BODY
---
---  DESCRIPTION:
---
---  This package is the implementation of Test 10 of the RTEMS
---  Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with INTERFACES; use INTERFACES;
-with RTEMS;
-with RTEMS_CALLING_OVERHEAD;
-with TEST_SUPPORT;
-with TEXT_IO;
-with TIME_TEST_SUPPORT;
-with UNSIGNED32_IO;
-
-package body TMTEST is
-
---PAGE
--- 
---  INIT
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS  : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** TIME TEST 10 ***" );
-
-      TMTEST.TEST_INIT;
-
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
-
-   end INIT;
-
---PAGE
--- 
---  TEST_INIT
---
-
-   procedure TEST_INIT
-   is
-      INDEX          : RTEMS.UNSIGNED32;
-      TASK_ENTRY     : RTEMS.TASK_ENTRY;
-      PRIORITY       : RTEMS.TASK_PRIORITY;
-      OVERHEAD       : RTEMS.UNSIGNED32;
-      TASK_ID        : RTEMS.ID;
-      BUFFER         : TMTEST.BUFFER;
-      BUFFER_POINTER : RTEMS.ADDRESS;
-      MESSAGE_SIZE   : RTEMS.UNSIGNED32;
-      STATUS         : RTEMS.STATUS_CODES;
-   begin
-
-      BUFFER_POINTER := BUFFER'ADDRESS;
-
-      PRIORITY := 5;
-
-      for INDEX in 0 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-      loop
-
-         RTEMS.TASK_CREATE( 
-            RTEMS.BUILD_NAME( 'T', 'I', 'M', 'E' ),
-            PRIORITY, 
-            1024, 
-            RTEMS.DEFAULT_MODES,
-            RTEMS.DEFAULT_ATTRIBUTES,
-            TASK_ID,
-            STATUS
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE LOOP" );
-
-         PRIORITY := PRIORITY + 1;
-
-         if INDEX = 0 then
-            TASK_ENTRY := TMTEST.HIGH_TASK'ACCESS;
-         elsif INDEX = TIME_TEST_SUPPORT.OPERATION_COUNT then
-            TASK_ENTRY := TMTEST.LOW_TASK'ACCESS;
-         else
-            TASK_ENTRY := TMTEST.MIDDLE_TASKS'ACCESS;
-         end if;
-
-         RTEMS.TASK_START( TASK_ID, TASK_ENTRY, 0, STATUS );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START LOOP" );
-
-      end loop;
-
-      RTEMS.MESSAGE_QUEUE_CREATE(
-         1,
-         TIME_TEST_SUPPORT.OPERATION_COUNT,
-         16,
-         RTEMS.DEFAULT_OPTIONS,
-         TMTEST.QUEUE_ID,
-         STATUS
-      );
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            TIMER_DRIVER.EMPTY_FUNCTION;
-         end loop;
-      OVERHEAD := TIMER_DRIVER.READ_TIMER;
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            RTEMS.MESSAGE_QUEUE_RECEIVE( 
-               TMTEST.QUEUE_ID,
-               BUFFER_POINTER,
-               RTEMS.NO_WAIT,
-               RTEMS.NO_TIMEOUT,
-               MESSAGE_SIZE,
-               STATUS
-            );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-      TIME_TEST_SUPPORT.PUT_TIME(
-         "MESSAGE_QUEUE_RECEIVE (NO_WAIT)",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         RTEMS_CALLING_OVERHEAD.MESSAGE_QUEUE_RECEIVE 
-      );
-
-   end TEST_INIT;
-
---PAGE
--- 
---  HIGH_TASK
---
-
-   procedure HIGH_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      BUFFER         : TMTEST.BUFFER;
-      BUFFER_POINTER : RTEMS.ADDRESS;
-      MESSAGE_SIZE   : RTEMS.UNSIGNED32;
-      STATUS         : RTEMS.STATUS_CODES;
-   begin
-
-      BUFFER_POINTER := BUFFER'ADDRESS;
-
-      TIMER_DRIVER.INITIALIZE;
-
-      RTEMS.MESSAGE_QUEUE_RECEIVE( 
-         TMTEST.QUEUE_ID,
-         BUFFER_POINTER,
-         RTEMS.DEFAULT_OPTIONS,
-         RTEMS.NO_TIMEOUT,
-         MESSAGE_SIZE,
-         STATUS
-      );
-
-   end HIGH_TASK;
-
---PAGE
--- 
---  MIDDLE_TASKS
---
-
-   procedure MIDDLE_TASKS (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      BUFFER         : TMTEST.BUFFER;
-      BUFFER_POINTER : RTEMS.ADDRESS;
-      MESSAGE_SIZE   : RTEMS.UNSIGNED32;
-      STATUS         : RTEMS.STATUS_CODES;
-   begin
- 
-      BUFFER_POINTER := BUFFER'ADDRESS;
-
-      RTEMS.MESSAGE_QUEUE_RECEIVE( 
-         TMTEST.QUEUE_ID,
-         BUFFER_POINTER,
-         RTEMS.DEFAULT_OPTIONS,
-         RTEMS.NO_TIMEOUT,
-         MESSAGE_SIZE,
-         STATUS
-      );
- 
-   end MIDDLE_TASKS;
-
---PAGE
--- 
---  LOW_TASK
---
-
-   procedure LOW_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS   : RTEMS.STATUS_CODES;
-   begin
-
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-      TIME_TEST_SUPPORT.PUT_TIME(
-         "MESSAGE_QUEUE_RECEIVE (blocking)",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         0,
-         RTEMS_CALLING_OVERHEAD.MESSAGE_QUEUE_RECEIVE 
-      );
-
-      RTEMS.SHUTDOWN_EXECUTIVE( 0 );
-
-   end LOW_TASK;
-
-end TMTEST;
diff --git a/c/src/ada-tests/tmtests/tm10/tmtest.ads b/c/src/ada-tests/tmtests/tm10/tmtest.ads
deleted file mode 100644
index 9268fa8bac..0000000000
--- a/c/src/ada-tests/tmtests/tm10/tmtest.ads
+++ /dev/null
@@ -1,117 +0,0 @@
---
---  TMTEST / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package is the specification for Test 10 of the RTEMS
---  Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with TIMER_DRIVER;
-with RTEMS;
-
-package TMTEST is
-
---
---  Buffer Record similar to that used by RTEMS 3.2.1.  Using this
---  avoids changes to the test.
---
-
-   type BUFFER is
-      record
-         FIELD1 : RTEMS.UNSIGNED32;   -- TEMPORARY UNTIL VARIABLE LENGTH
-         FIELD2 : RTEMS.UNSIGNED32;
-         FIELD3 : RTEMS.UNSIGNED32;
-         FIELD4 : RTEMS.UNSIGNED32;
-      end record;
-
---
---  The following is the ID of the message queue used for timing operations.
---
-
-   QUEUE_ID  : RTEMS.ID;
-
---
---  The following variable is set to the execution time returned
---  by the timer.
---
-
-   END_TIME  : RTEMS.UNSIGNED32;
-
---
---  INIT
---
---  DESCRIPTION:
---
---  This RTEMS task initializes the application.
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TEST_INIT
---
---  DESCRIPTION:
---
---  This subprogram performs test initialization.  After initialization
---  has been completed, the NO_WAIT case for MESSAGE_QUEUE_RECEIVE
---  is timed and reported.
---
-
-   procedure TEST_INIT;
-
---
---  HIGH_TASK
---
---  DESCRIPTION:
---
---  This RTEMS task is the highest priority task in the system.  
---  It starts the timer and performs a blocking MESSAGE_QUEUE_RECEIVE.
---
-
-   procedure HIGH_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  MIDDLE_TASKS
---
---  DESCRIPTION:
---
---  These RTEMS tasks perform a blocking MESSAGE_QUEUE_RECEIVE.
---
-
-   procedure MIDDLE_TASKS (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  LOW_TASK
---
---  DESCRIPTION:
---
---  This RTEMS task stops the timer and reports the execution time 
---  of a blocking MESSAGE_QUEUE_RECEIVE.
---
-
-   procedure LOW_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
-end TMTEST;
diff --git a/c/src/ada-tests/tmtests/tm11/config.h b/c/src/ada-tests/tmtests/tm11/config.h
deleted file mode 100644
index b82372ca0f..0000000000
--- a/c/src/ada-tests/tmtests/tm11/config.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*  config.h
- *
- *  This include file defines the Configuration Table for this test.
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-/* configuration information */
-
-#define CONFIGURE_TMTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
-
-#define CONFIGURE_MAXIMUM_TASKS              111
-#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES     1
-#define CONFIGURE_TICKS_PER_TIMESLICE        0
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#define CONFIGURE_MAXIMUM_POSIX_THREADS              10
-#define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
-#define CONFIGURE_MAXIMUM_POSIX_MUTEXES              20
-#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES  10
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/c/src/ada-tests/tmtests/tm11/tm11.adb b/c/src/ada-tests/tmtests/tm11/tm11.adb
deleted file mode 100644
index d88dae9fa4..0000000000
--- a/c/src/ada-tests/tmtests/tm11/tm11.adb
+++ /dev/null
@@ -1,57 +0,0 @@
---
---  MAIN / BODY
---
---  DESCRIPTION:
---
---  This is the entry point for Test TM11 of the Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-with TMTEST;
-with TEST_SUPPORT;
-
-procedure TM11 is
-  INIT_ID : RTEMS.ID;
-  STATUS  : RTEMS.STATUS_CODES;
-begin
-
-   RTEMS.TASK_CREATE(
-      RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
-      1,
-      RTEMS.MINIMUM_STACK_SIZE,
-      RTEMS.NO_PREEMPT,
-      RTEMS.DEFAULT_ATTRIBUTES,
-      INIT_ID,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
-
-
-   RTEMS.TASK_START(
-      INIT_ID,
-      TMTEST.INIT'ACCESS,
-      0,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
-
-   loop
-      delay 120.0;
-   end loop;
-
-end TM11;
-
diff --git a/c/src/ada-tests/tmtests/tm11/tmtest.adb b/c/src/ada-tests/tmtests/tm11/tmtest.adb
deleted file mode 100644
index 5cba54d365..0000000000
--- a/c/src/ada-tests/tmtests/tm11/tmtest.adb
+++ /dev/null
@@ -1,219 +0,0 @@
---
---  TMTEST / BODY
---
---  DESCRIPTION:
---
---  This package is the implementation of Test 11 of the RTEMS
---  Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with INTERFACES; use INTERFACES;
-with RTEMS;
-with RTEMS_CALLING_OVERHEAD;
-with TEST_SUPPORT;
-with TEXT_IO;
-with TIME_TEST_SUPPORT;
-with UNSIGNED32_IO;
-
-package body TMTEST is
-
---PAGE
--- 
---  INIT
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      TASK_ID : RTEMS.ID;
-      STATUS  : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** TIME TEST 11 ***" );
-
-      RTEMS.TASK_CREATE( 
-         1,
-         251, 
-         1024, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         TASK_ID,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE" );
-
-      RTEMS.TASK_START( 
-         TASK_ID, 
-         TMTEST.TEST_INIT'ACCESS, 
-         0, 
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START" );
-
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
-
-   end INIT;
-
---PAGE
--- 
---  TEST_INIT
---
-
-   procedure TEST_INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      INDEX          : RTEMS.UNSIGNED32;
-      TASK_ENTRY     : RTEMS.TASK_ENTRY;
-      PRIORITY       : RTEMS.TASK_PRIORITY;
-      TASK_ID        : RTEMS.ID;
-      BUFFER         : TMTEST.BUFFER;
-      BUFFER_POINTER : RTEMS.ADDRESS;
-      MESSAGE_SIZE   : RTEMS.UNSIGNED32;
-      STATUS         : RTEMS.STATUS_CODES;
-   begin
-
-      BUFFER_POINTER := BUFFER'ADDRESS;
-
--- As each task is started, it preempts this task and performs a blocking
--- MESSAGE_QUEUE_RECEIVE.  Upon completion of this loop all created tasks
--- are blocked.
-
-      RTEMS.MESSAGE_QUEUE_CREATE(
-         RTEMS.BUILD_NAME( 'M', 'Q', '1', ' ' ),
-         TIME_TEST_SUPPORT.OPERATION_COUNT,
-         16,
-         RTEMS.DEFAULT_OPTIONS,
-         TMTEST.QUEUE_ID,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_CREATE" );
-
-      PRIORITY := 250;
-
-      for INDEX in 0 .. TIME_TEST_SUPPORT.OPERATION_COUNT - 1
-      loop
-
-         RTEMS.TASK_CREATE( 
-            RTEMS.BUILD_NAME( 'T', 'I', 'M', 'E' ),
-            PRIORITY, 
-            1024, 
-            RTEMS.DEFAULT_MODES,
-            RTEMS.DEFAULT_ATTRIBUTES,
-            TASK_ID,
-            STATUS
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE LOOP" );
-
-         PRIORITY := PRIORITY - 1;
-
-         if INDEX = TIME_TEST_SUPPORT.OPERATION_COUNT - 1 then
-            TASK_ENTRY := TMTEST.HIGH_TASK'ACCESS;
-         else
-            TASK_ENTRY := TMTEST.MIDDLE_TASKS'ACCESS;
-         end if;
-
-         RTEMS.TASK_START( TASK_ID, TASK_ENTRY, 0, STATUS );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START LOOP" );
-
-      end loop;
-
-      TIMER_DRIVER.INITIALIZE;
-         RTEMS.MESSAGE_QUEUE_SEND( 
-            TMTEST.QUEUE_ID,
-            BUFFER_POINTER,
-            16,
-            STATUS
-         );
-
-   end TEST_INIT;
-
---PAGE
--- 
---  HIGH_TASK
---
-
-   procedure HIGH_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      BUFFER         : TMTEST.BUFFER;
-      BUFFER_POINTER : RTEMS.ADDRESS;
-      MESSAGE_SIZE   : RTEMS.UNSIGNED32;
-      STATUS         : RTEMS.STATUS_CODES;
-   begin
-
-      BUFFER_POINTER := BUFFER'ADDRESS;
-
-      RTEMS.MESSAGE_QUEUE_RECEIVE( 
-         TMTEST.QUEUE_ID,
-         BUFFER_POINTER,
-         RTEMS.DEFAULT_OPTIONS,
-         RTEMS.NO_TIMEOUT,
-         MESSAGE_SIZE,
-         STATUS
-      );
-
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME(
-         "MESSAGE_QUEUE_SEND (preemptive)",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         0,
-         RTEMS_CALLING_OVERHEAD.MESSAGE_QUEUE_SEND 
-      );
-
-      RTEMS.SHUTDOWN_EXECUTIVE( 0 );
-
-   end HIGH_TASK;
-
---PAGE
--- 
---  MIDDLE_TASKS
---
-
-   procedure MIDDLE_TASKS (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      BUFFER         : TMTEST.BUFFER;
-      BUFFER_POINTER : RTEMS.ADDRESS;
-      MESSAGE_SIZE   : RTEMS.UNSIGNED32;
-      STATUS         : RTEMS.STATUS_CODES;
-   begin
- 
-      BUFFER_POINTER := BUFFER'ADDRESS;
-
-      RTEMS.MESSAGE_QUEUE_RECEIVE( 
-         TMTEST.QUEUE_ID,
-         BUFFER_POINTER,
-         RTEMS.DEFAULT_OPTIONS,
-         RTEMS.NO_TIMEOUT,
-         MESSAGE_SIZE,
-         STATUS
-      );
- 
-      RTEMS.MESSAGE_QUEUE_SEND( 
-         TMTEST.QUEUE_ID,
-         BUFFER_POINTER,
-         16,
-         STATUS
-      );
-
-   end MIDDLE_TASKS;
-
-end TMTEST;
diff --git a/c/src/ada-tests/tmtests/tm11/tmtest.ads b/c/src/ada-tests/tmtests/tm11/tmtest.ads
deleted file mode 100644
index 82b9ba2fbe..0000000000
--- a/c/src/ada-tests/tmtests/tm11/tmtest.ads
+++ /dev/null
@@ -1,114 +0,0 @@
---
---  TMTEST / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package is the specification for Test 11 of the RTEMS
---  Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with TIMER_DRIVER;
-with RTEMS;
-
-package TMTEST is
-
---
---  Buffer Record similar to that used by RTEMS 3.2.1.  Using this
---  avoids changes to the test.
---
-
-   type BUFFER is
-      record
-         FIELD1 : RTEMS.UNSIGNED32;   -- TEMPORARY UNTIL VARIABLE LENGTH
-         FIELD2 : RTEMS.UNSIGNED32;
-         FIELD3 : RTEMS.UNSIGNED32;
-         FIELD4 : RTEMS.UNSIGNED32;
-      end record;
-
---
---  The following is the ID of the message queue used for timing operations.
---
-
-   QUEUE_ID : RTEMS.ID;
-
---
---  The following variable is set to the execution time returned
---  by the timer.
---
-
-   END_TIME  : RTEMS.UNSIGNED32;
-
---
---  INIT
---
---  DESCRIPTION:
---
---  This RTEMS task initializes the application.
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TEST_INIT
---
---  DESCRIPTION:
---
---  This subprogram performs test initialization.  As each application
---  task is created and started, it will preempt this task and
---  perform a blocking MESSAGE_QUEUE_RECEIVE.  Once all of the 
---  initialization is completed, the timer is started and the first 
---  preemptive MESSAGE_QUEUE_SEND is executed.
---
-
-   procedure TEST_INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  HIGH_TASK
---
---  DESCRIPTION:
---
---  This RTEMS task is the highest priority task in the system.  
---  It performs a blocking blocking MESSAGE_QUEUE_RECEIVE.  It is
---  the last test task created and started.  Thus it is the last 
---  task to be enqueued waiting for a message and the last task
---  to receive the message.  Once it receives the message, it
---  stops the timer and reports the execution time for a
---  preemptive MESSAGE_QUEUE_SEND.
---
-
-   procedure HIGH_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  MIDDLE_TASKS
---
---  DESCRIPTION:
---
---  As each of these RTEMS tasks is created and started, it preempts
---  the initialization task and perform a blocking MESSAGE_QUEUE_RECEIVE.
---
-
-   procedure MIDDLE_TASKS (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
-end TMTEST;
diff --git a/c/src/ada-tests/tmtests/tm12/config.h b/c/src/ada-tests/tmtests/tm12/config.h
deleted file mode 100644
index b82372ca0f..0000000000
--- a/c/src/ada-tests/tmtests/tm12/config.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*  config.h
- *
- *  This include file defines the Configuration Table for this test.
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-/* configuration information */
-
-#define CONFIGURE_TMTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
-
-#define CONFIGURE_MAXIMUM_TASKS              111
-#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES     1
-#define CONFIGURE_TICKS_PER_TIMESLICE        0
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#define CONFIGURE_MAXIMUM_POSIX_THREADS              10
-#define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
-#define CONFIGURE_MAXIMUM_POSIX_MUTEXES              20
-#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES  10
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/c/src/ada-tests/tmtests/tm12/tm12.adb b/c/src/ada-tests/tmtests/tm12/tm12.adb
deleted file mode 100644
index aa19b74a5c..0000000000
--- a/c/src/ada-tests/tmtests/tm12/tm12.adb
+++ /dev/null
@@ -1,57 +0,0 @@
---
---  MAIN / BODY
---
---  DESCRIPTION:
---
---  This is the entry point for Test TM12 of the Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-with TMTEST;
-with TEST_SUPPORT;
-
-procedure TM12 is
-  INIT_ID : RTEMS.ID;
-  STATUS  : RTEMS.STATUS_CODES;
-begin
-
-   RTEMS.TASK_CREATE(
-      RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
-      1,
-      RTEMS.MINIMUM_STACK_SIZE,
-      RTEMS.NO_PREEMPT,
-      RTEMS.DEFAULT_ATTRIBUTES,
-      INIT_ID,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
-
-
-   RTEMS.TASK_START(
-      INIT_ID,
-      TMTEST.INIT'ACCESS,
-      0,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
-
-   loop
-      delay 120.0;
-   end loop;
-
-end TM12;
-
diff --git a/c/src/ada-tests/tmtests/tm12/tmtest.adb b/c/src/ada-tests/tmtests/tm12/tmtest.adb
deleted file mode 100644
index eb25d84829..0000000000
--- a/c/src/ada-tests/tmtests/tm12/tmtest.adb
+++ /dev/null
@@ -1,212 +0,0 @@
---
---  TMTEST / BODY
---
---  DESCRIPTION:
---
---  This package is the implementation of Test 12 of the RTEMS
---  Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with INTERFACES; use INTERFACES;
-with RTEMS;
-with RTEMS_CALLING_OVERHEAD;
-with TEST_SUPPORT;
-with TEXT_IO;
-with TIME_TEST_SUPPORT;
-with UNSIGNED32_IO;
-
-package body TMTEST is
-
---PAGE
--- 
---  INIT
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      TASK_ID : RTEMS.ID;
-      STATUS  : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** TIME TEST 12 ***" );
-
-      RTEMS.TASK_CREATE( 
-         1,
-         251, 
-         1024, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         TASK_ID,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE" );
-
-      RTEMS.TASK_START( 
-         TASK_ID, 
-         TMTEST.TEST_INIT'ACCESS, 
-         0, 
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START" );
-
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
-
-   end INIT;
-
---PAGE
--- 
---  TEST_INIT
---
-
-   procedure TEST_INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      INDEX          : RTEMS.UNSIGNED32;
-      TASK_ENTRY     : RTEMS.TASK_ENTRY;
-      PRIORITY       : RTEMS.TASK_PRIORITY;
-      TASK_ID        : RTEMS.ID;
-      BUFFER         : TMTEST.BUFFER;
-      BUFFER_POINTER : RTEMS.ADDRESS;
-      STATUS         : RTEMS.STATUS_CODES;
-   begin
-
-      BUFFER_POINTER := BUFFER'ADDRESS;
-
-      RTEMS.MESSAGE_QUEUE_CREATE(
-         RTEMS.BUILD_NAME( 'M', 'Q', '1', ' ' ),
-         TIME_TEST_SUPPORT.OPERATION_COUNT,
-         16,
-         RTEMS.DEFAULT_OPTIONS,
-         TMTEST.QUEUE_ID,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_CREATE" );
-
-      PRIORITY := 250;
-
-      for INDEX in 0 .. TIME_TEST_SUPPORT.OPERATION_COUNT - 1
-      loop
-
-         RTEMS.TASK_CREATE( 
-            RTEMS.BUILD_NAME( 'T', 'I', 'M', 'E' ),
-            PRIORITY, 
-            1024, 
-            RTEMS.DEFAULT_MODES,
-            RTEMS.DEFAULT_ATTRIBUTES,
-            TASK_ID,
-            STATUS
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE LOOP" );
-
-         PRIORITY := PRIORITY - 1;
-
-         if INDEX = TIME_TEST_SUPPORT.OPERATION_COUNT - 1 then
-            TASK_ENTRY := TMTEST.HIGH_TASK'ACCESS;
-         else
-            TASK_ENTRY := TMTEST.LOW_TASKS'ACCESS;
-         end if;
-
-         RTEMS.TASK_START( TASK_ID, TASK_ENTRY, 0, STATUS );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START LOOP" );
-
-      end loop;
-
-   end TEST_INIT;
-
---PAGE
--- 
---  HIGH_TASK
---
-
-   procedure HIGH_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      BUFFER         : TMTEST.BUFFER;
-      BUFFER_POINTER : RTEMS.ADDRESS;
-      INDEX          : RTEMS.UNSIGNED32;
-      OVERHEAD       : RTEMS.UNSIGNED32;
-      STATUS         : RTEMS.STATUS_CODES;
-   begin
-
-      BUFFER_POINTER := BUFFER'ADDRESS;
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            TIMER_DRIVER.EMPTY_FUNCTION;
-         end loop;
-      OVERHEAD := TIMER_DRIVER.READ_TIMER;
-
-      for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT 
-      loop
-      
-         RTEMS.MESSAGE_QUEUE_SEND(
-            TMTEST.QUEUE_ID,
-            BUFFER_POINTER, 
-            16,
-            STATUS
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_SEND" ); --XXX
-
-      end loop;
-
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME(
-         "MESSAGE_QUEUE_SEND (readying)",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         RTEMS_CALLING_OVERHEAD.MESSAGE_QUEUE_SEND 
-      );
-
-      RTEMS.SHUTDOWN_EXECUTIVE( 0 );
-
-   end HIGH_TASK;
-
---PAGE
--- 
---  LOW_TASK
---
-
-   procedure LOW_TASKS (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      BUFFER         : TMTEST.BUFFER;
-      BUFFER_POINTER : RTEMS.ADDRESS;
-      MESSAGE_SIZE   : RTEMS.UNSIGNED32;
-      STATUS         : RTEMS.STATUS_CODES;
-   begin
- 
-      BUFFER_POINTER := BUFFER'ADDRESS;
-
-      RTEMS.MESSAGE_QUEUE_RECEIVE( 
-         TMTEST.QUEUE_ID,
-         BUFFER_POINTER,
-         RTEMS.DEFAULT_OPTIONS,
-         RTEMS.NO_TIMEOUT,
-         MESSAGE_SIZE,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_RECEIVE" ); --XXX
- 
-   end LOW_TASKS;
-
-end TMTEST;
diff --git a/c/src/ada-tests/tmtests/tm12/tmtest.ads b/c/src/ada-tests/tmtests/tm12/tmtest.ads
deleted file mode 100644
index b18df42719..0000000000
--- a/c/src/ada-tests/tmtests/tm12/tmtest.ads
+++ /dev/null
@@ -1,105 +0,0 @@
---
---  TMTEST / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package is the specification for Test 12 of the RTEMS
---  Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with TIMER_DRIVER;
-with RTEMS;
-
-package TMTEST is
-
---
---  Buffer Record similar to that used by RTEMS 3.2.1.  Using this
---  avoids changes to the test.
---
-
-   type BUFFER is
-      record
-         FIELD1 : RTEMS.UNSIGNED32;   -- TEMPORARY UNTIL VARIABLE LENGTH
-         FIELD2 : RTEMS.UNSIGNED32;
-         FIELD3 : RTEMS.UNSIGNED32;
-         FIELD4 : RTEMS.UNSIGNED32;
-      end record;
-
---
---  The following is the ID of the message queue used for timing operations.
---
-
-   QUEUE_ID : RTEMS.ID;
-
---
---  The following variable is set to the execution time returned
---  by the timer.
---
-
-   END_TIME  : RTEMS.UNSIGNED32;
-
---
---  INIT
---
---  DESCRIPTION:
---
---  This RTEMS task initializes the application.
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TEST_INIT
---
---  DESCRIPTION:
---
---  This subprogram performs test initialization.
---
-
-   procedure TEST_INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  HIGH_TASK
---
---  DESCRIPTION:
---
---  This RTEMS task is the lowest priority task in the system.  It
---  only executes after all of the LOW_TASKS have blocked.  It then
---  times a readying MESSAGE_QUEUE_SEND.
---
-
-   procedure HIGH_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  LOW_TASKS
---
---  DESCRIPTION:
---
---  These RTEMS tasks perform a blocking MESSAGE_QUEUE_RECEIVE.
---
-
-   procedure LOW_TASKS (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
-end TMTEST;
diff --git a/c/src/ada-tests/tmtests/tm13/config.h b/c/src/ada-tests/tmtests/tm13/config.h
deleted file mode 100644
index b82372ca0f..0000000000
--- a/c/src/ada-tests/tmtests/tm13/config.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*  config.h
- *
- *  This include file defines the Configuration Table for this test.
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-/* configuration information */
-
-#define CONFIGURE_TMTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
-
-#define CONFIGURE_MAXIMUM_TASKS              111
-#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES     1
-#define CONFIGURE_TICKS_PER_TIMESLICE        0
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#define CONFIGURE_MAXIMUM_POSIX_THREADS              10
-#define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
-#define CONFIGURE_MAXIMUM_POSIX_MUTEXES              20
-#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES  10
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/c/src/ada-tests/tmtests/tm13/tm13.adb b/c/src/ada-tests/tmtests/tm13/tm13.adb
deleted file mode 100644
index 79f3aabf2b..0000000000
--- a/c/src/ada-tests/tmtests/tm13/tm13.adb
+++ /dev/null
@@ -1,57 +0,0 @@
---
---  MAIN / BODY
---
---  DESCRIPTION:
---
---  This is the entry point for Test TM13 of the Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-with TMTEST;
-with TEST_SUPPORT;
-
-procedure TM13 is
-  INIT_ID : RTEMS.ID;
-  STATUS  : RTEMS.STATUS_CODES;
-begin
-
-   RTEMS.TASK_CREATE(
-      RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
-      1,
-      RTEMS.MINIMUM_STACK_SIZE,
-      RTEMS.NO_PREEMPT,
-      RTEMS.DEFAULT_ATTRIBUTES,
-      INIT_ID,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
-
-
-   RTEMS.TASK_START(
-      INIT_ID,
-      TMTEST.INIT'ACCESS,
-      0,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
-
-   loop
-      delay 120.0;
-   end loop;
-
-end TM13;
-
diff --git a/c/src/ada-tests/tmtests/tm13/tmtest.adb b/c/src/ada-tests/tmtests/tm13/tmtest.adb
deleted file mode 100644
index 2a657d9515..0000000000
--- a/c/src/ada-tests/tmtests/tm13/tmtest.adb
+++ /dev/null
@@ -1,217 +0,0 @@
---
---  TMTEST / BODY
---
---  DESCRIPTION:
---
---  This package is the implementation of Test 13 of the RTEMS
---  Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with INTERFACES; use INTERFACES;
-with RTEMS;
-with RTEMS_CALLING_OVERHEAD;
-with TEST_SUPPORT;
-with TEXT_IO;
-with TIME_TEST_SUPPORT;
-with UNSIGNED32_IO;
-
-package body TMTEST is
-
---PAGE
--- 
---  INIT
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      TASK_ID : RTEMS.ID;
-      STATUS  : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** TIME TEST 13 ***" );
-
-      RTEMS.TASK_CREATE( 
-         1,
-         251, 
-         1024, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         TASK_ID,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE" );
-
-      RTEMS.TASK_START( 
-         TASK_ID, 
-         TMTEST.TEST_INIT'ACCESS, 
-         0, 
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START" );
-
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
-
-   end INIT;
-
---PAGE
--- 
---  TEST_INIT
---
-
-   procedure TEST_INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      INDEX          : RTEMS.UNSIGNED32;
-      TASK_ENTRY     : RTEMS.TASK_ENTRY;
-      PRIORITY       : RTEMS.TASK_PRIORITY;
-      TASK_ID        : RTEMS.ID;
-      BUFFER         : TMTEST.BUFFER;
-      BUFFER_POINTER : RTEMS.ADDRESS;
-      MESSAGE_SIZE   : RTEMS.UNSIGNED32;
-      STATUS         : RTEMS.STATUS_CODES;
-   begin
-
-      BUFFER_POINTER := BUFFER'ADDRESS;
-
--- As each task is started, it preempts this task and performs a blocking
--- MESSAGE_QUEUE_RECEIVE.  Upon completion of this loop all created tasks
--- are blocked.
-
-      RTEMS.MESSAGE_QUEUE_CREATE(
-         RTEMS.BUILD_NAME( 'M', 'Q', '1', ' ' ),
-         TIME_TEST_SUPPORT.OPERATION_COUNT,
-         16,
-         RTEMS.DEFAULT_OPTIONS,
-         TMTEST.QUEUE_ID,
-         STATUS
-      );
-
-      PRIORITY := 250;
-
-      for INDEX in 0 .. TIME_TEST_SUPPORT.OPERATION_COUNT - 1
-      loop
-
-         RTEMS.TASK_CREATE( 
-            RTEMS.BUILD_NAME( 'T', 'I', 'M', 'E' ),
-            PRIORITY, 
-            1024, 
-            RTEMS.DEFAULT_MODES,
-            RTEMS.DEFAULT_ATTRIBUTES,
-            TASK_ID,
-            STATUS
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE LOOP" );
-
-         PRIORITY := PRIORITY - 1;
-
-         if INDEX = TIME_TEST_SUPPORT.OPERATION_COUNT - 1 then
-            TASK_ENTRY := TMTEST.HIGH_TASK'ACCESS;
-         else
-            TASK_ENTRY := TMTEST.MIDDLE_TASKS'ACCESS;
-         end if;
-
-         RTEMS.TASK_START( TASK_ID, TASK_ENTRY, 0, STATUS );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START LOOP" );
-
-      end loop;
-
-      TIMER_DRIVER.INITIALIZE;
-      RTEMS.MESSAGE_QUEUE_URGENT( 
-         TMTEST.QUEUE_ID,
-         BUFFER_POINTER,
-         16,
-         STATUS
-      );
-
-   end TEST_INIT;
-
---PAGE
--- 
---  HIGH_TASK
---
-
-   procedure HIGH_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      BUFFER         : TMTEST.BUFFER;
-      BUFFER_POINTER : RTEMS.ADDRESS;
-      MESSAGE_SIZE   : RTEMS.UNSIGNED32;
-      STATUS         : RTEMS.STATUS_CODES;
-   begin
-
-      BUFFER_POINTER := BUFFER'ADDRESS;
-
-      RTEMS.MESSAGE_QUEUE_RECEIVE( 
-         TMTEST.QUEUE_ID,
-         BUFFER_POINTER,
-         RTEMS.DEFAULT_OPTIONS,
-         RTEMS.NO_TIMEOUT,
-         MESSAGE_SIZE,
-         STATUS
-      );
-
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-      TIME_TEST_SUPPORT.PUT_TIME(
-         "MESSAGE_QUEUE_URGENT (preemptive)",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         0,
-         RTEMS_CALLING_OVERHEAD.MESSAGE_QUEUE_URGENT 
-      );
-
-      RTEMS.SHUTDOWN_EXECUTIVE( 0 );
-
-   end HIGH_TASK;
-
---PAGE
--- 
---  MIDDLE_TASKS
---
-
-   procedure MIDDLE_TASKS (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      BUFFER         : TMTEST.BUFFER;
-      BUFFER_POINTER : RTEMS.ADDRESS;
-      MESSAGE_SIZE   : RTEMS.UNSIGNED32;
-      STATUS         : RTEMS.STATUS_CODES;
-   begin
- 
-      BUFFER_POINTER := BUFFER'ADDRESS;
-
-      RTEMS.MESSAGE_QUEUE_RECEIVE( 
-         TMTEST.QUEUE_ID,
-         BUFFER_POINTER,
-         RTEMS.DEFAULT_OPTIONS,
-         RTEMS.NO_TIMEOUT,
-         MESSAGE_SIZE,
-         STATUS
-      );
- 
-      RTEMS.MESSAGE_QUEUE_URGENT( 
-         TMTEST.QUEUE_ID,
-         BUFFER_POINTER,
-         16,
-         STATUS
-      );
-
-   end MIDDLE_TASKS;
-
-end TMTEST;
diff --git a/c/src/ada-tests/tmtests/tm13/tmtest.ads b/c/src/ada-tests/tmtests/tm13/tmtest.ads
deleted file mode 100644
index 2ecf4a3a96..0000000000
--- a/c/src/ada-tests/tmtests/tm13/tmtest.ads
+++ /dev/null
@@ -1,114 +0,0 @@
---
---  TMTEST / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package is the specification for Test 13 of the RTEMS
---  Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with TIMER_DRIVER;
-with RTEMS;
-
-package TMTEST is
-
---
---  Buffer Record similar to that used by RTEMS 3.2.1.  Using this
---  avoids changes to the test.
---
-
-   type BUFFER is
-      record
-         FIELD1 : RTEMS.UNSIGNED32;   -- TEMPORARY UNTIL VARIABLE LENGTH
-         FIELD2 : RTEMS.UNSIGNED32;
-         FIELD3 : RTEMS.UNSIGNED32;
-         FIELD4 : RTEMS.UNSIGNED32;
-      end record;
-
---
---  The following is the ID of the message queue used for timing operations.
---
-
-   QUEUE_ID : RTEMS.ID;
-
---
---  The following variable is set to the execution time returned
---  by the timer.
---
-
-   END_TIME  : RTEMS.UNSIGNED32;
-
---
---  INIT
---
---  DESCRIPTION:
---
---  This RTEMS task initializes the application.
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TEST_INIT
---
---  DESCRIPTION:
---
---  This subprogram performs test initialization.  As each application
---  task is created and started, it will preempt this task and
---  perform a blocking MESSAGE_QUEUE_RECEIVE.  Once all of the 
---  initialization is completed, the timer is started and the first 
---  preemptive MESSAGE_QUEUE_URGENT is executed.
---
-
-   procedure TEST_INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  HIGH_TASK
---
---  DESCRIPTION:
---
---  This RTEMS task is the highest priority task in the system.  
---  It performs a blocking blocking MESSAGE_QUEUE_RECEIVE.  It is
---  the last test task created and started.  Thus it is the last 
---  task to be enqueued waiting for a message and the last task
---  to receive the message.  Once it receives the message, it
---  stops the timer and reports the execution time for a
---  preemptive MESSAGE_QUEUE_URGENT.
---
-
-   procedure HIGH_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  MIDDLE_TASKS
---
---  DESCRIPTION:
---
---  As each of these RTEMS tasks is created and started, it preempts
---  the initialization task and perform a blocking MESSAGE_QUEUE_RECEIVE.
---
-
-   procedure MIDDLE_TASKS (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
-end TMTEST;
diff --git a/c/src/ada-tests/tmtests/tm14/config.h b/c/src/ada-tests/tmtests/tm14/config.h
deleted file mode 100644
index b82372ca0f..0000000000
--- a/c/src/ada-tests/tmtests/tm14/config.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*  config.h
- *
- *  This include file defines the Configuration Table for this test.
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-/* configuration information */
-
-#define CONFIGURE_TMTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
-
-#define CONFIGURE_MAXIMUM_TASKS              111
-#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES     1
-#define CONFIGURE_TICKS_PER_TIMESLICE        0
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#define CONFIGURE_MAXIMUM_POSIX_THREADS              10
-#define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
-#define CONFIGURE_MAXIMUM_POSIX_MUTEXES              20
-#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES  10
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/c/src/ada-tests/tmtests/tm14/tm14.adb b/c/src/ada-tests/tmtests/tm14/tm14.adb
deleted file mode 100644
index c155fcd29d..0000000000
--- a/c/src/ada-tests/tmtests/tm14/tm14.adb
+++ /dev/null
@@ -1,57 +0,0 @@
---
---  MAIN / BODY
---
---  DESCRIPTION:
---
---  This is the entry point for Test TM14 of the Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-with TMTEST;
-with TEST_SUPPORT;
-
-procedure TM14 is
-  INIT_ID : RTEMS.ID;
-  STATUS  : RTEMS.STATUS_CODES;
-begin
-
-   RTEMS.TASK_CREATE(
-      RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
-      1,
-      RTEMS.MINIMUM_STACK_SIZE,
-      RTEMS.NO_PREEMPT,
-      RTEMS.DEFAULT_ATTRIBUTES,
-      INIT_ID,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
-
-
-   RTEMS.TASK_START(
-      INIT_ID,
-      TMTEST.INIT'ACCESS,
-      0,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
-
-   loop
-      delay 120.0;
-   end loop;
-
-end TM14;
-
diff --git a/c/src/ada-tests/tmtests/tm14/tmtest.adb b/c/src/ada-tests/tmtests/tm14/tmtest.adb
deleted file mode 100644
index 69eeb368eb..0000000000
--- a/c/src/ada-tests/tmtests/tm14/tmtest.adb
+++ /dev/null
@@ -1,216 +0,0 @@
---
---  TMTEST / BODY
---
---  DESCRIPTION:
---
---  This package is the implementation of Test 14 of the RTEMS
---  Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with INTERFACES; use INTERFACES;
-with RTEMS;
-with RTEMS_CALLING_OVERHEAD;
-with TEST_SUPPORT;
-with TEXT_IO;
-with TIME_TEST_SUPPORT;
-with UNSIGNED32_IO;
-
-package body TMTEST is
-
---PAGE
--- 
---  INIT
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      TASK_ID : RTEMS.ID;
-      STATUS  : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** TIME TEST 14 ***" );
-
-      RTEMS.TASK_CREATE( 
-         1,
-         251, 
-         1024, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         TASK_ID,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE" );
-
-      RTEMS.TASK_START( 
-         TASK_ID, 
-         TMTEST.TEST_INIT'ACCESS, 
-         0, 
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START" );
-
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
-
-   end INIT;
-
---PAGE
--- 
---  TEST_INIT
---
-
-   procedure TEST_INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      INDEX          : RTEMS.UNSIGNED32;
-      TASK_ENTRY     : RTEMS.TASK_ENTRY;
-      PRIORITY       : RTEMS.TASK_PRIORITY;
-      TASK_ID        : RTEMS.ID;
-      BUFFER         : TMTEST.BUFFER;
-      BUFFER_POINTER : RTEMS.ADDRESS;
-      STATUS         : RTEMS.STATUS_CODES;
-   begin
-
-      BUFFER_POINTER := BUFFER'ADDRESS;
-
-      RTEMS.MESSAGE_QUEUE_CREATE(
-         RTEMS.BUILD_NAME( 'M', 'Q', '1', ' ' ),
-         TIME_TEST_SUPPORT.OPERATION_COUNT,
-         16,
-         RTEMS.DEFAULT_OPTIONS,
-         TMTEST.QUEUE_ID,
-         STATUS
-      );
-
-      PRIORITY := 250;
-
-      for INDEX in 0 .. TIME_TEST_SUPPORT.OPERATION_COUNT - 1
-      loop
-
-         RTEMS.TASK_CREATE( 
-            RTEMS.BUILD_NAME( 'T', 'I', 'M', 'E' ),
-            PRIORITY, 
-            1024, 
-            RTEMS.DEFAULT_MODES,
-            RTEMS.DEFAULT_ATTRIBUTES,
-            TASK_ID,
-            STATUS
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE LOOP" );
-
-         PRIORITY := PRIORITY - 1;
-
-         if INDEX = TIME_TEST_SUPPORT.OPERATION_COUNT - 1 then
-            TASK_ENTRY := TMTEST.HIGH_TASK'ACCESS;
-         else
-            TASK_ENTRY := TMTEST.LOW_TASKS'ACCESS;
-         end if;
-
-         RTEMS.TASK_START( TASK_ID, TASK_ENTRY, 0, STATUS );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START LOOP" );
-
-      end loop;
-
-      TIMER_DRIVER.INITIALIZE;
-      RTEMS.MESSAGE_QUEUE_URGENT( 
-         TMTEST.QUEUE_ID,
-         BUFFER_POINTER,
-         16,
-         STATUS
-      );
-
-   end TEST_INIT;
-
---PAGE
--- 
---  HIGH_TASK
---
-
-   procedure HIGH_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      BUFFER         : TMTEST.BUFFER;
-      BUFFER_POINTER : RTEMS.ADDRESS;
-      OVERHEAD       : RTEMS.UNSIGNED32;
-      STATUS         : RTEMS.STATUS_CODES;
-   begin
-
-      BUFFER_POINTER := BUFFER'ADDRESS;
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            TIMER_DRIVER.EMPTY_FUNCTION;
-         end loop;
-      OVERHEAD := TIMER_DRIVER.READ_TIMER;
-
-      for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT 
-      loop
-      
-         RTEMS.MESSAGE_QUEUE_URGENT(
-            TMTEST.QUEUE_ID,
-            BUFFER_POINTER, 
-            16,
-            STATUS
-         );
-
-      end loop;
-
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME(
-         "MESSAGE_QUEUE_URGENT (readying)",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         RTEMS_CALLING_OVERHEAD.MESSAGE_QUEUE_URGENT 
-      );
-
-      RTEMS.SHUTDOWN_EXECUTIVE( 0 );
-
-   end HIGH_TASK;
-
---PAGE
--- 
---  LOW_TASKS
---
-
-   procedure LOW_TASKS (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      BUFFER         : TMTEST.BUFFER;
-      BUFFER_POINTER : RTEMS.ADDRESS;
-      MESSAGE_SIZE   : RTEMS.UNSIGNED32;
-      STATUS         : RTEMS.STATUS_CODES;
-   begin
- 
-      BUFFER_POINTER := BUFFER'ADDRESS;
-
-      RTEMS.MESSAGE_QUEUE_RECEIVE( 
-         TMTEST.QUEUE_ID,
-         BUFFER_POINTER,
-         RTEMS.DEFAULT_OPTIONS,
-         RTEMS.NO_TIMEOUT,
-         MESSAGE_SIZE,
-         STATUS
-      );
- 
-   end LOW_TASKS;
-
-end TMTEST;
diff --git a/c/src/ada-tests/tmtests/tm14/tmtest.ads b/c/src/ada-tests/tmtests/tm14/tmtest.ads
deleted file mode 100644
index e08a167fcb..0000000000
--- a/c/src/ada-tests/tmtests/tm14/tmtest.ads
+++ /dev/null
@@ -1,105 +0,0 @@
---
---  TMTEST / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package is the specification for Test 14 of the RTEMS
---  Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with TIMER_DRIVER;
-with RTEMS;
-
-package TMTEST is
-
---
---  Buffer Record similar to that used by RTEMS 3.2.1.  Using this
---  avoids changes to the test.
---
-
-   type BUFFER is
-      record
-         FIELD1 : RTEMS.UNSIGNED32;   -- TEMPORARY UNTIL VARIABLE LENGTH
-         FIELD2 : RTEMS.UNSIGNED32;
-         FIELD3 : RTEMS.UNSIGNED32;
-         FIELD4 : RTEMS.UNSIGNED32;
-      end record;
-
---
---  The following is the ID of the message queue used for timing operations.
---
-
-   QUEUE_ID : RTEMS.ID;
-
---
---  The following variable is set to the execution time returned
---  by the timer.
---
-
-   END_TIME  : RTEMS.UNSIGNED32;
-
---
---  INIT
---
---  DESCRIPTION:
---
---  This RTEMS task initializes the application.
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TEST_INIT
---
---  DESCRIPTION:
---
---  This subprogram performs test initialization.
---
-
-   procedure TEST_INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  HIGH_TASK
---
---  DESCRIPTION:
---
---  This RTEMS task is the lowest priority task in the system.  It
---  only executes after all of the LOW_TASKS have blocked.  It then
---  times a readying MESSAGE_QUEUE_SEND.
---
-
-   procedure HIGH_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  LOW_TASKS
---
---  DESCRIPTION:
---
---  These RTEMS tasks perform a blocking MESSAGE_QUEUE_RECEIVE.
---
-
-   procedure LOW_TASKS (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
-end TMTEST;
diff --git a/c/src/ada-tests/tmtests/tm15/config.h b/c/src/ada-tests/tmtests/tm15/config.h
deleted file mode 100644
index b82372ca0f..0000000000
--- a/c/src/ada-tests/tmtests/tm15/config.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*  config.h
- *
- *  This include file defines the Configuration Table for this test.
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-/* configuration information */
-
-#define CONFIGURE_TMTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
-
-#define CONFIGURE_MAXIMUM_TASKS              111
-#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES     1
-#define CONFIGURE_TICKS_PER_TIMESLICE        0
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#define CONFIGURE_MAXIMUM_POSIX_THREADS              10
-#define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
-#define CONFIGURE_MAXIMUM_POSIX_MUTEXES              20
-#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES  10
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/c/src/ada-tests/tmtests/tm15/tm15.adb b/c/src/ada-tests/tmtests/tm15/tm15.adb
deleted file mode 100644
index ede6d05307..0000000000
--- a/c/src/ada-tests/tmtests/tm15/tm15.adb
+++ /dev/null
@@ -1,57 +0,0 @@
---
---  MAIN / BODY
---
---  DESCRIPTION:
---
---  This is the entry point for Test TM15 of the Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-with TMTEST;
-with TEST_SUPPORT;
-
-procedure TM15 is
-  INIT_ID : RTEMS.ID;
-  STATUS  : RTEMS.STATUS_CODES;
-begin
-
-   RTEMS.TASK_CREATE(
-      RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
-      1,
-      RTEMS.MINIMUM_STACK_SIZE,
-      RTEMS.NO_PREEMPT,
-      RTEMS.DEFAULT_ATTRIBUTES,
-      INIT_ID,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
-
-
-   RTEMS.TASK_START(
-      INIT_ID,
-      TMTEST.INIT'ACCESS,
-      0,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
-
-   loop
-      delay 120.0;
-   end loop;
-
-end TM15;
-
diff --git a/c/src/ada-tests/tmtests/tm15/tmtest.adb b/c/src/ada-tests/tmtests/tm15/tmtest.adb
deleted file mode 100644
index c1ed0dc9c2..0000000000
--- a/c/src/ada-tests/tmtests/tm15/tmtest.adb
+++ /dev/null
@@ -1,276 +0,0 @@
---
---  TMTEST / BODY
---
---  DESCRIPTION:
---
---  This package is the implementation of Test 15 of the RTEMS
---  Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with INTERFACES; use INTERFACES;
-with RTEMS;
-with RTEMS_CALLING_OVERHEAD;
-with TEST_SUPPORT;
-with TEXT_IO;
-with TIME_TEST_SUPPORT;
-with UNSIGNED32_IO;
-
-package body TMTEST is
-
---PAGE
--- 
---  INIT
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      TASK_ID : RTEMS.ID;
-      STATUS  : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** TIME TEST 15 ***" );
-
-      TMTEST.TEST_INIT;
-
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
-
-   end INIT;
-
---PAGE
--- 
---  TEST_INIT
---
-
-   procedure TEST_INIT
-   is
-      ID        : RTEMS.ID;
-      INDEX     : RTEMS.UNSIGNED32;
-      OVERHEAD  : RTEMS.UNSIGNED32;
-      EVENT_OUT : RTEMS.EVENT_SET;
-      STATUS    : RTEMS.STATUS_CODES;
-   begin
-
-      TMTEST.TIME_SET := FALSE;
-
-      RTEMS.TASK_CREATE( 
-         RTEMS.BUILD_NAME( 'L', 'O', 'W', ' ' ),
-         10, 
-         1024, 
-         RTEMS.NO_PREEMPT,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         ID,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE LOW" );
-
-      RTEMS.TASK_START( ID, TMTEST.LOW_TASK'ACCESS, 0, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START LOW" );
-
-      for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-      loop
-
-         RTEMS.TASK_CREATE( 
-            RTEMS.BUILD_NAME( 'H', 'I', 'G', 'H' ),
-            5, 
-            1024, 
-            RTEMS.DEFAULT_MODES,
-            RTEMS.DEFAULT_ATTRIBUTES,
-            TMTEST.TASK_ID( INDEX ),
-            STATUS
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE LOOP" );
-
-         RTEMS.TASK_START( 
-            TMTEST.TASK_ID( INDEX ),
-            TMTEST.HIGH_TASKS'ACCESS, 
-            0, 
-            STATUS 
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START LOOP" );
-
-      end loop;
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            TIMER_DRIVER.EMPTY_FUNCTION;
-         end loop;
-      OVERHEAD := TIMER_DRIVER.READ_TIMER;
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            RTEMS.EVENT_RECEIVE(
-               RTEMS.PENDING_EVENTS,
-               RTEMS.DEFAULT_OPTIONS,
-               RTEMS.NO_TIMEOUT,
-               EVENT_OUT,
-               STATUS
-            );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "EVENT_RECEIVE (current)",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         RTEMS_CALLING_OVERHEAD.EVENT_RECEIVE 
-      );
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            RTEMS.EVENT_RECEIVE(
-               RTEMS.ALL_EVENTS,
-               RTEMS.NO_WAIT,
-               RTEMS.NO_TIMEOUT,
-               EVENT_OUT,
-               STATUS
-            );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "EVENT_RECEIVE (NO_WAIT)",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         RTEMS_CALLING_OVERHEAD.EVENT_RECEIVE 
-      );
-
-   end TEST_INIT;
-
---PAGE
--- 
---  LOW_TASK
---
-
-   procedure LOW_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      ID        : RTEMS.ID;
-      INDEX     : RTEMS.UNSIGNED32;
-      EVENT_OUT : RTEMS.EVENT_SET;
-      OVERHEAD  : RTEMS.UNSIGNED32;
-      STATUS    : RTEMS.STATUS_CODES;
-   begin
-   
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "EVENT_RECEIVE (blocking)",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         0,
-         RTEMS_CALLING_OVERHEAD.EVENT_RECEIVE 
-      );
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            TIMER_DRIVER.EMPTY_FUNCTION;
-         end loop;
-      OVERHEAD := TIMER_DRIVER.READ_TIMER;
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            RTEMS.EVENT_SEND( RTEMS.SELF, RTEMS.EVENT_16, STATUS );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "EVENT_SEND (returns to caller)",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         RTEMS_CALLING_OVERHEAD.EVENT_SEND 
-      );
-
-      TIMER_DRIVER.INITIALIZE;
-         RTEMS.EVENT_RECEIVE(
-            RTEMS.EVENT_16,
-            RTEMS.DEFAULT_OPTIONS,
-            RTEMS.NO_TIMEOUT,
-            EVENT_OUT,
-            STATUS
-         );
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "EVENT_RECEIVE (available)",
-         TMTEST.END_TIME, 
-         1, 
-         0,
-         RTEMS_CALLING_OVERHEAD.EVENT_RECEIVE 
-      );
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            RTEMS.EVENT_SEND( 
-               TMTEST.TASK_ID( INDEX ), 
-               RTEMS.EVENT_16, 
-               STATUS 
-            );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "EVENT_SEND (readying)",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         RTEMS_CALLING_OVERHEAD.EVENT_SEND 
-      );
-
-      RTEMS.SHUTDOWN_EXECUTIVE( 0 );
-
-   end LOW_TASK;
-
---PAGE
--- 
---  HIGH_TASKS
---
-
-   procedure HIGH_TASKS (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      EVENT_OUT : RTEMS.EVENT_SET;
-      STATUS    : RTEMS.STATUS_CODES;
-   begin
-
-      if TMTEST.TIME_SET = FALSE then
-         TMTEST.TIME_SET := TRUE;
-         TIMER_DRIVER.INITIALIZE;
-      end if;
-
-      RTEMS.EVENT_RECEIVE(
-         16#7FFFFFFF#,
-         RTEMS.DEFAULT_OPTIONS,
-         RTEMS.NO_TIMEOUT,
-         EVENT_OUT,
-         STATUS
-      );
-   
-   end HIGH_TASKS;
-
-end TMTEST;
diff --git a/c/src/ada-tests/tmtests/tm15/tmtest.ads b/c/src/ada-tests/tmtests/tm15/tmtest.ads
deleted file mode 100644
index 9ccc3d6558..0000000000
--- a/c/src/ada-tests/tmtests/tm15/tmtest.ads
+++ /dev/null
@@ -1,109 +0,0 @@
---
---  TMTEST / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package is the specification for Test 15 of the RTEMS
---  Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with TIME_TEST_SUPPORT;
-with TIMER_DRIVER;
-with RTEMS;
-
-package TMTEST is
-
---
---  This array contains the IDs of all RTEMS tasks created by this test.
---
-
-   TASK_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 
-      TIME_TEST_SUPPORT.OPERATION_COUNT ) of RTEMS.ID;
-
---
---   This variable is set to TRUE if the timer has been initialized
---   and is currently timing an operation.
---
-
-   TIME_SET  : Standard.BOOLEAN;
-
---
---  The following variable is set to the execution time returned
---  by the timer.
---
-
-   END_TIME  : RTEMS.UNSIGNED32;
-
---
---  INIT
---
---  DESCRIPTION:
---
---  This RTEMS task initializes the application.
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TEST_INIT
---
---  DESCRIPTION:
---
---  This subprogram performs test initialization.  Once initialization
---  has been completed, the following operations are timed and reported:
---
---    + event_receive of currently PENDING_EVENTS
---    + event_receive NO_WAIT case
---
-
-   procedure TEST_INIT;
-
---
---  LOW_TASK
---
---  DESCRIPTION:
---
---  This RTEMS task stops the timer and reports the execution time 
---  of a blocking EVENT_RECEIVE.  After this the following
---  operations are timed and the execution time is reported:
---  
---    + EVENT_SEND which does not ready a task
---    + EVENT_RECEIVE with the event condition available
---    + EVENT_SEND which readies a task
---
-
-   procedure LOW_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  HIGH_TASKS
---
---  DESCRIPTION:
---
---  These RTEMS tasks executive a blocking EVENT_RECEIVE after
---  initialization is complete.  The first of these tasks to 
---  execute starts the timer.
---
-
-   procedure HIGH_TASKS (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
-end TMTEST;
diff --git a/c/src/ada-tests/tmtests/tm16/config.h b/c/src/ada-tests/tmtests/tm16/config.h
deleted file mode 100644
index b82372ca0f..0000000000
--- a/c/src/ada-tests/tmtests/tm16/config.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*  config.h
- *
- *  This include file defines the Configuration Table for this test.
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-/* configuration information */
-
-#define CONFIGURE_TMTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
-
-#define CONFIGURE_MAXIMUM_TASKS              111
-#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES     1
-#define CONFIGURE_TICKS_PER_TIMESLICE        0
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#define CONFIGURE_MAXIMUM_POSIX_THREADS              10
-#define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
-#define CONFIGURE_MAXIMUM_POSIX_MUTEXES              20
-#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES  10
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/c/src/ada-tests/tmtests/tm16/tm16.adb b/c/src/ada-tests/tmtests/tm16/tm16.adb
deleted file mode 100644
index 91acf3fe15..0000000000
--- a/c/src/ada-tests/tmtests/tm16/tm16.adb
+++ /dev/null
@@ -1,57 +0,0 @@
---
---  MAIN / BODY
---
---  DESCRIPTION:
---
---  This is the entry point for Test TM16 of the Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-with TMTEST;
-with TEST_SUPPORT;
-
-procedure TM16 is
-  INIT_ID : RTEMS.ID;
-  STATUS  : RTEMS.STATUS_CODES;
-begin
-
-   RTEMS.TASK_CREATE(
-      RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
-      1,
-      RTEMS.MINIMUM_STACK_SIZE,
-      RTEMS.NO_PREEMPT,
-      RTEMS.DEFAULT_ATTRIBUTES,
-      INIT_ID,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
-
-
-   RTEMS.TASK_START(
-      INIT_ID,
-      TMTEST.INIT'ACCESS,
-      0,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
-
-   loop
-      delay 120.0;
-   end loop;
-
-end TM16;
-
diff --git a/c/src/ada-tests/tmtests/tm16/tmtest.adb b/c/src/ada-tests/tmtests/tm16/tmtest.adb
deleted file mode 100644
index 57dcdd482d..0000000000
--- a/c/src/ada-tests/tmtests/tm16/tmtest.adb
+++ /dev/null
@@ -1,197 +0,0 @@
---
---  TMTEST / BODY
---
---  DESCRIPTION:
---
---  This package is the implementation of Test 16 of the RTEMS
---  Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with INTERFACES; use INTERFACES;
-with RTEMS;
-with RTEMS_CALLING_OVERHEAD;
-with TEST_SUPPORT;
-with TEXT_IO;
-with TIME_TEST_SUPPORT;
-with UNSIGNED32_IO;
-
-package body TMTEST is
-
---PAGE
--- 
---  INIT
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      ID     : RTEMS.ID;
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** TIME TEST 16 ***" );
-
-      RTEMS.TASK_CREATE( 
-         RTEMS.BUILD_NAME( 'T', 'E', 'S', 'T' ),
-         251, 
-         2048, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         ID,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TEST INIT" );
-
-      RTEMS.TASK_START( 
-         ID, 
-         TMTEST.TEST_INIT'ACCESS, 
-         0, 
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TEST INIT" );
-
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
-
-   end INIT;
-
---PAGE
--- 
---  TEST_INIT
---
-
-   procedure TEST_INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      PRIORITY   : RTEMS.TASK_PRIORITY;
-      INDEX      : RTEMS.UNSIGNED32;
-      TASK_ENTRY : RTEMS.TASK_ENTRY;
-      STATUS     : RTEMS.STATUS_CODES;
-   begin
-
-      PRIORITY := 250;
-
-      for INDEX in 0 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-      loop
-
-         RTEMS.TASK_CREATE( 
-            RTEMS.BUILD_NAME( 'M', 'I', 'D', ' ' ),
-            PRIORITY, 
-            1024, 
-            RTEMS.DEFAULT_MODES,
-            RTEMS.DEFAULT_ATTRIBUTES,
-            TMTEST.TASK_ID( INDEX ), 
-            STATUS
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE LOOP" );
-
-         if INDEX = TIME_TEST_SUPPORT.OPERATION_COUNT then
-            TASK_ENTRY := TMTEST.HIGH_TASK'ACCESS;
-         else
-            TASK_ENTRY := TMTEST.MIDDLE_TASKS'ACCESS;
-         end if;
-
-         RTEMS.TASK_START( 
-            TMTEST.TASK_ID( INDEX ), 
-            TASK_ENTRY, 
-            0, 
-            STATUS 
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START LOOP" );
-
-         PRIORITY := PRIORITY - 1;
-
-      end loop;
-
-      TMTEST.TASK_COUNT := 0;
-
-      TIMER_DRIVER.INITIALIZE;                  -- starts the timer
-
-      RTEMS.EVENT_SEND(                         -- preempts task
-         TMTEST.TASK_ID( TMTEST.TASK_COUNT ), 
-         RTEMS.EVENT_16, 
-         STATUS 
-      );
-      
-   end TEST_INIT;
-
---PAGE
--- 
---  MIDDLE_TASKS
---
-
-   procedure MIDDLE_TASKS (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      EVENT_OUT : RTEMS.EVENT_SET;
-      STATUS    : RTEMS.STATUS_CODES;
-   begin
-
-      RTEMS.EVENT_RECEIVE(                      -- task blocks
-         RTEMS.EVENT_16, 
-         RTEMS.DEFAULT_OPTIONS,
-         RTEMS.NO_TIMEOUT,
-         EVENT_OUT,
-         STATUS
-      );
-
-      TMTEST.TASK_COUNT := TMTEST.TASK_COUNT + 1;
-
-      RTEMS.EVENT_SEND(                         -- preempts task
-         TMTEST.TASK_ID( TMTEST.TASK_COUNT ), 
-         RTEMS.EVENT_16, 
-         STATUS 
-      );
-      
-   end MIDDLE_TASKS;
-
---PAGE
--- 
---  HIGH_TASK
---
-
-   procedure HIGH_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      EVENT_OUT : RTEMS.EVENT_SET;
-      STATUS    : RTEMS.STATUS_CODES;
-   begin
-
-      RTEMS.EVENT_RECEIVE(                      -- task blocks
-         RTEMS.EVENT_16, 
-         RTEMS.DEFAULT_OPTIONS,
-         RTEMS.NO_TIMEOUT,
-         EVENT_OUT,
-         STATUS
-      );
-
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "EVENT_SEND (preemptive)", 
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         0,
-         RTEMS_CALLING_OVERHEAD.EVENT_SEND 
-      );
-
-      RTEMS.SHUTDOWN_EXECUTIVE( 0 );
-
-   end HIGH_TASK;
-
-end TMTEST;
diff --git a/c/src/ada-tests/tmtests/tm16/tmtest.ads b/c/src/ada-tests/tmtests/tm16/tmtest.ads
deleted file mode 100644
index 44b7feabd2..0000000000
--- a/c/src/ada-tests/tmtests/tm16/tmtest.ads
+++ /dev/null
@@ -1,111 +0,0 @@
---
---  TMTEST / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package is the specification for Test 16 of the RTEMS
---  Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-with TIME_TEST_SUPPORT;
-with TIMER_DRIVER;
-
-package TMTEST is
-
---
---  This array contains the IDs of all RTEMS tasks created by this test.
---
-
-   TASK_ID   : array ( RTEMS.UNSIGNED32 
-      range 0 .. TIME_TEST_SUPPORT.OPERATION_COUNT ) of RTEMS.ID;
-
---
---  This variable is used to index through the TASK_ID array
---  so that events can be send to the next task.
---
-
-   TASK_COUNT : RTEMS.UNSIGNED32;
-
---
---  The following variable is set to the execution time returned
---  by the timer.
---
-
-   END_TIME  : RTEMS.UNSIGNED32;
-
---
---  INIT
---
---  DESCRIPTION:
---
---  This RTEMS task initializes the application.  
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TEST_INIT
---
---  DESCRIPTION:
---
---  This subprogram performs test initialization.  Once initialization
---  has been completed, this task sets the TASK_COUNT to 0 and
---  starts the timer before performing a preemptive EVENT_SEND.
---
-
-   procedure TEST_INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  HIGH_TASK
---
---  DESCRIPTION:
---
---  This RTEMS task is highest priority task in the system.
---  Its first action is to perform a blocking EVENT_RECEIVE.
---  It is the last task to have its event set sent to it.  Thus it 
---  is the last task to be awakened by a preemptive EVENT_SEND.
---  After it preempts the last MIDDLE_TASKS, it stops the timer
---  and reports the execution time of preemptive EVENT_SEND.
---
-
-   procedure HIGH_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  MIDDLE_TASKS
---
---  DESCRIPTION:
---
---  These RTEMS tasks perform a blocking EVENT_RECEIVE.  When
---  readied, each task will increment the TASK_COUNT and
---  perform a preemptive EVENT_SEND.  TASK_COUNT is used to
---  index the TASK_ID array in such a way that incrementing
---  TASK_COUNT makes it index the ID of the next task to 
---  send events to. 
---
-
-   procedure MIDDLE_TASKS (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
-end TMTEST;
diff --git a/c/src/ada-tests/tmtests/tm17/config.h b/c/src/ada-tests/tmtests/tm17/config.h
deleted file mode 100644
index b82372ca0f..0000000000
--- a/c/src/ada-tests/tmtests/tm17/config.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*  config.h
- *
- *  This include file defines the Configuration Table for this test.
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-/* configuration information */
-
-#define CONFIGURE_TMTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
-
-#define CONFIGURE_MAXIMUM_TASKS              111
-#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES     1
-#define CONFIGURE_TICKS_PER_TIMESLICE        0
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#define CONFIGURE_MAXIMUM_POSIX_THREADS              10
-#define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
-#define CONFIGURE_MAXIMUM_POSIX_MUTEXES              20
-#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES  10
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/c/src/ada-tests/tmtests/tm17/tm17.adb b/c/src/ada-tests/tmtests/tm17/tm17.adb
deleted file mode 100644
index 263352447b..0000000000
--- a/c/src/ada-tests/tmtests/tm17/tm17.adb
+++ /dev/null
@@ -1,57 +0,0 @@
---
---  MAIN / BODY
---
---  DESCRIPTION:
---
---  This is the entry point for Test TM17 of the Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-with TMTEST;
-with TEST_SUPPORT;
-
-procedure TM17 is
-  INIT_ID : RTEMS.ID;
-  STATUS  : RTEMS.STATUS_CODES;
-begin
-
-   RTEMS.TASK_CREATE(
-      RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
-      1,
-      RTEMS.MINIMUM_STACK_SIZE,
-      RTEMS.NO_PREEMPT,
-      RTEMS.DEFAULT_ATTRIBUTES,
-      INIT_ID,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
-
-
-   RTEMS.TASK_START(
-      INIT_ID,
-      TMTEST.INIT'ACCESS,
-      0,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
-
-   loop
-      delay 120.0;
-   end loop;
-
-end TM17;
-
diff --git a/c/src/ada-tests/tmtests/tm17/tmtest.adb b/c/src/ada-tests/tmtests/tm17/tmtest.adb
deleted file mode 100644
index 1b36ab0cbf..0000000000
--- a/c/src/ada-tests/tmtests/tm17/tmtest.adb
+++ /dev/null
@@ -1,160 +0,0 @@
---
---  TMTEST / BODY
---
---  DESCRIPTION:
---
---  This package is the implementation of Test 17 of the RTEMS
---  Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with INTERFACES; use INTERFACES;
-with RTEMS;
-with RTEMS_CALLING_OVERHEAD;
-with TEST_SUPPORT;
-with TEXT_IO;
-with TIME_TEST_SUPPORT;
-with UNSIGNED32_IO;
-
-package body TMTEST is
-
---PAGE
--- 
---  INIT
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      TASK_ENTRY : RTEMS.TASK_ENTRY;
-      INDEX      : RTEMS.UNSIGNED32;
-      STATUS     : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** TIME TEST 17 ***" );
-
-      TMTEST.TASK_PRIORITY := 254;
-
-      for INDEX in 0 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-      loop
-
-         RTEMS.TASK_CREATE( 
-            RTEMS.BUILD_NAME( 'T', 'I', 'M', 'E' ),
-            TMTEST.TASK_PRIORITY, 
-            1024, 
-            RTEMS.DEFAULT_MODES,
-            RTEMS.DEFAULT_ATTRIBUTES,
-            TMTEST.TASK_ID( INDEX ), 
-            STATUS
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE LOOP" );
-
-         if INDEX = TIME_TEST_SUPPORT.OPERATION_COUNT then
-            TASK_ENTRY := TMTEST.LAST_TASK'ACCESS;
-         elsif INDEX = 0 then
-            TASK_ENTRY := TMTEST.FIRST_TASK'ACCESS;
-         else
-            TASK_ENTRY := TMTEST.MIDDLE_TASKS'ACCESS;
-         end if;
-
-         RTEMS.TASK_START( TMTEST.TASK_ID( INDEX ), TASK_ENTRY, 0, STATUS );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START LOOP" );
-
-      end loop;
-
-      TMTEST.TASK_COUNT := 1;
-
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
-
-   end INIT;
-
---PAGE
--- 
---  FIRST_TASK
---
-
-   procedure FIRST_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      PREVIOUS_PRIORITY : RTEMS.TASK_PRIORITY;
-      STATUS            : RTEMS.STATUS_CODES;
-   begin
-
-      TIMER_DRIVER.INITIALIZE;
-
-      TMTEST.TASK_PRIORITY := TMTEST.TASK_PRIORITY - 1;
-      TMTEST.TASK_COUNT    := TMTEST.TASK_COUNT + 1;
-
-      RTEMS.TASK_SET_PRIORITY(
-         TMTEST.TASK_ID( TMTEST.TASK_COUNT ), 
-         TMTEST.TASK_PRIORITY,
-         PREVIOUS_PRIORITY,
-         STATUS 
-      );
-
-   end FIRST_TASK;
-
---PAGE
--- 
---  MIDDLE_TASKS
---
-
-   procedure MIDDLE_TASKS (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      PREVIOUS_PRIORITY : RTEMS.TASK_PRIORITY;
-      STATUS            : RTEMS.STATUS_CODES;
-   begin
-
-      TMTEST.TASK_PRIORITY := TMTEST.TASK_PRIORITY - 1;
-      TMTEST.TASK_COUNT    := TMTEST.TASK_COUNT + 1;
-
-      RTEMS.TASK_SET_PRIORITY(
-         TMTEST.TASK_ID( TMTEST.TASK_COUNT ), 
-         TMTEST.TASK_PRIORITY,
-         PREVIOUS_PRIORITY,
-         STATUS 
-      );
-
-   end MIDDLE_TASKS;
-
---PAGE
--- 
---  LAST_TASK
---
-
-   procedure LAST_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-   begin
-
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "TASK_SET_PRIORITY (preemptive)", 
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         0,
-         RTEMS_CALLING_OVERHEAD.TASK_SET_PRIORITY 
-      );
-
-      RTEMS.SHUTDOWN_EXECUTIVE( 0 );
-
-   end LAST_TASK;
-
-end TMTEST;
diff --git a/c/src/ada-tests/tmtests/tm17/tmtest.ads b/c/src/ada-tests/tmtests/tm17/tmtest.ads
deleted file mode 100644
index e63a76fc62..0000000000
--- a/c/src/ada-tests/tmtests/tm17/tmtest.ads
+++ /dev/null
@@ -1,109 +0,0 @@
---
---  TMTEST / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package is the specification for Test 17 of the RTEMS
---  Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-with TIME_TEST_SUPPORT;
-with TIMER_DRIVER;
-
-package TMTEST is
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS tasks created
---  by this test.
---
-
-   TASK_ID   : array ( RTEMS.UNSIGNED32 
-      range 0 .. TIME_TEST_SUPPORT.OPERATION_COUNT ) of RTEMS.ID;
-   TASK_NAME : array ( RTEMS.UNSIGNED32 
-      range 0 .. TIME_TEST_SUPPORT.OPERATION_COUNT ) of RTEMS.NAME;
-
---
---  These variables are used to index the TASK_ID array and change
---  the priority of each successive task such that the TASK_SET_PRIORITY
---  results in a preemption.
---
-
-   TASK_COUNT     : RTEMS.UNSIGNED32;
-   TASK_PRIORITY  : RTEMS.TASK_PRIORITY;
-
---
---  The following variable is set to the execution time returned
---  by the timer.
---
-
-   END_TIME       : RTEMS.UNSIGNED32;
-
---
---  INIT
---
---  DESCRIPTION:
---
---  This RTEMS task initializes the application.
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  FIRST_TASK
---
---  DESCRIPTION:
---
---  This RTEMS task is the first task to execute in the system.  It
---  starts the timer and updates the TASK_COUNT and TASK_PRIORITY 
---  variables so that a preemptive TASK_SET_PRIORITY can be performed.
---
-
-   procedure FIRST_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  MIDDLE_TASK
---
---  DESCRIPTION:
---
---  These RTEMS tasks update the TASK_COUNT and TASK_PRIORITY variables
---  so that a preemptive TASK_SET_PRIORITY can be performed.
---
-
-   procedure MIDDLE_TASKS (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  LAST_TASK
---
---  DESCRIPTION:
---
---  This RTEMS task is the last task to execute in the system.  It
---  stops the timer and reports the execution time of a preemptive
---  TASK_SET_PRIORITY.
---
-
-   procedure LAST_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
-end TMTEST;
diff --git a/c/src/ada-tests/tmtests/tm18/config.h b/c/src/ada-tests/tmtests/tm18/config.h
deleted file mode 100644
index b82372ca0f..0000000000
--- a/c/src/ada-tests/tmtests/tm18/config.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*  config.h
- *
- *  This include file defines the Configuration Table for this test.
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-/* configuration information */
-
-#define CONFIGURE_TMTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
-
-#define CONFIGURE_MAXIMUM_TASKS              111
-#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES     1
-#define CONFIGURE_TICKS_PER_TIMESLICE        0
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#define CONFIGURE_MAXIMUM_POSIX_THREADS              10
-#define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
-#define CONFIGURE_MAXIMUM_POSIX_MUTEXES              20
-#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES  10
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/c/src/ada-tests/tmtests/tm18/tm18.adb b/c/src/ada-tests/tmtests/tm18/tm18.adb
deleted file mode 100644
index 207c78261e..0000000000
--- a/c/src/ada-tests/tmtests/tm18/tm18.adb
+++ /dev/null
@@ -1,57 +0,0 @@
---
---  MAIN / BODY
---
---  DESCRIPTION:
---
---  This is the entry point for Test TM18 of the Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-with TMTEST;
-with TEST_SUPPORT;
-
-procedure TM18 is
-  INIT_ID : RTEMS.ID;
-  STATUS  : RTEMS.STATUS_CODES;
-begin
-
-   RTEMS.TASK_CREATE(
-      RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
-      1,
-      RTEMS.MINIMUM_STACK_SIZE,
-      RTEMS.NO_PREEMPT,
-      RTEMS.DEFAULT_ATTRIBUTES,
-      INIT_ID,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
-
-
-   RTEMS.TASK_START(
-      INIT_ID,
-      TMTEST.INIT'ACCESS,
-      0,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
-
-   loop
-      delay 120.0;
-   end loop;
-
-end TM18;
-
diff --git a/c/src/ada-tests/tmtests/tm18/tmtest.adb b/c/src/ada-tests/tmtests/tm18/tmtest.adb
deleted file mode 100644
index 2603ed0c77..0000000000
--- a/c/src/ada-tests/tmtests/tm18/tmtest.adb
+++ /dev/null
@@ -1,154 +0,0 @@
---
---  TMTEST / BODY
---
---  DESCRIPTION:
---
---  This package is the implementation of Test 18 of the RTEMS
---  Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with INTERFACES; use INTERFACES;
-with RTEMS;
-with RTEMS_CALLING_OVERHEAD;
-with TEST_SUPPORT;
-with TEXT_IO;
-with TIME_TEST_SUPPORT;
-with UNSIGNED32_IO;
-
-package body TMTEST is
-
---PAGE
--- 
---  INIT
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS     : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** TIME TEST 18 ***" );
-
-      TMTEST.TEST_INIT;
-
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
-
-   end INIT;
-
---PAGE
--- 
---  TEST_INIT
---
-
-   procedure TEST_INIT
-   is
-      ID         : RTEMS.ID;
-      TASK_ENTRY : RTEMS.TASK_ENTRY;
-      INDEX      : RTEMS.UNSIGNED32;
-      STATUS     : RTEMS.STATUS_CODES;
-   begin
-
-      for INDEX in 0 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-      loop
-
-         RTEMS.TASK_CREATE( 
-            RTEMS.BUILD_NAME( 'T', 'I', 'M', 'E' ),
-            128,
-            1024, 
-            RTEMS.DEFAULT_MODES,
-            RTEMS.DEFAULT_ATTRIBUTES,
-            ID,
-            STATUS
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE LOOP" );
-
-
-         if INDEX = TIME_TEST_SUPPORT.OPERATION_COUNT then
-            TASK_ENTRY := TMTEST.LAST_TASK'ACCESS;
-         elsif INDEX = 0 then
-            TASK_ENTRY := TMTEST.FIRST_TASK'ACCESS;
-         else
-            TASK_ENTRY := TMTEST.MIDDLE_TASKS'ACCESS;
-         end if;
-
-         RTEMS.TASK_START( ID, TASK_ENTRY, 0, STATUS );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START LOOP" );
-
-      end loop;
-
-   end TEST_INIT;
-
---PAGE
--- 
---  FIRST_TASK
---
-
-   procedure FIRST_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      TIMER_DRIVER.INITIALIZE;
-
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-
-   end FIRST_TASK;
-
---PAGE
--- 
---  MIDDLE_TASKS
---
-
-   procedure MIDDLE_TASKS (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-
-   end MIDDLE_TASKS;
-
---PAGE
--- 
---  LAST_TASK
---
-
-   procedure LAST_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-   begin
-
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "TASK_DELETE (self)", 
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         0,
-         RTEMS_CALLING_OVERHEAD.TASK_DELETE 
-      );
-
-      RTEMS.SHUTDOWN_EXECUTIVE( 0 );
-
-   end LAST_TASK;
-
-end TMTEST;
diff --git a/c/src/ada-tests/tmtests/tm18/tmtest.ads b/c/src/ada-tests/tmtests/tm18/tmtest.ads
deleted file mode 100644
index 4fe81c9fcb..0000000000
--- a/c/src/ada-tests/tmtests/tm18/tmtest.ads
+++ /dev/null
@@ -1,97 +0,0 @@
---
---  TMTEST / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package is the specification for Test 18 of the RTEMS
---  Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-with TIME_TEST_SUPPORT;
-with TIMER_DRIVER;
-
-package TMTEST is
-
---
---  The following variable is set to the execution time returned
---  by the timer.
---
-
-   END_TIME       : RTEMS.UNSIGNED32;
-
---
---  INIT
---
---  DESCRIPTION:
---
---  This RTEMS task initializes the application.
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TEST_INIT
---
---  DESCRIPTION:
---
---  This subprogram performs test initialization.
---
-
-   procedure TEST_INIT;
-
---
---  FIRST_TASK
---
---  DESCRIPTION:
---
---  This RTEMS task is the first task to execute.  It starts the
---  timer and performs a TASK_DELETE on itself.
---
-
-   procedure FIRST_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  MIDDLE_TASK
---
---  DESCRIPTION:
---
---  These RTEMS tasks perform a TASK_DELETE on themselves.
---
-
-   procedure MIDDLE_TASKS (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  LAST_TASK
---
---  DESCRIPTION:
---
---  This RTEMS task is the last task to execute.  It stops the
---  timer and reports the execution time of a TASK_DELETE SELF.
---
-
-   procedure LAST_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
-end TMTEST;
diff --git a/c/src/ada-tests/tmtests/tm19/config.h b/c/src/ada-tests/tmtests/tm19/config.h
deleted file mode 100644
index b82372ca0f..0000000000
--- a/c/src/ada-tests/tmtests/tm19/config.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*  config.h
- *
- *  This include file defines the Configuration Table for this test.
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-/* configuration information */
-
-#define CONFIGURE_TMTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
-
-#define CONFIGURE_MAXIMUM_TASKS              111
-#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES     1
-#define CONFIGURE_TICKS_PER_TIMESLICE        0
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#define CONFIGURE_MAXIMUM_POSIX_THREADS              10
-#define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
-#define CONFIGURE_MAXIMUM_POSIX_MUTEXES              20
-#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES  10
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/c/src/ada-tests/tmtests/tm19/tm19.adb b/c/src/ada-tests/tmtests/tm19/tm19.adb
deleted file mode 100644
index 6e62411a10..0000000000
--- a/c/src/ada-tests/tmtests/tm19/tm19.adb
+++ /dev/null
@@ -1,57 +0,0 @@
---
---  MAIN / BODY
---
---  DESCRIPTION:
---
---  This is the entry point for Test TM19 of the Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-with TMTEST;
-with TEST_SUPPORT;
-
-procedure TM19 is
-  INIT_ID : RTEMS.ID;
-  STATUS  : RTEMS.STATUS_CODES;
-begin
-
-   RTEMS.TASK_CREATE(
-      RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
-      1,
-      RTEMS.MINIMUM_STACK_SIZE,
-      RTEMS.NO_PREEMPT,
-      RTEMS.DEFAULT_ATTRIBUTES,
-      INIT_ID,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
-
-
-   RTEMS.TASK_START(
-      INIT_ID,
-      TMTEST.INIT'ACCESS,
-      0,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
-
-   loop
-      delay 120.0;
-   end loop;
-
-end TM19;
-
diff --git a/c/src/ada-tests/tmtests/tm19/tmtest.adb b/c/src/ada-tests/tmtests/tm19/tmtest.adb
deleted file mode 100644
index 1beb25e26b..0000000000
--- a/c/src/ada-tests/tmtests/tm19/tmtest.adb
+++ /dev/null
@@ -1,287 +0,0 @@
---
---  TMTEST / BODY
---
---  DESCRIPTION:
---
---  This package is the implementation of Test 19 of the RTEMS
---  Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with INTERFACES; use INTERFACES;
-with RTEMS;
-with RTEMS_CALLING_OVERHEAD;
-with TEST_SUPPORT;
-with TEXT_IO;
-with TIME_TEST_SUPPORT;
-with UNSIGNED32_IO;
-
-package body TMTEST is
-
---PAGE
--- 
---  INIT
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** TIME TEST 19 ***" );
-
-      RTEMS.TASK_CREATE( 
-         RTEMS.BUILD_NAME( 'T', 'I', 'M', 'E' ),
-         128,
-         1024, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         TMTEST.TASK_ID( 1 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TASK1" );
-
-      RTEMS.TASK_START( 
-         TMTEST.TASK_ID( 1 ),
-         TMTEST.TASK_1'ACCESS, 
-         0, 
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TASK1" );
-
-      RTEMS.TASK_CREATE( 
-         RTEMS.BUILD_NAME( 'T', 'I', 'M', 'E' ),
-         127,
-         1024, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         TMTEST.TASK_ID( 2 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TASK2" );
-
-      RTEMS.TASK_START( 
-         TMTEST.TASK_ID( 2 ),
-         TMTEST.TASK_2'ACCESS, 
-         0, 
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TASK2" );
-
-      RTEMS.TASK_CREATE( 
-         RTEMS.BUILD_NAME( 'T', 'I', 'M', 'E' ),
-         126,
-         1024, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         TMTEST.TASK_ID( 3 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TASK3" );
-
-      RTEMS.TASK_START( 
-         TMTEST.TASK_ID( 3 ),
-         TMTEST.TASK_3'ACCESS, 
-         0, 
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TASK3" );
-
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
-
-   end INIT;
-
---PAGE
--- 
---  PROCESS_ASR_FOR_PASS_1
---
-
-   procedure PROCESS_ASR_FOR_PASS_1 (
-      SIGNALS : in     RTEMS.SIGNAL_SET
-   ) is
-      STATUS  : RTEMS.STATUS_CODES;
-   begin
-
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "SIGNAL_SEND (self)",
-         TMTEST.END_TIME, 
-         1,
-         0,
-         RTEMS_CALLING_OVERHEAD.SIGNAL_SEND 
-      );
-
-      TEXT_IO.PUT_LINE( "SIGNAL_ENTER (preemptive) na" );
-
-      TIMER_DRIVER.INITIALIZE;
-
-   end PROCESS_ASR_FOR_PASS_1;
-
---PAGE
--- 
---  PROCESS_ASR_FOR_PASS_2
---
-
-   procedure PROCESS_ASR_FOR_PASS_2 (
-      SIGNALS : in     RTEMS.SIGNAL_SET
-   ) is
-      STATUS  : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.PUT_LINE( "SIGNAL_ENTER (preemptive) na" );
-     
-      RTEMS.TASK_RESUME( TMTEST.TASK_ID( 3 ), STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_RESUME" );
-
-      TIMER_DRIVER.INITIALIZE;
-
-   end PROCESS_ASR_FOR_PASS_2;
-
---PAGE
--- 
---  TASK_1
---
-
-   procedure TASK_1 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS  : RTEMS.STATUS_CODES;
-   begin
-
-      TIMER_DRIVER.INITIALIZE;
-         RTEMS.SIGNAL_CATCH( 
-            TMTEST.PROCESS_ASR_FOR_PASS_1'ACCESS, 
-            RTEMS.DEFAULT_MODES,
-            STATUS 
-         );
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "SIGNAL_CATCH",
-         TMTEST.END_TIME, 
-         1,
-         0,
-         RTEMS_CALLING_OVERHEAD.SIGNAL_CATCH 
-      );
-
-      TIMER_DRIVER.INITIALIZE;
-         RTEMS.SIGNAL_SEND( TMTEST.TASK_ID( 2 ), RTEMS.SIGNAL_1, STATUS );
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "SIGNAL_SEND (non-preemptive)",
-         TMTEST.END_TIME, 
-         1,
-         0,
-         RTEMS_CALLING_OVERHEAD.SIGNAL_SEND 
-      );
-
-      TIMER_DRIVER.INITIALIZE;
-         RTEMS.SIGNAL_SEND( RTEMS.SELF, RTEMS.SIGNAL_1, STATUS );
-
-      -- end time is done in ASR
-
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "SIGNAL_RETURN (non-preemptive)",
-         TMTEST.END_TIME, 
-         1,
-         0,
-         0
-      );
-
-      RTEMS.SIGNAL_CATCH( 
-         TMTEST.PROCESS_ASR_FOR_PASS_2'ACCESS, 
-         RTEMS.NO_PREEMPT,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SIGNAL_CATCH" );
-
-      TIMER_DRIVER.INITIALIZE;
-         RTEMS.SIGNAL_SEND( RTEMS.SELF, RTEMS.SIGNAL_1, STATUS );
-
-   end TASK_1;
-
---PAGE
--- 
---  PROCESS_ASR_FOR_TASK_2
---
-
-   procedure PROCESS_ASR_FOR_TASK_2 (
-      SIGNALS : in     RTEMS.SIGNAL_SET
-   ) is
-      STATUS  : RTEMS.STATUS_CODES;
-   begin
-
-      NULL;
-
-   end PROCESS_ASR_FOR_TASK_2;
-
---PAGE
--- 
---  TASK_2
---
-
-   procedure TASK_2 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS  : RTEMS.STATUS_CODES;
-   begin
-
-      RTEMS.SIGNAL_CATCH( 
-         TMTEST.PROCESS_ASR_FOR_TASK_2'ACCESS, 
-         RTEMS.DEFAULT_MODES,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SIGNAL_CATCH" );
-
-      RTEMS.TASK_SUSPEND( RTEMS.SELF, STATUS );
-
-   end TASK_2;
-
---PAGE
--- 
---  TASK_3
---
-
-   procedure TASK_3 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      RTEMS.TASK_SUSPEND( RTEMS.SELF, STATUS );
-
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "SIGNAL_RETURN (preemptive)",
-         TMTEST.END_TIME, 
-         1,
-         0,
-         0
-     );
-
-     RTEMS.SHUTDOWN_EXECUTIVE( 0 );
-
-   end TASK_3;
-
-end TMTEST;
diff --git a/c/src/ada-tests/tmtests/tm19/tmtest.ads b/c/src/ada-tests/tmtests/tm19/tmtest.ads
deleted file mode 100644
index 2ac34a75fb..0000000000
--- a/c/src/ada-tests/tmtests/tm19/tmtest.ads
+++ /dev/null
@@ -1,144 +0,0 @@
---
---  TMTEST / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package is the specification for Test 19 of the RTEMS
---  Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-with TIME_TEST_SUPPORT;
-with TIMER_DRIVER;
-
-package TMTEST is
-
---
---  This array contains the IDs of all RTEMS tasks created by this test.
---
-
-   TASK_ID : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.ID;
-
---
---  The following variable is set to the execution time returned
---  by the timer.
---
-
-   END_TIME       : RTEMS.UNSIGNED32;
-
---
---  INIT
---
---  DESCRIPTION:
---
---  This RTEMS task initializes the application.
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  PROCESS_ASR_FOR_PASS_1
---
---  DESCRIPTION:
---
---  This subprogram is the ASR used to measure and report the 
---  execution time of a SIGNAL_SEND to SELF.  Before it exits
---  it starts the timer so that the execution time required to
---  exit from an ASR back to the same task can be measured.
---
-
-   procedure PROCESS_ASR_FOR_PASS_1 (
-      SIGNALS : in     RTEMS.SIGNAL_SET
-   );
-
---
---  PROCESS_ASR_FOR_PASS_2
---
---  DESCRIPTION:
---
---  This subprogram is the ASR which sets up for a preemptive
---  return from an ASR.  Before it exits it starts the timer 
---  so that the execution time required to exit from an ASR 
---  and transfer control to the another task can be measured.
---
-
-   procedure PROCESS_ASR_FOR_PASS_2 (
-      SIGNALS : in     RTEMS.SIGNAL_SET
-   );
-
---
---  TASK_1
---
---  DESCRIPTION:
---
---  This RTEMS task is responsible for measuring and reporting
---  the following execution times:
---
---    + SIGNAL_CATCH
---    + non-preemptive SIGNAL_SEND
---    + non-preemptive return from an ASR 
---
-
-   procedure TASK_1 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  PROCESS_ASR_FOR_TASK_2
---
---  DESCRIPTION:
---
---  This subprogram is the ASR for TASK_2.  It performs no actions.
---
-
-   procedure PROCESS_ASR_FOR_TASK_2 (
-      SIGNALS : in     RTEMS.SIGNAL_SET
-   );
-
---
---  TASK_2
---
---  DESCRIPTION:
---
---  This RTEMS task is used as the recipient of a SIGNAL_SEND. 
---  After establishing an ASR, it suspends itself to insure
---  that it does not execute again.
---
-
-   procedure TASK_2 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TASK_3
---
---  DESCRIPTION:
---
---  This RTEMS task is used as the recipient of a preemptive 
---  SIGNAL_SEND.  This task suspends itself and is resumed by 
---  an ASR for TASK_1.  Once the task executes, it stops the 
---  timer and reports the execution time for a preemptive 
---  return from an ASR.
---
-
-   procedure TASK_3 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
-end TMTEST;
diff --git a/c/src/ada-tests/tmtests/tm20/config.h b/c/src/ada-tests/tmtests/tm20/config.h
deleted file mode 100644
index 83d86e9b8c..0000000000
--- a/c/src/ada-tests/tmtests/tm20/config.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*  config.h
- *
- *  This include file defines the Configuration Table for this test.
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-/* configuration information */
-
-#define CONFIGURE_TMTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
-
-#define CONFIGURE_MAXIMUM_PARTITIONS         1
-#define CONFIGURE_MAXIMUM_REGIONS            1
-#define CONFIGURE_TICKS_PER_TIMESLICE        0
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#define CONFIGURE_MAXIMUM_POSIX_THREADS              10
-#define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
-#define CONFIGURE_MAXIMUM_POSIX_MUTEXES              20
-#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES  10
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/c/src/ada-tests/tmtests/tm20/tm20.adb b/c/src/ada-tests/tmtests/tm20/tm20.adb
deleted file mode 100644
index 4462a79bb9..0000000000
--- a/c/src/ada-tests/tmtests/tm20/tm20.adb
+++ /dev/null
@@ -1,57 +0,0 @@
---
---  MAIN / BODY
---
---  DESCRIPTION:
---
---  This is the entry point for Test TM20 of the Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-with TMTEST;
-with TEST_SUPPORT;
-
-procedure TM20 is
-  INIT_ID : RTEMS.ID;
-  STATUS  : RTEMS.STATUS_CODES;
-begin
-
-   RTEMS.TASK_CREATE(
-      RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
-      1,
-      RTEMS.MINIMUM_STACK_SIZE,
-      RTEMS.NO_PREEMPT,
-      RTEMS.DEFAULT_ATTRIBUTES,
-      INIT_ID,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
-
-
-   RTEMS.TASK_START(
-      INIT_ID,
-      TMTEST.INIT'ACCESS,
-      0,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
-
-   loop
-      delay 120.0;
-   end loop;
-
-end TM20;
-
diff --git a/c/src/ada-tests/tmtests/tm20/tmtest.adb b/c/src/ada-tests/tmtests/tm20/tmtest.adb
deleted file mode 100644
index 6b17059e35..0000000000
--- a/c/src/ada-tests/tmtests/tm20/tmtest.adb
+++ /dev/null
@@ -1,588 +0,0 @@
---
---  TMTEST / BODY
---
---  DESCRIPTION:
---
---  This package is the implementation of Test 20 of the RTEMS
---  Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with INTERFACES; use INTERFACES;
-with RTEMS;
-with RTEMS_CALLING_OVERHEAD;
-with TEST_SUPPORT;
-with TEXT_IO;
-with TIME_TEST_SUPPORT;
-with UNSIGNED32_IO;
-
-package body TMTEST is
-
---PAGE
--- 
---  INIT
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS     : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** TIME TEST 20 ***" );
-
-      RTEMS.TASK_CREATE( 
-         RTEMS.BUILD_NAME( 'T', 'I', 'M', '1' ),
-         128,
-         2048, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         TMTEST.TASK_ID( 1 ), 
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TASK1" );
-
-      RTEMS.TASK_START( 
-         TMTEST.TASK_ID( 1 ), 
-         TMTEST.TASK_1'ACCESS, 
-         0, 
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TASK1" );
-
-      RTEMS.TASK_CREATE( 
-         RTEMS.BUILD_NAME( 'T', 'I', 'M', '2' ),
-         129,
-         2048, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         TMTEST.TASK_ID( 2 ), 
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TASK2" );
-
-      RTEMS.TASK_START( 
-         TMTEST.TASK_ID( 2 ), 
-         TMTEST.TASK_2'ACCESS, 
-         0, 
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TASK2" );
-
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
-
-   end INIT;
-
---PAGE
--- 
---  TASK_1
---
-
-   procedure TASK_1 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      BUFFER_COUNT      : RTEMS.UNSIGNED32;
-      INDEX             : RTEMS.UNSIGNED32;
-      PREVIOUS_MODE     : RTEMS.MODE;
-      PREVIOUS_PRIORITY : RTEMS.TASK_PRIORITY;
-      RETURN_VALUE      : RTEMS.UNSIGNED32;
-      OVERHEAD          : RTEMS.UNSIGNED32;
-      STATUS            : RTEMS.STATUS_CODES;
-   begin
-
-      TMTEST.PARTITION_NAME := RTEMS.BUILD_NAME( 'P', 'A', 'R', 'T' );
-
-      TIMER_DRIVER.INITIALIZE;
-
-         RTEMS.PARTITION_CREATE(
-            TMTEST.PARTITION_NAME,
-            TMTEST.PARTITION_AREA'ADDRESS,
-            2048,
-            128,
-            RTEMS.DEFAULT_ATTRIBUTES,
-            TMTEST.PARTITION_ID,
-            STATUS 
-         );
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "PARTITION_CREATE",
-         TMTEST.END_TIME, 
-         1,
-         0,
-         RTEMS_CALLING_OVERHEAD.PARTITION_CREATE 
-      );
-
-      TMTEST.REGION_NAME := RTEMS.BUILD_NAME( 'R', 'E', 'G', 'N' );
-
-      TIMER_DRIVER.INITIALIZE;
-
-         RTEMS.REGION_CREATE(
-            TMTEST.REGION_NAME,
-            TMTEST.REGION_AREA'ADDRESS,
-            2048,
-            16,
-            RTEMS.DEFAULT_ATTRIBUTES,
-            TMTEST.REGION_ID,
-            STATUS 
-         );
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "REGION_CREATE",
-         TMTEST.END_TIME, 
-         1,
-         0,
-         RTEMS_CALLING_OVERHEAD.REGION_CREATE 
-      );
-
-      TIMER_DRIVER.INITIALIZE;
-         RTEMS.PARTITION_GET_BUFFER(
-            TMTEST.PARTITION_ID,
-            TMTEST.BUFFER_ADDRESS_1,
-            STATUS 
-         );
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "PARTITION_GET_BUFFER (available)",
-         TMTEST.END_TIME, 
-         1,
-         0,
-         RTEMS_CALLING_OVERHEAD.PARTITION_GET_BUFFER 
-      );
-
-      BUFFER_COUNT := 0;
-      loop 
-
-         RTEMS.PARTITION_GET_BUFFER(
-            TMTEST.PARTITION_ID,
-            TMTEST.BUFFER_ADDRESSES( BUFFER_COUNT ),
-            STATUS 
-         );
-
-         exit when RTEMS.ARE_STATUSES_EQUAL( STATUS, RTEMS.UNSATISFIED );
-
-         BUFFER_COUNT := BUFFER_COUNT + 1;
-
-      end loop;
-
-      TIMER_DRIVER.INITIALIZE;
-         RTEMS.PARTITION_GET_BUFFER(
-            TMTEST.PARTITION_ID,
-            TMTEST.BUFFER_ADDRESS_2,
-            STATUS 
-         );
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "PARTITION_GET_BUFFER (not available)",
-         TMTEST.END_TIME, 
-         1,
-         0,
-         RTEMS_CALLING_OVERHEAD.PARTITION_GET_BUFFER 
-      );
-
-      TIMER_DRIVER.INITIALIZE;
-         RTEMS.PARTITION_RETURN_BUFFER(
-            TMTEST.PARTITION_ID,
-            TMTEST.BUFFER_ADDRESS_1,
-            STATUS 
-         );
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "PARTITION_RETURN_BUFFER",
-         TMTEST.END_TIME, 
-         1,
-         0,
-         RTEMS_CALLING_OVERHEAD.PARTITION_RETURN_BUFFER 
-      );
-
-      for INDEX in 0 .. BUFFER_COUNT - 1
-      loop
-
-         RTEMS.PARTITION_RETURN_BUFFER(
-            TMTEST.PARTITION_ID,
-            TMTEST.BUFFER_ADDRESSES( INDEX ),
-            STATUS 
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "PARTITION_RETURN_BUFFER" );
-
-      end loop;
-
-      TIMER_DRIVER.INITIALIZE;
-         RTEMS.PARTITION_DELETE( TMTEST.PARTITION_ID, STATUS );
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "PARTITION_DELETE",
-         TMTEST.END_TIME, 
-         1,
-         0,
-         RTEMS_CALLING_OVERHEAD.PARTITION_DELETE 
-      );
-
-      RTEMS.REGION_GET_SEGMENT(
-         TMTEST.REGION_ID,
-         400,
-         RTEMS.DEFAULT_OPTIONS,
-         RTEMS.NO_TIMEOUT,
-         TMTEST.BUFFER_ADDRESS_2,
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_GET_SEGMENT" );
-
-      TIMER_DRIVER.INITIALIZE;
-         RTEMS.REGION_GET_SEGMENT(
-            TMTEST.REGION_ID,
-            400,
-            RTEMS.DEFAULT_OPTIONS,
-            RTEMS.NO_TIMEOUT,
-            TMTEST.BUFFER_ADDRESS_3,
-            STATUS 
-         );
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "REGION_GET_SEGMENT (available)",
-         TMTEST.END_TIME, 
-         1,
-         0,
-         RTEMS_CALLING_OVERHEAD.REGION_GET_SEGMENT 
-      );
-
-      TIMER_DRIVER.INITIALIZE;
-         RTEMS.REGION_GET_SEGMENT(
-            TMTEST.REGION_ID,
-            1998,
-            RTEMS.NO_WAIT,
-            RTEMS.NO_TIMEOUT,
-            TMTEST.BUFFER_ADDRESS_4,
-            STATUS 
-         );
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "REGION_GET_SEGMENT (NO_WAIT)",
-         TMTEST.END_TIME, 
-         1,
-         0,
-         RTEMS_CALLING_OVERHEAD.REGION_GET_SEGMENT 
-      );
-
-      RTEMS.REGION_RETURN_SEGMENT(
-         TMTEST.REGION_ID,
-         TMTEST.BUFFER_ADDRESS_3,
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_RETURN_SEGMENT" );
-
-      TIMER_DRIVER.INITIALIZE;
-         RTEMS.REGION_RETURN_SEGMENT(
-            TMTEST.REGION_ID,
-            TMTEST.BUFFER_ADDRESS_2,
-            STATUS 
-         );
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "REGION_RETURN_SEGMENT (no tasks waiting)",
-         TMTEST.END_TIME, 
-         1,
-         0,
-         RTEMS_CALLING_OVERHEAD.REGION_RETURN_SEGMENT 
-      );
-
-      RTEMS.REGION_GET_SEGMENT(
-         TMTEST.REGION_ID,
-         400,
-         RTEMS.DEFAULT_OPTIONS,
-         RTEMS.NO_TIMEOUT,
-         TMTEST.BUFFER_ADDRESS_1,
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_GET_SEGMENT" );
-
-      TIMER_DRIVER.INITIALIZE;
-         RTEMS.REGION_GET_SEGMENT(
-            TMTEST.REGION_ID,
-            1998,
-            RTEMS.DEFAULT_OPTIONS,
-            RTEMS.NO_TIMEOUT,
-            TMTEST.BUFFER_ADDRESS_2,
-            STATUS 
-         );
-
-      -- execute TASK_2
-
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "REGION_RETURN_SEGMENT (preempt)",
-         TMTEST.END_TIME, 
-         1,
-         0,
-         RTEMS_CALLING_OVERHEAD.REGION_RETURN_SEGMENT 
-      );
-
-      RTEMS.REGION_RETURN_SEGMENT(
-         TMTEST.REGION_ID,
-         TMTEST.BUFFER_ADDRESS_2,
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_RETURN_SEGMENT" );
-
-      RTEMS.TASK_MODE(
-         RTEMS.NO_PREEMPT,
-         RTEMS.PREEMPT_MASK,
-         PREVIOUS_MODE,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_MODE" );
-
-      RTEMS.TASK_SET_PRIORITY( RTEMS.SELF, 254, PREVIOUS_PRIORITY, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SET_PRIORITY" );
-
-      RTEMS.REGION_GET_SEGMENT(
-         TMTEST.REGION_ID,
-         400,
-         RTEMS.DEFAULT_OPTIONS,
-         RTEMS.NO_TIMEOUT,
-         TMTEST.BUFFER_ADDRESS_1,
-         STATUS 
-      );
-
-      RTEMS.REGION_GET_SEGMENT(
-         TMTEST.REGION_ID,
-         1998,
-         RTEMS.DEFAULT_OPTIONS,
-         RTEMS.NO_TIMEOUT,
-         TMTEST.BUFFER_ADDRESS_2,
-         STATUS 
-      );
- 
-      -- execute TASK_2
-
-      RTEMS.REGION_RETURN_SEGMENT(
-         TMTEST.REGION_ID,
-         TMTEST.BUFFER_ADDRESS_2,
-         STATUS 
-      );
-
-      TIMER_DRIVER.INITIALIZE;
-         RTEMS.REGION_DELETE( TMTEST.REGION_ID, STATUS );
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "REGION_DELETE",
-         TMTEST.END_TIME, 
-         1,
-         0,
-         RTEMS_CALLING_OVERHEAD.REGION_DELETE 
-      );
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            TIMER_DRIVER.EMPTY_FUNCTION;
-         end loop;
-      OVERHEAD := TIMER_DRIVER.READ_TIMER;
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            RTEMS.IO_INITIALIZE(
-               1, 
-               0,
-               RTEMS.NULL_ADDRESS,
-               RETURN_VALUE,
-               STATUS
-            );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "IO_INITIALIZE",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT,
-         0,
-         RTEMS_CALLING_OVERHEAD.IO_INITIALIZE 
-      );
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            RTEMS.IO_OPEN(
-               1, 
-               0,
-               RTEMS.NULL_ADDRESS,
-               RETURN_VALUE,
-               STATUS
-            );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "IO_OPEN",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT,
-         0,
-         RTEMS_CALLING_OVERHEAD.IO_OPEN 
-      );
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            RTEMS.IO_CLOSE(
-               1, 
-               0,
-               RTEMS.NULL_ADDRESS,
-               RETURN_VALUE,
-               STATUS
-            );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "IO_CLOSE",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT,
-         0,
-         RTEMS_CALLING_OVERHEAD.IO_CLOSE 
-      );
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            RTEMS.IO_READ(
-               1, 
-               0,
-               RTEMS.NULL_ADDRESS,
-               RETURN_VALUE,
-               STATUS
-            );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "IO_READ",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT,
-         0,
-         RTEMS_CALLING_OVERHEAD.IO_READ 
-      );
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            RTEMS.IO_WRITE(
-               1, 
-               0,
-               RTEMS.NULL_ADDRESS,
-               RETURN_VALUE,
-               STATUS
-            );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "IO_WRITE",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT,
-         0,
-         RTEMS_CALLING_OVERHEAD.IO_WRITE 
-      );
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            RTEMS.IO_CONTROL(
-               1, 
-               0,
-               RTEMS.NULL_ADDRESS,
-               RETURN_VALUE,
-               STATUS
-            );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "IO_CONTROL",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT,
-         0,
-         RTEMS_CALLING_OVERHEAD.IO_CONTROL 
-      );
-
-      RTEMS.SHUTDOWN_EXECUTIVE( 0 );
-
-   end TASK_1;
-
---PAGE
--- 
---  TASK_2
---
-
-   procedure TASK_2 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS            : RTEMS.STATUS_CODES;
-   begin
-
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "REGION_GET_SEGMENT (blocking)",
-         TMTEST.END_TIME, 
-         1,
-         0,
-         RTEMS_CALLING_OVERHEAD.REGION_GET_SEGMENT 
-      );
-
-      TIMER_DRIVER.INITIALIZE;
-         RTEMS.REGION_RETURN_SEGMENT(
-            TMTEST.REGION_ID,
-            TMTEST.BUFFER_ADDRESS_1,
-            STATUS 
-         );
-
-      -- preempt back to TASK_1
-
-      TIMER_DRIVER.INITIALIZE;
-         RTEMS.REGION_RETURN_SEGMENT(
-            TMTEST.REGION_ID,
-            TMTEST.BUFFER_ADDRESS_1,
-            STATUS 
-         );
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "REGION_RETURN_SEGMENT (ready -- return)",
-         TMTEST.END_TIME, 
-         1,
-         0,
-         RTEMS_CALLING_OVERHEAD.REGION_RETURN_SEGMENT 
-      );
-
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
-
-   end TASK_2;
-
-end TMTEST;
diff --git a/c/src/ada-tests/tmtests/tm20/tmtest.ads b/c/src/ada-tests/tmtests/tm20/tmtest.ads
deleted file mode 100644
index cf1dfeaaa1..0000000000
--- a/c/src/ada-tests/tmtests/tm20/tmtest.ads
+++ /dev/null
@@ -1,151 +0,0 @@
---
---  TMTEST / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package is the specification for Test 20 of the RTEMS
---  Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with TIME_TEST_SUPPORT;
-with TIMER_DRIVER;
-with RTEMS;
-
-package TMTEST is
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS tasks created
---  by this test.
---
-
-   TASK_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.ID;
-   TASK_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.NAME;
-
---
---  These following are the ID and NAME of the RTEMS partition created
---  by this test.
---
-
-   PARTITION_ID   : RTEMS.ID;
-   PARTITION_NAME : RTEMS.NAME;
-
---
---  These following are the ID and NAME of the RTEMS region created
---  by this test.
---
-
-   REGION_ID   : RTEMS.ID;
-   REGION_NAME : RTEMS.NAME;
-
---
---  The following area defines a memory area to be used as the
---  memory space for a partition.
--- 
-
-   PARTITION_AREA : array ( RTEMS.UNSIGNED32 range 0 .. 2047 )
-      of RTEMS.UNSIGNED8;
-   for PARTITION_AREA'ALIGNMENT use RTEMS.STRUCTURE_ALIGNMENT;
-
---
---  The following area defines a memory area to be used as the
---  memory space for a region.
--- 
-
-   REGION_AREA : array ( RTEMS.UNSIGNED32 range 0 .. 2047 )
-      of RTEMS.UNSIGNED8;
-
-   for REGION_AREA'ALIGNMENT use RTEMS.STRUCTURE_ALIGNMENT;
-
---
---  The following are the buffers allocated from the region.
---
-
-   BUFFER_ADDRESS_1 : RTEMS.ADDRESS;
-   BUFFER_ADDRESS_2 : RTEMS.ADDRESS;
-   BUFFER_ADDRESS_3 : RTEMS.ADDRESS;
-   BUFFER_ADDRESS_4 : RTEMS.ADDRESS;
-
-   BUFFER_ADDRESSES : array ( RTEMS.UNSIGNED32 
-      range 0 .. TIME_TEST_SUPPORT.OPERATION_COUNT ) of RTEMS.ADDRESS;
-
---
---  The following variable is set to the execution time returned
---  by the timer.
---
-
-   END_TIME  : RTEMS.UNSIGNED32;
-
---
---  INIT
---
---  DESCRIPTION:
---
---  This RTEMS task initializes the application.
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TASK_1
---
---  DESCRIPTION:
---
---  This RTEMS task is responsible for measuring and reporting
---  the following execution times:
---
---    + PARTITION_CREATE
---    + REGION_CREATE
---    + PARTITION_GET_BUFFER with a buffer available
---    + PARTITION_GET_BUFFER with no buffers available
---    + PARTITION_RETURN_BUFFER
---    + PARTITION_DELETE
---    + REGION_GET_SEGMENT with a segment available
---    + REGION_GET_SEGMENT with the NO_WAIT option
---    + REGION_RETURN_SEGMENT with no tasks waiting for memory
---    + REGION_RETURN_SEGMENT preemptive
---    + REGION_DELETE
---    + IO_INITIALIZE
---    + IO_OPEN
---    + IO_CLOSE
---    + IO_READ
---    + IO_WRITE
---    + IO_CONTROL
---
-
-   procedure TASK_1 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TASK_2
---
---  DESCRIPTION:
---
---  This RTEMS task is responsible for measuring and reporting
---  the following execution times:
---
---    + blocking REGION_GET_SEGMENT 
---    + REGION_RETURN_SEGMENT which readies a task
---
-
-   procedure TASK_2 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
-end TMTEST;
diff --git a/c/src/ada-tests/tmtests/tm21/config.h b/c/src/ada-tests/tmtests/tm21/config.h
deleted file mode 100644
index 43d589d0f0..0000000000
--- a/c/src/ada-tests/tmtests/tm21/config.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*  config.h
- *
- *  This include file defines the Configuration Table for this test.
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-/* configuration information */
-
-#define CONFIGURE_TMTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
-
-#define CONFIGURE_MAXIMUM_TASKS              102
-#define CONFIGURE_MAXIMUM_TIMERS             100
-#define CONFIGURE_MAXIMUM_SEMAPHORES         100
-#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES     100
-#define CONFIGURE_MAXIMUM_PARTITIONS         100
-#define CONFIGURE_MAXIMUM_REGIONS            100
-#define CONFIGURE_MAXIMUM_PORTS              100
-#define CONFIGURE_MAXIMUM_PERIODS            100
-#define CONFIGURE_TICKS_PER_TIMESLICE        0
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#define CONFIGURE_MAXIMUM_POSIX_THREADS              10
-#define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
-#define CONFIGURE_MAXIMUM_POSIX_MUTEXES              20
-#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES  10
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/c/src/ada-tests/tmtests/tm21/tm21.adb b/c/src/ada-tests/tmtests/tm21/tm21.adb
deleted file mode 100644
index 05958d5ad5..0000000000
--- a/c/src/ada-tests/tmtests/tm21/tm21.adb
+++ /dev/null
@@ -1,57 +0,0 @@
---
---  MAIN / BODY
---
---  DESCRIPTION:
---
---  This is the entry point for Test TM21 of the Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-with TMTEST;
-with TEST_SUPPORT;
-
-procedure TM21 is
-  INIT_ID : RTEMS.ID;
-  STATUS  : RTEMS.STATUS_CODES;
-begin
-
-   RTEMS.TASK_CREATE(
-      RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
-      1,
-      RTEMS.MINIMUM_STACK_SIZE,
-      RTEMS.NO_PREEMPT,
-      RTEMS.DEFAULT_ATTRIBUTES,
-      INIT_ID,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
-
-
-   RTEMS.TASK_START(
-      INIT_ID,
-      TMTEST.INIT'ACCESS,
-      0,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
-
-   loop
-      delay 120.0;
-   end loop;
-
-end TM21;
-
diff --git a/c/src/ada-tests/tmtests/tm21/tmtest.adb b/c/src/ada-tests/tmtests/tm21/tmtest.adb
deleted file mode 100644
index 51ea93cc8b..0000000000
--- a/c/src/ada-tests/tmtests/tm21/tmtest.adb
+++ /dev/null
@@ -1,302 +0,0 @@
---
---  TMTEST / BODY
---
---  DESCRIPTION:
---
---  This package is the implementation of Test 21 of the RTEMS
---  Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with INTERFACES; use INTERFACES;
-with RTEMS;
-with RTEMS_CALLING_OVERHEAD;
-with TEST_SUPPORT;
-with TEXT_IO;
-with TIME_TEST_SUPPORT;
-with UNSIGNED32_IO;
-
-package body TMTEST is
-
---PAGE
--- 
---  INIT
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      ID     : RTEMS.ID;
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** TIME TEST 21 ***" );
-
-      RTEMS.TASK_CREATE( 
-         RTEMS.BUILD_NAME( 'T', 'I', 'M', 'E' ),
-         250,
-         2048, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         ID,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE TASK_1" );
-
-      RTEMS.TASK_START( ID, TMTEST.TASK_1'ACCESS, 0, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START TASK1" );
-
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
-
-   end INIT;
-
---PAGE
--- 
---  TASK_1
---
-
-   procedure TASK_1 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      INDEX    : RTEMS.UNSIGNED32;
-      ID       : RTEMS.ID;
-      OVERHEAD : RTEMS.UNSIGNED32;
-      STATUS   : RTEMS.STATUS_CODES;
-   begin
-
-      for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-      loop
-
-         RTEMS.TASK_CREATE( 
-            INDEX,
-            254,
-            1024, 
-            RTEMS.DEFAULT_MODES,
-            RTEMS.DEFAULT_ATTRIBUTES,
-            ID,
-            STATUS
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE" );
-
-         RTEMS.MESSAGE_QUEUE_CREATE( 
-            INDEX,
-            TIME_TEST_SUPPORT.OPERATION_COUNT,
-            16,
-            RTEMS.DEFAULT_ATTRIBUTES,
-            ID,
-            STATUS
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_CREATE" );
-
-         RTEMS.SEMAPHORE_CREATE( 
-            INDEX,
-            TIME_TEST_SUPPORT.OPERATION_COUNT,
-            RTEMS.DEFAULT_ATTRIBUTES,
-            RTEMS.NO_PRIORITY,
-            ID,
-            STATUS
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_CREATE" );
-
-         RTEMS.REGION_CREATE( 
-            INDEX,
-            TMTEST.REGION_AREA'ADDRESS,
-            2048,
-            16,
-            RTEMS.DEFAULT_ATTRIBUTES,
-            ID,
-            STATUS
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "REGION_CREATE" );
-
-         RTEMS.PARTITION_CREATE( 
-            INDEX,
-            TMTEST.PARTITION_AREA'ADDRESS,
-            2048,
-            128,
-            RTEMS.DEFAULT_ATTRIBUTES,
-            ID,
-            STATUS
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "PARTITION_CREATE" );
-
-         RTEMS.PORT_CREATE( 
-            INDEX,
-            TMTEST.INTERNAL_PORT_AREA'ADDRESS,
-            TMTEST.EXTERNAL_PORT_AREA'ADDRESS,
-            16#FF#,
-            ID,
-            STATUS
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "PORT_CREATE" );
-
-         RTEMS.TIMER_CREATE( INDEX, ID, STATUS );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_CREATE" );
-
-         RTEMS.RATE_MONOTONIC_CREATE( INDEX, ID, STATUS );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "RATE_MONOTONIC_CREATE" );
-
-      end loop;
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            TIMER_DRIVER.EMPTY_FUNCTION;
-         end loop;
-      OVERHEAD := TIMER_DRIVER.READ_TIMER;
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            RTEMS.TASK_IDENT( INDEX, RTEMS.SEARCH_ALL_NODES, ID, STATUS );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "TASK_IDENT",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         RTEMS_CALLING_OVERHEAD.TASK_IDENT 
-      );
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            RTEMS.MESSAGE_QUEUE_IDENT( 
-               INDEX, 
-               RTEMS.SEARCH_ALL_NODES, 
-               ID, 
-               STATUS 
-            );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "MESSAGE_QUEUE_IDENT",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         RTEMS_CALLING_OVERHEAD.MESSAGE_QUEUE_IDENT
-      );
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            RTEMS.SEMAPHORE_IDENT( 
-               INDEX, 
-               RTEMS.SEARCH_ALL_NODES, 
-               ID, 
-               STATUS 
-           );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "SEMAPHORE_IDENT",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         RTEMS_CALLING_OVERHEAD.SEMAPHORE_IDENT
-      );
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            RTEMS.PARTITION_IDENT( 
-               INDEX, 
-               RTEMS.SEARCH_ALL_NODES, 
-               ID, 
-               STATUS 
-           );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "PARTITION_IDENT",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         RTEMS_CALLING_OVERHEAD.PARTITION_IDENT
-      );
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            RTEMS.REGION_IDENT( INDEX, ID, STATUS );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "REGION_IDENT",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         RTEMS_CALLING_OVERHEAD.REGION_IDENT
-      );
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            RTEMS.PORT_IDENT( INDEX, ID, STATUS );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "PORT_IDENT",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         RTEMS_CALLING_OVERHEAD.PORT_IDENT
-      );
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            RTEMS.TIMER_IDENT( INDEX, ID, STATUS );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "TIMER_IDENT",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         RTEMS_CALLING_OVERHEAD.TIMER_IDENT
-      );
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            RTEMS.RATE_MONOTONIC_IDENT( INDEX, ID, STATUS );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "RATE_MONOTONIC_IDENT",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         RTEMS_CALLING_OVERHEAD.RATE_MONOTONIC_IDENT
-      );
-
-      RTEMS.SHUTDOWN_EXECUTIVE( 0 );
-
-   end TASK_1;
-
-end TMTEST;
diff --git a/c/src/ada-tests/tmtests/tm21/tmtest.ads b/c/src/ada-tests/tmtests/tm21/tmtest.ads
deleted file mode 100644
index 36d687256f..0000000000
--- a/c/src/ada-tests/tmtests/tm21/tmtest.ads
+++ /dev/null
@@ -1,122 +0,0 @@
---
---  TMTEST / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package is the specification for Test 21 of the RTEMS
---  Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-with SYSTEM;
-with TIMER_DRIVER;
-with System.Storage_Elements;
-
-package TMTEST is
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS tasks created
---  by this test.
---
-
-   TASK_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.ID;
-   TASK_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.NAME;
-
---
---  The following variable is set to the execution time returned
---  by the timer.
---
-
-   END_TIME  : RTEMS.UNSIGNED32;
-
---
---  The following area defines a memory area to be used as the
---  internal address space of the port.
--- 
-
-   INTERNAL_PORT_AREA_ADDRESS : constant System.Address :=
-      System.Storage_Elements.To_Address(16#00001000#);
-
-   INTERNAL_PORT_AREA : array ( RTEMS.UNSIGNED32 range 0 .. 255 )
-      of RTEMS.UNSIGNED8;
-   for INTERNAL_PORT_AREA use at INTERNAL_PORT_AREA_ADDRESS;
-
---
---  The following area defines a memory area to be used as the
---  external address space of the port.
--- 
-
-   EXTERNAL_PORT_AREA_ADDRESS : constant System.Address :=
-      System.Storage_Elements.To_Address(16#00002000#);
-
-   EXTERNAL_PORT_AREA : array ( RTEMS.UNSIGNED32 range 0 .. 255 )
-      of RTEMS.UNSIGNED8;
-   for EXTERNAL_PORT_AREA use at EXTERNAL_PORT_AREA_ADDRESS;
-
---
---  The following area defines a memory area to be used as the
---  memory space for a partition.
--- 
-
-   PARTITION_AREA : array ( RTEMS.UNSIGNED32 range 0 .. 2047 )
-      of RTEMS.UNSIGNED8;
-   for PARTITION_AREA'ALIGNMENT use RTEMS.STRUCTURE_ALIGNMENT;
-
---
---  These following are the ID and NAME of the RTEMS region created
---  by this test.
---
-
-   REGION_AREA : array ( RTEMS.UNSIGNED32 range 0 .. 2047 )
-      of RTEMS.UNSIGNED8;
-   for REGION_AREA'ALIGNMENT use RTEMS.STRUCTURE_ALIGNMENT;
-
---
---  INIT
---
---  DESCRIPTION:
---
---  This RTEMS task initializes the application.
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TASK_1
---
---  DESCRIPTION:
---
---  This RTEMS task is responsible for measuring and reporting the
---  following directive execution times:
---
---    + TASK_IDENT
---    + MESSAGE_QUEUE_IDENT
---    + SEMAPHORE_IDENT
---    + PARTITION_IDENT
---    + REGION_IDENT
---    + PORT_IDENT
---    + TIMER_IDENT
---    + RATE_MONOTONIC_IDENT
---
-
-   procedure TASK_1 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
-end TMTEST;
diff --git a/c/src/ada-tests/tmtests/tm22/config.h b/c/src/ada-tests/tmtests/tm22/config.h
deleted file mode 100644
index a9d518d83e..0000000000
--- a/c/src/ada-tests/tmtests/tm22/config.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*  config.h
- *
- *  This include file defines the Configuration Table for this test.
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-/* configuration information */
-
-#define CONFIGURE_TMTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
-
-#define CONFIGURE_MAXIMUM_TASKS              103
-#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES     1
-#define CONFIGURE_TICKS_PER_TIMESLICE        0
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#define CONFIGURE_MAXIMUM_POSIX_THREADS              10
-#define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
-#define CONFIGURE_MAXIMUM_POSIX_MUTEXES              20
-#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES  10
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/c/src/ada-tests/tmtests/tm22/tm22.adb b/c/src/ada-tests/tmtests/tm22/tm22.adb
deleted file mode 100644
index 037168ddcf..0000000000
--- a/c/src/ada-tests/tmtests/tm22/tm22.adb
+++ /dev/null
@@ -1,57 +0,0 @@
---
---  MAIN / BODY
---
---  DESCRIPTION:
---
---  This is the entry point for Test TM22 of the Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-with TMTEST;
-with TEST_SUPPORT;
-
-procedure TM22 is
-  INIT_ID : RTEMS.ID;
-  STATUS  : RTEMS.STATUS_CODES;
-begin
-
-   RTEMS.TASK_CREATE(
-      RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
-      1,
-      RTEMS.MINIMUM_STACK_SIZE,
-      RTEMS.NO_PREEMPT,
-      RTEMS.DEFAULT_ATTRIBUTES,
-      INIT_ID,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
-
-
-   RTEMS.TASK_START(
-      INIT_ID,
-      TMTEST.INIT'ACCESS,
-      0,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
-
-   loop
-      delay 120.0;
-   end loop;
-
-end TM22;
-
diff --git a/c/src/ada-tests/tmtests/tm22/tmtest.adb b/c/src/ada-tests/tmtests/tm22/tmtest.adb
deleted file mode 100644
index d1a2c3cf29..0000000000
--- a/c/src/ada-tests/tmtests/tm22/tmtest.adb
+++ /dev/null
@@ -1,256 +0,0 @@
---
---  TMTEST / BODY
---
---  DESCRIPTION:
---
---  This package is the implementation of Test 22 of the RTEMS
---  Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with INTERFACES; use INTERFACES;
-with RTEMS;
-with RTEMS_CALLING_OVERHEAD;
-with TEST_SUPPORT;
-with TEXT_IO;
-with TIME_TEST_SUPPORT;
-with UNSIGNED32_IO;
-
-package body TMTEST is
-
---PAGE
--- 
---  INIT
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      ID     : RTEMS.ID;
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** TIME TEST 22 ***" );
-
-      RTEMS.MESSAGE_QUEUE_CREATE( 
-         RTEMS.BUILD_NAME( 'M', 'Q', '1', ' ' ),
-         100,
-         16,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         TMTEST.MESSAGE_QUEUE_ID,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_CREATE" );
-
-      RTEMS.TASK_CREATE( 
-         RTEMS.BUILD_NAME( 'L', 'O', 'W', ' ' ), 
-         10,
-         2048, 
-         RTEMS.NO_PREEMPT,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         ID,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE LOW" );
-
-      RTEMS.TASK_START( ID, TMTEST.LOW_TASK'ACCESS, 0, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START LOW" );
-
-      RTEMS.TASK_CREATE( 
-         RTEMS.BUILD_NAME( 'P', 'R', 'M', 'T' ),
-         11,
-         2048, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         ID,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE PREEMPT" );
-
-      RTEMS.TASK_START( ID, TMTEST.PREEMPT_TASK'ACCESS, 0, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START PREEMPT" );
-
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
-
-   end INIT;
-
---PAGE
--- 
---  HIGH_TASK
---
-
-   procedure HIGH_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      BUFFER         : TMTEST.BUFFER;
-      BUFFER_POINTER : RTEMS.ADDRESS;
-      COUNT          : RTEMS.UNSIGNED32;
-      STATUS         : RTEMS.STATUS_CODES;
-   begin
-
-      BUFFER_POINTER := BUFFER'ADDRESS;
-
-      TIMER_DRIVER.INITIALIZE;
-         RTEMS.MESSAGE_QUEUE_BROADCAST(
-            TMTEST.MESSAGE_QUEUE_ID,
-            BUFFER_POINTER,
-            16,
-            COUNT,
-            STATUS 
-         );
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "MESSAGE_QUEUE_BROADCAST (readying)", 
-         TMTEST.END_TIME, 
-         1,
-         0,
-         RTEMS_CALLING_OVERHEAD.MESSAGE_QUEUE_BROADCAST
-      );
-
-      RTEMS.TASK_SUSPEND( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SUSPEND" );
-
-   end HIGH_TASK;
-
---PAGE
--- 
---  LOW_TASK
---
-
-   procedure LOW_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      ID             : RTEMS.ID;
-      BUFFER         : TMTEST.BUFFER;
-      BUFFER_POINTER : RTEMS.ADDRESS;
-      INDEX          : RTEMS.UNSIGNED32;
-      OVERHEAD       : RTEMS.UNSIGNED32;
-      COUNT          : RTEMS.UNSIGNED32;
-      MESSAGE_SIZE   : RTEMS.UNSIGNED32;
-      STATUS         : RTEMS.STATUS_CODES;
-   begin
-
-      BUFFER_POINTER := BUFFER'ADDRESS;
-
-      RTEMS.TASK_CREATE( 
-         RTEMS.BUILD_NAME( 'H', 'I', 'G', 'H' ), 
-         5,
-         2048, 
-         RTEMS.NO_PREEMPT,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         ID,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE HIGH" );
-
-      RTEMS.TASK_START( ID, TMTEST.HIGH_TASK'ACCESS, 0, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START HIGH" );
-
-      RTEMS.MESSAGE_QUEUE_RECEIVE(
-         TMTEST.MESSAGE_QUEUE_ID,
-         BUFFER_POINTER,
-         RTEMS.DEFAULT_MODES,
-         RTEMS.NO_TIMEOUT,
-         MESSAGE_SIZE,
-         STATUS
-      );
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            TIMER_DRIVER.EMPTY_FUNCTION;
-         end loop;
-      OVERHEAD := TIMER_DRIVER.READ_TIMER;
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            RTEMS.MESSAGE_QUEUE_BROADCAST(
-               TMTEST.MESSAGE_QUEUE_ID,
-               BUFFER_POINTER,
-               16,
-               COUNT,
-               STATUS 
-            );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "MESSAGE_QUEUE_BROADCAST (no waiting tasks)",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         RTEMS_CALLING_OVERHEAD.MESSAGE_QUEUE_BROADCAST
-      );
-
-      RTEMS.MESSAGE_QUEUE_RECEIVE(
-         TMTEST.MESSAGE_QUEUE_ID,
-         BUFFER_POINTER,
-         RTEMS.DEFAULT_MODES,
-         RTEMS.NO_TIMEOUT,
-         MESSAGE_SIZE,
-         STATUS
-      );
-
-      -- should go to PREEMPT_TASK here
-
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "MESSAGE_QUEUE_BROADCAST (preempt)",
-         TMTEST.END_TIME, 
-         1,
-         0,
-         RTEMS_CALLING_OVERHEAD.MESSAGE_QUEUE_BROADCAST
-      );
-
-      RTEMS.SHUTDOWN_EXECUTIVE( 0 );
-
-   end LOW_TASK;
-
---PAGE
--- 
---  LOW_TASK
---
-
-   procedure PREEMPT_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      BUFFER         : TMTEST.BUFFER;
-      BUFFER_POINTER : RTEMS.ADDRESS;
-      COUNT          : RTEMS.UNSIGNED32;
-      STATUS         : RTEMS.STATUS_CODES;
-   begin
-
-      BUFFER_POINTER := BUFFER'ADDRESS;
-
-      TIMER_DRIVER.INITIALIZE;
-         RTEMS.MESSAGE_QUEUE_BROADCAST(
-            TMTEST.MESSAGE_QUEUE_ID,
-            BUFFER_POINTER,
-            16,
-            COUNT,
-            STATUS 
-         );
-
-      -- should be preempted by LOW_TASK
-
-   end PREEMPT_TASK;
-
-end TMTEST;
diff --git a/c/src/ada-tests/tmtests/tm22/tmtest.ads b/c/src/ada-tests/tmtests/tm22/tmtest.ads
deleted file mode 100644
index 43270fcf65..0000000000
--- a/c/src/ada-tests/tmtests/tm22/tmtest.ads
+++ /dev/null
@@ -1,119 +0,0 @@
---
---  TMTEST / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package is the specification for Test 22 of the RTEMS
---  Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with TIMER_DRIVER;
-with RTEMS;
-
-package TMTEST is
-
---
---  Buffer Record similar to that used by RTEMS 3.2.1.  Using this
---  avoids changes to the test.
---
-
-   type BUFFER is
-      record
-         FIELD1 : RTEMS.UNSIGNED32;   -- TEMPORARY UNTIL VARIABLE LENGTH
-         FIELD2 : RTEMS.UNSIGNED32;
-         FIELD3 : RTEMS.UNSIGNED32;
-         FIELD4 : RTEMS.UNSIGNED32;
-      end record;
-
---
---  The following is the ID of the message queue used for timing operations.
---
-
-   MESSAGE_QUEUE_ID : RTEMS.ID;
-
---
---  The following variable is set to the execution time returned
---  by the timer.
---
-
-   END_TIME  : RTEMS.UNSIGNED32;
-
---
---  INIT
---
---  DESCRIPTION:
---
---  This RTEMS task initializes the application.
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  HIGH_TASK
---
---  DESCRIPTION:
---
---  This RTEMS task is created by LOW_TASK and executes after
---  LOW_TASK has performed a blocking MESSAGE_QUEUE_RECEIVE.
---  This task then executes and performs a readying 
---  MESSAGE_QUEUE_BROADCAST and reports its execution time.
---  Finally, the task suspends itself so LOW_TASK can continue
---  execution.
---
-
-   procedure HIGH_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  LOW_TASK
---
---  DESCRIPTION:
---
---  This RTEMS task performs a blocking MESSAGE_QUEUE_RECEIVE
---  so that when HIGH_TASK performs a MESSAGE_QUEUE_BROADCAST,
---  there will be a task to be readied.  Following this, the 
---  execution time for a MESSAGE_QUEUE_BROADCAST to a message 
---  queue with no waiting tasks is measured and reported.
---  Then this task performs another blocking MESSAGE_QUEUE_RECEIVE
---  so that when PREEMPT_TASK performs a MESSAGE_QUEUE_BROADCAST,
---  PREEMPT_TASK will be preempted by this task.  After control
---  of the processor is transferred back to this task by the
---  preemption, the timer is stopped and the execution time of
---  a preemptive MESSAGE_QUEUE_BROADCAST is reported.
---
-
-   procedure LOW_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  PREEMPT_TASK
---
---  DESCRIPTION:
---
---  This RTEMS task starts the timer and performs a preemptive
---   MESSAGE_QUEUE_BROADCAST.
---
-
-   procedure PREEMPT_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
-end TMTEST;
diff --git a/c/src/ada-tests/tmtests/tm23/config.h b/c/src/ada-tests/tmtests/tm23/config.h
deleted file mode 100644
index 5e53478121..0000000000
--- a/c/src/ada-tests/tmtests/tm23/config.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*  config.h
- *
- *  This include file defines the Configuration Table for this test.
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-/* configuration information */
-
-#define CONFIGURE_TMTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
-
-#define CONFIGURE_MAXIMUM_TASKS              111
-#define CONFIGURE_MAXIMUM_TIMERS             110
-#define CONFIGURE_TICKS_PER_TIMESLICE        0
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#define CONFIGURE_MAXIMUM_POSIX_THREADS              10
-#define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
-#define CONFIGURE_MAXIMUM_POSIX_MUTEXES              20
-#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES  10
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/c/src/ada-tests/tmtests/tm23/tm23.adb b/c/src/ada-tests/tmtests/tm23/tm23.adb
deleted file mode 100644
index b6855a86e1..0000000000
--- a/c/src/ada-tests/tmtests/tm23/tm23.adb
+++ /dev/null
@@ -1,57 +0,0 @@
---
---  MAIN / BODY
---
---  DESCRIPTION:
---
---  This is the entry point for Test TM23 of the Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-with TMTEST;
-with TEST_SUPPORT;
-
-procedure TM23 is
-  INIT_ID : RTEMS.ID;
-  STATUS  : RTEMS.STATUS_CODES;
-begin
-
-   RTEMS.TASK_CREATE(
-      RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
-      1,
-      RTEMS.MINIMUM_STACK_SIZE,
-      RTEMS.NO_PREEMPT,
-      RTEMS.DEFAULT_ATTRIBUTES,
-      INIT_ID,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
-
-
-   RTEMS.TASK_START(
-      INIT_ID,
-      TMTEST.INIT'ACCESS,
-      0,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
-
-   loop
-      delay 120.0;
-   end loop;
-
-end TM23;
-
diff --git a/c/src/ada-tests/tmtests/tm23/tmtest.adb b/c/src/ada-tests/tmtests/tm23/tmtest.adb
deleted file mode 100644
index bb9dabe3be..0000000000
--- a/c/src/ada-tests/tmtests/tm23/tmtest.adb
+++ /dev/null
@@ -1,399 +0,0 @@
---
---  TMTEST / BODY
---
---  DESCRIPTION:
---
---  This package is the implementation of Test 23 of the RTEMS
---  Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with INTERFACES; use INTERFACES;
-with RTEMS;
-with RTEMS_CALLING_OVERHEAD;
-with TEST_SUPPORT;
-with TEXT_IO;
-with TIME_TEST_SUPPORT;
-with UNSIGNED32_IO;
-
-package body TMTEST is
-
---PAGE
--- 
---  INIT
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      OVERHEAD      : RTEMS.UNSIGNED32;
-      TASK_PRIORITY : RTEMS.TASK_PRIORITY;
-      INDEX         : RTEMS.UNSIGNED32;
-      ID            : RTEMS.ID;
-      TASK_ENTRY    : RTEMS.TASK_ENTRY;
-      STATUS        : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** TIME TEST 23 ***" );
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            TIMER_DRIVER.EMPTY_FUNCTION;
-         end loop;
-      OVERHEAD := TIMER_DRIVER.READ_TIMER;
-
-      TASK_PRIORITY := 5;
-
-      for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-      loop
-
-         RTEMS.TASK_CREATE( 
-            RTEMS.BUILD_NAME( 'T', 'I', 'M', 'E' ),
-            TASK_PRIORITY, 
-            1024, 
-            RTEMS.DEFAULT_MODES,
-            RTEMS.DEFAULT_ATTRIBUTES,
-            ID,
-            STATUS
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE LOOP" );
-
-         if INDEX = 1 then
-            TASK_ENTRY := TMTEST.HIGH_TASK'ACCESS;
-         elsif INDEX = TIME_TEST_SUPPORT.OPERATION_COUNT then
-            TASK_ENTRY := TMTEST.LOW_TASK'ACCESS;
-         else
-            TASK_ENTRY := TMTEST.MIDDLE_TASKS'ACCESS;
-         end if;
-
-         RTEMS.TASK_START( ID, TASK_ENTRY, 0, STATUS );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START LOOP" );
-
-         TASK_PRIORITY := TASK_PRIORITY + 1;
-
-      end loop;
-
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
-
-   end INIT;
-
---PAGE
--- 
---  NULL_DELAY
---
-
-   procedure NULL_DELAY (
-      IGNORED_ID      : in     RTEMS.ID;
-      IGNORED_ADDRESS : in     RTEMS.ADDRESS
-   ) is
-   begin
-
-      NULL;
-
-   end NULL_DELAY;
-
---PAGE
--- 
---  HIGH_TASK
---
-
-   procedure HIGH_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      INDEX    : RTEMS.TASK_PRIORITY;
-      OVERHEAD : RTEMS.UNSIGNED32;
-      STATUS   : RTEMS.STATUS_CODES;
-   begin
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            TIMER_DRIVER.EMPTY_FUNCTION;
-         end loop;
-      OVERHEAD := TIMER_DRIVER.READ_TIMER;
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            RTEMS.TIMER_CREATE(
-               INDEX,
-               TMTEST.TIMER_ID( INDEX ),
-               STATUS
-            );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "TIMER_CREATE",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         0,
-         RTEMS_CALLING_OVERHEAD.TIMER_CREATE
-      );
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            RTEMS.TIMER_FIRE_AFTER(
-               TMTEST.TIMER_ID( INDEX ),
-               500,
-               TMTEST.NULL_DELAY'ACCESS,
-               RTEMS.NULL_ADDRESS,
-               STATUS
-            );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "TIMER_FIRE_AFTER (inactive)",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         0,
-         RTEMS_CALLING_OVERHEAD.TIMER_FIRE_AFTER
-      );
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            RTEMS.TIMER_FIRE_AFTER(
-               TMTEST.TIMER_ID( INDEX ),
-               500,
-               TMTEST.NULL_DELAY'ACCESS,
-               RTEMS.NULL_ADDRESS,
-               STATUS
-            );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "TIMER_FIRE_AFTER (active)",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         0,
-         RTEMS_CALLING_OVERHEAD.TIMER_FIRE_AFTER
-      );
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            RTEMS.TIMER_CANCEL( TMTEST.TIMER_ID( INDEX ), STATUS );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "TIMER_CANCEL (active)",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         0,
-         RTEMS_CALLING_OVERHEAD.TIMER_CANCEL
-      );
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            RTEMS.TIMER_CANCEL( TMTEST.TIMER_ID( INDEX ), STATUS );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "TIMER_CANCEL (inactive)",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         0,
-         RTEMS_CALLING_OVERHEAD.TIMER_CANCEL
-      );
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            RTEMS.TIMER_RESET( TMTEST.TIMER_ID( INDEX ), STATUS );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "TIMER_RESET (inactive)",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         0,
-         RTEMS_CALLING_OVERHEAD.TIMER_RESET
-      );
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            RTEMS.TIMER_RESET( TMTEST.TIMER_ID( INDEX ), STATUS );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "TIMER_RESET (active)",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         0,
-         RTEMS_CALLING_OVERHEAD.TIMER_RESET
-      );
-
-      for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-      loop
-         RTEMS.TIMER_CANCEL( TMTEST.TIMER_ID( INDEX ), STATUS );
-      end loop;
-
-      TMTEST.TIME_OF_DAY := ( 1988, 12, 31, 9, 0, 0, 0 );
-
-      RTEMS.CLOCK_SET( TMTEST.TIME_OF_DAY, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_SET" );
-
-      TMTEST.TIME_OF_DAY.YEAR := 1989;
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            RTEMS.TIMER_FIRE_WHEN(
-               TMTEST.TIMER_ID( INDEX ),
-               TMTEST.TIME_OF_DAY,
-               TMTEST.NULL_DELAY'ACCESS,
-               RTEMS.NULL_ADDRESS,
-               STATUS
-            );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "TIMER_FIRE_WHEN (inactive)",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         0,
-         RTEMS_CALLING_OVERHEAD.TIMER_FIRE_WHEN
-      );
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            RTEMS.TIMER_FIRE_WHEN(
-               TMTEST.TIMER_ID( INDEX ),
-               TMTEST.TIME_OF_DAY,
-               TMTEST.NULL_DELAY'ACCESS,
-               RTEMS.NULL_ADDRESS,
-               STATUS
-            );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "TIMER_FIRE_WHEN (active)",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         0,
-         RTEMS_CALLING_OVERHEAD.TIMER_FIRE_WHEN
-      );
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            RTEMS.TIMER_DELETE( TMTEST.TIMER_ID( INDEX ), STATUS );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "TIMER_DELETE (active)",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         0,
-         RTEMS_CALLING_OVERHEAD.TIMER_DELETE
-      );
-
-      for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-      loop
-         RTEMS.TIMER_CREATE( INDEX, TMTEST.TIMER_ID( INDEX ), STATUS );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_CREATE" );
-
-         RTEMS.TIMER_FIRE_AFTER( 
-            TMTEST.TIMER_ID( INDEX ), 
-            500,
-            TMTEST.NULL_DELAY'ACCESS,
-            RTEMS.NULL_ADDRESS,
-            STATUS 
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_FIRE_AFTER" );
-
-         RTEMS.TIMER_CANCEL( TMTEST.TIMER_ID( INDEX ), STATUS );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_CANCEL" );
-
-      end loop;
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            RTEMS.TIMER_DELETE( TMTEST.TIMER_ID( INDEX ), STATUS );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "TIMER_DELETE (inactive)",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         0,
-         RTEMS_CALLING_OVERHEAD.TIMER_DELETE
-      );
-
-      TIMER_DRIVER.INITIALIZE;
-         RTEMS.TASK_WAKE_WHEN( TMTEST.TIME_OF_DAY, STATUS );
-
-   end HIGH_TASK;
-
---PAGE
--- 
---  MIDDLE_TASKS
---
-
-   procedure MIDDLE_TASKS (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      RTEMS.TASK_WAKE_WHEN( TMTEST.TIME_OF_DAY, STATUS );
-
-   end MIDDLE_TASKS;
-
---PAGE
--- 
---  LOW_TASK
---
-
-   procedure LOW_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-   begin
-
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "TASK_WAKE_WHEN",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         0,
-         RTEMS_CALLING_OVERHEAD.TASK_WAKE_WHEN
-      );
-
-      RTEMS.SHUTDOWN_EXECUTIVE( 0 );
-
-   end LOW_TASK;
-
-end TMTEST;
diff --git a/c/src/ada-tests/tmtests/tm23/tmtest.ads b/c/src/ada-tests/tmtests/tm23/tmtest.ads
deleted file mode 100644
index 9f713ae073..0000000000
--- a/c/src/ada-tests/tmtests/tm23/tmtest.ads
+++ /dev/null
@@ -1,130 +0,0 @@
---
---  TMTEST / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package is the specification for Test 23 of the RTEMS
---  Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with TIMER_DRIVER;
-with TIME_TEST_SUPPORT;
-with RTEMS;
-
-package TMTEST is
-
---
---  This array contains the IDs of all RTEMS timers created by this test.
---
-
-   TIMER_ID   : array ( RTEMS.UNSIGNED32 
-      range 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT ) of RTEMS.ID;
-
---
---  This data item contains a time of day used by all of the
---  "WHEN" directives timed in this test.
---
-
-   TIME_OF_DAY      : RTEMS.TIME_OF_DAY;
-
---
---  The following variable is set to the execution time returned
---  by the timer.
---
-
-   END_TIME  : RTEMS.UNSIGNED32;
-
---
---  INIT
---
---  DESCRIPTION:
---
---  This RTEMS task initializes the application.
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  NULL_DELAY
---
---  DESCRIPTION:
---
---  This subprogram is a timer service routine.  It performs
---  no actions.
---
-
-   procedure NULL_DELAY (
-      IGNORED_ID      : in     RTEMS.ID;  
-      IGNORED_ADDRESS : in     RTEMS.ADDRESS 
-   );
-
---
---  HIGH_TASK
---
---  DESCRIPTION:
---
---  This RTEMS task is responsible for measuring and reporting
---  the following directive execution times:
---
---    + TIMER_CREATE
---    + TIMER_FIRE_AFTER with an inactive timer
---    + TIMER_FIRE_AFTER with an active timer
---    + TIMER_CANCEL of an active timer
---    + TIMER_CANCEL of an inactive timer
---    + TIMER_RESET of an active timer
---    + TIMER_RESET of an inactive timer
---    + TIMER_FIRE_WHEN of an inactive timer
---    + TIMER_FIRE_WHEN of an active timer
---    + TIMER_DELETE of an active timer
---    + TIMER_DELETE of an inactive timer
---
---  After measuring and reporting the above times, this task starts
---  the timer and executes the TASK_WAKE_WHEN directive.
---
-
-   procedure HIGH_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  MIDDLE_TASKS
---
---  DESCRIPTION:
---
---  These RTEMS tasks executes the TASK_WAKE_WHEN directive.
---
-
-   procedure MIDDLE_TASKS (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  MIDDLE_TASKS
---
---  DESCRIPTION:
---
---  This RTEMS task stops the timer and reports the execution time for
---  the TASK_WAKE_WHEN directive.
---
-
-   procedure LOW_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
-end TMTEST;
diff --git a/c/src/ada-tests/tmtests/tm24/config.h b/c/src/ada-tests/tmtests/tm24/config.h
deleted file mode 100644
index 7e7793cf15..0000000000
--- a/c/src/ada-tests/tmtests/tm24/config.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*  config.h
- *
- *  This include file defines the Configuration Table for this test.
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-/* configuration information */
-
-#define CONFIGURE_TMTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
-
-#define CONFIGURE_MAXIMUM_TASKS              111
-#define CONFIGURE_TICKS_PER_TIMESLICE        0
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#define CONFIGURE_MAXIMUM_POSIX_THREADS              10
-#define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
-#define CONFIGURE_MAXIMUM_POSIX_MUTEXES              20
-#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES  10
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/c/src/ada-tests/tmtests/tm24/tm24.adb b/c/src/ada-tests/tmtests/tm24/tm24.adb
deleted file mode 100644
index 03873ba82c..0000000000
--- a/c/src/ada-tests/tmtests/tm24/tm24.adb
+++ /dev/null
@@ -1,57 +0,0 @@
---
---  MAIN / BODY
---
---  DESCRIPTION:
---
---  This is the entry point for Test TM24 of the Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-with TMTEST;
-with TEST_SUPPORT;
-
-procedure TM24 is
-  INIT_ID : RTEMS.ID;
-  STATUS  : RTEMS.STATUS_CODES;
-begin
-
-   RTEMS.TASK_CREATE(
-      RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
-      1,
-      RTEMS.MINIMUM_STACK_SIZE,
-      RTEMS.NO_PREEMPT,
-      RTEMS.DEFAULT_ATTRIBUTES,
-      INIT_ID,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
-
-
-   RTEMS.TASK_START(
-      INIT_ID,
-      TMTEST.INIT'ACCESS,
-      0,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
-
-   loop
-      delay 120.0;
-   end loop;
-
-end TM24;
-
diff --git a/c/src/ada-tests/tmtests/tm24/tmtest.adb b/c/src/ada-tests/tmtests/tm24/tmtest.adb
deleted file mode 100644
index e8af0ca6ea..0000000000
--- a/c/src/ada-tests/tmtests/tm24/tmtest.adb
+++ /dev/null
@@ -1,165 +0,0 @@
---
---  TMTEST / BODY
---
---  DESCRIPTION:
---
---  This package is the implementation of Test 24 of the RTEMS
---  Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with INTERFACES; use INTERFACES;
-with RTEMS;
-with RTEMS_CALLING_OVERHEAD;
-with TEST_SUPPORT;
-with TEXT_IO;
-with TIME_TEST_SUPPORT;
-with UNSIGNED32_IO;
-
-package body TMTEST is
-
---PAGE
--- 
---  INIT
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      ID         : RTEMS.ID;
-      INDEX      : RTEMS.UNSIGNED32;
-      STATUS     : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** TIME TEST 24 ***" );
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            TIMER_DRIVER.EMPTY_FUNCTION;
-         end loop;
-      TMTEST.OVERHEAD := TIMER_DRIVER.READ_TIMER;
-
-      RTEMS.TASK_CREATE( 
-         RTEMS.BUILD_NAME( 'H', 'I', 'G', 'H' ),
-         10,
-         1024, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         ID,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE HIGH" );
-
-      RTEMS.TASK_START( ID, TMTEST.HIGH_TASK'ACCESS, 0, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START HIGH" );
-
-      for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-      loop
-
-         RTEMS.TASK_CREATE( 
-            RTEMS.BUILD_NAME( 'R', 'E', 'S', 'T' ),
-            128,
-            1024, 
-            RTEMS.DEFAULT_MODES,
-            RTEMS.DEFAULT_ATTRIBUTES,
-            ID,
-            STATUS
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE LOOP" );
-
-         RTEMS.TASK_START( ID, TMTEST.TASKS'ACCESS, 0, STATUS );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START LOOP" );
-
-      end loop;
-
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
-
-   end INIT;
-
---PAGE
--- 
---  HIGH_TASK
---
-
-   procedure HIGH_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      INDEX    : RTEMS.UNSIGNED32;
-      STATUS   : RTEMS.STATUS_CODES;
-   begin
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            RTEMS.TASK_WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "TASK_WAKE_AFTER (no context switch)",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         TMTEST.OVERHEAD,
-         RTEMS_CALLING_OVERHEAD.TASK_WAKE_AFTER
-      );
-
-      TMTEST.TASK_COUNT := 0;
-
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
-
-   end HIGH_TASK;
-
---PAGE
--- 
---  TASKS
---
-
-   procedure TASKS (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS            : RTEMS.STATUS_CODES;
-   begin
-
-      TMTEST.TASK_COUNT := TMTEST.TASK_COUNT + 1;
-
-      if TMTEST.TASK_COUNT = 1 then
-         
-         TIMER_DRIVER.INITIALIZE;
-
-      elsif TMTEST.TASK_COUNT = TIME_TEST_SUPPORT.OPERATION_COUNT then
-         TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-         TIME_TEST_SUPPORT.PUT_TIME( 
-            "TASK_WAKE_AFTER (context switch)",
-            TMTEST.END_TIME, 
-            TIME_TEST_SUPPORT.OPERATION_COUNT, 
-            TMTEST.OVERHEAD,
-         RTEMS_CALLING_OVERHEAD.TASK_WAKE_AFTER
-         );
-
-         RTEMS.SHUTDOWN_EXECUTIVE( 0 );
-
-      end if;
-
-      RTEMS.TASK_WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS );
-
-   end TASKS;
-
-end TMTEST;
diff --git a/c/src/ada-tests/tmtests/tm24/tmtest.ads b/c/src/ada-tests/tmtests/tm24/tmtest.ads
deleted file mode 100644
index df90eddb91..0000000000
--- a/c/src/ada-tests/tmtests/tm24/tmtest.ads
+++ /dev/null
@@ -1,99 +0,0 @@
---
---  TMTEST / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package is the specification for Test 24 of the RTEMS
---  Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with TIMER_DRIVER;
-with RTEMS;
-
-package TMTEST is
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS tasks created
---  by this test.
---
-
-   TASK_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.ID;
-   TASK_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.NAME;
-
---
---  This variable is used to determine which task should
---  start the timer and which task should stop the timer
---  and report the execution time.
---
-
-   TASK_COUNT : RTEMS.UNSIGNED32;
-
---
---  This variable contains the execution time required of the
---  loop used to execute the directive.
---  
-
-   OVERHEAD  : RTEMS.UNSIGNED32;
-
---
---  The following variable is set to the execution time returned
---  by the timer.
---
-
-   END_TIME  : RTEMS.UNSIGNED32;
-
---
---  INIT
---
---  DESCRIPTION:
---
---  This RTEMS task initializes the application.
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  HIGH_TASK
---
---  DESCRIPTION:
---
---  This RTEMS task is responsible for measuring and reporting the
---  execution time for an invocation of TASK_WAKE_AFTER which 
---  attempts to yield but does not result in a context switch.
---
-
-   procedure HIGH_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TASKS
---
---  DESCRIPTION:
---
---  These RTEMS tasks are responsible for measuring and reporting the
---  execution time for an invocation of TASK_WAKE_AFTER which 
---  attempts to yield but does result in a context switch.
---
-
-   procedure TASKS (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
-end TMTEST;
diff --git a/c/src/ada-tests/tmtests/tm25/config.h b/c/src/ada-tests/tmtests/tm25/config.h
deleted file mode 100644
index e58f7c9923..0000000000
--- a/c/src/ada-tests/tmtests/tm25/config.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*  config.h
- *
- *  This include file defines the Configuration Table for this test.
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-/* configuration information */
-
-#define CONFIGURE_TMTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
-
-#define CONFIGURE_MAXIMUM_TASKS              111
-#define CONFIGURE_MAXIMUM_SEMAPHORES         1
-#define CONFIGURE_TICKS_PER_TIMESLICE        0
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#define CONFIGURE_MAXIMUM_POSIX_THREADS              10
-#define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
-#define CONFIGURE_MAXIMUM_POSIX_MUTEXES              20
-#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES  10
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/c/src/ada-tests/tmtests/tm25/tm25.adb b/c/src/ada-tests/tmtests/tm25/tm25.adb
deleted file mode 100644
index c3099ab193..0000000000
--- a/c/src/ada-tests/tmtests/tm25/tm25.adb
+++ /dev/null
@@ -1,57 +0,0 @@
---
---  MAIN / BODY
---
---  DESCRIPTION:
---
---  This is the entry point for Test TM25 of the Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-with TMTEST;
-with TEST_SUPPORT;
-
-procedure TM25 is
-  INIT_ID : RTEMS.ID;
-  STATUS  : RTEMS.STATUS_CODES;
-begin
-
-   RTEMS.TASK_CREATE(
-      RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
-      1,
-      RTEMS.MINIMUM_STACK_SIZE,
-      RTEMS.NO_PREEMPT,
-      RTEMS.DEFAULT_ATTRIBUTES,
-      INIT_ID,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
-
-
-   RTEMS.TASK_START(
-      INIT_ID,
-      TMTEST.INIT'ACCESS,
-      0,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
-
-   loop
-      delay 120.0;
-   end loop;
-
-end TM25;
-
diff --git a/c/src/ada-tests/tmtests/tm25/tmtest.adb b/c/src/ada-tests/tmtests/tm25/tmtest.adb
deleted file mode 100644
index 080129028e..0000000000
--- a/c/src/ada-tests/tmtests/tm25/tmtest.adb
+++ /dev/null
@@ -1,157 +0,0 @@
---
---  TMTEST / BODY
---
---  DESCRIPTION:
---
---  This package is the implementation of Test 25 of the RTEMS
---  Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with INTERFACES; use INTERFACES;
-with RTEMS;
-with RTEMS_CALLING_OVERHEAD;
-with TEST_SUPPORT;
-with TEXT_IO;
-with TIME_TEST_SUPPORT;
-with UNSIGNED32_IO;
-
-package body TMTEST is
-
---PAGE
--- 
---  INIT
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      INDEX   : RTEMS.UNSIGNED32;
-      TASK_ID : RTEMS.ID;
-      STATUS  : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** TIME TEST 25 ***" );
-
-      RTEMS.SEMAPHORE_CREATE(
-         RTEMS.BUILD_NAME( 'S', 'M', '1', ' ' ),
-         0,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         RTEMS.NO_PRIORITY,
-         TMTEST.SEMAPHORE_ID,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_CREATE OF SM1" );
-
-      RTEMS.TASK_CREATE( 
-         RTEMS.BUILD_NAME( 'L', 'O', 'W', ' ' ),
-         254, 
-         2048, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         TASK_ID,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE LOW" );
-
-      RTEMS.TASK_START( 
-         TASK_ID, 
-         TMTEST.LOW_TASK'ACCESS, 
-         0, 
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START LOW" );
-
-      for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-      loop
-
-         RTEMS.TASK_CREATE( 
-            RTEMS.BUILD_NAME( 'T', 'I', 'M', 'E' ),
-            128, 
-            1024, 
-            RTEMS.DEFAULT_MODES,
-            RTEMS.DEFAULT_ATTRIBUTES,
-            TASK_ID,
-            STATUS
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE LOOP" );
-
-         RTEMS.TASK_START( 
-            TASK_ID, 
-            TMTEST.HIGH_TASKS'ACCESS, 
-            0, 
-            STATUS 
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START LOOP" );
-
-      end loop;
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
-
-   end INIT;
-
---PAGE
--- 
---  HIGH_TASKS
---
-
-   procedure HIGH_TASKS (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      RTEMS.SEMAPHORE_OBTAIN(
-         TMTEST.SEMAPHORE_ID,
-         RTEMS.DEFAULT_OPTIONS,
-         RTEMS.INTERVAL'LAST,
-         STATUS
-      );
-
-   end HIGH_TASKS;
-
---PAGE
--- 
---  LOW_TASK
---
-
-   procedure LOW_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS                   : RTEMS.STATUS_CODES;
-   begin
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            RTEMS.CLOCK_TICK( STATUS );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "CLOCK_TICK",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         0,
-         RTEMS_CALLING_OVERHEAD.CLOCK_TICK
-      );
-
-      RTEMS.SHUTDOWN_EXECUTIVE( 0 );
-
-   end LOW_TASK;
-
-end TMTEST;
diff --git a/c/src/ada-tests/tmtests/tm25/tmtest.ads b/c/src/ada-tests/tmtests/tm25/tmtest.ads
deleted file mode 100644
index 069e7e17ee..0000000000
--- a/c/src/ada-tests/tmtests/tm25/tmtest.ads
+++ /dev/null
@@ -1,80 +0,0 @@
---
---  TMTEST / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package is the specification for Test 25 of the RTEMS
---  Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with TIMER_DRIVER;
-with RTEMS;
-
-package TMTEST is
-
---
---  The following is the ID of the semaphore used for timing operations.
---
-
-   SEMAPHORE_ID : RTEMS.ID;
-
---
---  The following variable is set to the execution time returned
---  by the timer.
---
-
-   END_TIME  : RTEMS.UNSIGNED32;
-
---
---  INIT
---
---  DESCRIPTION:
---
---  This RTEMS task initializes the application.
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  HIGH_TASKS
---
---  DESCRIPTION:
---
---  These RTEMS tasks perform a blocking SEMAPHORE_OBTAIN which
---  has an optional timeout.
---
-
-   procedure HIGH_TASKS (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  LOW_TASK
---
---  DESCRIPTION:
---
---  This RTEMS task is responsible for measuring and reporting
---  the execution time for the CLOCK_TICK directive.
---
-
-   procedure LOW_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
-end TMTEST;
diff --git a/c/src/ada-tests/tmtests/tm26/README b/c/src/ada-tests/tmtests/tm26/README
deleted file mode 100644
index c54eb82024..0000000000
--- a/c/src/ada-tests/tmtests/tm26/README
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-#  $Id$
-#
-
-This test requires interfacing to internal RTEMS routines and
-is probably not worth the effort to convert.
diff --git a/c/src/ada-tests/tmtests/tm26/config.h b/c/src/ada-tests/tmtests/tm26/config.h
deleted file mode 100644
index e58f7c9923..0000000000
--- a/c/src/ada-tests/tmtests/tm26/config.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*  config.h
- *
- *  This include file defines the Configuration Table for this test.
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-/* configuration information */
-
-#define CONFIGURE_TMTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
-
-#define CONFIGURE_MAXIMUM_TASKS              111
-#define CONFIGURE_MAXIMUM_SEMAPHORES         1
-#define CONFIGURE_TICKS_PER_TIMESLICE        0
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#define CONFIGURE_MAXIMUM_POSIX_THREADS              10
-#define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
-#define CONFIGURE_MAXIMUM_POSIX_MUTEXES              20
-#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES  10
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/c/src/ada-tests/tmtests/tm26/tm26.adb b/c/src/ada-tests/tmtests/tm26/tm26.adb
deleted file mode 100644
index 8d4db0a3ed..0000000000
--- a/c/src/ada-tests/tmtests/tm26/tm26.adb
+++ /dev/null
@@ -1,57 +0,0 @@
---
---  MAIN / BODY
---
---  DESCRIPTION:
---
---  This is the entry point for Test TM26 of the Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-with TMTEST;
-with TEST_SUPPORT;
-
-procedure TM26 is
-  INIT_ID : RTEMS.ID;
-  STATUS  : RTEMS.STATUS_CODES;
-begin
-
-   RTEMS.TASK_CREATE(
-      RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
-      1,
-      RTEMS.MINIMUM_STACK_SIZE,
-      RTEMS.NO_PREEMPT,
-      RTEMS.DEFAULT_ATTRIBUTES,
-      INIT_ID,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
-
-
-   RTEMS.TASK_START(
-      INIT_ID,
-      TMTEST.INIT'ACCESS,
-      0,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
-
-   loop
-      delay 120.0;
-   end loop;
-
-end TM26;
-
diff --git a/c/src/ada-tests/tmtests/tm26/tmtest.adp b/c/src/ada-tests/tmtests/tm26/tmtest.adp
deleted file mode 100644
index ddf0c39f7a..0000000000
--- a/c/src/ada-tests/tmtests/tm26/tmtest.adp
+++ /dev/null
@@ -1,650 +0,0 @@
---
---  TMTEST / BODY
---
---  DESCRIPTION:
---
---  This package is the implementation of Test 26 of the RTEMS
---  Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with INTERFACES; use INTERFACES;
-with RTEMS_CALLING_OVERHEAD;
-with RTEMS;
-with RTEMS_TEST_SUPPORT;
-with TEST_SUPPORT;
-with TEXT_IO;
-with TIME_TEST_SUPPORT;
-with UNSIGNED32_IO;
-
-include(../../support/fp.inc)
-
-package body TMTEST is
-
---PAGE
--- 
---  INIT
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      INDEX   : RTEMS.UNSIGNED32;
-      TASK_ID : RTEMS.ID;
-      STATUS  : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** TIME TEST 26 ***" );
-
-      RTEMS.TASK_CREATE( 
-         RTEMS.BUILD_NAME(  'F', 'P', '1', ' ' ),
-         201, 
-         2048, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.FLOATING_POINT,
-         TASK_ID,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF FP1" );
-
-      RTEMS.TASK_START(
-         TASK_ID,
-         TMTEST.FLOATING_POINT_TASK_1'ACCESS,
-         0,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF FP1" );
-
-      RTEMS.TASK_CREATE( 
-         RTEMS.BUILD_NAME(  'F', 'P', '2', ' ' ),
-         202, 
-         2048, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.FLOATING_POINT,
-         TASK_ID,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF FP2" );
-
-      RTEMS.TASK_START(
-         TASK_ID,
-         TMTEST.FLOATING_POINT_TASK_2'ACCESS,
-         0,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF FP2" );
-
-      RTEMS.TASK_CREATE( 
-         RTEMS.BUILD_NAME(  'L', 'O', 'W', ' ' ),
-         200, 
-         2048, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         TASK_ID,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF LOW" );
-
-      RTEMS.TASK_START( 
-         TASK_ID, 
-         TMTEST.LOW_TASK'ACCESS, 
-         0, 
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF LOW" );
-
-      RTEMS.TASK_CREATE( 
-         RTEMS.BUILD_NAME(  'M', 'I', 'D', ' ' ),
-         128, 
-         2048, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         TASK_ID,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF MIDDLE" );
-
-      RTEMS.TASK_START( 
-         TASK_ID, 
-         TMTEST.MIDDLE_TASK'ACCESS, 
-         0, 
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF MIDDLE" );
-
-      RTEMS.TASK_CREATE( 
-         RTEMS.BUILD_NAME(  'H', 'I', 'G', 'H' ),
-         5, 
-         2048, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         TASK_ID,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF HIGH" );
-
-      RTEMS.TASK_START( 
-         TASK_ID, 
-         TMTEST.HIGH_TASK'ACCESS, 
-         0, 
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF HIGH" );
-
-      RTEMS.SEMAPHORE_CREATE( 
-         RTEMS.BUILD_NAME(  'S', 'E', 'M', '1' ),
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         RTEMS.DEFAULT_ATTRIBUTES,
-         TMTEST.SEMAPHORE_ID,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_CREATE" );
-
-      for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-      loop
-
-         RTEMS.TASK_CREATE( 
-            RTEMS.BUILD_NAME(  'N', 'U', 'L', 'L' ),
-            254, 
-            512, 
-            RTEMS.DEFAULT_MODES,
-            RTEMS.DEFAULT_ATTRIBUTES,
-            TASK_ID,
-            STATUS
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE LOOP" );
-
-         RTEMS.TASK_START( 
-            TASK_ID, 
-            TMTEST.NULL_TASK'ACCESS, 
-            0, 
-            STATUS 
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START LOOP" );
-
-      end loop;
-
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
-
-   end INIT;
-
---PAGE
--- 
---  NULL_TASK
---
-
-   procedure NULL_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-   begin
-
-      NULL;
-
-   end NULL_TASK;
-
---PAGE
--- 
---  HIGH_TASK
---
-
-   procedure HIGH_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-   begin
-
-      TIMER_DRIVER.INITIALIZE;
-         RTEMS_TEST_SUPPORT.THREAD_ENABLE_DISPATCH;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-      
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "THREAD_ENABLE_DISPATCH", 
-         TMTEST.END_TIME, 
-         1, 
-         0,
-         0
-      );
-
-      TIMER_DRIVER.INITIALIZE;
-         RTEMS_TEST_SUPPORT.THREAD_SET_STATE( 
-            RTEMS_TEST_SUPPORT.THREAD_EXECUTING,
-            RTEMS.SUSPENDED
-         );
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-      
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "THREAD_SET_STATE", 
-         TMTEST.END_TIME, 
-         1, 
-         0,
-         0
-      );
-
-      -- FORCE CONTEXT SWITCH
-
-      RTEMS_TEST_SUPPORT.CONTEXT_SWITCH_NECESSARY := TRUE;
-
-      TIMER_DRIVER.INITIALIZE;
-         RTEMS_TEST_SUPPORT.THREAD_DISPATCH; -- dispatches MIDDLE_TASK
-
-   end HIGH_TASK;
-
---PAGE
--- 
---  MIDDLE_TASK
---
-
-   procedure MIDDLE_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-   begin
-
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-      
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "THREAD_DISPATCH (NO FP)", 
-         TMTEST.END_TIME, 
-         1, 
-         0,
-         0
-      );
-
-      RTEMS_TEST_SUPPORT.THREAD_SET_STATE( 
-         RTEMS_TEST_SUPPORT.THREAD_EXECUTING,
-         RTEMS.SUSPENDED
-      );
-
-      TMTEST.MIDDLE_TCB := RTEMS_TEST_SUPPORT.THREAD_EXECUTING;
- 
-      RTEMS_TEST_SUPPORT.THREAD_EXECUTING :=
-          RTEMS_TEST_SUPPORT.THREAD_TO_CONTROL_POINTER(
-             RTEMS_TEST_SUPPORT.CHAIN_NODE_POINTER_TO_ADDRESS(
-                RTEMS_TEST_SUPPORT.THREAD_READY_CHAIN( 200 ).FIRST
-             )
-          );
-
-      -- do NOT force context switch
-
-      RTEMS_TEST_SUPPORT.CONTEXT_SWITCH_NECESSARY := FALSE;
-
-      RTEMS_TEST_SUPPORT.THREAD_DISABLE_DISPATCH;
-
-      TIMER_DRIVER.INITIALIZE;
-         RTEMS_TEST_SUPPORT.CONTEXT_SWITCH(
-            RTEMS_TEST_SUPPORT.CONTEXT_TO_CONTROL_POINTER( 
-               TMTEST.MIDDLE_TCB.REGISTERS'ADDRESS 
-            ),
-            RTEMS_TEST_SUPPORT.CONTEXT_TO_CONTROL_POINTER( 
-               RTEMS_TEST_SUPPORT.THREAD_EXECUTING.REGISTERS'ADDRESS 
-            )
-         );
-
-   end MIDDLE_TASK;
-
---PAGE
--- 
---  LOW_TASK
---
-
-   procedure LOW_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      EXECUTING : RTEMS.TCB_POINTER;
-   begin
-
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-      
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "CONTEXT_SWITCH (NO FP)", 
-         TMTEST.END_TIME, 
-         1, 
-         0,
-         0
-      );
-
-      EXECUTING := RTEMS_TEST_SUPPORT.THREAD_EXECUTING;
-   
-      RTEMS_TEST_SUPPORT.THREAD_EXECUTING :=
-          RTEMS_TEST_SUPPORT.THREAD_TO_CONTROL_POINTER(
-             RTEMS_TEST_SUPPORT.CHAIN_NODE_POINTER_TO_ADDRESS(
-                RTEMS_TEST_SUPPORT.THREAD_READY_CHAIN( 201 ).FIRST
-             )
-          );
-
-      -- do NOT force context switch
-
-      RTEMS_TEST_SUPPORT.CONTEXT_SWITCH_NECESSARY := FALSE;
-
-      RTEMS_TEST_SUPPORT.THREAD_DISABLE_DISPATCH;
-
-      TIMER_DRIVER.INITIALIZE;
-
-         RTEMS_TEST_SUPPORT.CONTEXT_RESTORE_FP(
-            RTEMS_TEST_SUPPORT.THREAD_EXECUTING.FP_CONTEXT'ADDRESS
-         );
-         RTEMS_TEST_SUPPORT.CONTEXT_SWITCH(
-            RTEMS_TEST_SUPPORT.CONTEXT_TO_CONTROL_POINTER( 
-               EXECUTING.REGISTERS'ADDRESS 
-            ),
-            RTEMS_TEST_SUPPORT.CONTEXT_TO_CONTROL_POINTER( 
-               RTEMS_TEST_SUPPORT.THREAD_EXECUTING.REGISTERS'ADDRESS 
-            )
-         );
-
-   end LOW_TASK;
-
---PAGE
--- 
---  FLOATING_POINT_TASK_1
---
-
-   procedure FLOATING_POINT_TASK_1 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      EXECUTING           : RTEMS.TCB_POINTER;
-      FP_DECLARE;
-   begin
-
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-      
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "CONTEXT_SWITCH (restore 1st FP)", 
-         TMTEST.END_TIME, 
-         1, 
-         0,
-         0
-      );
-
-      EXECUTING := RTEMS_TEST_SUPPORT.THREAD_EXECUTING;
-   
-      RTEMS_TEST_SUPPORT.THREAD_EXECUTING :=
-          RTEMS_TEST_SUPPORT.THREAD_TO_CONTROL_POINTER(
-             RTEMS_TEST_SUPPORT.CHAIN_NODE_POINTER_TO_ADDRESS(
-                RTEMS_TEST_SUPPORT.THREAD_READY_CHAIN( 202 ).FIRST
-             )
-          );
-
-      -- do NOT force context switch
-
-      RTEMS_TEST_SUPPORT.CONTEXT_SWITCH_NECESSARY := FALSE;
-
-      RTEMS_TEST_SUPPORT.THREAD_DISABLE_DISPATCH;
-
-      TIMER_DRIVER.INITIALIZE;
-
-         RTEMS_TEST_SUPPORT.CONTEXT_SAVE_FP( EXECUTING.FP_CONTEXT'ADDRESS );
-         RTEMS_TEST_SUPPORT.CONTEXT_RESTORE_FP(
-            RTEMS_TEST_SUPPORT.THREAD_EXECUTING.FP_CONTEXT'ADDRESS
-         );
-         RTEMS_TEST_SUPPORT.CONTEXT_SWITCH(
-            RTEMS_TEST_SUPPORT.CONTEXT_TO_CONTROL_POINTER( 
-               EXECUTING.REGISTERS'ADDRESS 
-            ),
-            RTEMS_TEST_SUPPORT.CONTEXT_TO_CONTROL_POINTER( 
-               RTEMS_TEST_SUPPORT.THREAD_EXECUTING.REGISTERS'ADDRESS 
-            )
-         );
-
-      -- switch to FLOATING_POINT_TASK_2
-
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-      
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "CONTEXT_SWITCH (used->init FP)", 
-         TMTEST.END_TIME, 
-         1, 
-         0,
-         0 
-      );
-
-      FP_LOAD( 1.0 );
-
-      EXECUTING := RTEMS_TEST_SUPPORT.THREAD_EXECUTING;
-   
-      RTEMS_TEST_SUPPORT.THREAD_EXECUTING :=
-          RTEMS_TEST_SUPPORT.THREAD_TO_CONTROL_POINTER(
-             RTEMS_TEST_SUPPORT.CHAIN_NODE_POINTER_TO_ADDRESS(
-                RTEMS_TEST_SUPPORT.THREAD_READY_CHAIN( 202 ).FIRST
-             )
-          );
-
-      -- do NOT force context switch
-
-      RTEMS_TEST_SUPPORT.CONTEXT_SWITCH_NECESSARY := FALSE;
-
-      RTEMS_TEST_SUPPORT.THREAD_DISABLE_DISPATCH;
-
-      TIMER_DRIVER.INITIALIZE;
-
-         RTEMS_TEST_SUPPORT.CONTEXT_SAVE_FP( EXECUTING.FP_CONTEXT'ADDRESS );
-         RTEMS_TEST_SUPPORT.CONTEXT_RESTORE_FP(
-            RTEMS_TEST_SUPPORT.THREAD_EXECUTING.FP_CONTEXT'ADDRESS
-         );
-         RTEMS_TEST_SUPPORT.CONTEXT_SWITCH(
-            RTEMS_TEST_SUPPORT.CONTEXT_TO_CONTROL_POINTER( 
-               EXECUTING.REGISTERS'ADDRESS 
-            ),
-            RTEMS_TEST_SUPPORT.CONTEXT_TO_CONTROL_POINTER( 
-               RTEMS_TEST_SUPPORT.THREAD_EXECUTING.REGISTERS'ADDRESS 
-            )
-         );
-
-      -- switch to FLOATING_POINT_TASK_2
-
-   end FLOATING_POINT_TASK_1;
-
---PAGE
--- 
---  FLOATING_POINT_TASK_2
---
-
-   procedure FLOATING_POINT_TASK_2 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      EXECUTING           : RTEMS.TCB_POINTER;
-      FP_DECLARE;
-   begin
-
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-      
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "CONTEXT_SWITCH (init->init FP)", 
-         TMTEST.END_TIME, 
-         1, 
-         0,
-         0 
-      );
-
-      EXECUTING := RTEMS_TEST_SUPPORT.THREAD_EXECUTING;
-   
-      RTEMS_TEST_SUPPORT.THREAD_EXECUTING :=
-          RTEMS_TEST_SUPPORT.THREAD_TO_CONTROL_POINTER(
-             RTEMS_TEST_SUPPORT.CHAIN_NODE_POINTER_TO_ADDRESS(
-                RTEMS_TEST_SUPPORT.THREAD_READY_CHAIN( 201 ).FIRST
-             )
-          );
-
-      FP_LOAD( 1.0 );
-
-      -- do NOT force context switch
-
-      RTEMS_TEST_SUPPORT.CONTEXT_SWITCH_NECESSARY := FALSE;
-
-      RTEMS_TEST_SUPPORT.THREAD_DISABLE_DISPATCH;
-
-      TIMER_DRIVER.INITIALIZE;
-
-         RTEMS_TEST_SUPPORT.CONTEXT_SAVE_FP( EXECUTING.FP_CONTEXT'ADDRESS );
-         RTEMS_TEST_SUPPORT.CONTEXT_RESTORE_FP(
-            RTEMS_TEST_SUPPORT.THREAD_EXECUTING.FP_CONTEXT'ADDRESS
-         );
-         RTEMS_TEST_SUPPORT.CONTEXT_SWITCH(
-            RTEMS_TEST_SUPPORT.CONTEXT_TO_CONTROL_POINTER( 
-               EXECUTING.REGISTERS'ADDRESS 
-            ),
-            RTEMS_TEST_SUPPORT.CONTEXT_TO_CONTROL_POINTER( 
-               RTEMS_TEST_SUPPORT.THREAD_EXECUTING.REGISTERS'ADDRESS 
-            )
-         );
-
-      -- switch to FLOATING_POINT_TASK_1
-
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-      
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "CONTEXT_SWITCH (used->used FP)", 
-         TMTEST.END_TIME, 
-         1, 
-         0,
-         0
-      );
-
-      TMTEST.COMPLETE_TEST;
-
-      RTEMS.SHUTDOWN_EXECUTIVE( 0 );
-
-   end FLOATING_POINT_TASK_2;
-
---PAGE
--- 
---  COMPLETE_TEST
---
-
-   procedure COMPLETE_TEST
-   is 
-      INDEX         : RTEMS.UNSIGNED32;
-      OVERHEAD      : RTEMS.UNSIGNED32;
-      TASK_ID       : RTEMS.ID;
-      LOCATION      : RTEMS_TEST_SUPPORT.OBJECTS_LOCATIONS;
-      THE_SEMAPHORE : RTEMS.TCB_POINTER;
-      THE_THREAD    : RTEMS.TCB_POINTER;
-   begin
-
-      TIMER_DRIVER.INITIALIZE;
-         RTEMS_TEST_SUPPORT.THREAD_RESUME( TMTEST.MIDDLE_TCB );
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-      
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "THREAD_RESUME", 
-         TMTEST.END_TIME, 
-         1, 
-         0,
-         0
-      );
-
-      RTEMS_TEST_SUPPORT.THREAD_SET_STATE( 
-         TMTEST.MIDDLE_TCB,
-         RTEMS.WAITING_FOR_MESSAGE
-      );
-
-      TIMER_DRIVER.INITIALIZE;
-         RTEMS_TEST_SUPPORT.THREAD_UNBLOCK( TMTEST.MIDDLE_TCB );
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-      
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "THREAD_UNBLOCK", 
-         TMTEST.END_TIME, 
-         1, 
-         0,
-         0
-      );
-
-      RTEMS_TEST_SUPPORT.THREAD_SET_STATE( 
-         TMTEST.MIDDLE_TCB,
-         RTEMS.WAITING_FOR_MESSAGE
-      );
-
-      TIMER_DRIVER.INITIALIZE;
-         RTEMS_TEST_SUPPORT.THREAD_READY( TMTEST.MIDDLE_TCB );
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-      
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "THREAD_READY", 
-         TMTEST.END_TIME, 
-         1, 
-         0,
-         0
-      );
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            TIMER_DRIVER.EMPTY_FUNCTION;
-         end loop;
-      OVERHEAD := TIMER_DRIVER.READ_TIMER;
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            RTEMS_TEST_SUPPORT.THREAD_GET( 
-               TASK_ID, 
-               LOCATION, 
-               THE_THREAD
-            );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-      
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "THREAD_GET", 
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         0,
-         0
-      );
-
---      TIMER_DRIVER.INITIALIZE;
---         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
---         loop
---            RTEMS_TEST_SUPPORT.SEMAPHORE_GET( 
---               TMTEST.SEMAPHORE_ID, 
---               LOCATION, 
---               THE_SEMAPHORE
---            );
---         end loop;
---      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-      
---      TIME_TEST_SUPPORT.PUT_TIME( 
---         "SEMAPHORE_GET", 
---         TMTEST.END_TIME, 
---         TIME_TEST_SUPPORT.OPERATION_COUNT, 
---         0,
---         0
---      );
-        TEXT_IO.PUT_LINE( "SEMAPHORE_GET NOT IN ADA" );
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            RTEMS_TEST_SUPPORT.THREAD_GET( 
-               16#3#,
-               LOCATION, 
-               THE_THREAD
-            ); 
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-      
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "THREAD_GET (invalid id)", 
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         0,
-         0
-      );
-
-   end COMPLETE_TEST;
-
-end TMTEST;
diff --git a/c/src/ada-tests/tmtests/tm26/tmtest.ads b/c/src/ada-tests/tmtests/tm26/tmtest.ads
deleted file mode 100644
index 3f56e24010..0000000000
--- a/c/src/ada-tests/tmtests/tm26/tmtest.ads
+++ /dev/null
@@ -1,189 +0,0 @@
---
---  TMTEST / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package is the specification for Test 26 of the RTEMS
---  Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with TIMER_DRIVER;
-with RTEMS;
-
-package TMTEST is
-
---
---  This points to the RTEMS task control block for the MIDDLE_TASK.
---
-
-   MIDDLE_TCB   : RTEMS.TCB_POINTER;
-
---
---  The following is the ID of the semaphore used for timing operations.
---
-
-   SEMAPHORE_ID : RTEMS.ID;
-
---
---  The following variable is set to the execution time returned
---  by the timer.
---
-
-   END_TIME     : RTEMS.UNSIGNED32;
-
---
---  INIT
---
---  DESCRIPTION:
---
---  This RTEMS task initializes the application.
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  NULL_TASK
---
---  DESCRIPTION:
---
---  This RTEMS task has a NULL body and is only included to 
---  allow TASK_START to be invoked without impacting another
---  task.
---
-
-   procedure NULL_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  HIGH_TASK
---
---  DESCRIPTION:
---
---  This RTEMS task is the highest priority test task and 
---  thus executes first.  It is responsible for measuring
---  and reporting the following times:
---
---    + THREAD_DISABLE_DISPATCH
---    + THREAD_ENABLE_DISPATCH
---    + THREAD_SET_STATE
---
---  After measuring and reporting the above times, this task
---  starts the timer and forces dispatch to the MIDDLE_TASK.
---
-
-   procedure HIGH_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  MIDDLE_TASK
---
---  DESCRIPTION:
---
---  This RTEMS task stops the timer and reports the execution
---  time for THREAD_DISPATCH without any floating point context
---  save and restore involved.  Following this, it starts the
---  timer and forces a CONTEXT_SWITCH to the LOW_TASK.
---
-
-   procedure MIDDLE_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  LOW_TASK
---
---  DESCRIPTION:
---
---  This RTEMS task stops the timer and reports the execution
---  time for a raw CONTEXT_SWITCH without any floating point context
---  save and restore involved.  Following this, it starts the
---  timer and performs a CONTEXT_RESTORE_FP for the FLOATING_POINT_TASK_1
---  and a CONTEXT_SWITCH to FLOATING_POINT_TASK_1.
---
-
-   procedure LOW_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  FLOATING_POINT_TASK_1
---
---  DESCRIPTION:
---
---  This RTEMS task stops the timer and reports the execution
---  time for a CONTEXT_SWITCH which restores the first floating 
---  point context.  Following this, it starts the
---  timer and performs a CONTEXT_SAVE_FP and CONTEXT_RESTORE_FP 
---  and a CONTEXT_SWITCH to FLOATING_POINT_TASK_2.  Once
---  control is returned to this task FLOATING_POINT_TASK_2, the
---  timer is stopped and the execution time for CONTEXT_SWITCH
---  from a used to an initialized floating point context is reported.
---  Following this, it starts the timer and performs a 
---  CONTEXT_SAVE_FP and CONTEXT_RESTORE_FP and a CONTEXT_SWITCH 
---  to FLOATING_POINT_TASK_2.  
---
-
-   procedure FLOATING_POINT_TASK_1 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  FLOATING_POINT_TASK_2
---
---  DESCRIPTION:
---
---  This RTEMS task stops the timer and reports the execution
---  time for a CONTEXT_SWITCH which switches from one freshly 
---  initialized floating point context to another freshly 
---  initialized floating point context.  Following this, it 
---  "dirties" its floating point context and starts the
---  timer.  After this it performs a CONTEXT_SAVE_FP and 
---  CONTEXT_RESTORE_FP and a CONTEXT_SWITCH to FLOATING_POINT_TASK_1.
---  Once control is returned to this task FLOATING_POINT_TASK_2, the
---  timer is stopped and the execution time for CONTEXT_SWITCH
---  from one used floating point context to another used floating 
---  point context is reported.  After this, this task invokes
---  the COMPLETE_TEST subprogram to measure and report
---  the remaining execution times measured by this test.
---  
-
-   procedure FLOATING_POINT_TASK_2 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  COMPLETE_TEST
---
---  DESCRIPTION:
---
---  This subprogram is responsible for measuring and reporting the
---  following execution times:
---
---    + THREAD_RESUME 
---    + THREAD_UNBLOCK
---    + THREAD_READY
---    + THREAD_GET with a valid id
---    + THREAD_GET with an invalid id
---
-
-   procedure COMPLETE_TEST;
-
-end TMTEST;
diff --git a/c/src/ada-tests/tmtests/tm27/README b/c/src/ada-tests/tmtests/tm27/README
deleted file mode 100644
index 7fa8ba0b23..0000000000
--- a/c/src/ada-tests/tmtests/tm27/README
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-#  $Id$
-#
-
-This test requires interfacing to BSP provided macros which aid in
-installing an ISR.  It may or may not be worth the effort to convert.
-Primarily this would require a C file which provided real bodies
-to invoke for these macros.
diff --git a/c/src/ada-tests/tmtests/tm27/config.h b/c/src/ada-tests/tmtests/tm27/config.h
deleted file mode 100644
index 7e7793cf15..0000000000
--- a/c/src/ada-tests/tmtests/tm27/config.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*  config.h
- *
- *  This include file defines the Configuration Table for this test.
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-/* configuration information */
-
-#define CONFIGURE_TMTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
-
-#define CONFIGURE_MAXIMUM_TASKS              111
-#define CONFIGURE_TICKS_PER_TIMESLICE        0
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#define CONFIGURE_MAXIMUM_POSIX_THREADS              10
-#define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
-#define CONFIGURE_MAXIMUM_POSIX_MUTEXES              20
-#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES  10
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/c/src/ada-tests/tmtests/tm27/tm27.adb b/c/src/ada-tests/tmtests/tm27/tm27.adb
deleted file mode 100644
index 7a8e1ca9f3..0000000000
--- a/c/src/ada-tests/tmtests/tm27/tm27.adb
+++ /dev/null
@@ -1,57 +0,0 @@
---
---  MAIN / BODY
---
---  DESCRIPTION:
---
---  This is the entry point for Test TM27 of the Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-with TMTEST;
-with TEST_SUPPORT;
-
-procedure TM27 is
-  INIT_ID : RTEMS.ID;
-  STATUS  : RTEMS.STATUS_CODES;
-begin
-
-   RTEMS.TASK_CREATE(
-      RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
-      1,
-      RTEMS.MINIMUM_STACK_SIZE,
-      RTEMS.NO_PREEMPT,
-      RTEMS.DEFAULT_ATTRIBUTES,
-      INIT_ID,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
-
-
-   RTEMS.TASK_START(
-      INIT_ID,
-      TMTEST.INIT'ACCESS,
-      0,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
-
-   loop
-      delay 120.0;
-   end loop;
-
-end TM27;
-
diff --git a/c/src/ada-tests/tmtests/tm27/tmtest.adb b/c/src/ada-tests/tmtests/tm27/tmtest.adb
deleted file mode 100644
index 12761659be..0000000000
--- a/c/src/ada-tests/tmtests/tm27/tmtest.adb
+++ /dev/null
@@ -1,268 +0,0 @@
---
---  TMTEST / BODY
---
---  DESCRIPTION:
---
---  This package is the implementation of Test 27 of the RTEMS
---  Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with INTERRUPT_TIME_TEST_SUPPORT;
-with INTERFACES; use INTERFACES;
-with RTEMS_CALLING_OVERHEAD;
-with RTEMS;
-with RTEMS_TEST_SUPPORT;
-with TEST_SUPPORT;
-with TEXT_IO;
-with TIME_TEST_SUPPORT;
-with UNSIGNED32_IO;
-
-package body TMTEST is
-
---PAGE
--- 
---  INIT
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS  : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** TIME TEST 27 ***" );
-
-      RTEMS.TASK_CREATE( 
-         RTEMS.BUILD_NAME( 'T', 'A', '1', ' ' ),
-         254, 
-         2048, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         TMTEST.TASK_ID( 1 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE TASK_1" );
-
-      RTEMS.TASK_START( 
-         TMTEST.TASK_ID( 1 ),
-         TMTEST.TASK_1'ACCESS, 
-         0, 
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START TASK_1" );
-
-      RTEMS.TASK_CREATE( 
-         RTEMS.BUILD_NAME( 'T', 'A', '2', ' ' ),
-         254, 
-         2048, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         TMTEST.TASK_ID( 2 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE TASK_2" );
-
-      RTEMS.TASK_START( 
-         TMTEST.TASK_ID( 2 ),
-         TMTEST.TASK_2'ACCESS, 
-         0, 
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START TASK_2" );
-
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
-
-   end INIT;
-
---PAGE
--- 
---  TASK_1
---
-
-   procedure TASK_1 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-   begin
-
-      RTEMS_TEST_SUPPORT.THREAD_DISPATCH_DISABLE_LEVEL := 1;
-
-      TMTEST.INTERRUPT_NEST := 1;
-
-      INTERRUPT_TIME_TEST_SUPPORT.INSTALL_HANDLER( 
-         TMTEST.ISR_HANDLER'ADDRESS 
-      );
-
-      TIMER_DRIVER.INITIALIZE;
-         INTERRUPT_TIME_TEST_SUPPORT.CAUSE_INTERRUPT; 
-      -- goes to ISR_HANDLER
-         
-      TMTEST.INTERRUPT_RETURN_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "INTERRUPT_ENTER (nested interrupt)",
-         TMTEST.INTERRUPT_ENTER_NESTED_TIME, 
-         1, 
-         0,
-         0
-      );
- 
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "INTERRUPT_RETURN (nested interrupt)",
-         TMTEST.INTERRUPT_RETURN_NESTED_TIME, 
-         1, 
-         0,
-         0
-      );
- 
-      TMTEST.INTERRUPT_NEST := 0;
-      
-      RTEMS_TEST_SUPPORT.THREAD_DISPATCH_DISABLE_LEVEL := 0;
-      
-      TIMER_DRIVER.INITIALIZE;
-         INTERRUPT_TIME_TEST_SUPPORT.CAUSE_INTERRUPT; 
-      -- goes to ISR_HANDLER
-         
-      TMTEST.INTERRUPT_RETURN_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "INTERRUPT_ENTER (no preempt)",
-         TMTEST.INTERRUPT_ENTER_TIME, 
-         1, 
-         0,
-         0
-      );
- 
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "INTERRUPT_RETURN (no preempt)",
-         TMTEST.INTERRUPT_RETURN_TIME, 
-         1, 
-         0,
-         0
-      );
- 
-      RTEMS_TEST_SUPPORT.THREAD_DISPATCH_DISABLE_LEVEL := 0;
-      
-      RTEMS_TEST_SUPPORT.THREAD_HEIR :=
-          RTEMS_TEST_SUPPORT.THREAD_TO_CONTROL_POINTER(
-             RTEMS_TEST_SUPPORT.CHAIN_NODE_POINTER_TO_ADDRESS(
-                RTEMS_TEST_SUPPORT.THREAD_READY_CHAIN( 254 ).LAST
-             )
-          );
-
-      RTEMS_TEST_SUPPORT.CONTEXT_SWITCH_NECESSARY := TRUE;
-
-      TIMER_DRIVER.INITIALIZE;
-         INTERRUPT_TIME_TEST_SUPPORT.CAUSE_INTERRUPT; 
-      -- goes to ISR_HANDLER
-
-   end TASK_1;
-
---PAGE
--- 
---  TASK_2
---
-
-   procedure TASK_2 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-   begin
- 
-      TMTEST.INTERRUPT_RETURN_TIME := TIMER_DRIVER.READ_TIMER; 
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "INTERRUPT_ENTER (preempt)", 
-         TMTEST.INTERRUPT_ENTER_TIME, 
-         1, 
-         0,
-         0
-      );
- 
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "INTERRUPT_RETURN (preempt)",
-         TMTEST.INTERRUPT_RETURN_TIME, 
-         1, 
-         0,
-         0
-      );
-
-      RTEMS.SHUTDOWN_EXECUTIVE( 0 );
-
-   end TASK_2;
-
---PAGE
--- 
---  ISR_HANDLER
---
-
---
---  The ISR_HANDLER and ISR_HANDLER_INNER subprograms are structured
---  so that there will be as little entry overhead as possible included
---  in the interrupt entry time.
---
-
-   procedure ISR_HANDLER (
-      VECTOR : in     RTEMS.VECTOR_NUMBER
-   ) is
-   begin
-
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; 
-
-      TMTEST.ISR_HANDLER_INNER;
-
-   end ISR_HANDLER;
-
--- 
---  ISR_HANDLER_INNER
---
-
-   procedure ISR_HANDLER_INNER
-   is
-   begin
-
-      -- enable tracing here is necessary
-
-      INTERRUPT_TIME_TEST_SUPPORT.CLEAR_INTERRUPT;
-
-      case TMTEST.INTERRUPT_NEST is
-         when 0 =>
-            TMTEST.INTERRUPT_ENTER_TIME := TMTEST.END_TIME;
-
-         when 1 =>
-            TMTEST.INTERRUPT_ENTER_TIME := TMTEST.END_TIME;
-            TMTEST.INTERRUPT_NEST := 2;
-            TIMER_DRIVER.INITIALIZE;
-               INTERRUPT_TIME_TEST_SUPPORT.CAUSE_INTERRUPT; 
-            -- goes to a nested copy of ISR_HANDLER
- 
-            TMTEST.INTERRUPT_RETURN_NESTED_TIME := TIMER_DRIVER.READ_TIMER; 
-
-         when 2 =>
-            TMTEST.INTERRUPT_ENTER_NESTED_TIME := TMTEST.END_TIME;
-
-         when others =>
-             NULL;
-
-      end case;
-
-      -- Start the timer so interrupt return times can be measured
-
-      TIMER_DRIVER.INITIALIZE;
-    
-   end ISR_HANDLER_INNER;
-
-end TMTEST;
diff --git a/c/src/ada-tests/tmtests/tm27/tmtest.ads b/c/src/ada-tests/tmtests/tm27/tmtest.ads
deleted file mode 100644
index ef7848c822..0000000000
--- a/c/src/ada-tests/tmtests/tm27/tmtest.ads
+++ /dev/null
@@ -1,131 +0,0 @@
---
---  TMTEST / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package is the specification for Test 27 of the RTEMS
---  Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with TIMER_DRIVER;
-with RTEMS;
-
-package TMTEST is
-
---
---  This array contains the IDs of all RTEMS tasks created by this test.
---
-
-   TASK_ID : array ( RTEMS.UNSIGNED32 range 1 .. 2 ) of RTEMS.ID;
-
---
---  The following variable is set to the execution time returned
---  by the timer.
---
-
-   END_TIME : RTEMS.UNSIGNED32;
-
---
---  The following variable indicates which interrupt case is
---  currently being timed.
---
-
-   INTERRUPT_NEST : RTEMS.UNSIGNED32;
-
---
---  The following variables are set to the appropriate execution 
---  times by the ISR.  This is done so the times will be available
---  to be printed by a task.
---
-
-   INTERRUPT_ENTER_TIME  : RTEMS.UNSIGNED32;
-   INTERRUPT_RETURN_TIME : RTEMS.UNSIGNED32;
-
-   INTERRUPT_ENTER_NESTED_TIME  : RTEMS.UNSIGNED32;
-   INTERRUPT_RETURN_NESTED_TIME : RTEMS.UNSIGNED32;
-
---
---  INIT
---
---  DESCRIPTION:
---
---  This RTEMS task initializes the application.
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TASK_1
---
---  DESCRIPTION:
---
---  This RTEMS task reports the following execution times:
---
---    + interrupt entry overhead for a nested interrupt
---    + interrupt exit overhead for a nested interrupt
---    + interrupt entry overhead when no preemption occurs
---    + interrupt exit overhead when no preemption occurs
---
-
-   procedure TASK_1 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TASK_2
---
---  DESCRIPTION:
---
---  This RTEMS task reports the following execution times:
---
---    + interrupt entry overhead when preemption occurs
---    + interrupt exit overhead when preemption occurs
---
-
-   procedure TASK_2 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  ISR_HANDLER
---
---  DESCRIPTION:
---
---  This subprogram is the test ISR.  It simply stops the
---  timer and save the execution time for ISR_HANDLER_INNER.
---  This is done to minimize the subroutine linkage overhead
---  for this routine.
---
-
-   procedure ISR_HANDLER (
-      VECTOR : in     RTEMS.VECTOR_NUMBER
-   );
-
---
---  ISR_HANDLER_INNER
---
---  DESCRIPTION:
---
---  This subprogram is responsible for storing the execution
---  time for the case currently being timed.
---
-
-   procedure ISR_HANDLER_INNER;
-
-end TMTEST;
diff --git a/c/src/ada-tests/tmtests/tm28/config.h b/c/src/ada-tests/tmtests/tm28/config.h
deleted file mode 100644
index 0c238dfbaf..0000000000
--- a/c/src/ada-tests/tmtests/tm28/config.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*  config.h
- *
- *  This include file defines the Configuration Table for this test.
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-/* configuration information */
-
-#define CONFIGURE_TMTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
-
-#define CONFIGURE_MAXIMUM_TASKS              2
-#define CONFIGURE_MAXIMUM_PORTS              1
-#define CONFIGURE_TICKS_PER_TIMESLICE        0
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#define CONFIGURE_MAXIMUM_POSIX_THREADS              10
-#define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
-#define CONFIGURE_MAXIMUM_POSIX_MUTEXES              20
-#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES  10
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/c/src/ada-tests/tmtests/tm28/tm28.adb b/c/src/ada-tests/tmtests/tm28/tm28.adb
deleted file mode 100644
index e76d166e7a..0000000000
--- a/c/src/ada-tests/tmtests/tm28/tm28.adb
+++ /dev/null
@@ -1,57 +0,0 @@
---
---  MAIN / BODY
---
---  DESCRIPTION:
---
---  This is the entry point for Test TM28 of the Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-with TMTEST;
-with TEST_SUPPORT;
-
-procedure TM28 is
-  INIT_ID : RTEMS.ID;
-  STATUS  : RTEMS.STATUS_CODES;
-begin
-
-   RTEMS.TASK_CREATE(
-      RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
-      1,
-      RTEMS.MINIMUM_STACK_SIZE,
-      RTEMS.NO_PREEMPT,
-      RTEMS.DEFAULT_ATTRIBUTES,
-      INIT_ID,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
-
-
-   RTEMS.TASK_START(
-      INIT_ID,
-      TMTEST.INIT'ACCESS,
-      0,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
-
-   loop
-      delay 120.0;
-   end loop;
-
-end TM28;
-
diff --git a/c/src/ada-tests/tmtests/tm28/tmtest.adb b/c/src/ada-tests/tmtests/tm28/tmtest.adb
deleted file mode 100644
index 7505635c06..0000000000
--- a/c/src/ada-tests/tmtests/tm28/tmtest.adb
+++ /dev/null
@@ -1,176 +0,0 @@
---
---  TMTEST / BODY
---
---  DESCRIPTION:
---
---  This package is the implementation of Test 28 of the RTEMS
---  Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with INTERFACES; use INTERFACES;
-with RTEMS;
-with RTEMS_CALLING_OVERHEAD;
-with TEST_SUPPORT;
-with TEXT_IO;
-with TIME_TEST_SUPPORT;
-with UNSIGNED32_IO;
-
-package body TMTEST is
-
---PAGE
--- 
---  INIT
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      TASK_ID : RTEMS.ID;
-      STATUS  : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** TIME TEST 28 ***" );
-
-      RTEMS.TASK_CREATE( 
-         RTEMS.BUILD_NAME( 'T', 'E', 'S', 'T' ),
-         128, 
-         1024, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         TMTEST.TASK_ID( 1 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE" );
-
-      RTEMS.TASK_START( 
-         TMTEST.TASK_ID( 1 ),
-         TMTEST.TEST_TASK'ACCESS, 
-         0, 
-         STATUS 
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START" );
-
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
-
-   end INIT;
-
---PAGE
--- 
---  TEST_TASK
---
-
-   procedure TEST_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      NAME      : RTEMS.NAME;
-      OVERHEAD  : RTEMS.UNSIGNED32;
-      CONVERTED : RTEMS.ADDRESS;
-      STATUS    : RTEMS.STATUS_CODES;
-   begin
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            TIMER_DRIVER.EMPTY_FUNCTION;
-         end loop;
-      OVERHEAD := TIMER_DRIVER.READ_TIMER;
-
-      NAME := RTEMS.BUILD_NAME( 'P', 'O', 'R', 'T' );
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            RTEMS.PORT_CREATE(
-               NAME,
-               TMTEST.INTERNAL_PORT_AREA'ADDRESS,
-               TMTEST.EXTERNAL_PORT_AREA'ADDRESS,
-               16#FF#,
-               TMTEST.PORT_ID( INDEX ),
-               STATUS
-            );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "PORT_CREATE",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         RTEMS_CALLING_OVERHEAD.PORT_CREATE
-      );
- 
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            RTEMS.PORT_EXTERNAL_TO_INTERNAL(
-               TMTEST.PORT_ID( 1 ),
-               TMTEST.EXTERNAL_PORT_AREA( 16#F# )'ADDRESS,
-               CONVERTED,
-               STATUS
-            );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "PORT_EXTERNAL_TO_INTERNAL",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         RTEMS_CALLING_OVERHEAD.PORT_EXTERNAL_TO_INTERNAL
-      );
- 
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            RTEMS.PORT_INTERNAL_TO_EXTERNAL(
-               TMTEST.PORT_ID( 1 ),
-               TMTEST.INTERNAL_PORT_AREA( 16#F# )'ADDRESS,
-               CONVERTED,
-               STATUS
-            );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "PORT_INTERNAL_TO_EXTERNAL",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         RTEMS_CALLING_OVERHEAD.PORT_INTERNAL_TO_EXTERNAL
-      );
- 
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            RTEMS.PORT_DELETE( TMTEST.PORT_ID( INDEX ), STATUS );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "PORT_DELETE",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         RTEMS_CALLING_OVERHEAD.PORT_DELETE
-      );
-
-      RTEMS.SHUTDOWN_EXECUTIVE( 0 );
- 
-   end TEST_TASK;
-
-end TMTEST;
diff --git a/c/src/ada-tests/tmtests/tm28/tmtest.ads b/c/src/ada-tests/tmtests/tm28/tmtest.ads
deleted file mode 100644
index 5bf220d453..0000000000
--- a/c/src/ada-tests/tmtests/tm28/tmtest.ads
+++ /dev/null
@@ -1,106 +0,0 @@
---
---  TMTEST / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package is the specification for Test 28 of the RTEMS
---  Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with SYSTEM;
-with TIME_TEST_SUPPORT;
-with TIMER_DRIVER;
-with RTEMS;
-with System.Storage_Elements;
-
-package TMTEST is
-
---
---  This array contains the IDs of all RTEMS tasks created by this test.
---
-
-   TASK_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.ID;
-
---
---  This array contains the IDs of all RTEMS ports created by this test.
---
-
-   PORT_ID   : array ( RTEMS.UNSIGNED32 
-      range 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT ) of RTEMS.ID;
-
---
---  The following area defines a memory area to be used as the
---  internal address space of the port.
--- 
-
-   INTERNAL_PORT_AREA_ADDRESS : constant System.Address :=
-      System.Storage_Elements.To_Address(16#00001000#);
-
-   INTERNAL_PORT_AREA : array ( RTEMS.UNSIGNED32 range 0 .. 255 )
-      of RTEMS.UNSIGNED8;
-   for INTERNAL_PORT_AREA use at INTERNAL_PORT_AREA_ADDRESS;
-
---
---  The following area defines a memory area to be used as the
---  external address space of the port.
--- 
-
-   EXTERNAL_PORT_AREA_ADDRESS : constant System.Address :=
-      System.Storage_Elements.To_Address(16#00002000#);
-
-   EXTERNAL_PORT_AREA : array ( RTEMS.UNSIGNED32 range 0 .. 255 )
-      of RTEMS.UNSIGNED8;
-   for EXTERNAL_PORT_AREA use at EXTERNAL_PORT_AREA_ADDRESS;
-
---
---  The following variable is set to the execution time returned
---  by the timer.
---
-
-   END_TIME  : RTEMS.UNSIGNED32;
-
---
---  INIT
---
---  DESCRIPTION:
---
---  This RTEMS task initializes the application.
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TEST_TASK
---
---  DESCRIPTION:
---
---  This RTEMS task is responsible for measuring and reporting the
---  following directive execution times:
---
---    + PORT_CREATE
---    + PORT_EXTERNAL_TO_INTERNAL
---    + PORT_INTERNAL_TO_EXTERNAL
---    + PORT_DELETE
---
-
-   procedure TEST_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
-end TMTEST;
diff --git a/c/src/ada-tests/tmtests/tm29/config.h b/c/src/ada-tests/tmtests/tm29/config.h
deleted file mode 100644
index d22b4a61cb..0000000000
--- a/c/src/ada-tests/tmtests/tm29/config.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*  config.h
- *
- *  This include file defines the Configuration Table for this test.
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-/* configuration information */
-
-#define CONFIGURE_TMTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
-
-#define CONFIGURE_MAXIMUM_TASKS              111
-#define CONFIGURE_MAXIMUM_PERIODS            111
-#define CONFIGURE_TICKS_PER_TIMESLICE        0
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#define CONFIGURE_MAXIMUM_POSIX_THREADS              10
-#define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
-#define CONFIGURE_MAXIMUM_POSIX_MUTEXES              20
-#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES  10
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/c/src/ada-tests/tmtests/tm29/tm29.adb b/c/src/ada-tests/tmtests/tm29/tm29.adb
deleted file mode 100644
index 7834403d2b..0000000000
--- a/c/src/ada-tests/tmtests/tm29/tm29.adb
+++ /dev/null
@@ -1,57 +0,0 @@
---
---  MAIN / BODY
---
---  DESCRIPTION:
---
---  This is the entry point for Test TM29 of the Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-with TMTEST;
-with TEST_SUPPORT;
-
-procedure TM29 is
-  INIT_ID : RTEMS.ID;
-  STATUS  : RTEMS.STATUS_CODES;
-begin
-
-   RTEMS.TASK_CREATE(
-      RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
-      1,
-      RTEMS.MINIMUM_STACK_SIZE,
-      RTEMS.NO_PREEMPT,
-      RTEMS.DEFAULT_ATTRIBUTES,
-      INIT_ID,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
-
-
-   RTEMS.TASK_START(
-      INIT_ID,
-      TMTEST.INIT'ACCESS,
-      0,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
-
-   loop
-      delay 120.0;
-   end loop;
-
-end TM29;
-
diff --git a/c/src/ada-tests/tmtests/tm29/tmtest.adb b/c/src/ada-tests/tmtests/tm29/tmtest.adb
deleted file mode 100644
index e1f1af77dd..0000000000
--- a/c/src/ada-tests/tmtests/tm29/tmtest.adb
+++ /dev/null
@@ -1,234 +0,0 @@
---
---  TMTEST / BODY
---
---  DESCRIPTION:
---
---  This package is the implementation of Test 29 of the RTEMS
---  Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with INTERFACES; use INTERFACES;
-with RTEMS;
-with RTEMS_CALLING_OVERHEAD;
-with TEST_SUPPORT;
-with TEXT_IO;
-with TIME_TEST_SUPPORT;
-with UNSIGNED32_IO;
-
-package body TMTEST is
-
---PAGE
--- 
---  INIT
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      ID     : RTEMS.ID;
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** TIME TEST 29 ***" );
-
-      TMTEST.PERIOD_NAME := RTEMS.BUILD_NAME( 'P', 'R', 'D', ' ' );
-
-      TIMER_DRIVER.INITIALIZE;
-         RTEMS.RATE_MONOTONIC_CREATE( TMTEST.PERIOD_NAME, ID, STATUS );
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "RATE_MONOTONIC_CREATE",
-         TMTEST.END_TIME, 
-         1,
-         0,
-         RTEMS_CALLING_OVERHEAD.RATE_MONOTONIC_CREATE
-      );
-
-      TIMER_DRIVER.INITIALIZE;
-         RTEMS.RATE_MONOTONIC_PERIOD( ID, 10, STATUS );
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "RATE_MONOTONIC_PERIOD (initial)",
-         TMTEST.END_TIME, 
-         1,
-         0,
-         RTEMS_CALLING_OVERHEAD.RATE_MONOTONIC_PERIOD
-      );
-
-      TIMER_DRIVER.INITIALIZE;
-         RTEMS.RATE_MONOTONIC_PERIOD( ID, RTEMS.PERIOD_STATUS, STATUS );
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "RATE_MONOTONIC_PERIOD (STATUS)",
-         TMTEST.END_TIME, 
-         1,
-         0,
-         RTEMS_CALLING_OVERHEAD.RATE_MONOTONIC_PERIOD
-      );
-
-      TIMER_DRIVER.INITIALIZE;
-         RTEMS.RATE_MONOTONIC_CANCEL( ID, STATUS );
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "RATE_MONOTONIC_CANCEL",
-         TMTEST.END_TIME, 
-         1,
-         0,
-         RTEMS_CALLING_OVERHEAD.RATE_MONOTONIC_CANCEL
-      );
-
-      TIMER_DRIVER.INITIALIZE;
-         RTEMS.RATE_MONOTONIC_DELETE( ID, STATUS );
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "RATE_MONOTONIC_DELETE (cancelled)",
-         TMTEST.END_TIME, 
-         1,
-         0,
-         RTEMS_CALLING_OVERHEAD.RATE_MONOTONIC_DELETE
-      );
-
-      RTEMS.RATE_MONOTONIC_CREATE( TMTEST.PERIOD_NAME, ID, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "RATE_MONOTONIC_CREATE" );
-
-      RTEMS.RATE_MONOTONIC_PERIOD( ID, 10, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "RATE_MONOTONIC_PERIOD" );
-
-      TIMER_DRIVER.INITIALIZE;
-         RTEMS.RATE_MONOTONIC_DELETE( ID, STATUS );
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "RATE_MONOTONIC_DELETE (active)",
-         TMTEST.END_TIME, 
-         1,
-         0,
-         RTEMS_CALLING_OVERHEAD.RATE_MONOTONIC_DELETE
-      );
-
-      for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-      loop
-
-         RTEMS.TASK_CREATE( 
-            RTEMS.BUILD_NAME( 'T', 'E', 'S', 'T' ),
-            128, 
-            1024, 
-            RTEMS.DEFAULT_MODES,
-            RTEMS.DEFAULT_ATTRIBUTES,
-            ID,
-            STATUS
-         );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE LOOP" );
-
-         RTEMS.TASK_START( ID, TMTEST.TASKS'ACCESS, 0, STATUS );
-         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START LOOP" );
-
-      end loop;
-
-      RTEMS.TASK_CREATE( 
-         RTEMS.BUILD_NAME( 'L', 'O', 'W', ' ' ),
-         200, 
-         2048, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         ID,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE LOOP" );
-
-      RTEMS.TASK_START( ID, TMTEST.LOW_TASK'ACCESS, 0, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START LOOP" );
-
-      TMTEST.TASK_COUNT := 0;
-
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
-
-   end INIT;
-
---PAGE
--- 
---  TASKS
---
-
-   procedure TASKS (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      ID     : RTEMS.NAME;
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      RTEMS.RATE_MONOTONIC_CREATE( TMTEST.PERIOD_NAME, ID, STATUS );
-      RTEMS.RATE_MONOTONIC_PERIOD( ID, 10, STATUS );
-
-      -- Give up the processor to allow all tasks to actually
-      -- create and start their period timer before the benchmark
-      -- timer driver is initialized.
-
-      RTEMS.TASK_WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS );
-
-      TMTEST.TASK_COUNT := TMTEST.TASK_COUNT + 1;
-
-      if TMTEST.TASK_COUNT = 1 then
-         TIMER_DRIVER.INITIALIZE;
-      end if;
-
-      RTEMS.RATE_MONOTONIC_PERIOD( ID, 100, STATUS );
-
-   end TASKS;
-
---PAGE
--- 
---  LOW_TASK
---
-
-   procedure LOW_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      INDEX    : RTEMS.UNSIGNED32;
-      OVERHEAD : RTEMS.UNSIGNED32;
-      STATUS   : RTEMS.STATUS_CODES;
-   begin
-
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            TIMER_DRIVER.EMPTY_FUNCTION;
-         end loop;
-      OVERHEAD := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "RATE_MONOTONIC_PERIOD (blocking)",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         RTEMS_CALLING_OVERHEAD.RATE_MONOTONIC_PERIOD
-      );
-   
-      RTEMS.SHUTDOWN_EXECUTIVE( 0 );
-
-   end LOW_TASK;
-
-end TMTEST;
diff --git a/c/src/ada-tests/tmtests/tm29/tmtest.ads b/c/src/ada-tests/tmtests/tm29/tmtest.ads
deleted file mode 100644
index e60ded1e11..0000000000
--- a/c/src/ada-tests/tmtests/tm29/tmtest.ads
+++ /dev/null
@@ -1,96 +0,0 @@
---
---  TMTEST / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package is the specification for Test 29 of the RTEMS
---  Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with TIMER_DRIVER;
-with RTEMS;
-
-package TMTEST is
-
---
---  The following is the name used for all periods created by this test.
---
-
-   PERIOD_NAME : RTEMS.NAME;
-
---
---  The following is used to allow all tasks to create and start
---  their period timers before the timer is started for timing 
---  the blocking case of RATE_MONOTONIC_PERIOD.
---
-
-   TASK_COUNT  : RTEMS.UNSIGNED32;
-
---
---  The following variable is set to the execution time returned
---  by the timer.
---
-
-   END_TIME    : RTEMS.UNSIGNED32;
-
---
---  INIT
---
---  DESCRIPTION:
---
---  This RTEMS task initializes the application.  It also measures and
---  reports the following directive execution times:
---
---    + RATE_MONOTONIC_CREATE
---    + RATE_MONOTONIC_PERIOD the initial time
---    + RATE_MONOTONIC_PERIOD for a period's status
---    + RATE_MONOTONIC_CANCEL
---    + RATE_MONOTONIC_DELETE of a cancelled period
---    + RATE_MONOTONIC_DELETE of an active period
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TEST_TASK
---
---  DESCRIPTION:
---
---  The first of these RTEMS tasks starts the timer.  All of these
---  tasks execute a blocking RATE_MONOTONIC_PERIOD.
---
-
-   procedure TASKS (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TEST_TASK
---
---  DESCRIPTION:
---
---  This RTEMS task stops the timer and reports the execution
---  time for a blocking RATE_MONOTONIC_PERIOD.
---
-
-   procedure LOW_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
-end TMTEST;
diff --git a/c/src/ada-tests/tmtests/tmck/config.h b/c/src/ada-tests/tmtests/tmck/config.h
deleted file mode 100644
index be54f54955..0000000000
--- a/c/src/ada-tests/tmtests/tmck/config.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*  config.h
- *
- *  This include file defines the Configuration Table for this test.
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-/* configuration information */
-
-#define CONFIGURE_TMTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
-
-#define CONFIGURE_MAXIMUM_TASKS              2
-#define CONFIGURE_MAXIMUM_SEMAPHORES         1
-#define CONFIGURE_TICKS_PER_TIMESLICE        0
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#define CONFIGURE_MAXIMUM_POSIX_THREADS              10
-#define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
-#define CONFIGURE_MAXIMUM_POSIX_MUTEXES              20
-#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES  10
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/c/src/ada-tests/tmtests/tmck/tmck.adb b/c/src/ada-tests/tmtests/tmck/tmck.adb
deleted file mode 100644
index 4f05735bca..0000000000
--- a/c/src/ada-tests/tmtests/tmck/tmck.adb
+++ /dev/null
@@ -1,57 +0,0 @@
---
---  MAIN / BODY
---
---  DESCRIPTION:
---
---  This is the entry point for Test TMCK of the Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-with TMTEST;
-with TEST_SUPPORT;
-
-procedure TMCK is
-  INIT_ID : RTEMS.ID;
-  STATUS  : RTEMS.STATUS_CODES;
-begin
-
-   RTEMS.TASK_CREATE(
-      RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
-      1,
-      RTEMS.MINIMUM_STACK_SIZE,
-      RTEMS.NO_PREEMPT,
-      RTEMS.DEFAULT_ATTRIBUTES,
-      INIT_ID,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
-
-
-   RTEMS.TASK_START(
-      INIT_ID,
-      TMTEST.INIT'ACCESS,
-      0,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
-
-   loop
-      delay 120.0;
-   end loop;
-
-end TMCK;
-
diff --git a/c/src/ada-tests/tmtests/tmck/tmtest.adb b/c/src/ada-tests/tmtests/tmck/tmtest.adb
deleted file mode 100644
index 254a462bcc..0000000000
--- a/c/src/ada-tests/tmtests/tmck/tmtest.adb
+++ /dev/null
@@ -1,220 +0,0 @@
---
---  TMTEST / BODY
---
---  DESCRIPTION:
---
---  This package is the implementation of Timer Check Test of the RTEMS
---  Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with TIMER_DRIVER;
-with INTERFACES; use INTERFACES;
-with RTEMS;
-with TEST_SUPPORT;
-with TEXT_IO;
-with TIME_TEST_SUPPORT;
-with UNSIGNED32_IO;
-
-package body TMTEST is
-
---PAGE
--- 
---  INIT
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** TIME TEST CHECK ***" );
-
-      TIMER_DRIVER.SET_FIND_AVERAGE_OVERHEAD( TRUE );
-
-      TMTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME(  'T', 'A', '1', ' ' );
-
-      RTEMS.TASK_CREATE( 
-         TMTEST.TASK_NAME( 1 ), 
-         1, 
-         2048, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         TMTEST.TASK_ID( 1 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA1" );
-
-      RTEMS.TASK_START(
-         TMTEST.TASK_ID( 1 ),
-         TMTEST.TASK_1'ACCESS,
-         0,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA1" );
-
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
-
-   end INIT;
-
---PAGE
--- 
---  TASK_1
---
-
-   procedure TASK_1 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      INDEX                    : RTEMS.UNSIGNED32;
-   begin
-
-      TMTEST.CHECK_READ_TIMER;
-
-TEST_SUPPORT.PAUSE;
-
-      TIMER_DRIVER.INITIALIZE;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "NULL timer stopped at", 
-         TMTEST.END_TIME, 
-         1, 
-         0,
-         0
-      );
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 0 .. 1000
-         loop
-            TIMER_DRIVER.EMPTY_FUNCTION;
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "LOOP (1000) timer stopped at", 
-         TMTEST.END_TIME, 
-         1, 
-         0,
-         0
-      );
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 0 .. 10000
-         loop
-            TIMER_DRIVER.EMPTY_FUNCTION;
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "LOOP (10000) timer stopped at", 
-         TMTEST.END_TIME, 
-         1, 
-         0,
-         0
-      );
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 0 .. 50000
-         loop
-            TIMER_DRIVER.EMPTY_FUNCTION;
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "LOOP (50000) timer stopped at", 
-         TMTEST.END_TIME, 
-         1, 
-         0,
-         0
-      );
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 0 .. 100000
-         loop
-            TIMER_DRIVER.EMPTY_FUNCTION;
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "LOOP (100000) timer stopped at", 
-         TMTEST.END_TIME, 
-         1, 
-         0,
-         0
-      );
-
-      RTEMS.SHUTDOWN_EXECUTIVE( 0 );
-   
-   end TASK_1;
-
---PAGE
--- 
---  CHECK_READ_TIMER
---
-
-   procedure CHECK_READ_TIMER 
-   is
-      INDEX : RTEMS.UNSIGNED32;
-      TIME  : RTEMS.UNSIGNED32;
-   begin
-
-      for INDEX in TMTEST.DISTRIBUTION'FIRST .. TMTEST.DISTRIBUTION'LAST
-      loop
-          TMTEST.DISTRIBUTION( INDEX ) := 0;
-      end loop;
-
-      for INDEX in 1 .. TMTEST.OPERATION_COUNT
-      loop
-
-         loop
-            TIMER_DRIVER.INITIALIZE;
-            TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-      
-            exit when 
-               TMTEST.END_TIME <= RTEMS.UNSIGNED32( TMTEST.DISTRIBUTION'LAST );
-
-            TEXT_IO.PUT( "TOO LONG (" );
-            UNSIGNED32_IO.PUT( TMTEST.END_TIME );
-            TEXT_IO.PUT_LINE( ")!!!" );
-         end loop;
-
-         TMTEST.DISTRIBUTION( TMTEST.END_TIME ) :=
-             TMTEST.DISTRIBUTION( TMTEST.END_TIME ) + 1;
-
-      end loop;
-
-      TEXT_IO.PUT_LINE( 
-         "Units may not be in microseconds for this test!!!"
-      );
-
-      TIME := 0;
-
-      for INDEX in TMTEST.DISTRIBUTION'FIRST .. TMTEST.DISTRIBUTION'LAST
-      loop
-         if TMTEST.DISTRIBUTION( INDEX ) /= 0 then
-            TIME := TIME + (TMTEST.DISTRIBUTION( INDEX ) * INDEX);
-            UNSIGNED32_IO.PUT( INDEX );
-            TEXT_IO.PUT( " " );
-            UNSIGNED32_IO.PUT( TMTEST.DISTRIBUTION( INDEX ) );
-            TEXT_IO.NEW_LINE;
-         end if;
-      end loop;
-
-      TEXT_IO.PUT( "Total time = " );
-      UNSIGNED32_IO.PUT( TIME );
-      TEXT_IO.NEW_LINE;
-
-   end CHECK_READ_TIMER;
-
-end TMTEST;
diff --git a/c/src/ada-tests/tmtests/tmck/tmtest.ads b/c/src/ada-tests/tmtests/tmck/tmtest.ads
deleted file mode 100644
index 8f82d786a2..0000000000
--- a/c/src/ada-tests/tmtests/tmck/tmtest.ads
+++ /dev/null
@@ -1,97 +0,0 @@
---
---  TMTEST / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package is the specification for Timer Check Test of the RTEMS
---  Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with TIMER_DRIVER;
-with RTEMS;
-
-package TMTEST is
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS tasks created
---  by this test.
---
-
-   TASK_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.ID;
-   TASK_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.NAME;
-
---
---  The following variable is set to the execution time returned
---  by the timer.
---
-
-   END_TIME  : RTEMS.UNSIGNED32;
-
---
---  The following defines the number of iterations of each timed
---  operation to perform.
---
-
-   OPERATION_COUNT      : constant RTEMS.UNSIGNED32 := 100000;
-
---  
---  The following array is used to determine how many times
---  each time between 0 and 1000 microseconds was returned
---  when simply starting and stopping the timer.
-
-   DISTRIBUTION : array ( RTEMS.UNSIGNED32 range 0 .. 10000 ) of RTEMS.UNSIGNED32;
-
---
---  INIT
---
---  DESCRIPTION:
---
---  This RTEMS task initializes the application.
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TASK_1
---
---  DESCRIPTION:
---
---  This RTEMS task invokes CHECK_READ_TIMER before demonstrating
---  that increasing the order of magnitude of the number of loop
---  iterations performed has a corresponding impact on the time
---  reported by the timer driver.
---
-
-   procedure TASK_1 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  CHECK_READ_TIMER
---
---  DESCRIPTION:
---
---  This subprogram is used to determine the overhead associated
---  with starting and stopping the timer.  It is also useful
---  for determining if unexpected times will be reported.
---
-
-   procedure CHECK_READ_TIMER;
-
-end TMTEST;
diff --git a/c/src/ada-tests/tmtests/tmoverhd/README b/c/src/ada-tests/tmtests/tmoverhd/README
deleted file mode 100644
index d5624c4270..0000000000
--- a/c/src/ada-tests/tmtests/tmoverhd/README
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-#  $Id$
-#
-
-This test is of marginal usefulness in testing the bindings.  It
-shows how much overhead is required to call the Ada binding
-routine but does not give any indication of how much overhead the
-binding itself adds.  This information can be inferred by subtracting
-the C times from Ada times on the same target processor.
diff --git a/c/src/ada-tests/tmtests/tmoverhd/config.h b/c/src/ada-tests/tmtests/tmoverhd/config.h
deleted file mode 100644
index be54f54955..0000000000
--- a/c/src/ada-tests/tmtests/tmoverhd/config.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*  config.h
- *
- *  This include file defines the Configuration Table for this test.
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-/* configuration information */
-
-#define CONFIGURE_TMTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
-
-#define CONFIGURE_MAXIMUM_TASKS              2
-#define CONFIGURE_MAXIMUM_SEMAPHORES         1
-#define CONFIGURE_TICKS_PER_TIMESLICE        0
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#define CONFIGURE_MAXIMUM_POSIX_THREADS              10
-#define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
-#define CONFIGURE_MAXIMUM_POSIX_MUTEXES              20
-#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES  10
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/c/src/ada-tests/tmtests/tmoverhd/dummy_rtems.adb b/c/src/ada-tests/tmtests/tmoverhd/dummy_rtems.adb
deleted file mode 100644
index e6a3519e99..0000000000
--- a/c/src/ada-tests/tmtests/tmoverhd/dummy_rtems.adb
+++ /dev/null
@@ -1,877 +0,0 @@
---
---  DUMMY_RTEMS / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package contains implementation of stub routines
---  which are used to time the invocation overhead incurred
---  with an Ada application program invokes each RTEMS directive.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-
-package body DUMMY_RTEMS is
-
--- Initialization Manager
-
-   procedure INITIALIZE_EXECUTIVE (
-      CONFIGURATION_TABLE   : in     RTEMS.CONFIGURATION_TABLE_POINTER;
-      CPU_TABLE             : in     RTEMS.CPU_TABLE_POINTER
-   ) is
-   begin
-
-      NULL;
-
-   end INITIALIZE_EXECUTIVE;
-
-   procedure SHUTDOWN_EXECUTIVE (
-      RESULT : in     RTEMS.UNSIGNED32
-   ) is
-   begin
-
-      NULL;
-
-   end SHUTDOWN_EXECUTIVE;
-
--- Task Manager
-
-   procedure TASK_CREATE (
-      NAME             : in     RTEMS.NAME;
-      INITIAL_PRIORITY : in     RTEMS.TASK_PRIORITY;
-      STACK_SIZE       : in     RTEMS.UNSIGNED32;
-      INITIAL_MODES    : in     RTEMS.MODE;
-      ATTRIBUTE_SET    : in     RTEMS.ATTRIBUTE;
-      ID               :    out RTEMS.ID;
-      RESULT           :    out RTEMS.STATUS_CODES
-   ) is
-   begin
-
-      RESULT := RTEMS.SUCCESSFUL;
-
-   end TASK_CREATE;
-
-   procedure TASK_IDENT (
-      NAME   : in     RTEMS.NAME;
-      NODE   : in     RTEMS.UNSIGNED32;
-      ID     :    out RTEMS.ID;
-      RESULT :    out RTEMS.STATUS_CODES
-   ) is
-   begin
-
-      RESULT := RTEMS.SUCCESSFUL;
-
-   end TASK_IDENT;
-
-   procedure TASK_START (
-      ID          : in     RTEMS.ID;
-      ENTRY_POINT : in     RTEMS.TASK_ENTRY;
-      ARGUMENT    : in     RTEMS.UNSIGNED32;
-      RESULT      :    out RTEMS.STATUS_CODES
-   ) is
-   begin
-
-      RESULT := RTEMS.SUCCESSFUL;
-
-   end TASK_START;
-
-   procedure TASK_RESTART (
-      ID       : in     RTEMS.ID;
-      ARGUMENT : in     RTEMS.UNSIGNED32;
-      RESULT   :    out RTEMS.STATUS_CODES
-   ) is
-   begin
-
-      RESULT := RTEMS.SUCCESSFUL;
-
-   end TASK_RESTART;
-
-   procedure TASK_DELETE (
-      ID     : in     RTEMS.ID;
-      RESULT :    out RTEMS.STATUS_CODES
-   ) is
-   begin
-
-      RESULT := RTEMS.SUCCESSFUL;
-
-   end TASK_DELETE;
-
-   procedure TASK_SUSPEND (
-      ID     : in     RTEMS.ID;
-      RESULT :    out RTEMS.STATUS_CODES
-   ) is
-   begin
-
-      RESULT := RTEMS.SUCCESSFUL;
-
-   end TASK_SUSPEND;
-
-   procedure TASK_RESUME (
-      ID     : in     RTEMS.ID;
-      RESULT :    out RTEMS.STATUS_CODES
-   ) is
-   begin
-
-      RESULT := RTEMS.SUCCESSFUL;
-
-   end TASK_RESUME;
-
-   procedure TASK_SET_PRIORITY (
-      ID           : in     RTEMS.ID;
-      NEW_PRIORITY : in     RTEMS.TASK_PRIORITY;
-      OLD_PRIORITY :    out RTEMS.TASK_PRIORITY;
-      RESULT       :    out RTEMS.STATUS_CODES
-   ) is
-   begin
-
-      RESULT := RTEMS.SUCCESSFUL;
-
-   end TASK_SET_PRIORITY;
-
-   procedure TASK_MODE (
-      MODE_SET          : in     RTEMS.MODE;
-      MASK              : in     RTEMS.MODE;
-      PREVIOUS_MODE_SET :    out RTEMS.MODE;
-      RESULT            :    out RTEMS.STATUS_CODES
-   ) is
-   begin
-
-      RESULT := RTEMS.SUCCESSFUL;
-
-   end TASK_MODE;
-
-   procedure TASK_GET_NOTE (
-      ID      : in     RTEMS.ID;
-      NOTEPAD : in     RTEMS.NOTEPAD_INDEX;
-      NOTE    :    out RTEMS.UNSIGNED32;
-      RESULT  :    out RTEMS.STATUS_CODES
-   ) is
-   begin
-
-      RESULT := RTEMS.SUCCESSFUL;
-
-   end TASK_GET_NOTE;
-
-   procedure TASK_SET_NOTE (
-      ID      : in     RTEMS.ID;
-      NOTEPAD : in     RTEMS.NOTEPAD_INDEX;
-      NOTE    : in     RTEMS.UNSIGNED32;
-      RESULT  :    out RTEMS.STATUS_CODES
-   ) is
-   begin
-
-      RESULT := RTEMS.SUCCESSFUL;
-
-   end TASK_SET_NOTE;
-
-   procedure TASK_WAKE_WHEN (
-      TIME_BUFFER : in     RTEMS.TIME_OF_DAY;
-      RESULT      :    out RTEMS.STATUS_CODES
-   ) is
-   begin
-
-      RESULT := RTEMS.SUCCESSFUL;
-
-   end TASK_WAKE_WHEN;
-
-   procedure TASK_WAKE_AFTER (
-      TICKS  : in     RTEMS.INTERVAL;
-      RESULT :    out RTEMS.STATUS_CODES
-   ) is
-   begin
-
-      RESULT := RTEMS.SUCCESSFUL;
-
-   end TASK_WAKE_AFTER;
-
--- Interrupt Manager
-
-   procedure INTERRUPT_CATCH (
-      NEW_ISR_HANDLER : in     RTEMS.ADDRESS;
-      VECTOR          : in     RTEMS.VECTOR_NUMBER;
-      OLD_ISR_HANDLER :    out RTEMS.ADDRESS;
-      RESULT          :    out RTEMS.STATUS_CODES
-   ) is
-   begin
-
-      RESULT := RTEMS.SUCCESSFUL;
-
-   end INTERRUPT_CATCH;
-
--- Clock Manager
-
-   procedure CLOCK_GET (
-      OPTION      : in     RTEMS.CLOCK_GET_OPTIONS;
-      TIME_BUFFER : in     RTEMS.ADDRESS;
-      RESULT      :    out RTEMS.STATUS_CODES
-   ) is
-   begin
-
-      RESULT := RTEMS.SUCCESSFUL;
-
-   end CLOCK_GET;
-
-   procedure CLOCK_SET (
-      TIME_BUFFER : in     RTEMS.TIME_OF_DAY;
-      RESULT      :    out RTEMS.STATUS_CODES
-   ) is
-   begin
-
-      RESULT := RTEMS.SUCCESSFUL;
-
-   end CLOCK_SET;
-
-   procedure CLOCK_TICK (
-      RESULT :    out RTEMS.STATUS_CODES
-   ) is
-   begin
-
-      RESULT := RTEMS.SUCCESSFUL;
-
-   end CLOCK_TICK;
-
--- Timer Manager
-
-   procedure TIMER_CREATE (
-      NAME   : in     RTEMS.NAME;
-      ID     :    out RTEMS.ID;
-      RESULT :    out RTEMS.STATUS_CODES
-   ) is
-   begin
-
-      RESULT := RTEMS.SUCCESSFUL;
-
-   end TIMER_CREATE;
-
-   procedure TIMER_DELETE (
-      ID     : in     RTEMS.ID;
-      RESULT :    out RTEMS.STATUS_CODES
-   ) is
-   begin
-
-      RESULT := RTEMS.SUCCESSFUL;
-
-   end TIMER_DELETE;
-
-   procedure TIMER_IDENT (
-      NAME   : in     RTEMS.NAME;
-      ID     :    out RTEMS.ID;
-      RESULT :    out RTEMS.STATUS_CODES
-   ) is
-   begin
-
-      RESULT := RTEMS.SUCCESSFUL;
-
-   end TIMER_IDENT;
-
-   procedure TIMER_FIRE_AFTER (
-      ID        : in     RTEMS.ID;
-      TICKS     : in     RTEMS.INTERVAL;
-      ROUTINE   : in     RTEMS.TIMER_SERVICE_ROUTINE;
-      USER_DATA : in     RTEMS.ADDRESS;
-      RESULT    :    out RTEMS.STATUS_CODES
-   ) is
-   begin
-
-      RESULT := RTEMS.SUCCESSFUL;
-
-   end TIMER_FIRE_AFTER;
-
-   procedure TIMER_FIRE_WHEN (
-      ID        : in     RTEMS.ID;
-      WALL_TIME : in     RTEMS.TIME_OF_DAY;
-      ROUTINE   : in     RTEMS.TIMER_SERVICE_ROUTINE;
-      USER_DATA : in     RTEMS.ADDRESS;
-      RESULT    :    out RTEMS.STATUS_CODES
-   ) is
-   begin
-
-      RESULT := RTEMS.SUCCESSFUL;
-
-   end TIMER_FIRE_WHEN;
-
-   procedure TIMER_RESET (
-      ID     : in     RTEMS.ID;
-      RESULT :    out RTEMS.STATUS_CODES
-   ) is
-   begin
-
-      RESULT := RTEMS.SUCCESSFUL;
-
-   end TIMER_RESET;
-
-   procedure TIMER_CANCEL (
-      ID     : in     RTEMS.ID;
-      RESULT :    out RTEMS.STATUS_CODES
-   ) is
-   begin
-
-      RESULT := RTEMS.SUCCESSFUL;
-
-   end TIMER_CANCEL;
-
--- Semaphore Manager
-
-   procedure SEMAPHORE_CREATE (
-      NAME             : in     RTEMS.NAME;
-      COUNT            : in     RTEMS.UNSIGNED32;
-      ATTRIBUTE_SET    : in     RTEMS.ATTRIBUTE;
-      PRIORITY_CEILING : in     RTEMS.TASK_PRIORITY;
-      ID               :    out RTEMS.ID;
-      RESULT           :    out RTEMS.STATUS_CODES
-   ) is
-   begin
-
-      RESULT := RTEMS.SUCCESSFUL;
-
-   end SEMAPHORE_CREATE;
-
-   procedure SEMAPHORE_DELETE (
-      ID     : in     RTEMS.ID;
-      RESULT :    out RTEMS.STATUS_CODES
-   ) is
-   begin
-
-      RESULT := RTEMS.SUCCESSFUL;
-
-   end SEMAPHORE_DELETE;
-
-   procedure SEMAPHORE_IDENT (
-      NAME   : in     RTEMS.NAME;
-      NODE   : in     RTEMS.UNSIGNED32;
-      ID     :    out RTEMS.ID;
-      RESULT :    out RTEMS.STATUS_CODES
-   ) is
-   begin
-
-      RESULT := RTEMS.SUCCESSFUL;
-
-   end SEMAPHORE_IDENT;
-
-   procedure SEMAPHORE_OBTAIN (
-      ID         : in     RTEMS.ID;
-      OPTION_SET : in     RTEMS.OPTION;
-      TIMEOUT    : in     RTEMS.INTERVAL;
-      RESULT     :    out RTEMS.STATUS_CODES
-   ) is
-   begin
-
-      RESULT := RTEMS.SUCCESSFUL;
-
-   end SEMAPHORE_OBTAIN;
-
-   procedure SEMAPHORE_RELEASE (
-      ID     : in     RTEMS.ID;
-      RESULT :    out RTEMS.STATUS_CODES
-   ) is
-   begin
-
-      RESULT := RTEMS.SUCCESSFUL;
-
-   end SEMAPHORE_RELEASE;
-
--- Message Queue Manager
-
-   procedure MESSAGE_QUEUE_CREATE (
-      Name             : in     RTEMS.Name;
-      Count            : in     RTEMS.Unsigned32;
-      Max_Message_Size : in     RTEMS.Unsigned32;
-      Attribute_Set    : in     RTEMS.Attribute;
-      ID               :    out RTEMS.ID;
-      Result           :    out RTEMS.Status_Codes
-   ) is
-   begin
-
-      RESULT := RTEMS.SUCCESSFUL;
-
-   end MESSAGE_QUEUE_CREATE;
-
-   procedure MESSAGE_QUEUE_IDENT (
-      NAME   : in     RTEMS.NAME;
-      NODE   : in     RTEMS.UNSIGNED32;
-      ID     :    out RTEMS.ID;
-      RESULT :    out RTEMS.STATUS_CODES
-   ) is
-   begin
-
-      RESULT := RTEMS.SUCCESSFUL;
-
-   end MESSAGE_QUEUE_IDENT;
-
-   procedure MESSAGE_QUEUE_DELETE (
-      ID     : in     RTEMS.ID;
-      RESULT :    out RTEMS.STATUS_CODES
-   ) is
-   begin
-
-      RESULT := RTEMS.SUCCESSFUL;
-
-   end MESSAGE_QUEUE_DELETE;
-
-   procedure MESSAGE_QUEUE_SEND (
-      ID     : in     RTEMS.ID;
-      BUFFER : in     RTEMS.ADDRESS;
-      Size   : in     RTEMS.Unsigned32;
-      RESULT :    out RTEMS.STATUS_CODES
-   ) is
-   begin
-
-      RESULT := RTEMS.SUCCESSFUL;
-
-   end MESSAGE_QUEUE_SEND;
-
-   procedure MESSAGE_QUEUE_URGENT (
-      ID     : in     RTEMS.ID;
-      BUFFER : in     RTEMS.ADDRESS;
-      Size   : in     RTEMS.Unsigned32;
-      RESULT :    out RTEMS.STATUS_CODES
-   ) is
-   begin
-
-      RESULT := RTEMS.SUCCESSFUL;
-
-   end MESSAGE_QUEUE_URGENT;
-
-   procedure MESSAGE_QUEUE_BROADCAST (
-      ID     : in     RTEMS.ID;
-      BUFFER : in     RTEMS.ADDRESS;
-      Size   : in     RTEMS.Unsigned32;
-      COUNT  :    out RTEMS.UNSIGNED32;
-      RESULT :    out RTEMS.STATUS_CODES
-   ) is
-   begin
-
-      RESULT := RTEMS.SUCCESSFUL;
-
-   end MESSAGE_QUEUE_BROADCAST;
-
-   procedure MESSAGE_QUEUE_RECEIVE (
-      ID         : in     RTEMS.ID;
-      BUFFER     : in     RTEMS.ADDRESS;
-      OPTION_SET : in     RTEMS.OPTION;
-      TIMEOUT    : in     RTEMS.INTERVAL;
-      Size       :    out RTEMS.Unsigned32;
-      RESULT     :    out RTEMS.STATUS_CODES
-   ) is
-   begin
-
-      RESULT := RTEMS.SUCCESSFUL;
-
-   end MESSAGE_QUEUE_RECEIVE;
-
-   procedure MESSAGE_QUEUE_FLUSH (
-      ID     : in     RTEMS.ID;
-      COUNT  :    out RTEMS.UNSIGNED32;
-      RESULT :    out RTEMS.STATUS_CODES
-   ) is
-   begin
-
-      RESULT := RTEMS.SUCCESSFUL;
-
-   end MESSAGE_QUEUE_FLUSH;
-
--- Event Manager
-
-   procedure EVENT_SEND (
-      ID       : in     RTEMS.ID;
-      EVENT_IN : in     RTEMS.EVENT_SET;
-      RESULT   :    out RTEMS.STATUS_CODES
-   ) is
-   begin
-
-      RESULT := RTEMS.SUCCESSFUL;
-
-   end EVENT_SEND;
-
-   procedure EVENT_RECEIVE (
-      EVENT_IN   : in     RTEMS.EVENT_SET;
-      OPTION_SET : in     RTEMS.OPTION;
-      TICKS      : in     RTEMS.INTERVAL;
-      EVENT_OUT  :    out RTEMS.EVENT_SET;
-      RESULT     :    out RTEMS.STATUS_CODES
-   ) is
-   begin
-
-      RESULT := RTEMS.SUCCESSFUL;
-
-   end EVENT_RECEIVE;
-
--- Signal Manager
-
-   procedure SIGNAL_CATCH (
-      ASR_HANDLER : in     RTEMS.ASR_HANDLER;
-      MODE_SET    : in     RTEMS.MODE;
-      RESULT      :    out RTEMS.STATUS_CODES
-   ) is
-   begin
-
-      RESULT := RTEMS.SUCCESSFUL;
-
-   end SIGNAL_CATCH;
-
-   procedure SIGNAL_SEND (
-      ID         : in     RTEMS.ID;
-      SIGNAL_SET : in     RTEMS.SIGNAL_SET;
-      RESULT     :    out RTEMS.STATUS_CODES
-   ) is
-   begin
-
-      RESULT := RTEMS.SUCCESSFUL;
-
-   end SIGNAL_SEND;
-
--- Partition Manager
-
-   procedure PARTITION_CREATE (
-      NAME             : in     RTEMS.NAME;
-      STARTING_ADDRESS : in     RTEMS.ADDRESS;
-      LENGTH           : in     RTEMS.UNSIGNED32;
-      BUFFER_SIZE      : in     RTEMS.UNSIGNED32;
-      ATTRIBUTE_SET    : in     RTEMS.ATTRIBUTE;
-      ID               :    out RTEMS.ID;
-      RESULT           :    out RTEMS.STATUS_CODES
-   ) is
-   begin
-
-      RESULT := RTEMS.SUCCESSFUL;
-
-   end PARTITION_CREATE;
-
-   procedure PARTITION_IDENT (
-      NAME   : in     RTEMS.NAME;
-      NODE   : in     RTEMS.UNSIGNED32;
-      ID     :    out RTEMS.ID;
-      RESULT :    out RTEMS.STATUS_CODES
-   ) is
-   begin
-
-      RESULT := RTEMS.SUCCESSFUL;
-
-   end PARTITION_IDENT;
-
-   procedure PARTITION_DELETE (
-      ID     : in     RTEMS.ID;
-      RESULT :    out RTEMS.STATUS_CODES
-   ) is
-   begin
-
-      RESULT := RTEMS.SUCCESSFUL;
-
-   end PARTITION_DELETE;
-
-   procedure PARTITION_GET_BUFFER (
-      ID     : in     RTEMS.ID;
-      BUFFER :    out RTEMS.ADDRESS;
-      RESULT :    out RTEMS.STATUS_CODES
-   ) is
-   begin
-
-      RESULT := RTEMS.SUCCESSFUL;
-
-   end PARTITION_GET_BUFFER;
-
-   procedure PARTITION_RETURN_BUFFER (
-      ID     : in     RTEMS.ID;
-      BUFFER : in     RTEMS.ADDRESS;
-      RESULT :    out RTEMS.STATUS_CODES
-   ) is
-   begin
-
-      RESULT := RTEMS.SUCCESSFUL;
-
-   end PARTITION_RETURN_BUFFER;
-
--- Region Manager
-
-   procedure REGION_CREATE (
-      NAME             : in     RTEMS.NAME;
-      STARTING_ADDRESS : in     RTEMS.ADDRESS;
-      LENGTH           : in     RTEMS.UNSIGNED32;
-      PAGE_SIZE        : in     RTEMS.UNSIGNED32;
-      ATTRIBUTE_SET    : in     RTEMS.ATTRIBUTE;
-      ID               :    out RTEMS.ID;
-      RESULT           :    out RTEMS.STATUS_CODES
-   ) is
-   begin
-
-      RESULT := RTEMS.SUCCESSFUL;
-
-   end REGION_CREATE;
-
-   procedure REGION_IDENT (
-      NAME   : in     RTEMS.NAME;
-      ID     :    out RTEMS.ID;
-      RESULT :    out RTEMS.STATUS_CODES
-   ) is
-   begin
-
-      RESULT := RTEMS.SUCCESSFUL;
-
-   end REGION_IDENT;
-
-   procedure REGION_DELETE (
-      ID     : in     RTEMS.ID;
-      RESULT :    out RTEMS.STATUS_CODES
-   ) is
-   begin
-
-      RESULT := RTEMS.SUCCESSFUL;
-
-   end REGION_DELETE;
-
-   procedure REGION_GET_SEGMENT (
-      ID         : in     RTEMS.ID;
-      SIZE       : in     RTEMS.UNSIGNED32;
-      OPTION_SET : in     RTEMS.OPTION;
-      TIMEOUT    : in     RTEMS.INTERVAL;
-      SEGMENT    :    out RTEMS.ADDRESS;
-      RESULT     :    out RTEMS.STATUS_CODES
-   ) is
-   begin
-
-      RESULT := RTEMS.SUCCESSFUL;
-
-   end REGION_GET_SEGMENT;
-
-   procedure REGION_RETURN_SEGMENT (
-      ID      : in     RTEMS.ID;
-      SEGMENT : in     RTEMS.ADDRESS;
-      RESULT  :    out RTEMS.STATUS_CODES
-   ) is
-   begin
-
-      RESULT := RTEMS.SUCCESSFUL;
-
-   end REGION_RETURN_SEGMENT;
-
--- Dual Ported Memory Manager
-
-   procedure PORT_CREATE (
-      NAME           : in     RTEMS.NAME;
-      INTERNAL_START : in     RTEMS.ADDRESS;
-      EXTERNAL_START : in     RTEMS.ADDRESS;
-      LENGTH         : in     RTEMS.UNSIGNED32;
-      ID             :    out RTEMS.ID;
-      RESULT         :    out RTEMS.STATUS_CODES
-   ) is
-   begin
-
-      RESULT := RTEMS.SUCCESSFUL;
-
-   end PORT_CREATE;
-
-   procedure PORT_IDENT (
-      NAME   : in     RTEMS.NAME;
-      ID     :    out RTEMS.ID;
-      RESULT :    out RTEMS.STATUS_CODES
-   ) is
-   begin
-
-      RESULT := RTEMS.SUCCESSFUL;
-
-   end PORT_IDENT;
-
-   procedure PORT_DELETE (
-      ID     : in     RTEMS.ID;
-      RESULT :    out RTEMS.STATUS_CODES
-   ) is
-   begin
-
-      RESULT := RTEMS.SUCCESSFUL;
-
-   end PORT_DELETE;
-
-   procedure PORT_EXTERNAL_TO_INTERNAL (
-      ID       : in     RTEMS.ID;
-      EXTERNAL : in     RTEMS.ADDRESS;
-      INTERNAL :    out RTEMS.ADDRESS;
-      RESULT   :    out RTEMS.STATUS_CODES
-   ) is
-   begin
-
-      RESULT := RTEMS.SUCCESSFUL;
-
-   end PORT_EXTERNAL_TO_INTERNAL;
-
-   procedure PORT_INTERNAL_TO_EXTERNAL (
-      ID       : in     RTEMS.ID;
-      INTERNAL : in     RTEMS.ADDRESS;
-      EXTERNAL :    out RTEMS.ADDRESS;
-      RESULT   :    out RTEMS.STATUS_CODES
-   ) is
-   begin
-
-      RESULT := RTEMS.SUCCESSFUL;
-
-   end PORT_INTERNAL_TO_EXTERNAL;
-
--- Input/Output Manager
-
-   procedure IO_INITIALIZE (
-      MAJOR        : in     RTEMS.DEVICE_MAJOR_NUMBER;
-      MINOR        : in     RTEMS.DEVICE_MINOR_NUMBER;
-      ARGUMENT     : in     RTEMS.ADDRESS;
-      RETURN_VALUE :    out RTEMS.UNSIGNED32;
-      RESULT       :    out RTEMS.STATUS_CODES
-   ) is
-   begin
-
-      RESULT := RTEMS.SUCCESSFUL;
-
-   end IO_INITIALIZE;
-
-   procedure IO_OPEN (
-      MAJOR        : in     RTEMS.DEVICE_MAJOR_NUMBER;
-      MINOR        : in     RTEMS.DEVICE_MINOR_NUMBER;
-      ARGUMENT     : in     RTEMS.ADDRESS;
-      RETURN_VALUE :    out RTEMS.UNSIGNED32;
-      RESULT       :    out RTEMS.STATUS_CODES
-   ) is
-   begin
-
-      RESULT := RTEMS.SUCCESSFUL;
-
-   end IO_OPEN;
-
-   procedure IO_CLOSE (
-      MAJOR        : in     RTEMS.DEVICE_MAJOR_NUMBER;
-      MINOR        : in     RTEMS.DEVICE_MINOR_NUMBER;
-      ARGUMENT     : in     RTEMS.ADDRESS;
-      RETURN_VALUE :    out RTEMS.UNSIGNED32;
-      RESULT       :    out RTEMS.STATUS_CODES
-   ) is
-   begin
-
-      RESULT := RTEMS.SUCCESSFUL;
-
-   end IO_CLOSE;
-
-   procedure IO_READ (
-      MAJOR        : in     RTEMS.DEVICE_MAJOR_NUMBER;
-      MINOR        : in     RTEMS.DEVICE_MINOR_NUMBER;
-      ARGUMENT     : in     RTEMS.ADDRESS;
-      RETURN_VALUE :    out RTEMS.UNSIGNED32;
-      RESULT       :    out RTEMS.STATUS_CODES
-   ) is
-   begin
-
-      RESULT := RTEMS.SUCCESSFUL;
-
-   end IO_READ;
-
-   procedure IO_WRITE (
-      MAJOR        : in     RTEMS.DEVICE_MAJOR_NUMBER;
-      MINOR        : in     RTEMS.DEVICE_MINOR_NUMBER;
-      ARGUMENT     : in     RTEMS.ADDRESS;
-      RETURN_VALUE :    out RTEMS.UNSIGNED32;
-      RESULT       :    out RTEMS.STATUS_CODES
-   ) is
-   begin
-
-      RESULT := RTEMS.SUCCESSFUL;
-
-   end IO_WRITE;
-
-   procedure IO_CONTROL (
-      MAJOR        : in     RTEMS.DEVICE_MAJOR_NUMBER;
-      MINOR        : in     RTEMS.DEVICE_MINOR_NUMBER;
-      ARGUMENT     : in     RTEMS.ADDRESS;
-      RETURN_VALUE :    out RTEMS.UNSIGNED32;
-      RESULT       :    out RTEMS.STATUS_CODES
-   ) is
-   begin
-
-      RESULT := RTEMS.SUCCESSFUL;
-
-   end IO_CONTROL;
-
--- Fatal Error Manager
-
-   procedure FATAL_ERROR_OCCURRED (
-      THE_ERROR : in     RTEMS.UNSIGNED32
-   ) is
-   begin
-
-      NULL;
-
-   end FATAL_ERROR_OCCURRED;
-
--- Rate Monotonic Manager
-
-   procedure RATE_MONOTONIC_CREATE (
-      NAME   : in     RTEMS.NAME;
-      ID     :    out RTEMS.ID;
-      RESULT :    out RTEMS.STATUS_CODES
-   ) is
-   begin
-
-      RESULT := RTEMS.SUCCESSFUL;
-
-   end RATE_MONOTONIC_CREATE;
-
-   procedure RATE_MONOTONIC_IDENT (
-      NAME   : in     RTEMS.NAME;
-      ID     :    out RTEMS.ID;
-      RESULT :    out RTEMS.STATUS_CODES
-   ) is
-   begin
-
-      RESULT := RTEMS.SUCCESSFUL;
-
-   end RATE_MONOTONIC_IDENT;
-
-   procedure RATE_MONOTONIC_DELETE (
-      ID     : in     RTEMS.ID;
-      RESULT :    out RTEMS.STATUS_CODES
-   ) is
-   begin
-
-      RESULT := RTEMS.SUCCESSFUL;
-
-   end RATE_MONOTONIC_DELETE;
-
-   procedure RATE_MONOTONIC_CANCEL (
-      ID     : in     RTEMS.ID;
-      RESULT :    out RTEMS.STATUS_CODES
-   ) is
-   begin
-
-      RESULT := RTEMS.SUCCESSFUL;
-
-   end RATE_MONOTONIC_CANCEL;
-
-   procedure RATE_MONOTONIC_PERIOD (
-      ID      : in     RTEMS.ID;
-      LENGTH  : in     RTEMS.INTERVAL;
-      RESULT  :    out RTEMS.STATUS_CODES
-   ) is
-   begin
-
-      RESULT := RTEMS.SUCCESSFUL;
-
-   end RATE_MONOTONIC_PERIOD;
-
--- Multiprocessing Manager
-
-   procedure MULTIPROCESSING_ANNOUNCE
-   is
-   begin
-
-      NULL;
-
-   end MULTIPROCESSING_ANNOUNCE;
-
-end DUMMY_RTEMS;
diff --git a/c/src/ada-tests/tmtests/tmoverhd/dummy_rtems.ads b/c/src/ada-tests/tmtests/tmoverhd/dummy_rtems.ads
deleted file mode 100644
index ccad73c0ef..0000000000
--- a/c/src/ada-tests/tmtests/tmoverhd/dummy_rtems.ads
+++ /dev/null
@@ -1,521 +0,0 @@
---
---  DUMMY_RTEMS / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package contains specifications for stub routines
---  which are used to time the invocation overhead incurred
---  with an Ada application program invokes each RTEMS directive.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-
-package DUMMY_RTEMS is
-
--- Initialization Manager
-
-   procedure INITIALIZE_EXECUTIVE (
-      CONFIGURATION_TABLE   : in     RTEMS.CONFIGURATION_TABLE_POINTER;
-      CPU_TABLE             : in     RTEMS.CPU_TABLE_POINTER
-   );
-
-   procedure SHUTDOWN_EXECUTIVE (
-      RESULT : in     RTEMS.UNSIGNED32
-   );
-
--- Task Manager
-
-   procedure TASK_CREATE (
-      NAME             : in     RTEMS.NAME;
-      INITIAL_PRIORITY : in     RTEMS.TASK_PRIORITY;
-      STACK_SIZE       : in     RTEMS.UNSIGNED32;
-      INITIAL_MODES    : in     RTEMS.MODE;
-      ATTRIBUTE_SET    : in     RTEMS.ATTRIBUTE;
-      ID               :    out RTEMS.ID;
-      RESULT           :    out RTEMS.STATUS_CODES
-   );
-
-   procedure TASK_IDENT (
-      NAME   : in     RTEMS.NAME;
-      NODE   : in     RTEMS.UNSIGNED32;
-      ID     :    out RTEMS.ID;
-      RESULT :    out RTEMS.STATUS_CODES
-   );
-
-   procedure TASK_START (
-      ID          : in     RTEMS.ID;
-      ENTRY_POINT : in     RTEMS.TASK_ENTRY;
-      ARGUMENT    : in     RTEMS.UNSIGNED32;
-      RESULT      :    out RTEMS.STATUS_CODES
-   );
-
-   procedure TASK_RESTART (
-      ID       : in     RTEMS.ID;
-      ARGUMENT : in     RTEMS.UNSIGNED32;
-      RESULT   :    out RTEMS.STATUS_CODES
-   );
-
-   procedure TASK_DELETE (
-      ID     : in     RTEMS.ID;
-      RESULT :    out RTEMS.STATUS_CODES
-   );
-
-   procedure TASK_SUSPEND (
-      ID     : in     RTEMS.ID;
-      RESULT :    out RTEMS.STATUS_CODES
-   );
-
-   procedure TASK_RESUME (
-      ID     : in     RTEMS.ID;
-      RESULT :    out RTEMS.STATUS_CODES
-   );
-
-   procedure TASK_SET_PRIORITY (
-      ID           : in     RTEMS.ID;
-      NEW_PRIORITY : in     RTEMS.TASK_PRIORITY;
-      OLD_PRIORITY :    out RTEMS.TASK_PRIORITY;
-      RESULT       :    out RTEMS.STATUS_CODES
-   );
-
-   procedure TASK_MODE (
-      MODE_SET          : in     RTEMS.MODE;
-      MASK              : in     RTEMS.MODE;
-      PREVIOUS_MODE_SET :    out RTEMS.MODE;
-      RESULT            :    out RTEMS.STATUS_CODES
-   );
-
-   procedure TASK_GET_NOTE (
-      ID      : in     RTEMS.ID;
-      NOTEPAD : in     RTEMS.NOTEPAD_INDEX;
-      NOTE    :    out RTEMS.UNSIGNED32;
-      RESULT  :    out RTEMS.STATUS_CODES
-   );
-
-   procedure TASK_SET_NOTE (
-      ID      : in     RTEMS.ID;
-      NOTEPAD : in     RTEMS.NOTEPAD_INDEX;
-      NOTE    : in     RTEMS.UNSIGNED32;
-      RESULT  :    out RTEMS.STATUS_CODES
-   );
-
-   procedure TASK_WAKE_WHEN (
-      TIME_BUFFER : in     RTEMS.TIME_OF_DAY;
-      RESULT      :    out RTEMS.STATUS_CODES
-   );
-
-   procedure TASK_WAKE_AFTER (
-      TICKS  : in     RTEMS.INTERVAL;
-      RESULT :    out RTEMS.STATUS_CODES
-   );
-
--- Interrupt Manager
-
-   procedure INTERRUPT_CATCH (
-      NEW_ISR_HANDLER : in     RTEMS.ADDRESS;
-      VECTOR          : in     RTEMS.VECTOR_NUMBER;
-      OLD_ISR_HANDLER :    out RTEMS.ADDRESS;
-      RESULT          :    out RTEMS.STATUS_CODES
-   );
-
--- Clock Manager
-
-   procedure CLOCK_GET (
-      OPTION      : in     RTEMS.CLOCK_GET_OPTIONS;
-      TIME_BUFFER : in     RTEMS.ADDRESS;
-      RESULT      :    out RTEMS.STATUS_CODES
-   );
-
-   procedure CLOCK_SET (
-      TIME_BUFFER : in     RTEMS.TIME_OF_DAY;
-      RESULT      :    out RTEMS.STATUS_CODES
-   );
-
-   procedure CLOCK_TICK (
-      RESULT :    out RTEMS.STATUS_CODES
-   );
-
--- Timer Manager
-
-   procedure TIMER_CREATE (
-      NAME   : in     RTEMS.NAME;
-      ID     :    out RTEMS.ID;
-      RESULT :    out RTEMS.STATUS_CODES
-   );
-
-   procedure TIMER_DELETE (
-      ID     : in     RTEMS.ID;
-      RESULT :    out RTEMS.STATUS_CODES
-   );
-
-   procedure TIMER_IDENT (
-      NAME   : in     RTEMS.NAME;
-      ID     :    out RTEMS.ID;
-      RESULT :    out RTEMS.STATUS_CODES
-   );
-
-   procedure TIMER_FIRE_AFTER (
-      ID        : in     RTEMS.ID;
-      TICKS     : in     RTEMS.INTERVAL;
-      ROUTINE   : in     RTEMS.TIMER_SERVICE_ROUTINE;
-      USER_DATA : in     RTEMS.ADDRESS;
-      RESULT    :    out RTEMS.STATUS_CODES
-   );
-
-   procedure TIMER_FIRE_WHEN (
-      ID        : in     RTEMS.ID;
-      WALL_TIME : in     RTEMS.TIME_OF_DAY;
-      ROUTINE   : in     RTEMS.TIMER_SERVICE_ROUTINE;
-      USER_DATA : in     RTEMS.ADDRESS;
-      RESULT    :    out RTEMS.STATUS_CODES
-   );
-
-   procedure TIMER_RESET (
-      ID     : in     RTEMS.ID;
-      RESULT :    out RTEMS.STATUS_CODES
-   );
-
-   procedure TIMER_CANCEL (
-      ID     : in     RTEMS.ID;
-      RESULT :    out RTEMS.STATUS_CODES
-   );
-
--- Semaphore Manager
-
-   procedure SEMAPHORE_CREATE (
-      NAME             : in     RTEMS.NAME;
-      COUNT            : in     RTEMS.UNSIGNED32;
-      ATTRIBUTE_SET    : in     RTEMS.ATTRIBUTE;
-      PRIORITY_CEILING : in     RTEMS.TASK_PRIORITY;
-      ID               :    out RTEMS.ID;
-      RESULT           :    out RTEMS.STATUS_CODES
-   );
-
-   procedure SEMAPHORE_DELETE (
-      ID     : in     RTEMS.ID;
-      RESULT :    out RTEMS.STATUS_CODES
-   );
-
-   procedure SEMAPHORE_IDENT (
-      NAME   : in     RTEMS.NAME;
-      NODE   : in     RTEMS.UNSIGNED32;
-      ID     :    out RTEMS.ID;
-      RESULT :    out RTEMS.STATUS_CODES
-   );
-
-   procedure SEMAPHORE_OBTAIN (
-      ID         : in     RTEMS.ID;
-      OPTION_SET : in     RTEMS.OPTION;
-      TIMEOUT    : in     RTEMS.INTERVAL;
-      RESULT     :    out RTEMS.STATUS_CODES
-   );
-
-   procedure SEMAPHORE_RELEASE (
-      ID     : in     RTEMS.ID;
-      RESULT :    out RTEMS.STATUS_CODES
-   );
-
--- Message Queue Manager
-
-   procedure MESSAGE_QUEUE_CREATE (
-      Name             : in     RTEMS.Name;
-      Count            : in     RTEMS.Unsigned32;
-      Max_Message_Size : in     RTEMS.Unsigned32;
-      Attribute_Set    : in     RTEMS.Attribute;
-      ID               :    out RTEMS.ID;
-      Result           :    out RTEMS.Status_Codes
-   );
-
-   procedure MESSAGE_QUEUE_IDENT (
-      NAME   : in     RTEMS.NAME;
-      NODE   : in     RTEMS.UNSIGNED32;
-      ID     :    out RTEMS.ID;
-      RESULT :    out RTEMS.STATUS_CODES
-   );
-
-   procedure MESSAGE_QUEUE_DELETE (
-      ID     : in     RTEMS.ID;
-      RESULT :    out RTEMS.STATUS_CODES
-   );
-
-   procedure MESSAGE_QUEUE_SEND (
-      ID     : in     RTEMS.ID;
-      BUFFER : in     RTEMS.ADDRESS;
-      SIZE   : in     RTEMS.UNSIGNED32;
-      RESULT :    out RTEMS.STATUS_CODES
-   );
-
-   procedure MESSAGE_QUEUE_URGENT (
-      ID     : in     RTEMS.ID;
-      BUFFER : in     RTEMS.ADDRESS;
-      SIZE   : in     RTEMS.UNSIGNED32;
-      RESULT :    out RTEMS.STATUS_CODES
-   );
-
-   procedure MESSAGE_QUEUE_BROADCAST (
-      ID     : in     RTEMS.ID;
-      BUFFER : in     RTEMS.ADDRESS;
-      SIZE   : in     RTEMS.UNSIGNED32;
-      COUNT  :    out RTEMS.UNSIGNED32;
-      RESULT :    out RTEMS.STATUS_CODES
-   );
-
-   procedure MESSAGE_QUEUE_RECEIVE (
-      ID         : in     RTEMS.ID;
-      BUFFER     : in     RTEMS.ADDRESS;
-      OPTION_SET : in     RTEMS.OPTION;
-      TIMEOUT    : in     RTEMS.INTERVAL;
-      SIZE       :    out RTEMS.UNSIGNED32;
-      RESULT     :    out RTEMS.STATUS_CODES
-   );
-
-   procedure MESSAGE_QUEUE_FLUSH (
-      ID     : in     RTEMS.ID;
-      COUNT  :    out RTEMS.UNSIGNED32;
-      RESULT :    out RTEMS.STATUS_CODES
-   );
-
--- Event Manager
-
-   procedure EVENT_SEND (
-      ID       : in     RTEMS.ID;
-      EVENT_IN : in     RTEMS.EVENT_SET;
-      RESULT   :    out RTEMS.STATUS_CODES
-   );
-
-   procedure EVENT_RECEIVE (
-      EVENT_IN   : in     RTEMS.EVENT_SET;
-      OPTION_SET : in     RTEMS.OPTION;
-      TICKS      : in     RTEMS.INTERVAL;
-      EVENT_OUT  :    out RTEMS.EVENT_SET;
-      RESULT     :    out RTEMS.STATUS_CODES
-   );
-
--- Signal Manager
-
-   procedure SIGNAL_CATCH (
-      ASR_HANDLER : in     RTEMS.ASR_HANDLER;
-      MODE_SET    : in     RTEMS.MODE;
-      RESULT      :    out RTEMS.STATUS_CODES
-   );
-
-   procedure SIGNAL_SEND (
-      ID         : in     RTEMS.ID;
-      SIGNAL_SET : in     RTEMS.SIGNAL_SET;
-      RESULT     :    out RTEMS.STATUS_CODES
-   );
-
--- Partition Manager
-
-   procedure PARTITION_CREATE (
-      NAME             : in     RTEMS.NAME;
-      STARTING_ADDRESS : in     RTEMS.ADDRESS;
-      LENGTH           : in     RTEMS.UNSIGNED32;
-      BUFFER_SIZE      : in     RTEMS.UNSIGNED32;
-      ATTRIBUTE_SET    : in     RTEMS.ATTRIBUTE;
-      ID               :    out RTEMS.ID;
-      RESULT           :    out RTEMS.STATUS_CODES
-   );
-
-   procedure PARTITION_IDENT (
-      NAME   : in     RTEMS.NAME;
-      NODE   : in     RTEMS.UNSIGNED32;
-      ID     :    out RTEMS.ID;
-      RESULT :    out RTEMS.STATUS_CODES
-   );
-
-   procedure PARTITION_DELETE (
-      ID     : in     RTEMS.ID;
-      RESULT :    out RTEMS.STATUS_CODES
-   );
-
-   procedure PARTITION_GET_BUFFER (
-      ID     : in     RTEMS.ID;
-      BUFFER :    out RTEMS.ADDRESS;
-      RESULT :    out RTEMS.STATUS_CODES
-   );
-
-   procedure PARTITION_RETURN_BUFFER (
-      ID     : in     RTEMS.ID;
-      BUFFER : in     RTEMS.ADDRESS;
-      RESULT :    out RTEMS.STATUS_CODES
-   );
-
--- Region Manager
-
-   procedure REGION_CREATE (
-      NAME             : in     RTEMS.NAME;
-      STARTING_ADDRESS : in     RTEMS.ADDRESS;
-      LENGTH           : in     RTEMS.UNSIGNED32;
-      PAGE_SIZE        : in     RTEMS.UNSIGNED32;
-      ATTRIBUTE_SET    : in     RTEMS.ATTRIBUTE;
-      ID               :    out RTEMS.ID;
-      RESULT           :    out RTEMS.STATUS_CODES
-   );
-
-   procedure REGION_IDENT (
-      NAME   : in     RTEMS.NAME;
-      ID     :    out RTEMS.ID;
-      RESULT :    out RTEMS.STATUS_CODES
-   );
-
-   procedure REGION_DELETE (
-      ID     : in     RTEMS.ID;
-      RESULT :    out RTEMS.STATUS_CODES
-   );
-
-   procedure REGION_GET_SEGMENT (
-      ID         : in     RTEMS.ID;
-      SIZE       : in     RTEMS.UNSIGNED32;
-      OPTION_SET : in     RTEMS.OPTION;
-      TIMEOUT    : in     RTEMS.INTERVAL;
-      SEGMENT    :    out RTEMS.ADDRESS;
-      RESULT     :    out RTEMS.STATUS_CODES
-   );
-
-   procedure REGION_RETURN_SEGMENT (
-      ID      : in     RTEMS.ID;
-      SEGMENT : in     RTEMS.ADDRESS;
-      RESULT  :    out RTEMS.STATUS_CODES
-   );
-
--- Dual Ported Memory Manager
-
-   procedure PORT_CREATE (
-      NAME           : in     RTEMS.NAME;
-      INTERNAL_START : in     RTEMS.ADDRESS;
-      EXTERNAL_START : in     RTEMS.ADDRESS;
-      LENGTH         : in     RTEMS.UNSIGNED32;
-      ID             :    out RTEMS.ID;
-      RESULT         :    out RTEMS.STATUS_CODES
-   );
-
-   procedure PORT_IDENT (
-      NAME   : in     RTEMS.NAME;
-      ID     :    out RTEMS.ID;
-      RESULT :    out RTEMS.STATUS_CODES
-   );
-
-   procedure PORT_DELETE (
-      ID     : in     RTEMS.ID;
-      RESULT :    out RTEMS.STATUS_CODES
-   );
-
-   procedure PORT_EXTERNAL_TO_INTERNAL (
-      ID       : in     RTEMS.ID;
-      EXTERNAL : in     RTEMS.ADDRESS;
-      INTERNAL :    out RTEMS.ADDRESS;
-      RESULT   :    out RTEMS.STATUS_CODES
-   );
-
-   procedure PORT_INTERNAL_TO_EXTERNAL (
-      ID       : in     RTEMS.ID;
-      INTERNAL : in     RTEMS.ADDRESS;
-      EXTERNAL :    out RTEMS.ADDRESS;
-      RESULT   :    out RTEMS.STATUS_CODES
-   );
-
--- Input/Output Manager
-
-   procedure IO_INITIALIZE (
-      MAJOR        : in     RTEMS.DEVICE_MAJOR_NUMBER;
-      MINOR        : in     RTEMS.DEVICE_MINOR_NUMBER;
-      ARGUMENT     : in     RTEMS.ADDRESS;
-      RETURN_VALUE :    out RTEMS.UNSIGNED32;
-      RESULT       :    out RTEMS.STATUS_CODES
-   );
-
-   procedure IO_OPEN (
-      MAJOR        : in     RTEMS.DEVICE_MAJOR_NUMBER;
-      MINOR        : in     RTEMS.DEVICE_MINOR_NUMBER;
-      ARGUMENT     : in     RTEMS.ADDRESS;
-      RETURN_VALUE :    out RTEMS.UNSIGNED32;
-      RESULT       :    out RTEMS.STATUS_CODES
-   );
-
-   procedure IO_CLOSE (
-      MAJOR        : in     RTEMS.DEVICE_MAJOR_NUMBER;
-      MINOR        : in     RTEMS.DEVICE_MINOR_NUMBER;
-      ARGUMENT     : in     RTEMS.ADDRESS;
-      RETURN_VALUE :    out RTEMS.UNSIGNED32;
-      RESULT       :    out RTEMS.STATUS_CODES
-   );
-
-   procedure IO_READ (
-      MAJOR        : in     RTEMS.DEVICE_MAJOR_NUMBER;
-      MINOR        : in     RTEMS.DEVICE_MINOR_NUMBER;
-      ARGUMENT     : in     RTEMS.ADDRESS;
-      RETURN_VALUE :    out RTEMS.UNSIGNED32;
-      RESULT       :    out RTEMS.STATUS_CODES
-   );
-
-   procedure IO_WRITE (
-      MAJOR        : in     RTEMS.DEVICE_MAJOR_NUMBER;
-      MINOR        : in     RTEMS.DEVICE_MINOR_NUMBER;
-      ARGUMENT     : in     RTEMS.ADDRESS;
-      RETURN_VALUE :    out RTEMS.UNSIGNED32;
-      RESULT       :    out RTEMS.STATUS_CODES
-   );
-
-   procedure IO_CONTROL (
-      MAJOR        : in     RTEMS.DEVICE_MAJOR_NUMBER;
-      MINOR        : in     RTEMS.DEVICE_MINOR_NUMBER;
-      ARGUMENT     : in     RTEMS.ADDRESS;
-      RETURN_VALUE :    out RTEMS.UNSIGNED32;
-      RESULT       :    out RTEMS.STATUS_CODES
-   );
-
--- Fatal Error Manager
-
-   procedure FATAL_ERROR_OCCURRED (
-      THE_ERROR : in     RTEMS.UNSIGNED32
-   );
-
--- Rate Monotonic Manager
-
-   procedure RATE_MONOTONIC_CREATE (
-      NAME   : in     RTEMS.NAME;
-      ID     :    out RTEMS.ID;
-      RESULT :    out RTEMS.STATUS_CODES
-   );
-
-   procedure RATE_MONOTONIC_IDENT (
-      NAME   : in     RTEMS.NAME;
-      ID     :    out RTEMS.ID;
-      RESULT :    out RTEMS.STATUS_CODES
-   );
-
-   procedure RATE_MONOTONIC_DELETE (
-      ID     : in     RTEMS.ID;
-      RESULT :    out RTEMS.STATUS_CODES
-   );
-
-   procedure RATE_MONOTONIC_CANCEL (
-      ID     : in     RTEMS.ID;
-      RESULT :    out RTEMS.STATUS_CODES
-   );
-
-   procedure RATE_MONOTONIC_PERIOD (
-      ID      : in     RTEMS.ID;
-      LENGTH  : in     RTEMS.INTERVAL;
-      RESULT  :    out RTEMS.STATUS_CODES
-   );
-
--- Multiprocessing Manager
-
-   procedure MULTIPROCESSING_ANNOUNCE;
-
-end DUMMY_RTEMS;
diff --git a/c/src/ada-tests/tmtests/tmoverhd/tmoverhd.adb b/c/src/ada-tests/tmtests/tmoverhd/tmoverhd.adb
deleted file mode 100644
index 50066a949c..0000000000
--- a/c/src/ada-tests/tmtests/tmoverhd/tmoverhd.adb
+++ /dev/null
@@ -1,57 +0,0 @@
---
---  MAIN / BODY
---
---  DESCRIPTION:
---
---  This is the entry point for Test TMOVERHD of the Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-with TMTEST;
-with TEST_SUPPORT;
-
-procedure TMOVERHD is
-  INIT_ID : RTEMS.ID;
-  STATUS  : RTEMS.STATUS_CODES;
-begin
-
-   RTEMS.TASK_CREATE(
-      RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
-      1,
-      RTEMS.MINIMUM_STACK_SIZE,
-      RTEMS.NO_PREEMPT,
-      RTEMS.DEFAULT_ATTRIBUTES,
-      INIT_ID,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF INIT" );
-
-
-   RTEMS.TASK_START(
-      INIT_ID,
-      TMTEST.INIT'ACCESS,
-      0,
-      STATUS
-   );
-   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF INIT" );
-
-   loop
-      delay 120.0;
-   end loop;
-
-end TMOVERHD;
-
diff --git a/c/src/ada-tests/tmtests/tmoverhd/tmtest.adb b/c/src/ada-tests/tmtests/tmoverhd/tmtest.adb
deleted file mode 100644
index 2faf4bb226..0000000000
--- a/c/src/ada-tests/tmtests/tmoverhd/tmtest.adb
+++ /dev/null
@@ -1,1564 +0,0 @@
---
---  TMTEST / BODY
---
---  DESCRIPTION:
---
---  This package is the implementation of Calling Overhead Test of the RTEMS
---  Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with DUMMY_RTEMS;
-with INTERFACES; use INTERFACES;
-with RTEMS;
-with TEST_SUPPORT;
-with TEXT_IO;
-with TIME_TEST_SUPPORT;
-with UNSIGNED32_IO;
-
-package body TMTEST is
-
---PAGE
--- 
---  INIT
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      STATUS : RTEMS.STATUS_CODES;
-   begin
-
-      TEXT_IO.NEW_LINE( 2 );
-      TEXT_IO.PUT_LINE( "*** TIME TEST OVERHEAD ***" );
-
-      TIMER_DRIVER.SET_FIND_AVERAGE_OVERHEAD( TRUE );
-
-      TMTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME(  'T', 'A', '1', ' ' );
-
-      RTEMS.TASK_CREATE( 
-         TMTEST.TASK_NAME( 1 ), 
-         254, 
-         2048, 
-         RTEMS.DEFAULT_MODES,
-         RTEMS.DEFAULT_ATTRIBUTES,
-         TMTEST.TASK_ID( 1 ),
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA1" );
-
-      RTEMS.TASK_START(
-         TMTEST.TASK_ID( 1 ),
-         TMTEST.TASK_1'ACCESS,
-         0,
-         STATUS
-      );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA1" );
-
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
-      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
-
-   end INIT;
-
---PAGE
--- 
---  TIMER_HANDLER
---
-
-   procedure TIMER_HANDLER (
-      IGNORED_ID      : in     RTEMS.ID;
-      IGNORED_ADDRESS : in     RTEMS.ADDRESS
-   ) is
-   begin
-
-      NULL;
-
-   end TIMER_HANDLER;
-
---PAGE
--- 
---  ISR_HANDLER
---
-
-   procedure ISR_HANDLER (
-      VECTOR : in     RTEMS.VECTOR_NUMBER
-   ) is
-   begin
-
-      NULL;
-
-   end ISR_HANDLER;
-
---PAGE
--- 
---  ASR_HANDLER
---
-
-   procedure ASR_HANDLER (
-      SIGNALS : in     RTEMS.SIGNAL_SET
-   ) is
-   begin
-
-      NULL;
-
-   end ASR_HANDLER;
-
---PAGE
--- 
---  TASK_1
---
-
-   CPU_TABLE      : aliased RTEMS.CPU_TABLE;
-
-   procedure TASK_1 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   ) is
-      NAME           : RTEMS.NAME;
-      INDEX          : RTEMS.UNSIGNED32;
-      OVERHEAD       : RTEMS.UNSIGNED32;
-      ID             : RTEMS.ID;
-      IN_PRIORITY    : RTEMS.TASK_PRIORITY;
-      OUT_PRIORITY   : RTEMS.TASK_PRIORITY;
-      IN_MODE        : RTEMS.MODE;
-      MASK           : RTEMS.MODE;
-      OUT_MODE       : RTEMS.MODE;
-      NOTE           : RTEMS.UNSIGNED32;
-      TIME           : RTEMS.TIME_OF_DAY;
-      TIMEOUT        : RTEMS.INTERVAL;
-      SIGNALS        : RTEMS.SIGNAL_SET;
-      ADDRESS_1      : RTEMS.ADDRESS;
-      EVENTS         : RTEMS.SIGNAL_SET;
-      BUFFER         : TMTEST.BUFFER;
-      BUFFER_POINTER : RTEMS.ADDRESS;
-      MESSAGE_SIZE   : RTEMS.UNSIGNED32;
-      COUNT          : RTEMS.UNSIGNED32;
-      MAJOR          : RTEMS.DEVICE_MAJOR_NUMBER;
-      MINOR          : RTEMS.DEVICE_MINOR_NUMBER;
-      IO_RESULT      : RTEMS.UNSIGNED32;
-      ERROR          : RTEMS.UNSIGNED32;
-      STATUS         : RTEMS.STATUS_CODES;
-   begin
-
-      NAME := RTEMS.BUILD_NAME(  'N', 'A', 'M', 'E' );
-
-      BUFFER_POINTER := BUFFER'ADDRESS;
-     
--- INITIALIZE_EXECUTIVE
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            DUMMY_RTEMS.INITIALIZE_EXECUTIVE( 
-               RTEMS.CONFIGURATION,
-               CPU_TABLE'ACCESS
-            );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "INITIALIZE_EXECUTIVE",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         0
-      );
-
--- SHUTDOWN_EXECUTIVE
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            DUMMY_RTEMS.SHUTDOWN_EXECUTIVE( ERROR );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "SHUTDOWN_EXECUTIVE",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         0
-      );
-
--- TASK_CREATE
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            DUMMY_RTEMS.TASK_CREATE( 
-               NAME, 
-               IN_PRIORITY, 
-               2048, 
-               RTEMS.DEFAULT_MODES, 
-               RTEMS.DEFAULT_ATTRIBUTES, 
-               ID, 
-               STATUS 
-            );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "TASK_CREATE",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         0
-      );
-
--- TASK_IDENT
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            DUMMY_RTEMS.TASK_IDENT(
-               NAME,
-               RTEMS.SEARCH_ALL_NODES,
-               ID,
-               STATUS
-            );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "TASK_IDENT",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         0
-      );
-
--- TASK_START
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            DUMMY_RTEMS.TASK_START( ID, TMTEST.TASK_1'ACCESS, 0, STATUS );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "TASK_START",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         0
-      );
-
--- TASK_RESTART
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            DUMMY_RTEMS.TASK_RESTART( ID, 0, STATUS );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "TASK_RESTART",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         0
-      );
-
--- TASK_DELETE
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            DUMMY_RTEMS.TASK_DELETE( ID, STATUS );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "TASK_DELETE",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         0
-      );
-
--- TASK_SUSPEND
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            DUMMY_RTEMS.TASK_SUSPEND( ID, STATUS );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "TASK_SUSPEND",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         0
-      );
-
--- TASK_RESUME
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            DUMMY_RTEMS.TASK_RESUME( ID, STATUS );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "TASK_RESUME",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         0
-      );
-
--- TASK_SET_PRIORITY
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            DUMMY_RTEMS.TASK_SET_PRIORITY( 
-               ID, 
-               IN_PRIORITY, 
-               OUT_PRIORITY, 
-               STATUS 
-            );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "TASK_SET_PRIORITY",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         0
-      );
-
--- TASK_MODE
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            DUMMY_RTEMS.TASK_MODE( 
-               IN_MODE, 
-               MASK,
-               OUT_MODE, 
-               STATUS 
-            );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "TASK_MODE",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         0
-      );
-
--- TASK_GET_NOTE
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            DUMMY_RTEMS.TASK_GET_NOTE( ID, 1, NOTE, STATUS );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "TASK_GET_NOTE",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         0
-      );
-
--- TASK_SET_NOTE
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            DUMMY_RTEMS.TASK_SET_NOTE( ID, 1, NOTE, STATUS );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "TASK_SET_NOTE",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         0
-      );
-
--- TASK_WAKE_WHEN
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            DUMMY_RTEMS.TASK_WAKE_WHEN( TIME, STATUS );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "TASK_WAKE_WHEN",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         0
-      );
-
--- TASK_WAKE_AFTER
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            DUMMY_RTEMS.TASK_WAKE_AFTER( TIMEOUT, STATUS );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "TASK_WAKE_AFTER",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT,
-         OVERHEAD,
-         0
-      );
-
--- INTERRUPT_CATCH
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            DUMMY_RTEMS.INTERRUPT_CATCH( 
-               TMTEST.ISR_HANDLER'ADDRESS,  
-               RTEMS.VECTOR_NUMBER'FIRST,
-               ADDRESS_1,
-               STATUS
-            );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "INTERRUPT_CATCH",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         0
-      );
-
--- CLOCK_GET
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            DUMMY_RTEMS.CLOCK_GET( RTEMS.CLOCK_GET_TOD, TIME'ADDRESS, STATUS );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "CLOCK_GET",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         0
-      );
-
--- CLOCK_SET
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            DUMMY_RTEMS.CLOCK_SET( TIME, STATUS );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "CLOCK_SET",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         0
-      );
-
--- CLOCK_TICK
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            DUMMY_RTEMS.CLOCK_TICK( STATUS );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "CLOCK_TICK",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         0
-      );
-
-TEST_SUPPORT.PAUSE;
-
--- TIMER_CREATE
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            DUMMY_RTEMS.TIMER_CREATE( NAME, ID, STATUS );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "TIMER_CREATE",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         0
-      );
-
--- TIMER_DELETE
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            DUMMY_RTEMS.TIMER_DELETE( ID, STATUS );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "TIMER_DELETE",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         0
-      );
-
--- TIMER_IDENT
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            DUMMY_RTEMS.TIMER_IDENT(
-               NAME,
-               ID,
-               STATUS
-            );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "TIMER_IDENT",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         0
-      );
-
--- TIMER_FIRE_AFTER
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            DUMMY_RTEMS.TIMER_FIRE_AFTER( 
-               ID, 
-               TIMEOUT, 
-               TMTEST.TIMER_HANDLER'ACCESS,
-               RTEMS.NULL_ADDRESS,
-               STATUS
-            );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "TIMER_FIRE_AFTER",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         0
-      );
-
--- TIMER_FIRE_WHEN
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            DUMMY_RTEMS.TIMER_FIRE_WHEN(
-               ID, 
-               TIME, 
-               TMTEST.TIMER_HANDLER'ACCESS,
-               RTEMS.NULL_ADDRESS,
-               STATUS
-            );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "TIMER_FIRE_WHEN",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         0
-      );
-
--- TIMER_RESET
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            DUMMY_RTEMS.TIMER_RESET( ID, STATUS );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "TIMER_RESET",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         0
-      );
-
--- TIMER_CANCEL
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            DUMMY_RTEMS.TIMER_CANCEL( ID, STATUS );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "TIMER_CANCEL",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         0
-      );
-
--- SEMAPHORE_CREATE
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            DUMMY_RTEMS.SEMAPHORE_CREATE( 
-               NAME, 
-               128,
-               RTEMS.DEFAULT_ATTRIBUTES,
-               RTEMS.NO_PRIORITY,
-               ID, 
-               STATUS 
-            );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "SEMAPHORE_CREATE",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         0
-      );
-
--- SEMAPHORE_DELETE
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            DUMMY_RTEMS.SEMAPHORE_DELETE( ID, STATUS );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "SEMAPHORE_DELETE",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         0
-      );
-
--- SEMAPHORE_IDENT
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            DUMMY_RTEMS.SEMAPHORE_IDENT(
-               NAME,
-               RTEMS.SEARCH_ALL_NODES,
-               ID,
-               STATUS
-            );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "SEMAPHORE_IDENT",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         0
-      );
-
--- SEMAPHORE_OBTAIN
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            DUMMY_RTEMS.SEMAPHORE_OBTAIN( 
-               ID, 
-               RTEMS.DEFAULT_OPTIONS,
-               TIMEOUT,
-               STATUS 
-            );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "SEMAPHORE_OBTAIN",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         0
-      );
-
--- SEMAPHORE_RELEASE
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            DUMMY_RTEMS.SEMAPHORE_RELEASE( ID, STATUS );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "SEMAPHORE_RELEASE",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         0
-      );
-
--- MESSAGE_QUEUE_CREATE
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            DUMMY_RTEMS.MESSAGE_QUEUE_CREATE( 
-               NAME, 
-               128,
-               16,
-               RTEMS.DEFAULT_ATTRIBUTES,
-               ID, 
-               STATUS 
-            );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "MESSAGE_QUEUE_CREATE",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         0
-      );
-
--- MESSAGE_QUEUE_IDENT
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            DUMMY_RTEMS.MESSAGE_QUEUE_IDENT(
-               NAME,
-               RTEMS.SEARCH_ALL_NODES,
-               ID,
-               STATUS
-            );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "MESSAGE_QUEUE_IDENT",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         0
-      );
-
--- MESSAGE_QUEUE_DELETE
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            DUMMY_RTEMS.MESSAGE_QUEUE_DELETE( ID, STATUS );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "MESSAGE_QUEUE_DELETE",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         0
-      );
-
--- MESSAGE_QUEUE_SEND
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            DUMMY_RTEMS.MESSAGE_QUEUE_SEND( ID, BUFFER_POINTER, 16, STATUS );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "MESSAGE_QUEUE_SEND",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         0
-      );
-
--- MESSAGE_QUEUE_URGENT
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            DUMMY_RTEMS.MESSAGE_QUEUE_URGENT( ID, BUFFER_POINTER, 16, STATUS );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "MESSAGE_QUEUE_URGENT",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         0
-      );
-
--- MESSAGE_QUEUE_BROADCAST
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            DUMMY_RTEMS.MESSAGE_QUEUE_BROADCAST( 
-               ID, 
-               BUFFER_POINTER, 
-               16,
-               COUNT, 
-               STATUS 
-            );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "MESSAGE_QUEUE_BROADCAST",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         0
-      );
-
--- MESSAGE_QUEUE_RECEIVE
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            DUMMY_RTEMS.MESSAGE_QUEUE_RECEIVE( 
-               ID, 
-               BUFFER_POINTER,
-               RTEMS.DEFAULT_OPTIONS,
-               TIMEOUT,
-               MESSAGE_SIZE,
-               STATUS 
-            );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "MESSAGE_QUEUE_RECEIVE",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         0
-      );
-
--- MESSAGE_QUEUE_FLUSH
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            DUMMY_RTEMS.MESSAGE_QUEUE_FLUSH( ID, COUNT, STATUS );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "MESSAGE_QUEUE_FLUSH",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         0
-      );
-
-TEST_SUPPORT.PAUSE;
-
--- EVENT_SEND
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            DUMMY_RTEMS.EVENT_SEND( ID, EVENTS, STATUS );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "EVENT_SEND",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         0
-      );
-
--- EVENT_RECEIVE
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            DUMMY_RTEMS.EVENT_RECEIVE( 
-               RTEMS.EVENT_16, 
-               EVENTS, 
-               RTEMS.DEFAULT_OPTIONS,
-               TIMEOUT,
-               STATUS 
-            );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "EVENT_RECEIVE",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         0
-      );
-
--- SIGNAL_CATCH
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            DUMMY_RTEMS.SIGNAL_CATCH( 
-               TMTEST.ASR_HANDLER'ACCESS, 
-               RTEMS.DEFAULT_MODES,
-               STATUS 
-            );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "SIGNAL_CATCH",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         0
-      );
-
--- SIGNAL_SEND
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            DUMMY_RTEMS.SIGNAL_SEND( ID, SIGNALS, STATUS );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "SIGNAL_SEND",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         0
-      );
-
--- PARTITION_CREATE
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            DUMMY_RTEMS.PARTITION_CREATE( 
-               NAME, 
-               TMTEST.MEMORY_AREA'ADDRESS,
-               2048,
-               128,
-               RTEMS.DEFAULT_ATTRIBUTES,
-               ID, 
-               STATUS 
-            );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "PARTITION_CREATE",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         0
-      );
-
--- PARTITION_IDENT
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            DUMMY_RTEMS.PARTITION_IDENT(
-               NAME,
-               RTEMS.SEARCH_ALL_NODES,
-               ID,
-               STATUS
-            );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "PARTITION_IDENT",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         0
-      );
-
--- PARTITION_DELETE
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            DUMMY_RTEMS.PARTITION_DELETE( ID, STATUS );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "PARTITION_DELETE",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         0
-      );
-
--- PARTITION_GET_BUFFER
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            DUMMY_RTEMS.PARTITION_GET_BUFFER( ID, ADDRESS_1, STATUS );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "PARTITION_GET_BUFFER",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         0
-      );
-
--- PARTITION_RETURN_BUFFER
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            DUMMY_RTEMS.PARTITION_RETURN_BUFFER( ID, ADDRESS_1, STATUS );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "PARTITION_RETURN_BUFFER",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         0
-      );
-
--- REGION_CREATE
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            DUMMY_RTEMS.REGION_CREATE( 
-               NAME, 
-               TMTEST.MEMORY_AREA'ADDRESS,
-               2048,
-               128,
-               RTEMS.DEFAULT_ATTRIBUTES,
-               ID, 
-               STATUS 
-            );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "REGION_CREATE",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         0
-      );
-
--- REGION_IDENT
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            DUMMY_RTEMS.REGION_IDENT(
-               NAME,
-               ID,
-               STATUS
-            );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "REGION_IDENT",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         0
-      );
-
--- REGION_DELETE
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            DUMMY_RTEMS.REGION_DELETE( ID, STATUS );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "REGION_DELETE",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         0
-      );
-
--- REGION_GET_SEGMENT
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            DUMMY_RTEMS.REGION_GET_SEGMENT( 
-               ID, 
-               243,
-               RTEMS.DEFAULT_OPTIONS,
-               TIMEOUT,
-               ADDRESS_1,
-               STATUS 
-            );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "REGION_GET_SEGMENT",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         0
-      );
-
--- REGION_RETURN_SEGMENT
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            DUMMY_RTEMS.REGION_RETURN_SEGMENT( ID, ADDRESS_1, STATUS );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "REGION_RETURN_SEGMENT",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         0
-      );
-
--- PORT_CREATE
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            DUMMY_RTEMS.PORT_CREATE( 
-               NAME, 
-               TMTEST.INTERNAL_PORT_AREA'ADDRESS,
-               TMTEST.EXTERNAL_PORT_AREA'ADDRESS,
-               TMTEST.INTERNAL_PORT_AREA'LENGTH,
-               ID, 
-               STATUS 
-            );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "PORT_CREATE",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         0
-      );
-
--- PORT_IDENT
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            DUMMY_RTEMS.PORT_IDENT( NAME, ID, STATUS );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "PORT_IDENT",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         0
-      );
-
--- PORT_DELETE
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            DUMMY_RTEMS.PORT_DELETE( ID, STATUS );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "PORT_DELETE",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         0
-      );
-
--- PORT_EXTERNAL_TO_INTERNAL
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            DUMMY_RTEMS.PORT_EXTERNAL_TO_INTERNAL( 
-               ID, 
-               TMTEST.EXTERNAL_PORT_AREA( 7 )'ADDRESS,
-               ADDRESS_1,
-               STATUS 
-            );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "PORT_EXTERNAL_TO_INTERNAL",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         0
-      );
-
--- PORT_INTERNAL_TO_EXTERNAL
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            DUMMY_RTEMS.PORT_INTERNAL_TO_EXTERNAL( 
-               ID, 
-               TMTEST.INTERNAL_PORT_AREA( 7 )'ADDRESS,
-               ADDRESS_1,
-               STATUS 
-            );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "PORT_INTERNAL_TO_EXTERNAL",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         0
-      );
-
-TEST_SUPPORT.PAUSE;
-
--- IO_INITIALIZE
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            DUMMY_RTEMS.IO_INITIALIZE( 
-               MAJOR,
-               MINOR,
-               ADDRESS_1,
-               IO_RESULT,
-               STATUS
-            );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "IO_INITIALIZE",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         0
-      );
-
--- IO_OPEN
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            DUMMY_RTEMS.IO_OPEN( 
-               MAJOR,
-               MINOR,
-               ADDRESS_1,
-               IO_RESULT,
-               STATUS
-            );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "IO_OPEN",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         0
-      );
-
--- IO_CLOSE
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            DUMMY_RTEMS.IO_CLOSE( 
-               MAJOR,
-               MINOR,
-               ADDRESS_1,
-               IO_RESULT,
-               STATUS
-            );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "IO_CLOSE",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         0
-      );
-
--- IO_READ
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            DUMMY_RTEMS.IO_READ( 
-               MAJOR,
-               MINOR,
-               ADDRESS_1,
-               IO_RESULT,
-               STATUS
-            );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "IO_READ",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         0
-      );
-
--- IO_WRITE
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            DUMMY_RTEMS.IO_WRITE( 
-               MAJOR,
-               MINOR,
-               ADDRESS_1,
-               IO_RESULT,
-               STATUS
-            );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "IO_WRITE",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         0
-      );
-
--- IO_CONTROL
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            DUMMY_RTEMS.IO_CONTROL( 
-               MAJOR,
-               MINOR,
-               ADDRESS_1,
-               IO_RESULT,
-               STATUS
-            );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "IO_CONTROL",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         0
-      );
-
--- FATAL_ERROR_OCCURRED
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            DUMMY_RTEMS.FATAL_ERROR_OCCURRED( ERROR );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "FATAL_ERROR_OCCURRED",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         0
-      );
-
--- RATE_MONOTONIC_CREATE
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            DUMMY_RTEMS.RATE_MONOTONIC_CREATE( NAME, ID, STATUS );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "RATE_MONOTONIC_CREATE",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         0
-      );
-
--- RATE_MONOTONIC_IDENT
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            DUMMY_RTEMS.RATE_MONOTONIC_IDENT(
-               NAME,
-               ID,
-               STATUS
-            );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "RATE_MONOTONIC_IDENT",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         0
-      );
-
--- RATE_MONOTONIC_DELETE
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            DUMMY_RTEMS.RATE_MONOTONIC_DELETE( ID, STATUS );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "RATE_MONOTONIC_DELETE",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         0
-      );
-
--- RATE_MONOTONIC_CANCEL
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            DUMMY_RTEMS.RATE_MONOTONIC_CANCEL( ID, STATUS );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "RATE_MONOTONIC_CANCEL",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         0
-      );
-
--- RATE_MONOTONIC_PERIOD
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            DUMMY_RTEMS.RATE_MONOTONIC_PERIOD( ID, TIMEOUT, STATUS );
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "RATE_MONOTONIC_PERIOD",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         0
-      );
-
--- MULTIPROCESSING_ANNOUNCE
-
-      TIMER_DRIVER.INITIALIZE;
-         for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
-         loop
-            DUMMY_RTEMS.MULTIPROCESSING_ANNOUNCE;
-         end loop;
-      TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
-
-      TIME_TEST_SUPPORT.PUT_TIME( 
-         "MULTIPROCESSING_ANNOUNCE",
-         TMTEST.END_TIME, 
-         TIME_TEST_SUPPORT.OPERATION_COUNT, 
-         OVERHEAD,
-         0
-      );
-
-      RTEMS.SHUTDOWN_EXECUTIVE( 0 );
-   
-   end TASK_1;
-
-end TMTEST;
diff --git a/c/src/ada-tests/tmtests/tmoverhd/tmtest.ads b/c/src/ada-tests/tmtests/tmoverhd/tmtest.ads
deleted file mode 100644
index 52b4da559d..0000000000
--- a/c/src/ada-tests/tmtests/tmoverhd/tmtest.ads
+++ /dev/null
@@ -1,155 +0,0 @@
---
---  TMTEST / SPECIFICATION
---
---  DESCRIPTION:
---
---  This package is the specification for Calling Overhead Test of the RTEMS
---  Timing Test Suite.
---
---  DEPENDENCIES: 
---
---  
---
---  COPYRIGHT (c) 1989-1997.
---  On-Line Applications Research Corporation (OAR).
---  Copyright assigned to U.S. Government, 1994.
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with RTEMS;
-with SYSTEM;
-with TIMER_DRIVER;
-with System.Storage_Elements;
-
-package TMTEST is
-
---
---  Buffer Record similar to that used by RTEMS 3.2.1.  Using this
---  avoids changes to the test.
---
-
-   type BUFFER is
-      record
-         FIELD1 : RTEMS.UNSIGNED32;   -- TEMPORARY UNTIL VARIABLE LENGTH
-         FIELD2 : RTEMS.UNSIGNED32;
-         FIELD3 : RTEMS.UNSIGNED32;
-         FIELD4 : RTEMS.UNSIGNED32;
-      end record;
-
---
---  These arrays contain the IDs and NAMEs of all RTEMS tasks created
---  by this test.
---
-
-   TASK_ID   : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.ID;
-   TASK_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.NAME;
-
---
---  The following variable is set to the execution time returned
---  by the timer.
---
-
-   END_TIME  : RTEMS.UNSIGNED32;
-
---
---  The following area defines a memory area to be used as the
---  internal address space of the port.
--- 
-
-   INTERNAL_PORT_AREA_ADDRESS : constant System.Address :=
-      System.Storage_Elements.To_Address(16#00001000#);
-
-   INTERNAL_PORT_AREA : array ( RTEMS.UNSIGNED32 range 0 .. 255 )
-      of RTEMS.UNSIGNED8;
-   for INTERNAL_PORT_AREA use at INTERNAL_PORT_AREA_ADDRESS;
-
---
---  The following area defines a memory area to be used as the
---  external address space of the port.
--- 
-
-   EXTERNAL_PORT_AREA_ADDRESS : constant System.Address :=
-      System.Storage_Elements.To_Address(16#00002000#);
-
-   EXTERNAL_PORT_AREA : array ( RTEMS.UNSIGNED32 range 0 .. 255 )
-      of RTEMS.UNSIGNED8;
-   for EXTERNAL_PORT_AREA use at EXTERNAL_PORT_AREA_ADDRESS;
-
-
---
---  The following area defines a memory area to be used as the
---  memory space for a partition and later for a region.
--- 
-
-   MEMORY_AREA : array ( RTEMS.UNSIGNED32 range 0 .. 255 ) of RTEMS.UNSIGNED8;
-   for MEMORY_AREA'ALIGNMENT use RTEMS.STRUCTURE_ALIGNMENT;
-
---
---  INIT
---
---  DESCRIPTION:
---
---  This RTEMS task initializes the application.
---
-
-   procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
---
---  TIMER_HANDLER
---
---  DESCRIPTION:
---
---  This subprogram is a timer service routine.
---
-
-   procedure TIMER_HANDLER (
-      IGNORED_ID      : in     RTEMS.ID;  
-      IGNORED_ADDRESS : in     RTEMS.ADDRESS 
-   );
-
---
---  ISR_HANDLER
---
---  DESCRIPTION:
---
---  This subprogram is an interrupt service routine.
---
-
-   procedure ISR_HANDLER (
-      VECTOR : in     RTEMS.VECTOR_NUMBER
-   );
-
---
---  ASR_HANDLER
---
---  DESCRIPTION:
---
---  This subprogram is an asynchronous signal routine.
---
-
-   procedure ASR_HANDLER (
-      SIGNALS : in     RTEMS.SIGNAL_SET
-   );
-
---
---  TASK_1
---
---  DESCRIPTION:
---
---  This RTEMS task is responsible for measuring and 
---  reporting the calling overhead for all RTEMS
---  directives.
---
-
-   procedure TASK_1 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
-   );
-
-end TMTEST;
diff --git a/c/src/ada/rtems.adb b/c/src/ada/rtems.adb
deleted file mode 100644
index 9bd7432be1..0000000000
--- a/c/src/ada/rtems.adb
+++ /dev/null
@@ -1,2035 +0,0 @@
---
---  RTEMS / Body
---  DESCRIPTION:
---
---  This package provides the interface to the RTEMS API.
---  
---
---  DEPENDENCIES:
---
---
---
---  COPYRIGHT (c) 1997.
---  On-Line Applications Research Corporation (OAR).
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with Ada;
-with Ada.Unchecked_Conversion;
-with System;
-with Interfaces; use Interfaces;
-with Interfaces.C;
-
-package body RTEMS is
-
-   --
-   --  Utility Functions
-   --
- 
-   function From_Ada_Boolean (
-      Ada_Boolean : Standard.Boolean
-   ) return RTEMS.Boolean is
-   begin
-
-      if Ada_Boolean = Standard.True then
-         return RTEMS.True;
-      end if;
-
-      return RTEMS.False;
-
-   end From_Ada_Boolean;
- 
-   function To_Ada_Boolean (
-      RTEMS_Boolean : RTEMS.Boolean
-   ) return Standard.Boolean is
-   begin
-
-      if RTEMS_Boolean = RTEMS.True then
-         return Standard.True;
-      end if;
-
-      return Standard.False;
-
-   end To_Ada_Boolean;
-
-   function Milliseconds_To_Microseconds (
-      Milliseconds : RTEMS.Unsigned32
-   ) return RTEMS.Unsigned32 is
-   begin
-
-      return Milliseconds * 1000;
-
-   end Milliseconds_To_Microseconds;
-
-   function Microseconds_To_Ticks (
-      Microseconds : RTEMS.Unsigned32
-   ) return RTEMS.Interval is
-      Microseconds_Per_Tick : RTEMS.Interval;
-      pragma Import (C, Microseconds_Per_Tick, "_TOD_Microseconds_per_tick");
-   begin
-
-      return Microseconds / Microseconds_Per_Tick; 
-
-   end Microseconds_To_Ticks;
-
-   function Milliseconds_To_Ticks (
-      Milliseconds : RTEMS.Unsigned32
-   ) return RTEMS.Interval is
-   begin
-
-      return Microseconds_To_Ticks(Milliseconds_To_Microseconds(Milliseconds));
-
-   end Milliseconds_To_Ticks;
-
-   function Build_Name (
-      C1 : in     Character;
-      C2 : in     Character;
-      C3 : in     Character;
-      C4 : in     Character
-   ) return RTEMS.Name is
-      C1_Value : RTEMS.Unsigned32;
-      C2_Value : RTEMS.Unsigned32;
-      C3_Value : RTEMS.Unsigned32;
-      C4_Value : RTEMS.Unsigned32;
-   begin
-
-     C1_Value := Character'Pos( C1 );
-     C2_Value := Character'Pos( C2 );
-     C3_Value := Character'Pos( C3 );
-     C4_Value := Character'Pos( C4 );
-
-     return Interfaces.Shift_Left( C1_Value, 24 ) or
-            Interfaces.Shift_Left( C2_Value, 16 ) or
-            Interfaces.Shift_Left( C3_Value, 8 )  or
-            C4_Value;
-
-   end Build_Name;
-
-   procedure Name_To_Characters (
-      Name : in     RTEMS.Name;
-      C1   :    out Character;
-      C2   :    out Character;
-      C3   :    out Character;
-      C4   :    out Character
-   ) is
-      C1_Value : RTEMS.Unsigned32;
-      C2_Value : RTEMS.Unsigned32;
-      C3_Value : RTEMS.Unsigned32;
-      C4_Value : RTEMS.Unsigned32;
-   begin
-
-     C1_Value := Interfaces.Shift_Right( Name, 24 );
-     C2_Value := Interfaces.Shift_Right( Name, 16 );
-     C3_Value := Interfaces.Shift_Right( Name, 8 );
-     C4_Value := Name;
-
-     C1_Value := C1_Value and 16#00FF#;
-     C2_Value := C2_Value and 16#00FF#;
-     C3_Value := C3_Value and 16#00FF#;
-     C4_Value := C4_Value and 16#00FF#;
-
-     C1 := Character'Val( C1_Value );
-     C2 := Character'Val( C2_Value );
-     C3 := Character'Val( C3_Value );
-     C4 := Character'Val( C4_Value );
-
-   end Name_To_Characters;
-
-   function Get_Node (
-      ID : in     RTEMS.ID
-   ) return RTEMS.Unsigned32 is
-   begin
-
-      -- May not be right
-      return Interfaces.Shift_Right( ID, 16 );
-
-   end Get_Node;
-
-   function Get_Index (
-      ID : in     RTEMS.ID
-   ) return RTEMS.Unsigned32 is
-   begin
-
-      -- May not be right
-      return ID and 16#FFFF#;
-
-   end Get_Index;
-
-
-   function Are_Statuses_Equal (
-      Status  : in     RTEMS.Status_Codes;
-      Desired : in     RTEMS.Status_Codes
-   ) return Standard.Boolean is
-   begin
-
-      if Status = Desired then
-         return Standard.True;
-      end if;
-
-      return Standard.False;
-
-   end Are_Statuses_Equal;
-
-   function Is_Status_Successful (
-      Status  : in     RTEMS.Status_Codes
-   ) return Standard.Boolean is
-   begin
-
-      if Status = RTEMS.Successful then
-         return Standard.True;
-      end if;
-
-      return Standard.False;
-
-   end Is_Status_Successful;
-
-   function Subtract (
-      Left   : in     RTEMS.Address;
-      Right  : in     RTEMS.Address
-   ) return RTEMS.Unsigned32 is
-      function To_Unsigned32 is
-         new Ada.Unchecked_Conversion (System.Address, RTEMS.Unsigned32);
-
-   begin
-      return To_Unsigned32(Left) - To_Unsigned32(Right);
-   end Subtract;
-
-   function Are_Equal (
-      Left   : in     RTEMS.Address;
-      Right  : in     RTEMS.Address
-   ) return Standard.Boolean is
-      function To_Unsigned32 is
-         new Ada.Unchecked_Conversion (System.Address, RTEMS.Unsigned32);
-
-   begin
-      return (To_Unsigned32(Left) = To_Unsigned32(Right));
-   end Are_Equal;
-
-
-   --
-   --
-   --  RTEMS API
-   --
-
-   --
-   --  Initialization Manager
-   --
-
-   procedure Initialize_Executive (
-      Configuration_Table   : in     RTEMS.Configuration_Table_Pointer;
-      CPU_Table             : in     RTEMS.CPU_Table_Pointer
-   ) is
-      procedure Initialize_Executive_Base (
-         Configuration_Table   : in     RTEMS.Configuration_Table_Pointer;
-         CPU_Table             : in     RTEMS.CPU_Table_Pointer
-      );
-      pragma Import (C, Initialize_Executive_Base,
-         "rtems_initialize_executive");
-
-   begin
-
-      Initialize_Executive_Base (Configuration_Table, CPU_Table);
-
-   end Initialize_Executive;
- 
-   procedure Initialize_Executive_Early (
-      Configuration_Table : in     RTEMS.Configuration_Table_Pointer;
-      CPU_Table           : in     RTEMS.CPU_Table_Pointer;
-      Level               :    out RTEMS.ISR_Level
-   ) is
-      function Initialize_Executive_Early_Base (
-         Configuration_Table   : in     RTEMS.Configuration_Table_Pointer;
-         CPU_Table             : in     RTEMS.CPU_Table_Pointer
-      ) return RTEMS.ISR_Level;
-      pragma Import (C, Initialize_Executive_Early_Base,
-         "rtems_initialize_executive_early");
-
-   begin
-
-      Level := Initialize_Executive_Early_Base (Configuration_Table, CPU_Table);
-
-   end Initialize_Executive_Early;
-
-   procedure Initialize_Executive_Late (
-      BSP_Level : in    RTEMS.ISR_Level
-   ) is
-      procedure Initialize_Executive_Late_Base (
-         Level : in     RTEMS.ISR_Level
-      );
-      pragma Import (C, Initialize_Executive_Late_Base,
-         "rtems_initialize_executive_late");
-
-   begin
-
-      Initialize_Executive_Late_Base (BSP_Level);
-
-   end Initialize_Executive_Late;
-
-   procedure Shutdown_Executive (
-      Result : in     RTEMS.Unsigned32
-   ) is
-      procedure Shutdown_Executive_Base;
-      pragma Import (C,Shutdown_Executive_Base,"rtems_shutdown_executive");
-   begin
-
-      Shutdown_Executive_Base;
-
-   end Shutdown_Executive;
-
-
-   --
-   --  Task Manager
-   --
-
-   procedure Task_Create (
-      Name             : in     RTEMS.Name;
-      Initial_Priority : in     RTEMS.Task_Priority;
-      Stack_Size       : in     RTEMS.Unsigned32;
-      Initial_Modes    : in     RTEMS.Mode;
-      Attribute_Set    : in     RTEMS.Attribute;
-      ID               :    out RTEMS.ID;
-      Result           :    out RTEMS.Status_Codes
-   ) is
-      function Task_Create_Base (
-         Name             : RTEMS.Name;
-         Initial_Priority : RTEMS.Task_Priority;
-         Stack_Size       : RTEMS.Unsigned32;
-         Initial_Modes    : RTEMS.Mode;
-         Attribute_Set    : RTEMS.Attribute;
-         ID               : access RTEMS.ID
-      )  return RTEMS.Status_Codes;
-         pragma Import (C, Task_Create_Base, "rtems_task_create");
-         ID_Base : aliased RTEMS.ID := ID;
-   begin
-      Result := Task_Create_Base (
-                   Name,
-                   Initial_Priority,
-                   Stack_Size,
-                   Initial_Modes,
-                   Attribute_Set,
-                   ID_Base'Unchecked_Access
-                );
-      ID := ID_Base;
-   end Task_Create;
-
-
-   procedure Task_Ident (
-      Name             : in     RTEMS.Name;
-      Node             : in     RTEMS.Node;
-      ID               :    out RTEMS.ID;
-      Result           :    out RTEMS.Status_Codes
-   ) is
-
-      function Task_Ident_Base (
-         Name             : RTEMS.Name;
-         Node             : RTEMS.Node;
-         ID               : access RTEMS.ID
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Task_Ident_Base, "rtems_task_ident");
-      ID_Base     : aliased RTEMS.ID := ID;
-
-   begin
-
-      Result := Task_Ident_Base (
-                        Name,
-                        Node,
-                        ID_Base'Unchecked_Access
-                     );
-
-      ID := ID_Base;
-
-   end Task_Ident;
-
-   procedure Task_Start (
-      ID          : in     RTEMS.ID;
-      Entry_Point : in     RTEMS.Task_Entry;
-      Argument    : in     RTEMS.Task_Argument;
-      Result      :    out RTEMS.Status_Codes
-   ) is
-
-      function Task_Start_Base (
-         ID          : RTEMS.ID;
-         Entry_Point : RTEMS.Task_Entry;
-         Argument    : RTEMS.Task_Argument
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Task_Start_Base, "rtems_task_start");
-
-   begin
-
-      Result := Task_Start_Base (
-                        ID,
-                        Entry_Point,
-                        Argument
-                     );
-
-   end Task_Start;
-
-   procedure Task_Restart (
-      ID       : in     RTEMS.ID;
-      Argument : in     RTEMS.Task_Argument;
-      Result   :    out RTEMS.Status_Codes
-   ) is
-      function Task_Restart_Base (
-         ID       : RTEMS.ID;
-         Argument : RTEMS.Task_Argument
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Task_Restart_Base, "rtems_task_restart");
-   begin
-
-      Result := Task_Restart_Base (
-                        ID,
-                        Argument
-                     );
- 
-   end Task_Restart;
- 
-   procedure Task_Delete (
-      ID     : in     RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   ) is
-      function Task_Delete_Base (
-         ID : RTEMS.ID
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Task_Delete_Base, "rtems_task_delete");
-   begin
-
-      Result := Task_Delete_Base ( ID );
- 
-   end Task_Delete;
- 
-   procedure Task_Suspend (
-      ID     : in     RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   ) is
-      function Task_Suspend_Base (
-         ID : RTEMS.ID
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Task_Suspend_Base, "rtems_task_suspend");
-   begin
-
-      Result := Task_Suspend_Base ( ID );
- 
-   end Task_Suspend;
- 
-   procedure Task_Resume (
-      ID     : in     RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   ) is
-      function Task_Resume_Base (
-         ID : RTEMS.ID
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Task_Resume_Base, "rtems_task_resume");
-   begin
-
-      Result := Task_Resume_Base ( ID );
-
-   end Task_Resume;
- 
-   procedure Task_Set_Priority (
-      ID           : in     RTEMS.ID;
-      New_Priority : in     RTEMS.Task_Priority;
-      Old_Priority :    out RTEMS.Task_Priority;
-      Result       :    out RTEMS.Status_Codes
-   ) is
-      function Task_Set_Priority_Base (
-         ID           : RTEMS.ID;
-         New_Priority : RTEMS.Task_Priority;
-         Old_Priority : access RTEMS.Task_Priority
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Task_Set_Priority_Base, "rtems_task_set_priority");
-      Old_Priority_Base : aliased RTEMS.Task_Priority := Old_Priority;
- 
-   begin
- 
-      Result := Task_Set_Priority_Base (
-                        ID,
-                        New_Priority,
-                        Old_Priority_Base'Unchecked_Access
-                     );
- 
-      Old_Priority := Old_Priority_Base;
-
-   end Task_Set_Priority;
- 
-   procedure Task_Mode (
-      Mode_Set          : in     RTEMS.Mode;
-      Mask              : in     RTEMS.Mode;
-      Previous_Mode_Set :    out RTEMS.Mode;
-      Result            :    out RTEMS.Status_Codes
-   ) is
-      function Task_Mode_Base (
-         Mode_Set          : RTEMS.Mode;
-         Mask              : RTEMS.Mode;
-         Previous_Mode_Set : access RTEMS.Mode
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Task_Mode_Base, "rtems_task_mode");
-      Previous_Mode_Set_Base : aliased RTEMS.Mode := Previous_Mode_Set;
-   begin
-
-      Result := Task_Mode_Base (
-         Mode_Set,
-         Mask,
-         Previous_Mode_Set_Base'Unchecked_Access
-      );
-
-      Previous_Mode_Set := Previous_Mode_Set_Base;
-
-   end Task_Mode;
- 
-   procedure Task_Get_Note (
-      ID      : in     RTEMS.ID;
-      Notepad : in     RTEMS.Notepad_Index;
-      Note    :    out RTEMS.Unsigned32;
-      Result  :    out RTEMS.Status_Codes
-   ) is
-      function Task_Get_Note_Base (
-         ID      : RTEMS.ID;
-         Notepad : RTEMS.Notepad_Index;
-         Note    : access RTEMS.Unsigned32
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Task_Get_Note_Base, "rtems_task_get_note");
-      Note_Base : aliased RTEMS.Unsigned32 := Note;
-   begin
-
-      Result := Task_Get_Note_Base (
-         ID,
-         Notepad,
-         Note_Base'Unchecked_Access
-      );
- 
-      Note := NOTE_Base;
-
-   end Task_Get_Note;
- 
-   procedure Task_Set_Note (
-      ID      : in     RTEMS.ID;
-      Notepad : in     RTEMS.Notepad_Index;
-      Note    : in     RTEMS.Unsigned32;
-      Result  :    out RTEMS.Status_Codes
-   ) is
-      function Task_Set_Note_Base (
-         ID      : RTEMS.ID;
-         Notepad : RTEMS.Notepad_Index;
-         Note    : RTEMS.Unsigned32
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Task_Set_Note_Base, "rtems_task_set_note");
-   begin
-
-      Result := Task_Set_Note_Base ( ID, Notepad, Note );
-
-   end Task_Set_Note;
- 
-   procedure Task_Wake_When (
-      Time_Buffer : in     RTEMS.Time_Of_Day;
-      Result      :    out RTEMS.Status_Codes
-   ) is
-      function Task_Wake_When_Base (
-         Time_Buffer : RTEMS.Time_Of_Day
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Task_Wake_When_Base, "rtems_task_wake_when");
-   begin
-
-      Result := Task_Wake_When_Base ( Time_Buffer );
-
-   end Task_Wake_When;
- 
-   procedure Task_Wake_After (
-      Ticks  : in     RTEMS.Interval;
-      Result :    out RTEMS.Status_Codes
-   ) is
-      function Task_Wake_After_Base (
-         Ticks : RTEMS.Interval
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Task_Wake_After_Base, "rtems_task_wake_after");
-   begin
-
-      Result := Task_Wake_After_Base ( Ticks );
-
-   end Task_Wake_After;
- 
-   --
-   -- Interrupt Manager
-   --
-
-   procedure Interrupt_Catch (
-      New_ISR_Handler : in     RTEMS.Address;
-      Vector          : in     RTEMS.Vector_Number;
-      Old_ISR_Handler :    out RTEMS.Address;
-      Result          :    out RTEMS.Status_Codes
-   ) is
-      function Interrupt_Catch_Base (
-         New_ISR_Handler : RTEMS.Address;
-         Vector          : RTEMS.Vector_Number;
-         Old_ISR_Handler : access RTEMS.Address
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Interrupt_Catch_Base, "rtems_interrupt_catch");
-      Old_ISR_Handler_Base : aliased RTEMS.Address := Old_ISR_Handler;
-   begin
- 
-      Result := Interrupt_Catch_Base (
-         New_ISR_Handler,
-         Vector,
-         OLD_ISR_HANDLER_Base'Unchecked_Access
-      );
- 
-      Old_ISR_Handler := OLD_ISR_HANDLER_Base;
- 
-   end Interrupt_Catch;
-
-   -- XXX
-   function Interrupt_Disable
-   return RTEMS.ISR_Level is
-   begin
-      return 0;
-   end Interrupt_Disable;
-
-   procedure Interrupt_Enable (
-      Level : in     RTEMS.ISR_Level
-   ) is
-   begin
-      Null;
-   end Interrupt_Enable;
-
-   procedure Interrupt_Flash (
-      Level : in     RTEMS.ISR_Level
-   ) is
-   begin
-      Null;
-   end Interrupt_Flash;
-
-   function Interrupt_Is_In_Progress
-   return RTEMS.Boolean is
-   begin
-      return RTEMS.From_Ada_Boolean (Standard.True);
-   end Interrupt_Is_In_Progress;
-
-   --
-   -- Clock Manager
-   -- 
- 
-   procedure Clock_Get (
-      Option      : in     RTEMS.Clock_Get_Options;
-      Time_Buffer : in     RTEMS.Address;
-      Result      :    out RTEMS.Status_Codes
-   ) is
-      function Clock_Get_base (
-         Option      : RTEMS.Clock_Get_Options;
-         Time_Buffer : RTEMS.Address
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Clock_Get_base, "rtems_clock_get");
-   begin
-
-      Result := Clock_Get_base ( Option, Time_Buffer );
-
-   end Clock_Get;
- 
-   procedure Clock_Set (
-      Time_Buffer : in     RTEMS.Time_Of_Day;
-      Result      :    out RTEMS.Status_Codes
-   ) is
-      function Clock_Set_base (
-         Time_Buffer : RTEMS.Time_Of_Day
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Clock_Set_base, "rtems_clock_set");
-   begin
- 
-      Result := Clock_Set_base ( Time_Buffer );
-
-   end Clock_Set;
- 
-   procedure Clock_Tick (
-      Result :    out RTEMS.Status_Codes
-   ) is
-      function Clock_Tick_Base return RTEMS.Status_Codes;
-      pragma Import (C, Clock_Tick_Base, "rtems_clock_tick");
-   begin
-
-      Result := Clock_Tick_Base;
-
-   end Clock_Tick;
- 
-   --
-   -- Extension Manager
-   --
- 
-   procedure Extension_Create (
-      Name   : in     RTEMS.Name;
-      Table  : in     RTEMS.Extensions_Table_Pointer;
-      ID     :    out RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   ) is
-      function Extension_Create_Base (
-         Name   : RTEMS.Name;
-         Table  : RTEMS.Extensions_Table_Pointer;
-         ID     : access RTEMS.ID
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Extension_Create_Base, "rtems_extension_create");
-      ID_Base : aliased RTEMS.ID := ID;
-   begin
- 
-      Result := Extension_Create_Base (
-         Name,
-         Table,
-         ID_Base'Unchecked_Access
-      );
- 
-      ID := ID_Base;
-
-   end Extension_Create;
- 
-   procedure Extension_Ident (
-      Name   : in     RTEMS.Name;
-      ID     :    out RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   ) is
-      function Extension_Ident_Base (
-         Name   : RTEMS.Name;
-         ID     : access RTEMS.ID
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Extension_Ident_Base, "rtems_extension_ident");
-      ID_Base : aliased RTEMS.ID := ID;
-   begin
- 
-      Result := Extension_Ident_Base (
-         Name,
-         ID_Base'Unchecked_Access
-      );
- 
-      ID := ID_Base;
-
-   end Extension_Ident;
- 
-   procedure Extension_Delete (
-      ID     : in     RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   ) is
-      function Extension_Delete_Base (
-         ID : RTEMS.ID
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Extension_Delete_Base, "rtems_extension_delete");
-   begin
- 
-      Result := Extension_Delete_Base ( ID );
-
-   end Extension_Delete;
- 
-   --
-   -- Timer Manager
-   --
- 
-   procedure Timer_Create (
-      Name   : in     RTEMS.Name;
-      ID     :    out RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   ) is
-      function Timer_Create_Base (
-         Name   : RTEMS.Name;
-         ID     : access RTEMS.ID
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Timer_Create_Base, "rtems_timer_create");
-      ID_Base : aliased RTEMS.ID := ID;
-   begin
- 
-      Result := Timer_Create_Base (
-         Name,
-         ID_Base'Unchecked_Access
-      );
- 
-      ID := ID_Base;
-
-   end Timer_Create;
- 
-   procedure Timer_Ident (
-      Name   : in     RTEMS.Name;
-      ID     :    out RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   ) is
-      function Timer_Ident_Base (
-         Name   : RTEMS.Name;
-         ID     : access RTEMS.ID
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Timer_Ident_Base, "rtems_timer_ident");
-      ID_Base : aliased RTEMS.ID := ID;
-   begin
- 
-      Result := Timer_Ident_Base (
-         Name,
-         ID_Base'Unchecked_Access
-      );
- 
-      ID := ID_Base;
-
-   end Timer_Ident;
- 
-   procedure Timer_Delete (
-      ID     : in     RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   ) is
-      function Timer_Delete_Base (
-         ID : RTEMS.ID
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Timer_Delete_Base, "rtems_timer_delete");
-   begin
- 
-      Result := Timer_Delete_Base ( ID );
-
-   end Timer_Delete;
- 
-   procedure Timer_Fire_After (
-      ID        : in     RTEMS.ID;
-      Ticks     : in     RTEMS.Interval;
-      Routine   : in     RTEMS.Timer_Service_Routine;
-      User_Data : in     RTEMS.Address;
-      Result    :    out RTEMS.Status_Codes
-   ) is
-      function Timer_Fire_After_Base (
-         ID        : RTEMS.ID;
-         Ticks     : RTEMS.Interval;
-         Routine   : RTEMS.Timer_Service_Routine;
-         User_Data : RTEMS.Address
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Timer_Fire_After_Base, "rtems_timer_fire_after");
-   begin
- 
-      Result := Timer_Fire_After_Base ( 
-                   ID,
-                   Ticks,
-                   Routine,
-                   User_Data
-                );
-
-   end Timer_Fire_After;
- 
-   procedure Timer_Fire_When (
-      ID        : in     RTEMS.ID;
-      Wall_Time : in     RTEMS.Time_Of_Day;
-      Routine   : in     RTEMS.Timer_Service_Routine;
-      User_Data : in     RTEMS.Address;
-      Result    :    out RTEMS.Status_Codes
-   ) is
-      function Timer_Fire_When (
-         ID        : RTEMS.ID;
-         Wall_Time : in     RTEMS.Time_Of_Day;
-         Routine   : RTEMS.Timer_Service_Routine;
-         User_Data : RTEMS.Address
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Timer_Fire_When, "rtems_timer_fire_when");
-   begin
- 
-      Result := Timer_Fire_When ( 
-                   ID,
-                   Wall_Time,
-                   Routine,
-                   User_Data
-                );
-
-   end Timer_Fire_When;
- 
-   procedure Timer_Reset (
-      ID     : in     RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   ) is
-      function Timer_Reset_Base (
-         ID : RTEMS.ID
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Timer_Reset_Base, "rtems_timer_reset");
-   begin
- 
-      Result := Timer_Reset_Base ( ID );
-
-   end Timer_Reset;
- 
-   procedure Timer_Cancel (
-      ID     : in     RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   ) is
-      function Timer_Cancel_Base (
-         ID : RTEMS.ID
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Timer_Cancel_Base, "rtems_timer_cancel");
-   begin
- 
-      Result := Timer_Cancel_Base ( ID );
-
-   end Timer_Cancel;
- 
-   --
-   -- Semaphore Manager
-   --
- 
-   procedure Semaphore_Create (
-      Name             : in     RTEMS.Name;
-      Count            : in     RTEMS.Unsigned32;
-      Attribute_Set    : in     RTEMS.Attribute;
-      Priority_Ceiling : in     RTEMS.Task_Priority;
-      ID               :    out RTEMS.ID;
-      Result           :    out RTEMS.Status_Codes
-   ) is
-      function Semaphore_Create_Base (
-         Name             : RTEMS.Name;
-         Count            : RTEMS.Unsigned32;
-         Attribute_Set    : RTEMS.Attribute;
-         Priority_Ceiling : RTEMS.Task_Priority;
-         ID               : access RTEMS.ID
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Semaphore_Create_Base, "rtems_semaphore_create");
-      ID_Base : aliased RTEMS.ID := ID;
-   begin
- 
-      Result := Semaphore_Create_Base (
-         Name,
-         Count,
-         Attribute_Set,
-         Priority_Ceiling,
-         ID_Base'Unchecked_Access
-      );
- 
-      ID := ID_Base;
-
-   end Semaphore_Create;
- 
-   procedure Semaphore_Delete (
-      ID     : in     RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   ) is
-      function Semaphore_Delete_Base (
-         ID : RTEMS.ID
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Semaphore_Delete_Base, "rtems_semaphore_delete");
-   begin
- 
-      Result := Semaphore_Delete_Base ( ID );
-
-   end Semaphore_Delete;
- 
-   procedure Semaphore_Ident (
-      Name   : in     RTEMS.Name;
-      Node   : in     RTEMS.Unsigned32;
-      ID     :    out RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   ) is
-      function Semaphore_Ident_Base (
-         Name : RTEMS.Name;
-         Node : RTEMS.Unsigned32;
-         ID   : access RTEMS.ID
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Semaphore_Ident_Base, "rtems_semaphore_ident");
-      ID_Base : aliased RTEMS.ID := ID;
-   begin
- 
-      Result := Semaphore_Ident_Base (
-         Name,
-         Node,
-         ID_Base'Unchecked_Access
-      );
- 
-      ID := ID_Base;
-
-   end Semaphore_Ident;
- 
-   procedure Semaphore_Obtain (
-      ID         : in     RTEMS.ID;
-      Option_Set : in     RTEMS.Option;
-      Timeout    : in     RTEMS.Interval;
-      Result     :    out RTEMS.Status_Codes
-   ) is
-      function Semaphore_Obtain_Base (
-         ID         : RTEMS.ID;
-         Option_Set : RTEMS.Option;
-         Timeout    : RTEMS.Interval
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Semaphore_Obtain_Base, "rtems_semaphore_obtain");
-   begin
- 
-      Result := Semaphore_Obtain_Base ( ID, Option_Set, Timeout );
-
-   end Semaphore_Obtain;
- 
-   procedure Semaphore_Release (
-      ID     : in     RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   ) is
-      function Semaphore_Release_Base (
-         ID : RTEMS.ID
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Semaphore_Release_Base, "rtems_semaphore_release");
-   begin
- 
-      Result := Semaphore_Release_Base ( ID );
-
-   end Semaphore_Release;
- 
-   --
-   -- Message Queue Manager
-   --
- 
-   procedure Message_Queue_Create (
-      Name             : in     RTEMS.Name;
-      Count            : in     RTEMS.Unsigned32;
-      Max_Message_Size : in     RTEMS.Unsigned32;
-      Attribute_Set    : in     RTEMS.Attribute;
-      ID               :    out RTEMS.ID;
-      Result           :    out RTEMS.Status_Codes
-   ) is
-      --  XXX broken
-      function Message_Queue_Create_Base (
-         Name             : RTEMS.Name;
-         Count            : RTEMS.Unsigned32;
-         Max_Message_Size : RTEMS.Unsigned32;
-         Attribute_Set    : RTEMS.Attribute;
-         ID               : access RTEMS.ID
-      )  return RTEMS.Status_Codes;
-      pragma Import (C,
-        Message_Queue_Create_Base, "rtems_message_queue_create");
-      ID_Base : aliased RTEMS.ID := ID;
-   begin
- 
-      Result := Message_Queue_Create_Base (
-         Name,
-         Count,
-         Max_Message_Size,
-         Attribute_Set,
-         ID_Base'Unchecked_Access
-      );
- 
-      ID := ID_Base;
-
-   end Message_Queue_Create;
- 
-   procedure Message_Queue_Ident (
-      Name   : in     RTEMS.Name;
-      Node   : in     RTEMS.Unsigned32;
-      ID     :    out RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   ) is
-      function Message_Queue_Ident_Base (
-         Name : RTEMS.Name;
-         Node : RTEMS.Unsigned32;
-         ID   : access RTEMS.ID
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Message_Queue_Ident_Base, "rtems_message_queue_ident");
-      ID_Base : aliased RTEMS.ID := ID;
-   begin
- 
-      Result := Message_Queue_Ident_Base (
-         Name,
-         Node,
-         ID_Base'Unchecked_Access
-      );
- 
-      ID := ID_Base;
-
-   end Message_Queue_Ident;
- 
-   procedure Message_Queue_Delete (
-      ID     : in     RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   ) is
-      function Message_Queue_Delete_Base (
-         ID : RTEMS.ID
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Message_Queue_Delete_Base,
-         "rtems_message_queue_delete");
-   begin
- 
-      Result := Message_Queue_Delete_Base ( ID );
-
-   end Message_Queue_Delete;
- 
-   procedure Message_Queue_Send (
-      ID     : in     RTEMS.ID;
-      Buffer : in     RTEMS.Address;
-      Size   : in     RTEMS.Unsigned32;
-      Result :    out RTEMS.Status_Codes
-   ) is
-      function Message_Queue_Send_Base (
-         ID     : RTEMS.ID;
-         Buffer : RTEMS.Address;
-         Size   : RTEMS.Unsigned32
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Message_Queue_Send_Base, "rtems_message_queue_send");
-   begin
- 
-      Result := Message_Queue_Send_Base ( ID, Buffer, Size );
-
-   end Message_Queue_Send;
- 
-   procedure Message_Queue_Urgent (
-      ID     : in     RTEMS.ID;
-      Buffer : in     RTEMS.Address;
-      Size   : in     RTEMS.Unsigned32;
-      Result :    out RTEMS.Status_Codes
-   ) is
-      function Message_Queue_Urgent_Base (
-         ID     : RTEMS.ID;
-         Buffer : RTEMS.Address;
-         Size   : RTEMS.Unsigned32
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Message_Queue_Urgent_Base,
-         "rtems_message_queue_urgent");
-   begin
- 
-      Result := Message_Queue_Urgent_Base ( ID, Buffer, Size );
-
-   end Message_Queue_Urgent;
- 
-   procedure Message_Queue_Broadcast (
-      ID     : in     RTEMS.ID;
-      Buffer : in     RTEMS.Address;
-      Size   : in     RTEMS.Unsigned32;
-      Count  :    out RTEMS.Unsigned32;
-      Result :    out RTEMS.Status_Codes
-   ) is
-      function Message_Queue_Broadcast_Base (
-         ID     : RTEMS.ID;
-         Buffer : RTEMS.Address;
-         Size   : RTEMS.Unsigned32;
-         Count  : access RTEMS.Unsigned32 
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Message_Queue_Broadcast_Base,
-         "rtems_message_queue_broadcast");
-      Count_Base : aliased RTEMS.Unsigned32 := Count;
-   begin
- 
-      Result := Message_Queue_Broadcast_Base ( 
-                   ID, 
-                   Buffer, 
-                   Size,
-                   Count_Base'Unchecked_Access
-                );
- 
-      Count := Count_Base;
-
-   end Message_Queue_Broadcast;
- 
-   procedure Message_Queue_Receive (
-      ID         : in     RTEMS.ID;
-      Buffer     : in     RTEMS.Address;
-      Option_Set : in     RTEMS.Option;
-      Timeout    : in     RTEMS.Interval;
-      Size       :    out RTEMS.Unsigned32;
-      Result     :    out RTEMS.Status_Codes
-   ) is
-      function Message_Queue_Receive_Base (
-         ID         : RTEMS.ID;
-         Buffer     : RTEMS.Address;
-         Size       : access RTEMS.Unsigned32;
-         Option_Set : RTEMS.Option;
-         Timeout    : RTEMS.Interval
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Message_Queue_Receive_Base,
-         "rtems_message_queue_receive");
-      Size_Base : aliased RTEMS.Unsigned32;
-   begin
- 
-      Result := Message_Queue_Receive_Base ( 
-                   ID,
-                   Buffer, 
-                   Size_Base'Unchecked_Access,
-                   Option_Set, 
-                   Timeout 
-                 );
-
-      Size := Size_Base;
-
-   end Message_Queue_Receive;
- 
-   procedure Message_Queue_Flush (
-      ID     : in     RTEMS.ID;
-      Count  :    out RTEMS.Unsigned32;
-      Result :    out RTEMS.Status_Codes
-   ) is
-      function Message_Queue_Flush_Base (
-         ID    : RTEMS.ID;
-         Count : access RTEMS.Unsigned32
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Message_Queue_Flush_Base, "rtems_message_queue_flush");
-      COUNT_Base : aliased RTEMS.Unsigned32 := Count;
-   begin
- 
-      Result := Message_Queue_Flush_Base (
-                   ID,
-                   COUNT_Base'Unchecked_Access
-                );
- 
-      Count := COUNT_Base;
-
-   end Message_Queue_Flush;
- 
-
-   --
-   -- Event Manager
-   --
-
-   procedure Event_Send (
-      ID       : in     RTEMS.ID;
-      Event_In : in     RTEMS.Event_Set;
-      Result   :    out RTEMS.Status_Codes
-   ) is
-      function Event_Send_Base (
-         ID       : RTEMS.ID;
-         Event_In : RTEMS.Event_Set
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Event_Send_Base, "rtems_event_send");
-   begin
-
-      Result := Event_Send_Base (
-                   ID,
-                   Event_In
-                );
-
-   end Event_Send;
-
-   procedure Event_Receive (
-      Event_In   : in     RTEMS.Event_Set;
-      Option_Set : in     RTEMS.Option;
-      Ticks      : in     RTEMS.Interval;
-      Event_Out  :    out RTEMS.Event_Set;
-      Result     :    out RTEMS.Status_Codes
-   ) is
-      function Event_Receive_Base (
-         Event_In   : RTEMS.Event_Set;
-         Option_Set : RTEMS.Option;
-         Ticks      : RTEMS.Interval;
-         Event_Out  : access RTEMS.Event_Set
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Event_Receive_Base, "rtems_event_receive");
-      Event_Out_Base : aliased RTEMS.Event_Set; -- := Event_Out;
-   begin
-
-      Result := Event_Receive_Base (
-                   Event_In,
-                   Option_Set,
-                   Ticks,
-                   Event_Out_Base'Access
-                );
-
-      Event_Out := Event_Out_Base;
-
-   end Event_Receive;
-
-   --
-   -- Signal Manager
-   --
- 
-   procedure Signal_Catch (
-      ASR_Handler : in     RTEMS.ASR_Handler;
-      Mode_Set    : in     RTEMS.Mode;
-      Result      :    out RTEMS.Status_Codes
-   ) is
-      function Signal_Catch_Base (
-         ASR_Handler : RTEMS.ASR_Handler;
-         Mode_Set    : RTEMS.Mode
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Signal_Catch_Base, "rtems_signal_catch");
-   begin
-
-      Result := Signal_Catch_Base ( ASR_Handler, Mode_Set );
-
-   end Signal_Catch;
- 
-   procedure Signal_Send (
-      ID         : in     RTEMS.ID;
-      Signal_Set : in     RTEMS.Signal_Set;
-      Result     :    out RTEMS.Status_Codes
-   ) is
-      function Signal_Send_Base (
-         ID         : RTEMS.ID;
-         Signal_Set : RTEMS.Signal_Set
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Signal_Send_Base, "rtems_signal_send");
-   begin
- 
-      Result := Signal_Send_Base ( ID, Signal_Set );
-
-   end Signal_Send;
- 
- 
-   --
-   -- Partition Manager
-   --
- 
-   procedure Partition_Create (
-      Name             : in     RTEMS.Name;
-      Starting_Address : in     RTEMS.Address;
-      Length           : in     RTEMS.Unsigned32;
-      Buffer_Size      : in     RTEMS.Unsigned32;
-      Attribute_Set    : in     RTEMS.Attribute;
-      ID               :    out RTEMS.ID;
-      Result           :    out RTEMS.Status_Codes
-   ) is
-      function Partition_Create_Base (
-         Name             : RTEMS.Name;
-         Starting_Address : RTEMS.Address;
-         Length           : RTEMS.Unsigned32;
-         Buffer_Size      : RTEMS.Unsigned32;
-         Attribute_Set    : RTEMS.Attribute;
-         ID               : access RTEMS.Event_Set
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Partition_Create_Base, "rtems_partition_create");
-      ID_Base : aliased RTEMS.ID := ID;
-   begin
- 
-      Result := Partition_Create_Base (
-         Name,
-         Starting_Address,
-         Length,
-         Buffer_Size,
-         Attribute_Set,
-         ID_Base'Unchecked_Access
-      );
- 
-      ID := ID_Base;
- 
-   end Partition_Create;
- 
-   procedure Partition_Ident (
-      Name   : in     RTEMS.Name;
-      Node   : in     RTEMS.Unsigned32;
-      ID     :    out RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   ) is
-      function Partition_Ident_Base (
-         Name : RTEMS.Name;
-         Node : RTEMS.Unsigned32;
-         ID   : access RTEMS.Event_Set
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Partition_Ident_Base, "rtems_partition_ident");
-      ID_Base : aliased RTEMS.ID := ID;
-   begin
- 
-      Result := Partition_Ident_Base (
-         Name,
-         Node,
-         ID_Base'Unchecked_Access
-      );
- 
-      ID := ID_Base;
-
-   end Partition_Ident;
- 
-   procedure Partition_Delete (
-      ID     : in     RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   ) is
-      function Partition_Delete_Base (
-         ID : RTEMS.ID
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Partition_Delete_Base, "rtems_partition_delete");
-   begin
- 
-      Result := Partition_Delete_Base ( ID );
-
-   end Partition_Delete;
- 
-   procedure Partition_Get_Buffer (
-      ID     : in     RTEMS.ID;
-      Buffer :    out RTEMS.Address;
-      Result :    out RTEMS.Status_Codes
-   ) is
-      function Partition_Get_Buffer_Base (
-         ID     : RTEMS.ID;
-         Buffer : access RTEMS.Address
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Partition_Get_Buffer_Base,
-         "rtems_partition_get_buffer");
-      Buffer_Base : aliased RTEMS.Address := Buffer;
-   begin
- 
-      Result := Partition_Get_Buffer_Base (
-         ID,
-         Buffer_Base'Unchecked_Access
-      );
- 
-      Buffer := Buffer_Base;
-
-   end Partition_Get_Buffer;
- 
-   procedure Partition_Return_Buffer (
-      ID     : in     RTEMS.ID;
-      Buffer : in     RTEMS.Address;
-      Result :    out RTEMS.Status_Codes
-   ) is
-      function Partition_Return_Buffer_Base (
-         ID     : RTEMS.Name;
-         Buffer : RTEMS.Address
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Partition_Return_Buffer_Base,
-         "rtems_partition_return_buffer");
-   begin
- 
-      Result := Partition_Return_Buffer_Base ( ID, Buffer );
-
-   end Partition_Return_Buffer;
-
-   --
-   -- Region Manager
-   --
- 
-   procedure Region_Create (
-      Name             : in     RTEMS.Name;
-      Starting_Address : in     RTEMS.Address;
-      Length           : in     RTEMS.Unsigned32;
-      Page_Size        : in     RTEMS.Unsigned32;
-      Attribute_Set    : in     RTEMS.Attribute;
-      ID               :    out RTEMS.ID;
-      Result           :    out RTEMS.Status_Codes
-   ) is
-      function Region_Create_Base (
-         Name             : RTEMS.Name;
-         Starting_Address : RTEMS.Address;
-         Length           : RTEMS.Unsigned32;
-         Page_Size        : RTEMS.Unsigned32;
-         Attribute_Set    : RTEMS.Attribute;
-         ID               : access RTEMS.ID
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Region_Create_Base, "rtems_region_create");
-      ID_Base : aliased RTEMS.ID := ID;
- 
-   begin
- 
-      Result := Region_Create_Base (
-                        Name,
-                        Starting_Address,
-                        Length,
-                        Page_Size,
-                        Attribute_Set,
-                        ID_Base'Unchecked_Access
-                     );
- 
-      ID := ID_Base;
-
-   end Region_Create;
- 
-   procedure Region_Ident (
-      Name   : in     RTEMS.Name;
-      ID     :    out RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   ) is
-      function Region_Ident_Base (
-         Name   : RTEMS.Name;
-         ID     : access RTEMS.ID
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Region_Ident_Base, "rtems_region_ident");
-      ID_Base : aliased RTEMS.ID := ID;
-   begin
- 
-      Result := Region_Ident_Base (
-         Name,
-         ID_Base'Unchecked_Access
-      );
- 
-      ID := ID_Base;
-
-   end Region_Ident;
- 
-   procedure Region_Delete (
-      ID     : in     RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   ) is
-      function Region_Delete_Base (
-         ID : RTEMS.ID
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Region_Delete_Base, "rtems_region_delete");
-   begin
- 
-      Result := Region_Delete_Base ( ID );
-
-   end Region_Delete;
- 
-   procedure Region_Extend (
-      ID               : in     RTEMS.ID;
-      Starting_Address : in     RTEMS.Address;
-      Length           : in     RTEMS.Unsigned32;
-      Result           :    out RTEMS.Status_Codes
-   ) is
-      function Region_Extend_Base (
-         ID               : RTEMS.ID;
-         Starting_Address : RTEMS.Address;
-         Length           : RTEMS.Unsigned32
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Region_Extend_Base, "rtems_region_extend");
-   begin
- 
-      Result := Region_Extend_Base ( ID, Starting_Address, Length );
-
-   end Region_Extend;
- 
-   procedure Region_Get_Segment (
-      ID         : in     RTEMS.ID;
-      Size       : in     RTEMS.Unsigned32;
-      Option_Set : in     RTEMS.Option;
-      Timeout    : in     RTEMS.Interval;
-      Segment    :    out RTEMS.Address;
-      Result     :    out RTEMS.Status_Codes
-   ) is
-      function Region_Get_Segment_Base (
-         ID         : RTEMS.ID;
-         Size       : RTEMS.Unsigned32;
-         Option_Set : RTEMS.Option;
-         Timeout    : RTEMS.Interval;
-         Segment    : access RTEMS.Address
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Region_Get_Segment_Base, "rtems_region_get_segment");
-      Segment_Base : aliased RTEMS.Address := Segment;
-   begin
- 
-      Result := Region_Get_Segment_Base (
-         ID,
-         Size,
-         Option_Set,
-         Timeout,
-         Segment_Base'Unchecked_Access
-      );
- 
-      Segment := SEGMENT_Base;
-
-   end Region_Get_Segment;
- 
-   procedure Region_Get_Segment_Size (
-      ID      : in     RTEMS.ID;
-      Segment : in     RTEMS.Address;
-      Size    :    out RTEMS.Unsigned32;
-      Result  :    out RTEMS.Status_Codes
-   ) is
-      function Region_Get_Segment_Size_Base (
-         ID      : RTEMS.ID;
-         Segment : RTEMS.Address;
-         Size    : access RTEMS.Unsigned32
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Region_Get_Segment_Size_Base,
-         "rtems_region_get_segment_size");
-      Size_Base : aliased RTEMS.Unsigned32 := Size;
-   begin
- 
-      Result := Region_Get_Segment_Size_Base (
-         ID,
-         Segment,
-         Size_Base'Unchecked_Access
-      );
- 
-      Size := SIZE_Base;
-
-   end Region_Get_Segment_Size;
- 
-   procedure Region_Return_Segment (
-      ID      : in     RTEMS.ID;
-      Segment : in     RTEMS.Address;
-      Result  :    out RTEMS.Status_Codes
-   ) is
-      function Region_Return_Segment_Base (
-         ID      : RTEMS.ID;
-         Segment : RTEMS.Address
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Region_Return_Segment_Base,
-         "rtems_region_return_segment");
-   begin
- 
-      Result := Region_Return_Segment_Base ( ID, Segment );
-
-   end Region_Return_Segment;
- 
-
-   --
-   -- Dual Ported Memory Manager
-   --
- 
-   procedure Port_Create (
-      Name           : in     RTEMS.Name;
-      Internal_Start : in     RTEMS.Address;
-      External_Start : in     RTEMS.Address;
-      Length         : in     RTEMS.Unsigned32;
-      ID             :    out RTEMS.ID;
-      Result         :    out RTEMS.Status_Codes
-   ) is
-      function Port_Create_Base (
-         Name           : RTEMS.Name;
-         Internal_Start : RTEMS.Address;
-         External_Start : RTEMS.Address;
-         Length         : RTEMS.Unsigned32;
-         ID             : access RTEMS.ID
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Port_Create_Base, "rtems_port_create");
-      ID_Base : aliased RTEMS.ID := ID;
- 
-   begin
- 
-      Result := Port_Create_Base (
-                   Name,
-                   Internal_Start,
-                   External_Start,
-                   Length,
-                   ID_Base'Unchecked_Access
-                );
- 
-      ID := ID_Base;
-
-   end Port_Create;
- 
-   procedure Port_Ident (
-      Name   : in     RTEMS.Name;
-      ID     :    out RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   ) is
-      function Port_Ident_Base (
-         Name : RTEMS.Name;
-         ID   : access RTEMS.ID
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Port_Ident_Base, "rtems_port_ident");
-      ID_Base : aliased RTEMS.ID := ID;
-   begin
- 
-      Result := Port_Ident_Base (
-         Name,
-         ID_Base'Unchecked_Access
-      );
- 
-      ID := ID_Base;
-
-   end Port_Ident;
- 
-   procedure Port_Delete (
-      ID     : in     RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   ) is
-      function Port_Delete_Base (
-         ID : RTEMS.ID
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Port_Delete_Base, "rtems_port_delete");
-   begin
- 
-      Result := Port_Delete_Base ( ID );
-
-   end Port_Delete;
- 
-   procedure Port_External_To_Internal (
-      ID       : in     RTEMS.ID;
-      External : in     RTEMS.Address;
-      Internal :    out RTEMS.Address;
-      Result   :    out RTEMS.Status_Codes
-   ) is
-      function Port_External_To_Internal_Base (
-         ID       : RTEMS.ID;
-         External : RTEMS.Address;
-         Internal : access RTEMS.Address
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Port_External_To_Internal_Base,
-         "rtems_port_external_to_internal");
-      Internal_Base : aliased RTEMS.Address := Internal;
-   begin
- 
-      Result := Port_External_To_Internal_Base (
-         ID,
-         External,
-         Internal_Base'Unchecked_Access
-      );
- 
-      Internal := INTERNAL_Base;
-
-   end Port_External_To_Internal;
- 
-   procedure Port_Internal_To_External (
-      ID       : in     RTEMS.ID;
-      Internal : in     RTEMS.Address;
-      External :    out RTEMS.Address;
-      Result   :    out RTEMS.Status_Codes
-   ) is
-      function Port_Internal_To_External_Base (
-         ID       : RTEMS.ID;
-         Internal : RTEMS.Address;
-         External : access RTEMS.Address
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Port_Internal_To_External_Base,
-         "rtems_port_internal_to_external");
-      External_Base : aliased RTEMS.Address := External;
-   begin
- 
-      Result := Port_Internal_To_External_Base (
-         ID,
-         Internal,
-         External_Base'Unchecked_Access
-      );
- 
-      External := EXTERNAL_Base;
-
-   end Port_Internal_To_External;
- 
-   --
-   -- Input/Output Manager
-   --
- 
-   procedure IO_Initialize (
-      Major        : in     RTEMS.Device_Major_Number;
-      Minor        : in     RTEMS.Device_Minor_Number;
-      Argument     : in     RTEMS.Address;
-      Return_Value :    out RTEMS.Unsigned32;
-      Result       :    out RTEMS.Status_Codes
-   ) is
-      function IO_Initialize_Base (
-         Major        : RTEMS.Device_Major_Number;
-         Minor        : RTEMS.Device_Minor_Number;
-         Argument     : RTEMS.Address;
-         Return_Value : access RTEMS.Unsigned32
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, IO_Initialize_Base, "rtems_io_initialize");
-      Return_Value_Base : aliased RTEMS.Unsigned32 := Return_Value;
-   begin
- 
-      Result := IO_Initialize_Base (
-         Major,
-         Minor,
-         Argument,
-         Return_Value_Base'Unchecked_Access
-      );
- 
-      Return_Value := Return_Value_Base;
-
-   end IO_Initialize;
- 
-   procedure IO_Register_Name (
-      Name   : in     String;
-      Major  : in     RTEMS.Device_Major_Number;
-      Minor  : in     RTEMS.Device_Minor_Number;
-      Result :    out RTEMS.Status_Codes
-   ) is
-      function IO_Register_Name_Base (
-         Name   : Interfaces.C.Char_Array;
-         Major  : RTEMS.Device_Major_Number;
-         Minor  : RTEMS.Device_Minor_Number
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, IO_Register_Name_Base, "rtems_io_register_name");
-   begin
-
-      Result := IO_Register_Name_Base (
-         Interfaces.C.To_C (Name),
-         Major,
-         Minor
-      );
-
-   end IO_Register_Name;
-
-   procedure IO_Lookup_Name (
-      Name         : in     String;
-      Device_Info  :    out RTEMS.Driver_Name_t;
-      Result       :    out RTEMS.Status_Codes
-   ) is
-      function IO_Lookup_Name_Base (
-         Name        : Interfaces.C.Char_Array;
-         Device_Info : access RTEMS.Driver_Name_t
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, IO_Lookup_Name_Base, "rtems_io_lookup_name");
-
-      Device_Info_Base : aliased RTEMS.Driver_Name_t;
-   begin
-
-      Result := IO_Lookup_Name_Base (
-         Interfaces.C.To_C (Name),
-         Device_Info_Base'Unchecked_Access
-      );
-
-      Device_Info := Device_Info_Base;
-
-   end IO_Lookup_Name;
-
-   procedure IO_Open (
-      Major        : in     RTEMS.Device_Major_Number;
-      Minor        : in     RTEMS.Device_Minor_Number;
-      Argument     : in     RTEMS.Address;
-      Result       :    out RTEMS.Status_Codes
-   ) is
-      function IO_Open_Base (
-         Major        : RTEMS.Device_Major_Number;
-         Minor        : RTEMS.Device_Minor_Number;
-         Argument     : RTEMS.Address
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, IO_Open_Base, "rtems_io_open");
-   begin
- 
-      Result := IO_Open_Base (Major, Minor, Argument);
- 
-   end IO_Open;
- 
-   procedure IO_Close (
-      Major        : in     RTEMS.Device_Major_Number;
-      Minor        : in     RTEMS.Device_Minor_Number;
-      Argument     : in     RTEMS.Address;
-      Result       :    out RTEMS.Status_Codes
-   ) is
-      function IO_Close_Base (
-         Major        : RTEMS.Device_Major_Number;
-         Minor        : RTEMS.Device_Minor_Number;
-         Argument     : RTEMS.Address
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, IO_Close_Base, "rtems_io_close");
-   begin
- 
-      Result := IO_Close_Base (Major, Minor, Argument);
- 
-   end IO_Close;
- 
-   procedure IO_Read (
-      Major        : in     RTEMS.Device_Major_Number;
-      Minor        : in     RTEMS.Device_Minor_Number;
-      Argument     : in     RTEMS.Address;
-      Result       :    out RTEMS.Status_Codes
-   ) is
-      function IO_Read_Base (
-         Major        : RTEMS.Device_Major_Number;
-         Minor        : RTEMS.Device_Minor_Number;
-         Argument     : RTEMS.Address
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, IO_Read_Base, "rtems_io_read");
-   begin
- 
-      Result := IO_Read_Base (Major, Minor, Argument);
- 
-   end IO_Read;
- 
-   procedure IO_Write (
-      Major        : in     RTEMS.Device_Major_Number;
-      Minor        : in     RTEMS.Device_Minor_Number;
-      Argument     : in     RTEMS.Address;
-      Result       :    out RTEMS.Status_Codes
-   ) is
-      function IO_Write_Base (
-         Major        : RTEMS.Device_Major_Number;
-         Minor        : RTEMS.Device_Minor_Number;
-         Argument     : RTEMS.Address
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, IO_Write_Base, "rtems_io_write");
-   begin
- 
-      Result := IO_Write_Base (Major, Minor, Argument);
- 
-   end IO_Write;
- 
-   procedure IO_Control (
-      Major        : in     RTEMS.Device_Major_Number;
-      Minor        : in     RTEMS.Device_Minor_Number;
-      Argument     : in     RTEMS.Address;
-      Result       :    out RTEMS.Status_Codes
-   ) is
-      function IO_Control_Base (
-         Major        : RTEMS.Device_Major_Number;
-         Minor        : RTEMS.Device_Minor_Number;
-         Argument     : RTEMS.Address
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, IO_Control_Base, "rtems_io_control");
-   begin
- 
-      Result := IO_Control_Base (Major, Minor, Argument);
- 
-   end IO_Control;
- 
- 
-   --
-   -- Fatal Error Manager
-   --
- 
-   procedure Fatal_Error_Occurred (
-      The_Error : in     RTEMS.Unsigned32
-   ) is
-      procedure Fatal_Error_Occurred_base (
-         The_Error : RTEMS.Unsigned32
-      );
-   pragma Import (C, Fatal_Error_Occurred_Base, "rtems_fatal_error_occurred");
-   begin
- 
-      Fatal_Error_Occurred_Base ( The_Error );
-
-   end Fatal_Error_Occurred; 
-   --
-   -- Rate Monotonic Manager
-   --
- 
-   procedure Rate_Monotonic_Create (
-      Name   : in     RTEMS.Name;
-      ID     :    out RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   ) is
-      function Rate_Monotonic_Create_base (
-         Name   : RTEMS.Name;
-         ID     : access RTEMS.ID
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Rate_Monotonic_Create_base, "rtems_rate_monotonic_create");
-      ID_Base : aliased RTEMS.ID := ID;
-   begin
- 
-      Result := Rate_Monotonic_Create_base (
-         Name,
-         ID_Base'Unchecked_Access
-      );
- 
-      ID := ID_Base;
-
-   end Rate_Monotonic_Create;
- 
-   procedure Rate_Monotonic_Ident (
-      Name   : in     RTEMS.Name;
-      ID     :    out RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   ) is
-      function Rate_Monotonic_Ident_Base (
-         Name   : RTEMS.Name;
-         ID     : access RTEMS.ID
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Rate_Monotonic_Ident_Base, "rtems_rate_monotonic_ident");
-      ID_Base : aliased RTEMS.ID := ID;
-   begin
- 
-      Result := Rate_Monotonic_Ident_Base (
-         Name,
-         ID_Base'Unchecked_Access
-      );
- 
-      ID := ID_Base;
-
-   end Rate_Monotonic_Ident;
- 
-   procedure Rate_Monotonic_Delete (
-      ID     : in     RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   ) is
-      function Rate_Monotonic_Delete_Base (
-         ID : RTEMS.ID
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Rate_Monotonic_Delete_Base,
-         "rtems_rate_monotonic_delete");
-   begin
- 
-      Result := Rate_Monotonic_Delete_base ( ID );
-
-   end Rate_Monotonic_Delete;
- 
-   procedure Rate_Monotonic_Cancel (
-      ID     : in     RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   ) is
-      function Rate_Monotonic_Cancel_Base (
-         ID : RTEMS.ID
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Rate_Monotonic_Cancel_Base,
-         "rtems_rate_monotonic_cancel");
-   begin
- 
-      Result := Rate_Monotonic_Cancel_Base ( ID );
-
-   end Rate_Monotonic_Cancel;
- 
-   procedure Rate_Monotonic_Period (
-      ID      : in     RTEMS.ID;
-      Length  : in     RTEMS.Interval;
-      Result  :    out RTEMS.Status_Codes
-   ) is
-      function Rate_Monotonic_Period_Base (
-         ID     : RTEMS.ID;
-         Length : RTEMS.Interval
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Rate_Monotonic_Period_Base,
-         "rtems_rate_monotonic_period");
-   begin
- 
-      Result := Rate_Monotonic_Period_base ( ID, Length );
-
-   end Rate_Monotonic_Period;
- 
- 
-   procedure Rate_Monotonic_Get_Status (
-      ID      : in     RTEMS.ID;
-      Status  :    out RTEMS.Rate_Monotonic_Period_Status;
-      Result  :    out RTEMS.Status_Codes
-   ) is
-      function Rate_Monotonic_Get_Status_Base (
-         ID      : RTEMS.ID;
-         Status  : access RTEMS.Rate_Monotonic_Period_Status
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Rate_Monotonic_Get_Status_Base,
-         "rtems_rate_monotonic_get_status");
-
-      Status_Base : aliased RTEMS.Rate_Monotonic_Period_Status;
-   begin
-
-      Result := Rate_Monotonic_Get_Status_Base (
-         ID,
-         Status_Base'Unchecked_Access
-      );
-
-      Status := Status_Base;
-
-
-   end Rate_Monotonic_Get_Status;
-
-   --
-   -- Multiprocessing Manager
-   --
- 
-   procedure Multiprocessing_Announce is
-      procedure Multiprocessing_Announce_Base;
-      pragma Import (C, Multiprocessing_Announce_Base,
-         "rtems_multiprocessing_announce");
-   begin
- 
-      Multiprocessing_Announce_Base;
-
-   end Multiprocessing_Announce;
- 
- 
-   --
-   -- Debug Manager
-   --
- 
-   procedure Debug_Enable (
-      To_Be_Enabled : in     RTEMS.Debug_Set
-   ) is
-      procedure Debug_Enable_Base (
-         To_Be_Enabled : RTEMS.Debug_Set
-      );
-   pragma Import (C, Debug_Enable_Base, "rtems_debug_enable");
-   begin
- 
-      Debug_Enable_Base ( To_Be_Enabled );
-
-   end Debug_Enable;
- 
-   procedure Debug_Disable (
-      To_Be_Disabled : in     RTEMS.Debug_Set
-   ) is
-      procedure Debug_Disable_Base (
-         To_Be_Disabled : RTEMS.Debug_Set
-      );
-   pragma Import (C, Debug_Disable_Base, "rtems_debug_disable");
-   begin
- 
-      Debug_Disable_Base ( To_Be_Disabled );
-
-   end Debug_Disable;
- 
-   function Debug_Is_Enabled (
-      Level : in     RTEMS.Debug_Set
-   ) return RTEMS.Boolean is
-      function Debug_Is_Enabled_Base (
-         Level : RTEMS.Debug_Set
-      )  return RTEMS.Boolean;
-      pragma Import (C, Debug_Is_Enabled_Base, "_Debug_Is_enabled");
-   begin
- 
-      return Debug_Is_Enabled_Base ( Level );
-
-   end Debug_Is_Enabled;
-
-    -- HACK
-    -- function Configuration 
-    -- return RTEMS.Configuration_Table_Pointer is
-    --    Configuration_base : RTEMS.Configuration_Table_Pointer;
-    --    pragma Import (C, Configuration_base, "_Configuration_Table");
-    -- begin
-    --    return Configuration_Base;
-    -- end Configuration;
-
-end RTEMS;
-
diff --git a/c/src/ada/rtems.ads b/c/src/ada/rtems.ads
deleted file mode 100644
index 508f24046f..0000000000
--- a/c/src/ada/rtems.ads
+++ /dev/null
@@ -1,1430 +0,0 @@
---
---  RTEMS / Specification
---
---  DESCRIPTION:
---
---  This package provides the interface to the RTEMS API.
---
---  DEPENDENCIES:
---
---
---
---  COPYRIGHT (c) 1997.
---  On-Line Applications Research Corporation (OAR).
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with System;
-with System.Storage_Elements; use System.Storage_Elements;
-with Interfaces;
-with Interfaces.C;
-
-package RTEMS is
-
-   Structure_Alignment : constant := 8;
-
-   --
-   --  RTEMS Base Types
-   --
-
-   subtype Unsigned8  is Interfaces.Unsigned_8;
-   subtype Unsigned16 is Interfaces.Unsigned_16;
-   subtype Unsigned32 is Interfaces.Unsigned_32;
-
-   type Unsigned32_Pointer     is access all RTEMS.Unsigned32;
-   type Unsigned16_Pointer     is access all RTEMS.Unsigned16;
-   type Unsigned8_Pointer      is access all RTEMS.Unsigned8;
-
-   subtype Boolean             is RTEMS.Unsigned32;
-   subtype Address             is System.Address;
-   subtype Single              is Interfaces.C.C_float;
-   subtype Double              is Interfaces.C.Double;
-
-   --
-   --  The following define the size of each of the base types in
-   --  both bits and system units.
-   --
-
-   Unsigned8_Bits   : constant := 7;
-   Unsigned16_Bits  : constant := 15;
-   Unsigned32_Bits  : constant := 31;
-   Boolean_Bits     : constant := 31;
-   Address_Bits     : constant := 31;
-   Single_Bits      : constant := 31;
-   Double_Bits      : constant := 63;
-
-   Unsigned8_Units  : constant := 1;
-   Unsigned16_Units : constant := 2;
-   Unsigned32_Units : constant := 4;
-   Boolean_Units    : constant := 4;
-   Address_Units    : constant := 4;
-   Single_Units     : constant := 4;
-   Double_Units     : constant := 8;
-
-   Null_Address     : constant RTEMS.Address :=
-      System.Storage_Elements.To_Address(0);
-
-   True  : constant RTEMS.Boolean := 1;
-   False : constant RTEMS.Boolean := 0;
-
-   --  More Types
-   --
-
-   subtype Name                is RTEMS.Unsigned32;
-   subtype ID                  is RTEMS.Unsigned32;
-   subtype Interval            is RTEMS.Unsigned32;
-   subtype Attribute           is RTEMS.Unsigned32;
-   subtype Mode                is RTEMS.Unsigned32;
-   subtype Option              is RTEMS.Unsigned32;
-   subtype Task_Priority       is RTEMS.Unsigned32;
-   subtype Notepad_Index       is RTEMS.Unsigned32 range 0 .. 15;
-
-   subtype Event_Set           is RTEMS.Unsigned32;
-   subtype Signal_Set          is RTEMS.Unsigned32;
-   subtype Debug_Set           is RTEMS.Unsigned32;
-   subtype Device_Major_Number is RTEMS.Unsigned32;
-   subtype Device_Minor_Number is RTEMS.Unsigned32;
-   subtype Vector_Number       is RTEMS.Unsigned32;
-   subtype ISR_Level           is RTEMS.Unsigned32;
-
-   subtype Node                is RTEMS.Unsigned32;
-
-   --
-   --  Task Related Types
-   --  XXXX fix this
-   subtype Task_Argument       is RTEMS.Unsigned32;
-   type Task_Argument_PTR      is access all Task_Argument;
-
-   -- XXXX fix this
-   subtype TCB                 is RTEMS.Unsigned32;
-   type    TCB_Pointer         is access all RTEMS.TCB;
-
-   subtype Task_States         is RTEMS.Unsigned32;
-
-   type Task_Entry is access procedure (
-      Argument : RTEMS.Unsigned32
-   );
-
-   --
-   --  Clock and Time of Day Types
-   --
-
-   type Time_Of_Day is
-      record
-         Year    : RTEMS.Unsigned32; -- year, A.D.
-         Month   : RTEMS.Unsigned32; -- month, 1 .. 12
-         Day     : RTEMS.Unsigned32; -- day, 1 .. 31
-         Hour    : RTEMS.Unsigned32; -- hour, 0 .. 23
-         Minute  : RTEMS.Unsigned32; -- minute, 0 .. 59
-         Second  : RTEMS.Unsigned32; -- second, 0 .. 59
-         Ticks   : RTEMS.Unsigned32; -- elapsed ticks between seconds
-      end record;
-
-   type Clock_Time_Value is
-      record
-         Seconds      : RTEMS.Unsigned32;
-         Microseconds : RTEMS.Unsigned32;
-      end record;
-
-   type Clock_Get_Options is (
-      Clock_Get_TOD,
-      Clock_Get_Seconds_Since_Epoch,
-      Clock_Get_Ticks_Since_Boot,
-      Clock_Get_Ticks_Per_Seconds,
-      Clock_Get_Time_Value
-   );
-
-   --
-   --  Device Driver Entry Prototype
-   --
-
-   type Device_Driver_Entry is access function (
-      Major    : in     RTEMS.Device_Major_Number;
-      Minor    : in     RTEMS.Device_Major_Number;
-      Argument : in     RTEMS.Unsigned32;
-      ID       : in     RTEMS.Unsigned32
-   ) return RTEMS.Unsigned32;
-
-   type Driver_Address_Table_Entry is
-      record
-         Initialization : RTEMS.Device_Driver_Entry;
-         Open           : RTEMS.Device_Driver_Entry;
-         Close          : RTEMS.Device_Driver_Entry;
-         Read           : RTEMS.Device_Driver_Entry;
-         Write          : RTEMS.Device_Driver_Entry;
-         Control        : RTEMS.Device_Driver_Entry;
-      end record;
-
-   type Driver_Address_Table is array ( RTEMS.Unsigned32
-     range 1 .. RTEMS.Unsigned32'Last ) of RTEMS.Driver_Address_Table_Entry;
-
-   type Driver_Address_Table_Pointer is access all Driver_Address_Table;
-
-   type Driver_Name_t is
-      record
-         Device_Name        : RTEMS.Address;
-         Device_Name_Length : RTEMS.Unsigned32;
-         Major              : RTEMS.Device_Major_Number;
-         Minor              : RTEMS.Device_Minor_Number;
-
-      end record;
-
-   --
-   --  Ident Options
-   --
-
-   Search_All_Nodes : constant RTEMS.Node := 0;
-
-   --
-   --  Options
-   --
-
-   Default_Options    : constant RTEMS.Option    := 16#0000#;
-
-   Wait      : constant RTEMS.Option := 16#0000#;
-   No_Wait   : constant RTEMS.Option := 16#0001#;
-
-   Event_All : constant RTEMS.Option := 16#0000#;
-   Event_Any : constant RTEMS.Option := 16#0002#;
-
-   --
-   --  Mode constants
-   --
-
-   Default_Modes      : constant RTEMS.Mode      := 16#0000#;
-
-   All_Mode_Masks     : constant RTEMS.Mode := 16#0000_ffff#;
-   Current_Mode       : constant RTEMS.Mode := 16#0000_0000#;
-   Preempt_Mask       : constant RTEMS.Mode := 16#0000_0100#;
-   Timeslice_Mask     : constant RTEMS.Mode := 16#0000_0200#;
-   ASR_Mask           : constant RTEMS.Mode := 16#0000_0400#;
-   Interrupt_Mask     : RTEMS.Mode;
-   Preempt            : constant RTEMS.Mode := 16#0000_0000#;
-   No_Preempt         : constant RTEMS.Mode := 16#0000_0100#;
-   No_Timeslice       : constant RTEMS.Mode := 16#0000_0000#;
-   Timeslice          : constant RTEMS.Mode := 16#0000_0200#;
-   ASR                : constant RTEMS.Mode := 16#0000_0000#;
-   No_ASR             : constant RTEMS.Mode := 16#0000_0400#;
-
-   pragma Import (C, Interrupt_Mask, "rtems_interrupt_mask");
-
-   --
-   --  Attribute constants
-   --
-
-   Default_Attributes  : constant RTEMS.Attribute := 16#00000000#;
-   No_Floating_Point   : constant RTEMS.Attribute := 16#00000000#;
-   Floating_Point      : constant RTEMS.Attribute := 16#00000001#;
-   Local               : constant RTEMS.Attribute := 16#00000000#;
-   Global              : constant RTEMS.Attribute := 16#00000002#;
-   FIFO                : constant RTEMS.Attribute := 16#00000000#;
-   Priority            : constant RTEMS.Attribute := 16#00000004#;
-   Counting_Semaphore  : constant RTEMS.Attribute := 16#00000000#;
-   Binary_Semaphore    : constant RTEMS.Attribute := 16#00000010#;
-   No_Inherit_Priority : constant RTEMS.Attribute := 16#00000000#;
-   Inherit_Priority    : constant RTEMS.Attribute := 16#00000020#;
-   No_Priority_Ceiling : constant RTEMS.Attribute := 16#00000000#;
-   Priority_Ceiling    : constant RTEMS.Attribute := 16#00000040#;
-
-   function Interrupt_Level (
-      Level : in     RTEMS.Unsigned32
-   ) return RTEMS.Attribute;
-   pragma Import (C, Interrupt_Level, "rtems_interrupt_level_attribute");
-   
-
-   Minimum_Stack_Size : RTEMS.Unsigned32;
-   pragma Import (C, Minimum_Stack_Size, "rtems_minimum_stack_size");
-
-
-   --
-   --  Notepad index constants
-   --
-
-   Notepad_0  : constant RTEMS.Unsigned32 := 0;
-   Notepad_1  : constant RTEMS.Unsigned32 := 1;
-   Notepad_2  : constant RTEMS.Unsigned32 := 2;
-   Notepad_3  : constant RTEMS.Unsigned32 := 3;
-   Notepad_4  : constant RTEMS.Unsigned32 := 4;
-   Notepad_5  : constant RTEMS.Unsigned32 := 5;
-   Notepad_6  : constant RTEMS.Unsigned32 := 6;
-   Notepad_7  : constant RTEMS.Unsigned32 := 7;
-   Notepad_8  : constant RTEMS.Unsigned32 := 8;
-   Notepad_9  : constant RTEMS.Unsigned32 := 9;
-   Notepad_10 : constant RTEMS.Unsigned32 := 10;
-   Notepad_11 : constant RTEMS.Unsigned32 := 11;
-   Notepad_12 : constant RTEMS.Unsigned32 := 12;
-   Notepad_13 : constant RTEMS.Unsigned32 := 13;
-   Notepad_14 : constant RTEMS.Unsigned32 := 14;
-   Notepad_15 : constant RTEMS.Unsigned32 := 15;
-
-   --
-   --  Miscellaneous
-   --
-
-   No_Timeout       : constant RTEMS.Interval := 0;
-   Self             : constant RTEMS.ID       := 0;
-   Period_Status    : constant RTEMS.Interval := 0;
-   Yield_Processor  : constant RTEMS.Interval := 0;
-   Current_Priority : constant RTEMS.Task_Priority := 0;
-   No_Priority      : constant RTEMS.Task_Priority := 0;
-
-
-   --
-   --  Extension Callouts and Table
-   --
-
-   type Thread_Create_Extension is access procedure (
-      Current_Task : in     RTEMS.TCB_Pointer;
-      New_Task     : in     RTEMS.TCB_Pointer
-   );
-
-   type Thread_Start_Extension is access procedure (
-      Current_Task : in     RTEMS.TCB_Pointer;
-      Started_Task : in     RTEMS.TCB_Pointer
-   );
-
-   type Thread_Restart_Extension is access procedure (
-      Current_Task   : in     RTEMS.TCB_Pointer;
-      Restarted_Task : in     RTEMS.TCB_Pointer
-   );
-
-   type Thread_Delete_Extension is access procedure (
-      Current_Task : in     RTEMS.TCB_Pointer;
-      Deleted_Task : in     RTEMS.TCB_Pointer
-   );
-
-   type Thread_Switch_Extension is access procedure (
-      Current_Task : in     RTEMS.TCB_Pointer;
-      Heir_Task    : in     RTEMS.TCB_Pointer
-   );
-
-   type Thread_Post_Switch_Extension is access procedure (
-      Current_Task : in     RTEMS.TCB_Pointer
-   );
-
-   type Thread_Begin_Extension is access procedure (
-      Current_Task : in     RTEMS.TCB_Pointer
-   );
-
-   type Thread_Exitted_Extension is access procedure (
-      Current_Task : in     RTEMS.TCB_Pointer
-   );
-
-   type Fatal_Error_Extension is access procedure (
-      Error : in     RTEMS.Unsigned32
-   );
-
-   type Extensions_Table is
-      record
-         Thread_Create      : RTEMS.Thread_Create_Extension;
-         Thread_Start       : RTEMS.Thread_Start_Extension;
-         Thread_Restart     : RTEMS.Thread_Restart_Extension;
-         Thread_Delete      : RTEMS.Thread_Delete_Extension;
-         Thread_Switch      : RTEMS.Thread_Switch_Extension;
-         Thread_Post_Switch : RTEMS.Thread_Post_Switch_Extension;
-         Thread_Begin       : RTEMS.Thread_Begin_Extension;
-         Thread_Exitted     : RTEMS.Thread_Exitted_Extension;
-         Fatal              : RTEMS.Fatal_Error_Extension;
-      end record;
-
-   type Extensions_Table_Pointer is access all Extensions_Table;
-
-   --
-   --  The following type define a pointer to a watchdog/timer service routine.
-   --
-
-   type Timer_Service_Routine is access procedure (
-      ID          : in     RTEMS.ID;
-      User_Data   : in     RTEMS.Address
-   );
-
-   --
-   --  The following type define a pointer to a signal service routine.
-   --
-
-   type ASR_Handler is access procedure (
-      Signals : in     RTEMS.Signal_Set
-   );
-
-   --
-   --  The following type defines the status information returned
-   --  about a period.
-   --
-
-   type Rate_Monotonic_Period_States is (
-     Inactive,               -- off chain, never initialized
-     Owner_Is_Blocking,      -- on chain, owner is blocking on it
-     Active,                 -- on chain, running continuously
-     Expired_While_Blocking, -- on chain, expired while owner was was blocking
-     Expired                 -- off chain, will be reset by next
-                             --   rtems_rate_monotonic_period
-   );
-
-   for Rate_Monotonic_Period_States'Size use 32;
-
-   for Rate_Monotonic_Period_States use (
-     Inactive                => 0,
-     Owner_Is_Blocking       => 1,
-     Active                  => 2,
-     Expired_While_Blocking  => 3,
-     Expired                 => 4
-   );
-
-   type Rate_Monotonic_Period_Status is
-      record
-         State                            : RTEMS.Rate_Monotonic_Period_States;
-         Ticks_Since_Last_Period          : RTEMS.Unsigned32;
-         Ticks_Executed_Since_Last_Period : RTEMS.Unsigned32;
-      end record;
-
-   --
-   --  Method Completions Status Codes
-   --
-
-   type Status_Codes is (
-      Successful,               -- successful completion
-      Task_Exitted,             -- returned from a task
-      MP_Not_Configured,        -- multiprocessing not configured
-      Invalid_Name,             -- invalid object name
-      Invalid_ID,               -- invalid object id
-      Too_Many,                 -- too many
-      Timeout,                  -- timed out waiting
-      Object_Was_Deleted,       -- object deleted while waiting
-      Invalid_Size,             -- specified size was invalid
-      Invalid_Address,          -- address specified is invalid
-      Invalid_Number,           -- number was invalid
-      Not_Defined,              -- item has not been initialized
-      Resource_In_Use,          -- resources still outstanding
-      Unsatisfied,              -- request not satisfied
-      Incorrect_State,          -- task is in wrong state
-      Already_Suspended,        -- task already in state
-      Illegal_On_Self,          -- illegal on calling task
-      Illegal_On_Remote_Object, -- illegal for remote object
-      Called_From_ISR,          -- called from wrong environment
-      Invalid_Priority,         -- invalid task priority
-      Invalid_Clock,            -- invalid date/time
-      Invalid_Node,             -- invalid node id
-      Not_Configured,           -- directive not configured
-      Not_Owner_Of_Resource,    -- not owner of resource
-      Not_Implemented,          -- directive not implemented
-      Internal_Error,           -- RTEMS inconsistency detected
-      No_Memory,                -- no memory left in heap
-      IO_Error,                 -- driver IO error
-      Proxy_Blocking            -- internal multiprocessing only
-   );
-
-   for Status_Codes'Size use 32;
-
-   for Status_Codes use (
-      Successful                  =>  0,
-      Task_Exitted                =>  1,
-      MP_Not_Configured           =>  2,
-      Invalid_Name                =>  3,
-      Invalid_ID                  =>  4,
-      Too_Many                    =>  5,
-      Timeout                     =>  6,
-      Object_Was_Deleted          =>  7,
-      Invalid_Size                =>  8,
-      Invalid_Address             =>  9,
-      Invalid_NumbeR              => 10,
-      Not_Defined                 => 11,
-      Resource_In_Use             => 12,
-      Unsatisfied                 => 13,
-      Incorrect_State             => 14,
-      Already_Suspended           => 15,
-      Illegal_On_Self             => 16,
-      Illegal_On_Remote_Object    => 17,
-      Called_From_ISR             => 18,
-      Invalid_Priority            => 19,
-      Invalid_Clock               => 20,
-      Invalid_Node                => 21,
-      Not_Configured              => 22,
-      Not_Owner_Of_Resource       => 23,
-      Not_ImplementeD             => 24,
-      Internal_Error              => 25,
-      No_Memory                   => 26,
-      IO_Error                    => 27,
-      Proxy_Blocking              => 28
-   );
-
-   --
-   --  RTEMS Events
-   --
-
-   Pending_Events : constant RTEMS.Event_Set := 16#0000_0000#;
-   All_Events     : constant RTEMS.Event_Set := 16#FFFF_FFFF#;
-   Event_0        : constant RTEMS.Event_Set := 16#0000_0001#;
-   Event_1        : constant RTEMS.Event_Set := 16#0000_0002#;
-   Event_2        : constant RTEMS.Event_Set := 16#0000_0004#;
-   Event_3        : constant RTEMS.Event_Set := 16#0000_0008#;
-   Event_4        : constant RTEMS.Event_Set := 16#0000_0010#;
-   Event_5        : constant RTEMS.Event_Set := 16#0000_0020#;
-   Event_6        : constant RTEMS.Event_Set := 16#0000_0040#;
-   Event_7        : constant RTEMS.Event_Set := 16#0000_0080#;
-   Event_8        : constant RTEMS.Event_Set := 16#0000_0100#;
-   Event_9        : constant RTEMS.Event_Set := 16#0000_0200#;
-   Event_10       : constant RTEMS.Event_Set := 16#0000_0400#;
-   Event_11       : constant RTEMS.Event_Set := 16#0000_0800#;
-   Event_12       : constant RTEMS.Event_Set := 16#0000_1000#;
-   Event_13       : constant RTEMS.Event_Set := 16#0000_2000#;
-   Event_14       : constant RTEMS.Event_Set := 16#0000_4000#;
-   Event_15       : constant RTEMS.Event_Set := 16#0000_8000#;
-   Event_16       : constant RTEMS.Event_Set := 16#0001_0000#;
-   Event_17       : constant RTEMS.Event_Set := 16#0002_0000#;
-   Event_18       : constant RTEMS.Event_Set := 16#0004_0000#;
-   Event_19       : constant RTEMS.Event_Set := 16#0008_0000#;
-   Event_20       : constant RTEMS.Event_Set := 16#0010_0000#;
-   Event_21       : constant RTEMS.Event_Set := 16#0020_0000#;
-   Event_22       : constant RTEMS.Event_Set := 16#0040_0000#;
-   Event_23       : constant RTEMS.Event_Set := 16#0080_0000#;
-   Event_24       : constant RTEMS.Event_Set := 16#0100_0000#;
-   Event_25       : constant RTEMS.Event_Set := 16#0200_0000#;
-   Event_26       : constant RTEMS.Event_Set := 16#0400_0000#;
-   Event_27       : constant RTEMS.Event_Set := 16#0800_0000#;
-   Event_28       : constant RTEMS.Event_Set := 16#1000_0000#;
-   Event_29       : constant RTEMS.Event_Set := 16#2000_0000#;
-   Event_30       : constant RTEMS.Event_Set := 16#4000_0000#;
-   Event_31       : constant RTEMS.Event_Set := 16#8000_0000#;
-
-   --
-   --  RTEMS Signals
-   --
-
-   All_Signals : constant RTEMS.Signal_Set := 16#7FFFFFFF#;
-   Signal_0    : constant RTEMS.Signal_Set := 16#00000001#;
-   Signal_1    : constant RTEMS.Signal_Set := 16#00000002#;
-   Signal_2    : constant RTEMS.Signal_Set := 16#00000004#;
-   Signal_3    : constant RTEMS.Signal_Set := 16#00000008#;
-   Signal_4    : constant RTEMS.Signal_Set := 16#00000010#;
-   Signal_5    : constant RTEMS.Signal_Set := 16#00000020#;
-   Signal_6    : constant RTEMS.Signal_Set := 16#00000040#;
-   Signal_7    : constant RTEMS.Signal_Set := 16#00000080#;
-   Signal_8    : constant RTEMS.Signal_Set := 16#00000100#;
-   Signal_9    : constant RTEMS.Signal_Set := 16#00000200#;
-   Signal_10   : constant RTEMS.Signal_Set := 16#00000400#;
-   Signal_11   : constant RTEMS.Signal_Set := 16#00000800#;
-   Signal_12   : constant RTEMS.Signal_Set := 16#00001000#;
-   Signal_13   : constant RTEMS.Signal_Set := 16#00002000#;
-   Signal_14   : constant RTEMS.Signal_Set := 16#00004000#;
-   Signal_15   : constant RTEMS.Signal_Set := 16#00008000#;
-   Signal_16   : constant RTEMS.Signal_Set := 16#00010000#;
-   Signal_17   : constant RTEMS.Signal_Set := 16#00020000#;
-   Signal_18   : constant RTEMS.Signal_Set := 16#00040000#;
-   Signal_19   : constant RTEMS.Signal_Set := 16#00080000#;
-   Signal_20   : constant RTEMS.Signal_Set := 16#00100000#;
-   Signal_21   : constant RTEMS.Signal_Set := 16#00200000#;
-   Signal_22   : constant RTEMS.Signal_Set := 16#00400000#;
-   Signal_23   : constant RTEMS.Signal_Set := 16#00800000#;
-   Signal_24   : constant RTEMS.Signal_Set := 16#01000000#;
-   Signal_25   : constant RTEMS.Signal_Set := 16#02000000#;
-   Signal_26   : constant RTEMS.Signal_Set := 16#04000000#;
-   Signal_27   : constant RTEMS.Signal_Set := 16#08000000#;
-   Signal_28   : constant RTEMS.Signal_Set := 16#10000000#;
-   Signal_29   : constant RTEMS.Signal_Set := 16#20000000#;
-   Signal_30   : constant RTEMS.Signal_Set := 16#40000000#;
-   Signal_31   : constant RTEMS.Signal_Set := 16#80000000#;
-
-   --
-   --  RTEMS API Configuration Information
-   --
-
-   type Initialization_Tasks_Table_Entry is
-      record
-         Name             : RTEMS.Name;          -- task name
-         Stack_Size       : RTEMS.Unsigned32;    -- task stack size
-         Initial_Priority : RTEMS.Task_priority; -- task priority
-         Attribute_Set    : RTEMS.Attribute;     -- task attributes
-         Entry_Point      : RTEMS.Task_Entry;    -- task entry point
-         Mode_Set         : RTEMS.Mode;          -- task initial mode
-         Argument         : RTEMS.Unsigned32;    -- task argument
-      end record;
-
-   type Initialization_Tasks_Table is array ( RTEMS.Unsigned32 range <> ) of
-     RTEMS.Initialization_Tasks_Table_Entry;
-
-   type Initialization_Tasks_Table_Pointer is access all
-        Initialization_Tasks_Table;
-
-   type API_Configuration_Table is
-      record
-         Maximum_Tasks                   : RTEMS.Unsigned32;
-         Maximum_Timers                  : RTEMS.Unsigned32;
-         Maximum_Semaphores              : RTEMS.Unsigned32;
-         Maximum_Message_queues          : RTEMS.Unsigned32;
-         Maximum_Partitions              : RTEMS.Unsigned32;
-         Maximum_Regions                 : RTEMS.Unsigned32;
-         Maximum_Ports                   : RTEMS.Unsigned32;
-         Maximum_Periods                 : RTEMS.Unsigned32;
-         Number_Of_Initialization_Tasks  : RTEMS.Unsigned32;
-         User_Initialization_Tasks_Table :
-                                   RTEMS.Initialization_Tasks_Table_Pointer;
-      end record;
-
-   type API_Configuration_Table_Pointer is access all API_Configuration_Table;
-
-   --
-   --  RTEMS POSIX API Configuration Information
-   --
-
-   type POSIX_Thread_Entry is access procedure (
-      Argument : in     RTEMS.Address
-   );
-
-   type POSIX_Initialization_Threads_Table_Entry is
-   record
-      Thread_Entry : RTEMS.POSIX_Thread_Entry;
-   end record;
-
-   type POSIX_Initialization_Threads_Table is array
-       ( RTEMS.Unsigned32 range <> ) of
-       RTEMS.POSIX_Initialization_Threads_Table_Entry;
-
-   type POSIX_Initialization_Threads_Table_Pointer is access all
-       POSIX_Initialization_Threads_Table;
-
-   type POSIX_API_Configuration_Table_Entry is
-      record
-         Maximum_Threads                 : Interfaces.C.Int;
-         Maximum_Mutexes                 : Interfaces.C.Int;
-         Maximum_Condition_Variables     : Interfaces.C.Int;
-         Maximum_Keys                    : Interfaces.C.Int;
-         Maximum_Queued_Signals          : Interfaces.C.Int;
-         Number_Of_Initialization_Tasks  : Interfaces.C.Int;
-         User_Initialization_Tasks_Table :
-            RTEMS.POSIX_Initialization_Threads_Table_Pointer;
-      end record;
-
-   type POSIX_API_Configuration_Table is array ( RTEMS.Unsigned32 range <> ) of
-      RTEMS.POSIX_API_Configuration_Table_Entry;
-
-   type POSIX_API_Configuration_Table_Pointer is access all
-          RTEMS.POSIX_API_Configuration_Table;
-
-   --
-   --  MPCI Information include MPCI Configuration
-   --
-
-   type Configuration_Table_Pointer;
-
-   type MP_Packet_Classes is (
-      MP_PACKET_MPCI_INTERNAL,
-      MP_PACKET_TASKS,
-      MP_PACKET_MESSAGE_QUEUE,
-      MP_PACKET_SEMAPHORE,
-      MP_PACKET_PARTITION,
-      MP_PACKET_REGION,
-      MP_PACKET_EVENT,
-      MP_PACKET_SIGNAL
-   );
-
-   for MP_Packet_Classes use (
-      MP_PACKET_MPCI_INTERNAL    => 0,
-      MP_PACKET_TASKS            => 1,
-      MP_PACKET_MESSAGE_QUEUE    => 2,
-      MP_PACKET_SEMAPHORE        => 3,
-      MP_PACKET_PARTITION        => 4,
-      MP_PACKET_REGION           => 5,
-      MP_PACKET_EVENT            => 6,
-      MP_PACKET_SIGNAL           => 7
-   );
-
-   type Packet_Prefix is
-      record
-         The_Class       : RTEMS.MP_Packet_Classes;
-         ID              : RTEMS.ID;
-         Source_TID      : RTEMS.ID;
-         Source_Priority : RTEMS.Task_Priority;
-         Return_Code     : RTEMS.Unsigned32;
-         Length          : RTEMS.Unsigned32;
-         To_Convert      : RTEMS.Unsigned32;
-         Timeout         : RTEMS.Interval;
-      end record;
-
-   type Packet_Prefix_Pointer is access all Packet_Prefix;
-
-   type MPCI_Initialization_Entry is access procedure (
-      Configuration : in     RTEMS.Configuration_Table_Pointer
-   );
-
-   type MPCI_Get_Packet_Entry is access procedure (
-      Packet : access RTEMS.Packet_Prefix_Pointer
-   );
-
-   type MPCI_Return_Packet_Entry is access procedure (
-      Packet : in     RTEMS.Packet_Prefix_Pointer
-   );
-
-   type MPCI_Send_Entry is access procedure (
-      Packet : in     RTEMS.Packet_Prefix_Pointer
-   );
-
-   type MPCI_Receive_Entry is access procedure (
-      Packet : access RTEMS.Packet_Prefix_Pointer
-   );
-
-   type MPCI_Table is
-      record
-         Default_Timeout     : RTEMS.Unsigned32; -- in ticks
-         Maximum_Packet_Size : RTEMS.Unsigned32;
-         Initialization      : RTEMS.MPCI_Initialization_Entry;
-         Get_Packet          : RTEMS.MPCI_Get_Packet_Entry;
-         Return_Packet       : RTEMS.MPCI_Return_Packet_Entry;
-         Send                : RTEMS.MPCI_Send_Entry;
-         Receive             : RTEMS.MPCI_Receive_Entry;
-      end record;
-
-   type MPCI_Table_Pointer is access all MPCI_Table;
-
-   --
-   --  Configuration Information
-   --
-
-   type Multiprocessing_Table is
-      record
-         Node                   : RTEMS.Unsigned32;
-         Maximum_Nodes          : RTEMS.Unsigned32;
-         Maximum_Global_Objects : RTEMS.Unsigned32;
-         Maximum_Proxies        : RTEMS.Unsigned32;
-         User_MPCI_Table        : RTEMS.MPCI_Table_Pointer;
-      end record;
-
-   type Multiprocessing_Table_Pointer is access all Multiprocessing_Table;
-
-   type Configuration_Table is
-      record
-          Work_Space_Start             : RTEMS.Address;
-          Work_Space_Size              : RTEMS.Unsigned32;
-          Maximum_Extensions           : RTEMS.Unsigned32;
-          Microseconds_Per_Tick        : RTEMS.Unsigned32;
-          Ticks_Per_Timeslice          : RTEMS.Unsigned32;
-          Maximum_Devices              : RTEMS.Unsigned32;
-          Number_Of_Device_Drivers     : RTEMS.Unsigned32;
-          Device_Driver_Table          : RTEMS.Driver_Address_Table_Pointer;
-          Number_Of_Initial_Extensions : RTEMS.Unsigned32;
-          User_Extension_Table         : RTEMS.Extensions_Table_Pointer;
-          User_Multiprocessing_Table   : RTEMS.Multiprocessing_Table_Pointer;
-          RTEMS_API_Configuration      : RTEMS.API_Configuration_Table_Pointer;
-          POSIX_API_Configuration      : RTEMS.POSIX_API_Configuration_Table_Pointer;
-      end record;
-
-   type Configuration_Table_Pointer is access all Configuration_Table;
-
-   --
-   --  For now, do not provide access to the CPU Table from Ada.
-   --  When this type is provided, a CPU dependent file must
-   --  define it.
-   --
-
-   subtype CPU_Table is RTEMS.Address;
-   type CPU_Table_Pointer is access all CPU_Table;
-
-   --
-   --  Utility Functions
-   --
-
-   function From_Ada_Boolean (
-      Ada_Boolean : Standard.Boolean
-   ) return RTEMS.Boolean;
-
-   function To_Ada_Boolean (
-      RTEMS_Boolean : RTEMS.Boolean
-   ) return Standard.Boolean;
-
-   function Milliseconds_To_Microseconds (
-      Milliseconds : RTEMS.Unsigned32
-   ) return RTEMS.Unsigned32;
-
-   function Microseconds_To_Ticks (
-      Microseconds : RTEMS.Unsigned32
-   ) return RTEMS.Interval;
-
-   function Milliseconds_To_Ticks (
-      Milliseconds : RTEMS.Unsigned32
-   ) return RTEMS.Interval;
-
-   function Build_Name (
-      C1 : in     Character;
-      C2 : in     Character;
-      C3 : in     Character;
-      C4 : in     Character
-   ) return RTEMS.Name;
-
-   procedure Name_To_Characters (
-      Name : in     RTEMS.Name;
-      C1   :    out Character;
-      C2   :    out Character;
-      C3   :    out Character;
-      C4   :    out Character
-   );
-
-   function Get_Node (
-      ID : in     RTEMS.ID
-   ) return RTEMS.Unsigned32;
-
-   function Get_Index (
-      ID : in     RTEMS.ID
-   ) return RTEMS.Unsigned32;
-
-   function Are_Statuses_Equal (
-      Status  : in     RTEMS.Status_Codes;
-      Desired : in     RTEMS.Status_Codes
-   ) return Standard.Boolean;
-
-   function Is_Status_Successful (
-      Status  : in     RTEMS.Status_Codes
-   ) return Standard.Boolean;
-
-   function Subtract (
-      Left   : in     RTEMS.Address;
-      Right  : in     RTEMS.Address
-   ) return RTEMS.Unsigned32;
-
-   function Are_Equal (
-      Left   : in     RTEMS.Address;
-      Right  : in     RTEMS.Address
-   ) return Standard.Boolean;
-   --
-   --  RTEMS API
-   --
-
-   --
-   --  Initialization Manager
-   --
-
-   procedure Initialize_Executive (
-      Configuration_Table   : in     RTEMS.Configuration_Table_Pointer;
-      CPU_Table             : in     RTEMS.CPU_Table_Pointer
-   );
-
-   procedure Initialize_Executive_Early (
-      Configuration_Table : in     RTEMS.Configuration_Table_Pointer;
-      CPU_Table           : in     RTEMS.CPU_Table_Pointer;
-      Level               :    out RTEMS.ISR_Level
-   );
-
-   procedure Initialize_Executive_Late (
-      BSP_Level : in    RTEMS.ISR_Level
-   );
-
-   procedure Shutdown_Executive (
-      Result : in     RTEMS.Unsigned32
-   );
-
-   --
-   --  Task Manager
-   --
-
-   procedure Task_Create (
-      Name             : in     RTEMS.Name;
-      Initial_Priority : in     RTEMS.Task_Priority;
-      Stack_Size       : in     Unsigned32;
-      Initial_Modes    : in     RTEMS.Mode;
-      Attribute_Set    : in     RTEMS.Attribute;
-      ID               :    out RTEMS.ID;
-      Result           :    out RTEMS.Status_Codes
-   );
-
-   procedure Task_Ident (
-      Name   : in     RTEMS.Name;
-      Node   : in     RTEMS.Node;
-      ID     :    out RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   );
-
-   procedure Task_Start (
-      ID          : in     RTEMS.ID;
-      Entry_Point : in     RTEMS.Task_Entry;
-      Argument    : in     RTEMS.Task_Argument;
-      Result      :    out RTEMS.Status_Codes
-   );
-
-   procedure Task_Restart (
-      ID       : in     RTEMS.ID;
-      Argument : in     RTEMS.Task_Argument;
-      Result   :    out RTEMS.Status_Codes
-   );
-
-   procedure Task_Delete (
-      ID     : in     RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   );
-
-   procedure Task_Suspend (
-      ID     : in     RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   );
-
-   procedure Task_Resume (
-      ID     : in     RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   );
-
-   procedure Task_Set_Priority (
-      ID           : in     RTEMS.ID;
-      New_Priority : in     RTEMS.Task_Priority;
-      Old_Priority :    out RTEMS.Task_Priority;
-      Result       :    out RTEMS.Status_Codes
-   );
-
-   procedure Task_Mode (
-      Mode_Set          : in     RTEMS.Mode;
-      Mask              : in     RTEMS.Mode;
-      Previous_Mode_Set :    out RTEMS.Mode;
-      Result            :    out RTEMS.Status_Codes
-   );
-
-   procedure Task_Get_Note (
-      ID      : in     RTEMS.ID;
-      Notepad : in     RTEMS.Notepad_Index;
-      Note    :    out RTEMS.Unsigned32;
-      Result  :    out RTEMS.Status_Codes
-   );
-
-   procedure Task_Set_Note (
-      ID      : in     RTEMS.ID;
-      Notepad : in     RTEMS.Notepad_Index;
-      Note    : in     RTEMS.Unsigned32;
-      Result  :    out RTEMS.Status_Codes
-   );
-
-   procedure Task_Wake_When (
-      Time_Buffer : in     RTEMS.Time_Of_Day;
-      Result      :    out RTEMS.Status_Codes
-   );
-
-   procedure Task_Wake_After (
-      Ticks  : in     RTEMS.Interval;
-      Result :    out RTEMS.Status_Codes
-   );
-
-   --
-   --  Interrupt Manager
-   --
-
-   procedure Interrupt_Catch (
-      New_ISR_Handler : in     RTEMS.Address;
-      Vector          : in     RTEMS.Vector_Number;
-      Old_ISR_Handler :    out RTEMS.Address;
-      Result          :    out RTEMS.Status_Codes
-   );
-
-   function Interrupt_Disable
-   return RTEMS.ISR_Level;
-
-   procedure Interrupt_Enable (
-      Level : in     RTEMS.ISR_Level
-   );
-
-   procedure Interrupt_Flash (
-      Level : in     RTEMS.ISR_Level
-   );
-
-   function Interrupt_Is_In_Progress
-   return RTEMS.Boolean;
-
-   --
-   --  Clock Manager
-   --
-
-   procedure Clock_Get (
-      Option      : in     RTEMS.Clock_Get_Options;
-      Time_Buffer : in     RTEMS.Address;
-      Result      :    out RTEMS.Status_Codes
-   );
-
-   procedure Clock_Set (
-      Time_Buffer : in     RTEMS.Time_Of_Day;
-      Result      :    out RTEMS.Status_Codes
-   );
-
-   procedure Clock_Tick (
-      Result :    out RTEMS.Status_Codes
-   );
-
-   --
-   --  Extension Manager
-   --
-
-   procedure Extension_Create (
-      Name   : in     RTEMS.Name;
-      Table  : in     RTEMS.Extensions_Table_Pointer;
-      ID     :    out RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   );
-
-   procedure Extension_Ident (
-      Name   : in     RTEMS.Name;
-      ID     :    out RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   );
-
-   procedure Extension_Delete (
-      ID     : in     RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   );
-
-
-   --
-   --  Timer Manager
-   --
-
-   procedure Timer_Create (
-      Name   : in     RTEMS.Name;
-      ID     :    out RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   );
-
-   procedure Timer_Ident (
-      Name   : in     RTEMS.Name;
-      ID     :    out RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   );
-
-   procedure Timer_Delete (
-      ID     : in     RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   );
-
-   procedure Timer_Fire_After (
-      ID        : in     RTEMS.ID;
-      Ticks     : in     RTEMS.Interval;
-      Routine   : in     RTEMS.Timer_Service_Routine;
-      User_Data : in     RTEMS.Address;
-      Result    :    out RTEMS.Status_Codes
-   );
-
-   procedure Timer_Fire_When (
-      ID        : in     RTEMS.ID;
-      Wall_Time : in     RTEMS.Time_Of_Day;
-      Routine   : in     RTEMS.Timer_Service_Routine;
-      User_Data : in     RTEMS.Address;
-      Result    :    out RTEMS.Status_Codes
-   );
-
-   procedure Timer_Reset (
-      ID     : in     RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   );
-
-   procedure Timer_Cancel (
-      ID     : in     RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   );
-
-   --
-   --  Semaphore Manager
-   --
-
-   procedure Semaphore_Create (
-      Name             : in     RTEMS.Name;
-      Count            : in     RTEMS.Unsigned32;
-      Attribute_Set    : in     RTEMS.Attribute;
-      Priority_Ceiling : in     RTEMS.Task_Priority;
-      ID               :    out RTEMS.ID;
-      Result           :    out RTEMS.Status_Codes
-   );
-
-   procedure Semaphore_Delete (
-      ID     : in     RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   );
-
-   procedure Semaphore_Ident (
-      Name   : in     RTEMS.Name;
-      Node   : in     RTEMS.Unsigned32;
-      ID     :    out RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   );
-
-   procedure Semaphore_Obtain (
-      ID         : in     RTEMS.ID;
-      Option_Set : in     RTEMS.Option;
-      Timeout    : in     RTEMS.Interval;
-      Result     :    out RTEMS.Status_Codes
-   );
-
-   procedure Semaphore_Release (
-      ID     : in     RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   );
-
-
-   --
-   --  Message Queue Manager
-   --
-
-   procedure Message_Queue_Create (
-      Name             : in     RTEMS.Name;
-      Count            : in     RTEMS.Unsigned32;
-      Max_Message_Size : in     RTEMS.Unsigned32;
-      Attribute_Set    : in     RTEMS.Attribute;
-      ID               :    out RTEMS.ID;
-      Result           :    out RTEMS.Status_Codes
-   );
-
-   procedure Message_Queue_Ident (
-      Name   : in     RTEMS.Name;
-      Node   : in     RTEMS.Unsigned32;
-      ID     :    out RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   );
-
-   procedure Message_Queue_Delete (
-      ID     : in     RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   );
-
-   procedure Message_Queue_Send (
-      ID     : in     RTEMS.ID;
-      Buffer : in     RTEMS.Address;
-      Size   : in     RTEMS.Unsigned32;
-      Result :    out RTEMS.Status_Codes
-   );
-
-   procedure Message_Queue_Urgent (
-      ID     : in     RTEMS.ID;
-      Buffer : in     RTEMS.Address;
-      Size   : in     RTEMS.Unsigned32;
-      Result :    out RTEMS.Status_Codes
-   );
-
-   procedure Message_Queue_Broadcast (
-      ID     : in     RTEMS.ID;
-      Buffer : in     RTEMS.Address;
-      Size   : in     RTEMS.Unsigned32;
-      Count  :    out RTEMS.Unsigned32;
-      Result :    out RTEMS.Status_Codes
-   );
-
-   procedure Message_Queue_Receive (
-      ID         : in     RTEMS.ID;
-      Buffer     : in     RTEMS.Address;
-      Option_Set : in     RTEMS.Option;
-      Timeout    : in     RTEMS.Interval;
-      Size       :    out RTEMS.Unsigned32;
-      Result     :    out RTEMS.Status_Codes
-   );
-
-   procedure Message_Queue_Flush (
-      ID     : in     RTEMS.ID;
-      Count  :    out RTEMS.Unsigned32;
-      Result :    out RTEMS.Status_Codes
-   );
-
-
-   --
-   --  Event Manager
-   --
-
-   procedure Event_Send (
-      ID       : in     RTEMS.ID;
-      Event_In : in     RTEMS.Event_Set;
-      Result   :    out RTEMS.Status_Codes
-   );
-
-   procedure Event_Receive (
-      Event_In   : in     RTEMS.Event_Set;
-      Option_Set : in     RTEMS.Option;
-      Ticks      : in     RTEMS.Interval;
-      Event_Out  :    out RTEMS.Event_Set;
-      Result     :    out RTEMS.Status_Codes
-   );
-
-   --
-   --  Signal Manager
-   --
-
-   procedure Signal_Catch (
-      ASR_Handler : in     RTEMS.ASR_Handler;
-      Mode_Set    : in     RTEMS.Mode;
-      Result      :    out RTEMS.Status_Codes
-   );
-
-   procedure Signal_Send (
-      ID         : in     RTEMS.ID;
-      Signal_Set : in     RTEMS.Signal_Set;
-      Result     :    out RTEMS.Status_Codes
-   );
-
-
-   --
-   --  Partition Manager
-   --
-
-   procedure Partition_Create (
-      Name             : in     RTEMS.Name;
-      Starting_Address : in     RTEMS.Address;
-      Length           : in     RTEMS.Unsigned32;
-      Buffer_Size      : in     RTEMS.Unsigned32;
-      Attribute_Set    : in     RTEMS.Attribute;
-      ID               :    out RTEMS.ID;
-      Result           :    out RTEMS.Status_Codes
-   );
-
-   procedure Partition_Ident (
-      Name   : in     RTEMS.Name;
-      Node   : in     RTEMS.Unsigned32;
-      ID     :    out RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   );
-
-   procedure Partition_Delete (
-      ID     : in     RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   );
-
-   procedure Partition_Get_Buffer (
-      ID     : in     RTEMS.ID;
-      Buffer :    out RTEMS.Address;
-      Result :    out RTEMS.Status_Codes
-   );
-
-   procedure Partition_Return_Buffer (
-      ID     : in     RTEMS.ID;
-      Buffer : in     RTEMS.Address;
-      Result :    out RTEMS.Status_Codes
-   );
-
-
-   --
-   --  Region Manager
-   --
-
-   procedure Region_Create (
-      Name             : in     RTEMS.Name;
-      Starting_Address : in     RTEMS.Address;
-      Length           : in     RTEMS.Unsigned32;
-      Page_Size        : in     RTEMS.Unsigned32;
-      Attribute_Set    : in     RTEMS.Attribute;
-      ID               :    out RTEMS.ID;
-      Result           :    out RTEMS.Status_Codes
-   );
-
-   procedure Region_Ident (
-      Name   : in     RTEMS.Name;
-      ID     :    out RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   );
-
-   procedure Region_Delete (
-      ID     : in     RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   );
-
-   procedure Region_Extend (
-      ID               : in     RTEMS.ID;
-      Starting_Address : in     RTEMS.Address;
-      Length           : in     RTEMS.Unsigned32;
-      Result           :    out RTEMS.Status_Codes
-   );
-
-   procedure Region_Get_Segment (
-      ID         : in     RTEMS.ID;
-      Size       : in     RTEMS.Unsigned32;
-      Option_Set : in     RTEMS.Option;
-      Timeout    : in     RTEMS.Interval;
-      Segment    :    out RTEMS.Address;
-      Result     :    out RTEMS.Status_Codes
-   );
-
-   procedure Region_Get_Segment_Size (
-      ID         : in     RTEMS.ID;
-      Segment    : in     RTEMS.Address;
-      Size       :    out RTEMS.Unsigned32;
-      Result     :    out RTEMS.Status_Codes
-   );
-
-   procedure Region_Return_Segment (
-      ID      : in     RTEMS.ID;
-      Segment : in     RTEMS.Address;
-      Result  :    out RTEMS.Status_Codes
-   );
-
-
-   --
-   --  Dual Ported Memory Manager
-   --
-
-   procedure Port_Create (
-      Name           : in     RTEMS.Name;
-      Internal_Start : in     RTEMS.Address;
-      External_Start : in     RTEMS.Address;
-      Length         : in     RTEMS.Unsigned32;
-      ID             :    out RTEMS.ID;
-      Result         :    out RTEMS.Status_Codes
-   );
-
-   procedure Port_Ident (
-      Name   : in     RTEMS.Name;
-      ID     :    out RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   );
-
-   procedure Port_Delete (
-      ID     : in     RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   );
-
-   procedure Port_External_To_Internal (
-      ID       : in     RTEMS.ID;
-      External : in     RTEMS.Address;
-      Internal :    out RTEMS.Address;
-      Result   :    out RTEMS.Status_Codes
-   );
-
-   procedure Port_Internal_To_External (
-      ID       : in     RTEMS.ID;
-      Internal : in     RTEMS.Address;
-      External :    out RTEMS.Address;
-      Result   :    out RTEMS.Status_Codes
-   );
-
-   --
-   --  Input/Output Manager
-   --
-
-   procedure IO_Initialize (
-      Major        : in     RTEMS.Device_Major_Number;
-      Minor        : in     RTEMS.Device_Minor_Number;
-      Argument     : in     RTEMS.Address;
-      Return_Value :    out RTEMS.Unsigned32;
-      Result       :    out RTEMS.Status_Codes
-   );
-
-   procedure IO_Register_Name (
-      Name   : in     String;
-      Major  : in     RTEMS.Device_Major_Number;
-      Minor  : in     RTEMS.Device_Minor_Number;
-      Result :    out RTEMS.Status_Codes
-   );
-
-   procedure IO_Lookup_Name (
-      Name         : in     String;
-      Device_Info  :    out RTEMS.Driver_Name_t;
-      Result       :    out RTEMS.Status_Codes
-   );
-
-   procedure IO_Open (
-      Major        : in     RTEMS.Device_Major_Number;
-      Minor        : in     RTEMS.Device_Minor_Number;
-      Argument     : in     RTEMS.Address;
-      Result       :    out RTEMS.Status_Codes
-   );
-
-   procedure IO_Close (
-      Major        : in     RTEMS.Device_Major_Number;
-      Minor        : in     RTEMS.Device_Minor_Number;
-      Argument     : in     RTEMS.Address;
-      Result       :    out RTEMS.Status_Codes
-   );
-
-   procedure IO_Read (
-      Major        : in     RTEMS.Device_Major_Number;
-      Minor        : in     RTEMS.Device_Minor_Number;
-      Argument     : in     RTEMS.Address;
-      Result       :    out RTEMS.Status_Codes
-   );
-
-   procedure IO_Write (
-      Major        : in     RTEMS.Device_Major_Number;
-      Minor        : in     RTEMS.Device_Minor_Number;
-      Argument     : in     RTEMS.Address;
-      Result       :    out RTEMS.Status_Codes
-   );
-
-   procedure IO_Control (
-      Major        : in     RTEMS.Device_Major_Number;
-      Minor        : in     RTEMS.Device_Minor_Number;
-      Argument     : in     RTEMS.Address;
-      Result       :    out RTEMS.Status_Codes
-   );
-
-
-   --
-   --  Fatal Error Manager
-   --
-
-   procedure Fatal_Error_Occurred (
-      The_Error : in     RTEMS.Unsigned32
-   );
-
-
-   --
-   --  Rate Monotonic Manager
-   --
-
-   procedure Rate_Monotonic_Create (
-      Name   : in     RTEMS.Name;
-      ID     :    out RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   );
-
-   procedure Rate_Monotonic_Ident (
-      Name   : in     RTEMS.Name;
-      ID     :    out RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   );
-
-   procedure Rate_Monotonic_Delete (
-      ID     : in     RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   );
-
-   procedure Rate_Monotonic_Cancel (
-      ID     : in     RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   );
-
-   procedure Rate_Monotonic_Period (
-      ID      : in     RTEMS.ID;
-      Length  : in     RTEMS.Interval;
-      Result  :    out RTEMS.Status_Codes
-   );
-
-   procedure Rate_Monotonic_Get_Status (
-      ID      : in     RTEMS.ID;
-      Status  :    out RTEMS.Rate_Monotonic_Period_Status;
-      Result  :    out RTEMS.Status_Codes
-   );
-
-   --
-   --  Multiprocessing Manager
-   --
-
-   procedure Multiprocessing_Announce;
-
-
-   --
-   --  Debug Manager
-   --
-
-   Debug_All_Mask : constant RTEMS.Debug_Set := 16#ffffffff#;
-   Debug_Region   : constant RTEMS.Debug_Set := 16#00000001#;
-
-   procedure Debug_Enable (
-      To_Be_Enabled : in     RTEMS.Debug_Set
-   );
-
-   procedure Debug_Disable (
-      To_Be_Disabled : in     RTEMS.Debug_Set
-   );
-
-   function Debug_Is_Enabled (
-      Level : in     RTEMS.Debug_Set
-   ) return RTEMS.Boolean;
-
-  --
-  --  Some Useful Data Items
-  --
-
-  Configuration : RTEMS.Configuration_Table_Pointer;
-  pragma Import (C, Configuration, "_Configuration_Table");
-
-
-private
-end RTEMS;
diff --git a/c/src/exec/libcsupport/include/chain.h b/c/src/exec/libcsupport/include/chain.h
deleted file mode 100644
index 98cf2b1a86..0000000000
--- a/c/src/exec/libcsupport/include/chain.h
+++ /dev/null
@@ -1,362 +0,0 @@
-/*  chain.h
- * 
- *  This include file contains all the constants and structures associated
- *  with doubly linked chains.  This file actually just provides an
- *  interface to the chain object in rtems.
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- * $ld:
- */
-
-#ifndef __CHAIN_h
-#define __CHAIN_h
-
-#include <rtems.h>
-
-/* 
- *  Chain_Initialize
- *
- *  This routine initializes the_chain structure to manage the
- *  contiguous array of number_nodes nodes which starts at
- *  starting_address.  Each node is of node_size bytes.
- *
- *  Chain_Control                    *the_chain,		 * IN  * 
- *  void                             *starting_address,		 * IN  * 
- *  rtems_unsigned32                  number_nodes,		 * IN  * 
- *  rtems_unsigned32                  node_size			 * IN  * 
- */
-
-#define Chain_Initialize( the_chain, starting_address, \
-                          number_nodes, node_size ) \
-       _Chain_Initialize( the_chain, starting_address, \
-                          number_nodes, node_size ) \
-
-
-/* 
- *  Chain_Initialize_empty
- *
- *  This routine initializes the specified chain to contain zero nodes.
- *
- *  Chain_Control                    *the_chain			 * IN  * 
- */
-
-#define Chain_Initialize_empty( the_chain ) \
-       _Chain_Initialize_empty( the_chain )
- 
-
-/*
- *  Chain_Are_nodes_equal
- *
- *  This function returns TRUE if LEFT and RIGHT are equal,
- *  and FALSE otherwise.
- *
- *  Chain_Node                       *left,			 * IN  * 
- *  Chain_Node                       *right			 * IN  * 
- */
- 
-#define Chain_Are_nodes_equal( left, right ) \
-       _Chain_Are_nodes_equal( left, right )
-
-
-/* 
- *  Chain_Extract_unprotected
- *
- *  This routine extracts the_node from the chain on which it resides.
- *  It does NOT disable interrupts to insure the atomicity of the
- *  extract operation.
- *
- *  Chain_Node                       *the_node			 * IN  * 
- */
-
-#define Chain_Extract_unprotected( the_node ) \
-       _Chain_Extract_unprotected( the_node )
-
-
-/* 
- *  Chain_Extract
- *
- *  This routine extracts the_node from the chain on which it resides.
- *  It disables interrupts to insure the atomicity of the
- *  extract operation.
- *
- *  Chain_Node                       *the_node			 * IN  * 
- */
-
-#define Chain_Extract( the_node ) \
-       _Chain_Extract( the_node )
-
-
-/* 
- *  Chain_Get_unprotected
- *
- *  This function removes the first node from the_chain and returns
- *  a pointer to that node.  If the_chain is empty, then NULL is returned.
- *  It does NOT disable interrupts to insure the atomicity of the
- *  get operation.
- *
- *  Chain_Control                    *the_chain			 * IN  * 
- */
-
-#define Chain_Get_unprotected( the_chain ) \
-       _Chain_Get_unprotected( the_chain )
-
-
-/* 
- *  Chain_Get
- *
- *  This function removes the first node from the_chain and returns
- *  a pointer to that node.  If the_chain is empty, then NULL is returned.
- *  It disables interrupts to insure the atomicity of the
- *  get operation.
- *
- *  Chain_Control                    *the_chain			 * IN  * 
- */
-
-#define Chain_Get( the_chain ) \
-       _Chain_Get( the_chain )
-
-
-/* 
- *  Chain_Get_first_unprotected
- *
- *  This function removes the first node from the_chain and returns
- *  a pointer to that node.  It does NOT disable interrupts to insure
- *  the atomicity of the get operation.
- *
- *  Chain_Control                    *the_chain			 * IN  * 
- */
-
-#define Chain_Get_first_unprotected( the_chain ) \
-       _Chain_Get_first_unprotected( the_chain )
-
-
-/* 
- *  Chain_Insert_unprotected
- *
- *  This routine inserts the_node on a chain immediately following
- *  after_node.  It does NOT disable interrupts to insure the atomicity
- *  of the extract operation.
- *
- *  Chain_Node                       *after_node,		 * IN  * 
- *  Chain_Node                       *the_node			 * IN  * 
- */
-
-#define Chain_Insert_unprotected( after_node, the_node ) \
-       _Chain_Insert_unprotected( after_node, the_node )
-
-
-/* 
- *  Chain_Insert
- *
- *  This routine inserts the_node on a chain immediately following
- *  after_node.  It disables interrupts to insure the atomicity
- *  of the extract operation.
- *
- *  Chain_Node                       *after_node,		 * IN  * 
- *  Chain_Node                       *the_node			 * IN  * 
- */
-
-#define Chain_Insert( after_node, the_node ) \
-       _Chain_Insert( after_node, the_node )
-
-
-/* 
- *  Chain_Append_unprotected
- *
- *  This routine appends the_node onto the end of the_chain.
- *  It does NOT disable interrupts to insure the atomicity of the
- *  append operation.
- *
- *  Chain_Control                    *the_chain,		 * IN  * 
- *  Chain_Node                       *the_node			 * IN  * 
- */
-
-#define Chain_Append_unprotected( the_chain, the_node ) \
-       _Chain_Append_unprotected( the_chain, the_node )
-
-
-/* 
- *  Chain_Append
- *
- *  This routine appends the_node onto the end of the_chain.
- *  It disables interrupts to insure the atomicity of the
- *  append operation.
- *
- *  Chain_Control                    *the_chain,		 * IN  * 
- *  Chain_Node                       *the_node			 * IN  * 
- */
-
-#define Chain_Append( the_chain, the_node ) \
-       _Chain_Append( the_chain, the_node )
-
-
-/* 
- *  Chain_Prepend_unprotected
- *
- *  This routine prepends the_node onto the front of the_chain.
- *  It does NOT disable interrupts to insure the atomicity of the
- *  prepend operation.
- *
- *  Chain_Control                    *the_chain,		 * IN  * 
- *  Chain_Node                       *the_node			 * IN  * 
- */
-
-#define Chain_Prepend_unprotected( the_chain, the_node ) \
-       _Chain_Prepend_unprotected( the_chain, the_node )
-
-
-/* 
- *  Chain_Prepend
- *
- *  This routine prepends the_node onto the front of the_chain.
- *  It disables interrupts to insure the atomicity of the
- *  prepend operation.
- *
- *  Chain_Control                    *the_chain,		 * IN  * 
- *  Chain_Node                       *the_node			 * IN  * 
- */
-
-#define Chain_Prepend( the_chain, the_node ) \
-       _Chain_Prepend( the_chain, the_node )
-
-
-/* 
- *  Chain_Head
- *
- *  This function returns a pointer to the first node on the chain.
- *
- *  Chain_Control                    *the_chain			 * IN  * 
- */
-
-#define Chain_Head( the_chain ) \
-       _Chain_Head( the_chain )
-
-
-/* 
- *  Chain_Tail
- *
- *  This function returns a pointer to the last node on the chain.
- *
- *  Chain_Control                    *the_chain			 * IN  * 
- */
-
-#define Chain_Tail( the_chain ) \
-       _Chain_Tail( the_chain )
-
-
-/* 
- *  Chain_Is_head
- *
- *  This function returns TRUE if the_node is the head of the_chain and
- *  FALSE otherwise.
- *
- *  Chain_Control                    *the_chain,		 * IN  * 
- *  Chain_Node                       *the_node			 * IN  * 
- */
-
-#define Chain_Is_head( the_chain, the_node ) \
-       _Chain_Is_head( the_chain, the_node )
-
-
-/* 
- *  Chain_Is_tail
- *
- *  This function returns TRUE if the_node is the tail of the_chain and
- *  FALSE otherwise.
- *
- *  Chain_Control                    *the_chain,		 * IN  * 
- *  Chain_Node                       *the_node			 * IN  * 
- */
-
-#define Chain_Is_tail( the_chain, the_node ) \
-       _Chain_Is_tail( the_chain, the_node )
-
-
-/* 
- *  Chain_Is_first
- *
- *  This function returns TRUE if the_node is the first node on a chain and
- *  FALSE otherwise.
- *
- *  Chain_Node                       *the_node			 * IN  * 
- */
-
-#define Chain_Is_first( the_node ) \
-       _Chain_Is_first( the_node )
-
-
-/* 
- *  Chain_Is_last
- *
- *  This function returns TRUE if the_node is the last node on a chain and
- *  FALSE otherwise.
- *
- *  Chain_Node                       *the_node			 * IN  * 
- */
-
-#define Chain_Is_last( the_node ) \
-       _Chain_Is_last( the_node )
-
-
-/* 
- *  Chain_Is_empty
- *
- *  This function returns TRUE if there are no nodes on the_chain and
- *  FALSE otherwise.
- *
- *  Chain_Control                    *the_chain			 * IN  * 
- */
-
-#define Chain_Is_empty( the_chain ) \
-       _Chain_Is_empty( the_chain )
-
-
-/* 
- *  Chain_Has_only_one_node
- *
- *  This function returns TRUE if there is only one node on the_chain and
- *  FALSE otherwise.
- *
- *  Chain_Control                    *the_chain			 * IN  * 
- */
-
-#define Chain_Has_only_one_node( the_chain ) \
-       _Chain_Has_only_one_node( the_chain )
-
-
-/* 
- *  Chain_Is_null
- *
- *  This function returns TRUE if the_chain is NULL and FALSE otherwise.
- *
- *  Chain_Control                    *the_chain			 * IN  * 
- */
-
-#define Chain_Is_null( the_chain ) \
-       _Chain_Is_null( the_chain )
-
-
-/* 
- *  Chain_Is_null_node
- *
- *  This function returns TRUE if the_node is NULL and FALSE otherwise.
- *
- *  Chain_Node                       *the_node			 * IN  * 
- */
-
-#define Chain_Is_null_node( the_node ) \
-       _Chain_Is_null_node( the_node )
-
-
-#undef __RTEMS_APPLICATION__
-#include <rtems/score/chain.inl>
-#define __RTEMS_APPLICATION__
-#endif
-/* end of include file */
diff --git a/c/src/exec/libcsupport/include/clockdrv.h b/c/src/exec/libcsupport/include/clockdrv.h
deleted file mode 100644
index 74c9d5e9f7..0000000000
--- a/c/src/exec/libcsupport/include/clockdrv.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*  clock.h
- *
- *  This file describes the Clock Driver for all boards.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __CLOCK_DRIVER_h
-#define __CLOCK_DRIVER_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* variables */
-
-extern volatile rtems_unsigned32 Clock_driver_ticks;
-extern rtems_device_major_number rtems_clock_major;
-extern rtems_device_minor_number rtems_clock_minor;
-
-/* default clock driver entry */
-
-#define CLOCK_DRIVER_TABLE_ENTRY \
-  { Clock_initialize, NULL, NULL, NULL, NULL, Clock_control }
- 
-rtems_device_driver Clock_initialize(
-  rtems_device_major_number,
-  rtems_device_minor_number,
-  void *
-);
-
-rtems_device_driver Clock_control(
-  rtems_device_major_number major,
-  rtems_device_minor_number minor,
-  void *pargp
-);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/libcsupport/include/console.h b/c/src/exec/libcsupport/include/console.h
deleted file mode 100644
index 2f5173d757..0000000000
--- a/c/src/exec/libcsupport/include/console.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*  console.h
- *
- *  This file describes the Console Device Driver for all boards.
- *  This driver provides support for the standard C Library.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef _CONSOLE_DRIVER_h
-#define _CONSOLE_DRIVER_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define CONSOLE_DRIVER_TABLE_ENTRY \
-  { console_initialize, console_open, console_close, \
-    console_read, console_write, console_control }
-
-void console_reserve_resources(
-  rtems_configuration_table *configuration
-);
-
-rtems_device_driver console_initialize(
-  rtems_device_major_number,
-  rtems_device_minor_number,
-  void *
-);
-
-rtems_device_driver console_open(
-  rtems_device_major_number,
-  rtems_device_minor_number,
-  void *
-);
-
-rtems_device_driver console_close(
-  rtems_device_major_number,
-  rtems_device_minor_number,
-  void *
-);
-
-rtems_device_driver console_read(
-  rtems_device_major_number,
-  rtems_device_minor_number,
-  void *
-);
-
-rtems_device_driver console_write(
-  rtems_device_major_number,
-  rtems_device_minor_number,
-  void *
-);
-
-rtems_device_driver console_control(
-  rtems_device_major_number,
-  rtems_device_minor_number,
-  void *
-);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/libcsupport/include/iosupp.h b/c/src/exec/libcsupport/include/iosupp.h
deleted file mode 100644
index 97175e0a7b..0000000000
--- a/c/src/exec/libcsupport/include/iosupp.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*  iosupp.h
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __IOSUPP_h
-#define __IOSUPP_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* character constants */
-
-#define BS              0x08            /* backspace */
-#define LF              0x0a            /* line feed */
-#define CR              0x0d            /* carriage return */
-#define XON             0x11            /* control-Q */
-#define XOFF            0x13            /* control-S */
-
-/* structures */
-
-#ifdef IOSUPP_INIT
-#define IOSUPP_EXTERN
-#else
-#undef IOSUPP_EXTERN
-#define IOSUPP_EXTERN  extern
-#endif
-
-/* functions */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/c/src/exec/libcsupport/include/motorola/mc68230.h b/c/src/exec/libcsupport/include/motorola/mc68230.h
deleted file mode 100644
index bde00c4cdd..0000000000
--- a/c/src/exec/libcsupport/include/motorola/mc68230.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * mc68230.h -- Low level support code for the Motorola 68230 Parallel
- *              Interface/Timer (PIT)
- *
- * Modified by Doug McBride, Colorado Space Grant College
- *
- * Format taken partly from RTEMS code and mostly from Motorola IDP user's
- * manual.  RTEMS copyright information below.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __MC68230_H__
-#define __MC68230_H__
-
-/* Some Motorola IDP User manual defines: */
-#define PIT_ADDR	0x00c01003		/* base address of the PIT */
-#define REGOFF	0x04				/* Difference between addresses */
-#define VECT	64
-#define H1VECT	0x00
-#define H2VECT	0x01
-#define H3VECT	0x02
-#define H4VECT	0x03
-
-/*
- * mc68230 register offsets
- */
-#define PGCR	0x00
-#define PSRR	1*REGOFF
-#define PADDR	2*REGOFF
-#define PBDDR	3*REGOFF
-#define PCDDR	4*REGOFF
-#define PIVR	5*REGOFF
-#define PACR	6*REGOFF
-#define PBCR	7*REGOFF
-#define PADR	8*REGOFF
-#define PBDR	9*REGOFF
-#define PAAR	10*REGOFF
-#define PBAR	11*REGOFF
-#define PCDR	12*REGOFF
-#define PITSR	13*REGOFF
-#define TCR		16*REGOFF
-#define TIVR	17*REGOFF
-#define CPRH	19*REGOFF
-#define CPRM	20*REGOFF
-#define CPRL	21*REGOFF
-#define CNTRH	23*REGOFF
-#define CNTRM	24*REGOFF
-#define CNTRL	25*REGOFF
-#define TSR		26*REGOFF
-
-/* Some RTEMS style defines: */
-#ifndef VOL8
-#define VOL8( ptr )   ((volatile rtems_unsigned8 *)(ptr))
-#endif
-
-#define MC68230_WRITE( reg, data ) \
-   *(VOL8(PIT_ADDR+reg)) = (data)
-
-#define MC68230_READ( reg, data ) \
-   (data) = *(VOL8(PIT_ADDR+reg))
-
-#endif
diff --git a/c/src/exec/libcsupport/include/motorola/mc68681.h b/c/src/exec/libcsupport/include/motorola/mc68681.h
deleted file mode 100644
index 7602097fd8..0000000000
--- a/c/src/exec/libcsupport/include/motorola/mc68681.h
+++ /dev/null
@@ -1,306 +0,0 @@
-/*
- * mc68681-duart.h -- Low level support code for the Motorola mc68681
- *                   DUART.
- *
- *  Originally written by rob@cygnus.com (Rob Savoye) for the libgloss
- *    IDP support.
- *
- *  $Id$
- */
-
-#ifndef __MC68681_H__
-#define __MC68681_H__
-
-/*
- *  In the dark ages when this controller was designed, it was actually
- *  possible to access data on unaligned byte boundaries with no penalty.
- *  Now we find this chip in configurations in which the registers are
- *  at 16-bit, 32-bit, and 64-bit boundaries at the whim of the board
- *  designer.  If the registers are not at byte addresses, then
- *  set this multiplier before including this file to correct the offsets.
- */
-
-#ifndef MC68681_OFFSET_MULTIPLIER
-#define MC68681_OFFSET_MULTIPLIER 1
-#endif
-
-#define __MC68681_REG(_R) ((_R) * MC68681_OFFSET_MULTIPLIER)
-
-/*
- * mc68681 register offsets Read/Write Addresses
- */
-#define MC68681_MODE_REG_1A  __MC68681_REG(0)  /* MR1A-MR Prior to Read */
-#define MC68681_MODE_REG_2A  __MC68681_REG(0)  /* MR2A-MR After Read    */
-
-#define MC68681_COUNT_MODE_CURRENT_MSB       __MC68681_REG(6)  /* CTU   */
-#define MC68681_COUNTER_TIMER_UPPER_REG      __MC68681_REG(6)  /* CTU   */
-#define MC68681_COUNT_MODE_CURRENT_LSB       __MC68681_REG(7)  /* CTL   */
-#define MC68681_COUNTER_TIMER_LOWER_REG      __MC68681_REG(7)  /* CTL   */
-#define MC68681_INTERRUPT_VECTOR_REG         __MC68681_REG(12) /* IVR   */
-
-#define MC68681_MODE_REG_1B  __MC68681_REG(8)  /* MR1B-MR Prior to Read */
-#define MC68681_MODE_REG_2B  __MC68681_REG(8)  /* MR2BA-MR After Read   */
-
-/*
- * mc68681 register offsets Read Only  Addresses
- */
-#define MC68681_STATUS_REG_A                __MC68681_REG(1)   /* SRA   */
-#define MC68681_MASK_ISR_REG                __MC68681_REG(2)   /* MISR  */
-#define MC68681_RECEIVE_BUFFER_A            __MC68681_REG(3)   /* RHRA  */
-#define MC68681_INPUT_PORT_CHANGE_REG       __MC68681_REG(4)   /* IPCR  */
-#define MC68681_INTERRUPT_STATUS_REG        __MC68681_REG(5)   /* ISR   */
-#define MC68681_STATUS_REG_B                __MC68681_REG(9)   /* SRB   */
-#define MC68681_RECEIVE_BUFFER_B            __MC68681_REG(11)  /* RHRB  */
-#define MC68681_INPUT_PORT                  __MC68681_REG(13)  /* IP    */
-#define MC68681_START_COUNT_CMD             __MC68681_REG(14)  /* SCC   */
-#define MC68681_STOP_COUNT_CMD              __MC68681_REG(15)  /* STC   */
-
-/*
- * mc68681 register offsets Write Only  Addresses
- */
-#define MC68681_CLOCK_SELECT_REG_A          __MC68681_REG(1)   /* CSRA  */
-#define MC68681_COMMAND_REG_A               __MC68681_REG(2)   /* CRA   */
-#define MC68681_TRANSMIT_BUFFER_A           __MC68681_REG(3)   /* THRA  */
-#define MC68681_AUX_CTRL_REG                __MC68681_REG(4)   /* ACR   */
-#define MC68681_INTERRUPT_MASK_REG          __MC68681_REG(5)   /* IMR   */
-#define MC68681_CLOCK_SELECT_REG_B          __MC68681_REG(9)   /* CSRB  */
-#define MC68681_COMMAND_REG_B               __MC68681_REG(10)  /* CRB   */
-#define MC68681_TRANSMIT_BUFFER_B           __MC68681_REG(11)  /* THRB  */
-#define MC68681_OUTPUT_PORT_CONFIG_REG      __MC68681_REG(13)  /* OPCR  */
-#define MC68681_OUTPUT_PORT_SET_REG         __MC68681_REG(14)  /* SOPBC */
-#define MC68681_OUTPUT_PORT_RESET_BITS      __MC68681_REG(15)  /* COPBC */
-
-
-#ifndef MC6681_VOL
-#define MC6681_VOL( ptr )   ((volatile unsigned char *)(ptr))
-#endif
-
-#define MC68681_WRITE( _base, _reg, _data ) \
-   *((volatile unsigned char *)_base+_reg) = (_data)
-
-#define MC68681_READ( _base, _reg ) \
-   *(((volatile unsigned char *)_base+_reg))
-
-
-
-#define  MC68681_CLEAR                                     0x00 
-
-#define MC68681_PORT_A                                     0
-#define MC68681_PORT_B                                     1
-
-/* 
- *  DUART Command Register Definitions: 
- *
- *  MC68681_COMMAND_REG_A,MC68681_COMMAND_REG_B       
- */
-#define MC68681_MODE_REG_ENABLE_RX                          0x01
-#define MC68681_MODE_REG_DISABLE_RX                         0x02
-#define MC68681_MODE_REG_ENABLE_TX                          0x04
-#define MC68681_MODE_REG_DISABLE_TX                         0x08
-#define MC68681_MODE_REG_RESET_MR_PTR                       0x10
-#define MC68681_MODE_REG_RESET_RX                           0x20
-#define MC68681_MODE_REG_RESET_TX                           0x30
-#define MC68681_MODE_REG_RESET_ERROR                        0x40
-#define MC68681_MODE_REG_RESET_BREAK                        0x50
-#define MC68681_MODE_REG_START_BREAK                        0x60
-#define MC68681_MODE_REG_STOP_BREAK                         0x70
-#define MC68681_MODE_REG_SET_RX_BRG                         0x80
-#define MC68681_MODE_REG_CLEAR_RX_BRG                       0x90
-#define MC68681_MODE_REG_SET_TX_BRG                         0xa0
-#define MC68681_MODE_REG_CLEAR_TX_BRG                       0xb0
-#define MC68681_MODE_REG_SET_STANDBY                        0xc0
-#define MC68681_MODE_REG_SET_ACTIVE                         0xd0
-
-/*
- * Mode Register Definitions
- *
- *  MC68681_MODE_REG_1A 
- *  MC68681_MODE_REG_1B 
- */
-#define MC68681_5BIT_CHARS                                  0x00
-#define MC68681_6BIT_CHARS                                  0x01
-#define MC68681_7BIT_CHARS                                  0x02
-#define MC68681_8BIT_CHARS                                  0x03
-
-#define MC68681_ODD_PARITY                                  0x00
-#define MC68681_EVEN_PARITY                                 0x04
-
-#define MC68681_WITH_PARITY                                 0x00
-#define MC68681_FORCE_PARITY                                0x08
-#define MC68681_NO_PARITY                                   0x10
-#define MC68681_MULTI_DROP                                  0x18
-
-#define MC68681_ERR_MODE_CHAR                               0x00
-#define MC68681_ERR_MODE_BLOCK                              0x20
-
-#define MC68681_RX_INTR_RX_READY                            0x00
-#define MC68681_RX_INTR_FFULL                               0x40
-
-#define MC68681_NO_RX_RTS_CTL                               0x00
-#define MC68681_RX_RTS_CTRL                                 0x80
-
-
-/*
- * Mode Register Definitions
- *
- *  MC68681_MODE_REG_2A
- *  MC68681_MODE_REG_2B
- */
-#define MC68681_STOP_BIT_LENGTH__563                        0x00
-#define MC68681_STOP_BIT_LENGTH__625                        0x01
-#define MC68681_STOP_BIT_LENGTH__688                        0x02
-#define MC68681_STOP_BIT_LENGTH__75                         0x03
-#define MC68681_STOP_BIT_LENGTH__813                        0x04
-#define MC68681_STOP_BIT_LENGTH__875                        0x05
-#define MC68681_STOP_BIT_LENGTH__938                        0x06
-#define MC68681_STOP_BIT_LENGTH_1                           0x07
-#define MC68681_STOP_BIT_LENGTH_1_563                       0x08
-#define MC68681_STOP_BIT_LENGTH_1_625                       0x09
-#define MC68681_STOP_BIT_LENGTH_1_688                       0x0a
-#define MC68681_STOP_BIT_LENGTH_1_75                        0x0b
-#define MC68681_STOP_BIT_LENGTH_1_813                       0x0c
-#define MC68681_STOP_BIT_LENGTH_1_875                       0x0d
-#define MC68681_STOP_BIT_LENGTH_1_938                       0x0e
-#define MC68681_STOP_BIT_LENGTH_2                           0x0f
-
-#define MC68681_CTS_ENABLE_TX                               0x10
-#define MC68681_TX_RTS_CTRL                                 0x20
-
-#define MC68681_CHANNEL_MODE_NORMAL                         0x00
-#define MC68681_CHANNEL_MODE_ECHO                           0x40
-#define MC68681_CHANNEL_MODE_LOCAL_LOOP                     0x80
-#define MC68681_CHANNEL_MODE_REMOTE_LOOP                    0xc0
-
-/*
- * Status Register Definitions
- *
- *    MC68681_STATUS_REG_A,  MC68681_STATUS_REG_B
- */
-#define MC68681_RX_READY                                    0x01
-#define MC68681_FFULL                                       0x02
-#define MC68681_TX_READY                                    0x04
-#define MC68681_TX_EMPTY                                    0x08
-#define MC68681_OVERRUN_ERROR                               0x10
-#define MC68681_PARITY_ERROR                                0x20
-#define MC68681_FRAMING_ERROR                               0x40
-#define MC68681_RECEIVED_BREAK                              0x80
-
-
-/* 
- * Interupt Status Register Definitions.  
- *
- * MC68681_INTERRUPT_STATUS_REG          
- */
-
-
-/* 
- *  Interupt Mask Register Definitions     
- *
- *  MC68681_INTERRUPT_MASK_REG 
- */
-#define MC68681_IR_TX_READY_A                               0x01
-#define MC68681_IR_RX_READY_A                               0x02
-#define MC68681_IR_BREAK_A                                  0x04
-#define MC68681_IR_COUNTER_READY                            0x08
-#define MC68681_IR_TX_READY_B                               0x10
-#define MC68681_IR_RX_READY_B                               0x20
-#define MC68681_IR_BREAK_B                                  0x40
-#define MC68681_IR_INPUT_PORT_CHANGE                        0x80
-
-/* 
- * Status Register Definitions.  
- * 
- * MC68681_STATUS_REG_A,MC68681_STATUS_REG_B          
- */
-#define MC68681_STATUS_RXRDY                                0x01
-#define MC68681_STATUS_FFULL                                0x02
-#define MC68681_STATUS_TXRDY                                0x04
-#define MC68681_STATUS_TXEMT                                0x08
-#define MC68681_STATUS_OVERRUN_ERROR                        0x10
-#define MC68681_STATUS_PARITY_ERROR                         0x20
-#define MC68681_STATUS_FRAMING_ERROR                        0x40
-#define MC68681_STATUS_RECEIVED_BREAK                       0x80
-
-/* 
- * Definitions for the Interrupt Vector Register: 
- *
- * MC68681_INTERRUPT_VECTOR_REG  
- */
-#define  MC68681_INTERRUPT_VECTOR_INIT                      0x0f
-
-/* 
- * Definitions for the Auxiliary Control Register  
- *
- * MC68681_AUX_CTRL_REG 
- */
-#define MC68681_AUX_BRG_SET1                                0x00
-#define MC68681_AUX_BRG_SET2                                0x80
-
-
-/* 
- * The following Baud rates assume the X1 clock pin is driven with a 
- * 3.6864 MHz signal.  If a different frequency is used the DUART channel
- * is running at the follwoing baud rate:
- *       ((Table Baud Rate)*frequency)/3.6864 MHz 
- */
-
-/* 
- * Definitions for the Clock Select Register: 
- *
- * MC68681_CLOCK_SELECT_REG_A,MC68681_CLOCK_SELECT_REG_A 
- * 
- * Note:  ACR[7] is the MSB of the Auxiliary Control register
- *        X is the extend bit.
- *        CRA - 0x08  Set Rx BRG Select Extend Bit   (X=1)
- *        CRA - 0x09  Clear Rx BRG Select Extend Bit (X=0)
- *        CRB - 0x0a  Set Tx BRG Select Extend Bit   (X=1)
- *        CRB - 0x0b  Clear Tx BRG Select Extend Bit (x=1)
- */
-#define MC68681_BAUD_RATE_MASK_50           0x00   /* ACR[7]=0,X=0 */
-                                                   /* ARC[7]=1,X=1 */
-#define MC68681_BAUD_RATE_MASK_75           0x00   /* ACR[7]=0,X=0 */
-                                                   /* ARC[7]=1,X=1 */
-#define MC68681_BAUD_RATE_MASK_110          0x01   
-#define MC68681_BAUD_RATE_MASK_134_5        0x02   
-#define MC68681_BAUD_RATE_MASK_150          0x03   /* ACR[7]=0,X=0 */
-                                                   /* ARC[7]=1,X=1 */
-#define MC68681_BAUD_RATE_MASK_200          0x03   /* ACR[7]=0,X=0 */
-                                                   /* ARC[7]=1,X=1 */
-#define MC68681_BAUD_RATE_MASK_300          0x04   /* ACR[7]=0,X=0 */
-                                                   /* ARC[7]=1,X=1 */
-#define MC68681_BAUD_RATE_MASK_600          0x05   /* ACR[7]=0,X=0 */
-                                                   /* ARC[7]=1,X=1 */
-#define MC68681_BAUD_RATE_MASK_1050         0x07   /* ACR[7]=0,X=0 */
-                                                   /* ARC[7]=1,X=1 */
-#define MC68681_BAUD_RATE_MASK_1200         0x06   /* ACR[7]=0,X=0 */
-                                                   /* ARC[7]=1,X=1 */
-#define MC68681_BAUD_RATE_MASK_1800         0x0a   /* ACR[7]=0,X=0 */
-                                                   /* ARC[7]=1,X=1 */
-#define MC68681_BAUD_RATE_MASK_2400         0x08   /* ACR[7]=0,X=0 */
-                                                   /* ARC[7]=1,X=1 */
-#define MC68681_BAUD_RATE_MASK_3600         0x04   /* ACR[7]=0,X=0 */
-                                                   /* ARC[7]=1,X=1 */
-#define MC68681_BAUD_RATE_MASK_4800         0x09   
-#define MC68681_BAUD_RATE_MASK_7200         0x0a   /* ACR[7]=0,X=0 */
-                                                   /* ARC[7]=1,X=1 */
-#define MC68681_BAUD_RATE_MASK_9600         0xbb   
-
-#define MC68681_BAUD_RATE_MASK_14_4K        0x05   /* ACR[7]=0,X=0 */
-                                                   /* ARC[7]=1,X=1 */
-#define MC68681_BAUD_RATE_MASK_19_2K        0xcc   /* ACR[7]=1,X=0 */
-                                                   /* ARC[7]=0,X=1 */
-#define MC68681_BAUD_RATE_MASK_28_8K        0x06   /* ACR[7]=0,X=0 */
-                                                   /* ARC[7]=1,X=1 */
-#define MC68681_BAUD_RATE_MASK_38_4K        0xcc   /* ACR[7]=0,X=0 */
-                                                   /* ARC[7]=1,X=1 */
-#define MC68681_BAUD_RATE_MASK_57_6K        0x07   /* ACR[7]=0,X=0 */
-                                                   /* ARC[7]=1,X=1 */
-#define MC68681_BAUD_RATE_MASK_115_5K       0x08  
-#define MC68681_BAUD_RATE_MASK_TIMER        0xdd   
-#define MC68681_BAUD_RATE_MASK_TIMER_16X    0xee   
-#define MC68681_BAUD_RATE_MASK_TIMER_1X     0xff   
-
-#endif
-
-
-
diff --git a/c/src/exec/libcsupport/include/ringbuf.h b/c/src/exec/libcsupport/include/ringbuf.h
deleted file mode 100644
index 8c80aaf9c8..0000000000
--- a/c/src/exec/libcsupport/include/ringbuf.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- *  ringbuf.h 
- *
- *  This file provides simple ring buffer functionality.
- *
- *  $Id$
- */
-
-#ifndef __RINGBUF_H__
-#define __RINGBUF_H__
-
-#ifndef RINGBUF_QUEUE_LENGTH
-#define RINGBUF_QUEUE_LENGTH 128
-#endif
-
-typedef struct {
-  char buffer[RINGBUF_QUEUE_LENGTH];
-  volatile int  head;
-  volatile int  tail;
-} Ring_buffer_t;
-
-#define Ring_buffer_Initialize( _buffer ) \
-  do { \
-    (_buffer)->head = (_buffer)->tail = 0; \
-  } while ( 0 ) 
-  
-#define Ring_buffer_Is_empty( _buffer ) \
-   ( (_buffer)->head == (_buffer)->tail )
-
-#define Ring_buffer_Is_full( _buffer ) \
-   ( (_buffer)->head == ((_buffer)->tail + 1) % RINGBUF_QUEUE_LENGTH )
-
-#define Ring_buffer_Add_character( _buffer, _ch ) \
-  do { \
-    rtems_unsigned32 isrlevel; \
-    \
-    rtems_interrupt_disable( isrlevel ); \
-      (_buffer)->tail = ((_buffer)->tail+1) % RINGBUF_QUEUE_LENGTH; \
-      (_buffer)->buffer[ (_buffer)->tail ] = (_ch); \
-    rtems_interrupt_enable( isrlevel ); \
-  } while ( 0 ) 
-
-#define Ring_buffer_Remove_character( _buffer, _ch ) \
-  do { \
-    rtems_unsigned32 isrlevel; \
-    \
-    rtems_interrupt_disable( isrlevel ); \
-      (_buffer)->head = ((_buffer)->head+1) % RINGBUF_QUEUE_LENGTH; \
-      (_ch) = (_buffer)->buffer[ (_buffer)->head ]; \
-    rtems_interrupt_enable( isrlevel ); \
-  } while ( 0 ) 
-
-#endif
diff --git a/c/src/exec/libcsupport/include/rtems/assoc.h b/c/src/exec/libcsupport/include/rtems/assoc.h
deleted file mode 100644
index 1982d654ac..0000000000
--- a/c/src/exec/libcsupport/include/rtems/assoc.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *
- *  Rtems associativity routines.  Mainly used to convert a value from
- *  one space to another (eg: our errno's to host errno's and v.v)
- *
- *
- *  $Id$
- */
-
-#ifndef _INCLUDE_ASSOC_H
-#define _INCLUDE_ASSOC_H
-
-typedef struct {
-    const char   *name;
-    unsigned32   local_value;
-    unsigned32   remote_value;
-} rtems_assoc_t;
-
-/*
- * Flag/marker for optional default value in each table
- */
-
-#define RTEMS_ASSOC_DEFAULT_NAME "(default)"
-
-const rtems_assoc_t *rtems_assoc_ptr_by_name(const rtems_assoc_t *, const char *);
-const rtems_assoc_t *rtems_assoc_ptr_by_value(const rtems_assoc_t *, unsigned32);
-const rtems_assoc_t *rtems_assoc_ptr_by_remote(const rtems_assoc_t *, unsigned32);
-
-unsigned32   rtems_assoc_remote_by_local(const rtems_assoc_t *, unsigned32);
-unsigned32   rtems_assoc_local_by_remote(const rtems_assoc_t *, unsigned32);
-unsigned32   rtems_assoc_remote_by_name(const rtems_assoc_t *, const char *);
-unsigned32   rtems_assoc_local_by_name(const rtems_assoc_t *, const char *);
-const char  *rtems_assoc_name_by_local(const rtems_assoc_t *, unsigned32);
-const char  *rtems_assoc_name_by_remote(const rtems_assoc_t *, unsigned32);
-
-unsigned32   rtems_assoc_remote_by_local_bitfield(const rtems_assoc_t *, unsigned32);
-char  *rtems_assoc_name_by_local_bitfield(const rtems_assoc_t *, unsigned32, char *);
-char  *rtems_assoc_name_by_remote_bitfield(const rtems_assoc_t *, unsigned32, char *);
-unsigned32   rtems_assoc_local_by_remote_bitfield(const rtems_assoc_t *, unsigned32);
-
-
-#endif /* ! _INCLUDE_ASSOC_H */
diff --git a/c/src/exec/libcsupport/include/rtems/error.h b/c/src/exec/libcsupport/include/rtems/error.h
deleted file mode 100644
index a0698afb5d..0000000000
--- a/c/src/exec/libcsupport/include/rtems/error.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- *  Defines and externs for rtems error reporting
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_ERROR_h
-#define __RTEMS_ERROR_h
-
-/*
- * rtems_error() and rtems_panic() support
- */
-
-#define RTEMS_ERROR_ERRNO  (1<<((sizeof(int) * 8) - 2)) /* hi bit; use 'errno' */
-#define RTEMS_ERROR_PANIC  (RTEMS_ERROR_ERRNO / 2)       /* err fatal; no return */
-#define RTEMS_ERROR_ABORT  (RTEMS_ERROR_ERRNO / 4)       /* err is fatal; panic */
-
-#define RTEMS_ERROR_MASK  (RTEMS_ERROR_ERRNO | RTEMS_ERROR_ABORT | \
-                             RTEMS_ERROR_PANIC) /* all */
-
-const char *rtems_status_text(rtems_status_code);
-int   rtems_error(int error_code, const char *printf_format, ...);
-#ifdef __GNUC__
-void  rtems_panic(const char *printf_format, ...);
-/*
- *  We should be able to use this attribute but gcc complains that
- *  rtems_panic does in fact return. :(
- *
- *      __attribute__ ((__noreturn__));
- */
-#else
-void  rtems_panic(const char *printf_format, ...);
-#endif
-
-extern int rtems_panic_in_progress;
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/libcsupport/include/rtems/libcsupport.h b/c/src/exec/libcsupport/include/rtems/libcsupport.h
deleted file mode 100644
index d007784526..0000000000
--- a/c/src/exec/libcsupport/include/rtems/libcsupport.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*  libcsupport.h
- *
- *  This include file contains the information regarding the
- *  RTEMS specific support for the standard C library.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __LIBC_SUPPORT_h
-#define __LIBC_SUPPORT_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <sys/types.h>
-
-void RTEMS_Malloc_Initialize(
-  void   *start,
-  size_t  length,
-  size_t  sbrk_amount
-);
-
-extern void malloc_dump(void);
-extern void malloc_walk(size_t source, size_t printf_enabled);
-extern void libc_init(int reentrant);
-extern int  host_errno(void);
-extern void fix_syscall_errno(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/libcsupport/include/rtems/libio.h b/c/src/exec/libcsupport/include/rtems/libio.h
deleted file mode 100644
index dcdda85aec..0000000000
--- a/c/src/exec/libcsupport/include/rtems/libio.h
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * General purpose communication channel for RTEMS to allow UNIX/POSIX
- *    system call behavior on top of RTEMS IO devices.
- *
- * TODO
- *      stat(2)
- *      unlink(2)
- *      rename(2)
- *
- *  $Id$
- */
-
-#ifndef _RTEMS_LIBIO_H
-#define _RTEMS_LIBIO_H
-
-#include <sys/stat.h>
-
-typedef unsigned32 rtems_libio_offset_t;
-
-/*
- * An open file data structure, indexed by 'fd'
- * TODO:
- *    should really have a separate per/file data structure that this
- *    points to (eg: size, offset, driver, pathname should be in that)
- */
-
-typedef struct {
-    rtems_driver_name_t *driver;
-    rtems_libio_offset_t size;          /* size of file */
-    rtems_libio_offset_t offset;        /* current offset into the file */
-    unsigned32           flags;
-    char                *pathname;      /* opened pathname */
-    Objects_Id           sem;
-    unsigned32           data0;         /* private to "driver" */
-    void                *data1;         /* ... */
-} rtems_libio_t;
-
-
-/*
- * param block for read/write
- * Note: it must include 'offset' instead of using iop's offset since
- *       we can have multiple outstanding i/o's on a device.
- */
-
-typedef struct {
-    rtems_libio_t          *iop;
-    rtems_libio_offset_t    offset;
-    unsigned8              *buffer;
-    unsigned32              count;
-    unsigned32              flags;
-    unsigned32              bytes_moved;
-} rtems_libio_rw_args_t;
-
-/*
- * param block for open/close
- */
-
-typedef struct {
-    rtems_libio_t          *iop;
-    unsigned32              flags;
-    unsigned32              mode;
-} rtems_libio_open_close_args_t;
-
-/*
- * param block for ioctl
- */
-
-typedef struct {
-    rtems_libio_t          *iop;
-    unsigned32              command;
-    void                   *buffer;
-    unsigned32              ioctl_return;
-} rtems_libio_ioctl_args_t;
-
-
-/*
- * Values for 'flag'
- */
-
-#define LIBIO_FLAGS_NO_DELAY      0x0001  /* return immediately if no data */
-#define LIBIO_FLAGS_READ          0x0002  /* reading */
-#define LIBIO_FLAGS_WRITE         0x0004  /* writing */
-#define LIBIO_FLAGS_LINE_BUFFERED 0x0008  /* line buffered io (^h, ^u, etc) */
-#define LIBIO_FLAGS_OPEN          0x0100  /* device is open */
-#define LIBIO_FLAGS_APPEND        0x0200  /* all writes append */
-#define LIBIO_FLAGS_CREATE        0x0400  /* create file */
-
-#define LIBIO_FLAGS_READ_WRITE    (LIBIO_FLAGS_READ | LIBIO_FLAGS_WRITE)
-
-void rtems_libio_init(void);
-
-int __rtems_open(const char  *pathname, unsigned32 flag, unsigned32 mode);
-int __rtems_close(int  fd);
-int __rtems_read(int fd, void *buffer, unsigned32 count);
-int __rtems_write(int fd, const void *buffer, unsigned32 count);
-int __rtems_ioctl(int fd, unsigned32  command, void *buffer);
-int __rtems_lseek(int fd, rtems_libio_offset_t offset, int whence);
-int __rtems_fstat(int _fd, struct stat* _sbuf);
-
-/*
- * External I/O handlers
- */
-typedef struct {
-    int (*open)(const char  *pathname, unsigned32 flag, unsigned32 mode);
-    int (*close)(int  fd);
-    int (*read)(int fd, void *buffer, unsigned32 count);
-    int (*write)(int fd, const void *buffer, unsigned32 count);
-    int (*ioctl)(int fd, unsigned32  command, void *buffer);
-    int (*lseek)(int fd, rtems_libio_offset_t offset, int whence);
-} rtems_libio_handler_t;
-
-void rtems_register_libio_handler(int handler_flag,
-                                 const rtems_libio_handler_t *handler);
-
-#define RTEMS_FILE_DESCRIPTOR_TYPE_FILE         0x0000
-#define RTEMS_FILE_DESCRIPTOR_TYPE_SOCKET       0x1000
-#define rtems_make_file_descriptor(fd,flags)    ((fd)|(flags))
-#define rtems_file_descriptor_base(fd)          ((fd) & 0x0FFF)
-#define rtems_file_descriptor_type(fd)          ((fd) & 0xF000)
-#define rtems_file_descriptor_type_index(fd)    ((((fd) & 0xF000) >> 12) - 1)
-
-/*
- *  IOCTL values
- */
-
-#define       RTEMS_IO_GET_ATTRIBUTES 1
-#define       RTEMS_IO_SET_ATTRIBUTES 2
-#define       RTEMS_IO_TCDRAIN        3
-
-/*
- * Callbacks from TERMIOS routines to device-dependent code
- */
-#include <termios.h>
-typedef struct rtems_termios_callbacks {
-  int       (*firstOpen)(int major, int minor, void *arg);
-  int       (*lastClose)(int major, int minor, void *arg);
-  int       (*pollRead)(int minor);
-  int       (*write)(int minor, const char *buf, int len);
-  int       (*setAttributes)(int minor, const struct termios *t);
-  int       (*stopRemoteTx)(int minor);
-  int       (*startRemoteTx)(int minor);
-  int       outputUsesInterrupts;
-} rtems_termios_callbacks;
-
-/*
- * Device-independent TERMIOS routines
- */
-void rtems_termios_initialize (void);
-rtems_status_code rtems_termios_open (
-  rtems_device_major_number      major,
-  rtems_device_minor_number      minor,
-  void                          *arg,
-  const rtems_termios_callbacks *callbacks
-  );
-rtems_status_code rtems_termios_close (void *arg);
-rtems_status_code rtems_termios_read (void *arg);
-rtems_status_code rtems_termios_write (void *arg);
-rtems_status_code rtems_termios_ioctl (void *arg);
-int rtems_termios_enqueue_raw_characters (void *ttyp, char *buf, int len);
-int rtems_termios_dequeue_characters (void *ttyp, int len);
-void rtems_termios_reserve_resources(
-  rtems_configuration_table *configuration,
-  rtems_unsigned32           number_of_devices
-);
-
-#endif /* _RTEMS_LIBIO_H */
diff --git a/c/src/exec/libcsupport/include/spurious.h b/c/src/exec/libcsupport/include/spurious.h
deleted file mode 100644
index 36fcaba904..0000000000
--- a/c/src/exec/libcsupport/include/spurious.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*  spurious.h
- *
- *  This file describes the Spurious Interrupt Driver for all boards.
- *
- *  COPYRIGHT (c) 1989, 1990, 1991, 1992, 1993.
- *  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.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __SPURIOUS_h
-#define __SPURIOUS_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define SPURIOUS_DRIVER_TABLE_ENTRY \
-  { Spurious_Initialize, NULL, NULL, NULL, NULL, NULL }
-
-rtems_device_driver Spurious_Initialize(
-  rtems_device_major_number,
-  rtems_device_minor_number,
-  void *,
-  rtems_id,
-  rtems_unsigned32 *
-);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/libcsupport/include/sys/filio.h b/c/src/exec/libcsupport/include/sys/filio.h
deleted file mode 100644
index b82a649c0f..0000000000
--- a/c/src/exec/libcsupport/include/sys/filio.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)filio.h	8.1 (Berkeley) 3/28/94
- * $Id$
- */
-
-#ifndef	_SYS_FILIO_H_
-#define	_SYS_FILIO_H_
-
-#include <sys/ioccom.h>
-
-/* Generic file-descriptor ioctl's. */
-#define	FIOCLEX		 _IO('f', 1)		/* set close on exec on fd */
-#define	FIONCLEX	 _IO('f', 2)		/* remove close on exec */
-#define	FIONREAD	_IOR('f', 127, int)	/* get # bytes to read */
-#define	FIONBIO		_IOW('f', 126, int)	/* set/clear non-blocking i/o */
-#define	FIOASYNC	_IOW('f', 125, int)	/* set/clear async i/o */
-#define	FIOSETOWN	_IOW('f', 124, int)	/* set owner */
-#define	FIOGETOWN	_IOR('f', 123, int)	/* get owner */
-
-#endif /* !_SYS_FILIO_H_ */
diff --git a/c/src/exec/libcsupport/include/sys/ioctl.h b/c/src/exec/libcsupport/include/sys/ioctl.h
deleted file mode 100644
index e3a69a5a7f..0000000000
--- a/c/src/exec/libcsupport/include/sys/ioctl.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)ioctl.h	8.6 (Berkeley) 3/28/94
- * $Id$
- */
-
-#ifndef	_SYS_IOCTL_H_
-#define	_SYS_IOCTL_H_
-
-#include <sys/ttycom.h>
-
-/*
- * Pun for SunOS prior to 3.2.  SunOS 3.2 and later support TIOCGWINSZ
- * and TIOCSWINSZ (yes, even 3.2-3.5, the fact that it wasn't documented
- * notwithstanding).
- */
-struct ttysize {
-	unsigned short	ts_lines;
-	unsigned short	ts_cols;
-	unsigned short	ts_xxx;
-	unsigned short	ts_yyy;
-};
-#define	TIOCGSIZE	TIOCGWINSZ
-#define	TIOCSSIZE	TIOCSWINSZ
-
-#include <sys/ioccom.h>
-
-#include <sys/filio.h>
-#include <sys/sockio.h>
-
-#endif /* !_SYS_IOCTL_H_ */
-
-/*
- * Keep outside _SYS_IOCTL_H_
- * Compatibility with old terminal driver
- *
- * Source level -> #define USE_OLD_TTY
- * Kernel level -> options COMPAT_43 or COMPAT_SUNOS
- */
-#if defined(USE_OLD_TTY) || defined(COMPAT_43) || defined(COMPAT_SUNOS)
-#include <sys/ioctl_compat.h>
-#endif
diff --git a/c/src/exec/libcsupport/include/sys/sockio.h b/c/src/exec/libcsupport/include/sys/sockio.h
deleted file mode 100644
index 020061170f..0000000000
--- a/c/src/exec/libcsupport/include/sys/sockio.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)sockio.h	8.1 (Berkeley) 3/28/94
- * $Id$
- */
-
-#ifndef	_SYS_SOCKIO_H_
-#define	_SYS_SOCKIO_H_
-
-#include <sys/ioccom.h>
-
-/* Socket ioctl's. */
-#define	SIOCSHIWAT	 _IOW('s',  0, int)		/* set high watermark */
-#define	SIOCGHIWAT	 _IOR('s',  1, int)		/* get high watermark */
-#define	SIOCSLOWAT	 _IOW('s',  2, int)		/* set low watermark */
-#define	SIOCGLOWAT	 _IOR('s',  3, int)		/* get low watermark */
-#define	SIOCATMARK	 _IOR('s',  7, int)		/* at oob mark? */
-#define	SIOCSPGRP	 _IOW('s',  8, int)		/* set process group */
-#define	SIOCGPGRP	 _IOR('s',  9, int)		/* get process group */
-
-#define	SIOCADDRT	 _IOW('r', 10, struct ortentry)	/* add route */
-#define	SIOCDELRT	 _IOW('r', 11, struct ortentry)	/* delete route */
-#define	SIOCGETVIFCNT	_IOWR('r', 15, struct sioc_vif_req)/* get vif pkt cnt */
-#define	SIOCGETSGCNT	_IOWR('r', 16, struct sioc_sg_req) /* get s,g pkt cnt */
-
-#define	SIOCSIFADDR	 _IOW('i', 12, struct ifreq)	/* set ifnet address */
-#define	OSIOCGIFADDR	_IOWR('i', 13, struct ifreq)	/* get ifnet address */
-#define	SIOCGIFADDR	_IOWR('i', 33, struct ifreq)	/* get ifnet address */
-#define	SIOCSIFDSTADDR	 _IOW('i', 14, struct ifreq)	/* set p-p address */
-#define	OSIOCGIFDSTADDR	_IOWR('i', 15, struct ifreq)	/* get p-p address */
-#define	SIOCGIFDSTADDR	_IOWR('i', 34, struct ifreq)	/* get p-p address */
-#define	SIOCSIFFLAGS	 _IOW('i', 16, struct ifreq)	/* set ifnet flags */
-#define	SIOCGIFFLAGS	_IOWR('i', 17, struct ifreq)	/* get ifnet flags */
-#define	OSIOCGIFBRDADDR	_IOWR('i', 18, struct ifreq)	/* get broadcast addr */
-#define	SIOCGIFBRDADDR	_IOWR('i', 35, struct ifreq)	/* get broadcast addr */
-#define	SIOCSIFBRDADDR	 _IOW('i', 19, struct ifreq)	/* set broadcast addr */
-#define	OSIOCGIFCONF	_IOWR('i', 20, struct ifconf)	/* get ifnet list */
-#define	SIOCGIFCONF	_IOWR('i', 36, struct ifconf)	/* get ifnet list */
-#define	OSIOCGIFNETMASK	_IOWR('i', 21, struct ifreq)	/* get net addr mask */
-#define	SIOCGIFNETMASK	_IOWR('i', 37, struct ifreq)	/* get net addr mask */
-#define	SIOCSIFNETMASK	 _IOW('i', 22, struct ifreq)	/* set net addr mask */
-#define	SIOCGIFMETRIC	_IOWR('i', 23, struct ifreq)	/* get IF metric */
-#define	SIOCSIFMETRIC	 _IOW('i', 24, struct ifreq)	/* set IF metric */
-#define	SIOCDIFADDR	 _IOW('i', 25, struct ifreq)	/* delete IF addr */
-#define	SIOCAIFADDR	 _IOW('i', 26, struct ifaliasreq)/* add/chg IF alias */
-
-#define	SIOCADDMULTI	 _IOW('i', 49, struct ifreq)	/* add m'cast addr */
-#define	SIOCDELMULTI	 _IOW('i', 50, struct ifreq)	/* del m'cast addr */
-#define	SIOCGIFMTU	_IOWR('i', 51, struct ifreq)	/* get IF mtu */
-#define	SIOCSIFMTU	 _IOW('i', 52, struct ifreq)	/* set IF mtu */
-#define	SIOCGIFPHYS	_IOWR('i', 53, struct ifreq)	/* get IF wire */
-#define	SIOCSIFPHYS	 _IOW('i', 54, struct ifreq)	/* set IF wire */
-#define	SIOCSIFMEDIA	_IOWR('i', 55, struct ifreq)	/* set net media */
-#define	SIOCGIFMEDIA	_IOWR('i', 56, struct ifmediareq) /* get net media */
-
-#endif /* !_SYS_SOCKIO_H_ */
diff --git a/c/src/exec/libcsupport/include/sys/termios.h b/c/src/exec/libcsupport/include/sys/termios.h
deleted file mode 100644
index 1112ec4f5e..0000000000
--- a/c/src/exec/libcsupport/include/sys/termios.h
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- *  POSIX termios implementation for RTEMS console device driver.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef	TERMIOS_H
-#define	TERMIOS_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef unsigned char	cc_t;
-typedef unsigned int	speed_t;
-typedef unsigned int	tcflag_t;
-
-#define NCCS 19
-struct termios {
-	tcflag_t c_iflag;		/* input mode flags */
-	tcflag_t c_oflag;		/* output mode flags */
-	tcflag_t c_cflag;		/* control mode flags */
-	tcflag_t c_lflag;		/* local mode flags */
-	cc_t c_line;			/* line discipline */
-	cc_t c_cc[NCCS];		/* control characters */
-};
-
-/* c_cc characters */
-#define VINTR 0
-#define VQUIT 1
-#define VERASE 2
-#define VKILL 3
-#define VEOF 4
-#define VTIME 5
-#define VMIN 6
-#define VSWTC 7
-#define VSTART 8
-#define VSTOP 9
-#define VSUSP 10
-#define VEOL 11
-#define VREPRINT 12
-#define VDISCARD 13
-#define VWERASE 14
-#define VLNEXT 15
-#define VEOL2 16
-
-/* c_iflag bits */
-#define IGNBRK	0000001
-#define BRKINT	0000002
-#define IGNPAR	0000004
-#define PARMRK	0000010
-#define INPCK	0000020
-#define ISTRIP	0000040
-#define INLCR	0000100
-#define IGNCR	0000200
-#define ICRNL	0000400
-#define IUCLC	0001000
-#define IXON	0002000
-#define IXANY	0004000
-#define IXOFF	0010000
-#define IMAXBEL	0020000
-
-/* c_oflag bits */
-#define OPOST	0000001
-#define OLCUC	0000002
-#define ONLCR	0000004
-#define OCRNL	0000010
-#define ONOCR	0000020
-#define ONLRET	0000040
-#define OFILL	0000100
-#define OFDEL	0000200
-#define NLDLY	0000400
-#define   NL0	0000000
-#define   NL1	0000400
-#define CRDLY	0003000
-#define   CR0	0000000
-#define   CR1	0001000
-#define   CR2	0002000
-#define   CR3	0003000
-#define TABDLY	0014000
-#define   TAB0	0000000
-#define   TAB1	0004000
-#define   TAB2	0010000
-#define   TAB3	0014000
-#define   XTABS	0014000
-#define BSDLY	0020000
-#define   BS0	0000000
-#define   BS1	0020000
-#define VTDLY	0040000
-#define   VT0	0000000
-#define   VT1	0040000
-#define FFDLY	0100000
-#define   FF0	0000000
-#define   FF1	0100000
-
-/* c_cflag bit meaning */
-#define CBAUD	0010017
-#define  B0	0000000		/* hang up */
-#define  B50	0000001
-#define  B75	0000002
-#define  B110	0000003
-#define  B134	0000004
-#define  B150	0000005
-#define  B200	0000006
-#define  B300	0000007
-#define  B600	0000010
-#define  B1200	0000011
-#define  B1800	0000012
-#define  B2400	0000013
-#define  B4800	0000014
-#define  B9600	0000015
-#define  B19200	0000016
-#define  B38400	0000017
-#define EXTA B19200
-#define EXTB B38400
-#define CSIZE	0000060
-#define   CS5	0000000
-#define   CS6	0000020
-#define   CS7	0000040
-#define   CS8	0000060
-#define CSTOPB	0000100
-#define CREAD	0000200
-#define PARENB	0000400
-#define PARODD	0001000
-#define HUPCL	0002000
-#define CLOCAL	0004000
-#define CBAUDEX 0010000
-#define  B57600  0010001
-#define  B115200 0010002
-#define  B230400 0010003
-#define  B460800 0010004
-#define CIBAUD	  002003600000	/* input baud rate (not used) */
-#define CRTSCTS	  020000000000		/* flow control */
-
-/* c_lflag bits */
-#define ISIG	0000001
-#define ICANON	0000002
-#define XCASE	0000004
-#define ECHO	0000010
-#define ECHOE	0000020
-#define ECHOK	0000040
-#define ECHONL	0000100
-#define NOFLSH	0000200
-#define TOSTOP	0000400
-#define ECHOCTL	0001000
-#define ECHOPRT	0002000
-#define ECHOKE	0004000
-#define FLUSHO	0010000
-#define PENDIN	0040000
-#define IEXTEN	0100000
-
-/* tcflow() and TCXONC use these */
-#define	TCOOFF		0
-#define	TCOON		1
-#define	TCIOFF		2
-#define	TCION		3
-
-/* tcflush() and TCFLSH use these */
-#define	TCIFLUSH	0
-#define	TCOFLUSH	1
-#define	TCIOFLUSH	2
-
-/* tcsetattr uses these */
-#define	TCSANOW		0
-#define	TCSADRAIN	1
-#define	TCSAFLUSH	2
-
-int	tcgetattr(int, struct termios *);
-int	tcsetattr(int, int, struct termios *);
-int	tcdrain(int);
-speed_t	cfgetospeed(const struct termios *tp);
-int	cfsetospeed(struct termios *tp, speed_t speed);
-speed_t	cfgetispeed(const struct termios *tp);
-int	cfsetispeed(struct termios *tp, speed_t speed);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif	/* TERMIOS_H */
diff --git a/c/src/exec/libcsupport/include/sys/utsname.h b/c/src/exec/libcsupport/include/sys/utsname.h
deleted file mode 100644
index ca15230d40..0000000000
--- a/c/src/exec/libcsupport/include/sys/utsname.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*  sys/utsname.h 
- *
- *  $Id$
- */
-
-#ifndef __POSIX_SYS_UTSNAME_h
-#define __POSIX_SYS_UTSNAME_h
-
-#include <sys/times.h>
-#include <sys/types.h>
-
-/*
- *  4.4.1 Get System Name (Table 4-1), P1003.1b-1993, p. 90
- *
- *  NOTE:  The lengths of the strings in this structure are 
- *         just long enough to reliably contain the RTEMS information.
- *         For example, the fields are not long enough to support 
- *         Internet hostnames.
- */
-
-struct utsname {
-  char sysname[ 32 ];  /* Name of this implementation of the operating system */
-  char nodename[ 32 ]; /* Name of this node within an implementation */
-                       /*   specified communication network */
-  char release[ 32 ];  /* Current release level of this implementation */
-  char version[ 32 ];  /* Current version level of this release */
-  char machine[ 32 ];  /* Name of the hardware type on which the system */
-                       /*   is running */
-};
-
-/*
- *  4.4.1 Get System Name, P1003.1b-1993, p. 90
- */
-
-int uname(
-  struct utsname *name
-);
-
-/*
- *  4.5.2 Get Process Times, P1003.1b-1993, p. 92
- */
-
-clock_t times(
-  struct tms   *buffer
-);
-
-#endif
-/* end of include file */
-
diff --git a/c/src/exec/libcsupport/include/timerdrv.h b/c/src/exec/libcsupport/include/timerdrv.h
deleted file mode 100644
index ed1ce2b9a2..0000000000
--- a/c/src/exec/libcsupport/include/timerdrv.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*  timerdrv.h
- *
- *  This file describes the Timer Driver for all boards.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __TIMER_DRIVER_h
-#define __TIMER_DRIVER_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* functions */
-
-void Timer_initialize( void );
-
-rtems_unsigned32 Read_timer( void );
-
-rtems_status_code Empty_function( void );
-
-void Set_find_average_overhead(
-  rtems_boolean find_flag
-);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/libcsupport/include/vmeintr.h b/c/src/exec/libcsupport/include/vmeintr.h
deleted file mode 100644
index 6593ba12a5..0000000000
--- a/c/src/exec/libcsupport/include/vmeintr.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- *  vmeintr.h
- *
- *  This file is the specification for the VMEbus interface library
- *  which should be provided by all BSPs for VMEbus Single Board
- *  Computers but currently only a few do so.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __VME_INTERRUPT_h
-#define __VME_INTERRUPT_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- *  This defines the mask which is used to determine which
- *  interrupt levels are affected by a call to this package.
- *  The LSB corresponds to VME interrupt 0 and the MSB
- *  to VME interrupt 7.
- *
- */
-
-typedef rtems_unsigned8 VME_interrupt_Mask;
-
-/*
- *  VME_interrupt_Disable
- *
- */
-
-void VME_interrupt_Disable (
-  VME_interrupt_Mask                mask                        /* IN  */
-);
-
-/*
- *  VME_interrupt_Disable
- *
- */
-
-void VME_interrupt_Enable (
-  VME_interrupt_Mask                mask                        /* IN  */
-);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* end of include file */
diff --git a/c/src/exec/libcsupport/include/zilog/z8036.h b/c/src/exec/libcsupport/include/zilog/z8036.h
deleted file mode 100644
index 1c53c8afac..0000000000
--- a/c/src/exec/libcsupport/include/zilog/z8036.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/*  z8036.h
- *
- *  This include file defines information related to a Zilog Z8036
- *  Counter/Timer/IO Chip.  It is a memory mapped part.
- *
- *  Input parameters:  NONE
- *
- *  Output parameters:  NONE
- *
- *  NOTE: This file shares as much as possible with the include
- *        file for the Z8536 via z8x36.h.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __Z8036_h
-#define __Z8036_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* macros */
-
-#define Z8036( ptr ) ((volatile struct z8036_map *)(ptr))
-
-#define Z8x36_STATE0 ( z8036 ) \
-  { /*char *garbage = *(Z8036(z8036))->???; */ }
-
-
-#define Z8x36_WRITE( z8036, reg, data ) \
-   (Z8036(z8036))->reg = (data)
-
-
-#define Z8x36_READ( z8036, reg, data ) \
-   (Z8036(z8036))->reg = (data)
-
-/* structures */
-
-struct z8036_map {
-/* MAIN CONTROL REGISTERS (0x00-0x07) */
-  rtems_unsigned8 MASTER_INTR;           /* Master Interrupt Ctl Reg */
-  rtems_unsigned8 MASTER_CFG;            /* Master Configuration Ctl Reg */
-  rtems_unsigned8 PORTA_VECTOR;          /* Port A - Interrupt Vector */
-  rtems_unsigned8 PORTB_VECTOR;          /* Port B - Interrupt Vector */
-  rtems_unsigned8 CNT_TMR_VECTOR;        /* Counter/Timer Interrupt Vector */
-  rtems_unsigned8 PORTC_DATA_POLARITY;   /* Port C - Data Path Polarity */
-  rtems_unsigned8 PORTC_DIRECTION;       /* Port C - Data Direction */
-  rtems_unsigned8 PORTC_SPECIAL_IO_CTL;  /* Port C - Special IO Control */
-/* MOST OFTEN ACCESSED REGISTERS (0x08 - 0x0f) */
-  rtems_unsigned8 PORTA_CMD_STATUS;      /* Port A - Command Status Reg */
-  rtems_unsigned8 PORTB_CMD_STATUS;      /* Port B - Command Status Reg */
-  rtems_unsigned8 CT1_CMD_STATUS;        /* Ctr/Timer 1 - Command Status Reg */
-  rtems_unsigned8 CT2_CMD_STATUS;        /* Ctr/Timer 2 - Command Status Reg */
-  rtems_unsigned8 CT3_CMD_STATUS;        /* Ctr/Timer 3 - Command Status Reg */
-  rtems_unsigned8 PORTA_DATA;            /* Port A - Data */
-  rtems_unsigned8 PORTB_DATA;            /* Port B - Data */
-  rtems_unsigned8 PORTC_DATA;            /* Port C - Data */
-/* COUNTER/TIMER RELATED REGISTERS (0x10-0x1f) */
-  rtems_unsigned8 CT1_CUR_CNT_MSB;       /* Ctr/Timer 1 - Current Count (MSB) */
-  rtems_unsigned8 CT1_CUR_CNT_LSB;       /* Ctr/Timer 1 - Current Count (LSB) */
-  rtems_unsigned8 CT2_CUR_CNT_MSB;       /* Ctr/Timer 2 - Current Count (MSB) */
-  rtems_unsigned8 CT2_CUR_CNT_LSB;       /* Ctr/Timer 2 - Current Count (LSB) */
-  rtems_unsigned8 CT3_CUR_CNT_MSB;       /* Ctr/Timer 3 - Current Count (MSB) */
-  rtems_unsigned8 CT3_CUR_CNT_LSB;       /* Ctr/Timer 3 - Current Count (LSB) */
-  rtems_unsigned8 CT1_TIME_CONST_MSB;    /* Ctr/Timer 1 - Time Constant (MSB) */
-  rtems_unsigned8 CT1_TIME_CONST_LSB;    /* Ctr/Timer 1 - Time Constant (LSB) */
-  rtems_unsigned8 CT2_TIME_CONST_MSB;    /* Ctr/Timer 2 - Time Constant (MSB) */
-  rtems_unsigned8 CT2_TIME_CONST_LSB;    /* Ctr/Timer 2 - Time Constant (LSB) */
-  rtems_unsigned8 CT3_TIME_CONST_MSB;    /* Ctr/Timer 3 - Time Constant (MSB) */
-  rtems_unsigned8 CT3_TIME_CONST_LSB;    /* Ctr/Timer 3 - Time Constant (LSB) */
-  rtems_unsigned8 CT1_MODE_SPEC;         /* Ctr/Timer 1 - Mode Specification  */
-  rtems_unsigned8 CT2_MODE_SPEC;         /* Ctr/Timer 2 - Mode Specification  */
-  rtems_unsigned8 CT3_MODE_SPEC;         /* Ctr/Timer 3 - Mode Specification  */
-  rtems_unsigned8 CURRENT_VECTOR;        /* Current Vector */
-/* PORT A SPECIFICATION REGISTERS (0x20 -0x27) */
-  rtems_unsigned8 PORTA_MODE;            /* Port A - Mode Specification  */
-  rtems_unsigned8 PORTA_HANDSHAKE;       /* Port A - Handshake Specification  */
-  rtems_unsigned8 PORTA_DATA_POLARITY;   /* Port A - Data Path Polarity */
-  rtems_unsigned8 PORTA_DIRECTION;       /* Port A - Data Direction */
-  rtems_unsigned8 PORTA_SPECIAL_IO_CTL;  /* Port A - Special IO Control */
-  rtems_unsigned8 PORTA_PATT_POLARITY;   /* Port A - Pattern Polarity */
-  rtems_unsigned8 PORTA_PATT_TRANS;      /* Port A - Pattern Transition */
-  rtems_unsigned8 PORTA_PATT_MASK;       /* Port A - Pattern Mask */
-/* PORT B SPECIFICATION REGISTERS (0x28-0x2f) */
-  rtems_unsigned8 PORTB_MODE;            /* Port B - Mode Specification  */
-  rtems_unsigned8 PORTB_HANDSHAKE;       /* Port B - Handshake Specification  */
-  rtems_unsigned8 PORTB_DATA_POLARITY;   /* Port B - Data Path Polarity */
-  rtems_unsigned8 PORTB_DIRECTION;       /* Port B - Data Direction */
-  rtems_unsigned8 PORTB_SPECIAL_IO_CTL;  /* Port B - Special IO Control */
-  rtems_unsigned8 PORTB_PATT_POLARITY;   /* Port B - Pattern Polarity */
-  rtems_unsigned8 PORTB_PATT_TRANS;      /* Port B - Pattern Transition */
-  rtems_unsigned8 PORTB_PATT_MASK;       /* Port B - Pattern Mask */
-};
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
diff --git a/c/src/exec/libcsupport/include/zilog/z8530.h b/c/src/exec/libcsupport/include/zilog/z8530.h
deleted file mode 100644
index 60a3e3b771..0000000000
--- a/c/src/exec/libcsupport/include/zilog/z8530.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/*  z8530.h
- *
- *  This include file defines information related to a Zilog Z8530
- *  SCC Chip.  It is a IO mapped part.
- *
- *  Input parameters:   NONE
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __Z8530_h
-#define __Z8530_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* macros */
-
-#define VOL8( ptr )   ((volatile rtems_unsigned8 *)(ptr))
-
-#define Z8x30_STATE0 ( z8530 ) \
-  { char *garbage; \
-    (garbage) = *(VOL8(z8530)) \
-  }
-
-#define Z8x30_WRITE_CONTROL( z8530, reg, data ) \
-   *(VOL8(z8530)) = (reg); \
-   *(VOL8(z8530)) = (data)
-
-#define Z8x30_READ_CONTROL( z8530, reg, data ) \
-   *(VOL8(z8530)) = (reg); \
-   (data) = *(VOL8(z8530))
-
-#define Z8x30_WRITE_DATA( z8530, data ) \
-   *(VOL8(z8530)) = (data);
-
-#define Z8x30_READ_DATA( z8530, data ) \
-   (data) = *(VOL8(z8530));
-
-
-/* RR_0 Bit Definitions */
-
-#define RR_0_TX_BUFFER_EMPTY   0x04
-#define RR_0_RX_DATA_AVAILABLE 0x01
-
-/* read registers */
-
-#define RR_0       0x00
-#define RR_1       0x01
-#define RR_2       0x02
-#define RR_3       0x03
-#define RR_4       0x04
-#define RR_5       0x05
-#define RR_6       0x06
-#define RR_7       0x07
-#define RR_8       0x08
-#define RR_9       0x09
-#define RR_10      0x0A
-#define RR_11      0x0B
-#define RR_12      0x0C
-#define RR_13      0x0D
-#define RR_14      0x0E
-#define RR_15      0x0F
-
-/* write registers */
-
-#define WR_0       0x00
-#define WR_1       0x01
-#define WR_2       0x02
-#define WR_3       0x03
-#define WR_4       0x04
-#define WR_5       0x05
-#define WR_6       0x06
-#define WR_7       0x07
-#define WR_8       0x08
-#define WR_9       0x09
-#define WR_10      0x0A
-#define WR_11      0x0B
-#define WR_12      0x0C
-#define WR_13      0x0D
-#define WR_14      0x0E
-#define WR_15      0x0F
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/c/src/exec/libcsupport/include/zilog/z8536.h b/c/src/exec/libcsupport/include/zilog/z8536.h
deleted file mode 100644
index 0f0b5641e7..0000000000
--- a/c/src/exec/libcsupport/include/zilog/z8536.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/*  z8536.h
- *
- *  This include file defines information related to a Zilog Z8536
- *  Counter/Timer/IO Chip.  It is a IO mapped part.
- *
- *  Input parameters:   NONE
- *
- *  Output parameters:  NONE
- *
- *  NOTE: This file shares as much as possible with the include
- *        file for the Z8036 via z8x36.h.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __Z8536_h
-#define __Z8536_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* macros */
-
-#define VOL8( ptr )   ((volatile rtems_unsigned8 *)(ptr))
-
-#define Z8x36_STATE0 ( z8536 ) \
-  { char *garbage; \
-    (garbage) = *(VOL8(z8536+0xC)) \
-  }
-
-#define Z8x36_WRITE( z8536, reg, data ) \
-   *(VOL8(z8536+0xC)) = (reg); \
-   *(VOL8(z8536+0xC)) = (data)
-
-#define Z8x36_READ( z8536, reg, data ) \
-   *(VOL8(z8536+0xC)) = (reg); \
-   (data) = *(VOL8(z8536+0xC))
-
-/* structures */
-
-/* MAIN CONTROL REGISTERS (0x00-0x07) */
-#define MASTER_INTR           0x00   /* Master Interrupt Ctl Reg */
-#define MASTER_CFG            0x01   /* Master Configuration Ctl Reg */
-#define PORTA_VECTOR          0x02   /* Port A - Interrupt Vector */
-#define PORTB_VECTOR          0x03   /* Port B - Interrupt Vector */
-#define CNT_TMR_VECTOR        0x04   /* Counter/Timer Interrupt Vector */
-#define PORTC_DATA_POLARITY   0x05   /* Port C - Data Path Polarity */
-#define PORTC_DIRECTION       0x06   /* Port C - Data Direction */
-#define PORTC_SPECIAL_IO_CTL  0x07   /* Port C - Special IO Control */
-
-/* MOST OFTEN ACCESSED REGISTERS (0x08 - 0x0f) */
-#define PORTA_CMD_STATUS      0x08   /* Port A - Command Status Reg */
-#define PORTB_CMD_STATUS      0x09   /* Port B - Command Status Reg */
-#define CT1_CMD_STATUS        0x0a   /* Ctr/Timer 1 - Command Status Reg */
-#define CT2_CMD_STATUS        0x0b   /* Ctr/Timer 2 - Command Status Reg */
-#define CT3_CMD_STATUS        0x0c   /* Ctr/Timer 3 - Command Status Reg */
-#define PORTA_DATA            0x0d   /* Port A - Data */
-#define PORTB_DATA            0x0e   /* Port B - Data */
-#define PORTC_DATA            0x0f   /* Port C - Data */
-
-/* COUNTER/TIMER RELATED REGISTERS (0x10-0x1f) */
-#define CT1_CUR_CNT_MSB       0x10   /* Ctr/Timer 1 - Current Count (MSB) */
-#define CT1_CUR_CNT_LSB       0x11   /* Ctr/Timer 1 - Current Count (LSB) */
-#define CT2_CUR_CNT_MSB       0x12   /* Ctr/Timer 2 - Current Count (MSB) */
-#define CT2_CUR_CNT_LSB       0x13   /* Ctr/Timer 2 - Current Count (LSB) */
-#define CT3_CUR_CNT_MSB       0x14   /* Ctr/Timer 3 - Current Count (MSB) */
-#define CT3_CUR_CNT_LSB       0x15   /* Ctr/Timer 3 - Current Count (LSB) */
-#define CT1_TIME_CONST_MSB    0x16   /* Ctr/Timer 1 - Time Constant (MSB) */
-#define CT1_TIME_CONST_LSB    0x17   /* Ctr/Timer 1 - Time Constant (LSB) */
-#define CT2_TIME_CONST_MSB    0x18   /* Ctr/Timer 2 - Time Constant (MSB) */
-#define CT2_TIME_CONST_LSB    0x19   /* Ctr/Timer 2 - Time Constant (LSB) */
-#define CT3_TIME_CONST_MSB    0x1a   /* Ctr/Timer 3 - Time Constant (MSB) */
-#define CT3_TIME_CONST_LSB    0x1b   /* Ctr/Timer 3 - Time Constant (LSB) */
-#define CT1_MODE_SPEC         0x1c   /* Ctr/Timer 1 - Mode Specification  */
-#define CT2_MODE_SPEC         0x1d   /* Ctr/Timer 2 - Mode Specification  */
-#define CT3_MODE_SPEC         0x1e   /* Ctr/Timer 3 - Mode Specification  */
-#define CURRENT_VECTOR        0x1f   /* Current Vector */
-
-/* PORT A SPECIFICATION REGISTERS (0x20 -0x27) */
-#define PORTA_MODE            0x20   /* Port A - Mode Specification  */
-#define PORTA_HANDSHAKE       0x21   /* Port A - Handshake Specification  */
-#define PORTA_DATA_POLARITY   0x22   /* Port A - Data Path Polarity */
-#define PORTA_DIRECTION       0x23   /* Port A - Data Direction */
-#define PORTA_SPECIAL_IO_CTL  0x24   /* Port A - Special IO Control */
-#define PORTA_PATT_POLARITY   0x25   /* Port A - Pattern Polarity */
-#define PORTA_PATT_TRANS      0x26   /* Port A - Pattern Transition */
-#define PORTA_PATT_MASK       0x27   /* Port A - Pattern Mask */
-
-/* PORT B SPECIFICATION REGISTERS (0x28-0x2f) */
-#define PORTB_MODE            0x28   /* Port B - Mode Specification  */
-#define PORTB_HANDSHAKE       0x29   /* Port B - Handshake Specification  */
-#define PORTB_DATA_POLARITY   0x2a   /* Port B - Data Path Polarity */
-#define PORTB_DIRECTION       0x2b   /* Port B - Data Direction */
-#define PORTB_SPECIAL_IO_CTL  0x2c   /* Port B - Special IO Control */
-#define PORTB_PATT_POLARITY   0x2d   /* Port B - Pattern Polarity */
-#define PORTB_PATT_TRANS      0x2e   /* Port B - Pattern Transition */
-#define PORTB_PATT_MASK       0x2f   /* Port B - Pattern Mask */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/c/src/exec/libcsupport/src/README b/c/src/exec/libcsupport/src/README
deleted file mode 100644
index ee7a90501e..0000000000
--- a/c/src/exec/libcsupport/src/README
+++ /dev/null
@@ -1,37 +0,0 @@
---
---  $Id$
---
-
-Overview of newlib support (newlib is from CYGNUS)
-    Each task can have its own libc state including:
-        open stdio files
-        strtok
-        multi precision arithmetic state
-        etc.
-
-    This is implemented by a reentrancy data structure for each task.
-
-    When a task is "started" (in RTEMS sense) the reentrancy structure
-    is allocated.  Its address is stored in notepad[NOTEPAD_LAST].
-
-    When task is switched to, the value of global variable _impure_ptr
-    is changed to the value of the new tasks reentrancy structure.
-
-    When a task is deleted
-        atexit() processing (for that task) happens
-        task's stdio buffers are flushed
-
-    When exit(3) is called
-        calling task's atexit processing done
-        global libc state atexit processing done
-            (this will include any atexit routines installed by drivers)
-        executive is shutdown
-            causes a context switch back to bsp land
-
-
-NOTE:
-    libc extension are installed by bsp_libc_init()
-        iff we are using clock interrupts.
-        This hack is necessary to allow the tmtests to avoid
-        timing the extensions.
-
diff --git a/c/src/exec/libcsupport/src/__brk.c b/c/src/exec/libcsupport/src/__brk.c
deleted file mode 100644
index 4dab22c729..0000000000
--- a/c/src/exec/libcsupport/src/__brk.c
+++ /dev/null
@@ -1,44 +0,0 @@
-#if !defined(RTEMS_UNIX)
-
-/*
- *  RTEMS "Broken" __brk/__sbrk Implementation
- *
- *  NOTE: sbrk is BSP provided.
- *
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems.h>
-
-#include <signal.h>
-#include <errno.h>
-#include <sys/types.h>
-#ifdef RTEMS_NEWLIB
-#include <reent.h>
-#endif
-#include <unistd.h>
-
-/* we use RTEMS for memory management.  We don't need sbrk */
-
-void * __sbrk(int incr)
-{
-  errno = EINVAL;
-  return (void *)0;
-}
-
-int __brk( const void *endds )
-{
-  errno = EINVAL;
-  return -1;
-}
-
-#endif
diff --git a/c/src/exec/libcsupport/src/__gettod.c b/c/src/exec/libcsupport/src/__gettod.c
deleted file mode 100644
index dc83c47ce4..0000000000
--- a/c/src/exec/libcsupport/src/__gettod.c
+++ /dev/null
@@ -1,118 +0,0 @@
-#define __RTEMS_VIOLATE_KERNEL_VISIBILITY__
-
-#include <rtems.h>
-
-#if !defined(RTEMS_UNIX)
-/*
- *  RTEMS gettimeofday Implementation
- *
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifdef RTEMS_NEWLIB
-#include <sys/reent.h>
-#endif
-
-#include <sys/time.h>
-#include <time.h>
-
-#include <errno.h>
-#include <assert.h>
-
-/*
- *  Seconds from January 1, 1970 to January 1, 1988.  Used to account for
- *  differences between POSIX API and RTEMS core.
- */
-
-#define POSIX_TIME_SECONDS_1970_THROUGH_1988 \
-  (((1987 - 1970 + 1)  * TOD_SECONDS_PER_NON_LEAP_YEAR) + \
-  (4 * TOD_SECONDS_PER_DAY))
-
-/*
- *  NOTE:  The solaris gettimeofday does not have a second parameter.
- */
-
-int gettimeofday(
-  struct timeval  *tp,
-  struct timezone *tzp
-)
-{
-  rtems_interrupt_level level;
-  rtems_unsigned32      seconds;
-  rtems_unsigned32      microseconds;
-
-  if ( !tp ) {
-    errno = EFAULT;
-    return -1;
-  }
-
-  /*
-   *  POSIX does not seem to allow for not having a TOD so we just
-   *  grab the time of day.
-   *
-   *  NOTE: XXX this routine should really be in the executive proper.
-   */
-  
-  rtems_interrupt_disable(level);
-    seconds      = _TOD_Seconds_since_epoch;
-    microseconds = _TOD_Current.ticks;
-  rtems_interrupt_enable(level);
-
-  tp->tv_sec  = seconds + POSIX_TIME_SECONDS_1970_THROUGH_1988;
-  tp->tv_usec = microseconds * _TOD_Microseconds_per_tick;
-
-  /*
-   * newlib does not have timezone and daylight savings time
-   * yet.  When it does this needs to be fixed.
-   */
-
-#if 0
-  if ( tzp ) {
-    tzp->tz_minuteswest = 0;  /* at UTC */
-    tzp->tz_dsttime = 0;      /* no daylight savings */
-  tzp->minuteswest = timezone / 60; /* from seconds to minutes */
-  tzp->dsttime = daylight;
-  }
-#endif
-  return 0;
-}
-
-#if defined(RTEMS_NEWLIB) 
-
-/*
- *  "Reentrant" version
- */
-
-int _gettimeofday_r(
-  struct _reent   *ignored_reentrancy_stuff,
-  struct timeval  *tp,
-  struct timezone *tzp
-)
-{
-  return gettimeofday( tp, tzp );
-}
-
-/*
- *  "System call" version 
- */
-
-int _gettimeofday(
-  struct timeval  *tp,
-  struct timezone *tzp
-)
-{
-  return gettimeofday( tp, tzp );
-}
-
-#endif /* defined(RTEMS_NEWLIB) */
-
-#endif
diff --git a/c/src/exec/libcsupport/src/__times.c b/c/src/exec/libcsupport/src/__times.c
deleted file mode 100644
index 635bf8e062..0000000000
--- a/c/src/exec/libcsupport/src/__times.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- *  RTEMS _times Implementation
- *
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems.h>
-
-#include <sys/times.h>
-#include <time.h>
-#include <sys/time.h>
-#include <errno.h>
-#include <assert.h>
-
-clock_t _times(
-   struct tms  *ptms
-)
-{
-  rtems_status_code      status;
-  rtems_interval         ticks_since_boot;
-
-  if ( !ptms ) {
-    errno = EFAULT;
-    return -1;
-  }
-
-  /* "POSIX" does not seem to allow for not having a TOD */
-  status = rtems_clock_get(
-    RTEMS_CLOCK_GET_TICKS_SINCE_BOOT,
-    &ticks_since_boot
-  );
-  if ( status != RTEMS_SUCCESSFUL ) {
-    assert( 0 );
-    return -1;
-  }
-
-  /*
-   *  RTEMS has no notion of system versus user time and does
-   *  not (as of 3.2.0) keep track of CPU usage on a per task basis.
-   */
-
-  ptms->tms_utime  = ticks_since_boot;
-  ptms->tms_stime  = 0;
-  ptms->tms_cutime = 0;
-  ptms->tms_cstime = 0;
-
-  return 0;
-}
-
-clock_t times(
-   struct tms  *ptms
-)
-{
-  return _times( ptms );
-}
-
-#if defined(RTEMS_NEWLIB)
-clock_t _times_r(
-   struct _reent *ptr,
-   struct tms  *ptms
-)
-{
-  return _times(ptms);
-}
-#endif
diff --git a/c/src/exec/libcsupport/src/assoc.c b/c/src/exec/libcsupport/src/assoc.c
deleted file mode 100644
index 74387a8c5b..0000000000
--- a/c/src/exec/libcsupport/src/assoc.c
+++ /dev/null
@@ -1,260 +0,0 @@
-/*
- * assoc.c
- *      rtems assoc routines
- *
- *  $Id$
- */
-
-#include <rtems.h>
-#include "assoc.h"
-
-#include <stdio.h>              /* sprintf */
-#include <string.h>             /* strcat, strcmp */
-
-#define STREQ(a,b)      (strcmp((a), (b)) == 0)
-#define rtems_assoc_is_default(ap)  ((ap)->name && STREQ(ap->name, RTEMS_ASSOC_DEFAULT_NAME))
-
-const rtems_assoc_t *
-rtems_assoc_ptr_by_name(
-    const rtems_assoc_t *ap,
-    const char *name
-  )
-{
-    const rtems_assoc_t *default_ap = 0;
-
-    if (rtems_assoc_is_default(ap))
-        default_ap = ap++;
-    
-    for ( ; ap->name; ap++)
-        if (strcmp(ap->name, name) == 0)
-            return ap;
-
-    return default_ap;
-}
-
-const rtems_assoc_t *
-rtems_assoc_ptr_by_local(
-    const rtems_assoc_t *ap,
-    unsigned32     local_value
-  )
-{
-    const rtems_assoc_t *default_ap = 0;
-
-    if (rtems_assoc_is_default(ap))
-        default_ap = ap++;
-    
-    for ( ; ap->name; ap++)
-        if (ap->local_value == local_value)
-            return ap;
-
-    return default_ap;
-}
-
-
-const rtems_assoc_t *
-rtems_assoc_ptr_by_remote(
-    const rtems_assoc_t *ap,
-    unsigned32     remote_value
-  )
-{
-    const rtems_assoc_t *default_ap = 0;
-
-    if (rtems_assoc_is_default(ap))
-        default_ap = ap++;
-    
-    for ( ; ap->name; ap++)
-        if (ap->remote_value == remote_value)
-            return ap;
-
-    return default_ap;
-}
-
-
-/*
- * Get values
- */
-
-unsigned32
-rtems_assoc_remote_by_local(
-    const rtems_assoc_t *ap,
-    unsigned32     local_value
-  )
-{
-    const rtems_assoc_t *nap;
-    nap = rtems_assoc_ptr_by_local(ap, local_value);
-    if (nap)
-        return nap->remote_value;
-    
-    return 0;
-}
-
-unsigned32
-rtems_assoc_local_by_remote(
-    const rtems_assoc_t *ap,
-    unsigned32     remote_value
-  )
-{
-    const rtems_assoc_t *nap;
-    nap = rtems_assoc_ptr_by_remote(ap, remote_value);
-    if (nap)
-        return nap->local_value;
-    
-    return 0;
-}
-
-unsigned32
-rtems_assoc_remote_by_name(
-    const rtems_assoc_t *ap,
-    const char          *name
-  )
-{
-    const rtems_assoc_t *nap;
-    nap = rtems_assoc_ptr_by_name(ap, name);
-    if (nap)
-        return nap->remote_value;
-    
-    return 0;
-}
-
-unsigned32
-rtems_assoc_local_by_name(
-    const rtems_assoc_t *ap,
-    const char          *name
-  )
-{
-    const rtems_assoc_t *nap;
-    nap = rtems_assoc_ptr_by_name(ap, name);
-    if (nap)
-        return nap->local_value;
-    
-    return 0;
-}
-
-/*
- * what to return if a value is not found
- * this is not reentrant, but it really shouldn't be invoked anyway
- */
-
-const char *
-rtems_assoc_name_bad(
-    unsigned32 bad_value
-)
-{
-#ifdef RTEMS_DEBUG
-    static char bad_buffer[32];
-
-    sprintf(bad_buffer, "< %d [0x%x] >", bad_value, bad_value);
-#else
-    static char bad_buffer[32] = "<assoc.c: BAD NAME>";
-#endif
-    return bad_buffer;
-}
-
-
-const char *
-rtems_assoc_name_by_local(
-    const rtems_assoc_t *ap,
-    unsigned32     local_value
-  )
-{
-    const rtems_assoc_t *nap;
-    nap = rtems_assoc_ptr_by_local(ap, local_value);
-    if (nap)
-        return nap->name;
-    
-    return rtems_assoc_name_bad(local_value);
-}
-
-const char *
-rtems_assoc_name_by_remote(
-    const rtems_assoc_t *ap,
-    unsigned32     remote_value
-  )
-{
-    const rtems_assoc_t *nap;
-    nap = rtems_assoc_ptr_by_remote(ap, remote_value);
-    if (nap)
-        return nap->name;
-    
-    return rtems_assoc_name_bad(remote_value);
-}
-
-/*
- * Bitfield functions assume just 1 bit set in each of remote and local
- *      entries; they do not check for this.
- */
-
-unsigned32 rtems_assoc_remote_by_local_bitfield(
-    const rtems_assoc_t *ap,
-    unsigned32     local_value
-  )
-{  
-    unsigned32 b;
-    unsigned32 remote_value = 0;
-
-    for (b = 1; b; b <<= 1)
-        if (b & local_value)
-            remote_value |= rtems_assoc_remote_by_local(ap, b);
-        
-    return remote_value;
-}
-
-
-unsigned32 rtems_assoc_local_by_remote_bitfield(
-    const rtems_assoc_t *ap,
-    unsigned32     remote_value
-  )
-{  
-    unsigned32 b;
-    unsigned32 local_value = 0;
-
-    for (b = 1; b; b <<= 1)
-        if (b & remote_value)
-            local_value |= rtems_assoc_local_by_remote(ap, b);
-        
-    return local_value;
-}
-
-char *
-rtems_assoc_name_by_remote_bitfield(
-    const rtems_assoc_t *ap,
-    unsigned32     value,
-    char          *buffer
-  )
-{  
-    unsigned32 b;
-
-    *buffer = 0;
-
-    for (b = 1; b; b <<= 1)
-        if (b & value)
-        {
-            if (*buffer)
-                strcat(buffer, " ");
-            strcat(buffer, rtems_assoc_name_by_remote(ap, b));
-        }
-        
-    return buffer;
-}
-
-char *
-rtems_assoc_name_by_local_bitfield(
-    const rtems_assoc_t *ap,
-    unsigned32     value,
-    char          *buffer
-  )
-{  
-    unsigned32 b;
-
-    *buffer = 0;
-
-    for (b = 1; b; b <<= 1)
-        if (b & value)
-        {
-            if (*buffer)
-                strcat(buffer, " ");
-            strcat(buffer, rtems_assoc_name_by_local(ap, b));
-        }
-        
-    return buffer;
-}
diff --git a/c/src/exec/libcsupport/src/closedir.c b/c/src/exec/libcsupport/src/closedir.c
deleted file mode 100644
index 5edb3499e6..0000000000
--- a/c/src/exec/libcsupport/src/closedir.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- *  closedir() - POSIX 1003.1b - XXX
- *
- *  $Id$
- */
-
-
-#include <sys/types.h>
-#include <dirent.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <errno.h>
-
-int closedir(
-  register DIR *dirp
-)
-{
-  errno = ENOSYS;
-  return -1;
-}
diff --git a/c/src/exec/libcsupport/src/error.c b/c/src/exec/libcsupport/src/error.c
deleted file mode 100644
index dd32fb8b66..0000000000
--- a/c/src/exec/libcsupport/src/error.c
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- *  report errors and panics to RTEMS' stderr.
- *  Currently just used by RTEMS monitor.
- *
- *  $Id$
- */
-
-
-/*
- * These routines provide general purpose error reporting.
- * rtems_error reports an error to stderr and allows use of
- * printf style formatting.  A newline is appended to all messages.
- * 
- * error_flag can be specified as any of the following:
- *
- *  	RTEMS_ERROR_ERRNO       -- include errno text in output
- *  	RTEMS_ERROR_PANIC       -- halts local system after output
- *  	RTEMS_ERROR_ABORT       -- abort after output
- *
- * It can also include a rtems_status value which can be OR'd
- * with the above flags. * 
- *
- * EXAMPLE
- *	#include <rtems.h>
- *	#include <rtems/error.h>
- *	rtems_error(0, "stray interrupt %d", intr);
- *
- * EXAMPLE
- *        if ((status = rtems_task_create(...)) != RTEMS_SUCCCESSFUL)
- *        {
- *            rtems_error(status | RTEMS_ERROR_ABORT,
- *                        "could not create task");
- *        }
- *
- * EXAMPLE
- *        if ((fd = open(pathname, O_RDNLY)) < 0)
- *        {
- *            rtems_error(RTEMS_ERROR_ERRNO, "open of '%s' failed", pathname);
- *            goto failed;
- *        }
- */
-
-#define __RTEMS_VIOLATE_KERNEL_VISIBILITY__
-#include <rtems.h>
-
-#include "error.h"
-#include <rtems/assoc.h>
-
-#include <stdio.h>
-#include <stdarg.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>		/* _exit() */
-
-/* bug in hpux <errno.h>: no prototypes unless you are C++ */
-#ifdef hpux9
-char *strerror(int);
-#endif
-
-extern char *rtems_progname;
-int          rtems_panic_in_progress;
-
-rtems_assoc_t rtems_status_assoc[] = {
-    { "successful completion",              RTEMS_SUCCESSFUL, },
-    { "returned from a thread",             RTEMS_TASK_EXITTED, },
-    { "multiprocessing not configured",     RTEMS_MP_NOT_CONFIGURED, },
-    { "invalid object name",                RTEMS_INVALID_NAME, },
-    { "invalid object id",                  RTEMS_INVALID_ID, },
-    { "too many",                           RTEMS_TOO_MANY, },
-    { "timed out waiting",                  RTEMS_TIMEOUT, },
-    { "object deleted while waiting",       RTEMS_OBJECT_WAS_DELETED, },
-    { "specified size was invalid",         RTEMS_INVALID_SIZE, },
-    { "address specified is invalid",       RTEMS_INVALID_ADDRESS, },
-    { "number was invalid",                 RTEMS_INVALID_NUMBER, },
-    { "item has not been initialized",      RTEMS_NOT_DEFINED, },
-    { "resources still outstanding",        RTEMS_RESOURCE_IN_USE, },
-    { "request not satisfied",              RTEMS_UNSATISFIED, },
-    { "thread is in wrong state",           RTEMS_INCORRECT_STATE, },
-    { "thread already in state",            RTEMS_ALREADY_SUSPENDED, },
-    { "illegal on calling thread",          RTEMS_ILLEGAL_ON_SELF, },
-    { "illegal for remote object",          RTEMS_ILLEGAL_ON_REMOTE_OBJECT, },
-    { "called from wrong environment",      RTEMS_CALLED_FROM_ISR, },
-    { "invalid thread priority",            RTEMS_INVALID_PRIORITY, },
-    { "invalid date/time",                  RTEMS_INVALID_CLOCK, },
-    { "invalid node id",                    RTEMS_INVALID_NODE, },
-    { "directive not configured",           RTEMS_NOT_CONFIGURED, },
-    { "not owner of resource",              RTEMS_NOT_OWNER_OF_RESOURCE , },
-    { "directive not implemented",          RTEMS_NOT_IMPLEMENTED, },
-    { "RTEMS inconsistency detected",       RTEMS_INTERNAL_ERROR, },
-    { "could not get enough memory",        RTEMS_NO_MEMORY, },
-    { "internal multiprocessing only",      THREAD_STATUS_PROXY_BLOCKING, },
-    { 0, 0, 0 },
-};
-
-
-const char *
-rtems_status_text(
-    rtems_status_code status
-)
-{
-    return rtems_assoc_name_by_local(rtems_status_assoc, status);
-}
-
-
-static int rtems_verror(
-    unsigned32   error_flag,
-    const char   *printf_format,
-    va_list      arglist
-)
-{
-    int               local_errno = 0;
-    int               chars_written = 0;
-    rtems_status_code status;
-
-    if (error_flag & RTEMS_ERROR_PANIC)
-    {
-        if (rtems_panic_in_progress++)
-            _Thread_Disable_dispatch();       /* disable task switches */
-
-        /* don't aggravate things */
-        if (rtems_panic_in_progress > 2)
-            return 0;
-    }
-
-    (void) fflush(stdout);  	    /* in case stdout/stderr same */
-
-    status = error_flag & ~RTEMS_ERROR_MASK;
-    if (error_flag & RTEMS_ERROR_ERRNO)     /* include errno? */
-        local_errno = errno;
-
-    if (_System_state_Is_multiprocessing)
-        fprintf(stderr, "[%d] ", _Configuration_MP_table->node);
-    
-    if (rtems_progname && *rtems_progname)
-        chars_written += fprintf(stderr, "%s: ", rtems_progname);
-    chars_written += vfprintf(stderr, printf_format, arglist);
-    
-    if (status)
-        chars_written += fprintf(stderr, " (status: %s)", rtems_status_text(status));
-
-    if (local_errno)
-    {
-      if ((local_errno > 0) && *strerror(local_errno))
-        chars_written += fprintf(stderr, " (errno: %s)", strerror(local_errno));
-      else
-        chars_written += fprintf(stderr, " (unknown errno=%d)", local_errno);
-    }
-    
-    chars_written += fprintf(stderr, "\n");
-
-    (void) fflush(stderr);
-
-    if (error_flag & (RTEMS_ERROR_PANIC | RTEMS_ERROR_ABORT))
-    {
-        if (error_flag & RTEMS_ERROR_PANIC)
-        {
-            rtems_error(0, "fatal error, exiting");
-            _exit(local_errno);
-        }
-        else
-        {
-            rtems_error(0, "fatal error, aborting");
-            abort();
-        }
-    }
-    return chars_written;
-}
-
-
-/*
- * Report an error.
- * error_flag is as above; printf_format is a normal
- * printf(3) format string, with its concommitant arguments.
- * 
- * Returns the number of characters written.
- */
-
-int rtems_error(
-    int   error_flag,
-    const char *printf_format,
-    ...
-  )
-{
-    va_list arglist;
-    int chars_written;
-
-    va_start(arglist, printf_format);
-    chars_written = rtems_verror(error_flag, printf_format, arglist);
-    va_end(arglist);
-    
-    return chars_written;
-}
-
-/* 
- * rtems_panic is shorthand for rtems_error(RTEMS_ERROR_PANIC, ...)
- */
-
-void rtems_panic(
-    const char *printf_format,
-    ...
-  )
-{
-    va_list arglist;
-
-    va_start(arglist, printf_format);
-    (void) rtems_verror(RTEMS_ERROR_PANIC, printf_format, arglist);
-    va_end(arglist);
-}
diff --git a/c/src/exec/libcsupport/src/getdents.c b/c/src/exec/libcsupport/src/getdents.c
deleted file mode 100644
index 9b16d82409..0000000000
--- a/c/src/exec/libcsupport/src/getdents.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- *  Just enough to make newlib return an error.
- *
- *  $Id$
- */
-
-int getdents(
-  int   fd,
-  void *buf,
-  int   len
-)
-{
-  return -1;
-}
diff --git a/c/src/exec/libcsupport/src/hosterr.c b/c/src/exec/libcsupport/src/hosterr.c
deleted file mode 100644
index a55e4a7e84..0000000000
--- a/c/src/exec/libcsupport/src/hosterr.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- *  Routines to access a host errno
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems.h>
-#include <errno.h>
-
-int host_errno(void);
-
-/*
- * copy host errno, if any to thread aware errno, if any
- */
-
-void fix_syscall_errno(void)
-{
-    errno = host_errno();
-}
-
-/*
- * Get the host system errno, if any
- * When using newlib (or possibly other libc's) on top of UNIX
- * the errno returned by system calls may be unavailable due
- * to trickery of making errno thread aware.
- * This provides a kludge of getting at it.
- */
-
-#undef errno
-extern int errno;
-int host_errno(void)
-{
-    return errno;
-}
-
diff --git a/c/src/exec/libcsupport/src/libio.c b/c/src/exec/libcsupport/src/libio.c
deleted file mode 100644
index 12682c1190..0000000000
--- a/c/src/exec/libcsupport/src/libio.c
+++ /dev/null
@@ -1,524 +0,0 @@
-/*
- *  Provide UNIX/POSIX-like io system calls for RTEMS using the
- *  RTEMS IO manager
- *
- *  $Id$
- */
-
-#include <rtems.h>
-#include <rtems/assoc.h>                /* assoc.h not included by rtems.h */
-
-#include <stdio.h>                      /* O_RDONLY, et.al. */
-#include <fcntl.h>                      /* O_RDONLY, et.al. */
-#include <assert.h>
-
-#if ! defined(O_NDELAY)
-# if defined(solaris2)
-#  define O_NDELAY O_NONBLOCK
-# elif defined(RTEMS_NEWLIB)
-#  define O_NDELAY _FNBIO
-# endif
-#endif
-
-
-#include <errno.h>
-#include <string.h>                     /* strcmp */
-#include <unistd.h>
-#include <stdlib.h>                     /* calloc() */
-
-#include "libio.h"                      /* libio.h not pulled in by rtems */
-
-/*
- * Semaphore to protect the io table
- */
-
-Objects_Id rtems_libio_semaphore;
-
-#define RTEMS_LIBIO_SEM         rtems_build_name('L', 'B', 'I', 'O')
-#define RTEMS_LIBIO_IOP_SEM(n)  rtems_build_name('L', 'B', 'I', n)
-
-extern unsigned32     rtems_libio_number_iops;
-rtems_libio_t *rtems_libio_iops;
-rtems_libio_t *rtems_libio_last_iop;
-
-#define rtems_libio_iop(fd)    ((((unsigned32)(fd)) < rtems_libio_number_iops) ? \
-                                       &rtems_libio_iops[fd] : 0)
-
-#define rtems_libio_check_fd(fd) \
-    do { \
-        if ((unsigned32) (fd) >= rtems_libio_number_iops) \
-        { \
-            errno = EBADF; \
-            return -1; \
-        } \
-    } while (0)
-
-#define rtems_libio_check_buffer(buffer) \
-    do { \
-        if ((buffer) == 0) \
-        { \
-            errno = EINVAL; \
-            return -1; \
-        } \
-    } while (0)
-
-#define rtems_libio_check_count(count) \
-    do { \
-        if ((count) == 0) \
-        { \
-            return 0; \
-        } \
-    } while (0)
-
-#define rtems_libio_check_permissions(iop, flag) \
-    do { \
-        if (((iop)->flags & (flag)) == 0) \
-        { \
-              errno = EINVAL; \
-              return -1; \
-        } \
-    } while (0)
-
-/*
- * External I/O handlers
- * 
- * Space for all possible handlers is preallocated
- * to speed up dispatch to external handlers.
- */
-
-static rtems_libio_handler_t handlers[15];
-
-void
-rtems_register_libio_handler(
-    int                         handler_flag,
-    const rtems_libio_handler_t *handler
-)
-{
-  int handler_index = rtems_file_descriptor_type_index(handler_flag);
-
-  if ((handler_index < 0) || (handler_index >= 15))
-    rtems_fatal_error_occurred( RTEMS_INVALID_NUMBER );
-  handlers[handler_index] = *handler;
-}
-
-/*
- * Called by bsp startup code to init the libio area.
- */
-
-void
-rtems_libio_init(void)
-{
-    rtems_status_code rc;
-
-    if (rtems_libio_number_iops > 0)
-    {
-        rtems_libio_iops = (rtems_libio_t *) calloc(rtems_libio_number_iops,
-                                                    sizeof(rtems_libio_t));
-        if (rtems_libio_iops == NULL)
-            rtems_fatal_error_occurred(RTEMS_NO_MEMORY);
-
-        rtems_libio_last_iop = rtems_libio_iops + (rtems_libio_number_iops - 1);
-    }
-
-    rc = rtems_semaphore_create(
-      RTEMS_LIBIO_SEM,
-      1,
-      RTEMS_BINARY_SEMAPHORE | RTEMS_INHERIT_PRIORITY | RTEMS_PRIORITY,
-      RTEMS_NO_PRIORITY,
-      &rtems_libio_semaphore
-    );
-    if (rc != RTEMS_SUCCESSFUL)
-        rtems_fatal_error_occurred(rc);
-}
-
-/*
- * Convert RTEMS status to a UNIX errno
- */
-
-rtems_assoc_t errno_assoc[] = {
-    { "OK",                 RTEMS_SUCCESSFUL,                0 },
-    { "BUSY",               RTEMS_RESOURCE_IN_USE,           EBUSY },
-    { "INVALID NAME",       RTEMS_INVALID_NAME,              EINVAL },
-    { "NOT IMPLEMENTED",    RTEMS_NOT_IMPLEMENTED,           ENOSYS },
-    { "TIMEOUT",            RTEMS_TIMEOUT,                   ETIMEDOUT },
-    { "NO MEMORY",          RTEMS_NO_MEMORY,                 ENOMEM },
-    { "NO DEVICE",          RTEMS_UNSATISFIED,               ENODEV },
-    { "INVALID NUMBER",     RTEMS_INVALID_NUMBER,            EBADF},
-    { "NOT RESOURCE OWNER", RTEMS_NOT_OWNER_OF_RESOURCE,     EPERM},
-    { "IO ERROR",           RTEMS_IO_ERROR,                  EIO},
-    { 0, 0, 0 },
-};
-
-static unsigned32
-rtems_libio_errno(rtems_status_code code)
-{
-    int rc;
-    
-    if ((rc = rtems_assoc_remote_by_local(errno_assoc, (unsigned32) code)))
-    {
-        errno = rc;
-        return -1;
-    }
-    return -1;
-}
-
-/*
- * Convert UNIX fnctl(2) flags to ones that RTEMS drivers understand
- */
-
-rtems_assoc_t access_modes_assoc[] = {
-    { "READ",       LIBIO_FLAGS_READ,  O_RDONLY },
-    { "WRITE",      LIBIO_FLAGS_WRITE, O_WRONLY },
-    { "READ/WRITE", LIBIO_FLAGS_READ_WRITE, O_RDWR },
-    { 0, 0, 0 },
-};
-
-rtems_assoc_t status_flags_assoc[] = {
-    { "NO DELAY",  LIBIO_FLAGS_NO_DELAY,  O_NDELAY },
-    { "APPEND",    LIBIO_FLAGS_APPEND,    O_APPEND },
-    { "CREATE",    LIBIO_FLAGS_CREATE,    O_CREAT },
-    { 0, 0, 0 },
-};
-
-static unsigned32
-rtems_libio_fcntl_flags(unsigned32 fcntl_flags)
-{
-    unsigned32 flags = 0;
-    unsigned32 access_modes;
-
-    /*
-     * Access mode is a small integer
-     */
-    
-    access_modes = fcntl_flags & O_ACCMODE;
-    fcntl_flags &= ~O_ACCMODE;
-    flags = rtems_assoc_local_by_remote(access_modes_assoc, access_modes);
-
-    /*
-     * Everything else is single bits
-     */
-
-    flags |= rtems_assoc_local_by_remote_bitfield(status_flags_assoc, fcntl_flags);
-    return flags;
-}
-
-
-static rtems_libio_t *
-rtems_libio_allocate(void)
-{
-    rtems_libio_t *iop;
-    rtems_status_code rc;
-    
-    rtems_semaphore_obtain(rtems_libio_semaphore, RTEMS_WAIT, RTEMS_NO_TIMEOUT);
-
-    for (iop = rtems_libio_iops; iop <= rtems_libio_last_iop; iop++)
-        if ((iop->flags & LIBIO_FLAGS_OPEN) == 0)
-        {
-            /*
-             * Got one; create a semaphore for it
-             */
-
-            rc = rtems_semaphore_create(
-              RTEMS_LIBIO_IOP_SEM(iop - rtems_libio_iops),
-              1,
-              RTEMS_BINARY_SEMAPHORE | RTEMS_INHERIT_PRIORITY | RTEMS_PRIORITY,
-              RTEMS_NO_PRIORITY,
-              &iop->sem
-            );
-            if (rc != RTEMS_SUCCESSFUL)
-                goto failed;
-            
-            iop->flags = LIBIO_FLAGS_OPEN;
-            goto done;
-        }
-    
-failed:
-    iop = 0;
-    
-done:
-    rtems_semaphore_release(rtems_libio_semaphore);
-    return iop;
-}
-
-static void
-rtems_libio_free(rtems_libio_t *iop)
-{
-    rtems_semaphore_obtain(rtems_libio_semaphore, RTEMS_WAIT, RTEMS_NO_TIMEOUT);
-
-    if (iop->sem)
-        rtems_semaphore_delete(iop->sem);
-    (void) memset(iop, 0, sizeof(*iop));
-
-    rtems_semaphore_release(rtems_libio_semaphore);
-}
-
-int
-__rtems_open(
-    const char   *pathname,
-    unsigned32    flag,
-    unsigned32    mode)
-{
-    rtems_status_code rc;
-    rtems_libio_t *iop = 0;
-    rtems_driver_name_t *np;
-    rtems_libio_open_close_args_t args;
-
-    /*
-     * Additional external I/O handlers would be supported by
-     * adding code to pick apart the pathname appropriately.
-     * The networking code does not require changes here since
-     * network file descriptors are obtained using socket(), not
-     * open().
-     */
-
-    if ((rc = rtems_io_lookup_name(pathname, &np)) != RTEMS_SUCCESSFUL)
-        goto done;
-
-    iop = rtems_libio_allocate();
-    if (iop == 0)
-    {
-        rc = RTEMS_TOO_MANY;
-        goto done;
-    }
-    
-    iop->driver = np;
-    iop->pathname = (char *) pathname;
-    iop->flags |= rtems_libio_fcntl_flags(flag);
-
-    args.iop = iop;
-    args.flags = iop->flags;
-    args.mode = mode;
-
-    rc = rtems_io_open(np->major, np->minor, (void *) &args);
-    
-done:
-  
-    if (rc != RTEMS_SUCCESSFUL)
-    {
-        if (iop)
-            rtems_libio_free(iop);
-        return rtems_libio_errno(rc);
-    }
-    
-    return iop - rtems_libio_iops;
-}
-    
-int
-__rtems_close(
-    int  fd
-  )    
-{
-    rtems_status_code rc;
-    rtems_driver_name_t *np;
-    rtems_libio_t *iop;
-    rtems_libio_open_close_args_t args;
-    int status;
-
-    if (rtems_file_descriptor_type(fd)) {
-        int (*fp)(int fd);
-
-        fp = handlers[rtems_file_descriptor_type_index(fd)].close;
-        if (fp == NULL) {
-            errno = EBADF;
-            return -1;
-        }
-        status = (*fp)(fd);
-        return status;
-    }
-    iop = rtems_libio_iop(fd);
-    rtems_libio_check_fd(fd);
-
-    np = iop->driver;
-
-    args.iop = iop;
-    args.flags = 0;
-    args.mode = 0;
-    
-    rc = rtems_io_close(np->major, np->minor, (void *) &args);
-
-    rtems_libio_free(iop);
-
-    if (rc != RTEMS_SUCCESSFUL)
-        return rtems_libio_errno(rc);
-    return 0;
-}
-    
-int
-__rtems_read(
-    int       fd,
-    void *    buffer,
-    unsigned32 count
-  )
-{
-    rtems_status_code rc;
-    rtems_driver_name_t *np;
-    rtems_libio_t *iop;
-    rtems_libio_rw_args_t args;
-
-    if (rtems_file_descriptor_type(fd)) {
-        int (*fp)(int fd, void *buffer, unsigned32 count);
-
-        fp = handlers[rtems_file_descriptor_type_index(fd)].read;
-        if (fp == NULL) {
-            errno = EBADF;
-            return -1;
-        }
-        return (*fp)(fd, buffer, count);
-    }
-    iop = rtems_libio_iop(fd);
-    rtems_libio_check_fd(fd);
-    rtems_libio_check_buffer(buffer);
-    rtems_libio_check_count(count);
-    rtems_libio_check_permissions(iop, LIBIO_FLAGS_READ);
-
-    np = iop->driver;
-
-    args.iop = iop;
-    args.offset = iop->offset;
-    args.buffer = buffer;
-    args.count = count;
-    args.flags = iop->flags;
-    args.bytes_moved = 0;
-
-    rc = rtems_io_read(np->major, np->minor, (void *) &args);
-
-    iop->offset += args.bytes_moved;
-
-    if (rc != RTEMS_SUCCESSFUL)
-        return rtems_libio_errno(rc);
-
-    return args.bytes_moved;
-}
-
-int
-__rtems_write(
-    int         fd,
-    const void *buffer,
-    unsigned32  count
-  )
-{
-    rtems_status_code rc;
-    rtems_driver_name_t *np;
-    rtems_libio_t *iop;
-    rtems_libio_rw_args_t args;
-
-    if (rtems_file_descriptor_type(fd)) {
-        int (*fp)(int fd, const void *buffer, unsigned32 count);
-
-        fp = handlers[rtems_file_descriptor_type_index(fd)].write;
-        if (fp == NULL) {
-            errno = EBADF;
-            return -1;
-        }
-        return (*fp)(fd, buffer, count);
-    }
-    iop = rtems_libio_iop(fd);
-    rtems_libio_check_fd(fd);
-    rtems_libio_check_buffer(buffer);
-    rtems_libio_check_count(count);
-    rtems_libio_check_permissions(iop, LIBIO_FLAGS_WRITE);
-
-    np = iop->driver;
-
-    args.iop = iop;
-    args.offset = iop->offset;
-    args.buffer = (void *) buffer;
-    args.count = count;
-    args.flags = iop->flags;
-    args.bytes_moved = 0;
-
-    rc = rtems_io_write(np->major, np->minor, (void *) &args);
-
-    iop->offset += args.bytes_moved;
-
-    if (rc != RTEMS_SUCCESSFUL)
-        return rtems_libio_errno(rc);
-
-    return args.bytes_moved;
-}
-
-int
-__rtems_ioctl(
-    int         fd,
-    unsigned32  command,
-    void *      buffer)
-{
-    rtems_status_code rc;
-    rtems_driver_name_t *np;
-    rtems_libio_t *iop;
-    rtems_libio_ioctl_args_t args;
-
-    if (rtems_file_descriptor_type(fd)) {
-        int (*fp)(int fd, unsigned32 command, void *buffer);
-
-        fp = handlers[rtems_file_descriptor_type_index(fd)].ioctl;
-        if (fp == NULL) {
-            errno = EBADF;
-            return -1;
-        }
-        return (*fp)(fd, command, buffer);
-    }
-    iop = rtems_libio_iop(fd);
-    rtems_libio_check_fd(fd);
-
-    np = iop->driver;
-
-    args.iop = iop;
-    args.command = command;
-    args.buffer = buffer;
-
-    rc = rtems_io_control(np->major, np->minor, (void *) &args);
-
-    if (rc != RTEMS_SUCCESSFUL)
-        return rtems_libio_errno(rc);
-
-    return args.ioctl_return;
-}
-    
-/*
- * internal only??
- */
-
-
-int
-__rtems_lseek(
-    int                  fd,
-    rtems_libio_offset_t offset,
-    int                  whence
-  )    
-{
-    rtems_libio_t *iop;
-
-    if (rtems_file_descriptor_type(fd)) {
-        int (*fp)(int fd, rtems_libio_offset_t offset, int whence);
-
-        fp = handlers[rtems_file_descriptor_type_index(fd)].lseek;
-        if (fp == NULL) {
-            errno = EBADF;
-            return -1;
-        }
-        return (*fp)(fd, offset, whence);
-    }
-    iop = rtems_libio_iop(fd);
-    rtems_libio_check_fd(fd);
-
-    switch (whence)
-    {
-        case SEEK_SET:
-            iop->offset = offset;
-            break;
-
-        case SEEK_CUR:
-            iop->offset += offset;
-            break;
-
-        case SEEK_END:
-            iop->offset = iop->size - offset;
-            break;
-
-        default:
-            errno = EINVAL;
-            return -1;
-    }
-    return 0;
-}
diff --git a/c/src/exec/libcsupport/src/malloc.c b/c/src/exec/libcsupport/src/malloc.c
deleted file mode 100644
index fac38585a7..0000000000
--- a/c/src/exec/libcsupport/src/malloc.c
+++ /dev/null
@@ -1,424 +0,0 @@
-/*
- *  RTEMS Malloc Family Implementation
- *
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define __RTEMS_VIOLATE_KERNEL_VISIBILITY__
-#include <rtems.h>
-#include "libcsupport.h"
-#ifdef RTEMS_NEWLIB
-#include <sys/reent.h>
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <assert.h>
-#include <errno.h>
-#include <string.h>
-
-/* for sbrk prototype in linux */
-#if defined(__linux__)
-#define __USE_MISC
-#endif
-#include <unistd.h>    /* sbrk(2) */
-
-rtems_id RTEMS_Malloc_Heap;
-size_t RTEMS_Malloc_Sbrk_amount;
-
-extern rtems_cpu_table   Cpu_table;
-#ifdef RTEMS_DEBUG
-#define MALLOC_STATS
-#define MALLOC_DIRTY
-#endif
-
-#ifdef MALLOC_STATS
-#define MSBUMP(f,n)    rtems_malloc_stats.f += (n)
-
-struct {
-    unsigned32  space_available;             /* current size of malloc area */
-    unsigned32  malloc_calls;                /* # calls to malloc */
-    unsigned32  free_calls;
-    unsigned32  realloc_calls;
-    unsigned32  calloc_calls;
-    unsigned32  max_depth;		     /* most ever malloc'd at 1 time */
-    unsigned64  lifetime_allocated;
-    unsigned64  lifetime_freed;
-} rtems_malloc_stats;
-
-#else			/* No rtems_malloc_stats */
-#define MSBUMP(f,n)
-#endif
-
-void RTEMS_Malloc_Initialize(
-  void   *start,
-  size_t  length,
-  size_t  sbrk_amount
-)
-{
-  rtems_status_code   status;
-  void               *starting_address;
-  rtems_unsigned32    old_address;
-  rtems_unsigned32    u32_address;
-
-  /*
-   * If the starting address is 0 then we are to attempt to
-   * get length worth of memory using sbrk. Make sure we
-   * align the address that we get back.
-   */
-
-  starting_address = start;
-  RTEMS_Malloc_Sbrk_amount = sbrk_amount;
-
-  if (!starting_address) {
-    u32_address = (unsigned int)sbrk(length);
-
-    if (u32_address == (rtems_unsigned32) -1) {
-      rtems_fatal_error_occurred( RTEMS_NO_MEMORY );
-      /* DOES NOT RETURN!!! */
-    }
-
-    if (u32_address & (CPU_ALIGNMENT-1)) {
-      old_address = u32_address;
-      u32_address = (u32_address + CPU_ALIGNMENT) & ~(CPU_ALIGNMENT-1);
-
-       /*
-	* adjust the length by whatever we aligned by
-	*/
-
-      length -= u32_address - old_address;
-    }
-
-    starting_address = (void *)u32_address;
-  }
-
-  /*
-   *  If the BSP is not clearing out the workspace, then it is most likely
-   *  not clearing out the initial memory for the heap.  There is no 
-   *  standard supporting zeroing out the heap memory.  But much code
-   *  with UNIX history seems to assume that memory malloc'ed during
-   *  initialization (before any free's) is zero'ed.  This is true most
-   *  of the time under UNIX because zero'ing memory when it is first
-   *  given to a process eliminates the chance of a process seeing data
-   *  left over from another process.  This would be a security violation.
-   */
-
-  if ( Cpu_table.do_zero_of_workspace )
-     memset( starting_address, 0, length );
-
-  /*
-   *  Unfortunately we cannot use assert if this fails because if this
-   *  has failed we do not have a heap and if we do not have a heap
-   *  STDIO cannot work because there will be no buffers.
-   */
-
-  status = rtems_region_create(
-    rtems_build_name( 'H', 'E', 'A', 'P' ),
-    starting_address,
-    length,
-    CPU_ALIGNMENT,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &RTEMS_Malloc_Heap
-  );
-  if ( status != RTEMS_SUCCESSFUL )
-    rtems_fatal_error_occurred( status );
-
-#ifdef MALLOC_STATS
-  /* zero all the stats */
-  (void) memset(&rtems_malloc_stats, 0, sizeof(rtems_malloc_stats));
-#endif
-  
-  MSBUMP(space_available, length);
-}
-
-#ifdef RTEMS_NEWLIB
-void *malloc(
-  size_t  size
-)
-{
-  void              *return_this;
-  void              *starting_address;
-  rtems_unsigned32   the_size;
-  rtems_unsigned32   sbrk_amount;
-  rtems_status_code  status;
-
-  MSBUMP(malloc_calls, 1);
-
-  if ( !size )
-    return (void *) 0;
-
-  /*
-   * Try to give a segment in the current region if there is not
-   * enough space then try to grow the region using rtems_region_extend().
-   * If this fails then return a NULL pointer.
-   */
-
-  status = rtems_region_get_segment(
-    RTEMS_Malloc_Heap,
-    size,
-    RTEMS_NO_WAIT,
-    RTEMS_NO_TIMEOUT,
-    &return_this
-  );
-
-  if ( status != RTEMS_SUCCESSFUL ) {
-    /*
-     *  Round to the "requested sbrk amount" so hopefully we won't have
-     *  to grow again for a while.  This effectively does sbrk() calls
-     *  in "page" amounts.
-     */
-
-    sbrk_amount = RTEMS_Malloc_Sbrk_amount;
-
-    if ( sbrk_amount == 0 )
-      return (void *) 0;
-
-    the_size = ((size + sbrk_amount) / sbrk_amount * sbrk_amount);
-
-    if (((rtems_unsigned32)starting_address = (void *)sbrk(the_size)) 
-            == (rtems_unsigned32) -1)
-      return (void *) 0;
-
-    status = rtems_region_extend(
-      RTEMS_Malloc_Heap,
-      starting_address,
-      the_size
-    );
-    if ( status != RTEMS_SUCCESSFUL ) {
-      sbrk(-the_size);
-      errno = ENOMEM;
-      return (void *) 0;
-    }
-    
-    MSBUMP(space_available, the_size);
-
-    status = rtems_region_get_segment(
-      RTEMS_Malloc_Heap,
-       size,
-       RTEMS_NO_WAIT,
-       RTEMS_NO_TIMEOUT,
-       &return_this
-    );
-    if ( status != RTEMS_SUCCESSFUL ) {
-      errno = ENOMEM;
-      return (void *) 0;
-    }
-  }
-
-#ifdef MALLOC_STATS
-  if (return_this)
-  {
-      unsigned32 actual_size;
-      unsigned32 current_depth;
-      status = rtems_region_get_segment_size(RTEMS_Malloc_Heap, return_this, &actual_size);
-      MSBUMP(lifetime_allocated, actual_size);
-      current_depth = rtems_malloc_stats.lifetime_allocated - rtems_malloc_stats.lifetime_freed;
-      if (current_depth > rtems_malloc_stats.max_depth)
-          rtems_malloc_stats.max_depth = current_depth;
-  }
-#endif
-
-#ifdef MALLOC_DIRTY
-  (void) memset(return_this, 0xCF, size);
-#endif
-
-  return return_this;
-}
-
-void *calloc(
-  size_t nelem,
-  size_t elsize
-)
-{
-  register char *cptr;
-  int length;
-
-  MSBUMP(calloc_calls, 1);
-
-  length = nelem * elsize;
-  cptr = malloc( length );
-  if ( cptr )
-    memset( cptr, '\0', length );
-
-  MSBUMP(malloc_calls, -1);   /* subtract off the malloc */
-
-  return cptr;
-}
-
-void *realloc(
-  void *ptr,
-  size_t size
-)
-{
-  rtems_unsigned32  old_size;
-  rtems_status_code status;
-  char *new_area;
-
-  MSBUMP(realloc_calls, 1);
-
-  if ( !ptr )
-    return malloc( size );
-
-  if ( !size ) {
-    free( ptr );
-    return (void *) 0;
-  }
-
-  new_area = malloc( size );
- 
-  MSBUMP(malloc_calls, -1);   /* subtract off the malloc */
-
-  if ( !new_area ) {
-    free( ptr );
-    return (void *) 0;
-  }
-
-  status = rtems_region_get_segment_size( RTEMS_Malloc_Heap, ptr, &old_size );
-  if ( status != RTEMS_SUCCESSFUL ) {
-    errno = EINVAL;
-    return (void *) 0;
-  }
-
-  memcpy( new_area, ptr, (size < old_size) ? size : old_size );
-  free( ptr );
-
-  return new_area;
-
-}
-
-void free(
-  void *ptr
-)
-{
-  rtems_status_code status;
-
-  MSBUMP(free_calls, 1);
-
-  if ( !ptr )
-    return;
-
-#ifdef MALLOC_STATS
-  {
-      unsigned32        size;
-      status = rtems_region_get_segment_size( RTEMS_Malloc_Heap, ptr, &size );
-      if ( status == RTEMS_SUCCESSFUL ) {
-          MSBUMP(lifetime_freed, size);
-      }
-  }
-#endif
-  
-  status = rtems_region_return_segment( RTEMS_Malloc_Heap, ptr );
-  if ( status != RTEMS_SUCCESSFUL ) {
-    errno = EINVAL;
-    assert( 0 );
-  }
-}
-/* end if RTEMS_NEWLIB */
-#endif
-
-#ifdef MALLOC_STATS
-/*
- * Dump the malloc statistics
- * May be called via atexit()  (installable by our bsp) or
- * at any time by user
- */
-
-void malloc_dump(void)
-{
-    unsigned32 allocated = rtems_malloc_stats.lifetime_allocated - rtems_malloc_stats.lifetime_freed;
-
-    printf("Malloc stats\n");
-    printf("  avail:%uk  allocated:%uk (%d%%) max:%uk (%d%%) lifetime:%Luk freed:%Luk\n",
-           (unsigned int) rtems_malloc_stats.space_available / 1024,
-           (unsigned int) allocated / 1024,
-           /* avoid float! */
-           (allocated * 100) / rtems_malloc_stats.space_available,
-           (unsigned int) rtems_malloc_stats.max_depth / 1024,
-           (rtems_malloc_stats.max_depth * 100) / rtems_malloc_stats.space_available,
-           (unsigned64) rtems_malloc_stats.lifetime_allocated / 1024,
-           (unsigned64) rtems_malloc_stats.lifetime_freed / 1024);
-    printf("  Call counts:   malloc:%d   free:%d   realloc:%d   calloc:%d\n",
-           rtems_malloc_stats.malloc_calls,
-           rtems_malloc_stats.free_calls,
-           rtems_malloc_stats.realloc_calls,
-           rtems_malloc_stats.calloc_calls);
-}
-
-
-void malloc_walk(size_t source, size_t printf_enabled)
-{
-   register Region_Control *the_region;
-   Objects_Locations        location;
- 
-   the_region = _Region_Get( RTEMS_Malloc_Heap, &location );
-   if ( location == OBJECTS_LOCAL )
-   {
-      _Heap_Walk( &the_region->Memory, source, printf_enabled );
-      _Thread_Enable_dispatch();
-   }
-}
-
-#else
-
-void malloc_dump(void)
-{
-   return;
-}
- 
-void malloc_walk(size_t source, size_t printf_enabled)
-{
-   return;
-}
-
-#endif
-
-/*
- *  "Reentrant" versions of the above routines implemented above.
- */
-
-#ifdef RTEMS_NEWLIB
-void *_malloc_r(
-  struct _reent *ignored,
-  size_t  size
-)
-{
-  return malloc( size );
-}
-
-void *_calloc_r(
-  struct _reent *ignored,
-  size_t nelem,
-  size_t elsize
-)
-{
-  return calloc( nelem, elsize );
-}
-
-void *_realloc_r(
-  struct _reent *ignored,
-  void *ptr,
-  size_t size
-)
-{
-  return realloc( ptr, size );
-}
-
-void _free_r(
-  struct _reent *ignored,
-  void *ptr
-)
-{
-  free( ptr );
-}
-#endif
-
diff --git a/c/src/exec/libcsupport/src/newlibc.c b/c/src/exec/libcsupport/src/newlibc.c
deleted file mode 100644
index a6acc1c8d7..0000000000
--- a/c/src/exec/libcsupport/src/newlibc.c
+++ /dev/null
@@ -1,429 +0,0 @@
-
-/*
- *  COPYRIGHT (c) 1994 by Division Incorporated
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  Description:
- *      Implementation of hooks for the CYGNUS newlib libc
- *      These hooks set things up so that:
- *              '_REENT' is switched at task switch time.
- *
- *
- *  TODO:
- *
- *  NOTE:
- *
- *  $Id$
- *
- */
-
-#define __RTEMS_VIOLATE_KERNEL_VISIBILITY__
-#include <rtems.h>
-
-#if defined(RTEMS_NEWLIB)
-#include <libcsupport.h>
-#include <stdlib.h>             /* for free() */
-#include <string.h>             /* for memset() */
-
-#include <sys/reent.h>          /* for extern of _REENT (aka _impure_ptr) */
-#include <errno.h>
-
-/*
- *  NOTE:
- *        There is some problem with doing this on the hpux version
- *        of the UNIX simulator (symptom is printf core dumps), so
- *        we just don't for now.
- *        Not sure if this is a problem with hpux, newlib, or something else.
- */
- 
-#if defined(RTEMS_UNIX) && !defined(hpux)
-#define NEED_SETVBUF
-#endif
- 
-#ifdef NEED_SETVBUF
-#include <stdio.h>
-#endif
-
-#include "internal.h"
-
-#define LIBC_NOTEPAD RTEMS_NOTEPAD_LAST
-
-
-int              libc_reentrant;        /* do we think we are reentrant? */
-struct _reent    libc_global_reent = _REENT_INIT(libc_global_reent);
-
-/*
- * CYGNUS newlib routine that does atexit() processing and flushes
- *      stdio streams
- *      undocumented
- */
-
-extern void _wrapup_reent(struct _reent *);
-extern void _reclaim_reent(struct _reent *);
-
-#include <stdio.h>
-
-void
-libc_wrapup(void)
-{
-    /*
-     *  In case RTEMS is already down, don't do this.  It could be 
-     *  dangerous.
-     */
-
-    if (!_System_state_Is_up(_System_state_Get()))
-       return;
-
-    _wrapup_reent(0);
-    if (_REENT != &libc_global_reent)
-    {
-        _wrapup_reent(&libc_global_reent);
-#if 0
-        /* don't reclaim this one, just in case we do printfs */
-        /* on our way out to ROM */
-        _reclaim_reent(&libc_global_reent);
-#endif
-        _REENT = &libc_global_reent;
-    }
-    
-    /*
-     * Try to drain output buffers.
-     *
-     * Should this be changed to do *all* file streams?
-     *	_fwalk (_REENT, fclose);
-     */
-    fclose (stdin);
-    fclose (stdout);
-    fclose (stderr);
-}
-
-
-rtems_boolean
-libc_create_hook(rtems_tcb *current_task,
-                 rtems_tcb *creating_task)
-{
-    MY_task_set_note(creating_task, LIBC_NOTEPAD, 0);
-    return TRUE;
-}
-
-/*
- * Called for all user TASKS (system tasks are MPCI Receive Server and IDLE)
- */
-
-rtems_extension
-libc_start_hook(rtems_tcb *current_task,
-                rtems_tcb *starting_task)
-{
-    struct _reent *ptr;
-
-    /* NOTE: our malloc is reentrant without a reent ptr since
-     *  it is based on region manager
-     */
-
-    ptr = (struct _reent *) calloc(1, sizeof(struct _reent));
-
-    if (!ptr)
-       rtems_fatal_error_occurred(RTEMS_NO_MEMORY);
- 
-#ifdef __GNUC__
-    /* GCC extension: structure constants */
-    *ptr = (struct _reent) _REENT_INIT((*ptr));
-#else
-    /* 
-     *  Warning: THIS IS VERY DEPENDENT ON NEWLIB!!! WRITTEN FOR 1.7.0
-     */
-    ptr->_errno=0;
-    ptr->_stdin=&ptr->__sf[0];
-    ptr->_stdout=&ptr->__sf[1];
-    ptr->_stderr=&ptr->__sf[2];
-    ptr->_scanpoint=0;
-    ptr->_asctime[0]=0;
-    ptr->_next=1;
-    ptr->__sdidinit=0;
-#endif
-
-    MY_task_set_note(starting_task, LIBC_NOTEPAD, (rtems_unsigned32) ptr);
-}
-
-/*
- * Called for all user TASKS (system tasks are MPCI Receive Server and IDLE)
- */
- 
-#ifdef NEED_SETVBUF
-rtems_extension
-libc_begin_hook(rtems_tcb *current_task)
-{
-  setvbuf( stdout, NULL, _IOLBF, BUFSIZ );
-}
-#endif
-
-rtems_extension
-libc_switch_hook(rtems_tcb *current_task,
-                 rtems_tcb *heir_task)
-{
-    rtems_unsigned32 impure_value;
-
-    /* XXX We can't use rtems_task_set_note() here since SYSI task has a
-     * tid of 0, which is treated specially (optimized, actually)
-     * by rtems_task_set_note
-     *
-     * NOTE:  The above comment is no longer true and we need to use
-     *        the extension data areas added about the same time.
-     */
-
-    /*
-     *  Don't touch the outgoing task if it has been deleted.
-     */
-
-    if ( !_States_Is_transient( current_task->current_state ) ) {
-      impure_value = (rtems_unsigned32) _REENT;
-      MY_task_set_note(current_task, LIBC_NOTEPAD, impure_value);
-    }
-
-    _REENT = (struct _reent *) MY_task_get_note(heir_task, LIBC_NOTEPAD);
-
-}
-
-/*
- *  Function:   libc_delete_hook
- *  Created:    94/12/10
- *
- *  Description:
- *      Called when a task is deleted.
- *      Must restore the new lib reentrancy state for the new current
- *      task.
- *
- *  Parameters:
- *
- *
- *  Returns:
- *
- *
- *  Side Effects:
- *
- *  Notes:
- *
- *
- *  Deficiencies/ToDo:
- *
- *
- */
-rtems_extension
-libc_delete_hook(rtems_tcb *current_task,
-                 rtems_tcb *deleted_task)
-{
-    struct _reent *ptr;
-
-    /*
-     * The reentrancy structure was allocated by newlib using malloc()
-     */
-
-    if (current_task == deleted_task)
-    {
-      ptr = _REENT;
-    }
-    else
-    {
-      ptr = (struct _reent *) MY_task_get_note(deleted_task, LIBC_NOTEPAD);
-    }
-
-    /* if (ptr) */
-    if (ptr && ptr != &libc_global_reent)
-    {
-      _wrapup_reent(ptr);
-      _reclaim_reent(ptr);
-      free(ptr);
-    }
-
-    MY_task_set_note(deleted_task, LIBC_NOTEPAD, 0);
-
-    /*
-     * Require the switch back to another task to install its own
-     */
-
-    if (current_task == deleted_task)
-    {
-      _REENT = 0;
-    }
-}
-
-/*
- *  Function:   libc_init
- *  Created:    94/12/10
- *
- *  Description:
- *      Init libc for CYGNUS newlib
- *      Set up _REENT to use our global libc_global_reent.
- *      (newlib provides a global of its own, but we prefer our
- *      own name for it)
- *
- *      If reentrancy is desired (which it should be), then
- *      we install the task extension hooks to maintain the
- *      newlib reentrancy global variable _REENT on task
- *      create, delete, switch, exit, etc.
- *
- *  Parameters:
- *      reentrant               non-zero if reentrant library desired.
- *
- *  Returns:
- *
- *  Side Effects:
- *      installs libc extensions if reentrant.
- *
- *  Notes:
- *
- *
- *  Deficiencies/ToDo:
- *
- */
-
-void
-libc_init(int reentrant)
-{
-    rtems_extensions_table  libc_extension;
-    rtems_id                extension_id;
-    rtems_status_code       rc;
-
-    _REENT = &libc_global_reent;
-
-    if (reentrant)
-    {
-        memset(&libc_extension, 0, sizeof(libc_extension));
-
-        libc_extension.thread_create  = libc_create_hook;
-        libc_extension.thread_start   = libc_start_hook;
-#ifdef NEED_SETVBUF
-        libc_extension.thread_begin   = libc_begin_hook;
-#endif
-        libc_extension.thread_switch  = libc_switch_hook;
-        libc_extension.thread_delete  = libc_delete_hook;
-
-        rc = rtems_extension_create(rtems_build_name('L', 'I', 'B', 'C'),
-                              &libc_extension, &extension_id);
-        if (rc != RTEMS_SUCCESSFUL)
-            rtems_fatal_error_occurred(rc);
-
-        libc_reentrant = reentrant;
-    }
-}
-
-#if 0
-/*
- *  Routines required by the gnat runtime.
- */
-
-int get_errno()
-{
-  return errno;
-}
-#endif
-
-/*
- *  Function:   _exit
- *  Created:    94/12/10
- *
- *  Description:
- *      Called from exit() after it does atexit() processing and stdio fflush's
- *
- *      called from bottom of exit() to really delete the task.
- *      If we are using reentrant libc, then let the delete extension
- *      do all the work, otherwise if a shutdown is in progress,
- *      then just do it.
- *
- *  Parameters:
- *      exit status
- *
- *  Returns:
- *      does not return
- *
- *  Side Effects:
- *
- *  Notes:
- *
- *
- *  Deficiencies/ToDo:
- *
- *
- */
-
-#include <stdio.h>
-
-/* #if !defined(RTEMS_UNIX) && !defined(__GO32__) && !defined(_AM29K) */
-#if !defined(RTEMS_UNIX) && !defined(_AM29K)
-void _exit(int status)
-{
-    libc_wrapup(); /* Why? XXX */
-    rtems_shutdown_executive(status);
-}
-#else
-
-void exit(int status)
-{
-    libc_wrapup();
-    rtems_shutdown_executive(status);
-}
-#endif
-
-
-/*
- *  These are directly supported (and completely correct) in the posix api.
- */
-
-pid_t __getpid(void)
-{
-  return getpid();
-}
-
-/* #if !defined(RTEMS_POSIX_API) || defined(__GO32__) */
-#if !defined(RTEMS_POSIX_API)
-pid_t getpid(void)
-{
-  return (0);
-}
-#endif
-
-/* #if !defined(RTEMS_POSIX_API) || defined(__GO32__) */
-#if !defined(RTEMS_POSIX_API)
-int kill( pid_t pid, int sig )
-{
-  return 0;
-}
-#endif
-
-int __kill( pid_t pid, int sig )
-{
-  return 0;
-}
-
-#if !defined(RTEMS_POSIX_API)
-unsigned int sleep(
-  unsigned int seconds
-)
-{
-  rtems_status_code status;
-  rtems_interval    ticks_per_second;
-  rtems_interval    ticks;
- 
-  status = rtems_clock_get(
-    RTEMS_CLOCK_GET_TICKS_PER_SECOND,
-    &ticks_per_second
-  );
- 
-  ticks = seconds * ticks_per_second;
- 
-  status = rtems_task_wake_after( ticks );
- 
-  /*
-   *  Returns the "unslept" amount of time.  In RTEMS signals are not
-   *  interruptable, so tasks really sleep all of the requested time.
-   */
- 
-  return 0;
-}
-#endif
-
-
-#endif
diff --git a/c/src/exec/libcsupport/src/no_libc.c b/c/src/exec/libcsupport/src/no_libc.c
deleted file mode 100644
index 5a58ba761c..0000000000
--- a/c/src/exec/libcsupport/src/no_libc.c
+++ /dev/null
@@ -1,55 +0,0 @@
-
-/*  no_libc.h
- *
- *  This file contains stubs for the reentrancy hooks when
- *  an unknown C library is used.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-#include <rtems.h>
-#if  !defined(RTEMS_NEWLIB) && !defined(RTEMS_UNIX)
-
-#include "libcsupport.h"
-#include "internal.h"
-
-#include <stdlib.h>             /* for free() */
-
-void
-libc_init(int reentrant)
-{
-}
-
-void libc_suspend_main(void)
-{
-}
-
-
-void libc_global_exit(rtems_unsigned32 code)
-{
-}
-
-void _exit(int status)
-{
-}
-
-#else
-
-/* remove ANSI errors.
- *  A program must contain at least one external-declaration
- *  (X3.159-1989 p.82,L3).
- */
-void no_libc_dummy_function( void )
-{
-}
-
-#endif
diff --git a/c/src/exec/libcsupport/src/opendir.c b/c/src/exec/libcsupport/src/opendir.c
deleted file mode 100644
index e303eb28e5..0000000000
--- a/c/src/exec/libcsupport/src/opendir.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- *  opendir() - POSIX 1003.1b - XXX
- *
- *  $Id$
- */
-
-#include <dirent.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-DIR *opendir(
-  const char *name
-)
-{
-  return NULL;
-}
diff --git a/c/src/exec/libcsupport/src/readdir.c b/c/src/exec/libcsupport/src/readdir.c
deleted file mode 100644
index d592a62b99..0000000000
--- a/c/src/exec/libcsupport/src/readdir.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- *  readdir() - POSIX 1003.1b - XXX
- *
- *  $Id$
- */
-
-#include <dirent.h>
-
-struct dirent *readdir(
-  register DIR *dirp
-)
-{
-  return NULL;
-}
diff --git a/c/src/exec/libcsupport/src/rewinddir.c b/c/src/exec/libcsupport/src/rewinddir.c
deleted file mode 100644
index c85e6fd4d0..0000000000
--- a/c/src/exec/libcsupport/src/rewinddir.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- *  rewinddir() - POSIX 1003.1b - XXX
- *
- *  $Id$
- */
-
-#include <sys/types.h>
-#include <assert.h>
-#include <dirent.h>
-#include <stdio.h>
-#include <errno.h>
-#include <unistd.h>
-
-void rewinddir(
-  DIR *dirp
-)
-{
-  errno = ENOSYS;
-  return -1;
-}
diff --git a/c/src/exec/libcsupport/src/scandir.c b/c/src/exec/libcsupport/src/scandir.c
deleted file mode 100644
index 380415dd97..0000000000
--- a/c/src/exec/libcsupport/src/scandir.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- *  scandir() - POSIX 1003.1b - XXX
- *
- *  $Id$
- */
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <dirent.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-
-int scandir(
-  const char      *dirname,
-  struct dirent ***namelist,
-  int             (*select)(struct dirent *),
-  int             (*dcomp)(const void *, const void *)
-)
-{
-  errno = ENOSYS;
-  return -1;
-}
diff --git a/c/src/exec/libcsupport/src/seekdir.c b/c/src/exec/libcsupport/src/seekdir.c
deleted file mode 100644
index e591adbb9f..0000000000
--- a/c/src/exec/libcsupport/src/seekdir.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- *  seekdir() - POSIX 1003.1b - XXX
- *
- *  $Id$
- */
-
-#include <sys/param.h>
-#include <assert.h>
-#include <dirent.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <errno.h>
-
-void seekdir(
-  DIR  *dirp,
-  long  loc
-)
-{
-  errno = ENOSYS;
-  return -1;
-}
diff --git a/c/src/exec/libcsupport/src/tcdrain.c b/c/src/exec/libcsupport/src/tcdrain.c
deleted file mode 100644
index 585871cc90..0000000000
--- a/c/src/exec/libcsupport/src/tcdrain.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- *  This file contains the RTEMS implementation of the POSIX API
- *  routines tcdrain.
- *
- *  $Id$
- *
- */
-
-#include <rtems.h>
-#if defined(RTEMS_NEWLIB)
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <termios.h>
-
-#include "internal.h"
-#include "libio.h"
-
-int
-tcdrain(int fd)
-{
-	return __rtems_ioctl(fd,RTEMS_IO_TCDRAIN,0);
-}
-
-#endif
diff --git a/c/src/exec/libcsupport/src/telldir.c b/c/src/exec/libcsupport/src/telldir.c
deleted file mode 100644
index eee8d925ec..0000000000
--- a/c/src/exec/libcsupport/src/telldir.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- *  telldir() - XXX
- * 
- *  $Id$
- */
-
-#include <sys/param.h>
-#include <assert.h>
-#include <dirent.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <errno.h>
-
-#include <rtems.h>
-#include "libio.h"
-
-long telldir(
-  DIR *dirp
-)
-{
-  errno = ENOSYS;
-  return -1;
-}
diff --git a/c/src/exec/libcsupport/src/termios.c b/c/src/exec/libcsupport/src/termios.c
deleted file mode 100644
index c2a43c7707..0000000000
--- a/c/src/exec/libcsupport/src/termios.c
+++ /dev/null
@@ -1,935 +0,0 @@
-/*
- * TERMIOS serial line support
- *
- *  Author:
- *    W. Eric Norum
- *    Saskatchewan Accelerator Laboratory
- *    University of Saskatchewan
- *    Saskatoon, Saskatchewan, CANADA
- *    eric@skatter.usask.ca
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems.h>
-#include <rtems/libio.h>
-#include <ctype.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <termios.h>
-#include <unistd.h>
-
-/*
- *  FreeBSD does not support a full POSIX termios so we have to help it out
- */
-
-
-#if defined(__FreeBSD__)
-#define XTABS   0
-#define ONLRET  0
-#define ONOCR   0
-#define TABDLY  0
-#define OLCUC   0
-#define ILCUC   0
-#define OCRNL   0
-#define IUCLC   0
-#endif
-
-/*
- * The size of the cooked buffer
- */
-#define CBUFSIZE	256
-
-/*
- * The sizes of the raw message buffers.
- * On most architectures it is quite a bit more
- * efficient if these are powers of two.
- */
-#define RAW_INPUT_BUFFER_SIZE	128
-#define RAW_OUTPUT_BUFFER_SIZE	64
-
-/*
- * Variables associated with each termios instance.
- * One structure for each hardware I/O device.
- */
-struct rtems_termios_tty {
-	/*
-	 * Linked-list of active TERMIOS devices
-	 */
-	struct rtems_termios_tty	*forw;
-	struct rtems_termios_tty	*back;
-
-	/*
-	 * How many times has this device been opened
-	 */
-	int		refcount;
-
-	/*
-	 * This device
-	 */
-	rtems_device_major_number	major;
-	rtems_device_major_number	minor;
-
-	/*
-	 * Mutual-exclusion semaphores
-	 */
-	rtems_id	isem;
-	rtems_id	osem;
-
-	/*
-	 * The canonical (cooked) character buffer
-	 */
-	char		cbuf[CBUFSIZE];
-	int		ccount;
-	int		cindex;
-
-	/*
-	 * Keep track of cursor (printhead) position
-	 */
-	int		column;
-	int		read_start_column;
-
-	/*
-	 * The ioctl settings
-	 */
-	struct termios	termios;
-	rtems_interval	vtimeTicks;
-
-	/*
-	 * Raw input character buffer
-	 */
-	volatile char		rawInBuf[RAW_INPUT_BUFFER_SIZE];
-	volatile unsigned int	rawInBufHead;
-	volatile unsigned int	rawInBufTail;
-	rtems_id		rawInBufSemaphore;
-	rtems_unsigned32	rawInBufSemaphoreOptions;
-	rtems_interval		rawInBufSemaphoreTimeout;
-	rtems_interval		rawInBufSemaphoreFirstTimeout;
-	unsigned int		rawInBufDropped;	/* Statistics */
-
-	/*
-	 * Raw output character buffer
-	 */
-	volatile char		rawOutBuf[RAW_OUTPUT_BUFFER_SIZE];
-	volatile unsigned int	rawOutBufHead;
-	volatile unsigned int	rawOutBufTail;
-	rtems_id		rawOutBufSemaphore;
-	enum {rob_idle, rob_busy, rob_wait }	rawOutBufState;
-
-	/*
-	 * Callbacks to device-specific routines
-	 */
-	rtems_termios_callbacks	device;
-};
-
-static struct rtems_termios_tty *ttyHead, *ttyTail;
-static rtems_id ttyMutex;
-
-/*
- *  Reserve enough resources to open every physical device once.
- */
-
-static int first_time;   /* assumed to be zeroed by BSS initialization */
-
-void
-rtems_termios_reserve_resources (
-  rtems_configuration_table *configuration,
-  rtems_unsigned32           number_of_devices
-  )
-{
-	rtems_api_configuration_table *rtems_config;
-
-	if (!configuration)
-		rtems_fatal_error_occurred (0xFFF0F001);
-	rtems_config = configuration->RTEMS_api_configuration;
-	if (!rtems_config)
-		rtems_fatal_error_occurred (0xFFF0F002);
-	if (!first_time)
-		rtems_config->maximum_semaphores += 1;
-	first_time = 1;
-	rtems_config->maximum_semaphores += (4 * number_of_devices);
-}
-
-void
-rtems_termios_initialize (void)
-{
-	rtems_status_code sc;
-
-	/*
-	 * Create the mutex semaphore for the tty list
-	 */
-	if (!ttyMutex) {
-		sc = rtems_semaphore_create (
-			rtems_build_name ('T', 'R', 'm', 'i'),
-			1,
-			RTEMS_BINARY_SEMAPHORE | RTEMS_INHERIT_PRIORITY | RTEMS_PRIORITY,
-			RTEMS_NO_PRIORITY,
-			&ttyMutex);
-		if (sc != RTEMS_SUCCESSFUL)
-			rtems_fatal_error_occurred (sc);
-	}
-}
-	
-/*
- * Open a termios device
- */
-rtems_status_code
-rtems_termios_open (
-  rtems_device_major_number      major,
-  rtems_device_minor_number      minor,
-  void                          *arg,
-  const rtems_termios_callbacks *callbacks
-  )
-{
-	rtems_status_code sc;
-	rtems_libio_open_close_args_t *args = arg;
-	struct rtems_termios_tty *tty;
-
-	/*
-	 * See if the device has already been opened
-	 */
-	sc = rtems_semaphore_obtain (ttyMutex, RTEMS_WAIT, RTEMS_NO_TIMEOUT);
-	if (sc != RTEMS_SUCCESSFUL)
-		return sc;
-	for (tty = ttyHead ; tty != NULL ; tty = tty->forw) {
-		if ((tty->major == major) && (tty->minor == minor))
-			break;
-	}
-	if (tty == NULL) {
-		static char c = 'a';
-
-		/*
-		 * Create a new device
-		 */
-		tty = calloc (1, sizeof (struct rtems_termios_tty));
-		if (tty == NULL) {
-			rtems_semaphore_release (ttyMutex);
-			return RTEMS_NO_MEMORY;
-		}
-		tty->forw = ttyHead;
-		ttyHead = tty;
-		if (ttyTail == NULL)
-			ttyTail = tty;
-
-		tty->minor = minor;
-		tty->major = major;
-
-		/*
-		 * Set up mutex semaphores
-		 */
-		sc = rtems_semaphore_create (
-			rtems_build_name ('T', 'R', 'i', c),
-			1,
-			RTEMS_BINARY_SEMAPHORE | RTEMS_INHERIT_PRIORITY | RTEMS_PRIORITY,
-			RTEMS_NO_PRIORITY,
-			&tty->isem);
-		if (sc != RTEMS_SUCCESSFUL)
-			rtems_fatal_error_occurred (sc);
-		sc = rtems_semaphore_create (
-			rtems_build_name ('T', 'R', 'o', c),
-			1,
-			RTEMS_BINARY_SEMAPHORE | RTEMS_INHERIT_PRIORITY | RTEMS_PRIORITY,
-			RTEMS_NO_PRIORITY,
-			&tty->osem);
-		if (sc != RTEMS_SUCCESSFUL)
-			rtems_fatal_error_occurred (sc);
-		sc = rtems_semaphore_create (
-			rtems_build_name ('T', 'R', 'x', c),
-			0,
-			RTEMS_COUNTING_SEMAPHORE | RTEMS_PRIORITY,
-			RTEMS_NO_PRIORITY,
-			&tty->rawOutBufSemaphore);
-		if (sc != RTEMS_SUCCESSFUL)
-			rtems_fatal_error_occurred (sc);
-		tty->rawOutBufState = rob_idle;
-
-		/*
-		 * Set callbacks
-		 */
-		tty->device = *callbacks;
-		if (!tty->device.pollRead) {
-			sc = rtems_semaphore_create (
-				rtems_build_name ('T', 'R', 'r', c),
-				0,
-				RTEMS_COUNTING_SEMAPHORE | RTEMS_PRIORITY,
-				RTEMS_NO_PRIORITY,
-				&tty->rawInBufSemaphore);
-			if (sc != RTEMS_SUCCESSFUL)
-				rtems_fatal_error_occurred (sc);
-		}
-
-		/*
-		 * Set default parameters
-		 */
-		tty->termios.c_iflag = BRKINT | ICRNL | IXON | IMAXBEL;
-		tty->termios.c_oflag = OPOST | ONLCR | XTABS;
-		tty->termios.c_cflag = B9600 | CS8 | CREAD;
-		tty->termios.c_lflag = ISIG | ICANON | IEXTEN | ECHO | ECHOK | ECHOE | ECHOCTL;
-		tty->termios.c_cc[VINTR] = '\003';
-		tty->termios.c_cc[VQUIT] = '\034';
-		tty->termios.c_cc[VERASE] = '\177';
-		tty->termios.c_cc[VKILL] = '\025';
-		tty->termios.c_cc[VEOF] = '\004';
-		tty->termios.c_cc[VEOL] = '\000';
-		tty->termios.c_cc[VEOL2] = '\000';
-		tty->termios.c_cc[VSTART] = '\021';
-		tty->termios.c_cc[VSTOP] = '\023';
-		tty->termios.c_cc[VSUSP] = '\032';
-		tty->termios.c_cc[VREPRINT] = '\022';
-		tty->termios.c_cc[VDISCARD] = '\017';
-		tty->termios.c_cc[VWERASE] = '\027';
-		tty->termios.c_cc[VLNEXT] = '\026';
-
-		/*
-		 * Bump name characer
-		 */
-		if (c++ == 'z')
-			c = 'a';
-	}
-	args->iop->data1 = tty;
-	if (!tty->refcount++ && tty->device.firstOpen)
-		(*tty->device.firstOpen)(major, minor, arg);
-	rtems_semaphore_release (ttyMutex);
-	return RTEMS_SUCCESSFUL;
-}
-
-/*
- * Drain output queue
- */
-static void
-drainOutput (struct rtems_termios_tty *tty)
-{
-	rtems_interrupt_level level;
-	rtems_status_code sc;
-
-	if (tty->device.outputUsesInterrupts) {
-		rtems_interrupt_disable (level);
-		while (tty->rawOutBufTail != tty->rawOutBufHead) {
-			tty->rawOutBufState = rob_wait;
-			rtems_interrupt_enable (level);
-			sc = rtems_semaphore_obtain (tty->rawOutBufSemaphore,
-							RTEMS_WAIT,
-							RTEMS_NO_TIMEOUT);
-			if (sc != RTEMS_SUCCESSFUL)
-				rtems_fatal_error_occurred (sc);
-			rtems_interrupt_disable (level);
-		}
-		rtems_interrupt_enable (level);
-	}
-}
-
-rtems_status_code
-rtems_termios_close (void *arg)
-{
-	rtems_libio_open_close_args_t *args = arg;
-	struct rtems_termios_tty *tty = args->iop->data1;
-	rtems_status_code sc;
-
-	sc = rtems_semaphore_obtain (ttyMutex, RTEMS_WAIT, RTEMS_NO_TIMEOUT);
-	if (sc != RTEMS_SUCCESSFUL)
-		rtems_fatal_error_occurred (sc);
-	if (--tty->refcount == 0) {
-		drainOutput (tty);
-		if (tty->device.lastClose)
-			 (*tty->device.lastClose)(tty->major, tty->minor, arg);
-		if (tty->forw == NULL)
-			ttyTail = tty->back;
-		else
-			tty->forw->back = tty->back;
-		if (tty->back == NULL)
-			ttyHead = tty->forw;
-		else
-			tty->back->forw = tty->forw;
-		rtems_semaphore_delete (tty->isem);
-		rtems_semaphore_delete (tty->osem);
-		rtems_semaphore_delete (tty->rawOutBufSemaphore);
-		if (!tty->device.pollRead)
-			rtems_semaphore_delete (tty->rawInBufSemaphore);
-		free (tty);
-	}
-	rtems_semaphore_release (ttyMutex);
-	return RTEMS_SUCCESSFUL;
-}
-
-rtems_status_code
-rtems_termios_ioctl (void *arg)
-{
-	rtems_libio_ioctl_args_t *args = arg;
-	struct rtems_termios_tty *tty = args->iop->data1;
-	rtems_status_code sc;
-
- 	args->ioctl_return = 0;
-	sc = rtems_semaphore_obtain (tty->osem, RTEMS_WAIT, RTEMS_NO_TIMEOUT);
-	if (sc != RTEMS_SUCCESSFUL) {
-		args->ioctl_return = sc;
-		return sc;
-	}
-	switch (args->command) {
-	default:
-		sc = RTEMS_INVALID_NUMBER;
-		break;
-
-	case RTEMS_IO_GET_ATTRIBUTES:
-		*(struct termios *)args->buffer = tty->termios;
-		break;
-
-	case RTEMS_IO_SET_ATTRIBUTES:
-		tty->termios = *(struct termios *)args->buffer;
-		if (tty->termios.c_lflag & ICANON) {
-			tty->rawInBufSemaphoreOptions = RTEMS_WAIT;
-			tty->rawInBufSemaphoreTimeout = RTEMS_NO_TIMEOUT;
-			tty->rawInBufSemaphoreFirstTimeout = RTEMS_NO_TIMEOUT;
-		}
-		else {
-			rtems_interval ticksPerSecond;
-			rtems_clock_get (RTEMS_CLOCK_GET_TICKS_PER_SECOND, &ticksPerSecond);
-			tty->vtimeTicks = tty->termios.c_cc[VTIME] * ticksPerSecond / 10;
-			if (tty->termios.c_cc[VTIME]) {
-				tty->rawInBufSemaphoreOptions = RTEMS_WAIT;
-				tty->rawInBufSemaphoreTimeout = tty->vtimeTicks;
-				if (tty->termios.c_cc[VMIN])
-					tty->rawInBufSemaphoreFirstTimeout = RTEMS_NO_TIMEOUT;
-				else
-					tty->rawInBufSemaphoreFirstTimeout = tty->vtimeTicks;
-			}
-			else {
-				if (tty->termios.c_cc[VMIN]) {
-					tty->rawInBufSemaphoreOptions = RTEMS_WAIT;
-					tty->rawInBufSemaphoreTimeout = RTEMS_NO_TIMEOUT;
-					tty->rawInBufSemaphoreFirstTimeout = RTEMS_NO_TIMEOUT;
-				}
-				else {
-					tty->rawInBufSemaphoreOptions = RTEMS_NO_WAIT;
-				}
-			}
-		}
-		if (tty->device.setAttributes)
-			(*tty->device.setAttributes)(tty->minor, &tty->termios);
-		break;
-
-	case RTEMS_IO_TCDRAIN:
-		drainOutput (tty);
-		break;
-	}
-	rtems_semaphore_release (tty->osem);
-	args->ioctl_return = sc;
-	return sc;
-}
-
-/*
- * Send characters to device-specific code
- */
-static void
-osend (const char *buf, int len, struct rtems_termios_tty *tty)
-{
-	unsigned int newHead;
-	rtems_interrupt_level level;
-	rtems_status_code sc;
-
-	if (!tty->device.outputUsesInterrupts) {
-		(*tty->device.write)(tty->minor, buf, len);
-		return;
-	}
-	newHead = tty->rawOutBufHead;
-	while (len) {
-		/*
-		 * Performance improvement could be made here.
-		 * Copy multiple bytes to raw buffer:
-		 * if (len > 1) && (space to buffer end, or tail > 1)
-		 *	ncopy = MIN (len, space to buffer end or tail)
-		 *	memcpy (raw buffer, buf, ncopy)
-		 *	buf += ncopy
-		 *	len -= ncopy
-		 *
-		 * To minimize latency, the memcpy should be done
-		 * with interrupts enabled.
-		 */
-		newHead = (newHead + 1) % RAW_OUTPUT_BUFFER_SIZE;
-		rtems_interrupt_disable (level);
-		while (newHead == tty->rawOutBufTail) {
-			tty->rawOutBufState = rob_wait;
-			rtems_interrupt_enable (level);
-			sc = rtems_semaphore_obtain (tty->rawOutBufSemaphore,
-							RTEMS_WAIT,
-							RTEMS_NO_TIMEOUT);
-			if (sc != RTEMS_SUCCESSFUL)
-				rtems_fatal_error_occurred (sc);
-			rtems_interrupt_disable (level);
-		}
-		tty->rawOutBuf[tty->rawOutBufHead] = *buf++;
-		tty->rawOutBufHead = newHead;
-		if (tty->rawOutBufState == rob_idle) {
-			(*tty->device.write)(tty->minor,
-				(char *)&tty->rawOutBuf[tty->rawOutBufTail], 1);
-			tty->rawOutBufState = rob_busy;
-		}
-		rtems_interrupt_enable (level);
-		len--;
-	}
-}
-
-/*
- * Handle output processing
- */
-static void
-oproc (unsigned char c, struct rtems_termios_tty *tty)
-{
-	int	i;
-
-	if (tty->termios.c_oflag & OPOST) {
-		switch (c) {
-		case '\n':
-			if (tty->termios.c_oflag & ONLRET)
-				tty->column = 0;
-			if (tty->termios.c_oflag & ONLCR) {
-				osend ("\r", 1, tty);
-				tty->column = 0;
-			}
-			break;
-
-		case '\r':
-			if ((tty->termios.c_oflag & ONOCR) && (tty->column == 0))
-				return;
-			if (tty->termios.c_oflag & OCRNL) {
-				c = '\n';
-				if (tty->termios.c_oflag & ONLRET)
-					tty->column = 0;
-				break;
-			}
-			tty->column = 0;
-			break;
-
-		case '\t':
-			i = 8 - (tty->column & 7);
-			if ((tty->termios.c_oflag & TABDLY) == XTABS) {
-				tty->column += i;
-				osend ( "        ",  i, tty);
-				return;
-			}
-			tty->column += i;
-			break;
-
-		case '\b':
-			if (tty->column > 0)
-				tty->column--;
-			break;
-
-		default:
-			if (tty->termios.c_oflag & OLCUC)
-				c = toupper(c);
-			if (!iscntrl(c))
-				tty->column++;
-			break;
-		}
-	}
-	osend (&c, 1, tty);
-}
-
-rtems_status_code
-rtems_termios_write (void *arg)
-{
-	rtems_libio_rw_args_t *args = arg;
-	struct rtems_termios_tty *tty = args->iop->data1;
-	rtems_status_code sc;
-
-	sc = rtems_semaphore_obtain (tty->osem, RTEMS_WAIT, RTEMS_NO_TIMEOUT);
-	if (sc != RTEMS_SUCCESSFUL)
-		return sc;
-	if (tty->termios.c_oflag & OPOST) {
-		unsigned32 count = args->count;
-		unsigned8 *buffer = args->buffer;
-		while (count--)
-			oproc (*buffer++, tty);
-		args->bytes_moved = args->count;
-	}
-	else {
-		osend (args->buffer, args->count, tty);
-		args->bytes_moved = args->count;
-	}
-	rtems_semaphore_release (tty->osem);
-	return sc;
-}
-
-/*
- * Echo a typed character
- */
-static void
-echo (unsigned char c, struct rtems_termios_tty *tty)
-{
-	if ((tty->termios.c_lflag & ECHOCTL) && iscntrl(c) && (c != '\t') && (c != '\n')) {
-		char echobuf[2];
-
-		echobuf[0] = '^';
-		echobuf[1] = c ^ 0x40;
-		osend (echobuf, 2, tty);
-		tty->column += 2;
-	}
-	else {
-		oproc (c, tty);
-	}
-}
-
-/*
- * Erase a character or line
- * FIXME: Needs support for WERASE and ECHOPRT.
- * FIXME: Some of the tests should check for IEXTEN, too.
- */
-static void
-erase (struct rtems_termios_tty *tty, int lineFlag)
-{
-	if (tty->ccount == 0)
-		return;
-	if (lineFlag) {
-		if (!(tty->termios.c_lflag & ECHO)) {
-			tty->ccount = 0;
-			return;
-		}
-		if (!(tty->termios.c_lflag & ECHOE)) {
-			tty->ccount = 0;
-			echo (tty->termios.c_cc[VKILL], tty);
-			if (tty->termios.c_lflag & ECHOK)
-				echo ('\n', tty);
-			return;
-		}
-	}
-	while (tty->ccount) {
-		unsigned char c = tty->cbuf[--tty->ccount];
-
-		if (tty->termios.c_lflag & ECHO) {
-			if (!lineFlag && !(tty->termios.c_lflag & ECHOE)) {
-				echo (tty->termios.c_cc[VERASE], tty);
-			}
-			else if (c == '\t') {
-				int col = tty->read_start_column;
-				int i = 0;
-
-				/*
-				 * Find the character before the tab
-				 */
-				while (i != tty->ccount) {
-					c = tty->cbuf[i++];
-					if (c == '\t') {
-						col = (col | 7) + 1;
-					}
-					else if (iscntrl (c)) {
-						if (tty->termios.c_lflag & ECHOCTL)
-							col += 2;
-					}
-					else {
-						col++;
-					}
-				}
-
-				/*
-				 * Back up over the tab
-				 */
-				while (tty->column > col) {
-					osend ("\b", 1, tty);
-					tty->column--;
-				}
-			}
-			else {
-				if (iscntrl (c) && (tty->termios.c_lflag & ECHOCTL)) {
-					osend ("\b \b", 3, tty);
-					if (tty->column)
-						tty->column--;
-				}
-				if (!iscntrl (c) || (tty->termios.c_lflag & ECHOCTL)) {
-					osend ("\b \b", 3, tty);
-					if (tty->column)
-						tty->column--;
-				}
-			}
-		}
-		if (!lineFlag)
-			break;
-	}
-}
-
-/*
- * Process a single input character
- */
-static int
-iproc (unsigned char c, struct rtems_termios_tty *tty)
-{
-	if (tty->termios.c_iflag & ISTRIP)
-		c &= 0x7f;
-	if (tty->termios.c_iflag & IUCLC)
-		c = tolower (c);
-	if (c == '\r') {
-		if (tty->termios.c_iflag & IGNCR)
-			return 0;
-		if (tty->termios.c_iflag & ICRNL)
-			c = '\n';
-	}
-	else if ((c == '\n') && (tty->termios.c_iflag & INLCR)) {
-		c = '\r';
-	}
-	if ((c != '\0') && (tty->termios.c_lflag & ICANON)) {
-		if (c == tty->termios.c_cc[VERASE]) {
-			erase (tty, 0);
-			return 0;
-		}
-		else if (c == tty->termios.c_cc[VKILL]) {
-			erase (tty, 1);
-			return 0;
-		}
-		else if (c == tty->termios.c_cc[VEOF]) {
-			return 1;
-		}
-		else if (c == '\n') {
-			if (tty->termios.c_lflag & (ECHO | ECHONL))
-				echo (c, tty);
-			tty->cbuf[tty->ccount++] = c;
-			return 1;
-		}
-		else if ((c == tty->termios.c_cc[VEOL])
-		      || (c == tty->termios.c_cc[VEOL2])) {
-			if (tty->termios.c_lflag & ECHO)
-				echo (c, tty);
-			tty->cbuf[tty->ccount++] = c;
-			return 1;
-		}
-	}
-
-	/*
-	 * FIXME: Should do IMAXBEL handling somehow
-	 */
-	if (tty->ccount < (CBUFSIZE-1)) {
-		if (tty->termios.c_lflag & ECHO)
-			echo (c, tty);
-		tty->cbuf[tty->ccount++] = c;
-	}
-	return 0;
-}
-
-/*
- * Process input character, with semaphore.
- */
-static int
-siproc (unsigned char c, struct rtems_termios_tty *tty)
-{
-	int i;
-
-	/*
-	 * Obtain output semaphore if character will be echoed
-	 */
-	if (tty->termios.c_lflag & (ECHO|ECHOE|ECHOK|ECHONL|ECHOPRT|ECHOCTL|ECHOKE)) {
-		rtems_semaphore_obtain (tty->osem, RTEMS_WAIT, RTEMS_NO_TIMEOUT);
-		i = iproc (c, tty);
-		rtems_semaphore_release (tty->osem);
-	}
-	else {
-		i = iproc (c, tty);
-	}
-	return i;
-}
-
-/*
- * Fill the input buffer by polling the device
- */
-static rtems_status_code
-fillBufferPoll (struct rtems_termios_tty *tty)
-{
-	int n;
-
-	if (tty->termios.c_lflag & ICANON) {
-		for (;;) {
-			n = (*tty->device.pollRead)(tty->minor);
-			if (n < 0) {
-				rtems_task_wake_after (1);
-			}
-			else {
-				if  (siproc (n, tty))
-					break;
-			}
-		}
-	}
-	else {
-		rtems_interval then, now;
-		if (!tty->termios.c_cc[VMIN] && tty->termios.c_cc[VTIME])
-			rtems_clock_get (RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &then);
-		for (;;) {
-			n = (*tty->device.pollRead)(tty->minor);
-			if (n < 0) {
-				if (tty->termios.c_cc[VMIN]) {
-					if (tty->termios.c_cc[VTIME] && tty->ccount) {
-						rtems_clock_get (RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &now);
-						if ((now - then) > tty->vtimeTicks) {
-							break;
-						}
-					}
-				}
-				else {
-					if (!tty->termios.c_cc[VTIME])
-						break;
-					rtems_clock_get (RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &now);
-					if ((now - then) > tty->vtimeTicks) {
-						break;
-					}
-				}
-				rtems_task_wake_after (1);
-			}
-			else {
-				siproc (n, tty);
-				if (tty->ccount >= tty->termios.c_cc[VMIN])
-					break;
-				if (tty->termios.c_cc[VMIN] && tty->termios.c_cc[VTIME])
-					rtems_clock_get (RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &then);
-			}
-		}
-	}
-	return RTEMS_SUCCESSFUL;
-}
-
-/*
- * Fill the input buffer from the raw input queue
- */
-static rtems_status_code
-fillBufferQueue (struct rtems_termios_tty *tty)
-{
-	rtems_interval timeout = tty->rawInBufSemaphoreFirstTimeout;
-	rtems_status_code sc;
-
-	for (;;) {
-		/*
-		 * Process characters read from raw queue
-		 */
-		while (tty->rawInBufHead != tty->rawInBufTail) {
-			unsigned char c;
-			unsigned int newHead;
-
-			newHead = (tty->rawInBufHead + 1) % RAW_INPUT_BUFFER_SIZE;
-			c = tty->rawInBuf[newHead];
-			tty->rawInBufHead = newHead;
-			if (tty->termios.c_lflag & ICANON) {
-				if  (siproc (c, tty))
-					return RTEMS_SUCCESSFUL;
-			}
-			else {
-				siproc (c, tty);
-				if (tty->ccount >= tty->termios.c_cc[VMIN])
-					return RTEMS_SUCCESSFUL;
-			}
-			timeout = tty->rawInBufSemaphoreTimeout;
-		}
-
-		/*
-		 * Wait for characters
-		 */
-		sc = rtems_semaphore_obtain (tty->rawInBufSemaphore,
-						tty->rawInBufSemaphoreOptions,
-						timeout);
-		if (sc != RTEMS_SUCCESSFUL)
-			break;
-	}
-	return RTEMS_SUCCESSFUL;
-}
-
-rtems_status_code
-rtems_termios_read (void *arg)
-{
-	rtems_libio_rw_args_t *args = arg;
-	struct rtems_termios_tty *tty = args->iop->data1;
-	unsigned32 count = args->count;
-	unsigned8 *buffer = args->buffer;
-	rtems_status_code sc;
-
-	sc = rtems_semaphore_obtain (tty->isem, RTEMS_WAIT, RTEMS_NO_TIMEOUT);
-	if (sc != RTEMS_SUCCESSFUL)
-		return sc;
-	if (tty->cindex == tty->ccount) {
-		tty->cindex = tty->ccount = 0;
-		tty->read_start_column = tty->column;
-		if (tty->device.pollRead)
-			sc = fillBufferPoll (tty);
-		else
-			sc = fillBufferQueue (tty);
-		if (sc != RTEMS_SUCCESSFUL)
-			tty->cindex = tty->ccount = 0;
-	}
-	while (count && (tty->cindex < tty->ccount)) {
-		*buffer++ = tty->cbuf[tty->cindex++];
-		count--;
-	}
-	args->bytes_moved = args->count - count;
-	rtems_semaphore_release (tty->isem);
-	return sc;
-}
-
-/*
- * Place characters on raw queue.
- * NOTE: This routine runs in the context of the
- *       device receive interrupt handler.
- * Returns the number of characters dropped because of overlow.
- */
-int
-rtems_termios_enqueue_raw_characters (void *ttyp, char *buf, int len)
-{
-	struct rtems_termios_tty *tty = ttyp;
-	unsigned int newTail;
-
-	while (len) {
-		newTail = (tty->rawInBufTail + 1) % RAW_INPUT_BUFFER_SIZE;
-		if (newTail == tty->rawInBufHead) {
-			tty->rawInBufDropped += len;
-			break;
-		}
-		tty->rawInBuf[newTail] = *buf++;
-		len--;
-		tty->rawInBufTail = newTail;
-	}
-	rtems_semaphore_release (tty->rawInBufSemaphore);
-	return len;
-}
-
-/*
- * Characters have been transmitted
- * NOTE: This routine runs in the context of the
- *       device transmit interrupt handler.
- * The second argument is the number of characters transmitted so far.
- * This value will always be 1 for devices which generate an interrupt
- * for each transmitted character. 
- * It returns number of characters left to transmit
- */
-int
-rtems_termios_dequeue_characters (void *ttyp, int len)
-{
-	struct rtems_termios_tty *tty = ttyp;
-	unsigned int newTail;
-	int nToSend;
-
-	if (tty->rawOutBufState == rob_wait)
-		rtems_semaphore_release (tty->rawOutBufSemaphore);
-	if ( tty->rawOutBufHead == tty->rawOutBufTail )
-		return 0;
-	newTail = (tty->rawOutBufTail + len) % RAW_OUTPUT_BUFFER_SIZE;
-	if (newTail == tty->rawOutBufHead) {
-		/*
-		 * Buffer empty
-		 */
-		tty->rawOutBufState = rob_idle;
-		nToSend = 0;
-	}
-	else {
-		/*
-		 * Buffer not empty, start tranmitter
-		 */
-		if (newTail > tty->rawOutBufHead)
-			nToSend = RAW_OUTPUT_BUFFER_SIZE - newTail;
-		else
-			nToSend = tty->rawOutBufHead - newTail;
-		(*tty->device.write)(tty->minor, (char *)&tty->rawOutBuf[newTail], nToSend);
-		tty->rawOutBufState = rob_busy;
-	}
-	tty->rawOutBufTail = newTail;
-
-	return nToSend;
-}
-
-
diff --git a/c/src/exec/libcsupport/src/unixlibc.c b/c/src/exec/libcsupport/src/unixlibc.c
deleted file mode 100644
index 3e757e313d..0000000000
--- a/c/src/exec/libcsupport/src/unixlibc.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- *  $Id$
- */
-
-#include <rtems.h>
-
-#if defined(RTEMS_UNIXLIB)
-
-void libc_init(int reentrant)
-{
-}
-
-#else
- 
-/* remove ANSI errors.
- *  A program must contain at least one external-declaration
- *  (X3.159-1989 p.82,L3).
- */
-void unixlibc_dummy_function( void )
-{
-}
-
-#endif
diff --git a/c/src/exec/libcsupport/src/utsname.c b/c/src/exec/libcsupport/src/utsname.c
deleted file mode 100644
index 7fba3d610f..0000000000
--- a/c/src/exec/libcsupport/src/utsname.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- *  $Id$
- */
-
-#include <stdio.h>
-#include <string.h>
-
-#include <sys/utsname.h>
-
-#include <rtems/system.h>
-#include <rtems/score/system.h>
-#include <rtems/score/object.h>
-
-/*PAGE
- *
- *  4.4.1 Get System Name, P1003.1b-1993, p. 90
- */
-
-int uname(
-  struct utsname *name
-)
-{
-  /*  XXX: Here is what Solaris returns...
-          sysname = SunOS
-          nodename = node_name
-          release = 5.3
-          version = Generic_101318-12
-          machine = sun4m
-  */
-
-  strcpy( name->sysname, "RTEMS" );
-
-  sprintf( name->nodename, "Node %d\n", _Objects_Local_node );
-
-  /* XXX release string is in BAD format for this routine!!! */ 
-  strcpy( name->release, "3.2.0" );
- 
-  /* XXX does this have any meaning for RTEMS */
-   
-  strcpy( name->release, "" );
-
-  sprintf( name->machine, "%s/%s", CPU_NAME, CPU_MODEL_NAME );
-
-  return 0;
-}
-
-/*PAGE
- *
- *  4.5.2 Get Process Times, P1003.1b-1993, p. 92
- */
-
-clock_t times(
-  struct tms   *buffer
-)
-{
-  return POSIX_NOT_IMPLEMENTED();
-}
diff --git a/c/src/exec/libnetworking/README b/c/src/exec/libnetworking/README
deleted file mode 100644
index d0c22ec688..0000000000
--- a/c/src/exec/libnetworking/README
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-#  $Id$
-#
-
-This is a snapshot of my attempt to fit the FreeBSD networking code into
-RTEMS.  Things seem to be working!
-
-Things that need to be done:
-	1) More documentation!
-	2) Figure out what's still not working :-)
-	3) Rationalize the include files.  Right now I have a special
-	   hack in the Makefile to ensure that I pick up the FreeBSD versions
-	   of the include files that are duplicated between RTEMS
-	   and FreeBSD.
-	   The network device driver source should move to the BSP source tree.
-	4) Have a look at all the FIXME comments.
-	5) Go through and make sure that all the source files are
-	   free of undesired copyright restrictions.
diff --git a/c/src/exec/libnetworking/arpa/ftp.h b/c/src/exec/libnetworking/arpa/ftp.h
deleted file mode 100644
index 584d290bc9..0000000000
--- a/c/src/exec/libnetworking/arpa/ftp.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright (c) 1983, 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)ftp.h	8.1 (Berkeley) 6/2/93
- *
- *  $Id$
- */
-
-#ifndef _ARPA_FTP_H_
-#define	_ARPA_FTP_H_
-
-/* Definitions for FTP; see RFC-765. */
-
-/*
- * Reply codes.
- */
-#define PRELIM		1	/* positive preliminary */
-#define COMPLETE	2	/* positive completion */
-#define CONTINUE	3	/* positive intermediate */
-#define TRANSIENT	4	/* transient negative completion */
-#define ERROR		5	/* permanent negative completion */
-
-/*
- * Type codes
- */
-#define	TYPE_A		1	/* ASCII */
-#define	TYPE_E		2	/* EBCDIC */
-#define	TYPE_I		3	/* image */
-#define	TYPE_L		4	/* local byte size */
-
-#ifdef FTP_NAMES
-char *typenames[] =  {"0", "ASCII", "EBCDIC", "Image", "Local" };
-#endif
-
-/*
- * Form codes
- */
-#define	FORM_N		1	/* non-print */
-#define	FORM_T		2	/* telnet format effectors */
-#define	FORM_C		3	/* carriage control (ASA) */
-#ifdef FTP_NAMES
-char *formnames[] =  {"0", "Nonprint", "Telnet", "Carriage-control" };
-#endif
-
-/*
- * Structure codes
- */
-#define	STRU_F		1	/* file (no record structure) */
-#define	STRU_R		2	/* record structure */
-#define	STRU_P		3	/* page structure */
-#ifdef FTP_NAMES
-char *strunames[] =  {"0", "File", "Record", "Page" };
-#endif
-
-/*
- * Mode types
- */
-#define	MODE_S		1	/* stream */
-#define	MODE_B		2	/* block */
-#define	MODE_C		3	/* compressed */
-#ifdef FTP_NAMES
-char *modenames[] =  {"0", "Stream", "Block", "Compressed" };
-#endif
-
-/*
- * Record Tokens
- */
-#define	REC_ESC		'\377'	/* Record-mode Escape */
-#define	REC_EOR		'\001'	/* Record-mode End-of-Record */
-#define REC_EOF		'\002'	/* Record-mode End-of-File */
-
-/*
- * Block Header
- */
-#define	BLK_EOR		0x80	/* Block is End-of-Record */
-#define	BLK_EOF		0x40	/* Block is End-of-File */
-#define BLK_ERRORS	0x20	/* Block is suspected of containing errors */
-#define	BLK_RESTART	0x10	/* Block is Restart Marker */
-
-#define	BLK_BYTECOUNT	2	/* Bytes in this block */
-
-#endif /* !_FTP_H_ */
diff --git a/c/src/exec/libnetworking/arpa/inet.h b/c/src/exec/libnetworking/arpa/inet.h
deleted file mode 100644
index ad5332e7ab..0000000000
--- a/c/src/exec/libnetworking/arpa/inet.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * -
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-/*
- *	@(#)inet.h	8.1 (Berkeley) 6/2/93
- *	From: Id: inet.h,v 8.5 1997/01/29 08:48:09 vixie Exp $
- *	$Id$
- */
-
-#ifndef _ARPA_INET_H_
-#define	_ARPA_INET_H_
-
-/* External definitions for functions in inet(3), addr2ascii(3) */
-
-#include <sys/types.h>
-#include <sys/cdefs.h>
-
-struct in_addr;
-
-#if 0	/* RTEMS -- Why rename these? */
-/* XXX all new diversions!! argh!! */
-#define	inet_addr	__inet_addr
-#define	inet_aton	__inet_aton
-#define	inet_lnaof	__inet_lnaof
-#define	inet_makeaddr	__inet_makeaddr
-#define	inet_neta	__inet_neta
-#define	inet_netof	__inet_netof
-#define	inet_network	__inet_network
-#define	inet_net_ntop	__inet_net_ntop
-#define	inet_net_pton	__inet_net_pton
-#define	inet_ntoa	__inet_ntoa
-#define	inet_pton	__inet_pton
-#define	inet_ntop	__inet_ntop
-#define	inet_nsap_addr	__inet_nsap_addr
-#define	inet_nsap_ntoa	__inet_nsap_ntoa
-#endif
-
-__BEGIN_DECLS
-int		 ascii2addr __P((int, const char *, void *));
-char		*addr2ascii __P((int, const void *, int, char *));
-unsigned long	 inet_addr __P((const char *));
-int		 inet_aton __P((const char *, struct in_addr *));
-unsigned long	 inet_lnaof __P((struct in_addr));
-struct in_addr	 inet_makeaddr __P((u_long , u_long));
-char *		 inet_neta __P((u_long, char *, size_t));
-unsigned long	 inet_netof __P((struct in_addr));
-unsigned long	 inet_network __P((const char *));
-char		*inet_net_ntop __P((int, const void *, int, char *, size_t));
-int		 inet_net_pton __P((int, const char *, void *, size_t));
-char		*inet_ntoa __P((struct in_addr));
-int              inet_pton __P((int, const char *, void *));
-const char	*inet_ntop __P((int, const void *, char *, size_t));
-u_int		 inet_nsap_addr __P((const char *, u_char *, int));
-char		*inet_nsap_ntoa __P((int, const u_char *, char *));
-__END_DECLS
-
-#endif /* !_INET_H_ */
diff --git a/c/src/exec/libnetworking/arpa/nameser.h b/c/src/exec/libnetworking/arpa/nameser.h
deleted file mode 100644
index 634dece37b..0000000000
--- a/c/src/exec/libnetworking/arpa/nameser.h
+++ /dev/null
@@ -1,448 +0,0 @@
-/*
- * Copyright (c) 1983, 1989, 1993
- *    The Regents of the University of California.  All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- * 	This product includes software developed by the University of
- * 	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-/*
- *	From: Id: nameser.h,v 8.16 1998/02/06 00:35:58 halley Exp
- *	$Id$
- */
-
-#ifndef _ARPA_NAMESER_H_
-#define _ARPA_NAMESER_H_
-
-#define BIND_4_COMPAT
-
-#include <sys/types.h>
-#include <sys/cdefs.h>
-
-/*
- * revision information.  this is the release date in YYYYMMDD format.
- * it can change every day so the right thing to do with it is use it
- * in preprocessor commands such as "#if (__NAMESER > 19931104)".  do not
- * compare for equality; rather, use it to determine whether your libnameser.a
- * is new enough to contain a certain feature.
- */
-
-/* XXXRTH I made this bigger than __BIND in 4.9.5 T6B */
-#define __NAMESER	19961001	/* New interface version stamp. */
-
-/*
- * Define constants based on RFC 883, RFC 1034, RFC 1035
- */
-#define NS_PACKETSZ	512	/* maximum packet size */
-#define NS_MAXDNAME	1025	/* maximum domain name */
-#define NS_MAXCDNAME	255	/* maximum compressed domain name */
-#define NS_MAXLABEL	63	/* maximum length of domain label */
-#define NS_HFIXEDSZ	12	/* #/bytes of fixed data in header */
-#define NS_QFIXEDSZ	4	/* #/bytes of fixed data in query */
-#define NS_RRFIXEDSZ	10	/* #/bytes of fixed data in r record */
-#define NS_INT32SZ	4	/* #/bytes of data in a u_int32_t */
-#define NS_INT16SZ	2	/* #/bytes of data in a u_int16_t */
-#define NS_INT8SZ	1	/* #/bytes of data in a u_int8_t */
-#define NS_INADDRSZ	4	/* IPv4 T_A */
-#define NS_IN6ADDRSZ	16	/* IPv6 T_AAAA */
-#define NS_CMPRSFLGS	0xc0	/* Flag bits indicating name compression. */
-#define NS_DEFAULTPORT	53	/* For both TCP and UDP. */
-
-/*
- * These can be expanded with synonyms, just keep ns_parse.c:ns_parserecord()
- * in synch with it.
- */
-typedef enum __ns_sect {
-	ns_s_qd = 0,		/* Query: Question. */
-	ns_s_zn = 0,		/* Update: Zone. */
-	ns_s_an = 1,		/* Query: Answer. */
-	ns_s_pr = 1,		/* Update: Prerequisites. */
-	ns_s_ns = 2,		/* Query: Name servers. */
-	ns_s_ud = 2,		/* Update: Update. */
-	ns_s_ar = 3,		/* Query|Update: Additional records. */
-	ns_s_max = 4
-} ns_sect;
-
-/*
- * This is a message handle.  It is caller allocated and has no dynamic data.
- * This structure is intended to be opaque to all but ns_parse.c, thus the
- * leading _'s on the member names.  Use the accessor functions, not the _'s.
- */
-typedef struct __ns_msg {
-	const u_char	*_msg, *_eom;
-	u_int16_t	_id, _flags, _counts[ns_s_max];
-	const u_char	*_sections[ns_s_max];
-	ns_sect		_sect;
-	int		_rrnum;
-	const u_char	*_ptr;
-} ns_msg;
-
-/* Private data structure - do not use from outside library. */
-struct _ns_flagdata {  int mask, shift;  };
-extern struct _ns_flagdata _ns_flagdata[];
-
-/* Accessor macros - this is part of the public interface. */
-#define ns_msg_getflag(handle, flag) ( \
-			((handle)._flags & _ns_flagdata[flag].mask) \
-			 >> _ns_flagdata[flag].shift \
-			)
-#define ns_msg_id(handle) ((handle)._id + 0)
-#define ns_msg_base(handle) ((handle)._msg + 0)
-#define ns_msg_end(handle) ((handle)._eom + 0)
-#define ns_msg_size(handle) ((handle)._eom - (handle)._msg)
-#define ns_msg_count(handle, section) ((handle)._counts[section] + 0)
-
-/*
- * This is a parsed record.  It is caller allocated and has no dynamic data.
- */
-typedef	struct __ns_rr {
-	char		name[NS_MAXDNAME];	/* XXX need to malloc */
-	u_int16_t	type;
-	u_int16_t	class;
-	u_int32_t	ttl;
-	u_int16_t	rdlength;
-	const u_char	*rdata;
-} ns_rr;
-
-/* Accessor macros - this is part of the public interface. */
-#define ns_rr_name(rr)	(((rr).name[0] != '\0') ? (rr).name : ".")
-#define ns_rr_type(rr)	((rr).type + 0)
-#define ns_rr_class(rr)	((rr).class + 0)
-#define ns_rr_ttl(rr)	((rr).ttl + 0)
-#define ns_rr_rdlen(rr)	((rr).rdlength + 0)
-#define ns_rr_rdata(rr)	((rr).rdata + 0)
-
-/*
- * These don't have to be in the same order as in the packet flags word,
- * and they can even overlap in some cases, but they will need to be kept
- * in synch with ns_parse.c:ns_flagdata[].
- */
-typedef enum __ns_flag {
-	ns_f_qr,		/* Question/Response. */
-	ns_f_opcode,		/* Operation code. */
-	ns_f_aa,		/* Authoritative Answer. */
-	ns_f_tc,		/* Truncation occurred. */
-	ns_f_rd,		/* Recursion Desired. */
-	ns_f_ra,		/* Recursion Available. */
-	ns_f_z,			/* MBZ. */
-	ns_f_ad,		/* Authentic Data (DNSSEC). */
-	ns_f_cd,		/* Checking Disabled (DNSSEC). */
-	ns_f_rcode,		/* Response code. */
-	ns_f_max
-} ns_flag;
-
-/*
- * Currently defined opcodes.
- */
-typedef enum __ns_opcode {
-	ns_o_query = 0,		/* Standard query. */
-	ns_o_iquery = 1,	/* Inverse query (deprecated/unsupported). */
-	ns_o_status = 2,	/* Name server status query (unsupported). */
-				/* Opcode 3 is undefined/reserved. */
-	ns_o_notify = 4,	/* Zone change notification. */
-	ns_o_update = 5,	/* Zone update message. */
-	ns_o_max = 6
-} ns_opcode;
-
-/*
- * Currently defined response codes.
- */
-typedef	enum __ns_rcode {
-	ns_r_noerror = 0,	/* No error occurred. */
-	ns_r_formerr = 1,	/* Format error. */
-	ns_r_servfail = 2,	/* Server failure. */
-	ns_r_nxdomain = 3,	/* Name error. */
-	ns_r_notimpl = 4,	/* Unimplemented. */
-	ns_r_refused = 5,	/* Operation refused. */
-	/* these are for BIND_UPDATE */
-	ns_r_yxdomain = 6,	/* Name exists */
-	ns_r_yxrrset = 7,	/* RRset exists */
-	ns_r_nxrrset = 8,	/* RRset does not exist */
-	ns_r_notauth = 9,	/* Not authoritative for zone */
-	ns_r_notzone = 10,	/* Zone of record different from zone section */
-	ns_r_max = 11
-} ns_rcode;
-
-/* BIND_UPDATE */
-typedef enum __ns_update_operation {
-	ns_uop_delete = 0,
-	ns_uop_add = 1,
-	ns_uop_max = 2
-} ns_update_operation;
-
-/*
- * This RR-like structure is particular to UPDATE.
- */
-struct ns_updrec {
-	struct ns_updrec *r_prev;	/* prev record */
-	struct ns_updrec *r_next;	/* next record */
-	u_int8_t	r_section;	/* ZONE/PREREQUISITE/UPDATE */
-	char *		r_dname;	/* owner of the RR */
-	u_int16_t	r_class;	/* class number */
-	u_int16_t	r_type;		/* type number */
-	u_int32_t	r_ttl;		/* time to live */
-	u_char *	r_data;		/* rdata fields as text string */
-	u_int16_t	r_size;		/* size of r_data field */
-	int		r_opcode;	/* type of operation */
-	/* following fields for private use by the resolver/server routines */
-	struct ns_updrec *r_grpnext;	/* next record when grouped */
-	struct databuf *r_dp;		/* databuf to process */
-	struct databuf *r_deldp;	/* databuf's deleted/overwritten */
-	u_int16_t	r_zone;		/* zone number on server */
-};
-typedef struct ns_updrec ns_updrec;
-
-/*
- * Currently defined type values for resources and queries.
- */
-typedef enum __ns_type {
-	ns_t_a = 1,		/* Host address. */
-	ns_t_ns = 2,		/* Authoritative server. */
-	ns_t_md = 3,		/* Mail destination. */
-	ns_t_mf = 4,		/* Mail forwarder. */
-	ns_t_cname = 5,		/* Canonical name. */
-	ns_t_soa = 6,		/* Start of authority zone. */
-	ns_t_mb = 7,		/* Mailbox domain name. */
-	ns_t_mg = 8,		/* Mail group member. */
-	ns_t_mr = 9,		/* Mail rename name. */
-	ns_t_null = 10,		/* Null resource record. */
-	ns_t_wks = 11,		/* Well known service. */
-	ns_t_ptr = 12,		/* Domain name pointer. */
-	ns_t_hinfo = 13,	/* Host information. */
-	ns_t_minfo = 14,	/* Mailbox information. */
-	ns_t_mx = 15,		/* Mail routing information. */
-	ns_t_txt = 16,		/* Text strings. */
-	ns_t_rp = 17,		/* Responsible person. */
-	ns_t_afsdb = 18,	/* AFS cell database. */
-	ns_t_x25 = 19,		/* X_25 calling address. */
-	ns_t_isdn = 20,		/* ISDN calling address. */
-	ns_t_rt = 21,		/* Router. */
-	ns_t_nsap = 22,		/* NSAP address. */
-	ns_t_nsap_ptr = 23,	/* Reverse NSAP lookup (deprecated). */
-	ns_t_sig = 24,		/* Security signature. */
-	ns_t_key = 25,		/* Security key. */
-	ns_t_px = 26,		/* X.400 mail mapping. */
-	ns_t_gpos = 27,		/* Geographical position (withdrawn). */
-	ns_t_aaaa = 28,		/* Ip6 Address. */
-	ns_t_loc = 29,		/* Location Information. */
-	ns_t_nxt = 30,		/* Next domain (security). */
-	ns_t_eid = 31,		/* Endpoint identifier. */
-	ns_t_nimloc = 32,	/* Nimrod Locator. */
-	ns_t_srv = 33,		/* Server Selection. */
-	ns_t_atma = 34,		/* ATM Address */
-	ns_t_naptr = 35,	/* Naming Authority PoinTeR */
-	/* Query type values which do not appear in resource records. */
-	ns_t_ixfr = 251,	/* Incremental zone transfer. */
-	ns_t_axfr = 252,	/* Transfer zone of authority. */
-	ns_t_mailb = 253,	/* Transfer mailbox records. */
-	ns_t_maila = 254,	/* Transfer mail agent records. */
-	ns_t_any = 255,		/* Wildcard match. */
-	ns_t_max = 65536
-} ns_type;
-
-/*
- * Values for class field
- */
-typedef enum __ns_class {
-	ns_c_in = 1,		/* Internet. */
-				/* Class 2 unallocated/unsupported. */
-	ns_c_chaos = 3,		/* MIT Chaos-net. */
-	ns_c_hs = 4,		/* MIT Hesiod. */
-	/* Query class values which do not appear in resource records */
-	ns_c_none = 254,	/* for prereq. sections in update requests */
-	ns_c_any = 255,		/* Wildcard match. */
-	ns_c_max = 65536
-} ns_class;
-
-/*
- * Flags field of the KEY RR rdata
- */
-#define	NS_KEY_TYPEMASK		0xC000	/* Mask for "type" bits */
-#define	NS_KEY_TYPE_AUTH_CONF	0x0000	/* Key usable for both */
-#define	NS_KEY_TYPE_CONF_ONLY	0x8000	/* Key usable for confidentiality */
-#define	NS_KEY_TYPE_AUTH_ONLY	0x4000	/* Key usable for authentication */
-#define	NS_KEY_TYPE_NO_KEY	0xC000	/* No key usable for either; no key */
-/* The type bits can also be interpreted independently, as single bits: */
-#define	NS_KEY_NO_AUTH		0x8000	/* Key unusable for authentication */
-#define	NS_KEY_NO_CONF		0x4000	/* Key unusable for confidentiality */
-#define	NS_KEY_EXPERIMENTAL	0x2000	/* Security is *mandatory* if bit=0 */
-#define	NS_KEY_RESERVED3	0x1000  /* reserved - must be zero */
-#define	NS_KEY_RESERVED4	0x0800  /* reserved - must be zero */
-#define	NS_KEY_USERACCOUNT	0x0400	/* key is assoc. with a user acct */
-#define	NS_KEY_ENTITY		0x0200	/* key is assoc. with entity eg host */
-#define	NS_KEY_ZONEKEY		0x0100	/* key is zone key */
-#define	NS_KEY_IPSEC		0x0080  /* key is for IPSEC (host or user)*/
-#define	NS_KEY_EMAIL		0x0040  /* key is for email (MIME security) */
-#define	NS_KEY_RESERVED10	0x0020  /* reserved - must be zero */
-#define	NS_KEY_RESERVED11	0x0010  /* reserved - must be zero */
-#define	NS_KEY_SIGNATORYMASK	0x000F	/* key can sign RR's of same name */
-
-#define	NS_KEY_RESERVED_BITMASK ( NS_KEY_RESERVED3 | \
-				  NS_KEY_RESERVED4 | \
-				  NS_KEY_RESERVED10 | \
-				  NS_KEY_RESERVED11 )
-
-/* The Algorithm field of the KEY and SIG RR's is an integer, {1..254} */
-#define	NS_ALG_MD5RSA		1	/* MD5 with RSA */
-#define	NS_ALG_EXPIRE_ONLY	253	/* No alg, no security */
-#define	NS_ALG_PRIVATE_OID	254	/* Key begins with OID giving alg */
-
-/* Signatures */
-#define	NS_MD5RSA_MIN_BITS	 512	/* Size of a mod or exp in bits */
-#define	NS_MD5RSA_MAX_BITS	2552
-	/* Total of binary mod and exp */
-#define	NS_MD5RSA_MAX_BYTES	((NS_MD5RSA_MAX_BITS+7/8)*2+3)
-	/* Max length of text sig block */
-#define	NS_MD5RSA_MAX_BASE64	(((NS_MD5RSA_MAX_BYTES+2)/3)*4)
-
-/* Offsets into SIG record rdata to find various values */
-#define	NS_SIG_TYPE	0	/* Type flags */
-#define	NS_SIG_ALG	2	/* Algorithm */
-#define	NS_SIG_LABELS	3	/* How many labels in name */
-#define	NS_SIG_OTTL	4	/* Original TTL */
-#define	NS_SIG_EXPIR	8	/* Expiration time */
-#define	NS_SIG_SIGNED	12	/* Signature time */
-#define	NS_SIG_FOOT	16	/* Key footprint */
-#define	NS_SIG_SIGNER	18	/* Domain name of who signed it */
-
-/* How RR types are represented as bit-flags in NXT records */
-#define	NS_NXT_BITS 8
-#define	NS_NXT_BIT_SET(  n,p) (p[(n)/NS_NXT_BITS] |=  (0x80>>((n)%NS_NXT_BITS)))
-#define	NS_NXT_BIT_CLEAR(n,p) (p[(n)/NS_NXT_BITS] &= ~(0x80>>((n)%NS_NXT_BITS)))
-#define	NS_NXT_BIT_ISSET(n,p) (p[(n)/NS_NXT_BITS] &   (0x80>>((n)%NS_NXT_BITS)))
-
-
-/*
- * Inline versions of get/put short/long.  Pointer is advanced.
- */
-#define NS_GET16(s, cp) { \
-	register u_char *t_cp = (u_char *)(cp); \
-	(s) = ((u_int16_t)t_cp[0] << 8) \
-	    | ((u_int16_t)t_cp[1]) \
-	    ; \
-	(cp) += NS_INT16SZ; \
-}
-
-#define NS_GET32(l, cp) { \
-	register u_char *t_cp = (u_char *)(cp); \
-	(l) = ((u_int32_t)t_cp[0] << 24) \
-	    | ((u_int32_t)t_cp[1] << 16) \
-	    | ((u_int32_t)t_cp[2] << 8) \
-	    | ((u_int32_t)t_cp[3]) \
-	    ; \
-	(cp) += NS_INT32SZ; \
-}
-
-#define NS_PUT16(s, cp) { \
-	register u_int16_t t_s = (u_int16_t)(s); \
-	register u_char *t_cp = (u_char *)(cp); \
-	*t_cp++ = t_s >> 8; \
-	*t_cp   = t_s; \
-	(cp) += NS_INT16SZ; \
-}
-
-#define NS_PUT32(l, cp) { \
-	register u_int32_t t_l = (u_int32_t)(l); \
-	register u_char *t_cp = (u_char *)(cp); \
-	*t_cp++ = t_l >> 24; \
-	*t_cp++ = t_l >> 16; \
-	*t_cp++ = t_l >> 8; \
-	*t_cp   = t_l; \
-	(cp) += NS_INT32SZ; \
-}
-
-/*
- * ANSI C identifier hiding.
- */
-#define ns_get16		__ns_get16
-#define ns_get32		__ns_get32
-#define ns_put16		__ns_put16
-#define ns_put32		__ns_put32
-#define ns_initparse		__ns_initparse
-#define ns_parserr		__ns_parserr
-#define	ns_sprintrr		__ns_sprintrr
-#define	ns_sprintrrf		__ns_sprintrrf
-#define	ns_format_ttl		__ns_format_ttl
-#define	ns_parse_ttl		__ns_parse_ttl
-#define	ns_name_ntop		__ns_name_ntop
-#define	ns_name_pton		__ns_name_pton
-#define	ns_name_unpack		__ns_name_unpack
-#define	ns_name_pack		__ns_name_pack
-#define	ns_name_compress	__ns_name_compress
-#define	ns_name_uncompress	__ns_name_uncompress
-
-__BEGIN_DECLS
-u_int		ns_get16 __P((const u_char *));
-u_long		ns_get32 __P((const u_char *));
-void		ns_put16 __P((u_int, u_char *));
-void		ns_put32 __P((u_long, u_char *));
-int		ns_initparse __P((const u_char *, int, ns_msg *));
-int		ns_parserr __P((ns_msg *, ns_sect, int, ns_rr *));
-int		ns_sprintrr __P((const ns_msg *, const ns_rr *,
-				 const char *, const char *, char *, size_t));
-int		ns_sprintrrf __P((const u_char *, size_t, const char *,
-				  ns_class, ns_type, u_long, const u_char *,
-				  size_t, const char *, const char *,
-				  char *, size_t));
-int		ns_format_ttl __P((u_long, char *, size_t));
-int		ns_parse_ttl __P((const char *, u_long *));
-int		ns_name_ntop __P((const u_char *, char *, size_t));
-int		ns_name_pton __P((const char *, u_char *, size_t));
-int		ns_name_unpack __P((const u_char *, const u_char *,
-				    const u_char *, u_char *, size_t));
-int		ns_name_pack __P((const u_char *, u_char *, int,
-				  const u_char **, const u_char **));
-int		ns_name_uncompress __P((const u_char *, const u_char *,
-					const u_char *, char *, size_t));
-int		ns_name_compress __P((const char *, u_char *, size_t,
-				      const u_char **, const u_char **));
-int		ns_name_skip __P((const u_char **, const u_char *));
-__END_DECLS
-
-#ifdef BIND_4_COMPAT
-#include <arpa/nameser_compat.h>
-#endif
-
-#endif /* !_ARPA_NAMESER_H_ */
diff --git a/c/src/exec/libnetworking/arpa/nameser_compat.h b/c/src/exec/libnetworking/arpa/nameser_compat.h
deleted file mode 100644
index 2ab5b47386..0000000000
--- a/c/src/exec/libnetworking/arpa/nameser_compat.h
+++ /dev/null
@@ -1,194 +0,0 @@
-/* Copyright (c) 1983, 1989
- *    The Regents of the University of California.  All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- * 	This product includes software developed by the University of
- * 	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- *      from nameser.h	8.1 (Berkeley) 6/2/93
- *	From: Id: nameser_compat.h,v 8.9 1998/03/20 23:25:10 halley Exp
- *	$Id$
- */
-
-#ifndef _ARPA_NAMESER_COMPAT_
-#define	_ARPA_NAMESER_COMPAT_
-
-#define	__BIND		19950621	/* (DEAD) interface version stamp. */
-
-#include <machine/endian.h>
-
-#if !defined(BYTE_ORDER) || \
-    (BYTE_ORDER != BIG_ENDIAN && BYTE_ORDER != LITTLE_ENDIAN && \
-    BYTE_ORDER != PDP_ENDIAN)
-	/* you must determine what the correct bit order is for
-	 * your compiler - the next line is an intentional error
-	 * which will force your compiles to bomb until you fix
-	 * the above macros.
-	 */
-  error "Undefined or invalid BYTE_ORDER";
-#endif
-
-/*
- * Structure for query header.  The order of the fields is machine- and
- * compiler-dependent, depending on the byte/bit order and the layout
- * of bit fields.  We use bit fields only in int variables, as this
- * is all ANSI requires.  This requires a somewhat confusing rearrangement.
- */
-
-typedef struct {
-	unsigned	id :16;		/* query identification number */
-#if BYTE_ORDER == BIG_ENDIAN
-			/* fields in third byte */
-	unsigned	qr: 1;		/* response flag */
-	unsigned	opcode: 4;	/* purpose of message */
-	unsigned	aa: 1;		/* authoritive answer */
-	unsigned	tc: 1;		/* truncated message */
-	unsigned	rd: 1;		/* recursion desired */
-			/* fields in fourth byte */
-	unsigned	ra: 1;		/* recursion available */
-	unsigned	unused :1;	/* unused bits (MBZ as of 4.9.3a3) */
-	unsigned	ad: 1;		/* authentic data from named */
-	unsigned	cd: 1;		/* checking disabled by resolver */
-	unsigned	rcode :4;	/* response code */
-#endif
-#if BYTE_ORDER == LITTLE_ENDIAN || BYTE_ORDER == PDP_ENDIAN
-			/* fields in third byte */
-	unsigned	rd :1;		/* recursion desired */
-	unsigned	tc :1;		/* truncated message */
-	unsigned	aa :1;		/* authoritive answer */
-	unsigned	opcode :4;	/* purpose of message */
-	unsigned	qr :1;		/* response flag */
-			/* fields in fourth byte */
-	unsigned	rcode :4;	/* response code */
-	unsigned	cd: 1;		/* checking disabled by resolver */
-	unsigned	ad: 1;		/* authentic data from named */
-	unsigned	unused :1;	/* unused bits (MBZ as of 4.9.3a3) */
-	unsigned	ra :1;		/* recursion available */
-#endif
-			/* remaining bytes */
-	unsigned	qdcount :16;	/* number of question entries */
-	unsigned	ancount :16;	/* number of answer entries */
-	unsigned	nscount :16;	/* number of authority entries */
-	unsigned	arcount :16;	/* number of resource entries */
-} HEADER;
-
-#define PACKETSZ	NS_PACKETSZ
-#define MAXDNAME	NS_MAXDNAME
-#define MAXCDNAME	NS_MAXCDNAME
-#define MAXLABEL	NS_MAXLABEL
-#define	HFIXEDSZ	NS_HFIXEDSZ
-#define QFIXEDSZ	NS_QFIXEDSZ
-#define RRFIXEDSZ	NS_RRFIXEDSZ
-#define	INT32SZ		NS_INT32SZ
-#define	INT16SZ		NS_INT16SZ
-#define	INADDRSZ	NS_INADDRSZ
-#define	IN6ADDRSZ	NS_IN6ADDRSZ
-#define	INDIR_MASK	NS_CMPRSFLGS
-#define NAMESERVER_PORT	NS_DEFAULTPORT
-
-#define S_ZONE		ns_s_zn
-#define S_PREREQ	ns_s_pr
-#define S_UPDATE	ns_s_ud
-#define S_ADDT		ns_s_ar
-
-#define QUERY		ns_o_query
-#define IQUERY		ns_o_iquery
-#define STATUS		ns_o_status
-#define	NS_NOTIFY_OP	ns_o_notify
-#define	NS_UPDATE_OP	ns_o_update
-
-#define NOERROR		ns_r_noerror
-#define FORMERR		ns_r_formerr
-#define SERVFAIL	ns_r_servfail
-#define NXDOMAIN	ns_r_nxdomain
-#define NOTIMP		ns_r_notimpl
-#define REFUSED		ns_r_refused
-#define YXDOMAIN	ns_r_yxdomain
-#define YXRRSET		ns_r_yxrrset
-#define NXRRSET		ns_r_nxrrset
-#define NOTAUTH		ns_r_notauth
-#define NOTZONE		ns_r_notzone
-
-#define DELETE		ns_uop_delete
-#define ADD		ns_uop_add
-
-#define T_A		ns_t_a
-#define T_NS		ns_t_ns
-#define T_MD		ns_t_md
-#define T_MF		ns_t_mf
-#define T_CNAME		ns_t_cname
-#define T_SOA		ns_t_soa
-#define T_MB		ns_t_mb
-#define T_MG		ns_t_mg
-#define T_MR		ns_t_mr
-#define T_NULL		ns_t_null
-#define T_WKS		ns_t_wks
-#define T_PTR		ns_t_ptr
-#define T_HINFO		ns_t_hinfo
-#define T_MINFO		ns_t_minfo
-#define T_MX		ns_t_mx
-#define T_TXT		ns_t_txt
-#define	T_RP		ns_t_rp
-#define T_AFSDB		ns_t_afsdb
-#define T_X25		ns_t_x25
-#define T_ISDN		ns_t_isdn
-#define T_RT		ns_t_rt
-#define T_NSAP		ns_t_nsap
-#define T_NSAP_PTR	ns_t_nsap_ptr
-#define	T_SIG		ns_t_sig
-#define	T_KEY		ns_t_key
-#define	T_PX		ns_t_px
-#define	T_GPOS		ns_t_gpos
-#define	T_AAAA		ns_t_aaaa
-#define	T_LOC		ns_t_loc
-#define	T_NXT		ns_t_nxt
-#define	T_EID		ns_t_eid
-#define	T_NIMLOC	ns_t_nimloc
-#define	T_SRV		ns_t_srv
-#define T_ATMA		ns_t_atma
-#define T_NAPTR		ns_t_naptr
-#define	T_IXFR		ns_t_ixfr
-#define T_AXFR		ns_t_axfr
-#define T_MAILB		ns_t_mailb
-#define T_MAILA		ns_t_maila
-#define T_ANY		ns_t_any
-
-#define C_IN		ns_c_in
-#define C_CHAOS		ns_c_chaos
-#define C_HS		ns_c_hs
-/* BIND_UPDATE */
-#define C_NONE		ns_c_none
-#define C_ANY		ns_c_any
-
-#define	GETSHORT		NS_GET16
-#define	GETLONG			NS_GET32
-#define	PUTSHORT		NS_PUT16
-#define	PUTLONG			NS_PUT32
-
-#endif /* _ARPA_NAMESER_COMPAT_ */
diff --git a/c/src/exec/libnetworking/arpa/telnet.h b/c/src/exec/libnetworking/arpa/telnet.h
deleted file mode 100644
index 09b85692da..0000000000
--- a/c/src/exec/libnetworking/arpa/telnet.h
+++ /dev/null
@@ -1,342 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)telnet.h	8.2 (Berkeley) 12/15/93
- *
- *  $Id$
- */
-
-#ifndef _ARPA_TELNET_H_
-#define	_ARPA_TELNET_H_
-
-/*
- * Definitions for the TELNET protocol.
- */
-#define	IAC	255		/* interpret as command: */
-#define	DONT	254		/* you are not to use option */
-#define	DO	253		/* please, you use option */
-#define	WONT	252		/* I won't use option */
-#define	WILL	251		/* I will use option */
-#define	SB	250		/* interpret as subnegotiation */
-#define	GA	249		/* you may reverse the line */
-#define	EL	248		/* erase the current line */
-#define	EC	247		/* erase the current character */
-#define	AYT	246		/* are you there */
-#define	AO	245		/* abort output--but let prog finish */
-#define	IP	244		/* interrupt process--permanently */
-#define	BREAK	243		/* break */
-#define	DM	242		/* data mark--for connect. cleaning */
-#define	NOP	241		/* nop */
-#define	SE	240		/* end sub negotiation */
-#define EOR     239             /* end of record (transparent mode) */
-#define	ABORT	238		/* Abort process */
-#define	SUSP	237		/* Suspend process */
-#define	xEOF	236		/* End of file: EOF is already used... */
-
-#define SYNCH	242		/* for telfunc calls */
-
-#ifdef TELCMDS
-char *telcmds[] = {
-	"EOF", "SUSP", "ABORT", "EOR",
-	"SE", "NOP", "DMARK", "BRK", "IP", "AO", "AYT", "EC",
-	"EL", "GA", "SB", "WILL", "WONT", "DO", "DONT", "IAC",
-	0
-};
-#else
-extern char *telcmds[];
-#endif
-
-#define	TELCMD_FIRST	xEOF
-#define	TELCMD_LAST	IAC
-#define	TELCMD_OK(x)	((unsigned int)(x) <= TELCMD_LAST && \
-			 (unsigned int)(x) >= TELCMD_FIRST)
-#define	TELCMD(x)	telcmds[(x)-TELCMD_FIRST]
-
-/* telnet options */
-#define TELOPT_BINARY	0	/* 8-bit data path */
-#define TELOPT_ECHO	1	/* echo */
-#define	TELOPT_RCP	2	/* prepare to reconnect */
-#define	TELOPT_SGA	3	/* suppress go ahead */
-#define	TELOPT_NAMS	4	/* approximate message size */
-#define	TELOPT_STATUS	5	/* give status */
-#define	TELOPT_TM	6	/* timing mark */
-#define	TELOPT_RCTE	7	/* remote controlled transmission and echo */
-#define TELOPT_NAOL 	8	/* negotiate about output line width */
-#define TELOPT_NAOP 	9	/* negotiate about output page size */
-#define TELOPT_NAOCRD	10	/* negotiate about CR disposition */
-#define TELOPT_NAOHTS	11	/* negotiate about horizontal tabstops */
-#define TELOPT_NAOHTD	12	/* negotiate about horizontal tab disposition */
-#define TELOPT_NAOFFD	13	/* negotiate about formfeed disposition */
-#define TELOPT_NAOVTS	14	/* negotiate about vertical tab stops */
-#define TELOPT_NAOVTD	15	/* negotiate about vertical tab disposition */
-#define TELOPT_NAOLFD	16	/* negotiate about output LF disposition */
-#define TELOPT_XASCII	17	/* extended ascic character set */
-#define	TELOPT_LOGOUT	18	/* force logout */
-#define	TELOPT_BM	19	/* byte macro */
-#define	TELOPT_DET	20	/* data entry terminal */
-#define	TELOPT_SUPDUP	21	/* supdup protocol */
-#define	TELOPT_SUPDUPOUTPUT 22	/* supdup output */
-#define	TELOPT_SNDLOC	23	/* send location */
-#define	TELOPT_TTYPE	24	/* terminal type */
-#define	TELOPT_EOR	25	/* end or record */
-#define	TELOPT_TUID	26	/* TACACS user identification */
-#define	TELOPT_OUTMRK	27	/* output marking */
-#define	TELOPT_TTYLOC	28	/* terminal location number */
-#define	TELOPT_3270REGIME 29	/* 3270 regime */
-#define	TELOPT_X3PAD	30	/* X.3 PAD */
-#define	TELOPT_NAWS	31	/* window size */
-#define	TELOPT_TSPEED	32	/* terminal speed */
-#define	TELOPT_LFLOW	33	/* remote flow control */
-#define TELOPT_LINEMODE	34	/* Linemode option */
-#define TELOPT_XDISPLOC	35	/* X Display Location */
-#define TELOPT_OLD_ENVIRON 36	/* Old - Environment variables */
-#define	TELOPT_AUTHENTICATION 37/* Authenticate */
-#define	TELOPT_ENCRYPT	38	/* Encryption option */
-#define TELOPT_NEW_ENVIRON 39	/* New - Environment variables */
-#define	TELOPT_EXOPL	255	/* extended-options-list */
-
-
-#define	NTELOPTS	(1+TELOPT_NEW_ENVIRON)
-#ifdef TELOPTS
-char *telopts[NTELOPTS+1] = {
-	"BINARY", "ECHO", "RCP", "SUPPRESS GO AHEAD", "NAME",
-	"STATUS", "TIMING MARK", "RCTE", "NAOL", "NAOP",
-	"NAOCRD", "NAOHTS", "NAOHTD", "NAOFFD", "NAOVTS",
-	"NAOVTD", "NAOLFD", "EXTEND ASCII", "LOGOUT", "BYTE MACRO",
-	"DATA ENTRY TERMINAL", "SUPDUP", "SUPDUP OUTPUT",
-	"SEND LOCATION", "TERMINAL TYPE", "END OF RECORD",
-	"TACACS UID", "OUTPUT MARKING", "TTYLOC",
-	"3270 REGIME", "X.3 PAD", "NAWS", "TSPEED", "LFLOW",
-	"LINEMODE", "XDISPLOC", "OLD-ENVIRON", "AUTHENTICATION",
-	"ENCRYPT", "NEW-ENVIRON",
-	0
-};
-#define	TELOPT_FIRST	TELOPT_BINARY
-#define	TELOPT_LAST	TELOPT_NEW_ENVIRON
-#define	TELOPT_OK(x)	((unsigned int)(x) <= TELOPT_LAST)
-#define	TELOPT(x)	telopts[(x)-TELOPT_FIRST]
-#endif
-
-/* sub-option qualifiers */
-#define	TELQUAL_IS	0	/* option is... */
-#define	TELQUAL_SEND	1	/* send option */
-#define	TELQUAL_INFO	2	/* ENVIRON: informational version of IS */
-#define	TELQUAL_REPLY	2	/* AUTHENTICATION: client version of IS */
-#define	TELQUAL_NAME	3	/* AUTHENTICATION: client version of IS */
-
-#define	LFLOW_OFF		0	/* Disable remote flow control */
-#define	LFLOW_ON		1	/* Enable remote flow control */
-#define	LFLOW_RESTART_ANY	2	/* Restart output on any char */
-#define	LFLOW_RESTART_XON	3	/* Restart output only on XON */
-
-/*
- * LINEMODE suboptions
- */
-
-#define	LM_MODE		1
-#define	LM_FORWARDMASK	2
-#define	LM_SLC		3
-
-#define	MODE_EDIT	0x01
-#define	MODE_TRAPSIG	0x02
-#define	MODE_ACK	0x04
-#define MODE_SOFT_TAB	0x08
-#define MODE_LIT_ECHO	0x10
-
-#define	MODE_MASK	0x1f
-
-/* Not part of protocol, but needed to simplify things... */
-#define MODE_FLOW		0x0100
-#define MODE_ECHO		0x0200
-#define MODE_INBIN		0x0400
-#define MODE_OUTBIN		0x0800
-#define MODE_FORCE		0x1000
-
-#define	SLC_SYNCH	1
-#define	SLC_BRK		2
-#define	SLC_IP		3
-#define	SLC_AO		4
-#define	SLC_AYT		5
-#define	SLC_EOR		6
-#define	SLC_ABORT	7
-#define	SLC_EOF		8
-#define	SLC_SUSP	9
-#define	SLC_EC		10
-#define	SLC_EL		11
-#define	SLC_EW		12
-#define	SLC_RP		13
-#define	SLC_LNEXT	14
-#define	SLC_XON		15
-#define	SLC_XOFF	16
-#define	SLC_FORW1	17
-#define	SLC_FORW2	18
-#define SLC_MCL         19
-#define SLC_MCR         20
-#define SLC_MCWL        21
-#define SLC_MCWR        22
-#define SLC_MCBOL       23
-#define SLC_MCEOL       24
-#define SLC_INSRT       25
-#define SLC_OVER        26
-#define SLC_ECR         27
-#define SLC_EWR         28
-#define SLC_EBOL        29
-#define SLC_EEOL        30
-
-#define	NSLC		30
-
-/*
- * For backwards compatability, we define SLC_NAMES to be the
- * list of names if SLC_NAMES is not defined.
- */
-#define	SLC_NAMELIST	"0", "SYNCH", "BRK", "IP", "AO", "AYT", "EOR",	\
-			"ABORT", "EOF", "SUSP", "EC", "EL", "EW", "RP",	\
-			"LNEXT", "XON", "XOFF", "FORW1", "FORW2",	\
-			"MCL", "MCR", "MCWL", "MCWR", "MCBOL",		\
-			"MCEOL", "INSRT", "OVER", "ECR", "EWR",		\
-			"EBOL", "EEOL",					\
-			0
-
-#ifdef	SLC_NAMES
-char *slc_names[] = {
-	SLC_NAMELIST
-};
-#else
-extern char *slc_names[];
-#define	SLC_NAMES SLC_NAMELIST
-#endif
-
-#define	SLC_NAME_OK(x)	((unsigned int)(x) <= NSLC)
-#define SLC_NAME(x)	slc_names[x]
-
-#define	SLC_NOSUPPORT	0
-#define	SLC_CANTCHANGE	1
-#define	SLC_VARIABLE	2
-#define	SLC_DEFAULT	3
-#define	SLC_LEVELBITS	0x03
-
-#define	SLC_FUNC	0
-#define	SLC_FLAGS	1
-#define	SLC_VALUE	2
-
-#define	SLC_ACK		0x80
-#define	SLC_FLUSHIN	0x40
-#define	SLC_FLUSHOUT	0x20
-
-#define	OLD_ENV_VAR	1
-#define	OLD_ENV_VALUE	0
-#define	NEW_ENV_VAR	0
-#define	NEW_ENV_VALUE	1
-#define	ENV_ESC		2
-#define ENV_USERVAR	3
-
-/*
- * AUTHENTICATION suboptions
- */
-
-/*
- * Who is authenticating who ...
- */
-#define	AUTH_WHO_CLIENT		0	/* Client authenticating server */
-#define	AUTH_WHO_SERVER		1	/* Server authenticating client */
-#define	AUTH_WHO_MASK		1
-
-/*
- * amount of authentication done
- */
-#define	AUTH_HOW_ONE_WAY	0
-#define	AUTH_HOW_MUTUAL		2
-#define	AUTH_HOW_MASK		2
-
-#define	AUTHTYPE_NULL		0
-#define	AUTHTYPE_KERBEROS_V4	1
-#define	AUTHTYPE_KERBEROS_V5	2
-#define	AUTHTYPE_SPX		3
-#define	AUTHTYPE_MINK		4
-#define	AUTHTYPE_CNT		5
-
-#define	AUTHTYPE_TEST		99
-
-#ifdef	AUTH_NAMES
-char *authtype_names[] = {
-	"NULL", "KERBEROS_V4", "KERBEROS_V5", "SPX", "MINK",
-	0
-};
-#else
-extern char *authtype_names[];
-#endif
-
-#define	AUTHTYPE_NAME_OK(x)	((unsigned int)(x) < AUTHTYPE_CNT)
-#define	AUTHTYPE_NAME(x)	authtype_names[x]
-
-/*
- * ENCRYPTion suboptions
- */
-#define	ENCRYPT_IS		0	/* I pick encryption type ... */
-#define	ENCRYPT_SUPPORT		1	/* I support encryption types ... */
-#define	ENCRYPT_REPLY		2	/* Initial setup response */
-#define	ENCRYPT_START		3	/* Am starting to send encrypted */
-#define	ENCRYPT_END		4	/* Am ending encrypted */
-#define	ENCRYPT_REQSTART	5	/* Request you start encrypting */
-#define	ENCRYPT_REQEND		6	/* Request you end encrypting */
-#define	ENCRYPT_ENC_KEYID	7
-#define	ENCRYPT_DEC_KEYID	8
-#define	ENCRYPT_CNT		9
-
-#define	ENCTYPE_ANY		0
-#define	ENCTYPE_DES_CFB64	1
-#define	ENCTYPE_DES_OFB64	2
-#define	ENCTYPE_CNT		3
-
-#ifdef	ENCRYPT_NAMES
-char *encrypt_names[] = {
-	"IS", "SUPPORT", "REPLY", "START", "END",
-	"REQUEST-START", "REQUEST-END", "ENC-KEYID", "DEC-KEYID",
-	0
-};
-char *enctype_names[] = {
-	"ANY", "DES_CFB64",  "DES_OFB64",
-	0
-};
-#else
-extern char *encrypt_names[];
-extern char *enctype_names[];
-#endif
-
-
-#define	ENCRYPT_NAME_OK(x)	((unsigned int)(x) < ENCRYPT_CNT)
-#define	ENCRYPT_NAME(x)		encrypt_names[x]
-
-#define	ENCTYPE_NAME_OK(x)	((unsigned int)(x) < ENCTYPE_CNT)
-#define	ENCTYPE_NAME(x)		enctype_names[x]
-
-#endif /* !_TELNET_H_ */
diff --git a/c/src/exec/libnetworking/bpfilter.h b/c/src/exec/libnetworking/bpfilter.h
deleted file mode 100644
index 5a6ee0337b..0000000000
--- a/c/src/exec/libnetworking/bpfilter.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/*
- *  $Id$
- */
-
-/* intentionally empty file */
-
diff --git a/c/src/exec/libnetworking/kern/kern_subr.c b/c/src/exec/libnetworking/kern/kern_subr.c
deleted file mode 100644
index 71e51fc442..0000000000
--- a/c/src/exec/libnetworking/kern/kern_subr.c
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)kern_subr.c	8.3 (Berkeley) 1/21/94
- * $Id$
- */
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/proc.h>
-#include <sys/malloc.h>
-#include <sys/queue.h>
-
-int
-uiomove(cp, n, uio)
-	register caddr_t cp;
-	register int n;
-	register struct uio *uio;
-{
-	register struct iovec *iov;
-	u_int cnt;
-	int error;
-
-#ifdef DIAGNOSTIC
-	if (uio->uio_rw != UIO_READ && uio->uio_rw != UIO_WRITE)
-		panic("uiomove: mode");
-#endif
-	while (n > 0 && uio->uio_resid) {
-		iov = uio->uio_iov;
-		cnt = iov->iov_len;
-		if (cnt == 0) {
-			uio->uio_iov++;
-			uio->uio_iovcnt--;
-			continue;
-		}
-		if (cnt > n)
-			cnt = n;
-
-		switch (uio->uio_segflg) {
-
-		case UIO_USERSPACE:
-		case UIO_USERISPACE:
-			if (uio->uio_rw == UIO_READ)
-				error = copyout(cp, iov->iov_base, cnt);
-			else
-				error = copyin(iov->iov_base, cp, cnt);
-			if (error)
-				return (error);
-			break;
-
-		case UIO_SYSSPACE:
-			if (uio->uio_rw == UIO_READ)
-				bcopy((caddr_t)cp, iov->iov_base, cnt);
-			else
-				bcopy(iov->iov_base, (caddr_t)cp, cnt);
-			break;
-		case UIO_NOCOPY:
-			break;
-		}
-		iov->iov_base += cnt;
-		iov->iov_len -= cnt;
-		uio->uio_resid -= cnt;
-		uio->uio_offset += cnt;
-		cp += cnt;
-		n -= cnt;
-	}
-	return (0);
-}
-
-#ifdef vax	/* unused except by ct.c, other oddities XXX */
-/*
- * Get next character written in by user from uio.
- */
-int
-uwritec(uio)
-	struct uio *uio;
-{
-	register struct iovec *iov;
-	register int c;
-
-	if (uio->uio_resid <= 0)
-		return (-1);
-again:
-	if (uio->uio_iovcnt <= 0)
-		panic("uwritec");
-	iov = uio->uio_iov;
-	if (iov->iov_len == 0) {
-		uio->uio_iov++;
-		if (--uio->uio_iovcnt == 0)
-			return (-1);
-		goto again;
-	}
-	switch (uio->uio_segflg) {
-
-	case UIO_USERSPACE:
-		c = fubyte(iov->iov_base);
-		break;
-
-	case UIO_SYSSPACE:
-		c = *(u_char *) iov->iov_base;
-		break;
-
-	case UIO_USERISPACE:
-		c = fuibyte(iov->iov_base);
-		break;
-	}
-	if (c < 0)
-		return (-1);
-	iov->iov_base++;
-	iov->iov_len--;
-	uio->uio_resid--;
-	uio->uio_offset++;
-	return (c);
-}
-#endif /* vax */
-
-/*
- * General routine to allocate a hash table.
- */
-void *
-hashinit(elements, type, hashmask)
-	int elements, type;
-	u_long *hashmask;
-{
-	long hashsize;
-	LIST_HEAD(generic, generic) *hashtbl;
-	int i;
-
-	if (elements <= 0)
-		panic("hashinit: bad elements");
-	for (hashsize = 1; hashsize <= elements; hashsize <<= 1)
-		continue;
-	hashsize >>= 1;
-	hashtbl = malloc((u_long)hashsize * sizeof(*hashtbl), type, M_WAITOK);
-	for (i = 0; i < hashsize; i++)
-		LIST_INIT(&hashtbl[i]);
-	*hashmask = hashsize - 1;
-	return (hashtbl);
-}
-
-#define NPRIMES 27
-static int primes[] = { 1, 13, 31, 61, 127, 251, 509, 761, 1021, 1531, 2039,
-			2557, 3067, 3583, 4093, 4603, 5119, 5623, 6143, 6653,
-			7159, 7673, 8191, 12281, 16381, 24571, 32749 };
-
-/*
- * General routine to allocate a prime number sized hash table.
- */
-void *
-phashinit(elements, type, nentries)
-	int elements, type;
-	u_long *nentries;
-{
-	long hashsize;
-	LIST_HEAD(generic, generic) *hashtbl;
-	int i;
-
-	if (elements <= 0)
-		panic("phashinit: bad elements");
-	for (i = 1, hashsize = primes[1]; hashsize <= elements;) {
-		i++;
-		if (i == NPRIMES)
-			break;
-		hashsize = primes[i];
-	}
-	hashsize = primes[i - 1];
-	hashtbl = malloc((u_long)hashsize * sizeof(*hashtbl), type, M_WAITOK);
-	for (i = 0; i < hashsize; i++)
-		LIST_INIT(&hashtbl[i]);
-	*nentries = hashsize;
-	return (hashtbl);
-}
diff --git a/c/src/exec/libnetworking/kern/uipc_domain.c b/c/src/exec/libnetworking/kern/uipc_domain.c
deleted file mode 100644
index 910007395c..0000000000
--- a/c/src/exec/libnetworking/kern/uipc_domain.c
+++ /dev/null
@@ -1,228 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)uipc_domain.c	8.2 (Berkeley) 10/18/93
- * $Id$
- */
-
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <sys/protosw.h>
-#include <sys/domain.h>
-#include <sys/mbuf.h>
-#include <sys/kernel.h>
-#include <sys/systm.h>
-
-/*
- * System initialization
- *
- * Note: domain initialization wants to take place on a per domain basis
- * as a result of traversing a linker set.  Most likely, each domain
- * want to call a registration function rather than being handled here
- * in domaininit().  Probably this will look like:
- *
- * SYSINIT(unique, SI_SUB_PROTO_DOMAI, SI_ORDER_ANY, domain_add, xxx)
- *
- * Where 'xxx' is replaced by the address of a parameter struct to be
- * passed to the doamin_add() function.
- */
-
-#if !defined(__rtems__)
-static int	x_save_spl;			/* used by kludge*/
-static void kludge_splimp __P((void *));
-static void kludge_splx __P((void *));
-       void domaininit __P((void *));
-SYSINIT(splimp, SI_SUB_PROTO_BEGIN, SI_ORDER_FIRST, kludge_splimp, &x_save_spl)
-SYSINIT(domain, SI_SUB_PROTO_DOMAIN, SI_ORDER_FIRST, domaininit, NULL)
-SYSINIT(splx, SI_SUB_PROTO_END, SI_ORDER_FIRST, kludge_splx, &x_save_spl)
-#endif
-
-static void	pffasttimo __P((void *));
-static void	pfslowtimo __P((void *));
-
-struct domain *domains;
-
-#define	ADDDOMAIN(x)	{ \
-	__CONCAT(x,domain.dom_next) = domains; \
-	domains = &__CONCAT(x,domain); \
-}
-
-extern struct linker_set domain_set;
-
-/* ARGSUSED*/
-void
-domaininit(dummy)
-	void *dummy;
-{
-	register struct domain *dp;
-	register struct protosw *pr;
-
-/* - not in our sources
-#ifdef ISDN
-	ADDDOMAIN(isdn);
-#endif
-*/
-
-	for (dp = domains; dp; dp = dp->dom_next) {
-		if (dp->dom_init)
-			(*dp->dom_init)();
-		for (pr = dp->dom_protosw; pr < dp->dom_protoswNPROTOSW; pr++){
-#ifdef PRU_OLDSTYLE
-			/* See comments in uipc_socket2.c. */
-			if (pr->pr_usrreqs == 0 && pr->pr_ousrreq)
-				pr->pr_usrreqs = &pru_oldstyle;
-#endif
-			if (pr->pr_init)
-				(*pr->pr_init)();
-		}
-	}
-
-	if (max_linkhdr < 16)		/* XXX */
-		max_linkhdr = 16;
-	max_hdr = max_linkhdr + max_protohdr;
-	max_datalen = MHLEN - max_hdr;
-	timeout(pffasttimo, (void *)0, 1);
-	timeout(pfslowtimo, (void *)0, 1);
-}
-
-
-/*
- * The following two operations are kludge code.  Most likely, they should
- * be done as a "domainpreinit()" for the first function and then rolled
- * in as the last act of "domaininit()" for the second.
- *
- * In point of fact, it is questionable why other initialization prior
- * to this does not also take place at splimp by default.
- */
-static void
-kludge_splimp(udata)
-	void *udata;
-{
-	int	*savesplp = udata;
-
-	*savesplp = splimp();
-}
-
-static void
-kludge_splx(udata)
-	void *udata;
-{
-	int	*savesplp = udata;
-
-	splx( *savesplp);
-}
-
-
-
-struct protosw *
-pffindtype(int family, int type)
-{
-	register struct domain *dp;
-	register struct protosw *pr;
-
-	for (dp = domains; dp; dp = dp->dom_next)
-		if (dp->dom_family == family)
-			goto found;
-	return (0);
-found:
-	for (pr = dp->dom_protosw; pr < dp->dom_protoswNPROTOSW; pr++)
-		if (pr->pr_type && pr->pr_type == type)
-			return (pr);
-	return (0);
-}
-
-struct protosw *
-pffindproto(int family, int protocol, int type)
-{
-	register struct domain *dp;
-	register struct protosw *pr;
-	struct protosw *maybe = 0;
-
-	if (family == 0)
-		return (0);
-	for (dp = domains; dp; dp = dp->dom_next)
-		if (dp->dom_family == family)
-			goto found;
-	return (0);
-found:
-	for (pr = dp->dom_protosw; pr < dp->dom_protoswNPROTOSW; pr++) {
-		if ((pr->pr_protocol == protocol) && (pr->pr_type == type))
-			return (pr);
-
-		if (type == SOCK_RAW && pr->pr_type == SOCK_RAW &&
-		    pr->pr_protocol == 0 && maybe == (struct protosw *)0)
-			maybe = pr;
-	}
-	return (maybe);
-}
-
-void
-pfctlinput(cmd, sa)
-	int cmd;
-	struct sockaddr *sa;
-{
-	register struct domain *dp;
-	register struct protosw *pr;
-
-	for (dp = domains; dp; dp = dp->dom_next)
-		for (pr = dp->dom_protosw; pr < dp->dom_protoswNPROTOSW; pr++)
-			if (pr->pr_ctlinput)
-				(*pr->pr_ctlinput)(cmd, sa, (void *)0);
-}
-
-static void
-pfslowtimo(arg)
-	void *arg;
-{
-	register struct domain *dp;
-	register struct protosw *pr;
-
-	for (dp = domains; dp; dp = dp->dom_next)
-		for (pr = dp->dom_protosw; pr < dp->dom_protoswNPROTOSW; pr++)
-			if (pr->pr_slowtimo)
-				(*pr->pr_slowtimo)();
-	timeout(pfslowtimo, (void *)0, hz/2);
-}
-
-static void
-pffasttimo(arg)
-	void *arg;
-{
-	register struct domain *dp;
-	register struct protosw *pr;
-
-	for (dp = domains; dp; dp = dp->dom_next)
-		for (pr = dp->dom_protosw; pr < dp->dom_protoswNPROTOSW; pr++)
-			if (pr->pr_fasttimo)
-				(*pr->pr_fasttimo)();
-	timeout(pffasttimo, (void *)0, hz/5);
-}
diff --git a/c/src/exec/libnetworking/kern/uipc_mbuf.c b/c/src/exec/libnetworking/kern/uipc_mbuf.c
deleted file mode 100644
index f682be94a7..0000000000
--- a/c/src/exec/libnetworking/kern/uipc_mbuf.c
+++ /dev/null
@@ -1,851 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1988, 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)uipc_mbuf.c	8.2 (Berkeley) 1/4/94
- * $Id$
- */
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/proc.h>
-#include <sys/malloc.h>
-#define MBTYPES
-#include <sys/mbuf.h>
-#include <sys/kernel.h>
-#include <sys/syslog.h>
-#include <sys/domain.h>
-#include <sys/protosw.h>
-
-#include <vm/vm.h>
-#include <vm/vm_param.h>
-#include <vm/vm_kern.h>
-#include <vm/vm_extern.h>
-
-static void mbinit __P((void *));
-SYSINIT(mbuf, SI_SUB_MBUF, SI_ORDER_FIRST, mbinit, NULL)
-
-struct mbuf *mbutl;
-char	*mclrefcnt;
-struct mbstat mbstat;
-struct mbuf *mmbfree;
-union mcluster *mclfree;
-int	max_linkhdr;
-int	max_protohdr;
-int	max_hdr;
-int	max_datalen;
-
-static void	m_reclaim __P((void));
-
-/* "number of clusters of pages" */
-#define NCL_INIT	1
-
-#define NMB_INIT	16
-
-/* ARGSUSED*/
-static void
-mbinit(dummy)
-	void *dummy;
-{
-	int s;
-
-	mmbfree = NULL; mclfree = NULL;
-	s = splimp();
-	if (m_mballoc(NMB_INIT, M_DONTWAIT) == 0)
-		goto bad;
-	if (m_clalloc(NCL_INIT, M_DONTWAIT) == 0)
-		goto bad;
-	splx(s);
-	return;
-bad:
-	panic("mbinit");
-}
-
-/*
- * Allocate at least nmb mbufs and place on mbuf free list.
- * Must be called at splimp.
- */
-/* ARGSUSED */
-int
-m_mballoc(nmb, nowait)
-	register int nmb;
-	int nowait;
-{
-	register caddr_t p;
-	register int i;
-	int nbytes;
-
-	/* Once we run out of map space, it will be impossible to get
-	 * any more (nothing is ever freed back to the map) (XXX which
-	 * is dumb). (however you are not dead as m_reclaim might
-	 * still be able to free a substantial amount of space).
-	 */
-	if (mb_map_full)
-		return (0);
-
-	nbytes = round_page(nmb * MSIZE);
-	p = (caddr_t)kmem_malloc(mb_map, nbytes, nowait ? M_NOWAIT : M_WAITOK);
-	/*
-	 * Either the map is now full, or this is nowait and there
-	 * are no pages left.
-	 */
-	if (p == NULL)
-		return (0);
-
-	nmb = nbytes / MSIZE;
-	for (i = 0; i < nmb; i++) {
-		((struct mbuf *)p)->m_next = mmbfree;
-		mmbfree = (struct mbuf *)p;
-		p += MSIZE;
-	}
-	mbstat.m_mbufs += nmb;
-	return (1);
-}
-
-/*
- * Allocate some number of mbuf clusters
- * and place on cluster free list.
- * Must be called at splimp.
- */
-/* ARGSUSED */
-int
-m_clalloc(ncl, nowait)
-	register int ncl;
-	int nowait;
-{
-	register caddr_t p;
-	register int i;
-
-	/*
-	 * Once we run out of map space, it will be impossible
-	 * to get any more (nothing is ever freed back to the
-	 * map).
-	 */
-	if (mb_map_full)
-		return (0);
-
-	p = (caddr_t)kmem_malloc(mb_map, ncl*MCLBYTES,
-				 nowait ? M_NOWAIT : M_WAITOK);
-	/*
-	 * Either the map is now full, or this is nowait and there
-	 * are no pages left.
-	 */
-	if (p == NULL)
-		return (0);
-
-	for (i = 0; i < ncl; i++) {
-		((union mcluster *)p)->mcl_next = mclfree;
-		mclfree = (union mcluster *)p;
-		p += MCLBYTES;
-		mbstat.m_clfree++;
-	}
-	mbstat.m_clusters += ncl;
-	return (1);
-}
-
-/*
- * When MGET failes, ask protocols to free space when short of memory,
- * then re-attempt to allocate an mbuf.
- */
-struct mbuf *
-m_retry(i, t)
-	int i, t;
-{
-	register struct mbuf *m;
-
-	m_reclaim();
-#define m_retry(i, t)	(struct mbuf *)0
-	MGET(m, i, t);
-#undef m_retry
-	if (m != NULL)
-		mbstat.m_wait++;
-	else
-		mbstat.m_drops++;
-	return (m);
-}
-
-/*
- * As above; retry an MGETHDR.
- */
-struct mbuf *
-m_retryhdr(i, t)
-	int i, t;
-{
-	register struct mbuf *m;
-
-	m_reclaim();
-#define m_retryhdr(i, t) (struct mbuf *)0
-	MGETHDR(m, i, t);
-#undef m_retryhdr
-	if (m != NULL)
-		mbstat.m_wait++;
-	else
-		mbstat.m_drops++;
-	return (m);
-}
-
-static void
-m_reclaim()
-{
-	register struct domain *dp;
-	register struct protosw *pr;
-	int s = splimp();
-
-	for (dp = domains; dp; dp = dp->dom_next)
-		for (pr = dp->dom_protosw; pr < dp->dom_protoswNPROTOSW; pr++)
-			if (pr->pr_drain)
-				(*pr->pr_drain)();
-	splx(s);
-	mbstat.m_drain++;
-}
-
-/*
- * Space allocation routines.
- * These are also available as macros
- * for critical paths.
- */
-struct mbuf *
-m_get(nowait, type)
-	int nowait, type;
-{
-	register struct mbuf *m;
-
-	MGET(m, nowait, type);
-	return (m);
-}
-
-struct mbuf *
-m_gethdr(nowait, type)
-	int nowait, type;
-{
-	register struct mbuf *m;
-
-	MGETHDR(m, nowait, type);
-	return (m);
-}
-
-struct mbuf *
-m_getclr(nowait, type)
-	int nowait, type;
-{
-	register struct mbuf *m;
-
-	MGET(m, nowait, type);
-	if (m == 0)
-		return (0);
-	bzero(mtod(m, caddr_t), MLEN);
-	return (m);
-}
-
-struct mbuf *
-m_free(m)
-	struct mbuf *m;
-{
-	register struct mbuf *n;
-
-	MFREE(m, n);
-	return (n);
-}
-
-void
-m_freem(m)
-	register struct mbuf *m;
-{
-	register struct mbuf *n;
-
-	if (m == NULL)
-		return;
-	do {
-		MFREE(m, n);
-		m = n;
-	} while (m);
-}
-
-/*
- * Mbuffer utility routines.
- */
-
-/*
- * Lesser-used path for M_PREPEND:
- * allocate new mbuf to prepend to chain,
- * copy junk along.
- */
-struct mbuf *
-m_prepend(m, len, how)
-	register struct mbuf *m;
-	int len, how;
-{
-	struct mbuf *mn;
-
-	MGET(mn, how, m->m_type);
-	if (mn == (struct mbuf *)NULL) {
-		m_freem(m);
-		return ((struct mbuf *)NULL);
-	}
-	if (m->m_flags & M_PKTHDR) {
-		M_COPY_PKTHDR(mn, m);
-		m->m_flags &= ~M_PKTHDR;
-	}
-	mn->m_next = m;
-	m = mn;
-	if (len < MHLEN)
-		MH_ALIGN(m, len);
-	m->m_len = len;
-	return (m);
-}
-
-/*
- * Make a copy of an mbuf chain starting "off0" bytes from the beginning,
- * continuing for "len" bytes.  If len is M_COPYALL, copy to end of mbuf.
- * The wait parameter is a choice of M_WAIT/M_DONTWAIT from caller.
- */
-static int MCFail;
-
-struct mbuf *
-m_copym(m, off0, len, wait)
-	register struct mbuf *m;
-	int off0, wait;
-	register int len;
-{
-	register struct mbuf *n, **np;
-	register int off = off0;
-	struct mbuf *top;
-	int copyhdr = 0;
-
-	if (off < 0 || len < 0)
-		panic("m_copym");
-	if (off == 0 && m->m_flags & M_PKTHDR)
-		copyhdr = 1;
-	while (off > 0) {
-		if (m == 0)
-			panic("m_copym");
-		if (off < m->m_len)
-			break;
-		off -= m->m_len;
-		m = m->m_next;
-	}
-	np = &top;
-	top = 0;
-	while (len > 0) {
-		if (m == 0) {
-			if (len != M_COPYALL)
-				panic("m_copym");
-			break;
-		}
-		MGET(n, wait, m->m_type);
-		*np = n;
-		if (n == 0)
-			goto nospace;
-		if (copyhdr) {
-			M_COPY_PKTHDR(n, m);
-			if (len == M_COPYALL)
-				n->m_pkthdr.len -= off0;
-			else
-				n->m_pkthdr.len = len;
-			copyhdr = 0;
-		}
-		n->m_len = min(len, m->m_len - off);
-		if (m->m_flags & M_EXT) {
-			n->m_data = m->m_data + off;
-			if(!m->m_ext.ext_ref)
-				mclrefcnt[mtocl(m->m_ext.ext_buf)]++;
-			else
-				(*(m->m_ext.ext_ref))(m->m_ext.ext_buf,
-							m->m_ext.ext_size);
-			n->m_ext = m->m_ext;
-			n->m_flags |= M_EXT;
-		} else
-			bcopy(mtod(m, caddr_t)+off, mtod(n, caddr_t),
-			    (unsigned)n->m_len);
-		if (len != M_COPYALL)
-			len -= n->m_len;
-		off = 0;
-		m = m->m_next;
-		np = &n->m_next;
-	}
-	if (top == 0)
-		MCFail++;
-	return (top);
-nospace:
-	m_freem(top);
-	MCFail++;
-	return (0);
-}
-
-/*
- * Copy an entire packet, including header (which must be present).
- * An optimization of the common case `m_copym(m, 0, M_COPYALL, how)'.
- */
-struct mbuf *
-m_copypacket(m, how)
-	struct mbuf *m;
-	int how;
-{
-	struct mbuf *top, *n, *o;
-
-	MGET(n, how, m->m_type);
-	top = n;
-	if (!n)
-		goto nospace;
-
-	M_COPY_PKTHDR(n, m);
-	n->m_len = m->m_len;
-	if (m->m_flags & M_EXT) {
-		n->m_data = m->m_data;
-		mclrefcnt[mtocl(m->m_ext.ext_buf)]++;
-		n->m_ext = m->m_ext;
-		n->m_flags |= M_EXT;
-	} else {
-		bcopy(mtod(m, char *), mtod(n, char *), n->m_len);
-	}
-
-	m = m->m_next;
-	while (m) {
-		MGET(o, how, m->m_type);
-		if (!o)
-			goto nospace;
-
-		n->m_next = o;
-		n = n->m_next;
-
-		n->m_len = m->m_len;
-		if (m->m_flags & M_EXT) {
-			n->m_data = m->m_data;
-			mclrefcnt[mtocl(m->m_ext.ext_buf)]++;
-			n->m_ext = m->m_ext;
-			n->m_flags |= M_EXT;
-		} else {
-			bcopy(mtod(m, char *), mtod(n, char *), n->m_len);
-		}
-
-		m = m->m_next;
-	}
-	return top;
-nospace:
-	m_freem(top);
-	MCFail++;
-	return 0;
-}
-
-/*
- * Copy data from an mbuf chain starting "off" bytes from the beginning,
- * continuing for "len" bytes, into the indicated buffer.
- */
-void
-m_copydata(m, off, len, cp)
-	register struct mbuf *m;
-	register int off;
-	register int len;
-	caddr_t cp;
-{
-	register unsigned count;
-
-	if (off < 0 || len < 0)
-		panic("m_copydata");
-	while (off > 0) {
-		if (m == 0)
-			panic("m_copydata");
-		if (off < m->m_len)
-			break;
-		off -= m->m_len;
-		m = m->m_next;
-	}
-	while (len > 0) {
-		if (m == 0)
-			panic("m_copydata");
-		count = min(m->m_len - off, len);
-		bcopy(mtod(m, caddr_t) + off, cp, count);
-		len -= count;
-		cp += count;
-		off = 0;
-		m = m->m_next;
-	}
-}
-
-/*
- * Concatenate mbuf chain n to m.
- * Both chains must be of the same type (e.g. MT_DATA).
- * Any m_pkthdr is not updated.
- */
-void
-m_cat(m, n)
-	register struct mbuf *m, *n;
-{
-	while (m->m_next)
-		m = m->m_next;
-	while (n) {
-		if (m->m_flags & M_EXT ||
-		    m->m_data + m->m_len + n->m_len >= &m->m_dat[MLEN]) {
-			/* just join the two chains */
-			m->m_next = n;
-			return;
-		}
-		/* splat the data from one into the other */
-		bcopy(mtod(n, caddr_t), mtod(m, caddr_t) + m->m_len,
-		    (u_int)n->m_len);
-		m->m_len += n->m_len;
-		n = m_free(n);
-	}
-}
-
-void
-m_adj(mp, req_len)
-	struct mbuf *mp;
-	int req_len;
-{
-	register int len = req_len;
-	register struct mbuf *m;
-	register int count;
-
-	if ((m = mp) == NULL)
-		return;
-	if (len >= 0) {
-		/*
-		 * Trim from head.
-		 */
-		while (m != NULL && len > 0) {
-			if (m->m_len <= len) {
-				len -= m->m_len;
-				m->m_len = 0;
-				m = m->m_next;
-			} else {
-				m->m_len -= len;
-				m->m_data += len;
-				len = 0;
-			}
-		}
-		m = mp;
-		if (mp->m_flags & M_PKTHDR)
-			m->m_pkthdr.len -= (req_len - len);
-	} else {
-		/*
-		 * Trim from tail.  Scan the mbuf chain,
-		 * calculating its length and finding the last mbuf.
-		 * If the adjustment only affects this mbuf, then just
-		 * adjust and return.  Otherwise, rescan and truncate
-		 * after the remaining size.
-		 */
-		len = -len;
-		count = 0;
-		for (;;) {
-			count += m->m_len;
-			if (m->m_next == (struct mbuf *)0)
-				break;
-			m = m->m_next;
-		}
-		if (m->m_len >= len) {
-			m->m_len -= len;
-			if (mp->m_flags & M_PKTHDR)
-				mp->m_pkthdr.len -= len;
-			return;
-		}
-		count -= len;
-		if (count < 0)
-			count = 0;
-		/*
-		 * Correct length for chain is "count".
-		 * Find the mbuf with last data, adjust its length,
-		 * and toss data from remaining mbufs on chain.
-		 */
-		m = mp;
-		if (m->m_flags & M_PKTHDR)
-			m->m_pkthdr.len = count;
-		for (; m; m = m->m_next) {
-			if (m->m_len >= count) {
-				m->m_len = count;
-				break;
-			}
-			count -= m->m_len;
-		}
-		while (m->m_next)
-			(m = m->m_next) ->m_len = 0;
-	}
-}
-
-/*
- * Rearange an mbuf chain so that len bytes are contiguous
- * and in the data area of an mbuf (so that mtod and dtom
- * will work for a structure of size len).  Returns the resulting
- * mbuf chain on success, frees it and returns null on failure.
- * If there is room, it will add up to max_protohdr-len extra bytes to the
- * contiguous region in an attempt to avoid being called next time.
- */
-static int MPFail;
-
-struct mbuf *
-m_pullup(n, len)
-	register struct mbuf *n;
-	int len;
-{
-	register struct mbuf *m;
-	register int count;
-	int space;
-
-	/*
-	 * If first mbuf has no cluster, and has room for len bytes
-	 * without shifting current data, pullup into it,
-	 * otherwise allocate a new mbuf to prepend to the chain.
-	 */
-	if ((n->m_flags & M_EXT) == 0 &&
-	    n->m_data + len < &n->m_dat[MLEN] && n->m_next) {
-		if (n->m_len >= len)
-			return (n);
-		m = n;
-		n = n->m_next;
-		len -= m->m_len;
-	} else {
-		if (len > MHLEN)
-			goto bad;
-		MGET(m, M_DONTWAIT, n->m_type);
-		if (m == 0)
-			goto bad;
-		m->m_len = 0;
-		if (n->m_flags & M_PKTHDR) {
-			M_COPY_PKTHDR(m, n);
-			n->m_flags &= ~M_PKTHDR;
-		}
-	}
-	space = &m->m_dat[MLEN] - (m->m_data + m->m_len);
-	do {
-		count = min(min(max(len, max_protohdr), space), n->m_len);
-		bcopy(mtod(n, caddr_t), mtod(m, caddr_t) + m->m_len,
-		  (unsigned)count);
-		len -= count;
-		m->m_len += count;
-		n->m_len -= count;
-		space -= count;
-		if (n->m_len)
-			n->m_data += count;
-		else
-			n = m_free(n);
-	} while (len > 0 && n);
-	if (len > 0) {
-		(void) m_free(m);
-		goto bad;
-	}
-	m->m_next = n;
-	return (m);
-bad:
-	m_freem(n);
-	MPFail++;
-	return (0);
-}
-
-/*
- * Partition an mbuf chain in two pieces, returning the tail --
- * all but the first len0 bytes.  In case of failure, it returns NULL and
- * attempts to restore the chain to its original state.
- */
-struct mbuf *
-m_split(m0, len0, wait)
-	register struct mbuf *m0;
-	int len0, wait;
-{
-	register struct mbuf *m, *n;
-	unsigned len = len0, remain;
-
-	for (m = m0; m && len > m->m_len; m = m->m_next)
-		len -= m->m_len;
-	if (m == 0)
-		return (0);
-	remain = m->m_len - len;
-	if (m0->m_flags & M_PKTHDR) {
-		MGETHDR(n, wait, m0->m_type);
-		if (n == 0)
-			return (0);
-		n->m_pkthdr.rcvif = m0->m_pkthdr.rcvif;
-		n->m_pkthdr.len = m0->m_pkthdr.len - len0;
-		m0->m_pkthdr.len = len0;
-		if (m->m_flags & M_EXT)
-			goto extpacket;
-		if (remain > MHLEN) {
-			/* m can't be the lead packet */
-			MH_ALIGN(n, 0);
-			n->m_next = m_split(m, len, wait);
-			if (n->m_next == 0) {
-				(void) m_free(n);
-				return (0);
-			} else
-				return (n);
-		} else
-			MH_ALIGN(n, remain);
-	} else if (remain == 0) {
-		n = m->m_next;
-		m->m_next = 0;
-		return (n);
-	} else {
-		MGET(n, wait, m->m_type);
-		if (n == 0)
-			return (0);
-		M_ALIGN(n, remain);
-	}
-extpacket:
-	if (m->m_flags & M_EXT) {
-		n->m_flags |= M_EXT;
-		n->m_ext = m->m_ext;
-		if(!m->m_ext.ext_ref)
-			mclrefcnt[mtocl(m->m_ext.ext_buf)]++;
-		else
-			(*(m->m_ext.ext_ref))(m->m_ext.ext_buf,
-						m->m_ext.ext_size);
-		m->m_ext.ext_size = 0; /* For Accounting XXXXXX danger */
-		n->m_data = m->m_data + len;
-	} else {
-		bcopy(mtod(m, caddr_t) + len, mtod(n, caddr_t), remain);
-	}
-	n->m_len = remain;
-	m->m_len = len;
-	n->m_next = m->m_next;
-	m->m_next = 0;
-	return (n);
-}
-/*
- * Routine to copy from device local memory into mbufs.
- */
-struct mbuf *
-m_devget(buf, totlen, off0, ifp, copy)
-	char *buf;
-	int totlen, off0;
-	struct ifnet *ifp;
-	void (*copy) __P((char *from, caddr_t to, u_int len));
-{
-	register struct mbuf *m;
-	struct mbuf *top = 0, **mp = &top;
-	register int off = off0, len;
-	register char *cp;
-	char *epkt;
-
-	cp = buf;
-	epkt = cp + totlen;
-	if (off) {
-		cp += off + 2 * sizeof(u_short);
-		totlen -= 2 * sizeof(u_short);
-	}
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
-	if (m == 0)
-		return (0);
-	m->m_pkthdr.rcvif = ifp;
-	m->m_pkthdr.len = totlen;
-	m->m_len = MHLEN;
-
-	while (totlen > 0) {
-		if (top) {
-			MGET(m, M_DONTWAIT, MT_DATA);
-			if (m == 0) {
-				m_freem(top);
-				return (0);
-			}
-			m->m_len = MLEN;
-		}
-		len = min(totlen, epkt - cp);
-		if (len >= MINCLSIZE) {
-			MCLGET(m, M_DONTWAIT);
-			if (m->m_flags & M_EXT)
-				m->m_len = len = min(len, MCLBYTES);
-			else
-				len = m->m_len;
-		} else {
-			/*
-			 * Place initial small packet/header at end of mbuf.
-			 */
-			if (len < m->m_len) {
-				if (top == 0 && len + max_linkhdr <= m->m_len)
-					m->m_data += max_linkhdr;
-				m->m_len = len;
-			} else
-				len = m->m_len;
-		}
-		if (copy)
-			copy(cp, mtod(m, caddr_t), (unsigned)len);
-		else
-			bcopy(cp, mtod(m, caddr_t), (unsigned)len);
-		cp += len;
-		*mp = m;
-		mp = &m->m_next;
-		totlen -= len;
-		if (cp == epkt)
-			cp = buf;
-	}
-	return (top);
-}
-
-/*
- * Copy data from a buffer back into the indicated mbuf chain,
- * starting "off" bytes from the beginning, extending the mbuf
- * chain if necessary.
- */
-void
-m_copyback(m0, off, len, cp)
-	struct	mbuf *m0;
-	register int off;
-	register int len;
-	caddr_t cp;
-{
-	register int mlen;
-	register struct mbuf *m = m0, *n;
-	int totlen = 0;
-
-	if (m0 == 0)
-		return;
-	while (off > (mlen = m->m_len)) {
-		off -= mlen;
-		totlen += mlen;
-		if (m->m_next == 0) {
-			n = m_getclr(M_DONTWAIT, m->m_type);
-			if (n == 0)
-				goto out;
-			n->m_len = min(MLEN, len + off);
-			m->m_next = n;
-		}
-		m = m->m_next;
-	}
-	while (len > 0) {
-		mlen = min (m->m_len - off, len);
-		bcopy(cp, off + mtod(m, caddr_t), (unsigned)mlen);
-		cp += mlen;
-		len -= mlen;
-		mlen += off;
-		off = 0;
-		totlen += mlen;
-		if (len == 0)
-			break;
-		if (m->m_next == 0) {
-			n = m_get(M_DONTWAIT, m->m_type);
-			if (n == 0)
-				break;
-			n->m_len = min(MLEN, len);
-			m->m_next = n;
-		}
-		m = m->m_next;
-	}
-out:	if (((m = m0)->m_flags & M_PKTHDR) && (m->m_pkthdr.len < totlen))
-		m->m_pkthdr.len = totlen;
-}
diff --git a/c/src/exec/libnetworking/kern/uipc_socket.c b/c/src/exec/libnetworking/kern/uipc_socket.c
deleted file mode 100644
index 895d1c7d45..0000000000
--- a/c/src/exec/libnetworking/kern/uipc_socket.c
+++ /dev/null
@@ -1,1100 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1988, 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)uipc_socket.c	8.3 (Berkeley) 4/15/94
- * $Id$
- */
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/systm.h>
-#include <sys/proc.h>
-#include <sys/file.h>
-#include <sys/malloc.h>
-#include <sys/mbuf.h>
-#include <sys/domain.h>
-#include <sys/kernel.h>
-#include <sys/protosw.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/resourcevar.h>
-#include <sys/signalvar.h>
-#include <sys/sysctl.h>
-
-static int somaxconn = SOMAXCONN;
-SYSCTL_INT(_kern, KERN_SOMAXCONN, somaxconn, CTLFLAG_RW, &somaxconn, 0, "");
-
-/*
- * Socket operation routines.
- * These routines are called by the routines in
- * sys_socket.c or from a system process, and
- * implement the semantics of socket operations by
- * switching out to the protocol specific routines.
- */
-/*ARGSUSED*/
-int
-socreate(dom, aso, type, proto, p)
-	int dom;
-	struct socket **aso;
-	register int type;
-	int proto;
-	struct proc *p;
-{
-	register struct protosw *prp;
-	register struct socket *so;
-	register int error;
-
-	if (proto)
-		prp = pffindproto(dom, proto, type);
-	else
-		prp = pffindtype(dom, type);
-	if (prp == 0 || prp->pr_usrreqs == 0)
-		return (EPROTONOSUPPORT);
-	if (prp->pr_type != type)
-		return (EPROTOTYPE);
-	MALLOC(so, struct socket *, sizeof(*so), M_SOCKET, M_WAIT);
-	bzero((caddr_t)so, sizeof(*so));
-	TAILQ_INIT(&so->so_incomp);
-	TAILQ_INIT(&so->so_comp);
-	so->so_type = type;
-	so->so_state = SS_PRIV;
-	so->so_uid = 0;
-	so->so_proto = prp;
-	error = (*prp->pr_usrreqs->pru_attach)(so, proto);
-	if (error) {
-		so->so_state |= SS_NOFDREF;
-		sofree(so);
-		return (error);
-	}
-	*aso = so;
-	return (0);
-}
-
-int
-sobind(so, nam)
-	struct socket *so;
-	struct mbuf *nam;
-{
-	int s = splnet();
-	int error;
-
-	error = (*so->so_proto->pr_usrreqs->pru_bind)(so, nam);
-	splx(s);
-	return (error);
-}
-
-int
-solisten(so, backlog)
-	register struct socket *so;
-	int backlog;
-{
-	int s = splnet(), error;
-
-	error = (*so->so_proto->pr_usrreqs->pru_listen)(so);
-	if (error) {
-		splx(s);
-		return (error);
-	}
-	if (so->so_comp.tqh_first == NULL)
-		so->so_options |= SO_ACCEPTCONN;
-	if (backlog < 0 || backlog > somaxconn)
-		backlog = somaxconn;
-	so->so_qlimit = backlog;
-	splx(s);
-	return (0);
-}
-
-void
-sofree(so)
-	register struct socket *so;
-{
-	struct socket *head = so->so_head;
-
-	if (so->so_pcb || (so->so_state & SS_NOFDREF) == 0)
-		return;
-	if (head != NULL) {
-		if (so->so_state & SS_INCOMP) {
-			TAILQ_REMOVE(&head->so_incomp, so, so_list);
-			head->so_incqlen--;
-		} else if (so->so_state & SS_COMP) {
-			TAILQ_REMOVE(&head->so_comp, so, so_list);
-		} else {
-			panic("sofree: not queued");
-		}
-		head->so_qlen--;
-		so->so_state &= ~(SS_INCOMP|SS_COMP);
-		so->so_head = NULL;
-	}
-	sbrelease(&so->so_snd);
-	sorflush(so);
-	FREE(so, M_SOCKET);
-}
-
-/*
- * Close a socket on last file table reference removal.
- * Initiate disconnect if connected.
- * Free socket when disconnect complete.
- */
-int
-soclose(so)
-	register struct socket *so;
-{
-	int s = splnet();		/* conservative */
-	int error = 0;
-
-	if (so->so_options & SO_ACCEPTCONN) {
-		struct socket *sp, *sonext;
-
-		for (sp = so->so_incomp.tqh_first; sp != NULL; sp = sonext) {
-			sonext = sp->so_list.tqe_next;
-			(void) soabort(sp);
-		}
-		for (sp = so->so_comp.tqh_first; sp != NULL; sp = sonext) {
-			sonext = sp->so_list.tqe_next;
-			(void) soabort(sp);
-		}
-	}
-	if (so->so_pcb == 0)
-		goto discard;
-	if (so->so_state & SS_ISCONNECTED) {
-		if ((so->so_state & SS_ISDISCONNECTING) == 0) {
-			error = sodisconnect(so);
-			if (error)
-				goto drop;
-		}
-		if (so->so_options & SO_LINGER) {
-			if ((so->so_state & SS_ISDISCONNECTING) &&
-			    (so->so_state & SS_NBIO))
-				goto drop;
-			while (so->so_state & SS_ISCONNECTED) {
-				soconnsleep (so);
-			}
-		}
-	}
-drop:
-	if (so->so_pcb) {
-		int error2 = (*so->so_proto->pr_usrreqs->pru_detach)(so);
-		if (error == 0)
-			error = error2;
-	}
-discard:
-	if (so->so_state & SS_NOFDREF)
-		panic("soclose: NOFDREF");
-	so->so_state |= SS_NOFDREF;
-	sofree(so);
-	splx(s);
-	return (error);
-}
-
-/*
- * Must be called at splnet...
- */
-int
-soabort(so)
-	struct socket *so;
-{
-
-	return (*so->so_proto->pr_usrreqs->pru_abort)(so);
-}
-
-int
-soaccept(so, nam)
-	register struct socket *so;
-	struct mbuf *nam;
-{
-	int s = splnet();
-	int error;
-
-	if ((so->so_state & SS_NOFDREF) == 0)
-		panic("soaccept: !NOFDREF");
-	so->so_state &= ~SS_NOFDREF;
-	error = (*so->so_proto->pr_usrreqs->pru_accept)(so, nam);
-	splx(s);
-	return (error);
-}
-
-int
-soconnect(so, nam)
-	register struct socket *so;
-	struct mbuf *nam;
-{
-	int s;
-	int error;
-
-	if (so->so_options & SO_ACCEPTCONN)
-		return (EOPNOTSUPP);
-	s = splnet();
-	/*
-	 * If protocol is connection-based, can only connect once.
-	 * Otherwise, if connected, try to disconnect first.
-	 * This allows user to disconnect by connecting to, e.g.,
-	 * a null address.
-	 */
-	if (so->so_state & (SS_ISCONNECTED|SS_ISCONNECTING) &&
-	    ((so->so_proto->pr_flags & PR_CONNREQUIRED) ||
-	    (error = sodisconnect(so))))
-		error = EISCONN;
-	else
-		error = (*so->so_proto->pr_usrreqs->pru_connect)(so, nam);
-	splx(s);
-	return (error);
-}
-
-int
-soconnect2(so1, so2)
-	register struct socket *so1;
-	struct socket *so2;
-{
-	int s = splnet();
-	int error;
-
-	error = (*so1->so_proto->pr_usrreqs->pru_connect2)(so1, so2);
-	splx(s);
-	return (error);
-}
-
-int
-sodisconnect(so)
-	register struct socket *so;
-{
-	int s = splnet();
-	int error;
-
-	if ((so->so_state & SS_ISCONNECTED) == 0) {
-		error = ENOTCONN;
-		goto bad;
-	}
-	if (so->so_state & SS_ISDISCONNECTING) {
-		error = EALREADY;
-		goto bad;
-	}
-	error = (*so->so_proto->pr_usrreqs->pru_disconnect)(so);
-bad:
-	splx(s);
-	return (error);
-}
-
-#define	SBLOCKWAIT(f)	(((f) & MSG_DONTWAIT) ? M_NOWAIT : M_WAITOK)
-/*
- * Send on a socket.
- * If send must go all at once and message is larger than
- * send buffering, then hard error.
- * Lock against other senders.
- * If must go all at once and not enough room now, then
- * inform user that this would block and do nothing.
- * Otherwise, if nonblocking, send as much as possible.
- * The data to be sent is described by "uio" if nonzero,
- * otherwise by the mbuf chain "top" (which must be null
- * if uio is not).  Data provided in mbuf chain must be small
- * enough to send all at once.
- *
- * Returns nonzero on error, timeout or signal; callers
- * must check for short counts if EINTR/ERESTART are returned.
- * Data and control buffers are freed on return.
- */
-int
-sosend(so, addr, uio, top, control, flags)
-	register struct socket *so;
-	struct mbuf *addr;
-	struct uio *uio;
-	struct mbuf *top;
-	struct mbuf *control;
-	int flags;
-{
-	struct mbuf **mp;
-	register struct mbuf *m;
-	register long space, len, resid;
-	int clen = 0, error, s, dontroute, mlen;
-	int atomic = sosendallatonce(so) || top;
-
-	if (uio)
-		resid = uio->uio_resid;
-	else
-		resid = top->m_pkthdr.len;
-	/*
-	 * In theory resid should be unsigned.
-	 * However, space must be signed, as it might be less than 0
-	 * if we over-committed, and we must use a signed comparison
-	 * of space and resid.  On the other hand, a negative resid
-	 * causes us to loop sending 0-length segments to the protocol.
-	 *
-	 * Also check to make sure that MSG_EOR isn't used on SOCK_STREAM
-	 * type sockets since that's an error.
-	 */
-	if ((resid < 0) || (so->so_type == SOCK_STREAM && (flags & MSG_EOR))) {
-		error = EINVAL;
-		goto out;
-	}
-
-	dontroute =
-	    (flags & MSG_DONTROUTE) && (so->so_options & SO_DONTROUTE) == 0 &&
-	    (so->so_proto->pr_flags & PR_ATOMIC);
-	if (control)
-		clen = control->m_len;
-#define	snderr(errno)	{ error = errno; splx(s); goto release; }
-
-restart:
-	error = sblock(&so->so_snd, SBLOCKWAIT(flags));
-	if (error)
-		goto out;
-	do {
-		s = splnet();
-		if (so->so_state & SS_CANTSENDMORE)
-			snderr(EPIPE);
-		if (so->so_error) {
-			error = so->so_error;
-			so->so_error = 0;
-			splx(s);
-			goto release;
-		}
-		if ((so->so_state & SS_ISCONNECTED) == 0) {
-			/*
-			 * `sendto' and `sendmsg' is allowed on a connection-
-			 * based socket if it supports implied connect.
-			 * Return ENOTCONN if not connected and no address is
-			 * supplied.
-			 */
-			if ((so->so_proto->pr_flags & PR_CONNREQUIRED) &&
-			    (so->so_proto->pr_flags & PR_IMPLOPCL) == 0) {
-				if ((so->so_state & SS_ISCONFIRMING) == 0 &&
-				    !(resid == 0 && clen != 0))
-					snderr(ENOTCONN);
-			} else if (addr == 0)
-			    snderr(so->so_proto->pr_flags & PR_CONNREQUIRED ?
-				   ENOTCONN : EDESTADDRREQ);
-		}
-		space = sbspace(&so->so_snd);
-		if (flags & MSG_OOB)
-			space += 1024;
-		if ((atomic && resid > so->so_snd.sb_hiwat) ||
-		    clen > so->so_snd.sb_hiwat)
-			snderr(EMSGSIZE);
-		if (space < resid + clen && uio &&
-		    (atomic || space < so->so_snd.sb_lowat || space < clen)) {
-			if (so->so_state & SS_NBIO)
-				snderr(EWOULDBLOCK);
-			sbunlock(&so->so_snd);
-			error = sbwait(&so->so_snd);
-			splx(s);
-			if (error)
-				goto out;
-			goto restart;
-		}
-		splx(s);
-		mp = &top;
-		space -= clen;
-		do {
-		    if (uio == NULL) {
-			/*
-			 * Data is prepackaged in "top".
-			 */
-			resid = 0;
-			if (flags & MSG_EOR)
-				top->m_flags |= M_EOR;
-		    } else do {
-			if (top == 0) {
-				MGETHDR(m, M_WAIT, MT_DATA);
-				mlen = MHLEN;
-				m->m_pkthdr.len = 0;
-				m->m_pkthdr.rcvif = (struct ifnet *)0;
-			} else {
-				MGET(m, M_WAIT, MT_DATA);
-				mlen = MLEN;
-			}
-			if (resid >= MINCLSIZE) {
-				MCLGET(m, M_WAIT);
-				if ((m->m_flags & M_EXT) == 0)
-					goto nopages;
-				mlen = MCLBYTES;
-				len = min(min(mlen, resid), space);
-			} else {
-nopages:
-				len = min(min(mlen, resid), space);
-				/*
-				 * For datagram protocols, leave room
-				 * for protocol headers in first mbuf.
-				 */
-				if (atomic && top == 0 && len < mlen)
-					MH_ALIGN(m, len);
-			}
-			space -= len;
-			error = uiomove(mtod(m, caddr_t), (int)len, uio);
-			resid = uio->uio_resid;
-			m->m_len = len;
-			*mp = m;
-			top->m_pkthdr.len += len;
-			if (error)
-				goto release;
-			mp = &m->m_next;
-			if (resid <= 0) {
-				if (flags & MSG_EOR)
-					top->m_flags |= M_EOR;
-				break;
-			}
-		    } while (space > 0 && atomic);
-		    if (dontroute)
-			    so->so_options |= SO_DONTROUTE;
-		    s = splnet();				/* XXX */
-		    error = (*so->so_proto->pr_usrreqs->pru_send)(so,
-			(flags & MSG_OOB) ? PRUS_OOB :
-			/*
-			 * If the user set MSG_EOF, the protocol
-			 * understands this flag and nothing left to
-			 * send then use PRU_SEND_EOF instead of PRU_SEND.
-			 */
-			((flags & MSG_EOF) &&
-			 (so->so_proto->pr_flags & PR_IMPLOPCL) &&
-			 (resid <= 0)) ?
-				PRUS_EOF : 0,
-			top, addr, control);
-		    splx(s);
-		    if (dontroute)
-			    so->so_options &= ~SO_DONTROUTE;
-		    clen = 0;
-		    control = 0;
-		    top = 0;
-		    mp = &top;
-		    if (error)
-			goto release;
-		} while (resid && space > 0);
-	} while (resid);
-
-release:
-	sbunlock(&so->so_snd);
-out:
-	if (top)
-		m_freem(top);
-	if (control)
-		m_freem(control);
-	return (error);
-}
-
-/*
- * Implement receive operations on a socket.
- * We depend on the way that records are added to the sockbuf
- * by sbappend*.  In particular, each record (mbufs linked through m_next)
- * must begin with an address if the protocol so specifies,
- * followed by an optional mbuf or mbufs containing ancillary data,
- * and then zero or more mbufs of data.
- * In order to avoid blocking network interrupts for the entire time here,
- * we splx() while doing the actual copy to user space.
- * Although the sockbuf is locked, new data may still be appended,
- * and thus we must maintain consistency of the sockbuf during that time.
- *
- * The caller may receive the data as a single mbuf chain by supplying
- * an mbuf **mp0 for use in returning the chain.  The uio is then used
- * only for the count in uio_resid.
- */
-int
-soreceive(so, paddr, uio, mp0, controlp, flagsp)
-	register struct socket *so;
-	struct mbuf **paddr;
-	struct uio *uio;
-	struct mbuf **mp0;
-	struct mbuf **controlp;
-	int *flagsp;
-{
-	register struct mbuf *m, **mp;
-	register int flags, len, error, s, offset;
-	struct protosw *pr = so->so_proto;
-	struct mbuf *nextrecord;
-	int moff, type = 0;
-	int orig_resid = uio->uio_resid;
-
-	mp = mp0;
-	if (paddr)
-		*paddr = 0;
-	if (controlp)
-		*controlp = 0;
-	if (flagsp)
-		flags = *flagsp &~ MSG_EOR;
-	else
-		flags = 0;
-	if (flags & MSG_OOB) {
-		m = m_get(M_WAIT, MT_DATA);
-		error = (*pr->pr_usrreqs->pru_rcvoob)(so, m, flags & MSG_PEEK);
-		if (error)
-			goto bad;
-		do {
-			error = uiomove(mtod(m, caddr_t),
-			    (int) min(uio->uio_resid, m->m_len), uio);
-			m = m_free(m);
-		} while (uio->uio_resid && error == 0 && m);
-bad:
-		if (m)
-			m_freem(m);
-		return (error);
-	}
-	if (mp)
-		*mp = (struct mbuf *)0;
-	if (so->so_state & SS_ISCONFIRMING && uio->uio_resid)
-		(*pr->pr_usrreqs->pru_rcvd)(so, 0);
-
-restart:
-	error = sblock(&so->so_rcv, SBLOCKWAIT(flags));
-	if (error)
-		return (error);
-	s = splnet();
-
-	m = so->so_rcv.sb_mb;
-	/*
-	 * If we have less data than requested, block awaiting more
-	 * (subject to any timeout) if:
-	 *   1. the current count is less than the low water mark, or
-	 *   2. MSG_WAITALL is set, and it is possible to do the entire
-	 *	receive operation at once if we block (resid <= hiwat).
-	 *   3. MSG_DONTWAIT is not set
-	 * If MSG_WAITALL is set but resid is larger than the receive buffer,
-	 * we have to do the receive in sections, and thus risk returning
-	 * a short count if a timeout or signal occurs after we start.
-	 */
-	if (m == 0 || (((flags & MSG_DONTWAIT) == 0 &&
-	    so->so_rcv.sb_cc < uio->uio_resid) &&
-	    (so->so_rcv.sb_cc < so->so_rcv.sb_lowat ||
-	    ((flags & MSG_WAITALL) && uio->uio_resid <= so->so_rcv.sb_hiwat)) &&
-	    m->m_nextpkt == 0 && (pr->pr_flags & PR_ATOMIC) == 0)) {
-#ifdef DIAGNOSTIC
-		if (m == 0 && so->so_rcv.sb_cc)
-			panic("receive 1");
-#endif
-		if (so->so_error) {
-			if (m)
-				goto dontblock;
-			error = so->so_error;
-			if ((flags & MSG_PEEK) == 0)
-				so->so_error = 0;
-			goto release;
-		}
-		if (so->so_state & SS_CANTRCVMORE) {
-			if (m)
-				goto dontblock;
-			else
-				goto release;
-		}
-		for (; m; m = m->m_next)
-			if (m->m_type == MT_OOBDATA  || (m->m_flags & M_EOR)) {
-				m = so->so_rcv.sb_mb;
-				goto dontblock;
-			}
-		if ((so->so_state & (SS_ISCONNECTED|SS_ISCONNECTING)) == 0 &&
-		    (so->so_proto->pr_flags & PR_CONNREQUIRED)) {
-			error = ENOTCONN;
-			goto release;
-		}
-		if (uio->uio_resid == 0)
-			goto release;
-		if ((so->so_state & SS_NBIO) || (flags & MSG_DONTWAIT)) {
-			error = EWOULDBLOCK;
-			goto release;
-		}
-		sbunlock(&so->so_rcv);
-		error = sbwait(&so->so_rcv);
-		splx(s);
-		if (error)
-			return (error);
-		goto restart;
-	}
-dontblock:
-	nextrecord = m->m_nextpkt;
-	if (pr->pr_flags & PR_ADDR) {
-#ifdef DIAGNOSTIC
-		if (m->m_type != MT_SONAME)
-			panic("receive 1a");
-#endif
-		orig_resid = 0;
-		if (flags & MSG_PEEK) {
-			if (paddr)
-				*paddr = m_copy(m, 0, m->m_len);
-			m = m->m_next;
-		} else {
-			sbfree(&so->so_rcv, m);
-			if (paddr) {
-				*paddr = m;
-				so->so_rcv.sb_mb = m->m_next;
-				m->m_next = 0;
-				m = so->so_rcv.sb_mb;
-			} else {
-				MFREE(m, so->so_rcv.sb_mb);
-				m = so->so_rcv.sb_mb;
-			}
-		}
-	}
-	while (m && m->m_type == MT_CONTROL && error == 0) {
-		if (flags & MSG_PEEK) {
-			if (controlp)
-				*controlp = m_copy(m, 0, m->m_len);
-			m = m->m_next;
-		} else {
-			sbfree(&so->so_rcv, m);
-			if (controlp) {
-				if (pr->pr_domain->dom_externalize &&
-				    mtod(m, struct cmsghdr *)->cmsg_type ==
-				    SCM_RIGHTS)
-				   error = (*pr->pr_domain->dom_externalize)(m);
-				*controlp = m;
-				so->so_rcv.sb_mb = m->m_next;
-				m->m_next = 0;
-				m = so->so_rcv.sb_mb;
-			} else {
-				MFREE(m, so->so_rcv.sb_mb);
-				m = so->so_rcv.sb_mb;
-			}
-		}
-		if (controlp) {
-			orig_resid = 0;
-			controlp = &(*controlp)->m_next;
-		}
-	}
-	if (m) {
-		if ((flags & MSG_PEEK) == 0)
-			m->m_nextpkt = nextrecord;
-		type = m->m_type;
-		if (type == MT_OOBDATA)
-			flags |= MSG_OOB;
-	}
-	moff = 0;
-	offset = 0;
-	while (m && uio->uio_resid > 0 && error == 0) {
-		if (m->m_type == MT_OOBDATA) {
-			if (type != MT_OOBDATA)
-				break;
-		} else if (type == MT_OOBDATA)
-			break;
-#ifdef DIAGNOSTIC
-		else if (m->m_type != MT_DATA && m->m_type != MT_HEADER)
-			panic("receive 3");
-#endif
-		so->so_state &= ~SS_RCVATMARK;
-		len = uio->uio_resid;
-		if (so->so_oobmark && len > so->so_oobmark - offset)
-			len = so->so_oobmark - offset;
-		if (len > m->m_len - moff)
-			len = m->m_len - moff;
-		/*
-		 * If mp is set, just pass back the mbufs.
-		 * Otherwise copy them out via the uio, then free.
-		 * Sockbuf must be consistent here (points to current mbuf,
-		 * it points to next record) when we drop priority;
-		 * we must note any additions to the sockbuf when we
-		 * block interrupts again.
-		 */
-		if (mp == 0) {
-			splx(s);
-			error = uiomove(mtod(m, caddr_t) + moff, (int)len, uio);
-			s = splnet();
-			if (error)
-				goto release;
-		} else
-			uio->uio_resid -= len;
-		if (len == m->m_len - moff) {
-			if (m->m_flags & M_EOR)
-				flags |= MSG_EOR;
-			if (flags & MSG_PEEK) {
-				m = m->m_next;
-				moff = 0;
-			} else {
-				nextrecord = m->m_nextpkt;
-				sbfree(&so->so_rcv, m);
-				if (mp) {
-					*mp = m;
-					mp = &m->m_next;
-					so->so_rcv.sb_mb = m = m->m_next;
-					*mp = (struct mbuf *)0;
-				} else {
-					MFREE(m, so->so_rcv.sb_mb);
-					m = so->so_rcv.sb_mb;
-				}
-				if (m)
-					m->m_nextpkt = nextrecord;
-			}
-		} else {
-			if (flags & MSG_PEEK)
-				moff += len;
-			else {
-				if (mp)
-					*mp = m_copym(m, 0, len, M_WAIT);
-				m->m_data += len;
-				m->m_len -= len;
-				so->so_rcv.sb_cc -= len;
-			}
-		}
-		if (so->so_oobmark) {
-			if ((flags & MSG_PEEK) == 0) {
-				so->so_oobmark -= len;
-				if (so->so_oobmark == 0) {
-					so->so_state |= SS_RCVATMARK;
-					break;
-				}
-			} else {
-				offset += len;
-				if (offset == so->so_oobmark)
-					break;
-			}
-		}
-		if (flags & MSG_EOR)
-			break;
-		/*
-		 * If the MSG_WAITALL flag is set (for non-atomic socket),
-		 * we must not quit until "uio->uio_resid == 0" or an error
-		 * termination.  If a signal/timeout occurs, return
-		 * with a short count but without error.
-		 * Keep sockbuf locked against other readers.
-		 */
-		while (flags & MSG_WAITALL && m == 0 && uio->uio_resid > 0 &&
-		    !sosendallatonce(so) && !nextrecord) {
-			if (so->so_error || so->so_state & SS_CANTRCVMORE)
-				break;
-			error = sbwait(&so->so_rcv);
-			if (error) {
-				sbunlock(&so->so_rcv);
-				splx(s);
-				return (0);
-			}
-			m = so->so_rcv.sb_mb;
-			if (m)
-				nextrecord = m->m_nextpkt;
-		}
-	}
-
-	if (m && pr->pr_flags & PR_ATOMIC) {
-		flags |= MSG_TRUNC;
-		if ((flags & MSG_PEEK) == 0)
-			(void) sbdroprecord(&so->so_rcv);
-	}
-	if ((flags & MSG_PEEK) == 0) {
-		if (m == 0)
-			so->so_rcv.sb_mb = nextrecord;
-		if (pr->pr_flags & PR_WANTRCVD && so->so_pcb)
-			(*pr->pr_usrreqs->pru_rcvd)(so, flags);
-	}
-	if (orig_resid == uio->uio_resid && orig_resid &&
-	    (flags & MSG_EOR) == 0 && (so->so_state & SS_CANTRCVMORE) == 0) {
-		sbunlock(&so->so_rcv);
-		splx(s);
-		goto restart;
-	}
-
-	if (flagsp)
-		*flagsp |= flags;
-release:
-	sbunlock(&so->so_rcv);
-	splx(s);
-	return (error);
-}
-
-int
-soshutdown(so, how)
-	register struct socket *so;
-	register int how;
-{
-	register struct protosw *pr = so->so_proto;
-
-	how++;
-	if (how & FREAD)
-		sorflush(so);
-	if (how & FWRITE)
-		return ((*pr->pr_usrreqs->pru_shutdown)(so));
-	return (0);
-}
-
-void
-sorflush(so)
-	register struct socket *so;
-{
-	register struct sockbuf *sb = &so->so_rcv;
-	register struct protosw *pr = so->so_proto;
-	register int s;
-	struct sockbuf asb;
-
-	sb->sb_flags |= SB_NOINTR;
-	(void) sblock(sb, M_WAITOK);
-	s = splimp();
-	socantrcvmore(so);
-	sbunlock(sb);
-	asb = *sb;
-	bzero((caddr_t)sb, sizeof (*sb));
-	splx(s);
-	if (pr->pr_flags & PR_RIGHTS && pr->pr_domain->dom_dispose)
-		(*pr->pr_domain->dom_dispose)(asb.sb_mb);
-	sbrelease(&asb);
-}
-
-int
-sosetopt(so, level, optname, m0)
-	register struct socket *so;
-	int level, optname;
-	struct mbuf *m0;
-{
-	int error = 0;
-	register struct mbuf *m = m0;
-
-	if (level != SOL_SOCKET) {
-		if (so->so_proto && so->so_proto->pr_ctloutput)
-			return ((*so->so_proto->pr_ctloutput)
-				  (PRCO_SETOPT, so, level, optname, &m0));
-		error = ENOPROTOOPT;
-	} else {
-		switch (optname) {
-
-		case SO_LINGER:
-			if (m == NULL || m->m_len != sizeof (struct linger)) {
-				error = EINVAL;
-				goto bad;
-			}
-			so->so_linger = mtod(m, struct linger *)->l_linger;
-			/* fall thru... */
-
-		case SO_DEBUG:
-		case SO_KEEPALIVE:
-		case SO_DONTROUTE:
-		case SO_USELOOPBACK:
-		case SO_BROADCAST:
-		case SO_REUSEADDR:
-		case SO_REUSEPORT:
-		case SO_OOBINLINE:
-		case SO_TIMESTAMP:
-			if (m == NULL || m->m_len < sizeof (int)) {
-				error = EINVAL;
-				goto bad;
-			}
-			if (*mtod(m, int *))
-				so->so_options |= optname;
-			else
-				so->so_options &= ~optname;
-			break;
-
-		case SO_SNDBUF:
-		case SO_RCVBUF:
-		case SO_SNDLOWAT:
-		case SO_RCVLOWAT:
-		    {
-			int optval;
-
-			if (m == NULL || m->m_len < sizeof (int)) {
-				error = EINVAL;
-				goto bad;
-			}
-
-			/*
-			 * Values < 1 make no sense for any of these
-			 * options, so disallow them.
-			 */
-			optval = *mtod(m, int *);
-			if (optval < 1) {
-				error = EINVAL;
-				goto bad;
-			}
-
-			switch (optname) {
-
-			case SO_SNDBUF:
-			case SO_RCVBUF:
-				if (sbreserve(optname == SO_SNDBUF ?
-				    &so->so_snd : &so->so_rcv,
-				    (u_long) optval) == 0) {
-					error = ENOBUFS;
-					goto bad;
-				}
-				break;
-
-			/*
-			 * Make sure the low-water is never greater than
-			 * the high-water.
-			 */
-			case SO_SNDLOWAT:
-				so->so_snd.sb_lowat =
-				    (optval > so->so_snd.sb_hiwat) ?
-				    so->so_snd.sb_hiwat : optval;
-				break;
-			case SO_RCVLOWAT:
-				so->so_rcv.sb_lowat =
-				    (optval > so->so_rcv.sb_hiwat) ?
-				    so->so_rcv.sb_hiwat : optval;
-				break;
-			}
-			break;
-		    }
-
-		case SO_SNDTIMEO:
-		case SO_RCVTIMEO:
-		    {
-			struct timeval *tv;
-			short val;
-
-			if (m == NULL || m->m_len < sizeof (*tv)) {
-				error = EINVAL;
-				goto bad;
-			}
-			tv = mtod(m, struct timeval *);
-			if (tv->tv_sec > SHRT_MAX / hz - hz) {
-				error = EDOM;
-				goto bad;
-			}
-			val = tv->tv_sec * hz + tv->tv_usec / tick;
-
-			switch (optname) {
-
-			case SO_SNDTIMEO:
-				so->so_snd.sb_timeo = val;
-				break;
-			case SO_RCVTIMEO:
-				so->so_rcv.sb_timeo = val;
-				break;
-			}
-			break;
-		    }
-
-		case SO_PRIVSTATE:
-			/* we don't care what the parameter is... */
-			so->so_state &= ~SS_PRIV;
-			break;
-
-		default:
-			error = ENOPROTOOPT;
-			break;
-		}
-		if (error == 0 && so->so_proto && so->so_proto->pr_ctloutput) {
-			(void) ((*so->so_proto->pr_ctloutput)
-				  (PRCO_SETOPT, so, level, optname, &m0));
-			m = NULL;	/* freed by protocol */
-		}
-	}
-bad:
-	if (m)
-		(void) m_free(m);
-	return (error);
-}
-
-int
-sogetopt(so, level, optname, mp)
-	register struct socket *so;
-	int level, optname;
-	struct mbuf **mp;
-{
-	register struct mbuf *m;
-
-	if (level != SOL_SOCKET) {
-		if (so->so_proto && so->so_proto->pr_ctloutput) {
-			return ((*so->so_proto->pr_ctloutput)
-				  (PRCO_GETOPT, so, level, optname, mp));
-		} else
-			return (ENOPROTOOPT);
-	} else {
-		m = m_get(M_WAIT, MT_SOOPTS);
-		m->m_len = sizeof (int);
-
-		switch (optname) {
-
-		case SO_LINGER:
-			m->m_len = sizeof (struct linger);
-			mtod(m, struct linger *)->l_onoff =
-				so->so_options & SO_LINGER;
-			mtod(m, struct linger *)->l_linger = so->so_linger;
-			break;
-
-		case SO_USELOOPBACK:
-		case SO_DONTROUTE:
-		case SO_DEBUG:
-		case SO_KEEPALIVE:
-		case SO_REUSEADDR:
-		case SO_REUSEPORT:
-		case SO_BROADCAST:
-		case SO_OOBINLINE:
-		case SO_TIMESTAMP:
-			*mtod(m, int *) = so->so_options & optname;
-			break;
-
-		case SO_PRIVSTATE:
-			*mtod(m, int *) = so->so_state & SS_PRIV;
-			break;
-
-		case SO_TYPE:
-			*mtod(m, int *) = so->so_type;
-			break;
-
-		case SO_ERROR:
-			*mtod(m, int *) = so->so_error;
-			so->so_error = 0;
-			break;
-
-		case SO_SNDBUF:
-			*mtod(m, int *) = so->so_snd.sb_hiwat;
-			break;
-
-		case SO_RCVBUF:
-			*mtod(m, int *) = so->so_rcv.sb_hiwat;
-			break;
-
-		case SO_SNDLOWAT:
-			*mtod(m, int *) = so->so_snd.sb_lowat;
-			break;
-
-		case SO_RCVLOWAT:
-			*mtod(m, int *) = so->so_rcv.sb_lowat;
-			break;
-
-		case SO_SNDTIMEO:
-		case SO_RCVTIMEO:
-		    {
-			int val = (optname == SO_SNDTIMEO ?
-			     so->so_snd.sb_timeo : so->so_rcv.sb_timeo);
-
-			m->m_len = sizeof(struct timeval);
-			mtod(m, struct timeval *)->tv_sec = val / hz;
-			mtod(m, struct timeval *)->tv_usec =
-			    (val % hz) * tick;
-			break;
-		    }
-
-		default:
-			(void)m_free(m);
-			return (ENOPROTOOPT);
-		}
-		*mp = m;
-		return (0);
-	}
-}
-
-void
-sohasoutofband(so)
-	register struct socket *so;
-{
-#if 0	/* FIXME: For now we just ignore out of band data */
-	struct proc *p;
-
-	if (so->so_pgid < 0)
-		gsignal(-so->so_pgid, SIGURG);
-	else if (so->so_pgid > 0 && (p = pfind(so->so_pgid)) != 0)
-		psignal(p, SIGURG);
-	selwakeup(&so->so_rcv.sb_sel);
-#endif
-}
diff --git a/c/src/exec/libnetworking/kern/uipc_socket2.c b/c/src/exec/libnetworking/kern/uipc_socket2.c
deleted file mode 100644
index 0539d2c5f3..0000000000
--- a/c/src/exec/libnetworking/kern/uipc_socket2.c
+++ /dev/null
@@ -1,965 +0,0 @@
-/*
- * This file has undergone several changes to reflect the
- * differences between the RTEMS and FreeBSD kernels.
- */
-
-/*
- * Copyright (c) 1982, 1986, 1988, 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)uipc_socket2.c	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/proc.h>
-#include <sys/file.h>
-#include <sys/buf.h>
-#include <sys/malloc.h>
-#include <sys/mbuf.h>
-#include <sys/protosw.h>
-#include <sys/stat.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/signalvar.h>
-#include <sys/sysctl.h>
-
-/*
- * Primitive routines for operating on sockets and socket buffers
- */
-
-u_long	sb_max = SB_MAX;		/* XXX should be static */
-SYSCTL_INT(_kern, KERN_MAXSOCKBUF, maxsockbuf, CTLFLAG_RW, &sb_max, 0, "")
-
-static	u_long sb_efficiency = 8;	/* parameter for sbreserve() */
-SYSCTL_INT(_kern, OID_AUTO, sockbuf_waste_factor, CTLFLAG_RW, &sb_efficiency,
-	   0, "");
-
-/*
- * Procedures to manipulate state flags of socket
- * and do appropriate wakeups.  Normal sequence from the
- * active (originating) side is that soisconnecting() is
- * called during processing of connect() call,
- * resulting in an eventual call to soisconnected() if/when the
- * connection is established.  When the connection is torn down
- * soisdisconnecting() is called during processing of disconnect() call,
- * and soisdisconnected() is called when the connection to the peer
- * is totally severed.  The semantics of these routines are such that
- * connectionless protocols can call soisconnected() and soisdisconnected()
- * only, bypassing the in-progress calls when setting up a ``connection''
- * takes no time.
- *
- * From the passive side, a socket is created with
- * two queues of sockets: so_q0 for connections in progress
- * and so_q for connections already made and awaiting user acceptance.
- * As a protocol is preparing incoming connections, it creates a socket
- * structure queued on so_q0 by calling sonewconn().  When the connection
- * is established, soisconnected() is called, and transfers the
- * socket structure to so_q, making it available to accept().
- *
- * If a socket is closed with sockets on either
- * so_q0 or so_q, these sockets are dropped.
- *
- * If higher level protocols are implemented in
- * the kernel, the wakeups done here will sometimes
- * cause software-interrupt process scheduling.
- */
-
-void
-soisconnecting(so)
-	register struct socket *so;
-{
-
-	so->so_state &= ~(SS_ISCONNECTED|SS_ISDISCONNECTING);
-	so->so_state |= SS_ISCONNECTING;
-}
-
-void
-soisconnected(so)
-	register struct socket *so;
-{
-	register struct socket *head = so->so_head;
-
-	so->so_state &= ~(SS_ISCONNECTING|SS_ISDISCONNECTING|SS_ISCONFIRMING);
-	so->so_state |= SS_ISCONNECTED;
-	if (head && (so->so_state & SS_INCOMP)) {
-		TAILQ_REMOVE(&head->so_incomp, so, so_list);
-		head->so_incqlen--;
-		so->so_state &= ~SS_INCOMP;
-		TAILQ_INSERT_TAIL(&head->so_comp, so, so_list);
-		so->so_state |= SS_COMP;
-		sorwakeup(head);
-		soconnwakeup(head);
-	} else {
-		soconnwakeup(so);
-		sorwakeup(so);
-		sowwakeup(so);
-	}
-}
-
-void
-soisdisconnecting(so)
-	register struct socket *so;
-{
-
-	so->so_state &= ~SS_ISCONNECTING;
-	so->so_state |= (SS_ISDISCONNECTING|SS_CANTRCVMORE|SS_CANTSENDMORE);
-	soconnwakeup(so);
-	sowwakeup(so);
-	sorwakeup(so);
-}
-
-void
-soisdisconnected(so)
-	register struct socket *so;
-{
-
-	so->so_state &= ~(SS_ISCONNECTING|SS_ISCONNECTED|SS_ISDISCONNECTING);
-	so->so_state |= (SS_CANTRCVMORE|SS_CANTSENDMORE);
-	soconnwakeup(so);
-	sowwakeup(so);
-	sorwakeup(so);
-}
-
-/*
- * Return a random connection that hasn't been serviced yet and
- * is eligible for discard.  There is a one in qlen chance that
- * we will return a null, saying that there are no dropable
- * requests.  In this case, the protocol specific code should drop
- * the new request.  This insures fairness.
- *
- * This may be used in conjunction with protocol specific queue
- * congestion routines.
- */
-struct socket *
-sodropablereq(head)
-	register struct socket *head;
-{
-	register struct socket *so;
-	unsigned int i, j, qlen, m;
-
-	static int rnd;
-	static long old_mono_secs;
-	static unsigned int cur_cnt, old_cnt;
-
-	if ((i = (m = rtems_bsdnet_seconds_since_boot()) - old_mono_secs) != 0) {
-		old_mono_secs = m;
-		old_cnt = cur_cnt / i;
-		cur_cnt = 0;
-	}
-
-	so = TAILQ_FIRST(&head->so_incomp);
-	if (!so)
-		return (so);
-
-	qlen = head->so_incqlen;
-	if (++cur_cnt > qlen || old_cnt > qlen) {
-		rnd = (314159 * rnd + 66329) & 0xffff;
-		j = ((qlen + 1) * rnd) >> 16;
-
-		while (j-- && so)
-		    so = TAILQ_NEXT(so, so_list);
-	}
-
-	return (so);
-}
-
-/*
- * When an attempt at a new connection is noted on a socket
- * which accepts connections, sonewconn is called.  If the
- * connection is possible (subject to space constraints, etc.)
- * then we allocate a new structure, propoerly linked into the
- * data structure of the original socket, and return this.
- * Connstatus may be 0, or SO_ISCONFIRMING, or SO_ISCONNECTED.
- *
- * Currently, sonewconn() is defined as sonewconn1() in socketvar.h
- * to catch calls that are missing the (new) second parameter.
- */
-struct socket *
-sonewconn1(head, connstatus)
-	register struct socket *head;
-	int connstatus;
-{
-	register struct socket *so;
-
-	if (head->so_qlen > 3 * head->so_qlimit / 2)
-		return ((struct socket *)0);
-	MALLOC(so, struct socket *, sizeof(*so), M_SOCKET, M_DONTWAIT);
-	if (so == NULL)
-		return ((struct socket *)0);
-	bzero((caddr_t)so, sizeof(*so));
-	so->so_head = head;
-	so->so_type = head->so_type;
-	so->so_options = head->so_options &~ SO_ACCEPTCONN;
-	so->so_linger = head->so_linger;
-	so->so_state = head->so_state | SS_NOFDREF;
-	so->so_proto = head->so_proto;
-	so->so_timeo = head->so_timeo;
-	so->so_pgid = head->so_pgid;
-	so->so_uid = head->so_uid;
-	(void) soreserve(so, head->so_snd.sb_hiwat, head->so_rcv.sb_hiwat);
-	if (connstatus) {
-		TAILQ_INSERT_TAIL(&head->so_comp, so, so_list);
-		so->so_state |= SS_COMP;
-	} else {
-		TAILQ_INSERT_TAIL(&head->so_incomp, so, so_list);
-		so->so_state |= SS_INCOMP;
-		head->so_incqlen++;
-	}
-	head->so_qlen++;
-	if ((*so->so_proto->pr_usrreqs->pru_attach)(so, 0)) {
-		if (so->so_state & SS_COMP) {
-			TAILQ_REMOVE(&head->so_comp, so, so_list);
-		} else {
-			TAILQ_REMOVE(&head->so_incomp, so, so_list);
-			head->so_incqlen--;
-		}
-		head->so_qlen--;
-		(void) free((caddr_t)so, M_SOCKET);
-		return ((struct socket *)0);
-	}
-	if (connstatus) {
-		sorwakeup(head);
-		soconnwakeup(head);
-		so->so_state |= connstatus;
-	}
-	return (so);
-}
-
-/*
- * Socantsendmore indicates that no more data will be sent on the
- * socket; it would normally be applied to a socket when the user
- * informs the system that no more data is to be sent, by the protocol
- * code (in case PRU_SHUTDOWN).  Socantrcvmore indicates that no more data
- * will be received, and will normally be applied to the socket by a
- * protocol when it detects that the peer will send no more data.
- * Data queued for reading in the socket may yet be read.
- */
-
-void
-socantsendmore(so)
-	struct socket *so;
-{
-
-	so->so_state |= SS_CANTSENDMORE;
-	sowwakeup(so);
-}
-
-void
-socantrcvmore(so)
-	struct socket *so;
-{
-
-	so->so_state |= SS_CANTRCVMORE;
-	sorwakeup(so);
-}
-
-/*
- * Socket buffer (struct sockbuf) utility routines.
- *
- * Each socket contains two socket buffers: one for sending data and
- * one for receiving data.  Each buffer contains a queue of mbufs,
- * information about the number of mbufs and amount of data in the
- * queue, and other fields allowing select() statements and notification
- * on data availability to be implemented.
- *
- * Data stored in a socket buffer is maintained as a list of records.
- * Each record is a list of mbufs chained together with the m_next
- * field.  Records are chained together with the m_nextpkt field. The upper
- * level routine soreceive() expects the following conventions to be
- * observed when placing information in the receive buffer:
- *
- * 1. If the protocol requires each message be preceded by the sender's
- *    name, then a record containing that name must be present before
- *    any associated data (mbuf's must be of type MT_SONAME).
- * 2. If the protocol supports the exchange of ``access rights'' (really
- *    just additional data associated with the message), and there are
- *    ``rights'' to be received, then a record containing this data
- *    should be present (mbuf's must be of type MT_RIGHTS).
- * 3. If a name or rights record exists, then it must be followed by
- *    a data record, perhaps of zero length.
- *
- * Before using a new socket structure it is first necessary to reserve
- * buffer space to the socket, by calling sbreserve().  This should commit
- * some of the available buffer space in the system buffer pool for the
- * socket (currently, it does nothing but enforce limits).  The space
- * should be released by calling sbrelease() when the socket is destroyed.
- */
-
-int
-soreserve(so, sndcc, rcvcc)
-	register struct socket *so;
-	u_long sndcc, rcvcc;
-{
-
-	if (sbreserve(&so->so_snd, sndcc) == 0)
-		goto bad;
-	if (sbreserve(&so->so_rcv, rcvcc) == 0)
-		goto bad2;
-	if (so->so_rcv.sb_lowat == 0)
-		so->so_rcv.sb_lowat = 1;
-	if (so->so_snd.sb_lowat == 0)
-		so->so_snd.sb_lowat = MCLBYTES;
-	if (so->so_snd.sb_lowat > so->so_snd.sb_hiwat)
-		so->so_snd.sb_lowat = so->so_snd.sb_hiwat;
-	return (0);
-bad2:
-	sbrelease(&so->so_snd);
-bad:
-	return (ENOBUFS);
-}
-
-/*
- * Allot mbufs to a sockbuf.
- * Attempt to scale mbmax so that mbcnt doesn't become limiting
- * if buffering efficiency is near the normal case.
- */
-int
-sbreserve(sb, cc)
-	struct sockbuf *sb;
-	u_long cc;
-{
-
-	if (cc > sb_max * MCLBYTES / (MSIZE + MCLBYTES))
-		return (0);
-	sb->sb_hiwat = cc;
-	sb->sb_mbmax = min(cc * sb_efficiency, sb_max);
-	if (sb->sb_lowat > sb->sb_hiwat)
-		sb->sb_lowat = sb->sb_hiwat;
-	return (1);
-}
-
-/*
- * Free mbufs held by a socket, and reserved mbuf space.
- */
-void
-sbrelease(sb)
-	struct sockbuf *sb;
-{
-
-	sbflush(sb);
-	sb->sb_hiwat = sb->sb_mbmax = 0;
-}
-
-/*
- * Routines to add and remove
- * data from an mbuf queue.
- *
- * The routines sbappend() or sbappendrecord() are normally called to
- * append new mbufs to a socket buffer, after checking that adequate
- * space is available, comparing the function sbspace() with the amount
- * of data to be added.  sbappendrecord() differs from sbappend() in
- * that data supplied is treated as the beginning of a new record.
- * To place a sender's address, optional access rights, and data in a
- * socket receive buffer, sbappendaddr() should be used.  To place
- * access rights and data in a socket receive buffer, sbappendrights()
- * should be used.  In either case, the new data begins a new record.
- * Note that unlike sbappend() and sbappendrecord(), these routines check
- * for the caller that there will be enough space to store the data.
- * Each fails if there is not enough space, or if it cannot find mbufs
- * to store additional information in.
- *
- * Reliable protocols may use the socket send buffer to hold data
- * awaiting acknowledgement.  Data is normally copied from a socket
- * send buffer in a protocol with m_copy for output to a peer,
- * and then removing the data from the socket buffer with sbdrop()
- * or sbdroprecord() when the data is acknowledged by the peer.
- */
-
-/*
- * Append mbuf chain m to the last record in the
- * socket buffer sb.  The additional space associated
- * the mbuf chain is recorded in sb.  Empty mbufs are
- * discarded and mbufs are compacted where possible.
- */
-void
-sbappend(sb, m)
-	struct sockbuf *sb;
-	struct mbuf *m;
-{
-	register struct mbuf *n;
-
-	if (m == 0)
-		return;
-	n = sb->sb_mb;
-	if (n) {
-		while (n->m_nextpkt)
-			n = n->m_nextpkt;
-		do {
-			if (n->m_flags & M_EOR) {
-				sbappendrecord(sb, m); /* XXXXXX!!!! */
-				return;
-			}
-		} while (n->m_next && (n = n->m_next));
-	}
-	sbcompress(sb, m, n);
-}
-
-#ifdef SOCKBUF_DEBUG
-void
-sbcheck(sb)
-	register struct sockbuf *sb;
-{
-	register struct mbuf *m;
-	register int len = 0, mbcnt = 0;
-
-	for (m = sb->sb_mb; m; m = m->m_next) {
-		len += m->m_len;
-		mbcnt += MSIZE;
-		if (m->m_flags & M_EXT) /*XXX*/ /* pretty sure this is bogus */
-			mbcnt += m->m_ext.ext_size;
-		if (m->m_nextpkt)
-			panic("sbcheck nextpkt");
-	}
-	if (len != sb->sb_cc || mbcnt != sb->sb_mbcnt) {
-		printf("cc %d != %d || mbcnt %d != %d\n", len, sb->sb_cc,
-		    mbcnt, sb->sb_mbcnt);
-		panic("sbcheck");
-	}
-}
-#endif
-
-/*
- * As above, except the mbuf chain
- * begins a new record.
- */
-void
-sbappendrecord(sb, m0)
-	register struct sockbuf *sb;
-	register struct mbuf *m0;
-{
-	register struct mbuf *m;
-
-	if (m0 == 0)
-		return;
-	m = sb->sb_mb;
-	if (m)
-		while (m->m_nextpkt)
-			m = m->m_nextpkt;
-	/*
-	 * Put the first mbuf on the queue.
-	 * Note this permits zero length records.
-	 */
-	sballoc(sb, m0);
-	if (m)
-		m->m_nextpkt = m0;
-	else
-		sb->sb_mb = m0;
-	m = m0->m_next;
-	m0->m_next = 0;
-	if (m && (m0->m_flags & M_EOR)) {
-		m0->m_flags &= ~M_EOR;
-		m->m_flags |= M_EOR;
-	}
-	sbcompress(sb, m, m0);
-}
-
-/*
- * As above except that OOB data
- * is inserted at the beginning of the sockbuf,
- * but after any other OOB data.
- */
-void
-sbinsertoob(sb, m0)
-	register struct sockbuf *sb;
-	register struct mbuf *m0;
-{
-	register struct mbuf *m;
-	register struct mbuf **mp;
-
-	if (m0 == 0)
-		return;
-	for (mp = &sb->sb_mb; *mp ; mp = &((*mp)->m_nextpkt)) {
-	    m = *mp;
-	    again:
-		switch (m->m_type) {
-
-		case MT_OOBDATA:
-			continue;		/* WANT next train */
-
-		case MT_CONTROL:
-			m = m->m_next;
-			if (m)
-				goto again;	/* inspect THIS train further */
-		}
-		break;
-	}
-	/*
-	 * Put the first mbuf on the queue.
-	 * Note this permits zero length records.
-	 */
-	sballoc(sb, m0);
-	m0->m_nextpkt = *mp;
-	*mp = m0;
-	m = m0->m_next;
-	m0->m_next = 0;
-	if (m && (m0->m_flags & M_EOR)) {
-		m0->m_flags &= ~M_EOR;
-		m->m_flags |= M_EOR;
-	}
-	sbcompress(sb, m, m0);
-}
-
-/*
- * Append address and data, and optionally, control (ancillary) data
- * to the receive queue of a socket.  If present,
- * m0 must include a packet header with total length.
- * Returns 0 if no space in sockbuf or insufficient mbufs.
- */
-int
-sbappendaddr(sb, asa, m0, control)
-	register struct sockbuf *sb;
-	struct sockaddr *asa;
-	struct mbuf *m0, *control;
-{
-	register struct mbuf *m, *n;
-	int space = asa->sa_len;
-
-if (m0 && (m0->m_flags & M_PKTHDR) == 0)
-panic("sbappendaddr");
-	if (m0)
-		space += m0->m_pkthdr.len;
-	for (n = control; n; n = n->m_next) {
-		space += n->m_len;
-		if (n->m_next == 0)	/* keep pointer to last control buf */
-			break;
-	}
-	if (space > sbspace(sb))
-		return (0);
-	if (asa->sa_len > MLEN)
-		return (0);
-	MGET(m, M_DONTWAIT, MT_SONAME);
-	if (m == 0)
-		return (0);
-	m->m_len = asa->sa_len;
-	bcopy((caddr_t)asa, mtod(m, caddr_t), asa->sa_len);
-	if (n)
-		n->m_next = m0;		/* concatenate data to control */
-	else
-		control = m0;
-	m->m_next = control;
-	for (n = m; n; n = n->m_next)
-		sballoc(sb, n);
-	n = sb->sb_mb;
-	if (n) {
-		while (n->m_nextpkt)
-			n = n->m_nextpkt;
-		n->m_nextpkt = m;
-	} else
-		sb->sb_mb = m;
-	return (1);
-}
-
-int
-sbappendcontrol(sb, m0, control)
-	struct sockbuf *sb;
-	struct mbuf *control, *m0;
-{
-	register struct mbuf *m, *n;
-	int space = 0;
-
-	if (control == 0)
-		panic("sbappendcontrol");
-	for (m = control; ; m = m->m_next) {
-		space += m->m_len;
-		if (m->m_next == 0)
-			break;
-	}
-	n = m;			/* save pointer to last control buffer */
-	for (m = m0; m; m = m->m_next)
-		space += m->m_len;
-	if (space > sbspace(sb))
-		return (0);
-	n->m_next = m0;			/* concatenate data to control */
-	for (m = control; m; m = m->m_next)
-		sballoc(sb, m);
-	n = sb->sb_mb;
-	if (n) {
-		while (n->m_nextpkt)
-			n = n->m_nextpkt;
-		n->m_nextpkt = control;
-	} else
-		sb->sb_mb = control;
-	return (1);
-}
-
-/*
- * Compress mbuf chain m into the socket
- * buffer sb following mbuf n.  If n
- * is null, the buffer is presumed empty.
- */
-void
-sbcompress(sb, m, n)
-	register struct sockbuf *sb;
-	register struct mbuf *m, *n;
-{
-	register int eor = 0;
-	register struct mbuf *o;
-
-	while (m) {
-		eor |= m->m_flags & M_EOR;
-		if (m->m_len == 0 &&
-		    (eor == 0 ||
-		     (((o = m->m_next) || (o = n)) &&
-		      o->m_type == m->m_type))) {
-			m = m_free(m);
-			continue;
-		}
-		if (n && (n->m_flags & (M_EXT | M_EOR)) == 0 &&
-		    (n->m_data + n->m_len + m->m_len) < &n->m_dat[MLEN] &&
-		    n->m_type == m->m_type) {
-			bcopy(mtod(m, caddr_t), mtod(n, caddr_t) + n->m_len,
-			    (unsigned)m->m_len);
-			n->m_len += m->m_len;
-			sb->sb_cc += m->m_len;
-			m = m_free(m);
-			continue;
-		}
-		if (n)
-			n->m_next = m;
-		else
-			sb->sb_mb = m;
-		sballoc(sb, m);
-		n = m;
-		m->m_flags &= ~M_EOR;
-		m = m->m_next;
-		n->m_next = 0;
-	}
-	if (eor) {
-		if (n)
-			n->m_flags |= eor;
-		else
-			printf("semi-panic: sbcompress\n");
-	}
-}
-
-/*
- * Free all mbufs in a sockbuf.
- * Check that all resources are reclaimed.
- */
-void
-sbflush(sb)
-	register struct sockbuf *sb;
-{
-
-	if (sb->sb_flags & SB_LOCK)
-		panic("sbflush");
-	while (sb->sb_mbcnt)
-		sbdrop(sb, (int)sb->sb_cc);
-	if (sb->sb_cc || sb->sb_mb)
-		panic("sbflush 2");
-}
-
-/*
- * Drop data from (the front of) a sockbuf.
- */
-void
-sbdrop(sb, len)
-	register struct sockbuf *sb;
-	register int len;
-{
-	register struct mbuf *m, *mn;
-	struct mbuf *next;
-
-	next = (m = sb->sb_mb) ? m->m_nextpkt : 0;
-	while (len > 0) {
-		if (m == 0) {
-			if (next == 0)
-				panic("sbdrop");
-			m = next;
-			next = m->m_nextpkt;
-			continue;
-		}
-		if (m->m_len > len) {
-			m->m_len -= len;
-			m->m_data += len;
-			sb->sb_cc -= len;
-			break;
-		}
-		len -= m->m_len;
-		sbfree(sb, m);
-		MFREE(m, mn);
-		m = mn;
-	}
-	while (m && m->m_len == 0) {
-		sbfree(sb, m);
-		MFREE(m, mn);
-		m = mn;
-	}
-	if (m) {
-		sb->sb_mb = m;
-		m->m_nextpkt = next;
-	} else
-		sb->sb_mb = next;
-}
-
-/*
- * Drop a record off the front of a sockbuf
- * and move the next record to the front.
- */
-void
-sbdroprecord(sb)
-	register struct sockbuf *sb;
-{
-	register struct mbuf *m, *mn;
-
-	m = sb->sb_mb;
-	if (m) {
-		sb->sb_mb = m->m_nextpkt;
-		do {
-			sbfree(sb, m);
-			MFREE(m, mn);
-			m = mn;
-		} while (m);
-	}
-}
-
-/*
- * Create a "control" mbuf containing the specified data
- * with the specified type for presentation on a socket buffer.
- */
-struct mbuf *
-sbcreatecontrol(p, size, type, level)
-	caddr_t p;
-	register int size;
-	int type, level;
-{
-	register struct cmsghdr *cp;
-	struct mbuf *m;
-
-	if ((m = m_get(M_DONTWAIT, MT_CONTROL)) == NULL)
-		return ((struct mbuf *) NULL);
-	cp = mtod(m, struct cmsghdr *);
-	/* XXX check size? */
-	(void)memcpy(CMSG_DATA(cp), p, size);
-	size += sizeof(*cp);
-	m->m_len = size;
-	cp->cmsg_len = size;
-	cp->cmsg_level = level;
-	cp->cmsg_type = type;
-	return (m);
-}
-
-#ifdef PRU_OLDSTYLE
-/*
- * The following routines mediate between the old-style `pr_usrreq'
- * protocol implementations and the new-style `struct pr_usrreqs'
- * calling convention.
- */
-
-/* syntactic sugar */
-#define	nomb	(struct mbuf *)0
-
-static int
-old_abort(struct socket *so)
-{
-	return so->so_proto->pr_ousrreq(so, PRU_ABORT, nomb, nomb, nomb);
-}
-
-static int
-old_accept(struct socket *so, struct mbuf *nam)
-{
-	return so->so_proto->pr_ousrreq(so, PRU_ACCEPT, nomb,  nam, nomb);
-}
-
-static int
-old_attach(struct socket *so, int proto)
-{
-	return so->so_proto->pr_ousrreq(so, PRU_ATTACH, nomb,
-				       (struct mbuf *)proto, /* XXX */
-				       nomb);
-}
-
-static int
-old_bind(struct socket *so, struct mbuf *nam)
-{
-	return so->so_proto->pr_ousrreq(so, PRU_BIND, nomb, nam, nomb);
-}
-
-static int
-old_connect(struct socket *so, struct mbuf *nam)
-{
-	return so->so_proto->pr_ousrreq(so, PRU_CONNECT, nomb, nam, nomb);
-}
-
-static int
-old_connect2(struct socket *so1, struct socket *so2)
-{
-	return so1->so_proto->pr_ousrreq(so1, PRU_CONNECT2, nomb, 
-				       (struct mbuf *)so2, nomb);
-}
-
-static int
-old_control(struct socket *so, int cmd, caddr_t data, struct ifnet *ifp)
-{
-	return so->so_proto->pr_ousrreq(so, PRU_CONTROL, (struct mbuf *)cmd, 
-				       (struct mbuf *)data, 
-				       (struct mbuf *)ifp);
-}
-
-static int
-old_detach(struct socket *so)
-{
-	return so->so_proto->pr_ousrreq(so, PRU_DETACH, nomb, nomb, nomb);
-}
-
-static int
-old_disconnect(struct socket *so)
-{
-	return so->so_proto->pr_ousrreq(so, PRU_DISCONNECT, nomb, nomb, nomb);
-}
-
-static int
-old_listen(struct socket *so)
-{
-	return so->so_proto->pr_ousrreq(so, PRU_LISTEN, nomb, nomb, nomb);
-}
-
-static int
-old_peeraddr(struct socket *so, struct mbuf *nam)
-{
-	return so->so_proto->pr_ousrreq(so, PRU_PEERADDR, nomb, nam, nomb);
-}
-
-static int
-old_rcvd(struct socket *so, int flags)
-{
-	return so->so_proto->pr_ousrreq(so, PRU_RCVD, nomb,
-				       (struct mbuf *)flags, /* XXX */
-				       nomb);
-}
-
-static int
-old_rcvoob(struct socket *so, struct mbuf *m, int flags)
-{
-	return so->so_proto->pr_ousrreq(so, PRU_RCVOOB, m,
-				       (struct mbuf *)flags, /* XXX */
-				       nomb);
-}
-
-static int
-old_send(struct socket *so, int flags, struct mbuf *m, struct mbuf *addr,
-	 struct mbuf *control)
-{
-	int req;
-
-	if (flags & PRUS_OOB) {
-		req = PRU_SENDOOB;
-	} else if(flags & PRUS_EOF) {
-		req = PRU_SEND_EOF;
-	} else {
-		req = PRU_SEND;
-	}
-	return so->so_proto->pr_ousrreq(so, req, m, addr, control);
-}
-
-static int
-old_sense(struct socket *so, struct stat *sb)
-{
-	return so->so_proto->pr_ousrreq(so, PRU_SENSE, (struct mbuf *)sb,
-				       nomb, nomb);
-}
-
-static int
-old_shutdown(struct socket *so)
-{
-	return so->so_proto->pr_ousrreq(so, PRU_SHUTDOWN, nomb, nomb, nomb);
-}
-
-static int
-old_sockaddr(struct socket *so, struct mbuf *nam)
-{
-	return so->so_proto->pr_ousrreq(so, PRU_SOCKADDR, nomb, nam, nomb);
-}
-
-struct pr_usrreqs pru_oldstyle = {
-	old_abort, old_accept, old_attach, old_bind, old_connect,
-	old_connect2, old_control, old_detach, old_disconnect,
-	old_listen, old_peeraddr, old_rcvd, old_rcvoob, old_send,
-	old_sense, old_shutdown, old_sockaddr
-};
-
-#endif /* PRU_OLDSTYLE */
-
-/*
- * Some routines that return EOPNOTSUPP for entry points that are not
- * supported by a protocol.  Fill in as needed.
- */
-int
-pru_accept_notsupp(struct socket *so, struct mbuf *nam)
-{
-	return EOPNOTSUPP;
-}
-
-int
-pru_connect2_notsupp(struct socket *so1, struct socket *so2)
-{
-	return EOPNOTSUPP;
-}
-
-int
-pru_control_notsupp(struct socket *so, int cmd, caddr_t data,
-		    struct ifnet *ifp)
-{
-	return EOPNOTSUPP;
-}
-
-int
-pru_listen_notsupp(struct socket *so)
-{
-	return EOPNOTSUPP;
-}
-
-int
-pru_rcvd_notsupp(struct socket *so, int flags)
-{
-	return EOPNOTSUPP;
-}
-
-int
-pru_rcvoob_notsupp(struct socket *so, struct mbuf *m, int flags)
-{
-	return EOPNOTSUPP;
-}
-
-/*
- * This isn't really a ``null'' operation, but it's the default one
- * and doesn't do anything destructive.
- */
-int
-pru_sense_null(struct socket *so, struct stat *sb)
-{
-	sb->st_blksize = so->so_snd.sb_hiwat;
-	return 0;
-}
-
diff --git a/c/src/exec/libnetworking/lib/README b/c/src/exec/libnetworking/lib/README
deleted file mode 100644
index 998bd5e708..0000000000
--- a/c/src/exec/libnetworking/lib/README
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-#  $Id$
-#
-
-Sources from application-level (as opposed to kernel-level) libraries.
diff --git a/c/src/exec/libnetworking/lib/getprotoby.c b/c/src/exec/libnetworking/lib/getprotoby.c
deleted file mode 100644
index fc8de6e402..0000000000
--- a/c/src/exec/libnetworking/lib/getprotoby.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- *  $Id$
- */
-
-#include <netdb.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-
-static const struct protoent prototab[] = {
-					{ "ip",    NULL, IPPROTO_IP },
-					{ "icmp",  NULL, IPPROTO_ICMP },
-					{ "tcp",   NULL, IPPROTO_TCP },
-					{ "udp",   NULL, IPPROTO_UDP },
-					};
-
-/*
- * Dummy version of BSD getprotobyname()
- */
-struct protoent *
-getprotobyname (const char *name)
-{
-	int i;
-
-	for (i = 0 ; i < (sizeof prototab / sizeof prototab[0]) ; i++) {
-		if (strcmp (name, prototab[i].p_name) == 0)
-			return (struct protoent *) &prototab[i];
-	}
-	return NULL;
-}
-
-/*
- * Dummy version of BSD getprotobynumber()
- */
-struct protoent *
-getprotobynumber (int proto)
-{
-	int i;
-
-	for (i = 0 ; i < (sizeof prototab / sizeof prototab[0]) ; i++) {
-		if (proto == prototab[i].p_proto)
-			return (struct protoent *) &prototab[i];
-	}
-	return NULL;
-}
diff --git a/c/src/exec/libnetworking/lib/syslog.c b/c/src/exec/libnetworking/lib/syslog.c
deleted file mode 100644
index 0bb15bc78e..0000000000
--- a/c/src/exec/libnetworking/lib/syslog.c
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * RTEMS version of syslog and associated routines
- *
- * $Id$
- */
-
-#include <rtems.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <errno.h>
-#include <syslog.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-
-#include <unistd.h>
-
-static int LogStatus = LOG_CONS;
-static const char *LogTag = "syslog";
-static int LogFacility = LOG_USER;
-static int LogMask = 0xff;
-
-static int LogFd = -1;
-static rtems_id LogSemaphore;
-extern struct in_addr rtems_bsdnet_log_host_address;
-
-#define SYSLOG_PORT	514
-
-void
-syslog (int pri, const char *fmt, ...)
-{
-	va_list ap;
-
-	va_start (ap, fmt);
-	vsyslog (pri, fmt, ap);
-	va_end (ap);
-}
-
-/*
- * FIXME: Should cbuf be static?  It could be if we put the mutex
- *        around the entire body of this routine.  Then we wouldn't
- *        have to worry about blowing stacks with a local variable
- *        that large.  Could make cbuf bigger, too.
- */
-void
-vsyslog (int pri, const char *fmt, va_list ap)
-{
-	int cnt;
-	char *cp;
-	char *msgp, cbuf[200];
-	int sent;
-
-	if (pri & ~(LOG_PRIMASK|LOG_FACMASK)) {
-		syslog (LOG_ERR|LOG_CONS|LOG_PERROR|LOG_PID,
-								"syslog: unknown facility/priority: %#x", pri);
-		pri &= LOG_PRIMASK|LOG_FACMASK;
-	}
-
-	if (!LOG_MASK(LOG_PRI(pri)) & LogMask)
-		return;
-
-	if ((pri & LOG_FACMASK) == 0)
-		pri |= LogFacility;
-
-	cnt = sprintf (cbuf, "<%d>", pri);
-	cp = msgp = cbuf + cnt;
-	if (LogTag) {
-		const char *lp = LogTag;
-		while ((*cp = *lp++) != '\0')
-			cp++;
-	}
-	if (LogStatus & LOG_PID) {
-		rtems_id tid;
-		rtems_task_ident (RTEMS_SELF, 0, &tid);
-		cnt = sprintf (cp, "[%#lx]", (unsigned long)tid);
-		cp += cnt;
-	}
-	if (LogTag) {
-		*cp++ = ':';
-		*cp++ = ' ';
-	}
-	cnt = vsprintf (cp, fmt, ap);
-	cnt += cp - cbuf;
-	if (cbuf[cnt-1] == '\n')
-		cbuf[--cnt] = '\0';
-
-	if (LogStatus & LOG_PERROR)
-		printf ("%s\n", cbuf);
-
-	/*
-	 * Grab the mutex
-	 */
-	sent = 0;
-	if ((rtems_bsdnet_log_host_address.s_addr != INADDR_ANY)
-	 && (LogFd >= 0)
-	 && (rtems_semaphore_obtain (LogSemaphore, RTEMS_WAIT, RTEMS_NO_TIMEOUT) == RTEMS_SUCCESSFUL)) {
-		/*
-		 * Set the destination address/port
-		 */
-		struct sockaddr_in farAddress;
-		farAddress.sin_family = AF_INET;
-		farAddress.sin_port = htons (SYSLOG_PORT);
-		farAddress.sin_addr = rtems_bsdnet_log_host_address;
-		memset (farAddress.sin_zero, '\0', sizeof farAddress.sin_zero);
-
-		/*
-		 * Send the message
-		 */
-		if (sendto (LogFd, cbuf, cnt, 0, (struct sockaddr *)&farAddress, sizeof farAddress) >= 0)
-			sent = 1;
-		rtems_semaphore_release (LogSemaphore);
-	}
-	if (!sent && (LogStatus & LOG_CONS) && !(LogStatus & LOG_PERROR))
-		printf ("%s\n", msgp);
-}
-
-void
-openlog (const char *ident, int logstat, int logfac)
-{
-	rtems_status_code sc;
-	struct sockaddr_in myAddress;
-
-	if (ident != NULL)
-		LogTag = ident;
-	LogStatus = logstat;
-	if (logfac != 0 && (logfac & ~LOG_FACMASK) == 0)
-		LogFacility = logfac;
-
-	/*
-	 * Create the socket
-	 */
-	if ((LogFd = socket (AF_INET, SOCK_DGRAM, 0)) < 0) {
-		printf ("Can't create syslog socket: %d\n", errno);
-		return;
-	}
-
-	/*
-	 * Bind socket to name
-	 */
-	myAddress.sin_family = AF_INET;
-	myAddress.sin_addr.s_addr = INADDR_ANY;
-	myAddress.sin_port = 0;
-	memset (myAddress.sin_zero, '\0', sizeof myAddress.sin_zero);
-	if (bind (LogFd, (struct sockaddr *)&myAddress, sizeof (myAddress)) < 0) {
-		close (LogFd);
-		LogFd = -1;
-		printf ("Can't bind syslog socket: %d\n", errno);
-		return;
-	}
-
-	/*
-	 * Create the mutex
-	 */
-	sc = rtems_semaphore_create (rtems_build_name('s', 'L', 'o', 'g'),
-					1,
-					RTEMS_PRIORITY |
-						RTEMS_BINARY_SEMAPHORE |
-						RTEMS_INHERIT_PRIORITY |
-						RTEMS_NO_PRIORITY_CEILING |
-						RTEMS_LOCAL,
-					0,
-					&LogSemaphore);
-	if (sc != RTEMS_SUCCESSFUL) {
-		printf ("Can't create syslog seamphore: %d\n", sc);
-		close (LogFd);
-		LogFd = -1;
-	}
-}
-
-void
-closelog(void)
-{
-	if (LogFd >= 0) {
-		close (LogFd);
-		LogFd = -1;
-		rtems_semaphore_delete (LogSemaphore);
-	}
-}
-
-int
-setlogmask (int pmask)
-{
-	int omask;
-
-	omask = LogMask;
-	if (pmask != 0)
-		LogMask = pmask;
-	return (omask);
-}
diff --git a/c/src/exec/libnetworking/lib/tftpDriver.c b/c/src/exec/libnetworking/lib/tftpDriver.c
deleted file mode 100644
index cf75623580..0000000000
--- a/c/src/exec/libnetworking/lib/tftpDriver.c
+++ /dev/null
@@ -1,609 +0,0 @@
-/*
- * Trivial File Transfer Protocol (RFC 1350)
- *
- * Transfer file to/from remote host
- *
- * W. Eric Norum
- * Saskatchewan Accelerator Laboratory
- * University of Saskatchewan
- * Saskatoon, Saskatchewan, CANADA
- * eric@skatter.usask.ca
- *
- *  $Id$
- */
-
-#include <stdio.h>
-#include <errno.h>
-#include <malloc.h>
-#include <string.h>
-#include <unistd.h>
-#include <rtems.h>
-#include <rtems/libio.h>
-#include <rtems/rtems_bsdnet.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-/*
- * Range of UDP ports to try
- */
-#define UDP_PORT_BASE	3180
-
-/*
- * Pathname prefix
- */
-#define TFTP_PATHNAME_PREFIX	"/TFTP/"
-
-/*
- * Default limits
- */
-#define PACKET_REPLY_MILLISECONDS	6000
-#define OPEN_RETRY_LIMIT	10
-#define IO_RETRY_LIMIT		10
-
-/*
- * TFTP opcodes
- */
-#define TFTP_OPCODE_RRQ		1
-#define TFTP_OPCODE_WRQ		2
-#define TFTP_OPCODE_DATA	3
-#define TFTP_OPCODE_ACK		4
-#define TFTP_OPCODE_ERROR	5
-
-/*
- * Largest data transfer
- */
-#define TFTP_BUFSIZE	512
-
-/*
- * Packets transferred between machines
- */
-union tftpPacket {
-	/*
-	 * RRQ/WRQ packet
-	 */
-	struct tftpRWRQ {
-		rtems_unsigned16	opcode;
-		char			filename_mode[TFTP_BUFSIZE];
-	} tftpRWRQ;
-
-	/*
-	 * DATA packet
-	 */
-	struct tftpDATA {
-		rtems_unsigned16	opcode;
-		rtems_unsigned16	blocknum;
-		rtems_unsigned8		data[TFTP_BUFSIZE];
-	} tftpDATA;
-
-	/*
-	 * ACK packet
-	 */
-	struct tftpACK {
-		rtems_unsigned16	opcode;
-		rtems_unsigned16	blocknum;
-	} tftpACK;
-
-	/*
-	 * ERROR packet
-	 */
-	struct tftpERROR {
-		rtems_unsigned16	opcode;
-		rtems_unsigned16	errorCode;
-		char			errorMessage[TFTP_BUFSIZE];
-	} tftpERROR;
-};
-
-/*
- * State of each TFTP stream
- */
-struct tftpStream {
-	/*
-	 * Buffer for storing most recently-received packet
-	 */
-	union tftpPacket	pkbuf;
-
-	/*
-	 * Last block number received
-	 */
-	rtems_unsigned16	blocknum;
-
-	/*
-	 * Data transfer socket
-	 */
-	int			socket;
-	struct sockaddr_in	myAddress;
-	struct sockaddr_in	farAddress;
-
-	/*
-	 * Indices into buffer
-	 */
-	int	nleft;
-	int	nused;
-
-	/*
-	 * Flags
-	 */
-	int	firstReply;
-	int	eof;
-};
-
-/*
- * Number of streams open at the same time
- */
-static rtems_id tftp_mutex;
-static int nStreams;
-static struct tftpStream ** volatile tftpStreams;
-
-/*
- * Initialize the TFTP driver
- */
-rtems_device_driver rtems_tftp_initialize(
-  rtems_device_major_number major,
-  rtems_device_minor_number minor,
-  void *pargp
-)
-{
-	rtems_status_code sc;
-
-	sc = rtems_semaphore_create (rtems_build_name('T', 'F', 'T', 'P'),
-					1,
-					RTEMS_FIFO |
-						RTEMS_BINARY_SEMAPHORE |
-						RTEMS_NO_INHERIT_PRIORITY |
-						RTEMS_NO_PRIORITY_CEILING |
-						RTEMS_LOCAL,
-					0,
-					&tftp_mutex);
-	if (sc != RTEMS_SUCCESSFUL)
-		return sc;
-	rtems_io_register_name (TFTP_PATHNAME_PREFIX, major, minor);
-	return RTEMS_SUCCESSFUL;
-}
-
-/*
- * Set error message
- * This RTEMS/UNIX error mapping needs to be fixed!
- */
-static void
-tftpSetErrno (struct tftpStream *tp)
-{
-	unsigned int tftpError;
-	static const int errorMap[] = {
-		0,
-		ENOENT,
-		EPERM,
-		ENOSPC,
-		EINVAL,
-		ENXIO,
-		EEXIST,
-		ESRCH,
-		0,
-	};
-
-	tftpError = ntohs (tp->pkbuf.tftpERROR.errorCode);
-	if (tftpError < (sizeof errorMap / sizeof errorMap[0]))
-		errno = errorMap[tftpError];
-	else
-		errno = 1000 + tftpError;
-}
-
-/*
- * Send a message to make the other end shut up
- */
-static void
-sendStifle (struct tftpStream *tp, struct sockaddr_in *to)
-{
-	int len;
-
-	/*
-	 * Create the error packet (Unknown transfer ID).
-	 */
-	tp->pkbuf.tftpERROR.opcode = htons (TFTP_OPCODE_ERROR);
-	tp->pkbuf.tftpERROR.errorCode = htons (5);
-	len = sizeof tp->pkbuf.tftpERROR.opcode +
-				sizeof tp->pkbuf.tftpERROR.errorCode + 1;
-	len += sprintf (tp->pkbuf.tftpERROR.errorMessage, "GO AWAY"); 
-
-	/*
-	 * Send it
-	 */
-	sendto (tp->socket, (char *)&tp->pkbuf, len, 0,
-					(struct sockaddr *)to, sizeof *to);
-}
-
-/*
- * Wait for a data packet
- */
-static int
-getPacket (struct tftpStream *tp)
-{
-	int len;
-	struct timeval tv;
-
-	tv.tv_sec = 6;
-	tv.tv_usec = 0;
-	setsockopt (tp->socket, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof tv);
-	for (;;) {
-		union {
-			struct sockaddr s;
-			struct sockaddr_in i;
-		} from;
-		int fromlen = sizeof from;
-		len = recvfrom (tp->socket, (char *)&tp->pkbuf,
-							sizeof tp->pkbuf, 0,
-							&from.s, &fromlen);
-		if (len < 0)
-			break;
-		if (from.i.sin_addr.s_addr == tp->farAddress.sin_addr.s_addr) {
-			if (tp->firstReply) {
-				tp->firstReply = 0;
-				tp->farAddress.sin_port = from.i.sin_port;
-			}
-			if (tp->farAddress.sin_port == from.i.sin_port) 
-				break;
-		}
-
-		/*
-		 * Packet is from someone with whom we are
-		 * not interested.  Tell them to go away.
-		 */
-		sendStifle (tp, &from.i);
-	}
-	tv.tv_sec = 0;
-	setsockopt (tp->socket, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof tv);
-	return len;
-}
-
-/*
- * Send an acknowledgement
- */
-static int
-sendAck (struct tftpStream *tp)
-{
-	/*
-	 * Create the acknowledgement
-	 */
-	tp->pkbuf.tftpACK.opcode = htons (TFTP_OPCODE_ACK);
-	tp->pkbuf.tftpACK.blocknum = htons (tp->blocknum);
-
-	/*
-	 * Send it
-	 */
-	if (sendto (tp->socket, (char *)&tp->pkbuf, sizeof tp->pkbuf.tftpACK, 0,
-					(struct sockaddr *)&tp->farAddress,
-					sizeof tp->farAddress) < 0)
-		return errno;
-	return 0;
-}
-
-/*
- * Release a stream and clear the pointer to it
- */
-static void
-releaseStream (int s)
-{
-	rtems_semaphore_obtain (tftp_mutex, RTEMS_WAIT, RTEMS_NO_TIMEOUT);
-	free (tftpStreams[s]);
-	tftpStreams[s] = NULL;
-	rtems_semaphore_release (tftp_mutex);
-}
-
-/*
- * Open a TFTP stream
- */
-rtems_device_driver rtems_tftp_open(
-  rtems_device_major_number major,
-  rtems_device_minor_number minor,
-  void *pargp
-)
-{
-	rtems_libio_open_close_args_t *ap = pargp;
-	struct tftpStream *tp;
-	int retryCount;
-	rtems_unsigned32 farAddress;
-	int s;
-	int len;
-	char *cp1, *cp2;
-	char *remoteFilename;
-	rtems_interval now;
-	rtems_status_code sc;
-
-	/*
-	 * Read-only for now
-	 */
-	if (ap->flags & LIBIO_FLAGS_WRITE)
-		return RTEMS_NOT_IMPLEMENTED;
-
-	/*
-	 * Pick apart the name into a host:pathname pair
-	 */
-	if (strlen (ap->iop->pathname) <= strlen (TFTP_PATHNAME_PREFIX))
-		return RTEMS_INVALID_NAME;
-	cp2 = ap->iop->pathname + strlen (TFTP_PATHNAME_PREFIX);
-	if (*cp2 == '/') {
-		farAddress = rtems_bsdnet_bootp_server_address.s_addr;
-	}
-	else {
-		char *hostname;
-
-		cp1 = cp2;
-		while (*cp2 != '/') {
-			if (*cp2 == '\0')
-				return RTEMS_INVALID_NAME;
-			cp2++;
-		}
-		len = cp2 - cp1;
-		hostname = malloc (len + 1);
-		if (hostname == NULL)
-			return RTEMS_NO_MEMORY;
-		strncpy (hostname, cp1, len);
-		hostname[len] = '\0';
-		farAddress = inet_addr (hostname);
-		free (hostname);
-	}
-	if ((farAddress == 0) || (farAddress == ~0))
-		return RTEMS_INVALID_NAME;
-	if (*++cp2 == '\0')
-		return RTEMS_INVALID_NAME;
-	remoteFilename = cp2;
-	if (strlen (remoteFilename) > (TFTP_BUFSIZE - 10))
-		return RTEMS_INVALID_NAME;
-
-	/*
-	 * Find a free stream
-	 */
-	sc = rtems_semaphore_obtain (tftp_mutex, RTEMS_WAIT, RTEMS_NO_TIMEOUT);
-	if (sc != RTEMS_SUCCESSFUL)
-		return sc;
-	for (s = 0 ; s < nStreams ; s++) {
-		if (tftpStreams[s] == NULL)
-			break;
-	}
-	if (s == nStreams) {
-		/*
-		 * Reallocate stream pointers
-		 * Guard against the case where realloc() returns NULL.
-		 */
-		struct tftpStream **np;
-
-		np = realloc (tftpStreams, ++nStreams * sizeof *tftpStreams);
-		if (np == NULL) {
-			rtems_semaphore_release (tftp_mutex);
-			return RTEMS_NO_MEMORY;
-		}
-		tftpStreams = np;
-	}
-	tp = tftpStreams[s] = malloc (sizeof (struct tftpStream));
-	rtems_semaphore_release (tftp_mutex);
-	if (tp == NULL)
-		return RTEMS_NO_MEMORY;
-	ap->iop->data0 = s;
-	ap->iop->data1 = tp;
-
-	/*
-	 * Create the socket
-	 */
-	if ((tp->socket = socket (AF_INET, SOCK_DGRAM, 0)) < 0) {
-		releaseStream (s);
-		return RTEMS_TOO_MANY;
-	}
-
-	/*
-	 * Bind the socket to a local address
-	 */
-	retryCount = 0;
-	rtems_clock_get (RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &now);
-	for (;;) {
-		int try = (now + retryCount) % 10;
-
-		tp->myAddress.sin_family = AF_INET;
-		tp->myAddress.sin_port = htons (UDP_PORT_BASE + nStreams * try + minor);
-		tp->myAddress.sin_addr.s_addr = htonl (INADDR_ANY);
-		if (bind (tp->socket, (struct sockaddr *)&tp->myAddress, sizeof tp->myAddress) >= 0)
-			break;
-		if (++retryCount == 10) {
-			close (tp->socket);
-			releaseStream (minor);
-			return RTEMS_RESOURCE_IN_USE;
-		}
-	}
-
-	/*
-	 * Set the UDP destination to the TFTP server
-	 * port on the remote machine.
-	 */
-	tp->farAddress.sin_family = AF_INET;
-	tp->farAddress.sin_addr.s_addr = farAddress;
-	tp->farAddress.sin_port = htons (69);
-
-	/*
-	 * Start the transfer
-	 */
-	tp->firstReply = 1;
-	for (;;) {
-		/*
-		 * Create the request
-		 */
-		tp->pkbuf.tftpRWRQ.opcode = htons (TFTP_OPCODE_RRQ);
-		cp1 = tp->pkbuf.tftpRWRQ.filename_mode;
-		cp2 = remoteFilename;
-		while ((*cp1++ = *cp2++) != '\0')
-			continue;
-		cp2 = "octet";
-		while ((*cp1++ = *cp2++) != '\0')
-			continue;
-		len = cp1 - (char *)&tp->pkbuf.tftpRWRQ;
-
-		/*
-		 * Send the request
-		 */
-		if (sendto (tp->socket, (char *)&tp->pkbuf, len, 0, 
-					(struct sockaddr *)&tp->farAddress,
-					sizeof tp->farAddress) < 0) {
-			close (tp->socket);
-			releaseStream (minor);
-			return RTEMS_UNSATISFIED;
-		}
-
-		/*
-		 * Get reply
-		 */
-		len = getPacket (tp);
-		if (len >= (int) sizeof tp->pkbuf.tftpACK) {
-			int opcode = ntohs (tp->pkbuf.tftpDATA.opcode);
-			if ((opcode == TFTP_OPCODE_DATA)
-			 && (ntohs (tp->pkbuf.tftpDATA.blocknum) == 1)) {
-				tp->nused = 0;
-				tp->blocknum = 1;
-				tp->nleft = len - 2 * sizeof (rtems_unsigned16);
-				tp->eof = (tp->nleft < TFTP_BUFSIZE);
-				if (sendAck (tp) != 0) {
-					close (tp->socket);
-					releaseStream (minor);
-					return RTEMS_UNSATISFIED;
-				}
-				break;
-			}
-			if (opcode == TFTP_OPCODE_ERROR) {
-				tftpSetErrno (tp);
-				close (tp->socket);
-				releaseStream (ap->iop->data0);
-				return RTEMS_INTERNAL_ERROR;
-			}
-		}
-
-		/*
-		 * Keep trying
-		 */
-		if (++retryCount >= OPEN_RETRY_LIMIT) {
-			close (tp->socket);
-			releaseStream (minor);
-			return RTEMS_UNSATISFIED;
-		}
-	}
-	return RTEMS_SUCCESSFUL;
-}
-
-/*
- * Read from a TFTP stream
- */
-rtems_device_driver rtems_tftp_read(
-  rtems_device_major_number major,
-  rtems_device_minor_number minor,
-  void *pargp
-)
-{
-	rtems_libio_rw_args_t *ap = pargp;
-	char *bp;
-	struct tftpStream *tp;
-	int retryCount;
-	int nwant;
-
-	tp = ap->iop->data1;
-
-	/*
-	 * Read till user request is satisfied or EOF is reached
-	 */
-	bp = ap->buffer;
-	nwant = ap->count;
-	while (nwant) {
-		if (tp->nleft) {
-			int count;
-			if (nwant < tp->nleft)
-				count = nwant;
-			else
-				count = tp->nleft;
-			memcpy (bp, &tp->pkbuf.tftpDATA.data[tp->nused], count);
-			tp->nused += count;
-			tp->nleft -= count;
-			bp += count;
-			nwant -= count;
-			if (nwant == 0)
-				break;
-		}
-		if (tp->eof)
-			break;
-
-		/*
-		 * Wait for the next packet
-		 */
-		retryCount = 0;
-		for (;;) {
-			int len = getPacket (tp);
-			if (len >= (int)sizeof tp->pkbuf.tftpACK) {
-				int opcode = ntohs (tp->pkbuf.tftpDATA.opcode);
-				rtems_unsigned16 nextBlock = tp->blocknum + 1;
-				if ((opcode == TFTP_OPCODE_DATA)
-				 && (ntohs (tp->pkbuf.tftpDATA.blocknum) == nextBlock)) {
-					tp->nused = 0;
-					tp->nleft = len - 2 * sizeof (rtems_unsigned16);
-					tp->eof = (tp->nleft < TFTP_BUFSIZE);
-					tp->blocknum++;
-					if (sendAck (tp) != 0)
-						return RTEMS_IO_ERROR;
-					break;
-				}
-				if (opcode == TFTP_OPCODE_ERROR) {
-					tftpSetErrno (tp);
-					return RTEMS_INTERNAL_ERROR;
-				}
-			}
-
-			/*
-			 * Keep trying?
-			 */
-			if (++retryCount == IO_RETRY_LIMIT)
-				return RTEMS_IO_ERROR;
-			if (sendAck (tp) != 0)
-				return RTEMS_IO_ERROR;
-		}
-	}
-	ap->bytes_moved = ap->count - nwant;
-	return RTEMS_SUCCESSFUL;
-}
-
-/*
- * Close a TFTP stream
- */
-rtems_device_driver rtems_tftp_close(
-  rtems_device_major_number major,
-  rtems_device_minor_number minor,
-  void *pargp
-)
-{
-	rtems_libio_open_close_args_t *ap = pargp;
-	struct tftpStream *tp = ap->iop->data1;;
-
-	if (!tp->eof && !tp->firstReply) {
-		/*
-		 * Tell the other end to stop
-		 */
-		rtems_interval ticksPerSecond;
-		sendStifle (tp, &tp->farAddress);
-		rtems_clock_get (RTEMS_CLOCK_GET_TICKS_PER_SECOND, &ticksPerSecond);
-		rtems_task_wake_after (1 + ticksPerSecond / 10);
-	}
-	close (tp->socket);
-	releaseStream (ap->iop->data0);
-	return RTEMS_SUCCESSFUL;
-}
-
-rtems_device_driver rtems_tftp_write(
-  rtems_device_major_number major,
-  rtems_device_minor_number minor,
-  void *pargp
-)
-{
-	return RTEMS_NOT_CONFIGURED;
-}
-
-rtems_device_driver rtems_tftp_control(
-  rtems_device_major_number major,
-  rtems_device_minor_number minor,
-  void *pargp
-)
-{
-	return RTEMS_NOT_CONFIGURED;
-}
diff --git a/c/src/exec/libnetworking/libc/addr2ascii.3 b/c/src/exec/libnetworking/libc/addr2ascii.3
deleted file mode 100644
index 10c839ea74..0000000000
--- a/c/src/exec/libnetworking/libc/addr2ascii.3
+++ /dev/null
@@ -1,217 +0,0 @@
-.\"
-.\" Copyright 1996 Massachusetts Institute of Technology
-.\"
-.\" Permission to use, copy, modify, and distribute this software and
-.\" its documentation for any purpose and without fee is hereby
-.\" granted, provided that both the above copyright notice and this
-.\" permission notice appear in all copies, that both the above
-.\" copyright notice and this permission notice appear in all
-.\" supporting documentation, and that the name of M.I.T. not be used
-.\" in advertising or publicity pertaining to distribution of the
-.\" software without specific, written prior permission.  M.I.T. makes
-.\" no representations about the suitability of this software for any
-.\" purpose.  It is provided "as is" without express or implied
-.\" warranty.
-.\" 
-.\" THIS SOFTWARE IS PROVIDED BY M.I.T. ``AS IS''.  M.I.T. DISCLAIMS
-.\" ALL EXPRESS OR IMPLIED WARRANTIES WITH REGARD TO THIS SOFTWARE,
-.\" INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-.\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT
-.\" SHALL M.I.T. BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-.\" SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-.\" LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-.\" USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-.\" ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-.\" OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-.\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"	$ANA: addr2ascii.3,v 1.1 1996/06/13 18:41:46 wollman Exp $
-.\"     $Id$
-.\"
-.Dd June 13, 1996
-.Dt ADDR2ASCII 3
-.Os
-.Sh NAME
-.Nm addr2ascii ,
-.Nm ascii2addr
-.Nd Generic address formatting routines
-.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <netinet/in.h>
-.Fd #include <arpa/inet.h>
-.Ft "char *"
-.Fn addr2ascii "int af" "const void *addrp" "int len" "char *buf"
-.Ft int
-.Fn ascii2addr "int af" "const char *ascii" "void *result"
-.Sh DESCRIPTION
-The routines
-.Fn addr2ascii
-and
-.Fn ascii2addr
-are used to convert network addresses between binary form and a
-printable form appropriate to the address family.  Both functions take
-an
-.Fa af
-argument, specifying the address family to be used in the conversion
-process.
-(Currently, only the
-.Dv AF_INET
-and
-.Dv AF_LINK
-address families are supported.)
-.Pp
-The
-.Fn addr2ascii
-function
-is used to convert binary, network-format addresses into printable
-form.  In addition to
-.Fa af ,
-there are three other arguments.  The
-.Fa addrp
-argument is a pointer to the network address to be converted.
-The
-.Fa len
-argument is the length of the address.  The
-.Fa buf
-argument is an optional pointer to a caller-allocated buffer to hold
-the result; if a null pointer is passed,
-.Fn addr2ascii
-uses a statically-allocated buffer.
-.Pp
-The
-.Fn ascii2addr
-function performs the inverse operation to
-.Fn addr2ascii .
-In addition to
-.Fa af ,
-it takes two parameters,
-.Fa ascii
-and
-.Fa result .
-The
-.Fa ascii
-parameter is a pointer to the string which is to be converted into
-binary.  The
-.Fa result
-parameter is a pointer to an appropriate network address structure for
-the specified family.
-.Pp
-The following gives the appropriate structure to use for binary
-addresses in the specified family:
-.Pp
-.Bl -tag -width AF_INETxxxx -compact
-.It Dv AF_INET
-.Li struct in_addr
-.Pq in Aq Pa netinet/in.h
-.It Dv AF_LINK
-.Li struct sockaddr_dl
-.Pq in Aq Pa net/if_dl.h
-.\" .It Dv AF_INET6
-.\" .Li struct in6_addr
-.\" .Pq in Aq Pa netinet6/in6.h
-.El
-.Sh RETURN VALUES
-The
-.Fn addr2ascii
-function returns the address of the buffer it was passed, or a static
-buffer if the a null pointer was passed; on failure, it returns a null
-pointer.
-The
-.Fn ascii2addr
-function returns the length of the binary address in bytes, or -1 on
-failure.
-.Sh EXAMPLES
-The
-.Xr inet 3
-functions
-.Fn inet_ntoa
-and
-.Fn inet_aton
-could be implemented thusly:
-.Bd -literal -offset indent
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-char *
-inet_ntoa(struct in_addr addr)
-{
-	return addr2ascii(AF_INET, &addr, sizeof addr, 0);
-}
-
-int
-inet_aton(const char *ascii, struct in_addr *addr)
-{
-	return (ascii2addr(AF_INET, ascii, addr) 
-	    == sizeof(*addr));
-}
-.Ed
-.Pp
-In actuality, this cannot be done because
-.Fn addr2ascii
-and
-.Fn ascii2addr
-are implemented in terms of the
-.Xr inet 3
-functions, rather than the other way around.
-.Sh ERRORS
-When a failure is returned,
-.Li errno
-is set to one of the following values:
-.Bl -tag -width [EPROTONOSUPPORT]
-.It Bq Er ENAMETOOLONG
-The
-.Fn addr2ascii
-routine was passed a
-.Fa len
-parameter which was inappropriate for the address family given by
-.Fa af .
-.It Bq Er EPROTONOSUPPORT
-Either routine was passed an
-.Fa af
-parameter other than
-.Dv AF_INET
-or
-.Dv AF_LINK .
-.It Bq Er EINVAL
-The string passed to
-.Fn ascii2addr
-was improperly formatted for address family
-.Fa af .
-.El
-.Sh SEE ALSO
-.Xr inet 3 ,
-.Xr linkaddr 3 ,
-.Xr inet 4
-.Sh HISTORY
-An interface close to this one was originally suggested by Craig
-Partridge.  This particular interface originally appeared in the
-.Tn INRIA
-.Tn IPv6
-implementation.
-.Sh AUTHORS
-Code and documentation by
-.An Garrett A. Wollman ,
-MIT Laboratory for Computer Science.
-.Sh BUGS
-The original implementations supported IPv6.  This support should
-eventually be resurrected.  The
-.Tn NRL
-implementation also included support for the
-.Dv AF_ISO
-and
-.Dv AF_NS
-address families.
-.Pp
-The genericity of this interface is somewhat questionable.  A truly
-generic interface would provide a means for determining the length of
-the buffer to be used so that it could be dynamically allocated, and
-would always require a
-.Dq Li "struct sockaddr"
-to hold the binary address.  Unfortunately, this is incompatible with existing
-practice.  This limitation means that a routine for printing network
-addresses from arbitrary address families must still have internal
-knowledge of the maximum buffer length needed and the appropriate part
-of the address to use as the binary address.
diff --git a/c/src/exec/libnetworking/libc/addr2ascii.c b/c/src/exec/libnetworking/libc/addr2ascii.c
deleted file mode 100644
index dc651743b6..0000000000
--- a/c/src/exec/libnetworking/libc/addr2ascii.c
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright 1996 Massachusetts Institute of Technology
- *
- * Permission to use, copy, modify, and distribute this software and
- * its documentation for any purpose and without fee is hereby
- * granted, provided that both the above copyright notice and this
- * permission notice appear in all copies, that both the above
- * copyright notice and this permission notice appear in all
- * supporting documentation, and that the name of M.I.T. not be used
- * in advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission.  M.I.T. makes
- * no representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied
- * warranty.
- * 
- * THIS SOFTWARE IS PROVIDED BY M.I.T. ``AS IS''.  M.I.T. DISCLAIMS
- * ALL EXPRESS OR IMPLIED WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT
- * SHALL M.I.T. BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	$ANA: addr2ascii.c,v 1.1 1996/06/13 18:41:46 wollman Exp $
- *
- *  $Id$
- */
-
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <errno.h>
-#include <string.h>
-
-#include <net/if_dl.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-/*-
- * Convert a network address from binary to printable numeric format.
- * This API is copied from INRIA's IPv6 implementation, but it is a
- * bit bogus in two ways:
- *
- *	1) There is no value in passing both an address family and
- *	   an address length; either one should imply the other,
- *	   or we should be passing sockaddrs instead.
- *	2) There should by contrast be /added/ a length for the buffer
- *	   that we pass in, so that programmers are spared the need to
- *	   manually calculate (read: ``guess'') the maximum length.
- *
- * Flash: the API is also the same in the NRL implementation, and seems to
- * be some sort of standard, so we appear to be stuck with both the bad
- * naming and the poor choice of arguments.
- */
-char *
-addr2ascii(af, addrp, len, buf)
-	int af;
-	const void *addrp;
-	int len;		/* should be size_t XXX */
-	char *buf;		/* XXX should pass length of buffer */
-{
-	static char staticbuf[64]; /* 64 for AF_LINK > 16 for AF_INET */
-
-	if (!buf)
-		buf = staticbuf;
-
-	switch(af) {
-	case AF_INET:
-		if (len != sizeof(struct in_addr)) {
-			errno = ENAMETOOLONG;
-			return 0;
-		}
-		strcpy(buf, inet_ntoa(*(const struct in_addr *)addrp));
-		break;
-
-	case AF_LINK:
-		if (len != sizeof(struct sockaddr_dl)) {
-			errno = ENAMETOOLONG;
-			return 0;
-		}
-		strcpy(buf, link_ntoa((const struct sockaddr_dl *)addrp));
-		break;
-			
-	default:
-		errno = EPROTONOSUPPORT;
-		return 0;
-	}
-	return buf;
-}
diff --git a/c/src/exec/libnetworking/libc/ascii2addr.c b/c/src/exec/libnetworking/libc/ascii2addr.c
deleted file mode 100644
index e140244737..0000000000
--- a/c/src/exec/libnetworking/libc/ascii2addr.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright 1996 Massachusetts Institute of Technology
- *
- * Permission to use, copy, modify, and distribute this software and
- * its documentation for any purpose and without fee is hereby
- * granted, provided that both the above copyright notice and this
- * permission notice appear in all copies, that both the above
- * copyright notice and this permission notice appear in all
- * supporting documentation, and that the name of M.I.T. not be used
- * in advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission.  M.I.T. makes
- * no representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied
- * warranty.
- * 
- * THIS SOFTWARE IS PROVIDED BY M.I.T. ``AS IS''.  M.I.T. DISCLAIMS
- * ALL EXPRESS OR IMPLIED WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT
- * SHALL M.I.T. BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	$ANA: ascii2addr.c,v 1.2 1996/06/13 18:46:02 wollman Exp $
- *
- *  $Id$
- */
-
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <errno.h>
-#include <string.h>
-
-#include <net/if_dl.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-int
-ascii2addr(af, ascii, result)
-	int af;
-	const char *ascii;
-	void *result;
-{
-	struct in_addr *ina;
-	char strbuf[4*sizeof("123")]; /* long enough for V4 only */
-
-	switch(af) {
-	case AF_INET:
-		ina = result;
-		strbuf[0] = '\0';
-		strncat(strbuf, ascii, (sizeof strbuf)-1);
-		if (inet_aton(strbuf, ina))
-			return sizeof(struct in_addr);
-		errno = EINVAL;
-		break;
-
-	case AF_LINK:
-		link_addr(ascii, result);
-		/* oops... no way to detect failure */
-		return sizeof(struct sockaddr_dl);
-
-	default:
-		errno = EPROTONOSUPPORT;
-		break;
-	}
-
-	return -1;
-}
diff --git a/c/src/exec/libnetworking/libc/base64.c b/c/src/exec/libnetworking/libc/base64.c
deleted file mode 100644
index 3017ccc01c..0000000000
--- a/c/src/exec/libnetworking/libc/base64.c
+++ /dev/null
@@ -1,318 +0,0 @@
-/*
- * Copyright (c) 1996, 1998 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-/*
- * Portions Copyright (c) 1995 by International Business Machines, Inc.
- *
- * International Business Machines, Inc. (hereinafter called IBM) grants
- * permission under its copyrights to use, copy, modify, and distribute this
- * Software with or without fee, provided that the above copyright notice and
- * all paragraphs of this notice appear in all copies, and that the name of IBM
- * not be used in connection with the marketing of any product incorporating
- * the Software or modifications thereof, without specific, written prior
- * permission.
- *
- * To the extent it has a right to do so, IBM grants an immunity from suit
- * under its patents, if any, for the use, sale or manufacture of products to
- * the extent that such products are used for performing Domain Name System
- * dynamic updates in TCP/IP networks by means of the Software.  No immunity is
- * granted for any product per se or for any other function of any product.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", AND IBM DISCLAIMS ALL WARRANTIES,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL IBM BE LIABLE FOR ANY SPECIAL,
- * DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE, EVEN
- * IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES.
- */
-
-#if !defined(__rtems__)
-#if !defined(LINT) && !defined(CODECENTER)
-static char rcsid[] = "$Id$";
-#endif /* not lint */
-#endif /* not rtems */
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-
-#include <ctype.h>
-#include <resolv.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#define Assert(Cond) if (!(Cond)) abort()
-
-static const char Base64[] =
-	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-static const char Pad64 = '=';
-
-/* (From RFC1521 and draft-ietf-dnssec-secext-03.txt)
-   The following encoding technique is taken from RFC 1521 by Borenstein
-   and Freed.  It is reproduced here in a slightly edited form for
-   convenience.
-
-   A 65-character subset of US-ASCII is used, enabling 6 bits to be
-   represented per printable character. (The extra 65th character, "=",
-   is used to signify a special processing function.)
-
-   The encoding process represents 24-bit groups of input bits as output
-   strings of 4 encoded characters. Proceeding from left to right, a
-   24-bit input group is formed by concatenating 3 8-bit input groups.
-   These 24 bits are then treated as 4 concatenated 6-bit groups, each
-   of which is translated into a single digit in the base64 alphabet.
-
-   Each 6-bit group is used as an index into an array of 64 printable
-   characters. The character referenced by the index is placed in the
-   output string.
-
-                         Table 1: The Base64 Alphabet
-
-      Value Encoding  Value Encoding  Value Encoding  Value Encoding
-          0 A            17 R            34 i            51 z
-          1 B            18 S            35 j            52 0
-          2 C            19 T            36 k            53 1
-          3 D            20 U            37 l            54 2
-          4 E            21 V            38 m            55 3
-          5 F            22 W            39 n            56 4
-          6 G            23 X            40 o            57 5
-          7 H            24 Y            41 p            58 6
-          8 I            25 Z            42 q            59 7
-          9 J            26 a            43 r            60 8
-         10 K            27 b            44 s            61 9
-         11 L            28 c            45 t            62 +
-         12 M            29 d            46 u            63 /
-         13 N            30 e            47 v
-         14 O            31 f            48 w         (pad) =
-         15 P            32 g            49 x
-         16 Q            33 h            50 y
-
-   Special processing is performed if fewer than 24 bits are available
-   at the end of the data being encoded.  A full encoding quantum is
-   always completed at the end of a quantity.  When fewer than 24 input
-   bits are available in an input group, zero bits are added (on the
-   right) to form an integral number of 6-bit groups.  Padding at the
-   end of the data is performed using the '=' character.
-
-   Since all base64 input is an integral number of octets, only the
-         -------------------------------------------------                       
-   following cases can arise:
-   
-       (1) the final quantum of encoding input is an integral
-           multiple of 24 bits; here, the final unit of encoded
-	   output will be an integral multiple of 4 characters
-	   with no "=" padding,
-       (2) the final quantum of encoding input is exactly 8 bits;
-           here, the final unit of encoded output will be two
-	   characters followed by two "=" padding characters, or
-       (3) the final quantum of encoding input is exactly 16 bits;
-           here, the final unit of encoded output will be three
-	   characters followed by one "=" padding character.
-   */
-
-int
-b64_ntop(u_char const *src, size_t srclength, char *target, size_t targsize) {
-	size_t datalength = 0;
-	u_char input[3];
-	u_char output[4];
-	size_t i;
-
-	while (2 < srclength) {
-		input[0] = *src++;
-		input[1] = *src++;
-		input[2] = *src++;
-		srclength -= 3;
-
-		output[0] = input[0] >> 2;
-		output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4);
-		output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6);
-		output[3] = input[2] & 0x3f;
-		Assert(output[0] < 64);
-		Assert(output[1] < 64);
-		Assert(output[2] < 64);
-		Assert(output[3] < 64);
-
-		if (datalength + 4 > targsize)
-			return (-1);
-		target[datalength++] = Base64[output[0]];
-		target[datalength++] = Base64[output[1]];
-		target[datalength++] = Base64[output[2]];
-		target[datalength++] = Base64[output[3]];
-	}
-    
-	/* Now we worry about padding. */
-	if (0 != srclength) {
-		/* Get what's left. */
-		input[0] = input[1] = input[2] = '\0';
-		for (i = 0; i < srclength; i++)
-			input[i] = *src++;
-	
-		output[0] = input[0] >> 2;
-		output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4);
-		output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6);
-		Assert(output[0] < 64);
-		Assert(output[1] < 64);
-		Assert(output[2] < 64);
-
-		if (datalength + 4 > targsize)
-			return (-1);
-		target[datalength++] = Base64[output[0]];
-		target[datalength++] = Base64[output[1]];
-		if (srclength == 1)
-			target[datalength++] = Pad64;
-		else
-			target[datalength++] = Base64[output[2]];
-		target[datalength++] = Pad64;
-	}
-	if (datalength >= targsize)
-		return (-1);
-	target[datalength] = '\0';	/* Returned value doesn't count \0. */
-	return (datalength);
-}
-
-/* skips all whitespace anywhere.
-   converts characters, four at a time, starting at (or after)
-   src from base - 64 numbers into three 8 bit bytes in the target area.
-   it returns the number of data bytes stored at the target, or -1 on error.
- */
-
-int
-b64_pton(src, target, targsize)
-	char const *src;
-	u_char *target;
-	size_t targsize;
-{
-	int tarindex, state, ch;
-	char *pos;
-
-	state = 0;
-	tarindex = 0;
-
-	while ((ch = *src++) != '\0') {
-		if (isspace(ch))	/* Skip whitespace anywhere. */
-			continue;
-
-		if (ch == Pad64)
-			break;
-
-		pos = strchr(Base64, ch);
-		if (pos == 0) 		/* A non-base64 character. */
-			return (-1);
-
-		switch (state) {
-		case 0:
-			if (target) {
-				if ((size_t)tarindex >= targsize)
-					return (-1);
-				target[tarindex] = (pos - Base64) << 2;
-			}
-			state = 1;
-			break;
-		case 1:
-			if (target) {
-				if ((size_t)tarindex + 1 >= targsize)
-					return (-1);
-				target[tarindex]   |=  (pos - Base64) >> 4;
-				target[tarindex+1]  = ((pos - Base64) & 0x0f)
-							<< 4 ;
-			}
-			tarindex++;
-			state = 2;
-			break;
-		case 2:
-			if (target) {
-				if ((size_t)tarindex + 1 >= targsize)
-					return (-1);
-				target[tarindex]   |=  (pos - Base64) >> 2;
-				target[tarindex+1]  = ((pos - Base64) & 0x03)
-							<< 6;
-			}
-			tarindex++;
-			state = 3;
-			break;
-		case 3:
-			if (target) {
-				if ((size_t)tarindex >= targsize)
-					return (-1);
-				target[tarindex] |= (pos - Base64);
-			}
-			tarindex++;
-			state = 0;
-			break;
-		default:
-			abort();
-		}
-	}
-
-	/*
-	 * We are done decoding Base-64 chars.  Let's see if we ended
-	 * on a byte boundary, and/or with erroneous trailing characters.
-	 */
-
-	if (ch == Pad64) {		/* We got a pad char. */
-		ch = *src++;		/* Skip it, get next. */
-		switch (state) {
-		case 0:		/* Invalid = in first position */
-		case 1:		/* Invalid = in second position */
-			return (-1);
-
-		case 2:		/* Valid, means one byte of info */
-			/* Skip any number of spaces. */
-			for ((void)NULL; ch != '\0'; ch = *src++)
-				if (!isspace(ch))
-					break;
-			/* Make sure there is another trailing = sign. */
-			if (ch != Pad64)
-				return (-1);
-			ch = *src++;		/* Skip the = */
-			/* Fall through to "single trailing =" case. */
-			/* FALLTHROUGH */
-
-		case 3:		/* Valid, means two bytes of info */
-			/*
-			 * We know this char is an =.  Is there anything but
-			 * whitespace after it?
-			 */
-			for ((void)NULL; ch != '\0'; ch = *src++)
-				if (!isspace(ch))
-					return (-1);
-
-			/*
-			 * Now make sure for cases 2 and 3 that the "extra"
-			 * bits that slopped past the last full byte were
-			 * zeros.  If we don't check them, they become a
-			 * subliminal channel.
-			 */
-			if (target && target[tarindex] != 0)
-				return (-1);
-		}
-	} else {
-		/*
-		 * We ended by seeing the end of the string.  Make sure we
-		 * have no partial bytes lying around.
-		 */
-		if (state != 0)
-			return (-1);
-	}
-
-	return (tarindex);
-}
diff --git a/c/src/exec/libnetworking/libc/byteorder.3 b/c/src/exec/libnetworking/libc/byteorder.3
deleted file mode 100644
index 81bf604867..0000000000
--- a/c/src/exec/libnetworking/libc/byteorder.3
+++ /dev/null
@@ -1,77 +0,0 @@
-.\" Copyright (c) 1983, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"     @(#)byteorder.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
-.\"
-.Dd June 4, 1993
-.Dt BYTEORDER 3
-.Os BSD 4.2
-.Sh NAME
-.Nm htonl ,
-.Nm htons ,
-.Nm ntohl ,
-.Nm ntohs
-.Nd convert values between host and network byte order
-.Sh SYNOPSIS
-.Fd #include <sys/param.h>
-.Ft u_long
-.Fn htonl "u_long hostlong"
-.Ft u_short
-.Fn htons "u_short hostshort"
-.Ft u_long
-.Fn ntohl "u_long netlong"
-.Ft u_short
-.Fn ntohs "u_short netshort"
-.Sh DESCRIPTION
-These routines convert 16 and 32 bit quantities between network
-byte order and host byte order.
-On machines which have a byte order which is the same as the network
-order, routines are defined as null macros.
-.Pp
-These routines are most often used in conjunction with Internet
-addresses and ports as returned by
-.Xr gethostbyname 3
-and
-.Xr getservent 3 .
-.Sh SEE ALSO
-.Xr gethostbyname 3 ,
-.Xr getservent 3
-.Sh HISTORY
-The
-.Nm byteorder
-functions appeared in 
-.Bx 4.2 .
-.Sh BUGS
-On the
-.Tn VAX
-bytes are handled backwards from most everyone else in
-the world.  This is not expected to be fixed in the near future.
diff --git a/c/src/exec/libnetworking/libc/ether_addr.c b/c/src/exec/libnetworking/libc/ether_addr.c
deleted file mode 100644
index 9b7a9abf44..0000000000
--- a/c/src/exec/libnetworking/libc/ether_addr.c
+++ /dev/null
@@ -1,226 +0,0 @@
-/*
- * Copyright (c) 1995
- *	Bill Paul <wpaul@ctr.columbia.edu>.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by Bill Paul.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY Bill Paul AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * ethernet address conversion and lookup routines
- *
- * Written by Bill Paul <wpaul@ctr.columbia.edu>
- * Center for Telecommunications Research
- * Columbia University, New York City
- *
- *	$Id$
- */
-
-
-#include <stdio.h>
-#include <paths.h>
-#include <sys/types.h>
-#include <string.h>
-#include <stdlib.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <net/ethernet.h>
-#ifdef YP
-#include <rpc/rpc.h>
-#include <rpcsvc/yp_prot.h>
-#include <rpcsvc/ypclnt.h>
-#endif
-
-#ifndef _PATH_ETHERS
-#define _PATH_ETHERS "/etc/ethers"
-#endif
-
-/*
- * Parse a string of text containing an ethernet address and hostname
- * and separate it into its component parts.
- */
-int ether_line(l, e, hostname)
-        char *l;
-	struct ether_addr *e;
-	char *hostname;
-{
-        int i, o[6];
-
-        i = sscanf(l, "%x:%x:%x:%x:%x:%x %s", &o[0], &o[1], &o[2],
-                                              &o[3], &o[4], &o[5],
-					      hostname);
-	if (i != 7)
-                return (i);
-
-        for (i=0; i<6; i++)
-                e->octet[i] = o[i];
-        return (0);
-}
-
-/*
- * Convert an ASCII representation of an ethernet address to
- * binary form.
- */
-struct ether_addr *ether_aton(a)
-        char *a;
-{
-        int i;
-	static struct ether_addr o;
-	unsigned int o0, o1, o2, o3, o4, o5;
-
-        i = sscanf(a, "%x:%x:%x:%x:%x:%x", &o0, &o1, &o2, &o3, &o4, &o5);
-
-        if (i != 6)
-                return (NULL);
-
-        o.octet[0]=o0;
-	o.octet[1]=o1;
-	o.octet[2]=o2;
-	o.octet[3]=o3;
-	o.octet[4]=o4;
-	o.octet[5]=o5;
-
-        return ((struct ether_addr *)&o);
-}
-
-/*
- * Convert a binary representation of an ethernet address to
- * an ASCII string.
- */
-char *ether_ntoa(n)
-        struct ether_addr *n;
-{
-        int i;
-	static char a[18];
-
-        i = sprintf(a,"%x:%x:%x:%x:%x:%x",n->octet[0],n->octet[1],n->octet[2],
-                                          n->octet[3],n->octet[4],n->octet[5]);
-        if (i < 11)
-                return (NULL);
-        return ((char *)&a);
-}
-
-/*
- * Map an ethernet address to a hostname. Use either /etc/ethers or
- * NIS/YP.
- */
-
-int ether_ntohost(hostname, e)
-	char *hostname;
-	struct ether_addr *e;
-{
-	FILE *fp;
-	char buf[BUFSIZ + 2];
-	struct ether_addr local_ether;
-	char local_host[MAXHOSTNAMELEN];
-#ifdef YP
-	char *result;
-	int resultlen;
-	char *ether_a;
-	char *yp_domain;
-#endif
-	if ((fp = fopen(_PATH_ETHERS, "r")) == NULL)
-		return (1);
-
-	while (fgets(buf,BUFSIZ,fp)) {
-		if (buf[0] == '#')
-			continue;
-#ifdef YP
-		if (buf[0] == '+') {
-			if (yp_get_default_domain(&yp_domain))
-				continue;
-			ether_a = ether_ntoa(e);
-			if (yp_match(yp_domain, "ethers.byaddr", ether_a,
-				strlen(ether_a), &result, &resultlen)) {
-				continue;
-			}
-			strncpy(buf, result, resultlen);
-			buf[resultlen] = '\0';
-			free(result);
-		}
-#endif
-		if (!ether_line(buf, &local_ether, local_host)) {
-			if (!bcmp((char *)&local_ether.octet[0],
-				(char *)&e->octet[0], 6)) {
-			/* We have a match */
-				strcpy(hostname, local_host);
-				fclose(fp);
-				return(0);
-			}
-		}
-	}
-	fclose(fp);
-	return (1);
-}
-
-/*
- * Map a hostname to an ethernet address using /etc/ethers or
- * NIS/YP.
- */
-int ether_hostton(hostname, e)
-	char *hostname;
-	struct ether_addr *e;
-{
-	FILE *fp;
-	char buf[BUFSIZ + 2];
-	struct ether_addr local_ether;
-	char local_host[MAXHOSTNAMELEN];
-#ifdef YP
-	char *result;
-	int resultlen;
-	char *yp_domain;
-#endif
-	if ((fp = fopen(_PATH_ETHERS, "r")) == NULL)
-		return (1);
-
-	while (fgets(buf,BUFSIZ,fp)) {
-		if (buf[0] == '#')
-			continue;
-#ifdef YP
-		if (buf[0] == '+') {
-			if (yp_get_default_domain(&yp_domain))
-				continue;
-			if (yp_match(yp_domain, "ethers.byname", hostname,
-				strlen(hostname), &result, &resultlen)) {
-				continue;
-			}
-			strncpy(buf, result, resultlen);
-			buf[resultlen] = '\0';
-			free(result);
-		}
-#endif
-		if (!ether_line(buf, &local_ether, local_host)) {
-			if (!strcmp(hostname, local_host)) {
-				/* We have a match */
-				bcopy((char *)&local_ether.octet[0],
-					(char *)&e->octet[0], 6);
-				fclose(fp);
-				return(0);
-			}
-		}
-	}
-	fclose(fp);
-	return (1);
-}
diff --git a/c/src/exec/libnetworking/libc/ethers.3 b/c/src/exec/libnetworking/libc/ethers.3
deleted file mode 100644
index afea48320a..0000000000
--- a/c/src/exec/libnetworking/libc/ethers.3
+++ /dev/null
@@ -1,193 +0,0 @@
-.\" Copyright (c) 1995
-.\"	Bill Paul <wpaul@ctr.columbia.edu>.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by Bill Paul.
-.\" 4. Neither the name of the author nor the names of any co-contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY Bill Paul AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"     $Id$
-.\"
-.Dd April 12, 1995
-.Dt ETHERS 3
-.Os FreeBSD 2.1
-.Sh NAME
-.Nm ethers ,
-.Nm ether_line ,
-.Nm ether_aton ,
-.Nm ether_ntoa ,
-.Nm ether_ntohost ,
-.Nm ether_hostton
-.Nd Ethernet address conversion and lookup routines
-.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/socket.h>
-.Fd #include <net/ethernet.h>
-.Ft int
-.Fn ether_line "char *l" "struct ether_addr *e" "char *hostname"
-.Ft struct ether_addr *
-.Fn ether_aton "char *a"
-.Ft char *
-.Fn ether_ntoa "struct ether_addr *n"
-.Ft int
-.Fn ether_ntohost "char *hostname" "struct ether_addr *e"
-.Ft int
-.Fn ether_hostton "char *hostname" "struct ether_addr *e"
-.Sh DESCRIPTION
-These functions operate on ethernet addresses using an
-.Ar ether_addr
-structure, which is defined in the header file
-.Aq Pa netinet/if_ether.h :
-.Bd -literal -offset indent
-/*
- * The number of bytes in an ethernet (MAC) address.
- */
-#define ETHER_ADDR_LEN		6
-
-/*
- * Structure of a 48-bit Ethernet address.
- */
-struct  ether_addr {
-        u_char octet[ETHER_ADDR_LEN];
-};
-.Ed
-.Pp
-The function
-.Fn ether_line
-scans
-.Ar l ,
-an
-.Tn ASCII
-string in
-.Xr ethers 5
-format and sets
-.Ar e
-to the ethernet address specified in the string and
-.Ar h
-to the hostname. This function is used to parse lines from
-.Pa /etc/ethers
-into their component parts.
-.Pp
-The
-.Fn ether_aton
-function converts an
-.Tn ASCII
-representation of an ethernet address into an
-.Ar ether_addr
-structure. Likewise,
-.Fn ether_ntoa
-converts an ethernet address specified as an
-.Ar ether_addr
-structure into an
-.Tn ASCII
-string.
-.Pp
-The
-.Fn ether_ntohost
-and
-.Fn ether_hostton
-functions map ethernet addresses to their corresponding hostnames
-as specified in the
-.Pa /etc/ethers
-database. 
-.Fn ether_ntohost
-converts from ethernet address to hostname, and
-.Fn ether_hostton
-converts from hostname to ethernet address.
-.Sh RETURN VALUES
-.Fn ether_line
-returns zero on success and non-zero if it was unable to parse
-any part of the supplied line
-.Ar l .
-It returns the extracted ethernet address in the supplied
-.Ar ether_addr
-structure
-.Ar e
-and the hostname in the supplied string
-.Ar h .
-.Pp
-On success, 
-.Fn ether_ntoa
-returns a pointer to a string containing an
-.Tn ASCII
-representation of an ethernet address. If it is unable to convert
-the supplied
-.Ar ether_addr
-structure, it returns a
-.Dv NULL
-pointer. Likewise,
-.Fn ether_aton
-returns a pointer to an
-.Ar ether_addr
-structure on success and a
-.Dv NULL
-pointer on failure.
-.Pp
-The
-.Fn ether_ntohost
-and
-.Fn ether_hostton
-functions both return zero on success or non-zero if they were
-unable to find a match in the
-.Pa /etc/ethers
-database.
-.Sh NOTES
-The user must insure that the hostname strings passed to the
-the
-.Fn ether_line ,
-.Fn ether_ntohost
-and
-.Fn ether_hostton
-functions are large enough to contain the returned hostnames.
-.Sh NIS INTERACTION
-If the
-.Pa /etc/ethers
-contains a line with a single + in it, the
-.Fn ether_ntohost
-and
-.Fn ether_hostton
-functions will attempt to consult the NIS
-.Pa ethers.byname
-and
-.Pa ethers.byaddr
-maps in addition to the data in the
-.Pa /etc/ethers
-file.
-.Sh SEE ALSO
-.Xr yp 4 ,
-.Xr ethers 5
-.Sh BUGS
-.Pp
-The
-.Fn ether_aton
-and
-.Fn ether_ntoa
-functions returns values that are stored in static memory areas
-which may be overwritten the next time they are called.
-.Sh HISTORY
-This particular implementation of the
-.Nm ethers
-library functions were written for and first appeared in
-.Fx 2.1 .
diff --git a/c/src/exec/libnetworking/libc/gethostbydns.c b/c/src/exec/libnetworking/libc/gethostbydns.c
deleted file mode 100644
index 3d80ffde7a..0000000000
--- a/c/src/exec/libnetworking/libc/gethostbydns.c
+++ /dev/null
@@ -1,773 +0,0 @@
-/*
- * ++Copyright++ 1985, 1988, 1993
- * -
- * Copyright (c) 1985, 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * -
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- * -
- * --Copyright--
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)gethostnamadr.c	8.1 (Berkeley) 6/4/93";
-static char fromrcsid[] = "From: Id: gethnamaddr.c,v 8.23 1998/04/07 04:59:46 vixie Exp $";
-static char rcsid[] = "$Id$";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-
-#include <stdio.h>
-#include <unistd.h>
-#include <string.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <ctype.h>
-#include <errno.h>
-#include <syslog.h>
-
-#include "res_config.h"
-
-#define SPRINTF(x) ((size_t)sprintf x)
-
-#define	MAXALIASES	35
-#define	MAXADDRS	35
-
-static const char AskedForGot[] =
-		"gethostby*.gethostanswer: asked for \"%s\", got \"%s\"";
-
-static char *h_addr_ptrs[MAXADDRS + 1];
-
-static struct hostent host;
-static char *host_aliases[MAXALIASES];
-static char hostbuf[8*1024];
-static u_char host_addr[16];	/* IPv4 or IPv6 */
-
-#ifdef RESOLVSORT
-static void addrsort __P((char **, int));
-#endif
-
-#if PACKETSZ > 1024
-#define	MAXPACKET	PACKETSZ
-#else
-#define	MAXPACKET	1024
-#endif
-
-typedef union {
-    HEADER hdr;
-    u_char buf[MAXPACKET];
-} querybuf;
-
-typedef union {
-    int32_t al;
-    char ac;
-} align;
-
-extern int h_errno;
-int _dns_ttl_;
-
-#ifdef DEBUG
-static void
-dprintf(msg, num)
-	char *msg;
-	int num;
-{
-	if (_res.options & RES_DEBUG) {
-		int save = errno;
-
-		printf(msg, num);
-		errno = save;
-	}
-}
-#else
-# define dprintf(msg, num) /*nada*/
-#endif
-
-#define BOUNDED_INCR(x) \
-	do { \
-		cp += x; \
-		if (cp > eom) { \
-			h_errno = NO_RECOVERY; \
-			return (NULL); \
-		} \
-	} while (0)
-
-#define BOUNDS_CHECK(ptr, count) \
-	do { \
-		if ((ptr) + (count) > eom) { \
-			h_errno = NO_RECOVERY; \
-			return (NULL); \
-		} \
-	} while (0)
-
-static struct hostent *
-gethostanswer(answer, anslen, qname, qtype)
-	const querybuf *answer;
-	int anslen;
-	const char *qname;
-	int qtype;
-{
-	register const HEADER *hp;
-	register const u_char *cp;
-	register int n;
-	const u_char *eom, *erdata;
-	char *bp, **ap, **hap;
-	int type, class, buflen, ancount, qdcount;
-	int haveanswer, had_error;
-	int toobig = 0;
-	char tbuf[MAXDNAME];
-	const char *tname;
-	int (*name_ok) __P((const char *));
-
-	tname = qname;
-	host.h_name = NULL;
-	eom = answer->buf + anslen;
-	switch (qtype) {
-	case T_A:
-	case T_AAAA:
-		name_ok = res_hnok;
-		break;
-	case T_PTR:
-		name_ok = res_dnok;
-		break;
-	default:
-		h_errno = NO_RECOVERY;
-		return (NULL);	/* XXX should be abort(); */
-	}
-	/*
-	 * find first satisfactory answer
-	 */
-	hp = &answer->hdr;
-	ancount = ntohs(hp->ancount);
-	qdcount = ntohs(hp->qdcount);
-	bp = hostbuf;
-	buflen = sizeof hostbuf;
-	cp = answer->buf;
-	BOUNDED_INCR(HFIXEDSZ);
-	if (qdcount != 1) {
-		h_errno = NO_RECOVERY;
-		return (NULL);
-	}
-	n = dn_expand(answer->buf, eom, cp, bp, buflen);
-	if ((n < 0) || !(*name_ok)(bp)) {
-		h_errno = NO_RECOVERY;
-		return (NULL);
-	}
-	BOUNDED_INCR(n + QFIXEDSZ);
-	if (qtype == T_A || qtype == T_AAAA) {
-		/* res_send() has already verified that the query name is the
-		 * same as the one we sent; this just gets the expanded name
-		 * (i.e., with the succeeding search-domain tacked on).
-		 */
-		n = strlen(bp) + 1;		/* for the \0 */
-		if (n >= MAXHOSTNAMELEN) {
-			h_errno = NO_RECOVERY;
-			return (NULL);
-		}
-		host.h_name = bp;
-		bp += n;
-		buflen -= n;
-		/* The qname can be abbreviated, but h_name is now absolute. */
-		qname = host.h_name;
-	}
-	ap = host_aliases;
-	*ap = NULL;
-	host.h_aliases = host_aliases;
-	hap = h_addr_ptrs;
-	*hap = NULL;
-	host.h_addr_list = h_addr_ptrs;
-	haveanswer = 0;
-	had_error = 0;
-	_dns_ttl_ = -1;
-	while (ancount-- > 0 && cp < eom && !had_error) {
-		n = dn_expand(answer->buf, eom, cp, bp, buflen);
-		if ((n < 0) || !(*name_ok)(bp)) {
-			had_error++;
-			continue;
-		}
-		cp += n;			/* name */
-		BOUNDS_CHECK(cp, 3 * INT16SZ + INT32SZ);
-		type = _getshort(cp);
- 		cp += INT16SZ;			/* type */
-		class = _getshort(cp);
- 		cp += INT16SZ;			/* class */
-		if (qtype == T_A  && type == T_A)
-			_dns_ttl_ = _getlong(cp);
-		cp += INT32SZ;			/* TTL */
-		n = _getshort(cp);
-		cp += INT16SZ;			/* len */
-		BOUNDS_CHECK(cp, n);
-		erdata = cp + n;
-		if (class != C_IN) {
-			/* XXX - debug? syslog? */
-			cp += n;
-			continue;		/* XXX - had_error++ ? */
-		}
-		if ((qtype == T_A || qtype == T_AAAA) && type == T_CNAME) {
-			if (ap >= &host_aliases[MAXALIASES-1])
-				continue;
-			n = dn_expand(answer->buf, eom, cp, tbuf, sizeof tbuf);
-			if ((n < 0) || !(*name_ok)(tbuf)) {
-				had_error++;
-				continue;
-			}
-			cp += n;
-			if (cp != erdata) {
-				h_errno = NO_RECOVERY;
-				return (NULL);
-			}
-			/* Store alias. */
-			*ap++ = bp;
-			n = strlen(bp) + 1;	/* for the \0 */
-			if (n >= MAXHOSTNAMELEN) {
-				had_error++;
-				continue;
-			}
-			bp += n;
-			buflen -= n;
-			/* Get canonical name. */
-			n = strlen(tbuf) + 1;	/* for the \0 */
-			if (n > buflen || n >= MAXHOSTNAMELEN) {
-				had_error++;
-				continue;
-			}
-			strcpy(bp, tbuf);
-			host.h_name = bp;
-			bp += n;
-			buflen -= n;
-			continue;
-		}
-		if (qtype == T_PTR && type == T_CNAME) {
-			n = dn_expand(answer->buf, eom, cp, tbuf, sizeof tbuf);
-			if (n < 0 || !res_dnok(tbuf)) {
-				had_error++;
-				continue;
-			}
-			cp += n;
-			if (cp != erdata) {
-				h_errno = NO_RECOVERY;
-				return (NULL);
-			}
-			/* Get canonical name. */
-			n = strlen(tbuf) + 1;	/* for the \0 */
-			if (n > buflen || n >= MAXHOSTNAMELEN) {
-				had_error++;
-				continue;
-			}
-			strcpy(bp, tbuf);
-			tname = bp;
-			bp += n;
-			buflen -= n;
-			continue;
-		}
-		if (type != qtype) {
-			syslog(LOG_NOTICE|LOG_AUTH,
-	"gethostby*.gethostanswer: asked for \"%s %s %s\", got type \"%s\"",
-			       qname, p_class(C_IN), p_type(qtype),
-			       p_type(type));
-			cp += n;
-			continue;		/* XXX - had_error++ ? */
-		}
-		switch (type) {
-		case T_PTR:
-			if (strcasecmp(tname, bp) != 0) {
-				syslog(LOG_NOTICE|LOG_AUTH,
-				       AskedForGot, qname, bp);
-				cp += n;
-				continue;	/* XXX - had_error++ ? */
-			}
-			n = dn_expand(answer->buf, eom, cp, bp, buflen);
-			if ((n < 0) || !res_hnok(bp)) {
-				had_error++;
-				break;
-			}
-#if MULTI_PTRS_ARE_ALIASES
-			cp += n;
-			if (cp != erdata) {
-				h_errno = NO_RECOVERY;
-				return (NULL);
-			}
-			if (!haveanswer)
-				host.h_name = bp;
-			else if (ap < &host_aliases[MAXALIASES-1])
-				*ap++ = bp;
-			else
-				n = -1;
-			if (n != -1) {
-				n = strlen(bp) + 1;	/* for the \0 */
-				if (n >= MAXHOSTNAMELEN) {
-					had_error++;
-					break;
-				}
-				bp += n;
-				buflen -= n;
-			}
-			break;
-#else
-			host.h_name = bp;
-			if (_res.options & RES_USE_INET6) {
-				n = strlen(bp) + 1;	/* for the \0 */
-				if (n >= MAXHOSTNAMELEN) {
-					had_error++;
-					break;
-				}
-				bp += n;
-				buflen -= n;
-				_map_v4v6_hostent(&host, &bp, &buflen);
-			}
-			h_errno = NETDB_SUCCESS;
-			return (&host);
-#endif
-		case T_A:
-		case T_AAAA:
-			if (strcasecmp(host.h_name, bp) != 0) {
-				syslog(LOG_NOTICE|LOG_AUTH,
-				       AskedForGot, host.h_name, bp);
-				cp += n;
-				continue;	/* XXX - had_error++ ? */
-			}
-			if (n != host.h_length) {
-				cp += n;
-				continue;
-			}
-			if (!haveanswer) {
-				register int nn;
-
-				host.h_name = bp;
-				nn = strlen(bp) + 1;	/* for the \0 */
-				bp += nn;
-				buflen -= nn;
-			}
-
-			bp += sizeof(align) - ((u_long)bp % sizeof(align));
-
-			if (bp + n >= &hostbuf[sizeof hostbuf]) {
-				dprintf("size (%d) too big\n", n);
-				had_error++;
-				continue;
-			}
-			if (hap >= &h_addr_ptrs[MAXADDRS-1]) {
-				if (!toobig++)
-					dprintf("Too many addresses (%d)\n",
-						MAXADDRS);
-				cp += n;
-				continue;
-			}
-			bcopy(cp, *hap++ = bp, n);
-			bp += n;
-			buflen -= n;
-			cp += n;
-			if (cp != erdata) {
-				h_errno = NO_RECOVERY;
-				return (NULL);
-			}
-			break;
-		default:
-			dprintf("Impossible condition (type=%d)\n", type);
-			h_errno = NO_RECOVERY;
-			return (NULL);
-			/* BIND has abort() here, too risky on bad data */
-		}
-		if (!had_error)
-			haveanswer++;
-	}
-	if (haveanswer) {
-		*ap = NULL;
-		*hap = NULL;
-# if defined(RESOLVSORT)
-		/*
-		 * Note: we sort even if host can take only one address
-		 * in its return structures - should give it the "best"
-		 * address in that case, not some random one
-		 */
-		if (_res.nsort && haveanswer > 1 && qtype == T_A)
-			addrsort(h_addr_ptrs, haveanswer);
-# endif /*RESOLVSORT*/
-		if (!host.h_name) {
-			n = strlen(qname) + 1;	/* for the \0 */
-			if (n > buflen || n >= MAXHOSTNAMELEN)
-				goto no_recovery;
-			strcpy(bp, qname);
-			host.h_name = bp;
-			bp += n;
-			buflen -= n;
-		}
-		if (_res.options & RES_USE_INET6)
-			_map_v4v6_hostent(&host, &bp, &buflen);
-		h_errno = NETDB_SUCCESS;
-		return (&host);
-	}
- no_recovery:
-	h_errno = NO_RECOVERY;
-	return (NULL);
-}
-
-struct hostent *
-__dns_getanswer(answer, anslen, qname, qtype)
-	const char *answer;
-	int anslen;
-	const char *qname;
-	int qtype;
-{
-	switch(qtype) {
-	case T_AAAA:
-		host.h_addrtype = AF_INET6;
-		host.h_length = IN6ADDRSZ;
-		break;
-	case T_A:
-	default:
-		host.h_addrtype = AF_INET;
-		host.h_length = INADDRSZ;
-		break;
-	}
-
-	return(gethostanswer((const querybuf *)answer, anslen, qname, qtype));
-}
-
-struct hostent *
-_gethostbydnsname(name, af)
-	const char *name;
-	int af;
-{
-	querybuf buf;
-	register const char *cp;
-	char *bp;
-	int n, size, type, len;
-
-	if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
-		h_errno = NETDB_INTERNAL;
-		return (NULL);
-	}
-
-	switch (af) {
-	case AF_INET:
-		size = INADDRSZ;
-		type = T_A;
-		break;
-	case AF_INET6:
-		size = IN6ADDRSZ;
-		type = T_AAAA;
-		break;
-	default:
-		h_errno = NETDB_INTERNAL;
-		errno = EAFNOSUPPORT;
-		return (NULL);
-	}
-
-	host.h_addrtype = af;
-	host.h_length = size;
-
-	/*
-	 * if there aren't any dots, it could be a user-level alias.
-	 * this is also done in res_query() since we are not the only
-	 * function that looks up host names.
-	 */
-	if (!strchr(name, '.') && (cp = __hostalias(name)))
-		name = cp;
-
-	/*
-	 * disallow names consisting only of digits/dots, unless
-	 * they end in a dot.
-	 */
-	if (isdigit((int)name[0]))
-		for (cp = name;; ++cp) {
-			if (!*cp) {
-				if (*--cp == '.')
-					break;
-				/*
-				 * All-numeric, no dot at the end.
-				 * Fake up a hostent as if we'd actually
-				 * done a lookup.
-				 */
-				if (inet_pton(af, name, host_addr) <= 0) {
-					h_errno = HOST_NOT_FOUND;
-					return (NULL);
-				}
-				strncpy(hostbuf, name, MAXDNAME);
-				hostbuf[MAXDNAME] = '\0';
-				bp = hostbuf + MAXDNAME;
-				len = sizeof hostbuf - MAXDNAME;
-				host.h_name = hostbuf;
-				host.h_aliases = host_aliases;
-				host_aliases[0] = NULL;
-				h_addr_ptrs[0] = (char *)host_addr;
-				h_addr_ptrs[1] = NULL;
-				host.h_addr_list = h_addr_ptrs;
-				if (_res.options & RES_USE_INET6)
-					_map_v4v6_hostent(&host, &bp, &len);
-				h_errno = NETDB_SUCCESS;
-				return (&host);
-			}
-			if (!isdigit((int)*cp) && *cp != '.') 
-				break;
-		}
-	if ((isxdigit((int)name[0]) && strchr(name, ':') != NULL) ||
-	    name[0] == ':')
-		for (cp = name;; ++cp) {
-			if (!*cp) {
-				if (*--cp == '.')
-					break;
-				/*
-				 * All-IPv6-legal, no dot at the end.
-				 * Fake up a hostent as if we'd actually
-				 * done a lookup.
-				 */
-				if (inet_pton(af, name, host_addr) <= 0) {
-					h_errno = HOST_NOT_FOUND;
-					return (NULL);
-				}
-				strncpy(hostbuf, name, MAXDNAME);
-				hostbuf[MAXDNAME] = '\0';
-				bp = hostbuf + MAXDNAME;
-				len = sizeof hostbuf - MAXDNAME;
-				host.h_name = hostbuf;
-				host.h_aliases = host_aliases;
-				host_aliases[0] = NULL;
-				h_addr_ptrs[0] = (char *)host_addr;
-				h_addr_ptrs[1] = NULL;
-				host.h_addr_list = h_addr_ptrs;
-				h_errno = NETDB_SUCCESS;
-				return (&host);
-			}
-			if (!isxdigit((int)*cp) && *cp != ':' && *cp != '.') 
-				break;
-		}
-
-	if ((n = res_search(name, C_IN, type, buf.buf, sizeof(buf))) < 0) {
-		dprintf("res_search failed (%d)\n", n);
-		return (NULL);
-	}
-	return (gethostanswer(&buf, n, name, type));
-}
-
-struct hostent *
-_gethostbydnsaddr(addr, len, af)
-	const char *addr;	/* XXX should have been def'd as u_char! */
-	int len, af;
-{
-	const u_char *uaddr = (const u_char *)addr;
-	static const u_char mapped[] = { 0,0, 0,0, 0,0, 0,0, 0,0, 0xff,0xff };
-	static const u_char tunnelled[] = { 0,0, 0,0, 0,0, 0,0, 0,0, 0,0 };
-	int n, size;
-	querybuf buf;
-	register struct hostent *hp;
-	char qbuf[MAXDNAME+1], *qp;
-#ifdef SUNSECURITY
-	register struct hostent *rhp;
-	char **haddr;
-	u_long old_options;
-	char hname2[MAXDNAME+1];
-#endif /*SUNSECURITY*/
-	
-	if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
-		h_errno = NETDB_INTERNAL;
-		return (NULL);
-	}
-	if (af == AF_INET6 && len == IN6ADDRSZ &&
-	    (!bcmp(uaddr, mapped, sizeof mapped) ||
-	     !bcmp(uaddr, tunnelled, sizeof tunnelled))) {
-		/* Unmap. */
-		addr += sizeof mapped;
-		uaddr += sizeof mapped;
-		af = AF_INET;
-		len = INADDRSZ;
-	}
-	switch (af) {
-	case AF_INET:
-		size = INADDRSZ;
-		break;
-	case AF_INET6:
-		size = IN6ADDRSZ;
-		break;
-	default:
-		errno = EAFNOSUPPORT;
-		h_errno = NETDB_INTERNAL;
-		return (NULL);
-	}
-	if (size != len) {
-		errno = EINVAL;
-		h_errno = NETDB_INTERNAL;
-		return (NULL);
-	}
-	switch (af) {
-	case AF_INET:
-		(void) sprintf(qbuf, "%u.%u.%u.%u.in-addr.arpa",
-			       (uaddr[3] & 0xff),
-			       (uaddr[2] & 0xff),
-			       (uaddr[1] & 0xff),
-			       (uaddr[0] & 0xff));
-		break;
-	case AF_INET6:
-		qp = qbuf;
-		for (n = IN6ADDRSZ - 1; n >= 0; n--) {
-			qp += SPRINTF((qp, "%x.%x.",
-				       uaddr[n] & 0xf,
-				       (uaddr[n] >> 4) & 0xf));
-		}
-		strcpy(qp, "ip6.int");
-		break;
-	default:
-		abort();
-	}
-	n = res_query(qbuf, C_IN, T_PTR, (u_char *)buf.buf, sizeof buf.buf);
-	if (n < 0) {
-		dprintf("res_query failed (%d)\n", n);
-		return (NULL);
-	}
-	if (!(hp = gethostanswer(&buf, n, qbuf, T_PTR)))
-		return (NULL);	/* h_errno was set by gethostanswer() */
-#ifdef SUNSECURITY
-	if (af == AF_INET) {
-	    /*
-	     * turn off search as the name should be absolute,
-	     * 'localhost' should be matched by defnames
-	     */
-	    strncpy(hname2, hp->h_name, MAXDNAME);
-	    hname2[MAXDNAME] = '\0';
-	    old_options = _res.options;
-	    _res.options &= ~RES_DNSRCH;
-	    _res.options |= RES_DEFNAMES;
-	    if (!(rhp = gethostbyname(hname2))) {
-		syslog(LOG_NOTICE|LOG_AUTH,
-		       "gethostbyaddr: No A record for %s (verifying [%s])",
-		       hname2, inet_ntoa(*((struct in_addr *)addr)));
-		_res.options = old_options;
-		h_errno = HOST_NOT_FOUND;
-		return (NULL);
-	    }
-	    _res.options = old_options;
-	    for (haddr = rhp->h_addr_list; *haddr; haddr++)
-		if (!memcmp(*haddr, addr, INADDRSZ))
-			break;
-	    if (!*haddr) {
-		syslog(LOG_NOTICE|LOG_AUTH,
-		       "gethostbyaddr: A record of %s != PTR record [%s]",
-		       hname2, inet_ntoa(*((struct in_addr *)addr)));
-		h_errno = HOST_NOT_FOUND;
-		return (NULL);
-	    }
-	}
-#endif /*SUNSECURITY*/
-	hp->h_addrtype = af;
-	hp->h_length = len;
-	bcopy(addr, host_addr, len);
-	h_addr_ptrs[0] = (char *)host_addr;
-	h_addr_ptrs[1] = NULL;
-	if (af == AF_INET && (_res.options & RES_USE_INET6)) {
-		_map_v4v6_address((char*)host_addr, (char*)host_addr);
-		hp->h_addrtype = AF_INET6;
-		hp->h_length = IN6ADDRSZ;
-	}
-	h_errno = NETDB_SUCCESS;
-	return (hp);
-}
-
-#ifdef RESOLVSORT
-static void
-addrsort(ap, num)
-	char **ap;
-	int num;
-{
-	int i, j;
-	char **p;
-	short aval[MAXADDRS];
-	int needsort = 0;
-
-	p = ap;
-	for (i = 0; i < num; i++, p++) {
-	    for (j = 0 ; (unsigned)j < _res.nsort; j++)
-		if (_res.sort_list[j].addr.s_addr == 
-		    (((struct in_addr *)(*p))->s_addr & _res.sort_list[j].mask))
-			break;
-	    aval[i] = j;
-	    if (needsort == 0 && i > 0 && j < aval[i-1])
-		needsort = i;
-	}
-	if (!needsort)
-	    return;
-
-	while (needsort < num) {
-	    for (j = needsort - 1; j >= 0; j--) {
-		if (aval[j] > aval[j+1]) {
-		    char *hp;
-
-		    i = aval[j];
-		    aval[j] = aval[j+1];
-		    aval[j+1] = i;
-
-		    hp = ap[j];
-		    ap[j] = ap[j+1];
-		    ap[j+1] = hp;
-
-		} else
-		    break;
-	    }
-	    needsort++;
-	}
-}
-#endif
-void
-_sethostdnsent(stayopen)
-	int stayopen;
-{
-	if ((_res.options & RES_INIT) == 0 && res_init() == -1)
-		return;
-	if (stayopen)
-		_res.options |= RES_STAYOPEN | RES_USEVC;
-}
-
-void
-_endhostdnsent()
-{
-	_res.options &= ~(RES_STAYOPEN | RES_USEVC);
-	res_close();
-}
diff --git a/c/src/exec/libnetworking/libc/gethostbyht.c b/c/src/exec/libnetworking/libc/gethostbyht.c
deleted file mode 100644
index 29f2805367..0000000000
--- a/c/src/exec/libnetworking/libc/gethostbyht.c
+++ /dev/null
@@ -1,202 +0,0 @@
-/*-
- * Copyright (c) 1985, 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * -
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- * -
- * --Copyright--
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)gethostnamadr.c	8.1 (Berkeley) 6/4/93";
-static char rcsid[] = "$Id$";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <errno.h>
-#include <string.h>
-#include <arpa/nameser.h>	/* XXX */
-#include <resolv.h>		/* XXX */
-
-#define	MAXALIASES	35
-
-static struct hostent host;
-static char *host_aliases[MAXALIASES];
-static char hostbuf[BUFSIZ+1];
-static FILE *hostf = NULL;
-static u_char host_addr[16];	/* IPv4 or IPv6 */
-static char *h_addr_ptrs[2];
-static int stayopen = 0;
-
-void
-_sethosthtent(f)
-	int f;
-{
-	if (!hostf)
-		hostf = fopen(_PATH_HOSTS, "r" );
-	else
-		rewind(hostf);
-	stayopen = f;
-}
-
-void
-_endhosthtent()
-{
-	if (hostf && !stayopen) {
-		(void) fclose(hostf);
-		hostf = NULL;
-	}
-}
-
-struct hostent *
-gethostent()
-{
-	char *p;
-	register char *cp, **q;
-	int af, len;
-
-	if (!hostf && !(hostf = fopen(_PATH_HOSTS, "r" ))) {
-		h_errno = NETDB_INTERNAL;
-		return (NULL);
-	}
- again:
-	if (!(p = fgets(hostbuf, sizeof hostbuf, hostf))) {
-		h_errno = HOST_NOT_FOUND;
-		return (NULL);
-	}
-	if (*p == '#')
-		goto again;
-	if (!(cp = strpbrk(p, "#\n")))
-		goto again;
-	*cp = '\0';
-	if (!(cp = strpbrk(p, " \t")))
-		goto again;
-	*cp++ = '\0';
-	if (inet_pton(AF_INET6, p, host_addr) > 0) {
-		af = AF_INET6;
-		len = IN6ADDRSZ;
-	} else if (inet_pton(AF_INET, p, host_addr) > 0) {
-		if (_res.options & RES_USE_INET6) {
-			_map_v4v6_address((char*)host_addr, (char*)host_addr);
-			af = AF_INET6;
-			len = IN6ADDRSZ;
-		} else {
-			af = AF_INET;
-			len = INADDRSZ;
-		}
-	} else {
-		goto again;
-	}
-	h_addr_ptrs[0] = (char *)host_addr;
-	h_addr_ptrs[1] = NULL;
-	host.h_addr_list = h_addr_ptrs;
-	host.h_length = len;
-	host.h_addrtype = af;
-	while (*cp == ' ' || *cp == '\t')
-		cp++;
-	host.h_name = cp;
-	q = host.h_aliases = host_aliases;
-	if ((cp = strpbrk(cp, " \t")) != NULL)
-		*cp++ = '\0';
-	while (cp && *cp) {
-		if (*cp == ' ' || *cp == '\t') {
-			cp++;
-			continue;
-		}
-		if (q < &host_aliases[MAXALIASES - 1])
-			*q++ = cp;
-		if ((cp = strpbrk(cp, " \t")) != NULL)
-			*cp++ = '\0';
-	}
-	*q = NULL;
-	h_errno = NETDB_SUCCESS;
-	return (&host);
-}
-
-struct hostent *
-_gethostbyhtname(name, af)
-	const char *name;
-	int af;
-{
-	register struct hostent *p;
-	register char **cp;
-	
-	sethostent(0);
-	while ((p = gethostent()) != NULL) {
-		if (p->h_addrtype != af)
-			continue;
-		if (strcasecmp(p->h_name, name) == 0)
-			break;
-		for (cp = p->h_aliases; *cp != 0; cp++)
-			if (strcasecmp(*cp, name) == 0)
-				goto found;
-	}
-found:
-	endhostent();
-	return (p);
-}
-
-struct hostent *
-_gethostbyhtaddr(addr, len, af)
-	const char *addr;
-	int len, af;
-{
-	register struct hostent *p;
-
-	sethostent(0);
-	while ((p = gethostent()) != NULL)
-		if (p->h_addrtype == af && !bcmp(p->h_addr, addr, len))
-			break;
-	endhostent();
-	return (p);
-}
diff --git a/c/src/exec/libnetworking/libc/gethostbyname.3 b/c/src/exec/libnetworking/libc/gethostbyname.3
deleted file mode 100644
index e21dc79f1d..0000000000
--- a/c/src/exec/libnetworking/libc/gethostbyname.3
+++ /dev/null
@@ -1,305 +0,0 @@
-.\" Copyright (c) 1983, 1987, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"     From: @(#)gethostbyname.3	8.4 (Berkeley) 5/25/95
-.\"     $Id$
-.\"
-.Dd May 25, 1995
-.Dt GETHOSTBYNAME 3
-.Os BSD 4.2
-.Sh NAME
-.Nm gethostbyname ,
-.Nm gethostbyname2 ,
-.Nm gethostbyaddr ,
-.Nm gethostent ,
-.Nm sethostent ,
-.Nm endhostent ,
-.Nm herror ,
-.Nm hstrerror
-.Nd get network host entry
-.Sh SYNOPSIS
-.Fd #include <netdb.h>
-.Vt extern int h_errno;
-.Ft struct hostent *
-.Fn gethostbyname "const char *name"
-.Ft struct hostent *
-.Fn gethostbyname2 "const char *name" "int af"
-.Ft struct hostent *
-.Fn gethostbyaddr "const char *addr" "int len" "int type"
-.Ft struct hostent *
-.Fn gethostent void
-.Ft void
-.Fn sethostent "int stayopen"
-.Ft void
-.Fn endhostent void
-.Ft void
-.Fn herror "const char *string"
-.Ft const char *
-.Fn hstrerror "int err"
-.Sh DESCRIPTION
-The
-.Fn gethostbyname ,
-.Fn gethostbyname2
-and
-.Fn gethostbyaddr
-functions
-each return a pointer to an object with the
-following structure describing an internet host
-referenced by name or by address, respectively.
-This structure contains either the information obtained from the name server,
-.Xr named 8 ,
-or broken-out fields from a line in 
-.Pa /etc/hosts .
-If the local name server is not running these routines do a lookup in
-.Pa /etc/hosts .
-.Bd -literal
-struct	hostent {
-	char	*h_name;	/* official name of host */
-	char	**h_aliases;	/* alias list */
-	int	h_addrtype;	/* host address type */
-	int	h_length;	/* length of address */
-	char	**h_addr_list;	/* list of addresses from name server */
-};
-#define	h_addr  h_addr_list[0]	/* address, for backward compatibility */
-.Ed
-.Pp
-The members of this structure are:
-.Bl -tag -width h_addr_list
-.It Fa h_name
-Official name of the host.
-.It Fa h_aliases
-A NULL-terminated array of alternate names for the host.
-.It Fa h_addrtype
-The type of address being returned; usually
-.Dv AF_INET .
-.It Fa h_length
-The length, in bytes, of the address.
-.It Fa h_addr_list
-A NULL-terminated array of network addresses for the host.
-Host addresses are returned in network byte order.
-.It Fa h_addr
-The first address in
-.Fa h_addr_list ;
-this is for backward compatibility.
-.El
-.Pp
-When using the nameserver,
-.Fn gethostbyname
-and
-.Fn gethostbyname
-will search for the named host in the current domain and its parents
-unless the name ends in a dot.
-If the name contains no dot, and if the environment variable
-.Dq Ev HOSTALIASES
-contains the name of an alias file, the alias file will first be searched
-for an alias matching the input name.
-See
-.Xr hostname 7
-for the domain search procedure and the alias file format.
-.Pp
-The
-.Fn gethostbyname2
-function is an evolution of
-.Fn gethostbyname
-which is intended to allow lookups in address families other than
-.Dv AF_INET ,
-for example
-.Dv AF_INET6 .
-Currently the
-.Fa af
-argument must be specified as
-.Dv AF_INET
-else the function will return
-.Dv NULL
-after having set
-.Va h_errno
-to
-.Dv NETDB_INTERNAL
-.Pp
-The
-.Fn sethostent
-function
-may be used to request the use of a connected
-.Tn TCP
-socket for queries.
-If the
-.Fa stayopen
-flag is non-zero,
-this sets the option to send all queries to the name server using
-.Tn TCP
-and to retain the connection after each call to 
-.Fn gethostbyname ,
-.Fn gethostbyname2
-or
-.Fn gethostbyaddr .
-Otherwise, queries are performed using
-.Tn UDP
-datagrams.
-.Pp
-The
-.Fn endhostent
-function
-closes the
-.Tn TCP
-connection.
-.Pp
-The
-.Fn herror
-function writes a message to the diagnostic output consisting of the
-string parameter
-.Fa s ,
-the constant string ": ", and a message corresponding to the value of
-.Va h_errno .
-.Pp
-The
-.Fn hstrerror
-function returns a string which is the message text corresponding to the
-value of the
-.Fa err
-parameter.
-.Sh FILES
-.Bl -tag -width /etc/resolv.conf -compact
-.It Pa /etc/hosts
-.It Pa /etc/host.conf
-.It Pa /etc/resolv.conf
-.El
-.Sh DIAGNOSTICS
-Error return status from 
-.Fn gethostbyname ,
-.Fn gethostbyname2
-and
-.Fn gethostbyaddr
-is indicated by return of a null pointer.
-The external integer
-.Va h_errno
-may then be checked to see whether this is a temporary failure
-or an invalid or unknown host.
-The routine
-.Fn herror
-can be used to print an error message describing the failure.
-If its argument
-.Fa string
-is
-.Pf non Dv -NULL ,
-it is printed, followed by a colon and a space.
-The error message is printed with a trailing newline.
-.Pp
-The variable
-.Va h_errno
-can have the following values:
-.Bl -tag -width HOST_NOT_FOUND
-.It Dv HOST_NOT_FOUND
-No such host is known.
-.It Dv TRY_AGAIN
-This is usually a temporary error
-and means that the local server did not receive
-a response from an authoritative server.
-A retry at some later time may succeed.
-.It Dv NO_RECOVERY
-Some unexpected server failure was encountered.
-This is a non-recoverable error.
-.It Dv NO_DATA
-The requested name is valid but does not have an IP address; 
-this is not a temporary error.  
-This means that the name is known to the name server but there is no address
-associated with this name.
-Another type of request to the name server using this domain name
-will result in an answer;
-for example, a mail-forwarder may be registered for this domain.
-.El
-.Sh SEE ALSO
-.Xr resolver 3 ,
-.Xr hosts 5 ,
-.Xr hostname 7 ,
-.Xr named 8
-.Sh CAVEAT
-The
-.Fn gethostent
-function
-is defined, and
-.Fn sethostent
-and
-.Fn endhostent
-are redefined,
-when
-.Xr libc 3
-is built to use only the routines to lookup in
-.Pa /etc/hosts
-and not the name server.
-.Pp
-The
-.Fn gethostent
-function
-reads the next line of
-.Pa /etc/hosts ,
-opening the file if necessary.
-.Pp
-The
-.Fn sethostent
-function
-opens and/or rewinds the file
-.Pa /etc/hosts .
-If the
-.Fa stayopen
-argument is non-zero,
-the file will not be closed after each call to
-.Fn gethostbyname ,
-.Fn gethostbyname2
-or
-.Fn gethostbyaddr .
-.Pp
-The
-.Fn endhostent
-function
-closes the file.
-.Sh HISTORY
-The
-.Fn herror
-function appeared in 
-.Bx 4.3 .
-The
-.Fn endhostent ,
-.Fn gethostbyaddr ,
-.Fn gethostbyname ,
-.Fn gethostent ,
-and
-.Fn sethostent
-functions appeared in
-.Bx 4.2 .
-The
-.Fn gethostbyname2
-function first appeared in bind-4.9.4.
-.Sh BUGS
-These functions use static data storage;
-if the data is needed for future use, it should be
-copied before any subsequent calls overwrite it.
-Only the Internet
-address format is currently understood.
diff --git a/c/src/exec/libnetworking/libc/gethostbynis.c b/c/src/exec/libnetworking/libc/gethostbynis.c
deleted file mode 100644
index 45dbe5a85d..0000000000
--- a/c/src/exec/libnetworking/libc/gethostbynis.c
+++ /dev/null
@@ -1,142 +0,0 @@
-/*-
- * Copyright (c) 1994, Garrett Wollman
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)$Id$";
-static char rcsid[] = "$Id$";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <errno.h>
-#include <string.h>
-#ifdef YP
-#include <rpc/rpc.h>
-#include <rpcsvc/yp_prot.h>
-#include <rpcsvc/ypclnt.h>
-#endif
-
-#define	MAXALIASES	35
-#define	MAXADDRS	35
-
-#ifdef YP
-static char *host_aliases[MAXALIASES];
-static char hostaddr[MAXADDRS];
-static char *host_addrs[2];
-#endif /* YP */
-
-static struct hostent *
-_gethostbynis(name, map, af)
-	const char *name;
-	char *map;
-	int af;
-{
-#ifdef YP
-	register char *cp, **q;
-	char *result;
-	int resultlen;
-	static struct hostent h;
-	static char *domain = (char *)NULL;
-	static char ypbuf[YPMAXRECORD + 2];
-
-	switch(af) {
-	case AF_INET:
-		break;
-	default:
-	case AF_INET6:
-		errno = EAFNOSUPPORT;
-		return NULL;
-	}
-
-	if (domain == (char *)NULL)
-		if (yp_get_default_domain (&domain))
-			return ((struct hostent *)NULL);
-
-	if (yp_match(domain, map, name, strlen(name), &result, &resultlen))
-		return ((struct hostent *)NULL);
-
-	/* avoid potential memory leak */
-	bcopy((char *)result, (char *)&ypbuf, resultlen);
-	ypbuf[resultlen] = '\0';
-	free(result);
-	result = (char *)&ypbuf;
-
-	if ((cp = index(result, '\n')))
-		*cp = '\0';
-
-	cp = strpbrk(result, " \t");
-	*cp++ = '\0';
-	h.h_addr_list = host_addrs;
-	h.h_addr = hostaddr;
-	*((u_long *)h.h_addr) = inet_addr(result);
-	h.h_length = sizeof(u_long);
-	h.h_addrtype = AF_INET;
-	while (*cp == ' ' || *cp == '\t')
-		cp++;
-	h.h_name = cp;
-	q = h.h_aliases = host_aliases;
-	cp = strpbrk(cp, " \t");
-	if (cp != NULL)
-		*cp++ = '\0';
-	while (cp && *cp) {
-		if (*cp == ' ' || *cp == '\t') {
-			cp++;
-			continue;
-		}
-		if (q < &host_aliases[MAXALIASES - 1])
-			*q++ = cp;
-		cp = strpbrk(cp, " \t");
-		if (cp != NULL)
-			*cp++ = '\0';
-	}
-	*q = NULL;
-	return (&h);
-#else
-	return (NULL);
-#endif /* YP */
-}
-
-struct hostent *
-_gethostbynisname(name, af)
-	const char *name;
-	int af;
-{
-	return _gethostbynis(name, "hosts.byname", af);
-}
-
-struct hostent *
-_gethostbynisaddr(addr, len, af)
-	const char *addr;
-	int len;
-	int af;
-{
-	return _gethostbynis(inet_ntoa(*(struct in_addr *)addr),"hosts.byaddr", af);
-}
diff --git a/c/src/exec/libnetworking/libc/gethostnamadr.c b/c/src/exec/libnetworking/libc/gethostnamadr.c
deleted file mode 100644
index 92f7a21014..0000000000
--- a/c/src/exec/libnetworking/libc/gethostnamadr.c
+++ /dev/null
@@ -1,224 +0,0 @@
-/*-
- * Copyright (c) 1994, Garrett Wollman
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)$Id$";
-static char rcsid[] = "$Id$";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <errno.h>
-#include <string.h>
-#include <arpa/nameser.h>		/* XXX hack for _res */
-#include <resolv.h>			/* XXX hack for _res */
-
-#define _PATH_HOSTCONF	"/etc/host.conf"
-
-enum service_type {
-  SERVICE_NONE = 0,
-  SERVICE_BIND,
-  SERVICE_HOSTS,
-  SERVICE_NIS };
-#define SERVICE_MAX	SERVICE_NIS
-
-static struct {
-  const char *name;
-  enum service_type type;
-} service_names[] = {
-  { "hosts", SERVICE_HOSTS },
-  { "/etc/hosts", SERVICE_HOSTS },
-  { "hosttable", SERVICE_HOSTS },
-  { "htable", SERVICE_HOSTS },
-  { "bind", SERVICE_BIND },
-  { "dns", SERVICE_BIND },
-  { "domain", SERVICE_BIND },
-  { "yp", SERVICE_NIS },
-  { "yellowpages", SERVICE_NIS },
-  { "nis", SERVICE_NIS },
-  { 0, SERVICE_NONE }
-};
-
-static enum service_type service_order[SERVICE_MAX + 1];
-static int service_done = 0;
-
-static enum service_type
-get_service_name(const char *name) {
-	int i;
-	for(i = 0; service_names[i].type != SERVICE_NONE; i++) {
-		if(!strcasecmp(name, service_names[i].name)) {
-			return service_names[i].type;
-		}
-	}
-	return SERVICE_NONE;
-}
-
-static void
-init_services()
-{
-	char *cp, *p, buf[BUFSIZ];
-	register int cc = 0;
-	FILE *fd;
-
-	if ((fd = (FILE *)fopen(_PATH_HOSTCONF, "r")) == NULL) {
-				/* make some assumptions */
-		service_order[0] = SERVICE_BIND;
-		service_order[1] = SERVICE_HOSTS;
-		service_order[2] = SERVICE_NONE;
-	} else {
-		while (fgets(buf, BUFSIZ, fd) != NULL && cc < SERVICE_MAX) {
-			if(buf[0] == '#')
-				continue;
-
-			p = buf;
-			while ((cp = strsep(&p, "\n \t,:;")) != NULL && *cp == '\0')
-				;
-			if (cp == NULL)
-				continue;
-			do {
-				if (isalpha((int)cp[0])) {
-					service_order[cc] = get_service_name(cp);
-					if(service_order[cc] != SERVICE_NONE)
-						cc++;
-				}
-				while ((cp = strsep(&p, "\n \t,:;")) != NULL && *cp == '\0')
-					;
-			} while(cp != NULL && cc < SERVICE_MAX);
-		}
-		service_order[cc] = SERVICE_NONE;
-		fclose(fd);
-	}
-	service_done = 1;
-}
-
-struct hostent *
-gethostbyname(const char *name)
-{
-	struct hostent *hp;
-
-	if (_res.options & RES_USE_INET6) {		/* XXX */
-		hp = gethostbyname2(name, AF_INET6);	/* XXX */
-		if (hp)					/* XXX */
-			return (hp);			/* XXX */
-	}						/* XXX */
-	return (gethostbyname2(name, AF_INET));
-}
-
-struct hostent *
-gethostbyname2(const char *name, int type)
-{
-	struct hostent *hp = 0;
-	int nserv = 0;
-
-	if (!service_done)
-		init_services();
-
-	while (!hp) {
-		switch (service_order[nserv]) {
-		      case SERVICE_NONE:
-			return NULL;
-		      case SERVICE_HOSTS:
-			hp = _gethostbyhtname(name, type);
-			break;
-		      case SERVICE_BIND:
-			hp = _gethostbydnsname(name, type);
-			break;
-		      case SERVICE_NIS:
-			hp = _gethostbynisname(name, type);
-			break;
-		}
-		nserv++;
-	}
-	return hp;
-}
-
-struct hostent *
-gethostbyaddr(const char *addr, int len, int type)
-{
-	struct hostent *hp = 0;
-	int nserv = 0;
-
-	if (!service_done)
-		init_services();
-
-	while (!hp) {
-		switch (service_order[nserv]) {
-		      case SERVICE_NONE:
-			return 0;
-		      case SERVICE_HOSTS:
-			hp = _gethostbyhtaddr(addr, len, type);
-			break;
-		      case SERVICE_BIND:
-			hp = _gethostbydnsaddr(addr, len, type);
-			break;
-		      case SERVICE_NIS:
-			hp = _gethostbynisaddr(addr, len, type);
-			break;
-		}
-		nserv++;
-	}
-	return hp;
-}
-
-#ifdef _THREAD_SAFE
-struct hostent_data;
-
-/*
- * Temporary function (not thread safe)
- */
-int gethostbyaddr_r(const char *addr, int len, int type,
-	struct hostent *result, struct hostent_data *buffer)
-{
-	struct hostent *hp;
-	int ret;
-	if ((hp = gethostbyaddr(addr, len, type)) == NULL) {
-		ret = -1;
-	} else {
-		memcpy(result, hp, sizeof(struct hostent));
-		ret = 0;
-	}
-	return(ret);
-}
-#endif
-
-void
-sethostent(stayopen)
-	int stayopen;
-{
-	_sethosthtent(stayopen);
-	_sethostdnsent(stayopen);
-}
-
-void
-endhostent()
-{
-	_endhosthtent();
-	_endhostdnsent();
-}
diff --git a/c/src/exec/libnetworking/libc/gethostname.c b/c/src/exec/libnetworking/libc/gethostname.c
deleted file mode 100644
index 81dc2267c2..0000000000
--- a/c/src/exec/libnetworking/libc/gethostname.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- *  $Id$
- */
-
-#include "config.h"
-
-/*
- * Solaris doesn't include the gethostname call by default.
- */
-#include <sys/utsname.h>
-#include <sys/systeminfo.h>
-
-#include <netdb.h>
-
-/*
- * PUBLIC: #ifndef HAVE_GETHOSTNAME
- * PUBLIC: int gethostname __P((char *, int));
- * PUBLIC: #endif
- */
-int
-gethostname(host, len)
-	char *host;
-	int len;
-{
-	return (sysinfo(SI_HOSTNAME, host, len) == -1 ? -1 : 0);
-}
diff --git a/c/src/exec/libnetworking/libc/getnetbydns.c b/c/src/exec/libnetworking/libc/getnetbydns.c
deleted file mode 100644
index 8f8c576332..0000000000
--- a/c/src/exec/libnetworking/libc/getnetbydns.c
+++ /dev/null
@@ -1,313 +0,0 @@
-/*-
- * Copyright (c) 1985, 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * -
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- * -
- * --Copyright--
- */
-/* Portions Copyright (c) 1993 Carlos Leandro and Rui Salgueiro
- *	Dep. Matematica Universidade de Coimbra, Portugal, Europe
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)gethostnamadr.c	8.1 (Berkeley) 6/4/93";
-static char rcsid[] = "$Id$";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-
-#include <stdio.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <ctype.h>
-#include <errno.h>
-#include <string.h>
-#include <unistd.h>
-#include <syslog.h>
-
-#include "res_config.h"
-
-extern int h_errno;
-
-#define BYADDR 0
-#define BYNAME 1
-#define	MAXALIASES	35
-
-#if PACKETSZ > 1024
-#define	MAXPACKET	PACKETSZ
-#else
-#define	MAXPACKET	1024
-#endif
-
-typedef union {
-	HEADER	hdr;
-	u_char	buf[MAXPACKET];
-} querybuf;
-
-typedef union {
-	long	al;
-	char	ac;
-} align;
-
-static struct netent *
-getnetanswer(answer, anslen, net_i)
-	querybuf *answer;
-	int anslen;
-	int net_i;
-{
-
-	register HEADER *hp;
-	register u_char *cp;
-	register int n;
-	u_char *eom;
-	int type, class, buflen, ancount, qdcount, haveanswer, i, nchar;
-	char aux1[MAXHOSTNAMELEN], aux2[MAXHOSTNAMELEN], ans[MAXHOSTNAMELEN];
-	char *in, *st, *pauxt, *bp, **ap;
-	char *paux1 = &aux1[0], *paux2 = &aux2[0], flag = 0;
-static	struct netent net_entry;
-static	char *net_aliases[MAXALIASES], netbuf[PACKETSZ];
-
-	/*
-	 * find first satisfactory answer
-	 *
-	 *      answer --> +------------+  ( MESSAGE )
-	 *		   |   Header   |
-	 *		   +------------+
-	 *		   |  Question  | the question for the name server
-	 *		   +------------+
-	 *		   |   Answer   | RRs answering the question
-	 *		   +------------+
-	 *		   | Authority  | RRs pointing toward an authority
-	 *		   | Additional | RRs holding additional information
-	 *		   +------------+
-	 */
-	eom = answer->buf + anslen;
-	hp = &answer->hdr;
-	ancount = ntohs(hp->ancount); /* #/records in the answer section */
-	qdcount = ntohs(hp->qdcount); /* #/entries in the question section */
-	bp = netbuf;
-	buflen = sizeof(netbuf);
-	cp = answer->buf + HFIXEDSZ;
-	if (!qdcount) {
-		if (hp->aa)
-			h_errno = HOST_NOT_FOUND;
-		else
-			h_errno = TRY_AGAIN;
-		return (NULL);
-	}
-	while (qdcount-- > 0)
-		cp += __dn_skipname(cp, eom) + QFIXEDSZ;
-	ap = net_aliases;
-	*ap = NULL;
-	net_entry.n_aliases = net_aliases;
-	haveanswer = 0;
-	while (--ancount >= 0 && cp < eom) {
-		n = dn_expand(answer->buf, eom, cp, bp, buflen);
-		if ((n < 0) || !res_dnok(bp))
-			break;
-		cp += n;
-		ans[0] = '\0';
-		(void)strncpy(&ans[0], bp, sizeof(ans) - 1);
-		ans[sizeof(ans) - 1] = '\0';
-		GETSHORT(type, cp);
-		GETSHORT(class, cp);
-		cp += INT32SZ;		/* TTL */
-		GETSHORT(n, cp);
-		if (class == C_IN && type == T_PTR) {
-			n = dn_expand(answer->buf, eom, cp, bp, buflen);
-			if ((n < 0) || !res_hnok(bp)) {
-				cp += n;
-				return (NULL);
-			}
-			cp += n; 
-			*ap++ = bp;
-			bp += strlen(bp) + 1;
-			net_entry.n_addrtype =
-				(class == C_IN) ? AF_INET : AF_UNSPEC;
-			haveanswer++;
-		}
-	}
-	if (haveanswer) {
-		*ap = NULL;
-		switch (net_i) {
-		case BYADDR:
-			net_entry.n_name = *net_entry.n_aliases;
-			net_entry.n_net = 0L;
-			break;
-		case BYNAME:
-			in = *net_entry.n_aliases;
-			net_entry.n_name = &ans[0];
-			aux2[0] = '\0';
-			for (i = 0; i < 4; i++) {
-				for (st = in, nchar = 0;
-				     *st != '.';
-				     st++, nchar++)
-					;
-				if (nchar != 1 || *in != '0' || flag) {
-					flag = 1;
-					(void)strncpy(paux1,
-						      (i==0) ? in : in-1,
-						      (i==0) ?nchar : nchar+1);
-					paux1[(i==0) ? nchar : nchar+1] = '\0';
-					pauxt = paux2;
-					paux2 = strcat(paux1, paux2);
-					paux1 = pauxt;
-				}
-				in = ++st;
-			}		  
-			net_entry.n_net = inet_network(paux2);
-			break;
-		}
-		net_entry.n_aliases++;
-		return (&net_entry);
-	}
-	h_errno = TRY_AGAIN;
-	return (NULL);
-}
-
-struct netent *
-_getnetbydnsaddr(net, net_type)
-	register unsigned long net;
-	register int net_type;
-{
-	unsigned int netbr[4];
-	int nn, anslen;
-	querybuf buf;
-	char qbuf[MAXDNAME];
-	unsigned long net2;
-	struct netent *net_entry;
-
-	if (net_type != AF_INET)
-		return (NULL);
-
-	for (nn = 4, net2 = net; net2; net2 >>= 8)
-		netbr[--nn] = net2 & 0xff;
-	switch (nn) {
-	case 3: 	/* Class A */
-		sprintf(qbuf, "0.0.0.%u.in-addr.arpa", netbr[3]);
-		break;
-	case 2: 	/* Class B */
-		sprintf(qbuf, "0.0.%u.%u.in-addr.arpa", netbr[3], netbr[2]);
-		break;
-	case 1: 	/* Class C */
-		sprintf(qbuf, "0.%u.%u.%u.in-addr.arpa", netbr[3], netbr[2],
-		    netbr[1]);
-		break;
-	case 0: 	/* Class D - E */
-		sprintf(qbuf, "%u.%u.%u.%u.in-addr.arpa", netbr[3], netbr[2],
-		    netbr[1], netbr[0]);
-		break;
-	}
-	anslen = res_query(qbuf, C_IN, T_PTR, (u_char *)&buf, sizeof(buf));
-	if (anslen < 0) {
-#ifdef DEBUG
-		if (_res.options & RES_DEBUG)
-			printf("res_query failed\n");
-#endif
-		return (NULL);
-	}
-	net_entry = getnetanswer(&buf, anslen, BYADDR);
-	if (net_entry) {
-		unsigned u_net = net;	/* maybe net should be unsigned ? */
-
-		/* Strip trailing zeros */
-		while ((u_net & 0xff) == 0 && u_net != 0)
-			u_net >>= 8;
-		net_entry->n_net = u_net;
-		return (net_entry);
-	}
-	return (NULL);
-}
-
-struct netent *
-_getnetbydnsname(net)
-	register const char *net;
-{
-	int anslen;
-	querybuf buf;
-	char qbuf[MAXDNAME];
-
-	if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
-		h_errno = NETDB_INTERNAL;
-		return (NULL);
-	}
-	strncpy(qbuf, net, sizeof(qbuf) - 1);
-	qbuf[sizeof(qbuf) - 1] = '\0';
-	anslen = res_search(qbuf, C_IN, T_PTR, (u_char *)&buf, sizeof(buf));
-	if (anslen < 0) {
-#ifdef DEBUG
-		if (_res.options & RES_DEBUG)
-			printf("res_query failed\n");
-#endif
-		return (NULL);
-	}
-	return getnetanswer(&buf, anslen, BYNAME);
-}
-
-void
-_setnetdnsent(stayopen)
-	int stayopen;
-{
-	if (stayopen)
-		_res.options |= RES_STAYOPEN | RES_USEVC;
-}
-
-void
-_endnetdnsent()
-{
-	_res.options &= ~(RES_STAYOPEN | RES_USEVC);
-	res_close();
-}
diff --git a/c/src/exec/libnetworking/libc/getnetbyht.c b/c/src/exec/libnetworking/libc/getnetbyht.c
deleted file mode 100644
index f7b7b1091d..0000000000
--- a/c/src/exec/libnetworking/libc/getnetbyht.c
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/* Portions Copyright (c) 1993 Carlos Leandro and Rui Salgueiro
- *	Dep. Matematica Universidade de Coimbra, Portugal, Europe
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * from getnetent.c	1.1 (Coimbra) 93/06/02
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getnetent.c	8.1 (Berkeley) 6/4/93";
-static char orig_rcsid[] = "From: Id: getnetent.c,v 8.4 1997/06/01 20:34:37 vixie Exp";
-static chat rcsid[] = "$Id$";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <string.h>
-
-#define	MAXALIASES	35
-
-static FILE *netf;
-static char line[BUFSIZ+1];
-static struct netent net;
-static char *net_aliases[MAXALIASES];
-static int _net_stayopen;
-
-void
-_setnethtent(f)
-	int f;
-{
-
-	if (netf == NULL)
-		netf = fopen(_PATH_NETWORKS, "r" );
-	else
-		rewind(netf);
-	_net_stayopen |= f;
-}
-
-void
-_endnethtent()
-{
-
-	if (netf) {
-		fclose(netf);
-		netf = NULL;
-	}
-	_net_stayopen = 0;
-}
-
-struct netent *
-getnetent()
-{
-	char *p;
-	register char *cp, **q;
-
-	if (netf == NULL && (netf = fopen(_PATH_NETWORKS, "r" )) == NULL)
-		return (NULL);
-again:
-	p = fgets(line, sizeof line, netf);
-	if (p == NULL)
-		return (NULL);
-	if (*p == '#')
-		goto again;
-	cp = strpbrk(p, "#\n");
-	if (cp == NULL)
-		goto again;
-	*cp = '\0';
-	net.n_name = p;
-	cp = strpbrk(p, " \t");
-	if (cp == NULL)
-		goto again;
-	*cp++ = '\0';
-	while (*cp == ' ' || *cp == '\t')
-		cp++;
-	p = strpbrk(cp, " \t");
-	if (p != NULL)
-		*p++ = '\0';
-	net.n_net = inet_network(cp);
-	net.n_addrtype = AF_INET;
-	q = net.n_aliases = net_aliases;
-	if (p != NULL) 
-		cp = p;
-	while (cp && *cp) {
-		if (*cp == ' ' || *cp == '\t') {
-			cp++;
-			continue;
-		}
-		if (q < &net_aliases[MAXALIASES - 1])
-			*q++ = cp;
-		cp = strpbrk(cp, " \t");
-		if (cp != NULL)
-			*cp++ = '\0';
-	}
-	*q = NULL;
-	return (&net);
-}
-
-struct netent *
-_getnetbyhtname(name)
-	register const char *name;
-{
-	register struct netent *p;
-	register char **cp;
-
-	setnetent(_net_stayopen);
-	while ( (p = getnetent()) ) {
-		if (strcasecmp(p->n_name, name) == 0)
-			break;
-		for (cp = p->n_aliases; *cp != 0; cp++)
-			if (strcasecmp(*cp, name) == 0)
-				goto found;
-	}
-found:
-	if (!_net_stayopen)
-		endnetent();
-	return (p);
-}
-
-struct netent *
-_getnetbyhtaddr(net, type)
-	register unsigned long net;
-	register int type;
-{
-	register struct netent *p;
-
-	setnetent(_net_stayopen);
-	while ( (p = getnetent()) )
-		if (p->n_addrtype == type && p->n_net == net)
-			break;
-	if (!_net_stayopen)
-		endnetent();
-	return (p);
-}
diff --git a/c/src/exec/libnetworking/libc/getnetbynis.c b/c/src/exec/libnetworking/libc/getnetbynis.c
deleted file mode 100644
index 0549016ba2..0000000000
--- a/c/src/exec/libnetworking/libc/getnetbynis.c
+++ /dev/null
@@ -1,177 +0,0 @@
-/*-
- * Copyright (c) 1994, Garrett Wollman
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)$Id$";
-static char rcsid[] = "$Id$";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <errno.h>
-#include <string.h>
-#include <arpa/nameser.h>
-#ifdef YP
-#include <rpc/rpc.h>
-#include <rpcsvc/yp_prot.h>
-#include <rpcsvc/ypclnt.h>
-#endif
-
-#define	MAXALIASES	35
-#define	MAXADDRS	35
-
-#ifdef YP
-static char *host_aliases[MAXALIASES];
-#endif /* YP */
-
-static struct netent *
-_getnetbynis(name, map, af)
-	const char *name;
-	char *map;
-	int af;
-{
-#ifdef YP
-	register char *cp, **q;
-	static char *result;
-	int resultlen;
-	static struct netent h;
-	static char *domain = (char *)NULL;
-	static char ypbuf[YPMAXRECORD + 2];
-
-	switch(af) {
-	case AF_INET:
-		break;
-	default:
-	case AF_INET6:
-		errno = EAFNOSUPPORT;
-		return NULL;
-	}
-
-	if (domain == (char *)NULL)
-		if (yp_get_default_domain (&domain))
-			return (NULL);
-
-	if (yp_match(domain, map, name, strlen(name), &result, &resultlen))
-		return (NULL);
-
-	bcopy((char *)result, (char *)&ypbuf, resultlen);
-	ypbuf[resultlen] = '\0';
-	free(result);
-	result = (char *)&ypbuf;
-
-	if ((cp = index(result, '\n')))
-		*cp = '\0';
-
-	cp = strpbrk(result, " \t");
-	*cp++ = '\0';
-	h.n_name = result;
-
-	while (*cp == ' ' || *cp == '\t')
-		cp++;
-
-	h.n_net = inet_network(cp);
-	h.n_addrtype = AF_INET;
-
-	q = h.n_aliases = host_aliases;
-	cp = strpbrk(cp, " \t");
-	if (cp != NULL)
-		*cp++ = '\0';
-	while (cp && *cp) {
-		if (*cp == ' ' || *cp == '\t') {
-			cp++;
-			continue;
-		}
-		if (q < &host_aliases[MAXALIASES - 1])
-			*q++ = cp;
-		cp = strpbrk(cp, " \t");
-		if (cp != NULL)
-			*cp++ = '\0';
-	}
-	*q = NULL;
-	return (&h);
-#else
-	return (NULL);
-#endif
-}
-
-struct netent *
-_getnetbynisname(name)
-	const char *name;
-{
-	return _getnetbynis(name, "networks.byname", AF_INET);
-}
-
-struct netent *
-_getnetbynisaddr(addr, af)
-	unsigned long addr;
-	int af;
-{
-	char *str, *cp;
-	unsigned long net2;
-	int nn;
-	unsigned int netbr[4];
-	char buf[MAXDNAME];
-
-	if (af != AF_INET) {
-		errno = EAFNOSUPPORT;
-		return (NULL);
-	}
-
-        for (nn = 4, net2 = addr; net2; net2 >>= 8) {
-                netbr[--nn] = net2 & 0xff;
-	}
-
-	switch (nn) {
-	case 3:		/* Class A */
-		sprintf(buf, "%u", netbr[3]);
-		break;
-        case 2:		/* Class B */
-		sprintf(buf, "%u.%u", netbr[2], netbr[3]);
-		break;
-        case 1:		/* Class C */
-		sprintf(buf, "%u.%u.%u", netbr[1], netbr[2], netbr[3]);
-                break;
-        case 0:		/* Class D - E */
-		sprintf(buf, "%u.%u.%u.%u", netbr[0], netbr[1],
-			netbr[2], netbr[3]);
-		break;
-	}
-
-	str = (char *)&buf;
-	cp = str + (strlen(str) - 2);
-
-	while(!strcmp(cp, ".0")) {
-		*cp = '\0';
-		cp = str + (strlen(str) - 2);
-	}
-
-	return _getnetbynis(str, "networks.byaddr", af);
-}
diff --git a/c/src/exec/libnetworking/libc/getnetent.3 b/c/src/exec/libnetworking/libc/getnetent.3
deleted file mode 100644
index aec93b5876..0000000000
--- a/c/src/exec/libnetworking/libc/getnetent.3
+++ /dev/null
@@ -1,159 +0,0 @@
-.\" Copyright (c) 1983, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"     @(#)getnetent.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
-.\"
-.Dd June 4, 1993
-.Dt GETNETENT 3
-.Os BSD 4.2
-.Sh NAME
-.Nm getnetent ,
-.Nm getnetbyaddr ,
-.Nm getnetbyname ,
-.Nm setnetent ,
-.Nm endnetent
-.Nd get network entry
-.Sh SYNOPSIS
-.Fd #include <netdb.h>
-.Ft struct netent *
-.Fn getnetent void
-.Ft struct netent *
-.Fn getnetbyname "const char *name"
-.Ft struct netent *
-.Fn getnetbyaddr "unsigned long net" "int type"
-.Ft void
-.Fn setnetent "int stayopen"
-.Ft void
-.Fn endnetent void
-.Sh DESCRIPTION
-The
-.Fn getnetent ,
-.Fn getnetbyname ,
-and
-.Fn getnetbyaddr
-functions
-each return a pointer to an object with the
-following structure
-containing the broken-out
-fields of a line in the network data base,
-.Pa /etc/networks .
-.Bd -literal -offset indent
-struct	netent {
-	char		*n_name;	/* official name of net */
-	char		**n_aliases;	/* alias list */
-	int		n_addrtype;	/* net number type */
-	unsigned long	n_net;		/* net number */
-};
-.Ed
-.Pp
-The members of this structure are:
-.Bl -tag -width n_addrtype
-.It Fa n_name
-The official name of the network.
-.It Fa n_aliases
-A zero terminated list of alternate names for the network.
-.It Fa n_addrtype
-The type of the network number returned; currently only AF_INET.
-.It Fa n_net
-The network number.  Network numbers are returned in machine byte
-order.
-.El
-.Pp
-The
-.Fn getnetent
-function
-reads the next line of the file, opening the file if necessary.
-.Pp
-The
-.Fn setnetent
-function
-opens and rewinds the file.  If the
-.Fa stayopen
-flag is non-zero,
-the net data base will not be closed after each call to 
-.Fn getnetbyname
-or
-.Fn getnetbyaddr .
-.Pp
-The
-.Fn endnetent
-function
-closes the file.
-.Pp
-The
-.Fn getnetbyname
-function
-and
-.Fn getnetbyaddr
-sequentially search from the beginning
-of the file until a matching
-net name or
-net address and type is found,
-or until
-.Dv EOF
-is encountered. The
-.Fa type
-must be
-.Dv AF_INET .
-Network numbers are supplied in host order.
-.Sh FILES
-.Bl -tag -width /etc/networks -compact
-.It Pa /etc/networks
-.El
-.Sh DIAGNOSTICS
-Null pointer
-(0) returned on
-.Dv EOF
-or error.
-.Sh SEE ALSO
-.Xr networks 5
-.Pp
-.%T RFC 1101
-.Sh HISTORY
-The
-.Fn getnetent ,
-.Fn getnetbyaddr ,
-.Fn getnetbyname ,
-.Fn setnetent ,
-and
-.Fn endnetent
-functions appeared in 
-.Bx 4.2 .
-.Sh BUGS
-The data space used by
-these functions is static; if future use requires the data, it should be
-copied before any subsequent calls to these functions overwrite it.
-Only Internet network
-numbers are currently understood.
-Expecting network numbers to fit
-in no more than 32 bits is probably
-naive.
diff --git a/c/src/exec/libnetworking/libc/getnetnamadr.c b/c/src/exec/libnetworking/libc/getnetnamadr.c
deleted file mode 100644
index 4d6597f98c..0000000000
--- a/c/src/exec/libnetworking/libc/getnetnamadr.c
+++ /dev/null
@@ -1,190 +0,0 @@
-/*-
- * Copyright (c) 1994, Garrett Wollman
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$Id$";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <errno.h>
-#include <string.h>
-
-#ifndef _PATH_NETCONF
-#define _PATH_NETCONF	"/etc/host.conf"
-#endif
-
-enum service_type {
-  SERVICE_NONE = 0,
-  SERVICE_BIND,
-  SERVICE_TABLE,
-  SERVICE_NIS };
-#define SERVICE_MAX	SERVICE_NIS
-
-static struct {
-  const char *name;
-  enum service_type type;
-} service_names[] = {
-  { "hosts", SERVICE_TABLE },
-  { "/etc/hosts", SERVICE_TABLE },
-  { "hosttable", SERVICE_TABLE },
-  { "htable", SERVICE_TABLE },
-  { "bind", SERVICE_BIND },
-  { "dns", SERVICE_BIND },
-  { "domain", SERVICE_BIND },
-  { "yp", SERVICE_NIS },
-  { "yellowpages", SERVICE_NIS },
-  { "nis", SERVICE_NIS },
-  { 0, SERVICE_NONE }
-};
-
-static enum service_type service_order[SERVICE_MAX + 1];
-static int service_done = 0;
-
-static enum service_type
-get_service_name(const char *name) {
-	int i;
-	for(i = 0; service_names[i].type != SERVICE_NONE; i++) {
-		if(!strcasecmp(name, service_names[i].name)) {
-			return service_names[i].type;
-		}
-	}
-	return SERVICE_NONE;
-}
-
-static void
-init_services()
-{
-	char *cp, *p, buf[BUFSIZ];
-	register int cc = 0;
-	FILE *fd;
-
-	if ((fd = (FILE *)fopen(_PATH_NETCONF, "r")) == NULL) {
-				/* make some assumptions */
-		service_order[0] = SERVICE_TABLE;
-		service_order[1] = SERVICE_NONE;
-	} else {
-		while (fgets(buf, BUFSIZ, fd) != NULL && cc < SERVICE_MAX) {
-			if(buf[0] == '#')
-				continue;
-
-			p = buf;
-			while ((cp = strsep(&p, "\n \t,:;")) != NULL && *cp == '\0')
-				;
-			if (cp == NULL)
-				continue;
-			do {
-				if (isalpha(cp[0])) {
-					service_order[cc] = get_service_name(cp);
-					if(service_order[cc] != SERVICE_NONE)
-						cc++;
-				}
-				while ((cp = strsep(&p, "\n \t,:;")) != NULL && *cp == '\0')
-					;
-			} while(cp != NULL && cc < SERVICE_MAX);
-		}
-		service_order[cc] = SERVICE_NONE;
-		fclose(fd);
-	}
-	service_done = 1;
-}
-
-struct netent *
-getnetbyname(const char *name)
-{
-	struct netent *hp = 0;
-	int nserv = 0;
-
-	if (!service_done)
-		init_services();
-
-	while (!hp) {
-		switch (service_order[nserv]) {
-		      case SERVICE_NONE:
-			return NULL;
-		      case SERVICE_TABLE:
-			hp = _getnetbyhtname(name);
-			break;
-		      case SERVICE_BIND:
-			hp = _getnetbydnsname(name);
-			break;
-		      case SERVICE_NIS:
-			hp = _getnetbynisname(name);
-			break;
-		}
-		nserv++;
-	}
-	return hp;
-}
-
-struct netent *
-getnetbyaddr(addr, af)
-	u_long addr;
-	int af;
-{
-	struct netent *hp = 0;
-	int nserv = 0;
-
-	if (!service_done)
-		init_services();
-
-	while (!hp) {
-		switch (service_order[nserv]) {
-		      case SERVICE_NONE:
-			return 0;
-		      case SERVICE_TABLE:
-			hp = _getnetbyhtaddr(addr, af);
-			break;
-		      case SERVICE_BIND:
-			hp = _getnetbydnsaddr(addr, af);
-			break;
-		      case SERVICE_NIS:
-			hp = _getnetbynisaddr(addr, af);
-			break;
-		}
-		nserv++;
-	}
-	return hp;
-}
-
-void
-setnetent(stayopen)
-	int stayopen;
-{
-	_setnethtent(stayopen);
-	_setnetdnsent(stayopen);
-}
-
-void
-endnetent()
-{
-	_endnethtent();
-	_endnetdnsent();
-}
diff --git a/c/src/exec/libnetworking/libc/getproto.c b/c/src/exec/libnetworking/libc/getproto.c
deleted file mode 100644
index c2a653f4b4..0000000000
--- a/c/src/exec/libnetworking/libc/getproto.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *  $Id$
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getproto.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
-#include <netdb.h>
-
-extern int _proto_stayopen;
-
-struct protoent *
-getprotobynumber(proto)
-	register int proto;
-{
-	register struct protoent *p;
-
-	setprotoent(_proto_stayopen);
-	while ( (p = getprotoent()) )
-		if (p->p_proto == proto)
-			break;
-	if (!_proto_stayopen)
-		endprotoent();
-	return (p);
-}
diff --git a/c/src/exec/libnetworking/libc/getprotoent.3 b/c/src/exec/libnetworking/libc/getprotoent.3
deleted file mode 100644
index 784461d7e3..0000000000
--- a/c/src/exec/libnetworking/libc/getprotoent.3
+++ /dev/null
@@ -1,147 +0,0 @@
-.\" Copyright (c) 1983, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"     @(#)getprotoent.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
-.\"
-.Dd June 4, 1993
-.Dt GETPROTOENT 3
-.Os BSD 4.2
-.Sh NAME
-.Nm getprotoent ,
-.Nm getprotobynumber ,
-.Nm getprotobyname ,
-.Nm setprotoent ,
-.Nm endprotoent
-.Nd get protocol entry
-.Sh SYNOPSIS
-.Fd #include <netdb.h>
-.Ft struct protoent *
-.Fn getprotoent void
-.Ft struct protoent *
-.Fn getprotobyname "const char *name"
-.Ft struct protoent *
-.Fn getprotobynumber "int proto"
-.Ft void
-.Fn setprotoent "int stayopen"
-.Ft void
-.Fn endprotoent void
-.Sh DESCRIPTION
-The
-.Fn getprotoent ,
-.Fn getprotobyname ,
-and
-.Fn getprotobynumber
-functions
-each return a pointer to an object with the
-following structure
-containing the broken-out
-fields of a line in the network protocol data base,
-.Pa /etc/protocols .
-.Bd -literal -offset indent
-.Pp
-struct	protoent {
-	char	*p_name;	/* official name of protocol */
-	char	**p_aliases;	/* alias list */
-	int	p_proto;	/* protocol number */
-};
-.Ed
-.Pp
-The members of this structure are:
-.Bl -tag -width p_aliases
-.It Fa p_name
-The official name of the protocol.
-.It Fa p_aliases
-A zero terminated list of alternate names for the protocol.
-.It Fa p_proto
-The protocol number.
-.El
-.Pp
-The
-.Fn getprotoent
-function
-reads the next line of the file, opening the file if necessary.
-.Pp
-The
-.Fn setprotoent
-function
-opens and rewinds the file.  If the
-.Fa stayopen
-flag is non-zero,
-the net data base will not be closed after each call to 
-.Fn getprotobyname
-or
-.Fn getprotobynumber .
-.Pp
-The
-.Fn endprotoent
-function
-closes the file.
-.Pp
-The
-.Fn getprotobyname
-function
-and
-.Fn getprotobynumber
-sequentially search from the beginning
-of the file until a matching
-protocol name or
-protocol number is found,
-or until
-.Dv EOF
-is encountered.
-.Sh RETURN VALUES
-Null pointer
-(0) returned on
-.Dv EOF
-or error.
-.Sh FILES
-.Bl -tag -width /etc/protocols -compact
-.It Pa /etc/protocols
-.El
-.Sh SEE ALSO
-.Xr protocols 5
-.Sh HISTORY
-The
-.Fn getprotoent ,
-.Fn getprotobynumber ,
-.Fn getprotobyname ,
-.Fn setprotoent ,
-and
-.Fn endprotoent
-functions appeared in 
-.Bx 4.2 .
-.Sh BUGS
-These functions use a static data space;
-if the data is needed for future use, it should be
-copied before any subsequent calls overwrite it.
-Only the Internet
-protocols are currently understood.
diff --git a/c/src/exec/libnetworking/libc/getprotoent.c b/c/src/exec/libnetworking/libc/getprotoent.c
deleted file mode 100644
index 0b9cefec68..0000000000
--- a/c/src/exec/libnetworking/libc/getprotoent.c
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *  $Id$
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getprotoent.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#define	MAXALIASES	35
-
-static FILE *protof = NULL;
-static char line[BUFSIZ+1];
-static struct protoent proto;
-static char *proto_aliases[MAXALIASES];
-int _proto_stayopen;
-
-void
-setprotoent(f)
-	int f;
-{
-	if (protof == NULL)
-		protof = fopen(_PATH_PROTOCOLS, "r" );
-	else
-		rewind(protof);
-	_proto_stayopen |= f;
-}
-
-void
-endprotoent()
-{
-	if (protof) {
-		fclose(protof);
-		protof = NULL;
-	}
-	_proto_stayopen = 0;
-}
-
-struct protoent *
-getprotoent()
-{
-	char *p;
-	register char *cp, **q;
-
-	if (protof == NULL && (protof = fopen(_PATH_PROTOCOLS, "r" )) == NULL)
-		return (NULL);
-again:
-	if ((p = fgets(line, BUFSIZ, protof)) == NULL)
-		return (NULL);
-	if (*p == '#')
-		goto again;
-	cp = strpbrk(p, "#\n");
-	if (cp == NULL)
-		goto again;
-	*cp = '\0';
-	proto.p_name = p;
-	cp = strpbrk(p, " \t");
-	if (cp == NULL)
-		goto again;
-	*cp++ = '\0';
-	while (*cp == ' ' || *cp == '\t')
-		cp++;
-	p = strpbrk(cp, " \t");
-	if (p != NULL)
-		*p++ = '\0';
-	proto.p_proto = atoi(cp);
-	q = proto.p_aliases = proto_aliases;
-	if (p != NULL) {
-		cp = p;
-		while (cp && *cp) {
-			if (*cp == ' ' || *cp == '\t') {
-				cp++;
-				continue;
-			}
-			if (q < &proto_aliases[MAXALIASES - 1])
-				*q++ = cp;
-			cp = strpbrk(cp, " \t");
-			if (cp != NULL)
-				*cp++ = '\0';
-		}
-	}
-	*q = NULL;
-	return (&proto);
-}
diff --git a/c/src/exec/libnetworking/libc/getprotoname.c b/c/src/exec/libnetworking/libc/getprotoname.c
deleted file mode 100644
index 46880eb005..0000000000
--- a/c/src/exec/libnetworking/libc/getprotoname.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *  $Id$
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getprotoname.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
-#include <netdb.h>
-#include <string.h>
-
-extern int _proto_stayopen;
-
-struct protoent *
-getprotobyname(name)
-	register const char *name;
-{
-	register struct protoent *p;
-	register char **cp;
-
-	setprotoent(_proto_stayopen);
-	while ( (p = getprotoent()) ) {
-		if (strcmp(p->p_name, name) == 0)
-			break;
-		for (cp = p->p_aliases; *cp != 0; cp++)
-			if (strcmp(*cp, name) == 0)
-				goto found;
-	}
-found:
-	if (!_proto_stayopen)
-		endprotoent();
-	return (p);
-}
diff --git a/c/src/exec/libnetworking/libc/getservbyname.c b/c/src/exec/libnetworking/libc/getservbyname.c
deleted file mode 100644
index 19936907d3..0000000000
--- a/c/src/exec/libnetworking/libc/getservbyname.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *  $Id$
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getservbyname.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
-#include <netdb.h>
-#include <string.h>
-
-extern int _serv_stayopen;
-
-struct servent *
-getservbyname(name, proto)
-	const char *name, *proto;
-{
-	register struct servent *p;
-	register char **cp;
-
-#ifdef YP
-	extern char *___getservbyname_yp;
-	extern char *___getservbyproto_yp;
-
-	___getservbyname_yp = (char *)name;
-	___getservbyproto_yp = (char *)proto;
-#endif
-
-	setservent(_serv_stayopen);
-	while ( (p = getservent()) ) {
-		if (strcmp(name, p->s_name) == 0)
-			goto gotname;
-		for (cp = p->s_aliases; *cp; cp++)
-			if (strcmp(name, *cp) == 0)
-				goto gotname;
-		continue;
-gotname:
-		if (proto == 0 || strcmp(p->s_proto, proto) == 0)
-			break;
-	}
-	if (!_serv_stayopen)
-		endservent();
-
-#ifdef YP
-	___getservbyname_yp = NULL;
-	___getservbyproto_yp = NULL;
-#endif
-
-	return (p);
-}
diff --git a/c/src/exec/libnetworking/libc/getservbyport.c b/c/src/exec/libnetworking/libc/getservbyport.c
deleted file mode 100644
index c8433954e1..0000000000
--- a/c/src/exec/libnetworking/libc/getservbyport.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *  $Id$
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getservbyport.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
-#include <netdb.h>
-#include <string.h>
-
-extern int _serv_stayopen;
-
-struct servent *
-getservbyport(port, proto)
-	int port;
-	const char *proto;
-{
-	register struct servent *p;
-
-#ifdef YP
-	extern int ___getservbyport_yp;
-	extern char *___getservbyproto_yp;
-
-	___getservbyport_yp = port;
-	___getservbyproto_yp = (char *)proto;
-#endif
-
-	setservent(_serv_stayopen);
-	while ( (p = getservent()) ) {
-		if (p->s_port != port)
-			continue;
-		if (proto == 0 || strcmp(p->s_proto, proto) == 0)
-			break;
-	}
-	if (!_serv_stayopen)
-		endservent();
-
-#ifdef YP
-	___getservbyport_yp = 0;
-	___getservbyproto_yp = NULL;
-#endif
-
-	return (p);
-}
diff --git a/c/src/exec/libnetworking/libc/getservent.3 b/c/src/exec/libnetworking/libc/getservent.3
deleted file mode 100644
index 79c18a3beb..0000000000
--- a/c/src/exec/libnetworking/libc/getservent.3
+++ /dev/null
@@ -1,156 +0,0 @@
-.\" Copyright (c) 1983, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"     From: @(#)getservent.3	8.3 (Berkeley) 1/12/94
-.\"	$Id$
-.\"
-.Dd July 9, 1995
-.Dt GETSERVENT 3
-.Os BSD 4.2
-.Sh NAME
-.Nm getservent ,
-.Nm getservbyport ,
-.Nm getservbyname ,
-.Nm setservent ,
-.Nm endservent
-.Nd get service entry
-.Sh SYNOPSIS
-.Fd #include <netdb.h>
-.Ft struct servent *
-.Fn getservent 
-.Ft struct servent *
-.Fn getservbyname "const char *name" "const char *proto"
-.Ft struct servent *
-.Fn getservbyport "int port" "const char *proto"
-.Ft void
-.Fn setservent "int stayopen"
-.Ft void
-.Fn endservent void
-.Sh DESCRIPTION
-The
-.Fn getservent ,
-.Fn getservbyname ,
-and
-.Fn getservbyport
-functions
-each return a pointer to an object with the
-following structure
-containing the broken-out
-fields of a line in the network services data base,
-.Pa /etc/services .
-.Bd -literal -offset indent
-struct	servent {
-	char	*s_name;	/* official name of service */
-	char	**s_aliases;	/* alias list */
-	int	s_port;		/* port service resides at */
-	char	*s_proto;	/* protocol to use */
-};
-.Ed
-.Pp
-The members of this structure are:
-.Bl -tag -width s_aliases
-.It Fa s_name
-The official name of the service.
-.It Fa s_aliases
-A zero terminated list of alternate names for the service.
-.It Fa s_port
-The port number at which the service resides.
-Port numbers are returned in network byte order.
-.It Fa s_proto
-The name of the protocol to use when contacting the
-service.
-.El
-.Pp
-The
-.Fn getservent
-function
-reads the next line of the file, opening the file if necessary.
-.Pp
-The
-.Fn setservent
-function
-opens and rewinds the file.  If the
-.Fa stayopen
-flag is non-zero,
-the net data base will not be closed after each call to 
-.Fn getservbyname
-or
-.Fn getservbyport .
-.Pp
-The
-.Fn endservent
-function
-closes the file.
-.Pp
-The
-.Fn getservbyname
-and
-.Fn getservbyport
-functions
-sequentially search from the beginning
-of the file until a matching
-protocol name or
-port number is found,
-or until
-.Dv EOF
-is encountered.
-If a protocol name is also supplied (non-
-.Dv NULL ) , 
-searches must also match the protocol.
-.ne 1i
-.Sh FILES
-.Bl -tag -width /etc/services -compact
-.It Pa /etc/services
-.El
-.Sh DIAGNOSTICS
-Null pointer
-(0) returned on
-.Dv EOF
-or error.
-.Sh SEE ALSO
-.Xr getprotoent 3 ,
-.Xr services 5
-.Sh HISTORY
-The
-.Fn getservent ,
-.Fn getservbyport ,
-.Fn getservbyname ,
-.Fn setservent ,
-and
-.Fn endservent
-functions appeared in 
-.Bx 4.2 .
-.Sh BUGS
-These functions use static data storage;
-if the data is needed for future use, it should be
-copied before any subsequent calls overwrite it.
-Expecting port numbers to fit in a 32 bit
-quantity is probably naive.
diff --git a/c/src/exec/libnetworking/libc/getservent.c b/c/src/exec/libnetworking/libc/getservent.c
deleted file mode 100644
index 08a05c0975..0000000000
--- a/c/src/exec/libnetworking/libc/getservent.c
+++ /dev/null
@@ -1,280 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *  $Id$
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getservent.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#ifdef YP
-#include <rpc/rpc.h>
-#include <rpcsvc/yp_prot.h>
-#include <rpcsvc/ypclnt.h>
-static int serv_stepping_yp = 0;
-extern int _yp_check __P(( char ** ));
-#endif
-
-
-#define	MAXALIASES	35
-
-static FILE *servf = NULL;
-static char line[BUFSIZ+1];
-static struct servent serv;
-static char *serv_aliases[MAXALIASES];
-int _serv_stayopen;
-
-#ifdef YP
-char *___getservbyname_yp = NULL;
-char *___getservbyproto_yp = NULL;
-int ___getservbyport_yp = 0;
-static char *yp_domain = NULL;
-
-static int
-_getservbyport_yp(line)
-	char *line;
-{
-	char *result;
-	int resultlen;
-	char buf[YPMAXRECORD + 2];
-	int rv;
-
-	snprintf(buf, sizeof(buf), "%d/%s", ntohs(___getservbyport_yp),
-						___getservbyproto_yp);
-
-	___getservbyport_yp = 0;
-	___getservbyproto_yp = NULL;
-
-	if(!yp_domain) {
-		if(yp_get_default_domain(&yp_domain))
-			return (0);
-	}
-
-	/*
-	 * We have to be a little flexible here. Ideally you're supposed
-	 * to have both a services.byname and a services.byport map, but
-	 * some systems have only services.byname. FreeBSD cheats a little
-	 * by putting the services.byport information in the same map as
-	 * services.byname so that either case will work. We allow for both
-	 * possibilities here: if there is no services.byport map, we try
-	 * services.byname instead.
-	 */
-	if ((rv = yp_match(yp_domain, "services.byport", buf, strlen(buf),
-						&result, &resultlen))) {
-		if (rv == YPERR_MAP) {
-			if (yp_match(yp_domain, "services.byname", buf,
-					strlen(buf), &result, &resultlen))
-			return(0);
-		} else
-			return(0);
-	}
-		
-	/* getservent() expects lines terminated with \n -- make it happy */
-	snprintf(line, BUFSIZ, "%.*s\n", resultlen, result);
-
-	free(result);
-	return(1);
-}
-
-static int
-_getservbyname_yp(line)
-	char *line;
-{
-	char *result;
-	int resultlen;
-	char buf[YPMAXRECORD + 2];
-
-	if(!yp_domain) {
-		if(yp_get_default_domain(&yp_domain))
-			return (0);
-	}
-
-	snprintf(buf, sizeof(buf), "%s/%s", ___getservbyname_yp,
-						___getservbyproto_yp);
-
-	___getservbyname_yp = 0;
-	___getservbyproto_yp = NULL;
-
-	if (yp_match(yp_domain, "services.byname", buf, strlen(buf),
-						&result, &resultlen)) {
-		return(0);
-	}
-		
-	/* getservent() expects lines terminated with \n -- make it happy */
-	snprintf(line, BUFSIZ, "%.*s\n", resultlen, result);
-
-	free(result);
-	return(1);
-}
-
-static int
-_getservent_yp(line)
-	char *line;
-{
-	static char *key = NULL;
-	static int keylen;
-	char *lastkey, *result;
-	int resultlen;
-	int rv;
-
-	if(!yp_domain) {
-		if(yp_get_default_domain(&yp_domain))
-			return (0);
-	}
-
-	if (!serv_stepping_yp) {
-		if (key)
-			free(key);
-		if ((rv = yp_first(yp_domain, "services.byname", &key, &keylen,
-			     &result, &resultlen))) {
-			serv_stepping_yp = 0;
-			return(0);
-		}
-		serv_stepping_yp = 1;
-	} else {
-		lastkey = key;
-		rv = yp_next(yp_domain, "services.byname", key, keylen, &key,
-			     &keylen, &result, &resultlen);
-		free(lastkey);
-		if (rv) {
-			serv_stepping_yp = 0;
-			return (0);
-		}
-	}
-
-	/* getservent() expects lines terminated with \n -- make it happy */
-	snprintf(line, BUFSIZ, "%.*s\n", resultlen, result);
-
-	free(result);
-
-	return(1);
-}
-#endif
-
-void
-setservent(f)
-	int f;
-{
-	if (servf == NULL)
-		servf = fopen(_PATH_SERVICES, "r" );
-	else
-		rewind(servf);
-	_serv_stayopen |= f;
-}
-
-void
-endservent()
-{
-	if (servf) {
-		fclose(servf);
-		servf = NULL;
-	}
-	_serv_stayopen = 0;
-}
-
-struct servent *
-getservent()
-{
-	char *p;
-	register char *cp, **q;
-
-#ifdef YP
-	if (serv_stepping_yp && _getservent_yp(line)) {
-		p = (char *)&line;
-		goto unpack;
-	}
-tryagain:
-#endif
-	if (servf == NULL && (servf = fopen(_PATH_SERVICES, "r" )) == NULL)
-		return (NULL);
-again:
-	if ((p = fgets(line, BUFSIZ, servf)) == NULL)
-		return (NULL);
-#ifdef YP
-	if (*p == '+' && _yp_check(NULL)) {
-		if (___getservbyname_yp != NULL) {
-			if (!_getservbyname_yp(line))
-				goto tryagain;
-		} 
-		else if (___getservbyport_yp != 0) {
-			if (!_getservbyport_yp(line))
-				goto tryagain;
-		}
-		else if (!_getservent_yp(line))
-			goto tryagain;
-	}
-unpack:
-#endif
-	if (*p == '#')
-		goto again;
-	cp = strpbrk(p, "#\n");
-	if (cp == NULL)
-		goto again;
-	*cp = '\0';
-	serv.s_name = p;
-	p = strpbrk(p, " \t");
-	if (p == NULL)
-		goto again;
-	*p++ = '\0';
-	while (*p == ' ' || *p == '\t')
-		p++;
-	cp = strpbrk(p, ",/");
-	if (cp == NULL)
-		goto again;
-	*cp++ = '\0';
-	serv.s_port = htons((u_short)atoi(p));
-	serv.s_proto = cp;
-	q = serv.s_aliases = serv_aliases;
-	cp = strpbrk(cp, " \t");
-	if (cp != NULL)
-		*cp++ = '\0';
-	while (cp && *cp) {
-		if (*cp == ' ' || *cp == '\t') {
-			cp++;
-			continue;
-		}
-		if (q < &serv_aliases[MAXALIASES - 1])
-			*q++ = cp;
-		cp = strpbrk(cp, " \t");
-		if (cp != NULL)
-			*cp++ = '\0';
-	}
-	*q = NULL;
-	return (&serv);
-}
diff --git a/c/src/exec/libnetworking/libc/herror.c b/c/src/exec/libnetworking/libc/herror.c
deleted file mode 100644
index ba1dae934d..0000000000
--- a/c/src/exec/libnetworking/libc/herror.c
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright (c) 1987, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * Portions Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)herror.c	8.1 (Berkeley) 6/4/93";
-static char rcsid[] = "$Id$";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <sys/uio.h>
-#include <netdb.h>
-#include <string.h>
-#include <unistd.h>
-
-const char *h_errlist[] = {
-	"Resolver Error 0 (no error)",
-	"Unknown host",				/* 1 HOST_NOT_FOUND */
-	"Host name lookup failure",		/* 2 TRY_AGAIN */
-	"Unknown server error",			/* 3 NO_RECOVERY */
-	"No address associated with name",	/* 4 NO_ADDRESS */
-};
-int	h_nerr = { sizeof h_errlist / sizeof h_errlist[0] };
-
-int	h_errno;
-
-/*
- * herror --
- *	print the error indicated by the h_errno value.
- */
-void
-herror(s)
-	const char *s;
-{
-#if 0
-	struct iovec iov[4];
-	register struct iovec *v = iov;
-
-	if (s && *s) {
-		v->iov_base = (char *)s;
-		v->iov_len = strlen(s);
-		v++;
-		v->iov_base = ": ";
-		v->iov_len = 2;
-		v++;
-	}
-	v->iov_base = (char *)hstrerror(h_errno);
-	v->iov_len = strlen(v->iov_base);
-	v++;
-	v->iov_base = "\n";
-	v->iov_len = 1;
-	writev(STDERR_FILENO, iov, (v - iov) + 1);
-#else
-	/*
-	 * RTEMS: no writev yet
-	 */
-	if (s && *s) {
-		write (2, s, strlen (s));
-		write (2, ": ", 2);
-	}
-	s = (char *)hstrerror(h_errno);
-	write (2, s, strlen (s));
-	write (2, "\n", 1);
-#endif
-}
-
-const char *
-hstrerror(err)
-	int err;
-{
-	if (err < 0)
-		return ("Resolver internal error");
-	else if (err < h_nerr)
-		return (h_errlist[err]);
-	return ("Unknown resolver error");
-}
diff --git a/c/src/exec/libnetworking/libc/inet.3 b/c/src/exec/libnetworking/libc/inet.3
deleted file mode 100644
index 1052f538f2..0000000000
--- a/c/src/exec/libnetworking/libc/inet.3
+++ /dev/null
@@ -1,210 +0,0 @@
-.\" Copyright (c) 1983, 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"     From: @(#)inet.3	8.1 (Berkeley) 6/4/93
-.\"	$Id$
-.\"
-.Dd June 17, 1996
-.Dt INET 3
-.Os BSD 4.2
-.Sh NAME
-.Nm inet_aton ,
-.Nm inet_addr ,
-.Nm inet_network ,
-.Nm inet_ntoa ,
-.Nm inet_makeaddr ,
-.Nm inet_lnaof ,
-.Nm inet_netof
-.Nd Internet address manipulation routines
-.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/socket.h>
-.Fd #include <netinet/in.h>
-.Fd #include <arpa/inet.h>
-.Ft int 
-.Fn inet_aton "const char *cp" "struct in_addr *pin"
-.Ft unsigned long 
-.Fn inet_addr "const char *cp"
-.Ft unsigned long 
-.Fn inet_network "const char *cp"
-.Ft char *
-.Fn inet_ntoa "struct in_addr in"
-.Ft struct in_addr 
-.Fn inet_makeaddr "unsigned long net" "unsigned long lna"
-.Ft unsigned long 
-.Fn inet_lnaof "struct in_addr in"
-.Ft unsigned long 
-.Fn inet_netof "struct in_addr in"
-.Sh DESCRIPTION
-The routines
-.Fn inet_aton ,
-.Fn inet_addr
-and
-.Fn inet_network
-interpret character strings representing
-numbers expressed in the Internet standard
-.Ql \&.
-notation.
-The
-.Fn inet_aton
-routine interprets the specified character string as an Internet address,
-placing the address into the structure provided.
-It returns 1 if the string was successfully interpreted,
-or 0 if the string is invalid.
-The
-.Fn inet_addr
-and
-.Fn inet_network
-functions return numbers suitable for use
-as Internet addresses and Internet network
-numbers, respectively.
-The routine
-.Fn inet_ntoa
-takes an Internet address and returns an
-.Tn ASCII
-string representing the address in
-.Ql \&.
-notation.  The routine
-.Fn inet_makeaddr
-takes an Internet network number and a local
-network address and constructs an Internet address
-from it.  The routines
-.Fn inet_netof
-and
-.Fn inet_lnaof
-break apart Internet host addresses, returning
-the network number and local network address part,
-respectively.
-.Pp
-All Internet addresses are returned in network
-order (bytes ordered from left to right).
-All network numbers and local address parts are
-returned as machine format integer values.
-.Sh INTERNET ADDRESSES
-Values specified using the
-.Ql \&.
-notation take one
-of the following forms:
-.Bd -literal -offset indent
-a.b.c.d
-a.b.c
-a.b
-a
-.Ed
-.Pp
-When four parts are specified, each is interpreted
-as a byte of data and assigned, from left to right,
-to the four bytes of an Internet address.  Note
-that when an Internet address is viewed as a 32-bit
-integer quantity on the
-.Tn VAX
-the bytes referred to
-above appear as
-.Dq Li d.c.b.a .
-That is,
-.Tn VAX
-bytes are
-ordered from right to left.
-.Pp
-When a three part address is specified, the last
-part is interpreted as a 16-bit quantity and placed
-in the right-most two bytes of the network address.
-This makes the three part address format convenient
-for specifying Class B network addresses as
-.Dq Li 128.net.host .
-.Pp
-When a two part address is supplied, the last part
-is interpreted as a 24-bit quantity and placed in
-the right most three bytes of the network address.
-This makes the two part address format convenient
-for specifying Class A network addresses as
-.Dq Li net.host .
-.Pp
-When only one part is given, the value is stored
-directly in the network address without any byte
-rearrangement.
-.Pp
-All numbers supplied as
-.Dq parts
-in a
-.Ql  \&.
-notation
-may be decimal, octal, or hexadecimal, as specified
-in the C language (i.e., a leading 0x or 0X implies
-hexadecimal; otherwise, a leading 0 implies octal;
-otherwise, the number is interpreted as decimal).
-.Pp
-The
-.Fn inet_aton
-and
-.Fn inet_ntoa
-functions are semi-deprecated in favor of the
-.Xr addr2ascii 3
-family.  However, since those functions are not yet widely implemented,
-portable programs cannot rely on their presence and will continue
-to use the
-.Xr inet 3
-functions for some time.
-.Sh DIAGNOSTICS
-The constant
-.Dv INADDR_NONE
-is returned by
-.Fn inet_addr
-and
-.Fn inet_network
-for malformed requests.
-.Sh SEE ALSO
-.Xr addr2ascii 3 ,
-.Xr gethostbyname 3 ,
-.Xr getnetent 3 ,
-.Xr hosts 5 ,
-.Xr networks 5
-.Sh HISTORY
-These
-functions appeared in 
-.Bx 4.2 .
-.Sh BUGS
-The value
-.Dv INADDR_NONE
-(0xffffffff) is a valid broadcast address, but
-.Fn inet_addr
-cannot return that value without indicating failure.
-The newer
-.Fn inet_aton
-function does not share this problem.
-The problem of host byte ordering versus network byte ordering is
-confusing.
-The string returned by
-.Fn inet_ntoa
-resides in a static memory area.
-.Pp
-Inet_addr should return a
-.Fa struct in_addr .
diff --git a/c/src/exec/libnetworking/libc/inet_addr.c b/c/src/exec/libnetworking/libc/inet_addr.c
deleted file mode 100644
index 225ccc1269..0000000000
--- a/c/src/exec/libnetworking/libc/inet_addr.c
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- * ++Copyright++ 1983, 1990, 1993
- * -
- * Copyright (c) 1983, 1990, 1993
- *    The Regents of the University of California.  All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- * 	This product includes software developed by the University of
- * 	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * -
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- * -
- * --Copyright--
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)inet_addr.c	8.1 (Berkeley) 6/17/93";
-static char rcsid[] = "$Id$";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/param.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <ctype.h>
-
-/*
- * Ascii internet address interpretation routine.
- * The value returned is in network order.
- */
-u_long
-inet_addr(cp)
-	register const char *cp;
-{
-	struct in_addr val;
-
-	if (inet_aton(cp, &val))
-		return (val.s_addr);
-	return (INADDR_NONE);
-}
-
-/* 
- * Check whether "cp" is a valid ascii representation
- * of an Internet address and convert to a binary address.
- * Returns 1 if the address is valid, 0 if not.
- * This replaces inet_addr, the return value from which
- * cannot distinguish between failure and a local broadcast address.
- */
-int
-inet_aton(cp, addr)
-	register const char *cp;
-	struct in_addr *addr;
-{
-	register u_long val;
-	register int base, n;
-	register char c;
-	u_int parts[4];
-	register u_int *pp = parts;
-
-	c = *cp;
-	for (;;) {
-		/*
-		 * Collect number up to ``.''.
-		 * Values are specified as for C:
-		 * 0x=hex, 0=octal, isdigit=decimal.
-		 */
-		if (!isdigit((int)c))
-			return (0);
-		val = 0; base = 10;
-		if (c == '0') {
-			c = *++cp;
-			if (c == 'x' || c == 'X')
-				base = 16, c = *++cp;
-			else
-				base = 8;
-		}
-		for (;;) {
-			if (isascii((int)c) && isdigit((int)c)) {
-				val = (val * base) + (c - '0');
-				c = *++cp;
-			} else if (base == 16 && isascii((int)c) && isxdigit((int)c)) {
-				val = (val << 4) |
-					(c + 10 - (islower((int)c) ? 'a' : 'A'));
-				c = *++cp;
-			} else
-				break;
-		}
-		if (c == '.') {
-			/*
-			 * Internet format:
-			 *	a.b.c.d
-			 *	a.b.c	(with c treated as 16 bits)
-			 *	a.b	(with b treated as 24 bits)
-			 */
-			if (pp >= parts + 3)
-				return (0);
-			*pp++ = val;
-			c = *++cp;
-		} else
-			break;
-	}
-	/*
-	 * Check for trailing characters.
-	 */
-	if (c != '\0' && (!isascii((int)c) || !isspace((int)c)))
-		return (0);
-	/*
-	 * Concoct the address according to
-	 * the number of parts specified.
-	 */
-	n = pp - parts + 1;
-	switch (n) {
-
-	case 0:
-		return (0);		/* initial nondigit */
-
-	case 1:				/* a -- 32 bits */
-		break;
-
-	case 2:				/* a.b -- 8.24 bits */
-		if (val > 0xffffff)
-			return (0);
-		val |= parts[0] << 24;
-		break;
-
-	case 3:				/* a.b.c -- 8.8.16 bits */
-		if (val > 0xffff)
-			return (0);
-		val |= (parts[0] << 24) | (parts[1] << 16);
-		break;
-
-	case 4:				/* a.b.c.d -- 8.8.8.8 bits */
-		if (val > 0xff)
-			return (0);
-		val |= (parts[0] << 24) | (parts[1] << 16) | (parts[2] << 8);
-		break;
-	}
-	if (addr)
-		addr->s_addr = htonl(val);
-	return (1);
-}
diff --git a/c/src/exec/libnetworking/libc/inet_lnaof.c b/c/src/exec/libnetworking/libc/inet_lnaof.c
deleted file mode 100644
index 6ec6a9aef1..0000000000
--- a/c/src/exec/libnetworking/libc/inet_lnaof.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *  $Id$
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)inet_lnaof.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/param.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-/*
- * Return the local network address portion of an
- * internet address; handles class a/b/c network
- * number formats.
- */
-u_long
-inet_lnaof(in)
-	struct in_addr in;
-{
-	register u_long i = ntohl(in.s_addr);
-
-	if (IN_CLASSA(i))
-		return ((i)&IN_CLASSA_HOST);
-	else if (IN_CLASSB(i))
-		return ((i)&IN_CLASSB_HOST);
-	else
-		return ((i)&IN_CLASSC_HOST);
-}
diff --git a/c/src/exec/libnetworking/libc/inet_makeaddr.c b/c/src/exec/libnetworking/libc/inet_makeaddr.c
deleted file mode 100644
index ce84170ed9..0000000000
--- a/c/src/exec/libnetworking/libc/inet_makeaddr.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *  $Id$
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)inet_makeaddr.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/param.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-/*
- * Formulate an Internet address from network + host.  Used in
- * building addresses stored in the ifnet structure.
- */
-struct in_addr
-inet_makeaddr(net, host)
-	u_long net, host;
-{
-	u_long addr;
-
-	if (net < 128)
-		addr = (net << IN_CLASSA_NSHIFT) | (host & IN_CLASSA_HOST);
-	else if (net < 65536)
-		addr = (net << IN_CLASSB_NSHIFT) | (host & IN_CLASSB_HOST);
-	else if (net < 16777216L)
-		addr = (net << IN_CLASSC_NSHIFT) | (host & IN_CLASSC_HOST);
-	else
-		addr = net | host;
-	addr = htonl(addr);
-	return (*(struct in_addr *)&addr);
-}
diff --git a/c/src/exec/libnetworking/libc/inet_net_ntop.c b/c/src/exec/libnetworking/libc/inet_net_ntop.c
deleted file mode 100644
index 4c7893d417..0000000000
--- a/c/src/exec/libnetworking/libc/inet_net_ntop.c
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char orig_rcsid[] = "From Id: inet_net_ntop.c,v 8.2 1996/08/08 06:54:44 vixie Exp";
-static const char rcsid[] = "$Id$";
-#endif
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#ifdef SPRINTF_CHAR
-# define SPRINTF(x) strlen(sprintf/**/x)
-#else
-# define SPRINTF(x) ((size_t)sprintf x)
-#endif
-
-static char *	inet_net_ntop_ipv4 __P((const u_char *src, int bits,
-					char *dst, size_t size));
-
-/*
- * char *
- * inet_net_ntop(af, src, bits, dst, size)
- *	convert network number from network to presentation format.
- *	generates CIDR style result always.
- * return:
- *	pointer to dst, or NULL if an error occurred (check errno).
- * author:
- *	Paul Vixie (ISC), July 1996
- */
-char *
-inet_net_ntop(af, src, bits, dst, size)
-	int af;
-	const void *src;
-	int bits;
-	char *dst;
-	size_t size;
-{
-	switch (af) {
-	case AF_INET:
-		return (inet_net_ntop_ipv4(src, bits, dst, size));
-	default:
-		errno = EAFNOSUPPORT;
-		return (NULL);
-	}
-}
-
-/*
- * static char *
- * inet_net_ntop_ipv4(src, bits, dst, size)
- *	convert IPv4 network number from network to presentation format.
- *	generates CIDR style result always.
- * return:
- *	pointer to dst, or NULL if an error occurred (check errno).
- * note:
- *	network byte order assumed.  this means 192.5.5.240/28 has
- *	0x11110000 in its fourth octet.
- * author:
- *	Paul Vixie (ISC), July 1996
- */
-static char *
-inet_net_ntop_ipv4(src, bits, dst, size)
-	const u_char *src;
-	int bits;
-	char *dst;
-	size_t size;
-{
-	char *odst = dst;
-	char *t;
-	u_int m;
-	int b;
-
-	if (bits < 0 || bits > 32) {
-		errno = EINVAL;
-		return (NULL);
-	}
-	if (bits == 0) {
-		if (size < sizeof "0")
-			goto emsgsize;
-		*dst++ = '0';
-		*dst = '\0';
-	}
-
-	/* Format whole octets. */
-	for (b = bits / 8; b > 0; b--) {
-		if (size < sizeof "255.")
-			goto emsgsize;
-		t = dst;
-		dst += SPRINTF((dst, "%u", *src++));
-		if (b > 1) {
-			*dst++ = '.';
-			*dst = '\0';
-		}
-		size -= (size_t)(dst - t);
-	}
-
-	/* Format partial octet. */
-	b = bits % 8;
-	if (b > 0) {
-		if (size < sizeof ".255")
-			goto emsgsize;
-		t = dst;
-		if (dst != odst)
-			*dst++ = '.';
-		m = ((1 << b) - 1) << (8 - b);
-		dst += SPRINTF((dst, "%u", *src & m));
-		size -= (size_t)(dst - t);
-	}
-
-	/* Format CIDR /width. */
-	if (size < sizeof "/32")
-		goto emsgsize;
-	dst += SPRINTF((dst, "/%u", bits));
-	return (odst);
-
- emsgsize:
-	errno = EMSGSIZE;
-	return (NULL);
-}
diff --git a/c/src/exec/libnetworking/libc/inet_net_pton.c b/c/src/exec/libnetworking/libc/inet_net_pton.c
deleted file mode 100644
index 8915c2a5be..0000000000
--- a/c/src/exec/libnetworking/libc/inet_net_pton.c
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- * Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char orig_rcsid[] = "From Id: inet_net_pton.c,v 1.8 1996/11/21 10:28:12 vixie Exp $";
-static const char rcsid[] = "$Id$";
-#endif
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include <assert.h>
-#include <ctype.h>
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#ifdef SPRINTF_CHAR
-# define SPRINTF(x) strlen(sprintf/**/x)
-#else
-# define SPRINTF(x) ((size_t)sprintf x)
-#endif
-
-static int	inet_net_pton_ipv4 __P((const char *src, u_char *dst,
-					size_t size));
-
-/*
- * static int
- * inet_net_pton(af, src, dst, size)
- *	convert network number from presentation to network format.
- *	accepts hex octets, hex strings, decimal octets, and /CIDR.
- *	"size" is in bytes and describes "dst".
- * return:
- *	number of bits, either imputed classfully or specified with /CIDR,
- *	or -1 if some failure occurred (check errno).  ENOENT means it was
- *	not a valid network specification.
- * author:
- *	Paul Vixie (ISC), June 1996
- */
-int
-inet_net_pton(af, src, dst, size)
-	int af;
-	const char *src;
-	void *dst;
-	size_t size;
-{
-	switch (af) {
-	case AF_INET:
-		return (inet_net_pton_ipv4(src, dst, size));
-	default:
-		errno = EAFNOSUPPORT;
-		return (-1);
-	}
-}
-
-/*
- * static int
- * inet_net_pton_ipv4(src, dst, size)
- *	convert IPv4 network number from presentation to network format.
- *	accepts hex octets, hex strings, decimal octets, and /CIDR.
- *	"size" is in bytes and describes "dst".
- * return:
- *	number of bits, either imputed classfully or specified with /CIDR,
- *	or -1 if some failure occurred (check errno).  ENOENT means it was
- *	not an IPv4 network specification.
- * note:
- *	network byte order assumed.  this means 192.5.5.240/28 has
- *	0x11110000 in its fourth octet.
- * author:
- *	Paul Vixie (ISC), June 1996
- */
-static int
-inet_net_pton_ipv4(src, dst, size)
-	const char *src;
-	u_char *dst;
-	size_t size;
-{
-	static const char
-		xdigits[] = "0123456789abcdef",
-		digits[] = "0123456789";
-	int n, ch, tmp, dirty, bits;
-	const u_char *odst = dst;
-
-	ch = *src++;
-	if (ch == '0' && (src[0] == 'x' || src[0] == 'X')
-	    && isascii(src[1]) && isxdigit(src[1])) {
-		/* Hexadecimal: Eat nybble string. */
-		if (size <= 0)
-			goto emsgsize;
-		*dst = 0, dirty = 0;
-		src++;	/* skip x or X. */
-		while ((ch = *src++) != '\0' &&
-		       isascii(ch) && isxdigit(ch)) {
-			if (isupper(ch))
-				ch = tolower(ch);
-			n = strchr(xdigits, ch) - xdigits;
-			assert(n >= 0 && n <= 15);
-			*dst |= n;
-			if (!dirty++)
-				*dst <<= 4;
-			else if (size-- > 0)
-				*++dst = 0, dirty = 0;
-			else
-				goto emsgsize;
-		}
-		if (dirty)
-			size--;
-	} else if (isascii(ch) && isdigit(ch)) {
-		/* Decimal: eat dotted digit string. */
-		for (;;) {
-			tmp = 0;
-			do {
-				n = strchr(digits, ch) - digits;
-				assert(n >= 0 && n <= 9);
-				tmp *= 10;
-				tmp += n;
-				if (tmp > 255)
-					goto enoent;
-			} while ((ch = *src++) != '\0' &&
-				 isascii(ch) && isdigit(ch));
-			if (size-- <= 0)
-				goto emsgsize;
-			*dst++ = (u_char) tmp;
-			if (ch == '\0' || ch == '/')
-				break;
-			if (ch != '.')
-				goto enoent;
-			ch = *src++;
-			if (!isascii(ch) || !isdigit(ch))
-				goto enoent;
-		}
-	} else
-		goto enoent;
-
-	bits = -1;
-	if (ch == '/' && isascii(src[0]) && isdigit(src[0]) && dst > odst) {
-		/* CIDR width specifier.  Nothing can follow it. */
-		ch = *src++;	/* Skip over the /. */
-		bits = 0;
-		do {
-			n = strchr(digits, ch) - digits;
-			assert(n >= 0 && n <= 9);
-			bits *= 10;
-			bits += n;
-		} while ((ch = *src++) != '\0' && isascii(ch) && isdigit(ch));
-		if (ch != '\0')
-			goto enoent;
-		if (bits > 32)
-			goto emsgsize;
-	}
-
-	/* Firey death and destruction unless we prefetched EOS. */
-	if (ch != '\0')
-		goto enoent;
-
-	/* If nothing was written to the destination, we found no address. */
-	if (dst == odst)
-		goto enoent;
-	/* If no CIDR spec was given, infer width from net class. */
-	if (bits == -1) {
-		if (*odst >= 240)	/* Class E */
-			bits = 32;
-		else if (*odst >= 224)	/* Class D */
-			bits = 4;
-		else if (*odst >= 192)	/* Class C */
-			bits = 24;
-		else if (*odst >= 128)	/* Class B */
-			bits = 16;
-		else			/* Class A */
-			bits = 8;
-		/* If imputed mask is narrower than specified octets, widen. */
-		if (bits >= 8 && bits < ((dst - odst) * 8))
-			bits = (dst - odst) * 8;
-	}
-	/* Extend network to cover the actual mask. */
-	while (bits > ((dst - odst) * 8)) {
-		if (size-- <= 0)
-			goto emsgsize;
-		*dst++ = '\0';
-	}
-	return (bits);
-
- enoent:
-	errno = ENOENT;
-	return (-1);
-
- emsgsize:
-	errno = EMSGSIZE;
-	return (-1);
-}
diff --git a/c/src/exec/libnetworking/libc/inet_neta.c b/c/src/exec/libnetworking/libc/inet_neta.c
deleted file mode 100644
index 59b156f7f6..0000000000
--- a/c/src/exec/libnetworking/libc/inet_neta.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char orig_rcsid[] = "From Id: inet_neta.c,v 8.2 1996/08/08 06:54:44 vixie Exp";
-static const char rcsid[] = "$Id$";
-#endif
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-
-#ifdef SPRINTF_CHAR
-# define SPRINTF(x) strlen(sprintf/**/x)
-#else
-# define SPRINTF(x) ((size_t)sprintf x)
-#endif
-
-/*
- * char *
- * inet_neta(src, dst, size)
- *	format a u_long network number into presentation format.
- * return:
- *	pointer to dst, or NULL if an error occurred (check errno).
- * note:
- *	format of ``src'' is as for inet_network().
- * author:
- *	Paul Vixie (ISC), July 1996
- */
-char *
-inet_neta(src, dst, size)
-	u_long src;
-	char *dst;
-	size_t size;
-{
-	char *odst = dst;
-	char *tp;
-
-	while (src & 0xffffffff) {
-		u_char b = (src & 0xff000000) >> 24;
-
-		src <<= 8;
-		if (b) {
-			if (size < sizeof "255.")
-				goto emsgsize;
-			tp = dst;
-			dst += SPRINTF((dst, "%u", b));
-			if (src != 0L) {
-				*dst++ = '.';
-				*dst = '\0';
-			}
-			size -= (size_t)(dst - tp);
-		}
-	}
-	if (dst == odst) {
-		if (size < sizeof "0.0.0.0")
-			goto emsgsize;
-		strcpy(dst, "0.0.0.0");
-	}
-	return (odst);
-
- emsgsize:
-	errno = EMSGSIZE;
-	return (NULL);
-}
diff --git a/c/src/exec/libnetworking/libc/inet_netof.c b/c/src/exec/libnetworking/libc/inet_netof.c
deleted file mode 100644
index 179731efc3..0000000000
--- a/c/src/exec/libnetworking/libc/inet_netof.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *  $Id$
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)inet_netof.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/param.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-/*
- * Return the network number from an internet
- * address; handles class a/b/c network #'s.
- */
-u_long
-inet_netof(in)
-	struct in_addr in;
-{
-	register u_long i = ntohl(in.s_addr);
-
-	if (IN_CLASSA(i))
-		return (((i)&IN_CLASSA_NET) >> IN_CLASSA_NSHIFT);
-	else if (IN_CLASSB(i))
-		return (((i)&IN_CLASSB_NET) >> IN_CLASSB_NSHIFT);
-	else
-		return (((i)&IN_CLASSC_NET) >> IN_CLASSC_NSHIFT);
-}
diff --git a/c/src/exec/libnetworking/libc/inet_network.c b/c/src/exec/libnetworking/libc/inet_network.c
deleted file mode 100644
index ac0073bf0a..0000000000
--- a/c/src/exec/libnetworking/libc/inet_network.c
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *  $Id$
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)inet_network.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <ctype.h>
-
-/*
- * Internet network address interpretation routine.
- * The library routines call this routine to interpret
- * network numbers.
- */
-u_long
-inet_network(cp)
-	register const char *cp;
-{
-	register u_long val, base, n, i;
-	register char c;
-	u_long parts[4], *pp = parts;
-
-again:
-	val = 0; base = 10;
-	if (*cp == '0')
-		base = 8, cp++;
-	if (*cp == 'x' || *cp == 'X')
-		base = 16, cp++;
-	while ((c = *cp) != 0) {
-		if (isdigit(c)) {
-			val = (val * base) + (c - '0');
-			cp++;
-			continue;
-		}
-		if (base == 16 && isxdigit(c)) {
-			val = (val << 4) + (c + 10 - (islower(c) ? 'a' : 'A'));
-			cp++;
-			continue;
-		}
-		break;
-	}
-	if (*cp == '.') {
-		if (pp >= parts + 3)
-			return (INADDR_NONE);
-		*pp++ = val, cp++;
-		goto again;
-	}
-	if (*cp && !isspace(*cp))
-		return (INADDR_NONE);
-	*pp++ = val;
-	n = pp - parts;
-	for (val = 0, i = 0; i < n; i++) {
-		val <<= 8;
-		val |= parts[i] & 0xff;
-	}
-	return (val);
-}
diff --git a/c/src/exec/libnetworking/libc/inet_ntoa.c b/c/src/exec/libnetworking/libc/inet_ntoa.c
deleted file mode 100644
index 44b686f0b3..0000000000
--- a/c/src/exec/libnetworking/libc/inet_ntoa.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *  $Id$
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)inet_ntoa.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <stdio.h>
-
-/*
- * Convert network-format internet address
- * to base 256 d.d.d.d representation.
- */
-char *
-inet_ntoa(in)
-	struct in_addr in;
-{
-	static char ret[18];
-
-	strcpy(ret, "[inet_ntoa error]");
-	(void) inet_ntop(AF_INET, &in, ret, sizeof ret);
-	return (ret);
-}
diff --git a/c/src/exec/libnetworking/libc/inet_ntop.c b/c/src/exec/libnetworking/libc/inet_ntop.c
deleted file mode 100644
index 76a538755a..0000000000
--- a/c/src/exec/libnetworking/libc/inet_ntop.c
+++ /dev/null
@@ -1,191 +0,0 @@
-/* Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$Id$";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-
-#define SPRINTF(x) ((size_t)sprintf x)
-
-/*
- * WARNING: Don't even consider trying to compile this on a system where
- * sizeof(int) < 4.  sizeof(int) > 4 is fine; all the world's not a VAX.
- */
-
-static const char *inet_ntop4 __P((const u_char *src, char *dst, size_t size));
-static const char *inet_ntop6 __P((const u_char *src, char *dst, size_t size));
-
-/* char *
- * inet_ntop(af, src, dst, size)
- *	convert a network format address to presentation format.
- * return:
- *	pointer to presentation format address (`dst'), or NULL (see errno).
- * author:
- *	Paul Vixie, 1996.
- */
-const char *
-inet_ntop(af, src, dst, size)
-	int af;
-	const void *src;
-	char *dst;
-	size_t size;
-{
-	switch (af) {
-	case AF_INET:
-		return (inet_ntop4(src, dst, size));
-	case AF_INET6:
-		return (inet_ntop6(src, dst, size));
-	default:
-		errno = EAFNOSUPPORT;
-		return (NULL);
-	}
-	/* NOTREACHED */
-}
-
-/* const char *
- * inet_ntop4(src, dst, size)
- *	format an IPv4 address, more or less like inet_ntoa()
- * return:
- *	`dst' (as a const)
- * notes:
- *	(1) uses no statics
- *	(2) takes a u_char* not an in_addr as input
- * author:
- *	Paul Vixie, 1996.
- */
-static const char *
-inet_ntop4(src, dst, size)
-	const u_char *src;
-	char *dst;
-	size_t size;
-{
-	static const char fmt[] = "%u.%u.%u.%u";
-	char tmp[sizeof "255.255.255.255"];
-
-	if (SPRINTF((tmp, fmt, src[0], src[1], src[2], src[3])) > size) {
-		errno = ENOSPC;
-		return (NULL);
-	}
-	strcpy(dst, tmp);
-	return (dst);
-}
-
-/* const char *
- * inet_ntop6(src, dst, size)
- *	convert IPv6 binary address into presentation (printable) format
- * author:
- *	Paul Vixie, 1996.
- */
-static const char *
-inet_ntop6(src, dst, size)
-	const u_char *src;
-	char *dst;
-	size_t size;
-{
-	/*
-	 * Note that int32_t and int16_t need only be "at least" large enough
-	 * to contain a value of the specified size.  On some systems, like
-	 * Crays, there is no such thing as an integer variable with 16 bits.
-	 * Keep this in mind if you think this function should have been coded
-	 * to use pointer overlays.  All the world's not a VAX.
-	 */
-	char tmp[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255"], *tp;
-	struct { int base, len; } best, cur;
-	u_int words[NS_IN6ADDRSZ / NS_INT16SZ];
-	int i;
-
-	/*
-	 * Preprocess:
-	 *	Copy the input (bytewise) array into a wordwise array.
-	 *	Find the longest run of 0x00's in src[] for :: shorthanding.
-	 */
-	memset(words, '\0', sizeof words);
-	for (i = 0; i < NS_IN6ADDRSZ; i++)
-		words[i / 2] |= (src[i] << ((1 - (i % 2)) << 3));
-	best.base = -1;
-	cur.base = -1;
-	for (i = 0; i < (NS_IN6ADDRSZ / NS_INT16SZ); i++) {
-		if (words[i] == 0) {
-			if (cur.base == -1)
-				cur.base = i, cur.len = 1;
-			else
-				cur.len++;
-		} else {
-			if (cur.base != -1) {
-				if (best.base == -1 || cur.len > best.len)
-					best = cur;
-				cur.base = -1;
-			}
-		}
-	}
-	if (cur.base != -1) {
-		if (best.base == -1 || cur.len > best.len)
-			best = cur;
-	}
-	if (best.base != -1 && best.len < 2)
-		best.base = -1;
-
-	/*
-	 * Format the result.
-	 */
-	tp = tmp;
-	for (i = 0; i < (NS_IN6ADDRSZ / NS_INT16SZ); i++) {
-		/* Are we inside the best run of 0x00's? */
-		if (best.base != -1 && i >= best.base &&
-		    i < (best.base + best.len)) {
-			if (i == best.base)
-				*tp++ = ':';
-			continue;
-		}
-		/* Are we following an initial run of 0x00s or any real hex? */
-		if (i != 0)
-			*tp++ = ':';
-		/* Is this address an encapsulated IPv4? */
-		if (i == 6 && best.base == 0 &&
-		    (best.len == 6 || (best.len == 5 && words[5] == 0xffff))) {
-			if (!inet_ntop4(src+12, tp, sizeof tmp - (tp - tmp)))
-				return (NULL);
-			tp += strlen(tp);
-			break;
-		}
-		tp += SPRINTF((tp, "%x", words[i]));
-	}
-	/* Was it a trailing run of 0x00's? */
-	if (best.base != -1 && (best.base + best.len) ==
-	    (NS_IN6ADDRSZ / NS_INT16SZ))
-		*tp++ = ':';
-	*tp++ = '\0';
-
-	/*
-	 * Check for overflow, copy, and we're done.
-	 */
-	if ((size_t)(tp - tmp) > size) {
-		errno = ENOSPC;
-		return (NULL);
-	}
-	strcpy(dst, tmp);
-	return (dst);
-}
diff --git a/c/src/exec/libnetworking/libc/inet_pton.c b/c/src/exec/libnetworking/libc/inet_pton.c
deleted file mode 100644
index 8d21111cfa..0000000000
--- a/c/src/exec/libnetworking/libc/inet_pton.c
+++ /dev/null
@@ -1,214 +0,0 @@
-/* Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$Id$";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-#include <string.h>
-#include <errno.h>
-
-/*
- * WARNING: Don't even consider trying to compile this on a system where
- * sizeof(int) < 4.  sizeof(int) > 4 is fine; all the world's not a VAX.
- */
-
-static int	inet_pton4 __P((const char *src, u_char *dst));
-static int	inet_pton6 __P((const char *src, u_char *dst));
-
-/* int
- * inet_pton(af, src, dst)
- *	convert from presentation format (which usually means ASCII printable)
- *	to network format (which is usually some kind of binary format).
- * return:
- *	1 if the address was valid for the specified address family
- *	0 if the address wasn't valid (`dst' is untouched in this case)
- *	-1 if some other error occurred (`dst' is untouched in this case, too)
- * author:
- *	Paul Vixie, 1996.
- */
-int
-inet_pton(af, src, dst)
-	int af;
-	const char *src;
-	void *dst;
-{
-	switch (af) {
-	case AF_INET:
-		return (inet_pton4(src, dst));
-	case AF_INET6:
-		return (inet_pton6(src, dst));
-	default:
-		errno = EAFNOSUPPORT;
-		return (-1);
-	}
-	/* NOTREACHED */
-}
-
-/* int
- * inet_pton4(src, dst)
- *	like inet_aton() but without all the hexadecimal and shorthand.
- * return:
- *	1 if `src' is a valid dotted quad, else 0.
- * notice:
- *	does not touch `dst' unless it's returning 1.
- * author:
- *	Paul Vixie, 1996.
- */
-static int
-inet_pton4(src, dst)
-	const char *src;
-	u_char *dst;
-{
-	static const char digits[] = "0123456789";
-	int saw_digit, octets, ch;
-	u_char tmp[NS_INADDRSZ], *tp;
-
-	saw_digit = 0;
-	octets = 0;
-	*(tp = tmp) = 0;
-	while ((ch = *src++) != '\0') {
-		const char *pch;
-
-		if ((pch = strchr(digits, ch)) != NULL) {
-			u_int new = *tp * 10 + (pch - digits);
-
-			if (new > 255)
-				return (0);
-			*tp = new;
-			if (! saw_digit) {
-				if (++octets > 4)
-					return (0);
-				saw_digit = 1;
-			}
-		} else if (ch == '.' && saw_digit) {
-			if (octets == 4)
-				return (0);
-			*++tp = 0;
-			saw_digit = 0;
-		} else
-			return (0);
-	}
-	if (octets < 4)
-		return (0);
-
-	memcpy(dst, tmp, NS_INADDRSZ);
-	return (1);
-}
-
-/* int
- * inet_pton6(src, dst)
- *	convert presentation level address to network order binary form.
- * return:
- *	1 if `src' is a valid [RFC1884 2.2] address, else 0.
- * notice:
- *	(1) does not touch `dst' unless it's returning 1.
- *	(2) :: in a full address is silently ignored.
- * credit:
- *	inspired by Mark Andrews.
- * author:
- *	Paul Vixie, 1996.
- */
-static int
-inet_pton6(src, dst)
-	const char *src;
-	u_char *dst;
-{
-	static const char xdigits_l[] = "0123456789abcdef",
-			  xdigits_u[] = "0123456789ABCDEF";
-	u_char tmp[NS_IN6ADDRSZ], *tp, *endp, *colonp;
-	const char *xdigits, *curtok;
-	int ch, saw_xdigit;
-	u_int val;
-
-	memset((tp = tmp), '\0', NS_IN6ADDRSZ);
-	endp = tp + NS_IN6ADDRSZ;
-	colonp = NULL;
-	/* Leading :: requires some special handling. */
-	if (*src == ':')
-		if (*++src != ':')
-			return (0);
-	curtok = src;
-	saw_xdigit = 0;
-	val = 0;
-	while ((ch = *src++) != '\0') {
-		const char *pch;
-
-		if ((pch = strchr((xdigits = xdigits_l), ch)) == NULL)
-			pch = strchr((xdigits = xdigits_u), ch);
-		if (pch != NULL) {
-			val <<= 4;
-			val |= (pch - xdigits);
-			if (val > 0xffff)
-				return (0);
-			saw_xdigit = 1;
-			continue;
-		}
-		if (ch == ':') {
-			curtok = src;
-			if (!saw_xdigit) {
-				if (colonp)
-					return (0);
-				colonp = tp;
-				continue;
-			}
-			if (tp + NS_INT16SZ > endp)
-				return (0);
-			*tp++ = (u_char) (val >> 8) & 0xff;
-			*tp++ = (u_char) val & 0xff;
-			saw_xdigit = 0;
-			val = 0;
-			continue;
-		}
-		if (ch == '.' && ((tp + NS_INADDRSZ) <= endp) &&
-		    inet_pton4(curtok, tp) > 0) {
-			tp += NS_INADDRSZ;
-			saw_xdigit = 0;
-			break;	/* '\0' was seen by inet_pton4(). */
-		}
-		return (0);
-	}
-	if (saw_xdigit) {
-		if (tp + NS_INT16SZ > endp)
-			return (0);
-		*tp++ = (u_char) (val >> 8) & 0xff;
-		*tp++ = (u_char) val & 0xff;
-	}
-	if (colonp != NULL) {
-		/*
-		 * Since some memmove()'s erroneously fail to handle
-		 * overlapping regions, we'll do the shift by hand.
-		 */
-		const int n = tp - colonp;
-		int i;
-
-		for (i = 1; i <= n; i++) {
-			endp[- i] = colonp[n - i];
-			colonp[n - i] = 0;
-		}
-		tp = endp;
-	}
-	if (tp != endp)
-		return (0);
-	memcpy(dst, tmp, NS_IN6ADDRSZ);
-	return (1);
-}
diff --git a/c/src/exec/libnetworking/libc/iso_addr.3 b/c/src/exec/libnetworking/libc/iso_addr.3
deleted file mode 100644
index 0c9973bef4..0000000000
--- a/c/src/exec/libnetworking/libc/iso_addr.3
+++ /dev/null
@@ -1,111 +0,0 @@
-.\" Copyright (c) 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"     @(#)iso_addr.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
-.\"
-.Dd June 4, 1993
-.Dt ISO_ADDR 3
-.Os
-.Sh NAME
-.Nm iso_addr ,
-.Nm iso_ntoa
-.Nd "elementary network address conversion routines for Open System Interconnection
-.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <netiso/iso.h>
-.Ft struct iso_addr *
-.Fn iso_addr "char *cp"
-.Ft char *
-.Fn iso_ntoa "struct iso_addr *isoa"
-.Sh DESCRIPTION
-The routine
-.Fn iso_addr
-interprets character strings representing
-.Tn OSI
-addresses, returning binary information suitable
-for use in system calls.
-The routine
-.Fn iso_ntoa
-takes
-.Tn OSI
-addresses and returns
-.Tn ASCII
-strings representing NSAPs (network service
-access points) in a
-notation inverse to that accepted by 
-.Fn iso_addr .
-.Pp
-Unfortunately, no universal standard exists for representing
-.Tn OSI
-network addresses.
-.Pp
-The format employed by
-.Fn iso_addr
-is a sequence of hexadecimal
-.Dq digits
-(optionally separated by periods),
-of the form:
-.Bd -filled -offset indent
-<hex digits>.<hex digits>.<hex digits>
-.Ed
-.Pp
-Each pair of hexadecimal digits represents a byte
-with the leading digit indicating the higher-ordered bits.
-A period following an even number of bytes has no
-effect (but may be used to increase legibility).
-A period following an odd number of bytes has the
-effect of causing the byte of address being translated
-to have its higher order bits filled with zeros.
-.Sh RETURN VALUES
-.Fn iso_ntoa
-always returns a null terminated string.
-.Fn iso_addr
-always returns a pointer to a struct iso_addr.
-(See
-.Sx BUGS . )
-.Sh SEE ALSO
-.Xr iso 4
-.Sh HISTORY
-The
-.Fn iso_addr
-and
-.Fn iso_ntoa
-functions appeared in 
-.Bx 4.3 Reno .
-.Sh BUGS
-The returned values
-reside in a static memory area.
-.Pp
-The function
-.Fn iso_addr
-should diagnose improperly formed input, and there should be an unambiguous
-way to recognize this.
diff --git a/c/src/exec/libnetworking/libc/iso_addr.c b/c/src/exec/libnetworking/libc/iso_addr.c
deleted file mode 100644
index eb14e8a72b..0000000000
--- a/c/src/exec/libnetworking/libc/iso_addr.c
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *  $Id$
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)iso_addr.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <netiso/iso.h>
-#include <string.h>
-
-/* States*/
-#define VIRGIN	0
-#define GOTONE	1
-#define GOTTWO	2
-/* Inputs */
-#define	DIGIT	(4*0)
-#define	END	(4*1)
-#define DELIM	(4*2)
-
-struct iso_addr *
-iso_addr(addr)
-	register const char *addr;
-{
-	static struct iso_addr out_addr;
-	register char *cp = out_addr.isoa_genaddr;
-	char *cplim = cp + sizeof(out_addr.isoa_genaddr);
-	register int byte = 0, state = VIRGIN, new;
-
-	bzero((char *)&out_addr, sizeof(out_addr));
-	do {
-		if ((*addr >= '0') && (*addr <= '9')) {
-			new = *addr - '0';
-		} else if ((*addr >= 'a') && (*addr <= 'f')) {
-			new = *addr - 'a' + 10;
-		} else if ((*addr >= 'A') && (*addr <= 'F')) {
-			new = *addr - 'A' + 10;
-		} else if (*addr == 0)
-			state |= END;
-		else
-			state |= DELIM;
-		addr++;
-		switch (state /* | INPUT */) {
-		case GOTTWO | DIGIT:
-			*cp++ = byte; /*FALLTHROUGH*/
-		case VIRGIN | DIGIT:
-			state = GOTONE; byte = new; continue;
-		case GOTONE | DIGIT:
-			state = GOTTWO; byte = new + (byte << 4); continue;
-		default: /* | DELIM */
-			state = VIRGIN; *cp++ = byte; byte = 0; continue;
-		case GOTONE | END:
-		case GOTTWO | END:
-			*cp++ = byte; /* FALLTHROUGH */
-		case VIRGIN | END:
-			break;
-		}
-		break;
-	} while (cp < cplim);
-	out_addr.isoa_len = cp - out_addr.isoa_genaddr;
-	return (&out_addr);
-}
-
-static char hexlist[] = "0123456789abcdef";
-
-char *
-iso_ntoa(isoa)
-	const struct iso_addr *isoa;
-{
-	static char tmpbuf[sizeof(isoa->isoa_genaddr)*3];
-	const u_char *binary;
-	char *cp;
-	int i;
-
-	binary = isoa->isoa_genaddr;
-	cp = tmpbuf;
-
-	for (i = 0; i < isoa->isoa_len; i++) {
-		*cp++ = hexlist[*binary >> 4];
-		*cp++ = hexlist[*binary++ & 0xf];
-
-		if ((((i % 2) == 0) && ((i + 1) < isoa->isoa_len)))
-			*cp++ = '.';
-	}
-	*cp = '\0';
-	return tmpbuf;
-}
diff --git a/c/src/exec/libnetworking/libc/linkaddr.3 b/c/src/exec/libnetworking/libc/linkaddr.3
deleted file mode 100644
index 6999add0e8..0000000000
--- a/c/src/exec/libnetworking/libc/linkaddr.3
+++ /dev/null
@@ -1,138 +0,0 @@
-.\" Copyright (c) 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Donn Seeley at BSDI.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"     From: @(#)linkaddr.3	8.1 (Berkeley) 7/28/93
-.\"	$Id$
-.\"
-.Dd June 17, 1996
-.Dt LINK_ADDR 3
-.Os BSD 4.4
-.Sh NAME
-.Nm link_addr ,
-.Nm link_ntoa
-.Nd elementary address specification routines for link level access
-.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/socket.h>
-.Fd #include <net/if_dl.h>
-.Ft void
-.Fn link_addr "const char *addr" "struct sockaddr_dl *sdl"
-.Ft char *
-.Fn link_ntoa "const struct sockaddr_dl *sdl"
-.Sh DESCRIPTION
-The routine
-.Fn link_addr
-interprets character strings representing
-link-level addresses, returning binary information suitable
-for use in system calls.
-The routine
-.Fn link_ntoa
-takes
-a link-level
-address and returns an
-.Tn ASCII
-string representing some of the information present,
-including the link level address itself, and the interface name
-or number, if present.
-This facility is experimental and is
-still subject to change.
-.Pp
-For
-.Fn link_addr ,
-the string
-.Fa addr
-may contain
-an optional network interface identifier of the form
-.Dq "name unit-number" ,
-suitable for the first argument to
-.Xr ifconfig 8 ,
-followed in all cases by a colon and
-an interface address in the form of
-groups of hexadecimal digits
-separated by periods.
-Each group represents a byte of address;
-address bytes are filled left to right from
-low order bytes through high order bytes.
-.Pp
-.\" A regular expression may make this format clearer:
-.\" .Bd -literal -offset indent
-.\" ([a-z]+[0-9]+:)?[0-9a-f]+(\e.[0-9a-f]+)*
-.\" .Ed
-.\" .Pp
-Thus
-.Li le0:8.0.9.13.d.30
-represents an ethernet address
-to be transmitted on the first Lance ethernet interface.
-.Pp
-The direct use of these functions is deprecated in favor of the
-.Xr addr2ascii 3
-interface; however, portable programs cannot rely on the latter as it is
-not yet widely implemented.
-.Sh RETURN VALUES
-.Fn link_ntoa
-always returns a null terminated string.
-.Fn link_addr
-has no return value.
-(See
-.Sx BUGS . )
-.Sh SEE ALSO
-.Xr addr2ascii 3
-.\" .Xr iso 4
-.Sh HISTORY
-The
-.Fn link_addr
-and
-.Fn link_ntoa
-functions appeared in 
-.Bx 4.3 Reno  .
-.Sh BUGS
-The returned values for link_ntoa
-reside in a static memory area.
-.Pp
-The function
-.Fn link_addr
-should diagnose improperly formed input, and there should be an unambiguous
-way to recognize this.
-.Pp
-If the
-.Va sdl_len
-field of the link socket address
-.Fa sdl
-is 0,
-.Fn link_ntoa
-will not insert a colon before the interface address bytes.
-If this translated address is given to
-.Fn link_addr
-without inserting an initial colon,
-the latter will not interpret it correctly.
diff --git a/c/src/exec/libnetworking/libc/linkaddr.c b/c/src/exec/libnetworking/libc/linkaddr.c
deleted file mode 100644
index 28c16cff05..0000000000
--- a/c/src/exec/libnetworking/libc/linkaddr.c
+++ /dev/null
@@ -1,160 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *  $Id$
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)linkaddr.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <net/if_dl.h>
-#include <string.h>
-
-/* States*/
-#define NAMING	0
-#define GOTONE	1
-#define GOTTWO	2
-#define RESET	3
-/* Inputs */
-#define	DIGIT	(4*0)
-#define	END	(4*1)
-#define DELIM	(4*2)
-#define LETTER	(4*3)
-
-void
-link_addr(addr, sdl)
-	register const char *addr;
-	register struct sockaddr_dl *sdl;
-{
-	register char *cp = sdl->sdl_data;
-	char *cplim = sdl->sdl_len + (char *)sdl;
-	register int byte = 0, state = NAMING, new;
-
-	bzero((char *)&sdl->sdl_family, sdl->sdl_len - 1);
-	sdl->sdl_family = AF_LINK;
-	do {
-		state &= ~LETTER;
-		if ((*addr >= '0') && (*addr <= '9')) {
-			new = *addr - '0';
-		} else if ((*addr >= 'a') && (*addr <= 'f')) {
-			new = *addr - 'a' + 10;
-		} else if ((*addr >= 'A') && (*addr <= 'F')) {
-			new = *addr - 'A' + 10;
-		} else if (*addr == 0) {
-			state |= END;
-		} else if (state == NAMING &&
-			   (((*addr >= 'A') && (*addr <= 'Z')) ||
-			   ((*addr >= 'a') && (*addr <= 'z'))))
-			state |= LETTER;
-		else
-			state |= DELIM;
-		addr++;
-		switch (state /* | INPUT */) {
-		case NAMING | DIGIT:
-		case NAMING | LETTER:
-			*cp++ = addr[-1];
-			continue;
-		case NAMING | DELIM:
-			state = RESET;
-			sdl->sdl_nlen = cp - sdl->sdl_data;
-			continue;
-		case GOTTWO | DIGIT:
-			*cp++ = byte;
-			/* FALLTHROUGH */
-		case RESET | DIGIT:
-			state = GOTONE;
-			byte = new;
-			continue;
-		case GOTONE | DIGIT:
-			state = GOTTWO;
-			byte = new + (byte << 4);
-			continue;
-		default: /* | DELIM */
-			state = RESET;
-			*cp++ = byte;
-			byte = 0;
-			continue;
-		case GOTONE | END:
-		case GOTTWO | END:
-			*cp++ = byte;
-			/* FALLTHROUGH */
-		case RESET | END:
-			break;
-		}
-		break;
-	} while (cp < cplim);
-	sdl->sdl_alen = cp - LLADDR(sdl);
-	new = cp - (char *)sdl;
-	if (new > sizeof(*sdl))
-		sdl->sdl_len = new;
-	return;
-}
-
-static char hexlist[] = "0123456789abcdef";
-
-char *
-link_ntoa(sdl)
-	register const struct sockaddr_dl *sdl;
-{
-	static char obuf[64];
-	register char *out = obuf;
-	register int i;
-	register u_char *in = (u_char *)LLADDR(sdl);
-	u_char *inlim = in + sdl->sdl_alen;
-	int firsttime = 1;
-
-	if (sdl->sdl_nlen) {
-		bcopy(sdl->sdl_data, obuf, sdl->sdl_nlen);
-		out += sdl->sdl_nlen;
-		if (sdl->sdl_alen)
-			*out++ = ':';
-	}
-	while (in < inlim) {
-		if (firsttime)
-			firsttime = 0;
-		else
-			*out++ = '.';
-		i = *in++;
-		if (i > 0xf) {
-			out[1] = hexlist[i & 0xf];
-			i >>= 4;
-			out[0] = hexlist[i];
-			out += 2;
-		} else
-			*out++ = hexlist[i];
-	}
-	*out = 0;
-	return (obuf);
-}
diff --git a/c/src/exec/libnetworking/libc/map_v4v6.c b/c/src/exec/libnetworking/libc/map_v4v6.c
deleted file mode 100644
index 0f8658e117..0000000000
--- a/c/src/exec/libnetworking/libc/map_v4v6.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * ++Copyright++ 1985, 1988, 1993
- * -
- * Copyright (c) 1985, 1988, 1993
- *    The Regents of the University of California.  All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- * 	This product includes software developed by the University of
- * 	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * -
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- * -
- * --Copyright--
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)gethostnamadr.c	8.1 (Berkeley) 6/4/93";
-static char rcsid[] = "$Id$";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-
-#include <stdio.h>
-#include <string.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <ctype.h>
-#include <errno.h>
-#include <syslog.h>
-
-typedef union {
-	int32_t al;
-	char ac;
-} align;
-
-void
-_map_v4v6_address(src, dst)
-	const char *src;
-	char *dst;
-{
-	u_char *p = (u_char *)dst;
-	char tmp[INADDRSZ];
-	int i;
-
-	/* Stash a temporary copy so our caller can update in place. */
-	bcopy(src, tmp, INADDRSZ);
-	/* Mark this ipv6 addr as a mapped ipv4. */
-	for (i = 0; i < 10; i++)
-		*p++ = 0x00;
-	*p++ = 0xff;
-	*p++ = 0xff;
-	/* Retrieve the saved copy and we're done. */
-	bcopy(tmp, (void*)p, INADDRSZ);
-}
-
-void
-_map_v4v6_hostent(hp, bpp, lenp)
-	struct hostent *hp;
-	char **bpp;
-	int *lenp;
-{
-	char **ap;
-
-	if (hp->h_addrtype != AF_INET || hp->h_length != INADDRSZ)
-		return;
-	hp->h_addrtype = AF_INET6;
-	hp->h_length = IN6ADDRSZ;
-	for (ap = hp->h_addr_list; *ap; ap++) {
-		int i = sizeof(align) - ((u_long)*bpp % sizeof(align));
-
-		if (*lenp < (i + IN6ADDRSZ)) {
-			/* Out of memory.  Truncate address list here.  XXX */
-			*ap = NULL;
-			return;
-		}
-		*bpp += i;
-		*lenp -= i;
-		_map_v4v6_address(*ap, *bpp);
-		*ap = *bpp;
-		*bpp += IN6ADDRSZ;
-		*lenp -= IN6ADDRSZ;
-	}
-}
diff --git a/c/src/exec/libnetworking/libc/ns.3 b/c/src/exec/libnetworking/libc/ns.3
deleted file mode 100644
index e621ad2d90..0000000000
--- a/c/src/exec/libnetworking/libc/ns.3
+++ /dev/null
@@ -1,131 +0,0 @@
-.\" Copyright (c) 1986, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"     @(#)ns.3	8.1 (Berkeley) 6/4/93
-.\"	$Id$
-.\"
-.Dd June 4, 1993
-.Dt NS 3
-.Os BSD 4.3
-.Sh NAME
-.Nm ns_addr ,
-.Nm ns_ntoa
-.Nd Xerox
-.Tn NS Ns (tm)
-address conversion routines
-.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <netns/ns.h>
-.Ft struct ns_addr 
-.Fn ns_addr "char *cp"
-.Ft char *
-.Fn ns_ntoa "struct ns_addr ns"
-.Sh DESCRIPTION
-The routine
-.Fn ns_addr
-interprets character strings representing
-.Tn XNS
-addresses, returning binary information suitable
-for use in system calls.
-The routine
-.Fn ns_ntoa
-takes
-.Tn XNS
-addresses and returns
-.Tn ASCII
-strings representing the address in a
-notation in common use in the Xerox Development Environment:
-.Bd -filled -offset indent
-<network number>.<host number>.<port number>
-.Ed
-.Pp
-Trailing zero fields are suppressed, and each number is printed in hexadecimal,
-in a format suitable for input to 
-.Fn ns_addr .
-Any fields lacking super-decimal digits will have a
-trailing
-.Ql H
-appended.
-.Pp
-Unfortunately, no universal standard exists for representing
-.Tn XNS
-addresses.
-An effort has been made to insure that
-.Fn ns_addr
-be compatible with most formats in common use.
-It will first separate an address into 1 to 3 fields using a single delimiter
-chosen from
-period
-.Ql \&. ,
-colon
-.Ql \&:
-or pound-sign
-.Ql \&# .
-Each field is then examined for byte separators (colon or period).
-If there are byte separators, each subfield separated is taken to be
-a small hexadecimal number, and the entirety is taken as a network-byte-ordered
-quantity to be zero extended in the high-network-order bytes.
-Next, the field is inspected for hyphens, in which case
-the field is assumed to be a number in decimal notation
-with hyphens separating the millenia.
-Next, the field is assumed to be a number:
-It is interpreted
-as hexadecimal if there is a leading
-.Ql 0x
-(as in C),
-a trailing
-.Ql H
-(as in Mesa), or there are any super-decimal digits present.
-It is interpreted as octal is there is a leading
-.Ql 0
-and there are no super-octal digits.
-Otherwise, it is converted as a decimal number.
-.Sh RETURN VALUES
-None. (See
-.Sx BUGS . )
-.Sh SEE ALSO
-.Xr hosts 5 ,
-.Xr networks 5
-.Sh HISTORY
-The
-.Fn ns_addr
-and
-.Fn ns_toa
-functions appeared in 
-.Bx 4.3 .
-.Sh BUGS
-The string returned by
-.Fn ns_ntoa
-resides in a static memory area.
-The function
-.Fn ns_addr
-should diagnose improperly formed input, and there should be an unambiguous
-way to recognize this.
diff --git a/c/src/exec/libnetworking/libc/ns_addr.c b/c/src/exec/libnetworking/libc/ns_addr.c
deleted file mode 100644
index 18fabe91f1..0000000000
--- a/c/src/exec/libnetworking/libc/ns_addr.c
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
- * Copyright (c) 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * J.Q. Johnson.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *  $Id$
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)ns_addr.c	8.1 (Berkeley) 6/7/93";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/param.h>
-#include <netns/ns.h>
-#include <stdio.h>
-#include <string.h>
-
-static struct ns_addr addr, zero_addr;
-
-static void Field(), cvtbase();
-
-struct ns_addr
-ns_addr(name)
-	const char *name;
-{
-	char separator;
-	char *hostname, *socketname, *cp;
-	char buf[50];
-
-	(void)strncpy(buf, name, sizeof(buf) - 1);
-	buf[sizeof(buf) - 1] = '\0';
-
-	/*
-	 * First, figure out what he intends as a field separtor.
-	 * Despite the way this routine is written, the prefered
-	 * form  2-272.AA001234H.01777, i.e. XDE standard.
-	 * Great efforts are made to insure backward compatability.
-	 */
-	if ((hostname = strchr(buf, '#')) != NULL)
-		separator = '#';
-	else {
-		hostname = strchr(buf, '.');
-		if ((cp = strchr(buf, ':')) &&
-		    ((hostname && cp < hostname) || (hostname == 0))) {
-			hostname = cp;
-			separator = ':';
-		} else
-			separator = '.';
-	}
-	if (hostname)
-		*hostname++ = 0;
-
-	addr = zero_addr;
-	Field(buf, addr.x_net.c_net, 4);
-	if (hostname == 0)
-		return (addr);  /* No separator means net only */
-
-	socketname = strchr(hostname, separator);
-	if (socketname) {
-		*socketname++ = 0;
-		Field(socketname, (u_char *)&addr.x_port, 2);
-	}
-
-	Field(hostname, addr.x_host.c_host, 6);
-
-	return (addr);
-}
-
-static void
-Field(buf, out, len)
-	char *buf;
-	u_char *out;
-	int len;
-{
-	register char *bp = buf;
-	int i, ibase, base16 = 0, base10 = 0, clen = 0;
-	int hb[6], *hp;
-	char *fmt;
-
-	/*
-	 * first try 2-273#2-852-151-014#socket
-	 */
-	if ((*buf != '-') &&
-	    (1 < (i = sscanf(buf, "%d-%d-%d-%d-%d",
-			&hb[0], &hb[1], &hb[2], &hb[3], &hb[4])))) {
-		cvtbase(1000L, 256, hb, i, out, len);
-		return;
-	}
-	/*
-	 * try form 8E1#0.0.AA.0.5E.E6#socket
-	 */
-	if (1 < (i = sscanf(buf,"%x.%x.%x.%x.%x.%x",
-			&hb[0], &hb[1], &hb[2], &hb[3], &hb[4], &hb[5]))) {
-		cvtbase(256L, 256, hb, i, out, len);
-		return;
-	}
-	/*
-	 * try form 8E1#0:0:AA:0:5E:E6#socket
-	 */
-	if (1 < (i = sscanf(buf,"%x:%x:%x:%x:%x:%x",
-			&hb[0], &hb[1], &hb[2], &hb[3], &hb[4], &hb[5]))) {
-		cvtbase(256L, 256, hb, i, out, len);
-		return;
-	}
-	/*
-	 * This is REALLY stretching it but there was a
-	 * comma notation separting shorts -- definitely non standard
-	 */
-	if (1 < (i = sscanf(buf,"%x,%x,%x",
-			&hb[0], &hb[1], &hb[2]))) {
-		hb[0] = htons(hb[0]); hb[1] = htons(hb[1]);
-		hb[2] = htons(hb[2]);
-		cvtbase(65536L, 256, hb, i, out, len);
-		return;
-	}
-
-	/* Need to decide if base 10, 16 or 8 */
-	while (*bp) switch (*bp++) {
-
-	case '0': case '1': case '2': case '3': case '4': case '5':
-	case '6': case '7': case '-':
-		break;
-
-	case '8': case '9':
-		base10 = 1;
-		break;
-
-	case 'a': case 'b': case 'c': case 'd': case 'e': case 'f':
-	case 'A': case 'B': case 'C': case 'D': case 'E': case 'F':
-		base16 = 1;
-		break;
-
-	case 'x': case 'X':
-		*--bp = '0';
-		base16 = 1;
-		break;
-
-	case 'h': case 'H':
-		base16 = 1;
-		/* fall into */
-
-	default:
-		*--bp = 0; /* Ends Loop */
-	}
-	if (base16) {
-		fmt = "%3x";
-		ibase = 4096;
-	} else if (base10 == 0 && *buf == '0') {
-		fmt = "%3o";
-		ibase = 512;
-	} else {
-		fmt = "%3d";
-		ibase = 1000;
-	}
-
-	for (bp = buf; *bp++; ) clen++;
-	if (clen == 0) clen++;
-	if (clen > 18) clen = 18;
-	i = ((clen - 1) / 3) + 1;
-	bp = clen + buf - 3;
-	hp = hb + i - 1;
-
-	while (hp > hb) {
-		(void)sscanf(bp, fmt, hp);
-		bp[0] = 0;
-		hp--;
-		bp -= 3;
-	}
-	(void)sscanf(buf, fmt, hp);
-	cvtbase((long)ibase, 256, hb, i, out, len);
-}
-
-static void
-cvtbase(oldbase,newbase,input,inlen,result,reslen)
-	long oldbase;
-	int newbase;
-	int input[];
-	int inlen;
-	unsigned char result[];
-	int reslen;
-{
-	int d, e;
-	long sum;
-
-	e = 1;
-	while (e > 0 && reslen > 0) {
-		d = 0; e = 0; sum = 0;
-		/* long division: input=input/newbase */
-		while (d < inlen) {
-			sum = sum*oldbase + (long) input[d];
-			e += (sum > 0);
-			input[d++] = sum / newbase;
-			sum %= newbase;
-		}
-		result[--reslen] = sum;	/* accumulate remainder */
-	}
-	for (d=0; d < reslen; d++)
-		result[d] = 0;
-}
diff --git a/c/src/exec/libnetworking/libc/ns_name.c b/c/src/exec/libnetworking/libc/ns_name.c
deleted file mode 100644
index af10d2f062..0000000000
--- a/c/src/exec/libnetworking/libc/ns_name.c
+++ /dev/null
@@ -1,595 +0,0 @@
-/*
- * Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#if !defined(__rtems__)
-#if !defined(LINT) && !defined(CODECENTER)
-static char rcsid[] = "$Id$";
-#endif /* not lint */
-#endif /* not rtems */
-
-#include <sys/types.h>
-
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-
-#include <errno.h>
-#include <resolv.h>
-#include <string.h>
-
-/* Data. */
-
-static char		digits[] = "0123456789";
-
-/* Forward. */
-
-static int		special(int);
-static int		printable(int);
-static int		dn_find(const u_char *, const u_char *,
-				const u_char * const *,
-				const u_char * const *);
-
-/* Public. */
-
-/*
- * ns_name_ntop(src, dst, dstsiz)
- *	Convert an encoded domain name to printable ascii as per RFC1035.
- * return:
- *	Number of bytes written to buffer, or -1 (with errno set)
- * notes:
- *	The root is returned as "."
- *	All other domains are returned in non absolute form
- */
-int
-ns_name_ntop(const u_char *src, char *dst, size_t dstsiz) {
-	const u_char *cp;
-	char *dn, *eom;
-	u_char c;
-	u_int n;
-
-	cp = src;
-	dn = dst;
-	eom = dst + dstsiz;
-
-	while ((n = *cp++) != 0) {
-		if ((n & NS_CMPRSFLGS) != 0) {
-			/* Some kind of compression pointer. */
-			errno = EMSGSIZE;
-			return (-1);
-		}
-		if (dn != dst) {
-			if (dn >= eom) {
-				errno = EMSGSIZE;
-				return (-1);
-			}
-			*dn++ = '.';
-		}
-		if (dn + n >= eom) {
-			errno = EMSGSIZE;
-			return (-1);
-		}
-		for ((void)NULL; n > 0; n--) {
-			c = *cp++;
-			if (special(c)) {
-				if (dn + 1 >= eom) {
-					errno = EMSGSIZE;
-					return (-1);
-				}
-				*dn++ = '\\';
-				*dn++ = (char)c;
-			} else if (!printable(c)) {
-				if (dn + 3 >= eom) {
-					errno = EMSGSIZE;
-					return (-1);
-				}
-				*dn++ = '\\';
-				*dn++ = digits[c / 100];
-				*dn++ = digits[(c % 100) / 10];
-				*dn++ = digits[c % 10];
-			} else {
-				if (dn >= eom) {
-					errno = EMSGSIZE;
-					return (-1);
-				}
-				*dn++ = (char)c;
-			}
-		}
-	}
-	if (dn == dst) {
-		if (dn >= eom) {
-			errno = EMSGSIZE;
-			return (-1);
-		}
-		*dn++ = '.';
-	}
-	if (dn >= eom) {
-		errno = EMSGSIZE;
-		return (-1);
-	}
-	*dn++ = '\0';
-	return (dn - dst);
-}
-
-/*
- * ns_name_pton(src, dst, dstsiz)
- *	Convert a ascii string into an encoded domain name as per RFC1035.
- * return:
- *	-1 if it fails
- *	1 if string was fully qualified
- *	0 is string was not fully qualified
- * notes:
- *	Enforces label and domain length limits.
- */
-
-int
-ns_name_pton(const char *src, u_char *dst, size_t dstsiz) {
-	u_char *label, *bp, *eom;
-	int c, n, escaped;
-	char *cp;
-
-	escaped = 0;
-	bp = dst;
-	eom = dst + dstsiz;
-	label = bp++;
-
-	while ((c = *src++) != 0) {
-		if (escaped) {
-			if ((cp = strchr(digits, c)) != NULL) {
-				n = (cp - digits) * 100;
-				if ((c = *src++) == 0 ||
-				    (cp = strchr(digits, c)) == NULL) {
-					errno = EMSGSIZE;
-					return (-1);
-				}
-				n += (cp - digits) * 10;
-				if ((c = *src++) == 0 ||
-				    (cp = strchr(digits, c)) == NULL) {
-					errno = EMSGSIZE;
-					return (-1);
-				}
-				n += (cp - digits);
-				if (n > 255) {
-					errno = EMSGSIZE;
-					return (-1);
-				}
-				c = n;
-			}
-			escaped = 0;
-		} else if (c == '\\') {
-			escaped = 1;
-			continue;
-		} else if (c == '.') {
-			c = (bp - label - 1);
-			if ((c & NS_CMPRSFLGS) != 0) {	/* Label too big. */
-				errno = EMSGSIZE;
-				return (-1);
-			}
-			if (label >= eom) {
-				errno = EMSGSIZE;
-				return (-1);
-			}
-			*label = c;
-			/* Fully qualified ? */
-			if (*src == '\0') {
-				if (c != 0) {
-					if (bp >= eom) {
-						errno = EMSGSIZE;
-						return (-1);
-					}
-					*bp++ = '\0';
-				}
-				if ((bp - dst) > MAXCDNAME) {
-					errno = EMSGSIZE;
-					return (-1);
-				}
-				return (1);
-			}
-			if (c == 0) {
-				errno = EMSGSIZE;
-				return (-1);
-			}
-			label = bp++;
-			continue;
-		}
-		if (bp >= eom) {
-			errno = EMSGSIZE;
-			return (-1);
-		}
-		*bp++ = (u_char)c;
-	}
-	c = (bp - label - 1);
-	if ((c & NS_CMPRSFLGS) != 0) {		/* Label too big. */
-		errno = EMSGSIZE;
-		return (-1);
-	}
-	if (label >= eom) {
-		errno = EMSGSIZE;
-		return (-1);
-	}
-	*label = c;
-	if (c != 0) {
-		if (bp >= eom) {
-			errno = EMSGSIZE;
-			return (-1);
-		}
-		*bp++ = 0;
-	}
-	if ((bp - dst) > MAXCDNAME) {	/* src too big */
-		errno = EMSGSIZE;
-		return (-1);
-	}
-	return (0);
-}
-
-/*
- * ns_name_unpack(msg, eom, src, dst, dstsiz)
- *	Unpack a domain name from a message, source may be compressed.
- * return:
- *	-1 if it fails, or consumed octets if it succeeds.
- */
-int
-ns_name_unpack(const u_char *msg, const u_char *eom, const u_char *src,
-	       u_char *dst, size_t dstsiz)
-{
-	const u_char *srcp, *dstlim;
-	u_char *dstp;
-	int n, len, checked;
-
-	len = -1;
-	checked = 0;
-	dstp = dst;
-	srcp = src;
-	dstlim = dst + dstsiz;
-	if (srcp < msg || srcp >= eom) {
-		errno = EMSGSIZE;
-		return (-1);
-	}
-	/* Fetch next label in domain name. */
-	while ((n = *srcp++) != 0) {
-		/* Check for indirection. */
-		switch (n & NS_CMPRSFLGS) {
-		case 0:
-			/* Limit checks. */
-			if (dstp + n + 1 >= dstlim || srcp + n >= eom) {
-				errno = EMSGSIZE;
-				return (-1);
-			}
-			checked += n + 1;
-			*dstp++ = n;
-			memcpy(dstp, srcp, n);
-			dstp += n;
-			srcp += n;
-			break;
-
-		case NS_CMPRSFLGS:
-			if (srcp >= eom) {
-				errno = EMSGSIZE;
-				return (-1);
-			}
-			if (len < 0)
-				len = srcp - src + 1;
-			srcp = msg + (((n & 0x3f) << 8) | (*srcp & 0xff));
-			if (srcp < msg || srcp >= eom) {  /* Out of range. */
-				errno = EMSGSIZE;
-				return (-1);
-			}
-			checked += 2;
-			/*
-			 * Check for loops in the compressed name;
-			 * if we've looked at the whole message,
-			 * there must be a loop.
-			 */
-			if (checked >= eom - msg) {
-				errno = EMSGSIZE;
-				return (-1);
-			}
-			break;
-
-		default:
-			errno = EMSGSIZE;
-			return (-1);			/* flag error */
-		}
-	}
-	*dstp = '\0';
-	if (len < 0)
-		len = srcp - src;
-	return (len);
-}
-
-/*
- * ns_name_pack(src, dst, dstsiz, dnptrs, lastdnptr)
- *	Pack domain name 'domain' into 'comp_dn'.
- * return:
- *	Size of the compressed name, or -1.
- * notes:
- *	'dnptrs' is an array of pointers to previous compressed names.
- *	dnptrs[0] is a pointer to the beginning of the message. The array
- *	ends with NULL.
- *	'lastdnptr' is a pointer to the end of the array pointed to
- *	by 'dnptrs'.
- * Side effects:
- *	The list of pointers in dnptrs is updated for labels inserted into
- *	the message as we compress the name.  If 'dnptr' is NULL, we don't
- *	try to compress names. If 'lastdnptr' is NULL, we don't update the
- *	list.
- */
-int
-ns_name_pack(const u_char *src, u_char *dst, int dstsiz,
-	     const u_char **dnptrs, const u_char **lastdnptr)
-{
-	u_char *dstp;
-	const u_char **cpp, **lpp, *eob, *msg;
-	const u_char *srcp;
-	int n, l;
-
-	srcp = src;
-	dstp = dst;
-	eob = dstp + dstsiz;
-	lpp = cpp = NULL;
-	if (dnptrs != NULL) {
-		if ((msg = *dnptrs++) != NULL) {
-			for (cpp = dnptrs; *cpp != NULL; cpp++)
-				(void)NULL;
-			lpp = cpp;	/* end of list to search */
-		}
-	} else
-		msg = NULL;
-
-	/* make sure the domain we are about to add is legal */
-	l = 0;
-	do {
-		n = *srcp;
-		if ((n & NS_CMPRSFLGS) != 0) {
-			errno = EMSGSIZE;
-			return (-1);
-		}
-		l += n + 1;
-		if (l > MAXCDNAME) {
-			errno = EMSGSIZE;
-			return (-1);
-		}
-		srcp += n + 1;
-	} while (n != 0);
-
-	srcp = src;
-	do {
-		/* Look to see if we can use pointers. */
-		n = *srcp;
-		if (n != 0 && msg != NULL) {
-			l = dn_find(srcp, msg, (const u_char * const *)dnptrs,
-				    (const u_char * const *)lpp);
-			if (l >= 0) {
-				if (dstp + 1 >= eob) {
-					errno = EMSGSIZE;
-					return (-1);
-				}
-				*dstp++ = (l >> 8) | NS_CMPRSFLGS;
-				*dstp++ = l % 256;
-				return (dstp - dst);
-			}
-			/* Not found, save it. */
-			if (lastdnptr != NULL && cpp < lastdnptr - 1 &&
-			    (dstp - msg) < 0x4000) {
-				*cpp++ = dstp;
-				*cpp = NULL;
-			}
-		}
-		/* copy label to buffer */
-		if (n & NS_CMPRSFLGS) {		/* Should not happen. */
-			errno = EMSGSIZE;
-			return (-1);
-		}
-		if (dstp + 1 + n >= eob) {
-			errno = EMSGSIZE;
-			return (-1);
-		}
-		memcpy(dstp, srcp, n + 1);
-		srcp += n + 1;
-		dstp += n + 1;
-	} while (n != 0);
-
-	if (dstp > eob) {
-		if (msg != NULL)
-			*lpp = NULL;
-		errno = EMSGSIZE;
-		return (-1);
-	} 
-	return (dstp - dst);
-}
-
-/*
- * ns_name_uncompress(msg, eom, src, dst, dstsiz)
- *	Expand compressed domain name to presentation format.
- * return:
- *	Number of bytes read out of `src', or -1 (with errno set).
- * note:
- *	Root domain returns as "." not "".
- */
-int
-ns_name_uncompress(const u_char *msg, const u_char *eom, const u_char *src,
-		   char *dst, size_t dstsiz)
-{
-	u_char tmp[NS_MAXCDNAME];
-	int n;
-	
-	if ((n = ns_name_unpack(msg, eom, src, tmp, sizeof tmp)) == -1)
-		return (-1);
-	if (ns_name_ntop(tmp, dst, dstsiz) == -1)
-		return (-1);
-	return (n);
-}
-
-/*
- * ns_name_compress(src, dst, dstsiz, dnptrs, lastdnptr)
- *	Compress a domain name into wire format, using compression pointers.
- * return:
- *	Number of bytes consumed in `dst' or -1 (with errno set).
- * notes:
- *	'dnptrs' is an array of pointers to previous compressed names.
- *	dnptrs[0] is a pointer to the beginning of the message.
- *	The list ends with NULL.  'lastdnptr' is a pointer to the end of the
- *	array pointed to by 'dnptrs'. Side effect is to update the list of
- *	pointers for labels inserted into the message as we compress the name.
- *	If 'dnptr' is NULL, we don't try to compress names. If 'lastdnptr'
- *	is NULL, we don't update the list.
- */
-int
-ns_name_compress(const char *src, u_char *dst, size_t dstsiz,
-		 const u_char **dnptrs, const u_char **lastdnptr)
-{
-	u_char tmp[NS_MAXCDNAME];
-
-	if (ns_name_pton(src, tmp, sizeof tmp) == -1)
-		return (-1);
-	return (ns_name_pack(tmp, dst, dstsiz, dnptrs, lastdnptr));
-}
-
-/*
- * ns_name_skip(ptrptr, eom)
- *	Advance *ptrptr to skip over the compressed name it points at.
- * return:
- *	0 on success, -1 (with errno set) on failure.
- */
-int
-ns_name_skip(const u_char **ptrptr, const u_char *eom) {
-	const u_char *cp;
-	u_int n;
-
-	cp = *ptrptr;
-	while (cp < eom && (n = *cp++) != 0) {
-		/* Check for indirection. */
-		switch (n & NS_CMPRSFLGS) {
-		case 0:			/* normal case, n == len */
-			cp += n;
-			continue;
-		case NS_CMPRSFLGS:	/* indirection */
-			cp++;
-			break;
-		default:		/* illegal type */
-			errno = EMSGSIZE;
-			return (-1);
-		}
-		break;
-	}
-	if (cp > eom) {
-		errno = EMSGSIZE;
-		return (-1);
-	}
-	*ptrptr = cp;
-	return (0);
-}
-
-/* Private. */
-
-/*
- * special(ch)
- *	Thinking in noninternationalized USASCII (per the DNS spec),
- *	is this characted special ("in need of quoting") ?
- * return:
- *	boolean.
- */
-static int
-special(int ch) {
-	switch (ch) {
-	case 0x22: /* '"' */
-	case 0x2E: /* '.' */
-	case 0x3B: /* ';' */
-	case 0x5C: /* '\\' */
-	/* Special modifiers in zone files. */
-	case 0x40: /* '@' */
-	case 0x24: /* '$' */
-		return (1);
-	default:
-		return (0);
-	}
-}
-
-/*
- * printable(ch)
- *	Thinking in noninternationalized USASCII (per the DNS spec),
- *	is this character visible and not a space when printed ?
- * return:
- *	boolean.
- */
-static int
-printable(int ch) {
-	return (ch > 0x20 && ch < 0x7f);
-}
-
-/*
- *	Thinking in noninternationalized USASCII (per the DNS spec),
- *	convert this character to lower case if it's upper case.
- */
-static int
-mklower(int ch) {
-	if (ch >= 0x41 && ch <= 0x5A)
-		return (ch + 0x20);
-	return (ch);
-}
-
-/*
- * dn_find(domain, msg, dnptrs, lastdnptr)
- *	Search for the counted-label name in an array of compressed names.
- * return:
- *	offset from msg if found, or -1.
- * notes:
- *	dnptrs is the pointer to the first name on the list,
- *	not the pointer to the start of the message.
- */
-static int
-dn_find(const u_char *domain, const u_char *msg,
-	const u_char * const *dnptrs,
-	const u_char * const *lastdnptr)
-{
-	const u_char *dn, *cp, *sp;
-	const u_char * const *cpp;
-	u_int n;
-
-	for (cpp = dnptrs; cpp < lastdnptr; cpp++) {
-		dn = domain;
-		sp = cp = *cpp;
-		while ((n = *cp++) != 0) {
-			/*
-			 * check for indirection
-			 */
-			switch (n & NS_CMPRSFLGS) {
-			case 0:			/* normal case, n == len */
-				if (n != *dn++)
-					goto next;
-				for ((void)NULL; n > 0; n--)
-					if (mklower(*dn++) != mklower(*cp++))
-						goto next;
-				/* Is next root for both ? */
-				if (*dn == '\0' && *cp == '\0')
-					return (sp - msg);
-				if (*dn)
-					continue;
-				goto next;
-
-			case NS_CMPRSFLGS:	/* indirection */
-				cp = msg + (((n & 0x3f) << 8) | *cp);
-				break;
-
-			default:	/* illegal type */
-				errno = EMSGSIZE;
-				return (-1);
-			}
-		}
- next: ;
-	}
-	errno = ENOENT;
-	return (-1);
-}
diff --git a/c/src/exec/libnetworking/libc/ns_netint.c b/c/src/exec/libnetworking/libc/ns_netint.c
deleted file mode 100644
index 3c09da8f8c..0000000000
--- a/c/src/exec/libnetworking/libc/ns_netint.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#if !defined(__rtems__)
-#if !defined(LINT) && !defined(CODECENTER)
-static char rcsid[] = "$Id$";
-#endif /* not lint */
-#endif /* not rtems */
-
-/* Import. */
-
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-
-u_int
-ns_get16(const u_char *src) {
-	u_int dst;
-
-	NS_GET16(dst, src);
-	return (dst);
-}
-
-u_long
-ns_get32(const u_char *src) {
-	u_long dst;
-
-	NS_GET32(dst, src);
-	return (dst);
-}
-
-void
-ns_put16(u_int src, u_char *dst) {
-	NS_PUT16(src, dst);
-}
-
-void
-ns_put32(u_long src, u_char *dst) {
-	NS_PUT32(src, dst);
-}
diff --git a/c/src/exec/libnetworking/libc/ns_ntoa.c b/c/src/exec/libnetworking/libc/ns_ntoa.c
deleted file mode 100644
index 9d0be2e1dc..0000000000
--- a/c/src/exec/libnetworking/libc/ns_ntoa.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright (c) 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *  $Id$
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)ns_ntoa.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/param.h>
-#include <netns/ns.h>
-#include <stdio.h>
-
-char *
-ns_ntoa(addr)
-	struct ns_addr addr;
-{
-	static char obuf[40];
-	union { union ns_net net_e; u_long long_e; } net;
-	u_short port = htons(addr.x_port);
-	register char *cp;
-	char *cp2;
-	register u_char *up = addr.x_host.c_host;
-	u_char *uplim = up + 6;
-	static char *spectHex();
-
-	net.net_e = addr.x_net;
-	sprintf(obuf, "%lx", (u_long)ntohl(net.long_e));
-	cp = spectHex(obuf);
-	cp2 = cp + 1;
-	while (*up==0 && up < uplim) up++;
-	if (up == uplim) {
-		if (port) {
-			sprintf(cp, ".0");
-			cp += 2;
-		}
-	} else {
-		sprintf(cp, ".%x", *up++);
-		while (up < uplim) {
-			while (*cp) cp++;
-			sprintf(cp, "%02x", *up++);
-		}
-		cp = spectHex(cp2);
-	}
-	if (port) {
-		sprintf(cp, ".%x", port);
-		spectHex(cp + 1);
-	}
-	return (obuf);
-}
-
-static char *
-spectHex(p0)
-	char *p0;
-{
-	int ok = 0;
-	int nonzero = 0;
-	register char *p = p0;
-	for (; *p; p++) switch (*p) {
-
-	case 'a': case 'b': case 'c': case 'd': case 'e': case 'f':
-		*p += ('A' - 'a');
-		/* fall into . . . */
-	case 'A': case 'B': case 'C': case 'D': case 'E': case 'F':
-		ok = 1;
-	case '1': case '2': case '3': case '4': case '5':
-	case '6': case '7': case '8': case '9':
-		nonzero = 1;
-	}
-	if (nonzero && !ok) { *p++ = 'H'; *p = 0; }
-	return (p);
-}
diff --git a/c/src/exec/libnetworking/libc/ns_parse.c b/c/src/exec/libnetworking/libc/ns_parse.c
deleted file mode 100644
index cc1f070156..0000000000
--- a/c/src/exec/libnetworking/libc/ns_parse.c
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- * Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#if !defined(__rtems__)
-#if !defined(LINT) && !defined(CODECENTER)
-static char rcsid[] = "$Id$";
-#endif /* not lint */
-#endif /* not rtems */
-
-#include <sys/types.h>
-
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-
-#include <errno.h>
-#include <resolv.h>
-#include <string.h>
-
-/* These need to be in the same order as the nres.h:ns_flag enum. */
-struct _ns_flagdata _ns_flagdata[16] = {
-	{ 0x8000, 15 },		/* qr. */
-	{ 0x7800, 11 },		/* opcode. */
-	{ 0x0400, 10 },		/* aa. */
-	{ 0x0200, 9 },		/* tc. */
-	{ 0x0100, 8 },		/* rd. */
-	{ 0x0080, 7 },		/* ra. */
-	{ 0x0040, 6 },		/* z. */
-	{ 0x0020, 5 },		/* ad. */
-	{ 0x0010, 4 },		/* cd. */
-	{ 0x000f, 0 },		/* rcode. */
-	{ 0x0000, 0 },		/* expansion (1/6). */
-	{ 0x0000, 0 },		/* expansion (2/6). */
-	{ 0x0000, 0 },		/* expansion (3/6). */
-	{ 0x0000, 0 },		/* expansion (4/6). */
-	{ 0x0000, 0 },		/* expansion (5/6). */
-	{ 0x0000, 0 },		/* expansion (6/6). */
-};
-
-static int
-skiprr(const u_char *ptr, const u_char *eom, ns_sect section, int count) {
-	const u_char *optr = ptr;
-
-	for ((void)NULL; count > 0; count--) {
-		int b, rdlength;
-
-		b = dn_skipname(ptr, eom);
-		if (b < 0)
-			goto emsgsize;
-		ptr += b/*Name*/ + NS_INT16SZ/*Type*/ + NS_INT16SZ/*Class*/;
-		if (section != ns_s_qd) {
-			if (ptr + NS_INT32SZ > eom)
-				goto emsgsize;
-			ptr += NS_INT32SZ/*TTL*/;
-			if (ptr + NS_INT16SZ > eom)
-				goto emsgsize;
-			NS_GET16(rdlength, ptr);
-			ptr += rdlength/*RData*/;
-		}
-	}
-	if (ptr > eom)
-		goto emsgsize;
-	return (ptr - optr);
- emsgsize:
-	errno = EMSGSIZE;
-	return (-1);
-}
-
-int
-ns_initparse(const u_char *msg, int msglen, ns_msg *handle) {
-	const u_char *eom = msg + msglen;
-	int i;
-
-	memset(handle, 0x5e, sizeof *handle);
-	handle->_msg = msg;
-	handle->_eom = eom;
-	if (msg + NS_INT16SZ > eom)
-		goto emsgsize;
-	NS_GET16(handle->_id, msg);
-	if (msg + NS_INT16SZ > eom)
-		goto emsgsize;
-	NS_GET16(handle->_flags, msg);
-	for (i = 0; i < ns_s_max; i++) {
-		if (msg + NS_INT16SZ > eom)
-			goto emsgsize;
-		NS_GET16(handle->_counts[i], msg);
-	}
-	for (i = 0; i < ns_s_max; i++)
-		if (handle->_counts[i] == 0)
-			handle->_sections[i] = NULL;
-		else {
-			int b = skiprr(msg, eom, (ns_sect)i,
-				       handle->_counts[i]);
-
-			if (b < 0)
-				return (-1);
-			handle->_sections[i] = msg;
-			msg += b;
-		}
-	if (msg != eom)
-		goto emsgsize;
-	handle->_sect = ns_s_max;
-	handle->_rrnum = -1;
-	handle->_ptr = NULL;
-	return (0);
- emsgsize:
-	errno = EMSGSIZE;
-	return (-1);
-}
-
-int
-ns_parserr(ns_msg *handle, ns_sect section, int rrnum, ns_rr *rr) {
-	int b;
-
-	/* Make section right. */
-	if (section < 0 || section >= ns_s_max)
-		goto enodev;
-	if ((int)section != (int)handle->_sect) {
-		handle->_sect = section;
-		handle->_rrnum = 0;
-		handle->_ptr = handle->_sections[(int)section];
-	}
-
-	/* Make rrnum right. */
-	if (rrnum == -1)
-		rrnum = handle->_rrnum;
-	if (rrnum < 0 || rrnum >= handle->_counts[(int)section])
-		goto enodev;
-	if (rrnum < handle->_rrnum) {
-		handle->_rrnum = 0;
-		handle->_ptr = handle->_sections[(int)section];
-	}
-	
-	b = skiprr(handle->_msg, handle->_eom, section,
-		   rrnum - handle->_rrnum);
-	if (b < 0)
-		return (-1);
-	handle->_ptr += b;
-	handle->_rrnum = rrnum;
-
-	/* Do the parse. */
-	b = dn_expand(handle->_msg, handle->_eom,
-		      handle->_ptr, rr->name, NS_MAXDNAME);
-	if (b < 0)
-		return (-1);
-	handle->_ptr += b;
-	if (handle->_ptr + NS_INT16SZ > handle->_eom)
-		goto emsgsize;
-	NS_GET16(rr->type, handle->_ptr);
-	if (handle->_ptr + NS_INT16SZ > handle->_eom)
-		goto emsgsize;
-	NS_GET16(rr->class, handle->_ptr);
-	if (section == ns_s_qd) {
-		rr->ttl = 0;
-		rr->rdlength = 0;
-		rr->rdata = NULL;
-	} else {
-		if (handle->_ptr + NS_INT32SZ > handle->_eom)
-			goto emsgsize;
-		NS_GET32(rr->ttl, handle->_ptr);
-		if (handle->_ptr + NS_INT16SZ > handle->_eom)
-			goto emsgsize;
-		NS_GET16(rr->rdlength, handle->_ptr);
-		if (handle->_ptr + rr->rdlength > handle->_eom)
-			goto emsgsize;
-		rr->rdata = handle->_ptr;
-		handle->_ptr += rr->rdlength;
-	}
-	handle->_rrnum++;
-
-	/* All done. */
-	return (0);
- enodev:
-	errno = ENODEV;
-	return (-1);
- emsgsize:
-	errno = EMSGSIZE;
-	return (-1);
-}
diff --git a/c/src/exec/libnetworking/libc/ns_print.c b/c/src/exec/libnetworking/libc/ns_print.c
deleted file mode 100644
index f7d7d16c64..0000000000
--- a/c/src/exec/libnetworking/libc/ns_print.c
+++ /dev/null
@@ -1,745 +0,0 @@
-/*
- * Copyright (c) 1996, 1998 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#if !defined(__rtems__)
-#if !defined(LINT) && !defined(CODECENTER)
-static char rcsid[] = "$Id$";
-#endif /* not lint */
-#endif /* not rtems */
-
-/* Import. */
-
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <arpa/inet.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <resolv.h>
-#include <string.h>
-#include <ctype.h>
-
-#define SPRINTF(x) ((size_t)sprintf x)
-
-/* Forward. */
-
-static size_t	prune_origin(const char *name, const char *origin);
-static int	charstr(const u_char *rdata, const u_char *edata,
-			char **buf, size_t *buflen);
-static int	addname(const u_char *msg, size_t msglen,
-			const u_char **p, const char *origin,
-			char **buf, size_t *buflen);
-static void	addlen(size_t len, char **buf, size_t *buflen);
-static int	addstr(const char *src, size_t len,
-		       char **buf, size_t *buflen);
-static int	addtab(size_t len, size_t target, int spaced,
-		       char **buf, size_t *buflen);
-
-/* Macros. */
-
-#define	T(x) \
-	do { \
-		if ((x) < 0) \
-			return (-1); \
-	} while (0)
-
-/* Public. */
-
-/*
- * int
- * ns_sprintrr(handle, rr, name_ctx, origin, buf, buflen)
- *	Convert an RR to presentation format.
- * return:
- *	Number of characters written to buf, or -1 (check errno).
- */
-int
-ns_sprintrr(const ns_msg *handle, const ns_rr *rr,
-	    const char *name_ctx, const char *origin,
-	    char *buf, size_t buflen)
-{
-	int n;
-
-	n = ns_sprintrrf(ns_msg_base(*handle), ns_msg_size(*handle),
-			 ns_rr_name(*rr), ns_rr_class(*rr), ns_rr_type(*rr),
-			 ns_rr_ttl(*rr), ns_rr_rdata(*rr), ns_rr_rdlen(*rr),
-			 name_ctx, origin, buf, buflen);
-	return (n);
-}
-
-/*
- * int
- * ns_sprintrrf(msg, msglen, name, class, type, ttl, rdata, rdlen,
- *	       name_ctx, origin, buf, buflen)
- *	Convert the fields of an RR into presentation format.
- * return:
- *	Number of characters written to buf, or -1 (check errno).
- */
-int
-ns_sprintrrf(const u_char *msg, size_t msglen,
-	    const char *name, ns_class class, ns_type type,
-	    u_long ttl, const u_char *rdata, size_t rdlen,
-	    const char *name_ctx, const char *origin,
-	    char *buf, size_t buflen)
-{
-	const char *obuf = buf;
-	const u_char *edata = rdata + rdlen;
-	int spaced = 0;
-
-	const char *comment;
-	char tmp[100];
-	int len, x;
-
-	/*
-	 * Owner.
-	 */
-	if (name_ctx != NULL && strcasecmp(name_ctx, name) == 0) {
-		T(addstr("\t\t\t", 3, &buf, &buflen));
-	} else {
-		len = prune_origin(name, origin);
-		if (len == 0) {
-			T(addstr("@\t\t\t", 4, &buf, &buflen));
-		} else {
-			T(addstr(name, len, &buf, &buflen));
-			/* Origin not used and no trailing dot? */
-			if ((!origin || !origin[0] || name[len] == '\0') &&
-			    name[len - 1] != '.') {
-				T(addstr(".", 1, &buf, &buflen));
-				len++;
-			}
-			T(spaced = addtab(len, 24, spaced, &buf, &buflen));
-		}
-	}
-
-	/*
-	 * TTL, Class, Type.
-	 */
-	T(x = ns_format_ttl(ttl, buf, buflen));
-	addlen(x, &buf, &buflen);
-	len = SPRINTF((tmp, " %s %s", p_class(class), p_type(type)));
-	T(addstr(tmp, len, &buf, &buflen));
-	T(spaced = addtab(x + len, 16, spaced, &buf, &buflen));
-
-	/*
-	 * RData.
-	 */
-	switch (type) {
-	case ns_t_a:
-		if (rdlen != NS_INADDRSZ)
-			goto formerr;
-		(void) inet_ntop(AF_INET, rdata, buf, buflen);
-		addlen(strlen(buf), &buf, &buflen);
-		break;
-
-	case ns_t_cname:
-	case ns_t_mb:
-	case ns_t_mg:
-	case ns_t_mr:
-	case ns_t_ns:
-	case ns_t_ptr:
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-		break;
-
-	case ns_t_hinfo:
-	case ns_t_isdn:
-		/* First word. */
-		T(len = charstr(rdata, edata, &buf, &buflen));
-		if (len == 0)
-			goto formerr;
-		rdata += len;
-		T(addstr(" ", 1, &buf, &buflen));
-
-		/* Second word. */
-		T(len = charstr(rdata, edata, &buf, &buflen));
-		if (len == 0)
-			goto formerr;
-		rdata += len;
-		break;
-
-	case ns_t_soa: {
-		u_long t;
-
-		/* Server name. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-		T(addstr(" ", 1, &buf, &buflen));
-
-		/* Administrator name. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-		T(addstr(" (\n", 3, &buf, &buflen));
-		spaced = 0;
-
-		if ((edata - rdata) != 5*NS_INT32SZ)
-			goto formerr;
-
-		/* Serial number. */
-		t = ns_get32(rdata);  rdata += NS_INT32SZ;
-		T(addstr("\t\t\t\t\t", 5, &buf, &buflen));
-		len = SPRINTF((tmp, "%lu", t));
-		T(addstr(tmp, len, &buf, &buflen));
-		T(spaced = addtab(len, 16, spaced, &buf, &buflen));
-		T(addstr("; serial\n", 9, &buf, &buflen));
-		spaced = 0;
-
-		/* Refresh interval. */
-		t = ns_get32(rdata);  rdata += NS_INT32SZ;
-		T(addstr("\t\t\t\t\t", 5, &buf, &buflen));
-		T(len = ns_format_ttl(t, buf, buflen));
-		addlen(len, &buf, &buflen);
-		T(spaced = addtab(len, 16, spaced, &buf, &buflen));
-		T(addstr("; refresh\n", 10, &buf, &buflen));
-		spaced = 0;
-
-		/* Retry interval. */
-		t = ns_get32(rdata);  rdata += NS_INT32SZ;
-		T(addstr("\t\t\t\t\t", 5, &buf, &buflen));
-		T(len = ns_format_ttl(t, buf, buflen));
-		addlen(len, &buf, &buflen);
-		T(spaced = addtab(len, 16, spaced, &buf, &buflen));
-		T(addstr("; retry\n", 8, &buf, &buflen));
-		spaced = 0;
-
-		/* Expiry. */
-		t = ns_get32(rdata);  rdata += NS_INT32SZ;
-		T(addstr("\t\t\t\t\t", 5, &buf, &buflen));
-		T(len = ns_format_ttl(t, buf, buflen));
-		addlen(len, &buf, &buflen);
-		T(spaced = addtab(len, 16, spaced, &buf, &buflen));
-		T(addstr("; expiry\n", 9, &buf, &buflen));
-		spaced = 0;
-
-		/* Minimum TTL. */
-		t = ns_get32(rdata);  rdata += NS_INT32SZ;
-		T(addstr("\t\t\t\t\t", 5, &buf, &buflen));
-		T(len = ns_format_ttl(t, buf, buflen));
-		addlen(len, &buf, &buflen);
-		T(addstr(" )", 2, &buf, &buflen));
-		T(spaced = addtab(len, 16, spaced, &buf, &buflen));
-		T(addstr("; minimum\n", 10, &buf, &buflen));
-
-		break;
-	    }
-
-	case ns_t_mx:
-	case ns_t_afsdb:
-	case ns_t_rt: {
-		u_int t;
-
-		if (rdlen < NS_INT16SZ)
-			goto formerr;
-
-		/* Priority. */
-		t = ns_get16(rdata);
-		rdata += NS_INT16SZ;
-		len = SPRINTF((tmp, "%u ", t));
-		T(addstr(tmp, len, &buf, &buflen));
-
-		/* Target. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-
-		break;
-	    }
-
-	case ns_t_px: {
-		u_int t;
-
-		if (rdlen < NS_INT16SZ)
-			goto formerr;
-
-		/* Priority. */
-		t = ns_get16(rdata);
-		rdata += NS_INT16SZ;
-		len = SPRINTF((tmp, "%u ", t));
-		T(addstr(tmp, len, &buf, &buflen));
-
-		/* Name1. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-		T(addstr(" ", 1, &buf, &buflen));
-
-		/* Name2. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-
-		break;
-	    }
-
-	case ns_t_x25:
-		T(len = charstr(rdata, edata, &buf, &buflen));
-		if (len == 0)
-			goto formerr;
-		rdata += len;
-		break;
-
-	case ns_t_txt:
-		while (rdata < edata) {
-			T(len = charstr(rdata, edata, &buf, &buflen));
-			if (len == 0)
-				goto formerr;
-			rdata += len;
-			if (rdata < edata)
-				T(addstr(" ", 1, &buf, &buflen));
-		}
-		break;
-
-	case ns_t_nsap: {
-		char t[255*3];
-
-		(void) inet_nsap_ntoa(rdlen, rdata, t);
-		T(addstr(t, strlen(t), &buf, &buflen));
-		break;
-	    }
-
-	case ns_t_aaaa:
-		if (rdlen != NS_IN6ADDRSZ)
-			goto formerr;
-		(void) inet_ntop(AF_INET6, rdata, buf, buflen);
-		addlen(strlen(buf), &buf, &buflen);
-		break;
-
-	case ns_t_loc: {
-		char t[255];
-
-		/* XXX protocol format checking? */
-		(void) loc_ntoa(rdata, t);
-		T(addstr(t, strlen(t), &buf, &buflen));
-		break;
-	    }
-
-	case ns_t_naptr: {
-		u_int order, preference;
-		char t[50];
-
-		if (rdlen < 2*NS_INT16SZ)
-			goto formerr;
-
-		/* Order, Precedence. */
-		order = ns_get16(rdata);	rdata += NS_INT16SZ;
-		preference = ns_get16(rdata);	rdata += NS_INT16SZ;
-		len = SPRINTF((t, "%u %u ", order, preference));
-		T(addstr(t, len, &buf, &buflen));
-
-		/* Flags. */
-		T(len = charstr(rdata, edata, &buf, &buflen));
-		if (len == 0)
-			goto formerr;
-		rdata += len;
-		T(addstr(" ", 1, &buf, &buflen));
-
-		/* Service. */
-		T(len = charstr(rdata, edata, &buf, &buflen));
-		if (len == 0)
-			goto formerr;
-		rdata += len;
-		T(addstr(" ", 1, &buf, &buflen));
-
-		/* Regexp. */
-		T(len = charstr(rdata, edata, &buf, &buflen));
-		if (len < 0)
-			return (-1);
-		if (len == 0)
-			goto formerr;
-		rdata += len;
-		T(addstr(" ", 1, &buf, &buflen));
-
-		/* Server. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-		break;
-	    }
-
-	case ns_t_srv: {
-		u_int priority, weight, port;
-		char t[50];
-
-		if (rdlen < NS_INT16SZ*3)
-			goto formerr;
-
-		/* Priority, Weight, Port. */
-		priority = ns_get16(rdata);  rdata += NS_INT16SZ;
-		weight   = ns_get16(rdata);  rdata += NS_INT16SZ;
-		port     = ns_get16(rdata);  rdata += NS_INT16SZ;
-		len = SPRINTF((t, "%u %u %u ", priority, weight, port));
-		T(addstr(t, len, &buf, &buflen));
-
-		/* Server. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-		break;
-	    }
-
-	case ns_t_minfo:
-	case ns_t_rp:
-		/* Name1. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-		T(addstr(" ", 1, &buf, &buflen));
-
-		/* Name2. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-
-		break;
-
-	case ns_t_wks: {
-		int n, lcnt;
-
-		if (rdlen < NS_INT32SZ + 1)
-			goto formerr;
-
-		/* Address. */
-		(void) inet_ntop(AF_INET, rdata, buf, buflen);
-		addlen(strlen(buf), &buf, &buflen);
-		rdata += NS_INADDRSZ;
-
-		/* Protocol. */
-		len = SPRINTF((tmp, " %u ( ", *rdata));
-		T(addstr(tmp, len, &buf, &buflen));
-		rdata += NS_INT8SZ;
-
-		/* Bit map. */
-		n = 0;
-		lcnt = 0;
-		while (rdata < edata) {
-			u_int c = *rdata++;
-			do {
-				if (c & 0200) {
-					if (lcnt == 0) {
-						T(addstr("\n\t\t\t\t", 5,
-							 &buf, &buflen));
-						lcnt = 10;
-						spaced = 0;
-					}
-					len = SPRINTF((tmp, "%d ", n));
-					T(addstr(tmp, len, &buf, &buflen));
-					lcnt--;
-				}
-				c <<= 1;
-			} while (++n & 07);
-		}
-		T(addstr(")", 1, &buf, &buflen));
-
-		break;
-	    }
-
-	case ns_t_key: {
-		char base64_key[NS_MD5RSA_MAX_BASE64];
-		u_int keyflags, protocol, algorithm;
-		const char *leader;
-		int n;
-
-		if (rdlen < NS_INT16SZ + NS_INT8SZ + NS_INT8SZ)
-			goto formerr;
-
-		/* Key flags, Protocol, Algorithm. */
-		keyflags = ns_get16(rdata);  rdata += NS_INT16SZ;
-		protocol = *rdata++;
-		algorithm = *rdata++;
-		len = SPRINTF((tmp, "0x%04x %u %u",
-			       keyflags, protocol, algorithm));
-		T(addstr(tmp, len, &buf, &buflen));
-
-		/* Public key data. */
-		len = b64_ntop(rdata, edata - rdata,
-			       base64_key, sizeof base64_key);
-		if (len < 0)
-			goto formerr;
-		if (len > 15) {
-			T(addstr(" (", 2, &buf, &buflen));
-			leader = "\n\t\t";
-			spaced = 0;
-		} else
-			leader = " ";
-		for (n = 0; n < len; n += 48) {
-			T(addstr(leader, strlen(leader), &buf, &buflen));
-			T(addstr(base64_key + n, MIN(len - n, 48),
-				 &buf, &buflen));
-		}
-		if (len > 15)
-			T(addstr(" )", 2, &buf, &buflen));
-
-		break;
-	    }
-
-	case ns_t_sig: {
-		char base64_key[NS_MD5RSA_MAX_BASE64];
-		u_int type, algorithm, labels, footprint;
-		const char *leader;
-		u_long t;
-		int n;
-
-		if (rdlen < 22)
-			goto formerr;
-
-		/* Type covered, Algorithm, Label count, Original TTL. */
-	        type = ns_get16(rdata);  rdata += NS_INT16SZ;
-		algorithm = *rdata++;
-		labels = *rdata++;
-		t = ns_get32(rdata);  rdata += NS_INT32SZ;
-		len = SPRINTF((tmp, " %s %d %lu ",
-			       p_type(type), algorithm, t));
-		T(addstr(tmp, len, &buf, &buflen));
-		if (labels != (u_int)dn_count_labels(name))
-			goto formerr;
-
-		/* Signature expiry. */
-		t = ns_get32(rdata);  rdata += NS_INT32SZ;
-		len = SPRINTF((tmp, "%s ", p_secstodate(t)));
-		T(addstr(tmp, len, &buf, &buflen));
-
-		/* Time signed. */
-		t = ns_get32(rdata);  rdata += NS_INT32SZ;
-		len = SPRINTF((tmp, "%s ", p_secstodate(t)));
-		T(addstr(tmp, len, &buf, &buflen));
-
-		/* Signature Footprint. */
-		footprint = ns_get16(rdata);  rdata += NS_INT16SZ;
-		len = SPRINTF((tmp, "%u ", footprint));
-		T(addstr(tmp, len, &buf, &buflen));
-
-		/* Signer's name. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-
-		/* Signature. */
-		len = b64_ntop(rdata, edata - rdata,
-			       base64_key, sizeof base64_key);
-		if (len > 15) {
-			T(addstr(" (", 2, &buf, &buflen));
-			leader = "\n\t\t";
-			spaced = 0;
-		} else
-			leader = " ";
-		if (len < 0)
-			goto formerr;
-		for (n = 0; n < len; n += 48) {
-			T(addstr(leader, strlen(leader), &buf, &buflen));
-			T(addstr(base64_key + n, MIN(len - n, 48),
-				 &buf, &buflen));
-		}
-		if (len > 15)
-			T(addstr(" )", 2, &buf, &buflen));
-
-		break;
-	    }
-
-	case ns_t_nxt: {
-		int n, c;
-
-		/* Next domain name. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-
-		/* Type bit map. */
-		n = edata - rdata;
-		for (c = 0; c < n*8; c++)
-			if (NS_NXT_BIT_ISSET(c, rdata)) {
-				len = SPRINTF((tmp, " %s", p_type(c)));
-				T(addstr(tmp, len, &buf, &buflen));
-			}
-		break;
-	    }
-
-	default:
-		comment = "unknown RR type";
-		goto hexify;
-	}
-	return (buf - obuf);
- formerr:
-	comment = "RR format error";
- hexify: {
-	int n, m;
-	char *p;
-
-	len = SPRINTF((tmp, "\\#(\t\t; %s", comment));
-	T(addstr(tmp, len, &buf, &buflen));
-	while (rdata < edata) {
-		p = tmp;
-		p += SPRINTF((p, "\n\t"));
-		spaced = 0;
-		n = MIN(16, edata - rdata);
-		for (m = 0; m < n; m++)
-			p += SPRINTF((p, "%02x ", rdata[m]));
-		T(addstr(tmp, p - tmp, &buf, &buflen));
-		if (n < 16) {
-			T(addstr(")", 1, &buf, &buflen));
-			T(addtab(p - tmp + 1, 48, spaced, &buf, &buflen));
-		}
-		p = tmp;
-		p += SPRINTF((p, "; "));
-		for (m = 0; m < n; m++)
-			*p++ = (isascii(rdata[m]) && isprint(rdata[m]))
-				? rdata[m]
-				: '.';
-		T(addstr(tmp, p - tmp, &buf, &buflen));
-		rdata += n;
-	}
-	return (buf - obuf);
-    }
-}
-
-/* Private. */
-
-/*
- * size_t
- * prune_origin(name, origin)
- *	Find out if the name is at or under the current origin.
- * return:
- *	Number of characters in name before start of origin,
- *	or length of name if origin does not match.
- * notes:
- *	This function should share code with samedomain().
- */
-static size_t
-prune_origin(const char *name, const char *origin) {
-	const char *oname = name;
-
-	while (*name != '\0') {
-		if (origin != NULL && strcasecmp(name, origin) == 0)
-			return (name - oname - (name > oname));
-		while (*name != '\0') {
-			if (*name == '\\') {
-				name++;
-				/* XXX need to handle \nnn form. */
-				if (*name == '\0')
-					break;
-			} else if (*name == '.') {
-				name++;
-				break;
-			}
-			name++;
-		}
-	}
-	return (name - oname);
-}
-
-/*
- * int
- * charstr(rdata, edata, buf, buflen)
- *	Format a <character-string> into the presentation buffer.
- * return:
- *	Number of rdata octets consumed
- *	0 for protocol format error
- *	-1 for output buffer error
- * side effects:
- *	buffer is advanced on success.
- */
-static int
-charstr(const u_char *rdata, const u_char *edata, char **buf, size_t *buflen) {
-	const u_char *odata = rdata;
-	size_t save_buflen = *buflen;
-	char *save_buf = *buf;
-
-	if (addstr("\"", 1, buf, buflen) < 0)
-		goto enospc;
-	if (rdata < edata) {
-		int n = *rdata;
-
-		if (rdata + 1 + n <= edata) {
-			rdata++;
-			while (n-- > 0) {
-				if (strchr("\n\"\\", *rdata) != NULL)
-					if (addstr("\\", 1, buf, buflen) < 0)
-						goto enospc;
-				if (addstr((const char *)rdata, 1,
-					   buf, buflen) < 0)
-					goto enospc;
-				rdata++;
-			}
-		}
-	}
-	if (addstr("\"", 1, buf, buflen) < 0)
-		goto enospc;
-	return (rdata - odata);
- enospc:
-	errno = ENOSPC;
-	*buf = save_buf;
-	*buflen = save_buflen;
-	return (-1);
-}
-
-static int
-addname(const u_char *msg, size_t msglen,
-	const u_char **pp, const char *origin,
-	char **buf, size_t *buflen)
-{
-	size_t newlen, save_buflen = *buflen;
-	char *save_buf = *buf;
-	int n;
-
-	n = dn_expand(msg, msg + msglen, *pp, *buf, *buflen);
-	if (n < 0)
-		goto enospc;	/* Guess. */
-	newlen = prune_origin(*buf, origin);
-	if ((origin == NULL || origin[0] == '\0' || (*buf)[newlen] == '\0') &&
-	    (newlen == 0 || (*buf)[newlen - 1] != '.')) {
-		/* No trailing dot. */
-		if (newlen + 2 > *buflen)
-			goto enospc;	/* No room for ".\0". */
-		(*buf)[newlen++] = '.';
-		(*buf)[newlen] = '\0';
-	}
-	if (newlen == 0) {
-		/* Use "@" instead of name. */
-		if (newlen + 2 > *buflen)
-			goto enospc;        /* No room for "@\0". */
-		(*buf)[newlen++] = '@';
-		(*buf)[newlen] = '\0';
-	}
-	*pp += n;
-	addlen(newlen, buf, buflen);
-	**buf = '\0';
-	return (newlen);
- enospc:
-	errno = ENOSPC;
-	*buf = save_buf;
-	*buflen = save_buflen;
-	return (-1);
-}
-
-static void
-addlen(size_t len, char **buf, size_t *buflen) {
-	assert(len <= *buflen);
-	*buf += len;
-	*buflen -= len;
-}
-
-static int
-addstr(const char *src, size_t len, char **buf, size_t *buflen) {
-	if (len > *buflen) {
-		errno = ENOSPC;
-		return (-1);
-	}
-	memcpy(*buf, src, len);
-	addlen(len, buf, buflen);
-	**buf = '\0';
-	return (0);
-}
-
-static int
-addtab(size_t len, size_t target, int spaced, char **buf, size_t *buflen) {
-	size_t save_buflen = *buflen;
-	char *save_buf = *buf;
-	int t;
-
-	if (spaced || len >= target - 1) {
-		T(addstr("  ", 2, buf, buflen));
-		spaced = 1;
-	} else {
-		for (t = (target - len - 1) / 8; t >= 0; t--)
-			if (addstr("\t", 1, buf, buflen) < 0) {
-				*buflen = save_buflen;
-				*buf = save_buf;
-				return (-1);
-			}
-		spaced = 0;
-	}
-	return (spaced);
-}
diff --git a/c/src/exec/libnetworking/libc/ns_ttl.c b/c/src/exec/libnetworking/libc/ns_ttl.c
deleted file mode 100644
index 75093c1dbc..0000000000
--- a/c/src/exec/libnetworking/libc/ns_ttl.c
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#if !defined(__rtems__)
-#if !defined(LINT) && !defined(CODECENTER)
-static char rcsid[] = "$Id$";
-#endif /* not lint */
-#endif /* not rtems */
-
-/* Import. */
-
-#include <arpa/nameser.h>
-
-#include <ctype.h>
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-
-#define SPRINTF(x) ((size_t)sprintf x)
-
-/* Forward. */
-
-static int	fmt1(int t, char s, char **buf, size_t *buflen);
-
-/* Macros. */
-
-#define T(x) if ((x) < 0) return (-1); else (void)NULL
-
-/* Public. */
-
-int
-ns_format_ttl(u_long src, char *dst, size_t dstlen) {
-	char *odst = dst;
-	int secs, mins, hours, days, weeks, x;
-	char *p;
-
-	secs = src % 60;   src /= 60;
-	mins = src % 60;   src /= 60;
-	hours = src % 24;  src /= 24;
-	days = src % 7;    src /= 7;
-	weeks = src;       src = 0;
-
-	x = 0;
-	if (weeks) {
-		T(fmt1(weeks, 'W', &dst, &dstlen));
-		x++;
-	}
-	if (days) {
-		T(fmt1(days, 'D', &dst, &dstlen));
-		x++;
-	}
-	if (hours) {
-		T(fmt1(hours, 'H', &dst, &dstlen));
-		x++;
-	}
-	if (mins) {
-		T(fmt1(mins, 'M', &dst, &dstlen));
-		x++;
-	}
-	if (secs || !(weeks || days || hours || mins)) {
-		T(fmt1(secs, 'S', &dst, &dstlen));
-		x++;
-	}
-
-	if (x > 1) {
-		int ch;
-
-		for (p = odst; (ch = *p) != '\0'; p++)
-			if (isascii(ch) && isupper(ch))
-				*p = tolower(ch);
-	}
-
-	return (dst - odst);
-}
-
-int
-ns_parse_ttl(const char *src, u_long *dst) {
-	u_long ttl, tmp;
-	int ch, digits, dirty;
-
-	ttl = 0;
-	tmp = 0;
-	digits = 0;
-	dirty = 0;
-	while ((ch = *src++) != '\0') {
-		if (!isascii(ch) || !isprint(ch))
-			goto einval;
-		if (isdigit(ch)) {
-			tmp *= 10;
-			tmp += (ch - '0');
-			digits++;
-			continue;
-		}
-		if (digits == 0)
-			goto einval;
-		if (islower(ch))
-			ch = toupper(ch);
-		switch (ch) {
-		case 'W':  tmp *= 7;
-		case 'D':  tmp *= 24;
-		case 'H':  tmp *= 60;
-		case 'M':  tmp *= 60;
-		case 'S':  break;
-		default:   goto einval;
-		}
-		ttl += tmp;
-		tmp = 0;
-		digits = 0;
-		dirty = 1;
-	}
-	if (digits > 0) {
-		if (dirty)
-			goto einval;
-		else
-			ttl += tmp;
-	}
-	*dst = ttl;
-	return (0);
-
- einval:
-	errno = EINVAL;
-	return (-1);
-}
-
-/* Private. */
-
-static int
-fmt1(int t, char s, char **buf, size_t *buflen) {
-	char tmp[50];
-	size_t len;
-
-	len = SPRINTF((tmp, "%d%c", t, s));
-	if (len + 1 > *buflen)
-		return (-1);
-	strcpy(*buf, tmp);
-	*buf += len;
-	*buflen -= len;
-	return (0);
-}
diff --git a/c/src/exec/libnetworking/libc/nsap_addr.c b/c/src/exec/libnetworking/libc/nsap_addr.c
deleted file mode 100644
index a7af57a266..0000000000
--- a/c/src/exec/libnetworking/libc/nsap_addr.c
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (c) 1996, 1998 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$Id$";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-#include <ctype.h>
-#include <resolv.h>
-
-static char
-xtob(c)
-	register int c;
-{
-	return (c - (((c >= '0') && (c <= '9')) ? '0' : '7'));
-}
-
-u_int
-inet_nsap_addr(ascii, binary, maxlen)
-	const char *ascii;
-	u_char *binary;
-	int maxlen;
-{
-	u_char c, nib;
-	u_int len = 0;
-
-	while ((c = *ascii++) != '\0' && len < (u_int)maxlen) {
-		if (c == '.' || c == '+' || c == '/')
-			continue;
-		if (!isascii(c))
-			return (0);
-		if (islower(c))
-			c = toupper(c);
-		if (isxdigit(c)) {
-			nib = xtob(c);
-			c = *ascii++;
-			if (c != '\0') {
-				c = toupper(c);
-				if (isxdigit(c)) {
-					*binary++ = (nib << 4) | xtob(c);
-					len++;
-				} else
-					return (0);
-			}
-			else
-				return (0);
-		}
-		else
-			return (0);
-	}
-	return (len);
-}
-
-char *
-inet_nsap_ntoa(binlen, binary, ascii)
-	int binlen;
-	register const u_char *binary;
-	register char *ascii;
-{
-	register int nib;
-	int i;
-	static char tmpbuf[255*3];
-	char *start;
-
-	if (ascii)
-		start = ascii;
-	else {
-		ascii = tmpbuf;
-		start = tmpbuf;
-	}
-
-	if (binlen > 255)
-		binlen = 255;
-
-	for (i = 0; i < binlen; i++) {
-		nib = *binary >> 4;
-		*ascii++ = nib + (nib < 10 ? '0' : '7');
-		nib = *binary++ & 0x0f;
-		*ascii++ = nib + (nib < 10 ? '0' : '7');
-		if (((i % 2) == 0 && (i + 1) < binlen))
-			*ascii++ = '.';
-	}
-	*ascii = '\0';
-	return (start);
-}
diff --git a/c/src/exec/libnetworking/libc/rcmd.3 b/c/src/exec/libnetworking/libc/rcmd.3
deleted file mode 100644
index e25057fa4e..0000000000
--- a/c/src/exec/libnetworking/libc/rcmd.3
+++ /dev/null
@@ -1,204 +0,0 @@
-.\" Copyright (c) 1983, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"     From: @(#)rcmd.3	8.1 (Berkeley) 6/4/93
-.\"	$Id$
-.\"
-.Dd February 15, 1996
-.Dt RCMD 3
-.Os BSD 4.2
-.Sh NAME
-.Nm rcmd ,
-.Nm rresvport ,
-.Nm iruserok ,
-.Nm ruserok
-.Nd routines for returning a stream to a remote command
-.Sh SYNOPSIS
-.Fd #include <unistd.h>
-.Ft int
-.Fn rcmd "char **ahost" "int inport" "const char *locuser" "const char *remuser" "const char *cmd" "int *fd2p"
-.Ft int
-.Fn rresvport "int *port"
-.Ft int
-.Fn iruserok "u_long raddr" "int superuser" "const char *ruser" "const char *luser"
-.Ft int
-.Fn ruserok "const char *rhost" "int superuser" "const char *ruser" "const char *luser"
-.Sh DESCRIPTION
-The
-.Fn rcmd
-function
-is used by the super-user to execute a command on
-a remote machine using an authentication scheme based
-on reserved port numbers.
-The
-.Fn rresvport
-function
-returns a descriptor to a socket
-with an address in the privileged port space.
-The
-.Fn ruserok
-function
-is used by servers
-to authenticate clients requesting service with
-.Fn rcmd .
-All three functions are present in the same file and are used
-by the
-.Xr rshd 8
-server (among others).
-.Pp
-The
-.Fn rcmd
-function
-looks up the host
-.Fa *ahost
-using
-.Xr gethostbyname 3 ,
-returning \-1 if the host does not exist.
-Otherwise
-.Fa *ahost
-is set to the standard name of the host
-and a connection is established to a server
-residing at the well-known Internet port
-.Fa inport .
-.Pp
-If the connection succeeds,
-a socket in the Internet domain of type
-.Dv SOCK_STREAM
-is returned to the caller, and given to the remote
-command as 
-.Em stdin
-and
-.Em stdout .
-If
-.Fa fd2p
-is non-zero, then an auxiliary channel to a control
-process will be set up, and a descriptor for it will be placed
-in
-.Fa *fd2p .
-The control process will return diagnostic
-output from the command (unit 2) on this channel, and will also
-accept bytes on this channel as being
-.Tn UNIX
-signal numbers, to be
-forwarded to the process group of the command.
-If
-.Fa fd2p
-is 0, then the 
-.Em stderr
-(unit 2 of the remote
-command) will be made the same as the 
-.Em stdout
-and no
-provision is made for sending arbitrary signals to the remote process,
-although you may be able to get its attention by using out-of-band data.
-.Pp
-The protocol is described in detail in
-.Xr rshd 8 .
-.Pp
-The
-.Fn rresvport
-function is used to obtain a socket with a privileged
-address bound to it.  This socket is suitable for use
-by 
-.Fn rcmd
-and several other functions.  Privileged Internet ports are those
-in the range 0 to 1023.  Only the super-user
-is allowed to bind an address of this sort to a socket.
-.Pp
-The
-.Fn iruserok
-and
-.Fn ruserok
-functions take a remote host's IP address or name, as returned by the
-.Xr gethostbyname 3
-routines, two user names and a flag indicating whether the local user's
-name is that of the super-user.
-Then, if the user is
-.Em NOT
-the super-user, it checks the
-.Pa /etc/hosts.equiv
-file.
-If that lookup is not done, or is unsuccessful, the
-.Pa .rhosts
-in the local user's home directory is checked to see if the request for
-service is allowed.
-.Pp
-If this file does not exist, is not a regular file, is owned by anyone
-other than the user or the super-user, or is writable by anyone other
-than the owner, the check automatically fails.
-Zero is returned if the machine name is listed in the
-.Dq Pa hosts.equiv
-file, or the host and remote user name are found in the
-.Dq Pa .rhosts
-file; otherwise
-.Fn iruserok
-and
-.Fn ruserok
-return \-1.
-If the local domain (as obtained from
-.Xr gethostname 3 )
-is the same as the remote domain, only the machine name need be specified.
-.Pp
-The
-.Fn iruserok
-function is strongly preferred for security reasons.
-It requires trusting the local DNS at most, while the
-.Fn ruserok
-function requires trusting the entire DNS, which can be spoofed.
-.Sh DIAGNOSTICS
-The
-.Fn rcmd
-function
-returns a valid socket descriptor on success.
-It returns \-1 on error and prints a diagnostic message on the standard error.
-.Pp
-The
-.Fn rresvport
-function
-returns a valid, bound socket descriptor on success.
-It returns \-1 on error with the global value
-.Va errno
-set according to the reason for failure.
-The error code
-.Dv EAGAIN
-is overloaded to mean ``All network ports in use.''
-.Sh SEE ALSO
-.Xr rlogin 1 ,
-.Xr rsh 1 ,
-.Xr intro 2 ,
-.Xr rexec 3 ,
-.Xr rexecd 8 ,
-.Xr rlogind 8 ,
-.Xr rshd 8
-.Sh HISTORY
-These
-functions appeared in 
-.Bx 4.2 .
diff --git a/c/src/exec/libnetworking/libc/rcmd.c b/c/src/exec/libnetworking/libc/rcmd.c
deleted file mode 100644
index 32e4953e9b..0000000000
--- a/c/src/exec/libnetworking/libc/rcmd.c
+++ /dev/null
@@ -1,520 +0,0 @@
-/*
- * Copyright (c) 1983, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *  $Id$
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)rcmd.c	8.3 (Berkeley) 3/26/94";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include <signal.h>
-#include <fcntl.h>
-#include <netdb.h>
-#include <unistd.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <string.h>
-#ifdef YP
-#include <rpc/rpc.h>
-#include <rpcsvc/yp_prot.h>
-#include <rpcsvc/ypclnt.h>
-#endif
-
-extern int innetgr __P(( const char *, const char *, const char *, const char * ));
-
-#define max(a, b)	((a > b) ? a : b)
-
-int	__ivaliduser __P((FILE *, u_long, const char *, const char *));
-static int __icheckhost __P((u_long, char *));
-
-int
-rcmd(ahost, rport, locuser, remuser, cmd, fd2p)
-	char **ahost;
-	u_short rport;
-	const char *locuser, *remuser, *cmd;
-	int *fd2p;
-{
-	struct hostent *hp;
-	struct sockaddr_in sin, from;
-	fd_set reads;
-	long oldmask;
-	pid_t pid;
-	int s, lport, timo;
-	char c;
-
-	pid = getpid();
-	hp = gethostbyname(*ahost);
-	if (hp == NULL) {
-		herror(*ahost);
-		return (-1);
-	}
-	*ahost = hp->h_name;
-	oldmask = sigblock(sigmask(SIGURG));
-	for (timo = 1, lport = IPPORT_RESERVED - 1;;) {
-		s = rresvport(&lport);
-		if (s < 0) {
-			if (errno == EAGAIN)
-				(void)fprintf(stderr,
-				    "rcmd: socket: All ports in use\n");
-			else
-				(void)fprintf(stderr, "rcmd: socket: %s\n",
-				    strerror(errno));
-			sigsetmask(oldmask);
-			return (-1);
-		}
-		fcntl(s, F_SETOWN, pid);
-		bzero(&sin, sizeof sin);
-		sin.sin_len = sizeof(struct sockaddr_in);
-		sin.sin_family = hp->h_addrtype;
-		sin.sin_port = rport;
-		bcopy(hp->h_addr_list[0], &sin.sin_addr, MIN(hp->h_length, sizeof sin.sin_addr));
-		if (connect(s, (struct sockaddr *)&sin, sizeof(sin)) >= 0)
-			break;
-		(void)close(s);
-		if (errno == EADDRINUSE) {
-			lport--;
-			continue;
-		}
-		if (errno == ECONNREFUSED && timo <= 16) {
-			(void)sleep(timo);
-			timo *= 2;
-			continue;
-		}
-		if (hp->h_addr_list[1] != NULL) {
-			int oerrno = errno;
-
-			(void)fprintf(stderr, "connect to address %s: ",
-			    inet_ntoa(sin.sin_addr));
-			errno = oerrno;
-			perror(0);
-			hp->h_addr_list++;
-			bcopy(hp->h_addr_list[0], &sin.sin_addr, MIN(hp->h_length, sizeof sin.sin_addr));
-			(void)fprintf(stderr, "Trying %s...\n",
-			    inet_ntoa(sin.sin_addr));
-			continue;
-		}
-		(void)fprintf(stderr, "%s: %s\n", hp->h_name, strerror(errno));
-		sigsetmask(oldmask);
-		return (-1);
-	}
-	lport--;
-	if (fd2p == 0) {
-		write(s, "", 1);
-		lport = 0;
-	} else {
-		char num[8];
-		int s2 = rresvport(&lport), s3;
-		int len = sizeof(from);
-		int nfds;
-
-		if (s2 < 0)
-			goto bad;
-		listen(s2, 1);
-		(void)snprintf(num, sizeof(num), "%d", lport);
-		if (write(s, num, strlen(num)+1) != strlen(num)+1) {
-			(void)fprintf(stderr,
-			    "rcmd: write (setting up stderr): %s\n",
-			    strerror(errno));
-			(void)close(s2);
-			goto bad;
-		}
-		nfds = max(s, s2)+1;
-		if(nfds > FD_SETSIZE) {
-			fprintf(stderr, "rcmd: too many files\n");
-			(void)close(s2);
-			goto bad;
-		}
-again:
-		FD_ZERO(&reads);
-		FD_SET(s, &reads);
-		FD_SET(s2, &reads);
-		errno = 0;
-		if (select(nfds, &reads, 0, 0, 0) < 1 || !FD_ISSET(s2, &reads)){
-			if (errno != 0)
-				(void)fprintf(stderr,
-				    "rcmd: select (setting up stderr): %s\n",
-				    strerror(errno));
-			else
-				(void)fprintf(stderr,
-				"select: protocol failure in circuit setup\n");
-			(void)close(s2);
-			goto bad;
-		}
-		s3 = accept(s2, (struct sockaddr *)&from, &len);
-		/*
-		 * XXX careful for ftp bounce attacks. If discovered, shut them
-		 * down and check for the real auxiliary channel to connect.
-		 */
-		if (from.sin_family == AF_INET && from.sin_port == htons(20)) {
-			close(s3);
-			goto again;
-		}
-		(void)close(s2);
-		if (s3 < 0) {
-			(void)fprintf(stderr,
-			    "rcmd: accept: %s\n", strerror(errno));
-			lport = 0;
-			goto bad;
-		}
-		*fd2p = s3;
-		from.sin_port = ntohs((u_short)from.sin_port);
-		if (from.sin_family != AF_INET ||
-		    from.sin_port >= IPPORT_RESERVED ||
-		    from.sin_port < IPPORT_RESERVED / 2) {
-			(void)fprintf(stderr,
-			    "socket: protocol failure in circuit setup.\n");
-			goto bad2;
-		}
-	}
-	(void)write(s, locuser, strlen(locuser)+1);
-	(void)write(s, remuser, strlen(remuser)+1);
-	(void)write(s, cmd, strlen(cmd)+1);
-	if (read(s, &c, 1) != 1) {
-		(void)fprintf(stderr,
-		    "rcmd: %s: %s\n", *ahost, strerror(errno));
-		goto bad2;
-	}
-	if (c != 0) {
-		while (read(s, &c, 1) == 1) {
-			(void)write(STDERR_FILENO, &c, 1);
-			if (c == '\n')
-				break;
-		}
-		goto bad2;
-	}
-	sigsetmask(oldmask);
-	return (s);
-bad2:
-	if (lport)
-		(void)close(*fd2p);
-bad:
-	(void)close(s);
-	sigsetmask(oldmask);
-	return (-1);
-}
-
-int
-rresvport(alport)
-	int *alport;
-{
-	struct sockaddr_in sin;
-	int s;
-
-	bzero(&sin, sizeof sin);
-	sin.sin_len = sizeof(struct sockaddr_in);
-	sin.sin_family = AF_INET;
-	sin.sin_addr.s_addr = INADDR_ANY;
-	s = socket(AF_INET, SOCK_STREAM, 0);
-	if (s < 0)
-		return (-1);
-#if 0 /* compat_exact_traditional_rresvport_semantics */
-	sin.sin_port = htons((u_short)*alport);
-	if (bind(s, (struct sockaddr *)&sin, sizeof(sin)) >= 0)
-		return (s);
-	if (errno != EADDRINUSE) {
-		(void)close(s);
-		return (-1);
-	}
-#endif
-	sin.sin_port = 0;
-	if (bindresvport(s, &sin) == -1) {
-		(void)close(s);
-		return (-1);
-	}
-	*alport = (int)ntohs(sin.sin_port);
-	return (s);
-}
-
-int	__check_rhosts_file = 1;
-char	*__rcmd_errstr;
-
-int
-ruserok(rhost, superuser, ruser, luser)
-	const char *rhost, *ruser, *luser;
-	int superuser;
-{
-	struct hostent *hp;
-	u_long addr;
-	char **ap;
-
-	if ((hp = gethostbyname(rhost)) == NULL)
-		return (-1);
-	for (ap = hp->h_addr_list; *ap; ++ap) {
-		bcopy(*ap, &addr, sizeof(addr));
-		if (iruserok(addr, superuser, ruser, luser) == 0)
-			return (0);
-	}
-	return (-1);
-}
-
-/*
- * New .rhosts strategy: We are passed an ip address. We spin through
- * hosts.equiv and .rhosts looking for a match. When the .rhosts only
- * has ip addresses, we don't have to trust a nameserver.  When it
- * contains hostnames, we spin through the list of addresses the nameserver
- * gives us and look for a match.
- *
- * Returns 0 if ok, -1 if not ok.
- */
-int
-iruserok(raddr, superuser, ruser, luser)
-	u_long raddr;
-	int superuser;
-	const char *ruser, *luser;
-{
-	register char *cp;
-	struct stat sbuf;
-	struct passwd *pwd;
-	FILE *hostf;
-	uid_t uid;
-	int first;
-	char pbuf[MAXPATHLEN];
-
-	first = 1;
-	hostf = superuser ? NULL : fopen(_PATH_HEQUIV, "r");
-again:
-	if (hostf) {
-		if (__ivaliduser(hostf, raddr, luser, ruser) == 0) {
-			(void)fclose(hostf);
-			return (0);
-		}
-		(void)fclose(hostf);
-	}
-	if (first == 1 && (__check_rhosts_file || superuser)) {
-		first = 0;
-		if ((pwd = getpwnam(luser)) == NULL)
-			return (-1);
-		(void)strcpy(pbuf, pwd->pw_dir);
-		(void)strcat(pbuf, "/.rhosts");
-
-		/*
-		 * Change effective uid while opening .rhosts.  If root and
-		 * reading an NFS mounted file system, can't read files that
-		 * are protected read/write owner only.
-		 */
-		uid = geteuid();
-		(void)seteuid(pwd->pw_uid);
-		hostf = fopen(pbuf, "r");
-		(void)seteuid(uid);
-
-		if (hostf == NULL)
-			return (-1);
-		/*
-		 * If not a regular file, or is owned by someone other than
-		 * user or root or if writeable by anyone but the owner, quit.
-		 */
-		cp = NULL;
-		if (lstat(pbuf, &sbuf) < 0)
-			cp = ".rhosts lstat failed";
-		else if (!S_ISREG(sbuf.st_mode))
-			cp = ".rhosts not regular file";
-		else if (fstat(fileno(hostf), &sbuf) < 0)
-			cp = ".rhosts fstat failed";
-		else if (sbuf.st_uid && sbuf.st_uid != pwd->pw_uid)
-			cp = "bad .rhosts owner";
-		else if (sbuf.st_mode & (S_IWGRP|S_IWOTH))
-			cp = ".rhosts writeable by other than owner";
-		/* If there were any problems, quit. */
-		if (cp) {
-			__rcmd_errstr = cp;
-			(void)fclose(hostf);
-			return (-1);
-		}
-		goto again;
-	}
-	return (-1);
-}
-
-/*
- * XXX
- * Don't make static, used by lpd(8).
- *
- * Returns 0 if ok, -1 if not ok.
- */
-int
-__ivaliduser(hostf, raddr, luser, ruser)
-	FILE *hostf;
-	u_long raddr;
-	const char *luser, *ruser;
-{
-	register char *user, *p;
-	int ch;
-	char buf[MAXHOSTNAMELEN + 128];		/* host + login */
-	char hname[MAXHOSTNAMELEN];
-	struct hostent *hp;
-	/* Presumed guilty until proven innocent. */
-	int userok = 0, hostok = 0;
-#ifdef YP
-	char *ypdomain;
-
-	if (yp_get_default_domain(&ypdomain))
-		ypdomain = NULL;
-#else
-#define	ypdomain NULL
-#endif
-	/* We need to get the damn hostname back for netgroup matching. */
-	if ((hp = gethostbyaddr((char *)&raddr, sizeof(u_long),
-							AF_INET)) == NULL)
-		return (-1);
-	strncpy(hname, hp->h_name, sizeof(hname));
-	hname[sizeof(hname) - 1] = '\0';
-
-	while (fgets(buf, sizeof(buf), hostf)) {
-		p = buf;
-		/* Skip lines that are too long. */
-		if (strchr(p, '\n') == NULL) {
-			while ((ch = getc(hostf)) != '\n' && ch != EOF);
-			continue;
-		}
-		if (*p == '\n' || *p == '#') {
-			/* comment... */
-			continue;
-		}
-		while (*p != '\n' && *p != ' ' && *p != '\t' && *p != '\0') {
-			*p = isupper(*p) ? tolower(*p) : *p;
-			p++;
-		}
-		if (*p == ' ' || *p == '\t') {
-			*p++ = '\0';
-			while (*p == ' ' || *p == '\t')
-				p++;
-			user = p;
-			while (*p != '\n' && *p != ' ' &&
-			    *p != '\t' && *p != '\0')
-				p++;
-		} else
-			user = p;
-		*p = '\0';
-		/*
-		 * Do +/- and +@/-@ checking. This looks really nasty,
-		 * but it matches SunOS's behavior so far as I can tell.
-		 */
-		switch(buf[0]) {
-		case '+':
-			if (!buf[1]) {     /* '+' matches all hosts */
-				hostok = 1;
-				break;
-			}
-			if (buf[1] == '@')  /* match a host by netgroup */
-				hostok = innetgr((char *)&buf[2],
-					(char *)&hname, NULL, ypdomain);
-			else		/* match a host by addr */
-				hostok = __icheckhost(raddr,(char *)&buf[1]);
-			break;
-		case '-':     /* reject '-' hosts and all their users */
-			if (buf[1] == '@') {
-				if (innetgr((char *)&buf[2],
-					      (char *)&hname, NULL, ypdomain))
-					return(-1);
-			} else {
-				if (__icheckhost(raddr,(char *)&buf[1]))
-					return(-1);
-			}
-			break;
-		default:  /* if no '+' or '-', do a simple match */
-			hostok = __icheckhost(raddr, buf);
-			break;
-		}
-		switch(*user) {
-		case '+':
-			if (!*(user+1)) {      /* '+' matches all users */
-				userok = 1;
-				break;
-			}
-			if (*(user+1) == '@')  /* match a user by netgroup */
-				userok = innetgr(user+2, NULL, ruser, ypdomain);
-			else	   /* match a user by direct specification */
-				userok = !(strcmp(ruser, user+1));
-			break;
-		case '-': 		/* if we matched a hostname, */
-			if (hostok) {   /* check for user field rejections */
-				if (!*(user+1))
-					return(-1);
-				if (*(user+1) == '@') {
-					if (innetgr(user+2, NULL,
-							ruser, ypdomain))
-						return(-1);
-				} else {
-					if (!strcmp(ruser, user+1))
-						return(-1);
-				}
-			}
-			break;
-		default:	/* no rejections: try to match the user */
-			if (hostok)
-				userok = !(strcmp(ruser,*user ? user : luser));
-			break;
-		}
-		if (hostok && userok)
-			return(0);
-	}
-	return (-1);
-}
-
-/*
- * Returns "true" if match, 0 if no match.
- */
-static int
-__icheckhost(raddr, lhost)
-	u_long raddr;
-	register char *lhost;
-{
-	register struct hostent *hp;
-	register u_long laddr;
-	register char **pp;
-
-	/* Try for raw ip address first. */
-	if (isdigit(*lhost) && (long)(laddr = inet_addr(lhost)) != -1)
-		return (raddr == laddr);
-
-	/* Better be a hostname. */
-	if ((hp = gethostbyname(lhost)) == NULL)
-		return (0);
-
-	/* Spin through ip addresses. */
-	for (pp = hp->h_addr_list; *pp; ++pp)
-		if (!bcmp(&raddr, *pp, sizeof(u_long)))
-			return (1);
-
-	/* No match. */
-	return (0);
-}
diff --git a/c/src/exec/libnetworking/libc/recv.c b/c/src/exec/libnetworking/libc/recv.c
deleted file mode 100644
index a842244caf..0000000000
--- a/c/src/exec/libnetworking/libc/recv.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *  $Id$
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)recv.c	8.2 (Berkeley) 2/21/94";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <stddef.h>
-
-ssize_t
-recv(s, buf, len, flags)
-	int s, flags;
-	size_t len;
-	void *buf;
-{
-	return (recvfrom(s, buf, len, flags, NULL, 0));
-}
diff --git a/c/src/exec/libnetworking/libc/res_comp.c b/c/src/exec/libnetworking/libc/res_comp.c
deleted file mode 100644
index 93043276f2..0000000000
--- a/c/src/exec/libnetworking/libc/res_comp.c
+++ /dev/null
@@ -1,258 +0,0 @@
-/*
- * Copyright (c) 1985, 1993
- *    The Regents of the University of California.  All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- * 	This product includes software developed by the University of
- * 	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-/*
- * Portions Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)res_comp.c	8.1 (Berkeley) 6/4/93";
-static char orig_rcsid[] = "From: Id: res_comp.c,v 8.11 1997/05/21 19:31:04 halley Exp $";
-static char rcsid[] = "$Id$";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <ctype.h>
-#include <resolv.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-
-#define BIND_4_COMPAT
-
-/*
- * Expand compressed domain name 'comp_dn' to full domain name.
- * 'msg' is a pointer to the begining of the message,
- * 'eomorig' points to the first location after the message,
- * 'exp_dn' is a pointer to a buffer of size 'length' for the result.
- * Return size of compressed name or -1 if there was an error.
- */
-int
-dn_expand(const u_char *msg, const u_char *eom, const u_char *src,
-	  char *dst, int dstsiz)
-{
-	int n = ns_name_uncompress(msg, eom, src, dst, (size_t)dstsiz);
-
-	if (n > 0 && dst[0] == '.')
-		dst[0] = '\0';
-	return (n);
-}
-
-/*
- * Pack domain name 'exp_dn' in presentation form into 'comp_dn'.
- * Return the size of the compressed name or -1.
- * 'length' is the size of the array pointed to by 'comp_dn'.
- */
-int
-dn_comp(const char *src, u_char *dst, int dstsiz,
-	u_char **dnptrs, u_char **lastdnptr)
-{
-	return (ns_name_compress(src, dst, (size_t)dstsiz,
-				 (const u_char **)dnptrs,
-				 (const u_char **)lastdnptr));
-}
-
-/*
- * Skip over a compressed domain name. Return the size or -1.
- */
-int
-dn_skipname(const u_char *ptr, const u_char *eom) {
-	const u_char *saveptr = ptr;
-
-	if (ns_name_skip(&ptr, eom) == -1)
-		return (-1);
-	return (ptr - saveptr);
-}
-
-/*
- * Verify that a domain name uses an acceptable character set.
- */
-
-/*
- * Note the conspicuous absence of ctype macros in these definitions.  On
- * non-ASCII hosts, we can't depend on string literals or ctype macros to
- * tell us anything about network-format data.  The rest of the BIND system
- * is not careful about this, but for some reason, we're doing it right here.
- */
-#define PERIOD 0x2e
-#define	hyphenchar(c) ((c) == 0x2d)
-#define bslashchar(c) ((c) == 0x5c)
-#define periodchar(c) ((c) == PERIOD)
-#define asterchar(c) ((c) == 0x2a)
-#define alphachar(c) (((c) >= 0x41 && (c) <= 0x5a) \
-		   || ((c) >= 0x61 && (c) <= 0x7a))
-#define digitchar(c) ((c) >= 0x30 && (c) <= 0x39)
-
-#define borderchar(c) (alphachar(c) || digitchar(c))
-#define middlechar(c) (borderchar(c) || hyphenchar(c))
-#define	domainchar(c) ((c) > 0x20 && (c) < 0x7f)
-
-int
-res_hnok(dn)
-	const char *dn;
-{
-	int ppch = '\0', pch = PERIOD, ch = *dn++;
-
-	while (ch != '\0') {
-		int nch = *dn++;
-
-		if (periodchar(ch)) {
-			(void)NULL;
-		} else if (periodchar(pch)) {
-			if (!borderchar(ch))
-				return (0);
-		} else if (periodchar(nch) || nch == '\0') {
-			if (!borderchar(ch))
-				return (0);
-		} else {
-			if (!middlechar(ch))
-				return (0);
-		}
-		ppch = pch, pch = ch, ch = nch;
-	}
-	return (1);
-}
-
-/*
- * hostname-like (A, MX, WKS) owners can have "*" as their first label
- * but must otherwise be as a host name.
- */
-int
-res_ownok(dn)
-	const char *dn;
-{
-	if (asterchar(dn[0])) {
-		if (periodchar(dn[1]))
-			return (res_hnok(dn+2));
-		if (dn[1] == '\0')
-			return (1);
-	}
-	return (res_hnok(dn));
-}
-
-/*
- * SOA RNAMEs and RP RNAMEs can have any printable character in their first
- * label, but the rest of the name has to look like a host name.
- */
-int
-res_mailok(dn)
-	const char *dn;
-{
-	int ch, escaped = 0;
-
-	/* "." is a valid missing representation */
-	if (*dn == '\0')
-		return (1);
-
-	/* otherwise <label>.<hostname> */
-	while ((ch = *dn++) != '\0') {
-		if (!domainchar(ch))
-			return (0);
-		if (!escaped && periodchar(ch))
-			break;
-		if (escaped)
-			escaped = 0;
-		else if (bslashchar(ch))
-			escaped = 1;
-	}
-	if (periodchar(ch))
-		return (res_hnok(dn));
-	return (0);
-}
-
-/*
- * This function is quite liberal, since RFC 1034's character sets are only
- * recommendations.
- */
-int
-res_dnok(dn)
-	const char *dn;
-{
-	int ch;
-
-	while ((ch = *dn++) != '\0')
-		if (!domainchar(ch))
-			return (0);
-	return (1);
-}
-
-#ifdef BIND_4_COMPAT
-/*
- * This module must export the following externally-visible symbols:
- *    ___putlong
- *    ___putshort
- *    __getlong
- *    __getshort
- * Note that one _ comes from C and the others come from us.
- */
-void __putlong(u_int32_t src, u_char *dst) { ns_put32(src, dst); }
-void __putshort(u_int16_t src, u_char *dst) { ns_put16(src, dst); }
-u_int32_t _getlong(const u_char *src) { return (ns_get32(src)); }
-u_int16_t _getshort(const u_char *src) { return (ns_get16(src)); }
-#endif /*BIND_4_COMPAT*/
diff --git a/c/src/exec/libnetworking/libc/res_config.h b/c/src/exec/libnetworking/libc/res_config.h
deleted file mode 100644
index 57ec414226..0000000000
--- a/c/src/exec/libnetworking/libc/res_config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- *  $Id$
- */
-
-#define	DEBUG	1	/* enable debugging code (needed for dig) */
-#define	RESOLVSORT	/* allow sorting of addresses in gethostbyname */
-#define	RFC1535		/* comply with RFC1535 (STRONGLY reccomended by vixie)*/
-#undef	USELOOPBACK	/* res_init() bind to localhost */
-#undef	SUNSECURITY	/* verify gethostbyaddr() calls - WE DONT NEED IT  */
-#define MULTI_PTRS_ARE_ALIASES 1 /* fold multiple PTR records into aliases */
-#define	CHECK_SRVR_ADDR 1 /* confirm that the server requested sent the reply */
-#define BIND_UPDATE 1	/* update support */
-
-#if defined(__rtems__)
-u_int16_t _getshort(const u_char *src);
-u_int32_t _getlong(const u_char *src);
-int gethostname (char *name, int namelen);
-int sethostname (char *name, int namelen);
-int issetugid (void);
-#endif
diff --git a/c/src/exec/libnetworking/libc/res_data.c b/c/src/exec/libnetworking/libc/res_data.c
deleted file mode 100644
index fb7d2c66eb..0000000000
--- a/c/src/exec/libnetworking/libc/res_data.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (c) 1995,1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$Id$";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-#include <ctype.h>
-#include <resolv.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "res_config.h"
-
-const char *_res_opcodes[] = {
-	"QUERY",
-	"IQUERY",
-	"CQUERYM",
-	"CQUERYU",	/* experimental */
-	"NOTIFY",	/* experimental */
-	"UPDATE",
-	"6",
-	"7",
-	"8",
-	"9",
-	"10",
-	"11",
-	"12",
-	"13",
-	"ZONEINIT",
-	"ZONEREF",
-};
-
-const char *_res_resultcodes[] = {
-	"NOERROR",
-	"FORMERR",
-	"SERVFAIL",
-	"NXDOMAIN",
-	"NOTIMP",
-	"REFUSED",
-	"YXDOMAIN",
-	"YXRRSET",
-	"NXRRSET",
-	"NOTAUTH",
-	"ZONEERR",
-	"11",
-	"12",
-	"13",
-	"14",
-	"NOCHANGE",
-};
-
-#ifdef BIND_UPDATE
-const char *_res_sectioncodes[] = {
-	"ZONE",
-	"PREREQUISITES",
-	"UPDATE",
-	"ADDITIONAL",
-};
-#endif
diff --git a/c/src/exec/libnetworking/libc/res_debug.c b/c/src/exec/libnetworking/libc/res_debug.c
deleted file mode 100644
index b747b6e6d2..0000000000
--- a/c/src/exec/libnetworking/libc/res_debug.c
+++ /dev/null
@@ -1,966 +0,0 @@
-/*
- * Copyright (c) 1985
- *    The Regents of the University of California.  All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- * 	This product includes software developed by the University of
- * 	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-/*
- * Portions Copyright (c) 1995 by International Business Machines, Inc.
- *
- * International Business Machines, Inc. (hereinafter called IBM) grants
- * permission under its copyrights to use, copy, modify, and distribute this
- * Software with or without fee, provided that the above copyright notice and
- * all paragraphs of this notice appear in all copies, and that the name of IBM
- * not be used in connection with the marketing of any product incorporating
- * the Software or modifications thereof, without specific, written prior
- * permission.
- *
- * To the extent it has a right to do so, IBM grants an immunity from suit
- * under its patents, if any, for the use, sale or manufacture of products to
- * the extent that such products are used for performing Domain Name System
- * dynamic updates in TCP/IP networks by means of the Software.  No immunity is
- * granted for any product per se or for any other function of any product.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", AND IBM DISCLAIMS ALL WARRANTIES,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL IBM BE LIABLE FOR ANY SPECIAL,
- * DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE, EVEN
- * IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES.
- */
-
-/*
- * Portions Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)res_debug.c	8.1 (Berkeley) 6/4/93";
-static char rcsid[] = "$Id$";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-
-#include <ctype.h>
-#include <errno.h>
-#include <math.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-
-#define SPRINTF(x) sprintf x
-
-extern const char *_res_opcodes[];
-extern const char *_res_resultcodes[];
-extern const char *_res_sectioncodes[];
-
-/*
- * Print the current options.
- */
-void
-fp_resstat(struct __res_state *statp, FILE *file) {
-	u_long mask;
-
-	fprintf(file, ";; res options:");
-	if (!statp)
-		statp = &_res;
-	for (mask = 1;  mask != 0;  mask <<= 1)
-		if (statp->options & mask)
-			fprintf(file, " %s", p_option(mask));
-	putc('\n', file);
-}
-
-static void
-do_section(ns_msg *handle, ns_sect section, int pflag, FILE *file) {
-	int n, sflag, rrnum;
-	char buf[2048];	/* XXX need to malloc */
-	ns_opcode opcode;
-	ns_rr rr;
-
-	/*
-	 * Print answer records.
-	 */
-	sflag = (_res.pfcode & pflag);
-	if (_res.pfcode && !sflag)
-		return;
-
-	opcode = ns_msg_getflag(*handle, ns_f_opcode);
-	rrnum = 0;
-	for (;;) {
-		if (ns_parserr(handle, section, rrnum, &rr)) {
-			if (errno != ENODEV)
-				fprintf(file, ";; ns_parserr: %s\n",
-					strerror(errno));
-			else if (rrnum > 0 && sflag != 0 &&
-				 (_res.pfcode & RES_PRF_HEAD1))
-				putc('\n', file);
-			return;
-		}
-		if (rrnum == 0 && sflag != 0 && (_res.pfcode & RES_PRF_HEAD1))
-			fprintf(file, ";; %s SECTION:\n",
-				p_section(section, opcode));
-		if (section == ns_s_qd)
-			fprintf(file, ";;\t%s, type = %s, class = %s\n",
-				ns_rr_name(rr),
-				p_type(ns_rr_type(rr)),
-				p_class(ns_rr_class(rr)));
-		else {
-			n = ns_sprintrr(handle, &rr, NULL, NULL,
-					buf, sizeof buf);
-			if (n < 0) {
-				fprintf(file, ";; ns_sprintrr: %s\n",
-					strerror(errno));
-				return;
-			}
-			fputs(buf, file);
-			fputc('\n', file);
-		}
-		rrnum++;
-	}
-}
-
-void
-p_query(const u_char *msg) {
-	fp_query(msg, stdout);
-}
-
-void
-fp_query(const u_char *msg, FILE *file) {
-	fp_nquery(msg, PACKETSZ, file);
-}
-
-/*
- * Print the contents of a query.
- * This is intended to be primarily a debugging routine.
- */
-void
-fp_nquery(const u_char *msg, int len, FILE *file) {
-	ns_msg handle;
-	int qdcount, ancount, nscount, arcount;
-	u_int opcode, rcode, id;
-
-	if ((_res.options & RES_INIT) == 0 && res_init() == -1)
-		return;
-
-	if (ns_initparse(msg, len, &handle) < 0) {
-		fprintf(file, ";; ns_initparse: %s\n", strerror(errno));
-		return;
-	}
-	opcode = ns_msg_getflag(handle, ns_f_opcode);
-	rcode = ns_msg_getflag(handle, ns_f_rcode);
-	id = ns_msg_id(handle);
-	qdcount = ns_msg_count(handle, ns_s_qd);
-	ancount = ns_msg_count(handle, ns_s_an);
-	nscount = ns_msg_count(handle, ns_s_ns);
-	arcount = ns_msg_count(handle, ns_s_ar);
-
-	/*
-	 * Print header fields.
-	 */
-	if ((!_res.pfcode) || (_res.pfcode & RES_PRF_HEADX) || rcode)
-		fprintf(file,
-			";; ->>HEADER<<- opcode: %s, status: %s, id: %d\n",
-			_res_opcodes[opcode], _res_resultcodes[rcode], id);
-	if ((!_res.pfcode) || (_res.pfcode & RES_PRF_HEADX))
-		putc(';', file);
-	if ((!_res.pfcode) || (_res.pfcode & RES_PRF_HEAD2)) {
-		fprintf(file, "; flags:");
-		if (ns_msg_getflag(handle, ns_f_qr))
-			fprintf(file, " qr");
-		if (ns_msg_getflag(handle, ns_f_aa))
-			fprintf(file, " aa");
-		if (ns_msg_getflag(handle, ns_f_tc))
-			fprintf(file, " tc");
-		if (ns_msg_getflag(handle, ns_f_rd))
-			fprintf(file, " rd");
-		if (ns_msg_getflag(handle, ns_f_ra))
-			fprintf(file, " ra");
-		if (ns_msg_getflag(handle, ns_f_z))
-			fprintf(file, " ??");
-		if (ns_msg_getflag(handle, ns_f_ad))
-			fprintf(file, " ad");
-		if (ns_msg_getflag(handle, ns_f_cd))
-			fprintf(file, " cd");
-	}
-	if ((!_res.pfcode) || (_res.pfcode & RES_PRF_HEAD1)) {
-		fprintf(file, "; %s: %d",
-			p_section(ns_s_qd, opcode), qdcount);
-		fprintf(file, ", %s: %d",
-			p_section(ns_s_an, opcode), ancount);
-		fprintf(file, ", %s: %d",
-			p_section(ns_s_ns, opcode), nscount);
-		fprintf(file, ", %s: %d",
-			p_section(ns_s_ar, opcode), arcount);
-	}
-	if ((!_res.pfcode) || (_res.pfcode & 
-		(RES_PRF_HEADX | RES_PRF_HEAD2 | RES_PRF_HEAD1))) {
-		putc('\n',file);
-	}
-	/*
-	 * Print the various sections.
-	 */
-	do_section(&handle, ns_s_qd, RES_PRF_QUES, file);
-	do_section(&handle, ns_s_an, RES_PRF_ANS, file);
-	do_section(&handle, ns_s_ns, RES_PRF_AUTH, file);
-	do_section(&handle, ns_s_ar, RES_PRF_ADD, file);
-	if (qdcount == 0 && ancount == 0 &&
-	    nscount == 0 && arcount == 0)
-		putc('\n', file);
-}
-
-const u_char *
-p_cdnname(const u_char *cp, const u_char *msg, int len, FILE *file) {
-	char name[MAXDNAME];
-	int n;
-
-	if ((n = dn_expand(msg, msg + len, cp, name, sizeof name)) < 0)
-		return (NULL);
-	if (name[0] == '\0')
-		putc('.', file);
-	else
-		fputs(name, file);
-	return (cp + n);
-}
-
-const u_char *
-p_cdname(const u_char *cp, const u_char *msg, FILE *file) {
-	return (p_cdnname(cp, msg, PACKETSZ, file));
-}
-
-/* Return a fully-qualified domain name from a compressed name (with
-   length supplied).  */
-
-const u_char *
-p_fqnname(cp, msg, msglen, name, namelen)
-	const u_char *cp, *msg;
-	int msglen;
-	char *name;
-	int namelen;
-{
-	int n, newlen;
-
-	if ((n = dn_expand(msg, cp + msglen, cp, name, namelen)) < 0)
-		return (NULL);
-	newlen = strlen(name);
-	if (newlen == 0 || name[newlen - 1] != '.') {
-		if (newlen + 1 >= namelen)	/* Lack space for final dot */
-			return (NULL);
-		else
-			strcpy(name + newlen, ".");
-	}
-	return (cp + n);
-}
-
-/* XXX:	the rest of these functions need to become length-limited, too. */
-
-const u_char *
-p_fqname(const u_char *cp, const u_char *msg, FILE *file) {
-	char name[MAXDNAME];
-	const u_char *n;
-
-	n = p_fqnname(cp, msg, MAXCDNAME, name, sizeof name);
-	if (n == NULL)
-		return (NULL);
-	fputs(name, file);
-	return (n);
-}
-
-/*
- * Names of RR classes and qclasses.  Classes and qclasses are the same, except
- * that C_ANY is a qclass but not a class.  (You can ask for records of class
- * C_ANY, but you can't have any records of that class in the database.)
- */
-const struct res_sym __p_class_syms[] = {
-	{C_IN,		"IN"},
-	{C_CHAOS,	"CHAOS"},
-	{C_HS,		"HS"},
-	{C_HS,		"HESIOD"},
-	{C_ANY,		"ANY"},
-	{C_NONE,	"NONE"},
-	{C_IN, 		(char *)0}
-};
-
-/*
- * Names of message sections.
- */
-const struct res_sym __p_default_section_syms[] = {
-	{ns_s_qd,	"QUERY"},
-	{ns_s_an,	"ANSWER"},
-	{ns_s_ns,	"AUTHORITY"},
-	{ns_s_ar,	"ADDITIONAL"},
-	{0,             (char *)0}
-};
-
-const struct res_sym __p_update_section_syms[] = {
-	{S_ZONE,	"ZONE"},
-	{S_PREREQ,	"PREREQUISITE"},
-	{S_UPDATE,	"UPDATE"},
-	{S_ADDT,	"ADDITIONAL"},
-	{0,             (char *)0}
-};
-
-/*
- * Names of RR types and qtypes.  Types and qtypes are the same, except
- * that T_ANY is a qtype but not a type.  (You can ask for records of type
- * T_ANY, but you can't have any records of that type in the database.)
- */
-const struct res_sym __p_type_syms[] = {
-	{T_A,		"A",		"address"},
-	{T_NS,		"NS",		"name server"},
-	{T_MD,		"MD",		"mail destination (deprecated)"},
-	{T_MF,		"MF",		"mail forwarder (deprecated)"},
-	{T_CNAME,	"CNAME",	"canonical name"},
-	{T_SOA,		"SOA",		"start of authority"},
-	{T_MB,		"MB",		"mailbox"},
-	{T_MG,		"MG",		"mail group member"},
-	{T_MR,		"MR",		"mail rename"},
-	{T_NULL,	"NULL",		"null"},
-	{T_WKS,		"WKS",		"well-known service (deprecated)"},
-	{T_PTR,		"PTR",		"domain name pointer"},
-	{T_HINFO,	"HINFO",	"host information"},
-	{T_MINFO,	"MINFO",	"mailbox information"},
-	{T_MX,		"MX",		"mail exchanger"},
-	{T_TXT,		"TXT",		"text"},
-	{T_RP,		"RP",		"responsible person"},
-	{T_AFSDB,	"AFSDB",	"DCE or AFS server"},
-	{T_X25,		"X25",		"X25 address"},
-	{T_ISDN,	"ISDN",		"ISDN address"},
-	{T_RT,		"RT",		"router"},
-	{T_NSAP,	"NSAP",		"nsap address"},
-	{T_NSAP_PTR,	"NSAP_PTR",	"domain name pointer"},
-	{T_SIG,		"SIG",		"signature"},
-	{T_KEY,		"KEY",		"key"},
-	{T_PX,		"PX",		"mapping information"},
-	{T_GPOS,	"GPOS",		"geographical position (withdrawn)"},
-	{T_AAAA,	"AAAA",		"IPv6 address"},
-	{T_LOC,		"LOC",		"location"},
-	{T_NXT,		"NXT",		"next valid name (unimplemented)"},
-	{T_EID,		"EID",		"endpoint identifier (unimplemented)"},
-	{T_NIMLOC,	"NIMLOC",	"NIMROD locator (unimplemented)"},
-	{T_SRV,		"SRV",		"server selection"},
-	{T_ATMA,	"ATMA",		"ATM address (unimplemented)"},
-	{T_IXFR,	"IXFR",		"incremental zone transfer"},
-	{T_AXFR,	"AXFR",		"zone transfer"},
-	{T_MAILB,	"MAILB",	"mailbox-related data (deprecated)"},
-	{T_MAILA,	"MAILA",	"mail agent (deprecated)"},
-	{T_NAPTR,	"NAPTR",	"URN Naming Authority"},
-	{T_ANY,		"ANY",		"\"any\""},
-	{0, 		NULL,		NULL}
-};
-
-int
-sym_ston(const struct res_sym *syms, const char *name, int *success) {
-	for ((void)NULL; syms->name != 0; syms++) {
-		if (strcasecmp (name, syms->name) == 0) {
-			if (success)
-				*success = 1;
-			return (syms->number);
-		}
-	}
-	if (success)
-		*success = 0;
-	return (syms->number);		/* The default value. */
-}
-
-const char *
-sym_ntos(const struct res_sym *syms, int number, int *success) {
-	static char unname[20];
-
-	for ((void)NULL; syms->name != 0; syms++) {
-		if (number == syms->number) {
-			if (success)
-				*success = 1;
-			return (syms->name);
-		}
-	}
-
-	sprintf(unname, "%d", number);
-	if (success)
-		*success = 0;
-	return (unname);
-}
-
-const char *
-sym_ntop(const struct res_sym *syms, int number, int *success) {
-	static char unname[20];
-
-	for ((void)NULL; syms->name != 0; syms++) {
-		if (number == syms->number) {
-			if (success)
-				*success = 1;
-			return (syms->humanname);
-		}
-	}
-	sprintf(unname, "%d", number);
-	if (success)
-		*success = 0;
-	return (unname);
-}
-
-/*
- * Return a string for the type.
- */
-const char *
-p_type(int type) {
-	return (sym_ntos(__p_type_syms, type, (int *)0));
-}
-
-/*
- * Return a string for the type.
- */
-const char *
-p_section(int section, int opcode) {
-	const struct res_sym *symbols;
-
-	switch (opcode) {
-	case ns_o_update:
-		symbols = __p_update_section_syms;
-		break;
-	default:
-		symbols = __p_default_section_syms;
-		break;
-	}
-	return (sym_ntos(symbols, section, (int *)0));
-}
-
-/*
- * Return a mnemonic for class.
- */
-const char *
-p_class(int class) {
-	return (sym_ntos(__p_class_syms, class, (int *)0));
-}
-
-/*
- * Return a mnemonic for an option
- */
-const char *
-p_option(u_long option) {
-	static char nbuf[40];
-
-	switch (option) {
-	case RES_INIT:		return "init";
-	case RES_DEBUG:		return "debug";
-	case RES_AAONLY:	return "aaonly(unimpl)";
-	case RES_USEVC:		return "usevc";
-	case RES_PRIMARY:	return "primry(unimpl)";
-	case RES_IGNTC:		return "igntc";
-	case RES_RECURSE:	return "recurs";
-	case RES_DEFNAMES:	return "defnam";
-	case RES_STAYOPEN:	return "styopn";
-	case RES_DNSRCH:	return "dnsrch";
-	case RES_INSECURE1:	return "insecure1";
-	case RES_INSECURE2:	return "insecure2";
-	default:		sprintf(nbuf, "?0x%lx?", (u_long)option);
-				return (nbuf);
-	}
-}
-
-/*
- * Return a mnemonic for a time to live.
- */
-const char *
-p_time(u_int32_t value) {
-	static char nbuf[40];
-
-	if (ns_format_ttl(value, nbuf, sizeof nbuf) < 0)
-		sprintf(nbuf, "%u", value);
-	return (nbuf);
-}
-
-
-/*
- * routines to convert between on-the-wire RR format and zone file format.
- * Does not contain conversion to/from decimal degrees; divide or multiply
- * by 60*60*1000 for that.
- */
-
-static unsigned int poweroften[10] = {1, 10, 100, 1000, 10000, 100000,
-				      1000000,10000000,100000000,1000000000};
-
-/* takes an XeY precision/size value, returns a string representation. */
-static const char *
-precsize_ntoa(prec)
-	u_int8_t prec;
-{
-	static char retbuf[sizeof "90000000.00"];
-	unsigned long val;
-	int mantissa, exponent;
-
-	mantissa = (int)((prec >> 4) & 0x0f) % 10;
-	exponent = (int)((prec >> 0) & 0x0f) % 10;
-
-	val = mantissa * poweroften[exponent];
-
-	(void) sprintf(retbuf, "%ld.%.2ld", val/100, val%100);
-	return (retbuf);
-}
-
-/* converts ascii size/precision X * 10**Y(cm) to 0xXY.  moves pointer. */
-static u_int8_t
-precsize_aton(strptr)
-	char **strptr;
-{
-	unsigned int mval = 0, cmval = 0;
-	u_int8_t retval = 0;
-	char *cp;
-	int exponent;
-	int mantissa;
-
-	cp = *strptr;
-
-	while (isdigit((int)*cp))
-		mval = mval * 10 + (*cp++ - '0');
-
-	if (*cp == '.') {		/* centimeters */
-		cp++;
-		if (isdigit((int)*cp)) {
-			cmval = (*cp++ - '0') * 10;
-			if (isdigit((int)*cp)) {
-				cmval += (*cp++ - '0');
-			}
-		}
-	}
-	cmval = (mval * 100) + cmval;
-
-	for (exponent = 0; exponent < 9; exponent++)
-		if (cmval < poweroften[exponent+1])
-			break;
-
-	mantissa = cmval / poweroften[exponent];
-	if (mantissa > 9)
-		mantissa = 9;
-
-	retval = (mantissa << 4) | exponent;
-
-	*strptr = cp;
-
-	return (retval);
-}
-
-/* converts ascii lat/lon to unsigned encoded 32-bit number.  moves pointer. */
-static u_int32_t
-latlon2ul(latlonstrptr,which)
-	char **latlonstrptr;
-	int *which;
-{
-	char *cp;
-	u_int32_t retval;
-	int deg = 0, min = 0, secs = 0, secsfrac = 0;
-
-	cp = *latlonstrptr;
-
-	while (isdigit((int)*cp))
-		deg = deg * 10 + (*cp++ - '0');
-
-	while (isspace((int)*cp))
-		cp++;
-
-	if (!(isdigit((int)*cp)))
-		goto fndhemi;
-
-	while (isdigit((int)*cp))
-		min = min * 10 + (*cp++ - '0');
-
-	while (isspace((int)*cp))
-		cp++;
-
-	if (!(isdigit((int)*cp)))
-		goto fndhemi;
-
-	while (isdigit((int)*cp))
-		secs = secs * 10 + (*cp++ - '0');
-
-	if (*cp == '.') {		/* decimal seconds */
-		cp++;
-		if (isdigit((int)*cp)) {
-			secsfrac = (*cp++ - '0') * 100;
-			if (isdigit((int)*cp)) {
-				secsfrac += (*cp++ - '0') * 10;
-				if (isdigit((int)*cp)) {
-					secsfrac += (*cp++ - '0');
-				}
-			}
-		}
-	}
-
-	while (!isspace((int)*cp))	/* if any trailing garbage */
-		cp++;
-
-	while (isspace((int)*cp))
-		cp++;
-
- fndhemi:
-	switch (*cp) {
-	case 'N': case 'n':
-	case 'E': case 'e':
-		retval = ((unsigned)1<<31)
-			+ (((((deg * 60) + min) * 60) + secs) * 1000)
-			+ secsfrac;
-		break;
-	case 'S': case 's':
-	case 'W': case 'w':
-		retval = ((unsigned)1<<31)
-			- (((((deg * 60) + min) * 60) + secs) * 1000)
-			- secsfrac;
-		break;
-	default:
-		retval = 0;	/* invalid value -- indicates error */
-		break;
-	}
-
-	switch (*cp) {
-	case 'N': case 'n':
-	case 'S': case 's':
-		*which = 1;	/* latitude */
-		break;
-	case 'E': case 'e':
-	case 'W': case 'w':
-		*which = 2;	/* longitude */
-		break;
-	default:
-		*which = 0;	/* error */
-		break;
-	}
-
-	cp++;			/* skip the hemisphere */
-
-	while (!isspace((int)*cp))	/* if any trailing garbage */
-		cp++;
-
-	while (isspace((int)*cp))	/* move to next field */
-		cp++;
-
-	*latlonstrptr = cp;
-
-	return (retval);
-}
-
-/* converts a zone file representation in a string to an RDATA on-the-wire
- * representation. */
-int
-loc_aton(ascii, binary)
-	const char *ascii;
-	u_char *binary;
-{
-	const char *cp, *maxcp;
-	u_char *bcp;
-
-	u_int32_t latit = 0, longit = 0, alt = 0;
-	u_int32_t lltemp1 = 0, lltemp2 = 0;
-	int altmeters = 0, altfrac = 0, altsign = 1;
-	u_int8_t hp = 0x16;	/* default = 1e6 cm = 10000.00m = 10km */
-	u_int8_t vp = 0x13;	/* default = 1e3 cm = 10.00m */
-	u_int8_t siz = 0x12;	/* default = 1e2 cm = 1.00m */
-	int which1 = 0, which2 = 0;
-
-	cp = ascii;
-	maxcp = cp + strlen(ascii);
-
-	lltemp1 = latlon2ul(&cp, &which1);
-
-	lltemp2 = latlon2ul(&cp, &which2);
-
-	switch (which1 + which2) {
-	case 3:			/* 1 + 2, the only valid combination */
-		if ((which1 == 1) && (which2 == 2)) { /* normal case */
-			latit = lltemp1;
-			longit = lltemp2;
-		} else if ((which1 == 2) && (which2 == 1)) { /* reversed */
-			longit = lltemp1;
-			latit = lltemp2;
-		} else {	/* some kind of brokenness */
-			return (0);
-		}
-		break;
-	default:		/* we didn't get one of each */
-		return (0);
-	}
-
-	/* altitude */
-	if (*cp == '-') {
-		altsign = -1;
-		cp++;
-	}
-    
-	if (*cp == '+')
-		cp++;
-
-	while (isdigit((int)*cp))
-		altmeters = altmeters * 10 + (*cp++ - '0');
-
-	if (*cp == '.') {		/* decimal meters */
-		cp++;
-		if (isdigit((int)*cp)) {
-			altfrac = (*cp++ - '0') * 10;
-			if (isdigit((int)*cp)) {
-				altfrac += (*cp++ - '0');
-			}
-		}
-	}
-
-	alt = (10000000 + (altsign * (altmeters * 100 + altfrac)));
-
-	while (!isspace((int)*cp) && (cp < maxcp)) /* if trailing garbage or m */
-		cp++;
-
-	while (isspace((int)*cp) && (cp < maxcp))
-		cp++;
-
-	if (cp >= maxcp)
-		goto defaults;
-
-	siz = precsize_aton(&cp);
-	
-	while (!isspace((int)*cp) && (cp < maxcp))	/* if trailing garbage or m */
-		cp++;
-
-	while (isspace((int)*cp) && (cp < maxcp))
-		cp++;
-
-	if (cp >= maxcp)
-		goto defaults;
-
-	hp = precsize_aton(&cp);
-
-	while (!isspace((int)*cp) && (cp < maxcp))	/* if trailing garbage or m */
-		cp++;
-
-	while (isspace((int)*cp) && (cp < maxcp))
-		cp++;
-
-	if (cp >= maxcp)
-		goto defaults;
-
-	vp = precsize_aton(&cp);
-
- defaults:
-
-	bcp = binary;
-	*bcp++ = (u_int8_t) 0;	/* version byte */
-	*bcp++ = siz;
-	*bcp++ = hp;
-	*bcp++ = vp;
-	PUTLONG(latit,bcp);
-	PUTLONG(longit,bcp);
-	PUTLONG(alt,bcp);
-    
-	return (16);		/* size of RR in octets */
-}
-
-/* takes an on-the-wire LOC RR and formats it in a human readable format. */
-const char *
-loc_ntoa(binary, ascii)
-	const u_char *binary;
-	char *ascii;
-{
-	static char *error = "?";
-	const u_char *cp = binary;
-
-	int latdeg, latmin, latsec, latsecfrac;
-	int longdeg, longmin, longsec, longsecfrac;
-	char northsouth, eastwest;
-	int altmeters, altfrac, altsign;
-
-	const u_int32_t referencealt = 100000 * 100;
-
-	int32_t latval, longval, altval;
-	u_int32_t templ;
-	u_int8_t sizeval, hpval, vpval, versionval;
-    
-	char *sizestr, *hpstr, *vpstr;
-
-	versionval = *cp++;
-
-	if (versionval) {
-		(void) sprintf(ascii, "; error: unknown LOC RR version");
-		return (ascii);
-	}
-
-	sizeval = *cp++;
-
-	hpval = *cp++;
-	vpval = *cp++;
-
-	GETLONG(templ, cp);
-	latval = (templ - ((unsigned)1<<31));
-
-	GETLONG(templ, cp);
-	longval = (templ - ((unsigned)1<<31));
-
-	GETLONG(templ, cp);
-	if (templ < referencealt) { /* below WGS 84 spheroid */
-		altval = referencealt - templ;
-		altsign = -1;
-	} else {
-		altval = templ - referencealt;
-		altsign = 1;
-	}
-
-	if (latval < 0) {
-		northsouth = 'S';
-		latval = -latval;
-	} else
-		northsouth = 'N';
-
-	latsecfrac = latval % 1000;
-	latval = latval / 1000;
-	latsec = latval % 60;
-	latval = latval / 60;
-	latmin = latval % 60;
-	latval = latval / 60;
-	latdeg = latval;
-
-	if (longval < 0) {
-		eastwest = 'W';
-		longval = -longval;
-	} else
-		eastwest = 'E';
-
-	longsecfrac = longval % 1000;
-	longval = longval / 1000;
-	longsec = longval % 60;
-	longval = longval / 60;
-	longmin = longval % 60;
-	longval = longval / 60;
-	longdeg = longval;
-
-	altfrac = altval % 100;
-	altmeters = (altval / 100) * altsign;
-
-	if ((sizestr = strdup(precsize_ntoa(sizeval))) == NULL)
-		sizestr = error;
-	if ((hpstr = strdup(precsize_ntoa(hpval))) == NULL)
-		hpstr = error;
-	if ((vpstr = strdup(precsize_ntoa(vpval))) == NULL)
-		vpstr = error;
-
-	sprintf(ascii,
-	      "%d %.2d %.2d.%.3d %c %d %.2d %.2d.%.3d %c %d.%.2dm %sm %sm %sm",
-		latdeg, latmin, latsec, latsecfrac, northsouth,
-		longdeg, longmin, longsec, longsecfrac, eastwest,
-		altmeters, altfrac, sizestr, hpstr, vpstr);
-
-	if (sizestr != error)
-		free(sizestr);
-	if (hpstr != error)
-		free(hpstr);
-	if (vpstr != error)
-		free(vpstr);
-
-	return (ascii);
-}
-
-
-/* Return the number of DNS hierarchy levels in the name. */
-int
-dn_count_labels(const char *name) {
-	int i, len, count;
-
-	len = strlen(name);
-	for (i = 0, count = 0; i < len; i++) {
-		/* XXX need to check for \. or use named's nlabels(). */
-		if (name[i] == '.')
-			count++;
-	}
-
-	/* don't count initial wildcard */
-	if (name[0] == '*')
-		if (count)
-			count--;
-
-	/* don't count the null label for root. */
-	/* if terminating '.' not found, must adjust */
-	/* count to include last label */
-	if (len > 0 && name[len-1] != '.')
-		count++;
-	return (count);
-}
-
-
-/* 
- * Make dates expressed in seconds-since-Jan-1-1970 easy to read.  
- * SIG records are required to be printed like this, by the Secure DNS RFC.
- */
-char *
-p_secstodate (u_long secs) {
-	static char output[15];		/* YYYYMMDDHHMMSS and null */
-	time_t clock = secs;
-	struct tm *time;
-	
-	time = gmtime(&clock);
-	time->tm_year += 1900;
-	time->tm_mon += 1;
-	sprintf(output, "%04d%02d%02d%02d%02d%02d",
-		time->tm_year, time->tm_mon, time->tm_mday,
-		time->tm_hour, time->tm_min, time->tm_sec);
-	return (output);
-}
diff --git a/c/src/exec/libnetworking/libc/res_init.c b/c/src/exec/libnetworking/libc/res_init.c
deleted file mode 100644
index 9371e9fa82..0000000000
--- a/c/src/exec/libnetworking/libc/res_init.c
+++ /dev/null
@@ -1,497 +0,0 @@
-/*
- * Copyright (c) 1985, 1989, 1993
- *    The Regents of the University of California.  All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- * 	This product includes software developed by the University of
- * 	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-/*
- * Portions Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)res_init.c	8.1 (Berkeley) 6/7/93";
-static char orig_rcsid[] = "From: Id: res_init.c,v 8.7 1996/11/18 09:10:04 vixie Exp $";
-static char rcsid[] = "$Id$";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-#include <ctype.h>
-#include <resolv.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "res_config.h"
-
-static void res_setoptions __P((char *, char *));
-
-#ifdef RESOLVSORT
-static const char sort_mask[] = "/&";
-#define ISSORTMASK(ch) (strchr(sort_mask, ch) != NULL)
-static u_int32_t net_mask __P((struct in_addr));
-#endif
-
-#if !defined(isascii) /* XXX - could be a function */
-# define isascii(c) (!(c & 0200))
-#endif
-
-/*
- * Resolver state default settings.
- */
-
-struct __res_state _res
-# if defined(__BIND_RES_TEXT)
-	= { RES_TIMEOUT, }	/* Motorola, et al. */
-# endif
-	;
-
-
-/*
- * Set up default settings.  If the configuration file exist, the values
- * there will have precedence.  Otherwise, the server address is set to
- * INADDR_ANY and the default domain name comes from the gethostname().
- *
- * An interrim version of this code (BIND 4.9, pre-4.4BSD) used 127.0.0.1
- * rather than INADDR_ANY ("0.0.0.0") as the default name server address
- * since it was noted that INADDR_ANY actually meant ``the first interface
- * you "ifconfig"'d at boot time'' and if this was a SLIP or PPP interface,
- * it had to be "up" in order for you to reach your own name server.  It
- * was later decided that since the recommended practice is to always 
- * install local static routes through 127.0.0.1 for all your network
- * interfaces, that we could solve this problem without a code change.
- *
- * The configuration file should always be used, since it is the only way
- * to specify a default domain.  If you are running a server on your local
- * machine, you should say "nameserver 0.0.0.0" or "nameserver 127.0.0.1"
- * in the configuration file.
- *
- * Return 0 if completes successfully, -1 on error
- */
-int
-res_init()
-{
-	register FILE *fp;
-	register char *cp, **pp;
-	register int n;
-	char buf[MAXDNAME];
-	int nserv = 0;    /* number of nameserver records read from file */
-	int haveenv = 0;
-	int havesearch = 0;
-#ifdef RESOLVSORT
-	int nsort = 0;
-	char *net;
-#endif
-#ifndef RFC1535
-	int dots;
-#endif
-
-	/*
-	 * These three fields used to be statically initialized.  This made
-	 * it hard to use this code in a shared library.  It is necessary,
-	 * now that we're doing dynamic initialization here, that we preserve
-	 * the old semantics: if an application modifies one of these three
-	 * fields of _res before res_init() is called, res_init() will not
-	 * alter them.  Of course, if an application is setting them to
-	 * _zero_ before calling res_init(), hoping to override what used
-	 * to be the static default, we can't detect it and unexpected results
-	 * will follow.  Zero for any of these fields would make no sense,
-	 * so one can safely assume that the applications were already getting
-	 * unexpected results.
-	 *
-	 * _res.options is tricky since some apps were known to diddle the bits
-	 * before res_init() was first called. We can't replicate that semantic
-	 * with dynamic initialization (they may have turned bits off that are
-	 * set in RES_DEFAULT).  Our solution is to declare such applications
-	 * "broken".  They could fool us by setting RES_INIT but none do (yet).
-	 */
-	if (!_res.retrans)
-		_res.retrans = RES_TIMEOUT;
-	if (!_res.retry)
-		_res.retry = 4;
-	if (!(_res.options & RES_INIT))
-		_res.options = RES_DEFAULT;
-
-	/*
-	 * This one used to initialize implicitly to zero, so unless the app
-	 * has set it to something in particular, we can randomize it now.
-	 */
-	if (!_res.id)
-		_res.id = res_randomid();
-
-#ifdef USELOOPBACK
-	_res.nsaddr.sin_addr = inet_makeaddr(IN_LOOPBACKNET, 1);
-#else
-	_res.nsaddr.sin_addr.s_addr = INADDR_ANY;
-#endif
-	_res.nsaddr.sin_family = AF_INET;
-	_res.nsaddr.sin_port = htons(NAMESERVER_PORT);
-	_res.nscount = 1;
-	_res.ndots = 1;
-	_res.pfcode = 0;
-
-	/*
-	 * RTEMS -- Set up name servers
-	 */
-	{
-#include <rtems/rtems_bsdnet_internal.h>
-	int n = 0;
-	while ((n < rtems_bsdnet_nameserver_count) && (nserv < MAXNS)) {
-		_res.nsaddr_list[nserv].sin_addr = rtems_bsdnet_nameserver[n];
-		_res.nsaddr_list[nserv].sin_family = AF_INET;
-		_res.nsaddr_list[nserv].sin_port = htons(NAMESERVER_PORT);
-		nserv++;
-		n++;
-	}
-	if (rtems_bsdnet_domain_name)
-		(void)strncpy(_res.defdname, rtems_bsdnet_domain_name, sizeof(_res.defdname) - 1);
-	}
-
-	/* Allow user to override the local domain definition */
-	if ((cp = getenv("LOCALDOMAIN")) != NULL) {
-		(void)strncpy(_res.defdname, cp, sizeof(_res.defdname) - 1);
-		haveenv++;
-
-		/*
-		 * Set search list to be blank-separated strings
-		 * from rest of env value.  Permits users of LOCALDOMAIN
-		 * to still have a search list, and anyone to set the
-		 * one that they want to use as an individual (even more
-		 * important now that the rfc1535 stuff restricts searches)
-		 */
-		cp = _res.defdname;
-		pp = _res.dnsrch;
-		*pp++ = cp;
-		for (n = 0; *cp && pp < _res.dnsrch + MAXDNSRCH; cp++) {
-			if (*cp == '\n')	/* silly backwards compat */
-				break;
-			else if (*cp == ' ' || *cp == '\t') {
-				*cp = 0;
-				n = 1;
-			} else if (n) {
-				*pp++ = cp;
-				n = 0;
-				havesearch = 1;
-			}
-		}
-		/* null terminate last domain if there are excess */
-		while (*cp != '\0' && *cp != ' ' && *cp != '\t' && *cp != '\n')
-			cp++;
-		*cp = '\0';
-		*pp++ = 0;
-	}
-
-#define	MATCH(line, name) \
-	(!strncmp(line, name, sizeof(name) - 1) && \
-	(line[sizeof(name) - 1] == ' ' || \
-	 line[sizeof(name) - 1] == '\t'))
-
-	if ((fp = fopen(_PATH_RESCONF, "r")) != NULL) {
-	    /* read the config file */
-	    while (fgets(buf, sizeof(buf), fp) != NULL) {
-		/* skip comments */
-		if (*buf == ';' || *buf == '#')
-			continue;
-		/* read default domain name */
-		if (MATCH(buf, "domain")) {
-		    if (haveenv)	/* skip if have from environ */
-			    continue;
-		    cp = buf + sizeof("domain") - 1;
-		    while (*cp == ' ' || *cp == '\t')
-			    cp++;
-		    if ((*cp == '\0') || (*cp == '\n'))
-			    continue;
-		    strncpy(_res.defdname, cp, sizeof(_res.defdname) - 1);
-		    if ((cp = strpbrk(_res.defdname, " \t\n")) != NULL)
-			    *cp = '\0';
-		    havesearch = 0;
-		    continue;
-		}
-		/* set search list */
-		if (MATCH(buf, "search")) {
-		    if (haveenv)	/* skip if have from environ */
-			    continue;
-		    cp = buf + sizeof("search") - 1;
-		    while (*cp == ' ' || *cp == '\t')
-			    cp++;
-		    if ((*cp == '\0') || (*cp == '\n'))
-			    continue;
-		    strncpy(_res.defdname, cp, sizeof(_res.defdname) - 1);
-		    if ((cp = strchr(_res.defdname, '\n')) != NULL)
-			    *cp = '\0';
-		    /*
-		     * Set search list to be blank-separated strings
-		     * on rest of line.
-		     */
-		    cp = _res.defdname;
-		    pp = _res.dnsrch;
-		    *pp++ = cp;
-		    for (n = 0; *cp && pp < _res.dnsrch + MAXDNSRCH; cp++) {
-			    if (*cp == ' ' || *cp == '\t') {
-				    *cp = 0;
-				    n = 1;
-			    } else if (n) {
-				    *pp++ = cp;
-				    n = 0;
-			    }
-		    }
-		    /* null terminate last domain if there are excess */
-		    while (*cp != '\0' && *cp != ' ' && *cp != '\t')
-			    cp++;
-		    *cp = '\0';
-		    *pp++ = 0;
-		    havesearch = 1;
-		    continue;
-		}
-		/* read nameservers to query */
-		if (MATCH(buf, "nameserver") && nserv < MAXNS) {
-		    struct in_addr a;
-
-		    cp = buf + sizeof("nameserver") - 1;
-		    while (*cp == ' ' || *cp == '\t')
-			cp++;
-		    if ((*cp != '\0') && (*cp != '\n') && inet_aton(cp, &a)) {
-			_res.nsaddr_list[nserv].sin_addr = a;
-			_res.nsaddr_list[nserv].sin_family = AF_INET;
-			_res.nsaddr_list[nserv].sin_port =
-				htons(NAMESERVER_PORT);
-			nserv++;
-		    }
-		    continue;
-		}
-#ifdef RESOLVSORT
-		if (MATCH(buf, "sortlist")) {
-		    struct in_addr a;
-
-		    cp = buf + sizeof("sortlist") - 1;
-		    while (nsort < MAXRESOLVSORT) {
-			while (*cp == ' ' || *cp == '\t')
-			    cp++;
-			if (*cp == '\0' || *cp == '\n' || *cp == ';')
-			    break;
-			net = cp;
-			while (*cp && !ISSORTMASK(*cp) && *cp != ';' &&
-			       isascii((int)*cp) && !isspace((int)*cp))
-				cp++;
-			n = *cp;
-			*cp = 0;
-			if (inet_aton(net, &a)) {
-			    _res.sort_list[nsort].addr = a;
-			    if (ISSORTMASK(n)) {
-				*cp++ = n;
-				net = cp;
-				while (*cp && *cp != ';' &&
-					isascii((int)*cp) && !isspace((int)*cp))
-				    cp++;
-				n = *cp;
-				*cp = 0;
-				if (inet_aton(net, &a)) {
-				    _res.sort_list[nsort].mask = a.s_addr;
-				} else {
-				    _res.sort_list[nsort].mask = 
-					net_mask(_res.sort_list[nsort].addr);
-				}
-			    } else {
-				_res.sort_list[nsort].mask = 
-				    net_mask(_res.sort_list[nsort].addr);
-			    }
-			    nsort++;
-			}
-			*cp = n;
-		    }
-		    continue;
-		}
-#endif
-		if (MATCH(buf, "options")) {
-		    res_setoptions(buf + sizeof("options") - 1, "conf");
-		    continue;
-		}
-	    }
-	    if (nserv > 1) 
-		_res.nscount = nserv;
-#ifdef RESOLVSORT
-	    _res.nsort = nsort;
-#endif
-	    (void) fclose(fp);
-	}
-	if (_res.defdname[0] == 0 &&
-	    gethostname(buf, sizeof(_res.defdname) - 1) == 0 &&
-	    (cp = strchr(buf, '.')) != NULL)
-		strcpy(_res.defdname, cp + 1);
-
-	/* find components of local domain that might be searched */
-	if (havesearch == 0) {
-		pp = _res.dnsrch;
-		*pp++ = _res.defdname;
-		*pp = NULL;
-
-#ifndef RFC1535
-		dots = 0;
-		for (cp = _res.defdname; *cp; cp++)
-			dots += (*cp == '.');
-
-		cp = _res.defdname;
-		while (pp < _res.dnsrch + MAXDFLSRCH) {
-			if (dots < LOCALDOMAINPARTS)
-				break;
-			cp = strchr(cp, '.') + 1;    /* we know there is one */
-			*pp++ = cp;
-			dots--;
-		}
-		*pp = NULL;
-#ifdef DEBUG
-		if (_res.options & RES_DEBUG) {
-			printf(";; res_init()... default dnsrch list:\n");
-			for (pp = _res.dnsrch; *pp; pp++)
-				printf(";;\t%s\n", *pp);
-			printf(";;\t..END..\n");
-		}
-#endif
-#endif /* !RFC1535 */
-	}
-
-	if ((cp = getenv("RES_OPTIONS")) != NULL)
-		res_setoptions(cp, "env");
-	_res.options |= RES_INIT;
-	return (0);
-}
-
-static void
-res_setoptions(options, source)
-	char *options, *source;
-{
-	char *cp = options;
-	int i;
-
-#ifdef DEBUG
-	if (_res.options & RES_DEBUG)
-		printf(";; res_setoptions(\"%s\", \"%s\")...\n",
-		       options, source);
-#endif
-	while (*cp) {
-		/* skip leading and inner runs of spaces */
-		while (*cp == ' ' || *cp == '\t')
-			cp++;
-		/* search for and process individual options */
-		if (!strncmp(cp, "ndots:", sizeof("ndots:") - 1)) {
-			i = atoi(cp + sizeof("ndots:") - 1);
-			if (i <= RES_MAXNDOTS)
-				_res.ndots = i;
-			else
-				_res.ndots = RES_MAXNDOTS;
-#ifdef DEBUG
-			if (_res.options & RES_DEBUG)
-				printf(";;\tndots=%d\n", _res.ndots);
-#endif
-		} else if (!strncmp(cp, "debug", sizeof("debug") - 1)) {
-#ifdef DEBUG
-			if (!(_res.options & RES_DEBUG)) {
-				printf(";; res_setoptions(\"%s\", \"%s\")..\n",
-				       options, source);
-				_res.options |= RES_DEBUG;
-			}
-			printf(";;\tdebug\n");
-#endif
-		} else if (!strncmp(cp, "inet6", sizeof("inet6") - 1)) {
-			_res.options |= RES_USE_INET6;
-		} else if (!strncmp(cp, "no_tld_query", sizeof("no_tld_query") - 1)) {
-			_res.options |= RES_NOTLDQUERY;
-		} else {
-			/* XXX - print a warning here? */
-		}
-		/* skip to next run of spaces */
-		while (*cp && *cp != ' ' && *cp != '\t')
-			cp++;
-	}
-}
-
-#ifdef RESOLVSORT
-/* XXX - should really support CIDR which means explicit masks always. */
-static u_int32_t
-net_mask(in)		/* XXX - should really use system's version of this */
-	struct in_addr in;
-{
-	register u_int32_t i = ntohl(in.s_addr);
-
-	if (IN_CLASSA(i))
-		return (htonl(IN_CLASSA_NET));
-	else if (IN_CLASSB(i))
-		return (htonl(IN_CLASSB_NET));
-	return (htonl(IN_CLASSC_NET));
-}
-#endif
-
-u_int
-res_randomid()
-{
-	struct timeval now;
-
-	gettimeofday(&now, NULL);
-	return (0xffff & (now.tv_sec ^ now.tv_usec ^ getpid()));
-}
diff --git a/c/src/exec/libnetworking/libc/res_mkquery.c b/c/src/exec/libnetworking/libc/res_mkquery.c
deleted file mode 100644
index d3fabfa5ab..0000000000
--- a/c/src/exec/libnetworking/libc/res_mkquery.c
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * Copyright (c) 1985, 1993
- *    The Regents of the University of California.  All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- * 	This product includes software developed by the University of
- * 	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-/*
- * Portions Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)res_mkquery.c	8.1 (Berkeley) 6/4/93";
-static char orig_rcsid[] = "From: Id: res_mkquery.c,v 8.9 1997/04/24 22:22:36 vixie Exp $";
-static char rcsid[] = "$Id$";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "res_config.h"
-
-/*
- * Form all types of queries.
- * Returns the size of the result or -1.
- */
-int
-res_mkquery(op, dname, class, type, data, datalen, newrr_in, buf, buflen)
-	int op;			/* opcode of query */
-	const char *dname;	/* domain name */
-	int class, type;	/* class and type of query */
-	const u_char *data;	/* resource record data */
-	int datalen;		/* length of data */
-	const u_char *newrr_in;	/* new rr for modify or append */
-	u_char *buf;		/* buffer to put query */
-	int buflen;		/* size of buffer */
-{
-	register HEADER *hp;
-	register u_char *cp;
-	register int n;
-	u_char *dnptrs[20], **dpp, **lastdnptr;
-
-	if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
-		h_errno = NETDB_INTERNAL;
-		return (-1);
-	}
-#ifdef DEBUG
-	if (_res.options & RES_DEBUG)
-		printf(";; res_mkquery(%d, %s, %d, %d)\n",
-		       op, dname, class, type);
-#endif
-	/*
-	 * Initialize header fields.
-	 */
-	if ((buf == NULL) || (buflen < HFIXEDSZ))
-		return (-1);
-	memset(buf, 0, HFIXEDSZ);
-	hp = (HEADER *) buf;
-	hp->id = htons(++_res.id);
-	hp->opcode = op;
-	hp->rd = (_res.options & RES_RECURSE) != 0;
-	hp->rcode = NOERROR;
-	cp = buf + HFIXEDSZ;
-	buflen -= HFIXEDSZ;
-	dpp = dnptrs;
-	*dpp++ = buf;
-	*dpp++ = NULL;
-	lastdnptr = dnptrs + sizeof dnptrs / sizeof dnptrs[0];
-	/*
-	 * perform opcode specific processing
-	 */
-	switch (op) {
-	case QUERY:	/*FALLTHROUGH*/
-	case NS_NOTIFY_OP:
-		if ((buflen -= QFIXEDSZ) < 0)
-			return (-1);
-		if ((n = dn_comp(dname, cp, buflen, dnptrs, lastdnptr)) < 0)
-			return (-1);
-		cp += n;
-		buflen -= n;
-		__putshort(type, cp);
-		cp += INT16SZ;
-		__putshort(class, cp);
-		cp += INT16SZ;
-		hp->qdcount = htons(1);
-		if (op == QUERY || data == NULL)
-			break;
-		/*
-		 * Make an additional record for completion domain.
-		 */
-		buflen -= RRFIXEDSZ;
-		n = dn_comp((char *)data, cp, buflen, dnptrs, lastdnptr);
-		if (n < 0)
-			return (-1);
-		cp += n;
-		buflen -= n;
-		__putshort(T_NULL, cp);
-		cp += INT16SZ;
-		__putshort(class, cp);
-		cp += INT16SZ;
-		__putlong(0, cp);
-		cp += INT32SZ;
-		__putshort(0, cp);
-		cp += INT16SZ;
-		hp->arcount = htons(1);
-		break;
-
-	case IQUERY:
-		/*
-		 * Initialize answer section
-		 */
-		if (buflen < 1 + RRFIXEDSZ + datalen)
-			return (-1);
-		*cp++ = '\0';	/* no domain name */
-		__putshort(type, cp);
-		cp += INT16SZ;
-		__putshort(class, cp);
-		cp += INT16SZ;
-		__putlong(0, cp);
-		cp += INT32SZ;
-		__putshort(datalen, cp);
-		cp += INT16SZ;
-		if (datalen) {
-			memcpy(cp, data, datalen);
-			cp += datalen;
-		}
-		hp->ancount = htons(1);
-		break;
-
-	default:
-		return (-1);
-	}
-	return (cp - buf);
-}
diff --git a/c/src/exec/libnetworking/libc/res_mkupdate.c b/c/src/exec/libnetworking/libc/res_mkupdate.c
deleted file mode 100644
index 56362f650b..0000000000
--- a/c/src/exec/libnetworking/libc/res_mkupdate.c
+++ /dev/null
@@ -1,415 +0,0 @@
-/*
- * Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-/*
- * Based on the Dynamic DNS reference implementation by Viraj Bais
- * <viraj_bais@ccm.fm.intel.com>
- */
-
-#if !defined(__rtems__)
-#if !defined(lint) && !defined(SABER)
-static char rcsid[] = "$Id$";
-#endif /* not lint */
-#endif /* not rtems */
-
-#include <sys/types.h>
-#include <sys/param.h>
-
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <arpa/inet.h>
-
-#include <errno.h>
-#include <limits.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <ctype.h>
-
-#include "res_config.h"
-
-static int getnum_str(u_char **, u_char *);
-static int getword_str(char *, int, u_char **, u_char *);
-
-#define ShrinkBuffer(x)  if ((buflen -= x) < 0) return (-2);
-
-/*
- * Form update packets.
- * Returns the size of the resulting packet if no error
- * On error,
- *	returns -1 if error in reading a word/number in rdata
- *		   portion for update packets
- *		-2 if length of buffer passed is insufficient
- *		-3 if zone section is not the first section in
- *		   the linked list, or section order has a problem
- *		-4 on a number overflow
- *		-5 unknown operation or no records
- */
-int
-res_mkupdate(ns_updrec *rrecp_in, u_char *buf, int buflen) {
-	ns_updrec *rrecp_start = rrecp_in;
-	HEADER *hp;
-	u_char *cp, *sp1, *sp2, *startp, *endp;
-	int n, i, soanum, multiline;
-	ns_updrec *rrecp;
-	struct in_addr ina;
-        char buf2[MAXDNAME];
-	int section, numrrs = 0, counts[ns_s_max];
-	u_int16_t rtype, rclass;
-	u_int32_t n1, rttl;
-	u_char *dnptrs[20], **dpp, **lastdnptr;
-
-	if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
-		h_errno = NETDB_INTERNAL;
-		return (-1);
-	}
-
-	/*
-	 * Initialize header fields.
-	 */
-	if ((buf == NULL) || (buflen < HFIXEDSZ))
-		return (-1);
-	memset(buf, 0, HFIXEDSZ);
-	hp = (HEADER *) buf;
-	hp->id = htons(++_res.id);
-	hp->opcode = ns_o_update;
-	hp->rcode = NOERROR;
-	sp1 = buf + 2*INT16SZ;  /* save pointer to zocount */
-	cp = buf + HFIXEDSZ;
-	buflen -= HFIXEDSZ;
-	dpp = dnptrs;
-	*dpp++ = buf;
-	*dpp++ = NULL;
-	lastdnptr = dnptrs + sizeof dnptrs / sizeof dnptrs[0];
-
-	if (rrecp_start == NULL)
-		return (-5);
-	else if (rrecp_start->r_section != S_ZONE)
-		return (-3);
-
-	memset(counts, 0, sizeof counts);
-	for (rrecp = rrecp_start; rrecp; rrecp = rrecp->r_grpnext) {
-		numrrs++;
-                section = rrecp->r_section;
-		if (section < 0 || section >= ns_s_max)
-			return (-1);
-		counts[section]++;
-		for (i = section + 1; i < ns_s_max; i++)
-			if (counts[i])
-				return (-3);
-		rtype = rrecp->r_type;
-		rclass = rrecp->r_class;
-		rttl = rrecp->r_ttl;
-		/* overload class and type */
-		if (section == S_PREREQ) {
-			rttl = 0;
-			switch (rrecp->r_opcode) {
-			case YXDOMAIN:
-				rclass = C_ANY;
-				rtype = T_ANY;
-				rrecp->r_size = 0;
-				break;
-			case NXDOMAIN:
-				rclass = C_NONE;
-				rtype = T_ANY;
-				rrecp->r_size = 0;
-				break;
-			case NXRRSET:
-				rclass = C_NONE;
-				rrecp->r_size = 0;
-				break;
-			case YXRRSET:
-				if (rrecp->r_size == 0)
-					rclass = C_ANY;
-				break;
-			default:
-				fprintf(stderr,
-					"res_mkupdate: incorrect opcode: %d\n",
-					rrecp->r_opcode);
-				fflush(stderr);
-				return (-1);
-			}
-		} else if (section == S_UPDATE) {
-			switch (rrecp->r_opcode) {
-			case DELETE:
-				rclass = rrecp->r_size == 0 ? C_ANY : C_NONE;
-				break;
-			case ADD:
-				break;
-			default:
-				fprintf(stderr,
-					"res_mkupdate: incorrect opcode: %d\n",
-					rrecp->r_opcode);
-				fflush(stderr);
-				return (-1);
-			}
-		}
-
-		/*
-		 * XXX	appending default domain to owner name is omitted,
-		 *	fqdn must be provided
-		 */
-		if ((n = dn_comp(rrecp->r_dname, cp, buflen, dnptrs,
-				 lastdnptr)) < 0)
-			return (-1);
-		cp += n;
-		ShrinkBuffer(n + 2*INT16SZ);
-		PUTSHORT(rtype, cp);
-		PUTSHORT(rclass, cp);
-		if (section == S_ZONE) {
-			if (numrrs != 1 || rrecp->r_type != T_SOA)
-				return (-3);
-			continue;
-		}
-		ShrinkBuffer(INT32SZ + INT16SZ);
-		PUTLONG(rttl, cp);
-		sp2 = cp;  /* save pointer to length byte */
-		cp += INT16SZ;
-		if (rrecp->r_size == 0) {
-			if (section == S_UPDATE && rclass != C_ANY)
-				return (-1);
-			else {
-				PUTSHORT(0, sp2);
-				continue;
-			}
-		}
-		startp = rrecp->r_data;
-		endp = startp + rrecp->r_size - 1;
-		/* XXX this should be done centrally. */
-		switch (rrecp->r_type) {
-		case T_A:
-			if (!getword_str(buf2, sizeof buf2, &startp, endp))
-				return (-1);
-			if (!inet_aton(buf2, &ina))
-				return (-1);
-			n1 = ntohl(ina.s_addr);
-			ShrinkBuffer(INT32SZ);
-			PUTLONG(n1, cp);
-			break;
-		case T_CNAME:
-		case T_MB:
-		case T_MG:
-		case T_MR:
-		case T_NS:
-		case T_PTR:
-			if (!getword_str(buf2, sizeof buf2, &startp, endp))
-				return (-1);
-			n = dn_comp(buf2, cp, buflen, dnptrs, lastdnptr);
-			if (n < 0)
-				return (-1);
-			cp += n;
-			ShrinkBuffer(n);
-			break;
-		case T_MINFO:
-		case T_SOA:
-		case T_RP:
-			for (i = 0; i < 2; i++) {
-				if (!getword_str(buf2, sizeof buf2, &startp,
-						 endp))
-				return (-1);
-				n = dn_comp(buf2, cp, buflen,
-					    dnptrs, lastdnptr);
-				if (n < 0)
-					return (-1);
-				cp += n;
-				ShrinkBuffer(n);
-			}
-			if (rrecp->r_type == T_SOA) {
-				ShrinkBuffer(5 * INT32SZ);
-				while (isspace(*startp) || !*startp)
-					startp++;
-				if (*startp == '(') {
-					multiline = 1;
-					startp++;
-				} else
-					multiline = 0;
-				/* serial, refresh, retry, expire, minimum */
-				for (i = 0; i < 5; i++) {
-					soanum = getnum_str(&startp, endp);
-					if (soanum < 0)
-						return (-1);
-					PUTLONG(soanum, cp);
-				}
-				if (multiline) {
-					while (isspace(*startp) || !*startp)
-						startp++;
-					if (*startp != ')')
-						return (-1);
-				}
-			}
-			break;
-		case T_MX:
-		case T_AFSDB:
-		case T_RT:
-			n = getnum_str(&startp, endp);
-			if (n < 0)
-				return (-1);
-			PUTSHORT(n, cp);
-			ShrinkBuffer(INT16SZ);
-			if (!getword_str(buf2, sizeof buf2, &startp, endp))
-				return (-1);
-			n = dn_comp(buf2, cp, buflen, dnptrs, lastdnptr);
-			if (n < 0)
-				return (-1);
-			cp += n;
-			ShrinkBuffer(n);
-			break;
-		case T_PX:
-			n = getnum_str(&startp, endp);
-			if (n < 0)
-				return (-1);
-			PUTSHORT(n, cp);
-			ShrinkBuffer(INT16SZ);
-			for (i = 0; i < 2; i++) {
-				if (!getword_str(buf2, sizeof buf2, &startp,
-						 endp))
-					return (-1);
-				n = dn_comp(buf2, cp, buflen, dnptrs,
-					    lastdnptr);
-				if (n < 0)
-					return (-1);
-				cp += n;
-				ShrinkBuffer(n);
-			}
-			break;
-		case T_WKS:
-		case T_HINFO:
-		case T_TXT:
-		case T_X25:
-		case T_ISDN:
-		case T_NSAP:
-		case T_LOC:
-			/* XXX - more fine tuning needed here */
-			ShrinkBuffer(rrecp->r_size);
-			memcpy(cp, rrecp->r_data, rrecp->r_size);
-			cp += rrecp->r_size;
-			break;
-		default:
-			return (-1);
-		} /*switch*/
-		n = (u_int16_t)((cp - sp2) - INT16SZ);
-		PUTSHORT(n, sp2);
-	} /*for*/
-		
-	hp->qdcount = htons(counts[0]);
-	hp->ancount = htons(counts[1]);
-	hp->nscount = htons(counts[2]);
-	hp->arcount = htons(counts[3]);
-	return (cp - buf);
-}
-
-/*
- * Get a whitespace delimited word from a string (not file)
- * into buf. modify the start pointer to point after the
- * word in the string.
- */
-static int
-getword_str(char *buf, int size, u_char **startpp, u_char *endp) {
-        char *cp;
-        int c;
- 
-        for (cp = buf; *startpp <= endp; ) {
-                c = **startpp;
-                if (isspace(c) || c == '\0') {
-                        if (cp != buf) /* trailing whitespace */
-                                break;
-                        else { /* leading whitespace */
-                                (*startpp)++;
-                                continue;
-                        }
-                }
-                (*startpp)++;
-                if (cp >= buf+size-1)
-                        break;
-                *cp++ = (u_char)c;
-        }
-        *cp = '\0';
-        return (cp != buf);
-}
-
-/*
- * Get a whitespace delimited number from a string (not file) into buf
- * update the start pointer to point after the number in the string.
- */
-static int
-getnum_str(u_char **startpp, u_char *endp) {
-        int c, n;
-        int seendigit = 0;
-        int m = 0;
-
-        for (n = 0; *startpp <= endp; ) {
-                c = **startpp;
-                if (isspace(c) || c == '\0') {
-                        if (seendigit) /* trailing whitespace */
-                                break;
-                        else { /* leading whitespace */
-                                (*startpp)++;
-                                continue;
-                        }
-                }
-                if (c == ';') {
-                        while ((*startpp <= endp) &&
-			       ((c = **startpp) != '\n'))
-					(*startpp)++;
-                        if (seendigit)
-                                break;
-                        continue;
-                }
-                if (!isdigit(c)) {
-                        if (c == ')' && seendigit) {
-                                (*startpp)--;
-                                break;
-                        }
-			return (-1);
-                }        
-                (*startpp)++;
-                n = n * 10 + (c - '0');
-                seendigit = 1;
-        }
-        return (n + m);
-}
-
-/*
- * Allocate a resource record buffer & save rr info.
- */
-ns_updrec *
-res_mkupdrec(int section, const char *dname,
-	     u_int class, u_int type, u_long ttl) {
-	ns_updrec *rrecp = (ns_updrec *)calloc(1, sizeof(ns_updrec));
-
-	if (!rrecp || !(rrecp->r_dname = strdup(dname)))
-		return (NULL);
- 	rrecp->r_class = class;
-	rrecp->r_type = type;
-	rrecp->r_ttl = ttl;
-	rrecp->r_section = section;
-	return (rrecp);
-}
-
-/*
- * Free a resource record buffer created by res_mkupdrec.
- */
-void
-res_freeupdrec(ns_updrec *rrecp) {
-	/* Note: freeing r_dp is the caller's responsibility. */
-	if (rrecp->r_dname != NULL)
-		free(rrecp->r_dname);
-	free(rrecp);
-}
diff --git a/c/src/exec/libnetworking/libc/res_query.c b/c/src/exec/libnetworking/libc/res_query.c
deleted file mode 100644
index 784fa433bc..0000000000
--- a/c/src/exec/libnetworking/libc/res_query.c
+++ /dev/null
@@ -1,410 +0,0 @@
-/*
- * Copyright (c) 1988, 1993
- *    The Regents of the University of California.  All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- * 	This product includes software developed by the University of
- * 	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-/*
- * Portions Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)res_query.c	8.1 (Berkeley) 6/4/93";
-static char orig_rcsid = "From: Id: res_query.c,v 8.14 1997/06/09 17:47:05 halley Exp $";
-static char rcsid[] = "$Id$";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-#include <ctype.h>
-#include <errno.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "res_config.h"
-
-#if PACKETSZ > 1024
-#define MAXPACKET	PACKETSZ
-#else
-#define MAXPACKET	1024
-#endif
-
-/*
- * Formulate a normal query, send, and await answer.
- * Returned answer is placed in supplied buffer "answer".
- * Perform preliminary check of answer, returning success only
- * if no error is indicated and the answer count is nonzero.
- * Return the size of the response on success, -1 on error.
- * Error number is left in h_errno.
- *
- * Caller must parse answer and determine whether it answers the question.
- */
-int
-res_query(name, class, type, answer, anslen)
-	const char *name;	/* domain name */
-	int class, type;	/* class and type of query */
-	u_char *answer;		/* buffer to put answer */
-	int anslen;		/* size of answer buffer */
-{
-	u_char buf[MAXPACKET];
-	HEADER *hp = (HEADER *) answer;
-	int n;
-
-	hp->rcode = NOERROR;	/* default */
-
-	if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
-		h_errno = NETDB_INTERNAL;
-		return (-1);
-	}
-#ifdef DEBUG
-	if (_res.options & RES_DEBUG)
-		printf(";; res_query(%s, %d, %d)\n", name, class, type);
-#endif
-
-	n = res_mkquery(QUERY, name, class, type, NULL, 0, NULL,
-			buf, sizeof(buf));
-	if (n <= 0) {
-#ifdef DEBUG
-		if (_res.options & RES_DEBUG)
-			printf(";; res_query: mkquery failed\n");
-#endif
-		h_errno = NO_RECOVERY;
-		return (n);
-	}
-	n = res_send(buf, n, answer, anslen);
-	if (n < 0) {
-#ifdef DEBUG
-		if (_res.options & RES_DEBUG)
-			printf(";; res_query: send error\n");
-#endif
-		h_errno = TRY_AGAIN;
-		return (n);
-	}
-
-	if (hp->rcode != NOERROR || ntohs(hp->ancount) == 0) {
-#ifdef DEBUG
-		if (_res.options & RES_DEBUG)
-			printf(";; rcode = %d, ancount=%d\n", hp->rcode,
-			    ntohs(hp->ancount));
-#endif
-		switch (hp->rcode) {
-		case NXDOMAIN:
-			h_errno = HOST_NOT_FOUND;
-			break;
-		case SERVFAIL:
-			h_errno = TRY_AGAIN;
-			break;
-		case NOERROR:
-			h_errno = NO_DATA;
-			break;
-		case FORMERR:
-		case NOTIMP:
-		case REFUSED:
-		default:
-			h_errno = NO_RECOVERY;
-			break;
-		}
-		return (-1);
-	}
-	return (n);
-}
-
-/*
- * Formulate a normal query, send, and retrieve answer in supplied buffer.
- * Return the size of the response on success, -1 on error.
- * If enabled, implement search rules until answer or unrecoverable failure
- * is detected.  Error code, if any, is left in h_errno.
- */
-int
-res_search(name, class, type, answer, anslen)
-	const char *name;	/* domain name */
-	int class, type;	/* class and type of query */
-	u_char *answer;		/* buffer to put answer */
-	int anslen;		/* size of answer */
-{
-	const char *cp, * const *domain;
-	HEADER *hp = (HEADER *) answer;
-	u_int dots;
-	int trailing_dot, ret, saved_herrno;
-	int got_nodata = 0, got_servfail = 0, tried_as_is = 0;
-
-	if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
-		h_errno = NETDB_INTERNAL;
-		return (-1);
-	}
-	errno = 0;
-	h_errno = HOST_NOT_FOUND;	/* default, if we never query */
-	dots = 0;
-	for (cp = name; *cp; cp++)
-		dots += (*cp == '.');
-	trailing_dot = 0;
-	if (cp > name && *--cp == '.')
-		trailing_dot++;
-
-	/* If there aren't any dots, it could be a user-level alias */
-	if (!dots && (cp = hostalias(name)) != NULL)
-		return (res_query(cp, class, type, answer, anslen));
-
-	/*
-	 * If there are dots in the name already, let's just give it a try
-	 * 'as is'.  The threshold can be set with the "ndots" option.
-	 */
-	saved_herrno = -1;
-	if (dots >= _res.ndots) {
-		ret = res_querydomain(name, NULL, class, type, answer, anslen);
-		if (ret > 0)
-			return (ret);
-		saved_herrno = h_errno;
-		tried_as_is++;
-	}
-
-	/*
-	 * We do at least one level of search if
-	 *	- there is no dot and RES_DEFNAME is set, or
-	 *	- there is at least one dot, there is no trailing dot,
-	 *	  and RES_DNSRCH is set.
-	 */
-	if ((!dots && (_res.options & RES_DEFNAMES)) ||
-	    (dots && !trailing_dot && (_res.options & RES_DNSRCH))) {
-		int done = 0;
-
-		for (domain = (const char * const *)_res.dnsrch;
-		     *domain && !done;
-		     domain++) {
-
-			ret = res_querydomain(name, *domain, class, type,
-					      answer, anslen);
-			if (ret > 0)
-				return (ret);
-
-			/*
-			 * If no server present, give up.
-			 * If name isn't found in this domain,
-			 * keep trying higher domains in the search list
-			 * (if that's enabled).
-			 * On a NO_DATA error, keep trying, otherwise
-			 * a wildcard entry of another type could keep us
-			 * from finding this entry higher in the domain.
-			 * If we get some other error (negative answer or
-			 * server failure), then stop searching up,
-			 * but try the input name below in case it's
-			 * fully-qualified.
-			 */
-			if (errno == ECONNREFUSED) {
-				h_errno = TRY_AGAIN;
-				return (-1);
-			}
-
-			switch (h_errno) {
-			case NO_DATA:
-				got_nodata++;
-				/* FALLTHROUGH */
-			case HOST_NOT_FOUND:
-				/* keep trying */
-				break;
-			case TRY_AGAIN:
-				if (hp->rcode == SERVFAIL) {
-					/* try next search element, if any */
-					got_servfail++;
-					break;
-				}
-				/* FALLTHROUGH */
-			default:
-				/* anything else implies that we're done */
-				done++;
-			}
-
-			/* if we got here for some reason other than DNSRCH,
-			 * we only wanted one iteration of the loop, so stop.
-			 */
-			if (!(_res.options & RES_DNSRCH))
-				done++;
-		}
-	}
-
-	/*
-	 * If we have not already tried the name "as is", do that now.
-	 * note that we do this regardless of how many dots were in the
-	 * name or whether it ends with a dot unless NOTLDQUERY is set.
-	 */
-	if (!tried_as_is && (dots || !(_res.options & RES_NOTLDQUERY))) {
-		ret = res_querydomain(name, NULL, class, type, answer, anslen);
-		if (ret > 0)
-			return (ret);
-	}
-
-	/* if we got here, we didn't satisfy the search.
-	 * if we did an initial full query, return that query's h_errno
-	 * (note that we wouldn't be here if that query had succeeded).
-	 * else if we ever got a nodata, send that back as the reason.
-	 * else send back meaningless h_errno, that being the one from
-	 * the last DNSRCH we did.
-	 */
-	if (saved_herrno != -1)
-		h_errno = saved_herrno;
-	else if (got_nodata)
-		h_errno = NO_DATA;
-	else if (got_servfail)
-		h_errno = TRY_AGAIN;
-	return (-1);
-}
-
-/*
- * Perform a call on res_query on the concatenation of name and domain,
- * removing a trailing dot from name if domain is NULL.
- */
-int
-res_querydomain(name, domain, class, type, answer, anslen)
-	const char *name, *domain;
-	int class, type;	/* class and type of query */
-	u_char *answer;		/* buffer to put answer */
-	int anslen;		/* size of answer */
-{
-	char nbuf[MAXDNAME];
-	const char *longname = nbuf;
-	int n, d;
-
-	if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
-		h_errno = NETDB_INTERNAL;
-		return (-1);
-	}
-#ifdef DEBUG
-	if (_res.options & RES_DEBUG)
-		printf(";; res_querydomain(%s, %s, %d, %d)\n",
-		       name, domain?domain:"<Nil>", class, type);
-#endif
-	if (domain == NULL) {
-		/*
-		 * Check for trailing '.';
-		 * copy without '.' if present.
-		 */
-		n = strlen(name);
-		if (n >= MAXDNAME) {
-			h_errno = NO_RECOVERY;
-			return (-1);
-		}
-		n--;
-		if (n >= 0 && name[n] == '.') {
-			strncpy(nbuf, name, n);
-			nbuf[n] = '\0';
-		} else
-			longname = name;
-	} else {
-		n = strlen(name);
-		d = strlen(domain);
-		if (n + d + 1 >= MAXDNAME) {
-			h_errno = NO_RECOVERY;
-			return (-1);
-		}
-		sprintf(nbuf, "%s.%s", name, domain);
-	}
-	return (res_query(longname, class, type, answer, anslen));
-}
-
-const char *
-hostalias(name)
-	const char *name;
-{
-	register char *cp1, *cp2;
-	FILE *fp;
-	char *file;
-	char buf[BUFSIZ];
-	static char abuf[MAXDNAME];
-
-	if (_res.options & RES_NOALIASES)
-		return (NULL);
-	if (issetugid())
-		return (NULL);
-	file = getenv("HOSTALIASES");
-	if (file == NULL || (fp = fopen(file, "r")) == NULL)
-		return (NULL);
-	setbuf(fp, NULL);
-	buf[sizeof(buf) - 1] = '\0';
-	while (fgets(buf, sizeof(buf), fp)) {
-		for (cp1 = buf; *cp1 && !isspace((int)*cp1); ++cp1)
-			;
-		if (!*cp1)
-			break;
-		*cp1 = '\0';
-		if (!strcasecmp(buf, name)) {
-			while (isspace((int)*++cp1))
-				;
-			if (!*cp1)
-				break;
-			for (cp2 = cp1 + 1; *cp2 && !isspace((int)*cp2); ++cp2)
-				;
-			abuf[sizeof(abuf) - 1] = *cp2 = '\0';
-			strncpy(abuf, cp1, sizeof(abuf) - 1);
-			fclose(fp);
-			return (abuf);
-		}
-	}
-	fclose(fp);
-	return (NULL);
-}
diff --git a/c/src/exec/libnetworking/libc/res_send.c b/c/src/exec/libnetworking/libc/res_send.c
deleted file mode 100644
index 08cb78490f..0000000000
--- a/c/src/exec/libnetworking/libc/res_send.c
+++ /dev/null
@@ -1,929 +0,0 @@
-/*
- * Copyright (c) 1985, 1989, 1993
- *    The Regents of the University of California.  All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- * 	This product includes software developed by the University of
- * 	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-/*
- * Portions Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)res_send.c	8.1 (Berkeley) 6/4/93";
-static char orig_rcsid[] = "From: Id: res_send.c,v 8.20 1998/04/06 23:27:51 halley Exp $";
-static char rcsid[] = "$Id$";
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * Send query to name server and wait for reply.
- */
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/socket.h>
-#include <sys/uio.h>
-
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <arpa/inet.h>
-
-#include <errno.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <poll.h>
-
-#include "res_config.h"
-
-#if !defined(__rtems__)
-#ifdef NOPOLL			/* libc_r doesn't wrap poll yet() */
-static int use_poll = 0;
-#else
-static int use_poll = 1;	/* adapt to poll() syscall availability */
-				/* 0 = not present, 1 = try it, 2 = exists */
-#endif
-#endif
-
-static int s = -1;		/* socket used for communications */
-static int connected = 0;	/* is the socket connected */
-static int vc = 0;		/* is the socket a virtual circuit? */
-static res_send_qhook Qhook = NULL;
-static res_send_rhook Rhook = NULL;
-
-
-#define CAN_RECONNECT 1
-
-#ifndef DEBUG
-#   define Dprint(cond, args) /*empty*/
-#   define DprintQ(cond, args, query, size) /*empty*/
-#   define Aerror(file, string, error, address) /*empty*/
-#   define Perror(file, string, error) /*empty*/
-#else
-#   define Dprint(cond, args) if (cond) {fprintf args;} else {}
-#   define DprintQ(cond, args, query, size) if (cond) {\
-			fprintf args;\
-			__fp_nquery(query, size, stdout);\
-		} else {}
-    static void
-    Aerror(file, string, error, address)
-	FILE *file;
-	char *string;
-	int error;
-	struct sockaddr_in address;
-    {
-	int save = errno;
-
-	if (_res.options & RES_DEBUG) {
-		fprintf(file, "res_send: %s ([%s].%u): %s\n",
-			string,
-			inet_ntoa(address.sin_addr),
-			ntohs(address.sin_port),
-			strerror(error));
-	}
-	errno = save;
-    }
-    static void
-    Perror(file, string, error)
-	FILE *file;
-	char *string;
-	int error;
-    {
-	int save = errno;
-
-	if (_res.options & RES_DEBUG) {
-		fprintf(file, "res_send: %s: %s\n",
-			string, strerror(error));
-	}
-	errno = save;
-    }
-#endif
-
-void
-res_send_setqhook(hook)
-	res_send_qhook hook;
-{
-
-	Qhook = hook;
-}
-
-void
-res_send_setrhook(hook)
-	res_send_rhook hook;
-{
-
-	Rhook = hook;
-}
-
-/* int
- * res_isourserver(ina)
- *	looks up "ina" in _res.ns_addr_list[]
- * returns:
- *	0  : not found
- *	>0 : found
- * author:
- *	paul vixie, 29may94
- */
-int
-res_isourserver(inp)
-	const struct sockaddr_in *inp;
-{
-	struct sockaddr_in ina;
-	int ns, ret;
-
-	ina = *inp;
-	ret = 0;
-	for (ns = 0;  ns < _res.nscount;  ns++) {
-		const struct sockaddr_in *srv = &_res.nsaddr_list[ns];
-
-		if (srv->sin_family == ina.sin_family &&
-		    srv->sin_port == ina.sin_port &&
-		    (srv->sin_addr.s_addr == INADDR_ANY ||
-		     srv->sin_addr.s_addr == ina.sin_addr.s_addr)) {
-			ret++;
-			break;
-		}
-	}
-	return (ret);
-}
-
-/* int
- * res_nameinquery(name, type, class, buf, eom)
- *	look for (name,type,class) in the query section of packet (buf,eom)
- * requires:
- *	buf + HFIXEDSZ <= eom
- * returns:
- *	-1 : format error
- *	0  : not found
- *	>0 : found
- * author:
- *	paul vixie, 29may94
- */
-int
-res_nameinquery(name, type, class, buf, eom)
-	const char *name;
-	int type, class;
-	const u_char *buf, *eom;
-{
-	const u_char *cp = buf + HFIXEDSZ;
-	int qdcount = ntohs(((HEADER*)buf)->qdcount);
-
-	while (qdcount-- > 0) {
-		char tname[MAXDNAME+1];
-		int n, ttype, tclass;
-
-		n = dn_expand(buf, eom, cp, tname, sizeof tname);
-		if (n < 0)
-			return (-1);
-		cp += n;
-		if (cp + 2 * INT16SZ > eom)
-			return (-1);
-		ttype = ns_get16(cp); cp += INT16SZ;
-		tclass = ns_get16(cp); cp += INT16SZ;
-		if (ttype == type &&
-		    tclass == class &&
-		    strcasecmp(tname, name) == 0)
-			return (1);
-	}
-	return (0);
-}
-
-/* int
- * res_queriesmatch(buf1, eom1, buf2, eom2)
- *	is there a 1:1 mapping of (name,type,class)
- *	in (buf1,eom1) and (buf2,eom2)?
- * returns:
- *	-1 : format error
- *	0  : not a 1:1 mapping
- *	>0 : is a 1:1 mapping
- * author:
- *	paul vixie, 29may94
- */
-int
-res_queriesmatch(buf1, eom1, buf2, eom2)
-	const u_char *buf1, *eom1;
-	const u_char *buf2, *eom2;
-{
-	const u_char *cp = buf1 + HFIXEDSZ;
-	int qdcount = ntohs(((HEADER*)buf1)->qdcount);
-
-	if (buf1 + HFIXEDSZ > eom1 || buf2 + HFIXEDSZ > eom2)
-		return (-1);
-
-	/*
-	 * Only header section present in replies to
-	 * dynamic update packets.
-	 */
-	if ( (((HEADER *)buf1)->opcode == ns_o_update) &&
-	     (((HEADER *)buf2)->opcode == ns_o_update) )
-		return (1);
-
-	if (qdcount != ntohs(((HEADER*)buf2)->qdcount))
-		return (0);
-	while (qdcount-- > 0) {
-		char tname[MAXDNAME+1];
-		int n, ttype, tclass;
-
-		n = dn_expand(buf1, eom1, cp, tname, sizeof tname);
-		if (n < 0)
-			return (-1);
-		cp += n;
-		if (cp + 2 * INT16SZ > eom1)
-			return (-1);
-		ttype = ns_get16(cp);	cp += INT16SZ;
-		tclass = ns_get16(cp); cp += INT16SZ;
-		if (!res_nameinquery(tname, ttype, tclass, buf2, eom2))
-			return (0);
-	}
-	return (1);
-}
-
-int
-res_send(buf, buflen, ans, anssiz)
-	const u_char *buf;
-	int buflen;
-	u_char *ans;
-	int anssiz;
-{
-	HEADER *hp = (HEADER *) buf;
-	HEADER *anhp = (HEADER *) ans;
-	int gotsomewhere, connreset, terrno, try, v_circuit, resplen, ns, n;
-	u_int badns;	/* XXX NSMAX can't exceed #/bits in this variable */
-
-	if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
-		/* errno should have been set by res_init() in this case. */
-		return (-1);
-	}
-	if (anssiz < HFIXEDSZ) {
-		errno = EINVAL;
-		return (-1);
-	}
-	DprintQ((_res.options & RES_DEBUG) || (_res.pfcode & RES_PRF_QUERY),
-		(stdout, ";; res_send()\n"), buf, buflen);
-	v_circuit = (_res.options & RES_USEVC) || buflen > PACKETSZ;
-	gotsomewhere = 0;
-	connreset = 0;
-	terrno = ETIMEDOUT;
-	badns = 0;
-
-	/*
-	 * Send request, RETRY times, or until successful
-	 */
-	for (try = 0; try < _res.retry; try++) {
-	    for (ns = 0; ns < _res.nscount; ns++) {
-		struct sockaddr_in *nsap = &_res.nsaddr_list[ns];
-    same_ns:
-		if (badns & (1 << ns)) {
-			res_close();
-			goto next_ns;
-		}
-
-		if (Qhook) {
-			int done = 0, loops = 0;
-
-			do {
-				res_sendhookact act;
-
-				act = (*Qhook)(&nsap, &buf, &buflen,
-					       ans, anssiz, &resplen);
-				switch (act) {
-				case res_goahead:
-					done = 1;
-					break;
-				case res_nextns:
-					res_close();
-					goto next_ns;
-				case res_done:
-					return (resplen);
-				case res_modified:
-					/* give the hook another try */
-					if (++loops < 42) /*doug adams*/
-						break;
-					/*FALLTHROUGH*/
-				case res_error:
-					/*FALLTHROUGH*/
-				default:
-					return (-1);
-				}
-			} while (!done);
-		}
-
-		Dprint(_res.options & RES_DEBUG,
-		       (stdout, ";; Querying server (# %d) address = %s\n",
-			ns + 1, inet_ntoa(nsap->sin_addr)));
-
-		if (v_circuit) {
-			int truncated;
-#if !defined(__rtems__)
-			struct iovec iov[2];
-#endif
-			u_short len;
-			u_char *cp;
-
-			/*
-			 * Use virtual circuit;
-			 * at most one attempt per server.
-			 */
-			try = _res.retry;
-			truncated = 0;
-			if (s < 0 || !vc || hp->opcode == ns_o_update) {
-				if (s >= 0)
-					res_close();
-
-				s = socket(PF_INET, SOCK_STREAM, 0);
-				if (s < 0) {
-					terrno = errno;
-					Perror(stderr, "socket(vc)", errno);
-					return (-1);
-				}
-				errno = 0;
-				if (connect(s, (struct sockaddr *)nsap,
-					    sizeof *nsap) < 0) {
-					terrno = errno;
-					Aerror(stderr, "connect/vc",
-					       errno, *nsap);
-					badns |= (1 << ns);
-					res_close();
-					goto next_ns;
-				}
-				vc = 1;
-			}
-			/*
-			 * Send length & message
-			 */
-			putshort((u_short)buflen, (u_char*)&len);
-#if !defined(__rtems__)
-			iov[0].iov_base = (caddr_t)&len;
-			iov[0].iov_len = INT16SZ;
-			iov[1].iov_base = (caddr_t)buf;
-			iov[1].iov_len = buflen;
-			if (writev(s, iov, 2) != (INT16SZ + buflen)) {
-#else
-			/*
-			 * RTEMS doesn't have writev (yet)
-			 */
-			if ((write (s, &len, INT16SZ) != INT16SZ)
-			 || (write (s, buf, buflen) != buflen)) {
-#endif
-				terrno = errno;
-				Perror(stderr, "write failed", errno);
-				badns |= (1 << ns);
-				res_close();
-				goto next_ns;
-			}
-			/*
-			 * Receive length & response
-			 */
-read_len:
-			cp = ans;
-			len = INT16SZ;
-			while ((n = read(s, (char *)cp, (int)len)) > 0) {
-				cp += n;
-				if ((len -= n) <= 0)
-					break;
-			}
-			if (n <= 0) {
-				terrno = errno;
-				Perror(stderr, "read failed", errno);
-				res_close();
-				/*
-				 * A long running process might get its TCP
-				 * connection reset if the remote server was
-				 * restarted.  Requery the server instead of
-				 * trying a new one.  When there is only one
-				 * server, this means that a query might work
-				 * instead of failing.  We only allow one reset
-				 * per query to prevent looping.
-				 */
-				if (terrno == ECONNRESET && !connreset) {
-					connreset = 1;
-					res_close();
-					goto same_ns;
-				}
-				res_close();
-				goto next_ns;
-			}
-			resplen = ns_get16(ans);
-			if (resplen > anssiz) {
-				Dprint(_res.options & RES_DEBUG,
-				       (stdout, ";; response truncated\n")
-				       );
-				truncated = 1;
-				len = anssiz;
-			} else
-				len = resplen;
-			if (len < HFIXEDSZ) {
-				/*
-				 * Undersized message.
-				 */
-				Dprint(_res.options & RES_DEBUG,
-				       (stdout, ";; undersized: %d\n", len));
-				terrno = EMSGSIZE;
-				badns |= (1 << ns);
-				res_close();
-				goto next_ns;
-			}
-			cp = ans;
-			while (len != 0 &&
-			       (n = read(s, (char *)cp, (int)len)) > 0) {
-				cp += n;
-				len -= n;
-			}
-			if (n <= 0) {
-				terrno = errno;
-				Perror(stderr, "read(vc)", errno);
-				res_close();
-				goto next_ns;
-			}
-			if (truncated) {
-				/*
-				 * Flush rest of answer
-				 * so connection stays in synch.
-				 */
-				anhp->tc = 1;
-				len = resplen - anssiz;
-				while (len != 0) {
-					char junk[PACKETSZ];
-
-					n = (len > sizeof(junk)
-					     ? sizeof(junk)
-					     : len);
-					if ((n = read(s, junk, n)) > 0)
-						len -= n;
-					else
-						break;
-				}
-			}
-			/*
-			 * The calling applicating has bailed out of
-			 * a previous call and failed to arrange to have
-			 * the circuit closed or the server has got
-			 * itself confused. Anyway drop the packet and
-			 * wait for the correct one.
-			 */
-			if (hp->id != anhp->id) {
-				DprintQ((_res.options & RES_DEBUG) ||
-					(_res.pfcode & RES_PRF_REPLY),
-					(stdout, ";; old answer (unexpected):\n"),
-					ans, (resplen>anssiz)?anssiz:resplen);
-				goto read_len;
-			}
-		} else {
-			/*
-			 * Use datagrams.
-			 */
-#ifndef NOPOLL
-			struct pollfd pfd;
-			int msec;
-#endif
-			struct timeval timeout;
-#ifndef NOSELECT
-			fd_set dsmask, *dsmaskp;
-			int dsmasklen;
-#endif
-			struct sockaddr_in from;
-			int fromlen;
-
-			if ((s < 0) || vc) {
-				if (vc)
-					res_close();
-				s = socket(PF_INET, SOCK_DGRAM, 0);
-				if (s < 0) {
-#ifndef CAN_RECONNECT
- bad_dg_sock:
-#endif
-					terrno = errno;
-					Perror(stderr, "socket(dg)", errno);
-					return (-1);
-				}
-				connected = 0;
-			}
-#ifndef CANNOT_CONNECT_DGRAM
-			/*
-			 * On a 4.3BSD+ machine (client and server,
-			 * actually), sending to a nameserver datagram
-			 * port with no nameserver will cause an
-			 * ICMP port unreachable message to be returned.
-			 * If our datagram socket is "connected" to the
-			 * server, we get an ECONNREFUSED error on the next
-			 * socket operation, and select returns if the
-			 * error message is received.  We can thus detect
-			 * the absence of a nameserver without timing out.
-			 * If we have sent queries to at least two servers,
-			 * however, we don't want to remain connected,
-			 * as we wish to receive answers from the first
-			 * server to respond.
-			 */
-			if (_res.nscount == 1 || (try == 0 && ns == 0)) {
-				/*
-				 * Connect only if we are sure we won't
-				 * receive a response from another server.
-				 */
-				if (!connected) {
-					if (connect(s, (struct sockaddr *)nsap,
-						    sizeof *nsap
-						    ) < 0) {
-						Aerror(stderr,
-						       "connect(dg)",
-						       errno, *nsap);
-						badns |= (1 << ns);
-						res_close();
-						goto next_ns;
-					}
-					connected = 1;
-				}
-				if (send(s, (char*)buf, buflen, 0) != buflen) {
-					Perror(stderr, "send", errno);
-					badns |= (1 << ns);
-					res_close();
-					goto next_ns;
-				}
-			} else {
-				/*
-				 * Disconnect if we want to listen
-				 * for responses from more than one server.
-				 */
-				if (connected) {
-#ifdef CAN_RECONNECT
-					struct sockaddr_in no_addr;
-
-					no_addr.sin_family = AF_INET;
-					no_addr.sin_addr.s_addr = INADDR_ANY;
-					no_addr.sin_port = 0;
-					(void) connect(s,
-						       (struct sockaddr *)
-						        &no_addr,
-						       sizeof no_addr);
-#else
-					int s1 = socket(PF_INET, SOCK_DGRAM,0);
-					if (s1 < 0)
-						goto bad_dg_sock;
-					(void) dup2(s1, s);
-					(void) close(s1);
-					Dprint(_res.options & RES_DEBUG,
-						(stdout, ";; new DG socket\n"))
-#endif /* CAN_RECONNECT */
-					connected = 0;
-					errno = 0;
-				}
-#endif /* !CANNOT_CONNECT_DGRAM */
-				if (sendto(s, (char*)buf, buflen, 0,
-					   (struct sockaddr *)nsap,
-					   sizeof *nsap)
-				    != buflen) {
-					Aerror(stderr, "sendto", errno, *nsap);
-					badns |= (1 << ns);
-					res_close();
-					goto next_ns;
-				}
-#ifndef CANNOT_CONNECT_DGRAM
-			}
-#endif /* !CANNOT_CONNECT_DGRAM */
-
-			/*
-			 * Wait for reply
-			 */
-#ifndef NOPOLL
-    othersyscall:
-			if (use_poll) {
-				msec = (_res.retrans << try) * 1000;
-				if (try > 0)
-					msec /= _res.nscount;
-				if (msec <= 0)
-					msec = 1000;
-			} else {
-#endif
-				timeout.tv_sec = (_res.retrans << try);
-				if (try > 0)
-					timeout.tv_sec /= _res.nscount;
-				if ((long) timeout.tv_sec <= 0)
-					timeout.tv_sec = 1;
-				timeout.tv_usec = 0;
-#ifndef NOPOLL
-			}
-#endif
-    wait:
-			if (s < 0) {
-				Perror(stderr, "s out-of-bounds", EMFILE);
-				res_close();
-				goto next_ns;
-			}
-#ifndef NOPOLL
-			if (use_poll) {
-				struct sigaction sa, osa;
-				int sigsys_installed = 0;
-
-				pfd.fd = s;
-				pfd.events = POLLIN;
-				if (use_poll == 1) {
-					bzero(&sa, sizeof(sa));
-					sa.sa_handler = SIG_IGN;
-					if (sigaction(SIGSYS, &sa, &osa) >= 0)
-						sigsys_installed = 1;
-				}
-				n = poll(&pfd, 1, msec);
-				if (sigsys_installed == 1) {
-					int oerrno = errno;
-					sigaction(SIGSYS, &osa, NULL);
-					errno = oerrno;
-				}
-				/* XXX why does nosys() return EINVAL? */
-				if (n < 0 && (errno == ENOSYS ||
-				    errno == EINVAL)) {
-					use_poll = 0;
-					goto othersyscall;
-				} else if (use_poll == 1)
-					use_poll = 2;
-				if (n < 0) {
-					if (errno == EINTR)
-						goto wait;
-					Perror(stderr, "poll", errno);
-					res_close();
-					goto next_ns;
-				}
-			} else {
-#endif
-#ifndef NOSELECT
-				dsmasklen = howmany(s + 1, NFDBITS) *
-					    sizeof(fd_mask);
-				if (dsmasklen > sizeof(fd_set)) {
-					dsmaskp = (fd_set *)malloc(dsmasklen);
-					if (dsmaskp == NULL) {
-						res_close();
-						goto next_ns;
-					}
-				} else
-					dsmaskp = &dsmask;
-				/* only zero what we need */
-				bzero((char *)dsmaskp, dsmasklen);
-				FD_SET(s, dsmaskp);
-				n = select(s + 1, dsmaskp, (fd_set *)NULL,
-					   (fd_set *)NULL, &timeout);
-				if (dsmaskp != &dsmask)
-					free(dsmaskp);
-				if (n < 0) {
-					if (errno == EINTR)
-						goto wait;
-					Perror(stderr, "select", errno);
-					res_close();
-					goto next_ns;
-				}
-#endif
-#ifndef NOPOLL
-			}
-#endif
-
-#ifdef NOSELECT
-			setsockopt (s, SOL_SOCKET, SO_RCVTIMEO, &timeout, sizeof timeout);
-#else
-			if (n == 0) {
-				/*
-				 * timeout
-				 */
-				Dprint(_res.options & RES_DEBUG,
-				       (stdout, ";; timeout\n"));
-				gotsomewhere = 1;
-				res_close();
-				goto next_ns;
-			}
-#endif
-			errno = 0;
-			fromlen = sizeof(struct sockaddr_in);
-			resplen = recvfrom(s, (char*)ans, anssiz, 0,
-					   (struct sockaddr *)&from, &fromlen);
-			if (resplen <= 0) {
-#ifdef NOSELECT
-				if (errno == ETIMEDOUT) {
-					Dprint(_res.options & RES_DEBUG,
-					       (stdout, ";; timeout\n"));
-					gotsomewhere = 1;
-					res_close();
-					goto next_ns;
-				}
-#endif
-				Perror(stderr, "recvfrom", errno);
-				res_close();
-				goto next_ns;
-			}
-			gotsomewhere = 1;
-			if (resplen < HFIXEDSZ) {
-				/*
-				 * Undersized message.
-				 */
-				Dprint(_res.options & RES_DEBUG,
-				       (stdout, ";; undersized: %d\n",
-					resplen));
-				terrno = EMSGSIZE;
-				badns |= (1 << ns);
-				res_close();
-				goto next_ns;
-			}
-			if (hp->id != anhp->id) {
-				/*
-				 * response from old query, ignore it.
-				 * XXX - potential security hazard could
-				 *	 be detected here.
-				 */
-				DprintQ((_res.options & RES_DEBUG) ||
-					(_res.pfcode & RES_PRF_REPLY),
-					(stdout, ";; old answer:\n"),
-					ans, (resplen>anssiz)?anssiz:resplen);
-				goto wait;
-			}
-#ifdef CHECK_SRVR_ADDR
-			if (!(_res.options & RES_INSECURE1) &&
-			    !res_isourserver(&from)) {
-				/*
-				 * response from wrong server? ignore it.
-				 * XXX - potential security hazard could
-				 *	 be detected here.
-				 */
-				DprintQ((_res.options & RES_DEBUG) ||
-					(_res.pfcode & RES_PRF_REPLY),
-					(stdout, ";; not our server:\n"),
-					ans, (resplen>anssiz)?anssiz:resplen);
-				goto wait;
-			}
-#endif
-			if (!(_res.options & RES_INSECURE2) &&
-			    !res_queriesmatch(buf, buf + buflen,
-					      ans, ans + anssiz)) {
-				/*
-				 * response contains wrong query? ignore it.
-				 * XXX - potential security hazard could
-				 *	 be detected here.
-				 */
-				DprintQ((_res.options & RES_DEBUG) ||
-					(_res.pfcode & RES_PRF_REPLY),
-					(stdout, ";; wrong query name:\n"),
-					ans, (resplen>anssiz)?anssiz:resplen);
-				goto wait;
-			}
-			if (anhp->rcode == SERVFAIL ||
-			    anhp->rcode == NOTIMP ||
-			    anhp->rcode == REFUSED) {
-				DprintQ(_res.options & RES_DEBUG,
-					(stdout, "server rejected query:\n"),
-					ans, (resplen>anssiz)?anssiz:resplen);
-				badns |= (1 << ns);
-				res_close();
-				/* don't retry if called from dig */
-				if (!_res.pfcode)
-					goto next_ns;
-			}
-			if (!(_res.options & RES_IGNTC) && anhp->tc) {
-				/*
-				 * get rest of answer;
-				 * use TCP with same server.
-				 */
-				Dprint(_res.options & RES_DEBUG,
-				       (stdout, ";; truncated answer\n"));
-				v_circuit = 1;
-				res_close();
-				goto same_ns;
-			}
-		} /*if vc/dg*/
-		Dprint((_res.options & RES_DEBUG) ||
-		       ((_res.pfcode & RES_PRF_REPLY) &&
-			(_res.pfcode & RES_PRF_HEAD1)),
-		       (stdout, ";; got answer:\n"));
-		DprintQ((_res.options & RES_DEBUG) ||
-			(_res.pfcode & RES_PRF_REPLY),
-			(stdout, "%s", ""),
-			ans, (resplen>anssiz)?anssiz:resplen);
-		/*
-		 * If using virtual circuits, we assume that the first server
-		 * is preferred over the rest (i.e. it is on the local
-		 * machine) and only keep that one open.
-		 * If we have temporarily opened a virtual circuit,
-		 * or if we haven't been asked to keep a socket open,
-		 * close the socket.
-		 */
-		if ((v_circuit && (!(_res.options & RES_USEVC) || ns != 0)) ||
-		    !(_res.options & RES_STAYOPEN)) {
-			res_close();
-		}
-		if (Rhook) {
-			int done = 0, loops = 0;
-
-			do {
-				res_sendhookact act;
-
-				act = (*Rhook)(nsap, buf, buflen,
-					       ans, anssiz, &resplen);
-				switch (act) {
-				case res_goahead:
-				case res_done:
-					done = 1;
-					break;
-				case res_nextns:
-					res_close();
-					goto next_ns;
-				case res_modified:
-					/* give the hook another try */
-					if (++loops < 42) /*doug adams*/
-						break;
-					/*FALLTHROUGH*/
-				case res_error:
-					/*FALLTHROUGH*/
-				default:
-					return (-1);
-				}
-			} while (!done);
-
-		}
-		return (resplen);
-    next_ns: ;
-	   } /*foreach ns*/
-	} /*foreach retry*/
-	res_close();
-	if (!v_circuit) {
-		if (!gotsomewhere)
-			errno = ECONNREFUSED;	/* no nameservers found */
-		else
-			errno = ETIMEDOUT;	/* no answer obtained */
-	} else
-		errno = terrno;
-	return (-1);
-}
-
-/*
- * This routine is for closing the socket if a virtual circuit is used and
- * the program wants to close it.  This provides support for endhostent()
- * which expects to close the socket.
- *
- * This routine is not expected to be user visible.
- */
-void
-res_close()
-{
-	if (s >= 0) {
-		(void) close(s);
-		s = -1;
-		connected = 0;
-		vc = 0;
-	}
-}
diff --git a/c/src/exec/libnetworking/libc/res_stubs.c b/c/src/exec/libnetworking/libc/res_stubs.c
deleted file mode 100644
index 92cf0fac54..0000000000
--- a/c/src/exec/libnetworking/libc/res_stubs.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (C) 1996 Peter Wemm <peter@freebsd.org>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $Id$
- */
-
-/*
- * This file is for FreeBSD-3.0 that has a bind-4.9.5-P1 derived
- * resolver in the libc.  It provides aliases for functions that
- * have moved since 4.9.4-P1.
- *
- * I'll save everybody the trouble and say it now:  *THIS IS A HACK*!
- *
- * Yes, many of these are private functions to the resolver, but some are
- * needed as there is no other way to provide the functionality and they've
- * turned up all over the place. :-(
- */
-
-#include <sys/types.h>
-#include <sys/cdefs.h>
-
-__weak_reference(__inet_addr, inet_addr);
-__weak_reference(__inet_aton, inet_aton);
-__weak_reference(__inet_lnaof, inet_lnaof);
-__weak_reference(__inet_makeaddr, inet_makeaddr);
-__weak_reference(__inet_neta, inet_neta);
-__weak_reference(__inet_netof, inet_netof);
-__weak_reference(__inet_network, inet_network);
-__weak_reference(__inet_net_ntop, inet_net_ntop);
-__weak_reference(__inet_net_pton, inet_net_pton);
-__weak_reference(__inet_ntoa, inet_ntoa);
-__weak_reference(__inet_pton, inet_pton);
-__weak_reference(__inet_ntop, inet_ntop);
-__weak_reference(__inet_nsap_addr, inet_nsap_addr);
-__weak_reference(__inet_nsap_ntoa, inet_nsap_ntoa);
-
-__weak_reference(__sym_ston, sym_ston);
-__weak_reference(__sym_ntos, sym_ntos);
-__weak_reference(__sym_ntop, sym_ntop);
-__weak_reference(__fp_resstat, fp_resstat);
-__weak_reference(__p_query, p_query);
-__weak_reference(__p_fqnname, p_fqnname);
-__weak_reference(__p_secstodate, p_secstodate);
-__weak_reference(__dn_count_labels, dn_count_labels);
-__weak_reference(__dn_comp, dn_comp);
-__weak_reference(__res_close, _res_close);
-__weak_reference(__dn_expand, dn_expand);
-__weak_reference(__res_init, res_init);
-__weak_reference(__res_query, res_query);
-__weak_reference(__res_search, res_search);
-__weak_reference(__res_querydomain, res_querydomain);
-__weak_reference(__res_mkquery, res_mkquery);
-__weak_reference(__res_send, res_send);
diff --git a/c/src/exec/libnetworking/libc/res_update.c b/c/src/exec/libnetworking/libc/res_update.c
deleted file mode 100644
index ef591e0674..0000000000
--- a/c/src/exec/libnetworking/libc/res_update.c
+++ /dev/null
@@ -1,518 +0,0 @@
-#if !defined(__rtems__)
-#if !defined(lint) && !defined(SABER)
-static char rcsid[] = "$Id$";
-#endif /* not lint */
-#endif /* not rtems */
-
-/*
- * Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-/*
- * Based on the Dynamic DNS reference implementation by Viraj Bais
- * <viraj_bais@ccm.fm.intel.com>
- */
-
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-#include <errno.h>
-#include <limits.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-/*
- * Separate a linked list of records into groups so that all records
- * in a group will belong to a single zone on the nameserver.
- * Create a dynamic update packet for each zone and send it to the
- * nameservers for that zone, and await answer.
- * Abort if error occurs in updating any zone.
- * Return the number of zones updated on success, < 0 on error.
- *
- * On error, caller must deal with the unsynchronized zones
- * eg. an A record might have been successfully added to the forward
- * zone but the corresponding PTR record would be missing if error
- * was encountered while updating the reverse zone.
- */
-
-#define NSMAX 16
-
-struct ns1 {
-	char nsname[MAXDNAME];
-	struct in_addr nsaddr1;
-};
-
-struct zonegrp {
-	char 		z_origin[MAXDNAME];
-	int16_t		z_class;
-	char		z_soardata[MAXDNAME + 5 * INT32SZ];
-	struct ns1 	z_ns[NSMAX];
-	int		z_nscount;
-	ns_updrec *	z_rr;
-	struct zonegrp *z_next;
-};
-
-
-int
-res_update(ns_updrec *rrecp_in) {
-	ns_updrec *rrecp, *tmprrecp;
-	u_char buf[PACKETSZ], answer[PACKETSZ], packet[2*PACKETSZ];
-	char name[MAXDNAME], zname[MAXDNAME], primary[MAXDNAME],
-	     mailaddr[MAXDNAME];
-	u_char soardata[2*MAXCDNAME+5*INT32SZ];
-	char *dname, *svdname, *cp1, *target;
-	u_char *cp, *eom;
-	HEADER *hp = (HEADER *) answer;
-	struct zonegrp *zptr = NULL, *tmpzptr, *prevzptr, *zgrp_start = NULL;
-	int i, j, k = 0, n, ancount, nscount, arcount, rcode, rdatasize,
-	    newgroup, done, myzone, seen_before, numzones = 0;
-	u_int16_t dlen, class, qclass, type, qtype;
-	u_int32_t ttl;
-
-	if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
-		h_errno = NETDB_INTERNAL;
-		return (-1);
-	}
-
-	for (rrecp = rrecp_in; rrecp; rrecp = rrecp->r_next) {
-		dname = rrecp->r_dname;
-		n = strlen(dname);
-		if (dname[n-1] == '.')
-			dname[n-1] = '\0';
-		qtype = T_SOA;
-		qclass = rrecp->r_class;
-		done = 0;
-		seen_before = 0;
-
-		while (!done && dname) {
-		    if (qtype == T_SOA) {
-			for (tmpzptr = zgrp_start;
-			     tmpzptr && !seen_before;
-			     tmpzptr = tmpzptr->z_next) {
-				if (strcasecmp(dname,
-					       tmpzptr->z_origin) == 0 &&
-				    tmpzptr->z_class == qclass)
-					seen_before++;
-				for (tmprrecp = tmpzptr->z_rr;
-				     tmprrecp && !seen_before;
-				     tmprrecp = tmprrecp->r_grpnext)
-				if (strcasecmp(dname, tmprrecp->r_dname) == 0
-				    && tmprrecp->r_class == qclass) {
-					seen_before++;
-					break;
-				}
-				if (seen_before) {
-					/*
-					 * Append to the end of
-					 * current group.
-					 */
-					for (tmprrecp = tmpzptr->z_rr;
-					     tmprrecp->r_grpnext;
-					     tmprrecp = tmprrecp->r_grpnext)
-						(void)NULL;
-					tmprrecp->r_grpnext = rrecp;
-					rrecp->r_grpnext = NULL;
-					done = 1;
-					break;
-				}
-			}
-		} else if (qtype == T_A) {
-		    for (tmpzptr = zgrp_start;
-			 tmpzptr && !done;
-			 tmpzptr = tmpzptr->z_next)
-			    for (i = 0; i < tmpzptr->z_nscount; i++)
-				if (tmpzptr->z_class == qclass &&
-				    strcasecmp(tmpzptr->z_ns[i].nsname,
-					       dname) == 0 &&
-				    tmpzptr->z_ns[i].nsaddr1.s_addr != 0) {
-					zptr->z_ns[k].nsaddr1.s_addr =
-					 tmpzptr->z_ns[i].nsaddr1.s_addr;
-					done = 1;
-					break;
-				}
-		}
-		if (done)
-		    break;
-		n = res_mkquery(QUERY, dname, qclass, qtype, NULL,
-				0, NULL, buf, sizeof buf);
-		if (n <= 0) {
-		    fprintf(stderr, "res_update: mkquery failed\n");
-		    return (n);
-		}
-		n = res_send(buf, n, answer, sizeof answer);
-		if (n < 0) {
-		    fprintf(stderr, "res_update: send error for %s\n",
-			    rrecp->r_dname);
-		    return (n);
-		}
-		if (n < HFIXEDSZ)
-			return (-1);
-		ancount = ntohs(hp->ancount);
-		nscount = ntohs(hp->nscount);
-		arcount = ntohs(hp->arcount);
-		rcode = hp->rcode;
-		cp = answer + HFIXEDSZ;
-		eom = answer + n;
-		/* skip the question section */
-		n = dn_skipname(cp, eom);
-		if (n < 0 || cp + n + 2 * INT16SZ > eom)
-			return (-1);
-		cp += n + 2 * INT16SZ;
-
-		if (qtype == T_SOA) {
-		    if (ancount == 0 && nscount == 0 && arcount == 0) {
-			/*
-			 * if (rcode == NOERROR) then the dname exists but
-			 * has no soa record associated with it.
-			 * if (rcode == NXDOMAIN) then the dname does not
-			 * exist and the server is replying out of NCACHE.
-			 * in either case, proceed with the next try
-			 */
-			dname = strchr(dname, '.');
-			if (dname != NULL)
-				dname++;
-			continue;
-		    } else if ((rcode == NOERROR || rcode == NXDOMAIN) &&
-			       ancount == 0 &&
-			       nscount == 1 && arcount == 0) {
-			/*
-			 * name/data does not exist, soa record supplied in the
-			 * authority section
-			 */
-			/* authority section must contain the soa record */
-			if ((n = dn_expand(answer, eom, cp, zname,
-					sizeof zname)) < 0)
-			    return (n);
-			cp += n;
-			if (cp + 2 * INT16SZ > eom)
-				return (-1);
-			GETSHORT(type, cp);
-			GETSHORT(class, cp);
-			if (type != T_SOA || class != qclass) {
-			    fprintf(stderr, "unknown answer\n");
-			    return (-1);
-			}
-			myzone = 0;
-			svdname = dname;
-			while (dname)
-			    if (strcasecmp(dname, zname) == 0) {
-				myzone = 1;
-				break;
-			    } else if ((dname = strchr(dname, '.')) != NULL)
-				dname++;
-			if (!myzone) {
-			    dname = strchr(svdname, '.');
-			    if (dname != NULL)
-				dname++;
-			    continue;
-			}
-			nscount = 0;
-			/* fallthrough */
-		    } else if (rcode == NOERROR && ancount == 1) {
-			/*
-			 * found the zone name
-			 * new servers will supply NS records for the zone
-			 * in authority section and A records for those 
-			 * nameservers in the additional section
-			 * older servers have to be explicitly queried for
-			 * NS records for the zone
-			 */
-			/* answer section must contain the soa record */
-			if ((n = dn_expand(answer, eom, cp, zname,
-			 	       	   sizeof zname)) < 0)
-				return (n);
-			else
-				cp += n;
-			if (cp + 2 * INT16SZ > eom)
-				return (-1);
-			GETSHORT(type, cp);
-			GETSHORT(class, cp);
-			if (type == T_CNAME) {
-				dname = strchr(dname, '.');
-				if (dname != NULL)
-					dname++;
-				continue;
-			}
-			if (strcasecmp(dname, zname) != 0 ||
-			    type != T_SOA ||
-			    class != rrecp->r_class) {
-				fprintf(stderr, "unknown answer\n");
-				return (-1);
-			}
-			/* FALLTHROUGH */
-		    } else {
-			fprintf(stderr,
-		"unknown response: ans=%d, auth=%d, add=%d, rcode=%d\n",
-				ancount, nscount, arcount, hp->rcode);
-			return (-1);
-		    }
-		    if (cp + INT32SZ + INT16SZ > eom)
-			    return (-1);
-		    /* continue processing the soa record */
-		    GETLONG(ttl, cp);
-		    GETSHORT(dlen, cp);
-		    if (cp + dlen > eom)
-			    return (-1);
-		    newgroup = 1;
-		    zptr = zgrp_start;
-		    prevzptr = NULL;
-		    while (zptr) {
-			if (strcasecmp(zname, zptr->z_origin) == 0 &&
-			    type == T_SOA && class == qclass) {
-				newgroup = 0;
-				break;
-			}
-			prevzptr = zptr;
-			zptr = zptr->z_next;
-		    }
-		    if (!newgroup) {
-			for (tmprrecp = zptr->z_rr;
-			     tmprrecp->r_grpnext;
-			     tmprrecp = tmprrecp->r_grpnext)
-				    ;
-			tmprrecp->r_grpnext = rrecp;
-			rrecp->r_grpnext = NULL;
-			done = 1;
-			cp += dlen;
-			break;
-		    } else {
-			if ((n = dn_expand(answer, eom, cp, primary,
-				       	   sizeof primary)) < 0)
-			    return (n);
-			cp += n;
-			/* 
-			 * We don't have to bounds check here because the
-			 * next use of 'cp' is in dn_expand().
-			 */
-			cp1 = (char *)soardata;
-			strcpy(cp1, primary);
-			cp1 += strlen(cp1) + 1;
-			if ((n = dn_expand(answer, eom, cp, mailaddr,
-				       	   sizeof mailaddr)) < 0)
-			    return (n);
-			cp += n;
-			strcpy(cp1, mailaddr);
-			cp1 += strlen(cp1) + 1;
-			if (cp + 5*INT32SZ > eom)
-				return (-1);
-			memcpy(cp1, cp, 5*INT32SZ);
-			cp += 5*INT32SZ;
-			cp1 += 5*INT32SZ;
-			rdatasize = (u_char *)cp1 - soardata;
-			zptr = calloc(1, sizeof(struct zonegrp));
-			if (zptr == NULL)
-                	    return (-1);
-			if (zgrp_start == NULL)
-			    zgrp_start = zptr;
-			else
-			    prevzptr->z_next = zptr;
-			zptr->z_rr = rrecp;
-			rrecp->r_grpnext = NULL;
-			strcpy(zptr->z_origin, zname);
-			zptr->z_class = class;
-			memcpy(zptr->z_soardata, soardata, rdatasize);
-			/* fallthrough to process NS and A records */
-		    }
-		} else if (qtype == T_NS) {
-		    if (rcode == NOERROR && ancount > 0) {
-			strcpy(zname, dname);
-			for (zptr = zgrp_start; zptr; zptr = zptr->z_next) {
-			    if (strcasecmp(zname, zptr->z_origin) == 0)
-				break;
-			}
-			if (zptr == NULL)
-			    /* should not happen */
-			    return (-1);
-			if (nscount > 0) {
-			    /*
-			     * answer and authority sections contain
-			     * the same information, skip answer section
-			     */
-			    for (j = 0; j < ancount; j++) {
-				n = dn_skipname(cp, eom);
-				if (n < 0)
-					return (-1);
-				n += 2*INT16SZ + INT32SZ;
-				if (cp + n + INT16SZ > eom)
-					return (-1);
-				cp += n;
-				GETSHORT(dlen, cp);
-				cp += dlen;
-			    }
-			} else
-			    nscount = ancount;
-			/* fallthrough to process NS and A records */
-		    } else {
-			fprintf(stderr, "cannot determine nameservers for %s:\
-ans=%d, auth=%d, add=%d, rcode=%d\n",
-				dname, ancount, nscount, arcount, hp->rcode);
-			return (-1);
-		    }
-		} else if (qtype == T_A) {
-		    if (rcode == NOERROR && ancount > 0) {
-			arcount = ancount;
-			ancount = nscount = 0;
-			/* fallthrough to process A records */
-		    } else {
-			fprintf(stderr, "cannot determine address for %s:\
-ans=%d, auth=%d, add=%d, rcode=%d\n",
-				dname, ancount, nscount, arcount, hp->rcode);
-			return (-1);
-		    }
-		}
-		/* process NS records for the zone */
-		j = 0;
-		for (i = 0; i < nscount; i++) {
-		    if ((n = dn_expand(answer, eom, cp, name,
-					sizeof name)) < 0)
-			return (n);
-		    cp += n;
-		    if (cp + 3 * INT16SZ + INT32SZ > eom)
-			    return (-1);
-		    GETSHORT(type, cp);
-		    GETSHORT(class, cp);
-		    GETLONG(ttl, cp);
-		    GETSHORT(dlen, cp);
-		    if (cp + dlen > eom)
-			return (-1);
-		    if (strcasecmp(name, zname) == 0 &&
-			type == T_NS && class == qclass) {
-				if ((n = dn_expand(answer, eom, cp,
-						   name, sizeof name)) < 0)
-					return (n);
-			    target = zptr->z_ns[j++].nsname;
-			    strcpy(target, name);
-		    }
-		    cp += dlen;
-		}
-		if (zptr->z_nscount == 0)
-		    zptr->z_nscount = j;
-		/* get addresses for the nameservers */
-		for (i = 0; i < arcount; i++) {
-		    if ((n = dn_expand(answer, eom, cp, name,
-					sizeof name)) < 0)
-			return (n);
-		    cp += n;
-		    if (cp + 3 * INT16SZ + INT32SZ > eom)
-			return (-1);
-		    GETSHORT(type, cp);
-		    GETSHORT(class, cp);
-		    GETLONG(ttl, cp);
-		    GETSHORT(dlen, cp);
-		    if (cp + dlen > eom)
-			    return (-1);
-		    if (type == T_A && dlen == INT32SZ && class == qclass) {
-			for (j = 0; j < zptr->z_nscount; j++)
-			    if (strcasecmp(name, zptr->z_ns[j].nsname) == 0) {
-				memcpy(&zptr->z_ns[j].nsaddr1.s_addr, cp,
-				       INT32SZ);
-				break;
-			    }
-		    }
-		    cp += dlen;
-		}
-		if (zptr->z_nscount == 0) {
-		    dname = zname;
-		    qtype = T_NS;
-		    continue;
-		}
-		done = 1;
-		for (k = 0; k < zptr->z_nscount; k++)
-		    if (zptr->z_ns[k].nsaddr1.s_addr == 0) {
-			done = 0;
-			dname = zptr->z_ns[k].nsname;
-			qtype = T_A;
-		    }
-
- 	    } /* while */
-	}
-
-	_res.options |= RES_DEBUG;
-	for (zptr = zgrp_start; zptr; zptr = zptr->z_next) {
-
-		/* append zone section */
-		rrecp = res_mkupdrec(ns_s_zn, zptr->z_origin,
-				     zptr->z_class, ns_t_soa, 0);
-		if (rrecp == NULL) {
-			fprintf(stderr, "saverrec error\n");
-			fflush(stderr);
-			return (-1);
-		}
-		rrecp->r_grpnext = zptr->z_rr;
-		zptr->z_rr = rrecp;
-
-		n = res_mkupdate(zptr->z_rr, packet, sizeof packet);
-		if (n < 0) {
-			fprintf(stderr, "res_mkupdate error\n");
-			fflush(stderr);
-			return (-1);
-		} else
-			fprintf(stdout, "res_mkupdate: packet size = %d\n", n);
-
-		/*
-		 * Override the list of NS records from res_init() with
-		 * the authoritative nameservers for the zone being updated.
-		 * Sort primary to be the first in the list of nameservers.
-		 */
-		for (i = 0; i < zptr->z_nscount; i++) {
-			if (strcasecmp(zptr->z_ns[i].nsname,
-				       zptr->z_soardata) == 0) {
-				struct in_addr tmpaddr;
-
-				if (i != 0) {
-					strcpy(zptr->z_ns[i].nsname,
-					       zptr->z_ns[0].nsname);
-					strcpy(zptr->z_ns[0].nsname,
-					       zptr->z_soardata);
-					tmpaddr = zptr->z_ns[i].nsaddr1;
-					zptr->z_ns[i].nsaddr1 =
-						zptr->z_ns[0].nsaddr1;
-					zptr->z_ns[0].nsaddr1 = tmpaddr;
-				}
-				break;
-			}
-		}
-		for (i = 0; i < MAXNS; i++) {
-			_res.nsaddr_list[i].sin_addr = zptr->z_ns[i].nsaddr1;
-			_res.nsaddr_list[i].sin_family = AF_INET;
-			_res.nsaddr_list[i].sin_port = htons(NAMESERVER_PORT);
-		}
-		_res.nscount = (zptr->z_nscount < MAXNS) ? 
-					zptr->z_nscount : MAXNS;
-		n = res_send(packet, n, answer, sizeof(answer));
-		if (n < 0) {
-			fprintf(stderr, "res_send: send error, n=%d\n", n);
-			break;
-		} else
-			numzones++;
-	}
-
-	/* free malloc'ed memory */
-	while(zgrp_start) {
-		zptr = zgrp_start;
-		zgrp_start = zgrp_start->z_next;
-		res_freeupdrec(zptr->z_rr);  /* Zone section we allocated. */
-		free((char *)zptr);
-	}
-
-	return (numzones);
-}
diff --git a/c/src/exec/libnetworking/libc/resolver.3 b/c/src/exec/libnetworking/libc/resolver.3
deleted file mode 100644
index 8c6f18334f..0000000000
--- a/c/src/exec/libnetworking/libc/resolver.3
+++ /dev/null
@@ -1,352 +0,0 @@
-.\" Copyright (c) 1985, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"     @(#)resolver.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
-.\"
-.Dd June 4, 1993
-.Dt RESOLVER 3
-.Os BSD 4.3
-.Sh NAME
-.Nm res_query ,
-.Nm res_search ,
-.Nm res_mkquery ,
-.Nm res_send ,
-.Nm res_init ,
-.Nm dn_comp ,
-.Nm dn_expand
-.Nd resolver routines
-.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <netinet/in.h>
-.Fd #include <arpa/nameser.h>
-.Fd #include <resolv.h>
-.Ft int
-.Fo res_query
-.Fa "const char *dname"
-.Fa "int class"
-.Fa "int type"
-.Fa "u_char *answer"
-.Fa "int anslen"
-.Fc
-.Ft int
-.Fo res_search
-.Fa "const char *dname"
-.Fa "int class"
-.Fa "int type"
-.Fa "u_char *answer"
-.Fa "int anslen"
-.Fc
-.Ft int
-.Fo res_mkquery
-.Fa "int op"
-.Fa "const char *dname"
-.Fa "int class"
-.Fa "int type"
-.Fa "const u_char *data"
-.Fa "int datalen"
-.Fa "const u_char *newrr_in"
-.Fa "u_char *buf"
-.Fa "int buflen"
-.Fc
-.Ft int
-.Fo res_send
-.Fa "const u_char *msg"
-.Fa "int msglen"
-.Fa "u_char *answer"
-.Fa "int anslen"
-.Fc
-.Ft int
-.Fn res_init 
-.Fo dn_comp
-.Fa "const char *exp_dn"
-.Fa "u_char *comp_dn"
-.Fa "int length"
-.Fa "u_char **dnptrs"
-.Fa "u_char **lastdnptr"
-.Fc
-.Ft int
-.Fo dn_expand
-.Fa "const u_char *msg"
-.Fa "const u_char *eomorig"
-.Fa "const u_char *comp_dn"
-.Fa "char *exp_dn"
-.Fa "int length"
-.Fc
-.Sh DESCRIPTION
-These routines are used for making, sending and interpreting
-query and reply messages with Internet domain name servers.
-.Pp
-Global configuration and state information that is used by the
-resolver routines is kept in the structure
-.Em _res .
-Most of the values have reasonable defaults and can be ignored.
-Options
-stored in
-.Em _res.options
-are defined in
-.Pa resolv.h
-and are as follows.
-Options are stored as a simple bit mask containing the bitwise ``or''
-of the options enabled.
-.Bl -tag -width RES_DEFNAMES
-.It Dv RES_INIT
-True if the initial name server address and default domain name are
-initialized (i.e.,
-.Fn res_init
-has been called).
-.It Dv RES_DEBUG
-Print debugging messages.
-.It Dv RES_AAONLY
-Accept authoritative answers only.
-With this option,
-.Fn res_send
-should continue until it finds an authoritative answer or finds an error.
-Currently this is not implemented.
-.It Dv RES_USEVC
-Use
-.Tn TCP
-connections for queries instead of
-.Tn UDP
-datagrams.
-.It Dv RES_STAYOPEN
-Used with
-.Dv RES_USEVC
-to keep the
-.Tn TCP
-connection open between
-queries.
-This is useful only in programs that regularly do many queries.
-.Tn UDP
-should be the normal mode used.
-.It Dv RES_IGNTC
-Unused currently (ignore truncation errors, i.e., don't retry with
-.Tn TCP ) .
-.It Dv RES_RECURSE
-Set the recursion-desired bit in queries.
-This is the default.
-.Pf ( Fn res_send
-does not do iterative queries and expects the name server
-to handle recursion.)
-.It Dv RES_DEFNAMES
-If set,
-.Fn res_search
-will append the default domain name to single-component names
-(those that do not contain a dot).
-This option is enabled by default.
-.It Dv RES_DNSRCH
-If this option is set,
-.Fn res_search
-will search for host names in the current domain and in parent domains; see
-.Xr hostname 7 .
-This is used by the standard host lookup routine
-.Xr gethostbyname 3 .
-This option is enabled by default.
-.It Dv RES_NOALIASES
-This option turns off the user level aliasing feature controlled by the
-.Dq Ev HOSTALIASES
-environment variable.  Network daemons should set this option.
-.El
-.Pp
-The
-.Fn res_init
-routine
-reads the configuration file (if any; see
-.Xr resolver 5 )
-to get the default domain name,
-search list and
-the Internet address of the local name server(s).
-If no server is configured, the host running
-the resolver is tried.
-The current domain name is defined by the hostname
-if not specified in the configuration file;
-it can be overridden by the environment variable
-.Ev LOCALDOMAIN .
-This environment variable may contain several blank-separated
-tokens if you wish to override the
-.Em "search list"
-on a per-process basis.  This is similar to the
-.Em search
-command in the configuration file.
-Another environment variable (
-.Dq Ev RES_OPTIONS
-can be set to
-override certain internal resolver options which are otherwise
-set by changing fields in the
-.Em _res
-structure or are inherited from the configuration file's
-.Em options
-command.  The syntax of the
-.Dq Ev RES_OPTIONS
-environment variable is explained in
-.Xr resolver 5 .
-Initialization normally occurs on the first call
-to one of the following routines.
-.Pp
-The
-.Fn res_query
-function provides an interface to the server query mechanism.
-It constructs a query, sends it to the local server,
-awaits a response, and makes preliminary checks on the reply.
-The query requests information of the specified
-.Fa type
-and
-.Fa class
-for the specified fully-qualified domain name
-.Fa dname .
-The reply message is left in the
-.Fa answer
-buffer with length
-.Fa anslen
-supplied by the caller.
-.Pp
-The
-.Fn res_search
-routine makes a query and awaits a response like
-.Fn res_query ,
-but in addition, it implements the default and search rules
-controlled by the
-.Dv RES_DEFNAMES
-and
-.Dv RES_DNSRCH
-options.
-It returns the first successful reply.
-.Pp
-The remaining routines are lower-level routines used by
-.Fn res_query .
-The
-.Fn res_mkquery
-function
-constructs a standard query message and places it in
-.Fa buf .
-It returns the size of the query, or \-1 if the query is
-larger than
-.Fa buflen .
-The query type
-.Fa op
-is usually
-.Dv QUERY ,
-but can be any of the query types defined in
-.Aq Pa arpa/nameser.h .
-The domain name for the query is given by
-.Fa dname .
-.Fa Newrr
-is currently unused but is intended for making update messages.
-.Pp
-The
-.Fn res_send
-routine
-sends a pre-formatted query and returns an answer.
-It will call
-.Fn res_init
-if
-.Dv RES_INIT
-is not set, send the query to the local name server, and
-handle timeouts and retries.
-The length of the reply message is returned, or
-\-1 if there were errors.
-.Pp
-The
-.Fn dn_comp
-function
-compresses the domain name
-.Fa exp_dn
-and stores it in
-.Fa comp_dn .
-The size of the compressed name is returned or \-1 if there were errors.
-The size of the array pointed to by
-.Fa comp_dn
-is given by
-.Fa length .
-The compression uses
-an array of pointers
-.Fa dnptrs
-to previously-compressed names in the current message.
-The first pointer points to
-to the beginning of the message and the list ends with
-.Dv NULL .
-The limit to the array is specified by
-.Fa lastdnptr .
-A side effect of
-.Fn dn_comp
-is to update the list of pointers for
-labels inserted into the message
-as the name is compressed.
-If
-.Em dnptr
-is
-.Dv NULL, names are not compressed.
-If
-.Fa lastdnptr
-is
-.Dv NULL ,
-the list of labels is not updated.
-.Pp
-The
-.Fn dn_expand
-entry
-expands the compressed domain name
-.Fa comp_dn
-to a full domain name
-The compressed name is contained in a query or reply message;
-.Fa msg
-is a pointer to the beginning of the message.
-The uncompressed name is placed in the buffer indicated by
-.Fa exp_dn
-which is of size
-.Fa length .
-The size of compressed name is returned or \-1 if there was an error.
-.Sh FILES
-.Bl -tag -width Pa
-/etc/resolv.conf
-The configuration file
-see
-.Xr resolver 5 .
-.El
-.Sh SEE ALSO
-.Xr gethostbyname 3 ,
-.Xr resolver 5 ,
-.Xr hostname 7 ,
-.Xr named 8
-.Pp
-.%T RFC1032 ,
-.%T RFC1033 ,
-.%T RFC1034 ,
-.%T RFC1035 ,
-.%T RFC974
-.Rs
-.%T "Name Server Operations Guide for BIND"
-.Re
-.Sh HISTORY
-The
-.Nm
-function appeared in 
-.Bx 4.3 .
diff --git a/c/src/exec/libnetworking/libc/send.c b/c/src/exec/libnetworking/libc/send.c
deleted file mode 100644
index ad14bd3cd2..0000000000
--- a/c/src/exec/libnetworking/libc/send.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *  $Id$
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)send.c	8.2 (Berkeley) 2/21/94";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <stddef.h>
-
-ssize_t
-send(s, msg, len, flags)
-	int s, flags;
-	size_t len;
-	const void *msg;
-{
-	return (sendto(s, msg, len, flags, NULL, 0));
-}
diff --git a/c/src/exec/libnetworking/libc/strsep.c b/c/src/exec/libnetworking/libc/strsep.c
deleted file mode 100644
index 182319493d..0000000000
--- a/c/src/exec/libnetworking/libc/strsep.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *  $Id$
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char sccsid[] = "@(#)strsep.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
-#include <string.h>
-#include <stdio.h>
-
-/*
- * Get next token from string *stringp, where tokens are possibly-empty
- * strings separated by characters from delim.  
- *
- * Writes NULs into the string at *stringp to end tokens.
- * delim need not remain constant from call to call.
- * On return, *stringp points past the last NUL written (if there might
- * be further tokens), or is NULL (if there are definitely no more tokens).
- *
- * If *stringp is NULL, strsep returns NULL.
- *
- * PUBLIC: #ifndef HAVE_STRSEP
- * PUBLIC: char *strsep __P((char **, const char *));
- * PUBLIC: #endif
- */
-char *
-strsep(stringp, delim)
-	register char **stringp;
-	register const char *delim;
-{
-	register char *s;
-	register const char *spanp;
-	register int c, sc;
-	char *tok;
-
-	if ((s = *stringp) == NULL)
-		return (NULL);
-	for (tok = s;;) {
-		c = *s++;
-		spanp = delim;
-		do {
-			if ((sc = *spanp++) == c) {
-				if (c == 0)
-					s = NULL;
-				else
-					s[-1] = 0;
-				*stringp = s;
-				return (tok);
-			}
-		} while (sc != 0);
-	}
-	/* NOTREACHED */
-}
diff --git a/c/src/exec/libnetworking/loop.h b/c/src/exec/libnetworking/loop.h
deleted file mode 100644
index 34e0b828e4..0000000000
--- a/c/src/exec/libnetworking/loop.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
- *  $Id$
- */
-
-#define NLOOP 1
diff --git a/c/src/exec/libnetworking/machine/conf.h b/c/src/exec/libnetworking/machine/conf.h
deleted file mode 100644
index 5a6ee0337b..0000000000
--- a/c/src/exec/libnetworking/machine/conf.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/*
- *  $Id$
- */
-
-/* intentionally empty file */
-
diff --git a/c/src/exec/libnetworking/machine/cpu.h b/c/src/exec/libnetworking/machine/cpu.h
deleted file mode 100644
index 5a6ee0337b..0000000000
--- a/c/src/exec/libnetworking/machine/cpu.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/*
- *  $Id$
- */
-
-/* intentionally empty file */
-
diff --git a/c/src/exec/libnetworking/machine/cpufunc.h b/c/src/exec/libnetworking/machine/cpufunc.h
deleted file mode 100644
index 2b4c47e48f..0000000000
--- a/c/src/exec/libnetworking/machine/cpufunc.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
- *  $Id$
- */
-
-/* intentionally empty file */
diff --git a/c/src/exec/libnetworking/machine/endian.h b/c/src/exec/libnetworking/machine/endian.h
deleted file mode 100644
index 6b17da58d3..0000000000
--- a/c/src/exec/libnetworking/machine/endian.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- *  $Id$
- */
-
-#ifndef _MACHINE_ENDIAN_H_
-#define _MACHINE_ENDIAN_H_
-
-#include <rtems/score/cpu.h>
-
-/*
- * BSD-style endian declaration
- */
-#define BIG_ENDIAN	4321
-#define LITTLE_ENDIAN	1234
-
-#if CPU_BIG_ENDIAN
-# define BYTE_ORDER BIG_ENDIAN
-#elif CPU_LITTLE_ENDIAN
-# define BYTE_ORDER LITTLE_ENDIAN
-#else
-# error "Can't decide which end is which!"
-#endif
-
-#if ( CPU_HAS_OWN_HOST_TO_NETWORK_ROUTINES == FALSE )
-
-#if ( CPU_BIG_ENDIAN == TRUE )
-
-/*
- *  Very simply on big endian CPUs
- */
-
-#define       ntohl(_x)        (_x)
-#define       ntohs(_x)        (_x)
-#define       htonl(_x)        (_x)
-#define       htons(_x)        (_x)
-
-#define NTOHS(x)
-#define HTONS(x)
-#define NTOHL(x)
-#define HTONL(x)
-
-#elif ( CPU_LITTLE_ENDIAN == TRUE )
-
-/*
- *  A little more complicated on little endian CPUs
- */
-
-#define       ntohl(_x)        ((long)  CPU_swap_u32((unsigned32)_x))
-#define       ntohs(_x)        ((short) CPU_swap_u16((unsigned16)_x))
-#define       htonl(_x)        ((long)  CPU_swap_u32((unsigned32)_x))
-#define       htons(_x)        ((short) CPU_swap_u16((unsigned16)_x))
-
-#define NTOHS(x) (x) = ntohs(x)
-#define HTONS(x) (x) = htons(x)
-#define NTOHL(x) (x) = ntohl(x)
-#define HTONL(x) (x) = htonl(x)
-
-#else
-#error "Unknown endian-ness for this cpu"
-#endif
-
-#endif  /* CPU_HAS_OWN_HOST_TO_NETWORK_ROUTINES */
-
-#endif /* _MACHINE_ENDIAN_H_ */
diff --git a/c/src/exec/libnetworking/machine/in_cksum.h b/c/src/exec/libnetworking/machine/in_cksum.h
deleted file mode 100644
index 15509b3888..0000000000
--- a/c/src/exec/libnetworking/machine/in_cksum.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	from tahoe:	in_cksum.c	1.2	86/01/05
- *	from:		@(#)in_cksum.c	1.3 (Berkeley) 1/19/91
- *	from: Id: in_cksum.c,v 1.8 1995/12/03 18:35:19 bde Exp
- *	$Id$
- */
-
-#ifndef _MACHINE_IN_CKSUM_H_
-#define	_MACHINE_IN_CKSUM_H_	1
-
-#include <sys/cdefs.h>
-
-/*
- * It it useful to have an Internet checksum routine which is inlineable
- * and optimized specifically for the task of computing IP header checksums
- * in the normal case (where there are no options and the header length is
- * therefore always exactly five 32-bit words.
- */
-#if (defined(__GNUC__) && defined(__i386__))
-static __inline u_int
-in_cksum_hdr(const struct ip *ip)
-{
-	register u_int sum = 0;
-		    
-#define ADD(n)	__asm("addl " #n "(%2), %0" : "=r" (sum) : "0" (sum), "r" (ip))
-#define ADDC(n)	__asm("adcl " #n "(%2), %0" : "=r" (sum) : "0" (sum), "r" (ip))
-#define MOP	__asm("adcl         $0, %0" : "=r" (sum) : "0" (sum))
-
-	ADD(0);
-	ADDC(4);
-	ADDC(8);
-	ADDC(12);
-	ADDC(16);
-	MOP;
-	sum = (sum & 0xffff) + (sum >> 16);
-	if (sum > 0xffff)
-		sum -= 0xffff;
-
-	return ~sum & 0xffff;
-}
-
-static __inline void
-in_cksum_update(struct ip *ip)
-{
-	int __tmpsum;
-	__tmpsum = (int)ntohs(ip->ip_sum) + 256;
-	ip->ip_sum = htons(__tmpsum + (__tmpsum >> 16));
-}
-
-#elif (defined(__GNUC__) && (defined(__mc68000__) || defined(__m68k__)))
-
-static __inline__ u_int
-in_cksum_hdr(const struct ip *ip)
-{
-	register u_int *ap = (u_int *)ip;
-	register u_int sum = *ap++;
-	register u_int tmp;
-		    
-	__asm__("addl  %2@+,%0\n\t"
-	        "movel %2@+,%1\n\t"
-	        "addxl %1,%0\n\t"
-	        "movel %2@+,%1\n\t"
-	        "addxl %1,%0\n\t"
-	        "movel %2@,%1\n\t"
-	        "addxl %1,%0\n\t"
-	        "moveq #0,%1\n\t"
-	        "addxl %1,%0\n" :
-		"=d" (sum), "=d" (tmp), "=a" (ap) :
-		"0" (sum), "2" (ap));
-	sum = (sum & 0xffff) + (sum >> 16);
-	if (sum > 0xffff)
-		sum -= 0xffff;
-	return ~sum & 0xffff;
-}
-
-#else
-u_int in_cksum_hdr __P((const struct ip *));
-#define	in_cksum_update(ip) \
-	do { \
-		int __tmpsum; \
-		__tmpsum = (int)ntohs(ip->ip_sum) + 256; \
-		ip->ip_sum = htons(__tmpsum + (__tmpsum >> 16)); \
-	} while(0)
-
-#endif
-
-#endif /* _MACHINE_IN_CKSUM_H_ */
diff --git a/c/src/exec/libnetworking/machine/limits.h b/c/src/exec/libnetworking/machine/limits.h
deleted file mode 100644
index 5a6ee0337b..0000000000
--- a/c/src/exec/libnetworking/machine/limits.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/*
- *  $Id$
- */
-
-/* intentionally empty file */
-
diff --git a/c/src/exec/libnetworking/machine/param.h b/c/src/exec/libnetworking/machine/param.h
deleted file mode 100644
index 4168f1f6cf..0000000000
--- a/c/src/exec/libnetworking/machine/param.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- *  $Id$
- */
-
-#ifndef _MACHINE_PARAM_H_
-#define	_MACHINE_PARAM_H_
-
-/*
- * These aren't really machine-dependent for RTEMS.....
- */
-
-/*
-#define MACHINE		"i386"
-#define MID_MACHINE	MID_I386
-*/
-
-/*
- * Round p (pointer or byte index) up to a correctly-aligned value
- * for all data types (int, long, ...).   The result is unsigned int
- * and must be cast to any desired pointer type.
- */
-#define ALIGNBYTES	(sizeof(int) - 1)
-#define ALIGN(p)	(((unsigned)(p) + ALIGNBYTES) & ~ALIGNBYTES)
-
-#define PAGE_SHIFT	12		/* LOG2(PAGE_SIZE) */
-#define PAGE_SIZE	(1<<PAGE_SHIFT)	/* bytes/page */
-#define PAGE_MASK	(PAGE_SIZE-1)
-#define NPTEPG		(PAGE_SIZE/(sizeof (pt_entry_t)))
-
-#define NPDEPG		(PAGE_SIZE/(sizeof (pd_entry_t)))
-#define PDRSHIFT	22		/* LOG2(NBPDR) */
-#define NBPDR		(1<<PDRSHIFT)	/* bytes/page dir */
-
-#define DEV_BSHIFT	9		/* log2(DEV_BSIZE) */
-#define DEV_BSIZE	(1<<DEV_BSHIFT)
-
-#define BLKDEV_IOSIZE	2048
-#define MAXPHYS		(64 * 1024)	/* max raw I/O transfer size */
-
-#define UPAGES	2		/* pages of u-area */
-
-/*
- * Constants related to network buffer management.
- * MCLBYTES must be no larger than CLBYTES (the software page size), and,
- * on machines that exchange pages of input or output buffers with mbuf
- * clusters (MAPPED_MBUFS), MCLBYTES must also be an integral multiple
- * of the hardware page size.
- */
-#ifndef	MSIZE
-#define MSIZE		128		/* size of an mbuf */
-#endif	/* MSIZE */
-
-#ifndef	MCLSHIFT
-#define MCLSHIFT	11		/* convert bytes to m_buf clusters */
-#endif	/* MCLSHIFT */
-#define MCLBYTES	(1 << MCLSHIFT)	/* size of an m_buf cluster */
-#define MCLOFSET	(MCLBYTES - 1)	/* offset within an m_buf cluster */
-
-/*
- * Some macros for units conversion
- */
-
-/* clicks to bytes */
-#define ctob(x)	((x)<<PAGE_SHIFT)
-
-/* bytes to clicks */
-#define btoc(x)	(((unsigned)(x)+PAGE_MASK)>>PAGE_SHIFT)
-
-/*
- * btodb() is messy and perhaps slow because `bytes' may be an off_t.  We
- * want to shift an unsigned type to avoid sign extension and we don't
- * want to widen `bytes' unnecessarily.  Assume that the result fits in
- * a daddr_t.
- */
-#define btodb(bytes)	 		/* calculates (bytes / DEV_BSIZE) */ \
-	(sizeof (bytes) > sizeof(long) \
-	 ? (daddr_t)((unsigned long long)(bytes) >> DEV_BSHIFT) \
-	 : (daddr_t)((unsigned long)(bytes) >> DEV_BSHIFT))
-
-#define dbtob(db)			/* calculates (db * DEV_BSIZE) */ \
-	((off_t)(db) << DEV_BSHIFT)
-
-/*
- * Mach derived conversion macros
- */
-#define trunc_page(x)		((unsigned)(x) & ~PAGE_MASK)
-#define round_page(x)		((((unsigned)(x)) + PAGE_MASK) & ~PAGE_MASK)
-
-#define atop(x)			((unsigned)(x) >> PAGE_SHIFT)
-#define ptoa(x)			((unsigned)(x) << PAGE_SHIFT)
-
-#endif /* !_MACHINE_PARAM_H_ */
diff --git a/c/src/exec/libnetworking/machine/types.h b/c/src/exec/libnetworking/machine/types.h
deleted file mode 100644
index 730a6dec1d..0000000000
--- a/c/src/exec/libnetworking/machine/types.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * This file will have to be incorparated into the RTEMS source
- * tree (probably in the existing <machine/types.h> so that these
- * contents are included when an application source file includes
- * <sys/types.h>.
- *
- *  $Id$
- */
-
-#ifndef _MACHINE_TYPES_H_
-#define _MACHINE_TYPES_H_
-
-#include <rtems.h>
-#include <machine/endian.h>
-
-typedef rtems_signed64		int64_t;
-typedef rtems_signed32		int32_t;
-typedef rtems_signed16		int16_t;
-typedef rtems_signed8		int8_t;
-
-typedef rtems_unsigned64	u_int64_t;
-typedef rtems_unsigned32	u_int32_t;
-typedef rtems_unsigned16	u_int16_t;
-typedef rtems_unsigned8		u_int8_t;
-
-#define	_CLOCK_T_	unsigned long
-#define	_TIME_T_	long
-
-#ifdef _COMPILING_BSD_KERNEL_
-#include <rtems/rtems_bsdnet_internal.h>
-#include <rtems/rtems_bsdnet.h>
-#endif
-
-#endif /* _MACHINE_TYPES_H_ */
diff --git a/c/src/exec/libnetworking/machine/vmparam.h b/c/src/exec/libnetworking/machine/vmparam.h
deleted file mode 100644
index 5a6ee0337b..0000000000
--- a/c/src/exec/libnetworking/machine/vmparam.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/*
- *  $Id$
- */
-
-/* intentionally empty file */
-
diff --git a/c/src/exec/libnetworking/net/bpf.h b/c/src/exec/libnetworking/net/bpf.h
deleted file mode 100644
index 7847d72470..0000000000
--- a/c/src/exec/libnetworking/net/bpf.h
+++ /dev/null
@@ -1,236 +0,0 @@
-/*
- * Copyright (c) 1990, 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from the Stanford/CMU enet packet filter,
- * (net/enet.c) distributed as part of 4.3BSD, and code contributed
- * to Berkeley by Steven McCanne and Van Jacobson both of Lawrence
- * Berkeley Laboratory.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *      @(#)bpf.h	8.1 (Berkeley) 6/10/93
- *	@(#)bpf.h	1.34 (LBL)     6/16/96
- *
- * $Id$
- */
-
-#ifndef _NET_BPF_H_
-#define _NET_BPF_H_
-
-/* BSD style release date */
-#define	BPF_RELEASE 199606
-
-typedef	int32_t	  bpf_int32;
-typedef	u_int32_t bpf_u_int32;
-
-/*
- * Alignment macros.  BPF_WORDALIGN rounds up to the next
- * even multiple of BPF_ALIGNMENT.
- */
-#define BPF_ALIGNMENT sizeof(bpf_int32)
-#define BPF_WORDALIGN(x) (((x)+(BPF_ALIGNMENT-1))&~(BPF_ALIGNMENT-1))
-
-#define BPF_MAXINSNS 512
-#define BPF_MAXBUFSIZE 0x8000
-#define BPF_MINBUFSIZE 32
-
-/*
- *  Structure for BIOCSETF.
- */
-struct bpf_program {
-	u_int bf_len;
-	struct bpf_insn *bf_insns;
-};
-
-/*
- * Struct returned by BIOCGSTATS.
- */
-struct bpf_stat {
-	u_int bs_recv;		/* number of packets received */
-	u_int bs_drop;		/* number of packets dropped */
-};
-
-/*
- * Struct return by BIOCVERSION.  This represents the version number of
- * the filter language described by the instruction encodings below.
- * bpf understands a program iff kernel_major == filter_major &&
- * kernel_minor >= filter_minor, that is, if the value returned by the
- * running kernel has the same major number and a minor number equal
- * equal to or less than the filter being downloaded.  Otherwise, the
- * results are undefined, meaning an error may be returned or packets
- * may be accepted haphazardly.
- * It has nothing to do with the source code version.
- */
-struct bpf_version {
-	u_short bv_major;
-	u_short bv_minor;
-};
-/* Current version number of filter architecture. */
-#define BPF_MAJOR_VERSION 1
-#define BPF_MINOR_VERSION 1
-
-#define	BIOCGBLEN	_IOR('B',102, u_int)
-#define	BIOCSBLEN	_IOWR('B',102, u_int)
-#define	BIOCSETF	_IOW('B',103, struct bpf_program)
-#define	BIOCFLUSH	_IO('B',104)
-#define BIOCPROMISC	_IO('B',105)
-#define	BIOCGDLT	_IOR('B',106, u_int)
-#define BIOCGETIF	_IOR('B',107, struct ifreq)
-#define BIOCSETIF	_IOW('B',108, struct ifreq)
-#define BIOCSRTIMEOUT	_IOW('B',109, struct timeval)
-#define BIOCGRTIMEOUT	_IOR('B',110, struct timeval)
-#define BIOCGSTATS	_IOR('B',111, struct bpf_stat)
-#define BIOCIMMEDIATE	_IOW('B',112, u_int)
-#define BIOCVERSION	_IOR('B',113, struct bpf_version)
-#define BIOCGRSIG	_IOR('B',114, u_int)
-#define BIOCSRSIG	_IOW('B',115, u_int)
-
-/*
- * Structure prepended to each packet.
- */
-struct bpf_hdr {
-	struct timeval	bh_tstamp;	/* time stamp */
-	bpf_u_int32	bh_caplen;	/* length of captured portion */
-	bpf_u_int32	bh_datalen;	/* original length of packet */
-	u_short		bh_hdrlen;	/* length of bpf header (this struct
-					   plus alignment padding) */
-};
-/*
- * Because the structure above is not a multiple of 4 bytes, some compilers
- * will insist on inserting padding; hence, sizeof(struct bpf_hdr) won't work.
- * Only the kernel needs to know about it; applications use bh_hdrlen.
- */
-#ifdef KERNEL
-#define SIZEOF_BPF_HDR 18
-#endif
-
-/*
- * Data-link level type codes.
- */
-#define DLT_NULL	0	/* no link-layer encapsulation */
-#define DLT_EN10MB	1	/* Ethernet (10Mb) */
-#define DLT_EN3MB	2	/* Experimental Ethernet (3Mb) */
-#define DLT_AX25	3	/* Amateur Radio AX.25 */
-#define DLT_PRONET	4	/* Proteon ProNET Token Ring */
-#define DLT_CHAOS	5	/* Chaos */
-#define DLT_IEEE802	6	/* IEEE 802 Networks */
-#define DLT_ARCNET	7	/* ARCNET */
-#define DLT_SLIP	8	/* Serial Line IP */
-#define DLT_PPP		9	/* Point-to-point Protocol */
-#define DLT_FDDI	10	/* FDDI */
-#define DLT_ATM_RFC1483	11	/* LLC/SNAP encapsulated atm */
-
-/*
- * The instruction encodings.
- */
-/* instruction classes */
-#define BPF_CLASS(code) ((code) & 0x07)
-#define		BPF_LD		0x00
-#define		BPF_LDX		0x01
-#define		BPF_ST		0x02
-#define		BPF_STX		0x03
-#define		BPF_ALU		0x04
-#define		BPF_JMP		0x05
-#define		BPF_RET		0x06
-#define		BPF_MISC	0x07
-
-/* ld/ldx fields */
-#define BPF_SIZE(code)	((code) & 0x18)
-#define		BPF_W		0x00
-#define		BPF_H		0x08
-#define		BPF_B		0x10
-#define BPF_MODE(code)	((code) & 0xe0)
-#define		BPF_IMM 	0x00
-#define		BPF_ABS		0x20
-#define		BPF_IND		0x40
-#define		BPF_MEM		0x60
-#define		BPF_LEN		0x80
-#define		BPF_MSH		0xa0
-
-/* alu/jmp fields */
-#define BPF_OP(code)	((code) & 0xf0)
-#define		BPF_ADD		0x00
-#define		BPF_SUB		0x10
-#define		BPF_MUL		0x20
-#define		BPF_DIV		0x30
-#define		BPF_OR		0x40
-#define		BPF_AND		0x50
-#define		BPF_LSH		0x60
-#define		BPF_RSH		0x70
-#define		BPF_NEG		0x80
-#define		BPF_JA		0x00
-#define		BPF_JEQ		0x10
-#define		BPF_JGT		0x20
-#define		BPF_JGE		0x30
-#define		BPF_JSET	0x40
-#define BPF_SRC(code)	((code) & 0x08)
-#define		BPF_K		0x00
-#define		BPF_X		0x08
-
-/* ret - BPF_K and BPF_X also apply */
-#define BPF_RVAL(code)	((code) & 0x18)
-#define		BPF_A		0x10
-
-/* misc */
-#define BPF_MISCOP(code) ((code) & 0xf8)
-#define		BPF_TAX		0x00
-#define		BPF_TXA		0x80
-
-/*
- * The instruction data structure.
- */
-struct bpf_insn {
-	u_short		code;
-	u_char		jt;
-	u_char		jf;
-	bpf_u_int32	k;
-};
-
-/*
- * Macros for insn array initializers.
- */
-#define BPF_STMT(code, k) { (u_short)(code), 0, 0, k }
-#define BPF_JUMP(code, k, jt, jf) { (u_short)(code), jt, jf, k }
-
-#ifdef KERNEL
-int	 bpf_validate __P((struct bpf_insn *, int));
-void	 bpf_tap __P((struct ifnet *, u_char *, u_int));
-void	 bpf_mtap __P((struct ifnet *, struct mbuf *));
-void	 bpfattach __P((struct ifnet *, u_int, u_int));
-void	 bpfilterattach __P((int));
-u_int	 bpf_filter __P((struct bpf_insn *, u_char *, u_int, u_int));
-#endif
-
-/*
- * Number of scratch memory words (for BPF_LD|BPF_MEM and BPF_ST).
- */
-#define BPF_MEMWORDS 16
-
-#endif
diff --git a/c/src/exec/libnetworking/net/ethernet.h b/c/src/exec/libnetworking/net/ethernet.h
deleted file mode 100644
index c6c07189ec..0000000000
--- a/c/src/exec/libnetworking/net/ethernet.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Fundamental constants relating to ethernet.
- *
- * $Id$
- *
- */
-
-#ifndef _NET_ETHERNET_H_
-#define _NET_ETHERNET_H_
-
-/*
- * The number of bytes in an ethernet (MAC) address.
- */
-#define	ETHER_ADDR_LEN		6
-
-/*
- * The number of bytes in the type field.
- */
-#define	ETHER_TYPE_LEN		2
-
-/*
- * The number of bytes in the trailing CRC field.
- */
-#define	ETHER_CRC_LEN		4
-
-/*
- * The length of the combined header.
- */
-#define	ETHER_HDR_LEN		(ETHER_ADDR_LEN*2+ETHER_TYPE_LEN)
-
-/*
- * The minimum packet length.
- */
-#define	ETHER_MIN_LEN		64
-
-/*
- * The maximum packet length.
- */
-#define	ETHER_MAX_LEN		1518
-
-/*
- * A macro to validate a length with
- */
-#define	ETHER_IS_VALID_LEN(foo)	\
-	((foo) >= ETHER_MIN_LEN && (foo) <= ETHER_MAX_LEN)
-
-/*
- * Structure of a 10Mb/s Ethernet header.
- */
-struct	ether_header {
-	u_char	ether_dhost[ETHER_ADDR_LEN];
-	u_char	ether_shost[ETHER_ADDR_LEN];
-	u_short	ether_type;
-};
-
-/*
- * Structure of a 48-bit Ethernet address.
- */
-struct	ether_addr {
-	u_char octet[ETHER_ADDR_LEN];
-};
-
-#endif
diff --git a/c/src/exec/libnetworking/net/if.c b/c/src/exec/libnetworking/net/if.c
deleted file mode 100644
index af6f003de3..0000000000
--- a/c/src/exec/libnetworking/net/if.c
+++ /dev/null
@@ -1,783 +0,0 @@
-/*
- * Copyright (c) 1980, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)if.c	8.3 (Berkeley) 1/4/94
- * $Id$
- */
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/mbuf.h>
-#include <sys/systm.h>
-#include <sys/proc.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/protosw.h>
-#include <sys/kernel.h>
-#include <sys/ioctl.h>
-#include <sys/errno.h>
-#include <sys/syslog.h>
-#include <sys/sysctl.h>
-
-#include <net/if.h>
-#include <net/if_dl.h>
-#include <net/if_types.h>
-#include <net/radix.h>
-
-/*
- * System initialization
- */
-
-static int ifconf __P((int, caddr_t));
-       void ifinit __P((void *));
-static void if_qflush __P((struct ifqueue *));
-static void if_slowtimo __P((void *));
-static void link_rtrequest __P((int, struct rtentry *, struct sockaddr *));
-
-SYSINIT(interfaces, SI_SUB_PROTO_IF, SI_ORDER_FIRST, ifinit, NULL)
-
-
-int	ifqmaxlen = IFQ_MAXLEN;
-struct	ifnet *ifnet;
-
-/*
- * Network interface utility routines.
- *
- * Routines with ifa_ifwith* names take sockaddr *'s as
- * parameters.
- *
- * This routine assumes that it will be called at splimp() or higher.
- */
-/* ARGSUSED*/
-void
-ifinit(dummy)
-	void *dummy;
-{
-	register struct ifnet *ifp;
-
-	for (ifp = ifnet; ifp; ifp = ifp->if_next)
-		if (ifp->if_snd.ifq_maxlen == 0)
-			ifp->if_snd.ifq_maxlen = ifqmaxlen;
-	if_slowtimo(0);
-}
-
-int if_index = 0;
-struct ifaddr **ifnet_addrs;
-
-
-/*
- * Attach an interface to the
- * list of "active" interfaces.
- */
-void
-if_attach(ifp)
-	struct ifnet *ifp;
-{
-	unsigned socksize, ifasize;
-	int namelen, masklen;
-	char workbuf[64];
-	register struct ifnet **p = &ifnet;
-	register struct sockaddr_dl *sdl;
-	register struct ifaddr *ifa;
-	static int if_indexlim = 8;
-
-
-	while (*p)
-		p = &((*p)->if_next);
-	*p = ifp;
-	ifp->if_index = ++if_index;
-	microtime(&ifp->if_lastchange);
-	if (ifnet_addrs == 0 || if_index >= if_indexlim) {
-		unsigned n = (if_indexlim <<= 1) * sizeof(ifa);
-		struct ifaddr **q = (struct ifaddr **)
-					malloc(n, M_IFADDR, M_WAITOK);
-		bzero((caddr_t)q, n);
-		if (ifnet_addrs) {
-			bcopy((caddr_t)ifnet_addrs, (caddr_t)q, n/2);
-			free((caddr_t)ifnet_addrs, M_IFADDR);
-		}
-		ifnet_addrs = q;
-	}
-	/*
-	 * create a Link Level name for this device
-	 */
-	namelen = sprintf(workbuf, "%s%d", ifp->if_name, ifp->if_unit);
-#define _offsetof(t, m) ((int)((caddr_t)&((t *)0)->m))
-	masklen = _offsetof(struct sockaddr_dl, sdl_data[0]) + namelen;
-	socksize = masklen + ifp->if_addrlen;
-#define ROUNDUP(a) (1 + (((a) - 1) | (sizeof(long) - 1)))
-	socksize = ROUNDUP(socksize);
-	if (socksize < sizeof(*sdl))
-		socksize = sizeof(*sdl);
-	ifasize = sizeof(*ifa) + 2 * socksize;
-	ifa = (struct ifaddr *)malloc(ifasize, M_IFADDR, M_WAITOK);
-	if (ifa) {
-		bzero((caddr_t)ifa, ifasize);
-		sdl = (struct sockaddr_dl *)(ifa + 1);
-		sdl->sdl_len = socksize;
-		sdl->sdl_family = AF_LINK;
-		bcopy(workbuf, sdl->sdl_data, namelen);
-		sdl->sdl_nlen = namelen;
-		sdl->sdl_index = ifp->if_index;
-		sdl->sdl_type = ifp->if_type;
-		ifnet_addrs[if_index - 1] = ifa;
-		ifa->ifa_ifp = ifp;
-		ifa->ifa_next = ifp->if_addrlist;
-		ifa->ifa_rtrequest = link_rtrequest;
-		ifp->if_addrlist = ifa;
-		ifa->ifa_addr = (struct sockaddr *)sdl;
-
-		sdl = (struct sockaddr_dl *)(socksize + (caddr_t)sdl);
-		ifa->ifa_netmask = (struct sockaddr *)sdl;
-		sdl->sdl_len = masklen;
-		while (namelen != 0)
-			sdl->sdl_data[--namelen] = 0xff;
-	}
-}
-/*
- * Locate an interface based on a complete address.
- */
-/*ARGSUSED*/
-struct ifaddr *
-ifa_ifwithaddr(addr)
-	register struct sockaddr *addr;
-{
-	register struct ifnet *ifp;
-	register struct ifaddr *ifa;
-
-#define	equal(a1, a2) \
-  (bcmp((caddr_t)(a1), (caddr_t)(a2), ((struct sockaddr *)(a1))->sa_len) == 0)
-	for (ifp = ifnet; ifp; ifp = ifp->if_next)
-	    for (ifa = ifp->if_addrlist; ifa; ifa = ifa->ifa_next) {
-		if (ifa->ifa_addr->sa_family != addr->sa_family)
-			continue;
-		if (equal(addr, ifa->ifa_addr))
-			return (ifa);
-		if ((ifp->if_flags & IFF_BROADCAST) && ifa->ifa_broadaddr &&
-		    equal(ifa->ifa_broadaddr, addr))
-			return (ifa);
-	}
-	return ((struct ifaddr *)0);
-}
-/*
- * Locate the point to point interface with a given destination address.
- */
-/*ARGSUSED*/
-struct ifaddr *
-ifa_ifwithdstaddr(addr)
-	register struct sockaddr *addr;
-{
-	register struct ifnet *ifp;
-	register struct ifaddr *ifa;
-
-	for (ifp = ifnet; ifp; ifp = ifp->if_next)
-	    if (ifp->if_flags & IFF_POINTOPOINT)
-		for (ifa = ifp->if_addrlist; ifa; ifa = ifa->ifa_next) {
-			if (ifa->ifa_addr->sa_family != addr->sa_family)
-				continue;
-			if (ifa->ifa_dstaddr && equal(addr, ifa->ifa_dstaddr))
-				return (ifa);
-	}
-	return ((struct ifaddr *)0);
-}
-
-/*
- * Find an interface on a specific network.  If many, choice
- * is most specific found.
- */
-struct ifaddr *
-ifa_ifwithnet(addr)
-	struct sockaddr *addr;
-{
-	register struct ifnet *ifp;
-	register struct ifaddr *ifa;
-	struct ifaddr *ifa_maybe = (struct ifaddr *) 0;
-	u_int af = addr->sa_family;
-	char *addr_data = addr->sa_data, *cplim;
-
-	if (af == AF_LINK) {
-	    register struct sockaddr_dl *sdl = (struct sockaddr_dl *)addr;
-	    if (sdl->sdl_index && sdl->sdl_index <= if_index)
-		return (ifnet_addrs[sdl->sdl_index - 1]);
-	}
-	for (ifp = ifnet; ifp; ifp = ifp->if_next) {
-		for (ifa = ifp->if_addrlist; ifa; ifa = ifa->ifa_next) {
-			register char *cp, *cp2, *cp3;
-
-			if (ifa->ifa_addr->sa_family != af)
-				next: continue;
-			if (ifp->if_flags & IFF_POINTOPOINT) {
-				if (ifa->ifa_dstaddr != 0
-				    && equal(addr, ifa->ifa_dstaddr))
- 					return (ifa);
-			} else {
-				/*
-				 * if we have a special address handler,
-				 * then use it instead of the generic one.
-				 */
-	          		if (ifa->ifa_claim_addr) {
-					if ((*ifa->ifa_claim_addr)(ifa, addr)) {
-						return (ifa);
-					} else {
-						continue;
-					}
-				}
-
-				/*
-				 * Scan all the bits in the ifa's address.
-				 * If a bit dissagrees with what we are
-				 * looking for, mask it with the netmask
-				 * to see if it really matters.
-				 * (A byte at a time)
-				 */
-				if (ifa->ifa_netmask == 0)
-					continue;
-				cp = addr_data;
-				cp2 = ifa->ifa_addr->sa_data;
-				cp3 = ifa->ifa_netmask->sa_data;
-				cplim = ifa->ifa_netmask->sa_len + (char *)ifa->ifa_netmask;
-				while (cp3 < cplim)
-					if ((*cp++ ^ *cp2++) & *cp3++)
-						goto next;
-				if (ifa_maybe == 0 ||
-				    rn_refines((caddr_t)ifa->ifa_netmask,
-				    (caddr_t)ifa_maybe->ifa_netmask))
-					ifa_maybe = ifa;
-			}
-		}
-	}
-	return (ifa_maybe);
-}
-
-/*
- * Find an interface address specific to an interface best matching
- * a given address.
- */
-struct ifaddr *
-ifaof_ifpforaddr(addr, ifp)
-	struct sockaddr *addr;
-	register struct ifnet *ifp;
-{
-	register struct ifaddr *ifa;
-	register char *cp, *cp2, *cp3;
-	register char *cplim;
-	struct ifaddr *ifa_maybe = 0;
-	u_int af = addr->sa_family;
-
-	if (af >= AF_MAX)
-		return (0);
-	for (ifa = ifp->if_addrlist; ifa; ifa = ifa->ifa_next) {
-		if (ifa->ifa_addr->sa_family != af)
-			continue;
-		if (ifa_maybe == 0)
-			ifa_maybe = ifa;
-		if (ifa->ifa_netmask == 0) {
-			if (equal(addr, ifa->ifa_addr) ||
-			    (ifa->ifa_dstaddr && equal(addr, ifa->ifa_dstaddr)))
-				return (ifa);
-			continue;
-		}
-		if (ifp->if_flags & IFF_POINTOPOINT) {
-			if (equal(addr, ifa->ifa_dstaddr))
-				return (ifa);
-		} else {
-			cp = addr->sa_data;
-			cp2 = ifa->ifa_addr->sa_data;
-			cp3 = ifa->ifa_netmask->sa_data;
-			cplim = ifa->ifa_netmask->sa_len + (char *)ifa->ifa_netmask;
-			for (; cp3 < cplim; cp3++)
-				if ((*cp++ ^ *cp2++) & *cp3)
-					break;
-			if (cp3 == cplim)
-				return (ifa);
-		}
-	}
-	return (ifa_maybe);
-}
-
-#include <net/route.h>
-
-/*
- * Default action when installing a route with a Link Level gateway.
- * Lookup an appropriate real ifa to point to.
- * This should be moved to /sys/net/link.c eventually.
- */
-static void
-link_rtrequest(cmd, rt, sa)
-	int cmd;
-	register struct rtentry *rt;
-	struct sockaddr *sa;
-{
-	register struct ifaddr *ifa;
-	struct sockaddr *dst;
-	struct ifnet *ifp;
-
-	if (cmd != RTM_ADD || ((ifa = rt->rt_ifa) == 0) ||
-	    ((ifp = ifa->ifa_ifp) == 0) || ((dst = rt_key(rt)) == 0))
-		return;
-	ifa = ifaof_ifpforaddr(dst, ifp);
-	if (ifa) {
-		IFAFREE(rt->rt_ifa);
-		rt->rt_ifa = ifa;
-		ifa->ifa_refcnt++;
-		if (ifa->ifa_rtrequest && ifa->ifa_rtrequest != link_rtrequest)
-			ifa->ifa_rtrequest(cmd, rt, sa);
-	}
-}
-
-/*
- * Mark an interface down and notify protocols of
- * the transition.
- * NOTE: must be called at splnet or eqivalent.
- */
-void
-if_down(ifp)
-	register struct ifnet *ifp;
-{
-	register struct ifaddr *ifa;
-
-	ifp->if_flags &= ~IFF_UP;
-	microtime(&ifp->if_lastchange);
-	for (ifa = ifp->if_addrlist; ifa; ifa = ifa->ifa_next)
-		pfctlinput(PRC_IFDOWN, ifa->ifa_addr);
-	if_qflush(&ifp->if_snd);
-	rt_ifmsg(ifp);
-}
-
-/*
- * Mark an interface up and notify protocols of
- * the transition.
- * NOTE: must be called at splnet or eqivalent.
- */
-void
-if_up(ifp)
-	register struct ifnet *ifp;
-{
-
-	ifp->if_flags |= IFF_UP;
-	microtime(&ifp->if_lastchange);
-#ifdef notyet
-	register struct ifaddr *ifa;
-	/* this has no effect on IP, and will kill all iso connections XXX */
-	for (ifa = ifp->if_addrlist; ifa; ifa = ifa->ifa_next)
-		pfctlinput(PRC_IFUP, ifa->ifa_addr);
-#endif
-	rt_ifmsg(ifp);
-}
-
-/*
- * Flush an interface queue.
- */
-static void
-if_qflush(ifq)
-	register struct ifqueue *ifq;
-{
-	register struct mbuf *m, *n;
-
-	n = ifq->ifq_head;
-	while ((m = n) != 0) {
-		n = m->m_act;
-		m_freem(m);
-	}
-	ifq->ifq_head = 0;
-	ifq->ifq_tail = 0;
-	ifq->ifq_len = 0;
-}
-
-/*
- * Handle interface watchdog timer routines.  Called
- * from softclock, we decrement timers (if set) and
- * call the appropriate interface routine on expiration.
- */
-static void
-if_slowtimo(arg)
-	void *arg;
-{
-	register struct ifnet *ifp;
-	int s = splimp();
-
-	for (ifp = ifnet; ifp; ifp = ifp->if_next) {
-		if (ifp->if_timer == 0 || --ifp->if_timer)
-			continue;
-		if (ifp->if_watchdog)
-			(*ifp->if_watchdog)(ifp);
-	}
-	splx(s);
-	timeout(if_slowtimo, (void *)0, hz / IFNET_SLOWHZ);
-}
-
-/*
- * Map interface name to
- * interface structure pointer.
- */
-struct ifnet *
-ifunit(name)
-	register char *name;
-{
-	register char *cp;
-	register struct ifnet *ifp;
-	int unit;
-	unsigned len;
-	char *ep, c;
-
-	for (cp = name; cp < name + IFNAMSIZ && *cp; cp++)
-		if (*cp >= '0' && *cp <= '9')
-			break;
-	if (*cp == '\0' || cp == name + IFNAMSIZ)
-		return ((struct ifnet *)0);
-	/*
-	 * Save first char of unit, and pointer to it,
-	 * so we can put a null there to avoid matching
-	 * initial substrings of interface names.
-	 */
-	len = cp - name + 1;
-	c = *cp;
-	ep = cp;
-	for (unit = 0; *cp >= '0' && *cp <= '9'; )
-		unit = unit * 10 + *cp++ - '0';
-	if (*cp != '\0')
-		return 0;	/* no trailing garbage allowed */
-	*ep = 0;
-	for (ifp = ifnet; ifp; ifp = ifp->if_next) {
-		if (bcmp(ifp->if_name, name, len))
-			continue;
-		if (unit == ifp->if_unit)
-			break;
-	}
-	*ep = c;
-	return (ifp);
-}
-
-/*
- * Interface ioctls.
- */
-int
-ifioctl(so, cmd, data, p)
-	struct socket *so;
-	int cmd;
-	caddr_t data;
-	struct proc *p;
-{
-	register struct ifnet *ifp;
-	register struct ifreq *ifr;
-	int error;
-
-	switch (cmd) {
-
-	case SIOCGIFCONF:
-	case OSIOCGIFCONF:
-		return (ifconf(cmd, data));
-	}
-	ifr = (struct ifreq *)data;
-	ifp = ifunit(ifr->ifr_name);
-	if (ifp == 0)
-		return (ENXIO);
-	switch (cmd) {
-
-	case SIOCGIFFLAGS:
-		ifr->ifr_flags = ifp->if_flags;
-		break;
-
-	case SIOCGIFMETRIC:
-		ifr->ifr_metric = ifp->if_metric;
-		break;
-
-	case SIOCGIFMTU:
-		ifr->ifr_mtu = ifp->if_mtu;
-		break;
-
-	case SIOCGIFPHYS:
-		ifr->ifr_phys = ifp->if_physical;
-		break;
-
-	case SIOCSIFFLAGS:
-		error = suser(p->p_ucred, &p->p_acflag);
-		if (error)
-			return (error);
-		if (ifp->if_flags & IFF_UP && (ifr->ifr_flags & IFF_UP) == 0) {
-			int s = splimp();
-			if_down(ifp);
-			splx(s);
-		}
-		if (ifr->ifr_flags & IFF_UP && (ifp->if_flags & IFF_UP) == 0) {
-			int s = splimp();
-			if_up(ifp);
-			splx(s);
-		}
-		ifp->if_flags = (ifp->if_flags & IFF_CANTCHANGE) |
-			(ifr->ifr_flags &~ IFF_CANTCHANGE);
-		if (ifp->if_ioctl)
-			(void) (*ifp->if_ioctl)(ifp, cmd, data);
-		microtime(&ifp->if_lastchange);
-		break;
-
-	case SIOCSIFMETRIC:
-		error = suser(p->p_ucred, &p->p_acflag);
-		if (error)
-			return (error);
-		ifp->if_metric = ifr->ifr_metric;
-		microtime(&ifp->if_lastchange);
-		break;
-
-	case SIOCSIFPHYS:
-		error = suser(p->p_ucred, &p->p_acflag);
-		if (error)
-			return error;
-		if (!ifp->if_ioctl)
-		        return EOPNOTSUPP;
-		error = (*ifp->if_ioctl)(ifp, cmd, data);
-		if (error == 0)
-			microtime(&ifp->if_lastchange);
-		return(error);
-
-	case SIOCSIFMTU:
-		error = suser(p->p_ucred, &p->p_acflag);
-		if (error)
-			return (error);
-		if (ifp->if_ioctl == NULL)
-			return (EOPNOTSUPP);
-		/*
-		 * 72 was chosen below because it is the size of a TCP/IP
-		 * header (40) + the minimum mss (32).
-		 */
-		if (ifr->ifr_mtu < 72 || ifr->ifr_mtu > 65535)
-			return (EINVAL);
-		error = (*ifp->if_ioctl)(ifp, cmd, data);
-		if (error == 0)
-			microtime(&ifp->if_lastchange);
-		return(error);
-
-	case SIOCADDMULTI:
-	case SIOCDELMULTI:
-		error = suser(p->p_ucred, &p->p_acflag);
-		if (error)
-			return (error);
-		if (ifp->if_ioctl == NULL)
-			return (EOPNOTSUPP);
-		error = (*ifp->if_ioctl)(ifp, cmd, data);
-		if (error == 0 )
-		    	microtime(&ifp->if_lastchange);
-		return(error);
-
-        case SIOCSIFMEDIA:
-		error = suser(p->p_ucred, &p->p_acflag);
-		if (error)
-			return (error);
-		if (ifp->if_ioctl == 0)
-			return (EOPNOTSUPP);
-		error = (*ifp->if_ioctl)(ifp, cmd, data);
-		if (error == 0)
-			microtime(&ifp->if_lastchange);
-		return error;
-
-	case SIOCGIFMEDIA:
-		if (ifp->if_ioctl == 0)
-			return (EOPNOTSUPP);
-		return ((*ifp->if_ioctl)(ifp, cmd, data));
-
-	default:
-		if (so->so_proto == 0)
-			return (EOPNOTSUPP);
-#ifndef COMPAT_43
-		return ((*so->so_proto->pr_usrreqs->pru_control)(so, cmd,
-								 data,
-								 ifp));
-#else
-	    {
-		int ocmd = cmd;
-
-		switch (cmd) {
-
-		case SIOCSIFDSTADDR:
-		case SIOCSIFADDR:
-		case SIOCSIFBRDADDR:
-		case SIOCSIFNETMASK:
-#if BYTE_ORDER != BIG_ENDIAN
-			if (ifr->ifr_addr.sa_family == 0 &&
-			    ifr->ifr_addr.sa_len < 16) {
-				ifr->ifr_addr.sa_family = ifr->ifr_addr.sa_len;
-				ifr->ifr_addr.sa_len = 16;
-			}
-#else
-			if (ifr->ifr_addr.sa_len == 0)
-				ifr->ifr_addr.sa_len = 16;
-#endif
-			break;
-
-		case OSIOCGIFADDR:
-			cmd = SIOCGIFADDR;
-			break;
-
-		case OSIOCGIFDSTADDR:
-			cmd = SIOCGIFDSTADDR;
-			break;
-
-		case OSIOCGIFBRDADDR:
-			cmd = SIOCGIFBRDADDR;
-			break;
-
-		case OSIOCGIFNETMASK:
-			cmd = SIOCGIFNETMASK;
-		}
-		error =  ((*so->so_proto->pr_usrreqs->pru_control)(so,
-								   cmd,
-								   data,
-								   ifp));
-		switch (ocmd) {
-
-		case OSIOCGIFADDR:
-		case OSIOCGIFDSTADDR:
-		case OSIOCGIFBRDADDR:
-		case OSIOCGIFNETMASK:
-			*(u_short *)&ifr->ifr_addr = ifr->ifr_addr.sa_family;
-		}
-		return (error);
-
-	    }
-#endif
-	}
-	return (0);
-}
-
-/*
- * Set/clear promiscuous mode on interface ifp based on the truth value
- * of pswitch.  The calls are reference counted so that only the first
- * "on" request actually has an effect, as does the final "off" request.
- * Results are undefined if the "off" and "on" requests are not matched.
- */
-int
-ifpromisc(ifp, pswitch)
-	struct ifnet *ifp;
-	int pswitch;
-{
-	struct ifreq ifr;
-
-	if (pswitch) {
-		/*
-		 * If the device is not configured up, we cannot put it in
-		 * promiscuous mode.
-		 */
-		if ((ifp->if_flags & IFF_UP) == 0)
-			return (ENETDOWN);
-		if (ifp->if_pcount++ != 0)
-			return (0);
-		ifp->if_flags |= IFF_PROMISC;
-		log(LOG_INFO, "%s%d: promiscuous mode enabled\n",
-		    ifp->if_name, ifp->if_unit);
-	} else {
-		if (--ifp->if_pcount > 0)
-			return (0);
-		ifp->if_flags &= ~IFF_PROMISC;
-	}
-	ifr.ifr_flags = ifp->if_flags;
-	return ((*ifp->if_ioctl)(ifp, SIOCSIFFLAGS, (caddr_t)&ifr));
-}
-
-/*
- * Return interface configuration
- * of system.  List may be used
- * in later ioctl's (above) to get
- * other information.
- */
-/*ARGSUSED*/
-static int
-ifconf(cmd, data)
-	int cmd;
-	caddr_t data;
-{
-	register struct ifconf *ifc = (struct ifconf *)data;
-	register struct ifnet *ifp = ifnet;
-	register struct ifaddr *ifa;
-	struct ifreq ifr, *ifrp;
-	int space = ifc->ifc_len, error = 0;
-
-	ifrp = ifc->ifc_req;
-	for (; space > sizeof (ifr) && ifp; ifp = ifp->if_next) {
-		char workbuf[64];
-		int ifnlen;
-
-		ifnlen = sprintf(workbuf, "%s%d", ifp->if_name, ifp->if_unit);
-		if(ifnlen + 1 > sizeof ifr.ifr_name) {
-			error = ENAMETOOLONG;
-		} else {
-			strcpy(ifr.ifr_name, workbuf);
-		}
-
-		if ((ifa = ifp->if_addrlist) == 0) {
-			bzero((caddr_t)&ifr.ifr_addr, sizeof(ifr.ifr_addr));
-			error = copyout((caddr_t)&ifr, (caddr_t)ifrp,
-			    sizeof (ifr));
-			if (error)
-				break;
-			space -= sizeof (ifr), ifrp++;
-		} else
-		    for ( ; space > sizeof (ifr) && ifa; ifa = ifa->ifa_next) {
-			register struct sockaddr *sa = ifa->ifa_addr;
-#ifdef COMPAT_43
-			if (cmd == OSIOCGIFCONF) {
-				struct osockaddr *osa =
-					 (struct osockaddr *)&ifr.ifr_addr;
-				ifr.ifr_addr = *sa;
-				osa->sa_family = sa->sa_family;
-				error = copyout((caddr_t)&ifr, (caddr_t)ifrp,
-						sizeof (ifr));
-				ifrp++;
-			} else
-#endif
-			if (sa->sa_len <= sizeof(*sa)) {
-				ifr.ifr_addr = *sa;
-				error = copyout((caddr_t)&ifr, (caddr_t)ifrp,
-						sizeof (ifr));
-				ifrp++;
-			} else {
-				space -= sa->sa_len - sizeof(*sa);
-				if (space < sizeof (ifr))
-					break;
-				error = copyout((caddr_t)&ifr, (caddr_t)ifrp,
-						sizeof (ifr.ifr_name));
-				if (error == 0)
-				    error = copyout((caddr_t)sa,
-				      (caddr_t)&ifrp->ifr_addr, sa->sa_len);
-				ifrp = (struct ifreq *)
-					(sa->sa_len + (caddr_t)&ifrp->ifr_addr);
-			}
-			if (error)
-				break;
-			space -= sizeof (ifr);
-		}
-	}
-	ifc->ifc_len -= space;
-	return (error);
-}
-
-SYSCTL_NODE(_net, PF_LINK, link, CTLFLAG_RW, 0, "Link layers");
-SYSCTL_NODE(_net_link, 0, generic, CTLFLAG_RW, 0, "Generic link-management");
diff --git a/c/src/exec/libnetworking/net/if.h b/c/src/exec/libnetworking/net/if.h
deleted file mode 100644
index acddd4f095..0000000000
--- a/c/src/exec/libnetworking/net/if.h
+++ /dev/null
@@ -1,467 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)if.h	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#ifndef _NET_IF_H_
-#define	_NET_IF_H_
-
-/*
- * Structures defining a network interface, providing a packet
- * transport mechanism (ala level 0 of the PUP protocols).
- *
- * Each interface accepts output datagrams of a specified maximum
- * length, and provides higher level routines with input datagrams
- * received from its medium.
- *
- * Output occurs when the routine if_output is called, with three parameters:
- *	(*ifp->if_output)(ifp, m, dst, rt)
- * Here m is the mbuf chain to be sent and dst is the destination address.
- * The output routine encapsulates the supplied datagram if necessary,
- * and then transmits it on its medium.
- *
- * On input, each interface unwraps the data received by it, and either
- * places it on the input queue of a internetwork datagram routine
- * and posts the associated software interrupt, or passes the datagram to a raw
- * packet input routine.
- *
- * Routines exist for locating interfaces by their addresses
- * or for locating a interface on a certain network, as well as more general
- * routing and gateway routines maintaining information used to locate
- * interfaces.  These routines live in the files if.c and route.c
- */
-
-#ifndef _TIME_ /*  XXX fast fix for SNMP, going away soon */
-#include <sys/time.h>
-#endif
-
-#ifdef __STDC__
-/*
- * Forward structure declarations for function prototypes [sic].
- */
-struct	mbuf;
-struct	proc;
-struct	rtentry;
-struct	socket;
-struct	ether_header;
-#endif
-
-/*
- * Structure describing information about an interface
- * which may be of interest to management entities.
- */
-struct if_data {
-	/* generic interface information */
-	u_char	ifi_type;		/* ethernet, tokenring, etc */
-	u_char	ifi_physical;		/* e.g., AUI, Thinnet, 10base-T, etc */
-	u_char	ifi_addrlen;		/* media address length */
-	u_char	ifi_hdrlen;		/* media header length */
-	u_char	ifi_recvquota;		/* polling quota for receive intrs */
-	u_char	ifi_xmitquota;		/* polling quota for xmit intrs */
-	u_long	ifi_mtu;		/* maximum transmission unit */
-	u_long	ifi_metric;		/* routing metric (external only) */
-	u_long	ifi_baudrate;		/* linespeed */
-	/* volatile statistics */
-	u_long	ifi_ipackets;		/* packets received on interface */
-	u_long	ifi_ierrors;		/* input errors on interface */
-	u_long	ifi_opackets;		/* packets sent on interface */
-	u_long	ifi_oerrors;		/* output errors on interface */
-	u_long	ifi_collisions;		/* collisions on csma interfaces */
-	u_long	ifi_ibytes;		/* total number of octets received */
-	u_long	ifi_obytes;		/* total number of octets sent */
-	u_long	ifi_imcasts;		/* packets received via multicast */
-	u_long	ifi_omcasts;		/* packets sent via multicast */
-	u_long	ifi_iqdrops;		/* dropped on input, this interface */
-	u_long	ifi_noproto;		/* destined for unsupported protocol */
-	u_long	ifi_recvtiming;		/* usec spent receiving when timing */
-	u_long	ifi_xmittiming;		/* usec spent xmitting when timing */
-	struct	timeval ifi_lastchange;	/* time of last administrative change */
-};
-
-/*
- * Structure defining a queue for a network interface.
- */
-struct	ifqueue {
-	struct	mbuf *ifq_head;
-	struct	mbuf *ifq_tail;
-	int	ifq_len;
-	int	ifq_maxlen;
-	int	ifq_drops;
-};
-
-/*
- * Structure defining a network interface.
- *
- * (Would like to call this struct ``if'', but C isn't PL/1.)
- */
-struct ifnet {
-	void	*if_softc;		/* pointer to driver state */
-	char	*if_name;		/* name, e.g. ``en'' or ``lo'' */
-	struct	ifnet *if_next;		/* all struct ifnets are chained */
-	struct	ifaddr *if_addrlist;	/* linked list of addresses per if */
-        int	if_pcount;		/* number of promiscuous listeners */
-	struct	bpf_if *if_bpf;		/* packet filter structure */
-	u_short	if_index;		/* numeric abbreviation for this if  */
-	short	if_unit;		/* sub-unit for lower level driver */
-	short	if_timer;		/* time 'til if_watchdog called */
-	short	if_flags;		/* up/down, broadcast, etc. */
-	int	if_ipending;		/* interrupts pending */
-	void	*if_linkmib;		/* link-type-specific MIB data */
-	size_t	if_linkmiblen;		/* length of above data */
-	struct	if_data if_data;
-/* procedure handles */
-	int	(*if_output)		/* output routine (enqueue) */
-		__P((struct ifnet *, struct mbuf *, struct sockaddr *,
-		     struct rtentry *));
-	void	(*if_start)		/* initiate output routine */
-		__P((struct ifnet *));
-	int	(*if_done)		/* output complete routine */
-		__P((struct ifnet *));	/* (XXX not used; fake prototype) */
-	int	(*if_ioctl)		/* ioctl routine */
-		__P((struct ifnet *, int, caddr_t));
-	void	(*if_watchdog)		/* timer routine */
-		__P((struct ifnet *));
-	int	(*if_poll_recv)		/* polled receive routine */
-		__P((struct ifnet *, int *));
-	int	(*if_poll_xmit)		/* polled transmit routine */
-		__P((struct ifnet *, int *));
-	void	(*if_poll_intren)	/* polled interrupt reenable routine */
-		__P((struct ifnet *));
-	void	(*if_poll_slowinput)	/* input routine for slow devices */
-		__P((struct ifnet *, struct mbuf *));
-	void	(*if_init)		/* Init routine */
-		__P((void *));
-	struct	ifqueue if_snd;		/* output queue */
-	struct	ifqueue *if_poll_slowq;	/* input queue for slow devices */
-};
-typedef void if_init_f_t __P((void *));       
-
-#define	if_mtu		if_data.ifi_mtu
-#define	if_type		if_data.ifi_type
-#define if_physical	if_data.ifi_physical
-#define	if_addrlen	if_data.ifi_addrlen
-#define	if_hdrlen	if_data.ifi_hdrlen
-#define	if_metric	if_data.ifi_metric
-#define	if_baudrate	if_data.ifi_baudrate
-#define	if_ipackets	if_data.ifi_ipackets
-#define	if_ierrors	if_data.ifi_ierrors
-#define	if_opackets	if_data.ifi_opackets
-#define	if_oerrors	if_data.ifi_oerrors
-#define	if_collisions	if_data.ifi_collisions
-#define	if_ibytes	if_data.ifi_ibytes
-#define	if_obytes	if_data.ifi_obytes
-#define	if_imcasts	if_data.ifi_imcasts
-#define	if_omcasts	if_data.ifi_omcasts
-#define	if_iqdrops	if_data.ifi_iqdrops
-#define	if_noproto	if_data.ifi_noproto
-#define	if_lastchange	if_data.ifi_lastchange
-#define if_recvquota	if_data.ifi_recvquota
-#define	if_xmitquota	if_data.ifi_xmitquota
-#define if_rawoutput(if, m, sa) if_output(if, m, sa, (struct rtentry *)0)
-
-#define	IFF_UP		0x1		/* interface is up */
-#define	IFF_BROADCAST	0x2		/* broadcast address valid */
-#define	IFF_DEBUG	0x4		/* turn on debugging */
-#define	IFF_LOOPBACK	0x8		/* is a loopback net */
-#define	IFF_POINTOPOINT	0x10		/* interface is point-to-point link */
-/*#define IFF_NOTRAILERS 0x20		 * obsolete: avoid use of trailers */
-#define	IFF_RUNNING	0x40		/* resources allocated */
-#define	IFF_NOARP	0x80		/* no address resolution protocol */
-#define	IFF_PROMISC	0x100		/* receive all packets */
-#define	IFF_ALLMULTI	0x200		/* receive all multicast packets */
-#define	IFF_OACTIVE	0x400		/* transmission in progress */
-#define	IFF_SIMPLEX	0x800		/* can't hear own transmissions */
-#define	IFF_LINK0	0x1000		/* per link layer defined bit */
-#define	IFF_LINK1	0x2000		/* per link layer defined bit */
-#define	IFF_LINK2	0x4000		/* per link layer defined bit */
-#define	IFF_ALTPHYS	IFF_LINK2	/* use alternate physical connection */
-#define	IFF_MULTICAST	0x8000		/* supports multicast */
-
-/* flags set internally only: */
-#define	IFF_CANTCHANGE \
-	(IFF_BROADCAST|IFF_POINTOPOINT|IFF_RUNNING|IFF_OACTIVE|\
-	    IFF_SIMPLEX|IFF_MULTICAST|IFF_ALLMULTI)
-
-
-/*
- * These really don't belong here, but there's no other obviously appropriate
- * location.
- */
-#define IFP_AUI		0
-#define IFP_10BASE2	1
-#define IFP_10BASET	2
-/* etc. */
-
-/*
- * Bit values in if_ipending
- */
-#define	IFI_RECV	1	/* I want to receive */
-#define	IFI_XMIT	2	/* I want to transmit */
-
-/*
- * Output queues (ifp->if_snd) and slow device input queues (*ifp->if_slowq)
- * are queues of messages stored on ifqueue structures
- * (defined above).  Entries are added to and deleted from these structures
- * by these macros, which should be called with ipl raised to splimp().
- */
-#define	IF_QFULL(ifq)		((ifq)->ifq_len >= (ifq)->ifq_maxlen)
-#define	IF_DROP(ifq)		((ifq)->ifq_drops++)
-#define	IF_ENQUEUE(ifq, m) { \
-	(m)->m_nextpkt = 0; \
-	if ((ifq)->ifq_tail == 0) \
-		(ifq)->ifq_head = m; \
-	else \
-		(ifq)->ifq_tail->m_nextpkt = m; \
-	(ifq)->ifq_tail = m; \
-	(ifq)->ifq_len++; \
-}
-#define	IF_PREPEND(ifq, m) { \
-	(m)->m_nextpkt = (ifq)->ifq_head; \
-	if ((ifq)->ifq_tail == 0) \
-		(ifq)->ifq_tail = (m); \
-	(ifq)->ifq_head = (m); \
-	(ifq)->ifq_len++; \
-}
-#define	IF_DEQUEUE(ifq, m) { \
-	(m) = (ifq)->ifq_head; \
-	if (m) { \
-		if (((ifq)->ifq_head = (m)->m_nextpkt) == 0) \
-			(ifq)->ifq_tail = 0; \
-		(m)->m_nextpkt = 0; \
-		(ifq)->ifq_len--; \
-	} \
-}
-
-#ifdef KERNEL
-#define	IF_ENQ_DROP(ifq, m)	if_enq_drop(ifq, m)
-
-#if defined(__GNUC__) && defined(MT_HEADER)
-static inline int
-if_queue_drop(struct ifqueue *ifq, struct mbuf *m)
-{
-	IF_DROP(ifq);
-	return 0;
-}
-
-static inline int
-if_enq_drop(struct ifqueue *ifq, struct mbuf *m)
-{
-	if (IF_QFULL(ifq) &&
-	    !if_queue_drop(ifq, m))
-		return 0;
-	IF_ENQUEUE(ifq, m);
-	return 1;
-}
-#else
-
-#ifdef MT_HEADER
-int	if_enq_drop __P((struct ifqueue *, struct mbuf *));
-#endif
-
-#endif
-#endif /* KERNEL */
-
-#define	IFQ_MAXLEN	50
-#define	IFNET_SLOWHZ	1		/* granularity is 1 second */
-
-/*
- * The ifaddr structure contains information about one address
- * of an interface.  They are maintained by the different address families,
- * are allocated and attached when an address is set, and are linked
- * together so all addresses for an interface can be located.
- */
-struct ifaddr {
-	struct	sockaddr *ifa_addr;	/* address of interface */
-	struct	sockaddr *ifa_dstaddr;	/* other end of p-to-p link */
-#define	ifa_broadaddr	ifa_dstaddr	/* broadcast address interface */
-	struct	sockaddr *ifa_netmask;	/* used to determine subnet */
-	struct	ifnet *ifa_ifp;		/* back-pointer to interface */
-	struct	ifaddr *ifa_next;	/* next address for interface */
-	void	(*ifa_rtrequest)	/* check or clean routes (+ or -)'d */
-		__P((int, struct rtentry *, struct sockaddr *));
-	u_short	ifa_flags;		/* mostly rt_flags for cloning */
-	short	ifa_refcnt;		/* references to this structure */
-	int	ifa_metric;		/* cost of going out this interface */
-#ifdef notdef
-	struct	rtentry *ifa_rt;	/* XXXX for ROUTETOIF ????? */
-#endif
-	int (*ifa_claim_addr)		/* check if an addr goes to this if */
-		__P((struct ifaddr *, struct sockaddr *));
-
-};
-#define	IFA_ROUTE	RTF_UP		/* route installed */
-
-/*
- * Message format for use in obtaining information about interfaces
- * from getkerninfo and the routing socket
- */
-struct if_msghdr {
-	u_short	ifm_msglen;	/* to skip over non-understood messages */
-	u_char	ifm_version;	/* future binary compatability */
-	u_char	ifm_type;	/* message type */
-	int	ifm_addrs;	/* like rtm_addrs */
-	int	ifm_flags;	/* value of if_flags */
-	u_short	ifm_index;	/* index for associated ifp */
-	struct	if_data ifm_data;/* statistics and other data about if */
-};
-
-/*
- * Message format for use in obtaining information about interface addresses
- * from getkerninfo and the routing socket
- */
-struct ifa_msghdr {
-	u_short	ifam_msglen;	/* to skip over non-understood messages */
-	u_char	ifam_version;	/* future binary compatability */
-	u_char	ifam_type;	/* message type */
-	int	ifam_addrs;	/* like rtm_addrs */
-	int	ifam_flags;	/* value of ifa_flags */
-	u_short	ifam_index;	/* index for associated ifp */
-	int	ifam_metric;	/* value of ifa_metric */
-};
-
-/*
- * Interface request structure used for socket
- * ioctl's.  All interface ioctl's must have parameter
- * definitions which begin with ifr_name.  The
- * remainder may be interface specific.
- */
-struct	ifreq {
-#define	IFNAMSIZ	16
-	char	ifr_name[IFNAMSIZ];		/* if name, e.g. "en0" */
-	union {
-		struct	sockaddr ifru_addr;
-		struct	sockaddr ifru_dstaddr;
-		struct	sockaddr ifru_broadaddr;
-		short	ifru_flags;
-		int	ifru_metric;
-		int	ifru_mtu;
-		int	ifru_phys;
-		int	ifru_media;
-		caddr_t	ifru_data;
-	} ifr_ifru;
-#define	ifr_addr	ifr_ifru.ifru_addr	/* address */
-#define	ifr_dstaddr	ifr_ifru.ifru_dstaddr	/* other end of p-to-p link */
-#define	ifr_broadaddr	ifr_ifru.ifru_broadaddr	/* broadcast address */
-#define	ifr_flags	ifr_ifru.ifru_flags	/* flags */
-#define	ifr_metric	ifr_ifru.ifru_metric	/* metric */
-#define	ifr_mtu		ifr_ifru.ifru_mtu	/* mtu */
-#define ifr_phys	ifr_ifru.ifru_phys	/* physical wire */
-#define ifr_media	ifr_ifru.ifru_media	/* physical media */
-#define	ifr_data	ifr_ifru.ifru_data	/* for use by interface */
-};
-
-struct ifaliasreq {
-	char	ifra_name[IFNAMSIZ];		/* if name, e.g. "en0" */
-	struct	sockaddr ifra_addr;
-	struct	sockaddr ifra_broadaddr;
-	struct	sockaddr ifra_mask;
-};
-
-struct ifmediareq {
-	char	ifm_name[IFNAMSIZ];	/* if name, e.g. "en0" */
-	int	ifm_current;		/* current media options */
-	int	ifm_mask;		/* don't care mask */
-	int	ifm_status;		/* media status */
-	int	ifm_active;		/* active options */
-	int	ifm_count;		/* # entries in ifm_ulist array */
-	int	*ifm_ulist;		/* media words */
-};
-/*
- * Structure used in SIOCGIFCONF request.
- * Used to retrieve interface configuration
- * for machine (useful for programs which
- * must know all networks accessible).
- */
-struct	ifconf {
-	int	ifc_len;		/* size of associated buffer */
-	union {
-		caddr_t	ifcu_buf;
-		struct	ifreq *ifcu_req;
-	} ifc_ifcu;
-#define	ifc_buf	ifc_ifcu.ifcu_buf	/* buffer address */
-#define	ifc_req	ifc_ifcu.ifcu_req	/* array of structures returned */
-};
-
-#include <net/if_arp.h>
-
-#ifdef KERNEL
-#define	IFAFREE(ifa) \
-	if ((ifa)->ifa_refcnt <= 0) \
-		ifafree(ifa); \
-	else \
-		(ifa)->ifa_refcnt--;
-
-extern struct	ifnet	*ifnet;
-extern int	ifqmaxlen;
-extern struct	ifnet	loif[];
-extern int	if_index;
-extern struct	ifaddr	**ifnet_addrs;
-
-void	ether_ifattach __P((struct ifnet *));
-void	ether_input __P((struct ifnet *, struct ether_header *, struct mbuf *));
-int	ether_output __P((struct ifnet *,
-	   struct mbuf *, struct sockaddr *, struct rtentry *));
-int	ether_ioctl __P((struct ifnet *, int , caddr_t ));
-
-void	if_attach __P((struct ifnet *));
-void	if_down __P((struct ifnet *));
-void	if_up __P((struct ifnet *));
-#ifdef vax
-void	ifubareset __P((int));
-#endif
-/*void	ifinit __P((void));*/ /* declared in systm.h for main() */
-int	ifioctl __P((struct socket *, int, caddr_t, struct proc *));
-int	ifpromisc __P((struct ifnet *, int));
-struct	ifnet *ifunit __P((char *));
-
-int	if_poll_recv_slow __P((struct ifnet *ifp, int *quotap));
-void	if_poll_xmit_slow __P((struct ifnet *ifp, int *quotap));
-void	if_poll_throttle __P((void));
-void	if_poll_unthrottle __P((void *));
-void	if_poll_init __P((void));
-void	if_poll __P((void));
-
-struct	ifaddr *ifa_ifwithaddr __P((struct sockaddr *));
-struct	ifaddr *ifa_ifwithdstaddr __P((struct sockaddr *));
-struct	ifaddr *ifa_ifwithnet __P((struct sockaddr *));
-struct	ifaddr *ifa_ifwithroute __P((int, struct sockaddr *,
-					struct sockaddr *));
-struct	ifaddr *ifaof_ifpforaddr __P((struct sockaddr *, struct ifnet *));
-void	ifafree __P((struct ifaddr *));
-
-int	looutput __P((struct ifnet *,
-	   struct mbuf *, struct sockaddr *, struct rtentry *));
-#endif /* KERNEL */
-
-#endif /* !_NET_IF_H_ */
diff --git a/c/src/exec/libnetworking/net/if_arp.h b/c/src/exec/libnetworking/net/if_arp.h
deleted file mode 100644
index dd726bf856..0000000000
--- a/c/src/exec/libnetworking/net/if_arp.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright (c) 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)if_arp.h	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#ifndef _NET_IF_ARP_H_
-#define	_NET_IF_ARP_H_
-
-/*
- * Address Resolution Protocol.
- *
- * See RFC 826 for protocol description.  ARP packets are variable
- * in size; the arphdr structure defines the fixed-length portion.
- * Protocol type values are the same as those for 10 Mb/s Ethernet.
- * It is followed by the variable-sized fields ar_sha, arp_spa,
- * arp_tha and arp_tpa in that order, according to the lengths
- * specified.  Field names used correspond to RFC 826.
- */
-struct	arphdr {
-	u_short	ar_hrd;		/* format of hardware address */
-#define ARPHRD_ETHER 	1	/* ethernet hardware format */
-#define ARPHRD_FRELAY 	15	/* frame relay hardware format */
-	u_short	ar_pro;		/* format of protocol address */
-	u_char	ar_hln;		/* length of hardware address */
-	u_char	ar_pln;		/* length of protocol address */
-	u_short	ar_op;		/* one of: */
-#define	ARPOP_REQUEST	1	/* request to resolve address */
-#define	ARPOP_REPLY	2	/* response to previous request */
-#define	ARPOP_REVREQUEST 3	/* request protocol address given hardware */
-#define	ARPOP_REVREPLY	4	/* response giving protocol address */
-#define ARPOP_INVREQUEST 8 	/* request to identify peer */
-#define ARPOP_INVREPLY	9	/* response identifying peer */
-/*
- * The remaining fields are variable in size,
- * according to the sizes above.
- */
-#ifdef COMMENT_ONLY
-	u_char	ar_sha[];	/* sender hardware address */
-	u_char	ar_spa[];	/* sender protocol address */
-	u_char	ar_tha[];	/* target hardware address */
-	u_char	ar_tpa[];	/* target protocol address */
-#endif
-};
-
-/*
- * ARP ioctl request
- */
-struct arpreq {
-	struct	sockaddr arp_pa;		/* protocol address */
-	struct	sockaddr arp_ha;		/* hardware address */
-	int	arp_flags;			/* flags */
-};
-/*  arp_flags and at_flags field values */
-#define	ATF_INUSE	0x01	/* entry in use */
-#define ATF_COM		0x02	/* completed entry (enaddr valid) */
-#define	ATF_PERM	0x04	/* permanent entry */
-#define	ATF_PUBL	0x08	/* publish entry (respond for other host) */
-#define	ATF_USETRAILERS	0x10	/* has requested trailers */
-
-#endif /* !_NET_IF_ARP_H_ */
diff --git a/c/src/exec/libnetworking/net/if_dl.h b/c/src/exec/libnetworking/net/if_dl.h
deleted file mode 100644
index 053ae3e92f..0000000000
--- a/c/src/exec/libnetworking/net/if_dl.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)if_dl.h	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#ifndef _NET_IF_DL_H_
-#define _NET_IF_DL_H_
-
-/*
- * A Link-Level Sockaddr may specify the interface in one of two
- * ways: either by means of a system-provided index number (computed
- * anew and possibly differently on every reboot), or by a human-readable
- * string such as "il0" (for managerial convenience).
- *
- * Census taking actions, such as something akin to SIOCGCONF would return
- * both the index and the human name.
- *
- * High volume transactions (such as giving a link-level ``from'' address
- * in a recvfrom or recvmsg call) may be likely only to provide the indexed
- * form, (which requires fewer copy operations and less space).
- *
- * The form and interpretation  of the link-level address is purely a matter
- * of convention between the device driver and its consumers; however, it is
- * expected that all drivers for an interface of a given if_type will agree.
- */
-
-/*
- * Structure of a Link-Level sockaddr:
- */
-struct sockaddr_dl {
-	u_char	sdl_len;	/* Total length of sockaddr */
-	u_char	sdl_family;	/* AF_DLI */
-	u_short	sdl_index;	/* if != 0, system given index for interface */
-	u_char	sdl_type;	/* interface type */
-	u_char	sdl_nlen;	/* interface name length, no trailing 0 reqd. */
-	u_char	sdl_alen;	/* link level address length */
-	u_char	sdl_slen;	/* link layer selector length */
-	char	sdl_data[12];	/* minimum work area, can be larger;
-				   contains both if name and ll address */
-};
-
-#define LLADDR(s) ((caddr_t)((s)->sdl_data + (s)->sdl_nlen))
-
-#ifndef KERNEL
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-void	link_addr __P((const char *, struct sockaddr_dl *));
-char	*link_ntoa __P((const struct sockaddr_dl *));
-__END_DECLS
-
-#endif /* !KERNEL */
-
-#endif
diff --git a/c/src/exec/libnetworking/net/if_ethersubr.c b/c/src/exec/libnetworking/net/if_ethersubr.c
deleted file mode 100644
index 4d1675ca3c..0000000000
--- a/c/src/exec/libnetworking/net/if_ethersubr.c
+++ /dev/null
@@ -1,988 +0,0 @@
-/*
- * Copyright (c) 1982, 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)if_ethersubr.c	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/malloc.h>
-#include <sys/mbuf.h>
-#include <sys/protosw.h>
-#include <sys/socket.h>
-#include <sys/ioctl.h>
-#include <sys/errno.h>
-#include <sys/syslog.h>
-#include <sys/sysctl.h>
-
-#include <net/if.h>
-#include <net/netisr.h>
-#include <net/route.h>
-#include <net/if_llc.h>
-#include <net/if_dl.h>
-#include <net/if_types.h>
-#include <net/ethernet.h>
-
-#ifdef INET
-#include <netinet/in.h>
-#include <netinet/in_var.h>
-#endif
-#include <netinet/if_ether.h>
-
-#ifdef IPX
-#include <netipx/ipx.h>
-#include <netipx/ipx_if.h>
-#endif
-
-#ifdef NS
-#include <netns/ns.h>
-#include <netns/ns_if.h>
-ushort ns_nettype;
-int ether_outputdebug = 0;
-int ether_inputdebug = 0;
-#endif
-
-#ifdef ISO
-#include <netiso/argo_debug.h>
-#include <netiso/iso.h>
-#include <netiso/iso_var.h>
-#include <netiso/iso_snpac.h>
-#endif
-
-/*#ifdef LLC
-#include <netccitt/dll.h>
-#include <netccitt/llc_var.h>
-#endif*/
-
-#if defined(LLC) && defined(CCITT)
-extern struct ifqueue pkintrq;
-#endif
-
-#ifdef NETATALK
-#include <netatalk/at.h>
-#include <netatalk/at_var.h>
-#include <netatalk/at_extern.h>
-
-#define llc_snap_org_code llc_un.type_snap.org_code
-#define llc_snap_ether_type llc_un.type_snap.ether_type
-
-extern u_char	at_org_code[ 3 ];
-extern u_char	aarp_org_code[ 3 ];
-#endif NETATALK
-
-u_char	etherbroadcastaddr[6] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
-#define senderr(e) { error = (e); goto bad;}
-
-/*
- * Ethernet output routine.
- * Encapsulate a packet of type family for the local net.
- * Use trailer local net encapsulation if enough data in first
- * packet leaves a multiple of 512 bytes of data in remainder.
- * Assumes that ifp is actually pointer to arpcom structure.
- */
-int
-ether_output(ifp, m0, dst, rt0)
-	register struct ifnet *ifp;
-	struct mbuf *m0;
-	struct sockaddr *dst;
-	struct rtentry *rt0;
-{
-	short type;
-	int s, error = 0;
-#ifdef NS
- 	u_char *cp
-	register struct ifqueue *inq;
-	register struct mbuf *m2;
-#endif
-	u_char  edst[6];
-	register struct mbuf *m = m0;
-	register struct rtentry *rt;
-	struct mbuf *mcopy = (struct mbuf *)0;
-	register struct ether_header *eh;
-	int off, len = m->m_pkthdr.len;
-	struct arpcom *ac = (struct arpcom *)ifp;
-#ifdef NETATALK
-	struct at_ifaddr *aa;
-#endif NETATALK
-
-	if ((ifp->if_flags & (IFF_UP|IFF_RUNNING)) != (IFF_UP|IFF_RUNNING))
-		senderr(ENETDOWN);
-	rt = rt0;
-	if (rt) {
-		if ((rt->rt_flags & RTF_UP) == 0) {
-			rt0 = rt = rtalloc1(dst, 1, 0UL);
-			if (rt0)
-				rt->rt_refcnt--;
-			else
-				senderr(EHOSTUNREACH);
-		}
-		if (rt->rt_flags & RTF_GATEWAY) {
-			if (rt->rt_gwroute == 0)
-				goto lookup;
-			if (((rt = rt->rt_gwroute)->rt_flags & RTF_UP) == 0) {
-				rtfree(rt); rt = rt0;
-			lookup: rt->rt_gwroute = rtalloc1(rt->rt_gateway, 1,
-							  0UL);
-				if ((rt = rt->rt_gwroute) == 0)
-					senderr(EHOSTUNREACH);
-			}
-		}
-		if (rt->rt_flags & RTF_REJECT)
-			if (rt->rt_rmx.rmx_expire == 0 ||
-			    rtems_bsdnet_seconds_since_boot() < rt->rt_rmx.rmx_expire)
-				senderr(rt == rt0 ? EHOSTDOWN : EHOSTUNREACH);
-	}
-	switch (dst->sa_family) {
-
-#ifdef INET
-	case AF_INET:
-		if (!arpresolve(ac, rt, m, dst, edst, rt0))
-			return (0);	/* if not yet resolved */
-		/* If broadcasting on a simplex interface, loopback a copy */
-		if ((m->m_flags & M_BCAST) && (ifp->if_flags & IFF_SIMPLEX))
-			mcopy = m_copy(m, 0, (int)M_COPYALL);
-		off = m->m_pkthdr.len - m->m_len;
-		type = htons(ETHERTYPE_IP);
-		break;
-#endif
-#ifdef IPX
-	case AF_IPX:
-		{
-		struct ifaddr *ia;
-
-		type = htons(ETHERTYPE_IPX);
- 		bcopy((caddr_t)&(((struct sockaddr_ipx *)dst)->sipx_addr.x_host),
-		    (caddr_t)edst, sizeof (edst));
-		for (ia = ifp->if_addrlist; ia != NULL; ia = ia->ifa_next)
-			if(ia->ifa_addr->sa_family == AF_IPX &&
-			   !bcmp((caddr_t)edst,
-				 (caddr_t)&((struct ipx_ifaddr *)ia)->ia_addr.sipx_addr.x_host,
-				 sizeof(edst)))
-				return (looutput(ifp, m, dst, rt));
-		/* If broadcasting on a simplex interface, loopback a copy */
-		if ((m->m_flags & M_BCAST) && (ifp->if_flags & IFF_SIMPLEX))
-			mcopy = m_copy(m, 0, (int)M_COPYALL);
-		break;
-		}
-#endif
-#ifdef NETATALK
-	case AF_APPLETALK:
-	    {
-		struct sockaddr_at *sat = (struct sockaddr_at *)dst;
-
-		/*
-		 * super hack..
-		 * Most of this loopback code should move into the appletalk
-		 * code, but it's here for now.. remember to move it! [JRE]
-		 * This may not get the same interface we started with
-		 * fix asap. XXX
-		 */
-		aa = at_ifawithnet( sat );
-		if (aa == NULL) {
-			goto bad;
-		}
-		if( aa->aa_ifa.ifa_ifp != ifp ) {
-			(*aa->aa_ifa.ifa_ifp->if_output)(aa->aa_ifa.ifa_ifp,
-							m,dst,rt);
-		}
-		if (((sat->sat_addr.s_net == ATADDR_ANYNET)
-		  && (sat->sat_addr.s_node == ATADDR_ANYNODE))
-		|| ((sat->sat_addr.s_net == aa->aa_addr.sat_addr.s_net )
-		  && (sat->sat_addr.s_node == aa->aa_addr.sat_addr.s_node))) {
-			(void) looutput(ifp, m, dst, rt);
-			return(0);
-		}
-
-        	if (!aarpresolve(ac, m, (struct sockaddr_at *)dst, edst)) {
-#ifdef NETATALKDEBUG
-                	extern char *prsockaddr(struct sockaddr *);
-                	printf("aarpresolv: failed for %s\n", prsockaddr(dst));
-#endif NETATALKDEBUG
-                	return (0);
-        	}
-
-		/*
-		 * If broadcasting on a simplex interface, loopback a copy
-		 */
-		if ((m->m_flags & M_BCAST) && (ifp->if_flags & IFF_SIMPLEX))
-			mcopy = m_copy(m, 0, (int)M_COPYALL);
-	    }
-	    /*
-	     * In the phase 2 case, we need to prepend an mbuf for the llc header.
-	     * Since we must preserve the value of m, which is passed to us by
-	     * value, we m_copy() the first mbuf, and use it for our llc header.
-	     */
-	    if ( aa->aa_flags & AFA_PHASE2 ) {
-		struct llc llc;
-
-		M_PREPEND(m, sizeof(struct llc), M_WAIT);
-		len += sizeof(struct llc);
-		llc.llc_dsap = llc.llc_ssap = LLC_SNAP_LSAP;
-		llc.llc_control = LLC_UI;
-		bcopy(at_org_code, llc.llc_snap_org_code, sizeof(at_org_code));
-		llc.llc_snap_ether_type = htons( ETHERTYPE_AT );
-		bcopy(&llc, mtod(m, caddr_t), sizeof(struct llc));
-		type = htons(m->m_pkthdr.len);
-	    } else {
-		type = htons(ETHERTYPE_AT);
-	    }
-	    break;
-#endif NETATALK
-#ifdef NS
-	case AF_NS:
-		switch(ns_nettype){
-		default:
-		case 0x8137: /* Novell Ethernet_II Ethernet TYPE II */
-			type = 0x8137;
-			break;
-		case 0x0: /* Novell 802.3 */
-			type = htons( m->m_pkthdr.len);
-			break;
-		case 0xe0e0: /* Novell 802.2 and Token-Ring */
-			M_PREPEND(m, 3, M_WAIT);
-			type = htons( m->m_pkthdr.len);
-			cp = mtod(m, u_char *);
-			*cp++ = 0xE0;
-			*cp++ = 0xE0;
-			*cp++ = 0x03;
-			break;
-		}
- 		bcopy((caddr_t)&(((struct sockaddr_ns *)dst)->sns_addr.x_host),
-		    (caddr_t)edst, sizeof (edst));
-		if (!bcmp((caddr_t)edst, (caddr_t)&ns_thishost, sizeof(edst))){
-			m->m_pkthdr.rcvif = ifp;
-			schednetisr(NETISR_NS);
-			inq = &nsintrq;
-			s = splimp();
-			if (IF_QFULL(inq)) {
-				IF_DROP(inq);
-				m_freem(m);
-			} else
-				IF_ENQUEUE(inq, m);
-			splx(s);
-			return (error);
-		}
-		if (!bcmp((caddr_t)edst, (caddr_t)&ns_broadhost, sizeof(edst))){
-			m2 = m_copy(m, 0, (int)M_COPYALL);
-			m2->m_pkthdr.rcvif = ifp;
-			schednetisr(NETISR_NS);
-			inq = &nsintrq;
-			s = splimp();
-			if (IF_QFULL(inq)) {
-				IF_DROP(inq);
-				m_freem(m2);
-			} else
-				IF_ENQUEUE(inq, m2);
-			splx(s);
-		}
-		/* If broadcasting on a simplex interface, loopback a copy */
-		if ((m->m_flags & M_BCAST) && (ifp->if_flags & IFF_SIMPLEX)){
-			mcopy = m_copy(m, 0, (int)M_COPYALL);
-		}
-		break;
-#endif /* NS */
-#ifdef	ISO
-	case AF_ISO: {
-		int	snpalen;
-		struct	llc *l;
-		register struct sockaddr_dl *sdl;
-
-		if (rt && (sdl = (struct sockaddr_dl *)rt->rt_gateway) &&
-		    sdl->sdl_family == AF_LINK && sdl->sdl_alen > 0) {
-			bcopy(LLADDR(sdl), (caddr_t)edst, sizeof(edst));
-		} else if (error =
-			    iso_snparesolve(ifp, (struct sockaddr_iso *)dst,
-					    (char *)edst, &snpalen))
-			goto bad; /* Not Resolved */
-		/* If broadcasting on a simplex interface, loopback a copy */
-		if (*edst & 1)
-			m->m_flags |= (M_BCAST|M_MCAST);
-		if ((m->m_flags & M_BCAST) && (ifp->if_flags & IFF_SIMPLEX) &&
-		    (mcopy = m_copy(m, 0, (int)M_COPYALL))) {
-			M_PREPEND(mcopy, sizeof (*eh), M_DONTWAIT);
-			if (mcopy) {
-				eh = mtod(mcopy, struct ether_header *);
-				bcopy((caddr_t)edst,
-				      (caddr_t)eh->ether_dhost, sizeof (edst));
-				bcopy((caddr_t)ac->ac_enaddr,
-				      (caddr_t)eh->ether_shost, sizeof (edst));
-			}
-		}
-		M_PREPEND(m, 3, M_DONTWAIT);
-		if (m == NULL)
-			return (0);
-		type = htons(m->m_pkthdr.len);
-		l = mtod(m, struct llc *);
-		l->llc_dsap = l->llc_ssap = LLC_ISO_LSAP;
-		l->llc_control = LLC_UI;
-		len += 3;
-		IFDEBUG(D_ETHER)
-			int i;
-			printf("unoutput: sending pkt to: ");
-			for (i=0; i<6; i++)
-				printf("%x ", edst[i] & 0xff);
-			printf("\n");
-		ENDDEBUG
-		} break;
-#endif /* ISO */
-#ifdef	LLC
-/*	case AF_NSAP: */
-	case AF_CCITT: {
-		register struct sockaddr_dl *sdl =
-			(struct sockaddr_dl *) rt -> rt_gateway;
-
-		if (sdl && sdl->sdl_family == AF_LINK
-		    && sdl->sdl_alen > 0) {
-			bcopy(LLADDR(sdl), (char *)edst,
-				sizeof(edst));
-		} else goto bad; /* Not a link interface ? Funny ... */
-		if ((ifp->if_flags & IFF_SIMPLEX) && (*edst & 1) &&
-		    (mcopy = m_copy(m, 0, (int)M_COPYALL))) {
-			M_PREPEND(mcopy, sizeof (*eh), M_DONTWAIT);
-			if (mcopy) {
-				eh = mtod(mcopy, struct ether_header *);
-				bcopy((caddr_t)edst,
-				      (caddr_t)eh->ether_dhost, sizeof (edst));
-				bcopy((caddr_t)ac->ac_enaddr,
-				      (caddr_t)eh->ether_shost, sizeof (edst));
-			}
-		}
-		type = htons(m->m_pkthdr.len);
-#ifdef LLC_DEBUG
-		{
-			int i;
-			register struct llc *l = mtod(m, struct llc *);
-
-			printf("ether_output: sending LLC2 pkt to: ");
-			for (i=0; i<6; i++)
-				printf("%x ", edst[i] & 0xff);
-			printf(" len 0x%x dsap 0x%x ssap 0x%x control 0x%x\n",
-			       type & 0xff, l->llc_dsap & 0xff, l->llc_ssap &0xff,
-			       l->llc_control & 0xff);
-
-		}
-#endif /* LLC_DEBUG */
-		} break;
-#endif /* LLC */
-
-	case AF_UNSPEC:
-		eh = (struct ether_header *)dst->sa_data;
- 		(void)memcpy(edst, eh->ether_dhost, sizeof (edst));
-		type = eh->ether_type;
-		break;
-
-	default:
-		printf("%s%d: can't handle af%d\n", ifp->if_name, ifp->if_unit,
-			dst->sa_family);
-		senderr(EAFNOSUPPORT);
-	}
-
-
-	if (mcopy)
-		(void) looutput(ifp, mcopy, dst, rt);
-	/*
-	 * Add local net header.  If no space in first mbuf,
-	 * allocate another.
-	 */
-	M_PREPEND(m, sizeof (struct ether_header), M_DONTWAIT);
-	if (m == 0)
-		senderr(ENOBUFS);
-	eh = mtod(m, struct ether_header *);
-	(void)memcpy(&eh->ether_type, &type,
-		sizeof(eh->ether_type));
- 	(void)memcpy(eh->ether_dhost, edst, sizeof (edst));
- 	(void)memcpy(eh->ether_shost, ac->ac_enaddr,
-	    sizeof(eh->ether_shost));
-	s = splimp();
-	/*
-	 * Queue message on interface, and start output if interface
-	 * not yet active.
-	 */
-	if (IF_QFULL(&ifp->if_snd)) {
-		IF_DROP(&ifp->if_snd);
-		splx(s);
-		senderr(ENOBUFS);
-	}
-	IF_ENQUEUE(&ifp->if_snd, m);
-	if ((ifp->if_flags & IFF_OACTIVE) == 0)
-		(*ifp->if_start)(ifp);
-	splx(s);
-	ifp->if_obytes += len + sizeof (struct ether_header);
-	if (m->m_flags & M_MCAST)
-		ifp->if_omcasts++;
-	return (error);
-
-bad:
-	if (m)
-		m_freem(m);
-	return (error);
-}
-
-/*
- * Process a received Ethernet packet;
- * the packet is in the mbuf chain m without
- * the ether header, which is provided separately.
- */
-void
-ether_input(ifp, eh, m)
-	struct ifnet *ifp;
-	register struct ether_header *eh;
-	struct mbuf *m;
-{
-	register struct ifqueue *inq;
-	u_short ether_type;
-#ifdef NS
-	u_short *checksum;
-#endif
-	int s;
-#if defined (ISO) || defined (LLC) || defined(NETATALK)
-	register struct llc *l;
-#endif
-
-	if ((ifp->if_flags & IFF_UP) == 0) {
-		m_freem(m);
-		return;
-	}
-	ifp->if_ibytes += m->m_pkthdr.len + sizeof (*eh);
-	if (bcmp((caddr_t)etherbroadcastaddr, (caddr_t)eh->ether_dhost,
-	    sizeof(etherbroadcastaddr)) == 0)
-		m->m_flags |= M_BCAST;
-	else if (eh->ether_dhost[0] & 1)
-		m->m_flags |= M_MCAST;
-	if (m->m_flags & (M_BCAST|M_MCAST))
-		ifp->if_imcasts++;
-
-	ether_type = ntohs(eh->ether_type);
-
-	switch (ether_type) {
-#ifdef INET
-	case ETHERTYPE_IP:
-		schednetisr(NETISR_IP);
-		inq = &ipintrq;
-		break;
-
-	case ETHERTYPE_ARP:
-		schednetisr(NETISR_ARP);
-		inq = &arpintrq;
-		break;
-#endif
-#ifdef IPX
-	case ETHERTYPE_IPX:
-		schednetisr(NETISR_IPX);
-		inq = &ipxintrq;
-		break;
-#endif
-#ifdef NS
-	case 0x8137: /* Novell Ethernet_II Ethernet TYPE II */
-		schednetisr(NETISR_NS);
-		inq = &nsintrq;
-		break;
-
-#endif /* NS */
-#ifdef NETATALK
-        case ETHERTYPE_AT:
-                schednetisr(NETISR_ATALK);
-                inq = &atintrq1;
-                break;
-        case ETHERTYPE_AARP:
-		/* probably this should be done with a NETISR as well */
-                aarpinput((struct arpcom *)ifp, m); /* XXX */
-                return;
-#endif NETATALK
-	default:
-#ifdef NS
-		checksum = mtod(m, ushort *);
-		/* Novell 802.3 */
-		if ((ether_type <= ETHERMTU) &&
-			((*checksum == 0xffff) || (*checksum == 0xE0E0))){
-			if(*checksum == 0xE0E0) {
-				m->m_pkthdr.len -= 3;
-				m->m_len -= 3;
-				m->m_data += 3;
-			}
-				schednetisr(NETISR_NS);
-				inq = &nsintrq;
-				break;
-		}
-#endif /* NS */
-#if defined (ISO) || defined (LLC) || defined(NETATALK)
-		if (ether_type > ETHERMTU)
-			goto dropanyway;
-		l = mtod(m, struct llc *);
-		switch (l->llc_dsap) {
-#ifdef NETATALK
-		case LLC_SNAP_LSAP:
-		    switch (l->llc_control) {
-		    case LLC_UI:
-			if (l->llc_ssap != LLC_SNAP_LSAP)
-			    goto dropanyway;
-	
-			if (Bcmp(&(l->llc_snap_org_code)[0], at_org_code,
-				   sizeof(at_org_code)) == 0 &&
-			     ntohs(l->llc_snap_ether_type) == ETHERTYPE_AT) {
-			    inq = &atintrq2;
-			    m_adj( m, sizeof( struct llc ));
-			    schednetisr(NETISR_ATALK);
-			    break;
-			}
-
-			if (Bcmp(&(l->llc_snap_org_code)[0], aarp_org_code,
-				   sizeof(aarp_org_code)) == 0 &&
-			     ntohs(l->llc_snap_ether_type) == ETHERTYPE_AARP) {
-			    m_adj( m, sizeof( struct llc ));
-			    aarpinput((struct arpcom *)ifp, m); /* XXX */
-			    return;
-			}
-		
-		    default:
-			goto dropanyway;
-		    }
-		    break;
-#endif NETATALK	
-#ifdef	ISO
-		case LLC_ISO_LSAP:
-			switch (l->llc_control) {
-			case LLC_UI:
-				/* LLC_UI_P forbidden in class 1 service */
-				if ((l->llc_dsap == LLC_ISO_LSAP) &&
-				    (l->llc_ssap == LLC_ISO_LSAP)) {
-					/* LSAP for ISO */
-					if (m->m_pkthdr.len > ether_type)
-						m_adj(m, ether_type - m->m_pkthdr.len);
-					m->m_data += 3;		/* XXX */
-					m->m_len -= 3;		/* XXX */
-					m->m_pkthdr.len -= 3;	/* XXX */
-					M_PREPEND(m, sizeof *eh, M_DONTWAIT);
-					if (m == 0)
-						return;
-					*mtod(m, struct ether_header *) = *eh;
-					IFDEBUG(D_ETHER)
-						printf("clnp packet");
-					ENDDEBUG
-					schednetisr(NETISR_ISO);
-					inq = &clnlintrq;
-					break;
-				}
-				goto dropanyway;
-
-			case LLC_XID:
-			case LLC_XID_P:
-				if(m->m_len < 6)
-					goto dropanyway;
-				l->llc_window = 0;
-				l->llc_fid = 9;
-				l->llc_class = 1;
-				l->llc_dsap = l->llc_ssap = 0;
-				/* Fall through to */
-			case LLC_TEST:
-			case LLC_TEST_P:
-			{
-				struct sockaddr sa;
-				register struct ether_header *eh2;
-				int i;
-				u_char c = l->llc_dsap;
-
-				l->llc_dsap = l->llc_ssap;
-				l->llc_ssap = c;
-				if (m->m_flags & (M_BCAST | M_MCAST))
-					bcopy((caddr_t)ac->ac_enaddr,
-					      (caddr_t)eh->ether_dhost, 6);
-				sa.sa_family = AF_UNSPEC;
-				sa.sa_len = sizeof(sa);
-				eh2 = (struct ether_header *)sa.sa_data;
-				for (i = 0; i < 6; i++) {
-					eh2->ether_shost[i] = c = eh->ether_dhost[i];
-					eh2->ether_dhost[i] =
-						eh->ether_dhost[i] = eh->ether_shost[i];
-					eh->ether_shost[i] = c;
-				}
-				ifp->if_output(ifp, m, &sa, NULL);
-				return;
-			}
-			default:
-				m_freem(m);
-				return;
-			}
-			break;
-#endif /* ISO */
-#ifdef LLC
-		case LLC_X25_LSAP:
-		{
-			if (m->m_pkthdr.len > ether_type)
-				m_adj(m, ether_type - m->m_pkthdr.len);
-			M_PREPEND(m, sizeof(struct sdl_hdr) , M_DONTWAIT);
-			if (m == 0)
-				return;
-			if ( !sdl_sethdrif(ifp, eh->ether_shost, LLC_X25_LSAP,
-					    eh->ether_dhost, LLC_X25_LSAP, 6,
-					    mtod(m, struct sdl_hdr *)))
-				panic("ETHER cons addr failure");
-			mtod(m, struct sdl_hdr *)->sdlhdr_len = ether_type;
-#ifdef LLC_DEBUG
-				printf("llc packet\n");
-#endif /* LLC_DEBUG */
-			schednetisr(NETISR_CCITT);
-			inq = &llcintrq;
-			break;
-		}
-#endif /* LLC */
-		dropanyway:
-		default:
-			m_freem(m);
-			return;
-		}
-#else /* ISO || LLC || NETATALK */
-	    m_freem(m);
-	    return;
-#endif /* ISO || LLC || NETATALK */
-	}
-
-	s = splimp();
-	if (IF_QFULL(inq)) {
-		IF_DROP(inq);
-		m_freem(m);
-	} else
-		IF_ENQUEUE(inq, m);
-	splx(s);
-}
-
-/*
- * Perform common duties while attaching to interface list
- */
-void
-ether_ifattach(ifp)
-	register struct ifnet *ifp;
-{
-	register struct ifaddr *ifa;
-	register struct sockaddr_dl *sdl;
-
-	ifp->if_type = IFT_ETHER;
-	ifp->if_addrlen = 6;
-	ifp->if_hdrlen = 14;
-	ifp->if_mtu = ETHERMTU;
-	if (ifp->if_baudrate == 0)
-	    ifp->if_baudrate = 10000000;
-	for (ifa = ifp->if_addrlist; ifa; ifa = ifa->ifa_next)
-		if ((sdl = (struct sockaddr_dl *)ifa->ifa_addr) &&
-		    sdl->sdl_family == AF_LINK) {
-			sdl->sdl_type = IFT_ETHER;
-			sdl->sdl_alen = ifp->if_addrlen;
-			bcopy((caddr_t)((struct arpcom *)ifp)->ac_enaddr,
-			      LLADDR(sdl), ifp->if_addrlen);
-			break;
-		}
-}
-
-static u_char ether_ipmulticast_min[6] = 
-	{ 0x01, 0x00, 0x5e, 0x00, 0x00, 0x00 };
-static u_char ether_ipmulticast_max[6] =
-	{ 0x01, 0x00, 0x5e, 0x7f, 0xff, 0xff };
-/*
- * Add an Ethernet multicast address or range of addresses to the list for a
- * given interface.
- */
-int
-ether_addmulti(ifr, ac)
-	struct ifreq *ifr;
-	register struct arpcom *ac;
-{
-	register struct ether_multi *enm;
-	struct sockaddr_in *sin;
-	u_char addrlo[6];
-	u_char addrhi[6];
-        int set_allmulti = 0;
-	int s = splimp();
-
-	switch (ifr->ifr_addr.sa_family) {
-
-	case AF_UNSPEC:
-		bcopy(ifr->ifr_addr.sa_data, addrlo, 6);
-		bcopy(addrlo, addrhi, 6);
-		break;
-
-#ifdef INET
-	case AF_INET:
-		sin = (struct sockaddr_in *)&(ifr->ifr_addr);
-		if (sin->sin_addr.s_addr == INADDR_ANY) {
-			/*
-			 * An IP address of INADDR_ANY means listen to all
-			 * of the Ethernet multicast addresses used for IP.
-			 * (This is for the sake of IP multicast routers.)
-			 */
-			bcopy(ether_ipmulticast_min, addrlo, 6);
-			bcopy(ether_ipmulticast_max, addrhi, 6);
-                      set_allmulti = 1;
-		}
-		else {
-			ETHER_MAP_IP_MULTICAST(&sin->sin_addr, addrlo);
-			bcopy(addrlo, addrhi, 6);
-		}
-		break;
-#endif
-
-	default:
-		splx(s);
-		return (EAFNOSUPPORT);
-	}
-
-	/*
-	 * Verify that we have valid Ethernet multicast addresses.
-	 */
-	if ((addrlo[0] & 0x01) != 1 || (addrhi[0] & 0x01) != 1) {
-		splx(s);
-		return (EINVAL);
-	}
-	/*
-	 * See if the address range is already in the list.
-	 */
-	ETHER_LOOKUP_MULTI(addrlo, addrhi, ac, enm);
-	if (enm != NULL) {
-		/*
-		 * Found it; just increment the reference count.
-		 */
-		++enm->enm_refcount;
-		splx(s);
-		return (0);
-	}
-	/*
-	 * New address or range; malloc a new multicast record
-	 * and link it into the interface's multicast list.
-	 */
-	enm = (struct ether_multi *)malloc(sizeof(*enm), M_IFMADDR, M_NOWAIT);
-	if (enm == NULL) {
-		splx(s);
-		return (ENOBUFS);
-	}
-	bcopy(addrlo, enm->enm_addrlo, 6);
-	bcopy(addrhi, enm->enm_addrhi, 6);
-	enm->enm_ac = ac;
-	enm->enm_refcount = 1;
-	enm->enm_next = ac->ac_multiaddrs;
-	ac->ac_multiaddrs = enm;
-	ac->ac_multicnt++;
-	splx(s);
-        if (set_allmulti)
-        	ac->ac_if.if_flags |= IFF_ALLMULTI;
-
-	/*
-	 * Return ENETRESET to inform the driver that the list has changed
-	 * and its reception filter should be adjusted accordingly.
-	 */
-	return (ENETRESET);
-}
-
-/*
- * Delete a multicast address record.
- */
-int
-ether_delmulti(ifr, ac)
-	struct ifreq *ifr;
-	register struct arpcom *ac;
-{
-	register struct ether_multi *enm;
-	register struct ether_multi **p;
-	struct sockaddr_in *sin;
-	u_char addrlo[6];
-	u_char addrhi[6];
-      int unset_allmulti = 0;
-	int s = splimp();
-
-	switch (ifr->ifr_addr.sa_family) {
-
-	case AF_UNSPEC:
-		bcopy(ifr->ifr_addr.sa_data, addrlo, 6);
-		bcopy(addrlo, addrhi, 6);
-		break;
-
-#ifdef INET
-	case AF_INET:
-		sin = (struct sockaddr_in *)&(ifr->ifr_addr);
-		if (sin->sin_addr.s_addr == INADDR_ANY) {
-			/*
-			 * An IP address of INADDR_ANY means stop listening
-			 * to the range of Ethernet multicast addresses used
-			 * for IP.
-			 */
-			bcopy(ether_ipmulticast_min, addrlo, 6);
-			bcopy(ether_ipmulticast_max, addrhi, 6);
-                      unset_allmulti = 1;
-		}
-		else {
-			ETHER_MAP_IP_MULTICAST(&sin->sin_addr, addrlo);
-			bcopy(addrlo, addrhi, 6);
-		}
-		break;
-#endif
-
-	default:
-		splx(s);
-		return (EAFNOSUPPORT);
-	}
-
-	/*
-	 * Look up the address in our list.
-	 */
-	ETHER_LOOKUP_MULTI(addrlo, addrhi, ac, enm);
-	if (enm == NULL) {
-		splx(s);
-		return (ENXIO);
-	}
-	if (--enm->enm_refcount != 0) {
-		/*
-		 * Still some claims to this record.
-		 */
-		splx(s);
-		return (0);
-	}
-	/*
-	 * No remaining claims to this record; unlink and free it.
-	 */
-	for (p = &enm->enm_ac->ac_multiaddrs;
-	     *p != enm;
-	     p = &(*p)->enm_next)
-		continue;
-	*p = (*p)->enm_next;
-	free(enm, M_IFMADDR);
-	ac->ac_multicnt--;
-	splx(s);
-      if (unset_allmulti)
-              ac->ac_if.if_flags &= ~IFF_ALLMULTI;
-
-	/*
-	 * Return ENETRESET to inform the driver that the list has changed
-	 * and its reception filter should be adjusted accordingly.
-	 */
-	return (ENETRESET);
-}
-
-SYSCTL_NODE(_net_link, IFT_ETHER, ether, CTLFLAG_RW, 0, "Ethernet");
-
-int
-ether_ioctl(struct ifnet *ifp, int command, caddr_t data)
-{
-	struct ifaddr *ifa = (struct ifaddr *) data;
-	struct ifreq *ifr = (struct ifreq *) data;
-	int error = 0;
-
-	switch (command) {
-	case SIOCSIFADDR:
-		ifp->if_flags |= IFF_UP;
-
-		switch (ifa->ifa_addr->sa_family) {
-#ifdef INET
-		case AF_INET:
-			ifp->if_init(ifp->if_softc);	/* before arpwhohas */
-			arp_ifinit((struct arpcom *)ifp, ifa);
-			break;
-#endif
-#ifdef IPX
-		/*
-		 * XXX - This code is probably wrong
-		 */
-		case AF_IPX:
-			{
-			register struct ipx_addr *ina = &(IA_SIPX(ifa)->sipx_addr);
-			struct arpcom *ac = (struct arpcom *) (ifp->if_softc);
-
-			if (ipx_nullhost(*ina))
-				ina->x_host =
-				    *(union ipx_host *) 
-			            ac->ac_enaddr;
-			else {
-				bcopy((caddr_t) ina->x_host.c_host,
-				      (caddr_t) ac->ac_enaddr,
-				      sizeof(ac->ac_enaddr));
-			}
-
-			/*
-			 * Set new address
-			 */
-			ifp->if_init(ifp->if_softc);
-			break;
-			}
-#endif
-#ifdef NS
-		/*
-		 * XXX - This code is probably wrong
-		 */
-		case AF_NS:
-		{
-			register struct ns_addr *ina = &(IA_SNS(ifa)->sns_addr);
-			struct arpcom *ac = (struct arpcom *) (ifp->if_softc);
-
-			if (ns_nullhost(*ina))
-				ina->x_host =
-				    *(union ns_host *) (ac->ac_enaddr);
-			else {
-				bcopy((caddr_t) ina->x_host.c_host,
-				      (caddr_t) ac->ac_enaddr,
-				      sizeof(ac->ac_enaddr));
-			}
-
-			/*
-			 * Set new address
-			 */
-			ifp->if_init(ifp->if_softc);
-			break;
-		}
-#endif
-		default:
-			ifp->if_init(ifp->if_softc);
-			break;
-		}
-		break;
-
-	case SIOCGIFADDR:
-		{
-			struct sockaddr *sa;
-
-			sa = (struct sockaddr *) & ifr->ifr_data;
-			bcopy(((struct arpcom *)ifp->if_softc)->ac_enaddr,
-			      (caddr_t) sa->sa_data, ETHER_ADDR_LEN);
-		}
-		break;
-
-	case SIOCSIFMTU:
-		/*
-		 * Set the interface MTU.
-		 */
-		if (ifr->ifr_mtu > ETHERMTU) {
-			error = EINVAL;
-		} else {
-			ifp->if_mtu = ifr->ifr_mtu;
-		}
-		break;
-	}
-	return (error);
-}
diff --git a/c/src/exec/libnetworking/net/if_llc.h b/c/src/exec/libnetworking/net/if_llc.h
deleted file mode 100644
index 3cdf652167..0000000000
--- a/c/src/exec/libnetworking/net/if_llc.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Copyright (c) 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *      @(#)if_llc.h	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#ifndef _NET_IF_LLC_H_
-#define _NET_IF_LLC_H_
-
-/*
- * IEEE 802.2 Link Level Control headers, for use in conjunction with
- * 802.{3,4,5} media access control methods.
- *
- * Headers here do not use bit fields due to shortcomings in many
- * compilers.
- */
-
-struct llc {
-	u_char	llc_dsap;
-	u_char	llc_ssap;
-	union {
-	    struct {
-		u_char control;
-		u_char format_id;
-		u_char class;
-		u_char window_x2;
-	    } type_u;
-	    struct {
-		u_char num_snd_x2;
-		u_char num_rcv_x2;
-	    } type_i;
-	    struct {
-		u_char control;
-		u_char num_rcv_x2;
-	    } type_s;
-	    struct {
-	        u_char control;
-		struct frmrinfo {
-			u_char rej_pdu_0;
-			u_char rej_pdu_1;
-			u_char frmr_control;
-			u_char frmr_control_ext;
-			u_char frmr_cause;
-		} frmrinfo;
-	    } type_frmr;
-	    struct {
-		u_char control;
-		u_char org_code[3];
-		u_short ether_type;
-	    } type_snap;
-	    struct {
-		u_char control;
-		u_char control_ext;
-	    } type_raw;
-	} llc_un;
-};
-#define llc_control            llc_un.type_u.control
-#define	llc_control_ext        llc_un.type_raw.control_ext
-#define llc_fid                llc_un.type_u.format_id
-#define llc_class              llc_un.type_u.class
-#define llc_window             llc_un.type_u.window_x2
-#define llc_frmrinfo           llc_un.type_frmr.frmrinfo
-#define llc_frmr_pdu0          llc_un.type_frmr.frmrinfo.rej_pdu0
-#define llc_frmr_pdu1          llc_un.type_frmr.frmrinfo.rej_pdu1
-#define llc_frmr_control       llc_un.type_frmr.frmrinfo.frmr_control
-#define llc_frmr_control_ext   llc_un.type_frmr.frmrinfo.frmr_control_ext
-#define llc_frmr_cause         llc_un.type_frmr.frmrinfo.frmr_control_ext
-
-/*
- * Don't use sizeof(struct llc_un) for LLC header sizes
- */
-#define LLC_ISFRAMELEN 4
-#define LLC_UFRAMELEN  3
-#define LLC_FRMRLEN    7
-
-/*
- * Unnumbered LLC format commands
- */
-#define LLC_UI		0x3
-#define LLC_UI_P	0x13
-#define LLC_DISC	0x43
-#define	LLC_DISC_P	0x53
-#define LLC_UA		0x63
-#define LLC_UA_P	0x73
-#define LLC_TEST	0xe3
-#define LLC_TEST_P	0xf3
-#define LLC_FRMR	0x87
-#define	LLC_FRMR_P	0x97
-#define LLC_DM		0x0f
-#define	LLC_DM_P	0x1f
-#define LLC_XID		0xaf
-#define LLC_XID_P	0xbf
-#define LLC_SABME	0x6f
-#define LLC_SABME_P	0x7f
-
-/*
- * Supervisory LLC commands
- */
-#define	LLC_RR		0x01
-#define	LLC_RNR		0x05
-#define	LLC_REJ		0x09
-
-/*
- * Info format - dummy only
- */
-#define	LLC_INFO	0x00
-
-/*
- * ISO PDTR 10178 contains among others
- */
-#define LLC_X25_LSAP	0x7e
-#define LLC_SNAP_LSAP	0xaa
-#define LLC_ISO_LSAP	0xfe
-
-#endif
diff --git a/c/src/exec/libnetworking/net/if_loop.c b/c/src/exec/libnetworking/net/if_loop.c
deleted file mode 100644
index 3823c28744..0000000000
--- a/c/src/exec/libnetworking/net/if_loop.c
+++ /dev/null
@@ -1,301 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)if_loop.c	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-/*
- * Loopback interface driver for protocol testing and timing.
- */
-#include "loop.h"
-#if NLOOP > 0
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/mbuf.h>
-#include <sys/socket.h>
-#include <sys/errno.h>
-#include <sys/ioctl.h>
-#include <sys/time.h>
-
-#include <net/if.h>
-#include <net/if_types.h>
-#include <net/netisr.h>
-#include <net/route.h>
-#include <net/bpf.h>
-
-#ifdef	INET
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/in_var.h>
-#include <netinet/ip.h>
-#endif
-
-#ifdef IPX
-#include <netipx/ipx.h>
-#include <netipx/ipx_if.h>
-#endif
-
-#ifdef NS
-#include <netns/ns.h>
-#include <netns/ns_if.h>
-#endif
-
-#ifdef ISO
-#include <netiso/iso.h>
-#include <netiso/iso_var.h>
-#endif
-
-#ifdef NETATALK
-#include <netinet/if_ether.h>
-#include <netatalk/at.h>
-#include <netatalk/at_var.h>
-#endif NETATALK
-
-#include "bpfilter.h"
-
-static int loioctl __P((struct ifnet *, int, caddr_t));
-static void lortrequest __P((int, struct rtentry *, struct sockaddr *));
-
-       void rtems_bsdnet_loopattach __P((void *));
-PSEUDO_SET(loopattach, if_loop);
-
-#ifdef TINY_LOMTU
-#define	LOMTU	(1024+512)
-#else
-#define LOMTU	16384
-#endif
-
-struct	ifnet loif[NLOOP];
-
-/* ARGSUSED */
-void
-rtems_bsdnet_loopattach(dummy)
-	void *dummy;
-{
-	register struct ifnet *ifp;
-	register int i = 0;
-
-	for (ifp = loif; i < NLOOP; ifp++) {
-	    ifp->if_name = "lo";
-	    ifp->if_next = NULL;
-	    ifp->if_unit = i++;
-	    ifp->if_mtu = LOMTU;
-	    ifp->if_flags = IFF_LOOPBACK | IFF_MULTICAST;
-	    ifp->if_ioctl = loioctl;
-	    ifp->if_output = looutput;
-	    ifp->if_type = IFT_LOOP;
-	    ifp->if_hdrlen = 0;
-	    ifp->if_addrlen = 0;
-	    if_attach(ifp);
-#if NBPFILTER > 0
-	    bpfattach(ifp, DLT_NULL, sizeof(u_int));
-#endif
-	}
-}
-
-int
-looutput(ifp, m, dst, rt)
-	struct ifnet *ifp;
-	register struct mbuf *m;
-	struct sockaddr *dst;
-	register struct rtentry *rt;
-{
-	int s, isr;
-	register struct ifqueue *ifq = 0;
-
-	if ((m->m_flags & M_PKTHDR) == 0)
-		panic("looutput no HDR");
-#if NBPFILTER > 0
-	/* BPF write needs to be handled specially */
-	if (dst->sa_family == AF_UNSPEC) {
-		dst->sa_family = *(mtod(m, int *));
-		m->m_len -= sizeof(int);
-		m->m_pkthdr.len -= sizeof(int);
-		m->m_data += sizeof(int);
-	}
-
-	if (ifp->if_bpf) {
-		/*
-		 * We need to prepend the address family as
-		 * a four byte field.  Cons up a dummy header
-		 * to pacify bpf.  This is safe because bpf
-		 * will only read from the mbuf (i.e., it won't
-		 * try to free it or keep a pointer a to it).
-		 */
-		struct mbuf m0;
-		u_int af = dst->sa_family;
-
-		m0.m_next = m;
-		m0.m_len = 4;
-		m0.m_data = (char *)&af;
-
-		bpf_mtap(ifp, &m0);
-	}
-#endif
-	m->m_pkthdr.rcvif = ifp;
-
-	if (rt && rt->rt_flags & (RTF_REJECT|RTF_BLACKHOLE)) {
-		m_freem(m);
-		return (rt->rt_flags & RTF_BLACKHOLE ? 0 :
-		        rt->rt_flags & RTF_HOST ? EHOSTUNREACH : ENETUNREACH);
-	}
-	ifp->if_opackets++;
-	ifp->if_obytes += m->m_pkthdr.len;
-	switch (dst->sa_family) {
-
-#ifdef INET
-	case AF_INET:
-		ifq = &ipintrq;
-		isr = NETISR_IP;
-		break;
-#endif
-#ifdef IPX
-	case AF_IPX:
-		ifq = &ipxintrq;
-		isr = NETISR_IPX;
-		break;
-#endif
-#ifdef NS
-	case AF_NS:
-		ifq = &nsintrq;
-		isr = NETISR_NS;
-		break;
-#endif
-#ifdef ISO
-	case AF_ISO:
-		ifq = &clnlintrq;
-		isr = NETISR_ISO;
-		break;
-#endif
-#ifdef NETATALK
-	case AF_APPLETALK:
-	        ifq = &atintrq2;
-		isr = NETISR_ATALK;
-		break;
-#endif NETATALK
-	default:
-		printf("lo%d: can't handle af%d\n", ifp->if_unit,
-			dst->sa_family);
-		m_freem(m);
-		return (EAFNOSUPPORT);
-	}
-	s = splimp();
-	if (IF_QFULL(ifq)) {
-		IF_DROP(ifq);
-		m_freem(m);
-		splx(s);
-		return (ENOBUFS);
-	}
-	IF_ENQUEUE(ifq, m);
-	schednetisr(isr);
-	ifp->if_ipackets++;
-	ifp->if_ibytes += m->m_pkthdr.len;
-	splx(s);
-	return (0);
-}
-
-/* ARGSUSED */
-static void
-lortrequest(cmd, rt, sa)
-	int cmd;
-	struct rtentry *rt;
-	struct sockaddr *sa;
-{
-	if (rt) {
-		rt->rt_rmx.rmx_mtu = rt->rt_ifp->if_mtu; /* for ISO */
-		/*
-		 * For optimal performance, the send and receive buffers
-		 * should be at least twice the MTU plus a little more for
-		 * overhead.
-		 */
-		rt->rt_rmx.rmx_recvpipe = 
-			rt->rt_rmx.rmx_sendpipe = 3 * LOMTU;
-	}
-}
-
-/*
- * Process an ioctl request.
- */
-/* ARGSUSED */
-static int
-loioctl(ifp, cmd, data)
-	register struct ifnet *ifp;
-	int cmd;
-	caddr_t data;
-{
-	register struct ifaddr *ifa;
-	register struct ifreq *ifr = (struct ifreq *)data;
-	register int error = 0;
-
-	switch (cmd) {
-
-	case SIOCSIFADDR:
-		ifp->if_flags |= IFF_UP | IFF_RUNNING;
-		ifa = (struct ifaddr *)data;
-		ifa->ifa_rtrequest = lortrequest;
-		/*
-		 * Everything else is done at a higher level.
-		 */
-		break;
-
-	case SIOCADDMULTI:
-	case SIOCDELMULTI:
-		if (ifr == 0) {
-			error = EAFNOSUPPORT;		/* XXX */
-			break;
-		}
-		switch (ifr->ifr_addr.sa_family) {
-
-#ifdef INET
-		case AF_INET:
-			break;
-#endif
-
-		default:
-			error = EAFNOSUPPORT;
-			break;
-		}
-		break;
-
-	case SIOCSIFMTU:
-		ifp->if_mtu = ifr->ifr_mtu;
-		break;
-
-	default:
-		error = EINVAL;
-	}
-	return (error);
-}
-#endif /* NLOOP > 0 */
diff --git a/c/src/exec/libnetworking/net/if_types.h b/c/src/exec/libnetworking/net/if_types.h
deleted file mode 100644
index 833ba471c3..0000000000
--- a/c/src/exec/libnetworking/net/if_types.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright (c) 1989, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)if_types.h	8.2 (Berkeley) 4/20/94
- * $Id$
- */
-
-#ifndef _NET_IF_TYPES_H_
-#define _NET_IF_TYPES_H_
-
-/*
- * Interface types for benefit of parsing media address headers.
- * This list is derived from the SNMP list of ifTypes, currently
- * documented in RFC1573.
- */
-
-#define	IFT_OTHER	0x1		/* none of the following */
-#define	IFT_1822	0x2		/* old-style arpanet imp */
-#define	IFT_HDH1822	0x3		/* HDH arpanet imp */
-#define	IFT_X25DDN	0x4		/* x25 to imp */
-#define	IFT_X25		0x5		/* PDN X25 interface (RFC877) */
-#define	IFT_ETHER	0x6		/* Ethernet CSMACD */
-#define	IFT_ISO88023	0x7		/* CMSA CD */
-#define	IFT_ISO88024	0x8		/* Token Bus */
-#define	IFT_ISO88025	0x9		/* Token Ring */
-#define	IFT_ISO88026	0xa		/* MAN */
-#define	IFT_STARLAN	0xb
-#define	IFT_P10		0xc		/* Proteon 10MBit ring */
-#define	IFT_P80		0xd		/* Proteon 80MBit ring */
-#define	IFT_HY		0xe		/* Hyperchannel */
-#define	IFT_FDDI	0xf
-#define	IFT_LAPB	0x10
-#define	IFT_SDLC	0x11
-#define	IFT_T1		0x12
-#define	IFT_CEPT	0x13		/* E1 - european T1 */
-#define	IFT_ISDNBASIC	0x14
-#define	IFT_ISDNPRIMARY	0x15
-#define	IFT_PTPSERIAL	0x16		/* Proprietary PTP serial */
-#define	IFT_PPP		0x17		/* RFC 1331 */
-#define	IFT_LOOP	0x18		/* loopback */
-#define	IFT_EON		0x19		/* ISO over IP */
-#define	IFT_XETHER	0x1a		/* obsolete 3MB experimental ethernet */
-#define	IFT_NSIP	0x1b		/* XNS over IP */
-#define	IFT_SLIP	0x1c		/* IP over generic TTY */
-#define	IFT_ULTRA	0x1d		/* Ultra Technologies */
-#define	IFT_DS3		0x1e		/* Generic T3 */
-#define	IFT_SIP		0x1f		/* SMDS */
-#define	IFT_FRELAY	0x20		/* Frame Relay DTE only */
-#define	IFT_RS232	0x21
-#define	IFT_PARA	0x22		/* parallel-port */
-#define	IFT_ARCNET	0x23
-#define	IFT_ARCNETPLUS	0x24
-#define	IFT_ATM		0x25		/* ATM cells */
-#define	IFT_MIOX25	0x26
-#define	IFT_SONET	0x27		/* SONET or SDH */
-#define	IFT_X25PLE	0x28
-#define	IFT_ISO88022LLC	0x29
-#define	IFT_LOCALTALK	0x2a
-#define	IFT_SMDSDXI	0x2b
-#define	IFT_FRELAYDCE	0x2c		/* Frame Relay DCE */
-#define	IFT_V35		0x2d
-#define	IFT_HSSI	0x2e
-#define	IFT_HIPPI	0x2f
-#define	IFT_MODEM	0x30		/* Generic Modem */
-#define	IFT_AAL5	0x31		/* AAL5 over ATM */
-#define	IFT_SONETPATH	0x32
-#define	IFT_SONETVT	0x33
-#define	IFT_SMDSICIP	0x34		/* SMDS InterCarrier Interface */
-#define	IFT_PROPVIRTUAL	0x35		/* Proprietary Virtual/internal */
-#define	IFT_PROPMUX	0x36		/* Proprietary Multiplexing */
-
-#endif
diff --git a/c/src/exec/libnetworking/net/netisr.h b/c/src/exec/libnetworking/net/netisr.h
deleted file mode 100644
index 73269a4442..0000000000
--- a/c/src/exec/libnetworking/net/netisr.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (c) 1980, 1986, 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)netisr.h	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#ifndef _NET_NETISR_H_
-#define _NET_NETISR_H_
-
-/*
- * The networking code runs off software interrupts.
- *
- * You can switch into the network by doing splnet() and return by splx().
- * The software interrupt level for the network is higher than the software
- * level for the clock (so you can enter the network in routines called
- * at timeout time).
- */
-#if defined(vax) || defined(tahoe)
-#define	setsoftnet()	mtpr(SIRR, 12)
-#endif
-
-/*
- * Each ``pup-level-1'' input queue has a bit in a ``netisr'' status
- * word which is used to de-multiplex a single software
- * interrupt used for scheduling the network code to calls
- * on the lowest level routine of each protocol.
- */
-#define	NETISR_RAW	0		/* same as AF_UNSPEC */
-#define	NETISR_IP	2		/* same as AF_INET */
-#define	NETISR_IMP	3		/* same as AF_IMPLINK */
-#define	NETISR_NS	6		/* same as AF_NS */
-#define	NETISR_ISO	7		/* same as AF_ISO */
-#define	NETISR_CCITT	10		/* same as AF_CCITT */
-#define NETISR_ATALK    16              /* same as AF_APPLETALK */
-#define	NETISR_ARP	18		/* same as AF_LINK */
-#define NETISR_IPX	23		/* same as AF_IPX */
-#define	NETISR_ISDN	26		/* same as AF_E164 */
-#define	NETISR_PPP	27		/* PPP soft interrupt */
-
-#define	schednetisr(anisr)	rtems_bsdnet_schednetisr(anisr)
-
-#ifndef LOCORE
-#ifdef KERNEL
-extern volatile unsigned int	netisr;	/* scheduling bits for network */
-
-typedef void netisr_t(void);
-
-struct netisrtab {
-	int nit_num;
-	netisr_t *nit_isr;
-};
-
-#define NETISR_SET(num, isr)
-
-int register_netisr __P((int, netisr_t *));
-
-#endif
-#endif
-
-#endif
diff --git a/c/src/exec/libnetworking/net/radix.c b/c/src/exec/libnetworking/net/radix.c
deleted file mode 100644
index bc1b7ee1d1..0000000000
--- a/c/src/exec/libnetworking/net/radix.c
+++ /dev/null
@@ -1,1028 +0,0 @@
-/*
- * Copyright (c) 1988, 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)radix.c	8.4 (Berkeley) 11/2/94
- *	$Id$
- */
-
-/*
- * Routines to build and maintain radix trees for routing lookups.
- */
-#ifndef _RADIX_H_
-#include <sys/param.h>
-#ifdef	KERNEL
-#include <sys/systm.h>
-#include <sys/malloc.h>
-#define	M_DONTWAIT M_NOWAIT
-#include <sys/domain.h>
-#else
-#include <stdlib.h>
-#endif
-#include <sys/syslog.h>
-#include <net/radix.h>
-#endif
-
-static struct radix_node *
-		rn_lookup __P((void *v_arg, void *m_arg,
-			       struct radix_node_head *head));
-static int	rn_walktree_from __P((struct radix_node_head *h, void *a,
-				      void *m, walktree_f_t *f, void *w));
-static int rn_walktree __P((struct radix_node_head *, walktree_f_t *, void *));
-static struct radix_node
-	 *rn_delete __P((void *, void *, struct radix_node_head *)),
-	 *rn_insert __P((void *, struct radix_node_head *, int *,
-			struct radix_node [2])),
-	 *rn_newpair __P((void *, int, struct radix_node[2])),
-	 *rn_search __P((void *, struct radix_node *)),
-	 *rn_search_m __P((void *, struct radix_node *, void *));
-
-static int	max_keylen;
-static struct radix_mask *rn_mkfreelist;
-static struct radix_node_head *mask_rnhead;
-static char *addmask_key;
-static char normal_chars[] = {0, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfe, -1};
-static char *rn_zeros, *rn_ones;
-
-#define rn_masktop (mask_rnhead->rnh_treetop)
-#undef Bcmp
-#define Bcmp(a, b, l) (l == 0 ? 0 : bcmp((caddr_t)(a), (caddr_t)(b), (u_long)l))
-
-static int	rn_lexobetter __P((void *m_arg, void *n_arg));
-static struct radix_mask *
-		rn_new_radix_mask __P((struct radix_node *tt,
-				       struct radix_mask *next));
-static int	rn_satsifies_leaf __P((char *trial, struct radix_node *leaf,
-				       int skip));
-
-/*
- * The data structure for the keys is a radix tree with one way
- * branching removed.  The index rn_b at an internal node n represents a bit
- * position to be tested.  The tree is arranged so that all descendants
- * of a node n have keys whose bits all agree up to position rn_b - 1.
- * (We say the index of n is rn_b.)
- *
- * There is at least one descendant which has a one bit at position rn_b,
- * and at least one with a zero there.
- *
- * A route is determined by a pair of key and mask.  We require that the
- * bit-wise logical and of the key and mask to be the key.
- * We define the index of a route to associated with the mask to be
- * the first bit number in the mask where 0 occurs (with bit number 0
- * representing the highest order bit).
- *
- * We say a mask is normal if every bit is 0, past the index of the mask.
- * If a node n has a descendant (k, m) with index(m) == index(n) == rn_b,
- * and m is a normal mask, then the route applies to every descendant of n.
- * If the index(m) < rn_b, this implies the trailing last few bits of k
- * before bit b are all 0, (and hence consequently true of every descendant
- * of n), so the route applies to all descendants of the node as well.
- *
- * Similar logic shows that a non-normal mask m such that
- * index(m) <= index(n) could potentially apply to many children of n.
- * Thus, for each non-host route, we attach its mask to a list at an internal
- * node as high in the tree as we can go.
- *
- * The present version of the code makes use of normal routes in short-
- * circuiting an explict mask and compare operation when testing whether
- * a key satisfies a normal route, and also in remembering the unique leaf
- * that governs a subtree.
- */
-
-static struct radix_node *
-rn_search(v_arg, head)
-	void *v_arg;
-	struct radix_node *head;
-{
-	register struct radix_node *x;
-	register caddr_t v;
-
-	for (x = head, v = v_arg; x->rn_b >= 0;) {
-		if (x->rn_bmask & v[x->rn_off])
-			x = x->rn_r;
-		else
-			x = x->rn_l;
-	}
-	return (x);
-};
-
-static struct radix_node *
-rn_search_m(v_arg, head, m_arg)
-	struct radix_node *head;
-	void *v_arg, *m_arg;
-{
-	register struct radix_node *x;
-	register caddr_t v = v_arg, m = m_arg;
-
-	for (x = head; x->rn_b >= 0;) {
-		if ((x->rn_bmask & m[x->rn_off]) &&
-		    (x->rn_bmask & v[x->rn_off]))
-			x = x->rn_r;
-		else
-			x = x->rn_l;
-	}
-	return x;
-};
-
-int
-rn_refines(m_arg, n_arg)
-	void *m_arg, *n_arg;
-{
-	register caddr_t m = m_arg, n = n_arg;
-	register caddr_t lim, lim2 = lim = n + *(u_char *)n;
-	int longer = (*(u_char *)n++) - (int)(*(u_char *)m++);
-	int masks_are_equal = 1;
-
-	if (longer > 0)
-		lim -= longer;
-	while (n < lim) {
-		if (*n & ~(*m))
-			return 0;
-		if (*n++ != *m++)
-			masks_are_equal = 0;
-	}
-	while (n < lim2)
-		if (*n++)
-			return 0;
-	if (masks_are_equal && (longer < 0))
-		for (lim2 = m - longer; m < lim2; )
-			if (*m++)
-				return 1;
-	return (!masks_are_equal);
-}
-
-struct radix_node *
-rn_lookup(v_arg, m_arg, head)
-	void *v_arg, *m_arg;
-	struct radix_node_head *head;
-{
-	register struct radix_node *x;
-	caddr_t netmask = 0;
-
-	if (m_arg) {
-		if ((x = rn_addmask(m_arg, 1, head->rnh_treetop->rn_off)) == 0)
-			return (0);
-		netmask = x->rn_key;
-	}
-	x = rn_match(v_arg, head);
-	if (x && netmask) {
-		while (x && x->rn_mask != netmask)
-			x = x->rn_dupedkey;
-	}
-	return x;
-}
-
-static int
-rn_satsifies_leaf(trial, leaf, skip)
-	char *trial;
-	register struct radix_node *leaf;
-	int skip;
-{
-	register char *cp = trial, *cp2 = leaf->rn_key, *cp3 = leaf->rn_mask;
-	char *cplim;
-	int length = min(*(u_char *)cp, *(u_char *)cp2);
-
-	if (cp3 == 0)
-		cp3 = rn_ones;
-	else
-		length = min(length, *(u_char *)cp3);
-	cplim = cp + length; cp3 += skip; cp2 += skip;
-	for (cp += skip; cp < cplim; cp++, cp2++, cp3++)
-		if ((*cp ^ *cp2) & *cp3)
-			return 0;
-	return 1;
-}
-
-struct radix_node *
-rn_match(v_arg, head)
-	void *v_arg;
-	struct radix_node_head *head;
-{
-	caddr_t v = v_arg;
-	register struct radix_node *t = head->rnh_treetop, *x;
-	register caddr_t cp = v, cp2;
-	caddr_t cplim;
-	struct radix_node *saved_t, *top = t;
-	int off = t->rn_off, vlen = *(u_char *)cp, matched_off;
-	register int test, b, rn_b;
-
-	/*
-	 * Open code rn_search(v, top) to avoid overhead of extra
-	 * subroutine call.
-	 */
-	for (; t->rn_b >= 0; ) {
-		if (t->rn_bmask & cp[t->rn_off])
-			t = t->rn_r;
-		else
-			t = t->rn_l;
-	}
-	/*
-	 * See if we match exactly as a host destination
-	 * or at least learn how many bits match, for normal mask finesse.
-	 *
-	 * It doesn't hurt us to limit how many bytes to check
-	 * to the length of the mask, since if it matches we had a genuine
-	 * match and the leaf we have is the most specific one anyway;
-	 * if it didn't match with a shorter length it would fail
-	 * with a long one.  This wins big for class B&C netmasks which
-	 * are probably the most common case...
-	 */
-	if (t->rn_mask)
-		vlen = *(u_char *)t->rn_mask;
-	cp += off; cp2 = t->rn_key + off; cplim = v + vlen;
-	for (; cp < cplim; cp++, cp2++)
-		if (*cp != *cp2)
-			goto on1;
-	/*
-	 * This extra grot is in case we are explicitly asked
-	 * to look up the default.  Ugh!
-	 */
-	if ((t->rn_flags & RNF_ROOT) && t->rn_dupedkey)
-		t = t->rn_dupedkey;
-	return t;
-on1:
-	test = (*cp ^ *cp2) & 0xff; /* find first bit that differs */
-	for (b = 7; (test >>= 1) > 0;)
-		b--;
-	matched_off = cp - v;
-	b += matched_off << 3;
-	rn_b = -1 - b;
-	/*
-	 * If there is a host route in a duped-key chain, it will be first.
-	 */
-	if ((saved_t = t)->rn_mask == 0)
-		t = t->rn_dupedkey;
-	for (; t; t = t->rn_dupedkey)
-		/*
-		 * Even if we don't match exactly as a host,
-		 * we may match if the leaf we wound up at is
-		 * a route to a net.
-		 */
-		if (t->rn_flags & RNF_NORMAL) {
-			if (rn_b <= t->rn_b)
-				return t;
-		} else if (rn_satsifies_leaf(v, t, matched_off))
-				return t;
-	t = saved_t;
-	/* start searching up the tree */
-	do {
-		register struct radix_mask *m;
-		t = t->rn_p;
-		m = t->rn_mklist;
-		if (m) {
-			/*
-			 * If non-contiguous masks ever become important
-			 * we can restore the masking and open coding of
-			 * the search and satisfaction test and put the
-			 * calculation of "off" back before the "do".
-			 */
-			do {
-				if (m->rm_flags & RNF_NORMAL) {
-					if (rn_b <= m->rm_b)
-						return (m->rm_leaf);
-				} else {
-					off = min(t->rn_off, matched_off);
-					x = rn_search_m(v, t, m->rm_mask);
-					while (x && x->rn_mask != m->rm_mask)
-						x = x->rn_dupedkey;
-					if (x && rn_satsifies_leaf(v, x, off))
-						    return x;
-				}
-				m = m->rm_mklist;
-			} while (m);
-		}
-	} while (t != top);
-	return 0;
-};
-
-#ifdef RN_DEBUG
-int	rn_nodenum;
-struct	radix_node *rn_clist;
-int	rn_saveinfo;
-int	rn_debug =  1;
-#endif
-
-static struct radix_node *
-rn_newpair(v, b, nodes)
-	void *v;
-	int b;
-	struct radix_node nodes[2];
-{
-	register struct radix_node *tt = nodes, *t = tt + 1;
-	t->rn_b = b; t->rn_bmask = 0x80 >> (b & 7);
-	t->rn_l = tt; t->rn_off = b >> 3;
-	tt->rn_b = -1; tt->rn_key = (caddr_t)v; tt->rn_p = t;
-	tt->rn_flags = t->rn_flags = RNF_ACTIVE;
-#ifdef RN_DEBUG
-	tt->rn_info = rn_nodenum++; t->rn_info = rn_nodenum++;
-	tt->rn_twin = t; tt->rn_ybro = rn_clist; rn_clist = tt;
-#endif
-	return t;
-}
-
-static struct radix_node *
-rn_insert(v_arg, head, dupentry, nodes)
-	void *v_arg;
-	struct radix_node_head *head;
-	int *dupentry;
-	struct radix_node nodes[2];
-{
-	caddr_t v = v_arg;
-	struct radix_node *top = head->rnh_treetop;
-	int head_off = top->rn_off, vlen = (int)*((u_char *)v);
-	register struct radix_node *t = rn_search(v_arg, top);
-	register caddr_t cp = v + head_off;
-	register int b;
-	struct radix_node *tt;
-    	/*
-	 * Find first bit at which v and t->rn_key differ
-	 */
-    {
-	register caddr_t cp2 = t->rn_key + head_off;
-	register int cmp_res;
-	caddr_t cplim = v + vlen;
-
-	while (cp < cplim)
-		if (*cp2++ != *cp++)
-			goto on1;
-	*dupentry = 1;
-	return t;
-on1:
-	*dupentry = 0;
-	cmp_res = (cp[-1] ^ cp2[-1]) & 0xff;
-	for (b = (cp - v) << 3; cmp_res; b--)
-		cmp_res >>= 1;
-    }
-    {
-	register struct radix_node *p, *x = top;
-	cp = v;
-	do {
-		p = x;
-		if (cp[x->rn_off] & x->rn_bmask)
-			x = x->rn_r;
-		else x = x->rn_l;
-	} while (b > (unsigned) x->rn_b); /* x->rn_b < b && x->rn_b >= 0 */
-#ifdef RN_DEBUG
-	if (rn_debug)
-		log(LOG_DEBUG, "rn_insert: Going In:\n"), traverse(p);
-#endif
-	t = rn_newpair(v_arg, b, nodes); tt = t->rn_l;
-	if ((cp[p->rn_off] & p->rn_bmask) == 0)
-		p->rn_l = t;
-	else
-		p->rn_r = t;
-	x->rn_p = t; t->rn_p = p; /* frees x, p as temp vars below */
-	if ((cp[t->rn_off] & t->rn_bmask) == 0) {
-		t->rn_r = x;
-	} else {
-		t->rn_r = tt; t->rn_l = x;
-	}
-#ifdef RN_DEBUG
-	if (rn_debug)
-		log(LOG_DEBUG, "rn_insert: Coming Out:\n"), traverse(p);
-#endif
-    }
-	return (tt);
-}
-
-struct radix_node *
-rn_addmask(n_arg, search, skip)
-	int search, skip;
-	void *n_arg;
-{
-	caddr_t netmask = (caddr_t)n_arg;
-	register struct radix_node *x;
-	register caddr_t cp, cplim;
-	register int b = 0, mlen, j;
-	int maskduplicated, m0, isnormal;
-	struct radix_node *saved_x;
-	static int last_zeroed = 0;
-
-	if ((mlen = *(u_char *)netmask) > max_keylen)
-		mlen = max_keylen;
-	if (skip == 0)
-		skip = 1;
-	if (mlen <= skip)
-		return (mask_rnhead->rnh_nodes);
-	if (skip > 1)
-		Bcopy(rn_ones + 1, addmask_key + 1, skip - 1);
-	if ((m0 = mlen) > skip)
-		Bcopy(netmask + skip, addmask_key + skip, mlen - skip);
-	/*
-	 * Trim trailing zeroes.
-	 */
-	for (cp = addmask_key + mlen; (cp > addmask_key) && cp[-1] == 0;)
-		cp--;
-	mlen = cp - addmask_key;
-	if (mlen <= skip) {
-		if (m0 >= last_zeroed)
-			last_zeroed = mlen;
-		return (mask_rnhead->rnh_nodes);
-	}
-	if (m0 < last_zeroed)
-		Bzero(addmask_key + m0, last_zeroed - m0);
-	*addmask_key = last_zeroed = mlen;
-	x = rn_search(addmask_key, rn_masktop);
-	if (Bcmp(addmask_key, x->rn_key, mlen) != 0)
-		x = 0;
-	if (x || search)
-		return (x);
-	R_Malloc(x, struct radix_node *, max_keylen + 2 * sizeof (*x));
-	if ((saved_x = x) == 0)
-		return (0);
-	Bzero(x, max_keylen + 2 * sizeof (*x));
-	netmask = cp = (caddr_t)(x + 2);
-	Bcopy(addmask_key, cp, mlen);
-	x = rn_insert(cp, mask_rnhead, &maskduplicated, x);
-	if (maskduplicated) {
-		log(LOG_ERR, "rn_addmask: mask impossibly already in tree");
-		Free(saved_x);
-		return (x);
-	}
-	/*
-	 * Calculate index of mask, and check for normalcy.
-	 */
-	cplim = netmask + mlen; isnormal = 1;
-	for (cp = netmask + skip; (cp < cplim) && *(u_char *)cp == 0xff;)
-		cp++;
-	if (cp != cplim) {
-		for (j = 0x80; (j & *cp) != 0; j >>= 1)
-			b++;
-		if (*cp != normal_chars[b] || cp != (cplim - 1))
-			isnormal = 0;
-	}
-	b += (cp - netmask) << 3;
-	x->rn_b = -1 - b;
-	if (isnormal)
-		x->rn_flags |= RNF_NORMAL;
-	return (x);
-}
-
-static int	/* XXX: arbitrary ordering for non-contiguous masks */
-rn_lexobetter(m_arg, n_arg)
-	void *m_arg, *n_arg;
-{
-	register u_char *mp = m_arg, *np = n_arg, *lim;
-
-	if (*mp > *np)
-		return 1;  /* not really, but need to check longer one first */
-	if (*mp == *np)
-		for (lim = mp + *mp; mp < lim;)
-			if (*mp++ > *np++)
-				return 1;
-	return 0;
-}
-
-static struct radix_mask *
-rn_new_radix_mask(tt, next)
-	register struct radix_node *tt;
-	register struct radix_mask *next;
-{
-	register struct radix_mask *m;
-
-	MKGet(m);
-	if (m == 0) {
-		log(LOG_ERR, "Mask for route not entered\n");
-		return (0);
-	}
-	Bzero(m, sizeof *m);
-	m->rm_b = tt->rn_b;
-	m->rm_flags = tt->rn_flags;
-	if (tt->rn_flags & RNF_NORMAL)
-		m->rm_leaf = tt;
-	else
-		m->rm_mask = tt->rn_mask;
-	m->rm_mklist = next;
-	tt->rn_mklist = m;
-	return m;
-}
-
-struct radix_node *
-rn_addroute(v_arg, n_arg, head, treenodes)
-	void *v_arg, *n_arg;
-	struct radix_node_head *head;
-	struct radix_node treenodes[2];
-{
-	caddr_t v = (caddr_t)v_arg, netmask = (caddr_t)n_arg;
-	register struct radix_node *t, *x = 0, *tt;
-	struct radix_node *saved_tt, *top = head->rnh_treetop;
-	short b = 0, b_leaf = 0;
-	int keyduplicated;
-	caddr_t mmask;
-	struct radix_mask *m, **mp;
-
-	/*
-	 * In dealing with non-contiguous masks, there may be
-	 * many different routes which have the same mask.
-	 * We will find it useful to have a unique pointer to
-	 * the mask to speed avoiding duplicate references at
-	 * nodes and possibly save time in calculating indices.
-	 */
-	if (netmask)  {
-		if ((x = rn_addmask(netmask, 0, top->rn_off)) == 0)
-			return (0);
-		b_leaf = x->rn_b;
-		b = -1 - x->rn_b;
-		netmask = x->rn_key;
-	}
-	/*
-	 * Deal with duplicated keys: attach node to previous instance
-	 */
-	saved_tt = tt = rn_insert(v, head, &keyduplicated, treenodes);
-	if (keyduplicated) {
-		for (t = tt; tt; t = tt, tt = tt->rn_dupedkey) {
-			if (tt->rn_mask == netmask)
-				return (0);
-			if (netmask == 0 ||
-			    (tt->rn_mask &&
-			     ((b_leaf < tt->rn_b) || /* index(netmask) > node */
-			       rn_refines(netmask, tt->rn_mask) ||
-			       rn_lexobetter(netmask, tt->rn_mask))))
-				break;
-		}
-		/*
-		 * If the mask is not duplicated, we wouldn't
-		 * find it among possible duplicate key entries
-		 * anyway, so the above test doesn't hurt.
-		 *
-		 * We sort the masks for a duplicated key the same way as
-		 * in a masklist -- most specific to least specific.
-		 * This may require the unfortunate nuisance of relocating
-		 * the head of the list.
-		 */
-		if (tt == saved_tt) {
-			struct	radix_node *xx = x;
-			/* link in at head of list */
-			(tt = treenodes)->rn_dupedkey = t;
-			tt->rn_flags = t->rn_flags;
-			tt->rn_p = x = t->rn_p;
-			t->rn_p = tt;				/* parent */
-			if (x->rn_l == t) x->rn_l = tt; else x->rn_r = tt;
-			saved_tt = tt; x = xx;
-		} else {
-			(tt = treenodes)->rn_dupedkey = t->rn_dupedkey;
-			t->rn_dupedkey = tt;
-			tt->rn_p = t;				/* parent */
-			if (tt->rn_dupedkey)			/* parent */
-				tt->rn_dupedkey->rn_p = tt;	/* parent */
-		}
-#ifdef RN_DEBUG
-		t=tt+1; tt->rn_info = rn_nodenum++; t->rn_info = rn_nodenum++;
-		tt->rn_twin = t; tt->rn_ybro = rn_clist; rn_clist = tt;
-#endif
-		tt->rn_key = (caddr_t) v;
-		tt->rn_b = -1;
-		tt->rn_flags = RNF_ACTIVE;
-	}
-	/*
-	 * Put mask in tree.
-	 */
-	if (netmask) {
-		tt->rn_mask = netmask;
-		tt->rn_b = x->rn_b;
-		tt->rn_flags |= x->rn_flags & RNF_NORMAL;
-	}
-	t = saved_tt->rn_p;
-	if (keyduplicated)
-		goto on2;
-	b_leaf = -1 - t->rn_b;
-	if (t->rn_r == saved_tt) x = t->rn_l; else x = t->rn_r;
-	/* Promote general routes from below */
-	if (x->rn_b < 0) {
-	    for (mp = &t->rn_mklist; x; x = x->rn_dupedkey)
-		if (x->rn_mask && (x->rn_b >= b_leaf) && x->rn_mklist == 0) {
-			*mp = m = rn_new_radix_mask(x, 0);
-			if (m)
-				mp = &m->rm_mklist;
-		}
-	} else if (x->rn_mklist) {
-		/*
-		 * Skip over masks whose index is > that of new node
-		 */
-		for (mp = &x->rn_mklist; (m = *mp); mp = &m->rm_mklist)
-			if (m->rm_b >= b_leaf)
-				break;
-		t->rn_mklist = m; *mp = 0;
-	}
-on2:
-	/* Add new route to highest possible ancestor's list */
-	if ((netmask == 0) || (b > t->rn_b ))
-		return tt; /* can't lift at all */
-	b_leaf = tt->rn_b;
-	do {
-		x = t;
-		t = t->rn_p;
-	} while (b <= t->rn_b && x != top);
-	/*
-	 * Search through routes associated with node to
-	 * insert new route according to index.
-	 * Need same criteria as when sorting dupedkeys to avoid
-	 * double loop on deletion.
-	 */
-	for (mp = &x->rn_mklist; (m = *mp); mp = &m->rm_mklist) {
-		if (m->rm_b < b_leaf)
-			continue;
-		if (m->rm_b > b_leaf)
-			break;
-		if (m->rm_flags & RNF_NORMAL) {
-			mmask = m->rm_leaf->rn_mask;
-			if (tt->rn_flags & RNF_NORMAL) {
-				log(LOG_ERR,
-				   "Non-unique normal route, mask not entered");
-				return tt;
-			}
-		} else
-			mmask = m->rm_mask;
-		if (mmask == netmask) {
-			m->rm_refs++;
-			tt->rn_mklist = m;
-			return tt;
-		}
-		if (rn_refines(netmask, mmask) || rn_lexobetter(netmask, mmask))
-			break;
-	}
-	*mp = rn_new_radix_mask(tt, *mp);
-	return tt;
-}
-
-static struct radix_node *
-rn_delete(v_arg, netmask_arg, head)
-	void *v_arg, *netmask_arg;
-	struct radix_node_head *head;
-{
-	register struct radix_node *t, *p, *x, *tt;
-	struct radix_mask *m, *saved_m, **mp;
-	struct radix_node *dupedkey, *saved_tt, *top;
-	caddr_t v, netmask;
-	int b, head_off, vlen;
-
-	v = v_arg;
-	netmask = netmask_arg;
-	x = head->rnh_treetop;
-	tt = rn_search(v, x);
-	head_off = x->rn_off;
-	vlen =  *(u_char *)v;
-	saved_tt = tt;
-	top = x;
-	if (tt == 0 ||
-	    Bcmp(v + head_off, tt->rn_key + head_off, vlen - head_off))
-		return (0);
-	/*
-	 * Delete our route from mask lists.
-	 */
-	if (netmask) {
-		if ((x = rn_addmask(netmask, 1, head_off)) == 0)
-			return (0);
-		netmask = x->rn_key;
-		while (tt->rn_mask != netmask)
-			if ((tt = tt->rn_dupedkey) == 0)
-				return (0);
-	}
-	if (tt->rn_mask == 0 || (saved_m = m = tt->rn_mklist) == 0)
-		goto on1;
-	if (tt->rn_flags & RNF_NORMAL) {
-		if (m->rm_leaf != tt || m->rm_refs > 0) {
-			log(LOG_ERR, "rn_delete: inconsistent annotation\n");
-			return 0;  /* dangling ref could cause disaster */
-		}
-	} else {
-		if (m->rm_mask != tt->rn_mask) {
-			log(LOG_ERR, "rn_delete: inconsistent annotation\n");
-			goto on1;
-		}
-		if (--m->rm_refs >= 0)
-			goto on1;
-	}
-	b = -1 - tt->rn_b;
-	t = saved_tt->rn_p;
-	if (b > t->rn_b)
-		goto on1; /* Wasn't lifted at all */
-	do {
-		x = t;
-		t = t->rn_p;
-	} while (b <= t->rn_b && x != top);
-	for (mp = &x->rn_mklist; (m = *mp); mp = &m->rm_mklist)
-		if (m == saved_m) {
-			*mp = m->rm_mklist;
-			MKFree(m);
-			break;
-		}
-	if (m == 0) {
-		log(LOG_ERR, "rn_delete: couldn't find our annotation\n");
-		if (tt->rn_flags & RNF_NORMAL)
-			return (0); /* Dangling ref to us */
-	}
-on1:
-	/*
-	 * Eliminate us from tree
-	 */
-	if (tt->rn_flags & RNF_ROOT)
-		return (0);
-#ifdef RN_DEBUG
-	/* Get us out of the creation list */
-	for (t = rn_clist; t && t->rn_ybro != tt; t = t->rn_ybro) {}
-	if (t) t->rn_ybro = tt->rn_ybro;
-#endif
-	t = tt->rn_p;
-	dupedkey = saved_tt->rn_dupedkey;
-	if (dupedkey) {
-		/*
-		 * at this point, tt is the deletion target and saved_tt
-		 * is the head of the dupekey chain
-		 */
-		if (tt == saved_tt) {
-			/* remove from head of chain */
-			x = dupedkey; x->rn_p = t;
-			if (t->rn_l == tt) t->rn_l = x; else t->rn_r = x;
-		} else {
-			/* find node in front of tt on the chain */
-			for (x = p = saved_tt; p && p->rn_dupedkey != tt;)
-				p = p->rn_dupedkey;
-			if (p) {
-				p->rn_dupedkey = tt->rn_dupedkey;
-				if (tt->rn_dupedkey)		   /* parent */
-					tt->rn_dupedkey->rn_p = p; /* parent */
-			} else log(LOG_ERR, "rn_delete: couldn't find us\n");
-		}
-		t = tt + 1;
-		if  (t->rn_flags & RNF_ACTIVE) {
-#ifndef RN_DEBUG
-			*++x = *t; p = t->rn_p;
-#else
-			b = t->rn_info; *++x = *t; t->rn_info = b; p = t->rn_p;
-#endif
-			if (p->rn_l == t) p->rn_l = x; else p->rn_r = x;
-			x->rn_l->rn_p = x; x->rn_r->rn_p = x;
-		}
-		goto out;
-	}
-	if (t->rn_l == tt) x = t->rn_r; else x = t->rn_l;
-	p = t->rn_p;
-	if (p->rn_r == t) p->rn_r = x; else p->rn_l = x;
-	x->rn_p = p;
-	/*
-	 * Demote routes attached to us.
-	 */
-	if (t->rn_mklist) {
-		if (x->rn_b >= 0) {
-			for (mp = &x->rn_mklist; (m = *mp);)
-				mp = &m->rm_mklist;
-			*mp = t->rn_mklist;
-		} else {
-			/* If there are any key,mask pairs in a sibling
-			   duped-key chain, some subset will appear sorted
-			   in the same order attached to our mklist */
-			for (m = t->rn_mklist; m && x; x = x->rn_dupedkey)
-				if (m == x->rn_mklist) {
-					struct radix_mask *mm = m->rm_mklist;
-					x->rn_mklist = 0;
-					if (--(m->rm_refs) < 0)
-						MKFree(m);
-					m = mm;
-				}
-			if (m)
-				log(LOG_ERR, "%s %p at %x\n",
-					    "rn_delete: Orphaned Mask", m, x);
-		}
-	}
-	/*
-	 * We may be holding an active internal node in the tree.
-	 */
-	x = tt + 1;
-	if (t != x) {
-#ifndef RN_DEBUG
-		*t = *x;
-#else
-		b = t->rn_info; *t = *x; t->rn_info = b;
-#endif
-		t->rn_l->rn_p = t; t->rn_r->rn_p = t;
-		p = x->rn_p;
-		if (p->rn_l == x) p->rn_l = t; else p->rn_r = t;
-	}
-out:
-	tt->rn_flags &= ~RNF_ACTIVE;
-	tt[1].rn_flags &= ~RNF_ACTIVE;
-	return (tt);
-}
-
-/*
- * This is the same as rn_walktree() except for the parameters and the
- * exit.
- */
-static int
-rn_walktree_from(h, a, m, f, w)
-	struct radix_node_head *h;
-	void *a, *m;
-	walktree_f_t *f;
-	void *w;
-{
-	int error;
-	struct radix_node *base, *next;
-	u_char *xa = (u_char *)a;
-	u_char *xm = (u_char *)m;
-	register struct radix_node *rn, *last = 0 /* shut up gcc */;
-	int stopping = 0;
-	int lastb;
-
-	/*
-	 * rn_search_m is sort-of-open-coded here.
-	 */
-	/* printf("about to search\n"); */
-	for (rn = h->rnh_treetop; rn->rn_b >= 0; ) {
-		last = rn;
-		/* printf("rn_b %d, rn_bmask %x, xm[rn_off] %x\n",
-		       rn->rn_b, rn->rn_bmask, xm[rn->rn_off]); */
-		if (!(rn->rn_bmask & xm[rn->rn_off])) {
-			break;
-		}
-		if (rn->rn_bmask & xa[rn->rn_off]) {
-			rn = rn->rn_r;
-		} else {
-			rn = rn->rn_l;
-		}
-	}
-	/* printf("done searching\n"); */
-
-	/*
-	 * Two cases: either we stepped off the end of our mask,
-	 * in which case last == rn, or we reached a leaf, in which
-	 * case we want to start from the last node we looked at.
-	 * Either way, last is the node we want to start from.
-	 */
-	rn = last;
-	lastb = rn->rn_b;
-
-	/* printf("rn %p, lastb %d\n", rn, lastb);*/
-
-	/*
-	 * This gets complicated because we may delete the node
-	 * while applying the function f to it, so we need to calculate
-	 * the successor node in advance.
-	 */
-	while (rn->rn_b >= 0)
-		rn = rn->rn_l;
-
-	while (!stopping) {
-		/* printf("node %p (%d)\n", rn, rn->rn_b); */
-		base = rn;
-		/* If at right child go back up, otherwise, go right */
-		while (rn->rn_p->rn_r == rn && !(rn->rn_flags & RNF_ROOT)) {
-			rn = rn->rn_p;
-
-			/* if went up beyond last, stop */
-			if (rn->rn_b < lastb) {
-				stopping = 1;
-				/* printf("up too far\n"); */
-			}
-		}
-
-		/* Find the next *leaf* since next node might vanish, too */
-		for (rn = rn->rn_p->rn_r; rn->rn_b >= 0;)
-			rn = rn->rn_l;
-		next = rn;
-		/* Process leaves */
-		while ((rn = base) != 0) {
-			base = rn->rn_dupedkey;
-			/* printf("leaf %p\n", rn); */
-			if (!(rn->rn_flags & RNF_ROOT)
-			    && (error = (*f)(rn, w)))
-				return (error);
-		}
-		rn = next;
-
-		if (rn->rn_flags & RNF_ROOT) {
-			/* printf("root, stopping"); */
-			stopping = 1;
-		}
-
-	}
-	return 0;
-}
-
-static int
-rn_walktree(h, f, w)
-	struct radix_node_head *h;
-	walktree_f_t *f;
-	void *w;
-{
-	int error;
-	struct radix_node *base, *next;
-	register struct radix_node *rn = h->rnh_treetop;
-	/*
-	 * This gets complicated because we may delete the node
-	 * while applying the function f to it, so we need to calculate
-	 * the successor node in advance.
-	 */
-	/* First time through node, go left */
-	while (rn->rn_b >= 0)
-		rn = rn->rn_l;
-	for (;;) {
-		base = rn;
-		/* If at right child go back up, otherwise, go right */
-		while (rn->rn_p->rn_r == rn && (rn->rn_flags & RNF_ROOT) == 0)
-			rn = rn->rn_p;
-		/* Find the next *leaf* since next node might vanish, too */
-		for (rn = rn->rn_p->rn_r; rn->rn_b >= 0;)
-			rn = rn->rn_l;
-		next = rn;
-		/* Process leaves */
-		while ((rn = base)) {
-			base = rn->rn_dupedkey;
-			if (!(rn->rn_flags & RNF_ROOT) && (error = (*f)(rn, w)))
-				return (error);
-		}
-		rn = next;
-		if (rn->rn_flags & RNF_ROOT)
-			return (0);
-	}
-	/* NOTREACHED */
-}
-
-int
-rn_inithead(head, off)
-	void **head;
-	int off;
-{
-	register struct radix_node_head *rnh;
-	register struct radix_node *t, *tt, *ttt;
-	if (*head)
-		return (1);
-	R_Malloc(rnh, struct radix_node_head *, sizeof (*rnh));
-	if (rnh == 0)
-		return (0);
-	Bzero(rnh, sizeof (*rnh));
-	*head = rnh;
-	t = rn_newpair(rn_zeros, off, rnh->rnh_nodes);
-	ttt = rnh->rnh_nodes + 2;
-	t->rn_r = ttt;
-	t->rn_p = t;
-	tt = t->rn_l;
-	tt->rn_flags = t->rn_flags = RNF_ROOT | RNF_ACTIVE;
-	tt->rn_b = -1 - off;
-	*ttt = *tt;
-	ttt->rn_key = rn_ones;
-	rnh->rnh_addaddr = rn_addroute;
-	rnh->rnh_deladdr = rn_delete;
-	rnh->rnh_matchaddr = rn_match;
-	rnh->rnh_lookup = rn_lookup;
-	rnh->rnh_walktree = rn_walktree;
-	rnh->rnh_walktree_from = rn_walktree_from;
-	rnh->rnh_treetop = t;
-	return (1);
-}
-
-void
-rn_init()
-{
-	char *cp, *cplim;
-#ifdef KERNEL
-	struct domain *dom;
-
-	for (dom = domains; dom; dom = dom->dom_next)
-		if (dom->dom_maxrtkey > max_keylen)
-			max_keylen = dom->dom_maxrtkey;
-#endif
-	if (max_keylen == 0) {
-		log(LOG_ERR,
-		    "rn_init: radix functions require max_keylen be set\n");
-		return;
-	}
-	R_Malloc(rn_zeros, char *, 3 * max_keylen);
-	if (rn_zeros == NULL)
-		panic("rn_init");
-	Bzero(rn_zeros, 3 * max_keylen);
-	rn_ones = cp = rn_zeros + max_keylen;
-	addmask_key = cplim = rn_ones + max_keylen;
-	while (cp < cplim)
-		*cp++ = -1;
-	if (rn_inithead((void **)&mask_rnhead, 0) == 0)
-		panic("rn_init 2");
-}
diff --git a/c/src/exec/libnetworking/net/radix.h b/c/src/exec/libnetworking/net/radix.h
deleted file mode 100644
index 6ef9aafbac..0000000000
--- a/c/src/exec/libnetworking/net/radix.h
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * Copyright (c) 1988, 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)radix.h	8.2 (Berkeley) 10/31/94
- *	$Id$
- */
-
-#ifndef _RADIX_H_
-#define	_RADIX_H_
-
-/*
- * Radix search tree node layout.
- */
-
-struct radix_node {
-	struct	radix_mask *rn_mklist;	/* list of masks contained in subtree */
-	struct	radix_node *rn_p;	/* parent */
-	short	rn_b;			/* bit offset; -1-index(netmask) */
-	char	rn_bmask;		/* node: mask for bit test*/
-	u_char	rn_flags;		/* enumerated next */
-#define RNF_NORMAL	1		/* leaf contains normal route */
-#define RNF_ROOT	2		/* leaf is root leaf for tree */
-#define RNF_ACTIVE	4		/* This node is alive (for rtfree) */
-	union {
-		struct {			/* leaf only data: */
-			caddr_t	rn_Key;		/* object of search */
-			caddr_t	rn_Mask;	/* netmask, if present */
-			struct	radix_node *rn_Dupedkey;
-		} rn_leaf;
-		struct {			/* node only data: */
-			int	rn_Off;		/* where to start compare */
-			struct	radix_node *rn_L;/* progeny */
-			struct	radix_node *rn_R;/* progeny */
-		} rn_node;
-	}		rn_u;
-#ifdef RN_DEBUG
-	int rn_info;
-	struct radix_node *rn_twin;
-	struct radix_node *rn_ybro;
-#endif
-};
-
-#define rn_dupedkey rn_u.rn_leaf.rn_Dupedkey
-#define rn_key rn_u.rn_leaf.rn_Key
-#define rn_mask rn_u.rn_leaf.rn_Mask
-#define rn_off rn_u.rn_node.rn_Off
-#define rn_l rn_u.rn_node.rn_L
-#define rn_r rn_u.rn_node.rn_R
-
-/*
- * Annotations to tree concerning potential routes applying to subtrees.
- */
-
-extern struct radix_mask {
-	short	rm_b;			/* bit offset; -1-index(netmask) */
-	char	rm_unused;		/* cf. rn_bmask */
-	u_char	rm_flags;		/* cf. rn_flags */
-	struct	radix_mask *rm_mklist;	/* more masks to try */
-	union	{
-		caddr_t	rmu_mask;		/* the mask */
-		struct	radix_node *rmu_leaf;	/* for normal routes */
-	}	rm_rmu;
-	int	rm_refs;		/* # of references to this struct */
-} *rn_mkfreelist;
-
-#define rm_mask rm_rmu.rmu_mask
-#define rm_leaf rm_rmu.rmu_leaf		/* extra field would make 32 bytes */
-
-#define MKGet(m) {\
-	if (rn_mkfreelist) {\
-		m = rn_mkfreelist; \
-		rn_mkfreelist = (m)->rm_mklist; \
-	} else \
-		R_Malloc(m, struct radix_mask *, sizeof (*(m))); }\
-
-#define MKFree(m) { (m)->rm_mklist = rn_mkfreelist; rn_mkfreelist = (m);}
-
-typedef int walktree_f_t __P((struct radix_node *, void *));
-
-struct radix_node_head {
-	struct	radix_node *rnh_treetop;
-	int	rnh_addrsize;		/* permit, but not require fixed keys */
-	int	rnh_pktsize;		/* permit, but not require fixed keys */
-	struct	radix_node *(*rnh_addaddr)	/* add based on sockaddr */
-		__P((void *v, void *mask,
-		     struct radix_node_head *head, struct radix_node nodes[]));
-	struct	radix_node *(*rnh_addpkt)	/* add based on packet hdr */
-		__P((void *v, void *mask,
-		     struct radix_node_head *head, struct radix_node nodes[]));
-	struct	radix_node *(*rnh_deladdr)	/* remove based on sockaddr */
-		__P((void *v, void *mask, struct radix_node_head *head));
-	struct	radix_node *(*rnh_delpkt)	/* remove based on packet hdr */
-		__P((void *v, void *mask, struct radix_node_head *head));
-	struct	radix_node *(*rnh_matchaddr)	/* locate based on sockaddr */
-		__P((void *v, struct radix_node_head *head));
-	struct	radix_node *(*rnh_lookup)	/* locate based on sockaddr */
-		__P((void *v, void *mask, struct radix_node_head *head));
-	struct	radix_node *(*rnh_matchpkt)	/* locate based on packet hdr */
-		__P((void *v, struct radix_node_head *head));
-	int	(*rnh_walktree)			/* traverse tree */
-		__P((struct radix_node_head *head, walktree_f_t *f, void *w));
-	int	(*rnh_walktree_from)		/* traverse tree below a */
-		__P((struct radix_node_head *head, void *a, void *m,
-		     walktree_f_t *f, void *w));
-	void	(*rnh_close)	/* do something when the last ref drops */
-		__P((struct radix_node *rn, struct radix_node_head *head));
-	struct	radix_node rnh_nodes[3];	/* empty tree for common case */
-};
-
-#ifndef KERNEL
-#define Bcmp(a, b, n) bcmp(((char *)(a)), ((char *)(b)), (n))
-#define Bcopy(a, b, n) bcopy(((char *)(a)), ((char *)(b)), (unsigned)(n))
-#define Bzero(p, n) bzero((char *)(p), (int)(n));
-#define R_Malloc(p, t, n) (p = (t) malloc((unsigned int)(n)))
-#define Free(p) free((char *)p);
-#else
-#define Bcmp(a, b, n) bcmp(((caddr_t)(a)), ((caddr_t)(b)), (unsigned)(n))
-#define Bcopy(a, b, n) bcopy(((caddr_t)(a)), ((caddr_t)(b)), (unsigned)(n))
-#define Bzero(p, n) bzero((caddr_t)(p), (unsigned)(n));
-#define R_Malloc(p, t, n) (p = (t) malloc((unsigned long)(n), M_RTABLE, M_DONTWAIT))
-#define Free(p) free((caddr_t)p, M_RTABLE);
-#endif /*KERNEL*/
-
-extern struct radix_node_head *mask_rnhead;
-
-void	 rn_init __P((void));
-int	 rn_inithead __P((void **, int));
-int	 rn_refines __P((void *, void *));
-struct radix_node
-	 *rn_addmask __P((void *, int, int)),
-	 *rn_addroute __P((void *, void *, struct radix_node_head *,
-			struct radix_node [2])),
-	 *rn_match __P((void *, struct radix_node_head *));
-
-
-#endif /* _RADIX_H_ */
diff --git a/c/src/exec/libnetworking/net/raw_cb.c b/c/src/exec/libnetworking/net/raw_cb.c
deleted file mode 100644
index 0676931cdc..0000000000
--- a/c/src/exec/libnetworking/net/raw_cb.c
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * Copyright (c) 1980, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)raw_cb.c	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/systm.h>
-#include <sys/mbuf.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/domain.h>
-#include <sys/protosw.h>
-#include <sys/errno.h>
-
-#include <net/if.h>
-#include <net/route.h>
-#include <net/raw_cb.h>
-#include <netinet/in.h>
-
-/*
- * Routines to manage the raw protocol control blocks.
- *
- * TODO:
- *	hash lookups by protocol family/protocol + address family
- *	take care of unique address problems per AF?
- *	redo address binding to allow wildcards
- */
-
-struct rawcb rawcb;
-static u_long	raw_sendspace = RAWSNDQ;
-static u_long	raw_recvspace = RAWRCVQ;
-
-/*
- * Allocate a control block and a nominal amount
- * of buffer space for the socket.
- */
-int
-raw_attach(so, proto)
-	register struct socket *so;
-	int proto;
-{
-	register struct rawcb *rp = sotorawcb(so);
-	int error;
-
-	/*
-	 * It is assumed that raw_attach is called
-	 * after space has been allocated for the
-	 * rawcb.
-	 */
-	if (rp == 0)
-		return (ENOBUFS);
-	error = soreserve(so, raw_sendspace, raw_recvspace);
-	if (error)
-		return (error);
-	rp->rcb_socket = so;
-	rp->rcb_proto.sp_family = so->so_proto->pr_domain->dom_family;
-	rp->rcb_proto.sp_protocol = proto;
-	insque(rp, &rawcb);
-	return (0);
-}
-
-/*
- * Detach the raw connection block and discard
- * socket resources.
- */
-void
-raw_detach(rp)
-	register struct rawcb *rp;
-{
-	struct socket *so = rp->rcb_socket;
-
-	so->so_pcb = 0;
-	sofree(so);
-	remque(rp);
-#ifdef notdef
-	if (rp->rcb_laddr)
-		m_freem(dtom(rp->rcb_laddr));
-	rp->rcb_laddr = 0;
-#endif
-	free((caddr_t)(rp), M_PCB);
-}
-
-/*
- * Disconnect and possibly release resources.
- */
-void
-raw_disconnect(rp)
-	struct rawcb *rp;
-{
-
-#ifdef notdef
-	if (rp->rcb_faddr)
-		m_freem(dtom(rp->rcb_faddr));
-	rp->rcb_faddr = 0;
-#endif
-	if (rp->rcb_socket->so_state & SS_NOFDREF)
-		raw_detach(rp);
-}
-
-#ifdef notdef
-int
-raw_bind(so, nam)
-	register struct socket *so;
-	struct mbuf *nam;
-{
-	struct sockaddr *addr = mtod(nam, struct sockaddr *);
-	register struct rawcb *rp;
-
-	if (ifnet == 0)
-		return (EADDRNOTAVAIL);
-	rp = sotorawcb(so);
-	nam = m_copym(nam, 0, M_COPYALL, M_WAITOK);
-	rp->rcb_laddr = mtod(nam, struct sockaddr *);
-	return (0);
-}
-#endif
diff --git a/c/src/exec/libnetworking/net/raw_cb.h b/c/src/exec/libnetworking/net/raw_cb.h
deleted file mode 100644
index c1ed5e5e0a..0000000000
--- a/c/src/exec/libnetworking/net/raw_cb.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 1980, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)raw_cb.h	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#ifndef _NET_RAW_CB_H_
-#define _NET_RAW_CB_H_
-
-/*
- * Raw protocol interface control block.  Used
- * to tie a socket to the generic raw interface.
- */
-struct rawcb {
-	struct	rawcb *rcb_next;	/* doubly linked list */
-	struct	rawcb *rcb_prev;
-	struct	socket *rcb_socket;	/* back pointer to socket */
-	struct	sockaddr *rcb_faddr;	/* destination address */
-	struct	sockaddr *rcb_laddr;	/* socket's address */
-	struct	sockproto rcb_proto;	/* protocol family, protocol */
-};
-
-#define	sotorawcb(so)		((struct rawcb *)(so)->so_pcb)
-
-/*
- * Nominal space allocated to a raw socket.
- */
-#define	RAWSNDQ		8192
-#define	RAWRCVQ		8192
-
-#ifdef KERNEL
-extern struct rawcb rawcb;		/* head of list */
-
-int	 raw_attach __P((struct socket *, int));
-void	 raw_ctlinput __P((int, struct sockaddr *, void *));
-void	 raw_detach __P((struct rawcb *));
-void	 raw_disconnect __P((struct rawcb *));
-void	 raw_init __P((void));
-void	 raw_input __P((struct mbuf *,
-	    struct sockproto *, struct sockaddr *, struct sockaddr *));
-int	 raw_usrreq __P((struct socket *,
-	    int, struct mbuf *, struct mbuf *, struct mbuf *));
-#endif
-
-#endif
diff --git a/c/src/exec/libnetworking/net/raw_usrreq.c b/c/src/exec/libnetworking/net/raw_usrreq.c
deleted file mode 100644
index fb4faf4d6d..0000000000
--- a/c/src/exec/libnetworking/net/raw_usrreq.c
+++ /dev/null
@@ -1,315 +0,0 @@
-/*
- * Copyright (c) 1980, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)raw_usrreq.c	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/systm.h>
-#include <sys/mbuf.h>
-#include <sys/domain.h>
-#include <sys/protosw.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/errno.h>
-
-#include <net/if.h>
-#include <net/route.h>
-#include <net/netisr.h>
-#include <net/raw_cb.h>
-
-/*
- * Initialize raw connection block q.
- */
-void
-raw_init()
-{
-
-	rawcb.rcb_next = rawcb.rcb_prev = &rawcb;
-}
-
-
-/*
- * Raw protocol input routine.  Find the socket
- * associated with the packet(s) and move them over.  If
- * nothing exists for this packet, drop it.
- */
-/*
- * Raw protocol interface.
- */
-void
-raw_input(m0, proto, src, dst)
-	struct mbuf *m0;
-	register struct sockproto *proto;
-	struct sockaddr *src, *dst;
-{
-	register struct rawcb *rp;
-	register struct mbuf *m = m0;
-	register int sockets = 0;
-	struct socket *last;
-
-	last = 0;
-	for (rp = rawcb.rcb_next; rp != &rawcb; rp = rp->rcb_next) {
-		if (rp->rcb_proto.sp_family != proto->sp_family)
-			continue;
-		if (rp->rcb_proto.sp_protocol  &&
-		    rp->rcb_proto.sp_protocol != proto->sp_protocol)
-			continue;
-		/*
-		 * We assume the lower level routines have
-		 * placed the address in a canonical format
-		 * suitable for a structure comparison.
-		 *
-		 * Note that if the lengths are not the same
-		 * the comparison will fail at the first byte.
-		 */
-#define	equal(a1, a2) \
-  (bcmp((caddr_t)(a1), (caddr_t)(a2), a1->sa_len) == 0)
-		if (rp->rcb_laddr && !equal(rp->rcb_laddr, dst))
-			continue;
-		if (rp->rcb_faddr && !equal(rp->rcb_faddr, src))
-			continue;
-		if (last) {
-			struct mbuf *n;
-			n = m_copy(m, 0, (int)M_COPYALL);
-			if (n) {
-				if (sbappendaddr(&last->so_rcv, src,
-				    n, (struct mbuf *)0) == 0)
-					/* should notify about lost packet */
-					m_freem(n);
-				else {
-					sorwakeup(last);
-					sockets++;
-				}
-			}
-		}
-		last = rp->rcb_socket;
-	}
-	if (last) {
-		if (sbappendaddr(&last->so_rcv, src,
-		    m, (struct mbuf *)0) == 0)
-			m_freem(m);
-		else {
-			sorwakeup(last);
-			sockets++;
-		}
-	} else
-		m_freem(m);
-}
-
-/*ARGSUSED*/
-void
-raw_ctlinput(cmd, arg, dummy)
-	int cmd;
-	struct sockaddr *arg;
-	void *dummy;
-{
-
-	if (cmd < 0 || cmd > PRC_NCMDS)
-		return;
-	/* INCOMPLETE */
-}
-
-/*ARGSUSED*/
-int
-raw_usrreq(so, req, m, nam, control)
-	struct socket *so;
-	int req;
-	struct mbuf *m, *nam, *control;
-{
-	register struct rawcb *rp = sotorawcb(so);
-	register int error = 0;
-	int len;
-
-	if (req == PRU_CONTROL)
-		return (EOPNOTSUPP);
-	if (control && control->m_len) {
-		error = EOPNOTSUPP;
-		goto release;
-	}
-	if (rp == 0) {
-		error = EINVAL;
-		goto release;
-	}
-	switch (req) {
-
-	/*
-	 * Allocate a raw control block and fill in the
-	 * necessary info to allow packets to be routed to
-	 * the appropriate raw interface routine.
-	 */
-	case PRU_ATTACH:
-		if ((so->so_state & SS_PRIV) == 0) {
-			error = EACCES;
-			break;
-		}
-		error = raw_attach(so, (int)nam);
-		break;
-
-	/*
-	 * Destroy state just before socket deallocation.
-	 * Flush data or not depending on the options.
-	 */
-	case PRU_DETACH:
-		if (rp == 0) {
-			error = ENOTCONN;
-			break;
-		}
-		raw_detach(rp);
-		break;
-
-	/*
-	 * If a socket isn't bound to a single address,
-	 * the raw input routine will hand it anything
-	 * within that protocol family (assuming there's
-	 * nothing else around it should go to).
-	 */
-	case PRU_CONNECT:
-		error = EINVAL;
-#if 0
-		if (rp->rcb_faddr) {
-			error = EISCONN;
-			break;
-		}
-		nam = m_copym(nam, 0, M_COPYALL, M_WAIT);
-		rp->rcb_faddr = mtod(nam, struct sockaddr *);
-		soisconnected(so);
-#endif
-		break;
-
-	case PRU_BIND:
-		error = EINVAL;
-#if 0
-		if (rp->rcb_laddr) {
-			error = EINVAL;			/* XXX */
-			break;
-		}
-		error = raw_bind(so, nam);
-#endif
-		break;
-
-	case PRU_CONNECT2:
-		error = EOPNOTSUPP;
-		goto release;
-
-	case PRU_DISCONNECT:
-		if (rp->rcb_faddr == 0) {
-			error = ENOTCONN;
-			break;
-		}
-		raw_disconnect(rp);
-		soisdisconnected(so);
-		break;
-
-	/*
-	 * Mark the connection as being incapable of further input.
-	 */
-	case PRU_SHUTDOWN:
-		socantsendmore(so);
-		break;
-
-	/*
-	 * Ship a packet out.  The appropriate raw output
-	 * routine handles any massaging necessary.
-	 */
-	case PRU_SEND:
-		if (nam) {
-			if (rp->rcb_faddr) {
-				error = EISCONN;
-				break;
-			}
-			rp->rcb_faddr = mtod(nam, struct sockaddr *);
-		} else if (rp->rcb_faddr == 0) {
-			error = ENOTCONN;
-			break;
-		}
-		error = (*so->so_proto->pr_output)(m, so);
-		m = NULL;
-		if (nam)
-			rp->rcb_faddr = 0;
-		break;
-
-	case PRU_ABORT:
-		raw_disconnect(rp);
-		sofree(so);
-		soisdisconnected(so);
-		break;
-
-	case PRU_SENSE:
-		/*
-		 * stat: don't bother with a blocksize.
-		 */
-		return (0);
-
-	/*
-	 * Not supported.
-	 */
-	case PRU_RCVOOB:
-	case PRU_RCVD:
-		return(EOPNOTSUPP);
-
-	case PRU_LISTEN:
-	case PRU_ACCEPT:
-	case PRU_SENDOOB:
-		error = EOPNOTSUPP;
-		break;
-
-	case PRU_SOCKADDR:
-		if (rp->rcb_laddr == 0) {
-			error = EINVAL;
-			break;
-		}
-		len = rp->rcb_laddr->sa_len;
-		bcopy((caddr_t)rp->rcb_laddr, mtod(nam, caddr_t), (unsigned)len);
-		nam->m_len = len;
-		break;
-
-	case PRU_PEERADDR:
-		if (rp->rcb_faddr == 0) {
-			error = ENOTCONN;
-			break;
-		}
-		len = rp->rcb_faddr->sa_len;
-		bcopy((caddr_t)rp->rcb_faddr, mtod(nam, caddr_t), (unsigned)len);
-		nam->m_len = len;
-		break;
-
-	default:
-		panic("raw_usrreq");
-	}
-release:
-	if (m != NULL)
-		m_freem(m);
-	return (error);
-}
diff --git a/c/src/exec/libnetworking/net/route.c b/c/src/exec/libnetworking/net/route.c
deleted file mode 100644
index 683ddafee9..0000000000
--- a/c/src/exec/libnetworking/net/route.c
+++ /dev/null
@@ -1,959 +0,0 @@
-/*
- * Copyright (c) 1980, 1986, 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)route.c	8.2 (Berkeley) 11/15/93
- *	$Id$
- */
-
-#include "opt_mrouting.h"
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/proc.h>
-#include <sys/mbuf.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/domain.h>
-#include <sys/protosw.h>
-#include <sys/ioctl.h>
-
-#include <net/if.h>
-#include <net/route.h>
-#include <net/raw_cb.h>
-
-#include <netinet/in.h>
-#include <netinet/in_var.h>
-#include <netinet/ip_mroute.h>
-
-#define	SA(p) ((struct sockaddr *)(p))
-
-struct route_cb route_cb;
-static struct rtstat rtstat;
-struct radix_node_head *rt_tables[AF_MAX+1];
-
-static int	rttrash;		/* routes not in table but not freed */
-
-static void rt_maskedcopy __P((struct sockaddr *,
-	    struct sockaddr *, struct sockaddr *));
-static void rtable_init __P((void **));
-
-static void
-rtable_init(table)
-	void **table;
-{
-	struct domain *dom;
-	for (dom = domains; dom; dom = dom->dom_next)
-		if (dom->dom_rtattach)
-			dom->dom_rtattach(&table[dom->dom_family],
-			    dom->dom_rtoffset);
-}
-
-void
-route_init()
-{
-	rn_init();	/* initialize all zeroes, all ones, mask table */
-	rtable_init((void **)rt_tables);
-}
-
-/*
- * Packet routing routines.
- */
-void
-rtalloc(ro)
-	register struct route *ro;
-{
-	if (ro->ro_rt && ro->ro_rt->rt_ifp && (ro->ro_rt->rt_flags & RTF_UP))
-		return;				 /* XXX */
-	ro->ro_rt = rtalloc1(&ro->ro_dst, 1, 0UL);
-}
-
-void
-rtalloc_ign(ro, ignore)
-	register struct route *ro;
-	u_long ignore;
-{
-	if (ro->ro_rt && ro->ro_rt->rt_ifp && (ro->ro_rt->rt_flags & RTF_UP))
-		return;				 /* XXX */
-	ro->ro_rt = rtalloc1(&ro->ro_dst, 1, ignore);
-}
-
-/*
- * Look up the route that matches the address given
- * Or, at least try.. Create a cloned route if needed.
- */
-struct rtentry *
-rtalloc1(dst, report, ignflags)
-	register struct sockaddr *dst;
-	int report;
-	u_long ignflags;
-{
-	register struct radix_node_head *rnh = rt_tables[dst->sa_family];
-	register struct rtentry *rt;
-	register struct radix_node *rn;
-	struct rtentry *newrt = 0;
-	struct rt_addrinfo info;
-	u_long nflags;
-	int  s = splnet(), err = 0, msgtype = RTM_MISS;
-
-	/* 
-	 * Look up the address in the table for that Address Family
-	 */
-	if (rnh && (rn = rnh->rnh_matchaddr((caddr_t)dst, rnh)) &&
-	    ((rn->rn_flags & RNF_ROOT) == 0)) {
-		/*
-		 * If we find it and it's not the root node, then
-		 * get a refernce on the rtentry associated.
-		 */
-		newrt = rt = (struct rtentry *)rn;
-		nflags = rt->rt_flags & ~ignflags;
-		if (report && (nflags & (RTF_CLONING | RTF_PRCLONING))) {
-			/*
-			 * We are apparently adding (report = 0 in delete).
-			 * If it requires that it be cloned, do so.
-			 * (This implies it wasn't a HOST route.)
-			 */
-			err = rtrequest(RTM_RESOLVE, dst, SA(0),
-					      SA(0), 0, &newrt);
-			if (err) {
-				/*
-				 * If the cloning didn't succeed, maybe
-				 * what we have will do. Return that.
-				 */
-				newrt = rt;
-				rt->rt_refcnt++;
-				goto miss;
-			}
-			if ((rt = newrt) && (rt->rt_flags & RTF_XRESOLVE)) {
-				/*
-				 * If the new route specifies it be 
-				 * externally resolved, then go do that.
-				 */
-				msgtype = RTM_RESOLVE;
-				goto miss;
-			}
-		} else
-			rt->rt_refcnt++;
-	} else {
-		/*
-		 * Either we hit the root or couldn't find any match,
-		 * Which basically means
-		 * "caint get there frm here"
-		 */
-		rtstat.rts_unreach++;
-	miss:	if (report) {
-			/*
-			 * If required, report the failure to the supervising
-			 * Authorities.
-			 * For a delete, this is not an error. (report == 0)
-			 */
-			bzero((caddr_t)&info, sizeof(info));
-			info.rti_info[RTAX_DST] = dst;
-			rt_missmsg(msgtype, &info, 0, err);
-		}
-	}
-	splx(s);
-	return (newrt);
-}
-
-void
-rtfree(rt)
-	register struct rtentry *rt;
-{
-	register struct radix_node_head *rnh =
-		rt_tables[rt_key(rt)->sa_family];
-	register struct ifaddr *ifa;
-
-	if (rt == 0 || rnh == 0)
-		panic("rtfree");
-	rt->rt_refcnt--;
-	if(rnh->rnh_close && rt->rt_refcnt == 0) {
-		rnh->rnh_close((struct radix_node *)rt, rnh);
-	}
-	if (rt->rt_refcnt <= 0 && (rt->rt_flags & RTF_UP) == 0) {
-		if (rt->rt_nodes->rn_flags & (RNF_ACTIVE | RNF_ROOT))
-			panic ("rtfree 2");
-		rttrash--;
-		if (rt->rt_refcnt < 0) {
-			printf("rtfree: %p not freed (neg refs)\n", rt);
-			return;
-		}
-		ifa = rt->rt_ifa;
-		IFAFREE(ifa);
-		if (rt->rt_parent) {
-			RTFREE(rt->rt_parent);
-		}
-		Free(rt_key(rt));
-		Free(rt);
-	}
-}
-
-void
-ifafree(ifa)
-	register struct ifaddr *ifa;
-{
-	if (ifa == NULL)
-		panic("ifafree");
-	if (ifa->ifa_refcnt == 0)
-		free(ifa, M_IFADDR);
-	else
-		ifa->ifa_refcnt--;
-}
-
-/*
- * Force a routing table entry to the specified
- * destination to go through the given gateway.
- * Normally called as a result of a routing redirect
- * message from the network layer.
- *
- * N.B.: must be called at splnet
- *
- */
-void
-rtredirect(dst, gateway, netmask, flags, src, rtp)
-	struct sockaddr *dst, *gateway, *netmask, *src;
-	int flags;
-	struct rtentry **rtp;
-{
-	register struct rtentry *rt;
-	int error = 0;
-	short *stat = 0;
-	struct rt_addrinfo info;
-	struct ifaddr *ifa;
-
-	/* verify the gateway is directly reachable */
-	if ((ifa = ifa_ifwithnet(gateway)) == 0) {
-		error = ENETUNREACH;
-		goto out;
-	}
-	rt = rtalloc1(dst, 0, 0UL);
-	/*
-	 * If the redirect isn't from our current router for this dst,
-	 * it's either old or wrong.  If it redirects us to ourselves,
-	 * we have a routing loop, perhaps as a result of an interface
-	 * going down recently.
-	 */
-#define	equal(a1, a2) (bcmp((caddr_t)(a1), (caddr_t)(a2), (a1)->sa_len) == 0)
-	if (!(flags & RTF_DONE) && rt &&
-	     (!equal(src, rt->rt_gateway) || rt->rt_ifa != ifa))
-		error = EINVAL;
-	else if (ifa_ifwithaddr(gateway))
-		error = EHOSTUNREACH;
-	if (error)
-		goto done;
-	/*
-	 * Create a new entry if we just got back a wildcard entry
-	 * or the the lookup failed.  This is necessary for hosts
-	 * which use routing redirects generated by smart gateways
-	 * to dynamically build the routing tables.
-	 */
-	if ((rt == 0) || (rt_mask(rt) && rt_mask(rt)->sa_len < 2))
-		goto create;
-	/*
-	 * Don't listen to the redirect if it's
-	 * for a route to an interface.
-	 */
-	if (rt->rt_flags & RTF_GATEWAY) {
-		if (((rt->rt_flags & RTF_HOST) == 0) && (flags & RTF_HOST)) {
-			/*
-			 * Changing from route to net => route to host.
-			 * Create new route, rather than smashing route to net.
-			 */
-		create:
-			flags |=  RTF_GATEWAY | RTF_DYNAMIC;
-			error = rtrequest((int)RTM_ADD, dst, gateway,
-				    netmask, flags,
-				    (struct rtentry **)0);
-			stat = &rtstat.rts_dynamic;
-		} else {
-			/*
-			 * Smash the current notion of the gateway to
-			 * this destination.  Should check about netmask!!!
-			 */
-			rt->rt_flags |= RTF_MODIFIED;
-			flags |= RTF_MODIFIED;
-			stat = &rtstat.rts_newgateway;
-			rt_setgate(rt, rt_key(rt), gateway);
-		}
-	} else
-		error = EHOSTUNREACH;
-done:
-	if (rt) {
-		if (rtp && !error)
-			*rtp = rt;
-		else
-			rtfree(rt);
-	}
-out:
-	if (error)
-		rtstat.rts_badredirect++;
-	else if (stat != NULL)
-		(*stat)++;
-	bzero((caddr_t)&info, sizeof(info));
-	info.rti_info[RTAX_DST] = dst;
-	info.rti_info[RTAX_GATEWAY] = gateway;
-	info.rti_info[RTAX_NETMASK] = netmask;
-	info.rti_info[RTAX_AUTHOR] = src;
-	rt_missmsg(RTM_REDIRECT, &info, flags, error);
-}
-
-/*
-* Routing table ioctl interface.
-*/
-int
-rtioctl(req, data, p)
-	int req;
-	caddr_t data;
-	struct proc *p;
-{
-#ifdef INET
-	/* Multicast goop, grrr... */
-#ifdef MROUTING
-	return mrt_ioctl(req, data);
-#else
-	return mrt_ioctl(req, data, p);
-#endif
-#else /* INET */
-	return ENXIO;
-#endif /* INET */
-}
-
-struct ifaddr *
-ifa_ifwithroute(flags, dst, gateway)
-	int flags;
-	struct sockaddr	*dst, *gateway;
-{
-	register struct ifaddr *ifa;
-	if ((flags & RTF_GATEWAY) == 0) {
-		/*
-		 * If we are adding a route to an interface,
-		 * and the interface is a pt to pt link
-		 * we should search for the destination
-		 * as our clue to the interface.  Otherwise
-		 * we can use the local address.
-		 */
-		ifa = 0;
-		if (flags & RTF_HOST) {
-			ifa = ifa_ifwithdstaddr(dst);
-		}
-		if (ifa == 0)
-			ifa = ifa_ifwithaddr(gateway);
-	} else {
-		/*
-		 * If we are adding a route to a remote net
-		 * or host, the gateway may still be on the
-		 * other end of a pt to pt link.
-		 */
-		ifa = ifa_ifwithdstaddr(gateway);
-	}
-	if (ifa == 0)
-		ifa = ifa_ifwithnet(gateway);
-	if (ifa == 0) {
-		struct rtentry *rt = rtalloc1(dst, 0, 0UL);
-		if (rt == 0)
-			return (0);
-		rt->rt_refcnt--;
-		if ((ifa = rt->rt_ifa) == 0)
-			return (0);
-	}
-	if (ifa->ifa_addr->sa_family != dst->sa_family) {
-		struct ifaddr *oifa = ifa;
-		ifa = ifaof_ifpforaddr(dst, ifa->ifa_ifp);
-		if (ifa == 0)
-			ifa = oifa;
-	}
-	return (ifa);
-}
-
-#define ROUNDUP(a) (a>0 ? (1 + (((a) - 1) | (sizeof(long) - 1))) : sizeof(long))
-
-static int rt_fixdelete(struct radix_node *, void *);
-static int rt_fixchange(struct radix_node *, void *);
-
-struct rtfc_arg {
-	struct rtentry *rt0;
-	struct radix_node_head *rnh;
-};
-
-/*
- * Do appropriate manipulations of a routing tree given
- * all the bits of info needed
- */
-int
-rtrequest(req, dst, gateway, netmask, flags, ret_nrt)
-	int req, flags;
-	struct sockaddr *dst, *gateway, *netmask;
-	struct rtentry **ret_nrt;
-{
-	int s = splnet(); int error = 0;
-	register struct rtentry *rt;
-	register struct radix_node *rn;
-	register struct radix_node_head *rnh;
-	struct ifaddr *ifa;
-	struct sockaddr *ndst;
-#define senderr(x) { error = x ; goto bad; }
-
-	/*
-	 * Find the correct routing tree to use for this Address Family
-	 */
-	if ((rnh = rt_tables[dst->sa_family]) == 0)
-		senderr(ESRCH);
-	/*
-	 * If we are adding a host route then we don't want to put
-	 * a netmask in the tree
-	 */
-	if (flags & RTF_HOST)
-		netmask = 0;
-	switch (req) {
-	case RTM_DELETE:
-		/*
-		 * Remove the item from the tree and return it.
-		 * Complain if it is not there and do no more processing.
-		 */
-		if ((rn = rnh->rnh_deladdr(dst, netmask, rnh)) == 0)
-			senderr(ESRCH);
-		if (rn->rn_flags & (RNF_ACTIVE | RNF_ROOT))
-			panic ("rtrequest delete");
-		rt = (struct rtentry *)rn;
-
-		/*
-		 * Now search what's left of the subtree for any cloned
-		 * routes which might have been formed from this node.
-		 */
-		if ((rt->rt_flags & RTF_PRCLONING) && netmask) {
-			rnh->rnh_walktree_from(rnh, dst, netmask,
-					       rt_fixdelete, rt);
-		}
-
-		/*
-		 * Remove any external references we may have.
-		 * This might result in another rtentry being freed if
-		 * we held it's last reference.
-		 */
-		if (rt->rt_gwroute) {
-			rt = rt->rt_gwroute;
-			RTFREE(rt);
-			(rt = (struct rtentry *)rn)->rt_gwroute = 0;
-		}
-
-		/*
-		 * NB: RTF_UP must be set during the search above,
-		 * because we might delete the last ref, causing
-		 * rt to get freed prematurely.
-		 */
-		rt->rt_flags &= ~RTF_UP;
-
-		/* 
-		 * If there is llinfo or similar associated with the 
-		 * route, give the interface a chance to deal with it..
-		 */
-		if ((ifa = rt->rt_ifa) && ifa->ifa_rtrequest)
-			ifa->ifa_rtrequest(RTM_DELETE, rt, SA(0));
-		rttrash++;
-		/*
-		 * If the caller wants it, then it can have it, but it's up to it
-		 * to free the rtentry as we won't be doing it.
-		 */
-		if (ret_nrt)
-			*ret_nrt = rt;
-		else if (rt->rt_refcnt <= 0) {
-			rt->rt_refcnt++; /* make a 1->0 transition */
-			rtfree(rt);
-		}
-		break;
-
-	case RTM_RESOLVE:
-		if (ret_nrt == 0 || (rt = *ret_nrt) == 0)
-			senderr(EINVAL);
-		ifa = rt->rt_ifa;
-		flags = rt->rt_flags &
-		    ~(RTF_CLONING | RTF_PRCLONING | RTF_STATIC);
-		flags |= RTF_WASCLONED;
-		gateway = rt->rt_gateway;
-		if ((netmask = rt->rt_genmask) == 0)
-			flags |= RTF_HOST;
-		goto makeroute;
-
-	case RTM_ADD:
-		if ((flags & RTF_GATEWAY) && !gateway)
-			panic("rtrequest: GATEWAY but no gateway");
-
-		if ((ifa = ifa_ifwithroute(flags, dst, gateway)) == 0)
-			senderr(ENETUNREACH);
-
-	makeroute:
-		R_Malloc(rt, struct rtentry *, sizeof(*rt));
-		if (rt == 0)
-			senderr(ENOBUFS);
-		Bzero(rt, sizeof(*rt));
-		rt->rt_flags = RTF_UP | flags;
-		if ((error = rt_setgate(rt, dst, gateway))) {
-			Free(rt);
-			senderr(error);
-		}
-		ndst = rt_key(rt);
-		if (netmask) {
-			rt_maskedcopy(dst, ndst, netmask);
-		} else
-			Bcopy(dst, ndst, dst->sa_len);
-
-		/*
-		 * This moved from below so that rnh->rnh_addaddr() can
-		 * examine the ifa and ifp if it so desires.
-		 */
-		ifa->ifa_refcnt++;
-		rt->rt_ifa = ifa;
-		rt->rt_ifp = ifa->ifa_ifp;
-
-		rn = rnh->rnh_addaddr((caddr_t)ndst, (caddr_t)netmask,
-					rnh, rt->rt_nodes);
-		if (rn == 0) {
-			struct rtentry *rt2;
-			/*
-			 * Uh-oh, we already have one of these in the tree.
-			 * We do a special hack: if the route that's already
-			 * there was generated by the protocol-cloning
-			 * mechanism, then we just blow it away and retry
-			 * the insertion of the new one.
-			 */
-			rt2 = rtalloc1(dst, 0, RTF_PRCLONING);
-			if (rt2 && rt2->rt_parent) {
-				rtrequest(RTM_DELETE, 
-					  (struct sockaddr *)rt_key(rt2),
-					  rt2->rt_gateway,
-					  rt_mask(rt2), rt2->rt_flags, 0);
-				RTFREE(rt2);
-				rn = rnh->rnh_addaddr((caddr_t)ndst,
-						      (caddr_t)netmask,
-						      rnh, rt->rt_nodes);
-			} else if (rt2) {
-				RTFREE(rt2);
-			}
-		}
-
-		if (rn == 0) {
-			if (rt->rt_gwroute)
-				rtfree(rt->rt_gwroute);
-			if (rt->rt_ifa) {
-				IFAFREE(rt->rt_ifa);
-			}
-			Free(rt_key(rt));
-			Free(rt);
-			senderr(EEXIST);
-		}
-		rt->rt_parent = 0;
-
-		if (req == RTM_RESOLVE) {
-			rt->rt_rmx = (*ret_nrt)->rt_rmx; /* copy metrics */
-			if ((*ret_nrt)->rt_flags & RTF_PRCLONING) {
-				rt->rt_parent = (*ret_nrt);
-				(*ret_nrt)->rt_refcnt++;
-			}
-		}
-		if (ifa->ifa_rtrequest)
-			ifa->ifa_rtrequest(req, rt, SA(ret_nrt ? *ret_nrt : 0));
-		/*
-		 * We repeat the same procedure from rt_setgate() here because
-		 * it doesn't fire when we call it there because the node
-		 * hasn't been added to the tree yet.
-		 */
-		if (!(rt->rt_flags & RTF_HOST) && rt_mask(rt) != 0) {
-			struct rtfc_arg arg;
-			arg.rnh = rnh;
-			arg.rt0 = rt;
-			rnh->rnh_walktree_from(rnh, rt_key(rt), rt_mask(rt),
-					       rt_fixchange, &arg);
-		}
-
-		if (ret_nrt) {
-			*ret_nrt = rt;
-			rt->rt_refcnt++;
-		}
-		break;
-	}
-bad:
-	splx(s);
-	return (error);
-}
-
-/*
- * Called from rtrequest(RTM_DELETE, ...) to fix up the route's ``family''
- * (i.e., the routes related to it by the operation of cloning).  This
- * routine is iterated over all potential former-child-routes by way of
- * rnh->rnh_walktree_from() above, and those that actually are children of
- * the late parent (passed in as VP here) are themselves deleted.
- */
-static int
-rt_fixdelete(struct radix_node *rn, void *vp)
-{
-	struct rtentry *rt = (struct rtentry *)rn;
-	struct rtentry *rt0 = vp;
-
-	if (rt->rt_parent == rt0 && !(rt->rt_flags & RTF_PINNED)) {
-		return rtrequest(RTM_DELETE, rt_key(rt),
-				 (struct sockaddr *)0, rt_mask(rt),
-				 rt->rt_flags, (struct rtentry **)0);
-	}
-	return 0;
-}
-
-/*
- * This routine is called from rt_setgate() to do the analogous thing for
- * adds and changes.  There is the added complication in this case of a
- * middle insert; i.e., insertion of a new network route between an older
- * network route and (cloned) host routes.  For this reason, a simple check
- * of rt->rt_parent is insufficient; each candidate route must be tested
- * against the (mask, value) of the new route (passed as before in vp)
- * to see if the new route matches it.  Unfortunately, this has the obnoxious
- * property of also triggering for insertion /above/ a pre-existing network
- * route and clones.  Sigh.  This may be fixed some day.
- *
- * XXX - it may be possible to do fixdelete() for changes and reserve this
- * routine just for adds.  I'm not sure why I thought it was necessary to do
- * changes this way.
- */
-#ifdef DEBUG
-int rtfcdebug = 0;
-#endif
-
-static int
-rt_fixchange(struct radix_node *rn, void *vp)
-{
-	struct rtentry *rt = (struct rtentry *)rn;
-	struct rtfc_arg *ap = vp;
-	struct rtentry *rt0 = ap->rt0;
-	struct radix_node_head *rnh = ap->rnh;
-	u_char *xk1, *xm1, *xk2;
-	int i, len;
-
-#ifdef DEBUG
-	if (rtfcdebug)
-		printf("rt_fixchange: rt %p, rt0 %p\n", rt, rt0);
-#endif
-
-	if (!rt->rt_parent || (rt->rt_flags & RTF_PINNED)) {
-#ifdef DEBUG
-		if(rtfcdebug) printf("no parent or pinned\n");
-#endif
-		return 0;
-	}
-
-	if (rt->rt_parent == rt0) {
-#ifdef DEBUG
-		if(rtfcdebug) printf("parent match\n");
-#endif
-		return rtrequest(RTM_DELETE, rt_key(rt),
-				 (struct sockaddr *)0, rt_mask(rt),
-				 rt->rt_flags, (struct rtentry **)0);
-	}
-
-	/*
-	 * There probably is a function somewhere which does this...
-	 * if not, there should be.
-	 */
-	len = imin(((struct sockaddr *)rt_key(rt0))->sa_len,
-		   ((struct sockaddr *)rt_key(rt))->sa_len);
-
-	xk1 = (u_char *)rt_key(rt0);
-	xm1 = (u_char *)rt_mask(rt0);
-	xk2 = (u_char *)rt_key(rt);
-
-	for (i = rnh->rnh_treetop->rn_off; i < len; i++) {
-		if ((xk2[i] & xm1[i]) != xk1[i]) {
-#ifdef DEBUG
-			if(rtfcdebug) printf("no match\n");
-#endif
-			return 0;
-		}
-	}
-
-	/*
-	 * OK, this node is a clone, and matches the node currently being
-	 * changed/added under the node's mask.  So, get rid of it.
-	 */
-#ifdef DEBUG
-	if(rtfcdebug) printf("deleting\n");
-#endif
-	return rtrequest(RTM_DELETE, rt_key(rt), (struct sockaddr *)0,
-			 rt_mask(rt), rt->rt_flags, (struct rtentry **)0);
-}
-
-int
-rt_setgate(rt0, dst, gate)
-	struct rtentry *rt0;
-	struct sockaddr *dst, *gate;
-{
-	caddr_t new, old;
-	int dlen = ROUNDUP(dst->sa_len), glen = ROUNDUP(gate->sa_len);
-	register struct rtentry *rt = rt0;
-	struct radix_node_head *rnh = rt_tables[dst->sa_family];
-
-	/*
-	 * A host route with the destination equal to the gateway
-	 * will interfere with keeping LLINFO in the routing
-	 * table, so disallow it.
-	 */
-	if (((rt0->rt_flags & (RTF_HOST|RTF_GATEWAY|RTF_LLINFO)) ==
-					(RTF_HOST|RTF_GATEWAY)) &&
-	    (dst->sa_len == gate->sa_len) &&
-	    (bcmp(dst, gate, dst->sa_len) == 0)) {
-		/*
-		 * The route might already exist if this is an RTM_CHANGE
-		 * or a routing redirect, so try to delete it.
-		 */
-		if (rt_key(rt0))
-			rtrequest(RTM_DELETE, (struct sockaddr *)rt_key(rt0),
-			    rt0->rt_gateway, rt_mask(rt0), rt0->rt_flags, 0);
-		return EADDRNOTAVAIL;
-	}
-
-	if (rt->rt_gateway == 0 || glen > ROUNDUP(rt->rt_gateway->sa_len)) {
-		old = (caddr_t)rt_key(rt);
-		R_Malloc(new, caddr_t, dlen + glen);
-		if (new == 0)
-			return ENOBUFS;
-		rt->rt_nodes->rn_key = new;
-	} else {
-		new = rt->rt_nodes->rn_key;
-		old = 0;
-	}
-	Bcopy(gate, (rt->rt_gateway = (struct sockaddr *)(new + dlen)), glen);
-	if (old) {
-		Bcopy(dst, new, dlen);
-		Free(old);
-	}
-	if (rt->rt_gwroute) {
-		rt = rt->rt_gwroute; RTFREE(rt);
-		rt = rt0; rt->rt_gwroute = 0;
-	}
-	/*
-	 * Cloning loop avoidance:
-	 * In the presence of protocol-cloning and bad configuration,
-	 * it is possible to get stuck in bottomless mutual recursion
-	 * (rtrequest rt_setgate rtalloc1).  We avoid this by not allowing
-	 * protocol-cloning to operate for gateways (which is probably the
-	 * correct choice anyway), and avoid the resulting reference loops
-	 * by disallowing any route to run through itself as a gateway.
-	 * This is obviuosly mandatory when we get rt->rt_output().
-	 */
-	if (rt->rt_flags & RTF_GATEWAY) {
-		rt->rt_gwroute = rtalloc1(gate, 1, RTF_PRCLONING);
-		if (rt->rt_gwroute == rt) {
-			RTFREE(rt->rt_gwroute);
-			rt->rt_gwroute = 0;
-			return EDQUOT; /* failure */
-		}
-	}
-
-	/*
-	 * This isn't going to do anything useful for host routes, so
-	 * don't bother.  Also make sure we have a reasonable mask
-	 * (we don't yet have one during adds).
-	 */
-	if (!(rt->rt_flags & RTF_HOST) && rt_mask(rt) != 0) {
-		struct rtfc_arg arg;
-		arg.rnh = rnh;
-		arg.rt0 = rt;
-		rnh->rnh_walktree_from(rnh, rt_key(rt), rt_mask(rt),
-				       rt_fixchange, &arg);
-	}
-
-	return 0;
-}
-
-static void
-rt_maskedcopy(src, dst, netmask)
-	struct sockaddr *src, *dst, *netmask;
-{
-	register u_char *cp1 = (u_char *)src;
-	register u_char *cp2 = (u_char *)dst;
-	register u_char *cp3 = (u_char *)netmask;
-	u_char *cplim = cp2 + *cp3;
-	u_char *cplim2 = cp2 + *cp1;
-
-	*cp2++ = *cp1++; *cp2++ = *cp1++; /* copies sa_len & sa_family */
-	cp3 += 2;
-	if (cplim > cplim2)
-		cplim = cplim2;
-	while (cp2 < cplim)
-		*cp2++ = *cp1++ & *cp3++;
-	if (cp2 < cplim2)
-		bzero((caddr_t)cp2, (unsigned)(cplim2 - cp2));
-}
-
-/*
- * Set up a routing table entry, normally
- * for an interface.
- */
-int
-rtinit(ifa, cmd, flags)
-	register struct ifaddr *ifa;
-	int cmd, flags;
-{
-	register struct rtentry *rt;
-	register struct sockaddr *dst;
-	register struct sockaddr *deldst;
-	struct mbuf *m = 0;
-	struct rtentry *nrt = 0;
-	int error;
-
-	dst = flags & RTF_HOST ? ifa->ifa_dstaddr : ifa->ifa_addr;
-	/*
-	 * If it's a delete, check that if it exists, it's on the correct
-	 * interface or we might scrub a route to another ifa which would
-	 * be confusing at best and possibly worse.
-	 */
-	if (cmd == RTM_DELETE) {
-		/* 
-		 * It's a delete, so it should already exist..
-		 * If it's a net, mask off the host bits
-		 * (Assuming we have a mask)
-		 */
-		if ((flags & RTF_HOST) == 0 && ifa->ifa_netmask) {
-			m = m_get(M_WAIT, MT_SONAME);
-			deldst = mtod(m, struct sockaddr *);
-			rt_maskedcopy(dst, deldst, ifa->ifa_netmask);
-			dst = deldst;
-		}
-		/*
-		 * Get an rtentry that is in the routing tree and
-		 * contains the correct info. (if this fails we can't get there).
-		 * We set "report" to FALSE so that if it doesn't exist,
-		 * it doesn't report an error or clone a route, etc. etc.
-		 */
-		rt = rtalloc1(dst, 0, 0UL);
-		if (rt) {
-			/*
-			 * Ok so we found the rtentry. it has an extra reference
-			 * for us at this stage. we won't need that so
-			 * lop that off now.
-			 */
-			rt->rt_refcnt--;
-			if (rt->rt_ifa != ifa) {
-				/*
-				 * If the interface in the rtentry doesn't match
-				 * the interface we are using, then we don't
-				 * want to delete it, so return an error.
-				 * This seems to be the only point of 
-				 * this whole RTM_DELETE clause.
-				 */
-				if (m)
-					(void) m_free(m);
-				return (flags & RTF_HOST ? EHOSTUNREACH
-							: ENETUNREACH);
-			}
-		}
-		/* XXX */
-#if 0
-		else {
-			/* 
-			 * One would think that as we are deleting, and we know
-			 * it doesn't exist, we could just return at this point
-			 * with an "ELSE" clause, but apparently not..
-			 */
-			return (flags & RTF_HOST ? EHOSTUNREACH
-							: ENETUNREACH);
-		}
-#endif
-	}
-	/*
-	 * Do the actual request
-	 */
-	error = rtrequest(cmd, dst, ifa->ifa_addr, ifa->ifa_netmask,
-			flags | ifa->ifa_flags, &nrt);
-	if (m)
-		(void) m_free(m);
-	/*
-	 * If we are deleting, and we found an entry, then
-	 * it's been removed from the tree.. now throw it away.
-	 */
-	if (cmd == RTM_DELETE && error == 0 && (rt = nrt)) {
-		/*
-		 * notify any listenning routing agents of the change
-		 */
-		rt_newaddrmsg(cmd, ifa, error, nrt);
-		if (rt->rt_refcnt <= 0) {
-			rt->rt_refcnt++; /* need a 1->0 transition to free */
-			rtfree(rt);
-		}
-	}
-
-	/*
-	 * We are adding, and we have a returned routing entry.
-	 * We need to sanity check the result.
-	 */
-	if (cmd == RTM_ADD && error == 0 && (rt = nrt)) {
-		/*
-		 * We just wanted to add it.. we don't actually need a reference
-		 */
-		rt->rt_refcnt--;
-		/*
-		 * If it came back with an unexpected interface, then it must 
-		 * have already existed or something. (XXX)
-		 */
-		if (rt->rt_ifa != ifa) {
-			printf("rtinit: wrong ifa (%p) was (%p)\n", ifa,
-				rt->rt_ifa);
-			/*
-			 * Ask that the route we got back be removed
-			 * from the routing tables as we are trying
-			 * to supersede it.
-			 */
-			if (rt->rt_ifa->ifa_rtrequest)
-			    rt->rt_ifa->ifa_rtrequest(RTM_DELETE, rt, SA(0));
-			/* 
-			 * Remove the referenve to the it's ifaddr.
-			 */
-			IFAFREE(rt->rt_ifa);
-			/*
-			 * And substitute in references to the ifaddr
-			 * we are adding.
-			 */
-			rt->rt_ifa = ifa;
-			rt->rt_ifp = ifa->ifa_ifp;
-			ifa->ifa_refcnt++;
-			/*
-			 * Now add it to the routing table
-			 * XXX could we have just left it?
-			 * as it might have been in the right place..
-			 */
-			if (ifa->ifa_rtrequest)
-			    ifa->ifa_rtrequest(RTM_ADD, rt, SA(0));
-		}
-		/*
-		 * notify any listenning routing agents of the change
-		 */
-		rt_newaddrmsg(cmd, ifa, error, nrt);
-	}
-	return (error);
-}
diff --git a/c/src/exec/libnetworking/net/route.h b/c/src/exec/libnetworking/net/route.h
deleted file mode 100644
index 69d76909fc..0000000000
--- a/c/src/exec/libnetworking/net/route.h
+++ /dev/null
@@ -1,284 +0,0 @@
-/*
- * Copyright (c) 1980, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)route.h	8.3 (Berkeley) 4/19/94
- * $Id$
- */
-
-#ifndef _NET_ROUTE_H_
-#define _NET_ROUTE_H_
-
-/*
- * Kernel resident routing tables.
- *
- * The routing tables are initialized when interface addresses
- * are set by making entries for all directly connected interfaces.
- */
-
-/*
- * A route consists of a destination address and a reference
- * to a routing entry.  These are often held by protocols
- * in their control blocks, e.g. inpcb.
- */
-struct route {
-	struct	rtentry *ro_rt;
-	struct	sockaddr ro_dst;
-};
-
-/*
- * These numbers are used by reliable protocols for determining
- * retransmission behavior and are included in the routing structure.
- */
-struct rt_metrics {
-	u_long	rmx_locks;	/* Kernel must leave these values alone */
-	u_long	rmx_mtu;	/* MTU for this path */
-	u_long	rmx_hopcount;	/* max hops expected */
-	u_long	rmx_expire;	/* lifetime for route, e.g. redirect */
-	u_long	rmx_recvpipe;	/* inbound delay-bandwidth product */
-	u_long	rmx_sendpipe;	/* outbound delay-bandwidth product */
-	u_long	rmx_ssthresh;	/* outbound gateway buffer limit */
-	u_long	rmx_rtt;	/* estimated round trip time */
-	u_long	rmx_rttvar;	/* estimated rtt variance */
-	u_long	rmx_pksent;	/* packets sent using this route */
-	u_long	rmx_filler[4];	/* will be used for T/TCP later */
-};
-
-/*
- * rmx_rtt and rmx_rttvar are stored as microseconds;
- * RTTTOPRHZ(rtt) converts to a value suitable for use
- * by a protocol slowtimo counter.
- */
-#define	RTM_RTTUNIT	1000000	/* units for rtt, rttvar, as units per sec */
-#define	RTTTOPRHZ(r)	((r) / (RTM_RTTUNIT / PR_SLOWHZ))
-
-/*
- * XXX kernel function pointer `rt_output' is visible to applications.
- */
-struct mbuf;
-
-/*
- * We distinguish between routes to hosts and routes to networks,
- * preferring the former if available.  For each route we infer
- * the interface to use from the gateway address supplied when
- * the route was entered.  Routes that forward packets through
- * gateways are marked so that the output routines know to address the
- * gateway rather than the ultimate destination.
- */
-#ifndef RNF_NORMAL
-#include <net/radix.h>
-#endif
-struct rtentry {
-	struct	radix_node rt_nodes[2];	/* tree glue, and other values */
-#define	rt_key(r)	((struct sockaddr *)((r)->rt_nodes->rn_key))
-#define	rt_mask(r)	((struct sockaddr *)((r)->rt_nodes->rn_mask))
-	struct	sockaddr *rt_gateway;	/* value */
-	short	rt_filler;		/* was short flags field */
-	short	rt_refcnt;		/* # held references */
-	u_long	rt_flags;		/* up/down?, host/net */
-	struct	ifnet *rt_ifp;		/* the answer: interface to use */
-	struct	ifaddr *rt_ifa;		/* the answer: interface to use */
-	struct	sockaddr *rt_genmask;	/* for generation of cloned routes */
-	caddr_t	rt_llinfo;		/* pointer to link level info cache */
-	struct	rt_metrics rt_rmx;	/* metrics used by rx'ing protocols */
-	struct	rtentry *rt_gwroute;	/* implied entry for gatewayed routes */
-	int	(*rt_output) __P((struct ifnet *, struct mbuf *,
-				  struct sockaddr *, struct rtentry *));
-					/* output routine for this (rt,if) */
-	struct	rtentry *rt_parent; 	/* cloning parent of this route */
-	void	*rt_filler2;		/* more filler */
-};
-
-/*
- * Following structure necessary for 4.3 compatibility;
- * We should eventually move it to a compat file.
- */
-struct ortentry {
-	u_long	rt_hash;		/* to speed lookups */
-	struct	sockaddr rt_dst;	/* key */
-	struct	sockaddr rt_gateway;	/* value */
-	short	rt_flags;		/* up/down?, host/net */
-	short	rt_refcnt;		/* # held references */
-	u_long	rt_use;			/* raw # packets forwarded */
-	struct	ifnet *rt_ifp;		/* the answer: interface to use */
-};
-
-#define rt_use rt_rmx.rmx_pksent
-
-#define	RTF_UP		0x1		/* route usable */
-#define	RTF_GATEWAY	0x2		/* destination is a gateway */
-#define	RTF_HOST	0x4		/* host entry (net otherwise) */
-#define	RTF_REJECT	0x8		/* host or net unreachable */
-#define	RTF_DYNAMIC	0x10		/* created dynamically (by redirect) */
-#define	RTF_MODIFIED	0x20		/* modified dynamically (by redirect) */
-#define RTF_DONE	0x40		/* message confirmed */
-/*			0x80		   unused */
-#define RTF_CLONING	0x100		/* generate new routes on use */
-#define RTF_XRESOLVE	0x200		/* external daemon resolves name */
-#define RTF_LLINFO	0x400		/* generated by link layer (e.g. ARP) */
-#define RTF_STATIC	0x800		/* manually added */
-#define RTF_BLACKHOLE	0x1000		/* just discard pkts (during updates) */
-#define RTF_PROTO2	0x4000		/* protocol specific routing flag */
-#define RTF_PROTO1	0x8000		/* protocol specific routing flag */
-
-#define RTF_PRCLONING	0x10000		/* protocol requires cloning */
-#define RTF_WASCLONED	0x20000		/* route generated through cloning */
-#define RTF_PROTO3	0x40000		/* protocol specific routing flag */
-/*			0x80000		   unused */
-#define RTF_PINNED	0x100000	/* future use */
-#define	RTF_LOCAL	0x200000 	/* route represents a local address */
-#define	RTF_BROADCAST	0x400000	/* route represents a bcast address */
-#define	RTF_MULTICAST	0x800000	/* route represents a mcast address */
-					/* 0x1000000 and up unassigned */
-
-/*
- * Routing statistics.
- */
-struct	rtstat {
-	short	rts_badredirect;	/* bogus redirect calls */
-	short	rts_dynamic;		/* routes created by redirects */
-	short	rts_newgateway;		/* routes modified by redirects */
-	short	rts_unreach;		/* lookups which failed */
-	short	rts_wildcard;		/* lookups satisfied by a wildcard */
-};
-/*
- * Structures for routing messages.
- */
-struct rt_msghdr {
-	u_short	rtm_msglen;	/* to skip over non-understood messages */
-	u_char	rtm_version;	/* future binary compatibility */
-	u_char	rtm_type;	/* message type */
-	u_short	rtm_index;	/* index for associated ifp */
-	int	rtm_flags;	/* flags, incl. kern & message, e.g. DONE */
-	int	rtm_addrs;	/* bitmask identifying sockaddrs in msg */
-	pid_t	rtm_pid;	/* identify sender */
-	int	rtm_seq;	/* for sender to identify action */
-	int	rtm_errno;	/* why failed */
-	int	rtm_use;	/* from rtentry */
-	u_long	rtm_inits;	/* which metrics we are initializing */
-	struct	rt_metrics rtm_rmx; /* metrics themselves */
-};
-
-#define RTM_VERSION	5	/* Up the ante and ignore older versions */
-
-#define RTM_ADD		0x1	/* Add Route */
-#define RTM_DELETE	0x2	/* Delete Route */
-#define RTM_CHANGE	0x3	/* Change Metrics or flags */
-#define RTM_GET		0x4	/* Report Metrics */
-#define RTM_LOSING	0x5	/* Kernel Suspects Partitioning */
-#define RTM_REDIRECT	0x6	/* Told to use different route */
-#define RTM_MISS	0x7	/* Lookup failed on this address */
-#define RTM_LOCK	0x8	/* fix specified metrics */
-#define RTM_OLDADD	0x9	/* caused by SIOCADDRT */
-#define RTM_OLDDEL	0xa	/* caused by SIOCDELRT */
-#define RTM_RESOLVE	0xb	/* req to resolve dst to LL addr */
-#define RTM_NEWADDR	0xc	/* address being added to iface */
-#define RTM_DELADDR	0xd	/* address being removed from iface */
-#define RTM_IFINFO	0xe	/* iface going up/down etc. */
-
-#define RTV_MTU		0x1	/* init or lock _mtu */
-#define RTV_HOPCOUNT	0x2	/* init or lock _hopcount */
-#define RTV_EXPIRE	0x4	/* init or lock _hopcount */
-#define RTV_RPIPE	0x8	/* init or lock _recvpipe */
-#define RTV_SPIPE	0x10	/* init or lock _sendpipe */
-#define RTV_SSTHRESH	0x20	/* init or lock _ssthresh */
-#define RTV_RTT		0x40	/* init or lock _rtt */
-#define RTV_RTTVAR	0x80	/* init or lock _rttvar */
-
-/*
- * Bitmask values for rtm_addr.
- */
-#define RTA_DST		0x1	/* destination sockaddr present */
-#define RTA_GATEWAY	0x2	/* gateway sockaddr present */
-#define RTA_NETMASK	0x4	/* netmask sockaddr present */
-#define RTA_GENMASK	0x8	/* cloning mask sockaddr present */
-#define RTA_IFP		0x10	/* interface name sockaddr present */
-#define RTA_IFA		0x20	/* interface addr sockaddr present */
-#define RTA_AUTHOR	0x40	/* sockaddr for author of redirect */
-#define RTA_BRD		0x80	/* for NEWADDR, broadcast or p-p dest addr */
-
-/*
- * Index offsets for sockaddr array for alternate internal encoding.
- */
-#define RTAX_DST	0	/* destination sockaddr present */
-#define RTAX_GATEWAY	1	/* gateway sockaddr present */
-#define RTAX_NETMASK	2	/* netmask sockaddr present */
-#define RTAX_GENMASK	3	/* cloning mask sockaddr present */
-#define RTAX_IFP	4	/* interface name sockaddr present */
-#define RTAX_IFA	5	/* interface addr sockaddr present */
-#define RTAX_AUTHOR	6	/* sockaddr for author of redirect */
-#define RTAX_BRD	7	/* for NEWADDR, broadcast or p-p dest addr */
-#define RTAX_MAX	8	/* size of array to allocate */
-
-struct rt_addrinfo {
-	int	rti_addrs;
-	struct	sockaddr *rti_info[RTAX_MAX];
-};
-
-struct route_cb {
-	int	ip_count;
-	int	ipx_count;
-	int	ns_count;
-	int	iso_count;
-	int	any_count;
-};
-
-#ifdef KERNEL
-#define	RTFREE(rt) \
-	if ((rt)->rt_refcnt <= 1) \
-		rtfree(rt); \
-	else \
-		(rt)->rt_refcnt--;
-
-extern struct route_cb route_cb;
-extern struct rtstat rtstat;
-extern struct radix_node_head *rt_tables[AF_MAX+1];
-
-void	 route_init __P((void));
-void	 rt_ifmsg __P((struct ifnet *));
-void	 rt_missmsg __P((int, struct rt_addrinfo *, int, int));
-void	 rt_newaddrmsg __P((int, struct ifaddr *, int, struct rtentry *));
-int	 rt_setgate __P((struct rtentry *,
-	    struct sockaddr *, struct sockaddr *));
-void	 rtalloc __P((struct route *));
-void	 rtalloc_ign __P((struct route *, unsigned long));
-struct rtentry *
-	 rtalloc1 __P((struct sockaddr *, int, unsigned long));
-void	 rtfree __P((struct rtentry *));
-int	 rtinit __P((struct ifaddr *, int, int));
-int	 rtioctl __P((int, caddr_t, struct proc *));
-void	 rtredirect __P((struct sockaddr *, struct sockaddr *,
-	    struct sockaddr *, int, struct sockaddr *, struct rtentry **));
-int	 rtrequest __P((int, struct sockaddr *,
-	    struct sockaddr *, struct sockaddr *, int, struct rtentry **));
-#endif
-
-#endif
diff --git a/c/src/exec/libnetworking/net/rtsock.c b/c/src/exec/libnetworking/net/rtsock.c
deleted file mode 100644
index 57e777906a..0000000000
--- a/c/src/exec/libnetworking/net/rtsock.c
+++ /dev/null
@@ -1,829 +0,0 @@
-/*
- * Copyright (c) 1988, 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)rtsock.c	8.5 (Berkeley) 11/2/94
- *	$Id$
- */
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/sysctl.h>
-#include <sys/proc.h>
-#include <sys/mbuf.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/domain.h>
-#include <sys/protosw.h>
-
-#include <net/if.h>
-#include <net/route.h>
-#include <net/raw_cb.h>
-
-static struct	sockaddr route_dst = { 2, PF_ROUTE, };
-static struct	sockaddr route_src = { 2, PF_ROUTE, };
-static struct	sockaddr sa_zero   = { sizeof(sa_zero), AF_INET, };
-static struct	sockproto route_proto = { PF_ROUTE, };
-
-struct walkarg {
-	int	w_tmemsize;
-	int	w_op, w_arg;
-	caddr_t	w_tmem;
-	struct sysctl_req *w_req;
-};
-
-static struct mbuf *
-		rt_msg1 __P((int, struct rt_addrinfo *));
-static int	rt_msg2 __P((int,
-		    struct rt_addrinfo *, caddr_t, struct walkarg *));
-static int	rt_xaddrs __P((caddr_t, caddr_t, struct rt_addrinfo *));
-static int	sysctl_dumpentry __P((struct radix_node *rn, void *vw));
-static int	sysctl_iflist __P((int af, struct walkarg *w));
-static int	 route_output __P((struct mbuf *, struct socket *));
-static int	 route_usrreq __P((struct socket *,
-	    int, struct mbuf *, struct mbuf *, struct mbuf *));
-static void	 rt_setmetrics __P((u_long, struct rt_metrics *, struct rt_metrics *));
-
-/* Sleazy use of local variables throughout file, warning!!!! */
-#define dst	info.rti_info[RTAX_DST]
-#define gate	info.rti_info[RTAX_GATEWAY]
-#define netmask	info.rti_info[RTAX_NETMASK]
-#define genmask	info.rti_info[RTAX_GENMASK]
-#define ifpaddr	info.rti_info[RTAX_IFP]
-#define ifaaddr	info.rti_info[RTAX_IFA]
-#define brdaddr	info.rti_info[RTAX_BRD]
-
-/*ARGSUSED*/
-static int
-route_usrreq(so, req, m, nam, control)
-	register struct socket *so;
-	int req;
-	struct mbuf *m, *nam, *control;
-{
-	register int error = 0;
-	register struct rawcb *rp = sotorawcb(so);
-	int s;
-
-	if (req == PRU_ATTACH) {
-		MALLOC(rp, struct rawcb *, sizeof(*rp), M_PCB, M_WAITOK);
-		so->so_pcb = (caddr_t)rp;
-		if (so->so_pcb)
-			bzero(so->so_pcb, sizeof(*rp));
-	}
-	if (req == PRU_DETACH && rp) {
-		int af = rp->rcb_proto.sp_protocol;
-		if (af == AF_INET)
-			route_cb.ip_count--;
-		else if (af == AF_IPX)
-			route_cb.ipx_count--;
-		else if (af == AF_NS)
-			route_cb.ns_count--;
-		else if (af == AF_ISO)
-			route_cb.iso_count--;
-		route_cb.any_count--;
-	}
-	s = splnet();
-	error = raw_usrreq(so, req, m, nam, control);
-	rp = sotorawcb(so);
-	if (req == PRU_ATTACH && rp) {
-		int af = rp->rcb_proto.sp_protocol;
-		if (error) {
-			free((caddr_t)rp, M_PCB);
-			splx(s);
-			return (error);
-		}
-		if (af == AF_INET)
-			route_cb.ip_count++;
-		else if (af == AF_IPX)
-			route_cb.ipx_count++;
-		else if (af == AF_NS)
-			route_cb.ns_count++;
-		else if (af == AF_ISO)
-			route_cb.iso_count++;
-		rp->rcb_faddr = &route_src;
-		route_cb.any_count++;
-		soisconnected(so);
-		so->so_options |= SO_USELOOPBACK;
-	}
-	splx(s);
-	return (error);
-}
-
-/*ARGSUSED*/
-static int
-route_output(m, so)
-	register struct mbuf *m;
-	struct socket *so;
-{
-	register struct rt_msghdr *rtm = 0;
-	register struct rtentry *rt = 0;
-	struct rtentry *saved_nrt = 0;
-	struct radix_node_head *rnh;
-	struct rt_addrinfo info;
-	int len, error = 0;
-	struct ifnet *ifp = 0;
-	struct ifaddr *ifa = 0;
-
-#define senderr(e) { error = e; goto flush;}
-	if (m == 0 || ((m->m_len < sizeof(long)) &&
-		       (m = m_pullup(m, sizeof(long))) == 0))
-		return (ENOBUFS);
-	if ((m->m_flags & M_PKTHDR) == 0)
-		panic("route_output");
-	len = m->m_pkthdr.len;
-	if (len < sizeof(*rtm) ||
-	    len != mtod(m, struct rt_msghdr *)->rtm_msglen) {
-		dst = 0;
-		senderr(EINVAL);
-	}
-	R_Malloc(rtm, struct rt_msghdr *, len);
-	if (rtm == 0) {
-		dst = 0;
-		senderr(ENOBUFS);
-	}
-	m_copydata(m, 0, len, (caddr_t)rtm);
-	if (rtm->rtm_version != RTM_VERSION) {
-		dst = 0;
-		senderr(EPROTONOSUPPORT);
-	}
-	info.rti_addrs = rtm->rtm_addrs;
-	if (rt_xaddrs((caddr_t)(rtm + 1), len + (caddr_t)rtm, &info)) {
-		dst = 0;
-		senderr(EINVAL);
-	}
-	if (dst == 0 || (dst->sa_family >= AF_MAX)
-	    || (gate != 0 && (gate->sa_family >= AF_MAX)))
-		senderr(EINVAL);
-	if (genmask) {
-		struct radix_node *t;
-		t = rn_addmask((caddr_t)genmask, 0, 1);
-		if (t && Bcmp(genmask, t->rn_key, *(u_char *)genmask) == 0)
-			genmask = (struct sockaddr *)(t->rn_key);
-		else
-			senderr(ENOBUFS);
-	}
-	switch (rtm->rtm_type) {
-
-	case RTM_ADD:
-		if (gate == 0)
-			senderr(EINVAL);
-		error = rtrequest(RTM_ADD, dst, gate, netmask,
-					rtm->rtm_flags, &saved_nrt);
-		if (error == 0 && saved_nrt) {
-			rt_setmetrics(rtm->rtm_inits,
-				&rtm->rtm_rmx, &saved_nrt->rt_rmx);
-			saved_nrt->rt_rmx.rmx_locks &= ~(rtm->rtm_inits);
-			saved_nrt->rt_rmx.rmx_locks |=
-				(rtm->rtm_inits & rtm->rtm_rmx.rmx_locks);
-			saved_nrt->rt_refcnt--;
-			saved_nrt->rt_genmask = genmask;
-		}
-		break;
-
-	case RTM_DELETE:
-		error = rtrequest(RTM_DELETE, dst, gate, netmask,
-				rtm->rtm_flags, &saved_nrt);
-		if (error == 0) {
-			if ((rt = saved_nrt))
-				rt->rt_refcnt++;
-			goto report;
-		}
-		break;
-
-	case RTM_GET:
-	case RTM_CHANGE:
-	case RTM_LOCK:
-		if ((rnh = rt_tables[dst->sa_family]) == 0) {
-			senderr(EAFNOSUPPORT);
-		} else if ((rt = (struct rtentry *)
-				rnh->rnh_lookup(dst, netmask, rnh)))
-			rt->rt_refcnt++;
-		else
-			senderr(ESRCH);
-		switch(rtm->rtm_type) {
-
-		case RTM_GET:
-		report:
-			dst = rt_key(rt);
-			gate = rt->rt_gateway;
-			netmask = rt_mask(rt);
-			genmask = rt->rt_genmask;
-			if (rtm->rtm_addrs & (RTA_IFP | RTA_IFA)) {
-				ifp = rt->rt_ifp;
-				if (ifp) {
-					ifpaddr = ifp->if_addrlist->ifa_addr;
-					ifaaddr = rt->rt_ifa->ifa_addr;
-					rtm->rtm_index = ifp->if_index;
-				} else {
-					ifpaddr = 0;
-					ifaaddr = 0;
-			    }
-			}
-			len = rt_msg2(rtm->rtm_type, &info, (caddr_t)0,
-				(struct walkarg *)0);
-			if (len > rtm->rtm_msglen) {
-				struct rt_msghdr *new_rtm;
-				R_Malloc(new_rtm, struct rt_msghdr *, len);
-				if (new_rtm == 0)
-					senderr(ENOBUFS);
-				Bcopy(rtm, new_rtm, rtm->rtm_msglen);
-				Free(rtm); rtm = new_rtm;
-			}
-			(void)rt_msg2(rtm->rtm_type, &info, (caddr_t)rtm,
-				(struct walkarg *)0);
-			rtm->rtm_flags = rt->rt_flags;
-			rtm->rtm_rmx = rt->rt_rmx;
-			rtm->rtm_addrs = info.rti_addrs;
-			break;
-
-		case RTM_CHANGE:
-			if (gate && (error = rt_setgate(rt, rt_key(rt), gate)))
-				senderr(error);
-
-			/*
-			 * If they tried to change things but didn't specify
-			 * the required gateway, then just use the old one.
-			 * This can happen if the user tries to change the
-			 * flags on the default route without changing the
-			 * default gateway.  Changing flags still doesn't work.
-			 */
-			if ((rt->rt_flags & RTF_GATEWAY) && !gate)
-				gate = rt->rt_gateway;
-
-			/* new gateway could require new ifaddr, ifp;
-			   flags may also be different; ifp may be specified
-			   by ll sockaddr when protocol address is ambiguous */
-			if (ifpaddr && (ifa = ifa_ifwithnet(ifpaddr)) &&
-			    (ifp = ifa->ifa_ifp) && (ifaaddr || gate))
-				ifa = ifaof_ifpforaddr(ifaaddr ? ifaaddr : gate,
-							ifp);
-			else if ((ifaaddr && (ifa = ifa_ifwithaddr(ifaaddr))) ||
-				 (gate && (ifa = ifa_ifwithroute(rt->rt_flags,
-							rt_key(rt), gate))))
-				ifp = ifa->ifa_ifp;
-			if (ifa) {
-				register struct ifaddr *oifa = rt->rt_ifa;
-				if (oifa != ifa) {
-				    if (oifa && oifa->ifa_rtrequest)
-					oifa->ifa_rtrequest(RTM_DELETE,
-								rt, gate);
-				    IFAFREE(rt->rt_ifa);
-				    rt->rt_ifa = ifa;
-				    ifa->ifa_refcnt++;
-				    rt->rt_ifp = ifp;
-				}
-			}
-			rt_setmetrics(rtm->rtm_inits, &rtm->rtm_rmx,
-					&rt->rt_rmx);
-			if (rt->rt_ifa && rt->rt_ifa->ifa_rtrequest)
-			       rt->rt_ifa->ifa_rtrequest(RTM_ADD, rt, gate);
-			if (genmask)
-				rt->rt_genmask = genmask;
-			/*
-			 * Fall into
-			 */
-		case RTM_LOCK:
-			rt->rt_rmx.rmx_locks &= ~(rtm->rtm_inits);
-			rt->rt_rmx.rmx_locks |=
-				(rtm->rtm_inits & rtm->rtm_rmx.rmx_locks);
-			break;
-		}
-		break;
-
-	default:
-		senderr(EOPNOTSUPP);
-	}
-
-flush:
-	if (rtm) {
-		if (error)
-			rtm->rtm_errno = error;
-		else
-			rtm->rtm_flags |= RTF_DONE;
-	}
-	if (rt)
-		rtfree(rt);
-    {
-	register struct rawcb *rp = 0;
-	/*
-	 * Check to see if we don't want our own messages.
-	 */
-	if ((so->so_options & SO_USELOOPBACK) == 0) {
-		if (route_cb.any_count <= 1) {
-			if (rtm)
-				Free(rtm);
-			m_freem(m);
-			return (error);
-		}
-		/* There is another listener, so construct message */
-		rp = sotorawcb(so);
-	}
-	if (rtm) {
-		m_copyback(m, 0, rtm->rtm_msglen, (caddr_t)rtm);
-		Free(rtm);
-	}
-	if (rp)
-		rp->rcb_proto.sp_family = 0; /* Avoid us */
-	if (dst)
-		route_proto.sp_protocol = dst->sa_family;
-	raw_input(m, &route_proto, &route_src, &route_dst);
-	if (rp)
-		rp->rcb_proto.sp_family = PF_ROUTE;
-    }
-	return (error);
-}
-
-static void
-rt_setmetrics(which, in, out)
-	u_long which;
-	register struct rt_metrics *in, *out;
-{
-#define metric(f, e) if (which & (f)) out->e = in->e;
-	metric(RTV_RPIPE, rmx_recvpipe);
-	metric(RTV_SPIPE, rmx_sendpipe);
-	metric(RTV_SSTHRESH, rmx_ssthresh);
-	metric(RTV_RTT, rmx_rtt);
-	metric(RTV_RTTVAR, rmx_rttvar);
-	metric(RTV_HOPCOUNT, rmx_hopcount);
-	metric(RTV_MTU, rmx_mtu);
-	metric(RTV_EXPIRE, rmx_expire);
-#undef metric
-}
-
-#define ROUNDUP(a) \
-	((a) > 0 ? (1 + (((a) - 1) | (sizeof(long) - 1))) : sizeof(long))
-#define ADVANCE(x, n) (x += ROUNDUP((n)->sa_len))
-
-
-/*
- * Extract the addresses of the passed sockaddrs.
- * Do a little sanity checking so as to avoid bad memory references.
- * This data is derived straight from userland.
- */
-static int
-rt_xaddrs(cp, cplim, rtinfo)
-	register caddr_t cp, cplim;
-	register struct rt_addrinfo *rtinfo;
-{
-	register struct sockaddr *sa;
-	register int i;
-
-	bzero(rtinfo->rti_info, sizeof(rtinfo->rti_info));
-	for (i = 0; (i < RTAX_MAX) && (cp < cplim); i++) {
-		if ((rtinfo->rti_addrs & (1 << i)) == 0)
-			continue;
-		sa = (struct sockaddr *)cp;
-		/*
-		 * It won't fit.
-		 */
-		if ( (cp + sa->sa_len) > cplim ) {
-			return (EINVAL);
-		}
-
-		/*
-		 * there are no more.. quit now
-		 * If there are more bits, they are in error.
-		 * I've seen this. route(1) can evidently generate these. 
-		 * This causes kernel to core dump.
-		 * for compatibility, If we see this, point to a safe address.
-		 */
-		if (sa->sa_len == 0) {
-			rtinfo->rti_info[i] = &sa_zero;
-			return (0); /* should be EINVAL but for compat */
-		}
-
-		/* accept it */
-		rtinfo->rti_info[i] = sa;
-		ADVANCE(cp, sa);
-	}
-	return (0);
-}
-
-static struct mbuf *
-rt_msg1(type, rtinfo)
-	int type;
-	register struct rt_addrinfo *rtinfo;
-{
-	register struct rt_msghdr *rtm;
-	register struct mbuf *m;
-	register int i;
-	register struct sockaddr *sa;
-	int len, dlen;
-
-	m = m_gethdr(M_DONTWAIT, MT_DATA);
-	if (m == 0)
-		return (m);
-	switch (type) {
-
-	case RTM_DELADDR:
-	case RTM_NEWADDR:
-		len = sizeof(struct ifa_msghdr);
-		break;
-
-	case RTM_IFINFO:
-		len = sizeof(struct if_msghdr);
-		break;
-
-	default:
-		len = sizeof(struct rt_msghdr);
-	}
-	if (len > MHLEN)
-		panic("rt_msg1");
-	m->m_pkthdr.len = m->m_len = len;
-	m->m_pkthdr.rcvif = 0;
-	rtm = mtod(m, struct rt_msghdr *);
-	bzero((caddr_t)rtm, len);
-	for (i = 0; i < RTAX_MAX; i++) {
-		if ((sa = rtinfo->rti_info[i]) == NULL)
-			continue;
-		rtinfo->rti_addrs |= (1 << i);
-		dlen = ROUNDUP(sa->sa_len);
-		m_copyback(m, len, dlen, (caddr_t)sa);
-		len += dlen;
-	}
-	if (m->m_pkthdr.len != len) {
-		m_freem(m);
-		return (NULL);
-	}
-	rtm->rtm_msglen = len;
-	rtm->rtm_version = RTM_VERSION;
-	rtm->rtm_type = type;
-	return (m);
-}
-
-static int
-rt_msg2(type, rtinfo, cp, w)
-	int type;
-	register struct rt_addrinfo *rtinfo;
-	caddr_t cp;
-	struct walkarg *w;
-{
-	register int i;
-	int len, dlen, second_time = 0;
-	caddr_t cp0;
-
-	rtinfo->rti_addrs = 0;
-again:
-	switch (type) {
-
-	case RTM_DELADDR:
-	case RTM_NEWADDR:
-		len = sizeof(struct ifa_msghdr);
-		break;
-
-	case RTM_IFINFO:
-		len = sizeof(struct if_msghdr);
-		break;
-
-	default:
-		len = sizeof(struct rt_msghdr);
-	}
-	cp0 = cp;
-	if (cp0)
-		cp += len;
-	for (i = 0; i < RTAX_MAX; i++) {
-		register struct sockaddr *sa;
-
-		if ((sa = rtinfo->rti_info[i]) == 0)
-			continue;
-		rtinfo->rti_addrs |= (1 << i);
-		dlen = ROUNDUP(sa->sa_len);
-		if (cp) {
-			bcopy((caddr_t)sa, cp, (unsigned)dlen);
-			cp += dlen;
-		}
-		len += dlen;
-	}
-	if (cp == 0 && w != NULL && !second_time) {
-		register struct walkarg *rw = w;
-
-		if (rw->w_req) {
-			if (rw->w_tmemsize < len) {
-				if (rw->w_tmem)
-					free(rw->w_tmem, M_RTABLE);
-				rw->w_tmem = (caddr_t)
-					malloc(len, M_RTABLE, M_NOWAIT);
-				if (rw->w_tmem)
-					rw->w_tmemsize = len;
-			}
-			if (rw->w_tmem) {
-				cp = rw->w_tmem;
-				second_time = 1;
-				goto again;
-			}
-		}
-	}
-	if (cp) {
-		register struct rt_msghdr *rtm = (struct rt_msghdr *)cp0;
-
-		rtm->rtm_version = RTM_VERSION;
-		rtm->rtm_type = type;
-		rtm->rtm_msglen = len;
-	}
-	return (len);
-}
-
-/*
- * This routine is called to generate a message from the routing
- * socket indicating that a redirect has occured, a routing lookup
- * has failed, or that a protocol has detected timeouts to a particular
- * destination.
- */
-void
-rt_missmsg(type, rtinfo, flags, error)
-	int type, flags, error;
-	register struct rt_addrinfo *rtinfo;
-{
-	register struct rt_msghdr *rtm;
-	register struct mbuf *m;
-	struct sockaddr *sa = rtinfo->rti_info[RTAX_DST];
-
-	if (route_cb.any_count == 0)
-		return;
-	m = rt_msg1(type, rtinfo);
-	if (m == 0)
-		return;
-	rtm = mtod(m, struct rt_msghdr *);
-	rtm->rtm_flags = RTF_DONE | flags;
-	rtm->rtm_errno = error;
-	rtm->rtm_addrs = rtinfo->rti_addrs;
-	route_proto.sp_protocol = sa ? sa->sa_family : 0;
-	raw_input(m, &route_proto, &route_src, &route_dst);
-}
-
-/*
- * This routine is called to generate a message from the routing
- * socket indicating that the status of a network interface has changed.
- */
-void
-rt_ifmsg(ifp)
-	register struct ifnet *ifp;
-{
-	register struct if_msghdr *ifm;
-	struct mbuf *m;
-	struct rt_addrinfo info;
-
-	if (route_cb.any_count == 0)
-		return;
-	bzero((caddr_t)&info, sizeof(info));
-	m = rt_msg1(RTM_IFINFO, &info);
-	if (m == 0)
-		return;
-	ifm = mtod(m, struct if_msghdr *);
-	ifm->ifm_index = ifp->if_index;
-	ifm->ifm_flags = (u_short)ifp->if_flags;
-	ifm->ifm_data = ifp->if_data;
-	ifm->ifm_addrs = 0;
-	route_proto.sp_protocol = 0;
-	raw_input(m, &route_proto, &route_src, &route_dst);
-}
-
-/*
- * This is called to generate messages from the routing socket
- * indicating a network interface has had addresses associated with it.
- * if we ever reverse the logic and replace messages TO the routing
- * socket indicate a request to configure interfaces, then it will
- * be unnecessary as the routing socket will automatically generate
- * copies of it.
- */
-void
-rt_newaddrmsg(cmd, ifa, error, rt)
-	int cmd, error;
-	register struct ifaddr *ifa;
-	register struct rtentry *rt;
-{
-	struct rt_addrinfo info;
-	struct sockaddr *sa = 0;
-	int pass;
-	struct mbuf *m = 0;
-	struct ifnet *ifp = ifa->ifa_ifp;
-
-	if (route_cb.any_count == 0)
-		return;
-	for (pass = 1; pass < 3; pass++) {
-		bzero((caddr_t)&info, sizeof(info));
-		if ((cmd == RTM_ADD && pass == 1) ||
-		    (cmd == RTM_DELETE && pass == 2)) {
-			register struct ifa_msghdr *ifam;
-			int ncmd = cmd == RTM_ADD ? RTM_NEWADDR : RTM_DELADDR;
-
-			ifaaddr = sa = ifa->ifa_addr;
-			ifpaddr = ifp->if_addrlist->ifa_addr;
-			netmask = ifa->ifa_netmask;
-			brdaddr = ifa->ifa_dstaddr;
-			if ((m = rt_msg1(ncmd, &info)) == NULL)
-				continue;
-			ifam = mtod(m, struct ifa_msghdr *);
-			ifam->ifam_index = ifp->if_index;
-			ifam->ifam_metric = ifa->ifa_metric;
-			ifam->ifam_flags = ifa->ifa_flags;
-			ifam->ifam_addrs = info.rti_addrs;
-		}
-		if ((cmd == RTM_ADD && pass == 2) ||
-		    (cmd == RTM_DELETE && pass == 1)) {
-			register struct rt_msghdr *rtm;
-
-			if (rt == 0)
-				continue;
-			netmask = rt_mask(rt);
-			dst = sa = rt_key(rt);
-			gate = rt->rt_gateway;
-			if ((m = rt_msg1(cmd, &info)) == NULL)
-				continue;
-			rtm = mtod(m, struct rt_msghdr *);
-			rtm->rtm_index = ifp->if_index;
-			rtm->rtm_flags |= rt->rt_flags;
-			rtm->rtm_errno = error;
-			rtm->rtm_addrs = info.rti_addrs;
-		}
-		route_proto.sp_protocol = sa ? sa->sa_family : 0;
-		raw_input(m, &route_proto, &route_src, &route_dst);
-	}
-}
-
-
-/*
- * This is used in dumping the kernel table via sysctl().
- */
-int
-sysctl_dumpentry(rn, vw)
-	struct radix_node *rn;
-	void *vw;
-{
-	register struct walkarg *w = vw;
-	register struct rtentry *rt = (struct rtentry *)rn;
-	int error = 0, size;
-	struct rt_addrinfo info;
-
-	if (w->w_op == NET_RT_FLAGS && !(rt->rt_flags & w->w_arg))
-		return 0;
-	bzero((caddr_t)&info, sizeof(info));
-	dst = rt_key(rt);
-	gate = rt->rt_gateway;
-	netmask = rt_mask(rt);
-	genmask = rt->rt_genmask;
-	size = rt_msg2(RTM_GET, &info, 0, w);
-	if (w->w_req && w->w_tmem) {
-		register struct rt_msghdr *rtm = (struct rt_msghdr *)w->w_tmem;
-
-		rtm->rtm_flags = rt->rt_flags;
-		rtm->rtm_use = rt->rt_use;
-		rtm->rtm_rmx = rt->rt_rmx;
-		rtm->rtm_index = rt->rt_ifp->if_index;
-		rtm->rtm_errno = rtm->rtm_pid = rtm->rtm_seq = 0;
-		rtm->rtm_addrs = info.rti_addrs;
-		error = 0;
-		return (error);
-	}
-	return (error);
-}
-
-int
-sysctl_iflist(af, w)
-	int	af;
-	register struct	walkarg *w;
-{
-	register struct ifnet *ifp;
-	register struct ifaddr *ifa;
-	struct	rt_addrinfo info;
-	int	len, error = 0;
-
-	bzero((caddr_t)&info, sizeof(info));
-	for (ifp = ifnet; ifp; ifp = ifp->if_next) {
-		if (w->w_arg && w->w_arg != ifp->if_index)
-			continue;
-		ifa = ifp->if_addrlist;
-		ifpaddr = ifa->ifa_addr;
-		len = rt_msg2(RTM_IFINFO, &info, (caddr_t)0, w);
-		ifpaddr = 0;
-		if (w->w_req && w->w_tmem) {
-			register struct if_msghdr *ifm;
-
-			ifm = (struct if_msghdr *)w->w_tmem;
-			ifm->ifm_index = ifp->if_index;
-			ifm->ifm_flags = (u_short)ifp->if_flags;
-			ifm->ifm_data = ifp->if_data;
-			ifm->ifm_addrs = info.rti_addrs;
-			error =0;
-			if (error)
-				return (error);
-		}
-		while ((ifa = ifa->ifa_next) != 0) {
-			if (af && af != ifa->ifa_addr->sa_family)
-				continue;
-			ifaaddr = ifa->ifa_addr;
-			netmask = ifa->ifa_netmask;
-			brdaddr = ifa->ifa_dstaddr;
-			len = rt_msg2(RTM_NEWADDR, &info, 0, w);
-			if (w->w_req && w->w_tmem) {
-				register struct ifa_msghdr *ifam;
-
-				ifam = (struct ifa_msghdr *)w->w_tmem;
-				ifam->ifam_index = ifa->ifa_ifp->if_index;
-				ifam->ifam_flags = ifa->ifa_flags;
-				ifam->ifam_metric = ifa->ifa_metric;
-				ifam->ifam_addrs = info.rti_addrs;
-				error = 0;
-				if (error)
-					return (error);
-			}
-		}
-		ifaaddr = netmask = brdaddr = 0;
-	}
-	return (0);
-}
-
-static int
-sysctl_rtsock SYSCTL_HANDLER_ARGS
-{
-	int	*name = (int *)arg1;
-	u_int	namelen = arg2;
-	register struct radix_node_head *rnh;
-	int	i, s, error = EINVAL;
-	u_char  af;
-	struct	walkarg w;
-
-	name ++;
-	namelen--;
-	if (req->newptr)
-		return (EPERM);
-	if (namelen != 3)
-		return (EINVAL);
-	af = name[0];
-	Bzero(&w, sizeof(w));
-	w.w_op = name[1];
-	w.w_arg = name[2];
-	w.w_req = req;
-
-	s = splnet();
-	switch (w.w_op) {
-
-	case NET_RT_DUMP:
-	case NET_RT_FLAGS:
-		for (i = 1; i <= AF_MAX; i++)
-			if ((rnh = rt_tables[i]) && (af == 0 || af == i) &&
-			    (error = rnh->rnh_walktree(rnh,
-							sysctl_dumpentry, &w)))
-				break;
-		break;
-
-	case NET_RT_IFLIST:
-		error = sysctl_iflist(af, &w);
-	}
-	splx(s);
-	if (w.w_tmem)
-		free(w.w_tmem, M_RTABLE);
-	return (error);
-}
-
-SYSCTL_NODE(_net, PF_ROUTE, routetable, CTLFLAG_RD, sysctl_rtsock,"");
-
-/*
- * Definitions of protocols supported in the ROUTE domain.
- */
-
-extern struct domain routedomain;		/* or at least forward */
-
-static struct protosw routesw[] = {
-{ SOCK_RAW,	&routedomain,	0,		PR_ATOMIC|PR_ADDR,
-  0,		route_output,	raw_ctlinput,	0,
-  route_usrreq,
-  raw_init
-}
-};
-
-struct domain routedomain =
-    { PF_ROUTE, "route", route_init, 0, 0,
-      routesw, &routesw[sizeof(routesw)/sizeof(routesw[0])] };
-
-DOMAIN_SET(route);
diff --git a/c/src/exec/libnetworking/netdb.h b/c/src/exec/libnetworking/netdb.h
deleted file mode 100644
index ec274f851f..0000000000
--- a/c/src/exec/libnetworking/netdb.h
+++ /dev/null
@@ -1,182 +0,0 @@
-/*-
- * Copyright (c) 1980, 1983, 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * -
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- * -
- * --Copyright--
- */
-
-/*
- *      @(#)netdb.h	8.1 (Berkeley) 6/2/93
- *      From: Id: netdb.h,v 8.9 1996/11/19 08:39:29 vixie Exp $
- *	$Id$
- */
-
-#ifndef _NETDB_H_
-#define _NETDB_H_
-
-#include <sys/cdefs.h>
-
-#ifndef _PATH_HEQUIV
-# define	_PATH_HEQUIV	"/etc/hosts.equiv"
-#endif
-#define	_PATH_HOSTS	"/etc/hosts"
-#define	_PATH_NETWORKS	"/etc/networks"
-#define	_PATH_PROTOCOLS	"/etc/protocols"
-#define	_PATH_SERVICES	"/etc/services"
-
-extern int h_errno;
-
-/*
- * Structures returned by network data base library.  All addresses are
- * supplied in host order, and returned in network order (suitable for
- * use in system calls).
- */
-struct	hostent {
-	char	*h_name;	/* official name of host */
-	char	**h_aliases;	/* alias list */
-	int	h_addrtype;	/* host address type */
-	int	h_length;	/* length of address */
-	char	**h_addr_list;	/* list of addresses from name server */
-#define	h_addr	h_addr_list[0]	/* address, for backward compatibility */
-};
-
-/*
- * Assumption here is that a network number
- * fits in an unsigned long -- probably a poor one.
- */
-struct	netent {
-	char		*n_name;	/* official name of net */
-	char		**n_aliases;	/* alias list */
-	int		n_addrtype;	/* net address type */
-	unsigned long	n_net;		/* network # */
-};
-
-struct	servent {
-	char	*s_name;	/* official service name */
-	char	**s_aliases;	/* alias list */
-	int	s_port;		/* port # */
-	char	*s_proto;	/* protocol to use */
-};
-
-struct	protoent {
-	char	*p_name;	/* official protocol name */
-	char	**p_aliases;	/* alias list */
-	int	p_proto;	/* protocol # */
-};
-
-/*
- * Error return codes from gethostbyname() and gethostbyaddr()
- * (left in extern int h_errno).
- */
-
-#define	NETDB_INTERNAL	-1	/* see errno */
-#define	NETDB_SUCCESS	0	/* no problem */
-#define	HOST_NOT_FOUND	1 /* Authoritative Answer Host not found */
-#define	TRY_AGAIN	2 /* Non-Authoritative Host not found, or SERVERFAIL */
-#define	NO_RECOVERY	3 /* Non recoverable errors, FORMERR, REFUSED, NOTIMP */
-#define	NO_DATA		4 /* Valid name, no data record of requested type */
-#define	NO_ADDRESS	NO_DATA		/* no address, look for MX record */
-
-__BEGIN_DECLS
-void		endhostent __P((void));
-void		endnetent __P((void));
-void		endprotoent __P((void));
-void		endservent __P((void));
-struct hostent	*gethostbyaddr __P((const char *, int, int));
-struct hostent	*gethostbyname __P((const char *));
-struct hostent	*gethostbyname2 __P((const char *, int));
-struct hostent	*gethostent __P((void));
-struct netent	*getnetbyaddr __P((unsigned long, int));
-struct netent	*getnetbyname __P((const char *));
-struct netent	*getnetent __P((void));
-struct protoent	*getprotobyname __P((const char *));
-struct protoent	*getprotobynumber __P((int));
-struct protoent	*getprotoent __P((void));
-struct servent	*getservbyname __P((const char *, const char *));
-struct servent	*getservbyport __P((int, const char *));
-struct servent	*getservent __P((void));
-void		herror __P((const char *));
-__const char	*hstrerror __P((int));
-void		sethostent __P((int));
-/* void		sethostfile __P((const char *)); */
-void		setnetent __P((int));
-void		setprotoent __P((int));
-void		setservent __P((int));
-
-/*
- * PRIVATE functions specific to the FreeBSD implementation
- */
-
-/* DO NOT USE THESE, THEY ARE SUBJECT TO CHANGE AND ARE NOT PORTABLE!!! */
-void	_sethosthtent __P((int));
-void	_endhosthtent __P((void));
-void	_sethostdnsent __P((int));
-void	_endhostdnsent __P((void));
-void	_setnethtent __P((int));
-void	_endnethtent __P((void));
-void	_setnetdnsent __P((int));
-void	_endnetdnsent __P((void));
-struct hostent * _gethostbyhtname  __P((const char *, int));
-struct hostent * _gethostbydnsname __P((const char *, int));
-struct hostent * _gethostbynisname __P((const char *, int));
-struct hostent * _gethostbyhtaddr  __P((const char *, int, int));
-struct hostent * _gethostbydnsaddr __P((const char *, int, int));
-struct hostent * _gethostbynisaddr __P((const char *, int, int));
-struct netent *  _getnetbyhtname  __P((const char *));
-struct netent *  _getnetbydnsname __P((const char *));
-struct netent *  _getnetbynisname __P((const char *));
-struct netent *  _getnetbyhtaddr  __P((unsigned long, int));
-struct netent *  _getnetbydnsaddr __P((unsigned long, int));
-struct netent *  _getnetbynisaddr __P((unsigned long, int));
-void _map_v4v6_address __P((const char *src, char *dst));
-void _map_v4v6_hostent __P((struct hostent *hp, char **bp, int *len));
-__END_DECLS
-
-#endif /* !_NETDB_H_ */
diff --git a/c/src/exec/libnetworking/netinet/icmp_var.h b/c/src/exec/libnetworking/netinet/icmp_var.h
deleted file mode 100644
index 7657f31acf..0000000000
--- a/c/src/exec/libnetworking/netinet/icmp_var.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)icmp_var.h	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#ifndef _NETINET_ICMP_VAR_H_
-#define _NETINET_ICMP_VAR_H_
-
-/*
- * Variables related to this implementation
- * of the internet control message protocol.
- */
-struct	icmpstat {
-/* statistics related to icmp packets generated */
-	u_long	icps_error;		/* # of calls to icmp_error */
-	u_long	icps_oldshort;		/* no error 'cuz old ip too short */
-	u_long	icps_oldicmp;		/* no error 'cuz old was icmp */
-	u_long	icps_outhist[ICMP_MAXTYPE + 1];
-/* statistics related to input messages processed */
- 	u_long	icps_badcode;		/* icmp_code out of range */
-	u_long	icps_tooshort;		/* packet < ICMP_MINLEN */
-	u_long	icps_checksum;		/* bad checksum */
-	u_long	icps_badlen;		/* calculated bound mismatch */
-	u_long	icps_reflect;		/* number of responses */
-	u_long	icps_inhist[ICMP_MAXTYPE + 1];
-	u_long	icps_bmcastecho; 	/* b/mcast echo requests dropped */
-	u_long	icps_bmcasttstamp; 	/* b/mcast tstamp requests dropped */
-};
-
-/*
- * Names for ICMP sysctl objects
- */
-#define	ICMPCTL_MASKREPL	1	/* allow replies to netmask requests */
-#define	ICMPCTL_STATS		2	/* statistics (read-only) */
-#define ICMPCTL_MAXID		3
-
-#define ICMPCTL_NAMES { \
-	{ 0, 0 }, \
-	{ "maskrepl", CTLTYPE_INT }, \
-	{ "stats", CTLTYPE_STRUCT }, \
-}
-
-#ifdef KERNEL
-extern struct	icmpstat icmpstat;
-#endif
-
-#endif
diff --git a/c/src/exec/libnetworking/netinet/if_ether.c b/c/src/exec/libnetworking/netinet/if_ether.c
deleted file mode 100644
index 985ce6e7d9..0000000000
--- a/c/src/exec/libnetworking/netinet/if_ether.c
+++ /dev/null
@@ -1,638 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)if_ether.c	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-/*
- * Ethernet address resolution protocol.
- * TODO:
- *	add "inuse/lock" bit (or ref. count) along with valid bit
- */
-
-#include <sys/param.h>
-#include <sys/kernel.h>
-#include <sys/sysctl.h>
-#include <sys/queue.h>
-#include <sys/systm.h>
-#include <sys/mbuf.h>
-#include <sys/malloc.h>
-#include <sys/socket.h>
-#include <sys/syslog.h>
-
-#include <net/if.h>
-#include <net/if_dl.h>
-#include <net/route.h>
-#include <net/netisr.h>
-
-#include <netinet/in.h>
-#include <netinet/in_var.h>
-#include <netinet/if_ether.h>
-
-#define SIN(s) ((struct sockaddr_in *)s)
-#define SDL(s) ((struct sockaddr_dl *)s)
-
-SYSCTL_NODE(_net_link_ether, PF_INET, inet, CTLFLAG_RW, 0, "");
-
-/* timer values */
-static int arpt_prune = (5*60*1); /* walk list every 5 minutes */
-static int arpt_keep = (20*60); /* once resolved, good for 20 more minutes */
-static int arpt_down = 20;	/* once declared down, don't send for 20 sec */
-
-SYSCTL_INT(_net_link_ether_inet, OID_AUTO, prune_intvl, CTLFLAG_RW,
-	   &arpt_prune, 0, "");
-SYSCTL_INT(_net_link_ether_inet, OID_AUTO, max_age, CTLFLAG_RW, 
-	   &arpt_keep, 0, "");
-SYSCTL_INT(_net_link_ether_inet, OID_AUTO, host_down_time, CTLFLAG_RW,
-	   &arpt_down, 0, "");
-
-#define	rt_expire rt_rmx.rmx_expire
-
-struct llinfo_arp {
-	LIST_ENTRY(llinfo_arp) la_le;
-	struct	rtentry *la_rt;
-	struct	mbuf *la_hold;		/* last packet until resolved/timeout */
-	long	la_asked;		/* last time we QUERIED for this addr */
-#define la_timer la_rt->rt_rmx.rmx_expire /* deletion time in seconds */
-};
-
-static	LIST_HEAD(, llinfo_arp) llinfo_arp;
-
-struct	ifqueue arpintrq = {0, 0, 0, 50};
-static int	arp_inuse, arp_allocated;
-
-static int	arp_maxtries = 5;
-static int	useloopback = 1; /* use loopback interface for local traffic */
-static int	arp_proxyall = 0;
-
-SYSCTL_INT(_net_link_ether_inet, OID_AUTO, maxtries, CTLFLAG_RW,
-	   &arp_maxtries, 0, "");
-SYSCTL_INT(_net_link_ether_inet, OID_AUTO, useloopback, CTLFLAG_RW,
-	   &useloopback, 0, "");
-SYSCTL_INT(_net_link_ether_inet, OID_AUTO, proxyall, CTLFLAG_RW,
-	   &arp_proxyall, 0, "");
-
-static void	arp_rtrequest __P((int, struct rtentry *, struct sockaddr *));
-static void	arprequest __P((struct arpcom *, u_long *, u_long *, u_char *));
-void	arpintr __P((void));
-static void	arptfree __P((struct llinfo_arp *));
-static void	arptimer __P((void *));
-static struct llinfo_arp
-		*arplookup __P((u_long, int, int));
-static void	in_arpinput __P((struct mbuf *));
-
-/*
- * Timeout routine.  Age arp_tab entries periodically.
- */
-/* ARGSUSED */
-static void
-arptimer(ignored_arg)
-	void *ignored_arg;
-{
-	int s = splnet();
-	register struct llinfo_arp *la = llinfo_arp.lh_first;
-	struct llinfo_arp *ola;
-
-	timeout(arptimer, (caddr_t)0, arpt_prune * hz);
-	while ((ola = la) != 0) {
-		register struct rtentry *rt = la->la_rt;
-		la = la->la_le.le_next;
-		if (rt->rt_expire && rt->rt_expire <= rtems_bsdnet_seconds_since_boot())
-			arptfree(ola); /* timer has expired, clear */
-	}
-	splx(s);
-}
-
-/*
- * Parallel to llc_rtrequest.
- */
-static void
-arp_rtrequest(req, rt, sa)
-	int req;
-	register struct rtentry *rt;
-	struct sockaddr *sa;
-{
-	register struct sockaddr *gate = rt->rt_gateway;
-	register struct llinfo_arp *la = (struct llinfo_arp *)rt->rt_llinfo;
-	static struct sockaddr_dl null_sdl = {sizeof(null_sdl), AF_LINK};
-	static int arpinit_done;
-
-	if (!arpinit_done) {
-		arpinit_done = 1;
-		LIST_INIT(&llinfo_arp);
-		timeout(arptimer, (caddr_t)0, hz);
-	}
-	if (rt->rt_flags & RTF_GATEWAY)
-		return;
-	switch (req) {
-
-	case RTM_ADD:
-		/*
-		 * XXX: If this is a manually added route to interface
-		 * such as older version of routed or gated might provide,
-		 * restore cloning bit.
-		 */
-		if ((rt->rt_flags & RTF_HOST) == 0 &&
-		    SIN(rt_mask(rt))->sin_addr.s_addr != 0xffffffff)
-			rt->rt_flags |= RTF_CLONING;
-		if (rt->rt_flags & RTF_CLONING) {
-			/*
-			 * Case 1: This route should come from a route to iface.
-			 */
-			rt_setgate(rt, rt_key(rt),
-					(struct sockaddr *)&null_sdl);
-			gate = rt->rt_gateway;
-			SDL(gate)->sdl_type = rt->rt_ifp->if_type;
-			SDL(gate)->sdl_index = rt->rt_ifp->if_index;
-			rt->rt_expire = rtems_bsdnet_seconds_since_boot();
-			break;
-		}
-		/* Announce a new entry if requested. */
-		if (rt->rt_flags & RTF_ANNOUNCE)
-			arprequest((struct arpcom *)rt->rt_ifp,
-			    &SIN(rt_key(rt))->sin_addr.s_addr,
-			    &SIN(rt_key(rt))->sin_addr.s_addr,
-			    (u_char *)LLADDR(SDL(gate)));
-		/*FALLTHROUGH*/
-	case RTM_RESOLVE:
-		if (gate->sa_family != AF_LINK ||
-		    gate->sa_len < sizeof(null_sdl)) {
-			log(LOG_DEBUG, "arp_rtrequest: bad gateway value\n");
-			break;
-		}
-		SDL(gate)->sdl_type = rt->rt_ifp->if_type;
-		SDL(gate)->sdl_index = rt->rt_ifp->if_index;
-		if (la != 0)
-			break; /* This happens on a route change */
-		/*
-		 * Case 2:  This route may come from cloning, or a manual route
-		 * add with a LL address.
-		 */
-		R_Malloc(la, struct llinfo_arp *, sizeof(*la));
-		rt->rt_llinfo = (caddr_t)la;
-		if (la == 0) {
-			log(LOG_DEBUG, "arp_rtrequest: malloc failed\n");
-			break;
-		}
-		arp_inuse++, arp_allocated++;
-		Bzero(la, sizeof(*la));
-		la->la_rt = rt;
-		rt->rt_flags |= RTF_LLINFO;
-		LIST_INSERT_HEAD(&llinfo_arp, la, la_le);
-
-		/*
-		 * This keeps the multicast addresses from showing up
-		 * in `arp -a' listings as unresolved.  It's not actually
-		 * functional.  Then the same for broadcast.
-		 */
-		if (IN_MULTICAST(ntohl(SIN(rt_key(rt))->sin_addr.s_addr))) {
-			ETHER_MAP_IP_MULTICAST(&SIN(rt_key(rt))->sin_addr,
-					       LLADDR(SDL(gate)));
-			SDL(gate)->sdl_alen = 6;
-			rt->rt_expire = 0;
-		}
-		if (in_broadcast(SIN(rt_key(rt))->sin_addr, rt->rt_ifp)) {
-			memcpy(LLADDR(SDL(gate)), etherbroadcastaddr, 6);
-			SDL(gate)->sdl_alen = 6;
-			rt->rt_expire = 0;
-		}
-
-		if (SIN(rt_key(rt))->sin_addr.s_addr ==
-		    (IA_SIN(rt->rt_ifa))->sin_addr.s_addr) {
-		    /*
-		     * This test used to be
-		     *	if (loif.if_flags & IFF_UP)
-		     * It allowed local traffic to be forced
-		     * through the hardware by configuring the loopback down.
-		     * However, it causes problems during network configuration
-		     * for boards that can't receive packets they send.
-		     * It is now necessary to clear "useloopback" and remove
-		     * the route to force traffic out to the hardware.
-		     */
-			rt->rt_expire = 0;
-			Bcopy(((struct arpcom *)rt->rt_ifp)->ac_enaddr,
-				LLADDR(SDL(gate)), SDL(gate)->sdl_alen = 6);
-			if (useloopback)
-				rt->rt_ifp = loif;
-
-		}
-		break;
-
-	case RTM_DELETE:
-		if (la == 0)
-			break;
-		arp_inuse--;
-		LIST_REMOVE(la, la_le);
-		rt->rt_llinfo = 0;
-		rt->rt_flags &= ~RTF_LLINFO;
-		if (la->la_hold)
-			m_freem(la->la_hold);
-		Free((caddr_t)la);
-	}
-}
-
-/*
- * Broadcast an ARP request. Caller specifies:
- *	- arp header source ip address
- *	- arp header target ip address
- *	- arp header source ethernet address
- */
-static void
-arprequest(ac, sip, tip, enaddr)
-	register struct arpcom *ac;
-	register u_long *sip, *tip;
-	register u_char *enaddr;
-{
-	register struct mbuf *m;
-	register struct ether_header *eh;
-	register struct ether_arp *ea;
-	struct sockaddr sa;
-
-	if ((m = m_gethdr(M_DONTWAIT, MT_DATA)) == NULL)
-		return;
-	m->m_len = sizeof(*ea);
-	m->m_pkthdr.len = sizeof(*ea);
-	MH_ALIGN(m, sizeof(*ea));
-	ea = mtod(m, struct ether_arp *);
-	eh = (struct ether_header *)sa.sa_data;
-	bzero((caddr_t)ea, sizeof (*ea));
-	(void)memcpy(eh->ether_dhost, etherbroadcastaddr, sizeof(eh->ether_dhost));
-	eh->ether_type = htons(ETHERTYPE_ARP);	/* if_output will not swap */
-	ea->arp_hrd = htons(ARPHRD_ETHER);
-	ea->arp_pro = htons(ETHERTYPE_IP);
-	ea->arp_hln = sizeof(ea->arp_sha);	/* hardware address length */
-	ea->arp_pln = sizeof(ea->arp_spa);	/* protocol address length */
-	ea->arp_op = htons(ARPOP_REQUEST);
-	(void)memcpy(ea->arp_sha, enaddr, sizeof(ea->arp_sha));
-	(void)memcpy(ea->arp_spa, sip, sizeof(ea->arp_spa));
-	(void)memcpy(ea->arp_tpa, tip, sizeof(ea->arp_tpa));
-	sa.sa_family = AF_UNSPEC;
-	sa.sa_len = sizeof(sa);
-	(*ac->ac_if.if_output)(&ac->ac_if, m, &sa, (struct rtentry *)0);
-}
-
-/*
- * Resolve an IP address into an ethernet address.  If success,
- * desten is filled in.  If there is no entry in arptab,
- * set one up and broadcast a request for the IP address.
- * Hold onto this mbuf and resend it once the address
- * is finally resolved.  A return value of 1 indicates
- * that desten has been filled in and the packet should be sent
- * normally; a 0 return indicates that the packet has been
- * taken over here, either now or for later transmission.
- */
-int
-arpresolve(ac, rt, m, dst, desten, rt0)
-	register struct arpcom *ac;
-	register struct rtentry *rt;
-	struct mbuf *m;
-	register struct sockaddr *dst;
-	register u_char *desten;
-	struct rtentry *rt0;
-{
-	register struct llinfo_arp *la;
-	struct sockaddr_dl *sdl;
-
-	if (m->m_flags & M_BCAST) {	/* broadcast */
-		(void)memcpy(desten, etherbroadcastaddr, sizeof(etherbroadcastaddr));
-		return (1);
-	}
-	if (m->m_flags & M_MCAST) {	/* multicast */
-		ETHER_MAP_IP_MULTICAST(&SIN(dst)->sin_addr, desten);
-		return(1);
-	}
-	if (rt)
-		la = (struct llinfo_arp *)rt->rt_llinfo;
-	else {
-		la = arplookup(SIN(dst)->sin_addr.s_addr, 1, 0);
-		if (la)
-			rt = la->la_rt;
-	}
-	if (la == 0 || rt == 0) {
-		log(LOG_DEBUG, "arpresolve: can't allocate llinfo for %s\n",
-			inet_ntoa(SIN(dst)->sin_addr));
-		m_freem(m);
-		return (0);
-	}
-	sdl = SDL(rt->rt_gateway);
-	/*
-	 * Check the address family and length is valid, the address
-	 * is resolved; otherwise, try to resolve.
-	 */
-	if ((rt->rt_expire == 0 || rt->rt_expire > rtems_bsdnet_seconds_since_boot()) &&
-	    sdl->sdl_family == AF_LINK && sdl->sdl_alen != 0) {
-		bcopy(LLADDR(sdl), desten, sdl->sdl_alen);
-		return 1;
-	}
-	/*
-	 * There is an arptab entry, but no ethernet address
-	 * response yet.  Replace the held mbuf with this
-	 * latest one.
-	 */
-	if (la->la_hold)
-		m_freem(la->la_hold);
-	la->la_hold = m;
-	if (rt->rt_expire) {
-		rt->rt_flags &= ~RTF_REJECT;
-		if (la->la_asked == 0 || rt->rt_expire != rtems_bsdnet_seconds_since_boot()) {
-			rt->rt_expire = rtems_bsdnet_seconds_since_boot();
-			if (la->la_asked++ < arp_maxtries)
-			    arprequest(ac,
-			        &(SIN(rt->rt_ifa->ifa_addr)->sin_addr.s_addr),
-				&(SIN(dst)->sin_addr.s_addr),
-				ac->ac_enaddr);
-			else {
-				rt->rt_flags |= RTF_REJECT;
-				rt->rt_expire += arpt_down;
-				la->la_asked = 0;
-			}
-
-		}
-	}
-	return (0);
-}
-
-/*
- * Common length and type checks are done here,
- * then the protocol-specific routine is called.
- */
-void
-arpintr(void)
-{
-	register struct mbuf *m;
-	register struct arphdr *ar;
-	int s;
-
-	while (arpintrq.ifq_head) {
-		s = splimp();
-		IF_DEQUEUE(&arpintrq, m);
-		splx(s);
-		if (m == 0 || (m->m_flags & M_PKTHDR) == 0)
-			panic("arpintr");
-		if (m->m_len >= sizeof(struct arphdr) &&
-		    (ar = mtod(m, struct arphdr *)) &&
-		    ntohs(ar->ar_hrd) == ARPHRD_ETHER &&
-		    m->m_len >=
-		      sizeof(struct arphdr) + 2 * ar->ar_hln + 2 * ar->ar_pln)
-
-			    switch (ntohs(ar->ar_pro)) {
-
-			    case ETHERTYPE_IP:
-				    in_arpinput(m);
-				    continue;
-			    }
-		m_freem(m);
-	}
-}
-
-NETISR_SET(NETISR_ARP, arpintr);
-
-/*
- * ARP for Internet protocols on 10 Mb/s Ethernet.
- * Algorithm is that given in RFC 826.
- * In addition, a sanity check is performed on the sender
- * protocol address, to catch impersonators.
- * We no longer handle negotiations for use of trailer protocol:
- * Formerly, ARP replied for protocol type ETHERTYPE_TRAIL sent
- * along with IP replies if we wanted trailers sent to us,
- * and also sent them in response to IP replies.
- * This allowed either end to announce the desire to receive
- * trailer packets.
- * We no longer reply to requests for ETHERTYPE_TRAIL protocol either,
- * but formerly didn't normally send requests.
- */
-static void
-in_arpinput(m)
-	struct mbuf *m;
-{
-	register struct ether_arp *ea;
-	register struct arpcom *ac = (struct arpcom *)m->m_pkthdr.rcvif;
-	struct ether_header *eh;
-	register struct llinfo_arp *la = 0;
-	register struct rtentry *rt;
-	struct in_ifaddr *ia, *maybe_ia = 0;
-	struct sockaddr_dl *sdl;
-	struct sockaddr sa;
-	struct in_addr isaddr, itaddr, myaddr;
-	int op;
-
-	ea = mtod(m, struct ether_arp *);
-	op = ntohs(ea->arp_op);
-	(void)memcpy(&isaddr, ea->arp_spa, sizeof (isaddr));
-	(void)memcpy(&itaddr, ea->arp_tpa, sizeof (itaddr));
-	for (ia = in_ifaddr; ia; ia = ia->ia_next)
-		if (ia->ia_ifp == &ac->ac_if) {
-			maybe_ia = ia;
-			if ((itaddr.s_addr == ia->ia_addr.sin_addr.s_addr) ||
-			     (isaddr.s_addr == ia->ia_addr.sin_addr.s_addr))
-				break;
-		}
-	if (maybe_ia == 0) {
-		m_freem(m);
-		return;
-	}
-	myaddr = ia ? ia->ia_addr.sin_addr : maybe_ia->ia_addr.sin_addr;
-	if (!bcmp((caddr_t)ea->arp_sha, (caddr_t)ac->ac_enaddr,
-	    sizeof (ea->arp_sha))) {
-		m_freem(m);	/* it's from me, ignore it. */
-		return;
-	}
-	if (!bcmp((caddr_t)ea->arp_sha, (caddr_t)etherbroadcastaddr,
-	    sizeof (ea->arp_sha))) {
-		log(LOG_ERR,
-		    "arp: ether address is broadcast for IP address %s!\n",
-		    inet_ntoa(isaddr));
-		m_freem(m);
-		return;
-	}
-	if (isaddr.s_addr == myaddr.s_addr) {
-		log(LOG_ERR,
-		   "arp: %6D is using my IP address %s!\n",
-		   ea->arp_sha, ":", inet_ntoa(isaddr));
-		itaddr = myaddr;
-		goto reply;
-	}
-	la = arplookup(isaddr.s_addr, itaddr.s_addr == myaddr.s_addr, 0);
-	if (la && (rt = la->la_rt) && (sdl = SDL(rt->rt_gateway))) {
-		if (sdl->sdl_alen &&
-		    bcmp((caddr_t)ea->arp_sha, LLADDR(sdl), sdl->sdl_alen))
-			log(LOG_INFO, "arp: %s moved from %6D to %6D\n",
-			    inet_ntoa(isaddr), (u_char *)LLADDR(sdl), ":",
-			    ea->arp_sha, ":");
-		(void)memcpy(LLADDR(sdl), ea->arp_sha, sizeof(ea->arp_sha));
-		sdl->sdl_alen = sizeof(ea->arp_sha);
-		if (rt->rt_expire)
-			rt->rt_expire = rtems_bsdnet_seconds_since_boot() + arpt_keep;
-		rt->rt_flags &= ~RTF_REJECT;
-		la->la_asked = 0;
-		if (la->la_hold) {
-			(*ac->ac_if.if_output)(&ac->ac_if, la->la_hold,
-				rt_key(rt), rt);
-			la->la_hold = 0;
-		}
-	}
-reply:
-	if (op != ARPOP_REQUEST) {
-		m_freem(m);
-		return;
-	}
-	if (itaddr.s_addr == myaddr.s_addr) {
-		/* I am the target */
-		(void)memcpy(ea->arp_tha, ea->arp_sha, sizeof(ea->arp_sha));
-		(void)memcpy(ea->arp_sha, ac->ac_enaddr, sizeof(ea->arp_sha));
-	} else {
-		la = arplookup(itaddr.s_addr, 0, SIN_PROXY);
-		if (la == NULL) {
-			struct sockaddr_in sin;
-
-			if (!arp_proxyall) {
-				m_freem(m);
-				return;
-			}
-
-			bzero(&sin, sizeof sin);
-			sin.sin_family = AF_INET;
-			sin.sin_len = sizeof sin;
-			sin.sin_addr = itaddr;
-
-			rt = rtalloc1((struct sockaddr *)&sin, 0, 0UL);
-			if (!rt) {
-				m_freem(m);
-				return;
-			}
-			/*
-			 * Don't send proxies for nodes on the same interface
-			 * as this one came out of, or we'll get into a fight
-			 * over who claims what Ether address.
-			 */
-			if (rt->rt_ifp == &ac->ac_if) {
-				rtfree(rt);
-				m_freem(m);
-				return;
-			}
-			(void)memcpy(ea->arp_tha, ea->arp_sha, sizeof(ea->arp_sha));
-			(void)memcpy(ea->arp_sha, ac->ac_enaddr, sizeof(ea->arp_sha));
-			rtfree(rt);
-#ifdef DEBUG_PROXY
-			printf("arp: proxying for %s\n",
-			       inet_ntoa(itaddr));
-#endif
-		} else {
-			rt = la->la_rt;
-			(void)memcpy(ea->arp_tha, ea->arp_sha, sizeof(ea->arp_sha));
-			sdl = SDL(rt->rt_gateway);
-			(void)memcpy(ea->arp_sha, LLADDR(sdl), sizeof(ea->arp_sha));
-		}
-	}
-
-	(void)memcpy(ea->arp_tpa, ea->arp_spa, sizeof(ea->arp_spa));
-	(void)memcpy(ea->arp_spa, &itaddr, sizeof(ea->arp_spa));
-	ea->arp_op = htons(ARPOP_REPLY);
-	ea->arp_pro = htons(ETHERTYPE_IP); /* let's be sure! */
-	eh = (struct ether_header *)sa.sa_data;
-	(void)memcpy(eh->ether_dhost, ea->arp_tha, sizeof(eh->ether_dhost));
-	eh->ether_type = htons(ETHERTYPE_ARP);
-	sa.sa_family = AF_UNSPEC;
-	sa.sa_len = sizeof(sa);
-	(*ac->ac_if.if_output)(&ac->ac_if, m, &sa, (struct rtentry *)0);
-	return;
-}
-
-/*
- * Free an arp entry.
- */
-static void
-arptfree(la)
-	register struct llinfo_arp *la;
-{
-	register struct rtentry *rt = la->la_rt;
-	register struct sockaddr_dl *sdl;
-	if (rt == 0)
-		panic("arptfree");
-	if (rt->rt_refcnt > 0 && (sdl = SDL(rt->rt_gateway)) &&
-	    sdl->sdl_family == AF_LINK) {
-		sdl->sdl_alen = 0;
-		la->la_asked = 0;
-		rt->rt_flags &= ~RTF_REJECT;
-		return;
-	}
-	rtrequest(RTM_DELETE, rt_key(rt), (struct sockaddr *)0, rt_mask(rt),
-			0, (struct rtentry **)0);
-}
-/*
- * Lookup or enter a new address in arptab.
- */
-static struct llinfo_arp *
-arplookup(addr, create, proxy)
-	u_long addr;
-	int create, proxy;
-{
-	register struct rtentry *rt;
-	static struct sockaddr_inarp sin = {sizeof(sin), AF_INET };
-	const char *why = 0;
-
-	sin.sin_addr.s_addr = addr;
-	sin.sin_other = proxy ? SIN_PROXY : 0;
-	rt = rtalloc1((struct sockaddr *)&sin, create, 0UL);
-	if (rt == 0)
-		return (0);
-	rt->rt_refcnt--;
-
-	if (rt->rt_flags & RTF_GATEWAY)
-		why = "host is not on local network";
-	else if ((rt->rt_flags & RTF_LLINFO) == 0)
-		why = "could not allocate llinfo";
-	else if (rt->rt_gateway->sa_family != AF_LINK)
-		why = "gateway route is not ours";
-
-	if (why && create) {
-		log(LOG_DEBUG, "arplookup %s failed: %s\n",
-		    inet_ntoa(sin.sin_addr), why);
-		return 0;
-	} else if (why) {
-		return 0;
-	}
-	return ((struct llinfo_arp *)rt->rt_llinfo);
-}
-
-void
-arp_ifinit(ac, ifa)
-	struct arpcom *ac;
-	struct ifaddr *ifa;
-{
-	if (ntohl(IA_SIN(ifa)->sin_addr.s_addr) != INADDR_ANY)
-		arprequest(ac, &(IA_SIN(ifa)->sin_addr.s_addr),
-			       &(IA_SIN(ifa)->sin_addr.s_addr), ac->ac_enaddr);
-	ifa->ifa_rtrequest = arp_rtrequest;
-	ifa->ifa_flags |= RTF_CLONING;
-}
diff --git a/c/src/exec/libnetworking/netinet/if_ether.h b/c/src/exec/libnetworking/netinet/if_ether.h
deleted file mode 100644
index 22c8e97187..0000000000
--- a/c/src/exec/libnetworking/netinet/if_ether.h
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)if_ether.h	8.3 (Berkeley) 5/2/95
- *	$Id$
- */
-
-#ifndef _NETINET_IF_ETHER_H_
-#define _NETINET_IF_ETHER_H_
-
-#include <net/ethernet.h>
-
-#define	ETHERTYPE_PUP		0x0200	/* PUP protocol */
-#define	ETHERTYPE_IP		0x0800	/* IP protocol */
-#define ETHERTYPE_ARP		0x0806	/* Addr. resolution protocol */
-#define ETHERTYPE_REVARP	0x8035	/* reverse Addr. resolution protocol */
-
-/*
- * The ETHERTYPE_NTRAILER packet types starting at ETHERTYPE_TRAIL have
- * (type-ETHERTYPE_TRAIL)*512 bytes of data followed
- * by an ETHER type (as given above) and then the (variable-length) header.
- */
-#define	ETHERTYPE_TRAIL		0x1000		/* Trailer packet */
-#define	ETHERTYPE_NTRAILER	16
-
-#define	ETHERMTU	(ETHER_MAX_LEN-ETHER_HDR_LEN-ETHER_CRC_LEN)
-#define	ETHERMIN	(ETHER_MIN_LEN-ETHER_HDR_LEN-ETHER_CRC_LEN)
-
-#ifdef KERNEL
-/*
- * Macro to map an IP multicast address to an Ethernet multicast address.
- * The high-order 25 bits of the Ethernet address are statically assigned,
- * and the low-order 23 bits are taken from the low end of the IP address.
- */
-#define ETHER_MAP_IP_MULTICAST(ipaddr, enaddr) \
-	/* struct in_addr *ipaddr; */ \
-	/* u_char enaddr[ETHER_ADDR_LEN];	   */ \
-{ \
-	(enaddr)[0] = 0x01; \
-	(enaddr)[1] = 0x00; \
-	(enaddr)[2] = 0x5e; \
-	(enaddr)[3] = ((u_char *)ipaddr)[1] & 0x7f; \
-	(enaddr)[4] = ((u_char *)ipaddr)[2]; \
-	(enaddr)[5] = ((u_char *)ipaddr)[3]; \
-}
-#endif
-
-/*
- * Ethernet Address Resolution Protocol.
- *
- * See RFC 826 for protocol description.  Structure below is adapted
- * to resolving internet addresses.  Field names used correspond to
- * RFC 826.
- */
-struct	ether_arp {
-	struct	arphdr ea_hdr;	/* fixed-size header */
-	u_char	arp_sha[ETHER_ADDR_LEN];	/* sender hardware address */
-	u_char	arp_spa[4];	/* sender protocol address */
-	u_char	arp_tha[ETHER_ADDR_LEN];	/* target hardware address */
-	u_char	arp_tpa[4];	/* target protocol address */
-};
-#define	arp_hrd	ea_hdr.ar_hrd
-#define	arp_pro	ea_hdr.ar_pro
-#define	arp_hln	ea_hdr.ar_hln
-#define	arp_pln	ea_hdr.ar_pln
-#define	arp_op	ea_hdr.ar_op
-
-
-/*
- * Structure shared between the ethernet driver modules and
- * the address resolution code.  For example, each ec_softc or il_softc
- * begins with this structure.
- */
-struct	arpcom {
-	/*
-	 * The ifnet struct _must_ be at the head of this structure.
-	 */
-	struct 	ifnet ac_if;		/* network-visible interface */
-	u_char	ac_enaddr[ETHER_ADDR_LEN];		/* ethernet hardware address */
-	struct	ether_multi *ac_multiaddrs; /* list of ether multicast addrs */
-	int	ac_multicnt;		/* length of ac_multiaddrs list */
-};
-
-struct sockaddr_inarp {
-	u_char	sin_len;
-	u_char	sin_family;
-	u_short sin_port;
-	struct	in_addr sin_addr;
-	struct	in_addr sin_srcaddr;
-	u_short	sin_tos;
-	u_short	sin_other;
-#define SIN_PROXY 1
-};
-/*
- * IP and ethernet specific routing flags
- */
-#define	RTF_USETRAILERS	RTF_PROTO1	/* use trailers */
-#define RTF_ANNOUNCE	RTF_PROTO2	/* announce new arp entry */
-
-#ifdef	KERNEL
-extern u_char	etherbroadcastaddr[ETHER_ADDR_LEN];
-extern u_char	ether_ipmulticast_min[ETHER_ADDR_LEN];
-extern u_char	ether_ipmulticast_max[ETHER_ADDR_LEN];
-extern struct	ifqueue arpintrq;
-
-int	arpresolve __P((struct arpcom *, struct rtentry *, struct mbuf *,
-			struct sockaddr *, u_char *, struct rtentry *));
-void	arp_ifinit __P((struct arpcom *, struct ifaddr *));
-int	ether_addmulti __P((struct ifreq *, struct arpcom *));
-int	ether_delmulti __P((struct ifreq *, struct arpcom *));
-
-/*
- * Ethernet multicast address structure.  There is one of these for each
- * multicast address or range of multicast addresses that we are supposed
- * to listen to on a particular interface.  They are kept in a linked list,
- * rooted in the interface's arpcom structure.  (This really has nothing to
- * do with ARP, or with the Internet address family, but this appears to be
- * the minimally-disrupting place to put it.)
- */
-struct ether_multi {
-	u_char	enm_addrlo[ETHER_ADDR_LEN];		/* low  or only address of range */
-	u_char	enm_addrhi[ETHER_ADDR_LEN];		/* high or only address of range */
-	struct	arpcom *enm_ac;		/* back pointer to arpcom */
-	u_int	enm_refcount;		/* no. claims to this addr/range */
-	struct	ether_multi *enm_next;	/* ptr to next ether_multi */
-};
-
-/*
- * Structure used by macros below to remember position when stepping through
- * all of the ether_multi records.
- */
-struct ether_multistep {
-	struct ether_multi  *e_enm;
-};
-
-/*
- * Macro for looking up the ether_multi record for a given range of Ethernet
- * multicast addresses connected to a given arpcom structure.  If no matching
- * record is found, "enm" returns NULL.
- */
-#define ETHER_LOOKUP_MULTI(addrlo, addrhi, ac, enm) \
-	/* u_char addrlo[ETHER_ADDR_LEN]; */ \
-	/* u_char addrhi[ETHER_ADDR_LEN]; */ \
-	/* struct arpcom *ac; */ \
-	/* struct ether_multi *enm; */ \
-{ \
-	for ((enm) = (ac)->ac_multiaddrs; \
-	    (enm) != NULL && \
-	    (bcmp((enm)->enm_addrlo, (addrlo), ETHER_ADDR_LEN) != 0 || \
-	     bcmp((enm)->enm_addrhi, (addrhi), ETHER_ADDR_LEN) != 0); \
-		(enm) = (enm)->enm_next); \
-}
-
-/*
- * Macro to step through all of the ether_multi records, one at a time.
- * The current position is remembered in "step", which the caller must
- * provide.  ETHER_FIRST_MULTI(), below, must be called to initialize "step"
- * and get the first record.  Both macros return a NULL "enm" when there
- * are no remaining records.
- */
-#define ETHER_NEXT_MULTI(step, enm) \
-	/* struct ether_multistep step; */  \
-	/* struct ether_multi *enm; */  \
-{ \
-	if (((enm) = (step).e_enm) != NULL) \
-		(step).e_enm = (enm)->enm_next; \
-}
-
-#define ETHER_FIRST_MULTI(step, ac, enm) \
-	/* struct ether_multistep step; */ \
-	/* struct arpcom *ac; */ \
-	/* struct ether_multi *enm; */ \
-{ \
-	(step).e_enm = (ac)->ac_multiaddrs; \
-	ETHER_NEXT_MULTI((step), (enm)); \
-}
-
-#endif
-
-#endif
diff --git a/c/src/exec/libnetworking/netinet/igmp.c b/c/src/exec/libnetworking/netinet/igmp.c
deleted file mode 100644
index 2af8b7038e..0000000000
--- a/c/src/exec/libnetworking/netinet/igmp.c
+++ /dev/null
@@ -1,479 +0,0 @@
-/*
- * Copyright (c) 1988 Stephen Deering.
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Stephen Deering of Stanford University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)igmp.c	8.1 (Berkeley) 7/19/93
- * $Id$
- */
-
-/*
- * Internet Group Management Protocol (IGMP) routines.
- *
- * Written by Steve Deering, Stanford, May 1988.
- * Modified by Rosen Sharma, Stanford, Aug 1994.
- * Modified by Bill Fenner, Xerox PARC, Feb 1995.
- * Modified to fully comply to IGMPv2 by Bill Fenner, Oct 1995.
- *
- * MULTICAST Revision: 3.5.1.4
- */
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/mbuf.h>
-#include <sys/socket.h>
-#include <sys/protosw.h>
-#include <sys/kernel.h>
-#include <sys/sysctl.h>
-
-#include <net/if.h>
-#include <net/route.h>
-
-#include <netinet/in.h>
-#include <netinet/in_var.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/ip_var.h>
-#include <netinet/igmp.h>
-#include <netinet/igmp_var.h>
-
-static struct router_info *
-		find_rti __P((struct ifnet *ifp));
-
-static struct igmpstat igmpstat;
-
-SYSCTL_STRUCT(_net_inet_igmp, IGMPCTL_STATS, stats, CTLFLAG_RD,
-	&igmpstat, igmpstat, "");
-
-static int igmp_timers_are_running;
-static u_long igmp_all_hosts_group;
-static u_long igmp_all_rtrs_group;
-static struct mbuf *router_alert;
-static struct router_info *Head;
-
-static void igmp_sendpkt(struct in_multi *, int, unsigned long);
-
-void
-igmp_init()
-{
-	struct ipoption *ra;
-
-	/*
-	 * To avoid byte-swapping the same value over and over again.
-	 */
-	igmp_all_hosts_group = htonl(INADDR_ALLHOSTS_GROUP);
-	igmp_all_rtrs_group = htonl(INADDR_ALLRTRS_GROUP);
-
-	igmp_timers_are_running = 0;
-
-	/*
-	 * Construct a Router Alert option to use in outgoing packets
-	 */
-	MGET(router_alert, M_DONTWAIT, MT_DATA);
-	ra = mtod(router_alert, struct ipoption *);
-	ra->ipopt_dst.s_addr = 0;
-	ra->ipopt_list[0] = IPOPT_RA;	/* Router Alert Option */
-	ra->ipopt_list[1] = 0x04;	/* 4 bytes long */
-	ra->ipopt_list[2] = 0x00;
-	ra->ipopt_list[3] = 0x00;
-	router_alert->m_len = sizeof(ra->ipopt_dst) + ra->ipopt_list[1];
-
-	Head = (struct router_info *) 0;
-}
-
-static struct router_info *
-find_rti(ifp)
-	struct ifnet *ifp;
-{
-        register struct router_info *rti = Head;
-
-#ifdef IGMP_DEBUG
-	printf("[igmp.c, _find_rti] --> entering \n");
-#endif
-        while (rti) {
-                if (rti->rti_ifp == ifp) {
-#ifdef IGMP_DEBUG
-			printf("[igmp.c, _find_rti] --> found old entry \n");
-#endif
-                        return rti;
-                }
-                rti = rti->rti_next;
-        }
-	MALLOC(rti, struct router_info *, sizeof *rti, M_MRTABLE, M_NOWAIT);
-        rti->rti_ifp = ifp;
-        rti->rti_type = IGMP_V2_ROUTER;
-        rti->rti_time = 0;
-        rti->rti_next = Head;
-        Head = rti;
-#ifdef IGMP_DEBUG
-	printf("[igmp.c, _find_rti] --> created an entry \n");
-#endif
-        return rti;
-}
-
-void
-igmp_input(m, iphlen)
-	register struct mbuf *m;
-	register int iphlen;
-{
-	register struct igmp *igmp;
-	register struct ip *ip;
-	register int igmplen;
-	register struct ifnet *ifp = m->m_pkthdr.rcvif;
-	register int minlen;
-	register struct in_multi *inm;
-	register struct in_ifaddr *ia;
-	struct in_multistep step;
-	struct router_info *rti;
-	
-	int timer; /** timer value in the igmp query header **/
-
-	++igmpstat.igps_rcv_total;
-
-	ip = mtod(m, struct ip *);
-	igmplen = ip->ip_len;
-
-	/*
-	 * Validate lengths
-	 */
-	if (igmplen < IGMP_MINLEN) {
-		++igmpstat.igps_rcv_tooshort;
-		m_freem(m);
-		return;
-	}
-	minlen = iphlen + IGMP_MINLEN;
-	if ((m->m_flags & M_EXT || m->m_len < minlen) &&
-	    (m = m_pullup(m, minlen)) == 0) {
-		++igmpstat.igps_rcv_tooshort;
-		return;
-	}
-
-	/*
-	 * Validate checksum
-	 */
-	m->m_data += iphlen;
-	m->m_len -= iphlen;
-	igmp = mtod(m, struct igmp *);
-	if (in_cksum(m, igmplen)) {
-		++igmpstat.igps_rcv_badsum;
-		m_freem(m);
-		return;
-	}
-	m->m_data -= iphlen;
-	m->m_len += iphlen;
-
-	ip = mtod(m, struct ip *);
-	timer = igmp->igmp_code * PR_FASTHZ / IGMP_TIMER_SCALE;
-	rti = find_rti(ifp);
-
-	/*
-	 * In the IGMPv2 specification, there are 3 states and a flag.
-	 *
-	 * In Non-Member state, we simply don't have a membership record.
-	 * In Delaying Member state, our timer is running (inm->inm_timer)
-	 * In Idle Member state, our timer is not running (inm->inm_timer==0)
-	 *
-	 * The flag is inm->inm_state, it is set to IGMP_OTHERMEMBER if
-	 * we have heard a report from another member, or IGMP_IREPORTEDLAST
-	 * if I sent the last report.
-	 */
-	switch (igmp->igmp_type) {
-
-	case IGMP_MEMBERSHIP_QUERY:
-		++igmpstat.igps_rcv_queries;
-
-		if (ifp->if_flags & IFF_LOOPBACK)
-			break;
-
-		if (igmp->igmp_code == 0) {
-			/*
-			 * Old router.  Remember that the querier on this
-			 * interface is old, and set the timer to the
-			 * value in RFC 1112.
-			 */
-
-			rti->rti_type = IGMP_V1_ROUTER;
-			rti->rti_time = 0;
-
-			timer = IGMP_MAX_HOST_REPORT_DELAY * PR_FASTHZ;
-
-			if (ip->ip_dst.s_addr != igmp_all_hosts_group ||
-			    igmp->igmp_group.s_addr != 0) {
-				++igmpstat.igps_rcv_badqueries;
-				m_freem(m);
-				return;
-			}
-		} else {
-			/*
-			 * New router.  Simply do the new validity check.
-			 */
-			
-			if (igmp->igmp_group.s_addr != 0 &&
-			    !IN_MULTICAST(ntohl(igmp->igmp_group.s_addr))) {
-				++igmpstat.igps_rcv_badqueries;
-				m_freem(m);
-				return;
-			}
-		}
-
-		/*
-		 * - Start the timers in all of our membership records
-		 *   that the query applies to for the interface on
-		 *   which the query arrived excl. those that belong
-		 *   to the "all-hosts" group (224.0.0.1).
-		 * - Restart any timer that is already running but has
-		 *   a value longer than the requested timeout.
-		 * - Use the value specified in the query message as
-		 *   the maximum timeout.
-		 */
-		IN_FIRST_MULTI(step, inm);
-		while (inm != NULL) {
-			if (inm->inm_ifp == ifp &&
-			    inm->inm_addr.s_addr != igmp_all_hosts_group &&
-			    (igmp->igmp_group.s_addr == 0 ||
-			     igmp->igmp_group.s_addr == inm->inm_addr.s_addr)) {
-				if (inm->inm_timer == 0 ||
-				    inm->inm_timer > timer) {
-					inm->inm_timer =
-						IGMP_RANDOM_DELAY(timer);
-					igmp_timers_are_running = 1;
-				}
-			}
-			IN_NEXT_MULTI(step, inm);
-		}
-
-		break;
-
-	case IGMP_V1_MEMBERSHIP_REPORT:
-	case IGMP_V2_MEMBERSHIP_REPORT:
-		/*
-		 * For fast leave to work, we have to know that we are the
-		 * last person to send a report for this group.  Reports
-		 * can potentially get looped back if we are a multicast
-		 * router, so discard reports sourced by me.
-		 */
-		IFP_TO_IA(ifp, ia);
-		if (ia && ip->ip_src.s_addr == IA_SIN(ia)->sin_addr.s_addr)
-			break;
-
-		++igmpstat.igps_rcv_reports;
-
-		if (ifp->if_flags & IFF_LOOPBACK)
-			break;
-
-		if (!IN_MULTICAST(ntohl(igmp->igmp_group.s_addr))) {
-			++igmpstat.igps_rcv_badreports;
-			m_freem(m);
-			return;
-		}
-
-		/*
-		 * KLUDGE: if the IP source address of the report has an
-		 * unspecified (i.e., zero) subnet number, as is allowed for
-		 * a booting host, replace it with the correct subnet number
-		 * so that a process-level multicast routing demon can
-		 * determine which subnet it arrived from.  This is necessary
-		 * to compensate for the lack of any way for a process to
-		 * determine the arrival interface of an incoming packet.
-		 */
-		if ((ntohl(ip->ip_src.s_addr) & IN_CLASSA_NET) == 0)
-			if (ia) ip->ip_src.s_addr = htonl(ia->ia_subnet);
-
-		/*
-		 * If we belong to the group being reported, stop
-		 * our timer for that group.
-		 */
-		IN_LOOKUP_MULTI(igmp->igmp_group, ifp, inm);
-
-		if (inm != NULL) {
-			inm->inm_timer = 0;
-			++igmpstat.igps_rcv_ourreports;
-
-			inm->inm_state = IGMP_OTHERMEMBER;
-		}
-
-		break;
-	}
-
-	/*
-	 * Pass all valid IGMP packets up to any process(es) listening
-	 * on a raw IGMP socket.
-	 */
-	rip_input(m, iphlen);
-}
-
-void
-igmp_joingroup(inm)
-	struct in_multi *inm;
-{
-	int s = splnet();
-
-	if (inm->inm_addr.s_addr == igmp_all_hosts_group
-	    || inm->inm_ifp->if_flags & IFF_LOOPBACK) {
-		inm->inm_timer = 0;
-		inm->inm_state = IGMP_OTHERMEMBER;
-	} else {
-		inm->inm_rti = find_rti(inm->inm_ifp);
-		igmp_sendpkt(inm, inm->inm_rti->rti_type, 0);
-		inm->inm_timer = IGMP_RANDOM_DELAY(
-					IGMP_MAX_HOST_REPORT_DELAY*PR_FASTHZ);
-		inm->inm_state = IGMP_IREPORTEDLAST;
-		igmp_timers_are_running = 1;
-	}
-	splx(s);
-}
-
-void
-igmp_leavegroup(inm)
-	struct in_multi *inm;
-{
-	if (inm->inm_state == IGMP_IREPORTEDLAST &&
-	    inm->inm_addr.s_addr != igmp_all_hosts_group &&
-	    !(inm->inm_ifp->if_flags & IFF_LOOPBACK) &&
-	    inm->inm_rti->rti_type != IGMP_V1_ROUTER)
-		igmp_sendpkt(inm, IGMP_V2_LEAVE_GROUP, igmp_all_rtrs_group);
-}
-
-void
-igmp_fasttimo()
-{
-	register struct in_multi *inm;
-	struct in_multistep step;
-	int s;
-
-	/*
-	 * Quick check to see if any work needs to be done, in order
-	 * to minimize the overhead of fasttimo processing.
-	 */
-
-	if (!igmp_timers_are_running)
-		return;
-
-	s = splnet();
-	igmp_timers_are_running = 0;
-	IN_FIRST_MULTI(step, inm);
-	while (inm != NULL) {
-		if (inm->inm_timer == 0) {
-			/* do nothing */
-		} else if (--inm->inm_timer == 0) {
-			igmp_sendpkt(inm, inm->inm_rti->rti_type, 0);
-			inm->inm_state = IGMP_IREPORTEDLAST;
-		} else {
-			igmp_timers_are_running = 1;
-		}
-		IN_NEXT_MULTI(step, inm);
-	}
-	splx(s);
-}
-
-void
-igmp_slowtimo()
-{
-	int s = splnet();
-	register struct router_info *rti =  Head;
-
-#ifdef IGMP_DEBUG
-	printf("[igmp.c,_slowtimo] -- > entering \n");
-#endif
-	while (rti) {
-	    if (rti->rti_type == IGMP_V1_ROUTER) {
-		rti->rti_time++;
-		if (rti->rti_time >= IGMP_AGE_THRESHOLD) {
-			rti->rti_type = IGMP_V2_ROUTER;
-		}
-	    }
-	    rti = rti->rti_next;
-	}
-#ifdef IGMP_DEBUG	
-	printf("[igmp.c,_slowtimo] -- > exiting \n");
-#endif
-	splx(s);
-}
-
-static struct route igmprt;
-
-static void
-igmp_sendpkt(inm, type, addr)
-	struct in_multi *inm;
-	int type;
-	unsigned long addr;
-{
-        struct mbuf *m;
-        struct igmp *igmp;
-        struct ip *ip;
-        struct ip_moptions imo;
-
-        MGETHDR(m, M_DONTWAIT, MT_HEADER);
-        if (m == NULL)
-                return;
-
-	m->m_pkthdr.rcvif = loif;
-	m->m_pkthdr.len = sizeof(struct ip) + IGMP_MINLEN;
-	MH_ALIGN(m, IGMP_MINLEN + sizeof(struct ip));
-	m->m_data += sizeof(struct ip);
-        m->m_len = IGMP_MINLEN;
-        igmp = mtod(m, struct igmp *);
-        igmp->igmp_type   = type;
-        igmp->igmp_code   = 0;
-        igmp->igmp_group  = inm->inm_addr;
-        igmp->igmp_cksum  = 0;
-        igmp->igmp_cksum  = in_cksum(m, IGMP_MINLEN);
-
-        m->m_data -= sizeof(struct ip);
-        m->m_len += sizeof(struct ip);
-        ip = mtod(m, struct ip *);
-        ip->ip_tos        = 0;
-        ip->ip_len        = sizeof(struct ip) + IGMP_MINLEN;
-        ip->ip_off        = 0;
-        ip->ip_p          = IPPROTO_IGMP;
-        ip->ip_src.s_addr = INADDR_ANY;
-        ip->ip_dst.s_addr = addr ? addr : igmp->igmp_group.s_addr;
-
-        imo.imo_multicast_ifp  = inm->inm_ifp;
-        imo.imo_multicast_ttl  = 1;
-	imo.imo_multicast_vif  = -1;
-        /*
-         * Request loopback of the report if we are acting as a multicast
-         * router, so that the process-level routing demon can hear it.
-         */
-        imo.imo_multicast_loop = (ip_mrouter != NULL);
-
-	/*
-	 * XXX
-	 * Do we have to worry about reentrancy here?  Don't think so.
-	 */
-        ip_output(m, router_alert, &igmprt, 0, &imo);
-
-        ++igmpstat.igps_snd_reports;
-}
diff --git a/c/src/exec/libnetworking/netinet/igmp.h b/c/src/exec/libnetworking/netinet/igmp.h
deleted file mode 100644
index 01d6d09179..0000000000
--- a/c/src/exec/libnetworking/netinet/igmp.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (c) 1988 Stephen Deering.
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Stephen Deering of Stanford University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)igmp.h	8.1 (Berkeley) 6/10/93
- *	$Id$
- */
-
-#ifndef _NETINET_IGMP_H_
-#define _NETINET_IGMP_H_
-
-/*
- * Internet Group Management Protocol (IGMP) definitions.
- *
- * Written by Steve Deering, Stanford, May 1988.
- *
- * MULTICAST Revision: 3.5.1.2
- */
-
-/*
- * IGMP packet format.
- */
-struct igmp {
-	u_char		igmp_type;	/* version & type of IGMP message  */
-	u_char		igmp_code;	/* subtype for routing msgs        */
-	u_short		igmp_cksum;	/* IP-style checksum               */
-	struct in_addr	igmp_group;	/* group address being reported    */
-};					/*  (zero for queries)             */
-
-#define IGMP_MINLEN		     8
-
-/*
- * Message types, including version number.
- */
-#define IGMP_MEMBERSHIP_QUERY   	0x11	/* membership query         */
-#define IGMP_V1_MEMBERSHIP_REPORT	0x12	/* Ver. 1 membership report */
-#define IGMP_V2_MEMBERSHIP_REPORT	0x16	/* Ver. 2 membership report */
-#define IGMP_V2_LEAVE_GROUP		0x17	/* Leave-group message	    */
-
-#define IGMP_DVMRP			0x13	/* DVMRP routing message    */
-#define IGMP_PIM			0x14	/* PIM routing message	    */
-
-#define IGMP_MTRACE_RESP		0x1e  /* traceroute resp.(to sender)*/
-#define IGMP_MTRACE			0x1f  /* mcast traceroute messages  */
-
-#define IGMP_MAX_HOST_REPORT_DELAY   10    /* max delay for response to     */
-					   /*  query (in seconds) according */
-					   /*  to RFC1112                   */
-
-
-#define IGMP_TIMER_SCALE     10		/* denotes that the igmp code field */
-					/* specifies time in 10th of seconds*/
-
-/*
- * The following four defininitions are for backwards compatibility.
- * They should be removed as soon as all applications are updated to
- * use the new constant names.
- */
-#define IGMP_HOST_MEMBERSHIP_QUERY	IGMP_MEMBERSHIP_QUERY
-#define IGMP_HOST_MEMBERSHIP_REPORT	IGMP_V1_MEMBERSHIP_REPORT
-#define IGMP_HOST_NEW_MEMBERSHIP_REPORT	IGMP_V2_MEMBERSHIP_REPORT
-#define IGMP_HOST_LEAVE_MESSAGE		IGMP_V2_LEAVE_GROUP
-
-#endif /* _NETINET_IGMP_H_ */
diff --git a/c/src/exec/libnetworking/netinet/igmp_var.h b/c/src/exec/libnetworking/netinet/igmp_var.h
deleted file mode 100644
index f408bf2bc1..0000000000
--- a/c/src/exec/libnetworking/netinet/igmp_var.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright (c) 1988 Stephen Deering.
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Stephen Deering of Stanford University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)igmp_var.h	8.1 (Berkeley) 7/19/93
- * $Id$
- */
-
-#ifndef _NETINET_IGMP_VAR_H_
-#define _NETINET_IGMP_VAR_H_
-
-/*
- * Internet Group Management Protocol (IGMP),
- * implementation-specific definitions.
- *
- * Written by Steve Deering, Stanford, May 1988.
- *
- * MULTICAST Revision: 3.5.1.3
- */
-
-struct igmpstat {
-	u_int	igps_rcv_total;		/* total IGMP messages received */
-	u_int	igps_rcv_tooshort;	/* received with too few bytes */
-	u_int	igps_rcv_badsum;	/* received with bad checksum */
-	u_int	igps_rcv_queries;	/* received membership queries */
-	u_int	igps_rcv_badqueries;	/* received invalid queries */
-	u_int	igps_rcv_reports;	/* received membership reports */
-	u_int	igps_rcv_badreports;	/* received invalid reports */
-	u_int	igps_rcv_ourreports;	/* received reports for our groups */
-	u_int	igps_snd_reports;	/* sent membership reports */
-};
-
-#ifdef KERNEL
-extern struct igmpstat igmpstat;
-
-#define IGMP_RANDOM_DELAY(X) (random() % (X) + 1)
-
-/*
- * States for IGMPv2's leave processing
- */
-#define IGMP_OTHERMEMBER			0
-#define IGMP_IREPORTEDLAST			1
-
-/*
- * We must remember what version the subnet's querier is.
- * We conveniently use the IGMP message type for the proper
- * membership report to keep this state.
- */
-#define IGMP_V1_ROUTER				IGMP_V1_MEMBERSHIP_REPORT
-#define IGMP_V2_ROUTER				IGMP_V2_MEMBERSHIP_REPORT
-
-/*
- * Revert to new router if we haven't heard from an old router in
- * this amount of time.
- */
-#define IGMP_AGE_THRESHOLD			540
-
-void	igmp_init __P((void));
-void	igmp_input __P((struct mbuf *, int));
-void	igmp_joingroup __P((struct in_multi *));
-void	igmp_leavegroup __P((struct in_multi *));
-void	igmp_fasttimo __P((void));
-void	igmp_slowtimo __P((void));
-#endif
-
-/*
- * Names for IGMP sysctl objects
- */
-#define IGMPCTL_STATS		1	/* statistics (read-only) */
-#define IGMPCTL_MAXID		2
-
-#define IGMPCTL_NAMES { \
-	{ 0, 0 }, \
-	{ "stats", CTLTYPE_STRUCT }, \
-}
-
-#endif
-
-
diff --git a/c/src/exec/libnetworking/netinet/in.c b/c/src/exec/libnetworking/netinet/in.c
deleted file mode 100644
index 701406f207..0000000000
--- a/c/src/exec/libnetworking/netinet/in.c
+++ /dev/null
@@ -1,728 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)in.c	8.4 (Berkeley) 1/9/95
- *	$Id$
- */
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/systm.h>
-#include <sys/ioctl.h>
-#include <sys/errno.h>
-#include <sys/malloc.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/kernel.h>
-#include <sys/sysctl.h>
-
-#include <net/if.h>
-#include <net/route.h>
-
-#include <netinet/in_systm.h>
-#include <netinet/in.h>
-#include <netinet/in_var.h>
-#include <netinet/if_ether.h>
-
-#include <netinet/igmp_var.h>
-
-/*
- * This structure is used to keep track of in_multi chains which belong to
- * deleted interface addresses.
- */
-static LIST_HEAD(, multi_kludge) in_mk; /* XXX BSS initialization */
-
-struct multi_kludge {
-	LIST_ENTRY(multi_kludge) mk_entry;
-	struct ifnet *mk_ifp;
-	struct in_multihead mk_head;
-};
-
-static void	in_socktrim __P((struct sockaddr_in *));
-static int	in_ifinit __P((struct ifnet *,
-	    struct in_ifaddr *, struct sockaddr_in *, int));
-static void	in_ifscrub __P((struct ifnet *, struct in_ifaddr *));
-
-static int subnetsarelocal = 0;
-SYSCTL_INT(_net_inet_ip, OID_AUTO, subnets_are_local, CTLFLAG_RW, 
-	&subnetsarelocal, 0, "");
-/*
- * Return 1 if an internet address is for a ``local'' host
- * (one to which we have a connection).  If subnetsarelocal
- * is true, this includes other subnets of the local net.
- * Otherwise, it includes only the directly-connected (sub)nets.
- */
-int
-in_localaddr(in)
-	struct in_addr in;
-{
-	register u_long i = ntohl(in.s_addr);
-	register struct in_ifaddr *ia;
-
-	if (subnetsarelocal) {
-		for (ia = in_ifaddr; ia; ia = ia->ia_next)
-			if ((i & ia->ia_netmask) == ia->ia_net)
-				return (1);
-	} else {
-		for (ia = in_ifaddr; ia; ia = ia->ia_next)
-			if ((i & ia->ia_subnetmask) == ia->ia_subnet)
-				return (1);
-	}
-	return (0);
-}
-
-/*
- * Determine whether an IP address is in a reserved set of addresses
- * that may not be forwarded, or whether datagrams to that destination
- * may be forwarded.
- */
-int
-in_canforward(in)
-	struct in_addr in;
-{
-	register u_long i = ntohl(in.s_addr);
-	register u_long net;
-
-	if (IN_EXPERIMENTAL(i) || IN_MULTICAST(i))
-		return (0);
-	if (IN_CLASSA(i)) {
-		net = i & IN_CLASSA_NET;
-		if (net == 0 || net == (IN_LOOPBACKNET << IN_CLASSA_NSHIFT))
-			return (0);
-	}
-	return (1);
-}
-
-/*
- * Trim a mask in a sockaddr
- */
-static void
-in_socktrim(ap)
-struct sockaddr_in *ap;
-{
-    register char *cplim = (char *) &ap->sin_addr;
-    register char *cp = (char *) (&ap->sin_addr + 1);
-
-    ap->sin_len = 0;
-    while (--cp >= cplim)
-        if (*cp) {
-	    (ap)->sin_len = cp - (char *) (ap) + 1;
-	    break;
-	}
-}
-
-static int in_interfaces;	/* number of external internet interfaces */
-
-/*
- * Generic internet control operations (ioctl's).
- * Ifp is 0 if not an interface-specific ioctl.
- */
-/* ARGSUSED */
-int
-in_control(so, cmd, data, ifp)
-	struct socket *so;
-	u_long cmd;
-	caddr_t data;
-	register struct ifnet *ifp;
-{
-	register struct ifreq *ifr = (struct ifreq *)data;
-	register struct in_ifaddr *ia = 0, *iap;
-	register struct ifaddr *ifa;
-	struct in_ifaddr *oia;
-	struct in_aliasreq *ifra = (struct in_aliasreq *)data;
-	struct sockaddr_in oldaddr;
-	int error, hostIsNew, maskIsNew, s;
-	u_long i;
-	struct multi_kludge *mk;
-
-	/*
-	 * Find address for this interface, if it exists.
-	 *
-	 * If an alias address was specified, find that one instead of
-	 * the first one on the interface.
-	 */
-	if (ifp)
-		for (iap = in_ifaddr; iap; iap = iap->ia_next)
-			if (iap->ia_ifp == ifp) {
-				if (((struct sockaddr_in *)&ifr->ifr_addr)->sin_addr.s_addr ==
-				    iap->ia_addr.sin_addr.s_addr) {
-					ia = iap;
-					break;
-				} else if (ia == NULL) {
-					ia = iap;
-					if (ifr->ifr_addr.sa_family != AF_INET)
-						break;
-				}
-			}
-
-	switch (cmd) {
-
-	case SIOCAIFADDR:
-	case SIOCDIFADDR:
-		if (ifra->ifra_addr.sin_family == AF_INET) {
-			for (oia = ia; ia; ia = ia->ia_next) {
-				if (ia->ia_ifp == ifp  &&
-				    ia->ia_addr.sin_addr.s_addr ==
-				    ifra->ifra_addr.sin_addr.s_addr)
-					break;
-			}
-			if ((ifp->if_flags & IFF_POINTOPOINT)
-			    && (cmd == SIOCAIFADDR)
-			    && (ifra->ifra_dstaddr.sin_addr.s_addr
-				== INADDR_ANY)) {
-				return EDESTADDRREQ;
-			}
-		}
-		if (cmd == SIOCDIFADDR && ia == 0)
-			return (EADDRNOTAVAIL);
-		/* FALLTHROUGH */
-	case SIOCSIFADDR:
-	case SIOCSIFNETMASK:
-	case SIOCSIFDSTADDR:
-		if ((so->so_state & SS_PRIV) == 0)
-			return (EPERM);
-
-		if (ifp == 0)
-			panic("in_control");
-		if (ia == (struct in_ifaddr *)0) {
-			oia = (struct in_ifaddr *)
-				malloc(sizeof *oia, M_IFADDR, M_WAITOK);
-			if (oia == (struct in_ifaddr *)NULL)
-				return (ENOBUFS);
-			bzero((caddr_t)oia, sizeof *oia);
-			ia = in_ifaddr;
-			/*
-			 * Protect from ipintr() traversing address list
-			 * while we're modifying it.
-			 */
-			s = splnet();
-
-			if (ia) {
-				for ( ; ia->ia_next; ia = ia->ia_next)
-					continue;
-				ia->ia_next = oia;
-			} else
-				in_ifaddr = oia;
-			ia = oia;
-			ifa = ifp->if_addrlist;
-			if (ifa) {
-				for ( ; ifa->ifa_next; ifa = ifa->ifa_next)
-					continue;
-				ifa->ifa_next = (struct ifaddr *) ia;
-			} else
-				ifp->if_addrlist = (struct ifaddr *) ia;
-			ia->ia_ifa.ifa_addr = (struct sockaddr *)&ia->ia_addr;
-			ia->ia_ifa.ifa_dstaddr
-					= (struct sockaddr *)&ia->ia_dstaddr;
-			ia->ia_ifa.ifa_netmask
-					= (struct sockaddr *)&ia->ia_sockmask;
-			ia->ia_sockmask.sin_len = 8;
-			if (ifp->if_flags & IFF_BROADCAST) {
-				ia->ia_broadaddr.sin_len = sizeof(ia->ia_addr);
-				ia->ia_broadaddr.sin_family = AF_INET;
-			}
-			ia->ia_ifp = ifp;
-			if (!(ifp->if_flags & IFF_LOOPBACK))
-				in_interfaces++;
-			splx(s);
-		}
-		break;
-
-	case SIOCSIFBRDADDR:
-		if ((so->so_state & SS_PRIV) == 0)
-			return (EPERM);
-		/* FALLTHROUGH */
-
-	case SIOCGIFADDR:
-	case SIOCGIFNETMASK:
-	case SIOCGIFDSTADDR:
-	case SIOCGIFBRDADDR:
-		if (ia == (struct in_ifaddr *)0)
-			return (EADDRNOTAVAIL);
-		break;
-	}
-	switch (cmd) {
-
-	case SIOCGIFADDR:
-		*((struct sockaddr_in *)&ifr->ifr_addr) = ia->ia_addr;
-		break;
-
-	case SIOCGIFBRDADDR:
-		if ((ifp->if_flags & IFF_BROADCAST) == 0)
-			return (EINVAL);
-		*((struct sockaddr_in *)&ifr->ifr_dstaddr) = ia->ia_broadaddr;
-		break;
-
-	case SIOCGIFDSTADDR:
-		if ((ifp->if_flags & IFF_POINTOPOINT) == 0)
-			return (EINVAL);
-		*((struct sockaddr_in *)&ifr->ifr_dstaddr) = ia->ia_dstaddr;
-		break;
-
-	case SIOCGIFNETMASK:
-		*((struct sockaddr_in *)&ifr->ifr_addr) = ia->ia_sockmask;
-		break;
-
-	case SIOCSIFDSTADDR:
-		if ((ifp->if_flags & IFF_POINTOPOINT) == 0)
-			return (EINVAL);
-		oldaddr = ia->ia_dstaddr;
-		ia->ia_dstaddr = *(struct sockaddr_in *)&ifr->ifr_dstaddr;
-		if (ifp->if_ioctl && (error = (*ifp->if_ioctl)
-					(ifp, SIOCSIFDSTADDR, (caddr_t)ia))) {
-			ia->ia_dstaddr = oldaddr;
-			return (error);
-		}
-		if (ia->ia_flags & IFA_ROUTE) {
-			ia->ia_ifa.ifa_dstaddr = (struct sockaddr *)&oldaddr;
-			rtinit(&(ia->ia_ifa), (int)RTM_DELETE, RTF_HOST);
-			ia->ia_ifa.ifa_dstaddr =
-					(struct sockaddr *)&ia->ia_dstaddr;
-			rtinit(&(ia->ia_ifa), (int)RTM_ADD, RTF_HOST|RTF_UP);
-		}
-		break;
-
-	case SIOCSIFBRDADDR:
-		if ((ifp->if_flags & IFF_BROADCAST) == 0)
-			return (EINVAL);
-		ia->ia_broadaddr = *(struct sockaddr_in *)&ifr->ifr_broadaddr;
-		break;
-
-	case SIOCSIFADDR:
-		return (in_ifinit(ifp, ia,
-		    (struct sockaddr_in *) &ifr->ifr_addr, 1));
-
-	case SIOCSIFNETMASK:
-		i = ifra->ifra_addr.sin_addr.s_addr;
-		ia->ia_subnetmask = ntohl(ia->ia_sockmask.sin_addr.s_addr = i);
-		break;
-
-	case SIOCAIFADDR:
-		maskIsNew = 0;
-		hostIsNew = 1;
-		error = 0;
-		if (ia->ia_addr.sin_family == AF_INET) {
-			if (ifra->ifra_addr.sin_len == 0) {
-				ifra->ifra_addr = ia->ia_addr;
-				hostIsNew = 0;
-			} else if (ifra->ifra_addr.sin_addr.s_addr ==
-					       ia->ia_addr.sin_addr.s_addr)
-				hostIsNew = 0;
-		}
-		if (ifra->ifra_mask.sin_len) {
-			in_ifscrub(ifp, ia);
-			ia->ia_sockmask = ifra->ifra_mask;
-			ia->ia_subnetmask =
-			     ntohl(ia->ia_sockmask.sin_addr.s_addr);
-			maskIsNew = 1;
-		}
-		if ((ifp->if_flags & IFF_POINTOPOINT) &&
-		    (ifra->ifra_dstaddr.sin_family == AF_INET)) {
-			in_ifscrub(ifp, ia);
-			ia->ia_dstaddr = ifra->ifra_dstaddr;
-			maskIsNew  = 1; /* We lie; but the effect's the same */
-		}
-		if (ifra->ifra_addr.sin_family == AF_INET &&
-		    (hostIsNew || maskIsNew))
-			error = in_ifinit(ifp, ia, &ifra->ifra_addr, 0);
-		if ((ifp->if_flags & IFF_BROADCAST) &&
-		    (ifra->ifra_broadaddr.sin_family == AF_INET))
-			ia->ia_broadaddr = ifra->ifra_broadaddr;
-		return (error);
-
-	case SIOCDIFADDR:
-		mk = malloc(sizeof *mk, M_IPMADDR, M_WAITOK);
-		if (!mk)
-			return ENOBUFS;
-
-		in_ifscrub(ifp, ia);
-		/*
-		 * Protect from ipintr() traversing address list
-		 * while we're modifying it.
-		 */
-		s = splnet();
-
-		if ((ifa = ifp->if_addrlist) == (struct ifaddr *)ia)
-			ifp->if_addrlist = ifa->ifa_next;
-		else {
-			while (ifa->ifa_next &&
-			       (ifa->ifa_next != (struct ifaddr *)ia))
-				    ifa = ifa->ifa_next;
-			if (ifa->ifa_next)
-				ifa->ifa_next = ((struct ifaddr *)ia)->ifa_next;
-			else
-				printf("Couldn't unlink inifaddr from ifp\n");
-		}
-		oia = ia;
-		if (oia == (ia = in_ifaddr))
-			in_ifaddr = ia->ia_next;
-		else {
-			while (ia->ia_next && (ia->ia_next != oia))
-				ia = ia->ia_next;
-			if (ia->ia_next)
-				ia->ia_next = oia->ia_next;
-			else
-				printf("Didn't unlink inifadr from list\n");
-		}
-
-		if (!oia->ia_multiaddrs.lh_first) {
-			IFAFREE(&oia->ia_ifa);
-			FREE(mk, M_IPMADDR);
-			splx(s);
-			break;
-		}
-
-		/*
-		 * Multicast address kludge:
-		 * If there were any multicast addresses attached to this
-		 * interface address, either move them to another address
-		 * on this interface, or save them until such time as this
-		 * interface is reconfigured for IP.
-		 */
-		IFP_TO_IA(oia->ia_ifp, ia);
-		if (ia) {	/* there is another address */
-			struct in_multi *inm;
-			for(inm = oia->ia_multiaddrs.lh_first; inm;
-			    inm = inm->inm_entry.le_next) {
-				IFAFREE(&inm->inm_ia->ia_ifa);
-				ia->ia_ifa.ifa_refcnt++;
-				inm->inm_ia = ia;
-				LIST_INSERT_HEAD(&ia->ia_multiaddrs, inm,
-						 inm_entry);
-			}
-			FREE(mk, M_IPMADDR);
-		} else {	/* last address on this if deleted, save */
-			struct in_multi *inm;
-
-			LIST_INIT(&mk->mk_head);
-			mk->mk_ifp = ifp;
-
-			for(inm = oia->ia_multiaddrs.lh_first; inm;
-			    inm = inm->inm_entry.le_next) {
-				LIST_INSERT_HEAD(&mk->mk_head, inm, inm_entry);
-			}
-
-			if (mk->mk_head.lh_first) {
-				LIST_INSERT_HEAD(&in_mk, mk, mk_entry);
-			} else {
-				FREE(mk, M_IPMADDR);
-			}
-		}
-
-		IFAFREE((&oia->ia_ifa));
-		splx(s);
-		break;
-
-	default:
-		if (ifp == 0 || ifp->if_ioctl == 0)
-			return (EOPNOTSUPP);
-		return ((*ifp->if_ioctl)(ifp, cmd, data));
-	}
-	return (0);
-}
-
-/*
- * Delete any existing route for an interface.
- */
-static void
-in_ifscrub(ifp, ia)
-	register struct ifnet *ifp;
-	register struct in_ifaddr *ia;
-{
-
-	if ((ia->ia_flags & IFA_ROUTE) == 0)
-		return;
-	if (ifp->if_flags & (IFF_LOOPBACK|IFF_POINTOPOINT))
-		rtinit(&(ia->ia_ifa), (int)RTM_DELETE, RTF_HOST);
-	else
-		rtinit(&(ia->ia_ifa), (int)RTM_DELETE, 0);
-	ia->ia_flags &= ~IFA_ROUTE;
-}
-
-/*
- * Initialize an interface's internet address
- * and routing table entry.
- */
-static int
-in_ifinit(ifp, ia, sin, scrub)
-	register struct ifnet *ifp;
-	register struct in_ifaddr *ia;
-	struct sockaddr_in *sin;
-	int scrub;
-{
-	register u_long i = ntohl(sin->sin_addr.s_addr);
-	struct sockaddr_in oldaddr;
-	int s = splimp(), flags = RTF_UP, error;
-	struct multi_kludge *mk;
-
-	oldaddr = ia->ia_addr;
-	ia->ia_addr = *sin;
-	/*
-	 * Give the interface a chance to initialize
-	 * if this is its first address,
-	 * and to validate the address if necessary.
-	 */
-	if (ifp->if_ioctl &&
-	    (error = (*ifp->if_ioctl)(ifp, SIOCSIFADDR, (caddr_t)ia))) {
-		splx(s);
-		ia->ia_addr = oldaddr;
-		return (error);
-	}
-	splx(s);
-	if (scrub) {
-		ia->ia_ifa.ifa_addr = (struct sockaddr *)&oldaddr;
-		in_ifscrub(ifp, ia);
-		ia->ia_ifa.ifa_addr = (struct sockaddr *)&ia->ia_addr;
-	}
-	if (IN_CLASSA(i))
-		ia->ia_netmask = IN_CLASSA_NET;
-	else if (IN_CLASSB(i))
-		ia->ia_netmask = IN_CLASSB_NET;
-	else
-		ia->ia_netmask = IN_CLASSC_NET;
-	/*
-	 * The subnet mask usually includes at least the standard network part,
-	 * but may may be smaller in the case of supernetting.
-	 * If it is set, we believe it.
-	 */
-	if (ia->ia_subnetmask == 0) {
-		ia->ia_subnetmask = ia->ia_netmask;
-		ia->ia_sockmask.sin_addr.s_addr = htonl(ia->ia_subnetmask);
-	} else
-		ia->ia_netmask &= ia->ia_subnetmask;
-	ia->ia_net = i & ia->ia_netmask;
-	ia->ia_subnet = i & ia->ia_subnetmask;
-	in_socktrim(&ia->ia_sockmask);
-	/*
-	 * Add route for the network.
-	 */
-	ia->ia_ifa.ifa_metric = ifp->if_metric;
-	if (ifp->if_flags & IFF_BROADCAST) {
-		ia->ia_broadaddr.sin_addr.s_addr =
-			htonl(ia->ia_subnet | ~ia->ia_subnetmask);
-		ia->ia_netbroadcast.s_addr =
-			htonl(ia->ia_net | ~ ia->ia_netmask);
-	} else if (ifp->if_flags & IFF_LOOPBACK) {
-		ia->ia_ifa.ifa_dstaddr = ia->ia_ifa.ifa_addr;
-		flags |= RTF_HOST;
-	} else if (ifp->if_flags & IFF_POINTOPOINT) {
-		if (ia->ia_dstaddr.sin_family != AF_INET)
-			return (0);
-		flags |= RTF_HOST;
-	}
-	if ((error = rtinit(&(ia->ia_ifa), (int)RTM_ADD, flags)) == 0)
-		ia->ia_flags |= IFA_ROUTE;
-
-	LIST_INIT(&ia->ia_multiaddrs);
-	/*
-	 * If the interface supports multicast, join the "all hosts"
-	 * multicast group on that interface.
-	 */
-	if (ifp->if_flags & IFF_MULTICAST) {
-		struct in_addr addr;
-
-		/*
-		 * Continuation of multicast address hack:
-		 * If there was a multicast group list previously saved
-		 * for this interface, then we re-attach it to the first
-		 * address configured on the i/f.
-		 */
-		for(mk = in_mk.lh_first; mk; mk = mk->mk_entry.le_next) {
-			if(mk->mk_ifp == ifp) {
-				struct in_multi *inm;
-
-				for(inm = mk->mk_head.lh_first; inm;
-				    inm = inm->inm_entry.le_next) {
-					IFAFREE(&inm->inm_ia->ia_ifa);
-					ia->ia_ifa.ifa_refcnt++;
-					inm->inm_ia = ia;
-					LIST_INSERT_HEAD(&ia->ia_multiaddrs,
-							 inm, inm_entry);
-				}
-				LIST_REMOVE(mk, mk_entry);
-				free(mk, M_IPMADDR);
-				break;
-			}
-		}
-
-		addr.s_addr = htonl(INADDR_ALLHOSTS_GROUP);
-		in_addmulti(&addr, ifp);
-	}
-	return (error);
-}
-
-
-/*
- * Return 1 if the address might be a local broadcast address.
- */
-int
-in_broadcast(in, ifp)
-	struct in_addr in;
-        struct ifnet *ifp;
-{
-	register struct ifaddr *ifa;
-	u_long t;
-
-	if (in.s_addr == INADDR_BROADCAST ||
-	    in.s_addr == INADDR_ANY)
-		return 1;
-	if ((ifp->if_flags & IFF_BROADCAST) == 0)
-		return 0;
-	t = ntohl(in.s_addr);
-	/*
-	 * Look through the list of addresses for a match
-	 * with a broadcast address.
-	 */
-#define ia ((struct in_ifaddr *)ifa)
-	for (ifa = ifp->if_addrlist; ifa; ifa = ifa->ifa_next)
-		if (ifa->ifa_addr->sa_family == AF_INET &&
-		    (in.s_addr == ia->ia_broadaddr.sin_addr.s_addr ||
-		     in.s_addr == ia->ia_netbroadcast.s_addr ||
-		     /*
-		      * Check for old-style (host 0) broadcast.
-		      */
-		     t == ia->ia_subnet || t == ia->ia_net) &&
-		     /*
-		      * Check for an all one subnetmask. These
-		      * only exist when an interface gets a secondary
-		      * address.
-		      */
-		     ia->ia_subnetmask != (u_long)0xffffffff)
-			    return 1;
-	return (0);
-#undef ia
-}
-/*
- * Add an address to the list of IP multicast addresses for a given interface.
- */
-struct in_multi *
-in_addmulti(ap, ifp)
-	register struct in_addr *ap;
-	register struct ifnet *ifp;
-{
-	register struct in_multi *inm;
-	struct ifreq ifr;
-	struct in_ifaddr *ia;
-	int s = splnet();
-
-	/*
-	 * See if address already in list.
-	 */
-	IN_LOOKUP_MULTI(*ap, ifp, inm);
-	if (inm != NULL) {
-		/*
-		 * Found it; just increment the reference count.
-		 */
-		++inm->inm_refcount;
-	}
-	else {
-		/*
-		 * New address; allocate a new multicast record
-		 * and link it into the interface's multicast list.
-		 */
-		inm = (struct in_multi *)malloc(sizeof(*inm),
-		    M_IPMADDR, M_NOWAIT);
-		if (inm == NULL) {
-			splx(s);
-			return (NULL);
-		}
-		inm->inm_addr = *ap;
-		inm->inm_ifp = ifp;
-		inm->inm_refcount = 1;
-		IFP_TO_IA(ifp, ia);
-		if (ia == NULL) {
-			free(inm, M_IPMADDR);
-			splx(s);
-			return (NULL);
-		}
-		inm->inm_ia = ia;
-		ia->ia_ifa.ifa_refcnt++; /* gain a reference */
-		LIST_INSERT_HEAD(&ia->ia_multiaddrs, inm, inm_entry);
-
-		/*
-		 * Ask the network driver to update its multicast reception
-		 * filter appropriately for the new address.
-		 */
-		((struct sockaddr_in *)&ifr.ifr_addr)->sin_family = AF_INET;
-		((struct sockaddr_in *)&ifr.ifr_addr)->sin_addr = *ap;
-		if ((ifp->if_ioctl == NULL) ||
-		    (*ifp->if_ioctl)(ifp, SIOCADDMULTI,(caddr_t)&ifr) != 0) {
-			LIST_REMOVE(inm, inm_entry);
-			IFAFREE(&ia->ia_ifa); /* release reference */
-			free(inm, M_IPMADDR);
-			splx(s);
-			return (NULL);
-		}
-		/*
-		 * Let IGMP know that we have joined a new IP multicast group.
-		 */
-		igmp_joingroup(inm);
-	}
-	splx(s);
-	return (inm);
-}
-
-/*
- * Delete a multicast address record.
- */
-void
-in_delmulti(inm)
-	register struct in_multi *inm;
-{
-	struct ifreq ifr;
-	int s = splnet();
-
-	if (--inm->inm_refcount == 0) {
-		/*
-		 * No remaining claims to this record; let IGMP know that
-		 * we are leaving the multicast group.
-		 */
-		igmp_leavegroup(inm);
-		/*
-		 * Unlink from list.
-		 */
-		LIST_REMOVE(inm, inm_entry);
-		IFAFREE(&inm->inm_ia->ia_ifa); /* release reference */
-
-		/*
-		 * Notify the network driver to update its multicast reception
-		 * filter.
-		 */
-		((struct sockaddr_in *)&(ifr.ifr_addr))->sin_family = AF_INET;
-		((struct sockaddr_in *)&(ifr.ifr_addr))->sin_addr =
-								inm->inm_addr;
-		(*inm->inm_ifp->if_ioctl)(inm->inm_ifp, SIOCDELMULTI,
-							     (caddr_t)&ifr);
-		free(inm, M_IPMADDR);
-	}
-	splx(s);
-}
diff --git a/c/src/exec/libnetworking/netinet/in.h b/c/src/exec/libnetworking/netinet/in.h
deleted file mode 100644
index ba3cbb21cc..0000000000
--- a/c/src/exec/libnetworking/netinet/in.h
+++ /dev/null
@@ -1,433 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)in.h	8.3 (Berkeley) 1/3/94
- * $Id$
- */
-
-#ifndef _NETINET_IN_H_
-#define _NETINET_IN_H_
-
-/*
- * Constants and structures defined by the internet system,
- * Per RFC 790, September 1981, and numerous additions.
- */
-
-/*
- * Protocols (RFC 1700)
- */
-#define	IPPROTO_IP		0		/* dummy for IP */
-#define	IPPROTO_ICMP		1		/* control message protocol */
-#define	IPPROTO_IGMP		2		/* group mgmt protocol */
-#define	IPPROTO_GGP		3		/* gateway^2 (deprecated) */
-#define IPPROTO_IPIP		4 		/* IP encapsulation in IP */
-#define	IPPROTO_TCP		6		/* tcp */
-#define	IPPROTO_ST		7		/* Stream protocol II */
-#define	IPPROTO_EGP		8		/* exterior gateway protocol */
-#define	IPPROTO_PIGP		9		/* private interior gateway */
-#define	IPPROTO_RCCMON		10		/* BBN RCC Monitoring */
-#define	IPPROTO_NVPII		11		/* network voice protocol*/
-#define	IPPROTO_PUP		12		/* pup */
-#define	IPPROTO_ARGUS		13		/* Argus */
-#define	IPPROTO_EMCON		14		/* EMCON */
-#define	IPPROTO_XNET		15		/* Cross Net Debugger */
-#define	IPPROTO_CHAOS		16		/* Chaos*/
-#define	IPPROTO_UDP		17		/* user datagram protocol */
-#define	IPPROTO_MUX		18		/* Multiplexing */
-#define	IPPROTO_MEAS		19		/* DCN Measurement Subsystems */
-#define	IPPROTO_HMP		20		/* Host Monitoring */
-#define	IPPROTO_PRM		21		/* Packet Radio Measurement */
-#define	IPPROTO_IDP		22		/* xns idp */
-#define	IPPROTO_TRUNK1		23		/* Trunk-1 */
-#define	IPPROTO_TRUNK2		24		/* Trunk-2 */
-#define	IPPROTO_LEAF1		25		/* Leaf-1 */
-#define	IPPROTO_LEAF2		26		/* Leaf-2 */
-#define	IPPROTO_RDP		27		/* Reliable Data */
-#define	IPPROTO_IRTP		28		/* Reliable Transaction */
-#define	IPPROTO_TP		29 		/* tp-4 w/ class negotiation */
-#define	IPPROTO_BLT		30		/* Bulk Data Transfer */
-#define	IPPROTO_NSP		31		/* Network Services */
-#define	IPPROTO_INP		32		/* Merit Internodal */
-#define	IPPROTO_SEP		33		/* Sequential Exchange */
-#define	IPPROTO_3PC		34		/* Third Party Connect */
-#define	IPPROTO_IDPR		35		/* InterDomain Policy Routing */
-#define	IPPROTO_XTP		36		/* XTP */
-#define	IPPROTO_DDP		37		/* Datagram Delivery */
-#define	IPPROTO_CMTP		38		/* Control Message Transport */
-#define	IPPROTO_TPXX		39		/* TP++ Transport */
-#define	IPPROTO_IL		40		/* IL transport protocol */
-#define	IPPROTO_SIP		41		/* Simple Internet Protocol */
-#define	IPPROTO_SDRP		42		/* Source Demand Routing */
-#define	IPPROTO_SIPSR		43		/* SIP Source Route */
-#define	IPPROTO_SIPFRAG		44		/* SIP Fragment */
-#define	IPPROTO_IDRP		45		/* InterDomain Routing*/
-#define IPPROTO_RSVP		46 		/* resource reservation */
-#define	IPPROTO_GRE		47		/* General Routing Encap. */
-#define	IPPROTO_MHRP		48		/* Mobile Host Routing */
-#define	IPPROTO_BHA		49		/* BHA */
-#define	IPPROTO_ESP		50		/* SIPP Encap Sec. Payload */
-#define	IPPROTO_AH		51		/* SIPP Auth Header */
-#define	IPPROTO_INLSP		52		/* Integ. Net Layer Security */
-#define	IPPROTO_SWIPE		53		/* IP with encryption */
-#define	IPPROTO_NHRP		54		/* Next Hop Resolution */
-/* 55-60: Unassigned */
-#define	IPPROTO_AHIP		61		/* any host internal protocol */
-#define	IPPROTO_CFTP		62		/* CFTP */
-#define	IPPROTO_HELLO		63		/* "hello" routing protocol */
-#define	IPPROTO_SATEXPAK	64		/* SATNET/Backroom EXPAK */
-#define	IPPROTO_KRYPTOLAN	65		/* Kryptolan */
-#define	IPPROTO_RVD		66		/* Remote Virtual Disk */
-#define	IPPROTO_IPPC		67		/* Pluribus Packet Core */
-#define	IPPROTO_ADFS		68		/* Any distributed FS */
-#define	IPPROTO_SATMON		69		/* Satnet Monitoring */
-#define	IPPROTO_VISA		70		/* VISA Protocol */
-#define	IPPROTO_IPCV		71		/* Packet Core Utility */
-#define	IPPROTO_CPNX		72		/* Comp. Prot. Net. Executive */
-#define	IPPROTO_CPHB		73		/* Comp. Prot. HeartBeat */
-#define	IPPROTO_WSN		74		/* Wang Span Network */
-#define	IPPROTO_PVP		75		/* Packet Video Protocol */
-#define	IPPROTO_BRSATMON	76		/* BackRoom SATNET Monitoring */
-#define	IPPROTO_ND		77		/* Sun net disk proto (temp.) */
-#define	IPPROTO_WBMON		78		/* WIDEBAND Monitoring */
-#define	IPPROTO_WBEXPAK		79		/* WIDEBAND EXPAK */
-#define	IPPROTO_EON		80		/* ISO cnlp */
-#define	IPPROTO_VMTP		81		/* VMTP */
-#define	IPPROTO_SVMTP		82		/* Secure VMTP */
-#define	IPPROTO_VINES		83		/* Banyon VINES */
-#define	IPPROTO_TTP		84		/* TTP */
-#define	IPPROTO_IGP		85		/* NSFNET-IGP */
-#define	IPPROTO_DGP		86		/* dissimilar gateway prot. */
-#define	IPPROTO_TCF		87		/* TCF */
-#define	IPPROTO_IGRP		88		/* Cisco/GXS IGRP */
-#define	IPPROTO_OSPFIGP		89		/* OSPFIGP */
-#define	IPPROTO_SRPC		90		/* Strite RPC protocol */
-#define	IPPROTO_LARP		91		/* Locus Address Resoloution */
-#define	IPPROTO_MTP		92		/* Multicast Transport */
-#define	IPPROTO_AX25		93		/* AX.25 Frames */
-#define	IPPROTO_IPEIP		94		/* IP encapsulated in IP */
-#define	IPPROTO_MICP		95		/* Mobile Int.ing control */
-#define	IPPROTO_SCCSP		96		/* Semaphore Comm. security */
-#define	IPPROTO_ETHERIP		97		/* Ethernet IP encapsulation */
-#define	IPPROTO_ENCAP		98		/* encapsulation header */
-#define	IPPROTO_APES		99		/* any private encr. scheme */
-#define	IPPROTO_GMTP		100		/* GMTP*/
-/* 101-254: Unassigned */
-/* 255: Reserved */
-/* BSD Private, local use, namespace incursion */
-#define	IPPROTO_DIVERT		254		/* divert pseudo-protocol */
-#define	IPPROTO_RAW		255		/* raw IP packet */
-#define	IPPROTO_MAX		256
-
-
-/*
- * Local port number conventions:
- *
- * When a user does a bind(2) or connect(2) with a port number of zero,
- * a non-conflicting local port address is chosen.
- * The default range is IPPORT_RESERVED through
- * IPPORT_USERRESERVED, although that is settable by sysctl.
- *
- * A user may set the IPPROTO_IP option IP_PORTRANGE to change this
- * default assignment range.
- *
- * The value IP_PORTRANGE_DEFAULT causes the default behavior.
- *
- * The value IP_PORTRANGE_HIGH changes the range of candidate port numbers
- * into the "high" range.  These are reserved for client outbound connections
- * which do not want to be filtered by any firewalls.
- *
- * The value IP_PORTRANGE_LOW changes the range to the "low" are
- * that is (by convention) restricted to privileged processes.  This
- * convention is based on "vouchsafe" principles only.  It is only secure
- * if you trust the remote host to restrict these ports.
- *
- * The default range of ports and the high range can be changed by
- * sysctl(3).  (net.inet.ip.port{hi,low}{first,last}_auto)
- *
- * Changing those values has bad security implications if you are
- * using a a stateless firewall that is allowing packets outside of that
- * range in order to allow transparent outgoing connections.
- *
- * Such a firewall configuration will generally depend on the use of these
- * default values.  If you change them, you may find your Security
- * Administrator looking for you with a heavy object.
- */
-
-/*
- * Ports < IPPORT_RESERVED are reserved for
- * privileged processes (e.g. root).         (IP_PORTRANGE_LOW)
- * Ports > IPPORT_USERRESERVED are reserved
- * for servers, not necessarily privileged.  (IP_PORTRANGE_DEFAULT)
- */
-#define	IPPORT_RESERVED		1024
-#define	IPPORT_USERRESERVED	5000
-
-/*
- * Default local port range to use by setting IP_PORTRANGE_HIGH
- */
-#define	IPPORT_HIFIRSTAUTO	40000
-#define	IPPORT_HILASTAUTO	44999
-
-/*
- * Scanning for a free reserved port return a value below IPPORT_RESERVED,
- * but higher than IPPORT_RESERVEDSTART.  Traditionally the start value was
- * 512, but that conflicts with some well-known-services that firewalls may
- * have a fit if we use.
- */
-#define IPPORT_RESERVEDSTART	600
-
-/*
- * Internet address (a structure for historical reasons)
- */
-struct in_addr {
-	u_long s_addr;
-};
-
-/*
- * Definitions of bits in internet address integers.
- * On subnets, the decomposition of addresses to host and net parts
- * is done according to subnet mask, not the masks here.
- */
-#define	IN_CLASSA(i)		(((long)(i) & 0x80000000) == 0)
-#define	IN_CLASSA_NET		0xff000000
-#define	IN_CLASSA_NSHIFT	24
-#define	IN_CLASSA_HOST		0x00ffffff
-#define	IN_CLASSA_MAX		128
-
-#define	IN_CLASSB(i)		(((long)(i) & 0xc0000000) == 0x80000000)
-#define	IN_CLASSB_NET		0xffff0000
-#define	IN_CLASSB_NSHIFT	16
-#define	IN_CLASSB_HOST		0x0000ffff
-#define	IN_CLASSB_MAX		65536
-
-#define	IN_CLASSC(i)		(((long)(i) & 0xe0000000) == 0xc0000000)
-#define	IN_CLASSC_NET		0xffffff00
-#define	IN_CLASSC_NSHIFT	8
-#define	IN_CLASSC_HOST		0x000000ff
-
-#define	IN_CLASSD(i)		(((long)(i) & 0xf0000000) == 0xe0000000)
-#define	IN_CLASSD_NET		0xf0000000	/* These ones aren't really */
-#define	IN_CLASSD_NSHIFT	28		/* net and host fields, but */
-#define	IN_CLASSD_HOST		0x0fffffff	/* routing needn't know.    */
-#define	IN_MULTICAST(i)		IN_CLASSD(i)
-
-#define	IN_EXPERIMENTAL(i)	(((long)(i) & 0xf0000000) == 0xf0000000)
-#define	IN_BADCLASS(i)		(((long)(i) & 0xf0000000) == 0xf0000000)
-
-#define	INADDR_ANY		(u_long)0x00000000
-#define	INADDR_BROADCAST	(u_long)0xffffffff	/* must be masked */
-#ifndef KERNEL
-#define	INADDR_NONE		0xffffffff		/* -1 return */
-#endif
-
-#define	INADDR_UNSPEC_GROUP	(u_long)0xe0000000	/* 224.0.0.0 */
-#define	INADDR_ALLHOSTS_GROUP	(u_long)0xe0000001	/* 224.0.0.1 */
-#define	INADDR_ALLRTRS_GROUP	(u_long)0xe0000002	/* 224.0.0.2 */
-#define	INADDR_MAX_LOCAL_GROUP	(u_long)0xe00000ff	/* 224.0.0.255 */
-
-#define	IN_LOOPBACKNET		127			/* official! */
-
-/*
- * Socket address, internet style.
- */
-struct sockaddr_in {
-	u_char	sin_len;
-	u_char	sin_family;
-	u_short	sin_port;
-	struct	in_addr sin_addr;
-	char	sin_zero[8];
-};
-
-/*
- * Structure used to describe IP options.
- * Used to store options internally, to pass them to a process,
- * or to restore options retrieved earlier.
- * The ip_dst is used for the first-hop gateway when using a source route
- * (this gets put into the header proper).
- */
-struct ip_opts {
-	struct	in_addr ip_dst;		/* first hop, 0 w/o src rt */
-	char	ip_opts[40];		/* actually variable in size */
-};
-
-/*
- * Options for use with [gs]etsockopt at the IP level.
- * First word of comment is data type; bool is stored in int.
- */
-#define	IP_OPTIONS		1    /* buf/ip_opts; set/get IP options */
-#define	IP_HDRINCL		2    /* int; header is included with data */
-#define	IP_TOS			3    /* int; IP type of service and preced. */
-#define	IP_TTL			4    /* int; IP time to live */
-#define	IP_RECVOPTS		5    /* bool; receive all IP opts w/dgram */
-#define	IP_RECVRETOPTS		6    /* bool; receive IP opts for response */
-#define	IP_RECVDSTADDR		7    /* bool; receive IP dst addr w/dgram */
-#define	IP_RETOPTS		8    /* ip_opts; set/get IP options */
-#define	IP_MULTICAST_IF		9    /* u_char; set/get IP multicast i/f  */
-#define	IP_MULTICAST_TTL	10   /* u_char; set/get IP multicast ttl */
-#define	IP_MULTICAST_LOOP	11   /* u_char; set/get IP multicast loopback */
-#define	IP_ADD_MEMBERSHIP	12   /* ip_mreq; add an IP group membership */
-#define	IP_DROP_MEMBERSHIP	13   /* ip_mreq; drop an IP group membership */
-#define IP_MULTICAST_VIF	14   /* set/get IP mcast virt. iface */
-#define IP_RSVP_ON		15   /* enable RSVP in kernel */
-#define IP_RSVP_OFF		16   /* disable RSVP in kernel */
-#define IP_RSVP_VIF_ON		17   /* set RSVP per-vif socket */
-#define IP_RSVP_VIF_OFF		18   /* unset RSVP per-vif socket */
-#define IP_PORTRANGE		19   /* int; range to choose for unspec port */
-#define	IP_RECVIF		20   /* bool; receive reception if w/dgram */
-
-#define IP_FW_ADD     		50   /* add a firewall rule to chain */
-#define IP_FW_DEL    		51   /* delete a firewall rule from chain */
-#define IP_FW_FLUSH   		52   /* flush firewall rule chain */
-#define IP_FW_ZERO    		53   /* clear single/all firewall counter(s) */
-#define IP_FW_GET     		54   /* get entire firewall rule chain */
-#define IP_NAT			55   /* set/get NAT opts */
-
-/*
- * Defaults and limits for options
- */
-#define	IP_DEFAULT_MULTICAST_TTL  1	/* normally limit m'casts to 1 hop  */
-#define	IP_DEFAULT_MULTICAST_LOOP 1	/* normally hear sends if a member  */
-#define	IP_MAX_MEMBERSHIPS	20	/* per socket */
-
-/*
- * Argument structure for IP_ADD_MEMBERSHIP and IP_DROP_MEMBERSHIP.
- */
-struct ip_mreq {
-	struct	in_addr imr_multiaddr;	/* IP multicast address of group */
-	struct	in_addr imr_interface;	/* local IP address of interface */
-};
-
-/*
- * Argument for IP_PORTRANGE:
- * - which range to search when port is unspecified at bind() or connect()
- */
-#define	IP_PORTRANGE_DEFAULT	0	/* default range */
-#define	IP_PORTRANGE_HIGH	1	/* "high" - request firewall bypass */
-#define	IP_PORTRANGE_LOW	2	/* "low" - vouchsafe security */
-
-/*
- * Definitions for inet sysctl operations.
- *
- * Third level is protocol number.
- * Fourth level is desired variable within that protocol.
- */
-#define	IPPROTO_MAXID	(IPPROTO_IDP + 1)	/* don't list to IPPROTO_MAX */
-
-#define	CTL_IPPROTO_NAMES { \
-	{ "ip", CTLTYPE_NODE }, \
-	{ "icmp", CTLTYPE_NODE }, \
-	{ "igmp", CTLTYPE_NODE }, \
-	{ "ggp", CTLTYPE_NODE }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ "tcp", CTLTYPE_NODE }, \
-	{ 0, 0 }, \
-	{ "egp", CTLTYPE_NODE }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ "pup", CTLTYPE_NODE }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ "udp", CTLTYPE_NODE }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ "idp", CTLTYPE_NODE }, \
-}
-
-/*
- * Names for IP sysctl objects
- */
-#define	IPCTL_FORWARDING	1	/* act as router */
-#define	IPCTL_SENDREDIRECTS	2	/* may send redirects when forwarding */
-#define	IPCTL_DEFTTL		3	/* default TTL */
-#ifdef notyet
-#define	IPCTL_DEFMTU		4	/* default MTU */
-#endif
-#define IPCTL_RTEXPIRE		5	/* cloned route expiration time */
-#define IPCTL_RTMINEXPIRE	6	/* min value for expiration time */
-#define IPCTL_RTMAXCACHE	7	/* trigger level for dynamic expire */
-#define	IPCTL_SOURCEROUTE	8	/* may perform source routes */
-#define	IPCTL_DIRECTEDBROADCAST	9	/* may re-broadcast received packets */
-#define IPCTL_INTRQMAXLEN	10	/* max length of netisr queue */
-#define IPCTL_INTRQDROPS	11	/* number of netisr q drops */
-#define	IPCTL_ACCEPTSOURCEROUTE	13	/* may accept source routed packets */
-#define	IPCTL_MAXID		13
-
-#define	IPCTL_NAMES { \
-	{ 0, 0 }, \
-	{ "forwarding", CTLTYPE_INT }, \
-	{ "redirect", CTLTYPE_INT }, \
-	{ "ttl", CTLTYPE_INT }, \
-	{ "mtu", CTLTYPE_INT }, \
-	{ "rtexpire", CTLTYPE_INT }, \
-	{ "rtminexpire", CTLTYPE_INT }, \
-	{ "rtmaxcache", CTLTYPE_INT }, \
-	{ "sourceroute", CTLTYPE_INT }, \
- 	{ "directed-broadcast", CTLTYPE_INT }, \
-	{ "intr-queue-maxlen", CTLTYPE_INT }, \
-	{ "intr-queue-drops", CTLTYPE_INT }, \
-	{ "accept_sourceroute", CTLTYPE_INT }, \
-}
-
-
-#ifdef KERNEL
-struct ifnet; struct mbuf;	/* forward declarations for Standard C */
-
-int	 in_broadcast __P((struct in_addr, struct ifnet *));
-int	 in_canforward __P((struct in_addr));
-int	 in_cksum __P((struct mbuf *, int));
-int	 in_localaddr __P((struct in_addr));
-char 	*inet_ntoa __P((struct in_addr)); /* in libkern */
-
-/* Firewall hooks */
-struct ip;
-typedef	int ip_fw_chk_t __P((struct ip**, int, struct ifnet*, int, struct mbuf**));
-typedef	int ip_fw_ctl_t __P((int, struct mbuf**));
-extern	ip_fw_chk_t *ip_fw_chk_ptr;
-extern	ip_fw_ctl_t *ip_fw_ctl_ptr;
-
-/* IP NAT hooks */
-typedef	int ip_nat_t __P((struct ip**, struct mbuf**, struct ifnet*, int));
-typedef	int ip_nat_ctl_t __P((int, struct mbuf**));
-extern	ip_nat_t *ip_nat_ptr;
-extern	ip_nat_ctl_t *ip_nat_ctl_ptr;
-#define	IP_NAT_IN	0x00000001
-#define	IP_NAT_OUT	0x00000002
-
-#endif /* KERNEL */
-
-#endif
diff --git a/c/src/exec/libnetworking/netinet/in_cksum.c b/c/src/exec/libnetworking/netinet/in_cksum.c
deleted file mode 100644
index 9cffad3221..0000000000
--- a/c/src/exec/libnetworking/netinet/in_cksum.c
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * Copyright (c) 1988, 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)in_cksum.c	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#include <sys/param.h>
-#include <sys/mbuf.h>
-
-/*
- *  Try to use a CPU specific version, then punt to the portable C one.
- */
-
-#if (defined(__GNUC__) && (defined(__mc68000__) || defined(__m68k__)))
-
-#include "in_cksum_m68k.c"
-
-#elif (defined(__GNUC__) && defined(__i386__))
-
-#include "in_cksum_i386.c"
-
-#else
-
-/*
- * Checksum routine for Internet Protocol family headers (Portable Version).
- *
- * This routine is very heavily used in the network
- * code and should be modified for each CPU to be as fast as possible.
- */
-
-#define ADDCARRY(x)  (x > 65535 ? x -= 65535 : x)
-#define REDUCE \
-  {l_util.l = sum; sum = l_util.s[0] + l_util.s[1];  ADDCARRY(sum);}
-
-int
-in_cksum(m, len)
-	register struct mbuf *m;
-	register int len;
-{
-	register u_short *w;
-	register int sum = 0;
-	register int mlen = 0;
-	int byte_swapped = 0;
-
-	union {
-		char	c[2];
-		u_short	s;
-	} s_util;
-	union {
-		u_short s[2];
-		long	l;
-	} l_util;
-
-	for (;m && len; m = m->m_next) {
-		if (m->m_len == 0)
-			continue;
-		w = mtod(m, u_short *);
-		if (mlen == -1) {
-			/*
-			 * The first byte of this mbuf is the continuation
-			 * of a word spanning between this mbuf and the
-			 * last mbuf.
-			 *
-			 * s_util.c[0] is already saved when scanning previous
-			 * mbuf.
-			 */
-			s_util.c[1] = *(char *)w;
-			sum += s_util.s;
-			w = (u_short *)((char *)w + 1);
-			mlen = m->m_len - 1;
-			len--;
-		} else
-			mlen = m->m_len;
-		if (len < mlen)
-			mlen = len;
-		len -= mlen;
-		/*
-		 * Force to even boundary.
-		 */
-		if ((1 & (int) w) && (mlen > 0)) {
-			REDUCE;
-			sum <<= 8;
-			s_util.c[0] = *(u_char *)w;
-			w = (u_short *)((char *)w + 1);
-			mlen--;
-			byte_swapped = 1;
-		}
-		/*
-		 * Unroll the loop to make overhead from
-		 * branches &c small.
-		 */
-		while ((mlen -= 32) >= 0) {
-			sum += w[0]; sum += w[1]; sum += w[2]; sum += w[3];
-			sum += w[4]; sum += w[5]; sum += w[6]; sum += w[7];
-			sum += w[8]; sum += w[9]; sum += w[10]; sum += w[11];
-			sum += w[12]; sum += w[13]; sum += w[14]; sum += w[15];
-			w += 16;
-		}
-		mlen += 32;
-		while ((mlen -= 8) >= 0) {
-			sum += w[0]; sum += w[1]; sum += w[2]; sum += w[3];
-			w += 4;
-		}
-		mlen += 8;
-		if (mlen == 0 && byte_swapped == 0)
-			continue;
-		REDUCE;
-		while ((mlen -= 2) >= 0) {
-			sum += *w++;
-		}
-		if (byte_swapped) {
-			REDUCE;
-			sum <<= 8;
-			byte_swapped = 0;
-			if (mlen == -1) {
-				s_util.c[1] = *(char *)w;
-				sum += s_util.s;
-				mlen = 0;
-			} else
-				mlen = -1;
-		} else if (mlen == -1)
-			s_util.c[0] = *(char *)w;
-	}
-	if (len)
-		printf("cksum: out of data\n");
-	if (mlen == -1) {
-		/* The last mbuf has odd # of bytes. Follow the
-		   standard (the odd byte may be shifted left by 8 bits
-		   or not as determined by endian-ness of the machine) */
-		s_util.c[1] = 0;
-		sum += s_util.s;
-	}
-	REDUCE;
-	return (~sum & 0xffff);
-}
-#endif
diff --git a/c/src/exec/libnetworking/netinet/in_cksum_i386.c b/c/src/exec/libnetworking/netinet/in_cksum_i386.c
deleted file mode 100644
index 2057ab3fd6..0000000000
--- a/c/src/exec/libnetworking/netinet/in_cksum_i386.c
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * Checksum routine for Internet Protocol family headers.
- *
- * This routine is very heavily used in the network
- * code and should be modified for each CPU to be as fast as possible.
- *
- * This implementation is 386 version.
- *
- *  $Id$
- */
-
-#undef	ADDCARRY
-#define ADDCARRY(x)     if ((x) > 0xffff) (x) -= 0xffff
-#define REDUCE          {sum = (sum & 0xffff) + (sum >> 16); ADDCARRY(sum);}
-
-/*
- * Thanks to gcc we don't have to guess
- * which registers contain sum & w.
- */
-#define ADD(n)	asm("addl " #n "(%2), %0" : "=r" (sum) : "0" (sum), "r" (w))
-#define ADDC(n)	asm("adcl " #n "(%2), %0" : "=r" (sum) : "0" (sum), "r" (w))
-#define LOAD(n)	asm volatile("movb " #n "(%1), %0" : "=r" (junk) : "r" (w))
-#define MOP	asm("adcl         $0, %0" : "=r" (sum) : "0" (sum))
-
-int
-in_cksum(m, len)
-	register struct mbuf *m;
-	register int len;
-{
-	register u_short *w;
-	register unsigned sum = 0;
-	register int mlen = 0;
-	int byte_swapped = 0;
-	union { char	c[2]; u_short	s; } su;
-
-	for (;m && len; m = m->m_next) {
-		if (m->m_len == 0)
-			continue;
-		w = mtod(m, u_short *);
-		if (mlen == -1) {
-			/*
-			 * The first byte of this mbuf is the continuation
-			 * of a word spanning between this mbuf and the
-			 * last mbuf.
-			 */
-
-			/* su.c[0] is already saved when scanning previous
-			 * mbuf.  sum was REDUCEd when we found mlen == -1
-			 */
-			su.c[1] = *(u_char *)w;
-			sum += su.s;
-			w = (u_short *)((char *)w + 1);
-			mlen = m->m_len - 1;
-			len--;
-		} else
-			mlen = m->m_len;
-		if (len < mlen)
-			mlen = len;
-		len -= mlen;
-		/*
-		 * Force to long boundary so we do longword aligned
-		 * memory operations
-		 */
-		if (3 & (int) w) {
-			REDUCE;
-			if ((1 & (int) w) && (mlen > 0)) {
-				sum <<= 8;
-				su.c[0] = *(char *)w;
-				w = (u_short *)((char *)w + 1);
-				mlen--;
-				byte_swapped = 1;
-			}
-			if ((2 & (int) w) && (mlen >= 2)) {
-				sum += *w++;
-				mlen -= 2;
-			}
-		}
-		/*
-		 * Advance to a 486 cache line boundary.
-		 */
-		if (4 & (int) w && mlen >= 4) {
-			ADD(0);
-			MOP;
-			w += 2;
-			mlen -= 4;
-		}
-		if (8 & (int) w && mlen >= 8) {
-			ADD(0);
-			ADDC(4);
-			MOP;
-			w += 4;
-			mlen -= 8;
-		}
-		/*
-		 * Do as much of the checksum as possible 32 bits at at time.
-		 * In fact, this loop is unrolled to make overhead from
-		 * branches &c small.
-		 */
-		mlen -= 1;
-		while ((mlen -= 32) >= 0) {
-			u_char junk;
-			/*
-			 * Add with carry 16 words and fold in the last
-			 * carry by adding a 0 with carry.
-			 *
-			 * The early ADD(16) and the LOAD(32) are to load
-			 * the next 2 cache lines in advance on 486's.  The
-			 * 486 has a penalty of 2 clock cycles for loading
-			 * a cache line, plus whatever time the external
-			 * memory takes to load the first word(s) addressed.
-			 * These penalties are unavoidable.  Subsequent
-			 * accesses to a cache line being loaded (and to
-			 * other external memory?) are delayed until the
-			 * whole load finishes.  These penalties are mostly
-			 * avoided by not accessing external memory for
-			 * 8 cycles after the ADD(16) and 12 cycles after
-			 * the LOAD(32).  The loop terminates when mlen
-			 * is initially 33 (not 32) to guaranteed that
-			 * the LOAD(32) is within bounds.
-			 */
-			ADD(16);
-			ADDC(0);
-			ADDC(4);
-			ADDC(8);
-			ADDC(12);
-			LOAD(32);
-			ADDC(20);
-			ADDC(24);
-			ADDC(28);
-			MOP;
-			w += 16;
-		}
-		mlen += 32 + 1;
-		if (mlen >= 32) {
-			ADD(16);
-			ADDC(0);
-			ADDC(4);
-			ADDC(8);
-			ADDC(12);
-			ADDC(20);
-			ADDC(24);
-			ADDC(28);
-			MOP;
-			w += 16;
-			mlen -= 32;
-		}
-		if (mlen >= 16) {
-			ADD(0);
-			ADDC(4);
-			ADDC(8);
-			ADDC(12);
-			MOP;
-			w += 8;
-			mlen -= 16;
-		}
-		if (mlen >= 8) {
-			ADD(0);
-			ADDC(4);
-			MOP;
-			w += 4;
-			mlen -= 8;
-		}
-		if (mlen == 0 && byte_swapped == 0)
-			continue;       /* worth 1% maybe ?? */
-		REDUCE;
-		while ((mlen -= 2) >= 0) {
-			sum += *w++;
-		}
-		if (byte_swapped) {
-			sum <<= 8;
-			byte_swapped = 0;
-			if (mlen == -1) {
-				su.c[1] = *(char *)w;
-				sum += su.s;
-				mlen = 0;
-			} else
-				mlen = -1;
-		} else if (mlen == -1)
-			/*
-			 * This mbuf has odd number of bytes.
-			 * There could be a word split betwen
-			 * this mbuf and the next mbuf.
-			 * Save the last byte (to prepend to next mbuf).
-			 */
-			su.c[0] = *(char *)w;
-	}
-
-	if (len)
-		printf("cksum: out of data\n");
-	if (mlen == -1) {
-		/* The last mbuf has odd # of bytes. Follow the
-		   standard (the odd byte is shifted left by 8 bits) */
-		su.c[1] = 0;
-		sum += su.s;
-	}
-	REDUCE;
-	return (~sum & 0xffff);
-}
diff --git a/c/src/exec/libnetworking/netinet/in_cksum_m68k.c b/c/src/exec/libnetworking/netinet/in_cksum_m68k.c
deleted file mode 100644
index 58199c3adf..0000000000
--- a/c/src/exec/libnetworking/netinet/in_cksum_m68k.c
+++ /dev/null
@@ -1,223 +0,0 @@
-/*
- * Copyright (c) 1988, 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)in_cksum.c	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#include <sys/param.h>
-#include <sys/mbuf.h>
-
-#if (defined (__mcf5200__))
-# define IS_COLDFIRE 1
-#else
-# define IS_COLDFIRE 0
-#endif
-
-#define REDUCE { sum = (sum & 0xFFFF) + (sum >> 16); if (sum > 0xFFFF) sum -= 0xFFFF; }
-
-/*
- * Motorola 68k version of Internet Protocol Checksum routine
- * W. Eric Norum
- * Saskatchewan Accelerator Laboratory
- * August, 1998
- */
-int
-in_cksum(m, len)
-	struct mbuf *m;
-	int len;
-{
-	unsigned short *w;
-	unsigned long sum = 0;
-	int mlen = 0;
-	int byte_swapped = 0;
-	union {
-		char	c[2];
-		u_short	s;
-	} s_util;
-
-	for ( ; m && len ; m = m->m_next) {
-		if (m->m_len == 0)
-			continue;
-		w = mtod(m, u_short *);
-		if (mlen == -1) {
-			/*
-			 * The first byte of this mbuf is the continuation
-			 * of a word spanning between this mbuf and the
-			 * last mbuf.
-			 *
-			 * s_util.c[0] is already saved when scanning previous
-			 * mbuf.
-			 */
-			s_util.c[1] = *(char *)w;
-			sum += s_util.s;
-			w = (u_short *)((char *)w + 1);
-			mlen = m->m_len - 1;
-			len--;
-		} else
-			mlen = m->m_len;
-		if (len < mlen)
-			mlen = len;
-		len -= mlen;
-
-		/*
-		 * Force to longword boundary.
-		 */
-		if (3 & (int)w) {
-			REDUCE;
-			if ((1 & (int) w) && (mlen > 0)) {
-				sum <<= 8;
-				s_util.c[0] = *(u_char *)w;
-				w = (u_short *)((char *)w + 1);
-				mlen--;
-				byte_swapped = 1;
-			}
-			if ((2 & (int) w) && (mlen >= 2)) {
-				sum += *w++;
-				mlen -= 2;
-			}
-		}
-
-		/*
-		 * Sum all the longwords in the buffer.
-		 * See RFC 1071 -- Computing the Internet Checksum.
-		 * It should work for all 68k family members.
-		 */
-		{
-		unsigned long tcnt = mlen, t1;
-		__asm__ volatile (
-		"movel   %2,%3\n\t"
-		"lsrl    #6,%2       | count/64 = # loop traversals\n\t"
-		"andl    #0x3c,%3    | Then find fractions of a chunk\n\t"
-		"negl    %3\n\t      | Each long uses 4 instruction bytes\n\t"
-#if IS_COLDFIRE
-		"addql   #1,%2       | Clear X (extended carry flag)\n\t"
-		"subql   #1,%2       | \n\t"
-#else
-		"andi    #0xf,%%cc   | Clear X (extended carry flag)\n\t"
-#endif
-		"jmp     %%pc@(lcsum2_lbl-.-2:b,%3)  | Jump into loop\n"
-		"lcsum1_lbl:         | Begin inner loop...\n\t"
-		"movel   %1@+,%3     |  0: Fetch 32-bit word\n\t"
-		"addxl   %3,%0       |    Add word + previous carry\n\t"
-		"movel   %1@+,%3     |  1: Fetch 32-bit word\n\t"
-		"addxl   %3,%0       |    Add word + previous carry\n\t"
-		"movel   %1@+,%3     |  2: Fetch 32-bit word\n\t"
-		"addxl   %3,%0       |    Add word + previous carry\n\t"
-		"movel   %1@+,%3     |  3: Fetch 32-bit word\n\t"
-		"addxl   %3,%0       |    Add word + previous carry\n\t"
-		"movel   %1@+,%3     |  4: Fetch 32-bit word\n\t"
-		"addxl   %3,%0       |    Add word + previous carry\n\t"
-		"movel   %1@+,%3     |  5: Fetch 32-bit word\n\t"
-		"addxl   %3,%0       |    Add word + previous carry\n\t"
-		"movel   %1@+,%3     |  6: Fetch 32-bit word\n\t"
-		"addxl   %3,%0       |    Add word + previous carry\n\t"
-		"movel   %1@+,%3     |  7: Fetch 32-bit word\n\t"
-		"addxl   %3,%0       |    Add word + previous carry\n\t"
-		"movel   %1@+,%3     |  8: Fetch 32-bit word\n\t"
-		"addxl   %3,%0       |    Add word + previous carry\n\t"
-		"movel   %1@+,%3     |  9: Fetch 32-bit word\n\t"
-		"addxl   %3,%0       |    Add word + previous carry\n\t"
-		"movel   %1@+,%3     |  A: Fetch 32-bit word\n\t"
-		"addxl   %3,%0       |    Add word + previous carry\n\t"
-		"movel   %1@+,%3     |  B: Fetch 32-bit word\n\t"
-		"addxl   %3,%0       |    Add word + previous carry\n\t"
-		"movel   %1@+,%3     |  C: Fetch 32-bit word\n\t"
-		"addxl   %3,%0       |    Add word + previous carry\n\t"
-		"movel   %1@+,%3     |  D: Fetch 32-bit word\n\t"
-		"addxl   %3,%0       |    Add word + previous carry\n\t"
-		"movel   %1@+,%3     |  E: Fetch 32-bit word\n\t"
-		"addxl   %3,%0       |    Add word + previous carry\n\t"
-		"movel   %1@+,%3     |  F: Fetch 32-bit word\n\t"
-		"addxl   %3,%0       |    Add word + previous carry\n"
-		"lcsum2_lbl:         |  End of unrolled loop\n\t"
-#if IS_COLDFIRE
-		"moveq   #0,%3       | Add in last carry\n\t"
-		"addxl   %3,%0       |\n\t"
-		"subql 	 #1,%2       | Update loop count\n\t"
-		"bplb    lcsum1_lbl  | Loop (with X clear) if not done\n\t"
-		"movel   #0xffff,%2  | Get word mask\n\t"
-		"movel   %0,%3       | Fold 32 bit sum to 16 bits\n\t"
-		"swap    %3          |\n\t"
-		"andl    %2,%0       | Mask to 16-bit sum\n\t"
-		"andl    %2,%3       | Mask to 16-bit sum\n\t"
-		"addl    %3,%0       |\n\t"
-		"movel   %0,%3       | Add in last carry\n\t"
-		"swap    %3          |\n\t"
-		"addl    %3,%0       |\n\t"
-		"andl    %2,%0       | Mask to 16-bit sum\n\t"
-#else
-		"dbf     %2,lcsum1_lbl | (NB- dbf doesn't affect X)\n\t"
-		"movel   %0,%3       | Fold 32 bit sum to 16 bits\n\t"
-		"swap    %3          | (NB- swap doesn't affect X)\n\t"
-		"addxw   %3,%0       |\n\t"
-		"moveq   #0,%3       | Add in last carry\n\t"
-		"addxw   %3,%0       |\n\t"
-		"andl    #0xffff,%0  | Mask to 16-bit sum\n"
-#endif
-			:
-			"=d" (sum), "=a" (w), "=d" (tcnt) , "=d" (t1) :
-			"0" (sum), "1" (w), "2" (tcnt) :
-			"cc", "memory");
-		}
-		mlen &= 3;
-
-		/*
-		 * Soak up the last 1, 2 or 3 bytes
-		 */
-		while ((mlen -= 2) >= 0)
-			sum += *w++;
-		if (byte_swapped) {
-			REDUCE;
-			sum <<= 8;
-			byte_swapped = 0;
-			if (mlen == -1) {
-				s_util.c[1] = *(char *)w;
-				sum += s_util.s;
-				mlen = 0;
-			} else
-				mlen = -1;
-		} else if (mlen == -1)
-			s_util.c[0] = *(char *)w;
-	}
-	if (len)
-		sum = 0xDEAD;
-	if (mlen == -1) {
-		/* The last mbuf has odd # of bytes. Follow the
-		   standard (the odd byte may be shifted left by 8 bits
-		   or not as determined by endian-ness of the machine) */
-		s_util.c[1] = 0;
-		sum += s_util.s;
-	}
-	REDUCE;
-	return (~sum & 0xffff);
-}
diff --git a/c/src/exec/libnetworking/netinet/in_pcb.c b/c/src/exec/libnetworking/netinet/in_pcb.c
deleted file mode 100644
index 116f70eebf..0000000000
--- a/c/src/exec/libnetworking/netinet/in_pcb.c
+++ /dev/null
@@ -1,757 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1991, 1993, 1995
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)in_pcb.c	8.4 (Berkeley) 5/24/95
- *	$Id$
- */
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/systm.h>
-#include <sys/malloc.h>
-#include <sys/mbuf.h>
-#include <sys/protosw.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/ioctl.h>
-#include <sys/errno.h>
-#include <sys/time.h>
-#include <sys/proc.h>
-#include <sys/kernel.h>
-#include <sys/sysctl.h>
-
-#include <net/if.h>
-#include <net/route.h>
-
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/in_pcb.h>
-#include <netinet/in_var.h>
-#include <netinet/ip_var.h>
-
-struct	in_addr zeroin_addr;
-
-static void	 in_pcbinshash __P((struct inpcb *));
-static void	 in_rtchange __P((struct inpcb *, int));
-
-/*
- * These configure the range of local port addresses assigned to
- * "unspecified" outgoing connections/packets/whatever.
- */
-static int ipport_lowfirstauto  = IPPORT_RESERVED - 1;	/* 1023 */
-static int ipport_lowlastauto = IPPORT_RESERVEDSTART;	/* 600 */
-static int ipport_firstauto = IPPORT_RESERVED;		/* 1024 */
-static int ipport_lastauto  = IPPORT_USERRESERVED;	/* 5000 */
-static int ipport_hifirstauto = IPPORT_HIFIRSTAUTO;	/* 40000 */
-static int ipport_hilastauto  = IPPORT_HILASTAUTO;	/* 44999 */
-
-#define RANGECHK(var, min, max) \
-	if ((var) < (min)) { (var) = (min); } \
-	else if ((var) > (max)) { (var) = (max); }
-
-#if 0
-static int
-sysctl_net_ipport_check SYSCTL_HANDLER_ARGS
-{
-	int error = sysctl_handle_int(oidp,
-		oidp->oid_arg1, oidp->oid_arg2, req);
-	if (!error) {
-		RANGECHK(ipport_lowfirstauto, 1, IPPORT_RESERVED - 1);
-		RANGECHK(ipport_lowlastauto, 1, IPPORT_RESERVED - 1);
-		RANGECHK(ipport_firstauto, IPPORT_RESERVED, USHRT_MAX);
-		RANGECHK(ipport_lastauto, IPPORT_RESERVED, USHRT_MAX);
-		RANGECHK(ipport_hifirstauto, IPPORT_RESERVED, USHRT_MAX);
-		RANGECHK(ipport_hilastauto, IPPORT_RESERVED, USHRT_MAX);
-	}
-	return error;
-}
-#endif
-
-#undef RANGECHK
-
-SYSCTL_NODE(_net_inet_ip, IPPROTO_IP, portrange, CTLFLAG_RW, 0, "IP Ports");
-
-SYSCTL_PROC(_net_inet_ip_portrange, OID_AUTO, lowfirst, CTLTYPE_INT|CTLFLAG_RW,
-	   &ipport_lowfirstauto, 0, &sysctl_net_ipport_check, "I", "");
-SYSCTL_PROC(_net_inet_ip_portrange, OID_AUTO, lowlast, CTLTYPE_INT|CTLFLAG_RW,
-	   &ipport_lowlastauto, 0, &sysctl_net_ipport_check, "I", "");
-SYSCTL_PROC(_net_inet_ip_portrange, OID_AUTO, first, CTLTYPE_INT|CTLFLAG_RW,
-	   &ipport_firstauto, 0, &sysctl_net_ipport_check, "I", "");
-SYSCTL_PROC(_net_inet_ip_portrange, OID_AUTO, last, CTLTYPE_INT|CTLFLAG_RW,
-	   &ipport_lastauto, 0, &sysctl_net_ipport_check, "I", "");
-SYSCTL_PROC(_net_inet_ip_portrange, OID_AUTO, hifirst, CTLTYPE_INT|CTLFLAG_RW,
-	   &ipport_hifirstauto, 0, &sysctl_net_ipport_check, "I", "");
-SYSCTL_PROC(_net_inet_ip_portrange, OID_AUTO, hilast, CTLTYPE_INT|CTLFLAG_RW,
-	   &ipport_hilastauto, 0, &sysctl_net_ipport_check, "I", "");
-
-int
-in_pcballoc(so, pcbinfo)
-	struct socket *so;
-	struct inpcbinfo *pcbinfo;
-{
-	register struct inpcb *inp;
-	int s;
-
-	MALLOC(inp, struct inpcb *, sizeof(*inp), M_PCB, M_NOWAIT);
-	if (inp == NULL)
-		return (ENOBUFS);
-	bzero((caddr_t)inp, sizeof(*inp));
-	inp->inp_pcbinfo = pcbinfo;
-	inp->inp_socket = so;
-	s = splnet();
-	LIST_INSERT_HEAD(pcbinfo->listhead, inp, inp_list);
-	in_pcbinshash(inp);
-	splx(s);
-	so->so_pcb = (caddr_t)inp;
-	return (0);
-}
-
-int
-in_pcbbind(inp, nam)
-	register struct inpcb *inp;
-	struct mbuf *nam;
-{
-	register struct socket *so = inp->inp_socket;
-	unsigned short *lastport;
-	struct sockaddr_in *sin;
-	u_short lport = 0;
-	int wild = 0, reuseport = (so->so_options & SO_REUSEPORT);
-	int error;
-
-	if (in_ifaddr == 0)
-		return (EADDRNOTAVAIL);
-	if (inp->inp_lport || inp->inp_laddr.s_addr != INADDR_ANY)
-		return (EINVAL);
-	if ((so->so_options & (SO_REUSEADDR|SO_REUSEPORT)) == 0 &&
-	    ((so->so_proto->pr_flags & PR_CONNREQUIRED) == 0 ||
-	     (so->so_options & SO_ACCEPTCONN) == 0))
-		wild = 1;
-	if (nam) {
-		sin = mtod(nam, struct sockaddr_in *);
-		if (nam->m_len != sizeof (*sin))
-			return (EINVAL);
-#ifdef notdef
-		/*
-		 * We should check the family, but old programs
-		 * incorrectly fail to initialize it.
-		 */
-		if (sin->sin_family != AF_INET)
-			return (EAFNOSUPPORT);
-#endif
-		lport = sin->sin_port;
-		if (IN_MULTICAST(ntohl(sin->sin_addr.s_addr))) {
-			/*
-			 * Treat SO_REUSEADDR as SO_REUSEPORT for multicast;
-			 * allow complete duplication of binding if
-			 * SO_REUSEPORT is set, or if SO_REUSEADDR is set
-			 * and a multicast address is bound on both
-			 * new and duplicated sockets.
-			 */
-			if (so->so_options & SO_REUSEADDR)
-				reuseport = SO_REUSEADDR|SO_REUSEPORT;
-		} else if (sin->sin_addr.s_addr != INADDR_ANY) {
-			sin->sin_port = 0;		/* yech... */
-			if (ifa_ifwithaddr((struct sockaddr *)sin) == 0)
-				return (EADDRNOTAVAIL);
-		}
-		if (lport) {
-			struct inpcb *t;
-
-			/* GROSS */
-			if (ntohs(lport) < IPPORT_RESERVED &&
-			    (error = suser(p->p_ucred, &p->p_acflag)))
-				return (EACCES);
-			if (so->so_uid) {
-				t = in_pcblookup(inp->inp_pcbinfo, zeroin_addr,
-				    0, sin->sin_addr, lport,
-				    INPLOOKUP_WILDCARD);
-				if (t && (so->so_uid != t->inp_socket->so_uid))
-					return (EADDRINUSE);
-			}
-			t = in_pcblookup(inp->inp_pcbinfo, zeroin_addr, 0,
-			    sin->sin_addr, lport, wild);
-			if (t && (reuseport & t->inp_socket->so_options) == 0)
-				return (EADDRINUSE);
-		}
-		inp->inp_laddr = sin->sin_addr;
-	}
-	if (lport == 0) {
-		ushort first, last;
-		int count;
-
-		inp->inp_flags |= INP_ANONPORT;
-
-		if (inp->inp_flags & INP_HIGHPORT) {
-			first = ipport_hifirstauto;	/* sysctl */
-			last  = ipport_hilastauto;
-			lastport = &inp->inp_pcbinfo->lasthi;
-		} else if (inp->inp_flags & INP_LOWPORT) {
-			if ((error = suser(p->p_ucred, &p->p_acflag)))
-				return (EACCES);
-			first = ipport_lowfirstauto;	/* 1023 */
-			last  = ipport_lowlastauto;	/* 600 */
-			lastport = &inp->inp_pcbinfo->lastlow;
-		} else {
-			first = ipport_firstauto;	/* sysctl */
-			last  = ipport_lastauto;
-			lastport = &inp->inp_pcbinfo->lastport;
-		}
-		/*
-		 * Simple check to ensure all ports are not used up causing
-		 * a deadlock here.
-		 *
-		 * We split the two cases (up and down) so that the direction
-		 * is not being tested on each round of the loop.
-		 */
-		if (first > last) {
-			/*
-			 * counting down
-			 */
-			count = first - last;
-
-			do {
-				if (count-- <= 0)	/* completely used? */
-					return (EADDRNOTAVAIL);
-				--*lastport;
-				if (*lastport > first || *lastport < last)
-					*lastport = first;
-				lport = htons(*lastport);
-			} while (in_pcblookup(inp->inp_pcbinfo,
-				 zeroin_addr, 0, inp->inp_laddr, lport, wild));
-		} else {
-			/*
-			 * counting up
-			 */
-			count = last - first;
-
-			do {
-				if (count-- <= 0)	/* completely used? */
-					return (EADDRNOTAVAIL);
-				++*lastport;
-				if (*lastport < first || *lastport > last)
-					*lastport = first;
-				lport = htons(*lastport);
-			} while (in_pcblookup(inp->inp_pcbinfo,
-				 zeroin_addr, 0, inp->inp_laddr, lport, wild));
-		}
-	}
-	inp->inp_lport = lport;
-	in_pcbrehash(inp);
-	return (0);
-}
-
-/*
- *   Transform old in_pcbconnect() into an inner subroutine for new
- *   in_pcbconnect(): Do some validity-checking on the remote
- *   address (in mbuf 'nam') and then determine local host address
- *   (i.e., which interface) to use to access that remote host.
- *
- *   This preserves definition of in_pcbconnect(), while supporting a
- *   slightly different version for T/TCP.  (This is more than
- *   a bit of a kludge, but cleaning up the internal interfaces would
- *   have forced minor changes in every protocol).
- */
-
-int
-in_pcbladdr(inp, nam, plocal_sin)
-	register struct inpcb *inp;
-	struct mbuf *nam;
-	struct sockaddr_in **plocal_sin;
-{
-	struct in_ifaddr *ia;
-	register struct sockaddr_in *sin = mtod(nam, struct sockaddr_in *);
-
-	if (nam->m_len != sizeof (*sin))
-		return (EINVAL);
-	if (sin->sin_family != AF_INET)
-		return (EAFNOSUPPORT);
-	if (sin->sin_port == 0)
-		return (EADDRNOTAVAIL);
-	if (in_ifaddr) {
-		/*
-		 * If the destination address is INADDR_ANY,
-		 * use the primary local address.
-		 * If the supplied address is INADDR_BROADCAST,
-		 * and the primary interface supports broadcast,
-		 * choose the broadcast address for that interface.
-		 */
-#define	satosin(sa)	((struct sockaddr_in *)(sa))
-#define sintosa(sin)	((struct sockaddr *)(sin))
-#define ifatoia(ifa)	((struct in_ifaddr *)(ifa))
-		if (sin->sin_addr.s_addr == INADDR_ANY)
-		    sin->sin_addr = IA_SIN(in_ifaddr)->sin_addr;
-		else if (sin->sin_addr.s_addr == (u_long)INADDR_BROADCAST &&
-		  (in_ifaddr->ia_ifp->if_flags & IFF_BROADCAST))
-		    sin->sin_addr = satosin(&in_ifaddr->ia_broadaddr)->sin_addr;
-	}
-	if (inp->inp_laddr.s_addr == INADDR_ANY) {
-		register struct route *ro;
-
-		ia = (struct in_ifaddr *)0;
-		/*
-		 * If route is known or can be allocated now,
-		 * our src addr is taken from the i/f, else punt.
-		 */
-		ro = &inp->inp_route;
-		if (ro->ro_rt &&
-		    (satosin(&ro->ro_dst)->sin_addr.s_addr !=
-			sin->sin_addr.s_addr ||
-		    inp->inp_socket->so_options & SO_DONTROUTE)) {
-			RTFREE(ro->ro_rt);
-			ro->ro_rt = (struct rtentry *)0;
-		}
-		if ((inp->inp_socket->so_options & SO_DONTROUTE) == 0 && /*XXX*/
-		    (ro->ro_rt == (struct rtentry *)0 ||
-		    ro->ro_rt->rt_ifp == (struct ifnet *)0)) {
-			/* No route yet, so try to acquire one */
-			ro->ro_dst.sa_family = AF_INET;
-			ro->ro_dst.sa_len = sizeof(struct sockaddr_in);
-			((struct sockaddr_in *) &ro->ro_dst)->sin_addr =
-				sin->sin_addr;
-			rtalloc(ro);
-		}
-		/*
-		 * If we found a route, use the address
-		 * corresponding to the outgoing interface
-		 * unless it is the loopback (in case a route
-		 * to our address on another net goes to loopback).
-		 */
-		if (ro->ro_rt && !(ro->ro_rt->rt_ifp->if_flags & IFF_LOOPBACK))
-			ia = ifatoia(ro->ro_rt->rt_ifa);
-		if (ia == 0) {
-			u_short fport = sin->sin_port;
-
-			sin->sin_port = 0;
-			ia = ifatoia(ifa_ifwithdstaddr(sintosa(sin)));
-			if (ia == 0)
-				ia = ifatoia(ifa_ifwithnet(sintosa(sin)));
-			sin->sin_port = fport;
-			if (ia == 0)
-				ia = in_ifaddr;
-			if (ia == 0)
-				return (EADDRNOTAVAIL);
-		}
-		/*
-		 * If the destination address is multicast and an outgoing
-		 * interface has been set as a multicast option, use the
-		 * address of that interface as our source address.
-		 */
-		if (IN_MULTICAST(ntohl(sin->sin_addr.s_addr)) &&
-		    inp->inp_moptions != NULL) {
-			struct ip_moptions *imo;
-			struct ifnet *ifp;
-
-			imo = inp->inp_moptions;
-			if (imo->imo_multicast_ifp != NULL) {
-				ifp = imo->imo_multicast_ifp;
-				for (ia = in_ifaddr; ia; ia = ia->ia_next)
-					if (ia->ia_ifp == ifp)
-						break;
-				if (ia == 0)
-					return (EADDRNOTAVAIL);
-			}
-		}
-	/*
-	 * Don't do pcblookup call here; return interface in plocal_sin
-	 * and exit to caller, that will do the lookup.
-	 */
-		*plocal_sin = &ia->ia_addr;
-
-	}
-	return(0);
-}
-
-/*
- * Outer subroutine:
- * Connect from a socket to a specified address.
- * Both address and port must be specified in argument sin.
- * If don't have a local address for this socket yet,
- * then pick one.
- */
-int
-in_pcbconnect(inp, nam)
-	register struct inpcb *inp;
-	struct mbuf *nam;
-{
-	struct sockaddr_in *ifaddr;
-	register struct sockaddr_in *sin = mtod(nam, struct sockaddr_in *);
-	int error;
-
-	/*
-	 *   Call inner routine, to assign local interface address.
-	 */
-	if ((error = in_pcbladdr(inp, nam, &ifaddr)))
-		return(error);
-
-	if (in_pcblookuphash(inp->inp_pcbinfo, sin->sin_addr, sin->sin_port,
-	    inp->inp_laddr.s_addr ? inp->inp_laddr : ifaddr->sin_addr,
-	    inp->inp_lport, 0) != NULL)
-		return (EADDRINUSE);
-	if (inp->inp_laddr.s_addr == INADDR_ANY) {
-		if (inp->inp_lport == 0)
-			(void)in_pcbbind(inp, (struct mbuf *)0);
-		inp->inp_laddr = ifaddr->sin_addr;
-	}
-	inp->inp_faddr = sin->sin_addr;
-	inp->inp_fport = sin->sin_port;
-	in_pcbrehash(inp);
-	return (0);
-}
-
-void
-in_pcbdisconnect(inp)
-	struct inpcb *inp;
-{
-
-	inp->inp_faddr.s_addr = INADDR_ANY;
-	inp->inp_fport = 0;
-	in_pcbrehash(inp);
-	if (inp->inp_socket->so_state & SS_NOFDREF)
-		in_pcbdetach(inp);
-}
-
-void
-in_pcbdetach(inp)
-	struct inpcb *inp;
-{
-	struct socket *so = inp->inp_socket;
-	int s;
-
-	so->so_pcb = 0;
-	sofree(so);
-	if (inp->inp_options)
-		(void)m_free(inp->inp_options);
-	if (inp->inp_route.ro_rt)
-		rtfree(inp->inp_route.ro_rt);
-	ip_freemoptions(inp->inp_moptions);
-	s = splnet();
-	LIST_REMOVE(inp, inp_hash);
-	LIST_REMOVE(inp, inp_list);
-	splx(s);
-	FREE(inp, M_PCB);
-}
-
-void
-in_setsockaddr(inp, nam)
-	register struct inpcb *inp;
-	struct mbuf *nam;
-{
-	register struct sockaddr_in *sin;
-
-	nam->m_len = sizeof (*sin);
-	sin = mtod(nam, struct sockaddr_in *);
-	bzero((caddr_t)sin, sizeof (*sin));
-	sin->sin_family = AF_INET;
-	sin->sin_len = sizeof(*sin);
-	sin->sin_port = inp->inp_lport;
-	sin->sin_addr = inp->inp_laddr;
-}
-
-void
-in_setpeeraddr(inp, nam)
-	struct inpcb *inp;
-	struct mbuf *nam;
-{
-	register struct sockaddr_in *sin;
-
-	nam->m_len = sizeof (*sin);
-	sin = mtod(nam, struct sockaddr_in *);
-	bzero((caddr_t)sin, sizeof (*sin));
-	sin->sin_family = AF_INET;
-	sin->sin_len = sizeof(*sin);
-	sin->sin_port = inp->inp_fport;
-	sin->sin_addr = inp->inp_faddr;
-}
-
-/*
- * Pass some notification to all connections of a protocol
- * associated with address dst.  The local address and/or port numbers
- * may be specified to limit the search.  The "usual action" will be
- * taken, depending on the ctlinput cmd.  The caller must filter any
- * cmds that are uninteresting (e.g., no error in the map).
- * Call the protocol specific routine (if any) to report
- * any errors for each matching socket.
- *
- * Must be called at splnet.
- */
-void
-in_pcbnotify(head, dst, fport_arg, laddr, lport_arg, cmd, notify)
-	struct inpcbhead *head;
-	struct sockaddr *dst;
-	u_int fport_arg, lport_arg;
-	struct in_addr laddr;
-	int cmd;
-	void (*notify) __P((struct inpcb *, int));
-{
-	register struct inpcb *inp, *oinp;
-	struct in_addr faddr;
-	u_short fport = fport_arg, lport = lport_arg;
-	int errnum, s;
-
-	if ((unsigned)cmd > PRC_NCMDS || dst->sa_family != AF_INET)
-		return;
-	faddr = ((struct sockaddr_in *)dst)->sin_addr;
-	if (faddr.s_addr == INADDR_ANY)
-		return;
-
-	/*
-	 * Redirects go to all references to the destination,
-	 * and use in_rtchange to invalidate the route cache.
-	 * Dead host indications: notify all references to the destination.
-	 * Otherwise, if we have knowledge of the local port and address,
-	 * deliver only to that socket.
-	 */
-	if (PRC_IS_REDIRECT(cmd) || cmd == PRC_HOSTDEAD) {
-		fport = 0;
-		lport = 0;
-		laddr.s_addr = 0;
-		if (cmd != PRC_HOSTDEAD)
-			notify = in_rtchange;
-	}
-	errnum = inetctlerrmap[cmd];
-	s = splnet();
-	for (inp = head->lh_first; inp != NULL;) {
-		if (inp->inp_faddr.s_addr != faddr.s_addr ||
-		    inp->inp_socket == 0 ||
-		    (lport && inp->inp_lport != lport) ||
-		    (laddr.s_addr && inp->inp_laddr.s_addr != laddr.s_addr) ||
-		    (fport && inp->inp_fport != fport)) {
-			inp = inp->inp_list.le_next;
-			continue;
-		}
-		oinp = inp;
-		inp = inp->inp_list.le_next;
-		if (notify)
-			(*notify)(oinp, errnum);
-	}
-	splx(s);
-}
-
-/*
- * Check for alternatives when higher level complains
- * about service problems.  For now, invalidate cached
- * routing information.  If the route was created dynamically
- * (by a redirect), time to try a default gateway again.
- */
-void
-in_losing(inp)
-	struct inpcb *inp;
-{
-	register struct rtentry *rt;
-	struct rt_addrinfo info;
-
-	if ((rt = inp->inp_route.ro_rt)) {
-		inp->inp_route.ro_rt = 0;
-		bzero((caddr_t)&info, sizeof(info));
-		info.rti_info[RTAX_DST] =
-			(struct sockaddr *)&inp->inp_route.ro_dst;
-		info.rti_info[RTAX_GATEWAY] = rt->rt_gateway;
-		info.rti_info[RTAX_NETMASK] = rt_mask(rt);
-		rt_missmsg(RTM_LOSING, &info, rt->rt_flags, 0);
-		if (rt->rt_flags & RTF_DYNAMIC)
-			(void) rtrequest(RTM_DELETE, rt_key(rt),
-				rt->rt_gateway, rt_mask(rt), rt->rt_flags,
-				(struct rtentry **)0);
-		else
-		/*
-		 * A new route can be allocated
-		 * the next time output is attempted.
-		 */
-			rtfree(rt);
-	}
-}
-
-/*
- * After a routing change, flush old routing
- * and allocate a (hopefully) better one.
- */
-static void
-in_rtchange(inp, errnum)
-	register struct inpcb *inp;
-	int errnum;
-{
-	if (inp->inp_route.ro_rt) {
-		rtfree(inp->inp_route.ro_rt);
-		inp->inp_route.ro_rt = 0;
-		/*
-		 * A new route can be allocated the next time
-		 * output is attempted.
-		 */
-	}
-}
-
-struct inpcb *
-in_pcblookup(pcbinfo, faddr, fport_arg, laddr, lport_arg, wild_okay)
-	struct inpcbinfo *pcbinfo;
-	struct in_addr faddr, laddr;
-	u_int fport_arg, lport_arg;
-	int wild_okay;
-{
-	register struct inpcb *inp, *match = NULL;
-	int matchwild = 3, wildcard;
-	u_short fport = fport_arg, lport = lport_arg;
-	int s;
-
-	s = splnet();
-
-	for (inp = pcbinfo->listhead->lh_first; inp != NULL; inp = inp->inp_list.le_next) {
-		if (inp->inp_lport != lport)
-			continue;
-		wildcard = 0;
-		if (inp->inp_faddr.s_addr != INADDR_ANY) {
-			if (faddr.s_addr == INADDR_ANY)
-				wildcard++;
-			else if (inp->inp_faddr.s_addr != faddr.s_addr ||
-			    inp->inp_fport != fport)
-				continue;
-		} else {
-			if (faddr.s_addr != INADDR_ANY)
-				wildcard++;
-		}
-		if (inp->inp_laddr.s_addr != INADDR_ANY) {
-			if (laddr.s_addr == INADDR_ANY)
-				wildcard++;
-			else if (inp->inp_laddr.s_addr != laddr.s_addr)
-				continue;
-		} else {
-			if (laddr.s_addr != INADDR_ANY)
-				wildcard++;
-		}
-		if (wildcard && wild_okay == 0)
-			continue;
-		if (wildcard < matchwild) {
-			match = inp;
-			matchwild = wildcard;
-			if (matchwild == 0) {
-				break;
-			}
-		}
-	}
-	splx(s);
-	return (match);
-}
-
-/*
- * Lookup PCB in hash list.
- */
-struct inpcb *
-in_pcblookuphash(pcbinfo, faddr, fport_arg, laddr, lport_arg, wildcard)
-	struct inpcbinfo *pcbinfo;
-	struct in_addr faddr, laddr;
-	u_int fport_arg, lport_arg;
-	int wildcard;
-{
-	struct inpcbhead *head;
-	register struct inpcb *inp;
-	u_short fport = fport_arg, lport = lport_arg;
-	int s;
-
-	s = splnet();
-	/*
-	 * First look for an exact match.
-	 */
-	head = &pcbinfo->hashbase[INP_PCBHASH(faddr.s_addr, lport, fport, pcbinfo->hashmask)];
-	for (inp = head->lh_first; inp != NULL; inp = inp->inp_hash.le_next) {
-		if (inp->inp_faddr.s_addr == faddr.s_addr &&
-		    inp->inp_laddr.s_addr == laddr.s_addr &&
-		    inp->inp_fport == fport &&
-		    inp->inp_lport == lport)
-			goto found;
-	}
-	if (wildcard) {
-		struct inpcb *local_wild = NULL;
-
-		head = &pcbinfo->hashbase[INP_PCBHASH(INADDR_ANY, lport, 0, pcbinfo->hashmask)];
-		for (inp = head->lh_first; inp != NULL; inp = inp->inp_hash.le_next) {
-			if (inp->inp_faddr.s_addr == INADDR_ANY &&
-			    inp->inp_fport == 0 && inp->inp_lport == lport) {
-				if (inp->inp_laddr.s_addr == laddr.s_addr)
-					goto found;
-				else if (inp->inp_laddr.s_addr == INADDR_ANY)
-					local_wild = inp;
-			}
-		}
-		if (local_wild != NULL) {
-			inp = local_wild;
-			goto found;
-		}
-	}
-	splx(s);
-	return (NULL);
-
-found:
-	/*
-	 * Move PCB to head of this hash chain so that it can be
-	 * found more quickly in the future.
-	 * XXX - this is a pessimization on machines with few
-	 * concurrent connections.
-	 */
-	if (inp != head->lh_first) {
-		LIST_REMOVE(inp, inp_hash);
-		LIST_INSERT_HEAD(head, inp, inp_hash);
-	}
-	splx(s);
-	return (inp);
-}
-
-/*
- * Insert PCB into hash chain. Must be called at splnet.
- */
-static void
-in_pcbinshash(inp)
-	struct inpcb *inp;
-{
-	struct inpcbhead *head;
-
-	head = &inp->inp_pcbinfo->hashbase[INP_PCBHASH(inp->inp_faddr.s_addr,
-		 inp->inp_lport, inp->inp_fport, inp->inp_pcbinfo->hashmask)];
-
-	LIST_INSERT_HEAD(head, inp, inp_hash);
-}
-
-void
-in_pcbrehash(inp)
-	struct inpcb *inp;
-{
-	struct inpcbhead *head;
-	int s;
-
-	s = splnet();
-	LIST_REMOVE(inp, inp_hash);
-
-	head = &inp->inp_pcbinfo->hashbase[INP_PCBHASH(inp->inp_faddr.s_addr,
-		inp->inp_lport, inp->inp_fport, inp->inp_pcbinfo->hashmask)];
-
-	LIST_INSERT_HEAD(head, inp, inp_hash);
-	splx(s);
-}
diff --git a/c/src/exec/libnetworking/netinet/in_pcb.h b/c/src/exec/libnetworking/netinet/in_pcb.h
deleted file mode 100644
index 9390cfda6c..0000000000
--- a/c/src/exec/libnetworking/netinet/in_pcb.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)in_pcb.h	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#ifndef _NETINET_IN_PCB_H_
-#define _NETINET_IN_PCB_H_
-
-#include <sys/queue.h>
-
-/*
- * Common structure pcb for internet protocol implementation.
- * Here are stored pointers to local and foreign host table
- * entries, local and foreign socket numbers, and pointers
- * up (to a socket structure) and down (to a protocol-specific)
- * control block.
- */
-LIST_HEAD(inpcbhead, inpcb);
-
-struct inpcb {
-	LIST_ENTRY(inpcb) inp_list;		/* list for all PCBs of this proto */
-	LIST_ENTRY(inpcb) inp_hash;		/* hash list */
-	struct	inpcbinfo *inp_pcbinfo;	/* PCB list info */
-	struct	in_addr inp_faddr;	/* foreign host table entry */
-	struct	in_addr inp_laddr;	/* local host table entry */
-	u_short	inp_fport;		/* foreign port */
-	u_short	inp_lport;		/* local port */
-	caddr_t	inp_ppcb;		/* pointer to per-protocol pcb */
-	struct	socket *inp_socket;	/* back pointer to socket */
-	struct	mbuf *inp_options;	/* IP options */
-	struct	route inp_route;	/* placeholder for routing entry */
-	int	inp_flags;		/* generic IP/datagram flags */
-	u_char	inp_ip_tos;		/* type of service proto */
-	u_char	inp_ip_ttl;		/* time to live proto */
-	u_char	inp_ip_p;		/* protocol proto */
-	u_char	pad[1];			/* alignment */
-	struct	ip_moptions *inp_moptions; /* IP multicast options */
-#if 0 /* Someday, perhaps... */
-	struct	ip inp_ip;		/* header prototype; should have more */
-#endif
-};
-
-struct inpcbinfo {
-	struct inpcbhead *listhead;
-	struct inpcbhead *hashbase;
-	unsigned long hashmask;
-	unsigned short lastport;
-	unsigned short lastlow;
-	unsigned short lasthi;
-};
-
-#define INP_PCBHASH(faddr, lport, fport, mask) \
-	(((faddr) ^ ((faddr) >> 16) ^ (lport) ^ (fport)) & (mask))
-
-/* flags in inp_flags: */
-#define	INP_RECVOPTS		0x01	/* receive incoming IP options */
-#define	INP_RECVRETOPTS		0x02	/* receive IP options for reply */
-#define	INP_RECVDSTADDR		0x04	/* receive IP dst address */
-#define	INP_HDRINCL		0x08	/* user supplies entire IP header */
-#define	INP_HIGHPORT		0x10	/* user wants "high" port binding */
-#define	INP_LOWPORT		0x20	/* user wants "low" port binding */
-#define	INP_ANONPORT		0x40	/* port chosen for user */
-#define	INP_RECVIF		0x80	/* receive incoming interface */
-#define	INP_CONTROLOPTS		(INP_RECVOPTS|INP_RECVRETOPTS|INP_RECVDSTADDR|\
-					INP_RECVIF)
-
-#define	INPLOOKUP_WILDCARD	1
-
-#define	sotoinpcb(so)	((struct inpcb *)(so)->so_pcb)
-
-#ifdef KERNEL
-void	 in_losing __P((struct inpcb *));
-int	 in_pcballoc __P((struct socket *, struct inpcbinfo *));
-int	 in_pcbbind __P((struct inpcb *, struct mbuf *));
-int	 in_pcbconnect __P((struct inpcb *, struct mbuf *));
-void	 in_pcbdetach __P((struct inpcb *));
-void	 in_pcbdisconnect __P((struct inpcb *));
-int	 in_pcbladdr __P((struct inpcb *, struct mbuf *,
-	    struct sockaddr_in **));
-struct inpcb *
-	 in_pcblookup __P((struct inpcbinfo *,
-	    struct in_addr, u_int, struct in_addr, u_int, int));
-struct inpcb *
-	 in_pcblookuphash __P((struct inpcbinfo *,
-	    struct in_addr, u_int, struct in_addr, u_int, int));
-void	 in_pcbnotify __P((struct inpcbhead *, struct sockaddr *,
-	    u_int, struct in_addr, u_int, int, void (*)(struct inpcb *, int)));
-void	 in_pcbrehash __P((struct inpcb *));
-void	 in_setpeeraddr __P((struct inpcb *, struct mbuf *));
-void	 in_setsockaddr __P((struct inpcb *, struct mbuf *));
-#endif
-
-#endif
diff --git a/c/src/exec/libnetworking/netinet/in_proto.c b/c/src/exec/libnetworking/netinet/in_proto.c
deleted file mode 100644
index 3fa845955e..0000000000
--- a/c/src/exec/libnetworking/netinet/in_proto.c
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)in_proto.c	8.2 (Berkeley) 2/9/95
- *	$Id$
- */
-
-#include "opt_tcpdebug.h"
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/kernel.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/domain.h>
-#include <sys/mbuf.h>
-#include <sys/protosw.h>
-#include <sys/sysctl.h>
-
-#include <net/if.h>
-#include <net/radix.h>
-#include <net/route.h>
-
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/ip_var.h>
-#include <netinet/ip_icmp.h>
-#include <netinet/in_pcb.h>
-#include <netinet/igmp_var.h>
-#include <netinet/tcp.h>
-#include <netinet/tcp_fsm.h>
-#include <netinet/tcp_seq.h>
-#include <netinet/tcp_timer.h>
-#include <netinet/tcp_var.h>
-#include <netinet/tcpip.h>
-#ifdef TCPDEBUG
-#include <netinet/tcp_debug.h>
-#endif
-#include <netinet/udp.h>
-#include <netinet/udp_var.h>
-/*
- * TCP/IP protocol family: IP, ICMP, UDP, TCP.
- */
-
-#ifdef IPXIP
-#include <netipx/ipx.h>
-#include <netipx/ipx_ip.h>
-#endif
-
-#ifdef NSIP
-#include <netns/ns.h>
-#include <netns/ns_if.h>
-#endif
-
-#ifdef TPIP
-void	tpip_input(), tpip_ctlinput(), tp_init(), tp_slowtimo(), tp_drain();
-int	tp_ctloutput(), tp_usrreq();
-#endif
-
-#ifdef EON
-void	eoninput(), eonctlinput(), eonprotoinit();
-#endif /* EON */
-
-extern	struct domain inetdomain;
-
-struct protosw inetsw[] = {
-{ 0,		&inetdomain,	0,		0,
-  0,		0,		0,		0,
-  0,
-  ip_init,	0,		ip_slowtimo,	ip_drain
-},
-{ SOCK_DGRAM,	&inetdomain,	IPPROTO_UDP,	PR_ATOMIC|PR_ADDR,
-  udp_input,	0,		udp_ctlinput,	ip_ctloutput,
-  udp_usrreq,
-  udp_init
-},
-{ SOCK_STREAM,	&inetdomain,	IPPROTO_TCP,
-	PR_CONNREQUIRED|PR_IMPLOPCL|PR_WANTRCVD,
-  tcp_input,	0,		tcp_ctlinput,	tcp_ctloutput,
-  0,
-  tcp_init,	tcp_fasttimo,	tcp_slowtimo,	tcp_drain,
-  &tcp_usrreqs
-},
-{ SOCK_RAW,	&inetdomain,	IPPROTO_RAW,	PR_ATOMIC|PR_ADDR,
-  rip_input,	0,		0,		rip_ctloutput,
-  rip_usrreq,
-  0,		0,		0,		0,
-},
-{ SOCK_RAW,	&inetdomain,	IPPROTO_ICMP,	PR_ATOMIC|PR_ADDR,
-  icmp_input,	0,		0,		rip_ctloutput,
-  rip_usrreq
-},
-{ SOCK_RAW,	&inetdomain,	IPPROTO_IGMP,	PR_ATOMIC|PR_ADDR,
-  igmp_input,	0,		0,		rip_ctloutput,
-  rip_usrreq,
-  igmp_init,	igmp_fasttimo,	igmp_slowtimo
-},
-{ SOCK_RAW,	&inetdomain,	IPPROTO_RSVP,	PR_ATOMIC|PR_ADDR,
-  rsvp_input,	0,		0,		rip_ctloutput,
-  rip_usrreq,
-  0,		0,		0,		0,
-},
-{ SOCK_RAW,	&inetdomain,	IPPROTO_IPIP,	PR_ATOMIC|PR_ADDR,
-  ipip_input,	0,	 	0,		rip_ctloutput,
-  rip_usrreq,
-  0,		0,		0,		0,
-},
-#ifdef IPDIVERT
-{ SOCK_RAW,	&inetdomain,	IPPROTO_DIVERT,	PR_ATOMIC|PR_ADDR,
-  div_input,	0,	 	0,		ip_ctloutput,
-  div_usrreq,
-  div_init,	0,		0,		0,
-},
-#endif
-#ifdef TPIP
-{ SOCK_SEQPACKET,&inetdomain,	IPPROTO_TP,	PR_CONNREQUIRED|PR_WANTRCVD,
-  tpip_input,	0,		tpip_ctlinput,	tp_ctloutput,
-  tp_usrreq,
-  tp_init,	0,		tp_slowtimo,	tp_drain,
-},
-#endif
-/* EON (ISO CLNL over IP) */
-#ifdef EON
-{ SOCK_RAW,	&inetdomain,	IPPROTO_EON,	0,
-  eoninput,	0,		eonctlinput,		0,
-  0,
-  eonprotoinit,	0,		0,		0,
-},
-#endif
-#ifdef IPXIP
-{ SOCK_RAW,	&inetdomain,	IPPROTO_IDP,	PR_ATOMIC|PR_ADDR,
-  ipxip_input,	0,		ipxip_ctlinput,	0,
-  rip_usrreq,
-  0,		0,		0,		0,
-},
-#endif
-#ifdef NSIP
-{ SOCK_RAW,	&inetdomain,	IPPROTO_IDP,	PR_ATOMIC|PR_ADDR,
-  idpip_input,	0,		nsip_ctlinput,	0,
-  rip_usrreq,
-  0,		0,		0,		0,
-},
-#endif
-	/* raw wildcard */
-{ SOCK_RAW,	&inetdomain,	0,		PR_ATOMIC|PR_ADDR,
-  rip_input,	0,		0,		rip_ctloutput,
-  rip_usrreq,
-  rip_init,	0,		0,		0,
-},
-};
-
-extern int in_inithead(void **, int);
-
-struct domain inetdomain =
-    { AF_INET, "internet", 0, 0, 0, 
-      inetsw, &inetsw[sizeof(inetsw)/sizeof(inetsw[0])], 0,
-      in_inithead, 32, sizeof(struct sockaddr_in)
-    };
-
-DOMAIN_SET(inet);
-
-SYSCTL_NODE(_net,      PF_INET,		inet,	CTLFLAG_RW, 0,
-	"Internet Family");
-
-SYSCTL_NODE(_net_inet, IPPROTO_IP,	ip,	CTLFLAG_RW, 0,	"IP");
-SYSCTL_NODE(_net_inet, IPPROTO_ICMP,	icmp,	CTLFLAG_RW, 0,	"ICMP");
-SYSCTL_NODE(_net_inet, IPPROTO_UDP,	udp,	CTLFLAG_RW, 0,	"UDP");
-SYSCTL_NODE(_net_inet, IPPROTO_TCP,	tcp,	CTLFLAG_RW, 0,	"TCP");
-SYSCTL_NODE(_net_inet, IPPROTO_IGMP,	igmp,	CTLFLAG_RW, 0,	"IGMP");
-#ifdef IPDIVERT
-SYSCTL_NODE(_net_inet, IPPROTO_DIVERT,	div,	CTLFLAG_RW, 0,	"DIVERT");
-#endif
-
diff --git a/c/src/exec/libnetworking/netinet/in_rmx.c b/c/src/exec/libnetworking/netinet/in_rmx.c
deleted file mode 100644
index ba1793b3b4..0000000000
--- a/c/src/exec/libnetworking/netinet/in_rmx.c
+++ /dev/null
@@ -1,384 +0,0 @@
-/*
- * Copyright 1994, 1995 Massachusetts Institute of Technology
- *
- * Permission to use, copy, modify, and distribute this software and
- * its documentation for any purpose and without fee is hereby
- * granted, provided that both the above copyright notice and this
- * permission notice appear in all copies, that both the above
- * copyright notice and this permission notice appear in all
- * supporting documentation, and that the name of M.I.T. not be used
- * in advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission.  M.I.T. makes
- * no representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied
- * warranty.
- *
- * THIS SOFTWARE IS PROVIDED BY M.I.T. ``AS IS''.  M.I.T. DISCLAIMS
- * ALL EXPRESS OR IMPLIED WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT
- * SHALL M.I.T. BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $Id$
- */
-
-/*
- * This code does two things necessary for the enhanced TCP metrics to
- * function in a useful manner:
- *  1) It marks all non-host routes as `cloning', thus ensuring that
- *     every actual reference to such a route actually gets turned
- *     into a reference to a host route to the specific destination
- *     requested.
- *  2) When such routes lose all their references, it arranges for them
- *     to be deleted in some random collection of circumstances, so that
- *     a large quantity of stale routing data is not kept in kernel memory
- *     indefinitely.  See in_rtqtimo() below for the exact mechanism.
- */
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/sysctl.h>
-#include <sys/queue.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/mbuf.h>
-#include <sys/syslog.h>
-
-#include <net/if.h>
-#include <net/route.h>
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/in_var.h>
-
-#include <netinet/ip.h>
-#include <netinet/ip_var.h>
-
-#include <netinet/tcp.h>
-#include <netinet/tcp_seq.h>
-#include <netinet/tcp_timer.h>
-#include <netinet/tcp_var.h>
-
-extern int	in_inithead __P((void **head, int off));
-
-#define RTPRF_OURS		RTF_PROTO3	/* set on routes we manage */
-
-/*
- * Do what we need to do when inserting a route.
- */
-static struct radix_node *
-in_addroute(void *v_arg, void *n_arg, struct radix_node_head *head,
-	    struct radix_node *treenodes)
-{
-	struct rtentry *rt = (struct rtentry *)treenodes;
-	struct sockaddr_in *sin = (struct sockaddr_in *)rt_key(rt);
-	struct radix_node *ret;
-
-	/*
-	 * For IP, all unicast non-host routes are automatically cloning.
-	 */
-	if(IN_MULTICAST(ntohl(sin->sin_addr.s_addr)))
-		rt->rt_flags |= RTF_MULTICAST;
-
-	if(!(rt->rt_flags & (RTF_HOST | RTF_CLONING | RTF_MULTICAST))) {
-		rt->rt_flags |= RTF_PRCLONING;
-	}
-
-	/*
-	 * A little bit of help for both IP output and input:
-	 *   For host routes, we make sure that RTF_BROADCAST
-	 *   is set for anything that looks like a broadcast address.
-	 *   This way, we can avoid an expensive call to in_broadcast()
-	 *   in ip_output() most of the time (because the route passed
-	 *   to ip_output() is almost always a host route).
-	 *
-	 *   We also do the same for local addresses, with the thought
-	 *   that this might one day be used to speed up ip_input().
-	 *
-	 * We also mark routes to multicast addresses as such, because
-	 * it's easy to do and might be useful (but this is much more
-	 * dubious since it's so easy to inspect the address).  (This
-	 * is done above.)
-	 */
-	if (rt->rt_flags & RTF_HOST) {
-		if (in_broadcast(sin->sin_addr, rt->rt_ifp)) {
-			rt->rt_flags |= RTF_BROADCAST;
-		} else {
-#define satosin(sa) ((struct sockaddr_in *)sa)
-			if (satosin(rt->rt_ifa->ifa_addr)->sin_addr.s_addr
-			    == sin->sin_addr.s_addr)
-				rt->rt_flags |= RTF_LOCAL;
-#undef satosin
-		}
-	}
-
-	/*
-	 * We also specify a send and receive pipe size for every
-	 * route added, to help TCP a bit.  TCP doesn't actually
-	 * want a true pipe size, which would be prohibitive in memory
-	 * costs and is hard to compute anyway; it simply uses these
-	 * values to size its buffers.  So, we fill them in with the
-	 * same values that TCP would have used anyway, and allow the
-	 * installing program or the link layer to override these values
-	 * as it sees fit.  This will hopefully allow TCP more
-	 * opportunities to save its ssthresh value.
-	 */
-	if (!rt->rt_rmx.rmx_sendpipe && !(rt->rt_rmx.rmx_locks & RTV_SPIPE))
-		rt->rt_rmx.rmx_sendpipe = tcp_sendspace;
-
-	if (!rt->rt_rmx.rmx_recvpipe && !(rt->rt_rmx.rmx_locks & RTV_RPIPE))
-		rt->rt_rmx.rmx_recvpipe = tcp_recvspace;
-
-	if (!rt->rt_rmx.rmx_mtu && !(rt->rt_rmx.rmx_locks & RTV_MTU) 
-	    && rt->rt_ifp)
-		rt->rt_rmx.rmx_mtu = rt->rt_ifp->if_mtu;
-
-	ret = rn_addroute(v_arg, n_arg, head, treenodes);
-	if (ret == NULL && rt->rt_flags & RTF_HOST) {
-		struct rtentry *rt2;
-		/*
-		 * We are trying to add a host route, but can't.
-		 * Find out if it is because of an
-		 * ARP entry and delete it if so.
-		 */
-		rt2 = rtalloc1((struct sockaddr *)sin, 0,
-				RTF_CLONING | RTF_PRCLONING);
-		if (rt2) {
-			if (rt2->rt_flags & RTF_LLINFO &&
-				rt2->rt_flags & RTF_HOST &&
-				rt2->rt_gateway &&
-				rt2->rt_gateway->sa_family == AF_LINK) {
-				rtrequest(RTM_DELETE,
-					  (struct sockaddr *)rt_key(rt2),
-					  rt2->rt_gateway,
-					  rt_mask(rt2), rt2->rt_flags, 0);
-				ret = rn_addroute(v_arg, n_arg, head,
-					treenodes);
-			}
-			RTFREE(rt2);
-		}
-	}
-	return ret;
-}
-
-/*
- * This code is the inverse of in_clsroute: on first reference, if we
- * were managing the route, stop doing so and set the expiration timer
- * back off again.
- */
-static struct radix_node *
-in_matroute(void *v_arg, struct radix_node_head *head)
-{
-	struct radix_node *rn = rn_match(v_arg, head);
-	struct rtentry *rt = (struct rtentry *)rn;
-
-	if(rt && rt->rt_refcnt == 0) { /* this is first reference */
-		if(rt->rt_flags & RTPRF_OURS) {
-			rt->rt_flags &= ~RTPRF_OURS;
-			rt->rt_rmx.rmx_expire = 0;
-		}
-	}
-	return rn;
-}
-
-static int rtq_reallyold = 60*60;
-	/* one hour is ``really old'' */
-SYSCTL_INT(_net_inet_ip, IPCTL_RTEXPIRE, rtexpire,
-	CTLFLAG_RW, &rtq_reallyold , 0, "");
-				   
-static int rtq_minreallyold = 10;
-	/* never automatically crank down to less */
-SYSCTL_INT(_net_inet_ip, IPCTL_RTMINEXPIRE, rtminexpire,
-	CTLFLAG_RW, &rtq_minreallyold , 0, "");
-				   
-static int rtq_toomany = 128;
-	/* 128 cached routes is ``too many'' */
-SYSCTL_INT(_net_inet_ip, IPCTL_RTMAXCACHE, rtmaxcache,
-	CTLFLAG_RW, &rtq_toomany , 0, "");
-				   
-
-/*
- * On last reference drop, mark the route as belong to us so that it can be
- * timed out.
- */
-static void
-in_clsroute(struct radix_node *rn, struct radix_node_head *head)
-{
-	struct rtentry *rt = (struct rtentry *)rn;
-
-	if(!(rt->rt_flags & RTF_UP))
-		return;		/* prophylactic measures */
-
-	if((rt->rt_flags & (RTF_LLINFO | RTF_HOST)) != RTF_HOST)
-		return;
-
-	if((rt->rt_flags & (RTF_WASCLONED | RTPRF_OURS))
-	   != RTF_WASCLONED)
-		return;
-
-	/*
-	 * As requested by David Greenman:
-	 * If rtq_reallyold is 0, just delete the route without
-	 * waiting for a timeout cycle to kill it.
-	 */
-	if(rtq_reallyold != 0) {
-		rt->rt_flags |= RTPRF_OURS;
-		rt->rt_rmx.rmx_expire = rtems_bsdnet_seconds_since_boot() + rtq_reallyold;
-	} else {
-		rtrequest(RTM_DELETE,
-			  (struct sockaddr *)rt_key(rt),
-			  rt->rt_gateway, rt_mask(rt),
-			  rt->rt_flags, 0);
-	}
-}
-
-struct rtqk_arg {
-	struct radix_node_head *rnh;
-	int draining;
-	int killed;
-	int found;
-	int updating;
-	time_t nextstop;
-};
-
-/*
- * Get rid of old routes.  When draining, this deletes everything, even when
- * the timeout is not expired yet.  When updating, this makes sure that
- * nothing has a timeout longer than the current value of rtq_reallyold.
- */
-static int
-in_rtqkill(struct radix_node *rn, void *rock)
-{
-	struct rtqk_arg *ap = rock;
-	struct rtentry *rt = (struct rtentry *)rn;
-	int err;
-
-	if(rt->rt_flags & RTPRF_OURS) {
-		ap->found++;
-
-		if(ap->draining || rt->rt_rmx.rmx_expire <= rtems_bsdnet_seconds_since_boot()) {
-			if(rt->rt_refcnt > 0)
-				panic("rtqkill route really not free");
-
-			err = rtrequest(RTM_DELETE,
-					(struct sockaddr *)rt_key(rt),
-					rt->rt_gateway, rt_mask(rt),
-					rt->rt_flags, 0);
-			if(err) {
-				log(LOG_WARNING, "in_rtqkill: error %d\n", err);
-			} else {
-				ap->killed++;
-			}
-		} else {
-			if(ap->updating
-			   && (rt->rt_rmx.rmx_expire - rtems_bsdnet_seconds_since_boot()
-			       > rtq_reallyold)) {
-				rt->rt_rmx.rmx_expire = rtems_bsdnet_seconds_since_boot()
-					+ rtq_reallyold;
-			}
-			ap->nextstop = lmin(ap->nextstop,
-					    rt->rt_rmx.rmx_expire);
-		}
-	}
-
-	return 0;
-}
-
-#define RTQ_TIMEOUT	60*10	/* run no less than once every ten minutes */
-static int rtq_timeout = RTQ_TIMEOUT;
-
-static void
-in_rtqtimo(void *rock)
-{
-	struct radix_node_head *rnh = rock;
-	struct rtqk_arg arg;
-	struct timeval atv;
-	static time_t last_adjusted_timeout = 0;
-	int s;
-
-	arg.found = arg.killed = 0;
-	arg.rnh = rnh;
-	arg.nextstop = rtems_bsdnet_seconds_since_boot() + rtq_timeout;
-	arg.draining = arg.updating = 0;
-	s = splnet();
-	rnh->rnh_walktree(rnh, in_rtqkill, &arg);
-	splx(s);
-
-	/*
-	 * Attempt to be somewhat dynamic about this:
-	 * If there are ``too many'' routes sitting around taking up space,
-	 * then crank down the timeout, and see if we can't make some more
-	 * go away.  However, we make sure that we will never adjust more
-	 * than once in rtq_timeout seconds, to keep from cranking down too
-	 * hard.
-	 */
-	if((arg.found - arg.killed > rtq_toomany)
-	   && (rtems_bsdnet_seconds_since_boot() - last_adjusted_timeout >= rtq_timeout)
-	   && rtq_reallyold > rtq_minreallyold) {
-		rtq_reallyold = 2*rtq_reallyold / 3;
-		if(rtq_reallyold < rtq_minreallyold) {
-			rtq_reallyold = rtq_minreallyold;
-		}
-
-		last_adjusted_timeout = rtems_bsdnet_seconds_since_boot();
-#ifdef DIAGNOSTIC
-		log(LOG_DEBUG, "in_rtqtimo: adjusted rtq_reallyold to %d\n",
-		    rtq_reallyold);
-#endif
-		arg.found = arg.killed = 0;
-		arg.updating = 1;
-		s = splnet();
-		rnh->rnh_walktree(rnh, in_rtqkill, &arg);
-		splx(s);
-	}
-
-	atv.tv_usec = 0;
-	atv.tv_sec = arg.nextstop;
-	timeout(in_rtqtimo, rock, hzto(&atv));
-}
-
-void
-in_rtqdrain(void)
-{
-	struct radix_node_head *rnh = rt_tables[AF_INET];
-	struct rtqk_arg arg;
-	int s;
-	arg.found = arg.killed = 0;
-	arg.rnh = rnh;
-	arg.nextstop = 0;
-	arg.draining = 1;
-	arg.updating = 0;
-	s = splnet();
-	rnh->rnh_walktree(rnh, in_rtqkill, &arg);
-	splx(s);
-}
-
-/*
- * Initialize our routing tree.
- */
-int
-in_inithead(void **head, int off)
-{
-	struct radix_node_head *rnh;
-
-	if(!rn_inithead(head, off))
-		return 0;
-
-	if(head != (void **)&rt_tables[AF_INET]) /* BOGUS! */
-		return 1;	/* only do this for the real routing table */
-
-	rnh = *head;
-	rnh->rnh_addaddr = in_addroute;
-	rnh->rnh_matchaddr = in_matroute;
-	rnh->rnh_close = in_clsroute;
-	in_rtqtimo(rnh);	/* kick off timeout first time */
-	return 1;
-}
-
diff --git a/c/src/exec/libnetworking/netinet/in_systm.h b/c/src/exec/libnetworking/netinet/in_systm.h
deleted file mode 100644
index d72e9b4665..0000000000
--- a/c/src/exec/libnetworking/netinet/in_systm.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)in_systm.h	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#ifndef _NETINET_IN_SYSTM_H_
-#define _NETINET_IN_SYSTM_H_
-
-/*
- * Miscellaneous internetwork
- * definitions for kernel.
- */
-
-/*
- * Network types.
- *
- * Internally the system keeps counters in the headers with the bytes
- * swapped so that VAX instructions will work on them.  It reverses
- * the bytes before transmission at each protocol level.  The n_ types
- * represent the types with the bytes in ``high-ender'' order.
- */
-typedef u_short n_short;		/* short as received from the net */
-typedef u_long	n_long;			/* long as received from the net */
-
-typedef	u_long	n_time;			/* ms since 00:00 GMT, byte rev */
-
-#ifdef KERNEL
-n_time	 iptime __P((void));
-#endif
-
-#endif
diff --git a/c/src/exec/libnetworking/netinet/in_var.h b/c/src/exec/libnetworking/netinet/in_var.h
deleted file mode 100644
index e7a54d5e85..0000000000
--- a/c/src/exec/libnetworking/netinet/in_var.h
+++ /dev/null
@@ -1,235 +0,0 @@
-/*
- * Copyright (c) 1985, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)in_var.h	8.2 (Berkeley) 1/9/95
- *	$Id$
- */
-
-#ifndef _NETINET_IN_VAR_H_
-#define _NETINET_IN_VAR_H_
-
-#include <sys/queue.h>
-
-/*
- * Interface address, Internet version.  One of these structures
- * is allocated for each interface with an Internet address.
- * The ifaddr structure contains the protocol-independent part
- * of the structure and is assumed to be first.
- */
-struct in_ifaddr {
-	struct	ifaddr ia_ifa;		/* protocol-independent info */
-#define	ia_ifp		ia_ifa.ifa_ifp
-#define ia_flags	ia_ifa.ifa_flags
-					/* ia_{,sub}net{,mask} in host order */
-	u_long	ia_net;			/* network number of interface */
-	u_long	ia_netmask;		/* mask of net part */
-	u_long	ia_subnet;		/* subnet number, including net */
-	u_long	ia_subnetmask;		/* mask of subnet part */
-	struct	in_addr ia_netbroadcast; /* to recognize net broadcasts */
-	struct	in_ifaddr *ia_next;	/* next in list of internet addresses */
-	struct	sockaddr_in ia_addr;	/* reserve space for interface name */
-	struct	sockaddr_in ia_dstaddr; /* reserve space for broadcast addr */
-#define	ia_broadaddr	ia_dstaddr
-	struct	sockaddr_in ia_sockmask; /* reserve space for general netmask */
-	LIST_HEAD(in_multihead, in_multi) ia_multiaddrs;
-					/* list of multicast addresses */
-};
-
-struct	in_aliasreq {
-	char	ifra_name[IFNAMSIZ];		/* if name, e.g. "en0" */
-	struct	sockaddr_in ifra_addr;
-	struct	sockaddr_in ifra_broadaddr;
-#define ifra_dstaddr ifra_broadaddr
-	struct	sockaddr_in ifra_mask;
-};
-/*
- * Given a pointer to an in_ifaddr (ifaddr),
- * return a pointer to the addr as a sockaddr_in.
- */
-#define IA_SIN(ia)    (&(((struct in_ifaddr *)(ia))->ia_addr))
-#define IA_DSTSIN(ia) (&(((struct in_ifaddr *)(ia))->ia_dstaddr))
-
-#define IN_LNAOF(in, ifa) \
-	((ntohl((in).s_addr) & ~((struct in_ifaddr *)(ifa)->ia_subnetmask))
-
-
-#ifdef	KERNEL
-extern	struct	in_ifaddr *in_ifaddr;
-extern	struct	ifqueue	ipintrq;		/* ip packet input queue */
-extern	struct	in_addr zeroin_addr;
-extern	u_char	inetctlerrmap[];
-extern	int rtq_reallyold;	/* XXX */
-extern	int rtq_minreallyold;	/* XXX */
-extern	int rtq_toomany;	/* XXX */
-
-/*
- * Macro for finding the interface (ifnet structure) corresponding to one
- * of our IP addresses.
- */
-#define INADDR_TO_IFP(addr, ifp) \
-	/* struct in_addr addr; */ \
-	/* struct ifnet *ifp; */ \
-{ \
-	register struct in_ifaddr *ia; \
-\
-	for (ia = in_ifaddr; \
-	    ia != NULL && ((ia->ia_ifp->if_flags & IFF_POINTOPOINT)? \
-		IA_DSTSIN(ia):IA_SIN(ia))->sin_addr.s_addr != (addr).s_addr; \
-	    ia = ia->ia_next) \
-		 continue; \
-	if (ia == NULL) \
-	    for (ia = in_ifaddr; \
-		ia != NULL; \
-		ia = ia->ia_next) \
-		    if (ia->ia_ifp->if_flags & IFF_POINTOPOINT && \
-			IA_SIN(ia)->sin_addr.s_addr == (addr).s_addr) \
-			    break; \
-	(ifp) = (ia == NULL) ? NULL : ia->ia_ifp; \
-}
-
-/*
- * Macro for finding the internet address structure (in_ifaddr) corresponding
- * to a given interface (ifnet structure).
- */
-#define IFP_TO_IA(ifp, ia) \
-	/* struct ifnet *ifp; */ \
-	/* struct in_ifaddr *ia; */ \
-{ \
-	for ((ia) = in_ifaddr; \
-	    (ia) != NULL && (ia)->ia_ifp != (ifp); \
-	    (ia) = (ia)->ia_next) \
-		continue; \
-}
-#endif
-
-/*
- * This information should be part of the ifnet structure but we don't wish
- * to change that - as it might break a number of things
- */
-
-struct router_info {
-	struct ifnet *rti_ifp;
-	int    rti_type; /* type of router which is querier on this interface */
-	int    rti_time; /* # of slow timeouts since last old query */
-	struct router_info *rti_next;
-};
-
-/*
- * Internet multicast address structure.  There is one of these for each IP
- * multicast group to which this host belongs on a given network interface.
- * They are kept in a linked list, rooted in the interface's in_ifaddr
- * structure.
- */
-struct in_multi {
-	LIST_ENTRY(in_multi) inm_entry; /* list glue */
-	struct	in_addr inm_addr;	/* IP multicast address */
-	struct	ifnet *inm_ifp;		/* back pointer to ifnet */
-	struct	in_ifaddr *inm_ia;	/* back pointer to in_ifaddr */
-	u_int	inm_refcount;		/* no. membership claims by sockets */
-	u_int	inm_timer;		/* IGMP membership report timer */
-	u_int	inm_state;		/*  state of the membership */
-	struct	router_info *inm_rti;	/* router info*/
-};
-
-#ifdef KERNEL
-/*
- * Structure used by macros below to remember position when stepping through
- * all of the in_multi records.
- */
-struct in_multistep {
-	struct in_ifaddr *i_ia;
-	struct in_multi *i_inm;
-};
-
-/*
- * Macro for looking up the in_multi record for a given IP multicast address
- * on a given interface.  If no matching record is found, "inm" returns NULL.
- */
-#define IN_LOOKUP_MULTI(addr, ifp, inm) \
-	/* struct in_addr addr; */ \
-	/* struct ifnet *ifp; */ \
-	/* struct in_multi *inm; */ \
-{ \
-	register struct in_ifaddr *ia; \
-\
-	IFP_TO_IA((ifp), ia); \
-	if (ia == NULL) \
-		(inm) = NULL; \
-	else \
-		for ((inm) = ia->ia_multiaddrs.lh_first; \
-		    (inm) != NULL && (inm)->inm_addr.s_addr != (addr).s_addr; \
-		     (inm) = inm->inm_entry.le_next) \
-			 continue; \
-}
-
-/*
- * Macro to step through all of the in_multi records, one at a time.
- * The current position is remembered in "step", which the caller must
- * provide.  IN_FIRST_MULTI(), below, must be called to initialize "step"
- * and get the first record.  Both macros return a NULL "inm" when there
- * are no remaining records.
- */
-#define IN_NEXT_MULTI(step, inm) \
-	/* struct in_multistep  step; */ \
-	/* struct in_multi *inm; */ \
-{ \
-	if (((inm) = (step).i_inm) != NULL) \
-		(step).i_inm = (inm)->inm_entry.le_next; \
-	else \
-		while ((step).i_ia != NULL) { \
-			(inm) = (step).i_ia->ia_multiaddrs.lh_first; \
-			(step).i_ia = (step).i_ia->ia_next; \
-			if ((inm) != NULL) { \
-				(step).i_inm = (inm)->inm_entry.le_next; \
-				break; \
-			} \
-		} \
-}
-
-#define IN_FIRST_MULTI(step, inm) \
-	/* struct in_multistep step; */ \
-	/* struct in_multi *inm; */ \
-{ \
-	(step).i_ia = in_ifaddr; \
-	(step).i_inm = NULL; \
-	IN_NEXT_MULTI((step), (inm)); \
-}
-
-struct	in_multi *in_addmulti __P((struct in_addr *, struct ifnet *));
-void	in_delmulti __P((struct in_multi *));
-int	in_control __P((struct socket *, u_long, caddr_t, struct ifnet *));
-void	in_rtqdrain __P((void));
-void	ip_input __P((struct mbuf *));
-
-#endif /* KERNEL */
-
-#endif /* _NETINET_IN_VAR_H_ */
diff --git a/c/src/exec/libnetworking/netinet/ip.h b/c/src/exec/libnetworking/netinet/ip.h
deleted file mode 100644
index e7f824ca6f..0000000000
--- a/c/src/exec/libnetworking/netinet/ip.h
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)ip.h	8.2 (Berkeley) 6/1/94
- *	$Id$
- */
-
-#ifndef _NETINET_IP_H_
-#define _NETINET_IP_H_
-
-/*
- * Definitions for internet protocol version 4.
- * Per RFC 791, September 1981.
- */
-#define	IPVERSION	4
-
-/*
- * Structure of an internet header, naked of options.
- *
- * We declare ip_len and ip_off to be short, rather than u_short
- * pragmatically since otherwise unsigned comparisons can result
- * against negative integers quite easily, and fail in subtle ways.
- */
-struct ip {
-#ifdef _IP_VHL
-	u_char	ip_vhl;			/* version << 4 | header length >> 2 */
-#else
-#if BYTE_ORDER == LITTLE_ENDIAN
-	u_char	ip_hl:4,		/* header length */
-		ip_v:4;			/* version */
-#endif
-#if BYTE_ORDER == BIG_ENDIAN
-	u_char	ip_v:4,			/* version */
-		ip_hl:4;		/* header length */
-#endif
-#endif /* not _IP_VHL */
-	u_char	ip_tos;			/* type of service */
-	u_short	ip_len;			/* total length */
-	u_short	ip_id;			/* identification */
-	u_short	ip_off;			/* fragment offset field */
-#define	IP_RF 0x8000			/* reserved fragment flag */
-#define	IP_DF 0x4000			/* dont fragment flag */
-#define	IP_MF 0x2000			/* more fragments flag */
-#define	IP_OFFMASK 0x1fff		/* mask for fragmenting bits */
-	u_char	ip_ttl;			/* time to live */
-	u_char	ip_p;			/* protocol */
-	u_short	ip_sum;			/* checksum */
-	struct	in_addr ip_src,ip_dst;	/* source and dest address */
-};
-
-#ifdef _IP_VHL
-#define	IP_MAKE_VHL(v, hl)	((v) << 4 | (hl))
-#define	IP_VHL_HL(vhl)		((vhl) & 0x0f)
-#define	IP_VHL_V(vhl)		((vhl) >> 4)
-#define	IP_VHL_BORING		0x45
-#endif
-
-#define	IP_MAXPACKET	65535		/* maximum packet size */
-
-/*
- * Definitions for IP type of service (ip_tos)
- */
-#define	IPTOS_LOWDELAY		0x10
-#define	IPTOS_THROUGHPUT	0x08
-#define	IPTOS_RELIABILITY	0x04
-#define	IPTOS_MINCOST		0x02
-
-/*
- * Definitions for IP precedence (also in ip_tos) (hopefully unused)
- */
-#define	IPTOS_PREC_NETCONTROL		0xe0
-#define	IPTOS_PREC_INTERNETCONTROL	0xc0
-#define	IPTOS_PREC_CRITIC_ECP		0xa0
-#define	IPTOS_PREC_FLASHOVERRIDE	0x80
-#define	IPTOS_PREC_FLASH		0x60
-#define	IPTOS_PREC_IMMEDIATE		0x40
-#define	IPTOS_PREC_PRIORITY		0x20
-#define	IPTOS_PREC_ROUTINE		0x00
-
-/*
- * Definitions for options.
- */
-#define	IPOPT_COPIED(o)		((o)&0x80)
-#define	IPOPT_CLASS(o)		((o)&0x60)
-#define	IPOPT_NUMBER(o)		((o)&0x1f)
-
-#define	IPOPT_CONTROL		0x00
-#define	IPOPT_RESERVED1		0x20
-#define	IPOPT_DEBMEAS		0x40
-#define	IPOPT_RESERVED2		0x60
-
-#define	IPOPT_EOL		0		/* end of option list */
-#define	IPOPT_NOP		1		/* no operation */
-
-#define	IPOPT_RR		7		/* record packet route */
-#define	IPOPT_TS		68		/* timestamp */
-#define	IPOPT_SECURITY		130		/* provide s,c,h,tcc */
-#define	IPOPT_LSRR		131		/* loose source route */
-#define	IPOPT_SATID		136		/* satnet id */
-#define	IPOPT_SSRR		137		/* strict source route */
-#define	IPOPT_RA		148		/* router alert */
-
-/*
- * Offsets to fields in options other than EOL and NOP.
- */
-#define	IPOPT_OPTVAL		0		/* option ID */
-#define	IPOPT_OLEN		1		/* option length */
-#define IPOPT_OFFSET		2		/* offset within option */
-#define	IPOPT_MINOFF		4		/* min value of above */
-
-/*
- * Time stamp option structure.
- */
-struct	ip_timestamp {
-	u_char	ipt_code;		/* IPOPT_TS */
-	u_char	ipt_len;		/* size of structure (variable) */
-	u_char	ipt_ptr;		/* index of current entry */
-#if BYTE_ORDER == LITTLE_ENDIAN
-	u_char	ipt_flg:4,		/* flags, see below */
-		ipt_oflw:4;		/* overflow counter */
-#endif
-#if BYTE_ORDER == BIG_ENDIAN
-	u_char	ipt_oflw:4,		/* overflow counter */
-		ipt_flg:4;		/* flags, see below */
-#endif
-	union ipt_timestamp {
-		n_long	ipt_time[1];
-		struct	ipt_ta {
-			struct in_addr ipt_addr;
-			n_long ipt_time;
-		} ipt_ta[1];
-	} ipt_timestamp;
-};
-
-#include <machine/in_cksum.h>
-
-/* flag bits for ipt_flg */
-#define	IPOPT_TS_TSONLY		0		/* timestamps only */
-#define	IPOPT_TS_TSANDADDR	1		/* timestamps and addresses */
-#define	IPOPT_TS_PRESPEC	3		/* specified modules only */
-
-/* bits for security (not byte swapped) */
-#define	IPOPT_SECUR_UNCLASS	0x0000
-#define	IPOPT_SECUR_CONFID	0xf135
-#define	IPOPT_SECUR_EFTO	0x789a
-#define	IPOPT_SECUR_MMMM	0xbc4d
-#define	IPOPT_SECUR_RESTR	0xaf13
-#define	IPOPT_SECUR_SECRET	0xd788
-#define	IPOPT_SECUR_TOPSECRET	0x6bc5
-
-/*
- * Internet implementation parameters.
- */
-#define	MAXTTL		255		/* maximum time to live (seconds) */
-#define	IPDEFTTL	64		/* default ttl, from RFC 1340 */
-#define	IPFRAGTTL	60		/* time to live for frags, slowhz */
-#define	IPTTLDEC	1		/* subtracted when forwarding */
-
-#define	IP_MSS		576		/* default maximum segment size */
-
-#endif
diff --git a/c/src/exec/libnetworking/netinet/ip_divert.c b/c/src/exec/libnetworking/netinet/ip_divert.c
deleted file mode 100644
index 2955e811ad..0000000000
--- a/c/src/exec/libnetworking/netinet/ip_divert.c
+++ /dev/null
@@ -1,382 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	$Id$
- */
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/malloc.h>
-#include <sys/mbuf.h>
-#include <sys/socket.h>
-#include <sys/protosw.h>
-#include <sys/socketvar.h>
-#include <sys/errno.h>
-#include <sys/systm.h>
-
-#include <net/if.h>
-#include <net/route.h>
-
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/in_pcb.h>
-#include <netinet/in_var.h>
-#include <netinet/ip_var.h>
-
-/*
- * Divert sockets
- */
-
-/*
- * Allocate enough space to hold a full IP packet
- */
-#define	DIVSNDQ		(65536 + 100)
-#define	DIVRCVQ		(65536 + 100)
-
-/* Global variables */
-
-/*
- * ip_input() and ip_output() set this secret value before calling us to
- * let us know which divert port to divert a packet to; this is done so
- * we can use the existing prototype for struct protosw's pr_input().
- * This is stored in host order.
- */
-u_short ip_divert_port;
-
-/*
- * We set this value to a non-zero port number when we want the call to
- * ip_fw_chk() in ip_input() or ip_output() to ignore ``divert <port>''
- * chain entries. This is stored in host order.
- */
-u_short ip_divert_ignore;
-
-/* Internal variables */
-
-static struct inpcbhead divcb;
-static struct inpcbinfo divcbinfo;
-
-static u_long	div_sendspace = DIVSNDQ;	/* XXX sysctl ? */
-static u_long	div_recvspace = DIVRCVQ;	/* XXX sysctl ? */
-
-/* Optimization: have this preinitialized */
-static struct sockaddr_in divsrc = { sizeof(divsrc), AF_INET };
-
-/* Internal functions */
-
-static int div_output(struct socket *so,
-		struct mbuf *m, struct mbuf *addr, struct mbuf *control);
-
-/*
- * Initialize divert connection block queue.
- */
-void
-div_init(void)
-{
-	LIST_INIT(&divcb);
-	divcbinfo.listhead = &divcb;
-	/*
-	 * XXX We don't use the hash list for divert IP, but it's easier
-	 * to allocate a one entry hash list than it is to check all
-	 * over the place for hashbase == NULL.
-	 */
-	divcbinfo.hashbase = hashinit(1, M_PCB, &divcbinfo.hashmask);
-}
-
-/*
- * Setup generic address and protocol structures
- * for div_input routine, then pass them along with
- * mbuf chain. ip->ip_len is assumed to have had
- * the header length (hlen) subtracted out already.
- * We tell whether the packet was incoming or outgoing
- * by seeing if hlen == 0, which is a hack.
- */
-void
-div_input(struct mbuf *m, int hlen)
-{
-	struct ip *ip;
-	struct inpcb *inp;
-	struct socket *sa;
-
-	/* Sanity check */
-	if (ip_divert_port == 0)
-		panic("div_input: port is 0");
-
-	/* Assure header */
-	if (m->m_len < sizeof(struct ip) &&
-	    (m = m_pullup(m, sizeof(struct ip))) == 0) {
-		return;
-	}
-	ip = mtod(m, struct ip *);
-
-	/* Record divert port */
-	divsrc.sin_port = htons(ip_divert_port);
-
-	/* Restore packet header fields */
-	ip->ip_len += hlen;
-	HTONS(ip->ip_len);
-	HTONS(ip->ip_off);
-
-	/* Record receive interface address, if any */
-	divsrc.sin_addr.s_addr = 0;
-	if (hlen) {
-		struct ifaddr *ifa;
-
-#ifdef DIAGNOSTIC
-		/* Sanity check */
-		if (!(m->m_flags & M_PKTHDR))
-			panic("div_input: no pkt hdr");
-#endif
-
-		/* More fields affected by ip_input() */
-		HTONS(ip->ip_id);
-
-		/* Find IP address for recieve interface */
-		for (ifa = m->m_pkthdr.rcvif->if_addrlist;
-		    ifa != NULL; ifa = ifa->ifa_next) {
-			if (ifa->ifa_addr == NULL)
-				continue;
-			if (ifa->ifa_addr->sa_family != AF_INET)
-				continue;
-			divsrc.sin_addr =
-			    ((struct sockaddr_in *) ifa->ifa_addr)->sin_addr;
-			break;
-		}
-	}
-
-	/* Put packet on socket queue, if any */
-	sa = NULL;
-	for (inp = divcb.lh_first; inp != NULL; inp = inp->inp_list.le_next) {
-		if (inp->inp_lport == htons(ip_divert_port))
-			sa = inp->inp_socket;
-	}
-	if (sa) {
-		if (sbappendaddr(&sa->so_rcv, (struct sockaddr *)&divsrc,
-				m, (struct mbuf *)0) == 0)
-			m_freem(m);
-		else
-			sorwakeup(sa);
-	} else {
-		m_freem(m);
-		ipstat.ips_noproto++;
-		ipstat.ips_delivered--;
-        }
-}
-
-/*
- * Deliver packet back into the IP processing machinery.
- *
- * If no address specified, or address is 0.0.0.0, send to ip_output();
- * otherwise, send to ip_input() and mark as having been received on
- * the interface with that address.
- *
- * If no address specified, or dest port is 0, allow packet to divert
- * back to this socket; otherwise, don't.
- */
-static int
-div_output(so, m, addr, control)
-	struct socket *so;
-	register struct mbuf *m;
-	struct mbuf *addr, *control;
-{
-	register struct inpcb *const inp = sotoinpcb(so);
-	register struct ip *const ip = mtod(m, struct ip *);
-	struct sockaddr_in *sin = NULL;
-	int error = 0;
-
-	if (control)
-		m_freem(control);		/* XXX */
-	if (addr)
-		sin = mtod(addr, struct sockaddr_in *);
-
-	/* Loopback avoidance option */
-	ip_divert_ignore = ntohs(inp->inp_lport);
-
-	/* Reinject packet into the system as incoming or outgoing */
-	if (!sin || sin->sin_addr.s_addr == 0) {
-		/* Don't allow both user specified and setsockopt options,
-		   and don't allow packet length sizes that will crash */
-		if (((ip->ip_hl != (sizeof (*ip) >> 2)) && inp->inp_options) ||
-		     ((u_short)ntohs(ip->ip_len) > m->m_pkthdr.len)) {
-			error = EINVAL;
-			goto cantsend;
-		}
-
-		/* Convert fields to host order for ip_output() */
-		NTOHS(ip->ip_len);
-		NTOHS(ip->ip_off);
-
-		/* Send packet to output processing */
-		ipstat.ips_rawout++;			/* XXX */
-		error = ip_output(m, inp->inp_options, &inp->inp_route,
-			(so->so_options & SO_DONTROUTE) |
-			IP_ALLOWBROADCAST | IP_RAWOUTPUT, inp->inp_moptions);
-	} else {
-		struct ifaddr *ifa;
-
-		/* Find receive interface with the given IP address */
-		sin->sin_port = 0;
-		if ((ifa = ifa_ifwithaddr((struct sockaddr *) sin)) == 0) {
-			error = EADDRNOTAVAIL;
-			goto cantsend;
-		}
-		m->m_pkthdr.rcvif = ifa->ifa_ifp;
-
-		/* Send packet to input processing */
-		ip_input(m);
-	}
-
-	/* Reset for next time (and other packets) */
-	ip_divert_ignore = 0;
-	return error;
-
-cantsend:
-	ip_divert_ignore = 0;
-	m_freem(m);
-	return error;
-}
-
-/*ARGSUSED*/
-int
-div_usrreq(so, req, m, nam, control)
-	register struct socket *so;
-	int req;
-	struct mbuf *m, *nam, *control;
-{
-	register int error = 0;
-	register struct inpcb *inp = sotoinpcb(so);
-	int s;
-
-	if (inp == NULL && req != PRU_ATTACH) {
-		error = EINVAL;
-		goto release;
-	}
-	switch (req) {
-
-	case PRU_ATTACH:
-		if (inp)
-			panic("div_attach");
-		if ((so->so_state & SS_PRIV) == 0) {
-			error = EACCES;
-			break;
-		}
-		s = splnet();
-		error = in_pcballoc(so, &divcbinfo);
-		splx(s);
-		if (error)
-			break;
-		error = soreserve(so, div_sendspace, div_recvspace);
-		if (error)
-			break;
-		inp = (struct inpcb *)so->so_pcb;
-		inp->inp_ip_p = (int)nam;	/* XXX */
-		inp->inp_flags |= INP_HDRINCL;
-		/* The socket is always "connected" because
-		   we always know "where" to send the packet */
-		so->so_state |= SS_ISCONNECTED;
-		break;
-
-	case PRU_DISCONNECT:
-		if ((so->so_state & SS_ISCONNECTED) == 0) {
-			error = ENOTCONN;
-			break;
-		}
-		/* FALLTHROUGH */
-	case PRU_ABORT:
-		soisdisconnected(so);
-		/* FALLTHROUGH */
-	case PRU_DETACH:
-		if (inp == 0)
-			panic("div_detach");
-		in_pcbdetach(inp);
-		break;
-
-	case PRU_BIND:
-		s = splnet();
-		error = in_pcbbind(inp, nam);
-		splx(s);
-		break;
-
-	/*
-	 * Mark the connection as being incapable of further input.
-	 */
-	case PRU_SHUTDOWN:
-		socantsendmore(so);
-		break;
-
-	case PRU_SEND:
-		/* Packet must have a header (but that's about it) */
-		if (m->m_len < sizeof (struct ip) ||
-		    (m = m_pullup(m, sizeof (struct ip))) == 0) {
-			ipstat.ips_toosmall++;
-			error = EINVAL;
-			break;
-		}
-
-		/* Send packet */
-		error = div_output(so, m, nam, control); 
-		m = NULL;
-		break;
-
-	case PRU_SOCKADDR:
-		in_setsockaddr(inp, nam);
-		break;
-
-	case PRU_SENSE:
-		/*
-		 * stat: don't bother with a blocksize.
-		 */
-		return (0);
-
-	/*
-	 * Not supported.
-	 */
-	case PRU_CONNECT:
-	case PRU_CONNECT2:
-	case PRU_CONTROL:
-	case PRU_RCVOOB:
-	case PRU_RCVD:
-	case PRU_LISTEN:
-	case PRU_ACCEPT:
-	case PRU_SENDOOB:
-	case PRU_PEERADDR:
-		error = EOPNOTSUPP;
-		break;
-
-	default:
-		panic("div_usrreq");
-	}
-release:
-	if (m)
-		m_freem(m);
-	return (error);
-}
diff --git a/c/src/exec/libnetworking/netinet/ip_fw.c b/c/src/exec/libnetworking/netinet/ip_fw.c
deleted file mode 100644
index aeb09b0bbe..0000000000
--- a/c/src/exec/libnetworking/netinet/ip_fw.c
+++ /dev/null
@@ -1,1069 +0,0 @@
-/*
- * Copyright (c) 1996 Alex Nash
- * Copyright (c) 1993 Daniel Boulet
- * Copyright (c) 1994 Ugen J.S.Antsilevich
- *
- * Redistribution and use in source forms, with and without modification,
- * are permitted provided that this entire comment appears intact.
- *
- * Redistribution in binary form may occur without any restrictions.
- * Obviously, it would be nice if you gave credit where credit is due
- * but requiring it would be too onerous.
- *
- * This software is provided ``AS IS'' without any warranties of any kind.
- *
- *	$Id$
- */
-
-/*
- * Implement IP packet firewall
- */
-
-#ifndef IPFIREWALL_MODULE
-#include "opt_ipfw.h"
-#endif
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/malloc.h>
-#include <sys/mbuf.h>
-#include <sys/queue.h>
-#include <sys/kernel.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <sys/sysctl.h>
-#include <net/if.h>
-#include <net/route.h>
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/ip_var.h>
-#include <netinet/ip_icmp.h>
-#include <netinet/ip_fw.h>
-#include <netinet/tcp.h>
-#include <netinet/tcp_timer.h>
-#include <netinet/tcp_var.h>
-#include <netinet/tcpip.h>
-#include <netinet/udp.h>
-
-static int fw_debug = 1;
-#ifdef IPFIREWALL_VERBOSE
-static int fw_verbose = 1;
-#else
-static int fw_verbose = 0;
-#endif
-#ifdef IPFIREWALL_VERBOSE_LIMIT
-static int fw_verbose_limit = IPFIREWALL_VERBOSE_LIMIT;
-#else
-static int fw_verbose_limit = 0;
-#endif
-
-LIST_HEAD (ip_fw_head, ip_fw_chain) ip_fw_chain;
-
-#ifdef SYSCTL_NODE
-SYSCTL_NODE(_net_inet_ip, OID_AUTO, fw, CTLFLAG_RW, 0, "Firewall");
-SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, debug, CTLFLAG_RW, &fw_debug, 0, "");
-SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, verbose, CTLFLAG_RW, &fw_verbose, 0, "");
-SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, verbose_limit, CTLFLAG_RW, &fw_verbose_limit, 0, "");
-#endif
-
-#define dprintf(a)	if (!fw_debug); else printf a
-
-#define print_ip(a)	 printf("%ld.%ld.%ld.%ld",(ntohl(a.s_addr)>>24)&0xFF,\
-				 		  (ntohl(a.s_addr)>>16)&0xFF,\
-						  (ntohl(a.s_addr)>>8)&0xFF,\
-						  (ntohl(a.s_addr))&0xFF);
-
-#define dprint_ip(a)	if (!fw_debug); else print_ip(a)
-
-static int	add_entry __P((struct ip_fw_head *chainptr, struct ip_fw *frwl));
-static int	del_entry __P((struct ip_fw_head *chainptr, u_short number));
-static int	zero_entry __P((struct mbuf *m));
-static struct ip_fw *check_ipfw_struct __P((struct ip_fw *m));
-static struct ip_fw *check_ipfw_mbuf __P((struct mbuf *fw));
-static int	ipopts_match __P((struct ip *ip, struct ip_fw *f));
-static int	port_match __P((u_short *portptr, int nports, u_short port,
-				int range_flag));
-static int	tcpflg_match __P((struct tcphdr *tcp, struct ip_fw *f));
-static int	icmptype_match __P((struct icmp *  icmp, struct ip_fw * f));
-static void	ipfw_report __P((struct ip_fw *f, struct ip *ip,
-				struct ifnet *rif, struct ifnet *oif));
-
-#ifdef IPFIREWALL_MODULE
-static ip_fw_chk_t *old_chk_ptr;
-static ip_fw_ctl_t *old_ctl_ptr;
-#endif
-
-static int	ip_fw_chk __P((struct ip **pip, int hlen,
-			struct ifnet *oif, int ignport, struct mbuf **m));
-static int	ip_fw_ctl __P((int stage, struct mbuf **mm));
-
-static char err_prefix[] = "ip_fw_ctl:";
-
-/*
- * Returns 1 if the port is matched by the vector, 0 otherwise
- */
-static inline int 
-port_match(u_short *portptr, int nports, u_short port, int range_flag)
-{
-	if (!nports)
-		return 1;
-	if (range_flag) {
-		if (portptr[0] <= port && port <= portptr[1]) {
-			return 1;
-		}
-		nports -= 2;
-		portptr += 2;
-	}
-	while (nports-- > 0) {
-		if (*portptr++ == port) {
-			return 1;
-		}
-	}
-	return 0;
-}
-
-static int
-tcpflg_match(struct tcphdr *tcp, struct ip_fw *f)
-{
-	u_char		flg_set, flg_clr;
-	
-	if ((f->fw_tcpf & IP_FW_TCPF_ESTAB) &&
-	    (tcp->th_flags & (IP_FW_TCPF_RST | IP_FW_TCPF_ACK)))
-		return 1;
-
-	flg_set = tcp->th_flags & f->fw_tcpf;
-	flg_clr = tcp->th_flags & f->fw_tcpnf;
-
-	if (flg_set != f->fw_tcpf)
-		return 0;
-	if (flg_clr)
-		return 0;
-
-	return 1;
-}
-
-static int
-icmptype_match(struct icmp *icmp, struct ip_fw *f)
-{
-	int type;
-
-	if (!(f->fw_flg & IP_FW_F_ICMPBIT))
-		return(1);
-
-	type = icmp->icmp_type;
-
-	/* check for matching type in the bitmap */
-	if (type < IP_FW_ICMPTYPES_DIM * sizeof(unsigned) * 8 &&
-		(f->fw_icmptypes[type / (sizeof(unsigned) * 8)] & 
-		(1U << (type % (8 * sizeof(unsigned))))))
-		return(1);
-
-	return(0); /* no match */
-}
-
-static int
-ipopts_match(struct ip *ip, struct ip_fw *f)
-{
-	register u_char *cp;
-	int opt, optlen, cnt;
-	u_char	opts, nopts, nopts_sve;
-
-	cp = (u_char *)(ip + 1);
-	cnt = (ip->ip_hl << 2) - sizeof (struct ip);
-	opts = f->fw_ipopt;
-	nopts = nopts_sve = f->fw_ipnopt;
-
-	for (; cnt > 0; cnt -= optlen, cp += optlen) {
-		opt = cp[IPOPT_OPTVAL];
-		if (opt == IPOPT_EOL)
-			break;
-		if (opt == IPOPT_NOP)
-			optlen = 1;
-		else {
-			optlen = cp[IPOPT_OLEN];
-			if (optlen <= 0 || optlen > cnt) {
-				return 0; /*XXX*/
-			}
-		}
-		switch (opt) {
-
-		default:
-			break;
-
-		case IPOPT_LSRR:
-			opts &= ~IP_FW_IPOPT_LSRR;
-			nopts &= ~IP_FW_IPOPT_LSRR;
-			break;
-
-		case IPOPT_SSRR:
-			opts &= ~IP_FW_IPOPT_SSRR;
-			nopts &= ~IP_FW_IPOPT_SSRR;
-			break;
-
-		case IPOPT_RR:
-			opts &= ~IP_FW_IPOPT_RR;
-			nopts &= ~IP_FW_IPOPT_RR;
-			break;
-		case IPOPT_TS:
-			opts &= ~IP_FW_IPOPT_TS;
-			nopts &= ~IP_FW_IPOPT_TS;
-			break;
-		}
-		if (opts == nopts)
-			break;
-	}
-	if (opts == 0 && nopts == nopts_sve)
-		return 1;
-	else
-		return 0;
-}
-
-static inline int
-iface_match(struct ifnet *ifp, union ip_fw_if *ifu, int byname)
-{
-	/* Check by name or by IP address */
-	if (byname) {
-		/* Check unit number (-1 is wildcard) */
-		if (ifu->fu_via_if.unit != -1
-		    && ifp->if_unit != ifu->fu_via_if.unit)
-			return(0);
-		/* Check name */
-		if (strncmp(ifp->if_name, ifu->fu_via_if.name, FW_IFNLEN))
-			return(0);
-		return(1);
-	} else if (ifu->fu_via_ip.s_addr != 0) {	/* Zero == wildcard */
-		struct ifaddr *ia;
-
-		for (ia = ifp->if_addrlist; ia; ia = ia->ifa_next) {
-			if (ia->ifa_addr == NULL)
-				continue;
-			if (ia->ifa_addr->sa_family != AF_INET)
-				continue;
-			if (ifu->fu_via_ip.s_addr != ((struct sockaddr_in *)
-			    (ia->ifa_addr))->sin_addr.s_addr)
-				continue;
-			return(1);
-		}
-		return(0);
-	}
-	return(1);
-}
-
-static void
-ipfw_report(struct ip_fw *f, struct ip *ip,
-	struct ifnet *rif, struct ifnet *oif)
-{
-	static int counter;
-	struct tcphdr *const tcp = (struct tcphdr *) ((u_long *) ip+ ip->ip_hl);
-	struct udphdr *const udp = (struct udphdr *) ((u_long *) ip+ ip->ip_hl);
-	struct icmp *const icmp = (struct icmp *) ((u_long *) ip + ip->ip_hl);
-	int count;
-
-	count = f ? f->fw_pcnt : ++counter;
-	if (fw_verbose_limit != 0 && count > fw_verbose_limit)
-		return;
-
-	/* Print command name */
-	printf("ipfw: %d ", f ? f->fw_number : -1);
-	if (!f)
-		printf("Refuse");
-	else
-		switch (f->fw_flg & IP_FW_F_COMMAND) {
-		case IP_FW_F_DENY:
-			printf("Deny");
-			break;
-		case IP_FW_F_REJECT:
-			if (f->fw_reject_code == IP_FW_REJECT_RST)
-				printf("Reset");
-			else
-				printf("Unreach");
-			break;
-		case IP_FW_F_ACCEPT:
-			printf("Accept");
-			break;
-		case IP_FW_F_COUNT:
-			printf("Count");
-			break;
-		case IP_FW_F_DIVERT:
-			printf("Divert %d", f->fw_divert_port);
-			break;
-		case IP_FW_F_TEE:
-			printf("Tee %d", f->fw_divert_port);
-			break;
-		case IP_FW_F_SKIPTO:
-			printf("SkipTo %d", f->fw_skipto_rule);
-			break;
-		default:	
-			printf("UNKNOWN");
-			break;
-		}
-	printf(" ");
-
-	switch (ip->ip_p) {
-	case IPPROTO_TCP:
-		printf("TCP ");
-		print_ip(ip->ip_src);
-		if ((ip->ip_off & IP_OFFMASK) == 0)
-			printf(":%d ", ntohs(tcp->th_sport));
-		else
-			printf(" ");
-		print_ip(ip->ip_dst);
-		if ((ip->ip_off & IP_OFFMASK) == 0)
-			printf(":%d", ntohs(tcp->th_dport));
-		break;
-	case IPPROTO_UDP:
-		printf("UDP ");
-		print_ip(ip->ip_src);
-		if ((ip->ip_off & IP_OFFMASK) == 0)
-			printf(":%d ", ntohs(udp->uh_sport));
-		else
-			printf(" ");
-		print_ip(ip->ip_dst);
-		if ((ip->ip_off & IP_OFFMASK) == 0)
-			printf(":%d", ntohs(udp->uh_dport));
-		break;
-	case IPPROTO_ICMP:
-		printf("ICMP:%u.%u ", icmp->icmp_type, icmp->icmp_code);
-		print_ip(ip->ip_src);
-		printf(" ");
-		print_ip(ip->ip_dst);
-		break;
-	default:
-		printf("P:%d ", ip->ip_p);
-		print_ip(ip->ip_src);
-		printf(" ");
-		print_ip(ip->ip_dst);
-		break;
-	}
-	if (oif)
-		printf(" out via %s%d", oif->if_name, oif->if_unit);
-	else if (rif)
-		printf(" in via %s%d", rif->if_name, rif->if_unit);
-	if ((ip->ip_off & IP_OFFMASK)) 
-		printf(" Fragment = %d",ip->ip_off & IP_OFFMASK);
-	printf("\n");
-	if (fw_verbose_limit != 0 && count == fw_verbose_limit)
-		printf("ipfw: limit reached on rule #%d\n",
-		f ? f->fw_number : -1);
-}
-
-/*
- * Parameters:
- *
- *	ip	Pointer to packet header (struct ip *)
- *	hlen	Packet header length
- *	oif	Outgoing interface, or NULL if packet is incoming
- *	ignport	Ignore all divert/tee rules to this port (if non-zero)
- *	*m	The packet; we set to NULL when/if we nuke it.
- *
- * Return value:
- *
- *	0	The packet is to be accepted and routed normally OR
- *      	the packet was denied/rejected and has been dropped;
- *		in the latter case, *m is equal to NULL upon return.
- *	port	Divert the packet to port.
- */
-
-static int 
-ip_fw_chk(struct ip **pip, int hlen,
-	struct ifnet *oif, int ignport, struct mbuf **m)
-{
-	struct ip_fw_chain *chain;
-	struct ip_fw *rule = NULL;
-	struct ip *ip = *pip;
-	struct ifnet *const rif = (*m)->m_pkthdr.rcvif;
-	u_short offset = (ip->ip_off & IP_OFFMASK);
-	u_short src_port, dst_port;
-
-	/*
-	 * Go down the chain, looking for enlightment
-	 */
-	for (chain=ip_fw_chain.lh_first; chain; chain = chain->chain.le_next) {
-		register struct ip_fw *const f = chain->rule;
-
-		/* Check direction inbound */
-		if (!oif && !(f->fw_flg & IP_FW_F_IN))
-			continue;
-
-		/* Check direction outbound */
-		if (oif && !(f->fw_flg & IP_FW_F_OUT))
-			continue;
-
-		/* Fragments */
-		if ((f->fw_flg & IP_FW_F_FRAG) && !(ip->ip_off & IP_OFFMASK))
-			continue;
-
-		/* If src-addr doesn't match, not this rule. */
-		if (((f->fw_flg & IP_FW_F_INVSRC) != 0) ^ ((ip->ip_src.s_addr
-		    & f->fw_smsk.s_addr) != f->fw_src.s_addr))
-			continue;
-
-		/* If dest-addr doesn't match, not this rule. */
-		if (((f->fw_flg & IP_FW_F_INVDST) != 0) ^ ((ip->ip_dst.s_addr
-		    & f->fw_dmsk.s_addr) != f->fw_dst.s_addr))
-			continue;
-
-		/* Interface check */
-		if ((f->fw_flg & IF_FW_F_VIAHACK) == IF_FW_F_VIAHACK) {
-			struct ifnet *const iface = oif ? oif : rif;
-
-			/* Backwards compatibility hack for "via" */
-			if (!iface || !iface_match(iface,
-			    &f->fw_in_if, f->fw_flg & IP_FW_F_OIFNAME))
-				continue;
-		} else {
-			/* Check receive interface */
-			if ((f->fw_flg & IP_FW_F_IIFACE)
-			    && (!rif || !iface_match(rif,
-			      &f->fw_in_if, f->fw_flg & IP_FW_F_IIFNAME)))
-				continue;
-			/* Check outgoing interface */
-			if ((f->fw_flg & IP_FW_F_OIFACE)
-			    && (!oif || !iface_match(oif,
-			      &f->fw_out_if, f->fw_flg & IP_FW_F_OIFNAME)))
-				continue;
-		}
-
-		/* Check IP options */
-		if (f->fw_ipopt != f->fw_ipnopt && !ipopts_match(ip, f))
-			continue;
-
-		/* Check protocol; if wildcard, match */
-		if (f->fw_prot == IPPROTO_IP)
-			goto got_match;
-
-		/* If different, don't match */
-		if (ip->ip_p != f->fw_prot) 
-			continue;
-
-#define PULLUP_TO(len)	do {						\
-			    if ((*m)->m_len < (len)			\
-				&& (*m = m_pullup(*m, (len))) == 0) {	\
-				    goto bogusfrag;			\
-			    }						\
-			    *pip = ip = mtod(*m, struct ip *);		\
-			    offset = (ip->ip_off & IP_OFFMASK);		\
-			} while (0)
-
-		/* Protocol specific checks */
-		switch (ip->ip_p) {
-		case IPPROTO_TCP:
-		    {
-			struct tcphdr *tcp;
-
-			if (offset == 1)	/* cf. RFC 1858 */
-				goto bogusfrag;
-			if (offset != 0) {
-				/*
-				 * TCP flags and ports aren't available in this
-				 * packet -- if this rule specified either one,
-				 * we consider the rule a non-match.
-				 */
-				if (f->fw_nports != 0 ||
-				    f->fw_tcpf != f->fw_tcpnf)
-					continue;
-
-				break;
-			}
-			PULLUP_TO(hlen + 14);
-			tcp = (struct tcphdr *) ((u_long *)ip + ip->ip_hl);
-			if (f->fw_tcpf != f->fw_tcpnf && !tcpflg_match(tcp, f))
-				continue;
-			src_port = ntohs(tcp->th_sport);
-			dst_port = ntohs(tcp->th_dport);
-			goto check_ports;
-		    }
-
-		case IPPROTO_UDP:
-		    {
-			struct udphdr *udp;
-
-			if (offset != 0) {
-				/*
-				 * Port specification is unavailable -- if this
-				 * rule specifies a port, we consider the rule
-				 * a non-match.
-				 */
-				if (f->fw_nports != 0)
-					continue;
-
-				break;
-			}
-			PULLUP_TO(hlen + 4);
-			udp = (struct udphdr *) ((u_long *)ip + ip->ip_hl);
-			src_port = ntohs(udp->uh_sport);
-			dst_port = ntohs(udp->uh_dport);
-check_ports:
-			if (!port_match(&f->fw_pts[0],
-			    IP_FW_GETNSRCP(f), src_port,
-			    f->fw_flg & IP_FW_F_SRNG))
-				continue;
-			if (!port_match(&f->fw_pts[IP_FW_GETNSRCP(f)],
-			    IP_FW_GETNDSTP(f), dst_port,
-			    f->fw_flg & IP_FW_F_DRNG)) 
-				continue;
-			break;
-		    }
-
-		case IPPROTO_ICMP:
-		    {
-			struct icmp *icmp;
-
-			if (offset != 0)	/* Type isn't valid */
-				break;
-			PULLUP_TO(hlen + 2);
-			icmp = (struct icmp *) ((u_long *)ip + ip->ip_hl);
-			if (!icmptype_match(icmp, f))
-				continue;
-			break;
-		    }
-#undef PULLUP_TO
-
-bogusfrag:
-			if (fw_verbose)
-				ipfw_report(NULL, ip, rif, oif);
-			goto dropit;
-		}
-
-got_match:
-		/* Ignore divert/tee rule if socket port is "ignport" */
-		switch (f->fw_flg & IP_FW_F_COMMAND) {
-		case IP_FW_F_DIVERT:
-		case IP_FW_F_TEE:
-			if (f->fw_divert_port == ignport)
-				continue;       /* ignore this rule */
-			break;
-		}
-
-		/* Update statistics */
-		f->fw_pcnt += 1;
-		f->fw_bcnt += ip->ip_len;
-		f->timestamp = rtems_bsdnet_seconds_since_boot();
-
-		/* Log to console if desired */
-		if ((f->fw_flg & IP_FW_F_PRN) && fw_verbose)
-			ipfw_report(f, ip, rif, oif);
-
-		/* Take appropriate action */
-		switch (f->fw_flg & IP_FW_F_COMMAND) {
-		case IP_FW_F_ACCEPT:
-			return(0);
-		case IP_FW_F_COUNT:
-			continue;
-		case IP_FW_F_DIVERT:
-			return(f->fw_divert_port);
-		case IP_FW_F_TEE:
-			/*
-			 * XXX someday tee packet here, but beware that you
-			 * can't use m_copym() or m_copypacket() because
-			 * the divert input routine modifies the mbuf
-			 * (and these routines only increment reference
-			 * counts in the case of mbuf clusters), so need
-			 * to write custom routine.
-			 */
-			continue;
-		case IP_FW_F_SKIPTO:
-#ifdef DIAGNOSTIC
-			while (chain->chain.le_next
-			    && chain->chain.le_next->rule->fw_number
-				< f->fw_skipto_rule)
-#else
-			while (chain->chain.le_next->rule->fw_number
-			    < f->fw_skipto_rule)
-#endif
-				chain = chain->chain.le_next;
-			continue;
-		}
-
-		/* Deny/reject this packet using this rule */
-		rule = f;
-		break;
-	}
-
-#ifdef DIAGNOSTIC
-	/* Rule 65535 should always be there and should always match */
-	if (!chain)
-		panic("ip_fw: chain");
-#endif
-
-	/*
-	 * At this point, we're going to drop the packet.
-	 * Send a reject notice if all of the following are true:
-	 *
-	 * - The packet matched a reject rule
-	 * - The packet is not an ICMP packet
-	 * - The packet is not a multicast or broadcast packet
-	 */
-	if ((rule->fw_flg & IP_FW_F_COMMAND) == IP_FW_F_REJECT
-	    && ip->ip_p != IPPROTO_ICMP
-	    && !((*m)->m_flags & (M_BCAST|M_MCAST))
-	    && !IN_MULTICAST(ntohl(ip->ip_dst.s_addr))) {
-		switch (rule->fw_reject_code) {
-		case IP_FW_REJECT_RST:
-		  {
-			struct tcphdr *const tcp =
-				(struct tcphdr *) ((u_long *)ip + ip->ip_hl);
-			struct tcpiphdr ti, *const tip = (struct tcpiphdr *) ip;
-
-			if (offset != 0 || (tcp->th_flags & TH_RST))
-				break;
-			ti.ti_i = *((struct ipovly *) ip);
-			ti.ti_t = *tcp;
-			bcopy(&ti, ip, sizeof(ti));
-			NTOHL(tip->ti_seq);
-			NTOHL(tip->ti_ack);
-			tip->ti_len = ip->ip_len - hlen - (tip->ti_off << 2);
-			if (tcp->th_flags & TH_ACK) {
-				tcp_respond(NULL, tip, *m,
-				    (tcp_seq)0, ntohl(tcp->th_ack), TH_RST);
-			} else {
-				if (tcp->th_flags & TH_SYN)
-					tip->ti_len++;
-				tcp_respond(NULL, tip, *m, tip->ti_seq
-				    + tip->ti_len, (tcp_seq)0, TH_RST|TH_ACK);
-			}
-			*m = NULL;
-			break;
-		  }
-		default:	/* Send an ICMP unreachable using code */
-			icmp_error(*m, ICMP_UNREACH,
-			    rule->fw_reject_code, 0L, 0);
-			*m = NULL;
-			break;
-		}
-	}
-
-dropit:
-	/*
-	 * Finally, drop the packet.
-	 */
-	if (*m) {
-		m_freem(*m);
-		*m = NULL;
-	}
-	return(0);
-}
-
-static int
-add_entry(struct ip_fw_head *chainptr, struct ip_fw *frwl)
-{
-	struct ip_fw *ftmp = 0;
-	struct ip_fw_chain *fwc = 0, *fcp, *fcpl = 0;
-	u_short nbr = 0;
-	int s;
-
-	fwc = malloc(sizeof *fwc, M_IPFW, M_DONTWAIT);
-	ftmp = malloc(sizeof *ftmp, M_IPFW, M_DONTWAIT);
-	if (!fwc || !ftmp) {
-		dprintf(("%s malloc said no\n", err_prefix));
-		if (fwc)  free(fwc, M_IPFW);
-		if (ftmp) free(ftmp, M_IPFW);
-		return (ENOSPC);
-	}
-
-	bcopy(frwl, ftmp, sizeof(struct ip_fw));
-	ftmp->fw_in_if.fu_via_if.name[FW_IFNLEN - 1] = '\0';
-	ftmp->fw_pcnt = 0L;
-	ftmp->fw_bcnt = 0L;
-	fwc->rule = ftmp;
-	
-	s = splnet();
-
-	if (!chainptr->lh_first) {
-		LIST_INSERT_HEAD(chainptr, fwc, chain);
-		splx(s);
-		return(0);
-        } else if (ftmp->fw_number == (u_short)-1) {
-		if (fwc)  free(fwc, M_IPFW);
-		if (ftmp) free(ftmp, M_IPFW);
-		splx(s);
-		dprintf(("%s bad rule number\n", err_prefix));
-		return (EINVAL);
-        }
-
-	/* If entry number is 0, find highest numbered rule and add 100 */
-	if (ftmp->fw_number == 0) {
-		for (fcp = chainptr->lh_first; fcp; fcp = fcp->chain.le_next) {
-			if (fcp->rule->fw_number != (u_short)-1)
-				nbr = fcp->rule->fw_number;
-			else
-				break;
-		}
-		if (nbr < (u_short)-1 - 100)
-			nbr += 100;
-		ftmp->fw_number = nbr;
-	}
-
-	/* Got a valid number; now insert it, keeping the list ordered */
-	for (fcp = chainptr->lh_first; fcp; fcp = fcp->chain.le_next) {
-		if (fcp->rule->fw_number > ftmp->fw_number) {
-			if (fcpl) {
-				LIST_INSERT_AFTER(fcpl, fwc, chain);
-			} else {
-				LIST_INSERT_HEAD(chainptr, fwc, chain);
-			}
-			break;
-		} else {
-			fcpl = fcp;
-		}
-	}
-
-	splx(s);
-	return (0);
-}
-
-static int
-del_entry(struct ip_fw_head *chainptr, u_short number)
-{
-	struct ip_fw_chain *fcp;
-	int s;
-
-	s = splnet();
-
-	fcp = chainptr->lh_first; 
-	if (number != (u_short)-1) {
-		for (; fcp; fcp = fcp->chain.le_next) {
-			if (fcp->rule->fw_number == number) {
-				LIST_REMOVE(fcp, chain);
-				splx(s);
-				free(fcp->rule, M_IPFW);
-				free(fcp, M_IPFW);
-				return 0;
-			}
-		}
-	}
-
-	splx(s);
-	return (EINVAL);
-}
-
-static int
-zero_entry(struct mbuf *m)
-{
-	struct ip_fw *frwl;
-	struct ip_fw_chain *fcp;
-	int s;
-
-	if (m) {
-		if (m->m_len != sizeof(struct ip_fw))
-			return(EINVAL);
-		frwl = mtod(m, struct ip_fw *);
-	}
-	else
-		frwl = NULL;
-
-	/*
-	 *	It's possible to insert multiple chain entries with the
-	 *	same number, so we don't stop after finding the first
-	 *	match if zeroing a specific entry.
-	 */
-	s = splnet();
-	for (fcp = ip_fw_chain.lh_first; fcp; fcp = fcp->chain.le_next)
-		if (!frwl || frwl->fw_number == fcp->rule->fw_number) {
-			fcp->rule->fw_bcnt = fcp->rule->fw_pcnt = 0;
-			fcp->rule->timestamp = 0;
-		}
-	splx(s);
-
-	if (fw_verbose) {
-		if (frwl)
-			printf("ipfw: Entry %d cleared.\n", frwl->fw_number);
-		else
-			printf("ipfw: Accounting cleared.\n");
-	}
-
-	return(0);
-}
-
-static struct ip_fw *
-check_ipfw_mbuf(struct mbuf *m)
-{
-	/* Check length */
-	if (m->m_len != sizeof(struct ip_fw)) {
-		dprintf(("%s len=%d, want %d\n", err_prefix, m->m_len,
-		    (int)sizeof(struct ip_fw)));
-		return (NULL);
-	}
-	return(check_ipfw_struct(mtod(m, struct ip_fw *)));
-}
-
-static struct ip_fw *
-check_ipfw_struct(struct ip_fw *frwl)
-{
-	/* Check for invalid flag bits */
-	if ((frwl->fw_flg & ~IP_FW_F_MASK) != 0) {
-		dprintf(("%s undefined flag bits set (flags=%x)\n",
-		    err_prefix, frwl->fw_flg));
-		return (NULL);
-	}
-	/* Must apply to incoming or outgoing (or both) */
-	if (!(frwl->fw_flg & (IP_FW_F_IN | IP_FW_F_OUT))) {
-		dprintf(("%s neither in nor out\n", err_prefix));
-		return (NULL);
-	}
-	/* Empty interface name is no good */
-	if (((frwl->fw_flg & IP_FW_F_IIFNAME)
-	      && !*frwl->fw_in_if.fu_via_if.name)
-	    || ((frwl->fw_flg & IP_FW_F_OIFNAME)
-	      && !*frwl->fw_out_if.fu_via_if.name)) {
-		dprintf(("%s empty interface name\n", err_prefix));
-		return (NULL);
-	}
-	/* Sanity check interface matching */
-	if ((frwl->fw_flg & IF_FW_F_VIAHACK) == IF_FW_F_VIAHACK) {
-		;		/* allow "via" backwards compatibility */
-	} else if ((frwl->fw_flg & IP_FW_F_IN)
-	    && (frwl->fw_flg & IP_FW_F_OIFACE)) {
-		dprintf(("%s outgoing interface check on incoming\n",
-		    err_prefix));
-		return (NULL);
-	}
-	/* Sanity check port ranges */
-	if ((frwl->fw_flg & IP_FW_F_SRNG) && IP_FW_GETNSRCP(frwl) < 2) {
-		dprintf(("%s src range set but n_src_p=%d\n",
-		    err_prefix, IP_FW_GETNSRCP(frwl)));
-		return (NULL);
-	}
-	if ((frwl->fw_flg & IP_FW_F_DRNG) && IP_FW_GETNDSTP(frwl) < 2) {
-		dprintf(("%s dst range set but n_dst_p=%d\n",
-		    err_prefix, IP_FW_GETNDSTP(frwl)));
-		return (NULL);
-	}
-	if (IP_FW_GETNSRCP(frwl) + IP_FW_GETNDSTP(frwl) > IP_FW_MAX_PORTS) {
-		dprintf(("%s too many ports (%d+%d)\n",
-		    err_prefix, IP_FW_GETNSRCP(frwl), IP_FW_GETNDSTP(frwl)));
-		return (NULL);
-	}
-	/*
-	 *	Protocols other than TCP/UDP don't use port range
-	 */
-	if ((frwl->fw_prot != IPPROTO_TCP) &&
-	    (frwl->fw_prot != IPPROTO_UDP) &&
-	    (IP_FW_GETNSRCP(frwl) || IP_FW_GETNDSTP(frwl))) {
-		dprintf(("%s port(s) specified for non TCP/UDP rule\n",
-		    err_prefix));
-		return(NULL);
-	}
-
-	/*
-	 *	Rather than modify the entry to make such entries work, 
-	 *	we reject this rule and require user level utilities
-	 *	to enforce whatever policy they deem appropriate.
-	 */
-	if ((frwl->fw_src.s_addr & (~frwl->fw_smsk.s_addr)) || 
-		(frwl->fw_dst.s_addr & (~frwl->fw_dmsk.s_addr))) {
-		dprintf(("%s rule never matches\n", err_prefix));
-		return(NULL);
-	}
-
-	if ((frwl->fw_flg & IP_FW_F_FRAG) &&
-		(frwl->fw_prot == IPPROTO_UDP || frwl->fw_prot == IPPROTO_TCP)) {
-		if (frwl->fw_nports) {
-			dprintf(("%s cannot mix 'frag' and ports\n", err_prefix));
-			return(NULL);
-		}
-		if (frwl->fw_prot == IPPROTO_TCP &&
-			frwl->fw_tcpf != frwl->fw_tcpnf) {
-			dprintf(("%s cannot mix 'frag' with TCP flags\n", err_prefix));
-			return(NULL);
-		}
-	}
-
-	/* Check command specific stuff */
-	switch (frwl->fw_flg & IP_FW_F_COMMAND)
-	{
-	case IP_FW_F_REJECT:
-		if (frwl->fw_reject_code >= 0x100
-		    && !(frwl->fw_prot == IPPROTO_TCP
-		      && frwl->fw_reject_code == IP_FW_REJECT_RST)) {
-			dprintf(("%s unknown reject code\n", err_prefix));
-			return(NULL);
-		}
-		break;
-	case IP_FW_F_DIVERT:		/* Diverting to port zero is invalid */
-	case IP_FW_F_TEE:
-		if (frwl->fw_divert_port == 0) {
-			dprintf(("%s can't divert to port 0\n", err_prefix));
-			return (NULL);
-		}
-		break;
-	case IP_FW_F_DENY:
-	case IP_FW_F_ACCEPT:
-	case IP_FW_F_COUNT:
-	case IP_FW_F_SKIPTO:
-		break;
-	default:
-		dprintf(("%s invalid command\n", err_prefix));
-		return(NULL);
-	}
-
-	return frwl;
-}
-
-static int
-ip_fw_ctl(int stage, struct mbuf **mm)
-{
-	int error;
-	struct mbuf *m;
-
-	if (stage == IP_FW_GET) {
-		struct ip_fw_chain *fcp = ip_fw_chain.lh_first;
-		*mm = m = m_get(M_WAIT, MT_SOOPTS);
-		for (; fcp; fcp = fcp->chain.le_next) {
-			memcpy(m->m_data, fcp->rule, sizeof *(fcp->rule));
-			m->m_len = sizeof *(fcp->rule);
-			m->m_next = m_get(M_WAIT, MT_SOOPTS);
-			m = m->m_next;
-			m->m_len = 0;
-		}
-		return (0);
-	}
-	m = *mm;
-	/* only allow get calls if secure mode > 2 */
-	if (securelevel > 2) {
-		if (m) (void)m_free(m);
-		return(EPERM);
-	}
-	if (stage == IP_FW_FLUSH) {
-		while (ip_fw_chain.lh_first != NULL && 
-		    ip_fw_chain.lh_first->rule->fw_number != (u_short)-1) {
-			struct ip_fw_chain *fcp = ip_fw_chain.lh_first;
-			int s = splnet();
-			LIST_REMOVE(ip_fw_chain.lh_first, chain);
-			splx(s);
-			free(fcp->rule, M_IPFW);
-			free(fcp, M_IPFW);
-		}
-		if (m) (void)m_free(m);
-		return (0);
-	}
-	if (stage == IP_FW_ZERO) {
-		error = zero_entry(m);
-		if (m) (void)m_free(m);
-		return (error);
-	}
-	if (m == NULL) {
-		printf("%s NULL mbuf ptr\n", err_prefix);
-		return (EINVAL);
-	}
-
-	if (stage == IP_FW_ADD) {
-		struct ip_fw *frwl = check_ipfw_mbuf(m);
-
-		if (!frwl)
-			error = EINVAL;
-		else
-			error = add_entry(&ip_fw_chain, frwl);
-		if (m) (void)m_free(m);
-		return error;
-	}
-	if (stage == IP_FW_DEL) {
-		if (m->m_len != sizeof(struct ip_fw)) {
-			dprintf(("%s len=%d, want %d\n", err_prefix, m->m_len,
-			    (int)sizeof(struct ip_fw)));
-			error = EINVAL;
-		} else if (mtod(m, struct ip_fw *)->fw_number == (u_short)-1) {
-			dprintf(("%s can't delete rule 65535\n", err_prefix));
-			error = EINVAL;
-		} else
-			error = del_entry(&ip_fw_chain,
-			    mtod(m, struct ip_fw *)->fw_number);
-		if (m) (void)m_free(m);
-		return error;
-	}
-
-	dprintf(("%s unknown request %d\n", err_prefix, stage));
-	if (m) (void)m_free(m);
-	return (EINVAL);
-}
-
-void
-ip_fw_init(void)
-{
-	struct ip_fw default_rule;
-
-	ip_fw_chk_ptr = ip_fw_chk;
-	ip_fw_ctl_ptr = ip_fw_ctl;
-	LIST_INIT(&ip_fw_chain);
-
-	bzero(&default_rule, sizeof default_rule);
-	default_rule.fw_prot = IPPROTO_IP;
-	default_rule.fw_number = (u_short)-1;
-#ifdef IPFIREWALL_DEFAULT_TO_ACCEPT
-	default_rule.fw_flg |= IP_FW_F_ACCEPT;
-#else
-	default_rule.fw_flg |= IP_FW_F_DENY;
-#endif
-	default_rule.fw_flg |= IP_FW_F_IN | IP_FW_F_OUT;
-	if (check_ipfw_struct(&default_rule) == NULL ||
-		add_entry(&ip_fw_chain, &default_rule))
-		panic(__FUNCTION__);
-
-	printf("IP packet filtering initialized, "
-#ifdef IPDIVERT
-		"divert enabled, ");
-#else
-		"divert disabled, ");
-#endif
-#ifdef IPFIREWALL_DEFAULT_TO_ACCEPT
-	printf("default to accept, ");
-#endif
-#ifndef IPFIREWALL_VERBOSE
-	printf("logging disabled\n");
-#else
-	if (fw_verbose_limit == 0)
-		printf("unlimited logging\n");
-	else
-		printf("logging limited to %d packets/entry\n",
-		    fw_verbose_limit);
-#endif
-}
-
-#ifdef IPFIREWALL_MODULE
-
-#include <sys/exec.h>
-#include <sys/sysent.h>
-#include <sys/lkm.h>
-
-MOD_MISC(ipfw);
-
-static int
-ipfw_load(struct lkm_table *lkmtp, int cmd)
-{
-	int s=splnet();
-
-	old_chk_ptr = ip_fw_chk_ptr;
-	old_ctl_ptr = ip_fw_ctl_ptr;
-
-	ip_fw_init();
-	splx(s);
-	return 0;
-}
-
-static int
-ipfw_unload(struct lkm_table *lkmtp, int cmd)
-{
-	int s=splnet();
-
-	ip_fw_chk_ptr =  old_chk_ptr;
-	ip_fw_ctl_ptr =  old_ctl_ptr;
-
-	while (ip_fw_chain.lh_first != NULL) {
-		struct ip_fw_chain *fcp = ip_fw_chain.lh_first;
-		LIST_REMOVE(ip_fw_chain.lh_first, chain);
-		free(fcp->rule, M_IPFW);
-		free(fcp, M_IPFW);
-	}
-	
-	splx(s);
-	printf("IP firewall unloaded\n");
-	return 0;
-}
-
-int
-ipfw_mod(struct lkm_table *lkmtp, int cmd, int ver)
-{
-	DISPATCH(lkmtp, cmd, ver, ipfw_load, ipfw_unload, lkm_nullcmd);
-}
-#endif
diff --git a/c/src/exec/libnetworking/netinet/ip_fw.h b/c/src/exec/libnetworking/netinet/ip_fw.h
deleted file mode 100644
index cab7f4ac93..0000000000
--- a/c/src/exec/libnetworking/netinet/ip_fw.h
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * Copyright (c) 1993 Daniel Boulet
- * Copyright (c) 1994 Ugen J.S.Antsilevich
- *
- * Redistribution and use in source forms, with and without modification,
- * are permitted provided that this entire comment appears intact.
- *
- * Redistribution in binary form may occur without any restrictions.
- * Obviously, it would be nice if you gave credit where credit is due
- * but requiring it would be too onerous.
- *
- * This software is provided ``AS IS'' without any warranties of any kind.
- *
- *	$Id$
- */
-
-#ifndef _IP_FW_H
-#define _IP_FW_H
-
-#include <net/if.h>
-
-/*
- * This union structure identifies an interface, either explicitly
- * by name or implicitly by IP address. The flags IP_FW_F_IIFNAME
- * and IP_FW_F_OIFNAME say how to interpret this structure. An
- * interface unit number of -1 matches any unit number, while an
- * IP address of 0.0.0.0 indicates matches any interface.
- *
- * The receive and transmit interfaces are only compared against the
- * the packet if the corresponding bit (IP_FW_F_IIFACE or IP_FW_F_OIFACE)
- * is set. Note some packets lack a receive or transmit interface
- * (in which case the missing "interface" never matches).
- */
-
-union ip_fw_if {
-    struct in_addr fu_via_ip;	/* Specified by IP address */
-    struct {			/* Specified by interface name */
-#define FW_IFNLEN     IFNAMSIZ
-	    char  name[FW_IFNLEN];
-	    short unit;		/* -1 means match any unit */
-    } fu_via_if;
-};
-
-/*
- * Format of an IP firewall descriptor
- *
- * fw_src, fw_dst, fw_smsk, fw_dmsk are always stored in network byte order.
- * fw_flg and fw_n*p are stored in host byte order (of course).
- * Port numbers are stored in HOST byte order.
- * Warning: setsockopt() will fail if sizeof(struct ip_fw) > MLEN (108)
- */
-
-struct ip_fw {
-    u_long fw_pcnt,fw_bcnt;		/* Packet and byte counters */
-    struct in_addr fw_src, fw_dst;	/* Source and destination IP addr */
-    struct in_addr fw_smsk, fw_dmsk;	/* Mask for src and dest IP addr */
-    u_short fw_number;			/* Rule number */
-    u_short fw_flg;			/* Flags word */
-#define IP_FW_MAX_PORTS	10		/* A reasonable maximum */
-    u_short fw_pts[IP_FW_MAX_PORTS];	/* Array of port numbers to match */
-    u_char fw_ipopt,fw_ipnopt;		/* IP options set/unset */
-    u_char fw_tcpf,fw_tcpnf;		/* TCP flags set/unset */
-#define IP_FW_ICMPTYPES_DIM (32 / (sizeof(unsigned) * 8))
-    unsigned fw_icmptypes[IP_FW_ICMPTYPES_DIM]; /* ICMP types bitmap */
-    long timestamp;			/* timestamp (tv_sec) of last match */
-    union ip_fw_if fw_in_if, fw_out_if;	/* Incoming and outgoing interfaces */
-    union {
-	u_short fu_divert_port;		/* Divert/tee port (options IPDIVERT) */
-	u_short fu_skipto_rule;		/* SKIPTO command rule number */
-	u_short fu_reject_code;		/* REJECT response code */
-    } fw_un;
-    u_char fw_prot;			/* IP protocol */
-    u_char fw_nports;			/* N'of src ports and # of dst ports */
-					/* in ports array (dst ports follow */
-					/* src ports; max of 10 ports in all; */
-					/* count of 0 means match all ports) */
-};
-
-#define IP_FW_GETNSRCP(rule)		((rule)->fw_nports & 0x0f)
-#define IP_FW_SETNSRCP(rule, n)		do {				\
-					  (rule)->fw_nports &= ~0x0f;	\
-					  (rule)->fw_nports |= (n);	\
-					} while (0)
-#define IP_FW_GETNDSTP(rule)		((rule)->fw_nports >> 4)
-#define IP_FW_SETNDSTP(rule, n)		do {				\
-					  (rule)->fw_nports &= ~0xf0;	\
-					  (rule)->fw_nports |= (n) << 4;\
-					} while (0)
-
-#define fw_divert_port	fw_un.fu_divert_port
-#define fw_skipto_rule	fw_un.fu_skipto_rule
-#define fw_reject_code	fw_un.fu_reject_code
-
-struct ip_fw_chain {
-        LIST_ENTRY(ip_fw_chain) chain;
-        struct ip_fw    *rule;
-};
-
-/*
- * Values for "flags" field .
- */
-#define IP_FW_F_IN	0x0001	/* Check inbound packets		*/
-#define IP_FW_F_OUT	0x0002	/* Check outbound packets		*/
-#define IP_FW_F_IIFACE	0x0004	/* Apply inbound interface test		*/
-#define IP_FW_F_OIFACE	0x0008	/* Apply outbound interface test	*/
-
-#define IP_FW_F_COMMAND 0x0070	/* Mask for type of chain entry:	*/
-#define IP_FW_F_DENY	0x0000	/* This is a deny rule			*/
-#define IP_FW_F_REJECT	0x0010	/* Deny and send a response packet	*/
-#define IP_FW_F_ACCEPT	0x0020	/* This is an accept rule		*/
-#define IP_FW_F_COUNT	0x0030	/* This is a count rule			*/
-#define IP_FW_F_DIVERT	0x0040	/* This is a divert rule		*/
-#define IP_FW_F_TEE	0x0050	/* This is a tee rule			*/
-#define IP_FW_F_SKIPTO	0x0060	/* This is a skipto rule		*/
-
-#define IP_FW_F_PRN	0x0080	/* Print if this rule matches		*/
-
-#define IP_FW_F_SRNG	0x0100	/* The first two src ports are a min	*
-				 * and max range (stored in host byte	*
-				 * order).				*/
-
-#define IP_FW_F_DRNG	0x0200	/* The first two dst ports are a min	*
-				 * and max range (stored in host byte	*
-				 * order).				*/
-
-#define IP_FW_F_IIFNAME	0x0400	/* In interface by name/unit (not IP)	*/
-#define IP_FW_F_OIFNAME	0x0800	/* Out interface by name/unit (not IP)	*/
-
-#define IP_FW_F_INVSRC	0x1000	/* Invert sense of src check		*/
-#define IP_FW_F_INVDST	0x2000	/* Invert sense of dst check		*/
-
-#define IP_FW_F_FRAG	0x4000	/* Fragment				*/
-
-#define IP_FW_F_ICMPBIT 0x8000	/* ICMP type bitmap is valid		*/
-
-#define IP_FW_F_MASK	0xFFFF	/* All possible flag bits mask		*/
-
-/*
- * For backwards compatibility with rules specifying "via iface" but
- * not restricted to only "in" or "out" packets, we define this combination
- * of bits to represent this configuration.
- */
-
-#define IF_FW_F_VIAHACK	(IP_FW_F_IN|IP_FW_F_OUT|IP_FW_F_IIFACE|IP_FW_F_OIFACE)
-
-/*
- * Definitions for REJECT response codes.
- * Values less than 256 correspond to ICMP unreachable codes.
- */
-#define IP_FW_REJECT_RST	0x0100		/* TCP packets: send RST */
-
-/*
- * Definitions for IP option names.
- */
-#define IP_FW_IPOPT_LSRR	0x01
-#define IP_FW_IPOPT_SSRR	0x02
-#define IP_FW_IPOPT_RR		0x04
-#define IP_FW_IPOPT_TS		0x08
-
-/*
- * Definitions for TCP flags.
- */
-#define IP_FW_TCPF_FIN		TH_FIN
-#define IP_FW_TCPF_SYN		TH_SYN
-#define IP_FW_TCPF_RST		TH_RST
-#define IP_FW_TCPF_PSH		TH_PUSH
-#define IP_FW_TCPF_ACK		TH_ACK
-#define IP_FW_TCPF_URG		TH_URG
-#define IP_FW_TCPF_ESTAB	0x40
-
-/*
- * Main firewall chains definitions and global var's definitions.
- */
-#ifdef KERNEL
-
-/*
- * Function definitions.
- */
-void ip_fw_init(void);
-
-#endif /* KERNEL */
-
-#endif /* _IP_FW_H */
diff --git a/c/src/exec/libnetworking/netinet/ip_icmp.c b/c/src/exec/libnetworking/netinet/ip_icmp.c
deleted file mode 100644
index a18dacca99..0000000000
--- a/c/src/exec/libnetworking/netinet/ip_icmp.c
+++ /dev/null
@@ -1,710 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)ip_icmp.c	8.2 (Berkeley) 1/4/94
- *	$Id$
- */
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/malloc.h>
-#include <sys/mbuf.h>
-#include <sys/protosw.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <sys/kernel.h>
-#include <sys/socket.h>
-#include <sys/sysctl.h>
-
-#include <net/if.h>
-#include <net/route.h>
-
-#define _IP_VHL
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/in_var.h>
-#include <netinet/ip.h>
-#include <netinet/ip_icmp.h>
-#include <netinet/ip_var.h>
-#include <netinet/icmp_var.h>
-
-/*
- * ICMP routines: error generation, receive packet processing, and
- * routines to turnaround packets back to the originator, and
- * host table maintenance routines.
- */
-
-       struct	icmpstat icmpstat;
-SYSCTL_STRUCT(_net_inet_icmp, ICMPCTL_STATS, stats, CTLFLAG_RD,
-	&icmpstat, icmpstat, "");
-
-static int	icmpmaskrepl = 0;
-SYSCTL_INT(_net_inet_icmp, ICMPCTL_MASKREPL, maskrepl, CTLFLAG_RW,
-	&icmpmaskrepl, 0, "");
-
-static int	icmpbmcastecho = 1;
-SYSCTL_INT(_net_inet_icmp, OID_AUTO, bmcastecho, CTLFLAG_RW, &icmpbmcastecho,
-	   0, "");
-
-#ifdef ICMPPRINTFS
-int	icmpprintfs = 0;
-#endif
-
-static void	icmp_reflect __P((struct mbuf *));
-static void	icmp_send __P((struct mbuf *, struct mbuf *));
-static int	ip_next_mtu __P((int, int));
-
-extern	struct protosw inetsw[];
-
-/*
- * Generate an error packet of type error
- * in response to bad packet ip.
- */
-void
-icmp_error(n, type, code, dest, destifp)
-	struct mbuf *n;
-	int type, code;
-	n_long dest;
-	struct ifnet *destifp;
-{
-	register struct ip *oip = mtod(n, struct ip *), *nip;
-	register unsigned oiplen = IP_VHL_HL(oip->ip_vhl) << 2;
-	register struct icmp *icp;
-	register struct mbuf *m;
-	unsigned icmplen;
-
-#ifdef ICMPPRINTFS
-	if (icmpprintfs)
-		printf("icmp_error(%p, %x, %d)\n", oip, type, code);
-#endif
-	if (type != ICMP_REDIRECT)
-		icmpstat.icps_error++;
-	/*
-	 * Don't send error if not the first fragment of message.
-	 * Don't error if the old packet protocol was ICMP
-	 * error message, only known informational types.
-	 */
-	if (oip->ip_off &~ (IP_MF|IP_DF))
-		goto freeit;
-	if (oip->ip_p == IPPROTO_ICMP && type != ICMP_REDIRECT &&
-	  n->m_len >= oiplen + ICMP_MINLEN &&
-	  !ICMP_INFOTYPE(((struct icmp *)((caddr_t)oip + oiplen))->icmp_type)) {
-		icmpstat.icps_oldicmp++;
-		goto freeit;
-	}
-	/* Don't send error in response to a multicast or broadcast packet */
-	if (n->m_flags & (M_BCAST|M_MCAST))
-		goto freeit;
-	/*
-	 * First, formulate icmp message
-	 */
-	m = m_gethdr(M_DONTWAIT, MT_HEADER);
-	if (m == NULL)
-		goto freeit;
-	icmplen = oiplen + min(8, oip->ip_len);
-	m->m_len = icmplen + ICMP_MINLEN;
-	MH_ALIGN(m, m->m_len);
-	icp = mtod(m, struct icmp *);
-	if ((u_int)type > ICMP_MAXTYPE)
-		panic("icmp_error");
-	icmpstat.icps_outhist[type]++;
-	icp->icmp_type = type;
-	if (type == ICMP_REDIRECT)
-		icp->icmp_gwaddr.s_addr = dest;
-	else {
-		icp->icmp_void = 0;
-		/*
-		 * The following assignments assume an overlay with the
-		 * zeroed icmp_void field.
-		 */
-		if (type == ICMP_PARAMPROB) {
-			icp->icmp_pptr = code;
-			code = 0;
-		} else if (type == ICMP_UNREACH &&
-			code == ICMP_UNREACH_NEEDFRAG && destifp) {
-			icp->icmp_nextmtu = htons(destifp->if_mtu);
-		}
-	}
-
-	icp->icmp_code = code;
-	bcopy((caddr_t)oip, (caddr_t)&icp->icmp_ip, icmplen);
-	nip = &icp->icmp_ip;
-	nip->ip_len = htons((u_short)(nip->ip_len + oiplen));
-
-	/*
-	 * Now, copy old ip header (without options)
-	 * in front of icmp message.
-	 */
-	if (m->m_data - sizeof(struct ip) < m->m_pktdat)
-		panic("icmp len");
-	m->m_data -= sizeof(struct ip);
-	m->m_len += sizeof(struct ip);
-	m->m_pkthdr.len = m->m_len;
-	m->m_pkthdr.rcvif = n->m_pkthdr.rcvif;
-	nip = mtod(m, struct ip *);
-	bcopy((caddr_t)oip, (caddr_t)nip, sizeof(struct ip));
-	nip->ip_len = m->m_len;
-	nip->ip_vhl = IP_VHL_BORING;
-	nip->ip_p = IPPROTO_ICMP;
-	nip->ip_tos = 0;
-	icmp_reflect(m);
-
-freeit:
-	m_freem(n);
-}
-
-static struct sockaddr_in icmpsrc = { sizeof (struct sockaddr_in), AF_INET };
-static struct sockaddr_in icmpdst = { sizeof (struct sockaddr_in), AF_INET };
-static struct sockaddr_in icmpgw = { sizeof (struct sockaddr_in), AF_INET };
-
-/*
- * Process a received ICMP message.
- */
-void
-icmp_input(m, hlen)
-	register struct mbuf *m;
-	int hlen;
-{
-	register struct icmp *icp;
-	register struct ip *ip = mtod(m, struct ip *);
-	int icmplen = ip->ip_len;
-	register int i;
-	struct in_ifaddr *ia;
-	void (*ctlfunc) __P((int, struct sockaddr *, void *));
-	int code;
-
-	/*
-	 * Locate icmp structure in mbuf, and check
-	 * that not corrupted and of at least minimum length.
-	 */
-#ifdef ICMPPRINTFS
-	if (icmpprintfs) {
-		char buf[4 * sizeof "123"];
-		strcpy(buf, inet_ntoa(ip->ip_src));
-		printf("icmp_input from %s to %s, len %d\n",
-		       buf, inet_ntoa(ip->ip_dst), icmplen);
-	}
-#endif
-	if (icmplen < ICMP_MINLEN) {
-		icmpstat.icps_tooshort++;
-		goto freeit;
-	}
-	i = hlen + min(icmplen, ICMP_ADVLENMIN);
-	if (m->m_len < i && (m = m_pullup(m, i)) == 0)  {
-		icmpstat.icps_tooshort++;
-		return;
-	}
-	ip = mtod(m, struct ip *);
-	m->m_len -= hlen;
-	m->m_data += hlen;
-	icp = mtod(m, struct icmp *);
-	if (in_cksum(m, icmplen)) {
-		icmpstat.icps_checksum++;
-		goto freeit;
-	}
-	m->m_len += hlen;
-	m->m_data -= hlen;
-
-#ifdef ICMPPRINTFS
-	if (icmpprintfs)
-		printf("icmp_input, type %d code %d\n", icp->icmp_type,
-		    icp->icmp_code);
-#endif
-
-	/*
-	 * Message type specific processing.
-	 */
-	if (icp->icmp_type > ICMP_MAXTYPE)
-		goto raw;
-	icmpstat.icps_inhist[icp->icmp_type]++;
-	code = icp->icmp_code;
-	switch (icp->icmp_type) {
-
-	case ICMP_UNREACH:
-		switch (code) {
-			case ICMP_UNREACH_NET:
-			case ICMP_UNREACH_HOST:
-			case ICMP_UNREACH_PROTOCOL:
-			case ICMP_UNREACH_PORT:
-			case ICMP_UNREACH_SRCFAIL:
-				code += PRC_UNREACH_NET;
-				break;
-
-			case ICMP_UNREACH_NEEDFRAG:
-				code = PRC_MSGSIZE;
-				break;
-
-			case ICMP_UNREACH_NET_UNKNOWN:
-			case ICMP_UNREACH_NET_PROHIB:
-			case ICMP_UNREACH_TOSNET:
-				code = PRC_UNREACH_NET;
-				break;
-
-			case ICMP_UNREACH_HOST_UNKNOWN:
-			case ICMP_UNREACH_ISOLATED:
-			case ICMP_UNREACH_HOST_PROHIB:
-			case ICMP_UNREACH_TOSHOST:
-				code = PRC_UNREACH_HOST;
-				break;
-
-			case ICMP_UNREACH_FILTER_PROHIB:
-			case ICMP_UNREACH_HOST_PRECEDENCE:
-			case ICMP_UNREACH_PRECEDENCE_CUTOFF:
-				code = PRC_UNREACH_PORT;
-				break;
-
-			default:
-				goto badcode;
-		}
-		goto deliver;
-
-	case ICMP_TIMXCEED:
-		if (code > 1)
-			goto badcode;
-		code += PRC_TIMXCEED_INTRANS;
-		goto deliver;
-
-	case ICMP_PARAMPROB:
-		if (code > 1)
-			goto badcode;
-		code = PRC_PARAMPROB;
-		goto deliver;
-
-	case ICMP_SOURCEQUENCH:
-		if (code)
-			goto badcode;
-		code = PRC_QUENCH;
-	deliver:
-		/*
-		 * Problem with datagram; advise higher level routines.
-		 */
-		if (icmplen < ICMP_ADVLENMIN || icmplen < ICMP_ADVLEN(icp) ||
-		    IP_VHL_HL(icp->icmp_ip.ip_vhl) < (sizeof(struct ip) >> 2)) {
-			icmpstat.icps_badlen++;
-			goto freeit;
-		}
-		NTOHS(icp->icmp_ip.ip_len);
-		/* Discard ICMP's in response to multicast packets */
-		if (IN_MULTICAST(ntohl(icp->icmp_ip.ip_dst.s_addr)))
-			goto badcode;
-#ifdef ICMPPRINTFS
-		if (icmpprintfs)
-			printf("deliver to protocol %d\n", icp->icmp_ip.ip_p);
-#endif
-		icmpsrc.sin_addr = icp->icmp_ip.ip_dst;
-#if 1
-		/*
-		 * MTU discovery:
-		 * If we got a needfrag and there is a host route to the
-		 * original destination, and the MTU is not locked, then
-		 * set the MTU in the route to the suggested new value
-		 * (if given) and then notify as usual.  The ULPs will
-		 * notice that the MTU has changed and adapt accordingly.
-		 * If no new MTU was suggested, then we guess a new one
-		 * less than the current value.  If the new MTU is 
-		 * unreasonably small (arbitrarily set at 296), then
-		 * we reset the MTU to the interface value and enable the
-		 * lock bit, indicating that we are no longer doing MTU
-		 * discovery.
-		 */
-		if (code == PRC_MSGSIZE) {
-			struct rtentry *rt;
-			int mtu;
-
-			rt = rtalloc1((struct sockaddr *)&icmpsrc, 0,
-				      RTF_CLONING | RTF_PRCLONING);
-			if (rt && (rt->rt_flags & RTF_HOST)
-			    && !(rt->rt_rmx.rmx_locks & RTV_MTU)) {
-				mtu = ntohs(icp->icmp_nextmtu);
-				if (!mtu)
-					mtu = ip_next_mtu(rt->rt_rmx.rmx_mtu,
-							  1);
-#ifdef DEBUG_MTUDISC
-				printf("MTU for %s reduced to %d\n",
-					inet_ntoa(icmpsrc.sin_addr), mtu);
-#endif
-				if (mtu < 296) {
-					/* rt->rt_rmx.rmx_mtu =
-						rt->rt_ifp->if_mtu; */
-					rt->rt_rmx.rmx_locks |= RTV_MTU;
-				} else if (rt->rt_rmx.rmx_mtu > mtu) {
-					rt->rt_rmx.rmx_mtu = mtu;
-				}
-			}
-			if (rt)
-				RTFREE(rt);
-		}
-
-#endif
-		ctlfunc = inetsw[ip_protox[icp->icmp_ip.ip_p]].pr_ctlinput;
-		if (ctlfunc)
-			(*ctlfunc)(code, (struct sockaddr *)&icmpsrc,
-				   (void *)&icp->icmp_ip);
-		break;
-
-	badcode:
-		icmpstat.icps_badcode++;
-		break;
-
-	case ICMP_ECHO:
-		if (!icmpbmcastecho
-		    && (m->m_flags & (M_MCAST | M_BCAST)) != 0
-		    && IN_MULTICAST(ntohl(ip->ip_dst.s_addr))) {
-			icmpstat.icps_bmcastecho++;
-			break;
-		}
-		icp->icmp_type = ICMP_ECHOREPLY;
-		goto reflect;
-
-	case ICMP_TSTAMP:
-		if (!icmpbmcastecho
-		    && (m->m_flags & (M_MCAST | M_BCAST)) != 0
-		    && IN_MULTICAST(ntohl(ip->ip_dst.s_addr))) {
-			icmpstat.icps_bmcasttstamp++;
-			break;
-		}
-		if (icmplen < ICMP_TSLEN) {
-			icmpstat.icps_badlen++;
-			break;
-		}
-		icp->icmp_type = ICMP_TSTAMPREPLY;
-		icp->icmp_rtime = iptime();
-		icp->icmp_ttime = icp->icmp_rtime;	/* bogus, do later! */
-		goto reflect;
-
-	case ICMP_MASKREQ:
-#define	satosin(sa)	((struct sockaddr_in *)(sa))
-		if (icmpmaskrepl == 0)
-			break;
-		/*
-		 * We are not able to respond with all ones broadcast
-		 * unless we receive it over a point-to-point interface.
-		 */
-		if (icmplen < ICMP_MASKLEN)
-			break;
-		switch (ip->ip_dst.s_addr) {
-
-		case INADDR_BROADCAST:
-		case INADDR_ANY:
-			icmpdst.sin_addr = ip->ip_src;
-			break;
-
-		default:
-			icmpdst.sin_addr = ip->ip_dst;
-		}
-		ia = (struct in_ifaddr *)ifaof_ifpforaddr(
-			    (struct sockaddr *)&icmpdst, m->m_pkthdr.rcvif);
-		if (ia == 0)
-			break;
-		if (ia->ia_ifp == 0)
-			break;
-		icp->icmp_type = ICMP_MASKREPLY;
-		icp->icmp_mask = ia->ia_sockmask.sin_addr.s_addr;
-		if (ip->ip_src.s_addr == 0) {
-			if (ia->ia_ifp->if_flags & IFF_BROADCAST)
-			    ip->ip_src = satosin(&ia->ia_broadaddr)->sin_addr;
-			else if (ia->ia_ifp->if_flags & IFF_POINTOPOINT)
-			    ip->ip_src = satosin(&ia->ia_dstaddr)->sin_addr;
-		}
-reflect:
-		ip->ip_len += hlen;	/* since ip_input deducts this */
-		icmpstat.icps_reflect++;
-		icmpstat.icps_outhist[icp->icmp_type]++;
-		icmp_reflect(m);
-		return;
-
-	case ICMP_REDIRECT:
-		if (code > 3)
-			goto badcode;
-		if (icmplen < ICMP_ADVLENMIN || icmplen < ICMP_ADVLEN(icp) ||
-		    IP_VHL_HL(icp->icmp_ip.ip_vhl) < (sizeof(struct ip) >> 2)) {
-			icmpstat.icps_badlen++;
-			break;
-		}
-		/*
-		 * Short circuit routing redirects to force
-		 * immediate change in the kernel's routing
-		 * tables.  The message is also handed to anyone
-		 * listening on a raw socket (e.g. the routing
-		 * daemon for use in updating its tables).
-		 */
-		icmpgw.sin_addr = ip->ip_src;
-		icmpdst.sin_addr = icp->icmp_gwaddr;
-#ifdef	ICMPPRINTFS
-		if (icmpprintfs) {
-			char buf[4 * sizeof "123"];
-			strcpy(buf, inet_ntoa(icp->icmp_ip.ip_dst));
-
-			printf("redirect dst %s to %s\n",
-			       buf, inet_ntoa(icp->icmp_gwaddr));
-		}
-#endif
-		icmpsrc.sin_addr = icp->icmp_ip.ip_dst;
-		rtredirect((struct sockaddr *)&icmpsrc,
-		  (struct sockaddr *)&icmpdst,
-		  (struct sockaddr *)0, RTF_GATEWAY | RTF_HOST,
-		  (struct sockaddr *)&icmpgw, (struct rtentry **)0);
-		pfctlinput(PRC_REDIRECT_HOST, (struct sockaddr *)&icmpsrc);
-		break;
-
-	/*
-	 * No kernel processing for the following;
-	 * just fall through to send to raw listener.
-	 */
-	case ICMP_ECHOREPLY:
-	case ICMP_ROUTERADVERT:
-	case ICMP_ROUTERSOLICIT:
-	case ICMP_TSTAMPREPLY:
-	case ICMP_IREQREPLY:
-	case ICMP_MASKREPLY:
-	default:
-		break;
-	}
-
-raw:
-	rip_input(m, hlen);
-	return;
-
-freeit:
-	m_freem(m);
-}
-
-/*
- * Reflect the ip packet back to the source
- */
-static void
-icmp_reflect(m)
-	struct mbuf *m;
-{
-	register struct ip *ip = mtod(m, struct ip *);
-	register struct in_ifaddr *ia;
-	struct in_addr t;
-	struct mbuf *opts = 0;
-	int optlen = (IP_VHL_HL(ip->ip_vhl) << 2) - sizeof(struct ip);
-
-	if (!in_canforward(ip->ip_src) &&
-	    ((ntohl(ip->ip_src.s_addr) & IN_CLASSA_NET) !=
-	     (IN_LOOPBACKNET << IN_CLASSA_NSHIFT))) {
-		m_freem(m);	/* Bad return address */
-		goto done;	/* Ip_output() will check for broadcast */
-	}
-	t = ip->ip_dst;
-	ip->ip_dst = ip->ip_src;
-	/*
-	 * If the incoming packet was addressed directly to us,
-	 * use dst as the src for the reply.  Otherwise (broadcast
-	 * or anonymous), use the address which corresponds
-	 * to the incoming interface.
-	 */
-	for (ia = in_ifaddr; ia; ia = ia->ia_next) {
-		if (t.s_addr == IA_SIN(ia)->sin_addr.s_addr)
-			break;
-		if (ia->ia_ifp && (ia->ia_ifp->if_flags & IFF_BROADCAST) &&
-		    t.s_addr == satosin(&ia->ia_broadaddr)->sin_addr.s_addr)
-			break;
-	}
-	icmpdst.sin_addr = t;
-	if ((ia == (struct in_ifaddr *)0) && m->m_pkthdr.rcvif)
-		ia = (struct in_ifaddr *)ifaof_ifpforaddr(
-			(struct sockaddr *)&icmpdst, m->m_pkthdr.rcvif);
-	/*
-	 * The following happens if the packet was not addressed to us,
-	 * and was received on an interface with no IP address.
-	 */
-	if (ia == (struct in_ifaddr *)0)
-		ia = in_ifaddr;
-	t = IA_SIN(ia)->sin_addr;
-	ip->ip_src = t;
-	ip->ip_ttl = MAXTTL;
-
-	if (optlen > 0) {
-		register u_char *cp;
-		int opt, cnt;
-		u_int len;
-
-		/*
-		 * Retrieve any source routing from the incoming packet;
-		 * add on any record-route or timestamp options.
-		 */
-		cp = (u_char *) (ip + 1);
-		if ((opts = ip_srcroute()) == 0 &&
-		    (opts = m_gethdr(M_DONTWAIT, MT_HEADER))) {
-			opts->m_len = sizeof(struct in_addr);
-			mtod(opts, struct in_addr *)->s_addr = 0;
-		}
-		if (opts) {
-#ifdef ICMPPRINTFS
-		    if (icmpprintfs)
-			    printf("icmp_reflect optlen %d rt %d => ",
-				optlen, opts->m_len);
-#endif
-		    for (cnt = optlen; cnt > 0; cnt -= len, cp += len) {
-			    opt = cp[IPOPT_OPTVAL];
-			    if (opt == IPOPT_EOL)
-				    break;
-			    if (opt == IPOPT_NOP)
-				    len = 1;
-			    else {
-				    len = cp[IPOPT_OLEN];
-				    if (len <= 0 || len > cnt)
-					    break;
-			    }
-			    /*
-			     * Should check for overflow, but it "can't happen"
-			     */
-			    if (opt == IPOPT_RR || opt == IPOPT_TS ||
-				opt == IPOPT_SECURITY) {
-				    bcopy((caddr_t)cp,
-					mtod(opts, caddr_t) + opts->m_len, len);
-				    opts->m_len += len;
-			    }
-		    }
-		    /* Terminate & pad, if necessary */
-		    cnt = opts->m_len % 4;
-		    if (cnt) {
-			    for (; cnt < 4; cnt++) {
-				    *(mtod(opts, caddr_t) + opts->m_len) =
-					IPOPT_EOL;
-				    opts->m_len++;
-			    }
-		    }
-#ifdef ICMPPRINTFS
-		    if (icmpprintfs)
-			    printf("%d\n", opts->m_len);
-#endif
-		}
-		/*
-		 * Now strip out original options by copying rest of first
-		 * mbuf's data back, and adjust the IP length.
-		 */
-		ip->ip_len -= optlen;
-		ip->ip_vhl = IP_VHL_BORING;
-		m->m_len -= optlen;
-		if (m->m_flags & M_PKTHDR)
-			m->m_pkthdr.len -= optlen;
-		optlen += sizeof(struct ip);
-		bcopy((caddr_t)ip + optlen, (caddr_t)(ip + 1),
-			 (unsigned)(m->m_len - sizeof(struct ip)));
-	}
-	m->m_flags &= ~(M_BCAST|M_MCAST);
-	icmp_send(m, opts);
-done:
-	if (opts)
-		(void)m_free(opts);
-}
-
-/*
- * Send an icmp packet back to the ip level,
- * after supplying a checksum.
- */
-static void
-icmp_send(m, opts)
-	register struct mbuf *m;
-	struct mbuf *opts;
-{
-	register struct ip *ip = mtod(m, struct ip *);
-	register int hlen;
-	register struct icmp *icp;
-	struct route ro;
-
-	hlen = IP_VHL_HL(ip->ip_vhl) << 2;
-	m->m_data += hlen;
-	m->m_len -= hlen;
-	icp = mtod(m, struct icmp *);
-	icp->icmp_cksum = 0;
-	icp->icmp_cksum = in_cksum(m, ip->ip_len - hlen);
-	m->m_data -= hlen;
-	m->m_len += hlen;
-#ifdef ICMPPRINTFS
-	if (icmpprintfs) {
-		char buf[4 * sizeof "123"];
-		strcpy(buf, inet_ntoa(ip->ip_dst));
-		printf("icmp_send dst %s src %s\n",
-		       buf, inet_ntoa(ip->ip_src));
-	}
-#endif
-	bzero(&ro, sizeof ro);
-	(void) ip_output(m, opts, &ro, 0, NULL);
-	if (ro.ro_rt)
-		RTFREE(ro.ro_rt);
-}
-
-n_time
-iptime()
-{
-	struct timeval atv;
-	u_long t;
-
-	microtime(&atv);
-	t = (atv.tv_sec % (24*60*60)) * 1000 + atv.tv_usec / 1000;
-	return (htonl(t));
-}
-
-#if 1
-/*
- * Return the next larger or smaller MTU plateau (table from RFC 1191)
- * given current value MTU.  If DIR is less than zero, a larger plateau
- * is returned; otherwise, a smaller value is returned.
- */
-static int
-ip_next_mtu(mtu, dir)
-	int mtu;
-	int dir;
-{
-	static int mtutab[] = {
-		65535, 32000, 17914, 8166, 4352, 2002, 1492, 1006, 508, 296,
-		68, 0
-	};
-	int i;
-
-	for (i = 0; i < (sizeof mtutab) / (sizeof mtutab[0]); i++) {
-		if (mtu >= mtutab[i])
-			break;
-	}
-
-	if (dir < 0) {
-		if (i == 0) {
-			return 0;
-		} else {
-			return mtutab[i - 1];
-		}
-	} else {
-		if (mtutab[i] == 0) {
-			return 0;
-		} else if(mtu > mtutab[i]) {
-			return mtutab[i];
-		} else {
-			return mtutab[i + 1];
-		}
-	}
-}
-#endif
diff --git a/c/src/exec/libnetworking/netinet/ip_icmp.h b/c/src/exec/libnetworking/netinet/ip_icmp.h
deleted file mode 100644
index 9d07a682de..0000000000
--- a/c/src/exec/libnetworking/netinet/ip_icmp.h
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)ip_icmp.h	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#ifndef _NETINET_IP_ICMP_H_
-#define _NETINET_IP_ICMP_H_
-
-/*
- * Interface Control Message Protocol Definitions.
- * Per RFC 792, September 1981.
- */
-
-/*
- * Internal of an ICMP Router Advertisement
- */
-struct icmp_ra_addr {
-	u_int32_t ira_addr;
-	u_int32_t ira_preference;
-};
-
-/*
- * Structure of an icmp header.
- */
-struct icmp {
-	u_char	icmp_type;		/* type of message, see below */
-	u_char	icmp_code;		/* type sub code */
-	u_short	icmp_cksum;		/* ones complement cksum of struct */
-	union {
-		u_char ih_pptr;			/* ICMP_PARAMPROB */
-		struct in_addr ih_gwaddr;	/* ICMP_REDIRECT */
-		struct ih_idseq {
-			n_short	icd_id;
-			n_short	icd_seq;
-		} ih_idseq;
-		int ih_void;
-
-		/* ICMP_UNREACH_NEEDFRAG -- Path MTU Discovery (RFC1191) */
-		struct ih_pmtu {
-			n_short ipm_void;
-			n_short ipm_nextmtu;
-		} ih_pmtu;
-
-		struct ih_rtradv {
-			u_char irt_num_addrs;
-			u_char irt_wpa;
-			u_int16_t irt_lifetime;
-		} ih_rtradv;
-	} icmp_hun;
-#define	icmp_pptr	icmp_hun.ih_pptr
-#define	icmp_gwaddr	icmp_hun.ih_gwaddr
-#define	icmp_id		icmp_hun.ih_idseq.icd_id
-#define	icmp_seq	icmp_hun.ih_idseq.icd_seq
-#define	icmp_void	icmp_hun.ih_void
-#define	icmp_pmvoid	icmp_hun.ih_pmtu.ipm_void
-#define	icmp_nextmtu	icmp_hun.ih_pmtu.ipm_nextmtu
-#define	icmp_num_addrs	icmp_hun.ih_rtradv.irt_num_addrs
-#define	icmp_wpa	icmp_hun.ih_rtradv.irt_wpa
-#define	icmp_lifetime	icmp_hun.ih_rtradv.irt_lifetime
-	union {
-		struct id_ts {
-			n_time its_otime;
-			n_time its_rtime;
-			n_time its_ttime;
-		} id_ts;
-		struct id_ip  {
-			struct ip idi_ip;
-			/* options and then 64 bits of data */
-		} id_ip;
-		struct icmp_ra_addr id_radv;
-		u_long	id_mask;
-		char	id_data[1];
-	} icmp_dun;
-#define	icmp_otime	icmp_dun.id_ts.its_otime
-#define	icmp_rtime	icmp_dun.id_ts.its_rtime
-#define	icmp_ttime	icmp_dun.id_ts.its_ttime
-#define	icmp_ip		icmp_dun.id_ip.idi_ip
-#define	icmp_radv	icmp_dun.id_radv
-#define	icmp_mask	icmp_dun.id_mask
-#define	icmp_data	icmp_dun.id_data
-};
-
-/*
- * Lower bounds on packet lengths for various types.
- * For the error advice packets must first insure that the
- * packet is large enough to contain the returned ip header.
- * Only then can we do the check to see if 64 bits of packet
- * data have been returned, since we need to check the returned
- * ip header length.
- */
-#define	ICMP_MINLEN	8				/* abs minimum */
-#define	ICMP_TSLEN	(8 + 3 * sizeof (n_time))	/* timestamp */
-#define	ICMP_MASKLEN	12				/* address mask */
-#define	ICMP_ADVLENMIN	(8 + sizeof (struct ip) + 8)	/* min */
-#ifndef _IP_VHL
-#define	ICMP_ADVLEN(p)	(8 + ((p)->icmp_ip.ip_hl << 2) + 8)
-	/* N.B.: must separately check that ip_hl >= 5 */
-#else
-#define	ICMP_ADVLEN(p)	(8 + (IP_VHL_HL((p)->icmp_ip.ip_vhl) << 2) + 8)
-	/* N.B.: must separately check that header length >= 5 */
-#endif
-
-/*
- * Definition of type and code field values.
- */
-#define	ICMP_ECHOREPLY		0		/* echo reply */
-#define	ICMP_UNREACH		3		/* dest unreachable, codes: */
-#define		ICMP_UNREACH_NET	0		/* bad net */
-#define		ICMP_UNREACH_HOST	1		/* bad host */
-#define		ICMP_UNREACH_PROTOCOL	2		/* bad protocol */
-#define		ICMP_UNREACH_PORT	3		/* bad port */
-#define		ICMP_UNREACH_NEEDFRAG	4		/* IP_DF caused drop */
-#define		ICMP_UNREACH_SRCFAIL	5		/* src route failed */
-#define		ICMP_UNREACH_NET_UNKNOWN 6		/* unknown net */
-#define		ICMP_UNREACH_HOST_UNKNOWN 7		/* unknown host */
-#define		ICMP_UNREACH_ISOLATED	8		/* src host isolated */
-#define		ICMP_UNREACH_NET_PROHIB	9		/* prohibited access */
-#define		ICMP_UNREACH_HOST_PROHIB 10		/* ditto */
-#define		ICMP_UNREACH_TOSNET	11		/* bad tos for net */
-#define		ICMP_UNREACH_TOSHOST	12		/* bad tos for host */
-#define		ICMP_UNREACH_FILTER_PROHIB 13		/* admin prohib */
-#define		ICMP_UNREACH_HOST_PRECEDENCE 14		/* host prec vio. */
-#define		ICMP_UNREACH_PRECEDENCE_CUTOFF 15	/* prec cutoff */
-#define	ICMP_SOURCEQUENCH	4		/* packet lost, slow down */
-#define	ICMP_REDIRECT		5		/* shorter route, codes: */
-#define		ICMP_REDIRECT_NET	0		/* for network */
-#define		ICMP_REDIRECT_HOST	1		/* for host */
-#define		ICMP_REDIRECT_TOSNET	2		/* for tos and net */
-#define		ICMP_REDIRECT_TOSHOST	3		/* for tos and host */
-#define	ICMP_ECHO		8		/* echo service */
-#define	ICMP_ROUTERADVERT	9		/* router advertisement */
-#define	ICMP_ROUTERSOLICIT	10		/* router solicitation */
-#define	ICMP_TIMXCEED		11		/* time exceeded, code: */
-#define		ICMP_TIMXCEED_INTRANS	0		/* ttl==0 in transit */
-#define		ICMP_TIMXCEED_REASS	1		/* ttl==0 in reass */
-#define	ICMP_PARAMPROB		12		/* ip header bad */
-#define		ICMP_PARAMPROB_OPTABSENT 1		/* req. opt. absent */
-#define	ICMP_TSTAMP		13		/* timestamp request */
-#define	ICMP_TSTAMPREPLY	14		/* timestamp reply */
-#define	ICMP_IREQ		15		/* information request */
-#define	ICMP_IREQREPLY		16		/* information reply */
-#define	ICMP_MASKREQ		17		/* address mask request */
-#define	ICMP_MASKREPLY		18		/* address mask reply */
-
-#define	ICMP_MAXTYPE		18
-
-#define	ICMP_INFOTYPE(type) \
-	((type) == ICMP_ECHOREPLY || (type) == ICMP_ECHO || \
-	(type) == ICMP_ROUTERADVERT || (type) == ICMP_ROUTERSOLICIT || \
-	(type) == ICMP_TSTAMP || (type) == ICMP_TSTAMPREPLY || \
-	(type) == ICMP_IREQ || (type) == ICMP_IREQREPLY || \
-	(type) == ICMP_MASKREQ || (type) == ICMP_MASKREPLY)
-
-#ifdef KERNEL
-void	icmp_error __P((struct mbuf *, int, int, n_long, struct ifnet *));
-void	icmp_input __P((struct mbuf *, int));
-#endif
-
-#endif
diff --git a/c/src/exec/libnetworking/netinet/ip_input.c b/c/src/exec/libnetworking/netinet/ip_input.c
deleted file mode 100644
index 4cc141933f..0000000000
--- a/c/src/exec/libnetworking/netinet/ip_input.c
+++ /dev/null
@@ -1,1488 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)ip_input.c	8.2 (Berkeley) 1/4/94
- * $Id$
- *	$ANA: ip_input.c,v 1.5 1996/09/18 14:34:59 wollman Exp $
- */
-
-#define	_IP_VHL
-
-#include "opt_ipfw.h"
-
-#include <stddef.h>
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/malloc.h>
-#include <sys/mbuf.h>
-#include <sys/domain.h>
-#include <sys/protosw.h>
-#include <sys/socket.h>
-#include <sys/errno.h>
-#include <sys/time.h>
-#include <sys/kernel.h>
-#include <sys/syslog.h>
-#include <sys/sysctl.h>
-
-#include <net/if.h>
-#include <net/if_dl.h>
-#include <net/route.h>
-#include <net/netisr.h>
-
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/in_var.h>
-#include <netinet/ip.h>
-#include <netinet/in_pcb.h>
-#include <netinet/in_var.h>
-#include <netinet/ip_var.h>
-#include <netinet/ip_icmp.h>
-#include <machine/in_cksum.h>
-
-#include <sys/socketvar.h>
-
-#ifdef IPFIREWALL
-#include <netinet/ip_fw.h>
-#endif
-
-int rsvp_on = 0;
-static int ip_rsvp_on;
-struct socket *ip_rsvpd;
-
-static int	ipforwarding = 0;
-SYSCTL_INT(_net_inet_ip, IPCTL_FORWARDING, forwarding, CTLFLAG_RW,
-	&ipforwarding, 0, "");
-
-static int	ipsendredirects = 1; /* XXX */
-SYSCTL_INT(_net_inet_ip, IPCTL_SENDREDIRECTS, redirect, CTLFLAG_RW,
-	&ipsendredirects, 0, "");
-
-int	ip_defttl = IPDEFTTL;
-SYSCTL_INT(_net_inet_ip, IPCTL_DEFTTL, ttl, CTLFLAG_RW,
-	&ip_defttl, 0, "");
-
-static int	ip_dosourceroute = 0;
-SYSCTL_INT(_net_inet_ip, IPCTL_SOURCEROUTE, sourceroute, CTLFLAG_RW,
-	&ip_dosourceroute, 0, "");
-
-static int	ip_acceptsourceroute = 0;
-SYSCTL_INT(_net_inet_ip, IPCTL_ACCEPTSOURCEROUTE, accept_sourceroute,
-	CTLFLAG_RW, &ip_acceptsourceroute, 0, "");
-#ifdef DIAGNOSTIC
-static int	ipprintfs = 0;
-#endif
-
-extern	struct domain inetdomain;
-extern	struct protosw inetsw[];
-u_char	ip_protox[IPPROTO_MAX];
-static int	ipqmaxlen = IFQ_MAXLEN;
-struct	in_ifaddr *in_ifaddr;			/* first inet address */
-struct	ifqueue ipintrq;
-SYSCTL_INT(_net_inet_ip, IPCTL_INTRQMAXLEN, intr_queue_maxlen, CTLFLAG_RD,
-	&ipintrq.ifq_maxlen, 0, "");
-SYSCTL_INT(_net_inet_ip, IPCTL_INTRQDROPS, intr_queue_drops, CTLFLAG_RD,
-	&ipintrq.ifq_drops, 0, "");
-
-struct ipstat ipstat;
-
-/* Packet reassembly stuff */
-#define IPREASS_NHASH_LOG2      6
-#define IPREASS_NHASH           (1 << IPREASS_NHASH_LOG2)
-#define IPREASS_HMASK           (IPREASS_NHASH - 1)
-#define IPREASS_HASH(x,y) \
-	(((((x) & 0xF) | ((((x) >> 8) & 0xF) << 4)) ^ (y)) & IPREASS_HMASK)
-
-static struct ipq ipq[IPREASS_NHASH];
-static int    nipq = 0;         /* total # of reass queues */
-static int    maxnipq;
-
-#ifdef IPCTL_DEFMTU
-SYSCTL_INT(_net_inet_ip, IPCTL_DEFMTU, mtu, CTLFLAG_RW,
-	&ip_mtu, 0, "");
-#endif
-
-#if !defined(COMPAT_IPFW) || COMPAT_IPFW == 1
-#undef COMPAT_IPFW
-#define COMPAT_IPFW 1
-#else
-#undef COMPAT_IPFW
-#endif
-
-#ifdef COMPAT_IPFW
-/* Firewall hooks */
-ip_fw_chk_t *ip_fw_chk_ptr;
-ip_fw_ctl_t *ip_fw_ctl_ptr;
-
-/* IP Network Address Translation (NAT) hooks */ 
-ip_nat_t *ip_nat_ptr;
-ip_nat_ctl_t *ip_nat_ctl_ptr;
-#endif
-
-/*
- * We need to save the IP options in case a protocol wants to respond
- * to an incoming packet over the same route if the packet got here
- * using IP source routing.  This allows connection establishment and
- * maintenance when the remote end is on a network that is not known
- * to us.
- */
-static int	ip_nhops = 0;
-static	struct ip_srcrt {
-	struct	in_addr dst;			/* final destination */
-	char	nop;				/* one NOP to align */
-	char	srcopt[IPOPT_OFFSET + 1];	/* OPTVAL, OLEN and OFFSET */
-	struct	in_addr route[MAX_IPOPTLEN/sizeof(struct in_addr)];
-} ip_srcrt;
-
-#ifdef IPDIVERT
-/*
- * Shared variable between ip_input() and ip_reass() to communicate
- * about which packets, once assembled from fragments, get diverted,
- * and to which port.
- */
-static u_short	frag_divert_port;
-#endif
-
-static void save_rte __P((u_char *, struct in_addr));
-static void	 ip_deq __P((struct ipasfrag *));
-static int	 ip_dooptions __P((struct mbuf *));
-static void	 ip_enq __P((struct ipasfrag *, struct ipasfrag *));
-static void	 ip_forward __P((struct mbuf *, int));
-static void	 ip_freef __P((struct ipq *));
-static struct ip *
-	 ip_reass __P((struct ipasfrag *, struct ipq *, struct ipq *));
-static struct in_ifaddr *
-	 ip_rtaddr __P((struct in_addr));
-void	ipintr __P((void));
-/*
- * IP initialization: fill in IP protocol switch table.
- * All protocols not implemented in kernel go to raw IP protocol handler.
- */
-void
-ip_init()
-{
-	register struct protosw *pr;
-	register int i;
-
-	pr = pffindproto(PF_INET, IPPROTO_RAW, SOCK_RAW);
-	if (pr == 0)
-		panic("ip_init");
-	for (i = 0; i < IPPROTO_MAX; i++)
-		ip_protox[i] = pr - inetsw;
-	for (pr = inetdomain.dom_protosw;
-	    pr < inetdomain.dom_protoswNPROTOSW; pr++)
-		if (pr->pr_domain->dom_family == PF_INET &&
-		    pr->pr_protocol && pr->pr_protocol != IPPROTO_RAW)
-			ip_protox[pr->pr_protocol] = pr - inetsw;
-
-	for (i = 0; i < IPREASS_NHASH; i++)
-	    ipq[i].next = ipq[i].prev = &ipq[i];
-
-	maxnipq = nmbclusters/4;
-
-	ip_id = rtems_bsdnet_seconds_since_boot() & 0xffff;
-	ipintrq.ifq_maxlen = ipqmaxlen;
-#ifdef IPFIREWALL
-	ip_fw_init();
-#endif
-#ifdef IPNAT
-        ip_nat_init(); 
-#endif
-
-}
-
-static struct	sockaddr_in ipaddr = { sizeof(ipaddr), AF_INET };
-static struct	route ipforward_rt;
-
-/*
- * Ip input routine.  Checksum and byte swap header.  If fragmented
- * try to reassemble.  Process options.  Pass to next level.
- */
-void
-ip_input(struct mbuf *m)
-{
-	struct ip *ip;
-	struct ipq *fp;
-	struct in_ifaddr *ia;
-	int    i, hlen;
-	u_short sum;
-
-#ifdef	DIAGNOSTIC
-	if ((m->m_flags & M_PKTHDR) == 0)
-		panic("ip_input no HDR");
-#endif
-	/*
-	 * If no IP addresses have been set yet but the interfaces
-	 * are receiving, can't do anything with incoming packets yet.
-	 */
-	if (in_ifaddr == NULL)
-		goto bad;
-	ipstat.ips_total++;
-
-	if (m->m_pkthdr.len < sizeof(struct ip))
-		goto tooshort;
-
-#ifdef	DIAGNOSTIC
-	if (m->m_len < sizeof(struct ip))
-		panic("ipintr mbuf too short");
-#endif
-
-	if (m->m_len < sizeof (struct ip) &&
-	    (m = m_pullup(m, sizeof (struct ip))) == 0) {
-		ipstat.ips_toosmall++;
-		return;
-	}
-	ip = mtod(m, struct ip *);
-
-	if (IP_VHL_V(ip->ip_vhl) != IPVERSION) {
-		ipstat.ips_badvers++;
-		goto bad;
-	}
-
-	hlen = IP_VHL_HL(ip->ip_vhl) << 2;
-	if (hlen < sizeof(struct ip)) {	/* minimum header length */
-		ipstat.ips_badhlen++;
-		goto bad;
-	}
-	if (hlen > m->m_len) {
-		if ((m = m_pullup(m, hlen)) == 0) {
-			ipstat.ips_badhlen++;
-			return;
-		}
-		ip = mtod(m, struct ip *);
-	}
-	if (hlen == sizeof(struct ip)) {
-		sum = in_cksum_hdr(ip);
-	} else {
-		sum = in_cksum(m, hlen);
-	}
-	if (sum) {
-		ipstat.ips_badsum++;
-		goto bad;
-	}
-
-	/*
-	 * Convert fields to host representation.
-	 */
-	NTOHS(ip->ip_len);
-	if (ip->ip_len < hlen) {
-		ipstat.ips_badlen++;
-		goto bad;
-	}
-	NTOHS(ip->ip_id);
-	NTOHS(ip->ip_off);
-
-	/*
-	 * Check that the amount of data in the buffers
-	 * is as at least much as the IP header would have us expect.
-	 * Trim mbufs if longer than we expect.
-	 * Drop packet if shorter than we expect.
-	 */
-	if (m->m_pkthdr.len < ip->ip_len) {
-tooshort:
-		ipstat.ips_tooshort++;
-		goto bad;
-	}
-	if (m->m_pkthdr.len > ip->ip_len) {
-		if (m->m_len == m->m_pkthdr.len) {
-			m->m_len = ip->ip_len;
-			m->m_pkthdr.len = ip->ip_len;
-		} else
-			m_adj(m, ip->ip_len - m->m_pkthdr.len);
-	}
-	/*
-	 * IpHack's section.
-	 * Right now when no processing on packet has done
-	 * and it is still fresh out of network we do our black
-	 * deals with it.
-	 * - Firewall: deny/allow/divert
-	 * - Xlate: translate packet's addr/port (NAT).
-	 * - Wrap: fake packet's addr/port <unimpl.>
-	 * - Encapsulate: put it in another IP and send out. <unimp.>
- 	 */
-
-#ifdef COMPAT_IPFW
-	if (ip_fw_chk_ptr) {
-#ifdef IPDIVERT
-		u_short port;
-
-		port = (*ip_fw_chk_ptr)(&ip, hlen, NULL, ip_divert_ignore, &m);
-		ip_divert_ignore = 0;
-		if (port) {			/* Divert packet */
-			frag_divert_port = port;
-			goto ours;
-		}
-#else
-		/* If ipfw says divert, we have to just drop packet */
-		if ((*ip_fw_chk_ptr)(&ip, hlen, NULL, 0, &m)) {
-			m_freem(m);
-			m = NULL;
-		}
-#endif
-		if (!m)
-			return;
-	}
-
-        if (ip_nat_ptr && !(*ip_nat_ptr)(&ip, &m, m->m_pkthdr.rcvif, IP_NAT_IN))
-		return;
-#endif
-
-	/*
-	 * Process options and, if not destined for us,
-	 * ship it on.  ip_dooptions returns 1 when an
-	 * error was detected (causing an icmp message
-	 * to be sent and the original packet to be freed).
-	 */
-	ip_nhops = 0;		/* for source routed packets */
-	if (hlen > sizeof (struct ip) && ip_dooptions(m))
-		return;
-
-        /* greedy RSVP, snatches any PATH packet of the RSVP protocol and no
-         * matter if it is destined to another node, or whether it is 
-         * a multicast one, RSVP wants it! and prevents it from being forwarded
-         * anywhere else. Also checks if the rsvp daemon is running before
-	 * grabbing the packet.
-         */
-	if (rsvp_on && ip->ip_p==IPPROTO_RSVP) 
-		goto ours;
-
-	/*
-	 * Check our list of addresses, to see if the packet is for us.
-	 */
-	for (ia = in_ifaddr; ia; ia = ia->ia_next) {
-#define	satosin(sa)	((struct sockaddr_in *)(sa))
-
-		if (IA_SIN(ia)->sin_addr.s_addr == ip->ip_dst.s_addr)
-			goto ours;
-#ifdef BOOTP_COMPAT
-		if (IA_SIN(ia)->sin_addr.s_addr == INADDR_ANY)
-			goto ours;
-#endif
-		if (ia->ia_ifp && ia->ia_ifp->if_flags & IFF_BROADCAST) {
-			if (satosin(&ia->ia_broadaddr)->sin_addr.s_addr ==
-			    ip->ip_dst.s_addr)
-				goto ours;
-			if (ip->ip_dst.s_addr == ia->ia_netbroadcast.s_addr)
-				goto ours;
-		}
-	}
-	if (IN_MULTICAST(ntohl(ip->ip_dst.s_addr))) {
-		struct in_multi *inm;
-		if (ip_mrouter) {
-			/*
-			 * If we are acting as a multicast router, all
-			 * incoming multicast packets are passed to the
-			 * kernel-level multicast forwarding function.
-			 * The packet is returned (relatively) intact; if
-			 * ip_mforward() returns a non-zero value, the packet
-			 * must be discarded, else it may be accepted below.
-			 *
-			 * (The IP ident field is put in the same byte order
-			 * as expected when ip_mforward() is called from
-			 * ip_output().)
-			 */
-			ip->ip_id = htons(ip->ip_id);
-			if (ip_mforward(ip, m->m_pkthdr.rcvif, m, 0) != 0) {
-				ipstat.ips_cantforward++;
-				m_freem(m);
-				return;
-			}
-			ip->ip_id = ntohs(ip->ip_id);
-
-			/*
-			 * The process-level routing demon needs to receive
-			 * all multicast IGMP packets, whether or not this
-			 * host belongs to their destination groups.
-			 */
-			if (ip->ip_p == IPPROTO_IGMP)
-				goto ours;
-			ipstat.ips_forward++;
-		}
-		/*
-		 * See if we belong to the destination multicast group on the
-		 * arrival interface.
-		 */
-		IN_LOOKUP_MULTI(ip->ip_dst, m->m_pkthdr.rcvif, inm);
-		if (inm == NULL) {
-			ipstat.ips_cantforward++;
-			m_freem(m);
-			return;
-		}
-		goto ours;
-	}
-	if (ip->ip_dst.s_addr == (u_long)INADDR_BROADCAST)
-		goto ours;
-	if (ip->ip_dst.s_addr == INADDR_ANY)
-		goto ours;
-
-	/*
-	 * Not for us; forward if possible and desirable.
-	 */
-	if (ipforwarding == 0) {
-		ipstat.ips_cantforward++;
-		m_freem(m);
-	} else
-		ip_forward(m, 0);
-	return;
-
-ours:
-
-	/*
-	 * If offset or IP_MF are set, must reassemble.
-	 * Otherwise, nothing need be done.
-	 * (We could look in the reassembly queue to see
-	 * if the packet was previously fragmented,
-	 * but it's not worth the time; just let them time out.)
-	 */
-	if (ip->ip_off &~ (IP_DF | IP_RF)) {
-		if (m->m_flags & M_EXT) {		/* XXX */
-			if ((m = m_pullup(m, sizeof (struct ip))) == 0) {
-				ipstat.ips_toosmall++;
-#ifdef IPDIVERT
-				frag_divert_port = 0;
-#endif
-				return;
-			}
-			ip = mtod(m, struct ip *);
-		}
-		sum = IPREASS_HASH(ip->ip_src.s_addr, ip->ip_id);
-		/*
-		 * Look for queue of fragments
-		 * of this datagram.
-		 */
-		for (fp = ipq[sum].next; fp != &ipq[sum]; fp = fp->next)
-			if (ip->ip_id == fp->ipq_id &&
-			    ip->ip_src.s_addr == fp->ipq_src.s_addr &&
-			    ip->ip_dst.s_addr == fp->ipq_dst.s_addr &&
-			    ip->ip_p == fp->ipq_p)
-				goto found;
-
-		fp = 0;
-
-		/* check if there's a place for the new queue */
-		if (nipq > maxnipq) {
-		    /*
-		     * drop something from the tail of the current queue
-		     * before proceeding further
-		     */
-		    if (ipq[sum].prev == &ipq[sum]) {   /* gak */
-			for (i = 0; i < IPREASS_NHASH; i++) {
-			    if (ipq[i].prev != &ipq[i]) {
-				ip_freef(ipq[i].prev);
-				break;
-			    }
-			}
-		    } else
-			ip_freef(ipq[sum].prev);
-		}
-found:
-		/*
-		 * Adjust ip_len to not reflect header,
-		 * set ip_mff if more fragments are expected,
-		 * convert offset of this to bytes.
-		 */
-		ip->ip_len -= hlen;
-		((struct ipasfrag *)ip)->ipf_mff &= ~1;
-		if (ip->ip_off & IP_MF)
-			((struct ipasfrag *)ip)->ipf_mff |= 1;
-		ip->ip_off <<= 3;
-
-		/*
-		 * If datagram marked as having more fragments
-		 * or if this is not the first fragment,
-		 * attempt reassembly; if it succeeds, proceed.
-		 */
-		if (((struct ipasfrag *)ip)->ipf_mff & 1 || ip->ip_off) {
-			ipstat.ips_fragments++;
-			ip = ip_reass((struct ipasfrag *)ip, fp, &ipq[sum]);
-			if (ip == 0)
-				return;
-			ipstat.ips_reassembled++;
-			m = dtom(ip);
-#ifdef IPDIVERT
-			if (frag_divert_port) {
-				ip->ip_len += hlen;
-				HTONS(ip->ip_len);
-				HTONS(ip->ip_off);
-				HTONS(ip->ip_id);
-				ip->ip_sum = 0;
-				ip->ip_sum = in_cksum_hdr(ip);
-				NTOHS(ip->ip_id);
-				NTOHS(ip->ip_off);
-				NTOHS(ip->ip_len);
-				ip->ip_len -= hlen;
-			}
-#endif
-		} else
-			if (fp)
-				ip_freef(fp);
-	} else
-		ip->ip_len -= hlen;
-
-#ifdef IPDIVERT
-	/*
-	 * Divert reassembled packets to the divert protocol if required
-	 */
-	if (frag_divert_port) {
-		ipstat.ips_delivered++;
-		ip_divert_port = frag_divert_port;
-		frag_divert_port = 0;
-		(*inetsw[ip_protox[IPPROTO_DIVERT]].pr_input)(m, hlen);
-		return;
-	}
-
-	/* Don't let packets divert themselves */
-	if (ip->ip_p == IPPROTO_DIVERT) {
-		ipstat.ips_noproto++;
-		goto bad;
-	}
-#endif
-
-	/*
-	 * Switch out to protocol's input routine.
-	 */
-	ipstat.ips_delivered++;
-	(*inetsw[ip_protox[ip->ip_p]].pr_input)(m, hlen);
-	return;
-bad:
-	m_freem(m);
-}
-
-/*
- * IP software interrupt routine - to go away sometime soon
- */
-void
-ipintr(void)
-{
-	int s;
-	struct mbuf *m;
-
-	while(1) {
-		s = splimp();
-		IF_DEQUEUE(&ipintrq, m);
-		splx(s);
-		if (m == 0)
-			return;
-		ip_input(m);
-	}
-}
-
-NETISR_SET(NETISR_IP, ipintr);
-  
-/*
- * Take incoming datagram fragment and try to
- * reassemble it into whole datagram.  If a chain for
- * reassembly of this datagram already exists, then it
- * is given as fp; otherwise have to make a chain.
- */
-static struct ip *
-ip_reass(ip, fp, where)
-	register struct ipasfrag *ip;
-	register struct ipq *fp;
-	struct   ipq    *where;
-{
-	register struct mbuf *m = dtom(ip);
-	register struct ipasfrag *q;
-	struct mbuf *t;
-	int hlen = ip->ip_hl << 2;
-	int i, next;
-
-	/*
-	 * Presence of header sizes in mbufs
-	 * would confuse code below.
-	 */
-	m->m_data += hlen;
-	m->m_len -= hlen;
-
-	/*
-	 * If first fragment to arrive, create a reassembly queue.
-	 */
-	if (fp == 0) {
-		if ((t = m_get(M_DONTWAIT, MT_FTABLE)) == NULL)
-			goto dropfrag;
-		fp = mtod(t, struct ipq *);
-		insque(fp, where);
-		nipq++;
-		fp->ipq_ttl = IPFRAGTTL;
-		fp->ipq_p = ip->ip_p;
-		fp->ipq_id = ip->ip_id;
-		fp->ipq_next = fp->ipq_prev = (struct ipasfrag *)fp;
-		fp->ipq_src = ((struct ip *)ip)->ip_src;
-		fp->ipq_dst = ((struct ip *)ip)->ip_dst;
-#ifdef IPDIVERT
-		fp->ipq_divert = 0;
-#endif
-		q = (struct ipasfrag *)fp;
-		goto insert;
-	}
-
-	/*
-	 * Find a segment which begins after this one does.
-	 */
-	for (q = fp->ipq_next; q != (struct ipasfrag *)fp; q = q->ipf_next)
-		if (q->ip_off > ip->ip_off)
-			break;
-
-	/*
-	 * If there is a preceding segment, it may provide some of
-	 * our data already.  If so, drop the data from the incoming
-	 * segment.  If it provides all of our data, drop us.
-	 */
-	if (q->ipf_prev != (struct ipasfrag *)fp) {
-		i = q->ipf_prev->ip_off + q->ipf_prev->ip_len - ip->ip_off;
-		if (i > 0) {
-			if (i >= ip->ip_len)
-				goto dropfrag;
-			m_adj(dtom(ip), i);
-			ip->ip_off += i;
-			ip->ip_len -= i;
-		}
-	}
-
-	/*
-	 * While we overlap succeeding segments trim them or,
-	 * if they are completely covered, dequeue them.
-	 */
-	while (q != (struct ipasfrag *)fp && ip->ip_off + ip->ip_len > q->ip_off) {
-		struct mbuf *m0;
-
-		i = (ip->ip_off + ip->ip_len) - q->ip_off;
-		if (i < q->ip_len) {
-			q->ip_len -= i;
-			q->ip_off += i;
-			m_adj(dtom(q), i);
-			break;
-		}
-		m0 = dtom(q);
-		q = q->ipf_next;
-		ip_deq(q->ipf_prev);
-		m_freem(m0);
-	}
-
-insert:
-
-#ifdef IPDIVERT
-	/*
-	 * Any fragment diverting causes the whole packet to divert
-	 */
-	if (frag_divert_port != 0)
-		fp->ipq_divert = frag_divert_port;
-	frag_divert_port = 0;
-#endif
-
-	/*
-	 * Stick new segment in its place;
-	 * check for complete reassembly.
-	 */
-	ip_enq(ip, q->ipf_prev);
-	next = 0;
-	for (q = fp->ipq_next; q != (struct ipasfrag *)fp; q = q->ipf_next) {
-		if (q->ip_off != next)
-			return (0);
-		next += q->ip_len;
-	}
-	if (q->ipf_prev->ipf_mff & 1)
-		return (0);
-
-	/*
-	 * Reassembly is complete.  Make sure the packet is a sane size.
-	 */
-	if (next + (IP_VHL_HL(((struct ip *)fp->ipq_next)->ip_vhl) << 2)
-							> IP_MAXPACKET) {
-		ipstat.ips_toolong++;
-		ip_freef(fp);
-		return (0);
-	}
-
-	/*
-	 * Concatenate fragments.
-	 */
-	q = fp->ipq_next;
-	m = dtom(q);
-	t = m->m_next;
-	m->m_next = 0;
-	m_cat(m, t);
-	q = q->ipf_next;
-	while (q != (struct ipasfrag *)fp) {
-		t = dtom(q);
-		q = q->ipf_next;
-		m_cat(m, t);
-	}
-
-#ifdef IPDIVERT
-	/*
-	 * Record divert port for packet, if any
-	 */
-	frag_divert_port = fp->ipq_divert;
-#endif
-
-	/*
-	 * Create header for new ip packet by
-	 * modifying header of first packet;
-	 * dequeue and discard fragment reassembly header.
-	 * Make header visible.
-	 */
-	ip = fp->ipq_next;
-	ip->ip_len = next;
-	ip->ipf_mff &= ~1;
-	((struct ip *)ip)->ip_src = fp->ipq_src;
-	((struct ip *)ip)->ip_dst = fp->ipq_dst;
-	remque(fp);
-	nipq--;
-	(void) m_free(dtom(fp));
-	m = dtom(ip);
-	m->m_len += (ip->ip_hl << 2);
-	m->m_data -= (ip->ip_hl << 2);
-	/* some debugging cruft by sklower, below, will go away soon */
-	if (m->m_flags & M_PKTHDR) { /* XXX this should be done elsewhere */
-		register int plen = 0;
-		for (t = m; m; m = m->m_next)
-			plen += m->m_len;
-		t->m_pkthdr.len = plen;
-	}
-	return ((struct ip *)ip);
-
-dropfrag:
-	ipstat.ips_fragdropped++;
-	m_freem(m);
-	return (0);
-}
-
-/*
- * Free a fragment reassembly header and all
- * associated datagrams.
- */
-static void
-ip_freef(fp)
-	struct ipq *fp;
-{
-	register struct ipasfrag *q, *p;
-
-	for (q = fp->ipq_next; q != (struct ipasfrag *)fp; q = p) {
-		p = q->ipf_next;
-		ip_deq(q);
-		m_freem(dtom(q));
-	}
-	remque(fp);
-	(void) m_free(dtom(fp));
-	nipq--;
-}
-
-/*
- * Put an ip fragment on a reassembly chain.
- * Like insque, but pointers in middle of structure.
- */
-static void
-ip_enq(p, prev)
-	register struct ipasfrag *p, *prev;
-{
-
-	p->ipf_prev = prev;
-	p->ipf_next = prev->ipf_next;
-	prev->ipf_next->ipf_prev = p;
-	prev->ipf_next = p;
-}
-
-/*
- * To ip_enq as remque is to insque.
- */
-static void
-ip_deq(p)
-	register struct ipasfrag *p;
-{
-
-	p->ipf_prev->ipf_next = p->ipf_next;
-	p->ipf_next->ipf_prev = p->ipf_prev;
-}
-
-/*
- * IP timer processing;
- * if a timer expires on a reassembly
- * queue, discard it.
- */
-void
-ip_slowtimo()
-{
-	register struct ipq *fp;
-	int s = splnet();
-	int i;
-
-	for (i = 0; i < IPREASS_NHASH; i++) {
-		fp = ipq[i].next;
-		if (fp == 0)
-			continue;
-		while (fp != &ipq[i]) {
-			--fp->ipq_ttl;
-			fp = fp->next;
-			if (fp->prev->ipq_ttl == 0) {
-				ipstat.ips_fragtimeout++;
-				ip_freef(fp->prev);
-			}
-		}
-	}
-	splx(s);
-}
-
-/*
- * Drain off all datagram fragments.
- */
-void
-ip_drain()
-{
-	int     i;
-
-	for (i = 0; i < IPREASS_NHASH; i++) {
-		while (ipq[i].next != &ipq[i]) {
-			ipstat.ips_fragdropped++;
-			ip_freef(ipq[i].next);
-		}
-	}
-	in_rtqdrain();
-}
-
-/*
- * Do option processing on a datagram,
- * possibly discarding it if bad options are encountered,
- * or forwarding it if source-routed.
- * Returns 1 if packet has been forwarded/freed,
- * 0 if the packet should be processed further.
- */
-static int
-ip_dooptions(m)
-	struct mbuf *m;
-{
-	register struct ip *ip = mtod(m, struct ip *);
-	register u_char *cp;
-	register struct ip_timestamp *ipt;
-	register struct in_ifaddr *ia;
-	int opt, optlen, cnt, off, code, type = ICMP_PARAMPROB, forward = 0;
-	struct in_addr *sin, dst;
-	n_time ntime;
-
-	dst = ip->ip_dst;
-	cp = (u_char *)(ip + 1);
-	cnt = (IP_VHL_HL(ip->ip_vhl) << 2) - sizeof (struct ip);
-	for (; cnt > 0; cnt -= optlen, cp += optlen) {
-		opt = cp[IPOPT_OPTVAL];
-		if (opt == IPOPT_EOL)
-			break;
-		if (opt == IPOPT_NOP)
-			optlen = 1;
-		else {
-			optlen = cp[IPOPT_OLEN];
-			if (optlen <= 0 || optlen > cnt) {
-				code = &cp[IPOPT_OLEN] - (u_char *)ip;
-				goto bad;
-			}
-		}
-		switch (opt) {
-
-		default:
-			break;
-
-		/*
-		 * Source routing with record.
-		 * Find interface with current destination address.
-		 * If none on this machine then drop if strictly routed,
-		 * or do nothing if loosely routed.
-		 * Record interface address and bring up next address
-		 * component.  If strictly routed make sure next
-		 * address is on directly accessible net.
-		 */
-		case IPOPT_LSRR:
-		case IPOPT_SSRR:
-			if ((off = cp[IPOPT_OFFSET]) < IPOPT_MINOFF) {
-				code = &cp[IPOPT_OFFSET] - (u_char *)ip;
-				goto bad;
-			}
-			ipaddr.sin_addr = ip->ip_dst;
-			ia = (struct in_ifaddr *)
-				ifa_ifwithaddr((struct sockaddr *)&ipaddr);
-			if (ia == 0) {
-				if (opt == IPOPT_SSRR) {
-					type = ICMP_UNREACH;
-					code = ICMP_UNREACH_SRCFAIL;
-					goto bad;
-				}
-				if (!ip_dosourceroute)
-					goto nosourcerouting;
-				/*
-				 * Loose routing, and not at next destination
-				 * yet; nothing to do except forward.
-				 */
-				break;
-			}
-			off--;			/* 0 origin */
-			if (off > optlen - sizeof(struct in_addr)) {
-				/*
-				 * End of source route.  Should be for us.
-				 */
-				if (!ip_acceptsourceroute)
-					goto nosourcerouting;
-				save_rte(cp, ip->ip_src);
-				break;
-			}
-
-			if (!ip_dosourceroute) {
-				char buf[4*sizeof "123"];
-
-nosourcerouting:
-				strcpy(buf, inet_ntoa(ip->ip_dst));
-				log(LOG_WARNING, 
-				    "attempted source route from %s to %s\n",
-				    inet_ntoa(ip->ip_src), buf);
-				type = ICMP_UNREACH;
-				code = ICMP_UNREACH_SRCFAIL;
-				goto bad;
-			}
-
-			/*
-			 * locate outgoing interface
-			 */
-			(void)memcpy(&ipaddr.sin_addr, cp + off,
-			    sizeof(ipaddr.sin_addr));
-
-			if (opt == IPOPT_SSRR) {
-#define	INA	struct in_ifaddr *
-#define	SA	struct sockaddr *
-			    if ((ia = (INA)ifa_ifwithdstaddr((SA)&ipaddr)) == 0)
-				ia = (INA)ifa_ifwithnet((SA)&ipaddr);
-			} else
-				ia = ip_rtaddr(ipaddr.sin_addr);
-			if (ia == 0) {
-				type = ICMP_UNREACH;
-				code = ICMP_UNREACH_SRCFAIL;
-				goto bad;
-			}
-			ip->ip_dst = ipaddr.sin_addr;
-			(void)memcpy(cp + off, &(IA_SIN(ia)->sin_addr),
-			    sizeof(struct in_addr));
-			cp[IPOPT_OFFSET] += sizeof(struct in_addr);
-			/*
-			 * Let ip_intr's mcast routing check handle mcast pkts
-			 */
-			forward = !IN_MULTICAST(ntohl(ip->ip_dst.s_addr));
-			break;
-
-		case IPOPT_RR:
-			if ((off = cp[IPOPT_OFFSET]) < IPOPT_MINOFF) {
-				code = &cp[IPOPT_OFFSET] - (u_char *)ip;
-				goto bad;
-			}
-			/*
-			 * If no space remains, ignore.
-			 */
-			off--;			/* 0 origin */
-			if (off > optlen - sizeof(struct in_addr))
-				break;
-			(void)memcpy(&ipaddr.sin_addr, &ip->ip_dst,
-			    sizeof(ipaddr.sin_addr));
-			/*
-			 * locate outgoing interface; if we're the destination,
-			 * use the incoming interface (should be same).
-			 */
-			if ((ia = (INA)ifa_ifwithaddr((SA)&ipaddr)) == 0 &&
-			    (ia = ip_rtaddr(ipaddr.sin_addr)) == 0) {
-				type = ICMP_UNREACH;
-				code = ICMP_UNREACH_HOST;
-				goto bad;
-			}
-			(void)memcpy(cp + off, &(IA_SIN(ia)->sin_addr),
-			    sizeof(struct in_addr));
-			cp[IPOPT_OFFSET] += sizeof(struct in_addr);
-			break;
-
-		case IPOPT_TS:
-			code = cp - (u_char *)ip;
-			ipt = (struct ip_timestamp *)cp;
-			if (ipt->ipt_len < 5)
-				goto bad;
-			if (ipt->ipt_ptr > ipt->ipt_len - sizeof (long)) {
-				if (++ipt->ipt_oflw == 0)
-					goto bad;
-				break;
-			}
-			sin = (struct in_addr *)(cp + ipt->ipt_ptr - 1);
-			switch (ipt->ipt_flg) {
-
-			case IPOPT_TS_TSONLY:
-				break;
-
-			case IPOPT_TS_TSANDADDR:
-				if (ipt->ipt_ptr + sizeof(n_time) +
-				    sizeof(struct in_addr) > ipt->ipt_len)
-					goto bad;
-				ipaddr.sin_addr = dst;
-				ia = (INA)ifaof_ifpforaddr((SA)&ipaddr,
-							    m->m_pkthdr.rcvif);
-				if (ia == 0)
-					continue;
-				(void)memcpy(sin, &IA_SIN(ia)->sin_addr,
-				    sizeof(struct in_addr));
-				ipt->ipt_ptr += sizeof(struct in_addr);
-				break;
-
-			case IPOPT_TS_PRESPEC:
-				if (ipt->ipt_ptr + sizeof(n_time) +
-				    sizeof(struct in_addr) > ipt->ipt_len)
-					goto bad;
-				(void)memcpy(&ipaddr.sin_addr, sin,
-				    sizeof(struct in_addr));
-				if (ifa_ifwithaddr((SA)&ipaddr) == 0)
-					continue;
-				ipt->ipt_ptr += sizeof(struct in_addr);
-				break;
-
-			default:
-				goto bad;
-			}
-			ntime = iptime();
-			(void)memcpy(cp + ipt->ipt_ptr - 1, &ntime,
-			    sizeof(n_time));
-			ipt->ipt_ptr += sizeof(n_time);
-		}
-	}
-	if (forward && ipforwarding) {
-		ip_forward(m, 1);
-		return (1);
-	}
-	return (0);
-bad:
-	ip->ip_len -= IP_VHL_HL(ip->ip_vhl) << 2;   /* XXX icmp_error adds in hdr length */
-	icmp_error(m, type, code, 0, 0);
-	ipstat.ips_badoptions++;
-	return (1);
-}
-
-/*
- * Given address of next destination (final or next hop),
- * return internet address info of interface to be used to get there.
- */
-static struct in_ifaddr *
-ip_rtaddr(dst)
-	 struct in_addr dst;
-{
-	register struct sockaddr_in *sin;
-
-	sin = (struct sockaddr_in *) &ipforward_rt.ro_dst;
-
-	if (ipforward_rt.ro_rt == 0 || dst.s_addr != sin->sin_addr.s_addr) {
-		if (ipforward_rt.ro_rt) {
-			RTFREE(ipforward_rt.ro_rt);
-			ipforward_rt.ro_rt = 0;
-		}
-		sin->sin_family = AF_INET;
-		sin->sin_len = sizeof(*sin);
-		sin->sin_addr = dst;
-
-		rtalloc_ign(&ipforward_rt, RTF_PRCLONING);
-	}
-	if (ipforward_rt.ro_rt == 0)
-		return ((struct in_ifaddr *)0);
-	return ((struct in_ifaddr *) ipforward_rt.ro_rt->rt_ifa);
-}
-
-/*
- * Save incoming source route for use in replies,
- * to be picked up later by ip_srcroute if the receiver is interested.
- */
-void
-save_rte(option, dst)
-	u_char *option;
-	struct in_addr dst;
-{
-	unsigned olen;
-
-	olen = option[IPOPT_OLEN];
-#ifdef DIAGNOSTIC
-	if (ipprintfs)
-		printf("save_rte: olen %d\n", olen);
-#endif
-	if (olen > sizeof(ip_srcrt) - (1 + sizeof(dst)))
-		return;
-	bcopy(option, ip_srcrt.srcopt, olen);
-	ip_nhops = (olen - IPOPT_OFFSET - 1) / sizeof(struct in_addr);
-	ip_srcrt.dst = dst;
-}
-
-/*
- * Retrieve incoming source route for use in replies,
- * in the same form used by setsockopt.
- * The first hop is placed before the options, will be removed later.
- */
-struct mbuf *
-ip_srcroute()
-{
-	register struct in_addr *p, *q;
-	register struct mbuf *m;
-
-	if (ip_nhops == 0)
-		return ((struct mbuf *)0);
-	m = m_get(M_DONTWAIT, MT_SOOPTS);
-	if (m == 0)
-		return ((struct mbuf *)0);
-
-#define OPTSIZ	(sizeof(ip_srcrt.nop) + sizeof(ip_srcrt.srcopt))
-
-	/* length is (nhops+1)*sizeof(addr) + sizeof(nop + srcrt header) */
-	m->m_len = ip_nhops * sizeof(struct in_addr) + sizeof(struct in_addr) +
-	    OPTSIZ;
-#ifdef DIAGNOSTIC
-	if (ipprintfs)
-		printf("ip_srcroute: nhops %d mlen %d", ip_nhops, m->m_len);
-#endif
-
-	/*
-	 * First save first hop for return route
-	 */
-	p = &ip_srcrt.route[ip_nhops - 1];
-	*(mtod(m, struct in_addr *)) = *p--;
-#ifdef DIAGNOSTIC
-	if (ipprintfs)
-		printf(" hops %lx", ntohl(mtod(m, struct in_addr *)->s_addr));
-#endif
-
-	/*
-	 * Copy option fields and padding (nop) to mbuf.
-	 */
-	ip_srcrt.nop = IPOPT_NOP;
-	ip_srcrt.srcopt[IPOPT_OFFSET] = IPOPT_MINOFF;
-	(void)memcpy(mtod(m, caddr_t) + sizeof(struct in_addr),
-	    &ip_srcrt.nop, OPTSIZ);
-	q = (struct in_addr *)(mtod(m, caddr_t) +
-	    sizeof(struct in_addr) + OPTSIZ);
-#undef OPTSIZ
-	/*
-	 * Record return path as an IP source route,
-	 * reversing the path (pointers are now aligned).
-	 */
-	while (p >= ip_srcrt.route) {
-#ifdef DIAGNOSTIC
-		if (ipprintfs)
-			printf(" %lx", ntohl(q->s_addr));
-#endif
-		*q++ = *p--;
-	}
-	/*
-	 * Last hop goes to final destination.
-	 */
-	*q = ip_srcrt.dst;
-#ifdef DIAGNOSTIC
-	if (ipprintfs)
-		printf(" %lx\n", ntohl(q->s_addr));
-#endif
-	return (m);
-}
-
-/*
- * Strip out IP options, at higher
- * level protocol in the kernel.
- * Second argument is buffer to which options
- * will be moved, and return value is their length.
- * XXX should be deleted; last arg currently ignored.
- */
-void
-ip_stripoptions(m, mopt)
-	register struct mbuf *m;
-	struct mbuf *mopt;
-{
-	register int i;
-	struct ip *ip = mtod(m, struct ip *);
-	register caddr_t opts;
-	int olen;
-
-	olen = (IP_VHL_HL(ip->ip_vhl) << 2) - sizeof (struct ip);
-	opts = (caddr_t)(ip + 1);
-	i = m->m_len - (sizeof (struct ip) + olen);
-	bcopy(opts + olen, opts, (unsigned)i);
-	m->m_len -= olen;
-	if (m->m_flags & M_PKTHDR)
-		m->m_pkthdr.len -= olen;
-	ip->ip_vhl = IP_MAKE_VHL(IPVERSION, sizeof(struct ip) >> 2);
-}
-
-u_char inetctlerrmap[PRC_NCMDS] = {
-	0,		0,		0,		0,
-	0,		EMSGSIZE,	EHOSTDOWN,	EHOSTUNREACH,
-	EHOSTUNREACH,	EHOSTUNREACH,	ECONNREFUSED,	ECONNREFUSED,
-	EMSGSIZE,	EHOSTUNREACH,	0,		0,
-	0,		0,		0,		0,
-	ENOPROTOOPT
-};
-
-/*
- * Forward a packet.  If some error occurs return the sender
- * an icmp packet.  Note we can't always generate a meaningful
- * icmp message because icmp doesn't have a large enough repertoire
- * of codes and types.
- *
- * If not forwarding, just drop the packet.  This could be confusing
- * if ipforwarding was zero but some routing protocol was advancing
- * us as a gateway to somewhere.  However, we must let the routing
- * protocol deal with that.
- *
- * The srcrt parameter indicates whether the packet is being forwarded
- * via a source route.
- */
-static void
-ip_forward(m, srcrt)
-	struct mbuf *m;
-	int srcrt;
-{
-	register struct ip *ip = mtod(m, struct ip *);
-	register struct sockaddr_in *sin;
-	register struct rtentry *rt;
-	int error, type = 0, code = 0;
-	struct mbuf *mcopy;
-	n_long dest;
-	struct ifnet *destifp;
-
-	dest = 0;
-#ifdef DIAGNOSTIC
-	if (ipprintfs)
-		printf("forward: src %lx dst %lx ttl %x\n",
-			ip->ip_src.s_addr, ip->ip_dst.s_addr, ip->ip_ttl);
-#endif
-
-
-	if (m->m_flags & M_BCAST || in_canforward(ip->ip_dst) == 0) {
-		ipstat.ips_cantforward++;
-		m_freem(m);
-		return;
-	}
-	HTONS(ip->ip_id);
-	if (ip->ip_ttl <= IPTTLDEC) {
-		icmp_error(m, ICMP_TIMXCEED, ICMP_TIMXCEED_INTRANS, dest, 0);
-		return;
-	}
-	ip->ip_ttl -= IPTTLDEC;
-
-	sin = (struct sockaddr_in *)&ipforward_rt.ro_dst;
-	if ((rt = ipforward_rt.ro_rt) == 0 ||
-	    ip->ip_dst.s_addr != sin->sin_addr.s_addr) {
-		if (ipforward_rt.ro_rt) {
-			RTFREE(ipforward_rt.ro_rt);
-			ipforward_rt.ro_rt = 0;
-		}
-		sin->sin_family = AF_INET;
-		sin->sin_len = sizeof(*sin);
-		sin->sin_addr = ip->ip_dst;
-
-		rtalloc_ign(&ipforward_rt, RTF_PRCLONING);
-		if (ipforward_rt.ro_rt == 0) {
-			icmp_error(m, ICMP_UNREACH, ICMP_UNREACH_HOST, dest, 0);
-			return;
-		}
-		rt = ipforward_rt.ro_rt;
-	}
-
-	/*
-	 * Save at most 64 bytes of the packet in case
-	 * we need to generate an ICMP message to the src.
-	 */
-	mcopy = m_copy(m, 0, imin((int)ip->ip_len, 64));
-
-	/*
-	 * If forwarding packet using same interface that it came in on,
-	 * perhaps should send a redirect to sender to shortcut a hop.
-	 * Only send redirect if source is sending directly to us,
-	 * and if packet was not source routed (or has any options).
-	 * Also, don't send redirect if forwarding using a default route
-	 * or a route modified by a redirect.
-	 */
-#define	satosin(sa)	((struct sockaddr_in *)(sa))
-	if (rt->rt_ifp == m->m_pkthdr.rcvif &&
-	    (rt->rt_flags & (RTF_DYNAMIC|RTF_MODIFIED)) == 0 &&
-	    satosin(rt_key(rt))->sin_addr.s_addr != 0 &&
-	    ipsendredirects && !srcrt) {
-#define	RTA(rt)	((struct in_ifaddr *)(rt->rt_ifa))
-		u_long src = ntohl(ip->ip_src.s_addr);
-
-		if (RTA(rt) &&
-		    (src & RTA(rt)->ia_subnetmask) == RTA(rt)->ia_subnet) {
-		    if (rt->rt_flags & RTF_GATEWAY)
-			dest = satosin(rt->rt_gateway)->sin_addr.s_addr;
-		    else
-			dest = ip->ip_dst.s_addr;
-		    /* Router requirements says to only send host redirects */
-		    type = ICMP_REDIRECT;
-		    code = ICMP_REDIRECT_HOST;
-#ifdef DIAGNOSTIC
-		    if (ipprintfs)
-		        printf("redirect (%d) to %lx\n", code, (u_long)dest);
-#endif
-		}
-	}
-
-	error = ip_output(m, (struct mbuf *)0, &ipforward_rt, 
-			  IP_FORWARDING, 0);
-	if (error)
-		ipstat.ips_cantforward++;
-	else {
-		ipstat.ips_forward++;
-		if (type)
-			ipstat.ips_redirectsent++;
-		else {
-			if (mcopy)
-				m_freem(mcopy);
-			return;
-		}
-	}
-	if (mcopy == NULL)
-		return;
-	destifp = NULL;
-
-	switch (error) {
-
-	case 0:				/* forwarded, but need redirect */
-		/* type, code set above */
-		break;
-
-	case ENETUNREACH:		/* shouldn't happen, checked above */
-	case EHOSTUNREACH:
-	case ENETDOWN:
-	case EHOSTDOWN:
-	default:
-		type = ICMP_UNREACH;
-		code = ICMP_UNREACH_HOST;
-		break;
-
-	case EMSGSIZE:
-		type = ICMP_UNREACH;
-		code = ICMP_UNREACH_NEEDFRAG;
-		if (ipforward_rt.ro_rt)
-			destifp = ipforward_rt.ro_rt->rt_ifp;
-		ipstat.ips_cantfrag++;
-		break;
-
-	case ENOBUFS:
-		type = ICMP_SOURCEQUENCH;
-		code = 0;
-		break;
-	}
-	icmp_error(mcopy, type, code, dest, destifp);
-}
-
-void
-ip_savecontrol(inp, mp, ip, m)
-	register struct inpcb *inp;
-	register struct mbuf **mp;
-	register struct ip *ip;
-	register struct mbuf *m;
-{
-	if (inp->inp_socket->so_options & SO_TIMESTAMP) {
-		struct timeval tv;
-
-		microtime(&tv);
-		*mp = sbcreatecontrol((caddr_t) &tv, sizeof(tv),
-			SCM_TIMESTAMP, SOL_SOCKET);
-		if (*mp)
-			mp = &(*mp)->m_next;
-	}
-	if (inp->inp_flags & INP_RECVDSTADDR) {
-		*mp = sbcreatecontrol((caddr_t) &ip->ip_dst,
-		    sizeof(struct in_addr), IP_RECVDSTADDR, IPPROTO_IP);
-		if (*mp)
-			mp = &(*mp)->m_next;
-	}
-#ifdef notyet
-	/* XXX
-	 * Moving these out of udp_input() made them even more broken
-	 * than they already were.
-	 */
-	/* options were tossed already */
-	if (inp->inp_flags & INP_RECVOPTS) {
-		*mp = sbcreatecontrol((caddr_t) opts_deleted_above,
-		    sizeof(struct in_addr), IP_RECVOPTS, IPPROTO_IP);
-		if (*mp)
-			mp = &(*mp)->m_next;
-	}
-	/* ip_srcroute doesn't do what we want here, need to fix */
-	if (inp->inp_flags & INP_RECVRETOPTS) {
-		*mp = sbcreatecontrol((caddr_t) ip_srcroute(),
-		    sizeof(struct in_addr), IP_RECVRETOPTS, IPPROTO_IP);
-		if (*mp)
-			mp = &(*mp)->m_next;
-	}
-#endif
-	if (inp->inp_flags & INP_RECVIF) {
-		struct sockaddr_dl sdl;
-
-		sdl.sdl_len = offsetof(struct sockaddr_dl, sdl_data[0]);
-		sdl.sdl_family = AF_LINK;
-		sdl.sdl_index = m->m_pkthdr.rcvif ?
-			m->m_pkthdr.rcvif->if_index : 0;
-		sdl.sdl_nlen = sdl.sdl_alen = sdl.sdl_slen = 0;
-		*mp = sbcreatecontrol((caddr_t) &sdl, sdl.sdl_len,
-			IP_RECVIF, IPPROTO_IP);
-		if (*mp)
-			mp = &(*mp)->m_next;
-	}
-}
-
-int
-ip_rsvp_init(struct socket *so)
-{
-	if (so->so_type != SOCK_RAW ||
-	    so->so_proto->pr_protocol != IPPROTO_RSVP)
-	  return EOPNOTSUPP;
-
-	if (ip_rsvpd != NULL)
-	  return EADDRINUSE;
-
-	ip_rsvpd = so;
-	/*
-	 * This may seem silly, but we need to be sure we don't over-increment
-	 * the RSVP counter, in case something slips up.
-	 */
-	if (!ip_rsvp_on) {
-		ip_rsvp_on = 1;
-		rsvp_on++;
-	}
-
-	return 0;
-}
-
-int
-ip_rsvp_done(void)
-{
-	ip_rsvpd = NULL;
-	/*
-	 * This may seem silly, but we need to be sure we don't over-decrement
-	 * the RSVP counter, in case something slips up.
-	 */
-	if (ip_rsvp_on) {
-		ip_rsvp_on = 0;
-		rsvp_on--;
-	}
-	return 0;
-}
diff --git a/c/src/exec/libnetworking/netinet/ip_mroute.c b/c/src/exec/libnetworking/netinet/ip_mroute.c
deleted file mode 100644
index 662d695dfe..0000000000
--- a/c/src/exec/libnetworking/netinet/ip_mroute.c
+++ /dev/null
@@ -1,2302 +0,0 @@
-/*
- * IP multicast forwarding procedures
- *
- * Written by David Waitzman, BBN Labs, August 1988.
- * Modified by Steve Deering, Stanford, February 1989.
- * Modified by Mark J. Steiglitz, Stanford, May, 1991
- * Modified by Van Jacobson, LBL, January 1993
- * Modified by Ajit Thyagarajan, PARC, August 1993
- * Modified by Bill Fenner, PARC, April 1995
- *
- * MROUTING Revision: 3.5
- * $Id$
- */
-
-#include "opt_mrouting.h"
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/systm.h>
-#include <sys/mbuf.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/protosw.h>
-#include <sys/errno.h>
-#include <sys/time.h>
-#include <sys/kernel.h>
-#include <sys/ioctl.h>
-#include <sys/syslog.h>
-#include <net/if.h>
-#include <net/route.h>
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/ip_var.h>
-#include <netinet/in_pcb.h>
-#include <netinet/in_var.h>
-#include <netinet/igmp.h>
-#include <netinet/igmp_var.h>
-#include <netinet/ip_mroute.h>
-#include <netinet/udp.h>
-
-#ifndef NTOHL
-#if BYTE_ORDER != BIG_ENDIAN
-#define NTOHL(d) ((d) = ntohl((d)))
-#define NTOHS(d) ((d) = ntohs((u_short)(d)))
-#define HTONL(d) ((d) = htonl((d)))
-#define HTONS(d) ((d) = htons((u_short)(d)))
-#else
-#define NTOHL(d)
-#define NTOHS(d)
-#define HTONL(d)
-#define HTONS(d)
-#endif
-#endif
-
-#ifndef MROUTING
-extern u_long	_ip_mcast_src __P((int vifi));
-extern int	_ip_mforward __P((struct ip *ip, struct ifnet *ifp,
-				  struct mbuf *m, struct ip_moptions *imo));
-extern int	_ip_mrouter_done __P((void));
-extern int	_ip_mrouter_get __P((int cmd, struct socket *so,
-				     struct mbuf **m));
-extern int	_ip_mrouter_set __P((int cmd, struct socket *so,
-				     struct mbuf *m));
-extern int	_mrt_ioctl __P((int req, caddr_t data, struct proc *p));
-
-/*
- * Dummy routines and globals used when multicast routing is not compiled in.
- */
-
-struct socket  *ip_mrouter  = NULL;
-/* static u_int		ip_mrtproto = 0; */
-/* static struct mrtstat	mrtstat; */
-u_int		rsvpdebug = 0;
-
-int
-_ip_mrouter_set(cmd, so, m)
-	int cmd;
-	struct socket *so;
-	struct mbuf *m;
-{
-	return(EOPNOTSUPP);
-}
-
-int (*ip_mrouter_set)(int, struct socket *, struct mbuf *) = _ip_mrouter_set;
-
-
-int
-_ip_mrouter_get(cmd, so, m)
-	int cmd;
-	struct socket *so;
-	struct mbuf **m;
-{
-	return(EOPNOTSUPP);
-}
-
-int (*ip_mrouter_get)(int, struct socket *, struct mbuf **) = _ip_mrouter_get;
-
-int
-_ip_mrouter_done()
-{
-	return(0);
-}
-
-int (*ip_mrouter_done)(void) = _ip_mrouter_done;
-
-int
-_ip_mforward(ip, ifp, m, imo)
-	struct ip *ip;
-	struct ifnet *ifp;
-	struct mbuf *m;
-	struct ip_moptions *imo;
-{
-	return(0);
-}
-
-int (*ip_mforward)(struct ip *, struct ifnet *, struct mbuf *,
-		   struct ip_moptions *) = _ip_mforward;
-
-int
-_mrt_ioctl(int req, caddr_t data, struct proc *p)
-{
-	return EOPNOTSUPP;
-}
-
-int (*mrt_ioctl)(int, caddr_t, struct proc *) = _mrt_ioctl;
-
-void
-rsvp_input(m, iphlen)		/* XXX must fixup manually */
-	struct mbuf *m;
-	int iphlen;
-{
-    /* Can still get packets with rsvp_on = 0 if there is a local member
-     * of the group to which the RSVP packet is addressed.  But in this
-     * case we want to throw the packet away.
-     */
-    if (!rsvp_on) {
-	m_freem(m);
-	return;
-    }
- 
-    if (ip_rsvpd != NULL) {
-	if (rsvpdebug)
-	    printf("rsvp_input: Sending packet up old-style socket\n");
-	rip_input(m, iphlen);
-	return;
-    }
-    /* Drop the packet */
-    m_freem(m);
-}
-
-void ipip_input(struct mbuf *m, int iphlen) { /* XXX must fixup manually */
-	rip_input(m, iphlen);
-}
-
-int (*legal_vif_num)(int) = 0;
-
-/*
- * This should never be called, since IP_MULTICAST_VIF should fail, but
- * just in case it does get called, the code a little lower in ip_output
- * will assign the packet a local address.
- */
-u_long
-_ip_mcast_src(int vifi) { return INADDR_ANY; }
-u_long (*ip_mcast_src)(int) = _ip_mcast_src;
-
-int
-ip_rsvp_vif_init(so, m)
-    struct socket *so;
-    struct mbuf *m;
-{
-    return(EINVAL);
-}
-
-int
-ip_rsvp_vif_done(so, m)
-    struct socket *so;
-    struct mbuf *m;
-{
-    return(EINVAL);
-}
-
-void
-ip_rsvp_force_done(so)
-    struct socket *so;
-{
-    return;
-}
-
-#else /* MROUTING */
-
-#define M_HASCL(m)	((m)->m_flags & M_EXT)
-
-#define INSIZ		sizeof(struct in_addr)
-#define	same(a1, a2) \
-	(bcmp((caddr_t)(a1), (caddr_t)(a2), INSIZ) == 0)
-
-#define MT_MRTABLE MT_RTABLE	/* since nothing else uses it */
-
-/*
- * Globals.  All but ip_mrouter and ip_mrtproto could be static,
- * except for netstat or debugging purposes.
- */
-#ifndef MROUTE_LKM
-struct socket  *ip_mrouter  = NULL;
-struct mrtstat	mrtstat;
-
-int		ip_mrtproto = IGMP_DVMRP;    /* for netstat only */
-#else /* MROUTE_LKM */
-extern void	X_ipip_input __P((struct mbuf *m, int iphlen));
-extern struct mrtstat mrtstat;
-static int ip_mrtproto;
-#endif
-
-#define NO_RTE_FOUND 	0x1
-#define RTE_FOUND	0x2
-
-static struct mbuf    *mfctable[MFCTBLSIZ];
-static u_char		nexpire[MFCTBLSIZ];
-static struct vif	viftable[MAXVIFS];
-static u_int	mrtdebug = 0;	  /* debug level 	*/
-#define		DEBUG_MFC	0x02
-#define		DEBUG_FORWARD	0x04
-#define		DEBUG_EXPIRE	0x08
-#define		DEBUG_XMIT	0x10
-static u_int  	tbfdebug = 0;     /* tbf debug level 	*/
-static u_int	rsvpdebug = 0;	  /* rsvp debug level   */
-
-#define		EXPIRE_TIMEOUT	(hz / 4)	/* 4x / second		*/
-#define		UPCALL_EXPIRE	6		/* number of timeouts	*/
-
-/*
- * Define the token bucket filter structures
- * tbftable -> each vif has one of these for storing info 
- */
-
-static struct tbf tbftable[MAXVIFS];
-#define		TBF_REPROCESS	(hz / 100)	/* 100x / second */
-
-/*
- * 'Interfaces' associated with decapsulator (so we can tell
- * packets that went through it from ones that get reflected
- * by a broken gateway).  These interfaces are never linked into
- * the system ifnet list & no routes point to them.  I.e., packets
- * can't be sent this way.  They only exist as a placeholder for
- * multicast source verification.
- */
-static struct ifnet multicast_decap_if[MAXVIFS];
-
-#define ENCAP_TTL 64
-#define ENCAP_PROTO IPPROTO_IPIP	/* 4 */
-
-/* prototype IP hdr for encapsulated packets */
-static struct ip multicast_encap_iphdr = {
-#if BYTE_ORDER == LITTLE_ENDIAN
-	sizeof(struct ip) >> 2, IPVERSION,
-#else
-	IPVERSION, sizeof(struct ip) >> 2,
-#endif
-	0,				/* tos */
-	sizeof(struct ip),		/* total length */
-	0,				/* id */
-	0,				/* frag offset */
-	ENCAP_TTL, ENCAP_PROTO,	
-	0,				/* checksum */
-};
-
-/*
- * Private variables.
- */
-static vifi_t	   numvifs = 0;
-static int have_encap_tunnel = 0;
-
-/*
- * one-back cache used by ipip_input to locate a tunnel's vif
- * given a datagram's src ip address.
- */
-static u_long last_encap_src;
-static struct vif *last_encap_vif;
-
-static u_long	X_ip_mcast_src __P((int vifi));
-static int	X_ip_mforward __P((struct ip *ip, struct ifnet *ifp, struct mbuf *m, struct ip_moptions *imo));
-static int	X_ip_mrouter_done __P((void));
-static int	X_ip_mrouter_get __P((int cmd, struct socket *so, struct mbuf **m));
-static int	X_ip_mrouter_set __P((int cmd, struct socket *so, struct mbuf *m));
-static int	X_legal_vif_num __P((int vif));
-static int	X_mrt_ioctl __P((int cmd, caddr_t data));
-
-static int get_sg_cnt(struct sioc_sg_req *);
-static int get_vif_cnt(struct sioc_vif_req *);
-static int ip_mrouter_init(struct socket *, struct mbuf *);
-static int add_vif(struct vifctl *);
-static int del_vif(vifi_t *);
-static int add_mfc(struct mfcctl *);
-static int del_mfc(struct mfcctl *);
-static int socket_send(struct socket *, struct mbuf *, struct sockaddr_in *);
-static int get_version(struct mbuf *);
-static int get_assert(struct mbuf *);
-static int set_assert(int *);
-static void expire_upcalls(void *);
-static int ip_mdq(struct mbuf *, struct ifnet *, struct mfc *,
-		  vifi_t);
-static void phyint_send(struct ip *, struct vif *, struct mbuf *);
-static void encap_send(struct ip *, struct vif *, struct mbuf *);
-static void tbf_control(struct vif *, struct mbuf *, struct ip *, u_long);
-static void tbf_queue(struct vif *, struct mbuf *);
-static void tbf_process_q(struct vif *);
-static void tbf_reprocess_q(void *);
-static int tbf_dq_sel(struct vif *, struct ip *);
-static void tbf_send_packet(struct vif *, struct mbuf *);
-static void tbf_update_tokens(struct vif *);
-static int priority(struct vif *, struct ip *);
-void multiencap_decap(struct mbuf *);
-
-/*
- * whether or not special PIM assert processing is enabled.
- */
-static int pim_assert;
-/*
- * Rate limit for assert notification messages, in usec
- */
-#define ASSERT_MSG_TIME		3000000
-
-/*
- * Hash function for a source, group entry
- */
-#define MFCHASH(a, g) MFCHASHMOD(((a) >> 20) ^ ((a) >> 10) ^ (a) ^ \
-			((g) >> 20) ^ ((g) >> 10) ^ (g))
-
-/*
- * Find a route for a given origin IP address and Multicast group address
- * Type of service parameter to be added in the future!!!
- */
-
-#define MFCFIND(o, g, rt) { \
-	register struct mbuf *_mb_rt = mfctable[MFCHASH(o,g)]; \
-	register struct mfc *_rt = NULL; \
-	rt = NULL; \
-	++mrtstat.mrts_mfc_lookups; \
-	while (_mb_rt) { \
-		_rt = mtod(_mb_rt, struct mfc *); \
-		if ((_rt->mfc_origin.s_addr == o) && \
-		    (_rt->mfc_mcastgrp.s_addr == g) && \
-		    (_mb_rt->m_act == NULL)) { \
-			rt = _rt; \
-			break; \
-		} \
-		_mb_rt = _mb_rt->m_next; \
-	} \
-	if (rt == NULL) { \
-		++mrtstat.mrts_mfc_misses; \
-	} \
-}
-
-
-/*
- * Macros to compute elapsed time efficiently
- * Borrowed from Van Jacobson's scheduling code
- */
-#define TV_DELTA(a, b, delta) { \
-	    register int xxs; \
-		\
-	    delta = (a).tv_usec - (b).tv_usec; \
-	    if ((xxs = (a).tv_sec - (b).tv_sec)) { \
-	       switch (xxs) { \
-		      case 2: \
-			  delta += 1000000; \
-			      /* fall through */ \
-		      case 1: \
-			  delta += 1000000; \
-			  break; \
-		      default: \
-			  delta += (1000000 * xxs); \
-	       } \
-	    } \
-}
-
-#define TV_LT(a, b) (((a).tv_usec < (b).tv_usec && \
-	      (a).tv_sec <= (b).tv_sec) || (a).tv_sec < (b).tv_sec)
-
-#ifdef UPCALL_TIMING
-u_long upcall_data[51];
-static void collate(struct timeval *);
-#endif /* UPCALL_TIMING */
-
-
-/*
- * Handle MRT setsockopt commands to modify the multicast routing tables.
- */
-static int
-X_ip_mrouter_set(cmd, so, m)
-    int cmd;
-    struct socket *so;
-    struct mbuf *m;
-{
-   if (cmd != MRT_INIT && so != ip_mrouter) return EACCES;
-
-    switch (cmd) {
-	case MRT_INIT:     return ip_mrouter_init(so, m);
-	case MRT_DONE:     return ip_mrouter_done();
-	case MRT_ADD_VIF:  return add_vif (mtod(m, struct vifctl *));
-	case MRT_DEL_VIF:  return del_vif (mtod(m, vifi_t *));
-	case MRT_ADD_MFC:  return add_mfc (mtod(m, struct mfcctl *));
-	case MRT_DEL_MFC:  return del_mfc (mtod(m, struct mfcctl *));
-	case MRT_ASSERT:   return set_assert(mtod(m, int *));
-	default:             return EOPNOTSUPP;
-    }
-}
-
-#ifndef MROUTE_LKM
-int (*ip_mrouter_set)(int, struct socket *, struct mbuf *) = X_ip_mrouter_set;
-#endif
-
-/*
- * Handle MRT getsockopt commands
- */
-static int
-X_ip_mrouter_get(cmd, so, m)
-    int cmd;
-    struct socket *so;
-    struct mbuf **m;
-{
-    struct mbuf *mb;
-
-    if (so != ip_mrouter) return EACCES;
-
-    *m = mb = m_get(M_WAIT, MT_SOOPTS);
-  
-    switch (cmd) {
-	case MRT_VERSION:   return get_version(mb);
-	case MRT_ASSERT:    return get_assert(mb);
-	default:            return EOPNOTSUPP;
-    }
-}
-
-#ifndef MROUTE_LKM
-int (*ip_mrouter_get)(int, struct socket *, struct mbuf **) = X_ip_mrouter_get;
-#endif
-
-/*
- * Handle ioctl commands to obtain information from the cache
- */
-static int
-X_mrt_ioctl(cmd, data)
-    int cmd;
-    caddr_t data;
-{
-    int error = 0;
-
-    switch (cmd) {
-	case (SIOCGETVIFCNT):
-	    return (get_vif_cnt((struct sioc_vif_req *)data));
-	    break;
-	case (SIOCGETSGCNT):
-	    return (get_sg_cnt((struct sioc_sg_req *)data));
-	    break;
-	default:
-	    return (EINVAL);
-	    break;
-    }
-    return error;
-}
-
-#ifndef MROUTE_LKM
-int (*mrt_ioctl)(int, caddr_t) = X_mrt_ioctl;
-#endif
-
-/*
- * returns the packet, byte, rpf-failure count for the source group provided
- */
-static int
-get_sg_cnt(req)
-    register struct sioc_sg_req *req;
-{
-    register struct mfc *rt;
-    int s;
-
-    s = splnet();
-    MFCFIND(req->src.s_addr, req->grp.s_addr, rt);
-    splx(s);
-    if (rt != NULL) {
-	req->pktcnt = rt->mfc_pkt_cnt;
-	req->bytecnt = rt->mfc_byte_cnt;
-	req->wrong_if = rt->mfc_wrong_if;
-    } else
-	req->pktcnt = req->bytecnt = req->wrong_if = 0xffffffff;
-
-    return 0;
-}
-
-/*
- * returns the input and output packet and byte counts on the vif provided
- */
-static int
-get_vif_cnt(req)
-    register struct sioc_vif_req *req;
-{
-    register vifi_t vifi = req->vifi;
-
-    if (vifi >= numvifs) return EINVAL;
-
-    req->icount = viftable[vifi].v_pkt_in;
-    req->ocount = viftable[vifi].v_pkt_out;
-    req->ibytes = viftable[vifi].v_bytes_in;
-    req->obytes = viftable[vifi].v_bytes_out;
-
-    return 0;
-}
-
-/*
- * Enable multicast routing
- */
-static int
-ip_mrouter_init(so, m)
-	struct socket *so;
-	struct mbuf *m;
-{
-    int *v;
-
-    if (mrtdebug)
-	log(LOG_DEBUG,"ip_mrouter_init: so_type = %d, pr_protocol = %d\n",
-		so->so_type, so->so_proto->pr_protocol);
-
-    if (so->so_type != SOCK_RAW ||
-	so->so_proto->pr_protocol != IPPROTO_IGMP) return EOPNOTSUPP;
-
-    if (!m || (m->m_len != sizeof(int *)))
-	return ENOPROTOOPT;
-
-    v = mtod(m, int *);
-    if (*v != 1)
-	return ENOPROTOOPT;
-
-    if (ip_mrouter != NULL) return EADDRINUSE;
-
-    ip_mrouter = so;
-
-    bzero((caddr_t)mfctable, sizeof(mfctable));
-    bzero((caddr_t)nexpire, sizeof(nexpire));
-
-    pim_assert = 0;
-
-    timeout(expire_upcalls, (caddr_t)NULL, EXPIRE_TIMEOUT);
-
-    if (mrtdebug)
-	log(LOG_DEBUG, "ip_mrouter_init\n");
-
-    return 0;
-}
-
-/*
- * Disable multicast routing
- */
-static int
-X_ip_mrouter_done()
-{
-    vifi_t vifi;
-    int i;
-    struct ifnet *ifp;
-    struct ifreq ifr;
-    struct mbuf *mb_rt;
-    struct mbuf *m;
-    struct rtdetq *rte;
-    int s;
-
-    s = splnet();
-
-    /*
-     * For each phyint in use, disable promiscuous reception of all IP
-     * multicasts.
-     */
-    for (vifi = 0; vifi < numvifs; vifi++) {
-	if (viftable[vifi].v_lcl_addr.s_addr != 0 &&
-	    !(viftable[vifi].v_flags & VIFF_TUNNEL)) {
-	    ((struct sockaddr_in *)&(ifr.ifr_addr))->sin_family = AF_INET;
-	    ((struct sockaddr_in *)&(ifr.ifr_addr))->sin_addr.s_addr
-								= INADDR_ANY;
-	    ifp = viftable[vifi].v_ifp;
-	    (*ifp->if_ioctl)(ifp, SIOCDELMULTI, (caddr_t)&ifr);
-	}
-    }
-    bzero((caddr_t)tbftable, sizeof(tbftable));
-    bzero((caddr_t)viftable, sizeof(viftable));
-    numvifs = 0;
-    pim_assert = 0;
-
-    untimeout(expire_upcalls, (caddr_t)NULL);
-
-    /*
-     * Free all multicast forwarding cache entries.
-     */
-    for (i = 0; i < MFCTBLSIZ; i++) {
-	mb_rt = mfctable[i];
-	while (mb_rt) {
-	    if (mb_rt->m_act != NULL) {
-		while (mb_rt->m_act) {
-		    m = mb_rt->m_act;
-		    mb_rt->m_act = m->m_act;
-		    rte = mtod(m, struct rtdetq *);
-		    m_freem(rte->m);
-		    m_free(m);
-		}
-	    }
-	    mb_rt = m_free(mb_rt);
-	}
-    }
-
-    bzero((caddr_t)mfctable, sizeof(mfctable));
-
-    /*
-     * Reset de-encapsulation cache
-     */
-    last_encap_src = 0;
-    last_encap_vif = NULL;
-    have_encap_tunnel = 0;
- 
-    ip_mrouter = NULL;
-
-    splx(s);
-
-    if (mrtdebug)
-	log(LOG_DEBUG, "ip_mrouter_done\n");
-
-    return 0;
-}
-
-#ifndef MROUTE_LKM
-int (*ip_mrouter_done)(void) = X_ip_mrouter_done;
-#endif
-
-static int
-get_version(mb)
-    struct mbuf *mb;
-{
-    int *v;
-
-    v = mtod(mb, int *);
-
-    *v = 0x0305;	/* XXX !!!! */
-    mb->m_len = sizeof(int);
-
-    return 0;
-}
-
-/*
- * Set PIM assert processing global
- */
-static int
-set_assert(i)
-    int *i;
-{
-    if ((*i != 1) && (*i != 0))
-	return EINVAL;
-
-    pim_assert = *i;
-
-    return 0;
-}
-
-/*
- * Get PIM assert processing global
- */
-static int
-get_assert(m)
-    struct mbuf *m;
-{
-    int *i;
-
-    i = mtod(m, int *);
-
-    *i = pim_assert;
-
-    return 0;
-}
-
-/*
- * Add a vif to the vif table
- */
-static int
-add_vif(vifcp)
-    register struct vifctl *vifcp;
-{
-    register struct vif *vifp = viftable + vifcp->vifc_vifi;
-    static struct sockaddr_in sin = {sizeof sin, AF_INET};
-    struct ifaddr *ifa;
-    struct ifnet *ifp;
-    struct ifreq ifr;
-    int error, s;
-    struct tbf *v_tbf = tbftable + vifcp->vifc_vifi;
-
-    if (vifcp->vifc_vifi >= MAXVIFS)  return EINVAL;
-    if (vifp->v_lcl_addr.s_addr != 0) return EADDRINUSE;
-
-    /* Find the interface with an address in AF_INET family */
-    sin.sin_addr = vifcp->vifc_lcl_addr;
-    ifa = ifa_ifwithaddr((struct sockaddr *)&sin);
-    if (ifa == 0) return EADDRNOTAVAIL;
-    ifp = ifa->ifa_ifp;
-
-    if (vifcp->vifc_flags & VIFF_TUNNEL) {
-	if ((vifcp->vifc_flags & VIFF_SRCRT) == 0) {
-		/*
-		 * An encapsulating tunnel is wanted.  Tell ipip_input() to
-		 * start paying attention to encapsulated packets.
-		 */
-		if (have_encap_tunnel == 0) {
-			have_encap_tunnel = 1;
-			for (s = 0; s < MAXVIFS; ++s) {
-				multicast_decap_if[s].if_name = "mdecap";
-				multicast_decap_if[s].if_unit = s;
-			}
-		}
-		/*
-		 * Set interface to fake encapsulator interface
-		 */
-		ifp = &multicast_decap_if[vifcp->vifc_vifi];
-		/*
-		 * Prepare cached route entry
-		 */
-		bzero(&vifp->v_route, sizeof(vifp->v_route));
-	} else {
-	    log(LOG_ERR, "source routed tunnels not supported\n");
-	    return EOPNOTSUPP;
-	}
-    } else {
-	/* Make sure the interface supports multicast */
-	if ((ifp->if_flags & IFF_MULTICAST) == 0)
-	    return EOPNOTSUPP;
-
-	/* Enable promiscuous reception of all IP multicasts from the if */
-	((struct sockaddr_in *)&(ifr.ifr_addr))->sin_family = AF_INET;
-	((struct sockaddr_in *)&(ifr.ifr_addr))->sin_addr.s_addr = INADDR_ANY;
-	s = splnet();
-	error = (*ifp->if_ioctl)(ifp, SIOCADDMULTI, (caddr_t)&ifr);
-	splx(s);
-	if (error)
-	    return error;
-    }
-
-    s = splnet();
-    /* define parameters for the tbf structure */
-    vifp->v_tbf = v_tbf;
-    GET_TIME(vifp->v_tbf->tbf_last_pkt_t);
-    vifp->v_tbf->tbf_n_tok = 0;
-    vifp->v_tbf->tbf_q_len = 0;
-    vifp->v_tbf->tbf_max_q_len = MAXQSIZE;
-    vifp->v_tbf->tbf_q = vifp->v_tbf->tbf_t = NULL;
-
-    vifp->v_flags     = vifcp->vifc_flags;
-    vifp->v_threshold = vifcp->vifc_threshold;
-    vifp->v_lcl_addr  = vifcp->vifc_lcl_addr;
-    vifp->v_rmt_addr  = vifcp->vifc_rmt_addr;
-    vifp->v_ifp       = ifp;
-    /* scaling up here allows division by 1024 in critical code */
-    vifp->v_rate_limit= vifcp->vifc_rate_limit * 1024 / 1000;
-    vifp->v_rsvp_on   = 0;
-    vifp->v_rsvpd     = NULL;
-    /* initialize per vif pkt counters */
-    vifp->v_pkt_in    = 0;
-    vifp->v_pkt_out   = 0;
-    vifp->v_bytes_in  = 0;
-    vifp->v_bytes_out = 0;
-    splx(s);
-
-    /* Adjust numvifs up if the vifi is higher than numvifs */
-    if (numvifs <= vifcp->vifc_vifi) numvifs = vifcp->vifc_vifi + 1;
-
-    if (mrtdebug)
-	log(LOG_DEBUG, "add_vif #%d, lcladdr %x, %s %x, thresh %x, rate %d\n",
-	    vifcp->vifc_vifi, 
-	    ntohl(vifcp->vifc_lcl_addr.s_addr),
-	    (vifcp->vifc_flags & VIFF_TUNNEL) ? "rmtaddr" : "mask",
-	    ntohl(vifcp->vifc_rmt_addr.s_addr),
-	    vifcp->vifc_threshold,
-	    vifcp->vifc_rate_limit);    
-
-    return 0;
-}
-
-/*
- * Delete a vif from the vif table
- */
-static int
-del_vif(vifip)
-    vifi_t *vifip;
-{
-    register struct vif *vifp = viftable + *vifip;
-    register vifi_t vifi;
-    register struct mbuf *m;
-    struct ifnet *ifp;
-    struct ifreq ifr;
-    int s;
-
-    if (*vifip >= numvifs) return EINVAL;
-    if (vifp->v_lcl_addr.s_addr == 0) return EADDRNOTAVAIL;
-
-    s = splnet();
-
-    if (!(vifp->v_flags & VIFF_TUNNEL)) {
-	((struct sockaddr_in *)&(ifr.ifr_addr))->sin_family = AF_INET;
-	((struct sockaddr_in *)&(ifr.ifr_addr))->sin_addr.s_addr = INADDR_ANY;
-	ifp = vifp->v_ifp;
-	(*ifp->if_ioctl)(ifp, SIOCDELMULTI, (caddr_t)&ifr);
-    }
-
-    if (vifp == last_encap_vif) {
-	last_encap_vif = 0;
-	last_encap_src = 0;
-    }
-
-    /*
-     * Free packets queued at the interface
-     */
-    while (vifp->v_tbf->tbf_q) {
-	m = vifp->v_tbf->tbf_q;
-	vifp->v_tbf->tbf_q = m->m_act;
-	m_freem(m);
-    }
-
-    bzero((caddr_t)vifp->v_tbf, sizeof(*(vifp->v_tbf)));
-    bzero((caddr_t)vifp, sizeof (*vifp));
-
-    /* Adjust numvifs down */
-    for (vifi = numvifs; vifi > 0; vifi--)
-	if (viftable[vifi-1].v_lcl_addr.s_addr != 0) break;
-    numvifs = vifi;
-
-    splx(s);
-
-    if (mrtdebug)
-      log(LOG_DEBUG, "del_vif %d, numvifs %d\n", *vifip, numvifs);
-
-    return 0;
-}
-
-/*
- * Add an mfc entry
- */
-static int
-add_mfc(mfccp)
-    struct mfcctl *mfccp;
-{
-    struct mfc *rt;
-    register struct mbuf *mb_rt;
-    u_long hash;
-    struct mbuf *mb_ntry;
-    struct rtdetq *rte;
-    register u_short nstl;
-    int s;
-    int i;
-
-    MFCFIND(mfccp->mfcc_origin.s_addr, mfccp->mfcc_mcastgrp.s_addr, rt);
-
-    /* If an entry already exists, just update the fields */
-    if (rt) {
-	if (mrtdebug & DEBUG_MFC)
-	    log(LOG_DEBUG,"add_mfc update o %x g %x p %x\n",
-		ntohl(mfccp->mfcc_origin.s_addr),
-		ntohl(mfccp->mfcc_mcastgrp.s_addr),
-		mfccp->mfcc_parent);
-
-	s = splnet();
-	rt->mfc_parent = mfccp->mfcc_parent;
-	for (i = 0; i < numvifs; i++)
-	    rt->mfc_ttls[i] = mfccp->mfcc_ttls[i];
-	splx(s);
-	return 0;
-    }
-
-    /* 
-     * Find the entry for which the upcall was made and update
-     */
-    s = splnet();
-    hash = MFCHASH(mfccp->mfcc_origin.s_addr, mfccp->mfcc_mcastgrp.s_addr);
-    for (mb_rt = mfctable[hash], nstl = 0; mb_rt; mb_rt = mb_rt->m_next) {
-
-	rt = mtod(mb_rt, struct mfc *);
-	if ((rt->mfc_origin.s_addr == mfccp->mfcc_origin.s_addr) &&
-	    (rt->mfc_mcastgrp.s_addr == mfccp->mfcc_mcastgrp.s_addr) &&
-	    (mb_rt->m_act != NULL)) {
-  
-	    if (nstl++)
-		log(LOG_ERR, "add_mfc %s o %x g %x p %x dbx %x\n",
-		    "multiple kernel entries",
-		    ntohl(mfccp->mfcc_origin.s_addr),
-		    ntohl(mfccp->mfcc_mcastgrp.s_addr),
-		    mfccp->mfcc_parent, mb_rt->m_act);
-
-	    if (mrtdebug & DEBUG_MFC)
-		log(LOG_DEBUG,"add_mfc o %x g %x p %x dbg %x\n",
-		    ntohl(mfccp->mfcc_origin.s_addr),
-		    ntohl(mfccp->mfcc_mcastgrp.s_addr),
-		    mfccp->mfcc_parent, mb_rt->m_act);
-
-	    rt->mfc_origin     = mfccp->mfcc_origin;
-	    rt->mfc_mcastgrp   = mfccp->mfcc_mcastgrp;
-	    rt->mfc_parent     = mfccp->mfcc_parent;
-	    for (i = 0; i < numvifs; i++)
-		rt->mfc_ttls[i] = mfccp->mfcc_ttls[i];
-	    /* initialize pkt counters per src-grp */
-	    rt->mfc_pkt_cnt    = 0;
-	    rt->mfc_byte_cnt   = 0;
-	    rt->mfc_wrong_if   = 0;
-	    rt->mfc_last_assert.tv_sec = rt->mfc_last_assert.tv_usec = 0;
-
-	    rt->mfc_expire = 0;	/* Don't clean this guy up */
-	    nexpire[hash]--;
-
-	    /* free packets Qed at the end of this entry */
-	    while (mb_rt->m_act) {
-		mb_ntry = mb_rt->m_act;
-		rte = mtod(mb_ntry, struct rtdetq *);
-/* #ifdef RSVP_ISI */
-		ip_mdq(rte->m, rte->ifp, rt, -1);
-/* #endif */
-		mb_rt->m_act = mb_ntry->m_act;
-		m_freem(rte->m);
-#ifdef UPCALL_TIMING
-		collate(&(rte->t));
-#endif /* UPCALL_TIMING */
-		m_free(mb_ntry);
-	    }
-	}
-    }
-
-    /*
-     * It is possible that an entry is being inserted without an upcall
-     */
-    if (nstl == 0) {
-	if (mrtdebug & DEBUG_MFC)
-	    log(LOG_DEBUG,"add_mfc no upcall h %d o %x g %x p %x\n",
-		hash, ntohl(mfccp->mfcc_origin.s_addr),
-		ntohl(mfccp->mfcc_mcastgrp.s_addr),
-		mfccp->mfcc_parent);
-	
-	for (mb_rt = mfctable[hash]; mb_rt; mb_rt = mb_rt->m_next) {
-	    
-	    rt = mtod(mb_rt, struct mfc *);
-	    if ((rt->mfc_origin.s_addr == mfccp->mfcc_origin.s_addr) &&
-		(rt->mfc_mcastgrp.s_addr == mfccp->mfcc_mcastgrp.s_addr)) {
-
-		rt->mfc_origin     = mfccp->mfcc_origin;
-		rt->mfc_mcastgrp   = mfccp->mfcc_mcastgrp;
-		rt->mfc_parent     = mfccp->mfcc_parent;
-		for (i = 0; i < numvifs; i++)
-		    rt->mfc_ttls[i] = mfccp->mfcc_ttls[i];
-		/* initialize pkt counters per src-grp */
-		rt->mfc_pkt_cnt    = 0;
-		rt->mfc_byte_cnt   = 0;
-		rt->mfc_wrong_if   = 0;
-		rt->mfc_last_assert.tv_sec = rt->mfc_last_assert.tv_usec = 0;
-		if (rt->mfc_expire)
-		    nexpire[hash]--;
-		rt->mfc_expire	   = 0;
-	    }
-	}
-	if (mb_rt == NULL) {
-	    /* no upcall, so make a new entry */
-	    MGET(mb_rt, M_DONTWAIT, MT_MRTABLE);
-	    if (mb_rt == NULL) {
-		splx(s);
-		return ENOBUFS;
-	    }
-	    
-	    rt = mtod(mb_rt, struct mfc *);
-	    
-	    /* insert new entry at head of hash chain */
-	    rt->mfc_origin     = mfccp->mfcc_origin;
-	    rt->mfc_mcastgrp   = mfccp->mfcc_mcastgrp;
-	    rt->mfc_parent     = mfccp->mfcc_parent;
-	    for (i = 0; i < numvifs; i++)
-		    rt->mfc_ttls[i] = mfccp->mfcc_ttls[i];
-	    /* initialize pkt counters per src-grp */
-	    rt->mfc_pkt_cnt    = 0;
-	    rt->mfc_byte_cnt   = 0;
-	    rt->mfc_wrong_if   = 0;
-	    rt->mfc_last_assert.tv_sec = rt->mfc_last_assert.tv_usec = 0;
-	    rt->mfc_expire     = 0;
-	    
-	    /* link into table */
-	    mb_rt->m_next  = mfctable[hash];
-	    mfctable[hash] = mb_rt;
-	    mb_rt->m_act = NULL;
-	}
-    }
-    splx(s);
-    return 0;
-}
-
-#ifdef UPCALL_TIMING
-/*
- * collect delay statistics on the upcalls 
- */
-static void collate(t)
-register struct timeval *t;
-{
-    register u_long d;
-    register struct timeval tp;
-    register u_long delta;
-    
-    GET_TIME(tp);
-    
-    if (TV_LT(*t, tp))
-    {
-	TV_DELTA(tp, *t, delta);
-	
-	d = delta >> 10;
-	if (d > 50)
-	    d = 50;
-	
-	++upcall_data[d];
-    }
-}
-#endif /* UPCALL_TIMING */
-
-/*
- * Delete an mfc entry
- */
-static int
-del_mfc(mfccp)
-    struct mfcctl *mfccp;
-{
-    struct in_addr 	origin;
-    struct in_addr 	mcastgrp;
-    struct mfc 		*rt;
-    struct mbuf 	*mb_rt;
-    struct mbuf 	**nptr;
-    u_long 		hash;
-    int s;
-
-    origin = mfccp->mfcc_origin;
-    mcastgrp = mfccp->mfcc_mcastgrp;
-    hash = MFCHASH(origin.s_addr, mcastgrp.s_addr);
-
-    if (mrtdebug & DEBUG_MFC)
-	log(LOG_DEBUG,"del_mfc orig %x mcastgrp %x\n",
-	    ntohl(origin.s_addr), ntohl(mcastgrp.s_addr));
-
-    s = splnet();
-
-    nptr = &mfctable[hash];
-    while ((mb_rt = *nptr) != NULL) {
-        rt = mtod(mb_rt, struct mfc *);
-	if (origin.s_addr == rt->mfc_origin.s_addr &&
-	    mcastgrp.s_addr == rt->mfc_mcastgrp.s_addr &&
-	    mb_rt->m_act == NULL)
-	    break;
-
-	nptr = &mb_rt->m_next;
-    }
-    if (mb_rt == NULL) {
-	splx(s);
-	return EADDRNOTAVAIL;
-    }
-
-    MFREE(mb_rt, *nptr);
-
-    splx(s);
-
-    return 0;
-}
-
-/*
- * Send a message to mrouted on the multicast routing socket
- */
-static int
-socket_send(s, mm, src)
-	struct socket *s;
-	struct mbuf *mm;
-	struct sockaddr_in *src;
-{
-	if (s) {
-		if (sbappendaddr(&s->so_rcv,
-				 (struct sockaddr *)src,
-				 mm, (struct mbuf *)0) != 0) {
-			sorwakeup(s);
-			return 0;
-		}
-	}
-	m_freem(mm);
-	return -1;
-}
-
-/*
- * IP multicast forwarding function. This function assumes that the packet
- * pointed to by "ip" has arrived on (or is about to be sent to) the interface
- * pointed to by "ifp", and the packet is to be relayed to other networks
- * that have members of the packet's destination IP multicast group.
- *
- * The packet is returned unscathed to the caller, unless it is
- * erroneous, in which case a non-zero return value tells the caller to
- * discard it.
- */
-
-#define IP_HDR_LEN  20	/* # bytes of fixed IP header (excluding options) */
-#define TUNNEL_LEN  12  /* # bytes of IP option for tunnel encapsulation  */
-
-static int
-X_ip_mforward(ip, ifp, m, imo)
-    register struct ip *ip;
-    struct ifnet *ifp;
-    struct mbuf *m;
-    struct ip_moptions *imo;
-{
-    register struct mfc *rt;
-    register u_char *ipoptions;
-    static struct sockaddr_in 	k_igmpsrc	= { sizeof k_igmpsrc, AF_INET };
-    static int srctun = 0;
-    register struct mbuf *mm;
-    int s;
-    vifi_t vifi;
-    struct vif *vifp;
-
-    if (mrtdebug & DEBUG_FORWARD)
-	log(LOG_DEBUG, "ip_mforward: src %x, dst %x, ifp %x\n",
-	    ntohl(ip->ip_src.s_addr), ntohl(ip->ip_dst.s_addr), ifp);
-
-    if (ip->ip_hl < (IP_HDR_LEN + TUNNEL_LEN) >> 2 ||
-	(ipoptions = (u_char *)(ip + 1))[1] != IPOPT_LSRR ) {
-	/*
-	 * Packet arrived via a physical interface or
-	 * an encapsulated tunnel.
-	 */
-    } else {
-	/*
-	 * Packet arrived through a source-route tunnel.
-	 * Source-route tunnels are no longer supported.
-	 */
-	if ((srctun++ % 1000) == 0)
-	    log(LOG_ERR, "ip_mforward: received source-routed packet from %x\n",
-		ntohl(ip->ip_src.s_addr));
-
-	return 1;
-    }
-
-    if ((imo) && ((vifi = imo->imo_multicast_vif) < numvifs)) {
-	if (ip->ip_ttl < 255)
-		ip->ip_ttl++;	/* compensate for -1 in *_send routines */
-	if (rsvpdebug && ip->ip_p == IPPROTO_RSVP) {
-	    vifp = viftable + vifi;
-	    printf("Sending IPPROTO_RSVP from %lx to %lx on vif %d (%s%s%d)\n",
-		ntohl(ip->ip_src.s_addr), ntohl(ip->ip_dst.s_addr), vifi,
-		(vifp->v_flags & VIFF_TUNNEL) ? "tunnel on " : "",
-		vifp->v_ifp->if_name, vifp->v_ifp->if_unit);
-	}
-	return (ip_mdq(m, ifp, NULL, vifi));
-    }
-    if (rsvpdebug && ip->ip_p == IPPROTO_RSVP) {
-	printf("Warning: IPPROTO_RSVP from %lx to %lx without vif option\n",
-	    ntohl(ip->ip_src.s_addr), ntohl(ip->ip_dst.s_addr));
-	if(!imo)
-		printf("In fact, no options were specified at all\n");
-    }
-
-    /*
-     * Don't forward a packet with time-to-live of zero or one,
-     * or a packet destined to a local-only group.
-     */
-    if (ip->ip_ttl <= 1 ||
-	ntohl(ip->ip_dst.s_addr) <= INADDR_MAX_LOCAL_GROUP)
-	return 0;
-
-    /*
-     * Determine forwarding vifs from the forwarding cache table
-     */
-    s = splnet();
-    MFCFIND(ip->ip_src.s_addr, ip->ip_dst.s_addr, rt);
-
-    /* Entry exists, so forward if necessary */
-    if (rt != NULL) {
-	splx(s);
-	return (ip_mdq(m, ifp, rt, -1));
-    } else {
-	/*
-	 * If we don't have a route for packet's origin,
-	 * Make a copy of the packet &
-	 * send message to routing daemon
-	 */
-
-	register struct mbuf *mb_rt;
-	register struct mbuf *mb_ntry;
-	register struct mbuf *mb0;
-	register struct rtdetq *rte;
-	register struct mbuf *rte_m;
-	register u_long hash;
-	register int npkts;
-	int hlen = ip->ip_hl << 2;
-#ifdef UPCALL_TIMING
-	struct timeval tp;
-
-	GET_TIME(tp);
-#endif
-
-	mrtstat.mrts_no_route++;
-	if (mrtdebug & (DEBUG_FORWARD | DEBUG_MFC))
-	    log(LOG_DEBUG, "ip_mforward: no rte s %x g %x\n",
-		ntohl(ip->ip_src.s_addr),
-		ntohl(ip->ip_dst.s_addr));
-
-	/*
-	 * Allocate mbufs early so that we don't do extra work if we are
-	 * just going to fail anyway.  Make sure to pullup the header so
-	 * that other people can't step on it.
-	 */
-	MGET(mb_ntry, M_DONTWAIT, MT_DATA);
-	if (mb_ntry == NULL) {
-	    splx(s);
-	    return ENOBUFS;
-	}
-	mb0 = m_copy(m, 0, M_COPYALL);
-	if (mb0 && (M_HASCL(mb0) || mb0->m_len < hlen))
-	    mb0 = m_pullup(mb0, hlen);
-	if (mb0 == NULL) {
-	    m_free(mb_ntry);
-	    splx(s);
-	    return ENOBUFS;
-	}
-
-	/* is there an upcall waiting for this packet? */
-	hash = MFCHASH(ip->ip_src.s_addr, ip->ip_dst.s_addr);
-	for (mb_rt = mfctable[hash]; mb_rt; mb_rt = mb_rt->m_next) {
-	    rt = mtod(mb_rt, struct mfc *);
-	    if ((ip->ip_src.s_addr == rt->mfc_origin.s_addr) &&
-		(ip->ip_dst.s_addr == rt->mfc_mcastgrp.s_addr) &&
-		(mb_rt->m_act != NULL))
-		break;
-	}
-
-	if (mb_rt == NULL) {
-	    int i;
-	    struct igmpmsg *im;
-
-	    /* no upcall, so make a new entry */
-	    MGET(mb_rt, M_DONTWAIT, MT_MRTABLE);
-	    if (mb_rt == NULL) {
-		m_free(mb_ntry);
-		m_freem(mb0);
-		splx(s);
-		return ENOBUFS;
-	    }
-	    /* Make a copy of the header to send to the user level process */
-	    mm = m_copy(mb0, 0, hlen);
-	    if (mm == NULL) {
-		m_free(mb_ntry);
-		m_freem(mb0);
-		m_free(mb_rt);
-		splx(s);
-		return ENOBUFS;
-	    }
-
-	    /* 
-	     * Send message to routing daemon to install 
-	     * a route into the kernel table
-	     */
-	    k_igmpsrc.sin_addr = ip->ip_src;
-	    
-	    im = mtod(mm, struct igmpmsg *);
-	    im->im_msgtype	= IGMPMSG_NOCACHE;
-	    im->im_mbz		= 0;
-
-	    mrtstat.mrts_upcalls++;
-
-	    if (socket_send(ip_mrouter, mm, &k_igmpsrc) < 0) {
-		log(LOG_WARNING, "ip_mforward: ip_mrouter socket queue full\n");
-		++mrtstat.mrts_upq_sockfull;
-		m_free(mb_ntry);
-		m_freem(mb0);
-		m_free(mb_rt);
-		splx(s);
-		return ENOBUFS;
-	    }
-
-	    rt = mtod(mb_rt, struct mfc *);
-
-	    /* insert new entry at head of hash chain */
-	    rt->mfc_origin.s_addr     = ip->ip_src.s_addr;
-	    rt->mfc_mcastgrp.s_addr   = ip->ip_dst.s_addr;
-	    rt->mfc_expire	      = UPCALL_EXPIRE;
-	    nexpire[hash]++;
-	    for (i = 0; i < numvifs; i++)
-		rt->mfc_ttls[i] = 0;
-	    rt->mfc_parent = -1;
-
-	    /* link into table */
-	    mb_rt->m_next  = mfctable[hash];
-	    mfctable[hash] = mb_rt;
-	    mb_rt->m_act = NULL;
-
-	    rte_m = mb_rt;
-	} else {
-	    /* determine if q has overflowed */
-	    for (rte_m = mb_rt, npkts = 0; rte_m->m_act; rte_m = rte_m->m_act)
-		npkts++;
-
-	    if (npkts > MAX_UPQ) {
-		mrtstat.mrts_upq_ovflw++;
-		m_free(mb_ntry);
-		m_freem(mb0);
-		splx(s);
-		return 0;
-	    }
-	}
-
-	mb_ntry->m_act = NULL;
-	rte = mtod(mb_ntry, struct rtdetq *);
-
-	rte->m 			= mb0;
-	rte->ifp 		= ifp;
-#ifdef UPCALL_TIMING
-	rte->t			= tp;
-#endif
-
-	/* Add this entry to the end of the queue */
-	rte_m->m_act		= mb_ntry;
-
-	splx(s);
-
-	return 0;
-    }		
-}
-
-#ifndef MROUTE_LKM
-int (*ip_mforward)(struct ip *, struct ifnet *, struct mbuf *,
-		   struct ip_moptions *) = X_ip_mforward;
-#endif
-
-/*
- * Clean up the cache entry if upcall is not serviced
- */
-static void
-expire_upcalls(void *unused)
-{
-    struct mbuf *mb_rt, *m, **nptr;
-    struct rtdetq *rte;
-    struct mfc *mfc;
-    int i;
-    int s;
-
-    s = splnet();
-    for (i = 0; i < MFCTBLSIZ; i++) {
-	if (nexpire[i] == 0)
-	    continue;
-	nptr = &mfctable[i];
-	for (mb_rt = *nptr; mb_rt != NULL; mb_rt = *nptr) {
-	    mfc = mtod(mb_rt, struct mfc *);
-
-	    /*
-	     * Skip real cache entries
-	     * Make sure it wasn't marked to not expire (shouldn't happen)
-	     * If it expires now
-	     */
-	    if (mb_rt->m_act != NULL &&
-	        mfc->mfc_expire != 0 &&
-		--mfc->mfc_expire == 0) {
-		if (mrtdebug & DEBUG_EXPIRE)
-		    log(LOG_DEBUG, "expire_upcalls: expiring (%x %x)\n",
-			ntohl(mfc->mfc_origin.s_addr),
-			ntohl(mfc->mfc_mcastgrp.s_addr));
-		/*
-		 * drop all the packets
-		 * free the mbuf with the pkt, if, timing info
-		 */
-		while (mb_rt->m_act) {
-		    m = mb_rt->m_act;
-		    mb_rt->m_act = m->m_act;
-	     
-		    rte = mtod(m, struct rtdetq *);
-		    m_freem(rte->m);
-		    m_free(m);
-		}
-		++mrtstat.mrts_cache_cleanups;
-		nexpire[i]--;
-
-		MFREE(mb_rt, *nptr);
-	    } else {
-		nptr = &mb_rt->m_next;
-	    }
-	}
-    }
-    splx(s);
-    timeout(expire_upcalls, (caddr_t)NULL, EXPIRE_TIMEOUT);
-}
-
-/*
- * Packet forwarding routine once entry in the cache is made
- */
-static int
-ip_mdq(m, ifp, rt, xmt_vif)
-    register struct mbuf *m;
-    register struct ifnet *ifp;
-    register struct mfc *rt;
-    register vifi_t xmt_vif;
-{
-    register struct ip  *ip = mtod(m, struct ip *);
-    register vifi_t vifi;
-    register struct vif *vifp;
-    register int plen = ntohs(ip->ip_len);
-
-/*
- * Macro to send packet on vif.  Since RSVP packets don't get counted on
- * input, they shouldn't get counted on output, so statistics keeping is
- * seperate.
- */
-#define MC_SEND(ip,vifp,m) {                             \
-                if ((vifp)->v_flags & VIFF_TUNNEL)  	 \
-                    encap_send((ip), (vifp), (m));       \
-                else                                     \
-                    phyint_send((ip), (vifp), (m));      \
-}
-
-    /*
-     * If xmt_vif is not -1, send on only the requested vif.
-     *
-     * (since vifi_t is u_short, -1 becomes MAXUSHORT, which > numvifs.)
-     */
-    if (xmt_vif < numvifs) {
-	MC_SEND(ip, viftable + xmt_vif, m);
-	return 1;
-    }
-
-    /*
-     * Don't forward if it didn't arrive from the parent vif for its origin.
-     */
-    vifi = rt->mfc_parent;
-    if ((vifi >= numvifs) || (viftable[vifi].v_ifp != ifp)) {
-	/* came in the wrong interface */
-	if (mrtdebug & DEBUG_FORWARD)
-	    log(LOG_DEBUG, "wrong if: ifp %x vifi %d vififp %x\n",
-		ifp, vifi, viftable[vifi].v_ifp); 
-	++mrtstat.mrts_wrong_if;
-	++rt->mfc_wrong_if;
-	/*
-	 * If we are doing PIM assert processing, and we are forwarding
-	 * packets on this interface, and it is a broadcast medium
-	 * interface (and not a tunnel), send a message to the routing daemon.
-	 */
-	if (pim_assert && rt->mfc_ttls[vifi] &&
-		(ifp->if_flags & IFF_BROADCAST) &&
-		!(viftable[vifi].v_flags & VIFF_TUNNEL)) {
-	    struct sockaddr_in k_igmpsrc;
-	    struct mbuf *mm;
-	    struct igmpmsg *im;
-	    int hlen = ip->ip_hl << 2;
-	    struct timeval now;
-	    register u_long delta;
-
-	    GET_TIME(now);
-
-	    TV_DELTA(rt->mfc_last_assert, now, delta);
-
-	    if (delta > ASSERT_MSG_TIME) {
-		mm = m_copy(m, 0, hlen);
-		if (mm && (M_HASCL(mm) || mm->m_len < hlen))
-		    mm = m_pullup(mm, hlen);
-		if (mm == NULL) {
-		    return ENOBUFS;
-		}
-
-		rt->mfc_last_assert = now;
-
-		im = mtod(mm, struct igmpmsg *);
-		im->im_msgtype	= IGMPMSG_WRONGVIF;
-		im->im_mbz		= 0;
-		im->im_vif		= vifi;
-
-		k_igmpsrc.sin_addr = im->im_src;
-
-		socket_send(ip_mrouter, mm, &k_igmpsrc);
-	    }
-	}
-	return 0;
-    }
-
-    /* If I sourced this packet, it counts as output, else it was input. */
-    if (ip->ip_src.s_addr == viftable[vifi].v_lcl_addr.s_addr) {
-	viftable[vifi].v_pkt_out++;
-	viftable[vifi].v_bytes_out += plen;
-    } else {
-	viftable[vifi].v_pkt_in++;
-	viftable[vifi].v_bytes_in += plen;
-    }
-    rt->mfc_pkt_cnt++;
-    rt->mfc_byte_cnt += plen;
-
-    /*
-     * For each vif, decide if a copy of the packet should be forwarded.
-     * Forward if:
-     *		- the ttl exceeds the vif's threshold
-     *		- there are group members downstream on interface
-     */
-    for (vifp = viftable, vifi = 0; vifi < numvifs; vifp++, vifi++)
-	if ((rt->mfc_ttls[vifi] > 0) &&
-	    (ip->ip_ttl > rt->mfc_ttls[vifi])) {
-	    vifp->v_pkt_out++;
-	    vifp->v_bytes_out += plen;
-	    MC_SEND(ip, vifp, m);
-	}
-
-    return 0;
-}
-
-/*
- * check if a vif number is legal/ok. This is used by ip_output, to export
- * numvifs there, 
- */
-static int
-X_legal_vif_num(vif)
-    int vif;
-{
-    if (vif >= 0 && vif < numvifs)
-       return(1);
-    else
-       return(0);
-}
-
-#ifndef MROUTE_LKM
-int (*legal_vif_num)(int) = X_legal_vif_num;
-#endif
-
-/*
- * Return the local address used by this vif
- */
-static u_long
-X_ip_mcast_src(vifi)
-    int vifi;
-{
-    if (vifi >= 0 && vifi < numvifs)
-	return viftable[vifi].v_lcl_addr.s_addr;
-    else
-	return INADDR_ANY;
-}
-
-#ifndef MROUTE_LKM
-u_long (*ip_mcast_src)(int) = X_ip_mcast_src;
-#endif
-
-static void
-phyint_send(ip, vifp, m)
-    struct ip *ip;
-    struct vif *vifp;
-    struct mbuf *m;
-{
-    register struct mbuf *mb_copy;
-    register int hlen = ip->ip_hl << 2;
-
-    /*
-     * Make a new reference to the packet; make sure that
-     * the IP header is actually copied, not just referenced,
-     * so that ip_output() only scribbles on the copy.
-     */
-    mb_copy = m_copy(m, 0, M_COPYALL);
-    if (mb_copy && (M_HASCL(mb_copy) || mb_copy->m_len < hlen))
-	mb_copy = m_pullup(mb_copy, hlen);
-    if (mb_copy == NULL)
-	return;
-
-    if (vifp->v_rate_limit <= 0)
-	tbf_send_packet(vifp, mb_copy);
-    else
-	tbf_control(vifp, mb_copy, mtod(mb_copy, struct ip *), ip->ip_len);
-}
-
-static void
-encap_send(ip, vifp, m)
-    register struct ip *ip;
-    register struct vif *vifp;
-    register struct mbuf *m;
-{
-    register struct mbuf *mb_copy;
-    register struct ip *ip_copy;
-    register int i, len = ip->ip_len;
-
-    /*
-     * copy the old packet & pullup it's IP header into the
-     * new mbuf so we can modify it.  Try to fill the new
-     * mbuf since if we don't the ethernet driver will.
-     */
-    MGETHDR(mb_copy, M_DONTWAIT, MT_HEADER);
-    if (mb_copy == NULL)
-	return;
-    mb_copy->m_data += max_linkhdr;
-    mb_copy->m_len = sizeof(multicast_encap_iphdr);
-
-    if ((mb_copy->m_next = m_copy(m, 0, M_COPYALL)) == NULL) {
-	m_freem(mb_copy);
-	return;
-    }
-    i = MHLEN - M_LEADINGSPACE(mb_copy);
-    if (i > len)
-	i = len;
-    mb_copy = m_pullup(mb_copy, i);
-    if (mb_copy == NULL)
-	return;
-    mb_copy->m_pkthdr.len = len + sizeof(multicast_encap_iphdr);
-
-    /*
-     * fill in the encapsulating IP header.
-     */
-    ip_copy = mtod(mb_copy, struct ip *);
-    *ip_copy = multicast_encap_iphdr;
-    ip_copy->ip_id = htons(ip_id++);
-    ip_copy->ip_len += len;
-    ip_copy->ip_src = vifp->v_lcl_addr;
-    ip_copy->ip_dst = vifp->v_rmt_addr;
-
-    /*
-     * turn the encapsulated IP header back into a valid one.
-     */
-    ip = (struct ip *)((caddr_t)ip_copy + sizeof(multicast_encap_iphdr));
-    --ip->ip_ttl;
-    HTONS(ip->ip_len);
-    HTONS(ip->ip_off);
-    ip->ip_sum = 0;
-    mb_copy->m_data += sizeof(multicast_encap_iphdr);
-    ip->ip_sum = in_cksum(mb_copy, ip->ip_hl << 2);
-    mb_copy->m_data -= sizeof(multicast_encap_iphdr);
-
-    if (vifp->v_rate_limit <= 0)
-	tbf_send_packet(vifp, mb_copy);
-    else
-	tbf_control(vifp, mb_copy, ip, ip_copy->ip_len);
-}
-
-/*
- * De-encapsulate a packet and feed it back through ip input (this
- * routine is called whenever IP gets a packet with proto type
- * ENCAP_PROTO and a local destination address).
- */
-void
-#ifdef MROUTE_LKM
-X_ipip_input(m, iphlen)
-#else
-ipip_input(m, iphlen)
-#endif
-	register struct mbuf *m;
-	int iphlen;
-{
-    struct ifnet *ifp = m->m_pkthdr.rcvif;
-    register struct ip *ip = mtod(m, struct ip *);
-    register int hlen = ip->ip_hl << 2;
-    register int s;
-    register struct ifqueue *ifq;
-    register struct vif *vifp;
-
-    if (!have_encap_tunnel) {
-	    rip_input(m, iphlen);
-	    return;
-    }
-    /*
-     * dump the packet if it's not to a multicast destination or if
-     * we don't have an encapsulating tunnel with the source.
-     * Note:  This code assumes that the remote site IP address
-     * uniquely identifies the tunnel (i.e., that this site has
-     * at most one tunnel with the remote site).
-     */
-    if (! IN_MULTICAST(ntohl(((struct ip *)((char *)ip + hlen))->ip_dst.s_addr))) {
-	++mrtstat.mrts_bad_tunnel;
-	m_freem(m);
-	return;
-    }
-    if (ip->ip_src.s_addr != last_encap_src) {
-	register struct vif *vife;
-	
-	vifp = viftable;
-	vife = vifp + numvifs;
-	last_encap_src = ip->ip_src.s_addr;
-	last_encap_vif = 0;
-	for ( ; vifp < vife; ++vifp)
-	    if (vifp->v_rmt_addr.s_addr == ip->ip_src.s_addr) {
-		if ((vifp->v_flags & (VIFF_TUNNEL|VIFF_SRCRT))
-		    == VIFF_TUNNEL)
-		    last_encap_vif = vifp;
-		break;
-	    }
-    }
-    if ((vifp = last_encap_vif) == 0) {
-	last_encap_src = 0;
-	mrtstat.mrts_cant_tunnel++; /*XXX*/
-	m_freem(m);
-	if (mrtdebug)
-          log(LOG_DEBUG, "ip_mforward: no tunnel with %x\n",
-		ntohl(ip->ip_src.s_addr));
-	return;
-    }
-    ifp = vifp->v_ifp;
-
-    if (hlen > IP_HDR_LEN)
-      ip_stripoptions(m, (struct mbuf *) 0);
-    m->m_data += IP_HDR_LEN;
-    m->m_len -= IP_HDR_LEN;
-    m->m_pkthdr.len -= IP_HDR_LEN;
-    m->m_pkthdr.rcvif = ifp;
-
-    ifq = &ipintrq;
-    s = splimp();
-    if (IF_QFULL(ifq)) {
-	IF_DROP(ifq);
-	m_freem(m);
-    } else {
-	IF_ENQUEUE(ifq, m);
-	/*
-	 * normally we would need a "schednetisr(NETISR_IP)"
-	 * here but we were called by ip_input and it is going
-	 * to loop back & try to dequeue the packet we just
-	 * queued as soon as we return so we avoid the
-	 * unnecessary software interrrupt.
-	 */
-    }
-    splx(s);
-}
-
-/*
- * Token bucket filter module
- */
-
-static void
-tbf_control(vifp, m, ip, p_len)
-	register struct vif *vifp;
-	register struct mbuf *m;
-	register struct ip *ip;
-	register u_long p_len;
-{
-    register struct tbf *t = vifp->v_tbf;
-
-    if (p_len > MAX_BKT_SIZE) {
-	/* drop if packet is too large */
-	mrtstat.mrts_pkt2large++;
-	m_freem(m);
-	return;
-    }
-
-    tbf_update_tokens(vifp);
-
-    /* if there are enough tokens, 
-     * and the queue is empty,
-     * send this packet out
-     */
-
-    if (t->tbf_q_len == 0) {
-	/* queue empty, send packet if enough tokens */
-	if (p_len <= t->tbf_n_tok) {
-	    t->tbf_n_tok -= p_len;
-	    tbf_send_packet(vifp, m);
-	} else {
-	    /* queue packet and timeout till later */
-	    tbf_queue(vifp, m);
-	    timeout(tbf_reprocess_q, (caddr_t)vifp, TBF_REPROCESS);
-	}
-    } else if (t->tbf_q_len < t->tbf_max_q_len) {
-	/* finite queue length, so queue pkts and process queue */
-	tbf_queue(vifp, m);
-	tbf_process_q(vifp);
-    } else {
-	/* queue length too much, try to dq and queue and process */
-	if (!tbf_dq_sel(vifp, ip)) {
-	    mrtstat.mrts_q_overflow++;
-	    m_freem(m);
-	    return;
-	} else {
-	    tbf_queue(vifp, m);
-	    tbf_process_q(vifp);
-	}
-    }
-    return;
-}
-
-/* 
- * adds a packet to the queue at the interface
- */
-static void
-tbf_queue(vifp, m) 
-	register struct vif *vifp;
-	register struct mbuf *m;
-{
-    register int s = splnet();
-    register struct tbf *t = vifp->v_tbf;
-
-    if (t->tbf_t == NULL) {
-	/* Queue was empty */
-	t->tbf_q = m;
-    } else {
-	/* Insert at tail */
-	t->tbf_t->m_act = m;
-    }
-
-    /* Set new tail pointer */
-    t->tbf_t = m;
-
-#ifdef DIAGNOSTIC
-    /* Make sure we didn't get fed a bogus mbuf */
-    if (m->m_act)
-	panic("tbf_queue: m_act");
-#endif
-    m->m_act = NULL;
-
-    t->tbf_q_len++;
-
-    splx(s);
-}
-
-
-/* 
- * processes the queue at the interface
- */
-static void
-tbf_process_q(vifp)
-    register struct vif *vifp;
-{
-    register struct mbuf *m;
-    register int len;
-    register int s = splnet();
-    register struct tbf *t = vifp->v_tbf;
-
-    /* loop through the queue at the interface and send as many packets
-     * as possible
-     */
-    while (t->tbf_q_len > 0) {
-	m = t->tbf_q;
-
-	len = mtod(m, struct ip *)->ip_len;
-
-	/* determine if the packet can be sent */
-	if (len <= t->tbf_n_tok) {
-	    /* if so,
-	     * reduce no of tokens, dequeue the packet,
-	     * send the packet.
-	     */
-	    t->tbf_n_tok -= len;
-
-	    t->tbf_q = m->m_act;
-	    if (--t->tbf_q_len == 0)
-		t->tbf_t = NULL;
-
-	    m->m_act = NULL;
-	    tbf_send_packet(vifp, m);
-
-	} else break;
-    }
-    splx(s);
-}
-
-static void
-tbf_reprocess_q(xvifp)
-	void *xvifp;
-{
-    register struct vif *vifp = xvifp;
-    if (ip_mrouter == NULL) 
-	return;
-
-    tbf_update_tokens(vifp);
-
-    tbf_process_q(vifp);
-
-    if (vifp->v_tbf->tbf_q_len)
-	timeout(tbf_reprocess_q, (caddr_t)vifp, TBF_REPROCESS);
-}
-
-/* function that will selectively discard a member of the queue
- * based on the precedence value and the priority
- */
-static int
-tbf_dq_sel(vifp, ip)
-    register struct vif *vifp;
-    register struct ip *ip;
-{
-    register int s = splnet();
-    register u_int p;
-    register struct mbuf *m, *last;
-    register struct mbuf **np;
-    register struct tbf *t = vifp->v_tbf;
-
-    p = priority(vifp, ip);
-
-    np = &t->tbf_q;
-    last = NULL;
-    while ((m = *np) != NULL) {
-	if (p > priority(vifp, mtod(m, struct ip *))) {
-	    *np = m->m_act;
-	    /* If we're removing the last packet, fix the tail pointer */
-	    if (m == t->tbf_t)
-		t->tbf_t = last;
-	    m_freem(m);
-	    /* it's impossible for the queue to be empty, but
-	     * we check anyway. */
-	    if (--t->tbf_q_len == 0)
-		t->tbf_t = NULL;
-	    splx(s);
-	    mrtstat.mrts_drop_sel++;
-	    return(1);
-	}
-	np = &m->m_act;
-	last = m;
-    }
-    splx(s);
-    return(0);
-}
-
-static void
-tbf_send_packet(vifp, m)
-    register struct vif *vifp;
-    register struct mbuf *m;
-{
-    struct ip_moptions imo;
-    int error;
-    static struct route ro;
-    int s = splnet();
-
-    if (vifp->v_flags & VIFF_TUNNEL) {
-	/* If tunnel options */
-	ip_output(m, (struct mbuf *)0, &vifp->v_route,
-		  IP_FORWARDING, (struct ip_moptions *)0);
-    } else {
-	imo.imo_multicast_ifp  = vifp->v_ifp;
-	imo.imo_multicast_ttl  = mtod(m, struct ip *)->ip_ttl - 1;
-	imo.imo_multicast_loop = 1;
-	imo.imo_multicast_vif  = -1;
-
-	/*
-	 * Re-entrancy should not be a problem here, because
-	 * the packets that we send out and are looped back at us
-	 * should get rejected because they appear to come from
-	 * the loopback interface, thus preventing looping.
-	 */
-	error = ip_output(m, (struct mbuf *)0, &ro,
-			  IP_FORWARDING, &imo);
-
-	if (mrtdebug & DEBUG_XMIT)
-	    log(LOG_DEBUG, "phyint_send on vif %d err %d\n", 
-		vifp - viftable, error);
-    }
-    splx(s);
-}
-
-/* determine the current time and then
- * the elapsed time (between the last time and time now)
- * in milliseconds & update the no. of tokens in the bucket
- */
-static void
-tbf_update_tokens(vifp)
-    register struct vif *vifp;
-{
-    struct timeval tp;
-    register u_long tm;
-    register int s = splnet();
-    register struct tbf *t = vifp->v_tbf;
-
-    GET_TIME(tp);
-
-    TV_DELTA(tp, t->tbf_last_pkt_t, tm);
-
-    /*
-     * This formula is actually
-     * "time in seconds" * "bytes/second".
-     *
-     * (tm / 1000000) * (v_rate_limit * 1000 * (1000/1024) / 8)
-     *
-     * The (1000/1024) was introduced in add_vif to optimize
-     * this divide into a shift.
-     */
-    t->tbf_n_tok += tm * vifp->v_rate_limit / 1024 / 8;
-    t->tbf_last_pkt_t = tp;
-
-    if (t->tbf_n_tok > MAX_BKT_SIZE)
-	t->tbf_n_tok = MAX_BKT_SIZE;
-
-    splx(s);
-}
-
-static int
-priority(vifp, ip)
-    register struct vif *vifp;
-    register struct ip *ip;
-{
-    register int prio;
-
-    /* temporary hack; may add general packet classifier some day */
-
-    /*
-     * The UDP port space is divided up into four priority ranges:
-     * [0, 16384)     : unclassified - lowest priority
-     * [16384, 32768) : audio - highest priority
-     * [32768, 49152) : whiteboard - medium priority
-     * [49152, 65536) : video - low priority
-     */
-    if (ip->ip_p == IPPROTO_UDP) {
-	struct udphdr *udp = (struct udphdr *)(((char *)ip) + (ip->ip_hl << 2));
-	switch (ntohs(udp->uh_dport) & 0xc000) {
-	    case 0x4000:
-		prio = 70;
-		break;
-	    case 0x8000:
-		prio = 60;
-		break;
-	    case 0xc000:
-		prio = 55;
-		break;
-	    default:
-		prio = 50;
-		break;
-	}
-	if (tbfdebug > 1)
-		log(LOG_DEBUG, "port %x prio%d\n", ntohs(udp->uh_dport), prio);
-    } else {
-	    prio = 50;
-    }
-    return prio;
-}
-
-/*
- * End of token bucket filter modifications 
- */
-
-int
-ip_rsvp_vif_init(so, m)
-    struct socket *so;
-    struct mbuf *m;
-{
-    int i;
-    register int s;
-
-    if (rsvpdebug)
-	printf("ip_rsvp_vif_init: so_type = %d, pr_protocol = %d\n",
-	       so->so_type, so->so_proto->pr_protocol);
-
-    if (so->so_type != SOCK_RAW || so->so_proto->pr_protocol != IPPROTO_RSVP)
-	return EOPNOTSUPP;
-
-    /* Check mbuf. */
-    if (m == NULL || m->m_len != sizeof(int)) {
-	return EINVAL;
-    }
-    i = *(mtod(m, int *));
- 
-    if (rsvpdebug)
-	printf("ip_rsvp_vif_init: vif = %d rsvp_on = %d\n",i,rsvp_on);
- 
-    s = splnet();
-
-    /* Check vif. */
-    if (!legal_vif_num(i)) {
-	splx(s);
-	return EADDRNOTAVAIL;
-    }
-
-    /* Check if socket is available. */
-    if (viftable[i].v_rsvpd != NULL) {
-	splx(s);
-	return EADDRINUSE;
-    }
-
-    viftable[i].v_rsvpd = so;
-    /* This may seem silly, but we need to be sure we don't over-increment
-     * the RSVP counter, in case something slips up.
-     */
-    if (!viftable[i].v_rsvp_on) {
-	viftable[i].v_rsvp_on = 1;
-	rsvp_on++;
-    }
-
-    splx(s);
-    return 0;
-}
-
-int
-ip_rsvp_vif_done(so, m)
-    struct socket *so;
-    struct mbuf *m;
-{
-	int i;
-	register int s;
- 
-    if (rsvpdebug)
-	printf("ip_rsvp_vif_done: so_type = %d, pr_protocol = %d\n",
-	       so->so_type, so->so_proto->pr_protocol);
- 
-    if (so->so_type != SOCK_RAW || so->so_proto->pr_protocol != IPPROTO_RSVP)
-	return EOPNOTSUPP;
- 
-    /* Check mbuf. */
-    if (m == NULL || m->m_len != sizeof(int)) {
-	    return EINVAL;
-    }
-    i = *(mtod(m, int *));
- 
-    s = splnet();
- 
-    /* Check vif. */
-    if (!legal_vif_num(i)) {
-	splx(s);
-        return EADDRNOTAVAIL;
-    }
-
-    if (rsvpdebug)
-	printf("ip_rsvp_vif_done: v_rsvpd = %p so = %p\n",
-	       viftable[i].v_rsvpd, so);
-
-    viftable[i].v_rsvpd = NULL;
-    /* This may seem silly, but we need to be sure we don't over-decrement
-     * the RSVP counter, in case something slips up.
-     */
-    if (viftable[i].v_rsvp_on) {
-	viftable[i].v_rsvp_on = 0;
-	rsvp_on--;
-    }
-
-    splx(s);
-    return 0;
-}
-
-void
-ip_rsvp_force_done(so)
-    struct socket *so;
-{
-    int vifi;
-    register int s;
-
-    /* Don't bother if it is not the right type of socket. */
-    if (so->so_type != SOCK_RAW || so->so_proto->pr_protocol != IPPROTO_RSVP)
-	return;
-
-    s = splnet();
-
-    /* The socket may be attached to more than one vif...this
-     * is perfectly legal.
-     */
-    for (vifi = 0; vifi < numvifs; vifi++) {
-	if (viftable[vifi].v_rsvpd == so) {
-	    viftable[vifi].v_rsvpd = NULL;
-	    /* This may seem silly, but we need to be sure we don't
-	     * over-decrement the RSVP counter, in case something slips up.
-	     */
-	    if (viftable[vifi].v_rsvp_on) {
-		viftable[vifi].v_rsvp_on = 0;
-		rsvp_on--;
-	    }
-	}
-    }
-
-    splx(s);
-    return;
-}
-
-void
-rsvp_input(m, iphlen)
-	struct mbuf *m;
-	int iphlen;
-{
-    int vifi;
-    register struct ip *ip = mtod(m, struct ip *);
-    static struct sockaddr_in rsvp_src = { sizeof rsvp_src, AF_INET };
-    register int s;
-    struct ifnet *ifp;
-
-    if (rsvpdebug)
-	printf("rsvp_input: rsvp_on %d\n",rsvp_on);
-
-    /* Can still get packets with rsvp_on = 0 if there is a local member
-     * of the group to which the RSVP packet is addressed.  But in this
-     * case we want to throw the packet away.
-     */
-    if (!rsvp_on) {
-	m_freem(m);
-	return;
-    }
-
-    /* If the old-style non-vif-associated socket is set, then use
-     * it and ignore the new ones.
-     */
-    if (ip_rsvpd != NULL) {
-	if (rsvpdebug)
-	    printf("rsvp_input: Sending packet up old-style socket\n");
-	rip_input(m, iphlen);
-	return;
-    }
-
-    s = splnet();
-
-    if (rsvpdebug)
-	printf("rsvp_input: check vifs\n");
-
-#ifdef DIAGNOSTIC
-    if (!(m->m_flags & M_PKTHDR))
-	    panic("rsvp_input no hdr");
-#endif
-
-    ifp = m->m_pkthdr.rcvif;
-    /* Find which vif the packet arrived on. */
-    for (vifi = 0; vifi < numvifs; vifi++) {
-	if (viftable[vifi].v_ifp == ifp)
- 		break;
- 	}
- 
-    if (vifi == numvifs) {
-	/* Can't find vif packet arrived on. Drop packet. */
-	if (rsvpdebug)
-	    printf("rsvp_input: Can't find vif for packet...dropping it.\n");
-	m_freem(m);
-	splx(s);
-	return;
-    }
-
-    if (rsvpdebug)
-	printf("rsvp_input: check socket\n");
-
-    if (viftable[vifi].v_rsvpd == NULL) {
-	/* drop packet, since there is no specific socket for this
-	 * interface */
-	    if (rsvpdebug)
-		    printf("rsvp_input: No socket defined for vif %d\n",vifi);
-	    m_freem(m);
-	    splx(s);
-	    return;
-    }
-    rsvp_src.sin_addr = ip->ip_src;
-
-    if (rsvpdebug && m)
-	printf("rsvp_input: m->m_len = %d, sbspace() = %ld\n",
-	       m->m_len,sbspace(&(viftable[vifi].v_rsvpd->so_rcv)));
-
-    if (socket_send(viftable[vifi].v_rsvpd, m, &rsvp_src) < 0)
-	if (rsvpdebug)
-	    printf("rsvp_input: Failed to append to socket\n");
-    else
-	if (rsvpdebug)
-	    printf("rsvp_input: send packet up\n");
-    
-    splx(s);
-}
-
-#ifdef MROUTE_LKM
-#include <sys/conf.h>
-#include <sys/exec.h>
-#include <sys/sysent.h>
-#include <sys/lkm.h>
-
-MOD_MISC("ip_mroute_mod")
-
-static int
-ip_mroute_mod_handle(struct lkm_table *lkmtp, int cmd)
-{
-	int i;
-	struct lkm_misc	*args = lkmtp->private.lkm_misc;
-	int err = 0;
-
-	switch(cmd) {
-		static int (*old_ip_mrouter_cmd)();
-		static int (*old_ip_mrouter_done)();
-		static int (*old_ip_mforward)();
-		static int (*old_mrt_ioctl)();
-		static void (*old_proto4_input)();
-		static int (*old_legal_vif_num)();
-		extern struct protosw inetsw[];
-
-	case LKM_E_LOAD:
-		if(lkmexists(lkmtp) || ip_mrtproto)
-		  return(EEXIST);
-		old_ip_mrouter_cmd = ip_mrouter_cmd;
-		ip_mrouter_cmd = X_ip_mrouter_cmd;
-		old_ip_mrouter_done = ip_mrouter_done;
-		ip_mrouter_done = X_ip_mrouter_done;
-		old_ip_mforward = ip_mforward;
-		ip_mforward = X_ip_mforward;
-		old_mrt_ioctl = mrt_ioctl;
-		mrt_ioctl = X_mrt_ioctl;
-              old_proto4_input = inetsw[ip_protox[ENCAP_PROTO]].pr_input;
-              inetsw[ip_protox[ENCAP_PROTO]].pr_input = X_ipip_input;
-		old_legal_vif_num = legal_vif_num;
-		legal_vif_num = X_legal_vif_num;
-		ip_mrtproto = IGMP_DVMRP;
-
-		printf("\nIP multicast routing loaded\n");
-		break;
-
-	case LKM_E_UNLOAD:
-		if (ip_mrouter)
-		  return EINVAL;
-
-		ip_mrouter_cmd = old_ip_mrouter_cmd;
-		ip_mrouter_done = old_ip_mrouter_done;
-		ip_mforward = old_ip_mforward;
-		mrt_ioctl = old_mrt_ioctl;
-              inetsw[ip_protox[ENCAP_PROTO]].pr_input = old_proto4_input;
-		legal_vif_num = old_legal_vif_num;
-		ip_mrtproto = 0;
-		break;
-
-	default:
-		err = EINVAL;
-		break;
-	}
-
-	return(err);
-}
-
-int
-ip_mroute_mod(struct lkm_table *lkmtp, int cmd, int ver) {
-	DISPATCH(lkmtp, cmd, ver, ip_mroute_mod_handle, ip_mroute_mod_handle,
-		 nosys);
-}
-
-#endif /* MROUTE_LKM */
-#endif /* MROUTING */
diff --git a/c/src/exec/libnetworking/netinet/ip_mroute.h b/c/src/exec/libnetworking/netinet/ip_mroute.h
deleted file mode 100644
index 5ddd6799d2..0000000000
--- a/c/src/exec/libnetworking/netinet/ip_mroute.h
+++ /dev/null
@@ -1,262 +0,0 @@
-/*
- * Copyright (c) 1989 Stephen Deering.
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Stephen Deering of Stanford University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)ip_mroute.h	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#ifndef _NETINET_IP_MROUTE_H_
-#define _NETINET_IP_MROUTE_H_
-
-/*
- * Definitions for IP multicast forwarding.
- *
- * Written by David Waitzman, BBN Labs, August 1988.
- * Modified by Steve Deering, Stanford, February 1989.
- * Modified by Ajit Thyagarajan, PARC, August 1993.
- * Modified by Ajit Thyagarajan, PARC, August 1994.
- *
- * MROUTING Revision: 3.3.1.3
- */
-
-
-/*
- * Multicast Routing set/getsockopt commands.
- */
-#define	MRT_INIT	100	/* initialize forwarder */
-#define	MRT_DONE	101	/* shut down forwarder */
-#define	MRT_ADD_VIF	102	/* create virtual interface */
-#define	MRT_DEL_VIF	103	/* delete virtual interface */
-#define MRT_ADD_MFC	104	/* insert forwarding cache entry */
-#define MRT_DEL_MFC	105	/* delete forwarding cache entry */
-#define MRT_VERSION	106	/* get kernel version number */
-#define MRT_ASSERT      107     /* enable PIM assert processing */
-
-
-#define GET_TIME(t)	microtime(&t)
-
-/*
- * Types and macros for handling bitmaps with one bit per virtual interface.
- */
-#define	MAXVIFS 32
-typedef u_long vifbitmap_t;
-typedef u_short vifi_t;		/* type of a vif index */
-#define ALL_VIFS (vifi_t)-1
-
-#define	VIFM_SET(n, m)		((m) |= (1 << (n)))
-#define	VIFM_CLR(n, m)		((m) &= ~(1 << (n)))
-#define	VIFM_ISSET(n, m)	((m) & (1 << (n)))
-#define	VIFM_CLRALL(m)		((m) = 0x00000000)
-#define	VIFM_COPY(mfrom, mto)	((mto) = (mfrom))
-#define	VIFM_SAME(m1, m2)	((m1) == (m2))
-
-
-/*
- * Argument structure for MRT_ADD_VIF.
- * (MRT_DEL_VIF takes a single vifi_t argument.)
- */
-struct vifctl {
-	vifi_t	vifc_vifi;	    	/* the index of the vif to be added */
-	u_char	vifc_flags;     	/* VIFF_ flags defined below */
-	u_char	vifc_threshold; 	/* min ttl required to forward on vif */
-	u_int	vifc_rate_limit;	/* max rate */
-	struct	in_addr vifc_lcl_addr;	/* local interface address */
-	struct	in_addr vifc_rmt_addr;	/* remote address (tunnels only) */
-};
-
-#define	VIFF_TUNNEL	0x1		/* vif represents a tunnel end-point */
-#define VIFF_SRCRT	0x2		/* tunnel uses IP source routing */
-
-/*
- * Argument structure for MRT_ADD_MFC and MRT_DEL_MFC
- * (mfcc_tos to be added at a future point)
- */
-struct mfcctl {
-    struct in_addr  mfcc_origin;		/* ip origin of mcasts       */
-    struct in_addr  mfcc_mcastgrp; 		/* multicast group associated*/
-    vifi_t	    mfcc_parent;   		/* incoming vif              */
-    u_char	    mfcc_ttls[MAXVIFS]; 	/* forwarding ttls on vifs   */
-};
-
-/*
- * The kernel's multicast routing statistics.
- */
-struct mrtstat {
-    u_long	mrts_mfc_lookups;	/* # forw. cache hash table hits   */
-    u_long	mrts_mfc_misses;	/* # forw. cache hash table misses */
-    u_long	mrts_upcalls;		/* # calls to mrouted              */
-    u_long	mrts_no_route;		/* no route for packet's origin    */
-    u_long	mrts_bad_tunnel;	/* malformed tunnel options        */
-    u_long	mrts_cant_tunnel;	/* no room for tunnel options      */
-    u_long	mrts_wrong_if;		/* arrived on wrong interface	   */
-    u_long	mrts_upq_ovflw;		/* upcall Q overflow		   */
-    u_long	mrts_cache_cleanups;	/* # entries with no upcalls 	   */
-    u_long  	mrts_drop_sel;     	/* pkts dropped selectively        */
-    u_long  	mrts_q_overflow;    	/* pkts dropped - Q overflow       */
-    u_long  	mrts_pkt2large;     	/* pkts dropped - size > BKT SIZE  */
-    u_long	mrts_upq_sockfull;	/* upcalls dropped - socket full */
-};
-
-/*
- * Argument structure used by mrouted to get src-grp pkt counts
- */
-struct sioc_sg_req {
-    struct in_addr src;
-    struct in_addr grp;
-    u_long pktcnt;
-    u_long bytecnt;
-    u_long wrong_if;
-};
-
-/*
- * Argument structure used by mrouted to get vif pkt counts
- */
-struct sioc_vif_req {
-    vifi_t vifi;		/* vif number				*/
-    u_long icount;		/* Input packet count on vif		*/
-    u_long ocount;		/* Output packet count on vif		*/
-    u_long ibytes;		/* Input byte count on vif		*/
-    u_long obytes;		/* Output byte count on vif		*/
-};
-    
-
-/*
- * The kernel's virtual-interface structure.
- */
-struct vif {
-    u_char   		v_flags;     	/* VIFF_ flags defined above         */
-    u_char   		v_threshold;	/* min ttl required to forward on vif*/
-    u_int      		v_rate_limit; 	/* max rate			     */
-    struct tbf 	       *v_tbf;       	/* token bucket structure at intf.   */
-    struct in_addr 	v_lcl_addr;   	/* local interface address           */
-    struct in_addr 	v_rmt_addr;   	/* remote address (tunnels only)     */
-    struct ifnet       *v_ifp;	     	/* pointer to interface              */
-    u_long		v_pkt_in;	/* # pkts in on interface            */
-    u_long		v_pkt_out;	/* # pkts out on interface           */
-    u_long		v_bytes_in;	/* # bytes in on interface	     */
-    u_long		v_bytes_out;	/* # bytes out on interface	     */
-    struct route	v_route;	/* cached route if this is a tunnel */
-    u_int		v_rsvp_on;	/* RSVP listening on this vif */
-    struct socket      *v_rsvpd;	/* RSVP daemon socket */
-};
-
-/*
- * The kernel's multicast forwarding cache entry structure 
- * (A field for the type of service (mfc_tos) is to be added 
- * at a future point)
- */
-struct mfc {
-    struct in_addr  mfc_origin;	 		/* IP origin of mcasts   */
-    struct in_addr  mfc_mcastgrp;  		/* multicast group associated*/
-    vifi_t	    mfc_parent; 		/* incoming vif              */
-    u_char	    mfc_ttls[MAXVIFS]; 		/* forwarding ttls on vifs   */
-    u_long	    mfc_pkt_cnt;		/* pkt count for src-grp     */
-    u_long	    mfc_byte_cnt;		/* byte count for src-grp    */
-    u_long	    mfc_wrong_if;		/* wrong if for src-grp	     */
-    int		    mfc_expire;			/* time to clean entry up    */
-    struct timeval  mfc_last_assert;		/* last time I sent an assert*/
-};
-
-/*
- * Struct used to communicate from kernel to multicast router
- * note the convenient similarity to an IP packet
- */
-struct igmpmsg {
-    u_long	    unused1;
-    u_long	    unused2;
-    u_char	    im_msgtype;			/* what type of message	    */
-#define IGMPMSG_NOCACHE		1
-#define IGMPMSG_WRONGVIF	2
-    u_char	    im_mbz;			/* must be zero		    */
-    u_char	    im_vif;			/* vif rec'd on		    */
-    u_char	    unused3;
-    struct in_addr  im_src, im_dst;
-};
-
-/*
- * Argument structure used for pkt info. while upcall is made
- */
-struct rtdetq {
-    struct mbuf 	*m;		/* A copy of the packet		    */
-    struct ifnet	*ifp;		/* Interface pkt came in on	    */
-    vifi_t		xmt_vif;	/* Saved copy of imo_multicast_vif  */
-#ifdef UPCALL_TIMING
-    struct timeval	t;		/* Timestamp */
-#endif /* UPCALL_TIMING */
-};
-
-#define MFCTBLSIZ	256
-#if (MFCTBLSIZ & (MFCTBLSIZ - 1)) == 0	  /* from sys:route.h */
-#define MFCHASHMOD(h)	((h) & (MFCTBLSIZ - 1))
-#else
-#define MFCHASHMOD(h)	((h) % MFCTBLSIZ)
-#endif
-
-#define MAX_UPQ	4		/* max. no of pkts in upcall Q */
-
-/*
- * Token Bucket filter code 
- */
-#define MAX_BKT_SIZE    10000             /* 10K bytes size 		*/
-#define MAXQSIZE        10                /* max # of pkts in queue 	*/
-
-/*
- * the token bucket filter at each vif
- */
-struct tbf
-{
-    struct timeval tbf_last_pkt_t; /* arr. time of last pkt 	*/
-    u_long tbf_n_tok;      	/* no of tokens in bucket 	*/
-    u_long tbf_q_len;    	/* length of queue at this vif	*/
-    u_long tbf_max_q_len;	/* max. queue length		*/
-    struct mbuf *tbf_q;		/* Packet queue			*/
-    struct mbuf *tbf_t;		/* tail-insertion pointer	*/
-};
-
-#ifdef KERNEL
-
-extern int	(*ip_mrouter_set) __P((int, struct socket *, struct mbuf *));
-extern int	(*ip_mrouter_get) __P((int, struct socket *, struct mbuf **));
-extern int	(*ip_mrouter_done) __P((void));
-#ifdef MROUTING
-extern int	(*mrt_ioctl) __P((int, caddr_t));
-#else
-extern int	(*mrt_ioctl) __P((int, caddr_t, struct proc *));
-#endif
-
-#endif /* KERNEL */
-
-#endif /* _NETINET_IP_MROUTE_H_ */
diff --git a/c/src/exec/libnetworking/netinet/ip_output.c b/c/src/exec/libnetworking/netinet/ip_output.c
deleted file mode 100644
index 810f6c7479..0000000000
--- a/c/src/exec/libnetworking/netinet/ip_output.c
+++ /dev/null
@@ -1,1307 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1988, 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)ip_output.c	8.3 (Berkeley) 1/21/94
- *	$Id$
- */
-
-#define _IP_VHL
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/systm.h>
-#include <sys/malloc.h>
-#include <sys/mbuf.h>
-#include <sys/errno.h>
-#include <sys/protosw.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-
-#include <net/if.h>
-#include <net/route.h>
-
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/in_pcb.h>
-#include <netinet/in_var.h>
-#include <netinet/ip_var.h>
-
-#ifdef vax
-#include <machine/mtpr.h>
-#endif
-#include <machine/in_cksum.h>
-
-#if !defined(COMPAT_IPFW) || COMPAT_IPFW == 1
-#undef COMPAT_IPFW
-#define COMPAT_IPFW 1
-#else
-#undef COMPAT_IPFW
-#endif
-
-u_short ip_id;
-
-static struct mbuf *ip_insertoptions __P((struct mbuf *, struct mbuf *, int *));
-static void	ip_mloopback
-	__P((struct ifnet *, struct mbuf *, struct sockaddr_in *, int));
-static int	ip_getmoptions
-	__P((int, struct ip_moptions *, struct mbuf **));
-static int	ip_optcopy __P((struct ip *, struct ip *));
-static int	ip_pcbopts __P((struct mbuf **, struct mbuf *));
-static int	ip_setmoptions
-	__P((int, struct ip_moptions **, struct mbuf *));
-
-extern	struct protosw inetsw[];
-
-/*
- * IP output.  The packet in mbuf chain m contains a skeletal IP
- * header (with len, off, ttl, proto, tos, src, dst).
- * The mbuf chain containing the packet will be freed.
- * The mbuf opt, if present, will not be freed.
- */
-int
-ip_output(m0, opt, ro, flags, imo)
-	struct mbuf *m0;
-	struct mbuf *opt;
-	struct route *ro;
-	int flags;
-	struct ip_moptions *imo;
-{
-	struct ip *ip, *mhip;
-	struct ifnet *ifp;
-	struct mbuf *m = m0;
-	int hlen = sizeof (struct ip);
-	int len, off, error = 0;
-	struct sockaddr_in *dst;
-	struct in_ifaddr *ia;
-	int isbroadcast;
-
-#ifdef	DIAGNOSTIC
-	if ((m->m_flags & M_PKTHDR) == 0)
-		panic("ip_output no HDR");
-	if (!ro)
-		panic("ip_output no route, proto = %d",
-		      mtod(m, struct ip *)->ip_p);
-#endif
-	if (opt) {
-		m = ip_insertoptions(m, opt, &len);
-		hlen = len;
-	}
-	ip = mtod(m, struct ip *);
-	/*
-	 * Fill in IP header.
-	 */
-	if ((flags & (IP_FORWARDING|IP_RAWOUTPUT)) == 0) {
-		ip->ip_vhl = IP_MAKE_VHL(IPVERSION, hlen >> 2);
-		ip->ip_off &= IP_DF;
-		ip->ip_id = htons(ip_id++);
-		ipstat.ips_localout++;
-	} else {
-		hlen = IP_VHL_HL(ip->ip_vhl) << 2;
-	}
-
-	dst = (struct sockaddr_in *)&ro->ro_dst;
-	/*
-	 * If there is a cached route,
-	 * check that it is to the same destination
-	 * and is still up.  If not, free it and try again.
-	 */
-	if (ro->ro_rt && ((ro->ro_rt->rt_flags & RTF_UP) == 0 ||
-	   dst->sin_addr.s_addr != ip->ip_dst.s_addr)) {
-		RTFREE(ro->ro_rt);
-		ro->ro_rt = (struct rtentry *)0;
-	}
-	if (ro->ro_rt == 0) {
-		dst->sin_family = AF_INET;
-		dst->sin_len = sizeof(*dst);
-		dst->sin_addr = ip->ip_dst;
-	}
-	/*
-	 * If routing to interface only,
-	 * short circuit routing lookup.
-	 */
-#define ifatoia(ifa)	((struct in_ifaddr *)(ifa))
-#define sintosa(sin)	((struct sockaddr *)(sin))
-	if (flags & IP_ROUTETOIF) {
-		if ((ia = ifatoia(ifa_ifwithdstaddr(sintosa(dst)))) == 0 &&
-		    (ia = ifatoia(ifa_ifwithnet(sintosa(dst)))) == 0) {
-			ipstat.ips_noroute++;
-			error = ENETUNREACH;
-			goto bad;
-		}
-		ifp = ia->ia_ifp;
-		ip->ip_ttl = 1;
-		isbroadcast = in_broadcast(dst->sin_addr, ifp);
-	} else {
-		/*
-		 * If this is the case, we probably don't want to allocate
-		 * a protocol-cloned route since we didn't get one from the
-		 * ULP.  This lets TCP do its thing, while not burdening
-		 * forwarding or ICMP with the overhead of cloning a route.
-		 * Of course, we still want to do any cloning requested by
-		 * the link layer, as this is probably required in all cases
-		 * for correct operation (as it is for ARP).
-		 */
-		if (ro->ro_rt == 0)
-			rtalloc_ign(ro, RTF_PRCLONING);
-		if (ro->ro_rt == 0) {
-			ipstat.ips_noroute++;
-			error = EHOSTUNREACH;
-			goto bad;
-		}
-		ia = ifatoia(ro->ro_rt->rt_ifa);
-		ifp = ro->ro_rt->rt_ifp;
-		ro->ro_rt->rt_use++;
-		if (ro->ro_rt->rt_flags & RTF_GATEWAY)
-			dst = (struct sockaddr_in *)ro->ro_rt->rt_gateway;
-		if (ro->ro_rt->rt_flags & RTF_HOST)
-			isbroadcast = (ro->ro_rt->rt_flags & RTF_BROADCAST);
-		else
-			isbroadcast = in_broadcast(dst->sin_addr, ifp);
-	}
-	if (IN_MULTICAST(ntohl(ip->ip_dst.s_addr))) {
-		struct in_multi *inm;
-
-		m->m_flags |= M_MCAST;
-		/*
-		 * IP destination address is multicast.  Make sure "dst"
-		 * still points to the address in "ro".  (It may have been
-		 * changed to point to a gateway address, above.)
-		 */
-		dst = (struct sockaddr_in *)&ro->ro_dst;
-		/*
-		 * See if the caller provided any multicast options
-		 */
-		if (imo != NULL) {
-			ip->ip_ttl = imo->imo_multicast_ttl;
-			if (imo->imo_multicast_ifp != NULL)
-				ifp = imo->imo_multicast_ifp;
-			if (imo->imo_multicast_vif != -1)
-				ip->ip_src.s_addr =
-				    ip_mcast_src(imo->imo_multicast_vif);
-		} else
-			ip->ip_ttl = IP_DEFAULT_MULTICAST_TTL;
-		/*
-		 * Confirm that the outgoing interface supports multicast.
-		 */
-		if ((imo == NULL) || (imo->imo_multicast_vif == -1)) {
-			if ((ifp->if_flags & IFF_MULTICAST) == 0) {
-				ipstat.ips_noroute++;
-				error = ENETUNREACH;
-				goto bad;
-			}
-		}
-		/*
-		 * If source address not specified yet, use address
-		 * of outgoing interface.
-		 */
-		if (ip->ip_src.s_addr == INADDR_ANY) {
-			register struct in_ifaddr *ia;
-
-			for (ia = in_ifaddr; ia; ia = ia->ia_next)
-				if (ia->ia_ifp == ifp) {
-					ip->ip_src = IA_SIN(ia)->sin_addr;
-					break;
-				}
-		}
-
-		IN_LOOKUP_MULTI(ip->ip_dst, ifp, inm);
-		if (inm != NULL &&
-		   (imo == NULL || imo->imo_multicast_loop)) {
-			/*
-			 * If we belong to the destination multicast group
-			 * on the outgoing interface, and the caller did not
-			 * forbid loopback, loop back a copy.
-			 */
-			ip_mloopback(ifp, m, dst, hlen);
-		}
-		else {
-			/*
-			 * If we are acting as a multicast router, perform
-			 * multicast forwarding as if the packet had just
-			 * arrived on the interface to which we are about
-			 * to send.  The multicast forwarding function
-			 * recursively calls this function, using the
-			 * IP_FORWARDING flag to prevent infinite recursion.
-			 *
-			 * Multicasts that are looped back by ip_mloopback(),
-			 * above, will be forwarded by the ip_input() routine,
-			 * if necessary.
-			 */
-			if (ip_mrouter && (flags & IP_FORWARDING) == 0) {
-				/*
-				 * Check if rsvp daemon is running. If not, don't
-				 * set ip_moptions. This ensures that the packet
-				 * is multicast and not just sent down one link
-				 * as prescribed by rsvpd.
-				 */
-				if (!rsvp_on)
-				  imo = NULL;
-				if (ip_mforward(ip, ifp, m, imo) != 0) {
-					m_freem(m);
-					goto done;
-				}
-			}
-		}
-
-		/*
-		 * Multicasts with a time-to-live of zero may be looped-
-		 * back, above, but must not be transmitted on a network.
-		 * Also, multicasts addressed to the loopback interface
-		 * are not sent -- the above call to ip_mloopback() will
-		 * loop back a copy if this host actually belongs to the
-		 * destination group on the loopback interface.
-		 */
-		if (ip->ip_ttl == 0 || ifp->if_flags & IFF_LOOPBACK) {
-			m_freem(m);
-			goto done;
-		}
-
-		goto sendit;
-	}
-#ifndef notdef
-	/*
-	 * If source address not specified yet, use address
-	 * of outgoing interface.
-	 */
-	if (ip->ip_src.s_addr == INADDR_ANY)
-		ip->ip_src = IA_SIN(ia)->sin_addr;
-#endif
-	/*
-	 * Verify that we have any chance at all of being able to queue
-	 *      the packet or packet fragments
-	 */
-	if ((ifp->if_snd.ifq_len + ip->ip_len / ifp->if_mtu + 1) >=
-		ifp->if_snd.ifq_maxlen) {
-			error = ENOBUFS;
-			goto bad;
-	}
-
-	/*
-	 * Look for broadcast address and
-	 * and verify user is allowed to send
-	 * such a packet.
-	 */
-	if (isbroadcast) {
-		if ((ifp->if_flags & IFF_BROADCAST) == 0) {
-			error = EADDRNOTAVAIL;
-			goto bad;
-		}
-		if ((flags & IP_ALLOWBROADCAST) == 0) {
-			error = EACCES;
-			goto bad;
-		}
-		/* don't allow broadcast messages to be fragmented */
-		if ((u_short)ip->ip_len > ifp->if_mtu) {
-			error = EMSGSIZE;
-			goto bad;
-		}
-		m->m_flags |= M_BCAST;
-	} else {
-		m->m_flags &= ~M_BCAST;
-	}
-
-sendit:
-        /*
-	 * IpHack's section.
-	 * - Xlate: translate packet's addr/port (NAT).
-	 * - Firewall: deny/allow/etc.
-	 * - Wrap: fake packet's addr/port <unimpl.>
-	 * - Encapsulate: put it in another IP and send out. <unimp.>
-	 */ 
-
-#ifdef COMPAT_IPFW
-        if (ip_nat_ptr && !(*ip_nat_ptr)(&ip, &m, ifp, IP_NAT_OUT)) {
-		error = EACCES; 
-		goto done;
-	}
-
-	/*
-	 * Check with the firewall...
-	 */
-	if (ip_fw_chk_ptr) {
-#ifdef IPDIVERT
-		ip_divert_port = (*ip_fw_chk_ptr)(&ip,
-		    hlen, ifp, ip_divert_ignore, &m);
-		ip_divert_ignore = 0;
-		if (ip_divert_port) {		/* Divert packet */
-			(*inetsw[ip_protox[IPPROTO_DIVERT]].pr_input)(m, 0);
-			goto done;
-		}
-#else
-		/* If ipfw says divert, we have to just drop packet */
-		if ((*ip_fw_chk_ptr)(&ip, hlen, ifp, 0, &m)) {
-			m_freem(m);
-			goto done;
-		}
-#endif
-		if (!m) {
-			error = EACCES;
-			goto done;
-		}
-	}
-#endif /* COMPAT_IPFW */
-
-	/*
-	 * If small enough for interface, can just send directly.
-	 */
-	if ((u_short)ip->ip_len <= ifp->if_mtu) {
-		ip->ip_len = htons((u_short)ip->ip_len);
-		ip->ip_off = htons((u_short)ip->ip_off);
-		ip->ip_sum = 0;
-		if (ip->ip_vhl == IP_VHL_BORING) {
-			ip->ip_sum = in_cksum_hdr(ip);
-		} else {
-			ip->ip_sum = in_cksum(m, hlen);
-		}
-		error = (*ifp->if_output)(ifp, m,
-				(struct sockaddr *)dst, ro->ro_rt);
-		goto done;
-	}
-	/*
-	 * Too large for interface; fragment if possible.
-	 * Must be able to put at least 8 bytes per fragment.
-	 */
-	if (ip->ip_off & IP_DF) {
-		error = EMSGSIZE;
-		/*
-		 * This case can happen if the user changed the MTU
-		 * of an interface after enabling IP on it.  Because
-		 * most netifs don't keep track of routes pointing to
-		 * them, there is no way for one to update all its
-		 * routes when the MTU is changed.
-		 */
-		if ((ro->ro_rt->rt_flags & (RTF_UP | RTF_HOST))
-		    && !(ro->ro_rt->rt_rmx.rmx_locks & RTV_MTU)
-		    && (ro->ro_rt->rt_rmx.rmx_mtu > ifp->if_mtu)) {
-			ro->ro_rt->rt_rmx.rmx_mtu = ifp->if_mtu;
-		}
-		ipstat.ips_cantfrag++;
-		goto bad;
-	}
-	len = (ifp->if_mtu - hlen) &~ 7;
-	if (len < 8) {
-		error = EMSGSIZE;
-		goto bad;
-	}
-
-    {
-	int mhlen, firstlen = len;
-	struct mbuf **mnext = &m->m_nextpkt;
-
-	/*
-	 * Loop through length of segment after first fragment,
-	 * make new header and copy data of each part and link onto chain.
-	 */
-	m0 = m;
-	mhlen = sizeof (struct ip);
-	for (off = hlen + len; off < (u_short)ip->ip_len; off += len) {
-		MGETHDR(m, M_DONTWAIT, MT_HEADER);
-		if (m == 0) {
-			error = ENOBUFS;
-			ipstat.ips_odropped++;
-			goto sendorfree;
-		}
-		m->m_data += max_linkhdr;
-		mhip = mtod(m, struct ip *);
-		*mhip = *ip;
-		if (hlen > sizeof (struct ip)) {
-			mhlen = ip_optcopy(ip, mhip) + sizeof (struct ip);
-			mhip->ip_vhl = IP_MAKE_VHL(IPVERSION, mhlen >> 2);
-		}
-		m->m_len = mhlen;
-		mhip->ip_off = ((off - hlen) >> 3) + (ip->ip_off & ~IP_MF);
-		if (ip->ip_off & IP_MF)
-			mhip->ip_off |= IP_MF;
-		if (off + len >= (u_short)ip->ip_len)
-			len = (u_short)ip->ip_len - off;
-		else
-			mhip->ip_off |= IP_MF;
-		mhip->ip_len = htons((u_short)(len + mhlen));
-		m->m_next = m_copy(m0, off, len);
-		if (m->m_next == 0) {
-			(void) m_free(m);
-			error = ENOBUFS;	/* ??? */
-			ipstat.ips_odropped++;
-			goto sendorfree;
-		}
-		m->m_pkthdr.len = mhlen + len;
-		m->m_pkthdr.rcvif = (struct ifnet *)0;
-		mhip->ip_off = htons((u_short)mhip->ip_off);
-		mhip->ip_sum = 0;
-		if (mhip->ip_vhl == IP_VHL_BORING) {
-			mhip->ip_sum = in_cksum_hdr(mhip);
-		} else {
-			mhip->ip_sum = in_cksum(m, mhlen);
-		}
-		*mnext = m;
-		mnext = &m->m_nextpkt;
-		ipstat.ips_ofragments++;
-	}
-	/*
-	 * Update first fragment by trimming what's been copied out
-	 * and updating header, then send each fragment (in order).
-	 */
-	m = m0;
-	m_adj(m, hlen + firstlen - (u_short)ip->ip_len);
-	m->m_pkthdr.len = hlen + firstlen;
-	ip->ip_len = htons((u_short)m->m_pkthdr.len);
-	ip->ip_off = htons((u_short)(ip->ip_off | IP_MF));
-	ip->ip_sum = 0;
-	if (ip->ip_vhl == IP_VHL_BORING) {
-		ip->ip_sum = in_cksum_hdr(ip);
-	} else {
-		ip->ip_sum = in_cksum(m, hlen);
-	}
-sendorfree:
-	for (m = m0; m; m = m0) {
-		m0 = m->m_nextpkt;
-		m->m_nextpkt = 0;
-		if (error == 0)
-			error = (*ifp->if_output)(ifp, m,
-			    (struct sockaddr *)dst, ro->ro_rt);
-		else
-			m_freem(m);
-	}
-
-	if (error == 0)
-		ipstat.ips_fragmented++;
-    }
-done:
-	return (error);
-bad:
-	m_freem(m0);
-	goto done;
-}
-
-/*
- * Insert IP options into preformed packet.
- * Adjust IP destination as required for IP source routing,
- * as indicated by a non-zero in_addr at the start of the options.
- *
- * XXX This routine assumes that the packet has no options in place.
- */
-static struct mbuf *
-ip_insertoptions(m, opt, phlen)
-	register struct mbuf *m;
-	struct mbuf *opt;
-	int *phlen;
-{
-	register struct ipoption *p = mtod(opt, struct ipoption *);
-	struct mbuf *n;
-	register struct ip *ip = mtod(m, struct ip *);
-	unsigned optlen;
-
-	optlen = opt->m_len - sizeof(p->ipopt_dst);
-	if (optlen + (u_short)ip->ip_len > IP_MAXPACKET)
-		return (m);		/* XXX should fail */
-	if (p->ipopt_dst.s_addr)
-		ip->ip_dst = p->ipopt_dst;
-	if (m->m_flags & M_EXT || m->m_data - optlen < m->m_pktdat) {
-		MGETHDR(n, M_DONTWAIT, MT_HEADER);
-		if (n == 0)
-			return (m);
-		n->m_pkthdr.len = m->m_pkthdr.len + optlen;
-		m->m_len -= sizeof(struct ip);
-		m->m_data += sizeof(struct ip);
-		n->m_next = m;
-		m = n;
-		m->m_len = optlen + sizeof(struct ip);
-		m->m_data += max_linkhdr;
-		(void)memcpy(mtod(m, void *), ip, sizeof(struct ip));
-	} else {
-		m->m_data -= optlen;
-		m->m_len += optlen;
-		m->m_pkthdr.len += optlen;
-		ovbcopy((caddr_t)ip, mtod(m, caddr_t), sizeof(struct ip));
-	}
-	ip = mtod(m, struct ip *);
-	bcopy(p->ipopt_list, ip + 1, optlen);
-	*phlen = sizeof(struct ip) + optlen;
-	ip->ip_vhl = IP_MAKE_VHL(IPVERSION, *phlen >> 2);
-	ip->ip_len += optlen;
-	return (m);
-}
-
-/*
- * Copy options from ip to jp,
- * omitting those not copied during fragmentation.
- */
-static int
-ip_optcopy(ip, jp)
-	struct ip *ip, *jp;
-{
-	register u_char *cp, *dp;
-	int opt, optlen, cnt;
-
-	cp = (u_char *)(ip + 1);
-	dp = (u_char *)(jp + 1);
-	cnt = (IP_VHL_HL(ip->ip_vhl) << 2) - sizeof (struct ip);
-	for (; cnt > 0; cnt -= optlen, cp += optlen) {
-		opt = cp[0];
-		if (opt == IPOPT_EOL)
-			break;
-		if (opt == IPOPT_NOP) {
-			/* Preserve for IP mcast tunnel's LSRR alignment. */
-			*dp++ = IPOPT_NOP;
-			optlen = 1;
-			continue;
-		} else
-			optlen = cp[IPOPT_OLEN];
-		/* bogus lengths should have been caught by ip_dooptions */
-		if (optlen > cnt)
-			optlen = cnt;
-		if (IPOPT_COPIED(opt)) {
-			bcopy(cp, dp, optlen);
-			dp += optlen;
-		}
-	}
-	for (optlen = dp - (u_char *)(jp+1); optlen & 0x3; optlen++)
-		*dp++ = IPOPT_EOL;
-	return (optlen);
-}
-
-/*
- * IP socket option processing.
- */
-int
-ip_ctloutput(op, so, level, optname, mp)
-	int op;
-	struct socket *so;
-	int level, optname;
-	struct mbuf **mp;
-{
-	register struct inpcb *inp = sotoinpcb(so);
-	register struct mbuf *m = *mp;
-	register int optval = 0;
-	int error = 0;
-
-	if (level != IPPROTO_IP) {
-		error = EINVAL;
-		if (op == PRCO_SETOPT && *mp)
-			(void) m_free(*mp);
-	} else switch (op) {
-
-	case PRCO_SETOPT:
-		switch (optname) {
-		case IP_OPTIONS:
-#ifdef notyet
-		case IP_RETOPTS:
-			return (ip_pcbopts(optname, &inp->inp_options, m));
-#else
-			return (ip_pcbopts(&inp->inp_options, m));
-#endif
-
-		case IP_TOS:
-		case IP_TTL:
-		case IP_RECVOPTS:
-		case IP_RECVRETOPTS:
-		case IP_RECVDSTADDR:
-		case IP_RECVIF:
-			if (m == 0 || m->m_len != sizeof(int))
-				error = EINVAL;
-			else {
-				optval = *mtod(m, int *);
-				switch (optname) {
-
-				case IP_TOS:
-					inp->inp_ip_tos = optval;
-					break;
-
-				case IP_TTL:
-					inp->inp_ip_ttl = optval;
-					break;
-#define	OPTSET(bit) \
-	if (optval) \
-		inp->inp_flags |= bit; \
-	else \
-		inp->inp_flags &= ~bit;
-
-				case IP_RECVOPTS:
-					OPTSET(INP_RECVOPTS);
-					break;
-
-				case IP_RECVRETOPTS:
-					OPTSET(INP_RECVRETOPTS);
-					break;
-
-				case IP_RECVDSTADDR:
-					OPTSET(INP_RECVDSTADDR);
-					break;
-
-				case IP_RECVIF:
-					OPTSET(INP_RECVIF);
-					break;
-				}
-			}
-			break;
-#undef OPTSET
-
-		case IP_MULTICAST_IF:
-		case IP_MULTICAST_VIF:
-		case IP_MULTICAST_TTL:
-		case IP_MULTICAST_LOOP:
-		case IP_ADD_MEMBERSHIP:
-		case IP_DROP_MEMBERSHIP:
-			error = ip_setmoptions(optname, &inp->inp_moptions, m);
-			break;
-
-		case IP_PORTRANGE:
-			if (m == 0 || m->m_len != sizeof(int))
-				error = EINVAL;
-			else {
-				optval = *mtod(m, int *);
-
-				switch (optval) {
-
-				case IP_PORTRANGE_DEFAULT:
-					inp->inp_flags &= ~(INP_LOWPORT);
-					inp->inp_flags &= ~(INP_HIGHPORT);
-					break;
-
-				case IP_PORTRANGE_HIGH:
-					inp->inp_flags &= ~(INP_LOWPORT);
-					inp->inp_flags |= INP_HIGHPORT;
-					break;
-
-				case IP_PORTRANGE_LOW:
-					inp->inp_flags &= ~(INP_HIGHPORT);
-					inp->inp_flags |= INP_LOWPORT;
-					break;
-
-				default:
-					error = EINVAL;
-					break;
-				}
-			}
-			break;
-
-		default:
-			error = ENOPROTOOPT;
-			break;
-		}
-		if (m)
-			(void)m_free(m);
-		break;
-
-	case PRCO_GETOPT:
-		switch (optname) {
-		case IP_OPTIONS:
-		case IP_RETOPTS:
-			*mp = m = m_get(M_WAIT, MT_SOOPTS);
-			if (inp->inp_options) {
-				m->m_len = inp->inp_options->m_len;
-				bcopy(mtod(inp->inp_options, void *),
-				    mtod(m, void *), m->m_len);
-			} else
-				m->m_len = 0;
-			break;
-
-		case IP_TOS:
-		case IP_TTL:
-		case IP_RECVOPTS:
-		case IP_RECVRETOPTS:
-		case IP_RECVDSTADDR:
-		case IP_RECVIF:
-			*mp = m = m_get(M_WAIT, MT_SOOPTS);
-			m->m_len = sizeof(int);
-			switch (optname) {
-
-			case IP_TOS:
-				optval = inp->inp_ip_tos;
-				break;
-
-			case IP_TTL:
-				optval = inp->inp_ip_ttl;
-				break;
-
-#define	OPTBIT(bit)	(inp->inp_flags & bit ? 1 : 0)
-
-			case IP_RECVOPTS:
-				optval = OPTBIT(INP_RECVOPTS);
-				break;
-
-			case IP_RECVRETOPTS:
-				optval = OPTBIT(INP_RECVRETOPTS);
-				break;
-
-			case IP_RECVDSTADDR:
-				optval = OPTBIT(INP_RECVDSTADDR);
-				break;
-
-			case IP_RECVIF:
-				optval = OPTBIT(INP_RECVIF);
-				break;
-			}
-			*mtod(m, int *) = optval;
-			break;
-
-		case IP_MULTICAST_IF:
-		case IP_MULTICAST_VIF:
-		case IP_MULTICAST_TTL:
-		case IP_MULTICAST_LOOP:
-		case IP_ADD_MEMBERSHIP:
-		case IP_DROP_MEMBERSHIP:
-			error = ip_getmoptions(optname, inp->inp_moptions, mp);
-			break;
-
-		case IP_PORTRANGE:
-			*mp = m = m_get(M_WAIT, MT_SOOPTS);
-			m->m_len = sizeof(int);
-
-			if (inp->inp_flags & INP_HIGHPORT)
-				optval = IP_PORTRANGE_HIGH;
-			else if (inp->inp_flags & INP_LOWPORT)
-				optval = IP_PORTRANGE_LOW;
-			else
-				optval = 0;
-
-			*mtod(m, int *) = optval;
-			break;
-
-		default:
-			error = ENOPROTOOPT;
-			break;
-		}
-		break;
-	}
-	return (error);
-}
-
-/*
- * Set up IP options in pcb for insertion in output packets.
- * Store in mbuf with pointer in pcbopt, adding pseudo-option
- * with destination address if source routed.
- */
-static int
-#ifdef notyet
-ip_pcbopts(optname, pcbopt, m)
-	int optname;
-#else
-ip_pcbopts(pcbopt, m)
-#endif
-	struct mbuf **pcbopt;
-	register struct mbuf *m;
-{
-	register int cnt, optlen;
-	register u_char *cp;
-	u_char opt;
-
-	/* turn off any old options */
-	if (*pcbopt)
-		(void)m_free(*pcbopt);
-	*pcbopt = 0;
-	if (m == (struct mbuf *)0 || m->m_len == 0) {
-		/*
-		 * Only turning off any previous options.
-		 */
-		if (m)
-			(void)m_free(m);
-		return (0);
-	}
-
-#ifndef	vax
-	if (m->m_len % sizeof(long))
-		goto bad;
-#endif
-	/*
-	 * IP first-hop destination address will be stored before
-	 * actual options; move other options back
-	 * and clear it when none present.
-	 */
-	if (m->m_data + m->m_len + sizeof(struct in_addr) >= &m->m_dat[MLEN])
-		goto bad;
-	cnt = m->m_len;
-	m->m_len += sizeof(struct in_addr);
-	cp = mtod(m, u_char *) + sizeof(struct in_addr);
-	ovbcopy(mtod(m, caddr_t), (caddr_t)cp, (unsigned)cnt);
-	bzero(mtod(m, caddr_t), sizeof(struct in_addr));
-
-	for (; cnt > 0; cnt -= optlen, cp += optlen) {
-		opt = cp[IPOPT_OPTVAL];
-		if (opt == IPOPT_EOL)
-			break;
-		if (opt == IPOPT_NOP)
-			optlen = 1;
-		else {
-			optlen = cp[IPOPT_OLEN];
-			if (optlen <= IPOPT_OLEN || optlen > cnt)
-				goto bad;
-		}
-		switch (opt) {
-
-		default:
-			break;
-
-		case IPOPT_LSRR:
-		case IPOPT_SSRR:
-			/*
-			 * user process specifies route as:
-			 *	->A->B->C->D
-			 * D must be our final destination (but we can't
-			 * check that since we may not have connected yet).
-			 * A is first hop destination, which doesn't appear in
-			 * actual IP option, but is stored before the options.
-			 */
-			if (optlen < IPOPT_MINOFF - 1 + sizeof(struct in_addr))
-				goto bad;
-			m->m_len -= sizeof(struct in_addr);
-			cnt -= sizeof(struct in_addr);
-			optlen -= sizeof(struct in_addr);
-			cp[IPOPT_OLEN] = optlen;
-			/*
-			 * Move first hop before start of options.
-			 */
-			bcopy((caddr_t)&cp[IPOPT_OFFSET+1], mtod(m, caddr_t),
-			    sizeof(struct in_addr));
-			/*
-			 * Then copy rest of options back
-			 * to close up the deleted entry.
-			 */
-			ovbcopy((caddr_t)(&cp[IPOPT_OFFSET+1] +
-			    sizeof(struct in_addr)),
-			    (caddr_t)&cp[IPOPT_OFFSET+1],
-			    (unsigned)cnt + sizeof(struct in_addr));
-			break;
-		}
-	}
-	if (m->m_len > MAX_IPOPTLEN + sizeof(struct in_addr))
-		goto bad;
-	*pcbopt = m;
-	return (0);
-
-bad:
-	(void)m_free(m);
-	return (EINVAL);
-}
-
-/*
- * Set the IP multicast options in response to user setsockopt().
- */
-static int
-ip_setmoptions(optname, imop, m)
-	int optname;
-	struct ip_moptions **imop;
-	struct mbuf *m;
-{
-	register int error = 0;
-	u_char loop;
-	register int i;
-	struct in_addr addr;
-	register struct ip_mreq *mreq;
-	register struct ifnet *ifp;
-	register struct ip_moptions *imo = *imop;
-	struct route ro;
-	register struct sockaddr_in *dst;
-	int s;
-
-	if (imo == NULL) {
-		/*
-		 * No multicast option buffer attached to the pcb;
-		 * allocate one and initialize to default values.
-		 */
-		imo = (struct ip_moptions*)malloc(sizeof(*imo), M_IPMOPTS,
-		    M_WAITOK);
-
-		if (imo == NULL)
-			return (ENOBUFS);
-		*imop = imo;
-		imo->imo_multicast_ifp = NULL;
-		imo->imo_multicast_vif = -1;
-		imo->imo_multicast_ttl = IP_DEFAULT_MULTICAST_TTL;
-		imo->imo_multicast_loop = IP_DEFAULT_MULTICAST_LOOP;
-		imo->imo_num_memberships = 0;
-	}
-
-	switch (optname) {
-	/* store an index number for the vif you wanna use in the send */
-	case IP_MULTICAST_VIF:
-		if (!legal_vif_num) {
-			error = EOPNOTSUPP;
-			break;
-		}
-		if (m == NULL || m->m_len != sizeof(int)) {
-			error = EINVAL;
-			break;
-		}
-		i = *(mtod(m, int *));
-		if (!legal_vif_num(i) && (i != -1)) {
-			error = EINVAL;
-			break;
-		}
-		imo->imo_multicast_vif = i;
-		break;
-
-	case IP_MULTICAST_IF:
-		/*
-		 * Select the interface for outgoing multicast packets.
-		 */
-		if (m == NULL || m->m_len != sizeof(struct in_addr)) {
-			error = EINVAL;
-			break;
-		}
-		addr = *(mtod(m, struct in_addr *));
-		/*
-		 * INADDR_ANY is used to remove a previous selection.
-		 * When no interface is selected, a default one is
-		 * chosen every time a multicast packet is sent.
-		 */
-		if (addr.s_addr == INADDR_ANY) {
-			imo->imo_multicast_ifp = NULL;
-			break;
-		}
-		/*
-		 * The selected interface is identified by its local
-		 * IP address.  Find the interface and confirm that
-		 * it supports multicasting.
-		 */
-		s = splimp();
-		INADDR_TO_IFP(addr, ifp);
-		if (ifp == NULL || (ifp->if_flags & IFF_MULTICAST) == 0) {
-			splx(s);
-			error = EADDRNOTAVAIL;
-			break;
-		}
-		imo->imo_multicast_ifp = ifp;
-		splx(s);
-		break;
-
-	case IP_MULTICAST_TTL:
-		/*
-		 * Set the IP time-to-live for outgoing multicast packets.
-		 */
-		if (m == NULL || m->m_len != 1) {
-			error = EINVAL;
-			break;
-		}
-		imo->imo_multicast_ttl = *(mtod(m, u_char *));
-		break;
-
-	case IP_MULTICAST_LOOP:
-		/*
-		 * Set the loopback flag for outgoing multicast packets.
-		 * Must be zero or one.
-		 */
-		if (m == NULL || m->m_len != 1 ||
-		   (loop = *(mtod(m, u_char *))) > 1) {
-			error = EINVAL;
-			break;
-		}
-		imo->imo_multicast_loop = loop;
-		break;
-
-	case IP_ADD_MEMBERSHIP:
-		/*
-		 * Add a multicast group membership.
-		 * Group must be a valid IP multicast address.
-		 */
-		if (m == NULL || m->m_len != sizeof(struct ip_mreq)) {
-			error = EINVAL;
-			break;
-		}
-		mreq = mtod(m, struct ip_mreq *);
-		if (!IN_MULTICAST(ntohl(mreq->imr_multiaddr.s_addr))) {
-			error = EINVAL;
-			break;
-		}
-		s = splimp();
-		/*
-		 * If no interface address was provided, use the interface of
-		 * the route to the given multicast address.
-		 */
-		if (mreq->imr_interface.s_addr == INADDR_ANY) {
-			bzero((caddr_t)&ro, sizeof(ro));
-			dst = (struct sockaddr_in *)&ro.ro_dst;
-			dst->sin_len = sizeof(*dst);
-			dst->sin_family = AF_INET;
-			dst->sin_addr = mreq->imr_multiaddr;
-			rtalloc(&ro);
-			if (ro.ro_rt == NULL) {
-				error = EADDRNOTAVAIL;
-				splx(s);
-				break;
-			}
-			ifp = ro.ro_rt->rt_ifp;
-			rtfree(ro.ro_rt);
-		}
-		else {
-			INADDR_TO_IFP(mreq->imr_interface, ifp);
-		}
-
-		/*
-		 * See if we found an interface, and confirm that it
-		 * supports multicast.
-		 */
-		if (ifp == NULL || (ifp->if_flags & IFF_MULTICAST) == 0) {
-			error = EADDRNOTAVAIL;
-			splx(s);
-			break;
-		}
-		/*
-		 * See if the membership already exists or if all the
-		 * membership slots are full.
-		 */
-		for (i = 0; i < imo->imo_num_memberships; ++i) {
-			if (imo->imo_membership[i]->inm_ifp == ifp &&
-			    imo->imo_membership[i]->inm_addr.s_addr
-						== mreq->imr_multiaddr.s_addr)
-				break;
-		}
-		if (i < imo->imo_num_memberships) {
-			error = EADDRINUSE;
-			splx(s);
-			break;
-		}
-		if (i == IP_MAX_MEMBERSHIPS) {
-			error = ETOOMANYREFS;
-			splx(s);
-			break;
-		}
-		/*
-		 * Everything looks good; add a new record to the multicast
-		 * address list for the given interface.
-		 */
-		if ((imo->imo_membership[i] =
-		    in_addmulti(&mreq->imr_multiaddr, ifp)) == NULL) {
-			error = ENOBUFS;
-			splx(s);
-			break;
-		}
-		++imo->imo_num_memberships;
-		splx(s);
-		break;
-
-	case IP_DROP_MEMBERSHIP:
-		/*
-		 * Drop a multicast group membership.
-		 * Group must be a valid IP multicast address.
-		 */
-		if (m == NULL || m->m_len != sizeof(struct ip_mreq)) {
-			error = EINVAL;
-			break;
-		}
-		mreq = mtod(m, struct ip_mreq *);
-		if (!IN_MULTICAST(ntohl(mreq->imr_multiaddr.s_addr))) {
-			error = EINVAL;
-			break;
-		}
-
-		s = splimp();
-		/*
-		 * If an interface address was specified, get a pointer
-		 * to its ifnet structure.
-		 */
-		if (mreq->imr_interface.s_addr == INADDR_ANY)
-			ifp = NULL;
-		else {
-			INADDR_TO_IFP(mreq->imr_interface, ifp);
-			if (ifp == NULL) {
-				error = EADDRNOTAVAIL;
-				splx(s);
-				break;
-			}
-		}
-		/*
-		 * Find the membership in the membership array.
-		 */
-		for (i = 0; i < imo->imo_num_memberships; ++i) {
-			if ((ifp == NULL ||
-			     imo->imo_membership[i]->inm_ifp == ifp) &&
-			     imo->imo_membership[i]->inm_addr.s_addr ==
-			     mreq->imr_multiaddr.s_addr)
-				break;
-		}
-		if (i == imo->imo_num_memberships) {
-			error = EADDRNOTAVAIL;
-			splx(s);
-			break;
-		}
-		/*
-		 * Give up the multicast address record to which the
-		 * membership points.
-		 */
-		in_delmulti(imo->imo_membership[i]);
-		/*
-		 * Remove the gap in the membership array.
-		 */
-		for (++i; i < imo->imo_num_memberships; ++i)
-			imo->imo_membership[i-1] = imo->imo_membership[i];
-		--imo->imo_num_memberships;
-		splx(s);
-		break;
-
-	default:
-		error = EOPNOTSUPP;
-		break;
-	}
-
-	/*
-	 * If all options have default values, no need to keep the mbuf.
-	 */
-	if (imo->imo_multicast_ifp == NULL &&
-	    imo->imo_multicast_vif == -1 &&
-	    imo->imo_multicast_ttl == IP_DEFAULT_MULTICAST_TTL &&
-	    imo->imo_multicast_loop == IP_DEFAULT_MULTICAST_LOOP &&
-	    imo->imo_num_memberships == 0) {
-		free(*imop, M_IPMOPTS);
-		*imop = NULL;
-	}
-
-	return (error);
-}
-
-/*
- * Return the IP multicast options in response to user getsockopt().
- */
-static int
-ip_getmoptions(optname, imo, mp)
-	int optname;
-	register struct ip_moptions *imo;
-	register struct mbuf **mp;
-{
-	u_char *ttl;
-	u_char *loop;
-	struct in_addr *addr;
-	struct in_ifaddr *ia;
-
-	*mp = m_get(M_WAIT, MT_SOOPTS);
-
-	switch (optname) {
-
-	case IP_MULTICAST_VIF: 
-		if (imo != NULL)
-			*(mtod(*mp, int *)) = imo->imo_multicast_vif;
-		else
-			*(mtod(*mp, int *)) = -1;
-		(*mp)->m_len = sizeof(int);
-		return(0);
-
-	case IP_MULTICAST_IF:
-		addr = mtod(*mp, struct in_addr *);
-		(*mp)->m_len = sizeof(struct in_addr);
-		if (imo == NULL || imo->imo_multicast_ifp == NULL)
-			addr->s_addr = INADDR_ANY;
-		else {
-			IFP_TO_IA(imo->imo_multicast_ifp, ia);
-			addr->s_addr = (ia == NULL) ? INADDR_ANY
-					: IA_SIN(ia)->sin_addr.s_addr;
-		}
-		return (0);
-
-	case IP_MULTICAST_TTL:
-		ttl = mtod(*mp, u_char *);
-		(*mp)->m_len = 1;
-		*ttl = (imo == NULL) ? IP_DEFAULT_MULTICAST_TTL
-				     : imo->imo_multicast_ttl;
-		return (0);
-
-	case IP_MULTICAST_LOOP:
-		loop = mtod(*mp, u_char *);
-		(*mp)->m_len = 1;
-		*loop = (imo == NULL) ? IP_DEFAULT_MULTICAST_LOOP
-				      : imo->imo_multicast_loop;
-		return (0);
-
-	default:
-		return (EOPNOTSUPP);
-	}
-}
-
-/*
- * Discard the IP multicast options.
- */
-void
-ip_freemoptions(imo)
-	register struct ip_moptions *imo;
-{
-	register int i;
-
-	if (imo != NULL) {
-		for (i = 0; i < imo->imo_num_memberships; ++i)
-			in_delmulti(imo->imo_membership[i]);
-		free(imo, M_IPMOPTS);
-	}
-}
-
-/*
- * Routine called from ip_output() to loop back a copy of an IP multicast
- * packet to the input queue of a specified interface.  Note that this
- * calls the output routine of the loopback "driver", but with an interface
- * pointer that might NOT be a loopback interface -- evil, but easier than
- * replicating that code here.
- */
-static void
-ip_mloopback(ifp, m, dst, hlen)
-	struct ifnet *ifp;
-	register struct mbuf *m;
-	register struct sockaddr_in *dst;
-	int hlen;
-{
-	register struct ip *ip;
-	struct mbuf *copym;
-
-	copym = m_copy(m, 0, M_COPYALL);
-	if (copym != NULL && (copym->m_flags & M_EXT || copym->m_len < hlen))
-		copym = m_pullup(copym, hlen);
-	if (copym != NULL) {
-		/*
-		 * We don't bother to fragment if the IP length is greater
-		 * than the interface's MTU.  Can this possibly matter?
-		 */
-		ip = mtod(copym, struct ip *);
-		ip->ip_len = htons((u_short)ip->ip_len);
-		ip->ip_off = htons((u_short)ip->ip_off);
-		ip->ip_sum = 0;
-		if (ip->ip_vhl == IP_VHL_BORING) {
-			ip->ip_sum = in_cksum_hdr(ip);
-		} else {
-			ip->ip_sum = in_cksum(copym, hlen);
-		}
-		/*
-		 * NB:
-		 * It's not clear whether there are any lingering
-		 * reentrancy problems in other areas which might
-		 * be exposed by using ip_input directly (in
-		 * particular, everything which modifies the packet
-		 * in-place).  Yet another option is using the
-		 * protosw directly to deliver the looped back
-		 * packet.  For the moment, we'll err on the side
-		 * of safety by continuing to abuse looutput().
-		 */
-#ifdef notdef
-		copym->m_pkthdr.rcvif = ifp;
-		ip_input(copym)
-#else
-		(void) looutput(ifp, copym, (struct sockaddr *)dst, NULL);
-#endif
-	}
-}
diff --git a/c/src/exec/libnetworking/netinet/ip_var.h b/c/src/exec/libnetworking/netinet/ip_var.h
deleted file mode 100644
index cc7908e9a3..0000000000
--- a/c/src/exec/libnetworking/netinet/ip_var.h
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)ip_var.h	8.2 (Berkeley) 1/9/95
- *	$Id$
- */
-
-#ifndef _NETINET_IP_VAR_H_
-#define	_NETINET_IP_VAR_H_
-
-/*
- * Overlay for ip header used by other protocols (tcp, udp).
- */
-struct ipovly {
-	caddr_t	ih_next, ih_prev;	/* for protocol sequence q's */
-	u_char	ih_x1;			/* (unused) */
-	u_char	ih_pr;			/* protocol */
-	u_short	ih_len;			/* protocol length */
-	struct	in_addr ih_src;		/* source internet address */
-	struct	in_addr ih_dst;		/* destination internet address */
-};
-
-/*
- * Ip reassembly queue structure.  Each fragment
- * being reassembled is attached to one of these structures.
- * They are timed out after ipq_ttl drops to 0, and may also
- * be reclaimed if memory becomes tight.
- */
-struct ipq {
-	struct	ipq *next,*prev;	/* to other reass headers */
-	u_char	ipq_ttl;		/* time for reass q to live */
-	u_char	ipq_p;			/* protocol of this fragment */
-	u_short	ipq_id;			/* sequence id for reassembly */
-	struct	ipasfrag *ipq_next,*ipq_prev;
-					/* to ip headers of fragments */
-	struct	in_addr ipq_src,ipq_dst;
-#ifdef IPDIVERT
-	u_short ipq_divert;		/* divert protocol port */
-#endif
-};
-
-/*
- * Ip header, when holding a fragment.
- *
- * Note: ipf_next must be at same offset as ipq_next above
- */
-struct	ipasfrag {
-#if BYTE_ORDER == LITTLE_ENDIAN 
-	u_char	ip_hl:4,
-		ip_v:4;
-#endif
-#if BYTE_ORDER == BIG_ENDIAN 
-	u_char	ip_v:4,
-		ip_hl:4;
-#endif
-	u_char	ipf_mff;		/* XXX overlays ip_tos: use low bit
-					 * to avoid destroying tos;
-					 * copied from (ip_off&IP_MF) */
-	u_short	ip_len;
-	u_short	ip_id;
-	u_short	ip_off;
-	u_char	ip_ttl;
-	u_char	ip_p;
-	u_short	ip_sum;
-	struct	ipasfrag *ipf_next;	/* next fragment */
-	struct	ipasfrag *ipf_prev;	/* previous fragment */
-};
-
-/*
- * Structure stored in mbuf in inpcb.ip_options
- * and passed to ip_output when ip options are in use.
- * The actual length of the options (including ipopt_dst)
- * is in m_len.
- */
-#define MAX_IPOPTLEN	40
-
-struct ipoption {
-	struct	in_addr ipopt_dst;	/* first-hop dst if source routed */
-	char	ipopt_list[MAX_IPOPTLEN];	/* options proper */
-};
-
-/*
- * Structure attached to inpcb.ip_moptions and
- * passed to ip_output when IP multicast options are in use.
- */
-struct ip_moptions {
-	struct	ifnet *imo_multicast_ifp; /* ifp for outgoing multicasts */
-	u_char	imo_multicast_ttl;	/* TTL for outgoing multicasts */
-	u_char	imo_multicast_loop;	/* 1 => hear sends if a member */
-	u_short	imo_num_memberships;	/* no. memberships this socket */
-	struct	in_multi *imo_membership[IP_MAX_MEMBERSHIPS];
-	u_long	imo_multicast_vif;	/* vif num outgoing multicasts */
-};
-
-struct	ipstat {
-	u_long	ips_total;		/* total packets received */
-	u_long	ips_badsum;		/* checksum bad */
-	u_long	ips_tooshort;		/* packet too short */
-	u_long	ips_toosmall;		/* not enough data */
-	u_long	ips_badhlen;		/* ip header length < data size */
-	u_long	ips_badlen;		/* ip length < ip header length */
-	u_long	ips_fragments;		/* fragments received */
-	u_long	ips_fragdropped;	/* frags dropped (dups, out of space) */
-	u_long	ips_fragtimeout;	/* fragments timed out */
-	u_long	ips_forward;		/* packets forwarded */
-	u_long	ips_cantforward;	/* packets rcvd for unreachable dest */
-	u_long	ips_redirectsent;	/* packets forwarded on same net */
-	u_long	ips_noproto;		/* unknown or unsupported protocol */
-	u_long	ips_delivered;		/* datagrams delivered to upper level*/
-	u_long	ips_localout;		/* total ip packets generated here */
-	u_long	ips_odropped;		/* lost packets due to nobufs, etc. */
-	u_long	ips_reassembled;	/* total packets reassembled ok */
-	u_long	ips_fragmented;		/* datagrams successfully fragmented */
-	u_long	ips_ofragments;		/* output fragments created */
-	u_long	ips_cantfrag;		/* don't fragment flag was set, etc. */
-	u_long	ips_badoptions;		/* error in option processing */
-	u_long	ips_noroute;		/* packets discarded due to no route */
-	u_long	ips_badvers;		/* ip version != 4 */
-	u_long	ips_rawout;		/* total raw ip packets generated */
-	u_long	ips_toolong;		/* ip length > max ip packet size */
-};
-
-#ifdef KERNEL
-/* flags passed to ip_output as last parameter */
-#define	IP_FORWARDING		0x1		/* most of ip header exists */
-#define	IP_RAWOUTPUT		0x2		/* raw ip header exists */
-#define	IP_ROUTETOIF		SO_DONTROUTE	/* bypass routing tables */
-#define	IP_ALLOWBROADCAST	SO_BROADCAST	/* can send broadcast packets */
-
-struct inpcb;
-struct route;
-
-extern struct	ipstat	ipstat;
-extern u_short	ip_id;				/* ip packet ctr, for ids */
-extern int	ip_defttl;			/* default IP ttl */
-extern u_char	ip_protox[];
-extern struct socket *ip_rsvpd;	/* reservation protocol daemon */
-extern struct socket *ip_mrouter; /* multicast routing daemon */
-extern int	(*legal_vif_num) __P((int));
-extern u_long	(*ip_mcast_src) __P((int));
-extern int rsvp_on;
-
-int	 ip_ctloutput __P((int, struct socket *, int, int, struct mbuf **));
-void	 ip_drain __P((void));
-void	 ip_freemoptions __P((struct ip_moptions *));
-void	 ip_init __P((void));
-extern int	 (*ip_mforward) __P((struct ip *, struct ifnet *, struct mbuf *,
-			  struct ip_moptions *));
-int	 ip_output __P((struct mbuf *,
-	    struct mbuf *, struct route *, int, struct ip_moptions *));
-void	 ip_savecontrol __P((struct inpcb *, struct mbuf **, struct ip *,
-		struct mbuf *));
-void	 ip_slowtimo __P((void));
-struct mbuf *
-	 ip_srcroute __P((void));
-void	 ip_stripoptions __P((struct mbuf *, struct mbuf *));
-int	 rip_ctloutput __P((int, struct socket *, int, int, struct mbuf **));
-void	 rip_init __P((void));
-void	 rip_input __P((struct mbuf *, int));
-int	 rip_output __P((struct mbuf *, struct socket *, u_long));
-int	 rip_usrreq __P((struct socket *,
-	    int, struct mbuf *, struct mbuf *, struct mbuf *));
-void	ipip_input __P((struct mbuf *, int));
-void	rsvp_input __P((struct mbuf *, int));
-int	ip_rsvp_init __P((struct socket *));
-int	ip_rsvp_done __P((void));
-int	ip_rsvp_vif_init __P((struct socket *, struct mbuf *));
-int	ip_rsvp_vif_done __P((struct socket *, struct mbuf *));
-void	ip_rsvp_force_done __P((struct socket *));
-
-#ifdef IPDIVERT
-void	div_init __P((void));
-void	div_input __P((struct mbuf *, int));
-int	div_usrreq __P((struct socket *,
-		int, struct mbuf *, struct mbuf *, struct mbuf *));
-extern u_short ip_divert_port;
-extern u_short ip_divert_ignore;
-#endif /* IPDIVERT */
-
-#endif /* KERNEL */
-
-#endif /* _NETINET_IP_VAR_H_ */
diff --git a/c/src/exec/libnetworking/netinet/raw_ip.c b/c/src/exec/libnetworking/netinet/raw_ip.c
deleted file mode 100644
index 44d58f1844..0000000000
--- a/c/src/exec/libnetworking/netinet/raw_ip.c
+++ /dev/null
@@ -1,486 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)raw_ip.c	8.7 (Berkeley) 5/15/95
- *	$Id$
- */
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/malloc.h>
-#include <sys/mbuf.h>
-#include <sys/socket.h>
-#include <sys/protosw.h>
-#include <sys/socketvar.h>
-#include <sys/errno.h>
-#include <sys/systm.h>
-
-#include <net/if.h>
-#include <net/route.h>
-
-#define _IP_VHL
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/in_pcb.h>
-#include <netinet/in_var.h>
-#include <netinet/ip_var.h>
-#include <netinet/ip_mroute.h>
-
-#include <netinet/ip_fw.h>
-
-#if !defined(COMPAT_IPFW) || COMPAT_IPFW == 1
-#undef COMPAT_IPFW
-#define COMPAT_IPFW 1
-#else
-#undef COMPAT_IPFW
-#endif
-
-static struct inpcbhead ripcb;
-static struct inpcbinfo ripcbinfo;
-
-/*
- * Nominal space allocated to a raw ip socket.
- */
-#define	RIPSNDQ		8192
-#define	RIPRCVQ		8192
-
-/*
- * Raw interface to IP protocol.
- */
-
-/*
- * Initialize raw connection block q.
- */
-void
-rip_init()
-{
-	LIST_INIT(&ripcb);
-	ripcbinfo.listhead = &ripcb;
-	/*
-	 * XXX We don't use the hash list for raw IP, but it's easier
-	 * to allocate a one entry hash list than it is to check all
-	 * over the place for hashbase == NULL.
-	 */
-	ripcbinfo.hashbase = hashinit(1, M_PCB, &ripcbinfo.hashmask);
-}
-
-static struct	sockaddr_in ripsrc = { sizeof(ripsrc), AF_INET };
-/*
- * Setup generic address and protocol structures
- * for raw_input routine, then pass them along with
- * mbuf chain.
- */
-void
-rip_input(m, iphlen)
-	struct mbuf *m;
-	int iphlen;
-{
-	register struct ip *ip = mtod(m, struct ip *);
-	register struct inpcb *inp;
-	struct inpcb *last = 0;
-	struct mbuf *opts = 0;
-
-	ripsrc.sin_addr = ip->ip_src;
-	for (inp = ripcb.lh_first; inp != NULL; inp = inp->inp_list.le_next) {
-		if (inp->inp_ip_p && inp->inp_ip_p != ip->ip_p)
-			continue;
-		if (inp->inp_laddr.s_addr &&
-                  inp->inp_laddr.s_addr != ip->ip_dst.s_addr)
-			continue;
-		if (inp->inp_faddr.s_addr &&
-                  inp->inp_faddr.s_addr != ip->ip_src.s_addr)
-			continue;
-		if (last) {
-			struct mbuf *n = m_copy(m, 0, (int)M_COPYALL);
-			if (n) {
-				if (last->inp_flags & INP_CONTROLOPTS ||
-				    last->inp_socket->so_options & SO_TIMESTAMP)
-				    ip_savecontrol(last, &opts, ip, n);
-				if (sbappendaddr(&last->inp_socket->so_rcv,
-				    (struct sockaddr *)&ripsrc, n,
-				    opts) == 0) {
-					/* should notify about lost packet */
-					m_freem(n);
-					if (opts)
-					    m_freem(opts);
-				} else
-					sorwakeup(last->inp_socket);
-				opts = 0;
-			}
-		}
-		last = inp;
-	}
-	if (last) {
-		if (last->inp_flags & INP_CONTROLOPTS ||
-		    last->inp_socket->so_options & SO_TIMESTAMP)
-			ip_savecontrol(last, &opts, ip, m);
-		if (sbappendaddr(&last->inp_socket->so_rcv,
-		    (struct sockaddr *)&ripsrc, m, opts) == 0) {
-			m_freem(m);
-			if (opts)
-			    m_freem(opts);
-		} else
-			sorwakeup(last->inp_socket);
-	} else {
-		m_freem(m);
-              ipstat.ips_noproto++;
-              ipstat.ips_delivered--;
-      }
-}
-
-/*
- * Generate IP header and pass packet to ip_output.
- * Tack on options user may have setup with control call.
- */
-int
-rip_output(m, so, dst)
-	register struct mbuf *m;
-	struct socket *so;
-	u_long dst;
-{
-	register struct ip *ip;
-	register struct inpcb *inp = sotoinpcb(so);
-	int flags = (so->so_options & SO_DONTROUTE) | IP_ALLOWBROADCAST;
-
-	/*
-	 * If the user handed us a complete IP packet, use it.
-	 * Otherwise, allocate an mbuf for a header and fill it in.
-	 */
-	if ((inp->inp_flags & INP_HDRINCL) == 0) {
-		if (m->m_pkthdr.len + sizeof(struct ip) > IP_MAXPACKET) {
-			m_freem(m);
-			return(EMSGSIZE);
-		}
-		M_PREPEND(m, sizeof(struct ip), M_WAIT);
-		ip = mtod(m, struct ip *);
-		ip->ip_tos = 0;
-		ip->ip_off = 0;
-		ip->ip_p = inp->inp_ip_p;
-		ip->ip_len = m->m_pkthdr.len;
-		ip->ip_src = inp->inp_laddr;
-		ip->ip_dst.s_addr = dst;
-		ip->ip_ttl = MAXTTL;
-	} else {
-		if (m->m_pkthdr.len > IP_MAXPACKET) {
-			m_freem(m);
-			return(EMSGSIZE);
-		}
-		ip = mtod(m, struct ip *);
-		/* don't allow both user specified and setsockopt options,
-		   and don't allow packet length sizes that will crash */
-		if (((IP_VHL_HL(ip->ip_vhl) != (sizeof (*ip) >> 2)) 
-		     && inp->inp_options)
-		    || (ip->ip_len > m->m_pkthdr.len)
-		    || (ip->ip_len < (IP_VHL_HL(ip->ip_vhl) << 2))) {
-			m_freem(m);
-			return EINVAL;
-		}
-		if (ip->ip_id == 0)
-			ip->ip_id = htons(ip_id++);
-		/* XXX prevent ip_output from overwriting header fields */
-		flags |= IP_RAWOUTPUT;
-		ipstat.ips_rawout++;
-	}
-	return (ip_output(m, inp->inp_options, &inp->inp_route, flags,
-			  inp->inp_moptions));
-}
-
-/*
- * Raw IP socket option processing.
- */
-int
-rip_ctloutput(op, so, level, optname, m)
-	int op;
-	struct socket *so;
-	int level, optname;
-	struct mbuf **m;
-{
-	register struct inpcb *inp = sotoinpcb(so);
-	register int error;
-
-	if (level != IPPROTO_IP) {
-		if (op == PRCO_SETOPT && *m)
-			(void)m_free(*m);
-		return (EINVAL);
-	}
-
-	switch (optname) {
-
-	case IP_HDRINCL:
-		error = 0;
-		if (op == PRCO_SETOPT) {
-			if (m == 0 || *m == 0 || (*m)->m_len < sizeof (int))
-				error = EINVAL;
-			else if (*mtod(*m, int *))
-				inp->inp_flags |= INP_HDRINCL;
-			else
-				inp->inp_flags &= ~INP_HDRINCL;
-			if (*m)
-				(void)m_free(*m);
-		} else {
-			*m = m_get(M_WAIT, MT_SOOPTS);
-			(*m)->m_len = sizeof (int);
-			*mtod(*m, int *) = inp->inp_flags & INP_HDRINCL;
-		}
-		return (error);
-
-#ifdef COMPAT_IPFW
-	case IP_FW_GET:
-		if (ip_fw_ctl_ptr == NULL || op == PRCO_SETOPT) {
-			if (*m) (void)m_free(*m);
-			return(EINVAL);
-		}
-		return (*ip_fw_ctl_ptr)(optname, m); 
-
-	case IP_FW_ADD:
-	case IP_FW_DEL:
-	case IP_FW_FLUSH:
-	case IP_FW_ZERO:
-		if (ip_fw_ctl_ptr == NULL || op != PRCO_SETOPT) {
-			if (*m) (void)m_free(*m);
-			return(EINVAL);
-		}
-		return (*ip_fw_ctl_ptr)(optname, m); 
-
-	case IP_NAT:
-		if (ip_nat_ctl_ptr == NULL) {
-			if (*m) (void)m_free(*m);
-			return(EINVAL);
-		}
-		return (*ip_nat_ctl_ptr)(op, m); 
-
-#endif
-	case IP_RSVP_ON:
-		return ip_rsvp_init(so);
-		break;
-
-	case IP_RSVP_OFF:
-		return ip_rsvp_done();
-		break;
-
-	case IP_RSVP_VIF_ON:
-		return ip_rsvp_vif_init(so, *m);
-
-	case IP_RSVP_VIF_OFF:
-		return ip_rsvp_vif_done(so, *m);
-
-	case MRT_INIT:
-	case MRT_DONE:
-	case MRT_ADD_VIF:
-	case MRT_DEL_VIF:
-	case MRT_ADD_MFC:
-	case MRT_DEL_MFC:
-	case MRT_VERSION:
-	case MRT_ASSERT:
-		if (op == PRCO_SETOPT) {
-			error = ip_mrouter_set(optname, so, *m);
-			if (*m)
-				(void)m_free(*m);
-		} else if (op == PRCO_GETOPT) {
-			error = ip_mrouter_get(optname, so, m);
-		} else
-			error = EINVAL;
-		return (error);
-	}
-	return (ip_ctloutput(op, so, level, optname, m));
-}
-
-static u_long	rip_sendspace = RIPSNDQ; /* XXX sysctl ? */
-static u_long	rip_recvspace = RIPRCVQ; /* XXX sysctl ? */
-
-/*ARGSUSED*/
-int
-rip_usrreq(so, req, m, nam, control)
-	register struct socket *so;
-	int req;
-	struct mbuf *m, *nam, *control;
-{
-	register int error = 0;
-	register struct inpcb *inp = sotoinpcb(so);
-	int s;
-
-	if (req == PRU_CONTROL)
-		return (in_control(so, (u_long)m, (caddr_t)nam,
-			(struct ifnet *)control));
-
-	switch (req) {
-
-	case PRU_ATTACH:
-		if (inp)
-			panic("rip_attach");
-		if ((so->so_state & SS_PRIV) == 0) {
-			error = EACCES;
-			break;
-		}
-		s = splnet();
-		error = in_pcballoc(so, &ripcbinfo);
-		splx(s);
-		if (error)
-			break;
-		error = soreserve(so, rip_sendspace, rip_recvspace);
-		if (error)
-			break;
-		inp = (struct inpcb *)so->so_pcb;
-		inp->inp_ip_p = (int)nam;
-		break;
-
-	case PRU_DISCONNECT:
-		if ((so->so_state & SS_ISCONNECTED) == 0) {
-			error = ENOTCONN;
-			break;
-		}
-		/* FALLTHROUGH */
-	case PRU_ABORT:
-		soisdisconnected(so);
-		/* FALLTHROUGH */
-	case PRU_DETACH:
-		if (inp == 0)
-			panic("rip_detach");
-		if (so == ip_mrouter)
-			ip_mrouter_done();
-		ip_rsvp_force_done(so);
-		if (so == ip_rsvpd)
-			ip_rsvp_done();
-		in_pcbdetach(inp);
-		break;
-
-	case PRU_BIND:
-	    {
-		struct sockaddr_in *addr = mtod(nam, struct sockaddr_in *);
-
-		if (nam->m_len != sizeof(*addr)) {
-			error = EINVAL;
-			break;
-		}
-		if ((ifnet == 0) ||
-		    ((addr->sin_family != AF_INET) &&
-		     (addr->sin_family != AF_IMPLINK)) ||
-		    (addr->sin_addr.s_addr &&
-		     ifa_ifwithaddr((struct sockaddr *)addr) == 0)) {
-			error = EADDRNOTAVAIL;
-			break;
-		}
-		inp->inp_laddr = addr->sin_addr;
-		break;
-	    }
-	case PRU_CONNECT:
-	    {
-		struct sockaddr_in *addr = mtod(nam, struct sockaddr_in *);
-
-		if (nam->m_len != sizeof(*addr)) {
-			error = EINVAL;
-			break;
-		}
-		if (ifnet == 0) {
-			error = EADDRNOTAVAIL;
-			break;
-		}
-		if ((addr->sin_family != AF_INET) &&
-		     (addr->sin_family != AF_IMPLINK)) {
-			error = EAFNOSUPPORT;
-			break;
-		}
-		inp->inp_faddr = addr->sin_addr;
-		soisconnected(so);
-		break;
-	    }
-
-	case PRU_CONNECT2:
-		error = EOPNOTSUPP;
-		break;
-
-	/*
-	 * Mark the connection as being incapable of further input.
-	 */
-	case PRU_SHUTDOWN:
-		socantsendmore(so);
-		break;
-
-	/*
-	 * Ship a packet out.  The appropriate raw output
-	 * routine handles any massaging necessary.
-	 */
-	case PRU_SEND:
-	    {
-		register u_long dst;
-
-		if (so->so_state & SS_ISCONNECTED) {
-			if (nam) {
-				error = EISCONN;
-				break;
-			}
-			dst = inp->inp_faddr.s_addr;
-		} else {
-			if (nam == NULL) {
-				error = ENOTCONN;
-				break;
-			}
-			dst = mtod(nam, struct sockaddr_in *)->sin_addr.s_addr;
-		}
-		error = rip_output(m, so, dst);
-		m = NULL;
-		break;
-	    }
-
-	case PRU_SENSE:
-		/*
-		 * stat: don't bother with a blocksize.
-		 */
-		return (0);
-
-	/*
-	 * Not supported.
-	 */
-	case PRU_RCVOOB:
-	case PRU_RCVD:
-	case PRU_LISTEN:
-	case PRU_ACCEPT:
-	case PRU_SENDOOB:
-		error = EOPNOTSUPP;
-		break;
-
-	case PRU_SOCKADDR:
-		in_setsockaddr(inp, nam);
-		break;
-
-	case PRU_PEERADDR:
-		in_setpeeraddr(inp, nam);
-		break;
-
-	default:
-		panic("rip_usrreq");
-	}
-	if (m != NULL)
-		m_freem(m);
-	return (error);
-}
diff --git a/c/src/exec/libnetworking/netinet/tcp.h b/c/src/exec/libnetworking/netinet/tcp.h
deleted file mode 100644
index 3585917aa3..0000000000
--- a/c/src/exec/libnetworking/netinet/tcp.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)tcp.h	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#ifndef _NETINET_TCP_H_
-#define _NETINET_TCP_H_
-
-typedef	u_long	tcp_seq;
-typedef u_long	tcp_cc;			/* connection count per rfc1644 */
-
-/*
- * TCP header.
- * Per RFC 793, September, 1981.
- */
-struct tcphdr {
-	u_short	th_sport;		/* source port */
-	u_short	th_dport;		/* destination port */
-	tcp_seq	th_seq;			/* sequence number */
-	tcp_seq	th_ack;			/* acknowledgement number */
-#if BYTE_ORDER == LITTLE_ENDIAN
-	u_char	th_x2:4,		/* (unused) */
-		th_off:4;		/* data offset */
-#endif
-#if BYTE_ORDER == BIG_ENDIAN
-	u_char	th_off:4,		/* data offset */
-		th_x2:4;		/* (unused) */
-#endif
-	u_char	th_flags;
-#define	TH_FIN	0x01
-#define	TH_SYN	0x02
-#define	TH_RST	0x04
-#define	TH_PUSH	0x08
-#define	TH_ACK	0x10
-#define	TH_URG	0x20
-#define TH_FLAGS (TH_FIN|TH_SYN|TH_RST|TH_ACK|TH_URG)
-
-	u_short	th_win;			/* window */
-	u_short	th_sum;			/* checksum */
-	u_short	th_urp;			/* urgent pointer */
-};
-
-#define	TCPOPT_EOL		0
-#define	TCPOPT_NOP		1
-#define	TCPOPT_MAXSEG		2
-#define    TCPOLEN_MAXSEG		4
-#define TCPOPT_WINDOW		3
-#define    TCPOLEN_WINDOW		3
-#define TCPOPT_SACK_PERMITTED	4		/* Experimental */
-#define    TCPOLEN_SACK_PERMITTED	2
-#define TCPOPT_SACK		5		/* Experimental */
-#define TCPOPT_TIMESTAMP	8
-#define    TCPOLEN_TIMESTAMP		10
-#define    TCPOLEN_TSTAMP_APPA		(TCPOLEN_TIMESTAMP+2) /* appendix A */
-#define    TCPOPT_TSTAMP_HDR		\
-    (TCPOPT_NOP<<24|TCPOPT_NOP<<16|TCPOPT_TIMESTAMP<<8|TCPOLEN_TIMESTAMP)
-
-#define	TCPOPT_CC		11		/* CC options: RFC-1644 */
-#define TCPOPT_CCNEW		12
-#define TCPOPT_CCECHO		13
-#define	   TCPOLEN_CC			6
-#define	   TCPOLEN_CC_APPA		(TCPOLEN_CC+2)
-#define	   TCPOPT_CC_HDR(ccopt)		\
-    (TCPOPT_NOP<<24|TCPOPT_NOP<<16|(ccopt)<<8|TCPOLEN_CC)
-
-/*
- * Default maximum segment size for TCP.
- * With an IP MSS of 576, this is 536,
- * but 512 is probably more convenient.
- * This should be defined as MIN(512, IP_MSS - sizeof (struct tcpiphdr)).
- */
-#define	TCP_MSS	512
-
-#define	TCP_MAXWIN	65535	/* largest value for (unscaled) window */
-#define	TTCP_CLIENT_SND_WND	4096	/* dflt send window for T/TCP client */
-
-#define TCP_MAX_WINSHIFT	14	/* maximum window shift */
-
-#define TCP_MAXHLEN	(0xf<<2)	/* max length of header in bytes */
-#define TCP_MAXOLEN	(TCP_MAXHLEN - sizeof(struct tcphdr))
-					/* max space left for options */
-
-/*
- * User-settable options (used with setsockopt).
- */
-#define	TCP_NODELAY	0x01	/* don't delay send to coalesce packets */
-#define	TCP_MAXSEG	0x02	/* set maximum segment size */
-#define TCP_NOPUSH	0x04	/* don't push last block of write */
-#define TCP_NOOPT	0x08	/* don't use TCP options */
-
-#endif
diff --git a/c/src/exec/libnetworking/netinet/tcp_debug.c b/c/src/exec/libnetworking/netinet/tcp_debug.c
deleted file mode 100644
index 864a01cb1a..0000000000
--- a/c/src/exec/libnetworking/netinet/tcp_debug.c
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)tcp_debug.c	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#include "opt_tcpdebug.h"
-
-#ifdef TCPDEBUG
-/* load symbolic names */
-#define PRUREQUESTS
-#define TCPSTATES
-#define	TCPTIMERS
-#define	TANAMES
-#endif
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/systm.h>
-#include <sys/mbuf.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/protosw.h>
-#include <sys/errno.h>
-
-#include <net/route.h>
-#include <net/if.h>
-
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/in_pcb.h>
-#include <netinet/ip_var.h>
-#include <netinet/tcp.h>
-#include <netinet/tcp_fsm.h>
-#include <netinet/tcp_seq.h>
-#include <netinet/tcp_timer.h>
-#include <netinet/tcp_var.h>
-#include <netinet/tcpip.h>
-#include <netinet/tcp_debug.h>
-
-#ifdef TCPDEBUG
-static int	tcpconsdebug = 0;
-#endif
-
-static struct tcp_debug tcp_debug[TCP_NDEBUG];
-static int	tcp_debx;
-
-/*
- * Tcp debug routines
- */
-void
-tcp_trace(act, ostate, tp, ti, req)
-	short act, ostate;
-	struct tcpcb *tp;
-	struct tcpiphdr *ti;
-	int req;
-{
-#ifdef TCPDEBUG
-	tcp_seq seq, ack;
-	int len, flags;
-#endif
-	struct tcp_debug *td = &tcp_debug[tcp_debx++];
-
-	if (tcp_debx == TCP_NDEBUG)
-		tcp_debx = 0;
-	td->td_time = iptime();
-	td->td_act = act;
-	td->td_ostate = ostate;
-	td->td_tcb = (caddr_t)tp;
-	if (tp)
-		td->td_cb = *tp;
-	else
-		bzero((caddr_t)&td->td_cb, sizeof (*tp));
-	if (ti)
-		td->td_ti = *ti;
-	else
-		bzero((caddr_t)&td->td_ti, sizeof (*ti));
-	td->td_req = req;
-#ifdef TCPDEBUG
-	if (tcpconsdebug == 0)
-		return;
-	if (tp)
-		printf("%p %s:", tp, tcpstates[ostate]);
-	else
-		printf("???????? ");
-	printf("%s ", tanames[act]);
-	switch (act) {
-
-	case TA_INPUT:
-	case TA_OUTPUT:
-	case TA_DROP:
-		if (ti == 0)
-			break;
-		seq = ti->ti_seq;
-		ack = ti->ti_ack;
-		len = ti->ti_len;
-		if (act == TA_OUTPUT) {
-			seq = ntohl(seq);
-			ack = ntohl(ack);
-			len = ntohs((u_short)len);
-		}
-		if (act == TA_OUTPUT)
-			len -= sizeof (struct tcphdr);
-		if (len)
-			printf("[%x..%x)", seq, seq+len);
-		else
-			printf("%x", seq);
-		printf("@%x, urp=%x", ack, ti->ti_urp);
-		flags = ti->ti_flags;
-		if (flags) {
-			char *cp = "<";
-#define pf(f) {					\
-	if (ti->ti_flags & TH_##f) {		\
-		printf("%s%s", cp, #f);		\
-		cp = ",";			\
-	}					\
-}
-			pf(SYN); pf(ACK); pf(FIN); pf(RST); pf(PUSH); pf(URG);
-			printf(">");
-		}
-		break;
-
-	case TA_USER:
-		printf("%s", prurequests[req&0xff]);
-		if ((req & 0xff) == PRU_SLOWTIMO)
-			printf("<%s>", tcptimers[req>>8]);
-		break;
-	}
-	if (tp)
-		printf(" -> %s", tcpstates[tp->t_state]);
-	/* print out internal state of tp !?! */
-	printf("\n");
-	if (tp == 0)
-		return;
-	printf("\trcv_(nxt,wnd,up) (%x,%x,%x) snd_(una,nxt,max) (%x,%x,%x)\n",
-	    tp->rcv_nxt, tp->rcv_wnd, tp->rcv_up, tp->snd_una, tp->snd_nxt,
-	    tp->snd_max);
-	printf("\tsnd_(wl1,wl2,wnd) (%x,%x,%x)\n",
-	    tp->snd_wl1, tp->snd_wl2, tp->snd_wnd);
-#endif /* TCPDEBUG */
-}
diff --git a/c/src/exec/libnetworking/netinet/tcp_debug.h b/c/src/exec/libnetworking/netinet/tcp_debug.h
deleted file mode 100644
index a33743b077..0000000000
--- a/c/src/exec/libnetworking/netinet/tcp_debug.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)tcp_debug.h	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#ifndef _NETINET_TCP_DEBUG_H_
-#define	_NETINET_TCP_DEBUG_H_
-
-struct	tcp_debug {
-	n_time	td_time;
-	short	td_act;
-	short	td_ostate;
-	caddr_t	td_tcb;
-	struct	tcpiphdr td_ti;
-	short	td_req;
-	struct	tcpcb td_cb;
-};
-
-#define	TA_INPUT 	0
-#define	TA_OUTPUT	1
-#define	TA_USER		2
-#define	TA_RESPOND	3
-#define	TA_DROP		4
-
-#ifdef TANAMES
-static char	*tanames[] =
-    { "input", "output", "user", "respond", "drop" };
-#endif
-
-#define	TCP_NDEBUG 100
-
-#ifndef KERNEL
-/* XXX common variables for broken applications. */
-struct	tcp_debug tcp_debug[TCP_NDEBUG];
-int	tcp_debx;
-#endif
-
-#endif /* !_NETINET_TCP_DEBUG_H_ */
diff --git a/c/src/exec/libnetworking/netinet/tcp_fsm.h b/c/src/exec/libnetworking/netinet/tcp_fsm.h
deleted file mode 100644
index 3f2c12f54f..0000000000
--- a/c/src/exec/libnetworking/netinet/tcp_fsm.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)tcp_fsm.h	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#ifndef _NETINET_TCP_FSM_H_
-#define _NETINET_TCP_FSM_H_
-
-/*
- * TCP FSM state definitions.
- * Per RFC793, September, 1981.
- */
-
-#define	TCP_NSTATES	11
-
-#define	TCPS_CLOSED		0	/* closed */
-#define	TCPS_LISTEN		1	/* listening for connection */
-#define	TCPS_SYN_SENT		2	/* active, have sent syn */
-#define	TCPS_SYN_RECEIVED	3	/* have send and received syn */
-/* states < TCPS_ESTABLISHED are those where connections not established */
-#define	TCPS_ESTABLISHED	4	/* established */
-#define	TCPS_CLOSE_WAIT		5	/* rcvd fin, waiting for close */
-/* states > TCPS_CLOSE_WAIT are those where user has closed */
-#define	TCPS_FIN_WAIT_1		6	/* have closed, sent fin */
-#define	TCPS_CLOSING		7	/* closed xchd FIN; await FIN ACK */
-#define	TCPS_LAST_ACK		8	/* had fin and close; await FIN ACK */
-/* states > TCPS_CLOSE_WAIT && < TCPS_FIN_WAIT_2 await ACK of FIN */
-#define	TCPS_FIN_WAIT_2		9	/* have closed, fin is acked */
-#define	TCPS_TIME_WAIT		10	/* in 2*msl quiet wait after close */
-
-#define	TCPS_HAVERCVDSYN(s)	((s) >= TCPS_SYN_RECEIVED)
-#define TCPS_HAVEESTABLISHED(s)	((s) >= TCPS_ESTABLISHED)
-#define	TCPS_HAVERCVDFIN(s)	((s) >= TCPS_TIME_WAIT)
-
-#ifdef	TCPOUTFLAGS
-/*
- * Flags used when sending segments in tcp_output.
- * Basic flags (TH_RST,TH_ACK,TH_SYN,TH_FIN) are totally
- * determined by state, with the proviso that TH_FIN is sent only
- * if all data queued for output is included in the segment.
- */
-static u_char	tcp_outflags[TCP_NSTATES] = {
-    TH_RST|TH_ACK, 0, TH_SYN, TH_SYN|TH_ACK,
-    TH_ACK, TH_ACK,
-    TH_FIN|TH_ACK, TH_FIN|TH_ACK, TH_FIN|TH_ACK, TH_ACK, TH_ACK,
-};
-#endif
-
-#ifdef KPROF
-int	tcp_acounts[TCP_NSTATES][PRU_NREQ];
-#endif
-
-#ifdef	TCPSTATES
-char *tcpstates[] = {
-	"CLOSED",	"LISTEN",	"SYN_SENT",	"SYN_RCVD",
-	"ESTABLISHED",	"CLOSE_WAIT",	"FIN_WAIT_1",	"CLOSING",
-	"LAST_ACK",	"FIN_WAIT_2",	"TIME_WAIT",
-};
-#endif
-
-#endif
diff --git a/c/src/exec/libnetworking/netinet/tcp_input.c b/c/src/exec/libnetworking/netinet/tcp_input.c
deleted file mode 100644
index bc55a79ae2..0000000000
--- a/c/src/exec/libnetworking/netinet/tcp_input.c
+++ /dev/null
@@ -1,2149 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1988, 1990, 1993, 1994, 1995
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)tcp_input.c	8.12 (Berkeley) 5/24/95
- *	$Id$
- */
-
-#include "opt_tcpdebug.h"
-
-#ifndef TUBA_INCLUDE
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/sysctl.h>
-#include <sys/malloc.h>
-#include <sys/mbuf.h>
-#include <sys/protosw.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/errno.h>
-#include <sys/syslog.h>
-
-#include <machine/cpu.h>	/* before tcp_seq.h, for tcp_random18() */
-
-#include <net/if.h>
-#include <net/route.h>
-
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/in_pcb.h>
-#include <netinet/ip_var.h>
-#include <netinet/tcp.h>
-#include <netinet/tcp_fsm.h>
-#include <netinet/tcp_seq.h>
-#include <netinet/tcp_timer.h>
-#include <netinet/tcp_var.h>
-#include <netinet/tcpip.h>
-#ifdef TCPDEBUG
-#include <netinet/tcp_debug.h>
-static struct	tcpiphdr tcp_saveti;
-#endif
-
-static int	tcprexmtthresh = 3;
-tcp_seq	tcp_iss;
-tcp_cc	tcp_ccgen;
-
-struct	tcpstat tcpstat;
-SYSCTL_STRUCT(_net_inet_tcp, TCPCTL_STATS, stats,
-	CTLFLAG_RD, &tcpstat , tcpstat, "");
-
-static int log_in_vain = 0;
-SYSCTL_INT(_net_inet_tcp, OID_AUTO, log_in_vain, CTLFLAG_RW, 
-	&log_in_vain, 0, "");
-
-u_long	tcp_now;
-struct inpcbhead tcb;
-struct inpcbinfo tcbinfo;
-
-static void	 tcp_dooptions __P((struct tcpcb *,
-	    u_char *, int, struct tcpiphdr *, struct tcpopt *));
-static void	 tcp_pulloutofband __P((struct socket *,
-	    struct tcpiphdr *, struct mbuf *));
-static int	 tcp_reass __P((struct tcpcb *, struct tcpiphdr *, struct mbuf *));
-static void	 tcp_xmit_timer __P((struct tcpcb *, int));
-
-#endif /* TUBA_INCLUDE */
-
-/*
- * Insert segment ti into reassembly queue of tcp with
- * control block tp.  Return TH_FIN if reassembly now includes
- * a segment with FIN.  The macro form does the common case inline
- * (segment is the next to be received on an established connection,
- * and the queue is empty), avoiding linkage into and removal
- * from the queue and repetition of various conversions.
- * Set DELACK for segments received in order, but ack immediately
- * when segments are out of order (so fast retransmit can work).
- */
-#ifdef TCP_ACK_HACK
-#define	TCP_REASS(tp, ti, m, so, flags) { \
-	if ((ti)->ti_seq == (tp)->rcv_nxt && \
-	    (tp)->seg_next == (struct tcpiphdr *)(tp) && \
-	    (tp)->t_state == TCPS_ESTABLISHED) { \
-		if (ti->ti_flags & TH_PUSH) \
-			tp->t_flags |= TF_ACKNOW; \
-		else \
-			tp->t_flags |= TF_DELACK; \
-		(tp)->rcv_nxt += (ti)->ti_len; \
-		flags = (ti)->ti_flags & TH_FIN; \
-		tcpstat.tcps_rcvpack++;\
-		tcpstat.tcps_rcvbyte += (ti)->ti_len;\
-		sbappend(&(so)->so_rcv, (m)); \
-		sorwakeup(so); \
-	} else { \
-		(flags) = tcp_reass((tp), (ti), (m)); \
-		tp->t_flags |= TF_ACKNOW; \
-	} \
-}
-#else
-#define	TCP_REASS(tp, ti, m, so, flags) { \
-	if ((ti)->ti_seq == (tp)->rcv_nxt && \
-	    (tp)->seg_next == (struct tcpiphdr *)(tp) && \
-	    (tp)->t_state == TCPS_ESTABLISHED) { \
-		tp->t_flags |= TF_DELACK; \
-		(tp)->rcv_nxt += (ti)->ti_len; \
-		flags = (ti)->ti_flags & TH_FIN; \
-		tcpstat.tcps_rcvpack++;\
-		tcpstat.tcps_rcvbyte += (ti)->ti_len;\
-		sbappend(&(so)->so_rcv, (m)); \
-		sorwakeup(so); \
-	} else { \
-		(flags) = tcp_reass((tp), (ti), (m)); \
-		tp->t_flags |= TF_ACKNOW; \
-	} \
-}
-#endif
-#ifndef TUBA_INCLUDE
-
-static int
-tcp_reass(tp, ti, m)
-	register struct tcpcb *tp;
-	register struct tcpiphdr *ti;
-	struct mbuf *m;
-{
-	register struct tcpiphdr *q;
-	struct socket *so = tp->t_inpcb->inp_socket;
-	int flags;
-
-	/*
-	 * Call with ti==0 after become established to
-	 * force pre-ESTABLISHED data up to user socket.
-	 */
-	if (ti == 0)
-		goto present;
-
-	/*
-	 * Find a segment which begins after this one does.
-	 */
-	for (q = tp->seg_next; q != (struct tcpiphdr *)tp;
-	    q = (struct tcpiphdr *)q->ti_next)
-		if (SEQ_GT(q->ti_seq, ti->ti_seq))
-			break;
-
-	/*
-	 * If there is a preceding segment, it may provide some of
-	 * our data already.  If so, drop the data from the incoming
-	 * segment.  If it provides all of our data, drop us.
-	 */
-	if ((struct tcpiphdr *)q->ti_prev != (struct tcpiphdr *)tp) {
-		register int i;
-		q = (struct tcpiphdr *)q->ti_prev;
-		/* conversion to int (in i) handles seq wraparound */
-		i = q->ti_seq + q->ti_len - ti->ti_seq;
-		if (i > 0) {
-			if (i >= ti->ti_len) {
-				tcpstat.tcps_rcvduppack++;
-				tcpstat.tcps_rcvdupbyte += ti->ti_len;
-				m_freem(m);
-				/*
-				 * Try to present any queued data
-				 * at the left window edge to the user.
-				 * This is needed after the 3-WHS
-				 * completes.
-				 */
-				goto present;	/* ??? */
-			}
-			m_adj(m, i);
-			ti->ti_len -= i;
-			ti->ti_seq += i;
-		}
-		q = (struct tcpiphdr *)(q->ti_next);
-	}
-	tcpstat.tcps_rcvoopack++;
-	tcpstat.tcps_rcvoobyte += ti->ti_len;
-	REASS_MBUF(ti) = m;		/* XXX */
-
-	/*
-	 * While we overlap succeeding segments trim them or,
-	 * if they are completely covered, dequeue them.
-	 */
-	while (q != (struct tcpiphdr *)tp) {
-		register int i = (ti->ti_seq + ti->ti_len) - q->ti_seq;
-		if (i <= 0)
-			break;
-		if (i < q->ti_len) {
-			q->ti_seq += i;
-			q->ti_len -= i;
-			m_adj(REASS_MBUF(q), i);
-			break;
-		}
-		q = (struct tcpiphdr *)q->ti_next;
-		m = REASS_MBUF((struct tcpiphdr *)q->ti_prev);
-		remque(q->ti_prev);
-		m_freem(m);
-	}
-
-	/*
-	 * Stick new segment in its place.
-	 */
-	insque(ti, q->ti_prev);
-
-present:
-	/*
-	 * Present data to user, advancing rcv_nxt through
-	 * completed sequence space.
-	 */
-	if (!TCPS_HAVEESTABLISHED(tp->t_state))
-		return (0);
-	ti = tp->seg_next;
-	if (ti == (struct tcpiphdr *)tp || ti->ti_seq != tp->rcv_nxt)
-		return (0);
-	do {
-		tp->rcv_nxt += ti->ti_len;
-		flags = ti->ti_flags & TH_FIN;
-		remque(ti);
-		m = REASS_MBUF(ti);
-		ti = (struct tcpiphdr *)ti->ti_next;
-		if (so->so_state & SS_CANTRCVMORE)
-			m_freem(m);
-		else
-			sbappend(&so->so_rcv, m);
-	} while (ti != (struct tcpiphdr *)tp && ti->ti_seq == tp->rcv_nxt);
-	sorwakeup(so);
-	return (flags);
-}
-
-/*
- * TCP input routine, follows pages 65-76 of the
- * protocol specification dated September, 1981 very closely.
- */
-void
-tcp_input(m, iphlen)
-	register struct mbuf *m;
-	int iphlen;
-{
-	register struct tcpiphdr *ti;
-	register struct inpcb *inp;
-	u_char *optp = NULL;
-	int optlen = 0;
-	int len, tlen, off;
-	register struct tcpcb *tp = 0;
-	register int tiflags;
-	struct socket *so = 0;
-	int todrop, acked, ourfinisacked, needoutput = 0;
-	struct in_addr laddr;
-	int dropsocket = 0;
-	int iss = 0;
-	u_long tiwin;
-	struct tcpopt to;		/* options in this segment */
-	struct rmxp_tao *taop;		/* pointer to our TAO cache entry */
-	struct rmxp_tao	tao_noncached;	/* in case there's no cached entry */
-#ifdef TCPDEBUG
-	short ostate = 0;
-#endif
-
-	bzero((char *)&to, sizeof(to));
-
-	tcpstat.tcps_rcvtotal++;
-	/*
-	 * Get IP and TCP header together in first mbuf.
-	 * Note: IP leaves IP header in first mbuf.
-	 */
-	ti = mtod(m, struct tcpiphdr *);
-	if (iphlen > sizeof (struct ip))
-		ip_stripoptions(m, (struct mbuf *)0);
-	if (m->m_len < sizeof (struct tcpiphdr)) {
-		if ((m = m_pullup(m, sizeof (struct tcpiphdr))) == 0) {
-			tcpstat.tcps_rcvshort++;
-			return;
-		}
-		ti = mtod(m, struct tcpiphdr *);
-	}
-
-	/*
-	 * Checksum extended TCP header and data.
-	 */
-	tlen = ((struct ip *)ti)->ip_len;
-	len = sizeof (struct ip) + tlen;
-	ti->ti_next = ti->ti_prev = 0;
-	ti->ti_x1 = 0;
-	ti->ti_len = (u_short)tlen;
-	HTONS(ti->ti_len);
-	ti->ti_sum = in_cksum(m, len);
-	if (ti->ti_sum) {
-		tcpstat.tcps_rcvbadsum++;
-		goto drop;
-	}
-#endif /* TUBA_INCLUDE */
-
-	/*
-	 * Check that TCP offset makes sense,
-	 * pull out TCP options and adjust length.		XXX
-	 */
-	off = ti->ti_off << 2;
-	if (off < sizeof (struct tcphdr) || off > tlen) {
-		tcpstat.tcps_rcvbadoff++;
-		goto drop;
-	}
-	tlen -= off;
-	ti->ti_len = tlen;
-	if (off > sizeof (struct tcphdr)) {
-		if (m->m_len < sizeof(struct ip) + off) {
-			if ((m = m_pullup(m, sizeof (struct ip) + off)) == 0) {
-				tcpstat.tcps_rcvshort++;
-				return;
-			}
-			ti = mtod(m, struct tcpiphdr *);
-		}
-		optlen = off - sizeof (struct tcphdr);
-		optp = mtod(m, u_char *) + sizeof (struct tcpiphdr);
-	}
-	tiflags = ti->ti_flags;
-
-	/*
-	 * Convert TCP protocol specific fields to host format.
-	 */
-	NTOHL(ti->ti_seq);
-	NTOHL(ti->ti_ack);
-	NTOHS(ti->ti_win);
-	NTOHS(ti->ti_urp);
-
-	/*
-	 * Drop TCP, IP headers and TCP options.
-	 */
-	m->m_data += sizeof(struct tcpiphdr)+off-sizeof(struct tcphdr);
-	m->m_len  -= sizeof(struct tcpiphdr)+off-sizeof(struct tcphdr);
-
-	/*
-	 * Locate pcb for segment.
-	 */
-findpcb:
-	inp = in_pcblookuphash(&tcbinfo, ti->ti_src, ti->ti_sport,
-	    ti->ti_dst, ti->ti_dport, 1);
-
-	/*
-	 * If the state is CLOSED (i.e., TCB does not exist) then
-	 * all data in the incoming segment is discarded.
-	 * If the TCB exists but is in CLOSED state, it is embryonic,
-	 * but should either do a listen or a connect soon.
-	 */
-	if (inp == NULL) {
-		if (log_in_vain && tiflags & TH_SYN) {
-			char buf[4*sizeof "123"];
-
-			strcpy(buf, inet_ntoa(ti->ti_dst));
-			log(LOG_INFO, "Connection attempt to TCP %s:%d"
-			    " from %s:%d\n",
-			    buf, ntohs(ti->ti_dport),
-			    inet_ntoa(ti->ti_src), ntohs(ti->ti_sport));
-		}
-		goto dropwithreset;
-	}
-	tp = intotcpcb(inp);
-	if (tp == 0)
-		goto dropwithreset;
-	if (tp->t_state == TCPS_CLOSED)
-		goto drop;
-
-	/* Unscale the window into a 32-bit value. */
-	if ((tiflags & TH_SYN) == 0)
-		tiwin = ti->ti_win << tp->snd_scale;
-	else
-		tiwin = ti->ti_win;
-
-	so = inp->inp_socket;
-	if (so->so_options & (SO_DEBUG|SO_ACCEPTCONN)) {
-#ifdef TCPDEBUG
-		if (so->so_options & SO_DEBUG) {
-			ostate = tp->t_state;
-			tcp_saveti = *ti;
-		}
-#endif
-		if (so->so_options & SO_ACCEPTCONN) {
-			register struct tcpcb *tp0 = tp;
-			struct socket *so2;
-			if ((tiflags & (TH_RST|TH_ACK|TH_SYN)) != TH_SYN) {
-				/*
-				 * Note: dropwithreset makes sure we don't
-				 * send a RST in response to a RST.
-				 */
-				if (tiflags & TH_ACK) {
-					tcpstat.tcps_badsyn++;
-					goto dropwithreset;
-				}
-				goto drop;
-			}
-			so2 = sonewconn(so, 0);
-			if (so2 == 0) {
-				tcpstat.tcps_listendrop++;
-				so2 = sodropablereq(so);
-				if (so2) {
-					tcp_drop(sototcpcb(so2), ETIMEDOUT);
-					so2 = sonewconn(so, 0);
-				}
-				if (!so2)
-					goto drop;
-			}
-			so = so2;
-			/*
-			 * This is ugly, but ....
-			 *
-			 * Mark socket as temporary until we're
-			 * committed to keeping it.  The code at
-			 * ``drop'' and ``dropwithreset'' check the
-			 * flag dropsocket to see if the temporary
-			 * socket created here should be discarded.
-			 * We mark the socket as discardable until
-			 * we're committed to it below in TCPS_LISTEN.
-			 */
-			dropsocket++;
-			inp = (struct inpcb *)so->so_pcb;
-			inp->inp_laddr = ti->ti_dst;
-			inp->inp_lport = ti->ti_dport;
-			in_pcbrehash(inp);
-#if BSD>=43
-			inp->inp_options = ip_srcroute();
-#endif
-			tp = intotcpcb(inp);
-			tp->t_state = TCPS_LISTEN;
-			tp->t_flags |= tp0->t_flags & (TF_NOPUSH|TF_NOOPT);
-
-			/* Compute proper scaling value from buffer space */
-			while (tp->request_r_scale < TCP_MAX_WINSHIFT &&
-			   TCP_MAXWIN << tp->request_r_scale < so->so_rcv.sb_hiwat)
-				tp->request_r_scale++;
-		}
-	}
-
-	/*
-	 * Segment received on connection.
-	 * Reset idle time and keep-alive timer.
-	 */
-	tp->t_idle = 0;
-	if (TCPS_HAVEESTABLISHED(tp->t_state))
-		tp->t_timer[TCPT_KEEP] = tcp_keepidle;
-
-	/*
-	 * Process options if not in LISTEN state,
-	 * else do it below (after getting remote address).
-	 */
-	if (tp->t_state != TCPS_LISTEN)
-		tcp_dooptions(tp, optp, optlen, ti, &to);
-
-	/*
-	 * Header prediction: check for the two common cases
-	 * of a uni-directional data xfer.  If the packet has
-	 * no control flags, is in-sequence, the window didn't
-	 * change and we're not retransmitting, it's a
-	 * candidate.  If the length is zero and the ack moved
-	 * forward, we're the sender side of the xfer.  Just
-	 * free the data acked & wake any higher level process
-	 * that was blocked waiting for space.  If the length
-	 * is non-zero and the ack didn't move, we're the
-	 * receiver side.  If we're getting packets in-order
-	 * (the reassembly queue is empty), add the data to
-	 * the socket buffer and note that we need a delayed ack.
-	 * Make sure that the hidden state-flags are also off.
-	 * Since we check for TCPS_ESTABLISHED above, it can only
-	 * be TH_NEEDSYN.
-	 */
-	if (tp->t_state == TCPS_ESTABLISHED &&
-	    (tiflags & (TH_SYN|TH_FIN|TH_RST|TH_URG|TH_ACK)) == TH_ACK &&
-	    ((tp->t_flags & (TF_NEEDSYN|TF_NEEDFIN)) == 0) &&
-	    ((to.to_flag & TOF_TS) == 0 ||
-	     TSTMP_GEQ(to.to_tsval, tp->ts_recent)) &&
-	    /*
-	     * Using the CC option is compulsory if once started:
-	     *   the segment is OK if no T/TCP was negotiated or
-	     *   if the segment has a CC option equal to CCrecv
-	     */
-	    ((tp->t_flags & (TF_REQ_CC|TF_RCVD_CC)) != (TF_REQ_CC|TF_RCVD_CC) ||
-	     ((to.to_flag & TOF_CC) != 0 && to.to_cc == tp->cc_recv)) &&
-	    ti->ti_seq == tp->rcv_nxt &&
-	    tiwin && tiwin == tp->snd_wnd &&
-	    tp->snd_nxt == tp->snd_max) {
-
-		/*
-		 * If last ACK falls within this segment's sequence numbers,
-		 * record the timestamp.
-		 * NOTE that the test is modified according to the latest
-		 * proposal of the tcplw@cray.com list (Braden 1993/04/26).
-		 */
-		if ((to.to_flag & TOF_TS) != 0 &&
-		   SEQ_LEQ(ti->ti_seq, tp->last_ack_sent)) {
-			tp->ts_recent_age = tcp_now;
-			tp->ts_recent = to.to_tsval;
-		}
-
-		if (ti->ti_len == 0) {
-			if (SEQ_GT(ti->ti_ack, tp->snd_una) &&
-			    SEQ_LEQ(ti->ti_ack, tp->snd_max) &&
-			    tp->snd_cwnd >= tp->snd_wnd &&
-			    tp->t_dupacks < tcprexmtthresh) {
-				/*
-				 * this is a pure ack for outstanding data.
-				 */
-				++tcpstat.tcps_predack;
-				if ((to.to_flag & TOF_TS) != 0)
-					tcp_xmit_timer(tp,
-					    tcp_now - to.to_tsecr + 1);
-				else if (tp->t_rtt &&
-					    SEQ_GT(ti->ti_ack, tp->t_rtseq))
-					tcp_xmit_timer(tp, tp->t_rtt);
-				acked = ti->ti_ack - tp->snd_una;
-				tcpstat.tcps_rcvackpack++;
-				tcpstat.tcps_rcvackbyte += acked;
-				sbdrop(&so->so_snd, acked);
-				tp->snd_una = ti->ti_ack;
-				m_freem(m);
-
-				/*
-				 * If all outstanding data are acked, stop
-				 * retransmit timer, otherwise restart timer
-				 * using current (possibly backed-off) value.
-				 * If process is waiting for space,
-				 * wakeup/selwakeup/signal.  If data
-				 * are ready to send, let tcp_output
-				 * decide between more output or persist.
-				 */
-				if (tp->snd_una == tp->snd_max)
-					tp->t_timer[TCPT_REXMT] = 0;
-				else if (tp->t_timer[TCPT_PERSIST] == 0)
-					tp->t_timer[TCPT_REXMT] = tp->t_rxtcur;
-
-				if (so->so_snd.sb_flags & SB_NOTIFY)
-					sowwakeup(so);
-				if (so->so_snd.sb_cc)
-					(void) tcp_output(tp);
-				return;
-			}
-		} else if (ti->ti_ack == tp->snd_una &&
-		    tp->seg_next == (struct tcpiphdr *)tp &&
-		    ti->ti_len <= sbspace(&so->so_rcv)) {
-			/*
-			 * this is a pure, in-sequence data packet
-			 * with nothing on the reassembly queue and
-			 * we have enough buffer space to take it.
-			 */
-			++tcpstat.tcps_preddat;
-			tp->rcv_nxt += ti->ti_len;
-			tcpstat.tcps_rcvpack++;
-			tcpstat.tcps_rcvbyte += ti->ti_len;
-			/*
-			 * Add data to socket buffer.
-			 */
-			sbappend(&so->so_rcv, m);
-			sorwakeup(so);
-#ifdef TCP_ACK_HACK
-			/*
-			 * If this is a short packet, then ACK now - with Nagel
-			 *	congestion avoidance sender won't send more until
-			 *	he gets an ACK.
-			 */
-			if (tiflags & TH_PUSH) {
-				tp->t_flags |= TF_ACKNOW;
-				tcp_output(tp);
-			} else {
-				tp->t_flags |= TF_DELACK;
-			}
-#else
-			tp->t_flags |= TF_DELACK;
-#endif
-			return;
-		}
-	}
-
-	/*
-	 * Calculate amount of space in receive window,
-	 * and then do TCP input processing.
-	 * Receive window is amount of space in rcv queue,
-	 * but not less than advertised window.
-	 */
-	{ int win;
-
-	win = sbspace(&so->so_rcv);
-	if (win < 0)
-		win = 0;
-	tp->rcv_wnd = imax(win, (int)(tp->rcv_adv - tp->rcv_nxt));
-	}
-
-	switch (tp->t_state) {
-
-	/*
-	 * If the state is LISTEN then ignore segment if it contains an RST.
-	 * If the segment contains an ACK then it is bad and send a RST.
-	 * If it does not contain a SYN then it is not interesting; drop it.
-	 * If it is from this socket, drop it, it must be forged.
-	 * Don't bother responding if the destination was a broadcast.
-	 * Otherwise initialize tp->rcv_nxt, and tp->irs, select an initial
-	 * tp->iss, and send a segment:
-	 *     <SEQ=ISS><ACK=RCV_NXT><CTL=SYN,ACK>
-	 * Also initialize tp->snd_nxt to tp->iss+1 and tp->snd_una to tp->iss.
-	 * Fill in remote peer address fields if not previously specified.
-	 * Enter SYN_RECEIVED state, and process any other fields of this
-	 * segment in this state.
-	 */
-	case TCPS_LISTEN: {
-		struct mbuf *am;
-		register struct sockaddr_in *sin;
-
-		if (tiflags & TH_RST)
-			goto drop;
-		if (tiflags & TH_ACK)
-			goto dropwithreset;
-		if ((tiflags & TH_SYN) == 0)
-			goto drop;
-		if ((ti->ti_dport == ti->ti_sport) &&
-		    (ti->ti_dst.s_addr == ti->ti_src.s_addr))
-			goto drop;
-		/*
-		 * RFC1122 4.2.3.10, p. 104: discard bcast/mcast SYN
-		 * in_broadcast() should never return true on a received
-		 * packet with M_BCAST not set.
-		 */
-		if (m->m_flags & (M_BCAST|M_MCAST) ||
-		    IN_MULTICAST(ntohl(ti->ti_dst.s_addr)))
-			goto drop;
-		am = m_get(M_DONTWAIT, MT_SONAME);	/* XXX */
-		if (am == NULL)
-			goto drop;
-		am->m_len = sizeof (struct sockaddr_in);
-		sin = mtod(am, struct sockaddr_in *);
-		sin->sin_family = AF_INET;
-		sin->sin_len = sizeof(*sin);
-		sin->sin_addr = ti->ti_src;
-		sin->sin_port = ti->ti_sport;
-		bzero((caddr_t)sin->sin_zero, sizeof(sin->sin_zero));
-		laddr = inp->inp_laddr;
-		if (inp->inp_laddr.s_addr == INADDR_ANY)
-			inp->inp_laddr = ti->ti_dst;
-		if (in_pcbconnect(inp, am)) {
-			inp->inp_laddr = laddr;
-			(void) m_free(am);
-			goto drop;
-		}
-		(void) m_free(am);
-		tp->t_template = tcp_template(tp);
-		if (tp->t_template == 0) {
-			tp = tcp_drop(tp, ENOBUFS);
-			dropsocket = 0;		/* socket is already gone */
-			goto drop;
-		}
-		if ((taop = tcp_gettaocache(inp)) == NULL) {
-			taop = &tao_noncached;
-			bzero(taop, sizeof(*taop));
-		}
-		tcp_dooptions(tp, optp, optlen, ti, &to);
-		if (iss)
-			tp->iss = iss;
-		else
-			tp->iss = tcp_iss;
-		tcp_iss += TCP_ISSINCR/4;
-		tp->irs = ti->ti_seq;
-		tcp_sendseqinit(tp);
-		tcp_rcvseqinit(tp);
-		/*
-		 * Initialization of the tcpcb for transaction;
-		 *   set SND.WND = SEG.WND,
-		 *   initialize CCsend and CCrecv.
-		 */
-		tp->snd_wnd = tiwin;	/* initial send-window */
-		tp->cc_send = CC_INC(tcp_ccgen);
-		tp->cc_recv = to.to_cc;
-		/*
-		 * Perform TAO test on incoming CC (SEG.CC) option, if any.
-		 * - compare SEG.CC against cached CC from the same host,
-		 *	if any.
-		 * - if SEG.CC > chached value, SYN must be new and is accepted
-		 *	immediately: save new CC in the cache, mark the socket
-		 *	connected, enter ESTABLISHED state, turn on flag to
-		 *	send a SYN in the next segment.
-		 *	A virtual advertised window is set in rcv_adv to
-		 *	initialize SWS prevention.  Then enter normal segment
-		 *	processing: drop SYN, process data and FIN.
-		 * - otherwise do a normal 3-way handshake.
-		 */
-		if ((to.to_flag & TOF_CC) != 0) {
-		    if (taop->tao_cc != 0 && CC_GT(to.to_cc, taop->tao_cc)) {
-			taop->tao_cc = to.to_cc;
-			tp->t_state = TCPS_ESTABLISHED;
-
-			/*
-			 * If there is a FIN, or if there is data and the
-			 * connection is local, then delay SYN,ACK(SYN) in
-			 * the hope of piggy-backing it on a response
-			 * segment.  Otherwise must send ACK now in case
-			 * the other side is slow starting.
-			 */
-			if ((tiflags & TH_FIN) || (ti->ti_len != 0 &&
-			    in_localaddr(inp->inp_faddr)))
-				tp->t_flags |= (TF_DELACK | TF_NEEDSYN);
-			else
-				tp->t_flags |= (TF_ACKNOW | TF_NEEDSYN);
-
-			/*
-			 * Limit the `virtual advertised window' to TCP_MAXWIN
-			 * here.  Even if we requested window scaling, it will
-			 * become effective only later when our SYN is acked.
-			 */
-			tp->rcv_adv += min(tp->rcv_wnd, TCP_MAXWIN);
-			tcpstat.tcps_connects++;
-			soisconnected(so);
-			tp->t_timer[TCPT_KEEP] = tcp_keepinit;
-			dropsocket = 0;		/* committed to socket */
-			tcpstat.tcps_accepts++;
-			goto trimthenstep6;
-		    }
-		/* else do standard 3-way handshake */
-		} else {
-		    /*
-		     * No CC option, but maybe CC.NEW:
-		     *   invalidate cached value.
-		     */
-		     taop->tao_cc = 0;
-		}
-		/*
-		 * TAO test failed or there was no CC option,
-		 *    do a standard 3-way handshake.
-		 */
-		tp->t_flags |= TF_ACKNOW;
-		tp->t_state = TCPS_SYN_RECEIVED;
-		tp->t_timer[TCPT_KEEP] = tcp_keepinit;
-		dropsocket = 0;		/* committed to socket */
-		tcpstat.tcps_accepts++;
-		goto trimthenstep6;
-		}
-
-	/*
-	 * If the state is SYN_RECEIVED:
-	 *	if seg contains SYN/ACK, send a RST.
-	 *	if seg contains an ACK, but not for our SYN/ACK, send a RST.
-	 */
-	case TCPS_SYN_RECEIVED:
-		if (tiflags & TH_ACK) {
-			if (tiflags & TH_SYN) {
-				tcpstat.tcps_badsyn++;
-				goto dropwithreset;
-			}
-			if (SEQ_LEQ(ti->ti_ack, tp->snd_una) ||
-			    SEQ_GT(ti->ti_ack, tp->snd_max))
-				goto dropwithreset;
-		}
-		break;
-
-	/*
-	 * If the state is SYN_SENT:
-	 *	if seg contains an ACK, but not for our SYN, drop the input.
-	 *	if seg contains a RST, then drop the connection.
-	 *	if seg does not contain SYN, then drop it.
-	 * Otherwise this is an acceptable SYN segment
-	 *	initialize tp->rcv_nxt and tp->irs
-	 *	if seg contains ack then advance tp->snd_una
-	 *	if SYN has been acked change to ESTABLISHED else SYN_RCVD state
-	 *	arrange for segment to be acked (eventually)
-	 *	continue processing rest of data/controls, beginning with URG
-	 */
-	case TCPS_SYN_SENT:
-		if ((taop = tcp_gettaocache(inp)) == NULL) {
-			taop = &tao_noncached;
-			bzero(taop, sizeof(*taop));
-		}
-
-		if ((tiflags & TH_ACK) &&
-		    (SEQ_LEQ(ti->ti_ack, tp->iss) ||
-		     SEQ_GT(ti->ti_ack, tp->snd_max))) {
-			/*
-			 * If we have a cached CCsent for the remote host,
-			 * hence we haven't just crashed and restarted,
-			 * do not send a RST.  This may be a retransmission
-			 * from the other side after our earlier ACK was lost.
-			 * Our new SYN, when it arrives, will serve as the
-			 * needed ACK.
-			 */
-			if (taop->tao_ccsent != 0)
-				goto drop;
-			else
-				goto dropwithreset;
-		}
-		if (tiflags & TH_RST) {
-			if (tiflags & TH_ACK)
-				tp = tcp_drop(tp, ECONNREFUSED);
-			goto drop;
-		}
-		if ((tiflags & TH_SYN) == 0)
-			goto drop;
-		tp->snd_wnd = ti->ti_win;	/* initial send window */
-		tp->cc_recv = to.to_cc;		/* foreign CC */
-
-		tp->irs = ti->ti_seq;
-		tcp_rcvseqinit(tp);
-		if (tiflags & TH_ACK) {
-			/*
-			 * Our SYN was acked.  If segment contains CC.ECHO
-			 * option, check it to make sure this segment really
-			 * matches our SYN.  If not, just drop it as old
-			 * duplicate, but send an RST if we're still playing
-			 * by the old rules.  If no CC.ECHO option, make sure
-			 * we don't get fooled into using T/TCP.
-			 */
-			if (to.to_flag & TOF_CCECHO) {
-				if (tp->cc_send != to.to_ccecho)
-					if (taop->tao_ccsent != 0)
-						goto drop;
-					else
-						goto dropwithreset;
-			} else
-				tp->t_flags &= ~TF_RCVD_CC;
-			tcpstat.tcps_connects++;
-			soisconnected(so);
-			/* Do window scaling on this connection? */
-			if ((tp->t_flags & (TF_RCVD_SCALE|TF_REQ_SCALE)) ==
-				(TF_RCVD_SCALE|TF_REQ_SCALE)) {
-				tp->snd_scale = tp->requested_s_scale;
-				tp->rcv_scale = tp->request_r_scale;
-			}
-			/* Segment is acceptable, update cache if undefined. */
-			if (taop->tao_ccsent == 0)
-				taop->tao_ccsent = to.to_ccecho;
-
-			tp->rcv_adv += tp->rcv_wnd;
-			tp->snd_una++;		/* SYN is acked */
-			/*
-			 * If there's data, delay ACK; if there's also a FIN
-			 * ACKNOW will be turned on later.
-			 */
-			if (ti->ti_len != 0)
-				tp->t_flags |= TF_DELACK;
-			else
-				tp->t_flags |= TF_ACKNOW;
-			/*
-			 * Received <SYN,ACK> in SYN_SENT[*] state.
-			 * Transitions:
-			 *	SYN_SENT  --> ESTABLISHED
-			 *	SYN_SENT* --> FIN_WAIT_1
-			 */
-			if (tp->t_flags & TF_NEEDFIN) {
-				tp->t_state = TCPS_FIN_WAIT_1;
-				tp->t_flags &= ~TF_NEEDFIN;
-				tiflags &= ~TH_SYN;
-			} else {
-				tp->t_state = TCPS_ESTABLISHED;
-				tp->t_timer[TCPT_KEEP] = tcp_keepidle;
-			}
-		} else {
-		/*
-		 *  Received initial SYN in SYN-SENT[*] state => simul-
-		 *  taneous open.  If segment contains CC option and there is
-		 *  a cached CC, apply TAO test; if it succeeds, connection is
-		 *  half-synchronized.  Otherwise, do 3-way handshake:
-		 *        SYN-SENT -> SYN-RECEIVED
-		 *        SYN-SENT* -> SYN-RECEIVED*
-		 *  If there was no CC option, clear cached CC value.
-		 */
-			tp->t_flags |= TF_ACKNOW;
-			tp->t_timer[TCPT_REXMT] = 0;
-			if (to.to_flag & TOF_CC) {
-				if (taop->tao_cc != 0 &&
-				    CC_GT(to.to_cc, taop->tao_cc)) {
-					/*
-					 * update cache and make transition:
-					 *        SYN-SENT -> ESTABLISHED*
-					 *        SYN-SENT* -> FIN-WAIT-1*
-					 */
-					taop->tao_cc = to.to_cc;
-					if (tp->t_flags & TF_NEEDFIN) {
-						tp->t_state = TCPS_FIN_WAIT_1;
-						tp->t_flags &= ~TF_NEEDFIN;
-					} else {
-						tp->t_state = TCPS_ESTABLISHED;
-						tp->t_timer[TCPT_KEEP] = tcp_keepidle;
-					}
-					tp->t_flags |= TF_NEEDSYN;
-				} else
-					tp->t_state = TCPS_SYN_RECEIVED;
-			} else {
-				/* CC.NEW or no option => invalidate cache */
-				taop->tao_cc = 0;
-				tp->t_state = TCPS_SYN_RECEIVED;
-			}
-		}
-
-trimthenstep6:
-		/*
-		 * Advance ti->ti_seq to correspond to first data byte.
-		 * If data, trim to stay within window,
-		 * dropping FIN if necessary.
-		 */
-		ti->ti_seq++;
-		if (ti->ti_len > tp->rcv_wnd) {
-			todrop = ti->ti_len - tp->rcv_wnd;
-			m_adj(m, -todrop);
-			ti->ti_len = tp->rcv_wnd;
-			tiflags &= ~TH_FIN;
-			tcpstat.tcps_rcvpackafterwin++;
-			tcpstat.tcps_rcvbyteafterwin += todrop;
-		}
-		tp->snd_wl1 = ti->ti_seq - 1;
-		tp->rcv_up = ti->ti_seq;
-		/*
-		 *  Client side of transaction: already sent SYN and data.
-		 *  If the remote host used T/TCP to validate the SYN,
-		 *  our data will be ACK'd; if so, enter normal data segment
-		 *  processing in the middle of step 5, ack processing.
-		 *  Otherwise, goto step 6.
-		 */
- 		if (tiflags & TH_ACK)
-			goto process_ACK;
-		goto step6;
-	/*
-	 * If the state is LAST_ACK or CLOSING or TIME_WAIT:
-	 *	if segment contains a SYN and CC [not CC.NEW] option:
-	 *              if state == TIME_WAIT and connection duration > MSL,
-	 *                  drop packet and send RST;
-	 *
-	 *		if SEG.CC > CCrecv then is new SYN, and can implicitly
-	 *		    ack the FIN (and data) in retransmission queue.
-	 *                  Complete close and delete TCPCB.  Then reprocess
-	 *                  segment, hoping to find new TCPCB in LISTEN state;
-	 *
-	 *		else must be old SYN; drop it.
-	 *      else do normal processing.
-	 */
-	case TCPS_LAST_ACK:
-	case TCPS_CLOSING:
-	case TCPS_TIME_WAIT:
-		if ((tiflags & TH_SYN) &&
-		    (to.to_flag & TOF_CC) && tp->cc_recv != 0) {
-			if (tp->t_state == TCPS_TIME_WAIT &&
-					tp->t_duration > TCPTV_MSL)
-				goto dropwithreset;
-			if (CC_GT(to.to_cc, tp->cc_recv)) {
-				tp = tcp_close(tp);
-				goto findpcb;
-			}
-			else
-				goto drop;
-		}
- 		break;  /* continue normal processing */
-	}
-
-	/*
-	 * States other than LISTEN or SYN_SENT.
-	 * First check timestamp, if present.
-	 * Then check the connection count, if present.
-	 * Then check that at least some bytes of segment are within
-	 * receive window.  If segment begins before rcv_nxt,
-	 * drop leading data (and SYN); if nothing left, just ack.
-	 *
-	 * RFC 1323 PAWS: If we have a timestamp reply on this segment
-	 * and it's less than ts_recent, drop it.
-	 */
-	if ((to.to_flag & TOF_TS) != 0 && (tiflags & TH_RST) == 0 &&
-	    tp->ts_recent && TSTMP_LT(to.to_tsval, tp->ts_recent)) {
-
-		/* Check to see if ts_recent is over 24 days old.  */
-		if ((int)(tcp_now - tp->ts_recent_age) > TCP_PAWS_IDLE) {
-			/*
-			 * Invalidate ts_recent.  If this segment updates
-			 * ts_recent, the age will be reset later and ts_recent
-			 * will get a valid value.  If it does not, setting
-			 * ts_recent to zero will at least satisfy the
-			 * requirement that zero be placed in the timestamp
-			 * echo reply when ts_recent isn't valid.  The
-			 * age isn't reset until we get a valid ts_recent
-			 * because we don't want out-of-order segments to be
-			 * dropped when ts_recent is old.
-			 */
-			tp->ts_recent = 0;
-		} else {
-			tcpstat.tcps_rcvduppack++;
-			tcpstat.tcps_rcvdupbyte += ti->ti_len;
-			tcpstat.tcps_pawsdrop++;
-			goto dropafterack;
-		}
-	}
-
-	/*
-	 * T/TCP mechanism
-	 *   If T/TCP was negotiated and the segment doesn't have CC,
-	 *   or if it's CC is wrong then drop the segment.
-	 *   RST segments do not have to comply with this.
-	 */
-	if ((tp->t_flags & (TF_REQ_CC|TF_RCVD_CC)) == (TF_REQ_CC|TF_RCVD_CC) &&
-	    ((to.to_flag & TOF_CC) == 0 || tp->cc_recv != to.to_cc) &&
-	    (tiflags & TH_RST) == 0)
- 		goto dropafterack;
-
-	todrop = tp->rcv_nxt - ti->ti_seq;
-	if (todrop > 0) {
-		if (tiflags & TH_SYN) {
-			tiflags &= ~TH_SYN;
-			ti->ti_seq++;
-			if (ti->ti_urp > 1)
-				ti->ti_urp--;
-			else
-				tiflags &= ~TH_URG;
-			todrop--;
-		}
-		/*
-		 * Following if statement from Stevens, vol. 2, p. 960.
-		 */
-		if (todrop > ti->ti_len
-		    || (todrop == ti->ti_len && (tiflags & TH_FIN) == 0)) {
-			/*
-			 * Any valid FIN must be to the left of the window.
-			 * At this point the FIN must be a duplicate or out
-			 * of sequence; drop it.
-			 */
-			tiflags &= ~TH_FIN;
-
-			/*
-			 * Send an ACK to resynchronize and drop any data.
-			 * But keep on processing for RST or ACK.
-			 */
-			tp->t_flags |= TF_ACKNOW;
-			todrop = ti->ti_len;
-			tcpstat.tcps_rcvduppack++;
-			tcpstat.tcps_rcvdupbyte += todrop;
-		} else {
-			tcpstat.tcps_rcvpartduppack++;
-			tcpstat.tcps_rcvpartdupbyte += todrop;
-		}
-		m_adj(m, todrop);
-		ti->ti_seq += todrop;
-		ti->ti_len -= todrop;
-		if (ti->ti_urp > todrop)
-			ti->ti_urp -= todrop;
-		else {
-			tiflags &= ~TH_URG;
-			ti->ti_urp = 0;
-		}
-	}
-
-	/*
-	 * If new data are received on a connection after the
-	 * user processes are gone, then RST the other end.
-	 */
-	if ((so->so_state & SS_NOFDREF) &&
-	    tp->t_state > TCPS_CLOSE_WAIT && ti->ti_len) {
-		tp = tcp_close(tp);
-		tcpstat.tcps_rcvafterclose++;
-		goto dropwithreset;
-	}
-
-	/*
-	 * If segment ends after window, drop trailing data
-	 * (and PUSH and FIN); if nothing left, just ACK.
-	 */
-	todrop = (ti->ti_seq+ti->ti_len) - (tp->rcv_nxt+tp->rcv_wnd);
-	if (todrop > 0) {
-		tcpstat.tcps_rcvpackafterwin++;
-		if (todrop >= ti->ti_len) {
-			tcpstat.tcps_rcvbyteafterwin += ti->ti_len;
-			/*
-			 * If a new connection request is received
-			 * while in TIME_WAIT, drop the old connection
-			 * and start over if the sequence numbers
-			 * are above the previous ones.
-			 */
-			if (tiflags & TH_SYN &&
-			    tp->t_state == TCPS_TIME_WAIT &&
-			    SEQ_GT(ti->ti_seq, tp->rcv_nxt)) {
-				iss = tp->rcv_nxt + TCP_ISSINCR;
-				tp = tcp_close(tp);
-				goto findpcb;
-			}
-			/*
-			 * If window is closed can only take segments at
-			 * window edge, and have to drop data and PUSH from
-			 * incoming segments.  Continue processing, but
-			 * remember to ack.  Otherwise, drop segment
-			 * and ack.
-			 */
-			if (tp->rcv_wnd == 0 && ti->ti_seq == tp->rcv_nxt) {
-				tp->t_flags |= TF_ACKNOW;
-				tcpstat.tcps_rcvwinprobe++;
-			} else
-				goto dropafterack;
-		} else
-			tcpstat.tcps_rcvbyteafterwin += todrop;
-		m_adj(m, -todrop);
-		ti->ti_len -= todrop;
-		tiflags &= ~(TH_PUSH|TH_FIN);
-	}
-
-	/*
-	 * If last ACK falls within this segment's sequence numbers,
-	 * record its timestamp.
-	 * NOTE that the test is modified according to the latest
-	 * proposal of the tcplw@cray.com list (Braden 1993/04/26).
-	 */
-	if ((to.to_flag & TOF_TS) != 0 &&
-	    SEQ_LEQ(ti->ti_seq, tp->last_ack_sent)) {
-		tp->ts_recent_age = tcp_now;
-		tp->ts_recent = to.to_tsval;
-	}
-
-	/*
-	 * If the RST bit is set examine the state:
-	 *    SYN_RECEIVED STATE:
-	 *	If passive open, return to LISTEN state.
-	 *	If active open, inform user that connection was refused.
-	 *    ESTABLISHED, FIN_WAIT_1, FIN_WAIT2, CLOSE_WAIT STATES:
-	 *	Inform user that connection was reset, and close tcb.
-	 *    CLOSING, LAST_ACK, TIME_WAIT STATES
-	 *	Close the tcb.
-	 */
-	if (tiflags&TH_RST) switch (tp->t_state) {
-
-	case TCPS_SYN_RECEIVED:
-		so->so_error = ECONNREFUSED;
-		goto close;
-
-	case TCPS_ESTABLISHED:
-	case TCPS_FIN_WAIT_1:
-	case TCPS_FIN_WAIT_2:
-	case TCPS_CLOSE_WAIT:
-		so->so_error = ECONNRESET;
-	close:
-		tp->t_state = TCPS_CLOSED;
-		tcpstat.tcps_drops++;
-		tp = tcp_close(tp);
-		goto drop;
-
-	case TCPS_CLOSING:
-	case TCPS_LAST_ACK:
-	case TCPS_TIME_WAIT:
-		tp = tcp_close(tp);
-		goto drop;
-	}
-
-	/*
-	 * If a SYN is in the window, then this is an
-	 * error and we send an RST and drop the connection.
-	 */
-	if (tiflags & TH_SYN) {
-		tp = tcp_drop(tp, ECONNRESET);
-		goto dropwithreset;
-	}
-
-	/*
-	 * If the ACK bit is off:  if in SYN-RECEIVED state or SENDSYN
-	 * flag is on (half-synchronized state), then queue data for
-	 * later processing; else drop segment and return.
-	 */
-	if ((tiflags & TH_ACK) == 0) {
-		if (tp->t_state == TCPS_SYN_RECEIVED ||
-		    (tp->t_flags & TF_NEEDSYN))
-			goto step6;
-		else
-			goto drop;
-	}
-
-	/*
-	 * Ack processing.
-	 */
-	switch (tp->t_state) {
-
-	/*
-	 * In SYN_RECEIVED state, the ack ACKs our SYN, so enter
-	 * ESTABLISHED state and continue processing.
-	 * The ACK was checked above.
-	 */
-	case TCPS_SYN_RECEIVED:
-
-		tcpstat.tcps_connects++;
-		soisconnected(so);
-		/* Do window scaling? */
-		if ((tp->t_flags & (TF_RCVD_SCALE|TF_REQ_SCALE)) ==
-			(TF_RCVD_SCALE|TF_REQ_SCALE)) {
-			tp->snd_scale = tp->requested_s_scale;
-			tp->rcv_scale = tp->request_r_scale;
-		}
-		/*
-		 * Upon successful completion of 3-way handshake,
-		 * update cache.CC if it was undefined, pass any queued
-		 * data to the user, and advance state appropriately.
-		 */
-		if ((taop = tcp_gettaocache(inp)) != NULL &&
-		    taop->tao_cc == 0)
-			taop->tao_cc = tp->cc_recv;
-
-		/*
-		 * Make transitions:
-		 *      SYN-RECEIVED  -> ESTABLISHED
-		 *      SYN-RECEIVED* -> FIN-WAIT-1
-		 */
-		if (tp->t_flags & TF_NEEDFIN) {
-			tp->t_state = TCPS_FIN_WAIT_1;
-			tp->t_flags &= ~TF_NEEDFIN;
-		} else {
-			tp->t_state = TCPS_ESTABLISHED;
-			tp->t_timer[TCPT_KEEP] = tcp_keepidle;
-		}
-		/*
-		 * If segment contains data or ACK, will call tcp_reass()
-		 * later; if not, do so now to pass queued data to user.
-		 */
-		if (ti->ti_len == 0 && (tiflags & TH_FIN) == 0)
-			(void) tcp_reass(tp, (struct tcpiphdr *)0,
-			    (struct mbuf *)0);
-		tp->snd_wl1 = ti->ti_seq - 1;
-		/* fall into ... */
-
-	/*
-	 * In ESTABLISHED state: drop duplicate ACKs; ACK out of range
-	 * ACKs.  If the ack is in the range
-	 *	tp->snd_una < ti->ti_ack <= tp->snd_max
-	 * then advance tp->snd_una to ti->ti_ack and drop
-	 * data from the retransmission queue.  If this ACK reflects
-	 * more up to date window information we update our window information.
-	 */
-	case TCPS_ESTABLISHED:
-	case TCPS_FIN_WAIT_1:
-	case TCPS_FIN_WAIT_2:
-	case TCPS_CLOSE_WAIT:
-	case TCPS_CLOSING:
-	case TCPS_LAST_ACK:
-	case TCPS_TIME_WAIT:
-
-		if (SEQ_LEQ(ti->ti_ack, tp->snd_una)) {
-			if (ti->ti_len == 0 && tiwin == tp->snd_wnd) {
-				tcpstat.tcps_rcvdupack++;
-				/*
-				 * If we have outstanding data (other than
-				 * a window probe), this is a completely
-				 * duplicate ack (ie, window info didn't
-				 * change), the ack is the biggest we've
-				 * seen and we've seen exactly our rexmt
-				 * threshhold of them, assume a packet
-				 * has been dropped and retransmit it.
-				 * Kludge snd_nxt & the congestion
-				 * window so we send only this one
-				 * packet.
-				 *
-				 * We know we're losing at the current
-				 * window size so do congestion avoidance
-				 * (set ssthresh to half the current window
-				 * and pull our congestion window back to
-				 * the new ssthresh).
-				 *
-				 * Dup acks mean that packets have left the
-				 * network (they're now cached at the receiver)
-				 * so bump cwnd by the amount in the receiver
-				 * to keep a constant cwnd packets in the
-				 * network.
-				 */
-				if (tp->t_timer[TCPT_REXMT] == 0 ||
-				    ti->ti_ack != tp->snd_una)
-					tp->t_dupacks = 0;
-				else if (++tp->t_dupacks == tcprexmtthresh) {
-					tcp_seq onxt = tp->snd_nxt;
-					u_int win =
-					    min(tp->snd_wnd, tp->snd_cwnd) / 2 /
-						tp->t_maxseg;
-
-					if (win < 2)
-						win = 2;
-					tp->snd_ssthresh = win * tp->t_maxseg;
-					tp->t_timer[TCPT_REXMT] = 0;
-					tp->t_rtt = 0;
-					tp->snd_nxt = ti->ti_ack;
-					tp->snd_cwnd = tp->t_maxseg;
-					(void) tcp_output(tp);
-					tp->snd_cwnd = tp->snd_ssthresh +
-					       tp->t_maxseg * tp->t_dupacks;
-					if (SEQ_GT(onxt, tp->snd_nxt))
-						tp->snd_nxt = onxt;
-					goto drop;
-				} else if (tp->t_dupacks > tcprexmtthresh) {
-					tp->snd_cwnd += tp->t_maxseg;
-					(void) tcp_output(tp);
-					goto drop;
-				}
-			} else
-				tp->t_dupacks = 0;
-			break;
-		}
-		/*
-		 * If the congestion window was inflated to account
-		 * for the other side's cached packets, retract it.
-		 */
-		if (tp->t_dupacks >= tcprexmtthresh &&
-		    tp->snd_cwnd > tp->snd_ssthresh)
-			tp->snd_cwnd = tp->snd_ssthresh;
-		tp->t_dupacks = 0;
-		if (SEQ_GT(ti->ti_ack, tp->snd_max)) {
-			tcpstat.tcps_rcvacktoomuch++;
-			goto dropafterack;
-		}
-		/*
-		 *  If we reach this point, ACK is not a duplicate,
-		 *     i.e., it ACKs something we sent.
-		 */
-		if (tp->t_flags & TF_NEEDSYN) {
-			/*
-			 * T/TCP: Connection was half-synchronized, and our
-			 * SYN has been ACK'd (so connection is now fully
-			 * synchronized).  Go to non-starred state,
-			 * increment snd_una for ACK of SYN, and check if
-			 * we can do window scaling.
-			 */
-			tp->t_flags &= ~TF_NEEDSYN;
-			tp->snd_una++;
-			/* Do window scaling? */
-			if ((tp->t_flags & (TF_RCVD_SCALE|TF_REQ_SCALE)) ==
-				(TF_RCVD_SCALE|TF_REQ_SCALE)) {
-				tp->snd_scale = tp->requested_s_scale;
-				tp->rcv_scale = tp->request_r_scale;
-			}
-		}
-
-process_ACK:
-		acked = ti->ti_ack - tp->snd_una;
-		tcpstat.tcps_rcvackpack++;
-		tcpstat.tcps_rcvackbyte += acked;
-
-		/*
-		 * If we have a timestamp reply, update smoothed
-		 * round trip time.  If no timestamp is present but
-		 * transmit timer is running and timed sequence
-		 * number was acked, update smoothed round trip time.
-		 * Since we now have an rtt measurement, cancel the
-		 * timer backoff (cf., Phil Karn's retransmit alg.).
-		 * Recompute the initial retransmit timer.
-		 */
-		if (to.to_flag & TOF_TS)
-			tcp_xmit_timer(tp, tcp_now - to.to_tsecr + 1);
-		else if (tp->t_rtt && SEQ_GT(ti->ti_ack, tp->t_rtseq))
-			tcp_xmit_timer(tp,tp->t_rtt);
-
-		/*
-		 * If all outstanding data is acked, stop retransmit
-		 * timer and remember to restart (more output or persist).
-		 * If there is more data to be acked, restart retransmit
-		 * timer, using current (possibly backed-off) value.
-		 */
-		if (ti->ti_ack == tp->snd_max) {
-			tp->t_timer[TCPT_REXMT] = 0;
-			needoutput = 1;
-		} else if (tp->t_timer[TCPT_PERSIST] == 0)
-			tp->t_timer[TCPT_REXMT] = tp->t_rxtcur;
-
-		/*
-		 * If no data (only SYN) was ACK'd,
-		 *    skip rest of ACK processing.
-		 */
-		if (acked == 0)
-			goto step6;
-
-		/*
-		 * When new data is acked, open the congestion window.
-		 * If the window gives us less than ssthresh packets
-		 * in flight, open exponentially (maxseg per packet).
-		 * Otherwise open linearly: maxseg per window
-		 * (maxseg^2 / cwnd per packet).
-		 */
-		{
-		register u_int cw = tp->snd_cwnd;
-		register u_int incr = tp->t_maxseg;
-
-		if (cw > tp->snd_ssthresh)
-			incr = incr * incr / cw;
-		tp->snd_cwnd = min(cw + incr, TCP_MAXWIN<<tp->snd_scale);
-		}
-		if (acked > so->so_snd.sb_cc) {
-			tp->snd_wnd -= so->so_snd.sb_cc;
-			sbdrop(&so->so_snd, (int)so->so_snd.sb_cc);
-			ourfinisacked = 1;
-		} else {
-			sbdrop(&so->so_snd, acked);
-			tp->snd_wnd -= acked;
-			ourfinisacked = 0;
-		}
-		if (so->so_snd.sb_flags & SB_NOTIFY)
-			sowwakeup(so);
-		tp->snd_una = ti->ti_ack;
-		if (SEQ_LT(tp->snd_nxt, tp->snd_una))
-			tp->snd_nxt = tp->snd_una;
-
-		switch (tp->t_state) {
-
-		/*
-		 * In FIN_WAIT_1 STATE in addition to the processing
-		 * for the ESTABLISHED state if our FIN is now acknowledged
-		 * then enter FIN_WAIT_2.
-		 */
-		case TCPS_FIN_WAIT_1:
-			if (ourfinisacked) {
-				/*
-				 * If we can't receive any more
-				 * data, then closing user can proceed.
-				 * Starting the timer is contrary to the
-				 * specification, but if we don't get a FIN
-				 * we'll hang forever.
-				 */
-				if (so->so_state & SS_CANTRCVMORE) {
-					soisdisconnected(so);
-					tp->t_timer[TCPT_2MSL] = tcp_maxidle;
-				}
-				tp->t_state = TCPS_FIN_WAIT_2;
-			}
-			break;
-
-	 	/*
-		 * In CLOSING STATE in addition to the processing for
-		 * the ESTABLISHED state if the ACK acknowledges our FIN
-		 * then enter the TIME-WAIT state, otherwise ignore
-		 * the segment.
-		 */
-		case TCPS_CLOSING:
-			if (ourfinisacked) {
-				tp->t_state = TCPS_TIME_WAIT;
-				tcp_canceltimers(tp);
-				/* Shorten TIME_WAIT [RFC-1644, p.28] */
-				if (tp->cc_recv != 0 &&
-				    tp->t_duration < TCPTV_MSL)
-					tp->t_timer[TCPT_2MSL] =
-					    tp->t_rxtcur * TCPTV_TWTRUNC;
-				else
-					tp->t_timer[TCPT_2MSL] = 2 * TCPTV_MSL;
-				soisdisconnected(so);
-			}
-			break;
-
-		/*
-		 * In LAST_ACK, we may still be waiting for data to drain
-		 * and/or to be acked, as well as for the ack of our FIN.
-		 * If our FIN is now acknowledged, delete the TCB,
-		 * enter the closed state and return.
-		 */
-		case TCPS_LAST_ACK:
-			if (ourfinisacked) {
-				tp = tcp_close(tp);
-				goto drop;
-			}
-			break;
-
-		/*
-		 * In TIME_WAIT state the only thing that should arrive
-		 * is a retransmission of the remote FIN.  Acknowledge
-		 * it and restart the finack timer.
-		 */
-		case TCPS_TIME_WAIT:
-			tp->t_timer[TCPT_2MSL] = 2 * TCPTV_MSL;
-			goto dropafterack;
-		}
-	}
-
-step6:
-	/*
-	 * Update window information.
-	 * Don't look at window if no ACK: TAC's send garbage on first SYN.
-	 */
-	if ((tiflags & TH_ACK) &&
-	    (SEQ_LT(tp->snd_wl1, ti->ti_seq) ||
-	    (tp->snd_wl1 == ti->ti_seq && (SEQ_LT(tp->snd_wl2, ti->ti_ack) ||
-	     (tp->snd_wl2 == ti->ti_ack && tiwin > tp->snd_wnd))))) {
-		/* keep track of pure window updates */
-		if (ti->ti_len == 0 &&
-		    tp->snd_wl2 == ti->ti_ack && tiwin > tp->snd_wnd)
-			tcpstat.tcps_rcvwinupd++;
-		tp->snd_wnd = tiwin;
-		tp->snd_wl1 = ti->ti_seq;
-		tp->snd_wl2 = ti->ti_ack;
-		if (tp->snd_wnd > tp->max_sndwnd)
-			tp->max_sndwnd = tp->snd_wnd;
-		needoutput = 1;
-	}
-
-	/*
-	 * Process segments with URG.
-	 */
-	if ((tiflags & TH_URG) && ti->ti_urp &&
-	    TCPS_HAVERCVDFIN(tp->t_state) == 0) {
-		/*
-		 * This is a kludge, but if we receive and accept
-		 * random urgent pointers, we'll crash in
-		 * soreceive.  It's hard to imagine someone
-		 * actually wanting to send this much urgent data.
-		 */
-		if (ti->ti_urp + so->so_rcv.sb_cc > sb_max) {
-			ti->ti_urp = 0;			/* XXX */
-			tiflags &= ~TH_URG;		/* XXX */
-			goto dodata;			/* XXX */
-		}
-		/*
-		 * If this segment advances the known urgent pointer,
-		 * then mark the data stream.  This should not happen
-		 * in CLOSE_WAIT, CLOSING, LAST_ACK or TIME_WAIT STATES since
-		 * a FIN has been received from the remote side.
-		 * In these states we ignore the URG.
-		 *
-		 * According to RFC961 (Assigned Protocols),
-		 * the urgent pointer points to the last octet
-		 * of urgent data.  We continue, however,
-		 * to consider it to indicate the first octet
-		 * of data past the urgent section as the original
-		 * spec states (in one of two places).
-		 */
-		if (SEQ_GT(ti->ti_seq+ti->ti_urp, tp->rcv_up)) {
-			tp->rcv_up = ti->ti_seq + ti->ti_urp;
-			so->so_oobmark = so->so_rcv.sb_cc +
-			    (tp->rcv_up - tp->rcv_nxt) - 1;
-			if (so->so_oobmark == 0)
-				so->so_state |= SS_RCVATMARK;
-			sohasoutofband(so);
-			tp->t_oobflags &= ~(TCPOOB_HAVEDATA | TCPOOB_HADDATA);
-		}
-		/*
-		 * Remove out of band data so doesn't get presented to user.
-		 * This can happen independent of advancing the URG pointer,
-		 * but if two URG's are pending at once, some out-of-band
-		 * data may creep in... ick.
-		 */
-		if (ti->ti_urp <= (u_long)ti->ti_len
-#ifdef SO_OOBINLINE
-		     && (so->so_options & SO_OOBINLINE) == 0
-#endif
-		     )
-			tcp_pulloutofband(so, ti, m);
-	} else
-		/*
-		 * If no out of band data is expected,
-		 * pull receive urgent pointer along
-		 * with the receive window.
-		 */
-		if (SEQ_GT(tp->rcv_nxt, tp->rcv_up))
-			tp->rcv_up = tp->rcv_nxt;
-dodata:							/* XXX */
-
-	/*
-	 * Process the segment text, merging it into the TCP sequencing queue,
-	 * and arranging for acknowledgment of receipt if necessary.
-	 * This process logically involves adjusting tp->rcv_wnd as data
-	 * is presented to the user (this happens in tcp_usrreq.c,
-	 * case PRU_RCVD).  If a FIN has already been received on this
-	 * connection then we just ignore the text.
-	 */
-	if ((ti->ti_len || (tiflags&TH_FIN)) &&
-	    TCPS_HAVERCVDFIN(tp->t_state) == 0) {
-		TCP_REASS(tp, ti, m, so, tiflags);
-		/*
-		 * Note the amount of data that peer has sent into
-		 * our window, in order to estimate the sender's
-		 * buffer size.
-		 */
-		len = so->so_rcv.sb_hiwat - (tp->rcv_adv - tp->rcv_nxt);
-	} else {
-		m_freem(m);
-		tiflags &= ~TH_FIN;
-	}
-
-	/*
-	 * If FIN is received ACK the FIN and let the user know
-	 * that the connection is closing.
-	 */
-	if (tiflags & TH_FIN) {
-		if (TCPS_HAVERCVDFIN(tp->t_state) == 0) {
-			socantrcvmore(so);
-			/*
-			 *  If connection is half-synchronized
-			 *  (ie NEEDSYN flag on) then delay ACK,
-			 *  so it may be piggybacked when SYN is sent.
-			 *  Otherwise, since we received a FIN then no
-			 *  more input can be expected, send ACK now.
-			 */
-			if (tp->t_flags & TF_NEEDSYN)
-				tp->t_flags |= TF_DELACK;
-			else
-				tp->t_flags |= TF_ACKNOW;
-			tp->rcv_nxt++;
-		}
-		switch (tp->t_state) {
-
-	 	/*
-		 * In SYN_RECEIVED and ESTABLISHED STATES
-		 * enter the CLOSE_WAIT state.
-		 */
-		case TCPS_SYN_RECEIVED:
-		case TCPS_ESTABLISHED:
-			tp->t_state = TCPS_CLOSE_WAIT;
-			break;
-
-	 	/*
-		 * If still in FIN_WAIT_1 STATE FIN has not been acked so
-		 * enter the CLOSING state.
-		 */
-		case TCPS_FIN_WAIT_1:
-			tp->t_state = TCPS_CLOSING;
-			break;
-
-	 	/*
-		 * In FIN_WAIT_2 state enter the TIME_WAIT state,
-		 * starting the time-wait timer, turning off the other
-		 * standard timers.
-		 */
-		case TCPS_FIN_WAIT_2:
-			tp->t_state = TCPS_TIME_WAIT;
-			tcp_canceltimers(tp);
-			/* Shorten TIME_WAIT [RFC-1644, p.28] */
-			if (tp->cc_recv != 0 &&
-			    tp->t_duration < TCPTV_MSL) {
-				tp->t_timer[TCPT_2MSL] =
-				    tp->t_rxtcur * TCPTV_TWTRUNC;
-				/* For transaction client, force ACK now. */
-				tp->t_flags |= TF_ACKNOW;
-			}
-			else
-				tp->t_timer[TCPT_2MSL] = 2 * TCPTV_MSL;
-			soisdisconnected(so);
-			break;
-
-		/*
-		 * In TIME_WAIT state restart the 2 MSL time_wait timer.
-		 */
-		case TCPS_TIME_WAIT:
-			tp->t_timer[TCPT_2MSL] = 2 * TCPTV_MSL;
-			break;
-		}
-	}
-#ifdef TCPDEBUG
-	if (so->so_options & SO_DEBUG)
-		tcp_trace(TA_INPUT, ostate, tp, &tcp_saveti, 0);
-#endif
-
-	/*
-	 * Return any desired output.
-	 */
-	if (needoutput || (tp->t_flags & TF_ACKNOW))
-		(void) tcp_output(tp);
-	return;
-
-dropafterack:
-	/*
-	 * Generate an ACK dropping incoming segment if it occupies
-	 * sequence space, where the ACK reflects our state.
-	 */
-	if (tiflags & TH_RST)
-		goto drop;
-#ifdef TCPDEBUG
-	if (so->so_options & SO_DEBUG)
-		tcp_trace(TA_DROP, ostate, tp, &tcp_saveti, 0);
-#endif
-	m_freem(m);
-	tp->t_flags |= TF_ACKNOW;
-	(void) tcp_output(tp);
-	return;
-
-dropwithreset:
-	/*
-	 * Generate a RST, dropping incoming segment.
-	 * Make ACK acceptable to originator of segment.
-	 * Don't bother to respond if destination was broadcast/multicast.
-	 */
-	if ((tiflags & TH_RST) || m->m_flags & (M_BCAST|M_MCAST) ||
-	    IN_MULTICAST(ntohl(ti->ti_dst.s_addr)))
-		goto drop;
-#ifdef TCPDEBUG
-	if (tp == 0 || (tp->t_inpcb->inp_socket->so_options & SO_DEBUG))
-		tcp_trace(TA_DROP, ostate, tp, &tcp_saveti, 0);
-#endif
-	if (tiflags & TH_ACK)
-		tcp_respond(tp, ti, m, (tcp_seq)0, ti->ti_ack, TH_RST);
-	else {
-		if (tiflags & TH_SYN)
-			ti->ti_len++;
-		tcp_respond(tp, ti, m, ti->ti_seq+ti->ti_len, (tcp_seq)0,
-		    TH_RST|TH_ACK);
-	}
-	/* destroy temporarily created socket */
-	if (dropsocket)
-		(void) soabort(so);
-	return;
-
-drop:
-	/*
-	 * Drop space held by incoming segment and return.
-	 */
-#ifdef TCPDEBUG
-	if (tp == 0 || (tp->t_inpcb->inp_socket->so_options & SO_DEBUG))
-		tcp_trace(TA_DROP, ostate, tp, &tcp_saveti, 0);
-#endif
-	m_freem(m);
-	/* destroy temporarily created socket */
-	if (dropsocket)
-		(void) soabort(so);
-	return;
-#ifndef TUBA_INCLUDE
-}
-
-static void
-tcp_dooptions(tp, cp, cnt, ti, to)
-	struct tcpcb *tp;
-	u_char *cp;
-	int cnt;
-	struct tcpiphdr *ti;
-	struct tcpopt *to;
-{
-	u_short mss = 0;
-	int opt, optlen;
-
-	for (; cnt > 0; cnt -= optlen, cp += optlen) {
-		opt = cp[0];
-		if (opt == TCPOPT_EOL)
-			break;
-		if (opt == TCPOPT_NOP)
-			optlen = 1;
-		else {
-			optlen = cp[1];
-			if (optlen <= 0)
-				break;
-		}
-		switch (opt) {
-
-		default:
-			continue;
-
-		case TCPOPT_MAXSEG:
-			if (optlen != TCPOLEN_MAXSEG)
-				continue;
-			if (!(ti->ti_flags & TH_SYN))
-				continue;
-			bcopy((char *) cp + 2, (char *) &mss, sizeof(mss));
-			NTOHS(mss);
-			break;
-
-		case TCPOPT_WINDOW:
-			if (optlen != TCPOLEN_WINDOW)
-				continue;
-			if (!(ti->ti_flags & TH_SYN))
-				continue;
-			tp->t_flags |= TF_RCVD_SCALE;
-			tp->requested_s_scale = min(cp[2], TCP_MAX_WINSHIFT);
-			break;
-
-		case TCPOPT_TIMESTAMP:
-			if (optlen != TCPOLEN_TIMESTAMP)
-				continue;
-			to->to_flag |= TOF_TS;
-			bcopy((char *)cp + 2,
-			    (char *)&to->to_tsval, sizeof(to->to_tsval));
-			NTOHL(to->to_tsval);
-			bcopy((char *)cp + 6,
-			    (char *)&to->to_tsecr, sizeof(to->to_tsecr));
-			NTOHL(to->to_tsecr);
-
-			/*
-			 * A timestamp received in a SYN makes
-			 * it ok to send timestamp requests and replies.
-			 */
-			if (ti->ti_flags & TH_SYN) {
-				tp->t_flags |= TF_RCVD_TSTMP;
-				tp->ts_recent = to->to_tsval;
-				tp->ts_recent_age = tcp_now;
-			}
-			break;
-		case TCPOPT_CC:
-			if (optlen != TCPOLEN_CC)
-				continue;
-			to->to_flag |= TOF_CC;
-			bcopy((char *)cp + 2,
-			    (char *)&to->to_cc, sizeof(to->to_cc));
-			NTOHL(to->to_cc);
-			/*
-			 * A CC or CC.new option received in a SYN makes
-			 * it ok to send CC in subsequent segments.
-			 */
-			if (ti->ti_flags & TH_SYN)
-				tp->t_flags |= TF_RCVD_CC;
-			break;
-		case TCPOPT_CCNEW:
-			if (optlen != TCPOLEN_CC)
-				continue;
-			if (!(ti->ti_flags & TH_SYN))
-				continue;
-			to->to_flag |= TOF_CCNEW;
-			bcopy((char *)cp + 2,
-			    (char *)&to->to_cc, sizeof(to->to_cc));
-			NTOHL(to->to_cc);
-			/*
-			 * A CC or CC.new option received in a SYN makes
-			 * it ok to send CC in subsequent segments.
-			 */
-			tp->t_flags |= TF_RCVD_CC;
-			break;
-		case TCPOPT_CCECHO:
-			if (optlen != TCPOLEN_CC)
-				continue;
-			if (!(ti->ti_flags & TH_SYN))
-				continue;
-			to->to_flag |= TOF_CCECHO;
-			bcopy((char *)cp + 2,
-			    (char *)&to->to_ccecho, sizeof(to->to_ccecho));
-			NTOHL(to->to_ccecho);
-			break;
-		}
-	}
-	if (ti->ti_flags & TH_SYN)
-		tcp_mss(tp, mss);	/* sets t_maxseg */
-}
-
-/*
- * Pull out of band byte out of a segment so
- * it doesn't appear in the user's data queue.
- * It is still reflected in the segment length for
- * sequencing purposes.
- */
-static void
-tcp_pulloutofband(so, ti, m)
-	struct socket *so;
-	struct tcpiphdr *ti;
-	register struct mbuf *m;
-{
-	int cnt = ti->ti_urp - 1;
-
-	while (cnt >= 0) {
-		if (m->m_len > cnt) {
-			char *cp = mtod(m, caddr_t) + cnt;
-			struct tcpcb *tp = sototcpcb(so);
-
-			tp->t_iobc = *cp;
-			tp->t_oobflags |= TCPOOB_HAVEDATA;
-			bcopy(cp+1, cp, (unsigned)(m->m_len - cnt - 1));
-			m->m_len--;
-			return;
-		}
-		cnt -= m->m_len;
-		m = m->m_next;
-		if (m == 0)
-			break;
-	}
-	panic("tcp_pulloutofband");
-}
-
-/*
- * Collect new round-trip time estimate
- * and update averages and current timeout.
- */
-static void
-tcp_xmit_timer(tp, rtt)
-	register struct tcpcb *tp;
-	short rtt;
-{
-	register int delta;
-
-	tcpstat.tcps_rttupdated++;
-	tp->t_rttupdated++;
-	if (tp->t_srtt != 0) {
-		/*
-		 * srtt is stored as fixed point with 5 bits after the
-		 * binary point (i.e., scaled by 8).  The following magic
-		 * is equivalent to the smoothing algorithm in rfc793 with
-		 * an alpha of .875 (srtt = rtt/8 + srtt*7/8 in fixed
-		 * point).  Adjust rtt to origin 0.
-		 */
-		delta = ((rtt - 1) << TCP_DELTA_SHIFT)
-			- (tp->t_srtt >> (TCP_RTT_SHIFT - TCP_DELTA_SHIFT));
-
-		if ((tp->t_srtt += delta) <= 0)
-			tp->t_srtt = 1;
-
-		/*
-		 * We accumulate a smoothed rtt variance (actually, a
-		 * smoothed mean difference), then set the retransmit
-		 * timer to smoothed rtt + 4 times the smoothed variance.
-		 * rttvar is stored as fixed point with 4 bits after the
-		 * binary point (scaled by 16).  The following is
-		 * equivalent to rfc793 smoothing with an alpha of .75
-		 * (rttvar = rttvar*3/4 + |delta| / 4).  This replaces
-		 * rfc793's wired-in beta.
-		 */
-		if (delta < 0)
-			delta = -delta;
-		delta -= tp->t_rttvar >> (TCP_RTTVAR_SHIFT - TCP_DELTA_SHIFT);
-		if ((tp->t_rttvar += delta) <= 0)
-			tp->t_rttvar = 1;
-	} else {
-		/*
-		 * No rtt measurement yet - use the unsmoothed rtt.
-		 * Set the variance to half the rtt (so our first
-		 * retransmit happens at 3*rtt).
-		 */
-		tp->t_srtt = rtt << TCP_RTT_SHIFT;
-		tp->t_rttvar = rtt << (TCP_RTTVAR_SHIFT - 1);
-	}
-	tp->t_rtt = 0;
-	tp->t_rxtshift = 0;
-
-	/*
-	 * the retransmit should happen at rtt + 4 * rttvar.
-	 * Because of the way we do the smoothing, srtt and rttvar
-	 * will each average +1/2 tick of bias.  When we compute
-	 * the retransmit timer, we want 1/2 tick of rounding and
-	 * 1 extra tick because of +-1/2 tick uncertainty in the
-	 * firing of the timer.  The bias will give us exactly the
-	 * 1.5 tick we need.  But, because the bias is
-	 * statistical, we have to test that we don't drop below
-	 * the minimum feasible timer (which is 2 ticks).
-	 */
-	TCPT_RANGESET(tp->t_rxtcur, TCP_REXMTVAL(tp),
-		      max(tp->t_rttmin, rtt + 2), TCPTV_REXMTMAX);
-
-	/*
-	 * We received an ack for a packet that wasn't retransmitted;
-	 * it is probably safe to discard any error indications we've
-	 * received recently.  This isn't quite right, but close enough
-	 * for now (a route might have failed after we sent a segment,
-	 * and the return path might not be symmetrical).
-	 */
-	tp->t_softerror = 0;
-}
-
-/*
- * Determine a reasonable value for maxseg size.
- * If the route is known, check route for mtu.
- * If none, use an mss that can be handled on the outgoing
- * interface without forcing IP to fragment; if bigger than
- * an mbuf cluster (MCLBYTES), round down to nearest multiple of MCLBYTES
- * to utilize large mbufs.  If no route is found, route has no mtu,
- * or the destination isn't local, use a default, hopefully conservative
- * size (usually 512 or the default IP max size, but no more than the mtu
- * of the interface), as we can't discover anything about intervening
- * gateways or networks.  We also initialize the congestion/slow start
- * window to be a single segment if the destination isn't local.
- * While looking at the routing entry, we also initialize other path-dependent
- * parameters from pre-set or cached values in the routing entry.
- *
- * Also take into account the space needed for options that we
- * send regularly.  Make maxseg shorter by that amount to assure
- * that we can send maxseg amount of data even when the options
- * are present.  Store the upper limit of the length of options plus
- * data in maxopd.
- *
- * NOTE that this routine is only called when we process an incoming
- * segment, for outgoing segments only tcp_mssopt is called.
- *
- * In case of T/TCP, we call this routine during implicit connection
- * setup as well (offer = -1), to initialize maxseg from the cached
- * MSS of our peer.
- */
-void
-tcp_mss(tp, offer)
-	struct tcpcb *tp;
-	int offer;
-{
-	register struct rtentry *rt;
-	struct ifnet *ifp;
-	register int rtt, mss;
-	u_long bufsize;
-	struct inpcb *inp;
-	struct socket *so;
-	struct rmxp_tao *taop;
-	int origoffer = offer;
-
-	inp = tp->t_inpcb;
-	if ((rt = tcp_rtlookup(inp)) == NULL) {
-		tp->t_maxopd = tp->t_maxseg = tcp_mssdflt;
-		return;
-	}
-	ifp = rt->rt_ifp;
-	so = inp->inp_socket;
-
-	taop = rmx_taop(rt->rt_rmx);
-	/*
-	 * Offer == -1 means that we didn't receive SYN yet,
-	 * use cached value in that case;
-	 */
-	if (offer == -1)
-		offer = taop->tao_mssopt;
-	/*
-	 * Offer == 0 means that there was no MSS on the SYN segment,
-	 * in this case we use tcp_mssdflt.
-	 */
-	if (offer == 0)
-		offer = tcp_mssdflt;
-	else
-		/*
-		 * Sanity check: make sure that maxopd will be large
-		 * enough to allow some data on segments even is the
-		 * all the option space is used (40bytes).  Otherwise
-		 * funny things may happen in tcp_output.
-		 */
-		offer = max(offer, 64);
-	taop->tao_mssopt = offer;
-
-	/*
-	 * While we're here, check if there's an initial rtt
-	 * or rttvar.  Convert from the route-table units
-	 * to scaled multiples of the slow timeout timer.
-	 */
-	if (tp->t_srtt == 0 && (rtt = rt->rt_rmx.rmx_rtt)) {
-		/*
-		 * XXX the lock bit for RTT indicates that the value
-		 * is also a minimum value; this is subject to time.
-		 */
-		if (rt->rt_rmx.rmx_locks & RTV_RTT)
-			tp->t_rttmin = rtt / (RTM_RTTUNIT / PR_SLOWHZ);
-		tp->t_srtt = rtt / (RTM_RTTUNIT / (PR_SLOWHZ * TCP_RTT_SCALE));
-		tcpstat.tcps_usedrtt++;
-		if (rt->rt_rmx.rmx_rttvar) {
-			tp->t_rttvar = rt->rt_rmx.rmx_rttvar /
-			    (RTM_RTTUNIT / (PR_SLOWHZ * TCP_RTTVAR_SCALE));
-			tcpstat.tcps_usedrttvar++;
-		} else {
-			/* default variation is +- 1 rtt */
-			tp->t_rttvar =
-			    tp->t_srtt * TCP_RTTVAR_SCALE / TCP_RTT_SCALE;
-		}
-		TCPT_RANGESET(tp->t_rxtcur,
-		    ((tp->t_srtt >> 2) + tp->t_rttvar) >> 1,
-		    tp->t_rttmin, TCPTV_REXMTMAX);
-	}
-	/*
-	 * if there's an mtu associated with the route, use it
-	 */
-	if (rt->rt_rmx.rmx_mtu)
-		mss = rt->rt_rmx.rmx_mtu - sizeof(struct tcpiphdr);
-	else
-	{
-		mss = ifp->if_mtu - sizeof(struct tcpiphdr);
-		if (!in_localaddr(inp->inp_faddr))
-			mss = min(mss, tcp_mssdflt);
-	}
-	mss = min(mss, offer);
-	/*
-	 * maxopd stores the maximum length of data AND options
-	 * in a segment; maxseg is the amount of data in a normal
-	 * segment.  We need to store this value (maxopd) apart
-	 * from maxseg, because now every segment carries options
-	 * and thus we normally have somewhat less data in segments.
-	 */
-	tp->t_maxopd = mss;
-
-	/*
-	 * In case of T/TCP, origoffer==-1 indicates, that no segments
-	 * were received yet.  In this case we just guess, otherwise
-	 * we do the same as before T/TCP.
-	 */
- 	if ((tp->t_flags & (TF_REQ_TSTMP|TF_NOOPT)) == TF_REQ_TSTMP &&
-	    (origoffer == -1 ||
-	     (tp->t_flags & TF_RCVD_TSTMP) == TF_RCVD_TSTMP))
-		mss -= TCPOLEN_TSTAMP_APPA;
- 	if ((tp->t_flags & (TF_REQ_CC|TF_NOOPT)) == TF_REQ_CC &&
-	    (origoffer == -1 ||
-	     (tp->t_flags & TF_RCVD_CC) == TF_RCVD_CC))
-		mss -= TCPOLEN_CC_APPA;
-
-#if	(MCLBYTES & (MCLBYTES - 1)) == 0
-		if (mss > MCLBYTES)
-			mss &= ~(MCLBYTES-1);
-#else
-		if (mss > MCLBYTES)
-			mss = mss / MCLBYTES * MCLBYTES;
-#endif
-	/*
-	 * If there's a pipesize, change the socket buffer
-	 * to that size.  Make the socket buffers an integral
-	 * number of mss units; if the mss is larger than
-	 * the socket buffer, decrease the mss.
-	 */
-#ifdef RTV_SPIPE
-	if ((bufsize = rt->rt_rmx.rmx_sendpipe) == 0)
-#endif
-		bufsize = so->so_snd.sb_hiwat;
-	if (bufsize < mss)
-		mss = bufsize;
-	else {
-		bufsize = roundup(bufsize, mss);
-		if (bufsize > sb_max)
-			bufsize = sb_max;
-		(void)sbreserve(&so->so_snd, bufsize);
-	}
-	tp->t_maxseg = mss;
-
-#ifdef RTV_RPIPE
-	if ((bufsize = rt->rt_rmx.rmx_recvpipe) == 0)
-#endif
-		bufsize = so->so_rcv.sb_hiwat;
-	if (bufsize > mss) {
-		bufsize = roundup(bufsize, mss);
-		if (bufsize > sb_max)
-			bufsize = sb_max;
-		(void)sbreserve(&so->so_rcv, bufsize);
-	}
-	/*
-	 * Don't force slow-start on local network.
-	 */
-	if (!in_localaddr(inp->inp_faddr))
-		tp->snd_cwnd = mss;
-
-	if (rt->rt_rmx.rmx_ssthresh) {
-		/*
-		 * There's some sort of gateway or interface
-		 * buffer limit on the path.  Use this to set
-		 * the slow start threshhold, but set the
-		 * threshold to no less than 2*mss.
-		 */
-		tp->snd_ssthresh = max(2 * mss, rt->rt_rmx.rmx_ssthresh);
-		tcpstat.tcps_usedssthresh++;
-	}
-}
-
-/*
- * Determine the MSS option to send on an outgoing SYN.
- */
-int
-tcp_mssopt(tp)
-	struct tcpcb *tp;
-{
-	struct rtentry *rt;
-
-	rt = tcp_rtlookup(tp->t_inpcb);
-	if (rt == NULL)
-		return tcp_mssdflt;
-
-	return rt->rt_ifp->if_mtu - sizeof(struct tcpiphdr);
-}
-#endif /* TUBA_INCLUDE */
diff --git a/c/src/exec/libnetworking/netinet/tcp_output.c b/c/src/exec/libnetworking/netinet/tcp_output.c
deleted file mode 100644
index cbb5218dce..0000000000
--- a/c/src/exec/libnetworking/netinet/tcp_output.c
+++ /dev/null
@@ -1,755 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1988, 1990, 1993, 1995
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)tcp_output.c	8.4 (Berkeley) 5/24/95
- *	$Id$
- */
-
-#include "opt_tcpdebug.h"
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/systm.h>
-#include <sys/malloc.h>
-#include <sys/mbuf.h>
-#include <sys/protosw.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/errno.h>
-
-#include <net/route.h>
-
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/in_pcb.h>
-#include <netinet/ip_var.h>
-#include <netinet/tcp.h>
-#define	TCPOUTFLAGS
-#include <netinet/tcp_fsm.h>
-#include <netinet/tcp_seq.h>
-#include <netinet/tcp_timer.h>
-#include <netinet/tcp_var.h>
-#include <netinet/tcpip.h>
-#ifdef TCPDEBUG
-#include <netinet/tcp_debug.h>
-#endif
-
-#ifdef notyet
-extern struct mbuf *m_copypack();
-#endif
-
-
-/*
- * Tcp output routine: figure out what should be sent and send it.
- */
-int
-tcp_output(tp)
-	register struct tcpcb *tp;
-{
-	register struct socket *so = tp->t_inpcb->inp_socket;
-	register long len, win;
-	int off, flags, error;
-	register struct mbuf *m;
-	register struct tcpiphdr *ti;
-	u_char opt[TCP_MAXOLEN];
-	unsigned optlen, hdrlen;
-	int idle, sendalot;
-	struct rmxp_tao *taop;
-	struct rmxp_tao tao_noncached;
-
-	/*
-	 * Determine length of data that should be transmitted,
-	 * and flags that will be used.
-	 * If there is some data or critical controls (SYN, RST)
-	 * to send, then transmit; otherwise, investigate further.
-	 */
-	idle = (tp->snd_max == tp->snd_una);
-	if (idle && tp->t_idle >= tp->t_rxtcur)
-		/*
-		 * We have been idle for "a while" and no acks are
-		 * expected to clock out any data we send --
-		 * slow start to get ack "clock" running again.
-		 */
-		tp->snd_cwnd = tp->t_maxseg;
-again:
-	sendalot = 0;
-	off = tp->snd_nxt - tp->snd_una;
-	win = min(tp->snd_wnd, tp->snd_cwnd);
-
-	flags = tcp_outflags[tp->t_state];
-	/*
-	 * Get standard flags, and add SYN or FIN if requested by 'hidden'
-	 * state flags.
-	 */
-	if (tp->t_flags & TF_NEEDFIN)
-		flags |= TH_FIN;
-	if (tp->t_flags & TF_NEEDSYN)
-		flags |= TH_SYN;
-
-	/*
-	 * If in persist timeout with window of 0, send 1 byte.
-	 * Otherwise, if window is small but nonzero
-	 * and timer expired, we will send what we can
-	 * and go to transmit state.
-	 */
-	if (tp->t_force) {
-		if (win == 0) {
-			/*
-			 * If we still have some data to send, then
-			 * clear the FIN bit.  Usually this would
-			 * happen below when it realizes that we
-			 * aren't sending all the data.  However,
-			 * if we have exactly 1 byte of unset data,
-			 * then it won't clear the FIN bit below,
-			 * and if we are in persist state, we wind
-			 * up sending the packet without recording
-			 * that we sent the FIN bit.
-			 *
-			 * We can't just blindly clear the FIN bit,
-			 * because if we don't have any more data
-			 * to send then the probe will be the FIN
-			 * itself.
-			 */
-			if (off < so->so_snd.sb_cc)
-				flags &= ~TH_FIN;
-			win = 1;
-		} else {
-			tp->t_timer[TCPT_PERSIST] = 0;
-			tp->t_rxtshift = 0;
-		}
-	}
-
-	len = min(so->so_snd.sb_cc, win) - off;
-
-	if ((taop = tcp_gettaocache(tp->t_inpcb)) == NULL) {
-		taop = &tao_noncached;
-		bzero(taop, sizeof(*taop));
-	}
-
-	/*
-	 * Lop off SYN bit if it has already been sent.  However, if this
-	 * is SYN-SENT state and if segment contains data and if we don't
-	 * know that foreign host supports TAO, suppress sending segment.
-	 */
-	if ((flags & TH_SYN) && SEQ_GT(tp->snd_nxt, tp->snd_una)) {
-		flags &= ~TH_SYN;
-		off--, len++;
-		if (len > 0 && tp->t_state == TCPS_SYN_SENT &&
-		    taop->tao_ccsent == 0)
-			return 0;
-	}
-
-	/*
-	 * Be careful not to send data and/or FIN on SYN segments
-	 * in cases when no CC option will be sent.
-	 * This measure is needed to prevent interoperability problems
-	 * with not fully conformant TCP implementations.
-	 */
-	if ((flags & TH_SYN) &&
-	    ((tp->t_flags & TF_NOOPT) || !(tp->t_flags & TF_REQ_CC) ||
-	     ((flags & TH_ACK) && !(tp->t_flags & TF_RCVD_CC)))) {
-		len = 0;
-		flags &= ~TH_FIN;
-	}
-
-	if (len < 0) {
-		/*
-		 * If FIN has been sent but not acked,
-		 * but we haven't been called to retransmit,
-		 * len will be -1.  Otherwise, window shrank
-		 * after we sent into it.  If window shrank to 0,
-		 * cancel pending retransmit, pull snd_nxt back
-		 * to (closed) window, and set the persist timer
-		 * if it isn't already going.  If the window didn't
-		 * close completely, just wait for an ACK.
-		 */
-		len = 0;
-		if (win == 0) {
-			tp->t_timer[TCPT_REXMT] = 0;
-			tp->t_rxtshift = 0;
-			tp->snd_nxt = tp->snd_una;
-			if (tp->t_timer[TCPT_PERSIST] == 0)
-				tcp_setpersist(tp);
-		}
-	}
-	if (len > tp->t_maxseg) {
-		len = tp->t_maxseg;
-		sendalot = 1;
-	}
-	if (SEQ_LT(tp->snd_nxt + len, tp->snd_una + so->so_snd.sb_cc))
-		flags &= ~TH_FIN;
-
-	win = sbspace(&so->so_rcv);
-
-	/*
-	 * Sender silly window avoidance.  If connection is idle
-	 * and can send all data, a maximum segment,
-	 * at least a maximum default-size segment do it,
-	 * or are forced, do it; otherwise don't bother.
-	 * If peer's buffer is tiny, then send
-	 * when window is at least half open.
-	 * If retransmitting (possibly after persist timer forced us
-	 * to send into a small window), then must resend.
-	 */
-	if (len) {
-		if (len == tp->t_maxseg)
-			goto send;
-		if ((idle || tp->t_flags & TF_NODELAY) &&
-		    (tp->t_flags & TF_NOPUSH) == 0 &&
-		    len + off >= so->so_snd.sb_cc)
-			goto send;
-		if (tp->t_force)
-			goto send;
-		if (len >= tp->max_sndwnd / 2 && tp->max_sndwnd > 0)
-			goto send;
-		if (SEQ_LT(tp->snd_nxt, tp->snd_max))
-			goto send;
-	}
-
-	/*
-	 * Compare available window to amount of window
-	 * known to peer (as advertised window less
-	 * next expected input).  If the difference is at least two
-	 * max size segments, or at least 50% of the maximum possible
-	 * window, then want to send a window update to peer.
-	 */
-	if (win > 0) {
-		/*
-		 * "adv" is the amount we can increase the window,
-		 * taking into account that we are limited by
-		 * TCP_MAXWIN << tp->rcv_scale.
-		 */
-		long adv = min(win, (long)TCP_MAXWIN << tp->rcv_scale) -
-			(tp->rcv_adv - tp->rcv_nxt);
-
-		if (adv >= (long) (2 * tp->t_maxseg))
-			goto send;
-		if (2 * adv >= (long) so->so_rcv.sb_hiwat)
-			goto send;
-	}
-
-	/*
-	 * Send if we owe peer an ACK.
-	 */
-	if (tp->t_flags & TF_ACKNOW)
-		goto send;
-	if ((flags & TH_RST) ||
-	    ((flags & TH_SYN) && (tp->t_flags & TF_NEEDSYN) == 0))
-		goto send;
-	if (SEQ_GT(tp->snd_up, tp->snd_una))
-		goto send;
-	/*
-	 * If our state indicates that FIN should be sent
-	 * and we have not yet done so, or we're retransmitting the FIN,
-	 * then we need to send.
-	 */
-	if (flags & TH_FIN &&
-	    ((tp->t_flags & TF_SENTFIN) == 0 || tp->snd_nxt == tp->snd_una))
-		goto send;
-
-	/*
-	 * TCP window updates are not reliable, rather a polling protocol
-	 * using ``persist'' packets is used to insure receipt of window
-	 * updates.  The three ``states'' for the output side are:
-	 *	idle			not doing retransmits or persists
-	 *	persisting		to move a small or zero window
-	 *	(re)transmitting	and thereby not persisting
-	 *
-	 * tp->t_timer[TCPT_PERSIST]
-	 *	is set when we are in persist state.
-	 * tp->t_force
-	 *	is set when we are called to send a persist packet.
-	 * tp->t_timer[TCPT_REXMT]
-	 *	is set when we are retransmitting
-	 * The output side is idle when both timers are zero.
-	 *
-	 * If send window is too small, there is data to transmit, and no
-	 * retransmit or persist is pending, then go to persist state.
-	 * If nothing happens soon, send when timer expires:
-	 * if window is nonzero, transmit what we can,
-	 * otherwise force out a byte.
-	 */
-	if (so->so_snd.sb_cc && tp->t_timer[TCPT_REXMT] == 0 &&
-	    tp->t_timer[TCPT_PERSIST] == 0) {
-		tp->t_rxtshift = 0;
-		tcp_setpersist(tp);
-	}
-
-	/*
-	 * No reason to send a segment, just return.
-	 */
-	return (0);
-
-send:
-	/*
-	 * Before ESTABLISHED, force sending of initial options
-	 * unless TCP set not to do any options.
-	 * NOTE: we assume that the IP/TCP header plus TCP options
-	 * always fit in a single mbuf, leaving room for a maximum
-	 * link header, i.e.
-	 *	max_linkhdr + sizeof (struct tcpiphdr) + optlen <= MHLEN
-	 */
-	optlen = 0;
-	hdrlen = sizeof (struct tcpiphdr);
-	if (flags & TH_SYN) {
-		tp->snd_nxt = tp->iss;
-		if ((tp->t_flags & TF_NOOPT) == 0) {
-			u_short mss;
-
-			opt[0] = TCPOPT_MAXSEG;
-			opt[1] = TCPOLEN_MAXSEG;
-			mss = htons((u_short) tcp_mssopt(tp));
-			(void)memcpy(opt + 2, &mss, sizeof(mss));
-			optlen = TCPOLEN_MAXSEG;
-
-			if ((tp->t_flags & TF_REQ_SCALE) &&
-			    ((flags & TH_ACK) == 0 ||
-			    (tp->t_flags & TF_RCVD_SCALE))) {
-				*((u_long *) (opt + optlen)) = htonl(
-					TCPOPT_NOP << 24 |
-					TCPOPT_WINDOW << 16 |
-					TCPOLEN_WINDOW << 8 |
-					tp->request_r_scale);
-				optlen += 4;
-			}
-		}
- 	}
-
- 	/*
-	 * Send a timestamp and echo-reply if this is a SYN and our side
-	 * wants to use timestamps (TF_REQ_TSTMP is set) or both our side
-	 * and our peer have sent timestamps in our SYN's.
- 	 */
- 	if ((tp->t_flags & (TF_REQ_TSTMP|TF_NOOPT)) == TF_REQ_TSTMP &&
- 	    (flags & TH_RST) == 0 &&
-	    ((flags & TH_ACK) == 0 ||
-	     (tp->t_flags & TF_RCVD_TSTMP))) {
-		u_long *lp = (u_long *)(opt + optlen);
-
- 		/* Form timestamp option as shown in appendix A of RFC 1323. */
- 		*lp++ = htonl(TCPOPT_TSTAMP_HDR);
- 		*lp++ = htonl(tcp_now);
- 		*lp   = htonl(tp->ts_recent);
- 		optlen += TCPOLEN_TSTAMP_APPA;
- 	}
-
- 	/*
-	 * Send `CC-family' options if our side wants to use them (TF_REQ_CC),
-	 * options are allowed (!TF_NOOPT) and it's not a RST.
- 	 */
- 	if ((tp->t_flags & (TF_REQ_CC|TF_NOOPT)) == TF_REQ_CC &&
- 	     (flags & TH_RST) == 0) {
-		switch (flags & (TH_SYN|TH_ACK)) {
-		/*
-		 * This is a normal ACK, send CC if we received CC before
-		 * from our peer.
-		 */
-		case TH_ACK:
-			if (!(tp->t_flags & TF_RCVD_CC))
-				break;
-			/*FALLTHROUGH*/
-
-		/*
-		 * We can only get here in T/TCP's SYN_SENT* state, when
-		 * we're a sending a non-SYN segment without waiting for
-		 * the ACK of our SYN.  A check above assures that we only
-		 * do this if our peer understands T/TCP.
-		 */
-		case 0:
-			opt[optlen++] = TCPOPT_NOP;
-			opt[optlen++] = TCPOPT_NOP;
-			opt[optlen++] = TCPOPT_CC;
-			opt[optlen++] = TCPOLEN_CC;
-			*(u_int32_t *)&opt[optlen] = htonl(tp->cc_send);
-
-			optlen += 4;
-			break;
-
-		/*
-		 * This is our initial SYN, check whether we have to use
-		 * CC or CC.new.
-		 */
-		case TH_SYN:
-			opt[optlen++] = TCPOPT_NOP;
-			opt[optlen++] = TCPOPT_NOP;
-			opt[optlen++] = tp->t_flags & TF_SENDCCNEW ?
-						TCPOPT_CCNEW : TCPOPT_CC;
-			opt[optlen++] = TCPOLEN_CC;
-			*(u_int32_t *)&opt[optlen] = htonl(tp->cc_send);
- 			optlen += 4;
-			break;
-
-		/*
-		 * This is a SYN,ACK; send CC and CC.echo if we received
-		 * CC from our peer.
-		 */
-		case (TH_SYN|TH_ACK):
-			if (tp->t_flags & TF_RCVD_CC) {
-				opt[optlen++] = TCPOPT_NOP;
-				opt[optlen++] = TCPOPT_NOP;
-				opt[optlen++] = TCPOPT_CC;
-				opt[optlen++] = TCPOLEN_CC;
-				*(u_int32_t *)&opt[optlen] =
-					htonl(tp->cc_send);
-				optlen += 4;
-				opt[optlen++] = TCPOPT_NOP;
-				opt[optlen++] = TCPOPT_NOP;
-				opt[optlen++] = TCPOPT_CCECHO;
-				opt[optlen++] = TCPOLEN_CC;
-				*(u_int32_t *)&opt[optlen] =
-					htonl(tp->cc_recv);
-				optlen += 4;
-			}
-			break;
-		}
- 	}
-
- 	hdrlen += optlen;
-
-	/*
-	 * Adjust data length if insertion of options will
-	 * bump the packet length beyond the t_maxopd length.
-	 * Clear the FIN bit because we cut off the tail of
-	 * the segment.
-	 */
-	 if (len + optlen > tp->t_maxopd) {
-		/*
-		 * If there is still more to send, don't close the connection.
-		 */
-		flags &= ~TH_FIN;
-		len = tp->t_maxopd - optlen;
-		sendalot = 1;
-	}
-
-/*#ifdef DIAGNOSTIC*/
- 	if (max_linkhdr + hdrlen > MHLEN)
-		panic("tcphdr too big");
-/*#endif*/
-
-	/*
-	 * Grab a header mbuf, attaching a copy of data to
-	 * be transmitted, and initialize the header from
-	 * the template for sends on this connection.
-	 */
-	if (len) {
-		if (tp->t_force && len == 1)
-			tcpstat.tcps_sndprobe++;
-		else if (SEQ_LT(tp->snd_nxt, tp->snd_max)) {
-			tcpstat.tcps_sndrexmitpack++;
-			tcpstat.tcps_sndrexmitbyte += len;
-		} else {
-			tcpstat.tcps_sndpack++;
-			tcpstat.tcps_sndbyte += len;
-		}
-#ifdef notyet
-		if ((m = m_copypack(so->so_snd.sb_mb, off,
-		    (int)len, max_linkhdr + hdrlen)) == 0) {
-			error = ENOBUFS;
-			goto out;
-		}
-		/*
-		 * m_copypack left space for our hdr; use it.
-		 */
-		m->m_len += hdrlen;
-		m->m_data -= hdrlen;
-#else
-		MGETHDR(m, M_DONTWAIT, MT_HEADER);
-		if (m == NULL) {
-			error = ENOBUFS;
-			goto out;
-		}
-		m->m_data += max_linkhdr;
-		m->m_len = hdrlen;
-		if (len <= MHLEN - hdrlen - max_linkhdr) {
-			m_copydata(so->so_snd.sb_mb, off, (int) len,
-			    mtod(m, caddr_t) + hdrlen);
-			m->m_len += len;
-		} else {
-			m->m_next = m_copy(so->so_snd.sb_mb, off, (int) len);
-			if (m->m_next == 0) {
-				(void) m_free(m);
-				error = ENOBUFS;
-				goto out;
-			}
-		}
-#endif
-		/*
-		 * If we're sending everything we've got, set PUSH.
-		 * (This will keep happy those implementations which only
-		 * give data to the user when a buffer fills or
-		 * a PUSH comes in.)
-		 */
-		if (off + len == so->so_snd.sb_cc)
-			flags |= TH_PUSH;
-	} else {
-		if (tp->t_flags & TF_ACKNOW)
-			tcpstat.tcps_sndacks++;
-		else if (flags & (TH_SYN|TH_FIN|TH_RST))
-			tcpstat.tcps_sndctrl++;
-		else if (SEQ_GT(tp->snd_up, tp->snd_una))
-			tcpstat.tcps_sndurg++;
-		else
-			tcpstat.tcps_sndwinup++;
-
-		MGETHDR(m, M_DONTWAIT, MT_HEADER);
-		if (m == NULL) {
-			error = ENOBUFS;
-			goto out;
-		}
-		m->m_data += max_linkhdr;
-		m->m_len = hdrlen;
-	}
-	m->m_pkthdr.rcvif = (struct ifnet *)0;
-	ti = mtod(m, struct tcpiphdr *);
-	if (tp->t_template == 0)
-		panic("tcp_output");
-	(void)memcpy(ti, tp->t_template, sizeof (struct tcpiphdr));
-
-	/*
-	 * Fill in fields, remembering maximum advertised
-	 * window for use in delaying messages about window sizes.
-	 * If resending a FIN, be sure not to use a new sequence number.
-	 */
-	if (flags & TH_FIN && tp->t_flags & TF_SENTFIN &&
-	    tp->snd_nxt == tp->snd_max)
-		tp->snd_nxt--;
-	/*
-	 * If we are doing retransmissions, then snd_nxt will
-	 * not reflect the first unsent octet.  For ACK only
-	 * packets, we do not want the sequence number of the
-	 * retransmitted packet, we want the sequence number
-	 * of the next unsent octet.  So, if there is no data
-	 * (and no SYN or FIN), use snd_max instead of snd_nxt
-	 * when filling in ti_seq.  But if we are in persist
-	 * state, snd_max might reflect one byte beyond the
-	 * right edge of the window, so use snd_nxt in that
-	 * case, since we know we aren't doing a retransmission.
-	 * (retransmit and persist are mutually exclusive...)
-	 */
-	if (len || (flags & (TH_SYN|TH_FIN)) || tp->t_timer[TCPT_PERSIST])
-		ti->ti_seq = htonl(tp->snd_nxt);
-	else
-		ti->ti_seq = htonl(tp->snd_max);
-	ti->ti_ack = htonl(tp->rcv_nxt);
-	if (optlen) {
-		bcopy(opt, ti + 1, optlen);
-		ti->ti_off = (sizeof (struct tcphdr) + optlen) >> 2;
-	}
-	ti->ti_flags = flags;
-	/*
-	 * Calculate receive window.  Don't shrink window,
-	 * but avoid silly window syndrome.
-	 */
-	if (win < (long)(so->so_rcv.sb_hiwat / 4) && win < (long)tp->t_maxseg)
-		win = 0;
-	if (win < (long)(tp->rcv_adv - tp->rcv_nxt))
-		win = (long)(tp->rcv_adv - tp->rcv_nxt);
-	if (win > (long)TCP_MAXWIN << tp->rcv_scale)
-		win = (long)TCP_MAXWIN << tp->rcv_scale;
-	ti->ti_win = htons((u_short) (win>>tp->rcv_scale));
-	if (SEQ_GT(tp->snd_up, tp->snd_nxt)) {
-		ti->ti_urp = htons((u_short)(tp->snd_up - tp->snd_nxt));
-		ti->ti_flags |= TH_URG;
-	} else
-		/*
-		 * If no urgent pointer to send, then we pull
-		 * the urgent pointer to the left edge of the send window
-		 * so that it doesn't drift into the send window on sequence
-		 * number wraparound.
-		 */
-		tp->snd_up = tp->snd_una;		/* drag it along */
-
-	/*
-	 * Put TCP length in extended header, and then
-	 * checksum extended header and data.
-	 */
-	if (len + optlen)
-		ti->ti_len = htons((u_short)(sizeof (struct tcphdr) +
-		    optlen + len));
-	ti->ti_sum = in_cksum(m, (int)(hdrlen + len));
-
-	/*
-	 * In transmit state, time the transmission and arrange for
-	 * the retransmit.  In persist state, just set snd_max.
-	 */
-	if (tp->t_force == 0 || tp->t_timer[TCPT_PERSIST] == 0) {
-		tcp_seq startseq = tp->snd_nxt;
-
-		/*
-		 * Advance snd_nxt over sequence space of this segment.
-		 */
-		if (flags & (TH_SYN|TH_FIN)) {
-			if (flags & TH_SYN)
-				tp->snd_nxt++;
-			if (flags & TH_FIN) {
-				tp->snd_nxt++;
-				tp->t_flags |= TF_SENTFIN;
-			}
-		}
-		tp->snd_nxt += len;
-		if (SEQ_GT(tp->snd_nxt, tp->snd_max)) {
-			tp->snd_max = tp->snd_nxt;
-			/*
-			 * Time this transmission if not a retransmission and
-			 * not currently timing anything.
-			 */
-			if (tp->t_rtt == 0) {
-				tp->t_rtt = 1;
-				tp->t_rtseq = startseq;
-				tcpstat.tcps_segstimed++;
-			}
-		}
-
-		/*
-		 * Set retransmit timer if not currently set,
-		 * and not doing an ack or a keep-alive probe.
-		 * Initial value for retransmit timer is smoothed
-		 * round-trip time + 2 * round-trip time variance.
-		 * Initialize shift counter which is used for backoff
-		 * of retransmit time.
-		 */
-		if (tp->t_timer[TCPT_REXMT] == 0 &&
-		    tp->snd_nxt != tp->snd_una) {
-			tp->t_timer[TCPT_REXMT] = tp->t_rxtcur;
-			if (tp->t_timer[TCPT_PERSIST]) {
-				tp->t_timer[TCPT_PERSIST] = 0;
-				tp->t_rxtshift = 0;
-			}
-		}
-	} else
-		if (SEQ_GT(tp->snd_nxt + len, tp->snd_max))
-			tp->snd_max = tp->snd_nxt + len;
-
-#ifdef TCPDEBUG
-	/*
-	 * Trace.
-	 */
-	if (so->so_options & SO_DEBUG)
-		tcp_trace(TA_OUTPUT, tp->t_state, tp, ti, 0);
-#endif
-
-	/*
-	 * Fill in IP length and desired time to live and
-	 * send to IP level.  There should be a better way
-	 * to handle ttl and tos; we could keep them in
-	 * the template, but need a way to checksum without them.
-	 */
-	m->m_pkthdr.len = hdrlen + len;
-#ifdef TUBA
-	if (tp->t_tuba_pcb)
-		error = tuba_output(m, tp);
-	else
-#endif
-    {
-#if 1
-	struct rtentry *rt;
-#endif
-	((struct ip *)ti)->ip_len = m->m_pkthdr.len;
-	((struct ip *)ti)->ip_ttl = tp->t_inpcb->inp_ip_ttl;	/* XXX */
-	((struct ip *)ti)->ip_tos = tp->t_inpcb->inp_ip_tos;	/* XXX */
-#if 1
-	/*
-	 * See if we should do MTU discovery.  We do it only if the following
-	 * are true:
-	 *	1) we have a valid route to the destination
-	 *	2) the MTU is not locked (if it is, then discovery has been
-	 *	   disabled)
-	 */
-	if ((rt = tp->t_inpcb->inp_route.ro_rt)
-	    && rt->rt_flags & RTF_UP
-	    && !(rt->rt_rmx.rmx_locks & RTV_MTU)) {
-		((struct ip *)ti)->ip_off |= IP_DF;
-	}
-#endif
-	error = ip_output(m, tp->t_inpcb->inp_options, &tp->t_inpcb->inp_route,
-	    so->so_options & SO_DONTROUTE, 0);
-    }
-	if (error) {
-out:
-		if (error == ENOBUFS) {
-			tcp_quench(tp->t_inpcb, 0);
-			return (0);
-		}
-#if 1
-		if (error == EMSGSIZE) {
-			/*
-			 * ip_output() will have already fixed the route
-			 * for us.  tcp_mtudisc() will, as its last action,
-			 * initiate retransmission, so it is important to
-			 * not do so here.
-			 */
-			tcp_mtudisc(tp->t_inpcb, 0);
-			return 0;
-		}
-#endif
-		if ((error == EHOSTUNREACH || error == ENETDOWN)
-		    && TCPS_HAVERCVDSYN(tp->t_state)) {
-			tp->t_softerror = error;
-			return (0);
-		}
-		return (error);
-	}
-	tcpstat.tcps_sndtotal++;
-
-	/*
-	 * Data sent (as far as we can tell).
-	 * If this advertises a larger window than any other segment,
-	 * then remember the size of the advertised window.
-	 * Any pending ACK has now been sent.
-	 */
-	if (win > 0 && SEQ_GT(tp->rcv_nxt+win, tp->rcv_adv))
-		tp->rcv_adv = tp->rcv_nxt + win;
-	tp->last_ack_sent = tp->rcv_nxt;
-	tp->t_flags &= ~(TF_ACKNOW|TF_DELACK);
-	if (sendalot)
-		goto again;
-	return (0);
-}
-
-void
-tcp_setpersist(tp)
-	register struct tcpcb *tp;
-{
-	register int t = ((tp->t_srtt >> 2) + tp->t_rttvar) >> 1;
-
-	if (tp->t_timer[TCPT_REXMT])
-		panic("tcp_output REXMT");
-	/*
-	 * Start/restart persistance timer.
-	 */
-	TCPT_RANGESET(tp->t_timer[TCPT_PERSIST],
-	    t * tcp_backoff[tp->t_rxtshift],
-	    TCPTV_PERSMIN, TCPTV_PERSMAX);
-	if (tp->t_rxtshift < TCP_MAXRXTSHIFT)
-		tp->t_rxtshift++;
-}
diff --git a/c/src/exec/libnetworking/netinet/tcp_seq.h b/c/src/exec/libnetworking/netinet/tcp_seq.h
deleted file mode 100644
index 8cccf199e1..0000000000
--- a/c/src/exec/libnetworking/netinet/tcp_seq.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993, 1995
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)tcp_seq.h	8.3 (Berkeley) 6/21/95
- *	$Id$
- */
-
-#ifndef _NETINET_TCP_SEQ_H_
-#define _NETINET_TCP_SEQ_H_
-/*
- * TCP sequence numbers are 32 bit integers operated
- * on with modular arithmetic.  These macros can be
- * used to compare such integers.
- */
-#define	SEQ_LT(a,b)	((int)((a)-(b)) < 0)
-#define	SEQ_LEQ(a,b)	((int)((a)-(b)) <= 0)
-#define	SEQ_GT(a,b)	((int)((a)-(b)) > 0)
-#define	SEQ_GEQ(a,b)	((int)((a)-(b)) >= 0)
-
-/* for modulo comparisons of timestamps */
-#define TSTMP_LT(a,b)	((int)((a)-(b)) < 0)
-#define TSTMP_GEQ(a,b)	((int)((a)-(b)) >= 0)
-
-/*
- * TCP connection counts are 32 bit integers operated
- * on with modular arithmetic.  These macros can be
- * used to compare such integers.
- */
-#define	CC_LT(a,b)	((int)((a)-(b)) < 0)
-#define	CC_LEQ(a,b)	((int)((a)-(b)) <= 0)
-#define	CC_GT(a,b)	((int)((a)-(b)) > 0)
-#define	CC_GEQ(a,b)	((int)((a)-(b)) >= 0)
-
-/* Macro to increment a CC: skip 0 which has a special meaning */
-#define CC_INC(c)	(++(c) == 0 ? ++(c) : (c))
-
-/*
- * Macros to initialize tcp sequence numbers for
- * send and receive from initial send and receive
- * sequence numbers.
- */
-#define	tcp_rcvseqinit(tp) \
-	(tp)->rcv_adv = (tp)->rcv_nxt = (tp)->irs + 1
-
-#define	tcp_sendseqinit(tp) \
-	(tp)->snd_una = (tp)->snd_nxt = (tp)->snd_max = (tp)->snd_up = \
-	    (tp)->iss
-
-#define TCP_PAWS_IDLE	(24 * 24 * 60 * 60 * PR_SLOWHZ)
-					/* timestamp wrap-around time */
-
-#ifdef KERNEL
-extern tcp_cc	tcp_ccgen;		/* global connection count */
-
-/*
- * Increment for tcp_iss each second.
- * This is designed to increment at the standard 250 KB/s,
- * but with a random component averaging 128 KB.
- * We also increment tcp_iss by a quarter of this amount
- * each time we use the value for a new connection.
- * If defined, the tcp_random18() macro should produce a
- * number in the range [0-0x3ffff] that is hard to predict.
- */
-#ifndef tcp_random18
-#define	tcp_random18()	((random() >> 14) & 0x3ffff)
-#endif
-#define	TCP_ISSINCR	(122*1024 + tcp_random18())
-
-extern tcp_seq	tcp_iss;		/* tcp initial send seq # */
-#else
-#define	TCP_ISSINCR	(250*1024)	/* increment for tcp_iss each second */
-#endif /* KERNEL */
-#endif /* _NETINET_TCP_SEQ_H_ */
diff --git a/c/src/exec/libnetworking/netinet/tcp_subr.c b/c/src/exec/libnetworking/netinet/tcp_subr.c
deleted file mode 100644
index a9cde3fdf0..0000000000
--- a/c/src/exec/libnetworking/netinet/tcp_subr.c
+++ /dev/null
@@ -1,634 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1988, 1990, 1993, 1995
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)tcp_subr.c	8.2 (Berkeley) 5/24/95
- *	$Id$
- */
-
-#include "opt_tcpdebug.h"
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/proc.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/sysctl.h>
-#include <sys/malloc.h>
-#include <sys/mbuf.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/protosw.h>
-#include <sys/errno.h>
-
-#include <net/route.h>
-#include <net/if.h>
-
-#define _IP_VHL
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/in_pcb.h>
-#include <netinet/in_var.h>
-#include <netinet/ip_var.h>
-#include <netinet/ip_icmp.h>
-#include <netinet/tcp.h>
-#include <netinet/tcp_fsm.h>
-#include <netinet/tcp_seq.h>
-#include <netinet/tcp_timer.h>
-#include <netinet/tcp_var.h>
-#include <netinet/tcpip.h>
-#ifdef TCPDEBUG
-#include <netinet/tcp_debug.h>
-#endif
-
-int 	tcp_mssdflt = TCP_MSS;
-SYSCTL_INT(_net_inet_tcp, TCPCTL_MSSDFLT, mssdflt,
-	CTLFLAG_RW, &tcp_mssdflt , 0, "");
-
-static int	tcp_do_rfc1323 = 1;
-static int	tcp_do_rfc1644 = 1;
-#if !defined(__rtems__)
-static int 	tcp_rttdflt = TCPTV_SRTTDFLT / PR_SLOWHZ;
-SYSCTL_INT(_net_inet_tcp, TCPCTL_RTTDFLT, rttdflt,
-	CTLFLAG_RW, &tcp_rttdflt , 0, "");
-
-SYSCTL_INT(_net_inet_tcp, TCPCTL_DO_RFC1323, rfc1323,
-	CTLFLAG_RW, &tcp_do_rfc1323 , 0, "");
-
-SYSCTL_INT(_net_inet_tcp, TCPCTL_DO_RFC1644, rfc1644,
-	CTLFLAG_RW, &tcp_do_rfc1644 , 0, "");
-#endif
-
-static void	tcp_cleartaocache(void);
-static void	tcp_notify __P((struct inpcb *, int));
-
-/*
- * Target size of TCP PCB hash table. Will be rounded down to a prime
- * number.
- */
-#ifndef TCBHASHSIZE
-#define TCBHASHSIZE	128
-#endif
-
-/*
- * Tcp initialization
- */
-void
-tcp_init()
-{
-
-	tcp_iss = random();	/* wrong, but better than a constant */
-	tcp_ccgen = 1;
-	tcp_cleartaocache();
-	LIST_INIT(&tcb);
-	tcbinfo.listhead = &tcb;
-	tcbinfo.hashbase = hashinit(TCBHASHSIZE, M_PCB, &tcbinfo.hashmask);
-	if (max_protohdr < sizeof(struct tcpiphdr))
-		max_protohdr = sizeof(struct tcpiphdr);
-	if (max_linkhdr + sizeof(struct tcpiphdr) > MHLEN)
-		panic("tcp_init");
-}
-
-/*
- * Create template to be used to send tcp packets on a connection.
- * Call after host entry created, allocates an mbuf and fills
- * in a skeletal tcp/ip header, minimizing the amount of work
- * necessary when the connection is used.
- */
-struct tcpiphdr *
-tcp_template(tp)
-	struct tcpcb *tp;
-{
-	register struct inpcb *inp = tp->t_inpcb;
-	register struct mbuf *m;
-	register struct tcpiphdr *n;
-
-	if ((n = tp->t_template) == 0) {
-		m = m_get(M_DONTWAIT, MT_HEADER);
-		if (m == NULL)
-			return (0);
-		m->m_len = sizeof (struct tcpiphdr);
-		n = mtod(m, struct tcpiphdr *);
-	}
-	n->ti_next = n->ti_prev = 0;
-	n->ti_x1 = 0;
-	n->ti_pr = IPPROTO_TCP;
-	n->ti_len = htons(sizeof (struct tcpiphdr) - sizeof (struct ip));
-	n->ti_src = inp->inp_laddr;
-	n->ti_dst = inp->inp_faddr;
-	n->ti_sport = inp->inp_lport;
-	n->ti_dport = inp->inp_fport;
-	n->ti_seq = 0;
-	n->ti_ack = 0;
-	n->ti_x2 = 0;
-	n->ti_off = 5;
-	n->ti_flags = 0;
-	n->ti_win = 0;
-	n->ti_sum = 0;
-	n->ti_urp = 0;
-	return (n);
-}
-
-/*
- * Send a single message to the TCP at address specified by
- * the given TCP/IP header.  If m == 0, then we make a copy
- * of the tcpiphdr at ti and send directly to the addressed host.
- * This is used to force keep alive messages out using the TCP
- * template for a connection tp->t_template.  If flags are given
- * then we send a message back to the TCP which originated the
- * segment ti, and discard the mbuf containing it and any other
- * attached mbufs.
- *
- * In any case the ack and sequence number of the transmitted
- * segment are as specified by the parameters.
- *
- * NOTE: If m != NULL, then ti must point to *inside* the mbuf.
- */
-void
-tcp_respond(tp, ti, m, ack, seq, flags)
-	struct tcpcb *tp;
-	register struct tcpiphdr *ti;
-	register struct mbuf *m;
-	tcp_seq ack, seq;
-	int flags;
-{
-	register int tlen;
-	int win = 0;
-	struct route *ro = 0;
-	struct route sro;
-
-	if (tp) {
-		win = sbspace(&tp->t_inpcb->inp_socket->so_rcv);
-		ro = &tp->t_inpcb->inp_route;
-	} else {
-		ro = &sro;
-		bzero(ro, sizeof *ro);
-	}
-	if (m == 0) {
-		m = m_gethdr(M_DONTWAIT, MT_HEADER);
-		if (m == NULL)
-			return;
-#ifdef TCP_COMPAT_42
-		tlen = 1;
-#else
-		tlen = 0;
-#endif
-		m->m_data += max_linkhdr;
-		*mtod(m, struct tcpiphdr *) = *ti;
-		ti = mtod(m, struct tcpiphdr *);
-		flags = TH_ACK;
-	} else {
-		m_freem(m->m_next);
-		m->m_next = 0;
-		m->m_data = (caddr_t)ti;
-		m->m_len = sizeof (struct tcpiphdr);
-		tlen = 0;
-#define xchg(a,b,type) { type t; t=a; a=b; b=t; }
-		xchg(ti->ti_dst.s_addr, ti->ti_src.s_addr, u_long);
-		xchg(ti->ti_dport, ti->ti_sport, u_short);
-#undef xchg
-	}
-	ti->ti_len = htons((u_short)(sizeof (struct tcphdr) + tlen));
-	tlen += sizeof (struct tcpiphdr);
-	m->m_len = tlen;
-	m->m_pkthdr.len = tlen;
-	m->m_pkthdr.rcvif = (struct ifnet *) 0;
-	ti->ti_next = ti->ti_prev = 0;
-	ti->ti_x1 = 0;
-	ti->ti_seq = htonl(seq);
-	ti->ti_ack = htonl(ack);
-	ti->ti_x2 = 0;
-	ti->ti_off = sizeof (struct tcphdr) >> 2;
-	ti->ti_flags = flags;
-	if (tp)
-		ti->ti_win = htons((u_short) (win >> tp->rcv_scale));
-	else
-		ti->ti_win = htons((u_short)win);
-	ti->ti_urp = 0;
-	ti->ti_sum = 0;
-	ti->ti_sum = in_cksum(m, tlen);
-	((struct ip *)ti)->ip_len = tlen;
-	((struct ip *)ti)->ip_ttl = ip_defttl;
-#ifdef TCPDEBUG
-	if (tp == NULL || (tp->t_inpcb->inp_socket->so_options & SO_DEBUG))
-		tcp_trace(TA_OUTPUT, 0, tp, ti, 0);
-#endif
-	(void) ip_output(m, NULL, ro, 0, NULL);
-	if (ro == &sro && ro->ro_rt) {
-		RTFREE(ro->ro_rt);
-	}
-}
-
-/*
- * Create a new TCP control block, making an
- * empty reassembly queue and hooking it to the argument
- * protocol control block.
- */
-struct tcpcb *
-tcp_newtcpcb(inp)
-	struct inpcb *inp;
-{
-	register struct tcpcb *tp;
-
-	tp = malloc(sizeof(*tp), M_PCB, M_NOWAIT);
-	if (tp == NULL)
-		return ((struct tcpcb *)0);
-	bzero((char *) tp, sizeof(struct tcpcb));
-	tp->seg_next = tp->seg_prev = (struct tcpiphdr *)tp;
-	tp->t_maxseg = tp->t_maxopd = tcp_mssdflt;
-
-	if (tcp_do_rfc1323)
-		tp->t_flags = (TF_REQ_SCALE|TF_REQ_TSTMP);
-	if (tcp_do_rfc1644)
-		tp->t_flags |= TF_REQ_CC;
-	tp->t_inpcb = inp;
-	/*
-	 * Init srtt to TCPTV_SRTTBASE (0), so we can tell that we have no
-	 * rtt estimate.  Set rttvar so that srtt + 4 * rttvar gives
-	 * reasonable initial retransmit time.
-	 */
-	tp->t_srtt = TCPTV_SRTTBASE;
-	tp->t_rttvar = ((TCPTV_RTOBASE - TCPTV_SRTTBASE) << TCP_RTTVAR_SHIFT) / 4;
-	tp->t_rttmin = TCPTV_MIN;
-	tp->t_rxtcur = TCPTV_RTOBASE;
-	tp->snd_cwnd = TCP_MAXWIN << TCP_MAX_WINSHIFT;
-	tp->snd_ssthresh = TCP_MAXWIN << TCP_MAX_WINSHIFT;
-	inp->inp_ip_ttl = ip_defttl;
-	inp->inp_ppcb = (caddr_t)tp;
-	return (tp);
-}
-
-/*
- * Drop a TCP connection, reporting
- * the specified error.  If connection is synchronized,
- * then send a RST to peer.
- */
-struct tcpcb *
-tcp_drop(tp, errnum)
-	register struct tcpcb *tp;
-	int errnum;
-{
-	struct socket *so = tp->t_inpcb->inp_socket;
-
-	if (TCPS_HAVERCVDSYN(tp->t_state)) {
-		tp->t_state = TCPS_CLOSED;
-		(void) tcp_output(tp);
-		tcpstat.tcps_drops++;
-	} else
-		tcpstat.tcps_conndrops++;
-	if (errnum == ETIMEDOUT && tp->t_softerror)
-		errnum = tp->t_softerror;
-	so->so_error = errnum;
-	return (tcp_close(tp));
-}
-
-/*
- * Close a TCP control block:
- *	discard all space held by the tcp
- *	discard internet protocol block
- *	wake up any sleepers
- */
-struct tcpcb *
-tcp_close(tp)
-	register struct tcpcb *tp;
-{
-	register struct tcpiphdr *t;
-	struct inpcb *inp = tp->t_inpcb;
-	struct socket *so = inp->inp_socket;
-	register struct mbuf *m;
-	register struct rtentry *rt;
-
-	/*
-	 * If we got enough samples through the srtt filter,
-	 * save the rtt and rttvar in the routing entry.
-	 * 'Enough' is arbitrarily defined as the 16 samples.
-	 * 16 samples is enough for the srtt filter to converge
-	 * to within 5% of the correct value; fewer samples and
-	 * we could save a very bogus rtt.
-	 *
-	 * Don't update the default route's characteristics and don't
-	 * update anything that the user "locked".
-	 */
-	if (tp->t_rttupdated >= 16 &&
-	    (rt = inp->inp_route.ro_rt) &&
-	    ((struct sockaddr_in *)rt_key(rt))->sin_addr.s_addr != INADDR_ANY) {
-		register u_long i = 0;
-
-		if ((rt->rt_rmx.rmx_locks & RTV_RTT) == 0) {
-			i = tp->t_srtt *
-			    (RTM_RTTUNIT / (PR_SLOWHZ * TCP_RTT_SCALE));
-			if (rt->rt_rmx.rmx_rtt && i)
-				/*
-				 * filter this update to half the old & half
-				 * the new values, converting scale.
-				 * See route.h and tcp_var.h for a
-				 * description of the scaling constants.
-				 */
-				rt->rt_rmx.rmx_rtt =
-				    (rt->rt_rmx.rmx_rtt + i) / 2;
-			else
-				rt->rt_rmx.rmx_rtt = i;
-			tcpstat.tcps_cachedrtt++;
-		}
-		if ((rt->rt_rmx.rmx_locks & RTV_RTTVAR) == 0) {
-			i = tp->t_rttvar *
-			    (RTM_RTTUNIT / (PR_SLOWHZ * TCP_RTTVAR_SCALE));
-			if (rt->rt_rmx.rmx_rttvar && i)
-				rt->rt_rmx.rmx_rttvar =
-				    (rt->rt_rmx.rmx_rttvar + i) / 2;
-			else
-				rt->rt_rmx.rmx_rttvar = i;
-			tcpstat.tcps_cachedrttvar++;
-		}
-		/*
-		 * update the pipelimit (ssthresh) if it has been updated
-		 * already or if a pipesize was specified & the threshhold
-		 * got below half the pipesize.  I.e., wait for bad news
-		 * before we start updating, then update on both good
-		 * and bad news.
-		 */
-		if (((rt->rt_rmx.rmx_locks & RTV_SSTHRESH) == 0 &&
-		    ((i = tp->snd_ssthresh) != 0) && rt->rt_rmx.rmx_ssthresh) ||
-		    i < (rt->rt_rmx.rmx_sendpipe / 2)) {
-			/*
-			 * convert the limit from user data bytes to
-			 * packets then to packet data bytes.
-			 */
-			i = (i + tp->t_maxseg / 2) / tp->t_maxseg;
-			if (i < 2)
-				i = 2;
-			i *= (u_long)(tp->t_maxseg + sizeof (struct tcpiphdr));
-			if (rt->rt_rmx.rmx_ssthresh)
-				rt->rt_rmx.rmx_ssthresh =
-				    (rt->rt_rmx.rmx_ssthresh + i) / 2;
-			else
-				rt->rt_rmx.rmx_ssthresh = i;
-			tcpstat.tcps_cachedssthresh++;
-		}
-	}
-	/* free the reassembly queue, if any */
-	t = tp->seg_next;
-	while (t != (struct tcpiphdr *)tp) {
-		t = (struct tcpiphdr *)t->ti_next;
-		m = REASS_MBUF((struct tcpiphdr *)t->ti_prev);
-		remque(t->ti_prev);
-		m_freem(m);
-	}
-	if (tp->t_template)
-		(void) m_free(dtom(tp->t_template));
-	free(tp, M_PCB);
-	inp->inp_ppcb = 0;
-	soisdisconnected(so);
-	in_pcbdetach(inp);
-	tcpstat.tcps_closed++;
-	return ((struct tcpcb *)0);
-}
-
-void
-tcp_drain()
-{
-
-}
-
-/*
- * Notify a tcp user of an asynchronous error;
- * store error as soft error, but wake up user
- * (for now, won't do anything until can select for soft error).
- */
-static void
-tcp_notify(inp, error)
-	struct inpcb *inp;
-	int error;
-{
-	register struct tcpcb *tp = (struct tcpcb *)inp->inp_ppcb;
-	register struct socket *so = inp->inp_socket;
-
-	/*
-	 * Ignore some errors if we are hooked up.
-	 * If connection hasn't completed, has retransmitted several times,
-	 * and receives a second error, give up now.  This is better
-	 * than waiting a long time to establish a connection that
-	 * can never complete.
-	 */
-	if (tp->t_state == TCPS_ESTABLISHED &&
-	     (error == EHOSTUNREACH || error == ENETUNREACH ||
-	      error == EHOSTDOWN)) {
-		return;
-	} else if (tp->t_state < TCPS_ESTABLISHED && tp->t_rxtshift > 3 &&
-	    tp->t_softerror)
-		so->so_error = error;
-	else
-		tp->t_softerror = error;
-	soconnwakeup (so);
-	sorwakeup(so);
-	sowwakeup(so);
-}
-
-void
-tcp_ctlinput(cmd, sa, vip)
-	int cmd;
-	struct sockaddr *sa;
-	void *vip;
-{
-	register struct ip *ip = vip;
-	register struct tcphdr *th;
-	void (*notify) __P((struct inpcb *, int)) = tcp_notify;
-
-	if (cmd == PRC_QUENCH)
-		notify = tcp_quench;
-#if 1
-	else if (cmd == PRC_MSGSIZE)
-		notify = tcp_mtudisc;
-#endif
-	else if (!PRC_IS_REDIRECT(cmd) &&
-		 ((unsigned)cmd > PRC_NCMDS || inetctlerrmap[cmd] == 0))
-		return;
-	if (ip) {
-		th = (struct tcphdr *)((caddr_t)ip 
-				       + (IP_VHL_HL(ip->ip_vhl) << 2));
-		in_pcbnotify(&tcb, sa, th->th_dport, ip->ip_src, th->th_sport,
-			cmd, notify);
-	} else
-		in_pcbnotify(&tcb, sa, 0, zeroin_addr, 0, cmd, notify);
-}
-
-/*
- * When a source quench is received, close congestion window
- * to one segment.  We will gradually open it again as we proceed.
- */
-void
-tcp_quench(inp, errnum)
-	struct inpcb *inp;
-	int errnum;
-{
-	struct tcpcb *tp = intotcpcb(inp);
-
-	if (tp)
-		tp->snd_cwnd = tp->t_maxseg;
-}
-
-#if 1
-/*
- * When `need fragmentation' ICMP is received, update our idea of the MSS
- * based on the new value in the route.  Also nudge TCP to send something,
- * since we know the packet we just sent was dropped.
- * This duplicates some code in the tcp_mss() function in tcp_input.c.
- */
-void
-tcp_mtudisc(inp, errnum)
-	struct inpcb *inp;
-	int errnum;
-{
-	struct tcpcb *tp = intotcpcb(inp);
-	struct rtentry *rt;
-	struct rmxp_tao *taop;
-	struct socket *so = inp->inp_socket;
-	int offered;
-	int mss;
-
-	if (tp) {
-		rt = tcp_rtlookup(inp);
-		if (!rt || !rt->rt_rmx.rmx_mtu) {
-			tp->t_maxopd = tp->t_maxseg = tcp_mssdflt;
-			return;
-		}
-		taop = rmx_taop(rt->rt_rmx);
-		offered = taop->tao_mssopt;
-		mss = rt->rt_rmx.rmx_mtu - sizeof(struct tcpiphdr);
-		if (offered)
-			mss = min(mss, offered);
-		/*
-		 * XXX - The above conditional probably violates the TCP
-		 * spec.  The problem is that, since we don't know the
-		 * other end's MSS, we are supposed to use a conservative
-		 * default.  But, if we do that, then MTU discovery will
-		 * never actually take place, because the conservative
-		 * default is much less than the MTUs typically seen
-		 * on the Internet today.  For the moment, we'll sweep
-		 * this under the carpet.
-		 *
-		 * The conservative default might not actually be a problem
-		 * if the only case this occurs is when sending an initial
-		 * SYN with options and data to a host we've never talked
-		 * to before.  Then, they will reply with an MSS value which
-		 * will get recorded and the new parameters should get
-		 * recomputed.  For Further Study.
-		 */
-		if (tp->t_maxopd <= mss)
-			return;
-		tp->t_maxopd = mss;
-
-		if ((tp->t_flags & (TF_REQ_TSTMP|TF_NOOPT)) == TF_REQ_TSTMP &&
-		    (tp->t_flags & TF_RCVD_TSTMP) == TF_RCVD_TSTMP)
-			mss -= TCPOLEN_TSTAMP_APPA;
-		if ((tp->t_flags & (TF_REQ_CC|TF_NOOPT)) == TF_REQ_CC &&
-		    (tp->t_flags & TF_RCVD_CC) == TF_RCVD_CC)
-			mss -= TCPOLEN_CC_APPA;
-#if	(MCLBYTES & (MCLBYTES - 1)) == 0
-		if (mss > MCLBYTES)
-			mss &= ~(MCLBYTES-1);
-#else
-		if (mss > MCLBYTES)
-			mss = mss / MCLBYTES * MCLBYTES;
-#endif
-		if (so->so_snd.sb_hiwat < mss)
-			mss = so->so_snd.sb_hiwat;
-
-		tp->t_maxseg = mss;
-
-		tcpstat.tcps_mturesent++;
-		tp->t_rtt = 0;
-		tp->snd_nxt = tp->snd_una;
-		tcp_output(tp);
-	}
-}
-#endif
-
-/*
- * Look-up the routing entry to the peer of this inpcb.  If no route
- * is found and it cannot be allocated the return NULL.  This routine
- * is called by TCP routines that access the rmx structure and by tcp_mss
- * to get the interface MTU.
- */
-struct rtentry *
-tcp_rtlookup(inp)
-	struct inpcb *inp;
-{
-	struct route *ro;
-	struct rtentry *rt;
-
-	ro = &inp->inp_route;
-	rt = ro->ro_rt;
-	if (rt == NULL || !(rt->rt_flags & RTF_UP)) {
-		/* No route yet, so try to acquire one */
-		if (inp->inp_faddr.s_addr != INADDR_ANY) {
-			ro->ro_dst.sa_family = AF_INET;
-			ro->ro_dst.sa_len = sizeof(ro->ro_dst);
-			((struct sockaddr_in *) &ro->ro_dst)->sin_addr =
-				inp->inp_faddr;
-			rtalloc(ro);
-			rt = ro->ro_rt;
-		}
-	}
-	return rt;
-}
-
-/*
- * Return a pointer to the cached information about the remote host.
- * The cached information is stored in the protocol specific part of
- * the route metrics.
- */
-struct rmxp_tao *
-tcp_gettaocache(inp)
-	struct inpcb *inp;
-{
-	struct rtentry *rt = tcp_rtlookup(inp);
-
-	/* Make sure this is a host route and is up. */
-	if (rt == NULL ||
-	    (rt->rt_flags & (RTF_UP|RTF_HOST)) != (RTF_UP|RTF_HOST))
-		return NULL;
-
-	return rmx_taop(rt->rt_rmx);
-}
-
-/*
- * Clear all the TAO cache entries, called from tcp_init.
- *
- * XXX
- * This routine is just an empty one, because we assume that the routing
- * routing tables are initialized at the same time when TCP, so there is
- * nothing in the cache left over.
- */
-static void
-tcp_cleartaocache(void)
-{ }
diff --git a/c/src/exec/libnetworking/netinet/tcp_timer.c b/c/src/exec/libnetworking/netinet/tcp_timer.c
deleted file mode 100644
index 04d3d604e2..0000000000
--- a/c/src/exec/libnetworking/netinet/tcp_timer.c
+++ /dev/null
@@ -1,387 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1988, 1990, 1993, 1995
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)tcp_timer.c	8.2 (Berkeley) 5/24/95
- *	$Id$
- */
-
-#include "opt_tcpdebug.h"
-
-#ifndef TUBA_INCLUDE
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/sysctl.h>
-#include <sys/malloc.h>
-#include <sys/mbuf.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/protosw.h>
-#include <sys/errno.h>
-
-#include <machine/cpu.h>	/* before tcp_seq.h, for tcp_random18() */
-
-#include <net/if.h>
-#include <net/route.h>
-
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/in_pcb.h>
-#include <netinet/ip_var.h>
-#include <netinet/tcp.h>
-#include <netinet/tcp_fsm.h>
-#include <netinet/tcp_seq.h>
-#include <netinet/tcp_timer.h>
-#include <netinet/tcp_var.h>
-#include <netinet/tcpip.h>
-#ifdef TCPDEBUG
-#include <netinet/tcp_debug.h>
-#endif
-
-int	tcp_keepinit = TCPTV_KEEP_INIT;
-SYSCTL_INT(_net_inet_tcp, TCPCTL_KEEPINIT, keepinit,
-	CTLFLAG_RW, &tcp_keepinit , 0, "");
-
-int	tcp_keepidle = TCPTV_KEEP_IDLE;
-SYSCTL_INT(_net_inet_tcp, TCPCTL_KEEPIDLE, keepidle,
-	CTLFLAG_RW, &tcp_keepidle , 0, "");
-
-static int	tcp_keepintvl = TCPTV_KEEPINTVL;
-SYSCTL_INT(_net_inet_tcp, TCPCTL_KEEPINTVL, keepintvl,
-	CTLFLAG_RW, &tcp_keepintvl , 0, "");
-
-static int	always_keepalive = 0;
-SYSCTL_INT(_net_inet_tcp, OID_AUTO, always_keepalive,
-	CTLFLAG_RW, &always_keepalive , 0, "");
-
-static int	tcp_keepcnt = TCPTV_KEEPCNT;
-	/* max idle probes */
-static int	tcp_maxpersistidle = TCPTV_KEEP_IDLE;
-	/* max idle time in persist */
-int	tcp_maxidle;
-#else /* TUBA_INCLUDE */
-
-static	int tcp_maxpersistidle;
-#endif /* TUBA_INCLUDE */
-
-/*
- * Fast timeout routine for processing delayed acks
- */
-void
-tcp_fasttimo()
-{
-	register struct inpcb *inp;
-	register struct tcpcb *tp;
-	int s;
-
-	s = splnet();
-
-	for (inp = tcb.lh_first; inp != NULL; inp = inp->inp_list.le_next) {
-		if ((tp = (struct tcpcb *)inp->inp_ppcb) &&
-		    (tp->t_flags & TF_DELACK)) {
-			tp->t_flags &= ~TF_DELACK;
-			tp->t_flags |= TF_ACKNOW;
-			tcpstat.tcps_delack++;
-			(void) tcp_output(tp);
-		}
-	}
-	splx(s);
-}
-
-/*
- * Tcp protocol timeout routine called every 500 ms.
- * Updates the timers in all active tcb's and
- * causes finite state machine actions if timers expire.
- */
-void
-tcp_slowtimo()
-{
-	register struct inpcb *ip, *ipnxt;
-	register struct tcpcb *tp;
-	register int i;
-	int s;
-#ifdef TCPDEBUG
-	int ostate;
-#endif
-
-	s = splnet();
-
-	tcp_maxidle = tcp_keepcnt * tcp_keepintvl;
-
-	ip = tcb.lh_first;
-	if (ip == NULL) {
-		splx(s);
-		return;
-	}
-	/*
-	 * Search through tcb's and update active timers.
-	 */
-	for (; ip != NULL; ip = ipnxt) {
-		ipnxt = ip->inp_list.le_next;
-		tp = intotcpcb(ip);
-		if (tp == 0 || tp->t_state == TCPS_LISTEN)
-			continue;
-		for (i = 0; i < TCPT_NTIMERS; i++) {
-			if (tp->t_timer[i] && --tp->t_timer[i] == 0) {
-#ifdef TCPDEBUG
-				ostate = tp->t_state;
-#endif
-				tp = tcp_timers(tp, i);
-				if (tp == NULL)
-					goto tpgone;
-#ifdef TCPDEBUG
-				if (tp->t_inpcb->inp_socket->so_options
-				    & SO_DEBUG)
-					tcp_trace(TA_USER, ostate, tp,
-						  (struct tcpiphdr *)0,
-						  PRU_SLOWTIMO);
-#endif
-			}
-		}
-		tp->t_idle++;
-		tp->t_duration++;
-		if (tp->t_rtt)
-			tp->t_rtt++;
-tpgone:
-		;
-	}
-	tcp_iss += TCP_ISSINCR/PR_SLOWHZ;		/* increment iss */
-#ifdef TCP_COMPAT_42
-	if ((int)tcp_iss < 0)
-		tcp_iss = TCP_ISSINCR;			/* XXX */
-#endif
-	tcp_now++;					/* for timestamps */
-	splx(s);
-}
-#ifndef TUBA_INCLUDE
-
-/*
- * Cancel all timers for TCP tp.
- */
-void
-tcp_canceltimers(tp)
-	struct tcpcb *tp;
-{
-	register int i;
-
-	for (i = 0; i < TCPT_NTIMERS; i++)
-		tp->t_timer[i] = 0;
-}
-
-int	tcp_backoff[TCP_MAXRXTSHIFT + 1] =
-    { 1, 2, 4, 8, 16, 32, 64, 64, 64, 64, 64, 64, 64 };
-
-static int tcp_totbackoff = 511;	/* sum of tcp_backoff[] */
-
-/*
- * TCP timer processing.
- */
-struct tcpcb *
-tcp_timers(tp, timer)
-	register struct tcpcb *tp;
-	int timer;
-{
-	register int rexmt;
-
-	switch (timer) {
-
-	/*
-	 * 2 MSL timeout in shutdown went off.  If we're closed but
-	 * still waiting for peer to close and connection has been idle
-	 * too long, or if 2MSL time is up from TIME_WAIT, delete connection
-	 * control block.  Otherwise, check again in a bit.
-	 */
-	case TCPT_2MSL:
-		if (tp->t_state != TCPS_TIME_WAIT &&
-		    tp->t_idle <= tcp_maxidle)
-			tp->t_timer[TCPT_2MSL] = tcp_keepintvl;
-		else
-			tp = tcp_close(tp);
-		break;
-
-	/*
-	 * Retransmission timer went off.  Message has not
-	 * been acked within retransmit interval.  Back off
-	 * to a longer retransmit interval and retransmit one segment.
-	 */
-	case TCPT_REXMT:
-		if (++tp->t_rxtshift > TCP_MAXRXTSHIFT) {
-			tp->t_rxtshift = TCP_MAXRXTSHIFT;
-			tcpstat.tcps_timeoutdrop++;
-			tp = tcp_drop(tp, tp->t_softerror ?
-			    tp->t_softerror : ETIMEDOUT);
-			break;
-		}
-		tcpstat.tcps_rexmttimeo++;
-		rexmt = TCP_REXMTVAL(tp) * tcp_backoff[tp->t_rxtshift];
-		TCPT_RANGESET(tp->t_rxtcur, rexmt,
-		    tp->t_rttmin, TCPTV_REXMTMAX);
-		tp->t_timer[TCPT_REXMT] = tp->t_rxtcur;
-		/*
-		 * If losing, let the lower level know and try for
-		 * a better route.  Also, if we backed off this far,
-		 * our srtt estimate is probably bogus.  Clobber it
-		 * so we'll take the next rtt measurement as our srtt;
-		 * move the current srtt into rttvar to keep the current
-		 * retransmit times until then.
-		 */
-		if (tp->t_rxtshift > TCP_MAXRXTSHIFT / 4) {
-			in_losing(tp->t_inpcb);
-			tp->t_rttvar += (tp->t_srtt >> TCP_RTT_SHIFT);
-			tp->t_srtt = 0;
-		}
-		tp->snd_nxt = tp->snd_una;
-		/*
-		 * Force a segment to be sent.
-		 */
-		tp->t_flags |= TF_ACKNOW;
-		/*
-		 * If timing a segment in this window, stop the timer.
-		 */
-		tp->t_rtt = 0;
-		/*
-		 * Close the congestion window down to one segment
-		 * (we'll open it by one segment for each ack we get).
-		 * Since we probably have a window's worth of unacked
-		 * data accumulated, this "slow start" keeps us from
-		 * dumping all that data as back-to-back packets (which
-		 * might overwhelm an intermediate gateway).
-		 *
-		 * There are two phases to the opening: Initially we
-		 * open by one mss on each ack.  This makes the window
-		 * size increase exponentially with time.  If the
-		 * window is larger than the path can handle, this
-		 * exponential growth results in dropped packet(s)
-		 * almost immediately.  To get more time between
-		 * drops but still "push" the network to take advantage
-		 * of improving conditions, we switch from exponential
-		 * to linear window opening at some threshhold size.
-		 * For a threshhold, we use half the current window
-		 * size, truncated to a multiple of the mss.
-		 *
-		 * (the minimum cwnd that will give us exponential
-		 * growth is 2 mss.  We don't allow the threshhold
-		 * to go below this.)
-		 */
-		{
-		u_int win = min(tp->snd_wnd, tp->snd_cwnd) / 2 / tp->t_maxseg;
-		if (win < 2)
-			win = 2;
-		tp->snd_cwnd = tp->t_maxseg;
-		tp->snd_ssthresh = win * tp->t_maxseg;
-		tp->t_dupacks = 0;
-		}
-		(void) tcp_output(tp);
-		break;
-
-	/*
-	 * Persistance timer into zero window.
-	 * Force a byte to be output, if possible.
-	 */
-	case TCPT_PERSIST:
-		tcpstat.tcps_persisttimeo++;
-		/*
-		 * Hack: if the peer is dead/unreachable, we do not
-		 * time out if the window is closed.  After a full
-		 * backoff, drop the connection if the idle time
-		 * (no responses to probes) reaches the maximum
-		 * backoff that we would use if retransmitting.
-		 */
-		if (tp->t_rxtshift == TCP_MAXRXTSHIFT) {
-			u_long maxidle = TCP_REXMTVAL(tp);
-			if (maxidle < tp->t_rttmin)
-				maxidle = tp->t_rttmin;
-			maxidle *= tcp_totbackoff;
-			if (tp->t_idle >= tcp_maxpersistidle ||
-			    tp->t_idle >= maxidle) {
-				tcpstat.tcps_persistdrop++;
-				tp = tcp_drop(tp, ETIMEDOUT);
-				break;
-			}
-		}
-		tcp_setpersist(tp);
-		tp->t_force = 1;
-		(void) tcp_output(tp);
-		tp->t_force = 0;
-		break;
-
-	/*
-	 * Keep-alive timer went off; send something
-	 * or drop connection if idle for too long.
-	 */
-	case TCPT_KEEP:
-		tcpstat.tcps_keeptimeo++;
-		if (tp->t_state < TCPS_ESTABLISHED)
-			goto dropit;
-		if ((always_keepalive ||
-		    tp->t_inpcb->inp_socket->so_options & SO_KEEPALIVE) &&
-		    tp->t_state <= TCPS_CLOSING) {
-		    	if (tp->t_idle >= tcp_keepidle + tcp_maxidle)
-				goto dropit;
-			/*
-			 * Send a packet designed to force a response
-			 * if the peer is up and reachable:
-			 * either an ACK if the connection is still alive,
-			 * or an RST if the peer has closed the connection
-			 * due to timeout or reboot.
-			 * Using sequence number tp->snd_una-1
-			 * causes the transmitted zero-length segment
-			 * to lie outside the receive window;
-			 * by the protocol spec, this requires the
-			 * correspondent TCP to respond.
-			 */
-			tcpstat.tcps_keepprobe++;
-#ifdef TCP_COMPAT_42
-			/*
-			 * The keepalive packet must have nonzero length
-			 * to get a 4.2 host to respond.
-			 */
-			tcp_respond(tp, tp->t_template, (struct mbuf *)NULL,
-			    tp->rcv_nxt - 1, tp->snd_una - 1, 0);
-#else
-			tcp_respond(tp, tp->t_template, (struct mbuf *)NULL,
-			    tp->rcv_nxt, tp->snd_una - 1, 0);
-#endif
-			tp->t_timer[TCPT_KEEP] = tcp_keepintvl;
-		} else
-			tp->t_timer[TCPT_KEEP] = tcp_keepidle;
-		break;
-	dropit:
-		tcpstat.tcps_keepdrops++;
-		tp = tcp_drop(tp, ETIMEDOUT);
-		break;
-	}
-	return (tp);
-}
-#endif /* TUBA_INCLUDE */
diff --git a/c/src/exec/libnetworking/netinet/tcp_timer.h b/c/src/exec/libnetworking/netinet/tcp_timer.h
deleted file mode 100644
index 38ffac4ee7..0000000000
--- a/c/src/exec/libnetworking/netinet/tcp_timer.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)tcp_timer.h	8.1 (Berkeley) 6/10/93
- *	$Id$
- */
-
-#ifndef _NETINET_TCP_TIMER_H_
-#define _NETINET_TCP_TIMER_H_
-
-/*
- * Definitions of the TCP timers.  These timers are counted
- * down PR_SLOWHZ times a second.
- */
-#define	TCPT_NTIMERS	4
-
-#define	TCPT_REXMT	0		/* retransmit */
-#define	TCPT_PERSIST	1		/* retransmit persistence */
-#define	TCPT_KEEP	2		/* keep alive */
-#define	TCPT_2MSL	3		/* 2*msl quiet time timer */
-
-/*
- * The TCPT_REXMT timer is used to force retransmissions.
- * The TCP has the TCPT_REXMT timer set whenever segments
- * have been sent for which ACKs are expected but not yet
- * received.  If an ACK is received which advances tp->snd_una,
- * then the retransmit timer is cleared (if there are no more
- * outstanding segments) or reset to the base value (if there
- * are more ACKs expected).  Whenever the retransmit timer goes off,
- * we retransmit one unacknowledged segment, and do a backoff
- * on the retransmit timer.
- *
- * The TCPT_PERSIST timer is used to keep window size information
- * flowing even if the window goes shut.  If all previous transmissions
- * have been acknowledged (so that there are no retransmissions in progress),
- * and the window is too small to bother sending anything, then we start
- * the TCPT_PERSIST timer.  When it expires, if the window is nonzero,
- * we go to transmit state.  Otherwise, at intervals send a single byte
- * into the peer's window to force him to update our window information.
- * We do this at most as often as TCPT_PERSMIN time intervals,
- * but no more frequently than the current estimate of round-trip
- * packet time.  The TCPT_PERSIST timer is cleared whenever we receive
- * a window update from the peer.
- *
- * The TCPT_KEEP timer is used to keep connections alive.  If an
- * connection is idle (no segments received) for TCPTV_KEEP_INIT amount of time,
- * but not yet established, then we drop the connection.  Once the connection
- * is established, if the connection is idle for TCPTV_KEEP_IDLE time
- * (and keepalives have been enabled on the socket), we begin to probe
- * the connection.  We force the peer to send us a segment by sending:
- *	<SEQ=SND.UNA-1><ACK=RCV.NXT><CTL=ACK>
- * This segment is (deliberately) outside the window, and should elicit
- * an ack segment in response from the peer.  If, despite the TCPT_KEEP
- * initiated segments we cannot elicit a response from a peer in TCPT_MAXIDLE
- * amount of time probing, then we drop the connection.
- */
-
-/*
- * Time constants.
- */
-#define	TCPTV_MSL	( 30*PR_SLOWHZ)		/* max seg lifetime (hah!) */
-#define	TCPTV_SRTTBASE	0			/* base roundtrip time;
-						   if 0, no idea yet */
-#define	TCPTV_RTOBASE	(  3*PR_SLOWHZ)		/* assumed RTO if no info */
-#define	TCPTV_SRTTDFLT	(  3*PR_SLOWHZ)		/* assumed RTT if no info */
-
-#define	TCPTV_PERSMIN	(  5*PR_SLOWHZ)		/* retransmit persistence */
-#define	TCPTV_PERSMAX	( 60*PR_SLOWHZ)		/* maximum persist interval */
-
-#define	TCPTV_KEEP_INIT	( 75*PR_SLOWHZ)		/* initial connect keep alive */
-#define	TCPTV_KEEP_IDLE	(120*60*PR_SLOWHZ)	/* dflt time before probing */
-#define	TCPTV_KEEPINTVL	( 75*PR_SLOWHZ)		/* default probe interval */
-#define	TCPTV_KEEPCNT	8			/* max probes before drop */
-
-#define	TCPTV_MIN	(  1*PR_SLOWHZ)		/* minimum allowable value */
-#define	TCPTV_REXMTMAX	( 64*PR_SLOWHZ)		/* max allowable REXMT value */
-
-#define TCPTV_TWTRUNC	8			/* RTO factor to truncate TW */
-
-#define	TCP_LINGERTIME	120			/* linger at most 2 minutes */
-
-#define	TCP_MAXRXTSHIFT	12			/* maximum retransmits */
-
-#ifdef	TCPTIMERS
-static char *tcptimers[] =
-    { "REXMT", "PERSIST", "KEEP", "2MSL" };
-#endif
-
-/*
- * Force a time value to be in a certain range.
- */
-#define	TCPT_RANGESET(tv, value, tvmin, tvmax) { \
-	(tv) = (value); \
-	if ((u_long)(tv) < (u_long)(tvmin)) \
-		(tv) = (tvmin); \
-	else if ((u_long)(tv) > (u_long)(tvmax)) \
-		(tv) = (tvmax); \
-}
-
-#ifdef KERNEL
-extern int tcp_keepinit;		/* time to establish connection */
-extern int tcp_keepidle;		/* time before keepalive probes begin */
-extern int tcp_keepintvl;		/* time between keepalive probes */
-extern int tcp_maxidle;			/* time to drop after starting probes */
-extern int tcp_ttl;			/* time to live for TCP segs */
-extern int tcp_backoff[];
-#endif
-
-#endif
diff --git a/c/src/exec/libnetworking/netinet/tcp_usrreq.c b/c/src/exec/libnetworking/netinet/tcp_usrreq.c
deleted file mode 100644
index ecd9d95636..0000000000
--- a/c/src/exec/libnetworking/netinet/tcp_usrreq.c
+++ /dev/null
@@ -1,840 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	From: @(#)tcp_usrreq.c	8.2 (Berkeley) 1/3/94
- *	$Id$
- */
-
-#include "opt_tcpdebug.h"
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/sysctl.h>
-#include <sys/malloc.h>
-#include <sys/mbuf.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/protosw.h>
-#include <sys/errno.h>
-#include <sys/stat.h>
-
-#include <net/if.h>
-#include <net/route.h>
-
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/in_pcb.h>
-#include <netinet/in_var.h>
-#include <netinet/ip_var.h>
-#include <netinet/tcp.h>
-#include <netinet/tcp_fsm.h>
-#include <netinet/tcp_seq.h>
-#include <netinet/tcp_timer.h>
-#include <netinet/tcp_var.h>
-#include <netinet/tcpip.h>
-#ifdef TCPDEBUG
-#include <netinet/tcp_debug.h>
-#endif
-
-/*
- * TCP protocol interface to socket abstraction.
- */
-extern	char *tcpstates[];
-
-static int	tcp_attach __P((struct socket *));
-static int	tcp_connect __P((struct tcpcb *, struct mbuf *));
-static struct tcpcb *
-		tcp_disconnect __P((struct tcpcb *));
-static struct tcpcb *
-		tcp_usrclosed __P((struct tcpcb *));
-
-#ifdef TCPDEBUG
-#define	TCPDEBUG0	int ostate
-#define	TCPDEBUG1()	ostate = tp ? tp->t_state : 0
-#define	TCPDEBUG2(req)	if (tp && (so->so_options & SO_DEBUG)) \
-				tcp_trace(TA_USER, ostate, tp, 0, req)
-#else
-#define	TCPDEBUG0
-#define	TCPDEBUG1()
-#define	TCPDEBUG2(req)
-#endif
-
-/*
- * TCP attaches to socket via pru_attach(), reserving space,
- * and an internet control block.
- */
-static int
-tcp_usr_attach(struct socket *so, int proto)
-{
-	int s = splnet();
-	int error;
-	struct inpcb *inp = sotoinpcb(so);
-	struct tcpcb *tp = 0;
-	TCPDEBUG0;
-
-	TCPDEBUG1();
-	if (inp) {
-		error = EISCONN;
-		goto out;
-	}
-
-	error = tcp_attach(so);
-	if (error)
-		goto out;
-
-	if ((so->so_options & SO_LINGER) && so->so_linger == 0)
-		so->so_linger = TCP_LINGERTIME * hz;
-	tp = sototcpcb(so);
-out:
-	TCPDEBUG2(PRU_ATTACH);
-	splx(s);
-	return error;
-}
-
-/*
- * pru_detach() detaches the TCP protocol from the socket.
- * If the protocol state is non-embryonic, then can't
- * do this directly: have to initiate a pru_disconnect(),
- * which may finish later; embryonic TCB's can just
- * be discarded here.
- */
-static int
-tcp_usr_detach(struct socket *so)
-{
-	int s = splnet();
-	int error = 0;
-	struct inpcb *inp = sotoinpcb(so);
-	struct tcpcb *tp;
-	TCPDEBUG0;
-
-	if (inp == 0) {
-		splx(s);
-		return EINVAL;	/* XXX */
-	}
-	tp = intotcpcb(inp);
-	TCPDEBUG1();
-	if (tp->t_state > TCPS_LISTEN)
-		tp = tcp_disconnect(tp);
-	else
-		tp = tcp_close(tp);
-
-	TCPDEBUG2(PRU_DETACH);
-	splx(s);
-	return error;
-}
-
-#define	COMMON_START()	TCPDEBUG0; \
-			do { \
-				     if (inp == 0) { \
-					     splx(s); \
-					     return EINVAL; \
-				     } \
-				     tp = intotcpcb(inp); \
-				     TCPDEBUG1(); \
-		     } while(0)
-			     
-#define COMMON_END(req)	out: TCPDEBUG2(req); splx(s); return error; goto out
-
-
-/*
- * Give the socket an address.
- */
-static int
-tcp_usr_bind(struct socket *so, struct mbuf *nam)
-{
-	int s = splnet();
-	int error = 0;
-	struct inpcb *inp = sotoinpcb(so);
-	struct tcpcb *tp;
-	struct sockaddr_in *sinp;
-
-	COMMON_START();
-
-	/*
-	 * Must check for multicast addresses and disallow binding
-	 * to them.
-	 */
-	sinp = mtod(nam, struct sockaddr_in *);
-	if (sinp->sin_family == AF_INET &&
-	    IN_MULTICAST(ntohl(sinp->sin_addr.s_addr))) {
-		error = EAFNOSUPPORT;
-		goto out;
-	}
-	error = in_pcbbind(inp, nam);
-	if (error)
-		goto out;
-	COMMON_END(PRU_BIND);
-
-}
-
-/*
- * Prepare to accept connections.
- */
-static int
-tcp_usr_listen(struct socket *so)
-{
-	int s = splnet();
-	int error = 0;
-	struct inpcb *inp = sotoinpcb(so);
-	struct tcpcb *tp;
-
-	COMMON_START();
-	if (inp->inp_lport == 0)
-		error = in_pcbbind(inp, NULL);
-	if (error == 0)
-		tp->t_state = TCPS_LISTEN;
-	COMMON_END(PRU_LISTEN);
-}
-
-/*
- * Initiate connection to peer.
- * Create a template for use in transmissions on this connection.
- * Enter SYN_SENT state, and mark socket as connecting.
- * Start keep-alive timer, and seed output sequence space.
- * Send initial segment on connection.
- */
-static int
-tcp_usr_connect(struct socket *so, struct mbuf *nam)
-{
-	int s = splnet();
-	int error = 0;
-	struct inpcb *inp = sotoinpcb(so);
-	struct tcpcb *tp;
-	struct sockaddr_in *sinp;
-
-	COMMON_START();
-
-	/*
-	 * Must disallow TCP ``connections'' to multicast addresses.
-	 */
-	sinp = mtod(nam, struct sockaddr_in *);
-	if (sinp->sin_family == AF_INET
-	    && IN_MULTICAST(ntohl(sinp->sin_addr.s_addr))) {
-		error = EAFNOSUPPORT;
-		goto out;
-	}
-
-	if ((error = tcp_connect(tp, nam)) != 0)
-		goto out;
-	error = tcp_output(tp);
-	COMMON_END(PRU_CONNECT);
-}
-
-/*
- * Initiate disconnect from peer.
- * If connection never passed embryonic stage, just drop;
- * else if don't need to let data drain, then can just drop anyways,
- * else have to begin TCP shutdown process: mark socket disconnecting,
- * drain unread data, state switch to reflect user close, and
- * send segment (e.g. FIN) to peer.  Socket will be really disconnected
- * when peer sends FIN and acks ours.
- *
- * SHOULD IMPLEMENT LATER PRU_CONNECT VIA REALLOC TCPCB.
- */
-static int
-tcp_usr_disconnect(struct socket *so)
-{
-	int s = splnet();
-	int error = 0;
-	struct inpcb *inp = sotoinpcb(so);
-	struct tcpcb *tp;
-
-	COMMON_START();
-	tp = tcp_disconnect(tp);
-	COMMON_END(PRU_DISCONNECT);
-}
-
-/*
- * Accept a connection.  Essentially all the work is
- * done at higher levels; just return the address
- * of the peer, storing through addr.
- */
-static int
-tcp_usr_accept(struct socket *so, struct mbuf *nam)
-{
-	int s = splnet();
-	int error = 0;
-	struct inpcb *inp = sotoinpcb(so);
-	struct tcpcb *tp;
-
-	COMMON_START();
-	in_setpeeraddr(inp, nam);
-	COMMON_END(PRU_ACCEPT);
-}
-
-/*
- * Mark the connection as being incapable of further output.
- */
-static int
-tcp_usr_shutdown(struct socket *so)
-{
-	int s = splnet();
-	int error = 0;
-	struct inpcb *inp = sotoinpcb(so);
-	struct tcpcb *tp;
-
-	COMMON_START();
-	socantsendmore(so);
-	tp = tcp_usrclosed(tp);
-	if (tp)
-		error = tcp_output(tp);
-	COMMON_END(PRU_SHUTDOWN);
-}
-
-/*
- * After a receive, possibly send window update to peer.
- */
-static int
-tcp_usr_rcvd(struct socket *so, int flags)
-{
-	int s = splnet();
-	int error = 0;
-	struct inpcb *inp = sotoinpcb(so);
-	struct tcpcb *tp;
-
-	COMMON_START();
-	tcp_output(tp);
-	COMMON_END(PRU_RCVD);
-}
-
-/*
- * Do a send by putting data in output queue and updating urgent
- * marker if URG set.  Possibly send more data.
- */
-static int
-tcp_usr_send(struct socket *so, int flags, struct mbuf *m, struct mbuf *nam,
-	     struct mbuf *control)
-{
-	int s = splnet();
-	int error = 0;
-	struct inpcb *inp = sotoinpcb(so);
-	struct tcpcb *tp;
-
-	COMMON_START();
-	if (control && control->m_len) {
-		m_freem(control); /* XXX shouldn't caller do this??? */
-		if (m)
-			m_freem(m);
-		error = EINVAL;
-		goto out;
-	}
-
-	if(!(flags & PRUS_OOB)) {
-		sbappend(&so->so_snd, m);
-		if (nam && tp->t_state < TCPS_SYN_SENT) {
-			/*
-			 * Do implied connect if not yet connected,
-			 * initialize window to default value, and
-			 * initialize maxseg/maxopd using peer's cached
-			 * MSS.
-			 */
-			error = tcp_connect(tp, nam);
-			if (error)
-				goto out;
-			tp->snd_wnd = TTCP_CLIENT_SND_WND;
-			tcp_mss(tp, -1);
-		}
-
-		if (flags & PRUS_EOF) {
-			/*
-			 * Close the send side of the connection after
-			 * the data is sent.
-			 */
-			socantsendmore(so);
-			tp = tcp_usrclosed(tp);
-		}
-		if (tp != NULL)
-			error = tcp_output(tp);
-	} else {
-		if (sbspace(&so->so_snd) < -512) {
-			m_freem(m);
-			error = ENOBUFS;
-			goto out;
-		}
-		/*
-		 * According to RFC961 (Assigned Protocols),
-		 * the urgent pointer points to the last octet
-		 * of urgent data.  We continue, however,
-		 * to consider it to indicate the first octet
-		 * of data past the urgent section.
-		 * Otherwise, snd_up should be one lower.
-		 */
-		sbappend(&so->so_snd, m);
-		if (nam && tp->t_state < TCPS_SYN_SENT) {
-			/*
-			 * Do implied connect if not yet connected,
-			 * initialize window to default value, and
-			 * initialize maxseg/maxopd using peer's cached
-			 * MSS.
-			 */
-			error = tcp_connect(tp, nam);
-			if (error)
-				goto out;
-			tp->snd_wnd = TTCP_CLIENT_SND_WND;
-			tcp_mss(tp, -1);
-		}
-		tp->snd_up = tp->snd_una + so->so_snd.sb_cc;
-		tp->t_force = 1;
-		error = tcp_output(tp);
-		tp->t_force = 0;
-	}
-	COMMON_END((flags & PRUS_OOB) ? PRU_SENDOOB : 
-		   ((flags & PRUS_EOF) ? PRU_SEND_EOF : PRU_SEND));
-}
-
-/*
- * Abort the TCP.
- */
-static int
-tcp_usr_abort(struct socket *so)
-{
-	int s = splnet();
-	int error = 0;
-	struct inpcb *inp = sotoinpcb(so);
-	struct tcpcb *tp;
-
-	COMMON_START();
-	tp = tcp_drop(tp, ECONNABORTED);
-	COMMON_END(PRU_ABORT);
-}
-
-/*
- * Fill in st_bklsize for fstat() operations on a socket.
- */
-static int
-tcp_usr_sense(struct socket *so, struct stat *sb)
-{
-	int s = splnet();
-
-	sb->st_blksize = so->so_snd.sb_hiwat;
-	splx(s);
-	return 0;
-}
-
-/*
- * Receive out-of-band data.
- */
-static int
-tcp_usr_rcvoob(struct socket *so, struct mbuf *m, int flags)
-{
-	int s = splnet();
-	int error = 0;
-	struct inpcb *inp = sotoinpcb(so);
-	struct tcpcb *tp;
-
-	COMMON_START();
-	if ((so->so_oobmark == 0 &&
-	     (so->so_state & SS_RCVATMARK) == 0) ||
-	    so->so_options & SO_OOBINLINE ||
-	    tp->t_oobflags & TCPOOB_HADDATA) {
-		error = EINVAL;
-		goto out;
-	}
-	if ((tp->t_oobflags & TCPOOB_HAVEDATA) == 0) {
-		error = EWOULDBLOCK;
-		goto out;
-	}
-	m->m_len = 1;
-	*mtod(m, caddr_t) = tp->t_iobc;
-	if ((flags & MSG_PEEK) == 0)
-		tp->t_oobflags ^= (TCPOOB_HAVEDATA | TCPOOB_HADDATA);
-	COMMON_END(PRU_RCVOOB);
-}
-
-static int
-tcp_usr_sockaddr(struct socket *so, struct mbuf *nam)
-{
-	int s = splnet();
-	int error = 0;
-	struct inpcb *inp = sotoinpcb(so);
-	struct tcpcb *tp;
-
-	COMMON_START();
-	in_setsockaddr(inp, nam);
-	COMMON_END(PRU_SOCKADDR);
-}
-
-static int
-tcp_usr_peeraddr(struct socket *so, struct mbuf *nam)
-{
-	int s = splnet();
-	int error = 0;
-	struct inpcb *inp = sotoinpcb(so);
-	struct tcpcb *tp;
-
-	COMMON_START();
-	in_setpeeraddr(inp, nam);
-	COMMON_END(PRU_PEERADDR);
-}
-
-/*
- * XXX - this should just be a call to in_control, but we need to get
- * the types worked out.
- */
-static int
-tcp_usr_control(struct socket *so, int cmd, caddr_t arg, struct ifnet *ifp)
-{
-	return in_control(so, cmd, arg, ifp);
-}
-
-/* xxx - should be const */
-struct pr_usrreqs tcp_usrreqs = {
-	tcp_usr_abort, tcp_usr_accept, tcp_usr_attach, tcp_usr_bind,
-	tcp_usr_connect, pru_connect2_notsupp, tcp_usr_control, tcp_usr_detach,
-	tcp_usr_disconnect, tcp_usr_listen, tcp_usr_peeraddr, tcp_usr_rcvd,
-	tcp_usr_rcvoob, tcp_usr_send, tcp_usr_sense, tcp_usr_shutdown,
-	tcp_usr_sockaddr
-};
-
-/*
- * Common subroutine to open a TCP connection to remote host specified
- * by struct sockaddr_in in mbuf *nam.  Call in_pcbbind to assign a local
- * port number if needed.  Call in_pcbladdr to do the routing and to choose
- * a local host address (interface).  If there is an existing incarnation
- * of the same connection in TIME-WAIT state and if the remote host was
- * sending CC options and if the connection duration was < MSL, then
- * truncate the previous TIME-WAIT state and proceed.
- * Initialize connection parameters and enter SYN-SENT state.
- */
-static int
-tcp_connect(tp, nam)
-	register struct tcpcb *tp;
-	struct mbuf *nam;
-{
-	struct inpcb *inp = tp->t_inpcb, *oinp;
-	struct socket *so = inp->inp_socket;
-	struct tcpcb *otp;
-	struct sockaddr_in *sin = mtod(nam, struct sockaddr_in *);
-	struct sockaddr_in *ifaddr;
-	int error;
-	struct rmxp_tao *taop;
-	struct rmxp_tao tao_noncached;
-
-	if (inp->inp_lport == 0) {
-		error = in_pcbbind(inp, NULL);
-		if (error)
-			return error;
-	}
-
-	/*
-	 * Cannot simply call in_pcbconnect, because there might be an
-	 * earlier incarnation of this same connection still in
-	 * TIME_WAIT state, creating an ADDRINUSE error.
-	 */
-	error = in_pcbladdr(inp, nam, &ifaddr);
-	if (error)
-		return error;
-	oinp = in_pcblookuphash(inp->inp_pcbinfo,
-	    sin->sin_addr, sin->sin_port,
-	    inp->inp_laddr.s_addr != INADDR_ANY ? inp->inp_laddr
-						: ifaddr->sin_addr,
-	    inp->inp_lport,  0);
-	if (oinp) {
-		if (oinp != inp && (otp = intotcpcb(oinp)) != NULL &&
-		otp->t_state == TCPS_TIME_WAIT &&
-		    otp->t_duration < TCPTV_MSL &&
-		    (otp->t_flags & TF_RCVD_CC))
-			otp = tcp_close(otp);
-		else
-			return EADDRINUSE;
-	}
-	if (inp->inp_laddr.s_addr == INADDR_ANY)
-		inp->inp_laddr = ifaddr->sin_addr;
-	inp->inp_faddr = sin->sin_addr;
-	inp->inp_fport = sin->sin_port;
-	in_pcbrehash(inp);
-
-	tp->t_template = tcp_template(tp);
-	if (tp->t_template == 0) {
-		in_pcbdisconnect(inp);
-		return ENOBUFS;
-	}
-
-	/* Compute window scaling to request.  */
-	while (tp->request_r_scale < TCP_MAX_WINSHIFT &&
-	    (TCP_MAXWIN << tp->request_r_scale) < so->so_rcv.sb_hiwat)
-		tp->request_r_scale++;
-
-	soisconnecting(so);
-	tcpstat.tcps_connattempt++;
-	tp->t_state = TCPS_SYN_SENT;
-	tp->t_timer[TCPT_KEEP] = tcp_keepinit;
-	tp->iss = tcp_iss; tcp_iss += TCP_ISSINCR/2;
-	tcp_sendseqinit(tp);
-
-	/*
-	 * Generate a CC value for this connection and
-	 * check whether CC or CCnew should be used.
-	 */
-	if ((taop = tcp_gettaocache(tp->t_inpcb)) == NULL) {
-		taop = &tao_noncached;
-		bzero(taop, sizeof(*taop));
-	}
-
-	tp->cc_send = CC_INC(tcp_ccgen);
-	if (taop->tao_ccsent != 0 &&
-	    CC_GEQ(tp->cc_send, taop->tao_ccsent)) {
-		taop->tao_ccsent = tp->cc_send;
-	} else {
-		taop->tao_ccsent = 0;
-		tp->t_flags |= TF_SENDCCNEW;
-	}
-
-	return 0;
-}
-
-int
-tcp_ctloutput(op, so, level, optname, mp)
-	int op;
-	struct socket *so;
-	int level, optname;
-	struct mbuf **mp;
-{
-	int error = 0, s;
-	struct inpcb *inp;
-	register struct tcpcb *tp;
-	register struct mbuf *m;
-	register int i;
-
-	s = splnet();
-	inp = sotoinpcb(so);
-	if (inp == NULL) {
-		splx(s);
-		if (op == PRCO_SETOPT && *mp)
-			(void) m_free(*mp);
-		return (ECONNRESET);
-	}
-	if (level != IPPROTO_TCP) {
-		error = ip_ctloutput(op, so, level, optname, mp);
-		splx(s);
-		return (error);
-	}
-	tp = intotcpcb(inp);
-
-	switch (op) {
-
-	case PRCO_SETOPT:
-		m = *mp;
-		switch (optname) {
-
-		case TCP_NODELAY:
-			if (m == NULL || m->m_len < sizeof (int))
-				error = EINVAL;
-			else if (*mtod(m, int *))
-				tp->t_flags |= TF_NODELAY;
-			else
-				tp->t_flags &= ~TF_NODELAY;
-			break;
-
-		case TCP_MAXSEG:
-			if (m && (i = *mtod(m, int *)) > 0 && i <= tp->t_maxseg)
-				tp->t_maxseg = i;
-			else
-				error = EINVAL;
-			break;
-
-		case TCP_NOOPT:
-			if (m == NULL || m->m_len < sizeof (int))
-				error = EINVAL;
-			else if (*mtod(m, int *))
-				tp->t_flags |= TF_NOOPT;
-			else
-				tp->t_flags &= ~TF_NOOPT;
-			break;
-
-		case TCP_NOPUSH:
-			if (m == NULL || m->m_len < sizeof (int))
-				error = EINVAL;
-			else if (*mtod(m, int *))
-				tp->t_flags |= TF_NOPUSH;
-			else
-				tp->t_flags &= ~TF_NOPUSH;
-			break;
-
-		default:
-			error = ENOPROTOOPT;
-			break;
-		}
-		if (m)
-			(void) m_free(m);
-		break;
-
-	case PRCO_GETOPT:
-		*mp = m = m_get(M_WAIT, MT_SOOPTS);
-		m->m_len = sizeof(int);
-
-		switch (optname) {
-		case TCP_NODELAY:
-			*mtod(m, int *) = tp->t_flags & TF_NODELAY;
-			break;
-		case TCP_MAXSEG:
-			*mtod(m, int *) = tp->t_maxseg;
-			break;
-		case TCP_NOOPT:
-			*mtod(m, int *) = tp->t_flags & TF_NOOPT;
-			break;
-		case TCP_NOPUSH:
-			*mtod(m, int *) = tp->t_flags & TF_NOPUSH;
-			break;
-		default:
-			error = ENOPROTOOPT;
-			break;
-		}
-		break;
-	}
-	splx(s);
-	return (error);
-}
-
-/*
- * tcp_sendspace and tcp_recvspace are the default send and receive window
- * sizes, respectively.  These are obsolescent (this information should
- * be set by the route).
- */
-u_long	tcp_sendspace = 1024*16;
-SYSCTL_INT(_net_inet_tcp, TCPCTL_SENDSPACE, sendspace,
-	CTLFLAG_RW, &tcp_sendspace , 0, "");
-u_long	tcp_recvspace = 1024*16;
-SYSCTL_INT(_net_inet_tcp, TCPCTL_RECVSPACE, recvspace,
-	CTLFLAG_RW, &tcp_recvspace , 0, "");
-
-/*
- * Attach TCP protocol to socket, allocating
- * internet protocol control block, tcp control block,
- * bufer space, and entering LISTEN state if to accept connections.
- */
-static int
-tcp_attach(so)
-	struct socket *so;
-{
-	register struct tcpcb *tp;
-	struct inpcb *inp;
-	int error;
-
-	if (so->so_snd.sb_hiwat == 0 || so->so_rcv.sb_hiwat == 0) {
-		error = soreserve(so, tcp_sendspace, tcp_recvspace);
-		if (error)
-			return (error);
-	}
-	error = in_pcballoc(so, &tcbinfo);
-	if (error)
-		return (error);
-	inp = sotoinpcb(so);
-	tp = tcp_newtcpcb(inp);
-	if (tp == 0) {
-		int nofd = so->so_state & SS_NOFDREF;	/* XXX */
-
-		so->so_state &= ~SS_NOFDREF;	/* don't free the socket yet */
-		in_pcbdetach(inp);
-		so->so_state |= nofd;
-		return (ENOBUFS);
-	}
-	tp->t_state = TCPS_CLOSED;
-	return (0);
-}
-
-/*
- * Initiate (or continue) disconnect.
- * If embryonic state, just send reset (once).
- * If in ``let data drain'' option and linger null, just drop.
- * Otherwise (hard), mark socket disconnecting and drop
- * current input data; switch states based on user close, and
- * send segment to peer (with FIN).
- */
-static struct tcpcb *
-tcp_disconnect(tp)
-	register struct tcpcb *tp;
-{
-	struct socket *so = tp->t_inpcb->inp_socket;
-
-	if (tp->t_state < TCPS_ESTABLISHED)
-		tp = tcp_close(tp);
-	else if ((so->so_options & SO_LINGER) && so->so_linger == 0)
-		tp = tcp_drop(tp, 0);
-	else {
-		soisdisconnecting(so);
-		sbflush(&so->so_rcv);
-		tp = tcp_usrclosed(tp);
-		if (tp)
-			(void) tcp_output(tp);
-	}
-	return (tp);
-}
-
-/*
- * User issued close, and wish to trail through shutdown states:
- * if never received SYN, just forget it.  If got a SYN from peer,
- * but haven't sent FIN, then go to FIN_WAIT_1 state to send peer a FIN.
- * If already got a FIN from peer, then almost done; go to LAST_ACK
- * state.  In all other cases, have already sent FIN to peer (e.g.
- * after PRU_SHUTDOWN), and just have to play tedious game waiting
- * for peer to send FIN or not respond to keep-alives, etc.
- * We can let the user exit from the close as soon as the FIN is acked.
- */
-static struct tcpcb *
-tcp_usrclosed(tp)
-	register struct tcpcb *tp;
-{
-
-	switch (tp->t_state) {
-
-	case TCPS_CLOSED:
-	case TCPS_LISTEN:
-		tp->t_state = TCPS_CLOSED;
-		tp = tcp_close(tp);
-		break;
-
-	case TCPS_SYN_SENT:
-	case TCPS_SYN_RECEIVED:
-		tp->t_flags |= TF_NEEDFIN;
-		break;
-
-	case TCPS_ESTABLISHED:
-		tp->t_state = TCPS_FIN_WAIT_1;
-		break;
-
-	case TCPS_CLOSE_WAIT:
-		tp->t_state = TCPS_LAST_ACK;
-		break;
-	}
-	if (tp && tp->t_state >= TCPS_FIN_WAIT_2) {
-		soisdisconnected(tp->t_inpcb->inp_socket);
-		/* To prevent the connection hanging in FIN_WAIT_2 forever. */
-		if (tp->t_state == TCPS_FIN_WAIT_2)
-			tp->t_timer[TCPT_2MSL] = tcp_maxidle;
-	}
-	return (tp);
-}
-
diff --git a/c/src/exec/libnetworking/netinet/tcp_var.h b/c/src/exec/libnetworking/netinet/tcp_var.h
deleted file mode 100644
index 8e63a2cafe..0000000000
--- a/c/src/exec/libnetworking/netinet/tcp_var.h
+++ /dev/null
@@ -1,374 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993, 1994, 1995
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)tcp_var.h	8.4 (Berkeley) 5/24/95
- * 	$Id$
- */
-
-#ifndef _NETINET_TCP_VAR_H_
-#define _NETINET_TCP_VAR_H_
-/*
- * Kernel variables for tcp.
- */
-
-/*
- * Tcp control block, one per tcp; fields:
- */
-struct tcpcb {
-	struct	tcpiphdr *seg_next;	/* sequencing queue */
-	struct	tcpiphdr *seg_prev;
-	int	t_state;		/* state of this connection */
-	int	t_timer[TCPT_NTIMERS];	/* tcp timers */
-	int	t_rxtshift;		/* log(2) of rexmt exp. backoff */
-	int	t_rxtcur;		/* current retransmit value */
-	int	t_dupacks;		/* consecutive dup acks recd */
-	u_int	t_maxseg;		/* maximum segment size */
-	u_int	t_maxopd;		/* mss plus options */
-	int	t_force;		/* 1 if forcing out a byte */
-	u_int	t_flags;
-#define	TF_ACKNOW	0x0001		/* ack peer immediately */
-#define	TF_DELACK	0x0002		/* ack, but try to delay it */
-#define	TF_NODELAY	0x0004		/* don't delay packets to coalesce */
-#define	TF_NOOPT	0x0008		/* don't use tcp options */
-#define	TF_SENTFIN	0x0010		/* have sent FIN */
-#define	TF_REQ_SCALE	0x0020		/* have/will request window scaling */
-#define	TF_RCVD_SCALE	0x0040		/* other side has requested scaling */
-#define	TF_REQ_TSTMP	0x0080		/* have/will request timestamps */
-#define	TF_RCVD_TSTMP	0x0100		/* a timestamp was received in SYN */
-#define	TF_SACK_PERMIT	0x0200		/* other side said I could SACK */
-#define TF_NEEDSYN	0x0400		/* send SYN (implicit state) */
-#define TF_NEEDFIN	0x0800		/* send FIN (implicit state) */
-#define TF_NOPUSH	0x1000		/* don't push */
-#define TF_REQ_CC	0x2000		/* have/will request CC */
-#define	TF_RCVD_CC	0x4000		/* a CC was received in SYN */
-#define TF_SENDCCNEW	0x8000		/* send CCnew instead of CC in SYN */
-
-	struct	tcpiphdr *t_template;	/* skeletal packet for transmit */
-	struct	inpcb *t_inpcb;		/* back pointer to internet pcb */
-/*
- * The following fields are used as in the protocol specification.
- * See RFC783, Dec. 1981, page 21.
- */
-/* send sequence variables */
-	tcp_seq	snd_una;		/* send unacknowledged */
-	tcp_seq	snd_nxt;		/* send next */
-	tcp_seq	snd_up;			/* send urgent pointer */
-	tcp_seq	snd_wl1;		/* window update seg seq number */
-	tcp_seq	snd_wl2;		/* window update seg ack number */
-	tcp_seq	iss;			/* initial send sequence number */
-	u_long	snd_wnd;		/* send window */
-/* receive sequence variables */
-	u_long	rcv_wnd;		/* receive window */
-	tcp_seq	rcv_nxt;		/* receive next */
-	tcp_seq	rcv_up;			/* receive urgent pointer */
-	tcp_seq	irs;			/* initial receive sequence number */
-/*
- * Additional variables for this implementation.
- */
-/* receive variables */
-	tcp_seq	rcv_adv;		/* advertised window */
-/* retransmit variables */
-	tcp_seq	snd_max;		/* highest sequence number sent;
-					 * used to recognize retransmits
-					 */
-/* congestion control (for slow start, source quench, retransmit after loss) */
-	u_long	snd_cwnd;		/* congestion-controlled window */
-	u_long	snd_ssthresh;		/* snd_cwnd size threshold for
-					 * for slow start exponential to
-					 * linear switch
-					 */
-/*
- * transmit timing stuff.  See below for scale of srtt and rttvar.
- * "Variance" is actually smoothed difference.
- */
-	u_int	t_idle;			/* inactivity time */
-	int	t_rtt;			/* round trip time */
-	tcp_seq	t_rtseq;		/* sequence number being timed */
-	int	t_srtt;			/* smoothed round-trip time */
-	int	t_rttvar;		/* variance in round-trip time */
-	u_int	t_rttmin;		/* minimum rtt allowed */
-	u_long	max_sndwnd;		/* largest window peer has offered */
-
-/* out-of-band data */
-	char	t_oobflags;		/* have some */
-	char	t_iobc;			/* input character */
-#define	TCPOOB_HAVEDATA	0x01
-#define	TCPOOB_HADDATA	0x02
-	int	t_softerror;		/* possible error not yet reported */
-
-/* RFC 1323 variables */
-	u_char	snd_scale;		/* window scaling for send window */
-	u_char	rcv_scale;		/* window scaling for recv window */
-	u_char	request_r_scale;	/* pending window scaling */
-	u_char	requested_s_scale;
-	u_long	ts_recent;		/* timestamp echo data */
-	u_long	ts_recent_age;		/* when last updated */
-	tcp_seq	last_ack_sent;
-/* RFC 1644 variables */
-	tcp_cc	cc_send;		/* send connection count */
-	tcp_cc	cc_recv;		/* receive connection count */
-	u_long	t_duration;		/* connection duration */
-
-/* TUBA stuff */
-	caddr_t	t_tuba_pcb;		/* next level down pcb for TCP over z */
-/* More RTT stuff */
-	u_long	t_rttupdated;		/* number of times rtt sampled */
-};
-
-/*
- * Structure to hold TCP options that are only used during segment
- * processing (in tcp_input), but not held in the tcpcb.
- * It's basically used to reduce the number of parameters
- * to tcp_dooptions.
- */
-struct tcpopt {
-	u_long	to_flag;		/* which options are present */
-#define TOF_TS		0x0001		/* timestamp */
-#define TOF_CC		0x0002		/* CC and CCnew are exclusive */
-#define TOF_CCNEW	0x0004
-#define	TOF_CCECHO	0x0008
-	u_long	to_tsval;
-	u_long	to_tsecr;
-	tcp_cc	to_cc;		/* holds CC or CCnew */
-	tcp_cc	to_ccecho;
-};
-
-/*
- * The TAO cache entry which is stored in the protocol family specific
- * portion of the route metrics.
- */
-struct rmxp_tao {
-	tcp_cc	tao_cc;			/* latest CC in valid SYN */
-	tcp_cc	tao_ccsent;		/* latest CC sent to peer */
-	u_short	tao_mssopt;		/* peer's cached MSS */
-#ifdef notyet
-	u_short	tao_flags;		/* cache status flags */
-#define	TAOF_DONT	0x0001		/* peer doesn't understand rfc1644 */
-#define	TAOF_OK		0x0002		/* peer does understand rfc1644 */
-#define	TAOF_UNDEF	0		/* we don't know yet */
-#endif /* notyet */
-};
-#define rmx_taop(r)	((struct rmxp_tao *)(r).rmx_filler)
-
-#define	intotcpcb(ip)	((struct tcpcb *)(ip)->inp_ppcb)
-#define	sototcpcb(so)	(intotcpcb(sotoinpcb(so)))
-
-/*
- * The smoothed round-trip time and estimated variance
- * are stored as fixed point numbers scaled by the values below.
- * For convenience, these scales are also used in smoothing the average
- * (smoothed = (1/scale)sample + ((scale-1)/scale)smoothed).
- * With these scales, srtt has 3 bits to the right of the binary point,
- * and thus an "ALPHA" of 0.875.  rttvar has 2 bits to the right of the
- * binary point, and is smoothed with an ALPHA of 0.75.
- */
-#define	TCP_RTT_SCALE		32	/* multiplier for srtt; 3 bits frac. */
-#define	TCP_RTT_SHIFT		5	/* shift for srtt; 3 bits frac. */
-#define	TCP_RTTVAR_SCALE	16	/* multiplier for rttvar; 2 bits */
-#define	TCP_RTTVAR_SHIFT	4	/* shift for rttvar; 2 bits */
-#define	TCP_DELTA_SHIFT		2	/* see tcp_input.c */
-
-/*
- * The initial retransmission should happen at rtt + 4 * rttvar.
- * Because of the way we do the smoothing, srtt and rttvar
- * will each average +1/2 tick of bias.  When we compute
- * the retransmit timer, we want 1/2 tick of rounding and
- * 1 extra tick because of +-1/2 tick uncertainty in the
- * firing of the timer.  The bias will give us exactly the
- * 1.5 tick we need.  But, because the bias is
- * statistical, we have to test that we don't drop below
- * the minimum feasible timer (which is 2 ticks).
- * This version of the macro adapted from a paper by Lawrence
- * Brakmo and Larry Peterson which outlines a problem caused
- * by insufficient precision in the original implementation,
- * which results in inappropriately large RTO values for very
- * fast networks.
- */
-#define	TCP_REXMTVAL(tp) \
-	((((tp)->t_srtt >> (TCP_RTT_SHIFT - TCP_DELTA_SHIFT))  \
-	  + (tp)->t_rttvar) >> TCP_DELTA_SHIFT)
-
-/* XXX
- * We want to avoid doing m_pullup on incoming packets but that
- * means avoiding dtom on the tcp reassembly code.  That in turn means
- * keeping an mbuf pointer in the reassembly queue (since we might
- * have a cluster).  As a quick hack, the source & destination
- * port numbers (which are no longer needed once we've located the
- * tcpcb) are overlayed with an mbuf pointer.
- */
-#define REASS_MBUF(ti) (*(struct mbuf **)&((ti)->ti_t))
-
-/*
- * TCP statistics.
- * Many of these should be kept per connection,
- * but that's inconvenient at the moment.
- */
-struct	tcpstat {
-	u_long	tcps_connattempt;	/* connections initiated */
-	u_long	tcps_accepts;		/* connections accepted */
-	u_long	tcps_connects;		/* connections established */
-	u_long	tcps_drops;		/* connections dropped */
-	u_long	tcps_conndrops;		/* embryonic connections dropped */
-	u_long	tcps_closed;		/* conn. closed (includes drops) */
-	u_long	tcps_segstimed;		/* segs where we tried to get rtt */
-	u_long	tcps_rttupdated;	/* times we succeeded */
-	u_long	tcps_delack;		/* delayed acks sent */
-	u_long	tcps_timeoutdrop;	/* conn. dropped in rxmt timeout */
-	u_long	tcps_rexmttimeo;	/* retransmit timeouts */
-	u_long	tcps_persisttimeo;	/* persist timeouts */
-	u_long	tcps_keeptimeo;		/* keepalive timeouts */
-	u_long	tcps_keepprobe;		/* keepalive probes sent */
-	u_long	tcps_keepdrops;		/* connections dropped in keepalive */
-
-	u_long	tcps_sndtotal;		/* total packets sent */
-	u_long	tcps_sndpack;		/* data packets sent */
-	u_long	tcps_sndbyte;		/* data bytes sent */
-	u_long	tcps_sndrexmitpack;	/* data packets retransmitted */
-	u_long	tcps_sndrexmitbyte;	/* data bytes retransmitted */
-	u_long	tcps_sndacks;		/* ack-only packets sent */
-	u_long	tcps_sndprobe;		/* window probes sent */
-	u_long	tcps_sndurg;		/* packets sent with URG only */
-	u_long	tcps_sndwinup;		/* window update-only packets sent */
-	u_long	tcps_sndctrl;		/* control (SYN|FIN|RST) packets sent */
-
-	u_long	tcps_rcvtotal;		/* total packets received */
-	u_long	tcps_rcvpack;		/* packets received in sequence */
-	u_long	tcps_rcvbyte;		/* bytes received in sequence */
-	u_long	tcps_rcvbadsum;		/* packets received with ccksum errs */
-	u_long	tcps_rcvbadoff;		/* packets received with bad offset */
-	u_long	tcps_rcvshort;		/* packets received too short */
-	u_long	tcps_rcvduppack;	/* duplicate-only packets received */
-	u_long	tcps_rcvdupbyte;	/* duplicate-only bytes received */
-	u_long	tcps_rcvpartduppack;	/* packets with some duplicate data */
-	u_long	tcps_rcvpartdupbyte;	/* dup. bytes in part-dup. packets */
-	u_long	tcps_rcvoopack;		/* out-of-order packets received */
-	u_long	tcps_rcvoobyte;		/* out-of-order bytes received */
-	u_long	tcps_rcvpackafterwin;	/* packets with data after window */
-	u_long	tcps_rcvbyteafterwin;	/* bytes rcvd after window */
-	u_long	tcps_rcvafterclose;	/* packets rcvd after "close" */
-	u_long	tcps_rcvwinprobe;	/* rcvd window probe packets */
-	u_long	tcps_rcvdupack;		/* rcvd duplicate acks */
-	u_long	tcps_rcvacktoomuch;	/* rcvd acks for unsent data */
-	u_long	tcps_rcvackpack;	/* rcvd ack packets */
-	u_long	tcps_rcvackbyte;	/* bytes acked by rcvd acks */
-	u_long	tcps_rcvwinupd;		/* rcvd window update packets */
-	u_long	tcps_pawsdrop;		/* segments dropped due to PAWS */
-	u_long	tcps_predack;		/* times hdr predict ok for acks */
-	u_long	tcps_preddat;		/* times hdr predict ok for data pkts */
-	u_long	tcps_pcbcachemiss;
-	u_long	tcps_cachedrtt;		/* times cached RTT in route updated */
-	u_long	tcps_cachedrttvar;	/* times cached rttvar updated */
-	u_long	tcps_cachedssthresh;	/* times cached ssthresh updated */
-	u_long	tcps_usedrtt;		/* times RTT initialized from route */
-	u_long	tcps_usedrttvar;	/* times RTTVAR initialized from rt */
-	u_long	tcps_usedssthresh;	/* times ssthresh initialized from rt*/
-	u_long	tcps_persistdrop;	/* timeout in persist state */
-	u_long	tcps_badsyn;		/* bogus SYN, e.g. premature ACK */
-	u_long	tcps_mturesent;		/* resends due to MTU discovery */
-	u_long	tcps_listendrop;	/* listen queue overflows */
-};
-
-/*
- * Names for TCP sysctl objects
- */
-#define	TCPCTL_DO_RFC1323	1	/* use RFC-1323 extensions */
-#define	TCPCTL_DO_RFC1644	2	/* use RFC-1644 extensions */
-#define	TCPCTL_MSSDFLT		3	/* MSS default */
-#define TCPCTL_STATS		4	/* statistics (read-only) */
-#define	TCPCTL_RTTDFLT		5	/* default RTT estimate */
-#define	TCPCTL_KEEPIDLE		6	/* keepalive idle timer */
-#define	TCPCTL_KEEPINTVL	7	/* interval to send keepalives */
-#define	TCPCTL_SENDSPACE	8	/* send buffer space */
-#define	TCPCTL_RECVSPACE	9	/* receive buffer space */
-#define	TCPCTL_KEEPINIT		10	/* receive buffer space */
-#define TCPCTL_MAXID		11
-
-#define TCPCTL_NAMES { \
-	{ 0, 0 }, \
-	{ "rfc1323", CTLTYPE_INT }, \
-	{ "rfc1644", CTLTYPE_INT }, \
-	{ "mssdflt", CTLTYPE_INT }, \
-	{ "stats", CTLTYPE_STRUCT }, \
-	{ "rttdflt", CTLTYPE_INT }, \
-	{ "keepidle", CTLTYPE_INT }, \
-	{ "keepintvl", CTLTYPE_INT }, \
-	{ "sendspace", CTLTYPE_INT }, \
-	{ "recvspace", CTLTYPE_INT }, \
-	{ "keepinit", CTLTYPE_INT }, \
-}
-
-#ifdef KERNEL
-extern	struct inpcbhead tcb;		/* head of queue of active tcpcb's */
-extern	struct inpcbinfo tcbinfo;
-extern	struct tcpstat tcpstat;	/* tcp statistics */
-extern	int tcp_mssdflt;	/* XXX */
-extern	u_long tcp_now;		/* for RFC 1323 timestamps */
-
-void	 tcp_canceltimers __P((struct tcpcb *));
-struct tcpcb *
-	 tcp_close __P((struct tcpcb *));
-void	 tcp_ctlinput __P((int, struct sockaddr *, void *));
-int	 tcp_ctloutput __P((int, struct socket *, int, int, struct mbuf **));
-struct tcpcb *
-	 tcp_drop __P((struct tcpcb *, int));
-void	 tcp_drain __P((void));
-void	 tcp_fasttimo __P((void));
-struct rmxp_tao *
-	 tcp_gettaocache __P((struct inpcb *));
-void	 tcp_init __P((void));
-void	 tcp_input __P((struct mbuf *, int));
-void	 tcp_mss __P((struct tcpcb *, int));
-int	 tcp_mssopt __P((struct tcpcb *));
-void	 tcp_mtudisc __P((struct inpcb *, int));
-struct tcpcb *
-	 tcp_newtcpcb __P((struct inpcb *));
-int	 tcp_output __P((struct tcpcb *));
-void	 tcp_quench __P((struct inpcb *, int));
-void	 tcp_respond __P((struct tcpcb *,
-	    struct tcpiphdr *, struct mbuf *, u_long, u_long, int));
-struct rtentry *
-	 tcp_rtlookup __P((struct inpcb *));
-void	 tcp_setpersist __P((struct tcpcb *));
-void	 tcp_slowtimo __P((void));
-struct tcpiphdr *
-	 tcp_template __P((struct tcpcb *));
-struct tcpcb *
-	 tcp_timers __P((struct tcpcb *, int));
-void	 tcp_trace __P((int, int, struct tcpcb *, struct tcpiphdr *, int));
-
-extern	struct pr_usrreqs tcp_usrreqs;
-extern	u_long tcp_sendspace;
-extern	u_long tcp_recvspace;
-
-#endif /* KERNEL */
-
-#endif /* _NETINET_TCP_VAR_H_ */
diff --git a/c/src/exec/libnetworking/netinet/tcpip.h b/c/src/exec/libnetworking/netinet/tcpip.h
deleted file mode 100644
index b8634bfd15..0000000000
--- a/c/src/exec/libnetworking/netinet/tcpip.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)tcpip.h	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#ifndef _NETINET_TCPIP_H_
-#define _NETINET_TCPIP_H_
-
-/*
- * Tcp+ip header, after ip options removed.
- */
-struct tcpiphdr {
-	struct 	ipovly ti_i;		/* overlaid ip structure */
-	struct	tcphdr ti_t;		/* tcp header */
-};
-#ifdef notyet
-/*
- * Tcp+ip header, after ip options removed but including TCP options.
- */
-struct full_tcpiphdr {
-	struct 	ipovly ti_i;		/* overlaid ip structure */
-	struct	tcphdr ti_t;		/* tcp header */
-	char	ti_o[TCP_MAXOLEN];	/* space for tcp options */
-};
-#endif /* notyet */
-#define	ti_next		ti_i.ih_next
-#define	ti_prev		ti_i.ih_prev
-#define	ti_x1		ti_i.ih_x1
-#define	ti_pr		ti_i.ih_pr
-#define	ti_len		ti_i.ih_len
-#define	ti_src		ti_i.ih_src
-#define	ti_dst		ti_i.ih_dst
-#define	ti_sport	ti_t.th_sport
-#define	ti_dport	ti_t.th_dport
-#define	ti_seq		ti_t.th_seq
-#define	ti_ack		ti_t.th_ack
-#define	ti_x2		ti_t.th_x2
-#define	ti_off		ti_t.th_off
-#define	ti_flags	ti_t.th_flags
-#define	ti_win		ti_t.th_win
-#define	ti_sum		ti_t.th_sum
-#define	ti_urp		ti_t.th_urp
-
-#endif
diff --git a/c/src/exec/libnetworking/netinet/udp.h b/c/src/exec/libnetworking/netinet/udp.h
deleted file mode 100644
index e73e1f4ddb..0000000000
--- a/c/src/exec/libnetworking/netinet/udp.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)udp.h	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#ifndef _NETINET_UDP_H_
-#define _NETINET_UDP_H_
-
-/*
- * Udp protocol header.
- * Per RFC 768, September, 1981.
- */
-struct udphdr {
-	u_short	uh_sport;		/* source port */
-	u_short	uh_dport;		/* destination port */
-	u_short	uh_ulen;		/* udp length */
-	u_short	uh_sum;			/* udp checksum */
-};
-
-#endif
diff --git a/c/src/exec/libnetworking/netinet/udp_usrreq.c b/c/src/exec/libnetworking/netinet/udp_usrreq.c
deleted file mode 100644
index 16c5fce2df..0000000000
--- a/c/src/exec/libnetworking/netinet/udp_usrreq.c
+++ /dev/null
@@ -1,613 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1988, 1990, 1993, 1995
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)udp_usrreq.c	8.6 (Berkeley) 5/23/95
- *	$Id$
- */
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/systm.h>
-#include <sys/malloc.h>
-#include <sys/mbuf.h>
-#include <sys/protosw.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/errno.h>
-#include <sys/stat.h>
-#include <sys/kernel.h>
-#include <sys/sysctl.h>
-#include <sys/syslog.h>
-
-#include <net/if.h>
-#include <net/route.h>
-
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/in_pcb.h>
-#include <netinet/in_var.h>
-#include <netinet/ip_var.h>
-#include <netinet/ip_icmp.h>
-#include <netinet/udp.h>
-#include <netinet/udp_var.h>
-
-/*
- * UDP protocol implementation.
- * Per RFC 768, August, 1980.
- */
-#ifndef	COMPAT_42
-static int	udpcksum = 1;
-#else
-static int	udpcksum = 0;		/* XXX */
-#endif
-SYSCTL_INT(_net_inet_udp, UDPCTL_CHECKSUM, checksum, CTLFLAG_RW,
-		&udpcksum, 0, "");
-
-static int log_in_vain = 0;
-SYSCTL_INT(_net_inet_udp, OID_AUTO, log_in_vain, CTLFLAG_RW, 
-	&log_in_vain, 0, "");
-
-static struct	inpcbhead udb;		/* from udp_var.h */
-static struct	inpcbinfo udbinfo;
-
-#ifndef UDBHASHSIZE
-#define UDBHASHSIZE 64
-#endif
-
-       struct	udpstat udpstat;	/* from udp_var.h */
-SYSCTL_STRUCT(_net_inet_udp, UDPCTL_STATS, stats, CTLFLAG_RD,
-	&udpstat, udpstat, "");
-
-static struct	sockaddr_in udp_in = { sizeof(udp_in), AF_INET };
-
-static	void udp_detach __P((struct inpcb *));
-static	int udp_output __P((struct inpcb *, struct mbuf *, struct mbuf *,
-			    struct mbuf *));
-static	void udp_notify __P((struct inpcb *, int));
-
-void
-udp_init()
-{
-	LIST_INIT(&udb);
-	udbinfo.listhead = &udb;
-	udbinfo.hashbase = hashinit(UDBHASHSIZE, M_PCB, &udbinfo.hashmask);
-}
-
-void
-udp_input(m, iphlen)
-	register struct mbuf *m;
-	int iphlen;
-{
-	register struct ip *ip;
-	register struct udphdr *uh;
-	register struct inpcb *inp;
-	struct mbuf *opts = 0;
-	int len;
-	struct ip save_ip;
-
-	udpstat.udps_ipackets++;
-
-	/*
-	 * Strip IP options, if any; should skip this,
-	 * make available to user, and use on returned packets,
-	 * but we don't yet have a way to check the checksum
-	 * with options still present.
-	 */
-	if (iphlen > sizeof (struct ip)) {
-		ip_stripoptions(m, (struct mbuf *)0);
-		iphlen = sizeof(struct ip);
-	}
-
-	/*
-	 * Get IP and UDP header together in first mbuf.
-	 */
-	ip = mtod(m, struct ip *);
-	if (m->m_len < iphlen + sizeof(struct udphdr)) {
-		if ((m = m_pullup(m, iphlen + sizeof(struct udphdr))) == 0) {
-			udpstat.udps_hdrops++;
-			return;
-		}
-		ip = mtod(m, struct ip *);
-	}
-	uh = (struct udphdr *)((caddr_t)ip + iphlen);
-
-	/*
-	 * Make mbuf data length reflect UDP length.
-	 * If not enough data to reflect UDP length, drop.
-	 */
-	len = ntohs((u_short)uh->uh_ulen);
-	if (ip->ip_len != len) {
-		if (len > ip->ip_len || len < sizeof(struct udphdr)) {
-			udpstat.udps_badlen++;
-			goto bad;
-		}
-		m_adj(m, len - ip->ip_len);
-		/* ip->ip_len = len; */
-	}
-	/*
-	 * Save a copy of the IP header in case we want restore it
-	 * for sending an ICMP error message in response.
-	 */
-	save_ip = *ip;
-
-	/*
-	 * Checksum extended UDP header and data.
-	 */
-	if (uh->uh_sum) {
-		((struct ipovly *)ip)->ih_next = 0;
-		((struct ipovly *)ip)->ih_prev = 0;
-		((struct ipovly *)ip)->ih_x1 = 0;
-		((struct ipovly *)ip)->ih_len = uh->uh_ulen;
-		uh->uh_sum = in_cksum(m, len + sizeof (struct ip));
-		if (uh->uh_sum) {
-			udpstat.udps_badsum++;
-			m_freem(m);
-			return;
-		}
-	}
-
-	if (IN_MULTICAST(ntohl(ip->ip_dst.s_addr)) ||
-	    in_broadcast(ip->ip_dst, m->m_pkthdr.rcvif)) {
-		struct inpcb *last;
-		/*
-		 * Deliver a multicast or broadcast datagram to *all* sockets
-		 * for which the local and remote addresses and ports match
-		 * those of the incoming datagram.  This allows more than
-		 * one process to receive multi/broadcasts on the same port.
-		 * (This really ought to be done for unicast datagrams as
-		 * well, but that would cause problems with existing
-		 * applications that open both address-specific sockets and
-		 * a wildcard socket listening to the same port -- they would
-		 * end up receiving duplicates of every unicast datagram.
-		 * Those applications open the multiple sockets to overcome an
-		 * inadequacy of the UDP socket interface, but for backwards
-		 * compatibility we avoid the problem here rather than
-		 * fixing the interface.  Maybe 4.5BSD will remedy this?)
-		 */
-
-		/*
-		 * Construct sockaddr format source address.
-		 */
-		udp_in.sin_port = uh->uh_sport;
-		udp_in.sin_addr = ip->ip_src;
-		m->m_len -= sizeof (struct udpiphdr);
-		m->m_data += sizeof (struct udpiphdr);
-		/*
-		 * Locate pcb(s) for datagram.
-		 * (Algorithm copied from raw_intr().)
-		 */
-		last = NULL;
-		for (inp = udb.lh_first; inp != NULL; inp = inp->inp_list.le_next) {
-			if (inp->inp_lport != uh->uh_dport)
-				continue;
-			if (inp->inp_laddr.s_addr != INADDR_ANY) {
-				if (inp->inp_laddr.s_addr !=
-				    ip->ip_dst.s_addr)
-					continue;
-			}
-			if (inp->inp_faddr.s_addr != INADDR_ANY) {
-				if (inp->inp_faddr.s_addr !=
-				    ip->ip_src.s_addr ||
-				    inp->inp_fport != uh->uh_sport)
-					continue;
-			}
-
-			if (last != NULL) {
-				struct mbuf *n;
-
-				if ((n = m_copy(m, 0, M_COPYALL)) != NULL) {
-					if (last->inp_flags & INP_CONTROLOPTS
-					    || last->inp_socket->so_options & SO_TIMESTAMP)
-						ip_savecontrol(last, &opts, ip, n);
-					if (sbappendaddr(&last->inp_socket->so_rcv,
-						(struct sockaddr *)&udp_in,
-						n, opts) == 0) {
-						m_freem(n);
-						if (opts)
-						    m_freem(opts);
-						udpstat.udps_fullsock++;
-					} else
-						sorwakeup(last->inp_socket);
-					opts = 0;
-				}
-			}
-			last = inp;
-			/*
-			 * Don't look for additional matches if this one does
-			 * not have either the SO_REUSEPORT or SO_REUSEADDR
-			 * socket options set.  This heuristic avoids searching
-			 * through all pcbs in the common case of a non-shared
-			 * port.  It * assumes that an application will never
-			 * clear these options after setting them.
-			 */
-			if (((last->inp_socket->so_options&(SO_REUSEPORT|SO_REUSEADDR)) == 0))
-				break;
-		}
-
-		if (last == NULL) {
-			/*
-			 * No matching pcb found; discard datagram.
-			 * (No need to send an ICMP Port Unreachable
-			 * for a broadcast or multicast datgram.)
-			 */
-			udpstat.udps_noportbcast++;
-			goto bad;
-		}
-		if (last->inp_flags & INP_CONTROLOPTS
-		    || last->inp_socket->so_options & SO_TIMESTAMP)
-			ip_savecontrol(last, &opts, ip, m);
-		if (sbappendaddr(&last->inp_socket->so_rcv,
-		     (struct sockaddr *)&udp_in,
-		     m, opts) == 0) {
-			udpstat.udps_fullsock++;
-			goto bad;
-		}
-		sorwakeup(last->inp_socket);
-		return;
-	}
-	/*
-	 * Locate pcb for datagram.
-	 */
-	inp = in_pcblookuphash(&udbinfo, ip->ip_src, uh->uh_sport,
-	    ip->ip_dst, uh->uh_dport, 1);
-	if (inp == NULL) {
-		if (log_in_vain) {
-			char buf[4*sizeof "123"];
-
-			strcpy(buf, inet_ntoa(ip->ip_dst));
-			log(LOG_INFO, "Connection attempt to UDP %s:%d"
-			    " from %s:%d\n",
-				buf, ntohs(uh->uh_dport),
-				inet_ntoa(ip->ip_src), ntohs(uh->uh_sport));
-		}
-		udpstat.udps_noport++;
-		if (m->m_flags & (M_BCAST | M_MCAST)) {
-			udpstat.udps_noportbcast++;
-			goto bad;
-		}
-		*ip = save_ip;
-		icmp_error(m, ICMP_UNREACH, ICMP_UNREACH_PORT, 0, 0);
-		return;
-	}
-
-	/*
-	 * Construct sockaddr format source address.
-	 * Stuff source address and datagram in user buffer.
-	 */
-	udp_in.sin_port = uh->uh_sport;
-	udp_in.sin_addr = ip->ip_src;
-	if (inp->inp_flags & INP_CONTROLOPTS
-	    || inp->inp_socket->so_options & SO_TIMESTAMP)
-		ip_savecontrol(inp, &opts, ip, m);
-	iphlen += sizeof(struct udphdr);
-	m->m_len -= iphlen;
-	m->m_pkthdr.len -= iphlen;
-	m->m_data += iphlen;
-	if (sbappendaddr(&inp->inp_socket->so_rcv, (struct sockaddr *)&udp_in,
-	    m, opts) == 0) {
-		udpstat.udps_fullsock++;
-		goto bad;
-	}
-	sorwakeup(inp->inp_socket);
-	return;
-bad:
-	m_freem(m);
-	if (opts)
-		m_freem(opts);
-}
-
-/*
- * Notify a udp user of an asynchronous error;
- * just wake up so that he can collect error status.
- */
-static void
-udp_notify(inp, errnum)
-	register struct inpcb *inp;
-	int errnum;
-{
-	inp->inp_socket->so_error = errnum;
-	sorwakeup(inp->inp_socket);
-	sowwakeup(inp->inp_socket);
-}
-
-void
-udp_ctlinput(cmd, sa, vip)
-	int cmd;
-	struct sockaddr *sa;
-	void *vip;
-{
-	register struct ip *ip = vip;
-	register struct udphdr *uh;
-
-	if (!PRC_IS_REDIRECT(cmd) &&
-	    ((unsigned)cmd >= PRC_NCMDS || inetctlerrmap[cmd] == 0))
-		return;
-	if (ip) {
-		uh = (struct udphdr *)((caddr_t)ip + (ip->ip_hl << 2));
-		in_pcbnotify(&udb, sa, uh->uh_dport, ip->ip_src, uh->uh_sport,
-			cmd, udp_notify);
-	} else
-		in_pcbnotify(&udb, sa, 0, zeroin_addr, 0, cmd, udp_notify);
-}
-
-static int
-udp_output(inp, m, addr, control)
-	register struct inpcb *inp;
-	register struct mbuf *m;
-	struct mbuf *addr, *control;
-{
-	register struct udpiphdr *ui;
-	register int len = m->m_pkthdr.len;
-	struct in_addr laddr;
-	int s = 0, error = 0;
-
-	if (control)
-		m_freem(control);		/* XXX */
-
-	if (len + sizeof(struct udpiphdr) > IP_MAXPACKET) {
-		error = EMSGSIZE;
-		goto release;
-	}
-
-	if (addr) {
-		laddr = inp->inp_laddr;
-		if (inp->inp_faddr.s_addr != INADDR_ANY) {
-			error = EISCONN;
-			goto release;
-		}
-		/*
-		 * Must block input while temporarily connected.
-		 */
-		s = splnet();
-		error = in_pcbconnect(inp, addr);
-		if (error) {
-			splx(s);
-			goto release;
-		}
-	} else {
-		if (inp->inp_faddr.s_addr == INADDR_ANY) {
-			error = ENOTCONN;
-			goto release;
-		}
-	}
-	/*
-	 * Calculate data length and get a mbuf
-	 * for UDP and IP headers.
-	 */
-	M_PREPEND(m, sizeof(struct udpiphdr), M_DONTWAIT);
-	if (m == 0) {
-		error = ENOBUFS;
-		if (addr)
-			splx(s);
-		goto release;
-	}
-
-	/*
-	 * Fill in mbuf with extended UDP header
-	 * and addresses and length put into network format.
-	 */
-	ui = mtod(m, struct udpiphdr *);
-	ui->ui_next = ui->ui_prev = 0;
-	ui->ui_x1 = 0;
-	ui->ui_pr = IPPROTO_UDP;
-	ui->ui_len = htons((u_short)len + sizeof (struct udphdr));
-	ui->ui_src = inp->inp_laddr;
-	ui->ui_dst = inp->inp_faddr;
-	ui->ui_sport = inp->inp_lport;
-	ui->ui_dport = inp->inp_fport;
-	ui->ui_ulen = ui->ui_len;
-
-	/*
-	 * Stuff checksum and output datagram.
-	 */
-	ui->ui_sum = 0;
-	if (udpcksum) {
-	    if ((ui->ui_sum = in_cksum(m, sizeof (struct udpiphdr) + len)) == 0)
-		ui->ui_sum = 0xffff;
-	}
-	((struct ip *)ui)->ip_len = sizeof (struct udpiphdr) + len;
-	((struct ip *)ui)->ip_ttl = inp->inp_ip_ttl;	/* XXX */
-	((struct ip *)ui)->ip_tos = inp->inp_ip_tos;	/* XXX */
-	udpstat.udps_opackets++;
-	error = ip_output(m, inp->inp_options, &inp->inp_route,
-	    inp->inp_socket->so_options & (SO_DONTROUTE | SO_BROADCAST),
-	    inp->inp_moptions);
-
-	if (addr) {
-		in_pcbdisconnect(inp);
-		inp->inp_laddr = laddr;
-		splx(s);
-	}
-	return (error);
-
-release:
-	m_freem(m);
-	return (error);
-}
-
-static u_long	udp_sendspace = 9216;		/* really max datagram size */
-					/* 40 1K datagrams */
-SYSCTL_INT(_net_inet_udp, UDPCTL_MAXDGRAM, maxdgram, CTLFLAG_RW,
-	&udp_sendspace, 0, "");
-
-static u_long	udp_recvspace = 40 * (1024 + sizeof(struct sockaddr_in));
-SYSCTL_INT(_net_inet_udp, UDPCTL_RECVSPACE, recvspace, CTLFLAG_RW,
-	&udp_recvspace, 0, "");
-
-/*ARGSUSED*/
-int
-udp_usrreq(so, req, m, addr, control)
-	struct socket *so;
-	int req;
-	struct mbuf *m, *addr, *control;
-{
-	struct inpcb *inp = sotoinpcb(so);
-	int error = 0;
-	int s;
-
-	if (req == PRU_CONTROL)
-		return (in_control(so, (u_long)m, (caddr_t)addr,
-			(struct ifnet *)control));
-	if (inp == NULL && req != PRU_ATTACH) {
-		error = EINVAL;
-		goto release;
-	}
-	/*
-	 * Note: need to block udp_input while changing
-	 * the udp pcb queue and/or pcb addresses.
-	 */
-	switch (req) {
-
-	case PRU_ATTACH:
-		if (inp != NULL) {
-			error = EINVAL;
-			break;
-		}
-		s = splnet();
-		error = in_pcballoc(so, &udbinfo);
-		splx(s);
-		if (error)
-			break;
-		error = soreserve(so, udp_sendspace, udp_recvspace);
-		if (error)
-			break;
-		((struct inpcb *) so->so_pcb)->inp_ip_ttl = ip_defttl;
-		break;
-
-	case PRU_DETACH:
-		udp_detach(inp);
-		break;
-
-	case PRU_BIND:
-		s = splnet();
-		error = in_pcbbind(inp, addr);
-		splx(s);
-		break;
-
-	case PRU_LISTEN:
-		error = EOPNOTSUPP;
-		break;
-
-	case PRU_CONNECT:
-		if (inp->inp_faddr.s_addr != INADDR_ANY) {
-			error = EISCONN;
-			break;
-		}
-		s = splnet();
-		error = in_pcbconnect(inp, addr);
-		splx(s);
-		if (error == 0)
-			soisconnected(so);
-		break;
-
-	case PRU_CONNECT2:
-		error = EOPNOTSUPP;
-		break;
-
-	case PRU_ACCEPT:
-		error = EOPNOTSUPP;
-		break;
-
-	case PRU_DISCONNECT:
-		if (inp->inp_faddr.s_addr == INADDR_ANY) {
-			error = ENOTCONN;
-			break;
-		}
-		s = splnet();
-		in_pcbdisconnect(inp);
-		inp->inp_laddr.s_addr = INADDR_ANY;
-		splx(s);
-		so->so_state &= ~SS_ISCONNECTED;		/* XXX */
-		break;
-
-	case PRU_SHUTDOWN:
-		socantsendmore(so);
-		break;
-
-	case PRU_SEND:
-		return (udp_output(inp, m, addr, control));
-
-	case PRU_ABORT:
-		soisdisconnected(so);
-		udp_detach(inp);
-		break;
-
-	case PRU_SOCKADDR:
-		in_setsockaddr(inp, addr);
-		break;
-
-	case PRU_PEERADDR:
-		in_setpeeraddr(inp, addr);
-		break;
-
-	case PRU_SENSE:
-		/*
-		 * stat: don't bother with a blocksize.
-		 */
-		return (0);
-
-	case PRU_SENDOOB:
-	case PRU_FASTTIMO:
-	case PRU_SLOWTIMO:
-	case PRU_PROTORCV:
-	case PRU_PROTOSEND:
-		error =  EOPNOTSUPP;
-		break;
-
-	case PRU_RCVD:
-	case PRU_RCVOOB:
-		return (EOPNOTSUPP);	/* do not free mbuf's */
-
-	default:
-		panic("udp_usrreq");
-	}
-
-release:
-	if (control) {
-		printf("udp control data unexpectedly retained\n");
-		m_freem(control);
-	}
-	if (m)
-		m_freem(m);
-	return (error);
-}
-
-static void
-udp_detach(inp)
-	struct inpcb *inp;
-{
-	int s = splnet();
-
-	in_pcbdetach(inp);
-	splx(s);
-}
diff --git a/c/src/exec/libnetworking/netinet/udp_var.h b/c/src/exec/libnetworking/netinet/udp_var.h
deleted file mode 100644
index 90785b53de..0000000000
--- a/c/src/exec/libnetworking/netinet/udp_var.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)udp_var.h	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#ifndef _NETINET_UDP_VAR_H_
-#define _NETINET_UDP_VAR_H_
-
-/*
- * UDP kernel structures and variables.
- */
-struct	udpiphdr {
-	struct 	ipovly ui_i;		/* overlaid ip structure */
-	struct	udphdr ui_u;		/* udp header */
-};
-#define	ui_next		ui_i.ih_next
-#define	ui_prev		ui_i.ih_prev
-#define	ui_x1		ui_i.ih_x1
-#define	ui_pr		ui_i.ih_pr
-#define	ui_len		ui_i.ih_len
-#define	ui_src		ui_i.ih_src
-#define	ui_dst		ui_i.ih_dst
-#define	ui_sport	ui_u.uh_sport
-#define	ui_dport	ui_u.uh_dport
-#define	ui_ulen		ui_u.uh_ulen
-#define	ui_sum		ui_u.uh_sum
-
-struct	udpstat {
-				/* input statistics: */
-	u_long	udps_ipackets;		/* total input packets */
-	u_long	udps_hdrops;		/* packet shorter than header */
-	u_long	udps_badsum;		/* checksum error */
-	u_long	udps_badlen;		/* data length larger than packet */
-	u_long	udps_noport;		/* no socket on port */
-	u_long	udps_noportbcast;	/* of above, arrived as broadcast */
-	u_long	udps_fullsock;		/* not delivered, input socket full */
-	u_long	udpps_pcbcachemiss;	/* input packets missing pcb cache */
-	u_long	udpps_pcbhashmiss;	/* input packets not for hashed pcb */
-				/* output statistics: */
-	u_long	udps_opackets;		/* total output packets */
-};
-
-/*
- * Names for UDP sysctl objects
- */
-#define	UDPCTL_CHECKSUM		1	/* checksum UDP packets */
-#define UDPCTL_STATS		2	/* statistics (read-only) */
-#define	UDPCTL_MAXDGRAM		3	/* max datagram size */
-#define	UDPCTL_RECVSPACE	4	/* default receive buffer space */
-#define UDPCTL_MAXID		5
-
-#define UDPCTL_NAMES { \
-	{ 0, 0 }, \
-	{ "checksum", CTLTYPE_INT }, \
-	{ "stats", CTLTYPE_STRUCT }, \
-	{ "maxdgram", CTLTYPE_INT }, \
-	{ "recvspace", CTLTYPE_INT }, \
-}
-
-#ifdef KERNEL
-extern struct	inpcbhead udb;
-extern struct	inpcbinfo udbinfo;
-extern struct	udpstat udpstat;
-
-void	 udp_ctlinput __P((int, struct sockaddr *, void *));
-void	 udp_init __P((void));
-void	 udp_input __P((struct mbuf *, int));
-int	 udp_usrreq __P((struct socket *,
-	    int, struct mbuf *, struct mbuf *, struct mbuf *));
-#endif
-
-#endif
diff --git a/c/src/exec/libnetworking/nfs/bootp_subr.c b/c/src/exec/libnetworking/nfs/bootp_subr.c
deleted file mode 100644
index cb7d3d3407..0000000000
--- a/c/src/exec/libnetworking/nfs/bootp_subr.c
+++ /dev/null
@@ -1,968 +0,0 @@
-/*	$Id$	*/
-
-/*
- * Copyright (c) 1995 Gordon Ross, Adam Glass
- * Copyright (c) 1992 Regents of the University of California.
- * All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Lawrence Berkeley Laboratory and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * based on:
- *      nfs/krpc_subr.c
- *	$NetBSD: krpc_subr.c,v 1.10 1995/08/08 20:43:43 gwr Exp $
- */
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/conf.h>
-#include <sys/sockio.h>
-#include <sys/proc.h>
-#include <sys/mount.h>
-#include <sys/mbuf.h>
-#include <sys/reboot.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-
-#include <net/if.h>
-#include <net/route.h>
-
-#include <netinet/in.h>
-#include <net/if_types.h>
-#include <net/if_dl.h>
-#include <netinet/if_ether.h>
-
-#include <nfs/rpcv2.h>
-#include <nfs/nfsproto.h>
-#include <nfs/nfs.h>
-#include <nfs/nfsdiskless.h>
-#include <nfs/krpc.h>
-#include <nfs/xdr_subs.h>
-
-#define BOOTP_MIN_LEN		300	/* Minimum size of bootp udp packet */
-
-/*
- * What is the longest we will wait before re-sending a request?
- * Note this is also the frequency of "RPC timeout" messages.
- * The re-send loop count sup linearly to this maximum, so the
- * first complaint will happen after (1+2+3+4+5)=15 seconds.
- */
-#define	MAX_RESEND_DELAY 5	/* seconds */
-
-/* Definitions from RFC951 */
-struct bootp_packet {
-  u_int8_t op;
-  u_int8_t htype;
-  u_int8_t hlen;
-  u_int8_t hops;
-  u_int32_t xid;
-  u_int16_t secs;
-  u_int16_t flags;
-  struct in_addr ciaddr;
-  struct in_addr yiaddr;
-  struct in_addr siaddr;
-  struct in_addr giaddr;
-  unsigned char chaddr[16];
-  char sname[64];
-  char file[128];
-  unsigned char vend[256];
-};
-
-#define IPPORT_BOOTPC 68
-#define IPPORT_BOOTPS 67
-
-extern int nfs_diskless_valid;
-extern struct nfsv3_diskless nfsv3_diskless;
-
-/* mountd RPC */
-#if !defined(__rtems__)
-static int md_mount __P((struct sockaddr_in *mdsin, char *path,
-	u_char *fhp, int *fhsizep, struct nfs_args *args,struct proc *procp));
-static int md_lookup_swap __P((struct sockaddr_in *mdsin,char *path,
-			       u_char *fhp, int *fhsizep, 
-			       struct nfs_args *args,
-			       struct proc *procp));
-static int setfs __P((struct sockaddr_in *addr, char *path, char *p));
-#endif
-static int getdec __P((char **ptr));
-static char *substr __P((char *a,char *b));
-#if !defined(__rtems__)
-static void mountopts __P((struct nfs_args *args, char *p)); 
-static int xdr_opaque_decode __P((struct mbuf **ptr,u_char *buf,
-				  int len));
-static int xdr_int_decode __P((struct mbuf **ptr,int *iptr));
-#endif
-static void printip __P((char *prefix,struct in_addr addr));
-
-#ifdef BOOTP_DEBUG
-void bootpboot_p_sa(struct sockaddr *sa,struct sockaddr *ma);
-void bootpboot_p_ma(struct sockaddr *ma);
-void bootpboot_p_rtentry(struct rtentry *rt);
-void bootpboot_p_tree(struct radix_node *rn);
-void bootpboot_p_rtlist(void);
-void bootpboot_p_iflist(void);
-#endif
-
-int  bootpc_call(struct bootp_packet *call,
-		 struct bootp_packet *reply,
-		 struct proc *procp);
-
-int bootpc_fakeup_interface(struct ifreq *ireq,struct socket *so,
-			struct proc *procp);
-
-int 
-bootpc_adjust_interface(struct ifreq *ireq,struct socket *so,
-			struct sockaddr_in *myaddr,
-			struct sockaddr_in *netmask,
-			struct sockaddr_in *gw,
-			struct proc *procp);
-
-void bootpc_init(void);
-
-#ifdef BOOTP_DEBUG
-void bootpboot_p_sa(sa,ma)
-     struct sockaddr *sa;
-     struct sockaddr *ma;
-{
-  if (!sa) {
-    printf("(sockaddr *) <null>");
-    return;
-  }
-  switch (sa->sa_family) {
-  case AF_INET:
-    {
-      struct sockaddr_in *sin = (struct sockaddr_in *) sa;
-      printf("inet %x",ntohl(sin->sin_addr.s_addr));
-      if (ma) {
-	struct sockaddr_in *sin = (struct sockaddr_in *) ma;
-	printf(" mask %x",ntohl(sin->sin_addr.s_addr));
-      }
-    }
-  break;
-  case AF_LINK:
-    {
-      struct sockaddr_dl *sli = (struct sockaddr_dl *) sa;
-      int i;
-      printf("link %.*s ",sli->sdl_nlen,sli->sdl_data);
-      for (i=0;i<sli->sdl_alen;i++) {
-	if (i>0)
-	  printf(":");
-	printf("%x",(unsigned char) sli->sdl_data[i+sli->sdl_nlen]);
-      }
-    }
-  break;
-  default:
-    printf("af%d",sa->sa_family);
-  }
-}
-
-void bootpboot_p_ma(ma)
-     struct sockaddr *ma;
-{
-  if (!ma) {
-    printf("<null>");
-    return;
-  }
-  printf("%x",*(int*)ma);
-}
-
-void bootpboot_p_rtentry(rt)
-     struct rtentry *rt;
-{
-  bootpboot_p_sa(rt_key(rt),rt_mask(rt));
-  printf(" ");
-  bootpboot_p_ma(rt->rt_genmask);
-  printf(" ");
-  bootpboot_p_sa(rt->rt_gateway,NULL);
-  printf(" ");
-  printf("flags %x",(unsigned short) rt->rt_flags);
-  printf(" %d",rt->rt_rmx.rmx_expire);
-  printf(" %s%d\n",rt->rt_ifp->if_name,rt->rt_ifp->if_unit);
-}
-void  bootpboot_p_tree(rn)
-     struct radix_node *rn;
-{
-  while (rn) {
-    if (rn->rn_b < 0) {
-      if (rn->rn_flags & RNF_ROOT) {
-      } else {
-	bootpboot_p_rtentry((struct rtentry *) rn);
-      }
-      rn = rn->rn_dupedkey;
-    } else {
-      bootpboot_p_tree(rn->rn_l);
-      bootpboot_p_tree(rn->rn_r);
-      return;
-    }
-    
-  }
-}
-
-void bootpboot_p_rtlist(void)
-{
-  printf("Routing table:\n");
-  bootpboot_p_tree(rt_tables[AF_INET]->rnh_treetop);
-}
-
-void bootpboot_p_iflist(void)
-{
-  struct ifnet *ifp;
-  struct ifaddr *ifa;
-  printf("Interface list:\n");
-  for (ifp = TAILQ_FIRST(&ifnet); ifp != 0; ifp = TAILQ_NEXT(ifp,if_link))
-    {
-      for (ifa = TAILQ_FIRST(&ifp->if_addrhead) ;ifa; 
-	   ifa=TAILQ_NEXT(ifa,ifa_link))
-	if (ifa->ifa_addr->sa_family == AF_INET ) {
-	  printf("%s%d flags %x, addr %x, bcast %x, net %x\n",
-		 ifp->if_name,ifp->if_unit,
-		 (unsigned short) ifp->if_flags,
-		 ntohl(((struct sockaddr_in *) ifa->ifa_addr)->sin_addr.s_addr),
-		 ntohl(((struct sockaddr_in *) ifa->ifa_dstaddr)->sin_addr.s_addr),
-		 ntohl(((struct sockaddr_in *) ifa->ifa_netmask)->sin_addr.s_addr)
-		 );
-	}
-    }
-}
-#endif
-
-int
-bootpc_call(call,reply,procp)
-     struct bootp_packet *call;
-     struct bootp_packet *reply;	/* output */
-     struct proc *procp;
-{
-	struct socket *so;
-	struct sockaddr_in *sin;
-	struct mbuf *m, *nam;
-	struct uio auio;
-	struct iovec aio;
-	int error, rcvflg, timo, secs, len;
-
-	/* Free at end if not null. */
-	nam = NULL;
-
-	/*
-	 * Create socket and set its recieve timeout.
-	 */
-	if ((error = socreate(AF_INET, &so, SOCK_DGRAM, 0,procp)))
-		goto out;
-
-	m = m_get(M_WAIT, MT_SOOPTS);
-	if (m == NULL) {
-		error = ENOBUFS;
-		goto out;
-	} else {
-		struct timeval *tv;
-		tv = mtod(m, struct timeval *);
-		m->m_len = sizeof(*tv);
-		tv->tv_sec = 1;
-		tv->tv_usec = 0;
-		if ((error = sosetopt(so, SOL_SOCKET, SO_RCVTIMEO, m)))
-			goto out;
-	}
-
-	/*
-	 * Enable broadcast.
-	 */
-	{
-		int *on;
-		m = m_get(M_WAIT, MT_SOOPTS);
-		if (m == NULL) {
-			error = ENOBUFS;
-			goto out;
-		}
-		on = mtod(m, int *);
-		m->m_len = sizeof(*on);
-		*on = 1;
-		if ((error = sosetopt(so, SOL_SOCKET, SO_BROADCAST, m)))
-			goto out;
-	}
-
-	/*
-	 * Bind the local endpoint to a bootp client port.
-	 */
-	m = m_getclr(M_WAIT, MT_SONAME);
-	sin = mtod(m, struct sockaddr_in *);
-	sin->sin_len = m->m_len = sizeof(*sin);
-	sin->sin_family = AF_INET;
-	sin->sin_addr.s_addr = INADDR_ANY;
-	sin->sin_port = htons(IPPORT_BOOTPC);
-	error = sobind(so, m);
-	m_freem(m);
-	if (error) {
-		printf("bind failed\n");
-		goto out;
-	}
-
-	/*
-	 * Setup socket address for the server.
-	 */
-	nam = m_get(M_WAIT, MT_SONAME);
-	if (nam == NULL) {
-		error = ENOBUFS;
-		goto out;
-	}
-	sin = mtod(nam, struct sockaddr_in *);
-	sin-> sin_len = sizeof(*sin);
-	sin-> sin_family = AF_INET;
-	sin->sin_addr.s_addr = INADDR_BROADCAST;
-	sin->sin_port = htons(IPPORT_BOOTPS);
-
-	nam->m_len = sizeof(*sin);
-
-	/*
-	 * Send it, repeatedly, until a reply is received,
-	 * but delay each re-send by an increasing amount.
-	 * If the delay hits the maximum, start complaining.
-	 */
-	timo = 0;
-	for (;;) {
-		/* Send BOOTP request (or re-send). */
-		
-		aio.iov_base = (caddr_t) call;
-		aio.iov_len = sizeof(*call);
-		
-		auio.uio_iov = &aio;
-		auio.uio_iovcnt = 1;
-		auio.uio_segflg = UIO_SYSSPACE;
-		auio.uio_rw = UIO_WRITE;
-		auio.uio_offset = 0;
-		auio.uio_resid = sizeof(*call);
-		auio.uio_procp = procp;
-
-		error = sosend(so, nam, &auio, NULL, NULL, 0);
-		if (error) {
-			printf("bootpc_call: sosend: %d\n", error);
-			goto out;
-		}
-
-		/* Determine new timeout. */
-		if (timo < MAX_RESEND_DELAY)
-			timo++;
-		else
-			printf("BOOTP timeout for server 0x%x\n",
-			       (int)ntohl(sin->sin_addr.s_addr));
-
-		/*
-		 * Wait for up to timo seconds for a reply.
-		 * The socket receive timeout was set to 1 second.
-		 */
-		secs = timo;
-		while (secs > 0) {
-			aio.iov_base = (caddr_t) reply;
-			aio.iov_len = sizeof(*reply);
-
-			auio.uio_iov = &aio;
-			auio.uio_iovcnt = 1;
-			auio.uio_segflg = UIO_SYSSPACE;
-			auio.uio_rw = UIO_READ;
-			auio.uio_offset = 0;
-			auio.uio_resid = sizeof(*reply);
-			auio.uio_procp = procp;
-			
-			rcvflg = 0;
-			error = soreceive(so, NULL, &auio, NULL, NULL, &rcvflg);
-			if (error == EWOULDBLOCK) {
-				secs--;
-				call->secs=htons(ntohs(call->secs)+1);
-				continue;
-			}
-			if (error)
-				goto out;
-			len = sizeof(*reply) - auio.uio_resid;
-
-			/* Do we have the required number of bytes ? */
-			if (len < BOOTP_MIN_LEN)
-				continue;
-
-			/* Is it the right reply? */
-			if (reply->op != 2)
-			  continue;
-
-			if (reply->xid != call->xid)
-				continue;
-
-			if (reply->hlen != call->hlen)
-			  continue;
-
-			if (bcmp(reply->chaddr,call->chaddr,call->hlen))
-			  continue;
-
-			goto gotreply;	/* break two levels */
-
-		} /* while secs */
-	} /* forever send/receive */
-
-	error = ETIMEDOUT;
-	goto out;
-
- gotreply:
- out:
-	if (nam) m_freem(nam);
-	soclose(so);
-	return error;
-}
-
-int 
-bootpc_fakeup_interface(struct ifreq *ireq,struct socket *so,
-			struct proc *procp)
-{
-  struct sockaddr_in *sin;
-  int error;
-  struct sockaddr_in dst;
-  struct sockaddr_in gw;
-  struct sockaddr_in mask;
-
-  /*
-   * Bring up the interface.
-   *
-   * Get the old interface flags and or IFF_UP into them; if
-   * IFF_UP set blindly, interface selection can be clobbered.
-   */
-  error = ifioctl(so, SIOCGIFFLAGS, (caddr_t)ireq, procp);
-  if (error)
-    panic("bootpc_fakeup_interface: GIFFLAGS, error=%d", error);
-  ireq->ifr_flags |= IFF_UP;
-  error = ifioctl(so, SIOCSIFFLAGS, (caddr_t)ireq, procp);
-  if (error)
-    panic("bootpc_fakeup_interface: SIFFLAGS, error=%d", error);
-
-  /*
-   * Do enough of ifconfig(8) so that the chosen interface
-   * can talk to the servers.  (just set the address)
-   */
-  
-  /* addr is 0.0.0.0 */
-  
-  sin = (struct sockaddr_in *)&ireq->ifr_addr;
-  bzero((caddr_t)sin, sizeof(*sin));
-  sin->sin_len = sizeof(*sin);
-  sin->sin_family = AF_INET;
-  sin->sin_addr.s_addr = INADDR_ANY;
-  error = ifioctl(so, SIOCSIFADDR, (caddr_t)ireq, procp);
-  if (error)
-    panic("bootpc_fakeup_interface: set if addr, error=%d", error);
-  
-  /* netmask is 0.0.0.0 */
-  
-  sin = (struct sockaddr_in *)&ireq->ifr_addr;
-  bzero((caddr_t)sin, sizeof(*sin));
-  sin->sin_len = sizeof(*sin);
-  sin->sin_family = AF_INET;
-  sin->sin_addr.s_addr = INADDR_ANY;
-  error = ifioctl(so, SIOCSIFNETMASK, (caddr_t)ireq, procp);
-  if (error)
-    panic("bootpc_fakeup_interface: set if net addr, error=%d", error);
-  
-  /* Broadcast is 255.255.255.255 */
-  
-  sin = (struct sockaddr_in *)&ireq->ifr_addr;
-  bzero((caddr_t)sin, sizeof(*sin));
-  sin->sin_len = sizeof(*sin);
-  sin->sin_family = AF_INET;
-  sin->sin_addr.s_addr = INADDR_BROADCAST;
-  error = ifioctl(so, SIOCSIFBRDADDR, (caddr_t)ireq, procp);
-  if (error)
-    panic("bootpc_fakeup_interface: set if broadcast addr, error=%d", error);
-  
-  /* Add default route to 0.0.0.0 so we can send data */
-  
-  bzero((caddr_t) &dst, sizeof(dst));
-  dst.sin_len=sizeof(dst);
-  dst.sin_family=AF_INET;
-  dst.sin_addr.s_addr = htonl(0);
-  
-  bzero((caddr_t) &gw, sizeof(gw));
-  gw.sin_len=sizeof(gw);
-  gw.sin_family=AF_INET;
-  gw.sin_addr.s_addr = htonl(0x0);
-  
-  bzero((caddr_t) &mask, sizeof(mask));
-  mask.sin_len=sizeof(mask);
-  mask.sin_family=AF_INET;
-  mask.sin_addr.s_addr = htonl(0);
-  
-  error = rtrequest(RTM_ADD, 
-		    (struct sockaddr *) &dst, 
-		    (struct sockaddr *) &gw,
-		    (struct sockaddr *) &mask, 
-		    RTF_UP | RTF_STATIC
-		    , NULL);
-  if (error)
-    printf("bootpc_fakeup_interface: add default route, error=%d\n", error);
-  return error;
-}
-
-int 
-bootpc_adjust_interface(struct ifreq *ireq,struct socket *so,
-			struct sockaddr_in *myaddr,
-			struct sockaddr_in *netmask,
-			struct sockaddr_in *gw,
-			struct proc *procp)
-{
-  int error;
-  struct sockaddr_in oldgw;
-  struct sockaddr_in olddst;
-  struct sockaddr_in oldmask;
-  struct sockaddr_in *sin;
-
-  /* Remove old default route to 0.0.0.0 */
-  
-  bzero((caddr_t) &olddst, sizeof(olddst));
-  olddst.sin_len=sizeof(olddst);
-  olddst.sin_family=AF_INET;
-  olddst.sin_addr.s_addr = INADDR_ANY;
-  
-  bzero((caddr_t) &oldgw, sizeof(oldgw));
-  oldgw.sin_len=sizeof(oldgw);
-  oldgw.sin_family=AF_INET;
-  oldgw.sin_addr.s_addr = INADDR_ANY;
-  
-  bzero((caddr_t) &oldmask, sizeof(oldmask));
-  oldmask.sin_len=sizeof(oldmask);
-  oldmask.sin_family=AF_INET;
-  oldmask.sin_addr.s_addr = INADDR_ANY;
-  
-  error = rtrequest(RTM_DELETE, 
-		    (struct sockaddr *) &olddst,
-		    (struct sockaddr *) &oldgw,
-		    (struct sockaddr *) &oldmask, 
-		    (RTF_UP | RTF_STATIC), NULL);
-  if (error) {
-    printf("nfs_boot: del default route, error=%d\n", error);
-    return error;
-  }
-
-  /*
-   * Do enough of ifconfig(8) so that the chosen interface
-   * can talk to the servers.  (just set the address)
-   */
-  bcopy(netmask,&ireq->ifr_addr,sizeof(*netmask));
-  error = ifioctl(so, SIOCSIFNETMASK, (caddr_t)ireq, procp);
-  if (error)
-    panic("nfs_boot: set if netmask, error=%d", error);
-
-  /* Broadcast is with host part of IP address all 1's */
-  
-  sin = (struct sockaddr_in *)&ireq->ifr_addr;
-  bzero((caddr_t)sin, sizeof(*sin));
-  sin->sin_len = sizeof(*sin);
-  sin->sin_family = AF_INET;
-  sin->sin_addr.s_addr = myaddr->sin_addr.s_addr | ~ netmask->sin_addr.s_addr;
-  error = ifioctl(so, SIOCSIFBRDADDR, (caddr_t)ireq, procp);
-  if (error)
-    panic("bootpc_call: set if broadcast addr, error=%d", error);
-  
-  bcopy(myaddr,&ireq->ifr_addr,sizeof(*myaddr));
-  error = ifioctl(so, SIOCSIFADDR, (caddr_t)ireq, procp);
-  if (error)
-    panic("nfs_boot: set if addr, error=%d", error);
-
-  /* Add new default route */
-
-  error = rtrequest(RTM_ADD, 
-		    (struct sockaddr *) &olddst,
-		    (struct sockaddr *) gw,
-		    (struct sockaddr *) &oldmask,
-		    (RTF_UP | RTF_GATEWAY | RTF_STATIC), NULL);
-  if (error) {
-    printf("nfs_boot: add net route, error=%d\n", error);
-    return error;
-  }
-
-  return 0;
-}
-
-#if !defined(__rtems__)
-static int setfs(addr, path, p)
-	struct sockaddr_in *addr;
-	char *path;
-	char *p;
-{
-	unsigned ip = 0;
-	int val;
-
-	if (((val = getdec(&p)) < 0) || (val > 255)) return(0);
-	ip = val << 24;
-	if (*p != '.') return(0);
-	p++;
-	if (((val = getdec(&p)) < 0) || (val > 255)) return(0);
-	ip |= (val << 16);
-	if (*p != '.') return(0);
-	p++;
-	if (((val = getdec(&p)) < 0) || (val > 255)) return(0);
-	ip |= (val << 8);
-	if (*p != '.') return(0);
-	p++;
-	if (((val = getdec(&p)) < 0) || (val > 255)) return(0);
-	ip |= val;
-	if (*p != ':') return(0);
-	p++;
-
-	addr->sin_addr.s_addr = htonl(ip);
-	addr->sin_len = sizeof(struct sockaddr_in);
-	addr->sin_family = AF_INET;
-
-	strncpy(path,p,MNAMELEN-1);
-	return(1);
-}
-#endif
-
-static int getdec(ptr)
-	char **ptr;
-{
-	char *p = *ptr;
-	int ret=0;
-	if ((*p < '0') || (*p > '9')) return(-1);
-	while ((*p >= '0') && (*p <= '9')) {
-		ret = ret*10 + (*p - '0');
-		p++;
-	}
-	*ptr = p;
-	return(ret);
-}
-
-static char *substr(a,b)
-	char *a,*b;
-{
-	char *loc1;
-	char *loc2;
-
-        while (*a != '\0') {
-                loc1 = a;
-                loc2 = b;
-                while (*loc1 == *loc2++) {
-                        if (*loc1 == '\0') return (0);
-                        loc1++;
-                        if (*loc2 == '\0') return (loc1);
-                }
-        a++;
-        }
-        return (0);
-}
-
-static void printip(char *prefix,struct in_addr addr)
-{
-  unsigned int ip;
-
-  ip = ntohl(addr.s_addr);
-
-  printf("%s is %d.%d.%d.%d\n",prefix,
-	 ip >> 24, (ip >> 16) & 255 ,(ip >> 8) & 255 ,ip & 255 );
-}
-
-void
-bootpc_init(void)
-{
-  struct bootp_packet call;
-  struct bootp_packet reply;
-  static u_int32_t xid = ~0xFF;
-  
-  struct ifreq ireq;
-  struct ifnet *ifp;
-  struct socket *so;
-  int error;
-  int code,ncode,len;
-  int j;
-  char *p;
-  unsigned int ip;
-
-  struct sockaddr_in myaddr;
-  struct sockaddr_in netmask;
-  struct sockaddr_in gw;
-  int gotgw=0;
-  int gotnetmask=0;
-#if !defined(__rtems__)
-  int gotrootpath=0;
-  int gotswappath=0;
-#endif
-  char lookup_path[24];
-
-#define EALEN 6
-#if !defined(__rtems__)
-  unsigned char ea[EALEN];
-#endif
-  struct ifaddr *ifa;
-  struct sockaddr_dl *sdl = NULL;
-  char *delim;
-  struct proc *procp = NULL;
-
-  /*
-   * If already filled in, don't touch it here 
-   */
-  if (nfs_diskless_valid)
-    return;
-
-  /*
-   * Bump time if 0.
-  if (!time.tv_sec)
-    time.tv_sec++;
-   */
-
-  /*
-   * Find a network interface.
-   */
-  for (ifp = ifnet; ifp != 0; ifp = ifp->if_next)
-    if ((ifp->if_flags &
-      (IFF_LOOPBACK|IFF_POINTOPOINT)) == 0)
-	break;
-  if (ifp == NULL)
-    panic("bootpc_init: no suitable interface");
-  bzero(&ireq,sizeof(ireq));
-  sprintf(ireq.ifr_name, "%s%d", ifp->if_name,ifp->if_unit);
-  printf("bootpc_init: using network interface '%s'\n",
-	 ireq.ifr_name);
-
-  if ((error = socreate(AF_INET, &so, SOCK_DGRAM, 0,procp)) != 0)
-    panic("nfs_boot: socreate, error=%d", error);
-	  
-  bootpc_fakeup_interface(&ireq,so,procp);
-
-  printf("Bootpc testing starting\n");
-  
-  /* Get HW address */
-
-  for (ifa = ifp->if_addrlist;ifa; ifa = ifa->ifa_next)
-    if (ifa->ifa_addr->sa_family == AF_LINK &&
-	(sdl = ((struct sockaddr_dl *) ifa->ifa_addr)) &&
-	sdl->sdl_type == IFT_ETHER)
-      break;
-  
-  if (!sdl)
-    panic("bootpc: Unable to find HW address");
-  if (sdl->sdl_alen != EALEN ) 
-    panic("bootpc: HW address len is %d, expected value is %d",
-	  sdl->sdl_alen,EALEN);
-
-  printf("bootpc hw address is ");
-  delim="";
-  for (j=0;j<sdl->sdl_alen;j++) {
-    printf("%s%x",delim,((unsigned char *)LLADDR(sdl))[j]);
-    delim=":";
-  }
-  printf("\n");
-
-#if 0
-  bootpboot_p_iflist();
-  bootpboot_p_rtlist();
-#endif
-  
-  bzero((caddr_t) &call, sizeof(call));
-
-  /* bootpc part */
-  call.op = 1; 			/* BOOTREQUEST */
-  call.htype= 1;		/* 10mb ethernet */
-  call.hlen=sdl->sdl_alen;	/* Hardware address length */
-  call.hops=0;	
-  xid++;
-  call.xid = txdr_unsigned(xid);
-  bcopy(LLADDR(sdl),&call.chaddr,sdl->sdl_alen);
-  
-  call.vend[0]=99;
-  call.vend[1]=130;
-  call.vend[2]=83;
-  call.vend[3]=99;
-  call.vend[4]=255;
-  
-  call.secs = 0;
-  call.flags = htons(0x8000); /* We need an broadcast answer */
-  
-  error = bootpc_call(&call,&reply,procp);
-  
-  if (error)
-    panic("BOOTP call failed -- error %d", error);
-  
-  bzero(&myaddr,sizeof(myaddr));
-  bzero(&netmask,sizeof(netmask));
-  bzero(&gw,sizeof(gw));
-
-  myaddr.sin_len = sizeof(myaddr);
-  myaddr.sin_family = AF_INET;
-
-  netmask.sin_len = sizeof(netmask);
-  netmask.sin_family = AF_INET;
-
-  gw.sin_len = sizeof(gw);
-  gw.sin_family= AF_INET;
-
-  rtems_bsdnet_bootp_server_address = reply.siaddr;
-  rtems_bsdnet_log_host_address = reply.siaddr;
-
-  myaddr.sin_addr = reply.yiaddr;
-
-  ip = ntohl(myaddr.sin_addr.s_addr);
-  sprintf(lookup_path,"swap.%d.%d.%d.%d",
-	  ip >> 24, (ip >> 16) & 255 ,(ip >> 8) & 255 ,ip & 255 );
-
-  printip("My ip address",myaddr.sin_addr);
-
-  printip("Server ip address",reply.siaddr);
-
-  gw.sin_addr = reply.giaddr;
-  printip("Gateway ip address",reply.giaddr);
-
-  if (reply.sname[0])
-    printf("Server name is %s\n",reply.sname);
-  if (reply.file[0])
-    printf("boot file is %s\n",reply.file);
-  rtems_bsdnet_bootp_boot_file_name = strdup (reply.file);
-  if (reply.vend[0]==99 && reply.vend[1]==130 &&
-      reply.vend[2]==83 && reply.vend[3]==99) {
-    j=4;
-    ncode = reply.vend[j];
-    while (j<sizeof(reply.vend)) {
-      code = reply.vend[j] = ncode;
-      if (code==255)
-	break;
-      if (code==0) {
-	j++;
-	continue;
-      }
-      len = reply.vend[j+1];
-      j+=2;
-      if (len+j>=sizeof(reply.vend)) {
-	printf("Truncated field");
-	break;
-      }
-      ncode = reply.vend[j+len];
-      reply.vend[j+len]='\0';
-      p = &reply.vend[j];
-      switch (code) {
-      case 1:
-	if (len!=4) 
-	  panic("bootpc: subnet mask len is %d",len);
-	bcopy(&reply.vend[j],&netmask.sin_addr,4);
-	gotnetmask=1;
-	printip("Subnet mask",netmask.sin_addr);
-	break;
-      case 6:
-	/* Domain Name servers */
-	if (len % 4) 
-	  panic("bootpc: DNS Len is %d",len);
-	{
-	int dlen = 0;
-	while ((dlen < len) &&
-	  (rtems_bsdnet_nameserver_count < sizeof rtems_bsdnet_config.name_server /
-				  sizeof rtems_bsdnet_config.name_server[0])) {
-	    bcopy(&reply.vend[j+dlen],
-			&rtems_bsdnet_nameserver[rtems_bsdnet_nameserver_count],
-			4);
-	    printip("Domain Name Server",
-			rtems_bsdnet_nameserver[rtems_bsdnet_nameserver_count]);
-	    rtems_bsdnet_nameserver_count++;
-	    dlen += 4;
-	  }
-	}
-	break;
-      case 16:	/* Swap server IP address. unused */
-      case 2:
-	/* Time offset */
-	break;
-      case 3:
-	/* Routers */
-	if (len % 4) 
-	  panic("bootpc: Router Len is %d",len);
-	if (len > 0) {
-	  bcopy(&reply.vend[j],&gw.sin_addr,4);
-	  printip("Router",gw.sin_addr);
-	  gotgw=1;
-	}
-	break;
-      case 7:
-	/* Log servers */
-	if (len % 4) 
-	  panic("bootpc: Log server len is %d",len);
-	if (len > 0) {
-	  bcopy(&reply.vend[j],&rtems_bsdnet_log_host_address,4);
-	  printip("Log server",rtems_bsdnet_log_host_address);
-	}
-	break;
-      case 12:
-	if (len>=MAXHOSTNAMELEN)
-	  panic("bootpc: hostname  >=%d bytes",MAXHOSTNAMELEN);
-	if (sethostname (&reply.vend[j], len) < 0)
-	  panic("Can't set host name");
-	printf("Hostname is %.*s\n",len,&reply.vend[j]);
-	break;
-      case 15:
-	/* Domain name */
-	rtems_bsdnet_domain_name = strdup (&reply.vend[j]);
-	if (rtems_bsdnet_domain_name)
-		printf("Domain name is %s\n", rtems_bsdnet_domain_name);
-	break;
-      default:
-	printf("Ignoring field type %d\n",code);
-      }
-      j+=len;
-    }
-  }
-
-  if (!gotnetmask) {
-    if (IN_CLASSA(ntohl(myaddr.sin_addr.s_addr)))
-      netmask.sin_addr.s_addr = htonl(IN_CLASSA_NET);
-    else if (IN_CLASSB(ntohl(myaddr.sin_addr.s_addr)))
-      netmask.sin_addr.s_addr = htonl(IN_CLASSB_NET);
-    else 
-      netmask.sin_addr.s_addr = htonl(IN_CLASSC_NET);
-  }
-  if (!gotgw) {
-    /* Use proxyarp */
-    gw.sin_addr.s_addr = myaddr.sin_addr.s_addr;
-  }
-  
-#if 0
-  bootpboot_p_iflist();
-  bootpboot_p_rtlist();
-#endif
-  error = bootpc_adjust_interface(&ireq,so,
-				  &myaddr,&netmask,&gw,procp);
-  
-  soclose(so);
-
-#if 0
-  bootpboot_p_iflist();
-  bootpboot_p_rtlist();
-#endif
-
-
-#if 0
-    myaddr.sin_addr.s_addr | ~ netmask.sin_addr.s_addr;
-#endif
-
-#if 0
-  bootpboot_p_iflist();
-  bootpboot_p_rtlist();
-#endif
-  return;
-}
diff --git a/c/src/exec/libnetworking/nfs/krpc.h b/c/src/exec/libnetworking/nfs/krpc.h
deleted file mode 100644
index 8a21392657..0000000000
--- a/c/src/exec/libnetworking/nfs/krpc.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*	$NetBSD: krpc.h,v 1.4 1995/12/19 23:07:11 cgd Exp $	*/
-/*	$Id$	*/
-
-#include <sys/cdefs.h>
-
-int krpc_call __P((struct sockaddr_in *sin,
-	u_int prog, u_int vers, u_int func,
-	struct mbuf **data, struct mbuf **from, struct proc *procp));
-
-int krpc_portmap __P((struct sockaddr_in *sin,
-	u_int prog, u_int vers, u_int16_t *portp, struct proc *procp));
-
-struct mbuf *xdr_string_encode __P((char *str, int len));
-
-/*
- * RPC definitions for the portmapper
- */
-#define	PMAPPORT		111
-#define	PMAPPROG		100000
-#define	PMAPVERS		2
-#define	PMAPPROC_NULL		0
-#define	PMAPPROC_SET		1
-#define	PMAPPROC_UNSET		2
-#define	PMAPPROC_GETPORT	3
-#define	PMAPPROC_DUMP		4
-#define	PMAPPROC_CALLIT		5
diff --git a/c/src/exec/libnetworking/nfs/nfs.h b/c/src/exec/libnetworking/nfs/nfs.h
deleted file mode 100644
index 68f206e213..0000000000
--- a/c/src/exec/libnetworking/nfs/nfs.h
+++ /dev/null
@@ -1,620 +0,0 @@
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Rick Macklem at The University of Guelph.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)nfs.h	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#ifndef _NFS_NFS_H_
-#define _NFS_NFS_H_
-
-#include <nfs/rpcv2.h>
-
-/*
- * Tunable constants for nfs
- */
-
-#define	NFS_MAXIOVEC	34
-#define NFS_TICKINTVL	5		/* Desired time for a tick (msec) */
-#define NFS_HZ		(hz / nfs_ticks) /* Ticks/sec */
-#define	NFS_TIMEO	(1 * NFS_HZ)	/* Default timeout = 1 second */
-#define	NFS_MINTIMEO	(1 * NFS_HZ)	/* Min timeout to use */
-#define	NFS_MAXTIMEO	(60 * NFS_HZ)	/* Max timeout to backoff to */
-#define	NFS_MINIDEMTIMEO (5 * NFS_HZ)	/* Min timeout for non-idempotent ops*/
-#define	NFS_MAXREXMIT	100		/* Stop counting after this many */
-#define	NFS_MAXWINDOW	1024		/* Max number of outstanding requests */
-#define	NFS_RETRANS	10		/* Num of retrans for soft mounts */
-#define	NFS_MAXGRPS	16		/* Max. size of groups list */
-#ifndef NFS_MINATTRTIMO
-#define	NFS_MINATTRTIMO 5		/* Attribute cache timeout in sec */
-#endif
-#ifndef NFS_MAXATTRTIMO
-#define	NFS_MAXATTRTIMO 60
-#endif
-#define	NFS_WSIZE	8192		/* Def. write data size <= 8192 */
-#define	NFS_RSIZE	8192		/* Def. read data size <= 8192 */
-#define NFS_READDIRSIZE	8192		/* Def. readdir size */
-#define	NFS_DEFRAHEAD	1		/* Def. read ahead # blocks */
-#define	NFS_MAXRAHEAD	4		/* Max. read ahead # blocks */
-#define	NFS_MAXUIDHASH	64		/* Max. # of hashed uid entries/mp */
-#define	NFS_MAXASYNCDAEMON 	20	/* Max. number async_daemons runnable */
-#define NFS_MAXGATHERDELAY	100	/* Max. write gather delay (msec) */
-#ifndef NFS_GATHERDELAY
-#define NFS_GATHERDELAY		10	/* Default write gather delay (msec) */
-#endif
-#define	NFS_DIRBLKSIZ	4096		/* Must be a multiple of DIRBLKSIZ */
-
-/*
- * Oddballs
- */
-#define	NMOD(a)		((a) % nfs_asyncdaemons)
-#define NFS_CMPFH(n, f, s) \
-	((n)->n_fhsize == (s) && !bcmp((caddr_t)(n)->n_fhp, (caddr_t)(f), (s)))
-#define NFS_ISV3(v)	(VFSTONFS((v)->v_mount)->nm_flag & NFSMNT_NFSV3)
-#define NFS_SRVMAXDATA(n) \
-		(((n)->nd_flag & ND_NFSV3) ? (((n)->nd_nam2) ? \
-		 NFS_MAXDGRAMDATA : NFS_MAXDATA) : NFS_V2MAXDATA)
-
-/*
- * XXX
- * sys/buf.h should be edited to change B_APPENDWRITE --> B_NEEDCOMMIT, but
- * until then...
- * Same goes for sys/malloc.h, which needs M_NFSDIROFF,
- * M_NFSRVDESC and M_NFSBIGFH added.
- * The VA_EXCLUSIVE flag should be added for va_vaflags and set for an
- * exclusive create.
- * The B_INVAFTERWRITE flag should be set to whatever is required by the
- * buffer cache code to say "Invalidate the block after it is written back".
- */
-#ifndef B_NEEDCOMMIT
-#define B_NEEDCOMMIT	B_APPENDWRITE
-#endif
-#ifndef M_NFSRVDESC
-#define M_NFSRVDESC	M_TEMP
-#endif
-#ifndef M_NFSDIROFF
-#define M_NFSDIROFF	M_TEMP
-#endif
-#ifndef M_NFSBIGFH
-#define M_NFSBIGFH	M_TEMP
-#endif
-#ifndef VA_EXCLUSIVE
-#define VA_EXCLUSIVE	0
-#endif
-#ifdef __FreeBSD__
-#define	B_INVAFTERWRITE	B_NOCACHE
-#else
-#define	B_INVAFTERWRITE	B_INVAL
-#endif
-
-/*
- * These ifdefs try to handle the differences between the various 4.4BSD-Lite
- * based vfs interfaces.
- * btw: NetBSD-current does have a VOP_LEASDE(), but I don't know how to
- * differentiate between NetBSD-1.0 and NetBSD-current, so..
- * I also don't know about BSDi's 2.0 release.
- */
-#if !defined(HAS_VOPLEASE) && !defined(__FreeBSD__) && !defined(__NetBSD__)
-#define	HAS_VOPLEASE	1
-#endif
-#if !defined(HAS_VOPREVOKE) && !defined(__FreeBSD__) && !defined(__NetBSD__)
-#define HAS_VOPREVOKE	1
-#endif
-
-/*
- * The IO_METASYNC flag should be implemented for local file systems.
- * (Until then, it is nothin at all.)
- */
-#ifndef IO_METASYNC
-#define IO_METASYNC	0
-#endif
-
-/*
- * Set the attribute timeout based on how recently the file has been modified.
- */
-#define	NFS_ATTRTIMEO(np) \
-	((((np)->n_flag & NMODIFIED) || \
-	 (time.tv_sec - (np)->n_mtime) / 10 < NFS_MINATTRTIMO) ? NFS_MINATTRTIMO : \
-	 ((time.tv_sec - (np)->n_mtime) / 10 > NFS_MAXATTRTIMO ? NFS_MAXATTRTIMO : \
-	  (time.tv_sec - (np)->n_mtime) / 10))
-
-/*
- * Expected allocation sizes for major data structures. If the actual size
- * of the structure exceeds these sizes, then malloc() will be allocating
- * almost twice the memory required. This is used in nfs_init() to warn
- * the sysadmin that the size of a structure should be reduced.
- * (These sizes are always a power of 2. If the kernel malloc() changes
- *  to one that does not allocate space in powers of 2 size, then this all
- *  becomes bunk!)
- */
-#define NFS_NODEALLOC	256
-#define NFS_MNTALLOC	512
-#define NFS_SVCALLOC	256
-#define NFS_UIDALLOC	128
-
-/*
- * Structures for the nfssvc(2) syscall. Not that anyone but nfsd and mount_nfs
- * should ever try and use it.
- */
-struct nfsd_args {
-	int	sock;		/* Socket to serve */
-	caddr_t	name;		/* Client address for connection based sockets */
-	int	namelen;	/* Length of name */
-};
-
-struct nfsd_srvargs {
-	struct nfsd	*nsd_nfsd;	/* Pointer to in kernel nfsd struct */
-	uid_t		nsd_uid;	/* Effective uid mapped to cred */
-	u_long		nsd_haddr;	/* Ip address of client */
-	struct ucred	nsd_cr;		/* Cred. uid maps to */
-	int		nsd_authlen;	/* Length of auth string (ret) */
-	u_char		*nsd_authstr;	/* Auth string (ret) */
-	int		nsd_verflen;	/* and the verfier */
-	u_char		*nsd_verfstr;
-	struct timeval	nsd_timestamp;	/* timestamp from verifier */
-	u_long		nsd_ttl;	/* credential ttl (sec) */
-	NFSKERBKEY_T	nsd_key;	/* Session key */
-};
-
-struct nfsd_cargs {
-	char		*ncd_dirp;	/* Mount dir path */
-	uid_t		ncd_authuid;	/* Effective uid */
-	int		ncd_authtype;	/* Type of authenticator */
-	int		ncd_authlen;	/* Length of authenticator string */
-	u_char		*ncd_authstr;	/* Authenticator string */
-	int		ncd_verflen;	/* and the verifier */
-	u_char		*ncd_verfstr;
-	NFSKERBKEY_T	ncd_key;	/* Session key */
-};
-
-/*
- * Stats structure
- */
-struct nfsstats {
-	int	attrcache_hits;
-	int	attrcache_misses;
-	int	lookupcache_hits;
-	int	lookupcache_misses;
-	int	direofcache_hits;
-	int	direofcache_misses;
-	int	biocache_reads;
-	int	read_bios;
-	int	read_physios;
-	int	biocache_writes;
-	int	write_bios;
-	int	write_physios;
-	int	biocache_readlinks;
-	int	readlink_bios;
-	int	biocache_readdirs;
-	int	readdir_bios;
-	int	rpccnt[NFS_NPROCS];
-	int	rpcretries;
-	int	srvrpccnt[NFS_NPROCS];
-	int	srvrpc_errs;
-	int	srv_errs;
-	int	rpcrequests;
-	int	rpctimeouts;
-	int	rpcunexpected;
-	int	rpcinvalid;
-	int	srvcache_inproghits;
-	int	srvcache_idemdonehits;
-	int	srvcache_nonidemdonehits;
-	int	srvcache_misses;
-	int	srvnqnfs_leases;
-	int	srvnqnfs_maxleases;
-	int	srvnqnfs_getleases;
-	int	srvvop_writes;
-};
-
-/*
- * Flags for nfssvc() system call.
- */
-#define	NFSSVC_BIOD	0x002
-#define	NFSSVC_NFSD	0x004
-#define	NFSSVC_ADDSOCK	0x008
-#define	NFSSVC_AUTHIN	0x010
-#define	NFSSVC_GOTAUTH	0x040
-#define	NFSSVC_AUTHINFAIL 0x080
-#define	NFSSVC_MNTD	0x100
-
-/*
- * fs.nfs sysctl(3) identifiers
- */
-#define NFS_NFSSTATS	1		/* struct: struct nfsstats */
-#define NFS_NFSPRIVPORT	2		/* int: prohibit nfs to resvports */
-
-#define FS_NFS_NAMES { \
-		       { 0, 0 }, \
-		       { "nfsstats", CTLTYPE_STRUCT }, \
-		       { "nfsprivport", CTLTYPE_INT }, \
-}
-
-/*
- * The set of signals the interrupt an I/O in progress for NFSMNT_INT mounts.
- * What should be in this set is open to debate, but I believe that since
- * I/O system calls on ufs are never interrupted by signals the set should
- * be minimal. My reasoning is that many current programs that use signals
- * such as SIGALRM will not expect file I/O system calls to be interrupted
- * by them and break.
- */
-#if defined(KERNEL) || defined(_KERNEL)
-
-struct uio; struct buf; struct vattr; struct nameidata;	/* XXX */
-
-#define	NFSINT_SIGMASK	(sigmask(SIGINT)|sigmask(SIGTERM)|sigmask(SIGKILL)| \
-			 sigmask(SIGHUP)|sigmask(SIGQUIT))
-
-/*
- * Socket errors ignored for connectionless sockets??
- * For now, ignore them all
- */
-#define	NFSIGNORE_SOERROR(s, e) \
-		((e) != EINTR && (e) != ERESTART && (e) != EWOULDBLOCK && \
-		((s) & PR_CONNREQUIRED) == 0)
-
-/*
- * Nfs outstanding request list element
- */
-struct nfsreq {
-	TAILQ_ENTRY(nfsreq) r_chain;
-	struct mbuf	*r_mreq;
-	struct mbuf	*r_mrep;
-	struct mbuf	*r_md;
-	caddr_t		r_dpos;
-	struct nfsmount *r_nmp;
-	struct vnode	*r_vp;
-	u_long		r_xid;
-	int		r_flags;	/* flags on request, see below */
-	int		r_retry;	/* max retransmission count */
-	int		r_rexmit;	/* current retrans count */
-	int		r_timer;	/* tick counter on reply */
-	int		r_procnum;	/* NFS procedure number */
-	int		r_rtt;		/* RTT for rpc */
-	struct proc	*r_procp;	/* Proc that did I/O system call */
-};
-
-/*
- * Queue head for nfsreq's
- */
-extern TAILQ_HEAD(nfs_reqq, nfsreq) nfs_reqq;
-
-/* Flag values for r_flags */
-#define R_TIMING	0x01		/* timing request (in mntp) */
-#define R_SENT		0x02		/* request has been sent */
-#define	R_SOFTTERM	0x04		/* soft mnt, too many retries */
-#define	R_INTR		0x08		/* intr mnt, signal pending */
-#define	R_SOCKERR	0x10		/* Fatal error on socket */
-#define	R_TPRINTFMSG	0x20		/* Did a tprintf msg. */
-#define	R_MUSTRESEND	0x40		/* Must resend request */
-#define	R_GETONEREP	0x80		/* Probe for one reply only */
-
-/*
- * A list of nfssvc_sock structures is maintained with all the sockets
- * that require service by the nfsd.
- * The nfsuid structs hang off of the nfssvc_sock structs in both lru
- * and uid hash lists.
- */
-#ifndef NFS_UIDHASHSIZ
-#define	NFS_UIDHASHSIZ	29	/* Tune the size of nfssvc_sock with this */
-#endif
-#define	NUIDHASH(sock, uid) \
-	(&(sock)->ns_uidhashtbl[(uid) % NFS_UIDHASHSIZ])
-#ifndef NFS_WDELAYHASHSIZ
-#define	NFS_WDELAYHASHSIZ 16	/* and with this */
-#endif
-#define	NWDELAYHASH(sock, f) \
-	(&(sock)->ns_wdelayhashtbl[(*((u_long *)(f))) % NFS_WDELAYHASHSIZ])
-#ifndef NFS_MUIDHASHSIZ
-#define NFS_MUIDHASHSIZ	63	/* Tune the size of nfsmount with this */
-#endif
-#define	NMUIDHASH(nmp, uid) \
-	(&(nmp)->nm_uidhashtbl[(uid) % NFS_MUIDHASHSIZ])
-#define	NFSNOHASH(fhsum) \
-	(&nfsnodehashtbl[(fhsum) & nfsnodehash])
-
-/*
- * Network address hash list element
- */
-union nethostaddr {
-	u_long had_inetaddr;
-	struct mbuf *had_nam;
-};
-
-struct nfsuid {
-	TAILQ_ENTRY(nfsuid) nu_lru;	/* LRU chain */
-	LIST_ENTRY(nfsuid) nu_hash;	/* Hash list */
-	int		nu_flag;	/* Flags */
-	union nethostaddr nu_haddr;	/* Host addr. for dgram sockets */
-	struct ucred	nu_cr;		/* Cred uid mapped to */
-	int		nu_expire;	/* Expiry time (sec) */
-	struct timeval	nu_timestamp;	/* Kerb. timestamp */
-	u_long		nu_nickname;	/* Nickname on server */
-	NFSKERBKEY_T	nu_key;		/* and session key */
-};
-
-#define	nu_inetaddr	nu_haddr.had_inetaddr
-#define	nu_nam		nu_haddr.had_nam
-/* Bits for nu_flag */
-#define	NU_INETADDR	0x1
-#define NU_NAM		0x2
-#define NU_NETFAM(u)	(((u)->nu_flag & NU_INETADDR) ? AF_INET : AF_ISO)
-
-struct nfssvc_sock {
-	TAILQ_ENTRY(nfssvc_sock) ns_chain;	/* List of all nfssvc_sock's */
-	TAILQ_HEAD(, nfsuid) ns_uidlruhead;
-	struct file	*ns_fp;
-	struct socket	*ns_so;
-	struct mbuf	*ns_nam;
-	struct mbuf	*ns_raw;
-	struct mbuf	*ns_rawend;
-	struct mbuf	*ns_rec;
-	struct mbuf	*ns_recend;
-	struct mbuf	*ns_frag;
-	int		ns_flag;
-	int		ns_solock;
-	int		ns_cc;
-	int		ns_reclen;
-	int		ns_numuids;
-	u_long		ns_sref;
-	LIST_HEAD(, nfsrv_descript) ns_tq;	/* Write gather lists */
-	LIST_HEAD(, nfsuid) ns_uidhashtbl[NFS_UIDHASHSIZ];
-	LIST_HEAD(nfsrvw_delayhash, nfsrv_descript) ns_wdelayhashtbl[NFS_WDELAYHASHSIZ];
-};
-
-/* Bits for "ns_flag" */
-#define	SLP_VALID	0x01
-#define	SLP_DOREC	0x02
-#define	SLP_NEEDQ	0x04
-#define	SLP_DISCONN	0x08
-#define	SLP_GETSTREAM	0x10
-#define	SLP_LASTFRAG	0x20
-#define SLP_ALLFLAGS	0xff
-
-extern TAILQ_HEAD(nfssvc_sockhead, nfssvc_sock) nfssvc_sockhead;
-extern int nfssvc_sockhead_flag;
-#define	SLP_INIT	0x01
-#define	SLP_WANTINIT	0x02
-
-/*
- * One of these structures is allocated for each nfsd.
- */
-struct nfsd {
-	TAILQ_ENTRY(nfsd) nfsd_chain;	/* List of all nfsd's */
-	int		nfsd_flag;	/* NFSD_ flags */
-	struct nfssvc_sock *nfsd_slp;	/* Current socket */
-	int		nfsd_authlen;	/* Authenticator len */
-	u_char		nfsd_authstr[RPCAUTH_MAXSIZ]; /* Authenticator data */
-	int		nfsd_verflen;	/* and the Verifier */
-	u_char		nfsd_verfstr[RPCVERF_MAXSIZ];
-	struct proc	*nfsd_procp;	/* Proc ptr */
-	struct nfsrv_descript *nfsd_nd;	/* Associated nfsrv_descript */
-};
-
-/* Bits for "nfsd_flag" */
-#define	NFSD_WAITING	0x01
-#define	NFSD_REQINPROG	0x02
-#define	NFSD_NEEDAUTH	0x04
-#define	NFSD_AUTHFAIL	0x08
-
-/*
- * This structure is used by the server for describing each request.
- * Some fields are used only when write request gathering is performed.
- */
-struct nfsrv_descript {
-	u_quad_t		nd_time;	/* Write deadline (usec) */
-	off_t			nd_off;		/* Start byte offset */
-	off_t			nd_eoff;	/* and end byte offset */
-	LIST_ENTRY(nfsrv_descript) nd_hash;	/* Hash list */
-	LIST_ENTRY(nfsrv_descript) nd_tq;		/* and timer list */
-	LIST_HEAD(,nfsrv_descript) nd_coalesce;	/* coalesced writes */
-	struct mbuf		*nd_mrep;	/* Request mbuf list */
-	struct mbuf		*nd_md;		/* Current dissect mbuf */
-	struct mbuf		*nd_mreq;	/* Reply mbuf list */
-	struct mbuf		*nd_nam;	/* and socket addr */
-	struct mbuf		*nd_nam2;	/* return socket addr */
-	caddr_t			nd_dpos;	/* Current dissect pos */
-	int			nd_procnum;	/* RPC # */
-	int			nd_stable;	/* storage type */
-	int			nd_flag;	/* nd_flag */
-	int			nd_len;		/* Length of this write */
-	int			nd_repstat;	/* Reply status */
-	u_long			nd_retxid;	/* Reply xid */
-	u_long			nd_duration;	/* Lease duration */
-	struct timeval		nd_starttime;	/* Time RPC initiated */
-	fhandle_t		nd_fh;		/* File handle */
-	struct ucred		nd_cr;		/* Credentials */
-};
-
-/* Bits for "nd_flag" */
-#define	ND_READ		LEASE_READ
-#define ND_WRITE	LEASE_WRITE
-#define ND_CHECK	0x04
-#define ND_LEASE	(ND_READ | ND_WRITE | ND_CHECK)
-#define ND_NFSV3	0x08
-#define ND_NQNFS	0x10
-#define ND_KERBNICK	0x20
-#define ND_KERBFULL	0x40
-#define ND_KERBAUTH	(ND_KERBNICK | ND_KERBFULL)
-
-extern TAILQ_HEAD(nfsd_head, nfsd) nfsd_head;
-extern int nfsd_head_flag;
-#define	NFSD_CHECKSLP	0x01
-
-/*
- * These macros compare nfsrv_descript structures.
- */
-#define NFSW_CONTIG(o, n) \
-		((o)->nd_eoff >= (n)->nd_off && \
-		 !bcmp((caddr_t)&(o)->nd_fh, (caddr_t)&(n)->nd_fh, NFSX_V3FH))
-
-#define NFSW_SAMECRED(o, n) \
-	(((o)->nd_flag & ND_KERBAUTH) == ((n)->nd_flag & ND_KERBAUTH) && \
- 	 !bcmp((caddr_t)&(o)->nd_cr, (caddr_t)&(n)->nd_cr, \
-		sizeof (struct ucred)))
-
-int	nfs_reply __P((struct nfsreq *));
-int	nfs_getreq __P((struct nfsrv_descript *,struct nfsd *,int));
-int	nfs_send __P((struct socket *,struct mbuf *,struct mbuf *,struct nfsreq *));
-int	nfs_rephead __P((int,struct nfsrv_descript *,struct nfssvc_sock *,int,int,u_quad_t *,struct mbuf **,struct mbuf **,caddr_t *));
-int	nfs_sndlock __P((int *,struct nfsreq *));
-void	nfs_sndunlock __P((int *flagp));
-int	nfs_disct __P((struct mbuf **,caddr_t *,int,int,caddr_t *));
-int	nfs_vinvalbuf __P((struct vnode *,int,struct ucred *,struct proc *,int));
-int	nfs_readrpc __P((struct vnode *,struct uio *,struct ucred *));
-int	nfs_writerpc __P((struct vnode *,struct uio *,struct ucred *,int *,int *));
-int	nfs_readdirrpc __P((register struct vnode *,struct uio *,struct ucred *));
-int	nfs_asyncio __P((struct buf *,struct ucred *));
-int	nfs_doio __P((struct buf *,struct ucred *,struct proc *));
-int	nfs_readlinkrpc __P((struct vnode *,struct uio *,struct ucred *));
-int	nfs_sigintr __P((struct nfsmount *,struct nfsreq *r,struct proc *));
-int	nfs_readdirplusrpc __P((struct vnode *,register struct uio *,struct ucred *));
-int	nfsm_disct __P((struct mbuf **,caddr_t *,int,int,caddr_t *));
-void	nfsm_srvfattr __P((struct nfsrv_descript *,struct vattr *,struct nfs_fattr *));
-void	nfsm_srvwcc __P((struct nfsrv_descript *,int,struct vattr *,int,struct vattr *,struct mbuf **,char **));
-void	nfsm_srvpostopattr __P((struct nfsrv_descript *,int,struct vattr *,struct mbuf **,char **));
-int	netaddr_match __P((int,union nethostaddr *,struct mbuf *));
-int	nfs_request __P((struct vnode *,struct mbuf *,int,struct proc *,struct ucred *,struct mbuf **,struct mbuf **,caddr_t *));
-int	nfs_loadattrcache __P((struct vnode **,struct mbuf **,caddr_t *,struct vattr *));
-int	nfs_namei __P((struct nameidata *,fhandle_t *,int,struct nfssvc_sock *,struct mbuf *,struct mbuf **,caddr_t *,struct vnode **,struct proc *,int));
-void	nfsm_adj __P((struct mbuf *,int,int));
-int	nfsm_mbuftouio __P((struct mbuf **,struct uio *,int,caddr_t *));
-void	nfsrv_initcache __P((void));
-int	nfs_getauth __P((struct nfsmount *,struct nfsreq *,struct ucred *,char **,int *,char *,int *,NFSKERBKEY_T));
-int	nfs_getnickauth __P((struct nfsmount *,struct ucred *,char **,int *,char *,int));
-int	nfs_savenickauth __P((struct nfsmount *,struct ucred *,int,NFSKERBKEY_T,struct mbuf **,char **,struct mbuf *));
-int	nfs_adv __P((struct mbuf **,caddr_t *,int,int));
-void	nfs_nhinit __P((void));
-void	nfs_timer __P((void*));
-u_long nfs_hash __P((nfsfh_t *,int));
-void	nfsrv_slpderef __P((struct nfssvc_sock *slp));
-int	nfsrv_dorec __P((struct nfssvc_sock *,struct nfsd *,struct nfsrv_descript **));
-void	nfsrv_cleancache __P((void));
-int	nfsrv_getcache __P((struct nfsrv_descript *,struct nfssvc_sock *,struct mbuf **));
-int	nfs_init __P((void));
-void	nfsrv_updatecache __P((struct nfsrv_descript *,int,struct mbuf *));
-int	nfs_connect __P((struct nfsmount *,struct nfsreq *));
-void	nfs_disconnect __P((struct nfsmount *nmp));
-int	nfs_getattrcache __P((struct vnode *,struct vattr *));
-int	nfsm_strtmbuf __P((struct mbuf **,char **,char *,long));
-int	nfs_bioread __P((struct vnode *,struct uio *,int,struct ucred *, int getpages));
-int	nfsm_uiotombuf __P((struct uio *,struct mbuf **,int,caddr_t *));
-void	nfsrv_init __P((int));
-void	nfs_clearcommit __P((struct mount *));
-int	nfsrv_errmap __P((struct nfsrv_descript *, int));
-void	nfsrv_rcv __P((struct socket *so, caddr_t arg, int waitflag));
-void	nfsrvw_sort __P((gid_t [],int));
-void	nfsrv_setcred __P((struct ucred *,struct ucred *));
-int	nfs_writebp __P((struct buf *,int));
-int	nfsrv_object_create __P(( struct vnode * ));
-void	nfsrv_wakenfsd __P((struct nfssvc_sock *slp));
-int	nfsrv_writegather __P((struct nfsrv_descript **, struct nfssvc_sock *,
-			       struct proc *, struct mbuf **));
-int	nfs_fsinfo __P((struct nfsmount *, struct vnode *, struct ucred *,
-			struct proc *p));
-
-int	nfsrv3_access __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-			   struct proc *procp, struct mbuf **mrq));
-int	nfsrv_commit __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-			  struct proc *procp, struct mbuf **mrq));
-int	nfsrv_create __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-			  struct proc *procp, struct mbuf **mrq));
-int	nfsrv_fhtovp __P((fhandle_t *,int,struct vnode **,
-			struct ucred *,struct nfssvc_sock *,struct mbuf *,
-			int *,int));
-int	nfsrv_fsinfo __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-			  struct proc *procp, struct mbuf **mrq));
-int	nfsrv_getattr __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-			   struct proc *procp, struct mbuf **mrq));
-int	nfsrv_link __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-			struct proc *procp, struct mbuf **mrq));
-int	nfsrv_lookup __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-			  struct proc *procp, struct mbuf **mrq));
-int	nfsrv_mkdir __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-			 struct proc *procp, struct mbuf **mrq));
-int	nfsrv_mknod __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-			 struct proc *procp, struct mbuf **mrq));
-int	nfsrv_noop __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-			struct proc *procp, struct mbuf **mrq));
-int	nfsrv_null __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-			struct proc *procp, struct mbuf **mrq));
-int	nfsrv_pathconf __P((struct nfsrv_descript *nfsd,
-			    struct nfssvc_sock *slp, struct proc *procp,
-			    struct mbuf **mrq));
-int	nfsrv_read __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-			struct proc *procp, struct mbuf **mrq));
-int	nfsrv_readdir __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-			   struct proc *procp, struct mbuf **mrq));
-int	nfsrv_readdirplus __P((struct nfsrv_descript *nfsd,
-			       struct nfssvc_sock *slp, struct proc *procp,
-			       struct mbuf **mrq));
-int	nfsrv_readlink __P((struct nfsrv_descript *nfsd,
-			    struct nfssvc_sock *slp, struct proc *procp,
-			    struct mbuf **mrq));
-int	nfsrv_remove __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-			  struct proc *procp, struct mbuf **mrq));
-int	nfsrv_rename __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-			  struct proc *procp, struct mbuf **mrq));
-int	nfsrv_rmdir __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-			 struct proc *procp, struct mbuf **mrq));
-int	nfsrv_setattr __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-			   struct proc *procp, struct mbuf **mrq));
-int	nfsrv_statfs __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-			  struct proc *procp, struct mbuf **mrq));
-int	nfsrv_symlink __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-			   struct proc *procp, struct mbuf **mrq));
-int	nfsrv_write __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-			 struct proc *procp, struct mbuf **mrq));
-
-#ifdef NFS_DEBUG
-
-extern int nfs_debug;
-#define NFS_DEBUG_ASYNCIO	1 /* asynchronous i/o */
-#define NFS_DEBUG_WG		2 /* server write gathering */
-#define NFS_DEBUG_RC		4 /* server request caching */
-
-#define NFS_DPF(cat, args)					\
-	do {							\
-		if (nfs_debug & NFS_DEBUG_##cat) printf args;	\
-	} while (0)
-
-#else
-
-#define NFS_DPF(cat, args)
-
-#endif
-
-#endif	/* KERNEL */
-
-#endif
diff --git a/c/src/exec/libnetworking/nfs/nfsdiskless.h b/c/src/exec/libnetworking/nfs/nfsdiskless.h
deleted file mode 100644
index 0ed5c8f6f7..0000000000
--- a/c/src/exec/libnetworking/nfs/nfsdiskless.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Rick Macklem at The University of Guelph.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)nfsdiskless.h	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#ifndef _NFS_NFSDISKLESS_H_
-#define _NFS_NFSDISKLESS_H_
-
-/*
- * Structure that must be initialized for a diskless nfs client.
- * This structure is used by nfs_mountroot() to set up the root and swap
- * vnodes plus do a partial ifconfig(8) and route(8) so that the critical net
- * interface can communicate with the server.
- * The primary bootstrap is expected to fill in the appropriate fields before
- * starting the kernel. Whether or not the swap area is nfs mounted is determined
- * by the value in swdevt[0]. (equal to NODEV --> swap over nfs)
- * Currently only works for AF_INET protocols.
- * NB: All fields are stored in net byte order to avoid hassles with
- * client/server byte ordering differences.
- */
-
-/*
- * I have defined a new structure that can handle an NFS Version 3 file handle
- * but the kernel still expects the old Version 2 one to be provided. The
- * changes required in nfs_vfsops.c for using the new are documented there in
- * comments. (I felt that breaking network booting code by changing this
- * structure would not be prudent at this time, since almost all servers are
- * still Version 2 anyhow.)
- */
-struct nfsv3_diskless {
-	struct ifaliasreq myif;			/* Default interface */
-	struct sockaddr_in mygateway;		/* Default gateway */
-	struct nfs_args	swap_args;		/* Mount args for swap file */
-	int		swap_fhsize;		/* Size of file handle */
-	u_char		swap_fh[NFSX_V3FHMAX];	/* Swap file's file handle */
-	struct sockaddr_in swap_saddr;		/* Address of swap server */
-	char		swap_hostnam[MNAMELEN];	/* Host name for mount pt */
-	int		swap_nblks;		/* Size of server swap file */
-	struct ucred	swap_ucred;		/* Swap credentials */
-	struct nfs_args	root_args;		/* Mount args for root fs */
-	int		root_fhsize;		/* Size of root file handle */
-	u_char		root_fh[NFSX_V3FHMAX];	/* File handle of root dir */
-	struct sockaddr_in root_saddr;		/* Address of root server */
-	char		root_hostnam[MNAMELEN];	/* Host name for mount pt */
-	long		root_time;		/* Timestamp of root fs */
-	char		my_hostnam[MAXHOSTNAMELEN]; /* Client host name */
-};
-
-struct nfs_diskless {
-	struct ifaliasreq myif;			/* Default interface */
-	struct sockaddr_in mygateway;		/* Default gateway */
-	struct nfs_args	swap_args;		/* Mount args for swap file */
-	u_char		swap_fh[NFSX_V2FH];	/* Swap file's file handle */
-	struct sockaddr_in swap_saddr;		/* Address of swap server */
-	char		swap_hostnam[MNAMELEN];	/* Host name for mount pt */
-	int		swap_nblks;		/* Size of server swap file */
-	struct ucred	swap_ucred;		/* Swap credentials */
-	struct nfs_args	root_args;		/* Mount args for root fs */
-	u_char		root_fh[NFSX_V2FH];	/* File handle of root dir */
-	struct sockaddr_in root_saddr;		/* Address of root server */
-	char		root_hostnam[MNAMELEN];	/* Host name for mount pt */
-	long		root_time;		/* Timestamp of root fs */
-	char		my_hostnam[MAXHOSTNAMELEN]; /* Client host name */
-};
-
-#endif
diff --git a/c/src/exec/libnetworking/nfs/nfsproto.h b/c/src/exec/libnetworking/nfs/nfsproto.h
deleted file mode 100644
index 6ce7c5b960..0000000000
--- a/c/src/exec/libnetworking/nfs/nfsproto.h
+++ /dev/null
@@ -1,441 +0,0 @@
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Rick Macklem at The University of Guelph.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)nfsproto.h	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#ifndef _NFS_NFSPROTO_H_
-#define _NFS_NFSPROTO_H_
-
-/*
- * nfs definitions as per the Version 2 and 3 specs
- */
-
-/*
- * Constants as defined in the Sun NFS Version 2 and 3 specs.
- * "NFS: Network File System Protocol Specification" RFC1094
- * and in the "NFS: Network File System Version 3 Protocol
- * Specification"
- */
-
-#define NFS_PORT	2049
-#define	NFS_PROG	100003
-#define NFS_VER2	2
-#define	NFS_VER3	3
-#define NFS_V2MAXDATA	8192
-#define	NFS_MAXDGRAMDATA 16384
-#define	NFS_MAXDATA	32768
-#define	NFS_MAXPATHLEN	1024
-#define	NFS_MAXNAMLEN	255
-#define	NFS_MAXPKTHDR	404
-#define NFS_MAXPACKET	(NFS_MAXPKTHDR + NFS_MAXDATA)
-#define	NFS_MINPACKET	20
-#define	NFS_FABLKSIZE	512	/* Size in bytes of a block wrt fa_blocks */
-
-/* Stat numbers for rpc returns (version 2 and 3) */
-#define	NFS_OK			0
-#define	NFSERR_PERM		1
-#define	NFSERR_NOENT		2
-#define	NFSERR_IO		5
-#define	NFSERR_NXIO		6
-#define	NFSERR_ACCES		13
-#define	NFSERR_EXIST		17
-#define	NFSERR_XDEV		18	/* Version 3 only */
-#define	NFSERR_NODEV		19
-#define	NFSERR_NOTDIR		20
-#define	NFSERR_ISDIR		21
-#define	NFSERR_INVAL		22	/* Version 3 only */
-#define	NFSERR_FBIG		27
-#define	NFSERR_NOSPC		28
-#define	NFSERR_ROFS		30
-#define	NFSERR_MLINK		31	/* Version 3 only */
-#define	NFSERR_NAMETOL		63
-#define	NFSERR_NOTEMPTY		66
-#define	NFSERR_DQUOT		69
-#define	NFSERR_STALE		70
-#define	NFSERR_REMOTE		71	/* Version 3 only */
-#define	NFSERR_WFLUSH		99	/* Version 2 only */
-#define	NFSERR_BADHANDLE	10001	/* The rest Version 3 only */
-#define	NFSERR_NOT_SYNC		10002
-#define	NFSERR_BAD_COOKIE	10003
-#define	NFSERR_NOTSUPP		10004
-#define	NFSERR_TOOSMALL		10005
-#define	NFSERR_SERVERFAULT	10006
-#define	NFSERR_BADTYPE		10007
-#define	NFSERR_JUKEBOX		10008
-#define NFSERR_TRYLATER		NFSERR_JUKEBOX
-#define	NFSERR_STALEWRITEVERF	30001	/* Fake return for nfs_commit() */
-
-#define NFSERR_RETVOID		0x20000000 /* Return void, not error */
-#define NFSERR_AUTHERR		0x40000000 /* Mark an authentication error */
-#define NFSERR_RETERR		0x80000000 /* Mark an error return for V3 */
-
-/* Sizes in bytes of various nfs rpc components */
-#define	NFSX_UNSIGNED	4
-
-/* specific to NFS Version 2 */
-#define	NFSX_V2FH	32
-#define	NFSX_V2FATTR	68
-#define	NFSX_V2SATTR	32
-#define	NFSX_V2COOKIE	4
-#define NFSX_V2STATFS	20
-
-/* specific to NFS Version 3 */
-#define NFSX_V3FH		(sizeof (fhandle_t)) /* size this server uses */
-#define	NFSX_V3FHMAX		64	/* max. allowed by protocol */
-#define NFSX_V3FATTR		84
-#define NFSX_V3SATTR		60	/* max. all fields filled in */
-#define NFSX_V3SRVSATTR		(sizeof (struct nfsv3_sattr))
-#define NFSX_V3POSTOPATTR	(NFSX_V3FATTR + NFSX_UNSIGNED)
-#define NFSX_V3WCCDATA		(NFSX_V3POSTOPATTR + 8 * NFSX_UNSIGNED)
-#define NFSX_V3COOKIEVERF 	8
-#define NFSX_V3WRITEVERF 	8
-#define NFSX_V3CREATEVERF	8
-#define NFSX_V3STATFS		52
-#define NFSX_V3FSINFO		48
-#define NFSX_V3PATHCONF		24
-
-/* variants for both versions */
-#define NFSX_FH(v3)		((v3) ? (NFSX_V3FHMAX + NFSX_UNSIGNED) : \
-					NFSX_V2FH)
-#define NFSX_SRVFH(v3)		((v3) ? NFSX_V3FH : NFSX_V2FH)
-#define	NFSX_FATTR(v3)		((v3) ? NFSX_V3FATTR : NFSX_V2FATTR)
-#define NFSX_PREOPATTR(v3)	((v3) ? (7 * NFSX_UNSIGNED) : 0)
-#define NFSX_POSTOPATTR(v3)	((v3) ? (NFSX_V3FATTR + NFSX_UNSIGNED) : 0)
-#define NFSX_POSTOPORFATTR(v3)	((v3) ? (NFSX_V3FATTR + NFSX_UNSIGNED) : \
-					NFSX_V2FATTR)
-#define NFSX_WCCDATA(v3)	((v3) ? NFSX_V3WCCDATA : 0)
-#define NFSX_WCCORFATTR(v3)	((v3) ? NFSX_V3WCCDATA : NFSX_V2FATTR)
-#define	NFSX_SATTR(v3)		((v3) ? NFSX_V3SATTR : NFSX_V2SATTR)
-#define	NFSX_COOKIEVERF(v3)	((v3) ? NFSX_V3COOKIEVERF : 0)
-#define	NFSX_WRITEVERF(v3)	((v3) ? NFSX_V3WRITEVERF : 0)
-#define NFSX_READDIR(v3)	((v3) ? (5 * NFSX_UNSIGNED) : \
-					(2 * NFSX_UNSIGNED))
-#define	NFSX_STATFS(v3)		((v3) ? NFSX_V3STATFS : NFSX_V2STATFS)
-
-/* nfs rpc procedure numbers (before version mapping) */
-#define	NFSPROC_NULL		0
-#define	NFSPROC_GETATTR		1
-#define	NFSPROC_SETATTR		2
-#define	NFSPROC_LOOKUP		3
-#define	NFSPROC_ACCESS		4
-#define	NFSPROC_READLINK	5
-#define	NFSPROC_READ		6
-#define	NFSPROC_WRITE		7
-#define	NFSPROC_CREATE		8
-#define	NFSPROC_MKDIR		9
-#define	NFSPROC_SYMLINK		10
-#define	NFSPROC_MKNOD		11
-#define	NFSPROC_REMOVE		12
-#define	NFSPROC_RMDIR		13
-#define	NFSPROC_RENAME		14
-#define	NFSPROC_LINK		15
-#define	NFSPROC_READDIR		16
-#define	NFSPROC_READDIRPLUS	17
-#define	NFSPROC_FSSTAT		18
-#define	NFSPROC_FSINFO		19
-#define	NFSPROC_PATHCONF	20
-#define	NFSPROC_COMMIT		21
-
-/* And leasing (nqnfs) procedure numbers (must be last) */
-#define	NQNFSPROC_GETLEASE	22
-#define	NQNFSPROC_VACATED	23
-#define	NQNFSPROC_EVICTED	24
-
-#define NFSPROC_NOOP		25
-#define	NFS_NPROCS		26
-
-/* Actual Version 2 procedure numbers */
-#define	NFSV2PROC_NULL		0
-#define	NFSV2PROC_GETATTR	1
-#define	NFSV2PROC_SETATTR	2
-#define	NFSV2PROC_NOOP		3
-#define	NFSV2PROC_ROOT		NFSV2PROC_NOOP	/* Obsolete */
-#define	NFSV2PROC_LOOKUP	4
-#define	NFSV2PROC_READLINK	5
-#define	NFSV2PROC_READ		6
-#define	NFSV2PROC_WRITECACHE	NFSV2PROC_NOOP	/* Obsolete */
-#define	NFSV2PROC_WRITE		8
-#define	NFSV2PROC_CREATE	9
-#define	NFSV2PROC_REMOVE	10
-#define	NFSV2PROC_RENAME	11
-#define	NFSV2PROC_LINK		12
-#define	NFSV2PROC_SYMLINK	13
-#define	NFSV2PROC_MKDIR		14
-#define	NFSV2PROC_RMDIR		15
-#define	NFSV2PROC_READDIR	16
-#define	NFSV2PROC_STATFS	17
-
-/*
- * Constants used by the Version 3 protocol for various RPCs
- */
-#define NFSV3SATTRTIME_DONTCHANGE	0
-#define NFSV3SATTRTIME_TOSERVER		1
-#define NFSV3SATTRTIME_TOCLIENT		2
-
-#define NFSV3ACCESS_READ		0x01
-#define NFSV3ACCESS_LOOKUP		0x02
-#define NFSV3ACCESS_MODIFY		0x04
-#define NFSV3ACCESS_EXTEND		0x08
-#define NFSV3ACCESS_DELETE		0x10
-#define NFSV3ACCESS_EXECUTE		0x20
-
-#define NFSV3WRITE_UNSTABLE		0
-#define NFSV3WRITE_DATASYNC		1
-#define NFSV3WRITE_FILESYNC		2
-
-#define NFSV3CREATE_UNCHECKED		0
-#define NFSV3CREATE_GUARDED		1
-#define NFSV3CREATE_EXCLUSIVE		2
-
-#define NFSV3FSINFO_LINK		0x01
-#define NFSV3FSINFO_SYMLINK		0x02
-#define NFSV3FSINFO_HOMOGENEOUS		0x08
-#define NFSV3FSINFO_CANSETTIME		0x10
-
-/* Conversion macros */
-#define	vtonfsv2_mode(t,m) \
-		txdr_unsigned(((t) == VFIFO) ? MAKEIMODE(VCHR, (m)) : \
-				MAKEIMODE((t), (m)))
-#define vtonfsv3_mode(m)	txdr_unsigned((m) & 07777)
-#define	nfstov_mode(a)		(fxdr_unsigned(u_short, (a))&07777)
-#define	vtonfsv2_type(a)	txdr_unsigned(nfsv2_type[((long)(a))])
-#define	vtonfsv3_type(a)	txdr_unsigned(nfsv3_type[((long)(a))])
-#define	nfsv2tov_type(a)	nv2tov_type[fxdr_unsigned(u_long,(a))&0x7]
-#define	nfsv3tov_type(a)	nv3tov_type[fxdr_unsigned(u_long,(a))&0x7]
-
-/* File types */
-typedef enum { NFNON=0, NFREG=1, NFDIR=2, NFBLK=3, NFCHR=4, NFLNK=5,
-	NFSOCK=6, NFFIFO=7 } nfstype;
-
-/* Structs for common parts of the rpc's */
-/*
- * File Handle (32 bytes for version 2), variable up to 64 for version 3.
- * File Handles of up to NFS_SMALLFH in size are stored directly in the
- * nfs node, whereas larger ones are malloc'd. (This never happens when
- * NFS_SMALLFH is set to 64.)
- * NFS_SMALLFH should be in the range of 32 to 64 and be divisible by 4.
- */
-#ifndef NFS_SMALLFH
-#define NFS_SMALLFH	64
-#endif
-union nfsfh {
-	fhandle_t	fh_generic;
-	u_char		fh_bytes[NFS_SMALLFH];
-};
-typedef union nfsfh nfsfh_t;
-
-struct nfsv2_time {
-	u_long	nfsv2_sec;
-	u_long	nfsv2_usec;
-};
-typedef struct nfsv2_time	nfstime2;
-
-struct nfsv3_time {
-	u_long	nfsv3_sec;
-	u_long	nfsv3_nsec;
-};
-typedef struct nfsv3_time	nfstime3;
-
-/*
- * Quads are defined as arrays of 2 longs to ensure dense packing for the
- * protocol and to facilitate xdr conversion.
- */
-struct nfs_uquad {
-	u_long	nfsuquad[2];
-};
-typedef	struct nfs_uquad	nfsuint64;
-
-/*
- * Used to convert between two u_longs and a u_quad_t.
- */
-union nfs_quadconvert {
-	u_long		lval[2];
-	u_quad_t	qval;
-};
-typedef union nfs_quadconvert	nfsquad_t;
-
-/*
- * NFS Version 3 special file number.
- */
-struct nfsv3_spec {
-	u_long	specdata1;
-	u_long	specdata2;
-};
-typedef	struct nfsv3_spec	nfsv3spec;
-
-/*
- * File attributes and setable attributes. These structures cover both
- * NFS version 2 and the version 3 protocol. Note that the union is only
- * used so that one pointer can refer to both variants. These structures
- * go out on the wire and must be densely packed, so no quad data types
- * are used. (all fields are longs or u_longs or structures of same)
- * NB: You can't do sizeof(struct nfs_fattr), you must use the
- *     NFSX_FATTR(v3) macro.
- */
-struct nfs_fattr {
-	u_long	fa_type;
-	u_long	fa_mode;
-	u_long	fa_nlink;
-	u_long	fa_uid;
-	u_long	fa_gid;
-	union {
-		struct {
-			u_long		nfsv2fa_size;
-			u_long		nfsv2fa_blocksize;
-			u_long		nfsv2fa_rdev;
-			u_long		nfsv2fa_blocks;
-			u_long		nfsv2fa_fsid;
-			u_long		nfsv2fa_fileid;
-			nfstime2	nfsv2fa_atime;
-			nfstime2	nfsv2fa_mtime;
-			nfstime2	nfsv2fa_ctime;
-		} fa_nfsv2;
-		struct {
-			nfsuint64	nfsv3fa_size;
-			nfsuint64	nfsv3fa_used;
-			nfsv3spec	nfsv3fa_rdev;
-			nfsuint64	nfsv3fa_fsid;
-			nfsuint64	nfsv3fa_fileid;
-			nfstime3	nfsv3fa_atime;
-			nfstime3	nfsv3fa_mtime;
-			nfstime3	nfsv3fa_ctime;
-		} fa_nfsv3;
-	} fa_un;
-};
-
-/* and some ugly defines for accessing union components */
-#define	fa2_size		fa_un.fa_nfsv2.nfsv2fa_size
-#define	fa2_blocksize		fa_un.fa_nfsv2.nfsv2fa_blocksize
-#define	fa2_rdev		fa_un.fa_nfsv2.nfsv2fa_rdev
-#define	fa2_blocks		fa_un.fa_nfsv2.nfsv2fa_blocks
-#define	fa2_fsid		fa_un.fa_nfsv2.nfsv2fa_fsid
-#define	fa2_fileid		fa_un.fa_nfsv2.nfsv2fa_fileid
-#define	fa2_atime		fa_un.fa_nfsv2.nfsv2fa_atime
-#define	fa2_mtime		fa_un.fa_nfsv2.nfsv2fa_mtime
-#define	fa2_ctime		fa_un.fa_nfsv2.nfsv2fa_ctime
-#define	fa3_size		fa_un.fa_nfsv3.nfsv3fa_size
-#define	fa3_used		fa_un.fa_nfsv3.nfsv3fa_used
-#define	fa3_rdev		fa_un.fa_nfsv3.nfsv3fa_rdev
-#define	fa3_fsid		fa_un.fa_nfsv3.nfsv3fa_fsid
-#define	fa3_fileid		fa_un.fa_nfsv3.nfsv3fa_fileid
-#define	fa3_atime		fa_un.fa_nfsv3.nfsv3fa_atime
-#define	fa3_mtime		fa_un.fa_nfsv3.nfsv3fa_mtime
-#define	fa3_ctime		fa_un.fa_nfsv3.nfsv3fa_ctime
-
-struct nfsv2_sattr {
-	u_long		sa_mode;
-	u_long		sa_uid;
-	u_long		sa_gid;
-	u_long		sa_size;
-	nfstime2	sa_atime;
-	nfstime2	sa_mtime;
-};
-
-/*
- * NFS Version 3 sattr structure for the new node creation case.
- */
-struct nfsv3_sattr {
-	u_long		sa_modetrue;
-	u_long		sa_mode;
-	u_long		sa_uidtrue;
-	u_long		sa_uid;
-	u_long		sa_gidtrue;
-	u_long		sa_gid;
-	u_long		sa_sizefalse;
-	u_long		sa_atimetype;
-	nfstime3	sa_atime;
-	u_long		sa_mtimetype;
-	nfstime3	sa_mtime;
-};
-
-struct nfs_statfs {
-	union {
-		struct {
-			u_long		nfsv2sf_tsize;
-			u_long		nfsv2sf_bsize;
-			u_long		nfsv2sf_blocks;
-			u_long		nfsv2sf_bfree;
-			u_long		nfsv2sf_bavail;
-		} sf_nfsv2;
-		struct {
-			nfsuint64	nfsv3sf_tbytes;
-			nfsuint64	nfsv3sf_fbytes;
-			nfsuint64	nfsv3sf_abytes;
-			nfsuint64	nfsv3sf_tfiles;
-			nfsuint64	nfsv3sf_ffiles;
-			nfsuint64	nfsv3sf_afiles;
-			u_long		nfsv3sf_invarsec;
-		} sf_nfsv3;
-	} sf_un;
-};
-
-#define sf_tsize	sf_un.sf_nfsv2.nfsv2sf_tsize
-#define sf_bsize	sf_un.sf_nfsv2.nfsv2sf_bsize
-#define sf_blocks	sf_un.sf_nfsv2.nfsv2sf_blocks
-#define sf_bfree	sf_un.sf_nfsv2.nfsv2sf_bfree
-#define sf_bavail	sf_un.sf_nfsv2.nfsv2sf_bavail
-#define sf_tbytes	sf_un.sf_nfsv3.nfsv3sf_tbytes
-#define sf_fbytes	sf_un.sf_nfsv3.nfsv3sf_fbytes
-#define sf_abytes	sf_un.sf_nfsv3.nfsv3sf_abytes
-#define sf_tfiles	sf_un.sf_nfsv3.nfsv3sf_tfiles
-#define sf_ffiles	sf_un.sf_nfsv3.nfsv3sf_ffiles
-#define sf_afiles	sf_un.sf_nfsv3.nfsv3sf_afiles
-#define sf_invarsec	sf_un.sf_nfsv3.nfsv3sf_invarsec
-
-struct nfsv3_fsinfo {
-	u_long		fs_rtmax;
-	u_long		fs_rtpref;
-	u_long		fs_rtmult;
-	u_long		fs_wtmax;
-	u_long		fs_wtpref;
-	u_long		fs_wtmult;
-	u_long		fs_dtpref;
-	nfsuint64	fs_maxfilesize;
-	nfstime3	fs_timedelta;
-	u_long		fs_properties;
-};
-
-struct nfsv3_pathconf {
-	u_long		pc_linkmax;
-	u_long		pc_namemax;
-	u_long		pc_notrunc;
-	u_long		pc_chownrestricted;
-	u_long		pc_caseinsensitive;
-	u_long		pc_casepreserving;
-};
-
-#endif
diff --git a/c/src/exec/libnetworking/nfs/rpcv2.h b/c/src/exec/libnetworking/nfs/rpcv2.h
deleted file mode 100644
index 5fd6e7febf..0000000000
--- a/c/src/exec/libnetworking/nfs/rpcv2.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Rick Macklem at The University of Guelph.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)rpcv2.h	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#ifndef _NFS_RPCV2_H_
-#define _NFS_RPCV2_H_
-
-/*
- * Definitions for Sun RPC Version 2, from
- * "RPC: Remote Procedure Call Protocol Specification" RFC1057
- */
-
-/* Version # */
-#define	RPC_VER2	2
-
-/* Authentication */
-#define	RPCAUTH_NULL	0
-#define	RPCAUTH_UNIX	1
-#define	RPCAUTH_SHORT	2
-#define RPCAUTH_KERB4	4
-#define	RPCAUTH_NQNFS	300000
-#define	RPCAUTH_MAXSIZ	400
-#define	RPCVERF_MAXSIZ	12	/* For Kerb, can actually be 400 */
-#define	RPCAUTH_UNIXGIDS 16
-
-/*
- * Constants associated with authentication flavours.
- */
-#define RPCAKN_FULLNAME	0
-#define RPCAKN_NICKNAME	1
-
-/* Rpc Constants */
-#define	RPC_CALL	0
-#define	RPC_REPLY	1
-#define	RPC_MSGACCEPTED	0
-#define	RPC_MSGDENIED	1
-#define	RPC_PROGUNAVAIL	1
-#define	RPC_PROGMISMATCH	2
-#define	RPC_PROCUNAVAIL	3
-#define	RPC_GARBAGE	4		/* I like this one */
-#define	RPC_MISMATCH	0
-#define	RPC_AUTHERR	1
-
-/* Authentication failures */
-#define	AUTH_BADCRED	1
-#define	AUTH_REJECTCRED	2
-#define	AUTH_BADVERF	3
-#define	AUTH_REJECTVERF	4
-#define	AUTH_TOOWEAK	5		/* Give em wheaties */
-
-/* Sizes of rpc header parts */
-#define	RPC_SIZ		24
-#define	RPC_REPLYSIZ	28
-
-/* RPC Prog definitions */
-#define	RPCPROG_MNT	100005
-#define	RPCMNT_VER1	1
-#define	RPCMNT_VER3	3
-#define	RPCMNT_MOUNT	1
-#define	RPCMNT_DUMP	2
-#define	RPCMNT_UMOUNT	3
-#define	RPCMNT_UMNTALL	4
-#define	RPCMNT_EXPORT	5
-#define	RPCMNT_NAMELEN	255
-#define	RPCMNT_PATHLEN	1024
-#define	RPCPROG_NFS	100003
-
-/*
- * Structures used for RPCAUTH_KERB4.
- */
-struct nfsrpc_fullverf {
-	u_long		t1;
-	u_long		t2;
-	u_long		w2;
-};
-
-struct nfsrpc_fullblock {
-	u_long		t1;
-	u_long		t2;
-	u_long		w1;
-	u_long		w2;
-};
-
-struct nfsrpc_nickverf {
-	u_long			kind;
-	struct nfsrpc_fullverf	verf;
-};
-
-/*
- * and their sizes in bytes.. If sizeof (struct nfsrpc_xx) != these
- * constants, well then things will break in mount_nfs and nfsd.
- */
-#define RPCX_FULLVERF	12
-#define RPCX_FULLBLOCK	16
-#define RPCX_NICKVERF	16
-
-#ifdef NFSKERB
-XXX
-#else
-typedef u_char			NFSKERBKEY_T[2];
-typedef u_char			NFSKERBKEYSCHED_T[2];
-#endif
-#define NFS_KERBSRV	"rcmd"		/* Kerberos Service for NFS */
-#define NFS_KERBTTL	(30 * 60)	/* Credential ttl (sec) */
-#define NFS_KERBCLOCKSKEW (5 * 60)	/* Clock skew (sec) */
-#define NFS_KERBW1(t)	(*((u_long *)(&((t).dat[((t).length + 3) & ~0x3]))))
-#endif
diff --git a/c/src/exec/libnetworking/nfs/xdr_subs.h b/c/src/exec/libnetworking/nfs/xdr_subs.h
deleted file mode 100644
index 874730378f..0000000000
--- a/c/src/exec/libnetworking/nfs/xdr_subs.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Rick Macklem at The University of Guelph.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)xdr_subs.h	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#ifndef _NFS_XDR_SUBS_H_
-#define _NFS_XDR_SUBS_H_
-
-/*
- * Macros used for conversion to/from xdr representation by nfs...
- * These use the MACHINE DEPENDENT routines ntohl, htonl
- * As defined by "XDR: External Data Representation Standard" RFC1014
- *
- * To simplify the implementation, we use ntohl/htonl even on big-endian
- * machines, and count on them being `#define'd away.  Some of these
- * might be slightly more efficient as quad_t copies on a big-endian,
- * but we cannot count on their alignment anyway.
- */
-
-#define	fxdr_unsigned(t, v)	((t)ntohl((long)(v)))
-#define	txdr_unsigned(v)	(htonl((long)(v)))
-
-#define	fxdr_nfsv2time(f, t) { \
-	(t)->tv_sec = ntohl(((struct nfsv2_time *)(f))->nfsv2_sec); \
-	if (((struct nfsv2_time *)(f))->nfsv2_usec != 0xffffffff) \
-		(t)->tv_nsec = 1000 * ntohl(((struct nfsv2_time *)(f))->nfsv2_usec); \
-	else \
-		(t)->tv_nsec = 0; \
-}
-#define	txdr_nfsv2time(f, t) { \
-	((struct nfsv2_time *)(t))->nfsv2_sec = htonl((f)->tv_sec); \
-	if ((f)->tv_nsec != -1) \
-		((struct nfsv2_time *)(t))->nfsv2_usec = htonl((f)->tv_nsec / 1000); \
-	else \
-		((struct nfsv2_time *)(t))->nfsv2_usec = 0xffffffff; \
-}
-
-#define	fxdr_nfsv3time(f, t) { \
-	(t)->tv_sec = ntohl(((struct nfsv3_time *)(f))->nfsv3_sec); \
-	(t)->tv_nsec = ntohl(((struct nfsv3_time *)(f))->nfsv3_nsec); \
-}
-#define	txdr_nfsv3time(f, t) { \
-	((struct nfsv3_time *)(t))->nfsv3_sec = htonl((f)->tv_sec); \
-	((struct nfsv3_time *)(t))->nfsv3_nsec = htonl((f)->tv_nsec); \
-}
-
-#define	fxdr_hyper(f, t) { \
-	((long *)(t))[_QUAD_HIGHWORD] = ntohl(((long *)(f))[0]); \
-	((long *)(t))[_QUAD_LOWWORD] = ntohl(((long *)(f))[1]); \
-}
-#define	txdr_hyper(f, t) { \
-	((long *)(t))[0] = htonl(((long *)(f))[_QUAD_HIGHWORD]); \
-	((long *)(t))[1] = htonl(((long *)(f))[_QUAD_LOWWORD]); \
-}
-
-#endif
diff --git a/c/src/exec/libnetworking/opt_ipfw.h b/c/src/exec/libnetworking/opt_ipfw.h
deleted file mode 100644
index 5a6ee0337b..0000000000
--- a/c/src/exec/libnetworking/opt_ipfw.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/*
- *  $Id$
- */
-
-/* intentionally empty file */
-
diff --git a/c/src/exec/libnetworking/opt_mrouting.h b/c/src/exec/libnetworking/opt_mrouting.h
deleted file mode 100644
index 5a6ee0337b..0000000000
--- a/c/src/exec/libnetworking/opt_mrouting.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/*
- *  $Id$
- */
-
-/* intentionally empty file */
-
diff --git a/c/src/exec/libnetworking/opt_tcpdebug.h b/c/src/exec/libnetworking/opt_tcpdebug.h
deleted file mode 100644
index 5a6ee0337b..0000000000
--- a/c/src/exec/libnetworking/opt_tcpdebug.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/*
- *  $Id$
- */
-
-/* intentionally empty file */
-
diff --git a/c/src/exec/libnetworking/poll.h b/c/src/exec/libnetworking/poll.h
deleted file mode 100644
index 74dfca76c1..0000000000
--- a/c/src/exec/libnetworking/poll.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/*-
- * Copyright (c) 1997 Peter Wemm <peter@freebsd.org>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	$Id$
- */
-
-#ifndef _SYS_POLL_H_
-#define	_SYS_POLL_H_
-
-/*
- * This file is intended to be compatable with the traditional poll.h.
- */
-
-/*
- * This structure is passed as an array to poll(2).
- */
-struct pollfd {
-	int	fd;		/* which file descriptor to poll */
-	short	events;		/* events we are interested in */
-	short	revents;	/* events found on return */
-};
-
-/*
- * Requestable events.  If poll(2) finds any of these set, they are
- * copied to revents on return.
- * XXX Note that FreeBSD doesn't make much distinction between POLLPRI
- * and POLLRDBAND since none of the file types have distinct priority
- * bands - and only some have an urgent "mode".
- * XXX Note POLLIN isn't really supported in true SVSV terms.  Under SYSV
- * POLLIN includes all of normal, band and urgent data.  Most poll handlers
- * on FreeBSD only treat it as "normal" data.
- */
-#define	POLLIN		0x0001		/* any readable data available */
-#define	POLLPRI		0x0002		/* OOB/Urgent readable data */
-#define	POLLOUT		0x0004		/* file descriptor is writeable */
-#define	POLLRDNORM	0x0040		/* non-OOB/URG data available */
-#define	POLLWRNORM	POLLOUT		/* no write type differentiation */
-#define	POLLRDBAND	0x0080		/* OOB/Urgent readable data */
-#define	POLLWRBAND	0x0100		/* OOB/Urgent data can be written */
-
-/*
- * FreeBSD extensions: polling on a regular file might return one
- * of these events (currently only supported on UFS).
- */
-#define	POLLEXTEND	0x0200		/* file may have been extended */
-#define	POLLATTRIB	0x0400		/* file attributes may have changed */
-#define	POLLNLINK	0x0800		/* (un)link/rename may have happened */
-#define	POLLWRITE	0x1000		/* file's contents may have changed */
-
-/*
- * These events are set if they occur regardless of whether they were
- * requested.
- */
-#define	POLLERR		0x0008		/* some poll error occurred */
-#define	POLLHUP		0x0010		/* file descriptor was "hung up" */
-#define	POLLNVAL	0x0020		/* requested events "invalid" */
-
-#define	POLLSTANDARD	(POLLIN|POLLPRI|POLLOUT|POLLRDNORM|POLLRDBAND|\
-			 POLLWRBAND|POLLERR|POLLHUP|POLLNVAL)
-
-/*
- * Request that poll() wait forever.
- * XXX in SYSV, this is defined in stropts.h, which is not included
- * by poll.h.
- */
-#define	INFTIM		(-1)
-
-#ifndef KERNEL
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-/*
- * XXX logically, poll() should be declared in <poll.h>, but SVR4 at
- * least has it here in <sys/poll.h>.
- * XXX poll() has "unsigned long" nfds on SVR4, not unsigned as on the
- * other BSDs.
- */
-int	poll __P((struct pollfd *_pfd, unsigned _nfds, int _timeout));
-__END_DECLS
-
-#endif /* !KERNEL */
-
-#endif /* !_SYS_POLL_H_ */
diff --git a/c/src/exec/libnetworking/resolv.h b/c/src/exec/libnetworking/resolv.h
deleted file mode 100644
index 614f204706..0000000000
--- a/c/src/exec/libnetworking/resolv.h
+++ /dev/null
@@ -1,306 +0,0 @@
-/*-
- * Copyright (c) 1983, 1987, 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * Portions Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-/*
- *	@(#)resolv.h	8.1 (Berkeley) 6/2/93
- *	From Id: resolv.h,v 8.12 1998/04/28 19:36:46 halley Exp $
- *	$Id$
- */
-
-#ifndef _RESOLV_H_
-#define	_RESOLV_H_
-
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/cdefs.h>
-#include <stdio.h>
-
-/*
- * Revision information.  This is the release date in YYYYMMDD format.
- * It can change every day so the right thing to do with it is use it
- * in preprocessor commands such as "#if (__RES > 19931104)".  Do not
- * compare for equality; rather, use it to determine whether your resolver
- * is new enough to contain a certain feature.
- */
-
-#define	__RES	19960801
-
-/*
- * This used to be defined in res_query.c, now it's in herror.c.  It was
- * never extern'd by any *.h file before it was placed here.  herror.c is
- * part of libresolv.a even though it might make more sense in libnetdb.a
- * or even libnet.a.
- */
-
-extern int h_errno;
-
-/*
- * Resolver configuration file.
- * Normally not present, but may contain the address of the
- * inital name server(s) to query and the domain search list.
- */
-
-#ifndef _PATH_RESCONF
-#define	_PATH_RESCONF        "/etc/resolv.conf"
-#endif
-
-/*
- * Global defines and variables for resolver stub.
- */
-#define	MAXNS			3	/* max # name servers we'll track */
-#define	MAXDFLSRCH		3	/* # default domain levels to try */
-#define	MAXDNSRCH		6	/* max # domains in search path */
-#define	LOCALDOMAINPARTS	2	/* min levels in name that is "local" */
-
-#define	RES_TIMEOUT		5	/* min. seconds between retries */
-#define	MAXRESOLVSORT		10	/* number of net to sort on */
-#define	RES_MAXNDOTS		15	/* should reflect bit field size */
-
-struct __res_state {
-	int	retrans;	 	/* retransmition time interval */
-	int	retry;			/* number of times to retransmit */
-	u_long	options;		/* option flags - see below. */
-	int	nscount;		/* number of name servers */
-	struct sockaddr_in
-		nsaddr_list[MAXNS];	/* address of name server */
-#define	nsaddr	nsaddr_list[0]		/* for backward compatibility */
-	u_short	id;			/* current message id */
-	char	*dnsrch[MAXDNSRCH+1];	/* components of domain to search */
-	char	defdname[256];		/* default domain (deprecated) */
-	u_long	pfcode;			/* RES_PRF_ flags - see below. */
-	unsigned ndots:4;		/* threshold for initial abs. query */
-	unsigned nsort:4;		/* number of elements in sort_list[] */
-	char	unused[3];
-	struct {
-		struct in_addr	addr;
-		u_int32_t	mask;
-	} sort_list[MAXRESOLVSORT];
-	char	pad[72];		/* on an i386 this means 512b total */
-};
-
-/*
- * Resolver options (keep these in synch with res_debug.c, please)
- */
-#define RES_INIT	0x00000001	/* address initialized */
-#define RES_DEBUG	0x00000002	/* print debug messages */
-#define RES_AAONLY	0x00000004	/* authoritative answers only (!IMPL)*/
-#define RES_USEVC	0x00000008	/* use virtual circuit */
-#define RES_PRIMARY	0x00000010	/* query primary server only (!IMPL) */
-#define RES_IGNTC	0x00000020	/* ignore truncation errors */
-#define RES_RECURSE	0x00000040	/* recursion desired */
-#define RES_DEFNAMES	0x00000080	/* use default domain name */
-#define RES_STAYOPEN	0x00000100	/* Keep TCP socket open */
-#define RES_DNSRCH	0x00000200	/* search up local domain tree */
-#define	RES_INSECURE1	0x00000400	/* type 1 security disabled */
-#define	RES_INSECURE2	0x00000800	/* type 2 security disabled */
-#define	RES_NOALIASES	0x00001000	/* shuts off HOSTALIASES feature */
-#define	RES_USE_INET6	0x00002000	/* use/map IPv6 in gethostbyname() */
-#define	RES_NOTLDQUERY	0x00004000	/* Don't query TLD names */
-
-#define RES_DEFAULT	(RES_RECURSE | RES_DEFNAMES | RES_DNSRCH)
-
-/*
- * Resolver "pfcode" values.  Used by dig.
- */
-#define	RES_PRF_STATS	0x00000001
-#define	RES_PRF_UPDATE	0x00000002
-#define	RES_PRF_CLASS   0x00000004
-#define	RES_PRF_CMD	0x00000008
-#define	RES_PRF_QUES	0x00000010
-#define	RES_PRF_ANS	0x00000020
-#define	RES_PRF_AUTH	0x00000040
-#define	RES_PRF_ADD	0x00000080
-#define	RES_PRF_HEAD1	0x00000100
-#define	RES_PRF_HEAD2	0x00000200
-#define	RES_PRF_TTLID	0x00000400
-#define	RES_PRF_HEADX	0x00000800
-#define	RES_PRF_QUERY	0x00001000
-#define	RES_PRF_REPLY	0x00002000
-#define	RES_PRF_INIT    0x00004000
-/*			0x00008000	*/
-
-typedef enum { res_goahead, res_nextns, res_modified, res_done, res_error }
-	res_sendhookact;
-
-typedef res_sendhookact (*res_send_qhook)__P((struct sockaddr_in * const *ns,
-					      const u_char **query,
-					      int *querylen,
-					      u_char *ans,
-					      int anssiz,
-					      int *resplen));
-
-typedef res_sendhookact (*res_send_rhook)__P((const struct sockaddr_in *ns,
-					      const u_char *query,
-					      int querylen,
-					      u_char *ans,
-					      int anssiz,
-					      int *resplen));
-
-struct res_sym {
-	int	number;		/* Identifying number, like T_MX */
-	char *	name;		/* Its symbolic name, like "MX" */
-	char *	humanname;	/* Its fun name, like "mail exchanger" */
-};
-
-extern struct __res_state _res;
-extern const struct res_sym __p_class_syms[];
-extern const struct res_sym __p_type_syms[];
-
-/* Private routines shared between libc/net, named, nslookup and others. */
-#define	res_hnok	__res_hnok
-#define	res_ownok	__res_ownok
-#define	res_mailok	__res_mailok
-#define	res_dnok	__res_dnok
-#define	sym_ston	__sym_ston
-#define	sym_ntos	__sym_ntos
-#define	sym_ntop	__sym_ntop
-#define	b64_ntop	__b64_ntop
-#define	b64_pton	__b64_pton
-#define	loc_ntoa	__loc_ntoa
-#define	loc_aton	__loc_aton
-#define	fp_resstat	__fp_resstat
-#define	p_query		__p_query
-#define	dn_skipname	__dn_skipname
-#define	fp_resstat	__fp_resstat
-#define	fp_query	__fp_query
-#define	fp_nquery	__fp_nquery
-#define	hostalias	__hostalias
-#define	putlong		__putlong
-#define	putshort	__putshort
-#define	p_class		__p_class
-#define	p_time		__p_time
-#define	p_type		__p_type
-#define	p_query		__p_query
-#define	p_cdnname	__p_cdnname
-#define	p_section	__p_section
-#define	p_cdname	__p_cdname
-#define	p_fqnname	__p_fqnname
-#define	p_fqname	__p_fqname
-#define	p_option	__p_option
-#define	p_secstodate	__p_secstodate
-#define	dn_count_labels	__dn_count_labels
-#define	dn_comp		__dn_comp
-#define	dn_expand	__dn_expand
-#define	res_init	__res_init
-#define	res_randomid	__res_randomid
-#define	res_query	__res_query
-#define	res_search	__res_search
-#define	res_querydomain	__res_querydomain
-#define	res_mkquery	__res_mkquery
-#define	res_send	__res_send
-#define	res_isourserver	__res_isourserver
-#define	res_nameinquery	__res_nameinquery
-#define	res_queriesmatch __res_queriesmatch
-#define	res_close	__res_close
-#define	res_mkupdate	__res_mkupdate
-#define	res_mkupdrec	__res_mkupdrec
-#define	res_freeupdrec	__res_freeupdrec
-
-__BEGIN_DECLS
-int		res_hnok __P((const char *));
-int		res_ownok __P((const char *));
-int		res_mailok __P((const char *));
-int		res_dnok __P((const char *));
-int		sym_ston __P((const struct res_sym *, const char *, int *));
-const char *	sym_ntos __P((const struct res_sym *, int, int *));
-const char *	sym_ntop __P((const struct res_sym *, int, int *));
-int		b64_ntop __P((u_char const *, size_t, char *, size_t));
-int		b64_pton __P((char const *, u_char *, size_t));
-int		loc_aton __P((const char *, u_char *));
-const char *	loc_ntoa __P((const u_char *, char *));
-int		dn_skipname __P((const u_char *, const u_char *));
-void		fp_resstat __P((struct __res_state *, FILE *));
-void		fp_query __P((const u_char *, FILE *));
-void		fp_nquery __P((const u_char *, int, FILE *));
-const char *	hostalias __P((const char *));
-void		putlong __P((u_int32_t, u_char *));
-void		putshort __P((u_int16_t, u_char *));
-const char *	p_class __P((int));
-const char *	p_time __P((u_int32_t));
-const char *	p_type __P((int));
-void		p_query __P((const u_char *));
-const u_char *	p_cdnname __P((const u_char *, const u_char *, int, FILE *));
-const u_char *	p_cdname __P((const u_char *, const u_char *, FILE *));
-const u_char *	p_fqnname __P((const u_char *, const u_char *,
-			       int, char *, int));
-const u_char *	p_fqname __P((const u_char *, const u_char *, FILE *));
-const char *	p_option __P((u_long));
-char *		p_secstodate __P((u_long));
-int		dn_count_labels __P((const char *));
-int		dn_comp __P((const char *, u_char *, int,
-			     u_char **, u_char **));
-int		dn_expand __P((const u_char *, const u_char *, const u_char *,
-			       char *, int));
-int		res_init __P((void));
-u_int		res_randomid __P((void));
-int		res_query __P((const char *, int, int, u_char *, int));
-int		res_search __P((const char *, int, int, u_char *, int));
-int		res_querydomain __P((const char *, const char *, int, int,
-				     u_char *, int));
-int		res_mkquery __P((int, const char *, int, int, const u_char *,
-				 int, const u_char *, u_char *, int));
-int		res_send __P((const u_char *, int, u_char *, int));
-int		res_isourserver __P((const struct sockaddr_in *));
-int		res_nameinquery __P((const char *, int, int,
-				     const u_char *, const u_char *));
-int		res_queriesmatch __P((const u_char *, const u_char *,
-				      const u_char *, const u_char *));
-void		res_close __P((void));
-const char *	p_section __P((int, int));
-/* XXX The following depend on the ns_updrec typedef in arpa/nameser.h */
-#ifdef _ARPA_NAMESER_H_
-int		res_update __P((ns_updrec *));
-int		res_mkupdate __P((ns_updrec *, u_char *, int));
-ns_updrec *	res_mkupdrec __P((int, const char *, u_int, u_int, u_long));
-void		res_freeupdrec __P((ns_updrec *));
-#endif
-__END_DECLS
-
-#endif /* !_RESOLV_H_ */
diff --git a/c/src/exec/libnetworking/rtems/issetugid.c b/c/src/exec/libnetworking/rtems/issetugid.c
deleted file mode 100644
index 3baf0ec88b..0000000000
--- a/c/src/exec/libnetworking/rtems/issetugid.c
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Dummy version of BSD routine
- *
- *  $Id$
- */
-
-int
-issetugid (void)
-{
-	return 0;
-}
diff --git a/c/src/exec/libnetworking/rtems/rtems_bootp.c b/c/src/exec/libnetworking/rtems/rtems_bootp.c
deleted file mode 100644
index 47e3db758f..0000000000
--- a/c/src/exec/libnetworking/rtems/rtems_bootp.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- *  $Id$
- */
-
-#include <rtems.h>
-#include <rtems/error.h>
-#include <sys/types.h>
-#include <rtems/rtems_bsdnet.h>
-
-/*
- * Perform a BOOTP request
- */
-void
-rtems_bsdnet_do_bootp (void)
-{
-	rtems_bsdnet_semaphore_obtain ();
-	bootpc_init ();
-	rtems_bsdnet_semaphore_release ();
-}
diff --git a/c/src/exec/libnetworking/rtems/rtems_bsdnet.h b/c/src/exec/libnetworking/rtems/rtems_bsdnet.h
deleted file mode 100644
index 73ad92fa30..0000000000
--- a/c/src/exec/libnetworking/rtems/rtems_bsdnet.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- *  $Id$
- */
-
-#ifndef _RTEMS_BSDNET_
-#define _RTEMS_BSDNET_
-
-#include <rtems.h>
-
-/*
- * Values that may be obtained by BOOTP
- */
-extern struct in_addr rtems_bsdnet_bootp_server_address;
-extern char *rtems_bsdnet_bootp_boot_file_name;
-
-/*
- * Manipulate routing tables
- */
-struct sockaddr;
-struct rtentry;
-int rtems_bsdnet_rtrequest (
-    int req,
-    struct sockaddr *dst,
-    struct sockaddr *gateway,
-    struct sockaddr *netmask,
-    int flags,
-    struct rtentry **net_nrt);
-
-/*
- * Diagnostics
- */
-void rtems_bsdnet_show_inet_routes (void);
-void rtems_bsdnet_show_mbuf_stats (void);
-void rtems_bsdnet_show_if_stats (void);
-void rtems_bsdnet_show_ip_stats (void);
-void rtems_bsdnet_show_icmp_stats (void);
-void rtems_bsdnet_show_udp_stats (void);
-void rtems_bsdnet_show_tcp_stats (void);
-
-/*
- * Network configuration
- */
-struct rtems_bsdnet_ifconfig {
-	/*
-	 * These two entries must be supplied for each interface.
-	 */
-	char		*name;
-	int		(*attach)(struct rtems_bsdnet_ifconfig *conf);
-
-	/*
-	 * Link to next interface
-	 */
-	struct rtems_bsdnet_ifconfig *next;
-
-	/*
-	 * The following entries may be obtained
-	 * from BOOTP or explicitily supplied.
-	 */
-	char		*ip_address;
-	char		*ip_netmask;
-	void		*hardware_address;
-
-	/*
-	 * The driver assigns defaults values to the following
-	 * entries if they are not explicitly supplied.
-	 */
-	int		ignore_broadcast;
-	int		mtu;
-	int		rbuf_count;
-	int		xbuf_count;
-
-	/*
-	 * For external ethernet controller board the following
-	 * parameters are needed
-	 */
-	unsigned int	port;   /* port of the board */
-	unsigned int	irno;   /* irq of the board */
-	unsigned int	bpar;   /* memory of the board */
-
-};
-
-struct rtems_bsdnet_config {
-	/*
-	 * This entry points to the head of the ifconfig chain.
-	 */
-	struct rtems_bsdnet_ifconfig *ifconfig;
-
-	/*
-	 * This entry should be rtems_bsdnet_do_bootp if BOOTP
-	 * is being used to configure the network, and NULL
-	 * if BOOTP is not being used.
-	 */
-	void			(*bootp)(void);
-
-	/*
-	 * The remaining items can be initialized to 0, in
-	 * which case the default value will be used.
-	 */
-	rtems_task_priority	network_task_priority;	/* 100		*/
-	unsigned long		mbuf_bytecount;		/* 64 kbytes	*/
-	unsigned long		mbuf_cluster_bytecount;	/* 128 kbytes	*/
-	char			*hostname;		/* BOOTP	*/
-	char			*domainname;		/* BOOTP	*/
-	char			*gateway;		/* BOOTP	*/
-	char			*log_host;		/* BOOTP	*/
-	char			*name_server[3];	/* BOOTP	*/
-};
-extern struct rtems_bsdnet_config rtems_bsdnet_config;
-int rtems_bsdnet_initialize_network (void);
-void rtems_bsdnet_do_bootp (void);
-
-#endif /* _RTEMS_BSDNET_ */
diff --git a/c/src/exec/libnetworking/rtems/rtems_bsdnet_internal.h b/c/src/exec/libnetworking/rtems/rtems_bsdnet_internal.h
deleted file mode 100644
index 559bafd4c5..0000000000
--- a/c/src/exec/libnetworking/rtems/rtems_bsdnet_internal.h
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * Declarations to fit FreeBSD to RTEMS.
- *
- *******************************************************************
- *                            WARNING                              *
- * This file should *never* be included by any application program *
- *******************************************************************
- *
- *  $Id$
- */
-
-#ifndef _RTEMS_BSDNET_INTERNAL_H_
-#define _RTEMS_BSDNET_INTERNAL_H_
-
-typedef	unsigned int		vm_offset_t;
-typedef	long long		vm_ooffset_t;
-typedef	unsigned int		vm_pindex_t;
-typedef	unsigned int		vm_size_t;
-
-#define _BSD_OFF_T_	rtems_signed32
-#define _BSD_PID_T_	rtems_id
-#define _BSD_VA_LIST_	char *
-
-/* make sure we get the network versions of these */
-#include "../machine/types.h"
-#include "../machine/param.h"
-
-#include <sys/time.h>
-struct  itimerval {
-  struct  timeval it_interval;
-  struct  timeval it_value;
-};
-struct mdproc {
-	int	md_flags;
-	int	*md_regs;
-};
-
-#define USHRT_MAX	65535
-
-/*
- * Other RTEMS/BSD glue
- */
-struct socket;
-extern void soconnsleep (struct socket *so);
-extern void soconnwakeup (struct socket *so);
-#define splnet()	0
-#define splimp()	0
-#define splx(_s)	do { (_s) = 0; } while(0)
-
-#define ovbcopy(f,t,n) bcopy(f,t,n)
-#define copyout(f,t,n) (memcpy(t,f,n),0)
-#define copyin(f,t,n) (memcpy(t,f,n),0)
-
-#define random()	rtems_bsdnet_random()
-#define panic	rtems_panic
-#define suser(a,b)	0
-
-void	microtime (struct timeval *tv);
-#define hz rtems_bsdnet_ticks_per_second
-#define tick rtems_bsdnet_microseconds_per_tick
-
-#define SHRT_MAX 65535
-
-#define log	rtems_bsdnet_log
-
-/*
- * Since we can't have two sys/types.h files, we'll hack around
- * and copy the contents of the BSD sys/types.h to here....
- */
-#include <sys/cdefs.h>
-
-typedef	u_int64_t	u_quad_t;	/* quads */
-typedef	int64_t		quad_t;
-typedef	quad_t *	qaddr_t;
-
-typedef void __sighandler_t __P((int));
-typedef	__sighandler_t	*sig_t;	/* type of pointer to a signal function */
-#define NSIG    32
-struct	sigaltstack {
-	char	*ss_sp;			/* signal stack base */
-	int	ss_size;		/* signal stack length */
-	int	ss_flags;		/* SS_DISABLE and/or SS_ONSTACK */
-};
-
-#ifdef KERNEL
-typedef	int		boolean_t;
-typedef	struct vm_page	*vm_page_t;
-#endif
-
-#ifndef _POSIX_SOURCE
-/*
- * minor() gives a cookie instead of an index since we don't want to
- * change the meanings of bits 0-15 or waste time and space shifting
- * bits 16-31 for devices that don't use them.
- */
-#define	major(x)	((int)(((u_int)(x) >> 8)&0xff))	/* major number */
-#define	minor(x)	((int)((x)&0xffff00ff))		/* minor number */
-#define	makedev(x,y)	((dev_t)(((x) << 8) | (y)))	/* create dev_t */
-#endif
-
-#include <machine/endian.h>
-
-typedef quad_t          rlim_t;         /* resource limit */
-typedef	u_int32_t	fixpt_t;	/* fixed point number */
-
-/*
- * Forward structure declarations for function prototypes.  We include the
- * common structures that cross subsystem boundaries here; others are mostly
- * used in the same place that the structure is defined.
- */
-struct	proc;
-struct	pgrp;
-struct	ucred;
-struct	rusage;
-struct	file;
-struct	buf;
-struct	tty;
-struct	uio;
-
-/*
- * Redo kernel memory allocation
- */
-#define malloc rtems_bsdnet_malloc
-#define free rtems_bsdnet_free
-
-#define	M_NOWAIT	0x0001
-void *rtems_bsdnet_malloc (unsigned long size, int type, int flags);
-void rtems_bsdnet_free (void *addr, int type);
-
-void rtems_bsdnet_semaphore_obtain (void);
-void rtems_bsdnet_semaphore_release (void);
-void rtems_bsdnet_schednetisr (int n);
-
-unsigned long rtems_bsdnet_seconds_since_boot (void);
-unsigned long rtems_bsdnet_random (void);
-
-rtems_id rtems_bsdnet_newproc (
-  char  *name,
-  int   stacksize,
-  void  (*entry)(void *),
-  void  *arg
-);
-
-rtems_status_code rtems_bsdnet_event_receive (
-  rtems_event_set  event_in,
-  rtems_option     option_set,
-  rtems_interval   ticks,
-  rtems_event_set *event_out
-);
-
-/*
- * Network configuration
- */
-extern int rtems_bsdnet_ticks_per_second;
-extern int rtems_bsdnet_microseconds_per_tick;
-extern struct in_addr rtems_bsdnet_log_host_address;
-extern char *rtems_bsdnet_domain_name;
-extern struct in_addr rtems_bsdnet_nameserver[];
-extern int rtems_bsdnet_nameserver_count;
-
-/*
- * Internal IOCTL command
- */
-#define SIO_RTEMS_SHOW_STATS	_IO('i', 250)
-
-/*
- * Some extra prototypes
- */
-int sethostname (char *name, int namelen);
-void domaininit (void *);
-void ifinit (void *);
-void ipintr (void);
-void arpintr (void);
-void bootpc_init(void);
-int socket (int, int, int);
-int ioctl (int, unsigned long, ...);
-
-#endif /* _RTEMS_BSDNET_INTERNAL_H_ */
diff --git a/c/src/exec/libnetworking/rtems/rtems_glue.c b/c/src/exec/libnetworking/rtems/rtems_glue.c
deleted file mode 100644
index dd80a13d08..0000000000
--- a/c/src/exec/libnetworking/rtems/rtems_glue.c
+++ /dev/null
@@ -1,905 +0,0 @@
-/*
- *  $Id$
- */
-
-#include <string.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <errno.h>
-
-#include <rtems.h>
-#include <rtems/libio.h>
-#include <rtems/error.h>
-#include <rtems/rtems_bsdnet.h>
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/domain.h>
-#include <sys/mbuf.h>
-#include <sys/socketvar.h>
-#include <sys/socket.h>
-#include <sys/sockio.h>
-#include <sys/callout.h>
-#include <sys/proc.h>
-#include <sys/ioctl.h>
-#include <net/if.h>
-#include <net/route.h>
-#include <netinet/in.h>
-#include <vm/vm.h>
-#include <arpa/inet.h>
-
-#include <net/netisr.h>
-#include <net/route.h>
-
-/*
- * Events used by networking routines.
- * Everything will break if the application
- * tries to use these events or if the `sleep'
- * events are equal to any of the NETISR * events.
- */
-#define SBWAIT_EVENT	RTEMS_EVENT_24
-#define SOSLEEP_EVENT	RTEMS_EVENT_25
-#define NETISR_IP_EVENT		(1 << NETISR_IP)
-#define NETISR_ARP_EVENT	(1 << NETISR_ARP)
-#define NETISR_EVENTS	(NETISR_IP_EVENT|NETISR_ARP_EVENT)
-
-
-/*
- * Memory allocation
- */
-static int nmbuf	= (64 * 1024) / MSIZE;
-       int nmbclusters	= (128 * 1024) / MCLBYTES;
-
-/*
- * Socket buffering parameters
- */
-unsigned long sb_efficiency = 8;
-
-/*
- * Network task synchronization
- */
-static rtems_id networkSemaphore;
-static rtems_id networkDaemonTid;
-static rtems_unsigned32 networkDaemonPriority;
-static void networkDaemon (void *task_argument);
-
-/*
- * Network timing
- */
-int			rtems_bsdnet_ticks_per_second;
-int			rtems_bsdnet_microseconds_per_tick;
-
-/*
- * Callout processing
- */
-static rtems_interval	ticksWhenCalloutsLastChecked;
-static struct callout *callfree, calltodo;
-
-/*
- * FreeBSD variables
- */
-int nfs_diskless_valid;
-
-/*
- * BOOTP values
- */
-struct in_addr rtems_bsdnet_log_host_address;
-struct in_addr rtems_bsdnet_bootp_server_address;
-char *rtems_bsdnet_bootp_boot_file_name;
-char *rtems_bsdnet_domain_name;
-struct in_addr rtems_bsdnet_nameserver[sizeof rtems_bsdnet_config.name_server /
-			sizeof rtems_bsdnet_config.name_server[0]];
-int rtems_bsdnet_nameserver_count;
-
-extern rtems_libio_handler_t rtems_bsdnet_io_handler;
-
-/*
- * Perform FreeBSD memory allocation.
- * FIXME: This should be modified to keep memory allocation statistics.
- */
-#undef malloc
-#undef free
-extern void *malloc (size_t);
-extern void free (void *);
-void *
-rtems_bsdnet_malloc (unsigned long size, int type, int flags)
-{
-	void *p;
-
-	for (;;) {
-		p = malloc (size);
-		if (p)
-			return p;
-		if (flags & M_NOWAIT)
-			return p;
-		/*
-		 * FIXME: This should be redone as:
-		 * static volatile int rtems_bsdnet_need_memory;
-		 *     
-		 *	rtems_bsdnet_need_memory = 1;
-		 *	message_queue_receive
-		 *
-		 * Then in rtems_bsdnet_freee:
-		 *	free (....);
-		 *	if (rtems_bsdnet_need_memory)
-		 *		rtems_bsdnet_need_memory = 0;
-		 *		message_queue_broadcast
-		 */
-		rtems_task_wake_after (rtems_bsdnet_ticks_per_second);
-	}
-}
-
-/*
- * Free FreeBSD memory
- * FIXME: This should be modified to keep memory allocation statistics.
- */
-void
-rtems_bsdnet_free (void *addr, int type)
-{
-	free (addr);
-}
-
-/*
- * Do the initializations required by the BSD code
- * FIXME: Maybe we should use a different memory allocation scheme that
- * would let us share space between mbufs and mbuf clusters.
- * For now, we'll just take the easy way out!
- */
-static void
-bsd_init ()
-{
-	/*
-	 * Set up mbuf data strutures
-	 * Cluster allocation *must* come first -- see comment on kmem_malloc().
-	 */
-	m_clalloc (nmbclusters, M_DONTWAIT);
-	mclrefcnt = malloc (nmbclusters);
-	if (mclrefcnt == NULL)
-		rtems_panic ("No memory for mbuf cluster reference counts.");
-	memset (mclrefcnt, '\0', nmbclusters);
-	m_mballoc (nmbuf, M_DONTWAIT);
-	mbstat.m_mtypes[MT_FREE] = nmbuf;
-
-
-	/*
-	 * Set up domains
-	 */
-	{
-	extern struct domain routedomain;
-	extern struct domain inetdomain;
-
-	routedomain.dom_next = domains;
-	domains = &routedomain;
-	inetdomain.dom_next = domains;
-	domains = &inetdomain;
-	domaininit (NULL);
-	}
-
-	/*
-	 * Set up interfaces
-	 */
-	ifinit (NULL);
-}
-
-/*
- * Initialize and start network operations
- */
-static void
-rtems_bsdnet_initialize (void)
-{
-	rtems_status_code sc;
-
-	/*
-	 * Set the priority of all network tasks
-	 */
-	if (rtems_bsdnet_config.network_task_priority == 0)
-		networkDaemonPriority = 100;
-	else
-		networkDaemonPriority = rtems_bsdnet_config.network_task_priority;
-
-	/*
-	 * Set the memory allocation limits
-	 */
-	if (rtems_bsdnet_config.mbuf_bytecount)
-		nmbuf = rtems_bsdnet_config.mbuf_bytecount / MSIZE;
-	if (rtems_bsdnet_config.mbuf_cluster_bytecount)
-		nmbclusters = rtems_bsdnet_config.mbuf_cluster_bytecount / MCLBYTES;
-
-	/*
-	 * Create the task-synchronization semaphore
-	 */
-	sc = rtems_semaphore_create (rtems_build_name('B', 'S', 'D', 'n'),
-					0,
-					RTEMS_FIFO |
-						RTEMS_BINARY_SEMAPHORE |
-						RTEMS_NO_INHERIT_PRIORITY |
-						RTEMS_NO_PRIORITY_CEILING |
-						RTEMS_LOCAL,
-					0,
-					&networkSemaphore);
-	if (sc != RTEMS_SUCCESSFUL)
-		rtems_panic ("Can't create network seamphore: `%s'\n", rtems_status_text (sc));
-
-	/*
-	 * Compute clock tick conversion factors
-	 */
-	rtems_clock_get (RTEMS_CLOCK_GET_TICKS_PER_SECOND, &rtems_bsdnet_ticks_per_second);
-	if (rtems_bsdnet_ticks_per_second <= 0)
-		rtems_bsdnet_ticks_per_second = 1;
-	rtems_bsdnet_microseconds_per_tick = 1000000 / rtems_bsdnet_ticks_per_second;
-
-	/*
-	 * Ensure that `seconds' is greater than 0
-	 */
-	rtems_task_wake_after (rtems_bsdnet_ticks_per_second);
-
-	/*
-	 * Set up BSD-style sockets
-	 */
-	bsd_init ();
-
-	/*
-	 * Start network daemon
-	 */
-	networkDaemonTid = rtems_bsdnet_newproc ("ntwk", 4096, networkDaemon, NULL);
-
-	/*
-	 * Register as an external I/O handler
-	 */
-	rtems_register_libio_handler (RTEMS_FILE_DESCRIPTOR_TYPE_SOCKET,
-						&rtems_bsdnet_io_handler);
-
-	/*
-	 * Let other network tasks begin
-	 */
-	rtems_bsdnet_semaphore_release ();
-}
-
-rtems_id TaskWithSemaphore;
-/*
- * Obtain network mutex
- */
-void
-rtems_bsdnet_semaphore_obtain (void)
-{
-	rtems_status_code sc;
-
-	sc = rtems_semaphore_obtain (networkSemaphore, RTEMS_WAIT, RTEMS_NO_TIMEOUT);
-rtems_task_ident (RTEMS_SELF, 0, &TaskWithSemaphore);
-	if (sc != RTEMS_SUCCESSFUL)
-		rtems_panic ("Can't obtain network semaphore: `%s'\n", rtems_status_text (sc));
-}
-
-/*
- * Release network mutex
- */
-void
-rtems_bsdnet_semaphore_release (void)
-{
-	rtems_status_code sc;
-
-TaskWithSemaphore = 0;
-	sc = rtems_semaphore_release (networkSemaphore);
-	if (sc != RTEMS_SUCCESSFUL)
-		rtems_panic ("Can't release network semaphore: `%s'\n", rtems_status_text (sc));
-										}
-
-/*
- * Wait for something to happen to a socket buffer
- */
-int
-sbwait(sb)
-	struct sockbuf *sb;
-{
-	rtems_event_set events;
-	rtems_id tid;
-	rtems_status_code sc;
-
-	/*
-	 * Soak up any pending events.
-	 * The sleep/wakeup synchronization in the FreeBSD
-	 * kernel has no memory.
-	 */
-	rtems_event_receive (SBWAIT_EVENT, RTEMS_EVENT_ANY | RTEMS_NO_WAIT, RTEMS_NO_TIMEOUT, &events); 
-
-	/*
-	 * Set this task as the target of the wakeup operation.
-	 */
-	if (sb->sb_sel.si_pid)
-		rtems_panic ("Another task is already sleeping on that socket buffer");
-	rtems_task_ident (RTEMS_SELF, 0, &tid);
-	sb->sb_sel.si_pid = tid;
-
-	/*
-	 * Mark the socket buffer as waiting.
-	 */
-	sb->sb_flags |= SB_WAIT;
-
-	/*
-	 * Release the network semaphore.
-	 */
-	rtems_bsdnet_semaphore_release ();
-
-	/*
-	 * Wait for the wakeup event.
-	 */
-	sc = rtems_event_receive (SBWAIT_EVENT, RTEMS_EVENT_ANY | RTEMS_WAIT, sb->sb_timeo, &events);
-
-	/*
-	 * Reobtain the network semaphore.
-	 */
-	rtems_bsdnet_semaphore_obtain ();
-
-	/*
-	 * Relinquish ownership of the socket buffer
-	 */
-	sb->sb_flags &= ~SB_WAIT;
-	sb->sb_sel.si_pid = 0;
-
-	/*
-	 * Return the status of the wait.
-	 */
-	switch (sc) {
-	case RTEMS_SUCCESSFUL:	return 0;
-	case RTEMS_TIMEOUT:	return EWOULDBLOCK;
-	default:		return ENXIO;
-	}
-}
-
-
-/*
- * Wake up the task waiting on a socket buffer.
- */
-void
-sowakeup(so, sb)
-	register struct socket *so;
-	register struct sockbuf *sb;
-{
-	if (sb->sb_flags & SB_WAIT) {
-		sb->sb_flags &= ~SB_WAIT;
-		rtems_event_send (sb->sb_sel.si_pid, SBWAIT_EVENT);
-	}
-}
-
-/*
- * For now, a socket can be used by only one task at a time.
- */
-int
-sb_lock(sb)
-	register struct sockbuf *sb;
-{
-	rtems_panic ("Socket buffer is already in use.");
-	return 0;
-}
-void
-wakeup (void *p)
-{
-	rtems_panic ("Wakeup called");
-}
-
-/*
- * Wait for a connection/disconnection event.
- */
-void
-soconnsleep (struct socket *so)
-{
-	rtems_event_set events;
-	rtems_id tid;
-
-	/*
-	 * Soak up any pending events.
-	 * The sleep/wakeup synchronization in the FreeBSD
-	 * kernel has no memory.
-	 */
-	rtems_event_receive (SOSLEEP_EVENT, RTEMS_EVENT_ANY | RTEMS_NO_WAIT, RTEMS_NO_TIMEOUT, &events); 
-
-	/*
-	 * Set this task as the target of the wakeup operation.
-	 */
-	if (so->so_pgid)
-		rtems_panic ("Another task is already sleeping on that socket");
-	rtems_task_ident (RTEMS_SELF, 0, &tid);
-	so->so_pgid = tid;
-
-	/*
-	 * Wait for the wakeup event.
-	 */
-	rtems_bsdnet_event_receive (SOSLEEP_EVENT, RTEMS_EVENT_ANY | RTEMS_WAIT, RTEMS_NO_TIMEOUT, &events);
-
-	/*
-	 * Relinquish ownership of the socket.
-	 */
-	so->so_pgid = 0;
-}
-
-/*
- * Wake up a task waiting for a connection/disconnection to complete.
- */
-void
-soconnwakeup (struct socket *so)
-{
-	if (so->so_pgid)
-		rtems_event_send (so->so_pgid, SOSLEEP_EVENT);
-}
-
-/*
- * Send an event to the network daemon.
- * This corresponds to sending a software interrupt in the BSD kernel.
- */
-void
-rtems_bsdnet_schednetisr (int n)
-{
-	rtems_event_send (networkDaemonTid, 1 << n);
-}
-
-/*
- * The network daemon
- * This provides a context to run BSD software interrupts
- */
-static void
-networkDaemon (void *task_argument)
-{
-	rtems_event_set events;
-	rtems_interval now;
-	int ticksPassed;
-	unsigned32 timeout;
-	struct callout *c;
-
-	for (;;) {
-		c = calltodo.c_next;
-		if (c)
-			timeout = c->c_time;
-		else
-			timeout = RTEMS_NO_TIMEOUT;
-		rtems_bsdnet_event_receive (NETISR_EVENTS,
-						RTEMS_EVENT_ANY | RTEMS_WAIT,
-						timeout,
-						&events);
-		if (events & NETISR_IP_EVENT)
-			ipintr ();
-		if (events & NETISR_ARP_EVENT)
-			arpintr ();
-		rtems_clock_get (RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &now);
-		ticksPassed = now - ticksWhenCalloutsLastChecked;
-		if (ticksPassed != 0) {
-			ticksWhenCalloutsLastChecked = now;
-			
-			c = calltodo.c_next;
-			if (c) {
-				c->c_time -= ticksPassed;
-				while ((c = calltodo.c_next) != NULL && c->c_time <= 0) {
-					void *arg;
-					void (*func) (void *);
-
-					func = c->c_func;
-					arg = c->c_arg;
-					calltodo.c_next = c->c_next;
-					c->c_next = callfree;
-					callfree = c;
-					(*func)(arg);
-				}
-			}
-		}
-	}
-}
-
-/*
- * Structure passed to task-start stub
- */
-struct newtask {
-	void (*entry)(void *);
-	void *arg;
-};
-
-/*
- * Task-start stub
- */
-static void
-taskEntry (rtems_task_argument arg)
-{
-	struct newtask t;
-	
-	/*
-	 * Pick up task information and free
-	 * the memory allocated to pass the
-	 * information to this task.
-	 */
-	t = *(struct newtask *)arg;
-	free ((struct newtask *)arg);
-
-	/*
-	 * Enter the competition for the network semaphore
-	 */
-	rtems_bsdnet_semaphore_obtain ();
-
-	/*
-	 * Enter the task
-	 */
-	(*t.entry)(t.arg);
-	rtems_panic ("Network task returned!\n");
-}
-
-/*
- * Start a network task
- */
-rtems_id
-rtems_bsdnet_newproc (char *name, int stacksize, void(*entry)(void *), void *arg)
-{
-	struct newtask *t;
-	char nm[4];
-	rtems_id tid;
-	rtems_status_code sc;
-
-	strncpy (nm, name, 4);
-	sc = rtems_task_create (rtems_build_name(nm[0], nm[1], nm[2], nm[3]),
-		networkDaemonPriority,
-		stacksize,
-		RTEMS_PREEMPT|RTEMS_NO_TIMESLICE|RTEMS_NO_ASR|RTEMS_INTERRUPT_LEVEL(0),
-		RTEMS_NO_FLOATING_POINT|RTEMS_LOCAL,
-		&tid);
-	if (sc != RTEMS_SUCCESSFUL)
-		rtems_panic ("Can't create network daemon `%s': `%s'\n", name, rtems_status_text (sc));
-
-	/*
-	 * Set up task arguments
-	 */
-	t = malloc (sizeof *t);
-	t->entry = entry;
-	t->arg = arg;
-
-	/*
-	 * Start the task
-	 */
-	sc = rtems_task_start (tid, taskEntry, (rtems_task_argument)t);
-	if (sc != RTEMS_SUCCESSFUL)
-		rtems_panic ("Can't start network daemon `%s': `%s'\n", name, rtems_status_text (sc));
-
-	/*
-	 * Let our caller know the i.d. of the new task
-	 */
-	return tid;
-}
-
-rtems_status_code rtems_bsdnet_event_receive (
-  rtems_event_set  event_in,
-  rtems_option     option_set,
-  rtems_interval   ticks,
-  rtems_event_set *event_out)
-{
-	rtems_status_code sc;
-
-	rtems_bsdnet_semaphore_release ();
-	sc = rtems_event_receive (event_in, option_set, ticks, event_out);
-	rtems_bsdnet_semaphore_obtain ();
-	return sc;
-}
-
-/*
- * Return time since startup
- */
-void
-microtime (struct timeval *t)
-{
-	rtems_interval now;
-
-	rtems_clock_get (RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &now);
-	t->tv_sec = now / rtems_bsdnet_ticks_per_second;
-	t->tv_usec = (now % rtems_bsdnet_ticks_per_second) * rtems_bsdnet_microseconds_per_tick;
-}
-
-unsigned long
-rtems_bsdnet_seconds_since_boot (void)
-{
-	rtems_interval now;
-
-	rtems_clock_get (RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &now);
-	return now / rtems_bsdnet_ticks_per_second;
-}
-
-/*
- * Fake random number generator
- */
-unsigned long
-rtems_bsdnet_random (void)
-{
-	rtems_interval now;
-
-	rtems_clock_get (RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &now);
-	return (now * 99991);
-}
-
-/*
- * Callout list processing
- */
-void
-timeout(void (*ftn)(void *), void *arg, int ticks)
-{
-	register struct callout *new, *p, *t;
-
-	if (ticks <= 0)
-		ticks = 1;
-
-	/* Fill in the next free callout structure. */
-	if (callfree == NULL) {
-		callfree = malloc (sizeof *callfree);
-		if (callfree == NULL)
-			rtems_panic ("No memory for timeout table entry");
-		callfree->c_next = NULL;
-	}
-
-	new = callfree;
-	callfree = new->c_next;
-	new->c_arg = arg;
-	new->c_func = ftn;
-
-	/*
-	 * The time for each event is stored as a difference from the time
-	 * of the previous event on the queue.  Walk the queue, correcting
-	 * the ticks argument for queue entries passed.  Correct the ticks
-	 * value for the queue entry immediately after the insertion point
-	 * as well.  Watch out for negative c_time values; these represent
-	 * overdue events.
-	 */
-	for (p = &calltodo;
-	    (t = p->c_next) != NULL && ticks > t->c_time; p = t)
-		if (t->c_time > 0)
-			ticks -= t->c_time;
-	new->c_time = ticks;
-	if (t != NULL)
-		t->c_time -= ticks;
-
-	/* Insert the new entry into the queue. */
-	p->c_next = new;
-	new->c_next = t;
-}
-
-/*
- * Ticks till specified time
- * FIXME: This version worries only about seconds, but that's good
- * enough for the way the network code uses this routine.
- */
-int
-hzto(struct timeval *tv)
-{
-	long diff = tv->tv_sec - rtems_bsdnet_seconds_since_boot();
-
-	if (diff <= 0)
-		return 1;
-	return diff * rtems_bsdnet_ticks_per_second;
-}
-
-/*
- * Kernel debugging
- */
-int rtems_bsdnet_log_priority;
-void
-rtems_bsdnet_log (int priority, const char *fmt, ...)
-{
-	va_list args;
-	
-	if (priority & rtems_bsdnet_log_priority) {
-		va_start (args, fmt);
-		vprintf (fmt, args);
-		va_end (args);
-	}
-}
-
-/*
- * Hack alert: kmem_malloc `knows' that its
- * first invocation is to get mbuf clusters!
- */
-int mb_map_full;
-vm_map_t mb_map;
-vm_offset_t
-kmem_malloc (vm_map_t *map, vm_size_t size, boolean_t waitflag)
-{
-	void *p;
-	
-	/*
-	 * Can't get memory if we're already running.
-	 */
-	if (networkDaemonTid) {
-		if (waitflag == M_WAITOK)
-			rtems_panic (
-"Network mbuf space can not be enlarged after rtems_bsdnet_initialize() has\n"
-"returned.  Enlarge the initial mbuf/cluster size in rtems_bsdnet_config.");
-		return 0;
-	}
-
-#define ROUNDSIZE 2048
-	p = malloc (size+ROUNDSIZE);
-	p = (void *)((unsigned long)p & ~(ROUNDSIZE-1));
-	if ((p == NULL) && (waitflag == M_WAITOK))
-		rtems_panic ("Can't get initial network memory!");
-	if (mbutl == NULL)
-		mbutl = p;
-	return (vm_offset_t)p;
-}
-
-/*
- * IP header checksum routine for processors which don't have an inline version
- */
-u_int
-in_cksum_hdr (const void *ip)
-{
-	rtems_unsigned32 sum;
-	const rtems_unsigned16 *sp;
-	int i;
-
-	sum = 0;
-	sp = (rtems_unsigned16 *)ip;
-	for (i = 0 ; i < 10 ; i++)
-		sum += *sp++;
-	while (sum > 0xFFFF)
-		sum = (sum & 0xffff) + (sum >> 16);
-	return ~sum & 0xFFFF;
-}
-
-/*
- * Manipulate routing tables
- */
-int rtems_bsdnet_rtrequest (
-    int req,
-    struct sockaddr *dst,
-    struct sockaddr *gateway,
-    struct sockaddr *netmask,
-    int flags,
-    struct rtentry **net_nrt)
-{
-	int error;
-
-	rtems_bsdnet_semaphore_obtain ();
-	error = rtrequest (req, dst, gateway, netmask, flags, net_nrt);
-	rtems_bsdnet_semaphore_release ();
-	if (error) {
-		errno = error;
-		return -1;
-	}
-	return 0;
-}
-
-static void
-rtems_bsdnet_setup (void)
-{
-	struct rtems_bsdnet_ifconfig *ifp;
-	int s;
-	struct ifreq ifreq;
-	struct sockaddr_in address;
-	struct sockaddr_in netmask;
-	struct sockaddr_in broadcast;
-	struct sockaddr_in gateway;
-	int i;
-
-	/*
-	 * Set local parameters
-	 */
-	if (rtems_bsdnet_config.hostname)
-		sethostname (rtems_bsdnet_config.hostname,
-					strlen (rtems_bsdnet_config.hostname));
-	if (rtems_bsdnet_config.domainname)
-		rtems_bsdnet_domain_name =
-					strdup (rtems_bsdnet_config.domainname);
-	if (rtems_bsdnet_config.log_host)
-		rtems_bsdnet_log_host_address.s_addr =
-				inet_addr (rtems_bsdnet_config.log_host);
-	for (i = 0 ; i < sizeof rtems_bsdnet_config.name_server /
-			sizeof rtems_bsdnet_config.name_server[0] ; i++) {
-		if (!rtems_bsdnet_config.name_server[i])
-			break;
-		rtems_bsdnet_nameserver[rtems_bsdnet_nameserver_count++].s_addr
-			= inet_addr (rtems_bsdnet_config.name_server[i]);
-	}
-
-	/*
-	 * Configure interfaces
-	 */
-	s = socket (AF_INET, SOCK_DGRAM, 0);
-	if (s < 0)
-		rtems_panic ("Can't create initial socket: %s", strerror (errno));
-	for (ifp = rtems_bsdnet_config.ifconfig ; ifp ; ifp = ifp->next) {
-		if (ifp->ip_address == NULL)
-			continue;
-
-		/*
-		 * Get the interface flags
-		 */
-		strcpy (ifreq.ifr_name, ifp->name);
-		if (ioctl (s, SIOCGIFFLAGS, &ifreq) < 0)
-			rtems_panic ("Can't get %s flags: %s", ifp->name, strerror (errno));
-
-		/*
-		 * Bring interface up
-		 */
-		ifreq.ifr_flags |= IFF_UP;
-		if (ioctl (s, SIOCSIFFLAGS, &ifreq) < 0)
-			rtems_panic ("Can't bring %s up: %s", ifp->name, strerror (errno));
-
-		/*
-		 * Set interface netmask
-		 */
-		memset (&netmask, '\0', sizeof netmask);
-		netmask.sin_len = sizeof netmask;
-		netmask.sin_family = AF_INET;
-		netmask.sin_addr.s_addr = inet_addr (ifp->ip_netmask);
-		memcpy (&ifreq.ifr_addr, &netmask, sizeof netmask);
-		if (ioctl (s, SIOCSIFNETMASK, &ifreq) < 0)
-			rtems_panic ("Can't set %s netmask: %s", ifp->name, strerror (errno));
-
-		/*
-		 * Set interface address
-		 */
-		memset (&address, '\0', sizeof address);
-		address.sin_len = sizeof address;
-		address.sin_family = AF_INET;
-		address.sin_addr.s_addr = inet_addr (ifp->ip_address);
-		memcpy (&ifreq.ifr_addr, &address, sizeof address);
-		if (ioctl (s, SIOCSIFADDR, &ifreq) < 0)
-			rtems_panic ("Can't set %s address: %s", ifp->name, strerror (errno));
-
-		/*
-		 * Set interface broadcast address
-		 */
-		memset (&broadcast, '\0', sizeof broadcast);
-		broadcast.sin_len = sizeof broadcast;
-		broadcast.sin_family = AF_INET;
-		broadcast.sin_addr.s_addr = address.sin_addr.s_addr | ~netmask.sin_addr.s_addr;
-		memcpy (&ifreq.ifr_broadaddr, &broadcast, sizeof broadcast);
-		if (ioctl (s, SIOCSIFBRDADDR, &ifreq) < 0)
-			rtems_panic ("Can't set %s broadcast address: %s", ifp->name, strerror (errno));
-	}
-
-	/*
-	 * We're done with the dummy socket
-	 */
-	close (s);
-
-	/*
-	 * Set default route
-	 */
-	if (rtems_bsdnet_config.gateway) {
-		address.sin_addr.s_addr = INADDR_ANY;
-		netmask.sin_addr.s_addr = INADDR_ANY;
-		memset (&gateway, '\0', sizeof gateway);
-		gateway.sin_len = sizeof gateway;
-		gateway.sin_family = AF_INET;
-		gateway.sin_addr.s_addr = inet_addr (rtems_bsdnet_config.gateway);
-		if (rtems_bsdnet_rtrequest (
-				RTM_ADD, 
-				(struct sockaddr *)&address,
-				(struct sockaddr *)&gateway,
-				(struct sockaddr *)&netmask,
-				(RTF_UP | RTF_GATEWAY | RTF_STATIC), NULL) < 0)
-			rtems_panic ("Can't set default route: %s", strerror (errno));
-	}
-}
-
-/*
- * Initialize the network
- */
-int
-rtems_bsdnet_initialize_network (void)
-{
-	struct rtems_bsdnet_ifconfig *ifp;
-
-	/*
-	 * Start network tasks.
-	 * Initialize BSD network data structures.
-	 */
-	rtems_bsdnet_initialize ();
-
-	/*
-	 * Attach interfaces
-	 */
-	for (ifp = rtems_bsdnet_config.ifconfig ; ifp ; ifp = ifp->next) {
-		rtems_bsdnet_semaphore_obtain ();
-		(ifp->attach)(ifp);
-		rtems_bsdnet_semaphore_release ();
-	}
-
-	/*
-	 * Bring up the network
-	 */
-	rtems_bsdnet_setup ();
-	if (rtems_bsdnet_config.bootp)
-		(*rtems_bsdnet_config.bootp)();
-	return 0;
-}
diff --git a/c/src/exec/libnetworking/rtems/rtems_showicmpstat.c b/c/src/exec/libnetworking/rtems/rtems_showicmpstat.c
deleted file mode 100644
index 1faea2512b..0000000000
--- a/c/src/exec/libnetworking/rtems/rtems_showicmpstat.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- *  $Id$
- */
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/sysctl.h>
-#include <sys/proc.h>
-#include <sys/mbuf.h>
-#include <netinet/in_systm.h>
-#include <netinet/in.h>
-#include <netinet/ip.h>
-#include <netinet/ip_icmp.h>
-#include <netinet/icmp_var.h>
-
-/*
- * Display ICMP statistics
- * Don't lock the rest of the network tasks out while printing.
- * It's no big deal if the values change while being printed.
- */
-static void
-showicmpstat (const char *name, unsigned long n)
-{
-	if (n)
-		printf ("%35s%12lu\n", name, n);
-}
-
-void
-rtems_bsdnet_show_icmp_stats (void)
-{
-	int i;
-	char cbuf[20];
-
-	printf ("************ ICMP Statistics ************\n");
-	showicmpstat ("Calls to icmp_error()", icmpstat.icps_error);
-	showicmpstat ("Errors not sent -- old was icmp", icmpstat.icps_oldicmp);
-	for (i = 0 ; i <= ICMP_MAXTYPE ; i++) {
-		if (icmpstat.icps_outhist[i]) {
-			sprintf (cbuf, "Type %d sent", i);
-			showicmpstat (cbuf, icmpstat.icps_outhist[i]);
-		}
-	}
-	showicmpstat ("icmp_code out of range", icmpstat.icps_badcode);
-	showicmpstat ("packet < ICMP_MINLEN", icmpstat.icps_tooshort);
-	showicmpstat ("bad checksum", icmpstat.icps_checksum);
-	showicmpstat ("calculated bound mismatch", icmpstat.icps_badlen);
-	showicmpstat ("number of responses", icmpstat.icps_reflect);
-	showicmpstat ("b/mcast echo requests dropped", icmpstat.icps_bmcastecho);
-	showicmpstat ("b/mcast tstamp requests dropped", icmpstat.icps_bmcasttstamp);
-	for (i = 0 ; i <= ICMP_MAXTYPE ; i++) {
-		if (icmpstat.icps_inhist[i]) {
-			sprintf (cbuf, "Type %d received", i);
-			showicmpstat (cbuf, icmpstat.icps_inhist[i]);
-		}
-	}
-
-	printf ("\n");
-}
diff --git a/c/src/exec/libnetworking/rtems/rtems_showifstat.c b/c/src/exec/libnetworking/rtems/rtems_showifstat.c
deleted file mode 100644
index 9f9efc5ac2..0000000000
--- a/c/src/exec/libnetworking/rtems/rtems_showifstat.c
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- *  $Id$
- */
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/sysctl.h>
-#include <sys/proc.h>
-#include <sys/socket.h>
-#include <sys/ioctl.h>
-#include <net/if.h>
-#include <netinet/in.h>
-
-/*
- * Display an address
- */
-static int
-showaddress (char *name, struct sockaddr *a)
-{
-	struct sockaddr_in *sa;
-
-	if (!a || (a->sa_family != AF_INET))
-		return 0;
-	printf ("%s:", name);
-	sa = (struct sockaddr_in *)a;
-	printf ("%-16s", inet_ntoa (sa->sin_addr));
-	return 1;
-}
-
-/*
- * Display interface statistics
- */
-void
-rtems_bsdnet_show_if_stats (void)
-{
-	struct ifnet *ifp;
-	struct ifaddr *ifa;
-	unsigned int bit, flags;
-	int printed;
-
-	printf ("************ INTERFACE STATISTICS ************\n");
-	for (ifp = ifnet; ifp; ifp = ifp->if_next) {
-		printf ("***** %s%d *****\n", ifp->if_name, ifp->if_unit);
-		for (ifa = ifp->if_addrlist ; ifa ; ifa = ifa->ifa_next) {
-			printed = showaddress ("Address", ifa->ifa_addr);
-			if (ifp->if_flags & IFF_BROADCAST)
-				printed |= showaddress ("Broadcast Address", ifa->ifa_broadaddr);
-			if (ifp->if_flags & IFF_POINTOPOINT)
-				printed |= showaddress ("Destination Address", ifa->ifa_dstaddr);
-			printed |= showaddress ("Net mask", ifa->ifa_netmask);
-			if (printed)
-				printf ("\n");
-		}
-
-		printf ("Flags:");
-		for (bit = 1, flags = ifp->if_flags ; flags ; bit <<= 1) {
-			char *cp;
-			switch (flags & bit) {
-			default:		cp = NULL;		break;
-			case IFF_UP:		cp = "Up";		break;
-			case IFF_BROADCAST:	cp = "Broadcast";	break;
-			case IFF_DEBUG:		cp = "Debug";		break;
-			case IFF_LOOPBACK:	cp = "Loopback";	break;
-			case IFF_POINTOPOINT:	cp = "Point-to-point";	break;
-			case IFF_RUNNING:	cp = "Running";		break;
-			case IFF_NOARP:		cp = "No-ARP";		break;
-			case IFF_PROMISC:	cp = "Promiscuous";	break;
-			case IFF_ALLMULTI:	cp = "All-multicast";	break;
-			case IFF_OACTIVE:	cp = "Active";		break;
-			case IFF_SIMPLEX:	cp = "Simplex";		break;
-			case IFF_LINK0:		cp = "Link0";		break;
-			case IFF_LINK1:		cp = "Link1";		break;
-			case IFF_LINK2:		cp = "Link2";		break;
-			case IFF_MULTICAST:	cp = "Multicast";	break;
-			}
-			if (cp) {
-				flags &= ~bit;
-				printf (" %s", cp);
-			}
-		}
-		printf ("\n");
-
-		printf ("Send queue limit:%-4d length:%-4d Dropped:%-8d\n",
-							ifp->if_snd.ifq_maxlen,
-							ifp->if_snd.ifq_len,
-							ifp->if_snd.ifq_drops);
-
-		/*
-		 * FIXME: Could print if_data statistics here,
-		 *        but right now the drivers maintain their
-		 *        own statistics.
-		 */
-
-		/*
-		 * Grab the network semaphore.
-		 * In most cases this is not necessary, but it's
-		 * easier to always call the driver ioctl function
-		 * while holding the semaphore than to try
-		 * and explain why some ioctl commands are invoked
-		 * while holding the semaphore and others are
-		 * invoked while not holding the semaphore.
-		 */
-		rtems_bsdnet_semaphore_obtain ();
-		(*ifp->if_ioctl)(ifp, SIO_RTEMS_SHOW_STATS, NULL);
-		rtems_bsdnet_semaphore_release ();
-	}
-	printf ("\n");
-}
diff --git a/c/src/exec/libnetworking/rtems/rtems_showipstat.c b/c/src/exec/libnetworking/rtems/rtems_showipstat.c
deleted file mode 100644
index 2dd499a8c0..0000000000
--- a/c/src/exec/libnetworking/rtems/rtems_showipstat.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- *  $Id$
- */
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/sysctl.h>
-#include <sys/proc.h>
-#include <sys/mbuf.h>
-#include <netinet/in_systm.h>
-#include <netinet/in.h>
-#include <netinet/ip.h>
-#include <netinet/ip_var.h>
-
-/*
- * Display IP statistics
- * Don't lock the rest of the network tasks out while printing.
- * It's no big deal if the values change while being printed.
- */
-static void
-showipstat (const char *name, unsigned long n)
-{
-	if (n)
-		printf ("%35s%12lu\n", name, n);
-}
-
-void
-rtems_bsdnet_show_ip_stats (void)
-{
-	printf ("************ IP Statistics ************\n");
-	showipstat ("total packets received", ipstat.ips_total);
-	showipstat ("checksum bad", ipstat.ips_badsum);
-	showipstat ("packet too short", ipstat.ips_tooshort);
-	showipstat ("not enough data", ipstat.ips_toosmall);
-	showipstat ("ip header length < data size", ipstat.ips_badhlen);
-	showipstat ("ip length < ip header length", ipstat.ips_badlen);
-	showipstat ("fragments received", ipstat.ips_fragments);
-	showipstat ("frags dropped (dups, out of space)", ipstat.ips_fragdropped);
-	showipstat ("fragments timed out", ipstat.ips_fragtimeout);
-	showipstat ("packets forwarded", ipstat.ips_forward);
-	showipstat ("packets rcvd for unreachable dest", ipstat.ips_cantforward);
-	showipstat ("packets forwarded on same net", ipstat.ips_redirectsent);
-	showipstat ("unknown or unsupported protocol", ipstat.ips_noproto);
-	showipstat ("datagrams delivered to upper level", ipstat.ips_delivered);
-	showipstat ("total ip packets generated here", ipstat.ips_localout);
-	showipstat ("lost packets due to nobufs, etc.", ipstat.ips_odropped);
-	showipstat ("total packets reassembled ok", ipstat.ips_reassembled);
-	showipstat ("datagrams successfully fragmented", ipstat.ips_fragmented);
-	showipstat ("output fragments created", ipstat.ips_ofragments);
-	showipstat ("don't fragment flag was set, etc.", ipstat.ips_cantfrag);
-	showipstat ("error in option processing", ipstat.ips_badoptions);
-	showipstat ("packets discarded due to no route", ipstat.ips_noroute);
-	showipstat ("ip version != 4", ipstat.ips_badvers);
-	showipstat ("total raw ip packets generated", ipstat.ips_rawout);
-	showipstat ("ip length > max ip packet size", ipstat.ips_toolong);
-	printf ("\n");
-}
diff --git a/c/src/exec/libnetworking/rtems/rtems_showmbuf.c b/c/src/exec/libnetworking/rtems/rtems_showmbuf.c
deleted file mode 100644
index 39523bd00a..0000000000
--- a/c/src/exec/libnetworking/rtems/rtems_showmbuf.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- *  $Id$
- */
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/sysctl.h>
-#include <sys/proc.h>
-#include <sys/mbuf.h>
-
-/*
- * Display MBUF statistics
- * Don't lock the rest of the network tasks out while printing.
- * It's no big deal if the values change while being printed.
- */
-void
-rtems_bsdnet_show_mbuf_stats (void)
-{
-	int i;
-	int printed = 0;
-	char *cp;
-
-	printf ("************ MBUF STATISTICS ************\n");
-	printf ("mbufs:%4lu    clusters:%4lu    free:%4lu\n",
-			mbstat.m_mbufs, mbstat.m_clusters, mbstat.m_clfree);
-	printf ("drops:%4lu       waits:%4lu  drains:%4lu\n",
-			mbstat.m_drops, mbstat.m_wait, mbstat.m_drain);
-	for (i = 0 ; i < 20 ; i++) {
-		switch (i) {
-		case MT_FREE:		cp = "free";		break;
-		case MT_DATA:		cp = "data";		break;
-		case MT_HEADER:		cp = "header";		break;
-		case MT_SOCKET:		cp = "socket";		break;
-		case MT_PCB:		cp = "pcb";		break;
-		case MT_RTABLE:		cp = "rtable";		break;
-		case MT_HTABLE:		cp = "htable";		break;
-		case MT_ATABLE:		cp = "atable";		break;
-		case MT_SONAME:		cp = "soname";		break;
-		case MT_SOOPTS:		cp = "soopts";		break;
-		case MT_FTABLE:		cp = "ftable";		break;
-		case MT_RIGHTS:		cp = "rights";		break;
-		case MT_IFADDR:		cp = "ifaddr";		break;
-		case MT_CONTROL:	cp = "control";		break;
-		case MT_OOBDATA:	cp = "oobdata";		break;
-		default:		cp = NULL;		break;
-		}
-		if ((cp != NULL) || (mbstat.m_mtypes[i] != 0)) {
-			char cbuf[16];
-			if (cp == NULL) {
-				sprintf (cbuf, "Type %d", i);
-				cp = cbuf;
-			}
-			printf ("%10s:%-8u", cp, mbstat.m_mtypes[i]);
-			if (++printed == 4) {
-				printf ("\n");
-				printed = 0;
-			}
-		}
-	}
-	if (printed)
-		printf ("\n");
-	printf ("\n");
-}
diff --git a/c/src/exec/libnetworking/rtems/rtems_showroute.c b/c/src/exec/libnetworking/rtems/rtems_showroute.c
deleted file mode 100644
index b8196de8d3..0000000000
--- a/c/src/exec/libnetworking/rtems/rtems_showroute.c
+++ /dev/null
@@ -1,237 +0,0 @@
-/*
- *  $Id$
- */
-
-#include <stdlib.h>
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/sysctl.h>
-#include <sys/proc.h>
-#include <sys/mbuf.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/domain.h>
-
-#include <net/if.h>
-#include <net/if_dl.h>
-#include <net/route.h>
-
-#include <netinet/in.h>
-
-#include <arpa/inet.h>
-
-/*
- * We'll use the application versions of malloc and free.
- */
-#undef malloc
-#undef free
-
-/*
- * Information per route
- */
-struct rinfo {
-	struct sockaddr	dst;
-	union {
-		struct sockaddr		sa;
-		struct sockaddr_in	sin;
-		struct sockaddr_dl	sdl;
-	} un;
-	unsigned long	pksent;
-	unsigned long	expire;
-	int		flags;
-	char		ifname[16];
-	short		ifunit;
-	short		refcnt;
-};
-
-/*
- * Information per display
- */
-struct dinfo {
-	int		capacity;
-	int		count;
-	struct rinfo	*routes;
-};
-
-/*
- * Copy address
- */
-static void
-copyAddress (void *to, void *from, int tolen)
-{
-	int ncopy;
-	struct sockaddr dummy;
-
-	if (from == NULL) {
-		/*
-		 * Create a fake address of unspecified type
-		 */
-		from = &dummy;
-		dummy.sa_len = 4;
-		dummy.sa_family = AF_UNSPEC;
-	}
-	ncopy = ((struct sockaddr *)from)->sa_len;
-	if (ncopy > tolen)
-		ncopy = tolen;
-	memcpy (to, from, ncopy);
-}
-
-/*
- * Package everything up before printing it.
- * We don't want to block all network operations till
- * the printing completes!
- */
-static int
-show_inet_route (rn, vw)
-	struct radix_node *rn;
-	void *vw;
-{
-	struct rtentry *rt = (struct rtentry *)rn;
-	struct ifnet *ifp;
-	struct dinfo *dp = (struct dinfo *)vw;
-	struct rinfo *r;
-
-	/*
-	 * Get a pointer to a new route info structure
-	 */
-	if (dp->count >= dp->capacity) {
-		r = realloc (dp->routes, (sizeof *r) * (dp->capacity + 20));
-		if (r == 0)
-			return ENOMEM;
-		dp->capacity += 20;
-		dp->routes = r;
-	}
-	r = dp->routes + dp->count++;
-
-	/*
-	 * Fill in the route info structure
-	 */
-	copyAddress (&r->dst, rt_key(rt), sizeof r->dst);
-	if (rt->rt_flags & (RTF_GATEWAY | RTF_HOST)) {
-		copyAddress (&r->un, rt->rt_gateway, sizeof r->un);
-	}
-	else {
-		/*
-		 * Create a fake address to hold the mask
-		 */
-		struct sockaddr_in dummy;
-
-		dummy.sin_family = AF_INET;
-		dummy.sin_len = sizeof dummy;
-		dummy.sin_addr = ((struct sockaddr_in *)rt_mask(rt))->sin_addr;
-		copyAddress (&r->un, &dummy, sizeof r->un);
-	}
-	r->flags = rt->rt_flags;
-	r->refcnt = rt->rt_refcnt;
-	r->pksent = rt->rt_rmx.rmx_pksent;
-	r->expire = rt->rt_rmx.rmx_expire;
-	ifp = rt->rt_ifp;
-	strncpy (r->ifname, ifp->if_name, sizeof r->ifname);
-	r->ifunit = ifp->if_unit;
-	return 0;
-}
-
-/*
- * Convert link address to ASCII
- */
-static char *
-link_ascii (struct sockaddr_dl *sdl, char *buf, int bufsize)
-{
-	char *cp;
-	int i;
-	int first = 1;
-	int nleft = sdl->sdl_alen;
-	unsigned char *ap = LLADDR (sdl);
-	static const char hextab[16] = "0123456789ABCDEF";
-
-	cp = buf;
-	while (nleft && (bufsize > 4)) {
-		if (first) {
-			first = 0;
-		}
-		else {
-			*cp++ = ':';
-			bufsize--;
-		}
-		i = *ap++;
-		*cp++ = hextab[(i >> 4) & 0xf];
-		*cp++ = hextab[i & 0xf];
-		nleft--;
-		bufsize -= 2;
-	}
-	*cp = '\0';
-	return buf;
-}
-		
-void
-rtems_bsdnet_show_inet_routes (void)
-{
-	struct radix_node_head *rnh;
-	struct dinfo d;
-	struct rinfo *r;
-	int i, error;
-
-	/*
-	 * For now we'll handle only AF_INET
-	 */
-	rnh = rt_tables[AF_INET];
-	if (!rnh)
-		return;
-	d.count = d.capacity = 0;
-	d.routes = NULL;
-	rtems_bsdnet_semaphore_obtain ();
-	error = rnh->rnh_walktree(rnh, show_inet_route, &d);
-	rtems_bsdnet_semaphore_release ();
-	if (error) {
-		printf ("Can't get route info: %s\n", strerror (error));
-		return;
-	}
-	if (d.count == 0) {
-		printf ("No routes!\n");
-		return;
-	}
-	printf ("Destination     Gateway/Mask/Hw    Flags     Refs     Use Expire Interface\n");
-	for (i = 0, r = d.routes ; i < d.count ; i++, r++) {
-		char buf[30];
-		char *cp, *fc, flagbuf[10];
-		const char *addr;
-		unsigned long flagbit;
-		struct sockaddr_in *sin;
-
-		sin = (struct sockaddr_in *)&r->dst;
-		if (sin->sin_addr.s_addr == INADDR_ANY)
-			addr = "default";
-		else
-			addr = inet_ntop (AF_INET, &sin->sin_addr, buf, sizeof buf);
-		printf ("%-16s", addr);
-		switch (r->un.sa.sa_family) {
-		case AF_INET:
-			addr = inet_ntop (AF_INET, &r->un.sin.sin_addr, buf, sizeof buf);
-			break;
-
-		case AF_LINK:
-			addr = link_ascii (&r->un.sdl, buf, sizeof buf);
-			break;
-
-		default:
-			addr = "";
-			break;
-		}
-		printf ("%-19s", addr);
-		fc = "UGHRDM   XLS";
-		for (flagbit = 0x1, cp = flagbuf ; *fc ; flagbit <<= 1, fc++) {
-			if ((r->flags & flagbit) && (*fc != ' '))
-				*cp++ = *fc;
-		}
-		*cp = '\0';
-		printf ("%-10s%3d%9ld%7ld %.*s%d\n", flagbuf,
-					r->refcnt, r->pksent,
-					r->expire,
-					(int)sizeof r->ifname, r->ifname,
-					r->ifunit);
-	}
-	free (d.routes);
-}
diff --git a/c/src/exec/libnetworking/rtems/rtems_showtcpstat.c b/c/src/exec/libnetworking/rtems/rtems_showtcpstat.c
deleted file mode 100644
index b9a0366819..0000000000
--- a/c/src/exec/libnetworking/rtems/rtems_showtcpstat.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- *  $Id$
- */
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/sysctl.h>
-#include <sys/proc.h>
-#include <sys/mbuf.h>
-#include <sys/socket.h>
-#include <net/if.h>
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/ip_var.h>
-#include <netinet/tcp.h>
-#include <netinet/tcp_timer.h>
-#include <netinet/tcp_seq.h>
-#include <netinet/tcp_var.h>
-
-/*
- * Display TCP statistics
- * Don't lock the rest of the network tasks out while printing.
- * It's no big deal if the values change while being printed.
- */
-static void
-showtcpstat (const char *name, unsigned long n)
-{
-	if (n)
-		printf ("%35s%12lu\n", name, n);
-}
-
-void
-rtems_bsdnet_show_tcp_stats (void)
-{
-	printf ("************ TCP Statistics ************\n");
-	showtcpstat ("connections initiated", tcpstat.tcps_connattempt);
-	showtcpstat ("connections accepted", tcpstat.tcps_accepts);
-	showtcpstat ("connections established", tcpstat.tcps_connects);
-	showtcpstat ("connections dropped", tcpstat.tcps_drops);
-	showtcpstat ("embryonic connections dropped", tcpstat.tcps_conndrops);
-	showtcpstat ("conn. closed (includes drops)", tcpstat.tcps_closed);
-	showtcpstat ("segs where we tried to get rtt", tcpstat.tcps_segstimed);
-	showtcpstat ("times we succeeded", tcpstat.tcps_rttupdated);
-	showtcpstat ("delayed acks sent", tcpstat.tcps_delack);
-	showtcpstat ("conn. dropped in rxmt timeout", tcpstat.tcps_timeoutdrop);
-	showtcpstat ("retransmit timeouts", tcpstat.tcps_rexmttimeo);
-	showtcpstat ("persist timeouts", tcpstat.tcps_persisttimeo);
-	showtcpstat ("keepalive timeouts", tcpstat.tcps_keeptimeo);
-	showtcpstat ("keepalive probes sent", tcpstat.tcps_keepprobe);
-	showtcpstat ("connections dropped in keepalive", tcpstat.tcps_keepdrops);
-
-	showtcpstat ("total packets sent", tcpstat.tcps_sndtotal);
-	showtcpstat ("data packets sent", tcpstat.tcps_sndpack);
-	showtcpstat ("data bytes sent", tcpstat.tcps_sndbyte);
-	showtcpstat ("data packets retransmitted", tcpstat.tcps_sndrexmitpack);
-	showtcpstat ("data bytes retransmitted", tcpstat.tcps_sndrexmitbyte);
-	showtcpstat ("ack-only packets sent", tcpstat.tcps_sndacks);
-	showtcpstat ("window probes sent", tcpstat.tcps_sndprobe);
-	showtcpstat ("packets sent with URG only", tcpstat.tcps_sndurg);
-	showtcpstat ("window update-only packets sent", tcpstat.tcps_sndwinup);
-	showtcpstat ("control (SYN|FIN|RST) packets sent", tcpstat.tcps_sndctrl);
-
-	showtcpstat ("total packets received", tcpstat.tcps_rcvtotal);
-	showtcpstat ("packets received in sequence", tcpstat.tcps_rcvpack);
-	showtcpstat ("bytes received in sequence", tcpstat.tcps_rcvbyte);
-	showtcpstat ("packets received with ccksum errs", tcpstat.tcps_rcvbadsum);
-	showtcpstat ("packets received with bad offset", tcpstat.tcps_rcvbadoff);
-	showtcpstat ("packets received too short", tcpstat.tcps_rcvshort);
-	showtcpstat ("duplicate-only packets received", tcpstat.tcps_rcvduppack);
-	showtcpstat ("duplicate-only bytes received", tcpstat.tcps_rcvdupbyte);
-	showtcpstat ("packets with some duplicate data", tcpstat.tcps_rcvpartduppack);
-	showtcpstat ("dup. bytes in part-dup. packets", tcpstat.tcps_rcvpartdupbyte);
-	showtcpstat ("out-of-order packets received", tcpstat.tcps_rcvoopack);
-	showtcpstat ("out-of-order bytes received", tcpstat.tcps_rcvoobyte);
-	showtcpstat ("packets with data after window", tcpstat.tcps_rcvpackafterwin);
-	showtcpstat ("bytes rcvd after window", tcpstat.tcps_rcvbyteafterwin);
-	showtcpstat ("packets rcvd after \"close\"", tcpstat.tcps_rcvafterclose);
-	showtcpstat ("rcvd window probe packets", tcpstat.tcps_rcvwinprobe);
-	showtcpstat ("rcvd duplicate acks", tcpstat.tcps_rcvdupack);
-	showtcpstat ("rcvd acks for unsent data", tcpstat.tcps_rcvacktoomuch);
-	showtcpstat ("rcvd ack packets", tcpstat.tcps_rcvackpack);
-	showtcpstat ("bytes acked by rcvd acks", tcpstat.tcps_rcvackbyte);
-	showtcpstat ("rcvd window update packets", tcpstat.tcps_rcvwinupd);
-	showtcpstat ("segments dropped due to PAWS", tcpstat.tcps_pawsdrop);
-	showtcpstat ("times hdr predict ok for acks", tcpstat.tcps_predack);
-	showtcpstat ("times hdr predict ok for data pkts", tcpstat.tcps_preddat);
-	showtcpstat ("pcb cache misses", tcpstat.tcps_pcbcachemiss);
-	showtcpstat ("times cached RTT in route updated", tcpstat.tcps_cachedrtt);
-	showtcpstat ("times cached rttvar updated", tcpstat.tcps_cachedrttvar);
-	showtcpstat ("times cached ssthresh updated", tcpstat.tcps_cachedssthresh);
-	showtcpstat ("times RTT initialized from route", tcpstat.tcps_usedrtt);
-	showtcpstat ("times RTTVAR initialized from rt", tcpstat.tcps_usedrttvar);
-	showtcpstat ("times ssthresh initialized from rt", tcpstat.tcps_usedssthresh);
-	showtcpstat ("timeout in persist state", tcpstat.tcps_persistdrop);
-	showtcpstat ("bogus SYN, e.g. premature ACK", tcpstat.tcps_badsyn);
-	showtcpstat ("resends due to MTU discovery", tcpstat.tcps_mturesent);
-	showtcpstat ("listen queue overflows", tcpstat.tcps_listendrop);
-	printf ("\n");
-}
diff --git a/c/src/exec/libnetworking/rtems/rtems_showudpstat.c b/c/src/exec/libnetworking/rtems/rtems_showudpstat.c
deleted file mode 100644
index 1fc2d15a0b..0000000000
--- a/c/src/exec/libnetworking/rtems/rtems_showudpstat.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- *  $Id$
- */
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/sysctl.h>
-#include <sys/proc.h>
-#include <sys/mbuf.h>
-#include <sys/socket.h>
-#include <net/if.h>
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/ip_var.h>
-#include <netinet/udp.h>
-#include <netinet/udp_var.h>
-
-/*
- * Display UDP statistics
- * Don't lock the rest of the network tasks out while printing.
- * It's no big deal if the values change while being printed.
- */
-static void
-showudpstat (const char *name, unsigned long n)
-{
-	if (n)
-		printf ("%35s%12lu\n", name, n);
-}
-
-void
-rtems_bsdnet_show_udp_stats (void)
-{
-	printf ("************ UDP Statistics ************\n");
-	showudpstat ("total input packets", udpstat.udps_ipackets);
-	showudpstat ("packet shorter than header", udpstat.udps_hdrops);
-	showudpstat ("checksum error", udpstat.udps_badsum);
-	showudpstat ("data length larger than packet", udpstat.udps_badlen);
-	showudpstat ("no socket on port", udpstat.udps_noport);
-	showudpstat ("of above, arrived as broadcast", udpstat.udps_noportbcast);
-	showudpstat ("not delivered, input socket full", udpstat.udps_fullsock);
-	showudpstat ("input packets missing pcb cache", udpstat.udpps_pcbcachemiss);
-	showudpstat ("input packets not for hashed pcb", udpstat.udpps_pcbhashmiss);
-	showudpstat ("total output packets", udpstat.udps_opackets);
-	printf ("\n");
-}
diff --git a/c/src/exec/libnetworking/rtems/rtems_syscall.c b/c/src/exec/libnetworking/rtems/rtems_syscall.c
deleted file mode 100644
index 782a2f907b..0000000000
--- a/c/src/exec/libnetworking/rtems/rtems_syscall.c
+++ /dev/null
@@ -1,761 +0,0 @@
-/*
- *  $Id$
- */
-
-#include <string.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-#include <rtems.h>
-#include <rtems/libio.h>
-#include <rtems/error.h>
-#include <rtems/rtems_bsdnet.h>
-
-#include <sys/errno.h>
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/mbuf.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/protosw.h>
-#include <sys/proc.h>
-#include <sys/filio.h>
-
-#include <net/if.h>
-#include <net/route.h>
-
-/*
- *********************************************************************
- *              Map RTEMS file descriptor to BSD socket              *
- *********************************************************************
- */
-struct fdsock {
-	int		indexFreeNext;
-	struct socket	*sock;
-};
-static struct fdsock *fdsock;
-static int fdsockCount;
-static int indexFreeHead = -1;
-
-/*
- * Convert an RTEMS file descriptor to a BSD socket pointer.
- */
-static struct socket *
-fdToSocket (int fd)
-{
-	int i;
-	struct socket *s;
-
-	if ((fd < 0)
-	 || (rtems_file_descriptor_type(fd) != RTEMS_FILE_DESCRIPTOR_TYPE_SOCKET)
-	 || ((i = rtems_file_descriptor_base(fd)) >= fdsockCount)
-	 || ((s = fdsock[i].sock) == NULL)) {
-		errno = EBADF;
-		return NULL;
-	}
-	return s;
-}
-
-/*
- * Enlarge the size of the file-descritor/socket pointer map.
- */
-static int
-enlargeFdMap (void)
-{
-	struct fdsock *nfdsock;
-	int i;
-
-	nfdsock = realloc (fdsock, sizeof *fdsock * (fdsockCount + 20));
-	if (nfdsock == NULL) {
-		errno = ENFILE;
-		return 0;
-	}
-	fdsock = nfdsock;
-	for (i = fdsockCount, fdsockCount += 20 ; i < fdsockCount ; i++) {
-		fdsock[i].sock = NULL;
-		fdsock[i].indexFreeNext = indexFreeHead;
-		indexFreeHead = i;
-	}
-	return 1;
-}
-
-/*
- * Create a file descriptor for a new socket
- */
-static int
-makeFd (struct socket *s)
-{
-	int i;
-
-	if ((indexFreeHead < 0) && !enlargeFdMap ())
-		return -1;
-	i = indexFreeHead;
-	indexFreeHead = fdsock[i].indexFreeNext;
-	fdsock[i].sock = s;
-	return rtems_make_file_descriptor(i,RTEMS_FILE_DESCRIPTOR_TYPE_SOCKET);
-}
-
-/*
- * Package system call argument into mbuf.
- */
-static int
-sockargstombuf (struct mbuf **mp, const void *buf, int buflen, int type)
-{
-	struct mbuf *m;
-
-	if ((u_int)buflen > MLEN)
-		return (EINVAL);
-	m = m_get(M_WAIT, type);
-	if (m == NULL)
-		return (ENOBUFS);
-	m->m_len = buflen;
-	memcpy (mtod(m, caddr_t), buf, buflen);
-	*mp = m;
-	if (type == MT_SONAME) {
-		struct sockaddr *sa;
-		sa = mtod(m, struct sockaddr *);
-		sa->sa_len = buflen;
-	}
-	return 0;
-}
-
-/*
- *********************************************************************
- *                       BSD-style entry points                      *
- *********************************************************************
- */
-int
-socket (int domain, int type, int protocol)
-{
-	int fd = -1;
-	int error;
-	struct socket *so;
-
-	rtems_bsdnet_semaphore_obtain ();
-	error = socreate(domain, &so, type, protocol, NULL);
-	if (error == 0) {
-		fd = makeFd (so);
-		if (fd < 0)
-			soclose (so);
-	}
-	else {
-		errno = error;
-		fd = -1;
-	}
-	rtems_bsdnet_semaphore_release ();
-	return fd;
-}
-
-int
-bind (int s, struct sockaddr *name, int namelen)
-{
-	int error;
-	int ret = -1;
-	struct socket *so;
-	struct mbuf *nam;
-
-	rtems_bsdnet_semaphore_obtain ();
-	if ((so = fdToSocket (s)) != NULL) {
-		error = sockargstombuf (&nam, name, namelen, MT_SONAME);
-		if (error == 0) {
-			error = sobind (so, nam);
-			if (error == 0)
-				ret = 0;
-			else
-				errno = error;
-			m_freem (nam);
-		}
-		else {
-			errno = error;
-		}
-	}
-	rtems_bsdnet_semaphore_release ();
-	return ret;
-}
-
-int
-connect (int s, struct sockaddr *name, int namelen)
-{
-	int error;
-	int ret = -1;
-	struct socket *so;
-	struct mbuf *nam;
-
-	rtems_bsdnet_semaphore_obtain ();
-	if ((so = fdToSocket (s)) == NULL) {
-		rtems_bsdnet_semaphore_release ();
-		return -1;
-	}
-	if ((so->so_state & SS_NBIO) && (so->so_state & SS_ISCONNECTING)) {
-		errno = EALREADY;
-		rtems_bsdnet_semaphore_release ();
-		return -1;
-	}
-	error = sockargstombuf (&nam, name, namelen, MT_SONAME);
-	if (error) {
-		errno = error;
-		rtems_bsdnet_semaphore_release ();
-		return -1;
-	}
-	error = soconnect (so, nam);
-	if (error) {
-		errno = error;
-		rtems_bsdnet_semaphore_release ();
-		return -1;
-	}
-	if ((so->so_state & SS_NBIO) && (so->so_state & SS_ISCONNECTING)) {
-		m_freem(nam);
-		errno = EINPROGRESS;
-		rtems_bsdnet_semaphore_release ();
-		return -1;
-	}
-	while ((so->so_state & SS_ISCONNECTING) && so->so_error == 0) {
-		soconnsleep (so);
-	}
-	if (error == 0) {
-		error = so->so_error;
-		so->so_error = 0;
-	}
-	so->so_state &= ~SS_ISCONNECTING;
-	m_freem (nam);
-	if (error == 0)
-		ret = 0;
-	rtems_bsdnet_semaphore_release ();
-	return ret;
-}
-
-int
-listen (int s, int backlog)
-{
-	int error;
-	int ret = -1;
-	struct socket *so;
-
-	rtems_bsdnet_semaphore_obtain ();
-	if ((so = fdToSocket (s)) != NULL) {
-		error = solisten (so, backlog);
-		if (error == 0)
-			ret = 0;
-		else
-			errno = error;
-	}
-	rtems_bsdnet_semaphore_release ();
-	return ret;
-}
-
-int
-accept (int s, struct sockaddr *name, int *namelen)
-{
-	int fd;
-	struct socket *head, *so;
-	struct mbuf *nam;
-
-	rtems_bsdnet_semaphore_obtain ();
-	if ((head = fdToSocket (s)) == NULL) {
-		rtems_bsdnet_semaphore_release ();
-		return -1;
-	}
-	if ((head->so_options & SO_ACCEPTCONN) == 0) {
-		errno = EINVAL;
-		rtems_bsdnet_semaphore_release ();
-		return -1;
-	}
-        if ((head->so_state & SS_NBIO) && head->so_comp.tqh_first == NULL) {
-                errno = EWOULDBLOCK;
-		rtems_bsdnet_semaphore_release ();
-		return -1;
-	}
-        while (head->so_comp.tqh_first == NULL && head->so_error == 0) {
-                if (head->so_state & SS_CANTRCVMORE) {
-                        head->so_error = ECONNABORTED;
-                        break;
-                }
-		soconnsleep (head);
-        }
-	if (head->so_error) {
-		errno = head->so_error;
-		head->so_error = 0;
-		rtems_bsdnet_semaphore_release ();
-		return -1;
-	}
-
-	so = head->so_comp.tqh_first;
-	TAILQ_REMOVE(&head->so_comp, so, so_list);
-	head->so_qlen--;
-
-	fd = makeFd (so);
-	if (fd < 0) {
-		TAILQ_INSERT_HEAD(&head->so_comp, so, so_list);
-		head->so_qlen++;
-		soconnwakeup (head);
-		rtems_bsdnet_semaphore_release ();
-		return -1;
-	}
-	so->so_state &= ~SS_COMP;
-	so->so_head = NULL;
-
-	nam = m_get(M_WAIT, MT_SONAME);
-	(void) soaccept(so, nam);
-	if (name) {
-		 /* check length before it is destroyed */
-		if (*namelen > nam->m_len)
-			*namelen = nam->m_len;
-		memcpy (name, mtod(nam, caddr_t), *namelen);
-	}
-	m_freem(nam);
-	rtems_bsdnet_semaphore_release ();
-	return (fd);
-
-}
-
-/*
- * All `transmit' operations end up calling this routine.
- */
-ssize_t
-sendmsg (int s, const struct msghdr *mp, int flags)
-{
-	int ret = -1;
-	int error;
-	struct uio auio;
-	struct iovec *iov;
-	struct socket *so;
-	struct mbuf *to, *control;
-	int i;
-	int len;
-
-	rtems_bsdnet_semaphore_obtain ();
-	if ((so = fdToSocket (s)) == NULL) {
-		rtems_bsdnet_semaphore_release ();
-		return -1;
-	}
-	auio.uio_iov = mp->msg_iov;
-	auio.uio_iovcnt = mp->msg_iovlen;
-	auio.uio_segflg = UIO_USERSPACE;
-	auio.uio_rw = UIO_WRITE;
-	auio.uio_offset = 0;
-	auio.uio_resid = 0;
-	iov = mp->msg_iov;
-	for (i = 0; i < mp->msg_iovlen; i++, iov++) {
-		if ((auio.uio_resid += iov->iov_len) < 0) {
-			errno = EINVAL;
-			rtems_bsdnet_semaphore_release ();
-			return -1;
-		}
-	}
-	if (mp->msg_name) {
-		error = sockargstombuf (&to, mp->msg_name, mp->msg_namelen, MT_SONAME);
-		if (error) {
-			errno = error;
-			rtems_bsdnet_semaphore_release ();
-			return -1;
-		}
-	}
-	else {
-		to = NULL;
-	}
-	if (mp->msg_control) {
-		if (mp->msg_controllen < sizeof (struct cmsghdr)) {
-			errno = EINVAL;
-			if (to)
-				m_freem(to);
-			rtems_bsdnet_semaphore_release ();
-			return -1;
-		}
-		sockargstombuf (&control, mp->msg_control, mp->msg_controllen, MT_CONTROL);
-	}
-	else {
-		control = NULL;
-	}
-	len = auio.uio_resid;
-	error = sosend (so, to, &auio, (struct mbuf *)0, control, flags);
-	if (error) {
-		if (auio.uio_resid != len && (error == EINTR || error == EWOULDBLOCK))
-			error = 0;
-	}
-	if (error) 
-		errno = error;
-	else
-		ret = len - auio.uio_resid;
-	if (to)
-		m_freem(to);
-	rtems_bsdnet_semaphore_release ();
-	return (ret);
-}
-
-/*
- * Send a message to a host
- */
-ssize_t
-sendto (int s, const void *buf, size_t buflen, int flags, const struct sockaddr *to, int tolen)
-{
-	struct msghdr msg;
-	struct iovec iov;
-
-	iov.iov_base = (void *)buf;
-	iov.iov_len = buflen;
-	msg.msg_name = (caddr_t)to;
-	msg.msg_namelen = tolen;
-	msg.msg_iov = &iov;
-	msg.msg_iovlen = 1;
-	msg.msg_control = NULL;
-	msg.msg_controllen = 0;
-	return sendmsg (s, &msg, flags);
-}
-
-/*
- * Send a message to a connected host
- */
-ssize_t
-send (int s, const void *buf, size_t buflen, int flags)
-{
-	return sendto (s, buf, buflen, flags, NULL, 0);
-}
-
-/*
- * All `receive' operations end up calling this routine.
- */
-ssize_t
-recvmsg (int s, struct msghdr *mp, int flags)
-{
-	int ret = -1;
-	int error;
-	struct uio auio;
-	struct iovec *iov;
-	struct socket *so;
-	struct mbuf *from = NULL, *control = NULL;
-	int i;
-	int len;
-
-	rtems_bsdnet_semaphore_obtain ();
-	if ((so = fdToSocket (s)) == NULL) {
-		rtems_bsdnet_semaphore_release ();
-		return -1;
-	}
-	auio.uio_iov = mp->msg_iov;
-	auio.uio_iovcnt = mp->msg_iovlen;
-	auio.uio_segflg = UIO_USERSPACE;
-	auio.uio_rw = UIO_READ;
-	auio.uio_offset = 0;
-	auio.uio_resid = 0;
-	iov = mp->msg_iov;
-	for (i = 0; i < mp->msg_iovlen; i++, iov++) {
-		if ((auio.uio_resid += iov->iov_len) < 0) {
-			errno = EINVAL;
-			rtems_bsdnet_semaphore_release ();
-			return -1;
-		}
-	}
-	len = auio.uio_resid;
-	mp->msg_flags = flags;
-	error = soreceive (so, &from, &auio, (struct mbuf **)NULL, 
-			mp->msg_control ? &control : (struct mbuf **)NULL,
-			&mp->msg_flags);
-	if (error) {
-		if (auio.uio_resid != len && (error == EINTR || error == EWOULDBLOCK))
-			error = 0;
-	}
-	if (error) {
-		errno = error;
-	}
-	else {
-		ret = len - auio.uio_resid;
-		if (mp->msg_name) {
-			len = mp->msg_namelen;
-			if ((len <= 0) || (from == NULL)) {
-				len = 0;
-			}
-			else {
-				if (len > from->m_len)
-					len = from->m_len;
-				memcpy (mp->msg_name, mtod(from, caddr_t), len);
-			}
-			mp->msg_namelen = len;
-		}
-		if (mp->msg_control) {
-			struct mbuf *m;
-			caddr_t ctlbuf;
-
-			len = mp->msg_controllen;
-			m = control;
-			mp->msg_controllen = 0;
-			ctlbuf = (caddr_t) mp->msg_control;
-
-			while (m && (len > 0)) {
-				unsigned int tocopy;
-
-				if (len >= m->m_len) 
-					tocopy = m->m_len;
-				else {
-					mp->msg_flags |= MSG_CTRUNC;
-					tocopy = len;
-				}
-				memcpy(ctlbuf, mtod(m, caddr_t), tocopy);
-				ctlbuf += tocopy;
-				len -= tocopy;
-				m = m->m_next;
-			}
-			mp->msg_controllen = ctlbuf - mp->msg_control;
-		}
-	}
-	if (from)
-		m_freem (from);
-	if (control)
-		m_freem (control);
-	rtems_bsdnet_semaphore_release ();
-	return (ret);
-}
-
-/*
- * Receive a message from a host
- */
-ssize_t
-recvfrom (int s, void *buf, size_t buflen, int flags, const struct sockaddr *from, int *fromlen)
-{
-	struct msghdr msg;
-	struct iovec iov;
-	int ret;
-
-	iov.iov_base = buf;
-	iov.iov_len = buflen;
-	msg.msg_name = (caddr_t)from;
-	msg.msg_namelen = *fromlen;
-	msg.msg_iov = &iov;
-	msg.msg_iovlen = 1;
-	msg.msg_control = NULL;
-	msg.msg_controllen = 0;
-	ret = recvmsg (s, &msg, flags);
-	if ((from != NULL) && (fromlen != NULL) && (ret >= 0))
-		*fromlen = msg.msg_namelen;
-	return ret;
-}
-
-/*
- * Receive a message from a connected host
- */
-ssize_t
-recv (int s, void *buf, size_t buflen, int flags)
-{
-	return recvfrom (s, buf, buflen, flags, NULL, NULL);
-}
-
-int
-setsockopt (int s, int level, int name, const void *val, int len)
-{
-	struct socket *so;
-	struct mbuf *m = NULL;
-	int error;
-
-	rtems_bsdnet_semaphore_obtain ();
-	if ((so = fdToSocket (s)) == NULL) {
-		rtems_bsdnet_semaphore_release ();
-		return -1;
-	}
-	if (len > MLEN) {
-		errno = EINVAL;
-		rtems_bsdnet_semaphore_release ();
-		return -1;
-	}
-	if (val) {
-		error = sockargstombuf (&m, val, len, MT_SOOPTS);
-		if (error) {
-			errno = error;
-			rtems_bsdnet_semaphore_release ();
-			return -1;
-		}
-	}
-	error = sosetopt(so, level, name, m);
-	if (error) {
-		errno = error;
-		rtems_bsdnet_semaphore_release ();
-		return -1;
-	}
-	rtems_bsdnet_semaphore_release ();
-	return 0;
-}
-
-int
-getsockopt (int s, int level, int name, void *aval, int *avalsize)
-{
-	struct socket *so;
-	struct mbuf *m = NULL, *m0;
-	char *val = aval;
-	int i, op, valsize;
-	int error;
-
-	rtems_bsdnet_semaphore_obtain ();
-	if ((so = fdToSocket (s)) == NULL) {
-		rtems_bsdnet_semaphore_release ();
-		return -1;
-	}
-	if (val)
-		valsize = *avalsize;
-	else
-		valsize = 0;
-	if (((error = sogetopt(so, level, name, &m)) == 0) && val && valsize && m) {
-		op = 0;
-		while (m && op < valsize) {
-			i = valsize - op;
-			if (i > m->m_len)
-				i = m->m_len;
-			memcpy (val, mtod(m, caddr_t), i);
-			op += i;
-			val += i;
-			m0 = m;
-			MFREE (m0, m);
-		}
-		*avalsize = op;
-	}
-	if (m != NULL)
-		(void) m_free(m);
-	if (error) {
-		errno = error;
-		rtems_bsdnet_semaphore_release ();
-		return -1;
-	}
-	rtems_bsdnet_semaphore_release ();
-	return 0;
-}
-
-static int
-getpeersockname (int s, struct sockaddr *name, int *namelen, int pflag)
-{
-	struct socket *so;
-	struct mbuf *m;
-	int len = *namelen;
-	int error;
-
-	rtems_bsdnet_semaphore_obtain ();
-	if ((so = fdToSocket (s)) == NULL) {
-		rtems_bsdnet_semaphore_release ();
-		return -1;
-	}
-	m = m_getclr(M_WAIT, MT_SONAME);
-	if (m == NULL) {
-		errno = ENOBUFS;
-		rtems_bsdnet_semaphore_release ();
-		return -1;
-	}
-	if (pflag)
-		error = (*so->so_proto->pr_usrreqs->pru_peeraddr)(so, m);
-	else
-		error = (*so->so_proto->pr_usrreqs->pru_sockaddr)(so, m);
-	if (error) {
-		errno = error;
-		rtems_bsdnet_semaphore_release ();
-		return -1;
-	}
-	if (len > m->m_len) {
-		len = m->m_len;
-		*namelen = len;
-	}
-	memcpy (name, mtod(m, caddr_t), len);
-	m_freem (m);
-	rtems_bsdnet_semaphore_release ();
-	return 0;
-}
-
-int
-getpeername (int s, struct sockaddr *name, int *namelen)
-{
-	return getpeersockname (s, name, namelen, 1);
-}
-int
-getsockname (int s, struct sockaddr *name, int *namelen)
-{
-	return getpeersockname (s, name, namelen, 0);
-}
-
-/*
- ************************************************************************
- *                 RTEMS EXTERNAL I/O HANDLER ROUTINES                  *
- ************************************************************************
- */
-static int
-rtems_bsdnet_close (int fd)
-{
-	struct socket *so;
-	int error;
-	int i;
-
-	rtems_bsdnet_semaphore_obtain ();
-	if ((so = fdToSocket (fd)) == NULL) {
-		rtems_bsdnet_semaphore_release ();
-		return -1;
-	}
-	i = rtems_file_descriptor_base(fd);
-	fdsock[i].indexFreeNext = indexFreeHead;;
-	indexFreeHead = i;
-	error = soclose (so);
-	rtems_bsdnet_semaphore_release ();
-	if (error) {
-		errno = error;
-		return -1;
-	}
-	return 0;
-}
-
-static int
-rtems_bsdnet_read (int fd, void *buffer, unsigned32 count)
-{
-	return recv (fd, buffer, count, 0);
-}
-
-static int
-rtems_bsdnet_write (int fd, const void *buffer, unsigned32 count)
-{
-	return send (fd, buffer, count, 0);
-}
-
-static int
-so_ioctl (struct socket *so, unsigned32 command, void *buffer)
-{
-	switch (command) {
-	case FIONBIO:
-		if (*(int *)buffer)
-			so->so_state |= SS_NBIO;
-		else
-			so->so_state &= ~SS_NBIO;
-		return 0;
-
-	case FIONREAD:
-		*(int *)buffer = so->so_rcv.sb_cc;
-		return 0;
-	}
-
-	if (IOCGROUP(command) == 'i')
-		return ifioctl (so, command, buffer, NULL);
-	if (IOCGROUP(command) == 'r')
-		return rtioctl (command, buffer, NULL);
-	return (*so->so_proto->pr_usrreqs->pru_control)(so, command, buffer, 0);
-}
-
-static int
-rtems_bsdnet_ioctl (int fd, unsigned32 command, void *buffer)
-{
-	struct socket *so;
-	int error;
-
-	rtems_bsdnet_semaphore_obtain ();
-	if ((so = fdToSocket (fd)) == NULL) {
-		rtems_bsdnet_semaphore_release ();
-		return -1;
-	}
-	error = so_ioctl (so, command, buffer);
-	rtems_bsdnet_semaphore_release ();
-	if (error) {
-		errno = error;
-		return -1;
-	}
-	return 0;
-}
-
-rtems_libio_handler_t rtems_bsdnet_io_handler = {
-	NULL,			/* open */
-	rtems_bsdnet_close,	/* close */
-	rtems_bsdnet_read,	/* read */
-	rtems_bsdnet_write,	/* write */
-	rtems_bsdnet_ioctl,	/* ioctl */
-	NULL,			/* lseek */
-};
-
diff --git a/c/src/exec/libnetworking/rtems/sghostname.c b/c/src/exec/libnetworking/rtems/sghostname.c
deleted file mode 100644
index 36894caa86..0000000000
--- a/c/src/exec/libnetworking/rtems/sghostname.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * RTEMS versions of hostname functions
- * FIXME: Not thread-safe
- *
- *  $Id$
- */
-
-#include <string.h>
-#include <errno.h>
-#include <rtems/rtems_bsdnet.h>
-#include <sys/param.h>
-#include <sys/malloc.h>
-#include <sys/kernel.h>
-
-static char *rtems_hostname;
-
-int
-gethostname (char *name, int namelen)
-{
-	char *cp = rtems_hostname;
-
-	if (cp == NULL)
-		cp = "";
-	strncpy (name, cp, namelen);
-	return 0;
-}
-
-int
-sethostname (char *name, int namelen)
-{
-	char *old, *new;
-
-	if (namelen >= MAXHOSTNAMELEN) {
-		errno = EINVAL;
-		return -1;
-	}
-	new = malloc (namelen + 1, M_HTABLE, M_NOWAIT);
-	if (new == NULL) {
-		errno = ENOMEM;
-		return -1;
-	}
-	strncpy (new, name, namelen);
-	new[namelen] = '\0';
-	old = rtems_hostname;
-	rtems_hostname = new;
-	if (old)
-		free (old, M_HTABLE);
-	return 0;
-}
diff --git a/c/src/exec/libnetworking/rtems/tftp.h b/c/src/exec/libnetworking/rtems/tftp.h
deleted file mode 100644
index d09782e22b..0000000000
--- a/c/src/exec/libnetworking/rtems/tftp.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- *  $Id$
- */
-
-/*
- * Trivial File Transfer Protocol (TFTP)
- *
- * Transfer file to/from remote host
- *
- * W. Eric Norum
- * Saskatchewan Accelerator Laboratory
- * University of Saskatchewan
- * Saskatoon, Saskatchewan, CANADA
- * eric@skatter.usask.ca
- */
-
-/*
- * Usage:
- * 
- * To open `/bootfiles/image' on `hostname' for reading:
- *         fd = open ("/TFTP/hostname/bootfiles/image", O_RDONLY);
- *
- * The `hostname' must be four dot-separated decimal values.
- *
- * To open a file on the host which supplied the BOOTP
- * information just leave the `hostname' part empty:
- *         fd = open ("/TFTP//bootfiles/image", O_RDONLY);
- *
- */
-
-#ifndef _TFTP_DRIVER_h
-#define _TFTP_DRIVER_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * Driver entry points
- */
-#define TFTP_DRIVER_TABLE_ENTRY \
-  { rtems_tftp_initialize, rtems_tftp_open, rtems_tftp_close, \
-    rtems_tftp_read, rtems_tftp_write, rtems_tftp_control }
-
-rtems_device_driver rtems_tftp_initialize(
-  rtems_device_major_number,
-  rtems_device_minor_number,
-  void *
-);
-
-rtems_device_driver rtems_tftp_open(
-  rtems_device_major_number,
-  rtems_device_minor_number,
-  void *
-);
-
-rtems_device_driver rtems_tftp_close(
-  rtems_device_major_number,
-  rtems_device_minor_number,
-  void *
-);
-
-rtems_device_driver rtems_tftp_read(
-  rtems_device_major_number,
-  rtems_device_minor_number,
-  void *
-);
-
-rtems_device_driver rtems_tftp_write(
-  rtems_device_major_number,
-  rtems_device_minor_number,
-  void *
-);
-
-rtems_device_driver rtems_tftp_control(
-  rtems_device_major_number,
-  rtems_device_minor_number,
-  void *
-);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/c/src/exec/libnetworking/sys/buf.h b/c/src/exec/libnetworking/sys/buf.h
deleted file mode 100644
index 6cca571141..0000000000
--- a/c/src/exec/libnetworking/sys/buf.h
+++ /dev/null
@@ -1,248 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)buf.h	8.9 (Berkeley) 3/30/95
- * $Id$
- */
-
-#ifndef _SYS_BUF_H_
-#define	_SYS_BUF_H_
-
-#include <sys/queue.h>
-
-#define NOLIST ((struct buf *)0x87654321)
-
-struct buf;
-
-struct iodone_chain {
-	long	ic_prev_flags;
-	void	(*ic_prev_iodone) __P((struct buf *));
-	void	*ic_prev_iodone_chain;
-	struct {
-		long	ia_long;
-		void	*ia_ptr;
-	}	ic_args[5];
-};
-
-typedef TAILQ_HEAD(buf_queue_head, buf) buf_queue_head, *buf_queue_head_t;
-
-/*
- * The buffer header describes an I/O operation in the kernel.
- */
-struct buf {
-	LIST_ENTRY(buf) b_hash;		/* Hash chain. */
-	LIST_ENTRY(buf) b_vnbufs;	/* Buffer's associated vnode. */
-	TAILQ_ENTRY(buf) b_freelist;	/* Free list position if not active. */
-	TAILQ_ENTRY(buf) b_act;		/* Device driver queue when active. *new* */
-	struct  proc *b_proc;		/* Associated proc; NULL if kernel. */
-	long	b_flags;		/* B_* flags. */
-	unsigned short b_qindex;	/* buffer queue index */
-	unsigned char b_usecount;	/* buffer use count */
-	int	b_error;		/* Errno value. */
-	long	b_bufsize;		/* Allocated buffer size. */
-	long	b_bcount;		/* Valid bytes in buffer. */
-	long	b_resid;		/* Remaining I/O. */
-	dev_t	b_dev;			/* Device associated with buffer. */
-	struct {
-		caddr_t	b_addr;		/* Memory, superblocks, indirect etc. */
-	} b_un;
-	caddr_t	b_kvabase;		/* base kva for buffer */
-	int	b_kvasize;		/* size of kva for buffer */
-	void	*b_saveaddr;		/* Original b_addr for physio. */
-	daddr_t	b_lblkno;		/* Logical block number. */
-	daddr_t	b_blkno;		/* Underlying physical block number. */
-					/* Function to call upon completion. */
-	void	(*b_iodone) __P((struct buf *));
-					/* For nested b_iodone's. */
-	struct	iodone_chain *b_iodone_chain;
-	struct	vnode *b_vp;		/* Device vnode. */
-	int	b_dirtyoff;		/* Offset in buffer of dirty region. */
-	int	b_dirtyend;		/* Offset of end of dirty region. */
-	struct	ucred *b_rcred;		/* Read credentials reference. */
-	struct	ucred *b_wcred;		/* Write credentials reference. */
-	int	b_validoff;		/* Offset in buffer of valid region. */
-	int	b_validend;		/* Offset of end of valid region. */
-	daddr_t	b_pblkno;               /* physical block number */
-	caddr_t	b_savekva;              /* saved kva for transfer while bouncing */
-	void	*b_driver1;		/* for private use by the driver */
-	void	*b_driver2;		/* for private use by the driver */
-	void	*b_spc;
-	union	cluster_info {
-		TAILQ_HEAD(cluster_list_head, buf) cluster_head;
-		TAILQ_ENTRY(buf) cluster_entry;
-	} b_cluster;
-	struct	vm_page *b_pages[btoc(MAXPHYS)];
-	int		b_npages;
-};
-
-/* Device driver compatibility definitions. */
-#define	b_data	 b_un.b_addr		/* b_un.b_addr is not changeable. */
-
-/*
- * These flags are kept in b_flags.
- */
-#define	B_AGE		0x00000001	/* Move to age queue when I/O done. */
-#define	B_NEEDCOMMIT	0x00000002	/* Append-write in progress. */
-#define	B_ASYNC		0x00000004	/* Start I/O, do not wait. */
-#define	B_BAD		0x00000008	/* Bad block revectoring in progress. */
-#define	B_BUSY		0x00000010	/* I/O in progress. */
-#define	B_CACHE		0x00000020	/* Bread found us in the cache. */
-#define	B_CALL		0x00000040	/* Call b_iodone from biodone. */
-#define	B_DELWRI	0x00000080	/* Delay I/O until buffer reused. */
-#define	B_DIRTY		0x00000100	/* Dirty page to be pushed out async. */
-#define	B_DONE		0x00000200	/* I/O completed. */
-#define	B_EINTR		0x00000400	/* I/O was interrupted */
-#define	B_ERROR		0x00000800	/* I/O error occurred. */
-#define	B_GATHERED	0x00001000	/* LFS: already in a segment. */
-#define	B_INVAL		0x00002000	/* Does not contain valid info. */
-#define	B_LOCKED	0x00004000	/* Locked in core (not reusable). */
-#define	B_NOCACHE	0x00008000	/* Do not cache block after use. */
-#define	B_MALLOC	0x00010000	/* malloced b_data */
-#define	B_CLUSTEROK	0x00020000	/* Pagein op, so swap() can count it. */
-#define	B_PHYS		0x00040000	/* I/O to user memory. */
-#define	B_RAW		0x00080000	/* Set by physio for raw transfers. */
-#define	B_READ		0x00100000	/* Read buffer. */
-#define	B_TAPE		0x00200000	/* Magnetic tape I/O. */
-#define	B_RELBUF	0x00400000	/* Release VMIO buffer. */
-#define	B_WANTED	0x00800000	/* Process wants this buffer. */
-#define	B_WRITE		0x00000000	/* Write buffer (pseudo flag). */
-#define	B_WRITEINPROG	0x01000000	/* Write in progress. */
-#define	B_XXX		0x02000000	/* Debugging flag. */
-#define	B_PAGING	0x04000000	/* volatile paging I/O -- bypass VMIO */
-#define	B_ORDERED	0x08000000	/* Must guarantee I/O ordering */
-#define B_VMIO		0x20000000	/* VMIO flag */
-#define B_CLUSTER	0x40000000	/* pagein op, so swap() can count it */
-#define B_BOUNCE	0x80000000	/* bounce buffer flag */
-
-/*
- * number of buffer hash entries
- */
-#define BUFHSZ 512
-
-/*
- * buffer hash table calculation, originally by David Greenman
- */
-#define BUFHASH(vnp, bn)        \
-	(&bufhashtbl[(((unsigned long)(vnp) >> 7)+(int)(bn)) % BUFHSZ])
-
-/*
- * Definitions for the buffer free lists.
- */
-#define BUFFER_QUEUES	6	/* number of free buffer queues */
-
-extern LIST_HEAD(bufhashhdr, buf) bufhashtbl[BUFHSZ], invalhash;
-extern TAILQ_HEAD(bqueues, buf) bufqueues[BUFFER_QUEUES];
-
-#define QUEUE_NONE	0	/* on no queue */
-#define QUEUE_LOCKED	1	/* locked buffers */
-#define QUEUE_LRU	2	/* useful buffers */
-#define QUEUE_VMIO	3	/* VMIO buffers */
-#define QUEUE_AGE	4	/* not-useful buffers */
-#define QUEUE_EMPTY	5	/* empty buffer headers*/
-
-/*
- * Zero out the buffer's data area.
- */
-#define	clrbuf(bp) {							\
-	bzero((bp)->b_data, (u_int)(bp)->b_bcount);			\
-	(bp)->b_resid = 0;						\
-}
-
-/* Flags to low-level allocation routines. */
-#define B_CLRBUF	0x01	/* Request allocated buffer be cleared. */
-#define B_SYNC		0x02	/* Do all allocations synchronously. */
-
-#ifdef KERNEL
-extern int	nbuf;			/* The number of buffer headers */
-extern struct	buf *buf;		/* The buffer headers. */
-extern char	*buffers;		/* The buffer contents. */
-extern int	bufpages;		/* Number of memory pages in the buffer pool. */
-extern struct	buf *swbuf;		/* Swap I/O buffer headers. */
-extern int	nswbuf;			/* Number of swap I/O buffer headers. */
-extern TAILQ_HEAD(swqueue, buf) bswlist;
-
-void	bufinit __P((void));
-void	bremfree __P((struct buf *));
-int	bread __P((struct vnode *, daddr_t, int,
-	    struct ucred *, struct buf **));
-int	breadn __P((struct vnode *, daddr_t, int, daddr_t *, int *, int,
-	    struct ucred *, struct buf **));
-int	bwrite __P((struct buf *));
-void	bdwrite __P((struct buf *));
-void	bawrite __P((struct buf *));
-int	bowrite __P((struct buf *));
-void	brelse __P((struct buf *));
-void	bqrelse __P((struct buf *));
-int	vfs_bio_awrite __P((struct buf *));
-struct buf *     getpbuf __P((void));
-struct buf *incore __P((struct vnode *, daddr_t));
-struct buf *gbincore __P((struct vnode *, daddr_t));
-int	inmem __P((struct vnode *, daddr_t));
-struct buf *getblk __P((struct vnode *, daddr_t, int, int, int));
-struct buf *geteblk __P((int));
-int	allocbuf __P((struct buf *, int));
-int	biowait __P((struct buf *));
-void	biodone __P((struct buf *));
-
-void	cluster_callback __P((struct buf *));
-int	cluster_read __P((struct vnode *, u_quad_t, daddr_t, long,
-	    struct ucred *, struct buf **));
-int	cluster_wbuild __P((struct vnode *, long, daddr_t, int));
-void	cluster_write __P((struct buf *, u_quad_t));
-int	physio __P((void (*)(struct buf *), struct buf *, dev_t, 
-	    int, u_int (*)(struct buf *), struct uio *));
-u_int	minphys __P((struct buf *));
-void	vfs_bio_clrbuf __P((struct buf *));
-void	vfs_busy_pages __P((struct buf *, int clear_modify));
-void	vfs_unbusy_pages(struct buf *);
-void	vwakeup __P((struct buf *));
-void	vmapbuf __P((struct buf *));
-void	vunmapbuf __P((struct buf *));
-void	relpbuf __P((struct buf *));
-void	brelvp __P((struct buf *));
-void	bgetvp __P((struct vnode *, struct buf *));
-void	pbgetvp __P((struct vnode *, struct buf *));
-void	pbrelvp __P((struct buf *));
-void	reassignbuf __P((struct buf *, struct vnode *));
-struct	buf *trypbuf __P((void));
-void	vm_bounce_alloc __P((struct buf *));
-void	vm_bounce_free __P((struct buf *));
-vm_offset_t	vm_bounce_kva_alloc __P((int));
-void	vm_bounce_kva_alloc_free __P((vm_offset_t, int));
-#endif /* KERNEL */
-
-#endif /* !_SYS_BUF_H_ */
diff --git a/c/src/exec/libnetworking/sys/callout.h b/c/src/exec/libnetworking/sys/callout.h
deleted file mode 100644
index 5fec98f28b..0000000000
--- a/c/src/exec/libnetworking/sys/callout.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)callout.h	8.2 (Berkeley) 1/21/94
- * $Id$
- */
-
-#ifndef _SYS_CALLOUT_H_
-#define _SYS_CALLOUT_H_
-
-struct callout {
-	struct	callout *c_next;		/* next callout in queue */
-	void	*c_arg;				/* function argument */
-	void	(*c_func) __P((void *));	/* function to call */
-	int	c_time;				/* ticks to the event */
-};
-
-#ifdef KERNEL
-extern struct	callout *callfree, *callout, calltodo;
-extern int	ncallout;
-#endif
-
-#endif
diff --git a/c/src/exec/libnetworking/sys/conf.h b/c/src/exec/libnetworking/sys/conf.h
deleted file mode 100644
index 92d99d9d07..0000000000
--- a/c/src/exec/libnetworking/sys/conf.h
+++ /dev/null
@@ -1,228 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)conf.h	8.5 (Berkeley) 1/9/95
- * $Id$
- */
-
-#ifndef _SYS_CONF_H_
-#define	_SYS_CONF_H_
-
-/*
- * Definitions of device driver entry switches
- */
-
-struct buf;
-struct proc;
-struct tty;
-struct uio;
-struct vnode;
-
-typedef int d_open_t __P((dev_t dev, int oflags, int devtype, struct proc *p));
-typedef int d_close_t __P((dev_t dev, int fflag, int devtype, struct proc *p));
-typedef void d_strategy_t __P((struct buf *bp));
-typedef int d_ioctl_t __P((dev_t dev, int cmd, caddr_t data,
-			   int fflag, struct proc *p));
-typedef int d_dump_t __P((dev_t dev));
-typedef int d_psize_t __P((dev_t dev));
-
-typedef int d_read_t __P((dev_t dev, struct uio *uio, int ioflag));
-typedef int d_write_t __P((dev_t dev, struct uio *uio, int ioflag));
-typedef void d_stop_t __P((struct tty *tp, int rw));
-typedef int d_reset_t __P((dev_t dev));
-typedef struct tty *d_devtotty_t __P((dev_t dev));
-typedef int d_select_t __P((dev_t dev, int which, struct proc *p));
-typedef int d_mmap_t __P((dev_t dev, int offset, int nprot));
-
-typedef int l_open_t __P((dev_t dev, struct tty *tp));
-typedef int l_close_t __P((struct tty *tp, int flag));
-typedef int l_read_t __P((struct tty *tp, struct uio *uio, int flag));
-typedef int l_write_t __P((struct tty *tp, struct uio *uio, int flag));
-typedef int l_ioctl_t __P((struct tty *tp, int cmd, caddr_t data,
-			   int flag, struct proc *p));
-typedef int l_rint_t __P((int c, struct tty *tp));
-typedef int l_start_t __P((struct tty *tp));
-typedef int l_modem_t __P((struct tty *tp, int flag));
-
-/*
- * Block device switch table
- */
-struct bdevsw {
-	d_open_t	*d_open;
-	d_close_t	*d_close;
-	d_strategy_t	*d_strategy;
-	d_ioctl_t	*d_ioctl;
-	d_dump_t	*d_dump;
-	d_psize_t	*d_psize;
-	int		d_flags;
-	char 		*d_name;	/* name of the driver e.g. audio */
-	struct cdevsw	*d_cdev; 	/* cross pointer to the cdev */
-	int		d_maj;		/* the major number we were assigned */
-};
-
-#ifdef KERNEL
-extern struct bdevsw *bdevsw[];
-#endif
-
-/*
- * Character device switch table
- */
-struct cdevsw {
-	d_open_t	*d_open;
-	d_close_t	*d_close;
-	d_read_t	*d_read;
-	d_write_t	*d_write;
-	d_ioctl_t	*d_ioctl;
-	d_stop_t	*d_stop;
-	d_reset_t	*d_reset;	/* XXX not used */
-	d_devtotty_t	*d_devtotty;
-	d_select_t	*d_select;
-	d_mmap_t	*d_mmap;
-	d_strategy_t	*d_strategy;
-	char		*d_name;	/* see above */
-	struct bdevsw	*d_bdev;
-	int		d_maj;
-};
-
-#ifdef KERNEL
-extern struct cdevsw *cdevsw[];
-#endif
-
-/*
- * Line discipline switch table
- */
-struct linesw {
-	l_open_t	*l_open;
-	l_close_t	*l_close;
-	l_read_t	*l_read;
-	l_write_t	*l_write;
-	l_ioctl_t	*l_ioctl;
-	l_rint_t	*l_rint;
-	l_start_t	*l_start;
-	l_modem_t	*l_modem;
-};
-
-#ifdef KERNEL
-extern struct linesw linesw[];
-extern int nlinesw;
-
-int ldisc_register __P((int , struct linesw *));
-void ldisc_deregister __P((int));
-#define LDISC_LOAD 	-1		/* Loadable line discipline */
-#endif
-
-/*
- * Swap device table
- */
-struct swdevt {
-	dev_t	sw_dev;
-	int	sw_flags;
-	int	sw_nblks;
-	struct	vnode *sw_vp;
-};
-#define	SW_FREED	0x01
-#define	SW_SEQUENTIAL	0x02
-#define	sw_freed	sw_flags	/* XXX compat */
-
-#ifdef KERNEL
-d_open_t	noopen;
-d_close_t	noclose;
-d_read_t	noread;
-d_write_t	nowrite;
-d_ioctl_t	noioctl;
-d_stop_t	nostop;
-d_reset_t	noreset;
-d_devtotty_t	nodevtotty;
-d_select_t	noselect;
-d_mmap_t	nommap;
-
-/* Bogus defines for compatibility. */
-#define	noioc		noioctl
-#define	nostrat		nostrategy
-#define zerosize	nopsize
-/*
- * XXX d_strategy seems to be unused for cdevs that aren't associated with
- * bdevs and called without checking for it being non-NULL for bdevs.
- */
-#define	nostrategy	((d_strategy_t *)NULL)
-
-d_dump_t	nodump;
-
-/*
- * nopsize is little used, so not worth having dummy functions for.
- */
-#define	nopsize	((d_psize_t *)NULL)
-
-d_open_t	nullopen;
-d_close_t	nullclose;
-#define	nullstop nostop		/* one void return is as good as another */
-#define	nullreset noreset	/* one unused function is as good as another */
-
-d_open_t	nxopen;
-d_close_t	nxclose;
-d_read_t	nxread;
-d_write_t	nxwrite;
-d_ioctl_t	nxioctl;
-#define	nxstop	nostop		/* one void return is as good as another */
-#define	nxreset	noreset		/* one unused function is as good as another */
-#define	nxdevtotty nodevtotty	/* one NULL return is as good as another */
-d_select_t	nxselect;
-#define	nxmmap	nommap		/* one -1 return is as good as another */
-#define	nxstrategy nostrategy	/* one NULL value is as good as another */
-d_dump_t	nxdump;
-#define	nxpsize	nopsize		/* one NULL value is as good as another */
-
-d_read_t	rawread;
-d_write_t	rawwrite;
-
-l_read_t	l_noread;
-l_write_t	l_nowrite;
-
-int	bdevsw_add __P((dev_t *descrip,struct bdevsw *new,struct bdevsw **old));
-int	cdevsw_add __P((dev_t *descrip,struct cdevsw *new,struct cdevsw **old));
-void	cdevsw_make __P((struct bdevsw *from));
-void	bdevsw_add_generic __P((int bdev, int cdev, struct bdevsw *bdevsw));
-dev_t	chrtoblk __P((dev_t dev));
-int	isdisk __P((dev_t dev, int type));
-int	iskmemdev __P((dev_t dev));
-int	iszerodev __P((dev_t dev));
-void	setconf __P((void));
-#endif /* KERNEL */
-
-#include <machine/conf.h>
-
-#endif /* !_SYS_CONF_H_ */
diff --git a/c/src/exec/libnetworking/sys/domain.h b/c/src/exec/libnetworking/sys/domain.h
deleted file mode 100644
index 2ec8a5fb05..0000000000
--- a/c/src/exec/libnetworking/sys/domain.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)domain.h	8.1 (Berkeley) 6/2/93
- * $Id$
- */
-
-#ifndef _SYS_DOMAIN_H_
-#define _SYS_DOMAIN_H_
-
-/*
- * Structure per communications domain.
- */
-
-/*
- * Forward structure declarations for function prototypes [sic].
- */
-struct	mbuf;
-
-struct	domain {
-	int	dom_family;		/* AF_xxx */
-	char	*dom_name;
-	void	(*dom_init)		/* initialize domain data structures */
-		__P((void));
-	int	(*dom_externalize)	/* externalize access rights */
-		__P((struct mbuf *));
-	void	(*dom_dispose)		/* dispose of internalized rights */
-		__P((struct mbuf *));
-	struct	protosw *dom_protosw, *dom_protoswNPROTOSW;
-	struct	domain *dom_next;
-	int	(*dom_rtattach)		/* initialize routing table */
-		__P((void **, int));
-	int	dom_rtoffset;		/* an arg to rtattach, in bits */
-	int	dom_maxrtkey;		/* for routing layer */
-};
-
-#ifdef KERNEL
-extern struct	domain *domains;
-extern struct	domain localdomain;
-
-#define DOMAIN_SET(name) \
-	DATA_SET(domain_set, name ## domain);
-
-#endif
-
-#endif
diff --git a/c/src/exec/libnetworking/sys/kernel.h b/c/src/exec/libnetworking/sys/kernel.h
deleted file mode 100644
index 35bce70bd6..0000000000
--- a/c/src/exec/libnetworking/sys/kernel.h
+++ /dev/null
@@ -1,251 +0,0 @@
-/*-
- * Copyright (c) 1995 Terrence R. Lambert
- * All rights reserved.
- *
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)kernel.h	8.3 (Berkeley) 1/21/94
- * $Id$
- */
-
-#ifndef _SYS_KERNEL_H_
-#define _SYS_KERNEL_H_
-
-/* Global variables for the kernel. */
-
-/* 1.1 */
-extern long hostid;
-extern char hostname[MAXHOSTNAMELEN];
-extern int hostnamelen;
-extern char domainname[MAXHOSTNAMELEN];
-extern int domainnamelen;
-extern char kernelname[MAXPATHLEN];
-
-/* 1.2 */
-extern volatile struct timeval mono_time;
-extern struct timeval boottime;
-extern struct timeval runtime;
-/* extern volatile struct timeval time; */
-extern struct timezone tz;			/* XXX */
-
-extern int tick;			/* usec per tick (1000000 / hz) */
-extern int hz;				/* system clock's frequency */
-extern int psratio;			/* ratio: prof / stat */
-extern int stathz;			/* statistics clock's frequency */
-extern int profhz;			/* profiling clock's frequency */
-extern int ticks;
-extern int lbolt;			/* once a second sleep address */
-extern int tickdelta;
-extern long timedelta;
-
-/*
- * The following macros are used to declare global sets of objects, which
- * are collected by the linker into a `struct linker_set' as defined below.
- *
- * NB: the constants defined below must match those defined in
- * ld/ld.h.  Since their calculation requires arithmetic, we
- * can't name them symbolically (e.g., 23 is N_SETT | N_EXT).
- */
-#define MAKE_SET(set, sym, type)
-#define TEXT_SET(set, sym) MAKE_SET(set, sym, 23)
-#define DATA_SET(set, sym) MAKE_SET(set, sym, 25)
-#define BSS_SET(set, sym)  MAKE_SET(set, sym, 27)
-#define ABS_SET(set, sym)  MAKE_SET(set, sym, 21)
-
-
-/*
- * Enumerated types for known system startup interfaces.
- *
- * Startup occurs in ascending numeric order; the list entries are
- * sorted prior to attempting startup to guarantee order.  Items
- * of the same level are arbitrated for order based on the 'order'
- * element.
- *
- * These numbers are arbitrary and are chosen ONLY for ordering; the
- * enumeration values are explicit rather than implicit to provide
- * for binary compatibility with inserted elements.
- *
- * The SI_SUB_RUN_SCHEDULER value must have the highest lexical value.
- *
- * The SI_SUB_CONSOLE and SI_SUB_SWAP values represent values used by
- * the BSD 4.4Lite but not by FreeBSD; they are maintained in dependent
- * order to support porting.
- *
- * The SI_SUB_PROTO_BEGIN and SI_SUB_PROTO_END bracket a range of
- * initializations to take place at splimp().  This is a historical
- * wart that should be removed -- probably running everything at
- * splimp() until the first init that doesn't want it is the correct
- * fix.  They are currently present to ensure historical behavior.
- */
-enum sysinit_sub_id {
-	SI_SUB_DUMMY		= 0x00000000,	/* not executed; for linker*/
-	SI_SUB_CONSOLE		= 0x08000000,	/* console*/
-	SI_SUB_COPYRIGHT	= 0x08000001,	/* first use of console*/
-	SI_SUB_VM		= 0x10000000,	/* virtual memory system init*/
-	SI_SUB_KMEM		= 0x18000000,	/* kernel memory*/
-	SI_SUB_CPU		= 0x20000000,	/* CPU resource(s)*/
-	SI_SUB_DEVFS		= 0x22000000,	/* get DEVFS ready */
-	SI_SUB_DRIVERS		= 0x23000000,	/* Let Drivers initialize */
-	SI_SUB_CONFIGURE	= 0x24000000,	/* Configure devices */
-	SI_SUB_INTRINSIC	= 0x28000000,	/* proc 0*/
-	SI_SUB_RUN_QUEUE	= 0x30000000,	/* the run queue*/
-	SI_SUB_VM_CONF		= 0x38000000,	/* config VM, set limits*/
-	SI_SUB_VFS		= 0x40000000,	/* virtual file system*/
-	SI_SUB_CLOCKS		= 0x48000000,	/* real time and stat clocks*/
-	SI_SUB_MBUF		= 0x50000000,	/* mbufs*/
-	SI_SUB_CLIST		= 0x58000000,	/* clists*/
-	SI_SUB_SYSV_SHM		= 0x64000000,	/* System V shared memory*/
-	SI_SUB_SYSV_SEM		= 0x68000000,	/* System V semaphores*/
-	SI_SUB_SYSV_MSG		= 0x6C000000,	/* System V message queues*/
-	SI_SUB_PSEUDO		= 0x70000000,	/* pseudo devices*/
-	SI_SUB_PROTO_BEGIN	= 0x80000000,	/* XXX: set splimp (kludge)*/
-	SI_SUB_PROTO_IF		= 0x84000000,	/* interfaces*/
-	SI_SUB_PROTO_DOMAIN	= 0x88000000,	/* domains (address families?)*/
-	SI_SUB_PROTO_END	= 0x8fffffff,	/* XXX: set splx (kludge)*/
-	SI_SUB_KPROF		= 0x90000000,	/* kernel profiling*/
-	SI_SUB_KICK_SCHEDULER	= 0xa0000000,	/* start the timeout events*/
-	SI_SUB_ROOT		= 0xb0000000,	/* root mount*/
-	SI_SUB_ROOT_FDTAB	= 0xb8000000,	/* root vnode in fd table...*/
-	SI_SUB_SWAP		= 0xc0000000,	/* swap*/
-	SI_SUB_INTRINSIC_POST	= 0xd0000000,	/* proc 0 cleanup*/
-	SI_SUB_KTHREAD_INIT	= 0xe0000000,	/* init process*/
-	SI_SUB_KTHREAD_PAGE	= 0xe4000000,	/* pageout daemon*/
-	SI_SUB_KTHREAD_VM	= 0xe8000000,	/* vm daemon*/
-	SI_SUB_KTHREAD_UPDATE	= 0xec000000,	/* update daemon*/
-	SI_SUB_RUN_SCHEDULER	= 0xffffffff	/* scheduler: no return*/
-};
-
-
-/*
- * Some enumerated orders; "ANY" sorts last.
- */
-enum sysinit_elem_order {
-	SI_ORDER_FIRST		= 0x00000000,	/* first*/
-	SI_ORDER_SECOND		= 0x00000001,	/* second*/
-	SI_ORDER_THIRD		= 0x00000002,	/* third*/
-	SI_ORDER_MIDDLE		= 0x10000000,	/* somewhere in the middle */
-	SI_ORDER_ANY		= 0xffffffff	/* last*/
-};
-
-
-/*
- * System initialization call types; currently two are supported... one
- * to do a simple function call and one to cause a process to be started
- * by the kernel on the callers behalf.
- */
-typedef enum sysinit_elem_type {
-	SI_TYPE_DEFAULT		= 0x00000000,	/* No special processing*/
-	SI_TYPE_KTHREAD		= 0x00000001	/* start kernel thread*/
-} si_elem_t;
-
-
-/*
- * A system initialization call instance
- *
- * The subsystem
- */
-struct sysinit {
-	unsigned int	subsystem;		/* subsystem identifier*/
-	unsigned int	order;			/* init order within subsystem*/
-	void		(*func) __P((void *));	/* init function*/
-	void		*udata;			/* multiplexer/argument */
-	si_elem_t	type;			/* sysinit_elem_type*/
-};
-
-
-/*
- * Default: no special processing
- */
-#define	SYSINIT(uniquifier, subsystem, order, func, ident)	
-
-/*
- * Call 'fork()' before calling '(*func)(ident)';
- * for making a kernel 'thread' (or builtin process.)
- */
-#define	SYSINIT_KT(uniquifier, subsystem, order, func, ident)
-
-
-/*
- * A kernel process descriptor; used to start "internal" daemons
- *
- * Note: global_procpp may be NULL for no global save area
- */
-struct kproc_desc {
-	char		*arg0;			/* arg 0 (for 'ps' listing)*/
-	void		(*func) __P((void));	/* "main" for kernel process*/
-	struct proc	**global_procpp;	/* ptr to proc ptr save area*/
-};
-
-void	kproc_start __P((void *udata));
-
-#ifdef PSEUDO_LKM
-#include <sys/conf.h>
-#include <sys/exec.h>
-#include <sys/sysent.h>
-#include <sys/lkm.h>
-
-#define PSEUDO_SET(init, name) \
-	extern struct linker_set MODVNOPS; \
-	MOD_MISC(name); \
-	static int \
-	name ## _load(struct lkm_table *lkmtp, int cmd) \
-		{ init((void *)NULL /* XXX unused (?) */); return 0; } \
-	static int \
-	name ## _unload(struct lkm_table *lkmtp, int cmd) \
-		{ return EINVAL; } \
-	int \
-	name ## _mod(struct lkm_table *lkmtp, int cmd, int ver) { \
-		DISPATCH(lkmtp, cmd, ver, name ## _load, name ## _unload, \
-			 lkm_nullcmd); }
-#else /* PSEUDO_LKM */
-
-/*
- * Compatibility.  To be deprecated after LKM is updated.
- */
-#define	PSEUDO_SET(sym, name)	SYSINIT(ps, SI_SUB_PSEUDO, SI_ORDER_ANY, sym, 0)
-
-#endif /* PSEUDO_LKM */
-
-struct linker_set {
-	int		ls_length;
-	const void	*ls_items[1];		/* really ls_length of them,
-						 * trailing NULL */
-};
-
-extern struct linker_set execsw_set;
-
-#endif /* !_SYS_KERNEL_H_*/
diff --git a/c/src/exec/libnetworking/sys/libkern.h b/c/src/exec/libnetworking/sys/libkern.h
deleted file mode 100644
index c01e35b273..0000000000
--- a/c/src/exec/libnetworking/sys/libkern.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)libkern.h	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#ifndef _SYS_LIBKERN_H_
-#define	_SYS_LIBKERN_H_
-
-#include <sys/cdefs.h>
-#include <sys/types.h>
-
-/* BCD conversions. */
-extern u_char const	bcd2bin_data[];
-extern u_char const	bin2bcd_data[];
-extern char const	hex2ascii_data[];
-
-#define	bcd2bin(bcd)	(bcd2bin_data[bcd])
-#define	bin2bcd(bin)	(bin2bcd_data[bin])
-#define	hex2ascii(hex)	(hex2ascii_data[hex])
-
-static __inline int imax(int a, int b) { return (a > b ? a : b); }
-static __inline int imin(int a, int b) { return (a < b ? a : b); }
-static __inline long lmax(long a, long b) { return (a > b ? a : b); }
-static __inline long lmin(long a, long b) { return (a < b ? a : b); }
-static __inline u_int max(u_int a, u_int b) { return (a > b ? a : b); }
-static __inline u_int min(u_int a, u_int b) { return (a < b ? a : b); }
-static __inline quad_t qmax(quad_t a, quad_t b) { return (a > b ? a : b); }
-static __inline quad_t qmin(quad_t a, quad_t b) { return (a < b ? a : b); }
-static __inline u_long ulmax(u_long a, u_long b) { return (a > b ? a : b); }
-static __inline u_long ulmin(u_long a, u_long b) { return (a < b ? a : b); }
-
-/* Prototypes for non-quad routines. */
-int	 bcmp __P((const void *, const void *, size_t));
-#ifndef HAVE_INLINE_FFS
-int	 ffs __P((int));
-#endif
-#ifndef	HAVE_INLINE_FLS
-int	 fls __P((int));
-#endif
-int	 locc __P((int, char *, u_int));
-void	 qsort __P((void *base, size_t nmemb, size_t size,
-		    int (*compar)(const void *, const void *)));
-u_long	 random __P((void));
-char	*index __P((const char *, int));
-char	*rindex __P((const char *, int));
-int	 scanc __P((u_int, const u_char *, const u_char *, int));
-int	 skpc __P((int, int, char *));
-void	 srandom __P((u_long));
-char	*strcat __P((char *, const char *));
-int	 strcmp __P((const char *, const char *));
-char	*strdup __P((const char *s));
-char	*strcpy __P((char *, const char *));
-size_t	 strlen __P((const char *));
-int	 strncmp __P((const char *, const char *, size_t));
-char	*strncpy __P((char *, const char *, size_t));
-char	*strerror __P((int errnum));
-
-#endif /* !_SYS_LIBKERN_H_ */
diff --git a/c/src/exec/libnetworking/sys/malloc.h b/c/src/exec/libnetworking/sys/malloc.h
deleted file mode 100644
index ec85c1814d..0000000000
--- a/c/src/exec/libnetworking/sys/malloc.h
+++ /dev/null
@@ -1,355 +0,0 @@
-/*
- * Copyright (c) 1987, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)malloc.h	8.5 (Berkeley) 5/3/95
- * $Id$
- */
-
-#ifndef _SYS_MALLOC_H_
-#define	_SYS_MALLOC_H_
-
-#include <rtems/rtems_bsdnet_internal.h>  /* Ensure we get RTEMS malloc hooks */
-#define KMEMSTATS
-
-/*
- * flags to malloc
- */
-#define	M_WAITOK	0x0000
-#define	M_NOWAIT	0x0001
-#define M_KERNEL	0x0002
-
-/*
- * Types of memory to be allocated
- */
-#define	M_FREE		0	/* should be on free list */
-#define	M_MBUF		1	/* mbuf */
-#define	M_DEVBUF	2	/* device driver memory */
-#define	M_SOCKET	3	/* socket structure */
-#define	M_PCB		4	/* protocol control block */
-#define	M_RTABLE	5	/* routing tables */
-#define	M_HTABLE	6	/* IMP host tables */
-#define	M_FTABLE	7	/* fragment reassembly header */
-#define	M_ZOMBIE	8	/* zombie proc status */
-#define	M_IFADDR	9	/* interface address */
-#define	M_SOOPTS	10	/* socket options */
-#define	M_SONAME	11	/* socket name */
-#define	M_NAMEI		12	/* namei path name buffer */
-#define	M_GPROF		13	/* kernel profiling buffer */
-#define	M_IOCTLOPS	14	/* ioctl data buffer */
-#define	M_MAPMEM	15	/* mapped memory descriptors */
-#define	M_CRED		16	/* credentials */
-#define	M_PGRP		17	/* process group header */
-#define	M_SESSION	18	/* session header */
-#define	M_IOV		19	/* large iov's */
-#define	M_MOUNT		20	/* vfs mount struct */
-#define	M_FHANDLE	21	/* network file handle */
-#define	M_NFSREQ	22	/* NFS request header */
-#define	M_NFSMNT	23	/* NFS mount structure */
-#define	M_NFSNODE	24	/* NFS vnode private part */
-#define	M_VNODE		25	/* Dynamically allocated vnodes */
-#define	M_CACHE		26	/* Dynamically allocated cache entries */
-#define	M_DQUOT		27	/* UFS quota entries */
-#define	M_UFSMNT	28	/* UFS mount structure */
-#define	M_SHM		29	/* SVID compatible shared memory segments */
-#define	M_VMMAP		30	/* VM map structures */
-#define	M_VMMAPENT	31	/* VM map entry structures */
-#define	M_VMOBJ		32	/* VM object structure */
-#define	M_VMOBJHASH	33	/* VM object hash structure */
-#define	M_VMPMAP	34	/* VM pmap */
-#define	M_VMPVENT	35	/* VM phys-virt mapping entry */
-#define	M_VMPAGER	36	/* XXX: VM pager struct */
-#define	M_VMPGDATA	37	/* XXX: VM pager private data */
-#define	M_FILE		38	/* Open file structure */
-#define	M_FILEDESC	39	/* Open file descriptor table */
-#define	M_LOCKF		40	/* Byte-range locking structures */
-#define	M_PROC		41	/* Proc structures */
-#define	M_SUBPROC	42	/* Proc sub-structures */
-#define	M_SEGMENT	43	/* Segment for LFS */
-#define	M_LFSNODE	44	/* LFS vnode private part */
-#define	M_FFSNODE	45	/* FFS vnode private part */
-#define	M_MFSNODE	46	/* MFS vnode private part */
-#define	M_NQLEASE	47	/* Nqnfs lease */
-#define	M_NQMHOST	48	/* Nqnfs host address table */
-#define	M_NETADDR	49	/* Export host address structure */
-#define	M_NFSSVC	50	/* Nfs server structure */
-#define	M_NFSUID	51	/* Nfs uid mapping structure */
-#define	M_NFSD		52	/* Nfs server daemon structure */
-#define	M_IPMOPTS	53	/* internet multicast options */
-#define	M_IPMADDR	54	/* internet multicast address */
-#define	M_IFMADDR	55	/* link-level multicast address */
-#define	M_MRTABLE	56	/* multicast routing tables */
-#define M_ISOFSMNT	57	/* ISOFS mount structure */
-#define M_ISOFSNODE	58	/* ISOFS vnode private part */
-#define M_NFSRVDESC	59	/* NFS server socket descriptor */
-#define M_NFSDIROFF	60	/* NFS directory offset data */
-#define M_NFSBIGFH	61	/* NFS version 3 file handle */
-#define M_MSDOSFSMNT	67	/* MSDOSFS mount structure */
-#define M_MSDOSFSNODE	68	/* MSDOSFS vnode private part */
-#define M_MSDOSFSFAT	69	/* MSDOSFS file allocation table */
-#define M_DEVFSMNT	70	/* DEVFS mount structure */
-#define M_DEVFSBACK	71	/* DEVFS Back node */
-#define M_DEVFSFRONT	72	/* DEVFS Front node */
-#define M_DEVFSNODE	73	/* DEVFS node */
-#define	M_TEMP		74	/* misc temporary data buffers */
-#define M_TTYS		75	/* tty data structures */
-#define M_GZIP		76	/* Gzip trees */
-#define M_IPFW		77	/* IpFw/IpAcct chain's */
-#define M_DEVL		78	/* isa_device lists in userconfig() */
-#define M_PKTCLASS	79	/* structures used in packet classifier */
-#define	M_SYSCTL	80	/* sysctl internal magic */
-#define	M_SECA		81	/* security associations, key management */
-#define	M_BIOBUF	82	/* BIO buffer */
-#define	M_KTRACE	83	/* KTRACE */
-#define	M_SELECT	84	/* select() buffer */
-#define M_CFS		85	/* Coda */
-#define	M_LAST		86	/* Must be last type + 1 */
-
-#define INITKMEMNAMES { \
-	"free",		/* 0 M_FREE */ \
-	"mbuf",		/* 1 M_MBUF */ \
-	"devbuf",	/* 2 M_DEVBUF */ \
-	"socket",	/* 3 M_SOCKET */ \
-	"pcb",		/* 4 M_PCB */ \
-	"routetbl",	/* 5 M_RTABLE */ \
-	"hosttbl",	/* 6 M_HTABLE */ \
-	"fragtbl",	/* 7 M_FTABLE */ \
-	"zombie",	/* 8 M_ZOMBIE */ \
-	"ifaddr",	/* 9 M_IFADDR */ \
-	"soopts",	/* 10 M_SOOPTS */ \
-	"soname",	/* 11 M_SONAME */ \
-	"namei",	/* 12 M_NAMEI */ \
-	"gprof",	/* 13 M_GPROF */ \
-	"ioctlops",	/* 14 M_IOCTLOPS */ \
-	"mapmem",	/* 15 M_MAPMEM */ \
-	"cred",		/* 16 M_CRED */ \
-	"pgrp",		/* 17 M_PGRP */ \
-	"session",	/* 18 M_SESSION */ \
-	"iov",		/* 19 M_IOV */ \
-	"mount",	/* 20 M_MOUNT */ \
-	"fhandle",	/* 21 M_FHANDLE */ \
-	"NFS req",	/* 22 M_NFSREQ */ \
-	"NFS mount",	/* 23 M_NFSMNT */ \
-	"NFS node",	/* 24 M_NFSNODE */ \
-	"vnodes",	/* 25 M_VNODE */ \
-	"namecache",	/* 26 M_CACHE */ \
-	"UFS quota",	/* 27 M_DQUOT */ \
-	"UFS mount",	/* 28 M_UFSMNT */ \
-	"shm",		/* 29 M_SHM */ \
-	"VM map",	/* 30 M_VMMAP */ \
-	"VM mapent",	/* 31 M_VMMAPENT */ \
-	"VM object",	/* 32 M_VMOBJ */ \
-	"VM objhash",	/* 33 M_VMOBJHASH */ \
-	"VM pmap",	/* 34 M_VMPMAP */ \
-	"VM pvmap",	/* 35 M_VMPVENT */ \
-	"VM pager",	/* 36 M_VMPAGER */ \
-	"VM pgdata",	/* 37 M_VMPGDATA */ \
-	"file",		/* 38 M_FILE */ \
-	"file desc",	/* 39 M_FILEDESC */ \
-	"lockf",	/* 40 M_LOCKF */ \
-	"proc",		/* 41 M_PROC */ \
-	"subproc",	/* 42 M_SUBPROC */ \
-	"LFS segment",	/* 43 M_SEGMENT */ \
-	"LFS node",	/* 44 M_LFSNODE */ \
-	"FFS node",	/* 45 M_FFSNODE */ \
-	"MFS node",	/* 46 M_MFSNODE */ \
-	"NQNFS Lease",	/* 47 M_NQLEASE */ \
-	"NQNFS Host",	/* 48 M_NQMHOST */ \
-	"Export Host",	/* 49 M_NETADDR */ \
-	"NFS srvsock",	/* 50 M_NFSSVC */ \
-	"NFS uid",	/* 51 M_NFSUID */ \
-	"NFS daemon",	/* 52 M_NFSD */ \
-	"ip_moptions",	/* 53 M_IPMOPTS */ \
-	"in_multi",	/* 54 M_IPMADDR */ \
-	"ether_multi",	/* 55 M_IFMADDR */ \
-	"mrt",		/* 56 M_MRTABLE */ \
-	"ISOFS mount",	/* 57 M_ISOFSMNT */ \
-	"ISOFS node",	/* 58 M_ISOFSNODE */ \
-	"NFSV3 srvdesc",/* 59 M_NFSRVDESC */ \
-	"NFSV3 diroff",	/* 60 M_NFSDIROFF */ \
-	"NFSV3 bigfh",	/* 61 M_NFSBIGFH */ \
-	NULL, \
-	NULL, NULL, NULL, NULL, \
-	"MSDOSFS mount",/* 67 M_MSDOSFSMNT */ \
-	"MSDOSFS node",	/* 68 M_MSDOSFSNODE */ \
-	"MSDOSFS FAT",  /* 69 M_MSDOSFSFAR */ \
-	"DEVFS mount",	/* 70 M_DEVFSMNT */ \
-	"DEVFS back",	/* 71 M_DEVFSBACK */ \
-	"DEVFS front",	/* 72 M_DEVFSFRONT */ \
-	"DEVFS node",	/* 73 M_DEVFSNODE */ \
-	"temp",		/* 74 M_TEMP */ \
-	"ttys",		/* 75 M_TTYS */ \
-	"Gzip trees",	/* 76 M_GZIP */ \
-	"IpFw/IpAcct",	/* 77 M_IPFW */ \
-	"isa_devlist",	/* 78 M_DEVL */ \
-	"PktClass",	/* 79 M_PKTCLASS */ \
-	"sysctl",	/* 80 M_SYSCTL */ \
-	"key mgmt",	/* 81 M_SECA */ \
-	"BIO buffer",	/* 82 M_BIOBUF */ \
-	"KTRACE",	/* 83 M_KTRACE */ \
-	"select",	/* 84 M_SELECT */ \
-	"Coda",		/* 85 M_CFS */ \
-}
-
-struct kmemstats {
-	long	ks_inuse;	/* # of packets of this type currently in use */
-	long	ks_calls;	/* total packets of this type ever allocated */
-	long 	ks_memuse;	/* total memory held in bytes */
-	u_short	ks_limblocks;	/* number of times blocked for hitting limit */
-	u_short	ks_mapblocks;	/* number of times blocked for kernel map */
-	long	ks_maxused;	/* maximum number ever used */
-	long	ks_limit;	/* most that are allowed to exist */
-	long	ks_size;	/* sizes of this thing that are allocated */
-	long	ks_spare;
-};
-
-/*
- * Array of descriptors that describe the contents of each page
- */
-struct kmemusage {
-	short ku_indx;		/* bucket index */
-	union {
-		u_short freecnt;/* for small allocations, free pieces in page */
-		u_short pagecnt;/* for large allocations, pages alloced */
-	} ku_un;
-};
-#define ku_freecnt ku_un.freecnt
-#define ku_pagecnt ku_un.pagecnt
-
-/*
- * Set of buckets for each size of memory block that is retained
- */
-struct kmembuckets {
-	caddr_t kb_next;	/* list of free blocks */
-	caddr_t kb_last;	/* last free block */
-	long	kb_calls;	/* total calls to allocate this size */
-	long	kb_total;	/* total number of blocks allocated */
-	long	kb_totalfree;	/* # of free elements in this bucket */
-	long	kb_elmpercl;	/* # of elements in this sized allocation */
-	long	kb_highwat;	/* high water mark */
-	long	kb_couldfree;	/* over high water mark and could free */
-};
-
-#ifdef KERNEL
-#define	MINALLOCSIZE	(1 << MINBUCKET)
-#define BUCKETINDX(size) \
-	((size) <= (MINALLOCSIZE * 128) \
-		? (size) <= (MINALLOCSIZE * 8) \
-			? (size) <= (MINALLOCSIZE * 2) \
-				? (size) <= (MINALLOCSIZE * 1) \
-					? (MINBUCKET + 0) \
-					: (MINBUCKET + 1) \
-				: (size) <= (MINALLOCSIZE * 4) \
-					? (MINBUCKET + 2) \
-					: (MINBUCKET + 3) \
-			: (size) <= (MINALLOCSIZE* 32) \
-				? (size) <= (MINALLOCSIZE * 16) \
-					? (MINBUCKET + 4) \
-					: (MINBUCKET + 5) \
-				: (size) <= (MINALLOCSIZE * 64) \
-					? (MINBUCKET + 6) \
-					: (MINBUCKET + 7) \
-		: (size) <= (MINALLOCSIZE * 2048) \
-			? (size) <= (MINALLOCSIZE * 512) \
-				? (size) <= (MINALLOCSIZE * 256) \
-					? (MINBUCKET + 8) \
-					: (MINBUCKET + 9) \
-				: (size) <= (MINALLOCSIZE * 1024) \
-					? (MINBUCKET + 10) \
-					: (MINBUCKET + 11) \
-			: (size) <= (MINALLOCSIZE * 8192) \
-				? (size) <= (MINALLOCSIZE * 4096) \
-					? (MINBUCKET + 12) \
-					: (MINBUCKET + 13) \
-				: (size) <= (MINALLOCSIZE * 16384) \
-					? (MINBUCKET + 14) \
-					: (MINBUCKET + 15))
-
-/*
- * Turn virtual addresses into kmem map indices
- */
-#define kmemxtob(alloc)	(kmembase + (alloc) * PAGE_SIZE)
-#define btokmemx(addr)	(((caddr_t)(addr) - kmembase) / PAGE_SIZE)
-#define btokup(addr)	(&kmemusage[(caddr_t)(addr) - kmembase >> PAGE_SHIFT])
-
-/*
- * Macro versions for the usual cases of malloc/free
- */
-#if defined(KMEMSTATS) || defined(DIAGNOSTIC)
-#define	MALLOC(space, cast, size, type, flags) \
-	(space) = (cast)malloc((u_long)(size), type, flags)
-#define FREE(addr, type) free((addr), type)
-
-#else /* do not collect statistics */
-#define	MALLOC(space, cast, size, type, flags) { \
-	register struct kmembuckets *kbp = &bucket[BUCKETINDX(size)]; \
-	long s = splimp(); \
-	if (kbp->kb_next == NULL) { \
-		(space) = (cast)malloc((u_long)(size), type, flags); \
-	} else { \
-		(space) = (cast)kbp->kb_next; \
-		kbp->kb_next = *(caddr_t *)(space); \
-	} \
-	splx(s); \
-}
-
-#define FREE(addr, type) { \
-	register struct kmembuckets *kbp; \
-	register struct kmemusage *kup = btokup(addr); \
-	long s = splimp(); \
-	if (1 << kup->ku_indx > MAXALLOCSAVE) { \
-		free((addr), type); \
-	} else { \
-		kbp = &bucket[kup->ku_indx]; \
-		if (kbp->kb_next == NULL) \
-			kbp->kb_next = (caddr_t)(addr); \
-		else \
-			*(caddr_t *)(kbp->kb_last) = (caddr_t)(addr); \
-		*(caddr_t *)(addr) = NULL; \
-		kbp->kb_last = (caddr_t)(addr); \
-	} \
-	splx(s); \
-}
-#endif /* do not collect statistics */
-
-extern struct kmemstats kmemstats[];
-extern struct kmemusage *kmemusage;
-extern char *kmembase;
-extern struct kmembuckets bucket[];
-
-void	*contigmalloc __P((unsigned long size, int type, int flags,
-			   unsigned long low, unsigned long high,
-			   unsigned long alignment, unsigned long boundary));
-void	free __P((void *addr, int type));
-void	*malloc __P((unsigned long size, int type, int flags));
-#endif /* KERNEL */
-
-#endif /* !_SYS_MALLOC_H_ */
diff --git a/c/src/exec/libnetworking/sys/mbuf.h b/c/src/exec/libnetworking/sys/mbuf.h
deleted file mode 100644
index b380b3fca3..0000000000
--- a/c/src/exec/libnetworking/sys/mbuf.h
+++ /dev/null
@@ -1,439 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)mbuf.h	8.5 (Berkeley) 2/19/95
- * $Id$
- */
-
-#ifndef _SYS_MBUF_H_
-#define _SYS_MBUF_H_
-
-#ifndef M_WAITOK
-#include <sys/malloc.h>
-#endif
-
-/*
- * Mbufs are of a single size, MSIZE (machine/machparam.h), which
- * includes overhead.  An mbuf may add a single "mbuf cluster" of size
- * MCLBYTES (also in machine/machparam.h), which has no additional overhead
- * and is used instead of the internal data area; this is done when
- * at least MINCLSIZE of data must be stored.
- */
-
-#define	MLEN		(MSIZE - sizeof(struct m_hdr))	/* normal data len */
-#define	MHLEN		(MLEN - sizeof(struct pkthdr))	/* data len w/pkthdr */
-
-#define	MINCLSIZE	(MHLEN + MLEN)	/* smallest amount to put in cluster */
-#define	M_MAXCOMPRESS	(MHLEN / 2)	/* max amount to copy for compression */
-
-/*
- * Macros for type conversion
- * mtod(m,t) -	convert mbuf pointer to data pointer of correct type
- * dtom(x) -	convert data pointer within mbuf to mbuf pointer (XXX)
- * mtocl(x) -	convert pointer within cluster to cluster index #
- * cltom(x) -	convert cluster # to ptr to beginning of cluster
- */
-#define	mtod(m,t)	((t)((m)->m_data))
-#define	dtom(x)		((struct mbuf *)((long)(x) & ~(MSIZE-1)))
-#define	mtocl(x)	(((u_long)(x) - (u_long)mbutl) >> MCLSHIFT)
-#define	cltom(x)	((caddr_t)((u_long)mbutl + ((u_long)(x) << MCLSHIFT)))
-
-/* header at beginning of each mbuf: */
-struct m_hdr {
-	struct	mbuf *mh_next;		/* next buffer in chain */
-	struct	mbuf *mh_nextpkt;	/* next chain in queue/record */
-	caddr_t	mh_data;		/* location of data */
-	int	mh_len;			/* amount of data in this mbuf */
-	short	mh_type;		/* type of data in this mbuf */
-	short	mh_flags;		/* flags; see below */
-};
-
-/* record/packet header in first mbuf of chain; valid if M_PKTHDR set */
-struct	pkthdr {
-	struct	ifnet *rcvif;		/* rcv interface */
-	int	len;			/* total packet length */
-};
-
-/* description of external storage mapped into mbuf, valid if M_EXT set */
-struct m_ext {
-	caddr_t	ext_buf;		/* start of buffer */
-	void	(*ext_free)		/* free routine if not the usual */
-		__P((caddr_t, u_int));
-	u_int	ext_size;		/* size of buffer, for ext_free */
-	void	(*ext_ref)		/* add a reference to the ext object */
-		__P((caddr_t, u_int));
-};
-
-struct mbuf {
-	struct	m_hdr m_hdr;
-	union {
-		struct {
-			struct	pkthdr MH_pkthdr;	/* M_PKTHDR set */
-			union {
-				struct	m_ext MH_ext;	/* M_EXT set */
-				char	MH_databuf[MHLEN];
-			} MH_dat;
-		} MH;
-		char	M_databuf[MLEN];		/* !M_PKTHDR, !M_EXT */
-	} M_dat;
-};
-#define	m_next		m_hdr.mh_next
-#define	m_len		m_hdr.mh_len
-#define	m_data		m_hdr.mh_data
-#define	m_type		m_hdr.mh_type
-#define	m_flags		m_hdr.mh_flags
-#define	m_nextpkt	m_hdr.mh_nextpkt
-#define	m_act		m_nextpkt
-#define	m_pkthdr	M_dat.MH.MH_pkthdr
-#define	m_ext		M_dat.MH.MH_dat.MH_ext
-#define	m_pktdat	M_dat.MH.MH_dat.MH_databuf
-#define	m_dat		M_dat.M_databuf
-
-/* mbuf flags */
-#define	M_EXT		0x0001	/* has associated external storage */
-#define	M_PKTHDR	0x0002	/* start of record */
-#define	M_EOR		0x0004	/* end of record */
-#define	M_PROTO1	0x0008	/* protocol-specific */
-
-/* mbuf pkthdr flags, also in m_flags */
-#define	M_BCAST		0x0100	/* send/received as link-level broadcast */
-#define	M_MCAST		0x0200	/* send/received as link-level multicast */
-
-/* flags copied when copying m_pkthdr */
-#define	M_COPYFLAGS	(M_PKTHDR|M_EOR|M_PROTO1|M_BCAST|M_MCAST)
-
-/* mbuf types */
-#define	MT_FREE		0	/* should be on free list */
-#define	MT_DATA		1	/* dynamic (data) allocation */
-#define	MT_HEADER	2	/* packet header */
-#define	MT_SOCKET	3	/* socket structure */
-#define	MT_PCB		4	/* protocol control block */
-#define	MT_RTABLE	5	/* routing tables */
-#define	MT_HTABLE	6	/* IMP host tables */
-#define	MT_ATABLE	7	/* address resolution tables */
-#define	MT_SONAME	8	/* socket name */
-#define	MT_SOOPTS	10	/* socket options */
-#define	MT_FTABLE	11	/* fragment reassembly header */
-#define	MT_RIGHTS	12	/* access rights */
-#define	MT_IFADDR	13	/* interface address */
-#define MT_CONTROL	14	/* extra-data protocol message */
-#define MT_OOBDATA	15	/* expedited data  */
-
-/* flags to m_get/MGET */
-#define	M_DONTWAIT	M_NOWAIT
-#define	M_WAIT		M_WAITOK
-
-/* Freelists:
- *
- * Normal mbuf clusters are normally treated as character arrays
- * after allocation, but use the first word of the buffer as a free list
- * pointer while on the free list.
- */
-union mcluster {
-	union	mcluster *mcl_next;
-	char	mcl_buf[MCLBYTES];
-};
-
-/*
- * mbuf utility macros:
- *
- *	MBUFLOCK(code)
- * prevents a section of code from from being interrupted by network
- * drivers.
- */
-#define	MBUFLOCK(code) \
-	{ int ms = splimp(); \
-	  { code } \
-	  splx(ms); \
-	}
-
-/*
- * mbuf allocation/deallocation macros:
- *
- *	MGET(struct mbuf *m, int how, int type)
- * allocates an mbuf and initializes it to contain internal data.
- *
- *	MGETHDR(struct mbuf *m, int how, int type)
- * allocates an mbuf and initializes it to contain a packet header
- * and internal data.
- */
-#define	MGET(m, how, type) { \
-	  int _ms = splimp(); \
-	  if (mmbfree == 0) \
-		(void)m_mballoc(1, (how)); \
-	  if (((m) = mmbfree) != 0) { \
-		mmbfree = (m)->m_next; \
-		mbstat.m_mtypes[MT_FREE]--; \
-		(m)->m_type = (type); \
-		mbstat.m_mtypes[type]++; \
-		(m)->m_next = (struct mbuf *)NULL; \
-		(m)->m_nextpkt = (struct mbuf *)NULL; \
-		(m)->m_data = (m)->m_dat; \
-		(m)->m_flags = 0; \
-		splx(_ms); \
-	} else { \
-		splx(_ms); \
-		(m) = m_retry((how), (type)); \
-	} \
-}
-
-#define	MGETHDR(m, how, type) { \
-	  int _ms = splimp(); \
-	  if (mmbfree == 0) \
-		(void)m_mballoc(1, (how)); \
-	  if (((m) = mmbfree) != 0) { \
-		mmbfree = (m)->m_next; \
-		mbstat.m_mtypes[MT_FREE]--; \
-		(m)->m_type = (type); \
-		mbstat.m_mtypes[type]++; \
-		(m)->m_next = (struct mbuf *)NULL; \
-		(m)->m_nextpkt = (struct mbuf *)NULL; \
-		(m)->m_data = (m)->m_pktdat; \
-		(m)->m_flags = M_PKTHDR; \
-		splx(_ms); \
-	} else { \
-		splx(_ms); \
-		(m) = m_retryhdr((how), (type)); \
-	} \
-}
-
-/*
- * Mbuf cluster macros.
- * MCLALLOC(caddr_t p, int how) allocates an mbuf cluster.
- * MCLGET adds such clusters to a normal mbuf;
- * the flag M_EXT is set upon success.
- * MCLFREE releases a reference to a cluster allocated by MCLALLOC,
- * freeing the cluster if the reference count has reached 0.
- */
-#define	MCLALLOC(p, how) \
-	MBUFLOCK( \
-	  if (mclfree == 0) \
-		(void)m_clalloc(1, (how)); \
-	  if (((p) = (caddr_t)mclfree) != 0) { \
-		++mclrefcnt[mtocl(p)]; \
-		mbstat.m_clfree--; \
-		mclfree = ((union mcluster *)(p))->mcl_next; \
-	  } \
-	)
-
-#define	MCLGET(m, how) \
-	{ MCLALLOC((m)->m_ext.ext_buf, (how)); \
-	  if ((m)->m_ext.ext_buf != NULL) { \
-		(m)->m_data = (m)->m_ext.ext_buf; \
-		(m)->m_flags |= M_EXT; \
-		(m)->m_ext.ext_free = NULL;  \
-		(m)->m_ext.ext_ref = NULL;  \
-		(m)->m_ext.ext_size = MCLBYTES;  \
-	  } \
-	}
-
-#define	MCLFREE(p) \
-	MBUFLOCK ( \
-	  if (--mclrefcnt[mtocl(p)] == 0) { \
-		((union mcluster *)(p))->mcl_next = mclfree; \
-		mclfree = (union mcluster *)(p); \
-		mbstat.m_clfree++; \
-	  } \
-	)
-
-/*
- * MFREE(struct mbuf *m, struct mbuf *n)
- * Free a single mbuf and associated external storage.
- * Place the successor, if any, in n.
- */
-#define	MFREE(m, n) \
-	MBUFLOCK(  \
-	  mbstat.m_mtypes[(m)->m_type]--; \
-	  if ((m)->m_flags & M_EXT) { \
-		if ((m)->m_ext.ext_free) \
-			(*((m)->m_ext.ext_free))((m)->m_ext.ext_buf, \
-			    (m)->m_ext.ext_size); \
-		else { \
-			char *p = (m)->m_ext.ext_buf; \
-			if (--mclrefcnt[mtocl(p)] == 0) { \
-				((union mcluster *)(p))->mcl_next = mclfree; \
-				mclfree = (union mcluster *)(p); \
-				mbstat.m_clfree++; \
-			} \
-		} \
-	  } \
-	  (n) = (m)->m_next; \
-	  (m)->m_type = MT_FREE; \
-	  mbstat.m_mtypes[MT_FREE]++; \
-	  (m)->m_next = mmbfree; \
-	  mmbfree = (m); \
-	)
-
-/*
- * Copy mbuf pkthdr from from to to.
- * from must have M_PKTHDR set, and to must be empty.
- */
-#define	M_COPY_PKTHDR(to, from) { \
-	(to)->m_pkthdr = (from)->m_pkthdr; \
-	(to)->m_flags = (from)->m_flags & M_COPYFLAGS; \
-	(to)->m_data = (to)->m_pktdat; \
-}
-
-/*
- * Set the m_data pointer of a newly-allocated mbuf (m_get/MGET) to place
- * an object of the specified size at the end of the mbuf, longword aligned.
- */
-#define	M_ALIGN(m, len) \
-	{ (m)->m_data += (MLEN - (len)) &~ (sizeof(long) - 1); }
-/*
- * As above, for mbufs allocated with m_gethdr/MGETHDR
- * or initialized by M_COPY_PKTHDR.
- */
-#define	MH_ALIGN(m, len) \
-	{ (m)->m_data += (MHLEN - (len)) &~ (sizeof(long) - 1); }
-
-/*
- * Compute the amount of space available
- * before the current start of data in an mbuf.
- */
-#define	M_LEADINGSPACE(m) \
-	((m)->m_flags & M_EXT ? /* (m)->m_data - (m)->m_ext.ext_buf */ 0 : \
-	    (m)->m_flags & M_PKTHDR ? (m)->m_data - (m)->m_pktdat : \
-	    (m)->m_data - (m)->m_dat)
-
-/*
- * Compute the amount of space available
- * after the end of data in an mbuf.
- */
-#define	M_TRAILINGSPACE(m) \
-	((m)->m_flags & M_EXT ? (m)->m_ext.ext_buf + (m)->m_ext.ext_size - \
-	    ((m)->m_data + (m)->m_len) : \
-	    &(m)->m_dat[MLEN] - ((m)->m_data + (m)->m_len))
-
-/*
- * Arrange to prepend space of size plen to mbuf m.
- * If a new mbuf must be allocated, how specifies whether to wait.
- * If how is M_DONTWAIT and allocation fails, the original mbuf chain
- * is freed and m is set to NULL.
- */
-#define	M_PREPEND(m, plen, how) { \
-	if (M_LEADINGSPACE(m) >= (plen)) { \
-		(m)->m_data -= (plen); \
-		(m)->m_len += (plen); \
-	} else \
-		(m) = m_prepend((m), (plen), (how)); \
-	if ((m) && (m)->m_flags & M_PKTHDR) \
-		(m)->m_pkthdr.len += (plen); \
-}
-
-/* change mbuf to new type */
-#define MCHTYPE(m, t) { \
-	MBUFLOCK(mbstat.m_mtypes[(m)->m_type]--; mbstat.m_mtypes[t]++;) \
-	(m)->m_type = t;\
-}
-
-/* length to m_copy to copy all */
-#define	M_COPYALL	1000000000
-
-/* compatibility with 4.3 */
-#define  m_copy(m, o, l)	m_copym((m), (o), (l), M_DONTWAIT)
-
-/*
- * Mbuf statistics.
- */
-struct mbstat {
-	u_long	m_mbufs;	/* mbufs obtained from page pool */
-	u_long	m_clusters;	/* clusters obtained from page pool */
-	u_long	m_spare;	/* spare field */
-	u_long	m_clfree;	/* free clusters */
-	u_long	m_drops;	/* times failed to find space */
-	u_long	m_wait;		/* times waited for space */
-	u_long	m_drain;	/* times drained protocols for space */
-	u_short	m_mtypes[256];	/* type specific mbuf allocations */
-};
-
-#ifdef	KERNEL
-extern struct mbuf *mbutl;		/* virtual address of mclusters */
-extern char	*mclrefcnt;		/* cluster reference counts */
-extern struct mbstat mbstat;
-extern int	nmbclusters;
-extern int	nmbufs;
-extern struct mbuf *mmbfree;
-extern union mcluster *mclfree;
-extern int	max_linkhdr;		/* largest link-level header */
-extern int	max_protohdr;		/* largest protocol header */
-extern int	max_hdr;		/* largest link+protocol header */
-extern int	max_datalen;		/* MHLEN - max_hdr */
-extern int	mbtypes[];		/* XXX */
-
-struct	mbuf *m_copym __P((struct mbuf *, int, int, int));
-struct	mbuf *m_copypacket __P((struct mbuf *, int));
-struct	mbuf *m_devget __P((char *, int, int, struct ifnet *,
-			    void (*copy)(char *, caddr_t, u_int)));
-struct	mbuf *m_free __P((struct mbuf *));
-struct	mbuf *m_get __P((int, int));
-struct	mbuf *m_getclr __P((int, int));
-struct	mbuf *m_gethdr __P((int, int));
-struct	mbuf *m_prepend __P((struct mbuf *,int,int));
-struct	mbuf *m_pullup __P((struct mbuf *, int));
-struct	mbuf *m_retry __P((int, int));
-struct	mbuf *m_retryhdr __P((int, int));
-struct	mbuf *m_split __P((struct mbuf *,int,int));
-void	m_adj __P((struct mbuf *, int));
-void	m_cat __P((struct mbuf *,struct mbuf *));
-int	m_mballoc __P((int, int));
-int	m_clalloc __P((int, int));
-void	m_copyback __P((struct mbuf *, int, int, caddr_t));
-void	m_copydata __P((struct mbuf *,int,int,caddr_t));
-void	m_freem __P((struct mbuf *));
-
-#ifdef MBTYPES
-int mbtypes[] = {				/* XXX */
-	M_FREE,		/* MT_FREE	0	   should be on free list */
-	M_MBUF,		/* MT_DATA	1	   dynamic (data) allocation */
-	M_MBUF,		/* MT_HEADER	2	   packet header */
-	M_SOCKET,	/* MT_SOCKET	3	   socket structure */
-	M_PCB,		/* MT_PCB	4	   protocol control block */
-	M_RTABLE,	/* MT_RTABLE	5	   routing tables */
-	M_HTABLE,	/* MT_HTABLE	6	   IMP host tables */
-	0,		/* MT_ATABLE	7	   address resolution tables */
-	M_MBUF,		/* MT_SONAME	8	   socket name */
-	0,		/* 		9 */
-	M_SOOPTS,	/* MT_SOOPTS	10	   socket options */
-	M_FTABLE,	/* MT_FTABLE	11	   fragment reassembly header */
-	M_MBUF,		/* MT_RIGHTS	12	   access rights */
-	M_IFADDR,	/* MT_IFADDR	13	   interface address */
-	M_MBUF,		/* MT_CONTROL	14	   extra-data protocol message */
-	M_MBUF,		/* MT_OOBDATA	15	   expedited data  */
-#ifdef DATAKIT
-	25, 26, 27, 28, 29, 30, 31, 32		/* datakit ugliness */
-#endif
-};
-#endif
-#endif
-
-#endif /* !_SYS_MBUF_H_ */
diff --git a/c/src/exec/libnetworking/sys/mount.h b/c/src/exec/libnetworking/sys/mount.h
deleted file mode 100644
index a6254e302d..0000000000
--- a/c/src/exec/libnetworking/sys/mount.h
+++ /dev/null
@@ -1,531 +0,0 @@
-/*
- * Copyright (c) 1989, 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)mount.h	8.13 (Berkeley) 3/27/94
- *	$Id$
- */
-
-#ifndef _SYS_MOUNT_H_
-#define _SYS_MOUNT_H_
-
-#ifndef KERNEL
-#include <sys/ucred.h>
-#endif
-#include <sys/queue.h>
-
-typedef struct fsid { long val[2]; } fsid_t;	/* file system id type */
-
-/*
- * File identifier.
- * These are unique per filesystem on a single machine.
- */
-#define	MAXFIDSZ	16
-
-struct fid {
-	u_short		fid_len;		/* length of data in bytes */
-	u_short		fid_reserved;		/* force longword alignment */
-	char		fid_data[MAXFIDSZ];	/* data (variable length) */
-};
-
-/*
- * file system statistics
- */
-
-#define MNAMELEN 90	/* length of buffer for returned name */
-
-struct statfs {
-	long	f_spare2;		/* placeholder */
-	long	f_bsize;		/* fundamental file system block size */
-	long	f_iosize;		/* optimal transfer block size */
-	long	f_blocks;		/* total data blocks in file system */
-	long	f_bfree;		/* free blocks in fs */
-	long	f_bavail;		/* free blocks avail to non-superuser */
-	long	f_files;		/* total file nodes in file system */
-	long	f_ffree;		/* free file nodes in fs */
-	fsid_t	f_fsid;			/* file system id */
-	uid_t	f_owner;		/* user that mounted the filesystem */
-	int	f_type;			/* type of filesystem (see below) */
-	int	f_flags;		/* copy of mount flags */
-	long	f_spare[6];		/* spare for later */
-	char	f_mntonname[MNAMELEN];	/* directory on which mounted */
-	char	f_mntfromname[MNAMELEN];/* mounted filesystem */
-};
-
-/*
- * File system types.
- */
-#define	MOUNT_NONE	0
-#define	MOUNT_UFS	1	/* Fast Filesystem */
-#define	MOUNT_NFS	2	/* Sun-compatible Network Filesystem */
-#define	MOUNT_MFS	3	/* Memory-based Filesystem */
-#define	MOUNT_MSDOS	4	/* MS/DOS Filesystem */
-#define	MOUNT_LFS	5	/* Log-based Filesystem */
-#define	MOUNT_LOFS	6	/* Loopback Filesystem */
-#define	MOUNT_FDESC	7	/* File Descriptor Filesystem */
-#define	MOUNT_PORTAL	8	/* Portal Filesystem */
-#define MOUNT_NULL	9	/* Minimal Filesystem Layer */
-#define MOUNT_UMAP	10	/* User/Group Identifier Remapping Filesystem */
-#define MOUNT_KERNFS	11	/* Kernel Information Filesystem */
-#define MOUNT_PROCFS	12	/* /proc Filesystem */
-#define MOUNT_AFS	13	/* Andrew Filesystem */
-#define MOUNT_CD9660	14	/* ISO9660 (aka CDROM) Filesystem */
-#define MOUNT_UNION	15	/* Union (translucent) Filesystem */
-#define MOUNT_DEVFS	16	/* existing device Filesystem */
-#define	MOUNT_EXT2FS	17	/* Linux EXT2FS */
-#define MOUNT_TFS	18	/* Netcon Novell filesystem */
-#define	MOUNT_CFS	19	/* Coda filesystem */
-#define	MOUNT_MAXTYPE	19
-
-#define INITMOUNTNAMES { \
-	"none",		/*  0 MOUNT_NONE */ \
-	"ufs",		/*  1 MOUNT_UFS */ \
-	"nfs",		/*  2 MOUNT_NFS */ \
-	"mfs",		/*  3 MOUNT_MFS */ \
-	"msdos",	/*  4 MOUNT_MSDOS */ \
-	"lfs",		/*  5 MOUNT_LFS */ \
-	"lofs",		/*  6 MOUNT_LOFS */ \
-	"fdesc",	/*  7 MOUNT_FDESC */ \
-	"portal",	/*  8 MOUNT_PORTAL */ \
-	"null",		/*  9 MOUNT_NULL */ \
-	"umap",		/* 10 MOUNT_UMAP */ \
-	"kernfs",	/* 11 MOUNT_KERNFS */ \
-	"procfs",	/* 12 MOUNT_PROCFS */ \
-	"afs",		/* 13 MOUNT_AFS */ \
-	"cd9660",	/* 14 MOUNT_CD9660 */ \
-	"union",	/* 15 MOUNT_UNION */ \
-	"devfs",	/* 16 MOUNT_DEVFS */ \
-	"ext2fs",	/* 17 MOUNT_EXT2FS */ \
-	"tfs",		/* 18 MOUNT_TFS */ \
-	"cfs",		/* 19 MOUNT_CFS */ \
-	0,		/* 20 MOUNT_SPARE */ \
-}
-
-/*
- * Structure per mounted file system.  Each mounted file system has an
- * array of operations and an instance record.  The file systems are
- * put on a doubly linked list.
- */
-LIST_HEAD(vnodelst, vnode);
-
-struct mount {
-	CIRCLEQ_ENTRY(mount) mnt_list;		/* mount list */
-	struct vfsops	*mnt_op;		/* operations on fs */
-	struct vfsconf	*mnt_vfc;		/* configuration info */
-	struct vnode	*mnt_vnodecovered;	/* vnode we mounted on */
-	struct vnodelst	mnt_vnodelist;		/* list of vnodes this mount */
-	int		mnt_flag;		/* flags */
-	int		mnt_maxsymlinklen;	/* max size of short symlink */
-	struct statfs	mnt_stat;		/* cache of filesystem stats */
-	qaddr_t		mnt_data;		/* private data */
-/*	struct vfsconf	*mnt_vfc; */		/* configuration info */
-	time_t		mnt_time;		/* last time written*/
-};
-
-/*
- * Mount flags.
- *
- * Unmount uses MNT_FORCE flag.
- */
-#define	MNT_RDONLY	0x00000001	/* read only filesystem */
-#define	MNT_SYNCHRONOUS	0x00000002	/* file system written synchronously */
-#define	MNT_NOEXEC	0x00000004	/* can't exec from filesystem */
-#define	MNT_NOSUID	0x00000008	/* don't honor setuid bits on fs */
-#define	MNT_NODEV	0x00000010	/* don't interpret special files */
-#define	MNT_UNION	0x00000020	/* union with underlying filesystem */
-#define	MNT_ASYNC	0x00000040	/* file system written asynchronously */
-#define	MNT_NOATIME	0x10000000	/* Disable update of file access times */
-
-/*
- * exported mount flags.
- */
-#define	MNT_EXRDONLY	0x00000080	/* exported read only */
-#define	MNT_EXPORTED	0x00000100	/* file system is exported */
-#define	MNT_DEFEXPORTED	0x00000200	/* exported to the world */
-#define	MNT_EXPORTANON	0x00000400	/* use anon uid mapping for everyone */
-#define	MNT_EXKERB	0x00000800	/* exported with Kerberos uid mapping */
-
-/*
- * Flags set by internal operations.
- */
-#define	MNT_LOCAL	0x00001000	/* filesystem is stored locally */
-#define	MNT_QUOTA	0x00002000	/* quotas are enabled on filesystem */
-#define	MNT_ROOTFS	0x00004000	/* identifies the root filesystem */
-#define	MNT_USER	0x00008000	/* mounted by a user */
-
-/*
- * Mask of flags that are visible to statfs()
- */
-#define	MNT_VISFLAGMASK	(MNT_RDONLY|MNT_SYNCHRONOUS|MNT_NOEXEC|MNT_NOSUID| \
-			 MNT_NODEV|MNT_UNION|MNT_ASYNC|MNT_EXRDONLY|MNT_EXPORTED| \
-			 MNT_DEFEXPORTED|MNT_EXPORTANON|MNT_EXKERB|MNT_LOCAL| \
-			 MNT_QUOTA|MNT_ROOTFS|MNT_USER|MNT_NOATIME)
-
-/*
- * filesystem control flags.
- *
- * MNT_MLOCK lock the mount entry so that name lookup cannot proceed
- * past the mount point.  This keeps the subtree stable during mounts
- * and unmounts.
- */
-#define	MNT_UPDATE	0x00010000	/* not a real mount, just an update */
-#define	MNT_DELEXPORT	0x00020000	/* delete export host lists */
-#define	MNT_RELOAD	0x00040000	/* reload filesystem data */
-#define	MNT_FORCE	0x00080000	/* force unmount or readonly change */
-#define	MNT_MLOCK	0x00100000	/* lock so that subtree is stable */
-#define	MNT_MWAIT	0x00200000	/* someone is waiting for lock */
-#define MNT_MPBUSY	0x00400000	/* scan of mount point in progress */
-#define MNT_MPWANT	0x00800000	/* waiting for mount point */
-#define MNT_UNMOUNT	0x01000000	/* unmount in progress */
-#define MNT_WANTRDWR	0x02000000	/* want upgrade to read/write */
-
-/*
- * used to get configured filesystems information
- */
-#define VFS_MAXNAMELEN 32
-struct vfsconf {
-	void *vfc_vfsops;
-	char vfc_name[VFS_MAXNAMELEN];
-	int vfc_index;
-	int vfc_refcount;
-	int vfc_flags;
-};
-
-/*
- * NB: these flags refer to IMPLEMENTATION properties, not properties of
- * any actual mounts; i.e., it does not make sense to change the flags.
- */
-#define	VFCF_STATIC	0x00000001	/* statically compiled into kernel */
-#define	VFCF_NETWORK	0x00000002	/* may get data over the network */
-#define	VFCF_READONLY	0x00000004	/* writes are not implemented */
-#define VFCF_SYNTHETIC	0x00000008	/* data does not represent real files */
-#define	VFCF_LOOPBACK	0x00000010	/* aliases some other mounted FS */
-#define	VFCF_UNICODE	0x00000020	/* stores file names as Unicode*/
-
-/*
- * Operations supported on mounted file system.
- */
-#ifdef KERNEL
-
-extern	int	doforce;	/* Flag to permit forcible unmounting. */
-extern struct vfsconf void_vfsconf;
-extern struct vfsconf *vfsconf[];
-
-#ifdef __STDC__
-struct nameidata;
-struct mbuf;
-#endif
-
-struct vfsops {
-	int	(*vfs_mount)	__P((struct mount *mp, char *path, caddr_t data,
-				    struct nameidata *ndp, struct proc *p));
-	int	(*vfs_start)	__P((struct mount *mp, int flags,
-				    struct proc *p));
-	int	(*vfs_unmount)	__P((struct mount *mp, int mntflags,
-				    struct proc *p));
-	int	(*vfs_root)	__P((struct mount *mp, struct vnode **vpp));
-	int	(*vfs_quotactl)	__P((struct mount *mp, int cmds, uid_t uid,
-				    caddr_t arg, struct proc *p));
-	int	(*vfs_statfs)	__P((struct mount *mp, struct statfs *sbp,
-				    struct proc *p));
-	int	(*vfs_sync)	__P((struct mount *mp, int waitfor,
-				    struct ucred *cred, struct proc *p));
-	int	(*vfs_vget)	__P((struct mount *mp, ino_t ino,
-				    struct vnode **vpp));
-	int	(*vfs_fhtovp)	__P((struct mount *mp, struct fid *fhp,
-				    struct mbuf *nam, struct vnode **vpp,
-				    int *exflagsp, struct ucred **credanonp));
-	int	(*vfs_vptofh)	__P((struct vnode *vp, struct fid *fhp));
-	int	(*vfs_init)	__P((void));
-};
-
-#define VFS_MOUNT(MP, PATH, DATA, NDP, P) \
-	(*(MP)->mnt_op->vfs_mount)(MP, PATH, DATA, NDP, P)
-#define VFS_START(MP, FLAGS, P)	  (*(MP)->mnt_op->vfs_start)(MP, FLAGS, P)
-#define VFS_UNMOUNT(MP, FORCE, P) (*(MP)->mnt_op->vfs_unmount)(MP, FORCE, P)
-#define VFS_ROOT(MP, VPP)	  (*(MP)->mnt_op->vfs_root)(MP, VPP)
-#define VFS_QUOTACTL(MP,C,U,A,P)  (*(MP)->mnt_op->vfs_quotactl)(MP, C, U, A, P)
-#define VFS_STATFS(MP, SBP, P)	  (*(MP)->mnt_op->vfs_statfs)(MP, SBP, P)
-#define VFS_SYNC(MP, WAIT, C, P)  (*(MP)->mnt_op->vfs_sync)(MP, WAIT, C, P)
-#define VFS_VGET(MP, INO, VPP)	  (*(MP)->mnt_op->vfs_vget)(MP, INO, VPP)
-#define VFS_FHTOVP(MP, FIDP, NAM, VPP, EXFLG, CRED) \
-	(*(MP)->mnt_op->vfs_fhtovp)(MP, FIDP, NAM, VPP, EXFLG, CRED)
-#define	VFS_VPTOFH(VP, FIDP)	  (*(VP)->v_mount->mnt_op->vfs_vptofh)(VP, FIDP)
-
-#ifdef VFS_LKM
-#include <sys/conf.h>
-#include <sys/exec.h>
-#include <sys/sysent.h>
-#include <sys/lkm.h>
-
-#define VFS_SET(vfsops, fsname, index, flags) \
-	static struct vfsconf _fs_vfsconf = { \
-		&vfsops, \
-		#fsname, \
-		index, \
-		0, \
-		flags \
-	}; \
-	extern struct linker_set MODVNOPS; \
-	MOD_VFS(#fsname,index,&MODVNOPS,&_fs_vfsconf); \
-	int \
-	fsname ## _mod(struct lkm_table *lkmtp, int cmd, int ver) { \
-		DISPATCH(lkmtp, cmd, ver, lkm_nullcmd, lkm_nullcmd, lkm_nullcmd); }
-#else
-
-#define VFS_SET(vfsops, fsname, index, flags) \
-	static struct vfsconf _fs_vfsconf = { \
-		&vfsops, \
-		#fsname, \
-		index, \
-		0, \
-		flags | VFCF_STATIC \
-	}; \
-	DATA_SET(vfs_set,_fs_vfsconf)
-#endif /* VFS_LKM */
-
-#endif /* KERNEL */
-
-/*
- * Flags for various system call interfaces.
- *
- * waitfor flags to vfs_sync() and getfsstat()
- */
-#define MNT_WAIT	1
-#define MNT_NOWAIT	2
-
-/*
- * Generic file handle
- */
-struct fhandle {
-	fsid_t	fh_fsid;	/* File system id of mount point */
-	struct	fid fh_fid;	/* File sys specific id */
-};
-typedef struct fhandle	fhandle_t;
-
-#ifdef KERNEL
-#include <net/radix.h>
-#include <sys/socket.h>		/* XXX for AF_MAX */
-
-/*
- * Network address lookup element
- */
-struct netcred {
-	struct	radix_node netc_rnodes[2];
-	int	netc_exflags;
-	struct	ucred netc_anon;
-};
-
-/*
- * Network export information
- */
-struct netexport {
-	struct	netcred ne_defexported;		      /* Default export */
-	struct	radix_node_head *ne_rtable[AF_MAX+1]; /* Individual exports */
-};
-#endif /* KERNEL */
-
-/*
- * Export arguments for local filesystem mount calls.
- */
-struct export_args {
-	int	ex_flags;		/* export related flags */
-	uid_t	ex_root;		/* mapping for root uid */
-	struct	ucred ex_anon;		/* mapping for anonymous user */
-	struct	sockaddr *ex_addr;	/* net address to which exported */
-	int	ex_addrlen;		/* and the net address length */
-	struct	sockaddr *ex_mask;	/* mask of valid bits in saddr */
-	int	ex_masklen;		/* and the smask length */
-};
-
-/*
- * Arguments to mount UFS-based filesystems
- */
-struct ufs_args {
-	char	*fspec;			/* block special device to mount */
-	struct	export_args export;	/* network export information */
-};
-
-#ifdef MFS
-/*
- * Arguments to mount MFS
- */
-struct mfs_args {
-	char	*fspec;			/* name to export for statfs */
-	struct	export_args export;	/* if exported MFSes are supported */
-	caddr_t	base;			/* base of file system in memory */
-	u_long size;			/* size of file system */
-};
-#endif /* MFS */
-
-#ifdef MSDOSFS
-/*
- *  Arguments to mount MSDOS filesystems.
- */
-struct msdosfs_args {
-	char	*fspec;		/* blocks special holding the fs to mount */
-	struct	export_args export;	/* network export information */
-	uid_t	uid;		/* uid that owns msdosfs files */
-	gid_t	gid;		/* gid that owns msdosfs files */
-	mode_t	mask;		/* mask to be applied for msdosfs perms */
-};
-#endif
-
-#ifdef CD9660
-/*
- * Arguments to mount ISO 9660 filesystems.
- */
-struct iso_args {
-	char *fspec;			/* block special device to mount */
-	struct	export_args export;	/* network export info */
-	int flags;			/* mounting flags, see below */
-	int ssector;			/* starting sector */
-
-};
-#define ISOFSMNT_NORRIP		0x00000001 /* disable Rock Ridge Ext.*/
-#define ISOFSMNT_GENS		0x00000002 /* enable generation numbers */
-#define ISOFSMNT_EXTATT		0x00000004 /* enable extended attributes */
-#endif /* CD9660 */
-
-#ifdef NFS
-/*
- * Arguments to mount NFS
- */
-struct nfs_args {
-	struct sockaddr	*addr;		/* file server address */
-	int		addrlen;	/* length of address */
-	int		sotype;		/* Socket type */
-	int		proto;		/* and Protocol */
-	u_char		*fh;		/* File handle to be mounted */
-	int		fhsize;		/* Size, in bytes, of fh */
-	int		flags;		/* flags */
-	int		wsize;		/* write size in bytes */
-	int		rsize;		/* read size in bytes */
-	int		readdirsize;	/* readdir size in bytes */
-	int		timeo;		/* initial timeout in .1 secs */
-	int		retrans;	/* times to retry send */
-	int		maxgrouplist;	/* Max. size of group list */
-	int		readahead;	/* # of blocks to readahead */
-	int		leaseterm;	/* Term (sec) of lease */
-	int		deadthresh;	/* Retrans threshold */
-	char		*hostname;	/* server's name */
-};
-
-/*
- * NFS mount option flags
- */
-#define	NFSMNT_SOFT		0x00000001  /* soft mount (hard is default) */
-#define	NFSMNT_WSIZE		0x00000002  /* set write size */
-#define	NFSMNT_RSIZE		0x00000004  /* set read size */
-#define	NFSMNT_TIMEO		0x00000008  /* set initial timeout */
-#define	NFSMNT_RETRANS		0x00000010  /* set number of request retrys */
-#define	NFSMNT_MAXGRPS		0x00000020  /* set maximum grouplist size */
-#define	NFSMNT_INT		0x00000040  /* allow interrupts on hard mount */
-#define	NFSMNT_NOCONN		0x00000080  /* Don't Connect the socket */
-#define	NFSMNT_NQNFS		0x00000100  /* Use Nqnfs protocol */
-#define	NFSMNT_NFSV3		0x00000200  /* Use NFS Version 3 protocol */
-#define	NFSMNT_KERB		0x00000400  /* Use Kerberos authentication */
-#define	NFSMNT_DUMBTIMR		0x00000800  /* Don't estimate rtt dynamically */
-#define	NFSMNT_LEASETERM	0x00001000  /* set lease term (nqnfs) */
-#define	NFSMNT_READAHEAD	0x00002000  /* set read ahead */
-#define	NFSMNT_DEADTHRESH	0x00004000  /* set dead server retry thresh */
-#define	NFSMNT_RESVPORT		0x00008000  /* Allocate a reserved port */
-#define NFSMNT_RDIRPLUS		0x00010000  /* Use Readdirplus for V3 */
-#define NFSMNT_READDIRSIZE	0x00020000  /* Set readdir size */
-#define	NFSMNT_INTERNAL		0xfffc0000  /* Bits set internally */
-#define NFSMNT_HASWRITEVERF	0x00040000  /* Has write verifier for V3 */
-#define NFSMNT_GOTPATHCONF	0x00080000  /* Got the V3 pathconf info */
-#define NFSMNT_GOTFSINFO	0x00100000  /* Got the V3 fsinfo */
-#define	NFSMNT_MNTD		0x00200000  /* Mnt server for mnt point */
-#define	NFSMNT_DISMINPROG	0x00400000  /* Dismount in progress */
-#define	NFSMNT_DISMNT		0x00800000  /* Dismounted */
-#define	NFSMNT_SNDLOCK		0x01000000  /* Send socket lock */
-#define	NFSMNT_WANTSND		0x02000000  /* Want above */
-#define	NFSMNT_RCVLOCK		0x04000000  /* Rcv socket lock */
-#define	NFSMNT_WANTRCV		0x08000000  /* Want above */
-#define	NFSMNT_WAITAUTH		0x10000000  /* Wait for authentication */
-#define	NFSMNT_HASAUTH		0x20000000  /* Has authenticator */
-#define	NFSMNT_WANTAUTH		0x40000000  /* Wants an authenticator */
-#define	NFSMNT_AUTHERR		0x80000000  /* Authentication error */
-#endif /* NFS */
-
-#ifdef KERNEL
-extern	int (*mountroot) __P((void *));
-extern	struct vfsops	*mountrootvfsops;
-
-/*
- * exported vnode operations
- */
-int	dounmount __P((struct mount *, int, struct proc *));
-struct	mount *getvfs __P((fsid_t *));      /* return vfs given fsid */
-void	getnewfsid __P((struct mount *, int));
-int	vflush __P((struct mount *, struct vnode *, int));
-int	vfs_export			    /* process mount export info */
-	  __P((struct mount *, struct netexport *, struct export_args *));
-struct	netcred *vfs_export_lookup	    /* lookup host in fs export list */
-	  __P((struct mount *, struct netexport *, struct mbuf *));
-int	vfs_lock __P((struct mount *));         /* lock a vfs */
-int	vfs_mountedon __P((struct vnode *));    /* is a vfs mounted on vp */
-int	vfs_mountroot __P((void *));		/* XXX goes away? */
-void	vfs_msync __P((struct mount *, int));
-void	vfs_unlock __P((struct mount *));       /* unlock a vfs */
-void	vfs_unmountall __P((void));
-int	vfs_busy __P((struct mount *));         /* mark a vfs  busy */
-void	vfs_unbusy __P((struct mount *));       /* mark a vfs not busy */
-extern	CIRCLEQ_HEAD(mntlist, mount) mountlist;	/* mounted filesystem list */
-extern	struct vfsops *vfssw[];			/* filesystem type table */
-
-#else /* KERNEL */
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-int	fstatfs __P((int, struct statfs *));
-int	getfh __P((const char *, fhandle_t *));
-int	getfsstat __P((struct statfs *, long, int));
-int	getmntinfo __P((struct statfs **, int));
-int	mount __P((int, const char *, int, void *));
-int	statfs __P((const char *, struct statfs *));
-int	unmount __P((const char *, int));
-
-/* C library stuff */
-struct	vfsconf *getvfsbyname __P((const char *));
-struct	vfsconf *getvfsbytype __P((int));
-struct	vfsconf *getvfsent __P((void));
-void	setvfsent __P((int));
-void	endvfsent __P((void));
-int	vfsisloadable __P((const char *));
-int	vfsload __P((const char *));
-__END_DECLS
-
-#endif /* KERNEL */
-
-#endif /* !_SYS_MOUNT_H_ */
diff --git a/c/src/exec/libnetworking/sys/param.h b/c/src/exec/libnetworking/sys/param.h
deleted file mode 100644
index 21a9758520..0000000000
--- a/c/src/exec/libnetworking/sys/param.h
+++ /dev/null
@@ -1,231 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)param.h	8.3 (Berkeley) 4/4/95
- * $Id$
- */
-
-#ifndef _SYS_PARAM_H_
-#define _SYS_PARAM_H_
-
-#include <unistd.h>
-
-#define	BSD	199506		/* System version (year & month). */
-#define BSD4_3	1
-#define BSD4_4	1
-
-#ifndef NULL
-#define	NULL	0
-#endif
-
-#ifndef LOCORE
-#include <sys/types.h>
-#endif
-
-/*
- * Machine-independent constants (some used in following include files).
- * Redefined constants are from POSIX 1003.1 limits file.
- *
- * MAXCOMLEN should be >= sizeof(ac_comm) (see <acct.h>)
- * MAXLOGNAME should be >= UT_NAMESIZE (see <utmp.h>)
- */
-#include <sys/syslimits.h>
-
-#define	MAXCOMLEN	16		/* max command name remembered */
-#define	MAXINTERP	32		/* max interpreter file name length */
-#define	MAXLOGNAME	12		/* max login name length */
-#define	MAXUPRC		CHILD_MAX	/* max simultaneous processes */
-#define	NCARGS		ARG_MAX		/* max bytes for an exec function */
-#define	NGROUPS		NGROUPS_MAX	/* max number groups */
-#define	NOFILE		OPEN_MAX	/* max open files per process */
-#define	NOGROUP		65535		/* marker for empty group set member */
-#define MAXHOSTNAMELEN	256		/* max hostname size */
-
-/* More types and definitions used throughout the kernel. */
-#ifdef KERNEL
-#include <sys/cdefs.h>
-#include <sys/errno.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-#include <sys/ucred.h>
-#include <sys/uio.h>
-#include <sys/rtprio.h>
-
-#ifndef FALSE
-#define	FALSE	0
-#endif
-#ifndef TRUE
-#define	TRUE	1
-#endif
-#endif
-
-/* Signals. */
-#include <sys/signal.h>
-
-/* Machine type dependent parameters. */
-#include <machine/param.h>
-#include <machine/limits.h>
-
-/*
- * Priorities.  Note that with 32 run queues, differences less than 4 are
- * insignificant.
- */
-#define	PSWP	0
-#define	PVM	4
-#define	PINOD	8
-#define	PRIBIO	16
-#define	PVFS	20
-#define	PZERO	22		/* No longer magic, shouldn't be here.  XXX */
-#define	PSOCK	24
-#define	PWAIT	32
-#define	PLOCK	36
-#define	PPAUSE	40
-#define	PUSER	50
-#define	MAXPRI	127		/* Priorities range from 0 through MAXPRI. */
-
-#define	PRIMASK	0x0ff
-#define	PCATCH	0x100		/* OR'd with pri for tsleep to check signals */
-
-#define	NZERO	0		/* default "nice" */
-
-#define	NBPW	sizeof(int)	/* number of bytes per word (integer) */
-
-#define	CMASK	022		/* default file mask: S_IWGRP|S_IWOTH */
-#define	NODEV	(dev_t)(-1)	/* non-existent device */
-
-/*
- * Clustering of hardware pages on machines with ridiculously small
- * page sizes is done here.  The paging subsystem deals with units of
- * CLSIZE pte's describing PAGE_SIZE (from machine/machparam.h) pages each.
- */
-#if 0
-#define	CLBYTES		(CLSIZE*PAGE_SIZE)
-#endif
-
-#define	CBLOCK	128		/* Clist block size, must be a power of 2. */
-#define CBQSIZE	(CBLOCK/NBBY)	/* Quote bytes/cblock - can do better. */
-				/* Data chars/clist. */
-#define	CBSIZE	(CBLOCK - sizeof(struct cblock *) - CBQSIZE)
-#define	CROUND	(CBLOCK - 1)	/* Clist rounding. */
-
-/*
- * File system parameters and macros.
- *
- * The file system is made out of blocks of at most MAXBSIZE units, with
- * smaller units (fragments) only in the last direct block.  MAXBSIZE
- * primarily determines the size of buffers in the buffer pool.  It may be
- * made larger without any effect on existing file systems; however making
- * it smaller make make some file systems unmountable.  Also, MAXBSIZE
- * must be less than MAXPHYS!!!  DFLTBSIZE is the average amount of
- * memory allocated by vfs_bio per nbuf.  BKVASIZE is the average amount
- * of kernel virtual space allocated per nbuf.  BKVASIZE should be >=
- * DFLTBSIZE.  If it is significantly bigger than DFLTBSIZE, then
- * kva fragmentation causes fewer performance problems.
- */
-#define	MAXBSIZE	65536
-#define BKVASIZE	8192
-#define DFLTBSIZE	4096
-#define MAXFRAG 	8
-
-/*
- * MAXPATHLEN defines the longest permissible path length after expanding
- * symbolic links. It is used to allocate a temporary buffer from the buffer
- * pool in which to do the name expansion, hence should be a power of two,
- * and must be less than or equal to MAXBSIZE.  MAXSYMLINKS defines the
- * maximum number of symbolic links that may be expanded in a path name.
- * It should be set high enough to allow all legitimate uses, but halt
- * infinite loops reasonably quickly.
- */
-#if !defined(__rtems__)
-#define	MAXPATHLEN	PATH_MAX
-#endif
-#define MAXSYMLINKS	32
-
-/* Bit map related macros. */
-#define	setbit(a,i)	((a)[(i)/NBBY] |= 1<<((i)%NBBY))
-#define	clrbit(a,i)	((a)[(i)/NBBY] &= ~(1<<((i)%NBBY)))
-#define	isset(a,i)	((a)[(i)/NBBY] & (1<<((i)%NBBY)))
-#define	isclr(a,i)	(((a)[(i)/NBBY] & (1<<((i)%NBBY))) == 0)
-
-/* Macros for counting and rounding. */
-#ifndef howmany
-#define	howmany(x, y)	(((x)+((y)-1))/(y))
-#endif
-#define	rounddown(x, y)	(((x)/(y))*(y))
-#define	roundup(x, y)	((((x)+((y)-1))/(y))*(y))  /* to any y */
-#define	roundup2(x, y)	(((x)+((y)-1))&(~((y)-1))) /* if y is powers of two */
-#define powerof2(x)	((((x)-1)&(x))==0)
-
-/* Macros for min/max. */
-#ifndef KERNEL
-#define	MIN(a,b) (((a)<(b))?(a):(b))
-#define	MAX(a,b) (((a)>(b))?(a):(b))
-#endif
-
-/*
- * Constants for setting the parameters of the kernel memory allocator.
- *
- * 2 ** MINBUCKET is the smallest unit of memory that will be
- * allocated. It must be at least large enough to hold a pointer.
- *
- * Units of memory less or equal to MAXALLOCSAVE will permanently
- * allocate physical memory; requests for these size pieces of
- * memory are quite fast. Allocations greater than MAXALLOCSAVE must
- * always allocate and free physical memory; requests for these
- * size allocations should be done infrequently as they will be slow.
- *
- * Constraints: PAGE_SIZE <= MAXALLOCSAVE <= 2 ** (MINBUCKET + 14), and
- * MAXALLOCSIZE must be a power of two.
- */
-#define MINBUCKET	4		/* 4 => min allocation of 16 bytes */
-#define MAXALLOCSAVE	(2 * PAGE_SIZE)
-
-/*
- * Scale factor for scaled integers used to count %cpu time and load avgs.
- *
- * The number of CPU `tick's that map to a unique `%age' can be expressed
- * by the formula (1 / (2 ^ (FSHIFT - 11))).  The maximum load average that
- * can be calculated (assuming 32 bits) can be closely approximated using
- * the formula (2 ^ (2 * (16 - FSHIFT))) for (FSHIFT < 15).
- *
- * For the scheduler to maintain a 1:1 mapping of CPU `tick' to `%age',
- * FSHIFT must be at least 11; this gives us a maximum load avg of ~1024.
- */
-#define	FSHIFT	11		/* bits to right of fixed binary point */
-#define FSCALE	(1<<FSHIFT)
-
-#endif	/* _SYS_PARAM_H_ */
diff --git a/c/src/exec/libnetworking/sys/proc.h b/c/src/exec/libnetworking/sys/proc.h
deleted file mode 100644
index 2189a33b11..0000000000
--- a/c/src/exec/libnetworking/sys/proc.h
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * Dummy structure
- *
- *  $Id$
- */
-struct proc {
-	int	this_should_never_be_referenced;
-};
diff --git a/c/src/exec/libnetworking/sys/protosw.h b/c/src/exec/libnetworking/sys/protosw.h
deleted file mode 100644
index a7aa52feea..0000000000
--- a/c/src/exec/libnetworking/sys/protosw.h
+++ /dev/null
@@ -1,300 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)protosw.h	8.1 (Berkeley) 6/2/93
- * $Id$
- */
-
-#ifndef _SYS_PROTOSW_H_
-#define _SYS_PROTOSW_H_
-
-struct ifnet;
-struct mbuf;
-struct sockaddr;
-struct socket;
-struct sockproto;
-struct stat;
-
-/*
- * Protocol switch table.
- *
- * Each protocol has a handle initializing one of these structures,
- * which is used for protocol-protocol and system-protocol communication.
- *
- * A protocol is called through the pr_init entry before any other.
- * Thereafter it is called every 200ms through the pr_fasttimo entry and
- * every 500ms through the pr_slowtimo for timer based actions.
- * The system will call the pr_drain entry if it is low on space and
- * this should throw away any non-critical data.
- *
- * Protocols pass data between themselves as chains of mbufs using
- * the pr_input and pr_output hooks.  Pr_input passes data up (towards
- * UNIX) and pr_output passes it down (towards the imps); control
- * information passes up and down on pr_ctlinput and pr_ctloutput.
- * The protocol is responsible for the space occupied by any the
- * arguments to these entries and must dispose it.
- *
- * The userreq routine interfaces protocols to the system and is
- * described below.
- */
-struct protosw {
-	short	pr_type;		/* socket type used for */
-	struct	domain *pr_domain;	/* domain protocol a member of */
-	short	pr_protocol;		/* protocol number */
-	short	pr_flags;		/* see below */
-/* protocol-protocol hooks */
-	void	(*pr_input) __P((struct mbuf *, int len));
-					/* input to protocol (from below) */
-	int	(*pr_output)	__P((struct mbuf *m, struct socket *so));
-					/* output to protocol (from above) */
-	void	(*pr_ctlinput)__P((int, struct sockaddr *, void *));
-					/* control input (from below) */
-	int	(*pr_ctloutput)__P((int, struct socket *, int, int,
-				    struct mbuf **));
-					/* control output (from above) */
-/* user-protocol hook */
-	int	(*pr_ousrreq) __P((struct socket *, int, struct mbuf *,
-				   struct mbuf *, struct mbuf *));
-					/* user request: see list below */
-/* utility hooks */
-	void	(*pr_init) __P((void));	/* initialization hook */
-	void	(*pr_fasttimo) __P((void));
-					/* fast timeout (200ms) */
-	void	(*pr_slowtimo) __P((void));
-					/* slow timeout (500ms) */
-	void	(*pr_drain) __P((void));
-					/* flush any excess space possible */
-	struct	pr_usrreqs *pr_usrreqs;	/* supersedes pr_usrreq() */
-};
-
-#define	PR_SLOWHZ	2		/* 2 slow timeouts per second */
-#define	PR_FASTHZ	5		/* 5 fast timeouts per second */
-
-/*
- * Values for pr_flags.
- * PR_ADDR requires PR_ATOMIC;
- * PR_ADDR and PR_CONNREQUIRED are mutually exclusive.
- * PR_IMPLOPCL means that the protocol allows sendto without prior connect,
- *	and the protocol understands the MSG_EOF flag.  The first property is
- *	is only relevant if PR_CONNREQUIRED is set (otherwise sendto is allowed
- *	anyhow).
- */
-#define	PR_ATOMIC	0x01		/* exchange atomic messages only */
-#define	PR_ADDR		0x02		/* addresses given with messages */
-#define	PR_CONNREQUIRED	0x04		/* connection required by protocol */
-#define	PR_WANTRCVD	0x08		/* want PRU_RCVD calls */
-#define	PR_RIGHTS	0x10		/* passes capabilities */
-#define PR_IMPLOPCL	0x20		/* implied open/close */
-
-/*
- * The arguments to usrreq are:
- *	(*protosw[].pr_usrreq)(up, req, m, nam, opt);
- * where up is a (struct socket *), req is one of these requests,
- * m is a optional mbuf chain containing a message,
- * nam is an optional mbuf chain containing an address,
- * and opt is a pointer to a socketopt structure or nil.
- * The protocol is responsible for disposal of the mbuf chain m,
- * the caller is responsible for any space held by nam and opt.
- * A non-zero return from usrreq gives an
- * UNIX error number which should be passed to higher level software.
- */
-#define	PRU_ATTACH		0	/* attach protocol to up */
-#define	PRU_DETACH		1	/* detach protocol from up */
-#define	PRU_BIND		2	/* bind socket to address */
-#define	PRU_LISTEN		3	/* listen for connection */
-#define	PRU_CONNECT		4	/* establish connection to peer */
-#define	PRU_ACCEPT		5	/* accept connection from peer */
-#define	PRU_DISCONNECT		6	/* disconnect from peer */
-#define	PRU_SHUTDOWN		7	/* won't send any more data */
-#define	PRU_RCVD		8	/* have taken data; more room now */
-#define	PRU_SEND		9	/* send this data */
-#define	PRU_ABORT		10	/* abort (fast DISCONNECT, DETATCH) */
-#define	PRU_CONTROL		11	/* control operations on protocol */
-#define	PRU_SENSE		12	/* return status into m */
-#define	PRU_RCVOOB		13	/* retrieve out of band data */
-#define	PRU_SENDOOB		14	/* send out of band data */
-#define	PRU_SOCKADDR		15	/* fetch socket's address */
-#define	PRU_PEERADDR		16	/* fetch peer's address */
-#define	PRU_CONNECT2		17	/* connect two sockets */
-/* begin for protocols internal use */
-#define	PRU_FASTTIMO		18	/* 200ms timeout */
-#define	PRU_SLOWTIMO		19	/* 500ms timeout */
-#define	PRU_PROTORCV		20	/* receive from below */
-#define	PRU_PROTOSEND		21	/* send to below */
-/* end for protocol's internal use */
-#define PRU_SEND_EOF		22	/* send and close */
-#define PRU_NREQ		22
-
-#ifdef PRUREQUESTS
-char *prurequests[] = {
-	"ATTACH",	"DETACH",	"BIND",		"LISTEN",
-	"CONNECT",	"ACCEPT",	"DISCONNECT",	"SHUTDOWN",
-	"RCVD",		"SEND",		"ABORT",	"CONTROL",
-	"SENSE",	"RCVOOB",	"SENDOOB",	"SOCKADDR",
-	"PEERADDR",	"CONNECT2",	"FASTTIMO",	"SLOWTIMO",
-	"PROTORCV",	"PROTOSEND",
-	"SEND_EOF",
-};
-#endif
-
-#ifdef	KERNEL			/* users shouldn't see this decl */
-struct stat;
-struct ifnet;
-
-/*
- * If the ordering here looks odd, that's because it's alphabetical.
- */
-struct pr_usrreqs {
-	int	(*pru_abort) __P((struct socket *so));
-	int	(*pru_accept) __P((struct socket *so, struct mbuf *nam));
-	int	(*pru_attach) __P((struct socket *so, int proto));
-	int	(*pru_bind) __P((struct socket *so, struct mbuf *nam));
-	int	(*pru_connect) __P((struct socket *so, struct mbuf *nam));
-	int	(*pru_connect2) __P((struct socket *so1, struct socket *so2));
-	int	(*pru_control) __P((struct socket *so, int cmd, caddr_t data,
-				    struct ifnet *ifp));
-	int	(*pru_detach) __P((struct socket *so));
-	int	(*pru_disconnect) __P((struct socket *so));
-	int	(*pru_listen) __P((struct socket *so));
-	int	(*pru_peeraddr) __P((struct socket *so, struct mbuf *nam));
-	int	(*pru_rcvd) __P((struct socket *so, int flags));
-	int	(*pru_rcvoob) __P((struct socket *so, struct mbuf *m,
-				   int flags));
-	/*
-	 * The `m' parameter here is almost certainly going to become a
-	 * `struct uio' at some point in the future.  Similar changes
-	 * will probably happen for the receive entry points.
-	 */
-	int	(*pru_send) __P((struct socket *so, int flags, struct mbuf *m, 
-			      struct mbuf *addr, struct mbuf *control));
-#define	PRUS_OOB	0x1
-#define	PRUS_EOF	0x2
-	int	(*pru_sense) __P((struct socket *so, struct stat *sb));
-	int	(*pru_shutdown) __P((struct socket *so));
-	int	(*pru_sockaddr) __P((struct socket *so, struct mbuf *nam));
-};
-
-int	pru_accept_notsupp __P((struct socket *so, struct mbuf *nam));
-int	pru_connect2_notsupp __P((struct socket *so1, struct socket *so2));
-int	pru_control_notsupp __P((struct socket *so, int cmd, caddr_t data,
-				 struct ifnet *ifp));
-int	pru_listen_notsupp __P((struct socket *so));
-int	pru_rcvd_notsupp __P((struct socket *so, int flags));
-int	pru_rcvoob_notsupp __P((struct socket *so, struct mbuf *m, int flags));
-int	pru_sense_null __P((struct socket *so, struct stat *sb));
-
-#define	PRU_OLDSTYLE
-
-#ifdef PRU_OLDSTYLE
-/*
- * Protocols which don't yet implement pr_usrreqs can point it to this
- * structure, which will call the old pr_usrreq() entry point with the
- * appropriate arguments.
- */
-extern	struct pr_usrreqs pru_oldstyle;
-#endif /* PRU_OLDSTYLE */
-
-#endif /* KERNEL */
-
-/*
- * The arguments to the ctlinput routine are
- *	(*protosw[].pr_ctlinput)(cmd, sa, arg);
- * where cmd is one of the commands below, sa is a pointer to a sockaddr,
- * and arg is a `void *' argument used within a protocol family.
- */
-#define	PRC_IFDOWN		0	/* interface transition */
-#define	PRC_ROUTEDEAD		1	/* select new route if possible ??? */
-#define	PRC_QUENCH2		3	/* DEC congestion bit says slow down */
-#define	PRC_QUENCH		4	/* some one said to slow down */
-#define	PRC_MSGSIZE		5	/* message size forced drop */
-#define	PRC_HOSTDEAD		6	/* host appears to be down */
-#define	PRC_HOSTUNREACH		7	/* deprecated (use PRC_UNREACH_HOST) */
-#define	PRC_UNREACH_NET		8	/* no route to network */
-#define	PRC_UNREACH_HOST	9	/* no route to host */
-#define	PRC_UNREACH_PROTOCOL	10	/* dst says bad protocol */
-#define	PRC_UNREACH_PORT	11	/* bad port # */
-/* was	PRC_UNREACH_NEEDFRAG	12	   (use PRC_MSGSIZE) */
-#define	PRC_UNREACH_SRCFAIL	13	/* source route failed */
-#define	PRC_REDIRECT_NET	14	/* net routing redirect */
-#define	PRC_REDIRECT_HOST	15	/* host routing redirect */
-#define	PRC_REDIRECT_TOSNET	16	/* redirect for type of service & net */
-#define	PRC_REDIRECT_TOSHOST	17	/* redirect for tos & host */
-#define	PRC_TIMXCEED_INTRANS	18	/* packet lifetime expired in transit */
-#define	PRC_TIMXCEED_REASS	19	/* lifetime expired on reass q */
-#define	PRC_PARAMPROB		20	/* header incorrect */
-
-#define	PRC_NCMDS		21
-
-#define	PRC_IS_REDIRECT(cmd)	\
-	((cmd) >= PRC_REDIRECT_NET && (cmd) <= PRC_REDIRECT_TOSHOST)
-
-#ifdef PRCREQUESTS
-char	*prcrequests[] = {
-	"IFDOWN", "ROUTEDEAD", "#2", "DEC-BIT-QUENCH2",
-	"QUENCH", "MSGSIZE", "HOSTDEAD", "#7",
-	"NET-UNREACH", "HOST-UNREACH", "PROTO-UNREACH", "PORT-UNREACH",
-	"#12", "SRCFAIL-UNREACH", "NET-REDIRECT", "HOST-REDIRECT",
-	"TOSNET-REDIRECT", "TOSHOST-REDIRECT", "TX-INTRANS", "TX-REASS",
-	"PARAMPROB"
-};
-#endif
-
-/*
- * The arguments to ctloutput are:
- *	(*protosw[].pr_ctloutput)(req, so, level, optname, optval);
- * req is one of the actions listed below, so is a (struct socket *),
- * level is an indication of which protocol layer the option is intended.
- * optname is a protocol dependent socket option request,
- * optval is a pointer to a mbuf-chain pointer, for value-return results.
- * The protocol is responsible for disposal of the mbuf chain *optval
- * if supplied,
- * the caller is responsible for any space held by *optval, when returned.
- * A non-zero return from usrreq gives an
- * UNIX error number which should be passed to higher level software.
- */
-#define	PRCO_GETOPT	0
-#define	PRCO_SETOPT	1
-
-#define	PRCO_NCMDS	2
-
-#ifdef PRCOREQUESTS
-char	*prcorequests[] = {
-	"GETOPT", "SETOPT",
-};
-#endif
-
-#ifdef KERNEL
-struct protosw *pffindproto __P((int family, int protocol, int type));
-struct protosw *pffindtype __P((int family, int type));
-#endif
-
-#endif
diff --git a/c/src/exec/libnetworking/sys/queue.h b/c/src/exec/libnetworking/sys/queue.h
deleted file mode 100644
index e8aa08cf5d..0000000000
--- a/c/src/exec/libnetworking/sys/queue.h
+++ /dev/null
@@ -1,446 +0,0 @@
-/*
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)queue.h	8.5 (Berkeley) 8/20/94
- * $Id$
- */
-
-#ifndef _SYS_QUEUE_H_
-#define	_SYS_QUEUE_H_
-
-/*
- * This file defines five types of data structures: singly-linked lists,
- * slingly-linked tail queues, lists, tail queues, and circular queues.
- *
- * A singly-linked list is headed by a single forward pointer. The elements
- * are singly linked for minimum space and pointer manipulation overhead at
- * the expense of O(n) removal for arbitrary elements. New elements can be
- * added to the list after an existing element or at the head of the list.
- * Elements being removed from the head of the list should use the explicit
- * macro for this purpose for optimum efficiency. A singly-linked list may
- * only be traversed in the forward direction.  Singly-linked lists are ideal
- * for applications with large datasets and few or no removals or for
- * implementing a LIFO queue.
- *
- * A singly-linked tail queue is headed by a pair of pointers, one to the
- * head of the list and the other to the tail of the list. The elements are
- * singly linked for minimum space and pointer manipulation overhead at the
- * expense of O(n) removal for arbitrary elements. New elements can be added
- * to the list after an existing element, at the head of the list, or at the
- * end of the list. Elements being removed from the head of the tail queue
- * should use the explicit macro for this purpose for optimum efficiency.
- * A singly-linked tail queue may only be traversed in the forward direction.
- * Singly-linked tail queues are ideal for applications with large datasets
- * and few or no removals or for implementing a FIFO queue.
- *
- * A list is headed by a single forward pointer (or an array of forward
- * pointers for a hash table header). The elements are doubly linked
- * so that an arbitrary element can be removed without a need to
- * traverse the list. New elements can be added to the list before
- * or after an existing element or at the head of the list. A list
- * may only be traversed in the forward direction.
- *
- * A tail queue is headed by a pair of pointers, one to the head of the
- * list and the other to the tail of the list. The elements are doubly
- * linked so that an arbitrary element can be removed without a need to
- * traverse the list. New elements can be added to the list before or
- * after an existing element, at the head of the list, or at the end of
- * the list. A tail queue may only be traversed in the forward direction.
- *
- * A circle queue is headed by a pair of pointers, one to the head of the
- * list and the other to the tail of the list. The elements are doubly
- * linked so that an arbitrary element can be removed without a need to
- * traverse the list. New elements can be added to the list before or after
- * an existing element, at the head of the list, or at the end of the list.
- * A circle queue may be traversed in either direction, but has a more
- * complex end of list detection.
- *
- * For details on the use of these macros, see the queue(3) manual page.
- */
-
-/*
- * Singly-linked List definitions.
- */
-#define SLIST_HEAD(name, type)						\
-struct name {								\
-	struct type *slh_first;	/* first element */			\
-}
- 
-#define SLIST_ENTRY(type)						\
-struct {								\
-	struct type *sle_next;	/* next element */			\
-}
- 
-/*
- * Singly-linked List functions.
- */
-#define SLIST_INIT(head) {						\
-	(head)->slh_first = NULL;					\
-}
-
-#define SLIST_INSERT_AFTER(slistelm, elm, field) {			\
-	(elm)->field.sle_next = (slistelm)->field.sle_next;		\
-	(slistelm)->field.sle_next = (elm);				\
-}
-
-#define SLIST_INSERT_HEAD(head, elm, field) {				\
-	(elm)->field.sle_next = (head)->slh_first;			\
-	(head)->slh_first = (elm);					\
-}
-
-#define SLIST_REMOVE_HEAD(head, field) {				\
-	(head)->slh_first = (head)->slh_first->field.sle_next;		\
-}
-
-#define SLIST_REMOVE(head, elm, type, field) {				\
-	if ((head)->slh_first == (elm)) {				\
-		SLIST_REMOVE_HEAD((head), field);			\
-	}								\
-	else {								\
-		struct type *curelm = (head)->slh_first;		\
-		while( curelm->field.sle_next != (elm) )		\
-			curelm = curelm->field.sle_next;		\
-		curelm->field.sle_next =				\
-		    curelm->field.sle_next->field.sle_next;		\
-	}								\
-}
-
-/*
- * Singly-linked Tail queue definitions.
- */
-#define STAILQ_HEAD(name, type)						\
-struct name {								\
-	struct type *stqh_first;/* first element */			\
-	struct type **stqh_last;/* addr of last next element */		\
-}
-
-#define STAILQ_ENTRY(type)						\
-struct {								\
-	struct type *stqe_next;	/* next element */			\
-}
-
-/*
- * Singly-linked Tail queue functions.
- */
-#define	STAILQ_INIT(head) {						\
-	(head)->stqh_first = NULL;					\
-	(head)->stqh_last = &(head)->stqh_first;			\
-}
-
-#define STAILQ_INSERT_HEAD(head, elm, field) {				\
-	if (((elm)->field.stqe_next = (head)->stqh_first) == NULL)	\
-		(head)->stqh_last = &(elm)->field.stqe_next;		\
-	(head)->stqh_first = (elm);					\
-}
-
-#define STAILQ_INSERT_TAIL(head, elm, field) {				\
-	(elm)->field.stqe_next = NULL;					\
-	*(head)->stqh_last = (elm);					\
-	(head)->stqh_last = &(elm)->field.stqe_next;			\
-}
-
-#define STAILQ_INSERT_AFTER(head, tqelm, elm, field) {			\
-	if (((elm)->field.stqe_next = (tqelm)->field.stqe_next) == NULL)\
-		(head)->stqh_last = &(elm)->field.stqe_next;		\
-	(tqelm)->field.stqe_next = (elm);				\
-}
-
-#define STAILQ_REMOVE_HEAD(head, field) {				\
-	if (((head)->stqh_first =					\
-	     (head)->stqh_first->field.stqe_next) == NULL)		\
-		(head)->stqh_last = &(head)->stqh_first;		\
-}
-
-#define STAILQ_REMOVE(head, elm, type, field) {				\
-	if ((head)->stqh_first == (elm)) {				\
-		STAILQ_REMOVE_HEAD(head, field);			\
-	}								\
-	else {								\
-		struct type *curelm = (head)->stqh_first;		\
-		while( curelm->field.stqe_next != (elm) )		\
-			curelm = curelm->field.stqe_next;		\
-		if((curelm->field.stqe_next =				\
-		    curelm->field.stqe_next->field.stqe_next) == NULL)	\
-			(head)->stqh_last = &(curelm)->field.stqe_next;	\
-	}								\
-}
-
-/*
- * List definitions.
- */
-#define LIST_HEAD(name, type)						\
-struct name {								\
-	struct type *lh_first;	/* first element */			\
-}
-
-#define LIST_ENTRY(type)						\
-struct {								\
-	struct type *le_next;	/* next element */			\
-	struct type **le_prev;	/* address of previous next element */	\
-}
-
-/*
- * List functions.
- */
-#define	LIST_INIT(head) {						\
-	(head)->lh_first = NULL;					\
-}
-
-#define LIST_INSERT_AFTER(listelm, elm, field) {			\
-	if (((elm)->field.le_next = (listelm)->field.le_next) != NULL)	\
-		(listelm)->field.le_next->field.le_prev =		\
-		    &(elm)->field.le_next;				\
-	(listelm)->field.le_next = (elm);				\
-	(elm)->field.le_prev = &(listelm)->field.le_next;		\
-}
-
-#define LIST_INSERT_BEFORE(listelm, elm, field) {			\
-	(elm)->field.le_prev = (listelm)->field.le_prev;		\
-	(elm)->field.le_next = (listelm);				\
-	*(listelm)->field.le_prev = (elm);				\
-	(listelm)->field.le_prev = &(elm)->field.le_next;		\
-}
-
-#define LIST_INSERT_HEAD(head, elm, field) {				\
-	if (((elm)->field.le_next = (head)->lh_first) != NULL)		\
-		(head)->lh_first->field.le_prev = &(elm)->field.le_next;\
-	(head)->lh_first = (elm);					\
-	(elm)->field.le_prev = &(head)->lh_first;			\
-}
-
-#define LIST_REMOVE(elm, field) {					\
-	if ((elm)->field.le_next != NULL)				\
-		(elm)->field.le_next->field.le_prev = 			\
-		    (elm)->field.le_prev;				\
-	*(elm)->field.le_prev = (elm)->field.le_next;			\
-}
-
-/*
- * Tail queue definitions.
- */
-#define TAILQ_HEAD(name, type)						\
-struct name {								\
-	struct type *tqh_first;	/* first element */			\
-	struct type **tqh_last;	/* addr of last next element */		\
-}
-
-#define TAILQ_HEAD_INITIALIZER(head)					\
-	{ NULL, &(head).tqh_first }
-
-#define TAILQ_ENTRY(type)						\
-struct {								\
-	struct type *tqe_next;	/* next element */			\
-	struct type **tqe_prev;	/* address of previous next element */	\
-}
-
-/*
- * Tail queue functions.
- */
-#define	TAILQ_EMPTY(head) ((head)->tqh_first == NULL)
-
-#define	TAILQ_FIRST(head) ((head)->tqh_first)
-
-#define	TAILQ_LAST(head) ((head)->tqh_last)
-
-#define	TAILQ_NEXT(elm, field) ((elm)->field.tqe_next)
-
-#define TAILQ_PREV(elm, field) ((elm)->field.tqe_prev)
-
-#define	TAILQ_INIT(head) {						\
-	(head)->tqh_first = NULL;					\
-	(head)->tqh_last = &(head)->tqh_first;				\
-}
-
-#define TAILQ_INSERT_HEAD(head, elm, field) {				\
-	if (((elm)->field.tqe_next = (head)->tqh_first) != NULL)	\
-		(head)->tqh_first->field.tqe_prev =			\
-		    &(elm)->field.tqe_next;				\
-	else								\
-		(head)->tqh_last = &(elm)->field.tqe_next;		\
-	(head)->tqh_first = (elm);					\
-	(elm)->field.tqe_prev = &(head)->tqh_first;			\
-}
-
-#define TAILQ_INSERT_TAIL(head, elm, field) {				\
-	(elm)->field.tqe_next = NULL;					\
-	(elm)->field.tqe_prev = (head)->tqh_last;			\
-	*(head)->tqh_last = (elm);					\
-	(head)->tqh_last = &(elm)->field.tqe_next;			\
-}
-
-#define TAILQ_INSERT_AFTER(head, listelm, elm, field) {			\
-	if (((elm)->field.tqe_next = (listelm)->field.tqe_next) != NULL)\
-		(elm)->field.tqe_next->field.tqe_prev = 		\
-		    &(elm)->field.tqe_next;				\
-	else								\
-		(head)->tqh_last = &(elm)->field.tqe_next;		\
-	(listelm)->field.tqe_next = (elm);				\
-	(elm)->field.tqe_prev = &(listelm)->field.tqe_next;		\
-}
-
-#define TAILQ_INSERT_BEFORE(listelm, elm, field) {			\
-	(elm)->field.tqe_prev = (listelm)->field.tqe_prev;		\
-	(elm)->field.tqe_next = (listelm);				\
-	*(listelm)->field.tqe_prev = (elm);				\
-	(listelm)->field.tqe_prev = &(elm)->field.tqe_next;		\
-}
-
-#define TAILQ_REMOVE(head, elm, field) {				\
-	if (((elm)->field.tqe_next) != NULL)				\
-		(elm)->field.tqe_next->field.tqe_prev = 		\
-		    (elm)->field.tqe_prev;				\
-	else								\
-		(head)->tqh_last = (elm)->field.tqe_prev;		\
-	*(elm)->field.tqe_prev = (elm)->field.tqe_next;			\
-}
-
-/*
- * Circular queue definitions.
- */
-#define CIRCLEQ_HEAD(name, type)					\
-struct name {								\
-	struct type *cqh_first;		/* first element */		\
-	struct type *cqh_last;		/* last element */		\
-}
-
-#define CIRCLEQ_ENTRY(type)						\
-struct {								\
-	struct type *cqe_next;		/* next element */		\
-	struct type *cqe_prev;		/* previous element */		\
-}
-
-/*
- * Circular queue functions.
- */
-#define	CIRCLEQ_INIT(head) {						\
-	(head)->cqh_first = (void *)(head);				\
-	(head)->cqh_last = (void *)(head);				\
-}
-
-#define CIRCLEQ_INSERT_AFTER(head, listelm, elm, field) {		\
-	(elm)->field.cqe_next = (listelm)->field.cqe_next;		\
-	(elm)->field.cqe_prev = (listelm);				\
-	if ((listelm)->field.cqe_next == (void *)(head))		\
-		(head)->cqh_last = (elm);				\
-	else								\
-		(listelm)->field.cqe_next->field.cqe_prev = (elm);	\
-	(listelm)->field.cqe_next = (elm);				\
-}
-
-#define CIRCLEQ_INSERT_BEFORE(head, listelm, elm, field) {		\
-	(elm)->field.cqe_next = (listelm);				\
-	(elm)->field.cqe_prev = (listelm)->field.cqe_prev;		\
-	if ((listelm)->field.cqe_prev == (void *)(head))		\
-		(head)->cqh_first = (elm);				\
-	else								\
-		(listelm)->field.cqe_prev->field.cqe_next = (elm);	\
-	(listelm)->field.cqe_prev = (elm);				\
-}
-
-#define CIRCLEQ_INSERT_HEAD(head, elm, field) {				\
-	(elm)->field.cqe_next = (head)->cqh_first;			\
-	(elm)->field.cqe_prev = (void *)(head);				\
-	if ((head)->cqh_last == (void *)(head))				\
-		(head)->cqh_last = (elm);				\
-	else								\
-		(head)->cqh_first->field.cqe_prev = (elm);		\
-	(head)->cqh_first = (elm);					\
-}
-
-#define CIRCLEQ_INSERT_TAIL(head, elm, field) {				\
-	(elm)->field.cqe_next = (void *)(head);				\
-	(elm)->field.cqe_prev = (head)->cqh_last;			\
-	if ((head)->cqh_first == (void *)(head))			\
-		(head)->cqh_first = (elm);				\
-	else								\
-		(head)->cqh_last->field.cqe_next = (elm);		\
-	(head)->cqh_last = (elm);					\
-}
-
-#define	CIRCLEQ_REMOVE(head, elm, field) {				\
-	if ((elm)->field.cqe_next == (void *)(head))			\
-		(head)->cqh_last = (elm)->field.cqe_prev;		\
-	else								\
-		(elm)->field.cqe_next->field.cqe_prev =			\
-		    (elm)->field.cqe_prev;				\
-	if ((elm)->field.cqe_prev == (void *)(head))			\
-		(head)->cqh_first = (elm)->field.cqe_next;		\
-	else								\
-		(elm)->field.cqe_prev->field.cqe_next =			\
-		    (elm)->field.cqe_next;				\
-}
-
-#ifdef KERNEL
-
-/*
- * XXX insque() and remque() are an old way of handling certain queues.
- * They bogusly assumes that all queue heads look alike.
- */
-
-struct quehead {
-	struct quehead *qh_link;
-	struct quehead *qh_rlink;
-};
-
-#ifdef	__GNUC__
-
-static __inline void
-insque(void *a, void *b)
-{
-	struct quehead *element = a, *head = b;
-
-	element->qh_link = head->qh_link;
-	element->qh_rlink = head;
-	head->qh_link = element;
-	element->qh_link->qh_rlink = element;
-}
-
-static __inline void
-remque(void *a)
-{
-	struct quehead *element = a;
-
-	element->qh_link->qh_rlink = element->qh_rlink;
-	element->qh_rlink->qh_link = element->qh_link;
-	element->qh_rlink = 0;
-}
-
-#else /* !__GNUC__ */
-
-void	insque __P((void *a, void *b));
-void	remque __P((void *a));
-
-#endif /* __GNUC__ */
-
-#endif /* KERNEL */
-
-#endif /* !_SYS_QUEUE_H_ */
diff --git a/c/src/exec/libnetworking/sys/reboot.h b/c/src/exec/libnetworking/sys/reboot.h
deleted file mode 100644
index 48a7f0f782..0000000000
--- a/c/src/exec/libnetworking/sys/reboot.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1988, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)reboot.h	8.3 (Berkeley) 12/13/94
- * $Id$
- */
-
-#ifndef _SYS_REBOOT_H_
-#define _SYS_REBOOT_H_
-
-/*
- * Arguments to reboot system call.  These are passed to
- * the boot program and on to init.
- */
-#define	RB_AUTOBOOT	0	/* flags for system auto-booting itself */
-
-#define	RB_ASKNAME	0x001	/* ask for file name to reboot from */
-#define	RB_SINGLE	0x002	/* reboot to single user only */
-#define	RB_NOSYNC	0x004	/* dont sync before reboot */
-#define	RB_HALT		0x008	/* don't reboot, just halt */
-#define	RB_INITNAME	0x010	/* name given for /etc/init (unused) */
-#define	RB_DFLTROOT	0x020	/* use compiled-in rootdev */
-#define	RB_KDB		0x040	/* give control to kernel debugger */
-#define	RB_RDONLY	0x080	/* mount root fs read-only */
-#define	RB_DUMP		0x100	/* dump kernel memory before reboot */
-#define	RB_MINIROOT	0x200	/* mini-root present in memory at boot time */
-#define RB_CONFIG	0x400	/* invoke user configuration routing */
-#define RB_VERBOSE	0x800	/* print all potentially useful info */
-#define	RB_SERIAL	0x1000	/* user serial port as console */
-#define	RB_CDROM	0x2000	/* use cdrom as root */
-#define	RB_POWEROFF	0x4000	/* if you can, turn the power off */
-#define	RB_GDB		0x8000	/* use GDB remote debugger instead of DDB */
-#define	RB_MUTE		0x10000	/* Come up with the console muted */
-#define	RB_SELFTEST	0x20000	/* don't boot to normal operation, do selftest */
-
-#define	RB_BOOTINFO	0x80000000	/* have `struct bootinfo *' arg */
-
-/*
- * Constants for converting boot-style device number to type,
- * adaptor (uba, mba, etc), unit number and partition number.
- * Type (== major device number) is in the low byte
- * for backward compatibility.  Except for that of the "magic
- * number", each mask applies to the shifted value.
- * Format:
- *	 (4) (4) (4) (4)  (8)     (8)
- *	--------------------------------
- *	|MA | AD| CT| UN| PART  | TYPE |
- *	--------------------------------
- */
-#define	B_ADAPTORSHIFT		24
-#define	B_ADAPTORMASK		0x0f
-#define	B_ADAPTOR(val)		(((val) >> B_ADAPTORSHIFT) & B_ADAPTORMASK)
-#define B_CONTROLLERSHIFT	20
-#define B_CONTROLLERMASK	0xf
-#define	B_CONTROLLER(val)	(((val)>>B_CONTROLLERSHIFT) & B_CONTROLLERMASK)
-#define B_SLICESHIFT		20
-#define B_SLICEMASK		0xff
-#define B_SLICE(val)		(((val)>>B_SLICESHIFT) & B_SLICEMASK)
-#define B_UNITSHIFT		16
-#define B_UNITMASK		0xf
-#define	B_UNIT(val)		(((val) >> B_UNITSHIFT) & B_UNITMASK)
-#define B_PARTITIONSHIFT	8
-#define B_PARTITIONMASK		0xff
-#define	B_PARTITION(val)	(((val) >> B_PARTITIONSHIFT) & B_PARTITIONMASK)
-#define	B_TYPESHIFT		0
-#define	B_TYPEMASK		0xff
-#define	B_TYPE(val)		(((val) >> B_TYPESHIFT) & B_TYPEMASK)
-
-#define	B_MAGICMASK	0xf0000000
-#define	B_DEVMAGIC	0xa0000000
-
-#define MAKEBOOTDEV(type, adaptor, controller, unit, partition) \
-	(((type) << B_TYPESHIFT) | ((adaptor) << B_ADAPTORSHIFT) | \
-	((controller) << B_CONTROLLERSHIFT) | ((unit) << B_UNITSHIFT) | \
-	((partition) << B_PARTITIONSHIFT) | B_DEVMAGIC)
-
-#endif
diff --git a/c/src/exec/libnetworking/sys/resourcevar.h b/c/src/exec/libnetworking/sys/resourcevar.h
deleted file mode 100644
index 2b4c47e48f..0000000000
--- a/c/src/exec/libnetworking/sys/resourcevar.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
- *  $Id$
- */
-
-/* intentionally empty file */
diff --git a/c/src/exec/libnetworking/sys/rtprio.h b/c/src/exec/libnetworking/sys/rtprio.h
deleted file mode 100644
index dd9521e7c8..0000000000
--- a/c/src/exec/libnetworking/sys/rtprio.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) 1994, Henrik Vestergaard Draboel
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by (name).
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	$Id$
- */
-
-#ifndef _SYS_RTPRIO_H_
-#define _SYS_RTPRIO_H_
-
-/*
- * Process realtime-priority specifications to rtprio.
- */
-
-/* priority types */
-#define RTP_PRIO_REALTIME	0
-#define RTP_PRIO_NORMAL		1
-#define RTP_PRIO_IDLE		2
-
-/* priority range */
-#define RTP_PRIO_MIN		0	/* Highest priority */
-#define RTP_PRIO_MAX		31	/* Lowest priority */
-
-/*
- * rtprio() syscall functions
- */
-#define RTP_LOOKUP		0
-#define RTP_SET			1
-
-#ifndef LOCORE
-struct rtprio {
-	u_short type;
-	u_short prio;
-};
-#endif
-
-#ifndef KERNEL
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-int	rtprio __P((int, pid_t, struct rtprio *));
-__END_DECLS
-#endif	/* !KERNEL */
-#endif	/* !_SYS_RTPRIO_H_ */
diff --git a/c/src/exec/libnetworking/sys/select.h b/c/src/exec/libnetworking/sys/select.h
deleted file mode 100644
index e69971e3b6..0000000000
--- a/c/src/exec/libnetworking/sys/select.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)select.h	8.2 (Berkeley) 1/4/94
- * $Id$
- */
-
-#ifndef _SYS_SELECT_H_
-#define	_SYS_SELECT_H_
-
-/*
- * Used to maintain information about processes that wish to be
- * notified when I/O becomes possible.
- */
-struct selinfo {
-	pid_t	si_pid;		/* process to be notified */
-	short	si_flags;	/* see below */
-};
-#define	SI_COLL	0x0001		/* collision occurred */
-
-#ifdef KERNEL
-struct proc;
-
-void	selrecord __P((struct proc *selector, struct selinfo *));
-void	selwakeup __P((struct selinfo *));
-#endif
-
-#endif /* !_SYS_SELECT_H_ */
diff --git a/c/src/exec/libnetworking/sys/signalvar.h b/c/src/exec/libnetworking/sys/signalvar.h
deleted file mode 100644
index 8900458fdb..0000000000
--- a/c/src/exec/libnetworking/sys/signalvar.h
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)signalvar.h	8.6 (Berkeley) 2/19/95
- * $Id$
- */
-
-#ifndef	_SYS_SIGNALVAR_H_		/* tmp for user.h */
-#define	_SYS_SIGNALVAR_H_
-
-/*
- * Kernel signal definitions and data structures,
- * not exported to user programs.
- */
-
-/*
- * Process signal actions and state, needed only within the process
- * (not necessarily resident).
- */
-struct	sigacts {
-	sig_t	ps_sigact[NSIG];	/* disposition of signals */
-	sigset_t ps_catchmask[NSIG];	/* signals to be blocked */
-	sigset_t ps_sigonstack;		/* signals to take on sigstack */
-	sigset_t ps_sigintr;		/* signals that interrupt syscalls */
-	sigset_t ps_sigreset;		/* signals that reset when caught */
-	sigset_t ps_signodefer;		/* signals not masked while handled */
-	sigset_t ps_oldmask;		/* saved mask from before sigpause */
-	int	ps_flags;		/* signal flags, below */
-	struct	sigaltstack ps_sigstk;	/* sp & on stack state variable */
-	int	ps_sig;			/* for core dump/debugger XXX */
-	u_long	ps_code;		/* for core dump/debugger XXX */
-	sigset_t ps_usertramp;		/* SunOS compat; libc sigtramp XXX */
-};
-
-/* signal flags */
-#define	SAS_OLDMASK	0x01		/* need to restore mask before pause */
-#define	SAS_ALTSTACK	0x02		/* have alternate signal stack */
-
-/* additional signal action values, used only temporarily/internally */
-#define	SIG_CATCH	((__sighandler_t *)2)
-#define	SIG_HOLD	((__sighandler_t *)3)
-
-/*
- * get signal action for process and signal; currently only for current process
- */
-#define SIGACTION(p, sig)	(p->p_sigacts->ps_sigact[(sig)])
-
-/*
- * Determine signal that should be delivered to process p, the current
- * process, 0 if none.  If there is a pending stop signal with default
- * action, the process stops in issignal().
- */
-#define	CURSIG(p)							\
-	(((p)->p_siglist == 0 ||					\
-	    (((p)->p_flag & P_TRACED) == 0 &&				\
-	     ((p)->p_siglist & ~(p)->p_sigmask) == 0)) ?		\
-	    0 : issignal(p))
-
-/*
- * Clear a pending signal from a process.
- */
-#define	CLRSIG(p, sig)	{ (p)->p_siglist &= ~sigmask(sig); }
-
-/*
- * Signal properties and actions.
- * The array below categorizes the signals and their default actions
- * according to the following properties:
- */
-#define	SA_KILL		0x01		/* terminates process by default */
-#define	SA_CORE		0x02		/* ditto and coredumps */
-#define	SA_STOP		0x04		/* suspend process */
-#define	SA_TTYSTOP	0x08		/* ditto, from tty */
-#define	SA_IGNORE	0x10		/* ignore by default */
-#define	SA_CONT		0x20		/* continue if suspended */
-#define	SA_CANTMASK	0x40		/* non-maskable, catchable */
-
-#ifdef	SIGPROP
-static int sigprop[NSIG + 1] = {
-	0,			/* unused */
-	SA_KILL,		/* SIGHUP */
-	SA_KILL,		/* SIGINT */
-	SA_KILL|SA_CORE,	/* SIGQUIT */
-	SA_KILL|SA_CORE,	/* SIGILL */
-	SA_KILL|SA_CORE,	/* SIGTRAP */
-	SA_KILL|SA_CORE,	/* SIGABRT */
-	SA_KILL|SA_CORE,	/* SIGEMT */
-	SA_KILL|SA_CORE,	/* SIGFPE */
-	SA_KILL,		/* SIGKILL */
-	SA_KILL|SA_CORE,	/* SIGBUS */
-	SA_KILL|SA_CORE,	/* SIGSEGV */
-	SA_KILL|SA_CORE,	/* SIGSYS */
-	SA_KILL,		/* SIGPIPE */
-	SA_KILL,		/* SIGALRM */
-	SA_KILL,		/* SIGTERM */
-	SA_IGNORE,		/* SIGURG */
-	SA_STOP,		/* SIGSTOP */
-	SA_STOP|SA_TTYSTOP,	/* SIGTSTP */
-	SA_IGNORE|SA_CONT,	/* SIGCONT */
-	SA_IGNORE,		/* SIGCHLD */
-	SA_STOP|SA_TTYSTOP,	/* SIGTTIN */
-	SA_STOP|SA_TTYSTOP,	/* SIGTTOU */
-	SA_IGNORE,		/* SIGIO */
-	SA_KILL,		/* SIGXCPU */
-	SA_KILL,		/* SIGXFSZ */
-	SA_KILL,		/* SIGVTALRM */
-	SA_KILL,		/* SIGPROF */
-	SA_IGNORE,		/* SIGWINCH  */
-	SA_IGNORE,		/* SIGINFO */
-	SA_KILL,		/* SIGUSR1 */
-	SA_KILL,		/* SIGUSR2 */
-};
-
-#define	contsigmask	(sigmask(SIGCONT))
-#define	stopsigmask	(sigmask(SIGSTOP) | sigmask(SIGTSTP) | \
-			    sigmask(SIGTTIN) | sigmask(SIGTTOU))
-
-#endif /* SIGPROP */
-
-#define	sigcantmask	(sigmask(SIGKILL) | sigmask(SIGSTOP))
-
-#ifdef KERNEL
-/*
- * Machine-independent functions:
- */
-void	execsigs __P((struct proc *p));
-void	gsignal __P((int pgid, int sig));
-int	issignal __P((struct proc *p));
-void	killproc __P((struct proc *p, char *why));
-void	pgsignal __P((struct pgrp *pgrp, int sig, int checkctty));
-void	postsig __P((int sig));
-void	psignal __P((struct proc *p, int sig));
-void	setsigvec __P((struct proc *p, int signum, struct sigaction *sa));
-void	sigexit __P((struct proc *p, int signum));
-void	siginit __P((struct proc *p));
-void	trapsignal __P((struct proc *p, int sig, u_long code));
-
-/*
- * Machine-dependent functions:
- */
-void	sendsig __P((sig_t action, int sig, int returnmask, u_long code));
-#endif	/* KERNEL */
-#endif	/* !_SYS_SIGNALVAR_H_ */
diff --git a/c/src/exec/libnetworking/sys/socket.h b/c/src/exec/libnetworking/sys/socket.h
deleted file mode 100644
index 7e0f6c7572..0000000000
--- a/c/src/exec/libnetworking/sys/socket.h
+++ /dev/null
@@ -1,356 +0,0 @@
-/*
- * Copyright (c) 1982, 1985, 1986, 1988, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)socket.h	8.4 (Berkeley) 2/21/94
- * $Id$
- */
-
-#ifndef _SYS_SOCKET_H_
-#define	_SYS_SOCKET_H_
-
-/*
- * Definitions related to sockets: types, address families, options.
- */
-
-/*
- * Types
- */
-#define	SOCK_STREAM	1		/* stream socket */
-#define	SOCK_DGRAM	2		/* datagram socket */
-#define	SOCK_RAW	3		/* raw-protocol interface */
-#define	SOCK_RDM	4		/* reliably-delivered message */
-#define	SOCK_SEQPACKET	5		/* sequenced packet stream */
-
-/*
- * Option flags per-socket.
- */
-#define	SO_DEBUG	0x0001		/* turn on debugging info recording */
-#define	SO_ACCEPTCONN	0x0002		/* socket has had listen() */
-#define	SO_REUSEADDR	0x0004		/* allow local address reuse */
-#define	SO_KEEPALIVE	0x0008		/* keep connections alive */
-#define	SO_DONTROUTE	0x0010		/* just use interface addresses */
-#define	SO_BROADCAST	0x0020		/* permit sending of broadcast msgs */
-#define	SO_USELOOPBACK	0x0040		/* bypass hardware when possible */
-#define	SO_LINGER	0x0080		/* linger on close if data present */
-#define	SO_OOBINLINE	0x0100		/* leave received OOB data in line */
-#define	SO_REUSEPORT	0x0200		/* allow local address & port reuse */
-#define	SO_TIMESTAMP	0x0400		/* timestamp received dgram traffic */
-
-/*
- * Additional options, not kept in so_options.
- */
-#define SO_SNDBUF	0x1001		/* send buffer size */
-#define SO_RCVBUF	0x1002		/* receive buffer size */
-#define SO_SNDLOWAT	0x1003		/* send low-water mark */
-#define SO_RCVLOWAT	0x1004		/* receive low-water mark */
-#define SO_SNDTIMEO	0x1005		/* send timeout */
-#define SO_RCVTIMEO	0x1006		/* receive timeout */
-#define	SO_ERROR	0x1007		/* get error status and clear */
-#define	SO_TYPE		0x1008		/* get socket type */
-#define	SO_PRIVSTATE	0x1009		/* get/deny privileged state */
-
-/*
- * Structure used for manipulating linger option.
- */
-struct	linger {
-	int	l_onoff;		/* option on/off */
-	int	l_linger;		/* linger time */
-};
-
-/*
- * Level number for (get/set)sockopt() to apply to socket itself.
- */
-#define	SOL_SOCKET	0xffff		/* options for socket level */
-
-/*
- * Address families.
- */
-#define	AF_UNSPEC	0		/* unspecified */
-#define	AF_LOCAL	1		/* local to host (pipes, portals) */
-#define	AF_UNIX		AF_LOCAL	/* backward compatibility */
-#define	AF_INET		2		/* internetwork: UDP, TCP, etc. */
-#define	AF_IMPLINK	3		/* arpanet imp addresses */
-#define	AF_PUP		4		/* pup protocols: e.g. BSP */
-#define	AF_CHAOS	5		/* mit CHAOS protocols */
-#define	AF_NS		6		/* XEROX NS protocols */
-#define	AF_ISO		7		/* ISO protocols */
-#define	AF_OSI		AF_ISO
-#define	AF_ECMA		8		/* European computer manufacturers */
-#define	AF_DATAKIT	9		/* datakit protocols */
-#define	AF_CCITT	10		/* CCITT protocols, X.25 etc */
-#define	AF_SNA		11		/* IBM SNA */
-#define AF_DECnet	12		/* DECnet */
-#define AF_DLI		13		/* DEC Direct data link interface */
-#define AF_LAT		14		/* LAT */
-#define	AF_HYLINK	15		/* NSC Hyperchannel */
-#define	AF_APPLETALK	16		/* Apple Talk */
-#define	AF_ROUTE	17		/* Internal Routing Protocol */
-#define	AF_LINK		18		/* Link layer interface */
-#define	pseudo_AF_XTP	19		/* eXpress Transfer Protocol (no AF) */
-#define	AF_COIP		20		/* connection-oriented IP, aka ST II */
-#define	AF_CNT		21		/* Computer Network Technology */
-#define pseudo_AF_RTIP	22		/* Help Identify RTIP packets */
-#define	AF_IPX		23		/* Novell Internet Protocol */
-#define	AF_SIP		24		/* Simple Internet Protocol */
-#define	pseudo_AF_PIP	25		/* Help Identify PIP packets */
-#define	AF_ISDN		26		/* Integrated Services Digital Network*/
-#define	AF_E164		AF_ISDN		/* CCITT E.164 recommendation */
-#define	pseudo_AF_KEY	27		/* Internal key-management function */
-#define	AF_INET6	28		/* IPv6 */
-
-#define	AF_MAX		29
-
-/*
- * Structure used by kernel to store most
- * addresses.
- */
-struct sockaddr {
-	u_char	sa_len;			/* total length */
-	u_char	sa_family;		/* address family */
-	char	sa_data[14];		/* actually longer; address value */
-};
-
-/*
- * Structure used by kernel to pass protocol
- * information in raw sockets.
- */
-struct sockproto {
-	u_short	sp_family;		/* address family */
-	u_short	sp_protocol;		/* protocol */
-};
-
-/*
- * Protocol families, same as address families for now.
- */
-#define	PF_UNSPEC	AF_UNSPEC
-#define	PF_LOCAL	AF_LOCAL
-#define	PF_UNIX		PF_LOCAL	/* backward compatibility */
-#define	PF_INET		AF_INET
-#define	PF_IMPLINK	AF_IMPLINK
-#define	PF_PUP		AF_PUP
-#define	PF_CHAOS	AF_CHAOS
-#define	PF_NS		AF_NS
-#define	PF_ISO		AF_ISO
-#define	PF_OSI		AF_ISO
-#define	PF_ECMA		AF_ECMA
-#define	PF_DATAKIT	AF_DATAKIT
-#define	PF_CCITT	AF_CCITT
-#define	PF_SNA		AF_SNA
-#define PF_DECnet	AF_DECnet
-#define PF_DLI		AF_DLI
-#define PF_LAT		AF_LAT
-#define	PF_HYLINK	AF_HYLINK
-#define	PF_APPLETALK	AF_APPLETALK
-#define	PF_ROUTE	AF_ROUTE
-#define	PF_LINK		AF_LINK
-#define	PF_XTP		pseudo_AF_XTP	/* really just proto family, no AF */
-#define	PF_COIP		AF_COIP
-#define	PF_CNT		AF_CNT
-#define	PF_SIP		AF_SIP
-#define	PF_IPX		AF_IPX		/* same format as AF_NS */
-#define PF_RTIP		pseudo_AF_RTIP	/* same format as AF_INET */
-#define PF_PIP		pseudo_AF_PIP
-#define	PF_ISDN		AF_ISDN
-#define	PF_KEY		pseudo_AF_KEY
-#define	PF_INET6	AF_INET6
-
-#define	PF_MAX		AF_MAX
-
-/*
- * Definitions for network related sysctl, CTL_NET.
- *
- * Second level is protocol family.
- * Third level is protocol number.
- *
- * Further levels are defined by the individual families below.
- */
-#define NET_MAXID	AF_MAX
-
-#define CTL_NET_NAMES { \
-	{ 0, 0 }, \
-	{ "unix", CTLTYPE_NODE }, \
-	{ "inet", CTLTYPE_NODE }, \
-	{ "implink", CTLTYPE_NODE }, \
-	{ "pup", CTLTYPE_NODE }, \
-	{ "chaos", CTLTYPE_NODE }, \
-	{ "xerox_ns", CTLTYPE_NODE }, \
-	{ "iso", CTLTYPE_NODE }, \
-	{ "emca", CTLTYPE_NODE }, \
-	{ "datakit", CTLTYPE_NODE }, \
-	{ "ccitt", CTLTYPE_NODE }, \
-	{ "ibm_sna", CTLTYPE_NODE }, \
-	{ "decnet", CTLTYPE_NODE }, \
-	{ "dec_dli", CTLTYPE_NODE }, \
-	{ "lat", CTLTYPE_NODE }, \
-	{ "hylink", CTLTYPE_NODE }, \
-	{ "appletalk", CTLTYPE_NODE }, \
-	{ "route", CTLTYPE_NODE }, \
-	{ "link_layer", CTLTYPE_NODE }, \
-	{ "xtp", CTLTYPE_NODE }, \
-	{ "coip", CTLTYPE_NODE }, \
-	{ "cnt", CTLTYPE_NODE }, \
-	{ "rtip", CTLTYPE_NODE }, \
-	{ "ipx", CTLTYPE_NODE }, \
-	{ "sip", CTLTYPE_NODE }, \
-	{ "pip", CTLTYPE_NODE }, \
-	{ "isdn", CTLTYPE_NODE }, \
-	{ "key", CTLTYPE_NODE }, \
-}
-
-/*
- * PF_ROUTE - Routing table
- *
- * Three additional levels are defined:
- *	Fourth: address family, 0 is wildcard
- *	Fifth: type of info, defined below
- *	Sixth: flag(s) to mask with for NET_RT_FLAGS
- */
-#define NET_RT_DUMP	1		/* dump; may limit to a.f. */
-#define NET_RT_FLAGS	2		/* by flags, e.g. RESOLVING */
-#define NET_RT_IFLIST	3		/* survey interface list */
-#define	NET_RT_MAXID	4
-
-#define CTL_NET_RT_NAMES { \
-	{ 0, 0 }, \
-	{ "dump", CTLTYPE_STRUCT }, \
-	{ "flags", CTLTYPE_STRUCT }, \
-	{ "iflist", CTLTYPE_STRUCT }, \
-}
-
-/*
- * Maximum queue length specifiable by listen.
- */
-#define	SOMAXCONN	128
-
-/*
- * Message header for recvmsg and sendmsg calls.
- * Used value-result for recvmsg, value only for sendmsg.
- */
-struct msghdr {
-	caddr_t	msg_name;		/* optional address */
-	u_int	msg_namelen;		/* size of address */
-	struct	iovec *msg_iov;		/* scatter/gather array */
-	u_int	msg_iovlen;		/* # elements in msg_iov */
-	caddr_t	msg_control;		/* ancillary data, see below */
-	u_int	msg_controllen;		/* ancillary data buffer len */
-	int	msg_flags;		/* flags on received message */
-};
-
-#define	MSG_OOB		0x1		/* process out-of-band data */
-#define	MSG_PEEK	0x2		/* peek at incoming message */
-#define	MSG_DONTROUTE	0x4		/* send without using routing tables */
-#define	MSG_EOR		0x8		/* data completes record */
-#define	MSG_TRUNC	0x10		/* data discarded before delivery */
-#define	MSG_CTRUNC	0x20		/* control data lost before delivery */
-#define	MSG_WAITALL	0x40		/* wait for full request or error */
-#define	MSG_DONTWAIT	0x80		/* this message should be nonblocking */
-#define	MSG_EOF		0x100		/* data completes connection */
-#define MSG_COMPAT      0x8000		/* used in sendit() */
-
-/*
- * Header for ancillary data objects in msg_control buffer.
- * Used for additional information with/about a datagram
- * not expressible by flags.  The format is a sequence
- * of message elements headed by cmsghdr structures.
- */
-struct cmsghdr {
-	u_int	cmsg_len;		/* data byte count, including hdr */
-	int	cmsg_level;		/* originating protocol */
-	int	cmsg_type;		/* protocol-specific type */
-/* followed by	u_char  cmsg_data[]; */
-};
-
-/* given pointer to struct cmsghdr, return pointer to data */
-#define	CMSG_DATA(cmsg)		((u_char *)((cmsg) + 1))
-
-/* given pointer to struct cmsghdr, return pointer to next cmsghdr */
-#define	CMSG_NXTHDR(mhdr, cmsg)	\
-	(((caddr_t)(cmsg) + (cmsg)->cmsg_len + sizeof(struct cmsghdr) > \
-	    (mhdr)->msg_control + (mhdr)->msg_controllen) ? \
-	    (struct cmsghdr *)NULL : \
-	    (struct cmsghdr *)((caddr_t)(cmsg) + ALIGN((cmsg)->cmsg_len)))
-
-#define	CMSG_FIRSTHDR(mhdr)	((struct cmsghdr *)(mhdr)->msg_control)
-
-/* "Socket"-level control message types: */
-#define	SCM_RIGHTS	0x01		/* access rights (array of int) */
-#define	SCM_TIMESTAMP	0x02		/* timestamp (struct timeval) */
-
-/*
- * 4.3 compat sockaddr, move to compat file later
- */
-struct osockaddr {
-	u_short	sa_family;		/* address family */
-	char	sa_data[14];		/* up to 14 bytes of direct address */
-};
-
-/*
- * 4.3-compat message header (move to compat file later).
- */
-struct omsghdr {
-	caddr_t	msg_name;		/* optional address */
-	int	msg_namelen;		/* size of address */
-	struct	iovec *msg_iov;		/* scatter/gather array */
-	int	msg_iovlen;		/* # elements in msg_iov */
-	caddr_t	msg_accrights;		/* access rights sent/received */
-	int	msg_accrightslen;
-};
-
-#ifndef	KERNEL
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-int	accept __P((int, struct sockaddr *, int *));
-int	bind __P((int, const struct sockaddr *, int));
-int	connect __P((int, const struct sockaddr *, int));
-int	getpeername __P((int, struct sockaddr *, int *));
-int	getsockname __P((int, struct sockaddr *, int *));
-int	getsockopt __P((int, int, int, void *, int *));
-int	listen __P((int, int));
-ssize_t	recv __P((int, void *, size_t, int));
-ssize_t	recvfrom __P((int, void *, size_t, int, struct sockaddr *, int *));
-ssize_t	recvmsg __P((int, struct msghdr *, int));
-ssize_t	send __P((int, const void *, size_t, int));
-ssize_t	sendto __P((int, const void *,
-	    size_t, int, const struct sockaddr *, int));
-ssize_t	sendmsg __P((int, const struct msghdr *, int));
-int	setsockopt __P((int, int, int, const void *, int));
-int	shutdown __P((int, int));
-int	socket __P((int, int, int));
-int	socketpair __P((int, int, int, int *));
-__END_DECLS
-
-#else /* KERNEL */
-void	pfctlinput __P((int, struct sockaddr *));
-#endif /* !KERNEL */
-#endif /* !_SYS_SOCKET_H_ */
diff --git a/c/src/exec/libnetworking/sys/socketvar.h b/c/src/exec/libnetworking/sys/socketvar.h
deleted file mode 100644
index 257fee012b..0000000000
--- a/c/src/exec/libnetworking/sys/socketvar.h
+++ /dev/null
@@ -1,279 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)socketvar.h	8.3 (Berkeley) 2/19/95
- * $Id$
- */
-
-#ifndef _SYS_SOCKETVAR_H_
-#define _SYS_SOCKETVAR_H_
-
-#include <sys/queue.h>			/* for TAILQ macros */
-#include <sys/select.h>			/* for struct selinfo */
-
-/*
- * Kernel structure per socket.
- * Contains send and receive buffer queues,
- * handle on protocol and pointer to protocol
- * private data and error information.
- */
-struct socket {
-	short	so_type;		/* generic type, see socket.h */
-	short	so_options;		/* from socket call, see socket.h */
-	short	so_linger;		/* time to linger while closing */
-	short	so_state;		/* internal state flags SS_*, below */
-	caddr_t	so_pcb;			/* protocol control block */
-	struct	protosw *so_proto;	/* protocol handle */
-/*
- * Variables for connection queuing.
- * Socket where accepts occur is so_head in all subsidiary sockets.
- * If so_head is 0, socket is not related to an accept.
- * For head socket so_q0 queues partially completed connections,
- * while so_q is a queue of connections ready to be accepted.
- * If a connection is aborted and it has so_head set, then
- * it has to be pulled out of either so_q0 or so_q.
- * We allow connections to queue up based on current queue lengths
- * and limit on number of queued connections for this socket.
- */
-	struct	socket *so_head;	/* back pointer to accept socket */
-	TAILQ_HEAD(, socket) so_incomp;	/* queue of partial unaccepted connections */
-	TAILQ_HEAD(, socket) so_comp;	/* queue of complete unaccepted connections */
-	TAILQ_ENTRY(socket) so_list;	/* list of unaccepted connections */
-	short	so_qlen;		/* number of unaccepted connections */
-	short	so_incqlen;		/* number of unaccepted incomplete
-					   connections */
-	short	so_qlimit;		/* max number queued connections */
-	short	so_timeo;		/* connection timeout */
-	u_short	so_error;		/* error affecting connection */
-	pid_t	so_pgid;		/* pgid for signals */
-	u_long	so_oobmark;		/* chars to oob mark */
-/*
- * Variables for socket buffering.
- */
-	struct	sockbuf {
-		u_long	sb_cc;		/* actual chars in buffer */
-		u_long	sb_hiwat;	/* max actual char count */
-		u_long	sb_mbcnt;	/* chars of mbufs used */
-		u_long	sb_mbmax;	/* max chars of mbufs to use */
-		long	sb_lowat;	/* low water mark */
-		struct	mbuf *sb_mb;	/* the mbuf chain */
-		struct	selinfo sb_sel;	/* process selecting read/write */
-		short	sb_flags;	/* flags, see below */
-		short	sb_timeo;	/* timeout for read/write */
-	} so_rcv, so_snd;
-#define	SB_MAX		(256*1024)	/* default for max chars in sockbuf */
-#define	SB_LOCK		0x01		/* lock on data queue */
-#define	SB_WANT		0x02		/* someone is waiting to lock */
-#define	SB_WAIT		0x04		/* someone is waiting for data/space */
-#define	SB_SEL		0x08		/* someone is selecting */
-#define	SB_ASYNC	0x10		/* ASYNC I/O, need signals */
-#define	SB_NOTIFY	(SB_WAIT|SB_SEL|SB_ASYNC)
-#define	SB_NOINTR	0x40		/* operations not interruptible */
-
-	caddr_t	so_tpcb;		/* Wisc. protocol control block XXX */
-	void	(*so_upcall) __P((struct socket *so, caddr_t arg, int waitf));
-	caddr_t	so_upcallarg;		/* Arg for above */
-	uid_t	so_uid;			/* who opened the socket */
-};
-
-/*
- * Socket state bits.
- */
-#define	SS_NOFDREF		0x0001	/* no file table ref any more */
-#define	SS_ISCONNECTED		0x0002	/* socket connected to a peer */
-#define	SS_ISCONNECTING		0x0004	/* in process of connecting to peer */
-#define	SS_ISDISCONNECTING	0x0008	/* in process of disconnecting */
-#define	SS_CANTSENDMORE		0x0010	/* can't send more data to peer */
-#define	SS_CANTRCVMORE		0x0020	/* can't receive more data from peer */
-#define	SS_RCVATMARK		0x0040	/* at mark on input */
-
-#define	SS_PRIV			0x0080	/* privileged for broadcast, raw... */
-#define	SS_NBIO			0x0100	/* non-blocking ops */
-#define	SS_ASYNC		0x0200	/* async i/o notify */
-#define	SS_ISCONFIRMING		0x0400	/* deciding to accept connection req */
-
-#define	SS_INCOMP		0x0800	/* unaccepted, incomplete connection */
-#define	SS_COMP			0x1000	/* unaccepted, complete connection */
-
-
-/*
- * Macros for sockets and socket buffering.
- */
-
-/*
- * How much space is there in a socket buffer (so->so_snd or so->so_rcv)?
- * This is problematical if the fields are unsigned, as the space might
- * still be negative (cc > hiwat or mbcnt > mbmax).  Should detect
- * overflow and return 0.  Should use "lmin" but it doesn't exist now.
- */
-#define	sbspace(sb) \
-    ((long) imin((int)((sb)->sb_hiwat - (sb)->sb_cc), \
-	 (int)((sb)->sb_mbmax - (sb)->sb_mbcnt)))
-
-/* do we have to send all at once on a socket? */
-#define	sosendallatonce(so) \
-    ((so)->so_proto->pr_flags & PR_ATOMIC)
-
-/* can we read something from so? */
-#define	soreadable(so) \
-    ((so)->so_rcv.sb_cc >= (so)->so_rcv.sb_lowat || \
-	((so)->so_state & SS_CANTRCVMORE) || \
-	(so)->so_comp.tqh_first || (so)->so_error)
-
-/* can we write something to so? */
-#define	sowriteable(so) \
-    ((sbspace(&(so)->so_snd) >= (so)->so_snd.sb_lowat && \
-	(((so)->so_state&SS_ISCONNECTED) || \
-	  ((so)->so_proto->pr_flags&PR_CONNREQUIRED)==0)) || \
-     ((so)->so_state & SS_CANTSENDMORE) || \
-     (so)->so_error)
-
-/* adjust counters in sb reflecting allocation of m */
-#define	sballoc(sb, m) { \
-	(sb)->sb_cc += (m)->m_len; \
-	(sb)->sb_mbcnt += MSIZE; \
-	if ((m)->m_flags & M_EXT) \
-		(sb)->sb_mbcnt += (m)->m_ext.ext_size; \
-}
-
-/* adjust counters in sb reflecting freeing of m */
-#define	sbfree(sb, m) { \
-	(sb)->sb_cc -= (m)->m_len; \
-	(sb)->sb_mbcnt -= MSIZE; \
-	if ((m)->m_flags & M_EXT) \
-		(sb)->sb_mbcnt -= (m)->m_ext.ext_size; \
-}
-
-/*
- * Set lock on sockbuf sb; sleep if lock is already held.
- * Unless SB_NOINTR is set on sockbuf, sleep is interruptible.
- * Returns error without lock if sleep is interrupted.
- */
-#define sblock(sb, wf) ((sb)->sb_flags & SB_LOCK ? \
-		(((wf) == M_WAITOK) ? sb_lock(sb) : EWOULDBLOCK) : \
-		((sb)->sb_flags |= SB_LOCK), 0)
-
-/* release lock on sockbuf sb */
-#define	sbunlock(sb) { \
-	(sb)->sb_flags &= ~SB_LOCK; \
-	if ((sb)->sb_flags & SB_WANT) { \
-		(sb)->sb_flags &= ~SB_WANT; \
-		wakeup((caddr_t)&(sb)->sb_flags); \
-	} \
-}
-
-#define	sorwakeup(so)	{ sowakeup((so), &(so)->so_rcv); \
-			  if ((so)->so_upcall) \
-			    (*((so)->so_upcall))((so), (so)->so_upcallarg, M_DONTWAIT); \
-			}
-
-#define	sowwakeup(so)	sowakeup((so), &(so)->so_snd)
-
-#ifdef KERNEL
-extern u_long	sb_max;
-
-/* to catch callers missing new second argument to sonewconn: */
-#define	sonewconn(head, connstatus)	sonewconn1((head), (connstatus))
-
-struct filedesc;
-struct mbuf;
-struct sockaddr;
-struct stat;
-
-/*
- * File operations on sockets.
- */
-int	soo_ioctl __P((struct file *fp, int cmd, caddr_t data,
-	    struct proc *p));
-int	soo_select __P((struct file *fp, int which, struct proc *p));
-int	soo_stat __P((struct socket *so, struct stat *ub));
-
-/*
- * From uipc_socket and friends
- */
-int	getsock __P((struct filedesc *fdp, int fdes, struct file **fpp));
-int	sockargs __P((struct mbuf **mp, caddr_t buf, int buflen, int type));
-void	sbappend __P((struct sockbuf *sb, struct mbuf *m));
-int	sbappendaddr __P((struct sockbuf *sb, struct sockaddr *asa,
-	    struct mbuf *m0, struct mbuf *control));
-int	sbappendcontrol __P((struct sockbuf *sb, struct mbuf *m0,
-	    struct mbuf *control));
-void	sbappendrecord __P((struct sockbuf *sb, struct mbuf *m0));
-void	sbcheck __P((struct sockbuf *sb));
-void	sbcompress __P((struct sockbuf *sb, struct mbuf *m, struct mbuf *n));
-struct mbuf *
-	sbcreatecontrol __P((caddr_t p, int size, int type, int level));
-void	sbdrop __P((struct sockbuf *sb, int len));
-void	sbdroprecord __P((struct sockbuf *sb));
-void	sbflush __P((struct sockbuf *sb));
-void	sbinsertoob __P((struct sockbuf *sb, struct mbuf *m0));
-void	sbrelease __P((struct sockbuf *sb));
-int	sbreserve __P((struct sockbuf *sb, u_long cc));
-int	sbwait __P((struct sockbuf *sb));
-int	sb_lock __P((struct sockbuf *sb));
-int	soabort __P((struct socket *so));
-int	soaccept __P((struct socket *so, struct mbuf *nam));
-int	sobind __P((struct socket *so, struct mbuf *nam));
-void	socantrcvmore __P((struct socket *so));
-void	socantsendmore __P((struct socket *so));
-int	soclose __P((struct socket *so));
-int	soconnect __P((struct socket *so, struct mbuf *nam));
-int	soconnect2 __P((struct socket *so1, struct socket *so2));
-int	socreate __P((int dom, struct socket **aso, int type, int proto,
-	    struct proc *p));
-int	sodisconnect __P((struct socket *so));
-void	sofree __P((struct socket *so));
-int	sogetopt __P((struct socket *so, int level, int optname,
-	    struct mbuf **mp));
-void	sohasoutofband __P((struct socket *so));
-void	soisconnected __P((struct socket *so));
-void	soisconnecting __P((struct socket *so));
-void	soisdisconnected __P((struct socket *so));
-void	soisdisconnecting __P((struct socket *so));
-int	solisten __P((struct socket *so, int backlog));
-struct socket *
-	sodropablereq __P((struct socket *head));
-struct socket *
-	sonewconn1 __P((struct socket *head, int connstatus));
-int	soreceive __P((struct socket *so, struct mbuf **paddr, struct uio *uio,
-	    struct mbuf **mp0, struct mbuf **controlp, int *flagsp));
-int	soreserve __P((struct socket *so, u_long sndcc, u_long rcvcc));
-void	sorflush __P((struct socket *so));
-int	sosend __P((struct socket *so, struct mbuf *addr, struct uio *uio,
-	    struct mbuf *top, struct mbuf *control, int flags));
-int	sosetopt __P((struct socket *so, int level, int optname,
-	    struct mbuf *m0));
-int	soshutdown __P((struct socket *so, int how));
-void	sowakeup __P((struct socket *so, struct sockbuf *sb));
-#endif /* KERNEL */
-
-#endif /* !_SYS_SOCKETVAR_H_ */
diff --git a/c/src/exec/libnetworking/sys/sysctl.h b/c/src/exec/libnetworking/sys/sysctl.h
deleted file mode 100644
index b25ba43c4f..0000000000
--- a/c/src/exec/libnetworking/sys/sysctl.h
+++ /dev/null
@@ -1,379 +0,0 @@
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Mike Karels at Berkeley Software Design, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)sysctl.h	8.1 (Berkeley) 6/2/93
- * $Id$
- */
-
-#ifndef _SYS_SYSCTL_H_
-#define	_SYS_SYSCTL_H_
-
-/*
- * Definitions for sysctl call.  The sysctl call uses a hierarchical name
- * for objects that can be examined or modified.  The name is expressed as
- * a sequence of integers.  Like a file path name, the meaning of each
- * component depends on its place in the hierarchy.  The top-level and kern
- * identifiers are defined here, and other identifiers are defined in the
- * respective subsystem header files.
- */
-
-#define CTL_MAXNAME	12	/* largest number of components supported */
-
-/*
- * Each subsystem defined by sysctl defines a list of variables
- * for that subsystem. Each name is either a node with further
- * levels defined below it, or it is a leaf of some particular
- * type given below. Each sysctl level defines a set of name/type
- * pairs to be used by sysctl(1) in manipulating the subsystem.
- */
-struct ctlname {
-	char	*ctl_name;	/* subsystem name */
-	int	ctl_type;	/* type of name */
-};
-
-#define CTLTYPE		0xf	/* Mask for the type */
-#define	CTLTYPE_NODE	1	/* name is a node */
-#define	CTLTYPE_INT	2	/* name describes an integer */
-#define	CTLTYPE_STRING	3	/* name describes a string */
-#define	CTLTYPE_QUAD	4	/* name describes a 64-bit number */
-#define	CTLTYPE_OPAQUE	5	/* name describes a structure */
-#define	CTLTYPE_STRUCT	CTLTYPE_OPAQUE	/* name describes a structure */
-
-#define CTLFLAG_RD	0x80000000	/* Allow reads of variable */
-#define CTLFLAG_WR	0x40000000	/* Allow writes to the variable */
-#define CTLFLAG_RW	(CTLFLAG_RD|CTLFLAG_WR)
-#define CTLFLAG_NOLOCK	0x20000000	/* XXX Don't Lock */
-#define CTLFLAG_ANYBODY	0x10000000	/* All users can set this var */
-
-/*
- * USE THIS instead of a hardwired number from the categories below
- * to get dynamically assigned sysctl entries using the linker-set
- * technology. This is the way nearly all new sysctl variables should
- * be implimented.
- * e.g. SYSCTL_INT(_parent, OID_AUTO, name, CTLFLAG_RW, &variable, 0, "");
- */ 
-#define OID_AUTO	(-1)
-
-#ifdef KERNEL
-#define SYSCTL_HANDLER_ARGS (struct sysctl_oid *oidp, void *arg1, int arg2, \
-	struct sysctl_req *req)
-
-/*
- * This describes the access space for a sysctl request.  This is needed
- * so that we can use the interface from the kernel or from user-space.
- */
-struct sysctl_req {
-	struct proc	*p;
-	int		lock;
-	void		*oldptr;
-	int		oldlen;
-	int		oldidx;
-	int		(*oldfunc)(struct sysctl_req *, const void *, int);
-	void		*newptr;
-	int		newlen;
-	int		newidx;
-	int		(*newfunc)(struct sysctl_req *, void *, int);
-};
-
-/*
- * This describes one "oid" in the MIB tree.  Potentially more nodes can
- * be hidden behind it, expanded by the handler.
- */
-struct sysctl_oid {
-	int		oid_number;
-	int		oid_kind;
-	void		*oid_arg1;
-	int		oid_arg2;
-	const char	*oid_name;
-	int 		(*oid_handler) SYSCTL_HANDLER_ARGS;
-	const char	*oid_fmt;
-};
-
-#define SYSCTL_IN(r, p, l)
-#define SYSCTL_OUT(r, p, l)
-
-int sysctl_handle_int SYSCTL_HANDLER_ARGS;
-int sysctl_handle_string SYSCTL_HANDLER_ARGS;
-int sysctl_handle_opaque SYSCTL_HANDLER_ARGS;
-
-/* This is the "raw" function for a mib-oid */
-#define SYSCTL_OID(parent, nbr, name, kind, a1, a2, handler, fmt, descr)
-
-/* This makes a node from which other oids can hang */
-#define SYSCTL_NODE(parent, nbr, name, access, handler, descr)
-
-/* This is a string len can be 0 to indicate '\0' termination */
-#define SYSCTL_STRING(parent, nbr, name, access, arg, len, descr) 
-
-/* This is a integer, if ptr is NULL, val is returned */
-#define SYSCTL_INT(parent, nbr, name, access, ptr, val, descr) 
-
-/* This is anything, specified by a pointer and a lenth */
-#define SYSCTL_OPAQUE(parent, nbr, name, access, ptr, len, fmt, descr) 
-
-/* This is a struct, specified by a pointer and type */
-#define SYSCTL_STRUCT(parent, nbr, name, access, ptr, type, descr) 
-
-/* Needs a proc.  Specify by pointer and arg */
-#define SYSCTL_PROC(parent, nbr, name, access, ptr, arg, handler, fmt, descr) 
-#endif /* KERNEL */
-
-/*
- * Top-level identifiers
- */
-#define	CTL_UNSPEC	0		/* unused */
-#define	CTL_KERN	1		/* "high kernel": proc, limits */
-#define	CTL_VM		2		/* virtual memory */
-#define	CTL_VFS		3		/* file system, mount type is next */
-#define	CTL_NET		4		/* network, see socket.h */
-#define	CTL_DEBUG	5		/* debugging parameters */
-#define	CTL_HW		6		/* generic cpu/io */
-#define	CTL_MACHDEP	7		/* machine dependent */
-#define	CTL_USER	8		/* user-level */
-#define	CTL_MAXID	9		/* number of valid top-level ids */
-
-#define CTL_NAMES { \
-	{ 0, 0 }, \
-	{ "kern", CTLTYPE_NODE }, \
-	{ "vm", CTLTYPE_NODE }, \
-	{ "vfs", CTLTYPE_NODE }, \
-	{ "net", CTLTYPE_NODE }, \
-	{ "debug", CTLTYPE_NODE }, \
-	{ "hw", CTLTYPE_NODE }, \
-	{ "machdep", CTLTYPE_NODE }, \
-	{ "user", CTLTYPE_NODE }, \
-}
-
-/*
- * CTL_KERN identifiers
- */
-#define	KERN_OSTYPE	 	 1	/* string: system version */
-#define	KERN_OSRELEASE	 	 2	/* string: system release */
-#define	KERN_OSREV	 	 3	/* int: system revision */
-#define	KERN_VERSION	 	 4	/* string: compile time info */
-#define	KERN_MAXVNODES	 	 5	/* int: max vnodes */
-#define	KERN_MAXPROC	 	 6	/* int: max processes */
-#define	KERN_MAXFILES	 	 7	/* int: max open files */
-#define	KERN_ARGMAX	 	 8	/* int: max arguments to exec */
-#define	KERN_SECURELVL	 	 9	/* int: system security level */
-#define	KERN_HOSTNAME		10	/* string: hostname */
-#define	KERN_HOSTID		11	/* int: host identifier */
-#define	KERN_CLOCKRATE		12	/* struct: struct clockrate */
-#define	KERN_VNODE		13	/* struct: vnode structures */
-#define	KERN_PROC		14	/* struct: process entries */
-#define	KERN_FILE		15	/* struct: file entries */
-#define	KERN_PROF		16	/* node: kernel profiling info */
-#define	KERN_POSIX1		17	/* int: POSIX.1 version */
-#define	KERN_NGROUPS		18	/* int: # of supplemental group ids */
-#define	KERN_JOB_CONTROL	19	/* int: is job control available */
-#define	KERN_SAVED_IDS		20	/* int: saved set-user/group-ID */
-#define	KERN_BOOTTIME		21	/* struct: time kernel was booted */
-#define KERN_NISDOMAINNAME	22	/* string: YP domain name */
-#define KERN_UPDATEINTERVAL	23	/* int: update process sleep time */
-#define KERN_OSRELDATE		24	/* int: OS release date */
-#define KERN_NTP_PLL		25	/* node: NTP PLL control */
-#define	KERN_BOOTFILE		26	/* string: name of booted kernel */
-#define	KERN_MAXFILESPERPROC	27	/* int: max open files per proc */
-#define	KERN_MAXPROCPERUID 	28	/* int: max processes per uid */
-#define KERN_DUMPDEV		29	/* dev_t: device to dump on */
-#define	KERN_SOMAXCONN		30	/* int: max connections in listen q */
-#define	KERN_MAXSOCKBUF		31	/* int: max size of a socket buffer */
-#define	KERN_PS_STRINGS		32	/* int: address of PS_STRINGS */
-#define	KERN_USRSTACK		33	/* int: address of USRSTACK */
-#define KERN_MAXID		34      /* number of valid kern ids */
-
-#define CTL_KERN_NAMES { \
-	{ 0, 0 }, \
-	{ "ostype", CTLTYPE_STRING }, \
-	{ "osrelease", CTLTYPE_STRING }, \
-	{ "osrevision", CTLTYPE_INT }, \
-	{ "version", CTLTYPE_STRING }, \
-	{ "maxvnodes", CTLTYPE_INT }, \
-	{ "maxproc", CTLTYPE_INT }, \
-	{ "maxfiles", CTLTYPE_INT }, \
-	{ "argmax", CTLTYPE_INT }, \
-	{ "securelevel", CTLTYPE_INT }, \
-	{ "hostname", CTLTYPE_STRING }, \
-	{ "hostid", CTLTYPE_INT }, \
-	{ "clockrate", CTLTYPE_STRUCT }, \
-	{ "vnode", CTLTYPE_STRUCT }, \
-	{ "proc", CTLTYPE_STRUCT }, \
-	{ "file", CTLTYPE_STRUCT }, \
-	{ "profiling", CTLTYPE_NODE }, \
-	{ "posix1version", CTLTYPE_INT }, \
-	{ "ngroups", CTLTYPE_INT }, \
-	{ "job_control", CTLTYPE_INT }, \
-	{ "saved_ids", CTLTYPE_INT }, \
-	{ "boottime", CTLTYPE_STRUCT }, \
-	{ "nisdomainname", CTLTYPE_STRING }, \
-	{ "update", CTLTYPE_INT }, \
-	{ "osreldate", CTLTYPE_INT }, \
-        { "ntp_pll", CTLTYPE_NODE }, \
-	{ "bootfile", CTLTYPE_STRING }, \
-	{ "maxfilesperproc", CTLTYPE_INT }, \
-	{ "maxprocperuid", CTLTYPE_INT }, \
-	{ "dumpdev", CTLTYPE_STRUCT }, /* we lie; don't print as int */ \
-	{ "somaxconn", CTLTYPE_INT }, \
-	{ "maxsockbuf", CTLTYPE_INT }, \
-	{ "ps_strings", CTLTYPE_INT }, \
-	{ "usrstack", CTLTYPE_INT }, \
-}
-
-/*
- * CTL_VFS identifiers
- */
-#define VFS_VFSCONF		0	/* get configured filesystems */
-#define VFS_MAXID		1	/* number of items */
-
-#define CTL_VFS_NAMES { \
-	{ "vfsconf", CTLTYPE_STRUCT }, \
-}
-
-/*
- * KERN_PROC subtypes
- */
-#define KERN_PROC_ALL		0	/* everything */
-#define	KERN_PROC_PID		1	/* by process id */
-#define	KERN_PROC_PGRP		2	/* by process group id */
-#define	KERN_PROC_SESSION	3	/* by session of pid */
-#define	KERN_PROC_TTY		4	/* by controlling tty */
-#define	KERN_PROC_UID		5	/* by effective uid */
-#define	KERN_PROC_RUID		6	/* by real uid */
-
-/*
- * CTL_HW identifiers
- */
-#define	HW_MACHINE	 1		/* string: machine class */
-#define	HW_MODEL	 2		/* string: specific machine model */
-#define	HW_NCPU		 3		/* int: number of cpus */
-#define	HW_BYTEORDER	 4		/* int: machine byte order */
-#define	HW_PHYSMEM	 5		/* int: total memory */
-#define	HW_USERMEM	 6		/* int: non-kernel memory */
-#define	HW_PAGESIZE	 7		/* int: software page size */
-#define	HW_DISKNAMES	 8		/* strings: disk drive names */
-#define	HW_DISKSTATS	 9		/* struct: diskstats[] */
-#define HW_FLOATINGPT	10		/* int: has HW floating point? */
-#define HW_MACHINE_ARCH	11		/* string: machine architecture */
-#define	HW_MAXID	12		/* number of valid hw ids */
-
-#define CTL_HW_NAMES { \
-	{ 0, 0 }, \
-	{ "machine", CTLTYPE_STRING }, \
-	{ "model", CTLTYPE_STRING }, \
-	{ "ncpu", CTLTYPE_INT }, \
-	{ "byteorder", CTLTYPE_INT }, \
-	{ "physmem", CTLTYPE_INT }, \
-	{ "usermem", CTLTYPE_INT }, \
-	{ "pagesize", CTLTYPE_INT }, \
-	{ "disknames", CTLTYPE_STRUCT }, \
-	{ "diskstats", CTLTYPE_STRUCT }, \
-	{ "floatingpoint", CTLTYPE_INT }, \
-}
-
-/*
- * CTL_USER definitions
- */
-#define	USER_CS_PATH		 1	/* string: _CS_PATH */
-#define	USER_BC_BASE_MAX	 2	/* int: BC_BASE_MAX */
-#define	USER_BC_DIM_MAX		 3	/* int: BC_DIM_MAX */
-#define	USER_BC_SCALE_MAX	 4	/* int: BC_SCALE_MAX */
-#define	USER_BC_STRING_MAX	 5	/* int: BC_STRING_MAX */
-#define	USER_COLL_WEIGHTS_MAX	 6	/* int: COLL_WEIGHTS_MAX */
-#define	USER_EXPR_NEST_MAX	 7	/* int: EXPR_NEST_MAX */
-#define	USER_LINE_MAX		 8	/* int: LINE_MAX */
-#define	USER_RE_DUP_MAX		 9	/* int: RE_DUP_MAX */
-#define	USER_POSIX2_VERSION	10	/* int: POSIX2_VERSION */
-#define	USER_POSIX2_C_BIND	11	/* int: POSIX2_C_BIND */
-#define	USER_POSIX2_C_DEV	12	/* int: POSIX2_C_DEV */
-#define	USER_POSIX2_CHAR_TERM	13	/* int: POSIX2_CHAR_TERM */
-#define	USER_POSIX2_FORT_DEV	14	/* int: POSIX2_FORT_DEV */
-#define	USER_POSIX2_FORT_RUN	15	/* int: POSIX2_FORT_RUN */
-#define	USER_POSIX2_LOCALEDEF	16	/* int: POSIX2_LOCALEDEF */
-#define	USER_POSIX2_SW_DEV	17	/* int: POSIX2_SW_DEV */
-#define	USER_POSIX2_UPE		18	/* int: POSIX2_UPE */
-#define	USER_STREAM_MAX		19	/* int: POSIX2_STREAM_MAX */
-#define	USER_TZNAME_MAX		20	/* int: POSIX2_TZNAME_MAX */
-#define	USER_MAXID		21	/* number of valid user ids */
-
-#define	CTL_USER_NAMES { \
-	{ 0, 0 }, \
-	{ "cs_path", CTLTYPE_STRING }, \
-	{ "bc_base_max", CTLTYPE_INT }, \
-	{ "bc_dim_max", CTLTYPE_INT }, \
-	{ "bc_scale_max", CTLTYPE_INT }, \
-	{ "bc_string_max", CTLTYPE_INT }, \
-	{ "coll_weights_max", CTLTYPE_INT }, \
-	{ "expr_nest_max", CTLTYPE_INT }, \
-	{ "line_max", CTLTYPE_INT }, \
-	{ "re_dup_max", CTLTYPE_INT }, \
-	{ "posix2_version", CTLTYPE_INT }, \
-	{ "posix2_c_bind", CTLTYPE_INT }, \
-	{ "posix2_c_dev", CTLTYPE_INT }, \
-	{ "posix2_char_term", CTLTYPE_INT }, \
-	{ "posix2_fort_dev", CTLTYPE_INT }, \
-	{ "posix2_fort_run", CTLTYPE_INT }, \
-	{ "posix2_localedef", CTLTYPE_INT }, \
-	{ "posix2_sw_dev", CTLTYPE_INT }, \
-	{ "posix2_upe", CTLTYPE_INT }, \
-	{ "stream_max", CTLTYPE_INT }, \
-	{ "tzname_max", CTLTYPE_INT }, \
-}
-
-#ifdef KERNEL
-
-extern char	cpu_model[];
-extern char	machine[];
-extern char	osrelease[];
-extern char	ostype[];
-
-int kernel_sysctl(struct proc *p, int *name, u_int namelen, void *old, size_t *oldlenp, void *new, size_t newlen, int *retval);
-int userland_sysctl(struct proc *p, int *name, u_int namelen, void *old, size_t *oldlenp, int inkernel, void *new, size_t newlen, int *retval);
-/*
-int	sysctl_clockrate __P((char *, size_t*));
-int	sysctl_file __P((char *, size_t*));
-int	sysctl_doproc __P((int *, u_int, char *, size_t*));
-int	sysctl_doprof __P((int *, u_int, void *, size_t *, void *, size_t));
-*/
-
-#else	/* !KERNEL */
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-int	sysctl __P((int *, u_int, void *, size_t *, void *, size_t));
-int	sysctlbyname __P((const char *, void *, size_t *, void *, size_t));
-__END_DECLS
-#endif	/* KERNEL */
-
-#endif	/* !_SYS_SYSCTL_H_ */
diff --git a/c/src/exec/libnetworking/sys/syslimits.h b/c/src/exec/libnetworking/sys/syslimits.h
deleted file mode 100644
index 283a0241e3..0000000000
--- a/c/src/exec/libnetworking/sys/syslimits.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (c) 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)syslimits.h	8.1 (Berkeley) 6/2/93
- * $Id$
- */
-
-#ifndef _SYS_SYSLIMITS_H_
-#define _SYS_SYSLIMITS_H_
-
-#if !defined(__rtems__)
-#define	ARG_MAX			65536	/* max bytes for an exec function */
-#endif
-
-#if !defined(__rtems__)
-#ifndef CHILD_MAX
-#define	CHILD_MAX		   40	/* max simultaneous processes */
-#endif
-#endif
-
-#if !defined(__rtems__)
-#define	LINK_MAX		32767	/* max file link count */
-#endif
-
-#define	MAX_CANON		  255	/* max bytes in term canon input line */
-
-#define	MAX_INPUT		  255	/* max bytes in terminal input */
-
-#if !defined(__rtems__)
-#define	NAME_MAX		  255	/* max bytes in a file name */
-#endif
-
-#define	NGROUPS_MAX		   16	/* max supplemental group id's */
-
-#if !defined(__rtems__)
-#ifndef OPEN_MAX
-#define	OPEN_MAX		   64	/* max open files per process */
-#endif
-#endif
-
-#if !defined(__rtems__)
-#define	PATH_MAX		 1024	/* max bytes in pathname */
-#endif
-
-#define	PIPE_BUF		  512	/* max bytes for atomic pipe writes */
-
-#define	BC_BASE_MAX		   99	/* max ibase/obase values in bc(1) */
-#define	BC_DIM_MAX		 2048	/* max array elements in bc(1) */
-#define	BC_SCALE_MAX		   99	/* max scale value in bc(1) */
-#define	BC_STRING_MAX		 1000	/* max const string length in bc(1) */
-#define	COLL_WEIGHTS_MAX	    0	/* max weights for order keyword */
-#define	EXPR_NEST_MAX		   32	/* max expressions nested in expr(1) */
-#define	LINE_MAX		 2048	/* max bytes in an input line */
-#define	RE_DUP_MAX		  255	/* max RE's in interval notation */
-
-#endif
diff --git a/c/src/exec/libnetworking/sys/syslog.h b/c/src/exec/libnetworking/sys/syslog.h
deleted file mode 100644
index 724bee62c7..0000000000
--- a/c/src/exec/libnetworking/sys/syslog.h
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)syslog.h	8.1 (Berkeley) 6/2/93
- * $Id$
- */
-
-#ifndef _SYS_SYSLOG_H_
-#define _SYS_SYSLOG_H_
-
-#define	_PATH_LOG	"/var/run/log"
-#define	_PATH_OLDLOG	"/dev/log"	/* backward compatibility */
-
-/*
- * priorities/facilities are encoded into a single 32-bit quantity, where the
- * bottom 3 bits are the priority (0-7) and the top 28 bits are the facility
- * (0-big number).  Both the priorities and the facilities map roughly
- * one-to-one to strings in the syslogd(8) source code.  This mapping is
- * included in this file.
- *
- * priorities (these are ordered)
- */
-#define	LOG_EMERG	0	/* system is unusable */
-#define	LOG_ALERT	1	/* action must be taken immediately */
-#define	LOG_CRIT	2	/* critical conditions */
-#define	LOG_ERR		3	/* error conditions */
-#define	LOG_WARNING	4	/* warning conditions */
-#define	LOG_NOTICE	5	/* normal but significant condition */
-#define	LOG_INFO	6	/* informational */
-#define	LOG_DEBUG	7	/* debug-level messages */
-
-#define	LOG_PRIMASK	0x07	/* mask to extract priority part (internal) */
-				/* extract priority */
-#define	LOG_PRI(p)	((p) & LOG_PRIMASK)
-#define	LOG_MAKEPRI(fac, pri)	((fac) | (pri))
-
-#ifdef SYSLOG_NAMES
-#define	INTERNAL_NOPRI	0x10	/* the "no priority" priority */
-				/* mark "facility" */
-#define	INTERNAL_MARK	LOG_MAKEPRI((LOG_NFACILITIES<<3), 0)
-typedef struct _code {
-	char	*c_name;
-	int	c_val;
-} CODE;
-
-CODE prioritynames[] = {
-	{ "alert",	LOG_ALERT,	},
-	{ "crit",	LOG_CRIT,	},
-	{ "debug",	LOG_DEBUG,	},
-	{ "emerg",	LOG_EMERG,	},
-	{ "err",	LOG_ERR,	},
-	{ "error",	LOG_ERR,	},	/* DEPRECATED */
-	{ "info",	LOG_INFO,	},
-	{ "none",	INTERNAL_NOPRI,	},	/* INTERNAL */
-	{ "notice",	LOG_NOTICE,	},
-	{ "panic", 	LOG_EMERG,	},	/* DEPRECATED */
-	{ "warn",	LOG_WARNING,	},	/* DEPRECATED */
-	{ "warning",	LOG_WARNING,	},
-	{ NULL,		-1,		}
-};
-#endif
-
-/* facility codes */
-#define	LOG_KERN	(0<<3)	/* kernel messages */
-#define	LOG_USER	(1<<3)	/* random user-level messages */
-#define	LOG_MAIL	(2<<3)	/* mail system */
-#define	LOG_DAEMON	(3<<3)	/* system daemons */
-#define	LOG_AUTH	(4<<3)	/* security/authorization messages */
-#define	LOG_SYSLOG	(5<<3)	/* messages generated internally by syslogd */
-#define	LOG_LPR		(6<<3)	/* line printer subsystem */
-#define	LOG_NEWS	(7<<3)	/* network news subsystem */
-#define	LOG_UUCP	(8<<3)	/* UUCP subsystem */
-#define	LOG_CRON	(9<<3)	/* clock daemon */
-#define	LOG_AUTHPRIV	(10<<3)	/* security/authorization messages (private) */
-				/* Facility #10 clashes in DEC UNIX, where */
-				/* it's defined as LOG_MEGASAFE for AdvFS  */
-				/* event logging.                          */
-#define	LOG_FTP		(11<<3)	/* ftp daemon */
-#define	LOG_NTP		(12<<3)	/* NTP subsystem */
-
-	/* other codes through 15 reserved for system use */
-#define	LOG_LOCAL0	(16<<3)	/* reserved for local use */
-#define	LOG_LOCAL1	(17<<3)	/* reserved for local use */
-#define	LOG_LOCAL2	(18<<3)	/* reserved for local use */
-#define	LOG_LOCAL3	(19<<3)	/* reserved for local use */
-#define	LOG_LOCAL4	(20<<3)	/* reserved for local use */
-#define	LOG_LOCAL5	(21<<3)	/* reserved for local use */
-#define	LOG_LOCAL6	(22<<3)	/* reserved for local use */
-#define	LOG_LOCAL7	(23<<3)	/* reserved for local use */
-
-#define	LOG_NFACILITIES	24	/* current number of facilities */
-#define	LOG_FACMASK	0x03f8	/* mask to extract facility part */
-				/* facility of pri */
-#define	LOG_FAC(p)	(((p) & LOG_FACMASK) >> 3)
-
-#ifdef SYSLOG_NAMES
-CODE facilitynames[] = {
-	{ "auth",	LOG_AUTH,	},
-	{ "authpriv",	LOG_AUTHPRIV,	},
-	{ "cron", 	LOG_CRON,	},
-	{ "daemon",	LOG_DAEMON,	},
-	{ "ftp",	LOG_FTP,	},
-	{ "kern",	LOG_KERN,	},
-	{ "lpr",	LOG_LPR,	},
-	{ "mail",	LOG_MAIL,	},
-	{ "mark", 	INTERNAL_MARK,	},	/* INTERNAL */
-	{ "news",	LOG_NEWS,	},
-	{ "ntp",	LOG_NTP,	},
-	{ "security",	LOG_AUTH,	},	/* DEPRECATED */
-	{ "syslog",	LOG_SYSLOG,	},
-	{ "user",	LOG_USER,	},
-	{ "uucp",	LOG_UUCP,	},
-	{ "local0",	LOG_LOCAL0,	},
-	{ "local1",	LOG_LOCAL1,	},
-	{ "local2",	LOG_LOCAL2,	},
-	{ "local3",	LOG_LOCAL3,	},
-	{ "local4",	LOG_LOCAL4,	},
-	{ "local5",	LOG_LOCAL5,	},
-	{ "local6",	LOG_LOCAL6,	},
-	{ "local7",	LOG_LOCAL7,	},
-	{ NULL,		-1,		}
-};
-#endif
-
-#ifdef KERNEL
-#define	LOG_PRINTF	-1	/* pseudo-priority to indicate use of printf */
-#endif
-
-/*
- * arguments to setlogmask.
- */
-#define	LOG_MASK(pri)	(1 << (pri))		/* mask for one priority */
-#define	LOG_UPTO(pri)	((1 << ((pri)+1)) - 1)	/* all priorities through pri */
-
-/*
- * Option flags for openlog.
- *
- * LOG_ODELAY no longer does anything.
- * LOG_NDELAY is the inverse of what it used to be.
- */
-#define	LOG_PID		0x01	/* log the pid with each message */
-#define	LOG_CONS	0x02	/* log on the console if errors in sending */
-#define	LOG_ODELAY	0x04	/* delay open until first syslog() (default) */
-#define	LOG_NDELAY	0x08	/* don't delay open */
-#define	LOG_NOWAIT	0x10	/* don't wait for console forks: DEPRECATED */
-#define	LOG_PERROR	0x20	/* log to stderr as well */
-
-#ifdef KERNEL
-
-#else /* not KERNEL */
-
-#include <sys/cdefs.h>
-#include <stdarg.h>
-
-__BEGIN_DECLS
-void	closelog __P((void));
-void	openlog __P((const char *, int, int));
-int	setlogmask __P((int));
-void	syslog __P((int, const char *, ...));
-void	vsyslog __P((int, const char *, va_list));
-__END_DECLS
-
-#endif /* !KERNEL */
-
-#endif
diff --git a/c/src/exec/libnetworking/sys/systm.h b/c/src/exec/libnetworking/sys/systm.h
deleted file mode 100644
index 7e14867e70..0000000000
--- a/c/src/exec/libnetworking/sys/systm.h
+++ /dev/null
@@ -1,198 +0,0 @@
-/*-
- * Copyright (c) 1982, 1988, 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)systm.h	8.7 (Berkeley) 3/29/95
- * $Id$
- */
-
-#ifndef _SYS_SYSTM_H_
-#define	_SYS_SYSTM_H_
-
-#include <machine/cpufunc.h>
-
-extern int securelevel;		/* system security level (see init(8)) */
-
-extern int cold;		/* nonzero if we are doing a cold boot */
-extern const char *panicstr;	/* panic message */
-extern char version[];		/* system version */
-extern char copyright[];	/* system copyright */
-
-extern int nblkdev;		/* number of entries in bdevsw */
-extern int nchrdev;		/* number of entries in cdevsw */
-extern struct swdevt *swdevt;	/* swap-device information */
-extern int nswdev;		/* number of swap devices */
-extern int nswap;		/* size of swap space */
-
-extern int selwait;		/* select timeout address */
-
-extern u_char curpriority;	/* priority of current process */
-
-extern int physmem;		/* physical memory */
-
-extern dev_t dumpdev;		/* dump device */
-extern long dumplo;		/* offset into dumpdev */
-
-extern dev_t rootdev;		/* root device */
-extern struct vnode *rootvp;	/* vnode equivalent to above */
-
-extern dev_t swapdev;		/* swapping device */
-extern struct vnode *swapdev_vp;/* vnode equivalent to above */
-
-extern int boothowto;		/* reboot flags, from console subsystem */
-extern int bootverbose;		/* nonzero to print verbose messages */
-
-/*
- * General function declarations.
- */
-void	Debugger __P((const char *msg));
-int	nullop __P((void));
-int	eopnotsupp __P((void));
-int	einval __P((void));
-int	seltrue __P((dev_t dev, int which, struct proc *p));
-int	ureadc __P((int, struct uio *));
-void	*hashinit __P((int count, int type, u_long *hashmask));
-void	*phashinit __P((int count, int type, u_long *nentries));
-
-void	panic __P((const char *, ...)) __dead2;
-void	boot __P((int)) __dead2;
-void	cpu_boot __P((int));
-void	tablefull __P((const char *));
-int	addlog __P((const char *, ...));
-int	kvprintf __P((char const *, void (*)(int, void*), void *, int,
-		      _BSD_VA_LIST_));
-void	log __P((int, const char *, ...));
-int	printf __P((const char *, ...));
-int	sprintf __P((char *buf, const char *, ...));
-void	uprintf __P((const char *, ...));
-void	ttyprintf __P((struct tty *, const char *, ...));
-
-#define bcopy(f,t,n) memcpy((t),(f),(n))
-#define bzero(p,n) memset((p),(0),(n))
-
-int	copystr __P((const void *kfaddr, void *kdaddr, size_t len,
-		size_t *lencopied));
-int	copyinstr __P((const void *udaddr, void *kaddr, size_t len,
-		size_t *lencopied));
-int	copyin __P((const void *udaddr, void *kaddr, size_t len));
-int	copyout __P((const void *kaddr, void *udaddr, size_t len));
-
-int	fubyte __P((const void *base));
-int	fuibyte __P((const void *base));
-int	subyte __P((void *base, int byte));
-int	suibyte __P((void *base, int byte));
-int	fuword __P((const void *base));
-int	suword __P((void *base, int word));
-int	susword __P((void *base, int word));
-
-int	hzto __P((struct timeval *tv));
-void	realitexpire __P((void *));
-
-struct clockframe;
-void	hardclock __P((struct clockframe *frame));
-void	softclock __P((void));
-void	statclock __P((struct clockframe *frame));
-
-void	startprofclock __P((struct proc *));
-void	stopprofclock __P((struct proc *));
-void	setstatclockrate __P((int hzrate));
-
-void	hardupdate __P((long));
-void	hardpps __P((struct timeval *tvp, long usec));
-
-#include <sys/libkern.h>
-
-/* Initialize the world */
-extern void consinit(void);
-extern void usrinfoinit(void);
-extern void cpu_initclocks(void);
-extern void vntblinit(void);
-extern void nchinit(void);
-
-/* Finalize the world. */
-void	shutdown_nice __P((void));
-
-/*
- * Kernel to clock driver interface.
- */
-void	inittodr __P((time_t base));
-void	resettodr __P((void));
-void	startrtclock __P((void));
-
-/* Timeouts */
-typedef void (timeout_t)(void *); /* actual timeout function type */
-typedef timeout_t *timeout_func_t; /* a pointer to this type */
-
-void timeout(timeout_func_t, void *, int);
-void untimeout(timeout_func_t, void *);
-void	logwakeup __P((void));
-
-/* Various other callout lists that modules might want to know about */
-/* shutdown callout list definitions */
-typedef void (*bootlist_fn)(int,void *);
-int at_shutdown(bootlist_fn function, void *arg, int);
-int rm_at_shutdown(bootlist_fn function, void *arg);
-#define SHUTDOWN_PRE_SYNC 0
-#define SHUTDOWN_POST_SYNC 1
-
-/* forking */ /* XXX not yet */
-typedef void (*forklist_fn)(struct proc *parent,struct proc *child,int flags);
-int at_fork(forklist_fn function);
-int rm_at_fork(forklist_fn function);
-
-/* exiting */
-typedef void (*exitlist_fn)(struct proc *procp);
-int at_exit(exitlist_fn function);
-int rm_at_exit(exitlist_fn function);
-
-/* Not exactly a callout LIST, but a callout entry.. 			*/
-/* Allow an external module to define a hardware watchdog tickler	*/
-/* Normally a process would do this, but there are times when the	*/
-/* kernel needs to be able to hold off the watchdog, when the process	*/
-/* is not active, e.g. when dumping core. Costs us a whole 4 bytes to	*/
-/* make this generic. the variable is in kern_shutdown.c */
-typedef void (*watchdog_tickle_fn)(void);
-extern watchdog_tickle_fn wdog_tickler;
-
-
-/* 
- * Common `proc' functions are declared here so that proc.h can be included
- * less often.
- */
-int	tsleep __P((void *chan, int pri, char *wmesg, int timo));
-void	wakeup __P((void *chan));
-
-#endif /* !_SYS_SYSTM_H_ */
diff --git a/c/src/exec/libnetworking/sys/ttydefaults.h b/c/src/exec/libnetworking/sys/ttydefaults.h
deleted file mode 100644
index 68f0ddbe77..0000000000
--- a/c/src/exec/libnetworking/sys/ttydefaults.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)ttydefaults.h	8.4 (Berkeley) 1/21/94
- * $Id$
- */
-
-/*
- * System wide defaults for terminal state.
- */
-#ifndef _SYS_TTYDEFAULTS_H_
-#define	_SYS_TTYDEFAULTS_H_
-
-/*
- * Defaults on "first" open.
- */
-#define	TTYDEF_IFLAG	(BRKINT	| ICRNL	| IMAXBEL | IXON | IXANY)
-#define TTYDEF_OFLAG	(OPOST | ONLCR)
-#define TTYDEF_LFLAG	(ECHO | ICANON | ISIG | IEXTEN | ECHOE|ECHOKE|ECHOCTL)
-#define	TTYDEF_CFLAG	(CREAD | CS8 | HUPCL)
-#define TTYDEF_SPEED	(B9600)
-
-/*
- * Control Character Defaults
- */
-#define CTRL(x)	(x&037)
-#define	CEOF		CTRL('d')
-#define	CEOL		0xff		/* XXX avoid _POSIX_VDISABLE */
-#define	CERASE		0177
-#define	CINTR		CTRL('c')
-#define	CSTATUS		CTRL('t')
-#define	CKILL		CTRL('u')
-#define	CMIN		1
-#define	CQUIT		034		/* FS, ^\ */
-#define	CSUSP		CTRL('z')
-#define	CTIME		0
-#define	CDSUSP		CTRL('y')
-#define	CSTART		CTRL('q')
-#define	CSTOP		CTRL('s')
-#define	CLNEXT		CTRL('v')
-#define	CDISCARD 	CTRL('o')
-#define	CWERASE 	CTRL('w')
-#define	CREPRINT 	CTRL('r')
-#define	CEOT		CEOF
-/* compat */
-#define	CBRK		CEOL
-#define CRPRNT		CREPRINT
-#define	CFLUSH		CDISCARD
-
-/* PROTECTED INCLUSION ENDS HERE */
-#endif /* !_SYS_TTYDEFAULTS_H_ */
-
-/*
- * #define TTYDEFCHARS to include an array of default control characters.
- */
-#ifdef TTYDEFCHARS
-static cc_t	ttydefchars[NCCS] = {
-	CEOF,	CEOL,	CEOL,	CERASE, CWERASE, CKILL, CREPRINT,
-	_POSIX_VDISABLE, CINTR,	CQUIT,	CSUSP,	CDSUSP,	CSTART,	CSTOP,	CLNEXT,
-	CDISCARD, CMIN,	CTIME,  CSTATUS, _POSIX_VDISABLE
-};
-#undef TTYDEFCHARS
-#endif
diff --git a/c/src/exec/libnetworking/sys/ucred.h b/c/src/exec/libnetworking/sys/ucred.h
deleted file mode 100644
index d3899c3b4c..0000000000
--- a/c/src/exec/libnetworking/sys/ucred.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)ucred.h	8.4 (Berkeley) 1/9/95
- * $Id$
- */
-
-#ifndef _SYS_UCRED_H_
-#define	_SYS_UCRED_H_
-
-/*
- * Credentials.
- */
-struct ucred {
-	u_short	cr_ref;			/* reference count */
-	uid_t	cr_uid;			/* effective user id */
-	short	cr_ngroups;		/* number of groups */
-	gid_t	cr_groups[NGROUPS];	/* groups */
-};
-#define cr_gid cr_groups[0]
-#define NOCRED ((struct ucred *)0)	/* no credential available */
-#define FSCRED ((struct ucred *)-1)	/* filesystem credential */
-
-#ifdef KERNEL
-#define	crhold(cr)	(cr)->cr_ref++
-
-struct ucred	*crcopy __P((struct ucred *cr));
-struct ucred	*crdup __P((struct ucred *cr));
-void		crfree __P((struct ucred *cr));
-struct ucred	*crget __P((void));
-int		suser __P((struct ucred *cred, u_short *acflag));
-int		groupmember __P((gid_t gid, struct ucred *cred));
-#endif /* KERNEL */
-
-#endif /* !_SYS_UCRED_H_ */
diff --git a/c/src/exec/libnetworking/sys/uio.h b/c/src/exec/libnetworking/sys/uio.h
deleted file mode 100644
index 305941500d..0000000000
--- a/c/src/exec/libnetworking/sys/uio.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)uio.h	8.5 (Berkeley) 2/22/94
- * $Id$
- */
-
-#ifndef _SYS_UIO_H_
-#define	_SYS_UIO_H_
-
-/*
- * XXX
- * iov_base should be a void *.
- */
-struct iovec {
-	char	*iov_base;	/* Base address. */
-	size_t	 iov_len;	/* Length. */
-};
-
-enum	uio_rw { UIO_READ, UIO_WRITE };
-
-/* Segment flag values. */
-enum uio_seg {
-	UIO_USERSPACE,		/* from user data space */
-	UIO_SYSSPACE,		/* from system space */
-	UIO_USERISPACE,		/* from user I space */
-	UIO_NOCOPY		/* don't copy, already in object */
-};
-
-#ifdef KERNEL
-struct uio {
-	struct	iovec *uio_iov;
-	int	uio_iovcnt;
-	off_t	uio_offset;
-	int	uio_resid;
-	enum	uio_seg uio_segflg;
-	enum	uio_rw uio_rw;
-	struct	proc *uio_procp;
-};
-
-/*
- * Limits
- */
-#define UIO_MAXIOV	1024		/* max 1K of iov's */
-#define UIO_SMALLIOV	8		/* 8 on stack, else malloc */
-#endif /* KERNEL */
-
-#ifdef KERNEL
-
-int	uiomove __P((caddr_t, int, struct uio *));
-
-#else /* !KERNEL */
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-ssize_t	readv __P((int, const struct iovec *, int));
-ssize_t	writev __P((int, const struct iovec *, int));
-__END_DECLS
-
-#endif /* KERNEL */
-
-#endif /* !_SYS_UIO_H_ */
diff --git a/c/src/exec/libnetworking/syslog.h b/c/src/exec/libnetworking/syslog.h
deleted file mode 100644
index 6d223d00b7..0000000000
--- a/c/src/exec/libnetworking/syslog.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
- *  $Id$
- */
-
-#include <sys/syslog.h>
diff --git a/c/src/exec/libnetworking/vm/vm.h b/c/src/exec/libnetworking/vm/vm.h
deleted file mode 100644
index 19ea10e5eb..0000000000
--- a/c/src/exec/libnetworking/vm/vm.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)vm.h	8.2 (Berkeley) 12/13/93
- * $Id$
- */
-
-#ifndef VM_H
-#define VM_H
-
-typedef char vm_inherit_t;	/* XXX: inheritance codes */
-typedef u_char vm_prot_t;	/* protection codes */
-
-union vm_map_object;
-typedef union vm_map_object vm_map_object_t;
-
-struct vm_map_entry;
-typedef struct vm_map_entry *vm_map_entry_t;
-
-struct vm_map;
-typedef struct vm_map *vm_map_t;
-
-struct vm_object;
-typedef struct vm_object *vm_object_t;
-
-#ifndef KERNEL
-/*
- * This is defined in <sys/types.h> for the kernel so that non-vm kernel
- * sources (mainly Mach-derived ones such as ddb) don't have to include
- * vm stuff.  Defining it there for applications might break things.
- * Define it here for "applications" that include vm headers (e.g.,
- * genassym).
- */
-typedef int boolean_t;
-
-/*
- * This is defined in <sys/types.h> for the kernel so that vnode_if.h
- * doesn't have to include <vm/vm.h>.
- */
-struct vm_page;
-typedef struct vm_page *vm_page_t;
-#endif
-
-#endif				/* VM_H */
diff --git a/c/src/exec/libnetworking/vm/vm_extern.h b/c/src/exec/libnetworking/vm/vm_extern.h
deleted file mode 100644
index 720d42dc28..0000000000
--- a/c/src/exec/libnetworking/vm/vm_extern.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)vm_extern.h	8.2 (Berkeley) 1/12/94
- * $Id$
- */
-
-#ifndef _VM_EXTERN_H_
-#define	_VM_EXTERN_H_
-
-struct buf;
-struct proc;
-struct vmspace;
-struct vmtotal;
-struct mount;
-struct vnode;
-
-#ifdef KERNEL
-
-#ifdef TYPEDEF_FOR_UAP
-int getpagesize __P((struct proc * p, void *, int *));
-int madvise __P((struct proc *, void *, int *));
-int mincore __P((struct proc *, void *, int *));
-int mprotect __P((struct proc *, void *, int *));
-int msync __P((struct proc *, void *, int *));
-int munmap __P((struct proc *, void *, int *));
-int obreak __P((struct proc *, void *, int *));
-int sbrk __P((struct proc *, void *, int *));
-int smmap __P((struct proc *, void *, int *));
-int sstk __P((struct proc *, void *, int *));
-int swapon __P((struct proc *, void *, int *));
-#endif
-
-void faultin __P((struct proc *p));
-int grow __P((struct proc *, u_int));
-int kernacc __P((caddr_t, int, int));
-vm_offset_t kmem_alloc __P((vm_map_t, vm_size_t));
-vm_offset_t kmem_alloc_pageable __P((vm_map_t, vm_size_t));
-vm_offset_t kmem_alloc_wait __P((vm_map_t, vm_size_t));
-void kmem_free __P((vm_map_t, vm_offset_t, vm_size_t));
-void kmem_free_wakeup __P((vm_map_t, vm_offset_t, vm_size_t));
-void kmem_init __P((vm_offset_t, vm_offset_t));
-vm_offset_t kmem_malloc __P((vm_map_t, vm_size_t, boolean_t));
-vm_map_t kmem_suballoc __P((vm_map_t, vm_offset_t *, vm_offset_t *, vm_size_t, boolean_t));
-void munmapfd __P((struct proc *, int));
-int pager_cache __P((vm_object_t, boolean_t));
-int swaponvp __P((struct proc *, struct vnode *, dev_t , u_long));
-void swapout_procs __P((void));
-int useracc __P((caddr_t, int, int));
-int vm_fault __P((vm_map_t, vm_offset_t, vm_prot_t, boolean_t));
-void vm_fault_copy_entry __P((vm_map_t, vm_map_t, vm_map_entry_t, vm_map_entry_t));
-void vm_fault_unwire __P((vm_map_t, vm_offset_t, vm_offset_t));
-int vm_fault_wire __P((vm_map_t, vm_offset_t, vm_offset_t));
-int vm_fault_user_wire __P((vm_map_t, vm_offset_t, vm_offset_t));
-int vm_fork __P((struct proc *, struct proc *));
-int vm_mmap __P((vm_map_t, vm_offset_t *, vm_size_t, vm_prot_t, vm_prot_t, int, caddr_t, vm_ooffset_t));
-vm_offset_t vm_page_alloc_contig __P((vm_offset_t, vm_offset_t, vm_offset_t, vm_offset_t));
-void vm_set_page_size __P((void));
-void vmmeter __P((void));
-struct vmspace *vmspace_alloc __P((vm_offset_t, vm_offset_t, int));
-struct vmspace *vmspace_fork __P((struct vmspace *));
-void vmspace_free __P((struct vmspace *));
-void vnode_pager_setsize __P((struct vnode *, vm_ooffset_t));
-void vnode_pager_umount __P((struct mount *));
-void vnode_pager_uncache __P((struct vnode *));
-void vslock __P((caddr_t, u_int));
-void vsunlock __P((caddr_t, u_int, int));
-void vm_object_print __P((/* db_expr_t */ int, boolean_t, /* db_expr_t */ int,
-			  char *));
-void vm_fault_quick __P((caddr_t v, int prot));
-
-#endif				/* KERNEL */
-
-#endif				/* !_VM_EXTERN_H_ */
diff --git a/c/src/exec/libnetworking/vm/vm_kern.h b/c/src/exec/libnetworking/vm/vm_kern.h
deleted file mode 100644
index b1e073dd3a..0000000000
--- a/c/src/exec/libnetworking/vm/vm_kern.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * The Mach Operating System project at Carnegie-Mellon University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	from: @(#)vm_kern.h	8.1 (Berkeley) 6/11/93
- *
- *
- * Copyright (c) 1987, 1990 Carnegie-Mellon University.
- * All rights reserved.
- *
- * Authors: Avadis Tevanian, Jr., Michael Wayne Young
- *
- * Permission to use, copy, modify and distribute this software and
- * its documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- *
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- *
- * Carnegie Mellon requests users of this software to return to
- *
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- *
- * any improvements or extensions that they make and grant Carnegie the
- * rights to redistribute these changes.
- *
- * $Id$
- */
-
-#ifndef _VM_VM_KERN_H_
-#define _VM_VM_KERN_H_ 1
-
-/* Kernel memory management definitions. */
-extern vm_map_t buffer_map;
-extern vm_map_t kernel_map;
-extern vm_map_t kmem_map;
-extern vm_map_t mb_map;
-extern int mb_map_full;
-extern vm_map_t io_map;
-extern vm_map_t clean_map;
-extern vm_map_t phys_map;
-extern vm_map_t exec_map;
-extern vm_map_t u_map;
-
-extern vm_offset_t kernel_vm_end;
-
-#endif				/* _VM_VM_KERN_H_ */
diff --git a/c/src/exec/libnetworking/vm/vm_param.h b/c/src/exec/libnetworking/vm/vm_param.h
deleted file mode 100644
index f1cfca98ec..0000000000
--- a/c/src/exec/libnetworking/vm/vm_param.h
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * The Mach Operating System project at Carnegie-Mellon University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	from: @(#)vm_param.h	8.1 (Berkeley) 6/11/93
- *
- *
- * Copyright (c) 1987, 1990 Carnegie-Mellon University.
- * All rights reserved.
- *
- * Authors: Avadis Tevanian, Jr., Michael Wayne Young
- *
- * Permission to use, copy, modify and distribute this software and
- * its documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- *
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- *
- * Carnegie Mellon requests users of this software to return to
- *
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- *
- * any improvements or extensions that they make and grant Carnegie the
- * rights to redistribute these changes.
- *
- * $Id$
- */
-
-/*
- *	Machine independent virtual memory parameters.
- */
-
-#ifndef	_VM_PARAM_
-#define	_VM_PARAM_
-
-#include <machine/vmparam.h>
-
-/*
- *	The machine independent pages are refered to as PAGES.  A page
- *	is some number of hardware pages, depending on the target machine.
- */
-#define DEFAULT_PAGE_SIZE	4096
-
-#if 0
-
-/*
- *	All references to the size of a page should be done with PAGE_SIZE
- *	or PAGE_SHIFT.  The fact they are variables is hidden here so that
- *	we can easily make them constant if we so desire.
- */
-#ifndef PAGE_SIZE
-#define	PAGE_SIZE	cnt.v_page_size	/* size of page */
-#endif
-#ifndef PAGE_MASK
-#define PAGE_MASK	page_mask	/* size of page - 1 */
-#endif
-#ifndef PAGE_SHIFT
-#define PAGE_SHIFT	page_shift	/* bits to shift for pages */
-#endif
-
-#endif
-
-#ifdef KERNEL
-extern vm_size_t page_mask;
-extern int page_shift;
-
-#endif
-
-/*
- * CTL_VM identifiers
- */
-#define	VM_METER		1	/* struct vmmeter */
-#define	VM_LOADAVG	 	2	/* struct loadavg */
-#define VM_V_FREE_MIN		3	/* cnt.v_free_min */
-#define VM_V_FREE_TARGET	4	/* cnt.v_free_target */
-#define VM_V_FREE_RESERVED	5	/* cnt.v_free_reserved */
-#define VM_V_INACTIVE_TARGET	6	/* cnt.v_inactive_target */
-#define VM_V_CACHE_MIN		7	/* cnt.v_cache_max */
-#define VM_V_CACHE_MAX		8	/* cnt.v_cache_min */
-#define VM_V_PAGEOUT_FREE_MIN	9	/* cnt.v_pageout_free_min */
-#define	VM_PAGEOUT_ALGORITHM	10	/* pageout algorithm */
-#define VM_SWAPPING_ENABLED	11	/* swapping enabled */
-#define	VM_MAXID		12	/* number of valid vm ids */
-
-#define CTL_VM_NAMES { \
-	{ 0, 0 }, \
-	{ "vmmeter", CTLTYPE_STRUCT }, \
-	{ "loadavg", CTLTYPE_STRUCT }, \
-	{ "v_free_min", CTLTYPE_INT }, \
-	{ "v_free_target", CTLTYPE_INT }, \
-	{ "v_free_reserved", CTLTYPE_INT }, \
-	{ "v_inactive_target", CTLTYPE_INT }, \
-	{ "v_cache_min", CTLTYPE_INT }, \
-	{ "v_cache_max", CTLTYPE_INT }, \
-	{ "v_pageout_free_min", CTLTYPE_INT}, \
-	{ "pageout_algorithm", CTLTYPE_INT}, \
-	{ "swapping_enabled", CTLTYPE_INT},\
-}
-
-/*
- *	Return values from the VM routines.
- */
-#define	KERN_SUCCESS		0
-#define	KERN_INVALID_ADDRESS	1
-#define	KERN_PROTECTION_FAILURE	2
-#define	KERN_NO_SPACE		3
-#define	KERN_INVALID_ARGUMENT	4
-#define	KERN_FAILURE		5
-#define	KERN_RESOURCE_SHORTAGE	6
-#define	KERN_NOT_RECEIVER	7
-#define	KERN_NO_ACCESS		8
-
-#ifndef ASSEMBLER
-/*
- *	Convert addresses to pages and vice versa.
- *	No rounding is used.
- */
-#ifdef KERNEL
-#define num_pages(x) \
-	((vm_offset_t)((((vm_offset_t)(x)) + PAGE_MASK) >> PAGE_SHIFT))
-
-extern vm_size_t mem_size;	/* size of physical memory (bytes) */
-extern vm_offset_t first_addr;	/* first physical page */
-extern vm_offset_t last_addr;	/* last physical page */
-#endif				/* KERNEL */
-#endif				/* ASSEMBLER */
-#endif				/* _VM_PARAM_ */
diff --git a/c/src/exec/posix/include/aio.h b/c/src/exec/posix/include/aio.h
deleted file mode 100644
index 6348da4c15..0000000000
--- a/c/src/exec/posix/include/aio.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/* aio.h
- *
- *  $Id$
- */
-
-#ifndef __POSIX_ASYNCHRONOUS_IO_h
-#define __POSIX_ASYNCHRONOUS_IO_h
-
-#include <rtems/posix/features.h>
-
-#if defined(_POSIX_ASYNCHRONOUS_IO)
-
-/*
- *  6.7.1 Data Definitions for Asynchronous Input and Output, 
- *        P1003.1b-1993, p. 151
- */
-
-#include <sys/types.h>
-#include <signal.h>
-#include <time.h>
-#include <fcntl.h>
-
-/*
- *  6.7.1.2 Manifest Constants, P1003.1b-1993, p. 153
- */
-
-#define AIO_CANCELED    0 /* all requested operations have been canceled */
-#define AIO_NOTCANCELED 1 /* some of the operations could not be canceled */
-                          /*   since they are in progress */
-#define AIO_ALLDONE     2 /* none of the requested operations could be */
-                          /*   canceled since they are already complete */
-
-/* lio_listio() options */
-
-#define LIO_WAIT        0 /* calling process is to suspend until the */
-                          /*   operation is complete */
-#define LIO_NOWAIT      1 /* calling process is to continue execution while */
-                          /*   the operation is performed and no notification */
-                          /*   shall be given when the operation is completed */
-#define LIO_READ        2 /* request a read() */
-#define LIO_WRITE       3 /* request a write() */
-#define LIO_NOP         4 /* no transfer is requested */
-
-/*
- *  6.7.1.1 Asynchronous I/O Control Block, P1003.1b-1993, p. 151
- */
-
-struct aiocb {
-  int             aio_fildes;     /* File descriptor */
-  off_t           aio_offset;     /* File offset */
-  volatile void  *aio_buf;        /* Location of buffer */
-  size_t          aio_nbytes;     /* Length of transfer */
-  int             aio_reqprio;    /* Request priority offset */
-  struct sigevent aio_sigevent;   /* Signal number and value */
-  int             aoi_lio_opcode; /* Operation to be performed */
-};
-
-/*
- *  6.7.2 Asynchronous Read, P1003.1b-1993, p. 154
- */
-
-int aio_read(
-  struct aiocb  *aiocbp
-);
-
-/*
- *  6.7.3 Asynchronous Write, P1003.1b-1993, p. 155
- */
-
-int aio_write(
-  struct aiocb  *aiocbp
-);
-
-/*
- *  6.7.4 List Directed I/O, P1003.1b-1993, p. 158
- */
-
-int lio_listio(
-  int                    mode,
-  struct aiocb  * const  list[],
-  int                    nent,
-  struct sigevent       *sig
-);
-
-/*
- *  6.7.5 Retrieve Error of Asynchronous I/O Operation, P1003.1b-1993, p. 161
- */
-
-int aio_error(
-  const struct aiocb  *aiocbp
-);
-
-/*
- *  6.7.6 Retrieve Return Status of Asynchronous I/O Operation, 
- *        P1003.1b-1993, p. 162
- */
-
-int aio_return(
-  const struct aiocb  *aiocbp
-);
-
-/*
- *  6.7.7 Cancel Asynchronous I/O Operation, P1003.1b-1993, p. 163
- */
-
-int aio_cancel(
-  int            filedes,
-  struct aiocb  *aiocbp
-);
-
-/*
- *  6.7.7 Wait for Asynchronous I/O Request, P1003.1b-1993, p. 164
- */
-
-int aio_suspend(
-  struct aiocb  * const   list[],
-  int                     nent,
-  const struct timespec  *timeout
-);
-
-#if defined(_POSIX_SYNCHRONIZED_IO)
-
-/*
- *  6.7.9 Asynchronous File Synchronization, P1003.1b-1993, p. 166
- */
-
-int aio_fsync(
-  int            op,
-  struct aiocb  *aiocbp
-);
-
-#endif /* _POSIX_SYNCHRONIZED_IO */
-
-#endif /* _POSIX_ASYNCHRONOUS_IO */
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/posix/include/devctl.h b/c/src/exec/posix/include/devctl.h
deleted file mode 100644
index 5073b475ee..0000000000
--- a/c/src/exec/posix/include/devctl.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* devctl.h
- *
- *  $Id$
- */
-
-#ifndef __POSIX_DEVICE_CONTROL_h
-#define __POSIX_DEVICE_CONTROL_h
-
-#include <rtems/posix/features.h>
-
-#if defined(_POSIX_DEVICE_CONTROL)
-
-#include <sys/types.h>
-#include <unistd.h>
-
-/*
- *  21.2.1 Control a Device, P1003.4b/D8, p. 65
- */
-
-int devctl(
-  int     filedes,
-  void   *dev_data_ptr,
-  size_t  nbyte,
-  int    *dev_info_ptr
-);
-
-#endif
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/posix/include/intr.h b/c/src/exec/posix/include/intr.h
deleted file mode 100644
index f07d1f9552..0000000000
--- a/c/src/exec/posix/include/intr.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/* intr.h
- *
- *  XXX: It is unclear if the type "intr_t" should be defined when
- *       _POSIX_INTERRUPT_CONTROL is not.
- *
- *  $Id$
- */
-
-#ifndef __POSIX_INTERRUPTS_h
-#define __POSIX_INTERRUPTS_h
-
-#include <rtems/posix/features.h>
-#include <sys/types.h>
-#include <sys/time.h>
-
-#if defined(_POSIX_INTERRUPT_CONTROL)
-
-/*
- *  22.2 Concepts, P1003.4b/D8, p. 73
- */
-
-typedef int intr_t;
-
-/*
- *  22.3.1 Associate a User-Written ISR with an Interrupt, P1003.4b/D8, p. 74
- */
-
-/*
- *  Return codes from an interrupt handler
- */
-
-#define INTR_HANDLED_NOTIFY         0 /* ISR handled this interrupt, notify */
-                                      /*   the thread that registered the */
-                                      /*   ISR that the interrupt occurred. */
-#define INTR_HANDLED_DO_NOT_NOTIFY  1 /* ISR handled this interrupt, but */
-                                      /*   do NOT perform notification. */
-#define INTR_NOT_HANDLED            2 /* ISR did not handle this interrupt, */
-                                      /*   let the next handler try. */
-
-int intr_capture(
-  intr_t          intr,
-  int           (*intr_handler)( void *area ),
-  volatile void   *area,
-  size_t           areasize
-);
-
-int intr_release(
-  intr_t    intr,
-  int     (*intr_handler)( void *area )
-);
-
-int intr_lock(
-  intr_t  intr
-);
-  
-int intr_unlock(
-  intr_t  intr
-);
-  
-/*
- *  22.3.2 Await Interrupt Notification, P1003.4b/D8, p. 76
- */
-
-int intr_timed_wait(
-  int                     flags,
-  const struct timespec  *timeout
-);
-
-#endif
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/posix/include/limits.h b/c/src/exec/posix/include/limits.h
deleted file mode 100644
index e8ac4bf2fd..0000000000
--- a/c/src/exec/posix/include/limits.h
+++ /dev/null
@@ -1,164 +0,0 @@
-/* limits.h
- *
- *  This file lists the minimums for the limits set by each of
- *  the POSIX features subsets.
- *
- *  XXX: Careful attention needs to be paid to section 2.8 in 1003.1b-1993
- *       to segregrate the variables below based on their "class" according
- *       to our implementation.  We also need to set the Run-Time Invariant
- *       and other related values.
- *
- *  $Id$
- */
-
-#include_next <limits.h>
-
-#ifndef __POSIX_LIMITS_h
-#define __POSIX_LIMITS_h
-
-/* really only to get min stack size from <rtems/score/cpu.h> */
-#include <rtems/system.h>
-
-/****************************************************************************
- ****************************************************************************
- *                                                                          *
- *         P1003.1b-1993 defines the constants below this comment.          *
- *                                                                          *
- **************************************************************************** 
- ****************************************************************************/
-
-#define _POSIX_AIO_LISTIO_MAX   2
-#define _POSIX_AIO_MAX          1
-#define _POSIX_ARG_MAX          4096
-#define _POSIX_CHILD_MAX        6
-#define _POSIX_DELAYTIMER_MAX   32
-#define _POSIX_LINK_MAX         8
-#define _POSIX_MAX_CANON        255
-#define _POSIX_MAX_INPUT        255
-#define _POSIX_MQ_OPEN_MAX      8
-#define _POSIX_MQ_PRIO_MAX      32
-#define _POSIX_NAME_MAX         14
-#define _POSIX_NGROUPS_MAX      0
-#define _POSIX_OPEN_MAX         16
-#define _POSIX_PATH_MAX         255
-#define _POSIX_PIPE_BUF         512
-#define _POSIX_RTSIG_MAX        8
-#define _POSIX_SEM_NSEMS_MAX    256
-#define _POSIX_SEM_VALUE_MAX    32767
-#define _POSIX_SIGQUEUE_MAX     32
-#define _POSIX_SSIZE_MAX        32767
-#define _POSIX_STREAM_MAX       8
-#define _POSIX_TIMER_MAX        32
-#define _POSIX_TZNAME_MAX       3
-
-/*
- *  Definitions of the following may be omitted if the value is >= stated
- *  minimum but is indeterminate.
- */
-
-#define AIO_LISTIO_MAX          2
-#define AIO_MAX                 1
-#define AIO_PRIO_DELTA_MAX      0
-#define ARG_MAX                 4096
-#define CHILD_MAX               6
-#define DELAYTIMER_MAX          32
-#define MQ_OPEN_MAX             8
-#define MQ_PRIO_MAX             32
-#define OPEN_MAX                16
-#define PAGESIZE                1
-#define RTSIG_MAX               8
-#define SEM_NSEMS_MAX           256
-#define SEM_VALUE_MAX           32767
-#define SIGQUEUE_MAX            32
-#define STREAM_MAX              8
-#define TIMER_MAX               32
-#define TZNAME_MAX              3
-
-/*
- *  Pathname Variables
- */
-
-#define LINK_MAX                8
-#define MAX_CANON               255
-#define MAX_INPUT               255
-#define NAME_MAX                14
-#define PATH_MAX                255
-#define PIPE_BUF                512
-
-/*
- *  Invariant values
- */
-
-#define SSIZE_MAX               32767
-
-/*
- *  Maximum Values
- */
-
-#define _POSIX_CLOCKRES_MIN      0   /* in nanoseconds */
-
-/****************************************************************************
- ****************************************************************************
- *                                                                          *
- *         P1003.1c/D10 defines the constants below this comment.           *
- *
- *  XXX: doc seems to have printing problems in this table :(
- *                                                                          *
- **************************************************************************** 
- ****************************************************************************/
-
-#define _POSIX_LOGIN_NAME_MAX                9
-#define _POSIX_THREAD_DESTRUCTOR_ITERATIONS  4
-#define _POSIX_THREAD_KEYS_MAX               28
-#define _POSIX_THREAD_THREADS_MAX            64
-#define _POSIX_TTY_NAME_MAX                  9
-
-/*
- *  Definitions of the following may be omitted if the value is >= stated
- *  minimum but is indeterminate.
- */
-
-#define LOGIN_NAME_MAX                      _POSIX_LOGIN_NAME_MAX
-#define TTY_NAME_MAX                        _POSIX_TTY_NAME_MAX
-#define PTHREAD_DESTRUCTOR_ITERATIONS       _POSIX_THREAD_DESTRUCTOR_ITERATIONS
-#define PTHREAD_STACK_MIN                   CPU_STACK_MINIMUM_SIZE
-
-/*
- *  The maximum number of keys (PTHREAD_KEYS_MAX) and threads
- *  (PTHREAD_THREADS_MAX) are configurable and may exceed the minimum.
- *
-#define PTHREAD_KEYS_MAX                    _POSIX_THREAD_KEYS_MAX
-#define PTHREAD_THREADS_MAX                 _POSIX_THREAD_THREADS_MAX
-*/
-
-
-/****************************************************************************
- ****************************************************************************
- *                                                                          *
- *         P1003.4b/D8 defines the constants below this comment.            *
- *                                                                          *
- **************************************************************************** 
- ****************************************************************************/
-
-#define _POSIX_INTERRUPT_OVERRUN_MAX        32
-
-/*
- *  Definitions of the following may be omitted if the value is >= stated
- *  minimum but is indeterminate.
- */
-
-#define INTERRUPT_OVERRUN_MAX               32
-
-/*
- *  Pathname Variables
- */
-
-#define MIN_ALLOC_SIZE      
-#define REC_MIN_XFER_SIZE   
-#define REC_MAX_XFER_SIZE   
-#define REC_INCR_XFER_SIZE  
-#define REC_XFER_ALIGN      
-#define MAX_ATOMIC_SIZE     
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/posix/include/mqueue.h b/c/src/exec/posix/include/mqueue.h
deleted file mode 100644
index f1b2250e5c..0000000000
--- a/c/src/exec/posix/include/mqueue.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/* mqueue.h
- *
- *  $Id$
- */
-
-#ifndef __POSIX_MESSAGE_QUEUE_h
-#define __POSIX_MESSAGE_QUEUE_h
-
-#include <rtems/posix/features.h>
-
-#if defined(_POSIX_MESSAGE_PASSING)
-
-#include <sys/types.h>
-
-#include <rtems/system.h>
-#include <rtems/score/object.h>
-
-/*
- *  15.1.1 Data Structures, P1003.1b-1993, p. 271
- */
-
-typedef Objects_Id  mqd_t;
-
-struct mq_attr {
-  long  mq_flags;     /* Message queue flags */
-  long  mq_maxmsg;    /* Maximum number of messages */
-  long  mq_msgsize;   /* Maximum message size */
-  long  mq_curmsgs;   /* Number of messages currently queued */
-};
-
-/*
- *  15.2.2 Open a Message Queue, P1003.1b-1993, p. 272
- */
-
-mqd_t mq_open(
-  const char *name,
-  int         oflag,
-  ...
-);
-
-/*
- *  15.2.2 Close a Message Queue, P1003.1b-1993, p. 275
- */
-
-int mq_close(
-  mqd_t  mqdes
-);
-
-/*
- *  15.2.2 Remove a Message Queue, P1003.1b-1993, p. 276
- */
-
-int mq_unlink(
-  const char *name
-);
-
-/*
- *  15.2.4 Send a Message to a Message Queue, P1003.1b-1993, p. 277
- *
- *  NOTE: P1003.4b/D8, p. 45 adds mq_timedsend().
- */
-
-int mq_send(
-  mqd_t         mqdes,
-  const char   *msg_ptr,
-  size_t        msg_len,
-  unsigned int  msg_prio 
-);
-
-#if defined(_POSIX_TIMEOUTS)
-
-#include <time.h>
-
-int mq_timedsend(
-  mqd_t                  mqdes,
-  const char            *msg_ptr,
-  size_t                 msg_len,
-  unsigned int           msg_prio,
-  const struct timespec *timeout
-);
-
-#endif /* _POSIX_TIMEOUTS */
-
-/*
- *  15.2.5 Receive a Message From a Message Queue, P1003.1b-1993, p. 279
- *
- *  NOTE: P1003.4b/D8, p. 45 adds mq_timedreceive().
- */
-
-ssize_t mq_receive(
-  mqd_t         mqdes,
-  char         *msg_ptr,
-  size_t        msg_len,
-  unsigned int *msg_prio
-);
-
-#if defined(_POSIX_TIMEOUTS)
-
-int mq_timedreceive(                  /* XXX: should this be ssize_t */
-  mqd_t                  mqdes,
-  char                  *msg_ptr,
-  size_t                 msg_len,
-  unsigned int          *msg_prio,
-  const struct timespec *timeout
-);
-
-#endif /* _POSIX_TIMEOUTS */
-
-#if defined(_POSIX_REALTIME_SIGNALS)
-
-/*
- *  15.2.6 Notify Process that a Message is Available on a Queue, 
- *         P1003.1b-1993, p. 280
- */
-
-int mq_notify(
-  mqd_t                  mqdes,
-  const struct sigevent *notification
-);
-
-#endif /* _POSIX_REALTIME_SIGNALS */
-
-/*
- *  15.2.7 Set Message Queue Attributes, P1003.1b-1993, p. 281
- */
-
-int mq_setattr(
-  mqd_t                 mqdes,
-  const struct mq_attr *mqstat,
-  struct mq_attr       *omqstat
-);
-
-/*
- *  15.2.8 Get Message Queue Attributes, P1003.1b-1993, p. 283
- */
-
-int mq_getattr(
-  mqd_t           mqdes,
-  struct mq_attr *mqstat
-);
-
-#endif /* _POSIX_MESSAGE_PASSING */
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/posix/include/pthread.h b/c/src/exec/posix/include/pthread.h
deleted file mode 100644
index d70a794f38..0000000000
--- a/c/src/exec/posix/include/pthread.h
+++ /dev/null
@@ -1,500 +0,0 @@
-/*  pthread.h
- *
- *  $Id$
- */
-
-#ifndef __PTHREAD_h
-#define __PTHREAD_h
-
-#include <sys/features.h>
-
-#if defined(_POSIX_THREADS)
-
-#include <sys/types.h>
-#include <time.h>
-#include <sys/sched.h>
-
-/*
- *  3.1.3 Register Fork Handlers, P1003.1c/Draft 10, P1003.1c/Draft 10, p. 27
- *
- *  RTEMS does not support processes, so we fall under this and do not 
- *  provide this routine:
- *
- *  "Either the implementation shall support the pthread_atfork() function
- *   as described above or the pthread_atfork() funciton shall not be 
- *   provided."
- */
-
-/*
- *  11.3.1 Mutex Initialization Attributes, P1003.1c/Draft 10, p. 81
- */
-
-int pthread_mutexattr_init(
-  pthread_mutexattr_t *attr
-);
-
-int pthread_mutexattr_destroy(
-  pthread_mutexattr_t *attr
-);
-
-int pthread_mutexattr_getpshared(
-  const pthread_mutexattr_t *attr,
-  int                       *pshared
-);
-
-int pthread_mutexattr_setpshared(
-  pthread_mutexattr_t *attr,
-  int                  pshared
-);
-
-/*
- *  11.3.2 Initializing and Destroying a Mutex, P1003.1c/Draft 10, p. 87
- */
-
-int pthread_mutex_init(
-  pthread_mutex_t           *mutex,
-  const pthread_mutexattr_t *attr
-);
-
-int pthread_mutex_destroy(
-  pthread_mutex_t           *mutex
-);
-
-/*
- *  This is used to statically initialize a pthread_mutex_t. Example:
- *
- *  pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
- */
-
-#define PTHREAD_MUTEX_INITIALIZER  ((pthread_mutex_t) 0xFFFFFFFF)
-
-/*
- *  11.3.3 Locking and Unlocking a Mutex, P1003.1c/Draft 10, p. 93
- *        
- *  NOTE: P1003.4b/D8 adds pthread_mutex_timedlock(), p. 29
- */
-
-int pthread_mutex_lock(
-  pthread_mutex_t           *mutex
-);
-
-int pthread_mutex_trylock(
-  pthread_mutex_t           *mutex
-);
-
-int pthread_mutex_unlock(
-  pthread_mutex_t           *mutex
-);
-
-#if defined(_POSIX_TIMEOUTS)
-
-int pthread_mutex_timedlock(
-  pthread_mutex_t       *mutex,
-  const struct timespec *timeout
-);
-
-#endif /* _POSIX_TIMEOUTS */
-
-/*
- *  11.4.1 Condition Variable Initialization Attributes, 
- *            P1003.1c/Draft 10, p. 96
- */
- 
-int pthread_condattr_init(
-  pthread_condattr_t *attr
-);
- 
-int pthread_condattr_destroy(
-  pthread_condattr_t *attr
-);
- 
-int pthread_condattr_getpshared(
-  const pthread_condattr_t *attr,
-  int                      *pshared
-);
- 
-int pthread_condattr_setpshared(
-  pthread_condattr_t  *attr,
-  int                  pshared
-);
- 
-/*
- *  11.4.2 Initializing and Destroying a Condition Variable, 
- *         P1003.1c/Draft 10, p. 87
- */
- 
-int pthread_cond_init(
-  pthread_cond_t           *cond,
-  const pthread_condattr_t *attr
-);
- 
-int pthread_cond_destroy(
-  pthread_cond_t           *mutex
-);
- 
-/*
- *  This is used to statically initialize a pthread_cond_t. Example:
- *
- *  pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
- */
- 
-#define PTHREAD_COND_INITIALIZER  ((pthread_mutex_t) 0xFFFFFFFF)
- 
-/*
- *  11.4.3 Broadcasting and Signaling a Condition, P1003.1c/Draft 10, p. 101
- */
- 
-int pthread_cond_signal(
-  pthread_cond_t   *cond
-);
- 
-int pthread_cond_broadcast(
-  pthread_cond_t   *cond
-);
- 
-/*
- *  11.4.4 Waiting on a Condition, P1003.1c/Draft 10, p. 105
- */
- 
-int pthread_cond_wait(
-  pthread_cond_t     *cond,
-  pthread_mutex_t    *mutex
-);
- 
-int pthread_cond_timedwait(
-  pthread_cond_t        *cond,
-  pthread_mutex_t       *mutex,
-  const struct timespec *abstime
-);
- 
-#if defined(_POSIX_THREAD_PRIORITY_SCHEDULING)
-
-/*
- *  13.5.1 Thread Creation Scheduling Attributes, P1003.1c/Draft 10, p. 120
- */
-
-int pthread_attr_setscope(
-  pthread_attr_t  *attr,
-  int              contentionscope
-);
-
-int pthread_attr_getscope(
-  const pthread_attr_t  *attr,
-  int                   *contentionscope
-);
-
-int pthread_attr_setinheritsched(
-  pthread_attr_t  *attr,
-  int              inheritsched
-);
-
-int pthread_attr_getinheritsched(
-  const pthread_attr_t  *attr,
-  int                   *inheritsched
-);
-
-int pthread_attr_setschedpolicy(
-  pthread_attr_t  *attr,
-  int              policy
-);
-
-int pthread_attr_getschedpolicy(
-  const pthread_attr_t  *attr,
-  int                   *policy
-);
-
-#endif /* defined(_POSIX_THREAD_PRIORITY_SCHEDULING) */
-
-int pthread_attr_setschedparam(
-  pthread_attr_t            *attr,
-  const struct sched_param  *param
-);
-
-int pthread_attr_getschedparam(
-  const pthread_attr_t  *attr,
-  struct sched_param    *param
-);
-
-#if defined(_POSIX_THREAD_PRIORITY_SCHEDULING)
-
-/*
- *  13.5.2 Dynamic Thread Scheduling Parameters Access, 
- *         P1003.1c/Draft 10, p. 124
- */
-
-int pthread_getschedparam(
-  pthread_t           thread,
-  int                *policy,
-  struct sched_param *param
-);
-
-int pthread_setschedparam(
-  pthread_t           thread,
-  int                 policy,
-  struct sched_param *param
-);
-
-#endif /* defined(_POSIX_THREAD_PRIORITY_SCHEDULING) */
-
-#if defined(_POSIX_THREAD_PRIO_INHERIT) || defined(_POSIX_THREAD_PRIO_PROTECT)
-
-/*
- *  13.6.1 Mutex Initialization Scheduling Attributes, P1003.1c/Draft 10, p. 128
- */
- 
-int pthread_mutexattr_setprotocol(
-  pthread_mutexattr_t   *attr,
-  int                    protocol
-);
-
-int pthread_mutexattr_getprotocol(
-  const pthread_mutexattr_t   *attr,
-  int                         *protocol
-);
-
-int pthread_mutexattr_setprioceiling(
-  pthread_mutexattr_t   *attr,
-  int                    prioceiling
-);
-
-int pthread_mutexattr_getprioceiling(
-  const pthread_mutexattr_t   *attr,
-  int                         *prioceiling
-);
-
-#endif /* _POSIX_THREAD_PRIO_INHERIT || _POSIX_THREAD_PRIO_PROTECT */
-
-#if defined(_POSIX_THREAD_PRIO_PROTECT)
-
-/*
- *  13.6.2 Change the Priority Ceiling of a Mutex, P1003.1c/Draft 10, p. 131
- */
-
-int pthread_mutex_setprioceiling(
-  pthread_mutex_t   *mutex,
-  int                prioceiling,
-  int               *old_ceiling
-);
- 
-int pthread_mutex_getprioceiling(
-  pthread_mutex_t   *mutex,
-  int               *prioceiling
-);
-
-#endif /* _POSIX_THREAD_PRIO_PROTECT */
-
-/*
- *  16.1.1 Thread Creation Attributes, P1003.1c/Draft 10, p, 140
- */
-
-int pthread_attr_init(
-  pthread_attr_t  *attr
-);
-
-int pthread_attr_destroy(
-  pthread_attr_t  *attr
-);
- 
-int pthread_attr_getstacksize(
-  const pthread_attr_t  *attr,
-  size_t                *stacksize
-);
- 
-int pthread_attr_setstacksize(
-  pthread_attr_t  *attr,
-  size_t           stacksize
-);
- 
-int pthread_attr_getstackaddr(
-  const pthread_attr_t   *attr,
-  void                  **stackaddr
-);
- 
-int pthread_attr_setstackaddr(
-  pthread_attr_t  *attr,
-  void            *stackaddr
-);
- 
-int pthread_attr_getdetachstate(
-  const pthread_attr_t  *attr,
-  int                   *detachstate
-);
- 
-int pthread_attr_setdetachstate(
-  pthread_attr_t  *attr,
-  int              detachstate
-);
-
-/*
- *  16.1.2 Thread Creation, P1003.1c/Draft 10, p. 144
- */
-
-int pthread_create(
-  pthread_t              *thread,
-  const pthread_attr_t   *attr,
-  void                 *(*start_routine)( void * ),
-  void                   *arg
-);
-
-/*
- *  16.1.3 Wait for Thread Termination, P1003.1c/Draft 10, p. 147
- */
-
-int pthread_join(
-  pthread_t   thread,
-  void      **value_ptr
-);
-
-/*
- *  16.1.4 Detaching a Thread, P1003.1c/Draft 10, p. 149
- */
-
-int pthread_detach(
-  pthread_t   thread
-);
-
-/*
- * 16.1.5.1 Thread Termination, p1003.1c/Draft 10, p. 150
- */
-
-void pthread_exit(
-  void  *value_ptr
-);
-
-/*
- * 16.1.6 Get Calling Thread's ID, p1003.1c/Draft 10, p. XXX
- */
-
-pthread_t pthread_self( void );
-
-/*
- *  16.1.7 Compare Thread IDs, p1003.1c/Draft 10, p. 153
- */
-
-int pthread_equal( 
-  pthread_t  t1,
-  pthread_t  t2
-);
-
-/*
- *  16.1.8 Dynamic Package Initialization
- */
-
-/*
- *  This is used to statically initialize a pthread_once_t. Example:
- *
- *  pthread_once_t once = PTHREAD_ONCE_INIT;
- *
- *  NOTE:  This is named inconsistently -- it should be INITIALIZER.
- */
- 
-#define PTHREAD_ONCE_INIT  { 1, 0 }  /* is initialized and not run */
- 
-int pthread_once(
-  pthread_once_t  *once_control,
-  void           (*init_routine)(void)
-);
-
-/*
- *  17.1.1 Thread-Specific Data Key Create, P1003.1c/Draft 10, p. 163
- */
-
-int pthread_key_create(
-  pthread_key_t  *key,
-  void          (*destructor)( void * )
-);
-
-/*
- *  17.1.2 Thread-Specific Data Management, P1003.1c/Draft 10, p. 165
- */
-
-int pthread_setspecific(
-  pthread_key_t  key,
-  const void    *value
-);
-
-void *pthread_getspecific(
-  pthread_key_t  key
-);
-
-/*
- *  17.1.3 Thread-Specific Data Key Deletion, P1003.1c/Draft 10, p. 167
- */
-
-int pthread_key_delete(
-  pthread_key_t  key
-);
-
-/*
- *  18.2.1 Canceling Execution of a Thread, P1003.1c/Draft 10, p. 181
- */
-
-#define PTHREAD_CANCEL_ENABLE  0
-#define PTHREAD_CANCEL_DISABLE 1
-
-#define PTHREAD_CANCEL_DEFERRED 0
-#define PTHREAD_CANCEL_ASYNCHRONOUS 1
-
-int pthread_cancel(
-  pthread_t  thread
-);
-
-/*
- *  18.2.2 Setting Cancelability State, P1003.1c/Draft 10, p. 183
- */
-
-int pthread_setcancelstate( 
-  int  state,
-  int *oldstate
-);
-
-int pthread_setcanceltype(
-  int  type,
-  int *oldtype
-);
-
-void pthread_testcancel( void );
-
-/*
- *  18.2.3.1 Establishing Cancellation Handlers, P1003.1c/Draft 10, p. 184
- */
-
-void pthread_cleanup_push(
-  void   (*routine)( void * ),
-  void    *arg
-);
-
-void pthread_cleanup_pop(
-  int    execute
-);
-
-#if defined(_POSIX_THREAD_CPUTIME)
- 
-/*
- *  20.1.6 Accessing a Thread CPU-time Clock, P1003.4b/D8, p. 58
- */
- 
-int pthread_getcpuclockid(
-  pthread_t  thread_id,
-  clockid_t *clock_id
-);
- 
-/*
- *  20.1.7 CPU-time Clock Thread Creation Attribute, P1003.4b/D8, p. 59
- */
-
-int pthread_attr_setcputime(
-  pthread_attr_t  *attr,
-  int              clock_allowed
-);
-
-int pthread_attr_getcputime(
-  pthread_attr_t  *attr,
-  int             *clock_allowed
-);
-
-#endif /* defined(_POSIX_THREAD_CPUTIME) */
-
-#endif /* defined(_POSIX_THREADS) */
-#endif
-/* end of include file */
diff --git a/c/src/exec/posix/include/rtems/posix/Makefile.in b/c/src/exec/posix/include/rtems/posix/Makefile.in
deleted file mode 100644
index 543917d7ed..0000000000
--- a/c/src/exec/posix/include/rtems/posix/Makefile.in
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-H_PIECES= cond condmp config key mutex mutexmp posixapi \
-    priority psignal pthread pthreadmp seterr threadsup time
-#H_PIECES= cancel cond condmp intr key mqueue mqueuemp mutex \
-#    mutexmp pthread pthreadmp priority semaphore semaphoremp threadsup \
-#    time
-H_FILES=$(H_PIECES:%=$(srcdir)/%.h)
-
-SRCS=$(H_FILES)
-
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-#
-# Add your list of files to delete here.  The config files
-#  already know how to delete some stuff, so you may want
-#  to just run 'make clean' first to see what gets missed.
-#  'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
-
-all:	$(SRCS)
-	$(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/posix
diff --git a/c/src/exec/posix/include/rtems/posix/cancel.h b/c/src/exec/posix/include/rtems/posix/cancel.h
deleted file mode 100644
index e6d80275f4..0000000000
--- a/c/src/exec/posix/include/rtems/posix/cancel.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* rtems/posix/cancel.h
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_POSIX_CANCEL_h
-#define __RTEMS_POSIX_CANCEL_h
-
-typedef struct {
-  Chain_Node  Node;
-  void      (*routine)( void * );
-  void       *arg;
-}  POSIX_Cancel_Handler_control;
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/posix/include/rtems/posix/cond.h b/c/src/exec/posix/include/rtems/posix/cond.h
deleted file mode 100644
index 92c2e453ae..0000000000
--- a/c/src/exec/posix/include/rtems/posix/cond.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/*  rtems/posix/cond.h
- *
- *  This include file contains all the private support information for
- *  POSIX condition variables.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
- 
-#ifndef __RTEMS_POSIX_CONDITION_VARIABLES_h
-#define __RTEMS_POSIX_CONDITION_VARIABLES_h
- 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/object.h>
-#include <rtems/score/threadq.h>
-
-/*
- *  Constant to indicate condition variable does not currently have
- *  a mutex assigned to it.
- */
-
-#define POSIX_CONDITION_VARIABLES_NO_MUTEX 0
-
-/*
- *  Data Structure used to manage a POSIX condition variable
- */
- 
-typedef struct {
-   Objects_Control       Object;
-   int                   process_shared;
-   pthread_mutex_t       Mutex;
-   Thread_queue_Control  Wait_queue;
-}  POSIX_Condition_variables_Control;
-
-/*
- *  The following defines the information control block used to manage
- *  this class of objects.
- */
- 
-POSIX_EXTERN Objects_Information  _POSIX_Condition_variables_Information;
- 
-/*
- *  _POSIX_Condition_variables_Manager_initialization
- *
- *  DESCRIPTION:
- *
- *  This routine performs the initialization necessary for this manager.
- */
- 
-void _POSIX_Condition_variables_Manager_initialization(
-  unsigned32 maximum_condition_variables
-);
- 
-/*
- *  _POSIX_Condition_variables_Allocate
- *
- *  DESCRIPTION:
- *
- *  This function allocates a condition variable control block from
- *  the inactive chain of free condition variable control blocks.
- */
- 
-RTEMS_INLINE_ROUTINE POSIX_Condition_variables_Control * 
-  _POSIX_Condition_variables_Allocate( void );
- 
-/*
- *  _POSIX_Condition_variables_Free
- *
- *  DESCRIPTION:
- *
- *  This routine frees a condition variable control block to the
- *  inactive chain of free condition variable control blocks.
- */
- 
-RTEMS_INLINE_ROUTINE void _POSIX_Condition_variables_Free (
-  POSIX_Condition_variables_Control *the_condition_variable
-);
- 
-/*
- *  _POSIX_Condition_variables_Get
- *
- *  DESCRIPTION:
- *
- *  This function maps condition variable IDs to condition variable control 
- *  blocks.  If ID corresponds to a local condition variable, then it returns
- *  the_condition variable control pointer which maps to ID and location
- *  is set to OBJECTS_LOCAL.  if the condition variable ID is global and
- *  resides on a remote node, then location is set to OBJECTS_REMOTE,
- *  and the_condition variable is undefined.  Otherwise, location is set
- *  to OBJECTS_ERROR and the_condition variable is undefined.
- */
- 
-RTEMS_INLINE_ROUTINE POSIX_Condition_variables_Control *_POSIX_Condition_variables_Get (
-  Objects_Id        *id,
-  Objects_Locations *location
-);
- 
-/*
- *  _POSIX_Condition_variables_Is_null
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the_condition variable is NULL 
- *  and FALSE otherwise.
- */
- 
-RTEMS_INLINE_ROUTINE boolean _POSIX_Condition_variables_Is_null (
-  POSIX_Condition_variables_Control *the_condition_variable
-);
-
-#include <rtems/posix/cond.inl>
-#include <rtems/posix/condmp.h>
-
-#ifdef __cplusplus
-}
-#endif
- 
-#endif
-/*  end of include file */
-
diff --git a/c/src/exec/posix/include/rtems/posix/condmp.h b/c/src/exec/posix/include/rtems/posix/condmp.h
deleted file mode 100644
index de9c5ce0d4..0000000000
--- a/c/src/exec/posix/include/rtems/posix/condmp.h
+++ /dev/null
@@ -1,162 +0,0 @@
-/*  condmp.h
- *
- *  This include file contains all the constants and structures associated
- *  with the Multiprocessing Support in the POSIX Condition Variable Manager.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_POSIX_CONDITION_VARIABLES_MP_h
-#define __RTEMS_POSIX_CONDITION_VARIABLES_MP_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/mppkt.h>
-#include <rtems/score/object.h>
-#include <rtems/score/thread.h>
-#include <rtems/score/watchdog.h>
-
-/*
- *  The following enumerated type defines the list of
- *  remote condition variable operations.
- */
-
-typedef enum {
-  POSIX_CONDITION_VARIABLES_MP_ANNOUNCE_CREATE  =  0,
-  POSIX_CONDITION_VARIABLES_MP_ANNOUNCE_DELETE  =  1,
-  POSIX_CONDITION_VARIABLES_MP_EXTRACT_PROXY    =  2,
-  POSIX_CONDITION_VARIABLES_MP_OBTAIN_REQUEST   =  3,
-  POSIX_CONDITION_VARIABLES_MP_OBTAIN_RESPONSE  =  4,
-  POSIX_CONDITION_VARIABLES_MP_RELEASE_REQUEST  =  5,
-  POSIX_CONDITION_VARIABLES_MP_RELEASE_RESPONSE =  6,
-}   POSIX_Condition_variables_MP_Remote_operations;
-
-/*
- *  The following data structure defines the packet used to perform
- *  remote condition variable operations.
- */
-
-typedef struct {
-  MP_packet_Prefix                                Prefix;
-  POSIX_Condition_variables_MP_Remote_operations  operation;
-  Objects_Name                                    name;
-  boolean                                         wait;  /* XXX options */
-  Objects_Id                                      proxy_id;
-}   POSIX_Condition_variables_MP_Packet;
-
-/*
- *  _POSIX_Condition_variables_MP_Send_process_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs a remote procedure call so that a
- *  process operation can be performed on another node.
- */
-
-void _POSIX_Condition_variables_MP_Send_process_packet (
-  POSIX_Condition_variables_MP_Remote_operations  operation,
-  Objects_Id                        condition_variables_id,
-  Objects_Name                      name,
-  Objects_Id                        proxy_id
-);
-
-/*
- *  _POSIX_Condition_variables_MP_Send_request_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs a remote procedure call so that a
- *  directive operation can be initiated on another node.
- */
-
-int _POSIX_Condition_variables_MP_Send_request_packet (
-  POSIX_Condition_variables_MP_Remote_operations  operation,
-  Objects_Id                                      condition_variables_id,
-  boolean                                         wait,  /* XXX options */
-  Watchdog_Interval                               timeout
-);
-
-/*
- *  _POSIX_Condition_variables_MP_Send_response_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs a remote procedure call so that a
- *  directive can be performed on another node.
- */
-
-void _POSIX_Condition_variables_MP_Send_response_packet (
-  POSIX_Condition_variables_MP_Remote_operations  operation,
-  Objects_Id                        condition_variables_id,
-  Thread_Control                   *the_thread
-);
-
-/*
- *
- *  _POSIX_Condition_variables_MP_Process_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs the actions specific to this package for
- *  the request from another node.
- */
-
-void _POSIX_Condition_variables_MP_Process_packet (
-  MP_packet_Prefix *the_packet_prefix
-);
-
-/*
- *  _POSIX_Condition_variables_MP_Send_object_was_deleted
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked indirectly by the thread queue
- *  when a proxy has been removed from the thread queue and
- *  the remote node must be informed of this.
- */
-
-void _POSIX_Condition_variables_MP_Send_object_was_deleted (
-  Thread_Control *the_proxy
-);
-
-/*
- *  _POSIX_Condition_variables_MP_Send_extract_proxy
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked when a task is deleted and it
- *  has a proxy which must be removed from a thread queue and
- *  the remote node must be informed of this.
- */
-
-void _POSIX_Condition_variables_MP_Send_extract_proxy (
-  Thread_Control *the_thread
-);
-
-/*
- *  _POSIX_Condition_variables_MP_Get_packet
- *
- *  DESCRIPTION:
- *
- *  This function is used to obtain a condition variable mp packet.
- */
-
-POSIX_Condition_variables_MP_Packet
-  *_POSIX_Condition_variables_MP_Get_packet ( void );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of file */
diff --git a/c/src/exec/posix/include/rtems/posix/config.h b/c/src/exec/posix/include/rtems/posix/config.h
deleted file mode 100644
index 8753c42382..0000000000
--- a/c/src/exec/posix/include/rtems/posix/config.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*  config.h
- *
- *  This include file contains the table of user defined configuration
- *  parameters specific for the POSIX API.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_POSIX_CONFIGURATION_h
-#define __RTEMS_POSIX_CONFIGURATION_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- *  XXX
- *
- *  The following records define the Configuration Table.  The
- *  information contained in this table is required in all
- *  RTEMS systems, whether single or multiprocessor.  This
- *  table primarily defines the following:
- *
- *     + required number of each object type
- */
-
-/*
- *  For now, we are only allowing the user to specify the entry point
- *  for posix initialization threads.
- */
-
-typedef struct {
-  void       *(*thread_entry)(void *);
-} posix_initialization_threads_table;
-
-typedef struct {
-  int                                 maximum_threads;
-  int                                 maximum_mutexes;
-  int                                 maximum_condition_variables;
-  int                                 maximum_keys;
-  int                                 maximum_queued_signals;
-  int                                 number_of_initialization_threads;
-  posix_initialization_threads_table *User_initialization_threads_table;
-} posix_api_configuration_table;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/posix/include/rtems/posix/intr.h b/c/src/exec/posix/include/rtems/posix/intr.h
deleted file mode 100644
index 539c66f058..0000000000
--- a/c/src/exec/posix/include/rtems/posix/intr.h
+++ /dev/null
@@ -1,154 +0,0 @@
-/*  rtems/posix/intr.h
- *
- *  This include file contains all the private support information for
- *  POSIX Interrupt Manager.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
- 
-#ifndef __RTEMS_POSIX_KEY_h
-#define __RTEMS_POSIX_KEY_h
- 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/isr.h>
-#include <rtems/score/object.h>
-
-/*
- *  Data Structure used to manage each POSIX Interrupt Vector
- */
-
-typedef struct {
-  int            number_installed;
-  int            lock_count;
-  int            deferred_count;
-  Chain_Control  Handlers;
-} POSIX_Interrupt_Control;
- 
-/*
- *  Data Structure used to manage a POSIX Interrupt Handler
- */
- 
-typedef struct {
-  Objects_Control         Object;
-  int                     is_active; 
-  intr_t                  vector; 
-  Thread_Control         *server;
-  int                   (*handler)( void *area );
-  volatile void           *user_data_area;
-}  POSIX_Interrupt_Handler_control;
-
-/*
- *  The following defines the information control block used to manage
- *  this class of objects.
- */
- 
-POSIX_EXTERN Objects_Information _POSIX_Interrupt_Handlers_Information;
-
-/*
- *  The following is an array which is used to manage the set of
- *  interrupt handlers installed on each vector.
- */
-
-POSIX_EXTERN POSIX_Interrupt_Control 
-               _POSIX_Interrupt_Information[ ISR_NUMBER_OF_VECTORS ];
- 
-/*
- *  _POSIX_Interrupt_Manager_initialization
- *
- *  DESCRIPTION:
- *
- *  This routine performs the initialization necessary for this manager.
- */
- 
-void _POSIX_Interrupt_Manager_initialization( 
-  unsigned32  maximum_interrupt_handlers
-);
- 
-/*
- *  _POSIX_Interrupt_Allocate
- *
- *  DESCRIPTION:
- *
- *  This function allocates a interrupt handler control block from
- *  the inactive chain of free interrupt handler control blocks.
- */
- 
-RTEMS_INLINE_ROUTINE POSIX_Interrupt_Handler_control *
-  _POSIX_Interrupt_Allocate( void );
- 
-/*
- *  _POSIX_Interrupt_Free
- *
- *  DESCRIPTION:
- *
- *  This routine frees a interrupt handler control block to the
- *  inactive chain of free interrupt handler control blocks.
- */
- 
-RTEMS_INLINE_ROUTINE void _POSIX_Interrupt_Free (
-  POSIX_Interrupt_Handler_control *the_intr
-);
- 
-/*
- *  _POSIX_Interrupt_Get
- *
- *  DESCRIPTION:
- *
- *  This function maps interrupt handler IDs to interrupt handler control 
- *  blocks.  If ID corresponds to a local interrupt handler, then it returns
- *  the_intr control pointer which maps to ID and location
- *  is set to OBJECTS_LOCAL.  if the interrupt handler ID is global and
- *  resides on a remote node, then location is set to OBJECTS_REMOTE,
- *  and the_intr is undefined.  Otherwise, location is set
- *  to OBJECTS_ERROR and the_intr is undefined.
- */
- 
-RTEMS_INLINE_ROUTINE POSIX_Interrupt_Control *_POSIX_Interrupt_Get (
-  Objects_Id         id,
-  Objects_Locations *location
-);
- 
-/*
- *  _POSIX_Interrupt_Is_null
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the_intr is NULL and FALSE otherwise.
- */
- 
-RTEMS_INLINE_ROUTINE boolean _POSIX_Interrupt_Is_null (
-  POSIX_Interrupt_Handler_control *the_intr
-);
- 
-/*
- *  _POSIX_Interrupt_Handler
- *
- *  DESCRIPTION:
- *
- *  This function XXX.
- */
- 
-void _POSIX_Interrupt_Handler(
-  ISR_Vector_number   vector
-);
-
-#include <rtems/posix/intr.inl>
-
-#ifdef __cplusplus
-}
-#endif
- 
-#endif
-/*  end of include file */
-
diff --git a/c/src/exec/posix/include/rtems/posix/key.h b/c/src/exec/posix/include/rtems/posix/key.h
deleted file mode 100644
index 22bfafd594..0000000000
--- a/c/src/exec/posix/include/rtems/posix/key.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/*  rtems/posix/key.h
- *
- *  This include file contains all the private support information for
- *  POSIX key.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
- 
-#ifndef __RTEMS_POSIX_KEY_h
-#define __RTEMS_POSIX_KEY_h
- 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- *  Data Structure used to manage a POSIX key
- *
- *  NOTE:  The Values is a table indexed by the index portion of the
- *         ID of the currently executing thread.
- */
- 
-typedef struct {
-   Objects_Control     Object;
-   boolean             is_active;
-   void              (*destructor)( void * );
-   void              **Values[ OBJECTS_CLASSES_LAST_THREAD_CLASS + 1 ];
-}  POSIX_Keys_Control;
-
-/*
- *  The following defines the information control block used to manage
- *  this class of objects.
- */
- 
-POSIX_EXTERN Objects_Information  _POSIX_Keys_Information;
- 
-/*
- *  _POSIX_Keys_Manager_initialization
- *
- *  DESCRIPTION:
- *
- *  This routine performs the initialization necessary for this manager.
- */
- 
-void _POSIX_Key_Manager_initialization(
-  unsigned32 maximum_keys
-);
- 
-/*
- *  _POSIX_Keys_Run_destructors
- *
- *  DESCRIPTION:
- *
- *  This function executes all the destructors associated with the thread's
- *  keys.  This function will execute until all values have been set to NULL.
- *
- *  NOTE:  This is the routine executed when a thread exits to
- *         run through all the keys and do the destructor action.
- */
- 
-void _POSIX_Keys_Run_destructors(
-  Thread_Control *thread
-);
-
-/*
- *  _POSIX_Keys_Allocate
- *
- *  DESCRIPTION:
- *
- *  This function allocates a keys control block from
- *  the inactive chain of free keys control blocks.
- */
- 
-RTEMS_INLINE_ROUTINE POSIX_Keys_Control *_POSIX_Keys_Allocate( void );
- 
-/*
- *  _POSIX_Keys_Free
- *
- *  DESCRIPTION:
- *
- *  This routine frees a keys control block to the
- *  inactive chain of free keys control blocks.
- */
- 
-RTEMS_INLINE_ROUTINE void _POSIX_Keys_Free (
-  POSIX_Keys_Control *the_key
-);
- 
-/*
- *  _POSIX_Keys_Get
- *
- *  DESCRIPTION:
- *
- *  This function maps key IDs to key control blocks.
- *  If ID corresponds to a local keys, then it returns
- *  the_key control pointer which maps to ID and location
- *  is set to OBJECTS_LOCAL.  if the keys ID is global and
- *  resides on a remote node, then location is set to OBJECTS_REMOTE,
- *  and the_key is undefined.  Otherwise, location is set
- *  to OBJECTS_ERROR and the_key is undefined.
- */
- 
-RTEMS_INLINE_ROUTINE POSIX_Keys_Control *_POSIX_Keys_Get (
-  Objects_Id         id,
-  Objects_Locations *location
-);
- 
-/*
- *  _POSIX_Keys_Is_null
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the_key is NULL and FALSE otherwise.
- */
- 
-RTEMS_INLINE_ROUTINE boolean _POSIX_Keys_Is_null (
-  POSIX_Keys_Control *the_key
-);
-
-#include <rtems/posix/key.inl>
-
-#ifdef __cplusplus
-}
-#endif
- 
-#endif
-/*  end of include file */
-
diff --git a/c/src/exec/posix/include/rtems/posix/mqueue.h b/c/src/exec/posix/include/rtems/posix/mqueue.h
deleted file mode 100644
index 8e2851bfb5..0000000000
--- a/c/src/exec/posix/include/rtems/posix/mqueue.h
+++ /dev/null
@@ -1,186 +0,0 @@
-/*  rtems/posix/mqueue.h
- *
- *  This include file contains all the private support information for
- *  POSIX Message Queues.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
- 
-#ifndef __RTEMS_POSIX_MESSAGE_QUEUE_h
-#define __RTEMS_POSIX_MESSAGE_QUEUE_h
- 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/coremsg.h>
-#include <rtems/score/object.h>
-
-/*
- *  Data Structure used to manage a POSIX message queue
- */
- 
-typedef struct {
-   Objects_Control             Object;
-   int                         process_shared;
-   int                         flags;
-   boolean                     named;
-   boolean                     linked;
-   boolean                     blocking;
-   unsigned32                  open_count;
-   CORE_message_queue_Control  Message_queue;
-   struct sigevent             notification;
-}  POSIX_Message_queue_Control;
-
-/*
- *  The following defines the information control block used to manage
- *  this class of objects.
- */
- 
-POSIX_EXTERN Objects_Information  _POSIX_Message_queue_Information;
- 
-/*
- *  _POSIX_Message_queue_Manager_initialization
- *
- *  DESCRIPTION:
- *
- *  This routine performs the initialization necessary for this manager.
- */
- 
-void _POSIX_Message_queue_Manager_initialization(
-  unsigned32 maximum_message_queues
-);
- 
-/*
- *
- *  _POSIX_Message_queue_Create_support
- *
- *  DESCRIPTION:
- *
- *  This routine performs the creation of a message queue utilizing the
- *  core message queue.
- */
- 
-int _POSIX_Message_queue_Create_support(
-  const char                    *name,
-  int                            pshared,
-  unsigned int                   oflag,
-  struct mq_attr                *attr,
-  POSIX_Message_queue_Control  **message_queue
-);
-
-/*
- *
- *  _POSIX_Message_queue_Send_support
- *
- *  DESCRIPTION:
- *
- *  This routine posts a message to a specified message queue.
- */
-
-int _POSIX_Message_queue_Send_support(
-  mqd_t               mqdes,
-  const char         *msg_ptr,
-  unsigned32          msg_len,
-  Priority_Control    msg_prio,
-  Watchdog_Interval   timeout
-);
-
-/*
- *  _POSIX_Message_queue_Allocate
- *
- *  DESCRIPTION:
- *
- *  This function allocates a message queue control block from
- *  the inactive chain of free message queue control blocks.
- */
- 
-RTEMS_INLINE_ROUTINE POSIX_Message_queue_Control *_POSIX_Message_queue_Allocate( void );
- 
-/*
- *  _POSIX_Message_queue_Free
- *
- *  DESCRIPTION:
- *
- *  This routine frees a message queue control block to the
- *  inactive chain of free message queue control blocks.
- */
- 
-RTEMS_INLINE_ROUTINE void _POSIX_Message_queue_Free (
-  POSIX_Message_queue_Control *the_mq
-);
- 
-/*
- *  _POSIX_Message_queue_Get
- *
- *  DESCRIPTION:
- *
- *  This function maps message queue IDs to message queue control blocks.
- *  If ID corresponds to a local message queue, then it returns
- *  the_mq control pointer which maps to ID and location
- *  is set to OBJECTS_LOCAL.  if the message queue ID is global and
- *  resides on a remote node, then location is set to OBJECTS_REMOTE,
- *  and the_message queue is undefined.  Otherwise, location is set
- *  to OBJECTS_ERROR and the_mq is undefined.
- */
- 
-RTEMS_INLINE_ROUTINE POSIX_Message_queue_Control *_POSIX_Message_queue_Get (
-  Objects_Id         id,
-  Objects_Locations *location
-);
- 
-/*
- *  _POSIX_Message_queue_Is_null
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the_message_queue is NULL and FALSE otherwise.
- */
- 
-RTEMS_INLINE_ROUTINE boolean _POSIX_Message_queue_Is_null (
-  POSIX_Message_queue_Control *the_mq
-);
-
-/*
- *  _POSIX_Message_queue_Name_to_id
- *
- *  DESCRIPTION:
- *
- *  XXX
- */
-
-int _POSIX_Message_queue_Name_to_id(
-  const char          *name,
-  Objects_Id          *id
-);
-
-/*
- *  _POSIX_Message_queue_Priority_to_core
- * 
- *  DESCRIPTION:
- *
- *  XXX
- */
- 
-RTEMS_INLINE_ROUTINE Priority_Control _POSIX_Message_queue_Priority_to_core(
-  unsigned int priority
-);
-
-#include <rtems/posix/mqueue.inl>
-#include <rtems/posix/mqueuemp.h>
-
-#ifdef __cplusplus
-}
-#endif
- 
-#endif
-/*  end of include file */
-
diff --git a/c/src/exec/posix/include/rtems/posix/mqueuemp.h b/c/src/exec/posix/include/rtems/posix/mqueuemp.h
deleted file mode 100644
index 27742014ab..0000000000
--- a/c/src/exec/posix/include/rtems/posix/mqueuemp.h
+++ /dev/null
@@ -1,161 +0,0 @@
-/*  mqueuemp.h
- *
- *  This include file contains all the constants and structures associated
- *  with the Multiprocessing Support in the POSIX Message Queue Manager.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_POSIX_MESSAGE_QUEUE_MP_h
-#define __RTEMS_POSIX_MESSAGE_QUEUE_MP_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/mppkt.h>
-#include <rtems/score/object.h>
-#include <rtems/score/thread.h>
-#include <rtems/score/watchdog.h>
-
-/*
- *  The following enumerated type defines the list of
- *  remote message queue operations.
- */
-
-typedef enum {
-  POSIX_MESSAGE_QUEUE_MP_ANNOUNCE_CREATE  =  0,
-  POSIX_MESSAGE_QUEUE_MP_ANNOUNCE_DELETE  =  1,
-  POSIX_MESSAGE_QUEUE_MP_EXTRACT_PROXY    =  2,
-  POSIX_MESSAGE_QUEUE_MP_OBTAIN_REQUEST   =  3,
-  POSIX_MESSAGE_QUEUE_MP_OBTAIN_RESPONSE  =  4,
-  POSIX_MESSAGE_QUEUE_MP_RELEASE_REQUEST  =  5,
-  POSIX_MESSAGE_QUEUE_MP_RELEASE_RESPONSE =  6,
-}   POSIX_Message_queue_MP_Remote_operations;
-
-/*
- *  The following data structure defines the packet used to perform
- *  remote message queue operations.
- */
-
-typedef struct {
-  MP_packet_Prefix                          Prefix;
-  POSIX_Message_queue_MP_Remote_operations  operation;
-  Objects_Name                              name;
-  boolean                                   wait;  /* XXX options */
-  Objects_Id                                proxy_id;
-}   POSIX_Message_queue_MP_Packet;
-
-/*
- *  _POSIX_Message_queue_MP_Send_process_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs a remote procedure call so that a
- *  process operation can be performed on another node.
- */
-
-void _POSIX_Message_queue_MP_Send_process_packet (
-  POSIX_Message_queue_MP_Remote_operations  operation,
-  Objects_Id                        mq_id,
-  Objects_Name                      name,
-  Objects_Id                        proxy_id
-);
-
-/*
- *  _POSIX_Message_queue_MP_Send_request_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs a remote procedure call so that a
- *  directive operation can be initiated on another node.
- */
-
-int _POSIX_Message_queue_MP_Send_request_packet (
-  POSIX_Message_queue_MP_Remote_operations  operation,
-  Objects_Id                                mq_id,
-  boolean                                   wait,  /* XXX options */
-  Watchdog_Interval                         timeout
-);
-
-/*
- *  _POSIX_Message_queue_MP_Send_response_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs a remote procedure call so that a
- *  directive can be performed on another node.
- */
-
-void _POSIX_Message_queue_MP_Send_response_packet (
-  POSIX_Message_queue_MP_Remote_operations  operation,
-  Objects_Id                        mq_id,
-  Thread_Control                   *the_thread
-);
-
-/*
- *
- *  _POSIX_Message_queue_MP_Process_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs the actions specific to this package for
- *  the request from another node.
- */
-
-void _POSIX_Message_queue_MP_Process_packet (
-  MP_packet_Prefix *the_packet_prefix
-);
-
-/*
- *  _POSIX_Message_queue_MP_Send_object_was_deleted
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked indirectly by the thread queue
- *  when a proxy has been removed from the thread queue and
- *  the remote node must be informed of this.
- */
-
-void _POSIX_Message_queue_MP_Send_object_was_deleted (
-  Thread_Control *the_proxy
-);
-
-/*
- *  _POSIX_Message_queue_MP_Send_extract_proxy
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked when a task is deleted and it
- *  has a proxy which must be removed from a thread queue and
- *  the remote node must be informed of this.
- */
-
-void _POSIX_Message_queue_MP_Send_extract_proxy (
-  Thread_Control *the_thread
-);
-
-/*
- *  _POSIX_Message_queue_MP_Get_packet
- *
- *  DESCRIPTION:
- *
- *  This function is used to obtain a message queue mp packet.
- */
-
-POSIX_Message_queue_MP_Packet *_POSIX_Message_queue_MP_Get_packet ( void );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of file */
diff --git a/c/src/exec/posix/include/rtems/posix/mutex.h b/c/src/exec/posix/include/rtems/posix/mutex.h
deleted file mode 100644
index e6c5c44d39..0000000000
--- a/c/src/exec/posix/include/rtems/posix/mutex.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/*  rtems/posix/mutex.h
- *
- *  This include file contains all the private support information for
- *  POSIX mutex's.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
- 
-#ifndef __RTEMS_POSIX_MUTEX_h
-#define __RTEMS_POSIX_MUTEX_h
- 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/coremutex.h>
-#include <pthread.h>
-
-/*
- *  Data Structure used to manage a POSIX mutex
- */
- 
-typedef struct {
-   Objects_Control     Object;
-   int                 process_shared;
-   CORE_mutex_Control  Mutex;
-}  POSIX_Mutex_Control;
-
-/*
- *  The following defines the information control block used to manage
- *  this class of objects.
- */
- 
-POSIX_EXTERN Objects_Information  _POSIX_Mutex_Information;
- 
-/*
- *  _POSIX_Mutex_Manager_initialization
- *
- *  DESCRIPTION:
- *
- *  This routine performs the initialization necessary for this manager.
- */
- 
-void _POSIX_Mutex_Manager_initialization(
-  unsigned32 maximum_mutexes
-);
- 
-/*
- *  _POSIX_Mutex_Allocate
- *
- *  DESCRIPTION:
- *
- *  This function allocates a mutexes control block from
- *  the inactive chain of free mutexes control blocks.
- */
- 
-RTEMS_INLINE_ROUTINE POSIX_Mutex_Control *_POSIX_Mutex_Allocate( void );
- 
-/*
- *  _POSIX_Mutex_Free
- *
- *  DESCRIPTION:
- *
- *  This routine frees a mutexes control block to the
- *  inactive chain of free mutexes control blocks.
- */
- 
-RTEMS_INLINE_ROUTINE void _POSIX_Mutex_Free (
-  POSIX_Mutex_Control *the_mutex
-);
- 
-/*
- *  _POSIX_Mutex_Get
- *
- *  DESCRIPTION:
- *
- *  This function maps mutexes IDs to mutexes control blocks.
- *  If ID corresponds to a local mutexes, then it returns
- *  the_mutex control pointer which maps to ID and location
- *  is set to OBJECTS_LOCAL.  if the mutexes ID is global and
- *  resides on a remote node, then location is set to OBJECTS_REMOTE,
- *  and the_mutex is undefined.  Otherwise, location is set
- *  to OBJECTS_ERROR and the_mutex is undefined.
- */
- 
-RTEMS_INLINE_ROUTINE POSIX_Mutex_Control *_POSIX_Mutex_Get (
-  Objects_Id        *id,
-  Objects_Locations *location
-);
- 
-/*
- *  _POSIX_Mutex_Is_null
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the_mutex is NULL and FALSE otherwise.
- */
- 
-RTEMS_INLINE_ROUTINE boolean _POSIX_Mutex_Is_null (
-  POSIX_Mutex_Control *the_mutex
-);
-
-#include <rtems/posix/mutex.inl>
-#include <rtems/posix/mutexmp.h>
-
-#ifdef __cplusplus
-}
-#endif
- 
-#endif
-/*  end of include file */
-
diff --git a/c/src/exec/posix/include/rtems/posix/mutexmp.h b/c/src/exec/posix/include/rtems/posix/mutexmp.h
deleted file mode 100644
index 71f60677eb..0000000000
--- a/c/src/exec/posix/include/rtems/posix/mutexmp.h
+++ /dev/null
@@ -1,161 +0,0 @@
-/*  mutexmp.h
- *
- *  This include file contains all the constants and structures associated
- *  with the Multiprocessing Support in the POSIX Mutex Manager.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_POSIX_MUTEX_MP_h
-#define __RTEMS_POSIX_MUTEX_MP_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/mppkt.h>
-#include <rtems/score/object.h>
-#include <rtems/score/thread.h>
-#include <rtems/score/watchdog.h>
-
-/*
- *  The following enumerated type defines the list of
- *  remote mutex operations.
- */
-
-typedef enum {
-  POSIX_MUTEX_MP_ANNOUNCE_CREATE  =  0,
-  POSIX_MUTEX_MP_ANNOUNCE_DELETE  =  1,
-  POSIX_MUTEX_MP_EXTRACT_PROXY    =  2,
-  POSIX_MUTEX_MP_OBTAIN_REQUEST   =  3,
-  POSIX_MUTEX_MP_OBTAIN_RESPONSE  =  4,
-  POSIX_MUTEX_MP_RELEASE_REQUEST  =  5,
-  POSIX_MUTEX_MP_RELEASE_RESPONSE =  6,
-}   POSIX_Mutex_MP_Remote_operations;
-
-/*
- *  The following data structure defines the packet used to perform
- *  remote mutex operations.
- */
-
-typedef struct {
-  MP_packet_Prefix                  Prefix;
-  POSIX_Mutex_MP_Remote_operations  operation;
-  Objects_Name                      name;
-  boolean                           wait;  /* XXX options */
-  Objects_Id                        proxy_id;
-}   POSIX_Mutex_MP_Packet;
-
-/*
- *  _POSIX_Mutex_MP_Send_process_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs a remote procedure call so that a
- *  process operation can be performed on another node.
- */
-
-void _POSIX_Mutex_MP_Send_process_packet (
-  POSIX_Mutex_MP_Remote_operations  operation,
-  Objects_Id                        mutex_id,
-  Objects_Name                      name,
-  Objects_Id                        proxy_id
-);
-
-/*
- *  _POSIX_Mutex_MP_Send_request_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs a remote procedure call so that a
- *  directive operation can be initiated on another node.
- */
-
-int _POSIX_Mutex_MP_Send_request_packet (
-  POSIX_Mutex_MP_Remote_operations  operation,
-  Objects_Id                        mutex_id,
-  boolean                           wait,  /* XXX options */
-  Watchdog_Interval                 timeout
-);
-
-/*
- *  _POSIX_Mutex_MP_Send_response_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs a remote procedure call so that a
- *  directive can be performed on another node.
- */
-
-void _POSIX_Mutex_MP_Send_response_packet (
-  POSIX_Mutex_MP_Remote_operations  operation,
-  Objects_Id                        mutex_id,
-  Thread_Control                   *the_thread
-);
-
-/*
- *
- *  _POSIX_Mutex_MP_Process_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs the actions specific to this package for
- *  the request from another node.
- */
-
-void _POSIX_Mutex_MP_Process_packet (
-  MP_packet_Prefix *the_packet_prefix
-);
-
-/*
- *  _POSIX_Mutex_MP_Send_object_was_deleted
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked indirectly by the thread queue
- *  when a proxy has been removed from the thread queue and
- *  the remote node must be informed of this.
- */
-
-void _POSIX_Mutex_MP_Send_object_was_deleted (
-  Thread_Control *the_proxy
-);
-
-/*
- *  _POSIX_Mutex_MP_Send_extract_proxy
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked when a task is deleted and it
- *  has a proxy which must be removed from a thread queue and
- *  the remote node must be informed of this.
- */
-
-void _POSIX_Mutex_MP_Send_extract_proxy (
-  Thread_Control *the_thread
-);
-
-/*
- *  _POSIX_Mutex_MP_Get_packet
- *
- *  DESCRIPTION:
- *
- *  This function is used to obtain a mutex mp packet.
- */
-
-POSIX_Mutex_MP_Packet *_POSIX_Mutex_MP_Get_packet ( void );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of file */
diff --git a/c/src/exec/posix/include/rtems/posix/posixapi.h b/c/src/exec/posix/include/rtems/posix/posixapi.h
deleted file mode 100644
index f7c52985c3..0000000000
--- a/c/src/exec/posix/include/rtems/posix/posixapi.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- *  POSIX API Support
- *
- *  NOTE:
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
- 
-#ifndef __POSIX_API_h
-#define __POSIX_API_h
- 
-#include <rtems/config.h>
-
-/*PAGE
- *
- *  _POSIX_API_Initialize
- *
- *  XXX
- */
- 
-void _POSIX_API_Initialize(
-  rtems_configuration_table *configuration_table
-);
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/posix/include/rtems/posix/priority.h b/c/src/exec/posix/include/rtems/posix/priority.h
deleted file mode 100644
index c0253f3bab..0000000000
--- a/c/src/exec/posix/include/rtems/posix/priority.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- *
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_POSIX_PRIORITY_h
-#define __RTEMS_POSIX_PRIORITY_h
-
-#include <rtems/score/priority.h>
-
-/*
- *  1003.1b-1993,2.2.2.80 definition of priority, p. 19
- *
- *  "Numericallly higher values represent higher priorities."
- *
- *  Thus, RTEMS Core has priorities run in the opposite sense of the POSIX API.
- *
- *  There are only 254 posix priority levels since a task at priority level
- *  255 would never run because of the RTEMS idle task.  This is necessary
- *  because GNAT maps the lowest Ada task priority to the lowest thread
- *  priority.  The lowest priority Ada task should get to run, so there is
- *  a fundamental conflict with having 255 priorities.
- */
-
-#define POSIX_SCHEDULER_MAXIMUM_PRIORITY (254)
-  
-#define POSIX_SCHEDULER_MINIMUM_PRIORITY (1)
-
-RTEMS_INLINE_ROUTINE boolean _POSIX_Priority_Is_valid(
-  int priority
-);
-
-RTEMS_INLINE_ROUTINE Priority_Control _POSIX_Priority_To_core(
-  int priority
-);
-
-RTEMS_INLINE_ROUTINE int _POSIX_Priority_From_core(
-  Priority_Control priority
-);
-
-#include <rtems/posix/priority.inl>
-
-#endif
diff --git a/c/src/exec/posix/include/rtems/posix/psignal.h b/c/src/exec/posix/include/rtems/posix/psignal.h
deleted file mode 100644
index 4ecba1f41c..0000000000
--- a/c/src/exec/posix/include/rtems/posix/psignal.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- *  $Id$
- */
-
-#ifndef __RTEMS_POSIX_SIGNALS_h
-#define __RTEMS_POSIX_SIGNALS_h
-
-typedef struct {
-  Chain_Node  Node;
-  siginfo_t   Info;
-}  POSIX_signals_Siginfo_node;
-
-void _POSIX_signals_Manager_Initialization(
-  int  maximum_queued_signals
-);
-
-void _POSIX_signals_Post_switch_extension(
-  Thread_Control  *the_thread
-);
-
-#endif
-/* end of file */
diff --git a/c/src/exec/posix/include/rtems/posix/pthread.h b/c/src/exec/posix/include/rtems/posix/pthread.h
deleted file mode 100644
index abf5933fc2..0000000000
--- a/c/src/exec/posix/include/rtems/posix/pthread.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/*  rtems/posix/pthread.h
- *
- *  This include file contains all the private support information for
- *  POSIX threads.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
- 
-#ifndef __RTEMS_POSIX_THREADS_h
-#define __RTEMS_POSIX_THREADS_h
- 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/posix/config.h>
-#include <rtems/posix/threadsup.h>
-
-#define PTHREAD_MINIMUM_STACK_SIZE (STACK_MINIMUM_SIZE * 2)
-
-/*
- *  The following defines the information control block used to manage
- *  this class of objects.
- */
- 
-POSIX_EXTERN Objects_Information  _POSIX_Threads_Information;
-
-/*
- *  These are used to manage the user initialization threads.
- */
- 
-POSIX_EXTERN posix_initialization_threads_table 
-                   *_POSIX_Threads_User_initialization_threads;
-POSIX_EXTERN unsigned32   _POSIX_Threads_Number_of_initialization_threads;
-
- 
-/*
- *  _POSIX_Threads_Manager_initialization
- *
- *  DESCRIPTION:
- *
- *  This routine performs the initialization necessary for this manager.
- */
- 
-void _POSIX_Threads_Manager_initialization(
-  unsigned32                          maximum_pthreads,
-  unsigned32                          number_of_initialization_threads,
-  posix_initialization_threads_table *user_threads
-);
- 
-/*
- *  _POSIX_Threads_Allocate
- *
- *  DESCRIPTION:
- *
- *  This function allocates a pthread control block from
- *  the inactive chain of free pthread control blocks.
- */
- 
-RTEMS_INLINE_ROUTINE Thread_Control *_POSIX_Threads_Allocate( void );
- 
-/*
- *  _POSIX_Threads_Free
- *
- *  DESCRIPTION:
- *
- *  This routine frees a pthread control block to the
- *  inactive chain of free pthread control blocks.
- */
- 
-RTEMS_INLINE_ROUTINE void _POSIX_Threads_Free(
-  Thread_Control *the_pthread
-);
- 
-/*
- *  _POSIX_Threads_Get
- *
- *  DESCRIPTION:
- *
- *  This function maps pthread IDs to pthread control blocks.
- *  If ID corresponds to a local pthread, then it returns
- *  the_pthread control pointer which maps to ID and location
- *  is set to OBJECTS_LOCAL.  if the pthread ID is global and
- *  resides on a remote node, then location is set to OBJECTS_REMOTE,
- *  and the_pthread is undefined.  Otherwise, location is set
- *  to OBJECTS_ERROR and the_pthread is undefined.
- */
- 
-RTEMS_INLINE_ROUTINE Thread_Control *_POSIX_Threads_Get(
-  pthread_t          id,
-  Objects_Locations *location
-);
- 
-/*
- *  _POSIX_Threads_Is_null
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the_pthread is NULL and FALSE otherwise.
- */
- 
-RTEMS_INLINE_ROUTINE boolean _POSIX_Threads_Is_null(
-  Thread_Control *the_pthread
-);
-
-#include <rtems/posix/pthread.inl>
-#include <rtems/posix/pthreadmp.h>
-
-#ifdef __cplusplus
-}
-#endif
- 
-#endif
-/*  end of include file */
-
diff --git a/c/src/exec/posix/include/rtems/posix/pthreadmp.h b/c/src/exec/posix/include/rtems/posix/pthreadmp.h
deleted file mode 100644
index af5997ead7..0000000000
--- a/c/src/exec/posix/include/rtems/posix/pthreadmp.h
+++ /dev/null
@@ -1,161 +0,0 @@
-/*  pthreadmp.h
- *
- *  This include file contains all the constants and structures associated
- *  with the Multiprocessing Support in the POSIX Threads Manager.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_POSIX_THREADS_MP_h
-#define __RTEMS_POSIX_THREADS_MP_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/mppkt.h>
-#include <rtems/score/object.h>
-#include <rtems/score/thread.h>
-#include <rtems/score/watchdog.h>
-
-/*
- *  The following enumerated type defines the list of
- *  remote pthread operations.
- */
-
-typedef enum {
-  POSIX_THREADS_MP_ANNOUNCE_CREATE  =  0,
-  POSIX_THREADS_MP_ANNOUNCE_DELETE  =  1,
-  POSIX_THREADS_MP_EXTRACT_PROXY    =  2,
-  POSIX_THREADS_MP_OBTAIN_REQUEST   =  3,
-  POSIX_THREADS_MP_OBTAIN_RESPONSE  =  4,
-  POSIX_THREADS_MP_RELEASE_REQUEST  =  5,
-  POSIX_THREADS_MP_RELEASE_RESPONSE =  6
-}   POSIX_Threads_MP_Remote_operations;
-
-/*
- *  The following data structure defines the packet used to perform
- *  remote pthread operations.
- */
-
-typedef struct {
-  MP_packet_Prefix                    Prefix;
-  POSIX_Threads_MP_Remote_operations  operation;
-  Objects_Name                        name;
-  boolean                             wait;
-  Objects_Id                          proxy_id;
-}   POSIX_Threads_MP_Packet;
-
-/*
- *  _POSIX_Threads_MP_Send_process_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs a remote procedure call so that a
- *  process operation can be performed on another node.
- */
-
-void _POSIX_Threads_MP_Send_process_packet (
-  POSIX_Threads_MP_Remote_operations  operation,
-  Objects_Id                          pthread_id,
-  Objects_Name                        name,
-  Objects_Id                          proxy_id
-);
-
-/*
- *  _POSIX_Threads_MP_Send_request_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs a remote procedure call so that a
- *  directive operation can be initiated on another node.
- */
-
-int _POSIX_Threads_MP_Send_request_packet (
-  POSIX_Threads_MP_Remote_operations  operation,
-  Objects_Id                          pthread_id,
-  boolean                             wait,
-  Watchdog_Interval                   timeout
-);
-
-/*
- *  _POSIX_Threads_MP_Send_response_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs a remote procedure call so that a
- *  directive can be performed on another node.
- */
-
-void _POSIX_Threads_MP_Send_response_packet (
-  POSIX_Threads_MP_Remote_operations   operation,
-  Objects_Id                           pthread_id,
-  Thread_Control                      *the_thread
-);
-
-/*
- *
- *  _POSIX_Threads_MP_Process_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs the actions specific to this package for
- *  the request from another node.
- */
-
-void _POSIX_Threads_MP_Process_packet (
-  MP_packet_Prefix *the_packet_prefix
-);
-
-/*
- *  _POSIX_Threads_MP_Send_object_was_deleted
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked indirectly by the thread queue
- *  when a proxy has been removed from the thread queue and
- *  the remote node must be informed of this.
- */
-
-void _POSIX_Threads_MP_Send_object_was_deleted (
-  Thread_Control *the_proxy
-);
-
-/*
- *  _POSIX_Threads_MP_Send_extract_proxy
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked when a task is deleted and it
- *  has a proxy which must be removed from a thread queue and
- *  the remote node must be informed of this.
- */
-
-void _POSIX_Threads_MP_Send_extract_proxy (
-  Thread_Control *the_thread
-);
-
-/*
- *  _POSIX_Threads_MP_Get_packet
- *
- *  DESCRIPTION:
- *
- *  This function is used to obtain a pthread mp packet.
- */
-
-POSIX_Threads_MP_Packet *_POSIX_Threads_MP_Get_packet ( void );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of file */
diff --git a/c/src/exec/posix/include/rtems/posix/semaphore.h b/c/src/exec/posix/include/rtems/posix/semaphore.h
deleted file mode 100644
index cc658ee32b..0000000000
--- a/c/src/exec/posix/include/rtems/posix/semaphore.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/*  rtems/posix/semaphore.h
- *
- *  This include file contains all the private support information for
- *  POSIX Semaphores.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
- 
-#ifndef __RTEMS_POSIX_SEMAPHORE_h
-#define __RTEMS_POSIX_SEMAPHORE_h
- 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/coresem.h>
-
-/*
- *  Data Structure used to manage a POSIX semaphore
- */
- 
-typedef struct {
-   Objects_Control         Object;
-   int                     process_shared;
-   boolean                 named;
-   boolean                 linked;
-   unsigned32              open_count;
-   CORE_semaphore_Control  Semaphore;
-}  POSIX_Semaphore_Control;
-
-/*
- *  The following defines the information control block used to manage
- *  this class of objects.
- */
- 
-POSIX_EXTERN Objects_Information  _POSIX_Semaphore_Information;
- 
-/*
- *  _POSIX_Semaphore_Manager_initialization
- *
- *  DESCRIPTION:
- *
- *  This routine performs the initialization necessary for this manager.
- */
- 
-void _POSIX_Semaphore_Manager_initialization(
-  unsigned32 maximum_semaphorees
-);
- 
-/*
- *  _POSIX_Semaphore_Allocate
- *
- *  DESCRIPTION:
- *
- *  This function allocates a semaphore control block from
- *  the inactive chain of free semaphore control blocks.
- */
- 
-RTEMS_INLINE_ROUTINE POSIX_Semaphore_Control *_POSIX_Semaphore_Allocate( void );
- 
-/*
- *  _POSIX_Semaphore_Free
- *
- *  DESCRIPTION:
- *
- *  This routine frees a semaphore control block to the
- *  inactive chain of free semaphore control blocks.
- */
- 
-RTEMS_INLINE_ROUTINE void _POSIX_Semaphore_Free (
-  POSIX_Semaphore_Control *the_semaphore
-);
- 
-/*
- *  _POSIX_Semaphore_Get
- *
- *  DESCRIPTION:
- *
- *  This function maps semaphore IDs to semaphore control blocks.
- *  If ID corresponds to a local semaphore, then it returns
- *  the_semaphore control pointer which maps to ID and location
- *  is set to OBJECTS_LOCAL.  if the semaphore ID is global and
- *  resides on a remote node, then location is set to OBJECTS_REMOTE,
- *  and the_semaphore is undefined.  Otherwise, location is set
- *  to OBJECTS_ERROR and the_semaphore is undefined.
- */
- 
-RTEMS_INLINE_ROUTINE POSIX_Semaphore_Control *_POSIX_Semaphore_Get (
-  Objects_Id        *id,
-  Objects_Locations *location
-);
- 
-/*
- *  _POSIX_Semaphore_Is_null
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the_semaphore is NULL and FALSE otherwise.
- */
- 
-RTEMS_INLINE_ROUTINE boolean _POSIX_Semaphore_Is_null (
-  POSIX_Semaphore_Control *the_semaphore
-);
-
-/*
- *  _POSIX_Semaphore_Name_to_id
- *
- *  DESCRIPTION:
- *
- *  XXX
- */
-
-int _POSIX_Semaphore_Name_to_id(
-  const char          *name,
-  Objects_Id          *id
-);
-
-#include <rtems/posix/semaphore.inl>
-#include <rtems/posix/semaphoremp.h>
-
-#ifdef __cplusplus
-}
-#endif
- 
-#endif
-/*  end of include file */
-
diff --git a/c/src/exec/posix/include/rtems/posix/semaphoremp.h b/c/src/exec/posix/include/rtems/posix/semaphoremp.h
deleted file mode 100644
index 14af483f98..0000000000
--- a/c/src/exec/posix/include/rtems/posix/semaphoremp.h
+++ /dev/null
@@ -1,161 +0,0 @@
-/*  semaphoremp.h
- *
- *  This include file contains all the constants and structures associated
- *  with the Multiprocessing Support in the POSIX Semaphore Manager.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_POSIX_SEMAPHORE_MP_h
-#define __RTEMS_POSIX_SEMAPHORE_MP_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/mppkt.h>
-#include <rtems/score/object.h>
-#include <rtems/score/thread.h>
-#include <rtems/score/watchdog.h>
-
-/*
- *  The following enumerated type defines the list of
- *  remote semaphore operations.
- */
-
-typedef enum {
-  POSIX_SEMAPHORE_MP_ANNOUNCE_CREATE  =  0,
-  POSIX_SEMAPHORE_MP_ANNOUNCE_DELETE  =  1,
-  POSIX_SEMAPHORE_MP_EXTRACT_PROXY    =  2,
-  POSIX_SEMAPHORE_MP_OBTAIN_REQUEST   =  3,
-  POSIX_SEMAPHORE_MP_OBTAIN_RESPONSE  =  4,
-  POSIX_SEMAPHORE_MP_RELEASE_REQUEST  =  5,
-  POSIX_SEMAPHORE_MP_RELEASE_RESPONSE =  6,
-}   POSIX_Semaphore_MP_Remote_operations;
-
-/*
- *  The following data structure defines the packet used to perform
- *  remote semaphore operations.
- */
-
-typedef struct {
-  MP_packet_Prefix                      Prefix;
-  POSIX_Semaphore_MP_Remote_operations  operation;
-  Objects_Name                          name;
-  boolean                               wait;  /* XXX options */
-  Objects_Id                            proxy_id;
-}   POSIX_Semaphore_MP_Packet;
-
-/*
- *  _POSIX_Semaphore_MP_Send_process_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs a remote procedure call so that a
- *  process operation can be performed on another node.
- */
-
-void _POSIX_Semaphore_MP_Send_process_packet (
-  POSIX_Semaphore_MP_Remote_operations  operation,
-  Objects_Id                            semaphore_id,
-  Objects_Name                          name,
-  Objects_Id                            proxy_id
-);
-
-/*
- *  _POSIX_Semaphore_MP_Send_request_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs a remote procedure call so that a
- *  directive operation can be initiated on another node.
- */
-
-int _POSIX_Semaphore_MP_Send_request_packet (
-  POSIX_Semaphore_MP_Remote_operations  operation,
-  Objects_Id                            semaphore_id,
-  boolean                               wait,  /* XXX options */
-  Watchdog_Interval                     timeout
-);
-
-/*
- *  _POSIX_Semaphore_MP_Send_response_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs a remote procedure call so that a
- *  directive can be performed on another node.
- */
-
-void _POSIX_Semaphore_MP_Send_response_packet (
-  POSIX_Semaphore_MP_Remote_operations  operation,
-  Objects_Id                        semaphore_id,
-  Thread_Control                   *the_thread
-);
-
-/*
- *
- *  _POSIX_Semaphore_MP_Process_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs the actions specific to this package for
- *  the request from another node.
- */
-
-void _POSIX_Semaphore_MP_Process_packet (
-  MP_packet_Prefix *the_packet_prefix
-);
-
-/*
- *  _POSIX_Semaphore_MP_Send_object_was_deleted
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked indirectly by the thread queue
- *  when a proxy has been removed from the thread queue and
- *  the remote node must be informed of this.
- */
-
-void _POSIX_Semaphore_MP_Send_object_was_deleted (
-  Thread_Control *the_proxy
-);
-
-/*
- *  _POSIX_Semaphore_MP_Send_extract_proxy
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked when a task is deleted and it
- *  has a proxy which must be removed from a thread queue and
- *  the remote node must be informed of this.
- */
-
-void _POSIX_Semaphore_MP_Send_extract_proxy (
-  Thread_Control *the_thread
-);
-
-/*
- *  _POSIX_Semaphore_MP_Get_packet
- *
- *  DESCRIPTION:
- *
- *  This function is used to obtain a semaphore mp packet.
- */
-
-POSIX_Semaphore_MP_Packet *_POSIX_Semaphore_MP_Get_packet ( void );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of file */
diff --git a/c/src/exec/posix/include/rtems/posix/seterr.h b/c/src/exec/posix/include/rtems/posix/seterr.h
deleted file mode 100644
index 85311cfd8c..0000000000
--- a/c/src/exec/posix/include/rtems/posix/seterr.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
- 
-#ifndef __POSIX_SET_ERRNO_h
-#define __POSIX_SET_ERRNO_h
- 
-#define set_errno_and_return_minus_one( _error ) \
-  { errno = (_error); return -1; }
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/posix/include/rtems/posix/threadsup.h b/c/src/exec/posix/include/rtems/posix/threadsup.h
deleted file mode 100644
index bb800a507f..0000000000
--- a/c/src/exec/posix/include/rtems/posix/threadsup.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* threadsup.h
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_POSIX_THREAD_SUPPORT_h
-#define __RTEMS_POSIX_THREAD_SUPPORT_h
-
-#include <rtems/score/coresem.h>
-#include <rtems/score/tqdata.h>
-
-typedef struct {
-  pthread_attr_t          Attributes;
-  int                     detachstate;
-  Thread_queue_Control    Join_List;
-  int                     schedpolicy;
-  struct sched_param      schedparam;
-  int                     ss_high_priority;
-  Watchdog_Control        Sporadic_timer;
-
-  sigset_t                signals_blocked;
-  sigset_t                signals_pending;
-
-#if 0
-  /*
-   *  POSIX Interrupts 
-   */
-  unsigned32              interrupts_installed;
-  CORE_semaphore_Control  Interrupt_Semaphore;
-#endif
-
-#if 0
-  /*
-   *  POSIX Cancelability 
-   */
-  int                     cancelability_state;
-  int                     cancelability_type;
-  int                     cancelation_requested;
-  Chain_Control           Cancellation_Handlers;
-#endif
-
-} POSIX_API_Control;
-
-#endif
-/* end of include file */
-
diff --git a/c/src/exec/posix/include/rtems/posix/time.h b/c/src/exec/posix/include/rtems/posix/time.h
deleted file mode 100644
index 0e87db388e..0000000000
--- a/c/src/exec/posix/include/rtems/posix/time.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- *
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_POSIX_TIME_h
-#define __RTEMS_POSIX_TIME_h
-
-#include <rtems/score/tod.h>
-
-/*
- *  Seconds from January 1, 1970 to January 1, 1988.  Used to account for
- *  differences between POSIX API and RTEMS core.
- */
- 
-#define POSIX_TIME_SECONDS_1970_THROUGH_1988 \
-  (((1987 - 1970 + 1)  * TOD_SECONDS_PER_NON_LEAP_YEAR) + \
-  (4 * TOD_SECONDS_PER_DAY))
-
-/*PAGE
- *
- *  _POSIX_Timespec_subtract
- */
- 
-void _POSIX_Timespec_subtract(
-  const struct timespec *the_start,
-  const struct timespec *end,
-  struct timespec *result
-);
-
-/*
- *  _POSIX_Timespec_to_interval
- */
-
-Watchdog_Interval _POSIX_Timespec_to_interval(
-  const struct timespec *time
-);
-
-/*PAGE
- *
- *  _POSIX_Interval_to_timespec
- */
- 
-void _POSIX_Interval_to_timespec(
-  Watchdog_Interval  ticks,
-  struct timespec   *time
-);
-
-#endif
diff --git a/c/src/exec/posix/include/sched.h b/c/src/exec/posix/include/sched.h
deleted file mode 100644
index 14a603c0c5..0000000000
--- a/c/src/exec/posix/include/sched.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*  sched.h
- *
- *  $Id$
- */
-
-
-#ifndef __POSIX_SCHEDULING_h
-#define __POSIX_SCHEDULING_h
-
-#include <sys/features.h>
-
-#if defined(_POSIX_PRIORITY_SCHEDULING)
-
-#include <sys/types.h>
-#include <time.h>
-#include <sys/sched.h>
-#include <pthread.h>
-
-/*
- *  13.3.1 Set Scheduling Parameters, P1003.1b-1993, p. 252
- *
- */
-
-int sched_setparam(
-  pid_t                     pid,
-  const struct sched_param *param
-);
-
-/*
- *  13.3.2 Set Scheduling Parameters, P1003.1b-1993, p. 253
- */
-
-int sched_getparam(
-  pid_t                     pid,
-  const struct sched_param *param
-);
-
-/*
- *  13.3.3 Set Scheduling Policy and Scheduling Parameters, 
- *         P1003.1b-1993, p. 254
- */
-
-int sched_setscheduler(
-  pid_t                     pid,
-  int                       policy,
-  const struct sched_param *param
-);
-
-/*
- *  13.3.4 Get Scheduling Policy, P1003.1b-1993, p. 256
- */
-
-int sched_getscheduler(
-  pid_t                     pid
-);
-
-/*
- *  13.3.6 Get Scheduling Parameter Limits, P1003.1b-1993, p. 258
- */
-
-int sched_get_priority_max(
-  int  policy
-);
-
-int sched_get_priority_min(
-  int  policy
-);
-
-int sched_rr_get_interval(
-  pid_t             pid,
-  struct timespec  *interval
-);
-
-#endif /* _POSIX_PRIORITY_SCHEDULING */
-
-#if defined(_POSIX_THREADS) || defined(_POSIX_PRIORITY_SCHEDULING)
-
-/*
- *  13.3.5 Yield Processor, P1003.1b-1993, p. 257
- */
-
-int sched_yield( void );
-
-#endif /* _POSIX_THREADS or _POSIX_PRIORITY_SCHEDULING */
-
-#endif
-/* end of include file */
-
diff --git a/c/src/exec/posix/include/semaphore.h b/c/src/exec/posix/include/semaphore.h
deleted file mode 100644
index 0388f91ad9..0000000000
--- a/c/src/exec/posix/include/semaphore.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/*  semaphore.h
- *
- *  $Id$
- */
-
-#ifndef __POSIX_SEMAPHORE_h
-#define __POSIX_SEMAPHORE_h
-
-#include <rtems/posix/features.h>
-
-#if defined(_POSIX_SEMAPHORES)
-
-#include <sys/time.h>
-
-/*
- *  11.1 Semaphore Characteristics, P1003.1b-1993, p.219
- */
-
-typedef int sem_t;
-
-/*
- *  11.2.1 Initialize an Unnamed Semaphore, P1003.1b-1993, p.219
- */
-
-int sem_init(
-  sem_t         *sem,
-  int            pshared,
-  unsigned int   value
-);
-
-/*
- *  11.2.2 Destroy an Unnamed Semaphore, P1003.1b-1993, p.220
- */
-
-int sem_destroy(
-  sem_t *sem
-);
-
-/*
- *  11.2.3 Initialize/Open a Named Semaphore, P1003.1b-1993, p.221
- *
- *  NOTE: Follows open() calling conventions.
- */
-
-sem_t *sem_open(
-  const char *name,
-  int         oflag,
-  ...
-);
-
-/*
- *  11.2.4 Close a Named Semaphore, P1003.1b-1993, p.224
- */
-
-int sem_close(
-  sem_t *sem
-);
-
-/*
- *  11.2.5 Remove a Named Semaphore, P1003.1b-1993, p.225
- */
-
-int sem_unlink(
-  const char *name
-);
-
-/*
- *  11.2.6 Lock a Semaphore, P1003.1b-1993, p.226
- *
- *  NOTE: P1003.4b/D8 adds sem_timedwait(), p. 27
- */
-
-int sem_wait(
-  sem_t *sem
-);
-
-int sem_trywait(
-  sem_t *sem
-);
-
-#if defined(_POSIX_TIMEOUTS)
-int sem_timedwait(
-  sem_t                 *sem,
-  const struct timespec *timeout
-);
-#endif
-
-/*
- *  11.2.7 Unlock a Semaphore, P1003.1b-1993, p.227
- */
-
-int sem_post(
-  sem_t  *sem
-);
-
-/*
- *  11.2.8 Get the Value of a Semaphore, P1003.1b-1993, p.229
- */
-
-int sem_getvalue(
-  sem_t  *sem,
-  int    *sval
-);
-
-#endif   /* _POSIX_SEMAPHORES */
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/posix/include/sys/Makefile.in b/c/src/exec/posix/include/sys/Makefile.in
deleted file mode 100644
index d7d9281094..0000000000
--- a/c/src/exec/posix/include/sys/Makefile.in
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-#H_PIECES=utsname
-H_PIECES=
-H_FILES=$(H_PIECES:%=$(srcdir)/%.h)
-
-SRCS=$(H_FILES)
-
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-#
-# Add your list of files to delete here.  The config files
-#  already know how to delete some stuff, so you may want
-#  to just run 'make clean' first to see what gets missed.
-#  'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
-
-all:	$(SRCS)
-	$(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/sys
diff --git a/c/src/exec/posix/include/sys/utsname.h b/c/src/exec/posix/include/sys/utsname.h
deleted file mode 100644
index ca15230d40..0000000000
--- a/c/src/exec/posix/include/sys/utsname.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*  sys/utsname.h 
- *
- *  $Id$
- */
-
-#ifndef __POSIX_SYS_UTSNAME_h
-#define __POSIX_SYS_UTSNAME_h
-
-#include <sys/times.h>
-#include <sys/types.h>
-
-/*
- *  4.4.1 Get System Name (Table 4-1), P1003.1b-1993, p. 90
- *
- *  NOTE:  The lengths of the strings in this structure are 
- *         just long enough to reliably contain the RTEMS information.
- *         For example, the fields are not long enough to support 
- *         Internet hostnames.
- */
-
-struct utsname {
-  char sysname[ 32 ];  /* Name of this implementation of the operating system */
-  char nodename[ 32 ]; /* Name of this node within an implementation */
-                       /*   specified communication network */
-  char release[ 32 ];  /* Current release level of this implementation */
-  char version[ 32 ];  /* Current version level of this release */
-  char machine[ 32 ];  /* Name of the hardware type on which the system */
-                       /*   is running */
-};
-
-/*
- *  4.4.1 Get System Name, P1003.1b-1993, p. 90
- */
-
-int uname(
-  struct utsname *name
-);
-
-/*
- *  4.5.2 Get Process Times, P1003.1b-1993, p. 92
- */
-
-clock_t times(
-  struct tms   *buffer
-);
-
-#endif
-/* end of include file */
-
diff --git a/c/src/exec/posix/include/unistd.h b/c/src/exec/posix/include/unistd.h
deleted file mode 100644
index 0001ecc475..0000000000
--- a/c/src/exec/posix/include/unistd.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/* unistd.h
- *
- *  $Id$
- */
-
-#ifndef __POSIX_UNISTD_h
-#define __POSIX_UNISTD_h
-
-#include <rtems/posix/features.h>
-
-/*
- *  4.8.1 Get Configurable System Variables, P1003.1b-1993, p. 96
- *
- *  NOTE: Table 4-2, Configurable System Variables, p. 96
- */
-
-#define _SC_AIO_LISTIO_MAX          0
-#define _SC_AIO_MAX                 1
-#define _SC_AIO_PRIO_DELTA_MAX      2
-#define _SC_ARG_MAX                 3
-#define _SC_CHILD_MAX               4
-#define _SC_CLK_TCK                 5
-#define _SC_DELAYTIMER_MAX          6
-#define _SC_MQ_OPEN_MAX             7
-#define _SC_MQ_PRIO_MAX             8
-#define _SC_NGROUPS_MAX             9
-#define _SC_OPEN_MAX               10
-#define _SC_PAGESIZE               11
-#define _SC_RTSIG_MAX              12
-#define _SC_SEM_NSEMS_MAX          13
-#define _SC_SEM_VALUE_MAX          14
-#define _SC_SIGQUEUE_MAX           15
-#define _SC_STREAM_MAX             16
-#define _SC_TIMER_MAX              17
-#define _SC_TZNAME_MAX             18
-
-#define _SC_ASYNCHRONOUS_IO        19
-#define _SC_FSYNC                  20
-#define _SC_JOB_CONTROL            21
-#define _SC_MAPPED_FILES           22
-#define _SC_MEMLOCK                23
-#define _SC_MEMLOCK_RANGE          24
-#define _SC_MEMORY_PROTECTION      25
-#define _SC_MESSAGE_PASSING        26
-#define _SC_PRIORITIZED_IO         27
-#define _SC_REALTIME_SIGNALS       28
-#define _SC_SAVED_IDS              29
-#define _SC_SEMAPHORES             30
-#define _SC_SHARED_MEMORY_OBJECTS  31
-#define _SC_SYNCHRONIZED_IO        32
-#define _SC_TIMERS                 33
-#define _SC_VERSION                34
-
-/*
- *  P1003.1c/D10, p. 52 adds the following.
- */
-
-#define _SC_GETGR_R_SIZE_MAX             35
-#define _SC_GETPW_R_SIZE_MAX             36
-#define _SC_LOGIN_NAME_MAX               37
-#define _SC_THREAD_DESTRUCTOR_ITERATIONS 38
-#define _SC_THREAD_KEYS_MAX              39
-#define _SC_THREAD_STACK_MIN             40
-#define _SC_THREAD_THREADS_MAX           41
-#define _SC_TTY_NAME_MAX                 42
-
-#define _SC_THREADS                      43
-#define _SC_THREAD_ATTR_STACKADDR        44
-#define _SC_THREAD_ATTR_STACKSIZE        45
-#define _SC_THREAD_PRIORITY_SCHEDULING   46
-#define _SC_THREAD_PRIO_INHERIT          47
-#define _SC_THREAD_PRIO_CEILING          48
-#define _SC_THREAD_PROCESS_SHARED        49
-#define _SC_THREAD_SAFE_FUNCTIONS        50
-
-/* JRS: 04/02/98: _SC_THREAD_PRIO_CEILING seems to have changed names
- *                in the final standard to _SC_THREAD_PRIO_PROTECT.
- */
-
-/*
- *  4.8.1 Get Configurable System Variables, P1003.1b-1993, p. 95
- */
-
-long sysconf(
-  int name
-);
-
-#endif
-/* end of include */
diff --git a/c/src/exec/posix/include/wrap/Makefile.in b/c/src/exec/posix/include/wrap/Makefile.in
deleted file mode 100644
index 1d2e92cca0..0000000000
--- a/c/src/exec/posix/include/wrap/Makefile.in
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-#H_PIECES= aio devctl intr limits mqueue pthread sched semaphore \
-#    signal time unistd
-H_PIECES= pthread sched
-# limits.h may have been moved into newlib -- check before removing it
-# from the cvs tree
-H_FILES=$(H_PIECES:%=$(srcdir)/%.h)
-
-SRCS=$(H_FILES)
-
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-#
-# Add your list of files to delete here.  The config files
-#  already know how to delete some stuff, so you may want
-#  to just run 'make clean' first to see what gets missed.
-#  'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
-
-all:	$(SRCS)
-	$(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)
diff --git a/c/src/exec/posix/inline/rtems/posix/Makefile.in b/c/src/exec/posix/inline/rtems/posix/Makefile.in
deleted file mode 100644
index 0b0d64d1ef..0000000000
--- a/c/src/exec/posix/inline/rtems/posix/Makefile.in
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-#I_PIECES= cond intr key mqueue mutex pthread priority semaphore
-I_PIECES=cond key mutex pthread priority
-I_FILES=$(I_PIECES:%=$(srcdir)/%.inl)
-
-SRCS=$(I_FILES)
-
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-#
-# Add your list of files to delete here.  The config files
-#  already know how to delete some stuff, so you may want
-#  to just run 'make clean' first to see what gets missed.
-#  'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
-
-all:	$(SRCS)
-	$(INSTALL) -m 444 ${I_FILES} $(PROJECT_INCLUDE)/rtems/posix
diff --git a/c/src/exec/posix/inline/rtems/posix/cond.inl b/c/src/exec/posix/inline/rtems/posix/cond.inl
deleted file mode 100644
index 3a6741b1b8..0000000000
--- a/c/src/exec/posix/inline/rtems/posix/cond.inl
+++ /dev/null
@@ -1,77 +0,0 @@
-/*  rtems/posix/cond.inl
- *
- *  This include file contains the static inline implementation of the private 
- *  inlined routines for POSIX condition variables.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
- 
-#ifndef __RTEMS_POSIX_CONDITION_VARIABLES_inl
-#define __RTEMS_POSIX_CONDITION_VARIABLES_inl
- 
-/*PAGE
- *
- *  _POSIX_Condition_variables_Allocate
- */
- 
-RTEMS_INLINE_ROUTINE POSIX_Condition_variables_Control
-  *_POSIX_Condition_variables_Allocate( void )
-{
-  return (POSIX_Condition_variables_Control *) 
-    _Objects_Allocate( &_POSIX_Condition_variables_Information );
-}
- 
-/*PAGE
- *
- *  _POSIX_Condition_variables_Free
- */
- 
-RTEMS_INLINE_ROUTINE void _POSIX_Condition_variables_Free (
-  POSIX_Condition_variables_Control *the_condition_variable
-)
-{
-  _Objects_Free(
-    &_POSIX_Condition_variables_Information,
-    &the_condition_variable->Object
-  );
-}
- 
-/*PAGE
- *
- *  _POSIX_Condition_variables_Get
- */
- 
-RTEMS_INLINE_ROUTINE POSIX_Condition_variables_Control *_POSIX_Condition_variables_Get (
-  Objects_Id        *id,
-  Objects_Locations *location
-)
-{
-/* XXX really should validate pointer */
-/* XXX should support COND_INITIALIZER */
-  return (POSIX_Condition_variables_Control *)
-    _Objects_Get( &_POSIX_Condition_variables_Information, *id, location );
-}
- 
-/*PAGE
- *
- *  _POSIX_Condition_variables_Is_null
- */
- 
-RTEMS_INLINE_ROUTINE boolean _POSIX_Condition_variables_Is_null (
-  POSIX_Condition_variables_Control *the_condition_variable
-)
-{
-  return !the_condition_variable;
-}
-
-#endif
-/*  end of include file */
-
diff --git a/c/src/exec/posix/inline/rtems/posix/intr.inl b/c/src/exec/posix/inline/rtems/posix/intr.inl
deleted file mode 100644
index d084a1d12a..0000000000
--- a/c/src/exec/posix/inline/rtems/posix/intr.inl
+++ /dev/null
@@ -1,72 +0,0 @@
-/*  rtems/posix/intr.inl
- *
- *  This include file contains the static inline implementation of the private 
- *  inlined routines for POSIX Interrupt Manager
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
- 
-#ifndef __RTEMS_POSIX_INTERRUPT_inl
-#define __RTEMS_POSIX_INTERRUPT_inl
-
-/*PAGE
- *
- *  _POSIX_Interrupt_Allocate
- */
- 
-RTEMS_INLINE_ROUTINE POSIX_Interrupt_Handler_control *
-  _POSIX_Interrupt_Allocate( void )
-{
-  return (POSIX_Interrupt_Handler_control *) 
-    _Objects_Allocate( &_POSIX_Interrupt_Handlers_Information );
-}
- 
-/*PAGE
- *
- *  _POSIX_Interrupt_Free
- */
- 
-RTEMS_INLINE_ROUTINE void _POSIX_Interrupt_Free (
-  POSIX_Interrupt_Handler_control *the_intr
-)
-{
-  _Objects_Free( &_POSIX_Interrupt_Handlers_Information, &the_intr->Object );
-}
- 
-/*PAGE
- *
- *  _POSIX_Interrupt_Get
- */
- 
-RTEMS_INLINE_ROUTINE POSIX_Interrupt_Control *_POSIX_Interrupt_Get (
-  Objects_Id         id,
-  Objects_Locations *location
-)
-{
-  return (POSIX_Interrupt_Control *)
-    _Objects_Get( &_POSIX_Interrupt_Handlers_Information, id, location );
-}
- 
-/*PAGE
- *
- *  _POSIX_Interrupt_Is_null
- */
- 
-RTEMS_INLINE_ROUTINE boolean _POSIX_Interrupt_Is_null (
-  POSIX_Interrupt_Handler_control *the_intr
-)
-{
-  return !the_intr;
-}
-
-#endif
-/*  end of include file */
-
diff --git a/c/src/exec/posix/inline/rtems/posix/key.inl b/c/src/exec/posix/inline/rtems/posix/key.inl
deleted file mode 100644
index fa4d31b11f..0000000000
--- a/c/src/exec/posix/inline/rtems/posix/key.inl
+++ /dev/null
@@ -1,70 +0,0 @@
-/*  rtems/posix/key.inl
- *
- *  This include file contains the static inline implementation of the private 
- *  inlined routines for POSIX key's.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
- 
-#ifndef __RTEMS_POSIX_KEY_inl
-#define __RTEMS_POSIX_KEY_inl
- 
-/*PAGE
- *
- *  _POSIX_Keys_Allocate
- */
- 
-RTEMS_INLINE_ROUTINE POSIX_Keys_Control *_POSIX_Keys_Allocate( void )
-{
-  return (POSIX_Keys_Control *) _Objects_Allocate( &_POSIX_Keys_Information );
-}
- 
-/*PAGE
- *
- *  _POSIX_Keys_Free
- */
- 
-RTEMS_INLINE_ROUTINE void _POSIX_Keys_Free (
-  POSIX_Keys_Control *the_key
-)
-{
-  _Objects_Free( &_POSIX_Keys_Information, &the_key->Object );
-}
- 
-/*PAGE
- *
- *  _POSIX_Keys_Get
- */
- 
-RTEMS_INLINE_ROUTINE POSIX_Keys_Control *_POSIX_Keys_Get (
-  Objects_Id         id,
-  Objects_Locations *location
-)
-{
-  return (POSIX_Keys_Control *)
-    _Objects_Get( &_POSIX_Keys_Information, id, location );
-}
- 
-/*PAGE
- *
- *  _POSIX_Keys_Is_null
- */
- 
-RTEMS_INLINE_ROUTINE boolean _POSIX_Keys_Is_null (
-  POSIX_Keys_Control *the_key
-)
-{
-  return !the_key;
-}
-
-#endif
-/*  end of include file */
-
diff --git a/c/src/exec/posix/inline/rtems/posix/mqueue.inl b/c/src/exec/posix/inline/rtems/posix/mqueue.inl
deleted file mode 100644
index 51326fba7b..0000000000
--- a/c/src/exec/posix/inline/rtems/posix/mqueue.inl
+++ /dev/null
@@ -1,83 +0,0 @@
-/*  rtems/posix/mqueue.inl
- *
- *  This include file contains the static inline implementation of the private 
- *  inlined routines for POSIX Message Queue.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
- 
-#ifndef __RTEMS_POSIX_MESSAGE_QUEUE_inl
-#define __RTEMS_POSIX_MESSAGE_QUEUE_inl
- 
-/*PAGE
- *
- *  _POSIX_Message_queue_Allocate
- */
- 
-RTEMS_INLINE_ROUTINE POSIX_Message_queue_Control *_POSIX_Message_queue_Allocate( void )
-{
-  return (POSIX_Message_queue_Control *)
-    _Objects_Allocate( &_POSIX_Message_queue_Information );
-}
- 
-/*PAGE
- *
- *  _POSIX_Message_queue_Free
- */
- 
-RTEMS_INLINE_ROUTINE void _POSIX_Message_queue_Free (
-  POSIX_Message_queue_Control *the_mq
-)
-{
-  _Objects_Free( &_POSIX_Message_queue_Information, &the_mq->Object );
-}
- 
-/*PAGE
- *
- *  _POSIX_Message_queue_Get
- */
- 
-RTEMS_INLINE_ROUTINE POSIX_Message_queue_Control *_POSIX_Message_queue_Get (
-  Objects_Id         id,
-  Objects_Locations *location
-)
-{
-  return (POSIX_Message_queue_Control *)
-    _Objects_Get( &_POSIX_Message_queue_Information, id, location );
-}
- 
-/*PAGE
- *
- *  _POSIX_Message_queue_Is_null
- */
- 
-RTEMS_INLINE_ROUTINE boolean _POSIX_Message_queue_Is_null (
-  POSIX_Message_queue_Control *the_mq
-)
-{
-  return !the_mq;
-}
-
-/*PAGE
- *
- *  _POSIX_Message_queue_Priority_to_core
- */
- 
-RTEMS_INLINE_ROUTINE Priority_Control _POSIX_Message_queue_Priority_to_core(
-  unsigned int priority
-)
-{
-  return priority;
-}
-
-#endif
-/*  end of include file */
-
diff --git a/c/src/exec/posix/inline/rtems/posix/mutex.inl b/c/src/exec/posix/inline/rtems/posix/mutex.inl
deleted file mode 100644
index 5c1f3b7b73..0000000000
--- a/c/src/exec/posix/inline/rtems/posix/mutex.inl
+++ /dev/null
@@ -1,93 +0,0 @@
-/*  rtems/posix/mutex.inl
- *
- *  This include file contains the static inline implementation of the private 
- *  inlined routines for POSIX mutex's.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
- 
-#ifndef __RTEMS_POSIX_MUTEX_inl
-#define __RTEMS_POSIX_MUTEX_inl
- 
-/*PAGE
- *
- *  _POSIX_Mutex_Allocate
- */
- 
-RTEMS_INLINE_ROUTINE POSIX_Mutex_Control *_POSIX_Mutex_Allocate( void )
-{
-  return (POSIX_Mutex_Control *) _Objects_Allocate( &_POSIX_Mutex_Information );
-}
- 
-/*PAGE
- *
- *  _POSIX_Mutex_Free
- */
- 
-RTEMS_INLINE_ROUTINE void _POSIX_Mutex_Free (
-  POSIX_Mutex_Control *the_mutex
-)
-{
-  _Objects_Free( &_POSIX_Mutex_Information, &the_mutex->Object );
-}
- 
-/*PAGE
- *
- *  _POSIX_Mutex_Get
- */
- 
-RTEMS_INLINE_ROUTINE POSIX_Mutex_Control *_POSIX_Mutex_Get (
-  Objects_Id        *id,
-  Objects_Locations *location
-)
-{
-  int status;
-
-  if ( !id ) {
-    *location = OBJECTS_ERROR;
-    return (POSIX_Mutex_Control *) 0;
-  }
-
-  if ( *id == PTHREAD_MUTEX_INITIALIZER ) {
-    /*
-     *  Do an "auto-create" here.
-     */
-
-    status = pthread_mutex_init( id, 0 );
-    if ( status ) {
-      *location = OBJECTS_ERROR;
-      return (POSIX_Mutex_Control *) 0;
-    }
-  }
-
-  /*
-   *  Now call Objects_Get()
-   */
-
-  return (POSIX_Mutex_Control *)
-    _Objects_Get( &_POSIX_Mutex_Information, *id, location );
-}
- 
-/*PAGE
- *
- *  _POSIX_Mutex_Is_null
- */
- 
-RTEMS_INLINE_ROUTINE boolean _POSIX_Mutex_Is_null (
-  POSIX_Mutex_Control *the_mutex
-)
-{
-  return !the_mutex;
-}
-
-#endif
-/*  end of include file */
-
diff --git a/c/src/exec/posix/inline/rtems/posix/priority.inl b/c/src/exec/posix/inline/rtems/posix/priority.inl
deleted file mode 100644
index dc8187d4ef..0000000000
--- a/c/src/exec/posix/inline/rtems/posix/priority.inl
+++ /dev/null
@@ -1,37 +0,0 @@
-/*  
- *  $Id$
- */
-
-#ifndef __RTEMS_POSIX_PRIORITY_inl
-#define __RTEMS_POSIX_PRIORITY_inl
-
-/*
- *  1003.1b-1993,2.2.2.80 definition of priority, p. 19
- *
- *  "Numericallly higher values represent higher priorities."
- *
- *  Thus, RTEMS Core has priorities run in the opposite sense of the POSIX API.
- */
-
-RTEMS_INLINE_ROUTINE boolean _POSIX_Priority_Is_valid(
-  int priority
-)
-{
-  return (boolean) (priority >= 1 && priority <= 254);
-}
-
-RTEMS_INLINE_ROUTINE Priority_Control _POSIX_Priority_To_core(
-  int priority
-)
-{
-  return (Priority_Control) (255 - priority);
-}
-
-RTEMS_INLINE_ROUTINE int _POSIX_Priority_From_core(
-  Priority_Control priority
-)
-{
-  return 255 - priority;
-}
-
-#endif
diff --git a/c/src/exec/posix/inline/rtems/posix/pthread.inl b/c/src/exec/posix/inline/rtems/posix/pthread.inl
deleted file mode 100644
index 51f7287384..0000000000
--- a/c/src/exec/posix/inline/rtems/posix/pthread.inl
+++ /dev/null
@@ -1,70 +0,0 @@
-/*  rtems/posix/pthread.inl
- *
- *  This include file contains the static inline implementation of the private 
- *  inlined routines for POSIX threads.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
- 
-#ifndef __RTEMS_POSIX_THREADS_inl
-#define __RTEMS_POSIX_THREADS_inl
- 
-/*PAGE
- *
- *  _POSIX_Threads_Allocate
- */
- 
-RTEMS_INLINE_ROUTINE Thread_Control *_POSIX_Threads_Allocate( void )
-{
-  return (Thread_Control *) _Objects_Allocate( &_POSIX_Threads_Information );
-}
- 
-/*PAGE
- *
- *  _POSIX_Threads_Free
- */
- 
-RTEMS_INLINE_ROUTINE void _POSIX_Threads_Free (
-  Thread_Control *the_pthread
-)
-{
-  _Objects_Free( &_POSIX_Threads_Information, &the_pthread->Object );
-}
- 
-/*PAGE
- *
- *  _POSIX_Threads_Get
- */
- 
-RTEMS_INLINE_ROUTINE Thread_Control *_POSIX_Threads_Get (
-  pthread_t          id,
-  Objects_Locations *location
-)
-{
-  return (Thread_Control *)
-    _Objects_Get( &_POSIX_Threads_Information, (Objects_Id)id, location );
-}
- 
-/*PAGE
- *
- *  _POSIX_Threads_Is_null
- */
- 
-RTEMS_INLINE_ROUTINE boolean _POSIX_Threads_Is_null (
-  Thread_Control *the_pthread
-)
-{
-  return !the_pthread;
-}
-
-#endif
-/*  end of include file */
-
diff --git a/c/src/exec/posix/inline/rtems/posix/semaphore.inl b/c/src/exec/posix/inline/rtems/posix/semaphore.inl
deleted file mode 100644
index 8f2189d82a..0000000000
--- a/c/src/exec/posix/inline/rtems/posix/semaphore.inl
+++ /dev/null
@@ -1,71 +0,0 @@
-/*  rtems/posix/semaphore.inl
- *
- *  This include file contains the static inline implementation of the private 
- *  inlined routines for POSIX Semaphores.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
- 
-#ifndef __RTEMS_POSIX_SEMAPHORE_inl
-#define __RTEMS_POSIX_SEMAPHORE_inl
- 
-/*PAGE
- *
- *  _POSIX_Semaphore_Allocate
- */
- 
-RTEMS_INLINE_ROUTINE POSIX_Semaphore_Control *_POSIX_Semaphore_Allocate( void )
-{
-  return (POSIX_Semaphore_Control *)
-    _Objects_Allocate( &_POSIX_Semaphore_Information );
-}
- 
-/*PAGE
- *
- *  _POSIX_Semaphore_Free
- */
- 
-RTEMS_INLINE_ROUTINE void _POSIX_Semaphore_Free (
-  POSIX_Semaphore_Control *the_semaphore
-)
-{
-  _Objects_Free( &_POSIX_Semaphore_Information, &the_semaphore->Object );
-}
- 
-/*PAGE
- *
- *  _POSIX_Semaphore_Get
- */
- 
-RTEMS_INLINE_ROUTINE POSIX_Semaphore_Control *_POSIX_Semaphore_Get (
-  Objects_Id        *id,
-  Objects_Locations *location
-)
-{
-  return (POSIX_Semaphore_Control *)
-    _Objects_Get( &_POSIX_Semaphore_Information, *id, location );
-}
- 
-/*PAGE
- *
- *  _POSIX_Semaphore_Is_null
- */
- 
-RTEMS_INLINE_ROUTINE boolean _POSIX_Semaphore_Is_null (
-  POSIX_Semaphore_Control *the_semaphore
-)
-{
-  return !the_semaphore;
-}
-
-#endif
-/*  end of include file */
-
diff --git a/c/src/exec/posix/macros/rtems/posix/Makefile.in b/c/src/exec/posix/macros/rtems/posix/Makefile.in
deleted file mode 100644
index d402b7b788..0000000000
--- a/c/src/exec/posix/macros/rtems/posix/Makefile.in
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-# Right now there are not macro implementation of the posix inline routines
-# So it won't build
-I_PIECES= 
-I_FILES=$(I_PIECES:%=$(srcdir)/%.inl)
-
-SRCS=$(I_FILES)
-
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-#
-# Add your list of files to delete here.  The config files
-#  already know how to delete some stuff, so you may want
-#  to just run 'make clean' first to see what gets missed.
-#  'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
-
-all:	$(SRCS)
-	#$(INSTALL) -m 444 ${I_FILES} $(PROJECT_INCLUDE)/rtems/posix
diff --git a/c/src/exec/rtems/include/rtems.h b/c/src/exec/rtems/include/rtems.h
deleted file mode 100644
index 9a165c08dd..0000000000
--- a/c/src/exec/rtems/include/rtems.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/*  rtems.h
- *
- *  This include file contains information about RTEMS executive that
- *  is required by the application and is CPU independent.  It includes
- *  two (2) CPU dependent files to tailor its data structures for a
- *  particular processor.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_RTEMS_GENERIC_h
-#define __RTEMS_RTEMS_GENERIC_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- *  Unless told otherwise, the RTEMS include files will hide some stuff
- *  from normal application code.  Defining this crosses a boundary which
- *  is undesirable since it means your application is using RTEMS features
- *  which are not included in the formally defined and supported API.  
- *  Define this at your own risk. 
- */
-
-#if !defined(__RTEMS_VIOLATE_KERNEL_VISIBILITY__) && !defined(__RTEMS_INSIDE__)
-#define __RTEMS_APPLICATION__
-#endif
-
-#include <rtems/system.h>
-#include <rtems/rtems/status.h>
-#include <rtems/rtems/types.h>
-
-#include <rtems/config.h>
-#include <rtems/init.h>
-#include <rtems/rtems/tasks.h>
-#include <rtems/rtems/intr.h>
-#include <rtems/rtems/clock.h>
-#include <rtems/extension.h>
-#include <rtems/rtems/timer.h>
-#include <rtems/rtems/sem.h>
-#include <rtems/rtems/message.h>
-#include <rtems/rtems/event.h>
-#include <rtems/rtems/signal.h>
-#include <rtems/rtems/event.h>
-#include <rtems/rtems/part.h>
-#include <rtems/rtems/region.h>
-#include <rtems/rtems/dpmem.h>
-#include <rtems/io.h>
-#include <rtems/fatal.h>
-#include <rtems/rtems/ratemon.h>
-#include <rtems/rtems/mp.h>
-
-#include <rtems/rtems/support.h>
-#include <rtems/score/sysstate.h>
-
-#define RTEMS_HAS_HARDWARE_FP CPU_HARDWARE_FP
-
-/*
- *  The following define the constants which may be used in name searches.
- */
- 
-#define RTEMS_SEARCH_ALL_NODES   OBJECTS_SEARCH_ALL_NODES
-#define RTEMS_SEARCH_OTHER_NODES OBJECTS_SEARCH_OTHER_NODES
-#define RTEMS_SEARCH_LOCAL_NODE  OBJECTS_SEARCH_LOCAL_NODE
-#define RTEMS_WHO_AM_I           OBJECTS_WHO_AM_I
- 
-/*
- * Parameters and return id's for _Objects_Get_next
- */
- 
-#define RTEMS_OBJECT_ID_INITIAL_INDEX        OBJECTS_ID_INITIAL_INDEX
-#define RTEMS_OBJECT_ID_FINAL_INDEX          OBJECTS_ID_FINAL_INDEX
- 
-#define RTEMS_OBJECT_ID_INITIAL(class, node) OBJECTS_ID_INITIAL(class, node)
-#define RTEMS_OBJECT_ID_FINAL                OBJECTS_ID_FINAL
- 
-/*
- *  The following constant defines the minimum stack size which every
- *  thread must exceed.
- */
-
-#define RTEMS_MINIMUM_STACK_SIZE  STACK_MINIMUM_SIZE
-
-/*
- *  Constant for indefinite wait.  (actually an illegal interval)
- */
-
-#define RTEMS_NO_TIMEOUT  WATCHDOG_NO_TIMEOUT
-
-/*
- *  An MPCI must support packets of at least this size.
- */
- 
-#define RTEMS_MINIMUM_PACKET_SIZE  MP_PACKET_MINIMUM_PACKET_SIZE
- 
-/*
- *  The following constant defines the number of unsigned32's
- *  in a packet which must be converted to native format in a
- *  heterogeneous system.  In packets longer than
- *  MP_PACKET_MINIMUN_HETERO_CONVERSION unsigned32's, some of the "extra" data
- *  may a user message buffer which is not automatically endian swapped.
- */
- 
-#define RTEMS_MINIMUN_HETERO_CONVERSION  MP_PACKET_MINIMUN_HETERO_CONVERSION
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/rtems/include/rtems/rtems/Makefile.in b/c/src/exec/rtems/include/rtems/rtems/Makefile.in
deleted file mode 100644
index adb4903db8..0000000000
--- a/c/src/exec/rtems/include/rtems/rtems/Makefile.in
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-H_PIECES=asr attr clock config dpmem event eventmp eventset \
-   intr message modes mp msgmp options part partmp \
-   ratemon region regionmp rtemsapi sem semmp signal signalmp status \
-   support taskmp tasks timer types 
-H_FILES=$(H_PIECES:%=$(srcdir)/%.h)
-
-# H_FILES that get installed externally
-EXTERNAL_H_PIECES = rtems
-EXTERNAL_H_FILES=$(EXTERNAL_H_PIECES:%=$(srcdir)/%.h)
-
-SRCS=$(H_FILES) $(EXTERNAL_H_FILES)
-
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-#
-# Add your list of files to delete here.  The config files
-#  already know how to delete some stuff, so you may want
-#  to just run 'make clean' first to see what gets missed.
-#  'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
-
-all:	$(SRCS)
-	$(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/rtems
-	$(INSTALL) -m 444 ${EXTERNAL_H_FILES} $(PROJECT_INCLUDE)
diff --git a/c/src/exec/rtems/include/rtems/rtems/asr.h b/c/src/exec/rtems/include/rtems/rtems/asr.h
deleted file mode 100644
index 3fac2fa3e3..0000000000
--- a/c/src/exec/rtems/include/rtems/rtems/asr.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/*  asr.h
- *
- *  This include file contains all the constants and structures associated
- *  with the Asynchronous Signal Handler.  This Handler provides the low-level
- *  support required by the Signal Manager.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_ASR_h
-#define __RTEMS_ASR_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/rtems/modes.h>
-
-/*
- *
- *  The following type defines the control block used to manage
- *  each signal set.
- */
-
-typedef unsigned32 rtems_signal_set;
-
-/*
- *  Return type for ASR Handler
- */
-
-typedef void rtems_asr;
-
-/*
- *  The following type corresponds to the applications asynchronous
- *  signal processing routine.
- */
-
-typedef rtems_asr ( *rtems_asr_entry )(
-                 rtems_signal_set
-             );
-
-/*
- *
- *  The following defines the control structure used to manage
- *  signals.  Each thread has a copy of this record.
- */
-
-typedef struct {
-  boolean           is_enabled;       /* are ASRs enabled currently? */
-  rtems_asr_entry   handler;          /* address of RTEMS_ASR */
-  Modes_Control     mode_set;         /* RTEMS_ASR mode */
-  rtems_signal_set  signals_posted;   /* signal set */
-  rtems_signal_set  signals_pending;  /* pending signal set */
-  unsigned32        nest_level;       /* nest level of RTEMS_ASR */
-}   ASR_Information;
-
-/*
- *  The following constants define the individual signals which may
- *  be used to compose a signal set.
- */
-
-#define RTEMS_SIGNAL_0    0x00000001
-#define RTEMS_SIGNAL_1    0x00000002
-#define RTEMS_SIGNAL_2    0x00000004
-#define RTEMS_SIGNAL_3    0x00000008
-#define RTEMS_SIGNAL_4    0x00000010
-#define RTEMS_SIGNAL_5    0x00000020
-#define RTEMS_SIGNAL_6    0x00000040
-#define RTEMS_SIGNAL_7    0x00000080
-#define RTEMS_SIGNAL_8    0x00000100
-#define RTEMS_SIGNAL_9    0x00000200
-#define RTEMS_SIGNAL_10   0x00000400
-#define RTEMS_SIGNAL_11   0x00000800
-#define RTEMS_SIGNAL_12   0x00001000
-#define RTEMS_SIGNAL_13   0x00002000
-#define RTEMS_SIGNAL_14   0x00004000
-#define RTEMS_SIGNAL_15   0x00008000
-#define RTEMS_SIGNAL_16   0x00010000
-#define RTEMS_SIGNAL_17   0x00020000
-#define RTEMS_SIGNAL_18   0x00040000
-#define RTEMS_SIGNAL_19   0x00080000
-#define RTEMS_SIGNAL_20   0x00100000
-#define RTEMS_SIGNAL_21   0x00200000
-#define RTEMS_SIGNAL_22   0x00400000
-#define RTEMS_SIGNAL_23   0x00800000
-#define RTEMS_SIGNAL_24   0x01000000
-#define RTEMS_SIGNAL_25   0x02000000
-#define RTEMS_SIGNAL_26   0x04000000
-#define RTEMS_SIGNAL_27   0x08000000
-#define RTEMS_SIGNAL_28   0x10000000
-#define RTEMS_SIGNAL_29   0x20000000
-#define RTEMS_SIGNAL_30   0x40000000
-#define RTEMS_SIGNAL_31   0x80000000
-
-#ifndef __RTEMS_APPLICATION__
-#include <rtems/rtems/asr.inl>
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/rtems/include/rtems/rtems/attr.h b/c/src/exec/rtems/include/rtems/rtems/attr.h
deleted file mode 100644
index 215b27f9a0..0000000000
--- a/c/src/exec/rtems/include/rtems/rtems/attr.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/*  attr.h
- *
- *  This include file contains all information about the Object Attributes
- *  Handler.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_ATTRIBUTES_h
-#define __RTEMS_ATTRIBUTES_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* types */
-
-typedef unsigned32 rtems_attribute;
-
-/* constants */
-
-#define RTEMS_DEFAULT_ATTRIBUTES  0x00000000
-
-#define RTEMS_NO_FLOATING_POINT   0x00000000 /* don't use FP HW */
-#define RTEMS_FLOATING_POINT      0x00000001 /* utilize coprocessor */
-
-#define RTEMS_LOCAL               0x00000000 /* local resource */
-#define RTEMS_GLOBAL              0x00000002 /* global resource */
-
-#define RTEMS_FIFO                0x00000000 /* process RTEMS_FIFO */
-#define RTEMS_PRIORITY            0x00000004 /* process by priority */
-
-#define RTEMS_COUNTING_SEMAPHORE  0x00000000
-#define RTEMS_BINARY_SEMAPHORE    0x00000010
-
-#define RTEMS_NO_INHERIT_PRIORITY 0x00000000
-#define RTEMS_INHERIT_PRIORITY    0x00000020
-
-#define RTEMS_NO_PRIORITY_CEILING 0x00000000
-#define RTEMS_PRIORITY_CEILING    0x00000040
-
-#define RTEMS_APPLICATION_TASK    0x00000000
-#define RTEMS_SYSTEM_TASK         0x00000080
-
-#if ( CPU_HARDWARE_FP == TRUE ) || ( CPU_SOFTWARE_FP == TRUE )
-#define ATTRIBUTES_NOT_SUPPORTED       0
-#else
-#define ATTRIBUTES_NOT_SUPPORTED       RTEMS_FLOATING_POINT
-#endif
-
-#if ( CPU_ALL_TASKS_ARE_FP == TRUE )
-#define ATTRIBUTES_REQUIRED            RTEMS_FLOATING_POINT
-#else
-#define ATTRIBUTES_REQUIRED            0
-#endif
-
-/*
- *  _Attributes_Handler_initialization
- *
- *  DESCRIPTION:
- *
- *  This routine performs initialization for this handler.
- *
- *  NOTE: There is no initialization required in C.  Conditional compilation
- *        takes care of this in C.
- */
-
-#define _Attributes_Handler_initialization()
-
-#ifndef __RTEMS_APPLICATION__
-#include <rtems/rtems/attr.inl>
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/rtems/include/rtems/rtems/clock.h b/c/src/exec/rtems/include/rtems/rtems/clock.h
deleted file mode 100644
index c991d769cf..0000000000
--- a/c/src/exec/rtems/include/rtems/rtems/clock.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*  clock.h
- *
- *  This include file contains all the constants and structures associated
- *  with the Clock Manager.  This manager provides facilities to set, obtain,
- *  and continually update the current date and time.
- *
- *  This manager provides directives to:
- *
- *     + set the current date and time
- *     + obtain the current date and time
- *     + announce a clock tick
- *
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_CLOCK_h
-#define __RTEMS_CLOCK_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/tod.h>
-#include <rtems/rtems/types.h>
-
-/*
- *  List of things which can be returned by the rtems_clock_get directive.
- */
-
-typedef enum {
-  RTEMS_CLOCK_GET_TOD,
-  RTEMS_CLOCK_GET_SECONDS_SINCE_EPOCH,
-  RTEMS_CLOCK_GET_TICKS_SINCE_BOOT,
-  RTEMS_CLOCK_GET_TICKS_PER_SECOND,
-  RTEMS_CLOCK_GET_TIME_VALUE
-} rtems_clock_get_options;
-
-/*
- *  Standard flavor style to return TOD in for a rtems_clock_get option.
- */
-
-typedef struct {
-  unsigned32  seconds;
-  unsigned32  microseconds;
-} rtems_clock_time_value;
-
-/*
- *  rtems_clock_get
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_clock_get directive.  It returns
- *  one of the following:
- *    + current time of day
- *    + seconds since epoch
- *    + ticks since boot
- *    + ticks per second
- */
-
-rtems_status_code rtems_clock_get(
-  rtems_clock_get_options  option,
-  void              *time_buffer
-);
-
-/*
- *  rtems_clock_set
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_clock_set directive.  It sets
- *  the current time of day to that in the time_buffer record.
- */
-
-rtems_status_code rtems_clock_set(
-  rtems_time_of_day *time_buffer
-);
-
-/*
- *  rtems_clock_tick
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_clock_tick directive.  It is invoked
- *  to inform RTEMS of the occurrence of a clock tick.
- */
-
-rtems_status_code rtems_clock_tick( void );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/rtems/include/rtems/rtems/config.h b/c/src/exec/rtems/include/rtems/rtems/config.h
deleted file mode 100644
index f395710271..0000000000
--- a/c/src/exec/rtems/include/rtems/rtems/config.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*  config.h
- *
- *  This include file contains the table of user defined configuration
- *  parameters specific for the RTEMS API.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_RTEMS_CONFIGURATION_h
-#define __RTEMS_RTEMS_CONFIGURATION_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/rtems/types.h>
-#include <rtems/rtems/tasks.h>
-
-/*
- *  The following records define the Configuration Table.  The
- *  information contained in this table is required in all
- *  RTEMS systems, whether single or multiprocessor.  This
- *  table primarily defines the following:
- *
- *     + required number of each object type
- */
-
-typedef struct {
-  unsigned32                        maximum_tasks;
-  unsigned32                        maximum_timers;
-  unsigned32                        maximum_semaphores;
-  unsigned32                        maximum_message_queues;
-  unsigned32                        maximum_partitions;
-  unsigned32                        maximum_regions;
-  unsigned32                        maximum_ports;
-  unsigned32                        maximum_periods;
-  unsigned32                        number_of_initialization_tasks;
-  rtems_initialization_tasks_table *User_initialization_tasks_table;
-} rtems_api_configuration_table;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/rtems/include/rtems/rtems/dpmem.h b/c/src/exec/rtems/include/rtems/rtems/dpmem.h
deleted file mode 100644
index a74fc90f2a..0000000000
--- a/c/src/exec/rtems/include/rtems/rtems/dpmem.h
+++ /dev/null
@@ -1,157 +0,0 @@
-/*  dpmem.h
- *
- *  This include file contains all the constants and structures associated
- *  with the Dual Ported Memory Manager. This manager provides a mechanism
- *  for converting addresses between internal and external representations
- *  for multiple dual-ported memory areas.
- *
- *  Directives provided are:
- *
- *     + create a port
- *     + get ID of a port
- *     + delete a port
- *     + convert external to internal address
- *     + convert internal to external address
- *
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_DUAL_PORTED_MEMORY_h
-#define __RTEMS_DUAL_PORTED_MEMORY_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/object.h>
-
-/*
- *  The following structure defines the port control block.  Each port
- *  has a control block associated with it.  This control block contains
- *  all information required to support the port related operations.
- */
-
-typedef struct {
-  Objects_Control  Object;
-  void            *internal_base; /* base internal address */
-  void            *external_base; /* base external address */
-  unsigned32       length;        /* length of dual-ported area */
-}   Dual_ported_memory_Control;
-
-/*
- *  The following define the internal Dual Ported Memory information.
- */
-
-RTEMS_EXTERN Objects_Information  _Dual_ported_memory_Information;
-
-/*
- *  _Dual_ported_memory_Manager_initialization
- *
- *  DESCRIPTION:
- *
- *  This routine performs the initialization necessary for this manager.
- */
-
-void _Dual_ported_memory_Manager_initialization(
-  unsigned32 maximum_ports
-);
-
-/*
- *  rtems_port_create
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_port_create directive.  The port
- *  will have the name name.  The port maps onto an area of dual ported
- *  memory of length bytes which has internal_start and external_start
- *  as the internal and external starting addresses, respectively.
- *  It returns the id of the created port in ID.
- */
-
-rtems_status_code rtems_port_create(
-  rtems_name    name,
-  void         *internal_start,
-  void         *external_start,
-  unsigned32    length,
-  Objects_Id   *id
-);
-
-/*
- *  rtems_port_ident
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_port_ident directive.  This directive
- *  returns the port ID associated with name.  If more than one port is
- *  named name, then the port to which the ID belongs is arbitrary.
- */
-
-rtems_status_code rtems_port_ident(
-  rtems_name    name,
-  Objects_Id   *id
-);
-
-/*
- *  rtems_port_delete
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_port_delete directive.  It deletes
- *  the port associated with ID.
- */
-
-rtems_status_code rtems_port_delete(
-  Objects_Id id
-);
-
-/*
- *  rtems_port_external_to_internal
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_port_external_to_internal directive.
- *  It returns the internal port address which maps to the provided
- *  external port address for the specified port ID.
- */
-
-rtems_status_code rtems_port_external_to_internal(
-  Objects_Id   id,
-  void        *external,
-  void       **internal
-);
-
-/*
- *  rtems_port_internal_to_external
- *
- *  DESCRIPTION:
- *
- *  This routine implements the Port_internal_to_external directive.
- *  It returns the external port address which maps to the provided
- *  internal port address for the specified port ID.
- */
-
-rtems_status_code rtems_port_internal_to_external(
-  Objects_Id   id,
-  void        *internal,
-  void       **external
-);
-
-#ifndef __RTEMS_APPLICATION__
-#include <rtems/rtems/dpmem.inl>
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/rtems/include/rtems/rtems/event.h b/c/src/exec/rtems/include/rtems/rtems/event.h
deleted file mode 100644
index 48045bdade..0000000000
--- a/c/src/exec/rtems/include/rtems/rtems/event.h
+++ /dev/null
@@ -1,174 +0,0 @@
-/*  event.h
- *
- *  This include file contains the information pertaining to the Event
- *  Manager.  This manager provides a high performance method of communication
- *  and synchronization.
- *
- *  Directives provided are:
- *
- *     + send an event set to a task
- *     + receive event condition
- *
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_EVENT_h
-#define __RTEMS_EVENT_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/object.h>
-#include <rtems/rtems/types.h>
-#include <rtems/rtems/options.h>
-#include <rtems/score/thread.h>
-#include <rtems/score/watchdog.h>
-#include <rtems/rtems/eventset.h>
-
-/*
- *  This constant is passed as the event_in to the
- *  rtems_event_receive directive to determine which events are pending.
- */
-
-#define EVENT_CURRENT  0
-
-/*
- *  The following enumerated types indicate what happened while the event
- *  manager was in the synchronization window.
- */
-
-typedef enum {
-  EVENT_SYNC_SYNCHRONIZED,
-  EVENT_SYNC_NOTHING_HAPPENED,
-  EVENT_SYNC_TIMEOUT,
-  EVENT_SYNC_SATISFIED
-}  Event_Sync_states;
-
-/*
- *  Event_Manager_initialization
- *
- *  DESCRIPTION:
- *
- *  This routine performs the initialization necessary for this manager.
- */
- 
-void _Event_Manager_initialization( void );
-
-/*
- *  rtems_event_send
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_event_send directive.  It sends
- *  event_in to the task specified by ID.  If the task is blocked
- *  waiting to receive events and the posting of event_in satisfies
- *  the task's event condition, then it is unblocked.
- */
-
-rtems_status_code rtems_event_send (
-  Objects_Id         id,
-  rtems_event_set event_in
-);
-
-/*
- *  rtems_event_receive
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_event_receive directive.  This
- *  directive is invoked when the calling task wishes to receive
- *  the event_in event condition.  One of the fields in the option_set
- *  parameter determines whether the receive request is satisfied if
- *  any or all of the events are pending.   If the event condition
- *  is not satisfied immediately, then the task may block with an
- *  optional timeout of TICKS clock ticks or return immediately.
- *  This determination is based on another field in the option_set
- *  parameter.  This directive returns the events received in the
- *  event_out parameter.
- */
-
-rtems_status_code rtems_event_receive (
-  rtems_event_set  event_in,
-  rtems_option     option_set,
-  rtems_interval   ticks,
-  rtems_event_set *event_out
-);
-
-/*
- *  _Event_Seize
- *
- *  DESCRIPTION:
- *
- *  This routine determines if the event condition event_in is
- *  satisfied.  If so or if the no_wait option is enabled in option_set,
- *  then the procedure returns immediately.  If neither of these
- *  conditions is true, then the calling task is blocked with an
- *  optional timeout of ticks clock ticks.
- */
-
-void _Event_Seize (
-  rtems_event_set  event_in,
-  rtems_option     option_set,
-  rtems_interval   ticks,
-  rtems_event_set *event_out
-);
-
-/*
- *  _Event_Surrender
- *
- *  DESCRIPTION:
- *
- *  This routine determines if the event condition of the_thread
- *  has been satisfied.  If so, it unblocks the_thread.
- */
-
-void _Event_Surrender (
-  Thread_Control *the_thread
-);
-
-/*
- *  _Event_Timeout
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked when a task's event receive request
- *  has not been satisfied after the specified timeout interval.
- *  The task represented by ID will be unblocked and its status
- *  code will be set in it's control block to indicate that a timeout
- *  has occurred.
- */
-
-void _Event_Timeout (
-  Objects_Id  id,
-  void       *ignored
-);
-
-/*
- *  The following defines the synchronization flag used by the
- *  Event Manager to insure that signals sent to the currently
- *  executing thread are received properly.
- */
-
-RTEMS_EXTERN volatile Event_Sync_states _Event_Sync_state;
-
-#include <rtems/rtems/eventmp.h>
-#ifndef __RTEMS_APPLICATION__
-#include <rtems/rtems/event.inl>
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/rtems/include/rtems/rtems/eventmp.h b/c/src/exec/rtems/include/rtems/rtems/eventmp.h
deleted file mode 100644
index 2d609cbb37..0000000000
--- a/c/src/exec/rtems/include/rtems/rtems/eventmp.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/*  eventmp.h
- *
- *  This include file contains all the constants and structures associated
- *  with the Multiprocessing Support in the Event Manager.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_EVENT_MP_h
-#define __RTEMS_EVENT_MP_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/rtems/event.h>
-#include <rtems/score/mppkt.h>
-#include <rtems/score/object.h>
-#include <rtems/score/thread.h>
-#include <rtems/score/watchdog.h>
-
-/*
- *  The following enumerated type defines the list of
- *  remote event operations.
- */
-
-typedef enum {
-  EVENT_MP_SEND_REQUEST  =  0,
-  EVENT_MP_SEND_RESPONSE =  1
-}   Event_MP_Remote_operations;
-
-/*
- *  The following data structure defines the packet used to perform
- *  remote event operations.
- */
-
-typedef struct {
-  rtems_packet_prefix         Prefix;
-  Event_MP_Remote_operations  operation;
-  rtems_event_set             event_in;
-}   Event_MP_Packet;
-
-/*
- *  _Event_MP_Send_process_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs a remote procedure call so that a
- *  process operation can be performed on another node.
- *
- *  This routine is not needed since there are no process
- *  packets to be sent by this manager.
- */
-
-/*
- *  _Event_MP_Send_request_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs a remote procedure call so that a
- *  directive operation can be initiated on another node.
- */
-
-rtems_status_code _Event_MP_Send_request_packet (
-  Event_MP_Remote_operations operation,
-  Objects_Id                 event_id,
-  rtems_event_set         event_in
-);
-
-/*
- *  _Event_MP_Send_response_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs a remote procedure call so that a
- *  directive can be performed on another node.
- */
-
-void _Event_MP_Send_response_packet (
-  Event_MP_Remote_operations  operation,
-  Thread_Control             *the_thread
-);
-
-/*
- *
- *  _Event_MP_Process_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs the actions specific to this package for
- *  the request from another node.
- */
-
-void _Event_MP_Process_packet (
-  rtems_packet_prefix *the_packet_prefix
-);
-
-/*
- *  _Event_MP_Send_object_was_deleted
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked indirectly by the thread queue
- *  when a proxy has been removed from the thread queue and
- *  the remote node must be informed of this.
- *
- *  This routine is not needed since there are no objects
- *  deleted by this manager.
- */
-
-/*
- *  _Event_MP_Send_extract_proxy
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked when a task is deleted and it
- *  has a proxy which must be removed from a thread queue and
- *  the remote node must be informed of this.
- *
- *  This routine is not needed since there are no objects
- *  deleted by this manager.
- */
-
-/*
- *  _Event_MP_Get_packet
- *
- *  DESCRIPTION:
- *
- *  This function is used to obtain a event mp packet.
- */
-
-Event_MP_Packet *_Event_MP_Get_packet ( void );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of file */
diff --git a/c/src/exec/rtems/include/rtems/rtems/eventset.h b/c/src/exec/rtems/include/rtems/rtems/eventset.h
deleted file mode 100644
index fe1f9eb170..0000000000
--- a/c/src/exec/rtems/include/rtems/rtems/eventset.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*  eventset.h
- *
- *  This include file contains the information pertaining to the
- *  Event Sets Handler.  This handler provides methods for the manipulation
- *  of event sets which will be sent and received by tasks.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_EVENT_SET_h
-#define __RTEMS_EVENT_SET_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- *  The following defines the type used to control event sets.
- */
-
-typedef unsigned32 rtems_event_set;
-
-/*
- *  The following constants define the individual events which may
- *  be used to compose an event set.
- */
-
-#define RTEMS_PENDING_EVENTS      0           /* receive pending events   */
-#define RTEMS_ALL_EVENTS  0xFFFFFFFF
-
-#define RTEMS_EVENT_0     0x00000001
-#define RTEMS_EVENT_1     0x00000002
-#define RTEMS_EVENT_2     0x00000004
-#define RTEMS_EVENT_3     0x00000008
-#define RTEMS_EVENT_4     0x00000010
-#define RTEMS_EVENT_5     0x00000020
-#define RTEMS_EVENT_6     0x00000040
-#define RTEMS_EVENT_7     0x00000080
-#define RTEMS_EVENT_8     0x00000100
-#define RTEMS_EVENT_9     0x00000200
-#define RTEMS_EVENT_10    0x00000400
-#define RTEMS_EVENT_11    0x00000800
-#define RTEMS_EVENT_12    0x00001000
-#define RTEMS_EVENT_13    0x00002000
-#define RTEMS_EVENT_14    0x00004000
-#define RTEMS_EVENT_15    0x00008000
-#define RTEMS_EVENT_16    0x00010000
-#define RTEMS_EVENT_17    0x00020000
-#define RTEMS_EVENT_18    0x00040000
-#define RTEMS_EVENT_19    0x00080000
-#define RTEMS_EVENT_20    0x00100000
-#define RTEMS_EVENT_21    0x00200000
-#define RTEMS_EVENT_22    0x00400000
-#define RTEMS_EVENT_23    0x00800000
-#define RTEMS_EVENT_24    0x01000000
-#define RTEMS_EVENT_25    0x02000000
-#define RTEMS_EVENT_26    0x04000000
-#define RTEMS_EVENT_27    0x08000000
-#define RTEMS_EVENT_28    0x10000000
-#define RTEMS_EVENT_29    0x20000000
-#define RTEMS_EVENT_30    0x40000000
-#define RTEMS_EVENT_31    0x80000000
-
-
-/*
- *  The following constant is the value of an event set which
- *  has no events pending.
- */
-
-#define EVENT_SETS_NONE_PENDING 0
-
-#ifndef __RTEMS_APPLICATION__
-#include <rtems/rtems/eventset.inl>
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/rtems/include/rtems/rtems/intr.h b/c/src/exec/rtems/include/rtems/rtems/intr.h
deleted file mode 100644
index 168806bff2..0000000000
--- a/c/src/exec/rtems/include/rtems/rtems/intr.h
+++ /dev/null
@@ -1,160 +0,0 @@
-/*  intr.h
- *
- *  This include file contains all the constants and structures associated
- *  with the Interrupt Manager.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_INTERRUPT_h
-#define __RTEMS_INTERRUPT_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/isr.h>
-
-/*
- *  Interrupt level type
- */
-
-typedef ISR_Level rtems_interrupt_level;
-
-/*
- *  The following type defines the control block used to manage
- *  the vectors.
- */
- 
-typedef ISR_Vector_number rtems_vector_number;
-
-/*
- *  Return type for ISR Handler
- */
- 
-typedef void rtems_isr;
-
-/*
- *  Pointer to an ISR Handler
- */
- 
-typedef rtems_isr ( *rtems_isr_entry )(
-                 rtems_vector_number
-             );
-
-/*
- *  _Interrupt_Manager_initialization
- *
- *  DESCRIPTION:
- *
- *  This routine initializes the interrupt manager.
- *
- */
-
-void _Interrupt_Manager_initialization( void );
-
-/*
- *  rtems_interrupt_catch
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_interrupt_catch directive.  This
- *  directive installs new_isr_handler as the RTEMS interrupt service
- *  routine for vector.  The previous RTEMS interrupt service
- *  routine is returned in old_isr_handler.
- */
-
-rtems_status_code rtems_interrupt_catch(
-  rtems_isr_entry      new_isr_handler,
-  rtems_vector_number  vector,
-  rtems_isr_entry     *old_isr_handler
-);
-
-/*
- *  rtems_interrupt_disable
- *
- *  DESCRIPTION:
- *
- *  This routine disables all maskable interrupts and returns the
- *  previous level in _isr_cookie.
- */
-
-#define rtems_interrupt_disable( _isr_cookie ) \
-    _ISR_Disable(_isr_cookie)
-        
-/*
- *  rtems_interrupt_enable
- *
- *  DESCRIPTION:
- *
- *  This routine enables maskable interrupts to the level indicated
- *  _isr_cookie.
- */
-
-#define rtems_interrupt_enable( _isr_cookie ) \
-    _ISR_Enable(_isr_cookie)
-        
-/*
- *  rtems_interrupt_flash
- *
- *  DESCRIPTION:
- *
- *  This routine temporarily enables maskable interrupts to the
- *  level in _isr_cookie before redisabling them.
- */
-
-#define rtems_interrupt_flash( _isr_cookie ) \
-    _ISR_Flash(_isr_cookie)
-
-/*
- *  rtems_interrupt_is_in_progress
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the processor is currently servicing
- *  an interrupt and FALSE otherwise.   A return value of TRUE indicates
- *  that the caller is an interrupt service routine, NOT a thread.  The
- *  directives available to an interrupt service routine are restricted.
- */
- 
-#define rtems_interrupt_is_in_progress() \
-    _ISR_Is_in_progress()
-
-/*
- *  rtems_interrupt_cause
- *
- *  DESCRIPTION:
- *
- *  This routine generates an interrupt.
- *
- *  NOTE:  No implementation.
- */
-
-#define rtems_interrupt_cause( _interrupt_to_cause )
-
-/*
- *  rtems_interrupt_cause
- *
- *  DESCRIPTION:
- *
- *  This routine clears the specified interrupt.
- *
- *  NOTE:  No implementation.
- */
-
-#define rtems_interrupt_clear( _interrupt_to_clear )
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/rtems/include/rtems/rtems/message.h b/c/src/exec/rtems/include/rtems/rtems/message.h
deleted file mode 100644
index 611d46fde8..0000000000
--- a/c/src/exec/rtems/include/rtems/rtems/message.h
+++ /dev/null
@@ -1,334 +0,0 @@
-/*  message.h
- *
- *  This include file contains all the constants and structures associated
- *  with the Message Queue Manager.  This manager provides a mechanism for
- *  communication and synchronization between tasks using messages.
- *
- *  Directives provided are:
- *
- *     + create a queue
- *     + get ID of a queue
- *     + delete a queue
- *     + put a message at the rear of a queue
- *     + put a message at the front of a queue
- *     + broadcast N messages to a queue
- *     + receive message from a queue
- *     + flush all messages on a queue
- *
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_MESSAGE_QUEUE_h
-#define __RTEMS_MESSAGE_QUEUE_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/rtems/types.h>
-#include <rtems/score/chain.h>
-#include <rtems/score/object.h>
-#include <rtems/rtems/attr.h>
-#include <rtems/score/threadq.h>
-#include <rtems/score/coremsg.h>
-
-/*
- *  The following enumerated type details the modes in which a message
- *  may be submitted to a message queue.  The message may be posted
- *  in a send or urgent fashion.
- */
- 
-typedef enum {
-  MESSAGE_QUEUE_SEND_REQUEST   = 0,
-  MESSAGE_QUEUE_URGENT_REQUEST = 1
-}  Message_queue_Submit_types;
-
-/*
- *  The following records define the control block used to manage
- *  each message queue.
- */
-
-typedef struct {
-  Objects_Control             Object;
-  rtems_attribute             attribute_set;
-  CORE_message_queue_Control  message_queue;
-}   Message_queue_Control;
-
-/*
- *  The following defines the information control block used to
- *  manage this class of objects.
- */
-
-RTEMS_EXTERN Objects_Information  _Message_queue_Information;
-
-/*
- *  _Message_queue_Manager_initialization
- *
- *  DESCRIPTION:
- *
- *  This routine performs the initialization necessary for this manager.
- */
-
-void _Message_queue_Manager_initialization(
-  unsigned32 maximum_message_queues
-);
-
-/*
- *  rtems_message_queue_create
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_message_queue_create directive.  The
- *  message queue will have the name name.  If the attribute_set indicates
- *  that the message queue is to be limited in the number of messages
- *  that can be outstanding, then count indicates the maximum number of
- *  messages that will be held.  It returns the id of the created
- *  message queue in ID.
- */
-
-rtems_status_code rtems_message_queue_create(
-  rtems_name       name,
-  unsigned32       count,
-  unsigned32       max_message_size,
-  rtems_attribute  attribute_set,
-  Objects_Id      *id
-);
-
-/*
- *  rtems_message_queue_ident
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_message_queue_ident directive.
- *  This directive returns the message queue ID associated with NAME.
- *  If more than one message queue is named name, then the message
- *  queue to which the ID belongs is arbitrary.  node indicates the
- *  extent of the search for the ID of the message queue named name.
- *  The search can be limited to a particular node or allowed to
- *  encompass all nodes.
- */
-
-rtems_status_code rtems_message_queue_ident(
-  rtems_name    name,
-  unsigned32    node,
-  Objects_Id   *id
-);
-
-/*
- *  rtems_message_queue_delete
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_message_queue_delete directive.  The
- *  message queue indicated by ID is deleted.
- */
-
-rtems_status_code rtems_message_queue_delete(
-  Objects_Id id
-);
-
-/*
- *  rtems_message_queue_send
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_message_queue_send directive.
- *  This directive sends the message buffer to the message queue
- *  indicated by ID.  If one or more tasks is blocked waiting
- *  to receive a message from this message queue, then one will
- *  receive the message.  The task selected to receive the
- *  message is based on the task queue discipline algorithm in
- *  use by this particular message queue.  If no tasks are waiting,
- *  then the message buffer will be placed at the rear of the
- *  chain of pending messages for this message queue.
- */
-
-rtems_status_code rtems_message_queue_send(
-  Objects_Id            id,
-  void                 *buffer,
-  unsigned32            size
-);
-
-/*
- *  rtems_message_queue_urgent
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_message_queue_send directive.
- *  This directive sends the message buffer to the message queue
- *  indicated by ID.  If one or more tasks is blocked waiting
- *  to receive a message from this message queue, then one will
- *  receive the message.  The task selected to receive the
- *  message is based on the task queue discipline algorithm in
- *  use by this particular message queue.  If no tasks are waiting,
- *  then the message buffer will be placed at the rear of the
- *  chain of pending messages for this message queue.
- */
-
-rtems_status_code rtems_message_queue_urgent(
-  Objects_Id            id,
-  void                 *buffer,
-  unsigned32            size
-);
-
-/*
- *  rtems_message_queue_broadcast
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_message_queue_send directive.
- *  This directive sends the message buffer to the message queue
- *  indicated by ID.  If one or more tasks is blocked waiting
- *  to receive a message from this message queue, then one will
- *  receive the message.  The task selected to receive the
- *  message is based on the task queue discipline algorithm in
- *  use by this particular message queue.  If no tasks are waiting,
- *  then the message buffer will be placed at the rear of the
- *  chain of pending messages for this message queue.
- */
-
-rtems_status_code rtems_message_queue_broadcast(
-  Objects_Id            id,
-  void                 *buffer,
-  unsigned32            size,
-  unsigned32           *count
-);
-
-/*
- *  rtems_message_queue_receive
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_message_queue_receive directive.
- *  This directive is invoked when the calling task wishes to receive
- *  a message from the message queue indicated by ID.  The received
- *  message is to be placed in buffer.  If no messages are outstanding
- *  and the option_set indicates that the task is willing to block,
- *  then the task will be blocked until a message arrives or until,
- *  optionally, timeout clock ticks have passed.
- */
-
-rtems_status_code rtems_message_queue_receive(
-  Objects_Id            id,
-  void                 *buffer,
-  unsigned32           *size,
-  unsigned32            option_set,
-  rtems_interval        timeout
-);
-
-/*
- *  rtems_message_queue_flush
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_message_queue_flush directive.
- *  This directive takes all outstanding messages for the message
- *  queue indicated by ID and returns them to the inactive message
- *  chain.  The number of messages flushed is returned in COUNT.
- */
-
-rtems_status_code rtems_message_queue_flush(
-  Objects_Id  id,
-  unsigned32 *count
-);
-
-/*
- *  rtems_message_queue_get_number_pending
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_message_queue_get_number_pending
- *  directive.  This directive returns the number of pending 
- *  messages for the message queue indicated by ID 
- *  chain.  The number of messages pending is returned in COUNT.
- */
-
-rtems_status_code rtems_message_queue_get_number_pending(
-  Objects_Id  id,
-  unsigned32 *count
-);
-
-
-/*
- *  _Message_queue_Submit
- *
- *  DESCRIPTION:
- *
- *  This routine implements the directives rtems_message_queue_send
- *  and rtems_message_queue_urgent.  It processes a message that is
- *  to be submitted to the designated message queue.  The message will
- *  either be processed as a send send message which it will be inserted
- *  at the rear of the queue or it will be processed as an urgent message
- *  which will be inserted at the front of the queue.
- */
- 
-rtems_status_code _Message_queue_Submit(
-  Objects_Id                  id,
-  void                       *buffer,
-  unsigned32                  size,
-  Message_queue_Submit_types  submit_type
-);
-
-/*
- *  _Message_queue_Allocate
- *
- *  DESCRIPTION:
- *
- *  This function allocates a message queue control block from
- *  the inactive chain of free message queue control blocks.
- */
-
-Message_queue_Control *_Message_queue_Allocate (
-    unsigned32          count,
-    unsigned32          max_message_size
-);
-
-/*
- *  _Message_queue_Translate_core_message_queue_return_code
- *
- *  DESCRIPTION:
- *
- *  This function returns a RTEMS status code based on the core message queue
- *  status code specified.
- */
- 
-rtems_status_code _Message_queue_Translate_core_message_queue_return_code (
-  unsigned32 the_message_queue_status
-);
-
-/*
- *
- *  _Message_queue_Core_message_queue_mp_support
- *
- *  Input parameters:
- *    the_thread - the remote thread the message was submitted to
- *    id         - id of the message queue
- *
- *  Output parameters: NONE
- */
- 
-void  _Message_queue_Core_message_queue_mp_support (
-  Thread_Control *the_thread,
-  Objects_Id      id
-);
-
-#ifndef __RTEMS_APPLICATION__
-#include <rtems/rtems/message.inl>
-#endif
-#include <rtems/rtems/msgmp.h>
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/rtems/include/rtems/rtems/modes.h b/c/src/exec/rtems/include/rtems/rtems/modes.h
deleted file mode 100644
index 05205078c5..0000000000
--- a/c/src/exec/rtems/include/rtems/rtems/modes.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*  modes.h
- *
- *  This include file contains all constants and structures associated
- *  with the RTEMS thread and RTEMS_ASR modes.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_MODES_h
-#define __RTEMS_MODES_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/isr.h>
-
-/*
- *  The following type defines the control block used to manage
- *  each a mode set.
- */
-
-typedef unsigned32 Modes_Control;
-
-/*
- *  The following constants define the individual modes and masks
- *  which may be used to compose a mode set and to alter modes.
- */
-
-#define RTEMS_ALL_MODE_MASKS     0x0000ffff
-
-#define RTEMS_DEFAULT_MODES     0x00000000
-#define RTEMS_CURRENT_MODE      0
-
-#define RTEMS_PREEMPT_MASK    0x00000100  /* preemption bit           */
-#define RTEMS_TIMESLICE_MASK  0x00000200  /* timeslice bit            */
-#define RTEMS_ASR_MASK        0x00000400  /* RTEMS_ASR enable bit           */
-#define RTEMS_INTERRUPT_MASK  CPU_MODES_INTERRUPT_MASK
-
-#define RTEMS_PREEMPT      0x00000000     /* enable preemption        */
-#define RTEMS_NO_PREEMPT   0x00000100     /* disable preemption       */
-
-#define RTEMS_NO_TIMESLICE 0x00000000     /* disable timeslicing      */
-#define RTEMS_TIMESLICE    0x00000200     /* enable timeslicing       */
-
-#define RTEMS_ASR          0x00000000     /* enable RTEMS_ASR               */
-#define RTEMS_NO_ASR       0x00000400     /* disable RTEMS_ASR              */
-
-/*
- *  The number of bits for interrupt levels is CPU dependent.
- *  RTEMS supports 0 to 256 levels in bits 0-7 of the mode.
- */
-
-/*PAGE
- *
- *  RTEMS_INTERRUPT_LEVEL
- *
- *  DESCRIPTION:
- *
- *  This function returns the processor dependent interrupt
- *  level which corresponds to the requested interrupt level.
- *
- * NOTE: RTEMS supports 256 interrupt levels using the least
- *       significant eight bits of MODES.CONTROL.  On any
- *       particular CPU, fewer than 256 levels may be supported.
- */
-
-#define RTEMS_INTERRUPT_LEVEL( _mode_set ) \
-  ( (_mode_set) & RTEMS_INTERRUPT_MASK )
- 
-
-#ifndef __RTEMS_APPLICATION__
-#include <rtems/rtems/modes.inl>
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/rtems/include/rtems/rtems/mp.h b/c/src/exec/rtems/include/rtems/rtems/mp.h
deleted file mode 100644
index 77dd8a707f..0000000000
--- a/c/src/exec/rtems/include/rtems/rtems/mp.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*  mp.h
- *
- *  This include file contains all the constants and structures associated
- *  with the Multiprocessing Manager.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_MP_h
-#define __RTEMS_MP_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- *
- *  _Multiprocessing_Manager_initialization
- *
- *  DESCRIPTION:
- *
- *  This routine performs the initialization necessary for this manager.
- */
-
-void _Multiprocessing_Manager_initialization ( void );
-
-/*
- *
- *  rtems_multiprocessing_announce
- *
- *  DESCRIPTION:
- *
- *  This routine implements the MULTIPROCESSING_ANNOUNCE directive.
- *  It is invoked by the MPCI layer to indicate that an MPCI packet
- *  has been received.
- */
-
-void rtems_multiprocessing_announce ( void );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/*  end of include file */
diff --git a/c/src/exec/rtems/include/rtems/rtems/msgmp.h b/c/src/exec/rtems/include/rtems/rtems/msgmp.h
deleted file mode 100644
index 64fa8da93b..0000000000
--- a/c/src/exec/rtems/include/rtems/rtems/msgmp.h
+++ /dev/null
@@ -1,177 +0,0 @@
-/*  msgmp.h
- *
- *  This include file contains all the constants and structures associated
- *  with the Multiprocessing Support in the Message Manager.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_MESSAGE_QUEUE_MP_h
-#define __RTEMS_MESSAGE_QUEUE_MP_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/rtems/message.h>
-#include <rtems/score/mppkt.h>
-#include <rtems/score/object.h>
-#include <rtems/rtems/options.h>
-#include <rtems/score/thread.h>
-#include <rtems/score/watchdog.h>
-
-/*
- *  The following enumerated type defines the list of
- *  remote message queue operations.
- */
-
-typedef enum {
-  MESSAGE_QUEUE_MP_ANNOUNCE_CREATE             =  0,
-  MESSAGE_QUEUE_MP_ANNOUNCE_DELETE             =  1,
-  MESSAGE_QUEUE_MP_EXTRACT_PROXY               =  2,
-  MESSAGE_QUEUE_MP_RECEIVE_REQUEST             =  3,
-  MESSAGE_QUEUE_MP_RECEIVE_RESPONSE            =  4,
-  MESSAGE_QUEUE_MP_SEND_REQUEST                =  5,
-  MESSAGE_QUEUE_MP_SEND_RESPONSE               =  6,
-  MESSAGE_QUEUE_MP_URGENT_REQUEST              =  7,
-  MESSAGE_QUEUE_MP_URGENT_RESPONSE             =  8,
-  MESSAGE_QUEUE_MP_BROADCAST_REQUEST           =  9,
-  MESSAGE_QUEUE_MP_BROADCAST_RESPONSE          = 10,
-  MESSAGE_QUEUE_MP_FLUSH_REQUEST               = 11,
-  MESSAGE_QUEUE_MP_FLUSH_RESPONSE              = 12,
-  MESSAGE_QUEUE_MP_GET_NUMBER_PENDING_REQUEST  = 13,
-  MESSAGE_QUEUE_MP_GET_NUMBER_PENDING_RESPONSE = 14
-}   Message_queue_MP_Remote_operations;
-
-/*
- *  The following data structure defines the packet used to perform
- *  remote message queue operations.
- */
-
-typedef struct {
-  rtems_packet_prefix                Prefix;
-  Message_queue_MP_Remote_operations operation;
-  rtems_name                         name;
-  rtems_option                       option_set;
-  Objects_Id                         proxy_id;
-  unsigned32                         count;
-  unsigned32                         size;
-  unsigned32                         pad0;
-  CORE_message_queue_Buffer          Buffer;
-}   Message_queue_MP_Packet;
-
-/*
- *  _Message_queue_MP_Send_process_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs a remote procedure call so that a
- *  process operation can be performed on another node.
- */
-
-void _Message_queue_MP_Send_process_packet (
-  Message_queue_MP_Remote_operations operation,
-  Objects_Id                         message_queue_id,
-  rtems_name                         name,
-  Objects_Id                         proxy_id
-);
-
-/*
- *  _Message_queue_MP_Send_request_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs a remote procedure call so that a
- *  directive operation can be initiated on another node.
- */
-
-rtems_status_code _Message_queue_MP_Send_request_packet (
-  Message_queue_MP_Remote_operations  operation,
-  Objects_Id                          message_queue_id,
-  void                               *buffer,
-  unsigned32                         *size_p,
-  rtems_option                        option_set,
-  Watchdog_Interval                   timeout
-);
-
-/*
- *  _Message_queue_MP_Send_response_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs a remote procedure call so that a
- *  directive can be performed on another node.
- */
-
-void _Message_queue_MP_Send_response_packet (
-  Message_queue_MP_Remote_operations  operation,
-  Objects_Id                          message_queue_id,
-  Thread_Control                     *the_thread
-);
-
-/*
- *
- *  _Message_queue_MP_Process_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs the actions specific to this package for
- *  the request from another node.
- */
-
-void _Message_queue_MP_Process_packet (
-  rtems_packet_prefix *the_packet_prefix
-);
-
-/*
- *  _Message_queue_MP_Send_object_was_deleted
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked indirectly by the thread queue
- *  when a proxy has been removed from the thread queue and
- *  the remote node must be informed of this.
- */
-
-void _Message_queue_MP_Send_object_was_deleted (
-  Thread_Control *the_proxy
-);
-
-/*
- *  _Message_queue_MP_Send_extract_proxy
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked when a task is deleted and it
- *  has a proxy which must be removed from a thread queue and
- *  the remote node must be informed of this.
- */
-
-void _Message_queue_MP_Send_extract_proxy (
-  Thread_Control *the_thread
-);
-
-/*
- *  _Message_queue_MP_Get_packet
- *
- *  DESCRIPTION:
- *
- *  This function is used to obtain a message queue mp packet.
- */
-
-Message_queue_MP_Packet *_Message_queue_MP_Get_packet ( void );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of file */
diff --git a/c/src/exec/rtems/include/rtems/rtems/options.h b/c/src/exec/rtems/include/rtems/rtems/options.h
deleted file mode 100644
index 7746524f98..0000000000
--- a/c/src/exec/rtems/include/rtems/rtems/options.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*  options.h
- *
- *  This include file contains information which defines the
- *  options available on many directives.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_OPTIONS_h
-#define __RTEMS_OPTIONS_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- *  The following type defines the control block used to manage
- *  option sets.
- */
-
-typedef unsigned32 rtems_option;
-
-/*
- *  The following constants define the individual options which may
- *  be used to compose an option set.
- */
-
-#define RTEMS_DEFAULT_OPTIONS   0x00000000
-
-#define RTEMS_WAIT      0x00000000        /* wait on resource */
-#define RTEMS_NO_WAIT   0x00000001        /* do not wait on resource */
-
-#define RTEMS_EVENT_ALL 0x00000000        /* wait for all events */
-#define RTEMS_EVENT_ANY 0x00000002        /* wait on any event */
-
-#ifndef __RTEMS_APPLICATION__
-#include <rtems/rtems/options.inl>
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/rtems/include/rtems/rtems/part.h b/c/src/exec/rtems/include/rtems/rtems/part.h
deleted file mode 100644
index 1d720db146..0000000000
--- a/c/src/exec/rtems/include/rtems/rtems/part.h
+++ /dev/null
@@ -1,168 +0,0 @@
-/*  partition.h
- *
- *  This include file contains all the constants and structures associated
- *  with the Partition Manager.  This manager provides facilities to
- *  dynamically allocate memory in fixed-sized units which are returned
- *  as buffers.
- *
- *  Directives provided are:
- *
- *     + create a partition
- *     + get an ID of a partition
- *     + delete a partition
- *     + get a buffer from a partition
- *     + return a buffer to a partition
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_PARTITION_h
-#define __RTEMS_PARTITION_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/address.h>
-#include <rtems/score/object.h>
-#include <rtems/rtems/attr.h>
-#include <rtems/rtems/types.h>
-
-/*
- *  The following defines the control block used to manage each partition.
- */
-
-typedef struct {
-  Objects_Control     Object;
-  void               *starting_address;      /* physical address */
-  unsigned32          length;                /* in bytes */
-  unsigned32          buffer_size;           /* in bytes */
-  rtems_attribute  attribute_set;         /* attributes */
-  unsigned32          number_of_used_blocks; /* or allocated buffers */
-  Chain_Control       Memory;                /* buffer chain */
-}   Partition_Control;
-
-/*
- *  The following defines the information control block used to
- *  manage this class of objects.
- */
-
-RTEMS_EXTERN Objects_Information _Partition_Information;
-
-/*
- *  _Partition_Manager_initialization
- *
- *  DESCRIPTION:
- *
- *  This routine performs the initialization necessary for this manager.
- */
-
-void _Partition_Manager_initialization(
-  unsigned32 maximum_partitions
-);
-
-/*
- *  rtems_partition_create
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_partition_create directive.  The
- *  partition will have the name name.  The memory area managed by
- *  the partition is of length bytes and starts at starting_address.
- *  The memory area will be divided into as many buffers of
- *  buffer_size bytes as possible.   The attribute_set determines if
- *  the partition is global or local.  It returns the id of the
- *  created partition in ID.
- */
-
-rtems_status_code rtems_partition_create(
-  rtems_name          name,
-  void               *starting_address,
-  unsigned32          length,
-  unsigned32          buffer_size,
-  rtems_attribute  attribute_set,
-  Objects_Id         *id
-);
-
-/*
- *  rtems_partition_ident
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_partition_ident directive.
- *  This directive returns the partition ID associated with name.
- *  If more than one partition is named name, then the partition
- *  to which the ID belongs is arbitrary.  node indicates the
- *  extent of the search for the ID of the partition named name.
- *  The search can be limited to a particular node or allowed to
- *  encompass all nodes.
- */
-
-rtems_status_code rtems_partition_ident(
-  rtems_name    name,
-  unsigned32    node,
-  Objects_Id   *id
-);
-
-/*
- *  rtems_partition_delete
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_partition_delete directive.  The
- *  partition indicated by ID is deleted.
- */
-
-rtems_status_code rtems_partition_delete(
-  Objects_Id id
-);
-
-/*
- *  rtems_partition_get_buffer
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_partition_get_buffer directive.  It
- *  attempts to allocate a buffer from the partition associated with ID.
- *  If a buffer is allocated, its address is returned in buffer.
- */
-
-rtems_status_code rtems_partition_get_buffer(
-  Objects_Id  id,
-  void       **buffer
-);
-
-/*
- *  rtems_partition_return_buffer
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_partition_return_buffer directive.  It
- *  frees the buffer to the partition associated with ID.  The buffer must
- *  have been previously allocated from the same partition.
- */
-
-rtems_status_code rtems_partition_return_buffer(
-  Objects_Id  id,
-  void       *buffer
-);
-
-#ifndef __RTEMS_APPLICATION__
-#include <rtems/rtems/part.inl>
-#endif
-#include <rtems/rtems/partmp.h>
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/rtems/include/rtems/rtems/partmp.h b/c/src/exec/rtems/include/rtems/rtems/partmp.h
deleted file mode 100644
index 0bac39258b..0000000000
--- a/c/src/exec/rtems/include/rtems/rtems/partmp.h
+++ /dev/null
@@ -1,161 +0,0 @@
-/*  partmp.h
- *
- *  This include file contains all the constants and structures associated
- *  with the Multiprocessing Support in the Partition Manager.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_PARTITION_MP_h
-#define __RTEMS_PARTITION_MP_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/mppkt.h>
-#include <rtems/score/object.h>
-#include <rtems/rtems/options.h>
-#include <rtems/score/thread.h>
-
-#include <rtems/rtems/part.h>
-
-/*
- *  The following enumerated type defines the list of
- *  remote partition operations.
- */
-
-typedef enum {
-  PARTITION_MP_ANNOUNCE_CREATE        =  0,
-  PARTITION_MP_ANNOUNCE_DELETE        =  1,
-  PARTITION_MP_EXTRACT_PROXY          =  2,
-  PARTITION_MP_GET_BUFFER_REQUEST     =  3,
-  PARTITION_MP_GET_BUFFER_RESPONSE    =  4,
-  PARTITION_MP_RETURN_BUFFER_REQUEST  =  5,
-  PARTITION_MP_RETURN_BUFFER_RESPONSE =  6
-}   Partition_MP_Remote_operations;
-
-/*
- *  The following data structure defines the packet used to perform
- *  remote partition operations.
- */
-
-typedef struct {
-  rtems_packet_prefix             Prefix;
-  Partition_MP_Remote_operations  operation;
-  rtems_name                      name;
-  void                           *buffer;
-  Objects_Id                      proxy_id;
-}   Partition_MP_Packet;
-
-/*
- *  _Partition_MP_Send_process_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs a remote procedure call so that a
- *  process operation can be performed on another node.
- */
-
-void _Partition_MP_Send_process_packet (
-  Partition_MP_Remote_operations operation,
-  Objects_Id                     partition_id,
-  rtems_name                     name,
-  Objects_Id                     proxy_id
-);
-
-/*
- *  _Partition_MP_Send_request_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs a remote procedure call so that a
- *  directive operation can be initiated on another node.
- */
-
-rtems_status_code _Partition_MP_Send_request_packet (
-  Partition_MP_Remote_operations  operation,
-  Objects_Id                      partition_id,
-  void                           *buffer
-);
-
-/*
- *  _Partition_MP_Send_response_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs a remote procedure call so that a
- *  directive can be performed on another node.
- */
-
-void _Partition_MP_Send_response_packet (
-  Partition_MP_Remote_operations  operation,
-  Objects_Id                      partition_id,
-  Thread_Control                 *the_thread
-);
-
-/*
- *
- *  _Partition_MP_Process_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs the actions specific to this package for
- *  the request from another node.
- */
-
-void _Partition_MP_Process_packet (
-  rtems_packet_prefix *the_packet_prefix
-);
-
-/*
- *  _Partition_MP_Send_object_was_deleted
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked indirectly by the thread queue
- *  when a proxy has been removed from the thread queue and
- *  the remote node must be informed of this.
- *
- *  This routine is not needed by the Partition since a partition
- *  cannot be deleted when buffers are in use.
- */
-
-/*
- *  _Partition_MP_Send_extract_proxy
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked when a task is deleted and it
- *  has a proxy which must be removed from a thread queue and
- *  the remote node must be informed of this.
- */
-
-void _Partition_MP_Send_extract_proxy (
-  Thread_Control *the_thread
-);
-
-/*
- *  _Partition_MP_Get_packet
- *
- *  DESCRIPTION:
- *
- *  This function is used to obtain a partition mp packet.
- */
-
-Partition_MP_Packet *_Partition_MP_Get_packet ( void );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of file */
diff --git a/c/src/exec/rtems/include/rtems/rtems/ratemon.h b/c/src/exec/rtems/include/rtems/rtems/ratemon.h
deleted file mode 100644
index 0e1dfbfad3..0000000000
--- a/c/src/exec/rtems/include/rtems/rtems/ratemon.h
+++ /dev/null
@@ -1,213 +0,0 @@
-/*  ratemon.h
- *
- *  This include file contains all the constants, structures, and
- *  prototypes associated with the Rate Monotonic Manager.  This manager
- *  provides facilities to implement tasks which execute in a periodic fashion.
- *
- *  Directives provided are:
- *
- *     + create a rate monotonic timer
- *     + cancel a period
- *     + delete a rate monotonic timer
- *     + conclude current and start the next period
- *     + obtain status information on a period
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_RATE_MONOTONIC_h
-#define __RTEMS_RATE_MONOTONIC_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/object.h>
-#include <rtems/score/thread.h>
-#include <rtems/score/watchdog.h>
-
-/*
- *  The following enumerated type defines the states in which a
- *  period may be.
- */
-
-typedef enum {
-  RATE_MONOTONIC_INACTIVE,               /* off chain, never initialized */
-  RATE_MONOTONIC_OWNER_IS_BLOCKING,      /* on chain, owner is blocking on it */
-  RATE_MONOTONIC_ACTIVE,                 /* on chain, running continuously */
-  RATE_MONOTONIC_EXPIRED_WHILE_BLOCKING, /* on chain, expired while owner was */
-                                         /*   was blocking on it */
-  RATE_MONOTONIC_EXPIRED                 /* off chain, will be reset by next */
-                                         /*   rtems_rate_monotonic_period */
-}   rtems_rate_monotonic_period_states;
-
-/*
- *  The following constant is the interval passed to the rate_monontonic_period
- *  directive to obtain status information.
- */
-
-#define RTEMS_PERIOD_STATUS       WATCHDOG_NO_TIMEOUT
-
-/* 
- *  The following defines the period status structure.
- */ 
-
-typedef struct {
-  rtems_rate_monotonic_period_states  state;
-  unsigned32                          ticks_since_last_period;
-  unsigned32                          ticks_executed_since_last_period;
-}  rtems_rate_monotonic_period_status;
-
-/*
- *  The following structure defines the control block used to manage
- *  each period.
- */
-
-typedef struct {
-  Objects_Control                     Object;
-  Watchdog_Control                    Timer;
-  rtems_rate_monotonic_period_states  state;
-  unsigned32                          owner_ticks_executed_at_period;
-  unsigned32                          time_at_period;
-  Thread_Control                     *owner;
-}   Rate_monotonic_Control;
-
-RTEMS_EXTERN Objects_Information _Rate_monotonic_Information;
-
-/*
- *  _Rate_monotonic_Manager_initialization
- *
- *  DESCRIPTION:
- *
- *  This routine performs the initialization necessary for this manager.
- */
-
-void _Rate_monotonic_Manager_initialization(
-  unsigned32 maximum_periods
-);
-
-/*
- *  rtems_rate_monotonic_create
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rate_monotonic_create directive.  The
- *  period will have the name name.  It returns the id of the
- *  created period in ID.
- */
-
-rtems_status_code rtems_rate_monotonic_create(
-  rtems_name    name,
-  Objects_Id   *id
-);
-
-/*
- *  rtems_rate_monotonic_ident
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_rate_monotonic_ident directive.
- *  This directive returns the period ID associated with name.
- *  If more than one period is named name, then the period
- *  to which the ID belongs is arbitrary.
- */
-
-rtems_status_code rtems_rate_monotonic_ident(
-  rtems_name    name,
-  Objects_Id   *id
-);
-
-/*
- *  rtems_rate_monotonic_cancel
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_rate_monotonic_cancel directive.  This
- *  directive stops the period associated with ID from continuing to
- *  run.
- */
-
-rtems_status_code rtems_rate_monotonic_cancel(
-  Objects_Id id
-);
-
-/*
- *  rtems_rate_monotonic_delete
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_rate_monotonic_delete directive.  The
- *  period indicated by ID is deleted.
- */
-
-rtems_status_code rtems_rate_monotonic_delete(
-  Objects_Id id
-);
-
-/*
- *  rtems_rate_monotonic_get_status
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_rate_monotonic_get_status directive.
- *  Information about the period indicated by ID is returned.
- *
- */
-
-rtems_status_code rtems_rate_monotonic_get_status(
-  Objects_Id                           id,
-  rtems_rate_monotonic_period_status  *status
-);
-
-/*
- *  rtems_rate_monotonic_period
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_rate_monotonic_period directive.  When
- *  length is non-zero, this directive initiates the period associated with
- *  ID from continuing for a period of length.  If length is zero, then
- *  result is set to indicate the current state of the period.
- */
-
-rtems_status_code rtems_rate_monotonic_period(
-  Objects_Id      id,
-  rtems_interval  length
-);
-
-/*
- *  _Rate_monotonic_Timeout
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked when the period represented
- *  by ID expires.  If the task which owns this period is blocked
- *  waiting for the period to expire, then it is readied and the
- *  period is restarted.  If the owning task is not waiting for the
- *  period to expire, then the period is placed in the EXPIRED
- *  state and not restarted.
- */
-
-void _Rate_monotonic_Timeout (
-  Objects_Id  id,
-  void       *ignored
-);
-
-#ifndef __RTEMS_APPLICATION__
-#include <rtems/rtems/ratemon.inl>
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/rtems/include/rtems/rtems/region.h b/c/src/exec/rtems/include/rtems/rtems/region.h
deleted file mode 100644
index 05418f6a95..0000000000
--- a/c/src/exec/rtems/include/rtems/rtems/region.h
+++ /dev/null
@@ -1,234 +0,0 @@
-/*  region.h
- *
- *  This include file contains all the constants and structures associated
- *  with the Region Manager.  This manager provides facilities to dynamically
- *  allocate memory in variable sized units which are returned as segments.
- *
- *  Directives provided are:
- *
- *     + create a region
- *     + get an ID of a region
- *     + delete a region
- *     + get a segment from a region
- *     + return a segment to a region
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_REGION_h
-#define __RTEMS_REGION_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/object.h>
-#include <rtems/score/threadq.h>
-#include <rtems/score/heap.h>
-#include <rtems/debug.h>
-#include <rtems/rtems/attr.h>
-#include <rtems/rtems/types.h>
-
-/*
- *  The following records define the control block used to manage
- *  each region.
- */
-
-typedef struct {
-  Objects_Control       Object;
-  Thread_queue_Control  Wait_queue;            /* waiting threads        */
-  void                 *starting_address;      /* physical start addr    */
-  unsigned32            length;                /* physical length(bytes) */
-  unsigned32            page_size;             /* in bytes               */
-  unsigned32            maximum_segment_size;  /* in bytes               */
-  rtems_attribute       attribute_set;
-  unsigned32            number_of_used_blocks; /* blocks allocated       */
-  Heap_Control          Memory;
-}  Region_Control;
-
-/*
- *  The following defines the information control block used to
- *  manage this class of objects.
- */
-
-RTEMS_EXTERN Objects_Information _Region_Information;
-
-/*
- *  _Region_Manager_initialization
- *
- *  DESCRIPTION:
- *
- *  This routine performs the initialization necessary for this manager.
- */
-
-void _Region_Manager_initialization(
-  unsigned32 maximum_regions
-);
-
-/*
- *  rtems_region_create
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_region_create directive.  The
- *  region will have the name name.  The memory area managed by
- *  the region is of length bytes and starts at starting_address.
- *  The memory area will be divided into as many allocatable units of
- *  page_size bytes as possible.   The attribute_set determines which
- *  thread queue discipline is used by the region.  It returns the
- *  id of the created region in ID.
- */
-
-rtems_status_code rtems_region_create(
-  rtems_name          name,
-  void               *starting_address,
-  unsigned32          length,
-  unsigned32          page_size,
-  rtems_attribute  attribute_set,
-  Objects_Id         *id
-);
-
-/*
- *  rtems_region_extend
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_region_extend directive.  The
- *  region will have the name name.  The memory area managed by
- *  the region will be attempted to be grown by length bytes using
- *  the memory starting at starting_address.
- */
-
-rtems_status_code rtems_region_extend(
-  Objects_Id          id,
-  void               *starting_address,
-  unsigned32          length
-);
-
-/*
- *  rtems_region_ident
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_region_ident directive.
- *  This directive returns the region ID associated with name.
- *  If more than one region is named name, then the region
- *  to which the ID belongs is arbitrary.
- */
-
-rtems_status_code rtems_region_ident(
-  rtems_name    name,
-  Objects_Id   *id
-);
-
-/*
- *  rtems_region_delete
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_region_delete directive.  The
- *  region indicated by ID is deleted.
- */
-
-rtems_status_code rtems_region_delete(
-  Objects_Id id
-);
-
-/*
- *  rtems_region_get_segment
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_region_get_segment directive.  It
- *  attempts to allocate a segment from the region associated with ID.
- *  If a segment of the requested size can be allocated, its address
- *  is returned in segment.  If no segment is available, then the task
- *  may return immediately or block waiting for a segment with an optional
- *  timeout of timeout clock ticks.  Whether the task blocks or returns
- *  immediately is based on the no_wait option in the option_set.
- */
-
-rtems_status_code rtems_region_get_segment(
-  Objects_Id         id,
-  unsigned32         size,
-  rtems_option       option_set,
-  rtems_interval     timeout,
-  void              **segment
-);
-
-/*
- *  rtems_region_get_segment_size
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_region_get_segment_size directive.  It
- *  returns the size in bytes of the specified user memory area.
- */
-
-rtems_status_code rtems_region_get_segment_size(
-  Objects_Id         id,
-  void              *segment,
-  unsigned32        *size
-);
-
-/*
- *  rtems_region_return_segment
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_region_return_segment directive.  It
- *  frees the segment to the region associated with ID.  The segment must
- *  have been previously allocated from the same region.  If freeing the
- *  segment results in enough memory being available to satisfy the
- *  rtems_region_get_segment of the first blocked task, then that task and as
- *  many subsequent tasks as possible will be unblocked with their requests
- *  satisfied.
- */
-
-rtems_status_code rtems_region_return_segment(
-  Objects_Id  id,
-  void       *segment
-);
-
-#ifndef __RTEMS_APPLICATION__
-#include <rtems/rtems/region.inl>
-#endif
-#include <rtems/rtems/regionmp.h>
-
-/*
- *  _Region_Debug_Walk
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked to verify the integrity of a heap associated
- *  with the_region.
- */
-
-#ifdef RTEMS_DEBUG
-
-#define _Region_Debug_Walk( _the_region, _source ) \
-  do { \
-    if ( _Debug_Is_enabled( RTEMS_DEBUG_REGION ) ) \
-      _Heap_Walk( &(_the_region)->Memory, _source, FALSE ); \
-  } while ( 0 )
-
-#else
-
-#define _Region_Debug_Walk( _the_region, _source )
-
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/rtems/include/rtems/rtems/regionmp.h b/c/src/exec/rtems/include/rtems/rtems/regionmp.h
deleted file mode 100644
index fcdfa03178..0000000000
--- a/c/src/exec/rtems/include/rtems/rtems/regionmp.h
+++ /dev/null
@@ -1,166 +0,0 @@
-/*  regionmp.h
- *
- *  This include file contains all the constants and structures associated
- *  with the Multiprocessing Support in the Region Manager.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_REGION_MP_h
-#define __RTEMS_REGION_MP_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/mppkt.h>
-#include <rtems/score/object.h>
-#include <rtems/score/thread.h>
-
-#include <rtems/rtems/options.h>
-#include <rtems/rtems/region.h>
-
-/*
- *  The following enumerated type defines the list of
- *  remote region operations.
- */
-
-typedef enum {
-  REGION_MP_ANNOUNCE_CREATE         =  0,
-  REGION_MP_ANNOUNCE_DELETE         =  1,
-  REGION_MP_EXTRACT_PROXY           =  2,
-  REGION_MP_GET_SEGMENT_REQUEST     =  3,
-  REGION_MP_GET_SEGMENT_RESPONSE    =  4,
-  REGION_MP_RETURN_SEGMENT_REQUEST  =  5,
-  REGION_MP_RETURN_SEGMENT_RESPONSE =  6
-}   Region_MP_Remote_operations;
-
-/*
- *  The following data structure defines the packet used to perform
- *  remote region operations.
- */
-
-typedef struct {
-  rtems_packet_prefix          Prefix;
-  Region_MP_Remote_operations  operation;
-  rtems_name                   name;
-  rtems_option                 option_set;
-  unsigned32                   size;
-  Objects_Id                   proxy_id;
-  void                        *segment;
-}   Region_MP_Packet;
-
-/*
- *  _Region_MP_Send_process_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs a remote procedure call so that a
- *  process operation can be performed on another node.
- */
-
-void _Region_MP_Send_process_packet (
-  Region_MP_Remote_operations operation,
-  Objects_Id                  region_id,
-  rtems_name                  name,
-  Objects_Id                  proxy_id
-);
-
-/*
- *  _Region_MP_Send_request_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs a remote procedure call so that a
- *  directive operation can be initiated on another node.
- */
-
-rtems_status_code _Region_MP_Send_request_packet (
-  Region_MP_Remote_operations  operation,
-  Objects_Id                   region_id,
-  void                        *segment,
-  unsigned32                   size,
-  rtems_option                 option_set,
-  rtems_interval               timeout
-);
-
-/*
- *  _Region_MP_Send_response_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs a remote procedure call so that a
- *  directive can be performed on another node.
- */
-
-void _Region_MP_Send_response_packet (
-  Region_MP_Remote_operations  operation,
-  Objects_Id                   region_id,
-  Thread_Control              *the_thread
-);
-
-/*
- *
- *  _Region_MP_Process_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs the actions specific to this package for
- *  the request from another node.
- */
-
-void _Region_MP_Process_packet (
-  rtems_packet_prefix *the_packet_prefix
-);
-
-/*
- *  _Region_MP_Send_object_was_deleted
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked indirectly by the thread queue
- *  when a proxy has been removed from the thread queue and
- *  the remote node must be informed of this.
- *
- *  This routine is not needed by the Region since a region
- *  cannot be deleted when segments are in use.
- */
-
-/*
- *  _Region_MP_Send_extract_proxy
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked when a task is deleted and it
- *  has a proxy which must be removed from a thread queue and
- *  the remote node must be informed of this.
- */
-
-void _Region_MP_Send_extract_proxy (
-  Thread_Control *the_thread
-);
-
-/*
- *  _Region_MP_Get_packet
- *
- *  DESCRIPTION:
- *
- *  This function is used to obtain a region mp packet.
- */
-
-Region_MP_Packet *_Region_MP_Get_packet ( void );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of file */
diff --git a/c/src/exec/rtems/include/rtems/rtems/rtemsapi.h b/c/src/exec/rtems/include/rtems/rtems/rtemsapi.h
deleted file mode 100644
index dcea660f43..0000000000
--- a/c/src/exec/rtems/include/rtems/rtems/rtemsapi.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- *  RTEMS API Support
- *
- *  NOTE:
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
- 
-#ifndef __RTEMS_API_h
-#define __RTEMS_API_h
- 
-#include <rtems/config.h>
-
-/*PAGE
- *
- *  _RTEMS_API_Initialize
- *
- *  XXX
- */
- 
-void _RTEMS_API_Initialize(
-  rtems_configuration_table *configuration_table
-);
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/rtems/include/rtems/rtems/sem.h b/c/src/exec/rtems/include/rtems/rtems/sem.h
deleted file mode 100644
index 191e62b414..0000000000
--- a/c/src/exec/rtems/include/rtems/rtems/sem.h
+++ /dev/null
@@ -1,248 +0,0 @@
-/*  semaphore.h
- *
- *  This include file contains all the constants and structures associated
- *  with the Semaphore Manager.  This manager utilizes standard Dijkstra
- *  counting semaphores to provide synchronization and mutual exclusion
- *  capabilities.
- *
- *  Directives provided are:
- *
- *     + create a semaphore
- *     + get an ID of a semaphore
- *     + delete a semaphore
- *     + acquire a semaphore
- *     + release a semaphore
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_SEMAPHORE_h
-#define __RTEMS_SEMAPHORE_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/rtems/types.h>
-#include <rtems/rtems/support.h>
-#include <rtems/rtems/tasks.h>
-#include <rtems/rtems/attr.h>
-#include <rtems/score/coremutex.h>
-#include <rtems/score/object.h>
-#include <rtems/score/coresem.h>
-#include <rtems/score/threadq.h>
-
-/*
- *  The following defines the control block used to manage each semaphore.
- */
-
-typedef struct {
-  Objects_Control          Object;
-  rtems_attribute          attribute_set;
-  union {
-    CORE_mutex_Control     mutex;
-    CORE_semaphore_Control semaphore;
-  } Core_control;
-}   Semaphore_Control;
-
-/*
- *  The following defines the information control block used to manage
- *  this class of objects.
- */
-
-RTEMS_EXTERN Objects_Information  _Semaphore_Information;
-
-/*
- *  _Semaphore_Manager_initialization
- *
- *  DESCRIPTION:
- *
- *  This routine performs the initialization necessary for this manager.
- */
-
-void _Semaphore_Manager_initialization(
-  unsigned32 maximum_semaphores
-);
-
-/*
- *  rtems_semaphore_create
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_semaphore_create directive.  The
- *  semaphore will have the name name.  The starting count for
- *  the semaphore is count.  The attribute_set determines if
- *  the semaphore is global or local and the thread queue
- *  discipline.  It returns the id of the created semaphore in ID.
- */
-
-rtems_status_code rtems_semaphore_create(
-  rtems_name           name,
-  unsigned32           count,
-  rtems_attribute      attribute_set,
-  rtems_task_priority  priority_ceiling,
-  rtems_id            *id
-);
-
-/*
- *  rtems_semaphore_ident
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_semaphore_ident directive.
- *  This directive returns the semaphore ID associated with name.
- *  If more than one semaphore is named name, then the semaphore
- *  to which the ID belongs is arbitrary.  node indicates the
- *  extent of the search for the ID of the semaphore named name.
- *  The search can be limited to a particular node or allowed to
- *  encompass all nodes.
- */
-
-rtems_status_code rtems_semaphore_ident(
-  rtems_name    name,
-  unsigned32    node,
-  rtems_id     *id
-);
-
-/*
- *  rtems_semaphore_delete
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_semaphore_delete directive.  The
- *  semaphore indicated by ID is deleted.
- */
-
-rtems_status_code rtems_semaphore_delete(
-  rtems_id   id
-);
-
-/*
- *  rtems_semaphore_obtain
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_semaphore_obtain directive.  It
- *  attempts to obtain a unit from the semaphore associated with ID.
- *  If a unit can be allocated, the calling task will return immediately.
- *  If no unit is available, then the task may return immediately or
- *  block waiting for a unit with an optional timeout of timeout
- *  clock ticks.  Whether the task blocks or returns immediately
- *  is based on the RTEMS_NO_WAIT option in the option_set.
- */
-
-rtems_status_code rtems_semaphore_obtain(
-  rtems_id       id,
-  unsigned32     option_set,
-  rtems_interval timeout
-);
-
-/*
- *  rtems_semaphore_release
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_semaphore_release directive.  It
- *  frees a unit to the semaphore associated with ID.  If a task was
- *  blocked waiting for a unit from this semaphore, then that task will
- *  be readied and the unit given to that task.  Otherwise, the unit
- *  will be returned to the semaphore.
- */
-
-rtems_status_code rtems_semaphore_release(
-  rtems_id   id
-);
-
-/*
- *  _Semaphore_Seize
- *
- *  DESCRIPTION:
- *
- *  This routine attempts to receive a unit from the_semaphore.
- *  If a unit is available or if the RTEMS_NO_WAIT option is enabled in
- *  option_set, then the routine returns.  Otherwise, the calling task
- *  is blocked until a unit becomes available.
- */
-
-boolean _Semaphore_Seize(
-  Semaphore_Control *the_semaphore,
-  unsigned32         option_set
-);
-
-/*
- *  _Semaphore_Translate_core_mutex_return_code
- *
- *  DESCRIPTION:
- *
- *  This function returns a RTEMS status code based on the mutex
- *  status code specified.
- */
- 
-rtems_status_code _Semaphore_Translate_core_mutex_return_code (
-  unsigned32 the_mutex_status
-);
-
-/*
- *  _Semaphore_Translate_core_semaphore_return_code
- *
- *  DESCRIPTION:
- *
- *  This function returns a RTEMS status code based on the semaphore
- *  status code specified.
- */
- 
-rtems_status_code _Semaphore_Translate_core_semaphore_return_code (
-  unsigned32 the_mutex_status
-);
- 
-/*PAGE
- *
- *  _Semaphore_Core_mutex_mp_support
- *
- *  DESCRIPTION:
- *
- *  This function processes the global actions necessary for remote
- *  accesses to a global semaphore based on a core mutex.  This function
- *  is called by the core.
- */
-
-void  _Semaphore_Core_mutex_mp_support (
-  Thread_Control *the_thread,
-  rtems_id        id
-);
-
-/*PAGE
- *
- *  _Semaphore_Core_mp_support
- *
- *  DESCRIPTION:
- *
- *  This function processes the global actions necessary for remote 
- *  accesses to a global semaphore based on a core semaphore.  This function
- *  is called by the core.
- */
- 
-void  _Semaphore_Core_semaphore_mp_support (
-  Thread_Control *the_thread,
-  rtems_id        id
-);
-
-#ifndef __RTEMS_APPLICATION__
-#include <rtems/rtems/sem.inl>
-#endif
-#include <rtems/rtems/semmp.h>
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/*  end of include file */
diff --git a/c/src/exec/rtems/include/rtems/rtems/semmp.h b/c/src/exec/rtems/include/rtems/rtems/semmp.h
deleted file mode 100644
index fdea66f6a4..0000000000
--- a/c/src/exec/rtems/include/rtems/rtems/semmp.h
+++ /dev/null
@@ -1,163 +0,0 @@
-/*  semmp.h
- *
- *  This include file contains all the constants and structures associated
- *  with the Multiprocessing Support in the Semaphore Manager.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_SEMAPHORE_MP_h
-#define __RTEMS_SEMAPHORE_MP_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/mppkt.h>
-#include <rtems/score/object.h>
-#include <rtems/rtems/options.h>
-#include <rtems/rtems/sem.h>
-#include <rtems/score/thread.h>
-#include <rtems/score/watchdog.h>
-
-/*
- *  The following enumerated type defines the list of
- *  remote semaphore operations.
- */
-
-typedef enum {
-  SEMAPHORE_MP_ANNOUNCE_CREATE  =  0,
-  SEMAPHORE_MP_ANNOUNCE_DELETE  =  1,
-  SEMAPHORE_MP_EXTRACT_PROXY    =  2,
-  SEMAPHORE_MP_OBTAIN_REQUEST   =  3,
-  SEMAPHORE_MP_OBTAIN_RESPONSE  =  4,
-  SEMAPHORE_MP_RELEASE_REQUEST  =  5,
-  SEMAPHORE_MP_RELEASE_RESPONSE =  6
-}   Semaphore_MP_Remote_operations;
-
-/*
- *  The following data structure defines the packet used to perform
- *  remote semaphore operations.
- */
-
-typedef struct {
-  rtems_packet_prefix             Prefix;
-  Semaphore_MP_Remote_operations  operation;
-  rtems_name                      name;
-  rtems_option                    option_set;
-  Objects_Id                      proxy_id;
-}   Semaphore_MP_Packet;
-
-/*
- *  _Semaphore_MP_Send_process_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs a remote procedure call so that a
- *  process operation can be performed on another node.
- */
-
-void _Semaphore_MP_Send_process_packet (
-  Semaphore_MP_Remote_operations operation,
-  Objects_Id                     semaphore_id,
-  rtems_name                     name,
-  Objects_Id                     proxy_id
-);
-
-/*
- *  _Semaphore_MP_Send_request_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs a remote procedure call so that a
- *  directive operation can be initiated on another node.
- */
-
-rtems_status_code _Semaphore_MP_Send_request_packet (
-  Semaphore_MP_Remote_operations operation,
-  Objects_Id                     semaphore_id,
-  rtems_option                   option_set,
-  rtems_interval                 timeout
-);
-
-/*
- *  _Semaphore_MP_Send_response_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs a remote procedure call so that a
- *  directive can be performed on another node.
- */
-
-void _Semaphore_MP_Send_response_packet (
-  Semaphore_MP_Remote_operations  operation,
-  Objects_Id                      semaphore_id,
-  Thread_Control                 *the_thread
-);
-
-/*
- *
- *  _Semaphore_MP_Process_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs the actions specific to this package for
- *  the request from another node.
- */
-
-void _Semaphore_MP_Process_packet (
-  rtems_packet_prefix *the_packet_prefix
-);
-
-/*
- *  _Semaphore_MP_Send_object_was_deleted
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked indirectly by the thread queue
- *  when a proxy has been removed from the thread queue and
- *  the remote node must be informed of this.
- */
-
-void _Semaphore_MP_Send_object_was_deleted (
-  Thread_Control *the_proxy
-);
-
-/*
- *  _Semaphore_MP_Send_extract_proxy
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked when a task is deleted and it
- *  has a proxy which must be removed from a thread queue and
- *  the remote node must be informed of this.
- */
-
-void _Semaphore_MP_Send_extract_proxy (
-  Thread_Control *the_thread
-);
-
-/*
- *  _Semaphore_MP_Get_packet
- *
- *  DESCRIPTION:
- *
- *  This function is used to obtain a semaphore mp packet.
- */
-
-Semaphore_MP_Packet *_Semaphore_MP_Get_packet ( void );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of file */
diff --git a/c/src/exec/rtems/include/rtems/rtems/signal.h b/c/src/exec/rtems/include/rtems/rtems/signal.h
deleted file mode 100644
index 2b247762e9..0000000000
--- a/c/src/exec/rtems/include/rtems/rtems/signal.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*  signal.h
- *
- *  This include file contains all the constants and structures associated
- *  with the Signal Manager.   This manager provides capabilities required
- *  for asynchronous communication between tasks via signal sets.
- *
- *  Directives provided are:
- *
- *     + establish an asynchronous signal routine
- *     + send a signal set to a task
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_SIGNAL_h
-#define __RTEMS_SIGNAL_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/rtems/asr.h>
-#include <rtems/rtems/modes.h>
-#include <rtems/score/object.h>
-#include <rtems/rtems/status.h>
-#include <rtems/rtems/types.h>
-
-/*
- *  _Signal_Manager_initialization
- *
- *  DESCRIPTION:
- *
- *  This routine performs the initialization necessary for this manager.
- */
- 
-void _Signal_Manager_initialization( void );
-
-/*
- *  rtems_signal_catch
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_signal_catch directive.  This directive
- *  is used to establish asr_handler as the Asynchronous Signal Routine
- *  (RTEMS_ASR) for the calling task.  The asr_handler will execute with a
- *  mode of mode_set.
- */
-
-rtems_status_code rtems_signal_catch(
-  rtems_asr_entry   asr_handler,
-  rtems_mode        mode_set
-);
-
-/*
- *  rtems_signal_send
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_signal_send directive.  This directive
- *  sends the signal_set to the task specified by ID.
- */
-
-rtems_status_code rtems_signal_send(
-  Objects_Id             id,
-  rtems_signal_set signal_set
-);
-
-#include <rtems/rtems/signalmp.h>
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/rtems/include/rtems/rtems/signalmp.h b/c/src/exec/rtems/include/rtems/rtems/signalmp.h
deleted file mode 100644
index 2b13a0707e..0000000000
--- a/c/src/exec/rtems/include/rtems/rtems/signalmp.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/*  signalmp.h
- *
- *  This include file contains all the constants and structures associated
- *  with the Multiprocessing Support in the Signal Manager.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_SIGNAL_MP_h
-#define __RTEMS_SIGNAL_MP_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/rtems/asr.h>
-#include <rtems/score/mppkt.h>
-#include <rtems/score/object.h>
-#include <rtems/score/thread.h>
-#include <rtems/score/watchdog.h>
-
-/*
- *  The following enumerated type defines the list of
- *  remote signal operations.
- */
-
-typedef enum {
-  SIGNAL_MP_SEND_REQUEST  = 0,
-  SIGNAL_MP_SEND_RESPONSE = 1
-}   Signal_MP_Remote_operations;
-
-/*
- *  The following data structure defines the packet used to perform
- *  remote signal operations.
- */
-
-typedef struct {
-  rtems_packet_prefix          Prefix;
-  Signal_MP_Remote_operations  operation;
-  rtems_signal_set             signal_in;
-}   Signal_MP_Packet;
-
-/*
- *  _Signal_MP_Send_process_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs a remote procedure call so that a
- *  process operation can be performed on another node.
- *
- *  This routine is not needed since there are no process
- *  packets to be sent by this manager.
- */
-
-/*
- *  _Signal_MP_Send_request_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs a remote procedure call so that a
- *  directive operation can be initiated on another node.
- */
-
-rtems_status_code _Signal_MP_Send_request_packet (
-  Signal_MP_Remote_operations operation,
-  Objects_Id                  task_id,
-  rtems_signal_set      signal_in
-);
-
-/*
- *  _Signal_MP_Send_response_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs a remote procedure call so that a
- *  directive can be performed on another node.
- */
-
-void _Signal_MP_Send_response_packet (
-  Signal_MP_Remote_operations  operation,
-  Thread_Control              *the_thread
-);
-
-/*
- *
- *  _Signal_MP_Process_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs the actions specific to this package for
- *  the request from another node.
- */
-
-void _Signal_MP_Process_packet (
-  rtems_packet_prefix *the_packet_prefix
-);
-
-/*
- *  _Signal_MP_Send_object_was_deleted
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked indirectly by the thread queue
- *  when a proxy has been removed from the thread queue and
- *  the remote node must be informed of this.
- *
- *  This routine is not needed since there are no objects
- *  deleted by this manager.
- */
-
-/*
- *  _Signal_MP_Send_extract_proxy
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked when a task is deleted and it
- *  has a proxy which must be removed from a thread queue and
- *  the remote node must be informed of this.
- *
- *  This routine is not needed since there are no objects
- *  deleted by this manager.
- */
-
-/*
- *  _Signal_MP_Get_packet
- *
- *  DESCRIPTION:
- *
- *  This function is used to obtain a signal mp packet.
- */
-
-Signal_MP_Packet *_Signal_MP_Get_packet ( void );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of file */
diff --git a/c/src/exec/rtems/include/rtems/rtems/status.h b/c/src/exec/rtems/include/rtems/rtems/status.h
deleted file mode 100644
index db1cf2049c..0000000000
--- a/c/src/exec/rtems/include/rtems/rtems/status.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*  status.h
- *
- *  This include file contains the status codes returned from the
- *  executive directives.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_STATUS_h
-#define __RTEMS_STATUS_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* types */
-
-/* enumerated constants */
-
-typedef enum {
-  RTEMS_SUCCESSFUL               =  0, /* successful completion */
-  RTEMS_TASK_EXITTED             =  1, /* returned from a thread */
-  RTEMS_MP_NOT_CONFIGURED        =  2, /* multiprocessing not configured */
-  RTEMS_INVALID_NAME             =  3, /* invalid object name */
-  RTEMS_INVALID_ID               =  4, /* invalid object id */
-  RTEMS_TOO_MANY                 =  5, /* too many */
-  RTEMS_TIMEOUT                  =  6, /* timed out waiting */
-  RTEMS_OBJECT_WAS_DELETED       =  7, /* object deleted while waiting */
-  RTEMS_INVALID_SIZE             =  8, /* specified size was invalid */
-  RTEMS_INVALID_ADDRESS          =  9, /* address specified is invalid */
-  RTEMS_INVALID_NUMBER           = 10, /* number was invalid */
-  RTEMS_NOT_DEFINED              = 11, /* item has not been initialized */
-  RTEMS_RESOURCE_IN_USE          = 12, /* resources still outstanding */
-  RTEMS_UNSATISFIED              = 13, /* request not satisfied */
-  RTEMS_INCORRECT_STATE          = 14, /* thread is in wrong state */
-  RTEMS_ALREADY_SUSPENDED        = 15, /* thread already in state */
-  RTEMS_ILLEGAL_ON_SELF          = 16, /* illegal on calling thread */
-  RTEMS_ILLEGAL_ON_REMOTE_OBJECT = 17, /* illegal for remote object */
-  RTEMS_CALLED_FROM_ISR          = 18, /* called from wrong environment */
-  RTEMS_INVALID_PRIORITY         = 19, /* invalid thread priority */
-  RTEMS_INVALID_CLOCK            = 20, /* invalid date/time */
-  RTEMS_INVALID_NODE             = 21, /* invalid node id */
-  RTEMS_NOT_CONFIGURED           = 22, /* directive not configured */
-  RTEMS_NOT_OWNER_OF_RESOURCE    = 23, /* not owner of resource */
-  RTEMS_NOT_IMPLEMENTED          = 24, /* directive not implemented */
-  RTEMS_INTERNAL_ERROR           = 25, /* RTEMS inconsistency detected */
-  RTEMS_NO_MEMORY                = 26, /* could not get enough memory */
-  RTEMS_IO_ERROR                 = 27, /* driver IO error */
-  RTEMS_PROXY_BLOCKING           = 28  /* internal error only */
-} rtems_status_code;
-
-#define RTEMS_STATUS_CODES_FIRST RTEMS_SUCCESSFUL
-#define RTEMS_STATUS_CODES_LAST  RTEMS_PROXY_BLOCKING
-
-extern rtems_status_code _Status_Object_name_errors_to_status[];
-
-#ifdef RTEMS_API_INIT
-rtems_status_code _Status_Object_name_errors_to_status[] = {
-  RTEMS_SUCCESSFUL,      /* OBJECTS_SUCCESSFUL */
-  RTEMS_INVALID_NAME,    /* OBJECTS_INVALID_NAME */
-  RTEMS_INVALID_NODE     /* OBJECTS_INVALID_NODE */
-};
-#endif
-
-/*
- *  Applications are allowed to use the macros to compare status codes.
- */
-
-#include <rtems/rtems/status.inl>
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/rtems/include/rtems/rtems/support.h b/c/src/exec/rtems/include/rtems/rtems/support.h
deleted file mode 100644
index 643b4295bd..0000000000
--- a/c/src/exec/rtems/include/rtems/rtems/support.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/*  support.h
- *
- *  This include file contains information about support functions for
- *  the RTEMS API.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_RTEMS_SUPPORT_h
-#define __RTEMS_RTEMS_SUPPORT_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/rtems/types.h>
-
-/*
- *  rtems_build_name
- *
- *  DESCRIPTION:
- *
- *  This function returns an object name composed of the four characters
- *  C1, C2, C3, and C4.
- *
- *  NOTE:
- *
- *  This must be implemented as a macro for use in Configuration Tables.
- *
- */
- 
-#define rtems_build_name( _C1, _C2, _C3, _C4 ) \
-  ( (_C1) << 24 | (_C2) << 16 | (_C3) << 8 | (_C4) )
- 
-/*
- *  rtems_get_class
- *
- *  DESCRIPTION:
- *
- *  This function returns the class portion of the ID.
- *
- */
- 
-#define rtems_get_class( _id ) \
-  _Objects_Get_class( _id )
- 
-/*
- *  rtems_get_node
- *
- *  DESCRIPTION:
- *
- *  This function returns the node portion of the ID.
- *
- */
- 
-#define rtems_get_node( _id ) \
-  _Objects_Get_node( _id )
- 
-/*
- *  rtems_get_index
- *
- *  DESCRIPTION:
- *
- *  This function returns the index portion of the ID.
- *
- */
- 
-#define rtems_get_index( _id ) \
-  _Objects_Get_index( _id )
-
-/*
- *  Time related
- */
-
-#define RTEMS_MILLISECONDS_TO_MICROSECONDS(_ms) \
-        TOD_MILLISECONDS_TO_MICROSECONDS(_ms)
-#define RTEMS_MILLISECONDS_TO_TICKS(_ms) \
-        TOD_MILLISECONDS_TO_TICKS(_ms)
-#define RTEMS_MICROSECONDS_TO_TICKS(_ms) \
-        TOD_MICROSECONDS_TO_TICKS(_ms)
-
-#ifndef __RTEMS_APPLICATION__
-#include <rtems/rtems/support.inl>
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/rtems/include/rtems/rtems/taskmp.h b/c/src/exec/rtems/include/rtems/rtems/taskmp.h
deleted file mode 100644
index a1ff0a3715..0000000000
--- a/c/src/exec/rtems/include/rtems/rtems/taskmp.h
+++ /dev/null
@@ -1,167 +0,0 @@
-/*  taskmp.h
- *
- *  This include file contains all the constants and structures associated
- *  with the multiprocessing support in the task manager.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_RTEMS_TASKS_MP_h
-#define __RTEMS_RTEMS_TASKS_MP_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/mppkt.h>
-#include <rtems/score/object.h>
-#include <rtems/rtems/options.h>
-#include <rtems/score/priority.h>
-#include <rtems/rtems/tasks.h>
-#include <rtems/score/thread.h>
-
-/*
- *  The following enumerated type defines the list of
- *  remote task operations.
- */
-
-typedef enum {
-  RTEMS_TASKS_MP_ANNOUNCE_CREATE       =  0,
-  RTEMS_TASKS_MP_ANNOUNCE_DELETE       =  1,
-  RTEMS_TASKS_MP_SUSPEND_REQUEST       =  2,
-  RTEMS_TASKS_MP_SUSPEND_RESPONSE      =  3,
-  RTEMS_TASKS_MP_RESUME_REQUEST        =  4,
-  RTEMS_TASKS_MP_RESUME_RESPONSE       =  5,
-  RTEMS_TASKS_MP_SET_PRIORITY_REQUEST  =  6,
-  RTEMS_TASKS_MP_SET_PRIORITY_RESPONSE =  7,
-  RTEMS_TASKS_MP_GET_NOTE_REQUEST      =  8,
-  RTEMS_TASKS_MP_GET_NOTE_RESPONSE     =  9,
-  RTEMS_TASKS_MP_SET_NOTE_REQUEST      = 10,
-  RTEMS_TASKS_MP_SET_NOTE_RESPONSE     = 11
-}   RTEMS_tasks_MP_Remote_operations;
-
-/*
- *  The following data structure defines the packet used to perform
- *  remote task operations.
- */
-
-typedef struct {
-  rtems_packet_prefix               Prefix;
-  RTEMS_tasks_MP_Remote_operations  operation;
-  rtems_name                        name;
-  rtems_task_priority               the_priority;
-  unsigned32                        notepad;
-  unsigned32                        note;
-}   RTEMS_tasks_MP_Packet;
-
-/*
- *  _RTEMS_tasks_MP_Send_process_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs a remote procedure call so that a
- *  process operation can be performed on another node.
- */
-
-void _RTEMS_tasks_MP_Send_process_packet (
-  RTEMS_tasks_MP_Remote_operations operation,
-  Objects_Id                       task_id,
-  rtems_name                       name
-);
-
-/*
- *  _RTEMS_tasks_MP_Send_request_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs a remote procedure call so that a
- *  directive operation can be initiated on another node.
- */
-
-rtems_status_code _RTEMS_tasks_MP_Send_request_packet (
-  RTEMS_tasks_MP_Remote_operations operation,
-  Objects_Id                       task_id,
-  rtems_task_priority                 the_priority,
-  unsigned32                       notepad,
-  unsigned32                       note
-);
-
-/*
- *  _RTEMS_tasks_MP_Send_response_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs a remote procedure call so that a
- *  directive can be performed on another node.
- */
-
-void _RTEMS_tasks_MP_Send_response_packet (
-  RTEMS_tasks_MP_Remote_operations  operation,
-  Thread_Control                   *the_thread
-);
-
-/*
- *
- *  _RTEMS_tasks_MP_Process_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs the actions specific to this package for
- *  the request from another node.
- */
-
-void _RTEMS_tasks_MP_Process_packet (
-  rtems_packet_prefix *the_packet_prefix
-);
-
-/*
- *  _RTEMS_tasks_MP_Send_object_was_deleted
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked indirectly by the thread queue
- *  when a proxy has been removed from the thread queue and
- *  the remote node must be informed of this.
- *
- *  This routine is not needed by RTEMS_tasks since a task
- *  cannot be deleted when segments are in use.
- */
-
-/*
- *  _RTEMS_tasks_MP_Send_extract_proxy
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked when a task is deleted and it
- *  has a proxy which must be removed from a thread queue and
- *  the remote node must be informed of this.
- *
- *  This routine is not needed since there are no objects
- *  deleted by this manager.
- *
- */
-
-/*
- *  _RTEMS_tasks_MP_Get_packet
- *
- *  DESCRIPTION:
- *
- *  This function is used to obtain a task mp packet.
- */
-
-RTEMS_tasks_MP_Packet *_RTEMS_tasks_MP_Get_packet ( void );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of file */
diff --git a/c/src/exec/rtems/include/rtems/rtems/tasks.h b/c/src/exec/rtems/include/rtems/rtems/tasks.h
deleted file mode 100644
index 17730cee7f..0000000000
--- a/c/src/exec/rtems/include/rtems/rtems/tasks.h
+++ /dev/null
@@ -1,421 +0,0 @@
-/*  tasks.h
- *
- *  This include file contains all constants and structures associated
- *  with RTEMS tasks.  This manager provides a comprehensive set of directives
- *  to create, delete, and administer tasks.
- *
- *  Directives provided are:
- *
- *     + create a task
- *     + get an ID of a task
- *     + start a task
- *     + restart a task
- *     + delete a task
- *     + suspend a task
- *     + resume a task
- *     + set a task's priority
- *     + change the current task's mode
- *     + get a task notepad entry
- *     + set a task notepad entry
- *     + wake up after interval
- *     + wake up when specified
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_RTEMS_TASKS_h
-#define __RTEMS_RTEMS_TASKS_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/object.h>
-#include <rtems/score/states.h>
-#include <rtems/score/thread.h>
-#include <rtems/rtems/types.h>
-#include <rtems/rtems/eventset.h>
-#include <rtems/rtems/asr.h>
-#include <rtems/rtems/attr.h>
-#include <rtems/rtems/status.h>
-
-/*
- *  Constant to be used as the ID of current task
- */
-
-#define RTEMS_SELF                OBJECTS_ID_OF_SELF
-
-/*
- *  This constant is passed to the rtems_task_wake_after directive as the
- *  interval when a task wishes to yield the CPU.
- */
-
-#define RTEMS_YIELD_PROCESSOR WATCHDOG_NO_TIMEOUT
-
-/*
- *  Define the type for an RTEMS API task priority.
- */
-
-typedef Priority_Control rtems_task_priority;
-
-#define RTEMS_NO_PRIORITY           RTEMS_CURRENT_PRIORITY
-
-#define RTEMS_MINIMUM_PRIORITY      (PRIORITY_MINIMUM + 1)
-#define RTEMS_MAXIMUM_PRIORITY      PRIORITY_MAXIMUM
-
-/*
- *  The following constant is passed to rtems_task_set_priority when the
- *  caller wants to obtain the current priority.
- */
-
-#define RTEMS_CURRENT_PRIORITY      PRIORITY_MINIMUM   
-
-/*
- *  Notepads constants (indices into notepad array)
- */
- 
-#define RTEMS_NOTEPAD_FIRST 0             /* lowest numbered notepad */
-#define RTEMS_NOTEPAD_0    0              /* notepad location 0  */
-#define RTEMS_NOTEPAD_1    1              /* notepad location 1  */
-#define RTEMS_NOTEPAD_2    2              /* notepad location 2  */
-#define RTEMS_NOTEPAD_3    3              /* notepad location 3  */
-#define RTEMS_NOTEPAD_4    4              /* notepad location 4  */
-#define RTEMS_NOTEPAD_5    5              /* notepad location 5  */
-#define RTEMS_NOTEPAD_6    6              /* notepad location 6  */
-#define RTEMS_NOTEPAD_7    7              /* notepad location 7  */
-#define RTEMS_NOTEPAD_8    8              /* notepad location 8  */
-#define RTEMS_NOTEPAD_9    9              /* notepad location 9  */
-#define RTEMS_NOTEPAD_10   10             /* notepad location 10 */
-#define RTEMS_NOTEPAD_11   11             /* notepad location 11 */
-#define RTEMS_NOTEPAD_12   12             /* notepad location 12 */
-#define RTEMS_NOTEPAD_13   13             /* notepad location 13 */
-#define RTEMS_NOTEPAD_14   14             /* notepad location 14 */
-#define RTEMS_NOTEPAD_15   15             /* notepad location 15 */
-#define RTEMS_NOTEPAD_LAST RTEMS_NOTEPAD_15     /* highest numbered notepad */
- 
-#define RTEMS_NUMBER_NOTEPADS  (RTEMS_NOTEPAD_LAST+1)
-
-/*
- *  External API name for Thread_Control
- */
-
-typedef Thread_Control rtems_tcb;
-
-/*
- *  The following defines the "return type" of an RTEMS task.
- */
- 
-typedef void rtems_task;
-
-/*
- *  The following defines the argument to an RTEMS task.
- */
- 
-typedef unsigned32 rtems_task_argument;
-
-/*
- *  The following defines the type for the entry point of an RTEMS task.
- */
- 
-typedef rtems_task ( *rtems_task_entry )(
-                      rtems_task_argument
-                   );
- 
-/*
- *  The following records define the Initialization Tasks Table.
- *  Each entry contains the information required by RTEMS to
- *  create and start a user task automatically at executive
- *  initialization time.
- */
- 
-typedef struct {
-  rtems_name            name;              /* task name */
-  unsigned32            stack_size;        /* task stack size */
-  rtems_task_priority   initial_priority;  /* task priority */
-  rtems_attribute       attribute_set;     /* task attributes */
-  rtems_task_entry      entry_point;       /* task entry point */
-  rtems_mode            mode_set;          /* task initial mode */
-  unsigned32            argument;          /* task argument */
-} rtems_initialization_tasks_table;
-
-/*
- *  This is the API specific information required by each thread for
- *  the RTEMS API to function correctly.
- */
-
- 
-typedef struct {
-  unsigned32                Notepads[ RTEMS_NUMBER_NOTEPADS ];
-  rtems_event_set           pending_events;
-  rtems_event_set           event_condition;
-  ASR_Information           Signal;
-}  RTEMS_API_Control;
-
-/*
- *  The following defines the information control block used to
- *  manage this class of objects.
- */
-
-RTEMS_EXTERN Objects_Information _RTEMS_tasks_Information;
-
-/*
- *  These are used to manage the user initialization tasks.
- */
-
-RTEMS_EXTERN rtems_initialization_tasks_table 
-               *_RTEMS_tasks_User_initialization_tasks;
-RTEMS_EXTERN unsigned32   _RTEMS_tasks_Number_of_initialization_tasks;
-
-/*
- *  _RTEMS_tasks_Manager_initialization
- *
- *  DESCRIPTION:
- *
- *  This routine initializes all Task Manager related data structures.
- */
- 
-void _RTEMS_tasks_Manager_initialization(
-  unsigned32                        maximum_tasks,
-  unsigned32                        number_of_initialization_tasks,
-  rtems_initialization_tasks_table *user_tasks
-);
-
-/*
- *  rtems_task_create
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_task_create directive.  The task
- *  will have the name name.  The attribute_set can be used to indicate
- *  that the task will be globally accessible or utilize floating point.
- *  The task's stack will be stack_size bytes.   The task will begin
- *  execution with initial_priority and initial_modes.  It returns the
- *  id of the created task in ID.
- */
-
-rtems_status_code rtems_task_create(
-  rtems_name           name,
-  rtems_task_priority  initial_priority,
-  unsigned32           stack_size,
-  rtems_mode           initial_modes,
-  rtems_attribute      attribute_set,
-  Objects_Id          *id
-);
-
-/*
- *  rtems_task_ident
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_task_ident directive.
- *  This directive returns the task ID associated with name.
- *  If more than one task is named name, then the task to
- *  which the ID belongs is arbitrary.  node indicates the
- *  extent of the search for the ID of the task named name.
- *  The search can be limited to a particular node or allowed to
- *  encompass all nodes.
- */
-
-rtems_status_code rtems_task_ident(
-  rtems_name    name,
-  unsigned32    node,
-  Objects_Id   *id
-);
-
-/*
- *  rtems_task_delete
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_task_delete directive.  The
- *  task indicated by ID is deleted.
- */
-
-rtems_status_code rtems_task_delete(
-  Objects_Id id
-);
-
-/*
- *  rtems_task_get_note
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_task_get_note directive.  The
- *  value of the indicated notepad for the task associated with ID
- *  is returned in note.
- */
-
-rtems_status_code rtems_task_get_note(
-  Objects_Id  id,
-  unsigned32  notepad,
-  unsigned32 *note
-);
-
-/*
- *  rtems_task_set_note
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_task_set_note directive.  The
- *  value of the indicated notepad for the task associated with ID
- *  is returned in note.
- */
-
-rtems_status_code rtems_task_set_note(
-  Objects_Id id,
-  unsigned32 notepad,
-  unsigned32 note
-);
-
-/*
- *  rtems_task_mode
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_task_mode directive.  The current
- *  values of the modes indicated by mask of the calling task are changed
- *  to that indicated in mode_set.  The former mode of the task is
- *  returned in mode_set.
- */
-
-rtems_status_code rtems_task_mode(
-  rtems_mode  mode_set,
-  rtems_mode  mask,
-  rtems_mode *previous_mode_set
-);
-
-/*
- *  rtems_task_restart
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_task_restart directive.  The
- *  task associated with ID is restarted at its initial entry
- *  point with the new argument.
- */
-
-rtems_status_code rtems_task_restart(
-  Objects_Id id,
-  unsigned32 arg
-);
-
-/*
- *  rtems_task_suspend
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_task_suspend directive.  The
- *  SUSPENDED state is set for task associated with ID.
- */
-
-rtems_status_code rtems_task_suspend(
-  Objects_Id id
-);
-
-/*
- *  rtems_task_resume
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_task_resume Directive.  The
- *  SUSPENDED state is cleared for task associated with ID.
- */
-
-rtems_status_code rtems_task_resume(
-  Objects_Id id
-);
-
-/*
- *  rtems_task_set_priority
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_task_set_priority directive.  The
- *  current priority of the task associated with ID is set to
- *  new_priority.  The former priority of that task is returned
- *  in old_priority.
- */
-
-rtems_status_code rtems_task_set_priority(
-  Objects_Id           id,
-  rtems_task_priority  new_priority,
-  rtems_task_priority *old_priority
-);
-
-/*
- *  rtems_task_start
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_task_start directive.  The
- *  starting execution point of the task associated with ID is
- *  set to entry_point with the initial argument.
- */
-
-rtems_status_code rtems_task_start(
-  Objects_Id   id,
-  rtems_task_entry entry_point,
-  unsigned32   argument
-);
-
-/*
- *  rtems_task_wake_when
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_task_wake_when directive.  The
- *  calling task is blocked until the current time of day is
- *  equal to that indicated by time_buffer.
- */
-
-rtems_status_code rtems_task_wake_when(
-  rtems_time_of_day *time_buffer
-);
-
-/*
- *  rtems_task_wake_after
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_task_wake_after directive.  The
- *  calling task is blocked until the indicated number of clock
- *  ticks have occurred.
- */
-
-rtems_status_code rtems_task_wake_after(
-  rtems_interval  ticks
-);
-
-/*PAGE
- *
- *  _RTEMS_tasks_Initialize_user_tasks
- *
- *  This routine creates and starts all configured user
- *  initialzation threads.
- *
- *  Input parameters: NONE
- *
- *  Output parameters:  NONE
- */
- 
-void _RTEMS_tasks_Initialize_user_tasks( void );
-
-#ifndef __RTEMS_APPLICATION__
-#include <rtems/rtems/tasks.inl>
-#endif
-#include <rtems/rtems/taskmp.h>
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/rtems/include/rtems/rtems/timer.h b/c/src/exec/rtems/include/rtems/rtems/timer.h
deleted file mode 100644
index 4ef567c9bc..0000000000
--- a/c/src/exec/rtems/include/rtems/rtems/timer.h
+++ /dev/null
@@ -1,207 +0,0 @@
-/*  timer.h
- *
- *  This include file contains all the constants, structures, and
- *  prototypes associated with the Timer Manager.  This manager provides
- *  facilities to configure, initiate, cancel, and delete timers which will
- *  fire at specified intervals of time.
- *
- *  Directives provided are:
- *
- *     + create a timer
- *     + get an ID of a timer
- *     + delete a timer
- *     + set a timer to fire after a number of ticks have passed
- *     + set a timer to fire when a specified date and time has been reached
- *     + reset a timer
- *     + cancel a time
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_TIMER_h
-#define __RTEMS_TIMER_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/object.h>
-#include <rtems/score/tod.h>
-#include <rtems/score/watchdog.h>
-
-/*
- *  The following enumerated type details the classes to which a timer
- *  may belong.
- */
-
-typedef enum {
-  TIMER_INTERVAL,
-  TIMER_TIME_OF_DAY,
-  TIMER_DORMANT
-} Timer_Classes;
-
-/*
- *  The following types define a pointer to a timer service routine.
- */
- 
-typedef void rtems_timer_service_routine;
- 
-typedef rtems_timer_service_routine ( *rtems_timer_service_routine_entry )(
-                 rtems_id,
-                 void *
-             );
-
-/*
- *  The following defines the information control block used to manage
- *  this class of objects.
- */
-
-RTEMS_EXTERN Objects_Information  _Timer_Information;
-
-/*
- *  The following records define the control block used to manage
- *  each timer.
- */
-
-typedef struct {
-  Objects_Control  Object;
-  Watchdog_Control Ticker;
-  Timer_Classes    the_class;
-}   Timer_Control;
-
-/*
- *  _Timer_Manager_initialization
- *
- *  DESCRIPTION:
- *
- *  This routine performs the initialization necessary for this manager.
- */
-
-void _Timer_Manager_initialization(
-  unsigned32 maximum_timers
-);
-
-/*
- *  rtems_timer_create
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_timer_create directive.  The
- *  timer will have the name name.  It returns the id of the
- *  created timer in ID.
- */
-
-rtems_status_code rtems_timer_create(
-  rtems_name    name,
-  Objects_Id   *id
-);
-
-/*
- *  rtems_timer_ident
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_timer_ident directive.
- *  This directive returns the timer ID associated with name.
- *  If more than one timer is named name, then the timer
- *  to which the ID belongs is arbitrary.
- */
-
-rtems_status_code rtems_timer_ident(
-  rtems_name    name,
-  Objects_Id   *id
-);
-
-/*
- *  rtems_timer_cancel
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_timer_cancel directive.  It is used
- *  to stop the timer associated with ID from firing.
- */
-
-rtems_status_code rtems_timer_cancel(
-  Objects_Id id
-);
-
-/*
- *  rtems_timer_delete
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_timer_delete directive.  The
- *  timer indicated by ID is deleted.
- */
-
-rtems_status_code rtems_timer_delete(
-  Objects_Id id
-);
-
-/*
- *  rtems_timer_fire_after
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_timer_fire_after directive.  It
- *  initiates the timer associated with ID to fire in ticks clock
- *  ticks.  When the timer fires, the routine will be invoked.
- */
-
-rtems_status_code rtems_timer_fire_after(
-  Objects_Id                         id,
-  rtems_interval                     ticks,
-  rtems_timer_service_routine_entry  routine,
-  void                              *user_data
-);
-
-/*
- *  rtems_timer_fire_when
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_timer_fire_when directive.  It
- *  initiates the timer associated with ID to fire at wall_time
- *  When the timer fires, the routine will be invoked.
- */
-
-rtems_status_code rtems_timer_fire_when(
-  Objects_Id                          id,
-  rtems_time_of_day                  *wall_time,
-  rtems_timer_service_routine_entry   routine,
-  void                               *user_data
-);
-
-/*
- *  rtems_timer_reset
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_timer_reset directive.  It is used
- *  to reinitialize the interval timer associated with ID just as if
- *  rtems_timer_fire_after were re-invoked with the same arguments that
- *  were used to initiate this timer.
- */
-
-rtems_status_code rtems_timer_reset(
-  Objects_Id id
-);
-
-#ifndef __RTEMS_APPLICATION__
-#include <rtems/rtems/timer.inl>
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/rtems/include/rtems/rtems/types.h b/c/src/exec/rtems/include/rtems/rtems/types.h
deleted file mode 100644
index 4d2915bafa..0000000000
--- a/c/src/exec/rtems/include/rtems/rtems/types.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/*  types.h
- *
- *  This include file defines the types used by the RTEMS API.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_RTEMS_TYPES_h
-#define __RTEMS_RTEMS_TYPES_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/object.h>
-#include <rtems/score/priority.h>
-#include <rtems/rtems/modes.h>
-#include <rtems/score/mpci.h>
-#include <rtems/score/mppkt.h>
-
-/*
- *  RTEMS basic type definitions
- */
-
-typedef unsigned8       rtems_unsigned8;  /* unsigned 8-bit value  */
-typedef unsigned16      rtems_unsigned16; /* unsigned 16-bit value */
-typedef unsigned32      rtems_unsigned32; /* unsigned 32-bit value */
-
-typedef signed8         rtems_signed8;    /* signed 8-bit value  */
-typedef signed16        rtems_signed16;   /* signed 16-bit value */
-typedef signed32        rtems_signed32;   /* signed 32-bit value */
-
-/*
- * some C++ compilers (eg: HP's) don't do 'long long'
- */
-#if defined(__GNUC__)
-typedef unsigned64      rtems_unsigned64; /* unsigned 64-bit value */
-typedef signed64        rtems_signed64;   /* signed 64-bit value */
-#endif
-
-typedef single_precision rtems_single;    /* single precision float */
-typedef double_precision rtems_double;    /* double precision float */
-
-typedef boolean          rtems_boolean;
-
-typedef unsigned32       rtems_name;
-typedef Objects_Id       rtems_id;
-
-typedef Context_Control            rtems_context;
-typedef Context_Control_fp         rtems_context_fp;
-typedef CPU_Interrupt_frame        rtems_interrupt_frame;
-
-/*
- *  Time related 
- */
-
-typedef Watchdog_Interval rtems_interval;
-typedef TOD_Control       rtems_time_of_day;
-
-/*
- *  Define the type for an RTEMS API task mode.
- */
- 
-typedef Modes_Control rtems_mode;
-
-/*
- *  MPCI related entries
- */
-
-typedef MP_packet_Classes          rtems_mp_packet_classes;
-typedef MP_packet_Prefix           rtems_packet_prefix;
-
-typedef MPCI_initialization_entry  rtems_mpci_initialization_entry;
-typedef MPCI_get_packet_entry      rtems_mpci_get_packet_entry;
-typedef MPCI_return_packet_entry   rtems_mpci_return_packet_entry;
-typedef MPCI_send_entry            rtems_mpci_send_packet_entry;
-typedef MPCI_receive_entry         rtems_mpci_receive_packet_entry;
-
-typedef MPCI_Entry rtems_mpci_entry;
-
-typedef MPCI_Control rtems_mpci_table;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/rtems/inline/rtems/rtems/Makefile.in b/c/src/exec/rtems/inline/rtems/rtems/Makefile.in
deleted file mode 100644
index 9c11a33172..0000000000
--- a/c/src/exec/rtems/inline/rtems/rtems/Makefile.in
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-I_PIECES=asr attr dpmem event eventset message modes options \
-   part ratemon region sem status support tasks timer
-I_FILES=$(I_PIECES:%=$(srcdir)/%.inl)
-
-SRCS=$(I_FILES)
-
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/lib.cfg
-
-#
-# Add your list of files to delete here.  The config files
-#  already know how to delete some stuff, so you may want
-#  to just run 'make clean' first to see what gets missed.
-#  'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS += $(LIB)
-CLOBBER_ADDITIONS +=
-
-all:	$(SRCS)
-	$(INSTALL) -m 444 ${I_FILES} $(PROJECT_INCLUDE)/rtems/rtems
diff --git a/c/src/exec/rtems/inline/rtems/rtems/asr.inl b/c/src/exec/rtems/inline/rtems/rtems/asr.inl
deleted file mode 100644
index fede9dea9b..0000000000
--- a/c/src/exec/rtems/inline/rtems/rtems/asr.inl
+++ /dev/null
@@ -1,128 +0,0 @@
-/*  inline/asr.inl
- *
- *  This include file contains the implemenation of all routines
- *  associated with the asynchronous signal handler which are inlined.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __INLINE_ASR_inl
-#define __INLINE_ASR_inl
-
-#include <rtems/score/isr.h>
-
-/*PAGE
- *
- *  _ASR_Initialize
- *
- *  DESCRIPTION:
- *
- *  This routine initializes the given RTEMS_ASR information record.
- */
-
-RTEMS_INLINE_ROUTINE void _ASR_Initialize (
-  ASR_Information *information
-)
-{
-  information->is_enabled      = TRUE;
-  information->handler         = NULL;
-  information->mode_set        = RTEMS_DEFAULT_MODES;
-  information->signals_posted  = 0;
-  information->signals_pending = 0;
-  information->nest_level      = 0;
-}
-
-/*PAGE
- *
- *  _ASR_Swap_signals
- *
- *  DESCRIPTION:
- *
- *  This routine atomically swaps the pending and posted signal
- *  sets.  This is done when the thread alters its mode in such a
- *  way that the RTEMS_ASR disable/enable flag changes.
- */
-
-RTEMS_INLINE_ROUTINE void _ASR_Swap_signals (
-  ASR_Information *information
-)
-{
-  rtems_signal_set _signals;
-  ISR_Level        _level;
-
-  _ISR_Disable( _level );
-    _signals                     = information->signals_pending;
-    information->signals_pending = information->signals_posted;
-    information->signals_posted  = _signals;
-  _ISR_Enable( _level );
-}
-
-/*PAGE
- *
- *  _ASR_Is_null_handler
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the given asr_handler is NULL and
- *  FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _ASR_Is_null_handler (
-  rtems_asr_entry asr_handler
-)
-{
-  return asr_handler == NULL;
-}
-
-/*PAGE
- *
- *  _ASR_Are_signals_pending
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if there are signals pending in the
- *  given RTEMS_ASR information record and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _ASR_Are_signals_pending (
-  ASR_Information *information
-)
-{
-  return information->signals_posted != 0;
-}
-
-/*PAGE
- *
- *  _ASR_Post_signals
- *
- *  DESCRIPTION:
- *
- *  This routine posts the given signals into the signal_set
- *  passed in.  The result is returned to the user in signal_set.
- *
- *  NOTE:  This must be implemented as a macro.
- */
-
-RTEMS_INLINE_ROUTINE void _ASR_Post_signals(
-  rtems_signal_set  signals,
-  rtems_signal_set *signal_set
-)
-{
-  ISR_Level              _level;
-
-  _ISR_Disable( _level );
-    *signal_set |= signals;
-  _ISR_Enable( _level );
-}
-
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/rtems/inline/rtems/rtems/attr.inl b/c/src/exec/rtems/inline/rtems/rtems/attr.inl
deleted file mode 100644
index 3cec1edd3b..0000000000
--- a/c/src/exec/rtems/inline/rtems/rtems/attr.inl
+++ /dev/null
@@ -1,176 +0,0 @@
-/*  inline/attr.inl
- *
- *  This include file contains all of the inlined routines associated
- *  with attributes.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __INLINE_ATTRIBUTES_inl
-#define __INLINE_ATTRIBUTES_inl
-
-/*PAGE
- *
- *  _Attributes_Set
- *
- *  DESCRIPTION:
- *
- *  This function sets the requested new_attributes in the attribute_set
- *  passed in.  The result is returned to the user.
- */
-
-RTEMS_INLINE_ROUTINE rtems_attribute _Attributes_Set (
-   rtems_attribute new_attributes,
-   rtems_attribute attribute_set
-)
-{
-  return attribute_set | new_attributes;
-}
-
-/*PAGE
- *
- *  _Attributes_Clear
- *
- *  DESCRIPTION:
- *
- *  This function clears the requested new_attributes in the attribute_set
- *  passed in.  The result is returned to the user.
- */
-
-RTEMS_INLINE_ROUTINE rtems_attribute _Attributes_Clear (
-   rtems_attribute attribute_set,
-   rtems_attribute mask
-)
-{
-  return attribute_set & ~mask;
-}
-
-/*PAGE
- *
- *  _Attributes_Is_floating_point
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the floating point attribute is
- *  enabled in the attribute_set and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Attributes_Is_floating_point(
-  rtems_attribute attribute_set
-)
-{
-   return ( attribute_set & RTEMS_FLOATING_POINT );
-}
-
-/*PAGE
- *
- *  _Attributes_Is_global
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the global object attribute is
- *  enabled in the attribute_set and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Attributes_Is_global(
-  rtems_attribute attribute_set
-)
-{
-   return ( attribute_set & RTEMS_GLOBAL );
-}
-
-/*PAGE
- *
- *  _Attributes_Is_priority
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the priority attribute is
- *  enabled in the attribute_set and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Attributes_Is_priority(
-  rtems_attribute attribute_set
-)
-{
-   return ( attribute_set & RTEMS_PRIORITY );
-}
-
-/*PAGE
- *
- *  _Attributes_Is_binary_semaphore
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the binary semaphore attribute is
- *  enabled in the attribute_set and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Attributes_Is_binary_semaphore(
-  rtems_attribute attribute_set
-)
-{
-  return ( attribute_set & RTEMS_BINARY_SEMAPHORE );
-}
-
-/*PAGE
- *
- *  _Attributes_Is_inherit_priority
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the priority inheritance attribute
- *  is enabled in the attribute_set and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Attributes_Is_inherit_priority(
-  rtems_attribute attribute_set
-)
-{
-   return ( attribute_set & RTEMS_INHERIT_PRIORITY );
-}
-
-/*PAGE
- *
- *  _Attributes_Is_priority_ceiling
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the priority ceiling attribute
- *  is enabled in the attribute_set and FALSE otherwise.
- */
- 
-RTEMS_INLINE_ROUTINE boolean _Attributes_Is_priority_ceiling(
-  rtems_attribute attribute_set
-)
-{
-   return ( attribute_set & RTEMS_PRIORITY_CEILING );
-}
-
-/*PAGE
- *
- *  _Attributes_Is_system_task
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the system task attribute
- *  is enabled in the attribute_set and FALSE otherwise.
- */
- 
-RTEMS_INLINE_ROUTINE boolean _Attributes_Is_system_task(
-  rtems_attribute attribute_set
-)
-{
-   return ( attribute_set & RTEMS_PRIORITY_CEILING );
-}
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/rtems/inline/rtems/rtems/dpmem.inl b/c/src/exec/rtems/inline/rtems/rtems/dpmem.inl
deleted file mode 100644
index 777a886452..0000000000
--- a/c/src/exec/rtems/inline/rtems/rtems/dpmem.inl
+++ /dev/null
@@ -1,95 +0,0 @@
-/*  inline/dpmem.inl
- *
- *  This include file contains the inline routine used in conjunction
- *  with the Dual Ported Memory Manager
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __INLINE_DPMEM_inl
-#define __INLINE_DPMEM_inl
-
-
-/*PAGE
- *
- *  _Dual_ported_memory_Allocate
- *
- *  DESCRIPTION:
- *
- *  This routine allocates a port control block from the inactive chain
- *  of free port control blocks.
- */
-
-RTEMS_INLINE_ROUTINE Dual_ported_memory_Control
-   *_Dual_ported_memory_Allocate ( void )
-{
-  return (Dual_ported_memory_Control *)
-     _Objects_Allocate( &_Dual_ported_memory_Information );
-}
-
-/*PAGE
- *
- *  _Dual_ported_memory_Free
- *
- *  DESCRIPTION:
- *
- *  This routine frees a port control block to the inactive chain
- *  of free port control blocks.
- */
-
-RTEMS_INLINE_ROUTINE void _Dual_ported_memory_Free (
-   Dual_ported_memory_Control *the_port
-)
-{
-  _Objects_Free( &_Dual_ported_memory_Information, &the_port->Object );
-}
-
-/*PAGE
- *
- *  _Dual_ported_memory_Get
- *
- *  DESCRIPTION:
- *
- *  This function maps port IDs to port control blocks.  If ID
- *  corresponds to a local port, then it returns the_port control
- *  pointer which maps to ID and location is set to OBJECTS_LOCAL.
- *  Global ports are not supported, thus if ID  does not map to a
- *  local port, location is set to OBJECTS_ERROR and the_port is
- *  undefined.
- */
-
-RTEMS_INLINE_ROUTINE Dual_ported_memory_Control *_Dual_ported_memory_Get (
-  Objects_Id         id,
-  Objects_Locations *location
-)
-{
-  return (Dual_ported_memory_Control *)
-     _Objects_Get( &_Dual_ported_memory_Information, id, location );
-}
-
-/*PAGE
- *
- *  _Dual_ported_memory_Is_null
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the_port is NULL and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Dual_ported_memory_Is_null(
-  Dual_ported_memory_Control *the_port
-)
-{
-  return ( the_port == NULL );
-}
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/rtems/inline/rtems/rtems/event.inl b/c/src/exec/rtems/inline/rtems/rtems/event.inl
deleted file mode 100644
index a4c6ec7930..0000000000
--- a/c/src/exec/rtems/inline/rtems/rtems/event.inl
+++ /dev/null
@@ -1,21 +0,0 @@
-/*  inline/event.inl
- *
- *  This include file contains the static inline implementation of
- *  macros for the Event Manager.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __MACROS_EVENT_inl
-#define __MACROS_EVENT_inl
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/rtems/inline/rtems/rtems/eventset.inl b/c/src/exec/rtems/inline/rtems/rtems/eventset.inl
deleted file mode 100644
index eed8c33751..0000000000
--- a/c/src/exec/rtems/inline/rtems/rtems/eventset.inl
+++ /dev/null
@@ -1,95 +0,0 @@
-/*  inline/eventset.inl
- *
- *  This include file contains the information pertaining to event sets.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __INLINE_EVENT_SET_inl
-#define __INLINE_EVENT_SET_inl
-
-/*PAGE
- *
- *  _Event_sets_Is_empty
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if on events are posted in the event_set,
- *  and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Event_sets_Is_empty(
-  rtems_event_set the_event_set
-)
-{
-  return ( the_event_set == 0 );
-}
-
-/*PAGE
- *
- *  _Event_sets_Post
- *
- *  DESCRIPTION:
- *
- *  This routine posts the given new_events into the event_set
- *  passed in.  The result is returned to the user in event_set.
- */
-
-RTEMS_INLINE_ROUTINE void _Event_sets_Post(
-  rtems_event_set  the_new_events,
-  rtems_event_set *the_event_set
-)
-{
-  ISR_Level level;
-
-  _ISR_Disable( level );
-    *the_event_set |= the_new_events;
-  _ISR_Enable( level );
-}
-
-/*PAGE
- *
- *  _Event_sets_Get
- *
- *  DESCRIPTION:
- *
- *  This function returns the events in event_condition which are
- *  set in event_set.
- */
-
-RTEMS_INLINE_ROUTINE rtems_event_set _Event_sets_Get(
-  rtems_event_set the_event_set,
-  rtems_event_set the_event_condition
-)
-{
-   return ( the_event_set & the_event_condition );
-}
-
-/*PAGE
- *
- *  _Event_sets_Clear
- *
- *  DESCRIPTION:
- *
- *  This function removes the events in mask from the event_set
- *  passed in.  The result is returned to the user in event_set.
- */
-
-RTEMS_INLINE_ROUTINE rtems_event_set _Event_sets_Clear(
- rtems_event_set the_event_set,
- rtems_event_set the_mask
-)
-{
-   return ( the_event_set & ~(the_mask) );
-}
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/rtems/inline/rtems/rtems/message.inl b/c/src/exec/rtems/inline/rtems/rtems/message.inl
deleted file mode 100644
index f3f763ca2e..0000000000
--- a/c/src/exec/rtems/inline/rtems/rtems/message.inl
+++ /dev/null
@@ -1,83 +0,0 @@
-/*  message.inl
- *
- *  This include file contains the static inline implementation of all
- *  inlined routines in the Message Manager.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __MESSAGE_QUEUE_inl
-#define __MESSAGE_QUEUE_inl
-
-#include <rtems/score/wkspace.h>
-
-/*PAGE
- *
- *  _Message_queue_Is_null
- *
- *  DESCRIPTION:
- *
- *  This function places the_message at the rear of the outstanding
- *  messages on the_message_queue.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Message_queue_Is_null (
-  Message_queue_Control *the_message_queue
-)
-{
-  return ( the_message_queue == NULL  );
-}
-
-
-/*PAGE
- *
- *  _Message_queue_Free
- *
- *  DESCRIPTION:
- *
- *  This routine deallocates a message queue control block into
- *  the inactive chain of free message queue control blocks.
- */
-
-RTEMS_INLINE_ROUTINE void _Message_queue_Free (
-  Message_queue_Control *the_message_queue
-)
-{
-  _Objects_Free( &_Message_queue_Information, &the_message_queue->Object );
-}
-
-/*PAGE
- *
- *  _Message_queue_Get
- *
- *  DESCRIPTION:
- *
- *  This function maps message queue IDs to message queue control
- *  blocks.  If ID corresponds to a local message queue, then it
- *  returns the_message_queue control pointer which maps to ID
- *  and location is set to OBJECTS_LOCAL.  If the message queue ID is
- *  global and resides on a remote node, then location is set
- *  to OBJECTS_REMOTE, and the_message_queue is undefined.
- *  Otherwise, location is set to OBJECTS_ERROR and
- *  the_message_queue is undefined.
- */
-
-RTEMS_INLINE_ROUTINE Message_queue_Control *_Message_queue_Get (
-  Objects_Id         id,
-  Objects_Locations *location
-)
-{
-  return (Message_queue_Control *)
-     _Objects_Get( &_Message_queue_Information, id, location );
-}
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/rtems/inline/rtems/rtems/modes.inl b/c/src/exec/rtems/inline/rtems/rtems/modes.inl
deleted file mode 100644
index f72c2468e3..0000000000
--- a/c/src/exec/rtems/inline/rtems/rtems/modes.inl
+++ /dev/null
@@ -1,152 +0,0 @@
-/*  modes.inl
- *
- *  This include file contains the static inline implementation of the
- *  inlined routines in the Mode Handler
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __MODES_inl
-#define __MODES_inl
-
-/*PAGE
- *
- *  _Modes_Mask_changed
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if any of the mode flags in mask
- *  are set in mode_set, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Modes_Mask_changed (
-  Modes_Control mode_set,
-  Modes_Control masks
-)
-{
-   return ( mode_set & masks );
-}
-
-/*PAGE
- *
- *  _Modes_Is_asr_disabled
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if mode_set indicates that Asynchronous
- *  Signal Processing is disabled, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Modes_Is_asr_disabled (
-  Modes_Control mode_set
-)
-{
-   return (mode_set & RTEMS_ASR_MASK) == RTEMS_NO_ASR;
-}
-
-/*PAGE
- *
- *  _Modes_Is_preempt
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if mode_set indicates that preemption
- *  is enabled, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Modes_Is_preempt (
-  Modes_Control mode_set
-)
-{
-   return (mode_set & RTEMS_PREEMPT_MASK) == RTEMS_PREEMPT;
-}
-
-/*PAGE
- *
- *  _Modes_Is_timeslice
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if mode_set indicates that timeslicing
- *  is enabled, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Modes_Is_timeslice (
-  Modes_Control mode_set
-)
-{
-  return (mode_set & RTEMS_TIMESLICE_MASK) == RTEMS_TIMESLICE;
-}
-
-/*PAGE
- *
- *  _Modes_Get_interrupt_level
- *
- *  DESCRIPTION:
- *
- *  This function returns the interrupt level portion of the mode_set.
- */
-
-RTEMS_INLINE_ROUTINE ISR_Level _Modes_Get_interrupt_level (
-  Modes_Control mode_set
-)
-{
-  return ( mode_set & RTEMS_INTERRUPT_MASK );
-}
-
-/*PAGE
- *
- *  _Modes_Set_interrupt_level
- *
- *  DESCRIPTION:
- *
- *  This routine sets the current interrupt level to that specified
- *  in the mode_set.
- */
-
-RTEMS_INLINE_ROUTINE void _Modes_Set_interrupt_level (
-  Modes_Control mode_set
-)
-{
-  _ISR_Set_level( _Modes_Get_interrupt_level( mode_set ) );
-}
-
-/*PAGE
- *
- *  _Modes_Change
- *
- *  DESCRIPTION:
- *
- *  This routine changes the modes in old_mode_set indicated by
- *  mask to the requested values in new_mode_set.  The resulting
- *  mode set is returned in out_mode_set and the modes that changed
- *  is returned in changed.
- */
-
-RTEMS_INLINE_ROUTINE void _Modes_Change (
-  Modes_Control  old_mode_set,
-  Modes_Control  new_mode_set,
-  Modes_Control  mask,
-  Modes_Control *out_mode_set,
-  Modes_Control *changed
-)
-{
-  Modes_Control _out_mode;
-
-  _out_mode      =  old_mode_set;
-  _out_mode     &= ~mask;
-  _out_mode     |= new_mode_set & mask;
-  *changed       = _out_mode ^ old_mode_set;
-  *out_mode_set  = _out_mode;
-}
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/rtems/inline/rtems/rtems/options.inl b/c/src/exec/rtems/inline/rtems/rtems/options.inl
deleted file mode 100644
index f92acf56c4..0000000000
--- a/c/src/exec/rtems/inline/rtems/rtems/options.inl
+++ /dev/null
@@ -1,55 +0,0 @@
-/*  options.inl
- *
- *  This file contains the static inline implementation of the inlined
- *  routines from the Options Handler.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __OPTIONS_inl
-#define __OPTIONS_inl
-
-/*PAGE
- *
- *  _Options_Is_no_wait
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the RTEMS_NO_WAIT option is enabled in
- *  option_set, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Options_Is_no_wait (
-  rtems_option option_set
-)
-{
-   return (option_set & RTEMS_NO_WAIT);
-}
-
-/*PAGE
- *
- *  _Options_Is_any
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the RTEMS_EVENT_ANY option is enabled in
- *  OPTION_SET, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Options_Is_any (
-  rtems_option option_set
-)
-{
-   return (option_set & RTEMS_EVENT_ANY);
-}
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/rtems/inline/rtems/rtems/part.inl b/c/src/exec/rtems/inline/rtems/rtems/part.inl
deleted file mode 100644
index 18c948d5c4..0000000000
--- a/c/src/exec/rtems/inline/rtems/rtems/part.inl
+++ /dev/null
@@ -1,199 +0,0 @@
-/*  part.inl
- *
- *  This file contains the macro implementation of all inlined routines
- *  in the Partition Manager.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __PARTITION_inl
-#define __PARTITION_inl
-
-/*PAGE
- *
- *  _Partition_Allocate_buffer
- *
- *  DESCRIPTION:
- *
- *  This function attempts to allocate a buffer from the_partition.
- *  If successful, it returns the address of the allocated buffer.
- *  Otherwise, it returns NULL.
- */
-
-RTEMS_INLINE_ROUTINE void *_Partition_Allocate_buffer (
-   Partition_Control *the_partition
-)
-{
-  return _Chain_Get( &the_partition->Memory );
-}
-
-/*PAGE
- *
- *  _Partition_Free_buffer
- *
- *  DESCRIPTION:
- *
- *  This routine frees the_buffer to the_partition.
- */
-
-RTEMS_INLINE_ROUTINE void _Partition_Free_buffer (
-  Partition_Control *the_partition,
-  Chain_Node        *the_buffer
-)
-{
-  _Chain_Append( &the_partition->Memory, the_buffer );
-}
-
-/*PAGE
- *
- *  _Partition_Is_buffer_on_boundary
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the_buffer is on a valid buffer
- *  boundary for the_partition, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Partition_Is_buffer_on_boundary (
-  void              *the_buffer,
-  Partition_Control *the_partition
-)
-{
-  unsigned32   offset;
-
-  offset = (unsigned32) _Addresses_Subtract(
-    the_buffer,
-    the_partition->starting_address
-  );
-
-  return ((offset % the_partition->buffer_size) == 0);
-}
-
-/*PAGE
- *
- *  _Partition_Is_buffer_valid
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the_buffer is a valid buffer from
- *  the_partition, otherwise FALSE is returned.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Partition_Is_buffer_valid (
-   Chain_Node        *the_buffer,
-   Partition_Control *the_partition
-)
-{
-  void *starting;
-  void *ending;
-
-  starting = the_partition->starting_address;
-  ending   = _Addresses_Add_offset( starting, the_partition->length );
-
-  return (
-    _Addresses_Is_in_range( the_buffer, starting, ending ) &&
-    _Partition_Is_buffer_on_boundary( the_buffer, the_partition )
-  );
-}
-
-/*PAGE
- *
- *  _Partition_Is_buffer_size_aligned
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the use of the specified buffer_size
- *  will result in the allocation of buffers whose first byte is
- *  properly aligned, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Partition_Is_buffer_size_aligned (
-   unsigned32 buffer_size
-)
-{
-  return ((buffer_size % CPU_PARTITION_ALIGNMENT) == 0);
-}
-
-/*PAGE
- *
- *  _Partition_Allocate
- *
- *  DESCRIPTION:
- *
- *  This function allocates a partition control block from
- *  the inactive chain of free partition control blocks.
- */
-
-RTEMS_INLINE_ROUTINE Partition_Control *_Partition_Allocate ( void )
-{
-  return (Partition_Control *) _Objects_Allocate( &_Partition_Information );
-}
-
-/*PAGE
- *
- *  _Partition_Free
- *
- *  DESCRIPTION:
- *
- *  This routine frees a partition control block to the
- *  inactive chain of free partition control blocks.
- */
-
-RTEMS_INLINE_ROUTINE void _Partition_Free (
-   Partition_Control *the_partition
-)
-{
-  _Objects_Free( &_Partition_Information, &the_partition->Object );
-}
-
-/*PAGE
- *
- *  _Partition_Get
- *
- *  DESCRIPTION:
- *
- *  This function maps partition IDs to partition control blocks.
- *  If ID corresponds to a local partition, then it returns
- *  the_partition control pointer which maps to ID and location
- *  is set to OBJECTS_LOCAL.  If the partition ID is global and
- *  resides on a remote node, then location is set to OBJECTS_REMOTE,
- *  and the_partition is undefined.  Otherwise, location is set
- *  to OBJECTS_ERROR and the_partition is undefined.
- */
-
-RTEMS_INLINE_ROUTINE Partition_Control *_Partition_Get (
-  Objects_Id         id,
-  Objects_Locations *location
-)
-{
-  return (Partition_Control *)
-    _Objects_Get( &_Partition_Information, id, location );
-}
-
-/*PAGE
- *
- *  _Partition_Is_null
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the_partition is NULL
- *  and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Partition_Is_null (
-   Partition_Control *the_partition
-)
-{
-   return ( the_partition == NULL  );
-}
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/rtems/inline/rtems/rtems/ratemon.inl b/c/src/exec/rtems/inline/rtems/rtems/ratemon.inl
deleted file mode 100644
index f1293ef75a..0000000000
--- a/c/src/exec/rtems/inline/rtems/rtems/ratemon.inl
+++ /dev/null
@@ -1,143 +0,0 @@
-/*  ratemon.inl
- *
- *  This file contains the static inline  implementation of the inlined
- *  routines in the Rate Monotonic Manager.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RATE_MONOTONIC_inl
-#define __RATE_MONOTONIC_inl
-
-/*PAGE
- *
- *  _Rate_monotonic_Allocate
- *
- *  DESCRIPTION:
- *
- *  This function allocates a period control block from
- *  the inactive chain of free period control blocks.
- */
-
-RTEMS_INLINE_ROUTINE Rate_monotonic_Control *_Rate_monotonic_Allocate( void )
-{
-  return (Rate_monotonic_Control *)
-    _Objects_Allocate( &_Rate_monotonic_Information );
-}
-
-/*PAGE
- *
- *  _Rate_monotonic_Free
- *
- *  DESCRIPTION:
- *
- *  This routine allocates a period control block from
- *  the inactive chain of free period control blocks.
- */
-
-RTEMS_INLINE_ROUTINE void _Rate_monotonic_Free (
-  Rate_monotonic_Control *the_period
-)
-{
-  _Objects_Free( &_Rate_monotonic_Information, &the_period->Object );
-}
-
-/*PAGE
- *
- *  _Rate_monotonic_Get
- *
- *  DESCRIPTION:
- *
- *  This function maps period IDs to period control blocks.
- *  If ID corresponds to a local period, then it returns
- *  the_period control pointer which maps to ID and location
- *  is set to OBJECTS_LOCAL.  Otherwise, location is set
- *  to OBJECTS_ERROR and the_period is undefined.
- */
-
-RTEMS_INLINE_ROUTINE Rate_monotonic_Control *_Rate_monotonic_Get (
-  Objects_Id         id,
-  Objects_Locations *location
-)
-{
-  return (Rate_monotonic_Control *)
-    _Objects_Get( &_Rate_monotonic_Information, id, location );
-}
-
-/*PAGE
- *
- *  _Rate_monotonic_Is_active
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the_period is in the ACTIVE state,
- *  and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Rate_monotonic_Is_active (
-  Rate_monotonic_Control *the_period
-)
-{
-  return (the_period->state == RATE_MONOTONIC_ACTIVE);
-}
-
-/*PAGE
- *
- *  _Rate_monotonic_Is_inactive
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the_period is in the ACTIVE state,
- *  and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Rate_monotonic_Is_inactive (
-  Rate_monotonic_Control *the_period
-)
-{
-  return (the_period->state == RATE_MONOTONIC_INACTIVE);
-}
-
-/*PAGE
- *
- *  _Rate_monotonic_Is_expired
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the_period is in the EXPIRED state,
- *  and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Rate_monotonic_Is_expired (
-  Rate_monotonic_Control *the_period
-)
-{
-  return (the_period->state == RATE_MONOTONIC_EXPIRED);
-}
-
-/*PAGE
- *
- *  _Rate_monotonic_Is_null
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the_period is NULL and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Rate_monotonic_Is_null (
-  Rate_monotonic_Control *the_period
-)
-{
-  return (the_period == NULL);
-}
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/rtems/inline/rtems/rtems/region.inl b/c/src/exec/rtems/inline/rtems/rtems/region.inl
deleted file mode 100644
index 37f098ae63..0000000000
--- a/c/src/exec/rtems/inline/rtems/rtems/region.inl
+++ /dev/null
@@ -1,127 +0,0 @@
-/*  region.inl
- *
- *  This file contains the macro implementation of the inlined
- *  routines from the Region Manager.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __REGION_inl
-#define __REGION_inl
-
-/*PAGE
- *
- *  _Region_Allocate
- *
- *  DESCRIPTION:
- *
- *  This function allocates a region control block from
- *  the inactive chain of free region control blocks.
- */
-
-RTEMS_INLINE_ROUTINE Region_Control *_Region_Allocate( void )
-{
-  return (Region_Control *) _Objects_Allocate( &_Region_Information );
-}
-
-/*PAGE
- *
- *  _Region_Free
- *
- *  DESCRIPTION:
- *
- *  This routine frees a region control block to the
- *  inactive chain of free region control blocks.
- */
-
-RTEMS_INLINE_ROUTINE void _Region_Free (
-  Region_Control *the_region
-)
-{
-  _Objects_Free( &_Region_Information, &the_region->Object );
-}
-
-/*PAGE
- *
- *  _Region_Get
- *
- *  DESCRIPTION:
- *
- *  This function maps region IDs to region control blocks.
- *  If ID corresponds to a local region, then it returns
- *  the_region control pointer which maps to ID and location
- *  is set to OBJECTS_LOCAL.  Otherwise, location is set
- *  to OBJECTS_ERROR and the_region is undefined.
- */
-
-RTEMS_INLINE_ROUTINE Region_Control *_Region_Get (
-  Objects_Id         id,
-  Objects_Locations *location
-)
-{
-  return (Region_Control *)
-    _Objects_Get( &_Region_Information, id, location );
-}
-
-/*PAGE
- *
- *  _Region_Allocate_segment
- *
- *  DESCRIPTION:
- *
- *  This function attempts to allocate a segment from the_region.
- *  If successful, it returns the address of the allocated segment.
- *  Otherwise, it returns NULL.
- */
-
-RTEMS_INLINE_ROUTINE void *_Region_Allocate_segment (
-  Region_Control *the_region,
-  unsigned32      size
-)
-{
-   return _Heap_Allocate( &the_region->Memory, size );
-}
-
-/*PAGE
- *
- *  _Region_Free_segment
- *
- *  DESCRIPTION:
- *
- *  This function frees the_segment to the_region.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Region_Free_segment (
-  Region_Control *the_region,
-  void           *the_segment
-)
-{
-  return _Heap_Free( &the_region->Memory, the_segment );
-}
-
-/*PAGE
- *
- *  _Region_Is_null
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the_region is NULL and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Region_Is_null (
-  Region_Control *the_region
-)
-{
-  return ( the_region == NULL  );
-}
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/rtems/inline/rtems/rtems/sem.inl b/c/src/exec/rtems/inline/rtems/rtems/sem.inl
deleted file mode 100644
index 75774b2917..0000000000
--- a/c/src/exec/rtems/inline/rtems/rtems/sem.inl
+++ /dev/null
@@ -1,93 +0,0 @@
-/*  sem.inl
- *
- *  This file contains the static inlin implementation of the inlined
- *  routines from the Semaphore Manager.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __SEMAPHORE_inl
-#define __SEMAPHORE_inl
-
-/*PAGE
- *
- *  _Semaphore_Allocate
- *
- *  DESCRIPTION:
- *
- *  This function allocates a semaphore control block from
- *  the inactive chain of free semaphore control blocks.
- */
-
-RTEMS_INLINE_ROUTINE Semaphore_Control *_Semaphore_Allocate( void )
-{
-  return (Semaphore_Control *) _Objects_Allocate( &_Semaphore_Information );
-}
-
-/*PAGE
- *
- *  _Semaphore_Free
- *
- *  DESCRIPTION:
- *
- *  This routine frees a semaphore control block to the
- *  inactive chain of free semaphore control blocks.
- */
-
-RTEMS_INLINE_ROUTINE void _Semaphore_Free (
-  Semaphore_Control *the_semaphore
-)
-{
-  _Objects_Free( &_Semaphore_Information, &the_semaphore->Object );
-}
-
-/*PAGE
- *
- *  _Semaphore_Get
- *
- *  DESCRIPTION:
- *
- *  This function maps semaphore IDs to semaphore control blocks.
- *  If ID corresponds to a local semaphore, then it returns
- *  the_semaphore control pointer which maps to ID and location
- *  is set to OBJECTS_LOCAL.  if the semaphore ID is global and
- *  resides on a remote node, then location is set to OBJECTS_REMOTE,
- *  and the_semaphore is undefined.  Otherwise, location is set
- *  to OBJECTS_ERROR and the_semaphore is undefined.
- */
-
-RTEMS_INLINE_ROUTINE Semaphore_Control *_Semaphore_Get (
-  Objects_Id         id,
-  Objects_Locations *location
-)
-{
-  return (Semaphore_Control *)
-    _Objects_Get( &_Semaphore_Information, id, location );
-}
-
-/*PAGE
- *
- *  _Semaphore_Is_null
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the_semaphore is NULL and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Semaphore_Is_null (
-  Semaphore_Control *the_semaphore
-)
-{
-  return ( the_semaphore == NULL );
-}
-
-#endif
-/*  end of include file */
diff --git a/c/src/exec/rtems/inline/rtems/rtems/status.inl b/c/src/exec/rtems/inline/rtems/rtems/status.inl
deleted file mode 100644
index b9182c6f63..0000000000
--- a/c/src/exec/rtems/inline/rtems/rtems/status.inl
+++ /dev/null
@@ -1,56 +0,0 @@
-/*  inline/status.inl
- *
- *  This include file contains the implementations of the inlined
- *  routines for the status package.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __INLINE_STATUS_inl
-#define __INLINE_STATUS_inl
-
-/*PAGE
- *
- *  rtems_is_status_successful
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the status code is equal to RTEMS_SUCCESSFUL,
- *  and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean rtems_is_status_successful(
-  rtems_status_code code
-)
-{
-  return (code == RTEMS_SUCCESSFUL);
-}
-
-/*PAGE
- *
- *  rtems_are_statuses_equal
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the status code1 is equal to code2,
- *  and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean rtems_are_statuses_equal(
-  rtems_status_code code1,
-  rtems_status_code code2
-)
-{
-   return (code1 == code2);
-}
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/rtems/inline/rtems/rtems/support.inl b/c/src/exec/rtems/inline/rtems/rtems/support.inl
deleted file mode 100644
index 06de8d1f59..0000000000
--- a/c/src/exec/rtems/inline/rtems/rtems/support.inl
+++ /dev/null
@@ -1,61 +0,0 @@
-/*  support.inl
- *
- *  This include file contains the static inline implementation of all
- *  of the inlined routines specific to the RTEMS API.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
- 
-#ifndef __RTEMS_SUPPORT_inl
-#define __RTEMS_SUPPORT_inl
-
-/*PAGE
- *
- *  rtems_is_name_valid
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the name is valid, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE rtems_boolean rtems_is_name_valid (
-  rtems_name name
-)
-{
-  return ( name != 0 );
-}
-
-/*PAGE
- *
- *  rtems_name_to_characters
- *
- *  DESCRIPTION:
- *
- *  This function breaks the object name into the four component
- *  characters C1, C2, C3, and C4.
- */
-
-RTEMS_INLINE_ROUTINE void rtems_name_to_characters(
-  rtems_name    name,
-  char         *c1,
-  char         *c2,
-  char         *c3,
-  char         *c4
-)
-{
-  *c1 = (name >> 24) & 0xff;
-  *c2 = (name >> 16) & 0xff;
-  *c3 = (name >> 8) & 0xff;
-  *c4 =  name & 0xff;
-}
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/rtems/inline/rtems/rtems/tasks.inl b/c/src/exec/rtems/inline/rtems/rtems/tasks.inl
deleted file mode 100644
index 34c1e055a8..0000000000
--- a/c/src/exec/rtems/inline/rtems/rtems/tasks.inl
+++ /dev/null
@@ -1,90 +0,0 @@
-/*  tasks.inl
- *
- *  This file contains the static inline implementation of all inlined
- *  routines in the with RTEMS Tasks Manager.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_TASKS_inl
-#define __RTEMS_TASKS_inl
-
-/*PAGE
- *
- *  _RTEMS_tasks_Allocate
- *
- *  DESCRIPTION:
- *
- *  This function allocates a task control block from
- *  the inactive chain of free task control blocks.
- */
-
-RTEMS_INLINE_ROUTINE Thread_Control *_RTEMS_tasks_Allocate( void )
-{
-  return (Thread_Control *) _Objects_Allocate( &_RTEMS_tasks_Information );
-}
-
-/*PAGE
- *
- *  _RTEMS_tasks_Free
- *
- *  DESCRIPTION:
- *
- *  This routine frees a task control block to the
- *  inactive chain of free task control blocks.
- */
-
-RTEMS_INLINE_ROUTINE void _RTEMS_tasks_Free (
-  Thread_Control *the_task
-)
-{
-  _Objects_Free( 
-    _Objects_Get_information( the_task->Object.id ),
-    &the_task->Object
-  );
-}
-
-/*PAGE
- *
- *  _RTEMS_tasks_Priority_to_Core
- *
- *  DESCRIPTION:
- *
- *  This function converts an RTEMS API priority into a core priority.
- */
- 
-RTEMS_INLINE_ROUTINE Priority_Control _RTEMS_tasks_Priority_to_Core(
-  rtems_task_priority   priority
-)
-{
-  return (Priority_Control) priority;
-}
-
-/*PAGE
- *
- *  _RTEMS_tasks_Priority_is_valid
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the_priority is a valid user task priority
- *  and FALSE otherwise.
- */
- 
-RTEMS_INLINE_ROUTINE boolean _RTEMS_tasks_Priority_is_valid (
-  rtems_task_priority the_priority
-)
-{
-  return (  ( the_priority >= RTEMS_MINIMUM_PRIORITY ) &&
-            ( the_priority <= RTEMS_MAXIMUM_PRIORITY ) );
-}
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/rtems/inline/rtems/rtems/timer.inl b/c/src/exec/rtems/inline/rtems/rtems/timer.inl
deleted file mode 100644
index b884e02f4d..0000000000
--- a/c/src/exec/rtems/inline/rtems/rtems/timer.inl
+++ /dev/null
@@ -1,142 +0,0 @@
-/*  timer.inl
- *
- *  This file contains the static inline implementation of the inlined routines
- *  from the Timer Manager.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __TIMER_inl
-#define __TIMER_inl
-
-/*PAGE
- *
- *  _Timer_Allocate
- *
- *  DESCRIPTION:
- *
- *  This function allocates a timer control block from
- *  the inactive chain of free timer control blocks.
- */
-
-RTEMS_INLINE_ROUTINE Timer_Control *_Timer_Allocate( void )
-{
-  return (Timer_Control *) _Objects_Allocate( &_Timer_Information );
-}
-
-/*PAGE
- *
- *  _Timer_Free
- *
- *  DESCRIPTION:
- *
- *  This routine frees a timer control block to the
- *  inactive chain of free timer control blocks.
- */
-
-RTEMS_INLINE_ROUTINE void _Timer_Free (
-  Timer_Control *the_timer
-)
-{
-  _Objects_Free( &_Timer_Information, &the_timer->Object );
-}
-
-/*PAGE
- *
- *  _Timer_Get
- *
- *  DESCRIPTION:
- *
- *  This function maps timer IDs to timer control blocks.
- *  If ID corresponds to a local timer, then it returns
- *  the timer control pointer which maps to ID and location
- *  is set to OBJECTS_LOCAL.  Otherwise, location is set
- *  to OBJECTS_ERROR and the returned value is undefined.
- */
-
-RTEMS_INLINE_ROUTINE Timer_Control *_Timer_Get (
-  Objects_Id         id,
-  Objects_Locations *location
-)
-{
-  return (Timer_Control *)
-    _Objects_Get( &_Timer_Information, id, location );
-}
-
-/*PAGE
- *
- *  _Timer_Is_interval_class
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the class is that of an INTERVAL
- *  timer, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Timer_Is_interval_class (
-  Timer_Classes the_class
-)
-{
-  return ( the_class == TIMER_INTERVAL );
-}
-
-/*PAGE
- *
- *  _Timer_Is_time_of_day_class
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the class is that of an INTERVAL
- *  timer, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Timer_Is_timer_of_day_class (
-  Timer_Classes the_class
-)
-{
-  return ( the_class == TIMER_TIME_OF_DAY );
-}
-
-/*PAGE
- *
- *  _Timer_Is_dormant_class
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the class is that of a DORMANT
- *  timer, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Timer_Is_dormant_class (
-  Timer_Classes the_class
-)
-{
-  return ( the_class == TIMER_DORMANT );
-}
-
-/*PAGE
- *
- *  _Timer_Is_null
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the_timer is NULL and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Timer_Is_null (
-  Timer_Control *the_timer
-)
-{
-  return ( the_timer == NULL );
-}
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/rtems/macros/rtems/rtems/Makefile.in b/c/src/exec/rtems/macros/rtems/rtems/Makefile.in
deleted file mode 100644
index 9c11a33172..0000000000
--- a/c/src/exec/rtems/macros/rtems/rtems/Makefile.in
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-I_PIECES=asr attr dpmem event eventset message modes options \
-   part ratemon region sem status support tasks timer
-I_FILES=$(I_PIECES:%=$(srcdir)/%.inl)
-
-SRCS=$(I_FILES)
-
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/lib.cfg
-
-#
-# Add your list of files to delete here.  The config files
-#  already know how to delete some stuff, so you may want
-#  to just run 'make clean' first to see what gets missed.
-#  'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS += $(LIB)
-CLOBBER_ADDITIONS +=
-
-all:	$(SRCS)
-	$(INSTALL) -m 444 ${I_FILES} $(PROJECT_INCLUDE)/rtems/rtems
diff --git a/c/src/exec/rtems/macros/rtems/rtems/asr.inl b/c/src/exec/rtems/macros/rtems/rtems/asr.inl
deleted file mode 100644
index d3ed229ca9..0000000000
--- a/c/src/exec/rtems/macros/rtems/rtems/asr.inl
+++ /dev/null
@@ -1,90 +0,0 @@
-/*  macros/asr.h
- *
- *  This include file contains the implemenation of all routines
- *  associated with the asynchronous signal handler which are inlined.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __INLINE_ASR_h
-#define __INLINE_ASR_h
-
-#include <rtems/score/isr.h>
-
-/*PAGE
- *
- *  _ASR_Initialize
- *
- */
-
-#define _ASR_Initialize( _information ) \
-{ \
-  (_information)->is_enabled      = TRUE; \
-  (_information)->handler         = NULL; \
-  (_information)->mode_set        = RTEMS_DEFAULT_MODES; \
-  (_information)->signals_posted  = 0; \
-  (_information)->signals_pending = 0; \
-  (_information)->nest_level      = 0; \
-}
-
-/*PAGE
- *
- *  _ASR_Swap_signals
- *
- */
-
-#define _ASR_Swap_signals( _information ) \
-{ \
-  rtems_signal_set _signals; \
-  ISR_Level              _level; \
-   \
-  _ISR_Disable( _level ); \
-    _signals                        = (_information)->signals_pending; \
-    (_information)->signals_pending = (_information)->signals_posted; \
-    (_information)->signals_posted  = _signals; \
-  _ISR_Enable( _level ); \
-}
-
-/*PAGE
- *
- *  _ASR_Is_null_handler
- *
- */
-
-#define _ASR_Is_null_handler( _asr_handler ) \
-  ( (_asr_handler) == NULL )
-
-/*PAGE
- *
- *  _ASR_Are_signals_pending
- *
- */
-
-#define _ASR_Are_signals_pending( _information ) \
- ( (_information)->signals_posted != 0 )
-
-/*PAGE
- *
- *  _ASR_Post_signals
- *
- */
-
-#define _ASR_Post_signals( _signals, _signal_set ) \
-  do { \
-     ISR_Level _level; \
-     \
-     _ISR_Disable( _level ); \
-       *(_signal_set) |= (_signals); \
-     _ISR_Enable( _level ); \
-  } while ( 0 )
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/rtems/macros/rtems/rtems/attr.inl b/c/src/exec/rtems/macros/rtems/rtems/attr.inl
deleted file mode 100644
index 290e7f7870..0000000000
--- a/c/src/exec/rtems/macros/rtems/rtems/attr.inl
+++ /dev/null
@@ -1,100 +0,0 @@
-/*  macros/attr.h
- *
- *  This include file contains all of the inlined routines associated
- *  with attributes.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __MACROS_ATTRIBUTES_h
-#define __MACROS_ATTRIBUTES_h
-
-/*PAGE
- *
- *  _Attributes_Set
- */
-
-#define _Attributes_Set( _new_attributes, _attribute_set ) \
-  ( (_attribute_set) | (_new_attributes) )
-
-/*PAGE
- *
- *  _Attributes_Clear
- */
-
-#define _Attributes_Clear( _attribute_set, _mask ) \
-  ( (_attribute_set) & ~(_mask) )
-
-/*PAGE
- *
- *  _Attributes_Is_floating_point
- *
- */
-
-#define _Attributes_Is_floating_point( _attribute_set ) \
-  ( (_attribute_set) & RTEMS_FLOATING_POINT )
-
-/*PAGE
- *
- *  _Attributes_Is_global
- *
- */
-
-#define _Attributes_Is_global( _attribute_set ) \
-  ( (_attribute_set) & RTEMS_GLOBAL )
-
-/*PAGE
- *
- *  _Attributes_Is_priority
- *
- */
-
-#define _Attributes_Is_priority( _attribute_set ) \
-  ( (_attribute_set) & RTEMS_PRIORITY )
-
-/*PAGE
- *
- *  _Attributes_Is_binary_semaphore
- *
- */
-
-#define _Attributes_Is_binary_semaphore( _attribute_set ) \
-  ( (_attribute_set) & RTEMS_BINARY_SEMAPHORE )
-
-/*PAGE
- *
- *  _Attributes_Is_inherit_priority
- *
- */
-
-#define _Attributes_Is_inherit_priority( _attribute_set ) \
-  ( (_attribute_set) & RTEMS_INHERIT_PRIORITY )
-
-/*PAGE
- *
- *  _Attributes_Is_priority_ceiling
- *
- */
- 
-#define _Attributes_Is_priority_ceiling( _attribute_set ) \
-  ( (_attribute_set) & RTEMS_PRIORITY_CEILING )
-
-/*PAGE
- *
- *  _Attributes_Is_system_task
- *
- */
- 
-#define _Attributes_Is_system_task( _attribute_set ) \
-  ( (_attribute_set) & RTEMS_SYSTEM_TASK )
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/rtems/macros/rtems/rtems/dpmem.inl b/c/src/exec/rtems/macros/rtems/rtems/dpmem.inl
deleted file mode 100644
index 171f15d8e9..0000000000
--- a/c/src/exec/rtems/macros/rtems/rtems/dpmem.inl
+++ /dev/null
@@ -1,59 +0,0 @@
-/*  macros/dpmem.h
- *
- *  This include file contains the inline routine used in conjunction
- *  with the Dual Ported Memory Manager
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __MACROS_DPMEM_h
-#define __MACROS_DPMEM_h
-
-/*PAGE
- *
- *  _Dual_ported_memory_Allocate
- *
- */
-
-#define _Dual_ported_memory_Allocate() \
-  (Dual_ported_memory_Control *) \
-     _Objects_Allocate( &_Dual_ported_memory_Information )
-
-/*PAGE
- *
- *  _Dual_ported_memory_Free
- *
- */
-
-#define _Dual_ported_memory_Free( _the_port ) \
-  _Objects_Free( &_Dual_ported_memory_Information, &(_the_port)->Object )
-
-/*PAGE
- *
- *  _Dual_ported_memory_Get
- *
- */
-
-#define _Dual_ported_memory_Get( _id, _location ) \
-  (Dual_ported_memory_Control *) \
-     _Objects_Get( &_Dual_ported_memory_Information, (_id), (_location) )
-
-
-/*PAGE
- *
- *  _Dual_ported_memory_Is_null
- */
-
-#define _Dual_ported_memory_Is_null( _the_port ) \
-  ( (_the_port) == NULL )
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/rtems/macros/rtems/rtems/event.inl b/c/src/exec/rtems/macros/rtems/rtems/event.inl
deleted file mode 100644
index e0d18e7817..0000000000
--- a/c/src/exec/rtems/macros/rtems/rtems/event.inl
+++ /dev/null
@@ -1,21 +0,0 @@
-/*  macros/event.h
- *
- *  This include file contains the implementation of macros for
- *  the Event Manager.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __MACROS_EVENT_h
-#define __MACROS_EVENT_h
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/rtems/macros/rtems/rtems/eventset.inl b/c/src/exec/rtems/macros/rtems/rtems/eventset.inl
deleted file mode 100644
index 3eeb2bea63..0000000000
--- a/c/src/exec/rtems/macros/rtems/rtems/eventset.inl
+++ /dev/null
@@ -1,59 +0,0 @@
-/*  eventset.inl
- *
- *  This include file contains the macro implementation of inlined
- *  routines in the event set object.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __EVENT_SET_inl
-#define __EVENT_SET_inl
-
-/*PAGE
- *
- *  _Event_sets_Is_empty
- */
-
-#define _Event_sets_Is_empty( _the_event_set )  \
-  ((_the_event_set) == 0 )
-
-/*PAGE
- *
- *  _Event_sets_Is_empty
- */
-
-#define _Event_sets_Post( _the_new_events, _the_event_set ) \
-   do { \
-     ISR_Level level; \
-     \
-     _ISR_Disable( level ); \
-       *(_the_event_set) |= (_the_new_events); \
-     _ISR_Enable( level ); \
-   } while (0);
-
-/*PAGE
- *
- *  _Event_sets_Is_empty
- */
-
-#define _Event_sets_Get( _the_event_set, _the_event_condition ) \
-   ((_the_event_set) & (_the_event_condition))
-
-/*PAGE
- *
- *  _Event_sets_Clear
- */
-
-#define _Event_sets_Clear( _the_event_set, _the_mask ) \
-   ((_the_event_set) & ~(_the_mask))
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/rtems/macros/rtems/rtems/message.inl b/c/src/exec/rtems/macros/rtems/rtems/message.inl
deleted file mode 100644
index 537701d41b..0000000000
--- a/c/src/exec/rtems/macros/rtems/rtems/message.inl
+++ /dev/null
@@ -1,49 +0,0 @@
-/*  message.inl
- *
- *  This include file contains the macro implementation of all
- *  inlined routines in the Message Manager.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __MESSAGE_QUEUE_inl
-#define __MESSAGE_QUEUE_inl
-
-/*PAGE
- *
- *  _Message_queue_Is_null
- *
- */
-
-#define _Message_queue_Is_null( _the_message_queue ) \
-   ( (_the_message_queue) == NULL  )
-
-/*PAGE
- *
- *  _Message_queue_Free
- *
- */
-
-#define _Message_queue_Free( _the_message_queue ) \
-  _Objects_Free( &_Message_queue_Information, &(_the_message_queue)->Object )
-
-/*PAGE
- *
- *  _Message_queue_Get
- *
- */
-
-#define _Message_queue_Get( _id, _location ) \
-  (Message_queue_Control *) \
-     _Objects_Get( &_Message_queue_Information, (_id), (_location) )
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/rtems/macros/rtems/rtems/modes.inl b/c/src/exec/rtems/macros/rtems/rtems/modes.inl
deleted file mode 100644
index e84bf25b32..0000000000
--- a/c/src/exec/rtems/macros/rtems/rtems/modes.inl
+++ /dev/null
@@ -1,92 +0,0 @@
-/*  modes.inl
- *
- *  This include file contains the macro implementation of the
- *  inlined routines in the Mode Handler.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __MODES_inl
-#define __MODES_inl
-
-/*PAGE
- *
- *  _Modes_Mask_changed
- *
- */
-
-#define _Modes_Mask_changed( _mode_set, _masks ) \
-   ( (_mode_set) & (_masks) )
-
-/*PAGE
- *
- *  _Modes_Is_asr_disabled
- *
- */
-
-#define _Modes_Is_asr_disabled( _mode_set ) \
-   (((_mode_set) & RTEMS_ASR_MASK) == RTEMS_NO_ASR)
-
-/*PAGE
- *
- *  _Modes_Is_preempt
- *
- */
-
-#define _Modes_Is_preempt( _mode_set ) \
-   ( ( (_mode_set) & RTEMS_PREEMPT_MASK ) == RTEMS_PREEMPT )
-
-/*PAGE
- *
- *  _Modes_Is_timeslice
- *
- */
-
-#define _Modes_Is_timeslice( _mode_set ) \
-  (((_mode_set) & RTEMS_TIMESLICE_MASK) == RTEMS_TIMESLICE)
-
-/*PAGE
- *
- *  _Modes_Get_interrupt_level
- *
- */
-
-#define _Modes_Get_interrupt_level( _mode_set ) \
-  ( (_mode_set) & RTEMS_INTERRUPT_MASK )
-
-/*PAGE
- *
- *  _Modes_Set_interrupt_level
- *
- */
-
-#define _Modes_Set_interrupt_level( _mode_set ) \
-   _ISR_Set_level( _Modes_Get_interrupt_level( (_mode_set) ) )
-
-/*PAGE
- *
- *  _Modes_Change
- *
- */
-
-#define _Modes_Change( _old_mode_set, _new_mode_set, \
-                       _mask, _out_mode_set, _changed ) \
-  { Modes_Control _out_mode; \
-    \
-    _out_mode         =  (_old_mode_set); \
-    _out_mode        &= ~(_mask); \
-    _out_mode        |= (_new_mode_set) & (_mask); \
-    *(_changed)       = _out_mode ^ (_old_mode_set); \
-    *(_out_mode_set)  = _out_mode; \
-  }
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/rtems/macros/rtems/rtems/options.inl b/c/src/exec/rtems/macros/rtems/rtems/options.inl
deleted file mode 100644
index 78068ab17c..0000000000
--- a/c/src/exec/rtems/macros/rtems/rtems/options.inl
+++ /dev/null
@@ -1,39 +0,0 @@
-/*  options.inl
- *
- *  This file contains the macro implementation of the inlined
- *  routines from the Options Handler.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __OPTIONS_inl
-#define __OPTIONS_inl
-
-/*PAGE
- *
- *  _Options_Is_no_wait
- *
- */
-
-#define _Options_Is_no_wait( _option_set ) \
-   ( (_option_set) & RTEMS_NO_WAIT )
-
-/*PAGE
- *
- *  _Options_Is_any
- *
- */
-
-#define _Options_Is_any( _option_set ) \
-   ( (_option_set) & RTEMS_EVENT_ANY )
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/rtems/macros/rtems/rtems/part.inl b/c/src/exec/rtems/macros/rtems/rtems/part.inl
deleted file mode 100644
index 027a7427e5..0000000000
--- a/c/src/exec/rtems/macros/rtems/rtems/part.inl
+++ /dev/null
@@ -1,117 +0,0 @@
-/*  part.inl
- *
- *  This file contains the macro implementation of all inlined routines
- *  in the Partition Manager.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __PARTITION_inl
-#define __PARTITION_inl
-
-/*PAGE
- *
- *  _Partition_Allocate_buffer
- *
- */
-
-#define _Partition_Allocate_buffer( _the_partition ) \
-  _Chain_Get( &(_the_partition)->Memory )
-
-/*PAGE
- *
- *  _Partition_Free_buffer
- *
- */
-
-#define _Partition_Free_buffer( _the_partition, _the_buffer ) \
-  _Chain_Append( &(_the_partition)->Memory, (_the_buffer) )
-
-/*PAGE
- *
- *  _Partition_Is_buffer_on_boundary
- *
- */
-
-#define _Partition_Is_buffer_on_boundary( _the_buffer, _the_partition ) \
-  ((((unsigned32) _Addresses_Subtract( \
-                    (_the_buffer), \
-                    (_the_partition)->starting_address ) \
-                  ) % \
-                  (_the_partition)->buffer_size) == 0)
-
-/*PAGE
- *
- *  _Partition_Is_buffer_valid
- *
- */
-
-#define _Partition_Is_buffer_valid( _the_buffer, _the_partition ) \
-  ( \
-    _Addresses_Is_in_range( \
-      (_the_buffer), \
-      (_the_partition)->starting_address, \
-      _Addresses_Add_offset( \
-         (_the_partition)->starting_address, \
-         (_the_partition)->length \
-      ) \
-    ) && \
-    _Partition_Is_buffer_on_boundary( (_the_buffer), (_the_partition) ) \
-  )
-
-/*PAGE
- *
- *  _Partition_Is_buffer_size_aligned
- *
- */
-
-#define _Partition_Is_buffer_size_aligned( _buffer_size ) \
-  ((_buffer_size) % CPU_PARTITION_ALIGNMENT == 0)
-
-/*PAGE
- *
- *  _Partition_Allocate
- *
- */
-
-#define _Partition_Allocate() \
-  (Partition_Control *) _Objects_Allocate( &_Partition_Information )
-
-/*PAGE
- *
- *  _Partition_Free
- *
- */
-
-#define _Partition_Free( _the_partition ) \
-  _Objects_Free( &_Partition_Information, &(_the_partition)->Object )
-
-/*PAGE
- *
- *  _Partition_Get
- *
- */
-
-#define _Partition_Get( _id, _location ) \
-  (Partition_Control *) \
-    _Objects_Get( &_Partition_Information, (_id), (_location) )
-
-/*PAGE
- *
- *  _Partition_Is_null
- *
- */
-
-#define _Partition_Is_null( _the_partition ) \
-   ( (_the_partition) == NULL  )
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/rtems/macros/rtems/rtems/ratemon.inl b/c/src/exec/rtems/macros/rtems/rtems/ratemon.inl
deleted file mode 100644
index 8a550d91e0..0000000000
--- a/c/src/exec/rtems/macros/rtems/rtems/ratemon.inl
+++ /dev/null
@@ -1,85 +0,0 @@
-/*  ratemon.inl
- *
- *  This file contains the macro implementation of the inlined
- *  routines in the Rate Monotonic Manager.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RATE_MONOTONIC_inl
-#define __RATE_MONOTONIC_inl
-
-/*PAGE
- *
- *  _Rate_monotonic_Allocate
- *
- */
-
-#define _Rate_monotonic_Allocate() \
-  (Rate_monotonic_Control *) \
-    _Objects_Allocate( &_Rate_monotonic_Information )
-
-/*PAGE
- *
- *  _Rate_monotonic_Free
- *
- */
-
-#define _Rate_monotonic_Free( _the_period ) \
-  _Objects_Free( &_Rate_monotonic_Information, &(_the_period)->Object )
-
-/*PAGE
- *
- *  _Rate_monotonic_Get
- *
- */
-
-#define _Rate_monotonic_Get( _id, _location ) \
-  (Rate_monotonic_Control *) \
-    _Objects_Get( &_Rate_monotonic_Information, (_id), (_location) )
-
-/*PAGE
- *
- *  _Rate_monotonic_Is_active
- *
- */
-
-#define _Rate_monotonic_Is_active( _the_period ) \
-    ((_the_period)->state == RATE_MONOTONIC_ACTIVE)
-
-/*PAGE
- *
- *  _Rate_monotonic_Is_inactive
- *
- */
-
-#define _Rate_monotonic_Is_inactive( _the_period ) \
-    ((_the_period)->state == RATE_MONOTONIC_INACTIVE)
-
-/*PAGE
- *
- *  _Rate_monotonic_Is_expired
- *
- */
-
-#define _Rate_monotonic_Is_expired( _the_period ) \
-    ((_the_period)->state == RATE_MONOTONIC_EXPIRED)
-
-/*PAGE
- *
- *  _Rate_monotonic_Is_null
- *
- */
-
-#define _Rate_monotonic_Is_null( _the_period )   ( (_the_period) == NULL  )
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/rtems/macros/rtems/rtems/region.inl b/c/src/exec/rtems/macros/rtems/rtems/region.inl
deleted file mode 100644
index 8c36bdeb34..0000000000
--- a/c/src/exec/rtems/macros/rtems/rtems/region.inl
+++ /dev/null
@@ -1,75 +0,0 @@
-/*  region.inl
- *
- *  This file contains the macro implementation of the inlined
- *  routines from the Region Manager.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __REGION_inl
-#define __REGION_inl
-
-/*PAGE
- *
- *  _Region_Allocate
- *
- */
-
-#define _Region_Allocate() \
-  (Region_Control *) _Objects_Allocate( &_Region_Information )
-
-/*PAGE
- *
- *  _Region_Free
- *
- */
-
-#define _Region_Free( _the_region ) \
-  _Objects_Free( &_Region_Information, &(_the_region)->Object )
-
-/*PAGE
- *
- *  _Region_Get
- *
- */
-
-#define _Region_Get( _id, _location ) \
-  (Region_Control *) \
-   _Objects_Get( &_Region_Information, (_id), (_location) )
-
-/*PAGE
- *
- *  _Region_Allocate_segment
- *
- */
-
-#define _Region_Allocate_segment( _the_region, _size ) \
-   _Heap_Allocate( &(_the_region)->Memory, (_size) )
-
-/*PAGE
- *
- *  _Region_Free_segment
- *
- */
-
-#define _Region_Free_segment( _the_region, _the_segment ) \
-   _Heap_Free( &(_the_region)->Memory, (_the_segment) )
-
-/*PAGE
- *
- *  _Region_Is_null
- *
- */
-
-#define _Region_Is_null( _the_region )   ( (_the_region) == NULL  )
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/rtems/macros/rtems/rtems/sem.inl b/c/src/exec/rtems/macros/rtems/rtems/sem.inl
deleted file mode 100644
index 132422a30b..0000000000
--- a/c/src/exec/rtems/macros/rtems/rtems/sem.inl
+++ /dev/null
@@ -1,58 +0,0 @@
-/*  sem.inl
- *
- *  This file contains the macro implementation of the inlined
- *  routines from the Semaphore Manager.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __SEMAPHORE_inl
-#define __SEMAPHORE_inl
-
-/*PAGE
- *
- *  _Semaphore_Allocate
- *
- */
-
-#define _Semaphore_Allocate() \
-  (Semaphore_Control *) _Objects_Allocate( &_Semaphore_Information )
-
-/*PAGE
- *
- *  _Semaphore_Free
- *
- */
-
-#define _Semaphore_Free( _the_semaphore ) \
-  _Objects_Free( &_Semaphore_Information, &(_the_semaphore)->Object )
-
-/*PAGE
- *
- *  _Semaphore_Get
- *
- */
-
-#define _Semaphore_Get( _id, _location ) \
-  (Semaphore_Control *) \
-  _Objects_Get( &_Semaphore_Information, (_id), (_location) )
-
-/*PAGE
- *
- *  _Semaphore_Is_null
- *
- */
-
-#define _Semaphore_Is_null( _the_semaphore ) \
-  ( (_the_semaphore) == NULL )
-
-#endif
-/*  end of include file */
diff --git a/c/src/exec/rtems/macros/rtems/rtems/status.inl b/c/src/exec/rtems/macros/rtems/rtems/status.inl
deleted file mode 100644
index 6db9086df0..0000000000
--- a/c/src/exec/rtems/macros/rtems/rtems/status.inl
+++ /dev/null
@@ -1,39 +0,0 @@
-/*  macros/status.h
- *
- *  This include file contains the implementations of the inlined
- *  routines for the status package.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __MACROS_STATUS_h
-#define __MACROS_STATUS_h
-
-/*PAGE
- *
- *  rtems_is_status_successful
- *
- */
-
-#define rtems_is_status_successful( _code ) \
-  ( (_code) == RTEMS_SUCCESSFUL )
-
-/*PAGE
- *
- *  rtems_are_statuses_equal
- *
- */
-
-#define rtems_are_statuses_equal( _code1, _code2 ) \
-   ((_code1) == (_code2))
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/rtems/macros/rtems/rtems/support.inl b/c/src/exec/rtems/macros/rtems/rtems/support.inl
deleted file mode 100644
index fc84a2e7ee..0000000000
--- a/c/src/exec/rtems/macros/rtems/rtems/support.inl
+++ /dev/null
@@ -1,44 +0,0 @@
-/*  support.inl
- *
- *  This include file contains the macros implementation of all
- *  of the inlined routines specific to the RTEMS API.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
- 
-#ifndef __RTEMS_SUPPORT_inl
-#define __RTEMS_SUPPORT_inl
-
-/*PAGE
- *
- *  rtems_is_name_valid
- *
- */
-
-#define rtems_is_name_valid( _name ) \
-  ( (_name) != 0 )
-
-/*PAGE
- *
- *  rtems_name_to_characters
- *
- */
-
-#define rtems_name_to_characters( _name, _c1, _c2, _c3, _c4 ) \
-  { \
-    (*(_c1) = ((_name) >> 24) & 0xff; \
-    (*(_c2) = ((_name) >> 16) & 0xff; \
-    (*(_c3) = ((_name) >> 8) & 0xff; \
-    (*(_c4) = ((_name)) & 0xff; \
-  }
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/rtems/macros/rtems/rtems/tasks.inl b/c/src/exec/rtems/macros/rtems/rtems/tasks.inl
deleted file mode 100644
index a60d80d60c..0000000000
--- a/c/src/exec/rtems/macros/rtems/rtems/tasks.inl
+++ /dev/null
@@ -1,58 +0,0 @@
-/*  tasks.inl
- *
- *  This file contains the macro implementation of all inlined
- *  routines in the with RTEMS Tasks Manager.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_TASKS_inl
-#define __RTEMS_TASKS_inl
-
-/*PAGE
- *
- *  _RTEMS_tasks_Allocate
- *
- */
-
-#define _RTEMS_tasks_Allocate() \
-  (Thread_Control *) _Objects_Allocate( &_RTEMS_tasks_Information )
-
-/*PAGE
- *
- *  _RTEMS_tasks_Free
- *
- */
-
-#define _RTEMS_tasks_Free( _the_task ) \
-  _Objects_Free( &_RTEMS_tasks_Information, &(_the_task)->Object )
-
-/*PAGE
- *
- *  _RTEMS_tasks_Priority_to_Core
- */
- 
-#define _RTEMS_tasks_Priority_to_Core( _priority ) \
-  ((Priority_Control) (_priority))
-
-/*PAGE
- *
- *  _RTEMS_tasks_Priority_is_valid
- *
- */
- 
-#define _RTEMS_tasks_Priority_is_valid( _the_priority ) \
-  ( ((_the_priority) >= RTEMS_MINIMUM_PRIORITY) && \
-    ((_the_priority) <= RTEMS_MAXIMUM_PRIORITY) )
- 
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/rtems/macros/rtems/rtems/timer.inl b/c/src/exec/rtems/macros/rtems/rtems/timer.inl
deleted file mode 100644
index 5dc329a203..0000000000
--- a/c/src/exec/rtems/macros/rtems/rtems/timer.inl
+++ /dev/null
@@ -1,85 +0,0 @@
-/*  timer.inl
- *
- *  This file contains the macro implementation of the inlined routines
- *  from the Timer Manager.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __TIMER_inl
-#define __TIMER_inl
-
-/*PAGE
- *
- *  _Timer_Allocate
- *
- */
-
-#define _Timer_Allocate() \
-  (Timer_Control *) _Objects_Allocate( &_Timer_Information )
-
-/*PAGE
- *
- *  _Timer_Free
- *
- */
-
-#define _Timer_Free( _the_timer ) \
-  _Objects_Free( &_Timer_Information, &(_the_timer)->Object )
-
-/*PAGE
- *
- *  _Timer_Get
- *
- */
-
-#define _Timer_Get( _id, _location ) \
-  (Timer_Control *) \
-    _Objects_Get( &_Timer_Information, (_id), (_location) )
-
-/*PAGE
- *
- *  _Timer_Is_interval_class
- *
- */
-
-#define _Timer_Is_interval_class( _the_class ) \
-  ( (_the_class) == TIMER_INTERVAL )
-
-/*PAGE
- *
- *  _Timer_Is_time_of_day_class
- *
- */
-
-#define _Timer_Is_time_of_day_class( _the_class ) \
-  ( (_the_class) == TIMER_TIME_OF_DAY )
-
-/*PAGE
- *
- *  _Timer_Is_dormant_class
- *
- */
-
-#define _Timer_Is_dormant_class( _the_class ) \
-  ( (_the_class) == TIMER_DORMANT )
-
-/*PAGE
- *
- *  _Timer_Is_null
- *
- */
-
-#define _Timer_Is_null( _the_timer ) \
-  ( (_the_timer) == NULL )
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/rtems/src/rtclock.c b/c/src/exec/rtems/src/rtclock.c
deleted file mode 100644
index 8a1b6b56af..0000000000
--- a/c/src/exec/rtems/src/rtclock.c
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- *  Clock Manager
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems/system.h>
-#include <rtems/rtems/status.h>
-#include <rtems/rtems/clock.h>
-#include <rtems/score/isr.h>
-#include <rtems/score/thread.h>
-#include <rtems/score/tod.h>
-#include <rtems/score/watchdog.h>
-
-/*PAGE
- *
- *  rtems_clock_get
- *
- *  This directive returns the current date and time.  If the time has
- *  not been set by a tm_set then an error is returned.
- *
- *  Input parameters:
- *    option      - which value to return
- *    time_buffer - pointer to output buffer (a time and date structure
- *                  or an interval)
- *
- *  Output parameters:
- *    time_buffer      - output filled in
- *    RTEMS_SUCCESSFUL - if successful
- *    error code       - if unsuccessful
- */
-
-rtems_status_code rtems_clock_get(
-  rtems_clock_get_options  option,
-  void                    *time_buffer
-)
-{
-  ISR_Level      level;
-  rtems_interval tmp;
-
-  switch ( option ) {
-    case RTEMS_CLOCK_GET_TOD:
-      if ( !_TOD_Is_set )
-        return RTEMS_NOT_DEFINED;
-
-      *(rtems_time_of_day *)time_buffer = _TOD_Current;
-      return RTEMS_SUCCESSFUL;
-
-    case RTEMS_CLOCK_GET_SECONDS_SINCE_EPOCH:
-      if ( !_TOD_Is_set )
-        return RTEMS_NOT_DEFINED;
-
-      *(rtems_interval *)time_buffer = _TOD_Seconds_since_epoch;
-      return RTEMS_SUCCESSFUL;
-
-    case RTEMS_CLOCK_GET_TICKS_SINCE_BOOT:
-      *(rtems_interval *)time_buffer = _Watchdog_Ticks_since_boot;
-      return RTEMS_SUCCESSFUL;
-
-    case RTEMS_CLOCK_GET_TICKS_PER_SECOND:
-      *(rtems_interval *)time_buffer = _TOD_Ticks_per_second;
-      return RTEMS_SUCCESSFUL;
-
-    case RTEMS_CLOCK_GET_TIME_VALUE:
-      if ( !_TOD_Is_set )
-        return RTEMS_NOT_DEFINED;
-
-      _ISR_Disable( level );
-        ((rtems_clock_time_value *)time_buffer)->seconds =
-          _TOD_Seconds_since_epoch;
-        tmp = _TOD_Current.ticks;
-      _ISR_Enable( level );
-
-      tmp *= _TOD_Microseconds_per_tick;
-      ((rtems_clock_time_value *)time_buffer)->microseconds = tmp;
-
-      return RTEMS_SUCCESSFUL;
-  }
-
-  return RTEMS_INTERNAL_ERROR;   /* should never get here */
-
-}
-
-/*PAGE
- *
- *  rtems_clock_set
- *
- *  This directive sets the date and time for this node.
- *
- *  Input parameters:
- *    time_buffer - pointer to the time and date structure
- *
- *  Output parameters:
- *    RTEMS_SUCCESSFUL - if successful
- *    error code        - if unsuccessful
- */
-
-rtems_status_code rtems_clock_set(
-  rtems_time_of_day *time_buffer
-)
-{
-  rtems_interval     seconds;
-
-  if ( _TOD_Validate( time_buffer ) ) {
-    seconds = _TOD_To_seconds( time_buffer );
-    _Thread_Disable_dispatch();
-      _TOD_Set( time_buffer, seconds );
-    _Thread_Enable_dispatch();
-    return RTEMS_SUCCESSFUL;
-  }
-  return RTEMS_INVALID_CLOCK;
-}
-
-/*PAGE
- *
- *  rtems_clock_tick
- *
- *  This directive notifies the executve that a tick has occurred.
- *  When the tick occurs the time manager updates and maintains
- *  the calendar time, timeslicing, and any timeout delays.
- *
- *  Input parameters:  NONE
- *
- *  Output parameters:
- *    RTEMS_SUCCESSFUL - always succeeds
- *
- *  NOTE: This routine only works for leap-years through 2099.
- */
-
-rtems_status_code rtems_clock_tick( void )
-{
-  _TOD_Tickle_ticks();
-
-  _Watchdog_Tickle_ticks();
-
-  _Thread_Tickle_timeslice();
-
-  if ( _Thread_Is_context_switch_necessary() &&
-       _Thread_Is_dispatching_enabled() )
-    _Thread_Dispatch();
-
-  return RTEMS_SUCCESSFUL;
-}
diff --git a/c/src/exec/rtems/src/rtemstimer.c b/c/src/exec/rtems/src/rtemstimer.c
deleted file mode 100644
index 9d04686d40..0000000000
--- a/c/src/exec/rtems/src/rtemstimer.c
+++ /dev/null
@@ -1,349 +0,0 @@
-/*
- *  Timer Manager
- *
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems/system.h>
-#include <rtems/rtems/status.h>
-#include <rtems/rtems/support.h>
-#include <rtems/score/object.h>
-#include <rtems/score/thread.h>
-#include <rtems/rtems/timer.h>
-#include <rtems/score/tod.h>
-#include <rtems/score/watchdog.h>
-
-/*PAGE
- *
- *  _Timer_Manager_initialization
- *
- *  This routine initializes all timer manager related data structures.
- *
- *  Input parameters:
- *    maximum_timers - number of timers to initialize
- *
- *  Output parameters:  NONE
- */
-
-void _Timer_Manager_initialization(
-  unsigned32 maximum_timers
-)
-{
-  _Objects_Initialize_information(
-    &_Timer_Information,
-    OBJECTS_RTEMS_TIMERS,
-    FALSE,
-    maximum_timers,
-    sizeof( Timer_Control ),
-    FALSE,
-    RTEMS_MAXIMUM_NAME_LENGTH,
-    FALSE
-  );
-}
-
-/*PAGE
- *
- *  rtems_timer_create
- *
- *  This directive creates a timer and performs some initialization.
- *
- *  Input parameters:
- *    name - timer name
- *    id   - pointer to timer id
- *
- *  Output parameters:
- *    id                - timer id
- *    RTEMS_SUCCESSFUL - if successful
- *    error code        - if unsuccessful
- */
-
-rtems_status_code rtems_timer_create(
-  rtems_name    name,
-  Objects_Id   *id
-)
-{
-  Timer_Control *the_timer;
-
-  if ( !rtems_is_name_valid( name ) )
-    return RTEMS_INVALID_NAME;
-
-  _Thread_Disable_dispatch();         /* to prevent deletion */
-
-  the_timer = _Timer_Allocate();
-
-  if ( !the_timer ) {
-    _Thread_Enable_dispatch();
-    return RTEMS_TOO_MANY;
-  }
-
-  the_timer->the_class = TIMER_DORMANT;
-
-  _Objects_Open( &_Timer_Information, &the_timer->Object, &name );
-
-  *id = the_timer->Object.id;
-  _Thread_Enable_dispatch();
-  return RTEMS_SUCCESSFUL;
-}
-
-/*PAGE
- *
- *  rtems_timer_ident
- *
- *  This directive returns the system ID associated with
- *  the timer name.
- *
- *  Input parameters:
- *    name - user defined message queue name
- *    id   - pointer to timer id
- *
- *  Output parameters:
- *    *id               - message queue id
- *    RTEMS_SUCCESSFUL - if successful
- *    error code        - if unsuccessful
- */
-
-rtems_status_code rtems_timer_ident(
-  rtems_name    name,
-  Objects_Id   *id
-)
-{
-  Objects_Name_to_id_errors  status;
-
-  status = _Objects_Name_to_id(
-    &_Timer_Information,
-    &name,
-    OBJECTS_SEARCH_LOCAL_NODE,
-    id
-  );
-
-  return _Status_Object_name_errors_to_status[ status ];
-}
-
-/*PAGE
- *
- *  rtems_timer_cancel
- *
- *  This directive allows a thread to cancel a timer.
- *
- *  Input parameters:
- *    id - timer id
- *
- *  Output parameters:
- *    RTEMS_SUCCESSFUL - if successful
- *    error code - if unsuccessful
- */
-
-rtems_status_code rtems_timer_cancel(
-  Objects_Id id
-)
-{
-  Timer_Control   *the_timer;
-  Objects_Locations       location;
-
-  the_timer = _Timer_Get( id, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-      return RTEMS_INVALID_ID;
-    case OBJECTS_REMOTE:            /* should never return this */
-      return RTEMS_INTERNAL_ERROR;
-    case OBJECTS_LOCAL:
-      if ( !_Timer_Is_dormant_class( the_timer->the_class ) ) 
-        (void) _Watchdog_Remove( &the_timer->Ticker );
-      _Thread_Enable_dispatch();
-      return RTEMS_SUCCESSFUL;
-  }
-
-  return RTEMS_INTERNAL_ERROR;   /* unreached - only to remove warnings */
-}
-
-/*PAGE
- *
- *  rtems_timer_delete
- *
- *  This directive allows a thread to delete a timer.
- *
- *  Input parameters:
- *    id - timer id
- *
- *  Output parameters:
- *    RTEMS_SUCCESSFUL - if successful
- *    error code - if unsuccessful
- */
-
-rtems_status_code rtems_timer_delete(
-  Objects_Id id
-)
-{
-  Timer_Control   *the_timer;
-  Objects_Locations       location;
-
-  the_timer = _Timer_Get( id, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-      return RTEMS_INVALID_ID;
-    case OBJECTS_REMOTE:            /* should never return this */
-      return RTEMS_INTERNAL_ERROR;
-    case OBJECTS_LOCAL:
-      _Objects_Close( &_Timer_Information, &the_timer->Object );
-      (void) _Watchdog_Remove( &the_timer->Ticker );
-      _Timer_Free( the_timer );
-      _Thread_Enable_dispatch();
-      return RTEMS_SUCCESSFUL;
-  }
-
-  return RTEMS_INTERNAL_ERROR;   /* unreached - only to remove warnings */
-}
-
-/*PAGE
- *
- *  rtems_timer_fire_after
- *
- *  This directive allows a thread to start a timer.
- *
- *  Input parameters:
- *    id      - timer id
- *    ticks   - interval until routine is fired
- *    routine - routine to schedule
- *
- *  Output parameters:
- *    RTEMS_SUCCESSFUL - if successful
- *    error code        - if unsuccessful
- */
-
-rtems_status_code rtems_timer_fire_after(
-  Objects_Id                         id,
-  rtems_interval                     ticks,
-  rtems_timer_service_routine_entry  routine,
-  void                              *user_data
-)
-{
-  Timer_Control      *the_timer;
-  Objects_Locations   location;
-
-  if ( ticks == 0 )
-    return RTEMS_INVALID_NUMBER;
-
-  the_timer = _Timer_Get( id, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-      return RTEMS_INVALID_ID;
-    case OBJECTS_REMOTE:            /* should never return this */
-      return RTEMS_INTERNAL_ERROR;
-    case OBJECTS_LOCAL:
-      (void) _Watchdog_Remove( &the_timer->Ticker );
-      the_timer->the_class = TIMER_INTERVAL;
-      _Watchdog_Initialize( &the_timer->Ticker, routine, id, user_data );
-      _Watchdog_Insert_ticks( &the_timer->Ticker, ticks );
-      _Thread_Enable_dispatch();
-      return RTEMS_SUCCESSFUL;
-  }
-
-  return RTEMS_INTERNAL_ERROR;   /* unreached - only to remove warnings */
-}
-
-/*PAGE
- *
- *  rtems_timer_fire_when
- *
- *  This directive allows a thread to start a timer.
- *
- *  Input parameters:
- *    id        - timer id
- *    wall_time - time of day to fire timer
- *    routine   - routine to schedule
- *
- *  Output parameters:
- *    RTEMS_SUCCESSFUL - if successful
- *    error code        - if unsuccessful
- */
-
-rtems_status_code rtems_timer_fire_when(
-  Objects_Id                          id,
-  rtems_time_of_day                  *wall_time,
-  rtems_timer_service_routine_entry   routine,
-  void                               *user_data
-)
-{
-  Timer_Control       *the_timer;
-  Objects_Locations    location;
-  rtems_interval       seconds;
-
-  if ( !_TOD_Is_set )
-    return RTEMS_NOT_DEFINED;
-
-  if ( !_TOD_Validate( wall_time ) )
-    return RTEMS_INVALID_CLOCK;
-
-  seconds = _TOD_To_seconds( wall_time );
-  if ( seconds <= _TOD_Seconds_since_epoch )
-    return RTEMS_INVALID_CLOCK;
-
-  the_timer = _Timer_Get( id, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-      return RTEMS_INVALID_ID;
-    case OBJECTS_REMOTE:            /* should never return this */
-      return RTEMS_INTERNAL_ERROR;
-    case OBJECTS_LOCAL:
-      (void) _Watchdog_Remove( &the_timer->Ticker );
-      the_timer->the_class = TIMER_TIME_OF_DAY;
-      _Watchdog_Initialize( &the_timer->Ticker, routine, id, user_data );
-      _Watchdog_Insert_seconds(
-         &the_timer->Ticker,
-         seconds - _TOD_Seconds_since_epoch
-       );
-      _Thread_Enable_dispatch();
-      return RTEMS_SUCCESSFUL;
-  }
-
-  return RTEMS_INTERNAL_ERROR;   /* unreached - only to remove warnings */
-}
-
-/*PAGE
- *
- *  rtems_timer_reset
- *
- *  This directive allows a thread to reset a timer.
- *
- *  Input parameters:
- *    id - timer id
- *
- *  Output parameters:
- *    RTEMS_SUCCESSFUL - if successful
- *    error code        - if unsuccessful
- */
-
-rtems_status_code rtems_timer_reset(
-  Objects_Id id
-)
-{
-  Timer_Control     *the_timer;
-  Objects_Locations  location;
-
-  the_timer = _Timer_Get( id, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-      return RTEMS_INVALID_ID;
-    case OBJECTS_REMOTE:            /* should never return this */
-      return RTEMS_INTERNAL_ERROR;
-    case OBJECTS_LOCAL:
-      if ( _Timer_Is_interval_class( the_timer->the_class ) ) {
-        _Watchdog_Reset( &the_timer->Ticker );
-        _Thread_Enable_dispatch();
-        return RTEMS_SUCCESSFUL;
-      }
-      _Thread_Enable_dispatch();
-      return RTEMS_NOT_DEFINED;
-  }
-
-  return RTEMS_INTERNAL_ERROR;   /* unreached - only to remove warnings */
-}
diff --git a/c/src/exec/sapi/include/confdefs.h b/c/src/exec/sapi/include/confdefs.h
deleted file mode 100644
index e31218ac0d..0000000000
--- a/c/src/exec/sapi/include/confdefs.h
+++ /dev/null
@@ -1,656 +0,0 @@
-/*  confdefs.h
- *
- *  This include file contains the configuration table template that will
- *  be used by the single processor tests to define its default configuration
- *  parameters.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __CONFIGURATION_TEMPLATE_h
-#define __CONFIGURATION_TEMPLATE_h
- 
-#ifdef __cplusplus
-extern "C" {
-#endif
- 
-extern rtems_initialization_tasks_table Initialization_tasks[];
-extern rtems_driver_address_table       Device_drivers[];
-extern rtems_configuration_table        Configuration;
-extern rtems_multiprocessing_table      Multiprocessing_configuration;
-#ifdef RTEMS_POSIX_API
-extern posix_api_configuration_table    Configuration_POSIX_API;
-#endif
-
-/*
- *  RTEMS C Library and Newlib support
- *
- *  NOTE:  This ends up defining these even when newlib is not used.
- */
-
-#define CONFIGURE_NEWLIB_EXTENSION 1
-#define CONFIGURE_MALLOC_REGION 1
-
-#ifndef CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS
-#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 20
-#endif
-
-#define CONFIGURE_LIBIO_SEMAPHORES \
-  (CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS + 1)
-
-#ifdef CONFIGURE_INIT
-unsigned32 rtems_libio_number_iops = CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS;
-#endif
-
-/*
- *  Stack Checker Requirements
- */
-
-#ifdef STACK_CHECKER_ON
-#define CONFIGURE_STACK_CHECKER_EXTENSION 1
-#else
-#define CONFIGURE_STACK_CHECKER_EXTENSION 0
-#endif
-
-/*
- *  Interrupt Stack Space
- */
-
-#if (CPU_ALLOCATE_INTERRUPT_STACK == 0)
-#define CONFIGURE_INTERRUPT_STACK_MEMORY 0
-#else
-  #ifndef CONFIGURE_INTERRUPT_STACK_MEMORY
-  #define CONFIGURE_INTERRUPT_STACK_MEMORY RTEMS_MINIMUM_STACK_SIZE
-  #else
-  #define CONFIGURE_INTERRUPT_STACK_MEMORY 0
-  #endif
-#endif
-
-/*
- *  Default User Initialization Task Table.  This table guarantees that
- *  one user initialization table is defined.
- */
-
-#ifdef CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#ifdef CONFIGURE_HAS_OWN_INIT_TASK_TABLE
-
-/*
- *  The user is defining their own table information and setting the 
- *  appropriate variables.
- */
-
-#else
-
-#ifndef CONFIGURE_INIT_TASK_NAME
-#define CONFIGURE_INIT_TASK_NAME          rtems_build_name( 'U', 'I', '1', ' ' )
-#endif
-
-#ifndef CONFIGURE_INIT_TASK_STACK_SIZE
-#define CONFIGURE_INIT_TASK_STACK_SIZE    RTEMS_MINIMUM_STACK_SIZE 
-#endif
-
-#ifndef CONFIGURE_INIT_TASK_PRIORITY
-#define CONFIGURE_INIT_TASK_PRIORITY      1
-#endif
-
-#ifndef CONFIGURE_INIT_TASK_ATTRIBUTES
-#define CONFIGURE_INIT_TASK_ATTRIBUTES    RTEMS_DEFAULT_ATTRIBUTES 
-#endif
-
-#ifndef CONFIGURE_INIT_TASK_ENTRY_POINT
-#define CONFIGURE_INIT_TASK_ENTRY_POINT   Init 
-#endif
-
-#ifndef CONFIGURE_INIT_TASK_INITIAL_MODES
-#define CONFIGURE_INIT_TASK_INITIAL_MODES RTEMS_NO_PREEMPT 
-#endif
-
-#ifndef CONFIGURE_INIT_TASK_ARGUMENTS
-#define CONFIGURE_INIT_TASK_ARGUMENTS     0 
-#endif
-
-#ifdef CONFIGURE_INIT
-rtems_initialization_tasks_table Initialization_tasks[] = {
-  { CONFIGURE_INIT_TASK_NAME,
-    CONFIGURE_INIT_TASK_STACK_SIZE,
-    CONFIGURE_INIT_TASK_PRIORITY,
-    CONFIGURE_INIT_TASK_ATTRIBUTES,
-    CONFIGURE_INIT_TASK_ENTRY_POINT,
-    CONFIGURE_INIT_TASK_INITIAL_MODES,
-    CONFIGURE_INIT_TASK_ARGUMENTS
-  }
-};
-#endif
-
-#define CONFIGURE_INIT_TASK_TABLE Initialization_tasks
-
-#define CONFIGURE_INIT_TASK_TABLE_SIZE \
-  sizeof(CONFIGURE_INIT_TASK_TABLE) / sizeof(rtems_initialization_tasks_table)
-
-#endif    /* CONFIGURE_HAS_OWN_INIT_TASK_TABLE */
-
-#else     /* CONFIGURE_RTEMS_INIT_TASKS_TABLE */
-
-#define CONFIGURE_INIT_TASK_TABLE      NULL
-#define CONFIGURE_INIT_TASK_TABLE_SIZE 0
-
-#endif
-
-/*
- *  Default Device Driver Table.  Each driver needed by the test is explicitly
- *  choosen by that test.  There is always a null driver entry.
- */
-
-#define NULL_DRIVER_TABLE_ENTRY \
- { NULL, NULL, NULL, NULL, NULL, NULL }
-
-#ifdef CONFIGURE_TEST_NEEDS_TIMER_DRIVER
-#include <timerdrv.h>
-#endif
-
-#ifdef CONFIGURE_TEST_NEEDS_STUB_DRIVER
-#include <stubdrv.h>
-#endif
-
-#ifndef CONFIGURE_HAS_OWN_DEVICE_DRIVER_TABLE
-
-#ifdef CONFIGURE_INIT
-rtems_driver_address_table Device_drivers[] = {
-#ifdef CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-  CONSOLE_DRIVER_TABLE_ENTRY,
-#endif
-#ifdef CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-  CLOCK_DRIVER_TABLE_ENTRY,
-#endif
-#ifdef CONFIGURE_TEST_NEEDS_STUB_DRIVER
-  STUB_DRIVER_TABLE_ENTRY,
-#endif
-  NULL_DRIVER_TABLE_ENTRY
-};
-#endif
-
-#endif  /* CONFIGURE_HAS_OWN_DEVICE_DRIVER_TABLE */
-
-/*
- *  Default the number of devices per device driver.  This value may be
- *  overridden by the user.
- */
-
-#ifndef CONFIGURE_HAS_OWN_NUMBER_OF_DEVICES
-
-#ifndef CONFIGURE_MAXIMUM_DEVICES
-#define CONFIGURE_MAXIMUM_DEVICES   20
-#endif
-
-#endif /* CONFIGURE_HAS_OWN_NUMBER_OF_DEVICES */
-
-/*
- *  Default Configuration Table.  This table contains the most values set in
- *  the RTEMS Test Suite.  Each value may be overridden within each test to
- *  customize the environment. 
- */
-
-#ifdef CONFIGURE_MPTEST
-#ifndef CONFIGURE_HAS_OWN_MULTIPROCESING_TABLE
-
-#ifndef CONFIGURE_MP_NODE_NUMBER
-#define CONFIGURE_MP_NODE_NUMBER                NODE_NUMBER
-#endif
-
-#ifndef CONFIGURE_MP_MAXIMUM_NODES
-#define CONFIGURE_MP_MAXIMUM_NODES              2
-#endif
-
-#ifndef CONFIGURE_MP_MAXIMUM_GLOBAL_OBJECTS
-#define CONFIGURE_MP_MAXIMUM_GLOBAL_OBJECTS     32
-#endif
-
-#ifndef CONFIGURE_MP_MAXIMUM_PROXIES
-#define CONFIGURE_MP_MAXIMUM_PROXIES            32
-#endif
-
-#ifndef CONFIGURE_MP_MPCI_TABLE_POINTER
-#include <mpci.h>
-#define CONFIGURE_MP_MPCI_TABLE_POINTER         &MPCI_table
-#endif
-
-#ifdef CONFIGURE_INIT
-rtems_multiprocessing_table Multiprocessing_configuration = {
-  CONFIGURE_MP_NODE_NUMBER,              /* local node number */
-  CONFIGURE_MP_MAXIMUM_NODES,            /* maximum # nodes in system */
-  CONFIGURE_MP_MAXIMUM_GLOBAL_OBJECTS,   /* maximum # global objects */
-  CONFIGURE_MP_MAXIMUM_PROXIES,          /* maximum # proxies */
-  CONFIGURE_MP_MPCI_TABLE_POINTER        /* pointer to MPCI config table */
-};
-#endif
-
-#define CONFIGURE_MULTIPROCESSING_TABLE    &Multiprocessing_configuration
-
-#endif /* CONFIGURE_HAS_OWN_MULTIPROCESING_TABLE */
-
-#else
-
-#define CONFIGURE_MULTIPROCESSING_TABLE    NULL
-
-#endif /* CONFIGURE_MPTEST */
- 
-/*
- *  Default Configuration Table.  This table contains the most values set in
- *  the RTEMS Test Suite.  Each value may be overridden within each test to
- *  customize the environment. 
- */
-
-#ifndef CONFIGURE_HAS_OWN_CONFIGURATION_TABLE
- 
-#ifndef CONFIGURE_EXECUTIVE_RAM_WORK_AREA
-#define CONFIGURE_EXECUTIVE_RAM_WORK_AREA     NULL
-#endif
-
-#ifndef CONFIGURE_MAXIMUM_TASKS
-#define CONFIGURE_MAXIMUM_TASKS               10
-#endif
-
-#ifndef CONFIGURE_MAXIMUM_TIMERS
-#define CONFIGURE_MAXIMUM_TIMERS              0
-#endif
-
-#ifndef CONFIGURE_MAXIMUM_SEMAPHORES
-#define CONFIGURE_MAXIMUM_SEMAPHORES          0
-#endif
-
-#ifndef CONFIGURE_MAXIMUM_MESSAGE_QUEUES
-#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES      0
-#endif
-
-#ifndef CONFIGURE_MAXIMUM_PARTITIONS
-#define CONFIGURE_MAXIMUM_PARTITIONS          0
-#endif
-
-#ifndef CONFIGURE_MAXIMUM_REGIONS
-#define CONFIGURE_MAXIMUM_REGIONS             0
-#endif
-
-#ifndef CONFIGURE_MAXIMUM_PORTS
-#define CONFIGURE_MAXIMUM_PORTS               0
-#endif
-
-#ifndef CONFIGURE_MAXIMUM_PERIODS
-#define CONFIGURE_MAXIMUM_PERIODS             0
-#endif
-
-#ifndef CONFIGURE_MAXIMUM_USER_EXTENSIONS
-#define CONFIGURE_MAXIMUM_USER_EXTENSIONS     0
-#endif
-
-#ifndef CONFIGURE_MICROSECONDS_PER_TICK 
-#define CONFIGURE_MICROSECONDS_PER_TICK RTEMS_MILLISECONDS_TO_MICROSECONDS(10)
-#endif
-
-#ifndef CONFIGURE_TICKS_PER_TIMESLICE
-#define CONFIGURE_TICKS_PER_TIMESLICE        50
-#endif
-
-/*
- *  Initial Extension Set
- */
-
-#ifdef CONFIGURE_INIT
-#ifdef STACK_CHECKER_ON
-#include <stackchk.h>
-#endif
-
-rtems_extensions_table Configuration_Initial_Extensions[] = {
-#ifdef CONFIGURE_INITIAL_EXTENSIONS
-    CONFIGURE_INITIAL_EXTENSIONS,
-#endif
-#ifdef STACK_CHECKER_ON
-    STACK_CHECKER_EXTENSION,
-#endif
-    { NULL, NULL, NULL, NULL, NULL, NULL, NULL }
-};
-
-#define CONFIGURE_NUMBER_OF_INITIAL_EXTENSIONS \
-  ((sizeof(Configuration_Initial_Extensions) / \
-    sizeof(rtems_extensions_table)) - 1)
-
-#endif
-
-/*
- *  POSIX API Configuration Parameters
- */
-
-#ifdef RTEMS_POSIX_API
-
-#include <sys/types.h>
-#include <rtems/posix/cond.h>
-#include <rtems/posix/mutex.h>
-#include <rtems/posix/key.h>
-#include <rtems/posix/psignal.h>
-#include <rtems/posix/threadsup.h>
-
-#ifndef CONFIGURE_MAXIMUM_POSIX_THREADS
-#define CONFIGURE_MAXIMUM_POSIX_THREADS      10
-#endif
-
-#ifndef CONFIGURE_MAXIMUM_POSIX_MUTEXES
-#define CONFIGURE_MAXIMUM_POSIX_MUTEXES      0
-#endif
-
-#ifndef CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES
-#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES  0
-#endif
-
-#ifndef CONFIGURE_MAXIMUM_POSIX_KEYS
-#define CONFIGURE_MAXIMUM_POSIX_KEYS         0
-#endif
-
-#ifndef CONFIGURE_MAXIMUM_POSIX_QUEUED_SIGNALS
-#define CONFIGURE_MAXIMUM_POSIX_QUEUED_SIGNALS 0
-#endif
-
-#ifdef CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#ifdef CONFIGURE_POSIX_HAS_OWN_INIT_THREAD_TABLE
-
-/*
- *  The user is defining their own table information and setting the
- *  appropriate variables.
- */
- 
-#else
-
-#ifndef CONFIGURE_POSIX_INIT_THREAD_ENTRY_POINT
-#define CONFIGURE_POSIX_INIT_THREAD_ENTRY_POINT   POSIX_Init 
-#endif
-
-#ifdef CONFIGURE_INIT
-posix_initialization_threads_table POSIX_Initialization_threads[] = {
-  { CONFIGURE_POSIX_INIT_THREAD_ENTRY_POINT }
-};
-#endif
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE_NAME POSIX_Initialization_threads
- 
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE_SIZE \
-  sizeof(CONFIGURE_POSIX_INIT_THREAD_TABLE_NAME) / \
-      sizeof(posix_initialization_threads_table)
-
-#endif    /* CONFIGURE_POSIX_HAS_OWN_INIT_TASK_TABLE */
-
-#else     /* CONFIGURE_POSIX_INIT_THREAD_TABLE */
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE_NAME NULL
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE_SIZE 0
-
-#endif
-
-#define CONFIGURE_MEMORY_PER_TASK_FOR_POSIX_API \
-  ( \
-    sizeof (POSIX_API_Control) + \
-   (sizeof (void *) * (CONFIGURE_GNAT_KEYS + CONFIGURE_MAXIMUM_POSIX_KEYS)) \
-  )
-
-#define CONFIGURE_MEMORY_FOR_POSIX_MUTEXES(_mutexes) \
-  ((_mutexes) * \
-   ( sizeof(POSIX_Mutex_Control) + CONFIGURE_OBJECT_TABLE_STUFF ) )
-
-#define CONFIGURE_MEMORY_FOR_POSIX_CONDITION_VARIABLES(_condition_variables) \
-  ((_condition_variables) * \
-   ( sizeof(POSIX_Condition_variables_Control) + \
-        CONFIGURE_OBJECT_TABLE_STUFF ) )
-
-#define CONFIGURE_MEMORY_FOR_POSIX_KEYS(_keys) \
-  ((_keys) * \
-   ( sizeof(POSIX_Keys_Control) + CONFIGURE_OBJECT_TABLE_STUFF ) )
-
-#define CONFIGURE_MEMORY_FOR_POSIX_QUEUED_SIGNALS(_queued_signals) \
-  ((_queued_signals) * \
-   ( sizeof(POSIX_signals_Siginfo_node) + CONFIGURE_OBJECT_TABLE_STUFF ) )
-
-  
-
-#define CONFIGURE_MEMORY_FOR_POSIX \
-  ( \
-    CONFIGURE_MEMORY_FOR_POSIX_MUTEXES( CONFIGURE_MAXIMUM_POSIX_MUTEXES ) + \
-    CONFIGURE_MEMORY_FOR_POSIX_CONDITION_VARIABLES( \
-        CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES ) + \
-    CONFIGURE_MEMORY_FOR_POSIX_KEYS( CONFIGURE_MAXIMUM_POSIX_KEYS ) + \
-    CONFIGURE_MEMORY_FOR_POSIX_QUEUED_SIGNALS( \
-        CONFIGURE_MAXIMUM_POSIX_QUEUED_SIGNALS ) \
-   )
-
-
-#else
-
-#define CONFIGURE_MAXIMUM_POSIX_THREADS         0
-#define CONFIGURE_MEMORY_PER_TASK_FOR_POSIX_API 0
-#define CONFIGURE_MEMORY_FOR_POSIX              0
-
-#endif    /* RTEMS_POSIX_API */
-
-/* 
- *  Calculate the RAM size based on the maximum number of objects configured.
- *  The model is to estimate the memory required for each configured item,
- *  sum the memory requirements and insure that there is at least 32K greater 
- *  than that for things not directly addressed such as:
- *
- *    + stacks greater than minimum size
- *    + FP contexts
- *    + API areas (should be optional)
- *    + messages
- *    + object name and local pointer table overhead
- *    + per node memory requirements
- *    + executive fixed requirements (including at least internal threads
- *       and the Ready chains)
- *
- *  NOTE:  Eventually this should take into account some of the above.
- *         Basically, this is a "back of the envelope" estimate for
- *         memory requirements.  It could be more accurate.
- */
-
-#ifndef CONFIGURE_EXECUTIVE_RAM_SIZE
-
-#define CONFIGURE_OBJECT_TABLE_STUFF \
-  ( sizeof(Objects_Control *) + sizeof(rtems_name *) + sizeof(rtems_name) )
-
-#define CONFIGURE_MEMORY_FOR_TASKS(_tasks) \
-  (((_tasks) + 1 ) * \
-   ((sizeof(Thread_Control) + CONTEXT_FP_SIZE + \
-      STACK_MINIMUM_SIZE + sizeof( RTEMS_API_Control ) + \
-      CONFIGURE_MEMORY_PER_TASK_FOR_POSIX_API + \
-      CONFIGURE_OBJECT_TABLE_STUFF)) \
-  )
-
-#define CONFIGURE_MEMORY_FOR_TIMERS(_timers) \
-  ((_timers) * ( sizeof(Timer_Control) + CONFIGURE_OBJECT_TABLE_STUFF ) )
-
-#define CONFIGURE_MEMORY_FOR_SEMAPHORES(_semaphores) \
-  ((_semaphores) * \
-   ( sizeof(Semaphore_Control) + CONFIGURE_OBJECT_TABLE_STUFF ) )
-
-#define CONFIGURE_MEMORY_FOR_MESSAGE_QUEUES(_queues) \
-  ( (_queues) * \
-    ( sizeof(Message_queue_Control) + CONFIGURE_OBJECT_TABLE_STUFF ) )
-
-#define CONFIGURE_MEMORY_FOR_PARTITIONS(_partitions) \
-  ( (_partitions) * \
-    ( sizeof(Partition_Control) + CONFIGURE_OBJECT_TABLE_STUFF ) )
-
-#define CONFIGURE_MEMORY_FOR_REGIONS(_regions) \
-  ( (_regions) * \
-    ( sizeof(Region_Control) + CONFIGURE_OBJECT_TABLE_STUFF ) )
-
-#define CONFIGURE_MEMORY_FOR_PORTS(_ports) \
-  ( (_ports) * \
-    ( sizeof(Dual_ported_memory_Control) + CONFIGURE_OBJECT_TABLE_STUFF ) )
-
-#define CONFIGURE_MEMORY_FOR_PERIODS(_periods) \
-  ( (_periods) * \
-    ( sizeof(Rate_monotonic_Control) + CONFIGURE_OBJECT_TABLE_STUFF ) )
-
-#define CONFIGURE_MEMORY_FOR_USER_EXTENSIONS(_extensions) \
-  ( (_extensions) * \
-    ( sizeof(Extension_Control) + CONFIGURE_OBJECT_TABLE_STUFF ) )
-
-#define CONFIGURE_MEMORY_FOR_DEVICES(_devices) \
-  (((_devices) + 1) * ( sizeof(rtems_driver_name_t) ) )
-
-#ifdef CONFIGURE_MPTEST
-
-#ifndef CONFIGURE_HAS_OWN_MULTIPROCESING_TABLE
-
-#define CONFIGURE_MEMORY_FOR_PROXIES(_proxies) \
-  ( ((_proxies) + 1) * ( sizeof(Thread_Proxy_control) )  )
-
-#define CONFIGURE_MEMORY_FOR_GLOBAL_OBJECTS(_global_objects) \
-  ((_global_objects)  * ( sizeof(Objects_MP_Control) )  )
-
-#define CONFIGURE_MEMORY_FOR_MP \
-  ( CONFIGURE_MEMORY_FOR_PROXIES(CONFIGURE_MP_MAXIMUM_PROXIES) + \
-    CONFIGURE_MEMORY_FOR_GLOBAL_OBJECTS(CONFIGURE_MP_MAXIMUM_GLOBAL_OBJECTS) + \
-    CONFIGURE_MEMORY_FOR_TASKS(1) \
-  )
-
-#endif  /* CONFIGURE_HAS_OWN_MULTIPROCESING_TABLE */
-
-#else
-
-#define CONFIGURE_MEMORY_FOR_MP  0
-
-#endif
-
-#ifndef CONFIGURE_MEMORY_OVERHEAD
-#define CONFIGURE_MEMORY_OVERHEAD 0
-#endif
-
-#ifndef CONFIGURE_EXTRA_TASK_STACKS
-#define CONFIGURE_EXTRA_TASK_STACKS 0
-#endif
-
-#define CONFIGURE_MEMORY_FOR_SYSTEM_OVEREHAD \
-  ( CONFIGURE_MEMORY_FOR_TASKS(1) +    /* IDLE */ \
-    (256 * 12) +                       /* Ready chains */ \
-    256        +                       /* name/ptr table overhead */ \
-    CONFIGURE_INTERRUPT_STACK_MEMORY   /* interrupt stack */ \
-  )
-
-#define CONFIGURE_EXECUTIVE_RAM_SIZE \
-(( CONFIGURE_MEMORY_FOR_POSIX + \
-   CONFIGURE_MEMORY_FOR_TASKS(CONFIGURE_MAXIMUM_TASKS + \
-      CONFIGURE_MAXIMUM_POSIX_THREADS + CONFIGURE_MAXIMUM_ADA_TASKS ) + \
-   CONFIGURE_MEMORY_FOR_TIMERS(CONFIGURE_MAXIMUM_TIMERS) + \
-   CONFIGURE_MEMORY_FOR_SEMAPHORES(CONFIGURE_MAXIMUM_SEMAPHORES + \
-     CONFIGURE_LIBIO_SEMAPHORES) + \
-   CONFIGURE_MEMORY_FOR_MESSAGE_QUEUES(CONFIGURE_MAXIMUM_MESSAGE_QUEUES) + \
-   CONFIGURE_MEMORY_FOR_PARTITIONS(CONFIGURE_MAXIMUM_PARTITIONS) + \
-   CONFIGURE_MEMORY_FOR_REGIONS( \
-      CONFIGURE_MAXIMUM_REGIONS + CONFIGURE_MALLOC_REGION ) + \
-   CONFIGURE_MEMORY_FOR_PORTS(CONFIGURE_MAXIMUM_PORTS) + \
-   CONFIGURE_MEMORY_FOR_PERIODS(CONFIGURE_MAXIMUM_PERIODS) + \
-   CONFIGURE_MEMORY_FOR_USER_EXTENSIONS( \
-      CONFIGURE_MAXIMUM_USER_EXTENSIONS + CONFIGURE_NEWLIB_EXTENSION + \
-      CONFIGURE_STACK_CHECKER_EXTENSION ) + \
-   CONFIGURE_MEMORY_FOR_DEVICES(CONFIGURE_MAXIMUM_DEVICES) + \
-   CONFIGURE_MEMORY_FOR_MP + \
-   CONFIGURE_MEMORY_FOR_SYSTEM_OVEREHAD + \
-   (((CONFIGURE_MEMORY_OVERHEAD)+1) * 1024) + \
-   (CONFIGURE_EXTRA_TASK_STACKS) + (CONFIGURE_ADA_TASKS_STACK) \
-) & 0xfffffc00)
-#endif
-
-#ifdef CONFIGURE_GNAT_RTEMS
-#define CONFIGURE_GNAT_MUTEXES 10
-#define CONFIGURE_GNAT_KEYS    1
-
-/* 20 are required to run all tests in the ACVC */
-#ifndef CONFIGURE_MAXIMUM_ADA_TASKS
-#define CONFIGURE_MAXIMUM_ADA_TASKS  20
-#endif
-
-/* This is the number of non-Ada tasks which invoked Ada code. */
-#ifndef CONFIGURE_MAXIMUM_FAKE_ADA_TASKS
-#define CONFIGURE_MAXIMUM_FAKE_ADA_TASKS 0
-#endif
-
-/* Ada tasks are allocated twice the minimum stack space */
-#define CONFIGURE_ADA_TASKS_STACK \
-  (CONFIGURE_MAXIMUM_ADA_TASKS * (RTEMS_MINIMUM_STACK_SIZE + (6 * 1024)))
-
-#else
-#define CONFIGURE_GNAT_MUTEXES           0
-#define CONFIGURE_GNAT_KEYS              0
-#define CONFIGURE_MAXIMUM_ADA_TASKS      0
-#define CONFIGURE_MAXIMUM_FAKE_ADA_TASKS 0
-#define CONFIGURE_ADA_TASKS_STACK        0
-#endif
-
-
-#ifdef CONFIGURE_INIT
-
-rtems_api_configuration_table Configuration_RTEMS_API = {
-  CONFIGURE_MAXIMUM_TASKS,
-  CONFIGURE_MAXIMUM_TIMERS,
-  CONFIGURE_MAXIMUM_SEMAPHORES + CONFIGURE_LIBIO_SEMAPHORES,
-  CONFIGURE_MAXIMUM_MESSAGE_QUEUES,
-  CONFIGURE_MAXIMUM_PARTITIONS,
-  CONFIGURE_MAXIMUM_REGIONS + CONFIGURE_MALLOC_REGION,
-  CONFIGURE_MAXIMUM_PORTS,
-  CONFIGURE_MAXIMUM_PERIODS,
-  CONFIGURE_INIT_TASK_TABLE_SIZE,
-  CONFIGURE_INIT_TASK_TABLE
-};
-
-#ifdef RTEMS_POSIX_API
-posix_api_configuration_table Configuration_POSIX_API = {
-  CONFIGURE_MAXIMUM_POSIX_THREADS + CONFIGURE_MAXIMUM_ADA_TASKS,
-  CONFIGURE_MAXIMUM_POSIX_MUTEXES + CONFIGURE_GNAT_MUTEXES +
-    CONFIGURE_MAXIMUM_ADA_TASKS + CONFIGURE_MAXIMUM_FAKE_ADA_TASKS,
-  CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES +
-    CONFIGURE_MAXIMUM_ADA_TASKS + CONFIGURE_MAXIMUM_FAKE_ADA_TASKS,
-  CONFIGURE_MAXIMUM_POSIX_KEYS + CONFIGURE_GNAT_KEYS,
-  CONFIGURE_MAXIMUM_POSIX_QUEUED_SIGNALS,
-  CONFIGURE_POSIX_INIT_THREAD_TABLE_SIZE,
-  CONFIGURE_POSIX_INIT_THREAD_TABLE_NAME
-};
-#endif
-
-rtems_configuration_table Configuration = {
-  CONFIGURE_EXECUTIVE_RAM_WORK_AREA,
-  CONFIGURE_EXECUTIVE_RAM_SIZE,
-  CONFIGURE_MAXIMUM_USER_EXTENSIONS + CONFIGURE_NEWLIB_EXTENSION + 
-      CONFIGURE_STACK_CHECKER_EXTENSION,
-  CONFIGURE_MICROSECONDS_PER_TICK,
-  CONFIGURE_TICKS_PER_TIMESLICE,
-  CONFIGURE_MAXIMUM_DEVICES,
-  sizeof (Device_drivers)/
-    sizeof(rtems_driver_address_table),      /* number of device drivers */
-  Device_drivers,                            /* pointer to driver table */
-  CONFIGURE_NUMBER_OF_INITIAL_EXTENSIONS,    /* number of initial extensions */
-  Configuration_Initial_Extensions,          /* pointer to initial extensions */
-  CONFIGURE_MULTIPROCESSING_TABLE,           /* pointer to MP config table */
-  &Configuration_RTEMS_API,                  /* pointer to RTEMS API config */
-#ifdef RTEMS_POSIX_API
-  &Configuration_POSIX_API                   /* pointer to POSIX API config */
-#else
-  NULL                                       /* pointer to POSIX API config */
-#endif
-};
-#endif
-
-#endif /* CONFIGURE_HAS_OWN_CONFIGURATION_TABLE */
-
-#ifdef __cplusplus
-}
-#endif
- 
-#endif
-/* end of include file */
diff --git a/c/src/exec/sapi/include/rtems/Makefile.in b/c/src/exec/sapi/include/rtems/Makefile.in
deleted file mode 100644
index 109bb18c44..0000000000
--- a/c/src/exec/sapi/include/rtems/Makefile.in
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-H_PIECES= config directives extension fatal init io mptables 
-H_FILES=$(H_PIECES:%=$(srcdir)/%.h)
-
-# H_FILES that get installed externally
-EXTERNAL_H_PIECES = confdefs 
-EXTERNAL_H_FILES=$(EXTERNAL_H_PIECES:%=$(srcdir)/%.h)
-
-SRCS=$(H_FILES) $(EXTERNAL_H_FILES)
-
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-#
-# Add your list of files to delete here.  The config files
-#  already know how to delete some stuff, so you may want
-#  to just run 'make clean' first to see what gets missed.
-#  'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
-
-all:	$(SRCS) $(ARCH) $(PROJECT_INCLUDE)/rtems/sptables.h
-	$(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/
-	$(INSTALL) -m 444 ${EXTERNAL_H_FILES} $(PROJECT_INCLUDE)
-
-$(PROJECT_INCLUDE)/rtems/sptables.h: $(ARCH)/sptables.h-tmp
-	$(INSTALL) -m 444 $(ARCH)/sptables.h-tmp $@
-
-$(ARCH)/sptables.h-tmp: $(srcdir)/sptables.h
-	$(SED) -e 's?REPLACE_THIS_WITH_THE_BSP?$(RTEMS_BSP)?' \
-	    < $< >$(ARCH)/sptables.h-tmp
-
diff --git a/c/src/exec/sapi/include/rtems/README b/c/src/exec/sapi/include/rtems/README
deleted file mode 100644
index 5fcc0d14c7..0000000000
--- a/c/src/exec/sapi/include/rtems/README
+++ /dev/null
@@ -1,135 +0,0 @@
-#
-#  $Id$
-#
-
-Configuring a System Using the Template in confdefs.h
-=====================================================
-
-The file confdefs.h is a Configuration Template file which can be
-used to greatly simplify the creation and maintenance of RTEMS
-Configuration Tables.  The basic concepts are:
-
-   + confdefs.h provides defaults for all configuration parameters
-
-   + applications specify only those values they wish to override
-
-   + confdefs.h can be the only file which knows the precise layout
-     of the RTEMS Configuration Tables.
-
-The Configuration Template setup is used by all RTEMS tests to
-simplify the maintenance of the tests.
-
-Here is the section from the system.h file from test tm21 from 
-the Timing Test Suite:
-
-   /* configuration information */
- 
-   #define CONFIGURE_TMTEST
- 
-   #define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-   #define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
- 
-   #define CONFIGURE_MAXIMUM_TASKS              102
-   #define CONFIGURE_MAXIMUM_TIMERS             100
-   #define CONFIGURE_MAXIMUM_SEMAPHORES         100
-   #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES     100
-   #define CONFIGURE_MAXIMUM_PARTITIONS         100
-   #define CONFIGURE_MAXIMUM_REGIONS            100
-   #define CONFIGURE_MAXIMUM_PORTS              100
-   #define CONFIGURE_MAXIMUM_PERIODS            100
- 
-   #define CONFIGURE_TICKS_PER_TIMESLICE        0
- 
-   #include <confdefs.h>
- 
-
-The above example overrides a number of the configuration parameters.
-It informs the template that it is a member of the Timing Suite, 
-requires a console and timer driver, and that it needs 102 tasks,
-100 timers, 100 semaphores, 100 message queues, 100 partitions, 
-100 regions, 100 ports, and 100 periods.   By default, the test
-would have gotten no drivers, 10 tasks, and no other RTEMS objects.
-
-The following shows the configuration tables generated by the 
-template by default.
-
-
-#include <bsp.h>
-
-#define NULL_DRIVER_TABLE_ENTRY \
- { NULL, NULL, NULL, NULL, NULL, NULL }
- 
-rtems_driver_address_table Device_drivers[] = {
-#ifdef CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-  CONSOLE_DRIVER_TABLE_ENTRY,
-#endif
-#ifdef CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-  CLOCK_DRIVER_TABLE_ENTRY,
-#endif
-#ifdef CONFIGURE_TEST_NEEDS_STUB_DRIVER
-  STUB_DRIVER_TABLE_ENTRY,
-#endif
-  NULL_DRIVER_TABLE_ENTRY,
-};
-
-rtems_initialization_tasks_table Initialization_tasks[] = {
-  { rtems_build_name( 'U', 'I', '1', ' ' ), /* init task name */
-    RTEMS_MINIMUM_STACK_SIZE,               /* init task stack size */
-    1,                                      /* init task priority */
-    RTEMS_DEFAULT_ATTRIBUTES,               /* init task attributes */
-    Init,                                   /* init task entry point */
-    RTEMS_NO_PREEMPT,                       /* init task initial mode */
-    0                                       /* init task argument list */
-  }
-};
-
-#ifdef CONFIGURE_MPTEST
-/*
- *  NODE_NUMBER is assumed to be set on the compile line.
- */
-
-rtems_multiprocessing_table Multiprocessing_configuration = {
-  NODE_NUMBER,                           /* local node number */
-  2,                                     /* maximum # nodes in system */
-  32,                                    /* maximum # global objects */
-  32,                                    /* maximum # proxies */
-  &MPCI_table                            /* pointer to MPCI config table */
-};
-#endif
-
-/*
- *  CONFIGURE_EXECUTIVE_RAM_SIZE is a rough guess based on the number of
- *  tasks in the system plus enough extra to get a whole 64K extra.
- *
- *  The NULL address for the workspace area is assumed to be assigned
- *  at startup time by the BSP.
- */
-   
-rtems_configuration_table Configuration = {
-  NULL,                      /* executive RAM work area */
-  CONFIGURE_EXECUTIVE_RAM_SIZE, /* executive RAM size */
-  10,                        /* maximum # tasks */
-  0,                         /* maximum # timers */
-  0,                         /* maximum # semaphores */
-  0,                         /* maximum # message queues */
-  0,                         /* maximum # messages */
-  0,                         /* maximum # partitions */
-  0,                         /* maximum # regions */
-  0,                         /* maximum # dp memory areas */
-  0,                         /* maximum # periods */
-  0,                         /* maximum # user extensions */
-  RTEMS_MILLISECONDS_TO_MICROSECONDS(10), /* # us in a tick */
-  50,                        /* # ticks in a timeslice */
-  sizeof (Initialization_tasks) / sizeof(rtems_initialization_tasks_table),
-                             /* number of init tasks */
-  Initialization_tasks,      /* init task(s) table */
-  sizeof (Device_drivers) / sizeof(rtems_driver_address_table),
-                             /* number of device drivers */
-  Device_drivers,            /* pointer to driver address table */
-  NULL,                      /* pointer to initial extensions */
-#ifdef CONFIGURE_MPTEST
-  &Multiprocessing_configuration
-#else
-  NULL                       /* ptr to MP config table */
-#endif
-};
diff --git a/c/src/exec/sapi/include/rtems/config.h b/c/src/exec/sapi/include/rtems/config.h
deleted file mode 100644
index e3ae50d7d1..0000000000
--- a/c/src/exec/sapi/include/rtems/config.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/*  config.h
- *
- *  This include file contains the table of user defined configuration
- *  parameters.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_CONFIGURATION_h
-#define __RTEMS_CONFIGURATION_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- *  This is kind of kludgy but it allows targets to totally ignore the
- *  POSIX API safely.
- */
-
-#ifdef RTEMS_POSIX_API
-#include <rtems/posix/config.h>
-#else
-
-typedef void *posix_api_configuration_table;
-#endif
-
-#include <rtems/rtems/config.h>
-
-/*  XXX <rtems/rtems/config.h> should cover these
-#include <rtems/rtems/status.h>
-#include <rtems/rtems/types.h>
-#include <rtems/rtems/tasks.h>
-*/
-
-#include <rtems/extension.h>
-#include <rtems/io.h>
-#include <rtems/score/mpci.h>
-
-/*
- *  The following records define the Multiprocessor Configuration
- *  Table.  This table defines the multiprocessor system
- *  characteristics which must be known by RTEMS in a multiprocessor
- *  system.
- */
-
-typedef struct {
-  unsigned32    node;                   /* local node number */
-  unsigned32    maximum_nodes;          /* maximum # nodes in system */
-  unsigned32    maximum_global_objects; /* maximum # global objects */
-  unsigned32    maximum_proxies;        /* maximum # proxies */
-  MPCI_Control *User_mpci_table;        /* pointer to MPCI table */
-} rtems_multiprocessing_table;
-
-/*
- *  The following records define the Configuration Table.  The
- *  information contained in this table is required in all
- *  RTEMS systems, whether single or multiprocessor.  This
- *  table primarily defines the following:
- *
- *     + location and size of the RTEMS Workspace
- *     + microseconds per clock tick
- *     + clock ticks per task timeslice
- *     + required number of each object type for each API configured
- */
-
-typedef struct {
-  void                             *work_space_start;
-  unsigned32                        work_space_size;
-  unsigned32                        maximum_extensions;
-  unsigned32                        microseconds_per_tick;
-  unsigned32                        ticks_per_timeslice;
-  unsigned32                        maximum_devices;
-  unsigned32                        number_of_device_drivers;
-  rtems_driver_address_table       *Device_driver_table;
-  unsigned32                        number_of_initial_extensions;
-  rtems_extensions_table           *User_extension_table;
-  rtems_multiprocessing_table      *User_multiprocessing_table;
-  rtems_api_configuration_table    *RTEMS_api_configuration;
-  posix_api_configuration_table    *POSIX_api_configuration;
-} rtems_configuration_table;
-
-/*
- *  The following are provided strictly for the convenience of
- *  the user.  They are not used in RTEMS itself.
- */
-
-SAPI_EXTERN rtems_configuration_table    *_Configuration_Table;
-SAPI_EXTERN rtems_multiprocessing_table  *_Configuration_MP_table;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/sapi/include/rtems/directives.h b/c/src/exec/sapi/include/rtems/directives.h
deleted file mode 100644
index 785ab0760e..0000000000
--- a/c/src/exec/sapi/include/rtems/directives.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/*  directives.h
- *
- *  The following definitions are the directive numbers used
- *  in the assembly interface.
- *
- *  COPYRIGHT (c) 1989-1997
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_DIRECTIVES_h
-#define __RTEMS_DIRECTIVES_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define RTEMS_INITIALIZE_EXECUTIVE                       0
-#define RTEMS_INITIALIZE_EXECUTIVE_EARLY                 1
-#define RTEMS_INITIALIZE_EXECUTIVE_LATE                  2
-#define RTEMS_SHUTDOWN_EXECUTIVE                         3
-#define RTEMS_TASKS_CREATE                               4
-#define RTEMS_TASKS_NAME_TO_ID                           5
-#define RTEMS_TASKS_START                                6
-#define RTEMS_TASKS_RESTART                              7
-#define RTEMS_TASKS_DELETE                               8
-#define RTEMS_TASKS_SUSPEND                              9
-#define RTEMS_TASKS_RESUME                              10
-#define RTEMS_TASKS_SET_PRIORITY                        11
-#define RTEMS_TASKS_MODE                                12
-#define RTEMS_TASKS_GET_NOTE                            13
-#define RTEMS_TASKS_SET_NOTE                            14
-#define RTEMS_TASKS_WAKE_AFTER                          15
-#define RTEMS_TASKS_WAKE_WHEN                           16
-#define RTEMS_INTERRUPT_CATCH                           17
-#define RTEMS_CLOCK_SET                                 18
-#define RTEMS_CLOCK_GET                                 19
-#define RTEMS_CLOCK_TICK                                20
-#define RTEMS_EXTENSION_CREATE                          21
-#define RTEMS_EXTENSION_NAME_TO_ID                      22
-#define RTEMS_EXTENSION_DELETE                          23
-#define RTEMS_TIMER_CREATE                              24
-#define RTEMS_TIMER_NAME_TO_ID                          25
-#define RTEMS_TIMER_CANCEL                              26
-#define RTEMS_TIMER_DELETE                              27
-#define RTEMS_TIMER_FIRE_AFTER                          28
-#define RTEMS_TIMER_FIRE_WHEN                           29
-#define RTEMS_TIMER_RESET                               30
-#define RTEMS_SEMAPHORE_CREATE                          31
-#define RTEMS_SEMAPHORE_NAME_TO_ID                      32
-#define RTEMS_SEMAPHORE_DELETE                          33
-#define RTEMS_SEMAPHORE_OBTAIN                          34
-#define RTEMS_SEMAPHORE_RELEASE                         35
-#define RTEMS_MESSAGE_QUEUE_CREATE                      36
-#define RTEMS_MESSAGE_QUEUE_NAME_TO_ID                  37
-#define RTEMS_MESSAGE_QUEUE_DELETE                      38
-#define RTEMS_MESSAGE_QUEUE_SEND                        39
-#define RTEMS_MESSAGE_QUEUE_URGENT                      40
-#define RTEMS_MESSAGE_QUEUE_BROADCAST                   41
-#define RTEMS_MESSAGE_QUEUE_RECEIVE                     42
-#define RTEMS_MESSAGE_QUEUE_FLUSH                       43
-#define RTEMS_EVENT_SEND                                44
-#define RTEMS_EVENT_RECEIVE                             45
-#define RTEMS_SIGNAL_CATCH                              46
-#define RTEMS_SIGNAL_SEND                               47
-#define RTEMS_PARTITION_CREATE                          48
-#define RTEMS_PARTITION_NAME_TO_ID                      49
-#define RTEMS_PARTITION_DELETE                          50
-#define RTEMS_PARTITION_GET_BUFFER                      51
-#define RTEMS_PARTITION_RETURN_BUFFER                   52
-#define RTEMS_REGION_CREATE                             53
-#define RTEMS_REGION_EXTEND                             54
-#define RTEMS_REGION_NAME_TO_ID                         55
-#define RTEMS_REGION_DELETE                             56
-#define RTEMS_REGION_GET_SEGMENT_SIZE                   57
-#define RTEMS_REGION_GET_SEGMENT                        58
-#define RTEMS_REGION_RETURN_SEGMENT                     59
-#define RTEMS_DUAL_PORTED_MEMORY_CREATE                 60
-#define RTEMS_DUAL_PORTED_MEMORY_NAME_TO_ID             61
-#define RTEMS_DUAL_PORTED_MEMORY_DELETE                 62
-#define RTEMS_DUAL_PORTED_MEMORY_EXTERNAL_TO_INTERNAL   63
-#define RTEMS_DUAL_PORTED_MEMORY_INTERNAL_TO_EXTERNAL   64
-#define RTEMS_IO_INITIALIZE                             65
-#define RTEMS_IO_REGISTER_NAME                          66
-#define RTEMS_IO_LOOKUP_NAME                            67
-#define RTEMS_IO_OPEN                                   68
-#define RTEMS_IO_CLOSE                                  69
-#define RTEMS_IO_READ                                   70
-#define RTEMS_IO_WRITE                                  71
-#define RTEMS_IO_CONTROL                                72
-#define RTEMS_FATAL_ERROR_OCCURRED                      73
-#define RTEMS_RATE_MONOTONIC_CREATE                     74
-#define RTEMS_RATE_MONOTONIC_NAME_TO_ID                 75
-#define RTEMS_RATE_MONOTONIC_DELETE                     76
-#define RTEMS_RATE_MONOTONIC_CANCEL                     77
-#define RTEMS_RATE_MONOTONIC_PERIOD                     78
-#define RTEMS_MULTIPROCESSING_ANNOUNCE                  79
-#define RTEMS_DEBUG_ENABLE                              80
-#define RTEMS_DEBUG_DISABLE                             81
-
-#define RTEMS_NUMBER_OF_ENTRY_POINTS                    82
-
-/*
- *  The jump table of entry points into RTEMS directives.
- */
-
-extern const void *_Entry_points[ RTEMS_NUMBER_OF_ENTRY_POINTS ];
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of directives.h */
diff --git a/c/src/exec/sapi/include/rtems/extension.h b/c/src/exec/sapi/include/rtems/extension.h
deleted file mode 100644
index 9b6b21c70e..0000000000
--- a/c/src/exec/sapi/include/rtems/extension.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/*  extension.h
- *
- *  This include file contains all the constants, structures, and
- *  prototypes associated with the User Extension Manager.  This manager
- *  provides a mechanism for manipulating sets of user-defined extensions.
- *
- *  Directives provided are:
- *
- *     + create user extension set
- *     + get ID of user extension set
- *     + delete user extension set
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_EXTENSION_MANAGER_h
-#define __RTEMS_EXTENSION_MANAGER_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/object.h>
-#include <rtems/score/userext.h>
-#include <rtems/rtems/status.h>  /* XXX */
-#include <rtems/rtems/types.h>  /* XXX */
-
-/*
- *  Extension related types
- */
-
-typedef User_extensions_routine                   rtems_extension;
-typedef User_extensions_thread_create_extension   rtems_task_create_extension;
-typedef User_extensions_thread_delete_extension   rtems_task_delete_extension;
-typedef User_extensions_thread_start_extension    rtems_task_start_extension;
-typedef User_extensions_thread_restart_extension  rtems_task_restart_extension;
-typedef User_extensions_thread_switch_extension   rtems_task_switch_extension;
-typedef User_extensions_thread_post_switch_extension
-                                              rtems_task_post_switch_extension;
-typedef User_extensions_thread_begin_extension    rtems_task_begin_extension;
-typedef User_extensions_thread_exitted_extension  rtems_task_exitted_extension;
-typedef User_extensions_fatal_extension           rtems_fatal_extension;
-
-typedef User_extensions_Table                     rtems_extensions_table;
-
-/*
- *  The following defines the information control block used to manage
- *  this class of objects.
- */
-
-SAPI_EXTERN Objects_Information  _Extension_Information;
-
-/*
- *  The following records define the control block used to manage
- *  each extension.
- */
-
-typedef struct {
-  Objects_Control          Object;
-  User_extensions_Control  Extension;
-}   Extension_Control;
-
-/*
- *  _Extension_Manager_initialization
- *
- *  DESCRIPTION:
- *
- *  This routine performs the initialization necessary for this manager.
- */
-
-void _Extension_Manager_initialization(
-  unsigned32 maximum_extensions
-);
-
-/*
- *  rtems_extension_create
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_extension_create directive.  The
- *  extension will have the name name.   The entry points of the
- *  routines which constitute this extension set are in EXTENSION_TABLE.
- *  It returns the id of the created extension in ID.
- */
-
-rtems_status_code rtems_extension_create(
-  rtems_name              name,
-  rtems_extensions_table *extension_table,
-  Objects_Id              *id
-);
-
-/*
- *  rtems_extension_ident
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_extension_ident directive.
- *  This directive returns the extension ID associated with name.
- *  If more than one extension is named name, then the extension
- *  to which the ID belongs is arbitrary.
- */
-
-rtems_status_code rtems_extension_ident(
-  rtems_name    name,
-  Objects_Id   *id
-);
-
-/*
- *  rtems_extension_delete
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_extension_delete directive.  The
- *  extension indicated by ID is deleted.
- */
-
-rtems_status_code rtems_extension_delete(
-  Objects_Id id
-);
-
-#ifndef __RTEMS_APPLICATION__
-#include <rtems/extension.inl>
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/sapi/include/rtems/fatal.h b/c/src/exec/sapi/include/rtems/fatal.h
deleted file mode 100644
index 7f0a7b443a..0000000000
--- a/c/src/exec/sapi/include/rtems/fatal.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*  fatal.h
- *
- *  This include file contains constants and prototypes related
- *  to the Fatal Error Manager.  This manager processes all fatal or
- *  irrecoverable errors.
- *
- *  This manager provides directives to:
- *
- *     + announce a fatal error has occurred
- *
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_FATAL_h
-#define __RTEMS_FATAL_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- *  rtems_fatal_error_occurred
- *
- *  DESCRIPTION:
- *
- *  This is the routine which implements the rtems_fatal_error_occurred
- *  directive.  It is invoked when the application or RTEMS
- *  determines that a fatal error has occurred.
- */
-
-void volatile rtems_fatal_error_occurred(
-  unsigned32 the_error
-);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/sapi/include/rtems/init.h b/c/src/exec/sapi/include/rtems/init.h
deleted file mode 100644
index a4f24d8010..0000000000
--- a/c/src/exec/sapi/include/rtems/init.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/*  init.h
- *
- *  This include file contains all the constants and structures associated
- *  with the Initialization Manager.  This manager is responsible for
- *  initializing RTEMS, creating and starting all configured initialization
- *  tasks, invoking the initialization routine for each user-supplied device
- *  driver, and initializing the optional multiprocessor layer.
- *
- *  This manager provides directives to:
- *
- *     + initialize the RTEMS executive
- *     + shutdown the RTEMS executive
- *
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_INIT_h
-#define __RTEMS_INIT_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/rtems/types.h>
-#include <rtems/config.h>
-#include <rtems/rtems/intr.h>
-
-/*
- *  The following defines the default Multiprocessing Configuration
- *  Table.  This table is used in a single processor system.
- */
-
-extern const rtems_multiprocessing_table
-  _Initialization_Default_multiprocessing_table;
-
-/*
- *  rtems_initialize_executive
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_initialize_executive directive.  This
- *  directive is invoked at system startup to initialize the RTEMS
- *  multitasking environment.
- */
-
-void rtems_initialize_executive(
-  rtems_configuration_table *configuration_table,
-  rtems_cpu_table           *cpu_table
-);
-
-/*
- *  rtems_initialize_executive_early
- *
- *  DESCRIPTION:
- *
- *  This routine implements the early portion of rtems_initialize_executive
- *  directive up to the pretasking hook. This directive is invoked at system
- *  startup to initialize the RTEMS multitasking environment.
- */
-
-rtems_interrupt_level rtems_initialize_executive_early(
-  rtems_configuration_table *configuration_table,
-  rtems_cpu_table           *cpu_table
-);
-
-/*
- *  rtems_initialize_executive_late
- *
- *  DESCRIPTION:
- *
- *  This routine implements the early portion of rtems_initialize_executive
- *  directive up to the pretasking hook. This directive is invoked at system
- *  startup to initialize the RTEMS multitasking environment.
- */
-
-void rtems_initialize_executive_late(
-  rtems_interrupt_level bsp_level
-);
-
-/*
- *  rtems_shutdown_executive
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_shutdown_executive directive.  The
- *  invocation of this directive results in the RTEMS environment being
- *  shutdown and multitasking halted.  From the application's perspective,
- *  invocation of this directive results in the rtems_initialize_executive
- *  directive exitting to the startup code which invoked it.
- */
-
-void rtems_shutdown_executive(
-  unsigned32 result
-);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/sapi/include/rtems/io.h b/c/src/exec/sapi/include/rtems/io.h
deleted file mode 100644
index 11b4f812cd..0000000000
--- a/c/src/exec/sapi/include/rtems/io.h
+++ /dev/null
@@ -1,244 +0,0 @@
-/*  io.h
- *
- *  This include file contains all the constants and structures associated
- *  with the Input/Output Manager.  This manager provides a well defined
- *  mechanism for accessing device drivers and a structured methodology for
- *  organizing device drivers.
- *
- *  Directives provided are:
- *
- *     + initialize a device driver
- *     + open a device driver
- *     + close a device driver
- *     + read from a device driver
- *     + write to a device driver
- *     + special device services
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_IO_h
-#define __RTEMS_IO_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/rtems/status.h>
-
-/*
- *
- *  The following defines the types for:
- *
- *    + major and minor numbers
- *    + the return type of a device driver entry
- *    + a pointer to a device driver entry
- *    + an entry in the the Device Driver Address Table.  Each entry in this
- *      table corresponds to an application provided device driver and
- *      defines the entry points for that device driver.
- */
- 
-typedef unsigned32 rtems_device_major_number;
-typedef unsigned32 rtems_device_minor_number;
- 
-typedef rtems_status_code rtems_device_driver;
- 
-typedef rtems_device_driver ( *rtems_device_driver_entry )(
-                 rtems_device_major_number,
-                 rtems_device_minor_number,
-                 void *
-             );
-
-typedef struct {
-  rtems_device_driver_entry initialization; /* initialization procedure */
-  rtems_device_driver_entry open;           /* open request procedure */
-  rtems_device_driver_entry close;          /* close request procedure */
-  rtems_device_driver_entry read;           /* read request procedure */
-  rtems_device_driver_entry write;          /* write request procedure */
-  rtems_device_driver_entry control;        /* special functions procedure */
-}   rtems_driver_address_table;
- 
-/*
- * Table for the io device names
- */
-
-typedef struct {
-    char                     *device_name;
-    unsigned32                device_name_length;
-    rtems_device_major_number major;
-    rtems_device_minor_number minor;
-} rtems_driver_name_t;
-
-/*
- *  This is the table of device names.
- */
-
-/*
- *  The following declare the data required to manage the Driver
- *  Address Table and Device Name Table.
- */
-
-SAPI_EXTERN unsigned32                  _IO_Number_of_drivers;
-SAPI_EXTERN rtems_driver_address_table *_IO_Driver_address_table;
-SAPI_EXTERN unsigned32                  _IO_Number_of_devices;
-SAPI_EXTERN rtems_driver_name_t        *_IO_Driver_name_table;
-
-/*
- *  _IO_Manager_initialization
- *
- *  DESCRIPTION:
- *
- *  This routine performs the initialization necessary for this manager.
- */
-
-void _IO_Manager_initialization(
-  rtems_driver_address_table *driver_table,
-  unsigned32                  number_of_drivers,
-  unsigned32                  number_of_devices
-);
-
-/*
- *  rtems_io_register_name
- *
- *  DESCRIPTION:
- *
- *  Associate a name with a driver.
- *
- */
-
-rtems_status_code rtems_io_register_name(
-    char                      *device_name,
-    rtems_device_major_number  major,
-    rtems_device_minor_number  minor
-);
-
-
-/*
- *  rtems_io_lookup_name
- *
- *  DESCRIPTION:
- *
- *  Find what driver "owns" this name
- */
-
-rtems_status_code rtems_io_lookup_name(
-    const char           *name,
-    rtems_driver_name_t **device_info
-);
-
-
-/*
- *  rtems_io_initialize
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_io_initialize directive.  It is invoked
- *  to initialize a device driver or an individual device.
- */
-
-rtems_status_code rtems_io_initialize(
-  rtems_device_major_number  major,
-  rtems_device_minor_number  minor,
-  void                      *argument
-);
-
-/*
- *  rtems_io_open
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_io_open directive.  It is invoked
- *  to open a device.
- */
-
-rtems_status_code rtems_io_open(
-  rtems_device_major_number  major,
-  rtems_device_minor_number  minor,
-  void                      *argument
-);
-
-/*
- *  rtems_io_close
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_io_close directive.  It is invoked
- *  to close a device.
- */
-
-rtems_status_code rtems_io_close(
-  rtems_device_major_number  major,
-  rtems_device_minor_number  minor,
-  void                      *argument
-);
-
-/*
- *  rtems_io_read
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_io_read directive.  It is invoked
- *  to read from a device.
- */
-
-rtems_status_code rtems_io_read(
-  rtems_device_major_number  major,
-  rtems_device_minor_number  minor,
-  void                      *argument
-);
-
-/*
- *  rtems_io_write
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_io_write directive.  It is invoked
- *  to write to a device.
- */
-
-rtems_status_code rtems_io_write(
-  rtems_device_major_number  major,
-  rtems_device_minor_number  minor,
-  void                      *argument
-);
-
-/*
- *  rtems_io_control
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_io_control directive.  It is invoked
- *  to perform a device specific operation on a device.
- */
-
-rtems_status_code rtems_io_control(
-  rtems_device_major_number  major,
-  rtems_device_minor_number  minor,
-  void                      *argument
-);
-
-/*
- *  _IO_Initialize_all_drivers
- *
- *  DESCRIPTION:
- *
- *  This routine initializes all of the device drivers configured
- *  in the Device Driver Address Table.
- */
-
-void _IO_Initialize_all_drivers( void );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/sapi/include/rtems/mptables.h b/c/src/exec/sapi/include/rtems/mptables.h
deleted file mode 100644
index 8fdbdfebd2..0000000000
--- a/c/src/exec/sapi/include/rtems/mptables.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*  mptables.h
- *
- *  This include file contains the executive's pre-initialized tables
- *  used in a multiprocessor configuration.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_MPTABLES_h
-#define __RTEMS_MPTABLES_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/sapi/include/rtems/sptables.h b/c/src/exec/sapi/include/rtems/sptables.h
deleted file mode 100644
index ed5b4f896e..0000000000
--- a/c/src/exec/sapi/include/rtems/sptables.h
+++ /dev/null
@@ -1,165 +0,0 @@
-/*  sptables.h
- *
- *  This include file contains the executive's pre-initialized tables
- *  used when in a single processor configuration.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_SPTABLES_h
-#define __RTEMS_SPTABLES_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/config.h>
-
-#include <rtems/debug.h>
-#include <rtems/fatal.h>
-#include <rtems/init.h>
-#include <rtems/io.h>
-#include <rtems/score/sysstate.h>
-
-#include <rtems/rtems/intr.h>
-#include <rtems/rtems/clock.h>
-#include <rtems/rtems/tasks.h>
-#include <rtems/rtems/dpmem.h>
-#include <rtems/rtems/event.h>
-#include <rtems/rtems/message.h>
-#include <rtems/rtems/mp.h>
-#include <rtems/rtems/part.h>
-#include <rtems/rtems/ratemon.h>
-#include <rtems/rtems/region.h>
-#include <rtems/rtems/sem.h>
-#include <rtems/rtems/signal.h>
-#include <rtems/rtems/timer.h>
-
-/*
- *  This is the default Multiprocessing Configuration Table.
- *  It is used in single processor configurations.
- */
-
-const rtems_multiprocessing_table
-       _Initialization_Default_multiprocessing_table = {
-  1,                      /* local node number */
-  1,                      /* maximum number nodes in system */
-  0,                      /* maximum number global objects */
-  0,                      /* maximum number proxies */
-  NULL,                   /* pointer to MPCI address table */
-};
-
-/*
- *  This is the version string.
- */
-
-#define RTEMS_VERSION "rtems-4.0.0"
-
-const char _RTEMS_version[] =
-  "RTEMS RELEASE " RTEMS_VERSION
-     "(" CPU_NAME "/" CPU_MODEL_NAME "/REPLACE_THIS_WITH_THE_BSP)";
-
-
-/*
- *  This table is used by the single entry point code.
- */
-
-const void * _Entry_points[ RTEMS_NUMBER_OF_ENTRY_POINTS ] = {
-  (void *) rtems_initialize_executive,                      /*  0 */
-  (void *) rtems_initialize_executive_early,                /*  1 */
-  (void *) rtems_initialize_executive_late,                 /*  2 */
-  (void *) rtems_shutdown_executive,                        /*  3 */
-  (void *) rtems_task_create,                               /*  4 */
-  (void *) rtems_task_ident,                                /*  5 */
-  (void *) rtems_task_start,                                /*  6 */
-  (void *) rtems_task_restart,                              /*  7 */
-  (void *) rtems_task_delete,                               /*  8 */
-  (void *) rtems_task_suspend,                              /*  9 */
-  (void *) rtems_task_resume,                               /* 10 */
-  (void *) rtems_task_set_priority,                         /* 11 */
-  (void *) rtems_task_mode,                                 /* 12 */
-  (void *) rtems_task_get_note,                             /* 13 */
-  (void *) rtems_task_set_note,                             /* 14 */
-  (void *) rtems_task_wake_after,                           /* 15 */
-  (void *) rtems_task_wake_when,                            /* 16 */
-  (void *) rtems_interrupt_catch,                           /* 17 */
-  (void *) rtems_clock_set,                                 /* 18 */
-  (void *) rtems_clock_get,                                 /* 19 */
-  (void *) rtems_clock_tick,                                /* 20 */
-  (void *) rtems_extension_create,                          /* 21 */
-  (void *) rtems_extension_ident,                           /* 22 */
-  (void *) rtems_extension_delete,                          /* 23 */
-  (void *) rtems_timer_create,                              /* 24 */
-  (void *) rtems_timer_ident,                               /* 25 */
-  (void *) rtems_timer_cancel,                              /* 26 */
-  (void *) rtems_timer_delete,                              /* 27 */
-  (void *) rtems_timer_fire_after,                          /* 28 */
-  (void *) rtems_timer_fire_when,                           /* 29 */
-  (void *) rtems_timer_reset,                               /* 30 */
-  (void *) rtems_semaphore_create,                          /* 31 */
-  (void *) rtems_semaphore_ident,                           /* 32 */
-  (void *) rtems_semaphore_delete,                          /* 33 */
-  (void *) rtems_semaphore_obtain,                          /* 34 */
-  (void *) rtems_semaphore_release,                         /* 35 */
-  (void *) rtems_message_queue_create,                      /* 36 */
-  (void *) rtems_message_queue_ident,                       /* 37 */
-  (void *) rtems_message_queue_delete,                      /* 38 */
-  (void *) rtems_message_queue_send,                        /* 39 */
-  (void *) rtems_message_queue_urgent,                      /* 40 */
-  (void *) rtems_message_queue_broadcast,                   /* 41 */
-  (void *) rtems_message_queue_receive,                     /* 42 */
-  (void *) rtems_message_queue_flush,                       /* 43 */
-  (void *) rtems_event_send,                                /* 44 */
-  (void *) rtems_event_receive,                             /* 45 */
-  (void *) rtems_signal_catch,                              /* 46 */
-  (void *) rtems_signal_send,                               /* 47 */
-  (void *) rtems_partition_create,                          /* 48 */
-  (void *) rtems_partition_ident,                           /* 49 */
-  (void *) rtems_partition_delete,                          /* 50 */
-  (void *) rtems_partition_get_buffer,                      /* 51 */
-  (void *) rtems_partition_return_buffer,                   /* 52 */
-  (void *) rtems_region_create,                             /* 53 */
-  (void *) rtems_region_extend,                             /* 54 */
-  (void *) rtems_region_ident,                              /* 55 */
-  (void *) rtems_region_delete,                             /* 56 */
-  (void *) rtems_region_get_segment,                        /* 57 */
-  (void *) rtems_region_get_segment_size,                   /* 58 */
-  (void *) rtems_region_return_segment,                     /* 59 */
-  (void *) rtems_port_create,                               /* 60 */
-  (void *) rtems_port_ident,                                /* 61 */
-  (void *) rtems_port_delete,                               /* 62 */
-  (void *) rtems_port_external_to_internal,                 /* 63 */
-  (void *) rtems_port_internal_to_external,                 /* 64 */
-  (void *) rtems_io_initialize,                             /* 65 */
-  (void *) rtems_io_register_name,                          /* 66 */
-  (void *) rtems_io_lookup_name,                            /* 67 */
-  (void *) rtems_io_open,                                   /* 68 */
-  (void *) rtems_io_close,                                  /* 69 */
-  (void *) rtems_io_read,                                   /* 70 */
-  (void *) rtems_io_write,                                  /* 71 */
-  (void *) rtems_io_control,                                /* 72 */
-  (void *) rtems_fatal_error_occurred,                      /* 73 */
-  (void *) rtems_rate_monotonic_create,                     /* 74 */
-  (void *) rtems_rate_monotonic_ident,                      /* 75 */
-  (void *) rtems_rate_monotonic_delete,                     /* 76 */
-  (void *) rtems_rate_monotonic_cancel,                     /* 77 */
-  (void *) rtems_rate_monotonic_period,                     /* 78 */
-  (void *) rtems_multiprocessing_announce,                  /* 79 */
-  (void *) rtems_debug_enable,                              /* 80 */
-  (void *) rtems_debug_disable                              /* 81 */
-};
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/sapi/inline/rtems/Makefile.in b/c/src/exec/sapi/inline/rtems/Makefile.in
deleted file mode 100644
index 634df7f643..0000000000
--- a/c/src/exec/sapi/inline/rtems/Makefile.in
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-I_PIECES= extension
-I_FILES=$(I_PIECES:%=$(srcdir)/%.inl)
-
-SRCS=$(I_FILES)
-
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/lib.cfg
-
-#
-# Add your list of files to delete here.  The config files
-#  already know how to delete some stuff, so you may want
-#  to just run 'make clean' first to see what gets missed.
-#  'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS += $(LIB)
-CLOBBER_ADDITIONS +=
-
-all:	$(SRCS)
-	$(INSTALL) -m 444 ${I_FILES} $(PROJECT_INCLUDE)/rtems
diff --git a/c/src/exec/sapi/inline/rtems/extension.inl b/c/src/exec/sapi/inline/rtems/extension.inl
deleted file mode 100644
index 49cd834832..0000000000
--- a/c/src/exec/sapi/inline/rtems/extension.inl
+++ /dev/null
@@ -1,91 +0,0 @@
-/*  extension.inl
- *
- *  This file contains the static inline implementation of the inlined routines
- *  from the Extension Manager.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __EXTENSION_MANAGER_inl
-#define __EXTENSION_MANAGER_inl
-
-/*PAGE
- *
- *  _Extension_Allocate
- *
- *  DESCRIPTION:
- *
- *  This function allocates a extension control block from
- *  the inactive chain of free extension control blocks.
- */
-
-RTEMS_INLINE_ROUTINE Extension_Control *_Extension_Allocate( void )
-{
-  return (Extension_Control *) _Objects_Allocate( &_Extension_Information );
-}
-
-/*PAGE
- *
- *  _Extension_Free
- *
- *  DESCRIPTION:
- *
- *  This routine frees a extension control block to the
- *  inactive chain of free extension control blocks.
- */
-
-RTEMS_INLINE_ROUTINE void _Extension_Free (
-  Extension_Control *the_extension
-)
-{
-  _Objects_Free( &_Extension_Information, &the_extension->Object );
-}
-
-/*PAGE
- *
- *  _Extension_Get
- *
- *  DESCRIPTION:
- *
- *  This function maps extension IDs to extension control blocks.
- *  If ID corresponds to a local extension, then it returns
- *  the extension control pointer which maps to ID and location
- *  is set to OBJECTS_LOCAL.  Otherwise, location is set
- *  to OBJECTS_ERROR and the returned value is undefined.
- */
-
-RTEMS_INLINE_ROUTINE Extension_Control *_Extension_Get (
-  Objects_Id         id,
-  Objects_Locations *location
-)
-{
-  return (Extension_Control *)
-    _Objects_Get( &_Extension_Information, id, location );
-}
-
-/*PAGE
- *
- *  _Extension_Is_null
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the_extension is NULL and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Extension_Is_null (
-  Extension_Control *the_extension
-)
-{
-  return ( the_extension == NULL );
-}
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/sapi/macros/rtems/Makefile.in b/c/src/exec/sapi/macros/rtems/Makefile.in
deleted file mode 100644
index 634df7f643..0000000000
--- a/c/src/exec/sapi/macros/rtems/Makefile.in
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-I_PIECES= extension
-I_FILES=$(I_PIECES:%=$(srcdir)/%.inl)
-
-SRCS=$(I_FILES)
-
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/lib.cfg
-
-#
-# Add your list of files to delete here.  The config files
-#  already know how to delete some stuff, so you may want
-#  to just run 'make clean' first to see what gets missed.
-#  'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS += $(LIB)
-CLOBBER_ADDITIONS +=
-
-all:	$(SRCS)
-	$(INSTALL) -m 444 ${I_FILES} $(PROJECT_INCLUDE)/rtems
diff --git a/c/src/exec/sapi/macros/rtems/extension.inl b/c/src/exec/sapi/macros/rtems/extension.inl
deleted file mode 100644
index 225f6b188d..0000000000
--- a/c/src/exec/sapi/macros/rtems/extension.inl
+++ /dev/null
@@ -1,58 +0,0 @@
-/*  extension.inl
- *
- *  This file contains the macro implementation of the inlined routines
- *  from the Extension Manager.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __EXTENSION_inl
-#define __EXTENSION_inl
-
-/*PAGE
- *
- *  _Extension_Allocate
- *
- */
-
-#define _Extension_Allocate() \
-  (Extension_Control *) _Objects_Allocate( &_Extension_Information )
-
-/*PAGE
- *
- *  _Extension_Free
- *
- */
-
-#define _Extension_Free( _the_extension ) \
-  _Objects_Free( &_Extension_Information, &(_the_extension)->Object )
-
-/*PAGE
- *
- *  _Extension_Get
- *
- */
-
-#define _Extension_Get( _id, _location ) \
-  (Extension_Control *) \
-    _Objects_Get( &_Extension_Information, (_id), (_location) )
-
-/*PAGE
- *
- *  _Extension_Is_null
- *
- */
-
-#define _Extension_Is_null( _the_extension ) \
-  ( (_the_extension) == NULL )
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/score/cpu/mips/asm.h b/c/src/exec/score/cpu/mips/asm.h
deleted file mode 100644
index fccd89069f..0000000000
--- a/c/src/exec/score/cpu/mips/asm.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/*  asm.h
- *
- *  This include file attempts to address the problems
- *  caused by incompatible flavors of assemblers and
- *  toolsets.  It primarily addresses variations in the
- *  use of leading underscores on symbols and the requirement
- *  that register names be preceded by a %.
- *
- *
- *  NOTE: The spacing in the use of these macros
- *        is critical to them working as advertised.
- *
- *  COPYRIGHT:
- *
- *  This file is based on similar code found in newlib available
- *  from ftp.cygnus.com.  The file which was used had no copyright
- *  notice.  This file is freely distributable as long as the source
- *  of the file is noted.  This file is:
- *
- *  COPYRIGHT (c) 1994-1997.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  $Id$
- */
-/* @(#)asm.h       03/15/96     1.1 */
-
-#ifndef __NO_CPU_ASM_h
-#define __NO_CPU_ASM_h
-
-/*
- *  Indicate we are in an assembly file and get the basic CPU definitions.
- */
-
-#ifndef ASM
-#define ASM
-#endif
-#include <rtems/score/targopts.h>
-#include <rtems/score/no_cpu.h>
-
-/*
- *  Recent versions of GNU cpp define variables which indicate the
- *  need for underscores and percents.  If not using GNU cpp or
- *  the version does not support this, then you will obviously
- *  have to define these as appropriate.
- */
-
-#ifndef __USER_LABEL_PREFIX__
-#define __USER_LABEL_PREFIX__ _
-#endif
-
-#ifndef __REGISTER_PREFIX__
-#define __REGISTER_PREFIX__
-#endif
-
-/* ANSI concatenation macros.  */
-
-#define CONCAT1(a, b) CONCAT2(a, b)
-#define CONCAT2(a, b) a ## b
-
-/* Use the right prefix for global labels.  */
-
-#define SYM(x) CONCAT1 (__USER_LABEL_PREFIX__, x)
-
-/* Use the right prefix for registers.  */
-
-#define REG(x) CONCAT1 (__REGISTER_PREFIX__, x)
-
-/*
- *  define macros for all of the registers on this CPU
- *
- *  EXAMPLE:     #define d0 REG (d0)
- */
-
-/*
- *  Define macros to handle section beginning and ends.
- */
-
-
-#define BEGIN_CODE_DCL .text
-#define END_CODE_DCL
-#define BEGIN_DATA_DCL .data
-#define END_DATA_DCL
-#define BEGIN_CODE .text
-#define END_CODE
-#define BEGIN_DATA
-#define END_DATA
-#define BEGIN_BSS
-#define END_BSS
-#define END
-
-/*
- *  Following must be tailor for a particular flavor of the C compiler.
- *  They may need to put underscores in front of the symbols.
- */
-
-#define PUBLIC(sym) .globl SYM (sym)
-#define EXTERN(sym) .globl SYM (sym)
-
-#endif
-/* end of include file */
-
-
diff --git a/c/src/exec/score/cpu/mips/cpu.c b/c/src/exec/score/cpu/mips/cpu.c
deleted file mode 100644
index 4617be460d..0000000000
--- a/c/src/exec/score/cpu/mips/cpu.c
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- *  Mips CPU Dependent Source
- *
- *  Author:     Craig Lebakken <craigl@transition.com>
- *
- *  COPYRIGHT (c) 1996 by Transition Networks Inc.
- *
- *  To anyone who acknowledges that this file is provided "AS IS"
- *  without any express or implied warranty:
- *      permission to use, copy, modify, and distribute this file
- *      for any purpose is hereby granted without fee, provided that
- *      the above copyright notice and this notice appears in all
- *      copies, and that the name of Transition Networks not be used in
- *      advertising or publicity pertaining to distribution of the
- *      software without specific, written prior permission.
- *      Transition Networks makes no representations about the suitability
- *      of this software for any purpose.
- *
- *  Derived from c/src/exec/score/cpu/no_cpu/cpu.c:
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-/*
- *  Rather than deleting this, it is commented out to (hopefully) help
- *  the submitter send updates.
- *
- * static char _sccsid[] = "@(#)cpu.c 08/20/96     1.5\n";
- */
-
-#include <rtems/system.h>
-#include <rtems/score/isr.h>
-#include <rtems/score/wkspace.h>
-
-
-ISR_Handler_entry _ISR_Vector_table[ ISR_NUMBER_OF_VECTORS ];
-
-/*  _CPU_Initialize
- *
- *  This routine performs processor dependent initialization.
- *
- *  INPUT PARAMETERS:
- *    cpu_table       - CPU table to initialize
- *    thread_dispatch - address of disptaching routine
- */
-
-
-void null_handler( void )
-{
-}
-
-
-void _CPU_Initialize(
-  rtems_cpu_table  *cpu_table,
-  void      (*thread_dispatch)      /* ignored on this CPU */
-)
-{
-   unsigned int i = ISR_NUMBER_OF_VECTORS;
-
-   while ( i-- )
-   {
-      _ISR_Vector_table[i] = (ISR_Handler_entry)null_handler;
-   }
-
-  /*
-   *  The thread_dispatch argument is the address of the entry point
-   *  for the routine called at the end of an ISR once it has been
-   *  decided a context switch is necessary.  On some compilation
-   *  systems it is difficult to call a high-level language routine
-   *  from assembly.  This allows us to trick these systems.
-   *
-   *  If you encounter this problem save the entry point in a CPU
-   *  dependent variable.
-   */
-
-  _CPU_Thread_dispatch_pointer = thread_dispatch;
-
-  /*
-   *  If there is not an easy way to initialize the FP context
-   *  during Context_Initialize, then it is usually easier to
-   *  save an "uninitialized" FP context here and copy it to
-   *  the task's during Context_Initialize.
-   */
-
-  /* FP context initialization support goes here */
-
-  _CPU_Table = *cpu_table;
-
-}
-
-/*PAGE
- *
- *  _CPU_ISR_Get_level
- */
- 
-#if 0 /* located in cpu_asm.S */
-unsigned32 _CPU_ISR_Get_level( void )
-{
-  /*
-   *  This routine returns the current interrupt level.
-   */
-}
-#endif
-
-/*PAGE
- *
- *  _CPU_ISR_install_raw_handler
- */
- 
-void _CPU_ISR_install_raw_handler(
-  unsigned32  vector,
-  proc_ptr    new_handler,
-  proc_ptr   *old_handler
-)
-{
-  /*
-   *  This is where we install the interrupt handler into the "raw" interrupt
-   *  table used by the CPU to dispatch interrupt handlers.
-   */
-
-#if 0 /* not necessary */
-/* use IDT/Sim to set interrupt vector.  Needed to co-exist with debugger. */
-   add_ext_int_func( vector, new_handler );
-#endif
-}
-
-/*PAGE
- *
- *  _CPU_ISR_install_vector
- *
- *  This kernel routine installs the RTEMS handler for the
- *  specified vector.
- *
- *  Input parameters:
- *    vector      - interrupt vector number
- *    old_handler - former ISR for this vector number
- *    new_handler - replacement ISR for this vector number
- *
- *  Output parameters:  NONE
- *
- */
-
-void _CPU_ISR_install_vector(
-  unsigned32  vector,
-  proc_ptr    new_handler,
-  proc_ptr   *old_handler
-)
-{
-   *old_handler = _ISR_Vector_table[ vector ];
-
-   /*
-    *  If the interrupt vector table is a table of pointer to isr entry
-    *  points, then we need to install the appropriate RTEMS interrupt
-    *  handler for this vector number.
-    */
-
-   _CPU_ISR_install_raw_handler( vector, _ISR_Handler, old_handler );
-
-   /*
-    *  We put the actual user ISR address in '_ISR_vector_table'.  This will
-    *  be used by the _ISR_Handler so the user gets control.
-    */
-
-    _ISR_Vector_table[ vector ] = new_handler;
-}
-
-/*PAGE
- *
- *  _CPU_Install_interrupt_stack
- */
-
-void _CPU_Install_interrupt_stack( void )
-{
-/* we don't support this yet */
-}
-
-/*PAGE
- *
- *  _CPU_Internal_threads_Idle_thread_body
- *
- *  NOTES:
- *
- *  1. This is the same as the regular CPU independent algorithm.
- *
- *  2. If you implement this using a "halt", "idle", or "shutdown"
- *     instruction, then don't forget to put it in an infinite loop.
- *
- *  3. Be warned. Some processors with onboard DMA have been known
- *     to stop the DMA if the CPU were put in IDLE mode.  This might
- *     also be a problem with other on-chip peripherals.  So use this
- *     hook with caution.
- */
-
-#if 0 /* located in cpu_asm.S */
-void _CPU_Thread_Idle_body( void )
-{
-
-  for( ; ; )
-    /* insert your "halt" instruction here */ ;
-}
-#endif
-
-extern void mips_break( int error );
-
-#include <stdio.h>
-
-void mips_fatal_error( int error )
-{
-   printf("fatal error 0x%x %d\n",error,error);
-   mips_break( error );
-}
diff --git a/c/src/exec/score/cpu/mips/cpu_asm.S b/c/src/exec/score/cpu/mips/cpu_asm.S
deleted file mode 100644
index 7dcb8fbda7..0000000000
--- a/c/src/exec/score/cpu/mips/cpu_asm.S
+++ /dev/null
@@ -1,972 +0,0 @@
-/*  cpu_asm.S 
- *
- *  This file contains the basic algorithms for all assembly code used
- *  in an specific CPU port of RTEMS.  These algorithms must be implemented
- *  in assembly language
- *
- *  Author:     Craig Lebakken <craigl@transition.com>
- *
- *  COPYRIGHT (c) 1996 by Transition Networks Inc.
- *
- *  To anyone who acknowledges that this file is provided "AS IS"
- *  without any express or implied warranty:
- *      permission to use, copy, modify, and distribute this file
- *      for any purpose is hereby granted without fee, provided that
- *      the above copyright notice and this notice appears in all
- *      copies, and that the name of Transition Networks not be used in
- *      advertising or publicity pertaining to distribution of the
- *      software without specific, written prior permission.
- *      Transition Networks makes no representations about the suitability
- *      of this software for any purpose.
- *
- *  Derived from c/src/exec/score/cpu/no_cpu/cpu_asm.s:
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-/* @(#)cpu_asm.S       08/20/96     1.15 */
-
-#include "cpu_asm.h"
-
-#include "iregdef.h"
-#include "idtcpu.h"
-
-#define FRAME(name,frm_reg,offset,ret_reg)      \
-        .globl  name;                           \
-        .ent    name;                           \
-name:;                                          \
-        .frame  frm_reg,offset,ret_reg
-#define ENDFRAME(name)                          \
-        .end name
-
-
-#define EXCP_STACK_SIZE (NREGS*R_SZ)
-
-#if __ghs__
-#define sd sw
-#define ld lw
-#define dmtc0 mtc0
-#define dsll sll
-#define dmfc0 mfc0
-#endif
-
-#if 1  /* 32 bit unsigned32 types */
-#define sint sw
-#define lint lw
-#define stackadd addiu
-#define intadd addu
-#define SZ_INT 4
-#define SZ_INT_POW2 2
-#else /* 64 bit unsigned32 types */
-#define sint dw
-#define lint dw
-#define stackadd daddiu
-#define intadd daddu
-#define SZ_INT 8
-#define SZ_INT_POW2 3
-#endif
-
-#ifdef __GNUC__
-#define EXTERN(x,size) .extern x,size
-#else
-#define EXTERN(x,size)
-#endif
-
-/* NOTE: these constants must match the Context_Control structure in cpu.h */
-#define S0_OFFSET 0
-#define S1_OFFSET 1
-#define S2_OFFSET 2
-#define S3_OFFSET 3
-#define S4_OFFSET 4
-#define S5_OFFSET 5
-#define S6_OFFSET 6
-#define S7_OFFSET 7
-#define SP_OFFSET 8
-#define FP_OFFSET 9
-#define RA_OFFSET 10
-#define C0_SR_OFFSET 11
-#define C0_EPC_OFFSET 12
-
-/* NOTE: these constants must match the Context_Control_fp structure in cpu.h */
-#define FP0_OFFSET  0 
-#define FP1_OFFSET  1 
-#define FP2_OFFSET  2 
-#define FP3_OFFSET  3 
-#define FP4_OFFSET  4 
-#define FP5_OFFSET  5 
-#define FP6_OFFSET  6 
-#define FP7_OFFSET  7 
-#define FP8_OFFSET  8 
-#define FP9_OFFSET  9 
-#define FP10_OFFSET 10 
-#define FP11_OFFSET 11 
-#define FP12_OFFSET 12 
-#define FP13_OFFSET 13 
-#define FP14_OFFSET 14 
-#define FP15_OFFSET 15 
-#define FP16_OFFSET 16 
-#define FP17_OFFSET 17 
-#define FP18_OFFSET 18 
-#define FP19_OFFSET 19 
-#define FP20_OFFSET 20 
-#define FP21_OFFSET 21 
-#define FP22_OFFSET 22 
-#define FP23_OFFSET 23 
-#define FP24_OFFSET 24 
-#define FP25_OFFSET 25 
-#define FP26_OFFSET 26 
-#define FP27_OFFSET 27 
-#define FP28_OFFSET 28 
-#define FP29_OFFSET 29 
-#define FP30_OFFSET 30 
-#define FP31_OFFSET 31 
-
-
-/*PAGE
- *
- *  _CPU_ISR_Get_level
- */
-
-#if 0
-unsigned32 _CPU_ISR_Get_level( void )
-{
-  /*
-   *  This routine returns the current interrupt level.
-   */
-}
-#endif
-/* return the current exception level for the 4650 */
-FRAME(_CPU_ISR_Get_level,sp,0,ra)
-	mfc0 v0,C0_SR
-	nop
-	andi v0,SR_EXL 
-	srl v0,1
-	j ra
-ENDFRAME(_CPU_ISR_Get_level)
-
-FRAME(_CPU_ISR_Set_level,sp,0,ra)
-	nop
-	mfc0 a0,C0_SR
-	nop
-	andi a0,SR_EXL 
-	beqz a0,_CPU_ISR_Set_1		/* normalize a0 */
-	nop
-	li a0,1         
-_CPU_ISR_Set_1:
-	beq v0,a0,_CPU_ISR_Set_exit	/* if (current_level != new_level ) */
-	nop
-	bnez a0,_CPU_ISR_Set_2
-	nop
-	nop
-	mfc0 t0,C0_SR
-	nop
-	li t1,~SR_EXL
-	and t0,t1
-	nop
-	mtc0 t0,C0_SR                   /* disable exception level */
-	nop
-	j ra 
-	nop
-_CPU_ISR_Set_2:
-	nop
-	mfc0 t0,C0_SR
-	nop
-	li t1,~SR_IE
-	and t0,t1
-	nop
-	mtc0 t0,C0_SR                   /* first disable ie bit (recommended) */
-	nop
-	ori t0,SR_EXL|SR_IE		/* enable exception level  */
-	nop
-	mtc0 t0,C0_SR         
-	nop
-_CPU_ISR_Set_exit:
-	j ra
-	nop
-ENDFRAME(_CPU_ISR_Set_level)
-
-/*
- *  _CPU_Context_save_fp_context
- *
- *  This routine is responsible for saving the FP context
- *  at *fp_context_ptr.  If the point to load the FP context
- *  from is changed then the pointer is modified by this routine.
- *
- *  Sometimes a macro implementation of this is in cpu.h which dereferences
- *  the ** and a similarly named routine in this file is passed something
- *  like a (Context_Control_fp *).  The general rule on making this decision
- *  is to avoid writing assembly language.
- */
-
-/* void _CPU_Context_save_fp(
- * void **fp_context_ptr
- * )
- * {
- * }
- */
-
-FRAME(_CPU_Context_save_fp,sp,0,ra)
-	.set noat
-	ld a1,(a0)
-	swc1 $f0,FP0_OFFSET*4(a1)
-	swc1 $f1,FP1_OFFSET*4(a1)
-	swc1 $f2,FP2_OFFSET*4(a1)
-	swc1 $f3,FP3_OFFSET*4(a1)
-	swc1 $f4,FP4_OFFSET*4(a1)
-	swc1 $f5,FP5_OFFSET*4(a1)
-	swc1 $f6,FP6_OFFSET*4(a1)
-	swc1 $f7,FP7_OFFSET*4(a1)
-	swc1 $f8,FP8_OFFSET*4(a1)
-	swc1 $f9,FP9_OFFSET*4(a1)
-	swc1 $f10,FP10_OFFSET*4(a1)
-	swc1 $f11,FP11_OFFSET*4(a1)
-	swc1 $f12,FP12_OFFSET*4(a1)
-	swc1 $f13,FP13_OFFSET*4(a1)
-	swc1 $f14,FP14_OFFSET*4(a1)
-	swc1 $f15,FP15_OFFSET*4(a1)
-	swc1 $f16,FP16_OFFSET*4(a1)
-	swc1 $f17,FP17_OFFSET*4(a1)
-	swc1 $f18,FP18_OFFSET*4(a1)
-	swc1 $f19,FP19_OFFSET*4(a1)
-	swc1 $f20,FP20_OFFSET*4(a1)
-	swc1 $f21,FP21_OFFSET*4(a1)
-	swc1 $f22,FP22_OFFSET*4(a1)
-	swc1 $f23,FP23_OFFSET*4(a1)
-	swc1 $f24,FP24_OFFSET*4(a1)
-	swc1 $f25,FP25_OFFSET*4(a1)
-	swc1 $f26,FP26_OFFSET*4(a1)
-	swc1 $f27,FP27_OFFSET*4(a1)
-	swc1 $f28,FP28_OFFSET*4(a1)
-	swc1 $f29,FP29_OFFSET*4(a1)
-	swc1 $f30,FP30_OFFSET*4(a1)
-	swc1 $f31,FP31_OFFSET*4(a1)
-	j ra
-	nop
-	.set at
-ENDFRAME(_CPU_Context_save_fp)
-
-/*
- *  _CPU_Context_restore_fp_context
- *
- *  This routine is responsible for restoring the FP context
- *  at *fp_context_ptr.  If the point to load the FP context
- *  from is changed then the pointer is modified by this routine.
- *
- *  Sometimes a macro implementation of this is in cpu.h which dereferences
- *  the ** and a similarly named routine in this file is passed something
- *  like a (Context_Control_fp *).  The general rule on making this decision
- *  is to avoid writing assembly language.
- */
-
-/* void _CPU_Context_restore_fp(
- * void **fp_context_ptr
- * )
- * {
- * }
- */
-
-FRAME(_CPU_Context_restore_fp,sp,0,ra)
-	.set noat
-	ld a1,(a0)
-	lwc1 $f0,FP0_OFFSET*4(a1)
-	lwc1 $f1,FP1_OFFSET*4(a1)
-	lwc1 $f2,FP2_OFFSET*4(a1)
-	lwc1 $f3,FP3_OFFSET*4(a1)
-	lwc1 $f4,FP4_OFFSET*4(a1)
-	lwc1 $f5,FP5_OFFSET*4(a1)
-	lwc1 $f6,FP6_OFFSET*4(a1)
-	lwc1 $f7,FP7_OFFSET*4(a1)
-	lwc1 $f8,FP8_OFFSET*4(a1)
-	lwc1 $f9,FP9_OFFSET*4(a1)
-	lwc1 $f10,FP10_OFFSET*4(a1)
-	lwc1 $f11,FP11_OFFSET*4(a1)
-	lwc1 $f12,FP12_OFFSET*4(a1)
-	lwc1 $f13,FP13_OFFSET*4(a1)
-	lwc1 $f14,FP14_OFFSET*4(a1)
-	lwc1 $f15,FP15_OFFSET*4(a1)
-	lwc1 $f16,FP16_OFFSET*4(a1)
-	lwc1 $f17,FP17_OFFSET*4(a1)
-	lwc1 $f18,FP18_OFFSET*4(a1)
-	lwc1 $f19,FP19_OFFSET*4(a1)
-	lwc1 $f20,FP20_OFFSET*4(a1)
-	lwc1 $f21,FP21_OFFSET*4(a1)
-	lwc1 $f22,FP22_OFFSET*4(a1)
-	lwc1 $f23,FP23_OFFSET*4(a1)
-	lwc1 $f24,FP24_OFFSET*4(a1)
-	lwc1 $f25,FP25_OFFSET*4(a1)
-	lwc1 $f26,FP26_OFFSET*4(a1)
-	lwc1 $f27,FP27_OFFSET*4(a1)
-	lwc1 $f28,FP28_OFFSET*4(a1)
-	lwc1 $f29,FP29_OFFSET*4(a1)
-	lwc1 $f30,FP30_OFFSET*4(a1)
-	lwc1 $f31,FP31_OFFSET*4(a1)
-	j ra
-	nop
-	.set at
-ENDFRAME(_CPU_Context_restore_fp)
-
-/*  _CPU_Context_switch
- *
- *  This routine performs a normal non-FP context switch.
- */
-
-/* void _CPU_Context_switch(
- * Context_Control  *run,
- * Context_Control  *heir
- * )
- * {
- * }
- */
-
-FRAME(_CPU_Context_switch,sp,0,ra)
-
-	mfc0 t0,C0_SR
-	li t1,~SR_IE
-	sd t0,C0_SR_OFFSET*8(a0)	/* save status register */
-	and t0,t1
-	mtc0 t0,C0_SR                   /* first disable ie bit (recommended) */
-	ori t0,SR_EXL|SR_IE		/* enable exception level to disable interrupts */
-	mtc0 t0,C0_SR
-
-	sd ra,RA_OFFSET*8(a0)           /* save current context */
-	sd sp,SP_OFFSET*8(a0)
-	sd fp,FP_OFFSET*8(a0)
-	sd s0,S0_OFFSET*8(a0)
-	sd s1,S1_OFFSET*8(a0)
-	sd s2,S2_OFFSET*8(a0)
-	sd s3,S3_OFFSET*8(a0)
-	sd s4,S4_OFFSET*8(a0)
-	sd s5,S5_OFFSET*8(a0)
-	sd s6,S6_OFFSET*8(a0)
-	sd s7,S7_OFFSET*8(a0)
-	dmfc0 t0,C0_EPC
-	sd t0,C0_EPC_OFFSET*8(a0)
-
-_CPU_Context_switch_restore:
-	ld s0,S0_OFFSET*8(a1)		/* restore context */
-	ld s1,S1_OFFSET*8(a1)
-	ld s2,S2_OFFSET*8(a1)
-	ld s3,S3_OFFSET*8(a1)
-	ld s4,S4_OFFSET*8(a1)
-	ld s5,S5_OFFSET*8(a1)
-	ld s6,S6_OFFSET*8(a1)
-	ld s7,S7_OFFSET*8(a1)
-	ld fp,FP_OFFSET*8(a1) 
-	ld sp,SP_OFFSET*8(a1)
-	ld ra,RA_OFFSET*8(a1)
-	ld t0,C0_EPC_OFFSET*8(a1)
-	dmtc0 t0,C0_EPC
-	ld t0,C0_SR_OFFSET*8(a1)
-	andi t0,SR_EXL
-	bnez t0,_CPU_Context_1		/* set exception level from restore context */
-	li t0,~SR_EXL
-	mfc0 t1,C0_SR
-	nop
-	and t1,t0
-	mtc0 t1,C0_SR
-_CPU_Context_1:
-	j ra
-	nop
-ENDFRAME(_CPU_Context_switch)
-
-/*
- *  _CPU_Context_restore
- *
- *  This routine is generally used only to restart self in an
- *  efficient manner.  It may simply be a label in _CPU_Context_switch.
- *
- *  NOTE: May be unnecessary to reload some registers.
- */
-
-#if 0
-void _CPU_Context_restore(
-  Context_Control *new_context
-)
-{
-}
-#endif
-
-FRAME(_CPU_Context_restore,sp,0,ra)
-	dadd a1,a0,zero
-	j _CPU_Context_switch_restore
-	nop
-ENDFRAME(_CPU_Context_restore)
-
-EXTERN(_ISR_Nest_level, SZ_INT)
-EXTERN(_Thread_Dispatch_disable_level,SZ_INT)
-EXTERN(_Context_Switch_necessary,SZ_INT)
-EXTERN(_ISR_Signals_to_thread_executing,SZ_INT)
-.extern _Thread_Dispatch
-.extern _ISR_Vector_table
-
-/*  void __ISR_Handler()
- *
- *  This routine provides the RTEMS interrupt management.
- *
- */
-
-#if 0
-void _ISR_Handler()
-{
-   /*
-    *  This discussion ignores a lot of the ugly details in a real
-    *  implementation such as saving enough registers/state to be
-    *  able to do something real.  Keep in mind that the goal is
-    *  to invoke a user's ISR handler which is written in C and
-    *  uses a certain set of registers.
-    *
-    *  Also note that the exact order is to a large extent flexible.
-    *  Hardware will dictate a sequence for a certain subset of
-    *  _ISR_Handler while requirements for setting
-    */
-
-  /*
-   *  At entry to "common" _ISR_Handler, the vector number must be
-   *  available.  On some CPUs the hardware puts either the vector
-   *  number or the offset into the vector table for this ISR in a
-   *  known place.  If the hardware does not give us this information,
-   *  then the assembly portion of RTEMS for this port will contain
-   *  a set of distinct interrupt entry points which somehow place
-   *  the vector number in a known place (which is safe if another
-   *  interrupt nests this one) and branches to _ISR_Handler.
-   *
-   */
-#endif
-FRAME(_ISR_Handler,sp,0,ra)
-.set noreorder
-#if USE_IDTKIT
-/* IDT/Kit incorrectly adds 4 to EPC before returning.  This compensates */
-	lreg    k0, R_EPC*R_SZ(sp)
-	daddiu    k0,k0,-4
-	sreg    k0, R_EPC*R_SZ(sp)
-	lreg    k0, R_CAUSE*R_SZ(sp)
-	li	k1, ~CAUSE_BD
-	and     k0, k1 
-	sreg    k0, R_CAUSE*R_SZ(sp)
-#endif
-	
-/* save registers not already saved by IDT/sim */
-	stackadd sp,sp,-EXCP_STACK_SIZE /* store ra on the stack */
-
-	sreg    ra, R_RA*R_SZ(sp)
-	sreg    v0, R_V0*R_SZ(sp)
-	sreg    v1, R_V1*R_SZ(sp)
-	sreg    a0, R_A0*R_SZ(sp)
-	sreg    a1, R_A1*R_SZ(sp)
-	sreg    a2, R_A2*R_SZ(sp)
-	sreg    a3, R_A3*R_SZ(sp)
-	sreg    t0, R_T0*R_SZ(sp)
-	sreg    t1, R_T1*R_SZ(sp)
-	sreg    t2, R_T2*R_SZ(sp)
-	sreg    t3, R_T3*R_SZ(sp)
-	sreg    t4, R_T4*R_SZ(sp)
-	sreg    t5, R_T5*R_SZ(sp)
-	sreg    t6, R_T6*R_SZ(sp)
-	sreg    t7, R_T7*R_SZ(sp)
-	mflo    k0
-	sreg    t8, R_T8*R_SZ(sp)
-	sreg    k0, R_MDLO*R_SZ(sp)
-	sreg    t9, R_T9*R_SZ(sp)
-	mfhi    k0
-	sreg    gp, R_GP*R_SZ(sp)
-	sreg    fp, R_FP*R_SZ(sp)
-	sreg    k0, R_MDHI*R_SZ(sp)
-	.set noat
-	sreg    AT, R_AT*R_SZ(sp)
-	.set at
-
-	stackadd sp,sp,-40		/* store ra on the stack */
-	sd ra,32(sp)
-
-/* determine if an interrupt generated this exception */
-	mfc0 k0,C0_CAUSE
-	and k1,k0,CAUSE_EXCMASK
-	bnez k1,_ISR_Handler_prom_exit /* not an external interrupt, pass exception to Monitor */
-	mfc0 k1,C0_SR
-	and k0,k1
-	and k0,CAUSE_IPMASK
-	beq k0,zero,_ISR_Handler_quick_exit /* external interrupt not enabled, ignore */
-	nop
-
-  /*
-   *  save some or all context on stack
-   *  may need to save some special interrupt information for exit
-   *
-   *  #if ( CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE )
-   *    if ( _ISR_Nest_level == 0 )
-   *      switch to software interrupt stack
-   *  #endif
-   */
-#if ( CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE )
-	lint t0,_ISR_Nest_level
-	beq t0, zero,  _ISR_Handler_1
-	nop
-	/* switch stacks */	
-_ISR_Handler_1:
-#else
-	lint t0,_ISR_Nest_level
-#endif
-  /*
-   *  _ISR_Nest_level++;
-   */
-	addi t0,t0,1
-	sint t0,_ISR_Nest_level
-  /*
-   *  _Thread_Dispatch_disable_level++;
-   */
-	lint t1,_Thread_Dispatch_disable_level
-	addi t1,t1,1
-	sint t1,_Thread_Dispatch_disable_level
-#if 0
-	nop
-	j _ISR_Handler_4
-	nop
-  /*
-   *  while ( interrupts_pending(cause_reg) ) {
-   *     vector = BITFIELD_TO_INDEX(cause_reg);
-   *     (*_ISR_Vector_table[ vector ])( vector );
-   *  }
-   */
-_ISR_Handler_2:
-/* software interrupt priorities can be applied here */
-	li t1,-1
-/* convert bit field into interrupt index */
-_ISR_Handler_3:
-	andi t2,t0,1
-	addi t1,1
-	beql t2,zero,_ISR_Handler_3
-	dsrl t0,1
-	li t1,7
-	dsll t1,3			/* convert index to byte offset (*8) */
-	la t3,_ISR_Vector_table
-	intadd t1,t3
-	lint t1,(t1)
-	jalr t1
-	nop
-	j _ISR_Handler_5
-	nop
-_ISR_Handler_4:
-	mfc0 t0,C0_CAUSE
-	andi t0,CAUSE_IPMASK
-	bne t0,zero,_ISR_Handler_2
-	dsrl t0,t0,8
-_ISR_Handler_5:
-#else
-	nop
-	li t1,7
-	dsll t1,t1,SZ_INT_POW2
-	la t3,_ISR_Vector_table
-	intadd t1,t3
-	lint t1,(t1)
-	jalr t1
-	nop
-#endif
-  /*
-   *  --_ISR_Nest_level;
-   */
-        lint t2,_ISR_Nest_level
-	addi t2,t2,-1
-        sint t2,_ISR_Nest_level
-  /*
-   *  --_Thread_Dispatch_disable_level;
-   */
-	lint t1,_Thread_Dispatch_disable_level
-	addi t1,t1,-1
-	sint t1,_Thread_Dispatch_disable_level
-  /*
-   *  if ( _Thread_Dispatch_disable_level || _ISR_Nest_level )
-   *    goto the label "exit interrupt (simple case)"
-   */
-	or t0,t2,t1
-	bne t0,zero,_ISR_Handler_exit
-	nop
-  /*
-   *  #if ( CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE )
-   *    restore stack
-   *  #endif
-   *  
-   *  if ( !_Context_Switch_necessary && !_ISR_Signals_to_thread_executing )
-   *    goto the label "exit interrupt (simple case)"
-   */
-	lint t0,_Context_Switch_necessary
-	lint t1,_ISR_Signals_to_thread_executing
-	or t0,t0,t1
-	beq t0,zero,_ISR_Handler_exit
-	nop
-
-  /*
-   *  call _Thread_Dispatch() or prepare to return to _ISR_Dispatch
-   */
-	jal _Thread_Dispatch
-	nop
-  /*
-   *  prepare to get out of interrupt
-   *  return from interrupt  (maybe to _ISR_Dispatch)
-   *
-   *  LABEL "exit interrupt (simple case):
-   *  prepare to get out of interrupt
-   *  return from interrupt
-   */
-_ISR_Handler_exit:
-	ld ra,32(sp)
-	stackadd sp,sp,40
-
-/* restore interrupt context from stack */
-	lreg    k0, R_MDLO*R_SZ(sp)
-	mtlo    k0
-	lreg    k0, R_MDHI*R_SZ(sp)
-	lreg    a2, R_A2*R_SZ(sp)
-	mthi    k0
-	lreg    a3, R_A3*R_SZ(sp)
-	lreg    t0, R_T0*R_SZ(sp)
-	lreg    t1, R_T1*R_SZ(sp)
-	lreg    t2, R_T2*R_SZ(sp)
-	lreg    t3, R_T3*R_SZ(sp)
-	lreg    t4, R_T4*R_SZ(sp)
-	lreg    t5, R_T5*R_SZ(sp)
-	lreg    t6, R_T6*R_SZ(sp)
-	lreg    t7, R_T7*R_SZ(sp)
-	lreg    t8, R_T8*R_SZ(sp)
-	lreg    t9, R_T9*R_SZ(sp)
-	lreg    gp, R_GP*R_SZ(sp)
-	lreg    fp, R_FP*R_SZ(sp)
-	lreg    ra, R_RA*R_SZ(sp)
-	lreg    a0, R_A0*R_SZ(sp)
-	lreg    a1, R_A1*R_SZ(sp)
-	lreg    v1, R_V1*R_SZ(sp)
-	lreg    v0, R_V0*R_SZ(sp)
-	.set noat
-	lreg    AT, R_AT*R_SZ(sp)
-	.set at
-
-	stackadd sp,sp,EXCP_STACK_SIZE /* store ra on the stack */
-
-#if USE_IDTKIT
-/* we handled exception, so return non-zero value */
-	li v0,1
-#endif
-
-_ISR_Handler_quick_exit:
-#ifdef USE_IDTKIT
-	j ra
-#else
-	eret
-#endif
-	nop
-
-_ISR_Handler_prom_exit:
-#ifdef CPU_R3000
-	la      k0, (R_VEC+((48)*8))
-#endif
-
-#ifdef CPU_R4000
-	la      k0, (R_VEC+((112)*8)) /* R4000 Sim's location is different */
-#endif
-	j       k0
-	nop
-
-       .set    reorder
-
-ENDFRAME(_ISR_Handler)
-
-
-FRAME(mips_enable_interrupts,sp,0,ra)
-	mfc0 t0,C0_SR		/* get status reg */
-	nop
-	or t0,t0,a0		 
-	mtc0 t0,C0_SR		/* save updated status reg */
-	j ra
-	nop
-ENDFRAME(mips_enable_interrupts)
-
-FRAME(mips_disable_interrupts,sp,0,ra)
-	mfc0 v0,C0_SR		/* get status reg */
-	li t1,SR_IMASK		/* t1 = load interrupt mask word */
-	not t0,t1		/* t0 = ~t1 */
-	and t0,v0		/* clear imask bits */
-	mtc0 t0,C0_SR		/* save status reg */
-	and v0,t1		/* mask return value (only return imask bits) */
-	jr ra
-	nop
-ENDFRAME(mips_disable_interrupts)
-
-FRAME(mips_enable_global_interrupts,sp,0,ra)
-	mfc0 t0,C0_SR		/* get status reg */
-	nop
-	ori t0,SR_IE
-	mtc0 t0,C0_SR		/* save updated status reg */
-	j ra
-	nop
-ENDFRAME(mips_enable_global_interrupts)
-
-FRAME(mips_disable_global_interrupts,sp,0,ra)
-	li t1,SR_IE
-	mfc0 t0,C0_SR		/* get status reg */
-	not t1
-	and t0,t1
-	mtc0 t0,C0_SR		/* save updated status reg */
-	j ra
-	nop
-ENDFRAME(mips_disable_global_interrupts)
-
-/* return the value of the status register in v0.  Used for debugging */
-FRAME(mips_get_sr,sp,0,ra)
-	mfc0 v0,C0_SR
-	j ra
-	nop
-ENDFRAME(mips_get_sr)
-
-FRAME(mips_break,sp,0,ra)
-#if 1
-	break 0x0
-	j mips_break
-#else
-	j ra
-#endif
-	nop
-ENDFRAME(mips_break)
-
-/*PAGE
- *
- *  _CPU_Internal_threads_Idle_thread_body
- *
- *  NOTES:
- *
- *  1. This is the same as the regular CPU independent algorithm.
- *
- *  2. If you implement this using a "halt", "idle", or "shutdown"
- *     instruction, then don't forget to put it in an infinite loop.
- *
- *  3. Be warned. Some processors with onboard DMA have been known
- *     to stop the DMA if the CPU were put in IDLE mode.  This might
- *     also be a problem with other on-chip peripherals.  So use this
- *     hook with caution.
- */
-
-FRAME(_CPU_Thread_Idle_body,sp,0,ra)
-	wait			/* enter low power mode */
-	j _CPU_Thread_Idle_body
-	nop
-ENDFRAME(_CPU_Thread_Idle_body)
-
-#define VEC_CODE_LENGTH 10*4
-
-/**************************************************************************
-**
-**	init_exc_vecs() - moves the exception code into the addresses
-**			  reserved for exception vectors
-**
-**	UTLB Miss exception vector at address 0x80000000
-**
-**	General exception vector at address 0x80000080
-**
-**	RESET exception vector is at address 0xbfc00000
-**
-***************************************************************************/
-
-#define INITEXCFRM ((2*4)+4)		/* ra + 2 arguments */
-FRAME(init_exc_vecs,sp,0,ra)
-/* This code yanked from SIM */
-#if defined(CPU_R3000)
-	.set	noreorder
-	la	t1,exc_utlb_code
-	la	t2,exc_norm_code
-	li	t3,UT_VEC
-	li	t4,E_VEC
-	li	t5,VEC_CODE_LENGTH
-1:
-	lw	t6,0(t1)
-	lw	t7,0(t2)
-	sw	t6,0(t3)
-	sw	t7,0(t4)
-	addiu	t1,4
-	addiu	t3,4
-	addiu	t4,4
-	subu	t5,4
-	bne	t5,zero,1b
-	addiu	t2,4
-	move	t5,ra		# assumes clear_cache doesnt use t5
-	li	a0,UT_VEC
-	jal	clear_cache
-	li	a1,VEC_CODE_LENGTH
-	nop
-	li	a0,E_VEC
-	jal	clear_cache
-	li	a1,VEC_CODE_LENGTH
-	move	ra,t5		# restore ra
-	j	ra
-	nop
-	.set	reorder
-#endif
-#if defined(CPU_R4000)
-	.set reorder
-	move	t5,ra		# assumes clear_cache doesnt use t5
-
-	/* TLB exception vector */
-	la	t1,exc_tlb_code
-	li	t2,T_VEC |K1BASE
-	li	t3,VEC_CODE_LENGTH
-1:
-	lw	t6,0(t1)
-	addiu	t1,4
-	subu	t3,4
-	sw	t6,0(t2)
-	addiu	t2,4
-	bne	t3,zero,1b
-
-	li	a0,T_VEC
-	li	a1,VEC_CODE_LENGTH
-	jal	clear_cache
-
-	la	t1,exc_xtlb_code
-	li	t2,X_VEC |K1BASE
-	li	t3,VEC_CODE_LENGTH
-1:
-	lw	t6,0(t1)
-	addiu	t1,4
-	subu	t3,4
-	sw	t6,0(t2)
-	addiu	t2,4
-	bne	t3,zero,1b
-
-	/* extended TLB exception vector */
-	li	a0,X_VEC
-	li	a1,VEC_CODE_LENGTH
-	jal	clear_cache
-
-	/* cache error exception vector */
-	la	t1,exc_cache_code
-	li	t2,C_VEC |K1BASE
-	li	t3,VEC_CODE_LENGTH
-1:
-	lw	t6,0(t1)
-	addiu	t1,4
-	subu	t3,4
-	sw	t6,0(t2)
-	addiu	t2,4
-	bne	t3,zero,1b
-
-	li	a0,C_VEC
-	li	a1,VEC_CODE_LENGTH
-	jal	clear_cache
-
-	/* normal exception vector */
-	la	t1,exc_norm_code
-	li	t2,E_VEC |K1BASE
-	li	t3,VEC_CODE_LENGTH
-1:
-	lw	t6,0(t1)
-	addiu	t1,4
-	subu	t3,4
-	sw	t6,0(t2)
-	addiu	t2,4
-	bne	t3,zero,1b
-
-	li	a0,E_VEC
-	li	a1,VEC_CODE_LENGTH
-	jal	clear_cache
-
-	move	ra,t5		# restore ra
-	j	ra
-#endif
-ENDFRAME(init_exc_vecs)
-
-
-#if defined(CPU_R4000)
-FRAME(exc_tlb_code,sp,0,ra)
-#ifdef CPU_R3000
-        la      k0, (R_VEC+((48)*8))
-#endif
-
-#ifdef CPU_R4000
-        la      k0, (R_VEC+((112)*8)) /* R4000 Sim's location is different */
-#endif
-        j       k0
-	nop
-
-ENDFRAME(exc_tlb_code)
-
-
-FRAME(exc_xtlb_code,sp,0,ra)
-#ifdef CPU_R3000
-        la      k0, (R_VEC+((48)*8))
-#endif
-
-#ifdef CPU_R4000
-        la      k0, (R_VEC+((112)*8)) /* R4000 Sim's location is different */
-#endif
-        j       k0
-	nop
-
-ENDFRAME(exc_xtlb_code)
-
-
-FRAME(exc_cache_code,sp,0,ra)
-#ifdef CPU_R3000
-        la      k0, (R_VEC+((48)*8))
-#endif
-
-#ifdef CPU_R4000
-        la      k0, (R_VEC+((112)*8)) /* R4000 Sim's location is different */
-#endif
-        j       k0
-	nop
-
-ENDFRAME(exc_cache_code)
-
-
-FRAME(exc_norm_code,sp,0,ra)
-	la	k0, _ISR_Handler /* generic external int hndlr */
-	j	k0
-	nop
-	subu	sp, EXCP_STACK_SIZE		/* set up local stack frame */
-ENDFRAME(exc_norm_code)
-#endif
-
-/**************************************************************************
-**
-** enable_int(mask) - enables interrupts - mask is positioned so it only
-**                      needs to be or'ed into the status reg. This
-**                      also does some other things !!!! caution should
-**                      be used if invoking this while in the middle
-**                      of a debugging session where the client may have
-**                      nested interrupts.
-**
-****************************************************************************/
-FRAME(enable_int,sp,0,ra)
-        .set    noreorder
-        mfc0    t0,C0_SR
-        or      a0,1
-        or      t0,a0
-        mtc0    t0,C0_SR
-        j       ra
-        nop
-        .set    reorder
-ENDFRAME(enable_int)
-
-
-/***************************************************************************
-**
-**      disable_int(mask) - disable the interrupt - mask is the complement
-**                          of the bits to be cleared - i.e. to clear ext int
-**                          5 the mask would be - 0xffff7fff
-**
-****************************************************************************/
-FRAME(disable_int,sp,0,ra)
-        .set    noreorder
-        mfc0    t0,C0_SR
-        nop
-        and     t0,a0
-        mtc0    t0,C0_SR
-        j       ra
-        nop
-ENDFRAME(disable_int)
-
-
diff --git a/c/src/exec/score/cpu/mips/cpu_asm.h b/c/src/exec/score/cpu/mips/cpu_asm.h
deleted file mode 100644
index 5d78f39d7c..0000000000
--- a/c/src/exec/score/cpu/mips/cpu_asm.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- *  cpu_asm.h
- *
- *  Author:     Craig Lebakken <craigl@transition.com>
- *
- *  COPYRIGHT (c) 1996 by Transition Networks Inc.
- *
- *  To anyone who acknowledges that this file is provided "AS IS"
- *  without any express or implied warranty:
- *      permission to use, copy, modify, and distribute this file
- *      for any purpose is hereby granted without fee, provided that
- *      the above copyright notice and this notice appears in all
- *      copies, and that the name of Transition Networks not be used in
- *      advertising or publicity pertaining to distribution of the
- *      software without specific, written prior permission.
- *      Transition Networks makes no representations about the suitability
- *      of this software for any purpose.
- *
- *  Derived from c/src/exec/score/cpu/no_cpu/cpu_asm.h:
- *
- *  COPYRIGHT (c) 1989-1998.
- *  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.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- *
- */
-/* @(#)cpu_asm.h       08/20/96     1.2 */
-
-#ifndef __CPU_ASM_h
-#define __CPU_ASM_h
-
-/* pull in the generated offsets */
-
-/* #include <rtems/score/offsets.h> */
-
-/*
- * Hardware General Registers
- */
-
-/* put something here */
-
-/*
- * Hardware Floating Point Registers
- */
-
-#define R_FP0 	0
-#define R_FP1 	1
-#define R_FP2 	2
-#define R_FP3 	3
-#define R_FP4 	4
-#define R_FP5 	5
-#define R_FP6 	6
-#define R_FP7 	7
-#define R_FP8 	8
-#define R_FP9 	9
-#define R_FP10 	10
-#define R_FP11 	11
-#define R_FP12 	12
-#define R_FP13 	13
-#define R_FP14 	14
-#define R_FP15 	15
-#define R_FP16 	16
-#define R_FP17 	17
-#define R_FP18 	18
-#define R_FP19 	19
-#define R_FP20 	20
-#define R_FP21 	21
-#define R_FP22 	22
-#define R_FP23	23
-#define R_FP24 	24
-#define R_FP25 	25
-#define R_FP26 	26
-#define R_FP27 	27
-#define R_FP28 	28
-#define R_FP29 	29
-#define R_FP30 	30
-#define R_FP31 	31
-
-/*
- * Hardware Control Registers
- */
-
-/* put something here */
-
-/*
- * Calling Convention
- */
-
-/* put something here */
-
-/*
- * Temporary registers
- */
-
-/* put something here */
-
-/*
- * Floating Point Registers - SW Conventions
- */
-
-/* put something here */
-
-/*
- * Temporary floating point registers
- */
-
-/* put something here */
-
-#endif
-
-/* end of file */
diff --git a/c/src/exec/score/cpu/mips/idtcpu.h b/c/src/exec/score/cpu/mips/idtcpu.h
deleted file mode 100644
index f921e85ef6..0000000000
--- a/c/src/exec/score/cpu/mips/idtcpu.h
+++ /dev/null
@@ -1,440 +0,0 @@
-/*
-
-Based upon IDT provided code with the following release:
-
-This source code has been made available to you by IDT on an AS-IS
-basis. Anyone receiving this source is licensed under IDT copyrights
-to use it in any way he or she deems fit, including copying it,
-modifying it, compiling it, and redistributing it either with or
-without modifications.  No license under IDT patents or patent
-applications is to be implied by the copyright license.
-
-Any user of this software should understand that IDT cannot provide
-technical support for this software and will not be responsible for
-any consequences resulting from the use of this software.
-
-Any person who transfers this source code or any derivative work must
-include the IDT copyright notice, this paragraph, and the preceeding
-two paragraphs in the transferred software.
-
-COPYRIGHT IDT CORPORATION 1996
-LICENSED MATERIAL - PROGRAM PROPERTY OF IDT
-
-  $Id$
-*/ 
-
-/*
-** idtcpu.h -- cpu related defines
-*/
-
-#ifndef _IDTCPU_H__
-#define _IDTCPU_H__
-
-/*
- * 950313: Ketan added Register definition for XContext reg.
- *               added define for WAIT instruction.
- * 950421: Ketan added Register definition for Config reg (R3081)
- */
-
-/*
-** memory configuration and mapping
-*/
-#define K0BASE	0x80000000
-#define K0SIZE	0x20000000
-#define K1BASE	0xa0000000
-#define K1SIZE	0x20000000
-#define K2BASE	0xc0000000
-#define K2SIZE	0x20000000
-#if defined(CPU_R4000)
-#define KSBASE	0xe0000000
-#define KSSIZE	0x20000000
-#endif
-
-#define KUBASE	0
-#define KUSIZE	0x80000000
-
-/*
-** Exception Vectors
-*/
-#if defined(CPU_R3000)
-#define	UT_VEC	K0BASE			/* utlbmiss vector */
-#define E_VEC	(K0BASE+0x80)		/* exception vevtor */
-#endif
-#if defined(CPU_R4000)
-#define	T_VEC	(K0BASE+0x000)		/* tlbmiss vector */
-#define X_VEC	(K0BASE+0x080)		/* xtlbmiss vector */
-#define C_VEC	(K0BASE+0x100)		/* cache error vector */
-#define E_VEC	(K0BASE+0x180)		/* exception vector */
-#endif
-#define	R_VEC	(K1BASE+0x1fc00000)	/* reset vector */
-
-/*
-** Address conversion macros
-*/
-#ifdef CLANGUAGE
-#define CAST(as) (as)
-#else
-#define CAST(as)
-#endif
-#define	K0_TO_K1(x)	(CAST(unsigned)(x)|0xA0000000)	/* kseg0 to kseg1 */
-#define	K1_TO_K0(x)	(CAST(unsigned)(x)&0x9FFFFFFF)	/* kseg1 to kseg0 */
-#define	K0_TO_PHYS(x)	(CAST(unsigned)(x)&0x1FFFFFFF)	/* kseg0 to physical */
-#define	K1_TO_PHYS(x)	(CAST(unsigned)(x)&0x1FFFFFFF)	/* kseg1 to physical */
-#define	PHYS_TO_K0(x)	(CAST(unsigned)(x)|0x80000000)	/* physical to kseg0 */
-#define	PHYS_TO_K1(x)	(CAST(unsigned)(x)|0xA0000000)	/* physical to kseg1 */
-
-/*
-**	Cache size constants
-*/
-#define	MINCACHE	0x200		/* 512       For 3041. */
-#define	MAXCACHE	0x40000		/* 256*1024   256k */	
-
-#if defined(CPU_R4000)
-/* R4000 configuration register definitions */
-#define CFG_CM		0x80000000	/* Master-Checker mode */
-#define CFG_ECMASK	0x70000000	/* System Clock Ratio */
-#define CFG_ECBY2	0x00000000 	/* divide by 2 */
-#define CFG_ECBY3	0x10000000 	/* divide by 3 */
-#define CFG_ECBY4	0x20000000 	/* divide by 4 */
-#define CFG_EPMASK	0x0f000000	/* Transmit data pattern */
-#define CFG_EPD		0x00000000	/* D */
-#define CFG_EPDDX	0x01000000	/* DDX */
-#define CFG_EPDDXX	0x02000000	/* DDXX */
-#define CFG_EPDXDX	0x03000000	/* DXDX */
-#define CFG_EPDDXXX	0x04000000	/* DDXXX */
-#define CFG_EPDDXXXX	0x05000000	/* DDXXXX */
-#define CFG_EPDXXDXX	0x06000000	/* DXXDXX */
-#define CFG_EPDDXXXXX	0x07000000	/* DDXXXXX */
-#define CFG_EPDXXXDXXX	0x08000000	/* DXXXDXXX */
-#define CFG_SBMASK	0x00c00000	/* Secondary cache block size */
-#define CFG_SBSHIFT	22
-#define CFG_SB4		0x00000000	/* 4 words */
-#define CFG_SB8		0x00400000	/* 8 words */
-#define CFG_SB16	0x00800000	/* 16 words */
-#define CFG_SB32	0x00c00000	/* 32 words */
-#define CFG_SS		0x00200000	/* Split secondary cache */
-#define CFG_SW		0x00100000	/* Secondary cache port width */
-#define CFG_EWMASK	0x000c0000	/* System port width */
-#define CFG_EWSHIFT	18
-#define CFG_EW64	0x00000000	/* 64 bit */
-#define CFG_EW32	0x00010000	/* 32 bit */
-#define CFG_SC		0x00020000	/* Secondary cache absent */
-#define CFG_SM		0x00010000	/* Dirty Shared mode disabled */
-#define CFG_BE		0x00008000	/* Big Endian */
-#define CFG_EM		0x00004000	/* ECC mode enable */
-#define CFG_EB		0x00002000	/* Block ordering */
-#define CFG_ICMASK	0x00000e00	/* Instruction cache size */
-#define CFG_ICSHIFT	9
-#define CFG_DCMASK	0x000001c0	/* Data cache size */
-#define CFG_DCSHIFT	6
-#define CFG_IB		0x00000020	/* Instruction cache block size */
-#define CFG_DB		0x00000010	/* Data cache block size */
-#define CFG_CU		0x00000008	/* Update on Store Conditional */
-#define CFG_K0MASK	0x00000007	/* KSEG0 coherency algorithm */
-
-/*
- * R4000 primary cache mode
- */
-#define CFG_C_UNCACHED		2
-#define CFG_C_NONCOHERENT	3
-#define CFG_C_COHERENTXCL	4
-#define CFG_C_COHERENTXCLW	5
-#define CFG_C_COHERENTUPD	6
-
-/*
- * R4000 cache operations (should be in assembler...?)
- */
-#define Index_Invalidate_I               0x0         /* 0       0 */
-#define Index_Writeback_Inv_D            0x1         /* 0       1 */
-#define Index_Invalidate_SI              0x2         /* 0       2 */
-#define Index_Writeback_Inv_SD           0x3         /* 0       3 */
-#define Index_Load_Tag_I                 0x4         /* 1       0 */
-#define Index_Load_Tag_D                 0x5         /* 1       1 */
-#define Index_Load_Tag_SI                0x6         /* 1       2 */
-#define Index_Load_Tag_SD                0x7         /* 1       3 */
-#define Index_Store_Tag_I                0x8         /* 2       0 */
-#define Index_Store_Tag_D                0x9         /* 2       1 */
-#define Index_Store_Tag_SI               0xA         /* 2       2 */
-#define Index_Store_Tag_SD               0xB         /* 2       3 */
-#define Create_Dirty_Exc_D               0xD         /* 3       1 */
-#define Create_Dirty_Exc_SD              0xF         /* 3       3 */
-#define Hit_Invalidate_I                 0x10        /* 4       0 */
-#define Hit_Invalidate_D                 0x11        /* 4       1 */
-#define Hit_Invalidate_SI                0x12        /* 4       2 */
-#define Hit_Invalidate_SD                0x13        /* 4       3 */
-#define Hit_Writeback_Inv_D              0x15        /* 5       1 */
-#define Hit_Writeback_Inv_SD             0x17        /* 5       3 */
-#define Fill_I                           0x14        /* 5       0 */
-#define Hit_Writeback_D                  0x19        /* 6       1 */
-#define Hit_Writeback_SD                 0x1B        /* 6       3 */
-#define Hit_Writeback_I                  0x18        /* 6       0 */
-#define Hit_Set_Virtual_SI               0x1E        /* 7       2 */
-#define Hit_Set_Virtual_SD               0x1F        /* 7       3 */
-
-#ifndef WAIT
-#define WAIT .word 0x42000020
-#endif WAIT
-
-#ifndef wait 
-#define wait .word 0x42000020
-#endif wait
-
-#endif
-
-/*
-** TLB resource defines
-*/
-#if defined(CPU_R3000)
-#define	N_TLB_ENTRIES	64
-#define TLB_PGSIZE	0x1000
-#define RANDBASE	8
-#define	TLBLO_PFNMASK	0xfffff000
-#define	TLBLO_PFNSHIFT	12
-#define	TLBLO_N		0x800	/* non-cacheable */
-#define	TLBLO_D		0x400	/* writeable */
-#define	TLBLO_V		0x200	/* valid bit */
-#define	TLBLO_G		0x100	/* global access bit */
-
-#define	TLBHI_VPNMASK	0xfffff000
-#define	TLBHI_VPNSHIFT	12
-#define	TLBHI_PIDMASK	0xfc0
-#define	TLBHI_PIDSHIFT	6
-#define	TLBHI_NPID	64
-
-#define	TLBINX_PROBE	0x80000000
-#define	TLBINX_INXMASK	0x00003f00
-#define	TLBINX_INXSHIFT	8
-
-#define	TLBRAND_RANDMASK	0x00003f00
-#define	TLBRAND_RANDSHIFT	8
-
-#define	TLBCTXT_BASEMASK	0xffe00000
-#define	TLBCTXT_BASESHIFT	21
-
-#define	TLBCTXT_VPNMASK		0x001ffffc
-#define	TLBCTXT_VPNSHIFT	2
-#endif
-#if defined(CPU_R4000)
-#define	N_TLB_ENTRIES	48
-
-#define	TLBHI_VPN2MASK	0xffffe000
-#define	TLBHI_PIDMASK	0x000000ff
-#define	TLBHI_NPID	256
-
-#define	TLBLO_PFNMASK	0x3fffffc0
-#define TLBLO_PFNSHIFT	6
-#define	TLBLO_D		0x00000004	/* writeable */
-#define	TLBLO_V		0x00000002	/* valid bit */
-#define	TLBLO_G		0x00000001	/* global access bit */
-#define TLBLO_CMASK	0x00000038	/* cache algorithm mask */
-#define TLBLO_CSHIFT	3
-
-#define TLBLO_UNCACHED		(CFG_C_UNCACHED<<TLBLO_CSHIFT)
-#define TLBLO_NONCOHERENT	(CFG_C_NONCOHERENT<<TLBLO_CSHIFT)
-#define TLBLO_COHERENTXCL	(CFG_C_COHERENTXCL<<TLBLO_CSHIFT)
-#define TLBLO_COHERENTXCLW	(CFG_C_COHERENTXCLW<<TLBLO_CSHIFT)
-#define TLBLO_COHERENTUPD	(CFG_C_COHERENTUPD<<TLBLO_CSHIFT)
-
-#define	TLBINX_PROBE	0x80000000
-#define	TLBINX_INXMASK	0x0000003f
-
-#define	TLBRAND_RANDMASK	0x0000003f
-
-#define	TLBCTXT_BASEMASK	0xff800000
-#define	TLBCTXT_BASESHIFT	23
-
-#define	TLBCTXT_VPN2MASK	0x007ffff0
-#define	TLBCTXT_VPN2SHIFT	4
-
-#define TLBPGMASK_MASK		0x01ffe000
-#endif
-
-#if defined(CPU_R3000)
-#define	SR_CUMASK	0xf0000000	/* coproc usable bits */
-#define	SR_CU3		0x80000000	/* Coprocessor 3 usable */
-#define	SR_CU2		0x40000000	/* Coprocessor 2 usable */
-#define	SR_CU1		0x20000000	/* Coprocessor 1 usable */
-#define	SR_CU0		0x10000000	/* Coprocessor 0 usable */
-
-#define	SR_BEV		0x00400000	/* use boot exception vectors */
-
-/* Cache control bits */
-#define	SR_TS		0x00200000	/* TLB shutdown */
-#define	SR_PE		0x00100000	/* cache parity error */
-#define	SR_CM		0x00080000	/* cache miss */
-#define	SR_PZ		0x00040000	/* cache parity zero */
-#define	SR_SWC		0x00020000	/* swap cache */
-#define	SR_ISC		0x00010000	/* Isolate data cache */
-
-/*
-**	status register interrupt masks and bits
-*/
-
-#define	SR_IMASK	0x0000ff00	/* Interrupt mask */
-#define	SR_IMASK8	0x00000000	/* mask level 8 */
-#define	SR_IMASK7	0x00008000	/* mask level 7 */
-#define	SR_IMASK6	0x0000c000	/* mask level 6 */
-#define	SR_IMASK5	0x0000e000	/* mask level 5 */
-#define	SR_IMASK4	0x0000f000	/* mask level 4 */
-#define	SR_IMASK3	0x0000f800	/* mask level 3 */
-#define	SR_IMASK2	0x0000fc00	/* mask level 2 */
-#define	SR_IMASK1	0x0000fe00	/* mask level 1 */
-#define	SR_IMASK0	0x0000ff00	/* mask level 0 */
-
-#define	SR_IMASKSHIFT	8
-
-#define	SR_IBIT8	0x00008000	/* bit level 8 */
-#define	SR_IBIT7	0x00004000	/* bit level 7 */
-#define	SR_IBIT6	0x00002000	/* bit level 6 */
-#define	SR_IBIT5	0x00001000	/* bit level 5 */
-#define	SR_IBIT4	0x00000800	/* bit level 4 */
-#define	SR_IBIT3	0x00000400	/* bit level 3 */
-#define	SR_IBIT2	0x00000200	/* bit level 2 */
-#define	SR_IBIT1	0x00000100	/* bit level 1 */
-
-#define	SR_KUO		0x00000020	/* old kernel/user, 0 => k, 1 => u */
-#define	SR_IEO		0x00000010	/* old interrupt enable, 1 => enable */
-#define	SR_KUP		0x00000008	/* prev kernel/user, 0 => k, 1 => u */
-#define	SR_IEP		0x00000004	/* prev interrupt enable, 1 => enable */
-#define	SR_KUC		0x00000002	/* cur kernel/user, 0 => k, 1 => u */
-#define	SR_IEC		0x00000001	/* cur interrupt enable, 1 => enable */
-#endif
-
-#if defined(CPU_R4000)
-#define	SR_CUMASK	0xf0000000	/* coproc usable bits */
-#define	SR_CU3		0x80000000	/* Coprocessor 3 usable */
-#define	SR_CU2		0x40000000	/* Coprocessor 2 usable */
-#define	SR_CU1		0x20000000	/* Coprocessor 1 usable */
-#define	SR_CU0		0x10000000	/* Coprocessor 0 usable */
-
-#define SR_RP		0x08000000      /* Reduced power operation */
-#define SR_FR		0x04000000	/* Additional floating point registers */
-#define SR_RE		0x02000000	/* Reverse endian in user mode */
-
-#define SR_BEV		0x00400000	/* Use boot exception vectors */
-#define SR_TS		0x00200000	/* TLB shutdown */
-#define SR_SR		0x00100000	/* Soft reset */
-#define SR_CH		0x00040000	/* Cache hit */
-#define SR_CE		0x00020000	/* Use cache ECC  */
-#define SR_DE		0x00010000	/* Disable cache exceptions */
-
-/*
-**	status register interrupt masks and bits
-*/
-
-#define	SR_IMASK	0x0000ff00	/* Interrupt mask */
-#define	SR_IMASK8	0x00000000	/* mask level 8 */
-#define	SR_IMASK7	0x00008000	/* mask level 7 */
-#define	SR_IMASK6	0x0000c000	/* mask level 6 */
-#define	SR_IMASK5	0x0000e000	/* mask level 5 */
-#define	SR_IMASK4	0x0000f000	/* mask level 4 */
-#define	SR_IMASK3	0x0000f800	/* mask level 3 */
-#define	SR_IMASK2	0x0000fc00	/* mask level 2 */
-#define	SR_IMASK1	0x0000fe00	/* mask level 1 */
-#define	SR_IMASK0	0x0000ff00	/* mask level 0 */
-
-#define	SR_IMASKSHIFT	8
-
-#define	SR_IBIT8	0x00008000	/* bit level 8 */
-#define	SR_IBIT7	0x00004000	/* bit level 7 */
-#define	SR_IBIT6	0x00002000	/* bit level 6 */
-#define	SR_IBIT5	0x00001000	/* bit level 5 */
-#define	SR_IBIT4	0x00000800	/* bit level 4 */
-#define	SR_IBIT3	0x00000400	/* bit level 3 */
-#define	SR_IBIT2	0x00000200	/* bit level 2 */
-#define	SR_IBIT1	0x00000100	/* bit level 1 */
-
-#define SR_KSMASK	0x00000018	/* Kernel mode mask */
-#define SR_KSUSER	0x00000010	/* User mode */
-#define SR_KSSUPER	0x00000008	/* Supervisor mode */
-#define SR_KSKERNEL	0x00000000	/* Kernel mode */
-#define SR_ERL		0x00000004	/* Error level */
-#define SR_EXL		0x00000002	/* Exception level */
-#define SR_IE		0x00000001	/* Interrupts enabled */
-#endif
-
-
-
-/*
- * Cause Register
- */
-#define	CAUSE_BD	0x80000000	/* Branch delay slot */
-#define	CAUSE_CEMASK	0x30000000	/* coprocessor error */
-#define	CAUSE_CESHIFT	28
-
-
-#define	CAUSE_IPMASK	0x0000FF00	/* Pending interrupt mask */
-#define	CAUSE_IPSHIFT	8
-
-#define	CAUSE_EXCMASK	0x0000003C	/* Cause code bits */
-#define	CAUSE_EXCSHIFT	2
-
-#ifndef XDS
-/*
-**  Coprocessor 0 registers
-*/
-#define	C0_INX		$0		/* tlb index */
-#define	C0_RAND		$1		/* tlb random */
-#if defined(CPU_R3000)
-#define	C0_TLBLO	$2		/* tlb entry low */
-#endif
-#if defined(CPU_R4000)
-#define	C0_TLBLO0	$2		/* tlb entry low 0 */
-#define	C0_TLBLO1	$3		/* tlb entry low 1 */
-#endif
-
-#define	C0_CTXT		$4		/* tlb context */
-
-#if defined(CPU_R4000)
-#define C0_PAGEMASK	$5		/* tlb page mask */
-#define C0_WIRED	$6		/* number of wired tlb entries */
-#endif
-
-#define	C0_BADVADDR	$8		/* bad virtual address */
-
-#if defined(CPU_R4000)
-#define C0_COUNT	$9		/* cycle count */
-#endif
-
-#define	C0_TLBHI	$10		/* tlb entry hi */
-
-#if defined(CPU_R4000)
-#define C0_COMPARE	$11		/* cyccle count comparator  */
-#endif
-
-#define	C0_SR		$12		/* status register */
-#define	C0_CAUSE	$13		/* exception cause */
-#define	C0_EPC		$14		/* exception pc */
-#define	C0_PRID		$15		/* revision identifier */
-
-#if defined(CPU_R3000)
-#define C0_CONFIG   $3     /* configuration register R3081*/
-#endif
-
-#if defined(CPU_R4000)
-#define C0_CONFIG	$16		/* configuration register */
-#define C0_LLADDR	$17		/* linked load address */
-#define C0_WATCHLO	$18		/* watchpoint trap register */
-#define C0_WATCHHI	$19		/* watchpoint trap register */
-#define C0_XCTXT    $20     /* extended tlb context */
-#define C0_ECC		$26		/* secondary cache ECC control */
-#define C0_CACHEERR	$27		/* cache error status */
-#define C0_TAGLO	$28		/* cache tag lo */
-#define C0_TAGHI	$29		/* cache tag hi */
-#define C0_ERRPC	$30		/* cache error pc */
-#endif
-
-#endif XDS
-
-#ifdef R4650
-#define IWATCH $18
-#define DWATCH $19
-#define IBASE  $0
-#define IBOUND $1
-#define DBASE  $2
-#define DBOUND $3
-#define CALG	$17
-#endif
-
-#endif /* _IDTCPU_H__ */
-
diff --git a/c/src/exec/score/cpu/mips/idtmon.h b/c/src/exec/score/cpu/mips/idtmon.h
deleted file mode 100644
index b42211ed5c..0000000000
--- a/c/src/exec/score/cpu/mips/idtmon.h
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
-
-Based upon IDT provided code with the following release:
-
-This source code has been made available to you by IDT on an AS-IS
-basis. Anyone receiving this source is licensed under IDT copyrights
-to use it in any way he or she deems fit, including copying it,
-modifying it, compiling it, and redistributing it either with or
-without modifications.  No license under IDT patents or patent
-applications is to be implied by the copyright license.
-
-Any user of this software should understand that IDT cannot provide
-technical support for this software and will not be responsible for
-any consequences resulting from the use of this software.
-
-Any person who transfers this source code or any derivative work must
-include the IDT copyright notice, this paragraph, and the preceeding
-two paragraphs in the transferred software.
-
-COPYRIGHT IDT CORPORATION 1996
-LICENSED MATERIAL - PROGRAM PROPERTY OF IDT
-
-  $Id$
-*/ 
-
-/*
-**	idtmon.h - General header file for the IDT Prom Monitor
-**
-**	Copyright 1989  Integrated Device Technology, Inc.
-**	All Rights Reserved.
-**
-**	June 1989 - D.Cahoon
-*/
-#ifndef __IDTMON_H__
-#define __IDTMON_H__
-
-/*
-** P_STACKSIZE is the size of the Prom Stack. 
-** the prom stack grows downward 
-*/
-#define	P_STACKSIZE	0x2000   /* sets stack size to 8k */
-
-/*
-** M_BUSWIDTH
-** Memory bus width (including bank interleaving) in bytes
-** used when doing memory sizing to prevent bus capacitance
-** reporting ghost memory locations
-*/
-#if defined(CPU_R3000)
-#define M_BUSWIDTH	8	/* 32bit memory bank interleaved */
-#endif
-#if defined(CPU_R4000)
-#define M_BUSWIDTH	16	/* 64 bit memory bank interleaved */
-#endif
-
-/*
-** this is the default value for the number of bytes to add in calculating
-** the checksums in the checksum command
-*/
-#define CHK_SUM_CNT	0x20000	     /* number of bytes to calc chksum for */
-
-/*
-** Monitor modes
-*/
-#define	MODE_MONITOR	5	/* IDT Prom Monitor is executing */
-#define	MODE_USER	0xa	/* USER is executing */
-
-/*
-** memory reference widths
-*/
-#define	SW_BYTE		1
-#define	SW_HALFWORD	2
-#define	SW_WORD		4
-#define SW_TRIBYTEL	12
-#define SW_TRIBYTER	20
-
-#ifdef CPU_R4000
-/*
-** definitions for select_cache call
-*/
-#define DCACHE		0
-#define ICACHE		1
-#define SCACHE		2
-
-#endif
-
-#if defined (CLANGUAGE) || defined(_LANGUAGE_C)
-typedef struct {
-	unsigned int	mem_size;
-	unsigned int	icache_size;
-	unsigned int	dcache_size;
-#ifdef CPU_R4000
-    unsigned int    scache_size;
-#endif
-
-	} mem_config;
-
-#endif CLANGUAGE || defined(_LANGUAGE_C)
-
-/*
-** general equates for diagnostics and boolean functions
-*/
-#define	PASS			0
-#define	FAIL			1
-
-#ifndef	TRUE
-#define	TRUE			1
-#endif	TRUE
-#ifndef	NULL
-#define	NULL			0
-#endif	NULL
-
-#ifndef	FALSE
-#define	FALSE			0
-#endif	FALSE
-
-
-/*
-**	portablility equates
-*/
-
-#ifndef	BOOL
-#define BOOL	unsigned int
-#endif	BOOL
-
-#ifndef GLOBAL
-#define GLOBAL	/**/
-#endif  GLOBAL
-
-#ifndef MLOCAL
-#define MLOCAL	static
-#endif  MLOCAL
-
-
-#ifdef XDS
-#define CONST const
-#else
-#define CONST
-#endif XDS 
-
-#define u_char	unsigned char
-#define u_short unsigned short
-#define u_int	unsigned int
-/*
-** assembly instructions for compatability between xds and mips
-*/
-#ifndef XDS
-#define sllv sll
-#define srlv srl
-#endif XDS
-/*
-**	debugger macros for assembly language routines. Allows the 
-**	programmer to set up the necessary stack frame info
-**	required by debuggers to do stack traces.
-*/
-
-#ifndef XDS 
-#define	FRAME(name,frm_reg,offset,ret_reg)	\
-	.globl	name;				\
-	.ent	name;				\
-name:;						\
-	.frame	frm_reg,offset,ret_reg
-#define ENDFRAME(name) 				\
-	.end name
-#else
-#define	FRAME(name,frm_reg,offset,ret_reg)	\
-	.globl	_##name;\
-_##name:
-#define ENDFRAME(name)
-#endif  XDS
-#endif /* __IDTMON_H__ */
diff --git a/c/src/exec/score/cpu/mips/iregdef.h b/c/src/exec/score/cpu/mips/iregdef.h
deleted file mode 100644
index f0953da852..0000000000
--- a/c/src/exec/score/cpu/mips/iregdef.h
+++ /dev/null
@@ -1,325 +0,0 @@
-/*
-
-Based upon IDT provided code with the following release:
-
-This source code has been made available to you by IDT on an AS-IS
-basis. Anyone receiving this source is licensed under IDT copyrights
-to use it in any way he or she deems fit, including copying it,
-modifying it, compiling it, and redistributing it either with or
-without modifications.  No license under IDT patents or patent
-applications is to be implied by the copyright license.
-
-Any user of this software should understand that IDT cannot provide
-technical support for this software and will not be responsible for
-any consequences resulting from the use of this software.
-
-Any person who transfers this source code or any derivative work must
-include the IDT copyright notice, this paragraph, and the preceeding
-two paragraphs in the transferred software.
-
-COPYRIGHT IDT CORPORATION 1996
-LICENSED MATERIAL - PROGRAM PROPERTY OF IDT
-
-  $Id$
-*/ 
-
-/*
-**	iregdef.h - IDT R3000 register structure header file
-**
-**	Copyright 1989 Integrated Device Technology, Inc
-**	All Rights Reserved
-**
-*/
-#ifndef __IREGDEF_H__
-#define __IREGDEF_H__
-
-/*
- * 950313: Ketan added sreg/lreg and R_SZ for 64-bit saves
- *         added Register definition for XContext reg.
- *         Look towards end of this file.
- */
-/*
-** register names 
-*/
-#define r0	$0
-#define r1	$1
-#define r2	$2
-#define r3	$3
-#define r4	$4
-#define r5	$5
-#define r6	$6
-#define r7	$7
-#define r8	$8
-#define r9	$9
-#define r10	$10
-#define r11	$11
-#define r12	$12
-#define r13	$13
-
-#define r14	$14
-#define r15	$15
-#define r16	$16
-#define r17	$17
-#define r18	$18
-#define r19	$19
-#define r20	$20
-#define r21	$21
-#define r22	$22
-#define r23	$23
-#define r24	$24
-#define r25	$25
-#define r26	$26
-#define r27	$27
-#define r28	$28
-#define r29	$29
-#define r30	$30
-#define r31	$31
-
-#define fp0	$f0
-#define fp1	$f1
-#define fp2	$f2
-#define fp3	$f3
-#define fp4	$f4
-#define fp5	$f5
-#define fp6	$f6
-#define fp7	$f7
-#define fp8	$f8
-#define fp9	$f9
-#define fp10	$f10
-#define fp11	$f11
-#define fp12	$f12
-#define fp13	$f13
-#define fp14	$f14
-#define fp15	$f15
-#define fp16	$f16
-#define fp17	$f17
-#define fp18	$f18
-#define fp19	$f19
-#define fp20	$f20
-#define fp21	$f21
-#define fp22	$f22
-#define fp23	$f23
-#define fp24	$f24
-#define fp25	$f25
-#define fp26	$f26
-#define fp27	$f27
-#define fp28	$f28
-#define fp29	$f29
-#define fp30	$f30
-#define fp31	$f31
-
-#define fcr0	$0
-#define fcr30	$30
-#define fcr31	$31
-
-#define zero	$0	/* wired zero */
-#define AT	$at	/* assembler temp */
-#define v0	$2	/* return value */
-#define v1	$3
-#define a0	$4	/* argument registers a0-a3 */
-#define a1	$5
-#define a2	$6
-#define a3	$7
-#define t0	$8	/* caller saved  t0-t9 */
-#define t1	$9
-#define t2	$10
-#define t3	$11
-#define t4	$12
-#define t5	$13
-#define t6	$14
-#define t7	$15
-#define s0	$16	/* callee saved s0-s8 */
-#define s1	$17
-#define s2	$18
-#define s3	$19
-#define s4	$20
-#define s5	$21
-#define s6	$22
-#define s7	$23
-#define t8	$24
-#define t9	$25
-#define k0	$26	/* kernel usage */
-#define k1	$27	/* kernel usage */
-#define gp	$28	/* sdata pointer */
-#define sp	$29	/* stack pointer */
-#define s8	$30	/* yet another saved reg for the callee */
-#define fp	$30	/* frame pointer - this is being phased out by MIPS */
-#define ra	$31	/* return address */
-
-
-/*
-** relative position of registers in save reg area
-*/
-#define	R_R0		0
-#define	R_R1		1
-#define	R_R2		2
-#define	R_R3		3
-#define	R_R4		4
-#define	R_R5		5
-#define	R_R6		6
-#define	R_R7		7
-#define	R_R8		8
-#define	R_R9		9
-#define	R_R10		10
-#define	R_R11		11
-#define	R_R12		12
-#define	R_R13		13
-#define	R_R14		14
-#define	R_R15		15
-#define	R_R16		16
-#define	R_R17		17
-#define	R_R18		18
-#define	R_R19		19
-#define	R_R20		20
-#define	R_R21		21
-#define	R_R22		22
-#define	R_R23		23
-#define	R_R24		24
-#define	R_R25		25
-#define	R_R26		26
-#define	R_R27		27
-#define	R_R28		28
-#define	R_R29		29
-#define	R_R30		30
-#define	R_R31		31
-#define	R_F0		32
-#define	R_F1		33
-#define	R_F2		34
-#define	R_F3		35
-#define	R_F4		36
-#define	R_F5		37
-#define	R_F6		38
-#define	R_F7		39
-#define	R_F8		40
-#define	R_F9		41
-#define	R_F10		42
-#define	R_F11		43
-#define	R_F12		44
-#define	R_F13		45
-#define	R_F14		46
-#define	R_F15		47
-#define	R_F16		48
-#define	R_F17		49
-#define	R_F18		50
-#define	R_F19		51
-#define	R_F20		52
-#define	R_F21		53
-#define	R_F22		54
-#define	R_F23		55
-#define	R_F24		56
-#define	R_F25		57
-#define	R_F26		58
-#define	R_F27		59
-#define	R_F28		60
-#define	R_F29		61
-#define	R_F30		62
-#define	R_F31		63
-#define NCLIENTREGS	64
-#define	R_EPC		64
-#define	R_MDHI		65
-#define	R_MDLO		66
-#define	R_SR		67
-#define	R_CAUSE		68
-#define	R_TLBHI		69
-#if defined(CPU_R3000)
-#define	R_TLBLO		70
-#endif
-#if defined(CPU_R4000)
-#define	R_TLBLO0	70
-#endif
-#define	R_BADVADDR	71
-#define	R_INX		72
-#define	R_RAND		73
-#define	R_CTXT		74
-#define	R_EXCTYPE	75
-#define R_MODE		76
-#define	R_PRID		77
-#define R_FCSR		78
-#define R_FEIR		79
-#if defined(CPU_R3000)
-#define NREGS		80
-#endif
-#if defined(CPU_R4000)
-#define	R_TLBLO1	80
-#define R_PAGEMASK	81
-#define R_WIRED		82
-#define R_COUNT		83
-#define R_COMPARE	84
-#define R_CONFIG	85
-#define R_LLADDR	86
-#define R_WATCHLO	87
-#define R_WATCHHI	88
-#define R_ECC		89
-#define R_CACHEERR	90
-#define R_TAGLO		91
-#define R_TAGHI		92
-#define R_ERRPC		93
-#define R_XCTXT     94  /* Ketan added from SIM64bit */
-
-#define	NREGS		95
-#endif
-
-/*
-** For those who like to think in terms of the compiler names for the regs
-*/
-#define	R_ZERO		R_R0
-#define	R_AT		R_R1
-#define	R_V0		R_R2
-#define	R_V1		R_R3
-#define	R_A0		R_R4
-#define	R_A1		R_R5
-#define	R_A2		R_R6
-#define	R_A3		R_R7
-#define	R_T0		R_R8
-#define	R_T1		R_R9
-#define	R_T2		R_R10
-#define	R_T3		R_R11
-#define	R_T4		R_R12
-#define	R_T5		R_R13
-#define	R_T6		R_R14
-#define	R_T7		R_R15
-#define	R_S0		R_R16
-#define	R_S1		R_R17
-#define	R_S2		R_R18
-#define	R_S3		R_R19
-#define	R_S4		R_R20
-#define	R_S5		R_R21
-#define	R_S6		R_R22
-#define	R_S7		R_R23
-#define	R_T8		R_R24
-#define	R_T9		R_R25
-#define	R_K0		R_R26
-#define	R_K1		R_R27
-#define	R_GP		R_R28
-#define	R_SP		R_R29
-#define	R_FP		R_R30
-#define	R_RA		R_R31
-
-/* Ketan added the following */
-#ifdef CPU_R3000
-#define sreg	sw
-#define lreg	lw
-#define rmfc0	mfc0
-#define rmtc0	mtc0
-#define R_SZ	4
-#endif CPU_R3000
-
-#ifdef CPU_R4000
-#if __mips < 3
-#define sreg	sw
-#define lreg	lw
-#define rmfc0	mfc0
-#define rmtc0	mtc0
-#define R_SZ	4
-#else
-#define sreg	sd
-#define lreg	ld
-#define rmfc0	dmfc0
-#define rmtc0	dmtc0
-#define R_SZ	8
-#endif
-#endif CPU_R4000
-/* Ketan till here */
-
-#endif /* __IREGDEF_H__ */
-
diff --git a/c/src/exec/score/cpu/mips/rtems.c b/c/src/exec/score/cpu/mips/rtems.c
deleted file mode 100644
index 356f1b8b9e..0000000000
--- a/c/src/exec/score/cpu/mips/rtems.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*  rtems.c  ===> rtems.S or rtems.s
- *
- *  This file contains the single entry point code for
- *  the XXX implementation of RTEMS.
- *
- *  NOTE:  This is supposed to be a .S or .s file NOT a C file.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-/*
- *  Rather than deleting this, it is commented out to (hopefully) help
- *  the submitter send updates.
- *
- * static char _sccsid[] = "@(#)rtems.c 03/15/96     1.1\n";
- */
-
-
-/*
- *  This is supposed to be an assembly file.  This means that system.h
- *  and cpu.h should not be included in a "real" rtems file.
- */
-
-#include <rtems/system.h>
-#include <rtems/score/cpu.h>
-/* #include "asm.h> */
-
-/*
- *  RTEMS
- *
- *  This routine jumps to the directive indicated in the
- *  CPU defined register.  This routine is used when RTEMS is
- *  linked by itself and placed in ROM.  This routine is the
- *  first address in the ROM space for RTEMS.  The user "calls"
- *  this address with the directive arguments in the normal place.
- *  This routine then jumps indirectly to the correct directive
- *  preserving the arguments.  The directive should not realize
- *  it has been "wrapped" in this way.  The table "_Entry_points"
- *  is used to look up the directive.
- */
-
-void RTEMS()
-{
-}
-
diff --git a/c/src/exec/score/cpu/sh/ispsh7032.c b/c/src/exec/score/cpu/sh/ispsh7032.c
deleted file mode 100644
index 3ef3c32465..0000000000
--- a/c/src/exec/score/cpu/sh/ispsh7032.c
+++ /dev/null
@@ -1,252 +0,0 @@
-/*
- * This file contains the isp frames for the user interrupts.
- * From these procedures __ISR_Handler is called with the vector number
- * as argument.
- *
- * __ISR_Handler is kept in a separate file (cpu_asm.c), because a bug in 
- * some releases of gcc doesn't properly handle #pragma interrupt, if a 
- * file contains both isrs and normal functions.
- *
- *  Authors: Ralf Corsepius (corsepiu@faw.uni-ulm.de) and
- *           Bernd Becker (becker@faw.uni-ulm.de)
- *
- *  COPYRIGHT (c) 1997-1998, FAW Ulm, Germany
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE
- * 
- *
- *  COPYRIGHT (c) 1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems/system.h>
-#include <rtems/score/shtypes.h>
-#include <rtems/score/cpu_isps.h>
-
-/*
- * This is a exception vector table
- *
- * It has the same structure like the actual vector table (vectab)
- */
-proc_ptr _Hardware_isr_Table[256]={
-_dummy_isp, _dummy_isp, _dummy_isp, _dummy_isp,
-_dummy_isp, _dummy_isp, _dummy_isp, _dummy_isp, 
-_dummy_isp, _dummy_isp, _dummy_isp,
-_nmi_isp, _usb_isp, 
-_dummy_isp, _dummy_isp, _dummy_isp, _dummy_isp, 
-_dummy_isp, _dummy_isp, _dummy_isp, _dummy_isp, 
-_dummy_isp, _dummy_isp, _dummy_isp, _dummy_isp, 
-_dummy_isp, _dummy_isp, _dummy_isp, _dummy_isp, 
-_dummy_isp, _dummy_isp, _dummy_isp, 
-/* trapa 0 -31 */
-_dummy_isp, _dummy_isp, _dummy_isp, _dummy_isp, 
-_dummy_isp, _dummy_isp, _dummy_isp, _dummy_isp, 
-_dummy_isp, _dummy_isp, _dummy_isp, _dummy_isp, 
-_dummy_isp, _dummy_isp, _dummy_isp, _dummy_isp, 
-_dummy_isp, _dummy_isp, _dummy_isp, _dummy_isp,
-_dummy_isp, _dummy_isp, _dummy_isp, _dummy_isp, 
-_dummy_isp, _dummy_isp, _dummy_isp, _dummy_isp, 
-_dummy_isp, _dummy_isp, _dummy_isp, _dummy_isp, 
-/* irq 64 ... */
-_irq0_isp, _irq1_isp, _irq2_isp, _irq3_isp, 
-_irq4_isp, _irq5_isp, _irq6_isp, _irq7_isp,
-_dma0_isp, _dummy_isp, _dma1_isp, _dummy_isp, 
-_dma2_isp, _dummy_isp, _dma3_isp, _dummy_isp, 
-_imia0_isp, _imib0_isp, _ovi0_isp, _dummy_isp, 
-_imia1_isp, _imib1_isp, _ovi1_isp, _dummy_isp, 
-_imia2_isp, _imib2_isp, _ovi2_isp, _dummy_isp, 
-_imia3_isp, _imib3_isp, _ovi3_isp, _dummy_isp, 
-_imia4_isp, _imib4_isp, _ovi4_isp, _dummy_isp, 
-_eri0_isp, _rxi0_isp, _txi0_isp, _tei0_isp,
-_eri1_isp, _rxi1_isp, _txi1_isp, _tei1_isp,
-_prt_isp, _adu_isp, _dummy_isp, _dummy_isp, 
-_wdt_isp, 
-/* 113 */ _dref_isp
-};
-
-#define Str(a)#a
-
-/*
- * Some versions of gcc and all version of egcs at least until egcs-1.1b
- * are not able to handle #pragma interrupt correctly if more than 1 isr is 
- * contained in a file and when optimizing.
- * We try to work around this problem by using the macro below.
- */
-#define isp( name, number, func)\
-asm (".global _"Str(name)"\n\t" \
-     "_"Str(name)":       \n\t" \
-     "    mov.l r0,@-r15   \n\t" \
-     "    mov.l r1,@-r15   \n\t" \
-     "    mov.l r2,@-r15   \n\t" \
-     "    mov.l r3,@-r15   \n\t" \
-     "    mov.l r4,@-r15   \n\t" \
-     "    mov.l r5,@-r15   \n\t" \
-     "    mov.l r6,@-r15   \n\t" \
-     "    mov.l r7,@-r15   \n\t" \
-     "    mov.l r14,@-r15  \n\t" \
-     "    sts.l pr,@-r15   \n\t" \
-     "    sts.l mach,@-r15 \n\t" \
-     "    sts.l macl,@-r15 \n\t" \
-     "    mov r15,r14      \n\t" \
-     "    mov.l "Str(name)"_k, r1\n\t" \
-     "    jsr @r1           \n\t" \
-     "    mov #"Str(number)", r4\n\t" \
-     "    mov   r14,r15    \n\t" \
-     "    lds.l @r15+,macl \n\t" \
-     "    lds.l @r15+,mach \n\t" \
-     "    lds.l @r15+,pr   \n\t" \
-     "    mov.l @r15+,r14  \n\t" \
-     "    mov.l @r15+,r7   \n\t" \
-     "    mov.l @r15+,r6   \n\t" \
-     "    mov.l @r15+,r5   \n\t" \
-     "    mov.l @r15+,r4   \n\t" \
-     "    mov.l @r15+,r3   \n\t" \
-     "    mov.l @r15+,r2   \n\t" \
-     "    mov.l @r15+,r1   \n\t" \
-     "    mov.l @r15+,r0   \n\t" \
-     "    rte              \n\t" \
-     "    nop              \n\t" \
-     "    .align 2         \n\t" \
-     #name"_k: \n\t" \
-     ".long "Str(func));
-
-/************************************************
- * Dummy interrupt service procedure for 
- * interrupts being not allowed --> Trap 34 
- ************************************************/
-asm(" .section .text
-.global __dummy_isp
-__dummy_isp:
-      mov.l r14,@-r15
-      mov   r15, r14
-      trapa #34
-      mov.l @r15+,r14
-      rte
-      nop");
-
-/*****************************
- * Non maskable interrupt 
- *****************************/
-isp( _nmi_isp, NMI_ISP_V, ___ISR_Handler);
-
-/***************************** 
- * User break controller 
- *****************************/
-isp( _usb_isp, USB_ISP_V, ___ISR_Handler);
-
-/*****************************
- *  External interrupts 0-7 
- *****************************/
-isp( _irq0_isp, IRQ0_ISP_V, ___ISR_Handler);
-isp( _irq1_isp, IRQ1_ISP_V, ___ISR_Handler);
-isp( _irq2_isp, IRQ2_ISP_V, ___ISR_Handler);
-isp( _irq3_isp, IRQ3_ISP_V, ___ISR_Handler);
-isp( _irq4_isp, IRQ4_ISP_V, ___ISR_Handler);
-isp( _irq5_isp, IRQ5_ISP_V, ___ISR_Handler);
-isp( _irq6_isp, IRQ6_ISP_V, ___ISR_Handler);
-isp( _irq7_isp, IRQ7_ISP_V, ___ISR_Handler);
-
-/*****************************
- * DMA - controller 
- *****************************/
-isp( _dma0_isp, DMA0_ISP_V, ___ISR_Handler);
-isp( _dma1_isp, DMA1_ISP_V, ___ISR_Handler);
-isp( _dma2_isp, DMA2_ISP_V, ___ISR_Handler);
-isp( _dma3_isp, DMA3_ISP_V, ___ISR_Handler);
-
-
-/***************************** 
- * Interrupt timer unit 
- *****************************/
-
-/*****************************
- * Timer 0 
- *****************************/
-isp( _imia0_isp, IMIA0_ISP_V, ___ISR_Handler);
-isp( _imib0_isp, IMIB0_ISP_V, ___ISR_Handler);
-isp( _ovi0_isp,  OVI0_ISP_V, ___ISR_Handler);
-
-/*****************************
- * Timer 1
- *****************************/
-isp( _imia1_isp, IMIA1_ISP_V, ___ISR_Handler);
-isp( _imib1_isp, IMIB1_ISP_V, ___ISR_Handler);
-isp( _ovi1_isp,  OVI1_ISP_V, ___ISR_Handler);
-
-/*****************************
- * Timer 2
- *****************************/
-isp( _imia2_isp, IMIA2_ISP_V, ___ISR_Handler);
-isp( _imib2_isp, IMIB2_ISP_V, ___ISR_Handler);
-isp( _ovi2_isp,  OVI2_ISP_V, ___ISR_Handler);
-
-/*****************************
- * Timer 3
- *****************************/
-isp( _imia3_isp, IMIA3_ISP_V, ___ISR_Handler);
-isp( _imib3_isp, IMIB3_ISP_V, ___ISR_Handler);
-isp( _ovi3_isp,  OVI3_ISP_V, ___ISR_Handler);
-
-/*****************************
- * Timer 4
- *****************************/
-isp( _imia4_isp, IMIA4_ISP_V, ___ISR_Handler);
-isp( _imib4_isp, IMIB4_ISP_V, ___ISR_Handler);
-isp( _ovi4_isp,  OVI4_ISP_V, ___ISR_Handler);
-
-
-/*****************************
- * Serial interfaces 
- *****************************/
-
-/*****************************
- * Serial interface 0
- *****************************/
-isp( _eri0_isp,  ERI0_ISP_V, ___ISR_Handler);
-isp( _rxi0_isp,  RXI0_ISP_V, ___ISR_Handler);
-isp( _txi0_isp,  TXI0_ISP_V, ___ISR_Handler);
-isp( _tei0_isp,  TEI0_ISP_V, ___ISR_Handler);
-
-/*****************************
- * Serial interface 1
- *****************************/
-isp( _eri1_isp,  ERI1_ISP_V, ___ISR_Handler);
-isp( _rxi1_isp,  RXI1_ISP_V, ___ISR_Handler);
-isp( _txi1_isp,  TXI1_ISP_V, ___ISR_Handler);
-isp( _tei1_isp,  TEI1_ISP_V, ___ISR_Handler);
-
-
-/*****************************
- * Parity control unit of 
- * the bus state controller 
- *****************************/
-isp( _prt_isp,  PRT_ISP_V, ___ISR_Handler);
-
-
-/****************************** 
- * Analog digital converter
- * ADC 
- ******************************/
-isp( _adu_isp,  ADU_ISP_V, ___ISR_Handler);
-
-
-/******************************
- *  Watchdog timer 
- ******************************/
-isp( _wdt_isp,  WDT_ISP_V, ___ISR_Handler);
-
-
-/******************************
- * DRAM refresh control unit 
- * of bus state controller 
- ******************************/
-isp( _dref_isp,  DREF_ISP_V, ___ISR_Handler);
diff --git a/c/src/exec/score/include/rtems/debug.h b/c/src/exec/score/include/rtems/debug.h
deleted file mode 100644
index 5c83e67d05..0000000000
--- a/c/src/exec/score/include/rtems/debug.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/*  debug.h
- *
- *  This include file contains the information pertaining to the debug
- *  support within RTEMS.  It is currently cast in the form of a 
- *  Manager since it is externally accessible.
- *
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_DEBUG_h
-#define __RTEMS_DEBUG_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- *  The following type is used to manage the debug mask.
- */
-
-typedef unsigned32 rtems_debug_control;
-
-/*
- *  These constants represent various classes of debugging.
- */
-
-#define RTEMS_DEBUG_ALL_MASK 0xffffffff
-#define RTEMS_DEBUG_REGION   0x00000001
-
-/*
- *  This variable contains the current debug level.
- */
-
-SCORE_EXTERN rtems_debug_control _Debug_Level;
-
-/*
- *  _Debug_Manager_initialization
- *
- *  DESCRIPTION:
- *
- *  This routine performs the initialization necessary for this manager.
- */
-
-void _Debug_Manager_initialization( void );
-
-/*
- *  rtems_debug_enable
- *
- *  DESCRIPTION:
- *
- *  This routine enables the specified types of debug checks.
- */
-
-void rtems_debug_enable (
-  rtems_debug_control  to_be_enabled
-);
-
-/*
- *  rtems_debug_disable
- *
- *  DESCRIPTION:
- *
- *  This routine disables the specified types of debug checks.
- */
- 
-void rtems_debug_disable (
-  rtems_debug_control  to_be_disabled
-);
- 
-/*
- *
- *  _Debug_Is_enabled
- *
- *  DESCRIPTION:
- *
- *  This routine returns TRUE if the requested debug level is
- *  enabled, and FALSE otherwise.
- */
-
-boolean _Debug_Is_enabled(
-  rtems_debug_control  level
-);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/score/include/rtems/score/Makefile.in b/c/src/exec/score/include/rtems/score/Makefile.in
deleted file mode 100644
index 920e738c03..0000000000
--- a/c/src/exec/score/include/rtems/score/Makefile.in
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-# H_FILES that get installed in the rtems/score subdirectoy
-H_PIECES= address apiext bitfield chain context copyrt coremsg coremutex \
-    coresem heap interr isr mpci mppkt object objectmp \
-    priority stack states sysstate thread threadmp threadq \
-    tod tqdata userext watchdog wkspace
-H_FILES=$(H_PIECES:%=$(srcdir)/%.h)
-
-# H_FILES that get installed in the rtems subdirectoy
-SAPI_H_PIECES=debug system
-SAPI_H_FILES=$(SAPI_H_PIECES:%=$(srcdir)/%.h)
-
-# H_FILES that get installed at the top level
-EXTERNAL_H_PIECES = 
-EXTERNAL_H_FILES=$(EXTERNAL_H_PIECES:%=$(srcdir)/%.h)
-
-SRCS=$(H_FILES) $(SAPI_H_FILES) $(EXTERNAL_H_FILES)
-
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-#
-# Add your list of files to delete here.  The config files
-#  already know how to delete some stuff, so you may want
-#  to just run 'make clean' first to see what gets missed.
-#  'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
-
-all:	$(SRCS)
-	$(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score
-	$(INSTALL) -m 444 ${SAPI_H_FILES} $(PROJECT_INCLUDE)/rtems/
-#	$(INSTALL) -m 444 ${EXTERNAL_H_FILES} $(PROJECT_INCLUDE)
diff --git a/c/src/exec/score/include/rtems/score/address.h b/c/src/exec/score/include/rtems/score/address.h
deleted file mode 100644
index e64cd54931..0000000000
--- a/c/src/exec/score/include/rtems/score/address.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*  address.h
- *
- *  This include file contains the information required to manipulate
- *  physical addresses.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_ADDRESSES_h
-#define __RTEMS_ADDRESSES_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/address.inl>
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/score/include/rtems/score/apiext.h b/c/src/exec/score/include/rtems/score/apiext.h
deleted file mode 100644
index 804b2dea4c..0000000000
--- a/c/src/exec/score/include/rtems/score/apiext.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/*  apiext.h
- *
- *  XXX
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-#ifndef __API_EXTENSIONS_h
-#define __API_EXTENSIONS_h
-
-#include <rtems/score/chain.h>
-#include <rtems/score/thread.h>
-
-/*
- *  The control structure which defines the points at which an API
- *  can add an extension to the system initialization thread.
- */
- 
-typedef void (*API_extensions_Predriver_hook)(void);
-typedef void (*API_extensions_Postdriver_hook)(void);
-typedef void (*API_extensions_Postswitch_hook)(
-                 Thread_Control *
-             );
- 
- 
-typedef struct {
-  Chain_Node                      Node;
-  API_extensions_Predriver_hook   predriver_hook;
-  API_extensions_Postdriver_hook  postdriver_hook;
-  API_extensions_Postswitch_hook  postswitch_hook;
-}  API_extensions_Control;
-
-/*
- *  This is the list of API extensions to the system initialization.
- */
- 
-SCORE_EXTERN Chain_Control _API_extensions_List;
-
-/*
- *  _API_extensions_Initialization
- *
- *  DESCRIPTION:
- *
- *  This routine initializes the API extension handler.
- *
- */
- 
-void _API_extensions_Initialization( void );
- 
-/*
- *  _API_extensions_Add
- *
- *  DESCRIPTION:
- *
- *  XXX
- */
- 
-void _API_extensions_Add(
-  API_extensions_Control *the_extension
-);
-
-/*
- *  _API_extensions_Run_predriver
- *
- *  DESCRIPTION:
- *
- *  XXX
- */
- 
-void _API_extensions_Run_predriver( void );
-
-/*
- *  _API_extensions_Run_postdriver
- *
- *  DESCRIPTION:
- *
- *  XXX
- */
-
-void _API_extensions_Run_postdriver( void );
-
-/*
- *  _API_extensions_Run_postswitch
- *
- *  DESCRIPTION:
- *
- *  XXX
- */
-
-void _API_extensions_Run_postswitch( void );
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/score/include/rtems/score/bitfield.h b/c/src/exec/score/include/rtems/score/bitfield.h
deleted file mode 100644
index bbced47652..0000000000
--- a/c/src/exec/score/include/rtems/score/bitfield.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/*  bitfield.h
- *
- *  This include file contains all bit field manipulation routines.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_BITFIELD_h
-#define __RTEMS_BITFIELD_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- *  _Bitfield_Find_first_bit
- *
- *  DESCRIPTION:
- *
- *  This routine returns the bit_number of the first bit set
- *  in the specified value.  The correspondence between bit_number
- *  and actual bit position is processor dependent.  The search for
- *  the first bit set may run from most to least significant bit
- *  or vice-versa.
- *
- *  NOTE:
- *
- *  This routine is used when the executing thread is removed
- *  from the ready state and, as a result, its performance has a
- *  significant impact on the performance of the executive as a whole.
- */
-
-#if ( CPU_USE_GENERIC_BITFIELD_DATA == TRUE )
-
-#ifndef SCORE_INIT
-extern const unsigned char __log2table[256];
-#else
-const unsigned char __log2table[256] = {
-    7, 7, 6, 6, 5, 5, 5, 5, 4, 4, 4, 4, 4, 4, 4, 4,
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-};
-#endif
- 
-#endif
-
-#if ( CPU_USE_GENERIC_BITFIELD_CODE == FALSE )
-
-#define _Bitfield_Find_first_bit( _value, _bit_number ) \
-        _CPU_Bitfield_Find_first_bit( _value, _bit_number )
-
-#else
-
-/*
- *  The following must be a macro because if a CPU specific version
- *  is used it will most likely use inline assembly.
- */
-
-#define _Bitfield_Find_first_bit( _value, _bit_number ) \
-  { \
-    register unsigned32 __value = (unsigned32) (_value); \
-    register const unsigned char *__p = __log2table; \
-    \
-    if ( __value < 0x100 ) \
-      (_bit_number) = __p[ __value ] + 8; \
-    else \
-      (_bit_number) = __p[ __value >> 8 ]; \
-  }
-
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/score/include/rtems/score/chain.h b/c/src/exec/score/include/rtems/score/chain.h
deleted file mode 100644
index 910f5e4414..0000000000
--- a/c/src/exec/score/include/rtems/score/chain.h
+++ /dev/null
@@ -1,168 +0,0 @@
-/*  chain.h
- *
- *  This include file contains all the constants and structures associated
- *  with the Doubly Linked Chain Handler.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_CHAIN_h
-#define __RTEMS_CHAIN_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/address.h>
-
-/*
- *  This is used to manage each element (node) which is placed
- *  on a chain.
- *
- *  NOTE:  Typically, a more complicated structure will use the
- *         chain package.  The more complicated structure will
- *         include a chain node as the first element in its
- *         control structure.  It will then call the chain package
- *         with a pointer to that node element.  The node pointer
- *         and the higher level structure start at the same address
- *         so the user can cast the pointers back and forth.
- *
- */
-
-typedef struct Chain_Node_struct Chain_Node;
-
-struct Chain_Node_struct {
-  Chain_Node *next;
-  Chain_Node *previous;
-};
-
-/*
- *  This is used to manage a chain.  A chain consists of a doubly
- *  linked list of zero or more nodes.
- *
- *  NOTE:  This implementation does not require special checks for
- *         manipulating the first and last elements on the chain.
- *         To accomplish this the chain control structure is
- *         treated as two overlapping chain nodes.  The permanent
- *         head of the chain overlays a node structure on the
- *         first and permanent_null fields.  The permanent tail
- *         of the chain overlays a node structure on the
- *         permanent_null and last elements of the structure.
- *
- */
-
-typedef struct {
-  Chain_Node *first;
-  Chain_Node *permanent_null;
-  Chain_Node *last;
-} Chain_Control;
-
-/*
- *  _Chain_Initialize
- *
- *  DESCRIPTION:
- *
- *  This routine initializes the_chain structure to manage the
- *  contiguous array of number_nodes nodes which starts at
- *  starting_address.  Each node is of node_size bytes.
- *
- */
-
-void _Chain_Initialize(
-  Chain_Control *the_chain,
-  void          *starting_address,
-  unsigned32     number_nodes,
-  unsigned32     node_size
-);
-
-/*
- *  _Chain_Get_first_unprotected
- */
- 
-#ifndef USE_INLINES
-Chain_Node *_Chain_Get_first_unprotected(
-  Chain_Control *the_chain
-);
-#endif
-
-/*
- *  _Chain_Extract
- *
- *  DESCRIPTION:
- *
- *  This routine extracts the_node from the chain on which it resides.
- *  It disables interrupts to insure the atomicity of the
- *  extract operation.
- *
- */
-
-void _Chain_Extract(
-  Chain_Node *the_node
-);
-
-/*
- *  _Chain_Get
- *
- *  DESCRIPTION:
- *
- *  This function removes the first node from the_chain and returns
- *  a pointer to that node.  If the_chain is empty, then NULL is returned.
- *  It disables interrupts to insure the atomicity of the
- *  get operation.
- *
- */
-
-Chain_Node *_Chain_Get(
-  Chain_Control *the_chain
-);
-
-/*
- *  _Chain_Insert
- *
- *  DESCRIPTION:
- *
- *  This routine inserts the_node on a chain immediately following
- *  after_node.  It disables interrupts to insure the atomicity
- *  of the extract operation.
- *
- */
-
-void _Chain_Insert(
-  Chain_Node *after_node,
-  Chain_Node *the_node
-);
-
-/*
- *  _Chain_Append
- *
- *  DESCRIPTION:
- *
- *  This routine appends the_node onto the end of the_chain.
- *  It disables interrupts to insure the atomicity of the
- *  append operation.
- *
- */
-
-void _Chain_Append(
-  Chain_Control *the_chain,
-  Chain_Node    *the_node
-);
-
-#ifndef __RTEMS_APPLICATION__
-#include <rtems/score/chain.inl>
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/score/include/rtems/score/context.h b/c/src/exec/score/include/rtems/score/context.h
deleted file mode 100644
index 5a22fd4b6d..0000000000
--- a/c/src/exec/score/include/rtems/score/context.h
+++ /dev/null
@@ -1,134 +0,0 @@
-/*  context.h
- *
- *  This include file contains all information about a context.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_CONTEXT_h
-#define __RTEMS_CONTEXT_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/cpu.h>
-
-/*
- *  The following constant defines the number of bytes required
- *  to store a full floating point context.
- */
-
-#define CONTEXT_FP_SIZE CPU_CONTEXT_FP_SIZE
-
-/*
- *  The following variable is set to TRUE when a reschedule operation
- *  has determined that the processor should be taken away from the
- *  currently executing thread and given to the heir thread.
- */
-
-SCORE_EXTERN volatile boolean _Context_Switch_necessary;
-
-/*
- *  _Context_Initialize
- *
- *  DESCRIPTION:
- *
- *  This routine initializes THE_CONTEXT such that the stack
- *  pointer, interrupt level, and entry point are correct for the
- *  thread's initial state.
- */
-
-#define \
-   _Context_Initialize( _the_context, _stack, _size, _isr, _entry, _is_fp ) \
-   _CPU_Context_Initialize( _the_context, _stack, _size, _isr, _entry, _is_fp )
-
-/*
- *  _Context_Switch
- *
- *  DESCRIPTION:
- *
- *  This routine saves the current context into the EXECUTING
- *  context record and restores the context specified by HEIR.
- */
-
-#define _Context_Switch( _executing, _heir ) \
-   _CPU_Context_switch( _executing, _heir )
-
-/*
- *  _Context_Restart_self
- *
- *  DESCRIPTION:
- *
- *  This routine restarts the calling thread by restoring its initial
- *  stack pointer and returning to the thread's entry point.
- */
-
-#define _Context_Restart_self( _the_context ) \
-   _CPU_Context_Restart_self( _the_context )
-
-/*
- *  _Context_Fp_start
- *
- *  DESCRIPTION:
- *
- *  This function returns the starting address of the floating
- *  point context save area.  It is assumed that the are reserved
- *  for the floating point save area is large enough.
- */
-
-#define _Context_Fp_start( _base, _offset ) \
-   _CPU_Context_Fp_start( (_base), (_offset) )
-
-/*
- *  _Context_Initialize_fp
- *
- *  DESCRIPTION:
- *
- *  This routine initializes the floating point context save
- *  area to contain an initial known state.
- */
-
-#define _Context_Initialize_fp( _fp_area ) \
-   _CPU_Context_Initialize_fp( _fp_area )
-
-/*
- *  _Context_Restore_fp
- *
- *  DESCRIPTION:
- *
- *  This routine restores the floating point context contained
- *  in the FP_CONTEXT area.  It is assumed that the current
- *  floating point context has been saved by a previous invocation
- *  of SAVE_FP.
- */
-
-#define _Context_Restore_fp( _fp ) \
-   _CPU_Context_restore_fp( _fp )
-
-/*
- *  _Context_Save_fp
- *
- *  DESCRIPTION:
- *
- *  This routine saves the current floating point context
- *  in the FP_CONTEXT area.
- */
-
-#define _Context_Save_fp( _fp ) \
-   _CPU_Context_save_fp( _fp )
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/score/include/rtems/score/copyrt.h b/c/src/exec/score/include/rtems/score/copyrt.h
deleted file mode 100644
index 3a9a5a5c60..0000000000
--- a/c/src/exec/score/include/rtems/score/copyrt.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*  copyrt.h
- *
- *  This include file contains the copyright notice for RTEMS
- *  which is included in every binary copy of the executive.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_COPYRIGHT_h
-#define __RTEMS_COPYRIGHT_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef SCORE_INIT
-
-const char _Copyright_Notice[] =
-"COPYRIGHT (c) 1989-1998.\n\
-On-Line Applications Research Corporation (OAR).\n\
-Copyright assigned to U.S. Government, 1994.\n";
-
-#else
-
-extern const char _Copyright_Notice[];
-
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/score/include/rtems/score/coremsg.h b/c/src/exec/score/include/rtems/score/coremsg.h
deleted file mode 100644
index 03277e12b7..0000000000
--- a/c/src/exec/score/include/rtems/score/coremsg.h
+++ /dev/null
@@ -1,267 +0,0 @@
-/*  coremsg.h
- *
- *  This include file contains all the constants and structures associated
- *  with the Message queue Handler.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
- 
-#ifndef __RTEMS_CORE_MESSAGE_QUEUE_h
-#define __RTEMS_CORE_MESSAGE_QUEUE_h
- 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/thread.h>
-#include <rtems/score/threadq.h>
-#include <rtems/score/priority.h>
-#include <rtems/score/watchdog.h>
- 
-/*
- *  The following type defines the callout which the API provides
- *  to support global/multiprocessor operations on message_queues.
- */
- 
-typedef void ( *CORE_message_queue_API_mp_support_callout )(
-                 Thread_Control *,
-                 Objects_Id
-             );
-
-/*
- *  The following defines the data types needed to manipulate
- *  the contents of message buffers.
- *
- *  NOTE:  The buffer field is normally longer than a single unsigned32.
- *         but since messages are variable length we just make a ptr to 1.  
- */
- 
-typedef struct {
-    unsigned32  size;
-    unsigned32  buffer[1];
-} CORE_message_queue_Buffer;
- 
-/*
- *  The following records define the organization of a message
- *  buffer.
- */
- 
-typedef struct {
-  Chain_Node                 Node;
-  CORE_message_queue_Buffer  Contents;
-}   CORE_message_queue_Buffer_control;
-
-/*
- *  Blocking disciplines for a message_queue.
- */
-
-typedef enum {
-  CORE_MESSAGE_QUEUE_DISCIPLINES_FIFO,
-  CORE_MESSAGE_QUEUE_DISCIPLINES_PRIORITY
-}   CORE_message_queue_Disciplines;
-
-/*
- *  The following enumerated type details the modes in which a message
- *  may be submitted to a message queue.  The message may be posted
- *  in a send or urgent fashion.
- */
- 
-typedef enum {
-  CORE_MESSAGE_QUEUE_SEND_REQUEST   = 0,
-  CORE_MESSAGE_QUEUE_URGENT_REQUEST = 1
-}  CORE_message_queue_Submit_types;
-
-/*
- *  Core Message queue handler return statuses.
- */
- 
-typedef enum {
-  CORE_MESSAGE_QUEUE_STATUS_SUCCESSFUL,
-  CORE_MESSAGE_QUEUE_STATUS_INVALID_SIZE,
-  CORE_MESSAGE_QUEUE_STATUS_TOO_MANY,
-  CORE_MESSAGE_QUEUE_STATUS_UNSATISFIED,
-  CORE_MESSAGE_QUEUE_STATUS_UNSATISFIED_NOWAIT,
-  CORE_MESSAGE_QUEUE_STATUS_WAS_DELETED,
-  CORE_MESSAGE_QUEUE_STATUS_TIMEOUT
-}   CORE_message_queue_Status;
-
-/*
- *  The following defines the control block used to manage the 
- *  attributes of each message queue.
- */
-
-typedef struct {
-  CORE_message_queue_Disciplines  discipline;
-}   CORE_message_queue_Attributes;
- 
-/*
- *  The following defines the type for a Notification handler.  A notification
- *  handler is invoked when the message queue makes a 0->1 transition on
- *  pending messages.
- */
-
-typedef void (*CORE_message_queue_Notify_Handler)( void * );
-
-/*
- *  The following defines the control block used to manage each 
- *  counting message_queue.
- */
- 
-typedef struct {
-  Thread_queue_Control               Wait_queue;
-  CORE_message_queue_Attributes      Attributes;
-  unsigned32                         maximum_pending_messages;
-  unsigned32                         number_of_pending_messages;
-  unsigned32                         maximum_message_size;
-  Chain_Control                      Pending_messages;
-  CORE_message_queue_Buffer         *message_buffers;
-  CORE_message_queue_Notify_Handler  notify_handler;
-  void                              *notify_argument;
-  Chain_Control                      Inactive_messages;
-}   CORE_message_queue_Control;
-
-/*
- *  _CORE_message_queue_Initialize
- *
- *  DESCRIPTION:
- *
- *  This routine initializes the message_queue based on the parameters passed.
- */
-
-boolean _CORE_message_queue_Initialize(
-  CORE_message_queue_Control    *the_message_queue,
-  Objects_Classes                the_class,
-  CORE_message_queue_Attributes *the_message_queue_attributes,
-  unsigned32                     maximum_pending_messages,
-  unsigned32                     maximum_message_size,
-  Thread_queue_Extract_callout   proxy_extract_callout
-);
- 
-/*
- *  _CORE_message_queue_Close
- *
- *  DESCRIPTION:
- *
- *  This function closes a message by returning all allocated space and
- *  flushing the message_queue's task wait queue.
- */
- 
-void _CORE_message_queue_Close(
-  CORE_message_queue_Control *the_message_queue,
-  Thread_queue_Flush_callout  remote_extract_callout,
-  unsigned32                  status
-);
-
-/*
- *
- *  _CORE_message_queue_Flush
- *
- *  DESCRIPTION:
- *
- *  This function flushes the message_queue's task wait queue.  The number
- *  messages flushed from the queue is returned.
- *
- */
-
-unsigned32 _CORE_message_queue_Flush(
-  CORE_message_queue_Control *the_message_queue
-);
-
-/*
- *  _CORE_message_queue_Flush_support
- *
- *  DESCRIPTION:
- *
- *  This routine flushes all outstanding messages and returns
- *  them to the inactive message chain.
- */
- 
-unsigned32 _CORE_message_queue_Flush_support(
-  CORE_message_queue_Control *the_message_queue
-);
- 
-/*
- *
- *  _CORE_message_queue_Broadcast
- *
- *  DESCRIPTION:
- *
- *  This function sends a message for every thread waiting on the queue and
- *  returns the number of threads made ready by the message.
- *
- */
- 
-CORE_message_queue_Status _CORE_message_queue_Broadcast(
-  CORE_message_queue_Control                *the_message_queue,
-  void                                      *buffer,
-  unsigned32                                 size,
-  Objects_Id                                 id,
-  CORE_message_queue_API_mp_support_callout  api_message_queue_mp_support,
-  unsigned32                                *count
-);
-
-/*
- *
- *  _CORE_message_queue_Submit
- *
- *  DESCRIPTION:
- *
- *  This routine implements the send and urgent message functions. It
- *  processes a message that is to be submitted to the designated
- *  message queue.  The message will either be processed as a
- *  send message which it will be inserted at the rear of the queue
- *  or it will be processed as an urgent message which will be inserted
- *  at the front of the queue.
- *
- */
- 
-CORE_message_queue_Status _CORE_message_queue_Submit(
-  CORE_message_queue_Control                *the_message_queue,
-  void                                      *buffer,
-  unsigned32                                 size,
-  Objects_Id                                 id,
-  CORE_message_queue_API_mp_support_callout  api_message_queue_mp_support,
-  CORE_message_queue_Submit_types            submit_type
-);
-
-/*
- *
- *  _CORE_message_queue_Seize
- *
- *  DESCRIPTION:
- *
- *  This kernel routine dequeues a message, copies the message buffer to
- *  a given destination buffer, and frees the message buffer to the
- *  inactive message pool.  The thread will be blocked if wait is TRUE,
- *  otherwise an error will be given to the thread if no messages are available.
- *
- */
- 
-void _CORE_message_queue_Seize(
-  CORE_message_queue_Control *the_message_queue,
-  Objects_Id                  id,
-  void                       *buffer,
-  unsigned32                 *size,
-  boolean                     wait,
-  Watchdog_Interval           timeout
-);
-
-#ifndef __RTEMS_APPLICATION__
-#include <rtems/score/coremsg.inl>
-#endif
-
-#ifdef __cplusplus
-}
-#endif
- 
-#endif
-/*  end of include file */
-
diff --git a/c/src/exec/score/include/rtems/score/coremutex.h b/c/src/exec/score/include/rtems/score/coremutex.h
deleted file mode 100644
index 7145e4f19f..0000000000
--- a/c/src/exec/score/include/rtems/score/coremutex.h
+++ /dev/null
@@ -1,172 +0,0 @@
-/*  mutex.h
- *
- *  This include file contains all the constants and structures associated
- *  with the Mutex Handler.  A mutex is an enhanced version of the standard
- *  Dijkstra binary semaphore used to provide synchronization and mutual 
- *  exclusion capabilities.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
- 
-#ifndef __RTEMS_CORE_MUTEX_h
-#define __RTEMS_CORE_MUTEX_h
- 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/thread.h>
-#include <rtems/score/threadq.h>
-#include <rtems/score/priority.h>
-#include <rtems/score/watchdog.h>
- 
-/*
- *  The following type defines the callout which the API provides
- *  to support global/multiprocessor operations on mutexes.
- */
- 
-typedef void ( *CORE_mutex_API_mp_support_callout )(
-                 Thread_Control *,
-                 Objects_Id
-             );
-
-/*
- *  Blocking disciplines for a mutex.
- */
-
-typedef enum {
-  CORE_MUTEX_DISCIPLINES_FIFO,
-  CORE_MUTEX_DISCIPLINES_PRIORITY,
-  CORE_MUTEX_DISCIPLINES_PRIORITY_INHERIT,
-  CORE_MUTEX_DISCIPLINES_PRIORITY_CEILING
-}   CORE_mutex_Disciplines;
-
-/*
- *  Mutex handler return statuses.
- */
- 
-typedef enum {
-  CORE_MUTEX_STATUS_SUCCESSFUL,
-  CORE_MUTEX_STATUS_UNSATISFIED_NOWAIT,
-  CORE_MUTEX_STATUS_NESTING_NOT_ALLOWED,
-  CORE_MUTEX_STATUS_NOT_OWNER_OF_RESOURCE,
-  CORE_MUTEX_WAS_DELETED,
-  CORE_MUTEX_TIMEOUT,
-  CORE_MUTEX_STATUS_CEILING_VIOLATED
-}   CORE_mutex_Status;
-
-/*
- *  Locked and unlocked values
- */
-
-#define CORE_MUTEX_UNLOCKED 1
-#define CORE_MUTEX_LOCKED   0
-
-/*
- *  The following defines the control block used to manage the 
- *  attributes of each mutex.
- */
-
-typedef struct {
-  boolean                 allow_nesting;
-  CORE_mutex_Disciplines  discipline;
-  Priority_Control        priority_ceiling;
-}   CORE_mutex_Attributes;
- 
-/*
- *  The following defines the control block used to manage each mutex.
- */
- 
-typedef struct {
-  Thread_queue_Control    Wait_queue;
-  CORE_mutex_Attributes   Attributes;
-  unsigned32              lock;
-  unsigned32              nest_count;
-  Thread_Control         *holder;
-  Objects_Id              holder_id;
-}   CORE_mutex_Control;
-
-/*
- *  _CORE_mutex_Initialize
- *
- *  DESCRIPTION:
- *
- *  This routine initializes the mutex based on the parameters passed.
- */
-
-void _CORE_mutex_Initialize(
-  CORE_mutex_Control           *the_mutex,
-  Objects_Classes               the_class,
-  CORE_mutex_Attributes        *the_mutex_attributes,
-  unsigned32                    initial_lock,
-  Thread_queue_Extract_callout  proxy_extract_callout
-);
- 
-/*
- *  _CORE_mutex_Seize
- *
- *  DESCRIPTION:
- *
- *  This routine attempts to receive a unit from the_mutex.
- *  If a unit is available or if the wait flag is FALSE, then the routine
- *  returns.  Otherwise, the calling task is blocked until a unit becomes
- *  available.
- */
-
-void _CORE_mutex_Seize(
-  CORE_mutex_Control  *the_mutex,
-  Objects_Id           id,
-  boolean              wait,
-  Watchdog_Interval    timeout
-);
- 
-/*
- *  _CORE_mutex_Surrender
- *
- *  DESCRIPTION:
- *
- *  This routine frees a unit to the mutex.  If a task was blocked waiting for
- *  a unit from this mutex, then that task will be readied and the unit
- *  given to that task.  Otherwise, the unit will be returned to the mutex.
- */
-
-CORE_mutex_Status _CORE_mutex_Surrender(
-  CORE_mutex_Control                *the_mutex,
-  Objects_Id                         id,
-  CORE_mutex_API_mp_support_callout  api_mutex_mp_support
-);
- 
-/*
- *  _CORE_mutex_Flush
- *
- *  DESCRIPTION:
- *
- *  This routine assists in the deletion of a mutex by flushing the associated
- *  wait queue.
- */
- 
-void _CORE_mutex_Flush(
-  CORE_mutex_Control         *the_mutex,
-  Thread_queue_Flush_callout  remote_extract_callout,
-  unsigned32                  status
-);
- 
-#ifndef __RTEMS_APPLICATION__
-#include <rtems/score/coremutex.inl>
-#endif
-
-#ifdef __cplusplus
-}
-#endif
- 
-#endif
-/*  end of include file */
-
diff --git a/c/src/exec/score/include/rtems/score/coresem.h b/c/src/exec/score/include/rtems/score/coresem.h
deleted file mode 100644
index 2ef1371e8d..0000000000
--- a/c/src/exec/score/include/rtems/score/coresem.h
+++ /dev/null
@@ -1,156 +0,0 @@
-/*  core_sem.h
- *
- *  This include file contains all the constants and structures associated
- *  with the Counting Semaphore Handler.  A counting semaphore is the
- *  standard Dijkstra binary semaphore used to provide synchronization
- *  and mutual exclusion capabilities.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
- 
-#ifndef __RTEMS_CORE_COUNTING_SEMAPHORE_h
-#define __RTEMS_CORE_COUNTING_SEMAPHORE_h
- 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/thread.h>
-#include <rtems/score/threadq.h>
-#include <rtems/score/priority.h>
-#include <rtems/score/watchdog.h>
- 
-/*
- *  The following type defines the callout which the API provides
- *  to support global/multiprocessor operations on semaphores.
- */
- 
-typedef void ( *CORE_semaphore_API_mp_support_callout )(
-                 Thread_Control *,
-                 Objects_Id
-             );
-
-/*
- *  Blocking disciplines for a semaphore.
- */
-
-typedef enum {
-  CORE_SEMAPHORE_DISCIPLINES_FIFO,
-  CORE_SEMAPHORE_DISCIPLINES_PRIORITY
-}   CORE_semaphore_Disciplines;
-
-/*
- *  Core Semaphore handler return statuses.
- */
- 
-typedef enum {
-  CORE_SEMAPHORE_STATUS_SUCCESSFUL,
-  CORE_SEMAPHORE_STATUS_UNSATISFIED_NOWAIT,
-  CORE_SEMAPHORE_WAS_DELETED,
-  CORE_SEMAPHORE_TIMEOUT
-}   CORE_semaphore_Status;
-
-/*
- *  The following defines the control block used to manage the 
- *  attributes of each semaphore.
- */
-
-typedef struct {
-  CORE_semaphore_Disciplines  discipline;
-}   CORE_semaphore_Attributes;
- 
-/*
- *  The following defines the control block used to manage each 
- *  counting semaphore.
- */
- 
-typedef struct {
-  Thread_queue_Control        Wait_queue;
-  CORE_semaphore_Attributes   Attributes;
-  unsigned32                  count;
-}   CORE_semaphore_Control;
-
-/*
- *  _CORE_semaphore_Initialize
- *
- *  DESCRIPTION:
- *
- *  This routine initializes the semaphore based on the parameters passed.
- */
-
-void _CORE_semaphore_Initialize(
-  CORE_semaphore_Control       *the_semaphore,
-  Objects_Classes               the_class,
-  CORE_semaphore_Attributes    *the_semaphore_attributes,
-  unsigned32                    initial_value,
-  Thread_queue_Extract_callout  proxy_extract_callout
-);
- 
-/*
- *  _CORE_semaphore_Seize
- *
- *  DESCRIPTION:
- *
- *  This routine attempts to receive a unit from the_semaphore.
- *  If a unit is available or if the wait flag is FALSE, then the routine
- *  returns.  Otherwise, the calling task is blocked until a unit becomes
- *  available.
- */
-
-void _CORE_semaphore_Seize(
-  CORE_semaphore_Control  *the_semaphore,
-  Objects_Id               id,
-  boolean                  wait,
-  Watchdog_Interval        timeout
-);
- 
-/*
- *  _CORE_semaphore_Surrender
- *
- *  DESCRIPTION:
- *
- *  This routine frees a unit to the semaphore.  If a task was blocked waiting
- *  for a unit from this semaphore, then that task will be readied and the unit
- *  given to that task.  Otherwise, the unit will be returned to the semaphore.
- */
-
-CORE_semaphore_Status _CORE_semaphore_Surrender(
-  CORE_semaphore_Control                *the_semaphore,
-  Objects_Id                             id,
-  CORE_semaphore_API_mp_support_callout  api_semaphore_mp_support
-);
- 
-/*
- *  _CORE_semaphore_Flush
- *
- *  DESCRIPTION:
- *
- *  This routine assists in the deletion of a semaphore by flushing the
- *  associated wait queue.
- */
-
-void _CORE_semaphore_Flush(
-  CORE_semaphore_Control         *the_semaphore,
-  Thread_queue_Flush_callout      remote_extract_callout,
-  unsigned32                      status
-);
-
-#ifndef __RTEMS_APPLICATION__
-#include <rtems/score/coresem.inl>
-#endif
-
-#ifdef __cplusplus
-}
-#endif
- 
-#endif
-/*  end of include file */
-
diff --git a/c/src/exec/score/include/rtems/score/heap.h b/c/src/exec/score/include/rtems/score/heap.h
deleted file mode 100644
index eaee7cde3f..0000000000
--- a/c/src/exec/score/include/rtems/score/heap.h
+++ /dev/null
@@ -1,226 +0,0 @@
-/*  heap.h
- *
- *  This include file contains the information pertaining to the Heap
- *  Handler.  A heap is a doubly linked list of variable size
- *  blocks which are allocated using the first fit method.  Garbage
- *  collection is performed each time a block is returned to the heap by
- *  coalescing neighbor blocks.  Control information for both allocated
- *  and unallocated blocks is contained in the heap space.  A heap header
- *  contains control information for the heap.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_HEAP_h
-#define __RTEMS_HEAP_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- *  Status codes for heap_extend
- */
-
-typedef enum {
-  HEAP_EXTEND_SUCCESSFUL,
-  HEAP_EXTEND_ERROR,
-  HEAP_EXTEND_NOT_IMPLEMENTED
-}  Heap_Extend_status;
-
-/*
- *  Constants used in the size/used field of each heap block to
- *  indicate when a block is free or in use.
- */
-
-#define HEAP_BLOCK_USED    1           /* indicates block is in use */
-#define HEAP_BLOCK_FREE    0           /* indicates block is free */
-
-/*
- *  The size/used field value for the dummy front and back flags.
- */
-
-#define HEAP_DUMMY_FLAG    (0 + HEAP_BLOCK_USED)
-
-/*
- *  The following constants reflect various requirements of the
- *  heap data structures which impact the management of a heap.
- *
- * NOTE:   Because free block overhead is greater than used block
- *         overhead AND a portion of the allocated space is from
- *         the extra free block overhead, the absolute lower bound
- *         of the minimum fragment size is equal to the size of
- *         the free block overhead.
- */
-
-#define HEAP_OVERHEAD \
-  (sizeof( unsigned32 ) * 2)         /* size dummy first and last blocks */
-#define HEAP_BLOCK_USED_OVERHEAD \
-  (sizeof( void * ) * 2)             /* num bytes overhead in used block */
-#define HEAP_MINIMUM_SIZE \
-  (HEAP_OVERHEAD + sizeof (Heap_Block))
-                                     /* min number of bytes the user may */
-                                     /*   specify for the heap size      */
-
-/*
- *  The following defines the data structure used to manage
- *  individual blocks in a heap.   When the block is allocated, the
- *  next and previous fields are not used by the Heap Handler
- *  and thus the address returned for the block starts at
- *  the address of the next field.
- *
- *  NOTE:  The next and previous pointers are only valid when the
- *         block is free.  Caution must be exercised to insure that
- *         allocated blocks are large enough to contain them and
- *         that they are not accidentally overwritten when the
- *         block is actually allocated.
- */
-
-typedef struct Heap_Block_struct Heap_Block;
-
-struct Heap_Block_struct {
-  unsigned32  back_flag;   /* size and status of prev block */
-  unsigned32  front_flag;  /* size and status of block */
-  Heap_Block *next;        /* pointer to next block */
-  Heap_Block *previous;    /* pointer to previous block */
-};
-
-/*
- *  The following defines the control block used to manage each heap.
- *
- *  NOTE:
- *
- *  This structure is layed out such that it can be used a a dummy
- *  first and last block on the free block chain.  The extra padding
- *  insures the dummy last block is the correct size.
- *
- *  The first Heap_Block starts at first while the second starts at
- *  final.  This is effectively the same trick as is used in the Chain
- *  Handler.
- */
-
-typedef struct {
-  Heap_Block *start;       /* first valid block address in heap */
-  Heap_Block *final;       /* last valid block address in heap */
-
-  Heap_Block *first;       /* pointer to first block in heap */
-  Heap_Block *permanent_null;  /* always NULL pointer */
-  Heap_Block *last;        /* pointer to last block in heap */
-  unsigned32  page_size;   /* allocation unit */
-  unsigned32  reserved;
-}   Heap_Control;
-
-/*
- *  _Heap_Initialize
- *
- *  DESCRIPTION:
- *
- *  This routine initializes the_heap record to manage the
- *  contiguous heap of size bytes which starts at starting_address.
- *  Blocks of memory are allocated from the heap in multiples of
- *  page_size byte units.
- */
-
-unsigned32 _Heap_Initialize(
-  Heap_Control *the_heap,
-  void         *starting_address,
-  unsigned32    size,
-  unsigned32    page_size
-);
-
-/*
- *  _Heap_Extend
- *
- *  DESCRIPTION:
- *
- *  This routine grows the_heap memory area using the size bytes which
- *  begin at starting_address.
- */
-
-Heap_Extend_status _Heap_Extend(
-  Heap_Control *the_heap,
-  void         *starting_address,
-  unsigned32    size,
-  unsigned32   *amount_extended
-);
-
-/*
- *  _Heap_Allocate
- *
- *  DESCRIPTION:
- *
- *  DESCRIPTION:
- *
- *  This function attempts to allocate a block of size bytes from
- *  the_heap.  If insufficient memory is free in the_heap to allocate
- *  a  block of the requested size, then NULL is returned.
- */
-
-void *_Heap_Allocate(
-  Heap_Control *the_heap,
-  unsigned32    size
-);
-
-/*
- *  _Heap_Size_of_user_area
- *
- *  DESCRIPTION:
- *
- *  This kernel routine sets size to the size of the given heap block.
- *  It returns TRUE if the starting_address is in the heap, and FALSE
- *  otherwise.
- */
-
-boolean _Heap_Size_of_user_area(
-  Heap_Control        *the_heap,
-  void                *starting_address,
-  unsigned32          *size
-);
-
-/*
- *  _Heap_Free
- *
- *  DESCRIPTION:
- *
- *  This routine returns the block of memory which begins
- *  at starting_address to the_heap.  Any coalescing which is
- *  possible with the freeing of this routine is performed.
- */
-
-boolean _Heap_Free(
-  Heap_Control *the_heap,
-  void         *start_address
-);
-
-/*
- *  _Heap_Walk
- *
- *  DESCRIPTION:
- *
- *  This routine walks the heap to verify its integrity.
- */
-
-void _Heap_Walk(
-  Heap_Control *the_heap,
-  int           source,
-  boolean       do_dump
-);
-
-#ifndef __RTEMS_APPLICATION__
-#include <rtems/score/heap.inl>
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/score/include/rtems/score/interr.h b/c/src/exec/score/include/rtems/score/interr.h
deleted file mode 100644
index e999ceff7a..0000000000
--- a/c/src/exec/score/include/rtems/score/interr.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/*  interr.h
- *
- *  This include file contains constants and prototypes related
- *  to the Internal Error Handler. 
- *
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_INTERNAL_ERROR_h
-#define __RTEMS_INTERNAL_ERROR_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- *  This type lists the possible sources from which an error
- *  can be reported.
- */
-
-typedef enum {
-  INTERNAL_ERROR_CORE,
-  INTERNAL_ERROR_RTEMS_API,
-  INTERNAL_ERROR_POSIX_API
-} Internal_errors_Source;
-
-/*
- *  A list of errors which are generated internally by the executive core.
- */
-
-typedef enum {
-  INTERNAL_ERROR_NO_CONFIGURATION_TABLE,
-  INTERNAL_ERROR_NO_CPU_TABLE,
-  INTERNAL_ERROR_INVALID_WORKSPACE_ADDRESS,
-  INTERNAL_ERROR_TOO_LITTLE_WORKSPACE,
-  INTERNAL_ERROR_WORKSPACE_ALLOCATION,
-  INTERNAL_ERROR_INTERRUPT_STACK_TOO_SMALL,
-  INTERNAL_ERROR_THREAD_EXITTED,
-  INTERNAL_ERROR_INCONSISTENT_MP_INFORMATION,
-  INTERNAL_ERROR_INVALID_NODE,
-  INTERNAL_ERROR_NO_MPCI,
-  INTERNAL_ERROR_BAD_PACKET,
-  INTERNAL_ERROR_OUT_OF_PACKETS,
-  INTERNAL_ERROR_OUT_OF_GLOBAL_OBJECTS,
-  INTERNAL_ERROR_OUT_OF_PROXIES,
-  INTERNAL_ERROR_INVALID_GLOBAL_ID,
-  INTERNAL_ERROR_BAD_STACK_HOOK
-} Internal_errors_Core_list;
-
-/*
- *  This type holds the fatal error information.
- */
- 
-typedef struct {
-  Internal_errors_Source  the_source;
-  boolean                 is_internal;
-  unsigned32              the_error;
-} Internal_errors_Information;
-
-/*
- *  When a fatal error occurs, the error information is stored here.
- */
-
-SCORE_EXTERN Internal_errors_Information Internal_errors_What_happened;
-
-/*
- *  _Internal_error_Occurred
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked when the application or the executive itself
- *  determines that a fatal error has occurred.
- */
-
-void volatile _Internal_error_Occurred(
-  Internal_errors_Source  the_source,
-  boolean                 is_internal,
-  unsigned32              the_error
-);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/score/include/rtems/score/isr.h b/c/src/exec/score/include/rtems/score/isr.h
deleted file mode 100644
index 97ffe7f2ec..0000000000
--- a/c/src/exec/score/include/rtems/score/isr.h
+++ /dev/null
@@ -1,231 +0,0 @@
-/*  isr.h
- *
- *  This include file contains all the constants and structures associated
- *  with the management of processor interrupt levels.  This handler
- *  supports interrupt critical sections, vectoring of user interrupt
- *  handlers, nesting of interrupts, and manipulating interrupt levels.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __ISR_h
-#define __ISR_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- *  The following type defines the control block used to manage
- *  the interrupt level portion of the status register.
- */
-
-typedef unsigned32 ISR_Level;
-
-/*
- *  The following type defines the type used to manage the vectors.
- */
-
-typedef unsigned32 ISR_Vector_number;
-
-/*
- *  Return type for ISR Handler
- */
-
-typedef void ISR_Handler;
-
-/*
- *  Pointer to an ISR Handler
- */
-
-#if (CPU_ISR_PASSES_FRAME_POINTER == 1)
-typedef ISR_Handler ( *ISR_Handler_entry )(
-                 ISR_Vector_number,
-                 CPU_Interrupt_frame *
-             );
-#else
-typedef ISR_Handler ( *ISR_Handler_entry )(
-                 ISR_Vector_number
-             );
-#endif
-/*
- *  This constant promotes out the number of vectors truly supported by
- *  the current CPU being used.  This is usually the number of distinct vectors
- *  the cpu can vector.
- */
- 
-#define ISR_NUMBER_OF_VECTORS                CPU_INTERRUPT_NUMBER_OF_VECTORS
-
-/*
- *  This constant promotes out the highest valid interrupt vector number.
- */
-
-#define ISR_INTERRUPT_MAXIMUM_VECTOR_NUMBER  CPU_INTERRUPT_MAXIMUM_VECTOR_NUMBER
-
-/*
- *  The following is TRUE if signals have been sent to the currently
- *  executing thread by an ISR handler.
- */
-
-SCORE_EXTERN boolean    _ISR_Signals_to_thread_executing;
-
-/*
- *  The following contains the interrupt service routine nest level.
- *  When this variable is zero, a thread is executing.
- */
-
-SCORE_EXTERN unsigned32 _ISR_Nest_level;
-
-/*
- *  The following declares the Vector Table.  Application
- *  interrupt service routines are vectored by the ISR Handler via this table.
- */
-
-SCORE_EXTERN ISR_Handler_entry _ISR_Vector_table[ ISR_NUMBER_OF_VECTORS ];
-
-/*
- *  _ISR_Handler_initialization
- *
- *  DESCRIPTION:
- *
- *  This routine performs the initialization necessary for this handler.
- */
-
-void _ISR_Handler_initialization ( void );
-
-/*
- *  _ISR_Disable
- *
- *  DESCRIPTION:
- *
- *  This routine disables all interrupts so that a critical section
- *  of code can be executing without being interrupted.  Upon return,
- *  the argument _level will contain the previous interrupt mask level.
- */
-
-#define _ISR_Disable( _level ) \
-        _CPU_ISR_Disable( _level )
-
-/*
- *  _ISR_Enable
- *
- *  DESCRIPTION:
- *
- *  This routine enables interrupts to the previous interrupt mask
- *  LEVEL.  It is used at the end of a critical section of code to
- *  enable interrupts so they can be processed again.
- */
-
-#define _ISR_Enable( _level ) \
-        _CPU_ISR_Enable( _level )
-
-/*
- *  _ISR_Flash
- *
- *  DESCRIPTION:
- *
- *  This routine temporarily enables interrupts to the previous
- *  interrupt mask level and then disables all interrupts so that
- *  the caller can continue into the second part of a critical
- *  section.  This routine is used to temporarily enable interrupts
- *  during a long critical section.  It is used in long sections of
- *  critical code when a point is reached at which interrupts can
- *  be temporarily enabled.  Deciding where to flash interrupts
- *  in a long critical section is often difficult and the point
- *  must be selected with care to insure that the critical section
- *  properly protects itself.
- */
-
-#define _ISR_Flash( _level ) \
-        _CPU_ISR_Flash( _level )
-
-/*
- *  _ISR_Install_vector
- *
- *  DESCRIPTION:
- *
- *  This routine installs new_handler as the interrupt service routine
- *  for the specified vector.  The previous interrupt service routine is
- *  returned as old_handler.
- */
-
-#define _ISR_Install_vector( _vector, _new_handler, _old_handler ) \
-  _CPU_ISR_install_vector( _vector, _new_handler, _old_handler )
-
-/*
- *  _ISR_Get_level
- *
- *  DESCRIPTION:
- *
- *  This routine returns the current interrupt level.
- */
- 
-#define _ISR_Get_level() \
-        _CPU_ISR_Get_level()
- 
-/*
- *  _ISR_Set_level
- *
- *  DESCRIPTION:
- *
- *  This routine sets the current interrupt level to that specified
- *  by new_level.  The new interrupt level is effective when the
- *  routine exits.
- */
-
-#define _ISR_Set_level( _new_level ) \
-        _CPU_ISR_Set_level( _new_level )
-
-/*
- *  _ISR_Handler
- *
- *  DESCRIPTION:
- *
- *  This routine is the interrupt dispatcher.  ALL interrupts
- *  are vectored to this routine so that minimal context can be saved
- *  and setup performed before the application's high-level language
- *  interrupt service routine is invoked.   After the application's
- *  interrupt service routine returns control to this routine, it
- *  will determine if a thread dispatch is necessary.  If so, it will
- *  insure that the necessary thread scheduling operations are
- *  performed when the outermost interrupt service routine exits.
- *
- *  NOTE:  Implemented in assembly language.
- */
-
-void _ISR_Handler( void );
-
-/*
- *  _ISR_Dispatch
- *
- *  DESCRIPTION:
- *
- *  This routine provides a wrapper so that the routine
- *  _Thread_Dispatch can be invoked when a reschedule is necessary
- *  at the end of the outermost interrupt service routine.  This
- *  wrapper is necessary to establish the processor context needed
- *  by _Thread_Dispatch and to save the processor context which is
- *  corrupted by _Thread_Dispatch.  This context typically consists
- *  of registers which are not preserved across routine invocations.
- *
- *  NOTE:  Implemented in assembly language.
- */
-
-void _ISR_Dispatch( void );
-
-#include <rtems/score/isr.inl>
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/score/include/rtems/score/mpci.h b/c/src/exec/score/include/rtems/score/mpci.h
deleted file mode 100644
index 4475021eca..0000000000
--- a/c/src/exec/score/include/rtems/score/mpci.h
+++ /dev/null
@@ -1,412 +0,0 @@
-/*  mpci.h
- *
- *  This include file contains all the constants and structures associated
- *  with the MPCI layer.  It provides mechanisms to utilize packets.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __MPCI_h
-#define __MPCI_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/mppkt.h>
-#include <rtems/score/states.h>
-#include <rtems/score/thread.h>
-#include <rtems/score/threadq.h>
-#include <rtems/score/tqdata.h>
-#include <rtems/score/watchdog.h>
-#include <rtems/score/coresem.h>
-
-/*
- *  The following constants define the stack size requirements for
- *  the system threads.
- */
- 
-#define MPCI_RECEIVE_SERVER_STACK_SIZE \
-  ( STACK_MINIMUM_SIZE + \
-    CPU_MPCI_RECEIVE_SERVER_EXTRA_STACK + \
-    _CPU_Table.extra_mpci_receive_server_stack \
-  )
-
-/*
- *  The following defines the node number used when a broadcast is desired.
- */
-
-#define MPCI_ALL_NODES 0
-
-/*
- *  For packets associated with requests that don't already have a timeout,
- *  use the one specified by this MPCI driver.  The value specified by
- *   the MPCI driver sets an upper limit on how long a remote request
- *   should take to complete.
- */
-
-#define MPCI_DEFAULT_TIMEOUT    0xFFFFFFFF
-
-/*
- *  The following records define the Multiprocessor Communications
- *  Interface (MPCI) Table.  This table defines the user-provided
- *  MPCI which is a required part of a multiprocessor system.
- *
- *  For non-blocking local operations that become remote operations,
- *  we need a timeout.  This is a per-driver timeout: default_timeout
- */
-
-typedef void MPCI_Entry;
-
-typedef MPCI_Entry ( *MPCI_initialization_entry )( void );
-
-typedef MPCI_Entry ( *MPCI_get_packet_entry )(
-                 MP_packet_Prefix **
-             );
-
-typedef MPCI_Entry ( *MPCI_return_packet_entry )(
-                 MP_packet_Prefix *
-             );
-
-typedef MPCI_Entry ( *MPCI_send_entry )(
-                 unsigned32,
-                 MP_packet_Prefix *
-             );
-
-typedef MPCI_Entry ( *MPCI_receive_entry )(
-                 MP_packet_Prefix **
-             );
-
-typedef struct {
-  unsigned32                 default_timeout;        /* in ticks */
-  unsigned32                 maximum_packet_size;
-  MPCI_initialization_entry  initialization;
-  MPCI_get_packet_entry      get_packet;
-  MPCI_return_packet_entry   return_packet;
-  MPCI_send_entry            send_packet;
-  MPCI_receive_entry         receive_packet;
-} MPCI_Control;
-
-/*
- *  The following defines the type for packet processing routines
- *  invoked by the MPCI Receive server.
- */
-
-typedef void (*MPCI_Packet_processor)( MP_packet_Prefix * );
- 
-/*
- *  The following enumerated type defines the list of
- *  internal MP operations.
- */
- 
-typedef enum {
-  MPCI_PACKETS_SYSTEM_VERIFY  =  0
-}   MPCI_Internal_Remote_operations;
- 
-/*
- *  The following data structure defines the packet used to perform
- *  remote event operations.
- */
- 
-typedef struct {
-  MP_packet_Prefix                 Prefix;
-  MPCI_Internal_Remote_operations  operation;
-  unsigned32                       maximum_nodes;
-  unsigned32                       maximum_global_objects;
-}    MPCI_Internal_packet;
-
-/*
- *  This is the core semaphore which the MPCI Receive Server blocks on.
- */
-
-SCORE_EXTERN CORE_semaphore_Control _MPCI_Semaphore;
-/*
- *  The following thread queue is used to maintain a list of tasks
- *  which currently have outstanding remote requests.
- */
-
-SCORE_EXTERN Thread_queue_Control _MPCI_Remote_blocked_threads;
-
-/*
- *  The following define the internal pointers to the user's
- *  configuration information.
- */
- 
-SCORE_EXTERN MPCI_Control *_MPCI_table;
-
-/*
- *  The following points to the MPCI Receive Server.
- */
- 
-SCORE_EXTERN Thread_Control *_MPCI_Receive_server_tcb;
-
-/*
- *  The following table contains the process packet routines provided
- *  by each object that supports MP operations.
- */
-
-SCORE_EXTERN MPCI_Packet_processor 
-               _MPCI_Packet_processors[MP_PACKET_CLASSES_LAST+1];
-
-/*
- *  _MPCI_Handler_initialization
- *
- *  DESCRIPTION:
- *
- *  This routine performs the initialization necessary for this handler.
- */
-
-void _MPCI_Handler_initialization( 
-  MPCI_Control            *users_mpci_table,
-  unsigned32               timeout_status
-);
-
-/*
- *  _MPCI_Create_server
- *
- *  DESCRIPTION:
- *  
- *  This routine creates the packet receive server used in MP systems.
- */
-
-void _MPCI_Create_server( void );
-
-/*
- *  _MPCI_Initialization
- *
- *  DESCRIPTION:
- *
- *  This routine initializes the MPCI driver by
- *  invoking the user provided MPCI initialization callout.
- */
-
-void _MPCI_Initialization ( void );
-
-/*
- *  _MPCI_Register_packet_processor
- *
- *  DESCRIPTION:
- *
- *  This routine registers the MPCI packet processor for the
- *  designated object class.
- */
- 
-void _MPCI_Register_packet_processor( 
-  MP_packet_Classes      the_class,
-  MPCI_Packet_processor  the_packet_processor
-  
-);
- 
-/*
- *  _MPCI_Get_packet
- *
- *  DESCRIPTION:
- *
- *  This function obtains a packet by invoking the user provided
- *  MPCI get packet callout.
- */
-
-MP_packet_Prefix *_MPCI_Get_packet ( void );
-
-/*
- *  _MPCI_Return_packet
- *
- *  DESCRIPTION:
- *
- *  This routine returns a packet by invoking the user provided
- *  MPCI return packet callout.
- */
-
-void _MPCI_Return_packet (
-  MP_packet_Prefix *the_packet
-);
-
-/*
- *  _MPCI_Send_process_packet
- *
- *  DESCRIPTION:
- *
- *  This routine sends a process packet by invoking the user provided
- *  MPCI send callout.
- */
-
-void _MPCI_Send_process_packet (
-  unsigned32        destination,
-  MP_packet_Prefix *the_packet
-);
-
-/*
- *  _MPCI_Send_request_packet
- *
- *  DESCRIPTION:
- *
- *  This routine sends a request packet by invoking the user provided
- *  MPCI send callout.
- */
-
-unsigned32 _MPCI_Send_request_packet (
-  unsigned32         destination,
-  MP_packet_Prefix  *the_packet,
-  States_Control     extra_state
-);
-
-/*
- *  _MPCI_Send_response_packet
- *
- *  DESCRIPTION:
- *
- *  This routine sends a response packet by invoking the user provided
- *  MPCI send callout.
- */
-
-void _MPCI_Send_response_packet (
-  unsigned32        destination,
-  MP_packet_Prefix *the_packet
-);
-
-/*
- *  _MPCI_Receive_packet
- *
- *  DESCRIPTION:
- *
- *  This routine receives a packet by invoking the user provided
- *  MPCI receive callout.
- */
-
-MP_packet_Prefix  *_MPCI_Receive_packet ( void );
-
-/*
- *  _MPCI_Process_response
- *
- *  DESCRIPTION:
- *
- *  This routine obtains a packet by invoking the user provided
- *  MPCI get packet callout.
- */
-
-Thread_Control *_MPCI_Process_response (
-  MP_packet_Prefix *the_packet
-);
-
-/*PAGE
- *
- *  _MPCI_Receive_server
- *
- */
- 
-Thread _MPCI_Receive_server(
-  unsigned32 ignored
-);
-
-/*PAGE
- *
- *  _MPCI_Announce
- *
- *  DESCRIPTION:
- *
- *  XXX
- */
- 
-void _MPCI_Announce ( void );
-
-/*
- *  _MPCI_Internal_packets_Send_process_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs a remote procedure call so that a
- *  process operation can be performed on another node.
- */
- 
-void _MPCI_Internal_packets_Send_process_packet (
-   MPCI_Internal_Remote_operations operation
-);
- 
-/*
- *  _MPCI_Internal_packets_Send_request_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs a remote procedure call so that a
- *  directive operation can be initiated on another node.
- *
- *  This routine is not needed since there are no request
- *  packets to be sent by this manager.
- */
- 
-/*
- *  _MPCI_Internal_packets_Send_response_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs a remote procedure call so that a
- *  directive can be performed on another node.
- *
- *  This routine is not needed since there are no response
- *  packets to be sent by this manager.
- */
- 
-/*
- *
- *  _MPCI_Internal_packets_Process_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs the actions specific to this package for
- *  the request from another node.
- */
- 
-void _MPCI_Internal_packets_Process_packet (
-  MP_packet_Prefix *the_packet_prefix
-);
- 
-/*
- *  _MPCI_Internal_packets_Send_object_was_deleted
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked indirectly by the thread queue
- *  when a proxy has been removed from the thread queue and
- *  the remote node must be informed of this.
- *
- *  This routine is not needed since there are no objects
- *  deleted by this manager.
- */
- 
-/*
- *  _MPCI_Internal_packets_Send_extract_proxy
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked when a task is deleted and it
- *  has a proxy which must be removed from a thread queue and
- *  the remote node must be informed of this.
- *
- *  This routine is not needed since there are no objects
- *  deleted by this manager.
- */
- 
-/*
- *  _MPCI_Internal_packets_Get_packet
- *
- *  DESCRIPTION:
- *
- *  This routine is used to obtain a internal threads mp packet.
- */
- 
- MPCI_Internal_packet *_MPCI_Internal_packets_Get_packet ( void );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/score/include/rtems/score/mppkt.h b/c/src/exec/score/include/rtems/score/mppkt.h
deleted file mode 100644
index 1838d92336..0000000000
--- a/c/src/exec/score/include/rtems/score/mppkt.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/*  mppkt.h
- *
- *  This package is the specification for the Packet Handler.
- *  This handler defines the basic packet and provides
- *  mechanisms to utilize packets based on this prefix.
- *  Packets are the fundamental basis for messages passed between
- *  nodes in an MP system.
- *
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __MP_PACKET_h
-#define __MP_PACKET_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/object.h>
-#include <rtems/score/priority.h>
-#include <rtems/score/watchdog.h>
-
-/*
- *  The following enumerated type defines the packet classes.
- *
- *  NOTE:  In general, each class corresponds to a manager
- *         which supports global operations.  Each manager
- *         defines the set of supported operations.
- */
-
-typedef enum {
-  MP_PACKET_MPCI_INTERNAL    = 0,
-  MP_PACKET_TASKS            = 1,
-  MP_PACKET_MESSAGE_QUEUE    = 2,
-  MP_PACKET_SEMAPHORE        = 3,
-  MP_PACKET_PARTITION        = 4,
-  MP_PACKET_REGION           = 5,
-  MP_PACKET_EVENT            = 6,
-  MP_PACKET_SIGNAL           = 7
-}   MP_packet_Classes;
-
-#define MP_PACKET_CLASSES_FIRST  MP_PACKET_MPCI_INTERNAL
-#define MP_PACKET_CLASSES_LAST   MP_PACKET_SIGNAL
-
-/*
- *  The following record contains the prefix for every packet
- *  passed between nodes in an MP system.
- *
- *  NOTE: This structure is padded to insure that anything
- *        following it is on a 16 byte boundary.  This is
- *        the most stringent structure alignment rule
- *        encountered yet (i960CA).
- */
-
-typedef struct {
-  MP_packet_Classes       the_class;
-  Objects_Id              id;
-  Objects_Id              source_tid;
-  Priority_Control        source_priority;
-  unsigned32              return_code;
-  unsigned32              length;
-  unsigned32              to_convert;
-  Watchdog_Interval       timeout;
-}   MP_packet_Prefix;
-
-/*
- *  An MPCI must support packets of at least this size.
- */
-
-#define MP_PACKET_MINIMUM_PACKET_SIZE  64
-
-/*
- *  The following constant defines the number of unsigned32's
- *  in a packet which must be converted to native format in a
- *  heterogeneous system.  In packets longer than
- *  MP_PACKET_MINIMUN_HETERO_CONVERSION unsigned32's, some of the "extra" data
- *  may a user message buffer which is not automatically endian swapped.
- */
-
-#define MP_PACKET_MINIMUN_HETERO_CONVERSION  \
-  ( sizeof( MP_packet_Prefix ) / sizeof( unsigned32 ) )
-
-#ifndef __RTEMS_APPLICATION__
-#include <rtems/score/mppkt.inl>
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/score/include/rtems/score/object.h b/c/src/exec/score/include/rtems/score/object.h
deleted file mode 100644
index 0198731b96..0000000000
--- a/c/src/exec/score/include/rtems/score/object.h
+++ /dev/null
@@ -1,397 +0,0 @@
-/*  object.h
- *
- *  This include file contains all the constants and structures associated
- *  with the Object Handler.  This Handler provides mechanisms which
- *  can be used to initialize and manipulate all objects which have 
- *  ids.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __OBJECTS_h
-#define __OBJECTS_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/chain.h>
-
-/*
- *  The following type defines the control block used to manage
- *  object names.
- */
-
-typedef void * Objects_Name;
-
-/*
- *  Space for object names is allocated in multiples of this.
- *
- *  NOTE:  Must be a power of 2.  Matches the name manipulation routines.
- */
-
-#define OBJECTS_NAME_ALIGNMENT     sizeof( unsigned32 )
-
-/*
- *  Functions which compare names are prototyped like this.
- */
-
-typedef boolean (*Objects_Name_comparators)(
-  void       * /* name_1 */,
-  void       * /* name_2 */,
-  unsigned32   /* length */
-);
-
-/*
- *  The following type defines the control block used to manage
- *  object IDs.  The format is as follows (0=LSB):
- *
- *     Bits  0 .. 15    = index
- *     Bits 16 .. 25    = node
- *     Bits 26 .. 31    = class
- */
-
-typedef unsigned32 Objects_Id;
-
-#define OBJECTS_INDEX_START_BIT  0
-#define OBJECTS_NODE_START_BIT  16
-#define OBJECTS_CLASS_START_BIT 26
-
-#define OBJECTS_INDEX_MASK      0x0000ffff
-#define OBJECTS_NODE_MASK       0x03ff0000
-#define OBJECTS_CLASS_MASK      0xfc000000
-
-#define OBJECTS_INDEX_VALID_BITS  0x0000ffff
-#define OBJECTS_NODE_VALID_BITS   0x000003ff
-#define OBJECTS_CLASS_VALID_BITS  0x000000cf
-
-/*
- *  This enumerated type is used in the class field of the object ID.
- */
-
-typedef enum {
-  OBJECTS_NO_CLASS                  =  0,
-  OBJECTS_INTERNAL_THREADS          =  1,
-  OBJECTS_RTEMS_TASKS               =  2,
-  OBJECTS_POSIX_THREADS             =  3,
-  OBJECTS_RTEMS_TIMERS              =  4,
-  OBJECTS_RTEMS_SEMAPHORES          =  5,
-  OBJECTS_RTEMS_MESSAGE_QUEUES      =  6,
-  OBJECTS_RTEMS_PARTITIONS          =  7,
-  OBJECTS_RTEMS_REGIONS             =  8,
-  OBJECTS_RTEMS_PORTS               =  9,
-  OBJECTS_RTEMS_PERIODS             = 10,
-  OBJECTS_RTEMS_EXTENSIONS          = 11,
-  OBJECTS_POSIX_KEYS                = 12,
-  OBJECTS_POSIX_INTERRUPTS          = 13,
-  OBJECTS_POSIX_MESSAGE_QUEUES      = 14,
-  OBJECTS_POSIX_MUTEXES             = 15,
-  OBJECTS_POSIX_SEMAPHORES          = 16,
-  OBJECTS_POSIX_CONDITION_VARIABLES = 17
-} Objects_Classes;
- 
-#define OBJECTS_CLASSES_FIRST               OBJECTS_NO_CLASS
-#define OBJECTS_CLASSES_LAST                OBJECTS_POSIX_CONDITION_VARIABLES
-#define OBJECTS_CLASSES_FIRST_THREAD_CLASS  OBJECTS_INTERNAL_THREADS
-#define OBJECTS_CLASSES_LAST_THREAD_CLASS   OBJECTS_POSIX_THREADS
-
-/*
- *  This enumerated type lists the locations which may be returned
- *  by _Objects_Get.  These codes indicate the success of locating
- *  an object with the specified ID.
- */
-
-typedef enum {
-  OBJECTS_LOCAL  = 0,         /* object is local */
-  OBJECTS_REMOTE = 1,         /* object is remote */
-  OBJECTS_ERROR  = 2          /* id was invalid */
-}  Objects_Locations;
-
-/*
- *  The following defines the Object Control Block used to manage
- *  each object local to this node.
- */
-
-typedef struct {
-  Chain_Node    Node;
-  Objects_Id    id;
-  Objects_Name  name;
-}   Objects_Control;
-
-/*
- *  The following defines the structure for the information used to
- *  manage each class of objects.
- */
-
-typedef struct {
-  Objects_Classes   the_class;       /* Class of this object */
-  Objects_Id        minimum_id;      /* minimum valid id of this type */
-  Objects_Id        maximum_id;      /* maximum valid id of this type */
-  unsigned32        maximum;         /* maximum number of objects */
-  Objects_Control **local_table;     /* table of local object pointers */
-  Objects_Name     *name_table;      /* table of local object names */
-  Chain_Control    *global_table;    /* pointer to global table */
-  Chain_Control     Inactive;        /* chain of inactive ctl blocks */
-  boolean           is_string;       /* TRUE if names are strings */
-  unsigned32        name_length;     /* maximum length of names */
-  boolean           is_thread;       /* TRUE if these are threads */
-                                     /*   irregardless of API */
-}   Objects_Information;
-
-/*
- *  The following defines the data storage which contains the
- *  node number of the local node.
- */
-
-SCORE_EXTERN unsigned32  _Objects_Local_node;
-SCORE_EXTERN unsigned32  _Objects_Maximum_nodes;
-
-/*
- *  The following is the list of information blocks for each object
- *  class.  From the ID, we can go to one of these information blocks,
- *  and obtain a pointer to the appropriate object control block.
- */
-
-SCORE_EXTERN Objects_Information 
-    *_Objects_Information_table[OBJECTS_CLASSES_LAST + 1];
-
-/*
- *  The following defines the constant which may be used
- *  with _Objects_Get to manipulate the calling task.
- *
- */
-
-#define OBJECTS_ID_OF_SELF ((Objects_Id) 0)
-
-/*
- *  The following define the constants which may be used in name searches.
- */
-
-#define OBJECTS_SEARCH_ALL_NODES   0
-#define OBJECTS_SEARCH_OTHER_NODES 0x7FFFFFFE
-#define OBJECTS_SEARCH_LOCAL_NODE  0x7FFFFFFF
-#define OBJECTS_WHO_AM_I           0
-
-/*
- * Parameters and return id's for _Objects_Get_next
- */
-
-#define OBJECTS_ID_INITIAL_INDEX   (0)
-#define OBJECTS_ID_FINAL_INDEX     (0xffff)
-
-#define OBJECTS_ID_INITIAL(_class, _node) \
-  _Objects_Build_id( (_class), (_node), OBJECTS_ID_INITIAL_INDEX )
-
-#define OBJECTS_ID_FINAL           ((Objects_Id)~0)
-
-/*
- *  _Objects_Handler_initialization
- *
- *  DESCRIPTION:
- *
- *  This function performs the initialization necessary for this handler.
- *
- */
-
-void _Objects_Handler_initialization(
-  unsigned32 node,
-  unsigned32 maximum_nodes,
-  unsigned32 maximum_global_objects
-);
-
-/*
- *  _Objects_Initialize_information
- *
- *  DESCRIPTION:
- *
- *  This function initializes an object class information record.
- *  SUPPORTS_GLOBAL is TRUE if the object class supports global
- *  objects, and FALSE otherwise.  Maximum indicates the number
- *  of objects required in this class and size indicates the size
- *  in bytes of each control block for this object class.  The
- *  name length and string designator are also set.  In addition,
- *  the class may be a task, therefore this information is also included.
- */
-
-void _Objects_Initialize_information (
-  Objects_Information *information,
-  Objects_Classes      the_class,
-  boolean              supports_global,
-  unsigned32           maximum,
-  unsigned32           size,
-  boolean              is_string,
-  unsigned32           maximum_name_length,
-  boolean              is_task
-);
-
-/*
- *  _Objects_Clear_name
- *
- *  DESCRIPTION:
- *
- *  XXX
- */
- 
-void _Objects_Clear_name(
-  void       *name,
-  unsigned32  length
-);
-
-/*
- *  _Objects_Copy_name_string
- *
- *  DESCRIPTION:
- *
- *  XXX
- */
-
-void _Objects_Copy_name_string(
-  void       *source,
-  void       *destination
-);
-
-/*
- *  _Objects_Copy_name_raw
- *
- *  DESCRIPTION:
- *
- *  XXX
- */
-
-void _Objects_Copy_name_raw(
-  void       *source,
-  void       *destination,
-  unsigned32  length
-);
-
-/*
- *  _Objects_Compare_name_string
- *
- *  DESCRIPTION:
- *
- *  XXX
- */
-
-boolean _Objects_Compare_name_string(
-  void       *name_1,
-  void       *name_2,
-  unsigned32  length
-);
-
-/*
- *  _Objects_Compare_name_raw
- *
- *  DESCRIPTION:
- *
- *  XXX
- */
-
-boolean _Objects_Compare_name_raw(
-  void       *name_1,
-  void       *name_2,
-  unsigned32  length
-);
-/*
- *  _Objects_Name_to_id
- *
- *  DESCRIPTION:
- *
- *  This function implements the common portion of the object
- *  identification directives.  This directive returns the object
- *  id associated with name.  If more than one object of this class
- *  is named name, then the object to which the id belongs is
- *  arbitrary.  Node indicates the extent of the search for the
- *  id of the object named name.  If the object class supports global
- *  objects, then the search can be limited to a particular node
- *  or allowed to encompass all nodes.
- *
- */
-
-typedef enum {
-  OBJECTS_SUCCESSFUL,
-  OBJECTS_INVALID_NAME,
-  OBJECTS_INVALID_NODE
-} Objects_Name_to_id_errors;
-
-#define OBJECTS_NAME_ERRORS_FIRST OBJECTS_SUCCESSFUL
-#define OBJECTS_NAME_ERRORS_LAST  OBJECTS_INVALID_NODE
-
-Objects_Name_to_id_errors _Objects_Name_to_id(
-  Objects_Information *information,
-  Objects_Name         name,
-  unsigned32           node,
-  Objects_Id          *id
-);
-
-/*
- *  _Objects_Get
- *
- *  DESCRIPTION:
- *
- *  This function maps object ids to object control blocks.
- *  If id corresponds to a local object, then it returns
- *  the_object control pointer which maps to id and location
- *  is set to OBJECTS_LOCAL.  If the object class supports global
- *  objects and the object id is global and resides on a remote
- *  node, then location is set to OBJECTS_REMOTE, and the_object
- *  is undefined.  Otherwise, location is set to OBJECTS_ERROR
- *  and the_object is undefined.
- *
- */
-
-Objects_Control *_Objects_Get (
-  Objects_Information *information,
-  Objects_Id           id,
-  Objects_Locations   *location
-);
-
-/*
- *  _Objects_Get_next
- *
- *  DESCRIPTION:
- *
- *  Like _Objects_Get, but is used to find "next" open object.
- *
- */
-
-Objects_Control *_Objects_Get_next(
-    Objects_Information *information,
-    Objects_Id           id,
-    Objects_Locations   *location_p,
-    Objects_Id          *next_id_p
-);
-
-/*
- *  _Objects_Get_information
- *
- *  DESCRIPTION:
- *
- *  Returns the information control block for the class of objects
- *  corresponding to this id.
- */
-
-Objects_Information *_Objects_Get_information(
-  Objects_Id  id
-);
-  
-/*
- *  Pieces of object.inl are promoted out to the user
- */
-
-#include <rtems/score/object.inl>
-#include <rtems/score/objectmp.h>
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/score/include/rtems/score/objectmp.h b/c/src/exec/score/include/rtems/score/objectmp.h
deleted file mode 100644
index e307ca4264..0000000000
--- a/c/src/exec/score/include/rtems/score/objectmp.h
+++ /dev/null
@@ -1,152 +0,0 @@
-/*  objectmp.h
- *
- *  This include file contains all the constants and structures associated
- *  with the manipulation of Global RTEMS Objects.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_OBJECTS_MP_h
-#define __RTEMS_OBJECTS_MP_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- *  This defines the Global Object Control Block used to manage
- *  objects resident on other nodes.
- */
-
-typedef struct {
-  Objects_Control Object;
-  unsigned32      name;     /* XXX broken but works */
-  /* XXX If any API is MP with variable length names .. BOOM!!!! */
-}   Objects_MP_Control;
-
-/*
- *  _Objects_MP_Handler_initialization
- *
- *  DESCRIPTION:
- *
- *  This routine intializes the inactive global object chain
- *  based on the maximum number of global objects configured.
- */
-
-void _Objects_MP_Handler_initialization (
-  unsigned32 node,
-  unsigned32 maximum_nodes,
-  unsigned32 maximum_global_objects
-);
-
-/*PAGE
- *
- *  _Objects_MP_Open
- *
- *  DESCRIPTION:
- *
- *  This routine place the specified global object in the 
- *  specified information table.  
- */
- 
-void _Objects_MP_Open (
-  Objects_Information *information,
-  Objects_MP_Control  *the_global_object,
-  unsigned32           the_name,      /* XXX -- wrong for variable */
-  Objects_Id           the_id
-);
-
-/*
- *  _Objects_MP_Allocate_and_open
- *
- *  DESCRIPTION:
- *
- *  This routine allocates a global object control block
- *  and places it in the specified information table.  If the
- *  allocation fails, then is_fatal_error determines the
- *  error processing actions taken.
- */
-
-boolean _Objects_MP_Allocate_and_open (
-  Objects_Information *information,
-  unsigned32           the_name,     /* XXX -- wrong for variable length */
-  Objects_Id           the_id,
-  boolean              is_fatal_error
-);
-
-/*
- *  _Objects_MP_Close
- *
- *  DESCRIPTION:
- *
- *  This routine removes a global object from the specified
- *  information table and deallocates the global object control block.
- */
-
-void _Objects_MP_Close (
-  Objects_Information *information,
-  Objects_Id           the_id
-);
-
-/*
- *  _Objects_MP_Global_name_search
- *
- *  DESCRIPTION:
- *
- *  This routine looks for the object with the_name in the global
- *  object tables indicated by information.  It returns the ID of the
- *  object with that name if one is found.
- */
-
-Objects_Name_to_id_errors _Objects_MP_Global_name_search (
-  Objects_Information *information,
-  Objects_Name         the_name,
-  unsigned32           nodes_to_search,
-  Objects_Id          *the_id
-);
-
-/*
- *  _Objects_MP_Is_remote
- *
- *  DESCRIPTION:
- *
- *  This function searches the Global Object Table managed
- *  by information for the object indicated by ID.  If the object
- *  is found, then location is set to objects_remote, otherwise
- *  location is set to objects_error.  In both cases, the_object
- *  is undefined.
- */
-
-void _Objects_MP_Is_remote (
-  Objects_Information  *information,
-  Objects_Id            the_id,
-  Objects_Locations    *location,
-  Objects_Control     **the_object
-);
-
-/*
- *  The following chain header is used to manage the set of
- *  inactive global object control blocks.
- */
-
-SCORE_EXTERN unsigned32     _Objects_MP_Maximum_global_objects;
-SCORE_EXTERN Chain_Control  _Objects_MP_Inactive_global_objects;
-
-#ifndef __RTEMS_APPLICATION__
-#include <rtems/score/objectmp.inl>
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/score/include/rtems/score/priority.h b/c/src/exec/score/include/rtems/score/priority.h
deleted file mode 100644
index 7241888242..0000000000
--- a/c/src/exec/score/include/rtems/score/priority.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/*  priority.h
- *
- *  This include file contains all thread priority manipulation routines.
- *  This Handler provides mechanisms which can be used to
- *  initialize and manipulate thread priorities.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __PRIORITY_h
-#define __PRIORITY_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- *  The following type defines the control block used to manage
- *  thread priorities.
- *
- *  NOTE: Priority 0 is reserved for internal threads only.
- */
-
-typedef unsigned32 Priority_Control;
-
-#define PRIORITY_MINIMUM      0         /* highest thread priority */
-#define PRIORITY_MAXIMUM      255       /* lowest thread priority */
-
-/*
- *  The following record defines the information associated with
- *  each thread to manage its interaction with the priority bit maps.
- */
-
-typedef struct {
-  Priority_Bit_map_control *minor;        /* addr of minor bit map slot */
-  Priority_Bit_map_control  ready_major;  /* priority bit map ready mask */
-  Priority_Bit_map_control  ready_minor;  /* priority bit map ready mask */
-  Priority_Bit_map_control  block_major;  /* priority bit map block mask */
-  Priority_Bit_map_control  block_minor;  /* priority bit map block mask */
-}   Priority_Information;
-
-/*
- *  The following data items are the priority bit map.
- *  Each of the sixteen bits used in the _Priority_Major_bit_map is
- *  associated with one of the sixteen entries in the _Priority_Bit_map.
- *  Each bit in the _Priority_Bit_map indicates whether or not there are
- *  threads ready at a particular priority.  The mapping of
- *  individual priority levels to particular bits is processor
- *  dependent as is the value of each bit used to indicate that
- *  threads are ready at that priority.
- */
-
-SCORE_EXTERN volatile Priority_Bit_map_control _Priority_Major_bit_map;
-SCORE_EXTERN Priority_Bit_map_control 
-               _Priority_Bit_map[16] CPU_STRUCTURE_ALIGNMENT;
-
-/*
- *  The definition of the Priority_Bit_map_control type is CPU dependent.
- *
- */
-
-/*
- *  Priority Bitfield Manipulation Routines
- *
- *  NOTE:
- *
- *  These may simply be pass throughs to CPU dependent routines.
- */
- 
-#if ( CPU_USE_GENERIC_BITFIELD_CODE == FALSE )
-
-#define _Priority_Mask( _bit_number ) \
-  _CPU_Priority_Mask( _bit_number )
- 
-#define _Priority_Bits_index( _priority ) \
-  _CPU_Priority_bits_index( _priority )
-
-#endif
- 
-#ifndef __RTEMS_APPLICATION__
-#include <rtems/score/priority.inl>
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/score/include/rtems/score/stack.h b/c/src/exec/score/include/rtems/score/stack.h
deleted file mode 100644
index 1fc4a13966..0000000000
--- a/c/src/exec/score/include/rtems/score/stack.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*  stack.h
- *
- *  This include file contains all information about the thread
- *  Stack Handler.  This Handler provides mechanisms which can be used to
- *  initialize and utilize stacks.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __STACK_h
-#define __STACK_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- *  The following constant defines the minimum stack size which every
- *  thread must exceed.
- */
-
-#define STACK_MINIMUM_SIZE  CPU_STACK_MINIMUM_SIZE
-
-/*
- *  The following defines the control block used to manage each stack.
- */
-
-typedef struct {
-  unsigned32  size;        /* stack size */
-  void       *area;        /* low memory addr of stack */
-}   Stack_Control;
-
-#ifndef __RTEMS_APPLICATION__
-#include <rtems/score/stack.inl>
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/score/include/rtems/score/states.h b/c/src/exec/score/include/rtems/score/states.h
deleted file mode 100644
index a0d7ed8ab8..0000000000
--- a/c/src/exec/score/include/rtems/score/states.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*  states.h
- *
- *  This include file contains thread execution state information.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_STATES_h
-#define __RTEMS_STATES_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- *  The following type defines the control block used to manage a
- *  thread's state.
- */
-
-typedef unsigned32 States_Control;
-
-/*
- *  The following constants define the individual states which may be
- *  be used to compose and manipulate a thread's state.
- */
-
-#define STATES_ALL_SET                         0xfffff /* all states */
-#define STATES_READY                           0x00000 /* ready to run */
-#define STATES_DORMANT                         0x00001 /* created not started */
-#define STATES_SUSPENDED                       0x00002 /* waiting for resume */
-#define STATES_TRANSIENT                       0x00004 /* in transition */
-#define STATES_DELAYING                        0x00008 /* wait for timeout */
-#define STATES_WAITING_FOR_TIME                0x00010 /* wait for TOD */
-#define STATES_WAITING_FOR_BUFFER              0x00020 
-#define STATES_WAITING_FOR_SEGMENT             0x00040
-#define STATES_WAITING_FOR_MESSAGE             0x00080
-#define STATES_WAITING_FOR_EVENT               0x00100
-#define STATES_WAITING_FOR_SEMAPHORE           0x00200
-#define STATES_WAITING_FOR_MUTEX               0x00400
-#define STATES_WAITING_FOR_CONDITION_VARIABLE  0x00800
-#define STATES_WAITING_FOR_JOIN_AT_EXIT        0x01000
-#define STATES_WAITING_FOR_RPC_REPLY           0x02000
-#define STATES_WAITING_FOR_PERIOD              0x04000
-#define STATES_WAITING_FOR_SIGNAL              0x08000
-#define STATES_INTERRUPTIBLE_BY_SIGNAL         0x10000
-
-#define STATES_LOCALLY_BLOCKED ( STATES_WAITING_FOR_BUFFER             | \
-                                 STATES_WAITING_FOR_SEGMENT            | \
-                                 STATES_WAITING_FOR_MESSAGE            | \
-                                 STATES_WAITING_FOR_SEMAPHORE          | \
-                                 STATES_WAITING_FOR_MUTEX              | \
-                                 STATES_WAITING_FOR_CONDITION_VARIABLE | \
-                                 STATES_WAITING_FOR_JOIN_AT_EXIT       | \
-                                 STATES_WAITING_FOR_SIGNAL             )
-
-#define STATES_WAITING_ON_THREAD_QUEUE \
-                               ( STATES_LOCALLY_BLOCKED         | \
-                                 STATES_WAITING_FOR_RPC_REPLY   )
-
-#define STATES_BLOCKED         ( STATES_DELAYING                | \
-                                 STATES_WAITING_FOR_TIME        | \
-                                 STATES_WAITING_FOR_PERIOD      | \
-                                 STATES_WAITING_FOR_EVENT       | \
-                                 STATES_WAITING_ON_THREAD_QUEUE | \
-                                 STATES_INTERRUPTIBLE_BY_SIGNAL )
-
-#ifndef __RTEMS_APPLICATION__
-#include <rtems/score/states.inl>
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/score/include/rtems/score/sysstate.h b/c/src/exec/score/include/rtems/score/sysstate.h
deleted file mode 100644
index 8451894e97..0000000000
--- a/c/src/exec/score/include/rtems/score/sysstate.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*  sysstates.h
- *
- *  This include file contains information regarding the system state.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_SYSTEM_STATE_h
-#define __RTEMS_SYSTEM_STATE_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* types */
-
-/* enumerated constants */
-
-/*
- *  The following type defines the possible system states.
- */
-
-typedef enum {
-  SYSTEM_STATE_BEFORE_INITIALIZATION,   /* start -> end of 1st init part */
-  SYSTEM_STATE_BEFORE_MULTITASKING,     /* end of 1st -> beginning of 2nd */
-  SYSTEM_STATE_BEGIN_MULTITASKING,      /* just before multitasking starts */
-  SYSTEM_STATE_UP,                      /* normal operation */
-  SYSTEM_STATE_SHUTDOWN,                /* shutdown */
-  SYSTEM_STATE_FAILED                   /* fatal error occurred */
-} System_state_Codes;
-
-#define SYSTEM_STATE_CODES_FIRST SYSTEM_STATE_BEFORE_INITIALIZATION
-#define SYSTEM_STATE_CODES_LAST  SYSTEM_STATE_FAILED
-
-/*
- *  The following variable indicates whether or not this is 
- *  an multiprocessing system.
- */
- 
-SCORE_EXTERN boolean _System_state_Is_multiprocessing;
-
-/*
- *  The following variable contains the current system state.
- */
-
-SCORE_EXTERN System_state_Codes _System_state_Current;
-
-/*
- *  Make it possible for the application to get the system state information.
- */
-
-#include <rtems/score/sysstate.inl>
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/score/include/rtems/score/thread.h b/c/src/exec/score/include/rtems/score/thread.h
deleted file mode 100644
index da6fa76bd0..0000000000
--- a/c/src/exec/score/include/rtems/score/thread.h
+++ /dev/null
@@ -1,622 +0,0 @@
-/*  thread.h
- *
- *  This include file contains all constants and structures associated
- *  with the thread control block.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __THREAD_h
-#define __THREAD_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/context.h>
-#include <rtems/score/cpu.h>
-#include <rtems/score/mppkt.h>
-#include <rtems/score/object.h>
-#include <rtems/score/priority.h>
-#include <rtems/score/stack.h>
-#include <rtems/score/states.h>
-#include <rtems/score/tod.h>
-#include <rtems/score/tqdata.h>
-#include <rtems/score/watchdog.h>
-
-/*
- *  The following defines the "return type" of a thread.
- */
-
-typedef void Thread;
-
-/*
- *  The following defines the ways in which the entry point for a
- *  thread can be invoked.  Basically, it can be passed any
- *  combination/permutation of a pointer and an unsigned32 value.
- *
- *  NOTE: For now, we are ignoring the return type.
- */
-
-typedef enum {
-  THREAD_START_NUMERIC,
-  THREAD_START_POINTER,
-  THREAD_START_BOTH_POINTER_FIRST,
-  THREAD_START_BOTH_NUMERIC_FIRST
-} Thread_Start_types;
-
-typedef Thread ( *Thread_Entry )();   /* basic type */
-
-typedef Thread ( *Thread_Entry_numeric )( unsigned32 );
-typedef Thread ( *Thread_Entry_pointer )( void * );
-typedef Thread ( *Thread_Entry_both_pointer_first )( void *, unsigned32 );
-typedef Thread ( *Thread_Entry_both_numeric_first )( unsigned32, void * );
-
-/*
- *  The following lists the algorithms used to manage the thread cpu budget.
- *
- *  Reset Timeslice:   At each context switch, reset the time quantum.
- *  Exhaust Timeslice: Only reset the quantum once it is consumed.
- *  Callout:           Execute routine when budget is consumed.
- */
-
-typedef enum {
-  THREAD_CPU_BUDGET_ALGORITHM_NONE,
-  THREAD_CPU_BUDGET_ALGORITHM_RESET_TIMESLICE,
-  THREAD_CPU_BUDGET_ALGORITHM_EXHAUST_TIMESLICE,
-  THREAD_CPU_BUDGET_ALGORITHM_CALLOUT
-}  Thread_CPU_budget_algorithms;
-
-typedef struct Thread_Control_struct Thread_Control;
-
-typedef void (*Thread_CPU_budget_algorithm_callout )( Thread_Control * );
-
-/*
- *  The following structure contains the information which defines
- *  the starting state of a thread.
- */
-
-typedef struct {
-  Thread_Entry         entry_point;      /* starting thread address         */
-  Thread_Start_types   prototype;        /* how task is invoked             */
-  void                *pointer_argument; /* pointer argument                */
-  unsigned32           numeric_argument; /* numeric argument                */
-                                         /* initial execution modes         */
-  boolean              is_preemptible;
-  Thread_CPU_budget_algorithms          budget_algorithm;
-  Thread_CPU_budget_algorithm_callout   budget_callout;
-  unsigned32           isr_level;
-  Priority_Control     initial_priority; /* initial priority                */
-  boolean              core_allocated_stack;
-  Stack_Control        Initial_stack;    /* stack information               */
-  void                *fp_context;       /* initial FP context area address */
-  void                *stack;            /* initial stack area address      */
-}   Thread_Start_information;
-
-/*
- *  The following structure contains the information necessary to manage
- *  a thread which it is  waiting for a resource.
- */
-
-#define THREAD_STATUS_PROXY_BLOCKING 0x1111111
-
-typedef struct {
-  Objects_Id            id;              /* waiting on this object       */
-  unsigned32            count;           /* "generic" fields to be used */
-  void                 *return_argument; /*   when blocking */
-  void                 *return_argument_1;
-  unsigned32            option;
-
-  /*
-   *  NOTE: The following assumes that all API return codes can be
-   *        treated as an unsigned32.  
-   */
-  unsigned32            return_code;     /* status for thread awakened   */
-
-  Chain_Control         Block2n;         /* 2 - n priority blocked chain */
-  Thread_queue_Control *queue;           /* pointer to thread queue      */
-}   Thread_Wait_information;
-
-/*
- *  The following defines the control block used to manage
- *  each thread proxy.
- *
- *  NOTE: It is critical that proxies and threads have identical
- *        memory images for the shared part.
- */
-
-typedef struct {
-  Objects_Control          Object;
-  States_Control           current_state;
-  Priority_Control         current_priority;
-  Priority_Control         real_priority;
-  unsigned32               resource_count;
-  Thread_Wait_information  Wait;
-  Watchdog_Control         Timer;
-  MP_packet_Prefix        *receive_packet;
-     /****************** end of common block ********************/
-  Chain_Node               Active;
-}   Thread_Proxy_control;
-
-
-/*
- *  The following record defines the control block used
- *  to manage each thread.
- *
- *  NOTE: It is critical that proxies and threads have identical
- *        memory images for the shared part.
- */
-
-typedef enum {
-  THREAD_API_RTEMS,
-  THREAD_API_POSIX
-}  Thread_APIs;
-
-#define THREAD_API_FIRST THREAD_API_RTEMS
-#define THREAD_API_LAST  THREAD_API_POSIX
-
-struct Thread_Control_struct {
-  Objects_Control                       Object;
-  States_Control                        current_state;
-  Priority_Control                      current_priority;
-  Priority_Control                      real_priority;
-  unsigned32                            resource_count;
-  Thread_Wait_information               Wait;
-  Watchdog_Control                      Timer;
-  MP_packet_Prefix                     *receive_packet;
-     /****************** end of common block ********************/
-  boolean                               is_global;
-  boolean                               do_post_task_switch_extension;
-
-  boolean                               is_preemptible;
-  unsigned32                            cpu_time_budget;
-  Thread_CPU_budget_algorithms          budget_algorithm;
-  Thread_CPU_budget_algorithm_callout   budget_callout;
-
-  unsigned32                            ticks_executed;
-  Chain_Control                        *ready;
-  Priority_Information                  Priority_map;
-  Thread_Start_information              Start;
-  Context_Control                       Registers;
-  void                                 *fp_context;
-  void                                 *API_Extensions[ THREAD_API_LAST + 1 ];
-  void                                **extensions;
-};
-
-/*
- *  The following defines the information control block used to
- *  manage this class of objects.
- */
- 
-SCORE_EXTERN Objects_Information _Thread_Internal_information;
- 
-/*
- *  The following define the thread control pointers used to access
- *  and manipulate the idle thread.
- */
- 
-SCORE_EXTERN Thread_Control *_Thread_Idle;
-
-/*
- *  The following context area contains the context of the "thread"
- *  which invoked the start multitasking routine.  This context is 
- *  restored as the last action of the stop multitasking routine.  Thus
- *  control of the processor can be returned to the environment
- *  which initiated the system.
- */
- 
-SCORE_EXTERN Context_Control _Thread_BSP_context;
- 
-/*
- *  The following declares the dispatch critical section nesting
- *  counter which is used to prevent context switches at inopportune
- *  moments.
- */
-
-SCORE_EXTERN unsigned32 _Thread_Dispatch_disable_level;
-
-/*
- *  If this is non-zero, then the post-task switch extension
- *  is run regardless of the state of the per thread flag.
- */
-
-SCORE_EXTERN unsigned32 _Thread_Do_post_task_switch_extension;
-
-/*
- *  The following holds how many user extensions are in the system.  This
- *  is used to determine how many user extension data areas to allocate
- *  per thread.
- */
-
-SCORE_EXTERN unsigned32 _Thread_Maximum_extensions;
-
-/*
- *  The following is used to manage the length of a timeslice quantum.
- */
-
-SCORE_EXTERN unsigned32 _Thread_Ticks_per_timeslice;
-
-/*
- *  The following points to the array of FIFOs used to manage the
- *  set of ready threads.
- */
-
-SCORE_EXTERN Chain_Control *_Thread_Ready_chain;
-
-/*
- *  The following points to the thread which is currently executing.
- *  This thread is implicitly manipulated by numerous directives.
- */
-
-SCORE_EXTERN Thread_Control *_Thread_Executing;
-
-/*
- *  The following points to the highest priority ready thread
- *  in the system.  Unless the current thread is not preemptibl,
- *  then this thread will be context switched to when the next
- *  dispatch occurs.
- */
-
-SCORE_EXTERN Thread_Control *_Thread_Heir;
-
-/*
- *  The following points to the thread whose floating point
- *  context is currently loaded.
- */
-
-SCORE_EXTERN Thread_Control *_Thread_Allocated_fp;
-
-/*
- *  _Thread_Handler_initialization
- *
- *  DESCRIPTION:
- *
- *  This routine performs the initialization necessary for this handler.
- */
-
-void _Thread_Handler_initialization (
-  unsigned32   ticks_per_timeslice,
-  unsigned32   maximum_extensions,
-  unsigned32   maximum_proxies
-);
-
-/*
- *  _Thread_Create_idle
- *
- *  DESCRIPTION:
- *
- *  This routine creates the idle thread.
- *
- *  WARNING!! No thread should be created before this one.
- */
- 
-void _Thread_Create_idle( void );
-
-/*
- *  _Thread_Start_multitasking
- *
- *  DESCRIPTION:
- *
- *  This routine initiates multitasking.  It is invoked only as
- *  part of initialization and its invocation is the last act of
- *  the non-multitasking part of the system initialization.
- */
-
-void _Thread_Start_multitasking( void );
-
-/*
- *  _Thread_Dispatch
- *
- *  DESCRIPTION:
- *
- *  This routine is responsible for transferring control of the
- *  processor from the executing thread to the heir thread.  As part
- *  of this process, it is responsible for the following actions:
- *
- *     + saving the context of the executing thread
- *     + restoring the context of the heir thread
- *     + dispatching any signals for the resulting executing thread
- */
-
-void _Thread_Dispatch( void );
-
-/*
- *  _Thread_Initialize
- *
- *  DESCRIPTION:
- *
- *  XXX
- *
- *  NOTES:
- *
- *  If stack_area is NULL, it is allocated from the workspace.
- *
- *  If the stack is allocated from the workspace, then it is guaranteed to be
- *  of at least minimum size.
- */
-
-boolean _Thread_Initialize(
-  Objects_Information                  *information,
-  Thread_Control                       *the_thread,
-  void                                 *stack_area,
-  unsigned32                            stack_size,
-  boolean                               is_fp,
-  Priority_Control                      priority,
-  boolean                               is_preemptible,
-  Thread_CPU_budget_algorithms          budget_algorithm,
-  Thread_CPU_budget_algorithm_callout   budget_callout,
-  unsigned32                            isr_level,
-  Objects_Name                          name
-);
-
-/*
- *  _Thread_Start
- *
- *  DESCRIPTION:
- *
- *  XXX
- */
- 
-boolean _Thread_Start(
-  Thread_Control           *the_thread,
-  Thread_Start_types        the_prototype,
-  void                     *entry_point,
-  void                     *pointer_argument,
-  unsigned32                numeric_argument
-);
-
-/*
- *  _Thread_Restart
- *
- *  DESCRIPTION:
- *
- *  XXX
- */
- 
-/* XXX multiple task arg profiles */
- 
-boolean _Thread_Restart(
-  Thread_Control           *the_thread,
-  void                     *pointer_argument,
-  unsigned32                numeric_argument
-);
-
-/*
- *  _Thread_Close
- *
- *  DESCRIPTION:
- *
- *  XXX
- */
- 
-void _Thread_Close(
-  Objects_Information  *information,
-  Thread_Control       *the_thread
-);
-
-/*
- *  _Thread_Ready
- *
- *  DESCRIPTION:
- *
- *  This routine removes any set states for the_thread.  It performs
- *  any necessary scheduling operations including the selection of
- *  a new heir thread.
- */
-
-void _Thread_Ready(
-  Thread_Control *the_thread
-);
-
-/*
- *  _Thread_Clear_state
- *
- *  DESCRIPTION:
- *
- *  This routine clears the indicated STATES for the_thread.  It performs
- *  any necessary scheduling operations including the selection of
- *  a new heir thread.
- */
-
-void _Thread_Clear_state(
-  Thread_Control *the_thread,
-  States_Control  state
-);
-
-/*
- *  _Thread_Set_state
- *
- *  DESCRIPTION:
- *
- *  This routine sets the indicated states for the_thread.  It performs
- *  any necessary scheduling operations including the selection of
- *  a new heir thread.
- *
- */
-
-void _Thread_Set_state(
-  Thread_Control *the_thread,
-  States_Control  state
-);
-
-/*
- *  _Thread_Set_transient
- *
- *  DESCRIPTION:
- *
- *  This routine sets the TRANSIENT state for the_thread.  It performs
- *  any necessary scheduling operations including the selection of
- *  a new heir thread.
- */
-
-void _Thread_Set_transient(
-  Thread_Control *the_thread
-);
-
-/*
- *  _Thread_Reset_timeslice
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked upon expiration of the currently
- *  executing thread's timeslice.  If no other thread's are ready
- *  at the priority of the currently executing thread, then the
- *  executing thread's timeslice is reset.  Otherwise, the
- *  currently executing thread is placed at the rear of the
- *  FIFO for this priority and a new heir is selected.
- */
-
-void _Thread_Reset_timeslice( void );
-
-/*
- *  _Thread_Tickle_timeslice
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked as part of processing each clock tick.
- *  It is responsible for determining if the current thread allows
- *  timeslicing and, if so, when its timeslice expires.
- */
-
-void _Thread_Tickle_timeslice( void );
-
-/*
- *  _Thread_Yield_processor
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked when a thread wishes to voluntarily
- *  transfer control of the processor to another thread of equal
- *  or greater priority.
- */
-
-void _Thread_Yield_processor( void );
-
-/*
- *  _Thread_Load_environment
- *
- *  DESCRIPTION:
- *
- *  This routine initializes the context of the_thread to its
- *  appropriate starting state.
- */
-
-void _Thread_Load_environment(
-  Thread_Control *the_thread
-);
-
-/*
- *  _Thread_Handler
- *
- *  DESCRIPTION:
- *
- *  This routine is the wrapper function for all threads.  It is
- *  the starting point for all threads.  The user provided thread
- *  entry point is invoked by this routine.  Operations
- *  which must be performed immediately before and after the user's
- *  thread executes are found here.
- */
-
-void _Thread_Handler( void );
-
-/*
- *  _Thread_Delay_ended
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked when a thread must be unblocked at the
- *  end of a time based delay (i.e. wake after or wake when).
- */
-
-void _Thread_Delay_ended(
-  Objects_Id  id,
-  void       *ignored
-);
-
-/*
- *  _Thread_Change_priority
- *
- *  DESCRIPTION:
- *
- *  This routine changes the current priority of the_thread to
- *  new_priority.  It performs any necessary scheduling operations
- *  including the selection of a new heir thread.
- */
-
-void _Thread_Change_priority (
-  Thread_Control   *the_thread,
-  Priority_Control  new_priority,
-  boolean           prepend_it
-);
-
-/*
- *  _Thread_Set_priority
- *
- *  DESCRIPTION:
- *
- *  This routine updates the priority related fields in the_thread
- *  control block to indicate the current priority is now new_priority.
- */
-
-void _Thread_Set_priority(
-  Thread_Control   *the_thread,
-  Priority_Control  new_priority
-);
-
-/*
- *  _Thread_Evaluate_mode
- *
- *  DESCRIPTION:
- *
- *  This routine XXX
- */
-
-boolean _Thread_Evaluate_mode( void );
-
-/*
- *  _Thread_Get
- *
- *  NOTE:  If we are not using static inlines, this must be a real
- *         subroutine call.
- */
- 
-#ifndef USE_INLINES
-Thread_Control *_Thread_Get (
-  Objects_Id           id,
-  Objects_Locations   *location
-);
-#endif
-
-/*
- *  _Thread_Idle_body
- *
- *  DESCRIPTION:
- *
- *  This routine is the body of the system idle thread.
- */
- 
-#if (CPU_PROVIDES_IDLE_THREAD_BODY == FALSE)
-Thread _Thread_Idle_body(
-  unsigned32 ignored
-);
-#endif
-
-#ifndef __RTEMS_APPLICATION__
-#include <rtems/score/thread.inl>
-#endif
-#include <rtems/score/threadmp.h>
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/score/include/rtems/score/threadmp.h b/c/src/exec/score/include/rtems/score/threadmp.h
deleted file mode 100644
index 497bdc8c5b..0000000000
--- a/c/src/exec/score/include/rtems/score/threadmp.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*  threadmp.h
- *
- *  This include file contains the specification for all routines
- *  and data specific to the multiprocessing portion of the thread package.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_THREAD_MP_h
-#define __RTEMS_THREAD_MP_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- *  _Thread_MP_Handler_initialization
- *
- *  DESCRIPTION:
- *
- *  This routine initializes the multiprocessing portion of the Thread Handler.
- */
-
-void _Thread_MP_Handler_initialization (
-  unsigned32 maximum_proxies
-);
-
-/*
- *  _Thread_MP_Allocate_proxy
- *
- *  DESCRIPTION:
- *
- *  This  allocates a proxy control block from
- *  the inactive chain of free proxy control blocks.
- *
- *  NOTE: This function returns a thread control pointer
- *        because proxies are substitutes for remote threads.
- */
-
-Thread_Control *_Thread_MP_Allocate_proxy (
-  States_Control the_state
-);
-
-/*
- *  _Thread_MP_Find_proxy
- *
- *  DESCRIPTION:
- *
- *  This function removes the proxy control block for the specified
- *  id from the active chain of proxy control blocks.
- */
-
-Thread_Control *_Thread_MP_Find_proxy (
-  Objects_Id the_id
-);
-
-/*
- *  The following is used to determine when the multiprocessing receive
- *  thread is executing so that a proxy can be allocated instead of
- *  blocking the multiprocessing receive thread.
- */
-
-SCORE_EXTERN Thread_Control *_Thread_MP_Receive;
-
-/*
- * The following chains are used to manage proxies.
- */
-
-SCORE_EXTERN Chain_Control _Thread_MP_Active_proxies;
-SCORE_EXTERN Chain_Control _Thread_MP_Inactive_proxies;
-
-#ifndef __RTEMS_APPLICATION__
-#include <rtems/score/threadmp.inl>
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/score/include/rtems/score/threadq.h b/c/src/exec/score/include/rtems/score/threadq.h
deleted file mode 100644
index d3a0f58ad1..0000000000
--- a/c/src/exec/score/include/rtems/score/threadq.h
+++ /dev/null
@@ -1,301 +0,0 @@
-/*  threadq.h
- *
- *  This include file contains all the constants and structures associated
- *  with the manipulation of objects.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __THREAD_QUEUE_h
-#define __THREAD_QUEUE_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/tqdata.h>
-
-#include <rtems/score/object.h>
-#include <rtems/score/thread.h>
-#include <rtems/score/watchdog.h>
-
-/*
- *  Constant for indefinite wait.
- */
- 
-#define THREAD_QUEUE_WAIT_FOREVER  WATCHDOG_NO_TIMEOUT
-
-/*
- *  The following type defines the callout used when a remote task
- *  is extracted from a local thread queue.
- */
-
-typedef void ( *Thread_queue_Flush_callout )(
-                 Thread_Control *
-             );
-
-/*
- *  The following type defines the callout used when a local task
- *  is extracted from a remote thread queue (i.e. it's proxy must
- *  extracted from the remote queue).
- */
- 
-typedef void ( *Thread_queue_Extract_callout )(
-                 Thread_Control *
-             );
-
-SCORE_EXTERN Thread_queue_Extract_callout  
-  _Thread_queue_Extract_table[ OBJECTS_CLASSES_LAST + 1 ];
-
-/*
- *  _Thread_queue_Dequeue
- *
- *  DESCRIPTION:
- *
- *  This function returns a pointer to a thread waiting on
- *  the_thread_queue.  The selection of this thread is based on
- *  the discipline of the_thread_queue.  If no threads are waiting
- *  on the_thread_queue, then NULL is returned.
- */
-
-Thread_Control *_Thread_queue_Dequeue(
-  Thread_queue_Control *the_thread_queue
-);
-
-/*
- *  _Thread_queue_Enqueue
- *
- *  DESCRIPTION:
- *
- *  This routine enqueues the currently executing thread on
- *  the_thread_queue with an optional timeout.
- */
-
-void _Thread_queue_Enqueue(
-  Thread_queue_Control *the_thread_queue,
-  Watchdog_Interval     timeout
-);
-
-/*
- *  _Thread_queue_Extract
- *
- *  DESCRIPTION:
- *
- *  This routine removes the_thread from the_thread_queue
- *  and cancels any timeouts associated with this blocking.
- */
-
-void _Thread_queue_Extract(
-  Thread_queue_Control *the_thread_queue,
-  Thread_Control       *the_thread
-);
-
-/*
- *  _Thread_queue_Extract_with_proxy
- *
- *  DESCRIPTION:
- *
- *  This routine extracts the_thread from the_thread_queue
- *  and insures that if there is a proxy for this task on 
- *  another node, it is also dealt with.
- */
- 
-boolean _Thread_queue_Extract_with_proxy(
-  Thread_Control       *the_thread
-);
-
-/*
- *  _Thread_queue_First
- *
- *  DESCRIPTION:
- *
- *  This function returns a pointer to the "first" thread
- *  on the_thread_queue.  The "first" thread is selected
- *  based on the discipline of the_thread_queue.
- */
-
-Thread_Control *_Thread_queue_First(
-  Thread_queue_Control *the_thread_queue
-);
-
-/*
- *  _Thread_queue_Flush
- *
- *  DESCRIPTION:
- *
- *  This routine unblocks all threads blocked on the_thread_queue
- *  and cancels any associated timeouts.
- */
-
-void _Thread_queue_Flush(
-  Thread_queue_Control       *the_thread_queue,
-  Thread_queue_Flush_callout  remote_extract_callout,
-  unsigned32                  status
-);
-
-/*
- *  _Thread_queue_Initialize
- *
- *  DESCRIPTION:
- *
- *  This routine initializes the_thread_queue based on the
- *  discipline indicated in attribute_set.  The state set on
- *  threads which block on the_thread_queue is state.
- */
-
-void _Thread_queue_Initialize(
-  Thread_queue_Control         *the_thread_queue,
-  Objects_Classes               the_class,
-  Thread_queue_Disciplines      the_discipline,
-  States_Control                state,
-  Thread_queue_Extract_callout  proxy_extract_callout,
-  unsigned32                    timeout_status
-);
-
-/*
- *  _Thread_queue_Dequeue_priority
- *
- *  DESCRIPTION:
- *
- *  This function returns a pointer to the highest priority
- *  thread waiting on the_thread_queue.  If no threads are waiting
- *  on the_thread_queue, then NULL is returned.
- */
-
-Thread_Control *_Thread_queue_Dequeue_priority(
-  Thread_queue_Control *the_thread_queue
-);
-
-/*
- *  _Thread_queue_Enqueue_priority
- *
- *  DESCRIPTION:
- *
- *  This routine enqueues the currently executing thread on
- *  the_thread_queue with an optional timeout using the
- *  priority discipline.
- */
-
-void _Thread_queue_Enqueue_priority(
-  Thread_queue_Control *the_thread_queue,
-  Thread_Control       *the_thread,
-  Watchdog_Interval     timeout
-);
-
-/*
- *  _Thread_queue_Extract_priority
- *
- *  DESCRIPTION:
- *
- *  This routine removes the_thread from the_thread_queue
- *  and cancels any timeouts associated with this blocking.
- */
-
-void _Thread_queue_Extract_priority(
-  Thread_queue_Control *the_thread_queue,
-  Thread_Control       *the_thread
-);
-
-/*
- *  _Thread_queue_First_priority
- *
- *  DESCRIPTION:
- *
- *  This function returns a pointer to the "first" thread
- *  on the_thread_queue.  The "first" thread is the highest
- *  priority thread waiting on the_thread_queue.
- */
-
-Thread_Control *_Thread_queue_First_priority(
-  Thread_queue_Control *the_thread_queue
-);
-
-/*
- *  _Thread_queue_Dequeue_FIFO
- *
- *  DESCRIPTION:
- *
- *  This function returns a pointer to the thread which has
- *  been waiting the longest on  the_thread_queue.  If no
- *  threads are waiting on the_thread_queue, then NULL is returned.
- */
-
-Thread_Control *_Thread_queue_Dequeue_fifo(
-  Thread_queue_Control *the_thread_queue
-);
-
-/*
- *  _Thread_queue_Enqueue_FIFO
- *
- *  DESCRIPTION:
- *
- *  This routine enqueues the currently executing thread on
- *  the_thread_queue with an optional timeout using the
- *  FIFO discipline.
- */
-
-void _Thread_queue_Enqueue_fifo(
-  Thread_queue_Control *the_thread_queue,
-  Thread_Control       *the_thread,
-  Watchdog_Interval     timeout
-);
-
-/*
- *  _Thread_queue_Extract_FIFO
- *
- *  DESCRIPTION:
- *
- *  This routine removes the_thread from the_thread_queue
- *  and cancels any timeouts associated with this blocking.
- */
-
-void _Thread_queue_Extract_fifo(
-  Thread_queue_Control *the_thread_queue,
-  Thread_Control       *the_thread
-);
-
-/*
- *  _Thread_queue_First_FIFO
- *
- *  DESCRIPTION:
- *
- *  This function returns a pointer to the "first" thread
- *  on the_thread_queue.  The first thread is the thread
- *  which has been waiting longest on the_thread_queue.
- */
-
-Thread_Control *_Thread_queue_First_fifo(
-  Thread_queue_Control *the_thread_queue
-);
-
-/*
- *  _Thread_queue_timeout
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked when a task's request has not
- *  been satisfied after the timeout interval specified to
- *  enqueue.  The task represented by ID will be unblocked and
- *  its status code will be set in it's control block to indicate
- *  that a timeout has occurred.
- */
-
-void _Thread_queue_Timeout (
-  Objects_Id  id,
-  void       *ignored
-);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/score/include/rtems/score/tod.h b/c/src/exec/score/include/rtems/score/tod.h
deleted file mode 100644
index b87486bda1..0000000000
--- a/c/src/exec/score/include/rtems/score/tod.h
+++ /dev/null
@@ -1,277 +0,0 @@
-/*  tod.h
- *
- *  This include file contains all the constants and structures associated
- *  with the Time of Day Handler.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __TIME_OF_DAY_h
-#define __TIME_OF_DAY_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/object.h>
-#include <rtems/score/watchdog.h>
-
-/*
- *  The following constants are related to the time of day.
- */
-
-#define TOD_SECONDS_PER_MINUTE 60
-#define TOD_MINUTES_PER_HOUR   60
-#define TOD_MONTHS_PER_YEAR    12
-#define TOD_DAYS_PER_YEAR      365
-#define TOD_HOURS_PER_DAY      24
-#define TOD_SECONDS_PER_DAY    (TOD_SECONDS_PER_MINUTE * \
-                                TOD_MINUTES_PER_HOUR   * \
-                                TOD_HOURS_PER_DAY)
-
-#define TOD_SECONDS_PER_NON_LEAP_YEAR (365 * TOD_SECONDS_PER_DAY)
-
-#define TOD_MILLISECONDS_PER_SECOND     1000
-#define TOD_MICROSECONDS_PER_SECOND     1000000
-#define TOD_NANOSECONDS_PER_SECOND      1000000000
-#define TOD_NANOSECONDS_PER_MICROSECOND 1000
-
-/*
- *  The following constant define the earliest year to which an
- *  time of day can be initialized.  This is considered the
- *  epoch.
- */
-
-#define TOD_BASE_YEAR 1988
-
-/*
- *  The following record defines the time of control block.  This
- *  control block is used to maintain the current time of day.
- */
-
-typedef struct {                   /* RTEID style time/date */
-  unsigned32 year;                 /* year, A.D. */
-  unsigned32 month;                /* month, 1 -> 12 */
-  unsigned32 day;                  /* day, 1 -> 31 */
-  unsigned32 hour;                 /* hour, 0 -> 23 */
-  unsigned32 minute;               /* minute, 0 -> 59 */
-  unsigned32 second;               /* second, 0 -> 59 */
-  unsigned32 ticks;                /* elapsed ticks between secs */
-}   TOD_Control;
-
-/*
- *  The following is TRUE if the application has set the current
- *  time of day, and FALSE otherwise.
- */
-
-SCORE_EXTERN boolean _TOD_Is_set;
-
-/*
- *  The following contains the current time of day.
- */
-
-SCORE_EXTERN TOD_Control _TOD_Current;
-
-/*
- *  The following contains the number of seconds from 00:00:00
- *  January 1, TOD_BASE_YEAR until the current time of day.
- */
-
-SCORE_EXTERN Watchdog_Interval _TOD_Seconds_since_epoch;
-
-/*
- *  The following contains the number of microseconds per tick.
- */
-
-SCORE_EXTERN unsigned32 _TOD_Microseconds_per_tick;
-
-/*
- *  The following contains the number of clock ticks per second.
- *
- *  NOTE:
- *
- *  If one second is NOT evenly divisible by the number of microseconds
- *  per clock tick, this value will contain only the integer portion
- *  of the division.  This means that the interval between clock ticks
- *  can be a source of error in the current time of day.
- */
-
-SCORE_EXTERN unsigned32 _TOD_Ticks_per_second;
-
-/*
- *  This is the control structure for the watchdog timer which
- *  fires to service the seconds chain.
- */
-
-SCORE_EXTERN Watchdog_Control _TOD_Seconds_watchdog;
-
-#ifdef SCORE_INIT
-
-/*
- *  The following array contains the number of days in all months.
- *  The first dimension should be 1 for leap years, and 0 otherwise.
- *  The second dimension should range from 1 to 12 for January to
- *  February, respectively.
- */
-
-const unsigned32 _TOD_Days_per_month[ 2 ][ 13 ] = {
-  { 0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 },
-  { 0, 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }
-};
-
-/*
- *  The following array contains the number of days in all months
- *  up to the month indicated by the index of the second dimension.
- *  The first dimension should be 1 for leap years, and 0 otherwise.
- */
-
-const unsigned16 _TOD_Days_to_date[2][13] = {
-  { 0, 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334 },
-  { 0, 0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335 }
-};
-
-/*
- *  The following array contains the number of days in the years
- *  since the last leap year.  The index should be 0 for leap
- *  years, and the number of years since the beginning of a leap
- *  year otherwise.
- */
-
-const unsigned16 _TOD_Days_since_last_leap_year[4] = { 0, 366, 731, 1096 };
-
-#else
-
-extern const unsigned16 _TOD_Days_to_date[2][13]; /* Julian days */
-extern const unsigned16 _TOD_Days_since_last_leap_year[4];
-extern const unsigned32 _TOD_Days_per_month[2][13];
-
-#endif
-
-/*
- *  _TOD_Handler_initialization
- *
- *  DESCRIPTION:
- *
- *  This routine performs the initialization necessary for this handler.
- */
-
-void _TOD_Handler_initialization(
-  unsigned32 microseconds_per_tick
-);
-
-/*
- *  _TOD_Set
- *
- *  DESCRIPTION:
- *
- *  This routine sets the current time of day to THE_TOD and
- *  the equivalent SECONDS_SINCE_EPOCH.
- */
-
-void _TOD_Set(
-  TOD_Control       *the_tod,
-  Watchdog_Interval  seconds_since_epoch
-);
-
-/*
- *  _TOD_Validate
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if THE_TOD contains
- *  a valid time of day, and FALSE otherwise.
- */
-
-boolean _TOD_Validate(
-  TOD_Control *the_tod
-);
-
-/*
- *  _TOD_To_seconds
- *
- *  DESCRIPTION:
- *
- *  This function returns the number seconds between the epoch and THE_TOD.
- */
-
-Watchdog_Interval _TOD_To_seconds(
-  TOD_Control *the_tod
-);
-
-/*
- *  _TOD_Tickle
- *
- *  DESCRIPTION:
- *
- *  This routine is scheduled as a watchdog function and is invoked at
- *  each second boundary.  It updates the current time of day to indicate
- *  that a second has passed and processes the seconds watchdog chain.
- */
-
-void _TOD_Tickle(
-  Objects_Id  id,
-  void       *ignored
-);
-
-/*
- *  TOD_MILLISECONDS_TO_MICROSECONDS
- *
- *  DESCRIPTION:
- *
- *  This routine converts an interval expressed in milliseconds to microseconds.
- *
- *  NOTE:
- *
- *  This must be a macro so it can be used in "static" tables.
- */
-
-#define TOD_MILLISECONDS_TO_MICROSECONDS(_ms) ((_ms) * 1000)
-
-/*
- *  TOD_MICROSECONDS_TO_TICKS
- *
- *  DESCRIPTION:
- *
- *  This routine converts an interval expressed in microseconds to ticks.
- *
- *  NOTE:
- *
- *  This must be a macro so it can be used in "static" tables.
- */
-
-#define TOD_MICROSECONDS_TO_TICKS(_us) \
-    ((_us) / _TOD_Microseconds_per_tick)
-
-/*
- *  TOD_MILLISECONDS_TO_TICKS
- *
- *  DESCRIPTION:
- *
- *  This routine converts an interval expressed in milliseconds to ticks.
- *
- *  NOTE:
- *
- *  This must be a macro so it can be used in "static" tables.
- */
-
-#define TOD_MILLISECONDS_TO_TICKS(_ms) \
-    (TOD_MILLISECONDS_TO_MICROSECONDS(_ms) / _TOD_Microseconds_per_tick)
-
-#ifndef __RTEMS_APPLICATION__
-#include <rtems/score/tod.inl>
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/score/include/rtems/score/tqdata.h b/c/src/exec/score/include/rtems/score/tqdata.h
deleted file mode 100644
index 6136d35412..0000000000
--- a/c/src/exec/score/include/rtems/score/tqdata.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*  tqdata.h
- *
- *  This include file contains all the constants and structures
- *  needed to declare a thread queue.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __THREAD_QUEUE_DATA_h
-#define __THREAD_QUEUE_DATA_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/chain.h>
-#include <rtems/score/priority.h>
-#include <rtems/score/states.h>
-
-/*
- *  The following enumerated type details all of the disciplines
- *  supported by the Thread Queue Handler.
- */
-
-typedef enum {
-  THREAD_QUEUE_DISCIPLINE_FIFO,     /* FIFO queue discipline */
-  THREAD_QUEUE_DISCIPLINE_PRIORITY  /* PRIORITY queue discipline */
-}   Thread_queue_Disciplines;
-
-/*
- *  The following enumerated types indicate what happened while the thread
- *  queue was in the synchronization window.
- */
- 
-typedef enum {
-  THREAD_QUEUE_SYNCHRONIZED,
-  THREAD_QUEUE_NOTHING_HAPPENED,
-  THREAD_QUEUE_TIMEOUT,
-  THREAD_QUEUE_SATISFIED
-}  Thread_queue_States;
-
-/*
- *  The following constants are used to manage the priority queues.
- *
- *  There are four chains used to maintain a priority -- each chain
- *  manages a distinct set of task priorities.  The number of chains
- *  is determined by TASK_QUEUE_DATA_NUMBER_OF_PRIORITY_HEADERS.
- *  The following set must be consistent.  
- *
- *  The set below configures 4 headers -- each contains 64 priorities.
- *  Header x manages priority range (x*64) through ((x*64)+63).  If
- *  the priority is more than half way through the priority range it
- *  is in, then the search is performed from the rear of the chain.
- *  This halves the search time to find the insertion point.
- */
-
-#define TASK_QUEUE_DATA_NUMBER_OF_PRIORITY_HEADERS 4   
-#define TASK_QUEUE_DATA_PRIORITIES_PER_HEADER      64
-#define TASK_QUEUE_DATA_REVERSE_SEARCH_MASK        0x20
-
-typedef struct {
-  union {
-    Chain_Control Fifo;                /* FIFO discipline list           */
-    Chain_Control Priority[TASK_QUEUE_DATA_NUMBER_OF_PRIORITY_HEADERS];
-                                       /* priority discipline list       */
-  } Queues;
-  Thread_queue_States      sync_state; /* alloc/dealloc critical section */
-  Thread_queue_Disciplines discipline; /* queue discipline               */
-  States_Control           state;      /* state of threads on Thread_q   */
-  unsigned32               timeout_status;
-}   Thread_queue_Control;
-
-#ifndef __RTEMS_APPLICATION__
-#include <rtems/score/tqdata.inl>
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/score/include/rtems/score/userext.h b/c/src/exec/score/include/rtems/score/userext.h
deleted file mode 100644
index 29b0e9564e..0000000000
--- a/c/src/exec/score/include/rtems/score/userext.h
+++ /dev/null
@@ -1,211 +0,0 @@
-/*  userext.h
- *
- *  This include file contains all information about user extensions.  This
- *  Handler provides mechanisms which can be used to initialize and manipulate
- *  all user extensions.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __USER_EXTENSIONS_h
-#define __USER_EXTENSIONS_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/interr.h>
-#include <rtems/score/chain.h>
-#include <rtems/score/thread.h>
-
-/*
- *  The following records defines the User Extension Table.
- *  This table defines the application dependent routines which
- *  are invoked at critical points in the life of each thread and
- *  the system as a whole.
- */
- 
-typedef void User_extensions_routine;
- 
-typedef boolean ( *User_extensions_thread_create_extension )(
-                 Thread_Control *,
-                 Thread_Control *
-             );
- 
-typedef User_extensions_routine ( *User_extensions_thread_delete_extension )(
-                 Thread_Control *,
-                 Thread_Control *
-             );
- 
-typedef User_extensions_routine ( *User_extensions_thread_start_extension )(
-                 Thread_Control *,
-                 Thread_Control *
-             );
- 
-typedef User_extensions_routine ( *User_extensions_thread_restart_extension )(
-                 Thread_Control *,
-                 Thread_Control *
-             );
- 
-typedef User_extensions_routine ( *User_extensions_thread_switch_extension )(
-                 Thread_Control *,
-                 Thread_Control *
-             );
- 
-typedef User_extensions_routine (
-                                *User_extensions_thread_post_switch_extension )(
-                 Thread_Control *
-             );
- 
-typedef User_extensions_routine ( *User_extensions_thread_begin_extension )(
-                 Thread_Control *
-             );
- 
-typedef User_extensions_routine ( *User_extensions_thread_exitted_extension )(
-                 Thread_Control *
-             );
- 
-typedef User_extensions_routine ( *User_extensions_fatal_extension )(
-                 Internal_errors_Source  /* the_source  */,
-                 boolean                 /* is_internal */,
-                 unsigned32              /* the_error   */
-             );
-
- 
-typedef struct {
-  User_extensions_thread_create_extension       thread_create;
-  User_extensions_thread_start_extension        thread_start;
-  User_extensions_thread_restart_extension      thread_restart;
-  User_extensions_thread_delete_extension       thread_delete;
-  User_extensions_thread_switch_extension       thread_switch;
-  User_extensions_thread_begin_extension        thread_begin;
-  User_extensions_thread_exitted_extension      thread_exitted;
-  User_extensions_fatal_extension               fatal;
-}   User_extensions_Table;
-
-/*
- *  The following is used to manage each user extension set.
- */
-
-typedef struct {
-  Chain_Node              Node;
-  User_extensions_Table   Callouts;
-}   User_extensions_Control;
-
-/*
- *  The following is used to manage the list of active extensions.
- */
-
-SCORE_EXTERN Chain_Control _User_extensions_List;
-
-/*
- *  _User_extensions_Thread_create
- *
- *  DESCRIPTION:
- *
- *  This routine is used to invoke the user extension for
- *  the thread creation operate.
- */
-
-boolean _User_extensions_Thread_create (
-  Thread_Control *the_thread
-);
-
-/*
- *  _User_extensions_Thread_delete
- *
- *  DESCRIPTION:
- *
- *  This routine is used to invoke the user extension for
- *  the thread deletion operation.
- */
-
-void _User_extensions_Thread_delete (
-  Thread_Control *the_thread
-);
-
-/*
- *  _User_extensions_Thread_start
- *
- *  DESCRIPTION:
- *
- *  This routine is used to invoke the user extension for
- *  the thread start operation.
- */
-
-void _User_extensions_Thread_start (
-  Thread_Control *the_thread
-);
-
-/*
- *  _User_extensions_Thread_restart
- *
- *  DESCRIPTION:
- *
- *  This routine is used to invoke the user extension for
- *  the thread restart operation.
- */
-
-void _User_extensions_Thread_restart (
-  Thread_Control *the_thread
-);
-
-/*
- *  _User_extensions_Thread_begin
- *
- *  DESCRIPTION:
- *
- *  This routine is used to invoke the user extension which
- *  is invoked when a thread begins.
- */
-
-void _User_extensions_Thread_begin (
-  Thread_Control *executing
-);
-
-/*
- *  _User_extensions_Thread_exitted
- *
- *  DESCRIPTION:
- *
- *  This routine is used to invoke the user extension which
- *  is invoked when a thread exits.
- */
-
-void _User_extensions_Thread_exitted (
-  Thread_Control *executing
-);
-
-/*
- *  _User_extensions_Fatal
- *
- *  DESCRIPTION:
- *
- *  This routine is used to invoke the user extension invoked
- *  when a fatal error occurs.
- */
-
-void _User_extensions_Fatal (
-  Internal_errors_Source  the_source,
-  boolean                 is_internal,
-  unsigned32              the_error
-);
-
-#ifndef __RTEMS_APPLICATION__
-#include <rtems/score/userext.inl>
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/score/include/rtems/score/watchdog.h b/c/src/exec/score/include/rtems/score/watchdog.h
deleted file mode 100644
index ceb09793f6..0000000000
--- a/c/src/exec/score/include/rtems/score/watchdog.h
+++ /dev/null
@@ -1,194 +0,0 @@
-/*  watchdog.h
- *
- *  This include file contains all the constants and structures associated
- *  with watchdog timers.   This Handler provides mechanisms which can be
- *   used to initialize and manipulate watchdog timers.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __WATCHDOG_h
-#define __WATCHDOG_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/object.h>
-
-/*
- *  The following type defines the control block used to manage
- *  intervals.
- */
-
-typedef unsigned32 Watchdog_Interval;
-
-/*
- *  The following types define a pointer to a watchdog service routine.
- */
-
-typedef void Watchdog_Service_routine;
-
-typedef Watchdog_Service_routine ( *Watchdog_Service_routine_entry )(
-                 Objects_Id,
-                 void *
-             );
-
-/*
- *  Constant for indefinite wait.  (actually an illegal interval)
- */
-
-#define WATCHDOG_NO_TIMEOUT  0
-
-/*
- *  The following enumerated type lists the states in which a
- *  watchdog timer may be at any given time.
- */
-
-typedef enum {
-  WATCHDOG_INACTIVE,       /* off all chains */
-  WATCHDOG_BEING_INSERTED, /* off all chains, searching for insertion point */
-  WATCHDOG_ACTIVE,         /* on chain, allowed to fire */
-  WATCHDOG_REMOVE_IT       /* on chain, remove without firing if expires */
-} Watchdog_States;
-
-/*
- *  The following enumerated type details the manner in which
- *  a watchdog chain may be adjusted by the Watchdog_Adjust
- *  routine.  The direction indicates a movement FORWARD
- *  or BACKWARD in time.
- */
-
-typedef enum {
-  WATCHDOG_FORWARD,      /* adjust delta value forward */
-  WATCHDOG_BACKWARD      /* adjust delta value backward */
-} Watchdog_Adjust_directions;
-
-/*
- *  The following record defines the control block used
- *  to manage each watchdog timer.
- */
-
-typedef struct {
-  Chain_Node                      Node;
-  Watchdog_States                 state;
-  Watchdog_Interval               initial;
-  Watchdog_Interval               delta_interval;
-  Watchdog_Interval               start_time;
-  Watchdog_Interval               stop_time;
-  Watchdog_Service_routine_entry  routine;
-  Objects_Id                      id;
-  void                           *user_data;
-}   Watchdog_Control;
-
-/*
- *  The following are used for synchronization purposes
- *  during an insert on a watchdog delta chain.
- */
-
-SCORE_EXTERN volatile unsigned32  _Watchdog_Sync_level;
-SCORE_EXTERN volatile unsigned32  _Watchdog_Sync_count;
-
-/*
- *  The following contains the number of ticks since the
- *  system was booted.
- */
-
-SCORE_EXTERN Watchdog_Interval _Watchdog_Ticks_since_boot;
-
-/*
- *  The following defines the watchdog chains which are managed
- *  on ticks and second boundaries.
- */
-
-SCORE_EXTERN Chain_Control _Watchdog_Ticks_chain;
-SCORE_EXTERN Chain_Control _Watchdog_Seconds_chain;
-
-/*
- *  _Watchdog_Handler_initialization
- *
- *  DESCRIPTION:
- *
- *  This routine initializes the watchdog handler.  The watchdog
- *  synchronization flag is initialized and the watchdog chains are
- *  initialized and emptied.
- */
-
-void _Watchdog_Handler_initialization( void );
-
-/*
- *  _Watchdog_Remove
- *
- *  DESCRIPTION:
- *
- *  This routine removes THE_WATCHDOG from the watchdog chain on which
- *  it resides and returns the state THE_WATCHDOG timer was in.
- */
-
-Watchdog_States _Watchdog_Remove (
-  Watchdog_Control *the_watchdog
-);
-
-/*
- *  _Watchdog_Adjust
- *
- *  DESCRIPTION:
- *
- *  This routine adjusts the HEADER watchdog chain in the forward
- *  or backward DIRECTION for UNITS ticks.
- */
-
-void _Watchdog_Adjust (
-  Chain_Control              *header,
-  Watchdog_Adjust_directions  direction,
-  Watchdog_Interval           units
-);
-
-/*
- *  _Watchdog_Insert
- *
- *  DESCRIPTION:
- *
- *  This routine inserts THE_WATCHDOG into the HEADER watchdog chain
- *  for a time of UNITS.  The INSERT_MODE indicates whether
- *  THE_WATCHDOG is to be activated automatically or later, explicitly
- *  by the caller.
- *
- */
-
-void _Watchdog_Insert (
-  Chain_Control         *header,
-  Watchdog_Control      *the_watchdog
-);
-
-/*
- *  _Watchdog_Tickle
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked at appropriate intervals to update
- *  the HEADER watchdog chain.
- */
-
-void _Watchdog_Tickle (
-  Chain_Control *header
-);
-
-#ifndef __RTEMS_APPLICATION__
-#include <rtems/score/watchdog.inl>
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/score/include/rtems/score/wkspace.h b/c/src/exec/score/include/rtems/score/wkspace.h
deleted file mode 100644
index 3b4b84f95f..0000000000
--- a/c/src/exec/score/include/rtems/score/wkspace.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*  wkspace.h
- *
- *  This include file contains information related to the 
- *  RAM Workspace.  This Handler provides mechanisms which can be used to
- *  define, initialize and manipulate the workspace.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __WORKSPACE_h
-#define __WORKSPACE_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/heap.h>
-#include <rtems/score/interr.h>
-
-/*
- *  The following is used to manage the Workspace.
- *
- */
-
-SCORE_EXTERN Heap_Control _Workspace_Area;  /* executive heap header */
-
-/*
- *  _Workspace_Handler_initialization
- *
- *  DESCRIPTION:
- *
- *  This routine performs the initialization necessary for this handler.
- */
- 
-void _Workspace_Handler_initialization(
-  void       *starting_address,
-  unsigned32  size
-);
-
-/*
- *  _Workspace_Allocate_or_fatal_error
- *
- *  DESCRIPTION:
- *
- *  This routine returns the address of a block of memory of size
- *  bytes.  If a block of the appropriate size cannot be allocated
- *  from the workspace, then the internal error handler is invoked.
- */
-
-void *_Workspace_Allocate_or_fatal_error(
-  unsigned32   size
-);
-
-#ifndef __RTEMS_APPLICATION__
-#include <rtems/score/wkspace.inl>
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/score/include/rtems/system.h b/c/src/exec/score/include/rtems/system.h
deleted file mode 100644
index 5e1cc80ed5..0000000000
--- a/c/src/exec/score/include/rtems/system.h
+++ /dev/null
@@ -1,153 +0,0 @@
-/*  system.h
- *
- *  This include file contains information that is included in every
- *  function in the executive.  This must be the first include file
- *  included in all internal RTEMS files.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_SYSTEM_h
-#define __RTEMS_SYSTEM_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- *  The target options include file defines all target dependent 
- *  parameters for this build of RTEMS.  It must be included
- *  first so the basic macro definitions are in place.
- */
-
-#include <rtems/score/targopts.h>
-
-/*
- *  The following insures that all data is declared in the space
- *  of the initialization routine for either the Initialization Manager
- *  or the initialization file for the appropriate API.  It is 
- *  referenced as "external" in every other file.
- */
-
-#ifdef SCORE_INIT
-#undef  SCORE_EXTERN
-#define SCORE_EXTERN
-#else
-#undef  SCORE_EXTERN
-#define SCORE_EXTERN  extern
-#endif
-
-#ifdef SAPI_INIT
-#undef  SAPI_EXTERN
-#define SAPI_EXTERN
-#else
-#undef  SAPI_EXTERN
-#define SAPI_EXTERN  extern
-#endif
-
-#ifdef RTEMS_API_INIT
-#undef  RTEMS_EXTERN
-#define RTEMS_EXTERN
-#else
-#undef  RTEMS_EXTERN
-#define RTEMS_EXTERN  extern
-#endif
-
-#ifdef POSIX_API_INIT
-#undef  POSIX_EXTERN
-#define POSIX_EXTERN
-#else
-#undef  POSIX_EXTERN
-#define POSIX_EXTERN  extern
-#endif
-
-/*
- *  The following (in conjunction with compiler arguments) are used
- *  to choose between the use of static inline functions and macro
- *  functions.   The static inline implementation allows better
- *  type checking with no cost in code size or execution speed.
- */
-
-#ifdef USE_INLINES
-# ifdef __GNUC__
-#  define RTEMS_INLINE_ROUTINE static __inline__
-# else
-#  define RTEMS_INLINE_ROUTINE static inline
-# endif
-#else
-# define RTEMS_INLINE_ROUTINE
-#endif
-
-/*
- *  Include a base set of files.
- */
-
-/*
- * XXX: Eventually proc_ptr needs to disappear!!!
- */
-
-typedef void * proc_ptr;
-
-/*
- *  Define NULL
- */
-
-#ifndef NULL
-#define NULL      0          /* NULL value */
-#endif
-
-/*
- *  Boolean constants
- */
-
-#if !defined( TRUE ) || (TRUE != 1)
-#undef TRUE
-#define TRUE     (1)
-#endif
-
-#if !defined( FALSE ) || (FALSE != 0)
-#undef FALSE
-#define FALSE     (0)
-#endif
-
-#include <rtems/score/cpu.h>        /* processor specific information */
-
-#define stringify( _x ) # _x
-
-#define RTEMS_offsetof(type, field) \
-	((unsigned32) &(((type *) 0)->field))
-
-/*
- *  The following is the extern for the RTEMS version string.
- *  The contents of this string are CPU specific.
- */
-
-extern const char _RTEMS_version[];         /* RTEMS version string */
-extern const char _Copyright_Notice[];      /* RTEMS copyright string */
-
-/*
- *  The following defines the CPU dependent information table.
- */
-
-SCORE_EXTERN rtems_cpu_table _CPU_Table;               /* CPU dependent info */
-
-/*
- *  XXX weird RTEMS stuff
- */
-
-#define RTEMS_MAXIMUM_NAME_LENGTH 4
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/score/inline/rtems/score/Makefile.in b/c/src/exec/score/inline/rtems/score/Makefile.in
deleted file mode 100644
index f97d3bfcf3..0000000000
--- a/c/src/exec/score/inline/rtems/score/Makefile.in
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-I_PIECES= address chain coremsg coremutex coresem heap \
-    isr mppkt object objectmp priority stack states sysstate thread \
-    threadmp tod tqdata userext watchdog wkspace
-I_FILES=$(I_PIECES:%=$(srcdir)/%.inl)
-
-SRCS=$(I_FILES)
-
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/lib.cfg
-
-#
-# Add your list of files to delete here.  The config files
-#  already know how to delete some stuff, so you may want
-#  to just run 'make clean' first to see what gets missed.
-#  'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS += $(LIB)
-CLOBBER_ADDITIONS +=
-
-all:	$(SRCS)
-	$(INSTALL) -m 444 ${I_FILES} $(PROJECT_INCLUDE)/rtems/score
diff --git a/c/src/exec/score/inline/rtems/score/address.inl b/c/src/exec/score/inline/rtems/score/address.inl
deleted file mode 100644
index 2e3049d08e..0000000000
--- a/c/src/exec/score/inline/rtems/score/address.inl
+++ /dev/null
@@ -1,120 +0,0 @@
-/*  inline/address.inl
- *
- *  This include file contains the bodies of the routines
- *  about addresses which are inlined.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __INLINE_ADDRESSES_inl
-#define __INLINE_ADDRESSES_inl
-
-/*PAGE
- *
- *  _Addresses_Add_offset
- *
- *  DESCRIPTION:
- *
- *  This function is used to add an offset to a base address.
- *  It returns the resulting address.  This address is typically
- *  converted to an access type before being used further.
- */
-
-RTEMS_INLINE_ROUTINE void *_Addresses_Add_offset (
-  void       *base,
-  unsigned32  offset
-)
-{
-  return (void *)((char *)base + offset);
-}
-
-/*PAGE
- *
- *  _Addresses_Subtract_offset
- *
- *  DESCRIPTION:
- *
- *  This function is used to subtract an offset from a base
- *  address.  It returns the resulting address.  This address is
- *  typically converted to an access type before being used further.
- */
-
-RTEMS_INLINE_ROUTINE void *_Addresses_Subtract_offset (
-  void       *base,
-  unsigned32  offset
-)
-{
-  return (void *)((char *)base - offset);
-}
-
-/*PAGE
- *
- *  _Addresses_Subtract
- *
- *  DESCRIPTION:
- *
- *  This function is used to subtract two addresses.  It returns the
- *  resulting offset.
- *
- *  NOTE:  The cast of an address to an unsigned32 makes this code
- *         dependent on an addresses being thirty two bits.
- */
-
-RTEMS_INLINE_ROUTINE unsigned32 _Addresses_Subtract (
-  void *left,
-  void *right
-)
-{
-  return ((char *) left - (char *) right);
-}
-
-/*PAGE
- *
- *  _Addresses_Is_aligned
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the given address is correctly
- *  aligned for this processor and FALSE otherwise.  Proper alignment
- *  is based on correctness and efficiency.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Addresses_Is_aligned (
-  void *address
-)
-{
-    return ( ( (unsigned32)address % CPU_ALIGNMENT ) == 0 );
-}
-
-/*PAGE
- *
- *  _Addresses_Is_in_range
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the given address is within the
- *  memory range specified and FALSE otherwise.  base is the address
- *  of the first byte in the memory range and limit is the address
- *  of the last byte in the memory range.  The base address is
- *  assumed to be lower than the limit address.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Addresses_Is_in_range (
-  void *address,
-  void *base,
-  void *limit
-)
-{
-  return ( address >= base && address <= limit );
-}
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/score/inline/rtems/score/chain.inl b/c/src/exec/score/inline/rtems/score/chain.inl
deleted file mode 100644
index 4bd80116ae..0000000000
--- a/c/src/exec/score/inline/rtems/score/chain.inl
+++ /dev/null
@@ -1,390 +0,0 @@
-/*  inline/chain.inl
- *
- *  This include file contains the bodies of the routines which are
- *  associated with doubly linked chains and inlined.
- *
- *  NOTE:  The routines in this file are ordered from simple
- *         to complex.  No other Chain Handler routine is referenced
- *         unless it has already been defined.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __INLINE_CHAIN_inl
-#define __INLINE_CHAIN_inl
-
-/*PAGE
- *
- *  _Chain_Are_nodes_equal
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if LEFT and RIGHT are equal,
- *  and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Chain_Are_nodes_equal(
-  Chain_Node *left,
-  Chain_Node *right
-)
-{
-  return left == right;
-}
-
-/*PAGE
- *
- *  _Chain_Is_null
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the_chain is NULL and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Chain_Is_null(
-  Chain_Control *the_chain
-)
-{
-  return ( the_chain == NULL );
-}
-
-/*PAGE
- *
- *  _Chain_Is_null_node
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the_node is NULL and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Chain_Is_null_node(
-  Chain_Node *the_node
-)
-{
-  return ( the_node == NULL );
-}
-
-/*PAGE
- *
- *  _Chain_Head
- *
- *  DESCRIPTION:
- *
- *  This function returns a pointer to the first node on the chain.
- */
-
-RTEMS_INLINE_ROUTINE Chain_Node *_Chain_Head(
-  Chain_Control *the_chain
-)
-{
-   return (Chain_Node *) the_chain;
-}
-
-/*PAGE
- *
- *  _Chain_Tail
- *
- *  DESCRIPTION:
- *
- *  This function returns a pointer to the last node on the chain.
- */
-
-RTEMS_INLINE_ROUTINE Chain_Node *_Chain_Tail(
-  Chain_Control *the_chain
-)
-{
-   return (Chain_Node *) &the_chain->permanent_null;
-}
-
-/*PAGE
- *
- *  _Chain_Is_empty
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if there a no nodes on the_chain and
- *  FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Chain_Is_empty(
-  Chain_Control *the_chain
-)
-{
-  return ( the_chain->first == _Chain_Tail( the_chain ) );
-}
-
-/*PAGE
- *
- *  _Chain_Is_first
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the_node is the first node on a chain and
- *  FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Chain_Is_first(
-  Chain_Node *the_node
-)
-{
-  return ( the_node->previous == NULL );
-}
-
-/*PAGE
- *
- *  _Chain_Is_last
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the_node is the last node on a chain and
- *  FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Chain_Is_last(
-  Chain_Node *the_node
-)
-{
-  return ( the_node->next == NULL );
-}
-
-/*PAGE
- *
- *  _Chain_Has_only_one_node
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if there is only one node on the_chain and
- *  FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Chain_Has_only_one_node(
-  Chain_Control *the_chain
-)
-{
-  return ( the_chain->first == the_chain->last );
-}
-
-/*PAGE
- *
- *  _Chain_Is_head
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the_node is the head of the_chain and
- *  FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Chain_Is_head(
-  Chain_Control *the_chain,
-  Chain_Node    *the_node
-)
-{
-   return ( the_node == _Chain_Head( the_chain ) );
-}
-
-/*PAGE
- *
- *  _Chain_Is_tail
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the_node is the tail of the_chain and
- *  FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Chain_Is_tail(
-  Chain_Control *the_chain,
-  Chain_Node    *the_node
-)
-{
-   return ( the_node == _Chain_Tail( the_chain ) );
-}
-
-/*PAGE
- *
- *  Chain_Initialize_empty
- *
- *  DESCRIPTION:
- *
- *  This routine initializes the specified chain to contain zero nodes.
- */
-
-RTEMS_INLINE_ROUTINE void _Chain_Initialize_empty(
-  Chain_Control *the_chain
-)
-{
-  the_chain->first          = _Chain_Tail( the_chain );
-  the_chain->permanent_null = NULL;
-  the_chain->last           = _Chain_Head( the_chain );
-}
-
-/*PAGE
- *
- *  _Chain_Extract_unprotected
- *
- *  DESCRIPTION:
- *
- *  This routine extracts the_node from the chain on which it resides.
- *  It does NOT disable interrupts to insure the atomicity of the
- *  extract operation.
- */
-
-RTEMS_INLINE_ROUTINE void _Chain_Extract_unprotected(
-  Chain_Node *the_node
-)
-{
-  Chain_Node *next;
-  Chain_Node *previous;
-
-  next           = the_node->next;
-  previous       = the_node->previous;
-  next->previous = previous;
-  previous->next = next;
-}
-
-/*PAGE
- *
- *  _Chain_Get_first_unprotected
- *
- *  DESCRIPTION:
- *
- *  This function removes the first node from the_chain and returns
- *  a pointer to that node.  It does NOT disable interrupts to insure
- *  the atomicity of the get operation.
- */
-
-RTEMS_INLINE_ROUTINE Chain_Node *_Chain_Get_first_unprotected(
-  Chain_Control *the_chain
-)
-{
-  Chain_Node  *return_node;
-  Chain_Node  *new_first;
-
-  return_node         = the_chain->first;
-  new_first           = return_node->next;
-  the_chain->first    = new_first;
-  new_first->previous = _Chain_Head( the_chain );
-
-  return return_node;
-}
-
-/*PAGE
- *
- *  Chain_Get_unprotected
- *
- *  DESCRIPTION:
- *
- *  This function removes the first node from the_chain and returns
- *  a pointer to that node.  If the_chain is empty, then NULL is returned.
- *  It does NOT disable interrupts to insure the atomicity of the
- *  get operation.
- */
-
-RTEMS_INLINE_ROUTINE Chain_Node *_Chain_Get_unprotected(
-  Chain_Control *the_chain
-)
-{
-  if ( !_Chain_Is_empty( the_chain ) )
-    return _Chain_Get_first_unprotected( the_chain );
-  else
-    return NULL;
-}
-
-/*PAGE
- *
- *  _Chain_Insert_unprotected
- *
- *  DESCRIPTION:
- *
- *  This routine inserts the_node on a chain immediately following
- *  after_node.  It does NOT disable interrupts to insure the atomicity
- *  of the extract operation.
- */
-
-RTEMS_INLINE_ROUTINE void _Chain_Insert_unprotected(
-  Chain_Node *after_node,
-  Chain_Node *the_node
-)
-{
-  Chain_Node *before_node;
-
-  the_node->previous    = after_node;
-  before_node           = after_node->next;
-  after_node->next      = the_node;
-  the_node->next        = before_node;
-  before_node->previous = the_node;
-}
-
-/*PAGE
- *
- *  _Chain_Append_unprotected
- *
- *  DESCRIPTION:
- *
- *  This routine appends the_node onto the end of the_chain.
- *  It does NOT disable interrupts to insure the atomicity of the
- *  append operation.
- */
-
-RTEMS_INLINE_ROUTINE void _Chain_Append_unprotected(
-  Chain_Control *the_chain,
-  Chain_Node    *the_node
-)
-{
-  Chain_Node *old_last_node;
-
-  the_node->next      = _Chain_Tail( the_chain );
-  old_last_node       = the_chain->last;
-  the_chain->last     = the_node;
-  old_last_node->next = the_node;
-  the_node->previous  = old_last_node;
-}
-
-/*PAGE
- *
- *  _Chain_Prepend_unprotected
- *
- *  DESCRIPTION:
- *
- *  This routine prepends the_node onto the front of the_chain.
- *  It does NOT disable interrupts to insure the atomicity of the
- *  prepend operation.
- */
-
-RTEMS_INLINE_ROUTINE void _Chain_Prepend_unprotected(
-  Chain_Control *the_chain,
-  Chain_Node    *the_node
-)
-{
-  _Chain_Insert_unprotected( _Chain_Head( the_chain ), the_node );
-
-}
-
-/*PAGE
- *
- *  _Chain_Prepend
- *
- *  DESCRIPTION:
- *
- *  This routine prepends the_node onto the front of the_chain.
- *  It disables interrupts to insure the atomicity of the
- *  prepend operation.
- */
-
-RTEMS_INLINE_ROUTINE void _Chain_Prepend(
-  Chain_Control *the_chain,
-  Chain_Node    *the_node
-)
-{
-  _Chain_Insert( _Chain_Head( the_chain ), the_node );
-}
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/score/inline/rtems/score/coremsg.inl b/c/src/exec/score/inline/rtems/score/coremsg.inl
deleted file mode 100644
index a43b0e7b06..0000000000
--- a/c/src/exec/score/inline/rtems/score/coremsg.inl
+++ /dev/null
@@ -1,260 +0,0 @@
-/*  coremsg.inl
- *
- *  This include file contains the static inline implementation of all
- *  inlined routines in the Core Message Handler.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __CORE_MESSAGE_QUEUE_inl
-#define __CORE_MESSAGE_QUEUE_inl
-
-#include <string.h>   /* needed for memcpy */
- 
-/*PAGE
- *
- *  _CORE_message_queue_Send
- *
- *  DESCRIPTION:
- *
- *  This routine sends a message to the end of the specified message queue.
- */
- 
-RTEMS_INLINE_ROUTINE CORE_message_queue_Status _CORE_message_queue_Send(
-  CORE_message_queue_Control                *the_message_queue,
-  void                                      *buffer,
-  unsigned32                                 size,
-  Objects_Id                                 id,
-  CORE_message_queue_API_mp_support_callout  api_message_queue_mp_support
-)
-{
-  return _CORE_message_queue_Submit(
-    the_message_queue,
-    buffer,
-    size,
-    id,
-    api_message_queue_mp_support,
-    CORE_MESSAGE_QUEUE_SEND_REQUEST
-  );
-}
- 
-/*PAGE
- *
- *  _CORE_message_queue_Urgent
- *
- *  DESCRIPTION:
- *
- *  This routine sends a message to the front of the specified message queue.
- */
- 
-RTEMS_INLINE_ROUTINE CORE_message_queue_Status _CORE_message_queue_Urgent(
-  CORE_message_queue_Control                *the_message_queue,
-  void                                      *buffer,
-  unsigned32                                 size,
-  Objects_Id                                 id,
-  CORE_message_queue_API_mp_support_callout  api_message_queue_mp_support
-)
-{
-  return _CORE_message_queue_Submit(
-    the_message_queue,
-    buffer,
-    size,
-    id,
-    api_message_queue_mp_support,
-    CORE_MESSAGE_QUEUE_URGENT_REQUEST
- );
-}
-
-/*PAGE
- *
- *  _CORE_message_queue_Copy_buffer
- *
- *  DESCRIPTION:
- *
- *  This routine copies the contents of the source message buffer
- *  to the destination message buffer.
- */
-
-RTEMS_INLINE_ROUTINE void _CORE_message_queue_Copy_buffer (
-  void      *source,
-  void      *destination,
-  unsigned32 size
-)
-{
-  memcpy(destination, source, size);
-}
-
-/*PAGE
- *
- *  _CORE_message_queue_Allocate_message_buffer
- *
- *  DESCRIPTION:
- *
- *  This function allocates a message buffer from the inactive
- *  message buffer chain.
- */
-
-RTEMS_INLINE_ROUTINE CORE_message_queue_Buffer_control *
-_CORE_message_queue_Allocate_message_buffer (
-    CORE_message_queue_Control *the_message_queue
-)
-{
-   return (CORE_message_queue_Buffer_control *)
-     _Chain_Get( &the_message_queue->Inactive_messages );
-}
-
-/*PAGE
- *
- *  _CORE_message_queue_Free_message_buffer
- *
- *  DESCRIPTION:
- *
- *  This routine frees a message buffer to the inactive
- *  message buffer chain.
- */
-
-RTEMS_INLINE_ROUTINE void _CORE_message_queue_Free_message_buffer (
-    CORE_message_queue_Control        *the_message_queue,
-    CORE_message_queue_Buffer_control *the_message
-)
-{
-  _Chain_Append( &the_message_queue->Inactive_messages, &the_message->Node );
-}
-
-/*PAGE
- *
- *  _CORE_message_queue_Get_pending_message
- *
- *  DESCRIPTION:
- *
- *  This function removes the first message from the_message_queue
- *  and returns a pointer to it.
- */
-
-RTEMS_INLINE_ROUTINE
-  CORE_message_queue_Buffer_control *_CORE_message_queue_Get_pending_message (
-  CORE_message_queue_Control *the_message_queue
-)
-{
-  return (CORE_message_queue_Buffer_control *)
-    _Chain_Get_unprotected( &the_message_queue->Pending_messages );
-}
-
-/*PAGE
- *
- *  _CORE_message_queue_Is_priority
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the priority attribute is
- *  enabled in the attribute_set and FALSE otherwise.
- */
- 
-RTEMS_INLINE_ROUTINE boolean _CORE_message_queue_Is_priority(
-  CORE_message_queue_Attributes *the_attribute
-)
-{
-  return (the_attribute->discipline == CORE_MESSAGE_QUEUE_DISCIPLINES_PRIORITY);
-}
-
-/*PAGE
- *
- *  _CORE_message_queue_Append
- *
- *  DESCRIPTION:
- *
- *  This routine places the_message at the rear of the outstanding
- *  messages on the_message_queue.
- */
-
-RTEMS_INLINE_ROUTINE void _CORE_message_queue_Append (
-  CORE_message_queue_Control        *the_message_queue,
-  CORE_message_queue_Buffer_control *the_message
-)
-{
-  _Chain_Append( &the_message_queue->Pending_messages, &the_message->Node );
-}
-
-/*PAGE
- *
- *  _CORE_message_queue_Prepend
- *
- *  DESCRIPTION:
- *
- *  This routine places the_message at the front of the outstanding
- *  messages on the_message_queue.
- */
-
-RTEMS_INLINE_ROUTINE void _CORE_message_queue_Prepend (
-  CORE_message_queue_Control        *the_message_queue,
-  CORE_message_queue_Buffer_control *the_message
-)
-{
-  _Chain_Prepend(
-    &the_message_queue->Pending_messages,
-    &the_message->Node
-  );
-}
-
-/*PAGE
- *
- *  _CORE_message_queue_Is_null
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the_message_queue is TRUE and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _CORE_message_queue_Is_null (
-  CORE_message_queue_Control *the_message_queue
-)
-{
-  return ( the_message_queue == NULL  );
-}
-
-/*PAGE
- *
- *  _CORE_message_queue_Is_notify_enabled
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if notification is enabled on this message
- *  queue and FALSE otherwise.
- */
- 
-RTEMS_INLINE_ROUTINE boolean _CORE_message_queue_Is_notify_enabled (
-  CORE_message_queue_Control *the_message_queue
-)
-{
-  return (the_message_queue->notify_handler != NULL);
-}
- 
-/*PAGE
- *
- *  _CORE_message_queue_Set_notify
- *
- *  DESCRIPTION:
- *
- *  This routine initializes the notification information for the_message_queue.
- */
- 
-RTEMS_INLINE_ROUTINE void _CORE_message_queue_Set_notify (
-  CORE_message_queue_Control        *the_message_queue,
-  CORE_message_queue_Notify_Handler  the_handler,
-  void                              *the_argument
-)
-{
-  the_message_queue->notify_handler  = the_handler;
-  the_message_queue->notify_argument = the_argument;
-}
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/score/inline/rtems/score/coremutex.inl b/c/src/exec/score/inline/rtems/score/coremutex.inl
deleted file mode 100644
index 457f7c7d7d..0000000000
--- a/c/src/exec/score/inline/rtems/score/coremutex.inl
+++ /dev/null
@@ -1,124 +0,0 @@
-/*  inline/coremutex.inl
- *
- *  This include file contains all of the inlined routines associated
- *  with the CORE mutexes.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __INLINE_CORE_MUTEX_inl
-#define __INLINE_CORE_MUTEX_inl
-
-/*PAGE
- *
- *  _CORE_mutex_Is_locked
- *
- *  DESCRIPTION:
- *
- *  This routine returns TRUE if the mutex specified is locked and FALSE
- *  otherwise.
- */
- 
-RTEMS_INLINE_ROUTINE boolean _CORE_mutex_Is_locked(
-  CORE_mutex_Control  *the_mutex
-)
-{
-  return the_mutex->lock == CORE_MUTEX_LOCKED;
-}
- 
-/*PAGE
- *
- *  _CORE_mutex_Is_fifo
- *
- *  DESCRIPTION:
- *
- *  This routine returns TRUE if the mutex's wait discipline is FIFO and FALSE
- *  otherwise.
- */
- 
-RTEMS_INLINE_ROUTINE boolean _CORE_mutex_Is_fifo(
-  CORE_mutex_Attributes *the_attribute
-)
-{
-  return the_attribute->discipline == CORE_MUTEX_DISCIPLINES_FIFO;
-}
- 
-/*PAGE
- *
- *  _CORE_mutex_Is_priority
- *
- *  DESCRIPTION:
- *
- *  This routine returns TRUE if the mutex's wait discipline is PRIORITY and
- *  FALSE otherwise.
- */
- 
-RTEMS_INLINE_ROUTINE boolean _CORE_mutex_Is_priority(
-  CORE_mutex_Attributes *the_attribute
-)
-{
-  return the_attribute->discipline == CORE_MUTEX_DISCIPLINES_PRIORITY;
-}
- 
-/*PAGE
- *
- *  _CORE_mutex_Is_inherit_priority
- *
- *  DESCRIPTION:
- *
- *  This routine returns TRUE if the mutex's wait discipline is
- *  INHERIT_PRIORITY and FALSE otherwise.
- */
- 
-RTEMS_INLINE_ROUTINE boolean _CORE_mutex_Is_inherit_priority(
-  CORE_mutex_Attributes *the_attribute
-)
-{
-  return the_attribute->discipline == CORE_MUTEX_DISCIPLINES_PRIORITY_INHERIT;
-}
- 
-/*PAGE
- *
- *  _CORE_mutex_Is_priority_ceiling
- *
- *  DESCRIPTION:
- *
- *  This routine returns TRUE if the mutex's wait discipline is
- *  PRIORITY_CEILING and FALSE otherwise.
- */
- 
-RTEMS_INLINE_ROUTINE boolean _CORE_mutex_Is_priority_ceiling(
-  CORE_mutex_Attributes *the_attribute
-)
-{
-  return the_attribute->discipline == CORE_MUTEX_DISCIPLINES_PRIORITY_CEILING;
-}
- 
-/*PAGE
- *
- *  _CORE_mutex_Is_nesting_allowed
- *
- *  DESCRIPTION:
- *
- *  This routine returns TRUE if the mutex allows a task to obtain a
- *  semaphore more than once and nest.
- */
- 
-RTEMS_INLINE_ROUTINE boolean _CORE_mutex_Is_nesting_allowed(
-  CORE_mutex_Attributes *the_attribute
-)
-{
-  return the_attribute->allow_nesting == TRUE;
- 
-}
- 
-#endif
-/* end of include file */
diff --git a/c/src/exec/score/inline/rtems/score/coresem.inl b/c/src/exec/score/inline/rtems/score/coresem.inl
deleted file mode 100644
index 7ef8c93990..0000000000
--- a/c/src/exec/score/inline/rtems/score/coresem.inl
+++ /dev/null
@@ -1,54 +0,0 @@
-/*  inline/coresem.inl
- *
- *  This include file contains all of the inlined routines associated
- *  with the CORE semaphore.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __INLINE_CORE_SEMAPHORE_inl
-#define __INLINE_CORE_SEMAPHORE_inl
-
-/*PAGE
- *
- *  _CORE_semaphore_Is_priority
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the priority attribute is
- *  enabled in the attribute_set and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _CORE_semaphore_Is_priority(
-  CORE_semaphore_Attributes *the_attribute
-)
-{
-   return ( the_attribute->discipline == CORE_SEMAPHORE_DISCIPLINES_PRIORITY );
-}
-
-/*PAGE
- *
- *  _CORE_semaphore_Get_count
- *
- *  DESCRIPTION:
- *
- *  This routine returns the current count associated with the semaphore.
- */
- 
-RTEMS_INLINE_ROUTINE unsigned32 _CORE_semaphore_Get_count(
-  CORE_semaphore_Control  *the_semaphore
-)
-{
-  return the_semaphore->count;
-}
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/score/inline/rtems/score/heap.inl b/c/src/exec/score/inline/rtems/score/heap.inl
deleted file mode 100644
index 92936f8135..0000000000
--- a/c/src/exec/score/inline/rtems/score/heap.inl
+++ /dev/null
@@ -1,274 +0,0 @@
-/*  heap.inl
- *
- *  This file contains the static inline implementation of the inlined
- *  routines from the heap handler.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __HEAP_inl
-#define __HEAP_inl
-
-#include <rtems/score/address.h>
-
-/*PAGE
- *
- *  _Heap_Head
- *
- *  DESCRIPTION:
- *
- *  This function returns the head of the specified heap.
- */
-
-RTEMS_INLINE_ROUTINE Heap_Block *_Heap_Head (
-  Heap_Control *the_heap
-)
-{
-  return (Heap_Block *)&the_heap->start;
-}
-
-/*PAGE
- *
- *  _Heap_Tail
- *
- *  DESCRIPTION:
- *
- *  This function returns the tail of the specified heap.
- */
-
-RTEMS_INLINE_ROUTINE Heap_Block *_Heap_Tail (
-  Heap_Control *the_heap
-)
-{
-  return (Heap_Block *)&the_heap->final;
-}
-
-/*PAGE
- *
- *  _Heap_Previous_block
- *
- *  DESCRIPTION:
- *
- *  This function returns the address of the block which physically
- *  precedes the_block in memory.
- */
-
-RTEMS_INLINE_ROUTINE Heap_Block *_Heap_Previous_block (
-  Heap_Block *the_block
-)
-{
-  return (Heap_Block *) _Addresses_Subtract_offset(
-                          (void *)the_block,
-                          the_block->back_flag & ~ HEAP_BLOCK_USED
-                        );
-}
-
-/*PAGE
- *
- *  _Heap_Next_block
- *
- *  DESCRIPTION:
- *
- *  This function returns the address of the block which physically
- *  follows the_block in memory.
- *
- *  NOTE: Next_block assumes that the block is free.
- */
-
-RTEMS_INLINE_ROUTINE Heap_Block *_Heap_Next_block (
-  Heap_Block *the_block
-)
-{
-  return (Heap_Block *) _Addresses_Add_offset(
-                          (void *)the_block,
-                          the_block->front_flag & ~ HEAP_BLOCK_USED
-                        );
-}
-
-/*PAGE
- *
- *  _Heap_Block_at
- *
- *  DESCRIPTION:
- *
- *  This function calculates and returns a block's location (address)
- *  in the heap based upon a base address and an offset.
- */
-
-RTEMS_INLINE_ROUTINE Heap_Block *_Heap_Block_at(
-  void       *base,
-  unsigned32  offset
-)
-{
-  return (Heap_Block *) _Addresses_Add_offset( (void *)base, offset );
-}
-
-/*PAGE
- *
- *  _Heap_User_block_at
- *
- *  DESCRIPTION:
- *
- *  XXX
- */
- 
-RTEMS_INLINE_ROUTINE Heap_Block *_Heap_User_block_at(
-  void       *base
-)
-{
-  unsigned32         offset;
- 
-  offset = *(((unsigned32 *) base) - 1);
-  return _Heap_Block_at( base, -offset + -HEAP_BLOCK_USED_OVERHEAD);
-}
-
-/*PAGE
- *
- *  _Heap_Is_previous_block_free
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the previous block of the_block
- *  is free, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Heap_Is_previous_block_free (
-  Heap_Block *the_block
-)
-{
-  return !(the_block->back_flag & HEAP_BLOCK_USED);
-}
-
-/*PAGE
- *
- *  _Heap_Is_block_free
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the block is free, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Heap_Is_block_free (
-  Heap_Block *the_block
-)
-{
-  return !(the_block->front_flag & HEAP_BLOCK_USED);
-}
-
-/*PAGE
- *
- *  _Heap_Is_block_used
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the block is currently allocated,
- *  and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Heap_Is_block_used (
-  Heap_Block *the_block
-)
-{
-  return (the_block->front_flag & HEAP_BLOCK_USED);
-}
-
-/*PAGE
- *
- *  _Heap_Block_size
- *
- *  DESCRIPTION:
- *
- *  This function returns the size of the_block in bytes.
- */
-
-RTEMS_INLINE_ROUTINE unsigned32 _Heap_Block_size (
-  Heap_Block *the_block
-)
-{
-  return (the_block->front_flag & ~HEAP_BLOCK_USED);
-}
-
-/*PAGE
- *
- *  _Heap_Start_of_user_area
- *
- *  DESCRIPTION:
- *
- *  This function returns the starting address of the portion of the block
- *  which the user may access.
- */
-
-RTEMS_INLINE_ROUTINE void *_Heap_Start_of_user_area (
-  Heap_Block *the_block
-)
-{
-  return (void *) &the_block->next;
-}
-
-/*PAGE
- *
- *  _Heap_Is_block_in
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the_block is within the memory area
- *  managed by the_heap, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Heap_Is_block_in (
-  Heap_Control *the_heap,
-  Heap_Block   *the_block
-)
-{
-  return _Addresses_Is_in_range( the_block, the_heap->start, the_heap->final );
-}
-
-/*PAGE
- *
- *  _Heap_Is_page_size_valid
- *
- *  DESCRIPTION:
- *
- *  This function validates a specified heap page size.  If the page size
- *  is 0 or if lies outside a page size alignment boundary it is invalid
- *  and FALSE is returned.  Otherwise, the page size is valid and TRUE is
- *  returned.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Heap_Is_page_size_valid(
-  unsigned32 page_size
-)
-{
-  return ((page_size != 0) &&
-         ((page_size % CPU_HEAP_ALIGNMENT) == 0));
-}
-
-/*PAGE
- *
- *  _Heap_Build_flag
- *
- *  DESCRIPTION:
- *
- *  This function returns the block flag composed of size and in_use_flag.
- *  The flag returned is suitable for use as a back or front flag in a
- *  heap block.
- */
-
-RTEMS_INLINE_ROUTINE unsigned32 _Heap_Build_flag (
-  unsigned32 size,
-  unsigned32 in_use_flag
-)
-{
-  return  size | in_use_flag;
-}
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/score/inline/rtems/score/isr.inl b/c/src/exec/score/inline/rtems/score/isr.inl
deleted file mode 100644
index 6bd6e09d16..0000000000
--- a/c/src/exec/score/inline/rtems/score/isr.inl
+++ /dev/null
@@ -1,73 +0,0 @@
-/*  isr.inl
- *
- *  This include file contains the static implementation of all
- *  inlined routines in the Interrupt Handler.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __ISR_inl
-#define __ISR_inl
-
-/*PAGE
- *
- *  _ISR_Is_in_progress
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the processor is currently servicing
- *  and interrupt and FALSE otherwise.   A return value of TRUE indicates
- *  that the caller is an interrupt service routine, NOT a thread.  The
- *  directives available to an interrupt service routine are restricted.
- */
-
-RTEMS_INLINE_ROUTINE boolean _ISR_Is_in_progress( void )
-{
-  return (_ISR_Nest_level != 0);
-}
-
-/*PAGE
- *
- *  _ISR_Is_vector_number_valid
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the vector is a valid vector number
- *  for this processor and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _ISR_Is_vector_number_valid (
-  unsigned32 vector
-)
-{
-  return ( vector <= CPU_INTERRUPT_MAXIMUM_VECTOR_NUMBER );
-}
-
-/*PAGE
- *
- *  _ISR_Is_valid_user_handler
- *
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if handler is the entry point of a valid
- *  use interrupt service routine and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _ISR_Is_valid_user_handler (
-  void *handler
-)
-{
-  return ( handler != NULL);
-}
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/score/inline/rtems/score/mppkt.inl b/c/src/exec/score/inline/rtems/score/mppkt.inl
deleted file mode 100644
index 4be286b294..0000000000
--- a/c/src/exec/score/inline/rtems/score/mppkt.inl
+++ /dev/null
@@ -1,58 +0,0 @@
-/*  inline/mppkt.inl
- *
- *  This package is the implementation of the Packet Handler
- *  routines which are inlined.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __INLINE_MP_PACKET_inl
-#define __INLINE_MP_PACKET_inl
-
-/*PAGE
- *
- *  _Mp_packet_Is_valid_packet_class
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the the_packet_class is valid,
- *  and FALSE otherwise.
- *
- *  NOTE: Check for lower bounds (MP_PACKET_CLASSES_FIRST ) is unnecessary
- *        because this enum starts at lower bound of zero.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Mp_packet_Is_valid_packet_class (
-  MP_packet_Classes the_packet_class
-)
-{
-  return ( the_packet_class <= MP_PACKET_CLASSES_LAST );
-}
-
-/*PAGE
- *
- *  _Mp_packet_Is_null
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the the_packet_class is null,
- *  and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Mp_packet_Is_null (
-  MP_packet_Prefix   *the_packet
-)
-{
-  return the_packet == NULL;
-}
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/score/inline/rtems/score/object.inl b/c/src/exec/score/inline/rtems/score/object.inl
deleted file mode 100644
index 7e4d12aeec..0000000000
--- a/c/src/exec/score/inline/rtems/score/object.inl
+++ /dev/null
@@ -1,244 +0,0 @@
-/*  object.inl
- *
- *  This include file contains the static inline implementation of all
- *  of the inlined routines in the Object Handler.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __OBJECTS_inl
-#define __OBJECTS_inl
-
-/*PAGE
- *
- *  _Objects_Build_id
- *
- *  DESCRIPTION:
- *
- *  This function builds an object's id from the processor node and index
- *  values specified.
- */
-
-RTEMS_INLINE_ROUTINE Objects_Id _Objects_Build_id(
-  Objects_Classes  the_class,
-  unsigned32       node,
-  unsigned32       index
-)
-{
-  return ( (the_class << OBJECTS_CLASS_START_BIT) |
-           (node << OBJECTS_NODE_START_BIT)       |
-           (index << OBJECTS_INDEX_START_BIT) );
-}
-
-/*PAGE
- *
- *  _Objects_Get_class
- *
- *  DESCRIPTION:
- *
- *  This function returns the class portion of the ID.
- */
- 
-RTEMS_INLINE_ROUTINE Objects_Classes _Objects_Get_class(
-  Objects_Id id
-)
-{
-  return (Objects_Classes) 
-    ((id >> OBJECTS_CLASS_START_BIT) & OBJECTS_CLASS_VALID_BITS);
-}
- 
-
-/*PAGE
- *
- *  _Objects_Get_node
- *
- *  DESCRIPTION:
- *
- *  This function returns the node portion of the ID.
- */
-
-RTEMS_INLINE_ROUTINE unsigned32 _Objects_Get_node(
-  Objects_Id id
-)
-{
-  return (id >> OBJECTS_NODE_START_BIT) & OBJECTS_NODE_VALID_BITS;
-}
-
-/*PAGE
- *
- *  _Objects_Get_index
- *
- *  DESCRIPTION:
- *
- *  This function returns the index portion of the ID.
- */
-
-RTEMS_INLINE_ROUTINE unsigned32 _Objects_Get_index(
-  Objects_Id id
-)
-{
-  return (id >> OBJECTS_INDEX_START_BIT) & OBJECTS_INDEX_VALID_BITS;
-}
-
-/*PAGE
- *
- *  _Objects_Is_class_valid
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the class is valid.
- */
- 
-RTEMS_INLINE_ROUTINE boolean _Objects_Is_class_valid(
-  Objects_Classes the_class
-)
-{
-  return the_class && the_class <= OBJECTS_CLASSES_LAST;
-}
-
-/*PAGE
- *
- *  _Objects_Is_local_node
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the node is of the local object, and
- *  FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Objects_Is_local_node(
-  unsigned32 node
-)
-{
-  return ( node == _Objects_Local_node );
-}
-
-/*PAGE
- *
- *  _Objects_Is_local_id
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the id is of a local object, and
- *  FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Objects_Is_local_id(
-  Objects_Id id
-)
-{
-  return _Objects_Is_local_node( _Objects_Get_node(id) );
-}
-
-/*PAGE
- *
- *  _Objects_Are_ids_equal
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if left and right are equal,
- *  and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Objects_Are_ids_equal(
-  Objects_Id left,
-  Objects_Id right
-)
-{
-  return ( left == right );
-}
-
-/*PAGE
- *
- *  _Objects_Allocate
- *
- *  DESCRIPTION:
- *
- *  This function allocates a object control block from
- *  the inactive chain of free object control blocks.
- */
-
-RTEMS_INLINE_ROUTINE Objects_Control *_Objects_Allocate(
-  Objects_Information *information
-)
-{
-  return (Objects_Control *) _Chain_Get( &information->Inactive );
-}
-
-/*PAGE
- *
- *  _Objects_Free
- *
- *  DESCRIPTION:
- *
- *  This function frees a object control block to the
- *  inactive chain of free object control blocks.
- */
-
-RTEMS_INLINE_ROUTINE void _Objects_Free(
-  Objects_Information *information,
-  Objects_Control     *the_object
-)
-{
-  _Chain_Append( &information->Inactive, &the_object->Node );
-}
-
-/*PAGE
- *
- *  _Objects_Open
- *
- *  DESCRIPTION:
- *
- *  This function places the_object control pointer and object name
- *  in the Local Pointer and Local Name Tables, respectively.
- */
-
-RTEMS_INLINE_ROUTINE void _Objects_Open(
-  Objects_Information *information,
-  Objects_Control     *the_object,
-  Objects_Name         name
-)
-{
-  unsigned32  index;
-
-  index = _Objects_Get_index( the_object->id );
-  information->local_table[ index ] = the_object;
-
-  if ( information->is_string ) 
-    _Objects_Copy_name_string( name, the_object->name );
-  else
-    _Objects_Copy_name_raw( name, the_object->name, information->name_length );
-}
-
-/*PAGE
- *
- *  _Objects_Close
- *
- *  DESCRIPTION:
- *
- *  This function removes the_object control pointer and object name
- *  in the Local Pointer and Local Name Tables.
- */
-
-RTEMS_INLINE_ROUTINE void _Objects_Close(
-  Objects_Information  *information,
-  Objects_Control      *the_object
-)
-{
-  unsigned32 index;
-
-  index = _Objects_Get_index( the_object->id );
-  information->local_table[ index ] = (Objects_Control *) NULL;
-  _Objects_Clear_name( the_object->name, information->name_length );
-}
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/score/inline/rtems/score/objectmp.inl b/c/src/exec/score/inline/rtems/score/objectmp.inl
deleted file mode 100644
index f8fc62e129..0000000000
--- a/c/src/exec/score/inline/rtems/score/objectmp.inl
+++ /dev/null
@@ -1,73 +0,0 @@
-/*  inline/objectmp.inl
- *
- *  This include file contains the bodies of all inlined routines
- *  which deal with global objects.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __INLINE_MP_OBJECTS_inl
-#define __INLINE_MP_OBJECTS_inl
-
-/*PAGE
- *
- *  _Objects_MP_Allocate_global_object
- *
- *  DESCRIPTION:
- *
- *  This function allocates a Global Object control block.
- */
-
-RTEMS_INLINE_ROUTINE Objects_MP_Control *_Objects_MP_Allocate_global_object (
-  void
-)
-{
-  return (Objects_MP_Control *)
-           _Chain_Get( &_Objects_MP_Inactive_global_objects );
-}
-
-/*PAGE
- *
- *  _Objects_MP_Free_global_object
- *
- *  DESCRIPTION:
- *
- *  This routine deallocates a Global Object control block.
- */
-
-RTEMS_INLINE_ROUTINE void _Objects_MP_Free_global_object (
-  Objects_MP_Control *the_object
-)
-{
-  _Chain_Append(
-    &_Objects_MP_Inactive_global_objects,
-    &the_object->Object.Node
-  );
-}
-
-/*PAGE
- *
- *  _Objects_MP_Is_null_global_object
- *
- *  DESCRIPTION:
- *
- *  This function returns whether the global object is NULL or not.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Objects_MP_Is_null_global_object (
-  Objects_MP_Control *the_object
-)
-{
-  return( the_object == NULL );
-}
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/score/inline/rtems/score/priority.inl b/c/src/exec/score/inline/rtems/score/priority.inl
deleted file mode 100644
index b19d157976..0000000000
--- a/c/src/exec/score/inline/rtems/score/priority.inl
+++ /dev/null
@@ -1,247 +0,0 @@
-/*  priority.inl
- *
- *  This file contains the static inline implementation of all inlined
- *  routines in the Priority Handler.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __PRIORITY_inl
-#define __PRIORITY_inl
-
-#include <rtems/score/bitfield.h>
-
-/*PAGE
- *
- *  _Priority_Handler_initialization
- *
- *  DESCRIPTION:
- *
- *  This routine performs the initialization necessary for this handler.
- */
-
-RTEMS_INLINE_ROUTINE void _Priority_Handler_initialization( void )
-{
-  unsigned32 index;
-
-  _Priority_Major_bit_map = 0;
-  for ( index=0 ; index <16 ; index++ )
-     _Priority_Bit_map[ index ] = 0;
-}
-
-/*PAGE
- *
- *  _Priority_Is_valid
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the_priority if valid for a
- *  user task, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Priority_Is_valid (
-  Priority_Control the_priority
-)
-{
-  /* 
-   *  Since PRIORITY_MINIMUM is 0 and priorities are stored unsigned,
-   *  then checking for less than 0 is unnecessary.
-   */
-
-  return ( the_priority <= PRIORITY_MAXIMUM );
-}
-
-/*PAGE
- *
- *  _Priority_Major
- *
- *  DESCRIPTION:
- *
- *  This function returns the major portion of the_priority.
- */
-
-RTEMS_INLINE_ROUTINE unsigned32 _Priority_Major (
-  Priority_Control the_priority
-)
-{
-  return ( the_priority / 16 );
-}
-
-/*PAGE
- *
- *  _Priority_Minor
- *
- *  DESCRIPTION:
- *
- *  This function returns the minor portion of the_priority.
- */
-
-RTEMS_INLINE_ROUTINE unsigned32 _Priority_Minor (
-  Priority_Control the_priority
-)
-{
-  return ( the_priority % 16 );
-}
-
-#if ( CPU_USE_GENERIC_BITFIELD_CODE == TRUE )
- 
-/*PAGE
- *
- *  _Priority_Mask
- *
- *  DESCRIPTION:
- *
- *  This function returns the mask associated with the major or minor
- *  number passed to it.
- */
- 
-RTEMS_INLINE_ROUTINE unsigned32 _Priority_Mask (
-  unsigned32 bit_number
-)
-{
-  return (0x8000 >> bit_number);
-}
- 
- 
-/*PAGE
- *
- *  _Priority_Bits_index
- *
- *  DESCRIPTION:
- *
- *  This function translates the bit numbers returned by the bit scan
- *  of a priority bit field into something suitable for use as
- *  a major or minor component of a priority.
- */
- 
-RTEMS_INLINE_ROUTINE unsigned32 _Priority_Bits_index (
-  unsigned32 bit_number
-)
-{
-  return bit_number;
-}
-
-#endif
-
-/*PAGE
- *
- *  _Priority_Add_to_bit_map
- *
- *  DESCRIPTION:
- *
- *  This routine uses the_priority_map to update the priority
- *  bit maps to indicate that a thread has been readied.
- */
-
-RTEMS_INLINE_ROUTINE void _Priority_Add_to_bit_map (
-  Priority_Information *the_priority_map
-)
-{
-  *the_priority_map->minor |= the_priority_map->ready_minor;
-  _Priority_Major_bit_map  |= the_priority_map->ready_major;
-}
-
-/*PAGE
- *
- *  _Priority_Remove_from_bit_map
- *
- *  DESCRIPTION:
- *
- *  This routine uses the_priority_map to update the priority
- *  bit maps to indicate that a thread has been removed from the
- *  ready state.
- */
-
-RTEMS_INLINE_ROUTINE void _Priority_Remove_from_bit_map (
-  Priority_Information *the_priority_map
-)
-{
-  *the_priority_map->minor &= the_priority_map->block_minor;
-  if ( *the_priority_map->minor == 0 )
-    _Priority_Major_bit_map &= the_priority_map->block_major;
-}
-
-/*PAGE
- *
- *  _Priority_Get_highest
- *
- *  DESCRIPTION:
- *
- *  This function returns the priority of the highest priority
- *  ready thread.
- */
-
-RTEMS_INLINE_ROUTINE Priority_Control _Priority_Get_highest( void )
-{
-  Priority_Bit_map_control minor;
-  Priority_Bit_map_control major;
-
-  _Bitfield_Find_first_bit( _Priority_Major_bit_map, major );
-  _Bitfield_Find_first_bit( _Priority_Bit_map[major], minor );
-
-  return (_Priority_Bits_index( major ) << 4) +
-          _Priority_Bits_index( minor );
-}
-
-/*PAGE
- *
- *  _Priority_Initialize_information
- *
- *  DESCRIPTION:
- *
- *  This routine initializes the_priority_map so that it
- *  contains the information necessary to manage a thread
- *  at new_priority.
- */
-
-RTEMS_INLINE_ROUTINE void _Priority_Initialize_information(
-  Priority_Information *the_priority_map,
-  Priority_Control      new_priority
-)
-{
-  Priority_Bit_map_control major;
-  Priority_Bit_map_control minor;
-  Priority_Bit_map_control mask;
-
-  major = _Priority_Major( new_priority );
-  minor = _Priority_Minor( new_priority );
-
-  the_priority_map->minor =
-    &_Priority_Bit_map[ _Priority_Bits_index(major) ];
-
-  mask = _Priority_Mask( major );
-  the_priority_map->ready_major = mask;
-  the_priority_map->block_major = ~mask;
-
-  mask = _Priority_Mask( minor );
-  the_priority_map->ready_minor = mask;
-  the_priority_map->block_minor = ~mask;
-}
-
-/*PAGE
- *
- *  _Priority_Is_group_empty
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the priority GROUP is empty, and
- *  FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Priority_Is_group_empty (
-  Priority_Control      the_priority
-)
-{
-  return the_priority == 0;
-}
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/score/inline/rtems/score/stack.inl b/c/src/exec/score/inline/rtems/score/stack.inl
deleted file mode 100644
index eedd2f5ba2..0000000000
--- a/c/src/exec/score/inline/rtems/score/stack.inl
+++ /dev/null
@@ -1,81 +0,0 @@
-/*  stack.inl
- *
- *  This file contains the static inline implementation of the inlined
- *  routines from the Stack Handler.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __STACK_inl
-#define __STACK_inl
-
-/*PAGE
- *
- *  _Stack_Initialize
- *
- *  DESCRIPTION:
- *
- *  This routine initializes the_stack record to indicate that
- *  size bytes of memory starting at starting_address have been
- *  reserved for a stack.
- */
-
-RTEMS_INLINE_ROUTINE void _Stack_Initialize (
-  Stack_Control *the_stack,
-  void          *starting_address,
-  unsigned32     size
-)
-{
-  the_stack->area = starting_address;
-  the_stack->size = size;
-}
-
-/*PAGE
- *
- *  _Stack_Is_enough
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if size bytes is enough memory for
- *  a valid stack area on this processor, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Stack_Is_enough (
-  unsigned32 size
-)
-{
-  return ( size >= STACK_MINIMUM_SIZE );
-}
-
-/*PAGE
- *
- *  _Stack_Adjust_size
- *
- *  DESCRIPTION:
- *
- *  This function increases the stack size to insure that the thread
- *  has the desired amount of stack space after the initial stack
- *  pointer is determined based on alignment restrictions.
- *
- *  NOTE:
- *
- *  The amount of adjustment for alignment is CPU dependent.
- */
-
-RTEMS_INLINE_ROUTINE unsigned32 _Stack_Adjust_size (
-  unsigned32 size
-)
-{
-  return size + CPU_STACK_ALIGNMENT;
-}
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/score/inline/rtems/score/states.inl b/c/src/exec/score/inline/rtems/score/states.inl
deleted file mode 100644
index 1e67b14144..0000000000
--- a/c/src/exec/score/inline/rtems/score/states.inl
+++ /dev/null
@@ -1,384 +0,0 @@
-/*  states.inl
- *
- *  This file contains the macro implementation of the inlined
- *  routines associated with thread state information.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __STATES_inl
-#define __STATES_inl
-
-/*PAGE
- *
- *  _States_Set
- *
- *  DESCRIPTION:
- *
- *  This function sets the given states_to_set into the current_state
- *  passed in.  The result is returned to the user in current_state.
- */
-
-RTEMS_INLINE_ROUTINE States_Control _States_Set (
-  States_Control states_to_set,
-  States_Control current_state
-)
-{
-   return (current_state | states_to_set);
-}
-
-/*PAGE
- *
- *  _States_Clear
- *
- *  DESCRIPTION:
- *
- *  This function clears the given states_to_clear into the current_state
- *  passed in.  The result is returned to the user in current_state.
- */
-
-RTEMS_INLINE_ROUTINE States_Control _States_Clear (
-  States_Control states_to_clear,
-  States_Control current_state
-)
-{
-   return (current_state & ~states_to_clear);
-}
-
-/*PAGE
- *
- *  _States_Is_ready
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the_states indicates that the
- *  state is READY, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _States_Is_ready (
-  States_Control the_states
-)
-{
-   return (the_states == STATES_READY);
-}
-
-/*PAGE
- *
- *  _States_Is_only_dormant
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the DORMANT state is the ONLY state
- *  set in the_states, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _States_Is_only_dormant (
-  States_Control the_states
-)
-{
-   return (the_states == STATES_DORMANT);
-}
-
-/*PAGE
- *
- *  _States_Is_dormant
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the DORMANT state is set in
- *  the_states, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _States_Is_dormant (
-  States_Control the_states
-)
-{
-   return (the_states & STATES_DORMANT);
-}
-
-/*PAGE
- *
- *  _States_Is_suspended
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the SUSPENDED state is set in
- *  the_states, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _States_Is_suspended (
-  States_Control the_states
-)
-{
-   return (the_states & STATES_SUSPENDED);
-}
-
-/*PAGE
- *
- *  _States_Is_Transient
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the TRANSIENT state is set in
- *  the_states, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _States_Is_transient (
-  States_Control the_states
-)
-{
-   return (the_states & STATES_TRANSIENT);
-}
-
-/*PAGE
- *
- *  _States_Is_delaying
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the DELAYING state is set in
- *  the_states, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _States_Is_delaying (
-  States_Control the_states
-)
-{
-   return (the_states & STATES_DELAYING);
-}
-
-/*PAGE
- *
- *  _States_Is_waiting_for_buffer
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the WAITING_FOR_BUFFER state is set in
- *  the_states, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _States_Is_waiting_for_buffer (
-  States_Control the_states
-)
-{
-   return (the_states & STATES_WAITING_FOR_BUFFER);
-}
-
-/*PAGE
- *
- *  _States_Is_waiting_for_segment
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the WAITING_FOR_SEGMENT state is set in
- *  the_states, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _States_Is_waiting_for_segment (
-  States_Control the_states
-)
-{
-   return (the_states & STATES_WAITING_FOR_SEGMENT);
-}
-
-/*PAGE
- *
- *  _States_Is_waiting_for_message
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the WAITING_FOR_MESSAGE state is set in
- *  the_states, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _States_Is_waiting_for_message (
-  States_Control the_states
-)
-{
-   return (the_states & STATES_WAITING_FOR_MESSAGE);
-}
-
-/*PAGE
- *
- *  _States_Is_waiting_for_event
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the WAITING_FOR_EVENT state is set in
- *  the_states, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _States_Is_waiting_for_event (
-  States_Control the_states
-)
-{
-   return (the_states & STATES_WAITING_FOR_EVENT);
-}
-
-/*PAGE
- *
- *  _States_Is_waiting_for_mutex
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the WAITING_FOR_MUTEX state
- *  is set in the_states, and FALSE otherwise.
- */
- 
-RTEMS_INLINE_ROUTINE boolean _States_Is_waiting_for_mutex (
-  States_Control the_states
-)
-{
-   return (the_states & STATES_WAITING_FOR_MUTEX);
-}
-
-/*PAGE
- *
- *  _States_Is_waiting_for_semaphore
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the WAITING_FOR_SEMAPHORE state
- *  is set in the_states, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _States_Is_waiting_for_semaphore (
-  States_Control the_states
-)
-{
-   return (the_states & STATES_WAITING_FOR_SEMAPHORE);
-}
-
-/*PAGE
- *
- *  _States_Is_waiting_for_time
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the WAITING_FOR_TIME state is set in
- *  the_states, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _States_Is_waiting_for_time (
-  States_Control the_states
-)
-{
-   return (the_states & STATES_WAITING_FOR_TIME);
-}
-
-/*PAGE
- *
- *  _States_Is_waiting_for_rpc_reply
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the WAITING_FOR_TIME state is set in
- *  the_states, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _States_Is_waiting_for_rpc_reply (
-  States_Control the_states
-)
-{
-   return (the_states & STATES_WAITING_FOR_RPC_REPLY);
-}
-
-/*PAGE
- *
- *  _States_Is_waiting_for_period
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the WAITING_FOR_PERIOD state is set in
- *  the_states, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _States_Is_waiting_for_period (
-  States_Control the_states
-)
-{
-   return (the_states & STATES_WAITING_FOR_PERIOD);
-}
-
-/*PAGE
- *
- *  _States_Is_locally_blocked
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if one of the states which indicates
- *  that a task is blocked waiting for a local resource is set in
- *  the_states, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _States_Is_locally_blocked (
-  States_Control the_states
-)
-{
-   return (the_states & STATES_LOCALLY_BLOCKED);
-}
-
-/*PAGE
- *
- *  _States_Is_waiting_on_thread_queue
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if one of the states which indicates
- *  that a task is blocked waiting for a local resource is set in
- *  the_states, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _States_Is_waiting_on_thread_queue (
-  States_Control the_states
-)
-{
-   return (the_states & STATES_WAITING_ON_THREAD_QUEUE);
-}
-
-/*PAGE
- *
- *  _States_Is_blocked
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if one of the states which indicates
- *  that a task is blocked is set in the_states, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _States_Is_blocked (
-  States_Control the_states
-)
-{
-   return (the_states & STATES_BLOCKED);
-}
-
-/*PAGE
- *
- *
- *  _States_Are_set
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if any of the states in the mask
- *  are set in the_states, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _States_Are_set (
-  States_Control the_states,
-  States_Control mask
-)
-{
-   return ( (the_states & mask) != STATES_READY);
-}
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/score/inline/rtems/score/sysstate.inl b/c/src/exec/score/inline/rtems/score/sysstate.inl
deleted file mode 100644
index dea36d2806..0000000000
--- a/c/src/exec/score/inline/rtems/score/sysstate.inl
+++ /dev/null
@@ -1,154 +0,0 @@
-/*  sysstates.inl
- *
- *  This file contains the inline implementation of routines regarding the 
- *  system state.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __SYSTEM_STATE_inl
-#define __SYSTEM_STATE_inl
-
-/*PAGE
- *
- *  _System_state_Handler_initialization
- *
- *  DESCRIPTION:
- *
- *  This routine initializes the system state handler.
- */
- 
-RTEMS_INLINE_ROUTINE void _System_state_Handler_initialization (
-  boolean  is_multiprocessing
-)
-{
-  _System_state_Current = SYSTEM_STATE_BEFORE_INITIALIZATION;
-  _System_state_Is_multiprocessing = is_multiprocessing;
-}
- 
-/*PAGE
- *
- *  _System_state_Set
- *
- *  DESCRIPTION:
- *
- *  This routine sets the current system state to that specified by
- *  the called.
- */
-
-RTEMS_INLINE_ROUTINE void _System_state_Set (
-  System_state_Codes state
-)
-{
-  _System_state_Current = state;
-}
-
-/*PAGE
- *
- *  _System_state_Get
- *
- *  DESCRIPTION:
- *
- *  This function returns the current system state.
- */
-
-RTEMS_INLINE_ROUTINE System_state_Codes _System_state_Get ( void )
-{
-  return _System_state_Current;
-}
-
-/*PAGE
- *
- *  _System_state_Is_before_initialization
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the state is equal to the
- *  "before initialization" state, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _System_state_Is_before_initialization (
-  System_state_Codes state
-)
-{
-  return (state == SYSTEM_STATE_BEFORE_INITIALIZATION);
-}
-
-/*PAGE
- *
- *  _System_state_Is_before_multitasking
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the state is equal to the
- *  "before multitasking" state, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _System_state_Is_before_multitasking (
-  System_state_Codes state
-)
-{
-  return (state == SYSTEM_STATE_BEFORE_MULTITASKING);
-}
-
-/*PAGE
- *
- *  _System_state_Is_begin_multitasking
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the state is equal to the
- *  "begin multitasking" state, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _System_state_Is_begin_multitasking (
-  System_state_Codes state
-)
-{
-  return (state == SYSTEM_STATE_BEGIN_MULTITASKING);
-}
-
-/*PAGE
- *
- *  _System_state_Is_up
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the state is equal to the
- *  "up" state, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _System_state_Is_up (
-  System_state_Codes state
-)
-{
-  return (state == SYSTEM_STATE_UP);
-}
-
-/*PAGE
- *
- *  _System_state_Is_failed
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the state is equal to the
- *  "failed" state, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _System_state_Is_failed (
-  System_state_Codes state
-)
-{
-  return (state == SYSTEM_STATE_FAILED);
-}
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/score/inline/rtems/score/thread.inl b/c/src/exec/score/inline/rtems/score/thread.inl
deleted file mode 100644
index eef4532c07..0000000000
--- a/c/src/exec/score/inline/rtems/score/thread.inl
+++ /dev/null
@@ -1,404 +0,0 @@
-/*  thread.inl
- *
- *  This file contains the macro implementation of the inlined
- *  routines from the Thread handler.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __THREAD_inl
-#define __THREAD_inl
-
-/*PAGE
- *
- *  _Thread_Stop_multitasking
- *
- *  DESCRIPTION:
- *
- *  This routine halts multitasking and returns control to
- *  the "thread" (i.e. the BSP) which initially invoked the
- *  routine which initialized the system.
- */
-
-RTEMS_INLINE_ROUTINE void _Thread_Stop_multitasking( void )
-{
-  _Context_Switch( &_Thread_Executing->Registers, &_Thread_BSP_context );
-}
-
-/*PAGE
- *
- *  _Thread_Is_executing
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the_thread is the currently executing
- *  thread, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Thread_Is_executing (
-  Thread_Control *the_thread
-)
-{
-  return ( the_thread == _Thread_Executing );
-}
-
-/*PAGE
- *
- *  _Thread_Is_heir
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the_thread is the heir
- *  thread, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Thread_Is_heir (
-  Thread_Control *the_thread
-)
-{
-  return ( the_thread == _Thread_Heir );
-}
-
-/*PAGE
- *
- *  _Thread_Is_executing_also_the_heir
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the currently executing thread
- *  is also the heir thread, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Thread_Is_executing_also_the_heir( void )
-{
-  return ( _Thread_Executing == _Thread_Heir );
-}
-
-/*PAGE
- *
- *  _Thread_Resume
- *
- *  DESCRIPTION:
- *
- *  This routine clears the SUSPENDED state for the_thread.  It performs
- *  any necessary scheduling operations including the selection of
- *  a new heir thread.
- */
-
-RTEMS_INLINE_ROUTINE void _Thread_Resume (
-  Thread_Control *the_thread
-)
-{
-  _Thread_Clear_state( the_thread, STATES_SUSPENDED );
-}
-
-/*PAGE
- *
- *  _Thread_Unblock
- *
- *  DESCRIPTION:
- *
- *  This routine clears any blocking state for the_thread.  It performs
- *  any necessary scheduling operations including the selection of
- *  a new heir thread.
- */
-
-RTEMS_INLINE_ROUTINE void _Thread_Unblock (
-  Thread_Control *the_thread
-)
-{
-  _Thread_Clear_state( the_thread, STATES_BLOCKED );
-}
-
-/*PAGE
- *
- *  _Thread_Restart_self
- *
- *  DESCRIPTION:
- *
- *  This routine resets the current context of the calling thread
- *  to that of its initial state.
- */
-
-RTEMS_INLINE_ROUTINE void _Thread_Restart_self( void )
-{
-  if ( _Thread_Executing->fp_context != NULL )
-    _Context_Restore_fp( &_Thread_Executing->fp_context );
-
-  _CPU_Context_Restart_self( &_Thread_Executing->Registers );
-}
-
-/*PAGE
- *
- *  _Thread_Calculate_heir
- *
- *  DESCRIPTION:
- *
- *  This function returns a pointer to the highest priority
- *  ready thread.
- */
-
-RTEMS_INLINE_ROUTINE void _Thread_Calculate_heir( void )
-{
-  _Thread_Heir = (Thread_Control *)
-    _Thread_Ready_chain[ _Priority_Get_highest() ].first;
-}
-
-/*PAGE
- *
- *  _Thread_Is_allocated_fp
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the floating point context of
- *  the_thread is currently loaded in the floating point unit, and
- *  FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Thread_Is_allocated_fp (
-  Thread_Control *the_thread
-)
-{
-  return ( the_thread == _Thread_Allocated_fp );
-}
-
-/*PAGE
- *
- *  _Thread_Deallocate_fp
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked when the currently loaded floating
- *  point context is now longer associated with an active thread.
- */
-
-RTEMS_INLINE_ROUTINE void _Thread_Deallocate_fp( void )
-{
-  _Thread_Allocated_fp = NULL;
-}
-
-/*PAGE
- *
- *  _Thread_Disable_dispatch
- *
- *  DESCRIPTION:
- *
- *  This routine prevents dispatching.
- */
-
-RTEMS_INLINE_ROUTINE void _Thread_Disable_dispatch( void )
-{
-  _Thread_Dispatch_disable_level += 1;
-}
-
-/*PAGE
- *
- *  _Thread_Enable_dispatch
- *
- *  DESCRIPTION:
- *
- *  This routine allows dispatching to occur again.  If this is
- *  the outer most dispatching critical section, then a dispatching
- *  operation will be performed and, if necessary, control of the
- *  processor will be transferred to the heir thread.
- */
-
-#if ( CPU_INLINE_ENABLE_DISPATCH == TRUE )
-RTEMS_INLINE_ROUTINE void _Thread_Enable_dispatch()
-{
-  if ( (--_Thread_Dispatch_disable_level) == 0 )
-    _Thread_Dispatch();
-}
-#endif
-
-#if ( CPU_INLINE_ENABLE_DISPATCH == FALSE )
-void _Thread_Enable_dispatch( void );
-#endif
-
-/*PAGE
- *
- *  _Thread_Unnest_dispatch
- *
- *  DESCRIPTION:
- *
- *  This routine allows dispatching to occur again.  However,
- *  no dispatching operation is performed even if this is the outer
- *  most dispatching critical section.
- */
-
-RTEMS_INLINE_ROUTINE void _Thread_Unnest_dispatch( void )
-{
-  _Thread_Dispatch_disable_level -= 1;
-}
-
-/*PAGE
- *
- *  _Thread_Is_dispatching_enabled
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if dispatching is disabled, and FALSE
- *  otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Thread_Is_dispatching_enabled( void )
-{
-  return ( _Thread_Dispatch_disable_level == 0 );
-}
-
-/*PAGE
- *
- *  _Thread_Is_context_switch_necessary
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if dispatching is disabled, and FALSE
- *  otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Thread_Is_context_switch_necessary( void )
-{
-  return ( _Context_Switch_necessary );
-}
-
-/*PAGE
- *
- *  _Thread_Dispatch_initialization
- *
- *  DESCRIPTION:
- *
- *  This routine initializes the thread dispatching subsystem.
- */
-
-RTEMS_INLINE_ROUTINE void _Thread_Dispatch_initialization( void )
-{
-  _Thread_Dispatch_disable_level = 1;
-}
-
-/*PAGE
- *
- *  _Thread_Is_null
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the_thread is NULL and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Thread_Is_null (
-  Thread_Control *the_thread
-)
-{
-  return ( the_thread == NULL );
-}
-
-/*PAGE
- *
- *  _Thread_Get
- *
- *  DESCRIPTION:
- *
- *  This function maps thread IDs to thread control
- *  blocks.  If ID corresponds to a local thread, then it
- *  returns the_thread control pointer which maps to ID
- *  and location is set to OBJECTS_LOCAL.  If the thread ID is
- *  global and resides on a remote node, then location is set
- *  to OBJECTS_REMOTE, and the_thread is undefined.
- *  Otherwise, location is set to OBJECTS_ERROR and
- *  the_thread is undefined.
- *
- *  NOTE:  XXX... This routine may be able to be optimized.
- */
-
-RTEMS_INLINE_ROUTINE Thread_Control *_Thread_Get (
-  Objects_Id         id,
-  Objects_Locations *location
-)
-{
-  Objects_Classes      the_class;
-  Objects_Information *information;
-  Thread_Control      *tp = (Thread_Control *) 0;
- 
-  if ( _Objects_Are_ids_equal( id, OBJECTS_ID_OF_SELF ) ) {
-    _Thread_Disable_dispatch();
-    *location = OBJECTS_LOCAL;
-    tp = _Thread_Executing;
-    goto done;
-  }
- 
-  the_class = _Objects_Get_class( id );
- 
-  if ( the_class > OBJECTS_CLASSES_LAST ) {
-    *location = OBJECTS_ERROR;
-    goto done;
-  }
- 
-  information = _Objects_Information_table[ the_class ];
- 
-  if ( !information || !information->is_thread ) {
-    *location = OBJECTS_ERROR;
-    goto done;
-  }
- 
-  tp = (Thread_Control *) _Objects_Get( information, id, location );
- 
-done:
-  return tp;
-}
-
-
-/*
- *  _Thread_Is_proxy_blocking
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the status code is equal to the
- *  status which indicates that a proxy is blocking, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Thread_Is_proxy_blocking (
-  unsigned32 code
-)
-{
-  return (code == THREAD_STATUS_PROXY_BLOCKING);
-}
-
-/*PAGE
- *
- *  _Thread_Internal_allocate
- *
- *  DESCRIPTION:
- *
- *  This routine allocates an internal thread.
- */
- 
-RTEMS_INLINE_ROUTINE Thread_Control *_Thread_Internal_allocate( void )
-{
-  return (Thread_Control *) _Objects_Allocate( &_Thread_Internal_information );
-}
- 
-/*PAGE
- *
- *  _Thread_Internal_free
- *
- *  DESCRIPTION:
- *
- *  This routine frees an internal thread.
- */
- 
-RTEMS_INLINE_ROUTINE void _Thread_Internal_free (
-  Thread_Control *the_task
-)
-{
-  _Objects_Free( &_Thread_Internal_information, &the_task->Object );
-}
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/score/inline/rtems/score/threadmp.inl b/c/src/exec/score/inline/rtems/score/threadmp.inl
deleted file mode 100644
index 7a0391ff73..0000000000
--- a/c/src/exec/score/inline/rtems/score/threadmp.inl
+++ /dev/null
@@ -1,61 +0,0 @@
-/*  inline/threadmp.inl
- *
- *  This include file contains the bodies of all inlined routines
- *  for the multiprocessing part of thread package.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __INLINE_MP_THREAD_inl
-#define __INLINE_MP_THREAD_inl
-
-/*PAGE
- *
- *  _Thread_MP_Is_receive
- *
- *  DESCRIPTION:
- *
- *  This function returns true if the thread in question is the
- *  multiprocessing receive thread.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Thread_MP_Is_receive (
-  Thread_Control *the_thread
-)
-{
-  return the_thread == _Thread_MP_Receive;
-}
-
-/*PAGE
- *
- *  _Thread_MP_Free_proxy
- *
- *  DESCRIPTION:
- *
- *  This routine frees a proxy control block to the
- *  inactive chain of free proxy control blocks.
- */
-
-RTEMS_INLINE_ROUTINE void _Thread_MP_Free_proxy (
-  Thread_Control *the_thread
-)
-{
-  Thread_Proxy_control *the_proxy;
-
-  the_proxy = (Thread_Proxy_control *) the_thread;
-
-  _Chain_Extract( &the_proxy->Active );
-
-  _Chain_Append( &_Thread_MP_Inactive_proxies, &the_thread->Object.Node );
-}
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/score/inline/rtems/score/tod.inl b/c/src/exec/score/inline/rtems/score/tod.inl
deleted file mode 100644
index 326d662e64..0000000000
--- a/c/src/exec/score/inline/rtems/score/tod.inl
+++ /dev/null
@@ -1,67 +0,0 @@
-/*  tod.inl
- *
- *  This file contains the static inline implementation of the inlined routines
- *  from the Time of Day Handler.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __TIME_OF_DAY_inl
-#define __TIME_OF_DAY_inl
-
-/*PAGE
- *
- *  _TOD_Tickle_ticks
- *
- *  DESCRIPTION:
- *
- *  This routine increments the ticks field of the current time of
- *  day at each clock tick.
- */
-
-RTEMS_INLINE_ROUTINE void _TOD_Tickle_ticks( void )
-{
-  _TOD_Current.ticks += 1;
-  _Watchdog_Ticks_since_boot += 1;
-}
-
-/*PAGE
- *
- *  _TOD_Deactivate
- *
- *  DESCRIPTION:
- *
- *  This routine deactivates updating of the current time of day.
- */
-
-RTEMS_INLINE_ROUTINE void _TOD_Deactivate( void )
-{
-  _Watchdog_Remove( &_TOD_Seconds_watchdog );
-}
-
-/*PAGE
- *
- *  _TOD_Activate
- *
- *  DESCRIPTION:
- *
- *  This routine activates updating of the current time of day.
- */
-
-RTEMS_INLINE_ROUTINE void _TOD_Activate(
-  Watchdog_Interval ticks
-)
-{
-  _Watchdog_Insert_ticks( &_TOD_Seconds_watchdog, ticks );
-}
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/score/inline/rtems/score/tqdata.inl b/c/src/exec/score/inline/rtems/score/tqdata.inl
deleted file mode 100644
index d589933cf8..0000000000
--- a/c/src/exec/score/inline/rtems/score/tqdata.inl
+++ /dev/null
@@ -1,73 +0,0 @@
-/*  tqdata.inl
- *
- *  This file contains the static inline implementation of the inlined
- *  routines needed to support the Thread Queue Data.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __THREAD_QUEUE_DATA_inl
-#define __THREAD_QUEUE_DATA_inl
-
-/*PAGE
- *
- *  _Thread_queue_Header_number
- *
- *  DESCRIPTION:
- *
- *  This function returns the index of the priority chain on which
- *  a thread of the_priority should be placed.
- */
-
-RTEMS_INLINE_ROUTINE unsigned32 _Thread_queue_Header_number (
-  Priority_Control the_priority
-)
-{
-  return (the_priority / TASK_QUEUE_DATA_PRIORITIES_PER_HEADER);
-}
-
-/*PAGE
- *
- *  _Thread_queue_Is_reverse_search
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the_priority indicates that the
- *  enqueue search should start at the front of this priority
- *  group chain, and FALSE if the search should start at the rear.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Thread_queue_Is_reverse_search (
-  Priority_Control the_priority
-)
-{
-  return ( the_priority & TASK_QUEUE_DATA_REVERSE_SEARCH_MASK );
-}
-
-/*PAGE
- *
- *  _Thread_queue_Enter_critical_section
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked to indicate that the specified thread queue is
- *  entering a critical section.
- */
- 
-RTEMS_INLINE_ROUTINE void _Thread_queue_Enter_critical_section (
-  Thread_queue_Control *the_thread_queue
-)
-{
-  the_thread_queue->sync_state = THREAD_QUEUE_NOTHING_HAPPENED;
-}
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/score/inline/rtems/score/userext.inl b/c/src/exec/score/inline/rtems/score/userext.inl
deleted file mode 100644
index 29f7975aaa..0000000000
--- a/c/src/exec/score/inline/rtems/score/userext.inl
+++ /dev/null
@@ -1,132 +0,0 @@
-/*  userext.inl
- *
- *  This file contains the macro implementation of the inlined routines
- *  from the User Extension Handler
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __USER_EXTENSIONS_inl
-#define __USER_EXTENSIONS_inl
-
-#include <rtems/score/wkspace.h>
-
-/*PAGE
- *
- *  _User_extensions_Handler_initialization
- *
- *  DESCRIPTION:
- *
- *  This routine performs the initialization necessary for this handler.
- */
-
-RTEMS_INLINE_ROUTINE void _User_extensions_Handler_initialization (
-    unsigned32              number_of_extensions,
-    User_extensions_Table  *initial_extensions
-)
-{
-  User_extensions_Control *extension;
-  unsigned32               i;
-
-  _Chain_Initialize_empty( &_User_extensions_List );
-
-  if ( initial_extensions ) {
-    for (i=0 ; i<number_of_extensions ; i++ ) {
-      extension =
-         _Workspace_Allocate_or_fatal_error( sizeof(User_extensions_Control) );
-
-      extension->Callouts = initial_extensions[i];
-      _Chain_Append( &_User_extensions_List, &extension->Node );
-    }
-  }
-}
-
-/*PAGE
- *
- *  _User_extensions_Add_set
- *
- *  DESCRIPTION:
- *
- *  This routine is used to add a user extension set to the active list.
- */
-
-RTEMS_INLINE_ROUTINE void _User_extensions_Add_set (
-  User_extensions_Control *the_extension,
-  User_extensions_Table   *extension_table
-)
-{
-  the_extension->Callouts = *extension_table;
-
-  _Chain_Append( &_User_extensions_List, &the_extension->Node );
-}
-
-/*PAGE
- *
- *  _User_extensions_Add_API_set
- *  DESCRIPTION:
- *
- *  This routine is used to add an API extension set to the active list.
- */
- 
-RTEMS_INLINE_ROUTINE void _User_extensions_Add_API_set (
-  User_extensions_Control *the_extension
-)
-{
-  _Chain_Prepend( &_User_extensions_List, &the_extension->Node );
-}
- 
-/*PAGE
- *
- *  _User_extensions_Remove_set
- *
- *  DESCRIPTION:
- *
- *  This routine is used to remove a user extension set from the active list.
- */
-
-RTEMS_INLINE_ROUTINE void _User_extensions_Remove_set (
-  User_extensions_Control  *the_extension
-)
-{
-  _Chain_Extract( &the_extension->Node );
-}
-
-/*PAGE
- *
- *  _User_extensions_Thread_switch
- *
- *  DESCRIPTION:
- *
- *  This routine is used to invoke the user extension which
- *  is invoked when a context switch occurs.
- */
-
-RTEMS_INLINE_ROUTINE void _User_extensions_Thread_switch (
-  Thread_Control *executing,
-  Thread_Control *heir
-)
-{
-  Chain_Node              *the_node;
-  User_extensions_Control *the_extension;
-
-  for ( the_node = _User_extensions_List.first ;
-        !_Chain_Is_tail( &_User_extensions_List, the_node ) ;
-        the_node = the_node->next ) {
-
-    the_extension = (User_extensions_Control *) the_node;
-
-    if ( the_extension->Callouts.thread_switch != NULL )
-      (*the_extension->Callouts.thread_switch)( executing, heir );
-  }
-}
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/score/inline/rtems/score/watchdog.inl b/c/src/exec/score/inline/rtems/score/watchdog.inl
deleted file mode 100644
index 9662a9abc6..0000000000
--- a/c/src/exec/score/inline/rtems/score/watchdog.inl
+++ /dev/null
@@ -1,324 +0,0 @@
-/*  watchdog.inl
- *
- *  This file contains the static inline implementation of all inlined
- *  routines in the Watchdog Handler.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __WATCHDOG_inl
-#define __WATCHDOG_inl
-
-/*PAGE
- *
- *  _Watchdog_Initialize
- *
- *  DESCRIPTION:
- *
- *  This routine initializes the specified watchdog.  The watchdog is
- *  made inactive, the watchdog id and handler routine are set to the
- *  specified values.
- */
-
-RTEMS_INLINE_ROUTINE void _Watchdog_Initialize(
-  Watchdog_Control               *the_watchdog,
-  Watchdog_Service_routine_entry  routine,
-  Objects_Id                      id,
-  void                           *user_data
-)
-{
-  the_watchdog->state     = WATCHDOG_INACTIVE;
-  the_watchdog->routine   = routine;
-  the_watchdog->id        = id;
-  the_watchdog->user_data = user_data;
-}
-
-/*PAGE
- *
- *  _Watchdog_Is_active
- *
- *  DESCRIPTION:
- *
- *  This routine returns TRUE if the watchdog timer is in the ACTIVE
- *  state, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Watchdog_Is_active(
-  Watchdog_Control *the_watchdog
-)
-{
-
-  return ( the_watchdog->state == WATCHDOG_ACTIVE );
-
-}
-
-/*PAGE
- *
- *  _Watchdog_Activate
- *
- *  DESCRIPTION:
- *
- *  This routine activates THE_WATCHDOG timer which is already
- *  on a watchdog chain.
- */
-
-RTEMS_INLINE_ROUTINE void _Watchdog_Activate(
-  Watchdog_Control *the_watchdog
-)
-{
-
-  the_watchdog->state = WATCHDOG_ACTIVE;
-
-}
-
-/*PAGE
- *
- *  _Watchdog_Deactivate
- *
- *  DESCRIPTION:
- *
- *  This routine deactivates THE_WATCHDOG timer which will remain
- *  on a watchdog chain.
- */
-
-RTEMS_INLINE_ROUTINE void _Watchdog_Deactivate(
-  Watchdog_Control *the_watchdog
-)
-{
-
-  the_watchdog->state = WATCHDOG_REMOVE_IT;
-
-}
-
-/*PAGE
- *
- *  _Watchdog_Tickle_ticks
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked at each clock tick to update the ticks
- *  watchdog chain.
- */
-
-RTEMS_INLINE_ROUTINE void _Watchdog_Tickle_ticks( void )
-{
-
-  _Watchdog_Tickle( &_Watchdog_Ticks_chain );
-
-}
-
-/*PAGE
- *
- *  _Watchdog_Tickle_seconds
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked at each clock tick to update the seconds
- *  watchdog chain.
- */
-
-RTEMS_INLINE_ROUTINE void _Watchdog_Tickle_seconds( void )
-{
-
-  _Watchdog_Tickle( &_Watchdog_Seconds_chain );
-
-}
-
-/*PAGE
- *
- *  _Watchdog_Insert_ticks
- *
- *  DESCRIPTION:
- *
- *  This routine inserts THE_WATCHDOG into the ticks watchdog chain
- *  for a time of UNITS ticks.  The INSERT_MODE indicates whether
- *  THE_WATCHDOG is to be activated automatically or later, explicitly
- *  by the caller.
- */
-
-RTEMS_INLINE_ROUTINE void _Watchdog_Insert_ticks(
-  Watchdog_Control      *the_watchdog,
-  Watchdog_Interval      units
-)
-{
-
-  the_watchdog->initial = units;
-
-  _Watchdog_Insert( &_Watchdog_Ticks_chain, the_watchdog );
-
-}
-
-/*PAGE
- *
- *  _Watchdog_Insert_seconds
- *
- *  DESCRIPTION:
- *
- *  This routine inserts THE_WATCHDOG into the seconds watchdog chain
- *  for a time of UNITS seconds.  The INSERT_MODE indicates whether
- *  THE_WATCHDOG is to be activated automatically or later, explicitly
- *  by the caller.
- */
-
-RTEMS_INLINE_ROUTINE void _Watchdog_Insert_seconds(
-  Watchdog_Control      *the_watchdog,
-  Watchdog_Interval      units
-)
-{
-
-  the_watchdog->initial = units;
-
-  _Watchdog_Insert( &_Watchdog_Seconds_chain, the_watchdog );
-
-}
-
-/*PAGE
- *
- *  _Watchdog_Adjust_seconds
- *
- *  DESCRIPTION:
- *
- *  This routine adjusts the seconds watchdog chain in the forward
- *  or backward DIRECTION for UNITS seconds.  This is invoked when the
- *  current time of day is changed.
- */
-
-RTEMS_INLINE_ROUTINE void _Watchdog_Adjust_seconds(
-  Watchdog_Adjust_directions direction,
-  Watchdog_Interval          units
-)
-{
-
-  _Watchdog_Adjust( &_Watchdog_Seconds_chain, direction, units );
-
-}
-
-/*PAGE
- *
- *  _Watchdog_Adjust_ticks
- *
- *  DESCRIPTION:
- *
- *  This routine adjusts the ticks watchdog chain in the forward
- *  or backward DIRECTION for UNITS ticks.
- */
-
-RTEMS_INLINE_ROUTINE void _Watchdog_Adjust_ticks(
-  Watchdog_Adjust_directions direction,
-  Watchdog_Interval          units
-)
-{
-
-  _Watchdog_Adjust( &_Watchdog_Ticks_chain, direction, units );
-
-}
-
-/*PAGE
- *
- *  _Watchdog_Reset
- *
- *  DESCRIPTION:
- *
- *  This routine resets THE_WATCHDOG timer to its state at INSERT
- *  time.  This routine is valid only on interval watchdog timers
- *  and is used to make an interval watchdog timer fire "every" so
- *  many ticks.
- */
-
-RTEMS_INLINE_ROUTINE void _Watchdog_Reset(
-  Watchdog_Control *the_watchdog
-)
-{
-
-  (void) _Watchdog_Remove( the_watchdog );
-
-  _Watchdog_Insert( &_Watchdog_Ticks_chain, the_watchdog );
-
-}
-
-/*PAGE
- *
- *  _Watchdog_Next
- *
- *  DESCRIPTION:
- *
- *  This routine returns a pointer to the watchdog timer following
- *  THE_WATCHDOG on the watchdog chain.
- */
-
-RTEMS_INLINE_ROUTINE Watchdog_Control *_Watchdog_Next(
-  Watchdog_Control *the_watchdog
-)
-{
-
-  return ( (Watchdog_Control *) the_watchdog->Node.next );
-
-}
-
-/*PAGE
- *
- *  _Watchdog_Previous
- *
- *  DESCRIPTION:
- *
- *  This routine returns a pointer to the watchdog timer preceding
- *  THE_WATCHDOG on the watchdog chain.
- */
-
-RTEMS_INLINE_ROUTINE Watchdog_Control *_Watchdog_Previous(
-  Watchdog_Control *the_watchdog
-)
-{
-
-  return ( (Watchdog_Control *) the_watchdog->Node.previous );
-
-}
-
-/*PAGE
- *
- *  _Watchdog_First
- *
- *  DESCRIPTION:
- *
- *  This routine returns a pointer to the first watchdog timer
- *  on the watchdog chain HEADER.
- */
-
-RTEMS_INLINE_ROUTINE Watchdog_Control *_Watchdog_First(
-  Chain_Control *header
-)
-{
-
-  return ( (Watchdog_Control *) header->first );
-
-}
-
-/*PAGE
- *
- *  _Watchdog_Last
- *
- *  DESCRIPTION:
- *
- *  This routine returns a pointer to the last watchdog timer
- *  on the watchdog chain HEADER.
- */
-
-RTEMS_INLINE_ROUTINE Watchdog_Control *_Watchdog_Last(
-  Chain_Control *header
-)
-{
-
-  return ( (Watchdog_Control *) header->last );
-
-}
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/score/inline/rtems/score/wkspace.inl b/c/src/exec/score/inline/rtems/score/wkspace.inl
deleted file mode 100644
index f92bde0f41..0000000000
--- a/c/src/exec/score/inline/rtems/score/wkspace.inl
+++ /dev/null
@@ -1,57 +0,0 @@
-/*  wkspace.inl
- *
- *  This include file contains the bodies of the routines which contains
- *  information related to the RAM Workspace.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __WORKSPACE_inl
-#define __WORKSPACE_inl
-
-/*PAGE
- *
- *  _Workspace_Allocate
- *
- *  DESCRIPTION:
- *
- *  This routine returns the address of a block of memory of size
- *  bytes.  If a block of the appropriate size cannot be allocated
- *  from the workspace, then NULL is returned.
- */
-
-RTEMS_INLINE_ROUTINE void *_Workspace_Allocate(
-  unsigned32 size
-)
-{
-   return _Heap_Allocate( &_Workspace_Area, size );
-}
-
-/*PAGE
- *
- *  _Workspace_Free
- *
- *  DESCRIPTION:
- *
- *  This function frees the specified block of memory.  If the block
- *  belongs to the Workspace and can be successfully freed, then
- *  TRUE is returned.  Otherwise FALSE is returned.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Workspace_Free(
-  void *block
-)
-{
-   return _Heap_Free( &_Workspace_Area, block );
-}
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/score/macros/rtems/score/Makefile.in b/c/src/exec/score/macros/rtems/score/Makefile.in
deleted file mode 100644
index f97d3bfcf3..0000000000
--- a/c/src/exec/score/macros/rtems/score/Makefile.in
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-I_PIECES= address chain coremsg coremutex coresem heap \
-    isr mppkt object objectmp priority stack states sysstate thread \
-    threadmp tod tqdata userext watchdog wkspace
-I_FILES=$(I_PIECES:%=$(srcdir)/%.inl)
-
-SRCS=$(I_FILES)
-
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/lib.cfg
-
-#
-# Add your list of files to delete here.  The config files
-#  already know how to delete some stuff, so you may want
-#  to just run 'make clean' first to see what gets missed.
-#  'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS += $(LIB)
-CLOBBER_ADDITIONS +=
-
-all:	$(SRCS)
-	$(INSTALL) -m 444 ${I_FILES} $(PROJECT_INCLUDE)/rtems/score
diff --git a/c/src/exec/score/macros/rtems/score/README b/c/src/exec/score/macros/rtems/score/README
deleted file mode 100644
index b2f0c4d481..0000000000
--- a/c/src/exec/score/macros/rtems/score/README
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-#  $Id$
-#
-
-The files in this directory are not considered the "primary" source
-of inlined routines for RTEMS.  The "inline" directory contains
-the implementations of the inlined basis which are regularly
-tested.  In general, an effort is made to keep the contents of
-this directory up to date but testing is only performed irregularly
-and even then it is usually with a single target processor and BSP.
-
-The primary purpose of the code in this directory is to insure
-that RTEMS can be compiled using a C compiler which does not support
-static inline routines.
-
-These were last successfully tested on 2/1/95 on a prerelease version
-of 3.2.0.  The testing was done only on the Force CPU386 i386 target board.
-No testing was done on version of the code in the final release.
diff --git a/c/src/exec/score/macros/rtems/score/address.inl b/c/src/exec/score/macros/rtems/score/address.inl
deleted file mode 100644
index 712809a4e7..0000000000
--- a/c/src/exec/score/macros/rtems/score/address.inl
+++ /dev/null
@@ -1,68 +0,0 @@
-/*  macros/address.h
- *
- *  This include file contains the bodies of the routines
- *  about addresses which are inlined.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __MACROS_ADDRESSES_h
-#define __MACROS_ADDRESSES_h
-
-/*PAGE
- *
- *  _Addresses_Add_offset
- *
- */
-
-#define _Addresses_Add_offset( _base, _offset ) \
-  ((void *)((char *)(_base) + (_offset)))
-
-/*PAGE
- *
- *  _Addresses_Subtract_offset
- *
- */
-
-#define _Addresses_Subtract_offset( _base, _offset ) \
-  ((void *)((char *)(_base) - (_offset)))
-
-/*PAGE
- *
- *  _Addresses_Subtract
- *
- *  NOTE:  The cast of an address to an unsigned32 makes this code
- *         dependent on an addresses being thirty two bits.
- */
-
-#define _Addresses_Subtract( _left, _right ) \
-  ((void *)(_left) - (void *)(_right))
-
-/*PAGE
- *
- *  _Addresses_Is_aligned
- *
- */
-
-#define _Addresses_Is_aligned( _address ) \
-    ( ( (unsigned32)(_address) % 4 ) == 0 )
-
-/*PAGE
- *
- *  _Addresses_Is_in_range
- *
- */
-
-#define _Addresses_Is_in_range( _address, _base, _limit ) \
-  ( (_address) >= (_base) && (_address) <= (_limit) )
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/score/macros/rtems/score/chain.inl b/c/src/exec/score/macros/rtems/score/chain.inl
deleted file mode 100644
index 85ede31c12..0000000000
--- a/c/src/exec/score/macros/rtems/score/chain.inl
+++ /dev/null
@@ -1,200 +0,0 @@
-/*  macros/chain.h
- *
- *  This include file contains the bodies of the routines which are
- *  associated with doubly linked chains and inlined.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __MACROS_CHAIN_h
-#define __MACROS_CHAIN_h
-
-/*PAGE
- *
- *  _Chain_Are_nodes_equal
- */
-
-#define _Chain_Are_nodes_equal( _left, _right ) \
-  ( (_left) == (_right) )
-
-/*PAGE
- *
- *  _Chain_Is_null
- */
-
-#define _Chain_Is_null( _the_chain ) \
-  ( (_the_chain) == NULL )
-
-/*PAGE
- *
- *  _Chain_Is_null_node
- */
-
-#define _Chain_Is_null_node( _the_node ) \
-  ( (_the_node) == NULL )
-
-/*PAGE
- *
- *  _Chain_Head
- */
-
-#define _Chain_Head( _the_chain ) \
-   ((Chain_Node *) (_the_chain))
-
-/*PAGE
- *
- *  _Chain_Tail
- */
-
-#define _Chain_Tail( _the_chain ) \
-   ((Chain_Node *) &(_the_chain)->permanent_null)
-
-/*PAGE
- *
- *  _Chain_Is_empty
- */
-
-#define _Chain_Is_empty( _the_chain ) \
-  ( (_the_chain)->first == _Chain_Tail( (_the_chain) ) )
-
-/*PAGE
- *
- *  _Chain_Is_first
- */
-
-#define _Chain_Is_first( _the_node ) \
-  ( (the_node)->previous == NULL )
-
-/*PAGE
- *
- *  _Chain_Is_last
- */
-
-#define _Chain_Is_last( _the_node ) \
-  ( (_the_node)->next == NULL )
-
-/*PAGE
- *
- *  _Chain_Has_only_one_node
- */
-
-#define _Chain_Has_only_one_node( _the_chain ) \
-  ( (_the_chain)->first == (_the_chain)->last )
-
-/*PAGE
- *
- *  _Chain_Is_head
- */
-
-#define _Chain_Is_head( _the_chain, _the_node ) \
-   ( (_the_node) == _Chain_Head( (_the_chain) ) )
-
-/*PAGE
- *
- *  _Chain_Is_tail
- */
-
-#define _Chain_Is_tail( _the_chain, _the_node ) \
-   ( (_the_node) == _Chain_Tail( (_the_chain) ) )
-
-/*PAGE
- *
- *  Chain_Initialize_empty
- */
-
-#define _Chain_Initialize_empty( _the_chain ) \
-{ \
-  (_the_chain)->first          = _Chain_Tail( (_the_chain) ); \
-  (_the_chain)->permanent_null = NULL; \
-  (_the_chain)->last           = _Chain_Head( (_the_chain) ); \
-}
-
-/*PAGE
- *
- *  _Chain_Extract_unprotected
- */
-
-#define _Chain_Extract_unprotected( _the_node ) \
-{ \
-  Chain_Node *_next; \
-  Chain_Node *_previous; \
-   \
-  _next           = (_the_node)->next; \
-  _previous       = (_the_node)->previous; \
-  _next->previous = _previous; \
-  _previous->next = _next; \
-}
-
-/*PAGE
- *
- *  _Chain_Get_unprotected
- */
-
-/*PAGE
- *
- *  Chain_Get_unprotected
- */
-
-#define _Chain_Get_unprotected( _the_chain ) \
-  (( !_Chain_Is_empty( (_the_chain) ) ) \
-    ? _Chain_Get_first_unprotected( (_the_chain) ) \
-    : NULL)
-
-/*PAGE
- *
- *  _Chain_Insert_unprotected
- */
-
-#define _Chain_Insert_unprotected( _after_node, _the_node ) \
-do {  \
-  Chain_Node *_before_node; \
-   \
-  (_the_node)->previous  = (_after_node); \
-  _before_node           = (_after_node)->next; \
-  (_after_node)->next    = (_the_node);  \
-  (_the_node)->next      = _before_node;  \
-  _before_node->previous = (_the_node);  \
-} while (0)
-
-/*PAGE
- *
- *  _Chain_Append_unprotected
- */
-
-#define _Chain_Append_unprotected( _the_chain, _the_node ) \
-{ \
-  Chain_Node *_old_last_node; \
-    \
-  (_the_node)->next     = _Chain_Tail( (_the_chain) ); \
-  _old_last_node        = (_the_chain)->last; \
-  (_the_chain)->last    = (_the_node); \
-  _old_last_node->next  = (_the_node); \
-  (_the_node)->previous = _old_last_node; \
-}
-
-/*PAGE
- *
- *  _Chain_Prepend_unprotected
- */
-
-#define _Chain_Prepend_unprotected( _the_chain, _the_node ) \
-  _Chain_Insert_unprotected( _Chain_Head( (_the_chain) ), (_the_node) )
-
-/*PAGE
- *
- *  _Chain_Prepend
- */
-
-#define _Chain_Prepend( _the_chain, _the_node ) \
-  _Chain_Insert( _Chain_Head( (_the_chain) ), (_the_node) )
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/score/macros/rtems/score/coremsg.inl b/c/src/exec/score/macros/rtems/score/coremsg.inl
deleted file mode 100644
index 9868c97074..0000000000
--- a/c/src/exec/score/macros/rtems/score/coremsg.inl
+++ /dev/null
@@ -1,143 +0,0 @@
-/*  coremsg.inl
- *
- *  This include file contains the macro implementation of all
- *  inlined routines in the Core Message Handler.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __CORE_MESSAGE_QUEUE_inl
-#define __CORE_MESSAGE_QUEUE_inl
-
-/*PAGE
- *
- *  _CORE_message_queue_Send
- *
- */
- 
-#define _CORE_message_queue_Send( _the_message_queue, _buffer, _size, \
-_id, _api_message_queue_mp_support ) \
-  _CORE_message_queue_Submit( (_the_message_queue), (_buffer), (_size), \
-     (_id), (_api_message_queue_mp_support), CORE_MESSAGE_QUEUE_SEND_REQUEST )
- 
-/*PAGE
- *
- *  _CORE_message_queue_Urgent
- *
- */
- 
-#define _CORE_message_queue_Urgent( _the_message_queue, _buffer, _size, \
-_id, _api_message_queue_mp_support ) \
-  _CORE_message_queue_Submit( (_the_message_queue), (_buffer), (_size), \
-     (_id), (_api_message_queue_mp_support), CORE_MESSAGE_QUEUE_URGENT_REQUEST )
-
-/*PAGE
- *
- *  _CORE_message_queue_Copy_buffer
- */
-
-#define _CORE_message_queue_Copy_buffer( _source, _destination, _size ) \
-  memcpy( _destination, _source, _size)
-
-/*PAGE
- *
- *  _CORE_message_queue_Allocate_message_buffer
- *
- */
-
-#define _CORE_message_queue_Allocate_message_buffer( _the_message_queue ) \
-  (CORE_message_queue_Buffer_control *) \
-    _Chain_Get( &(_the_message_queue)->Inactive_messages )
-
-/*PAGE
- *
- *  _CORE_message_queue_Free_message_buffer
- *
- */
-
-#define _CORE_message_queue_Free_message_buffer( _the_message_queue, _the_message ) \
-  _Chain_Append( \
-    &(_the_message_queue)->Inactive_messages, \
-    &(_the_message)->Node \
-  )
-
-/*PAGE
- *
- *  _CORE_message_queue_Is_priority
- *
- */
- 
-#define _CORE_message_queue_Is_priority( _the_attribute ) \
-  ((_the_attribute)->discipline == CORE_MESSAGE_QUEUE_DISCIPLINES_PRIORITY)
-
-/*PAGE
- *
- *  _CORE_message_queue_Get_pending_message
- *
- */
-
-#define _CORE_message_queue_Get_pending_message( _the_message_queue ) \
-   (CORE_message_queue_Buffer_control *) \
-     _Chain_Get_unprotected( &(_the_message_queue)->Pending_messages )
-
-/*PAGE
- *
- *  _CORE_message_queue_Append
- *
- */
-
-#define _CORE_message_queue_Append( _the_message_queue, _the_message ) \
-   _Chain_Append( &(_the_message_queue)->Pending_messages, \
-                  &(_the_message)->Node )
-
-/*PAGE
- *
- *  _CORE_message_queue_Prepend
- *
- */
-
-#define _CORE_message_queue_Prepend( _the_message_queue, _the_message ) \
-   _Chain_Prepend( &(_the_message_queue)->Pending_messages, \
-                   &(_the_message)->Node )
-
-/*PAGE
- *
- *  _CORE_message_queue_Is_null
- *
- */
-
-#define _CORE_message_queue_Is_null( _the_message_queue ) \
-   ( (_the_message_queue) == NULL  )
-
-/*PAGE
- *
- *  _CORE_message_queue_Is_notify_enabled
- *
- */
- 
-#define _CORE_message_queue_Is_notify_enabled( _the_message_queue ) \
-  ( (_the_message_queue)->notify_handler != NULL )
- 
-/*PAGE
- *
- *  _CORE_message_queue_Set_notify
- *
- */
- 
-#define _CORE_message_queue_Set_notify( \
-  _the_message_queue, _the_handler, _the_argument ) \
-    do { \
-      (_the_message_queue)->notify_handler  = (_the_handler); \
-      (_the_message_queue)->notify_argument = (_the_argument); \
-    } while ( 0 )
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/score/macros/rtems/score/coremutex.inl b/c/src/exec/score/macros/rtems/score/coremutex.inl
deleted file mode 100644
index 19d535dc4e..0000000000
--- a/c/src/exec/score/macros/rtems/score/coremutex.inl
+++ /dev/null
@@ -1,77 +0,0 @@
-/*  macros/coremutex.h
- *
- *  This include file contains all of the inlined routines associated
- *  with core mutexes.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __MACROS_CORE_MUTEX_h
-#define __MACROS_CORE_MUTEX_h
-
-
-/*PAGE
- *
- *  _CORE_mutex_Is_locked
- *
- */
- 
-#define _CORE_mutex_Is_locked( _the_mutex ) \
-  ( (_the_mutex)->lock == CORE_MUTEX_LOCKED )
- 
-/*PAGE
- *
- *  _CORE_mutex_Is_fifo
- *
- */
- 
-#define _CORE_mutex_Is_fifo( _the_attribute ) \
-  ( (_the_attribute)->discipline == CORE_MUTEX_DISCIPLINES_FIFO )
- 
-/*PAGE
- *
- *  _CORE_mutex_Is_priority
- *
- */
-
-#define _CORE_mutex_Is_priority( _the_attribute ) \
-  ( (_the_attribute)->discipline == CORE_MUTEX_DISCIPLINES_PRIORITY )
-
-/*PAGE
- *
- *  _CORE_mutex_Is_inherit_priority
- *
- */
- 
-#define _CORE_mutex_Is_inherit_priority( _the_attribute ) \
-  ( (_the_attribute)->discipline == \
-                               CORE_MUTEX_DISCIPLINES_PRIORITY_INHERIT )
- 
-/*PAGE
- *
- *  _CORE_mutex_Is_priority_ceiling
- *
- */
- 
-#define _CORE_mutex_Is_priority_ceiling( _the_attribute )\
-  ( (_the_attribute)->discipline == CORE_MUTEX_DISCIPLINES_PRIORITY_CEILING )
- 
-/*PAGE
- *
- *  _CORE_mutex_Is_nesting_allowed
- *
- */
- 
-#define _CORE_mutex_Is_nesting_allowed( _the_attribute ) \
-  ( (_the_attribute)->allow_nesting == TRUE )
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/score/macros/rtems/score/coresem.inl b/c/src/exec/score/macros/rtems/score/coresem.inl
deleted file mode 100644
index fed9227c59..0000000000
--- a/c/src/exec/score/macros/rtems/score/coresem.inl
+++ /dev/null
@@ -1,40 +0,0 @@
-/*  macros/coresem.h
- *
- *  This include file contains all of the inlined routines associated
- *  with core semaphores.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __MACROS_CORE_SEMAPHORE_h
-#define __MACROS_CORE_SEMAPHORE_h
-
-/*PAGE
- *
- *  _CORE_semaphore_Is_priority
- *
- */
-
-#define _CORE_semaphore_Is_priority( _the_attribute ) \
-  ( (_the_attribute)->discipline == CORE_SEMAPHORE_DISCIPLINES_PRIORITY )
-
-/*PAGE
- *
- *  _Core_semaphore_Get_count
- *
- */
- 
-#define _Core_semaphore_Get_count( _the_semaphore ) \
-  ( (_the_semaphore)->count )
-
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/score/macros/rtems/score/heap.inl b/c/src/exec/score/macros/rtems/score/heap.inl
deleted file mode 100644
index d4bb8edb97..0000000000
--- a/c/src/exec/score/macros/rtems/score/heap.inl
+++ /dev/null
@@ -1,150 +0,0 @@
-/*  heap.inl
- *
- *  This file contains the macro implementation of the inlined
- *  routines from the heap handler.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __HEAP_inl
-#define __HEAP_inl
-
-#include <rtems/score/address.h>
-
-/*PAGE
- *
- *  _Heap_Head
- */
-
-#define _Heap_Head( _the_heap ) \
-  ((Heap_Block *)&(_the_heap)->start)
-
-/*PAGE
- *
- *  _Heap_Tail
- */
-
-#define _Heap_Tail( _the_heap ) \
-  ((Heap_Block *)&(_the_heap)->final)
-
-/*PAGE
- *
- *  _Heap_Previous_block
- */
-
-#define _Heap_Previous_block( _the_block ) \
-  ( (Heap_Block *) _Addresses_Subtract_offset( \
-      (void *)(_the_block), \
-      (_the_block)->back_flag & ~ HEAP_BLOCK_USED \
-    ) \
-  )
-
-/*PAGE
- *
- *  _Heap_Next_block
- */
-
-#define _Heap_Next_block( _the_block ) \
-  ( (Heap_Block *) _Addresses_Add_offset( \
-      (void *)(_the_block), \
-      (_the_block)->front_flag & ~ HEAP_BLOCK_USED \
-    ) \
-  )
-
-/*PAGE
- *
- *  _Heap_Block_at
- */
-
-#define _Heap_Block_at( _base, _offset ) \
-  ( (Heap_Block *) \
-     _Addresses_Add_offset( (void *)(_base), (_offset) ) )
-
-/*PAGE
- *
- *  _Heap_User_block_at
- *
- */
- 
-#define _Heap_User_block_at( _base ) \
-  _Heap_Block_at( \
-    (_base), \
-    -*(((unsigned32 *) (_base)) - 1) + -HEAP_BLOCK_USED_OVERHEAD \
-  )
-
-/*PAGE
- *
- *  _Heap_Is_previous_block_free
- */
-
-#define _Heap_Is_previous_block_free( _the_block ) \
-  ( !((_the_block)->back_flag & HEAP_BLOCK_USED) )
-
-/*PAGE
- *
- *  _Heap_Is_block_free
- */
-
-#define _Heap_Is_block_free( _the_block ) \
-  ( !((_the_block)->front_flag & HEAP_BLOCK_USED) )
-
-/*PAGE
- *
- *  _Heap_Is_block_used
- */
-
-#define _Heap_Is_block_used( _the_block ) \
-  ((_the_block)->front_flag & HEAP_BLOCK_USED)
-
-/*PAGE
- *
- *  _Heap_Block_size
- */
-
-#define _Heap_Block_size( _the_block )    \
-  ((_the_block)->front_flag & ~HEAP_BLOCK_USED)
-
-/*PAGE
- *
- *  _Heap_Start_of_user_area
- */
-
-#define _Heap_Start_of_user_area( _the_block ) \
-  ((void *) &(_the_block)->next)
-
-/*PAGE
- *
- *  _Heap_Is_block_in
- */
-
-#define _Heap_Is_block_in( _the_heap, _the_block ) \
-  ( ((_the_block) >= (_the_heap)->start) && \
-    ((_the_block) <= (_the_heap)->final) )
-
-/*PAGE
- *
- *  _Heap_Is_page_size_valid
- */
-
-#define _Heap_Is_page_size_valid( _page_size ) \
-  ( ((_page_size) != 0) && \
-    (((_page_size) % CPU_HEAP_ALIGNMENT) == 0) )
-
-/*PAGE
- *
- *  _Heap_Build_flag
- */
-
-#define _Heap_Build_flag( _size, _in_use_flag ) \
-  ( (_size) | (_in_use_flag))
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/score/macros/rtems/score/isr.inl b/c/src/exec/score/macros/rtems/score/isr.inl
deleted file mode 100644
index b642c4fed2..0000000000
--- a/c/src/exec/score/macros/rtems/score/isr.inl
+++ /dev/null
@@ -1,48 +0,0 @@
-/*  isr.inl
- *
- *  This include file contains the macro implementation of all
- *  inlined routines in the Interrupt Handler.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __ISR_inl
-#define __ISR_inl
-
-/*PAGE
- *
- *  _ISR_Is_in_progress
- *
- */
-
-#define _ISR_Is_in_progress() \
-        (_ISR_Nest_level != 0)
-
-/*PAGE
- *
- *  _ISR_Is_vector_number_valid
- *
- */
-
-#define _ISR_Is_vector_number_valid( _vector ) \
-  ( (_vector) <= CPU_INTERRUPT_MAXIMUM_VECTOR_NUMBER )
-
-/*PAGE
- *
- *  _ISR_Is_valid_user_handler
- *
- */
-
-#define _ISR_Is_valid_user_handler( _handler ) \
-  ((_handler) != NULL)
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/score/macros/rtems/score/mppkt.inl b/c/src/exec/score/macros/rtems/score/mppkt.inl
deleted file mode 100644
index b698602626..0000000000
--- a/c/src/exec/score/macros/rtems/score/mppkt.inl
+++ /dev/null
@@ -1,41 +0,0 @@
-/*  macros/mppkt.h
- *
- *  This package is the implementation of the Packet Handler
- *  routines which are inlined.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __MACROS_MP_PACKET_h
-#define __MACROS_MP_PACKET_h
-
-/*PAGE
- *
- *  _Mp_packet_Is_valid_packet_class
- *
- *  NOTE: Check for lower bounds (MP_PACKET_CLASSES_FIRST ) is unnecessary
- *        because this enum starts at lower bound of zero.
- */
-
-#define _Mp_packet_Is_valid_packet_class( _the_packet_class ) \
-  ( (_the_packet_class) <= MP_PACKET_CLASSES_LAST )
-
-/*PAGE
- *
- *  _Mp_packet_Is_null
- *
- */
-
-#define _Mp_packet_Is_null ( _the_packet ) \
-  ( (_the_packet) == NULL )
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/score/macros/rtems/score/object.inl b/c/src/exec/score/macros/rtems/score/object.inl
deleted file mode 100644
index cce2cbde9b..0000000000
--- a/c/src/exec/score/macros/rtems/score/object.inl
+++ /dev/null
@@ -1,148 +0,0 @@
-/*  object.inl
- *
- *  This include file contains the macro implementation of all
- *  of the inlined routines in the Object Handler.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __OBJECTS_inl
-#define __OBJECTS_inl
-
-/*PAGE
- *
- *  _Objects_Build_id
- *
- */
-
-#define _Objects_Build_id( _the_class, _node, _index ) \
-  ( ((_the_class) << OBJECTS_CLASS_START_BIT) | \
-    ((_node) << OBJECTS_NODE_START_BIT)       | \
-    ((_index) << OBJECTS_INDEX_START_BIT) )
-
-/*PAGE
- *
- *  _Objects_Get_class
- */
- 
-#define _Objects_Get_class( _id ) \
-  (Objects_Classes) \
-    (((_id) >> OBJECTS_CLASS_START_BIT) & OBJECTS_CLASS_VALID_BITS)
-
-/*PAGE
- *
- *  _Objects_Get_node
- *
- */
-
-#define _Objects_Get_node( _id ) \
-  (((_id) >> OBJECTS_NODE_START_BIT) & OBJECTS_NODE_VALID_BITS)
-
-/*PAGE
- *
- *  _Objects_Get_index
- *
- */
-
-#define _Objects_Get_index( _id ) \
-  (((_id) >> OBJECTS_INDEX_START_BIT) & OBJECTS_INDEX_VALID_BITS)
-
-/*PAGE
- *
- *  _Objects_Is_class_valid
- *
- */
- 
-#define _Objects_Is_class_valid( _the_class ) \
-  ( (_the_class) && (_the_class) <= OBJECTS_CLASSES_LAST )
-
-/*PAGE
- *
- *  _Objects_Is_local_node
- *
- */
-
-#define _Objects_Is_local_node( _node ) \
-  ( (_node) == _Objects_Local_node )
-
-/*PAGE
- *
- *  _Objects_Is_local_id
- *
- */
-
-#define _Objects_Is_local_id( _id ) \
-  _Objects_Is_local_node( _Objects_Get_node(_id) )
-
-/*PAGE
- *
- *  _Objects_Are_ids_equal
- *
- */
-
-#define _Objects_Are_ids_equal( _left, _right ) \
-  ( (_left) == (_right) )
-
-/*PAGE
- *
- *  _Objects_Allocate
- *
- */
-
-#define _Objects_Allocate( _information )  \
-  (Objects_Control *) _Chain_Get( &(_information)->Inactive )
-
-/*PAGE
- *
- *  _Objects_Free
- *
- */
-
-#define _Objects_Free( _information, _the_object )  \
-  _Chain_Append( &(_information)->Inactive, &(_the_object)->Node )
-
-/*PAGE
- *
- *  _Objects_Open
- *
- */
-
-#define _Objects_Open( _information, _the_object, _name ) \
-  { \
-    unsigned32 _index; \
-    \
-    _index = _Objects_Get_index( (_the_object)->id ); \
-    (_information)->local_table[ _index ] = (_the_object); \
-    \
-    if ( (_information)->is_string ) \
-      _Objects_Copy_name_string( (_name), (_the_object)->name ); \
-    else \
-      _Objects_Copy_name_raw( \
-        (_name), (_the_object)->name, (_information)->name_length ); \
-  }
-
-/*PAGE
- *
- *  _Objects_Close
- *
- */
-
-#define _Objects_Close( _information, _the_object ) \
-  { \
-    unsigned32 _index; \
-    \
-    _index = _Objects_Get_index( (_the_object)->id ); \
-    (_information)->local_table[ _index ] = (Objects_Control *) NULL; \
-    _Objects_Clear_name( (_the_object)->name, (_information)->name_length ); \
-  }
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/score/macros/rtems/score/objectmp.inl b/c/src/exec/score/macros/rtems/score/objectmp.inl
deleted file mode 100644
index 4593857fba..0000000000
--- a/c/src/exec/score/macros/rtems/score/objectmp.inl
+++ /dev/null
@@ -1,50 +0,0 @@
-/*  macros/objectmp.inl
- *
- *  This include file contains the bodies of all inlined routines
- *  which deal with global objects.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __MACROS_MP_OBJECTS_inl
-#define __MACROS_MP_OBJECTS_inl
-
-/*PAGE
- *
- *  _Objects_MP_Allocate_global_object
- *
- */
-
-#define _Objects_MP_Allocate_global_object() \
-  (Objects_MP_Control *) \
-           _Chain_Get( &_Objects_MP_Inactive_global_objects )
-
-/*PAGE
- *  _Objects_MP_Free_global_object
- *
- */
-
-#define _Objects_MP_Free_global_object( _the_object ) \
-  _Chain_Append( \
-    &_Objects_MP_Inactive_global_objects, \
-    &(_the_object)->Object.Node \
-  )
-
-/*PAGE
- *  _Objects_MP_Is_null_global_object
- *
- */
-
-#define _Objects_MP_Is_null_global_object( _the_object ) \
-  ( (_the_object) == NULL )
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/score/macros/rtems/score/priority.inl b/c/src/exec/score/macros/rtems/score/priority.inl
deleted file mode 100644
index c588289163..0000000000
--- a/c/src/exec/score/macros/rtems/score/priority.inl
+++ /dev/null
@@ -1,170 +0,0 @@
-/*  priority.inl
- *
- *  This file contains the macro implementation of all inlined routines
- *  in the Priority Handler.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __PRIORITY_inl
-#define __PRIORITY_inl
-
-#include <rtems/score/bitfield.h>
-
-/*PAGE
- *
- *  _Priority_Handler_initialization
- *
- */
-
-#define _Priority_Handler_initialization() \
-  { \
-    unsigned32 index; \
-    \
-    _Priority_Major_bit_map = 0; \
-    for ( index=0 ; index <16 ; index++ ) \
-       _Priority_Bit_map[ index ] = 0; \
-  }
-
-/*PAGE
- *
- *  _Priority_Is_valid
- *
- */
-
-  /* 
-   *  Since PRIORITY_MINIMUM is 0 and priorities are stored unsigned,
-   *  then checking for less than 0 is unnecessary.
-   */
-
-#define _Priority_Is_valid( _the_priority ) \
-  (  (_the_priority) <= PRIORITY_MAXIMUM )
-
-/*PAGE
- *
- *  _Priority_Major
- *
- */
-
-#define _Priority_Major( _the_priority ) ( (_the_priority) / 16 )
-
-/*PAGE
- *
- *  _Priority_Minor
- *
- */
-
-#define _Priority_Minor( _the_priority ) ( (_the_priority) % 16 )
-
-#if ( CPU_USE_GENERIC_BITFIELD_CODE == TRUE )
- 
-/*PAGE
- *
- *  _Priority_Mask
- *
- */
- 
-#define _Priority_Mask( _bit_number ) \
-  (0x8000 >> _bit_number)
- 
-/*PAGE
- *
- *  _Priority_Bits_index
- *
- */
- 
-#define _Priority_Bits_index( _bit_number ) \
-  (_bit_number)
- 
-#endif
- 
-/*PAGE
- *
- *  _Priority_Add_to_bit_map
- *
- */
-
-#define _Priority_Add_to_bit_map( _the_priority_map ) \
-   { \
-     *(_the_priority_map)->minor |= (_the_priority_map)->ready_minor; \
-     _Priority_Major_bit_map     |= (_the_priority_map)->ready_major; \
-   }
-
-/*PAGE
- *
- *  _Priority_Remove_from_bit_map
- *
- */
-
-#define _Priority_Remove_from_bit_map( _the_priority_map ) \
-   { \
-     *(_the_priority_map)->minor &= (_the_priority_map)->block_minor; \
-     if ( *(_the_priority_map)->minor == 0 ) \
-       _Priority_Major_bit_map &= (_the_priority_map)->block_major; \
-   }
-
-/*PAGE
- *
- *  _Priority_Get_highest
- *
- */
-
-#define _Priority_Get_highest( _high_priority ) \
-  { \
-    Priority_Bit_map_control minor; \
-    Priority_Bit_map_control major; \
-    \
-    _Bitfield_Find_first_bit( _Priority_Major_bit_map, major ); \
-    _Bitfield_Find_first_bit( _Priority_Bit_map[major], minor ); \
-    \
-    (_high_priority) = (_Priority_Bits_index( major ) * 16) +  \
-                        _Priority_Bits_index( minor ); \
-  }
-
-/*PAGE
- *
- *  _Priority_Initialize_information
- *
- */
-
-#define _Priority_Initialize_information( \
-     _the_priority_map, _new_priority ) \
-  { \
-    Priority_Bit_map_control _major; \
-    Priority_Bit_map_control _minor; \
-    Priority_Bit_map_control _mask;  \
-    \
-    _major = _Priority_Major( (_new_priority) ); \
-    _minor = _Priority_Minor( (_new_priority) ); \
-    \
-    (_the_priority_map)->minor =  \
-      &_Priority_Bit_map[ _Priority_Bits_index(_major) ]; \
-    \
-    _mask = _Priority_Mask( _major ); \
-    (_the_priority_map)->ready_major = _mask; \
-    (_the_priority_map)->block_major = ~_mask; \
-    \
-    _mask = _Priority_Mask( _minor ); \
-    (_the_priority_map)->ready_minor = _mask; \
-    (_the_priority_map)->block_minor = ~_mask; \
-  }
-
-/*PAGE
- *
- *  _Priority_Is_group_empty
- *
- */
-
-#define _Priority_Is_group_empty ( _the_priority ) \
-  ( (_the_priority) == 0 )
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/score/macros/rtems/score/stack.inl b/c/src/exec/score/macros/rtems/score/stack.inl
deleted file mode 100644
index 0e976eb0e0..0000000000
--- a/c/src/exec/score/macros/rtems/score/stack.inl
+++ /dev/null
@@ -1,50 +0,0 @@
-/*  stack.inl
- *
- *  This file contains the macro implementation of the inlined
- *  routines from the Stack Handler.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __STACK_inl
-#define __STACK_inl
-
-/*PAGE
- *
- *  _Stack_Initialize
- *
- */
-
-#define _Stack_Initialize( _the_stack, _starting_address, _size ) \
-  { \
-    (_the_stack)->area = (_starting_address); \
-    (_the_stack)->size = (_size);  \
-  }
-
-/*PAGE
- *
- *  _Stack_Is_enough
- *
- */
-
-#define _Stack_Is_enough( _size ) \
-  ( (_size) >= STACK_MINIMUM_SIZE )
-
-/*PAGE
- *
- *  _Stack_Adjust_size
- */
-
-#define _Stack_Adjust_size( _size ) \
-  ((_size) + CPU_STACK_ALIGNMENT)
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/score/macros/rtems/score/states.inl b/c/src/exec/score/macros/rtems/score/states.inl
deleted file mode 100644
index a100da077a..0000000000
--- a/c/src/exec/score/macros/rtems/score/states.inl
+++ /dev/null
@@ -1,210 +0,0 @@
-/*  states.inl
- *
- *  This file contains the macro implementation of the inlined
- *  routines associated with thread state information.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __STATES_inl
-#define __STATES_inl
-
-/*PAGE
- *
- *  _States_Set
- *
- */
-
-#define _States_Set( _states_to_set, _current_state ) \
-   ((_current_state) | (_states_to_set))
-
-/*PAGE
- *
- *  _States_Clear
- *
- */
-
-#define _States_Clear( _states_to_clear, _current_state ) \
-   ((_current_state) & ~(_states_to_clear))
-
-/*PAGE
- *
- *  _States_Is_ready
- *
- */
-
-#define _States_Is_ready( _the_states ) \
-   ( (_the_states) == STATES_READY )
-
-/*PAGE
- *
- *  _States_Is_only_dormant
- *
- */
-
-#define _States_Is_only_dormant( _the_states ) \
-   ( (_the_states) == STATES_DORMANT )
-
-/*PAGE
- *
- *  _States_Is_dormant
- *
- */
-
-#define _States_Is_dormant( _the_states ) \
-   ( (_the_states) & STATES_DORMANT )
-
-/*PAGE
- *
- *  _States_Is_suspended
- *
- */
-
-#define _States_Is_suspended( _the_states ) \
-   ( (_the_states) & STATES_SUSPENDED )
-
-/*PAGE
- *
- *  _States_Is_Transient
- *
- */
-
-#define _States_Is_transient( _the_states ) \
-   ( (_the_states) & STATES_TRANSIENT )
-
-/*PAGE
- *
- *  _States_Is_delaying
- *
- */
-
-#define _States_Is_delaying( _the_states ) \
-   ( (_the_states) & STATES_DELAYING )
-
-/*PAGE
- *
- *  _States_Is_waiting_for_buffer
- *
- */
-
-#define _States_Is_waiting_for_buffer( _the_states ) \
-   ( (_the_states) & STATES_WAITING_FOR_BUFFER )
-
-/*PAGE
- *
- *  _States_Is_waiting_for_segment
- *
- */
-
-#define _States_Is_waiting_for_segment( _the_states ) \
-   ( (_the_states) & STATES_WAITING_FOR_SEGMENT )
-
-/*PAGE
- *
- *  _States_Is_waiting_for_message
- *
- */
-
-#define _States_Is_waiting_for_message( _the_states ) \
-   ( (_the_states) & STATES_WAITING_FOR_MESSAGE )
-
-/*PAGE
- *
- *  _States_Is_waiting_for_event
- *
- */
-
-#define _States_Is_waiting_for_event( _the_states ) \
-   ( (_the_states) & STATES_WAITING_FOR_EVENT )
-
-/*PAGE
- *
- *  _States_Is_waiting_for_mutex
- *
- */
- 
-#define _States_Is_waiting_for_mutex( _the_states ) \
-   ( (_the_states) & STATES_WAITING_FOR_MUTEX )
-
-/*PAGE
- *
- *  _States_Is_waiting_for_semaphore
- *
- */
-
-#define _States_Is_waiting_for_semaphore( _the_states ) \
-   ( (_the_states) & STATES_WAITING_FOR_SEMAPHORE )
-
-/*PAGE
- *
- *  _States_Is_waiting_for_time
- *
- */
-
-#define _States_Is_waiting_for_time( _the_states ) \
-   ( (_the_states) & STATES_WAITING_FOR_TIME )
-
-/*PAGE
- *
- *  _States_Is_waiting_for_rpc_reply
- *
- */
-
-#define _States_Is_waiting_for_rpc_reply( _the_states ) \
-   ( (_the_states) & STATES_WAITING_FOR_RPC_REPLY )
-
-/*PAGE
- *
- *  _States_Is_waiting_for_period
- *
- */
-
-#define _States_Is_waiting_for_period( _the_states ) \
-   ( (_the_states) & STATES_WAITING_FOR_PERIOD )
-
-/*PAGE
- *
- *  _States_Is_locally_blocked
- *
- */
-
-#define _States_Is_locally_blocked( _the_states ) \
-   ( (_the_states) & STATES_LOCALLY_BLOCKED )
-
-/*PAGE
- *
- *  _States_Is_waiting_on_thread_queue
- *
- */
-
-#define _States_Is_waiting_on_thread_queue( _the_states ) \
-   ( (_the_states) & STATES_WAITING_ON_THREAD_QUEUE )
-
-/*PAGE
- *
- *  _States_Is_blocked
- *
- */
-
-#define _States_Is_blocked( _the_states ) \
-   ( (_the_states) & STATES_BLOCKED )
-
-/*PAGE
- *
- *  _States_Are_set
- *
- */
-
-#define _States_Are_set( _the_states, _mask ) \
-   ( ((_the_states) & (_mask)) != STATES_READY )
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/score/macros/rtems/score/sysstate.inl b/c/src/exec/score/macros/rtems/score/sysstate.inl
deleted file mode 100644
index 44957f6faa..0000000000
--- a/c/src/exec/score/macros/rtems/score/sysstate.inl
+++ /dev/null
@@ -1,90 +0,0 @@
-/*  sysstates.inl
- *
- *  This file contains the macro implementation of routines regarding the 
- *  system state.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __SYSTEM_STATE_inl
-#define __SYSTEM_STATE_inl
-
-/*PAGE
- *
- *  _System_state_Handler_initialization
- */
- 
-#define _System_state_Handler_initialization( _is_multiprocessing ) \
-  do { \
-    _System_state_Current = SYSTEM_STATE_BEFORE_INITIALIZATION; \
-    _System_state_Is_multiprocessing = (_is_multiprocessing); \
-  } while ( 0 )
-
-/*PAGE
- *
- *  _System_state_Set
- */
-
-#define _System_state_Set( _state ) \
-  do { \
-    _System_state_Current = (_state); \
-  } while ( 0 )
-
-/*PAGE
- *
- *  _System_state_Get
- */
-
-#define _System_state_Get() \
-  (_System_state_Current)
-
-/*PAGE
- *
- *  _System_state_Is_before_initialization
- */
-
-#define _System_state_Is_before_initialization( _state ) \
-  ((_state) == SYSTEM_STATE_BEFORE_INITIALIZATION)
-
-/*PAGE
- *
- *  _System_state_Is_before_multitasking
- */
-
-#define _System_state_Is_before_multitasking( _state ) \
-  ((_state) == SYSTEM_STATE_BEFORE_MULTITASKING)
-
-/*PAGE
- *
- *  _System_state_Is_begin_multitasking
- */
-
-#define _System_state_Is_begin_multitasking( _state ) \
-  ((_state) == SYSTEM_STATE_BEGIN_MULTITASKING)
-
-/*PAGE
- *
- *  _System_state_Is_up
- */
-
-#define _System_state_Is_up( _state ) \
-  ((_state) == SYSTEM_STATE_UP)
-
-/*PAGE
- *
- *  _System_state_Is_failed
- */
-
-#define _System_state_Is_failed( _state ) \
-  ((_state) == SYSTEM_STATE_FAILED)
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/score/macros/rtems/score/thread.inl b/c/src/exec/score/macros/rtems/score/thread.inl
deleted file mode 100644
index 96761143b8..0000000000
--- a/c/src/exec/score/macros/rtems/score/thread.inl
+++ /dev/null
@@ -1,217 +0,0 @@
-/*  thread.inl
- *
- *  This file contains the macro implementation of the inlined
- *  routines from the Thread handler.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __THREAD_inl
-#define __THREAD_inl
-
-/*PAGE
- *
- *  _Thread_Stop_multitasking
- *
- */
-
-#define _Thread_Stop_multitasking() \
-  _Context_Switch( &_Thread_Executing->Registers, &_Thread_BSP_context );
-
-/*PAGE
- *
- *  _Thread_Is_executing
- *
- */
-
-#define _Thread_Is_executing( _the_thread ) \
-        ( (_the_thread) == _Thread_Executing )
-
-/*PAGE
- *
- *  _Thread_Is_heir
- *
- */
-
-#define _Thread_Is_heir( _the_thread ) \
-        ( (_the_thread) == _Thread_Heir )
-
-/*PAGE
- *
- *  _Thread_Is_executing_also_the_heir
- *
- */
-
-#define _Thread_Is_executing_also_the_heir() \
-        ( _Thread_Executing == _Thread_Heir )
-
-/*PAGE
- *
- *  _Thread_Resume
- *
- */
-
-#define _Thread_Resume( _the_thread ) \
-        _Thread_Clear_state( (_the_thread), STATES_SUSPENDED )
-
-/*PAGE
- *
- *  _Thread_Unblock
- *
- */
-
-#define _Thread_Unblock( _the_thread ) \
-        _Thread_Clear_state( (_the_thread), STATES_BLOCKED );
-
-/*PAGE
- *
- *  _Thread_Restart_self
- *
- */
-
-#define _Thread_Restart_self()  \
-  {  \
-     if ( _Thread_Executing->fp_context != NULL ) \
-       _Context_Restore_fp( &_Thread_Executing->fp_context ); \
-     \
-    _CPU_Context_Restart_self( &_Thread_Executing->Registers ); \
-  }
-
-/*PAGE
- *
- *  _Thread_Calculate_heir
- *
- */
-
-#define _Thread_Calculate_heir() \
- { \
-   Priority_Control  highest; \
-   \
-   _Priority_Get_highest( highest ); \
-   \
-   _Thread_Heir = (Thread_Control *) _Thread_Ready_chain[ highest ].first; \
-  }
-
-/*PAGE
- *
- *  _Thread_Is_allocated_fp
- *
- */
-
-#define _Thread_Is_allocated_fp( _the_thread ) \
-        ( (_the_thread) == _Thread_Allocated_fp )
-
-/*PAGE
- *
- *  _Thread_Deallocate_fp
- *
- */
-
-#define _Thread_Deallocate_fp() \
-        _Thread_Allocated_fp = NULL
-
-/*PAGE
- *
- *  _Thread_Disable_dispatch
- *
- */
-
-#define _Thread_Disable_dispatch() \
-  _Thread_Dispatch_disable_level += 1
-
-/*PAGE
- *
- *  _Thread_Enable_dispatch
- *
- */
-
-#if ( CPU_INLINE_ENABLE_DISPATCH == TRUE )
-#define _Thread_Enable_dispatch()  \
-      { if ( (--_Thread_Dispatch_disable_level) == 0 ) \
-             _Thread_Dispatch();  \
-      }
-#endif
-
-#if ( CPU_INLINE_ENABLE_DISPATCH == FALSE )
-void _Thread_Enable_dispatch( void );
-#endif
-
-/*PAGE
- *
- *  _Thread_Unnest_dispatch
- *
- */
-
-#define _Thread_Unnest_dispatch()  \
-  _Thread_Dispatch_disable_level -= 1
-
-/*PAGE
- *
- *  _Thread_Is_dispatching_enabled
- *
- */
-
-#define _Thread_Is_dispatching_enabled() \
-  ( _Thread_Dispatch_disable_level == 0 )
-
-/*PAGE
- *
- *  _Thread_Is_context_switch_necessary
- *
- */
-
-#define _Thread_Is_context_switch_necessary() \
-  ( _Context_Switch_necessary == TRUE )
-
-/*PAGE
- *
- *  _Thread_Dispatch_initialization
- *
- */
-
-#define _Thread_Dispatch_initialization() \
-  _Thread_Dispatch_disable_level = 1
-
-/*PAGE
- *
- *  _Thread_Is_null
- *
- */
-
-#define _Thread_Is_null( _the_thread ) \
-  ( (_the_thread) == NULL )
-
-/*
- *  _Thread_Is_proxy_blocking
- *
- */
- 
-#define _Thread_Is_proxy_blocking( _code ) \
-  ( (_code) == THREAD_STATUS_PROXY_BLOCKING )
-
-/*
- *  _Thread_Internal_allocate
- *
- */
- 
-#define _Thread_Internal_allocate() \
-  ((Thread_Control *) _Objects_Allocate( &_Thread_Internal_information ))
- 
-/*
- *  _Thread_Internal_free
- *
- */
- 
-#define _Thread_Internal_free( _the_task ) \
-  _Objects_Free( &_Thread_Internal_information, &(_the_task)->Object )
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/score/macros/rtems/score/threadmp.inl b/c/src/exec/score/macros/rtems/score/threadmp.inl
deleted file mode 100644
index c9cc91319f..0000000000
--- a/c/src/exec/score/macros/rtems/score/threadmp.inl
+++ /dev/null
@@ -1,50 +0,0 @@
-/*  macros/threadmp.h
- *
- *  This include file contains the bodies of all inlined routines
- *  for the multiprocessing part of thread package.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __MACROS_MP_THREAD_h
-#define __MACROS_MP_THREAD_h
-
-/*PAGE
- *
- *  _Thread_MP_Is_receive
- *
- */
-
-#define _Thread_MP_Is_receive( _the_thread ) \
-  ( (_the_thread) == _Thread_MP_Receive)
-
-/*PAGE
- *
- *  _Thread_MP_Free_proxy
- *
- */
-
-#define _Thread_MP_Free_proxy( _the_thread ) \
-{ \
-  Thread_Proxy_control *_the_proxy; \
- \
-  _the_proxy = (Thread_Proxy_control *) (_the_thread); \
- \
-  _Chain_Extract( &_the_proxy->Active ); \
- \
-  _Chain_Append( \
-    &_Thread_MP_Inactive_proxies, \
-    &(_the_thread)->Object.Node \
-  ); \
-}
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/score/macros/rtems/score/tod.inl b/c/src/exec/score/macros/rtems/score/tod.inl
deleted file mode 100644
index 85603550ee..0000000000
--- a/c/src/exec/score/macros/rtems/score/tod.inl
+++ /dev/null
@@ -1,49 +0,0 @@
-/*  tod.inl
- *
- *  This file contains the macro implementation of the inlined routines
- *  from the Time of Day Handler.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __TIME_OF_DAY_inl
-#define __TIME_OF_DAY_inl
-
-/*PAGE
- *
- *  _TOD_Tickle_ticks
- *
- */
-
-#define _TOD_Tickle_ticks() \
-  _TOD_Current.ticks++; \
-  _Watchdog_Ticks_since_boot++
-
-/*PAGE
- *
- *  _TOD_Deactivate
- *
- */
-
-#define _TOD_Deactivate() \
-   _Watchdog_Remove( &_TOD_Seconds_watchdog )
-
-/*PAGE
- *
- *  _TOD_Activate
- *
- */
-
-#define _TOD_Activate( _ticks ) \
-   _Watchdog_Insert_ticks( &_TOD_Seconds_watchdog, (_ticks) )
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/score/macros/rtems/score/tqdata.inl b/c/src/exec/score/macros/rtems/score/tqdata.inl
deleted file mode 100644
index 0749e612d6..0000000000
--- a/c/src/exec/score/macros/rtems/score/tqdata.inl
+++ /dev/null
@@ -1,50 +0,0 @@
-/*  tqdata.inl
- *
- *  This file contains the macro implementation of the inlined
- *  routines needed to support the Thread Queue Data.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __THREAD_QUEUE_DATA_inl
-#define __THREAD_QUEUE_DATA_inl
-
-/*PAGE
- *
- *  _Thread_queue_Header_number
- *
- */
-
-#define _Thread_queue_Header_number( _the_priority ) \
-    ((_the_priority) / TASK_QUEUE_DATA_PRIORITIES_PER_HEADER)
-
-/*PAGE
- *
- *  _Thread_queue_Is_reverse_search
- *
- */
-
-#define _Thread_queue_Is_reverse_search( _the_priority ) \
-     ( (_the_priority) & TASK_QUEUE_DATA_REVERSE_SEARCH_MASK )
-
-/*PAGE
- *
- *  _Thread_queue_Enter_critical_section
- *
- */
- 
-#define _Thread_queue_Enter_critical_section( _the_thread_queue ) \
-  do { \
-    (_the_thread_queue)->sync_state = THREAD_QUEUE_NOTHING_HAPPENED; \
-  } while ( 0 )
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/score/macros/rtems/score/userext.inl b/c/src/exec/score/macros/rtems/score/userext.inl
deleted file mode 100644
index 37b0bf8d2a..0000000000
--- a/c/src/exec/score/macros/rtems/score/userext.inl
+++ /dev/null
@@ -1,126 +0,0 @@
-/*  userext.inl
- *
- *  This file contains the macro implementation of the inlined routines
- *  from the User Extension Handler
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __USER_EXTENSIONS_inl
-#define __USER_EXTENSIONS_inl
-
-/*PAGE
- *
- *  _User_extensions_Handler_initialization
- *
- */
-
-#define _User_extensions_Handler_initialization( _initial_extensions ) \
-  { \
-    _Chain_Initialize_empty( &_User_extensions_List ); \
-    \
-    if ( (_initial_extensions) ) { \
-      _User_extensions_Initial.Callouts = *(_initial_extensions); \
-      _Chain_Append( \
-        &_User_extensions_List, &_User_extensions_Initial.Node ); \
-    } \
-  }
-
-/*PAGE
- *
- *  _User_extensions_Add_set
- */
-
-#define _User_extensions_Add_set( _the_extension, _extension_table ) \
-  do { \
-    (_the_extension)->Callouts = *(_extension_table); \
-    \
-    _Chain_Append( &_User_extensions_List, &(_the_extension)->Node ); \
-  } while ( 0 )
-
-/*PAGE
- *
- *  _User_extensions_Add_API_set
- */
- 
-#define _User_extensions_Add_API_set( _the_extension ) \
-  _Chain_Prepend( &_User_extensions_List, &(_the_extension)->Node )
- 
-
-/*PAGE
- *
- *  _User_extensions_Remove_set
- */
-
-#define _User_extensions_Remove_set( _the_extension ) \
-  _Chain_Extract( &(_the_extension)->Node )
-
-/*PAGE
- *
- *  _User_extensions_Run_list_forward
- *
- *  NOTE:  No parentheses around macro names here to avoid
- *         messing up the name and function call expansion.
- */
-
-#define _User_extensions_Run_list_forward( _name, _arguments ) \
-  do { \
-    Chain_Node              *the_node; \
-    User_extensions_Control *the_extension; \
-    \
-    for ( the_node = _User_extensions_List.first ; \
-          !_Chain_Is_tail( &_User_extensions_List, the_node ) ; \
-          the_node = the_node->next ) { \
-      the_extension = (User_extensions_Control *) the_node; \
-      \
-      if ( the_extension->Callouts.## _name != NULL ) \
-        (*the_extension->Callouts.## _name) _arguments; \
-      \
-    } \
-    \
-  } while ( 0 )
-
-/*PAGE
- *
- *  _User_extensions_Run_list_backward
- *
- *  NOTE:  No parentheses around macro names here to avoid
- *         messing up the name and function call expansion.
- */
-
-#define _User_extensions_Run_list_backward( _name, _arguments ) \
-  do { \
-    Chain_Node              *the_node; \
-    User_extensions_Control *the_extension; \
-    \
-    for ( the_node = _User_extensions_List.last ; \
-          !_Chain_Is_head( &_User_extensions_List, the_node ) ; \
-          the_node = the_node->previous ) { \
-      the_extension = (User_extensions_Control *) the_node; \
-      \
-      if ( the_extension->Callouts.## _name != NULL ) \
-        (*the_extension->Callouts.## _name) _arguments; \
-      \
-    } \
-    \
-  } while ( 0 )
-
-/*PAGE
- *
- *  _User_extensions_Thread_switch
- *
- */
-
-#define _User_extensions_Thread_switch( _executing, _heir ) \
-  _User_extensions_Run_list_forward(thread_switch, (_executing, _heir) )
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/score/macros/rtems/score/watchdog.inl b/c/src/exec/score/macros/rtems/score/watchdog.inl
deleted file mode 100644
index fecc20e4f1..0000000000
--- a/c/src/exec/score/macros/rtems/score/watchdog.inl
+++ /dev/null
@@ -1,172 +0,0 @@
-/*  watchdog.inl
- *
- *  This file contains the macro implementation of all inlined routines
- *  in the Watchdog Handler.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __WATCHDOG_inl
-#define __WATCHDOG_inl
-
-#include <rtems/score/object.h>
-
-/*PAGE
- *
- *  _Watchdog_Initialize
- *
- */
-
-#define _Watchdog_Initialize( _the_watchdog, _routine, _id, _user_data )  \
-  { \
-    (_the_watchdog)->state     = WATCHDOG_INACTIVE; \
-    (_the_watchdog)->routine   = (_routine); \
-    (_the_watchdog)->id        = (_id); \
-    (_the_watchdog)->user_data = (_user_data); \
-  }
-
-/*PAGE
- *
- *  _Watchdog_Is_active
- *
- */
-
-#define _Watchdog_Is_active( _the_watchdog ) \
-  ( (_the_watchdog)->state == WATCHDOG_ACTIVE )
-
-/*PAGE
- *
- *  _Watchdog_Activate
- *
- */
-
-#define _Watchdog_Activate( _the_watchdog ) \
-  (_the_watchdog)->state = WATCHDOG_ACTIVE
-
-/*PAGE
- *
- *  _Watchdog_Deactivate
- *
- */
-
-#define _Watchdog_Deactivate( _the_watchdog ) \
-  (_the_watchdog)->state = WATCHDOG_REMOVE_IT
-
-/*PAGE
- *
- *  _Watchdog_Tickle_ticks
- *
- */
-
-#define _Watchdog_Tickle_ticks() \
-  _Watchdog_Tickle( &_Watchdog_Ticks_chain )
-
-/*PAGE
- *
- *  _Watchdog_Tickle_seconds
- *
- */
-
-#define _Watchdog_Tickle_seconds() \
-  _Watchdog_Tickle( &_Watchdog_Seconds_chain )
-
-/*PAGE
- *
- *  _Watchdog_Insert_ticks
- *
- */
-
-#define _Watchdog_Insert_ticks( _the_watchdog, _units ) \
-  do { \
-    (_the_watchdog)->initial = (_units); \
-    _Watchdog_Insert( &_Watchdog_Ticks_chain, (_the_watchdog) ); \
-  } while ( 0 )
-
-/*PAGE
- *
- *  _Watchdog_Insert_seconds
- *
- */
-
-#define _Watchdog_Insert_seconds( _the_watchdog, _units ) \
-  do { \
-    (_the_watchdog)->initial = (_units); \
-    _Watchdog_Insert( &_Watchdog_Seconds_chain, (_the_watchdog) ); \
-  } while ( 0 )
-
-/*PAGE
- *
- *  _Watchdog_Adjust_seconds
- *
- */
-
-#define _Watchdog_Adjust_seconds( _direction, _units ) \
-  _Watchdog_Adjust( &_Watchdog_Seconds_chain, (_direction), (_units) )
-
-/*PAGE
- *
- *  _Watchdog_Adjust_ticks
- *
- */
-
-#define _Watchdog_Adjust_ticks( _direction, _units ) \
-  _Watchdog_Adjust( &_Watchdog_Ticks_chain, (_direction), (_units) )
-
-/*PAGE
- *
- *  _Watchdog_Reset
- *
- */
-
-#define _Watchdog_Reset( _the_watchdog ) \
-   { \
-     (void) _Watchdog_Remove( (_the_watchdog) ); \
-     _Watchdog_Insert( &_Watchdog_Ticks_chain, (_the_watchdog) ); \
-   }
-
-/*PAGE
- *
- *  _Watchdog_Next
- *
- */
-
-#define _Watchdog_Next( _watchdog ) \
-  ((Watchdog_Control *) (_watchdog)->Node.next)
-
-/*PAGE
- *
- *  _Watchdog_Previous
- *
- */
-
-#define _Watchdog_Previous( _watchdog ) \
-  ((Watchdog_Control *) (_watchdog)->Node.previous)
-
-/*PAGE
- *
- *  _Watchdog_First
- *
- */
-
-#define _Watchdog_First( _header ) \
-  ((Watchdog_Control *) (_header)->first)
-
-/*PAGE
- *
- *  _Watchdog_Last
- *
- */
-
-#define _Watchdog_Last( _header ) \
-  ((Watchdog_Control *) (_header)->last)
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/score/macros/rtems/score/wkspace.inl b/c/src/exec/score/macros/rtems/score/wkspace.inl
deleted file mode 100644
index 525756db6b..0000000000
--- a/c/src/exec/score/macros/rtems/score/wkspace.inl
+++ /dev/null
@@ -1,39 +0,0 @@
-/*  wkspace.inl
- *
- *  This file contains the macro implementation of the inlined routines
- *  from the RAM Workspace Handler.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __WORKSPACE_inl
-#define __WORKSPACE_inl
-
-/*PAGE
- *
- *  _Workspace_Allocate
- *
- */
-
-#define _Workspace_Allocate( _size ) \
-   _Heap_Allocate( &_Workspace_Area, (_size) )
-
-/*PAGE
- *
- *  _Workspace_Free
- *
- */
-
-#define _Workspace_Free( _block ) \
-   _Heap_Free( &_Workspace_Area, (_block) )
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/score/src/coretod.c b/c/src/exec/score/src/coretod.c
deleted file mode 100644
index 72742944b4..0000000000
--- a/c/src/exec/score/src/coretod.c
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
- *  Time of Day (TOD) Handler
- *
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems/system.h>
-#include <rtems/score/object.h>
-#include <rtems/score/thread.h>
-#include <rtems/score/tod.h>
-#include <rtems/score/watchdog.h>
-
-/*PAGE
- *
- *  _TOD_Handler_initialization
- *
- *  This routine initializes the time of day handler.
- *
- *  Input parameters:
- *    microseconds_per_tick - microseconds between clock ticks
- *
- *  Output parameters: NONE
- */
-
-void _TOD_Handler_initialization(
-  unsigned32 microseconds_per_tick
-)
-{
-  _TOD_Microseconds_per_tick = microseconds_per_tick;
-
-  _TOD_Seconds_since_epoch = 0;
-
-  _TOD_Current.year   = TOD_BASE_YEAR;
-  _TOD_Current.month  = 1;
-  _TOD_Current.day    = 1;
-  _TOD_Current.hour   = 0;
-  _TOD_Current.minute = 0;
-  _TOD_Current.second = 0;
-  _TOD_Current.ticks  = 0;
-
-  if ( microseconds_per_tick == 0 )
-    _TOD_Ticks_per_second = 0;
-  else
-    _TOD_Ticks_per_second =
-       TOD_MICROSECONDS_PER_SECOND / microseconds_per_tick;
-
-  _Watchdog_Initialize( &_TOD_Seconds_watchdog, _TOD_Tickle, 0, NULL );
-
-  _TOD_Is_set = FALSE;
-  _TOD_Activate( _TOD_Ticks_per_second );
-}
-
-/*PAGE
- *
- *  _TOD_Set
- *
- *  This rountine sets the current date and time with the specified
- *  new date and time structure.
- *
- *  Input parameters:
- *    the_tod             - pointer to the time and date structure
- *    seconds_since_epoch - seconds since system epoch
- *
- *  Output parameters: NONE
- */
-
-void _TOD_Set(
-  TOD_Control *the_tod,
-  Watchdog_Interval  seconds_since_epoch
-)
-{
-  Watchdog_Interval ticks_until_next_second;
-
-  _Thread_Disable_dispatch();
-  _TOD_Deactivate();
-
-  if ( seconds_since_epoch < _TOD_Seconds_since_epoch )
-    _Watchdog_Adjust_seconds( WATCHDOG_BACKWARD,
-       _TOD_Seconds_since_epoch - seconds_since_epoch );
-  else
-    _Watchdog_Adjust_seconds( WATCHDOG_FORWARD,
-       seconds_since_epoch - _TOD_Seconds_since_epoch );
-
-  ticks_until_next_second = _TOD_Ticks_per_second;
-  if ( ticks_until_next_second > _TOD_Current.ticks )
-    ticks_until_next_second -= _TOD_Current.ticks;
-
-  _TOD_Current             = *the_tod;
-  _TOD_Seconds_since_epoch = seconds_since_epoch;
-  _TOD_Is_set              = TRUE;
-  _TOD_Activate( ticks_until_next_second );
-
-  _Thread_Enable_dispatch();
-}
-
-/*PAGE
- *
- *  _TOD_Validate
- *
- *  This kernel routine checks the validity of a date and time structure.
- *
- *  Input parameters:
- *    the_tod - pointer to a time and date structure
- *
- *  Output parameters:
- *    TRUE  - if the date, time, and tick are valid
- *    FALSE - if the the_tod is invalid
- *
- *  NOTE: This routine only works for leap-years through 2099.
- */
-
-boolean _TOD_Validate(
-  TOD_Control *the_tod
-)
-{
-  unsigned32 days_in_month;
-
-  if ((the_tod->ticks  >= _TOD_Ticks_per_second)  ||
-      (the_tod->second >= TOD_SECONDS_PER_MINUTE) ||
-      (the_tod->minute >= TOD_MINUTES_PER_HOUR)   ||
-      (the_tod->hour   >= TOD_HOURS_PER_DAY)      ||
-      (the_tod->month  == 0)                      ||
-      (the_tod->month  >  TOD_MONTHS_PER_YEAR)    ||
-      (the_tod->year   <  TOD_BASE_YEAR)          ||
-      (the_tod->day    == 0) )
-     return FALSE;
-
-  if ( (the_tod->year % 4) == 0 )
-    days_in_month = _TOD_Days_per_month[ 1 ][ the_tod->month ];
-  else
-    days_in_month = _TOD_Days_per_month[ 0 ][ the_tod->month ];
-
-  if ( the_tod->day > days_in_month )
-    return FALSE;
-
-  return TRUE;
-}
-
-/*PAGE
- *
- *  _TOD_To_seconds
- *
- *  This routine returns the seconds from the epoch until the
- *  current date and time.
- *
- *  Input parameters:
- *    the_tod - pointer to the time and date structure
- *
- *  Output parameters:
- *    returns    - seconds since epoch until the_tod
- */
-
-unsigned32 _TOD_To_seconds(
-  TOD_Control *the_tod
-)
-{
-  unsigned32 time;
-  unsigned32 year_mod_4;
-
-  time = the_tod->day - 1;
-  year_mod_4 = the_tod->year & 3;
-
-  if ( year_mod_4 == 0 )
-    time += _TOD_Days_to_date[ 1 ][ the_tod->month ];
-  else
-    time += _TOD_Days_to_date[ 0 ][ the_tod->month ];
-
-  time += ( (the_tod->year - TOD_BASE_YEAR) / 4 ) *
-            ( (TOD_DAYS_PER_YEAR * 4) + 1);
-
-  time += _TOD_Days_since_last_leap_year[ year_mod_4 ];
-
-  time *= TOD_SECONDS_PER_DAY;
-
-  time += ((the_tod->hour * TOD_MINUTES_PER_HOUR) + the_tod->minute)
-             * TOD_SECONDS_PER_MINUTE;
-
-  time += the_tod->second;
-
-  return( time );
-}
-
-/*PAGE
- *
- *  _TOD_Tickle
- *
- *  This routine updates the calendar time and tickles the
- *  per second watchdog timer chain.
- *
- *  Input parameters:
- *    ignored - this parameter is ignored
- *
- *  Output parameters: NONE
- *
- *  NOTE: This routine only works for leap-years through 2099.
- */
-
-void _TOD_Tickle(
-  Objects_Id  id,
-  void       *ignored
-)
-{
-  unsigned32 leap;
-
-  _TOD_Current.ticks = 0;
-  ++_TOD_Seconds_since_epoch;
-  if ( ++_TOD_Current.second >= TOD_SECONDS_PER_MINUTE ) {
-    _TOD_Current.second = 0;
-    if ( ++_TOD_Current.minute >= TOD_MINUTES_PER_HOUR ) {
-      _TOD_Current.minute = 0;
-      if ( ++_TOD_Current.hour >= TOD_HOURS_PER_DAY ) {
-        _TOD_Current.hour = 0;
-        if ( _TOD_Current.year & 0x3 ) leap = 0;
-        else                           leap = 1;
-        if ( ++_TOD_Current.day >
-               _TOD_Days_per_month[ leap ][ _TOD_Current.month ]) {
-          _TOD_Current.day = 1;
-          if ( ++_TOD_Current.month > TOD_MONTHS_PER_YEAR ) {
-            _TOD_Current.month = 1;
-            _TOD_Current.year++;
-          }
-        }
-      }
-    }
-  }
-
-  _Watchdog_Tickle_seconds();
-  _Watchdog_Insert_ticks( &_TOD_Seconds_watchdog, _TOD_Ticks_per_second );
-}
diff --git a/c/src/lib/include/rtems/assoc.h b/c/src/lib/include/rtems/assoc.h
deleted file mode 100644
index 1982d654ac..0000000000
--- a/c/src/lib/include/rtems/assoc.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *
- *  Rtems associativity routines.  Mainly used to convert a value from
- *  one space to another (eg: our errno's to host errno's and v.v)
- *
- *
- *  $Id$
- */
-
-#ifndef _INCLUDE_ASSOC_H
-#define _INCLUDE_ASSOC_H
-
-typedef struct {
-    const char   *name;
-    unsigned32   local_value;
-    unsigned32   remote_value;
-} rtems_assoc_t;
-
-/*
- * Flag/marker for optional default value in each table
- */
-
-#define RTEMS_ASSOC_DEFAULT_NAME "(default)"
-
-const rtems_assoc_t *rtems_assoc_ptr_by_name(const rtems_assoc_t *, const char *);
-const rtems_assoc_t *rtems_assoc_ptr_by_value(const rtems_assoc_t *, unsigned32);
-const rtems_assoc_t *rtems_assoc_ptr_by_remote(const rtems_assoc_t *, unsigned32);
-
-unsigned32   rtems_assoc_remote_by_local(const rtems_assoc_t *, unsigned32);
-unsigned32   rtems_assoc_local_by_remote(const rtems_assoc_t *, unsigned32);
-unsigned32   rtems_assoc_remote_by_name(const rtems_assoc_t *, const char *);
-unsigned32   rtems_assoc_local_by_name(const rtems_assoc_t *, const char *);
-const char  *rtems_assoc_name_by_local(const rtems_assoc_t *, unsigned32);
-const char  *rtems_assoc_name_by_remote(const rtems_assoc_t *, unsigned32);
-
-unsigned32   rtems_assoc_remote_by_local_bitfield(const rtems_assoc_t *, unsigned32);
-char  *rtems_assoc_name_by_local_bitfield(const rtems_assoc_t *, unsigned32, char *);
-char  *rtems_assoc_name_by_remote_bitfield(const rtems_assoc_t *, unsigned32, char *);
-unsigned32   rtems_assoc_local_by_remote_bitfield(const rtems_assoc_t *, unsigned32);
-
-
-#endif /* ! _INCLUDE_ASSOC_H */
diff --git a/c/src/lib/include/rtems/error.h b/c/src/lib/include/rtems/error.h
deleted file mode 100644
index a0698afb5d..0000000000
--- a/c/src/lib/include/rtems/error.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- *  Defines and externs for rtems error reporting
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_ERROR_h
-#define __RTEMS_ERROR_h
-
-/*
- * rtems_error() and rtems_panic() support
- */
-
-#define RTEMS_ERROR_ERRNO  (1<<((sizeof(int) * 8) - 2)) /* hi bit; use 'errno' */
-#define RTEMS_ERROR_PANIC  (RTEMS_ERROR_ERRNO / 2)       /* err fatal; no return */
-#define RTEMS_ERROR_ABORT  (RTEMS_ERROR_ERRNO / 4)       /* err is fatal; panic */
-
-#define RTEMS_ERROR_MASK  (RTEMS_ERROR_ERRNO | RTEMS_ERROR_ABORT | \
-                             RTEMS_ERROR_PANIC) /* all */
-
-const char *rtems_status_text(rtems_status_code);
-int   rtems_error(int error_code, const char *printf_format, ...);
-#ifdef __GNUC__
-void  rtems_panic(const char *printf_format, ...);
-/*
- *  We should be able to use this attribute but gcc complains that
- *  rtems_panic does in fact return. :(
- *
- *      __attribute__ ((__noreturn__));
- */
-#else
-void  rtems_panic(const char *printf_format, ...);
-#endif
-
-extern int rtems_panic_in_progress;
-
-#endif
-/* end of include file */
diff --git a/c/src/lib/include/rtems/libcsupport.h b/c/src/lib/include/rtems/libcsupport.h
deleted file mode 100644
index d007784526..0000000000
--- a/c/src/lib/include/rtems/libcsupport.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*  libcsupport.h
- *
- *  This include file contains the information regarding the
- *  RTEMS specific support for the standard C library.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __LIBC_SUPPORT_h
-#define __LIBC_SUPPORT_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <sys/types.h>
-
-void RTEMS_Malloc_Initialize(
-  void   *start,
-  size_t  length,
-  size_t  sbrk_amount
-);
-
-extern void malloc_dump(void);
-extern void malloc_walk(size_t source, size_t printf_enabled);
-extern void libc_init(int reentrant);
-extern int  host_errno(void);
-extern void fix_syscall_errno(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/c/src/lib/include/rtems/libio.h b/c/src/lib/include/rtems/libio.h
deleted file mode 100644
index dcdda85aec..0000000000
--- a/c/src/lib/include/rtems/libio.h
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * General purpose communication channel for RTEMS to allow UNIX/POSIX
- *    system call behavior on top of RTEMS IO devices.
- *
- * TODO
- *      stat(2)
- *      unlink(2)
- *      rename(2)
- *
- *  $Id$
- */
-
-#ifndef _RTEMS_LIBIO_H
-#define _RTEMS_LIBIO_H
-
-#include <sys/stat.h>
-
-typedef unsigned32 rtems_libio_offset_t;
-
-/*
- * An open file data structure, indexed by 'fd'
- * TODO:
- *    should really have a separate per/file data structure that this
- *    points to (eg: size, offset, driver, pathname should be in that)
- */
-
-typedef struct {
-    rtems_driver_name_t *driver;
-    rtems_libio_offset_t size;          /* size of file */
-    rtems_libio_offset_t offset;        /* current offset into the file */
-    unsigned32           flags;
-    char                *pathname;      /* opened pathname */
-    Objects_Id           sem;
-    unsigned32           data0;         /* private to "driver" */
-    void                *data1;         /* ... */
-} rtems_libio_t;
-
-
-/*
- * param block for read/write
- * Note: it must include 'offset' instead of using iop's offset since
- *       we can have multiple outstanding i/o's on a device.
- */
-
-typedef struct {
-    rtems_libio_t          *iop;
-    rtems_libio_offset_t    offset;
-    unsigned8              *buffer;
-    unsigned32              count;
-    unsigned32              flags;
-    unsigned32              bytes_moved;
-} rtems_libio_rw_args_t;
-
-/*
- * param block for open/close
- */
-
-typedef struct {
-    rtems_libio_t          *iop;
-    unsigned32              flags;
-    unsigned32              mode;
-} rtems_libio_open_close_args_t;
-
-/*
- * param block for ioctl
- */
-
-typedef struct {
-    rtems_libio_t          *iop;
-    unsigned32              command;
-    void                   *buffer;
-    unsigned32              ioctl_return;
-} rtems_libio_ioctl_args_t;
-
-
-/*
- * Values for 'flag'
- */
-
-#define LIBIO_FLAGS_NO_DELAY      0x0001  /* return immediately if no data */
-#define LIBIO_FLAGS_READ          0x0002  /* reading */
-#define LIBIO_FLAGS_WRITE         0x0004  /* writing */
-#define LIBIO_FLAGS_LINE_BUFFERED 0x0008  /* line buffered io (^h, ^u, etc) */
-#define LIBIO_FLAGS_OPEN          0x0100  /* device is open */
-#define LIBIO_FLAGS_APPEND        0x0200  /* all writes append */
-#define LIBIO_FLAGS_CREATE        0x0400  /* create file */
-
-#define LIBIO_FLAGS_READ_WRITE    (LIBIO_FLAGS_READ | LIBIO_FLAGS_WRITE)
-
-void rtems_libio_init(void);
-
-int __rtems_open(const char  *pathname, unsigned32 flag, unsigned32 mode);
-int __rtems_close(int  fd);
-int __rtems_read(int fd, void *buffer, unsigned32 count);
-int __rtems_write(int fd, const void *buffer, unsigned32 count);
-int __rtems_ioctl(int fd, unsigned32  command, void *buffer);
-int __rtems_lseek(int fd, rtems_libio_offset_t offset, int whence);
-int __rtems_fstat(int _fd, struct stat* _sbuf);
-
-/*
- * External I/O handlers
- */
-typedef struct {
-    int (*open)(const char  *pathname, unsigned32 flag, unsigned32 mode);
-    int (*close)(int  fd);
-    int (*read)(int fd, void *buffer, unsigned32 count);
-    int (*write)(int fd, const void *buffer, unsigned32 count);
-    int (*ioctl)(int fd, unsigned32  command, void *buffer);
-    int (*lseek)(int fd, rtems_libio_offset_t offset, int whence);
-} rtems_libio_handler_t;
-
-void rtems_register_libio_handler(int handler_flag,
-                                 const rtems_libio_handler_t *handler);
-
-#define RTEMS_FILE_DESCRIPTOR_TYPE_FILE         0x0000
-#define RTEMS_FILE_DESCRIPTOR_TYPE_SOCKET       0x1000
-#define rtems_make_file_descriptor(fd,flags)    ((fd)|(flags))
-#define rtems_file_descriptor_base(fd)          ((fd) & 0x0FFF)
-#define rtems_file_descriptor_type(fd)          ((fd) & 0xF000)
-#define rtems_file_descriptor_type_index(fd)    ((((fd) & 0xF000) >> 12) - 1)
-
-/*
- *  IOCTL values
- */
-
-#define       RTEMS_IO_GET_ATTRIBUTES 1
-#define       RTEMS_IO_SET_ATTRIBUTES 2
-#define       RTEMS_IO_TCDRAIN        3
-
-/*
- * Callbacks from TERMIOS routines to device-dependent code
- */
-#include <termios.h>
-typedef struct rtems_termios_callbacks {
-  int       (*firstOpen)(int major, int minor, void *arg);
-  int       (*lastClose)(int major, int minor, void *arg);
-  int       (*pollRead)(int minor);
-  int       (*write)(int minor, const char *buf, int len);
-  int       (*setAttributes)(int minor, const struct termios *t);
-  int       (*stopRemoteTx)(int minor);
-  int       (*startRemoteTx)(int minor);
-  int       outputUsesInterrupts;
-} rtems_termios_callbacks;
-
-/*
- * Device-independent TERMIOS routines
- */
-void rtems_termios_initialize (void);
-rtems_status_code rtems_termios_open (
-  rtems_device_major_number      major,
-  rtems_device_minor_number      minor,
-  void                          *arg,
-  const rtems_termios_callbacks *callbacks
-  );
-rtems_status_code rtems_termios_close (void *arg);
-rtems_status_code rtems_termios_read (void *arg);
-rtems_status_code rtems_termios_write (void *arg);
-rtems_status_code rtems_termios_ioctl (void *arg);
-int rtems_termios_enqueue_raw_characters (void *ttyp, char *buf, int len);
-int rtems_termios_dequeue_characters (void *ttyp, int len);
-void rtems_termios_reserve_resources(
-  rtems_configuration_table *configuration,
-  rtems_unsigned32           number_of_devices
-);
-
-#endif /* _RTEMS_LIBIO_H */
diff --git a/c/src/lib/include/sys/filio.h b/c/src/lib/include/sys/filio.h
deleted file mode 100644
index b82a649c0f..0000000000
--- a/c/src/lib/include/sys/filio.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)filio.h	8.1 (Berkeley) 3/28/94
- * $Id$
- */
-
-#ifndef	_SYS_FILIO_H_
-#define	_SYS_FILIO_H_
-
-#include <sys/ioccom.h>
-
-/* Generic file-descriptor ioctl's. */
-#define	FIOCLEX		 _IO('f', 1)		/* set close on exec on fd */
-#define	FIONCLEX	 _IO('f', 2)		/* remove close on exec */
-#define	FIONREAD	_IOR('f', 127, int)	/* get # bytes to read */
-#define	FIONBIO		_IOW('f', 126, int)	/* set/clear non-blocking i/o */
-#define	FIOASYNC	_IOW('f', 125, int)	/* set/clear async i/o */
-#define	FIOSETOWN	_IOW('f', 124, int)	/* set owner */
-#define	FIOGETOWN	_IOR('f', 123, int)	/* get owner */
-
-#endif /* !_SYS_FILIO_H_ */
diff --git a/c/src/lib/include/sys/ioctl.h b/c/src/lib/include/sys/ioctl.h
deleted file mode 100644
index e3a69a5a7f..0000000000
--- a/c/src/lib/include/sys/ioctl.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)ioctl.h	8.6 (Berkeley) 3/28/94
- * $Id$
- */
-
-#ifndef	_SYS_IOCTL_H_
-#define	_SYS_IOCTL_H_
-
-#include <sys/ttycom.h>
-
-/*
- * Pun for SunOS prior to 3.2.  SunOS 3.2 and later support TIOCGWINSZ
- * and TIOCSWINSZ (yes, even 3.2-3.5, the fact that it wasn't documented
- * notwithstanding).
- */
-struct ttysize {
-	unsigned short	ts_lines;
-	unsigned short	ts_cols;
-	unsigned short	ts_xxx;
-	unsigned short	ts_yyy;
-};
-#define	TIOCGSIZE	TIOCGWINSZ
-#define	TIOCSSIZE	TIOCSWINSZ
-
-#include <sys/ioccom.h>
-
-#include <sys/filio.h>
-#include <sys/sockio.h>
-
-#endif /* !_SYS_IOCTL_H_ */
-
-/*
- * Keep outside _SYS_IOCTL_H_
- * Compatibility with old terminal driver
- *
- * Source level -> #define USE_OLD_TTY
- * Kernel level -> options COMPAT_43 or COMPAT_SUNOS
- */
-#if defined(USE_OLD_TTY) || defined(COMPAT_43) || defined(COMPAT_SUNOS)
-#include <sys/ioctl_compat.h>
-#endif
diff --git a/c/src/lib/include/sys/sockio.h b/c/src/lib/include/sys/sockio.h
deleted file mode 100644
index 020061170f..0000000000
--- a/c/src/lib/include/sys/sockio.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)sockio.h	8.1 (Berkeley) 3/28/94
- * $Id$
- */
-
-#ifndef	_SYS_SOCKIO_H_
-#define	_SYS_SOCKIO_H_
-
-#include <sys/ioccom.h>
-
-/* Socket ioctl's. */
-#define	SIOCSHIWAT	 _IOW('s',  0, int)		/* set high watermark */
-#define	SIOCGHIWAT	 _IOR('s',  1, int)		/* get high watermark */
-#define	SIOCSLOWAT	 _IOW('s',  2, int)		/* set low watermark */
-#define	SIOCGLOWAT	 _IOR('s',  3, int)		/* get low watermark */
-#define	SIOCATMARK	 _IOR('s',  7, int)		/* at oob mark? */
-#define	SIOCSPGRP	 _IOW('s',  8, int)		/* set process group */
-#define	SIOCGPGRP	 _IOR('s',  9, int)		/* get process group */
-
-#define	SIOCADDRT	 _IOW('r', 10, struct ortentry)	/* add route */
-#define	SIOCDELRT	 _IOW('r', 11, struct ortentry)	/* delete route */
-#define	SIOCGETVIFCNT	_IOWR('r', 15, struct sioc_vif_req)/* get vif pkt cnt */
-#define	SIOCGETSGCNT	_IOWR('r', 16, struct sioc_sg_req) /* get s,g pkt cnt */
-
-#define	SIOCSIFADDR	 _IOW('i', 12, struct ifreq)	/* set ifnet address */
-#define	OSIOCGIFADDR	_IOWR('i', 13, struct ifreq)	/* get ifnet address */
-#define	SIOCGIFADDR	_IOWR('i', 33, struct ifreq)	/* get ifnet address */
-#define	SIOCSIFDSTADDR	 _IOW('i', 14, struct ifreq)	/* set p-p address */
-#define	OSIOCGIFDSTADDR	_IOWR('i', 15, struct ifreq)	/* get p-p address */
-#define	SIOCGIFDSTADDR	_IOWR('i', 34, struct ifreq)	/* get p-p address */
-#define	SIOCSIFFLAGS	 _IOW('i', 16, struct ifreq)	/* set ifnet flags */
-#define	SIOCGIFFLAGS	_IOWR('i', 17, struct ifreq)	/* get ifnet flags */
-#define	OSIOCGIFBRDADDR	_IOWR('i', 18, struct ifreq)	/* get broadcast addr */
-#define	SIOCGIFBRDADDR	_IOWR('i', 35, struct ifreq)	/* get broadcast addr */
-#define	SIOCSIFBRDADDR	 _IOW('i', 19, struct ifreq)	/* set broadcast addr */
-#define	OSIOCGIFCONF	_IOWR('i', 20, struct ifconf)	/* get ifnet list */
-#define	SIOCGIFCONF	_IOWR('i', 36, struct ifconf)	/* get ifnet list */
-#define	OSIOCGIFNETMASK	_IOWR('i', 21, struct ifreq)	/* get net addr mask */
-#define	SIOCGIFNETMASK	_IOWR('i', 37, struct ifreq)	/* get net addr mask */
-#define	SIOCSIFNETMASK	 _IOW('i', 22, struct ifreq)	/* set net addr mask */
-#define	SIOCGIFMETRIC	_IOWR('i', 23, struct ifreq)	/* get IF metric */
-#define	SIOCSIFMETRIC	 _IOW('i', 24, struct ifreq)	/* set IF metric */
-#define	SIOCDIFADDR	 _IOW('i', 25, struct ifreq)	/* delete IF addr */
-#define	SIOCAIFADDR	 _IOW('i', 26, struct ifaliasreq)/* add/chg IF alias */
-
-#define	SIOCADDMULTI	 _IOW('i', 49, struct ifreq)	/* add m'cast addr */
-#define	SIOCDELMULTI	 _IOW('i', 50, struct ifreq)	/* del m'cast addr */
-#define	SIOCGIFMTU	_IOWR('i', 51, struct ifreq)	/* get IF mtu */
-#define	SIOCSIFMTU	 _IOW('i', 52, struct ifreq)	/* set IF mtu */
-#define	SIOCGIFPHYS	_IOWR('i', 53, struct ifreq)	/* get IF wire */
-#define	SIOCSIFPHYS	 _IOW('i', 54, struct ifreq)	/* set IF wire */
-#define	SIOCSIFMEDIA	_IOWR('i', 55, struct ifreq)	/* set net media */
-#define	SIOCGIFMEDIA	_IOWR('i', 56, struct ifmediareq) /* get net media */
-
-#endif /* !_SYS_SOCKIO_H_ */
diff --git a/c/src/lib/include/sys/utsname.h b/c/src/lib/include/sys/utsname.h
deleted file mode 100644
index ca15230d40..0000000000
--- a/c/src/lib/include/sys/utsname.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*  sys/utsname.h 
- *
- *  $Id$
- */
-
-#ifndef __POSIX_SYS_UTSNAME_h
-#define __POSIX_SYS_UTSNAME_h
-
-#include <sys/times.h>
-#include <sys/types.h>
-
-/*
- *  4.4.1 Get System Name (Table 4-1), P1003.1b-1993, p. 90
- *
- *  NOTE:  The lengths of the strings in this structure are 
- *         just long enough to reliably contain the RTEMS information.
- *         For example, the fields are not long enough to support 
- *         Internet hostnames.
- */
-
-struct utsname {
-  char sysname[ 32 ];  /* Name of this implementation of the operating system */
-  char nodename[ 32 ]; /* Name of this node within an implementation */
-                       /*   specified communication network */
-  char release[ 32 ];  /* Current release level of this implementation */
-  char version[ 32 ];  /* Current version level of this release */
-  char machine[ 32 ];  /* Name of the hardware type on which the system */
-                       /*   is running */
-};
-
-/*
- *  4.4.1 Get System Name, P1003.1b-1993, p. 90
- */
-
-int uname(
-  struct utsname *name
-);
-
-/*
- *  4.5.2 Get Process Times, P1003.1b-1993, p. 92
- */
-
-clock_t times(
-  struct tms   *buffer
-);
-
-#endif
-/* end of include file */
-
diff --git a/c/src/lib/libbsp/a29k/portsw/start/Makefile.in b/c/src/lib/libbsp/a29k/portsw/start/Makefile.in
deleted file mode 100644
index f89c5a7e6f..0000000000
--- a/c/src/lib/libbsp/a29k/portsw/start/Makefile.in
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-# C source names, if any, go here -- minus the .c
-C_PIECES=
-C_FILES=$(C_PIECES:%=%.c)
-C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
-
-H_FILES=
-
-# Assembly source names, if any, go here -- minus the .s
-S_PIECES=crt0 register
-S_FILES=$(S_PIECES:%=%.s)
-S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
-
-SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES)
-OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
-
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-PGM=${ARCH}/crt0.o ${ARCH}/register.o
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES  +=
-CPPFLAGS +=
-CFLAGS   +=
-
-LD_PATHS  +=
-LD_LIBS   +=
-LDFLAGS   +=
-
-#
-# Add your list of files to delete here.  The config files
-#  already know how to delete some stuff, so you may want
-#  to just run 'make clean' first to see what gets missed.
-#  'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
-
-all:	${ARCH} $(SRCS) $(OBJS) $(PGM)
-	$(INSTALL_VARIANT) -m 555 ${PGM} ${PROJECT_RELEASE}/lib
diff --git a/c/src/lib/libbsp/a29k/portsw/start/amd.ah b/c/src/lib/libbsp/a29k/portsw/start/amd.ah
deleted file mode 100644
index 69f34f173e..0000000000
--- a/c/src/lib/libbsp/a29k/portsw/start/amd.ah
+++ /dev/null
@@ -1,517 +0,0 @@
-; /* @(#)amd.ah	1.1 96/05/23 08:56:58, TEI */
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;		 Initialization values for registers after RESET
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;  /* $Id$ */
-;
-;* File information and includes.
-
-        .file   "amd.ah"
-        .ident  "@(#)amd.ah	1.1 96/05/23 08:56:58, TEI"
-
-
-
-;
-;* AMD PROCESSOR SPECIFIC VALUES...
-;
-
-;
-;* Processor revision levels...
-;
-
-; PRL values: 31-28   27-24
-; Am29000	0	x
-; Am29005	1	x
-; Am29050	2	x
-; Am29035	3	x
-; Am29030	4	x
-; Am29200	5	x
-; Am29205	5	1x
-; Am29240	6	0
-; Manx		7	0
-; Cougar	8	0
-
-
-	.equ	AM29000_PRL, 	0x00
-
-	.equ	AM29005_PRL, 	0x10
-
-	.equ	AM29050_PRL, 	0x20
-
-	.equ	AM29035_PRL, 	0x30
-
-	.equ	AM29030_PRL, 	0x40
-
-	.equ	AM29200_PRL, 	0x50
-
-	.equ	AM29205_PRL, 	0x58
-
-	.equ	AM29240_PRL, 	0x60
-
-	.equ	AM29040_PRL, 	0x70
-
-	.equ	MANX_PRL,  	0x70
-
-	.equ	COUGAR_PRL, 	0x80
-
-;
-;* data structures sizes.
-;
-	.equ	CFGINFO_SIZE,	16*4
-
-	.equ	PGMINFO_SIZE,	16*4
-
-	.equ	VARARGS_SPACE,	16*4
-
-	.equ	WINDOWSIZE,	0x80
-;
-;* Am29027 Mode registers
-;
-
-	.equ	Am29027Mode1, 0x0fc00820
-
-	.equ	Am29027Mode2, 0x00001375
-	
-
-
-;* Processor Based Equates and Defines
-
-	.equ	SIG_SYNC,	-1	
-
-	.equ	ENABLE,		(SM)
-
-	.equ	DISABLE,	(ENABLE | DI | DA)
-
-	.equ	DISABLE_FZ,	(FZ | ENABLE | DI | DA)
-
-	.equ	CLR_TRAP,	(FZ | DA)	
-
-	.equ	InitOPS,	(TD | SM | (3<<IMShift) | DI | DA) 
-	
-	.equ	InitCPS,	(TD | SM | (0<<IMShift) | DI | DA) 
-
-	.equ	InitCPS1,	(TD | SM | (0<<IMShift) | DI ) 
-
-	.equ	CPS_TMR,	(SM | (0<<IMShift) | DI)
-
-	.equ	CPS_INT0,	(TD | SM | (0<<IMShift))
-
-	.equ	CPS_TMRINT0,	(SM | (0<<IMShift))
-
-	.equ	InitCFG,	0x0 
-
-	.equ	InitRBP,	(B0|B1|B2|B3|B4|B5)
-
-	.equ	TMC_VALUE,	0xFFFFFF
-
-	.equ	TMR_VALUE,	(IE | TMC_VALUE)
-
-
-
-
-
-
-;* 29205 specific (internal) peripheral initialization constants.
-
-; Current Processor Status (CPS) Register.
-; Old Processor Status Register (OPS).
-
-	.equ	DA,	0x00001
-	.equ	DI,	0x00002
-	.equ	IMShift,0x2
-	.equ	SM,	0x00010
-	.equ	PI,	0x00020
-	.equ	PD,	0x00040
-	.equ	WM,	0x00080
-	.equ	RE, 	0x00100
-	.equ	LK,	0x00200
-	.equ	FZ, 	0x00400
-	.equ	TU,	0x00800
-	.equ	TP,	0x01000
-	.equ	TE,	0x02000
-	.equ	IP,	0x04000
-	.equ	CA,	0x08000
-	.equ	MM,	0x10000
-	.equ	TD,	0x20000
-
-; Configuration Register (CFG)
-
-	.equ	CD,	0x01
-	.equ	CP,	0x02
-	.equ	BO,	0x04
-	.equ	RV, 	0x08
-	.equ	VF,	0x10
-	.equ	DW,	0x20
-	.equ	CO,	0x40
-	.equ	EE,	0x80
-	.equ	IDShift,	8
-	.equ	CFG_ID,	0x100
-	.equ	ILShift,	9
-	.equ	CFG_ILMask,	0x600
-	.equ	DDShift,	11
-	.equ	CFG_DD,	0x800
-	.equ	DLShift,	12
-	.equ	CFG_DLMask,	0x3000
-	.equ	PCEShift, 	14
-	.equ	CFG_PCE,	0x4000
-	.equ	PMBShift, 	16
-	.equ	D16,	0x8000
-	.equ	TBOShift,	23
-	.equ	PRLShift, 24
-
-; Channel Control Register (CHC)
-
-	.equ	CV, 0x1
-	.equ	NN, 0x2
-	.equ	TRShift, 2
-	.equ	TF, 0x400
-	.equ	PER, 0x800
-	.equ	LA, 0x1000
-	.equ	ST, 0x2000
-	.equ	ML, 0x4000
-	.equ	LS, 0x8000
-	.equ 	CRShift, 16
-	.equ	CNTLShift, 24
-	.equ	CEShift, 31
-	.equ	WBERShift, 31
-
-; Register Bank Protect (RBP)
-	.equ	B0, 0x1
-	.equ	B1, 0x2
-	.equ	B2, 0x4
-	.equ	B3, 0x8
-	.equ	B4, 0x10
-	.equ	B5, 0x20
-	.equ	B6, 0x40
-	.equ	B7, 0x80
-	.equ	B8, 0x100
-	.equ	B9, 0x200
-	.equ	B10, 0x400
-	.equ	B11, 0x800
-	.equ	B12, 0x1000
-	.equ	B13, 0x2000
-	.equ	B14, 0x4000
-	.equ	B15, 0x8000
-
-; Timer Counter
-
-	.equ	TCVMask, 0xffffff
-
-; Timer Reload Register
-
-	.equ	IE, 0x1000000
-	.equ	IN, 0x2000000
-	.equ	OV, 0x4000000
-	.equ	TRVMAsk, 0xffffff
-
-; MMU Configuration
-
-	.equ	PSShift, 8
-	.equ	PS0Shift, 8
-	.equ	PS1Shift, 12
-
-; LRU Recommendation (LRU)
-	.equ	LRUMask, 0xff
-
-; Reason Vector (RSN)
-	.equ 	RSNMask, 0xff
-
-; Region Mapping Address (RMA0 | RMA1)
-	.equ	PBAMask,0xffff
-	.equ	VBAShift, 16
-
-; Region Mapping Control (RMC0 | RMC1)
-	.equ	TIDMask, 0xff
-	.equ	RMC_UE, 0x100
-	.equ	RMC_UW, 0x200
-	.equ	RMC_UR, 0x400
-	.equ	RMC_SE, 0x800
-	.equ	RMC_SW, 0x1000
-	.equ	RMC_SR, 0x2000
-	.equ	RMC_VE, 0x4000
-	.equ	RMC_IO, 0x10000
-	.equ	RGSShift, 17
-	.equ	RMC_PGMShift, 22
-
-; Instruction breakpoint Control (IBC0 | IBC1)
-	.equ	BPIDMask, 0xff
-	.equ	BTE, 0x100
-	.equ	BRM, 0x200
-	.equ	IBC_BSY, 0x400
-	.equ	BEN, 0x800
-	.equ	BHO, 0x1000
-
-; Cache Data Register (CDR)
-	.equ	CDR_US, 0x1
-	.equ	P, 0x2
-	.equ	CDR_V, 0x4
-	.equ	IATAGShift, 20
-
-; Cache Interface Register (CIR)
-	.equ	CPTRShift, 2
-	.equ	CIR_RW, 0x1000000
-	.equ	FSELShift, 28
-
-; Indirect Pointer A, B, C (IPA, IPB, IPC)
-	.equ	IPShift, 2
-
-; ALU Status (ALU)
-	.equ	FCMask, 0x1F
-	.equ	BPShift, 5
-	.equ	C, 0x80
-	.equ	Z, 0x100
-	.equ	N, 0x200
-	.equ	ALU_V, 0x400
-	.equ	DF, 0x800
-
-; Byte Pointer
-	.equ	BPMask, 0x3
-
-; Load/Store Count Remaining (CR)
-	.equ	CRMask, 0xff
-
-; Floating Point Environment (FPE)
-	.equ	NM, 0x1
-	.equ	RM, 0x2
-	.equ	VM, 0x4
-	.equ	UM, 0x8
-	.equ	XM, 0x10
-	.equ	DM, 0x20
-	.equ 	FRMShift, 6
-	.equ	FF, 0x100
-	.equ	ACFShift, 9
-
-; Integer Environment (INTE)
-	.equ	MO, 0x1
-	.equ	DO, 0x2
-
-; Floating Point Status (FPS)
-	.equ	NS, 0x1
-	.equ	RS, 0x2
-	.equ	VS, 0x4
-	.equ	FPS_US, 0x8
-	.equ	XS, 0x10
-	.equ	DS, 0x20
-	.equ	NT, 0x100
-	.equ	RT, 0x200
-	.equ	VT, 0x400
-	.equ	UT, 0x800
-	.equ	XT, 0x1000
-	.equ	DT, 0x2000
-
-; Exception Opcode (EXOP)
-	.equ	IOPMask, 0xff
-
-; TLB Entry Word 0
-;	.equ	TIDMask, 0xff	already defined above
-	.equ	TLB_UE, 0x100
-	.equ	TLB_UW, 0x200
-	.equ	TLB_UR, 0x400
-	.equ	TLB_SE, 0x800
-	.equ	TLB_SW, 0x1000
-	.equ	TLB_SR, 0x2000
-	.equ	TLB_VE, 0x4000
-	.equ	VTAGShift, 15
-
-; TLB Entry Word 1
-	.equ	TLB_IO, 0x1
-	.equ	U, 0x2
-	.equ	TLB_PGMShift, 6
-	.equ	RPNShift, 10
-
-; Am29200 ROM Control bits.
-	.equ	RMCT_DW0Shift, 29
-	.equ	RMCT_DW1Shift, 21
-	.equ	RMCT_DW2Shift, 13
-	.equ	RMCT_DW3Shift, 5
-
-; Am29200 DRAM Control bits.
-	.equ	DW3, (1<<18)
-	.equ	DW2, (1<<22)
-	.equ	DW1, (1<<26)
-	.equ	DW0, (1<<30)
-
-	; Internal peripheral address assignments.
-	.equ	RMCT, 0x80000000
-	.equ	RMCF, 0x80000004
-	.equ	DRCT, 0x80000008
-	.equ	DRCF, 0x8000000C
-	.equ	DRM0, 0x80000010
-	.equ	DRM1, 0x80000014
-	.equ	DRM2, 0x80000018
-	.equ	DRM3, 0x8000001C
-	.equ	PIACT0, 0x80000020
-	.equ	PIACT1, 0x80000020
-	.equ	ICT, 0x80000028
-	.equ	DMCT0, 0x80000030
-	.equ	DMAD0, 0x80000034
-	.ifdef	revA
-	.equ	TAD0, 0x80000036
-	.equ	TCN0, 0x8000003A
-	.else
-	.equ	TAD0, 0x80000070	; default
-	.equ	TCN0, 0x8000003C	; default
-	.endif
-	.equ	DMCN0, 0x80000038
-	.equ	DMCT1, 0x80000040
-	.equ	DMAD1, 0x80000044
-	.equ	DMCN1, 0x80000048
-	.equ	SPCT, 0x80000080
-	.equ	SPST, 0x80000084
-	.equ	SPTH, 0x80000088
-	.equ	SPRB, 0x8000008C
-	.equ	BAUD, 0x80000090
-	.equ	PPCT, 0x800000C0
-	.equ	PPST, 0x800000C1
-	.equ	PPDT, 0x800000C4
-	.equ	POCT, 0x800000D0
-	.equ	PIN, 0x800000D4
-	.equ	POUT, 0x800000D8
-	.equ	POEN, 0x800000DC
-	.equ	VCT, 0x800000E0
-	.equ	TOP, 0x800000E4
-	.equ	SIDE, 0x800000E8
-	.equ	VDT, 0x800000EC
-
-	; Interrupt Controller Register bits.
-	.equ	TXDI,	(1<<5)
-	.equ	RXDI,	(1<<6)
-	.equ	RXSI,	(1<<7)
-	.equ	PPI,	(1<<11)
-	.equ	DMA1I,	(1<<13)
-	.equ	DMA0I,	(1<<14)
-	.equ	IOPIMask,	(0xFF<<16)
-	.equ	VDI,	(1<<27)
-	.equ	ICT200_I,  (TXDI|RXDI|RXSI|PPI|DMA1I|DMA0I|IOPIMask|VDI)
-	.equ	ICT205_I,  (TXDI|RXDI|RXSI|PPI|DMA1I|DMA0I|IOPIMask|VDI)
-
-	; Serial port Initialization bits
-	.equ	NO_PARITY,	0
-	
-
-	; SPST bits
-	.equ	THREShift, 22
-
-;* REGISTER Addresses
-
-	.equ	ROMCntlRegAddr,		0x80000000
-
-	.equ	ROMCfgRegAddr, 		0x80000004
-
-	.equ	DRAMCntlRegAddr,	0x80000008
-
-	.equ	DRAMCfgRegAddr,		0x8000000C
-
-	.equ	DRAMMap0RegAddr,	0x80000010
-
-	.equ	DRAMMap1RegAddr,	0x80000014
-
-	.equ	DRAMMap2RegAddr,	0x80000018
-
-	.equ	DRAMMap3RegAddr,	0x8000001C
-
-	.equ	PIACntl0RegAddr,	0x80000020
-
-	.equ	PIACntl1RegAddr,	0x80000024
-
-	.equ	INTRCntlRegAddr,	0x80000028
-
-	.equ	DMACntl0RegAddr,	0x80000030
-
-	.equ	DMACntl1RegAddr,	0x80000040
-
-	.equ	SERPortCntlRegAddr,	0x80000080
-
-	.equ	SERPortStatRegAddr,	0x80000084
-
-	.equ	SERPortTHLDRegAddr,	0x80000088
-
-	.equ	SERPortRbufRegAddr,	0x8000008C
-
-	.equ	SERPortBaudRegAddr,	0x80000090
-
-	.equ	PARPortCntlRegAddr,	0x800000C0
-
-	.equ	PIOCntlRegAddr,		0x800000D0
-
-	.equ	PIOInpRegAddr,		0x800000D4
-
-	.equ	PIOOutRegAddr,		0x800000D8
-
-	.equ	PIOOutEnaRegAddr,	0x800000DC
-
-	.equ	VCTCntlRegAddr,		0x800000E0
-
-;
-;* Control constants
-;
-
-;* AM29030 Timer related constants.
-
-	.equ	TMR_IE,			0x01000000
-
-	.equ	TMR_IN,			0x02000000
-
-	.equ	TMR_OV,			0x04000000
-
-	.equ	TMC_INITCNT, 		1613
-
-;
-;* System initialization values.
-;
-
-	.equ	__os_version,		0x0001		;
-
-	.equ	STACKSize,		0x8000		;
-
-	.equ	PGMExecMode,		0x0000		;
-
-	.equ	TSTCK_OFST,		28 * 4
-
-	.equ	CSTCK_OFST,		29 * 4
-
-	.equ	TMSTCK_OFST,		30 * 4
-
-	.equ	CMSTCK_OFST,		31 * 4
-
-	.equ	CTXSW_OK, 		0xA55A		; ctx switch ok
-
-	.set	NV_STARTOFST,		0x20		; 32 bytes
-
-	.set	NV_BAUDOFST,		0x00		; 00 bytes
-
-	.set	reg_cir, 		29
-
-	.set	reg_cdr, 		30
-
-	.equ	MSG_BUFSIZE,		0x1000		; serial buffer size 
-
-        .equ    ILLOPTRAP,      	0
-
-        .equ    UATRAP,         	1
-
-        .equ    PVTRAP,         	5
-
-        .equ    UITLBMISSTRAP,  	8
-
-        .equ    UDTLBMISSTRAP,  	9
-
-        .equ    TIMERTRAP,      	14
-
-        .equ    TRACETRAP,      	15
-
-        .equ    XLINXTRAP,      	16
-
-        .equ    SERIALTRAP,     	17
-
-        .equ    SLOWTMRTRAP,    	18
-
-        .equ    PORTTRAP,       	19
-
-        .equ    SVSCTRAP,       	80
-
-        .equ    SVSCTRAP1,       	81
-
-        .equ    V_CACHETRAP,      	66		;
-
-        .equ    V_SETSERVICE,      	67		;
diff --git a/c/src/lib/libbsp/a29k/portsw/start/pswmacro.ah b/c/src/lib/libbsp/a29k/portsw/start/pswmacro.ah
deleted file mode 100644
index a994719c58..0000000000
--- a/c/src/lib/libbsp/a29k/portsw/start/pswmacro.ah
+++ /dev/null
@@ -1,442 +0,0 @@
-; /* @(#)pswmacro.ah	1.1 96/05/23 08:56:58, TEI */
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;		 macros: Do_install and init_TLB
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;  /* $Id$ */
-
-;* File information and includes.
-
-	.file	"macro.ah"
-	.ident	"@(#)pswmacro.ah	1.1 96/05/23 08:56:58, TEI"
-
-
-	.macro	CONST32, RegName, RegValue
-		const	RegName, RegValue
-		consth	RegName, RegValue
-	.endm
-
-	.macro	CONSTX, RegName, RegValue
-		.if (RegValue) <= 0x0000ffff
-			const	RegName, RegValue
-		.else
-			const	RegName, RegValue
-			consth	RegName, RegValue
-		.endif
-	.endm
-
-	.macro	PRODEV, RegName
-		srl	RegName, RegName, 24
-	.endm
-
-;
-;* MACRO TO INSTALL VECTOR TABLE ENTRIES
-;
- 
-;* Assumes vector table address in v0
- 
-        .macro  _setvec, trapnum, trapaddr
-                mfsr    v0, vab                 ;
-                const   v2, trapnum             ;
-                sll     v1, v2, 2               ;
-                add     v1, v1, v0              ; v0 has location of vector tab
- 
-                const   v2, trapaddr            ;
-                consth  v2, trapaddr            ;
-                store   0, 0, v2, v1            ;
-                nop                             ;
-        .endm
- 
-        .macro  syscall, name
-                const     tav, HIF_@name        ;
-                asneq   V_SYSCALL, gr1, gr1     ;
-                nop                             ;
-                nop                             ;
-        .endm
-
-
-
-;* MACRO TO INSTALL VECTOR TABLE ENTRIES 
-
-	.macro	Do_Install, V_Number, V_Address
-		const	lr4, V_Address 
-		consth	lr4, V_Address
-		const	lr3, V_Number * 4
-		consth	lr3, V_Number * 4
-		call	lr0, V_Install
-		nop
-	.endm
-
-	.macro	Do_InstallX, V_Number, V_Address
-		const	lr4, V_Address 
-		consth	lr4, V_Address
-		const	lr3, V_Number * 4
-		consth	lr3, V_Number * 4
-		call	lr0, V_InstallX
-		nop
-	.endm
-
-
-
-; push a register onto the stack
-	.macro	pushreg, reg, sp
-	sub	sp, sp, 4		; adjust stack pointer
-	store	0, 0, reg, sp		; push register
-	.endm
-
-	.macro	push, sp, reg
-		sub	sp, sp, 4
-		store	0, 0, reg, sp
-	.endm
-
-; pop the register from stack
-	.macro	popreg, reg, sp
-	load	0, 0, reg, sp		; pop register
-	add	sp, sp, 4		; adjust stack pointer
-	.endm
-	.macro	pop, reg, sp
-		load	0, 0, reg, sp
-		add	sp, sp, 4
-	.endm
-
-; push a special register onto stack
-	.macro	pushspcl, spcl, tmpreg, sp
-	sub	sp, sp, 4		; adjust stack pointer
-	mfsr	tmpreg, spcl		; get spcl reg
-	store	0, 0, tmpreg, sp	; push onto stack
-	.endm
-
-	.macro	pushsr, sp, reg, sreg
-		mfsr	reg, sreg
-		sub	sp, sp, 4
-		store	0, 0, reg, sp
-	.endm
-
-; pop a special register from stack
-	.macro	popspcl, spcl, tmpreg, sp
-	load	0, 0, tmpreg, sp	; pop from stack
-	add	sp, sp, 4		; adjust stack pointer
-	mtsr	spcl, tmpreg		; set spcl reg
-	.endm
-
-	.macro	popsr, sreg, reg, sp
-		load	0, 0, reg, sp
-		add	sp, sp, 4
-		mtsr	sreg, reg
-	.endm
-
-;
-; save freeze mode registers on memory stack.
-;
-
-	.macro	SaveFZState,	tmp1, tmp2
-
-		; save freeze mode registers.
-
-		pushspcl pc0, tmp1, msp
-		pushspcl pc1, tmp1, msp
-		pushspcl alu, tmp1, msp
-
-		pushspcl cha, tmp1, msp
-		pushspcl chd, tmp1, msp
-		pushspcl chc, tmp1, msp
-
-		pushspcl ops, tmp1, msp
-
-		; turn freeze off
-
-		const	tmp2, FZ
-		mfsr	tmp1, cps
-		andn	tmp1, tmp1, tmp2
-		mtsr	cps, tmp1
-	.endm
-
-; restore freeze mode registers from memory stack.
-
-	.macro	RestoreFZState, tmp1, tmp2
-
-		; turn freeze on
-
-		const	tmp2, (FZ|DI|DA)
-		mfsr	tmp1, cps
-		or	tmp1, tmp1, tmp2
-		mtsr	cps, tmp1
-
-		; restore freeze mode registers.
-
-		popspcl	ops, tmp1, msp
-		popspcl	chc, tmp1, msp
-		popspcl	chd, tmp1, msp
-		popspcl	cha, tmp1, msp
-		popspcl	alu, tmp1, msp
-		popspcl	pc1, tmp1, msp
-		popspcl	pc0, tmp1, msp
-	.endm
-
-;
-;*
-;
-	.equ	WS,	512				; window size
-	.equ	RALLOC,	4 * 4				; stack alloc for C
-	.equ	SIGCTX_UM_SIZE,	40 * 4			; 
-	.equ	SIGCTX_RFB, (38) * 4			; user mode saved
-	.equ	SIGCTX_SM_SIZE, 12 * 4			;
-	.equ	SIGCTX_SIG, (11)*4 + SIGCTX_UM_SIZE	;
-	.equ	SIGCTX_GR1, (10)*4 + SIGCTX_UM_SIZE	;
-	.equ	SIGCTX_RAB, (9)*4 + SIGCTX_UM_SIZE	;
-	.equ	SIGCTX_PC0, (8)*4 + SIGCTX_UM_SIZE	;
-	.equ	SIGCTX_PC1, (7)*4 + SIGCTX_UM_SIZE	;
-	.equ	SIGCTX_PC2, (6)*4 + SIGCTX_UM_SIZE	;
-	.equ	SIGCTX_CHC, (3)*4 + SIGCTX_UM_SIZE	;
-	.equ	SIGCTX_OPS, (1)*4 + SIGCTX_UM_SIZE	;
-	.equ	SIGCTX_TAV, (0)*4 + SIGCTX_UM_SIZE	;
-
-	.macro	sup_sv
-		add	it2, trapreg, 0			; transfer signal #
-		sub	msp, msp, 4			;
-		store	0, 0, it2, msp			; save signal number
-		sub	msp, msp, 4			; push gr1
-
-		store	0, 0, gr1, msp			; 
-		sub	msp, msp, 4			; push rab
-		store	0, 0, rab, msp			; 
-		const	it0, WS				; Window size	
-
-		sub	rab, rfb, it0			; set rab = rfb-512
-		pushsr	msp, it0, PC0			; save program counter0
-		pushsr	msp, it0, PC1			; save program counter1
-		pushsr	msp, it0, PC2			; save program counter2
-
-		pushsr	msp, it0, CHA			; save channel address
-		pushsr	msp, it0, CHD			; save channel data
-		pushsr	msp, it0, CHC			; save channel control
-		pushsr	msp, it0, ALU			; save alu
-
-		pushsr	msp, it0, OPS			; save ops
-		sub	msp, msp, 4			; 
-		store	0, 0, tav, msp			; push tav
-		mtsrim	chc, 0				; no loadm/storem
-
-		mfsr	it0, ops			; get ops value
-		const	it1, (TD | DI)			; disable interrupts
-		consth	it1, (TD | DI)			; disable interrupts
-		or	it0, it0, it1			; set bits
-
-		mtsr	ops, it0			; set new ops
-		const	it0, sigcode			; signal handler
-		consth	it0, sigcode			; signal handler
-		mtsr	pc1, it0			; store pc1
-
-		add	it1, it0, 4			; next addr
-		mtsr	pc0, it1			; store pc1 location
-		iret					; return
-		nop					; ALIGN
-	.endm
-
-	.macro	sig_return
-		mfsr	it0, cps			; get processor status
-		const	it1, FZ|DA			; Freeze + traps disable
-		or	it0, it0, it1			; to set FZ+DA
-		mtsr	cps, it0			; in freeze mode
-
-		load	0, 0, tav, msp			; restore tav
-		add	msp, msp, 4			;
-		
-		popsr	OPS,it0, msp			;
-		popsr	ALU,it0, msp			;
-		popsr	CHC,it0, msp			;
-		popsr	CHD,it0, msp			;
-
-		popsr	CHA,it0, msp			;
-		popsr	PC2,it0, msp			;
-		popsr	PC1,it0, msp			;
-		popsr	PC0,it0, msp			;
-
-		load	0, 0, rab, msp			;
-		add	msp, msp, 4			;
-		load	0, 0, it0, msp			;
-		add	gr1, it0, 0			; pop rsp
-
-		add	msp, msp, 8			; discount signal #
-		iret
-	.endm
-
-	.macro	repair_R_stack
-		add	v0, msp, SIGCTX_GR1		; interrupted gr1
-		load 	0, 0, v2, v0			;
-		add	v0, msp, SIGCTX_RFB		;
-		load	0, 0, v3, v0			; interupted rfb
-
-		const	v1, WS				;	
-		sub	v1, v3, v1			; rfb-512
-		cpltu	v0, v2, v1			; test gr1 < rfb-512
-		jmpf	v0, $1				; 
-
-		add	gr1, rab, 0			;
-		add	v2, v1, 0			; set LB = rfb-512
-$1:
-;* if gr1 < rfb-512 yes LB = rfb-512 signalled during spill
-;* if no, LB=gr1 interrupted cache < 126 registers
-		cpleu	v0, v2, rfb			; test LB<=rfb
-		jmpf	v0, $2				;
-		nop					;
-		add	v2, rfb, 0			;
-$2:
-		cpeq	v0, v3, rfb			; fill rfb->'rfb
-		jmpt	v0, $3				; if rfb==rfb'
-		const	tav, (0x80<<2)			; prepare for fill
-		or	tav, tav, v2			; 
-
-		mtsr	IPA, tav			; IPA=LA<<2
-		sub	tav, v3, gr98			; cache fill LA->rfb
-		srl	tav, tav, 2			; convert to words
-		sub	tav, tav, 1			; 
-
-		mtsr	cr, tav				;
-		loadm	0, 0, gr0, v2			; fill from LA->rfb
-$3:
-		add	rfb, v3, 0			; move rfb upto 'rfb
-		sub	rab, v1, 0			; assign rab to rfb-512
-
-		add	v0, msp, SIGCTX_GR1		;
-		load	0, 0, v2, v0			; v0 = interrupted gr1
-		add	gr1, v2, 0			; move gr1 upto 'gr1
-		nop					;
-	.endm	
-		
-	.macro	repair_regs
-		mtsrim	cr, 29 - 1			; to restore locals
-		loadm	0, 0, v0, msp			;
-		add	msp, msp, 29*4			; 
-		popsr	Q, tav, msp			; 
-
-		popsr	IPC, tav, msp			; 
-		popsr	IPB, tav, msp			; 
-		popsr	IPA, tav, msp			; 
-		pop	FPStat3, msp			; floating point regs
-
-		pop	FPStat2, msp			; floating point regs
-		pop	FPStat1, msp			; floating point regs
-		pop	FPStat0, msp			; floating point regs
-
-		add	msp, msp, 3*4			; R-stack repaired
-	.endm
-
-;
-;*HIF related...
-;
-
-
-
-
-; send the message in bufaddr to Montip.
-	.macro	SendMessageToMontip,	bufaddr
-	const	lr2, bufaddr
-$1:
-	call	lr0, _msg_send
-	consth	lr2, bufaddr
-	cpeq	gr96, gr96, 0
-	jmpf	gr96, $1
-	const	lr2, bufaddr
-	.endm
-
-; build a HIF_CALL message in bufaddr to send to montip.
-	.macro	BuildHIFCALLMsg,	bufaddr, tmp1, tmp2
-	const	tmp1, bufaddr
-	consth	tmp1, bufaddr
-	const	tmp2, HIF_CALL_MSGCODE
-	store	0, 0, tmp2, tmp1	; msg code
-	add	tmp1, tmp1, 4
-	const	tmp2, HIF_CALL_MSGLEN	
-	store	0, 0, tmp2, tmp1	; msg len
-	add	tmp1, tmp1, 4
-	store	0, 0, gr121, tmp1	; service number
-	add	tmp1, tmp1, 4
-	store	0, 0, lr2, tmp1		; lr2
-	add	tmp1, tmp1, 4
-	store	0, 0, lr3, tmp1		; lr3
-	add	tmp1, tmp1, 4
-	store	0, 0, lr4, tmp1		; lr4
-	.endm
-
-;
-;* 
-;* All the funky AMD style macros go in here...simply for 
-;* compatility
-;
-;
-  .macro        IMPORT, symbol
-        .extern symbol
-  .endm
-
-  .macro        GLOBAL, symbol
-        .global symbol
-  .endm
-
-  .macro        USESECT, name, type
-        .sect   name, type
-        .use    name
-  .endm
-
-  .macro        SECTION, name, type
-        .sect   name, type
-  .endm
-
- .macro FUNC, fname, lineno
-        .global fname
-fname:
- .endm
-
- .macro ENDFUNC, fname, lineno
- .endm
-
-;*************************************LONG
- .macro LONG, varname
-varname:
-        .block  4
- .endm
-
-;*************************************UNSIGNED LONG
- .macro ULONG, varname
-varname:
-        .block  4
- .endm
-
-;*************************************SHORT
- .macro SHORT, varname
-varname:
-        .block  2
- .endm
-
-;*************************************CHAR
- .macro CHAR, varname
-varname:
-        .block  1
- .endm 
-
-;*************************************LONGARRAY
- .macro LONGARRAY, name, count
-name:
-        .block  count*4
- .endm
-
-;*************************************SHORTARRAY
-
- .macro SHORTARRAY, name, count
-name:
-        .block  count*2
- .endm
-
-;*************************************CHARARRAY
-
- .macro CHARARRAY, name, count
-name:
-        .block  count
- .endm
-
-
-;*************************************VOID_FPTR
-
- .macro VOID_FPTR, name
-name:
-        .block  4
- .endm
diff --git a/c/src/lib/libbsp/a29k/portsw/start/register.ah b/c/src/lib/libbsp/a29k/portsw/start/register.ah
deleted file mode 100644
index 1dced5b043..0000000000
--- a/c/src/lib/libbsp/a29k/portsw/start/register.ah
+++ /dev/null
@@ -1,214 +0,0 @@
-; /* @(#)register.ah	1.1 96/05/23 08:56:57, TEI */
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;		 naming of various registers    
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;  /* $Id$ */
-
-;* File information and includes.
-
-	.file	"register.ah"
-	.ident	"@(#)register.ah	1.1 96/05/23 08:56:57, TEI\n"
-
-;* Register Stack pointer and frame pointer registers.
-
-	.extern	Rrsp, Rfp
-
-	.reg	regsp, 		%%Rrsp
-	.reg	fp, 		%%Rfp
-
-
-	.extern RTrapReg
-	.extern Rtrapreg
-
-	.reg	TrapReg, 	%%RTrapReg
-	.reg	trapreg, 	%%Rtrapreg
-
-
-;* Operating system Interrupt handler registers (gr64-gr67)
-
-	.extern	ROSint0, ROSint1, ROSint2, ROSint3
-
-	.reg	OSint0, 	%%ROSint0
-	.reg	OSint1, 	%%ROSint1
-	.reg	OSint2, 	%%ROSint2
-	.reg	OSint3, 	%%ROSint3
-
-	.reg	it0, 		%%ROSint0
-	.reg	it1, 		%%ROSint1
-	.reg	it2, 		%%ROSint2
-	.reg	it3, 		%%ROSint3
-
-
-
-;* Operating system temporary (or scratch) registers (gr68-gr79)
-
-	.extern	ROStmp0, ROStmp1, ROStmp2, ROStmp3
-	.extern	ROStmp4, ROStmp5, ROStmp6, ROStmp7
-	.extern	ROStmp8, ROStmp9, ROStmp10, ROStmp11
-
-	.reg	OStmp0, 	%%ROStmp0
-	.reg	OStmp1, 	%%ROStmp1
-	.reg	OStmp2, 	%%ROStmp2
-	.reg	OStmp3, 	%%ROStmp3
-
-	.reg	OStmp4, 	%%ROStmp4
-	.reg	OStmp5, 	%%ROStmp5
-	.reg	OStmp6, 	%%ROStmp6
-	.reg	OStmp7, 	%%ROStmp7
-
-	.reg	OStmp8, 	%%ROStmp8
-	.reg	OStmp9, 	%%ROStmp9
-	.reg	OStmp10, 	%%ROStmp10
-	.reg	OStmp11, 	%%ROStmp11
-
-
-	.reg	kt0, 		%%ROStmp0
-	.reg	kt1, 		%%ROStmp1
-	.reg	kt2, 		%%ROStmp2
-	.reg	kt3, 		%%ROStmp3
-
-	.reg	kt4, 		%%ROStmp4
-	.reg	kt5, 		%%ROStmp5
-	.reg	kt6, 		%%ROStmp6
-	.reg	kt7, 		%%ROStmp7
-
-	.reg	kt8, 		%%ROStmp8
-	.reg	kt9, 		%%ROStmp9
-	.reg	kt10, 		%%ROStmp10
-	.reg	kt11, 		%%ROStmp11
-
-
-	.reg	TempReg0,	%%ROSint0
-	.reg	TempReg1, 	%%ROSint1
-	.reg	TempReg2, 	%%ROSint2
-	.reg	TempReg3, 	%%ROSint3
-
-	.reg	TempReg4, 	%%ROStmp0
-	.reg	TempReg5, 	%%ROStmp1
-	.reg	TempReg6, 	%%ROStmp2
-	.reg	TempReg7, 	%%ROStmp3
-
-	.reg	TempReg8, 	%%ROStmp4
-	.reg	TempReg9, 	%%ROStmp5
-	.reg	TempReg10, 	%%ROStmp6
-	.reg	TempReg11, 	%%ROStmp7
-
-	.reg	TempReg12, 	%%ROStmp8
-	.reg	TempReg13, 	%%ROStmp9
-	.reg	TempReg14, 	%%ROStmp10
-	.reg	TempReg15, 	%%ROStmp11
-
-
-;* Assigned static registers
-
-	.extern	RSpillAddrReg, RFillAddrReg, RSignalAddrReg
-	.extern	Rpcb, Retc
-	.extern	RTimerExt, RTimerUtil, RLEDReg, RERRReg
-	.extern	Ret0, Ret1, Ret2, Ret3, Ret4, Ret5, Ret6, Ret7, Reta, Retb
-	.extern	Retx, Rety, Retz
-
-
-	.reg	SpillAddrReg, 	%%RSpillAddrReg
-	.reg	FillAddrReg, 	%%RFillAddrReg
-	.reg	SignalAddrReg, 	%%RSignalAddrReg
-	.reg	pcb,		%%Rpcb
-
-	.reg	etx,		%%Retx
-	.reg	ety,		%%Rety
-	.reg	etz,		%%Retz
-	.reg	eta,		%%Reta
-
-	.reg	etb,		%%Retb
-	.reg	etc,		%%Retc
-	.reg	TimerExt, 	%%RTimerExt
-	.reg	TimerUtil, 	%%RTimerUtil
-
-	.reg	LEDReg, 	%%RLEDReg
-	.reg	ERRReg, 	%%RERRReg
-
-
-	.reg	et0,		%%Ret0
-	.reg	et1,		%%Ret1
-	.reg	et2,		%%Ret2
-	.reg	et3,		%%Ret3
-
-	.reg	et4,		%%Ret4
-	.reg	et5,		%%Ret5
-	.reg	et6,		%%Ret6
-	.reg	et7,		%%Ret7
-
-;
-	.equ	SCB1REG_NUM,	88	
-	.reg	SCB1REG_PTR,	%%Ret0
-
-; The floating point trap handlers need a few static registers
-
-        .extern RFPStat0, RFPStat1, RFPStat2, RFPStat3
-        .extern Rheapptr, RHeapPtr, RArgvPtr
-
-        .reg    FPStat0, 	%%RFPStat0
-        .reg    FPStat1, 	%%RFPStat1
-        .reg    FPStat2, 	%%RFPStat2
-        .reg    FPStat3, 	%%RFPStat3
-
-        .reg    heapptr, 	%%Rheapptr
-        .reg    HeapPtr, 	%%RHeapPtr
-        .reg    ArgvPtr, 	%%RArgvPtr
-
-        .extern RXLINXReg, RVMBCReg, RUARTReg, RETHERReg
-
-        .reg    XLINXReg,	%%RXLINXReg
-        .reg    VMBCReg,	%%RVMBCReg
-        .reg    UARTReg,	%%RUARTReg
-        .reg    ETHERReg,	%%RXLINXReg
-
-;* Compiler and programmer registers. (gr96-gr127)
-
-	.extern Rv0, Rv1, Rv2, Rv3, Rv4, Rv5, Rv6, Rv7, Rv8, Rv9
-	.extern Rv10, Rv11, Rv12, Rv13, Rv14, Rv15
-
-	.reg	v0, 		%%Rv0
-	.reg	v1, 		%%Rv1
-	.reg	v2, 		%%Rv2
-	.reg	v3, 		%%Rv3
-
-	.reg	v4, 		%%Rv4
-	.reg	v5, 		%%Rv5
-	.reg	v6, 		%%Rv6
-	.reg	v7, 		%%Rv7
-
-	.reg	v8, 		%%Rv8
-	.reg	v9, 		%%Rv9
-	.reg	v10, 		%%Rv10
-	.reg	v11, 		%%Rv11
-
-	.reg	v12, 		%%Rv12
-	.reg	v13, 		%%Rv13
-	.reg	v14, 		%%Rv14
-	.reg	v15, 		%%Rv15
-
-	.extern Rtv0, Rtv1, Rtv2, Rtv3, Rtv4
-
-	.reg	tv0, 		%%Rtv0
-	.reg	tv1, 		%%Rtv1
-	.reg	tv2, 		%%Rtv2
-	.reg	tv3, 		%%Rtv3
-	.reg	tv4, 		%%Rtv4
-
-; ****************************************************************************
-;	For uatrap
-; register definitions -- since this trap handler must allow for
-; nested traps and interrupts such as TLB miss, protection violation,
-; or Data Access Exception, and these trap handlers use the shared
-; Temp registers, we must maintain our own that are safe over user-
-; mode loads and stores.  The following must be assigned global
-; registers which are not used in INTR[0-3], TRAP[0-1], TLB miss,
-; TLB protection violation, or data exception trap handlers.
-
-;	.reg	cha_cpy, 	OStmp4		; copy of CHA
-;	.reg	chd_cpy, 	OStmp5		; copy of CHD
-;	.reg	chc_cpy, 	OStmp6		; copy of CHC
-;	.reg	LTemp0, 	OStmp7		; local temp 0
-;	.reg	LTemp1, 	OStmp8		; local temp 1
-
-; ****************************************************************************
diff --git a/c/src/lib/libbsp/i386/shared/irq/idt.c b/c/src/lib/libbsp/i386/shared/irq/idt.c
deleted file mode 100644
index 5f44bd0d2b..0000000000
--- a/c/src/lib/libbsp/i386/shared/irq/idt.c
+++ /dev/null
@@ -1,288 +0,0 @@
-/*
- * cpu.c  - This file contains implementation of C function to
- *          Instanciate IDT entries. More detailled information can be found
- *	    on Intel site and more precisely in the following book :
- *
- *		Pentium Processor familly
- *		Developper's Manual
- *
- *		Volume 3 : Architecture and Programming Manual
- *
- * Copyright (C) 1998  Eric Valette (valette@crf.canon.fr)
- *                     Canon Centre Recherche France.
- *
- *  The license and distribution terms for this file may be
- *  found in found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- * $Id$
- */
-
-#include <libcpu/cpu.h>
-#include <irq.h>
-
-static rtems_raw_irq_connect_data* 	raw_irq_table;
-static rtems_raw_irq_connect_data  	default_raw_irq_entry;
-static interrupt_gate_descriptor   	default_idt_entry;
-static rtems_raw_irq_global_settings* 	local_settings;
-
-void create_interrupt_gate_descriptor (interrupt_gate_descriptor* idtEntry,
-				       rtems_raw_irq_hdl hdl)
-{
-    idtEntry->low_offsets_bits	= (((unsigned) hdl) & 0xffff);
-    idtEntry->segment_selector	= i386_get_cs(); 
-    idtEntry->fixed_value_bits	= 0;
-    idtEntry->gate_type		= 0xe; 
-    idtEntry->privilege		= 0;
-    idtEntry->present		= 1;
-    idtEntry->high_offsets_bits	= ((((unsigned) hdl) >> 16) & 0xffff);
-}
-
-rtems_raw_irq_hdl get_hdl_from_vector(rtems_vector_offset index)
-{
-    rtems_raw_irq_hdl		hdl;
-    interrupt_gate_descriptor* 	idt_entry_tbl;
-    unsigned			limit;
-
-    i386_get_info_from_IDTR (&idt_entry_tbl, &limit);
-	
-    /* Convert limit into number of entries */
-    limit = (limit + 1) / sizeof(interrupt_gate_descriptor);
-  
-    if(index >= limit) {
-        return 0;
-    }
-
-    * ((unsigned int*) &hdl) = (idt_entry_tbl[index].low_offsets_bits | 
-			      (idt_entry_tbl[index].high_offsets_bits << 16));
-    return hdl;
-}
-
-int i386_set_idt_entry  (const rtems_raw_irq_connect_data* irq)
-{
-    interrupt_gate_descriptor* 	idt_entry_tbl;
-    unsigned			limit;
-    unsigned int 		level;
-
-    
-    i386_get_info_from_IDTR (&idt_entry_tbl, &limit);
-
-    /* Convert limit into number of entries */
-    limit = (limit + 1) / sizeof(interrupt_gate_descriptor);
-
-    if (irq->idtIndex >= limit) {
-      return 0;
-    }
-    /*
-     * Check if default handler is actually connected. If not issue an error.
-     * You must first get the current handler via i386_get_current_idt_entry
-     * and then disconnect it using i386_delete_idt_entry.
-     * RATIONALE : to always have the same transition by forcing the user
-     * to get the previous handler before accepting to disconnect.
-     */
-    if (get_hdl_from_vector(irq->idtIndex) != default_raw_irq_entry.hdl) {
-      return 0;
-    }
-
-    _CPU_ISR_Disable(level);
-    
-    raw_irq_table [irq->idtIndex] = *irq;
-    create_interrupt_gate_descriptor (&idt_entry_tbl[irq->idtIndex], irq->hdl);
-    irq->on(irq);
-    
-    _CPU_ISR_Enable(level);
-    return 1;
-}
-
-void _CPU_ISR_install_vector (unsigned vector,
-			      void* hdl,
-			      void** oldHdl)
-{
-    interrupt_gate_descriptor* 	idt_entry_tbl;
-    unsigned			limit;
-    interrupt_gate_descriptor	new;
-    unsigned int 		level;
-    
-    i386_get_info_from_IDTR (&idt_entry_tbl, &limit);
-
-    /* Convert limit into number of entries */
-    limit = (limit + 1) / sizeof(interrupt_gate_descriptor);
-
-    if (vector >= limit) {
-      return;
-    }
-    _CPU_ISR_Disable(level)
-    * ((unsigned int *) oldHdl) = idt_entry_tbl[vector].low_offsets_bits |
-	(idt_entry_tbl[vector].high_offsets_bits << 16);
-
-    create_interrupt_gate_descriptor(&new,  hdl);
-    idt_entry_tbl[vector] = new;
-
-    _CPU_ISR_Enable(level);
-}
-				
-int i386_get_current_idt_entry (rtems_raw_irq_connect_data* irq)
-{
-    interrupt_gate_descriptor* 	idt_entry_tbl;
-    unsigned			limit;
-
-    i386_get_info_from_IDTR (&idt_entry_tbl, &limit);
-
-    /* Convert limit into number of entries */
-    limit = (limit + 1) / sizeof(interrupt_gate_descriptor);
-
-    if (irq->idtIndex >= limit) {
-      return 0;
-    }
-    raw_irq_table [irq->idtIndex].hdl = get_hdl_from_vector(irq->idtIndex);
-    
-    *irq = raw_irq_table [irq->idtIndex];
-    
-    return 1;
-}
-
-int i386_delete_idt_entry (const rtems_raw_irq_connect_data* irq)
-{
-    interrupt_gate_descriptor* 	idt_entry_tbl;
-    unsigned			limit;
-    unsigned int 		level;
-    
-    i386_get_info_from_IDTR (&idt_entry_tbl, &limit);
-
-    /* Convert limit into number of entries */
-    limit = (limit + 1) / sizeof(interrupt_gate_descriptor);
-
-    if (irq->idtIndex >= limit) {
-      return 0;
-    }
-    /*
-     * Check if handler passed is actually connected. If not issue an error.
-     * You must first get the current handler via i386_get_current_idt_entry
-     * and then disconnect it using i386_delete_idt_entry.
-     * RATIONALE : to always have the same transition by forcing the user
-     * to get the previous handler before accepting to disconnect.
-     */
-    if (get_hdl_from_vector(irq->idtIndex) != irq->hdl){
-      return 0;
-    }
-    _CPU_ISR_Disable(level);
-
-    idt_entry_tbl[irq->idtIndex] = default_idt_entry;
-
-    irq->off(irq);
-    
-    raw_irq_table[irq->idtIndex] = default_raw_irq_entry;
-    raw_irq_table[irq->idtIndex].idtIndex = irq->idtIndex;
-
-    _CPU_ISR_Enable(level);
-    
-    return 1;
-}
-
-/*
- * Caution this function assumes the IDTR has been already set.
- */
-int i386_init_idt (rtems_raw_irq_global_settings* config)
-{
-    unsigned			limit;
-    unsigned 			i;
-    unsigned 			level;
-    interrupt_gate_descriptor*	idt_entry_tbl;
-    
-    i386_get_info_from_IDTR (&idt_entry_tbl, &limit);
-
-    /* Convert limit into number of entries */
-    limit = (limit + 1) / sizeof(interrupt_gate_descriptor);
-      
-    if (config->idtSize != limit) {
-      return 0;
-    }
-    /*
-     * store various accelarators
-     */
-    raw_irq_table 		= config->rawIrqHdlTbl;
-    local_settings 		= config;
-    default_raw_irq_entry 	= config->defaultRawEntry;
-
-    _CPU_ISR_Disable(level);
-
-    create_interrupt_gate_descriptor (&default_idt_entry, default_raw_irq_entry.hdl);
-
-    for (i=0; i < limit; i++) {
-      interrupt_gate_descriptor new;
-      create_interrupt_gate_descriptor (&new, raw_irq_table[i].hdl);
-      idt_entry_tbl[i] = new;
-      if (raw_irq_table[i].hdl != default_raw_irq_entry.hdl) {
-	raw_irq_table[i].on(&raw_irq_table[i]);
-      }
-      else {
-	raw_irq_table[i].off(&raw_irq_table[i]);
-      }
-    }
-    _CPU_ISR_Enable(level);
-
-    return 1;
-}
-
-int i386_get_idt_config (rtems_raw_irq_global_settings** config)
-{
-  *config = local_settings;
-  return 1;
-}
-
-/*
- * Caution this function assumes the GDTR has been already set.
- */
-int i386_set_gdt_entry (unsigned short segment_selector, unsigned base,
-			unsigned limit)
-{
-    unsigned 			gdt_limit;
-    unsigned short              tmp_segment = 0;
-    unsigned int                limit_adjusted;
-    segment_descriptors* 	gdt_entry_tbl;
-
-      
-    i386_get_info_from_GDTR (&gdt_entry_tbl, &gdt_limit);
-
-    if (segment_selector > limit) {
-      return 0;
-    }
-    /*
-     * set up limit first
-     */
-    limit_adjusted = limit;
-    if ( limit > 4095 ) {
-      gdt_entry_tbl[segment_selector].granularity = 1;
-      limit_adjusted /= 4096;
-    }
-    gdt_entry_tbl[segment_selector].limit_15_0  = limit_adjusted & 0xffff;
-    gdt_entry_tbl[segment_selector].limit_19_16 = (limit_adjusted >> 16) & 0xf;
-    /*
-     * set up base
-     */
-    gdt_entry_tbl[segment_selector].base_address_15_0  = base & 0xffff;
-    gdt_entry_tbl[segment_selector].base_address_23_16 = (base >> 16) & 0xff;
-    gdt_entry_tbl[segment_selector].base_address_31_24 = (base >> 24) & 0xff;
-    /*
-     * set up descriptor type (this may well becomes a parameter if needed)
-     */
-    gdt_entry_tbl[segment_selector].type 		= 2;   	/* Data R/W */
-    gdt_entry_tbl[segment_selector].descriptor_type 	= 1;	/* Code or Data */
-    gdt_entry_tbl[segment_selector].privilege 		= 0; 	/* ring 0 */
-    gdt_entry_tbl[segment_selector].present 		= 1; 	/* not present */
-
-    /*
-     * Now, reload all segment registers so the limit takes effect.
-     */
-
-    asm volatile( "movw %%ds,%0 ; movw %0,%%ds
-                   movw %%es,%0 ; movw %0,%%es
-                   movw %%fs,%0 ; movw %0,%%fs
-                   movw %%gs,%0 ; movw %0,%%gs
-                   movw %%ss,%0 ; movw %0,%%ss"
-                   : "=r" (tmp_segment)
-                   : "0"  (tmp_segment)
-		  );
-    
-    return 1;
-}
diff --git a/c/src/lib/libbsp/i960/cvme961/start/Makefile.in b/c/src/lib/libbsp/i960/cvme961/start/Makefile.in
deleted file mode 100644
index 68dcd2196e..0000000000
--- a/c/src/lib/libbsp/i960/cvme961/start/Makefile.in
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-# C source names, if any, go here -- minus the .c
-C_PIECES=
-C_FILES=$(C_PIECES:%=%.c)
-C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
-
-H_FILES=
-
-# Assembly source names, if any, go here -- minus the .s
-S_PIECES=start
-S_FILES=$(S_PIECES:%=%.s)
-S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
-
-SRCS=$(C_FILES) $(H_FILES) $(S_FILES)
-OBJS=$(C_O_FILES) $(S_O_FILES)
-
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-PGM=${ARCH}/start.o
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES  +=
-CPPFLAGS +=
-CFLAGS   +=
-
-LD_PATHS  +=
-LD_LIBS   +=
-LDFLAGS   +=
-
-#
-# Add your list of files to delete here.  The config files
-#  already know how to delete some stuff, so you may want
-#  to just run 'make clean' first to see what gets missed.
-#  'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
-
-all:	${ARCH} $(SRCS) $(OBJS) $(PGM)
-	$(INSTALL_VARIANT) -m 555 ${PGM} ${PROJECT_RELEASE}/lib
diff --git a/c/src/lib/libbsp/m68k/efi332/start/Makefile.in b/c/src/lib/libbsp/m68k/efi332/start/Makefile.in
deleted file mode 100644
index 2373aeca0b..0000000000
--- a/c/src/lib/libbsp/m68k/efi332/start/Makefile.in
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-PGM=${ARCH}/start332.o
-
-# C source names, if any, go here -- minus the .c
-C_PIECES=start332
-C_FILES=$(C_PIECES:%=%.c)
-C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
-
-H_FILES=
-
-SRCS=$(C_FILES) $(H_FILES)
-OBJS=$(C_O_FILES)
-
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES  +=
-CPPFLAGS +=
-CFLAGS   +=
-
-LD_PATHS  +=
-LD_LIBS   +=
-LDFLAGS   +=
-
-#
-# Add your list of files to delete here.  The config files
-#  already know how to delete some stuff, so you may want
-#  to just run 'make clean' first to see what gets missed.
-#  'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
-
-all:	${ARCH} $(SRCS) $(OBJS) $(PGM)
-	$(INSTALL_VARIANT) -m 555 ${PGM} ${PROJECT_RELEASE}/lib
diff --git a/c/src/lib/libbsp/m68k/efi332/start/start.c b/c/src/lib/libbsp/m68k/efi332/start/start.c
deleted file mode 100644
index 05f8d75ce9..0000000000
--- a/c/src/lib/libbsp/m68k/efi332/start/start.c
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- *  $Id
- */
-
-#include <efi332.h>
-#include <sim.h>
-#define __START_C__
-#include "bsp.h"
-
-m68k_isr_entry M68Kvec[256];
-m68k_isr_entry vectors[256];
-char * const __argv[]= {"main", ""};
-char * const __env[]= {""};
-
-/*
- *  This prototype really should have the noreturn attribute but
- *  that causes a warning since it appears that the routine does
- *  return.
- *
- *   void dumby_start ()  __attribute__ ((noreturn));
- */
-
-void dumby_start ();
-void  dumby_start() {
-void  boot_card();
-
-  /* We need to by-pass the link instruction since the RAM chip-
-     select pins are not yet configured. */
-  asm volatile ( ".global start ;
-                  start:");
-
-  /* disable interrupts, load stack pointer */
-  asm volatile ( "oriw  #0x0700, %sr;
-                  moveal #M68Kvec, %a0;
-                  movec %a0, %vbr;
-                  movel  #_end, %d0;
-                  addl   " STACK_SIZE ",%d0;
-                  movel  %d0,%sp;
-                  link %a6, #0"
-		  );
-
-  /* include in ram_init.S */
-  /*
-   * Initalize the SIM module.
-   * The stack pointer is not usable until the RAM chip select lines
-   * are configured. The following code must remain inline.
-   */
-
-  /* Module Configuration Register */
-  /*    see section(s) 3.1.3-3.1.6 of the SIM Reference Manual */
-  *SIMCR = (unsigned short int) 
-    (FRZSW | FRZBM | SAM(0,8,SHEN) | (MM*SIM_MM) | SAM(SIM_IARB,0,IARB));
-
-  /* Synthesizer Control Register */
-  /*    see section(s) 4.8 */
-  /* end include in ram_init.S */
-  *SYNCR = (unsigned short int)
-    ( SAM(EFI_W,15,W) | SAM(0x0,14,X) | SAM(EFI_Y,8,Y) | STSIM );
-  while (! (*SYNCR & SLOCK));	/* protect from clock overshoot */
-  /* include in ram_init.S */
-  *SYNCR = (unsigned short int)
-    ( SAM(EFI_W,15,W) | SAM(EFI_X,14,X) | SAM(EFI_Y,8,Y) | STSIM );
-
-  /* System Protection Control Register */
-  /*    !!! can only write to once after reset !!! */
-  /*    see section 3.8.4 of the SIM Reference Manual */
-  *SYPCR = (unsigned char)( SAM(0x3,4,SWT) | HME | BME );
-
-  /* Periodic Interrupr Control Register */
-  /*    see section 3.8.2 of the SIM Reference Manual */
-  *PICR = (unsigned short int)
-    ( SAM(0,8,PIRQL) | SAM(EFI_PIV,0,PIV) );
-  /*     ^^^ zero disables interrupt, don't enable here or ram_init will
-	 be wrong. It's enabled below. */
-
-  /* Periodic Interrupt Timer Register */
-  /*    see section 3.8.3 of the SIM Reference Manual */
-  *PITR = (unsigned short int)( SAM(0x09,0,PITM) );
-  /*    1.098mS interrupt */
-
-  /* Port C Data */
-  /*    load values before enabled */
-  *PORTC = (unsigned char) 0x0;
-
-  /* Chip-Select Base Address Register */
-  /*    see section 7 of the SIM Reference Manual */
-  *CSBARBT = (unsigned short int)
-    (((0x000000 >> 8)&0xfff8) | BS_512K ); /* 512k bytes located at 0x0000 */
-  *CSBAR0 = (unsigned short int)
-    (((0x000000 >> 8)&0xfff8) | BS_1M );   /* 1M bytes located at 0x0000 */
-  *CSBAR1 = (unsigned short int)
-    (((0x080000 >> 8)&0xfff8) | BS_256K ); /* 256k bytes located at 0x80000 */
-  *CSBAR2 = (unsigned short int)
-    (((0x080000 >> 8)&0xfff8) | BS_256K ); /* 256 bytes located at 0x80000 */
-  *CSBAR3 = (unsigned short int)         
-    (0xfff8 | BS_64K);	       	         /* AVEC interrupts */
-  *CSBAR10 = (unsigned short int)
-    (((0x000000 >> 8)&0xfff8) | BS_512K ); /* 512k bytes located at 0x0000 */
-
-  /* Chip-Select Options Registers */
-  /*    see section 7 of the SIM Reference Manual */
-  *CSORBT = (unsigned short int)
-    ( BothBytes | ReadWrite | SyncAS | WaitStates_13 | UserSupSpace );
-  *CSOR0 = (unsigned short int)
-    ( BothBytes | ReadOnly | SyncAS | External | UserSupSpace );
-  *CSOR1 = (unsigned short int)
-    ( LowerByte | ReadWrite | SyncAS | FastTerm | UserSupSpace );
-  *CSOR2 = (unsigned short int)
-    ( UpperByte | ReadWrite | SyncAS | FastTerm | UserSupSpace );
-  *CSOR3 = (unsigned short int)
-    ( BothBytes | ReadWrite | SyncAS | CPUSpace | IPLevel_any | AVEC );
-  *CSOR10 = (unsigned short int)
-    ( BothBytes | ReadOnly | SyncAS | External | UserSupSpace );
-
-  /* Chip Select Pin Assignment Register 0 */
-  /*    see section 7 of the SIM Reference Manual */
-  *CSPAR0 = (unsigned short int)( 
-     SAM(DisOut,CS_5,0x3000) |	/* PC2 */
-     SAM(DisOut,CS_4,0x0c00) |	/* PC1 */
-     SAM(DisOut,CS_3,0x0300) |	/* AVEC (internally) */
-     SAM(CS16bit,CS_2,0x00c0)|	/* RAM UDS */
-     SAM(CS16bit,CS_1,0x0030)|	/* RAM LDS */
-     SAM(CS16bit,CS_0,0x000c)|	/* W/!R */
-     SAM(CS16bit,CSBOOT,0x0003)	/* ROM DS */
-     );
-
-  /* Chip Select Pin Assignment Register 1 */
-  /*    see section 7 of the SIM Reference Manual */
-  *CSPAR1 = (unsigned short int)( 
-     SAM(CS16bit,CS_10,0x300)|	/* ECLK */
-     SAM(DisOut,CS_9,0x0c0) |	/* PC6 */
-     SAM(DisOut,CS_8,0x030) |	/* PC5 */
-     SAM(DisOut,CS_7,0x00c) |	/* PC4 */
-     SAM(DisOut,CS_6,0x003)	/* PC3 */
-     );
-
-  /* Port E and F Data Register */
-  /*    see section 9 of the SIM Reference Manual */
-  *PORTE0 = (unsigned char) 0;
-  *PORTF0 = (unsigned char) 0;
-
-  /* Port E and F Data Direction Register */
-  /*    see section 9 of the SIM Reference Manual */
-  *DDRE = (unsigned char) 0xff;
-  *DDRF = (unsigned char) 0xfd;
-  
-  /* Port E and F Pin Assignment Register */
-  /*    see section 9 of the SIM Reference Manual */
-  *PEPAR = (unsigned char) 0;
-  *PFPAR = (unsigned char) 0;
-
-  /* end of SIM initalization code */
-  /* end include in ram_init.S */
-
-
-
-  /*
-   * Initialize RAM by copying the .data section out of ROM (if
-   * needed) and "zero-ing" the .bss section.
-   */
-  {
-    register char *src = _endtext;
-    register char *dst = _sdata;
-
-    if (_copy_data_from_rom)
-      /* ROM has data at end of text; copy it. */
-      while (dst < _edata)
-	*dst++ = *src++;
-    
-    /* Zero bss */
-    for (dst = __bss_start; dst< _end; dst++)
-      *dst = 0;
-  }
-
-  /*
-   * Initalize the board.
-   */
-  Spurious_Initialize();
-  console_init();
-
-  /*
-   * Execute main with arguments argv and environment env
-   */
-  /* main(1, __argv, __env); */
-
-  boot_card();
-
-  reboot();
-}
-
-void reboot() {asm("trap #15");}
-
diff --git a/c/src/lib/libbsp/m68k/efi68k/start/Makefile.in b/c/src/lib/libbsp/m68k/efi68k/start/Makefile.in
deleted file mode 100644
index ddd45a4c24..0000000000
--- a/c/src/lib/libbsp/m68k/efi68k/start/Makefile.in
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-PGM=${ARCH}/start68k.o
-
-# C source names, if any, go here -- minus the .c
-C_PIECES=start68k
-C_FILES=$(C_PIECES:%=%.c)
-C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
-
-H_FILES=
-
-SRCS=$(C_FILES) $(H_FILES)
-OBJS=$(C_O_FILES)
-
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES  +=
-CPPFLAGS +=
-CFLAGS   +=
-
-LD_PATHS  +=
-LD_LIBS   +=
-LDFLAGS   +=
-
-#
-# Add your list of files to delete here.  The config files
-#  already know how to delete some stuff, so you may want
-#  to just run 'make clean' first to see what gets missed.
-#  'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
-
-all:	${ARCH} $(SRCS) $(OBJS) $(PGM)
-	$(INSTALL_VARIANT) -m 555 ${PGM} ${PROJECT_RELEASE}/lib
diff --git a/c/src/lib/libbsp/m68k/efi68k/start/start.c b/c/src/lib/libbsp/m68k/efi68k/start/start.c
deleted file mode 100644
index f63381c57f..0000000000
--- a/c/src/lib/libbsp/m68k/efi68k/start/start.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- *  $Id$
- */
-
-#include <efi68k.h>
-#define __START_C__
-#include "bsp.h"
-
-m68k_isr_entry M68Kvec[256];
-m68k_isr_entry vectors[256];
-char * const __argv[]= {"main", ""};
-char * const __env[]= {""};
-
-/*
- *  This prototype really should have the noreturn attribute but
- *  that causes a warning since it appears that the routine does
- *  return.
- *
- *   void dumby_start ()  __attribute__ ((noreturn));
- */
-
-void dumby_start ();
-void  dumby_start() {
-void  boot_card();
-
-  /* We need to by-pass the link instruction since the RAM chip-
-     select pins are not yet configured. */
-  asm volatile ( ".global start ;
-                  start:");
-
-  /* disable interrupts, load stack pointer */
-  asm volatile ( "oriw  #0x0700, %sr;
-                  movel  #_end, %d0;
-                  addl   " STACK_SIZE ",%d0;
-                  movel  %d0,%sp;
-                  link %a6, #0"
-		  );
-  /*
-   * Initialize RAM by copying the .data section out of ROM (if
-   * needed) and "zero-ing" the .bss section.
-   */
-  {
-    register char *src = _endtext;
-    register char *dst = _sdata;
-
-    if (_copy_data_from_rom)
-      /* ROM has data at end of text; copy it. */
-      while (dst < _edata)
-	*dst++ = *src++;
-    
-    /* Zero bss */
-    for (dst = __bss_start; dst< _end; dst++)
-      *dst = 0;
-  }
-
-  /*
-   * Initalize the board.
-   */
-  Spurious_Initialize();
-  console_init();
-  watch_dog_init();
-  tcp_init();
-
-  /*
-   * Execute main with arguments argv and environment env
-   */
-  /* main(1, __argv, __env); */
-  boot_card();
-
-  reboot();
-}
diff --git a/c/src/lib/libbsp/m68k/gen68302/start/Makefile.in b/c/src/lib/libbsp/m68k/gen68302/start/Makefile.in
deleted file mode 100644
index d96348b19d..0000000000
--- a/c/src/lib/libbsp/m68k/gen68302/start/Makefile.in
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-PGMS=${ARCH}/start302.o
-
-# C source names, if any, go here -- minus the .c
-C_PIECES=
-C_FILES=$(C_PIECES:%=%.c)
-C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
-
-H_FILES=
-
-# Assembly source names, if any, go here -- minus the .s
-S_PIECES=start302
-S_FILES=$(S_PIECES:%=%.s)
-S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
-
-SRCS=$(C_FILES) $(H_FILES) $(S_FILES)
-OBJS=$(C_O_FILES) $(S_O_FILES)
-
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES  +=
-CPPFLAGS +=
-CFLAGS   +=
-
-LD_PATHS  +=
-LD_LIBS   +=
-LDFLAGS   +=
-
-#
-# Add your list of files to delete here.  The config files
-#  already know how to delete some stuff, so you may want
-#  to just run 'make clean' first to see what gets missed.
-#  'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
-
-all:	${ARCH} $(SRCS) $(OBJS) $(PGM)
-	$(INSTALL_VARIANT) -m 555 ${PGMS} ${PROJECT_RELEASE}/lib
-
-# Install the program(s), appending _g or _p as appropriate.
-# for include files, just use $(INSTALL)
diff --git a/c/src/lib/libbsp/m68k/gen68302/start/start302.s b/c/src/lib/libbsp/m68k/gen68302/start/start302.s
deleted file mode 100644
index 2a7c652c87..0000000000
--- a/c/src/lib/libbsp/m68k/gen68302/start/start302.s
+++ /dev/null
@@ -1,267 +0,0 @@
-/*  entry.s
- *
- *  This file contains the entry point for the application.
- *  The name of this entry point is compiler dependent.
- *  It jumps to the BSP which is responsible for performing
- *  all initialization.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "asm.h"
-
-  .set	BAR,		0xF2		| Base Address Register location
-  .set	SCR,		0xF4		| System Control Register location
-  .set	BAR_VAL,	0x0f7f		| BAR value
-  .set	SCR_VAL,	0x00080f00	| SCR value
-  .set	GIMR_VAL,	0x8780		|Global Interrupt Mode Register. (MUST BE WRITTEN).
-  .set	BaseAddr,(BAR_VAL&0x0fff)<<12	| MC68302 internal base address
-
-  .set	oSYSRAM,	0x000		| 576 bytes of internal system RAM
-
-  .set	oGIMR,		0x812
-
-  .set	oCS0_Base,	0x830		| 16 bits, Chip Sel 0 Base Reg
-  .set	oCS0_Option,	0x832		| 16 bits, Chip Sel 0 Option Reg
-  .set	oCS1_Base,	0x834		| 16 bits, Chip Sel 1 Base Reg
-  .set	oCS1_Option,	0x836		| 16 bits, Chip Sel 1 Option Reg
-  .set	oCS2_Base,	0x838		| 16 bits, Chip Sel 2 Base Reg
-  .set	oCS2_Option,	0x83a		| 16 bits, Chip Sel 2 Option Reg
-  .set	oCS3_Base,	0x83c		| 16 bits, Chip Sel 3 Base Reg
-  .set	oCS3_Option,	0x83e		| 16 bits, Chip Sel 3 Option Reg
-
-  .set	tmpSRAM_BASE,	0x400000	| start of temporary SRAM
-  .set	FLASH_BASE,	0xc00000	| start of FLASH''s normal location
-
-
-BEGIN_CODE
-         PUBLIC (M68Kvec)               | Vector Table
-SYM (M68Kvec):				| standard location for vectors
-V___ISSP: .long	0x00001000		|00  0 Reset: Initial SSP
-V____IPC: .long	SYM(start)-V___ISSP	|04  1 Reset: Initial PC
-V_BUSERR: .long	Bad-V___ISSP		|08  2 Bus Error
-V_ADRERR: .long	Bad-V___ISSP		|0c  3 Address Error
-	.space	240			| reserve space for reset of vectors
-
-#if ( M68K_HAS_SEPARATE_STACKS == 1 )
-SYM (lowintstack):
-        .space   4092                   | reserve for interrupt stack
-SYM (hiintstack):
-        .space   4                      | end of interrupt stack
-#endif
-
-	PUBLIC (start)                 | Default entry point for GNU
-SYM (start):
-	move.w	#0x2700,sr		| Disable all interrupts
-	move.w	#BAR_VAL,BAR		| Set Base Address Register
-	move.l	#SCR_VAL,SCR		| Set System Control Register
-	lea	BaseAddr,a5
-	move.w	#GIMR_VAL,a5@(oGIMR)	| Set Global Interrupt Mode Register
-
-|
-| Set up chip select registers for the remapping process.
-|
-
-|
-|      0      X      x    x    x    x
-| 0  000 0  0-- -  --- ---- ---- ----
-| x  xxx x  xxx x  xx
-|
-	move.w	#0xc001,a5@(oCS0_Base)   | Expand CS0 to full size (FLASH)
-	move.w	#0x1f82,a5@(oCS0_Option) | 000000-03ffff, R, 0 WS
-
-|
-|      X      x      x    x    x    x
-| 0  100 0  0-- -  --- ---- ---- ----
-| x  xxx x  xxx x  xx
-|
-	move.w	#0xa801,a5@(oCS1_Base)   | Set up and enable CS1 (SRAM)
-	move.w	#0x1f80,a5@(oCS1_Option) | 400000-43ffff, RW, 0 WS
-
-|
-| Copy the initial boot FLASH area to the temporary SRAM location.
-|
-		moveq	#0,d0
-		movea.l	d0,a0			| a0 -> start of FLASH
-		lea	tmpSRAM_BASE,a1 	| a1 -> start of tmp SRAM
-|		moveq	#(endPreBoot-V___ISSP)/4,d0	| # longs to copy
-		moveq	#127,d0
-cpy_flash:	move.l	(a0)+,(a1)+		| copy
-		subq.l	#1,d0
-		bne	cpy_flash
-
-|
-| Copy remap code to 68302''s internal system RAM.
-|
-		movea.w	#begRemap-V___ISSP,a0	| a0 -> remap code
-		lea	a5@(oSYSRAM),a1	| a1 -> internal system RAM
-|		moveq	#(endRemap-begRemap)/2-1,d0	| d0 = # words to copy
-		moveq	#11,d0
-cpy_remap:	move.w	(a0)+,(a1)+		| copy
-		dbra	d0,cpy_remap
-
-|
-| Jump to the remap code in the 68302''s internal system RAM.
-|
-		jmp	a5@(oSYSRAM)		| (effectively a jmp begRemap)
-
-|
-| This remap code, when executed from the 68302''s internal system RAM
-| will 1) remap CS1 so that SRAM is at 0
-|      2) remap CS0 so that FLASH is at FLASH_BASE
-|  and 3) jump to executable code in the remapped FLASH.
-|
-begRemap:	move.w	#0xa001,a5@(oCS1_Base)	| Move CS1 (SRAM)
-		move.w	#0xd801,a5@(oCS0_Base)	| Move CS0 (FLASH)
-		lea	FLASH_BASE,a0
-		jmp	a0@(endRemap-V___ISSP.w)	| Jump back to FLASH
-endRemap:
-|
-| Now set up the remaining chip select registers.
-|
-
-|
-|      4      0      x    x    x    x
-| 1  000 1  111 0  000 0--- ---- ----
-| x  xxx x  xxx x  xx
-|
- 	move.w	#0xb1e1,a5@(oCS2_Base)		| Set up and enable CS2 (dpRAM)
- 	move.w	#0x1ff0,a5@(oCS2_Option)	| 8f0000-8f07ff, RW, 0 WS
-
-|
-|      8      X      x    x    x    x
-| 1  000 0  0-- -  --- ---- ---- ----
-| x  xxx x  xxx x  xx
-|
-	move.w	#0xd001,a5@(oCS3_Base)		| Set up and enable CS3 (IO)
-	move.w	#0x1f80,a5@(oCS3_Option)	| 800000-83ffff, RW, 0 WS
-
-endPreBoot:
-
-	move.b	#0x30,0x800001			| set status LED amber
-
- .set	oPIOB_Ctrl,	0x824
- .set	oPIOB_DDR,	0x826
- .set	oPIOB_Data,	0x828
-
- .set	oPIOA_Ctrl,	0x81e
- .set	oPIOA_DDR,	0x820
- .set	oPIOA_Data,	0x822
-
-	move.w	#0x0ff8,a5@(oPIOB_Data)	| Make output follow resistors.
-	move.w	#0x00ff,a5@(oPIOB_DDR)		| Set up PB7-PB0 for output.
-	move.w	#0x0080,a5@(oPIOB_Ctrl)	| Set up WDOG* as dedicated
-						| peripheral pins.
-
-	move.w	#0x1fff,a5@(oPIOA_Data)	| Make output follow resistors.
-	move.w	#0xea2a,a5@(oPIOA_DDR)		| Set up PA15-PA0 for in/output.
-	move.w	#0x0003,a5@(oPIOA_Ctrl)	| Set up TXD2/RXD2 as dedicated
-						| peripheral pins.
-
-|
-| Place "Bad" in all vectors from 010 thru 0ec.  Vectors 0f0 and 0f4
-| are not set because they are the 68302''s BAR and SCR.
-|
-		movea.w	#0x010,a0
-		moveq	#(0x0f0-0x010)/4-1,d0
-		move.l	#Bad,d1
-cpy_Bad:	move.l	d1,(a0)+
-		dbra	d0,cpy_Bad
-
- .set	vbase,	0x0200
-
-		lea	vbase,a0
-		moveq	#31,d0
-cpy_Bad1:	move.l	d1,(a0)+
-		dbra	d0,cpy_Bad1
-
-|
-| Fill in special locations to configure OS
-|
-		move.l	#Bad,0x008		| Bus Error
-		move.l	#Bad,0x00c		| Address Error
-		move.l	#Bad,0x024		| Trace
-|		move.l	#KE_IRET,$0b4		| pSOS+ RET_I Call
-
-|		move.l	#_cnsl_isr,vbase+0x028	| SCC2
-		move.l	#timerisr,vbase+0x018	| Timer ISR
-
-        |
-        | zero out uninitialized data area
-        |
-zerobss:
-        moveal  # SYM (end),a0                | find end of .bss
-        moveal  # SYM (bss_start),a1          | find beginning of .bss
-        moveq   #0,d0
-
-loop:   movel   d0,a1@+                | to zero out uninitialized
-        cmpal   a0,a1
-        jlt     loop                    | loop until _end reached
-
-        movel   # SYM (end),d0               | d0 = end of bss/start of heap
-        addl    # SYM (heap_size),d0          | d0 = end of heap
-        movel   d0, SYM (stack_start)  | Save for brk() routine
-        addl    # SYM (stack_size),d0         | make room for stack
-        andl    #0xffffffc0,d0         | align it on 16 byte boundary
-        movw    #0x3700,sr             | SUPV MODE,INTERRUPTS OFF!!!
-        movel   d0,a7                 | set master stack pointer
-        movel   d0,a6                 | set base pointer
-
-      /*
-       *  RTEMS should maintain a separate interrupt stack on CPUs
-       *  without one in hardware.  This is currently not supported
-       *  on versions of the m68k without a HW intr stack.
-       */
-
-#if ( M68K_HAS_SEPARATE_STACKS == 1 )
-        lea     SYM (hiintstack),a0          | a0 = high end of intr stack
-        movec   a0,isp                | set interrupt stack
-#endif
-
-        move.l  #0,a7@-               | environp
-        move.l  #0,a7@-               | argv
-        move.l  #0,a7@-               | argc
-        jsr     SYM (boot_card)
-
-	nop
-Bad:	bra	Bad
-
-	nop
-END_CODE
-
-
-BEGIN_DATA
-
-	PUBLIC (start_frame)
-SYM (start_frame):
-        .space  4,0
-
-	PUBLIC (stack_start)
-SYM (stack_start):
-        .space  4,0
-END_DATA
-
-BEGIN_BSS
-
-	PUBLIC (environ)
-        .align 2
-SYM (environ):
-        .long  0
-
-	PUBLIC (heap_size)
-        .set   SYM (heap_size),0x2000
-
-        PUBLIC (stack_size)
-        .set   SYM (stack_size),0x1000
-
-
-END_DATA
-END
diff --git a/c/src/lib/libbsp/m68k/gen68340/start/Makefile.in b/c/src/lib/libbsp/m68k/gen68340/start/Makefile.in
deleted file mode 100644
index ce91b95e3b..0000000000
--- a/c/src/lib/libbsp/m68k/gen68340/start/Makefile.in
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-PGMS=${ARCH}/start340.o
-
-# C source names, if any, go here -- minus the .c
-C_PIECES=
-C_FILES=$(C_PIECES:%=%.c)
-C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
-
-H_FILES=
-
-# Assembly source names, if any, go here -- minus the .s
-S_PIECES=start340
-S_FILES=$(S_PIECES:%=%.s)
-S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
-
-SRCS=$(C_FILES) $(H_FILES) $(S_FILES)
-OBJS=$(C_O_FILES) $(S_O_FILES)
-
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES  +=
-CPPFLAGS +=
-CFLAGS   +=
-
-LD_PATHS  +=
-LD_LIBS   +=
-LDFLAGS   +=
-
-#
-# Add your list of files to delete here.  The config files
-#  already know how to delete some stuff, so you may want
-#  to just run 'make clean' first to see what gets missed.
-#  'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
-
-all:	${ARCH} $(SRCS) $(OBJS) $(PGM)
-	$(INSTALL_VARIANT) -m 555 ${PGMS} ${PROJECT_RELEASE}/lib
-
-# Install the program(s), appending _g or _p as appropriate.
-# for include files, just use $(INSTALL)
diff --git a/c/src/lib/libbsp/m68k/gen68340/start/start340.s b/c/src/lib/libbsp/m68k/gen68340/start/start340.s
deleted file mode 100644
index 58ea0c92d0..0000000000
--- a/c/src/lib/libbsp/m68k/gen68340/start/start340.s
+++ /dev/null
@@ -1,874 +0,0 @@
-/*
- *  This file contains the entry point for the application.
- *  The name of this entry point is compiler dependent.
- *  It jumps to the BSP which is responsible for performing
- *  all initialization.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- * Based on the `gen68360' board support package, and covered by the
- * original distribution terms.
- *
- * Geoffroy Montel
- * France Telecom - CNET/DSM/TAM/CAT
- * 4, rue du Clos Courtel
- * 35512 CESSON-SEVIGNE
- * FRANCE
- * 
- * e-mail: g_montel@yahoo.com
- *
- *  $Id$
- */
-
-#include "asm.h"
-#include <m68349.inc>
-
-#define	_OLD_ASTECC 1 /* old addresses for AST68340 only, undefine for AST68349 */
-
-BEGIN_CODE
-	/*
-	 * Step 1: Decide on Reset Stack Pointer and Initial Program Counter
-	 */
-Entry:
-	.long	SYM(m340)+1024		|   0: Initial SSP
-	.long	start			|   1: Initial PC
-	.long	SYM(_uhoh)		|   2: Bus error
-	.long	SYM(_uhoh)		|   3: Address error
-	.long	SYM(_uhoh)		|   4: Illegal instruction
-	.long	SYM(_uhoh)		|   5: Zero division
-	.long	SYM(_uhoh)		|   6: CHK, CHK2 instruction
-	.long	SYM(_uhoh)		|   7: TRAPcc, TRAPV instructions
-	.long	SYM(_uhoh)		|   8: Privilege violation
-	.long	SYM(_uhoh)		|   9: Trace
-	.long	SYM(_uhoh)		|  10: Line 1010 emulator
-	.long	SYM(_uhoh)		|  11: Line 1111 emulator
-	.long	SYM(_uhoh)		|  12: Hardware breakpoint
-	.long	SYM(_uhoh)		|  13: Reserved for coprocessor violation
-	.long	SYM(_uhoh)		|  14: Format error
-	.long	SYM(_uhoh)		|  15: Uninitialized interrupt
-	.long	SYM(_uhoh)		|  16: Unassigned, reserved
-	.long	SYM(_uhoh)		|  17:
-	.long	SYM(_uhoh)		|  18:
-	.long	SYM(_uhoh)		|  19:
-	.long	SYM(_uhoh)		|  20:
-	.long	SYM(_uhoh)		|  21:
-	.long	SYM(_uhoh)		|  22:
-	.long	SYM(_uhoh)		|  23:
-	.long	SYM(_spuriousInterrupt)	|  24: Spurious interrupt
-	.long	SYM(_uhoh)		|  25: Level 1 interrupt autovector
-	.long	SYM(_uhoh)		|  26: Level 2 interrupt autovector
-	.long	SYM(_uhoh)		|  27: Level 3 interrupt autovector
-	.long	SYM(_uhoh)		|  28: Level 4 interrupt autovector
-	.long	SYM(_uhoh)		|  29: Level 5 interrupt autovector
-	.long	SYM(_uhoh)		|  30: Level 6 interrupt autovector
-	.long	SYM(_uhoh)		|  31: Level 7 interrupt autovector
-	.long	SYM(_uhoh)		|  32: Trap instruction (0-15)
-	.long	SYM(_uhoh)		|  33:
-	.long	SYM(_uhoh)		|  34:
-	.long	SYM(_uhoh)		|  35:
-	.long	SYM(_uhoh)		|  36:
-	.long	SYM(_uhoh)		|  37:
-	.long	SYM(_uhoh)		|  38:
-	.long	SYM(_uhoh)		|  39:
-	.long	SYM(_uhoh)		|  40:
-	.long	SYM(_uhoh)		|  41:
-	.long	SYM(_uhoh)		|  42:
-	.long	SYM(_uhoh)		|  43:
-	.long	SYM(_uhoh)		|  44:
-	.long	SYM(_uhoh)		|  45:
-	.long	SYM(_uhoh)		|  46:
-	.long	SYM(_uhoh)		|  47:
-	.long	SYM(_uhoh)		|  48: Reserved for coprocessor
-	.long	SYM(_uhoh)		|  49:
-	.long	SYM(_uhoh)		|  50:
-	.long	SYM(_uhoh)		|  51:
-	.long	SYM(_uhoh)		|  52:
-	.long	SYM(_uhoh)		|  53:
-	.long	SYM(_uhoh)		|  54:
-	.long	SYM(_uhoh)		|  55:
-	.long	SYM(_uhoh)		|  56:
-	.long	SYM(_uhoh)		|  57:
-	.long	SYM(_uhoh)		|  58:
-	.long	SYM(_uhoh)		|  59: Unassigned, reserved
-	.long	SYM(_uhoh)		|  60:
-	.long	SYM(_uhoh)		|  61:
-	.long	SYM(_uhoh)		|  62:
-	.long	SYM(_uhoh)		|  63:
-	.long	SYM(_uhoh)		|  64: User defined vectors (192)
-	.long	SYM(_uhoh)		|  65:
-	.long	SYM(_uhoh)		|  66:
-	.long	SYM(_uhoh)		|  67:
-	.long	SYM(_uhoh)		|  68:
-	.long	SYM(_uhoh)		|  69:
-	.long	SYM(_uhoh)		|  70:
-	.long	SYM(_uhoh)		|  71:
-	.long	SYM(_uhoh)		|  72:
-	.long	SYM(_uhoh)		|  73:
-	.long	SYM(_uhoh)		|  74:
-	.long	SYM(_uhoh)		|  75:
-	.long	SYM(_uhoh)		|  76:
-	.long	SYM(_uhoh)		|  77:
-	.long	SYM(_uhoh)		|  78:
-	.long	SYM(_uhoh)		|  79:
-	.long	SYM(_uhoh)		|  80:
-	.long	SYM(_uhoh)		|  81:
-	.long	SYM(_uhoh)		|  82:
-	.long	SYM(_uhoh)		|  83:
-	.long	SYM(_uhoh)		|  84:
-	.long	SYM(_uhoh)		|  85:
-	.long	SYM(_uhoh)		|  86:
-	.long	SYM(_uhoh)		|  87:
-	.long	SYM(_uhoh)		|  88:
-	.long	SYM(_uhoh)		|  89:
-	.long	SYM(_uhoh)		|  90:
-	.long	SYM(_uhoh)		|  91:
-	.long	SYM(_uhoh)		|  92:
-	.long	SYM(_uhoh)		|  93:
-	.long	SYM(_uhoh)		|  94:
-	.long	SYM(_uhoh)		|  95:
-	.long	SYM(_uhoh)		|  96:
-	.long	SYM(_uhoh)		|  97:
-	.long	SYM(_uhoh)		|  98:
-	.long	SYM(_uhoh)		|  99:
-	.long	SYM(_uhoh)		| 100:
-	.long	SYM(_uhoh)		| 101:
-	.long	SYM(_uhoh)		| 102:
-	.long	SYM(_uhoh)		| 103:
-	.long	SYM(_uhoh)		| 104:
-	.long	SYM(_uhoh)		| 105:
-	.long	SYM(_uhoh)		| 106:
-	.long	SYM(_uhoh)		| 107:
-	.long	SYM(_uhoh)		| 108:
-	.long	SYM(_uhoh)		| 109:
-	.long	SYM(_uhoh)		| 110:
-	.long	SYM(_uhoh)		| 111:
-	.long	SYM(_uhoh)		| 112:
-	.long	SYM(_uhoh)		| 113:
-	.long	SYM(_uhoh)		| 114:
-	.long	SYM(_uhoh)		| 115:
-	.long	SYM(_uhoh)		| 116:
-	.long	SYM(_uhoh)		| 117:
-	.long	SYM(_uhoh)		| 118:
-	.long	SYM(_uhoh)		| 119:
-	.long	SYM(_uhoh)		| 120:
-	.long	SYM(_uhoh)		| 121:
-	.long	SYM(_uhoh)		| 122:
-	.long	SYM(_uhoh)		| 123:
-	.long	SYM(_uhoh)		| 124:
-	.long	SYM(_uhoh)		| 125:
-	.long	SYM(_uhoh)		| 126:
-	.long	SYM(_uhoh)		| 127:
-	.long	SYM(_uhoh)		| 128:
-	.long	SYM(_uhoh)		| 129:
-	.long	SYM(_uhoh)		| 130:
-	.long	SYM(_uhoh)		| 131:
-	.long	SYM(_uhoh)		| 132:
-	.long	SYM(_uhoh)		| 133:
-	.long	SYM(_uhoh)		| 134:
-	.long	SYM(_uhoh)		| 135:
-	.long	SYM(_uhoh)		| 136:
-	.long	SYM(_uhoh)		| 137:
-	.long	SYM(_uhoh)		| 138:
-	.long	SYM(_uhoh)		| 139:
-	.long	SYM(_uhoh)		| 140:
-	.long	SYM(_uhoh)		| 141:
-	.long	SYM(_uhoh)		| 142:
-	.long	SYM(_uhoh)		| 143:
-	.long	SYM(_uhoh)		| 144:
-	.long	SYM(_uhoh)		| 145:
-	.long	SYM(_uhoh)		| 146:
-	.long	SYM(_uhoh)		| 147:
-	.long	SYM(_uhoh)		| 148:
-	.long	SYM(_uhoh)		| 149:
-	.long	SYM(_uhoh)		| 150:
-	.long	SYM(_uhoh)		| 151:
-	.long	SYM(_uhoh)		| 152:
-	.long	SYM(_uhoh)		| 153:
-	.long	SYM(_uhoh)		| 154:
-	.long	SYM(_uhoh)		| 155:
-	.long	SYM(_uhoh)		| 156:
-	.long	SYM(_uhoh)		| 157:
-	.long	SYM(_uhoh)		| 158:
-	.long	SYM(_uhoh)		| 159:
-	.long	SYM(_uhoh)		| 160:
-	.long	SYM(_uhoh)		| 161:
-	.long	SYM(_uhoh)		| 162:
-	.long	SYM(_uhoh)		| 163:
-	.long	SYM(_uhoh)		| 164:
-	.long	SYM(_uhoh)		| 165:
-	.long	SYM(_uhoh)		| 166:
-	.long	SYM(_uhoh)		| 167:
-	.long	SYM(_uhoh)		| 168:
-	.long	SYM(_uhoh)		| 169:
-	.long	SYM(_uhoh)		| 170:
-	.long	SYM(_uhoh)		| 171:
-	.long	SYM(_uhoh)		| 172:
-	.long	SYM(_uhoh)		| 173:
-	.long	SYM(_uhoh)		| 174:
-	.long	SYM(_uhoh)		| 175:
-	.long	SYM(_uhoh)		| 176:
-	.long	SYM(_uhoh)		| 177:
-	.long	SYM(_uhoh)		| 178:
-	.long	SYM(_uhoh)		| 179:
-	.long	SYM(_uhoh)		| 180:
-	.long	SYM(_uhoh)		| 181:
-	.long	SYM(_uhoh)		| 182:
-	.long	SYM(_uhoh)		| 183:
-	.long	SYM(_uhoh)		| 184:
-	.long	SYM(_uhoh)		| 185:
-	.long	SYM(_uhoh)		| 186:
-	.long	SYM(_uhoh)		| 187:
-	.long	SYM(_uhoh)		| 188:
-	.long	SYM(_uhoh)		| 189:
-	.long	SYM(_uhoh)		| 190:
-	.long	SYM(_uhoh)		| 191:
-	.long	SYM(_uhoh)		| 192:
-	.long	SYM(_uhoh)		| 193:
-	.long	SYM(_uhoh)		| 194:
-	.long	SYM(_uhoh)		| 195:
-	.long	SYM(_uhoh)		| 196:
-	.long	SYM(_uhoh)		| 197:
-	.long	SYM(_uhoh)		| 198:
-	.long	SYM(_uhoh)		| 199:
-	.long	SYM(_uhoh)		| 200:
-	.long	SYM(_uhoh)		| 201:
-	.long	SYM(_uhoh)		| 202:
-	.long	SYM(_uhoh)		| 203:
-	.long	SYM(_uhoh)		| 204:
-	.long	SYM(_uhoh)		| 205:
-	.long	SYM(_uhoh)		| 206:
-	.long	SYM(_uhoh)		| 207:
-	.long	SYM(_uhoh)		| 208:
-	.long	SYM(_uhoh)		| 209:
-	.long	SYM(_uhoh)		| 210:
-	.long	SYM(_uhoh)		| 211:
-	.long	SYM(_uhoh)		| 212:
-	.long	SYM(_uhoh)		| 213:
-	.long	SYM(_uhoh)		| 214:
-	.long	SYM(_uhoh)		| 215:
-	.long	SYM(_uhoh)		| 216:
-	.long	SYM(_uhoh)		| 217:
-	.long	SYM(_uhoh)		| 218:
-	.long	SYM(_uhoh)		| 219:
-	.long	SYM(_uhoh)		| 220:
-	.long	SYM(_uhoh)		| 221:
-	.long	SYM(_uhoh)		| 222:
-	.long	SYM(_uhoh)		| 223:
-	.long	SYM(_uhoh)		| 224:
-	.long	SYM(_uhoh)		| 225:
-	.long	SYM(_uhoh)		| 226:
-	.long	SYM(_uhoh)		| 227:
-	.long	SYM(_uhoh)		| 228:
-	.long	SYM(_uhoh)		| 229:
-	.long	SYM(_uhoh)		| 230:
-	.long	SYM(_uhoh)		| 231:
-	.long	SYM(_uhoh)		| 232:
-	.long	SYM(_uhoh)		| 233:
-	.long	SYM(_uhoh)		| 234:
-	.long	SYM(_uhoh)		| 235:
-	.long	SYM(_uhoh)		| 236:
-	.long	SYM(_uhoh)		| 237:
-	.long	SYM(_uhoh)		| 238:
-	.long	SYM(_uhoh)		| 239:
-	.long	SYM(_uhoh)		| 240:
-	.long	SYM(_uhoh)		| 241:
-	.long	SYM(_uhoh)		| 242:
-	.long	SYM(_uhoh)		| 243:
-	.long	SYM(_uhoh)		| 244:
-	.long	SYM(_uhoh)		| 245:
-	.long	SYM(_uhoh)		| 246:
-	.long	SYM(_uhoh)		| 247:
-	.long	SYM(_uhoh)		| 248:
-	.long	SYM(_uhoh)		| 249:
-	.long	SYM(_uhoh)		| 250:
-	.long	SYM(_uhoh)		| 251:
-	.long	SYM(_uhoh)		| 252:
-	.long	SYM(_uhoh)		| 253:
-	.long	SYM(_uhoh)		| 254:
-	.long	SYM(_uhoh)		| 255:
-
-/*
- * Default trap handler
- * With an oscilloscope you can see AS* stop
- */
-	PUBLIC (_uhoh)
-SYM(_uhoh):	nop				| Leave spot for breakpoint
-/*	stop	#0x2700				| Stop with interrupts disabled */
-	move.w	#0x2700,sr
-	move.w  (a7),_boot_panic_registers+4	| SR
-	move.l  2(a7),_boot_panic_registers	| PC
-	move.w  6(a7),_boot_panic_registers+6	| format & vector
-	movem.l d0-d7/a0-a7, _boot_panic_registers+8
-	movec	sfc, d0
-	movem.l	d0, _boot_panic_registers+72
-	movec	dfc, d0
-	movem.l	d0, _boot_panic_registers+76
-	movec	vbr, d0
-	movem.l	d0, _boot_panic_registers+80
-	jmp	SYM(_dbug_dumpanic)
-	bra.s	_crt0_cold_start
-
-/*
- * Log, but otherwise ignore, spurious interrupts
- */
-	PUBLIC (_spuriousInterrupt)
-SYM(_spuriousInterrupt):
-	addql	#1,SYM(_M68kSpuriousInterruptCount)
-	rte
-
-/*
- * Place the low-order 3 octets of the board's ethernet address at
- * a `well-known' fixed location relative to the startup location.
- */
-	.align 2
-	.word	0			| Padding
-ethernet_address_buffer:
-	.word	0x08F3			| Default address
-	.word	0xDEAD
-	.word	0xCAFE
-
-BEGIN_DATA
-
-/* equates */
-
-.equ	_CPU340, 0x0
-.equ	_CPU349, 0x31
-
-#ifdef _OLD_ASTECC				/* old addresses for AST68340 only */
-.equ	_EPLD_CS_BASE, 0x1
-.equ	_PROM_Start, 0x01000000    		/* CS0 */
-.equ	_FLEX_Start, 0x08000000			/* CS2 */
-.equ	_I2C_Start, 0x0c000000    		/* CS3 */
-
-.equ	_BCCram_Start, 0x00000000    		/* CS1	64 Kbytes */
-.equ	_BCCram_Size, 0x00010000    		/* CS1	64 Kbytes */
-
-.equ	_ExtRam_Start, 0x10000000  		/* SRAM */
-.equ 	_ExtRam_Size, 0x00400000		/* 4 Mbytes */
-
-.equ 	_FastRam_Start, 0x00000000		/* overlap /CS1 for the first 4 Kbytes */
-.equ	_FastRam_Size, 0x00001000		/* 4 Kbytes */
-
-#else 	/* new addresses for AST68349 and 68340 */
-
-.equ	_EPLD_CS_BASE, 0x5
-.equ	_PROM_Start, 0x50000000    		/* CS0 */
-.equ	_FLEX_Start, 0x08000000    		/* CS2 */
-.equ	_I2C_Start, 0x0c000000    		/* CS3 */
-
-.equ	_BCCram_Start, 0x00000000    		/* CS1	64 Kbytes */
-.equ	_BCCram_Size, 0x00010000    		/* CS1	64 Kbytes */
-
-.equ	_ExtRam_Start, 0x80000000  		/* DRAM */
-.equ	_ExtRam_Size, 0x00400000		/* 4 Mbytes */
-
-.equ	_FastRam_Start, 0x00000000		/* overlap /CS1 for the first 4 Kbytes */
-.equ	_FastRam_Size, 0x00001000		/* 4 Kbytes */
-#endif
-
-.equ	_SPEED349, 0xD680			/* 24 Mhz */
-.equ	_SPEED340, 0xD700			/* 25 Mhz */
-/* .equ	_SPEED340, 0xCE00			 16 Mhz */
-
-#define	crt0_boot_type	d0			/* cold/warm start (must be D0) */
-#define	crt0_temp	d1
-#define	crt0_cpu_type	d2
-#define	crt0_csswitch	d3
-#define	crt0_buswidth	d4
-#define	crt0_pdcs	d5
-#define	crt0_spare6	d6
-#define	crt0_spare7	d7
-#define	crt0_sim_base	a0
-#define	crt0_glue	a1
-#define	crt0_dram	a2
-#define	crt0_ptr3	a3
-#define	crt0_ptr4	a4
-#define	crt0_ptr5	a5
-#define	crt0_ptr6	a6
-
-/* -- PDCS buffer equates -- */
-.equ	pdcs_mask, 0x1F				/* DRAM configuration */
-.equ	pdcs_sw12, 7				/* switch 12 */
-.equ	pdcs_sw11, 6				/* switch 11 */
-.equ	pdcs_sw14, 5				/* switch 14 */
-
-.equ	bit_cache, pdcs_sw12			/* enable cache if on */
-.equ	bit_meminit, pdcs_sw11			/* init memory if on */
-
-/* -- Initialization stack and vars -- */
-
-_AsteccBusWidth:	ds.b 1
-_AsteccCsSwitch:	ds.b 1
-_AsteccCpuName:		ds.l 1
-
-.align 4
-
-_crt0_init_stack:
-		ds.l	500
-_crt0_init_stktop:
-
-/* -- Initialization code -- */
-BEGIN_CODE
-
-.align 4
-		dc.l    _crt0_init_stktop        /* reset SP */
-		dc.l    _crt0_cold_start         /* reset PC */
-		dc.l    _crt0_warm_start
-
-		.ascii	"BOOT XHM68K/Spectra for ASTECC 68349 and 68340 boards"
-		dc.w	0
-.align 4
-
-.globl start
-start:
-
-_crt0_cold_start:
-	moveq.l #0,crt0_boot_type			| signal cold reset
-	bra.s   _crt0_common_start
-
-_crt0_warm_start:
-	moveq.l #1,crt0_boot_type		 	| signal warm reset
-
-_crt0_common_start:
-	move.w	#0x2700,sr               		| disable interrupts and switch to interrupt mode
-	movea.l	#_crt0_init_stktop,sp			| set up initialization stack
-
-	move.l	#Entry,crt0_temp			| VBR initialization
-	movec.l crt0_temp,vbr				|
-	moveq.l #0x07,crt0_temp
-	movec.l crt0_temp,dfc				| prepare access in CPU space
-	move.l  #(BASE_SIM+0x111),crt0_temp 		| mask CPU, RESERVED USER SPACES
-	moves.l crt0_temp,BASE_REG			| base initialization (must be MOVES, PCC-130795)
-
-	movea.l #BASE_SIM,crt0_sim_base
-
-	/* -- disable Bus Monitor -- */
-	move.b  #0,SIM_SYPCR(crt0_sim_base)   		| system protection control register
-
-	/* -- enable A31-A24 -- */
-	clr.b   SIM_PPRA1(crt0_sim_base)
-
-	/* -- show cycles, user acces to SIM, 4 /CS & 4 /IT -- */
-	move.w  #0x427F,SIM_MCR(crt0_sim_base)
-
-	/* -- enable /IRQ3, 5, 6, 7 -- */
-	move.b   #0xE8,SIM_PPRB(crt0_sim_base)
-
-	/* -- enable autovector on /IRQ7 -- */
-	move.b   #0x80,SIM_AVR(crt0_sim_base)
-
-	/* -- test CPU type -- */
-	cmp.b	  #_CPU349,SIM_IDR(crt0_sim_base)
-	bne	  cpu_is_68340
-
-/*-------------------------------------------------------------------------------------------*/
-cpu_is_68349:
-
- 	/* -- set cpu clock -- */
-	move.w  #_SPEED349,SIM_SYNCR(crt0_sim_base)    		| clock
-
-sync_wait349:
-	btst.b	#3,(SIM_SYNCR+1)(crt0_sim_base)
-	beq	sync_wait349
-
-	/* to allow access to the EPLD internal registers, it is necessary
-	to disable the global chip-select /CS0 (which decodes every external
-	cycles). To do that, we initialize the 68349 internal RAM,
-	copy a part of the initialization code in it, and jump there.
-	from that moment, /CS0 is not used, therefore it can be initialized
-	with its default value. Its width may be incorrect, but it will be
-	adjusted later. The goal is to avoid any conflict with
-	the accesses to the EPLD registers.
-	When this is done, we read the RESET parameters (boot prom width
-	and chip-select switch) and proceed with the initialization
-	when all is done, we jump back to the boot prom now
-	decoded with a properly configured /CS0 */
-
-	/*-------------------------------------*/
-	/* -- configure internal SRAM banks -- */
-
-	move.l	#0x00000000,QDMM_MCR(crt0_sim_base)
-	move.l	#_FastRam_Start+0x0005,QDMM_QBAR0(crt0_sim_base)
-	move.l	#_FastRam_Start+0x0405,QDMM_QBAR1(crt0_sim_base)
-	move.l	#_FastRam_Start+0x0805,QDMM_QBAR2(crt0_sim_base)
-	move.l	#_FastRam_Start+0x0c05,QDMM_QBAR3(crt0_sim_base)
-
-	/*--------------------------------------------------------*/
-	/* -- copy to address of the 68349 initialization code -- */
-
-	lea.l		_copy_start(%pc),crt0_ptr3
-	lea.l		_copy_end(%pc),crt0_ptr4
-	move.l		crt0_ptr4,crt0_temp
-	sub.l		crt0_ptr3,crt0_temp
-	add.l		#3,crt0_temp				| adjust to next long word
-	lsr.l		#2,crt0_temp
-
-	move.l		#_FastRam_Start,crt0_ptr4
-_copy_loop:
-	move.l		(crt0_ptr3)+,(crt0_ptr4)+
-	subq.l		#1,crt0_temp
-	bne.s		_copy_loop
-	bra.l		_FastRam_Start				| jump to code in internal RAM
-
-	/*------------------------------------*/
-	/* -- start of initialization code -- */
-
-_copy_start:
-	bra.l		_begin_68349_init
-
-	/*----------------------------------------------------------*/
-	/*  Astecc  68349 board : chip-select initialization values */
-
-_table_csepld:
-	dc.b	(_EPLD_CS_BASE&0x0F)+0x80			| 16 bits, 0ws
-	dc.b	0x80						| 16 bits, 0 ws
-	dc.b	0x90						| 16 bits, ext /dsack
-	dc.b	0x90						| 16 bits, ext /dsack
-
-_table_cs349:
-	dc.l	0x003FFFF4               			| Mask CS0 (4Mbytes PROM, 32bits, 1WS)
-	dc.l	(_PROM_Start&0xFFFFFF00)+0x00000003  		| Base CS0
-	dc.l    0x003FFFF1               			| MASK CS1 (4Mbytes RAM, 16bits, 0WS)
-	dc.l	(_BCCram_Start&0xFFFFFF00)+0x00000003  		| Base CS1
-	dc.l    0x000000FF               			| MASK CS2 (FLEX, ext DTACK, 256 bytes)
-	dc.l	(_FLEX_Start&0xFFFFFF00)+0x00000003  		| Base CS2
-	dc.l	0x000000FF               			| Mask CS3 (I2C, ext DTACK, 256 bytes)
-	dc.l	(_I2C_Start&0xFFFFFF00)+0x00000003  		| Base CS3
-
-	/*-------------------------------------------------*/
-_begin_68349_init:
-
-	/*-------------------------------------------------*/
-	/* 68349 chip select initialization
-	
-	at this stage, the width of /CS0 may be incorrect
-	it will be corrected later
-	*/
-
-_cs68349_init:
-	lea.l   	SIM_MASKH0(crt0_sim_base),crt0_ptr4
-	lea.l   	_table_cs349(%pc),crt0_ptr3
-
-	moveq.l 	#0x07,crt0_temp
-_cs349_init2:
-	move.l  	(crt0_ptr3)+,(crt0_ptr4)+
-	dbra    	crt0_temp,_cs349_init2
-
-	/*-----------------------------------------------*/
-	/* -- prepare access to the internal registers --*/
-	moveq.l 	#EPLD_SPACE,crt0_temp
-	movec.l 	crt0_temp,dfc
-	movec.l 	crt0_temp,sfc
-	move.l 		#GLUE_EPLD,crt0_glue
-	move.l 		#DRAM_EPLD,crt0_dram
-
-	/*-------------------------------------------*/
-	/* EPLD generated /CS[3..0] must be disabled */
-
-_csepld_clear:
-	move.l		crt0_glue,crt0_ptr4
-	move.w		#3,crt0_spare6
-	clr.b		crt0_temp
-
-_csepld_clear1:
-	moves.b		crt0_temp,(crt0_ptr4)+
-	dbra    	crt0_spare6,_csepld_clear1
-
-	/*---------------------------------------------------------*/
-	/* -- get width of boot PROM, and active chip-select set --*/
-	moves.b  	REG_BUSWIDTH(crt0_dram),crt0_csswitch
-	move.b		crt0_csswitch,crt0_buswidth
-
-	/* state of CS_SWITCH  : sel == 0 => CPU chip_selects  (/CS[3..0])
-	                       : sel == 1 => EPLD chip_selects (/CS[3..0]) */
-	and.b		#1,crt0_csswitch
-
-	/* bus width of /CS0 during reset		bw[1..0]  : 0   1   2       3
-	                                   		bus width : 32  16  8   ext./dsackx */
-	rol.b		#2,crt0_buswidth
-	and.b		#3,crt0_buswidth
-
-	/*----------------------------------------------------*/
-	/* -- configure chip select 0 with boot prom width -- */
-	lea.l   	SIM_MASKH0(crt0_sim_base),crt0_ptr4
-	lea.l   	_table_cs349(%pc),crt0_ptr3
-	move.l  	(crt0_ptr3)+,crt0_temp
-	and.b		#0xFC,crt0_temp				| clear PS0 & PS1
-	or.b		crt0_buswidth,crt0_temp			| set boot PROM bus width
-	move.l		crt0_temp,(crt0_ptr4)+
-
-	/*------------------------*/
-	/* -- read PDCS buffer -- */
-	moves.b		REG_PDCS(crt0_glue),crt0_pdcs
-/*	move.b		#0x3F,crt0_pdcs 					pour test */
-
-
-	/*---------------------------------------*/
-	/* -- EPLD chip-select initialization -- */
-	/*---------------------------------------*/
-	btst.b		#0,crt0_csswitch
-	beq		_cs_init_end
-
-	/*--------------------------------------------*/
-	/* 68349 generated /CS[3..0] must be disabled */
-	lea.l   	SIM_MASKH0(crt0_sim_base),crt0_ptr4
-	lea.l   	_table_cs349(%pc),crt0_ptr3
-	moveq.l 	#0x03,crt0_temp
-_cs349_clear:
-	move.l  	(crt0_ptr3)+,(crt0_ptr4)+
-	move.l  	(crt0_ptr3)+,crt0_spare6
-	and.b		#0xFE,crt0_spare6			| disable chip-select
-	move.l		crt0_spare6,(crt0_ptr4)+
-	dbra    	crt0_temp,_cs349_clear
-
-	/*---------------------------------------------*/
-	/* EPLD generated /CS[3..0] must be configured */
-_csepld_init:
-	move.l		crt0_glue,crt0_ptr4
-	lea.l   	_table_csepld(%pc),crt0_ptr3
-
-	move.b  	(crt0_ptr3)+,crt0_temp
-	or.b		#0x20,crt0_temp				| default width is 32 bits
-	tst.b		crt0_buswidth				| is boot PROM bus width 32 bits ?
-	beq		_csepld1				| if not
-	and.b		#0xDF,crt0_temp				| set width to 16 bits
-_csepld1:
-	moves.b		crt0_temp,(crt0_ptr4)+
-
-	moveq.l 	#0x02,crt0_spare6
-_csepld2:
-	move.b  	(crt0_ptr3)+,crt0_temp
-	moves.b		crt0_temp,(crt0_ptr4)+
-	dbra    	crt0_spare6,_csepld2
-
-_cs_init_end:
-
-	/*--------------------------------------*/
-	/* -- DRAM controller initialization -- */
-_dram_init:
-	move.w 		#15,crt0_temp
-	move.l		#_ExtRam_Start,crt0_ptr3
-
-_dram_init1:
-	clr.l		(crt0_ptr3)+				| must access DRAM
-	dbra		crt0_temp,_dram_init1			| prior to init refresh
-
-_dram_init2:
-	move.b 		#3,crt0_temp
-	moves.b		crt0_temp,REG_WS(crt0_dram) 		| set 3 wait-states
-
-	move.b 		#0x81,crt0_temp
-	moves.b		crt0_temp,REG_REFRESH(crt0_dram) 	| refresh every 10µs
-
-	move.b 		#0,crt0_temp
-	moves.b		crt0_temp,REG_CONFIG(crt0_dram)		| default size = 4Mbytes
-
-	/*-----------------------*/
-	/* -- configure cache -- */
-_init_cache:
-	move.l		#0x000001E0,CACHE_MCR(crt0_sim_base)
-	btst.b		#bit_cache,crt0_pdcs
-	bne		_init_cache_end
-	or.l		#0x00000001,CACHE_MCR(crt0_sim_base)
-
-_init_cache_end:
-
-	/*-----------------------------*/
-	/* -- timers initialization -- */
-
-	clr.b 		crt0_temp
-	moves.b		crt0_temp,REG_TIMER1(crt0_glue)		| disable timer 1
-	moves.b		crt0_temp,REG_TIMER2(crt0_glue)		| disable timer 2
-
-	/*--------------------------*/
-	/* -- I2C initialization -- */
-	move.b 		#3,crt0_temp
-	moves.b		crt0_temp,REG_I2C(crt0_glue)		| tri-states I2C ports
-
-	/*-----------------------------------------*/
-	/* -- baudrate generator initialization -- */
-	move.b 		#2,crt0_temp
-	moves.b		crt0_temp,REG_BAUDRATE(crt0_glue) 	| baudrate = 38400
-
-	/*-------------------------------*/
-	/* --  IO port initialization -- */
-	clr.b 		crt0_temp
-	moves.b		crt0_temp,REG_IO(crt0_glue)		| set port as input
-
-	/* -- */
-
-	move.l 		#68349,crt0_cpu_type
-
-
-	/* -- jump back to PROM -- */
-
-	jmp.l		(_fill_test)				| must be absolute long
-
-_copy_end:
-
-/*-------------------------------------------------
-  initialization code for the 68340 board
-  -------------------------------------------------*/
-
-	/* Astecc  68340 board : chip-select initialization values */
-_table_cs340:
-	dc.l	0x003FFFF0               		/* Mask CS0 (4Mbytes PROM, 32bits, 0WS)	*/
-	dc.l	((_PROM_Start&0xFFFFFF00)+0x00000003)  	/* Base CS0 */
-	dc.l    0x0000FFFD               		/* MASK CS1 (RAMBCC340, 0WS, FTE) */
-	dc.l	((_BCCram_Start&0xFFFFFF00)+0x00000003)	/* Base CS1 */
-	dc.l    0x000000FF               		/* MASK CS2 (FLEX, ext DTACK, 256 bytes) */
-	dc.l	((_FLEX_Start&0xFFFFFF00)+0x00000003)  	/* Base CS2 */
-	dc.l	0x000000FF               		/* Mask CS3 (I2C, ext DTACK, 256 bytes)	*/
-	dc.l	((_I2C_Start&0xFFFFFF00)+0x00000003)  	/* Base CS3 */
-
-cpu_is_68340:
-
-	/* -- set cpu clock -- */
-	move.w  #_SPEED340,SIM_SYNCR(crt0_sim_base) 		| clock
-sync_wait340:
-	btst.b	#3,(SIM_SYNCR+1)(crt0_sim_base)
-	beq	sync_wait340
-
-	/* -- chip select initialization -- */
-	lea.l   SIM_MASKH0(crt0_sim_base),crt0_ptr4
-	lea.l   _table_cs340(%pc),crt0_ptr3
-	moveq.l #0x07,crt0_temp
-_b_cs340:
-	move.l  (crt0_ptr3)+,crt0_ptr5
-	move.l 	crt0_ptr5,(crt0_ptr4)+				| pour test
-	dbra    crt0_temp,_b_cs340
-
-	move.l	#68340,crt0_cpu_type
-	move.b	#0,crt0_csswitch				| CPU
-	move.b	#1,crt0_buswidth				| 16 bits
-
-
-	/*-------------------------------------------------
-	  fill RAM if COLDSTART
-	  -------------------------------------------------*/
-_fill_test:
-
-  	tst.l 	crt0_boot_type
-  	bne 	_dont_fill
-
-	cmp.b	#_CPU349,SIM_IDR(crt0_sim_base)
-	bne	_fill
-	btst.b	#bit_meminit,crt0_pdcs
-	bne	_dont_fill
-
-	/* fill main memory */
-_fill:
-	move.l  #_crt0_init_stack,crt0_ptr3			| skip Astecc vars
-  	move.l	#_ExtRam_Start,crt0_temp
-	sub.l  	#_crt0_init_stack,crt0_temp
-	add.l   #_ExtRam_Size,crt0_temp 			| get size
-	lsr.l   #2,crt0_temp            			| ajust for long word
-_fill_loop:
-	clr.l 	(crt0_ptr3)+
-	subq.l 	#1,crt0_temp
-	bne 	_fill_loop
-
-	cmp.b	#_CPU349,SIM_IDR(crt0_sim_base)
-	bne	_fill_bccram
-
-	/* fill QDMM memory */
-	movea.l #_FastRam_Start,crt0_ptr3			| get start
-	move.l  #_FastRam_Size,crt0_temp 			| get size
-	lsr.l   #2,crt0_temp            			| ajust for long word
-
-_QDMMfill_loop:
-	clr.l 	(crt0_ptr3)+
-	subq.l	#1,crt0_temp
-	bne	_QDMMfill_loop
-	bra	_dont_fill
-
-	/* fill BCC memory */
-_fill_bccram:
-	movea.l #_BCCram_Start,crt0_ptr3			| get start
-	move.l  #_BCCram_Size,crt0_temp 			| get size
-	lsr.l   #2,crt0_temp            			| ajust for long word
-_BCCfill_loop:
-	clr.l 	(crt0_ptr3)+
-	subq.l 	#1,crt0_temp
-	bne 	_BCCfill_loop
-
-	*-------------------------------------------------*/
-_dont_fill:
-	move.b	crt0_csswitch,_AsteccCsSwitch
-	move.b	crt0_buswidth,_AsteccBusWidth
-	move.l	crt0_cpu_type,_AsteccCpuName
-
-	jmp	SYM(_Init68340)					| Start C code (which never returns)
-
-/*
- * Copy DATA segment, clear BSS segment, set up real stack,
- * initialize heap, start C program.
- * Assume that DATA and BSS sizes are multiples of 4.
- */
-	PUBLIC (_CopyDataClearBSSAndStart)
-SYM(_CopyDataClearBSSAndStart):
-	lea	copy_start,a0					| Get start of DATA in RAM
-	lea	SYM(etext),a2					| Get start of DATA in ROM
-	cmpl	a0,a2						| Are they the same?
-	beq.s	NOCOPY						| Yes, no copy necessary
-	lea	copy_end,a1					| Get end of DATA in RAM
-	bra.s	COPYLOOPTEST					| Branch into copy loop
-COPYLOOP:
-	movel	a2@+,a0@+					| Copy word from ROM to RAM
-COPYLOOPTEST:
-	cmpl	a1,a0						| Done?
-	bcs.s	COPYLOOP					| No, skip
-NOCOPY:
-
-	lea	clear_start,a0					| Get start of BSS
-	lea	clear_end,a1					| Get end of BSS
-	clrl	d0						| Value to set
-	bra.s	ZEROLOOPTEST					| Branch into clear loop
-ZEROLOOP:
-	movel	d0,a0@+						| Clear a word
-ZEROLOOPTEST:
-	cmpl	a1,a0						| Done?
-	bcs.s	ZEROLOOP					| No, skip
-
-	movel	#stack_init,a7					| set master stack pointer
-	movel	d0,a7@-						| environp
-	movel	d0,a7@-						| argv
-	movel	d0,a7@-						| argc
-	jsr	SYM(boot_card)					| Call C main
-
-	PUBLIC (_mainDone)
-SYM(_mainDone):
-	nop							| Leave spot for breakpoint
-	movew	#1,a7						| Force a double bus error
-	movel	d0,a7@-						| This should cause a RESET
-/*	stop	#0x2700						| Stop with interrupts disabled */
-	move.w	#0x2700,sr
-	bra.s	SYM(_mainDone)					| Stuck forever
-
-        .align 2
-	PUBLIC (_HeapSize)
-SYM (_HeapSize):
-        .long  HeapSize
-	PUBLIC (_StackSize)
-SYM (_StackSize):
-        .long  StackSize
-END_CODE
-
-BEGIN_DATA_DCL
-        .align 2
-	PUBLIC (environ)
-SYM (environ):
-	.long	0
-	PUBLIC (_M68kSpuriousInterruptCount)
-SYM (_M68kSpuriousInterruptCount):
-	.long	0
-END_DATA_DCL
-
-END
-
diff --git a/c/src/lib/libbsp/m68k/gen68340/start/startfor340only.s b/c/src/lib/libbsp/m68k/gen68340/start/startfor340only.s
deleted file mode 100644
index 930694f02e..0000000000
--- a/c/src/lib/libbsp/m68k/gen68340/start/startfor340only.s
+++ /dev/null
@@ -1,499 +0,0 @@
-/*
- *  This file contains the entry point for the application.
- *  The name of this entry point is compiler dependent.
- *  It jumps to the BSP which is responsible for performing
- *  all initialization.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- * Based on the `gen68360' board support package, and covered by the
- * original distribution terms.
- *
- * Geoffroy Montel
- * France Telecom - CNET/DSM/TAM/CAT
- * 4, rue du Clos Courtel
- * 35512 CESSON-SEVIGNE
- * FRANCE
- * 
- * e-mail: g_montel@yahoo.com
- *
- *  $Id$
- */
-
-#include "asm.h"
-#include <m68340.inc>
-
-BEGIN_CODE
-	/*
-	 * Step 1: Decide on Reset Stack Pointer and Initial Program Counter
-	 */
-Entry:
-	.long	SYM(m340)+1024		|   0: Initial SSP
-	.long	start			|   1: Initial PC
-	.long	SYM(_uhoh)		|   2: Bus error
-	.long	SYM(_uhoh)		|   3: Address error
-	.long	SYM(_uhoh)		|   4: Illegal instruction
-	.long	SYM(_uhoh)		|   5: Zero division
-	.long	SYM(_uhoh)		|   6: CHK, CHK2 instruction
-	.long	SYM(_uhoh)		|   7: TRAPcc, TRAPV instructions
-	.long	SYM(_uhoh)		|   8: Privilege violation
-	.long	SYM(_uhoh)		|   9: Trace
-	.long	SYM(_uhoh)		|  10: Line 1010 emulator
-	.long	SYM(_uhoh)		|  11: Line 1111 emulator
-	.long	SYM(_uhoh)		|  12: Hardware breakpoint
-	.long	SYM(_uhoh)		|  13: Reserved for coprocessor violation
-	.long	SYM(_uhoh)		|  14: Format error
-	.long	SYM(_uhoh)		|  15: Uninitialized interrupt
-	.long	SYM(_uhoh)		|  16: Unassigned, reserved
-	.long	SYM(_uhoh)		|  17:
-	.long	SYM(_uhoh)		|  18:
-	.long	SYM(_uhoh)		|  19:
-	.long	SYM(_uhoh)		|  20:
-	.long	SYM(_uhoh)		|  21:
-	.long	SYM(_uhoh)		|  22:
-	.long	SYM(_uhoh)		|  23:
-	.long	SYM(_spuriousInterrupt)	|  24: Spurious interrupt
-	.long	SYM(_uhoh)		|  25: Level 1 interrupt autovector
-	.long	SYM(_uhoh)		|  26: Level 2 interrupt autovector
-	.long	SYM(_uhoh)		|  27: Level 3 interrupt autovector
-	.long	SYM(_uhoh)		|  28: Level 4 interrupt autovector
-	.long	SYM(_uhoh)		|  29: Level 5 interrupt autovector
-	.long	SYM(_uhoh)		|  30: Level 6 interrupt autovector
-	.long	SYM(_uhoh)		|  31: Level 7 interrupt autovector
-	.long	SYM(_uhoh)		|  32: Trap instruction (0-15)
-	.long	SYM(_uhoh)		|  33:
-	.long	SYM(_uhoh)		|  34:
-	.long	SYM(_uhoh)		|  35:
-	.long	SYM(_uhoh)		|  36:
-	.long	SYM(_uhoh)		|  37:
-	.long	SYM(_uhoh)		|  38:
-	.long	SYM(_uhoh)		|  39:
-	.long	SYM(_uhoh)		|  40:
-	.long	SYM(_uhoh)		|  41:
-	.long	SYM(_uhoh)		|  42:
-	.long	SYM(_uhoh)		|  43:
-	.long	SYM(_uhoh)		|  44:
-	.long	SYM(_uhoh)		|  45:
-	.long	SYM(_uhoh)		|  46:
-	.long	SYM(_uhoh)		|  47:
-	.long	SYM(_uhoh)		|  48: Reserved for coprocessor
-	.long	SYM(_uhoh)		|  49:
-	.long	SYM(_uhoh)		|  50:
-	.long	SYM(_uhoh)		|  51:
-	.long	SYM(_uhoh)		|  52:
-	.long	SYM(_uhoh)		|  53:
-	.long	SYM(_uhoh)		|  54:
-	.long	SYM(_uhoh)		|  55:
-	.long	SYM(_uhoh)		|  56:
-	.long	SYM(_uhoh)		|  57:
-	.long	SYM(_uhoh)		|  58:
-	.long	SYM(_uhoh)		|  59: Unassigned, reserved
-	.long	SYM(_uhoh)		|  60:
-	.long	SYM(_uhoh)		|  61:
-	.long	SYM(_uhoh)		|  62:
-	.long	SYM(_uhoh)		|  63:
-	.long	SYM(_uhoh)		|  64: User defined vectors (192)
-	.long	SYM(_uhoh)		|  65:
-	.long	SYM(_uhoh)		|  66:
-	.long	SYM(_uhoh)		|  67:
-	.long	SYM(_uhoh)		|  68:
-	.long	SYM(_uhoh)		|  69:
-	.long	SYM(_uhoh)		|  70:
-	.long	SYM(_uhoh)		|  71:
-	.long	SYM(_uhoh)		|  72:
-	.long	SYM(_uhoh)		|  73:
-	.long	SYM(_uhoh)		|  74:
-	.long	SYM(_uhoh)		|  75:
-	.long	SYM(_uhoh)		|  76:
-	.long	SYM(_uhoh)		|  77:
-	.long	SYM(_uhoh)		|  78:
-	.long	SYM(_uhoh)		|  79:
-	.long	SYM(_uhoh)		|  80:
-	.long	SYM(_uhoh)		|  81:
-	.long	SYM(_uhoh)		|  82:
-	.long	SYM(_uhoh)		|  83:
-	.long	SYM(_uhoh)		|  84:
-	.long	SYM(_uhoh)		|  85:
-	.long	SYM(_uhoh)		|  86:
-	.long	SYM(_uhoh)		|  87:
-	.long	SYM(_uhoh)		|  88:
-	.long	SYM(_uhoh)		|  89:
-	.long	SYM(_uhoh)		|  90:
-	.long	SYM(_uhoh)		|  91:
-	.long	SYM(_uhoh)		|  92:
-	.long	SYM(_uhoh)		|  93:
-	.long	SYM(_uhoh)		|  94:
-	.long	SYM(_uhoh)		|  95:
-	.long	SYM(_uhoh)		|  96:
-	.long	SYM(_uhoh)		|  97:
-	.long	SYM(_uhoh)		|  98:
-	.long	SYM(_uhoh)		|  99:
-	.long	SYM(_uhoh)		| 100:
-	.long	SYM(_uhoh)		| 101:
-	.long	SYM(_uhoh)		| 102:
-	.long	SYM(_uhoh)		| 103:
-	.long	SYM(_uhoh)		| 104:
-	.long	SYM(_uhoh)		| 105:
-	.long	SYM(_uhoh)		| 106:
-	.long	SYM(_uhoh)		| 107:
-	.long	SYM(_uhoh)		| 108:
-	.long	SYM(_uhoh)		| 109:
-	.long	SYM(_uhoh)		| 110:
-	.long	SYM(_uhoh)		| 111:
-	.long	SYM(_uhoh)		| 112:
-	.long	SYM(_uhoh)		| 113:
-	.long	SYM(_uhoh)		| 114:
-	.long	SYM(_uhoh)		| 115:
-	.long	SYM(_uhoh)		| 116:
-	.long	SYM(_uhoh)		| 117:
-	.long	SYM(_uhoh)		| 118:
-	.long	SYM(_uhoh)		| 119:
-	.long	SYM(_uhoh)		| 120:
-	.long	SYM(_uhoh)		| 121:
-	.long	SYM(_uhoh)		| 122:
-	.long	SYM(_uhoh)		| 123:
-	.long	SYM(_uhoh)		| 124:
-	.long	SYM(_uhoh)		| 125:
-	.long	SYM(_uhoh)		| 126:
-	.long	SYM(_uhoh)		| 127:
-	.long	SYM(_uhoh)		| 128:
-	.long	SYM(_uhoh)		| 129:
-	.long	SYM(_uhoh)		| 130:
-	.long	SYM(_uhoh)		| 131:
-	.long	SYM(_uhoh)		| 132:
-	.long	SYM(_uhoh)		| 133:
-	.long	SYM(_uhoh)		| 134:
-	.long	SYM(_uhoh)		| 135:
-	.long	SYM(_uhoh)		| 136:
-	.long	SYM(_uhoh)		| 137:
-	.long	SYM(_uhoh)		| 138:
-	.long	SYM(_uhoh)		| 139:
-	.long	SYM(_uhoh)		| 140:
-	.long	SYM(_uhoh)		| 141:
-	.long	SYM(_uhoh)		| 142:
-	.long	SYM(_uhoh)		| 143:
-	.long	SYM(_uhoh)		| 144:
-	.long	SYM(_uhoh)		| 145:
-	.long	SYM(_uhoh)		| 146:
-	.long	SYM(_uhoh)		| 147:
-	.long	SYM(_uhoh)		| 148:
-	.long	SYM(_uhoh)		| 149:
-	.long	SYM(_uhoh)		| 150:
-	.long	SYM(_uhoh)		| 151:
-	.long	SYM(_uhoh)		| 152:
-	.long	SYM(_uhoh)		| 153:
-	.long	SYM(_uhoh)		| 154:
-	.long	SYM(_uhoh)		| 155:
-	.long	SYM(_uhoh)		| 156:
-	.long	SYM(_uhoh)		| 157:
-	.long	SYM(_uhoh)		| 158:
-	.long	SYM(_uhoh)		| 159:
-	.long	SYM(_uhoh)		| 160:
-	.long	SYM(_uhoh)		| 161:
-	.long	SYM(_uhoh)		| 162:
-	.long	SYM(_uhoh)		| 163:
-	.long	SYM(_uhoh)		| 164:
-	.long	SYM(_uhoh)		| 165:
-	.long	SYM(_uhoh)		| 166:
-	.long	SYM(_uhoh)		| 167:
-	.long	SYM(_uhoh)		| 168:
-	.long	SYM(_uhoh)		| 169:
-	.long	SYM(_uhoh)		| 170:
-	.long	SYM(_uhoh)		| 171:
-	.long	SYM(_uhoh)		| 172:
-	.long	SYM(_uhoh)		| 173:
-	.long	SYM(_uhoh)		| 174:
-	.long	SYM(_uhoh)		| 175:
-	.long	SYM(_uhoh)		| 176:
-	.long	SYM(_uhoh)		| 177:
-	.long	SYM(_uhoh)		| 178:
-	.long	SYM(_uhoh)		| 179:
-	.long	SYM(_uhoh)		| 180:
-	.long	SYM(_uhoh)		| 181:
-	.long	SYM(_uhoh)		| 182:
-	.long	SYM(_uhoh)		| 183:
-	.long	SYM(_uhoh)		| 184:
-	.long	SYM(_uhoh)		| 185:
-	.long	SYM(_uhoh)		| 186:
-	.long	SYM(_uhoh)		| 187:
-	.long	SYM(_uhoh)		| 188:
-	.long	SYM(_uhoh)		| 189:
-	.long	SYM(_uhoh)		| 190:
-	.long	SYM(_uhoh)		| 191:
-	.long	SYM(_uhoh)		| 192:
-	.long	SYM(_uhoh)		| 193:
-	.long	SYM(_uhoh)		| 194:
-	.long	SYM(_uhoh)		| 195:
-	.long	SYM(_uhoh)		| 196:
-	.long	SYM(_uhoh)		| 197:
-	.long	SYM(_uhoh)		| 198:
-	.long	SYM(_uhoh)		| 199:
-	.long	SYM(_uhoh)		| 200:
-	.long	SYM(_uhoh)		| 201:
-	.long	SYM(_uhoh)		| 202:
-	.long	SYM(_uhoh)		| 203:
-	.long	SYM(_uhoh)		| 204:
-	.long	SYM(_uhoh)		| 205:
-	.long	SYM(_uhoh)		| 206:
-	.long	SYM(_uhoh)		| 207:
-	.long	SYM(_uhoh)		| 208:
-	.long	SYM(_uhoh)		| 209:
-	.long	SYM(_uhoh)		| 210:
-	.long	SYM(_uhoh)		| 211:
-	.long	SYM(_uhoh)		| 212:
-	.long	SYM(_uhoh)		| 213:
-	.long	SYM(_uhoh)		| 214:
-	.long	SYM(_uhoh)		| 215:
-	.long	SYM(_uhoh)		| 216:
-	.long	SYM(_uhoh)		| 217:
-	.long	SYM(_uhoh)		| 218:
-	.long	SYM(_uhoh)		| 219:
-	.long	SYM(_uhoh)		| 220:
-	.long	SYM(_uhoh)		| 221:
-	.long	SYM(_uhoh)		| 222:
-	.long	SYM(_uhoh)		| 223:
-	.long	SYM(_uhoh)		| 224:
-	.long	SYM(_uhoh)		| 225:
-	.long	SYM(_uhoh)		| 226:
-	.long	SYM(_uhoh)		| 227:
-	.long	SYM(_uhoh)		| 228:
-	.long	SYM(_uhoh)		| 229:
-	.long	SYM(_uhoh)		| 230:
-	.long	SYM(_uhoh)		| 231:
-	.long	SYM(_uhoh)		| 232:
-	.long	SYM(_uhoh)		| 233:
-	.long	SYM(_uhoh)		| 234:
-	.long	SYM(_uhoh)		| 235:
-	.long	SYM(_uhoh)		| 236:
-	.long	SYM(_uhoh)		| 237:
-	.long	SYM(_uhoh)		| 238:
-	.long	SYM(_uhoh)		| 239:
-	.long	SYM(_uhoh)		| 240:
-	.long	SYM(_uhoh)		| 241:
-	.long	SYM(_uhoh)		| 242:
-	.long	SYM(_uhoh)		| 243:
-	.long	SYM(_uhoh)		| 244:
-	.long	SYM(_uhoh)		| 245:
-	.long	SYM(_uhoh)		| 246:
-	.long	SYM(_uhoh)		| 247:
-	.long	SYM(_uhoh)		| 248:
-	.long	SYM(_uhoh)		| 249:
-	.long	SYM(_uhoh)		| 250:
-	.long	SYM(_uhoh)		| 251:
-	.long	SYM(_uhoh)		| 252:
-	.long	SYM(_uhoh)		| 253:
-	.long	SYM(_uhoh)		| 254:
-	.long	SYM(_uhoh)		| 255:
-
-/*
- * Default trap handler
- * With an oscilloscope you can see AS* stop
- */
-	PUBLIC (_uhoh)
-SYM(_uhoh):	nop				| Leave spot for breakpoint
-	stop	#0x2700				| Stop with interrupts disabled
-	bra.s	SYM(_uhoh)			| Stuck forever
-
-/*
- * Log, but otherwise ignore, spurious interrupts
- */
-	PUBLIC (_spuriousInterrupt)
-SYM(_spuriousInterrupt):
-	addql	#1,SYM(_M68kSpuriousInterruptCount)
-	rte
-
-/*
- * Place the low-order 3 octets of the board's ethernet address at
- * a `well-known' fixed location relative to the startup location.
- */
-	.align 2
-	.word	0			| Padding
-ethernet_address_buffer:
-	.word	0x08F3			| Default address
-	.word	0xDEAD
-	.word	0xCAFE
-
-/* -- equates -- */
-.equ 	_PROM_Start, 	0x01000000       /* CS0 */
-.equ	_BCCram_Start, 	0x00000000       /* CS1 */
-.equ	_FLEX_Start, 	0x08000000       /* CS2 */
-.equ	_I2C_Start,	0x02000000       /* CS3 */
-.equ	_EXTram_Start,	0x10000000       /* CS4 */
-.equ	_EXTram_Size,	0x000400000    	 /* 4 Mbytes */
-.equ	_SPEED,	0xD780			 /* 25 Mhz CPU349 */
-/* .equ	_SPEED,	0xD700			    25 Mhz */
-/* .equ	_SPEED,	0xCE00			    16 Mhz */
-
-BEGIN_DATA
-
-_crt0_init_stack:
-		ds.l	0x1000
-_crt0_init_stktop:
-
-
-BEGIN_CODE
-        dc.l    _crt0_init_stktop        /* reset SP */
-        dc.l    _crt0_cold_start         /* reset PC */
-        dc.l    _crt0_warm_start
-
-	.ascii	"RTEMS"
-	dc.w	0
-
-.align 2
-
-_table_cs:
-	/* carte Astecc - 68340 */
-	dc.l	0x003FFFF0               		/* Mask CS0 (4Mbytes PROM, 32bits, 0WS)	*/
-/*	dc.l	0x003FFFFD               		 Mask CS0 (4Mbytes PROM, 16bits, 3WS)	*/
-	dc.l	((_PROM_Start&0xFFFFFF00)+0x00000003)  	/* Base CS0 */
-/*	dc.l    0x0000FFF1               		 MASK CS1 (RAMBCC340, 0WS, FTE) */
-	dc.l    0x0000FFFD               		/* MASK CS1 (RAMBCC340, 0WS, FTE) */
-/*	dc.l	((_BCCram_Start&0xFFFFFF00)+0x00000007)	 Base CS1 */
-	dc.l	((_BCCram_Start&0xFFFFFF00)+0x00000003)	/* Base CS1 */
-	dc.l    0x000000FF               		/* MASK CS2 (FLEX, ext DTACK, 256 bytes) */
-	dc.l	((_FLEX_Start&0xFFFFFF00)+0x00000003)  	/* Base CS2 */
-	dc.l	0x000000FF               		/* Mask CS3 (I2C, ext DTACK, 256 bytes)	*/
-	dc.l	((_I2C_Start&0xFFFFFF00)+0x00000003)  	/* Base CS3 */
-
-/*
- * Initial PC
- */
-.globl start
-start:
-
-_crt0_cold_start:
-	moveq.l #0,d0                   		/* signal cold reset */
-	bra.s   _crt0_common_start
-
-_crt0_warm_start:
-	moveq.l #1,d0                   		/* signal warm reset */
-
-_crt0_common_start:
-	move.w	#0x2700,sr               		/* disable interrupts and switch to interrupt mode */
-	movea.l	#_crt0_init_stktop,sp			/* set up initialization stack */
-
-	lea	Entry,a0				/* Get base of vector table */
-	movec	a0,vbr					/* Set up the VBR */
-
-	moveq.l #0x07,d1
-	movec.l d1,dfc					/* prepare access in CPU space */
-	move.l  #(BASE_SIM+1),d1
-	moves.l d1,BASE_REG            			/* base initialization (must be MOVES, PCC-130795) */
-	moveq.l	#0x05,d1
-	movec.l	d1,dfc
-
-	movea.l #BASE_SIM,a0
-
-	/* -- disable Bus Monitor -- */
-	move.b  #0,SIM_SYPCR(a0)       			/* system protection control register */
-
-	/* -- set frequency to 25.16 Mhz -- */
-	move.w  #_SPEED,SIM_SYNCR(a0)			/* clock */
-
-sync_wait:
-	btst.b	#3,(SIM_SYNCR+1)(a0)
-	beq	sync_wait
-
-	/* -- enable A31-A24 -- */
-        clr.b   SIM_PPRA1(a0)
-
-	/* -- show cycles, user acces to SIM, 4 /CS & 4 /IT -- */
-	move.w 	#0x427F,SIM_MCR(a0)
-
-	/* -- chip select initialization -- */
-	lea.l   SIM_MASKH0(a0),a2
-	lea.l   _table_cs(%pc),a1
-	
-	moveq.l #0x07,d1
-
-_b_cs:
-	move.l  (a1)+, (a2)+
-	dbra    d1,_b_cs
-
-	/* fill RAM if COLDSTART */
-        tst.l 	d0
-        bne 	_dont_fill
-
-        movea.l #_EXTram_Start,a0			/* get start */
-        move.l  #_EXTram_Size,d1			/* get size */
-        lsr.l   #2,d1            			/* ajust for long word */
-
-_fill_loop:
-        clr.l	(a0)+
-        subq.l	#1,d1
-        bne	_fill_loop
-        
-_dont_fill:
-	jmp	SYM(_Init68340)		| Start C code (which never returns)
-
-/*
- * Copy DATA segment, clear BSS segment, set up real stack,
- * initialize heap, start C program.
- * Assume that DATA and BSS sizes are multiples of 4.
- */
-	PUBLIC (_CopyDataClearBSSAndStart)
-SYM(_CopyDataClearBSSAndStart):
-	lea	copy_start,a0		| Get start of DATA in RAM
-	lea	SYM(etext),a2		| Get start of DATA in ROM
-	cmpl	a0,a2			| Are they the same?
-	beq.s	NOCOPY			| Yes, no copy necessary
-	lea	copy_end,a1		| Get end of DATA in RAM
-	bra.s	COPYLOOPTEST		| Branch into copy loop
-COPYLOOP:
-	movel	a2@+,a0@+		| Copy word from ROM to RAM
-COPYLOOPTEST:
-	cmpl	a1,a0			| Done?
-	bcs.s	COPYLOOP		| No, skip
-NOCOPY:
-
-	lea	clear_start,a0		| Get start of BSS
-	lea	clear_end,a1		| Get end of BSS
-	clrl	d0			| Value to set
-	bra.s	ZEROLOOPTEST		| Branch into clear loop
-ZEROLOOP:
-	movel	d0,a0@+			| Clear a word
-ZEROLOOPTEST:
-	cmpl	a1,a0			| Done?
-	bcs.s	ZEROLOOP		| No, skip
-
-	movel	#stack_init,a7		| set master stack pointer
-	movel	d0,a7@-			| environp
-	movel	d0,a7@-			| argv
-	movel	d0,a7@-			| argc
-	jsr	SYM(boot_card)		| Call C main
-
-	PUBLIC (_mainDone)
-SYM(_mainDone):
-	nop				| Leave spot for breakpoint
-	movew	#1,a7			| Force a double bus error
-	movel	d0,a7@-			| This should cause a RESET
-	stop	#0x2700			| Stop with interrupts disabled
-	bra.s	SYM(_mainDone)		| Stuck forever
-
-        .align 2
-	PUBLIC (_HeapSize)
-SYM (_HeapSize):
-        .long  HeapSize
-	PUBLIC (_StackSize)
-SYM (_StackSize):
-        .long  StackSize
-END_CODE
-
-BEGIN_DATA_DCL
-        .align 2
-	PUBLIC (environ)
-SYM (environ):
-	.long	0
-	PUBLIC (_M68kSpuriousInterruptCount)
-SYM (_M68kSpuriousInterruptCount):
-	.long	0
-END_DATA_DCL
-
-END
-
diff --git a/c/src/lib/libbsp/m68k/gen68360/start/Makefile.in b/c/src/lib/libbsp/m68k/gen68360/start/Makefile.in
deleted file mode 100644
index 4d339f46fc..0000000000
--- a/c/src/lib/libbsp/m68k/gen68360/start/Makefile.in
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-PGMS=${ARCH}/start360.o
-
-# C source names, if any, go here -- minus the .c
-C_PIECES=
-C_FILES=$(C_PIECES:%=%.c)
-C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
-
-H_FILES=
-
-# Assembly source names, if any, go here -- minus the .s
-S_PIECES=start360
-S_FILES=$(S_PIECES:%=%.s)
-S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
-
-SRCS=$(C_FILES) $(H_FILES) $(S_FILES)
-OBJS=$(C_O_FILES) $(S_O_FILES)
-
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES  +=
-CPPFLAGS +=
-CFLAGS   +=
-
-LD_PATHS  +=
-LD_LIBS   +=
-LDFLAGS   +=
-
-#
-# Add your list of files to delete here.  The config files
-#  already know how to delete some stuff, so you may want
-#  to just run 'make clean' first to see what gets missed.
-#  'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
-
-all:	${ARCH} $(SRCS) $(OBJS) $(PGM)
-	$(INSTALL_VARIANT) -m 555 ${PGMS} ${PROJECT_RELEASE}/lib
-
-# Install the program(s), appending _g or _p as appropriate.
-# for include files, just use $(INSTALL)
diff --git a/c/src/lib/libbsp/m68k/gen68360/start/start360.s b/c/src/lib/libbsp/m68k/gen68360/start/start360.s
deleted file mode 100644
index 2c979e294f..0000000000
--- a/c/src/lib/libbsp/m68k/gen68360/start/start360.s
+++ /dev/null
@@ -1,432 +0,0 @@
-/*
- *
- *  This file contains the entry point for the application.
- *  The name of this entry point is compiler dependent.
- *  It jumps to the BSP which is responsible for performing
- *  all initialization.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- * Based on the `gen68302' board support package, and covered by the
- * original distribution terms.
- *
- * W. Eric Norum
- * Saskatchewan Accelerator Laboratory
- * University of Saskatchewan
- * Saskatoon, Saskatchewan, CANADA
- * eric@skatter.usask.ca
- *
- *  $Id$
- */
-
-#include "asm.h"
-
-BEGIN_CODE
-	/*
-	 * Step 1: Decide on Reset Stack Pointer and Initial Program Counter
-	 */
-Entry:
-	.long	SYM(m360)+1024		|   0: Initial SSP
-	.long	start			|   1: Initial PC
-	.long	SYM(_uhoh)		|   2: Bus error
-	.long	SYM(_uhoh)		|   3: Address error
-	.long	SYM(_uhoh)		|   4: Illegal instruction
-	.long	SYM(_uhoh)		|   5: Zero division
-	.long	SYM(_uhoh)		|   6: CHK, CHK2 instruction
-	.long	SYM(_uhoh)		|   7: TRAPcc, TRAPV instructions
-	.long	SYM(_uhoh)		|   8: Privilege violation
-	.long	SYM(_uhoh)		|   9: Trace
-	.long	SYM(_uhoh)		|  10: Line 1010 emulator
-	.long	SYM(_uhoh)		|  11: Line 1111 emulator
-	.long	SYM(_uhoh)		|  12: Hardware breakpoint
-	.long	SYM(_uhoh)		|  13: Reserved for coprocessor violation
-	.long	SYM(_uhoh)		|  14: Format error
-	.long	SYM(_uhoh)		|  15: Uninitialized interrupt
-	.long	SYM(_uhoh)		|  16: Unassigned, reserved
-	.long	SYM(_uhoh)		|  17:
-	.long	SYM(_uhoh)		|  18:
-	.long	SYM(_uhoh)		|  19:
-	.long	SYM(_uhoh)		|  20:
-	.long	SYM(_uhoh)		|  21:
-	.long	SYM(_uhoh)		|  22:
-	.long	SYM(_uhoh)		|  23:
-	.long	SYM(_spuriousInterrupt)	|  24: Spurious interrupt
-	.long	SYM(_uhoh)		|  25: Level 1 interrupt autovector
-	.long	SYM(_uhoh)		|  26: Level 2 interrupt autovector
-	.long	SYM(_uhoh)		|  27: Level 3 interrupt autovector
-	.long	SYM(_uhoh)		|  28: Level 4 interrupt autovector
-	.long	SYM(_uhoh)		|  29: Level 5 interrupt autovector
-	.long	SYM(_uhoh)		|  30: Level 6 interrupt autovector
-	.long	SYM(_uhoh)		|  31: Level 7 interrupt autovector
-	.long	SYM(_uhoh)		|  32: Trap instruction (0-15)
-	.long	SYM(_uhoh)		|  33:
-	.long	SYM(_uhoh)		|  34:
-	.long	SYM(_uhoh)		|  35:
-	.long	SYM(_uhoh)		|  36:
-	.long	SYM(_uhoh)		|  37:
-	.long	SYM(_uhoh)		|  38:
-	.long	SYM(_uhoh)		|  39:
-	.long	SYM(_uhoh)		|  40:
-	.long	SYM(_uhoh)		|  41:
-	.long	SYM(_uhoh)		|  42:
-	.long	SYM(_uhoh)		|  43:
-	.long	SYM(_uhoh)		|  44:
-	.long	SYM(_uhoh)		|  45:
-	.long	SYM(_uhoh)		|  46:
-	.long	SYM(_uhoh)		|  47:
-	.long	SYM(_uhoh)		|  48: Reserved for coprocessor
-	.long	SYM(_uhoh)		|  49:
-	.long	SYM(_uhoh)		|  50:
-	.long	SYM(_uhoh)		|  51:
-	.long	SYM(_uhoh)		|  52:
-	.long	SYM(_uhoh)		|  53:
-	.long	SYM(_uhoh)		|  54:
-	.long	SYM(_uhoh)		|  55:
-	.long	SYM(_uhoh)		|  56:
-	.long	SYM(_uhoh)		|  57:
-	.long	SYM(_uhoh)		|  58:
-	.long	SYM(_uhoh)		|  59: Unassigned, reserved
-	.long	SYM(_uhoh)		|  60:
-	.long	SYM(_uhoh)		|  61:
-	.long	SYM(_uhoh)		|  62:
-	.long	SYM(_uhoh)		|  63:
-	.long	SYM(_uhoh)		|  64: User defined vectors (192)
-	.long	SYM(_uhoh)		|  65:
-	.long	SYM(_uhoh)		|  66:
-	.long	SYM(_uhoh)		|  67:
-	.long	SYM(_uhoh)		|  68:
-	.long	SYM(_uhoh)		|  69:
-	.long	SYM(_uhoh)		|  70:
-	.long	SYM(_uhoh)		|  71:
-	.long	SYM(_uhoh)		|  72:
-	.long	SYM(_uhoh)		|  73:
-	.long	SYM(_uhoh)		|  74:
-	.long	SYM(_uhoh)		|  75:
-	.long	SYM(_uhoh)		|  76:
-	.long	SYM(_uhoh)		|  77:
-	.long	SYM(_uhoh)		|  78:
-	.long	SYM(_uhoh)		|  79:
-	.long	SYM(_uhoh)		|  80:
-	.long	SYM(_uhoh)		|  81:
-	.long	SYM(_uhoh)		|  82:
-	.long	SYM(_uhoh)		|  83:
-	.long	SYM(_uhoh)		|  84:
-	.long	SYM(_uhoh)		|  85:
-	.long	SYM(_uhoh)		|  86:
-	.long	SYM(_uhoh)		|  87:
-	.long	SYM(_uhoh)		|  88:
-	.long	SYM(_uhoh)		|  89:
-	.long	SYM(_uhoh)		|  90:
-	.long	SYM(_uhoh)		|  91:
-	.long	SYM(_uhoh)		|  92:
-	.long	SYM(_uhoh)		|  93:
-	.long	SYM(_uhoh)		|  94:
-	.long	SYM(_uhoh)		|  95:
-	.long	SYM(_uhoh)		|  96:
-	.long	SYM(_uhoh)		|  97:
-	.long	SYM(_uhoh)		|  98:
-	.long	SYM(_uhoh)		|  99:
-	.long	SYM(_uhoh)		| 100:
-	.long	SYM(_uhoh)		| 101:
-	.long	SYM(_uhoh)		| 102:
-	.long	SYM(_uhoh)		| 103:
-	.long	SYM(_uhoh)		| 104:
-	.long	SYM(_uhoh)		| 105:
-	.long	SYM(_uhoh)		| 106:
-	.long	SYM(_uhoh)		| 107:
-	.long	SYM(_uhoh)		| 108:
-	.long	SYM(_uhoh)		| 109:
-	.long	SYM(_uhoh)		| 110:
-	.long	SYM(_uhoh)		| 111:
-	.long	SYM(_uhoh)		| 112:
-	.long	SYM(_uhoh)		| 113:
-	.long	SYM(_uhoh)		| 114:
-	.long	SYM(_uhoh)		| 115:
-	.long	SYM(_uhoh)		| 116:
-	.long	SYM(_uhoh)		| 117:
-	.long	SYM(_uhoh)		| 118:
-	.long	SYM(_uhoh)		| 119:
-	.long	SYM(_uhoh)		| 120:
-	.long	SYM(_uhoh)		| 121:
-	.long	SYM(_uhoh)		| 122:
-	.long	SYM(_uhoh)		| 123:
-	.long	SYM(_uhoh)		| 124:
-	.long	SYM(_uhoh)		| 125:
-	.long	SYM(_uhoh)		| 126:
-	.long	SYM(_uhoh)		| 127:
-	.long	SYM(_uhoh)		| 128:
-	.long	SYM(_uhoh)		| 129:
-	.long	SYM(_uhoh)		| 130:
-	.long	SYM(_uhoh)		| 131:
-	.long	SYM(_uhoh)		| 132:
-	.long	SYM(_uhoh)		| 133:
-	.long	SYM(_uhoh)		| 134:
-	.long	SYM(_uhoh)		| 135:
-	.long	SYM(_uhoh)		| 136:
-	.long	SYM(_uhoh)		| 137:
-	.long	SYM(_uhoh)		| 138:
-	.long	SYM(_uhoh)		| 139:
-	.long	SYM(_uhoh)		| 140:
-	.long	SYM(_uhoh)		| 141:
-	.long	SYM(_uhoh)		| 142:
-	.long	SYM(_uhoh)		| 143:
-	.long	SYM(_uhoh)		| 144:
-	.long	SYM(_uhoh)		| 145:
-	.long	SYM(_uhoh)		| 146:
-	.long	SYM(_uhoh)		| 147:
-	.long	SYM(_uhoh)		| 148:
-	.long	SYM(_uhoh)		| 149:
-	.long	SYM(_uhoh)		| 150:
-	.long	SYM(_uhoh)		| 151:
-	.long	SYM(_uhoh)		| 152:
-	.long	SYM(_uhoh)		| 153:
-	.long	SYM(_uhoh)		| 154:
-	.long	SYM(_uhoh)		| 155:
-	.long	SYM(_uhoh)		| 156:
-	.long	SYM(_uhoh)		| 157:
-	.long	SYM(_uhoh)		| 158:
-	.long	SYM(_uhoh)		| 159:
-	.long	SYM(_uhoh)		| 160:
-	.long	SYM(_uhoh)		| 161:
-	.long	SYM(_uhoh)		| 162:
-	.long	SYM(_uhoh)		| 163:
-	.long	SYM(_uhoh)		| 164:
-	.long	SYM(_uhoh)		| 165:
-	.long	SYM(_uhoh)		| 166:
-	.long	SYM(_uhoh)		| 167:
-	.long	SYM(_uhoh)		| 168:
-	.long	SYM(_uhoh)		| 169:
-	.long	SYM(_uhoh)		| 170:
-	.long	SYM(_uhoh)		| 171:
-	.long	SYM(_uhoh)		| 172:
-	.long	SYM(_uhoh)		| 173:
-	.long	SYM(_uhoh)		| 174:
-	.long	SYM(_uhoh)		| 175:
-	.long	SYM(_uhoh)		| 176:
-	.long	SYM(_uhoh)		| 177:
-	.long	SYM(_uhoh)		| 178:
-	.long	SYM(_uhoh)		| 179:
-	.long	SYM(_uhoh)		| 180:
-	.long	SYM(_uhoh)		| 181:
-	.long	SYM(_uhoh)		| 182:
-	.long	SYM(_uhoh)		| 183:
-	.long	SYM(_uhoh)		| 184:
-	.long	SYM(_uhoh)		| 185:
-	.long	SYM(_uhoh)		| 186:
-	.long	SYM(_uhoh)		| 187:
-	.long	SYM(_uhoh)		| 188:
-	.long	SYM(_uhoh)		| 189:
-	.long	SYM(_uhoh)		| 190:
-	.long	SYM(_uhoh)		| 191:
-	.long	SYM(_uhoh)		| 192:
-	.long	SYM(_uhoh)		| 193:
-	.long	SYM(_uhoh)		| 194:
-	.long	SYM(_uhoh)		| 195:
-	.long	SYM(_uhoh)		| 196:
-	.long	SYM(_uhoh)		| 197:
-	.long	SYM(_uhoh)		| 198:
-	.long	SYM(_uhoh)		| 199:
-	.long	SYM(_uhoh)		| 200:
-	.long	SYM(_uhoh)		| 201:
-	.long	SYM(_uhoh)		| 202:
-	.long	SYM(_uhoh)		| 203:
-	.long	SYM(_uhoh)		| 204:
-	.long	SYM(_uhoh)		| 205:
-	.long	SYM(_uhoh)		| 206:
-	.long	SYM(_uhoh)		| 207:
-	.long	SYM(_uhoh)		| 208:
-	.long	SYM(_uhoh)		| 209:
-	.long	SYM(_uhoh)		| 210:
-	.long	SYM(_uhoh)		| 211:
-	.long	SYM(_uhoh)		| 212:
-	.long	SYM(_uhoh)		| 213:
-	.long	SYM(_uhoh)		| 214:
-	.long	SYM(_uhoh)		| 215:
-	.long	SYM(_uhoh)		| 216:
-	.long	SYM(_uhoh)		| 217:
-	.long	SYM(_uhoh)		| 218:
-	.long	SYM(_uhoh)		| 219:
-	.long	SYM(_uhoh)		| 220:
-	.long	SYM(_uhoh)		| 221:
-	.long	SYM(_uhoh)		| 222:
-	.long	SYM(_uhoh)		| 223:
-	.long	SYM(_uhoh)		| 224:
-	.long	SYM(_uhoh)		| 225:
-	.long	SYM(_uhoh)		| 226:
-	.long	SYM(_uhoh)		| 227:
-	.long	SYM(_uhoh)		| 228:
-	.long	SYM(_uhoh)		| 229:
-	.long	SYM(_uhoh)		| 230:
-	.long	SYM(_uhoh)		| 231:
-	.long	SYM(_uhoh)		| 232:
-	.long	SYM(_uhoh)		| 233:
-	.long	SYM(_uhoh)		| 234:
-	.long	SYM(_uhoh)		| 235:
-	.long	SYM(_uhoh)		| 236:
-	.long	SYM(_uhoh)		| 237:
-	.long	SYM(_uhoh)		| 238:
-	.long	SYM(_uhoh)		| 239:
-	.long	SYM(_uhoh)		| 240:
-	.long	SYM(_uhoh)		| 241:
-	.long	SYM(_uhoh)		| 242:
-	.long	SYM(_uhoh)		| 243:
-	.long	SYM(_uhoh)		| 244:
-	.long	SYM(_uhoh)		| 245:
-	.long	SYM(_uhoh)		| 246:
-	.long	SYM(_uhoh)		| 247:
-	.long	SYM(_uhoh)		| 248:
-	.long	SYM(_uhoh)		| 249:
-	.long	SYM(_uhoh)		| 250:
-	.long	SYM(_uhoh)		| 251:
-	.long	SYM(_uhoh)		| 252:
-	.long	SYM(_uhoh)		| 253:
-	.long	SYM(_uhoh)		| 254:
-	.long	SYM(_uhoh)		| 255:
-
-/*
- * Default trap handler
- * With an oscilloscope you can see AS* stop
- */
-	PUBLIC (_uhoh)
-SYM(_uhoh):	nop				| Leave spot for breakpoint
-	stop	#0x2700			| Stop with interrupts disabled
-	bra.s	SYM(_uhoh)			| Stuck forever
-
-/*
- * Log, but otherwise ignore, spurious interrupts
- */
-	PUBLIC (_spuriousInterrupt)
-SYM(_spuriousInterrupt):
-	addql	#1,SYM(_M68kSpuriousInterruptCount)
-	rte
-
-/*
- * Place the low-order 3 octets of the board's ethernet address at
- * a `well-known' fixed location relative to the startup location.
- */
-	.align 2
-	.word	0			| Padding
-ethernet_address_buffer:
-	.word	0x08F3			| Default address
-	.word	0xDEAD
-	.word	0xCAFE
-
-/*
- * Initial PC
- */
-.globl start
-start:
-	/*
-	 * Step 2: Stay in Supervisor Mode
-	 */
-#if ( M68K_HAS_SEPARATE_STACKS == 1 )
-	oriw	#0x3000,sr		| Switch to Master Stack Pointer
-	lea	SYM(m360)+1024-64,a7	| Put stack in dual-port ram
-					| a little below the interrupt stack
-#endif
-
-	/*
-	 * Step 3: Write the VBR
-	 */
-	lea	Entry,a0		| Get base of vector table
-	movec	a0,vbr			| Set up the VBR
-
-	/*
-	 * Step 4: Write the MBAR
-	 */
-	movec	dfc,d1			| Save destination register
-	moveq	#7,d0			| CPU-space funcction code
-	movec	d0,dfc			| Set destination function code register
-	movel	#SYM(m360)+0x101,d0	| MBAR value (mask CPU space accesses)
-	movesl	d0,0x3FF00		| Set MBAR
-	movec	d1,dfc			| Restore destination register
-
-	/*
-	 * Step 5: Verify a dual-port RAM location
-	 */
-	lea	SYM(m360),a0		| Point a0 to first DPRAM location
-	moveb	#0x33,d0		| Set the test value
-	moveb	d0,a0@			| Set the memory location
-	cmpb	a0@,d0			| Does it read back?
-	bne	SYM(_uhoh)			| If not, bad news!
-	notb	d0			| Flip bits
-	moveb	d0,a0@			| Set the memory location
-	cmpb	a0@,d0			| Does it read back?
-	bne	SYM(_uhoh)			| If not, bad news!
-
-	/*
-	 * Remaining steps are handled by C code
-	 */
-	jmp	SYM(_Init68360)		| Start C code (which never returns)
-
-/*
- * Copy DATA segment, clear BSS segment, set up real stack,
- * initialize heap, start C program.
- * Assume that DATA and BSS sizes are multiples of 4.
- */
-	PUBLIC (_CopyDataClearBSSAndStart)
-SYM(_CopyDataClearBSSAndStart):
-	lea	copy_start,a0		| Get start of DATA in RAM
-	lea	SYM(etext),a2		| Get start of DATA in ROM
-	cmpl	a0,a2			| Are they the same?
-	beq.s	NOCOPY			| Yes, no copy necessary
-	lea	copy_end,a1		| Get end of DATA in RAM
-	bra.s	COPYLOOPTEST		| Branch into copy loop
-COPYLOOP:
-	movel	a2@+,a0@+		| Copy word from ROM to RAM
-COPYLOOPTEST:
-	cmpl	a1,a0			| Done?
-	bcs.s	COPYLOOP		| No, skip
-NOCOPY:
-
-	lea	clear_start,a0		| Get start of BSS
-	lea	clear_end,a1		| Get end of BSS
-	clrl	d0			| Value to set
-	bra.s	ZEROLOOPTEST		| Branch into clear loop
-ZEROLOOP:
-	movel	d0,a0@+			| Clear a word
-ZEROLOOPTEST:
-	cmpl	a1,a0			| Done?
-	bcs.s	ZEROLOOP		| No, skip
-
-	movel	#stack_init,a7		| set master stack pointer
-	movel	d0,a7@-			| environp
-	movel	d0,a7@-			| argv
-	movel	d0,a7@-			| argc
-	jsr	SYM(boot_card)		| Call C main
-
-	PUBLIC (_mainDone)
-SYM(_mainDone):
-	nop				| Leave spot for breakpoint
-	movew	#1,a7			| Force a double bus error
-	movel	d0,a7@-			| This should cause a RESET
-	stop	#0x2700			| Stop with interrupts disabled
-	bra.s	SYM(_mainDone)		| Stuck forever
-
-        .align 2
-	PUBLIC (_HeapSize)
-SYM (_HeapSize):
-        .long  HeapSize
-	PUBLIC (_StackSize)
-SYM (_StackSize):
-        .long  StackSize
-END_CODE
-
-BEGIN_DATA_DCL
-        .align 2
-	PUBLIC (environ)
-SYM (environ):
-	.long	0
-	PUBLIC (_M68kSpuriousInterruptCount)
-SYM (_M68kSpuriousInterruptCount):
-	.long	0
-END_DATA_DCL
-
-END
-
diff --git a/c/src/lib/libbsp/m68k/ods68302/start/Makefile.in b/c/src/lib/libbsp/m68k/ods68302/start/Makefile.in
deleted file mode 100644
index a6d3ba2c08..0000000000
--- a/c/src/lib/libbsp/m68k/ods68302/start/Makefile.in
+++ /dev/null
@@ -1,69 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-PGM=${ARCH}/start302.o
-
-ifeq ($(RTEMS_DEBUGGER),yes)
-RESET_SRC = debugreset
-else
-RESET_SRC = reset
-CFLAGS += -DGDB_MONITOR_ACTIVE
-endif
-
-# C source names, if any, go here -- minus the .c
-C_PIECES=cpuboot
-C_FILES=$(C_PIECES:%=%.c)
-C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
-
-H_FILES=
-
-# Assembly source names, if any, go here -- minus the .s
-S_PIECES=$(RESET_SRC)
-S_FILES=$(S_PIECES:%=%.s)
-S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
-
-SRCS=$(C_FILES) $(H_FILES) $(S_FILES)
-OBJS=$(S_O_FILES) $(C_O_FILES)
-
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES  +=
-CPPFLAGS +=
-CFLAGS   +=
-
-LD_PATHS  +=
-LD_LIBS   +=
-LDFLAGS   +=
-
-#
-# Add your list of files to delete here.  The config files
-#  already know how to delete some stuff, so you may want
-#  to just run 'make clean' first to see what gets missed.
-#  'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
-
-${PGM}: ${OBJS}
-	$(make-rel)
-	
-all:	${ARCH} $(SRCS) $(OBJS) $(PGM)
-	$(INSTALL_VARIANT) -m 555 ${PGM} ${PROJECT_RELEASE}/lib
-
-# Install the program(s), appending _g or _p as appropriate.
-# for include files, just use $(INSTALL)
-
-
diff --git a/c/src/lib/libbsp/m68k/ods68302/start/cpuboot.c b/c/src/lib/libbsp/m68k/ods68302/start/cpuboot.c
deleted file mode 100644
index fd8a4146de..0000000000
--- a/c/src/lib/libbsp/m68k/ods68302/start/cpuboot.c
+++ /dev/null
@@ -1,133 +0,0 @@
-/*****************************************************************************/
-/*
-  Boot the CPU.
-
-  Occurs in 3 phases for a 68302.
-
-  Phase 1.
-
-  Called as soon as able after reset. The BAR has been programed, and
-  a small stack exists in the DPRAM. All interrupts are masked, and
-  the processor is running in supervisor mode. No other hardware or
-  chip selects are active.
-
-  This phase programs the chip select registers, the parallel ports
-  are set into default configurations, and basic registers cleared or
-  reset. The leds are programmed to show the end of phase 1.
-
-  Phase 2.
-
-  This is a piece of code which is copied to DPRAM and executed. It
-  should not do any more thann is currently present. The return to ROM
-  is managed by modifing the return address. Again leds show the status.
-
-  Phase 3.
-
-  This code executes with a valid C environment. That is the data
-  section has been intialised and the bss section set to 0. This phase
-  performs any special card initialisation and then calls boot card.
-  
-  $Id$
-  
-*/
-/*****************************************************************************/
-
-#include <bsp.h>
-#include <m68302.h>
-#include <debugport.h>
-#include <crc.h>
-
-/*
-  Open the address, reset all registers
-  */
-
-void boot_phase_1()
-{
-  M302_SCR = SCR_DEFAULT;
-
-  WRITE_OR(CSEL_ROM, ROM_SIZE, ROM_WAIT_STATES, OR_MASK_RW, OR_MASK_FC);
-  WRITE_BR(CSEL_ROM, RAM_BASE, BR_READ_ONLY, BR_FC_NULL, BR_ENABLED);
-  WRITE_OR(CSEL_RAM, RAM_SIZE, RAM_WAIT_STATES, OR_MASK_RW, OR_MASK_FC);
-  WRITE_BR(CSEL_RAM, ROM_BASE, BR_READ_WRITE, BR_FC_NULL, BR_ENABLED);
-
-#if defined(CSEL_1)
-  WRITE_OR(CSEL_1, CSEL_1_SIZE, CSEL_1_WAIT_STATES, OR_MASK_RW, OR_MASK_FC);
-  WRITE_BR(CSEL_1, CSEL_1_BASE, BR_READ_WRITE, BR_FC_NULL, BR_ENABLED);
-#endif
-  
-#if defined(CSEL_2)
-  WRITE_OR(CSEL_2, CSEL_2_SIZE, CSEL_2_WAIT_STATES, OR_MASK_RW, OR_MASK_FC);
-  WRITE_BR(CSEL_2, CSEL_2_BASE, BR_READ_WRITE, BR_FC_NULL, BR_ENABLED);
-#endif
-  
-  m302.reg.gimr = m302.reg.ipr = m302.reg.imr = m302.reg.isr = 0;
-  
-  m302.reg.simode = 0;
-
-  m302.reg.pacnt = CARD_PA_CONFIGURATION;
-  m302.reg.paddr = CARD_PA_DEFAULT_DIRECTIONS;
-  m302.reg.padat = CARD_PA_DEFAULT_DATA;
-
-  m302.reg.pbcnt = CARD_PB_CONFIGURATION;
-  m302.reg.pbddr = CARD_PB_DEFAULT_DIRECTIONS;
-  m302.reg.pbdat = CARD_PB_DEFAULT_DATA;
-
-  m302.reg.wrr = WATCHDOG_TIMEOUT_PERIOD | WATCHDOG_ENABLE;
-
-#if defined(LED_CONTROL)
-  LED_CONTROL(LED_1_RED, LED_2_OFF, LED_3_OFF, LED_4_OFF,
-              LED_5_OFF, LED_6_OFF, LED_7_OFF, LED_8_OFF);
-#endif  
-}
-
-/*
-  Swap the chip select mapping for ROM and RAM
-  */
-
-void boot_phase_2(void)
-{
-  rtems_unsigned32 stack;
-  
-#if defined(LED_CONTROL)
-  LED_CONTROL(LED_1_RED, LED_2_RED, LED_3_OFF, LED_4_OFF,
-              LED_5_OFF, LED_6_OFF, LED_7_OFF, LED_8_OFF);
-#endif
-  
-  WRITE_BR(CSEL_ROM, ROM_BASE, BR_READ_ONLY, BR_FC_NULL, BR_ENABLED);
-  WRITE_BR(CSEL_RAM, RAM_BASE, BR_READ_WRITE, BR_FC_NULL, BR_ENABLED);
-  
-#if defined(LED_CONTROL)
-  LED_CONTROL(LED_1_GREEN, LED_2_RED, LED_3_OFF, LED_4_OFF,
-              LED_5_OFF, LED_6_OFF, LED_7_OFF, LED_8_OFF);
-#endif
-
-  /* seems to want 2, looked at assember code output */
-  *(&stack + 2) |= ROM_BASE;
-}
-
-/*
-  Any pre-main initialisation, the C environment is setup, how-ever C++
-  static constructors have not been called, and RTEMS is not initialised.
-  */
-
-void boot_card();
-void set_debug_traps();
-void breakpoint();
-
-void boot_phase_3(void)
-{
-  if (GDB_RUN_MONITOR())
-  {
-    set_debug_traps();
-    breakpoint();
-  }
-  
-  debug_port_banner();
-  
-  /* FIXME : add RAM and ROM checks */
-  
-  /* boot the bsp, what ever this means */
-  boot_card();
-
-  WATCHDOG_TRIGGER();
-}
diff --git a/c/src/lib/libbsp/m68k/ods68302/start/debugreset.S b/c/src/lib/libbsp/m68k/ods68302/start/debugreset.S
deleted file mode 100644
index 74049191c4..0000000000
--- a/c/src/lib/libbsp/m68k/ods68302/start/debugreset.S
+++ /dev/null
@@ -1,107 +0,0 @@
-/*  
- *  $Id$
- *
- *  Re-written the gen68302 start-up code.
- *  
- *  Uses gas syntax only, removed the OAR asm.h.
- *  
- *  Supplies a complete vector table in ROM.
- *  
- *  Manages all vectors with seperate handlers to trap unhandled
- *  execptions.
- *  
- *  Uses the target specific header file to get the runtime 
- *  configuration
- *  
- *  COPYRIGHT (c) 1996
- *  Objective Design Systems Pty Ltd (ODS)
- *        
- *  COPYRIGHT (c) 1989, 1990, 1991, 1992, 1993, 1994.
- *  On-Line Applications Research Corporation (OAR).
- *  All rights assigned to U.S. Government, 1994.
- *
- *  This material may be reproduced by or for the U.S. Government pursuant
- *  to the copyright license under the clause at DFARS 252.227-7013.  This
- *  notice must appear in all copies of this file and its derivatives.
- *
- */
-
-|
-| Entry from debugger
-|
-        .sect   .text
-
-|
-| Start
-|
-| Entered from a hardware reset.
-|
-        
-        .global start                           | Default entry point for GNU
-start:
-
-        move.w  #0x2700,%sr                     | Disable all interrupts
-
-        |
-        | zero out uninitialized data area
-        |
-
-zerobss:
-        moveal  #end,%a0                        | find end of .bss
-        moveal  #bss_start,%a1                  | find beginning of .bss
-        moveq   #0,%d0
-        
-zerobss_loop:
-        
-        movel   %d0,%a1@+                       | to zero out uninitialized
-        cmpal   %a0,%a1
-        jlt     zerobss_loop                    | loop until _end reached
-
-        movel   #end,%d0                        | d0 = end of bss/start of heap
-        addl    #heap_size,%d0                  | d0 = end of heap
-
-        movel   %d0,stack_start                 | Save for brk() routine
-        addl    #stack_size,%d0                 | make room for stack
-        andl    #0xffffffc0,%d0                 | align it on 16 byte boundary
-
-        movw    #0x3700,%sr                     | SUPV MODE,INTERRUPTS OFF!!!
-        movel   %d0,%a7                         | set master stack pointer
-        movel   %d0,%a6                         | set base pointer
-
-        jsr     boot_phase_3
-
-|                
-| Initialised data
-|
-
-        .sect   .data
-        
-        .global start_frame
-        
-start_frame:
-        .space  4,0
-
-        .global stack_start
-        
-stack_start:
-        .space  4,0
-
-|
-| Uninitialised data
-|
-
-        .sect   .bss
-        
-        .global environ
-        .align  2
-        
-environ:
-        .long   0
-
-        .global heap_size
-        .set    heap_size,0x2000
-
-        .global stack_size
-        .set    stack_size,0x1000
-
-
diff --git a/c/src/lib/libbsp/m68k/ods68302/start/reset.S b/c/src/lib/libbsp/m68k/ods68302/start/reset.S
deleted file mode 100644
index 71d1071243..0000000000
--- a/c/src/lib/libbsp/m68k/ods68302/start/reset.S
+++ /dev/null
@@ -1,881 +0,0 @@
-/*  
- *  $Id$
- *
- *  Re-written the gen68302 start-up code.
- *  
- *  Uses gas syntax only, removed the OAR asm.h.
- *  
- *  Supplies a complete vector table in ROM.
- *  
- *  Manages all vectors with seperate handlers to trap unhandled
- *  execptions.
- *  
- *  Uses the target specific header file to get the runtime 
- *  configuration
- *  
- *  COPYRIGHT (c) 1996
- *  Objective Design Systems Pty Ltd (ODS)
- *        
- *  COPYRIGHT (c) 1989, 1990, 1991, 1992, 1993, 1994.
- *  On-Line Applications Research Corporation (OAR).
- *  All rights assigned to U.S. Government, 1994.
- *
- *  This material may be reproduced by or for the U.S. Government pursuant
- *  to the copyright license under the clause at DFARS 252.227-7013.  This
- *  notice must appear in all copies of this file and its derivatives.
- *
- */
-
-|
-| some basic defined, this is that is required
-|
-#define MC68302_BAR                0x000000F2
-#define MC68302_BAR_FC_CFC         0x0000
-#define MC68302_SYS_RAM_SIZE       0x240
-
-|
-| Boot boot code in a special section, ld postions
-|
-| Initial stack pointer is in the dual ported RAM
-|
-        .sect   .text
-
-        .global M68Kvec                 | Vector Table
-        
-M68Kvec:                                | standard location for vectors
-        
-|
-| Make relative, can have the code positioned any where
-|
-
-V___ISSP: .long  MC68302_BASE + MC68302_SYS_RAM_SIZE
-V____IPC: .long  start - V___ISSP
-        
-|
-| Create the rest of the vector table to point to the unhandled expection
-| handler
-|
-| Lots of macros, how-ever it creates a simple ROM vector table
-|
-
-exception_handler = unhandled_exception - V___ISSP
-#define MAKE_EXCEPTION_VECTOR(n) V___##n: .long (exception_handler + (n * 8))
-
-MAKE_EXCEPTION_VECTOR(2)
-MAKE_EXCEPTION_VECTOR(3)
-MAKE_EXCEPTION_VECTOR(4)
-MAKE_EXCEPTION_VECTOR(5)
-MAKE_EXCEPTION_VECTOR(6)
-MAKE_EXCEPTION_VECTOR(7)
-MAKE_EXCEPTION_VECTOR(8)
-MAKE_EXCEPTION_VECTOR(9)
-        
-MAKE_EXCEPTION_VECTOR(10)
-MAKE_EXCEPTION_VECTOR(11)
-MAKE_EXCEPTION_VECTOR(12)
-MAKE_EXCEPTION_VECTOR(13)
-MAKE_EXCEPTION_VECTOR(14)
-MAKE_EXCEPTION_VECTOR(15)
-MAKE_EXCEPTION_VECTOR(16)
-MAKE_EXCEPTION_VECTOR(17)
-MAKE_EXCEPTION_VECTOR(18)
-MAKE_EXCEPTION_VECTOR(19)
-
-MAKE_EXCEPTION_VECTOR(20)
-MAKE_EXCEPTION_VECTOR(21)
-MAKE_EXCEPTION_VECTOR(22)
-MAKE_EXCEPTION_VECTOR(23)
-MAKE_EXCEPTION_VECTOR(24)
-MAKE_EXCEPTION_VECTOR(25)
-MAKE_EXCEPTION_VECTOR(26)
-MAKE_EXCEPTION_VECTOR(27)
-MAKE_EXCEPTION_VECTOR(28)
-MAKE_EXCEPTION_VECTOR(29)
-        
-MAKE_EXCEPTION_VECTOR(30)
-MAKE_EXCEPTION_VECTOR(31)
-MAKE_EXCEPTION_VECTOR(32)
-MAKE_EXCEPTION_VECTOR(33)
-MAKE_EXCEPTION_VECTOR(34)
-MAKE_EXCEPTION_VECTOR(35)
-MAKE_EXCEPTION_VECTOR(36)
-MAKE_EXCEPTION_VECTOR(37)
-MAKE_EXCEPTION_VECTOR(38)
-MAKE_EXCEPTION_VECTOR(39)
-        
-MAKE_EXCEPTION_VECTOR(40)
-MAKE_EXCEPTION_VECTOR(41)
-MAKE_EXCEPTION_VECTOR(42)
-MAKE_EXCEPTION_VECTOR(43)
-MAKE_EXCEPTION_VECTOR(44)
-MAKE_EXCEPTION_VECTOR(45)
-MAKE_EXCEPTION_VECTOR(46)
-MAKE_EXCEPTION_VECTOR(47)
-MAKE_EXCEPTION_VECTOR(48)
-MAKE_EXCEPTION_VECTOR(49)
-        
-MAKE_EXCEPTION_VECTOR(50)
-MAKE_EXCEPTION_VECTOR(51)
-MAKE_EXCEPTION_VECTOR(52)
-MAKE_EXCEPTION_VECTOR(53)
-MAKE_EXCEPTION_VECTOR(54)
-MAKE_EXCEPTION_VECTOR(55)
-MAKE_EXCEPTION_VECTOR(56)
-MAKE_EXCEPTION_VECTOR(57)
-MAKE_EXCEPTION_VECTOR(58)
-MAKE_EXCEPTION_VECTOR(59)
-        
-MAKE_EXCEPTION_VECTOR(60)
-MAKE_EXCEPTION_VECTOR(61)
-MAKE_EXCEPTION_VECTOR(62)
-MAKE_EXCEPTION_VECTOR(63)
-MAKE_EXCEPTION_VECTOR(64)
-MAKE_EXCEPTION_VECTOR(65)
-MAKE_EXCEPTION_VECTOR(66)
-MAKE_EXCEPTION_VECTOR(67)
-MAKE_EXCEPTION_VECTOR(68)
-MAKE_EXCEPTION_VECTOR(69)
-        
-MAKE_EXCEPTION_VECTOR(70)
-MAKE_EXCEPTION_VECTOR(71)
-MAKE_EXCEPTION_VECTOR(72)
-MAKE_EXCEPTION_VECTOR(73)
-MAKE_EXCEPTION_VECTOR(74)
-MAKE_EXCEPTION_VECTOR(75)
-MAKE_EXCEPTION_VECTOR(76)
-MAKE_EXCEPTION_VECTOR(77)
-MAKE_EXCEPTION_VECTOR(78)
-MAKE_EXCEPTION_VECTOR(79)
-        
-MAKE_EXCEPTION_VECTOR(80)
-MAKE_EXCEPTION_VECTOR(81)
-MAKE_EXCEPTION_VECTOR(82)
-MAKE_EXCEPTION_VECTOR(83)
-MAKE_EXCEPTION_VECTOR(84)
-MAKE_EXCEPTION_VECTOR(85)
-MAKE_EXCEPTION_VECTOR(86)
-MAKE_EXCEPTION_VECTOR(87)
-MAKE_EXCEPTION_VECTOR(88)
-MAKE_EXCEPTION_VECTOR(89)
-        
-MAKE_EXCEPTION_VECTOR(90)
-MAKE_EXCEPTION_VECTOR(91)
-MAKE_EXCEPTION_VECTOR(92)
-MAKE_EXCEPTION_VECTOR(93)
-MAKE_EXCEPTION_VECTOR(94)
-MAKE_EXCEPTION_VECTOR(95)
-MAKE_EXCEPTION_VECTOR(96)
-MAKE_EXCEPTION_VECTOR(97)
-MAKE_EXCEPTION_VECTOR(98)
-MAKE_EXCEPTION_VECTOR(99)
-        
-MAKE_EXCEPTION_VECTOR(100)
-MAKE_EXCEPTION_VECTOR(101)
-MAKE_EXCEPTION_VECTOR(102)
-MAKE_EXCEPTION_VECTOR(103)
-MAKE_EXCEPTION_VECTOR(104)
-MAKE_EXCEPTION_VECTOR(105)
-MAKE_EXCEPTION_VECTOR(106)
-MAKE_EXCEPTION_VECTOR(107)
-MAKE_EXCEPTION_VECTOR(108)
-MAKE_EXCEPTION_VECTOR(109)
-        
-MAKE_EXCEPTION_VECTOR(110)
-MAKE_EXCEPTION_VECTOR(111)
-MAKE_EXCEPTION_VECTOR(112)
-MAKE_EXCEPTION_VECTOR(113)
-MAKE_EXCEPTION_VECTOR(114)
-MAKE_EXCEPTION_VECTOR(115)
-MAKE_EXCEPTION_VECTOR(116)
-MAKE_EXCEPTION_VECTOR(117)
-MAKE_EXCEPTION_VECTOR(118)
-MAKE_EXCEPTION_VECTOR(119)
-
-MAKE_EXCEPTION_VECTOR(120)
-MAKE_EXCEPTION_VECTOR(121)
-MAKE_EXCEPTION_VECTOR(122)
-MAKE_EXCEPTION_VECTOR(123)
-MAKE_EXCEPTION_VECTOR(124)
-MAKE_EXCEPTION_VECTOR(125)
-MAKE_EXCEPTION_VECTOR(126)
-MAKE_EXCEPTION_VECTOR(127)
-MAKE_EXCEPTION_VECTOR(128)
-MAKE_EXCEPTION_VECTOR(129)
-        
-MAKE_EXCEPTION_VECTOR(130)
-MAKE_EXCEPTION_VECTOR(131)
-MAKE_EXCEPTION_VECTOR(132)
-MAKE_EXCEPTION_VECTOR(133)
-MAKE_EXCEPTION_VECTOR(134)
-MAKE_EXCEPTION_VECTOR(135)
-MAKE_EXCEPTION_VECTOR(136)
-MAKE_EXCEPTION_VECTOR(137)
-MAKE_EXCEPTION_VECTOR(138)
-MAKE_EXCEPTION_VECTOR(139)
-                       
-MAKE_EXCEPTION_VECTOR(140)
-MAKE_EXCEPTION_VECTOR(141)
-MAKE_EXCEPTION_VECTOR(142)
-MAKE_EXCEPTION_VECTOR(143)
-MAKE_EXCEPTION_VECTOR(144)
-MAKE_EXCEPTION_VECTOR(145)
-MAKE_EXCEPTION_VECTOR(146)
-MAKE_EXCEPTION_VECTOR(147)
-MAKE_EXCEPTION_VECTOR(148)
-MAKE_EXCEPTION_VECTOR(149)
-        
-MAKE_EXCEPTION_VECTOR(150)
-MAKE_EXCEPTION_VECTOR(151)
-MAKE_EXCEPTION_VECTOR(152)
-MAKE_EXCEPTION_VECTOR(153)
-MAKE_EXCEPTION_VECTOR(154)
-MAKE_EXCEPTION_VECTOR(155)
-MAKE_EXCEPTION_VECTOR(156)
-MAKE_EXCEPTION_VECTOR(157)
-MAKE_EXCEPTION_VECTOR(158)
-MAKE_EXCEPTION_VECTOR(159)
-                       
-MAKE_EXCEPTION_VECTOR(160)
-MAKE_EXCEPTION_VECTOR(161)
-MAKE_EXCEPTION_VECTOR(162)
-MAKE_EXCEPTION_VECTOR(163)
-MAKE_EXCEPTION_VECTOR(164)
-MAKE_EXCEPTION_VECTOR(165)
-MAKE_EXCEPTION_VECTOR(166)
-MAKE_EXCEPTION_VECTOR(167)
-MAKE_EXCEPTION_VECTOR(168)
-MAKE_EXCEPTION_VECTOR(169)
-        
-MAKE_EXCEPTION_VECTOR(170)
-MAKE_EXCEPTION_VECTOR(171)
-MAKE_EXCEPTION_VECTOR(172)
-MAKE_EXCEPTION_VECTOR(173)
-MAKE_EXCEPTION_VECTOR(174)
-MAKE_EXCEPTION_VECTOR(175)
-MAKE_EXCEPTION_VECTOR(176)
-MAKE_EXCEPTION_VECTOR(177)
-MAKE_EXCEPTION_VECTOR(178)
-MAKE_EXCEPTION_VECTOR(179)
-                       
-MAKE_EXCEPTION_VECTOR(180)
-MAKE_EXCEPTION_VECTOR(181)
-MAKE_EXCEPTION_VECTOR(182)
-MAKE_EXCEPTION_VECTOR(183)
-MAKE_EXCEPTION_VECTOR(184)
-MAKE_EXCEPTION_VECTOR(185)
-MAKE_EXCEPTION_VECTOR(186)
-MAKE_EXCEPTION_VECTOR(187)
-MAKE_EXCEPTION_VECTOR(188)
-MAKE_EXCEPTION_VECTOR(189)
-        
-MAKE_EXCEPTION_VECTOR(190)
-MAKE_EXCEPTION_VECTOR(191)
-MAKE_EXCEPTION_VECTOR(192)
-MAKE_EXCEPTION_VECTOR(193)
-MAKE_EXCEPTION_VECTOR(194)
-MAKE_EXCEPTION_VECTOR(195)
-MAKE_EXCEPTION_VECTOR(196)
-MAKE_EXCEPTION_VECTOR(197)
-MAKE_EXCEPTION_VECTOR(198)
-MAKE_EXCEPTION_VECTOR(199)
-        
-MAKE_EXCEPTION_VECTOR(200)
-MAKE_EXCEPTION_VECTOR(201)
-MAKE_EXCEPTION_VECTOR(202)
-MAKE_EXCEPTION_VECTOR(203)
-MAKE_EXCEPTION_VECTOR(204)
-MAKE_EXCEPTION_VECTOR(205)
-MAKE_EXCEPTION_VECTOR(206)
-MAKE_EXCEPTION_VECTOR(207)
-MAKE_EXCEPTION_VECTOR(208)
-MAKE_EXCEPTION_VECTOR(209)
-                      
-MAKE_EXCEPTION_VECTOR(210)
-MAKE_EXCEPTION_VECTOR(211)
-MAKE_EXCEPTION_VECTOR(212)
-MAKE_EXCEPTION_VECTOR(213)
-MAKE_EXCEPTION_VECTOR(214)
-MAKE_EXCEPTION_VECTOR(215)
-MAKE_EXCEPTION_VECTOR(216)
-MAKE_EXCEPTION_VECTOR(217)
-MAKE_EXCEPTION_VECTOR(218)
-MAKE_EXCEPTION_VECTOR(219)
-                      
-MAKE_EXCEPTION_VECTOR(220)
-MAKE_EXCEPTION_VECTOR(221)
-MAKE_EXCEPTION_VECTOR(222)
-MAKE_EXCEPTION_VECTOR(223)
-MAKE_EXCEPTION_VECTOR(224)
-MAKE_EXCEPTION_VECTOR(225)
-MAKE_EXCEPTION_VECTOR(226)
-MAKE_EXCEPTION_VECTOR(227)
-MAKE_EXCEPTION_VECTOR(228)
-MAKE_EXCEPTION_VECTOR(229)
-                      
-MAKE_EXCEPTION_VECTOR(230)
-MAKE_EXCEPTION_VECTOR(231)
-MAKE_EXCEPTION_VECTOR(232)
-MAKE_EXCEPTION_VECTOR(233)
-MAKE_EXCEPTION_VECTOR(234)
-MAKE_EXCEPTION_VECTOR(235)
-MAKE_EXCEPTION_VECTOR(236)
-MAKE_EXCEPTION_VECTOR(237)
-MAKE_EXCEPTION_VECTOR(238)
-MAKE_EXCEPTION_VECTOR(239)
-                      
-MAKE_EXCEPTION_VECTOR(240)
-MAKE_EXCEPTION_VECTOR(241)
-MAKE_EXCEPTION_VECTOR(242)
-MAKE_EXCEPTION_VECTOR(243)
-MAKE_EXCEPTION_VECTOR(244)
-MAKE_EXCEPTION_VECTOR(245)
-MAKE_EXCEPTION_VECTOR(246)
-MAKE_EXCEPTION_VECTOR(247)
-MAKE_EXCEPTION_VECTOR(248)
-MAKE_EXCEPTION_VECTOR(249)
-                      
-MAKE_EXCEPTION_VECTOR(250)
-MAKE_EXCEPTION_VECTOR(251)
-MAKE_EXCEPTION_VECTOR(252)
-MAKE_EXCEPTION_VECTOR(253)
-MAKE_EXCEPTION_VECTOR(254)
-MAKE_EXCEPTION_VECTOR(255)                                
-
-|
-| Start
-|
-| Entered from a hardware reset.
-|
-        
-        .global start                           | Default entry point for GNU
-start:
-
-        move.w  #0x2700,%sr                     | Disable all interrupts
-
-        |
-        | Program the BAR, give us a stack !!
-        |
-
-        moveq   #0,%d0
-        move.w  #(MC68302_BASE >> 12),%d0
-        or.w    #(MC68302_BAR_FC_CFC << 12),%d0
-        move.l  #MC68302_BAR,%a0
-        move.w  %d0,%a0@(0)
-
-        |
-        | watch for sign extended maths with the linker on (boot_phase_1-V___ISSP)
-        | manage the address with code, limited address of 2K at reset for CS0
-        |
-        
-        move.l  #boot_phase_1,%d0
-        and.l   #0x1FFF,%d0
-        move.l  %d0,%a0
-        jsr     %a0@(0)                         | programs all basic 302 registers
-        
-        |
-        | Map to the 68302 registers
-        |
-        
-        move.l  #MC68302_BASE,%a5
-        
-        |
-        | Make a vector table in RAM
-        |
-        
-        move.l  #RAM_BASE,%a0                   | a0 -> rom vector table
-        moveal  #ROM_BASE,%a1                   | d1 -> start of tmp SRAM
-        
-        move.l  #255,%d0
-        
-copy_vec_table:
-
-        move.l  (%a0)+,%d1
-        or.l    #ROM_BASE,%d1
-        move.l  %d1,(%a1)+
-        subq.l  #1,%d0
-        bne     copy_vec_table
-
-#if defined(SYSTEM_TABLE_ANCHOR_OFFSET)        
-        |
-        | Clear the system table
-        |
-
-        move.l  #SYSTEM_TABLE_ANCHOR_OFFSET,%a0
-        move.l  #0,(%a0)
-#endif
-        
-        |
-        | Copy the chip select swap code to DPRAM and run it
-        |
-        
-        move.l  #boot_phase_2,%d0
-        and.l   #(ROM_SIZE - 1),%d0
-        move.l  %d0,%a0                         | a0 -> remap code
-        lea     %a5@(0),%a1                     | a1 -> internal system RAM
-
-        move.l  #boot_phase_3,%d0
-        and.l   #(ROM_SIZE - 1),%d0
-        sub.l   %a0,%d0
-        
-copy_remap:
-        move.b  (%a0)+,(%a1)+                   | copy
-        dbra    %d0,copy_remap
-
-        |
-        | Jump to the remap code in the 68302''s internal system RAM.
-        |
-
-        jsr     %a5@(0)                         | execute the swap code
-
-        |
-        | Map to the 68302 registers
-        |
-        
-        move.l  #MC68302_BASE,%a5
-        
-        |
-        | Copy initialized data area from ROM to RAM
-        |
-
-copy_data:
-        moveal  #etext,%a0                      | find the end of .text
-        moveal  #data_start,%a1                 | find the beginning of .data
-        moveal  #edata,%a2                      | find the end of .data
-        
-copy_data_loop:
-        
-        movel   %a0@+,%a1@+                     | copy the data
-        cmpal   %a2,%a1
-        jlt     copy_data_loop                  | loop until edata reached
-                                
-        |
-        | zero out uninitialized data area
-        |
-
-zerobss:
-        moveal  #end,%a0                        | find end of .bss
-        moveal  #bss_start,%a1                  | find beginning of .bss
-        moveq   #0,%d0
-        
-zerobss_loop:
-        
-        movel   %d0,%a1@+                       | to zero out uninitialized
-        cmpal   %a0,%a1
-        jlt     zerobss_loop                    | loop until _end reached
-
-        movel   #end,%d0                        | d0 = end of bss/start of heap
-        addl    #heap_size,%d0                  | d0 = end of heap
-
-        movel   %d0,stack_start                 | Save for brk() routine
-        addl    #stack_size,%d0                 | make room for stack
-        andl    #0xffffffc0,%d0                 | align it on 16 byte boundary
-
-        movw    #0x3700,%sr                     | SUPV MODE,INTERRUPTS OFF!!!
-        movel   %d0,%a7                         | set master stack pointer
-        movel   %d0,%a6                         | set base pointer
-
-        jsr     boot_phase_3
-
-|
-| Create an unhandled exception jump table. The table has an entry for
-| each vector in the vector table. The entry pushes the vector number onto
-| the stack and then calls a common exception handler using PIC.
-| 
-| The macros are to create the labels and format vectors.
-|
-                               
-#define cat(x, y) x ## y
-#define FORMAT_ID(n) (n << 2)
-#define EXCEPTION_HANDLER(h, n) EH__##n: move.w cat(h, FORMAT_ID(n)),-(%sp) ;  \
-                                        bra  common_exception_handler
-
-unhandled_exception:
-                
-EXCEPTION_HANDLER(#, 0)
-EXCEPTION_HANDLER(#, 1)
-EXCEPTION_HANDLER(#, 2)
-EXCEPTION_HANDLER(#, 3)
-EXCEPTION_HANDLER(#, 4)
-EXCEPTION_HANDLER(#, 5)
-EXCEPTION_HANDLER(#, 6)
-EXCEPTION_HANDLER(#, 7)
-EXCEPTION_HANDLER(#, 8)
-EXCEPTION_HANDLER(#, 9)
-        
-EXCEPTION_HANDLER(#, 10)
-EXCEPTION_HANDLER(#, 11)
-EXCEPTION_HANDLER(#, 12)
-EXCEPTION_HANDLER(#, 13)
-EXCEPTION_HANDLER(#, 14)
-EXCEPTION_HANDLER(#, 15)
-EXCEPTION_HANDLER(#, 16)
-EXCEPTION_HANDLER(#, 17)
-EXCEPTION_HANDLER(#, 18)
-EXCEPTION_HANDLER(#, 19)
-
-EXCEPTION_HANDLER(#, 20)
-EXCEPTION_HANDLER(#, 21)
-EXCEPTION_HANDLER(#, 22)
-EXCEPTION_HANDLER(#, 23)
-EXCEPTION_HANDLER(#, 24)
-EXCEPTION_HANDLER(#, 25)
-EXCEPTION_HANDLER(#, 26)
-EXCEPTION_HANDLER(#, 27)
-EXCEPTION_HANDLER(#, 28)
-EXCEPTION_HANDLER(#, 29)
-        
-EXCEPTION_HANDLER(#, 30)
-EXCEPTION_HANDLER(#, 31)
-EXCEPTION_HANDLER(#, 32)
-EXCEPTION_HANDLER(#, 33)
-EXCEPTION_HANDLER(#, 34)
-EXCEPTION_HANDLER(#, 35)
-EXCEPTION_HANDLER(#, 36)
-EXCEPTION_HANDLER(#, 37)
-EXCEPTION_HANDLER(#, 38)
-EXCEPTION_HANDLER(#, 39)
-        
-EXCEPTION_HANDLER(#, 40)
-EXCEPTION_HANDLER(#, 41)
-EXCEPTION_HANDLER(#, 42)
-EXCEPTION_HANDLER(#, 43)
-EXCEPTION_HANDLER(#, 44)
-EXCEPTION_HANDLER(#, 45)
-EXCEPTION_HANDLER(#, 46)
-EXCEPTION_HANDLER(#, 47)
-EXCEPTION_HANDLER(#, 48)
-EXCEPTION_HANDLER(#, 49)
-        
-EXCEPTION_HANDLER(#, 50)
-EXCEPTION_HANDLER(#, 51)
-EXCEPTION_HANDLER(#, 52)
-EXCEPTION_HANDLER(#, 53)
-EXCEPTION_HANDLER(#, 54)
-EXCEPTION_HANDLER(#, 55)
-EXCEPTION_HANDLER(#, 56)
-EXCEPTION_HANDLER(#, 57)
-EXCEPTION_HANDLER(#, 58)
-EXCEPTION_HANDLER(#, 59)
-        
-EXCEPTION_HANDLER(#, 60)
-EXCEPTION_HANDLER(#, 61)
-EXCEPTION_HANDLER(#, 62)
-EXCEPTION_HANDLER(#, 63)
-EXCEPTION_HANDLER(#, 64)
-EXCEPTION_HANDLER(#, 65)
-EXCEPTION_HANDLER(#, 66)
-EXCEPTION_HANDLER(#, 67)
-EXCEPTION_HANDLER(#, 68)
-EXCEPTION_HANDLER(#, 69)
-        
-EXCEPTION_HANDLER(#, 70)
-EXCEPTION_HANDLER(#, 71)
-EXCEPTION_HANDLER(#, 72)
-EXCEPTION_HANDLER(#, 73)
-EXCEPTION_HANDLER(#, 74)
-EXCEPTION_HANDLER(#, 75)
-EXCEPTION_HANDLER(#, 76)
-EXCEPTION_HANDLER(#, 77)
-EXCEPTION_HANDLER(#, 78)
-EXCEPTION_HANDLER(#, 79)
-        
-EXCEPTION_HANDLER(#, 80)
-EXCEPTION_HANDLER(#, 81)
-EXCEPTION_HANDLER(#, 82)
-EXCEPTION_HANDLER(#, 83)
-EXCEPTION_HANDLER(#, 84)
-EXCEPTION_HANDLER(#, 85)
-EXCEPTION_HANDLER(#, 86)
-EXCEPTION_HANDLER(#, 87)
-EXCEPTION_HANDLER(#, 88)
-EXCEPTION_HANDLER(#, 89)
-        
-EXCEPTION_HANDLER(#, 90)
-EXCEPTION_HANDLER(#, 91)
-EXCEPTION_HANDLER(#, 92)
-EXCEPTION_HANDLER(#, 93)
-EXCEPTION_HANDLER(#, 94)
-EXCEPTION_HANDLER(#, 95)
-EXCEPTION_HANDLER(#, 96)
-EXCEPTION_HANDLER(#, 97)
-EXCEPTION_HANDLER(#, 98)
-EXCEPTION_HANDLER(#, 99)
-        
-EXCEPTION_HANDLER(#, 100)
-EXCEPTION_HANDLER(#, 101)
-EXCEPTION_HANDLER(#, 102)
-EXCEPTION_HANDLER(#, 103)
-EXCEPTION_HANDLER(#, 104)
-EXCEPTION_HANDLER(#, 105)
-EXCEPTION_HANDLER(#, 106)
-EXCEPTION_HANDLER(#, 107)
-EXCEPTION_HANDLER(#, 108)
-EXCEPTION_HANDLER(#, 109)
-        
-EXCEPTION_HANDLER(#, 110)
-EXCEPTION_HANDLER(#, 111)
-EXCEPTION_HANDLER(#, 112)
-EXCEPTION_HANDLER(#, 113)
-EXCEPTION_HANDLER(#, 114)
-EXCEPTION_HANDLER(#, 115)
-EXCEPTION_HANDLER(#, 116)
-EXCEPTION_HANDLER(#, 117)
-EXCEPTION_HANDLER(#, 118)
-EXCEPTION_HANDLER(#, 119)
-
-EXCEPTION_HANDLER(#, 120)
-EXCEPTION_HANDLER(#, 121)
-EXCEPTION_HANDLER(#, 122)
-EXCEPTION_HANDLER(#, 123)
-EXCEPTION_HANDLER(#, 124)
-EXCEPTION_HANDLER(#, 125)
-EXCEPTION_HANDLER(#, 126)
-EXCEPTION_HANDLER(#, 127)
-EXCEPTION_HANDLER(#, 128)
-EXCEPTION_HANDLER(#, 129)
-        
-EXCEPTION_HANDLER(#, 130)
-EXCEPTION_HANDLER(#, 131)
-EXCEPTION_HANDLER(#, 132)
-EXCEPTION_HANDLER(#, 133)
-EXCEPTION_HANDLER(#, 134)
-EXCEPTION_HANDLER(#, 135)
-EXCEPTION_HANDLER(#, 136)
-EXCEPTION_HANDLER(#, 137)
-EXCEPTION_HANDLER(#, 138)
-EXCEPTION_HANDLER(#, 139)
-                       
-EXCEPTION_HANDLER(#, 140)
-EXCEPTION_HANDLER(#, 141)
-EXCEPTION_HANDLER(#, 142)
-EXCEPTION_HANDLER(#, 143)
-EXCEPTION_HANDLER(#, 144)
-EXCEPTION_HANDLER(#, 145)
-EXCEPTION_HANDLER(#, 146)
-EXCEPTION_HANDLER(#, 147)
-EXCEPTION_HANDLER(#, 148)
-EXCEPTION_HANDLER(#, 149)
-        
-EXCEPTION_HANDLER(#, 150)
-EXCEPTION_HANDLER(#, 151)
-EXCEPTION_HANDLER(#, 152)
-EXCEPTION_HANDLER(#, 153)
-EXCEPTION_HANDLER(#, 154)
-EXCEPTION_HANDLER(#, 155)
-EXCEPTION_HANDLER(#, 156)
-EXCEPTION_HANDLER(#, 157)
-EXCEPTION_HANDLER(#, 158)
-EXCEPTION_HANDLER(#, 159)
-                       
-EXCEPTION_HANDLER(#, 160)
-EXCEPTION_HANDLER(#, 161)
-EXCEPTION_HANDLER(#, 162)
-EXCEPTION_HANDLER(#, 163)
-EXCEPTION_HANDLER(#, 164)
-EXCEPTION_HANDLER(#, 165)
-EXCEPTION_HANDLER(#, 166)
-EXCEPTION_HANDLER(#, 167)
-EXCEPTION_HANDLER(#, 168)
-EXCEPTION_HANDLER(#, 169)
-        
-EXCEPTION_HANDLER(#, 170)
-EXCEPTION_HANDLER(#, 171)
-EXCEPTION_HANDLER(#, 172)
-EXCEPTION_HANDLER(#, 173)
-EXCEPTION_HANDLER(#, 174)
-EXCEPTION_HANDLER(#, 175)
-EXCEPTION_HANDLER(#, 176)
-EXCEPTION_HANDLER(#, 177)
-EXCEPTION_HANDLER(#, 178)
-EXCEPTION_HANDLER(#, 179)
-                       
-EXCEPTION_HANDLER(#, 180)
-EXCEPTION_HANDLER(#, 181)
-EXCEPTION_HANDLER(#, 182)
-EXCEPTION_HANDLER(#, 183)
-EXCEPTION_HANDLER(#, 184)
-EXCEPTION_HANDLER(#, 185)
-EXCEPTION_HANDLER(#, 186)
-EXCEPTION_HANDLER(#, 187)
-EXCEPTION_HANDLER(#, 188)
-EXCEPTION_HANDLER(#, 189)
-        
-EXCEPTION_HANDLER(#, 190)
-EXCEPTION_HANDLER(#, 191)
-EXCEPTION_HANDLER(#, 192)
-EXCEPTION_HANDLER(#, 193)
-EXCEPTION_HANDLER(#, 194)
-EXCEPTION_HANDLER(#, 195)
-EXCEPTION_HANDLER(#, 196)
-EXCEPTION_HANDLER(#, 197)
-EXCEPTION_HANDLER(#, 198)
-EXCEPTION_HANDLER(#, 199)
-        
-EXCEPTION_HANDLER(#, 200)
-EXCEPTION_HANDLER(#, 201)
-EXCEPTION_HANDLER(#, 202)
-EXCEPTION_HANDLER(#, 203)
-EXCEPTION_HANDLER(#, 204)
-EXCEPTION_HANDLER(#, 205)
-EXCEPTION_HANDLER(#, 206)
-EXCEPTION_HANDLER(#, 207)
-EXCEPTION_HANDLER(#, 208)
-EXCEPTION_HANDLER(#, 209)
-                      
-EXCEPTION_HANDLER(#, 210)
-EXCEPTION_HANDLER(#, 211)
-EXCEPTION_HANDLER(#, 212)
-EXCEPTION_HANDLER(#, 213)
-EXCEPTION_HANDLER(#, 214)
-EXCEPTION_HANDLER(#, 215)
-EXCEPTION_HANDLER(#, 216)
-EXCEPTION_HANDLER(#, 217)
-EXCEPTION_HANDLER(#, 218)
-EXCEPTION_HANDLER(#, 219)
-                      
-EXCEPTION_HANDLER(#, 220)
-EXCEPTION_HANDLER(#, 221)
-EXCEPTION_HANDLER(#, 222)
-EXCEPTION_HANDLER(#, 223)
-EXCEPTION_HANDLER(#, 224)
-EXCEPTION_HANDLER(#, 225)
-EXCEPTION_HANDLER(#, 226)
-EXCEPTION_HANDLER(#, 227)
-EXCEPTION_HANDLER(#, 228)
-EXCEPTION_HANDLER(#, 229)
-                      
-EXCEPTION_HANDLER(#, 230)
-EXCEPTION_HANDLER(#, 231)
-EXCEPTION_HANDLER(#, 232)
-EXCEPTION_HANDLER(#, 233)
-EXCEPTION_HANDLER(#, 234)
-EXCEPTION_HANDLER(#, 235)
-EXCEPTION_HANDLER(#, 236)
-EXCEPTION_HANDLER(#, 237)
-EXCEPTION_HANDLER(#, 238)
-EXCEPTION_HANDLER(#, 239)
-                      
-EXCEPTION_HANDLER(#, 240)
-EXCEPTION_HANDLER(#, 241)
-EXCEPTION_HANDLER(#, 242)
-EXCEPTION_HANDLER(#, 243)
-EXCEPTION_HANDLER(#, 244)
-EXCEPTION_HANDLER(#, 245)
-EXCEPTION_HANDLER(#, 246)
-EXCEPTION_HANDLER(#, 247)
-EXCEPTION_HANDLER(#, 248)
-EXCEPTION_HANDLER(#, 249)
-                      
-EXCEPTION_HANDLER(#, 250)
-EXCEPTION_HANDLER(#, 251)
-EXCEPTION_HANDLER(#, 252)
-EXCEPTION_HANDLER(#, 253)
-EXCEPTION_HANDLER(#, 254)
-EXCEPTION_HANDLER(#, 255)                                
-
-
-common_exception_handler: 
-
-        |
-        | Need to put the format/vector above the PC and status register
-        |
-
-        move.l  %d0,-(%sp)                      | free a register
-        move.w  4(%sp),%d0                      | get the format/vector id
-
-        |
-        | If a bus error or address error then trash the extra
-        | data saved on the stack
-        |
-
-        cmp.w   #0x0008,%d0
-        beq     ceh_10
-
-        cmp.w   #0x000C,%d0
-        beq     ceh_10
-
-        bra     ceh_20
-
-ceh_10:              
-
-        move.w  %d0,12(%sp)                     | need to move the format/id
-        move.l  (%sp)+,%d0                      | recover d0
-        addq    #8,%sp                          | trash the stack
-        move.l  %d0,-(%sp)                      | free a register, again
-        move.w  4(%sp),%d0                      | get the format/vector id
-
-ceh_20:
-
-        move.w  6(%sp),4(%sp)
-        move.w  8(%sp),6(%sp)
-        move.w  10(%sp),8(%sp)
-        move.w  %d0,10(%sp)                     | put the format/vector id
-        move.l  (%sp)+,%d0
-
-        |
-        | Save all the registers, pass control to a dump trace routine
-        |
-
-        movem.l %d0-%d7/%a0-%a7,%sp@-
-
-        |
-        | check to see if ROM is mapped to zero
-        |
-        
-        move.l  #trace_exception,%d1            | get the linked address
-        and.l   #(ROM_SIZE - 1),%d1             | obtain the offset into the ROM
-        lea.l   %pc@(0),%a0                     | were are we currently
-        move.l  %a0,%d0                         | need to use a data register
-        and.l   #~(ROM_SIZE - 1),%d0            | keep the top part of the address
-        or.l    %d1,%d0                         | apply it to the trace exception offset
-        move.l  %d0,%a0                         | need an address register for jumping
-        jsr     %a0@(0)
-
-ceh_30:                 
-        jmp     ceh_30
-|
-| The RAM based vector table
-|
-
-        .sect   .vtable
-
-        .global vector_table
-
-vector_table:   
-        .space  (256 * 4),0
-
-|                
-| Initialised data
-|
-
-        .sect   .data
-        
-        .global start_frame
-        
-start_frame:
-        .space  4,0
-
-        .global stack_start
-        
-stack_start:
-        .space  4,0
-
-|
-| Uninitialised data
-|
-
-        .sect   .bss
-        
-        .global environ
-        .align  2
-        
-environ:
-        .long   0
-
-        .global heap_size
-        .set    heap_size,0x2000
-
-        .global stack_size
-        .set    stack_size,0x1000
-
-
diff --git a/c/src/lib/libbsp/m68k/ods68302/startup/cpuboot.c b/c/src/lib/libbsp/m68k/ods68302/startup/cpuboot.c
deleted file mode 100644
index fd8a4146de..0000000000
--- a/c/src/lib/libbsp/m68k/ods68302/startup/cpuboot.c
+++ /dev/null
@@ -1,133 +0,0 @@
-/*****************************************************************************/
-/*
-  Boot the CPU.
-
-  Occurs in 3 phases for a 68302.
-
-  Phase 1.
-
-  Called as soon as able after reset. The BAR has been programed, and
-  a small stack exists in the DPRAM. All interrupts are masked, and
-  the processor is running in supervisor mode. No other hardware or
-  chip selects are active.
-
-  This phase programs the chip select registers, the parallel ports
-  are set into default configurations, and basic registers cleared or
-  reset. The leds are programmed to show the end of phase 1.
-
-  Phase 2.
-
-  This is a piece of code which is copied to DPRAM and executed. It
-  should not do any more thann is currently present. The return to ROM
-  is managed by modifing the return address. Again leds show the status.
-
-  Phase 3.
-
-  This code executes with a valid C environment. That is the data
-  section has been intialised and the bss section set to 0. This phase
-  performs any special card initialisation and then calls boot card.
-  
-  $Id$
-  
-*/
-/*****************************************************************************/
-
-#include <bsp.h>
-#include <m68302.h>
-#include <debugport.h>
-#include <crc.h>
-
-/*
-  Open the address, reset all registers
-  */
-
-void boot_phase_1()
-{
-  M302_SCR = SCR_DEFAULT;
-
-  WRITE_OR(CSEL_ROM, ROM_SIZE, ROM_WAIT_STATES, OR_MASK_RW, OR_MASK_FC);
-  WRITE_BR(CSEL_ROM, RAM_BASE, BR_READ_ONLY, BR_FC_NULL, BR_ENABLED);
-  WRITE_OR(CSEL_RAM, RAM_SIZE, RAM_WAIT_STATES, OR_MASK_RW, OR_MASK_FC);
-  WRITE_BR(CSEL_RAM, ROM_BASE, BR_READ_WRITE, BR_FC_NULL, BR_ENABLED);
-
-#if defined(CSEL_1)
-  WRITE_OR(CSEL_1, CSEL_1_SIZE, CSEL_1_WAIT_STATES, OR_MASK_RW, OR_MASK_FC);
-  WRITE_BR(CSEL_1, CSEL_1_BASE, BR_READ_WRITE, BR_FC_NULL, BR_ENABLED);
-#endif
-  
-#if defined(CSEL_2)
-  WRITE_OR(CSEL_2, CSEL_2_SIZE, CSEL_2_WAIT_STATES, OR_MASK_RW, OR_MASK_FC);
-  WRITE_BR(CSEL_2, CSEL_2_BASE, BR_READ_WRITE, BR_FC_NULL, BR_ENABLED);
-#endif
-  
-  m302.reg.gimr = m302.reg.ipr = m302.reg.imr = m302.reg.isr = 0;
-  
-  m302.reg.simode = 0;
-
-  m302.reg.pacnt = CARD_PA_CONFIGURATION;
-  m302.reg.paddr = CARD_PA_DEFAULT_DIRECTIONS;
-  m302.reg.padat = CARD_PA_DEFAULT_DATA;
-
-  m302.reg.pbcnt = CARD_PB_CONFIGURATION;
-  m302.reg.pbddr = CARD_PB_DEFAULT_DIRECTIONS;
-  m302.reg.pbdat = CARD_PB_DEFAULT_DATA;
-
-  m302.reg.wrr = WATCHDOG_TIMEOUT_PERIOD | WATCHDOG_ENABLE;
-
-#if defined(LED_CONTROL)
-  LED_CONTROL(LED_1_RED, LED_2_OFF, LED_3_OFF, LED_4_OFF,
-              LED_5_OFF, LED_6_OFF, LED_7_OFF, LED_8_OFF);
-#endif  
-}
-
-/*
-  Swap the chip select mapping for ROM and RAM
-  */
-
-void boot_phase_2(void)
-{
-  rtems_unsigned32 stack;
-  
-#if defined(LED_CONTROL)
-  LED_CONTROL(LED_1_RED, LED_2_RED, LED_3_OFF, LED_4_OFF,
-              LED_5_OFF, LED_6_OFF, LED_7_OFF, LED_8_OFF);
-#endif
-  
-  WRITE_BR(CSEL_ROM, ROM_BASE, BR_READ_ONLY, BR_FC_NULL, BR_ENABLED);
-  WRITE_BR(CSEL_RAM, RAM_BASE, BR_READ_WRITE, BR_FC_NULL, BR_ENABLED);
-  
-#if defined(LED_CONTROL)
-  LED_CONTROL(LED_1_GREEN, LED_2_RED, LED_3_OFF, LED_4_OFF,
-              LED_5_OFF, LED_6_OFF, LED_7_OFF, LED_8_OFF);
-#endif
-
-  /* seems to want 2, looked at assember code output */
-  *(&stack + 2) |= ROM_BASE;
-}
-
-/*
-  Any pre-main initialisation, the C environment is setup, how-ever C++
-  static constructors have not been called, and RTEMS is not initialised.
-  */
-
-void boot_card();
-void set_debug_traps();
-void breakpoint();
-
-void boot_phase_3(void)
-{
-  if (GDB_RUN_MONITOR())
-  {
-    set_debug_traps();
-    breakpoint();
-  }
-  
-  debug_port_banner();
-  
-  /* FIXME : add RAM and ROM checks */
-  
-  /* boot the bsp, what ever this means */
-  boot_card();
-
-  WATCHDOG_TRIGGER();
-}
diff --git a/c/src/lib/libbsp/mips/README b/c/src/lib/libbsp/mips/README
deleted file mode 100644
index 7f16e33d39..0000000000
--- a/c/src/lib/libbsp/mips/README
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-#  $Id$
-#
-
-The MIPS bsp are now called p4600 and p4650, referring to which cpu they use.
-The same bsp sub-directory can be used, the cpu is selected by the bsp
-specific makefiles (p4600.cfg and p4650.cfg).
diff --git a/c/src/lib/libbsp/mips/p4000/README b/c/src/lib/libbsp/mips/p4000/README
deleted file mode 100644
index 361366d01d..0000000000
--- a/c/src/lib/libbsp/mips/p4000/README
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-#  $Id$
-#
-# @(#)README        08/20/96     1.2
-#
-
-BSP NAME:           p4000
-BOARD:              Algorithmics P4000 SBC
-BUS:                N/A
-CPU FAMILY:         mips
-CPU:                IDT 4650 
-COPROCESSORS:       N/A
-MODE:               32 bit mode
-
-DEBUG MONITOR:      IDT/SIM
-
-PERIPHERALS
-===========
-TIMERS:             4650 internal
-  RESOLUTION:         half of internal clock frequency
-SERIAL PORTS:       IDT/SIM controlled
-REAL-TIME CLOCK:    none
-DMA:                none
-VIDEO:              none
-SCSI:               none
-NETWORKING:         none
-
-DRIVER INFORMATION
-==================
-CLOCK DRIVER:       4650 internal
-IOSUPP DRIVER:      N/A
-SHMSUPP:            N/A 
-TIMER DRIVER:       4650 internal
-TTY DRIVER:         uses IDT/SIM
-
-STDIO
-=====
-PORT:               Console port 0
-ELECTRICAL:         RS-232
-BAUD:               9600
-BITS PER CHARACTER: 8
-PARITY:             None
-STOP BITS:          1
-
-NOTES
-=====
-
diff --git a/c/src/lib/libbsp/mips/p4000/bsp_specs b/c/src/lib/libbsp/mips/p4000/bsp_specs
deleted file mode 100644
index 3f488f47b6..0000000000
--- a/c/src/lib/libbsp/mips/p4000/bsp_specs
+++ /dev/null
@@ -1,23 +0,0 @@
-%rename cpp old_cpp
-%rename lib old_lib
-%rename endfile old_endfile
-%rename startfile old_startfile
-%rename link old_link
-
-*cpp:
-%(old_cpp) %{qrtems: -D__embedded__} -Asystem(embedded)
-
-*lib:
-%{!qrtems: %(old_lib)} %{qrtems: --start-group \
-%{!qrtems_debug: -lrtemsall} %{qrtems_debug: -lrtemsall_g} \
--lc -lgcc --end-group \
-%{!qnolinkcmds: -T linkcmds%s}}
-
-*startfile:
-%{!qrtems: %(old_startfile)} %{qrtems: \
-%{!qrtems_debug: idt_csu.o%s} \
-%{qrtems_debug: idt_csu_g.o%s}}
-
-*link:
-%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start}
-
diff --git a/c/src/lib/libbsp/mips/p4000/console/console.c b/c/src/lib/libbsp/mips/p4000/console/console.c
deleted file mode 100644
index c862c91cfa..0000000000
--- a/c/src/lib/libbsp/mips/p4000/console/console.c
+++ /dev/null
@@ -1,275 +0,0 @@
-/*
- *  This file contains the IDT 4650 console IO package.
- *
- *  Author:     Craig Lebakken <craigl@transition.com>
- *
- *  COPYRIGHT (c) 1996 by Transition Networks Inc.
- *
- *  To anyone who acknowledges that this file is provided "AS IS"
- *  without any express or implied warranty:
- *      permission to use, copy, modify, and distribute this file
- *      for any purpose is hereby granted without fee, provided that
- *      the above copyright notice and this notice appears in all
- *      copies, and that the name of Transition Networks not be used in
- *      advertising or publicity pertaining to distribution of the
- *      software without specific, written prior permission.
- *      Transition Networks makes no representations about the suitability
- *      of this software for any purpose.
- *
- *  Derived from c/src/lib/libbsp/no_cpu/no_bsp/console/console.c:
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-/*
- *  Rather than deleting this, it is commented out to (hopefully) help
- *  the submitter send updates.
- *
- *  static char _sccsid[] = "@(#)console.c 08/20/96     1.6\n";
- */
-
-
-
-#include <bsp.h>
-#include <rtems/libio.h>
-#include <ctype.h>
-
-char idtsim_getchar( void );
-void idtsim_putchar( char c );
-void mips_leddisplay( char a, char b, char c, char d );
-
-
-/*  console_initialize
- *
- *  This routine initializes the console IO driver.
- *
- *  Input parameters: NONE
- *
- *  Output parameters:  NONE
- *
- *  Return values:
- */
-
-rtems_device_driver console_initialize(
-  rtems_device_major_number  major,
-  rtems_device_minor_number  minor,
-  void                      *arg
-)
-{
-  rtems_status_code status;
- 
-  status = rtems_io_register_name(
-    "/dev/console",
-    major,
-    (rtems_device_minor_number) 0
-  );
- 
-  if (status != RTEMS_SUCCESSFUL)
-    rtems_fatal_error_occurred(status);
- 
-  return RTEMS_SUCCESSFUL;
-}
-
-
-/*  is_character_ready
- *
- *  This routine returns TRUE if a character is available.
- *
- *  Input parameters: NONE
- *
- *  Output parameters:  NONE
- *
- *  Return values:
- */
-
-rtems_boolean is_character_ready(
-  char *ch
-)
-{
-  *ch = '\0';   /* return NULL for no particular reason */
-  return(TRUE);
-}
-
-/*  inbyte
- *
- *  This routine reads a character from the SOURCE.
- *
- *  Input parameters: NONE
- *
- *  Output parameters:  NONE
- *
- *  Return values:
- *    character read from SOURCE
- */
-
-char inbyte( void )
-{
-  /*
-   *  If polling, wait until a character is available.
-   */
-
-   return idtsim_getchar();
-}
-
-/*  outbyte
- *
- *  This routine transmits a character out the SOURCE.  It may support
- *  XON/XOFF flow control.
- *
- *  Input parameters:
- *    ch  - character to be transmitted
- *
- *  Output parameters:  NONE
- */
-
-void outbyte(
-  char ch
-)
-{
-#define NUM_LEDS 4
-   static unsigned int cur_led = 0;
-   static unsigned char led_chars[NUM_LEDS];
-
-  /*
-   *  If polling, wait for the transmitter to be ready.
-   *  Check for flow control requests and process.
-   *  Then output the character.
-   */
-
-  idtsim_putchar( ch );
-
-  /* print out first four alpha numeric characters in a line */
-  if ( ch == '\n' )
-  {
-    mips_leddisplay( led_chars[0], led_chars[1], led_chars[2], led_chars[3] );
-    cur_led = 0;
-  }
-  else if ( isalnum( (unsigned char) ch ) && cur_led < NUM_LEDS )
-  {
-    led_chars[cur_led++] = ch;
-  }
-
-}
-
-
-#if 0
-static int console_fd = -1;
-#endif
-
-/*
- *  Open entry point
- */
-
-rtems_device_driver console_open(
-  rtems_device_major_number major,
-  rtems_device_minor_number minor,
-  void                    * arg
-)
-{
-#if 0
-  int console_fd = open("tty0", 2); /* open for read/write */
-#endif
-  return RTEMS_SUCCESSFUL;
-}
- 
-/*
- *  Close entry point
- */
-
-rtems_device_driver console_close(
-  rtems_device_major_number major,
-  rtems_device_minor_number minor,
-  void                    * arg
-)
-{
-#if 0
-  if ( console_fd )
-    close( console_fd );
-#endif
-  return RTEMS_SUCCESSFUL;
-}
-
-/*
- * read bytes from the serial port. We only have stdin.
- */
-
-rtems_device_driver console_read(
-  rtems_device_major_number major,
-  rtems_device_minor_number minor,
-  void                    * arg
-)
-{
-  rtems_libio_rw_args_t *rw_args;
-  char *buffer;
-  int maximum;
-  int count = 0;
- 
-  rw_args = (rtems_libio_rw_args_t *) arg;
-
-  buffer = rw_args->buffer;
-  maximum = rw_args->count;
-
-  for (count = 0; count < maximum; count++) {
-    buffer[ count ] = inbyte();
-    if (buffer[ count ] == '\n' || buffer[ count ] == '\r') {
-      buffer[ count++ ]  = '\n';
-      break;
-    }
-  }
-
-  rw_args->bytes_moved = count;
-  return (count >= 0) ? RTEMS_SUCCESSFUL : RTEMS_UNSATISFIED;
-}
-
-/*
- * write bytes to the serial port. Stdout and stderr are the same. 
- */
-
-rtems_device_driver console_write(
-  rtems_device_major_number major,
-  rtems_device_minor_number minor,
-  void                    * arg
-)
-{
-  int count;
-  int maximum;
-  rtems_libio_rw_args_t *rw_args;
-  char *buffer;
-
-  rw_args = (rtems_libio_rw_args_t *) arg;
-
-  buffer = rw_args->buffer;
-  maximum = rw_args->count;
-
-  for (count = 0; count < maximum; count++) {
-    if ( buffer[ count ] == '\n') {
-      outbyte('\r');
-    }
-    outbyte( buffer[ count ] );
-  }
-
-  rw_args->bytes_moved = maximum;
-  return 0;
-}
-
-/*
- *  IO Control entry point
- */
-
-rtems_device_driver console_control(
-  rtems_device_major_number major,
-  rtems_device_minor_number minor,
-  void                    * arg
-)
-{
-  return RTEMS_SUCCESSFUL;
-}
diff --git a/c/src/lib/libbsp/mips/p4000/console/led.S b/c/src/lib/libbsp/mips/p4000/console/led.S
deleted file mode 100644
index e62b82e041..0000000000
--- a/c/src/lib/libbsp/mips/p4000/console/led.S
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- *  $Id$
- */
-
-#include <rtems/score/iregdef.h>
-#include <rtems/score/idtmon.h>
-#include <rtems/score/idtcpu.h>
-
-
-FRAME(mips_leddisplay,sp,0,ra)
-	j ra
-	nop
-ENDFRAME(mips_leddisplay)
-
-FRAME(sbddisplay,sp,0,ra)
-	j	ra
-ENDFRAME(sbddisplay)
-
-
-FRAME(sbdblank,sp,0,ra)
-	j	ra
-ENDFRAME(sbdblank)
-
diff --git a/c/src/lib/libbsp/mips/p4000/include/bsp.h b/c/src/lib/libbsp/mips/p4000/include/bsp.h
deleted file mode 100644
index da700b8dba..0000000000
--- a/c/src/lib/libbsp/mips/p4000/include/bsp.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/*  bsp.h
- *
- *  This include file contains all board IO definitions.
- *
- *  XXX : put yours in here
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-/* @(#)bsp.h       03/15/96     1.1 */
-
-#ifndef __P4000_BSP_h
-#define __P4000_BSP_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems.h>
-#include <console.h>
-#include <clockdrv.h>
-
-extern void WriteDisplay( char * string );
-
-/*
- *  Define the time limits for RTEMS Test Suite test durations.
- *  Long test and short test duration limits are provided.  These
- *  values are in seconds and need to be converted to ticks for the
- *  application.
- *
- */
-
-#define MAX_LONG_TEST_DURATION       300 /* 5 minutes = 300 seconds */
-#define MAX_SHORT_TEST_DURATION      3   /* 3 seconds */
-
-/*
- *  Stuff for Time Test 27
- */
-
-#define MUST_WAIT_FOR_INTERRUPT 0
-
-#define Install_tm27_vector( handler ) set_vector( (handler), 0, 1 )
-
-#define Cause_tm27_intr()
-
-#define Clear_tm27_intr()
-
-#define Lower_tm27_intr()
-
-extern unsigned32 mips_get_timer( void );
-
-#define CPU_CLOCK_RATE_MHZ     (50)
-#define CLOCKS_PER_MICROSECOND ( CPU_CLOCK_RATE_MHZ ) /* equivalent to CPU clock speed in MHz */
-
-/*
- *  Simple spin delay in microsecond units for device drivers.
- *  This is very dependent on the clock speed of the target.
- *
- *  NOTE: This macro generates a warning like "integer constant out 
- *        of range" which is safe to ignore.  In 64 bit mode, unsigned32
- *        types are actually 64 bits long so that comparisons between
- *        unsigned32 types and pointers are valid.  The warning is caused
- *        by code in the delay macro that is necessary for 64 bit mode.
- */
-
-#define delay( microseconds ) \
-  { \
-     unsigned32 _end_clock = mips_get_timer() + microseconds * CLOCKS_PER_MICROSECOND; \
-     _end_clock %= 0x100000000;  /* make sure result is 32 bits */ \
-     \
-     /* handle timer overflow, if necessary */ \
-     while ( _end_clock < mips_get_timer() );  \
-     \
-     while ( _end_clock > mips_get_timer() ); \
-  }
-
-/* Constants */
-
-#define RAM_START 0
-#define RAM_END   0x100000
-
-/* miscellaneous stuff assumed to exist */
-
-extern rtems_configuration_table BSP_Configuration;
-
-/*
- *  Device Driver Table Entries
- */
-
-/*
- * NOTE: Use the standard Console driver entry
- */
- 
-/*
- * NOTE: Use the standard Clock driver entry
- */
-
-/* miscellaneous stuff assumed to exist */
-
-mips_isr_entry set_vector(                      /* returns old vector */
-  rtems_isr_entry     handler,                  /* isr routine        */
-  rtems_vector_number vector,                   /* vector number      */
-  int                 type                      /* RTEMS or RAW intr  */
-);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/c/src/lib/libbsp/mips/p4000/include/coverhd.h b/c/src/lib/libbsp/mips/p4000/include/coverhd.h
deleted file mode 100644
index aca390463b..0000000000
--- a/c/src/lib/libbsp/mips/p4000/include/coverhd.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/*  coverhd.h
- *
- *  This include file has defines to represent the overhead associated
- *  with calling a particular directive from C.  These are used in the
- *  Timing Test Suite to ignore the overhead required to pass arguments
- *  to directives.  On some CPUs and/or target boards, this overhead
- *  is significant and makes it difficult to distinguish internal
- *  RTEMS execution time from that used to call the directive.
- *  This file should be updated after running the C overhead timing
- *  test.  Once this update has been performed, the RTEMS Time Test
- *  Suite should be rebuilt to account for these overhead times in the
- *  timing results.
- *
- *  NOTE:  If these are all zero, then the times reported include
- *         all calling overhead including passing of arguments.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-/* @(#)coverhd.h       04/08/96     1.3 */
-
-#ifndef __COVERHD_h
-#define __COVERHD_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define CALLING_OVERHEAD_INITIALIZE_EXECUTIVE      5
-#define CALLING_OVERHEAD_SHUTDOWN_EXECUTIVE        4
-#define CALLING_OVERHEAD_TASK_CREATE               6
-#define CALLING_OVERHEAD_TASK_IDENT                4
-#define CALLING_OVERHEAD_TASK_START                5
-#define CALLING_OVERHEAD_TASK_RESTART              4
-#define CALLING_OVERHEAD_TASK_DELETE               4
-#define CALLING_OVERHEAD_TASK_SUSPEND              4
-#define CALLING_OVERHEAD_TASK_RESUME               4
-#define CALLING_OVERHEAD_TASK_SET_PRIORITY         5
-#define CALLING_OVERHEAD_TASK_MODE                 4
-#define CALLING_OVERHEAD_TASK_GET_NOTE             5
-#define CALLING_OVERHEAD_TASK_SET_NOTE             5
-#define CALLING_OVERHEAD_TASK_WAKE_WHEN            9
-#define CALLING_OVERHEAD_TASK_WAKE_AFTER           4
-#define CALLING_OVERHEAD_INTERRUPT_CATCH           5
-#define CALLING_OVERHEAD_CLOCK_GET                 9
-#define CALLING_OVERHEAD_CLOCK_SET                 8
-#define CALLING_OVERHEAD_CLOCK_TICK                3
-
-#define CALLING_OVERHEAD_TIMER_CREATE              4
-#define CALLING_OVERHEAD_TIMER_IDENT               4
-#define CALLING_OVERHEAD_TIMER_DELETE              4
-#define CALLING_OVERHEAD_TIMER_FIRE_AFTER          6
-#define CALLING_OVERHEAD_TIMER_FIRE_WHEN           10
-#define CALLING_OVERHEAD_TIMER_RESET               4
-#define CALLING_OVERHEAD_TIMER_CANCEL              4
-#define CALLING_OVERHEAD_SEMAPHORE_CREATE          5
-#define CALLING_OVERHEAD_SEMAPHORE_IDENT           4
-#define CALLING_OVERHEAD_SEMAPHORE_DELETE          4
-#define CALLING_OVERHEAD_SEMAPHORE_OBTAIN          5
-#define CALLING_OVERHEAD_SEMAPHORE_RELEASE         4
-#define CALLING_OVERHEAD_MESSAGE_QUEUE_CREATE      5
-#define CALLING_OVERHEAD_MESSAGE_QUEUE_IDENT       4
-#define CALLING_OVERHEAD_MESSAGE_QUEUE_DELETE      4
-#define CALLING_OVERHEAD_MESSAGE_QUEUE_SEND        4
-#define CALLING_OVERHEAD_MESSAGE_QUEUE_URGENT      4
-#define CALLING_OVERHEAD_MESSAGE_QUEUE_BROADCAST   5
-#define CALLING_OVERHEAD_MESSAGE_QUEUE_RECEIVE     5
-#define CALLING_OVERHEAD_MESSAGE_QUEUE_FLUSH       4
-
-#define CALLING_OVERHEAD_EVENT_SEND                4
-#define CALLING_OVERHEAD_EVENT_RECEIVE             5
-#define CALLING_OVERHEAD_SIGNAL_CATCH              5
-#define CALLING_OVERHEAD_SIGNAL_SEND               4
-#define CALLING_OVERHEAD_PARTITION_CREATE          6
-#define CALLING_OVERHEAD_PARTITION_IDENT           4
-#define CALLING_OVERHEAD_PARTITION_DELETE          4
-#define CALLING_OVERHEAD_PARTITION_GET_BUFFER      4
-#define CALLING_OVERHEAD_PARTITION_RETURN_BUFFER   4
-#define CALLING_OVERHEAD_REGION_CREATE             6
-#define CALLING_OVERHEAD_REGION_IDENT              4
-#define CALLING_OVERHEAD_REGION_DELETE             4
-#define CALLING_OVERHEAD_REGION_GET_SEGMENT        5
-#define CALLING_OVERHEAD_REGION_RETURN_SEGMENT     4
-#define CALLING_OVERHEAD_PORT_CREATE               6
-#define CALLING_OVERHEAD_PORT_IDENT                4
-#define CALLING_OVERHEAD_PORT_DELETE               4
-#define CALLING_OVERHEAD_PORT_EXTERNAL_TO_INTERNAL 4
-#define CALLING_OVERHEAD_PORT_INTERNAL_TO_EXTERNAL 4
-
-#define CALLING_OVERHEAD_IO_INITIALIZE             5
-#define CALLING_OVERHEAD_IO_OPEN                   5
-#define CALLING_OVERHEAD_IO_CLOSE                  5
-#define CALLING_OVERHEAD_IO_READ                   5
-#define CALLING_OVERHEAD_IO_WRITE                  5
-#define CALLING_OVERHEAD_IO_CONTROL                5
-#define CALLING_OVERHEAD_FATAL_ERROR_OCCURRED      4
-#define CALLING_OVERHEAD_RATE_MONOTONIC_CREATE     4
-#define CALLING_OVERHEAD_RATE_MONOTONIC_IDENT      4
-#define CALLING_OVERHEAD_RATE_MONOTONIC_DELETE     4
-#define CALLING_OVERHEAD_RATE_MONOTONIC_CANCEL     4
-#define CALLING_OVERHEAD_RATE_MONOTONIC_PERIOD     4
-#define CALLING_OVERHEAD_MULTIPROCESSING_ANNOUNCE  3
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/c/src/lib/libbsp/mips/p4000/liblnk/lnklib.S b/c/src/lib/libbsp/mips/p4000/liblnk/lnklib.S
deleted file mode 100644
index ae2509ce3c..0000000000
--- a/c/src/lib/libbsp/mips/p4000/liblnk/lnklib.S
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- *  $Id$
- */
-
-#include <rtems/score/iregdef.h>
-#include <rtems/score/idtcpu.h>
-
-#define FRAME(name,frm_reg,offset,ret_reg)      \
-        .globl  name;                           \
-        .ent    name;                           \
-name:;                                          \
-        .frame  frm_reg,offset,ret_reg
-
-#define ENDFRAME(name)                          \
-        .end name
-
-#define PROM_LINK(name,entry)           \
-        .globl  name;                   \
-        .ent    name;                   \
-name:   la      $2,+entry;              \
-        j       $2;                     \
-        .end name
-
-#define	PROM_ENTRY(x)	(0xbfc00000+((x)*8))
-
-#define PROM_RESET	PROM_ENTRY(0)
-#define PROM_NOT_IMP	PROM_ENTRY(1)
-#define PROM_RESTART	PROM_ENTRY(2)
-#define PROM_REINIT	PROM_ENTRY(3)
-#define	PROM_GETCHAR	PROM_ENTRY(11)
-#define	PROM_PUTCHAR	PROM_ENTRY(12)
-#define	PROM_SHOWCHAR	PROM_ENTRY(13)
-#define	PROM_PRINTF	PROM_ENTRY(16)
-#define	PROM_RETURN	PROM_ENTRY(17)
-
-#define	PROM_RGETS	PROM_ENTRY(25)
-#define PROM_FLUSHCACHE	PROM_ENTRY(28)
-#define PROM_CLEARCACHE	PROM_ENTRY(29)
-#define PROM_SETJMP	PROM_ENTRY(30)
-#define PROM_LONGJMP	PROM_ENTRY(31)
-
-	.text
-
-PROM_LINK(idtsim_putchar, PROM_PUTCHAR)
-PROM_LINK(idtsim_getchar, PROM_GETCHAR)
-PROM_LINK(idtsim_showchar, PROM_SHOWCHAR)
-PROM_LINK(idtsim__exit, PROM_RETURN)
-PROM_LINK(idtsim_reinit, PROM_REINIT)
-PROM_LINK(idtsim_restart, PROM_RESTART)
-PROM_LINK(idtsim_reset, PROM_RESET)
-PROM_LINK(idtsim_promexit, PROM_RETURN)
-PROM_LINK(idtsim_setjmp, PROM_SETJMP)
-PROM_LINK(idtsim_longjmp, PROM_LONGJMP)
-
-FRAME(idtsim_init_sbrk,sp,0,ra)
-	j	ra
-ENDFRAME(idtsim_init_sbrk)
-
-FRAME(idtsim_init_file,sp,0,ra)
-	j	ra
-ENDFRAME(idtsim_init_file)
-
diff --git a/c/src/lib/libbsp/mips/p4000/start/start.S b/c/src/lib/libbsp/mips/p4000/start/start.S
deleted file mode 100644
index 8dc31c8999..0000000000
--- a/c/src/lib/libbsp/mips/p4000/start/start.S
+++ /dev/null
@@ -1,299 +0,0 @@
-/*
-
-Based upon IDT provided code with the following release:
-
-This source code has been made available to you by IDT on an AS-IS
-basis. Anyone receiving this source is licensed under IDT copyrights
-to use it in any way he or she deems fit, including copying it,
-modifying it, compiling it, and redistributing it either with or
-without modifications.  No license under IDT patents or patent
-applications is to be implied by the copyright license.
-
-Any user of this software should understand that IDT cannot provide
-technical support for this software and will not be responsible for
-any consequences resulting from the use of this software.
-
-Any person who transfers this source code or any derivative work must
-include the IDT copyright notice, this paragraph, and the preceeding
-two paragraphs in the transferred software.
-
-COPYRIGHT IDT CORPORATION 1996
-LICENSED MATERIAL - PROGRAM PROPERTY OF IDT
-
-  $Id$
-*/ 
-
-/*************************************************************************
-**
-** Copyright 1991-95 Integrated Device Technology, Inc.
-**	All Rights Reserved
-**
-** idt_csu.S -- IDT stand alone startup code
-**
-**************************************************************************/
-#include <rtems/score/iregdef.h>
-#include <rtems/score/idtcpu.h>
-#include <rtems/score/idtmon.h>
-
-
-.extern _fbss,4		  /* this is defined by the linker */
-.extern end,4		  /* this is defined by the linker */
-
-.lcomm sim_mem_cfg_struct,12
-
-	.text
-
-
-#define TMP_STKSIZE  1024 
-
-/**************************************************************************
-**
-**  start - Typicl standalone start up code required for R3000/R4000
-**
-**
-**	1)  Initialize the STATUS Register
-**		a) Clear parity error bit
-**		b) Set co_processor 1 usable bit ON
-**		c) Clear all IntMask Enables
-**		d) Set kernel/disabled mode
-**	2)  Initialize Cause Register
-**		a)  clear software interrupt bits       
-**	3)  Determine FPU installed or not
-**		if not, clear CoProcessor 1 usable bit
-**	4)  Clear bss area
-**	5)  MUST allocate temporary stack until memory size determined
-**	    It MUST be uncached to prevent overwriting when caches are cleared
-**	6)  Install exception handlers
-**	7)  Determine memory and cache sizes
-**	8)  Establish permanent stack (cached or uncached as defined by bss)
-**	9)  Flush Instruction and Data caches
-** 	10)  If there is a Translation Lookaside Buffer, Clear the TLB
-** 	11)  Execute initialization code if the IDT/c library is to be used
-** 
-** 	12)  Jump to user's "main()"
-** 	13)  Jump to promexit
-**
-**	IDT/C 5.x defines _R3000, IDT/C 6.x defines _R4000 internally. 
-**	This is used to mark code specific to R3xxx or R4xxx processors.
-**	IDT/C 6.x defines __mips to be the ISA level for which we're 
-**	generating code. This is used to make sure the stack etc. is 
-**	double word aligned, when using -mips3 (default) or -mips2, 
-**	when compiling with IDT/C6.x
-**
-***************************************************************************/
-
-FRAME(start,sp,0,ra)
-
-	.set	noreorder
-#ifdef _R3000
-	li	v0,SR_PE|SR_CU1        /* reset parity error and set */
-					/* cp1 usable */
-#endif
-#ifdef _R4000
-#if __mips==3 || defined(R4650)
-	li	v0,SR_CU1|SR_DE|SR_FR 	/* initally clear ERL, enable FPA 64bit regs*/
-	                                /* 4650: Need fr to be set anyway */
-#else
-	li	v0,SR_CU1|SR_DE 	/* initally clear ERL, enable FPA 32bit regs*/
-#endif mips3
-#endif
-
-	mtc0	v0,C0_SR		/* clr IntMsks/ kernel/disabled mode */
-	nop
-	mtc0	zero,C0_CAUSE		/* clear software interrupts */
-	nop
-
-#ifdef _R4000
-	li	v0,CFG_C_NONCOHERENT	# initialise default cache mode
-	mtc0	v0,C0_CONFIG
-#endif
-
-/*
-**	check to see if an fpu is really plugged in 
-*/
-	li	t3,0xaaaa5555		/*  put a's and 5's in t3	*/
-	mtc1	t3,fp0			/* try to write them into fp0   */	
-	mtc1	zero,fp1		/* try to write zero in fp	*/
-	mfc1	t0,fp0
-	mfc1	t1,fp1
-	nop
-	bne	t0,t3,1f		/* branch if no match  */
-	nop
-	bne	t1,zero,1f		/* double check for positive id   */
-	nop
-	/* We have a FPU. clear fcsr */
-	ctc1	zero, fcr31
-	j	2f			/* status register already correct  */
-	nop
-1:
-#ifdef _R3000
-	li	v0, SR_PE		/* reset parity error/NO cp1 usable */
-#endif
-
-#ifdef _R4000
-        li      v0,SR_DE 		/* clear ERL and disable FPA */
-#endif
-
-	mtc0	v0, C0_SR		/* reset status register */
-2:
-	la  	gp, _gp			
-
-	la	v0,_fbss 		/* clear bss before using it */
-	la	v1,end 			/* end of bss */
-3:	sw	zero,0(v0)
-	bltu	v0,v1,3b
-	add	v0,4 
-
-
-/************************************************************************
-**
-** 	Temporary Stack - needed to  handle stack saves until
-**			  memory size is determined and permanent stack set
-**
-**			  MUST be uncached to avoid confusion at cache
-**			       switching during memory sizing
-**
-*************************************************************************/
-#if __mips==3
-	/* For MIPS 3, we need to be sure that the stack is aligned on a
-	 * double word boundary. 
-	 */
-	andi	t0, v0, 0x7
-	beqz	t0, 11f   /* Last three bits Zero, already aligned */
-	nop
-	add	v0, 4
-11:
-#endif
-
-	or	v0, K1BASE		/* switch to uncached */
-	add	v1, v0, TMP_STKSIZE 	/* end of bss + length of tmp stack */
-	sub	v1, v1, (4*4)		/* overhead */
-	move	sp, v1			/* set sp to top of stack */
-4:	sw	zero, 0(v0)  
-	bltu	v0, v1, 4b		/* clear out temp stack */
-	add	v0, 4 
-	
-	jal	init_exc_vecs		/* install exception handlers */ 
-	nop				/* MUST do before memory probes */
-
-	la	v0, 5f
-	li	v1, K1BASE		/* force into uncached space */
-	or	v0, v1			/* during memory/cache probes */
-	j	v0
-	nop
-5:
-	la	a0, sim_mem_cfg_struct
-	jal	sim_mem_cfg		/* Make SIM call to get mem size */
-	nop
-	la	a0, sim_mem_cfg_struct
-	lw	a0, 0(a0)		/* Get memory size from struct */
-#ifdef _R3000
-	jal	config_Icache
-	nop
-	jal	config_Dcache		/* determine size of D & I caches */
-	nop	
-#endif
-#ifdef _R4000
-	jal	config_cache		/* determine size of D & I caches */
-	nop
-#endif
-
-	move	v0, a0			/* mem_size */
-
-#if __mips==3
-	/* For MIPS 3, we need to be sure that the stack (and hence v0
-	 * here) is aligned on a double word boundary. 
-	 */
-	andi	t0, v0, 0x7
-	beqz	t0, 12f   /* Last three bits Zero, already aligned */
-	nop
-	subu	v0, 4	/* mem_size was not aligned on doubleword bdry????*/
-12:
-#endif
-
-
-
-/**************************************************************************
-**
-**  Permanent Stack - now know top of memory, put permanent stack there	
-**
-***************************************************************************/ 
-
-	la	t2, _fbss		/* cache mode as linked */
-	and	t2, 0xF0000000		/* isolate segment */
-	la	t1, 6f
-	j	t1			/* back to original cache mode */
-	nop
-6:
-	or 	v0, t2			/* stack back to original cache mode */
-	addiu   v0,v0,-16		/* overhead */
-	move	sp, v0			/* now replace count w top of memory */
-	move	v1, v0
-	subu	v1, P_STACKSIZE 	/* clear requested stack size */
-
-7:	sw	zero, 0(v1)		/* clear P_STACKSIZE  stack */ 
-	bltu	v1,v0,7b
-	add	v1, 4 
-	.set	reorder
-
-#ifdef _R3000 
-	jal	flush_Icache	
-	jal	flush_Dcache		/* flush Data & Instruction caches */
-#endif
-#ifdef _R4000 
-	jal	flush_cache_nowrite	/* flush Data & Instruction caches */
-#endif
-
-
-
-/**************************************************************************
-**
-**	If this chip supports a Translation Lookaside Buffer, clear it
-**
-***************************************************************************/ 
-
-	.set	noreorder
-	mfc0	t1,  C0_SR		/* look at Status Register */
-	nop
-	.set 	reorder
-#ifdef _R3000
-	li	t2, SR_TS		/* TLB Shutdown bit */
-	and 	t1,t2      		/* TLB Shutdown if 1 */
-	bnez	t1, 8f			/* skip clearing if no TLB */	
-#endif
-
-#ifndef R4650
-	jal	init_tlb		/* clear the tlb */
-#endif
-
-
-/************************************************************************
-**
-**  Initialization required if using IDT/c or libc.a, standard C Lib 
-**
-**  can SKIP if not necessary for application
-**
-************************************************************************/
-8:
-
-	jal	idtsim_init_sbrk
-	jal	idtsim_init_file
-/***********************  END I/O initialization **********************/
-
-
-	jal	main
-
-	jal	idtsim_promexit
-
-ENDFRAME(start)
-
-
-	.globl	sim_mem_cfg
-sim_mem_cfg:
-	.set noat
-	.set noreorder
-	li	AT, (0xbfc00000+((55)*8))
-	jr	AT
-	nop
-	.set at
-	.set reorder
diff --git a/c/src/lib/libbsp/mips/p4000/startup/bspclean.c b/c/src/lib/libbsp/mips/p4000/startup/bspclean.c
deleted file mode 100644
index 5382c8491c..0000000000
--- a/c/src/lib/libbsp/mips/p4000/startup/bspclean.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/*  bsp_cleanup()
- *
- *  This routine normally is part of start.s and usually returns
- *  control to a monitor.
- *
- *  INPUT:  NONE
- *
- *  OUTPUT: NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-/*
- *  Rather than deleting this, it is commented out to (hopefully) help
- *  the submitter send updates.
- *
- *  static char _sccsid[] = "@(#)bspclean.c 03/15/96     1.1\n";
- */
-
-
-
-#include <rtems.h>
-#include <bsp.h>
-
-void idtsim__exit();
-
-void bsp_cleanup( void )
-{
-  idtsim__exit();
-}
diff --git a/c/src/lib/libbsp/mips/p4000/startup/bspstart.c b/c/src/lib/libbsp/mips/p4000/startup/bspstart.c
deleted file mode 100644
index bdd0c3074d..0000000000
--- a/c/src/lib/libbsp/mips/p4000/startup/bspstart.c
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- *  This routine starts the application.  It includes application,
- *  board, and monitor specific initialization and configuration.
- *  The generic CPU dependent initialization has been performed
- *  before this routine is invoked.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-/*
- *  Rather than deleting this, it is commented out to (hopefully) help
- *  the submitter send updates.
- *
- *  static char _sccsid[] = "@(#)bspstart.c 06/11/96     1.2\n";
- */
-
-
-#include <bsp.h>
-#include <rtems/libio.h>
- 
-#include <libcsupport.h>
- 
-#include <string.h>
- 
-/*
- *  The original table from the application and our copy of it with
- *  some changes.
- */
-
-extern rtems_configuration_table Configuration;
-
-rtems_configuration_table  BSP_Configuration;
-
-rtems_cpu_table Cpu_table;
-
-char *rtems_progname;
-
-/*
- *  Use the shared implementations of the following routines
- */
- 
-void bsp_postdriver_hook(void);
-void bsp_libc_init( void *, unsigned32, int );
-
-/*
- *  Function:   bsp_pretasking_hook
- *  Created:    95/03/10
- *
- *  Description:
- *      BSP pretasking hook.  Called just before drivers are initialized.
- *      Used to setup libc and install any BSP extensions.
- *
- *  NOTES:
- *      Must not use libc (to do io) from here, since drivers are
- *      not yet initialized.
- *
- */
- 
-#define LIBC_HEAP_SIZE (64 * 1024)
-
-void bsp_pretasking_hook(void)
-{
-    extern int end;
-    rtems_unsigned32        heap_start;
-
-    heap_start = (rtems_unsigned32) &end;
-    if (heap_start & (CPU_ALIGNMENT-1))
-        heap_start = (heap_start + CPU_ALIGNMENT) & ~(CPU_ALIGNMENT-1);
-
-    bsp_libc_init((void *) heap_start, LIBC_HEAP_SIZE, 0);
-
-#ifdef RTEMS_DEBUG
-    rtems_debug_enable( RTEMS_DEBUG_ALL_MASK );
-#endif
-}
- 
-extern int end; /* defined by linker */
-
-/*
- *  bsp_start
- *
- *  This routine does the bulk of the system initialization.
- */
-
-void bsp_start( void )
-{
-  /*
-   *  Allocate the memory for the RTEMS Work Space.  This can come from
-   *  a variety of places: hard coded address, malloc'ed from outside
-   *  RTEMS world (e.g. simulator or primitive memory manager), or (as
-   *  typically done by stock BSPs) by subtracting the required amount
-   *  of work space from the last physical address on the CPU board.
-   */
-
-  /*
-   *  Need to "allocate" the memory for the RTEMS Workspace and
-   *  tell the RTEMS configuration where it is.  This memory is
-   *  not malloc'ed.  It is just "pulled from the air".
-   */
-
-  BSP_Configuration.work_space_start =
-       (void *)((unsigned64)((&end) + LIBC_HEAP_SIZE + 0x2000) & ~0x7);
-
-  /*
-   *  initialize the CPU table for this BSP
-   */
-
-  Cpu_table.pretasking_hook = bsp_pretasking_hook;  /* init libc, etc. */
-  Cpu_table.postdriver_hook = bsp_postdriver_hook;
-  Cpu_table.interrupt_stack_size = 4096;
-}
diff --git a/c/src/lib/libbsp/mips/p4000/startup/ghlinkcmds b/c/src/lib/libbsp/mips/p4000/startup/ghlinkcmds
deleted file mode 100644
index 34cdbab802..0000000000
--- a/c/src/lib/libbsp/mips/p4000/startup/ghlinkcmds
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-#  $Id$
-#
-
--map
--sec
-{
-  .text 0x80010000  :
-  .data  align(16)  :
-  .rodata :
-  .fini :
-#  .sdata :
-  .symtab :
-  .strtab :
-  .debug :
-#  .sbss :
-  .bss     align(8)  :
-  .init 0xbfc00000 :
-}
diff --git a/c/src/lib/libbsp/mips/p4000/startup/idtmem.S b/c/src/lib/libbsp/mips/p4000/startup/idtmem.S
deleted file mode 100644
index 70a7096877..0000000000
--- a/c/src/lib/libbsp/mips/p4000/startup/idtmem.S
+++ /dev/null
@@ -1,938 +0,0 @@
-/*
-
-Based upon IDT provided code with the following release:
-
-This source code has been made available to you by IDT on an AS-IS
-basis. Anyone receiving this source is licensed under IDT copyrights
-to use it in any way he or she deems fit, including copying it,
-modifying it, compiling it, and redistributing it either with or
-without modifications.  No license under IDT patents or patent
-applications is to be implied by the copyright license.
-
-Any user of this software should understand that IDT cannot provide
-technical support for this software and will not be responsible for
-any consequences resulting from the use of this software.
-
-Any person who transfers this source code or any derivative work must
-include the IDT copyright notice, this paragraph, and the preceeding
-two paragraphs in the transferred software.
-
-COPYRIGHT IDT CORPORATION 1996
-LICENSED MATERIAL - PROGRAM PROPERTY OF IDT
-
-  $Id$
-
-*/
-
-/************************************************************************
-**
-**	idtmem.s - memory and cache functions
-**
-**	Copyright 1991 Integrated Device Technology, Inc.
-**	All Rights Reserved
-**
-**************************************************************************/
-
-/*
- * 950313: Ketan fixed bugs in mfc0/mtc0 hazards, and removed hack 
- * to set mem_size. 
- */
-
-#include <rtems/score/iregdef.h>
-#include <rtems/score/idtcpu.h>
-#include <rtems/score/idtmon.h>
-
-	.data
-mem_size:
-	.word	0	
-dcache_size:
-	.word 	0		
-icache_size:
-#if defined(CPU_R3000)
-	.word	MINCACHE	
-#endif
-#if defined(CPU_R4000)
-	.word	0
-#endif
-
-#if defined(CPU_R4000)
-	.data
-scache_size:
-	.word 	0
-icache_linesize:
-	.word	0
-dcache_linesize:
-	.word	0
-scache_linesize:
-	.word	0
-#endif
-
-
-		.text
-
-#if defined (CPU_R3000)
-#define CONFIGFRM ((2*4)+4)	
-
-/*************************************************************************
-**
-** Config_Dcache() -- determine size of Data cache 
-**
-**************************************************************************/
-
-FRAME(config_Dcache,sp, CONFIGFRM, ra)
-	.set	noreorder
-	subu	sp,CONFIGFRM
-	sw	ra,CONFIGFRM-4(sp)	/* save return address */
-	sw	s0,4*4(sp)		/* save s0 in first regsave slot */
-	mfc0	s0,C0_SR		/* save SR */
-	nop
-	mtc0	zero,C0_SR		/* disable interrupts */
-	.set	reorder
-	jal	_size_cache		/* returns Data cache size in v0 */
-	sw	v0, dcache_size		/* save it */
-	and 	s0, ~SR_PE		/* do not clear PE */
-	.set	noreorder
-	mtc0	s0,C0_SR		/* restore SR */
-	nop
-	.set	reorder
-	lw	s0, 4*4(sp)		/* restore s0 */
-	lw	ra,CONFIGFRM-4(sp)	/* restore ra */
-	addu	sp,CONFIGFRM		/* pop stack */
-	j	ra
-ENDFRAME(config_Dcache)
- 
-
-/*************************************************************************
-**
-** Config_Icache() -- determine size of Instruction cache
-**		      MUST be run in uncached mode/handled in idt_csu.s
-**
-**************************************************************************/
-
-FRAME(config_Icache,sp, CONFIGFRM, ra)
-	.set	noreorder
-	subu	sp,CONFIGFRM
-	sw	ra,CONFIGFRM-4(sp)	/* save return address */
-	sw	s0,4*4(sp)		/* save s0 in first regsave slot */
-	mfc0	s0,C0_SR		/* save SR */
-	nop
- 	mtc0	zero, C0_SR		/* disable interrupts */
-	li	v0,SR_SWC		/* swap caches/disable ints  */
-	mtc0	v0,C0_SR
-	nop
-	.set	reorder
-	jal	_size_cache		/* returns instruction cache size */
-	.set	noreorder
-	mtc0	zero,C0_SR		/* swap back caches */  
-	nop
-	and	s0,~SR_PE		/* do not inadvertantly clear PE */
-	mtc0	s0,C0_SR		/* restore SR */
-	nop
-	.set	reorder
-	sw	v0, icache_size		/* save it AFTER caches back */
-	lw	s0,4*4(sp)		/* restore s0 */
-	lw	ra,CONFIGFRM-4(sp)	/* restore ra */
-	addu	sp,CONFIGFRM		/* pop stack */
-	j	ra
-ENDFRAME(config_Icache)
-
-/************************************************************************
-**
-** _size_cache()
-** returns cache size in v0
-**
-************************************************************************/
-
-FRAME(_size_cache,sp,0,ra)
-	.set	noreorder
-	mfc0	t0,C0_SR		/* save current sr */
-	nop
-	and	t0,~SR_PE		/* do not inadvertently clear PE */
-	or	v0,t0,SR_ISC		/* isolate cache */
-	mtc0	v0,C0_SR
-	/*
-	 * First check if there is a cache there at all
-	 */
-	move	v0,zero
-	li	v1,0xa5a5a5a5		/* distinctive pattern */
-	sw	v1,K0BASE		/* try to write into cache */
-	lw	t1,K0BASE		/* try to read from cache */
-	nop
-	mfc0	t2,C0_SR
-	nop
-	.set	reorder
-	and	t2,SR_CM
-	bne	t2,zero,3f		/* cache miss, must be no cache */
-	bne	v1,t1,3f		/* data not equal -> no cache */
-	/*
-	 * Clear cache size boundries to known state.
-	 */
-	li	v0,MINCACHE
-1:
-	sw	zero,K0BASE(v0)
-	sll	v0,1
-	ble	v0,MAXCACHE,1b
-
-	li	v0,-1
-	sw	v0,K0BASE(zero)		/* store marker in cache */
-	li	v0,MINCACHE		/* MIN cache size */
-
-2:	lw	v1,K0BASE(v0)		/* Look for marker */
-	bne	v1,zero,3f		/* found marker */
-	sll	v0,1			/* cache size * 2 */
-	ble	v0,MAXCACHE,2b		/* keep looking */
-	move	v0,zero			/* must be no cache */
-	.set	noreorder
-3:	mtc0	t0,C0_SR		/* restore sr */
-	j	ra
-	nop
-ENDFRAME(_size_cache)
-	.set	reorder
-
-
-#define FLUSHFRM (2*4)
-
-/***************************************************************************
-**
-** flush_Dcache() -  flush entire Data cache
-**
-****************************************************************************/
-FRAME(flush_Dcache,sp,FLUSHFRM,ra)
-	lw      t2, dcache_size		
-	.set	noreorder
-	mfc0	t3,C0_SR		/* save SR */
-	nop
-	and	t3,~SR_PE		/* dont inadvertently clear PE */
-	beq	t2,zero,_Dflush_done	/* no D cache, get out! */
-	nop
-	li	v0, SR_ISC		/* isolate cache */
-	mtc0	v0, C0_SR
-	nop
-	.set	reorder
-	li	t0,K0BASE		/* set loop registers  */
-	or	t1,t0,t2
-
-2:	sb	zero,0(t0)
-	sb	zero,4(t0)
-	sb	zero,8(t0)
-	sb	zero,12(t0)
-	sb	zero,16(t0)
-	sb	zero,20(t0)
-	sb	zero,24(t0)
-	addu	t0,32
-	sb	zero,-4(t0)
-	bne	t0,t1,2b
-
-	.set	noreorder
-_Dflush_done:
-	mtc0	t3,C0_SR		/* restore Status Register */
-	.set	reorder
-	j	ra
-ENDFRAME(flush_Dcache)
-
-
-/***************************************************************************
-**
-** flush_Icache() -  flush entire Instruction cache
-**
-**	NOTE: Icache can only be flushed/cleared when uncached
-**	      Code forces into uncached memory regardless of calling mode
-**
-****************************************************************************/
-FRAME(flush_Icache,sp,FLUSHFRM,ra)
-	lw	t1,icache_size 
-	.set	noreorder
-	mfc0	t3,C0_SR		/* save SR */
-	nop
-	la	v0,1f
-	li	v1,K1BASE
-	or	v0,v1
-	j	v0			/* force into non-cached space */
-	nop
-1:
-	and	t3,~SR_PE		/* dont inadvertently clear PE */
-	beq	t1,zero,_Iflush_done	/* no i-cache get out */
-	nop
-	li	v0,SR_ISC|SR_SWC	/* disable intr, isolate and swap */
-	mtc0	v0,C0_SR
-	li	t0,K0BASE
-	.set	reorder
-	or	t1,t0,t1
-
-1:	sb	zero,0(t0)
-	sb	zero,4(t0)
-	sb	zero,8(t0)
-	sb	zero,12(t0)
-	sb	zero,16(t0)
-	sb	zero,20(t0)
-	sb	zero,24(t0)
-	addu	t0,32
-	sb	zero,-4(t0)
-	bne	t0,t1,1b
-	.set	noreorder
-_Iflush_done:
-	mtc0	t3,C0_SR		/* un-isolate, enable interrupts */
-	.set	reorder
-	j	ra
-ENDFRAME(flush_Icache)
-
-/**************************************************************************
-**
-** clear_Dcache(base_addr, byte_count) - flush portion of Data cache
-**
-**      a0 = base address of portion to be cleared
-**      a1 = byte count of length
-**
-***************************************************************************/
-FRAME(clear_Dcache,sp,0,ra)
-
-	lw  	t2, dcache_size		/* Data cache size */
-	.set	noreorder
-	mfc0	t3,C0_SR		/* save SR */
-	nop
-	and	t3,~SR_PE		/* dont inadvertently clear PE */
-	nop
-	nop
-	.set	reorder
-	/*
-	 * flush data cache
-	 */
-
-	.set	noreorder
-	nop
-	li	v0,SR_ISC		/* isolate data cache */
-	mtc0	v0,C0_SR
-	.set	reorder
-	bltu	t2,a1,1f		/* cache is smaller than region */
-	move	t2,a1
-1:	addu	t2,a0			/* ending address + 1 */
-	move	t0,a0
-
-1:	sb	zero,0(t0)
-	sb	zero,4(t0)
-	sb	zero,8(t0)
-	sb	zero,12(t0)
-	sb	zero,16(t0)
-	sb	zero,20(t0)
-	sb	zero,24(t0)
-	addu	t0,32
-	sb	zero,-4(t0)
-	bltu	t0,t2,1b
-
-	.set	noreorder
-	mtc0	t3,C0_SR		/* un-isolate, enable interrupts */
-	nop
-	.set	reorder
-	j	ra
-ENDFRAME(clear_Dcache)
-
-
-/**************************************************************************
-**
-** clear_Icache(base_addr, byte_count) - flush portion of Instruction cache
-**
-**      a0 = base address of portion to be cleared
-**      a1 = byte count of length
-**
-**	NOTE: Icache can only be flushed/cleared when uncached
-**	      Code forces into uncached memory regardless of calling mode
-**
-***************************************************************************/
-FRAME(clear_Icache,sp,0,ra)
-
-	lw      t1, icache_size		/* Instruction cache size */
-	/*
-	 * flush text cache
-	 */
-	.set	noreorder
-	mfc0	t3,C0_SR		/* save SR */
-	nop 
-	la	v0,1f
-	li	v1,K1BASE
-	or	v0,v1
-	j	v0			/* force into non-cached space */
-	nop
-1:
-	and	t3,~SR_PE		/* dont inadvertently clear PE */
-	nop
-	nop
-	li	v0,SR_ISC|SR_SWC	/* disable intr, isolate and swap */
-	mtc0	v0,C0_SR
-	.set	reorder
-	bltu	t1,a1,1f		/* cache is smaller than region */
-	move	t1,a1
-1:	addu	t1,a0			/* ending address + 1 */
-	move	t0,a0
-
-	sb	zero,0(t0)
-	sb	zero,4(t0)
-	sb	zero,8(t0)
-	sb	zero,12(t0)
-	sb	zero,16(t0)
-	sb	zero,20(t0)
-	sb	zero,24(t0)
-	addu	t0,32
-	sb	zero,-4(t0)
-	bltu	t0,t1,1b
-	.set	noreorder
-	mtc0	t3,C0_SR		/* un-isolate, enable interrupts */
-	nop
-	nop
-	nop				/* allow time for caches to swap */
-	.set	reorder
-	j	ra
-ENDFRAME(clear_Icache)
-
-
-/**************************************************************************
-**
-**  get_mem_conf - get memory configuration 
-**
-***************************************************************************/
-
-
-FRAME(get_mem_conf,sp,0,ra)
-
-	lw	t6, mem_size
-	sw	t6, 0(a0)
-	lw	t7, icache_size
-	sw	t7, 4(a0)
-	lw	t8, dcache_size
-	sw	t8, 8(a0) 
-	j	ra
-
-ENDFRAME(get_mem_conf)
-#endif /* defined CPU_R3000 */
-
-#if defined(CPU_R4000)
-#define LEAF(label)	FRAME(label,sp,0,ra)
-#define XLEAF(label) \
-	.globl label ; \
-label:
-#define END(label)	ENDFRAME(label)
-
-/*
- * cacheop macro to automate cache operations
- * first some helpers...
- */
-#define _mincache(size, maxsize) \
-	bltu	size,maxsize,8f ;	\
-	move	size,maxsize ;		\
-8:
-
-#define _align(tmp, minaddr, maxaddr, linesize) \
-	subu	tmp,linesize,1 ;	\
-	not	tmp ;			\
-	and	minaddr,tmp ;		\
-	addu	maxaddr,-1 ;		\
-	and	maxaddr,tmp
-
-/* This is a bit of a hack really because it relies on minaddr=a0 */
-#define _doop1(op1) \
-	cache	op1,0(a0) 
-
-#define _doop2(op1, op2) \
-	cache	op1,0(a0) ;		\
-	cache	op2,0(a0) 
-
-/* specials for cache initialisation */
-#define _doop1lw1(op1) \
-	cache	op1,0(a0) ;		\
-	lw	zero,0(a0) ;		\
-	cache	op1,0(a0) 
-
-#define _doop121(op1,op2) \
-	cache	op1,0(a0) ;		\
-	nop;				\
-	cache	op2,0(a0) ;		\
-	nop;				\
-	cache	op1,0(a0) 
-
-#define _oploopn(minaddr, maxaddr, linesize, tag, ops) \
-	.set	noreorder ;		\
-7: 	_doop##tag##ops ;	 	\
-	bne     minaddr,maxaddr,7b ;	\
-	addu   	minaddr,linesize ;	\
-	.set	reorder
-
-/* finally the cache operation macros */
-#define icacheopn(kva, n, cache_size, cache_linesize, tag, ops) \
-	_mincache(n, cache_size);	\
- 	blez	n,9f ;			\
-	addu	n,kva ;			\
-	_align(t1, kva, n, cache_linesize) ; \
-	_oploopn(kva, n, cache_linesize, tag, ops) ; \
-9:
-
-#define vcacheopn(kva, n, cache_size, cache_linesize, tag, ops) \
- 	blez	n,9f ;			\
-	addu	n,kva ;			\
-	_align(t1, kva, n, cache_linesize) ; \
-	_oploopn(kva, n, cache_linesize, tag, ops) ; \
-9:
-
-#define icacheop(kva, n, cache_size, cache_linesize, op) \
-	icacheopn(kva, n, cache_size, cache_linesize, 1, (op))
-
-#define vcacheop(kva, n, cache_size, cache_linesize, op) \
-	vcacheopn(kva, n, cache_size, cache_linesize, 1, (op))
-
-	.text
-
-/*
- * static void _size_cache()    R4000
- * 
- * Internal routine to determine cache sizes by looking at R4000 config
- * register.  Sizes are returned in registers, as follows:
- *	t2	icache size
- *	t3	dcache size
- *	t6	scache size
- *	t4	icache line size
- *	t5	dcache line size
- *	t7	scache line size
- */
-LEAF(_size_cache)
-	mfc0	t0,C0_CONFIG
-
-	and	t1,t0,CFG_ICMASK
-	srl	t1,CFG_ICSHIFT
-	li	t2,0x1000
-	sll	t2,t1
-
-	and	t1,t0,CFG_DCMASK
-	srl	t1,CFG_DCSHIFT
-	li	t3,0x1000
-	sll	t3,t1
-
-	li	t4,32
-	and	t1,t0,CFG_IB
-	bnez	t1,1f
-	li	t4,16
-1:	
-
-	li	t5,32
-	and	t1,t0,CFG_DB
-	bnez	t1,1f
-	li	t5,16
-1:	
-
-	move	t6,zero			# default to no scache
-	move	t7,zero			#
-
-	and	t1,t0,CFG_C_UNCACHED	# test config register
-	bnez	t1,1f			# no scache if uncached/non-coherent
-	
-	li	t6,0x100000		# assume 1Mb scache <<-NOTE
-	and	t1,t0,CFG_SBMASK
-	srl	t1,CFG_SBSHIFT
-	li	t7,16
-	sll	t7,t1
-1:	j	ra
-END(_size_cache)
-
-
-/*
- * void config_cache()   R4000
- * 
- * Work out size of I, D & S caches, assuming they are already initialised.
- */
-LEAF(config_cache)
-	lw	t0,icache_size
-	bgtz	t0,8f			# already known?
-	move	v0,ra
-	bal	_size_cache
-	move	ra,v0
-
-	sw	t2,icache_size
-	sw	t3,dcache_size
-	sw	t6,scache_size
-	sw	t4,icache_linesize
-	sw	t5,dcache_linesize
-	sw	t7,scache_linesize
-8:	j	ra
-END(config_cache)
-
-
-/*
- * void _init_cache()   R4000
- */
-LEAF(_init_cache)
-	/*
- 	 * First work out the sizes
-	 */
-	move	v0,ra
-	bal	_size_cache
-	move	ra,v0
-	
-	/*
-	 * The caches may be in an indeterminate state,
-	 * so we force good parity into them by doing an
-	 * invalidate, load/fill, invalidate for each line.
-	 */
-
-	/* disable all i/u and cache exceptions */
-	mfc0	v0,C0_SR
-	and	v1,v0,~SR_IE
-	or	v1,SR_DE
-	mtc0	v1,C0_SR
-
-	mtc0	zero,C0_TAGLO
-	mtc0	zero,C0_TAGHI
-
-	/* assume bottom of RAM will generate good parity for the cache */
-	li	a0,PHYS_TO_K0(0)
-	move	a2,t2		# icache_size
-	move	a3,t4		# icache_linesize
-	move	a1,a2
-	icacheopn(a0,a1,a2,a3,121,(Index_Store_Tag_I,Fill_I))
-
-	li	a0,PHYS_TO_K0(0)
-	move	a2,t3		# dcache_size
-	move	a3,t5		# dcache_linesize
-	move	a1,a2
-	icacheopn(a0,a1,a2,a3,1lw1,(Index_Store_Tag_D))
-
-	/* assume unified I & D in scache <<-NOTE */
-	blez	t6,1f
-	li	a0,PHYS_TO_K0(0)
-	move	a2,t6
-	move	a3,t7
-	move	a1,a2
-	icacheopn(a0,a1,a2,a3,1lw1,(Index_Store_Tag_SD))
-
-1:	mtc0	v0,C0_SR
-	j	ra
-END(_init_cache)
-	
-
-/*
- * void flush_cache (void)   R4000
- *
- * Flush and invalidate all caches
- */
-LEAF(flush_cache)
-	/* secondary cacheops do all the work if present */
-	lw	a2,scache_size
-	blez	a2,1f
-	lw	a3,scache_linesize
-	li	a0,PHYS_TO_K0(0)
-	move	a1,a2
-	icacheop(a0,a1,a2,a3,Index_Writeback_Inv_SD)
-	b	2f
-
-1:	
-	lw	a2,icache_size
-	blez	a2,2f
-	lw	a3,icache_linesize
-	li	a0,PHYS_TO_K0(0)
-	move	a1,a2
-	icacheop(a0,a1,a2,a3,Index_Invalidate_I)
-
-	lw	a2,dcache_size
-	lw	a3,dcache_linesize
-	li	a0,PHYS_TO_K0(0)
-	move	a1,a2
-	icacheop(a0,a1,a2,a3,Index_Writeback_Inv_D)
-
-2:	j	ra
-END(flush_cache)
-	
-/*
- * void flush_cache_nowrite (void)   R4000
- *
- * Invalidate all caches
- */
-LEAF(flush_cache_nowrite)
-	mfc0	v0,C0_SR
-	and	v1,v0,~SR_IE
-	mtc0	v1,C0_SR
-
-	mtc0	zero,C0_TAGLO
-	mtc0	zero,C0_TAGHI
-
-	lw	a2,icache_size
-	blez	a2,2f
-	lw	a3,icache_linesize
-	li	a0,PHYS_TO_K0(0)
-	move	a1,a2
-	icacheop(a0,a1,a2,a3,Index_Invalidate_I)
-
-	lw	a2,dcache_size
-	lw	a3,dcache_linesize
-	li	a0,PHYS_TO_K0(0)
-	move	a1,a2
-	icacheop(a0,a1,a2,a3,Index_Store_Tag_D)
-
-	lw	a2,scache_size
-	blez	a2,2f
-	lw	a3,scache_linesize
-	li	a0,PHYS_TO_K0(0)
-	move	a1,a2
-	icacheop(a0,a1,a2,a3,Index_Store_Tag_SD)
-
-2:	mtc0	v0,C0_SR
-	j	ra
-END(flush_cache_nowrite)
-	
-/*
- * void clean_cache (unsigned kva, size_t n)   R4000
- *
- * Writeback and invalidate address range in all caches
- */
-LEAF(clean_cache)
-XLEAF(clear_cache)
-
-	/* secondary cacheops do all the work (if fitted) */
-	lw	a2,scache_size
-	blez	a2,1f
-	lw	a3,scache_linesize
-	vcacheop(a0,a1,a2,a3,Hit_Writeback_Inv_SD)
-	b	2f
-
-1:	lw	a2,icache_size
-	blez	a2,2f
-	lw	a3,icache_linesize
-	/* save kva & n for subsequent loop */
-	move	t8,a0
-	move	t9,a1
-	vcacheop(a0,a1,a2,a3,Hit_Invalidate_I)
-
-	lw	a2,dcache_size
-	lw	a3,dcache_linesize
-	/* restore kva & n */
-	move	a0,t8
-	move	a1,t9
-	vcacheop(a0,a1,a2,a3,Hit_Writeback_Inv_D)
-
-2:	j	ra
-END(clean_cache)
-	
-/*
- * void clean_dcache (unsigned kva, size_t n)   R4000
- *
- * Writeback and invalidate address range in primary data cache
- */
-LEAF(clean_dcache)
-	lw	a2,dcache_size
-	blez	a2,2f
-	lw	a3,dcache_linesize
-
-	vcacheop(a0,a1,a2,a3,Hit_Writeback_Inv_D)
-
-2:	j	ra
-END(clean_dcache)
-	
-/*
- * void clean_dcache_indexed (unsigned kva, size_t n)   R4000
- *
- * Writeback and invalidate indexed range in primary data cache
- */
-LEAF(clean_dcache_indexed)
-	lw	a2,dcache_size
-	blez	a2,2f
-	lw	a3,dcache_linesize
-
-#ifdef CPU_ORION
-	srl	a2,1			# do one set (half cache) at a time
-	move	t8,a0			# save kva & n
-	move	t9,a1
-	icacheop(a0,a1,a2,a3,Index_Writeback_Inv_D)
-
-	addu	a0,t8,a2		# do next set
-	move	a1,t9			# restore n
-#endif
-	icacheop(a0,a1,a2,a3,Index_Writeback_Inv_D)
-
-2:	j	ra
-END(clean_dcache_indexed)
-	
-/*
- * void clean_dcache_nowrite (unsigned kva, size_t n)   R4000
- *
- * Invalidate an address range in primary data cache
- */
-LEAF(clean_dcache_nowrite)
-	lw	a2,dcache_size
-	blez	a2,2f
-	lw	a3,dcache_linesize
-
-	vcacheop(a0,a1,a2,a3,Hit_Invalidate_D)
-
-2:	j	ra
-END(clean_dcache_nowrite)
-	
-/*
- * void clean_dcache_nowrite_indexed (unsigned kva, size_t n)   R4000
- *
- * Invalidate indexed range in primary data cache
- */
-LEAF(clean_dcache_nowrite_indexed)
-	mfc0	v0,C0_SR
-	and	v1,v0,~SR_IE
-	mtc0	v1,C0_SR
-
-	mtc0	zero,C0_TAGLO
-	mtc0	zero,C0_TAGHI
-
-	lw	a2,dcache_size
-	blez	a2,2f
-	lw	a3,dcache_linesize
-
-#ifdef CPU_ORION
-	srl	a2,1			# do one set (half cache) at a time
-	move	t8,a0			# save kva & n
-	move	t9,a1
-	icacheop(a0,a1,a2,a3,Index_Store_Tag_D)
-
-	addu	a0,t8,a2		# do next set
-	move	a1,t9			# restore n
-#endif
-	icacheop(a0,a1,a2,a3,Index_Store_Tag_D)
-
-2:	mtc0	v0,C0_SR
-	j	ra
-END(clean_dcache_nowrite_indexed)
-	
-/*
- * void clean_icache (unsigned kva, size_t n)   R4000
- *
- * Invalidate address range in primary instruction cache
- */
-LEAF(clean_icache)
-	lw	a2,icache_size
-	blez	a2,2f
-	lw	a3,icache_linesize
-
-	vcacheop(a0,a1,a2,a3,Hit_Invalidate_I)
-
-2:	j	ra
-END(clean_icache)
-	
-/*
- * void clean_icache_indexed (unsigned kva, size_t n)   R4000
- *
- * Invalidate indexed range in primary instruction cache
- */
-LEAF(clean_icache_indexed)
-	lw	a2,icache_size
-	blez	a2,2f
-	lw	a3,icache_linesize
-
-#ifdef CPU_ORION
-	srl	a2,1			# do one set (half cache) at a time
-	move	t8,a0			# save kva & n
-	move	t9,a1
-	icacheop(a0,a1,a2,a3,Index_Invalidate_I)
-
-	addu	a0,t8,a2		# do next set
-	move	a1,t9			# restore n
-#endif
-	icacheop(a0,a1,a2,a3,Index_Invalidate_I)
-
-2:	j	ra
-END(clean_icache_indexed)
-	
-
-
-/*
- * void clean_scache (unsigned kva, size_t n)   R4000
- *
- * Writeback and invalidate address range in secondary cache
- */
-LEAF(clean_scache)
-	lw	a2,scache_size
-	blez	a2,2f
-	lw	a3,scache_linesize
-	vcacheop(a0,a1,a2,a3,Hit_Writeback_Inv_SD)
-
-2:	j	ra
-END(clean_scache)
-	
-/*
- * void clean_scache_indexed (unsigned kva, size_t n)   R4000
- *
- * Writeback and invalidate indexed range in secondary cache
- */
-LEAF(clean_scache_indexed)
-	lw	a2,scache_size
-	blez	a2,2f
-	lw	a3,scache_linesize
-
-	icacheop(a0,a1,a2,a3,Index_Writeback_Inv_SD)
-
-2:	j	ra
-END(clean_scache_indexed)
-	
-/*
- * void clean_scache_nowrite (unsigned kva, size_t n)   R4000
- *
- * Invalidate an address range in secondary cache
- */
-LEAF(clean_scache_nowrite)
-	lw	a2,scache_size
-	blez	a2,2f
-	lw	a3,scache_linesize
-
-	vcacheop(a0,a1,a2,a3,Hit_Invalidate_SD)
-
-2:	j	ra
-END(clean_scache_nowrite)
-	
-/*
- * void clean_scache_nowrite_indexed (unsigned kva, size_t n)   R4000
- *
- * Invalidate indexed range in secondary cache
- */
-LEAF(clean_scache_nowrite_indexed)
-	mfc0	v0,C0_SR
-	and	v1,v0,~SR_IE
-	mtc0	v1,C0_SR
-
-	mtc0	zero,C0_TAGLO
-	mtc0	zero,C0_TAGHI
-
-	lw	a2,scache_size
-	blez	a2,2f
-	lw	a3,scache_linesize
-
-	icacheop(a0,a1,a2,a3,Index_Store_Tag_SD)
-
-2:	mtc0	v0,C0_SR
-	j	ra
-END(clean_scache_nowrite_indexed)
-	
-/**************************************************************************
-**
-**  get_mem_conf - get memory configuration  R4000
-**
-***************************************************************************/
-
-
-FRAME(get_mem_conf,sp,0,ra)
-
-	lw	t6, mem_size
-	sw	t6, 0(a0)
-	lw	t7, icache_size
-	sw	t7, 4(a0)
-	lw	t8, dcache_size
-	sw	t8, 8(a0) 
-	lw	t7, scache_size
-	sw	t7, 12(a0) 
-	j	ra
-
-ENDFRAME(get_mem_conf)
-
-#endif /* defined(CPU_R4000) */
-
-/*
- * void set_mem_size (mem_size) 
- *
- * config_memory()'s memory size gets written into mem_size here.
- * Now we don't need to call config_cache() with memory size - New to IDTC6.0
- */
-FRAME(set_memory_size,sp,0,ra)
-	sw	a0, mem_size
-	j	ra
-ENDFRAME(set_memory_size)
-
-
diff --git a/c/src/lib/libbsp/mips/p4000/startup/idttlb.S b/c/src/lib/libbsp/mips/p4000/startup/idttlb.S
deleted file mode 100644
index 4aad7b1416..0000000000
--- a/c/src/lib/libbsp/mips/p4000/startup/idttlb.S
+++ /dev/null
@@ -1,390 +0,0 @@
-/*
-
-Based upon IDT provided code with the following release:
-
-This source code has been made available to you by IDT on an AS-IS
-basis. Anyone receiving this source is licensed under IDT copyrights
-to use it in any way he or she deems fit, including copying it,
-modifying it, compiling it, and redistributing it either with or
-without modifications.  No license under IDT patents or patent
-applications is to be implied by the copyright license.
-
-Any user of this software should understand that IDT cannot provide
-technical support for this software and will not be responsible for
-any consequences resulting from the use of this software.
-
-Any person who transfers this source code or any derivative work must
-include the IDT copyright notice, this paragraph, and the preceeding
-two paragraphs in the transferred software.
-
-COPYRIGHT IDT CORPORATION 1996
-LICENSED MATERIAL - PROGRAM PROPERTY OF IDT
-
-  $Id$
-*/
-
-
-/*
-**	idttlb.s - fetch the registers associated with and the contents
-**		   of the tlb.
-**
-*/
-/* 950308: Ketan patched a few tlb functions that would not have worked.*/
-#include <rtems/score/iregdef.h>
-#include <rtems/score/idtcpu.h>
-#include <rtems/score/idtmon.h>
-
-
-	.text
-
-#if defined(CPU_R3000)
-/*
-** ret_tlblo -- returns the 'entrylo' contents for the TLB
-**	'c' callable - as ret_tlblo(index) - where index is the
-**	tlb entry to return the lo value for - if called from assembly
-**	language then index should be in register a0.
-*/
-FRAME(ret_tlblo,sp,0,ra)
-	.set	noreorder
-	mfc0	t0,C0_SR		# save sr
-	nop
-	and	t0,~SR_PE		# dont inadvertantly clear PE
-	mtc0	zero,C0_SR		# clear interrupts
-	mfc0	t1,C0_TLBHI		# save pid
-	sll	a0,TLBINX_INXSHIFT	# position index
-	mtc0	a0,C0_INX		# write to index register
-	nop
-	tlbr				# put tlb entry in entrylo and hi
-	nop
-	mfc0	v0,C0_TLBLO		# get the requested entry lo
-	mtc0	t1,C0_TLBHI		# restore pid
-	mtc0	t0,C0_SR		# restore status register
-	j	ra
-	nop
-	.set	reorder
-ENDFRAME(ret_tlblo)
-#endif
-#if defined(CPU_R4000)
-/*
-** ret_tlblo[01] -- returns the 'entrylo' contents for the TLB
-**	'c' callable - as ret_tlblo(index) - where index is the
-**	tlb entry to return the lo value for - if called from assembly
-**	language then index should be in register a0.
-*/
-FRAME(ret_tlblo0,sp,0,ra)
-	mfc0	t0,C0_SR		# save sr
-	mtc0	zero,C0_SR		# clear interrupts
-	mfc0	t1,C0_TLBHI		# save pid
-	mtc0	a0,C0_INX		# write to index register
-	.set noreorder
-	nop; nop; nop; nop; nop; nop; nop; nop
-	.set reorder
-	tlbr				# put tlb entry in entrylo and hi
-	.set noreorder
-	nop; nop; nop; nop; nop; nop; nop; nop
-	.set reorder
-	mfc0	v0,C0_TLBLO0		# get the requested entry lo
-	mtc0	t1,C0_TLBHI		# restore pid
-	mtc0	t0,C0_SR		# restore status register
-	j	ra
-ENDFRAME(ret_tlblo0)
-
-FRAME(ret_tlblo1,sp,0,ra)
-	mfc0	t0,C0_SR		# save sr
-	mtc0	zero,C0_SR		# clear interrupts
-	mfc0	t1,C0_TLBHI		# save pid
-	mtc0	a0,C0_INX		# write to index register
-	.set noreorder
-	nop; nop; nop; nop; nop; nop; nop; nop
-	.set reorder
-	tlbr				# put tlb entry in entrylo and hi
-	.set noreorder
-	nop; nop; nop; nop; nop; nop; nop; nop
-	.set reorder
-	mfc0	v0,C0_TLBLO1		# get the requested entry lo
-	mtc0	t1,C0_TLBHI		# restore pid
-	mtc0	t0,C0_SR		# restore status register
-	j	ra
-ENDFRAME(ret_tlblo1)
-
-/*
-** ret_pagemask(index) -- return pagemask contents of tlb entry "index"
-*/
-FRAME(ret_pagemask,sp,0,ra)
-	mfc0	t0,C0_SR		# save sr
-	mtc0	zero,C0_SR		# disable interrupts
-	mfc0	t1,C0_TLBHI		# save current pid
-	mtc0	a0,C0_INX		# drop it in C0 register
-	.set noreorder
-	nop; nop; nop; nop; nop; nop; nop; nop
-	.set reorder
-	tlbr				# read entry to entry hi/lo
-	.set noreorder
-	nop; nop; nop; nop; nop; nop; nop; nop
-	.set reorder
-	mfc0	v0,C0_PAGEMASK		# to return value
-	mtc0	t1,C0_TLBHI		# restore current pid
-	mtc0	t0,C0_SR		# restore sr
-	j	ra
-ENDFRAME(ret_pagemask)
-
-/*
-** ret_tlbwired(void) -- return wired register
-*/
-FRAME(ret_tlbwired,sp,0,ra)
-	mfc0	v0,C0_WIRED
-	j	ra
-ENDFRAME(ret_tlbwired)
-#endif
-
-/*
-** ret_tlbhi -- return the tlb entry high content for tlb entry
-**			index
-*/
-FRAME(ret_tlbhi,sp,0,ra)
-#if defined(CPU_R3000)
-	.set	noreorder
-	mfc0	t0,C0_SR		# save sr
-	nop
-	and	t0,~SR_PE
-	mtc0	zero,C0_SR		# disable interrupts
-	mfc0	t1,C0_TLBHI		# save current pid
-	sll	a0,TLBINX_INXSHIFT	# position index
-	mtc0	a0,C0_INX		# drop it in C0 register
-	nop
-	tlbr				# read entry to entry hi/lo
-	nop
-	mfc0	v0,C0_TLBHI		# to return value
-	mtc0	t1,C0_TLBHI		# restore current pid
-	mtc0	t0,C0_SR		# restore sr
-	j	ra
-	nop
-	.set	reorder
-#endif
-#if defined(CPU_R4000)
-	mfc0	t0,C0_SR		# save sr
-	mtc0	zero,C0_SR		# disable interrupts
-	mfc0	t1,C0_TLBHI		# save current pid
-	mtc0	a0,C0_INX		# drop it in C0 register
-	.set noreorder
-	nop; nop; nop; nop; nop; nop; nop; nop
-	.set reorder
-	tlbr				# read entry to entry hi/lo0/lo1/mask
-	.set noreorder
-	nop; nop; nop; nop; nop; nop; nop; nop
-	.set reorder
-	mfc0	v0,C0_TLBHI		# to return value
-	mtc0	t1,C0_TLBHI		# restore current pid
-	mtc0	t0,C0_SR		# restore sr
-	j	ra
-#endif
-ENDFRAME(ret_tlbhi)
-
-/*
-** ret_tlbpid() -- return tlb pid contained in the current entry hi
-*/
-FRAME(ret_tlbpid,sp,0,ra)
-#if defined(CPU_R3000)
-	.set	noreorder
-	mfc0	v0,C0_TLBHI		# fetch tlb high 
-	nop
-	and	v0,TLBHI_PIDMASK	# isolate and position
-	srl	v0,TLBHI_PIDSHIFT
-	j	ra
-	nop
-	.set	reorder
-#endif
-#if defined(CPU_R4000)
-	mfc0	v0,C0_TLBHI	# to return value
-	nop
-	and	v0,TLBHI_PIDMASK
-	j	ra
-#endif
-ENDFRAME(ret_tlbpid)
-
-/*
-** tlbprobe(address, pid) -- probe the tlb to see if address is currently
-**				mapped
-**	a0 = vpn  - virtual page numbers are 0=0 1=0x1000, 2=0x2000...
-**			virtual page numbers for the r3000 are in
-**			entry hi bits 31-12
-**	a1 = pid  - this is a process id ranging from 0 to 63
-**		    this process id is shifted left 6 bits and or'ed into
-**		    the entry hi register
-**	returns an index value (0-63) if successful -1 -f not
-*/
-FRAME(tlbprobe,sp,0,ra)
-#if defined(CPU_R3000)
-	.set	noreorder
-	mfc0	t0,C0_SR		/* fetch status reg */
-	and	a0,TLBHI_VPNMASK	/* isolate just the vpn */
-	and	t0,~SR_PE		/* don't inadvertantly clear pe */
-	mtc0	zero,C0_SR 
-	mfc0	t1,C0_TLBHI	
-	sll	a1,TLBHI_PIDSHIFT	/* possition the pid */
-	and	a1,TLBHI_PIDMASK
-	or	a0,a1			/* build entry hi value */
-	mtc0	a0,C0_TLBHI
-	nop
-	tlbp				/* do the probe */
-	nop
-	mfc0	v1,C0_INX
-	li	v0,-1
-	bltz	v1,1f
-	nop
-	sra	v0,v1,TLBINX_INXSHIFT	/* get index positioned for return */
-1:
-	mtc0	t1,C0_TLBHI		/* restore tlb hi */
-	mtc0	t0,C0_SR		/* restore the status reg */
-	j	ra
-	nop
-	.set	reorder
-#endif
-#if defined(CPU_R4000)
-	mfc0	t0,C0_SR		# save sr
-	mtc0	zero,C0_SR		# disable interrupts
-	mfc0	t1,C0_TLBHI		# save current pid
-	and	a0,TLBHI_VPN2MASK	# construct tlbhi for probe
-	and	a1,TLBHI_PIDMASK
-	or	a0,a1
-	mtc0	a0,C0_TLBHI
-	.set noreorder
-	nop; nop; nop; nop; nop; nop; nop; nop
-	.set reorder
-	tlbp				# probe entry to entry hi/lo0/lo1/mask
-	.set noreorder
-	nop; nop; nop; nop; nop; nop; nop; nop
-	.set reorder
-	mfc0	v1,C0_INX
-	li	v0,-1
-	bltz	v1,1f
-	move	v0,v1
-1:	mtc0	t1,C0_TLBHI		# restore current pid
-	mtc0	t0,C0_SR		# restore sr
-	j	ra
-#endif
-ENDFRAME(tlbprobe)
-
-/*
-** resettlb(index) Invalidate the  TLB entry specified by index
-*/
-FRAME(resettlb,sp,0,ra)
-#if defined(CPU_R3000)
-	.set	noreorder
-	mfc0	t0,C0_TLBHI		# fetch the current hi 
-	mfc0	v0,C0_SR		# fetch the status reg.
-	li	t2,K0BASE&TLBHI_VPNMASK
-	and	v0,~SR_PE		# dont inadvertantly clear PE
-	mtc0	zero,C0_SR
-	mtc0	t2,C0_TLBHI		# set up tlbhi
-	mtc0	zero,C0_TLBLO
-	sll	a0,TLBINX_INXSHIFT
-	mtc0	a0,C0_INX
-	nop
-	tlbwi				# do actual invalidate
-	nop
-	mtc0	t0,C0_TLBHI
-	mtc0	v0,C0_SR
-	j	ra
-	nop
-	.set	reorder
-#endif
-#if defined(CPU_R4000)
-	li	t2,K0BASE&TLBHI_VPN2MASK
-	mfc0	t0,C0_TLBHI		# save current TLBHI
-	mfc0	v0,C0_SR		# save SR and disable interrupts
-	mtc0	zero,C0_SR
-	mtc0	t2,C0_TLBHI		# invalidate entry
-	mtc0	zero,C0_TLBLO0
-	mtc0	zero,C0_TLBLO1
-	mtc0	a0,C0_INX
-	.set noreorder
-	nop; nop; nop; nop; nop; nop; nop; nop
-	.set reorder
-	tlbwi
-	.set noreorder
-	nop; nop; nop; nop; nop; nop; nop; nop
-	.set reorder
-	mtc0	t0,C0_TLBHI
-	mtc0	v0,C0_SR
-	j	ra
-#endif
-ENDFRAME(resettlb)
-
-#if defined(CPU_R3000)
-/*
-** Setup TLB entry
-**
-** map_tlb(index, tlbhi, phypage)
-** 	a0  =  TLB entry index
-**	a1  =  virtual page number and PID
-**	a2  =  physical page
-*/
-FRAME(map_tlb,sp,0,ra)
-	.set	noreorder
-	sll	a0,TLBINX_INXSHIFT
-	mfc0	v0,C0_SR		# fetch the current status
-	mfc0	a3,C0_TLBHI		# save the current hi
-	and	v0,~SR_PE		# dont inadvertantly clear parity
-
-	mtc0	zero,C0_SR
-	mtc0	a1,C0_TLBHI		# set the hi entry
-	mtc0	a2,C0_TLBLO		# set the lo entry 
-	mtc0	a0,C0_INX		# load the index
-	nop
-	tlbwi				# put the hi/lo in tlb entry indexed
-	nop
-	mtc0	a3,C0_TLBHI		# put back the tlb hi reg 
-	mtc0	v0,C0_SR		# restore the status register 
-	j	ra
-	nop
-	.set	reorder
-ENDFRAME(map_tlb)
- #endif
-#if defined(CPU_R4000)
-/*
-** Setup R4000 TLB entry
-**
-** map_tlb4000(mask_index, tlbhi, pte_even, pte_odd)
-** 	a0  =  TLB entry index and page mask
-**	a1  =  virtual page number and PID
-**      a2  =  pte -- contents of even pte
-**      a3  =  pte -- contents of odd pte
-*/
-FRAME(map_tlb4000,sp,0,ra)
-	and	t2,a0,TLBPGMASK_MASK
-	and	a0,TLBINX_INXMASK
-	mfc0	t1,C0_TLBHI		# save current TLBPID
-	mfc0	v0,C0_SR		# save SR and disable interrupts
-	mtc0	zero,C0_SR
-	mtc0	t2,C0_PAGEMASK		# set 
-	mtc0	a1,C0_TLBHI		# set VPN and TLBPID
-	mtc0	a2,C0_TLBLO0		# set PPN and access bits
-	mtc0	a3,C0_TLBLO1		# set PPN and access bits
-	mtc0	a0,C0_INX		# set INDEX to wired entry
-	.set noreorder
-	nop; nop; nop; nop; nop; nop; nop; nop
-	.set reorder
-	tlbwi				# drop it in
-	.set noreorder
-	nop; nop; nop; nop; nop; nop; nop; nop
-	.set reorder
-	mtc0	t1,C0_TLBHI		# restore TLBPID
-	mtc0	v0,C0_SR		# restore SR
-	j	ra
-ENDFRAME(map_tlb4000)
-#endif
-
-
-/*
-** Set current TLBPID. This assumes PID is positioned correctly in reg.
-**			a0.
-*/
-FRAME(set_tlbpid,sp,0,ra)
-	.set	noreorder
-	mtc0	a0,C0_TLBHI
-	j	ra
-	nop
-	.set	reorder
-ENDFRAME(set_tlbpid)
-
diff --git a/c/src/lib/libbsp/mips/p4000/startup/inittlb.c b/c/src/lib/libbsp/mips/p4000/startup/inittlb.c
deleted file mode 100644
index e61f0043be..0000000000
--- a/c/src/lib/libbsp/mips/p4000/startup/inittlb.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- *  $Id$
- */
-
-#include <rtems/score/idtcpu.h>
-
-extern void resettlb( int i );
-
-void init_tlb(void)
-{
-  int i;
-
-        for (i = 0; i < N_TLB_ENTRIES; i++ )
-                resettlb(i);
-}
-
diff --git a/c/src/lib/libbsp/mips/p4000/startup/linkcmds b/c/src/lib/libbsp/mips/p4000/startup/linkcmds
deleted file mode 100644
index 47e0ba1162..0000000000
--- a/c/src/lib/libbsp/mips/p4000/startup/linkcmds
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- *   $Id$
- */
-
-OUTPUT_FORMAT("elf32-bigmips")
-OUTPUT_ARCH(mips)
-/* Do we need any of these for elf?
-   __DYNAMIC = 0;    */
-_DYNAMIC_LINK = 0;
-SECTIONS
-{
-  /* Read-only sections, merged into text segment: */
-  .text 0x80030000  :				/* */
-/*  .text 0xa0020000  :				/* */
-/*  .text 0x00020000  :				/* */
-  {
-    _ftext = . ;
-    *(.text)
-    CREATE_OBJECT_SYMBOLS
-    _etext = .;
-  }
-  .init    ALIGN(8)  : { *(.init)    } =0
-  .fini    ALIGN(8)  : { *(.fini)    } =0
-  .ctors   ALIGN(8)  : { *(.ctors)   }
-  .dtors   ALIGN(8)  : { *(.dtors)   }
-  .rodata  ALIGN(8)  : { *(.rodata)  *(.gnu.linkonce.r*) }
-  .rodata1 ALIGN(8)  :
-    {
-      *(.rodata1)
-      . = ALIGN(8);
-    }
-  .reginfo . : { *(.reginfo) }
-  /* also: .hash .dynsym .dynstr .plt(if r/o) .rel.got */
-  /* Read-write section, merged into data segment: */
-  .data  ALIGN(16)  :
-  {
-    _fdata = . ;
-    *(.data)
-    CONSTRUCTORS
-  }
-  .data1 ALIGN(8)  : { *(.data1) }
-  _gp = . + 0x8000;
-  .lit8 . : { *(.lit8) }
-  .lit4 . : { *(.lit4) }
-  /* also (before uninitialized portion): .dynamic .got .plt(if r/w)
-     (or does .dynamic go into its own segment?) */
-  /* We want the small data sections together, so single-instruction offsets
-     can access them all, and initialized data all before uninitialized, so
-     we can shorten the on-disk segment size.  */
-  .sdata   ALIGN(8)  : { *(.sdata) }
-  _edata  =  .;
-  __bss_start = ALIGN(8);
-  _fbss = .;
-  .sbss    ALIGN(8)  : { *(.sbss) *(.scommon) }
-  .bss     ALIGN(8)  :
-  {
-   *(.bss)
-   *(COMMON)
-   _end = . ;
-   end = . ;
-  }
-  /* Debug sections.  These should never be loadable, but they must have
-     zero addresses for the debuggers to work correctly.  */
-  .line			0 : { *(.line)			}
-  .debug		0 : { *(.debug)			}
-  .debug_sfnames	0 : { *(.debug_sfnames)		}
-  .debug_srcinfo	0 : { *(.debug_srcinfo)		}
-  .debug_macinfo	0 : { *(.debug_macinfo)		}
-  .debug_pubnames	0 : { *(.debug_pubnames)	}
-  .debug_aranges	0 : { *(.debug_aranges)		}
-}
-
diff --git a/c/src/lib/libbsp/mips/p4000/startup/setvec.c b/c/src/lib/libbsp/mips/p4000/startup/setvec.c
deleted file mode 100644
index 1142eb64de..0000000000
--- a/c/src/lib/libbsp/mips/p4000/startup/setvec.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*  set_vector
- *
- *  This routine installs an interrupt vector on the target Board/CPU.
- *  This routine is allowed to be as board dependent as necessary.
- *
- *  INPUT:
- *    handler - interrupt handler entry point
- *    vector  - vector number
- *    type    - 0 indicates raw hardware connect
- *              1 indicates RTEMS interrupt connect
- *
- *  RETURNS:
- *    address of previous interrupt handler
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-/*
- *  Rather than deleting this, it is commented out to (hopefully) help
- *  the submitter send updates.
- *
- *  static char _sccsid[] = "@(#)setvec.c 04/25/96     1.2\n";
- */
-
-
-#include <rtems.h>
-#include <bsp.h>
-
-mips_isr_entry set_vector(                    /* returns old vector */
-  rtems_isr_entry     handler,                  /* isr routine        */
-  rtems_vector_number vector,                   /* vector number      */
-  int                 type                      /* RTEMS or RAW intr  */
-)
-{
-  mips_isr_entry previous_isr;
-
-  if ( type )
-    rtems_interrupt_catch( handler, vector, (rtems_isr_entry *) &previous_isr );
-  else {
-    /* XXX: install non-RTEMS ISR as "raw" interupt */
-    rtems_interrupt_catch( handler, vector, (rtems_isr_entry *) &previous_isr );
-  }
-  return previous_isr;
-}
-
diff --git a/c/src/lib/libbsp/mips/p4000/times b/c/src/lib/libbsp/mips/p4000/times
deleted file mode 100644
index 58574229e1..0000000000
--- a/c/src/lib/libbsp/mips/p4000/times
+++ /dev/null
@@ -1,200 +0,0 @@
-#
-#  Timing Test Suite Results for the NO_BSP
-#
-#  NOTE: This is just a template.  The times are irrelevant since this BSP
-#        can only be compiled -- not executed.
-#
-#  $Id$
-#
-# @(#)times        08/01/96     1.4
-
-NOTE:  To obtain the execution time in microseconds, divide the number of
-       cycles by the clock speed.  For example, if rtems_semaphore create
-       is reported to be 1164 cycles, then at 66 Mhz it takes 17.64
-       microseconds or 8.75 microseconds at 133 Mhz.
-
-Board: Algorithmics P4000i 
-CPU: IDT 4650
-Clock Speed: 100MHz
-Memory Configuration: SRAM, DRAM, cache, etc
-Wait States:
-
-Times Reported in: cycles
-Timer Source: on-CPU cycle counter
-
-Column A:RTEMS compiled with 64 bit pointers and 64 bit unsigned32 types
-Column B:RTEMS compiled with 32 bit pointers and 32 bit unsigned32 types
-
-#                          DESCRIPTION                                 A    B
-== =================================================================  ==== ====
- 1 rtems_semaphore_create                                              788  759
-   rtems_semaphore_delete                                              903  945
-   rtems_semaphore_obtain: available                                   119  119
-   rtems_semaphore_obtain: not available -- NO_WAIT                    118  118
-   rtems_semaphore_release: no waiting tasks                           127  127
-
- 2 rtems_semaphore_obtain: not available -- caller blocks              842  840
-
- 3 rtems_semaphore_release: task readied -- preempts caller            777  751
-
- 4 rtems_task_restart: blocked task -- preempts caller                1611 1595
-   rtems_task_restart: ready task -- preempts caller                  1253 1395
-   rtems_semaphore_release: task readied -- returns to caller          365  345
-   rtems_task_create                                                   798  797
-   rtems_task_start                                                    464  460
-   rtems_task_restart: suspended task -- returns to caller             517  517
-   rtems_task_delete: suspended task                                   529  595
-   rtems_task_restart: ready task -- returns to caller                 527  525
-   rtems_task_restart: blocked task -- returns to caller               707  684
-   rtems_task_delete: blocked task                                     609  675
-
- 5 rtems_task_suspend: calling task                                    549  549
-   rtems_task_resume: task readied -- preempts caller                  702  699
-
- 6 rtems_task_restart: calling task                                    291  291
-   rtems_task_suspend: returns to caller                               195  194
-   rtems_task_resume: task readied -- returns to caller                198  198
-   rtems_task_delete: ready task                                       734  736
-
- 7 rtems_task_restart: suspended task -- preempts caller              1049  990
-
- 8 rtems_task_set_priority: obtain current priority                     94   94
-   rtems_task_set_priority: returns to caller                          418  355
-   rtems_task_mode: obtain current mode                                 44   43
-   rtems_task_mode: no reschedule                                        0   49
-   rtems_task_mode: reschedule -- returns to caller                      0  232 
-   rtems_task_mode: reschedule -- preempts caller                        0  687
-   rtems_task_set_note                                                   0  101
-   rtems_task_get_note                                                   0  103
-   rtems_clock_set                                                       0  237
-   rtems_clock_get                                                       0   16
-
- 9 rtems_message_queue_create                                         3583 3432
-   rtems_message_queue_send: no waiting tasks                          252  252
-   rtems_message_queue_urgent: no waiting tasks                        252  252
-   rtems_message_queue_receive: available                              207  207
-   rtems_message_queue_flush: no messages flushed                       95   96
-   rtems_message_queue_flush: messages flushed                         110  110
-   rtems_message_queue_delete                                         1044 1111
-
-10 rtems_message_queue_receive: not available -- NO_WAIT               132  131
-   rtems_message_queue_receive: not available -- caller blocks         884  892
-
-11 rtems_message_queue_send: task readied -- preempts caller           397  817 
-
-12 rtems_message_queue_send: task readied -- returns to caller         397  397
-
-13 rtems_message_queue_urgent: task readied -- preempts caller         816  817
-
-14 rtems_message_queue_urgent: task readied -- returns to caller       397  398
-
-15 rtems_event_receive: obtain current events                            5    5
-   rtems_event_receive: not available -- NO_WAIT                        99   99
-   rtems_event_receive: not available -- caller blocks                 689  689
-   rtems_event_send: no task readied                                   123  123
-   rtems_event_receive: available                                      326  349
-   rtems_event_send: task readied -- returns to caller                 333  429
-
-16 rtems_event_send: task readied -- preempts caller                   843  838
-
-17 rtems_task_set_priority: preempts caller                           1002  991
-
-18 rtems_task_delete: calling task                                    1171 1157
-
-19 rtems_signal_catch                                                    0 1306
-   rtems_signal_send: returns to caller                                  0 1019
-   rtems_signal_send: signal to self                                     0  496
-   exit ASR overhead: returns to calling task                            0  120
-   exit ASR overhead: returns to preempting task                         0   73
-
-20 rtems_partition_create                                             1293 1306
-   rtems_region_create                                                1010 1019
-   rtems_partition_get_buffer: available                               481  496
-   rtems_partition_get_buffer: not available                           120  120
-   rtems_partition_return_buffer                                       587  460
-   rtems_partition_delete                                              379  320
-   rtems_region_get_segment: available                                 179  179
-   rtems_region_get_segment: not available -- NO_WAIT                  349  293
-   rtems_region_return_segment: no waiting tasks                       335  322
-   rtems_region_get_segment: not available -- caller blocks           1603 1496
-   rtems_region_return_segment: task readied -- preempts caller       1616 1533
-   rtems_region_return_segment: task readied -- returns to caller      940  939
-   rtems_region_delete                                                 301  348
-   rtems_io_initialize                                                   9   10
-   rtems_io_open                                                         6    6
-   rtems_io_close                                                        6    6
-   rtems_io_read                                                         6    6
-   rtems_io_write                                                        6    5
-   rtems_io_control                                                      6    6
-
-21 rtems_task_ident                                                   1057 1058
-   rtems_message_queue_ident                                           963  963
-   rtems_semaphore_ident                                              1137 1136
-   rtems_partition_ident                                               962  961
-   rtems_region_ident                                                  923  924
-   rtems_port_ident                                                    918  917
-   rtems_timer_ident                                                   942  941
-   rtems_rate_monotonic_ident                                          924  925
-
-22 rtems_message_queue_broadcast: task readied -- returns to caller   1084 1095
-   rtems_message_queue_broadcast: no waiting tasks                     147  148
-   rtems_message_queue_broadcast: task readied -- preempts caller     1305 1268
-
-23 rtems_timer_create                                                  202  201
-   rtems_timer_fire_after: inactive                                    261  261
-   rtems_timer_fire_after: active                                      271  269
-   rtems_timer_cancel: active                                          142  141
-   rtems_timer_cancel: inactive                                        122  124
-   rtems_timer_reset: inactive                                         222  222
-   rtems_timer_reset: active                                           246  245
-   rtems_timer_fire_when: inactive                                     312  311
-   rtems_timer_fire_when: active                                       358  358
-   rtems_timer_delete: active                                          263  263
-   rtems_timer_delete: inactive                                        247  247
-   rtems_task_wake_when                                                833  831
-
-24 rtems_task_wake_after: yield -- returns to caller                    99   98
-   rtems_task_wake_after: yields -- preempts caller                    479  478
-
-25 rtems_clock_tick                                                    313  318
-
-26 _ISR_Disable                                                         64   57
-   _ISR_Flash                                                           51   36
-   _ISR_Enable                                                          31   18
-   _Thread_Disable_dispatch                                             53   37
-   _Thread_Enable_dispatch                                             260  233
-   _Thread_Set_state                                                   446  463
-   _Thread_Disptach (NO FP)                                            839  801
-   context switch: no floating point contexts                          673  653
-   context switch: self                                                156  162
-   context switch: to another task                                      84   70
-   context switch: restore 1st FP task                                1030 1013
-   fp context switch: save idle, restore idle                          969  948
-   fp context switch: save idle, restore initialized                   275  267
-   fp context switch: save initialized, restore initialized            319  292
-   _Thread_Resume                                                      512  480
-   _Thread_Unblock                                                     121  139
-   _Thread_Ready                                                       199  203
-   _Thread_Get                                                          27   27
-   _Semaphore_Get                                                       20   21
-   _Thread_Get: invalid id                                               5    5
-
-27 interrupt entry overhead: returns to interrupted task                 0    0
-   interrupt exit overhead: returns to interrupted task                 27   41
-   interrupt entry overhead: returns to nested interrupt                 0    0
-   interrupt exit overhead: returns to nested interrupt                  0    0
-   interrupt entry overhead: returns to preempting task                  0    0
-   interrupt exit overhead: returns to preempting task                   0    0
-
-28 rtems_port_create                                                   574  560
-   rtems_port_external_to_internal                                      87   87
-   rtems_port_internal_to_external                                      86   86
-   rtems_port_delete                                                   395  353
-
-29 rtems_rate_monotonic_create                                         621  633
-   rtems_rate_monotonic_period: initiate period -- returns to caller   773  694
-   rtems_rate_monotonic_period: obtain status                          295  284
-   rtems_rate_monotonic_cancel                                         408  451
-   rtems_rate_monotonic_delete: inactive                               453  471
-   rtems_rate_monotonic_delete: active                                 332  336
-   rtems_rate_monotonic_period: conclude periods -- caller blocks      664  686
diff --git a/c/src/lib/libbsp/mips64orion/p4000/start/Makefile.in b/c/src/lib/libbsp/mips64orion/p4000/start/Makefile.in
deleted file mode 100644
index 046969120a..0000000000
--- a/c/src/lib/libbsp/mips64orion/p4000/start/Makefile.in
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-# C source names, if any, go here -- minus the .c
-C_PIECES=
-C_FILES=$(C_PIECES:%=%.c)
-C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
-
-H_FILES=
-
-# Assembly source names, if any, go here -- minus the .s
-S_PIECES=idt_csu
-S_FILES=$(S_PIECES:%=%.S)
-S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
-
-SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES)
-OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
-
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-PGM=${ARCH}/idt_csu.o
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES  +=
-CPPFLAGS +=
-CFLAGS   +=
-
-LD_PATHS  +=
-LD_LIBS   +=
-LDFLAGS   +=
-
-#
-# Add your list of files to delete here.  The config files
-#  already know how to delete some stuff, so you may want
-#  to just run 'make clean' first to see what gets missed.
-#  'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
-
-all:	${ARCH} $(SRCS) $(OBJS) $(PGM)
-	$(INSTALL_VARIANT) -m 555 ${PGM} ${PROJECT_RELEASE}/lib
diff --git a/c/src/lib/libbsp/mips64orion/p4000/start/start.S b/c/src/lib/libbsp/mips64orion/p4000/start/start.S
deleted file mode 100644
index 8dc31c8999..0000000000
--- a/c/src/lib/libbsp/mips64orion/p4000/start/start.S
+++ /dev/null
@@ -1,299 +0,0 @@
-/*
-
-Based upon IDT provided code with the following release:
-
-This source code has been made available to you by IDT on an AS-IS
-basis. Anyone receiving this source is licensed under IDT copyrights
-to use it in any way he or she deems fit, including copying it,
-modifying it, compiling it, and redistributing it either with or
-without modifications.  No license under IDT patents or patent
-applications is to be implied by the copyright license.
-
-Any user of this software should understand that IDT cannot provide
-technical support for this software and will not be responsible for
-any consequences resulting from the use of this software.
-
-Any person who transfers this source code or any derivative work must
-include the IDT copyright notice, this paragraph, and the preceeding
-two paragraphs in the transferred software.
-
-COPYRIGHT IDT CORPORATION 1996
-LICENSED MATERIAL - PROGRAM PROPERTY OF IDT
-
-  $Id$
-*/ 
-
-/*************************************************************************
-**
-** Copyright 1991-95 Integrated Device Technology, Inc.
-**	All Rights Reserved
-**
-** idt_csu.S -- IDT stand alone startup code
-**
-**************************************************************************/
-#include <rtems/score/iregdef.h>
-#include <rtems/score/idtcpu.h>
-#include <rtems/score/idtmon.h>
-
-
-.extern _fbss,4		  /* this is defined by the linker */
-.extern end,4		  /* this is defined by the linker */
-
-.lcomm sim_mem_cfg_struct,12
-
-	.text
-
-
-#define TMP_STKSIZE  1024 
-
-/**************************************************************************
-**
-**  start - Typicl standalone start up code required for R3000/R4000
-**
-**
-**	1)  Initialize the STATUS Register
-**		a) Clear parity error bit
-**		b) Set co_processor 1 usable bit ON
-**		c) Clear all IntMask Enables
-**		d) Set kernel/disabled mode
-**	2)  Initialize Cause Register
-**		a)  clear software interrupt bits       
-**	3)  Determine FPU installed or not
-**		if not, clear CoProcessor 1 usable bit
-**	4)  Clear bss area
-**	5)  MUST allocate temporary stack until memory size determined
-**	    It MUST be uncached to prevent overwriting when caches are cleared
-**	6)  Install exception handlers
-**	7)  Determine memory and cache sizes
-**	8)  Establish permanent stack (cached or uncached as defined by bss)
-**	9)  Flush Instruction and Data caches
-** 	10)  If there is a Translation Lookaside Buffer, Clear the TLB
-** 	11)  Execute initialization code if the IDT/c library is to be used
-** 
-** 	12)  Jump to user's "main()"
-** 	13)  Jump to promexit
-**
-**	IDT/C 5.x defines _R3000, IDT/C 6.x defines _R4000 internally. 
-**	This is used to mark code specific to R3xxx or R4xxx processors.
-**	IDT/C 6.x defines __mips to be the ISA level for which we're 
-**	generating code. This is used to make sure the stack etc. is 
-**	double word aligned, when using -mips3 (default) or -mips2, 
-**	when compiling with IDT/C6.x
-**
-***************************************************************************/
-
-FRAME(start,sp,0,ra)
-
-	.set	noreorder
-#ifdef _R3000
-	li	v0,SR_PE|SR_CU1        /* reset parity error and set */
-					/* cp1 usable */
-#endif
-#ifdef _R4000
-#if __mips==3 || defined(R4650)
-	li	v0,SR_CU1|SR_DE|SR_FR 	/* initally clear ERL, enable FPA 64bit regs*/
-	                                /* 4650: Need fr to be set anyway */
-#else
-	li	v0,SR_CU1|SR_DE 	/* initally clear ERL, enable FPA 32bit regs*/
-#endif mips3
-#endif
-
-	mtc0	v0,C0_SR		/* clr IntMsks/ kernel/disabled mode */
-	nop
-	mtc0	zero,C0_CAUSE		/* clear software interrupts */
-	nop
-
-#ifdef _R4000
-	li	v0,CFG_C_NONCOHERENT	# initialise default cache mode
-	mtc0	v0,C0_CONFIG
-#endif
-
-/*
-**	check to see if an fpu is really plugged in 
-*/
-	li	t3,0xaaaa5555		/*  put a's and 5's in t3	*/
-	mtc1	t3,fp0			/* try to write them into fp0   */	
-	mtc1	zero,fp1		/* try to write zero in fp	*/
-	mfc1	t0,fp0
-	mfc1	t1,fp1
-	nop
-	bne	t0,t3,1f		/* branch if no match  */
-	nop
-	bne	t1,zero,1f		/* double check for positive id   */
-	nop
-	/* We have a FPU. clear fcsr */
-	ctc1	zero, fcr31
-	j	2f			/* status register already correct  */
-	nop
-1:
-#ifdef _R3000
-	li	v0, SR_PE		/* reset parity error/NO cp1 usable */
-#endif
-
-#ifdef _R4000
-        li      v0,SR_DE 		/* clear ERL and disable FPA */
-#endif
-
-	mtc0	v0, C0_SR		/* reset status register */
-2:
-	la  	gp, _gp			
-
-	la	v0,_fbss 		/* clear bss before using it */
-	la	v1,end 			/* end of bss */
-3:	sw	zero,0(v0)
-	bltu	v0,v1,3b
-	add	v0,4 
-
-
-/************************************************************************
-**
-** 	Temporary Stack - needed to  handle stack saves until
-**			  memory size is determined and permanent stack set
-**
-**			  MUST be uncached to avoid confusion at cache
-**			       switching during memory sizing
-**
-*************************************************************************/
-#if __mips==3
-	/* For MIPS 3, we need to be sure that the stack is aligned on a
-	 * double word boundary. 
-	 */
-	andi	t0, v0, 0x7
-	beqz	t0, 11f   /* Last three bits Zero, already aligned */
-	nop
-	add	v0, 4
-11:
-#endif
-
-	or	v0, K1BASE		/* switch to uncached */
-	add	v1, v0, TMP_STKSIZE 	/* end of bss + length of tmp stack */
-	sub	v1, v1, (4*4)		/* overhead */
-	move	sp, v1			/* set sp to top of stack */
-4:	sw	zero, 0(v0)  
-	bltu	v0, v1, 4b		/* clear out temp stack */
-	add	v0, 4 
-	
-	jal	init_exc_vecs		/* install exception handlers */ 
-	nop				/* MUST do before memory probes */
-
-	la	v0, 5f
-	li	v1, K1BASE		/* force into uncached space */
-	or	v0, v1			/* during memory/cache probes */
-	j	v0
-	nop
-5:
-	la	a0, sim_mem_cfg_struct
-	jal	sim_mem_cfg		/* Make SIM call to get mem size */
-	nop
-	la	a0, sim_mem_cfg_struct
-	lw	a0, 0(a0)		/* Get memory size from struct */
-#ifdef _R3000
-	jal	config_Icache
-	nop
-	jal	config_Dcache		/* determine size of D & I caches */
-	nop	
-#endif
-#ifdef _R4000
-	jal	config_cache		/* determine size of D & I caches */
-	nop
-#endif
-
-	move	v0, a0			/* mem_size */
-
-#if __mips==3
-	/* For MIPS 3, we need to be sure that the stack (and hence v0
-	 * here) is aligned on a double word boundary. 
-	 */
-	andi	t0, v0, 0x7
-	beqz	t0, 12f   /* Last three bits Zero, already aligned */
-	nop
-	subu	v0, 4	/* mem_size was not aligned on doubleword bdry????*/
-12:
-#endif
-
-
-
-/**************************************************************************
-**
-**  Permanent Stack - now know top of memory, put permanent stack there	
-**
-***************************************************************************/ 
-
-	la	t2, _fbss		/* cache mode as linked */
-	and	t2, 0xF0000000		/* isolate segment */
-	la	t1, 6f
-	j	t1			/* back to original cache mode */
-	nop
-6:
-	or 	v0, t2			/* stack back to original cache mode */
-	addiu   v0,v0,-16		/* overhead */
-	move	sp, v0			/* now replace count w top of memory */
-	move	v1, v0
-	subu	v1, P_STACKSIZE 	/* clear requested stack size */
-
-7:	sw	zero, 0(v1)		/* clear P_STACKSIZE  stack */ 
-	bltu	v1,v0,7b
-	add	v1, 4 
-	.set	reorder
-
-#ifdef _R3000 
-	jal	flush_Icache	
-	jal	flush_Dcache		/* flush Data & Instruction caches */
-#endif
-#ifdef _R4000 
-	jal	flush_cache_nowrite	/* flush Data & Instruction caches */
-#endif
-
-
-
-/**************************************************************************
-**
-**	If this chip supports a Translation Lookaside Buffer, clear it
-**
-***************************************************************************/ 
-
-	.set	noreorder
-	mfc0	t1,  C0_SR		/* look at Status Register */
-	nop
-	.set 	reorder
-#ifdef _R3000
-	li	t2, SR_TS		/* TLB Shutdown bit */
-	and 	t1,t2      		/* TLB Shutdown if 1 */
-	bnez	t1, 8f			/* skip clearing if no TLB */	
-#endif
-
-#ifndef R4650
-	jal	init_tlb		/* clear the tlb */
-#endif
-
-
-/************************************************************************
-**
-**  Initialization required if using IDT/c or libc.a, standard C Lib 
-**
-**  can SKIP if not necessary for application
-**
-************************************************************************/
-8:
-
-	jal	idtsim_init_sbrk
-	jal	idtsim_init_file
-/***********************  END I/O initialization **********************/
-
-
-	jal	main
-
-	jal	idtsim_promexit
-
-ENDFRAME(start)
-
-
-	.globl	sim_mem_cfg
-sim_mem_cfg:
-	.set noat
-	.set noreorder
-	li	AT, (0xbfc00000+((55)*8))
-	jr	AT
-	nop
-	.set at
-	.set reorder
diff --git a/c/src/lib/libbsp/powerpc/dmv177/Makefile.in b/c/src/lib/libbsp/powerpc/dmv177/Makefile.in
deleted file mode 100644
index 3e5ccf3e06..0000000000
--- a/c/src/lib/libbsp/powerpc/dmv177/Makefile.in
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/directory.cfg
-
-SRCS=README
-
-# We only build the networking device driver if HAS_NETWORKING was defined
-NETWORKING_DRIVER_yes_V = sonic
-NETWORKING_DRIVER = $(NETWORKING_DRIVER_$(HAS_NETWORKING)_V)
-
-all: $(SRCS)
-
-# wrapup is the one that actually builds and installs the library
-#  from the individual .rel files built in other directories
-SUB_DIRS=include clock console startup start timer \
-   scv64 tod $(NETWORKING_DRIVER) wrapup
diff --git a/c/src/lib/libbsp/powerpc/dmv177/QUIRKS b/c/src/lib/libbsp/powerpc/dmv177/QUIRKS
deleted file mode 100644
index e1d95e6427..0000000000
--- a/c/src/lib/libbsp/powerpc/dmv177/QUIRKS
+++ /dev/null
@@ -1,74 +0,0 @@
-#
-#  Quirks in the DY-4 DMV177
-#
-#  $Id$
-#
-
-JTAG and Caching
-================
-If data or code caching is enabled on certain revisions of the PPC603e,
-then the JTAG emulator interface become disfunctional.  You can not
-debug using the emulator on these chip revisions.  On certain revisions,
-it is so bad that when code caching is enabled, you can not even 
-download code reliably to the board.
-
-Caching and Peripherals
-=======================
-When caching is enabled, care must be exercised to insure that all
-peripheral addresses are still uncached.
-
-Exar 88681 Clock
-================
-This board uses a different clock for the Exar 88681 DUART than is
-documented in the Exar manual or the original MC68681 manual.  This
-resulted in the need for the the mc68681 libchip driver to support
-BSP specific baud rate tables and the development of a DMV177
-specific baud rate table.
-
-In the end, this all works but you have a very limited range of
-useful baud rates on the 88681 ports compared to what would have
-been supported had DY-4 just followed the Exar or Motorola manual.
-
-
-SCC Addresses
-=============
-The full set of SCC addresses is not documented in the DY-4 manual
-and they are not ordered as one would expect.  Normally the four
-SCC registers are ordered Control A, Data A, Control B, and Data B.
-DY-4 orders them with B first.
-
-This required extra time to debug.
-
-
-SCV64 and the Foundation Firmware
-=================================
-DY-4 technical support did not offer code to determine which interrupt
-sources were pending at the SCV64.  They recommended calling into the
-Foundation Firmware ROM monitor to figure this out.  The Foundation
-Firmware did not recognize enough interrupts on this board to be useful.
-
-In the end, we gave up on their technical support's recommendation
-and directly manipulated the SVC64.  This is what we wanted to do in
-the first place but we got no information from them to aid in this.
-Luckily, the manual does document enough of DY-4's mapping of the specific
-interrupt sources to make this work.
-
-
-Z85C30 SCC Clock Speed
-======================
-
-The Z85C30 SCC can be factory configured for 10 Mhz or 2.4616 Mhz.  Code
-had to be added to dynamically determine which clock was installed.
-
-The board we had used a 10 Mhz clock.  No testing was done with a 2.4616 Mhz
-clock.
-
-
-P2 Octopus Cable
-================
-
-DY-4's P2 breakout is large and a bit unwieldy.  It was difficult to 
-fight into the VME cage we used.  The SCSI connector comes off the 
-side and is very stiff thus making it difficult to route around
-anything in the back of the cage.  We gave up on trying to use
-it in the first few slots of OAR's cage.
diff --git a/c/src/lib/libbsp/powerpc/dmv177/README b/c/src/lib/libbsp/powerpc/dmv177/README
deleted file mode 100644
index 0f00873225..0000000000
--- a/c/src/lib/libbsp/powerpc/dmv177/README
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-#  $Id$
-#
-
-BSP NAME:           dmv177
-BOARD:              DY-4 DMV177
-BUS:                VMEBus
-CPU FAMILY:         powerpc
-CPU:                PowerPC 603e
-COPROCESSORS:       N/A
-MODE:               32 bit mode
-
-DEBUG MONITOR:      DY-4 General Purpose Monitor (GPM)
-
-PERIPHERALS
-===========
-TIMERS:             PPC internal Timebase register
-  RESOLUTION:         ???
-SERIAL PORTS:       2 RS-232 provided by a Exar 88681
-                    2 RS-422 provided by a Zilog Z8530
-REAL-TIME CLOCK:    PPC internal Decrementer register
-DMA:                none
-RTC:                Harris ICM7170
-VIDEO:              none
-SCSI:               QLogic FAS216 SCSI-2 (unsupported)
-NETWORKING:         National Semiconductor SONIC DP83932B (Ethernet)
-
-DRIVER INFORMATION
-==================
-CLOCK DRIVER:       PPC internal
-SHMSUPP:            N/A
-TIMER DRIVER:       PPC internal
-CONSOLE DRIVER:     Uses libchip drivers for Exar 88681 and Zilog Z8530.
-
-STDIO
-=====
-
-These are the default settings.
-
-PORT:               Console port 0
-ELECTRICAL:         RS-232
-BAUD:               9600
-BITS PER CHARACTER: 8
-PARITY:             N
-STOP BITS:          1
-
-Notes
-=====
-The console and real-time clock drivers use the libchip library.
diff --git a/c/src/lib/libbsp/powerpc/dmv177/README.net b/c/src/lib/libbsp/powerpc/dmv177/README.net
deleted file mode 100644
index b3ff231340..0000000000
--- a/c/src/lib/libbsp/powerpc/dmv177/README.net
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-#  $Id$
-#
-
-Setting the Ethernet Hardware Address
-=====================================
-
-The hardware Ethernet address is not set at the factory.  It is the
-responsibility of the end-user to insure that it is set properly.
-This file describes the standard procedure recommended by DY-4 
-technical support for setting this address.  This procedure is 
-similar to that followed by VxWorks as documented in DY-4
-Document Number #807885.
-
-The hardware Ethernet address and OS configuration information
-must be stored in the SEEPROM non-volatile memory of the
-SVME/DMV-176/177. The Foundation Firmware (FFW) reserves the 
-first 256 bytes of the SEEPROM for its own use and the remaining
-remaining 256 bytes are available for OS specific information.
-
-Three bytes in the Serial EEPROM are used for the lowest three bytes
-of the hardware Ethernet address These should be set to the serial
-number of your SVME/DMV-176/177 card to ensure a unique Ethernet
-address on your network. The three high bytes are hard coded in the
-BSP and represent the vendor-specific Ethernet codes (0x00, 0x80, 0x7F).
-Together these six bytes form the target's Ethernet address.
-
-Address is of the form ...
-
-NOTE: The serial number is found on the packaging (box) that the
-board came in OR it is also located on the solder side of the board  and
-looks something like SERNO:XXXXXX.  It can not be determined dynamically
-by software.
-
-Prior to using the Ethernet controller on the SVME/DMV-176/177 for the
-first time, the Ethernet address bytes must be programmed into the
-Serial EEPROM on the target card.   The 'emm' (EEPROM Memory Modification)
-command in the General Purpose Monitor (GPM) can be used to do this.
-
-In this example we will assume that the serial number of the target card
-is 123456.
-
-
-
diff --git a/c/src/lib/libbsp/powerpc/dmv177/STATUS b/c/src/lib/libbsp/powerpc/dmv177/STATUS
deleted file mode 100644
index 394412421e..0000000000
--- a/c/src/lib/libbsp/powerpc/dmv177/STATUS
+++ /dev/null
@@ -1,82 +0,0 @@
-#
-#  This is a status file for the update effort.
-#
-
-make/custom
-===========
-dmv17x.cfg
-
-TOP
-===
-README
-Makefile.in
-bsp_specs
-
-clock
-=====
-clock.c
-Makefile.in
-
-console
-=======
-Changed console from
-  duart.c
-  console.c
-To 
-  consolebsp.h
-  console.c
-  85c30.c
-  tbl85c30.c
-
-Note:  Check the number of serial ports and modify 
-       tbl85c30.c values to indicate the correct values.
-
-Makefile.in - Modified with new file names.
-
-timer
-=======
-timer.c
-Makefile.in
-
-include
-=======
-chain.h
-dmv170.h
-bsp.h
-Makefile
-Makefile.in
-coverhd.h
-
-network
-=======
-Eric's problem
-
-startup
-=======
-device-tree - remove
-linkcmds        
-setvec.c        - Modified to acount for general purpose vector.
-sbrk.c          - Ok
-rtems-ctor.cc   - Ok
-bspclean.s      - Ok
-vmeintr.c       
-Makefile.in     - Added genpvec.c
-bspstart.c      - Modified with changes from vista bsp.
-
-Added:
-genpvec.c
-
-Note:  Need to add routine which connects the general purpose interupt with the
-       various interupt handlers.  genpvec.c uses this routine and may need
-       to be modified.
-wrapup
-=======
-wrapup/Makefile.in
-
-vectors
-=======
-
-start
-=======
-start/Makefile.in
-start/start.s      - Made modifications based upon Score603e mods.
diff --git a/c/src/lib/libbsp/powerpc/dmv177/bsp_specs b/c/src/lib/libbsp/powerpc/dmv177/bsp_specs
deleted file mode 100644
index ab5a8ddbeb..0000000000
--- a/c/src/lib/libbsp/powerpc/dmv177/bsp_specs
+++ /dev/null
@@ -1,23 +0,0 @@
-%rename cpp old_cpp
-%rename lib old_lib
-%rename endfile old_endfile
-%rename startfile old_startfile
-%rename link old_link
-
-*cpp:
-%(old_cpp) %{qrtems: -D__embedded__} -Asystem(embedded)
-
-*lib:
-%{!qrtems: %(old_lib)} %{qrtems: --start-group \
-%{!qrtems_debug: -lrtemsall} %{qrtems_debug: -lrtemsall_g} \
--lc -lgcc --end-group  ecrtn%O%s \
-%{!qnolinkcmds: -T linkcmds%s}}
-
-*startfile:
-%{!qrtems: %(old_startfile)} %{qrtems:  ecrti%O%s \
-%{!qrtems_debug: start.o%s} \
-%{qrtems_debug: start_g.o%s}}
-
-*link:
-%{!qrtems: %(old_link)} %{qrtems: -Qy -dp -Bstatic -T linkcmds%s -e _start -u __vectors}
-
diff --git a/c/src/lib/libbsp/powerpc/dmv177/cable.doc b/c/src/lib/libbsp/powerpc/dmv177/cable.doc
deleted file mode 100644
index e77fbd9a95..0000000000
--- a/c/src/lib/libbsp/powerpc/dmv177/cable.doc
+++ /dev/null
@@ -1,97 +0,0 @@
-#
-#  Cable information for the DY-4 DMV177
-#
-#  $Id$
-#
-
-Background
-==========
-
-All serial cables described in this file were built using RJ-45 ribbon
-cables which were plugged into DB-25 or DB-9 adapters wired as described.
-Matching the colors of the wires in the shell is the easiest way to 
-make sure the cable is built properly.
-
-The board is configured as follows:
-
-  - An MC68681 is the first two serial ports.  These are RS-232 and may
-    be accessed via the front panel or the P2.  The front panel connector
-    has both A and B serial ports on a single connector. DY-4 part number
-    "OBYC3ASSY901132-000 Rev-" brings these ports out to two DB-25 
-    female connectors.
-
-  - The MC68681 serial ports are also accessible on the P2 connector.
-    DY-4 part number "OBYC3ASSY901080-004 Rev A" brings these out
-    to DB-9 female connectors.  These were not used in this effort.
-
-  - A Z85C30 is used for the third and fourth serial ports.  These are
-    RS-422 and may only be accessed via the P2 connector.  These are
-    brought out to DB-25 male connectors.  An RS-422 to RS-232 converter
-    was used to interface with these serial ports.
-
-References
-==========
-
-  - Linux Serial FAQ
-  - http://ahmed.egypt.com/electronics/serial 
-  - DY-4 Documentation
-
-RS-422 Converter
-================
-
-An RS-422 to RS-232 converter from B&B Electronics was used to
-adapt the RS-422 signals so they could be used with a normal
-RS-232 serial port.  Here is the information required to purchase
-one of these:
-
-    RS-232/RS-422 Converter:     Model 422LCON
-    Power Supply:                Model 422PS
-
-    B&B Electronics Manufacturing Company
-    707 Dayton Road
-    PO Box 1040
-    Ottawa, IL 61350
-    Voice: (815) 433-5100
-    FAX:   (815)434-7094
-
-
-Front Panel RS-232 Connection to a PC
-=====================================
-
-    Board's DB-25    PC's DB-9     Color in
-      Channel A         COM1        Shell
-    =============   ============  =========
-     RX on pin 2     TX on pin 2    Red
-     TX on pin 3     RX on pin 3    Blue
-    GND on pin 7    GND on pin 5    Black
-    DTR on pin 20   DTR on pin 4    Brown
-
-    No other signals are used.
-
-RS-422 Connection to a PC
-=========================
-
-This requires two cables with the converter connecting them.
-
-P2 RS-422 to the RS-422/RS-232 Converter
-========================================
-
-        Board's          Converter's    Color in
-        DB-25           RS-422 DB-25     Shell
-    ===============    ==============   ========
-    TXD_A on pin 2     RDA on pin 5      Red
-    TXD_B on pin 14    RDB on pin 17     Blue
-    RX_A on pin 3      TDA on pin 2      Brown
-    RX_B on pin 16     TDB on pin 14     Green
-    GND on pin 7       GND on pin 7      Black 
-
-  
-     Converter's       PC's DB-9     Color in
-     RS-232 DB-25         COM1        Shell
-    ===============  ==============  ========
-     TX on pin  2     TX on pin 2      Blue
-     RX on pin  3     RX on pin 3      Red
-    GND on pin  5    GND on pin 5      Black
-    DTR on pin  4    DTR on pin 4      Brown
-
-    No other signals
diff --git a/c/src/lib/libbsp/powerpc/dmv177/clock/Makefile.in b/c/src/lib/libbsp/powerpc/dmv177/clock/Makefile.in
deleted file mode 100644
index 7c2cfc0772..0000000000
--- a/c/src/lib/libbsp/powerpc/dmv177/clock/Makefile.in
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-PGM=${ARCH}/clock.rel
-
-# C source names, if any, go here -- minus the .c
-C_PIECES=clock
-C_FILES=$(C_PIECES:%=%.c)
-C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
-
-H_FILES=
-
-# Assembly source names, if any, go here -- minus the .s
-S_PIECES=
-S_FILES=$(S_PIECES:%=%.s)
-S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
-
-SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES)
-OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
-
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES  +=
-CPPFLAGS +=
-CFLAGS   +=
-
-LD_PATHS  +=
-LD_LIBS   +=
-LDFLAGS   +=
-
-#
-# Add your list of files to delete here.  The config files
-#  already know how to delete some stuff, so you may want
-#  to just run 'make clean' first to see what gets missed.
-#  'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
-
-${PGM}: ${SRCS} ${OBJS}
-	$(make-rel)
-
-all:	${ARCH} $(SRCS) $(PGM)
-
-# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
-install:  all
diff --git a/c/src/lib/libbsp/powerpc/dmv177/clock/clock.c b/c/src/lib/libbsp/powerpc/dmv177/clock/clock.c
deleted file mode 100644
index 75490a3382..0000000000
--- a/c/src/lib/libbsp/powerpc/dmv177/clock/clock.c
+++ /dev/null
@@ -1,246 +0,0 @@
-/*
- *  Clock Tick Device Driver
- *
- *  This routine utilizes the Decrementer Register common to the PPC family.
- *
- *  The tick frequency is directly programmed to the configured number of
- *  microseconds per tick.
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <stdlib.h>
-
-#include <bsp.h>
-#include <rtems/libio.h>
-
-extern rtems_cpu_table Cpu_table;
-
-/*
- *  The Real Time Clock Counter Timer uses this trap type.
- */
-
-#define CLOCK_VECTOR PPC_IRQ_DECREMENTER
-
-/*
- *  Clock ticks since initialization
- */
-
-volatile rtems_unsigned32 Clock_driver_ticks;
-
-/*
- *  This is the value programmed into the count down timer.
- */
-
-rtems_unsigned32 Clock_Decrementer_value;
-
-/*
- * This is the value of the old isr routine.
- */
-rtems_isr_entry  Old_ticker;
-
-
-void Clock_exit( void );
- 
-/*
- * These are set by clock driver during its init
- */
- 
-rtems_device_major_number rtems_clock_major = ~0;
-rtems_device_minor_number rtems_clock_minor;
-
-/*PAGE
- *
- *  Clock_isr
- *
- *  This is the clock tick interrupt handler.
- *
- *  Input parameters:
- *    vector - vector number
- *
- *  Output parameters:  NONE
- *
- *  Return values:      NONE
- *
- */
-
-rtems_isr Clock_isr(
-  rtems_vector_number  vector,
-  CPU_Interrupt_frame *frame
-)
-{
-  /*
-   *  Set the decrementer.
-   */
-
-  PPC_Set_decrementer( Clock_Decrementer_value );
-
-  /*
-   *  The driver has seen another tick.
-   */
-
-  Clock_driver_ticks += 1;
-
-  /*
-   *  Real Time Clock counter/timer is set to automatically reload.
-   */
-
-  rtems_clock_tick();
-}
-
-/*PAGE
- *
- *  Install_clock
- *
- *  This routine actually performs the hardware initialization for the clock.
- *
- *  Input parameters:
- *    clock_isr - clock interrupt service routine entry point
- *
- *  Output parameters:  NONE
- *
- *  Return values:      NONE
- *
- */
-
-extern int CLOCK_SPEED;
-
-void Install_clock(
-  rtems_isr_entry clock_isr
-)
-{
-  Clock_driver_ticks = 0;
-
-  if ( BSP_Configuration.ticks_per_timeslice ) {
-    Old_ticker = (rtems_isr_entry) set_vector( clock_isr, CLOCK_VECTOR, 1 );
-
-    PPC_Set_decrementer( Clock_Decrementer_value );
-
-    atexit( Clock_exit );
-  }
-}
-
-/*PAGE
- *
- *  Clock_exit
- *
- *  This routine allows the clock driver to exit by masking the interrupt and
- *  disabling the clock's counter.
- *
- *  Input parameters:   NONE
- *
- *  Output parameters:  NONE
- *
- *  Return values:      NONE
- *
- */
-
-void Clock_exit( void )
-{
-  if ( BSP_Configuration.ticks_per_timeslice ) {
-
-    /* nothing to do */; 
-
-    /* do not restore old vector */
-  }
-}
- 
-/*PAGE
- *
- *  Clock_initialize
- *
- *  This routine initializes the clock driver.
- *
- *  Input parameters:
- *    major - clock device major number
- *    minor - clock device minor number
- *    parg  - pointer to optional device driver arguments
- *
- *  Output parameters:  NONE
- *
- *  Return values:
- *    rtems_device_driver status code
- */
-
-rtems_device_driver Clock_initialize(
-  rtems_device_major_number major,
-  rtems_device_minor_number minor,
-  void *pargp
-)
-{
-  Clock_Decrementer_value = Cpu_table.clicks_per_usec *
-                       BSP_Configuration.microseconds_per_tick;
-
-  Install_clock( Clock_isr );
- 
-  /*
-   * make major/minor avail to others such as shared memory driver
-   */
- 
-  rtems_clock_major = major;
-  rtems_clock_minor = minor;
- 
-  return RTEMS_SUCCESSFUL;
-}
- 
-/*  PAGE
- *
- *  Clock_control
- *
- *  This routine is the clock device driver control entry point.
- *
- *  Input parameters:
- *    major - clock device major number
- *    minor - clock device minor number
- *    parg  - pointer to optional device driver arguments
- *
- *  Output parameters:  NONE
- *
- *  Return values:
- *    rtems_device_driver status code
- */
-
-rtems_device_driver Clock_control(
-  rtems_device_major_number major,
-  rtems_device_minor_number minor,
-  void *pargp
-)
-{
-    rtems_unsigned32 isrlevel;
-    rtems_libio_ioctl_args_t *args = pargp;
- 
-    if (args == 0)
-        goto done;
- 
-    /*
-     * This is hokey, but until we get a defined interface
-     * to do this, it will just be this simple...
-     */
- 
-    if (args->command == rtems_build_name('I', 'S', 'R', ' '))
-    {
-        Clock_isr( CLOCK_VECTOR, pargp );
-    }
-    else if (args->command == rtems_build_name('N', 'E', 'W', ' '))
-    {
-      rtems_interrupt_disable( isrlevel );
-       (void) set_vector( args->buffer, CLOCK_VECTOR, 1 );
-      rtems_interrupt_enable( isrlevel );
-    }
- 
-done:
-    return RTEMS_SUCCESSFUL;
-}
-
-
-
-
-
diff --git a/c/src/lib/libbsp/powerpc/dmv177/console/Makefile.in b/c/src/lib/libbsp/powerpc/dmv177/console/Makefile.in
deleted file mode 100644
index 261eb79a82..0000000000
--- a/c/src/lib/libbsp/powerpc/dmv177/console/Makefile.in
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-VPATH = @srcdir@:@srcdir@/../../../shared
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-PGM=${ARCH}/console.rel
-
-# C source names, if any, go here -- minus the .c
-C_PIECES=config console debugio
-C_FILES=$(C_PIECES:%=%.c)
-C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
-
-H_FILES=
-
-SRCS=$(C_FILES) $(H_FILES)
-OBJS=$(C_O_FILES)
-
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES  +=
-CPPFLAGS +=
-CFLAGS   +=
-
-LD_PATHS  +=
-LD_LIBS   +=
-LDFLAGS   +=
-
-#
-# Add your list of files to delete here.  The config files
-#  already know how to delete some stuff, so you may want
-#  to just run 'make clean' first to see what gets missed.
-#  'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
-
-${PGM}: ${SRCS} ${OBJS}
-	$(make-rel)
-
-all:	${ARCH} $(SRCS) $(PGM)
-
-# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
-install:  all
diff --git a/c/src/lib/libbsp/powerpc/dmv177/console/config.c b/c/src/lib/libbsp/powerpc/dmv177/console/config.c
deleted file mode 100644
index e3a0eb073f..0000000000
--- a/c/src/lib/libbsp/powerpc/dmv177/console/config.c
+++ /dev/null
@@ -1,283 +0,0 @@
-/*
- *  This file contains the TTY driver table for the DY-4 DMV177.
- *
- *  COPYRIGHT (c) 1989, 1990, 1991, 1992, 1993, 1994, 1997.
- *  On-Line Applications Research Corporation (OAR).
- *  All rights assigned to U.S. Government, 1994.
- *
- *  $Id$
- */
-
-#include <bsp.h>
-
-#include <libchip/serial.h>
-#include <libchip/mc68681.h>
-#include <libchip/z85c30.h>
-
-/*
- * Configuration specific probe routines
- *
- *
- * NOTE:  There are no DMV177 specific configuration routines.  These
- *        routines could be written to dynamically determine which serial
- *        ports are on a board.  Debugging this would require access to
- *        multiple board models.
- */
-
-/* NONE CURRENTLY PROVIDED */
-
-/*
- * The following table configures the console drivers used in this BSP.
- *
- * The first entry which, when probed, is available, will be named /dev/console,
- * all others being given the name indicated.
- */
-
-mc68681_baud_t 
-  dmv177_mc68681_baud_table[4][RTEMS_TERMIOS_NUMBER_BAUD_RATES] = {
-  { /* ACR[7] = 0, X = 0 */
-    MC68681_BAUD_NOT_VALID,    /* B0 */
-    MC68681_BAUD_NOT_VALID,    /* B50 */
-    0x01,                      /* B75 */
-    MC68681_BAUD_NOT_VALID,    /* B110 */
-    0x03,                      /* B134 */
-    MC68681_BAUD_NOT_VALID,    /* B150 */
-    0x04,                      /* B200 */
-    MC68681_BAUD_NOT_VALID,    /* B300 */
-    MC68681_BAUD_NOT_VALID,    /* B600 */
-    MC68681_BAUD_NOT_VALID,    /* B1200 */
-    MC68681_BAUD_NOT_VALID,    /* B1800 */
-    MC68681_BAUD_NOT_VALID,    /* B2400 */
-    0x0A,                      /* B4800 */
-    MC68681_BAUD_NOT_VALID,    /* B9600 */
-    MC68681_BAUD_NOT_VALID,    /* B19200 */
-    MC68681_BAUD_NOT_VALID,    /* B38400 */
-    MC68681_BAUD_NOT_VALID,    /* B57600 */
-    MC68681_BAUD_NOT_VALID,    /* B115200 */
-    MC68681_BAUD_NOT_VALID,    /* B230400 */
-    MC68681_BAUD_NOT_VALID     /* B460800 */
-  },
-  { /* ACR[7] = 1, X = 0 */
-    MC68681_BAUD_NOT_VALID,    /* B0 */
-    0x00,                      /* B50 */
-    0x01,                      /* B75 */
-    MC68681_BAUD_NOT_VALID,    /* B110 */
-    MC68681_BAUD_NOT_VALID,    /* B134 */
-    MC68681_BAUD_NOT_VALID,    /* B150 */
-    0x04,                      /* B200 */
-    MC68681_BAUD_NOT_VALID,    /* B300 */
-    MC68681_BAUD_NOT_VALID,    /* B600 */
-    0x0A,                      /* B1200 */
-    MC68681_BAUD_NOT_VALID,    /* B1800 */
-    MC68681_BAUD_NOT_VALID,    /* B2400 */
-    MC68681_BAUD_NOT_VALID,    /* B4800 */
-    MC68681_BAUD_NOT_VALID,    /* B9600 */
-    MC68681_BAUD_NOT_VALID,    /* B19200 */
-    MC68681_BAUD_NOT_VALID,    /* B38400 */
-    MC68681_BAUD_NOT_VALID,    /* B57600 */
-    MC68681_BAUD_NOT_VALID,    /* B115200 */
-    MC68681_BAUD_NOT_VALID,    /* B230400 */
-    MC68681_BAUD_NOT_VALID     /* B460800 */
-  },
-  { /* ACR[7] = 0, X = 1 */
-    MC68681_BAUD_NOT_VALID,    /* B0 */
-    0x00,                      /* B50 */
-    0x01,                      /* B75 */
-    MC68681_BAUD_NOT_VALID,    /* B110 */
-    MC68681_BAUD_NOT_VALID,    /* B134 */
-    MC68681_BAUD_NOT_VALID,    /* B150 */
-    MC68681_BAUD_NOT_VALID,    /* B200 */
-    MC68681_BAUD_NOT_VALID,    /* B300 */
-    MC68681_BAUD_NOT_VALID,    /* B600 */
-    MC68681_BAUD_NOT_VALID,    /* B1200 */
-    MC68681_BAUD_NOT_VALID,    /* B1800 */
-    0x04,                      /* B2400 */
-    MC68681_BAUD_NOT_VALID,    /* B4800 */
-    0x05,                      /* B9600 */
-    0x06,                      /* B19200 */
-    0x07,                      /* B38400 */
-    MC68681_BAUD_NOT_VALID,    /* B57600 */
-    MC68681_BAUD_NOT_VALID,    /* B115200 */
-    MC68681_BAUD_NOT_VALID,    /* B230400 */
-    MC68681_BAUD_NOT_VALID     /* B460800 */
-  },
-  { /* ACR[7] = 1, X = 1 */
-    MC68681_BAUD_NOT_VALID,    /* B0 */
-    MC68681_BAUD_NOT_VALID,    /* B50 */
-    0x01,                      /* B75 */
-    MC68681_BAUD_NOT_VALID,    /* B110 */
-    0x03,                      /* B134 */
-    MC68681_BAUD_NOT_VALID,    /* B150 */
-    MC68681_BAUD_NOT_VALID,    /* B200 */
-    MC68681_BAUD_NOT_VALID,    /* B300 */
-    MC68681_BAUD_NOT_VALID,    /* B600 */
-    MC68681_BAUD_NOT_VALID,    /* B1200 */
-    MC68681_BAUD_NOT_VALID,    /* B1800 */
-    0x04,                      /* B2400 */
-    0x0A,                      /* B4800 */
-    0x05,                      /* B9600 */
-    0x06,                      /* B19200 */
-    0x07,                      /* B38400 */
-    MC68681_BAUD_NOT_VALID,    /* B57600 */
-    MC68681_BAUD_NOT_VALID,    /* B115200 */
-    MC68681_BAUD_NOT_VALID,    /* B230400 */
-    MC68681_BAUD_NOT_VALID     /* B460800 */
-  },
-};
-
-#define MC68681_PORT_CONFIG  \
-  (MC68681_DATA_BAUD_RATE_SET_1|MC68681_XBRG_ENABLED) 
-
-/*
- *  Based on BSP configuration information decide whether to do polling IO
- *  or interrupt driven IO.
- */
-
-#if (CONSOLE_USE_INTERRUPTS)
-#define MC68681_FUNCTIONS &mc68681_fns
-#define Z85C30_FUNCTIONS  &z85c30_fns
-#else
-#define MC68681_FUNCTIONS &mc68681_fns_polled
-#define Z85C30_FUNCTIONS  &z85c30_fns_polled
-#endif
-
-boolean dmv177_z85c30_probe(int minor);
-boolean dmv177_mc68681_probe(int minor);
-
-console_tbl	Console_Port_Tbl[] = {
-	{
-		"/dev/com0",			/* sDeviceName */
-                SERIAL_MC68681,                 /* deviceType */
-		MC68681_FUNCTIONS,		/* pDeviceFns */
-		dmv177_mc68681_probe,		/* deviceProbe */
-		NULL,				/* pDeviceFlow */
-		16,				/* ulMargin */
-		8,				/* ulHysteresis */
-		(void *)9600,	/* baud rate */	/* pDeviceParams */
-		MC68681_ADDR,			/* ulCtrlPort1 */
-		MC68681_PORT1_ADDR,		/* ulCtrlPort2 */
-		MC68681_PORT_CONFIG,		/* ulDataPort */
-		mc68681_get_register_8,         /* getRegister */
-		mc68681_set_register_8,		/* setRegister */
-		NULL, /* unused */		/* getData */
-		NULL, /* unused */		/* setData */
-                (unsigned32)dmv177_mc68681_baud_table, /* ulClock */
-		DMV170_DUART_IRQ		/* ulIntVector */
-	},
-	{
-		"/dev/com1",			/* sDeviceName */
-                SERIAL_MC68681,                 /* deviceType */
-		MC68681_FUNCTIONS,		/* pDeviceFns */
-		dmv177_mc68681_probe,		/* deviceProbe */
-		NULL,				/* pDeviceFlow */
-		16,				/* ulMargin */
-		8,				/* ulHysteresis */
-		(void *)9600,	/* baud rate */	/* pDeviceParams */
-		MC68681_ADDR,			/* ulCtrlPort1 */
-		MC68681_PORT2_ADDR,		/* ulCtrlPort2 */
-		MC68681_PORT_CONFIG,		/* ulDataPort */
-		mc68681_get_register_8,         /* getRegister */
-		mc68681_set_register_8,		/* setRegister */
-		NULL, /* unused */		/* getData */
-		NULL, /* unused */		/* setData */
-                (unsigned32)dmv177_mc68681_baud_table, /* ulClock */
-		DMV170_DUART_IRQ		/* ulIntVector */
-	},
-	{
-		"/dev/com3",			/* sDeviceName */
-                SERIAL_Z85C30,                  /* deviceType */
-		Z85C30_FUNCTIONS,		/* pDeviceFns */
-		dmv177_z85c30_probe,		/* deviceProbe */
-		NULL,				/* pDeviceFlow */
-		16,				/* ulMargin */
-		8,				/* ulHysteresis */
-		(void *)9600,	/* baud rate */	/* pDeviceParams */
-		Z85C30_CTRL_A,			/* ulCtrlPort1 */
-		Z85C30_CTRL_A,			/* ulCtrlPort2 */
-		0,				/* ulDataPort */
-		z85c30_get_register,		/* getRegister */
-		z85c30_set_register,		/* setRegister */
-		NULL,				/* getData */
-		NULL,				/* setData */
-                0, /* filled in by probe */     /* ulClock */
-		DMV170_SCC_IRQ			/* ulIntVector */
-	},
-	{
-		"/dev/com4",			/* sDeviceName */
-                SERIAL_Z85C30,                  /* deviceType */
-		Z85C30_FUNCTIONS,		/* pDeviceFns */
-		dmv177_z85c30_probe,		/* deviceProbe */
-		NULL,				/* pDeviceFlow */
-		16,				/* ulMargin */
-		8,				/* ulHysteresis */
-		(void *)9600,	/* baud rate */	/* pDeviceParams */
-		Z85C30_CTRL_B,			/* ulCtrlPort1 */
-		Z85C30_CTRL_A,			/* ulCtrlPort2 */
-		0,				/* ulDataPort */
-		z85c30_get_register,		/* getRegister */
-		z85c30_set_register,		/* setRegister */
-		NULL,				/* getData */
-		NULL,				/* setData */
-                0, /* filled in by probe */     /* ulClock */
-		DMV170_SCC_IRQ			/* ulIntVector */
-	}
-};
-
-/*
- *  Declare some information used by the console driver
- */
-
-#define NUM_CONSOLE_PORTS (sizeof(Console_Port_Tbl)/sizeof(console_tbl))
-
-unsigned long  Console_Port_Count = NUM_CONSOLE_PORTS;
-
-console_data  Console_Port_Data[NUM_CONSOLE_PORTS];
-
-rtems_device_minor_number  Console_Port_Minor;
-
-/*
- *  Hopefully, by checking the card resource register, this BSP
- *  will be able to operate on the DMV171, DMV176, or DMV177.
- */
-
-boolean dmv177_z85c30_probe(int minor)
-{
-  volatile unsigned32 *dma_control_status_reg;
-  volatile unsigned16 *card_resource_reg;
-  unsigned16 v;
-
-  card_resource_reg = (volatile unsigned16 *) DMV170_CARD_RESORCE_REG;
-
-  v = *card_resource_reg & DMV170_SCC_INST_MASK;
-
-  if ( v != DMV170_SCC_INSTALLED )
-    return FALSE;
-
-  /*
-   *  Figure out the clock speed of the Z85C30 SCC
-   */
-
-  dma_control_status_reg = (volatile unsigned32 *)DMV170_DMA_CONTROL_STATUS_REG;
-
-  if ( *dma_control_status_reg & DMV170_SCC_10MHZ )
-    Console_Port_Tbl[minor].ulClock = Z85C30_CLOCK_10;
-  else
-    Console_Port_Tbl[minor].ulClock = Z85C30_CLOCK_2;
-
-  return TRUE;
-}
-
-boolean dmv177_mc68681_probe(int minor)
-{
-  volatile unsigned16 *card_resource_reg;
-  unsigned16 v;
-
-  card_resource_reg = (volatile unsigned16 *) DMV170_CARD_RESORCE_REG;
-
-  v = *card_resource_reg & DMV170_DUART_INST_MASK;
-
-  if ( v == DMV170_DUART_INSTALLED )
-    return TRUE;
-
-  return FALSE;
-}
diff --git a/c/src/lib/libbsp/powerpc/dmv177/console/conscfg.c b/c/src/lib/libbsp/powerpc/dmv177/console/conscfg.c
deleted file mode 100644
index e3a0eb073f..0000000000
--- a/c/src/lib/libbsp/powerpc/dmv177/console/conscfg.c
+++ /dev/null
@@ -1,283 +0,0 @@
-/*
- *  This file contains the TTY driver table for the DY-4 DMV177.
- *
- *  COPYRIGHT (c) 1989, 1990, 1991, 1992, 1993, 1994, 1997.
- *  On-Line Applications Research Corporation (OAR).
- *  All rights assigned to U.S. Government, 1994.
- *
- *  $Id$
- */
-
-#include <bsp.h>
-
-#include <libchip/serial.h>
-#include <libchip/mc68681.h>
-#include <libchip/z85c30.h>
-
-/*
- * Configuration specific probe routines
- *
- *
- * NOTE:  There are no DMV177 specific configuration routines.  These
- *        routines could be written to dynamically determine which serial
- *        ports are on a board.  Debugging this would require access to
- *        multiple board models.
- */
-
-/* NONE CURRENTLY PROVIDED */
-
-/*
- * The following table configures the console drivers used in this BSP.
- *
- * The first entry which, when probed, is available, will be named /dev/console,
- * all others being given the name indicated.
- */
-
-mc68681_baud_t 
-  dmv177_mc68681_baud_table[4][RTEMS_TERMIOS_NUMBER_BAUD_RATES] = {
-  { /* ACR[7] = 0, X = 0 */
-    MC68681_BAUD_NOT_VALID,    /* B0 */
-    MC68681_BAUD_NOT_VALID,    /* B50 */
-    0x01,                      /* B75 */
-    MC68681_BAUD_NOT_VALID,    /* B110 */
-    0x03,                      /* B134 */
-    MC68681_BAUD_NOT_VALID,    /* B150 */
-    0x04,                      /* B200 */
-    MC68681_BAUD_NOT_VALID,    /* B300 */
-    MC68681_BAUD_NOT_VALID,    /* B600 */
-    MC68681_BAUD_NOT_VALID,    /* B1200 */
-    MC68681_BAUD_NOT_VALID,    /* B1800 */
-    MC68681_BAUD_NOT_VALID,    /* B2400 */
-    0x0A,                      /* B4800 */
-    MC68681_BAUD_NOT_VALID,    /* B9600 */
-    MC68681_BAUD_NOT_VALID,    /* B19200 */
-    MC68681_BAUD_NOT_VALID,    /* B38400 */
-    MC68681_BAUD_NOT_VALID,    /* B57600 */
-    MC68681_BAUD_NOT_VALID,    /* B115200 */
-    MC68681_BAUD_NOT_VALID,    /* B230400 */
-    MC68681_BAUD_NOT_VALID     /* B460800 */
-  },
-  { /* ACR[7] = 1, X = 0 */
-    MC68681_BAUD_NOT_VALID,    /* B0 */
-    0x00,                      /* B50 */
-    0x01,                      /* B75 */
-    MC68681_BAUD_NOT_VALID,    /* B110 */
-    MC68681_BAUD_NOT_VALID,    /* B134 */
-    MC68681_BAUD_NOT_VALID,    /* B150 */
-    0x04,                      /* B200 */
-    MC68681_BAUD_NOT_VALID,    /* B300 */
-    MC68681_BAUD_NOT_VALID,    /* B600 */
-    0x0A,                      /* B1200 */
-    MC68681_BAUD_NOT_VALID,    /* B1800 */
-    MC68681_BAUD_NOT_VALID,    /* B2400 */
-    MC68681_BAUD_NOT_VALID,    /* B4800 */
-    MC68681_BAUD_NOT_VALID,    /* B9600 */
-    MC68681_BAUD_NOT_VALID,    /* B19200 */
-    MC68681_BAUD_NOT_VALID,    /* B38400 */
-    MC68681_BAUD_NOT_VALID,    /* B57600 */
-    MC68681_BAUD_NOT_VALID,    /* B115200 */
-    MC68681_BAUD_NOT_VALID,    /* B230400 */
-    MC68681_BAUD_NOT_VALID     /* B460800 */
-  },
-  { /* ACR[7] = 0, X = 1 */
-    MC68681_BAUD_NOT_VALID,    /* B0 */
-    0x00,                      /* B50 */
-    0x01,                      /* B75 */
-    MC68681_BAUD_NOT_VALID,    /* B110 */
-    MC68681_BAUD_NOT_VALID,    /* B134 */
-    MC68681_BAUD_NOT_VALID,    /* B150 */
-    MC68681_BAUD_NOT_VALID,    /* B200 */
-    MC68681_BAUD_NOT_VALID,    /* B300 */
-    MC68681_BAUD_NOT_VALID,    /* B600 */
-    MC68681_BAUD_NOT_VALID,    /* B1200 */
-    MC68681_BAUD_NOT_VALID,    /* B1800 */
-    0x04,                      /* B2400 */
-    MC68681_BAUD_NOT_VALID,    /* B4800 */
-    0x05,                      /* B9600 */
-    0x06,                      /* B19200 */
-    0x07,                      /* B38400 */
-    MC68681_BAUD_NOT_VALID,    /* B57600 */
-    MC68681_BAUD_NOT_VALID,    /* B115200 */
-    MC68681_BAUD_NOT_VALID,    /* B230400 */
-    MC68681_BAUD_NOT_VALID     /* B460800 */
-  },
-  { /* ACR[7] = 1, X = 1 */
-    MC68681_BAUD_NOT_VALID,    /* B0 */
-    MC68681_BAUD_NOT_VALID,    /* B50 */
-    0x01,                      /* B75 */
-    MC68681_BAUD_NOT_VALID,    /* B110 */
-    0x03,                      /* B134 */
-    MC68681_BAUD_NOT_VALID,    /* B150 */
-    MC68681_BAUD_NOT_VALID,    /* B200 */
-    MC68681_BAUD_NOT_VALID,    /* B300 */
-    MC68681_BAUD_NOT_VALID,    /* B600 */
-    MC68681_BAUD_NOT_VALID,    /* B1200 */
-    MC68681_BAUD_NOT_VALID,    /* B1800 */
-    0x04,                      /* B2400 */
-    0x0A,                      /* B4800 */
-    0x05,                      /* B9600 */
-    0x06,                      /* B19200 */
-    0x07,                      /* B38400 */
-    MC68681_BAUD_NOT_VALID,    /* B57600 */
-    MC68681_BAUD_NOT_VALID,    /* B115200 */
-    MC68681_BAUD_NOT_VALID,    /* B230400 */
-    MC68681_BAUD_NOT_VALID     /* B460800 */
-  },
-};
-
-#define MC68681_PORT_CONFIG  \
-  (MC68681_DATA_BAUD_RATE_SET_1|MC68681_XBRG_ENABLED) 
-
-/*
- *  Based on BSP configuration information decide whether to do polling IO
- *  or interrupt driven IO.
- */
-
-#if (CONSOLE_USE_INTERRUPTS)
-#define MC68681_FUNCTIONS &mc68681_fns
-#define Z85C30_FUNCTIONS  &z85c30_fns
-#else
-#define MC68681_FUNCTIONS &mc68681_fns_polled
-#define Z85C30_FUNCTIONS  &z85c30_fns_polled
-#endif
-
-boolean dmv177_z85c30_probe(int minor);
-boolean dmv177_mc68681_probe(int minor);
-
-console_tbl	Console_Port_Tbl[] = {
-	{
-		"/dev/com0",			/* sDeviceName */
-                SERIAL_MC68681,                 /* deviceType */
-		MC68681_FUNCTIONS,		/* pDeviceFns */
-		dmv177_mc68681_probe,		/* deviceProbe */
-		NULL,				/* pDeviceFlow */
-		16,				/* ulMargin */
-		8,				/* ulHysteresis */
-		(void *)9600,	/* baud rate */	/* pDeviceParams */
-		MC68681_ADDR,			/* ulCtrlPort1 */
-		MC68681_PORT1_ADDR,		/* ulCtrlPort2 */
-		MC68681_PORT_CONFIG,		/* ulDataPort */
-		mc68681_get_register_8,         /* getRegister */
-		mc68681_set_register_8,		/* setRegister */
-		NULL, /* unused */		/* getData */
-		NULL, /* unused */		/* setData */
-                (unsigned32)dmv177_mc68681_baud_table, /* ulClock */
-		DMV170_DUART_IRQ		/* ulIntVector */
-	},
-	{
-		"/dev/com1",			/* sDeviceName */
-                SERIAL_MC68681,                 /* deviceType */
-		MC68681_FUNCTIONS,		/* pDeviceFns */
-		dmv177_mc68681_probe,		/* deviceProbe */
-		NULL,				/* pDeviceFlow */
-		16,				/* ulMargin */
-		8,				/* ulHysteresis */
-		(void *)9600,	/* baud rate */	/* pDeviceParams */
-		MC68681_ADDR,			/* ulCtrlPort1 */
-		MC68681_PORT2_ADDR,		/* ulCtrlPort2 */
-		MC68681_PORT_CONFIG,		/* ulDataPort */
-		mc68681_get_register_8,         /* getRegister */
-		mc68681_set_register_8,		/* setRegister */
-		NULL, /* unused */		/* getData */
-		NULL, /* unused */		/* setData */
-                (unsigned32)dmv177_mc68681_baud_table, /* ulClock */
-		DMV170_DUART_IRQ		/* ulIntVector */
-	},
-	{
-		"/dev/com3",			/* sDeviceName */
-                SERIAL_Z85C30,                  /* deviceType */
-		Z85C30_FUNCTIONS,		/* pDeviceFns */
-		dmv177_z85c30_probe,		/* deviceProbe */
-		NULL,				/* pDeviceFlow */
-		16,				/* ulMargin */
-		8,				/* ulHysteresis */
-		(void *)9600,	/* baud rate */	/* pDeviceParams */
-		Z85C30_CTRL_A,			/* ulCtrlPort1 */
-		Z85C30_CTRL_A,			/* ulCtrlPort2 */
-		0,				/* ulDataPort */
-		z85c30_get_register,		/* getRegister */
-		z85c30_set_register,		/* setRegister */
-		NULL,				/* getData */
-		NULL,				/* setData */
-                0, /* filled in by probe */     /* ulClock */
-		DMV170_SCC_IRQ			/* ulIntVector */
-	},
-	{
-		"/dev/com4",			/* sDeviceName */
-                SERIAL_Z85C30,                  /* deviceType */
-		Z85C30_FUNCTIONS,		/* pDeviceFns */
-		dmv177_z85c30_probe,		/* deviceProbe */
-		NULL,				/* pDeviceFlow */
-		16,				/* ulMargin */
-		8,				/* ulHysteresis */
-		(void *)9600,	/* baud rate */	/* pDeviceParams */
-		Z85C30_CTRL_B,			/* ulCtrlPort1 */
-		Z85C30_CTRL_A,			/* ulCtrlPort2 */
-		0,				/* ulDataPort */
-		z85c30_get_register,		/* getRegister */
-		z85c30_set_register,		/* setRegister */
-		NULL,				/* getData */
-		NULL,				/* setData */
-                0, /* filled in by probe */     /* ulClock */
-		DMV170_SCC_IRQ			/* ulIntVector */
-	}
-};
-
-/*
- *  Declare some information used by the console driver
- */
-
-#define NUM_CONSOLE_PORTS (sizeof(Console_Port_Tbl)/sizeof(console_tbl))
-
-unsigned long  Console_Port_Count = NUM_CONSOLE_PORTS;
-
-console_data  Console_Port_Data[NUM_CONSOLE_PORTS];
-
-rtems_device_minor_number  Console_Port_Minor;
-
-/*
- *  Hopefully, by checking the card resource register, this BSP
- *  will be able to operate on the DMV171, DMV176, or DMV177.
- */
-
-boolean dmv177_z85c30_probe(int minor)
-{
-  volatile unsigned32 *dma_control_status_reg;
-  volatile unsigned16 *card_resource_reg;
-  unsigned16 v;
-
-  card_resource_reg = (volatile unsigned16 *) DMV170_CARD_RESORCE_REG;
-
-  v = *card_resource_reg & DMV170_SCC_INST_MASK;
-
-  if ( v != DMV170_SCC_INSTALLED )
-    return FALSE;
-
-  /*
-   *  Figure out the clock speed of the Z85C30 SCC
-   */
-
-  dma_control_status_reg = (volatile unsigned32 *)DMV170_DMA_CONTROL_STATUS_REG;
-
-  if ( *dma_control_status_reg & DMV170_SCC_10MHZ )
-    Console_Port_Tbl[minor].ulClock = Z85C30_CLOCK_10;
-  else
-    Console_Port_Tbl[minor].ulClock = Z85C30_CLOCK_2;
-
-  return TRUE;
-}
-
-boolean dmv177_mc68681_probe(int minor)
-{
-  volatile unsigned16 *card_resource_reg;
-  unsigned16 v;
-
-  card_resource_reg = (volatile unsigned16 *) DMV170_CARD_RESORCE_REG;
-
-  v = *card_resource_reg & DMV170_DUART_INST_MASK;
-
-  if ( v == DMV170_DUART_INSTALLED )
-    return TRUE;
-
-  return FALSE;
-}
diff --git a/c/src/lib/libbsp/powerpc/dmv177/console/debugio.c b/c/src/lib/libbsp/powerpc/dmv177/console/debugio.c
deleted file mode 100644
index d23df205a3..0000000000
--- a/c/src/lib/libbsp/powerpc/dmv177/console/debugio.c
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- *  This file contains the debug IO support.
- *
- *  COPYRIGHT (c) 1998 by Radstone Technology
- *
- *
- * THIS FILE IS PROVIDED TO YOU, THE USER, "AS IS", WITHOUT WARRANTY OF ANY
- * KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTY OF FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK
- * AS TO THE QUALITY AND PERFORMANCE OF ALL CODE IN THIS FILE IS WITH YOU.
- *
- * You are hereby granted permission to use, copy, modify, and distribute
- * this file, provided that this notice, plus the above copyright notice
- * and disclaimer, appears in all copies. Radstone Technology will provide
- * no support for this code.
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <bsp.h>
-#include <rtems/libio.h>
-#include <stdlib.h>
-#include <assert.h>
-#include <termios.h>
-
-#include <libchip/serial.h>
-
-/*
- * Load configuration table
- */
-
-extern console_data  Console_Port_Data[];
-extern rtems_device_minor_number  Console_Port_Minor;
- 
-/* PAGE
- *
- *  DEBUG_puts
- *
- *  This should be safe in the event of an error.  It attempts to ensure
- *  that no TX empty interrupts occur while it is doing polled IO.  Then
- *  it restores the state of that external interrupt.
- *
- *  Input parameters:
- *    string  - pointer to debug output string
- *
- *  Output parameters:  NONE
- *
- *  Return values:      NONE
- */
-
-void DEBUG_puts(
-  char *string
-)
-{
-  char *s;
-  unsigned32  Irql;
-
-  rtems_interrupt_disable(Irql);
-
-  for ( s = string ; *s ; s++ ) {
-    Console_Port_Tbl[Console_Port_Minor].pDeviceFns->
-      deviceWritePolled(Console_Port_Minor, *s);
-  }
-
-  rtems_interrupt_enable(Irql);
-}
-
-/* PAGE
- *
- *  DEBUG_puth
- *
- *  This should be safe in the event of an error.  It attempts to ensure
- *  that no TX empty interrupts occur while it is doing polled IO.  Then
- *  it restores the state of that external interrupt.
- *
- *  Input parameters:
- *    ulHexNum - value to display
- *
- *  Output parameters:  NONE
- *
- *  Return values:      NONE
- */
-
-void DEBUG_puth(
-  unsigned32 ulHexNum
-)
-{
-  unsigned long  i,d;
-  unsigned32      Irql;
-  void          (*poll)(int minor, char cChar);
-  
-  poll = Console_Port_Tbl[Console_Port_Minor].pDeviceFns->deviceWritePolled;
-
-  rtems_interrupt_disable(Irql);
-
-    (*poll)(Console_Port_Minor, '0');
-    (*poll)(Console_Port_Minor, 'x');
-
-    for ( i=32 ; i ; ) {
-      i -= 4;
-      d  = (ulHexNum>>i)&0xf;
-      (*poll)(Console_Port_Minor, (d<=9) ? d+'0' : d+'a'-0xa);
-    }
-  rtems_interrupt_enable(Irql);
-}
-
diff --git a/c/src/lib/libbsp/powerpc/dmv177/include/Makefile.in b/c/src/lib/libbsp/powerpc/dmv177/include/Makefile.in
deleted file mode 100644
index a711b3e1de..0000000000
--- a/c/src/lib/libbsp/powerpc/dmv177/include/Makefile.in
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-H_FILES = $(srcdir)/bsp.h $(srcdir)/coverhd.h \
-  $(srcdir)/dmv170.h $(srcdir)/../../../shared/tod.h
-
-#
-#  Equate files are for including from assembly preprocessed by
-#  gm4 or gasp.  No examples are provided except for those for
-#  other CPUs.  The best way to generate them would be to
-#  provide a program which generates the constants used based
-#  on the C equivalents.
-#
-#  If you add equate files, don't forget to uncomment the install line
-#  below.
-#
-
-EQ_FILES =
-
-SRCS=$(H_FILES) $(EQ_FILES)
-
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
-
-all:	$(SRCS)
-	$(INSTALL) -m 444 $(H_FILES) $(PROJECT_INCLUDE)
diff --git a/c/src/lib/libbsp/powerpc/dmv177/include/bsp.h b/c/src/lib/libbsp/powerpc/dmv177/include/bsp.h
deleted file mode 100644
index f99211f8d3..0000000000
--- a/c/src/lib/libbsp/powerpc/dmv177/include/bsp.h
+++ /dev/null
@@ -1,187 +0,0 @@
-/*  bsp.h
- *
- *  This include file contains all DY-4 DMV170 board IO definitions.
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  All rights assigned to U.S. Government, 1994.
- *
- *  This material may be reproduced by or for the U.S. Government pursuant
- *  to the copyright license under the clause at DFARS 252.227-7013.  This
- *  notice must appear in all copies of this file and its derivatives.
- *
- *  $Id$
- */
-
-#ifndef __DMV170_BSP_h
-#define __DMV170_BSP_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef ASM
-/* Definition of where to store registers in alignment handler */
-#define ALIGN_REGS 0x0140
-
-#else
-#include <rtems.h>
-#include <console.h>
-#include <clockdrv.h>
-#include <console.h>
-#include <iosupp.h>
-
-#include <dmv170.h>
-
-#if 0
-#define Enable_Debug() \
-  DMV170_WRITE( 0xffffbd0c, 0 )
-
-#define Debug_Entry( num ) \
-  DMV170_WRITE( 0xffffbd06, num )
-#else
-#define Enable_Debug()
-#define Debug_Entry( num )
-#endif
-
-/*
- * The following macro calculates the Baud constant. For the Z8530 chip.
- */
-#define Z8530_Baud( _frequency, _clock_by, _baud_rate  )   \
-  ( (_frequency /( _clock_by * 2 * _baud_rate))  - 2)
-
-
-/*
- *  Define the time limits for RTEMS Test Suite test durations.
- *  Long test and short test duration limits are provided.  These
- *  values are in seconds and need to be converted to ticks for the
- *  application.
- *
- */
-
-#define MAX_LONG_TEST_DURATION       300 /* 5 minutes = 300 seconds */
-#define MAX_SHORT_TEST_DURATION      3   /* 3 seconds */
-
-
-/*
- *  Stuff for Time Test 27
- */
-
-#define MUST_WAIT_FOR_INTERRUPT 1
-
-#define Install_tm27_vector( _handler ) \
-  set_vector( (_handler), PPC_IRQ_DECREMENTER, 1 )
-
-#define Cause_tm27_intr()  \
-  do { \
-    unsigned32 _clicks = 1; \
-    asm volatile( "mtdec %0" : "=r" ((_clicks)) : "r" ((_clicks)) ); \
-  } while (0)
-
-#define Clear_tm27_intr() \
-  do { \
-    unsigned32 _clicks = 0xffffffff; \
-    unsigned32 _msr = 0; \
-    _ISR_Set_level( 0 ); \
-    asm volatile( "mfmsr %0 ;" : "=r" (_msr) : "r" (_msr) ); \
-    _msr &=  ~0x8000; \
-    asm volatile( "mtmsr %0 ;" : "=r" (_msr) : "r" (_msr) ); \
-    asm volatile( "mtdec %0" : "=r" ((_clicks)) : "r" ((_clicks)) ); \
-  } while (0)
-
-#define Lower_tm27_intr() \
-  do { \
-    unsigned32 _msr = 0; \
-    _ISR_Set_level( 0 ); \
-    asm volatile( "mfmsr %0 ;" : "=r" (_msr) : "r" (_msr) ); \
-    _msr |=  0x8002; \
-    asm volatile( "mtmsr %0 ;" : "=r" (_msr) : "r" (_msr) ); \
-  } while (0)
-
-/* Constants */
-
-/*
- *  Device Driver Table Entries
- */
- 
-/*
- * NOTE: Use the standard Console driver entry
- */
- 
-/*
- * NOTE: Use the standard Clock driver entry
- */
- 
-
-/*
- *  Information placed in the linkcmds file.
- */
-
-extern int   RAM_START;
-extern int   RAM_END;
-extern int   RAM_SIZE;
-
-extern int   PROM_START;
-extern int   PROM_END;
-extern int   PROM_SIZE;
-
-extern int   CLOCK_SPEED;
-
-extern int   end;        /* last address in the program */
-
-/*
- * How many libio files we want
- */
- 
-#define BSP_LIBIO_MAX_FDS       20
-
-/* functions */
-
-/* 
- * genvec.c
- */
-rtems_isr_entry  set_EE_vector(
-  rtems_isr_entry     handler,                  /* isr routine        */
-  rtems_vector_number vector                    /* vector number      */
-);
-void initialize_external_exception_vector ();
-
-/*
- * console.c
- */
-void DEBUG_puts( char *string );
-
-void BSP_fatal_return( void );
-
-
-
-void bsp_start( void );
-
-void bsp_cleanup( void );
-
-rtems_isr_entry set_vector(                    /* returns old vector */
-  rtems_isr_entry     handler,                  /* isr routine        */
-  rtems_vector_number vector,                   /* vector number      */
-  int                 type                      /* RTEMS or RAW intr  */
-);
-
-void BSP_fatal_return( void );
-
-void bsp_spurious_initialize( void );
-
-extern rtems_configuration_table BSP_Configuration;     /* owned by BSP */
-
-extern rtems_cpu_table           Cpu_table;             /* owned by BSP */
-
-extern rtems_unsigned32          bsp_isr_level;
-
-extern int   CPU_PPC_CLICKS_PER_MS;
-
-#endif /* ASM */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/c/src/lib/libbsp/powerpc/dmv177/include/coverhd.h b/c/src/lib/libbsp/powerpc/dmv177/include/coverhd.h
deleted file mode 100644
index 451d13b706..0000000000
--- a/c/src/lib/libbsp/powerpc/dmv177/include/coverhd.h
+++ /dev/null
@@ -1,134 +0,0 @@
-/*  coverhd.h
- *
- *  This include file has defines to represent the overhead associated
- *  with calling a particular directive from C.  These are used in the
- *  Timing Test Suite to ignore the overhead required to pass arguments
- *  to directives.  On some CPUs and/or target boards, this overhead
- *  is significant and makes it difficult to distinguish internal
- *  RTEMS execution time from that used to call the directive.
- *  This file should be updated after running the C overhead timing
- *  test.  Once this update has been performed, the RTEMS Time Test
- *  Suite should be rebuilt to account for these overhead times in the
- *  timing results.
- *
- *  NOTE:  If these are all zero, then the times reported include
- *         calling overhead including passing of arguments.
- *
- *  COPYRIGHT (c) 1989, 1990, 1991, 1992, 1993, 1994.
- *  On-Line Applications Research Corporation (OAR).
- *  All rights assigned to U.S. Government, 1994.
- *
- *  This material may be reproduced by or for the U.S. Government pursuant
- *  to the copyright license under the clause at DFARS 252.227-7013.  This
- *  notice must appear in all copies of this file and its derivatives.
- *
- *  $Id$
- */
-
-/*
- *
- *  Units are 100ns.
- *
- *  These numbers are of questionable use, as they are developed by calling
- *  the routine many times, thus getting its entry veneer into the (small)
- *  cache on the 403GA.  This in general is not true of the RTEMS timing
- *  tests, which usually call a routine only once, thus having no cache loaded
- *  advantage.
- *
- *  Whether the directive times are useful after deducting the function call
- *  overhead is also questionable.  The user is more interested generally
- *  in the total cost of a directive, not the cost if the procedure call
- *  is inlined!  (In general this is not true).
- *
- *  Andrew Bray 18/08/1995
- *
- */
-
-#ifndef __COVERHD_h
-#define __COVERHD_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define CALLING_OVERHEAD_INITIALIZE_EXECUTIVE      0
-#define CALLING_OVERHEAD_SHUTDOWN_EXECUTIVE        0
-#define CALLING_OVERHEAD_TASK_CREATE               0
-#define CALLING_OVERHEAD_TASK_IDENT                0
-#define CALLING_OVERHEAD_TASK_START                0
-#define CALLING_OVERHEAD_TASK_RESTART              0
-#define CALLING_OVERHEAD_TASK_DELETE               0
-#define CALLING_OVERHEAD_TASK_SUSPEND              0
-#define CALLING_OVERHEAD_TASK_RESUME               0
-#define CALLING_OVERHEAD_TASK_SET_PRIORITY         0
-#define CALLING_OVERHEAD_TASK_MODE                 0
-#define CALLING_OVERHEAD_TASK_GET_NOTE             0
-#define CALLING_OVERHEAD_TASK_SET_NOTE             0
-#define CALLING_OVERHEAD_TASK_WAKE_WHEN            0
-#define CALLING_OVERHEAD_TASK_WAKE_AFTER           0
-#define CALLING_OVERHEAD_INTERRUPT_CATCH           0
-#define CALLING_OVERHEAD_CLOCK_GET                 0
-#define CALLING_OVERHEAD_CLOCK_SET                 0
-#define CALLING_OVERHEAD_CLOCK_TICK                0
-
-#define CALLING_OVERHEAD_TIMER_CREATE              0
-#define CALLING_OVERHEAD_TIMER_IDENT               0
-#define CALLING_OVERHEAD_TIMER_DELETE              0
-#define CALLING_OVERHEAD_TIMER_FIRE_AFTER          0
-#define CALLING_OVERHEAD_TIMER_FIRE_WHEN           0
-#define CALLING_OVERHEAD_TIMER_RESET               0
-#define CALLING_OVERHEAD_TIMER_CANCEL              0
-#define CALLING_OVERHEAD_SEMAPHORE_CREATE          0
-#define CALLING_OVERHEAD_SEMAPHORE_IDENT           0
-#define CALLING_OVERHEAD_SEMAPHORE_DELETE          0
-#define CALLING_OVERHEAD_SEMAPHORE_OBTAIN          0
-#define CALLING_OVERHEAD_SEMAPHORE_RELEASE         0
-#define CALLING_OVERHEAD_MESSAGE_QUEUE_CREATE      0
-#define CALLING_OVERHEAD_MESSAGE_QUEUE_IDENT       0
-#define CALLING_OVERHEAD_MESSAGE_QUEUE_DELETE      0
-#define CALLING_OVERHEAD_MESSAGE_QUEUE_SEND        0
-#define CALLING_OVERHEAD_MESSAGE_QUEUE_URGENT      0
-#define CALLING_OVERHEAD_MESSAGE_QUEUE_BROADCAST   0
-#define CALLING_OVERHEAD_MESSAGE_QUEUE_RECEIVE     0
-#define CALLING_OVERHEAD_MESSAGE_QUEUE_FLUSH       0
-
-#define CALLING_OVERHEAD_EVENT_SEND                0
-#define CALLING_OVERHEAD_EVENT_RECEIVE             0
-#define CALLING_OVERHEAD_SIGNAL_CATCH              0
-#define CALLING_OVERHEAD_SIGNAL_SEND               0
-#define CALLING_OVERHEAD_PARTITION_CREATE          0
-#define CALLING_OVERHEAD_PARTITION_IDENT           0
-#define CALLING_OVERHEAD_PARTITION_DELETE          0
-#define CALLING_OVERHEAD_PARTITION_GET_BUFFER      0
-#define CALLING_OVERHEAD_PARTITION_RETURN_BUFFER   0
-#define CALLING_OVERHEAD_REGION_CREATE             0
-#define CALLING_OVERHEAD_REGION_IDENT              0
-#define CALLING_OVERHEAD_REGION_DELETE             0
-#define CALLING_OVERHEAD_REGION_GET_SEGMENT        0
-#define CALLING_OVERHEAD_REGION_RETURN_SEGMENT     0
-#define CALLING_OVERHEAD_PORT_CREATE               0
-#define CALLING_OVERHEAD_PORT_IDENT                0
-#define CALLING_OVERHEAD_PORT_DELETE               0
-#define CALLING_OVERHEAD_PORT_EXTERNAL_TO_INTERNAL 0
-#define CALLING_OVERHEAD_PORT_INTERNAL_TO_EXTERNAL 0
-
-#define CALLING_OVERHEAD_IO_INITIALIZE             0
-#define CALLING_OVERHEAD_IO_OPEN                   0
-#define CALLING_OVERHEAD_IO_CLOSE                  0
-#define CALLING_OVERHEAD_IO_READ                   0
-#define CALLING_OVERHEAD_IO_WRITE                  0
-#define CALLING_OVERHEAD_IO_CONTROL                0
-#define CALLING_OVERHEAD_FATAL_ERROR_OCCURRED      0
-#define CALLING_OVERHEAD_RATE_MONOTONIC_CREATE     0
-#define CALLING_OVERHEAD_RATE_MONOTONIC_IDENT      0
-#define CALLING_OVERHEAD_RATE_MONOTONIC_DELETE     0
-#define CALLING_OVERHEAD_RATE_MONOTONIC_CANCEL     0
-#define CALLING_OVERHEAD_RATE_MONOTONIC_PERIOD     0
-#define CALLING_OVERHEAD_MULTIPROCESSING_ANNOUNCE  0
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/c/src/lib/libbsp/powerpc/dmv177/include/dmv170.h b/c/src/lib/libbsp/powerpc/dmv177/include/dmv170.h
deleted file mode 100644
index b676dafe0c..0000000000
--- a/c/src/lib/libbsp/powerpc/dmv177/include/dmv170.h
+++ /dev/null
@@ -1,290 +0,0 @@
-/*  dmv170.h
- *
- *  This include file contains information pertaining to the DMV170.
- *
- *  NOTE:  Other than where absolutely required, this version currently 
- *         supports only the peripherals and bits used by the basic board 
- *         support package. This includes at least significant pieces of 
- *         the following items:
- *
- *           + UART Channels A and B
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
- 
-#ifndef _INCLUDE_DMV170_h
-#define _INCLUDE_DMV170_h
-
-
-/*
- *  DY-4 uses a non-standard clock for the Exar 88681.
- */
-
-#undef  MC68681_BAUD_RATE_MASK_9600
-#define MC68681_BAUD_RATE_MASK_9600
-
-#define DMV17x_MC68681_BAUD_RATE_MASK_9600
-
-#if 0
-#define MC68681_OFFSET_MULTIPLIER 8
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Note:  Move address defs to the linker files. XXX */
-
-/* Real Time Clock Base Address */
-#define DMV170_RTC_ADDRESS   0xf2c00000
-
-/* base address of the DUART (68681) */
-#define MC68681_ADDR         0xf2800000
-#define MC68681_PORT1_ADDR   0xf2800000
-#define MC68681_PORT2_ADDR   0xf2800040
-
-/*
- *  SONIC Information
- */
-
-#define DMV170_SONIC_ADDR 0xf3000000
-
-#define SONIC_BASE_ADDRESS DMV170_SONIC_ADDR
-#define SONIC_VECTOR       DMV170_ETHERNET_IRQ
-
-/* base address for the SCC (85C30) */ 
-#define Z85C30_ADDR       0xfb000010
-#define Z85C30_CTRL_A     0xfb000010
-#define Z85C30_DATA_A     0xfb000018
-#define Z85C30_CTRL_B     0xfb000000
-#define Z85C30_DATA_B     0xfb000008
-#define Z85C30_CLOCK_10   (10485760)      /* 10 Mhz */
-#define Z85C30_CLOCK_2    (2581175)       /* 2.4616 Mhz */
-
-/* base address for the SCV64 */
-#define DMV170_SCV64_BASE_ADDRESS                        0xf2000000
-
-#define DMV170_LOCAL_CONTROL_STATUS_REG                   0xf2400000
-#define DMV170_TIMER0_COUNT_INTERVAL_REG                  0xf2400008
-#define DMV170_TIMER1_COUNT_INTERVAL_REG                  0xf2400010
-#define DMV170_TIMER2_COUNT_INTERVAL_REG                  0xf2400018
-#define DMV170_TIMER_CONTROL_REG                          0xf2400020
-#define DMV170_CARD_RESORCE_REG                           0xf2400040
-
-#define DMV170_WRITE( _reg, _data ) \
-   *((volatile rtems_unsigned16 *)(_reg)) = (_data)
-
-#define DMV170_READ( _reg, _data ) \
-   (_data) = *((volatile rtems_unsigned16 *)(_reg))
-
-/*
- *  The following defines the bits in the DMA Control and Status Register
- */
-
-/* XXX fill in the other bits */
-
-#define DMV170_DMA_CONTROL_STATUS_REG                     0xfc000090
-
-#define DMV170_SCC_10MHZ                                  0x00010000
-
-/*
- *  The following defines the bits in the Local Control and Status Register.
- */
-#define DMV170_IPLx_MASK                                  0x0007
-#define DMV170_MAXPACK_SENSE_MASK                         0x0008
-#define DMV170_MAXPACK_NOT_INSTALLED                      0x0008
-#define DMV170_MAXPACK_INSTALLED                          0x0000
-
-#define DMV170_MAXPACK_RESET_MASK                         0x0010
-#define DMV170_MAXPACK_RESET_NEGATE                       0x0010
-#define DMV170_MAXPACK_RESET_ASSERT                       0x0000
-#define DMV170_EEPROM_READ_WRITE_MASK                     0x0020
-#define DMV170_EEPROM_READ                                0x0020
-#define DMV170_EEPROM_WRITE                               0x0000
-#define DMV170_EEPROM_CLOCK_CTRL_MASK                     0x0040
-#define DMV170_EEPROM_CLOCK_ASSERT                        0x0040
-#define DMV170_EEPROM_CLOCK_NEGATE                        0x0000
-#define DMV170_EEPROM_DATA_MASK                           0x0080
-#define DMV170_EEPROM_DATA_HIGH                           0x0080
-#define DMV170_EEPROM_DATA_LOW                            0x0000
-
-/* Bits 8-10: 68040 Transfer Modifer Codes represent the Transfer
- *            Modifier to be used on MAXPack Accesses.
- *
- * Bit 11   : 68040 Transfer Type (TT) 0:TT are both low 1:TT are both high
- */
-
-#define DMV170_USER_LINK0_STATUS_MASK                     0x1000
-#define DMV170_USER_LINK0_OPEN                            0x1000
-#define DMV170_USER_LINK0_INSTALLED                       0x0000
-#define DMV170_LOWER_STATUS_LED_CONTROL_MASK              0x2000
-#define DMV170_LOWER_STATUS_LED_IS_OFF                    0x2000
-#define DMV170_LOWER_STATUS_LED_IS_ON                     0x0000
-#ifdef DMV176                                             
-       /* The following are not available for the DMV171 */
-#define DMV170_RAM_TYPE_MASK                              0x4000
-#define DMV170_RAM_TYPE_IS_DRAM                           0x4000
-#define DMV170_RAM_TYPE_IS_SRAM                           0x0000
-#define DMV170_IACK_VECTOR_AUTOVECTOR_MASK                0x8000
-#define DMV170_IACK_VECTOR_AUTOVECTOR_IS_VECTOR           0x8000
-#define DMV170_IACK_VECTOR_AUTOVECTOR_IS_NOT_VECTOR       0x0000
-#endif
- 
-/*
- *  The following defines the bits in the Timer Control Register.
- */
-
-#define DMV170_TIMER0_ENABLE_MASK                         0x0001
-#define DMV170_TIMER0_IS_ENABLED                          0x0001
-#define DMV170_TIMER0_IS_DISABLED                         0x0000
-#define DMV170_TIMER1_ENABLE_MASK                         0x0002
-#define DMV170_TIMER1_IS_ENABLED                          0x0002
-#define DMV170_TIMER1_IS_DISABLED                         0x0000
-#define DMV170_TIMER2_ENABLE_MASK                         0x0004
-#define DMV170_TIMER2_IS_ENABLED                          0x0004
-#define DMV170_TIMER2_IS_DISABLED                         0x0000
-#define DMV170_TIMER1_CLOCK_MASK                          0x0008
-#define DMV170_TIMER1_CLOCK_AT_TIMER0                     0x0008
-#define DMV170_TIMER1_CLOCK_AT_1MHZ                       0x0000
-
-#define DMV170_TIMER2_CLOCK_MASK                          0x0010
-#define DMV170_TIMER2_CLOCK_AT_TIMER0                     0x0010
-#define DMV170_TIMER2_CLOCK_AT_1MHZ                       0x0000
-#define DMV170_TIMER0_INTERRUPT_MASK                      0x0020
-#define DMV170_TIMER0_INTERRUPT_ENABLE                    0x0020
-#define DMV170_TIMER0_INTERRUPT_CLEAR                     0x0000
-#define DMV170_TIMER1_INTERRUPT_MASK                      0x0040
-#define DMV170_TIMER1_INTERRUPT_ENABLE                    0x0040
-#define DMV170_TIMER1_INTERRUPT_CLEAR                     0x0000
-#define DMV170_TIMER2_INTERRUPT_MASK                      0x0080
-#define DMV170_TIMER2_INTERRUPT_ENABLE                    0x0080
-#define DMV170_TIMER2_INTERRUPT_CLEAR                     0x0000
-
-/*
- *  The Following define the bits for the Card Resource Register.
- */
-
-#define DMV170_DUART_INTERRUPT_MASK    0x0001  /* DUART Interrupt Sense Bit  */
-#define DMV170_DUART_INTERRUPT_NEGATE  0x0001
-#define DMV170_DUART_INTERRUPT_ASSERT  0x0000
-#define DMV170_SONIC_INTERRUPT_MASK    0x0002  /* SONIC Interrupt Sense Bit  */
-#define DMV170_SONIC_INTERRUPT_NEGATE  0x0002
-#define DMV170_SONIC_INTERRUPT_ASSERT  0x0000
-#define DMV170_SCSI_INTERRUPT_MASK     0x0004  /* SCSI Interrupt Sense Bit   */
-#define DMV170_SCSI_INTERRUPT_NEGATE   0x0004
-#define DMV170_SCSI_INTERRUPT_ASSERT   0x0000
-#define DMV170_SCC_INTERRUPT_MASK      0x0008  /* SCC Interrupt Sense Bit    */
-#define DMV170_SCC_INTERRUPT_NEGATE    0x0008
-#define DMV170_SCC_INTERRUPT_ASSERT    0x0000
-#define DMV170_SNOOP_ENABLE_MASK       0x0010  /* CPU Snoop Enable Bit       */
-#define DMV170_SNOOP_DISABLE           0x0010
-#define DMV170_SNOOP_ENABLE            0x0000
-#define DMV170_SONIC_RESET_MASK        0x0020  /* SONIC RESET Control        */
-#define DMV170_SONIC_RESET_CLEAR       0x0020
-#define DMV170_SONIC_RESET_HOLD        0x0000
-#define DMV170_NV64_WE_MASK            0x0040  /* 64-bit Non-Volital Memory  */
-#define DMV170_NV64_WRITE_ENABLE       0x0040  /* Write Enable               */
-#define DMV170_NV64_WRITE_DISABLE      0x0000
-#define DMV170_BOOT_NV16_MASK          0x0080  /* BOOT Device Type           */
-#define DMV170_BOOT_64_BIT             0x0080
-#define DMV170_BOOT_16_BIT             0x0000
-#define DMV170_DUART_INST_MASK         0x0100  /* DUART Sense Bit            */
-#define DMV170_DUART_INSTALLED         0x0100
-#define DMV170_DUART_NOT_INSTALLED     0x0000
-#define DMV170_SONIC_INST_MASK         0x0200  /* SONIC Sense Bit            */
-#define DMV170_SONIC_INSTALLED         0x0200
-#define DMV170_SONIC_NOT_INSTALLED     0x0000
-#define DMV170_16M_NV64_MASK           0x0400  /* 16 Mb of 64bit Flash Sense */
-#define DMV170_16Mb_FLASH_INSTALLED    0x0400
-#define DMV170_8Mb_FLASH_INSTALLED     0x0000
-#define DMV170_SCC_INST_MASK           0x0800  /* SCC Sense Bit              */
-#define DMV170_SCC_INSTALLED           0x0800
-#define DMV170_SCC_NOT_INSTALLED       0x0000
-#define DMV170_RTC_INST_MASK           0x1000  /* RTC Sense Bit              */
-#define DMV170_RTC_INSTALLED           0x1000
-#define DMV170_RTC_NOT_INSTALLED       0x0000
-#define DMV170_NV64_INST_MASK          0x2000  /* 64bit Non-Volital Mem Sense*/
-
-#define DMV170_64_BIT_NON_VOLITAL_MEM_INSTALLED           0x2000
-#define DMV170_64_BIT_NON_VOLITAL_MEM_NOT_INSTALLED       0x0000
-
-
-/*
- * DUART Baud Rate Definitions.
- */
-
-#define DMV170_DUART_9621     MC68681_BAUD_RATE_MASK_600 /* close to 9600 */  
-
-#define DMV170_RTC_FREQUENCY             0x0000
-
-
-/*
- * CPU General Purpose Interrupt definations (PPC_IRQ_EXTERNAL).
- * Note: For the interrupt level read the lower 3 bits of the
- *       Local Control and Status Register.
- */
-
-#define DMV170_IRQ_FIRST                       ( PPC_IRQ_LAST +  1 )
-
-#define DMV170_LIRQ0                           ( DMV170_IRQ_FIRST + 0 )
-#define DMV170_LIRQ1                           ( DMV170_IRQ_FIRST + 1 )
-#define DMV170_LIRQ2                           ( DMV170_IRQ_FIRST + 2 )
-#define DMV170_LIRQ3                           ( DMV170_IRQ_FIRST + 3 )
-#define DMV170_LIRQ4                           ( DMV170_IRQ_FIRST + 4 )
-#define DMV170_LIRQ5                           ( DMV170_IRQ_FIRST + 5 )
-#define DMV170_L7IACF                          ( DMV170_IRQ_FIRST + 6 )
-#define DMV170_L7ISYS                          ( DMV170_IRQ_FIRST + 7 )
-#define DMV170_L7IMNI                          ( DMV170_IRQ_FIRST + 8 )
-#define DMV170_BIMODE                          ( DMV170_IRQ_FIRST + 9 )
-
-#define DMV170_DUART_IRQ                       DMV170_LIRQ5
-#define DMV170_ETHERNET_IRQ                    DMV170_LIRQ5
-#define DMV170_SCSI_IRQ                        DMV170_LIRQ5
-#define DMV170_SCC_IRQ                         DMV170_LIRQ5
-#define DMV170_MEZZANINE_IRQ_0                 DMV170_LIRQ4       
-#define DMV170_TICK_IRQ                        DMV170_LIRQ3
-#define DMV170_LOCATION_MON_IRQ                DMV170_LIRQ2        
-#define DMV170_SCV64_IRQ                       DMV170_LIRQ1 
-#define DMV170_RTC_IRQ                         DMV170_LIRQ0
-
-#define DMV170_ACFAIL_IRQ                      DMV170_L7IACF
-#define DMV170_SYSFAIL_IRQ                     DMV170_L7ISYS
-#define DMV170_WATCHDOG_IRQ                    DMV170_L7IMNI
-#define DMV170_BI_IRQ                          DMV170_BIMODE
-#define DMV170_RAM_PARITY_IRQ                  ( DMV170_IRQ_FIRST + 10)
-#define DMV170_DARF_BUS_ERROR_IRQ              ( DMV170_IRQ_FIRST + 11)
-#define DMV170_PERIPHERAL_IRQ                  ( DMV170_IRQ_FIRST + 12)
-
-#define MAX_BOARD_IRQS                         DMV170_PERIPHERAL_IRQ
-
-#define SCV64_Is_IRQ0( _status ) (_status&0x01)
-#define SCV64_Is_IRQ1( _status ) (_status&0x02)
-#define SCV64_Is_IRQ2( _status ) (_status&0x04)
-#define SCV64_Is_IRQ3( _status ) (_status&0x08)
-#define SCV64_Is_IRQ4( _status ) (_status&0x10)
-#define SCV64_Is_IRQ5( _status ) (_status&0x20)
-
-
-/*
- *  scv64.c
- */
-
-void SCV64_Generate_DUART_Interrupts();
-rtems_unsigned32 SCV64_Get_Interrupt();
-rtems_unsigned32 SCV64_Get_Interrupt_Enable();
-
-#ifdef __cplusplus
-}
-#endif
- 
-#endif /* !_INCLUDE_DMV170_h */
-/* end of include file */
-
diff --git a/c/src/lib/libbsp/powerpc/dmv177/scv64/Makefile.in b/c/src/lib/libbsp/powerpc/dmv177/scv64/Makefile.in
deleted file mode 100644
index 14961659b3..0000000000
--- a/c/src/lib/libbsp/powerpc/dmv177/scv64/Makefile.in
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-PGM=${ARCH}/scv64.rel
-
-# C source names, if any, go here -- minus the .c
-C_PIECES=$(SCV64_PIECES)
-C_FILES=$(C_PIECES:%=%.c)
-C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
-
-H_FILES=
-
-SRCS=$(C_FILES) $(H_FILES)
-OBJS=$(C_O_FILES)
-
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-# 
-SCV64_PIECES=scv64
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES  +=
-CPPFLAGS +=
-CFLAGS   +=
-
-LD_PATHS  +=
-LD_LIBS   +=
-LDFLAGS   +=
-
-#
-# Add your list of files to delete here.  The config files
-#  already know how to delete some stuff, so you may want
-#  to just run 'make clean' first to see what gets missed.
-#  'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
-
-${PGM}: ${SRCS} ${OBJS}
-	$(make-rel)
-
-all:	${ARCH} $(SRCS) $(PGM)
-
-# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
-install:  all
-
-
-
diff --git a/c/src/lib/libbsp/powerpc/dmv177/scv64/scv64.c b/c/src/lib/libbsp/powerpc/dmv177/scv64/scv64.c
deleted file mode 100644
index 850618ad0e..0000000000
--- a/c/src/lib/libbsp/powerpc/dmv177/scv64/scv64.c
+++ /dev/null
@@ -1,171 +0,0 @@
-/*  scv64.c
- *
- *  This set of routines control the scv64 chip on the DMV177 board.
- *
- *
- *  COPYRIGHT (c) 1989, 1990, 1991, 1992, 1993, 1994, 1997.
- *  On-Line Applications Research Corporation (OAR).
- *  All rights assigned to U.S. Government, 1994.
- *
- *  $Id$
- */
-
-#include <rtems.h>
-#include <bsp.h>
-
-typedef struct {
-  /* DARF Registers */
-  volatile rtems_unsigned32  DMALAR;             /* 0x00 */       
-  volatile rtems_unsigned32  DMAVAR;             /* 0x04 */       
-  volatile rtems_unsigned32  DMATC;              /* 0x08 */      
-  volatile rtems_unsigned32  DCSR;               /* 0x0c */     
-  volatile rtems_unsigned32  VMEBAR;             /* 0x10 */       
-  volatile rtems_unsigned32  RXDATA;             /* 0x14 */       
-  volatile rtems_unsigned32  RXADDR;             /* 0x18 */                           
-  volatile rtems_unsigned32  RXCTL;              /* 0x1c */      
-  volatile rtems_unsigned32  BUSSEL;             /* 0x20 */       
-  volatile rtems_unsigned32  IVECT;              /* 0x24 */      
-  volatile rtems_unsigned32  APBR;               /* 0x28 */     
-  volatile rtems_unsigned32  TXDATA;             /* 0x2c */       
-  volatile rtems_unsigned32  TXADDR;             /* 0x30 */       
-  volatile rtems_unsigned32  TXCTL;              /* 0x34 */      
-  volatile rtems_unsigned32  LMFIFO;             /* 0x38 */       
-  volatile rtems_unsigned32  MODE;               /* 0x3c */     
-  volatile rtems_unsigned32  SA64BAR;            /* 0x40 */        
-  volatile rtems_unsigned32  MA64BAR;            /* 0x44 */
-  volatile rtems_unsigned32  LAG;                /* 0x48 */
-  volatile rtems_unsigned32  DMAVTC;             /* 0x4c */
-
-  /* Reserved */
-  volatile rtems_unsigned32  reserved_50_7F[12];
-
-  /* ACC Registers */
-  volatile rtems_unsigned8   STAT0_pad[3];       /* 0x80 */       
-  volatile rtems_unsigned8   STAT0;                        
-  volatile rtems_unsigned8   STAT1_pad[3];       /* 0x84 */       
-  volatile rtems_unsigned8   STAT1;                        
-  volatile rtems_unsigned8   GENCTL_pad[3];      /* 0x88 */        
-  volatile rtems_unsigned8   GENCTL;                        
-  volatile rtems_unsigned8   VINT_pad[3];        /* 0x8c */      
-  volatile rtems_unsigned8   VINT;                        
-  volatile rtems_unsigned8   VREQ_pad[3];        /* 0x90 */      
-  volatile rtems_unsigned8   VREQ;                        
-  volatile rtems_unsigned8   VARB_pad[3];        /* 0x94 */      
-  volatile rtems_unsigned8   VARB;                        
-  volatile rtems_unsigned8   ID_pad[3];          /* 0x98 */    
-  volatile rtems_unsigned8   ID;                        
-  volatile rtems_unsigned8   NA_pad[3];          /* 0x9c */    
-  volatile rtems_unsigned8   NA;                        
-  volatile rtems_unsigned8   _7IS_pad[3];        /* 0xa0 */      
-  volatile rtems_unsigned8   _7IS;                        
-  volatile rtems_unsigned8   LIS_pad[3];         /* 0xa4 */     
-  volatile rtems_unsigned8   LIS;                        
-  volatile rtems_unsigned8   UIE_pad[3];         /* 0xa8 */     
-  volatile rtems_unsigned8   UIE;                        
-  volatile rtems_unsigned8   LIE_pad[3];         /* 0xac */     
-  volatile rtems_unsigned8   LIE;                        
-  volatile rtems_unsigned8   VIE_pad[3];         /* 0xb0 */     
-  volatile rtems_unsigned8   VIE;                        
-  volatile rtems_unsigned8   IC10_pad[3];        /* 0xb4 */      
-  volatile rtems_unsigned8   IC10;                        
-  volatile rtems_unsigned8   IC32_pad[3];        /* 0xb8 */      
-  volatile rtems_unsigned8   IC32;                        
-  volatile rtems_unsigned8   IC54_pad[3];        /* 0xbc */      
-  volatile rtems_unsigned8   IC54;                        
-  /* Utility Registers */
-  volatile rtems_unsigned32  MISC;
-  volatile rtems_unsigned32  delay_line[3];
-  volatile rtems_unsigned32  MBOX0;
-  volatile rtems_unsigned32  MBOX1;
-  volatile rtems_unsigned32  MBOX2;
-  volatile rtems_unsigned32  MBOX3;
-} SCV64_Registers;
-
-/*
- * LIE Register
- */
-#define LOCAL_INTERRUPT_ENABLE_0  0x01
-#define LOCAL_INTERRUPT_ENABLE_1  0x02
-#define LOCAL_INTERRUPT_ENABLE_2  0x04
-#define LOCAL_INTERRUPT_ENABLE_3  0x08
-#define LOCAL_INTERRUPT_ENABLE_4  0x10
-#define LOCAL_INTERRUPT_ENABLE_5  0x20
-
-/* 
- * IC54 Register
- */
-#define AUTOVECTOR_5  0x80
-
-
-/*
- * Set the registers pointer to the base address of the SCV64
- */
-SCV64_Registers *SCV64 =  (void *)DMV170_SCV64_BASE_ADDRESS;
-
-/*PAGE
- *
- *  SCV64_Initialize
- *
- *  This routine initializes the SCV64.
- */
-void SCV64_Initialize() {
-  SCV64->LIE = 0;
-}
-  
-/*PAGE
- *
- *  SCV64_Generate_DUART_Interrupts
- *
- *  This sets the SCV64 to generate duart interrupts for
- *  the DMV177 board.
- */
-void SCV64_Generate_DUART_Interrupts() {
-
-  rtems_unsigned8 data;
- 
-  /*
-   * Set Local Interrupt 5 enable
-   */
-  data = SCV64->LIE;
-  data |= LOCAL_INTERRUPT_ENABLE_5;
-  SCV64->LIE = data;
-
-  /*
-   * Set Autovector.
-   */
-  data = SCV64->IC54;
-  data |= AUTOVECTOR_5;
-  SCV64->IC54 = data;
-}
-
-/*PAGE
- *
- *  SCV64_Get_Interrupt
- *
- *  This routine returns the SCV64 status register.
- */
-rtems_unsigned32 SCV64_Get_Interrupt()
-{
-  rtems_unsigned8 data;
- 
-  /*
-   * Put the LIS data into the lower byte of the result
-   */
-  data = SCV64->LIS;
-
-  return data;
-}
-
-/*PAGE
- *
- * SCV64_Get_Interrupt_Enable
- *
- * This routine returns the interrupt enable mask.
- */
-rtems_unsigned32 SCV64_Get_Interrupt_Enable()
-{
-  /*
-   * Return the set of interrupts enabled.
-   */
-  return SCV64->LIE;
-}
diff --git a/c/src/lib/libbsp/powerpc/dmv177/sonic/Makefile.in b/c/src/lib/libbsp/powerpc/dmv177/sonic/Makefile.in
deleted file mode 100644
index 35cd5ff209..0000000000
--- a/c/src/lib/libbsp/powerpc/dmv177/sonic/Makefile.in
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-PGM=${ARCH}/sonic.rel
-
-# C source names, if any, go here -- minus the .c
-C_PIECES=sonic
-C_FILES=$(C_PIECES:%=%.c)
-C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
-
-H_FILES=
-
-# Assembly source names, if any, go here -- minus the .s
-S_PIECES=
-S_FILES=$(S_PIECES:%=%.s)
-S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
-
-SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES)
-OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
-
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES  += -D_COMPILING_BSD_KERNEL_ -DKERNEL -DINET -DNFS \
-     -DDIAGNOSTIC -DBOOTP_COMPAT
-CPPFLAGS +=
-CFLAGS   +=
-
-LD_PATHS  +=
-LD_LIBS   +=
-LDFLAGS   +=
-
-#
-# Add your list of files to delete here.  The config files
-#  already know how to delete some stuff, so you may want
-#  to just run 'make clean' first to see what gets missed.
-#  'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
-
-${PGM}: ${SRCS} ${OBJS}
-	$(make-rel)
-
-all:	${ARCH} $(SRCS) $(PGM)
-
-# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
-install:  all
diff --git a/c/src/lib/libbsp/powerpc/dmv177/sonic/sonic.c b/c/src/lib/libbsp/powerpc/dmv177/sonic/sonic.c
deleted file mode 100644
index 651025ee71..0000000000
--- a/c/src/lib/libbsp/powerpc/dmv177/sonic/sonic.c
+++ /dev/null
@@ -1,1599 +0,0 @@
-void break_when_you_get_here();
-/*
- *******************************************************************
- *******************************************************************
- **                                                               **
- **       RTEMS NETWORK DRIVER FOR NATIONAL DP83932 `SONIC'       **
- **         SYSTEMS-ORIENTED NETWORK INTERFACE CONTROLLER         **
- **                                                               **
- *******************************************************************
- *******************************************************************
- */
-
-/*
- * $Revision$   $Date$   $Author$
- * $State$
- * $Id$
- */
-
-/*
- * References:
- * 1) DP83932C-20/25/33 MHz SONIC(TM) Systems-Oriented Network Interface
- *    Controller data sheet.  TL/F/10492, RRD-B30M105, National Semiconductor,
- *    1995.
- *
- * 2) Software Driver Programmer's Guide for the DP83932 SONIC(TM),
- *    Application Note 746, Wesley Lee and Mike Lui, TL/F/11140, 
- *    RRD-B30M75, National Semiconductor, March, 1991.
- *
- * 3) SVME/DMV-171 Single Board Computer Documentation Package, #805905,
- *    DY 4 Systems Inc., Kanata, Ontario, September, 1996.
- */
-
-#include <rtems/rtems_bsdnet.h>
-#include "sonic.h"
-
-#include <stdio.h>
-
-#include <errno.h>
-#include <rtems/error.h>
-
-#include <sys/param.h>
-#include <sys/mbuf.h>
-#include <sys/socket.h>
-#include <sys/sockio.h>
-#include <sys/sockio.h>
-
-#include <net/if.h>
-
-#include <netinet/in.h>
-#include <netinet/if_ether.h>
-
-/*
- * Debug levels
- *
- */
-
-#define SONIC_DEBUG_NONE             0x0000
-#define SONIC_DEBUG_ALL              0xFFFF
-#define SONIC_DEBUG_PRINT_REGISTERS  0x0001
-#define SONIC_DEBUG_MEMORY           0x0002
-#define SONIC_DEBUG_MEMORY_ALLOCATE  0x0004
-#define SONIC_DEBUG_FRAGMENTS        0x0008
-#define SONIC_DEBUG_CAM              0x0008
-#define SONIC_DEBUG_DESCRIPTORS      0x0010
-#define SONIC_DEBUG_ERRORS           0x0020
-
-#define SONIC_DEBUG (SONIC_DEBUG_ERRORS)
-
-/* (SONIC_DEBUG_MEMORY|SONIC_DEBUG_DESCRIPTORS) */
-
-/* SONIC_DEBUG_ALL */
-
-
-/*
- * XXX
- */
-
-#include <dmv170.h>
-
-/*
- *  Use the top line if you want more symbols.
- */
-
-#define SONIC_STATIC 
-/* #define SONIC_STATIC static */
-
-/*
- * Number of devices supported by this driver
- */
-#ifndef NSONIC
-# define NSONIC 1
-#endif
-
-/*
- * Default location of device registers
- */
-#ifndef SONIC_BASE_ADDRESS
-# define SONIC_BASE_ADDRESS 0xF3000000
-# warning "Using default SONIC_BASE_ADDRESS."
-#endif
-
-/*
- * Default interrupt vector
- */
-#ifndef SONIC_VECTOR
-# define SONIC_VECTOR 1
-# warning "Using default SONIC_VECTOR."
-#endif
-
-/*
- * Default device configuration register values
- * Conservative, generic values.
- * DCR:
- *      No extended bus mode
- *      Unlatched bus retry
- *      Programmable outputs unused
- *      Asynchronous bus mode
- *      User definable pins unused
- *      No wait states (access time controlled by DTACK*)
- *      32-bit DMA
- *      Empty/Fill DMA mode
- *      Maximum Transmit/Receive FIFO
- * DC2:
- *      Extended programmable outputs unused
- *      Normal HOLD request
- *      Packet compress output unused
- *      No reject on CAM match
- */
-#define SONIC_DCR \
-   (DCR_DW32 | DCR_WAIT0 | DCR_PO0 | DCR_PO1  | DCR_RFT4 | DCR_TFT8)
-#ifndef SONIC_DCR
-# define SONIC_DCR (DCR_DW32 | DCR_TFT28)
-#endif
-#ifndef SONIC_DC2
-# define SONIC_DC2 (0)
-#endif
-
-/*
- * Default sizes of transmit and receive descriptor areas
- */
-#define RDA_COUNT     20
-#define TDA_COUNT     100
-
-/*
- * 
- * As suggested by National Application Note 746, make the
- * receive resource area bigger than the receive descriptor area.
- */
-#define RRA_EXTRA_COUNT  0
-
-/*
- * RTEMS event used by interrupt handler to signal daemons.
- */
-#define INTERRUPT_EVENT  RTEMS_EVENT_1
-
-/*
- * RTEMS event used to start transmit daemon.
- * This must not be the same as INTERRUPT_EVENT.
- */
-#define START_TRANSMIT_EVENT    RTEMS_EVENT_2
-
-/*
- * Largest Ethernet frame.
- */
-#define MAXIMUM_FRAME_SIZE  1518
-
-/*
- * Receive buffer size.
- * Allow for a pointer, plus a full ethernet frame (including Frame
- * Check Sequence) rounded up to a 4-byte boundary.
- */
-#define RBUF_SIZE  ((sizeof (void *) + (MAXIMUM_FRAME_SIZE) + 3) & ~3)
-#define RBUF_WC    ((((MAXIMUM_FRAME_SIZE) + 3) & ~3) / 2)
-
-/*
- * Macros for manipulating 32-bit pointers as 16-bit fragments
- */
-#define LSW(p)   ((rtems_unsigned16)((rtems_unsigned32)(p)))
-#define MSW(p)   ((rtems_unsigned16)((rtems_unsigned32)(p) >> 16))
-#define PTR(m,l) ((void*)(((rtems_unsigned16)(m)<<16)|(rtems_unsigned16)(l)))
-
-/*
- * Hardware-specific storage
- */
-struct sonic_softc {
-  /*
-   * Connection to networking code
-   * This entry *must* be the first in the sonic_softc structure.
-   */
-  struct arpcom                    arpcom;
-
-  /*
-   * Default location of device registers
-   * ===CACHE===
-   * This area must be non-cacheable, guarded.
-   */
-  void                             *sonic;
-
-  /*
-   * Interrupt vector
-   */
-  rtems_vector_number             vector;
-
-  /*
-   *  Indicates configuration
-   */
-  int                             acceptBroadcast;
-
-  /*
-   * Task waiting for interrupts
-   */
-  rtems_id                        rxDaemonTid;
-  rtems_id                        txDaemonTid;
-
-  /*
-   * Receive resource area
-   */
-  int                             rdaCount;
-  ReceiveResourcePointer_t        rsa;
-  ReceiveResourcePointer_t        rea;
-  CamDescriptorPointer_t          cdp;
-  ReceiveDescriptorPointer_t      rda;
-  ReceiveDescriptorPointer_t      rdp_last;
-
-  /*
-   * Transmit descriptors
-   */
-  int                             tdaCount;
-  TransmitDescriptorPointer_t     tdaHead;  /* Last filled */
-  TransmitDescriptorPointer_t     tdaTail;  /* Next to retire */
-  int                             tdaActiveCount;
-
-  /*
-   * Statistics
-   */
-  unsigned long                   Interrupts;
-  unsigned long                   rxInterrupts;
-  unsigned long                   rxMissed;
-  unsigned long                   rxGiant;
-  unsigned long                   rxNonOctet;
-  unsigned long                   rxBadCRC;
-  unsigned long                   rxCollision;
-
-  unsigned long                   txInterrupts;
-  unsigned long                   txSingleCollision;
-  unsigned long                   txMultipleCollision;
-  unsigned long                   txCollision;
-  unsigned long                   txDeferred;
-  unsigned long                   txUnderrun;
-  unsigned long                   txLateCollision;
-  unsigned long                   txExcessiveCollision;
-  unsigned long                   txExcessiveDeferral;
-  unsigned long                   txLostCarrier;
-  unsigned long                   txRawWait;
-};
-SONIC_STATIC struct sonic_softc sonic_softc[NSONIC];
-
-/*
- ******************************************************************
- *                                                                *
- *                        Support Routines                        *
- *                                                                *
- ******************************************************************
- */
-
-void sonic_write_register(
-  void       *base,
-  unsigned32  regno,
-  unsigned32  value
-);
-
-unsigned32 sonic_read_register(
-  void       *base,
-  unsigned32  regno
-);
-
-void sonic_enable_interrupts(
-  void       *rp,
-  unsigned32  mask
-)
-{
-  rtems_interrupt_level level;
-
-  rtems_interrupt_disable( level );
-      sonic_write_register(
-         rp,
-         SONIC_REG_IMR,
-         sonic_read_register(rp, SONIC_REG_IMR) | mask
-      );
-  rtems_interrupt_enable( level );
-}
-
-/*
- * Allocate non-cacheable memory on a single 64k page.
- * Very simple minded -- just keeps trying till the memory is on a single page.
- */
-SONIC_STATIC void * sonic_allocate(unsigned int nbytes)
-{
-  void *p;
-  unsigned long a1, a2;
-
-  for (;;) {
-    /*
-     * ===CACHE===
-     * Change malloc to malloc_noncacheable_guarded.
-     */
-    p = malloc( nbytes, M_MBUF, M_NOWAIT );
-    memset (p, '\0', nbytes);
-    if (p == NULL)
-      rtems_panic ("No memory!");
-    a1 = (unsigned long)p;
-    a2 = a1 + nbytes - 1;
-    if ((a1 >> 16) == (a2 >> 16))
-      break;
-  }
-#if (SONIC_DEBUG & SONIC_DEBUG_MEMORY_ALLOCATE)
-  printf( "sonic_allocate %d bytes at %p\n", nbytes, p );
-#endif
-  return p;
-}
-
-/*
- * Shut down the interface.
- */
-
-SONIC_STATIC void sonic_stop (struct sonic_softc *sc)
-{
-  void *rp = sc->sonic;
-  struct ifnet *ifp = &sc->arpcom.ac_if;
-
-  ifp->if_flags &= ~IFF_RUNNING;
-
-  /*
-   * Stop the transmitter and receiver.
-   */
-  sonic_write_register( rp, SONIC_REG_CR, CR_HTX | CR_RXDIS );
-}
-
-/*
- * Show interface statistics
- */
-SONIC_STATIC void sonic_stats (struct sonic_softc *sc)
-{
-  printf (" Total Interrupts:%-8lu", sc->Interrupts);
-  printf ("    Rx Interrupts:%-8lu", sc->rxInterrupts);
-  printf ("            Giant:%-8lu", sc->rxGiant);
-  printf ("        Non-octet:%-8lu\n", sc->rxNonOctet);
-  printf ("          Bad CRC:%-8lu", sc->rxBadCRC);
-  printf ("        Collision:%-8lu", sc->rxCollision);
-  printf ("           Missed:%-8lu\n", sc->rxMissed);
-
-  printf (    "    Tx Interrupts:%-8lu", sc->txInterrupts);
-  printf (  "           Deferred:%-8lu", sc->txDeferred);
-  printf ("        Lost Carrier:%-8lu\n", sc->txLostCarrier);
-  printf (   "Single Collisions:%-8lu", sc->txSingleCollision);
-  printf ( "Multiple Collisions:%-8lu", sc->txMultipleCollision);
-  printf ("Excessive Collisions:%-8lu\n", sc->txExcessiveCollision);
-  printf (   " Total Collisions:%-8lu", sc->txCollision);
-  printf ( "     Late Collision:%-8lu", sc->txLateCollision);
-  printf ("            Underrun:%-8lu\n", sc->txUnderrun);
-  printf (   "  Raw output wait:%-8lu\n", sc->txRawWait);
-}
-
-/*
- ******************************************************************
- *                                                                *
- *                        Interrupt Handler                       *
- *                                                                *
- ******************************************************************
- */
-
-SONIC_STATIC rtems_isr sonic_interrupt_handler (rtems_vector_number v)
-{
-  struct sonic_softc *sc = sonic_softc;
-  void *rp;
-
-#if (NSONIC > 1)
-  /*
-   * Find the device which requires service
-   */
-  for (;;) {
-    if (sc->vector == v)
-      break;
-    if (++sc == &sonic[NSONIC])
-      return;  /* Spurious interrupt? */
-  }
-#endif /* NSONIC > 1 */
-
-  /*
-   * Get pointer to SONIC registers
-   */
-  rp = sc->sonic;
-
-  sc->Interrupts++;
-
-  /*
-   * Packet received or receive buffer area exceeded?
-   */
-  if ((sonic_read_register( rp, SONIC_REG_IMR ) & (IMR_PRXEN | IMR_RBAEEN)) &&
-      (sonic_read_register( rp, SONIC_REG_ISR ) & (ISR_PKTRX | ISR_RBAE))) {
-    sonic_write_register(
-       rp,
-       SONIC_REG_IMR,
-       sonic_read_register( rp, SONIC_REG_IMR) & ~(IMR_PRXEN | IMR_RBAEEN)
-    );
-    sc->rxInterrupts++;
-    rtems_event_send (sc->rxDaemonTid, INTERRUPT_EVENT);
-  }
-
-  /*
-   * Packet started, transmitter done or transmitter error?
-   */
-  if ((sonic_read_register( rp, SONIC_REG_IMR ) & (IMR_PINTEN | IMR_PTXEN | IMR_TXEREN))
-   && (sonic_read_register( rp, SONIC_REG_ISR ) & (ISR_PINT | ISR_TXDN | ISR_TXER))) {
-    sonic_write_register(
-       rp,
-       SONIC_REG_IMR,
-       sonic_read_register( rp, SONIC_REG_IMR) &
-                  ~(IMR_PINTEN | IMR_PTXEN | IMR_TXEREN)
-    );
-    sc->txInterrupts++;
-    rtems_event_send (sc->txDaemonTid, INTERRUPT_EVENT);
-  }
-}
-
-/*
- ******************************************************************
- *                                                                *
- *                      Transmitter Routines                      *
- *                                                                *
- ******************************************************************
- */
-
-/*
- * Soak up transmit descriptors that have been sent.
- */
-
-SONIC_STATIC void sonic_retire_tda (struct sonic_softc *sc)
-{
-  rtems_unsigned16 status;
-  unsigned int collisions;
-  struct mbuf *m, *n;
-
-  /*
-   * Repeat for all completed transmit descriptors.
-   */
-  while ((sc->tdaActiveCount != 0)
-      && ((status = sc->tdaTail->status) != 0)) {
-
-#if (SONIC_DEBUG & SONIC_DEBUG_DESCRIPTORS)
-    printf( "retire TDA %p (0x%04x)\n", sc->tdaTail, status );
-#endif
-
-#if (SONIC_DEBUG & SONIC_DEBUG_ERRORS)
-    if ( status != 0x0001 )
-      printf( "ERROR: retire TDA %p (0x%04x)\n", sc->tdaTail, status );
-#endif
-
-    /*
-     * Check for errors which stop the transmitter.
-     */
-    if (status & (TDA_STATUS_EXD |
-        TDA_STATUS_EXC |
-        TDA_STATUS_FU |
-        TDA_STATUS_BCM)) {
-      /*
-       * Restart the transmitter if there are
-       * packets waiting to go.
-       */
-      rtems_unsigned16 link;
-      link = *(sc->tdaTail->linkp);
-
-      if ((link & TDA_LINK_EOL) == 0) {
-        void *rp = sc->sonic;
-
-        sonic_write_register( rp, SONIC_REG_CTDA, link );
-        sonic_write_register( rp, SONIC_REG_CR, CR_TXP );
-      }
-    }
-
-    /*
-     * Update network statistics
-     */
-    collisions = (status & TDA_STATUS_COLLISION_MASK) >> TDA_STATUS_COLLISION_SHIFT;
-    if (collisions) {
-      if (collisions == 1)
-        sc->txSingleCollision++;
-      else
-        sc->txMultipleCollision++;
-      sc->txCollision += collisions;
-    }
-    if (status & TDA_STATUS_EXC)
-      sc->txExcessiveCollision++;
-    if (status & TDA_STATUS_OWC)
-      sc->txLateCollision++;
-    if (status & TDA_STATUS_EXD)
-      sc->txExcessiveDeferral++;
-    if (status & TDA_STATUS_DEF)
-      sc->txDeferred++;
-    if (status & TDA_STATUS_FU)
-      sc->txUnderrun++;
-    if (status & TDA_STATUS_CRSL)
-      sc->txLostCarrier++;
-
-    /*
-     *  Free the packet and reset a couple of fields
-     */
-    sc->tdaActiveCount--;
-    m = (struct mbuf *)&sc->tdaTail->mbufp;
-    MFREE(m, n);
-
-    sc->tdaTail->frag[0].frag_link = LSW(sc->tdaTail->link_pad);
-    sc->tdaTail->frag_count        = 0;
-
-    /*
-     * Move to the next transmit descriptor
-     */
-    sc->tdaTail = sc->tdaTail->next;
-#if (SONIC_DEBUG & SONIC_DEBUG_DESCRIPTORS)
-    printf( "next TDA %p\n", sc->tdaTail );
-#endif
-  }
-}
-
-/*
- * Send packet
- */
-SONIC_STATIC void sonic_sendpacket (struct ifnet *ifp, struct mbuf *m)
-{
-  struct sonic_softc *sc = ifp->if_softc;
-  void *rp = sc->sonic;
-  struct mbuf *l = NULL;
-  TransmitDescriptorPointer_t tdp;
-  volatile struct TransmitDescriptorFragLink *fp;
-  unsigned int packetSize;
-  int i;
-  static char padBuf[64];
-
-  /*
-   * Free up transmit descriptors.
-   */
-  sonic_retire_tda (sc);
-
-  /*
-   * Wait for transmit descriptor to become available.
-   */
-  if (sc->tdaActiveCount == sc->tdaCount) {
-#if (SONIC_DEBUG & SONIC_DEBUG_FRAGMENTS)
-    puts( "Wait for more TDAs" );
-#endif
-    /*
-     * Clear old events.
-     */
-    sonic_write_register( rp, SONIC_REG_ISR, ISR_PINT | ISR_TXDN | ISR_TXER );
-
-    /*
-     * Wait for transmit descriptor to become available.
-     * Note that the transmit descriptors are checked
-     * *before* * entering the wait loop -- this catches
-     * the possibility that a transmit descriptor became
-     * available between the `if' the started this block,
-     * and the clearing of the interrupt status register.
-     */
-    sonic_retire_tda (sc);
-    while (sc->tdaActiveCount == sc->tdaCount) {
-      rtems_event_set events;
-      /*
-       * Enable transmitter interrupts.
-       */
-      sonic_enable_interrupts( rp, (IMR_PINTEN | IMR_PTXEN | IMR_TXEREN) );
-
-      /*
-       * Wait for interrupt
-       */
-      rtems_bsdnet_event_receive (INTERRUPT_EVENT,
-            RTEMS_WAIT|RTEMS_EVENT_ANY,
-            RTEMS_NO_TIMEOUT,
-            &events);
-      sonic_write_register( rp, SONIC_REG_ISR, ISR_PINT | ISR_TXDN | ISR_TXER );
-      sonic_retire_tda (sc);
-    }
-  }
-
-  /*
-   * Fill in the transmit descriptor fragment descriptors.
-   * ===CACHE===
-   * If data cache is operating in write-back mode, flush cached
-   * data to memory.
-   */
-  tdp = sc->tdaHead->next;
-  tdp->mbufp = m;
-  packetSize = 0;
-  fp = tdp->frag;
-  for (i = 0 ; i < MAXIMUM_FRAGS_PER_DESCRIPTOR ; i++, fp++) {
-    /*
-     * Throw away empty mbufs
-     */
-    if (m->m_len) {
-      void *p = mtod (m, void *);
-      fp->frag_lsw = LSW(p);
-      fp->frag_msw = MSW(p);
-      fp->frag_size = m->m_len;
-      packetSize += m->m_len;
-      l = m;
-      m = m->m_next;
-#if (SONIC_DEBUG & SONIC_DEBUG_FRAGMENTS)
-      printf( "fp %p 0x%04x%04x %d\n",
-                    fp, fp->frag_msw, fp->frag_lsw, fp->frag_size );
-#endif
-    }
-    else {
-      struct mbuf *n;
-      MFREE (m, n);
-      m = n;
-      if (l != NULL)
-        l->m_next = m;
-    }
-    /*
-     * Break out of the loop if this mbuf is the last in the frame.
-     */
-    if (m == NULL)
-      break;
-  }
-
-  /*
-   * Pad short packets.
-   */
-  if  ((packetSize < 64) && (i < MAXIMUM_FRAGS_PER_DESCRIPTOR)) {
-    int padSize = 64 - packetSize;
-    fp++;
-    fp->frag_lsw = LSW(padBuf);
-    fp->frag_msw = MSW(padBuf);
-    fp->frag_size = padSize;
-#if (SONIC_DEBUG & SONIC_DEBUG_FRAGMENTS)
-    printf( "PAD fp %p 0x%04x%04x %d\n",
-         fp, fp->frag_msw, fp->frag_lsw, fp->frag_size );
-#endif
-    packetSize += padSize;
-    i++;
-  }
-
-  /*
-   * Fill Transmit Descriptor
-   */
-  tdp->pkt_size = packetSize;
-  tdp->frag_count = i + 1;
-  tdp->status = 0;
-
-  /*
-   * Chain onto list and start transmission.
-   */
-
-  tdp->linkp = &(fp+1)->frag_link;
-  *tdp->linkp = LSW(tdp->next) | TDA_LINK_EOL;
-  if ( sc->tdaHead->frag_count )
-    *sc->tdaHead->linkp &= ~TDA_LINK_EOL;
-  sc->tdaActiveCount++;
-  sc->tdaHead = tdp;
-
-  sonic_enable_interrupts( rp, (IMR_PINTEN | IMR_PTXEN | IMR_TXEREN) );
-  sonic_write_register( rp, SONIC_REG_CR, CR_TXP );
-}
-
-/*
- * Driver transmit daemon
- */
-SONIC_STATIC void sonic_txDaemon (void *arg)
-{
-  struct sonic_softc *sc = (struct sonic_softc *)arg;
-  struct ifnet *ifp = &sc->arpcom.ac_if;
-  struct mbuf *m;
-  rtems_event_set events;
-
-  for (;;) {
-    /*
-     * Wait for packet
-     */
-    rtems_bsdnet_event_receive (
-       START_TRANSMIT_EVENT,
-       RTEMS_EVENT_ANY | RTEMS_WAIT,
-       RTEMS_NO_TIMEOUT,
-       &events
-    );
-
-    /*
-     * Send packets till queue is empty
-     */
-    for (;;) {
-      /*
-       * Get the next mbuf chain to transmit.
-       */
-      IF_DEQUEUE(&ifp->if_snd, m);
-      if (!m)
-        break;
-      sonic_sendpacket (ifp, m);
-    }
-    ifp->if_flags &= ~IFF_OACTIVE;
-  }
-}
-
-/*
- ******************************************************************
- *                                                                *
- *                        Receiver Routines                       *
- *                                                                *
- ******************************************************************
- */
-
-/*
- * Wait for SONIC to hand over a Receive Descriptor.
- */
-
-SONIC_STATIC void sonic_rda_wait(
-  struct sonic_softc *sc,
-  ReceiveDescriptorPointer_t rdp
-)
-{
-  int i;
-  void *rp = sc->sonic;
-  rtems_event_set events;
-
-  /*
-   * Wait for Receive Descriptor.
-   * The order of the tests is very important.
-   *    The RDA is checked after RBAE is detected.  This ensures that
-   *    the driver processes all RDA entries before reusing the RRA
-   *    entry holding the giant packet.
-   *    The event wait is done after the RDA and RBAE checks.  This
-   *    catches the possibility that a Receive Descriptor became ready
-   *    between the call to this function and the clearing of the
-   *    interrupt status register bit.
-   */
-  for (;;) {
-    /*
-     * Has a giant packet arrived?
-     * The National DP83932C data sheet is very vague on what
-     * happens under this condition.  The description of the
-     * Interrupt Status Register (Section 4.3.6) states,
-     * ``Reception is aborted and the SONIC fetches the next
-     * available resource descriptors in the RRA.  The buffer
-     * space is not re-used and an RDA is not setup for the
-     * truncated packet.''
-     * I take ``Reception is aborted''  to mean that the RXEN
-     * bit in the Command Register is cleared and must be set
-     * by the driver to begin reception again.
-     * Unfortunately, an alternative interpretation could be
-     * that only reception of the current packet is aborted.
-     * This would be more difficult to recover from....
-     */
-    if (sonic_read_register( rp, SONIC_REG_ISR ) & ISR_RBAE) {
-
-#if (SONIC_DEBUG & SONIC_DEBUG_ERRORS)
-      printf( "ERROR: looks like a giant packet -- RBAE\n" );
-#endif
-
-      /*
-       * One more check to soak up any Receive Descriptors
-       * that may already have been handed back to the driver.
-       */
-      if (rdp->in_use == RDA_IN_USE) {
-#if (SONIC_DEBUG & SONIC_DEBUG_ERRORS)
-      printf( "ERROR: nope just an RBAE\n" );
-#endif
-        break;
-      }
-
-      /*
-       * Check my interpretation of the SONIC manual.
-       */
-      if (sonic_read_register( rp, SONIC_REG_CR ) & CR_RXEN)
-        rtems_panic ("SONIC RBAE/RXEN");
-
-      /*
-       * Update statistics
-       */
-      sc->rxGiant++;
-
-      /*
-       * Reuse receive buffer.
-       * Again, the manual is subject to interpretation.  The
-       * RRP register is described as, `the lower address of
-       * the next descriptor the SONIC will read.''
-       * Since, acording to the ISR/RBAE notes, the SONIC has
-       * ``fetched the next available resource descriptor in
-       * the RRA'', I interpret this to mean that that the
-       * driver has to move the RRP back *two* entries to
-       * reuse the receive buffer holding the giant packet.
-       */
-      for (i = 0 ; i < 2 ; i++) {
-        if (sonic_read_register( rp, SONIC_REG_RRP ) ==
-            sonic_read_register( rp, SONIC_REG_RSA ))
-          sonic_write_register(
-            rp,
-            SONIC_REG_RRP,
-            sonic_read_register( rp, SONIC_REG_REA )
-          );
-          sonic_write_register(
-             rp,
-             SONIC_REG_RRP,
-             sonic_read_register(rp, SONIC_REG_RRP) - sizeof(ReceiveResource_t)
-          );
-      }
-
-      /*
-       * Restart reception
-       */
-      sonic_write_register( rp, SONIC_REG_ISR, ISR_RBAE );
-      sonic_write_register( rp, SONIC_REG_CR, CR_RXEN );
-    }
-
-    /*
-     * Clear old packet-received events.
-     */
-    sonic_write_register( rp, SONIC_REG_ISR, ISR_PKTRX );
-
-    /*
-     * Has Receive Descriptor become available?
-     */
-    if (rdp->in_use == RDA_IN_USE)
-      break;
-
-    /*
-     * Enable interrupts.
-     */
-    sonic_enable_interrupts( rp, (IMR_PRXEN | IMR_RBAEEN) );
-
-    /*
-     * Wait for interrupt.
-     */
-    rtems_bsdnet_event_receive(
-      INTERRUPT_EVENT,
-      RTEMS_WAIT|RTEMS_EVENT_ANY,
-      RTEMS_NO_TIMEOUT,
-      &events
-    );
-  }
-#if (SONIC_DEBUG & SONIC_DEBUG_DESCRIPTORS)
-  printf( "RDA %p\n", rdp );
-#endif
-
-#if (SONIC_DEBUG & SONIC_DEBUG_ERRORS)
-    if (rdp->status & 0x000E)
-      printf( "ERROR: RDA %p (0x%04x)\n", rdp, rdp->status );
-#endif
-
-}
-
-/*
- * SONIC reader task
- */
-SONIC_STATIC void sonic_rxDaemon (void *arg)
-{
-  struct sonic_softc *sc = (struct sonic_softc *)arg;
-  struct ifnet *ifp = &sc->arpcom.ac_if;
-  void *rp = sc->sonic;
-  struct mbuf *m;
-  rtems_unsigned16 status;
-  ReceiveDescriptorPointer_t rdp;
-  ReceiveResourcePointer_t rwp, rea;
-  rtems_unsigned16 newMissedTally, oldMissedTally;
-
-  rwp = sc->rsa;
-  rea = sc->rea;
-  rdp = sc->rda;
-
-  /*
-   * Start the receiver
-   */
-  oldMissedTally = sonic_read_register( rp, SONIC_REG_MPT );
-  sonic_write_register( rp, SONIC_REG_CR, CR_RRRA );
-  sonic_write_register( rp, SONIC_REG_CR, CR_RXEN );
-
-  /*
-   * Input packet handling loop
-   */
-  for (;;) {
-    /*
-     * Wait till SONIC supplies a Receive Descriptor.
-     */
-    if (rdp->in_use == RDA_FREE) {
-      sonic_rda_wait (sc, rdp);
-    }
-
-#if (SONIC_DEBUG & SONIC_DEBUG_DESCRIPTORS)
-    printf( "Incoming packet %p status=0x%04x\n", rdp, rdp->status );
-#endif
-
-    /*
-     * Check that packet is valid
-     */
-    status = rdp->status;
-    if (status & RDA_STATUS_PRX) {
-      struct mbuf **mp;
-      struct ether_header *eh;
-      void *p;
-
-      /*
-       * Get the mbuf pointer
-       */
-      p = PTR(rdp->pkt_msw, rdp->pkt_lsw);
-      mp = (struct mbuf **)p - 1;
-      m = *mp;
-
-      /*
-       * Pass the packet up the chain.
-       * The mbuf count is reduced to remove
-       * the frame check sequence at the end
-       * of the packet.
-       * ===CACHE===
-       * Invalidate cache entries for this memory.
-       */
-      m->m_len = m->m_pkthdr.len = rdp->byte_count -
-                          sizeof(rtems_unsigned32) -
-                          sizeof(struct ether_header);
-      eh = mtod (m, struct ether_header *);
-      m->m_data += sizeof(struct ether_header);
-      ether_input (ifp, eh, m);
-
-      /*
-       * Sanity check that Receive Resource Area is
-       * still in sync with Receive Descriptor Area
-       * The buffer reported in the Receive Descriptor
-       * should be the same as the buffer in the Receive
-       * Resource we are about to reuse.
-       */
-/* XXX figure out whether this is valid or not */
-#if 0
-      if ((LSW(p) != rwp->buff_ptr_lsw)
-       || (MSW(p) != rwp->buff_ptr_msw))
-        rtems_panic ("SONIC RDA/RRA");
-#endif
-
-      /*
-       * Allocate a new mbuf.
-       */
-      MGETHDR (m, M_WAIT, MT_DATA);
-      MCLGET (m, M_WAIT);
-      m->m_pkthdr.rcvif = ifp;
-      mp = mtod (m, struct mbuf **);
-      m->m_data += sizeof *mp;
-      *mp = m;
-      p = mtod (m, void *);
-
-      /*
-       * Reuse Receive Resource.
-       */
-      rwp->buff_ptr_lsw = LSW(p);
-      rwp->buff_ptr_msw = MSW(p);
-      rwp++;
-      if (rwp == rea) {
-#if (SONIC_DEBUG & SONIC_DEBUG_MEMORY)
-        printf( "Wrapping RWP from %p to %p\n", rwp, sc->rsa );
-#endif
-        rwp = sc->rsa;
-      }
-      sonic_write_register( rp, SONIC_REG_RWP , LSW(rwp) );
-
-      /*
-       * Tell the SONIC to reread the RRA.
-       */
-      if (sonic_read_register( rp, SONIC_REG_ISR ) & ISR_RBE)
-        sonic_write_register( rp, SONIC_REG_ISR, ISR_RBE );
-    }
-    else {
-      if (status & RDA_STATUS_COL)
-        sc->rxCollision++;
-      if (status & RDA_STATUS_FAER)
-        sc->rxNonOctet++;
-      else if (status & RDA_STATUS_CRCR)
-        sc->rxBadCRC++;
-    }
-
-    /*
-     * Count missed packets
-     */
-    newMissedTally = sonic_read_register( rp, SONIC_REG_MPT );
-    if (newMissedTally != oldMissedTally) {
-      sc->rxMissed += (newMissedTally - oldMissedTally) & 0xFFFF;
-      newMissedTally = oldMissedTally;
-    }
-
-    /*
-     * Move to next receive descriptor
-     */
-    rdp->in_use = RDA_FREE;
-    rdp = rdp->next;
-    rdp->link &= ~RDA_LINK_EOL;
-  }
-}
-
-/*
- ******************************************************************
- *                                                                *
- *                     Initialization Routines                    *
- *                                                                *
- ******************************************************************
- */
-
-/*
- * Initialize the SONIC hardware
- */
-SONIC_STATIC void sonic_initialize_hardware(struct sonic_softc *sc)
-{
-  void *rp = sc->sonic;
-  int i;
-  unsigned char *hwaddr;
-  rtems_isr_entry old_handler;
-  TransmitDescriptorPointer_t tdp;
-  ReceiveDescriptorPointer_t ordp, rdp;
-  ReceiveResourcePointer_t rwp;
-  struct mbuf *m;
-  void *p;
-  CamDescriptorPointer_t cdp;
-
-  /*
-   *  The Revision B SONIC has a horrible bug known as the "Zero
-   *  Length Packet bug".  The initial board used to develop this
-   *  driver had a newer revision of the SONIC so there was no reason
-   *  to check for this.  If you have the Revision B SONIC chip, then
-   *  you need to add some code to the RX path to handle this weirdness.
-   */
-
-  if ( sonic_read_register( rp, SONIC_REG_SR ) < SONIC_REVISION_C ) {
-    rtems_fatal_error_occurred( 0x0BADF00D );  /* don't eat this part :) */
-  }
-  
-  /*
-   *  Set up circular linked list in Transmit Descriptor Area.
-   *  Use the PINT bit in the transmit configuration field to
-   *  request an interrupt on every other transmitted packet.
-   *
-   *  NOTE: sonic_allocate() zeroes all of the memory allocated.
-   */
-
-  sc->tdaActiveCount = 0;
-  sc->tdaTail = sonic_allocate(sc->tdaCount * sizeof *tdp);
-#if (SONIC_DEBUG & SONIC_DEBUG_MEMORY)
-  printf( "tdaTail = %p\n", sc->tdaTail );
-#endif
-  tdp = sc->tdaTail;
-  for (i = 0 ; i < sc->tdaCount ; i++) {
-    /*
-     *  status, pkt_config, pkt_size, and all fragment fields 
-     *  are set to zero by sonic_allocate.
-     */
-
-/* XXX not used by the BSD drivers
-    if (i & 1)
-      tdp->pkt_config = TDA_CONFIG_PINT;
-*/
-
-    tdp->frag_count        = 0;
-    tdp->frag[0].frag_link = LSW(tdp + 1);
-    tdp->link_pad          = LSW(tdp + 1) | TDA_LINK_EOL;
-    tdp->linkp             = &((tdp + 1)->frag[0].frag_link);
-    tdp->next              = (TransmitDescriptor_t *)(tdp + 1);
-    tdp++;
-  }
-  tdp--;
-  sc->tdaHead = tdp;
-  tdp->link_pad = LSW(sc->tdaTail) | TDA_LINK_EOL;
-  tdp->next = (TransmitDescriptor_t *)sc->tdaTail;
-  tdp->linkp = &sc->tdaTail->frag[0].frag_link;
-
-  /*
-   *  Set up circular linked list in Receive Descriptor Area.
-   *  Leaves sc->rda pointing at the `beginning' of the list.
-   *
-   *  NOTE: The RDA and CDP must have the same MSW for their addresses.
-   */
-
-  sc->rda = sonic_allocate(
-              (sc->rdaCount * sizeof(ReceiveDescriptor_t)) + 
-                sizeof(CamDescriptor_t) );
-  sc->cdp = (CamDescriptorPointer_t) ((unsigned char *)sc->rda +
-        (sc->rdaCount * sizeof(ReceiveDescriptor_t)));
-#if (SONIC_DEBUG & SONIC_DEBUG_MEMORY)
-  printf( "rda area = %p\n", sc->rda );
-  printf( "cdp area = %p\n", sc->cdp );
-#endif
-
-  ordp = rdp = sc->rda;
-  for (i = 0 ; i < sc->rdaCount ; i++) {
-    /*
-     *  status, byte_count, pkt_ptr0, pkt_ptr1, and seq_no are set
-     *  to zero by sonic_allocate.
-     */
-    rdp->link   = LSW(rdp + 1);
-    rdp->in_use = RDA_FREE;
-    rdp->next   = (ReceiveDescriptor_t *)(rdp + 1);
-    ordp = rdp;
-    rdp++;
-  }
-  /*
-   *  Link the last desriptor to the 1st one and mark it as the end
-   *  of the list.
-   */
-  ordp->next   = sc->rda;
-  ordp->link   = LSW(sc->rda) | RDA_LINK_EOL;
-  sc->rdp_last = rdp;
- 
-  /*
-   * Allocate the receive resource area.
-   * In accordance with National Application Note 746, make the
-   * receive resource area bigger than the receive descriptor area.
-   * This has the useful side effect of making the receive resource
-   * area big enough to hold the CAM descriptor area.
-   */
-
-  sc->rsa = sonic_allocate((sc->rdaCount + RRA_EXTRA_COUNT) * sizeof *sc->rsa);
-#if (SONIC_DEBUG & SONIC_DEBUG_MEMORY)
-  printf( "rsa area = %p\n", sc->rsa );
-#endif
-
-  /*
-   *  Set up list in Receive Resource Area.
-   *  Allocate space for incoming packets.
-   */
-
-  rwp = sc->rsa;
-  for (i = 0 ; i < (sc->rdaCount + RRA_EXTRA_COUNT) ; i++, rwp++) {
-    struct mbuf **mp;
-
-    /*
-     * Allocate memory for buffer.
-     * Place a pointer to the mbuf at the beginning of the buffer
-     * so we can find the mbuf when the SONIC returns the buffer
-     * to the driver.
-     */
-    
-    MGETHDR (m, M_WAIT, MT_DATA);
-    MCLGET (m, M_WAIT);
-    m->m_pkthdr.rcvif = &sc->arpcom.ac_if;
-    mp = mtod (m, struct mbuf **);
-
-    m->m_data += sizeof *mp;
-    *mp = m;
-    p = mtod (m, void *);
-
-    /*
-     * Set up RRA entry
-     */
-    rwp->buff_ptr_lsw = LSW(p);
-    rwp->buff_ptr_msw = MSW(p);
-    rwp->buff_wc_lsw = RBUF_WC;
-    rwp->buff_wc_msw = 0;
-  }
-  sc->rea = rwp;
-#if (SONIC_DEBUG & SONIC_DEBUG_MEMORY)
-  printf( "rea area = %p\n", sc->rea );
-#endif
-
-
-  /*
-   * Issue a software reset.
-   */
-  sonic_write_register( rp, SONIC_REG_CR, CR_RST | CR_STP | CR_RXDIS | CR_HTX );
-
-  /*
-   * Set up data configuration registers.
-   */
-  sonic_write_register( rp, SONIC_REG_DCR, SONIC_DCR );
-  sonic_write_register( rp, SONIC_REG_DCR2, SONIC_DC2 );
-
-  sonic_write_register( rp, SONIC_REG_CR, CR_STP | CR_RXDIS | CR_HTX );
-
-  /*
-   * Mask all interrupts
-   */
-  sonic_write_register( rp, SONIC_REG_IMR, 0x3fff );
-
-  /*
-   * Clear outstanding interrupts.
-   */
-  sonic_write_register( rp, SONIC_REG_ISR, 0x7FFF );
-
-  /*
-   *  Clear the tally counters
-   */
-
-  sonic_write_register( rp, SONIC_REG_CRCT, 0xFFFF );
-  sonic_write_register( rp, SONIC_REG_FAET, 0xFFFF );
-  sonic_write_register( rp, SONIC_REG_MPT, 0xFFFF );
-  sonic_write_register( rp, SONIC_REG_RSC, 0 );
-
-  /*
-   *  Set the Receiver mode
-   *
-   *  Enable/disable reception of broadcast packets
-   */
-
-  if (sc->acceptBroadcast)
-    sonic_write_register( rp, SONIC_REG_RCR, RCR_BRD );
-  else
-    sonic_write_register( rp, SONIC_REG_RCR, 0 );
-
-  /*
-   * Set up Resource Area pointers
-   */
-
-  sonic_write_register( rp, SONIC_REG_URRA, MSW(sc->rsa) );
-  sonic_write_register( rp, SONIC_REG_RSA, LSW(sc->rsa) );
-
-  sonic_write_register( rp, SONIC_REG_REA, LSW(sc->rea) );
-
-  sonic_write_register( rp, SONIC_REG_RRP, LSW(sc->rsa) );
-  sonic_write_register( rp, SONIC_REG_RWP, LSW(sc->rsa) ); /* XXX was rea */
-
-  sonic_write_register( rp, SONIC_REG_URDA, MSW(sc->rda) );
-  sonic_write_register( rp, SONIC_REG_CRDA, LSW(sc->rda) );
-
-  sonic_write_register( rp, SONIC_REG_UTDA, MSW(sc->tdaTail) );
-  sonic_write_register( rp, SONIC_REG_CTDA, LSW(sc->tdaTail) );
-
-  /*
-   * Set End Of Buffer Count register to the value recommended
-   * in Note 1 of Section 3.4.4.4 of the SONIC data sheet.
-   */
-
-  sonic_write_register( rp, SONIC_REG_EOBC, RBUF_WC - 2 );
-
-  /*
-   *  Issue the load RRA command
-   */
-
-  sonic_write_register( rp, SONIC_REG_CR, CR_RRRA );
-  while (sonic_read_register( rp, SONIC_REG_CR ) & CR_RRRA)
-    continue;
-
-  /*
-   * Remove device reset
-   */
-
-  sonic_write_register( rp, SONIC_REG_CR, 0 );
-
-  /*
-   *  Set up the SONIC CAM with our hardware address.
-   */
-
-  hwaddr = sc->arpcom.ac_enaddr;
-  cdp = sc->cdp;
-
-#if (SONIC_DEBUG & SONIC_DEBUG_CAM)
-  printf( "hwaddr: %2x:%2x:%2x:%2x:%2x:%2x\n",
-     hwaddr[0], hwaddr[1], hwaddr[2], hwaddr[3], hwaddr[4], hwaddr[5] );
-#endif
-
-  cdp->cep  = 0;                     /* Fill first and only entry in CAM */
-  cdp->cap0 = hwaddr[1] << 8 | hwaddr[0];
-  cdp->cap1 = hwaddr[3] << 8 | hwaddr[2];
-  cdp->cap2 = hwaddr[5] << 8 | hwaddr[4];
-  cdp->ce   = 0x0001;                /* Enable first entry in CAM */
-
-  sonic_write_register( rp, SONIC_REG_CDC, 1 );      /* 1 entry in CDA */
-  sonic_write_register( rp, SONIC_REG_CDP, LSW(cdp) );
-  sonic_write_register( rp, SONIC_REG_CR,  CR_LCAM );  /* Load the CAM */
-
-  while (sonic_read_register( rp, SONIC_REG_CR ) & CR_LCAM)
-    continue;
-
-  /*
-   * Verify that CAM was properly loaded.
-   */
-
-  sonic_write_register( rp, SONIC_REG_CR, CR_RST | CR_STP | CR_RXDIS | CR_HTX );
-
-#if (SONIC_DEBUG & SONIC_DEBUG_CAM)
-  sonic_write_register( rp, SONIC_REG_CEP, 0 );  /* Select first entry in CAM */
-    printf ("Loaded Ethernet address into SONIC CAM.\n"
-      "  Wrote %04x%04x%04x - %#x\n"
-      "   Read %04x%04x%04x - %#x\n", 
-        cdp->cap2, cdp->cap1, cdp->cap0, cdp->ce,
-        sonic_read_register( rp, SONIC_REG_CAP2 ),
-        sonic_read_register( rp, SONIC_REG_CAP1 ),
-        sonic_read_register( rp, SONIC_REG_CAP0 ),
-        sonic_read_register( rp, SONIC_REG_CE ));
-#endif
-
-  sonic_write_register( rp, SONIC_REG_CEP, 0 );  /* Select first entry in CAM */
-  if ((sonic_read_register( rp, SONIC_REG_CAP2 ) != cdp->cap2)
-   || (sonic_read_register( rp, SONIC_REG_CAP1 ) != cdp->cap1)
-   || (sonic_read_register( rp, SONIC_REG_CAP0 ) != cdp->cap0)
-   || (sonic_read_register( rp, SONIC_REG_CE ) != cdp->ce)) {
-    printf ("Failed to load Ethernet address into SONIC CAM.\n"
-      "  Wrote %04x%04x%04x - %#x\n"
-      "   Read %04x%04x%04x - %#x\n", 
-        cdp->cap2, cdp->cap1, cdp->cap0, cdp->ce,
-        sonic_read_register( rp, SONIC_REG_CAP2 ),
-        sonic_read_register( rp, SONIC_REG_CAP1 ),
-        sonic_read_register( rp, SONIC_REG_CAP0 ),
-        sonic_read_register( rp, SONIC_REG_CE ));
-    rtems_panic ("SONIC LCAM");
-  }
-
-  sonic_write_register(rp, SONIC_REG_CR, CR_TXP | CR_RXEN | CR_STP);
-
-  /*
-   * Attach SONIC interrupt handler
-   */
-  sonic_write_register( rp, SONIC_REG_IMR, 0 );
-  old_handler = set_vector(sonic_interrupt_handler, sc->vector, 0);
-
-  /*
-   * Remainder of hardware initialization is
-   * done by the receive and transmit daemons.
-   */
-}
-
-/*
- * Send packet (caller provides header).
- */
-
-SONIC_STATIC void sonic_start(struct ifnet *ifp)
-{
-  struct sonic_softc *sc = ifp->if_softc;
-
-  rtems_event_send(sc->txDaemonTid, START_TRANSMIT_EVENT);
-  ifp->if_flags |= IFF_OACTIVE;
-}
-
-/*
- * Initialize and start the device
- */
-
-SONIC_STATIC void sonic_init (void *arg)
-{
-  struct sonic_softc *sc = arg;
-  struct ifnet *ifp = &sc->arpcom.ac_if;
-  void *rp = sc->sonic;
-  int rcr;
-
-  if (sc->txDaemonTid == 0) {
-
-    /*
-     * Set up SONIC hardware
-     */
-    sonic_initialize_hardware (sc);
-
-    /*
-     * Start driver tasks
-     */
-    sc->txDaemonTid = rtems_bsdnet_newproc ("SNtx", 4096, sonic_txDaemon, sc);
-    sc->rxDaemonTid = rtems_bsdnet_newproc ("SNrx", 4096, sonic_rxDaemon, sc);
-  }
-
-  /*
-   * Set flags appropriately
-   */
-  rcr = sonic_read_register( rp, SONIC_REG_RCR );
-  if (ifp->if_flags & IFF_PROMISC)
-    rcr |= RCR_PRO;
-  else
-    rcr &= ~RCR_PRO;
-  sonic_write_register( rp, SONIC_REG_RCR, rcr);
-
-  /*
-   * Tell the world that we're running.
-   */
-  ifp->if_flags |= IFF_RUNNING;
-
-  /*
-   * Enable receiver and transmitter
-   */
-  sonic_write_register(rp, SONIC_REG_CR, CR_TXP | CR_RXEN);
-}
-
-/*
- * Driver ioctl handler
- */
-static int
-sonic_ioctl (struct ifnet *ifp, int command, caddr_t data)
-{
-  struct sonic_softc *sc = ifp->if_softc;
-  int error = 0;
-
-  switch (command) {
-    case SIOCGIFADDR:
-    case SIOCSIFADDR:
-      ether_ioctl (ifp, command, data);
-      break;
-
-    case SIOCSIFFLAGS:
-      switch (ifp->if_flags & (IFF_UP | IFF_RUNNING)) {
-        case IFF_RUNNING:
-          sonic_stop (sc);
-          break;
-
-        case IFF_UP:
-          sonic_init (sc);
-          break;
-
-        case IFF_UP | IFF_RUNNING:
-          sonic_stop (sc);
-          sonic_init (sc);
-          break;
-
-        default:
-          break;
-        }
-      break;
-
-    case SIO_RTEMS_SHOW_STATS:
-      sonic_stats (sc);
-      break;
-    
-    /*
-     * FIXME: All sorts of multicast commands need to be added here!
-     */
-    default:
-      error = EINVAL;
-      break;
-  }
-  return error;
-}
-
-/*
- * Attach an SONIC driver to the system
- * This is the only `extern' function in the driver.
- */
-int
-rtems_sonic_driver_attach (struct rtems_bsdnet_ifconfig *config)
-{
-  struct sonic_softc *sc;
-  struct ifnet *ifp;
-  int mtu;
-  int i;
-
-  /*
-   * Find an unused entry
-   */
-  i = 0;
-  sc = sonic_softc;
-  for (;;) {
-    if (sc == &sonic_softc[NSONIC]) {
-      printf ("No more SONIC devices.\n");
-      return 0;
-    }
-    ifp = &sc->arpcom.ac_if;
-    if (ifp->if_softc == NULL)
-      break;
-    sc++;
-    i++;
-  }
-
-  /*
-   *  zero out the control structure
-   */
-
-  memset( sc, 0, sizeof(*sc) );
-
-
-  /*
-   * Process options
-   */
-  if (config->hardware_address) {
-    memcpy (sc->arpcom.ac_enaddr, config->hardware_address, ETHER_ADDR_LEN);
-  }
-  else {
-    memset (sc->arpcom.ac_enaddr, 0x08, ETHER_ADDR_LEN);
-  }
-  if (config->mtu)
-    mtu = config->mtu;
-  else
-    mtu = ETHERMTU;
-  if (config->rbuf_count)
-    sc->rdaCount = config->rbuf_count;
-  else
-    sc->rdaCount = RDA_COUNT;
-  if (config->xbuf_count)
-    sc->tdaCount = config->xbuf_count;
-  else
-    sc->tdaCount = TDA_COUNT;
-  sc->acceptBroadcast = !config->ignore_broadcast;
-
-  /*
-   * Set up network interface values
-   */
-  ifp->if_softc = sc;
-  ifp->if_unit = i + 1;
-  ifp->if_name = "sonic";
-  ifp->if_mtu = mtu;
-  ifp->if_init = sonic_init;
-  ifp->if_ioctl = sonic_ioctl;
-  ifp->if_start = sonic_start;
-  ifp->if_output = ether_output;
-  ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX;
-  if (ifp->if_snd.ifq_maxlen == 0)
-    ifp->if_snd.ifq_maxlen = ifqmaxlen;
-
-  /*
-   * Attach the interface
-   */
-  if_attach (ifp);
-  ether_ifattach (ifp);
-  return 1;
-}
-
-#if (SONIC_DEBUG & SONIC_DEBUG_PRINT_REGISTERS)
-#include <stdio.h>
-
-char SONIC_Reg_name[64][6]= {
-    "CR",         /* 0x00 */
-    "DCR",        /* 0x01 */
-    "RCR",        /* 0x02 */
-    "TCR",        /* 0x03 */
-    "IMR",        /* 0x04 */
-    "ISR",        /* 0x05 */
-    "UTDA",       /* 0x06 */
-    "CTDA",       /* 0x07 */
-    "0x08",       /* 0x08 */
-    "0x09",       /* 0x09 */
-    "0x0A",       /* 0x0A */
-    "0x0B",       /* 0x0B */
-    "0x0C",       /* 0x0C */
-    "URDA",       /* 0x0D */
-    "CRDA",       /* 0x0E */
-    "0x0F",       /* 0x0F */
-    "0x10",       /* 0x10 */
-    "0x11",       /* 0x11 */
-    "0x12",       /* 0x12 */
-    "EOBC",       /* 0x13 */
-    "URRA",       /* 0x14 */
-    "RSA",        /* 0x15 */
-    "REA",        /* 0x16 */
-    "RRP",        /* 0x17 */
-    "RWP",        /* 0x18 */
-    "0x19",       /* 0x19 */
-    "0x1A",       /* 0x1A */
-    "0x1B",       /* 0x1B */
-    "0x1C",       /* 0x1C */
-    "0x0D",       /* 0x1D */
-    "0x1E",       /* 0x1E */
-    "0x1F",       /* 0x1F */
-    "0x20",       /* 0x20 */
-    "CEP",        /* 0x21 */
-    "CAP2",       /* 0x22 */
-    "CAP1",       /* 0x23 */
-    "CAP0",       /* 0x24 */
-    "CE",         /* 0x25 */
-    "CDP",        /* 0x26 */
-    "CDC",        /* 0x27 */
-    "SR",         /* 0x28 */
-    "WT0",        /* 0x29 */
-    "WT1",        /* 0x2A */
-    "RSC",        /* 0x2B */
-    "CRCT",       /* 0x2C */
-    "FAET",       /* 0x2D */
-    "MPT",        /* 0x2E */
-    "MDT",        /* 0x2F */
-    "0x30",       /* 0x30 */
-    "0x31",       /* 0x31 */
-    "0x32",       /* 0x32 */
-    "0x33",       /* 0x33 */
-    "0x34",       /* 0x34 */
-    "0x35",       /* 0x35 */
-    "0x36",       /* 0x36 */
-    "0x37",       /* 0x37 */
-    "0x38",       /* 0x38 */
-    "0x39",       /* 0x39 */
-    "0x3A",       /* 0x3A */
-    "0x3B",       /* 0x3B */
-    "0x3C",       /* 0x3C */
-    "0x3D",       /* 0x3D */
-    "0x3E",       /* 0x3E */
-    "DCR2"        /* 0x3F */
-};
-#endif
-void sonic_write_register(
-  void       *base,
-  unsigned32  regno,
-  unsigned32  value
-)
-{
-  volatile unsigned32 *p = base;
-
-#if (SONIC_DEBUG & SONIC_DEBUG_PRINT_REGISTERS)
-  printf( "%p Write 0x%04x to %s (0x%02x)\n",
-      &p[regno], value, SONIC_Reg_name[regno], regno );
-  fflush( stdout );
-#endif
-  p[regno] = value;
-}
-
-unsigned32 sonic_read_register(
-  void       *base,
-  unsigned32  regno
-)
-{
-  volatile unsigned32 *p = base;
-  unsigned32           value;
-
-  value = p[regno];
-#if (SONIC_DEBUG & SONIC_DEBUG_PRINT_REGISTERS)
-  printf( "%p Read 0x%04x from %s (0x%02x)\n",
-      &p[regno], value, SONIC_Reg_name[regno], regno );
-  fflush( stdout );
-#endif
-  return value;
-}
diff --git a/c/src/lib/libbsp/powerpc/dmv177/sonic/sonic.h b/c/src/lib/libbsp/powerpc/dmv177/sonic/sonic.h
deleted file mode 100644
index 64aa1718f1..0000000000
--- a/c/src/lib/libbsp/powerpc/dmv177/sonic/sonic.h
+++ /dev/null
@@ -1,372 +0,0 @@
-/*

- *******************************************************************

- *******************************************************************

- **                                                               **

- **           DECLARATIONS FOR NATIONAL DP83932 `SONIC'           **

- **         SYSTEMS-ORIENTED NETWORK INTERFACE CONTROLLER         **

- **                                                               **

- *******************************************************************

- *******************************************************************

- */

-

-/*

- * $Revision$   $Date$   $Author$

- * $State$

- * $Id$

- */

-

-#ifndef _SONIC_DP83932_

-#define _SONIC_DP83932_

-

-#include <bsp.h>

-

-/*

- ******************************************************************

- *                                                                *

- *                        Device Registers                        *

- *                                                                *

- ******************************************************************

- */

-#define SONIC_REG_CR      0x00 /* Command */

-#define SONIC_REG_DCR     0x01 /* Data configuration */

-#define SONIC_REG_RCR     0x02 /* Receive control */

-#define SONIC_REG_TCR     0x03 /* Transmit control */

-#define SONIC_REG_IMR     0x04 /* Interrupt mask */

-#define SONIC_REG_ISR     0x05 /* Interrupt status */

-#define SONIC_REG_UTDA    0x06 /* Upper transmit descriptor address */

-#define SONIC_REG_CTDA    0x07 /* Current transmit descriptor address */

-#define SONIC_REG_URDA    0x0D /* Upper receive descriptor address */

-#define SONIC_REG_CRDA    0x0E /* Current receive descriptor address */

-#define SONIC_REG_EOBC    0x13 /* End of buffer word count */

-#define SONIC_REG_URRA    0x14 /* Upper receive resource */

-#define SONIC_REG_RSA     0x15 /* Resource start address */

-#define SONIC_REG_REA     0x16 /* Resource end address */

-#define SONIC_REG_RRP     0x17 /* Resouce read pointer */

-#define SONIC_REG_RWP     0x18 /* Resouce write pointer */

-#define SONIC_REG_CEP     0x21 /* CAM entry pointer */

-#define SONIC_REG_CAP2    0x22 /* CAM address port 2 */

-#define SONIC_REG_CAP1    0x23 /* CAM address port 1 */

-#define SONIC_REG_CAP0    0x24 /* CAM address port 0 */

-#define SONIC_REG_CE      0x25 /* CAM enable */

-#define SONIC_REG_CDP     0x26 /* CAM descriptor pointer */

-#define SONIC_REG_CDC     0x27 /* CAM descriptor count */

-#define SONIC_REG_SR      0x28 /* Silicon revision */

-#define SONIC_REG_WT0     0x29 /* Watchdog timer 0 */

-#define SONIC_REG_WT1     0x2A /* Watchdog timer 1 */

-#define SONIC_REG_RSC     0x2B /* Receive sequence counter */

-#define SONIC_REG_CRCT    0x2C /* CRC error tally */

-#define SONIC_REG_FAET    0x2D /* FAE tally */

-#define SONIC_REG_MPT     0x2E /* Missed packet tally */

-#define SONIC_REG_MDT     0x2F /* TX Maximum Deferral */

-#define SONIC_REG_DCR2    0x3F /* Data configuration 2 */

-

-/*

- * Command register

- */

-#define CR_LCAM         0x0200

-#define CR_RRRA         0x0100

-#define CR_RST          0x0080

-#define CR_ST           0x0020

-#define CR_STP          0x0010

-#define CR_RXEN         0x0008

-#define CR_RXDIS        0x0004

-#define CR_TXP          0x0002

-#define CR_HTX          0x0001

-

-/*

- * Data configuration register

- */

-#define DCR_EXBUS       0x8000

-#define DCR_LBR         0x2000

-#define DCR_PO1         0x1000

-#define DCR_PO0         0x0800

-#define DCR_SBUS        0x0400

-#define DCR_USR1        0x0200

-#define DCR_USR0        0x0100

-#define DCR_WC1         0x0080

-#define DCR_WC0         0x0040

-#define DCR_DW          0x0020

-#define DCR_BMS         0x0010

-#define DCR_RFT1        0x0008

-#define DCR_RFT0        0x0004

-#define DCR_TFT1        0x0002

-#define DCR_TFT0        0x0001

-

-/* data configuration register aliases */

-#define DCR_SYNC        DCR_SBUS  /* synchronous (memory cycle 2 clocks) */

-#define DCR_ASYNC       0         /* asynchronous (memory cycle 3 clocks) */

-

-#define DCR_WAIT0       0                 /* 0 wait states added */

-#define DCR_WAIT1       DCR_WC0           /* 1 wait state added */

-#define DCR_WAIT2       DCR_WC1           /* 2 wait states added */

-#define DCR_WAIT3       (DCR_WC1|DCR_WC0) /* 3 wait states added */

-

-#define DCR_DW16        0       /* use 16-bit DMA accesses */

-#define DCR_DW32        DCR_DW  /* use 32-bit DMA accesses */

-

-#define DCR_DMAEF       0       /* DMA until TX/RX FIFO has emptied/filled */

-#define DCR_DMABLOCK    DCR_BMS /* DMA until RX/TX threshold crossed */

-

-#define DCR_RFT4        0               /* receive threshold 4 bytes */

-#define DCR_RFT8        DCR_RFT0        /* receive threshold 8 bytes */

-#define DCR_RFT16       DCR_RFT1        /* receive threshold 16 bytes */

-#define DCR_RFT24       (DCR_RFT1|DCR_RFT0) /* receive threshold 24 bytes */

-

-#define DCR_TFT8        0               /* transmit threshold 8 bytes */

-#define DCR_TFT16       DCR_TFT0        /* transmit threshold 16 bytes */

-#define DCR_TFT24       DCR_TFT1        /* transmit threshold 24 bytes */

-#define DCR_TFT28       (DCR_TFT1|DCR_TFT0) /* transmit threshold 28 bytes */

-

-/*

- * Receive control register

- */

-#define RCR_ERR         0x8000

-#define RCR_RNT         0x4000

-#define RCR_BRD         0x2000

-#define RCR_PRO         0x1000

-#define RCR_AMC         0x0800

-#define RCR_LB1         0x0400

-#define RCR_LB0         0x0200

-#define RCR_MC          0x0100

-#define RCR_BC          0x0080

-#define RCR_LPKT        0x0040

-#define RCR_CRS         0x0020

-#define RCR_COL         0x0010

-#define RCR_CRCR        0x0008

-#define RCR_FAER        0x0004

-#define RCR_LBK         0x0002

-#define RCR_PRX         0x0001

-

-/*

- * Transmit control register

- */

-#define TCR_PINT        0x8000

-#define TCR_POWC        0x4000

-#define TCR_CRCI        0x2000

-#define TCR_EXDIS       0x1000

-#define TCR_EXD         0x0400

-#define TCR_DEF         0x0200

-#define TCR_NCRS        0x0100

-#define TCR_CRSL        0x0080

-#define TCR_EXC         0x0040

-#define TCR_OWC         0x0020

-#define TCR_PMB         0x0008

-#define TCR_FU          0x0004

-#define TCR_BCM         0x0002

-#define TCR_PTX         0x0001

-

-/*

- * Interrupt mask register

- */

-#define IMR_BREN        0x4000

-#define IMR_HBLEN       0x2000

-#define IMR_LCDEN       0x1000

-#define IMR_PINTEN      0x0800

-#define IMR_PRXEN       0x0400

-#define IMR_PTXEN       0x0200

-#define IMR_TXEREN      0x0100

-#define IMR_TCEN        0x0080

-#define IMR_RDEEN       0x0040

-#define IMR_RBEEN       0x0020

-#define IMR_RBAEEN      0x0010

-#define IMR_CRCEN       0x0008

-#define IMR_FAEEN       0x0004

-#define IMR_MPEN        0x0002

-#define IMR_RFOEN       0x0001

-

-/*

- * Interrupt status register

- */

-#define ISR_BR          0x4000

-#define ISR_HBL         0x2000

-#define ISR_LCD         0x1000

-#define ISR_PINT        0x0800

-#define ISR_PKTRX       0x0400

-#define ISR_TXDN        0x0200

-#define ISR_TXER        0x0100

-#define ISR_TC          0x0080

-#define ISR_RDE         0x0040

-#define ISR_RBE         0x0020

-#define ISR_RBAE        0x0010

-#define ISR_CRC         0x0008

-#define ISR_FAE         0x0004

-#define ISR_MP          0x0002

-#define ISR_RFO         0x0001

-

-/*

- * Data configuration register 2

- */

-#define DCR2_EXPO3      0x8000

-#define DCR2_EXPO2      0x4000

-#define DCR2_EXPO1      0x2000

-#define DCR2_EXPO0      0x1000

-#define DCR2_PH         0x0010

-#define DCR2_PCM        0x0004

-#define DCR2_PCNM       0x0002

-#define DCR2_RJCM       0x0001

-

-/*

- *  Known values for the Silicon Revision Register

- */

-

-#define SONIC_REVISION_B   4

-#define SONIC_REVISION_C   6

-

-/*

- ******************************************************************

- *                                                                *

- *                   Transmit Buffer Management                   *

- *                                                                *

- ******************************************************************

- */

-

-/*

- * Transmit descriptor area entry.

- * There is one transmit descriptor for each packet to be transmitted.

- * Statically reserve space for up to MAXIMUM_FRAGS_PER_PACKET fragments

- * per descriptor.

- */

-#define MAXIMUM_FRAGS_PER_DESCRIPTOR    6

-struct TransmitDescriptor {

-  rtems_unsigned32        status;

-  rtems_unsigned32        pkt_config;

-  rtems_unsigned32        pkt_size;

-  rtems_unsigned32        frag_count;

-

-  /*

-   * Packet fragment pointers

-   */

-  struct TransmitDescriptorFragLink {

-      rtems_unsigned32 frag_lsw;  /* LSW of fragment address */

-#define                      frag_link frag_lsw

-      rtems_unsigned32 frag_msw;  /* MSW of fragment address */

-      rtems_unsigned32 frag_size;

-  }                       frag[MAXIMUM_FRAGS_PER_DESCRIPTOR];

-

-  /*

-   * Space for link if all fragment pointers are used.

-   */

-  rtems_unsigned32        link_pad;

-

-  /*

-   * Extra RTEMS stuff 

-   */

-  struct TransmitDescriptor       *next;  /* Circularly-linked list */

-  struct mbuf                     *mbufp; /* First mbuf in packet */

-  volatile rtems_unsigned32       *linkp; /* Pointer to un[xxx].link */

-};

-typedef struct TransmitDescriptor TransmitDescriptor_t;

-typedef volatile TransmitDescriptor_t *TransmitDescriptorPointer_t;

-

-/*

- * Transmit Configuration.

- * For standard Ethernet transmission, all bits in the transmit

- * configuration field are set to 0.

- */

-#define TDA_CONFIG_PINT 0x8000

-#define TDA_CONFIG_POWC 0x4000

-#define TDA_CONFIG_CRCI 0x2000

-#define TDA_CONFIG_EXDIS        0x1000

-

-/*

- * Transmit status

- */

-#define TDA_STATUS_COLLISION_MASK       0xF800

-#define TDA_STATUS_COLLISION_SHIFT      11

-#define TDA_STATUS_EXD          0x0400

-#define TDA_STATUS_DEF          0x0200

-#define TDA_STATUS_NCRS         0x0100

-#define TDA_STATUS_CRSL         0x0080

-#define TDA_STATUS_EXC          0x0040

-#define TDA_STATUS_OWC          0x0020

-#define TDA_STATUS_PMB          0x0008

-#define TDA_STATUS_FU           0x0004

-#define TDA_STATUS_BCM          0x0002

-#define TDA_STATUS_PTX          0x0001

-

-#define TDA_LINK_EOL      0x0001

-#define TDA_LINK_EOL_MASK 0xFFFE

-

-

-

-/*

- ******************************************************************

- *                                                                *

- *                    Receive Buffer Management                   *

- *                                                                *

- ******************************************************************

- */

-

-/*

- * Receive resource area entry.

- * There is one receive resource entry for each receive buffer area (RBA).

- * This driver allows only one packet per receive buffer area, so one

- * receive resource entry corresponds to one correctly-received packet.

- */

-struct ReceiveResource {

-  rtems_unsigned32        buff_ptr_lsw;   /* LSW of RBA address */

-  rtems_unsigned32        buff_ptr_msw;   /* MSW of RBA address */

-  rtems_unsigned32        buff_wc_lsw;    /* LSW of RBA size (16-bit words) */

-  rtems_unsigned32        buff_wc_msw;    /* MSW of RBA size (16-bit words) */

-};

-typedef struct ReceiveResource ReceiveResource_t;

-typedef volatile ReceiveResource_t *ReceiveResourcePointer_t;

-

-/*

- * Receive descriptor area entry.

- * There is one receive descriptor for each packet received.

- */

-struct ReceiveDescriptor {

-  rtems_unsigned32        status;

-  rtems_unsigned32        byte_count;

-  rtems_unsigned32        pkt_lsw;        /* LSW of packet address */

-  rtems_unsigned32        pkt_msw;        /* MSW of packet address */

-  rtems_unsigned32        seq_no;

-  rtems_unsigned32        link;

-  rtems_unsigned32        in_use;

-

-  /*

-   * Extra RTEMS stuff 

-   */

-  volatile struct ReceiveDescriptor  *next;  /* Circularly-linked list */

-};

-typedef struct ReceiveDescriptor ReceiveDescriptor_t;

-typedef volatile ReceiveDescriptor_t *ReceiveDescriptorPointer_t;

-

-typedef struct {

-  rtems_unsigned32  cep;  /* CAM Entry Pointer */

-  rtems_unsigned32  cap0; /* CAM Address Port 0 xx-xx-xx-xx-YY-YY */

-  rtems_unsigned32  cap1; /* CAM Address Port 1 xx-xx-YY-YY-xxxx */

-  rtems_unsigned32  cap2; /* CAM Address Port 2 YY-YY-xx-xx-xx-xx */

-  rtems_unsigned32  ce;

-} CamDescriptor_t;

-

-typedef volatile CamDescriptor_t *CamDescriptorPointer_t;

-

-/*

- * Receive status

- */

-#define RDA_STATUS_ERR          0x8800

-#define RDA_STATUS_RNT          0x4000

-#define RDA_STATUS_BRD          0x2000

-#define RDA_STATUS_PRO          0x1000

-#define RDA_STATUS_AMC          0x0800

-#define RDA_STATUS_LB1          0x0400

-#define RDA_STATUS_LB0          0x0200

-#define RDA_STATUS_MC           0x0100

-#define RDA_STATUS_BC           0x0080

-#define RDA_STATUS_LPKT         0x0040

-#define RDA_STATUS_CRS          0x0020

-#define RDA_STATUS_COL          0x0010

-#define RDA_STATUS_CRCR         0x0008

-#define RDA_STATUS_FAER         0x0004

-#define RDA_STATUS_LBK          0x0002

-#define RDA_STATUS_PRX          0x0001

-

-#define RDA_LINK_EOL        0x0001

-#define RDA_LINK_EOL_MASK   0xFFFE

-#define RDA_IN_USE          0x0000  /* SONIC has finished with the packet */

-                                    /*   and the driver can process it */

-#define RDA_FREE            0xFFFF  /* SONIC can use it */

-  

-#endif /* _SONIC_DP83932_ */

diff --git a/c/src/lib/libbsp/powerpc/dmv177/start/Makefile.in b/c/src/lib/libbsp/powerpc/dmv177/start/Makefile.in
deleted file mode 100644
index cb7d9c07ec..0000000000
--- a/c/src/lib/libbsp/powerpc/dmv177/start/Makefile.in
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-PGMS=${ARCH}/start.o
-
-# C source names, if any, go here -- minus the .c
-C_PIECES=
-C_FILES=$(C_PIECES:%=%.c)
-C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
-
-H_FILES=
-
-# Assembly source names, if any, go here -- minus the .s
-S_PIECES=start
-S_FILES=$(S_PIECES:%=%.s)
-S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
-
-SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES)
-OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
-
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES  +=
-CPPFLAGS +=
-CFLAGS   +=
-
-LD_PATHS  +=
-LD_LIBS   +=
-LDFLAGS   +=
-
-#
-# Add your list of files to delete here.  The config files
-#  already know how to delete some stuff, so you may want
-#  to just run 'make clean' first to see what gets missed.
-#  'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
-
-all:	${ARCH} $(SRCS) $(OBJS) $(PGM)
-	$(INSTALL_VARIANT) -m 555 ${PGMS} ${PROJECT_RELEASE}/lib
diff --git a/c/src/lib/libbsp/powerpc/dmv177/start/start.s b/c/src/lib/libbsp/powerpc/dmv177/start/start.s
deleted file mode 100644
index f8e4e4e614..0000000000
--- a/c/src/lib/libbsp/powerpc/dmv177/start/start.s
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * This is based on the mvme-crt0.S file from libgloss/rs6000.
- * crt0.S -- startup file for PowerPC systems.
- *
- * Copyright (c) 1995 Cygnus Support
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- *
- *  $Id$
- */
-
-#include <rtems/score/targopts.h>
-#include "ppc-asm.h"
-
-	.file	"start.s"
-	.section ".got2","aw"
-	.align	2
-
-.LCTOC1 = .+32768
-
-	.extern	FUNC_NAME(atexit)
-	.globl	FUNC_NAME(__atexit)
-	.section ".sdata","aw"
-	.align	2
-FUNC_NAME(__atexit):			/* tell C's eabi-ctor's we have an atexit function */
-	.long	FUNC_NAME(atexit)@fixup	/* and that it is to register __do_global_dtors */
-
-	.section ".fixup","aw"
-	.align	2
-	.long	FUNC_NAME(__atexit)
-
-	.section ".got2","aw"
-.Ltable = .-.LCTOC1
-	.long	.LCTOC1			/* address we think .LCTOC1 is loaded at */
-
-.Lbss_start = .-.LCTOC1
-	.long	__bss_start
-
-.Lend = .-.LCTOC1
-	.long	_end
-
-.Lstack = .-.LCTOC1			/* stack address if set by user */
-	.long	__stack
-
-	.text
-.Lptr:
-	.long .LCTOC1-.Laddr
-
-	.globl	_start
-	.type	_start,@function
-_start:
-	lis     r5,0
-	mr      r4,r5
-	ori     r4,r4,0x0000            /* 0x2030  */
-        mtmsr   r4
-
-/* Add special purpose register initialization based upon the console driver
- * initialization of these registers   XXXXX
- */
-
-	bl	.Laddr			/* get current address */
-	
-.Laddr:
-	mflr	r4			/* real address of .Laddr */
-	lwz	r5,(.Lptr-.Laddr)(r4)	/* linker generated address of .LCTOC1 */
-	add	r5,r5,r4		/* correct to real pointer */
-	lwz	r4,.Ltable(r5)		/* get linker's idea of where .Laddr is */
-	subf	r4,r4,r5		/* calculate difference between where linked and current */
-
-	/* clear bss */
-	lwz	r6,.Lbss_start(r5)	/* calculate beginning of the BSS */
-	lwz	r7,.Lend(r5)		/* calculate end of the BSS */
-	add	r6,r6,r4		/* adjust pointers */
-	add	r7,r7,r4
-
-	cmplw	1,r6,r7
-	bc	4,4,.Ldone
-
-	subf	r8,r6,r7		/* number of bytes to zero */
-	srwi	r9,r8,2			/* number of words to zero */
-	mtctr	r9
-	li	r0,0			/* zero to clear memory */
-	addi	r6,r6,-4		/* adjust so we can use stwu */
-.Lloop:
-	stwu	r0,4(r6)		/* zero bss */
-	bdnz	.Lloop
-
-.Ldone:
-
-	lwz	r0,.Lstack(r5)		/* stack address or 0 */
-	cmplwi	1,r0,0			/* equal to 0? */
-	bc	12,6,.Lnostack		/* use default stack if == 0 */
-	mr	sp,r0			/* use user defined stack */
-
-.Lnostack:
-	/* set up initial stack frame */
-	addi	sp,sp,-4		/* make sure we don't overwrite debug mem */
-	lis	r0,0
-	stw	r0,0(sp)		/* clear back chain */
-	stwu	sp,-56(sp)		/* push another stack frame */
-
-	/* Let her rip */
-	bl	FUNC_NAME(boot_card)
-
-	/* return value from boot_card is argument to exit */
-	/* bl	FUNC_NAME(exit) */
-	trap
-.Lstart:
-	.size	_start,.Lstart-_start
diff --git a/c/src/lib/libbsp/powerpc/dmv177/startup/Makefile.in b/c/src/lib/libbsp/powerpc/dmv177/startup/Makefile.in
deleted file mode 100644
index 0877918685..0000000000
--- a/c/src/lib/libbsp/powerpc/dmv177/startup/Makefile.in
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-VPATH = @srcdir@:@srcdir@/../../../shared
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-PGM=${ARCH}/startup.rel
-
-# C source names, if any, go here -- minus the .c
-C_PIECES=bspclean bsplibc bsppost bspstart main sbrk setvec genpvec vmeintr
-C_FILES=$(C_PIECES:%=%.c)
-C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
-
-H_FILES=
-
-# Assembly source names, if any, go here -- minus the .s
-S_PIECES=
-S_FILES=$(S_PIECES:%=%.s)
-S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
-
-SRCS=linkcmds $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES)
-OBJS=$(C_O_FILES) $(S_O_FILES)
-
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES  +=
-CPPFLAGS +=
-CFLAGS   +=
-
-LD_PATHS  +=
-LD_LIBS   +=
-LDFLAGS   +=
-
-#
-# Add your list of files to delete here.  The config files
-#  already know how to delete some stuff, so you may want
-#  to just run 'make clean' first to see what gets missed.
-#  'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
-
-${PGM}: ${SRCS} ${OBJS}
-	$(make-rel)
-
-all:	${ARCH} $(SRCS) $(INSTALLED_O_FILES) $(PGM)
-	$(INSTALL) $(srcdir)/linkcmds ${PROJECT_RELEASE}/lib
diff --git a/c/src/lib/libbsp/powerpc/dmv177/startup/bspclean.c b/c/src/lib/libbsp/powerpc/dmv177/startup/bspclean.c
deleted file mode 100644
index 5e354f9387..0000000000
--- a/c/src/lib/libbsp/powerpc/dmv177/startup/bspclean.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-void bsp_cleanup( void )
-{
-#if 0
-  asm volatile( "li  10,99" );  /* 0x63 */
-  asm volatile( "sc" );
-#endif
-}
diff --git a/c/src/lib/libbsp/powerpc/dmv177/startup/bspstart.c b/c/src/lib/libbsp/powerpc/dmv177/startup/bspstart.c
deleted file mode 100644
index 07a5bf1473..0000000000
--- a/c/src/lib/libbsp/powerpc/dmv177/startup/bspstart.c
+++ /dev/null
@@ -1,134 +0,0 @@
-/*  bspstart.c
- *
- *  This set of routines starts the application.  It includes application,
- *  board, and monitor specific initialization and configuration.
- *  The generic CPU dependent initialization has been performed
- *  before any of these are invoked.
- *
- *  COPYRIGHT (c) 1989, 1990, 1991, 1992, 1993, 1994, 1997.
- *  On-Line Applications Research Corporation (OAR).
- *  All rights assigned to U.S. Government, 1994.
- *
- *  $Id$
- */
-
-#include <bsp.h>
-#include <rtems/libio.h>
-
-#include <libcsupport.h>
-
-#include <string.h>
-
-/*
- *  The original table from the application and our copy of it with
- *  some changes.
- */
- 
-extern rtems_configuration_table  Configuration;
-rtems_configuration_table         BSP_Configuration;
-rtems_cpu_table                   Cpu_table;
-rtems_unsigned32                  bsp_isr_level;
-
-/*
- *  Use the shared implementations of the following routines
- */
-
-void bsp_postdriver_hook(void);
-void bsp_libc_init( void *, unsigned32, int );
-
-/*PAGE
- *
- *  bsp_pretasking_hook
- *
- *  BSP pretasking hook.  Called just before drivers are initialized.
- *  Used to setup libc and install any BSP extensions.
- */
-
-void bsp_pretasking_hook(void)
-{
-  extern int end;
-  rtems_unsigned32 heap_start;
-  rtems_unsigned32 heap_size;
-
-  heap_start = (rtems_unsigned32) &end;
-  if (heap_start & (CPU_ALIGNMENT-1))
-    heap_start = (heap_start + CPU_ALIGNMENT) & ~(CPU_ALIGNMENT-1);
-
-  heap_size = BSP_Configuration.work_space_start - (void *)&end;
-  heap_size &= 0xfffffff0;  /* keep it as a multiple of 16 bytes */
-
-  bsp_libc_init((void *) heap_start, heap_size, 0);
-
-#ifdef RTEMS_DEBUG
-  rtems_debug_enable( RTEMS_DEBUG_ALL_MASK );
-#endif
-}
-
-/*  PAGE
- *
- *  bsp_predriver_hook
- *
- *  Initialization before drivers are setup.
- */ 
-
-void bsp_predriver_hook(void)
-{
-  initialize_external_exception_vector();
-}
-
-/*PAGE
- *
- *  bsp_start
- *
- *  This routine does the bulk of the system initialization.
- */
-
-void bsp_start( void )
-{
-  unsigned char *work_space_start;
-  unsigned int  msr_value = 0x2030;
-
-  /*
-   * Set BSP to initial value. Note: This value is a guess
-   * check how the real board comes up. This is critical to
-   * getting the source to work with the debugger.
-   */
-
-  _CPU_MSR_SET( msr_value );
-   
-  /*
-   *  Need to "allocate" the memory for the RTEMS Workspace and
-   *  tell the RTEMS configuration where it is.  This memory is
-   *  not malloc'ed.  It is just "pulled from the air".
-   */
-
-  work_space_start = 
-    (unsigned char *)&RAM_END - BSP_Configuration.work_space_size;
-
-  if ( work_space_start <= (unsigned char *)&end ) {
-    DEBUG_puts( "bspstart: Not enough RAM!!!\n" );
-    bsp_cleanup();
-  }
-
-  BSP_Configuration.work_space_start = work_space_start;
-
-  /*
-   *  Account for the console's resources
-   */
-
-  console_reserve_resources( &BSP_Configuration );
-
-  /*
-   *  initialize the CPU table for this BSP
-   */
-
-  Cpu_table.exceptions_in_RAM = TRUE;
-  Cpu_table.pretasking_hook   = bsp_pretasking_hook;    /* init libc, etc. */
-  Cpu_table.predriver_hook    = bsp_predriver_hook;
-  Cpu_table.postdriver_hook   = bsp_postdriver_hook;
-  /* Cpu_table.clicks_per_usec   = 66666667 / 4000000; */
-  Cpu_table.clicks_per_usec   = 66666667 / 4000000 / 2;
-
-  Cpu_table.do_zero_of_workspace = TRUE;
-  Cpu_table.interrupt_stack_size = (12 * 1024);
-}
diff --git a/c/src/lib/libbsp/powerpc/dmv177/startup/genpvec.c b/c/src/lib/libbsp/powerpc/dmv177/startup/genpvec.c
deleted file mode 100644
index 2faa40ed9a..0000000000
--- a/c/src/lib/libbsp/powerpc/dmv177/startup/genpvec.c
+++ /dev/null
@@ -1,239 +0,0 @@
-/*  genpvec.c
- *
- *  These routines handle the external exception.  Multiple ISRs occur off
- *  of this one interrupt.  This method will allow multiple ISRs to be
- *  called using the same IRQ index.  However, removing the ISR routines is
- *  presently not supported.
- *
- *  The external exception vector numbers begin with DMV170_IRQ_FIRST.
- *  DMV170_IRQ_FIRST is defined to be one greater than the last processor
- *  interrupt.  
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <bsp.h>
-#include "chain.h"
-#include <assert.h>
-
-#define   NUM_LIRQ_HANDLERS   20
-#define   NUM_LIRQ            ( MAX_BOARD_IRQS - PPC_IRQ_LAST )
-
-/* 
- * Structure to for one of possible multiple interrupt handlers for 
- * a given interrupt.
- */
-typedef struct
-{
-  Chain_Node          Node;
-  rtems_isr_entry     handler;                  /* isr routine        */
-  rtems_vector_number vector;                   /* vector number      */
-} EE_ISR_Type;
-
-/*
- * Note:  The following will not work if we add a method to remove
- *        handlers at a later time.
- */
-EE_ISR_Type       ISR_Nodes [NUM_LIRQ_HANDLERS];
-rtems_unsigned16  Nodes_Used; 
-Chain_Control     ISR_Array  [NUM_LIRQ];
-
-/*PAGE
- *
- * external_exception_ISR
- *
- * This interrupt service routine is called for an External Exception.
- *
- *  Input parameters:
- *    vector - vector number representing the external exception vector.
- *
- *  Output parameters:  NONE
- *
- *  Return values: 
- */
-
-rtems_isr external_exception_ISR (
-  rtems_vector_number   vector             /* IN  */
-)
-{ 
-  rtems_unsigned16      index;
-  rtems_boolean         is_active=FALSE;
-  rtems_unsigned32      scv64_status;
-  rtems_vector_number   chained_vector;
-  Chain_Node           *node;
-  EE_ISR_Type          *ee_isr;
-  
-
-  /*
-   * Get all active interrupts. 
-   */
-  scv64_status = SCV64_Get_Interrupt();
-  scv64_status &= SCV64_Get_Interrupt_Enable();
-
-  /*
-   * Process any set interrupts.
-   */
-  for (index = 0; index <= 5; index++) {
-    switch(index) {
-      case 0:
-        is_active = SCV64_Is_IRQ0( scv64_status );
-        break;
-      case 1:
-        is_active = SCV64_Is_IRQ1( scv64_status );
-        break;
-      case 2:
-        is_active = SCV64_Is_IRQ2( scv64_status );
-        break;
-      case 3:
-        is_active = SCV64_Is_IRQ3( scv64_status );
-        break;
-      case 4:
-        is_active = SCV64_Is_IRQ4( scv64_status );
-        break;
-      case 5:
-        is_active = SCV64_Is_IRQ5( scv64_status );
-        break;
-    }
-
-    if (is_active) {
-      /*
-       * Read vector.
-       */
-      node = ISR_Array[ index ].first;
-      while ( !_Chain_Is_tail( &ISR_Array[ index ], node ) ) {
-        ee_isr = (EE_ISR_Type *) node;
-        (*ee_isr->handler)( ee_isr->vector );
-        node = node->next;
-      }
-    }
-  }
-}
-
-
-/*PAGE
- *
- *  initialize_external_exception_vector
- *
- *  This routine initializes the external exception vector
- * 
- *  Input parameters: NONE
- *
- *  Output parameters:  NONE
- *
- *  Return values: NONE
- */
-
-void initialize_external_exception_vector ()
-{
-  int i;
-  rtems_isr_entry previous_isr;
-  rtems_status_code status;
-
-  Nodes_Used = 0;
-
-  /*
-   * Initialize the SCV64 chip
-   */
-  SCV64_Initialize(); 
-
-  for (i=0; i <NUM_LIRQ; i++)
-    Chain_Initialize_empty( &ISR_Array[i] );
-
-  /*  
-   * Install external_exception_ISR () as the handler for 
-   *  the General Purpose Interrupt.
-   */
-
-  status = rtems_interrupt_catch( external_exception_ISR, 
-           PPC_IRQ_EXTERNAL , (rtems_isr_entry *) &previous_isr );
-
-}
-
-/*PAGE
- *
- *  set_EE_vector
- *
- *  This routine installs one of multiple ISRs for the general purpose 
- *  inerrupt.
- *
- *  Input parameters:
- *    handler - handler to call at exception
- *    vector  - vector number associated with this handler.
- *
- *  Output parameters:  NONE
- *
- *  Return values:
- */
-
-rtems_isr_entry  set_EE_vector(
-  rtems_isr_entry     handler,      /* isr routine        */
-  rtems_vector_number vector        /* vector number      */
-)
-{
-  rtems_unsigned16 vec_idx  = vector - DMV170_IRQ_FIRST;
-  rtems_unsigned32 index;
-  
-  /* 
-   *  Verify that all of the nodes have not been used.
-   */
-  assert  (Nodes_Used < NUM_LIRQ_HANDLERS);
-   
-  /*
-   *  If we have already installed this handler for this vector, then
-   *  just reset it.
-   */
-
-  for ( index=0 ; index <= Nodes_Used ; index++ ) {
-    if ( ISR_Nodes[index].vector == vector &&
-         ISR_Nodes[index].handler == handler )
-      return 0;
-  }
-
-  /*
-   * Increment the number of nedes used and set the index for the node
-   * array.
-   */
-  
-  Nodes_Used++; 
-  index = Nodes_Used - 1;
-
-  /*
-   * Write the values of the handler and the vector to this node.
-   */
-  ISR_Nodes[index].handler = handler;
-  ISR_Nodes[index].vector  = vector;
-
-  /*
-   * Connect this node to the chain at the location of the 
-   * vector index.  
-   */
-  Chain_Append( &ISR_Array[vec_idx], &ISR_Nodes[index].Node );
-
-  /*
-   * Enable the LIRQ interrupt.
-   */
-  SCV64_Generate_DUART_Interrupts();
-
-  /*
-   * No interrupt service routine was removed so return 0
-   */
-  return 0;
-}
-
-
-
-
-
-
-
-
-
-
diff --git a/c/src/lib/libbsp/powerpc/dmv177/startup/linkcmds b/c/src/lib/libbsp/powerpc/dmv177/startup/linkcmds
deleted file mode 100644
index 52e379d8a4..0000000000
--- a/c/src/lib/libbsp/powerpc/dmv177/startup/linkcmds
+++ /dev/null
@@ -1,183 +0,0 @@
-OUTPUT_FORMAT("elf32-powerpc", "elf32-powerpc",
-	      "elf32-powerpc")
-OUTPUT_ARCH(powerpc)
-ENTRY(_start)
-
-/*
- *  Number of Decrementer countdowns per millisecond
- *
- *  Calculated by:  (66.67 Mhz * 1000) / 4 cycles per click
- *
-
-PROVIDE(CPU_PPC_CLICKS_PER_MS = 16667);
-*/
-
-MEMORY
-  {
-        RAM : ORIGIN = 0x41000, LENGTH = 32M
-        EPROM : ORIGIN = 0xFFF00000, LENGTH = 0x20000
-  }
-
-SECTIONS
-{
-  /* Read-only sections, merged into text segment: */
-  /* . = 0x40000 + SIZEOF_HEADERS; */
-  /* . = 0x1000000;*/
-  . = 0x41000;
-  .interp   : { *(.interp) }
-  .hash		  : { *(.hash)		}
-  .dynsym	  : { *(.dynsym)		}
-  .dynstr	  : { *(.dynstr)		}
-  .rela.text	  : { *(.rela.text) 	}
-  .rela.data	  : { *(.rela.data) 	}
-  .rela.rodata	  : { *(.rela.rodata) 	}
-  .rela.got	  : { *(.rela.got)	}
-  .rela.got1	  : { *(.rela.got1)	}
-  .rela.got2	  : { *(.rela.got2)	}
-  .rela.ctors	  : { *(.rela.ctors)	}
-  .rela.dtors	  : { *(.rela.dtors)	}
-  .rela.init	  : { *(.rela.init)	}
-  .rela.fini	  : { *(.rela.fini)	}
-  .rela.bss	  : { *(.rela.bss)	}
-  .rela.plt	  : { *(.rela.plt)	}
-  .rela.sdata	  : { *(.rela.sdata2)	}
-  .rela.sbss	  : { *(.rela.sbss2)	}
-  .rela.sdata2	  : { *(.rela.sdata2)	}
-  .rela.sbss2	  : { *(.rela.sbss2)	}
-  .plt   : { *(.plt) }
-  .text      :
-  {
-    *(.text)
-    *(.descriptors)
-    /* .gnu.warning sections are handled specially by elf32.em.  */
-    *(.gnu.warning)
-  } >RAM
-  .init		  : { *(.init)		} >RAM
-  .fini		  : { *(.fini)		} >RAM
-  .rodata	  : { *(.rodata)  	} >RAM
-  .rodata1	  : { *(.rodata1) 	} >RAM
-  _etext = .;
-  PROVIDE (etext = .);
-  PROVIDE (__SDATA2_START__ = .);
-  .sdata2	  : { *(.sdata2) 	} >RAM
-  .sbss2	  : { *(.sbss2) 	} >RAM
-  PROVIDE (__SBSS2_END__ = .);
-  /* Adjust the address for the data segment.  We want to adjust up to
-     the same address within the page on the next page up.  It would
-     be more correct to do this:
-       . = ALIGN(0x40000) + (ALIGN(8) & (0x40000 - 1));
-     The current expression does not correctly handle the case of a
-     text segment ending precisely at the end of a page; it causes the
-     data segment to skip a page.  The above expression does not have
-     this problem, but it will currently (2/95) cause BFD to allocate
-     a single segment, combining both text and data, for this case.
-     This will prevent the text segment from being shared among
-     multiple executions of the program; I think that is more
-     important than losing a page of the virtual address space (note
-     that no actual memory is lost; the page which is skipped can not
-     be referenced).  */
-  . =  ALIGN(8) + 0x40000;
-  PROVIDE (sdata = .);
-  .data    :
-  {
-    *(.data)
-    CONSTRUCTORS
-  } >RAM
-  PROVIDE (__EXCEPT_START__ = .);
-  .gcc_except_table   : { *(.gcc_except_table) } >RAM
-  PROVIDE (__EXCEPT_END__ = .);
-
-  .data1	  : { *(.data1) 	} >RAM
-  .got1		  : { *(.got1) 		} >RAM
-  .dynamic	  : { *(.dynamic) 	} >RAM
-  /* Put .ctors and .dtors next to the .got2 section, so that the pointers
-     get relocated with -mrelocatable. Also put in the .fixup pointers.
-     The current compiler no longer needs this, but keep it around for 2.7.2  */
-  PROVIDE (_GOT2_START_ = .);
-  PROVIDE (__GOT2_START__ = .);
-  .got2		  :  { *(.got2) 	} >RAM
-  PROVIDE (_GOT2_END_ = .);
-  PROVIDE (__GOT2_END__ = .);
-
-  PROVIDE (__CTOR_LIST__ = .);
-  .ctors	  : { *(.ctors) 	} >RAM
-  PROVIDE (__CTOR_END__ = .);
-
-  PROVIDE (__DTOR_LIST__ = .);
-  .dtors	  : { *(.dtors) 	} >RAM
-  PROVIDE (__DTOR_END__ = .);
-
-  PROVIDE (_FIXUP_START_ = .);
-  PROVIDE (__FIXUP_START__ = .);
-  .fixup	  : { *(.fixup) 	} >RAM
-  PROVIDE (_FIXUP_END_ = .);
-  PROVIDE (__FIXUP_END__ = .);
-
-  PROVIDE (_GOT2_END_ = .);
-  PROVIDE (_GOT_START_ = .);
-  s.got = .;
-  .got		  : { *(.got) 		} >RAM
-  .got.plt	  : { *(.got.plt) 	} >RAM
-  PROVIDE (_GOT_END_ = .);
-  PROVIDE (__GOT_END__ = .);
-
-  /* We want the small data sections together, so single-instruction offsets
-     can access them all, and initialized data all before uninitialized, so
-     we can shorten the on-disk segment size.  */
-  PROVIDE (__SDATA_START__ = .);
-  .sdata	  : { *(.sdata) 	} >RAM
-  _edata  =  .;
-  PROVIDE (edata = .);
-
-  PROVIDE (RAM_END = 4M);
-  .sbss      :
-  {
-    PROVIDE (__sbss_start = .);
-    *(.sbss)
-    *(.scommon)
-    PROVIDE (__sbss_end = .);
-  } >RAM
-  PROVIDE (__SBSS_END__ = .);
-  .bss       :
-  {
-   PROVIDE (__bss_start = .);
-   *(.dynbss)
-   *(.bss)
-   *(COMMON)
-  } >RAM
-  . =  ALIGN(8) + 0x8000;
-  PROVIDE (__stack = .);
-  _end = . ;
-  PROVIDE (end = .);
-
-  /* These are needed for ELF backends which have not yet been
-     converted to the new style linker.  */
-  .stab 0 : { *(.stab) }
-  .stabstr 0 : { *(.stabstr) }
-  /* DWARF debug sections.
-     Symbols in the DWARF debugging sections are relative to the beginning
-     of the section so we begin them at 0.  */
-  /* DWARF 1 */
-  .debug          0 : { *(.debug) }
-  .line           0 : { *(.line) }
-  /* GNU DWARF 1 extensions */
-  .debug_srcinfo  0 : { *(.debug_srcinfo) }
-  .debug_sfnames  0 : { *(.debug_sfnames) }
-  /* DWARF 1.1 and DWARF 2 */
-  .debug_aranges  0 : { *(.debug_aranges) }
-  .debug_pubnames 0 : { *(.debug_pubnames) }
-  /* DWARF 2 */
-  .debug_info     0 : { *(.debug_info) }
-  .debug_abbrev   0 : { *(.debug_abbrev) }
-  .debug_line     0 : { *(.debug_line) }
-  .debug_frame    0 : { *(.debug_frame) }
-  .debug_str      0 : { *(.debug_str) }
-  .debug_loc      0 : { *(.debug_loc) }
-  .debug_macinfo  0 : { *(.debug_macinfo) }
-  /* SGI/MIPS DWARF 2 extensions */
-  .debug_weaknames 0 : { *(.debug_weaknames) }
-  .debug_funcnames 0 : { *(.debug_funcnames) }
-  .debug_typenames 0 : { *(.debug_typenames) }
-  .debug_varnames  0 : { *(.debug_varnames) }
-  /* These must appear regardless of  .  */
-}
diff --git a/c/src/lib/libbsp/powerpc/dmv177/startup/setvec.c b/c/src/lib/libbsp/powerpc/dmv177/startup/setvec.c
deleted file mode 100644
index cf385569d0..0000000000
--- a/c/src/lib/libbsp/powerpc/dmv177/startup/setvec.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*  set_vector
- *
- *  This routine installs an interrupt vector on the target Board/CPU.
- *  This routine is allowed to be as board dependent as necessary.
- *
- *  INPUT:
- *    handler - interrupt handler entry point
- *    vector  - vector number
- *    type    - 0 indicates raw hardware connect
- *              1 indicates RTEMS interrupt connect
- *
- *  RETURNS:
- *    address of previous interrupt handler
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems.h>
-#include <bsp.h>
-
-/*PAGE
- *
- *  set_vector
- *
- *  This routine installs an interrupt handler for vector.
- */
-
-rtems_isr_entry set_vector(                    /* returns old vector */
-  rtems_isr_entry     handler,                  /* isr routine        */
-  rtems_vector_number vector,                   /* vector number      */
-  int                 type                      /* RTEMS or RAW intr  */
-)
-{
-  rtems_isr_entry previous_isr;
-  rtems_status_code status;
-
-  /* 
-   * vectors greater than PPC603e_IRQ_LAST are handled by the General purpose
-   * interupt handler.
-   */
-  if ( vector > PPC_IRQ_LAST )  {
-    set_EE_vector ( handler, vector );
-  }
-  else  {
-    status = rtems_interrupt_catch(
-       handler, vector, (rtems_isr_entry *) &previous_isr );
-  }
-  return previous_isr;
-}
-
diff --git a/c/src/lib/libbsp/powerpc/dmv177/startup/vmeintr.c b/c/src/lib/libbsp/powerpc/dmv177/startup/vmeintr.c
deleted file mode 100644
index 212d7eb938..0000000000
--- a/c/src/lib/libbsp/powerpc/dmv177/startup/vmeintr.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/*  vmeintr.c
- *
- *  VMEbus support routines for the DMV170.
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems.h>
-#include <bsp.h>
-#include <vmeintr.h>
-
-/* PAGE
- *
- *  VME_interrupt_Disable
- *
- *  This routine disables vme interupts
- *
- *  Input parameters:
- *    mask - interupt mask
- *
- *  Output parameters:  NONE
- *
- *  Return values: NONE
- */
-
-void VME_interrupt_Disable (
-  VME_interrupt_Mask                mask                        /* IN  */
-)
-{
-  volatile rtems_unsigned8  *VME_interrupt_enable;
-  rtems_unsigned8  value;
-
-#if 0
-  VME_interrupt_enable = ACC_VIE;
-#else
-  VME_interrupt_enable = 0;
-#endif
-  value = *VME_interrupt_enable;
-
-  value &= ~mask;  /* turn off interrupts for all levels in mask */
-
-  *VME_interrupt_enable = value;
-}
-
-/* PAGE
- *
- *  VME_interrupt_Enable
- *
- *  This routine enables vme interupts
- *
- *  Input parameters:
- *    mask - interupt mask
- *
- *  Output parameters:  NONE
- *
- *  Return values:
- */
-
-void VME_interrupt_Enable (
-  VME_interrupt_Mask                mask                        /* IN  */
-)
-{
-  volatile rtems_unsigned8  *VME_interrupt_enable;
-  rtems_unsigned8  value;
-
-#if 0
-  VME_interrupt_enable = ACC_VIE;
-#else
-  VME_interrupt_enable = 0;
-#endif
-  value = *VME_interrupt_enable;
-
-  value |= mask;  /* turn on interrupts for all levels in mask */
-
-  *VME_interrupt_enable = value;
-}
diff --git a/c/src/lib/libbsp/powerpc/dmv177/timer/Makefile.in b/c/src/lib/libbsp/powerpc/dmv177/timer/Makefile.in
deleted file mode 100644
index 16665e4de9..0000000000
--- a/c/src/lib/libbsp/powerpc/dmv177/timer/Makefile.in
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-PGM=${ARCH}/timer.rel
-
-# C source names, if any, go here -- minus the .c
-C_PIECES=timer
-C_FILES=$(C_PIECES:%=%.c)
-C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
-
-H_FILES=
-
-# Assembly source names, if any, go here -- minus the .s
-S_PIECES=
-S_FILES=$(S_PIECES:%=%.s)
-S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
-
-SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES)
-OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
-
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES  +=
-CPPFLAGS +=
-CFLAGS   +=
-
-LD_PATHS  +=
-LD_LIBS   +=
-LDFLAGS   +=
-
-#
-# Add your list of files to delete here.  The config files
-#  already know how to delete some stuff, so you may want
-#  to just run 'make clean' first to see what gets missed.
-#  'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
-
-${PGM}: ${SRCS} ${OBJS}
-	$(make-rel)
-
-all:	${ARCH} $(SRCS) $(PGM)
-
-# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
-install:  all
diff --git a/c/src/lib/libbsp/powerpc/dmv177/timer/timer.c b/c/src/lib/libbsp/powerpc/dmv177/timer/timer.c
deleted file mode 100644
index 674e2cf5a8..0000000000
--- a/c/src/lib/libbsp/powerpc/dmv177/timer/timer.c
+++ /dev/null
@@ -1,132 +0,0 @@
-/*  timer.c
- *
- *  This file implements a benchmark timer using the General Purpose Timer on
- *  the MEC.
- *
- *  The license and distribution terms for this file are in
- *  the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <assert.h>
-
-#include <bsp.h>
-
-rtems_unsigned64 Timer_driver_Start_time;
-
-rtems_boolean Timer_driver_Find_average_overhead;
-
-/*PAGE
- *
- *  Timer_initialize
- *  
- *  This routine initializes the timer.  
- *
- *  Input parameters:   NONE
- *
- *  Output parameters:  NONE
- *
- *  Return values:      NONE
- *
- */
-
-void Timer_initialize()
-{
-  /*
-   *  Timer runs long and accurate enough not to require an interrupt.
-   */
-
-
-  Timer_driver_Start_time = PPC_Get_timebase_register();
-  
-
-}
-
-#define AVG_OVERHEAD     24  /* It typically takes 24 instructions */
-                             /*     to start/stop the timer. */
-#define LEAST_VALID       1  /* Don't trust a value lower than this */
-
-/*  PAGE
- *
- *  Read_timer
- *
- *  This routine reads the timer.
- *
- *  Input parameters:   NONE
- *
- *  Output parameters:  NONE
- *
- *  Return values:      timer in ms units
- *
- */
-
-int Read_timer()
-{
-  rtems_unsigned64  clicks;
-  rtems_unsigned64  total64;
-  rtems_unsigned32  total;
-
-  /* approximately CLOCK_SPEED clicks per microsecond */
-
-  clicks = PPC_Get_timebase_register();
-
-  assert( clicks > Timer_driver_Start_time );
-
-  total64 = clicks - Timer_driver_Start_time;
-
-  assert( total64 <= 0xffffffff );  /* fits into a unsigned32 */
-
-  total = (rtems_unsigned32) total64;
-
-  if ( Timer_driver_Find_average_overhead == 1 )
-    return total;          /* in one microsecond units */
-
-  if ( total < LEAST_VALID )
-    return 0;            /* below timer resolution */
-
-  return total - AVG_OVERHEAD;
-}
-
-/*  PAGE
- *
- *  Empty_function
- *
- *  This routine is called during the idle loop.
- *
- *  Input parameters:   NONE
- *
- *  Output parameters:  
- *    status code of successful
- *
- *  Return values:      NONE
- *
- */
-
-rtems_status_code Empty_function( void )
-{
-  return RTEMS_SUCCESSFUL;
-}
-
-/*  PAGE
- *
- *  Set_find_average_overhead
- *
- *  This routine sets a global boolean to the value passed in.
- *
- *  Input parameters: 
- *    find_flag  - flag to indicate to find the average overhead.
- *
- *  Output parameters:  NONE
- *
- *  Return values:      NONE
- *
- */
-
-void Set_find_average_overhead(
-  rtems_boolean find_flag
-)
-{
-  Timer_driver_Find_average_overhead = find_flag;
-}
diff --git a/c/src/lib/libbsp/powerpc/dmv177/times b/c/src/lib/libbsp/powerpc/dmv177/times
deleted file mode 100644
index 2a18eae92a..0000000000
--- a/c/src/lib/libbsp/powerpc/dmv177/times
+++ /dev/null
@@ -1,191 +0,0 @@
-#
-#  Timing Test Suite Results for the DY-4 DMV177
-#
-#  $Id$
-#
-
-Board:                DY-4 DMV177
-CPU:                  PPC 603e
-Clock Speed:          100 Mhz
-Memory Configuration: 32 Mbyte DRAM
-Wait States:          XXX
-
-Times Reported in:    cycles
-Timer Source:         on-CPU General Purpose Count Down Timer
-
-Column A:             4.0.0-lmco
-Column B:             unused
-
-#                          DESCRIPTION                                 A    B
-== =================================================================  ==== ====
- 1 rtems_semaphore_create                                              571
-   rtems_semaphore_delete                                              575
-   rtems_semaphore_obtain: available                                   414
-   rtems_semaphore_obtain: not available -- NO_WAIT                    414
-   rtems_semaphore_release: no waiting tasks                           501
-
- 2 rtems_semaphore_obtain: not available -- caller blocks             1254
-
- 3 rtems_semaphore_release: task readied -- preempts caller            982
-
- 4 rtems_task_restart: blocked task -- preempts caller                1640
-   rtems_task_restart: ready task -- preempts caller                  1601
-   rtems_semaphore_release: task readied -- returns to caller          636
-   rtems_task_create                                                  2301
-   rtems_task_start                                                    794
-   rtems_task_restart: suspended task -- returns to caller             906
-   rtems_task_delete: suspended task                                  1555
-   rtems_task_restart: ready task -- returns to caller                 928
-   rtems_task_restart: blocked task -- returns to caller              1102
-   rtems_task_delete: blocked task                                    1609
-
- 5 rtems_task_suspend: calling task                                    960
-   rtems_task_resume: task readied -- preempts caller                  803
-
- 6 rtems_task_restart: calling task                                   1137
-   rtems_task_suspend: returns to caller                               433
-   rtems_task_resume: task readied -- returns to caller                451
-   rtems_task_delete: ready task                                      1620
-
- 7 rtems_task_restart: suspended task -- preempts caller              1483
-
- 8 rtems_task_set_priority: obtain current priority                    368
-   rtems_task_set_priority: returns to caller                          633
-   rtems_task_mode: obtain current mode                                184
-   rtems_task_mode: no reschedule                                      213
-   rtems_task_mode: reschedule -- returns to caller                    247
-   rtems_task_mode: reschedule -- preempts caller                      919
-   rtems_task_set_note                                                 383
-   rtems_task_get_note                                                 382
-   rtems_clock_set                                                     792
-   rtems_clock_get                                                      78
-
- 9 rtems_message_queue_create                                         2270
-   rtems_message_queue_send: no waiting tasks                          923
-   rtems_message_queue_urgent: no waiting tasks                        919
-   rtems_message_queue_receive: available                              755
-   rtems_message_queue_flush: no messages flushed                      369
-   rtems_message_queue_flush: messages flushed                         431
-   rtems_message_queue_delete                                          708
-
-10 rtems_message_queue_receive: not available -- NO_WAIT               467
-   rtems_message_queue_receive: not available -- caller blocks        1283
-
-11 rtems_message_queue_send: task readied -- preempts caller          1322
-
-12 rtems_message_queue_send: task readied -- returns to caller         955
-
-13 rtems_message_queue_urgent: task readied -- preempts caller        1322
-
-14 rtems_message_queue_urgent: task readied -- returns to caller       955
-
-15 rtems_event_receive: obtain current events                           43
-   rtems_event_receive: not available -- NO_WAIT                       331
-   rtems_event_receive: not available -- caller blocks                1043
-   rtems_event_send: no task readied                                   354
-   rtems_event_receive: available                                      357 
-   rtems_event_send: task readied -- returns to caller                 571
-
-16 rtems_event_send: task readied -- preempts caller                   946
-
-17 rtems_task_set_priority: preempts caller                           1211
-
-18 rtems_task_delete: calling task                                    2117
-
-19 rtems_signal_catch                                                  267
-   rtems_signal_send: returns to caller                                408
-   rtems_signal_send: signal to self                                   607
-   exit ASR overhead: returns to calling task                          464
-   exit ASR overhead: returns to preempting task                       752
-
-20 rtems_partition_create                                              762
-   rtems_region_create                                                 614
-   rtems_partition_get_buffer: available                               394
-   rtems_partition_get_buffer: not available                           376
-   rtems_partition_return_buffer                                       420
-   rtems_partition_delete                                              426
-   rtems_region_get_segment: available                                 515
-   rtems_region_get_segment: not available -- NO_WAIT                  472
-   rtems_region_return_segment: no waiting tasks                       544
-   rtems_region_get_segment: not available -- caller blocks           1345
-   rtems_region_return_segment: task readied -- preempts caller       1296
-   rtems_region_return_segment: task readied -- returns to caller      935
-   rtems_region_delete                                                 425
-   rtems_io_initialize                                                  52
-   rtems_io_open                                                        42
-   rtems_io_close                                                       44
-   rtems_io_read                                                        42
-   rtems_io_write                                                       44
-   rtems_io_control                                                     42
-
-21 rtems_task_ident                                                   2900
-   rtems_message_queue_ident                                          2828
-   rtems_semaphore_ident                                              3243
-   rtems_partition_ident                                              2828
-   rtems_region_ident                                                 2878
-   rtems_port_ident                                                   2828
-   rtems_timer_ident                                                  2828
-   rtems_rate_monotonic_ident                                         2826
-
-22 rtems_message_queue_broadcast: task readied -- returns to caller   1079
-   rtems_message_queue_broadcast: no waiting tasks                     589
-   rtems_message_queue_broadcast: task readied -- preempts caller     1435
-
-23 rtems_timer_create                                                  357
-   rtems_timer_fire_after: inactive                                    607
-   rtems_timer_fire_after: active                                      646
-   rtems_timer_cancel: active                                          378
-   rtems_timer_cancel: inactive                                        339
-   rtems_timer_reset: inactive                                         552
-   rtems_timer_reset: active                                           591
-   rtems_timer_fire_when: inactive                                     766
-   rtems_timer_fire_when: active                                       764
-   rtems_timer_delete: active                                          471
-   rtems_timer_delete: inactive                                        432
-   rtems_task_wake_when                                               1275
-
-24 rtems_task_wake_after: yield -- returns to caller                   245
-   rtems_task_wake_after: yields -- preempts caller                    851
-
-25 rtems_clock_tick                                                    214
-
-26 _ISR_Disable                                                         24
-   _ISR_Flash                                                           21
-   _ISR_Enable                                                          19
-   _Thread_Disable_dispatch                                             27
-   _Thread_Enable_dispatch                                             211
-   _Thread_Set_state                                                   177
-   _Thread_Disptach (NO FP)                                            761
-   context switch: no floating point contexts                          585
-   context switch: self                                                230
-   context switch: to another task                                     236
-   context switch: restore 1st FP task                                 730
-   fp context switch: save idle, restore idle                          478
-   fp context switch: save idle, restore initialized                   828
-   fp context switch: save initialized, restore initialized            478
-   _Thread_Resume                                                      143
-   _Thread_Unblock                                                     143
-   _Thread_Ready                                                       147
-   _Thread_Get                                                          93 
-   _Semaphore_Get                                                       77
-   _Thread_Get: invalid id                                              20
-
-27 interrupt entry overhead: returns to interrupted task               206
-   interrupt exit overhead: returns to interrupted task                213
-   interrupt entry overhead: returns to nested interrupt               201
-   interrupt exit overhead: returns to nested interrupt                186
-   interrupt entry overhead: returns to preempting task                202
-   interrupt exit overhead: returns to preempting task                 857
-
-28 rtems_port_create                                                   428
-   rtems_port_external_to_internal                                     339
-   rtems_port_internal_to_external                                     339
-   rtems_port_delete                                                   421
-
-29 rtems_rate_monotonic_create                                         388
-   rtems_rate_monotonic_period: initiate period -- returns to caller   556
-   rtems_rate_monotonic_period: obtain status                          377
-   rtems_rate_monotonic_cancel                                         427
-   rtems_rate_monotonic_delete: inactive                               465
-   rtems_rate_monotonic_delete: active                                 519
-   rtems_rate_monotonic_period: conclude periods -- caller blocks      843
diff --git a/c/src/lib/libbsp/powerpc/dmv177/tod/Makefile.in b/c/src/lib/libbsp/powerpc/dmv177/tod/Makefile.in
deleted file mode 100644
index f2af5cc8fb..0000000000
--- a/c/src/lib/libbsp/powerpc/dmv177/tod/Makefile.in
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-VPATH = @srcdir@:@srcdir@/../../../shared
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-PGM=${ARCH}/tod.rel
-
-# C source names, if any, go here -- minus the .c
-C_PIECES=config tod
-C_FILES=$(C_PIECES:%=%.c)
-C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
-
-H_FILES=
-
-SRCS=$(C_FILES) $(H_FILES)
-OBJS=$(C_O_FILES)
-
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-# First and second generation use different RTC chips :(
-TOD_PIECES=tod
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES  +=
-CPPFLAGS +=
-CFLAGS   +=
-
-LD_PATHS  +=
-LD_LIBS   +=
-LDFLAGS   +=
-
-#
-# Add your list of files to delete here.  The config files
-#  already know how to delete some stuff, so you may want
-#  to just run 'make clean' first to see what gets missed.
-#  'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
-
-${PGM}: ${SRCS} ${OBJS}
-	$(make-rel)
-
-all:	${ARCH} $(SRCS) $(PGM)
-
-# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
-install:  all
diff --git a/c/src/lib/libbsp/powerpc/dmv177/tod/config.c b/c/src/lib/libbsp/powerpc/dmv177/tod/config.c
deleted file mode 100644
index aa44aa66bf..0000000000
--- a/c/src/lib/libbsp/powerpc/dmv177/tod/config.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- *  This file contains the RTC driver table for the DY-4 DMV177.
- *
- *  COPYRIGHT (c) 1989, 1990, 1991, 1992, 1993, 1994, 1997.
- *  On-Line Applications Research Corporation (OAR).
- *  All rights assigned to U.S. Government, 1994.
- *
- *  $Id$
- */
-
-#include <bsp.h>
-
-#include <libchip/rtc.h>
-#include <libchip/icm7170.h>
-
-/*
- * Configuration specific probe routines
- *
- * NOTE:  There are no DMV177 specific configuration routines.  These
- *        routines could be written to dynamically determine what type
- *        of real-time clock is on this board.  This would be useful for
- *        a BSP supporting multiple board models.
- */
-
-/* NONE CURRENTLY PROVIDED */
-
-/*
- * The following table configures the RTC drivers used in this BSP.
- *
- * The first entry which, when probed, is available, will be named /dev/rtc,
- * all others being given the name indicated.
- */
-
-boolean dmv177_icm7170_probe(int minor);
-
-rtc_tbl	RTC_Table[] = {
-	{
-		"/dev/rtc0",			/* sDeviceName */
-                RTC_ICM7170,                    /* deviceType */
-		&icm7170_fns,			/* pDeviceFns */
-		dmv177_icm7170_probe,		/* deviceProbe */
-		(void *) ICM7170_AT_1_MHZ,	/* pDeviceParams */
-		DMV170_RTC_ADDRESS,		/* ulCtrlPort1 */
-		NULL,				/* ulDataPort */
-		icm7170_get_register_8,        	/* getRegister */
-		icm7170_set_register_8,		/* setRegister */
-	}
-};
-
-/*
- *  Declare 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;
-
-/*
- *  Hopefully, by checking the card resource register, this BSP
- *  will be able to operate on the DMV171, DMV176, or DMV177.
- */
-
-boolean dmv177_icm7170_probe(int minor)
-{
-  volatile unsigned16 *card_resource_reg;
-  unsigned16 v;
-
-  card_resource_reg = (volatile unsigned16 *) DMV170_CARD_RESORCE_REG;
-
-  v = *card_resource_reg & DMV170_RTC_INST_MASK;
-
-  if ( v == DMV170_RTC_INSTALLED )
-    return TRUE;
-
-  return FALSE;
-}
-
diff --git a/c/src/lib/libbsp/powerpc/dmv177/tod/todcfg.c b/c/src/lib/libbsp/powerpc/dmv177/tod/todcfg.c
deleted file mode 100644
index aa44aa66bf..0000000000
--- a/c/src/lib/libbsp/powerpc/dmv177/tod/todcfg.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- *  This file contains the RTC driver table for the DY-4 DMV177.
- *
- *  COPYRIGHT (c) 1989, 1990, 1991, 1992, 1993, 1994, 1997.
- *  On-Line Applications Research Corporation (OAR).
- *  All rights assigned to U.S. Government, 1994.
- *
- *  $Id$
- */
-
-#include <bsp.h>
-
-#include <libchip/rtc.h>
-#include <libchip/icm7170.h>
-
-/*
- * Configuration specific probe routines
- *
- * NOTE:  There are no DMV177 specific configuration routines.  These
- *        routines could be written to dynamically determine what type
- *        of real-time clock is on this board.  This would be useful for
- *        a BSP supporting multiple board models.
- */
-
-/* NONE CURRENTLY PROVIDED */
-
-/*
- * The following table configures the RTC drivers used in this BSP.
- *
- * The first entry which, when probed, is available, will be named /dev/rtc,
- * all others being given the name indicated.
- */
-
-boolean dmv177_icm7170_probe(int minor);
-
-rtc_tbl	RTC_Table[] = {
-	{
-		"/dev/rtc0",			/* sDeviceName */
-                RTC_ICM7170,                    /* deviceType */
-		&icm7170_fns,			/* pDeviceFns */
-		dmv177_icm7170_probe,		/* deviceProbe */
-		(void *) ICM7170_AT_1_MHZ,	/* pDeviceParams */
-		DMV170_RTC_ADDRESS,		/* ulCtrlPort1 */
-		NULL,				/* ulDataPort */
-		icm7170_get_register_8,        	/* getRegister */
-		icm7170_set_register_8,		/* setRegister */
-	}
-};
-
-/*
- *  Declare 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;
-
-/*
- *  Hopefully, by checking the card resource register, this BSP
- *  will be able to operate on the DMV171, DMV176, or DMV177.
- */
-
-boolean dmv177_icm7170_probe(int minor)
-{
-  volatile unsigned16 *card_resource_reg;
-  unsigned16 v;
-
-  card_resource_reg = (volatile unsigned16 *) DMV170_CARD_RESORCE_REG;
-
-  v = *card_resource_reg & DMV170_RTC_INST_MASK;
-
-  if ( v == DMV170_RTC_INSTALLED )
-    return TRUE;
-
-  return FALSE;
-}
-
diff --git a/c/src/lib/libbsp/powerpc/dmv177/wrapup/Makefile.in b/c/src/lib/libbsp/powerpc/dmv177/wrapup/Makefile.in
deleted file mode 100644
index 7119536c6a..0000000000
--- a/c/src/lib/libbsp/powerpc/dmv177/wrapup/Makefile.in
+++ /dev/null
@@ -1,62 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-# We only build the networking device driver if HAS_NETWORKING was defined
-NETWORKING_DRIVER_yes_V = sonic
-NETWORKING_DRIVER = $(NETWORKING_DRIVER_$(HAS_NETWORKING)_V)
-
-# pieces specific to this BSP
-BSP_PIECES=startup clock console scv64 timer tod $(NETWORKING_DRIVER)
-
-# pieces to pick up out of libcpu/$(RTEMS_CPU)
-CPU_PIECES=
-
-# shared pieces
-GENERIC_PIECES=
-
-# bummer; have to use $foreach since % pattern subst rules only replace 1x
-OBJS=$(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/$(piece).rel) \
-     $(foreach piece, $(CPU_PIECES), \
-         ../../../../libcpu/$(RTEMS_CPU)/$(piece)/$(ARCH)/$(piece).rel) \
-     $(foreach piece, $(GENERIC_PIECES), \
-         ../../../$(piece)/$(ARCH)/$(piece).rel)
-LIB=$(ARCH)/libbsp.a
-
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/lib.cfg
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES  +=
-CPPFLAGS +=
-CFLAGS   +=
-
-LD_PATHS  +=
-LD_LIBS   +=
-LDFLAGS   +=
-
-#
-# Add your list of files to delete here.  The config files
-#  already know how to delete some stuff, so you may want
-#  to just run 'make clean' first to see what gets missed.
-#  'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
-
-$(LIB): ${OBJS}
-	$(make-library)
-
-all:	${ARCH} $(SRCS) $(LIB)
-	$(INSTALL_VARIANT) -m 644 $(LIB) ${PROJECT_RELEASE}/lib
-
diff --git a/c/src/lib/libbsp/powerpc/psim/start/Makefile.in b/c/src/lib/libbsp/powerpc/psim/start/Makefile.in
deleted file mode 100644
index 35377e94f1..0000000000
--- a/c/src/lib/libbsp/powerpc/psim/start/Makefile.in
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-PGMS=${ARCH}/startsim.o
-
-# C source names, if any, go here -- minus the .c
-C_PIECES=
-C_FILES=$(C_PIECES:%=%.c)
-C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
-
-H_FILES=
-
-# Assembly source names, if any, go here -- minus the .s
-S_PIECES=startsim
-S_FILES=$(S_PIECES:%=%.s)
-S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
-
-SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES)
-OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
-
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES  +=
-CPPFLAGS +=
-CFLAGS   +=
-
-LD_PATHS  +=
-LD_LIBS   +=
-LDFLAGS   +=
-
-#
-# Add your list of files to delete here.  The config files
-#  already know how to delete some stuff, so you may want
-#  to just run 'make clean' first to see what gets missed.
-#  'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
-
-all:	${ARCH} $(SRCS) $(OBJS) $(PGM)
-	$(INSTALL_VARIANT) -m 555 ${PGMS} ${PROJECT_RELEASE}/lib
diff --git a/c/src/lib/libbsp/powerpc/psim/start/startsim.s b/c/src/lib/libbsp/powerpc/psim/start/startsim.s
deleted file mode 100644
index f94a3ca330..0000000000
--- a/c/src/lib/libbsp/powerpc/psim/start/startsim.s
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * This is based on the mvme-crt0.S file from libgloss/rs6000.
- * crt0.S -- startup file for PowerPC systems.
- *
- * Copyright (c) 1995 Cygnus Support
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- *
- *  $Id$
- */
-
-#include "ppc-asm.h"
-
-	.file	"startsim.s"
-	.section ".got2","aw"
-	.align	2
-
-.LCTOC1 = .+32768
-
-	.extern	FUNC_NAME(atexit)
-	.globl	FUNC_NAME(__atexit)
-	.section ".sdata","aw"
-	.align	2
-FUNC_NAME(__atexit):			/* tell C's eabi-ctor's we have an atexit function */
-	.long	FUNC_NAME(atexit)@fixup	/* and that it is to register __do_global_dtors */
-
-	.section ".fixup","aw"
-	.align	2
-	.long	FUNC_NAME(__atexit)
-
-	.section ".got2","aw"
-.Ltable = .-.LCTOC1
-	.long	.LCTOC1			/* address we think .LCTOC1 is loaded at */
-
-.Lbss_start = .-.LCTOC1
-	.long	__bss_start
-
-.Lend = .-.LCTOC1
-	.long	_end
-
-.Lstack = .-.LCTOC1			/* stack address if set by user */
-	.long	__stack
-
-	.text
-.Lptr:
-	.long .LCTOC1-.Laddr
-
-	.globl	_start
-	.type	_start,@function
-_start:
-	bl	.Laddr			/* get current address */
-.Laddr:
-	mflr	r4			/* real address of .Laddr */
-	lwz	r5,(.Lptr-.Laddr)(r4)	/* linker generated address of .LCTOC1 */
-	add	r5,r5,r4		/* correct to real pointer */
-	lwz	r4,.Ltable(r5)		/* get linker's idea of where .Laddr is */
-	subf	r4,r4,r5		/* calculate difference between where linked and current */
-
-	/* clear bss */
-	lwz	r6,.Lbss_start(r5)	/* calculate beginning of the BSS */
-	lwz	r7,.Lend(r5)		/* calculate end of the BSS */
-	add	r6,r6,r4		/* adjust pointers */
-	add	r7,r7,r4
-
-	cmplw	1,r6,r7
-	bc	4,4,.Ldone
-
-	subf	r8,r6,r7		/* number of bytes to zero */
-	srwi	r9,r8,2			/* number of words to zero */
-	mtctr	r9
-	li	r0,0			/* zero to clear memory */
-	addi	r6,r6,-4		/* adjust so we can use stwu */
-.Lloop:
-	stwu	r0,4(r6)		/* zero bss */
-	bdnz	.Lloop
-
-.Ldone:
-
-	lwz	r0,.Lstack(r5)		/* stack address or 0 */
-	cmplwi	1,r0,0			/* equal to 0? */
-	bc	12,6,.Lnostack		/* use default stack if == 0 */
-	mr	sp,r0			/* use user defined stack */
-
-.Lnostack:
-	/* set up initial stack frame */
-	addi	sp,sp,-4		/* make sure we don't overwrite debug mem */
-	lis	r0,0
-	stw	r0,0(sp)		/* clear back chain */
-	stwu	sp,-56(sp)		/* push another stack frame */
-
-	/* Let her rip */
-	bl	FUNC_NAME(boot_card)
-
-	/* return value from boot_card is argument to exit */
-	bl	FUNC_NAME(exit)
-	trap
-.Lstart:
-	.size	_start,.Lstart-_start
diff --git a/c/src/lib/libbsp/sh/gensh1/start/Makefile.in b/c/src/lib/libbsp/sh/gensh1/start/Makefile.in
deleted file mode 100644
index b5d382a468..0000000000
--- a/c/src/lib/libbsp/sh/gensh1/start/Makefile.in
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-VPATH=@srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-PGMS=${ARCH}/start.o
-
-# C source names, if any, go here -- minus the .c
-C_PIECES=
-C_FILES=$(C_PIECES:%=%.c)
-C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
-
-H_FILES=
-
-# Assembly source names, if any, go here -- minus the .s
-S_PIECES=start
-S_FILES=$(S_PIECES:%=%.s)
-S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
-
-SRCS=$(C_FILES) $(H_FILES) $(S_FILES)
-OBJS=$(C_O_FILES) $(S_O_FILES)
-
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES  +=
-CPPFLAGS +=
-CFLAGS   +=
-
-LD_PATHS  +=
-LD_LIBS   +=
-LDFLAGS   +=
-
-# force optimization, unless start.o will not work
-# CFLAGS_PROFILE=
-# CFLAGS_DEBUG=-O3
-# CFLAGS_OPTIMIZE=-O3
-
-#
-# Add your list of files to delete here.  The config files
-#  already know how to delete some stuff, so you may want
-#  to just run 'make clean' first to see what gets missed.
-#  'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
-
-all:	${ARCH} $(SRCS) $(OBJS) $(PGM)
-	$(INSTALL_VARIANT) -m 555 ${PGMS} ${PROJECT_RELEASE}/lib
diff --git a/c/src/lib/libbsp/shared/console.c b/c/src/lib/libbsp/shared/console.c
deleted file mode 100644
index 60ced47ddf..0000000000
--- a/c/src/lib/libbsp/shared/console.c
+++ /dev/null
@@ -1,291 +0,0 @@
-/*
- *  This file contains the TTY driver for the PPCn_60x
- *
- *  This driver uses the termios pseudo driver.
- *
- *  COPYRIGHT (c) 1998 by Radstone Technology
- *
- *
- * THIS FILE IS PROVIDED TO YOU, THE USER, "AS IS", WITHOUT WARRANTY OF ANY
- * KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTY OF FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK
- * AS TO THE QUALITY AND PERFORMANCE OF ALL CODE IN THIS FILE IS WITH YOU.
- *
- * You are hereby granted permission to use, copy, modify, and distribute
- * this file, provided that this notice, plus the above copyright notice
- * and disclaimer, appears in all copies. Radstone Technology will provide
- * no support for this code.
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <bsp.h>
-#include <rtems/libio.h>
-#include <stdlib.h>
-#include <assert.h>
-#include <termios.h>
-
-#include <libchip/serial.h>
-
-/*
- *  Configuration Information
- */
-
-extern console_data  Console_Port_Data[];
-extern unsigned long  Console_Port_Count;
-extern rtems_device_minor_number  Console_Port_Minor;
- 
-/*PAGE
- *
- *  console_open
- *
- *  open a port as a termios console.
- *
- */
-
-rtems_device_driver console_open(
-  rtems_device_major_number major,
-  rtems_device_minor_number minor,
-  void                    * arg
-)
-{
-  rtems_status_code              status;
-  rtems_libio_open_close_args_t *args = arg;
-  rtems_libio_ioctl_args_t       IoctlArgs;
-  struct termios                 Termios;
-  rtems_termios_callbacks        Callbacks;
-  console_tbl                   *cptr;
-
-  /*
-   * Verify the port number is valid.
-   */
-  if ( minor > Console_Port_Count ) {
-    return RTEMS_INVALID_NUMBER;
-  }
-
-  /*
-   * Open the port as a termios console driver.
-   */
-
-  cptr = &Console_Port_Tbl[minor];
-  Callbacks.firstOpen            = cptr->pDeviceFns->deviceFirstOpen;
-  Callbacks.lastClose            = cptr->pDeviceFns->deviceLastClose;
-  Callbacks.pollRead             = cptr->pDeviceFns->deviceRead;
-  Callbacks.write                = cptr->pDeviceFns->deviceWrite;
-  Callbacks.setAttributes        = cptr->pDeviceFns->deviceSetAttributes;
-  Callbacks.stopRemoteTx         = cptr->pDeviceFlow->deviceStopRemoteTx;
-  Callbacks.startRemoteTx        = cptr->pDeviceFlow->deviceStartRemoteTx;
-  Callbacks.outputUsesInterrupts = cptr->pDeviceFns->deviceOutputUsesInterrupts;
-
-  /* XXX what about 
-   *        Console_Port_Tbl[minor].ulMargin,
-   *        Console_Port_Tbl[minor].ulHysteresis);
-   */
-
-  status = rtems_termios_open ( major, minor, arg, &Callbacks );
-  Console_Port_Data[minor].termios_data = args->iop->data1;
-
-  if (minor!=Console_Port_Minor) {
-    /*
-     * If this is not the console we do not want ECHO and
-     * so forth
-     */
-    IoctlArgs.iop=args->iop;
-    IoctlArgs.command=RTEMS_IO_GET_ATTRIBUTES;
-    IoctlArgs.buffer=&Termios;
-    rtems_termios_ioctl(&IoctlArgs);
-    Termios.c_lflag=ICANON;
-    IoctlArgs.command=RTEMS_IO_SET_ATTRIBUTES;
-    rtems_termios_ioctl(&IoctlArgs);
-  }
-
-  if ( (args->iop->flags&LIBIO_FLAGS_READ) &&
-      Console_Port_Tbl[minor].pDeviceFlow &&
-      Console_Port_Tbl[minor].pDeviceFlow->deviceStartRemoteTx) {
-    Console_Port_Tbl[minor].pDeviceFlow->deviceStartRemoteTx(minor);
-  }
-
-  return status;
-}
- 
-/*PAGE
- *
- *  console_reserve_resources
- *
- *  This routine uses the termios driver to reserve resources.
- */
-
-void console_reserve_resources(
-  rtems_configuration_table *configuration
-)
-{
-  rtems_termios_reserve_resources( configuration, 4 );
-}
-
-
-/*PAGE
- *
- *  console_close
- *
- *  This routine closes a port that has been opened as console.
- */
-
-rtems_device_driver console_close(
-  rtems_device_major_number major,
-  rtems_device_minor_number minor,
-  void                    * arg
-)
-{
-  rtems_libio_open_close_args_t *args = arg;
-
-  if ( (args->iop->flags&LIBIO_FLAGS_READ) &&
-        Console_Port_Tbl[minor].pDeviceFlow &&
-        Console_Port_Tbl[minor].pDeviceFlow->deviceStopRemoteTx) {
-    Console_Port_Tbl[minor].pDeviceFlow->deviceStopRemoteTx(minor);
-  }
-
-  return rtems_termios_close (arg);
-}
- 
-/*PAGE
- *
- *  console_read
- *
- *  This routine uses the termios driver to read a character.
- */
-
-rtems_device_driver console_read(
-  rtems_device_major_number major,
-  rtems_device_minor_number minor,
-  void                    * arg
-)
-{
-  return rtems_termios_read (arg);
-}
- 
-/*PAGE
- *
- *  console_write
- *
- *  this routine uses the termios driver to write a character.
- */
-
-rtems_device_driver console_write(
-  rtems_device_major_number major,
-  rtems_device_minor_number minor,
-  void                    * arg
-)
-{
-  return rtems_termios_write (arg);
-}
- 
-/*PAGE
- *
- *  console_control
- *
- *  this routine uses the termios driver to process io
- */
-
-rtems_device_driver console_control(
-  rtems_device_major_number major,
-  rtems_device_minor_number minor,
-  void                    * arg
-)
-{
-  return rtems_termios_ioctl (arg);
-}
-
-/*PAGE
- *
- *  console_initialize
- *
- *  Routine called to initialize the console device driver.
- */
-
-rtems_device_driver console_initialize(
-  rtems_device_major_number  major,
-  rtems_device_minor_number  minor_arg,
-  void                      *arg
-)
-{
-  rtems_status_code          status;
-  rtems_device_minor_number  minor;
-
-  /*
-   * initialize the termio interface.
-   */
-
-  rtems_termios_initialize();
-
-  for (minor=0; minor < Console_Port_Count ; minor++) {
-    /*
-     * First perform the configuration dependent probe, then the
-     * device dependent probe
-     */
-
-    if ((!Console_Port_Tbl[minor].deviceProbe ||
-         Console_Port_Tbl[minor].deviceProbe(minor)) &&
-         Console_Port_Tbl[minor].pDeviceFns->deviceProbe(minor)) {
-      /*
-       * Use this device for the console
-       */
-      break;
-    }
-  }
-  if ( minor == Console_Port_Count ) {
-    /*
-     * Failed to find a working device
-     */
-    rtems_fatal_error_occurred(RTEMS_IO_ERROR);
-  }
-  
-  Console_Port_Minor=minor;
-
-  /*
-   * Register Device Names
-   */
-  status = rtems_io_register_name("/dev/console", major, Console_Port_Minor );
-  if (status != RTEMS_SUCCESSFUL) {
-    rtems_fatal_error_occurred(status);
-  }
-  Console_Port_Tbl[minor].pDeviceFns->deviceInitialize(Console_Port_Minor);
-
-  for (minor++;minor<Console_Port_Count;minor++) {
-    /*
-     * First perform the configuration dependent probe, then the
-     * device dependent probe
-     */
-
-    if ( (!Console_Port_Tbl[minor].deviceProbe ||
-         Console_Port_Tbl[minor].deviceProbe(minor)) &&
-         Console_Port_Tbl[minor].pDeviceFns->deviceProbe(minor)) {
-      status = rtems_io_register_name(
-        Console_Port_Tbl[minor].sDeviceName,
-        major,
-        minor );
-      if (status != RTEMS_SUCCESSFUL) {
-        rtems_fatal_error_occurred(status);
-      }
-
-      /*
-       * Initialize the hardware device.
-       */
-
-      Console_Port_Tbl[minor].pDeviceFns->deviceInitialize(minor);
-
-    }
-  }
-
-  return RTEMS_SUCCESSFUL;
-}
-
-
-
diff --git a/c/src/lib/libbsp/shared/tod.c b/c/src/lib/libbsp/shared/tod.c
deleted file mode 100644
index b43c7c1c04..0000000000
--- a/c/src/lib/libbsp/shared/tod.c
+++ /dev/null
@@ -1,243 +0,0 @@
-/*
- *  Real Time Clock Driver Wrapper for Libchip
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */ 
-
-#include <rtems.h>
-#include <libchip/rtc.h>
-
-/*
- *  Configuration Information
- */
-
-extern unsigned long              RTC_Count;
-extern rtems_device_minor_number  RTC_Minor;
-
-int RTC_Present;
-
-/*
- *  rtc_initialize
- *
- *  Initialize the RTC driver
- */
-
-rtems_device_driver rtc_initialize(
-  rtems_device_major_number  major,
-  rtems_device_minor_number  minor_arg,
-  void                      *arg
-)
-{
-  rtems_device_minor_number  minor;
-  rtems_status_code          status;
-
-  for (minor=0; minor < RTC_Count ; minor++) {
-    /* 
-     * First perform the configuration dependent probe, then the
-     * device dependent probe
-     */
-
-    if (RTC_Table[minor].deviceProbe && RTC_Table[minor].deviceProbe(minor)) {
-      /* 
-       * Use this device as the primary RTC
-       */
-      RTC_Minor = minor;
-      RTC_Present = 1;
-      break;
-    }
-  }
-
-  if ( !RTC_Present ) {
-    /* 
-     * Failed to find an RTC -- this is not a fatal error.
-     */
-
-    return RTEMS_INVALID_NUMBER;
-  }
-
-  /*
-   *  Register and initialize the primary RTC's
-   */
-
-  status = rtems_io_register_name( "/dev/rtc", major, RTC_Minor );
-  if (status != RTEMS_SUCCESSFUL) {
-    rtems_fatal_error_occurred(status);
-  }
-
-  RTC_Table[minor].pDeviceFns->deviceInitialize( RTC_Minor );
-
-  /*
-   *  Now initialize any secondary RTC's 
-   */
-
-  for ( minor++ ; minor<RTC_Count ; minor++) {
-    /*
-     * First perform the configuration dependent probe, then the
-     * device dependent probe
-     */
-
-    if (RTC_Table[minor].deviceProbe && RTC_Table[minor].deviceProbe(minor)) {
-      status = rtems_io_register_name(
-        RTC_Table[minor].sDeviceName,
-        major,
-        minor );
-      if (status != RTEMS_SUCCESSFUL) {
-        rtems_fatal_error_occurred(status);
-      }
-
-      /*
-       * Initialize the hardware device.
-       */
-
-      RTC_Table[minor].pDeviceFns->deviceInitialize(minor);
-
-    }
-  }
-
-  return RTEMS_SUCCESSFUL;
-}
-
-
-/*PAGE
- *
- *  This routine copies the time from the real time clock to RTEMS
- * 
- *  Input parameters:  NONE
- * 
- *  Output parameters:  NONE
- *
- *  Return values: NONE
- */
-
-void setRealTimeToRTEMS()
-{
-  rtems_time_of_day rtc_tod;
-
-  if (!RTC_Present)
-    return;
-
-  RTC_Table[RTC_Minor].pDeviceFns->deviceGetTime(RTC_Minor, &rtc_tod);
-  rtems_clock_set( &rtc_tod );
-}
-
-/*PAGE
- *
- *  setRealTimeFromRTEMS
- *
- *  This routine copies the time from RTEMS to the real time clock
- * 
- *  Input parameters:  NONE
- * 
- *  Output parameters:  NONE
- *
- *  Return values: NONE
- */
-
-void setRealTimeFromRTEMS()
-{
-  rtems_time_of_day rtems_tod;
-
-  if (!RTC_Present)
-    return;
-
-  rtems_clock_get( RTEMS_CLOCK_GET_TOD, &rtems_tod );
-  RTC_Table[RTC_Minor].pDeviceFns->deviceSetTime(RTC_Minor, &rtems_tod);
-}
-
-/*PAGE
- *
- *  getRealTime
- *
- *  This routine reads the current time from the RTC.
- * 
- *  Input parameters:  NONE
- * 
- *  Output parameters:  NONE
- *
- *  Return values: NONE
- */
-
-void getRealTime(
-  rtems_time_of_day *tod
-)
-{
-
-  if (!RTC_Present)
-    return;
-
-  RTC_Table[RTC_Minor].pDeviceFns->deviceGetTime(RTC_Minor, tod);
-}
-
-/*PAGE
- * 
- *  setRealTime
- *  
- *  This routine sets the RTC.
- *  
- *  Input parameters:  NONE
- * 
- *  Output parameters:  NONE
- *
- *  Return values: NONE
- */
-
-/* XXX this routine should be part of the public RTEMS interface */ 
-rtems_boolean _TOD_Validate( rtems_time_of_day *tod );
-
-int setRealTime(
-  rtems_time_of_day *tod
-)
-{
-  
-  if (!RTC_Present)
-    return -1;
-  
-  if ( !_TOD_Validate(tod) )
-    return -1;
-
-  RTC_Table[RTC_Minor].pDeviceFns->deviceSetTime(RTC_Minor, tod);
-  return 0;
-}
-
-
-/*PAGE
- *
- *  checkRealTime
- *
- *  This routine reads the returns the variance betweent the real time and
- *  rtems time.
- * 
- *  Input parameters: NONE
- * 
- *  Output parameters:  NONE
- *
- *  Return values: 
- *    int   The differance between the real time clock and rtems time.
- */
-
-/* XXX this routine should be part of the public RTEMS interface */ 
-unsigned32 _TOD_To_seconds( rtems_time_of_day *tod );
-
-int checkRealTime()
-{
-  rtems_time_of_day rtems_tod;
-  rtems_time_of_day rtc_tod;
-  unsigned32 rtems_time;
-  unsigned32 rtc_time;
-
-  if (!RTC_Present)
-    return -1;
-
-  rtems_clock_get( RTEMS_CLOCK_GET_TOD, &rtems_tod );
-  RTC_Table[RTC_Minor].pDeviceFns->deviceGetTime(RTC_Minor, &rtc_tod);
-
-  rtems_time = _TOD_To_seconds( &rtems_tod ); 
-  rtc_time = _TOD_To_seconds( &rtc_tod ); 
-
-  return rtems_time - rtc_time;
-}
-
diff --git a/c/src/lib/libbsp/shared/tod.h b/c/src/lib/libbsp/shared/tod.h
deleted file mode 100644
index 725211e082..0000000000
--- a/c/src/lib/libbsp/shared/tod.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Real Time Clock (MK48T08) for RTEMS on Score603e
- *
- *  Based on MVME162 TOD by:
- *    COPYRIGHT (C) 1997
- *    by Katsutoshi Shibuya - BU Denken Co.,Ltd. - Sapporo - JAPAN
- *    ALL RIGHTS RESERVED
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-#ifndef TOD_H
-#define TOD_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- *  Set the RTC.
- */
-
-int setRealTime(
-  rtems_time_of_day *tod
-);
-
-/*
- *  Get the time from the RTC.
- */
-
-void getRealTime(
-  rtems_time_of_day *tod
-);
-
-/*
- *  Read real time from RTC and set it to RTEMS' clock manager
- */
-
-void setRealTimeToRTEMS();
-
-/*
- *  Read time from RTEMS' clock manager and set it to RTC
- */
-
-void setRealTimeFromRTEMS();
-
-/*
- *  Return the difference between RTC and RTEMS' clock manager time in minutes.
- *  If the difference is greater than 1 day, this returns 9999.
- */
-
-int checkRealTime();
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/c/src/lib/libbsp/shmdr/shm_driver.h b/c/src/lib/libbsp/shmdr/shm_driver.h
deleted file mode 100644
index 8875525983..0000000000
--- a/c/src/lib/libbsp/shmdr/shm_driver.h
+++ /dev/null
@@ -1,542 +0,0 @@
-/*  shm.h
- *
- *  This include file contains all the constants, structures,
- *  and global variables for this RTEMS based shared memory
- *  communications interface driver.
- *
- *  Processor board dependencies are in other files.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __SHM_h
-#define __SHM_h
-
-#include <clockdrv.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*  The information contained in the Node Status, Locked Queue, and
- *  Envelope Control Blocks must be maintained in a NEUTRAL format.
- *  Currently the neutral format may be selected as big or little
- *  endian by simply defining either NEUTRAL_BIG or NEUTRAL_LITTLE.
- *
- *  It is CRITICAL to note that the neutral format can ONLY be
- *  changed by modifying this file and recompiling the ENTIRE
- *  SHM driver including ALL target specific support files.
- *
- *  The following table details the memory contents for the endian
- *  field of the Node Status Control Block in the various
- *  data format configurations (data is in hexadecimal):
- *
- *   NEUTRAL NATIVE BYTE 0  BYTE 1  BYTE 2  BYTE 3
- *   ======= ====== ======  ======  ======  ======
- *    BIG     BIG     00      00      00      01
- *    BIG    LITTLE   10      00      00      00
- *   LITTLE   BIG     01      00      00      00
- *   LITTLE  LITTLE   00      00      00      10
- *
- *
- *  NOTE: XXX
- *                PORTABILITY OF LOCKING INSTRUCTIONS
- *                ===================================
- *            The locking mechanism described below is not
- *            general enough.  Where the hardware supports
- *            it we should use "atomic swap" instructions
- *            so the values in the lock can be tailored to
- *            support a CPU with only weak atomic memory
- *            instructions.  There are combinations of
- *            CPUs with inflexible atomic memory instructions
- *            which appear to be incompatible.  For example,
- *            the SPARClite instruction uses a byte which is
- *            0xFF when locked.  The PA-RISC uses 1 to indicate
- *            locked and 0 when unlocked.  These CPUs appear to
- *            have incompatible lock instructions.  But
- *            they could be used in a heterogenous system
- *            with does not mix SPARCs and PA-RISCs.  For
- *            example, the i386 and SPARC or i386 and SPARC
- *            could work together.  The bottom line is that
- *            not every CPU will work together using this
- *            locking scheme.  There are supposed to be
- *            algorithms to do this without hardware assist
- *            and one of these should be incorporated into
- *            the shared memory driver.
- *
- *            The most flexible scheme using the instructions
- *            of the various CPUs for efficiency would be to use
- *            "atomic swaps" wherever possible.  Make the lock
- *            and unlock configurable much like BIG vs LITTLE
- *            endian use of shared memory is now.  The values
- *            of the lock could then reflect the "worst"
- *            CPU in a system.  This still results in mixes
- *            of CPUs which are incompatible.
- *
- *  The current locking mechanism is based upon the MC68020
- *  "tas" instruction which is atomic.  All ports to other CPUs
- *  comply with the restrictive placement of lock bit by this
- *  instruction.  The lock bit is the most significant bit in a
- *  big-endian rtems_unsigned32.  On other processors, the lock is
- *  typically implemented via an atomic swap or atomic modify
- *  bits type instruction.
- */
-
-#define NEUTRAL_BIG
-
-#ifdef NEUTRAL_BIG
-#define SHM_BIG       0x00000001
-#define SHM_LITTLE    0x10000000
-#endif
-
-#ifdef NEUTRAL_LITTLE
-#define SHM_BIG       0x01000000
-#define SHM_LITTLE    0x00000010
-#endif
-
-/*
- *  The following are the values used to fill in the lock field.  Some CPUs
- *  are able to write only a single value into field.  By making the
- *  lock and unlock values configurable, CPUs which support "atomic swap"
- *  instructions can generally be made to work in any heterogeneous
- *  configuration.  However, it is possible for two CPUs to be incompatible
- *  in regards to the lock field values.  This occurs when two CPUs
- *  which write only a single value to the field are used in a system
- *  but the two CPUs write different incompatible values.
- *
- *  NOTE:  The following is a first attempt at defining values which
- *         have a chance at working together.  The m68k should use
- *         chk2 instead of tas to be less restrictive.  Target endian
- *         problems (like the Force CPU386 which has (broken) big endian
- *         view of the VMEbus address space) are not addressed yet.
- */
-
-#if defined(__i960__)
-#define SHM_LOCK_VALUE    0x00000080
-#define SHM_UNLOCK_VALUE  0
-#elif defined(__mc68000__)
-#define SHM_LOCK_VALUE    0x80000000
-#define SHM_UNLOCK_VALUE  0
-#define SHM_LOCK_VALUE    0x80000000
-#define SHM_UNLOCK_VALUE  0
-#elif defined(__i386__)
-#define SHM_LOCK_VALUE    0x80000000
-#define SHM_UNLOCK_VALUE  0
-#elif defined(__mips__)
-#define SHM_LOCK_VALUE    0x80000000
-#define SHM_UNLOCK_VALUE  0
-#elif defined(__hppa__)
-#define SHM_LOCK_VALUE    0
-#define SHM_UNLOCK_VALUE  1
-#elif defined(__PPC__)
-#define SHM_LOCK_VALUE    1
-#define SHM_UNLOCK_VALUE  0
-#elif defined(__unix__)
-#define SHM_LOCK_VALUE    0
-#define SHM_UNLOCK_VALUE  1
-#elif defined(no_cpu)               /* for this values are irrelevant */
-#define SHM_LOCK_VALUE    1
-#define SHM_UNLOCK_VALUE  0
-#else
-#error "shm.h - no SHM_LOCK_VALUE defined for this CPU architecture"
-#endif
-
-#define Shm_Convert( value ) \
-  ((Shm_Configuration->convert) ? \
-    (*Shm_Configuration->convert)(value) : (value))
-
-/* constants */
-
-#define SHM_MASTER                  1     /* master initialization node */
-#define SHM_FIRST_NODE              1
-
-/* size constants */
-
-#define KILOBYTE          (1024)
-#define MEGABYTE          (1024*1024)
-
-/* inter-node interrupt values */
-
-#define NO_INTERRUPT            0     /* used for polled nodes */
-#define BYTE                    1
-#define WORD                    2
-#define LONG                    4
-
-/* operational mode constants -- used in SHM Configuration Table */
-#define POLLED_MODE             0
-#define INTR_MODE               1
-
-/* error codes */
-
-#define NO_ERROR                0
-#define SHM_NO_FREE_PKTS        0xf0000
-
-/* null pointers of different types */
-
-#define NULL_ENV_CB             ((Shm_Envelope_control *) 0)
-#define NULL_CONVERT            0
-
-/*
- * size of stuff before preamble in envelope.
- * It must be a constant since we will use it to generate MAX_PACKET_SIZE
- */
- 
-#define SHM_ENVELOPE_PREFIX_OVERHEAD    (4 * sizeof(vol_u32))
-
-/*
- *  The following is adjusted so envelopes are MAX_ENVELOPE_SIZE bytes long.
- *  It must be >= RTEMS_MINIMUM_PACKET_SIZE in mppkt.h.
- */
- 
-#ifndef MAX_ENVELOPE_SIZE
-#define MAX_ENVELOPE_SIZE 0x180
-#endif
-
-#define MAX_PACKET_SIZE  (MAX_ENVELOPE_SIZE -               \
-                          SHM_ENVELOPE_PREFIX_OVERHEAD +    \
-                          sizeof(Shm_Envelope_preamble) +   \
-                          sizeof(Shm_Envelope_postamble))
-
-
-/* constants pertinent to Locked Queue routines */
-
-#define LQ_UNLOCKED              SHM_UNLOCK_VALUE
-#define LQ_LOCKED                SHM_LOCK_VALUE
-
-/* constants related to the Free Envelope Pool */
-
-#define FREE_ENV_POOL            0
-#define FREE_ENV_CB              (&Shm_Locked_queues[ FREE_ENV_POOL ])
-
-/*  The following are important when dealing with
- *  the shared memory communications interface area.
- *
- *  NOTE: The starting address and length of the shared memory
- *        is defined in a system dependent file.
- */
-
-#define START_NS_CBS     ((void *)Shm_Configuration->base)
-#define START_LQ_CBS     ((START_NS_CBS) + \
-        ( (sizeof (Shm_Node_status_control)) * (Shm_Maximum_nodes + 1) ) )
-#define START_ENVELOPES  ( ((void *) START_LQ_CBS) + \
-        ( (sizeof (Shm_Locked_queue_Control)) * (Shm_Maximum_nodes + 1) ) )
-#define END_SHMCI_AREA    ( (void *) START_ENVELOPES + \
-        ( (sizeof (Shm_Envelope_control)) * Shm_Maximum_envelopes ) )
-#define END_SHARED_MEM   (START_NS_CBS+Shm_Configuration->length)
-
-/* macros */
-
-#define Shm_Is_master_node()  \
-  ( SHM_MASTER == Shm_Local_node )
-
-#define Shm_Free_envelope( ecb ) \
-  Shm_Locked_queue_Add( FREE_ENV_CB, (ecb) )
-#define Shm_Allocate_envelope() \
-  Shm_Locked_queue_Get(FREE_ENV_CB)
-
-#define Shm_Initialize_receive_queue(node) \
-  Shm_Locked_queue_Initialize( &Shm_Locked_queues[node], node )
-
-#define Shm_Append_to_receive_queue(node, ecb) \
-  Shm_Locked_queue_Add( &Shm_Locked_queues[node], (ecb) )
-
-#define Shm_Envelope_control_to_packet_prefix_pointer(ecb)  \
-   ((void *)(ecb)->packet)
-
-#define Shm_Packet_prefix_to_envelope_control_pointer( pkt )   \
-   ((Shm_Envelope_control *)((rtems_unsigned8 *)(pkt) - \
-   (sizeof(Shm_Envelope_preamble) + SHM_ENVELOPE_PREFIX_OVERHEAD)))
-
-#define Shm_Build_preamble(ecb, node) \
-       (ecb)->Preamble.endian = Shm_Configuration->format
-
-#define Shm_Build_postamble( ecb )
-
-/* volatile types */
-
-typedef volatile rtems_unsigned8  vol_u8;
-typedef volatile rtems_unsigned32 vol_u32;
-
-/* shm control information */
-
-struct shm_info {
-  vol_u32 not_currently_used_0;
-  vol_u32 not_currently_used_1;
-  vol_u32 not_currently_used_2;
-  vol_u32 not_currently_used_3;
-};
-
-typedef struct {
-  /*byte start_of_text;*/
-  vol_u32 endian;
-  vol_u32 not_currently_used_0;
-  vol_u32 not_currently_used_1;
-  vol_u32 not_currently_used_2;
-} Shm_Envelope_preamble;
-
-typedef struct {
-} Shm_Envelope_postamble;
-
-/* WARNING! If you change this structure, don't forget to change
- *          SHM_ENVELOPE_PREFIX_OVERHEAD and
- *          Shm_Packet_prefix_to_envelope_control_pointer() above.
- */
-
-/*  This comment block describes the contents of each field
- *  of the Envelope Control Block:
- *
- *  next      - The index of the next envelope on this queue.
- *  queue     - The index of the queue this envelope is on.
- *  index     - The index of this envelope.
- *  Preamble  - Generic packet preamble.  One day this structure
- *              could be enhanced to contain routing information.
- *  packet    - RTEMS MPCI packet.  Untouched by SHM Driver
- *              other than copying and format conversion as
- *              documented in the RTEMS User's Guide.
- *  Postamble - Generic packet postamble.  One day this structure
- *              could be enhanced to contain checksum information.
- */
-
-typedef struct {
-  vol_u32           next;     /* next envelope on queue       */
-  vol_u32           queue;    /* queue on which this resides  */
-  vol_u32           index;    /* index into array of envelopes*/
-  vol_u32           pad0;     /* insure the next one is aligned */
-  Shm_Envelope_preamble    Preamble; /* header information           */
-  vol_u8            packet[MAX_PACKET_SIZE]; /* RTEMS INFO    */
-  Shm_Envelope_postamble   Postamble;/* trailer information          */
-} Shm_Envelope_control;
-
-/*  This comment block describes the contents of each field
- *  of the Locked Queue Control Block:
- *
- *  lock      - Lock used to insure mutually exclusive access.
- *  front     - Index of first envelope on queue.  This field
- *              is used to remove head of queue (receive).
- *  rear      - Index of last envelope on queue.  This field
- *              is used to add evelope to queue (send).
- *  owner     - The node number of the recipient (owning) node.
- *              RTEMS does not use the node number zero (0).
- *              The zero node is used by the SHM Driver for the
- *              Free Envelope Queue shared by all nodes.
- */
-
-typedef struct {
-  vol_u32 lock;  /* lock field for this queue    */
-  vol_u32 front; /* first envelope on queue      */
-  vol_u32 rear;  /* last envelope on queue       */
-  vol_u32 owner; /* receiving (i.e. owning) node */
-} Shm_Locked_queue_Control;
-
-/*  This comment block describes the contents of each field
- *  of the Node Status Control Block:
- *
- *  status    - Node status.  Current values are Pending Initialization,
- *              Initialization Complete, and Active Node.  Other values
- *              could be added to enhance fault tolerance.
- *  error     - Zero if the node has not failed.  Otherwise,
- *              this field contains a status indicating the
- *              failure reason.
- *  int_address, int_value, and int_length
- *            - These field are the Interrupt Information table
- *              for this node in neutral format.  This is how
- *              each node knows how to generate interrupts.
- */
-
-typedef struct {
-  vol_u32  status;         /* node status information     */
-  vol_u32  error;          /* fatal error code            */
-  vol_u32  int_address;    /* write here for interrupt    */
-  vol_u32  int_value;      /* this value causes interrupt */
-  vol_u32  int_length;     /* for this length (0,1,2,4)   */
-  vol_u32  not_currently_used_0;
-  vol_u32  not_currently_used_1;
-  vol_u32  not_currently_used_2;
-} Shm_Node_status_control;
-
-/*  This comment block describes the contents of each field
- *  of the Interrupt Information Table.  This table describes
- *  how another node can generate an interrupt to this node.
- *  This information is target board dependent.  If the
- *  SHM Driver is in POLLED_MODE, then all fields should
- *  be initialized to NO_INTERRUPT.
- *
- *  address   - The address to which another node should
- *              write to cause an interrupt.
- *  value     - The value which must be written
- *  length    - The size of the value to write.  Valid
- *              values are BYTE, WORD, and LONG.
- *
- *  NOTE:  The Node Status Control Block contains this
- *         information in neutral format and not in a
- *         structure to avoid potential alignment problems.
- */
-
-typedef struct {
-  vol_u32 *address;        /* write here for interrupt    */
-  vol_u32  value;          /* this value causes interrupt */
-  vol_u32  length;         /* for this length (0,1,2,4)   */
-} Shm_Interrupt_information;
-
-/*  SHM Configuration Table
- *
- *  This comment block describes the contents of each field
- *  of the SHM Configuration Table.
- *
- *  base       - The base address of the shared memory.  This
- *               address may be specific to this node.
- *  length     - The length of the shared memory in bytes.
- *  format     - The natural format for rtems_unsigned32's in the
- *               shared memory.  Valid values are currently
- *               only SHM_LITTLE and SHM_BIG.
- *  convert    - The address of the routine which converts
- *               between neutral and local format.
- *  poll_intr  - The operational mode of the driver.  Some
- *               target boards may not provide hardware for
- *               an interprocessor interrupt.  If POLLED_MODE
- *               is selected, the SHM driver will install a
- *               wrapper around the Clock_isr() to poll for
- *               incoming packets.  Throughput is dependent
- *               on the time between clock interrupts.
- *               Valid values are POLLED_MODE and INTR_MODE.
- *  cause_intr - This is the address of the routine used to
- *               write to a particular address and cause an
- *               interrupt on another node.  This routine
- *               may need to be target dependent if something
- *               other than a normal write from C does not work.
- *  Intr       - This structure describes the operation required
- *               to cause an interrupt to this node.  The actual
- *               contents of this structure are described above.
- */
-
-struct shm_config_info {
-  vol_u32           *base;     /* base address of SHM         */
-  vol_u32            length;   /* length (in bytes) of SHM    */
-  vol_u32            format;   /* SHM is big or little endian */
-  vol_u32          (*convert)();/* neutral conversion routine */
-  vol_u32            poll_intr;/* POLLED or INTR driven mode  */
-  void             (*cause_intr)( rtems_unsigned32 );
-  Shm_Interrupt_information   Intr;     /* cause intr information      */
-};
-
-typedef struct shm_config_info shm_config_table;
-
-/* global variables */
-
-#ifdef _SHM_INIT
-#define SHM_EXTERN
-#else
-#define SHM_EXTERN extern
-#endif
-
-SHM_EXTERN shm_config_table             *Shm_Configuration;
-SHM_EXTERN Shm_Interrupt_information    *Shm_Interrupt_table;
-SHM_EXTERN Shm_Node_status_control      *Shm_Node_statuses;
-SHM_EXTERN Shm_Locked_queue_Control     *Shm_Locked_queues;
-SHM_EXTERN Shm_Envelope_control         *Shm_Envelopes;
-SHM_EXTERN rtems_configuration_table    *Shm_RTEMS_Configuration;
-SHM_EXTERN rtems_multiprocessing_table  *Shm_RTEMS_MP_Configuration;
-SHM_EXTERN rtems_unsigned32              Shm_Receive_message_count;
-SHM_EXTERN rtems_unsigned32              Shm_Null_message_count;
-SHM_EXTERN rtems_unsigned32              Shm_Interrupt_count;
-SHM_EXTERN rtems_unsigned32              Shm_Local_node;
-SHM_EXTERN Shm_Locked_queue_Control      *Shm_Local_receive_queue;
-SHM_EXTERN Shm_Node_status_control       *Shm_Local_node_status;
-SHM_EXTERN rtems_unsigned32              Shm_isrstat;
-                                                     /* reported by shmdr */
-
-SHM_EXTERN rtems_unsigned32 Shm_Pending_initialization;
-SHM_EXTERN rtems_unsigned32 Shm_Initialization_complete;
-SHM_EXTERN rtems_unsigned32 Shm_Active_node;
-
-SHM_EXTERN rtems_unsigned32 Shm_Maximum_nodes;
-SHM_EXTERN rtems_unsigned32 Shm_Maximum_envelopes;
-
-SHM_EXTERN rtems_unsigned32 Shm_Locked_queue_End_of_list;
-SHM_EXTERN rtems_unsigned32 Shm_Locked_queue_Not_on_list;
-
-/* functions */
-
-/* locked queue routines */
-void           Shm_Locked_queue_Add(
-                  Shm_Locked_queue_Control *, Shm_Envelope_control * );
-Shm_Envelope_control *Shm_Locked_queue_Get( Shm_Locked_queue_Control * );
-void           Shm_Locked_queue_Initialize(
-                  Shm_Locked_queue_Control *, rtems_unsigned32 );
-            /* Shm_Initialize_lock is CPU dependent */
-            /* Shm_Lock is CPU dependent */
-            /* Shm_Unlock is CPU dependent */
-
-/* portable routines */
-void           Init_env_pool();
-void           Shm_Print_statistics( void );
-void           MPCI_Fatal( Internal_errors_Source, boolean, rtems_unsigned32 );
-rtems_task     Shm_Cause_interrupt( rtems_unsigned32 );
-void           Shm_Poll();
-void           Shm_setclockvec();
-void           Shm_Convert_packet( rtems_packet_prefix * );
-
-/* CPU specific routines are inlined in shmcpu.h */
-
-/* target specific routines */
-void          *Shm_Convert_address( void * );
-void           Shm_Get_configuration( rtems_unsigned32, shm_config_table ** );
-void           Shm_isr();
-void           Shm_setvec( void );
-
-void           Shm_Initialize_lock( Shm_Locked_queue_Control * );
-void           Shm_Lock( Shm_Locked_queue_Control * );
-void           Shm_Unlock( Shm_Locked_queue_Control * );
-
-/* MPCI entry points */
-rtems_mpci_entry Shm_Get_packet(
-  rtems_packet_prefix **
-);
-
-rtems_mpci_entry Shm_Initialization( void );
-
-rtems_mpci_entry Shm_Receive_packet(
-  rtems_packet_prefix **
-);
-
-rtems_mpci_entry Shm_Return_packet(
-  rtems_packet_prefix *
-);
-
-rtems_mpci_entry Shm_Send_packet(
-  rtems_unsigned32,
-  rtems_packet_prefix *
-);
-
-extern rtems_mpci_table MPCI_table;
-
-#ifdef _SHM_INIT
-
-/* multiprocessor communications interface (MPCI) table */
-
-rtems_mpci_table MPCI_table  = {
-  100000,                     /* default timeout value in ticks */
-  MAX_PACKET_SIZE,            /* maximum packet size */
-  Shm_Initialization,         /* initialization procedure   */
-  Shm_Get_packet,             /* get packet procedure       */
-  Shm_Return_packet,          /* return packet procedure    */
-  Shm_Send_packet,            /* packet send procedure      */
-  Shm_Receive_packet          /* packet receive procedure   */
-};
-
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/c/src/lib/libbsp/sparc/erc32/start/Makefile.in b/c/src/lib/libbsp/sparc/erc32/start/Makefile.in
deleted file mode 100644
index dbc9cea9e3..0000000000
--- a/c/src/lib/libbsp/sparc/erc32/start/Makefile.in
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-PGMS=${ARCH}/startsis.o
-
-# C source names, if any, go here -- minus the .c
-C_PIECES=
-C_FILES=$(C_PIECES:%=%.c)
-C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
-
-H_FILES=
-
-# Assembly source names, if any, go here -- minus the .s
-S_PIECES=startsis
-S_FILES=$(S_PIECES:%=%.s)
-S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
-
-SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES)
-OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
-
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES  +=
-CPPFLAGS +=
-CFLAGS   +=
-
-LD_PATHS  +=
-LD_LIBS   +=
-LDFLAGS   +=
-
-#
-# Add your list of files to delete here.  The config files
-#  already know how to delete some stuff, so you may want
-#  to just run 'make clean' first to see what gets missed.
-#  'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
-
-all:	${ARCH} $(SRCS) $(OBJS) $(PGM)
-	$(INSTALL_VARIANT) -m 555 ${PGMS} ${PROJECT_RELEASE}/lib
diff --git a/c/src/lib/libbsp/sparc/erc32/start/startsis.s b/c/src/lib/libbsp/sparc/erc32/start/startsis.s
deleted file mode 100644
index 6097c4ab36..0000000000
--- a/c/src/lib/libbsp/sparc/erc32/start/startsis.s
+++ /dev/null
@@ -1,309 +0,0 @@
-/*
- *  startsis.s
- *
- *  Start code for the ERC32.
- *
- *  This is based on the file srt0.s provided with the binary
- *  distribution of the SPARC Instruction Simulator (SIS) found
- *  at ftp://ftp.estec.esa.nl/pub/ws/wsd/erc32.
- *
- *  $Id$
- */
-
-#include <asm.h>
-#include <erc32.h>
-
-/*
- *  Unexpected trap will halt the processor by forcing it to error state
- */
-
-#define BAD_TRAP \
-  ta 0; \
-  nop; \
-  nop; \
-  nop;
-
-/*
- *  Software trap. Treat as BAD_TRAP for the time being...
- */
-
-#define SOFT_TRAP BAD_TRAP
-
-
-  .seg    "text"
-  PUBLIC(start)
-  .global start
-
-SYM(start):
-start:
-
-/* 
- *  The trap table has to be the first code in a boot PROM.  But because
- *  the Memory Configuration comes up thinking we only have 4K of PROM, we
- *  cannot have a full trap table and still have room left over to 
- *  reprogram the Memory Configuration register correctly.  This file
- *  uses an abbreviated trap which has every entry which might be used
- *  before RTEMS installs its own trap table.
- */
-
-
-  PUBLIC(trap_table)
-SYM(trap_table):
-
-  RTRAP( 0, SYM(hard_reset) );                   ! 00 reset trap 
-  BAD_TRAP;                                     ! 01 instruction access 
-                                                !    exception
-  BAD_TRAP;                                     ! 02 illegal instruction
-  BAD_TRAP;                                     ! 03 privileged instruction
-  BAD_TRAP;                                     ! 04 fp disabled
-  TRAP( 5, SYM(window_overflow_trap_handler) ); ! 05 window overflow
-  TRAP( 6, SYM(window_underflow_trap_handler) );! 06 window underflow
-  BAD_TRAP;                                     ! 07 memory address not aligned
-  BAD_TRAP;                                     ! 08 fp exception
-  BAD_TRAP;                                     ! 09 data access exception
-  BAD_TRAP;                                     ! 0A tag overflow
-  BAD_TRAP;                                     ! 0B undefined
-  BAD_TRAP;                                     ! 0C undefined
-  BAD_TRAP;                                     ! 0D undefined
-  BAD_TRAP;                                     ! 0E undefined
-  BAD_TRAP;                                     ! 0F undefined
-  BAD_TRAP;                                     ! 10 undefined
-
-  /* 
-   *  ERC32 defined traps
-   */
-
-  BAD_TRAP;                                     ! 11 masked errors
-  BAD_TRAP;                                     ! 12 external 1
-  BAD_TRAP;                                     ! 13 external 2
-  BAD_TRAP;                                     ! 14 UART A RX/TX
-  BAD_TRAP;                                     ! 15 UART B RX/TX
-  BAD_TRAP;                                     ! 16 correctable memory error
-  BAD_TRAP;                                     ! 17 UART error
-  BAD_TRAP;                                     ! 18 DMA access error
-  BAD_TRAP;                                     ! 19 DMA timeout
-  BAD_TRAP;                                     ! 1A external 3
-  BAD_TRAP;                                     ! 1B external 4
-  BAD_TRAP;                                     ! 1C general purpose timer
-  BAD_TRAP;                                     ! 1D real time clock
-  BAD_TRAP;                                     ! 1E external 5
-  BAD_TRAP;                                     ! 1F watchdog timeout
-
-
-  BAD_TRAP; BAD_TRAP; BAD_TRAP; BAD_TRAP;       ! 20 - 23 undefined
-  BAD_TRAP;                                     ! 24 cp_disabled
-            BAD_TRAP; BAD_TRAP; BAD_TRAP;       ! 25 - 27 undefined
-  BAD_TRAP;                                     ! 28 cp_exception
-            BAD_TRAP; BAD_TRAP; BAD_TRAP;       ! 29 - 2B undefined
-  BAD_TRAP; BAD_TRAP; BAD_TRAP; BAD_TRAP;       ! 2C - 2F undefined
-  BAD_TRAP; BAD_TRAP; BAD_TRAP; BAD_TRAP;       ! 30 - 33 undefined
-  BAD_TRAP; BAD_TRAP; BAD_TRAP; BAD_TRAP;       ! 34 - 37 undefined
-  BAD_TRAP; BAD_TRAP; BAD_TRAP; BAD_TRAP;       ! 38 - 3B undefined
-  BAD_TRAP; BAD_TRAP; BAD_TRAP; BAD_TRAP;       ! 3C - 3F undefined
-  BAD_TRAP; BAD_TRAP; BAD_TRAP; BAD_TRAP;       ! 40 - 43 undefined
-  BAD_TRAP; BAD_TRAP; BAD_TRAP; BAD_TRAP;       ! 44 - 47 undefined
-  BAD_TRAP; BAD_TRAP; BAD_TRAP; BAD_TRAP;       ! 48 - 4B undefined
-  BAD_TRAP; BAD_TRAP; BAD_TRAP; BAD_TRAP;       ! 4C - 4F undefined
-  BAD_TRAP; BAD_TRAP; BAD_TRAP; BAD_TRAP;       ! 50 - 53 undefined
-  BAD_TRAP; BAD_TRAP; BAD_TRAP; BAD_TRAP;       ! 54 - 57 undefined
-  BAD_TRAP; BAD_TRAP; BAD_TRAP; BAD_TRAP;       ! 58 - 5B undefined
-  BAD_TRAP; BAD_TRAP; BAD_TRAP; BAD_TRAP;       ! 5C - 5F undefined
-  BAD_TRAP; BAD_TRAP; BAD_TRAP; BAD_TRAP;       ! 60 - 63 undefined
-  BAD_TRAP; BAD_TRAP; BAD_TRAP; BAD_TRAP;       ! 64 - 67 undefined
-  BAD_TRAP; BAD_TRAP; BAD_TRAP; BAD_TRAP;       ! 68 - 6B undefined
-  BAD_TRAP; BAD_TRAP; BAD_TRAP; BAD_TRAP;       ! 6C - 6F undefined
-  BAD_TRAP; BAD_TRAP; BAD_TRAP; BAD_TRAP;       ! 70 - 73 undefined
-  BAD_TRAP; BAD_TRAP; BAD_TRAP; BAD_TRAP;       ! 74 - 77 undefined
-  BAD_TRAP; BAD_TRAP; BAD_TRAP; BAD_TRAP;       ! 78 - 7B undefined
-
-/* 
-   This is a sad patch to make sure that we know where the
-   MEC timer control register mirror is so we can stop the timers
-   from an external debugger. It is needed because the control
-   register is write-only. Trap 0x7C cannot occure in ERC32...
-
-   We also use this location to store the last location of the
-   usable RAM in order not to overwrite the remote debugger with
-   the RTEMS work-space area.
-
-*/
-
-	.global __ERC32_MEC_Timer_Control_Mirror, _rdb_start, _CLOCK_SPEED
-
-_rdb_start:
-__ERC32_MEC_Timer_Control_Mirror:
-
-  BAD_TRAP; BAD_TRAP;                           ! 7C - 7D undefined
-
-_CLOCK_SPEED:
-  BAD_TRAP; BAD_TRAP; ! BAD_TRAP; BAD_TRAP;       ! 7E - 7F undefined
-
-  /* 
-   *  Software traps
-   *
-   *  NOTE: At the risk of being redundant... this is not a full
-   *        table.  The setjmp on the SPARC requires a window flush trap
-   *        handler and RTEMS will preserve the entries that were
-   *        installed before.
-   */
-
-  SOFT_TRAP; SOFT_TRAP; SOFT_TRAP;              ! 80 - 82
-  TRAP( 0x83, SYM(window_flush_trap_handler) ); ! 83 flush windows SW trap
-
-  SOFT_TRAP; SOFT_TRAP; SOFT_TRAP; SOFT_TRAP;   ! 84 - 87
-  SOFT_TRAP; SOFT_TRAP; SOFT_TRAP; SOFT_TRAP;   ! 88 - 8B
-  SOFT_TRAP; SOFT_TRAP; SOFT_TRAP; SOFT_TRAP;   ! 8C - 8F
-  SOFT_TRAP; SOFT_TRAP; SOFT_TRAP; SOFT_TRAP;   ! 90 - 93
-  SOFT_TRAP; SOFT_TRAP; SOFT_TRAP; SOFT_TRAP;   ! 94 - 97
-  SOFT_TRAP; SOFT_TRAP; SOFT_TRAP; SOFT_TRAP;   ! 98 - 9B
-  SOFT_TRAP; SOFT_TRAP; SOFT_TRAP; SOFT_TRAP;   ! 9C - 9F
-  SOFT_TRAP; SOFT_TRAP; SOFT_TRAP; SOFT_TRAP;   ! A0 - A3
-  SOFT_TRAP; SOFT_TRAP; SOFT_TRAP; SOFT_TRAP;   ! A4 - A7
-  SOFT_TRAP; SOFT_TRAP; SOFT_TRAP; SOFT_TRAP;   ! A8 - AB
-  SOFT_TRAP; SOFT_TRAP; SOFT_TRAP; SOFT_TRAP;   ! AC - AF
-  SOFT_TRAP; SOFT_TRAP; SOFT_TRAP; SOFT_TRAP;   ! B0 - B3
-  SOFT_TRAP; SOFT_TRAP; SOFT_TRAP; SOFT_TRAP;   ! B4 - B7
-  SOFT_TRAP; SOFT_TRAP; SOFT_TRAP; SOFT_TRAP;   ! B8 - BB
-  SOFT_TRAP; SOFT_TRAP; SOFT_TRAP; SOFT_TRAP;   ! BC - BF
-  SOFT_TRAP; SOFT_TRAP; SOFT_TRAP; SOFT_TRAP;   ! C0 - C3
-  SOFT_TRAP; SOFT_TRAP; SOFT_TRAP; SOFT_TRAP;   ! C4 - C7
-  SOFT_TRAP; SOFT_TRAP; SOFT_TRAP; SOFT_TRAP;   ! C8 - CB
-  SOFT_TRAP; SOFT_TRAP; SOFT_TRAP; SOFT_TRAP;   ! CC - CF
-  SOFT_TRAP; SOFT_TRAP; SOFT_TRAP; SOFT_TRAP;   ! D0 - D3
-  SOFT_TRAP; SOFT_TRAP; SOFT_TRAP; SOFT_TRAP;   ! D4 - D7
-  SOFT_TRAP; SOFT_TRAP; SOFT_TRAP; SOFT_TRAP;   ! D8 - DB
-  SOFT_TRAP; SOFT_TRAP; SOFT_TRAP; SOFT_TRAP;   ! DC - DF
-  SOFT_TRAP; SOFT_TRAP; SOFT_TRAP; SOFT_TRAP;   ! E0 - E3
-  SOFT_TRAP; SOFT_TRAP; SOFT_TRAP; SOFT_TRAP;   ! E4 - E7
-  SOFT_TRAP; SOFT_TRAP; SOFT_TRAP; SOFT_TRAP;   ! E8 - EB
-  SOFT_TRAP; SOFT_TRAP; SOFT_TRAP; SOFT_TRAP;   ! EC - EF
-  SOFT_TRAP; SOFT_TRAP; SOFT_TRAP; SOFT_TRAP;   ! F0 - F3
-  SOFT_TRAP; SOFT_TRAP; SOFT_TRAP; SOFT_TRAP;   ! F4 - F7
-  SOFT_TRAP; SOFT_TRAP; SOFT_TRAP; SOFT_TRAP;   ! F8 - FB
-  SOFT_TRAP; SOFT_TRAP; SOFT_TRAP; SOFT_TRAP;   ! FC - FF
-
-/*
- *  This is the hard reset code.
- */
-
-#define PSR_INIT   0x10c0       /* Disable traps, set s and ps */
-#define WIM_INIT   2
-#define STACK_SIZE 16 * 1024
-
-        PUBLIC(hard_reset)
-SYM(hard_reset):
-
-        set     _trap_table, %g1           ! Initialize TBR
-        mov     %g1, %tbr
-
-	set	(SYM(rdb_start)), %g6	   ! End of work-space area
-	st	%sp, [%g6]
-
-
-/* Check if MEC is initialised. If not, this means that we are
-   running on the simulator. Initiate some of the parameters
-   that are done by the boot-prom otherwise.
-*/
-
-        set     SYM(ERC32_MEC), %g3  ! g3 = base address of peripherals
-	ld	[%g3], %g2		
-	set	0xfe080000, %g1
-	andcc	%g1, %g2, %g0
-	bne	1f
-	set	0x00101000, %g1		! 2M ROM, 4M RAM
-                                         ! set the Memory Configuration
-        st     %g1, [ %g3 + ERC32_MEC_MEMORY_CONFIGURATION_OFFSET ]
-        
-	set	SYM(RAM_END), %sp	   ! End of work-space area
-	st	%sp, [%g6]
-
-	set	_CLOCK_SPEED, %g6	! Use 14 MHz in simulator
-	set	14, %g1
-	st	%g1, [%g6]
-
-/* Common initialisation */
-1:
-        set     WIM_INIT, %g1           ! Initialize WIM
-        mov     %g1, %wim               
-
-        set     PSR_INIT, %g1
-        wr      %g1, 0x20, %psr         ! enable traps
-
-        nop
-        nop
-        nop
-
-        sethi   %hi(stack_space + STACK_SIZE), %g1
-        or      %g1,%lo(stack_space + STACK_SIZE),%g1 
-                                        ! g1 = top of stack
-        mov     %g1, %sp                ! Set stack pointer
-        mov     %sp, %fp                ! Set frame pointer
-        nop
-
-        /*
-         *  Copy the initialized data to RAM
-         *
-         *  FROM:   _endtext 
-         *  TO:     _data_start 
-         *  LENGTH: (__bss_start - _data_start) bytes
-         */
- 
-
-        sethi %hi(_endtext),%g2
-        or    %g2,%lo(_endtext),%g2     ! g2 = start of initialized data in ROM
-
-        sethi %hi(_data_start),%g3
-        or    %g3,%lo(_data_start),%g3  ! g3 = start of initialized data in RAM
-
-        sethi %hi(__bss_start),%g4
-        or    %g4,%lo(__bss_start),%g4  ! g4 = end of initialized data in RAM
-
-	cmp   %g2, %g3
-	be    1f
-	nop
-
-copy_data:
-        ldd   [ %g2 ], %g6
-        std   %g6 , [ %g3 ]             ! copy this double word
-        add   %g3, 8, %g3               ! bump the destination pointer
-        add   %g2, 8, %g2               ! bump the source pointer
-        cmp   %g3, %g4                  ! Is the pointer past the end of dest?
-        bl    copy_data
-        nop
-
-        /* clear the bss */
-1:
-
-        sethi %hi(_edata),%g2
-        or    %g2,%lo(_edata),%g2       ! g2 = start of bss
-        sethi %hi(_end),%g3
-        or    %g3,%lo(_end),%g3         ! g3 = end of bss
-        mov   %g0,%g1                   ! so std has two zeros
-zerobss:
-        std    %g0,[%g2]
-        add    %g2,8,%g2
-        cmp    %g2,%g3
-        bleu,a zerobss
-        nop
-
-        mov     %0, %o2                 ! environ
-        mov     %0, %o1                 ! argv
-        mov     %0, %o0                 ! argc
-        call    SYM(boot_card)
-        sub     %sp, 0x60, %sp          ! room for boot_card to save args
-        nop
-
-        PUBLIC(BSP_fatal_return)
-SYM(BSP_fatal_return):
-        ta      0                       ! Halt if _main returns ...
-        nop
-
-        /*
-         *  There does not seem to be a way to get this aligned AND
-         *  in the BSS.
-         */
- 
-        .align  32
-        .comm   stack_space, STACK_SIZE
-
-/* end of file */
diff --git a/c/src/lib/libc/assoc.c b/c/src/lib/libc/assoc.c
deleted file mode 100644
index 74387a8c5b..0000000000
--- a/c/src/lib/libc/assoc.c
+++ /dev/null
@@ -1,260 +0,0 @@
-/*
- * assoc.c
- *      rtems assoc routines
- *
- *  $Id$
- */
-
-#include <rtems.h>
-#include "assoc.h"
-
-#include <stdio.h>              /* sprintf */
-#include <string.h>             /* strcat, strcmp */
-
-#define STREQ(a,b)      (strcmp((a), (b)) == 0)
-#define rtems_assoc_is_default(ap)  ((ap)->name && STREQ(ap->name, RTEMS_ASSOC_DEFAULT_NAME))
-
-const rtems_assoc_t *
-rtems_assoc_ptr_by_name(
-    const rtems_assoc_t *ap,
-    const char *name
-  )
-{
-    const rtems_assoc_t *default_ap = 0;
-
-    if (rtems_assoc_is_default(ap))
-        default_ap = ap++;
-    
-    for ( ; ap->name; ap++)
-        if (strcmp(ap->name, name) == 0)
-            return ap;
-
-    return default_ap;
-}
-
-const rtems_assoc_t *
-rtems_assoc_ptr_by_local(
-    const rtems_assoc_t *ap,
-    unsigned32     local_value
-  )
-{
-    const rtems_assoc_t *default_ap = 0;
-
-    if (rtems_assoc_is_default(ap))
-        default_ap = ap++;
-    
-    for ( ; ap->name; ap++)
-        if (ap->local_value == local_value)
-            return ap;
-
-    return default_ap;
-}
-
-
-const rtems_assoc_t *
-rtems_assoc_ptr_by_remote(
-    const rtems_assoc_t *ap,
-    unsigned32     remote_value
-  )
-{
-    const rtems_assoc_t *default_ap = 0;
-
-    if (rtems_assoc_is_default(ap))
-        default_ap = ap++;
-    
-    for ( ; ap->name; ap++)
-        if (ap->remote_value == remote_value)
-            return ap;
-
-    return default_ap;
-}
-
-
-/*
- * Get values
- */
-
-unsigned32
-rtems_assoc_remote_by_local(
-    const rtems_assoc_t *ap,
-    unsigned32     local_value
-  )
-{
-    const rtems_assoc_t *nap;
-    nap = rtems_assoc_ptr_by_local(ap, local_value);
-    if (nap)
-        return nap->remote_value;
-    
-    return 0;
-}
-
-unsigned32
-rtems_assoc_local_by_remote(
-    const rtems_assoc_t *ap,
-    unsigned32     remote_value
-  )
-{
-    const rtems_assoc_t *nap;
-    nap = rtems_assoc_ptr_by_remote(ap, remote_value);
-    if (nap)
-        return nap->local_value;
-    
-    return 0;
-}
-
-unsigned32
-rtems_assoc_remote_by_name(
-    const rtems_assoc_t *ap,
-    const char          *name
-  )
-{
-    const rtems_assoc_t *nap;
-    nap = rtems_assoc_ptr_by_name(ap, name);
-    if (nap)
-        return nap->remote_value;
-    
-    return 0;
-}
-
-unsigned32
-rtems_assoc_local_by_name(
-    const rtems_assoc_t *ap,
-    const char          *name
-  )
-{
-    const rtems_assoc_t *nap;
-    nap = rtems_assoc_ptr_by_name(ap, name);
-    if (nap)
-        return nap->local_value;
-    
-    return 0;
-}
-
-/*
- * what to return if a value is not found
- * this is not reentrant, but it really shouldn't be invoked anyway
- */
-
-const char *
-rtems_assoc_name_bad(
-    unsigned32 bad_value
-)
-{
-#ifdef RTEMS_DEBUG
-    static char bad_buffer[32];
-
-    sprintf(bad_buffer, "< %d [0x%x] >", bad_value, bad_value);
-#else
-    static char bad_buffer[32] = "<assoc.c: BAD NAME>";
-#endif
-    return bad_buffer;
-}
-
-
-const char *
-rtems_assoc_name_by_local(
-    const rtems_assoc_t *ap,
-    unsigned32     local_value
-  )
-{
-    const rtems_assoc_t *nap;
-    nap = rtems_assoc_ptr_by_local(ap, local_value);
-    if (nap)
-        return nap->name;
-    
-    return rtems_assoc_name_bad(local_value);
-}
-
-const char *
-rtems_assoc_name_by_remote(
-    const rtems_assoc_t *ap,
-    unsigned32     remote_value
-  )
-{
-    const rtems_assoc_t *nap;
-    nap = rtems_assoc_ptr_by_remote(ap, remote_value);
-    if (nap)
-        return nap->name;
-    
-    return rtems_assoc_name_bad(remote_value);
-}
-
-/*
- * Bitfield functions assume just 1 bit set in each of remote and local
- *      entries; they do not check for this.
- */
-
-unsigned32 rtems_assoc_remote_by_local_bitfield(
-    const rtems_assoc_t *ap,
-    unsigned32     local_value
-  )
-{  
-    unsigned32 b;
-    unsigned32 remote_value = 0;
-
-    for (b = 1; b; b <<= 1)
-        if (b & local_value)
-            remote_value |= rtems_assoc_remote_by_local(ap, b);
-        
-    return remote_value;
-}
-
-
-unsigned32 rtems_assoc_local_by_remote_bitfield(
-    const rtems_assoc_t *ap,
-    unsigned32     remote_value
-  )
-{  
-    unsigned32 b;
-    unsigned32 local_value = 0;
-
-    for (b = 1; b; b <<= 1)
-        if (b & remote_value)
-            local_value |= rtems_assoc_local_by_remote(ap, b);
-        
-    return local_value;
-}
-
-char *
-rtems_assoc_name_by_remote_bitfield(
-    const rtems_assoc_t *ap,
-    unsigned32     value,
-    char          *buffer
-  )
-{  
-    unsigned32 b;
-
-    *buffer = 0;
-
-    for (b = 1; b; b <<= 1)
-        if (b & value)
-        {
-            if (*buffer)
-                strcat(buffer, " ");
-            strcat(buffer, rtems_assoc_name_by_remote(ap, b));
-        }
-        
-    return buffer;
-}
-
-char *
-rtems_assoc_name_by_local_bitfield(
-    const rtems_assoc_t *ap,
-    unsigned32     value,
-    char          *buffer
-  )
-{  
-    unsigned32 b;
-
-    *buffer = 0;
-
-    for (b = 1; b; b <<= 1)
-        if (b & value)
-        {
-            if (*buffer)
-                strcat(buffer, " ");
-            strcat(buffer, rtems_assoc_name_by_local(ap, b));
-        }
-        
-    return buffer;
-}
diff --git a/c/src/lib/libc/assoc.h b/c/src/lib/libc/assoc.h
deleted file mode 100644
index 1982d654ac..0000000000
--- a/c/src/lib/libc/assoc.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *
- *  Rtems associativity routines.  Mainly used to convert a value from
- *  one space to another (eg: our errno's to host errno's and v.v)
- *
- *
- *  $Id$
- */
-
-#ifndef _INCLUDE_ASSOC_H
-#define _INCLUDE_ASSOC_H
-
-typedef struct {
-    const char   *name;
-    unsigned32   local_value;
-    unsigned32   remote_value;
-} rtems_assoc_t;
-
-/*
- * Flag/marker for optional default value in each table
- */
-
-#define RTEMS_ASSOC_DEFAULT_NAME "(default)"
-
-const rtems_assoc_t *rtems_assoc_ptr_by_name(const rtems_assoc_t *, const char *);
-const rtems_assoc_t *rtems_assoc_ptr_by_value(const rtems_assoc_t *, unsigned32);
-const rtems_assoc_t *rtems_assoc_ptr_by_remote(const rtems_assoc_t *, unsigned32);
-
-unsigned32   rtems_assoc_remote_by_local(const rtems_assoc_t *, unsigned32);
-unsigned32   rtems_assoc_local_by_remote(const rtems_assoc_t *, unsigned32);
-unsigned32   rtems_assoc_remote_by_name(const rtems_assoc_t *, const char *);
-unsigned32   rtems_assoc_local_by_name(const rtems_assoc_t *, const char *);
-const char  *rtems_assoc_name_by_local(const rtems_assoc_t *, unsigned32);
-const char  *rtems_assoc_name_by_remote(const rtems_assoc_t *, unsigned32);
-
-unsigned32   rtems_assoc_remote_by_local_bitfield(const rtems_assoc_t *, unsigned32);
-char  *rtems_assoc_name_by_local_bitfield(const rtems_assoc_t *, unsigned32, char *);
-char  *rtems_assoc_name_by_remote_bitfield(const rtems_assoc_t *, unsigned32, char *);
-unsigned32   rtems_assoc_local_by_remote_bitfield(const rtems_assoc_t *, unsigned32);
-
-
-#endif /* ! _INCLUDE_ASSOC_H */
diff --git a/c/src/lib/libc/error.c b/c/src/lib/libc/error.c
deleted file mode 100644
index dd32fb8b66..0000000000
--- a/c/src/lib/libc/error.c
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- *  report errors and panics to RTEMS' stderr.
- *  Currently just used by RTEMS monitor.
- *
- *  $Id$
- */
-
-
-/*
- * These routines provide general purpose error reporting.
- * rtems_error reports an error to stderr and allows use of
- * printf style formatting.  A newline is appended to all messages.
- * 
- * error_flag can be specified as any of the following:
- *
- *  	RTEMS_ERROR_ERRNO       -- include errno text in output
- *  	RTEMS_ERROR_PANIC       -- halts local system after output
- *  	RTEMS_ERROR_ABORT       -- abort after output
- *
- * It can also include a rtems_status value which can be OR'd
- * with the above flags. * 
- *
- * EXAMPLE
- *	#include <rtems.h>
- *	#include <rtems/error.h>
- *	rtems_error(0, "stray interrupt %d", intr);
- *
- * EXAMPLE
- *        if ((status = rtems_task_create(...)) != RTEMS_SUCCCESSFUL)
- *        {
- *            rtems_error(status | RTEMS_ERROR_ABORT,
- *                        "could not create task");
- *        }
- *
- * EXAMPLE
- *        if ((fd = open(pathname, O_RDNLY)) < 0)
- *        {
- *            rtems_error(RTEMS_ERROR_ERRNO, "open of '%s' failed", pathname);
- *            goto failed;
- *        }
- */
-
-#define __RTEMS_VIOLATE_KERNEL_VISIBILITY__
-#include <rtems.h>
-
-#include "error.h"
-#include <rtems/assoc.h>
-
-#include <stdio.h>
-#include <stdarg.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>		/* _exit() */
-
-/* bug in hpux <errno.h>: no prototypes unless you are C++ */
-#ifdef hpux9
-char *strerror(int);
-#endif
-
-extern char *rtems_progname;
-int          rtems_panic_in_progress;
-
-rtems_assoc_t rtems_status_assoc[] = {
-    { "successful completion",              RTEMS_SUCCESSFUL, },
-    { "returned from a thread",             RTEMS_TASK_EXITTED, },
-    { "multiprocessing not configured",     RTEMS_MP_NOT_CONFIGURED, },
-    { "invalid object name",                RTEMS_INVALID_NAME, },
-    { "invalid object id",                  RTEMS_INVALID_ID, },
-    { "too many",                           RTEMS_TOO_MANY, },
-    { "timed out waiting",                  RTEMS_TIMEOUT, },
-    { "object deleted while waiting",       RTEMS_OBJECT_WAS_DELETED, },
-    { "specified size was invalid",         RTEMS_INVALID_SIZE, },
-    { "address specified is invalid",       RTEMS_INVALID_ADDRESS, },
-    { "number was invalid",                 RTEMS_INVALID_NUMBER, },
-    { "item has not been initialized",      RTEMS_NOT_DEFINED, },
-    { "resources still outstanding",        RTEMS_RESOURCE_IN_USE, },
-    { "request not satisfied",              RTEMS_UNSATISFIED, },
-    { "thread is in wrong state",           RTEMS_INCORRECT_STATE, },
-    { "thread already in state",            RTEMS_ALREADY_SUSPENDED, },
-    { "illegal on calling thread",          RTEMS_ILLEGAL_ON_SELF, },
-    { "illegal for remote object",          RTEMS_ILLEGAL_ON_REMOTE_OBJECT, },
-    { "called from wrong environment",      RTEMS_CALLED_FROM_ISR, },
-    { "invalid thread priority",            RTEMS_INVALID_PRIORITY, },
-    { "invalid date/time",                  RTEMS_INVALID_CLOCK, },
-    { "invalid node id",                    RTEMS_INVALID_NODE, },
-    { "directive not configured",           RTEMS_NOT_CONFIGURED, },
-    { "not owner of resource",              RTEMS_NOT_OWNER_OF_RESOURCE , },
-    { "directive not implemented",          RTEMS_NOT_IMPLEMENTED, },
-    { "RTEMS inconsistency detected",       RTEMS_INTERNAL_ERROR, },
-    { "could not get enough memory",        RTEMS_NO_MEMORY, },
-    { "internal multiprocessing only",      THREAD_STATUS_PROXY_BLOCKING, },
-    { 0, 0, 0 },
-};
-
-
-const char *
-rtems_status_text(
-    rtems_status_code status
-)
-{
-    return rtems_assoc_name_by_local(rtems_status_assoc, status);
-}
-
-
-static int rtems_verror(
-    unsigned32   error_flag,
-    const char   *printf_format,
-    va_list      arglist
-)
-{
-    int               local_errno = 0;
-    int               chars_written = 0;
-    rtems_status_code status;
-
-    if (error_flag & RTEMS_ERROR_PANIC)
-    {
-        if (rtems_panic_in_progress++)
-            _Thread_Disable_dispatch();       /* disable task switches */
-
-        /* don't aggravate things */
-        if (rtems_panic_in_progress > 2)
-            return 0;
-    }
-
-    (void) fflush(stdout);  	    /* in case stdout/stderr same */
-
-    status = error_flag & ~RTEMS_ERROR_MASK;
-    if (error_flag & RTEMS_ERROR_ERRNO)     /* include errno? */
-        local_errno = errno;
-
-    if (_System_state_Is_multiprocessing)
-        fprintf(stderr, "[%d] ", _Configuration_MP_table->node);
-    
-    if (rtems_progname && *rtems_progname)
-        chars_written += fprintf(stderr, "%s: ", rtems_progname);
-    chars_written += vfprintf(stderr, printf_format, arglist);
-    
-    if (status)
-        chars_written += fprintf(stderr, " (status: %s)", rtems_status_text(status));
-
-    if (local_errno)
-    {
-      if ((local_errno > 0) && *strerror(local_errno))
-        chars_written += fprintf(stderr, " (errno: %s)", strerror(local_errno));
-      else
-        chars_written += fprintf(stderr, " (unknown errno=%d)", local_errno);
-    }
-    
-    chars_written += fprintf(stderr, "\n");
-
-    (void) fflush(stderr);
-
-    if (error_flag & (RTEMS_ERROR_PANIC | RTEMS_ERROR_ABORT))
-    {
-        if (error_flag & RTEMS_ERROR_PANIC)
-        {
-            rtems_error(0, "fatal error, exiting");
-            _exit(local_errno);
-        }
-        else
-        {
-            rtems_error(0, "fatal error, aborting");
-            abort();
-        }
-    }
-    return chars_written;
-}
-
-
-/*
- * Report an error.
- * error_flag is as above; printf_format is a normal
- * printf(3) format string, with its concommitant arguments.
- * 
- * Returns the number of characters written.
- */
-
-int rtems_error(
-    int   error_flag,
-    const char *printf_format,
-    ...
-  )
-{
-    va_list arglist;
-    int chars_written;
-
-    va_start(arglist, printf_format);
-    chars_written = rtems_verror(error_flag, printf_format, arglist);
-    va_end(arglist);
-    
-    return chars_written;
-}
-
-/* 
- * rtems_panic is shorthand for rtems_error(RTEMS_ERROR_PANIC, ...)
- */
-
-void rtems_panic(
-    const char *printf_format,
-    ...
-  )
-{
-    va_list arglist;
-
-    va_start(arglist, printf_format);
-    (void) rtems_verror(RTEMS_ERROR_PANIC, printf_format, arglist);
-    va_end(arglist);
-}
diff --git a/c/src/lib/libc/error.h b/c/src/lib/libc/error.h
deleted file mode 100644
index a0698afb5d..0000000000
--- a/c/src/lib/libc/error.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- *  Defines and externs for rtems error reporting
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_ERROR_h
-#define __RTEMS_ERROR_h
-
-/*
- * rtems_error() and rtems_panic() support
- */
-
-#define RTEMS_ERROR_ERRNO  (1<<((sizeof(int) * 8) - 2)) /* hi bit; use 'errno' */
-#define RTEMS_ERROR_PANIC  (RTEMS_ERROR_ERRNO / 2)       /* err fatal; no return */
-#define RTEMS_ERROR_ABORT  (RTEMS_ERROR_ERRNO / 4)       /* err is fatal; panic */
-
-#define RTEMS_ERROR_MASK  (RTEMS_ERROR_ERRNO | RTEMS_ERROR_ABORT | \
-                             RTEMS_ERROR_PANIC) /* all */
-
-const char *rtems_status_text(rtems_status_code);
-int   rtems_error(int error_code, const char *printf_format, ...);
-#ifdef __GNUC__
-void  rtems_panic(const char *printf_format, ...);
-/*
- *  We should be able to use this attribute but gcc complains that
- *  rtems_panic does in fact return. :(
- *
- *      __attribute__ ((__noreturn__));
- */
-#else
-void  rtems_panic(const char *printf_format, ...);
-#endif
-
-extern int rtems_panic_in_progress;
-
-#endif
-/* end of include file */
diff --git a/c/src/lib/libc/utsname.c b/c/src/lib/libc/utsname.c
deleted file mode 100644
index 7fba3d610f..0000000000
--- a/c/src/lib/libc/utsname.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- *  $Id$
- */
-
-#include <stdio.h>
-#include <string.h>
-
-#include <sys/utsname.h>
-
-#include <rtems/system.h>
-#include <rtems/score/system.h>
-#include <rtems/score/object.h>
-
-/*PAGE
- *
- *  4.4.1 Get System Name, P1003.1b-1993, p. 90
- */
-
-int uname(
-  struct utsname *name
-)
-{
-  /*  XXX: Here is what Solaris returns...
-          sysname = SunOS
-          nodename = node_name
-          release = 5.3
-          version = Generic_101318-12
-          machine = sun4m
-  */
-
-  strcpy( name->sysname, "RTEMS" );
-
-  sprintf( name->nodename, "Node %d\n", _Objects_Local_node );
-
-  /* XXX release string is in BAD format for this routine!!! */ 
-  strcpy( name->release, "3.2.0" );
- 
-  /* XXX does this have any meaning for RTEMS */
-   
-  strcpy( name->release, "" );
-
-  sprintf( name->machine, "%s/%s", CPU_NAME, CPU_MODEL_NAME );
-
-  return 0;
-}
-
-/*PAGE
- *
- *  4.5.2 Get Process Times, P1003.1b-1993, p. 92
- */
-
-clock_t times(
-  struct tms   *buffer
-)
-{
-  return POSIX_NOT_IMPLEMENTED();
-}
diff --git a/c/src/lib/libchip/Makefile.in b/c/src/lib/libchip/Makefile.in
deleted file mode 100644
index a5144ec02d..0000000000
--- a/c/src/lib/libchip/Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/directory.cfg
-
-SUB_DIRS=rtc serial
diff --git a/c/src/lib/libchip/rtc/Makefile.in b/c/src/lib/libchip/rtc/Makefile.in
deleted file mode 100644
index 724a1af380..0000000000
--- a/c/src/lib/libchip/rtc/Makefile.in
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-LIBNAME=librtcio.a
-LIB=${ARCH}/${LIBNAME}
-
-C_PIECES=\
-  rtcprobe \
-  icm7170 icm7170_reg icm7170_reg2 icm7170_reg4 icm7170_reg8 \
-  m48t08 m48t08_reg m48t08_reg2 m48t08_reg4 m48t08_reg8
-
-C_FILES=$(C_PIECES:%=%.c)
-C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
-
-INSTALLED_H_FILES=$(srcdir)/rtc.h \
-    $(srcdir)/icm7170.h $(srcdir)/m48t08.h
-
-SRCS=$(C_FILES) $(H_FILES) $(SYS_H_FILES) $(RTEMS_H_FILES) $(PRIVATE_H_FILES)
-OBJS=$(C_O_FILES)
-
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/lib.cfg
-
-#
-# Add local stuff here using +=
-#
-
-DEFINES  +=
-CPPFLAGS +=
-CFLAGS   += $(LIBC_DEFINES)
-
-#
-# Add your list of files to delete here.  The config files
-#  already know how to delete some stuff, so you may want
-#  to just run 'make clean' first to see what gets missed.
-#  'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS += $(LIB)
-CLOBBER_ADDITIONS +=
-
-all:	${ARCH} preinstall $(LIB)
-	$(INSTALL_VARIANT) -m 644 ${LIB} ${PROJECT_RELEASE}/lib
-
-$(LIB): $(SRCS) ${OBJS}
-	$(make-library)
-
-# Install the library, appending _g or _p as appropriate.
-# for include files, just use $(INSTALL)
-preinstall:
-	$(INSTALL) -m 444 $(INSTALLED_H_FILES) $(PROJECT_INCLUDE)/libchip
-
-
diff --git a/c/src/lib/libchip/rtc/README.ds1643 b/c/src/lib/libchip/rtc/README.ds1643
deleted file mode 100644
index 4fab5b62c6..0000000000
--- a/c/src/lib/libchip/rtc/README.ds1643
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-#  $Id$
-#
-
-The Mostek M48T08 is compatible with the Dallas Semiconductor DS1643.  Please
-use that driver.
-
diff --git a/c/src/lib/libchip/rtc/README.icm7170 b/c/src/lib/libchip/rtc/README.icm7170
deleted file mode 100644
index de2199339d..0000000000
--- a/c/src/lib/libchip/rtc/README.icm7170
+++ /dev/null
@@ -1,52 +0,0 @@
-#
-#  $Id$
-#
-
-
-Configuration Table Use
-=======================
-
-sDeviceName
-
-   The name of this device.
-
-deviceType
-
-   This field must be RTC_ICM7170.
-
-pDeviceFns
-
-   The device interface control table.  This must be icm7170_fns.
-
-deviceProbe
-
-   This is the address of the routine which probes to see if the device
-   is present.
-
-pDeviceParams
-
-    This field specifies the clock frequency.  It may be one of the
-    following:
-        ICM7170_AT_32_KHZ
-        ICM7170_AT_1_MHZ
-        ICM7170_AT_2_MHZ
-        ICM7170_AT_4_MHZ
-
-ulCtrlPort1
-
-   This field is the base address of the RTC area of the chip.
-
-ulCtrlPort2
-
-   This field is ignored.
-
-ulDataPort
-
-   This field is ignored.
-
-
-getRegister
-setRegister
-
-   These follow standard conventions.
-
diff --git a/c/src/lib/libchip/rtc/README.m48t08 b/c/src/lib/libchip/rtc/README.m48t08
deleted file mode 100644
index d792d7957e..0000000000
--- a/c/src/lib/libchip/rtc/README.m48t08
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-#  $Id$
-#
-
-
-Configuration Table Use
-=======================
-
-sDeviceName
-
-   The name of this device.
-
-deviceType
-
-   This field must be RTC_M48T08.
-
-pDeviceFns
-
-   The device interface control table.  This must be m48t08_fns.
-
-deviceProbe
-
-   This is the address of the routine which probes to see if the device
-   is present.
-
-pDeviceParams
-
-    This is ignored and should be NULL.
-
-ulCtrlPort1
-
-   This field is the base address of the RTC area of the chip.  The
-   NVRAM portion of the chip is ignored.
-
-ulCtrlPort2
-
-   This field is ignored.
-
-ulDataPort
-
-   This field is ignored.
-
-
-getRegister
-setRegister
-
-   These follow standard conventions.
-
diff --git a/c/src/lib/libchip/rtc/README.m48t18 b/c/src/lib/libchip/rtc/README.m48t18
deleted file mode 100644
index 85fe918f23..0000000000
--- a/c/src/lib/libchip/rtc/README.m48t18
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-#  $Id$
-#
-
-This is supported by the m48t08 driver.
diff --git a/c/src/lib/libchip/rtc/STATUS b/c/src/lib/libchip/rtc/STATUS
deleted file mode 100644
index e95a924ae9..0000000000
--- a/c/src/lib/libchip/rtc/STATUS
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-#  $Id$
-#
-
-General
-=======
-
-+ It would be nice to utilize the interrupt capabilities of some
-  RTC parts.  This could be used to trigger checking the software
-  clock against the hardware clock.
-
-+ The periodic capability of most RTCs is not suitable for use
-  as a general purpose flexible clock tick source.  For example,
-  many RTCs generate only a handful of periods with 100 Hz being the
-  most frequent. 
-
-+ The tick field is not set on get.  Anything smaller than a second
-  is ignored on set and get operations.
-
-+ Day of week is ignored since RTEMS does not set it internally.
-
-+ There is no attempt in RTEMS to know about time zones.
-
-Harris ICM7170
-==============
-
-+ Tested on a DMV177.
-
-+ Interrupt capabilities are ignored.
-
-Mostek 48T08
-============
-
-+ Untested.
-
-+ NVRAM is ignored.
-
diff --git a/c/src/lib/libchip/rtc/icm7170.c b/c/src/lib/libchip/rtc/icm7170.c
deleted file mode 100644
index f3cf513d2e..0000000000
--- a/c/src/lib/libchip/rtc/icm7170.c
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- *  This file interfaces with the real-time clock found in 
- *  a Harris ICM7170
- *
- *  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-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems.h>
-#include <libchip/rtc.h>
-#include <libchip/icm7170.h>
-
-/*
- *  Control register bits
- */
-
-/* XXX */
-
-/*
- *  icm7170_initialize
- */
-
-void icm7170_initialize(
-  int minor
-)
-{
-  unsigned32     icm7170;
-  setRegister_f  setReg;            
-  unsigned32     clock;
-
-  icm7170 = RTC_Table[ minor ].ulCtrlPort1;
-  setReg = RTC_Table[ minor ].setRegister;
-
-  /*
-   *  Initialize the RTC with the proper clock frequency
-   */
-
-  clock = (unsigned32) RTC_Table[ minor ].pDeviceParams;
-  (*setReg)( icm7170, ICM7170_CONTROL, 0x0c | clock );
-}
-
-/*
- *  icm7170_get_time
- */
-
-int icm7170_get_time(
-  int                minor,
-  rtems_time_of_day *time
-)
-{
-  unsigned32     icm7170;
-  getRegister_f  getReg;
-  setRegister_f  setReg;
-  unsigned32     year;
-
-  icm7170 = RTC_Table[ minor ].ulCtrlPort1;
-  getReg = RTC_Table[ minor ].getRegister;
-  setReg = RTC_Table[ minor ].setRegister;
-
-  /*
-   *  Put the RTC into read mode
-   */
-
-  (void) (*getReg)( icm7170, ICM7170_COUNTER_HUNDREDTHS );
-
-  /*
-   *  Now get the time
-   */
-
-
-  year = (*getReg)( icm7170, ICM7170_YEAR );
-  if ( year < 88 )
-    year += 2000;
-  else
-    year += 1900;
-
-  time->year   = year;
-  time->month  = (*getReg)( icm7170, ICM7170_MONTH );
-  time->day    = (*getReg)( icm7170, ICM7170_DATE );
-  time->hour   = (*getReg)( icm7170, ICM7170_HOUR );
-  time->minute = (*getReg)( icm7170, ICM7170_MINUTE );
-  time->second = (*getReg)( icm7170, ICM7170_SECOND );
-  
-  time->ticks  = 0;
-
-  /*
-   *  Put the RTC back into normal mode.
-   */
-
-  (void) (*getReg)( icm7170, ICM7170_COUNTER_HUNDREDTHS );
-
-  return 0;
-}
-
-/*
- *  icm7170_set_time
- */
-
-int icm7170_set_time(
-  int                minor,
-  rtems_time_of_day *time
-)
-{
-  unsigned32     icm7170;
-  getRegister_f  getReg;
-  setRegister_f  setReg;
-  unsigned32     year;
-  unsigned32     clock;
-
-  icm7170 = RTC_Table[ minor ].ulCtrlPort1;
-  getReg = RTC_Table[ minor ].getRegister;
-  setReg = RTC_Table[ minor ].setRegister;
-  clock = (unsigned32) RTC_Table[ minor ].pDeviceParams;
-
-  year = time->year;
-
-  if ( year >= 2088 )
-    rtems_fatal_error_occurred( RTEMS_INVALID_NUMBER );
-
-  if ( year >= 2000 )
-    year -= 2000;
-  else
-    year -= 1900;
-
-  (*setReg)( icm7170, ICM7170_CONTROL, 0x04 | clock );
-
-  (*setReg)( icm7170, ICM7170_YEAR,    year );
-  (*setReg)( icm7170, ICM7170_MONTH,   time->month );
-  (*setReg)( icm7170, ICM7170_DATE,    time->day );
-  (*setReg)( icm7170, ICM7170_HOUR,    time->hour );
-  (*setReg)( icm7170, ICM7170_MINUTE,  time->minute );
-  (*setReg)( icm7170, ICM7170_SECOND,  time->second );
- 
-  /*
-   *  This is not really right.
-   */
-
-  (*setReg)( icm7170, ICM7170_DAY_OF_WEEK,  1 );
-
-  /*
-   *  Put the RTC back into normal mode.
-   */
-
-  (*setReg)( icm7170, ICM7170_CONTROL, 0x0c | clock );
-
-  return 0;
-}
-
-/*
- *  Driver function table
- */
-
-rtc_fns icm7170_fns = {
-  icm7170_initialize,
-  icm7170_get_time,
-  icm7170_set_time
-};
-
diff --git a/c/src/lib/libchip/rtc/icm7170.h b/c/src/lib/libchip/rtc/icm7170.h
deleted file mode 100644
index 5bf9fd065c..0000000000
--- a/c/src/lib/libchip/rtc/icm7170.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- *  This file contains the definitions for the following real-time clocks:
- *
- *    + Harris Semiconduction ICM7170
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __LIBCHIP_ICM7170_h
-#define __LIBCHIP_ICM7170_h
-
-/*
- *  Register indices
- */
-
-#define ICM7170_CONTROL             0x11
-
-
-#define ICM7170_COUNTER_HUNDREDTHS  0x00
-#define ICM7170_HOUR                0x01
-#define ICM7170_MINUTE              0x02
-#define ICM7170_SECOND              0x03
-#define ICM7170_MONTH               0x04
-#define ICM7170_DATE                0x05
-#define ICM7170_YEAR                0x06
-#define ICM7170_DAY_OF_WEEK         0x07
-
-/*
- *  Configuration information in the parameters field
- */
-
-#define ICM7170_AT_32_KHZ  0x00
-#define ICM7170_AT_1_MHZ   0x01
-#define ICM7170_AT_2_MHZ   0x02
-#define ICM7170_AT_4_MHZ   0x03
-
-/*
- *  Driver function table
- */
-
-extern rtc_fns icm7170_fns;
-
-/*
- * Default register access routines
- */
-
-unsigned32 icm7170_get_register(    /* registers are at 1 byte boundaries */
-  unsigned32  ulCtrlPort,           /*   and accessed as bytes            */
-  unsigned8   ucRegNum
-);
-
-void  icm7170_set_register(
-  unsigned32  ulCtrlPort,
-  unsigned8   ucRegNum,
-  unsigned32  ucData
-);
-
-unsigned32 icm7170_get_register_2(  /* registers are at 2 byte boundaries */
-  unsigned32  ulCtrlPort,           /*   and accessed as bytes            */
-  unsigned8   ucRegNum
-);
-
-void  icm7170_set_register_2(
-  unsigned32  ulCtrlPort,
-  unsigned8   ucRegNum,
-  unsigned32  ucData
-);
-
-unsigned32 icm7170_get_register_4(  /* registers are at 4 byte boundaries */
-  unsigned32  ulCtrlPort,           /*   and accessed as bytes            */
-  unsigned8   ucRegNum
-);
-
-void  icm7170_set_register_4(
-  unsigned32  ulCtrlPort,
-  unsigned8   ucRegNum,
-  unsigned32  ucData
-);
-
-unsigned32 icm7170_get_register_8(  /* registers are at 8 byte boundaries */
-  unsigned32  ulCtrlPort,           /*   and accessed as bytes            */
-  unsigned8   ucRegNum
-);
-
-void  icm7170_set_register_8(
-  unsigned32  ulCtrlPort,
-  unsigned8   ucRegNum,
-  unsigned32  ucData
-);
-
-#endif
-/* end of include file */
diff --git a/c/src/lib/libchip/rtc/icm7170_reg.c b/c/src/lib/libchip/rtc/icm7170_reg.c
deleted file mode 100644
index b6961824b6..0000000000
--- a/c/src/lib/libchip/rtc/icm7170_reg.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- *  This file contains a typical set of register access routines which may be
- *  used with the icm7170 chip if accesses to the chip are as follows:
- *
- *    + registers are accessed as bytes
- *    + registers are only byte-aligned (no address gaps)
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems.h>
-
-#ifndef _ICM7170_MULTIPLIER
-#define _ICM7170_MULTIPLIER 1
-#define _ICM7170_NAME(_X) _X
-#define _ICM7170_TYPE unsigned8
-#endif
-
-#define CALCULATE_REGISTER_ADDRESS( _base, _reg ) \
-  (_ICM7170_TYPE *)((_base) + ((_reg) * _ICM7170_MULTIPLIER ))
-
-/* 
- *  ICM7170 Get Register Routine
- */
-
-unsigned32 _ICM7170_NAME(icm7170_get_register)(
-  unsigned32  ulCtrlPort,
-  unsigned8   ucRegNum
-)
-{
-  _ICM7170_TYPE *port;
-
-  port = CALCULATE_REGISTER_ADDRESS( ulCtrlPort, ucRegNum );
-
-  return *port;
-}
-
-/*
- *  ICM7170 Set Register Routine
- */
-
-void  _ICM7170_NAME(icm7170_set_register)(
-  unsigned32  ulCtrlPort,
-  unsigned8   ucRegNum,
-  unsigned32  ucData
-)
-{
-  _ICM7170_TYPE *port;
-
-  port = CALCULATE_REGISTER_ADDRESS( ulCtrlPort, ucRegNum );
-
-  *port = ucData;
-}
diff --git a/c/src/lib/libchip/rtc/icm7170_reg2.c b/c/src/lib/libchip/rtc/icm7170_reg2.c
deleted file mode 100644
index bab92697bf..0000000000
--- a/c/src/lib/libchip/rtc/icm7170_reg2.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- *  This file contains a typical set of register access routines which may be
- *  used with the icm7170 chip if accesses to the chip are as follows:
- *
- *    + registers are accessed as bytes
- *    + registers are on 16-bit boundaries
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define _ICM7170_MULTIPLIER 2
-#define _ICM7170_NAME(_X) _X##_2
-#define _ICM7170_TYPE unsigned8
-
-#include "icm7170_reg.c"
-
diff --git a/c/src/lib/libchip/rtc/icm7170_reg4.c b/c/src/lib/libchip/rtc/icm7170_reg4.c
deleted file mode 100644
index 896e0cbc0b..0000000000
--- a/c/src/lib/libchip/rtc/icm7170_reg4.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- *  This file contains a typical set of register access routines which may be
- *  used with the icm7170 chip if accesses to the chip are as follows:
- *
- *    + registers are accessed as bytes
- *    + registers are on 32-bit boundaries
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define _ICM7170_MULTIPLIER 4
-#define _ICM7170_NAME(_X) _X##_4
-#define _ICM7170_TYPE unsigned8
-
-#include "icm7170_reg.c"
-
diff --git a/c/src/lib/libchip/rtc/icm7170_reg8.c b/c/src/lib/libchip/rtc/icm7170_reg8.c
deleted file mode 100644
index d2ed2844ac..0000000000
--- a/c/src/lib/libchip/rtc/icm7170_reg8.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- *  This file contains a typical set of register access routines which may be
- *  used with the icm7170 chip if accesses to the chip are as follows:
- *
- *    + registers are accessed as bytes
- *    + registers are on 64-bit boundaries
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define _ICM7170_MULTIPLIER 8
-#define _ICM7170_NAME(_X) _X##_8
-#define _ICM7170_TYPE unsigned8
-
-#include "icm7170_reg.c"
-
diff --git a/c/src/lib/libchip/rtc/m48t08.c b/c/src/lib/libchip/rtc/m48t08.c
deleted file mode 100644
index b3d0dcb0de..0000000000
--- a/c/src/lib/libchip/rtc/m48t08.c
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- *  This file interfaces with the real-time clock found in 
- *  a Mostek M48T08 or M48T18 or compatibles.
- *
- *  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-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems.h>
-#include <libchip/rtc.h>
-#include <libchip/m48t08.h>
-
-/*
- *  Control register bits
- */
-
-#define M48T08_CONTROL_WRITE  0x80
-#define M48T08_CONTROL_READ   0x40
-#define M48T08_CONTROL_SIGN   0x20
-
-/*
- *  m48t08_initialize
- */
-
-void m48t08_initialize(
-  int minor
-)
-{
-}
-
-/*
- *  m48t08_get_time
- */
-
-#define From_BCD( _x ) ((((_x) >> 4) * 10) + ((_x) & 0x0F))
-#define To_BCD( _x )   ((((_x) / 10) << 4) + ((_x) % 10))
-
-int m48t08_get_time(
-  int                minor,
-  rtems_time_of_day *time
-)
-{
-  unsigned32     m48t08;
-  getRegister_f  getReg;
-  setRegister_f  setReg;
-  unsigned8      controlReg;
-  unsigned32     value1;
-  unsigned32     value2;
-
-  m48t08 = RTC_Table[ minor ].ulCtrlPort1;
-  getReg = RTC_Table[ minor ].getRegister;
-  setReg = RTC_Table[ minor ].setRegister;
-
-  /*
-   *  Put the RTC into read mode
-   */
-
-  controlReg = (*getReg)( m48t08, M48T08_CONTROL );
-  (*setReg)( m48t08, M48T08_CONTROL, controlReg | M48T08_CONTROL_READ );
-  
-  value1 = (*getReg)( m48t08, M48T08_YEAR );
-  value2 = From_BCD( value1 );
-  if ( value2 < 88 )
-    time->year = 2000 + value2;
-  else
-    time->year = 1900 + value2;
-
-  value1 = (*getReg)( m48t08, M48T08_MONTH );
-  time->month = From_BCD( value1 );
-
-  value1 = (*getReg)( m48t08, M48T08_DATE );
-  time->day = From_BCD( value1 );
-
-  value1 = (*getReg)( m48t08, M48T08_HOUR );
-  time->hour = From_BCD( value1 );
-
-  value1 = (*getReg)( m48t08, M48T08_MINUTE );
-  time->minute = From_BCD( value1 );
-
-  value1 = (*getReg)( m48t08, M48T08_SECOND );
-  time->second = From_BCD( value1 );
-  
-  time->ticks  = 0;
-
-  /*
-   *  Put the RTC back into normal mode.
-   */
-
-  (*setReg)( m48t08, M48T08_CONTROL, controlReg );
-
-  return 0;
-}
-
-/*
- *  m48t08_set_time
- */
-
-int m48t08_set_time(
-  int                minor,
-  rtems_time_of_day *time
-)
-{
-  unsigned32     m48t08;
-  getRegister_f  getReg;
-  setRegister_f  setReg;
-  unsigned8      controlReg;
-
-  m48t08 = RTC_Table[ minor ].ulCtrlPort1;
-  getReg = RTC_Table[ minor ].getRegister;
-  setReg = RTC_Table[ minor ].setRegister;
-
-  /*
-   *  Put the RTC into read mode
-   */
-
-  controlReg = (*getReg)( m48t08, M48T08_CONTROL );
-  (*setReg)( m48t08, M48T08_CONTROL, controlReg | M48T08_CONTROL_WRITE );
-  
-  if ( time->year >= 2088 )
-    rtems_fatal_error_occurred( RTEMS_INVALID_NUMBER );
-
-  (*setReg)( m48t08, M48T08_YEAR,    To_BCD(time->year % 100) );
-  (*setReg)( m48t08, M48T08_MONTH,   To_BCD(time->month) );
-  (*setReg)( m48t08, M48T08_DATE,    To_BCD(time->day) );
-  (*setReg)( m48t08, M48T08_HOUR,    To_BCD(time->hour) );
-  (*setReg)( m48t08, M48T08_MINUTE,  To_BCD(time->minute) );
-  (*setReg)( m48t08, M48T08_SECOND,  To_BCD(time->second) );
- 
-  /*
-   *  Put the RTC back into normal mode.
-   */
-
-  (*setReg)( m48t08, M48T08_CONTROL, controlReg );
-
-  return 0;
-}
-
-/*
- *  Driver function table
- */
-
-rtc_fns m48t08_fns = {
-  m48t08_initialize,
-  m48t08_get_time,
-  m48t08_set_time
-};
-
diff --git a/c/src/lib/libchip/rtc/m48t08.h b/c/src/lib/libchip/rtc/m48t08.h
deleted file mode 100644
index 7d27215e1e..0000000000
--- a/c/src/lib/libchip/rtc/m48t08.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- *  This file contains the definitions for the following real-time clocks:
- *
- *    + Mostek M48T08
- *    + Mostek M48T18 
- *    + Dallas Semiconductor DS1643
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __LIBCHIP_M48T08_h
-#define __LIBCHIP_M48T08_h
-
-/*
- *  Register indices
- */
-
-#define M48T08_CONTROL     0
-#define M48T08_SECOND      1
-#define M48T08_MINUTE      2
-#define M48T08_HOUR        3
-#define M48T08_DAY_OF_WEEK 4
-#define M48T08_DATE        5
-#define M48T08_MONTH       6
-#define M48T08_YEAR        7
- 
-/*
- *  Driver function table
- */
-
-extern rtc_fns m48t08_fns;
-
-/*
- * Default register access routines
- */
-
-unsigned32 m48t08_get_register(     /* registers are at 1 byte boundaries */
-  unsigned32  ulCtrlPort,           /*   and accessed as bytes            */
-  unsigned8   ucRegNum
-);
-
-void  m48t08_set_register(
-  unsigned32  ulCtrlPort,
-  unsigned8   ucRegNum,
-  unsigned32  ucData
-);
-
-unsigned32 m48t08_get_register_2(   /* registers are at 2 byte boundaries */
-  unsigned32  ulCtrlPort,           /*   and accessed as bytes            */
-  unsigned8   ucRegNum
-);
-
-void  m48t08_set_register_2(
-  unsigned32  ulCtrlPort,
-  unsigned8   ucRegNum,
-  unsigned32  ucData
-);
-
-unsigned32 m48t08_get_register_4(   /* registers are at 4 byte boundaries */
-  unsigned32  ulCtrlPort,           /*   and accessed as bytes            */
-  unsigned8   ucRegNum
-);
-
-void  m48t08_set_register_4(
-  unsigned32  ulCtrlPort,
-  unsigned8   ucRegNum,
-  unsigned32  ucData
-);
-
-unsigned32 m48t08_get_register_8(   /* registers are at 8 byte boundaries */
-  unsigned32  ulCtrlPort,           /*   and accessed as bytes            */
-  unsigned8   ucRegNum
-);
-
-void  m48t08_set_register_8(
-  unsigned32  ulCtrlPort,
-  unsigned8   ucRegNum,
-  unsigned32  ucData
-);
-
-#endif
-/* end of include file */
diff --git a/c/src/lib/libchip/rtc/m48t08_reg.c b/c/src/lib/libchip/rtc/m48t08_reg.c
deleted file mode 100644
index abb37c628c..0000000000
--- a/c/src/lib/libchip/rtc/m48t08_reg.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- *  This file contains a typical set of register access routines which may be
- *  used with the m48t08 chip if accesses to the chip are as follows:
- *
- *    + registers are accessed as bytes
- *    + registers are only byte-aligned (no address gaps)
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems.h>
-
-#ifndef _M48T08_MULTIPLIER
-#define _M48T08_MULTIPLIER 1
-#define _M48T08_NAME(_X) _X
-#define _M48T08_TYPE unsigned8
-#endif
-
-#define CALCULATE_REGISTER_ADDRESS( _base, _reg ) \
-  (_M48T08_TYPE *)((_base) + ((_reg) * _M48T08_MULTIPLIER ))
-
-/* 
- *  M48T08 Get Register Routine
- */
-
-unsigned32 _M48T08_NAME(m48t08_get_register)(
-  unsigned32  ulCtrlPort,
-  unsigned8   ucRegNum
-)
-{
-  _M48T08_TYPE *port;
-
-  port = CALCULATE_REGISTER_ADDRESS( ulCtrlPort, ucRegNum );
-
-  return *port;
-}
-
-/*
- *  M48T08 Set Register Routine
- */
-
-void  _M48T08_NAME(m48t08_set_register)(
-  unsigned32  ulCtrlPort,
-  unsigned8   ucRegNum,
-  unsigned32  ucData
-)
-{
-  _M48T08_TYPE *port;
-
-  port = CALCULATE_REGISTER_ADDRESS( ulCtrlPort, ucRegNum );
-
-  *port = ucData;
-}
diff --git a/c/src/lib/libchip/rtc/m48t08_reg2.c b/c/src/lib/libchip/rtc/m48t08_reg2.c
deleted file mode 100644
index a6f294a3f7..0000000000
--- a/c/src/lib/libchip/rtc/m48t08_reg2.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- *  This file contains a typical set of register access routines which may be
- *  used with the m48t08 chip if accesses to the chip are as follows:
- *
- *    + registers are accessed as bytes
- *    + registers are on 16-bit boundaries
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define _M48T08_MULTIPLIER 2
-#define _M48T08_NAME(_X) _X##_2
-#define _M48T08_TYPE unsigned8
-
-#include "m48t08_reg.c"
-
diff --git a/c/src/lib/libchip/rtc/m48t08_reg4.c b/c/src/lib/libchip/rtc/m48t08_reg4.c
deleted file mode 100644
index a84b988a34..0000000000
--- a/c/src/lib/libchip/rtc/m48t08_reg4.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- *  This file contains a typical set of register access routines which may be
- *  used with the m48t08 chip if accesses to the chip are as follows:
- *
- *    + registers are accessed as bytes
- *    + registers are on 32-bit boundaries
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define _M48T08_MULTIPLIER 4
-#define _M48T08_NAME(_X) _X##_4
-#define _M48T08_TYPE unsigned8
-
-#include "m48t08_reg.c"
-
diff --git a/c/src/lib/libchip/rtc/m48t08_reg8.c b/c/src/lib/libchip/rtc/m48t08_reg8.c
deleted file mode 100644
index dcc2a9b39b..0000000000
--- a/c/src/lib/libchip/rtc/m48t08_reg8.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- *  This file contains a typical set of register access routines which may be
- *  used with the m48t08 chip if accesses to the chip are as follows:
- *
- *    + registers are accessed as bytes
- *    + registers are on 64-bit boundaries
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define _M48T08_MULTIPLIER 8
-#define _M48T08_NAME(_X) _X##_8
-#define _M48T08_TYPE unsigned8
-
-#include "m48t08_reg.c"
-
diff --git a/c/src/lib/libchip/rtc/rtc.h b/c/src/lib/libchip/rtc/rtc.h
deleted file mode 100644
index 94b42e3f34..0000000000
--- a/c/src/lib/libchip/rtc/rtc.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- *  This file contains the Real-Time Clock definitions.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *
- *  $Id$
- */
-
-#ifndef __LIBCHIP_RTC_h
-#define __LIBCHIP_RTC_h
-
-/*
- *  Types for get and set register routines
- */
-
-typedef unsigned32 (*getRegister_f)(unsigned32 port, unsigned8 register);
-typedef void       (*setRegister_f)(
-                            unsigned32 port, unsigned8 reg, unsigned32 value);
-
-typedef struct _rtc_fns {
-  void    (*deviceInitialize)(int minor);
-  int     (*deviceGetTime)(int minor, rtems_time_of_day *time);
-  int     (*deviceSetTime)(int minor, rtems_time_of_day *time);
-} rtc_fns;
-
-typedef enum {
-  RTC_M48T08,                  /* SGS-Thomsom M48T08 or M48T18 */
-  RTC_ICM7170,                 /* Harris ICM-7170 */
-  RTC_CUSTOM                   /* BSP specific driver */
-} rtc_devs;
-
-/*
- * Each field is interpreted thus:
- * 
- * sDeviceName  This is the name of the device. 
- *
- * deviceType   This indicates the chip type.
- *
- * pDeviceFns   This is a pointer to the set of driver routines to use.
- *
- * pDeviceParams This contains either device specific data or a pointer to a
- *              device specific information table.
- *
- * ulCtrlPort1  This is the primary control port number for the device.
- *
- * ulCtrlPort2  This is the secondary control port number.
- *
- * ulDataPort   This is the port number for the data port of the device
- *
- * getRegister  This is the routine used to read register values.
- *
- * setRegister  This is the routine used to write register values.
- */
-
-typedef struct _rtc_tbl {
-  char          *sDeviceName;
-  rtc_devs       deviceType;
-  rtc_fns       *pDeviceFns;
-  boolean      (*deviceProbe)(int minor);
-  void          *pDeviceParams;
-  unsigned32     ulCtrlPort1;
-  unsigned32     ulDataPort;
-  getRegister_f  getRegister;
-  setRegister_f  setRegister;
-} rtc_tbl;
-
-extern rtc_tbl        RTC_Table[];
-extern unsigned long  RTC_Count;
-
-
-boolean rtc_probe( int minor );
-
-#endif
-/* end of include file */
diff --git a/c/src/lib/libchip/rtc/rtcprobe.c b/c/src/lib/libchip/rtc/rtcprobe.c
deleted file mode 100644
index 6aaad89486..0000000000
--- a/c/src/lib/libchip/rtc/rtcprobe.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- *  This file contains the default Real-Time Clock probe routine.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems.h>
-#include <libchip/rtc.h>
-
-
-boolean rtc_probe(
-  int minor
-)
-{
-  return TRUE;
-}
diff --git a/c/src/lib/libchip/serial/Makefile.in b/c/src/lib/libchip/serial/Makefile.in
deleted file mode 100644
index d9c78faf97..0000000000
--- a/c/src/lib/libchip/serial/Makefile.in
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-LIBNAME=libserialio.a
-LIB=${ARCH}/${LIBNAME}
-
-C_PIECES=\
-    mc68681 mc68681_baud mc68681_reg mc68681_reg2 mc68681_reg4 mc68681_reg8 \
-    ns16550 \
-    z85c30 z85c30_reg \
-    serprobe termios_baud2index termios_baud2num
-
-C_FILES=$(C_PIECES:%=%.c)
-C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
-
-INSTALLED_H_FILES=$(srcdir)/mc68681.h $(srcdir)/ns16550.h $(srcdir)/z85c30.h \
-                  $(srcdir)/serial.h
-SRCS=$(C_FILES) $(H_FILES) $(SYS_H_FILES) $(RTEMS_H_FILES) $(PRIVATE_H_FILES)
-OBJS=$(C_O_FILES)
-
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/lib.cfg
-
-#
-# Add local stuff here using +=
-#
-
-DEFINES  +=
-CPPFLAGS +=
-CFLAGS   += $(LIBC_DEFINES)
-
-#
-# Add your list of files to delete here.  The config files
-#  already know how to delete some stuff, so you may want
-#  to just run 'make clean' first to see what gets missed.
-#  'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS += $(LIB)
-CLOBBER_ADDITIONS +=
-
-all:	${ARCH} preinstall $(LIB)
-	$(INSTALL_VARIANT) -m 644 ${LIB} ${PROJECT_RELEASE}/lib
-
-$(LIB): $(SRCS) ${OBJS}
-	$(make-library)
-
-# Install the library, appending _g or _p as appropriate.
-# for include files, just use $(INSTALL)
-preinstall:
-	$(INSTALL) -m 444 $(INSTALLED_H_FILES) $(PROJECT_INCLUDE)/libchip
-
-
diff --git a/c/src/lib/libchip/serial/README b/c/src/lib/libchip/serial/README
deleted file mode 100644
index 3a1013b45b..0000000000
--- a/c/src/lib/libchip/serial/README
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-#  $Id$
-#
-
-This is the serial controller portion of the libchip library.  This 
-directory contains the source code for reusable console driver
-support code.  Each individual driver is configured using the
-console_tbl data structure.  This structure is defined and explained
-in the console.h file.
-
-The reusable chip drivers do not directly access the serial controller.
-They access the registers on the controller via a set of up to four 
-functions which are provided by the BSP.  These functins set and get
-general registers and data buffers.  Some chips can access the data
-buffers as general registers and thus the driver may not require
-those interface routines.
-
diff --git a/c/src/lib/libchip/serial/README.mc68681 b/c/src/lib/libchip/serial/README.mc68681
deleted file mode 100644
index 240faf759b..0000000000
--- a/c/src/lib/libchip/serial/README.mc68681
+++ /dev/null
@@ -1,87 +0,0 @@
-#
-#  $Id$
-#
-
-Configuration Table Use
-=======================
-
-sDeviceName
-
-   The name of this device.
-
-deviceType
-
-   This field must be SERIAL_MC68681.
-
-pDeviceFns
-
-   The device interface control table.  This may be:
-      + mc68681_fns for interrupt driven IO
-      + mc68681_fns_polled for polled IO
-
-deviceProbe
-
-   This is the address of the routine which probes to see if the device
-   is present.
-
-pDeviceFlow
-
-   This field is ignored as hardware flow control is not currently supported.
-
-ulMargin
-
-    This is currently unused.
-
-ulHysteresis
-
-    This is currently unused.
-
-pDeviceParams
-
-    This is set to the default settings.
-
-ulCtrlPort1
-
-   This field is the base address of the entire DUART.
-
-ulCtrlPort2
-
-   This field is the base address of the port specific registers.
-
-ulDataPort
-
-   This field is bit mapped as follows:
-     bit 0:  baud rate set a or b
-     bit 1-2: BRG selection ("Select Extend bit")
-
-   Note: If both ports on single DUART are not configured for the same
-         baud rate set, then unexpected results will occur.
-
-   Note: On the Exar 88c681, if a standard clock of 3.6864 Mhz is used
-         and the "Select Extend bit" is 0 (disabled), then the default
-         MC68681 baud rate table is selected.
-
-getRegister
-setRegister
-
-   These follow standard conventions.
-
-getData
-setData
-
-   These are unused since the TX and RX data registers can be accessed
-   as regular registers.
-
-ulClock
-
-   This is a pointer to a baud rate mapping table.  If set to
-   mc68681_baud_rate_table, then the CSR/ACR/X bit mappings shown
-   in the 68681 and 88681 manuals are used.  Otherwise, the board
-   specific baud rate mapping is used.
-
-   NULL is not a valid value.
-
-ulIntVector
-
-   This is the interrupt vector number associated with this chip.
-
diff --git a/c/src/lib/libchip/serial/README.ns16550 b/c/src/lib/libchip/serial/README.ns16550
deleted file mode 100644
index 2956173b1b..0000000000
--- a/c/src/lib/libchip/serial/README.ns16550
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-#  $Id$
-#
-
-This driver needs to be debugged before this is written.
diff --git a/c/src/lib/libchip/serial/README.xr88681 b/c/src/lib/libchip/serial/README.xr88681
deleted file mode 100644
index 37364aaec6..0000000000
--- a/c/src/lib/libchip/serial/README.xr88681
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-#  $Id$
-#
-
-The Exar XR88681 is an enhanced version of the Motorola MC68681 and is
-supported by the mc68681 driver.
diff --git a/c/src/lib/libchip/serial/README.z85c30 b/c/src/lib/libchip/serial/README.z85c30
deleted file mode 100644
index 4442b5ef40..0000000000
--- a/c/src/lib/libchip/serial/README.z85c30
+++ /dev/null
@@ -1,78 +0,0 @@
-#
-#  $Id$
-#
-
-Configuration Table Use
-=======================
-
-sDeviceName
-
-   The name of this device.
-
-deviceType
-
-   This field must be SERIAL_Z85C30.
-
-pDeviceFns
-
-   The device interface control table.  This may be:
-      + z85c30_fns for interrupt driven IO
-      + z85c30_fns_polled for polled IO
-
-deviceProbe
-
-   This is the address of the routine which probes to see if the device
-   is present.
-
-pDeviceFlow
-
-   This field is set to one of the following values:
-      + NULL for no hardware flow control
-      + z85c30_flow_RTSCTS for RTS/CTS based flow control
-      + z85c30_flow_DTRCTS for DTR/CTS based flow control
-
-ulMargin
-
-    This is currently unused.
-
-ulHysteresis
-
-    This is currently unused.
-
-pDeviceParams
-
-    This is set to the default settings.
-
-ulCtrlPort1
-
-   This field is the address of the control register for this port.
-
-ulCtrlPort2
-
-   This field is the address of the control register for chip.
-
-ulDataPort
-
-   This field is the address of the data register for this port.
-
-getRegister
-setRegister
-
-   These follow standard conventions.
-
-getData
-setData
-
-   These follow standard conventions.
-
-ulClock
-
-   This is the clock speed of the baud rate clock.
-   NULL, then the CSR/ACR/X bit mappings shown in the 68681 and 88681
-   manuals are used.  Otherwise, the board specific baud rate mapping
-   is used.
-
-ulIntVector
-
-   This is the interrupt vector number associated with this chip.
-
diff --git a/c/src/lib/libchip/serial/STATUS b/c/src/lib/libchip/serial/STATUS
deleted file mode 100644
index 6eb7fa4171..0000000000
--- a/c/src/lib/libchip/serial/STATUS
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-#  $Id$
-#
-
-General
-=======
-
-+ Hardware flow control is not currently supported.  Some of the chip
-  drivers (in particular the z8530) have support for hardware flow control
-  but this has not been tested in the libchip context.  There will need
-  to be a way to totally disabled hardware flow control which is not
-  currently in this.
-
-+ "ulClockSpeed" configuration item field to become a pointer to a table
-  of chip specific information.  For example, the z8530 should specify
-  clock speed and clock divisor setting.
-
-+ A termios structure should be included to specify  the initial settings.
-  Right now all drivers default to 9600, 8N1.
- 
-+ Need to switch to passing pointers rather than a minor number to 
-  functions which are strictly internal to each chip driver.  This
-  should be a performance win.
-
-+ Need a test which prompts you for termios settings and tests them.  Until
-  this happens, testing for the variety of settings possible will be limited.
-  This test should be able to test any serial port while prompts come to the
-  console.
-
-MC68681
-=======
-
-+ Works interrupt and polled.
-
-+ Hardware flow control not included.
-
-NS16650
-=======
-
-+ Not tested in libchip context.  Based on Radstone PPC2 driver which worked 
-  well.
-
-+ Interrupt code has been reworked to not use ring buffer and may be broken
-  as it has not been tested since this was done.
-
-+ ns16550_set-attributes function is untested.
-
-+ Hardware flow control included but is currently disabled in ISR.
-
-Z85C30
-======
-
-+ Works polled and interrupt.
-
-+ Hardware flow control included but is currently disabled in ISR.
-
-+ Needs to support mode where more specific vectors are generated.
-
diff --git a/c/src/lib/libchip/serial/mc68681.c b/c/src/lib/libchip/serial/mc68681.c
deleted file mode 100644
index a41a00d1ae..0000000000
--- a/c/src/lib/libchip/serial/mc68681.c
+++ /dev/null
@@ -1,756 +0,0 @@
-/*
- *  This file contains the termios TTY driver for the Motorola MC68681.
- *
- *  This part is available from a number of secondary sources.
- *  In particular, we know about the following:
- *
- *     + Exar 88c681 and 68c681
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems.h>
-#include <rtems/libio.h>
-#include <stdlib.h>
-
-#include <libchip/serial.h>
-#include <libchip/mc68681.h>
-#include "sersupp.h"
-#include "mc68681_p.h"
-
-/*
- * Flow control is only supported when using interrupts
- */
-
-console_fns mc68681_fns =
-{
-  libchip_serial_default_probe,   /* deviceProbe */
-  mc68681_open,                   /* deviceFirstOpen */
-  NULL,                           /* deviceLastClose */
-  NULL,                           /* deviceRead */
-  mc68681_write_support_int,      /* deviceWrite */
-  mc68681_initialize_interrupts,  /* deviceInitialize */
-  mc68681_write_polled,           /* deviceWritePolled */
-  mc68681_set_attributes,         /* deviceSetAttributes */
-  TRUE                            /* deviceOutputUsesInterrupts */
-};
-
-console_fns mc68681_fns_polled =
-{
-  libchip_serial_default_probe,        /* deviceProbe */
-  mc68681_open,                        /* deviceFirstOpen */
-  mc68681_close,                       /* deviceLastClose */
-  mc68681_inbyte_nonblocking_polled,   /* deviceRead */
-  mc68681_write_support_polled,        /* deviceWrite */
-  mc68681_init,                        /* deviceInitialize */
-  mc68681_write_polled,                /* deviceWritePolled */
-  mc68681_set_attributes,              /* deviceSetAttributes */
-  FALSE,                               /* deviceOutputUsesInterrupts */
-};
-
-extern void set_vector( rtems_isr_entry, rtems_vector_number, int );
-
-/*
- *  Console Device Driver Entry Points
- */
-
-/*
- *  mc68681_baud_rate
- *
- *  This routine returns the proper ACR bit and baud rate field values
- *  based on the requested baud rate.  The baud rate set to be used
- *  must be configured by the user.
- */
-
-MC68681_STATIC int mc68681_baud_rate(
-  int           minor,
-  int           baud,
-  unsigned int *baud_mask_p,
-  unsigned int *acr_bit_p,
-  unsigned int *command
-);
-
-/*
- *  mc68681_set_attributes
- *
- *  This function sets the DUART channel to reflect the requested termios
- *  port settings.
- */
-
-MC68681_STATIC int mc68681_set_attributes( 
-  int minor,
-  const struct termios *t
-)
-{
-  unsigned32             pMC68681_port;
-  unsigned32             pMC68681;
-  unsigned int           mode1;
-  unsigned int           mode2;
-  unsigned int           baud_mask;
-  unsigned int           acr_bit;
-  unsigned int           cmd;
-  setRegister_f          setReg;
-  rtems_interrupt_level  Irql;
-
-  pMC68681      = Console_Port_Tbl[minor].ulCtrlPort1;
-  pMC68681_port = Console_Port_Tbl[minor].ulCtrlPort2;
-  setReg        = Console_Port_Tbl[minor].setRegister;
-
-  /*
-   *  Set the baud rate
-   */
-
-  if (mc68681_baud_rate( minor, t->c_cflag, &baud_mask, &acr_bit, &cmd ) == -1)
-    return -1;
-
-  baud_mask |=  baud_mask << 4;
-  acr_bit   <<= 7;
-
-  /*
-   *  Parity
-   */
-
-  mode1 = 0;
-  mode2 = 0;
-
-  if (t->c_cflag & PARENB) {
-    if (t->c_cflag & PARODD)
-      mode1 |= 0x04;
-    else
-      mode1 |= 0x04;
-  } else {
-   mode1 |= 0x10;
-  }
-
-  /*
-   *  Character Size
-   */
-
-  if (t->c_cflag & CSIZE) {
-    switch (t->c_cflag & CSIZE) {
-      case CS5:  break;
-      case CS6:  mode1 |= 0x01;  break;
-      case CS7:  mode1 |= 0x02;  break;
-      case CS8:  mode1 |= 0x03;  break;
-    }
-  } else {
-    mode1 |= 0x03;       /* default to 9600,8,N,1 */
-  }
-
-  /*
-   *  Stop Bits
-   */
-  
-  if (t->c_cflag & CSTOPB) {
-    mode2 |= 0x07;                      /* 2 stop bits */
-  } else {
-    if ((t->c_cflag & CSIZE) == CS5)    /* CS5 and 2 stop bits not supported */
-      return -1;
-    mode2 |= 0x0F;                      /* 1 stop bit */
-  }
-
-  rtems_interrupt_disable(Irql);
-    (*setReg)( pMC68681, MC68681_AUX_CTRL_REG, acr_bit );
-    (*setReg)( pMC68681_port, MC68681_CLOCK_SELECT, baud_mask );
-    if ( cmd ) {
-      (*setReg)( pMC68681_port, MC68681_COMMAND, cmd );         /* RX */
-      (*setReg)( pMC68681_port, MC68681_COMMAND, cmd | 0x20 );  /* TX */
-    }
-    (*setReg)( pMC68681_port, MC68681_COMMAND, MC68681_MODE_REG_RESET_MR_PTR );
-    (*setReg)( pMC68681_port, MC68681_MODE, mode1 );
-    (*setReg)( pMC68681_port, MC68681_MODE, mode2 );
-  rtems_interrupt_enable(Irql);
-  return 0;
-}
-
-/*
- *  mc68681_initialize_context
- *
- *  This function sets the default values of the per port context structure.
- */
-
-MC68681_STATIC void mc68681_initialize_context(
-  int               minor,
-  mc68681_context  *pmc68681Context
-)
-{
-  int          port;
-  unsigned int pMC68681;
-  unsigned int pMC68681_port;
-  
-  pMC68681      = Console_Port_Tbl[minor].ulCtrlPort1;
-  pMC68681_port = Console_Port_Tbl[minor].ulCtrlPort2;
-
-  pmc68681Context->mate = -1;
-
-  for (port=0 ; port<Console_Port_Count ; port++ ) {
-    if ( Console_Port_Tbl[port].ulCtrlPort1 == pMC68681 && 
-         Console_Port_Tbl[port].ulCtrlPort2 != pMC68681_port ) {
-      pmc68681Context->mate = port;
-      pmc68681Context->imr  = 0;
-      break;
-    }
-  }
-
-}
-
-/*
- *  mc68681_init
- *
- *  This function initializes the DUART to a quiecsent state.
- */
-
-MC68681_STATIC void mc68681_init(int minor)
-{
-  unsigned32              pMC68681_port;
-  unsigned32              pMC68681;
-  mc68681_context        *pmc68681Context;
-  setRegister_f           setReg;
-  getRegister_f           getReg;
-
-  pmc68681Context = (mc68681_context *) malloc(sizeof(mc68681_context));
-
-  Console_Port_Data[minor].pDeviceContext = (void *)pmc68681Context;
-
-  mc68681_initialize_context( minor, pmc68681Context );
-
-  pMC68681      = Console_Port_Tbl[minor].ulCtrlPort1;
-  pMC68681_port = Console_Port_Tbl[minor].ulCtrlPort2;
-  setReg        = Console_Port_Tbl[minor].setRegister;
-  getReg        = Console_Port_Tbl[minor].getRegister;
-
-  /*
-   *  Reset everything and leave this port disabled.
-   */
-
-  (*setReg)( pMC68681_port, MC68681_COMMAND, MC68681_MODE_REG_RESET_RX );
-  (*setReg)( pMC68681_port, MC68681_COMMAND, MC68681_MODE_REG_RESET_TX );
-  (*setReg)( pMC68681_port, MC68681_COMMAND, MC68681_MODE_REG_RESET_ERROR );
-  (*setReg)( pMC68681_port, MC68681_COMMAND, MC68681_MODE_REG_RESET_BREAK );
-  (*setReg)( pMC68681_port, MC68681_COMMAND, MC68681_MODE_REG_STOP_BREAK );
-  (*setReg)( pMC68681_port, MC68681_COMMAND, MC68681_MODE_REG_DISABLE_TX );
-  (*setReg)( pMC68681_port, MC68681_COMMAND, MC68681_MODE_REG_DISABLE_RX );
-
-
-  (*setReg)( pMC68681_port, MC68681_MODE_REG_1A, 0x00 );
-  (*setReg)( pMC68681_port, MC68681_MODE_REG_2A, 0x02 );
-
-  /*
-   *  Disable interrupts on RX and TX for this port
-   */
-
-  mc68681_enable_interrupts( minor, MC68681_IMR_DISABLE_ALL );
-}
-
-/*
- *  mc68681_open
- *
- *  This function opens a port for communication.
- *
- *  Default state is 9600 baud, 8 bits, No parity, and 1 stop bit.
- */
-
-MC68681_STATIC int mc68681_open(
-  int      major,
-  int      minor,
-  void    *arg
-)
-{
-  unsigned32             pMC68681;
-  unsigned32             pMC68681_port;
-  unsigned int           baud;
-  unsigned int           acr;
-  unsigned int           vector;
-  unsigned int           command;
-  rtems_interrupt_level  Irql;
-  setRegister_f          setReg;
-
-  pMC68681      = Console_Port_Tbl[minor].ulCtrlPort1;
-  pMC68681_port = Console_Port_Tbl[minor].ulCtrlPort2;
-  setReg        = Console_Port_Tbl[minor].setRegister;
-  vector        = Console_Port_Tbl[minor].ulIntVector;
-
-  /* XXX default baud rate should be from configuration table */
-
-  (void) mc68681_baud_rate( minor, B9600, &baud, &acr, &command );
-
-  /*
-   *  Set the DUART channel to a default useable state
-   */
-
-  rtems_interrupt_disable(Irql);
-    (*setReg)( pMC68681, MC68681_AUX_CTRL_REG, acr );
-    (*setReg)( pMC68681_port, MC68681_CLOCK_SELECT, baud );
-    if ( command ) {
-      (*setReg)( pMC68681_port, MC68681_COMMAND, command );         /* RX */
-      (*setReg)( pMC68681_port, MC68681_COMMAND, command | 0x20 );  /* TX */
-    }
-    (*setReg)( pMC68681_port, MC68681_COMMAND, MC68681_MODE_REG_RESET_MR_PTR );
-    (*setReg)( pMC68681_port, MC68681_MODE, 0x13 );
-    (*setReg)( pMC68681_port, MC68681_MODE, 0x07 );
-  rtems_interrupt_enable(Irql);
-
-  (*setReg)( pMC68681_port, MC68681_COMMAND, MC68681_MODE_REG_ENABLE_TX );
-  (*setReg)( pMC68681_port, MC68681_COMMAND, MC68681_MODE_REG_ENABLE_RX );
-
-  (*setReg)( pMC68681, MC68681_INTERRUPT_VECTOR_REG, vector );
-
-  return RTEMS_SUCCESSFUL;
-}
-
-/*
- *  mc68681_close
- *
- *  This function shuts down the requested port.
- */
-
-MC68681_STATIC int mc68681_close(
-  int      major,
-  int      minor,
-  void    *arg
-)
-{
-  unsigned32      pMC68681;
-  unsigned32      pMC68681_port;
-  setRegister_f   setReg;
-
-  pMC68681      = Console_Port_Tbl[minor].ulCtrlPort1;
-  pMC68681_port = Console_Port_Tbl[minor].ulCtrlPort2;
-  setReg        = Console_Port_Tbl[minor].setRegister;
-
-  /*
-   *  Disable interrupts from this channel and then disable it totally.
-   */
-
-#if 0
-  (*setReg)( pMC68681_port, MC68681_COMMAND, MC68681_MODE_REG_DISABLE_TX );
-  (*setReg)( pMC68681_port, MC68681_COMMAND, MC68681_MODE_REG_DISABLE_RX );
-#endif
-
-  return(RTEMS_SUCCESSFUL);
-}
-
-/* 
- *  mc68681_write_polled
- *
- *  This routine polls out the requested character.
- */
-
-MC68681_STATIC void mc68681_write_polled(
-  int   minor, 
-  char  cChar
-)
-{
-  unsigned32              pMC68681_port;
-  unsigned char           ucLineStatus;
-  int                     iTimeout;
-  getRegister_f           getReg;
-  setRegister_f           setReg;
-
-  pMC68681_port = Console_Port_Tbl[minor].ulCtrlPort2;
-  getReg        = Console_Port_Tbl[minor].getRegister;
-  setReg        = Console_Port_Tbl[minor].setRegister;
-
-  /*
-   * wait for transmitter holding register to be empty
-   */
-  iTimeout = 1000;
-  ucLineStatus = (*getReg)(pMC68681_port, MC68681_STATUS);
-  while ((ucLineStatus & (MC68681_TX_READY|MC68681_TX_EMPTY)) == 0) {
-
-    if ((ucLineStatus & 0xF0))
-      (*setReg)( pMC68681_port, MC68681_COMMAND, MC68681_MODE_REG_RESET_ERROR );
-
-    /*
-     * Yield while we wait
-     */
-
-#if 0
-     if(_System_state_Is_up(_System_state_Get())) {
-       rtems_task_wake_after(RTEMS_YIELD_PROCESSOR);
-     }
-#endif
-     ucLineStatus = (*getReg)(pMC68681_port, MC68681_STATUS);
-     if(!--iTimeout) {
-       break;
-     }
-  }
-
-  /*
-   * transmit character
-   */
-
-  (*setReg)(pMC68681_port, MC68681_TX_BUFFER, cChar);
-}
-
-/*
- *  mc68681_isr
- *
- *  This is the single interrupt entry point which parcels interrupts
- *  out to the various ports.
- */
-
-MC68681_STATIC rtems_isr mc68681_isr(
-  rtems_vector_number vector
-)
-{
-  int     minor;
-
-  for(minor=0 ; minor<Console_Port_Count ; minor++) {
-    if(Console_Port_Tbl[minor].ulIntVector == vector && 
-       Console_Port_Tbl[minor].deviceType == SERIAL_MC68681 ) {
-      mc68681_process(minor);
-    }
-  }
-}
-
-/*
- *  mc68681_initialize_interrupts
- *
- *  This routine initializes the console's receive and transmit
- *  ring buffers and loads the appropriate vectors to handle the interrupts.
- */
-
-MC68681_STATIC void mc68681_initialize_interrupts(int minor)
-{
-  mc68681_init(minor);
-
-  Console_Port_Data[minor].bActive = FALSE;
-
-  set_vector(mc68681_isr, Console_Port_Tbl[minor].ulIntVector, 1);
-
-  mc68681_enable_interrupts(minor,MC68681_IMR_ENABLE_ALL_EXCEPT_TX);
-}
-
-/* 
- *  mc68681_write_support_int
- *
- *  Console Termios output entry point when using interrupt driven output.
- */
-
-MC68681_STATIC int mc68681_write_support_int(
-  int         minor, 
-  const char *buf, 
-  int         len
-)
-{
-  unsigned32      Irql;
-  unsigned32      pMC68681_port;
-  setRegister_f   setReg;
-
-  pMC68681_port = Console_Port_Tbl[minor].ulCtrlPort2;
-  setReg        = Console_Port_Tbl[minor].setRegister;
-
-  /*
-   *  We are using interrupt driven output and termios only sends us
-   *  one character at a time.
-   */
-
-  if ( !len )
-    return 0;
-
-  /*
-   *  Put the character out and enable interrupts if necessary.
-   */
-
-  rtems_interrupt_disable(Irql);
-    if ( Console_Port_Data[minor].bActive == FALSE ) {
-      Console_Port_Data[minor].bActive = TRUE;
-      mc68681_enable_interrupts(minor, MC68681_IMR_ENABLE_ALL);
-    }
-    (*setReg)(pMC68681_port, MC68681_TX_BUFFER, *buf);
-  rtems_interrupt_enable(Irql);
-
-  return 1;
-}
-
-/* 
- *  mc68681_write_support_polled
- *
- *  Console Termios output entry point when using polled output.
- *
- */
-
-MC68681_STATIC int mc68681_write_support_polled(
-  int         minor, 
-  const char *buf, 
-  int         len
-)
-{
-  int nwrite = 0;
-
-  /*
-   * poll each byte in the string out of the port.
-   */
-  while (nwrite < len) {
-    /*
-     * transmit character
-     */
-    mc68681_write_polled(minor, *buf++);
-    nwrite++;
-  }
-
-  /*
-   * return the number of bytes written.
-   */
-  return nwrite;
-}
-
-/* 
- *  mc68681_inbyte_nonblocking_polled 
- *
- *  Console Termios polling input entry point.
- */
-
-MC68681_STATIC int mc68681_inbyte_nonblocking_polled( 
-  int minor 
-)
-{
-  unsigned32           pMC68681_port;
-  unsigned char        ucLineStatus;
-  unsigned char        cChar;
-  getRegister_f        getReg;
-
-  pMC68681_port = Console_Port_Tbl[minor].ulCtrlPort2;
-  getReg        = Console_Port_Tbl[minor].getRegister;
-
-  ucLineStatus = (*getReg)(pMC68681_port, MC68681_STATUS);
-  if(ucLineStatus & MC68681_RX_READY) {
-    cChar = (*getReg)(pMC68681_port, MC68681_RX_BUFFER);
-    return (int)cChar;
-  } else {
-    return -1;
-  }
-}
-
-/*
- *  mc68681_baud_rate
- */
-
-MC68681_STATIC int mc68681_baud_rate(
-  int           minor,
-  int           baud,
-  unsigned int *baud_mask_p,
-  unsigned int *acr_bit_p,
-  unsigned int *command
-)
-{
-  unsigned int           baud_mask;
-  unsigned int           acr_bit;
-  int                    status;
-  int                    is_extended;
-  int                    baud_requested;
-  mc68681_baud_table_t  *baud_tbl;
-
-  baud_mask = 0;
-  acr_bit = 0;
-  status = 0;
-
-  if ( !(Console_Port_Tbl[minor].ulDataPort & MC68681_DATA_BAUD_RATE_SET_1) )
-    acr_bit = 1;
-
-  is_extended = 0;
-
-  switch (Console_Port_Tbl[minor].ulDataPort & MC68681_XBRG_MASK) {
-    case MC68681_XBRG_IGNORED:
-      *command = 0x00;
-      break;
-    case MC68681_XBRG_ENABLED:
-      *command = 0x80;
-      is_extended = 1;
-      break;
-    case MC68681_XBRG_DISABLED:
-      *command = 0x90;
-      break;
-  }
-
-  baud_requested = baud & CBAUD;
-  if (!baud_requested)
-    baud_requested = B9600;              /* default to 9600 baud */
-  
-  baud_requested = termios_baud_to_index( baud_requested );
-
-  baud_tbl = (mc68681_baud_table_t *) Console_Port_Tbl[minor].ulClock;
-  if (!baud_tbl)
-    rtems_fatal_error_occurred(RTEMS_INVALID_ADDRESS);
-
-  if ( is_extended )
-    baud_mask = (unsigned int)baud_tbl[ acr_bit + 2 ][ baud_requested ];
-  else
-    baud_mask = baud_tbl[ acr_bit ][ baud_requested ];
-
-  if ( baud_mask == MC68681_BAUD_NOT_VALID )
-    status = -1;
-
-  /*
-   *  upper nibble is receiver and lower nibble is transmitter
-   */
-
-  *baud_mask_p = (baud_mask << 4) | baud_mask;
-  *acr_bit_p   = acr_bit;
-  return status;
-}
-
-/*
- *  mc68681_process
- *
- *  This routine is the per port console interrupt handler.
- */
-
-MC68681_STATIC void mc68681_process(
-  int  minor
-)
-{
-  unsigned32              pMC68681;
-  unsigned32              pMC68681_port;
-  volatile unsigned8      ucLineStatus; 
-  unsigned char           cChar;
-  getRegister_f           getReg;
-  setRegister_f           setReg;
-
-  pMC68681      = Console_Port_Tbl[minor].ulCtrlPort1;
-  pMC68681_port = Console_Port_Tbl[minor].ulCtrlPort2;
-  getReg        = Console_Port_Tbl[minor].getRegister;
-  setReg        = Console_Port_Tbl[minor].setRegister;
-
-  /*
-   * Deal with any received characters
-   */
-  while(TRUE) {
-    ucLineStatus = (*getReg)(pMC68681_port, MC68681_STATUS);
-    if(!(ucLineStatus & MC68681_RX_READY)) {
-      break;
-    }
-    /*
-     *  If there is a RX error, then dump all the data.
-     */
-    if ( ucLineStatus & MC68681_RX_ERRORS ) {
-      do {
-        cChar = (*getReg)(pMC68681_port, MC68681_RX_BUFFER);
-        ucLineStatus = (*getReg)(pMC68681_port, MC68681_STATUS);
-      } while ( ucLineStatus & MC68681_RX_READY );
-      continue;
-    }
-    cChar = (*getReg)(pMC68681_port, MC68681_RX_BUFFER);
-    rtems_termios_enqueue_raw_characters( 
-      Console_Port_Data[minor].termios_data,
-      &cChar, 
-      1 
-    );
-  }
-
-  /*
-   *  Deal with the transmitter
-   */
-
-  ucLineStatus = (*getReg)(pMC68681, MC68681_INTERRUPT_STATUS_REG);
-  if (pMC68681 != pMC68681_port)
-    ucLineStatus >>= 4;
-
-  if(ucLineStatus & MC68681_IR_TX_READY) {
-    rtems_termios_dequeue_characters(Console_Port_Data[minor].termios_data, 1);
-    if (rtems_termios_is_more_to_tx( Console_Port_Data[minor].termios_data )) {
-      Console_Port_Data[minor].bActive = FALSE;
-      mc68681_enable_interrupts(minor, MC68681_IMR_ENABLE_ALL_EXCEPT_TX);
-    }
-  }
-
-}
-
-/*
- *  mc68681_build_imr
- *
- *  This function returns the value for the interrupt mask register for this
- *  DUART.  Since this is a shared register, we must look at the other port
- *  on this chip to determine whether or not it is using interrupts.
- */
-
-MC68681_STATIC unsigned int mc68681_build_imr(
-  int  minor,
-  int  enable_flag
-)
-{
-  int              mate;
-  int              is_a;
-  unsigned int     mask;
-  unsigned int     mate_mask;
-  unsigned int     pMC68681;
-  unsigned int     pMC68681_port;
-  mc68681_context *pmc68681Context;
-  mc68681_context *mateContext;
-  
-  pMC68681        = Console_Port_Tbl[minor].ulCtrlPort1;
-  pMC68681_port   = Console_Port_Tbl[minor].ulCtrlPort2;
-  pmc68681Context = (mc68681_context *) Console_Port_Data[minor].pDeviceContext;
-  mate            = pmc68681Context->mate;
-
-  mask = 0;
-  mate_mask = 0;
-
-  is_a = (pMC68681 == pMC68681_port);
- 
-  /*
-   *  If there is a mate for this port, get its IMR mask.
-   */
-
-  if ( mate != -1 ) {
-    mateContext = Console_Port_Data[mate].pDeviceContext;
-    
-    if (mateContext)
-      mate_mask = mateContext->imr;
-  }
-
-  /*
-   *  Calculate this port's IMR mask and save it in the context area.
-   */
-
-  if ( Console_Port_Tbl[minor].pDeviceFns->deviceOutputUsesInterrupts )
-    mask = enable_flag;
-
-  pmc68681Context->imr = mask;
-
-  /*
-   *  Now return the full IMR value
-   */
-
-  if (is_a)
-    return (mate_mask << 4) | mask;
-
-  return (mask << 4) | mate_mask;
-}
-
-/*
- *  mc68681_enable_interrupts
- *
- *  This function enables specific interrupt sources on the DUART.
- */
-
-MC68681_STATIC void mc68681_enable_interrupts(
-  int minor,
-  int imr_mask
-)
-{
-  unsigned32            pMC68681;
-  setRegister_f         setReg;
-
-  pMC68681 = Console_Port_Tbl[minor].ulCtrlPort1;
-  setReg   = Console_Port_Tbl[minor].setRegister;
-
-  /*
-   *  Enable interrupts on RX and TX -- not break
-   */
-
-  (*setReg)(
-     pMC68681,
-     MC68681_INTERRUPT_MASK_REG,
-     mc68681_build_imr(minor, imr_mask)
-  );
-}
diff --git a/c/src/lib/libchip/serial/mc68681.h b/c/src/lib/libchip/serial/mc68681.h
deleted file mode 100644
index 57713e3eff..0000000000
--- a/c/src/lib/libchip/serial/mc68681.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef _MC68681_H_
-#define _MC68681_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- *  These are just used in the interface between this driver and
- *  the read/write register routines when accessing the first
- *  control port.
- */
-
-#define MC68681_STATUS          1
-#define MC68681_RX_BUFFER       3
-
-#define MC68681_MODE            0
-#define MC68681_CLOCK_SELECT    1
-#define MC68681_COMMAND         2
-#define MC68681_TX_BUFFER       3
-
-/*
- *  Data Port bit map configuration
- *
- *   D0      : Baud Rate Set Selection
- *   D1 - D2 : Extended Baud Rate Setting
- */
-
-#define MC68681_DATA_BAUD_RATE_SET_1      0  /* ACR[7] = 0 */
-#define MC68681_DATA_BAUD_RATE_SET_2      1  /* ACR[7] = 1 */
-
-#define MC68681_XBRG_IGNORED              (0 << 1)
-#define MC68681_XBRG_ENABLED              (1 << 1)
-#define MC68681_XBRG_DISABLED             (2 << 1)
-#define MC68681_XBRG_MASK                 (3 << 1)
-
-/*
- *  Custom baud rate table information
- */
-
-typedef unsigned char mc68681_baud_t;
-typedef mc68681_baud_t mc68681_baud_table_t[RTEMS_TERMIOS_NUMBER_BAUD_RATES];
-
-#define MC68681_BAUD_NOT_VALID 0xFF
-
-extern mc68681_baud_t 
-    mc68681_baud_rate_table[4][RTEMS_TERMIOS_NUMBER_BAUD_RATES];
-
-
-/*
- * Driver function table
- */
-
-extern console_fns mc68681_fns;
-extern console_fns mc68681_fns_polled;
-
-/*
- * Default register access routines
- */
-
-unsigned8 mc68681_get_register(     /* registers are at 1 byte boundaries */
-  unsigned32  ulCtrlPort,           /*   and accessed as bytes            */
-  unsigned8   ucRegNum
-);
-
-void  mc68681_set_register(
-  unsigned32  ulCtrlPort,
-  unsigned8   ucRegNum,
-  unsigned8   ucData
-);
-
-unsigned8 mc68681_get_register_2(   /* registers are at 2 byte boundaries */
-  unsigned32  ulCtrlPort,           /*   and accessed as bytes            */
-  unsigned8   ucRegNum
-);
-
-void  mc68681_set_register_2(
-  unsigned32  ulCtrlPort,
-  unsigned8   ucRegNum,
-  unsigned8   ucData
-);
-
-unsigned8 mc68681_get_register_4(   /* registers are at 4 byte boundaries */
-  unsigned32  ulCtrlPort,           /*   and accessed as bytes            */
-  unsigned8   ucRegNum
-);
-
-void  mc68681_set_register_4(
-  unsigned32  ulCtrlPort,
-  unsigned8   ucRegNum,
-  unsigned8   ucData
-);
-
-unsigned8 mc68681_get_register_8(   /* registers are at 8 byte boundaries */
-  unsigned32  ulCtrlPort,           /*   and accessed as bytes            */
-  unsigned8   ucRegNum
-);
-
-void  mc68681_set_register_8(
-  unsigned32  ulCtrlPort,
-  unsigned8   ucRegNum,
-  unsigned8   ucData
-);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _MC68681_H_ */
diff --git a/c/src/lib/libchip/serial/mc68681_baud.c b/c/src/lib/libchip/serial/mc68681_baud.c
deleted file mode 100644
index d91774e501..0000000000
--- a/c/src/lib/libchip/serial/mc68681_baud.c
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- *  MC68681 Default Baud Rate Table
- *
- *  $Id$
- */
-
-#include <rtems.h>
-#include <libchip/serial.h>
-#include <libchip/mc68681.h>
-
-/* major index of 0 : ACR[7] = 0, X = 0 -- 68c681 only has these */
-/* major index of 1 : ACR[7] = 1, X = 0 -- 68c681 only has these */
-/* major index of 2 : ACR[7] = 0, X = 1 */
-/* major index of 3 : ACR[7] = 1, X = 1 */
-
-/* mc68681_baud_table_t mc68681_baud_rate_table[4] = { */
-mc68681_baud_t mc68681_baud_rate_table[4][RTEMS_TERMIOS_NUMBER_BAUD_RATES] = {
-  { /* ACR[7] = 0, X = 0 */
-    MC68681_BAUD_NOT_VALID,    /* B0 */
-    0x00,                      /* B50 */
-    MC68681_BAUD_NOT_VALID,    /* B75 */
-    0x01,                      /* B110 */
-    0x02,                      /* B134 */
-    MC68681_BAUD_NOT_VALID,    /* B150 */
-    0x03,                      /* B200 */
-    0x04,                      /* B300 */
-    0x05,                      /* B600 */
-    0x06,                      /* B1200 */
-    MC68681_BAUD_NOT_VALID,    /* B1800 */
-    0x08,                      /* B2400 */
-    0x09,                      /* B4800 */
-    0x0B,                      /* B9600 */
-    MC68681_BAUD_NOT_VALID,    /* B19200 */
-    0x0C,                      /* B38400 */
-    MC68681_BAUD_NOT_VALID,    /* B57600 */
-    MC68681_BAUD_NOT_VALID,    /* B115200 */
-    MC68681_BAUD_NOT_VALID,    /* B230400 */
-    MC68681_BAUD_NOT_VALID     /* B460800 */
-  },
-  { /* ACR[7] = 1, X = 0 */
-    MC68681_BAUD_NOT_VALID,    /* B0 */
-    MC68681_BAUD_NOT_VALID,    /* B50 */
-    0x00,                      /* B75 */
-    0x01,                      /* B110 */
-    0x02,                      /* B134 */
-    0x03,                      /* B150 */
-    MC68681_BAUD_NOT_VALID,    /* B200 */
-    0x04,                      /* B300 */
-    0x05,                      /* B600 */
-    0x06,                      /* B1200 */
-    0x0A,                      /* B1800 */
-    0x08,                      /* B2400 */
-    0x09,                      /* B4800 */
-    0x0B,                      /* B9600 */
-    0x0C,                      /* B19200 */
-    MC68681_BAUD_NOT_VALID,    /* B38400 */
-    MC68681_BAUD_NOT_VALID,    /* B57600 */
-    MC68681_BAUD_NOT_VALID,    /* B115200 */
-    MC68681_BAUD_NOT_VALID,    /* B230400 */
-    MC68681_BAUD_NOT_VALID     /* B460800 */
-  },
-  { /* ACR[7] = 0, X = 1 */
-    MC68681_BAUD_NOT_VALID,    /* B0 */
-    MC68681_BAUD_NOT_VALID,    /* B50 */
-    0x00,                      /* B75 */
-    0x01,                      /* B110 */
-    0x02,                      /* B134 */
-    0x03,                      /* B150 */
-    MC68681_BAUD_NOT_VALID,    /* B200 */
-    MC68681_BAUD_NOT_VALID,    /* B300 */
-    MC68681_BAUD_NOT_VALID,    /* B600 */
-    MC68681_BAUD_NOT_VALID,    /* B1200 */
-    0x0A,                      /* B1800 */
-    MC68681_BAUD_NOT_VALID,    /* B2400 */
-    0x08,                      /* B4800 */
-    0x0B,                      /* B9600 */
-    0x0C,                      /* B19200 */
-    MC68681_BAUD_NOT_VALID,    /* B38400 */
-    0x07,                      /* B57600 */
-    0x08,                      /* B115200 */
-    MC68681_BAUD_NOT_VALID,    /* B230400 */
-    MC68681_BAUD_NOT_VALID     /* B460800 */
-  },
-  { /* ACR[7] = 1, X = 1 */
-    MC68681_BAUD_NOT_VALID,    /* B0 */
-    0x00,                      /* B50 */
-    MC68681_BAUD_NOT_VALID,    /* B75 */
-    0x01,                      /* B110 */
-    0x02,                      /* B134 */
-    MC68681_BAUD_NOT_VALID,    /* B150 */
-    0x03,                      /* B200 */
-    MC68681_BAUD_NOT_VALID,    /* B300 */
-    MC68681_BAUD_NOT_VALID,    /* B600 */
-    MC68681_BAUD_NOT_VALID,    /* B1200 */
-    MC68681_BAUD_NOT_VALID,    /* B1800 */
-    MC68681_BAUD_NOT_VALID,    /* B2400 */
-    0x09,                      /* B4800 */
-    0x0B,                      /* B9600 */
-    MC68681_BAUD_NOT_VALID,    /* B19200 */
-    0x0C,                      /* B38400 */
-    0x07,                      /* B57600 */
-    0x08,                      /* B115200 */
-    MC68681_BAUD_NOT_VALID,    /* B230400 */
-    MC68681_BAUD_NOT_VALID     /* B460800 */
-  },
-};
-
diff --git a/c/src/lib/libchip/serial/mc68681_p.h b/c/src/lib/libchip/serial/mc68681_p.h
deleted file mode 100644
index 471b0ae42e..0000000000
--- a/c/src/lib/libchip/serial/mc68681_p.h
+++ /dev/null
@@ -1,317 +0,0 @@
-/*
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef _MC68681_P_H_
-#define _MC68681_P_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- *  Define MC68681_STATIC to nothing while debugging so the entry points
- *  will show up in the symbol table.
- */
-
-#define MC68681_STATIC
-
-/* #define MC68681_STATIC static */
-
-/*
- * mc68681 register offsets Read/Write Addresses
- */
-
-#define MC68681_MODE_REG_1A  0  /* MR1A-MR Prior to Read */
-#define MC68681_MODE_REG_2A  0  /* MR2A-MR After Read    */
-
-#define MC68681_COUNT_MODE_CURRENT_MSB       6  /* CTU   */
-#define MC68681_COUNTER_TIMER_UPPER_REG      6  /* CTU   */
-#define MC68681_COUNT_MODE_CURRENT_LSB       7  /* CTL   */
-#define MC68681_COUNTER_TIMER_LOWER_REG      7  /* CTL   */
-#define MC68681_INTERRUPT_VECTOR_REG        12  /* IVR   */
-
-#define MC68681_MODE_REG_1B  8  /* MR1B-MR Prior to Read */
-#define MC68681_MODE_REG_2B  8  /* MR2BA-MR After Read   */
-
-/*
- * mc68681 register offsets Read Only  Addresses
- */
-
-#define MC68681_STATUS_REG_A                 1  /* SRA   */
-#define MC68681_MASK_ISR_REG                 2  /* MISR  */
-#define MC68681_RECEIVE_BUFFER_A             3  /* RHRA  */
-#define MC68681_INPUT_PORT_CHANGE_REG        4  /* IPCR  */
-#define MC68681_INTERRUPT_STATUS_REG         5  /* ISR   */
-#define MC68681_STATUS_REG_B                 9  /* SRB   */
-#define MC68681_RECEIVE_BUFFER_B            11  /* RHRB  */
-#define MC68681_INPUT_PORT                  13  /* IP    */
-#define MC68681_START_COUNT_CMD             14  /* SCC   */
-#define MC68681_STOP_COUNT_CMD              15  /* STC   */
-
-/*
- * mc68681 register offsets Write Only  Addresses
- */
-
-#define MC68681_CLOCK_SELECT_REG_A           1  /* CSRA  */
-#define MC68681_COMMAND_REG_A                2  /* CRA   */
-#define MC68681_TRANSMIT_BUFFER_A            3  /* THRA  */
-#define MC68681_AUX_CTRL_REG                 4  /* ACR   */
-#define MC68681_INTERRUPT_MASK_REG           5  /* IMR   */
-#define MC68681_CLOCK_SELECT_REG_B           9  /* CSRB  */
-#define MC68681_COMMAND_REG_B               10  /* CRB   */
-#define MC68681_TRANSMIT_BUFFER_B           11  /* THRB  */
-#define MC68681_OUTPUT_PORT_CONFIG_REG      13  /* OPCR  */
-#define MC68681_OUTPUT_PORT_SET_REG         14  /* SOPBC */
-#define MC68681_OUTPUT_PORT_RESET_BITS      15  /* COPBC */
-
-/*
- *  DUART Command Register Definitions:
- *
- *  MC68681_COMMAND_REG_A,MC68681_COMMAND_REG_B
- */
-
-#define MC68681_MODE_REG_ENABLE_RX                          0x01
-#define MC68681_MODE_REG_DISABLE_RX                         0x02
-#define MC68681_MODE_REG_ENABLE_TX                          0x04
-#define MC68681_MODE_REG_DISABLE_TX                         0x08
-#define MC68681_MODE_REG_RESET_MR_PTR                       0x10
-#define MC68681_MODE_REG_RESET_RX                           0x20
-#define MC68681_MODE_REG_RESET_TX                           0x30
-#define MC68681_MODE_REG_RESET_ERROR                        0x40
-#define MC68681_MODE_REG_RESET_BREAK                        0x50
-#define MC68681_MODE_REG_START_BREAK                        0x60
-#define MC68681_MODE_REG_STOP_BREAK                         0x70
-#define MC68681_MODE_REG_SET_RX_BRG                         0x80
-#define MC68681_MODE_REG_CLEAR_RX_BRG                       0x90
-#define MC68681_MODE_REG_SET_TX_BRG                         0xa0
-#define MC68681_MODE_REG_CLEAR_TX_BRG                       0xb0
-#define MC68681_MODE_REG_SET_STANDBY                        0xc0
-#define MC68681_MODE_REG_SET_ACTIVE                         0xd0
-
-/*
- * Mode Register Definitions
- *
- *  MC68681_MODE_REG_1A
- *  MC68681_MODE_REG_1B
- */
-
-#define MC68681_5BIT_CHARS                                  0x00
-#define MC68681_6BIT_CHARS                                  0x01
-#define MC68681_7BIT_CHARS                                  0x02
-#define MC68681_8BIT_CHARS                                  0x03
-
-#define MC68681_ODD_PARITY                                  0x00
-#define MC68681_EVEN_PARITY                                 0x04
-
-#define MC68681_WITH_PARITY                                 0x00
-#define MC68681_FORCE_PARITY                                0x08
-#define MC68681_NO_PARITY                                   0x10
-#define MC68681_MULTI_DROP                                  0x18
-
-#define MC68681_ERR_MODE_CHAR                               0x00
-#define MC68681_ERR_MODE_BLOCK                              0x20
-
-#define MC68681_RX_INTR_RX_READY                            0x00
-#define MC68681_RX_INTR_FFULL                               0x40
-
-#define MC68681_NO_RX_RTS_CTL                               0x00
-#define MC68681_RX_RTS_CTRL                                 0x80
-
-/*
- * Mode Register Definitions
- *
- *  MC68681_MODE_REG_2A
- *  MC68681_MODE_REG_2B
- */
-
-#define MC68681_STOP_BIT_LENGTH__563                        0x00
-#define MC68681_STOP_BIT_LENGTH__625                        0x01
-#define MC68681_STOP_BIT_LENGTH__688                        0x02
-#define MC68681_STOP_BIT_LENGTH__75                         0x03
-#define MC68681_STOP_BIT_LENGTH__813                        0x04
-#define MC68681_STOP_BIT_LENGTH__875                        0x05
-#define MC68681_STOP_BIT_LENGTH__938                        0x06
-#define MC68681_STOP_BIT_LENGTH_1                           0x07
-#define MC68681_STOP_BIT_LENGTH_1_563                       0x08
-#define MC68681_STOP_BIT_LENGTH_1_625                       0x09
-#define MC68681_STOP_BIT_LENGTH_1_688                       0x0a
-#define MC68681_STOP_BIT_LENGTH_1_75                        0x0b
-#define MC68681_STOP_BIT_LENGTH_1_813                       0x0c
-#define MC68681_STOP_BIT_LENGTH_1_875                       0x0d
-#define MC68681_STOP_BIT_LENGTH_1_938                       0x0e
-#define MC68681_STOP_BIT_LENGTH_2                           0x0f
-
-#define MC68681_CTS_ENABLE_TX                               0x10
-#define MC68681_TX_RTS_CTRL                                 0x20
-
-#define MC68681_CHANNEL_MODE_NORMAL                         0x00
-#define MC68681_CHANNEL_MODE_ECHO                           0x40
-#define MC68681_CHANNEL_MODE_LOCAL_LOOP                     0x80
-#define MC68681_CHANNEL_MODE_REMOTE_LOOP                    0xc0
-
-/*
- * Status Register Definitions
- *
- *    MC68681_STATUS_REG_A,  MC68681_STATUS_REG_B
- */
-
-#define MC68681_RX_READY                                    0x01
-#define MC68681_FFULL                                       0x02
-#define MC68681_TX_READY                                    0x04
-#define MC68681_TX_EMPTY                                    0x08
-#define MC68681_OVERRUN_ERROR                               0x10
-#define MC68681_PARITY_ERROR                                0x20
-#define MC68681_FRAMING_ERROR                               0x40
-#define MC68681_RECEIVED_BREAK                              0x80
-
-#define MC68681_RX_ERRORS \
-  (MC68681_OVERRUN_ERROR|MC68681_PARITY_ERROR| \
-   MC68681_FRAMING_ERROR|MC68681_RECEIVED_BREAK)
-
-/*
- * Interupt Status Register Definitions.
- *
- * MC68681_INTERRUPT_STATUS_REG
- */
-
-/*
- *  Interupt Mask Register Definitions
- *
- *  MC68681_INTERRUPT_MASK_REG
- */
-
-/* These are passed to mc68681_build_imr */
-#define MC68681_IR_TX_READY                                 0x01
-#define MC68681_IR_RX_READY                                 0x02
-#define MC68681_IR_BREAK                                    0x04
-#define MC68681_IMR_ENABLE_ALL                              0x07
-#define MC68681_IMR_DISABLE_ALL                             0x00
-#define MC68681_IMR_ENABLE_ALL_EXCEPT_TX                    0x06
-
-#define MC68681_IR_TX_READY_A                               0x01
-#define MC68681_IR_RX_READY_A                               0x02
-#define MC68681_IR_BREAK_A                                  0x04
-#define MC68681_IR_COUNTER_READY                            0x08
-#define MC68681_IR_TX_READY_B                               0x10
-#define MC68681_IR_RX_READY_B                               0x20
-#define MC68681_IR_BREAK_B                                  0x40
-#define MC68681_IR_INPUT_PORT_CHANGE                        0x80
-
-/*
- * Status Register Definitions.
- *
- * MC68681_STATUS_REG_A,MC68681_STATUS_REG_B
- */
-
-#define MC68681_STATUS_RXRDY                                0x01
-#define MC68681_STATUS_FFULL                                0x02
-#define MC68681_STATUS_TXRDY                                0x04
-#define MC68681_STATUS_TXEMT                                0x08
-#define MC68681_STATUS_OVERRUN_ERROR                        0x10
-#define MC68681_STATUS_PARITY_ERROR                         0x20
-#define MC68681_STATUS_FRAMING_ERROR                        0x40
-#define MC68681_STATUS_RECEIVED_BREAK                       0x80
-
-/*
- * Definitions for the Interrupt Vector Register:
- *
- * MC68681_INTERRUPT_VECTOR_REG
- */
-
-#define  MC68681_INTERRUPT_VECTOR_INIT                      0x0f
-
-/*
- * Definitions for the Auxiliary Control Register
- *
- * MC68681_AUX_CTRL_REG
- */
-
-#define MC68681_AUX_BRG_SET1                                0x00
-#define MC68681_AUX_BRG_SET2                                0x80
-
-/*
- *  Per chip context control
- */
-
-typedef struct _mc68681_context
-{
-  int            mate;
-  unsigned char  imr;
-} mc68681_context;
-
-/*
- * Driver functions
- */
-MC68681_STATIC boolean mc68681_probe(int minor);
-
-MC68681_STATIC int mc68681_set_attributes( 
-  int minor,
-  const struct termios *t
-);
-
-MC68681_STATIC void mc68681_init(int minor);
-
-MC68681_STATIC int mc68681_open(
-  int major,
-  int minor,
-  void  * arg
-);
-
-MC68681_STATIC int mc68681_close(
-  int major,
-  int minor,
-  void  * arg
-);
-
-MC68681_STATIC void mc68681_write_polled(
-  int   minor, 
-  char  cChar
-);
-
-MC68681_STATIC void mc68681_initialize_interrupts(int minor);
-
-MC68681_STATIC int mc68681_write_support_int(
-  int   minor,
-  const char *buf,
-  int   len
-);
-
-MC68681_STATIC int mc68681_write_support_polled(
-  int   minor,
-  const char *buf,
-  int   len
-  );
-
-MC68681_STATIC int mc68681_inbyte_nonblocking_polled(
-  int minor
-);
-
-MC68681_STATIC unsigned int mc68681_build_imr(
-  int  minor,
-  int  enable_flag
-);
-
-MC68681_STATIC void mc68681_process(
-  int  minor
-);
-
-MC68681_STATIC void mc68681_enable_interrupts(
-  int minor,
-  int imr_mask
-);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _MC68681_P_H_ */
diff --git a/c/src/lib/libchip/serial/mc68681_reg.c b/c/src/lib/libchip/serial/mc68681_reg.c
deleted file mode 100644
index 115bafdfe8..0000000000
--- a/c/src/lib/libchip/serial/mc68681_reg.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- *  This file contains a typical set of register access routines which may be
- *  used with the mc68681 chip if accesses to the chip are as follows:
- *
- *    + registers are accessed as bytes
- *    + registers are only byte-aligned (no address gaps)
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems.h>
-
-#ifndef _MC68681_MULTIPLIER
-#define _MC68681_MULTIPLIER 1
-#define _MC68681_NAME(_X) _X
-#define _MC68681_TYPE unsigned8
-#endif
-
-#define CALCULATE_REGISTER_ADDRESS( _base, _reg ) \
-  (_MC68681_TYPE *)((_base) + ((_reg) * _MC68681_MULTIPLIER ))
-
-/* 
- *  MC68681 Get Register Routine
- */
-
-unsigned8 _MC68681_NAME(mc68681_get_register)(
-  unsigned32  ulCtrlPort,
-  unsigned8   ucRegNum
-)
-{
-  _MC68681_TYPE *port;
-
-  port = CALCULATE_REGISTER_ADDRESS( ulCtrlPort, ucRegNum );
-
-  return *port;
-}
-
-/*
- *  MC68681 Set Register Routine
- */
-
-void  _MC68681_NAME(mc68681_set_register)(
-  unsigned32  ulCtrlPort,
-  unsigned8   ucRegNum,
-  unsigned8   ucData
-)
-{
-  _MC68681_TYPE *port;
-
-  port = CALCULATE_REGISTER_ADDRESS( ulCtrlPort, ucRegNum );
-
-  *port = ucData;
-}
diff --git a/c/src/lib/libchip/serial/mc68681_reg2.c b/c/src/lib/libchip/serial/mc68681_reg2.c
deleted file mode 100644
index f786ab5df5..0000000000
--- a/c/src/lib/libchip/serial/mc68681_reg2.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- *  This file contains a typical set of register access routines which may be
- *  used with the mc68681 chip if accesses to the chip are as follows:
- *
- *    + registers are accessed as bytes
- *    + registers are on 16-bit boundaries
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define _MC68681_MULTIPLIER 2
-#define _MC68681_NAME(_X) _X##_2
-#define _MC68681_TYPE unsigned8
-
-#include "mc68681_reg.c"
-
diff --git a/c/src/lib/libchip/serial/mc68681_reg4.c b/c/src/lib/libchip/serial/mc68681_reg4.c
deleted file mode 100644
index 075a9b2564..0000000000
--- a/c/src/lib/libchip/serial/mc68681_reg4.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- *  This file contains a typical set of register access routines which may be
- *  used with the mc68681 chip if accesses to the chip are as follows:
- *
- *    + registers are accessed as bytes
- *    + registers are on 32-bit boundaries
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define _MC68681_MULTIPLIER 4
-#define _MC68681_NAME(_X) _X##_4
-#define _MC68681_TYPE unsigned8
-
-#include "mc68681_reg.c"
-
diff --git a/c/src/lib/libchip/serial/mc68681_reg8.c b/c/src/lib/libchip/serial/mc68681_reg8.c
deleted file mode 100644
index b83ccd2b46..0000000000
--- a/c/src/lib/libchip/serial/mc68681_reg8.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- *  This file contains a typical set of register access routines which may be
- *  used with the mc68681 chip if accesses to the chip are as follows:
- *
- *    + registers are accessed as bytes
- *    + registers are on 64-bit boundaries
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define _MC68681_MULTIPLIER 8
-#define _MC68681_NAME(_X) _X##_8
-#define _MC68681_TYPE unsigned8
-
-#include "mc68681_reg.c"
-
diff --git a/c/src/lib/libchip/serial/ns16550.c b/c/src/lib/libchip/serial/ns16550.c
deleted file mode 100644
index 6f8c3f759f..0000000000
--- a/c/src/lib/libchip/serial/ns16550.c
+++ /dev/null
@@ -1,659 +0,0 @@
-/*
- *  This file contains the TTY driver for the National Semiconductor NS16550.
- *
- *  This part is widely cloned and second sourced.  It is found in a number 
- *  of "Super IO" controllers.
- *
- *  COPYRIGHT (c) 1998 by Radstone Technology
- *
- *
- * THIS FILE IS PROVIDED TO YOU, THE USER, "AS IS", WITHOUT WARRANTY OF ANY
- * KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTY OF FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK
- * AS TO THE QUALITY AND PERFORMANCE OF ALL CODE IN THIS FILE IS WITH YOU.
- *
- * You are hereby granted permission to use, copy, modify, and distribute
- * this file, provided that this notice, plus the above copyright notice
- * and disclaimer, appears in all copies. Radstone Technology will provide
- * no support for this code.
- *
- *  This driver uses the termios pseudo driver.
- */
-
-#include <rtems.h>
-#include <rtems/libio.h>
-#include <stdlib.h>
-#include <ringbuf.h>
-
-#include <libchip/serial.h>
-#include "ns16550_p.h"
-#include "sersupp.h"
-
-/*
- * Flow control is only supported when using interrupts
- */
-
-console_flow ns16550_flow_RTSCTS = {
-  ns16550_negate_RTS,             /* deviceStopRemoteTx */
-  ns16550_assert_RTS              /* deviceStartRemoteTx */
-};
-
-console_flow ns16550_flow_DTRCTS = {
-  ns16550_negate_DTR,             /* deviceStopRemoteTx */
-  ns16550_assert_DTR              /* deviceStartRemoteTx */
-};
-
-console_fns ns16550_fns = {
-  libchip_serial_default_probe,   /* deviceProbe */
-  ns16550_open,                   /* deviceFirstOpen */
-  NULL,                           /* deviceLastClose */
-  NULL,                           /* deviceRead */
-  ns16550_write_support_int,      /* deviceWrite */
-  ns16550_initialize_interrupts,  /* deviceInitialize */
-  ns16550_write_polled,           /* deviceWritePolled */
-  ns16550_set_attributes,         /* deviceSetAttributes */
-  TRUE                            /* deviceOutputUsesInterrupts */
-};
-
-console_fns ns16550_fns_polled = {
-  libchip_serial_default_probe,        /* deviceProbe */
-  ns16550_open,                        /* deviceFirstOpen */
-  ns16550_close,                       /* deviceLastClose */
-  ns16550_inbyte_nonblocking_polled,   /* deviceRead */
-  ns16550_write_support_polled,        /* deviceWrite */
-  ns16550_init,                        /* deviceInitialize */
-  ns16550_write_polled,                /* deviceWritePolled */
-  ns16550_set_attributes,              /* deviceSetAttributes */
-  FALSE                                /* deviceOutputUsesInterrupts */
-};
-
-extern void set_vector( rtems_isr_entry, rtems_vector_number, int );
-
-/*
- *  ns16550_init
- */
-
-NS16550_STATIC void ns16550_init(int minor)
-{
-  unsigned32              pNS16550;
-  unsigned8               ucTrash;
-  unsigned8               ucDataByte;
-  unsigned32              ulBaudDivisor;
-  ns16550_context        *pns16550Context;
-  setRegister_f           setReg;
-  getRegister_f           getReg;
-
-  pns16550Context=(ns16550_context *)malloc(sizeof(ns16550_context));
-
-  Console_Port_Data[minor].pDeviceContext=(void *)pns16550Context;
-  pns16550Context->ucModemCtrl=SP_MODEM_IRQ;
-
-  pNS16550 = Console_Port_Tbl[minor].ulCtrlPort1;
-  setReg   = Console_Port_Tbl[minor].setRegister;
-  getReg   = Console_Port_Tbl[minor].getRegister;
-
-  /* Clear the divisor latch, clear all interrupt enables,
-   * and reset and
-   * disable the FIFO's.
-   */
-
-  (*setReg)(pNS16550, NS16550_LINE_CONTROL, 0x0);
-  ns16550_enable_interrupts(minor, NS16550_DISABLE_ALL_INTR);
-
-  /* Set the divisor latch and set the baud rate. */
-
-  ulBaudDivisor=NS16550_Baud((unsigned32)Console_Port_Tbl[minor].pDeviceParams);
-  ucDataByte = SP_LINE_DLAB;
-  (*setReg)(pNS16550, NS16550_LINE_CONTROL, ucDataByte);
-
-  /* XXX */
-  (*setReg)(pNS16550, NS16550_TRANSMIT_BUFFER, ulBaudDivisor&0xff);
-  (*setReg)(pNS16550, NS16550_INTERRUPT_ENABLE, (ulBaudDivisor>>8)&0xff);
-
-  /* Clear the divisor latch and set the character size to eight bits */
-  /* with one stop bit and no parity checking. */
-  ucDataByte = EIGHT_BITS;
-  (*setReg)(pNS16550, NS16550_LINE_CONTROL, ucDataByte);
-
-  /* Enable and reset transmit and receive FIFOs. TJA     */
-  ucDataByte = SP_FIFO_ENABLE;
-  (*setReg)(pNS16550, NS16550_FIFO_CONTROL, ucDataByte);
-
-  ucDataByte = SP_FIFO_ENABLE | SP_FIFO_RXRST | SP_FIFO_TXRST;
-  (*setReg)(pNS16550, NS16550_FIFO_CONTROL, ucDataByte);
-
-  ns16550_enable_interrupts(minor, NS16550_DISABLE_ALL_INTR);
-
-  /* Set data terminal ready. */
-  /* And open interrupt tristate line */
-  (*setReg)(pNS16550, NS16550_MODEM_CONTROL,pns16550Context->ucModemCtrl);
-
-  ucTrash = (*getReg)(pNS16550, NS16550_LINE_STATUS );
-  ucTrash = (*getReg)(pNS16550, NS16550_RECEIVE_BUFFER );
-}
-
-/*
- *  ns16550_open
- */
-
-NS16550_STATIC int ns16550_open(
-  int      major,
-  int      minor,
-  void    * arg
-)
-{
-  /*
-   * Assert DTR
-   */
-
-  if(Console_Port_Tbl[minor].pDeviceFlow != &ns16550_flow_DTRCTS) {
-    ns16550_assert_DTR(minor);
-  }
-
-  return(RTEMS_SUCCESSFUL);
-}
-
-/*
- *  ns16550_close
- */
-
-NS16550_STATIC int ns16550_close(
-  int      major,
-  int      minor,
-  void    * arg
-)
-{
-  /*
-   * Negate DTR
-   */
-  if(Console_Port_Tbl[minor].pDeviceFlow != &ns16550_flow_DTRCTS) {
-    ns16550_negate_DTR(minor);
-  }
-
-  return(RTEMS_SUCCESSFUL);
-}
-
-/* 
- *  ns16550_write_polled
- */
-
-NS16550_STATIC void ns16550_write_polled(
-  int   minor, 
-  char  cChar
-)
-{
-  unsigned32              pNS16550;
-  unsigned char           ucLineStatus;
-  int                     iTimeout;
-  getRegister_f           getReg;
-  setRegister_f           setReg;
-
-  pNS16550 = Console_Port_Tbl[minor].ulCtrlPort1;
-  getReg   = Console_Port_Tbl[minor].getRegister;
-  setReg   = Console_Port_Tbl[minor].setRegister;
-
-  /*
-   * wait for transmitter holding register to be empty
-   */
-  iTimeout=1000;
-  ucLineStatus = (*getReg)(pNS16550, NS16550_LINE_STATUS);
-  while ((ucLineStatus & SP_LSR_THOLD) == 0) {
-    /*
-     * Yield while we wait
-     */
-#if 0
-     if(_System_state_Is_up(_System_state_Get())) {
-       rtems_task_wake_after(RTEMS_YIELD_PROCESSOR);
-     }
-#endif
-     ucLineStatus = (*getReg)(pNS16550, NS16550_LINE_STATUS);
-     if(!--iTimeout) {
-       break;
-     }
-  }
-
-  /*
-   * transmit character
-   */
-  (*setReg)(pNS16550, NS16550_TRANSMIT_BUFFER, cChar);
-}
-
-/*
- * These routines provide control of the RTS and DTR lines
- */
-
-/*
- *  ns16550_assert_RTS
- */
-
-NS16550_STATIC int ns16550_assert_RTS(int minor)
-{
-  unsigned32              pNS16550;
-  unsigned32              Irql;
-  ns16550_context        *pns16550Context;
-  setRegister_f           setReg;
-
-  pns16550Context=(ns16550_context *) Console_Port_Data[minor].pDeviceContext;
-
-  pNS16550 = Console_Port_Tbl[minor].ulCtrlPort1;
-  setReg   = Console_Port_Tbl[minor].setRegister;
-
-  /*
-   * Assert RTS
-   */
-  rtems_interrupt_disable(Irql);
-  pns16550Context->ucModemCtrl|=SP_MODEM_RTS;
-  (*setReg)(pNS16550, NS16550_MODEM_CONTROL, pns16550Context->ucModemCtrl);
-  rtems_interrupt_enable(Irql);
-  return 0;
-}
-
-/*
- *  ns16550_negate_RTS
- */
-
-NS16550_STATIC int ns16550_negate_RTS(int minor)
-{
-  unsigned32              pNS16550;
-  unsigned32              Irql;
-  ns16550_context        *pns16550Context;
-  setRegister_f           setReg;
-
-  pns16550Context=(ns16550_context *) Console_Port_Data[minor].pDeviceContext;
-
-  pNS16550 = Console_Port_Tbl[minor].ulCtrlPort1;
-  setReg   = Console_Port_Tbl[minor].setRegister;
-
-  /*
-   * Negate RTS
-   */
-  rtems_interrupt_disable(Irql);
-  pns16550Context->ucModemCtrl&=~SP_MODEM_RTS;
-  (*setReg)(pNS16550, NS16550_MODEM_CONTROL, pns16550Context->ucModemCtrl);
-  rtems_interrupt_enable(Irql);
-  return 0;
-}
-
-/*
- * These flow control routines utilise a connection from the local DTR
- * line to the remote CTS line
- */
-
-/*
- *  ns16550_assert_DTR
- */
-
-NS16550_STATIC int ns16550_assert_DTR(int minor)
-{
-  unsigned32              pNS16550;
-  unsigned32              Irql;
-  ns16550_context        *pns16550Context;
-  setRegister_f           setReg;
-
-  pns16550Context=(ns16550_context *) Console_Port_Data[minor].pDeviceContext;
-
-  pNS16550 = Console_Port_Tbl[minor].ulCtrlPort1;
-  setReg   = Console_Port_Tbl[minor].setRegister;
-
-  /*
-   * Assert DTR
-   */
-  rtems_interrupt_disable(Irql);
-  pns16550Context->ucModemCtrl|=SP_MODEM_DTR;
-  (*setReg)(pNS16550, NS16550_MODEM_CONTROL, pns16550Context->ucModemCtrl);
-  rtems_interrupt_enable(Irql);
-  return 0;
-}
-
-/*
- *  ns16550_negate_DTR
- */
-
-NS16550_STATIC int ns16550_negate_DTR(int minor)
-{
-  unsigned32              pNS16550;
-  unsigned32              Irql;
-  ns16550_context        *pns16550Context;
-  setRegister_f           setReg;
-
-  pns16550Context=(ns16550_context *) Console_Port_Data[minor].pDeviceContext;
-
-  pNS16550 = Console_Port_Tbl[minor].ulCtrlPort1;
-  setReg   = Console_Port_Tbl[minor].setRegister;
-
-  /*
-   * Negate DTR
-   */
-  rtems_interrupt_disable(Irql);
-  pns16550Context->ucModemCtrl&=~SP_MODEM_DTR;
-  (*setReg)(pNS16550, NS16550_MODEM_CONTROL,pns16550Context->ucModemCtrl);
-  rtems_interrupt_enable(Irql);
-  return 0;
-}
-
-/*
- *  ns16550_set_attributes
- *
- *  This function sets the channel to reflect the requested termios
- *  port settings.
- */
-
-NS16550_STATIC int ns16550_set_attributes(
-  int                   minor,
-  const struct termios *t
-)
-{
-  unsigned32              pNS16550;
-  unsigned32              ulBaudDivisor;
-  unsigned8               ucLineControl;
-  unsigned32              baud_requested;
-  setRegister_f           setReg;
-  getRegister_f           getReg;
-  unsigned32              Irql;
-
-  pNS16550 = Console_Port_Tbl[minor].ulCtrlPort1;
-  setReg   = Console_Port_Tbl[minor].setRegister;
-  getReg   = Console_Port_Tbl[minor].getRegister;
-
-  /*
-   *  Calculate the baud rate divisor
-   */
-
-  baud_requested = t->c_cflag & CBAUD;
-  if (!baud_requested)
-    baud_requested = B9600;              /* default to 9600 baud */
-
-  ulBaudDivisor = termios_baud_to_number(baud_requested);
-
-  ucLineControl = 0;
-
-  /*
-   *  Parity
-   */
-
-  if (t->c_cflag & PARENB) {
-    ucLineControl |= SP_LINE_PAR;
-    if (!(t->c_cflag & PARODD))
-      ucLineControl |= SP_LINE_ODD;
-  }
-
-  /*
-   *  Character Size
-   */
-
-  if (t->c_cflag & CSIZE) {
-    switch (t->c_cflag & CSIZE) {
-      case CS5:  ucLineControl |= FIVE_BITS;  break;
-      case CS6:  ucLineControl |= SIX_BITS;   break;
-      case CS7:  ucLineControl |= SEVEN_BITS; break;
-      case CS8:  ucLineControl |= EIGHT_BITS; break;
-    }
-  } else {
-    ucLineControl |= EIGHT_BITS;               /* default to 9600,8,N,1 */
-  }
-
-  /*
-   *  Stop Bits
-   */
-
-  if (t->c_cflag & CSTOPB) {
-    ucLineControl |= SP_LINE_STOP;              /* 2 stop bits */
-  } else {
-    ;                                           /* 1 stop bit */
-  }
-
-  /*
-   *  Now actually set the chip
-   */
-
-  rtems_interrupt_disable(Irql);
-
-    /*
-     *  Set the baud rate 
-     */
-
-    (*setReg)(pNS16550, NS16550_LINE_CONTROL, SP_LINE_DLAB);
-    /* XXX are these registers right? */
-    (*setReg)(pNS16550, NS16550_TRANSMIT_BUFFER, ulBaudDivisor&0xff);
-    (*setReg)(pNS16550, NS16550_INTERRUPT_ENABLE, (ulBaudDivisor>>8)&0xff);
-
-    /*
-     *  Now write the line control
-     */
-    (*setReg)(pNS16550, NS16550_LINE_CONTROL, ucLineControl );
-
-  rtems_interrupt_enable(Irql);
-
-}
-
-/*
- *  ns16550_process
- *
- *  This routine is the console interrupt handler for A port.
- */
-
-NS16550_STATIC void ns16550_process(
-        int             minor
-)
-{
-  unsigned32              pNS16550;
-  volatile unsigned8      ucLineStatus; 
-  volatile unsigned8      ucInterruptId;
-  unsigned char           cChar;
-  getRegister_f           getReg;
-  setRegister_f           setReg;
-
-  pNS16550 = Console_Port_Tbl[minor].ulCtrlPort1;
-  getReg   = Console_Port_Tbl[minor].getRegister;
-  setReg   = Console_Port_Tbl[minor].setRegister;
-
-  do {
-    /*
-     * Deal with any received characters
-     */
-    while(TRUE) {
-      ucLineStatus = (*getReg)(pNS16550, NS16550_LINE_STATUS);
-      if(~ucLineStatus & SP_LSR_RDY) {
-        break;
-      }
-      cChar = (*getReg)(pNS16550, NS16550_RECEIVE_BUFFER);
-      rtems_termios_enqueue_raw_characters( 
-        Console_Port_Data[minor].termios_data,
-        &cChar, 
-        1 
-      );
-    }
-
-    /*
-     *  TX all the characters we can
-     */
-
-    while(TRUE) {
-        ucLineStatus = (*getReg)(pNS16550, NS16550_LINE_STATUS);
-        if(~ucLineStatus & SP_LSR_THOLD) {
-          /*
-           * We'll get another interrupt when
-           * the transmitter holding reg. becomes
-           * free again
-           */
-          break;
-        }
-
-#if 0
-        /* XXX flow control not completely supported in libchip */
-
-        if(Console_Port_Tbl[minor].pDeviceFlow != &ns16550_flow_RTSCTS) {
-          ns16550_negate_RTS(minor);
-        }
-#endif
-
-    rtems_termios_dequeue_characters(Console_Port_Data[minor].termios_data, 1);
-    if (rtems_termios_is_more_to_tx( Console_Port_Data[minor].termios_data )) {
-        if (Console_Port_Tbl[minor].pDeviceFlow != &ns16550_flow_RTSCTS) {
-          ns16550_negate_RTS(minor);
-        }
-        Console_Port_Data[minor].bActive = FALSE;
-        ns16550_enable_interrupts(minor, NS16550_ENABLE_ALL_INTR_EXCEPT_TX);
-        break;
-      }
-
-      ucInterruptId = (*getReg)(pNS16550, NS16550_INTERRUPT_ID);
-    }
-  } while((ucInterruptId&0xf)!=0x1);
-}
-
-/*
- *  ns16550_isr
- */
-
-NS16550_STATIC rtems_isr ns16550_isr(
-  rtems_vector_number vector
-)
-{
-  int     minor;
-
-  for(minor=0;minor<Console_Port_Count;minor++) {
-    if(Console_Port_Tbl[minor].ulIntVector == vector && 
-       Console_Port_Tbl[minor].deviceType == SERIAL_NS16550 ) {
-      ns16550_process(minor);
-    }
-  }
-}
-
-/*
- *  ns16550_enable_interrupts
- *
- *  This routine initializes the port to have the specified interrupts masked.
- */
-
-NS16550_STATIC void ns16550_enable_interrupts(
-  int minor,
-  int mask
-)
-{
-  unsigned32     pNS16550;
-  setRegister_f  setReg;
-
-  pNS16550 = Console_Port_Tbl[minor].ulCtrlPort1;
-  setReg   = Console_Port_Tbl[minor].setRegister;
-
-  (*setReg)(pNS16550, NS16550_INTERRUPT_ENABLE, mask);
-}
-
-/*
- *  ns16550_initialize_interrupts
- *
- *  This routine initializes the port to operate in interrupt driver mode.
- */ 
-
-NS16550_STATIC void ns16550_initialize_interrupts(int minor)
-{
-  ns16550_init(minor);
-
-  Console_Port_Data[minor].bActive = FALSE;
-
-  set_vector(ns16550_isr, Console_Port_Tbl[minor].ulIntVector, 1);
-
-  ns16550_enable_interrupts(minor, NS16550_ENABLE_ALL_INTR);
-}
-
-/* 
- *  ns16550_write_support_int
- *
- *  Console Termios output entry point.
- */
-
-NS16550_STATIC int ns16550_write_support_int(
-  int   minor, 
-  const char *buf, 
-  int   len
-)
-{
-  unsigned32     Irql;
-  unsigned32     pNS16550;
-  setRegister_f  setReg;
-
-  setReg   = Console_Port_Tbl[minor].setRegister;
-  pNS16550 = Console_Port_Tbl[minor].ulCtrlPort1;
-
-  /*
-   *  We are using interrupt driven output and termios only sends us
-   *  one character at a time.
-   */
-
-  if ( !len )
-    return 0;
-
-  if(Console_Port_Tbl[minor].pDeviceFlow != &ns16550_flow_RTSCTS) {
-    ns16550_assert_RTS(minor);
-  }
-
-  rtems_interrupt_disable(Irql);
-    if ( Console_Port_Data[minor].bActive == FALSE) {
-      Console_Port_Data[minor].bActive = TRUE;
-      ns16550_enable_interrupts(minor, NS16550_ENABLE_ALL_INTR);
-    }
-    (*setReg)(pNS16550, NS16550_TRANSMIT_BUFFER, *buf);
-  rtems_interrupt_enable(Irql);
-
-  return 1;
-}
-
-/* 
- *  ns16550_write_support_polled
- *
- *  Console Termios output entry point.
- *
- */
-
-NS16550_STATIC int ns16550_write_support_polled(
-  int         minor, 
-  const char *buf, 
-  int         len
-)
-{
-  int nwrite = 0;
-
-  /*
-   * poll each byte in the string out of the port.
-   */
-  while (nwrite < len) {
-    /*
-     * transmit character
-     */
-    ns16550_write_polled(minor, *buf++);
-    nwrite++;
-  }
-
-  /*
-   * return the number of bytes written.
-   */
-  return nwrite;
-}
-
-/* 
- *  ns16550_inbyte_nonblocking_polled 
- *
- *  Console Termios polling input entry point.
- */
-
-NS16550_STATIC int ns16550_inbyte_nonblocking_polled( 
-  int minor 
-)
-{
-  unsigned32           pNS16550;
-  unsigned char        ucLineStatus;
-  char                 cChar;
-  getRegister_f        getReg;
-
-  pNS16550 = Console_Port_Tbl[minor].ulCtrlPort1;
-  getReg   = Console_Port_Tbl[minor].getRegister;
-
-  ucLineStatus = (*getReg)(pNS16550, NS16550_LINE_STATUS);
-  if(ucLineStatus & SP_LSR_RDY) {
-    cChar = (*getReg)(pNS16550, NS16550_RECEIVE_BUFFER);
-    return (int)cChar;
-  } else {
-    return -1;
-  }
-}
diff --git a/c/src/lib/libchip/serial/ns16550.h b/c/src/lib/libchip/serial/ns16550.h
deleted file mode 100644
index cb01d20a85..0000000000
--- a/c/src/lib/libchip/serial/ns16550.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *  COPYRIGHT (c) 1998 by Radstone Technology
- *
- *
- * THIS FILE IS PROVIDED TO YOU, THE USER, "AS IS", WITHOUT WARRANTY OF ANY
- * KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTY OF FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK
- * AS TO THE QUALITY AND PERFORMANCE OF ALL CODE IN THIS FILE IS WITH YOU.
- *
- * You are hereby granted permission to use, copy, modify, and distribute
- * this file, provided that this notice, plus the above copyright notice
- * and disclaimer, appears in all copies. Radstone Technology will provide
- * no support for this code.
- *
- */
-
-#ifndef _NS16550_H_
-#define _NS16550_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * Driver function table
- */
-
-extern console_fns ns16550_fns;
-extern console_fns ns16550_fns_polled;
-
-/*
- * Flow control function tables
- */
-
-extern console_flow ns16550_flow_RTSCTS;
-extern console_flow ns16550_flow_DTRCTS;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _NS16550_H_ */
diff --git a/c/src/lib/libchip/serial/ns16550_p.h b/c/src/lib/libchip/serial/ns16550_p.h
deleted file mode 100644
index 27c3502a0d..0000000000
--- a/c/src/lib/libchip/serial/ns16550_p.h
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
- *  COPYRIGHT (c) 1998 by Radstone Technology
- *
- *
- * THIS FILE IS PROVIDED TO YOU, THE USER, "AS IS", WITHOUT WARRANTY OF ANY
- * KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTY OF FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK
- * AS TO THE QUALITY AND PERFORMANCE OF ALL CODE IN THIS FILE IS WITH YOU.
- *
- * You are hereby granted permission to use, copy, modify, and distribute
- * this file, provided that this notice, plus the above copyright notice
- * and disclaimer, appears in all copies. Radstone Technology will provide
- * no support for this code.
- *
- *  $Id$
- */
-
-#ifndef _NS16550_P_H_
-#define _NS16550_P_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- *  Define NS16550_STATIC to nothing while debugging so the entry points
- *  will show up in the symbol table.
- */
-
-#define NS16550_STATIC
-
-/* #define NS16550_STATIC static */
-
-/*
- * Define serial port read registers structure.
- */
-
-typedef volatile struct _SP_READ_REGISTERS {
-    unsigned char ReceiveBuffer;
-    unsigned char InterruptEnable;
-    unsigned char InterruptId;
-    unsigned char LineControl;
-    unsigned char ModemControl;
-    unsigned char LineStatus;
-    unsigned char ModemStatus;
-    unsigned char ScratchPad;
-} SP_READ_REGISTERS, *PSP_READ_REGISTERS;
-
-#define NS16550_RECEIVE_BUFFER   0
-#define NS16550_INTERRUPT_ENABLE 1
-#define NS16550_INTERRUPT_ID     2
-#define NS16550_LINE_CONTROL     3
-#define NS16550_MODEM_CONTROL    4
-#define NS16550_LINE_STATUS      5
-#define NS16550_MODEM_STATUS     6
-#define NS16550_SCRATCH_PAD      7
-
-/*
- * Define serial port write registers structure.
- */
-
-typedef volatile struct _SP_WRITE_REGISTERS {
-    unsigned char TransmitBuffer;
-    unsigned char InterruptEnable;
-    unsigned char FifoControl;
-    unsigned char LineControl;
-    unsigned char ModemControl;
-    unsigned char Reserved1;
-    unsigned char ModemStatus;
-    unsigned char ScratchPad;
-} SP_WRITE_REGISTERS, *PSP_WRITE_REGISTERS;
-
-#define NS16550_TRANSMIT_BUFFER  0
-#define NS16550_FIFO_CONTROL     2
-
-/*
- * Define serial port interrupt enable register structure.
- */
-
-#define SP_INT_RX_ENABLE  0x01
-#define SP_INT_TX_ENABLE  0x02
-#define SP_INT_LS_ENABLE  0x04
-#define SP_INT_MS_ENABLE  0x08
-
-#define NS16550_ENABLE_ALL_INTR           (SP_INT_RX_ENABLE | SP_INT_TX_ENABLE)
-#define NS16550_DISABLE_ALL_INTR          0x00
-#define NS16550_ENABLE_ALL_INTR_EXCEPT_TX (SP_INT_RX_ENABLE)
-
-/*
- * Define serial port interrupt id register structure.
- */
-
-typedef struct _SP_INTERRUPT_ID {
-    unsigned char InterruptPending : 1;
-    unsigned char Identification : 3;
-    unsigned char Reserved1 : 2;
-    unsigned char FifoEnabled : 2;
-} SP_INTERRUPT_ID, *PSP_INTERRUPT_ID;
-
-/*
- * Define serial port fifo control register structure.
- */
-
-#define SP_FIFO_ENABLE  0x01
-#define SP_FIFO_RXRST 0x02
-#define SP_FIFO_TXRST 0x04
-#define SP_FIFO_DMA   0x08
-#define SP_FIFO_RXLEVEL 0xc0
-
-/*
- * Define serial port line control register structure.
- */
-
-#define SP_LINE_SIZE  0x03
-#define SP_LINE_STOP  0x04
-#define SP_LINE_PAR   0x08
-#define SP_LINE_ODD   0x10
-#define SP_LINE_STICK 0x20
-#define SP_LINE_BREAK 0x40
-#define SP_LINE_DLAB  0x80
-
-/*
- * Line status register character size definitions.
- */
-
-#define FIVE_BITS 0x0                   /* five bits per character */
-#define SIX_BITS 0x1                    /* six bits per character */
-#define SEVEN_BITS 0x2                  /* seven bits per character */
-#define EIGHT_BITS 0x3                  /* eight bits per character */
-
-/*
- * Line speed divisor definition.
- */
-
-#define NS16550_Baud(baud_rate) (115200/baud_rate)
-
-/*
- * Define serial port modem control register structure.
- */
-
-#define SP_MODEM_DTR  0x01
-#define SP_MODEM_RTS  0x02
-#define SP_MODEM_IRQ  0x08
-#define SP_MODEM_LOOP 0x10
-#define SP_MODEM_DIV4 0x80
-
-/*
- * Define serial port line status register structure.
- */
-
-#define SP_LSR_RDY    0x01
-#define SP_LSR_EOVRUN 0x02
-#define SP_LSR_EPAR   0x04
-#define SP_LSR_EFRAME 0x08
-#define SP_LSR_BREAK  0x10
-#define SP_LSR_THOLD  0x20
-#define SP_LSR_TX   0x40
-#define SP_LSR_EFIFO  0x80
-
-typedef struct _ns16550_context
-{
-        unsigned8       ucModemCtrl;
-} ns16550_context;
-
-/*
- * Driver functions
- */
-
-NS16550_STATIC boolean ns16550_probe(int minor);
-
-NS16550_STATIC void ns16550_init(int minor);
-
-NS16550_STATIC int ns16550_open(
-  int major,
-  int minor,
-  void  * arg
-);
-
-NS16550_STATIC int ns16550_close(
-  int major,
-  int minor,
-  void  * arg
-);
-
-NS16550_STATIC void ns16550_write_polled(
-  int   minor, 
-  char  cChar
-);
-
-NS16550_STATIC int ns16550_assert_RTS(
-  int minor
-);
-
-NS16550_STATIC int ns16550_negate_RTS(
-  int minor
-);
-
-NS16550_STATIC int ns16550_assert_DTR(
-  int minor
-);
-
-NS16550_STATIC int ns16550_negate_DTR(
-  int minor
-);
-
-NS16550_STATIC void ns16550_initialize_interrupts(int minor);
-
-NS16550_STATIC int ns16550_write_support_int(
-  int   minor,
-  const char *buf,
-  int   len
-);
-
-NS16550_STATIC int ns16550_write_support_polled(
-  int   minor,
-  const char *buf,
-  int   len
-  );
-
-NS16550_STATIC int ns16550_inbyte_nonblocking_polled(
-  int minor
-);
-
-NS16550_STATIC void ns16550_enable_interrupts(
-  int minor,
-  int mask
-);
-
-NS16550_STATIC int ns16550_set_attributes(
-  int                   minor,
-  const struct termios *t
-);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _NS16550_P_H_ */
diff --git a/c/src/lib/libchip/serial/serial.h b/c/src/lib/libchip/serial/serial.h
deleted file mode 100644
index aa0e7f58aa..0000000000
--- a/c/src/lib/libchip/serial/serial.h
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- *  This file contains the TTY driver table definition
- *
- *  This driver uses the termios pseudo driver.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __LIBCHIP_SERIAL_h
-#define __LIBCHIP_SERIAL_h
-
-#include <termios.h>
-
-/*
- *  Types for get and set register routines
- */
-
-typedef unsigned8 (*getRegister_f)(unsigned32 port, unsigned8 register);
-typedef void      (*setRegister_f)(
-                            unsigned32 port, unsigned8 reg, unsigned8 value);
-typedef unsigned8 (*getData_f)(unsigned32 port);
-typedef void      (*setData_f)(unsigned32 port, unsigned8 value);
-
-typedef struct _console_fns {
-  boolean (*deviceProbe)(int minor);
-  int     (*deviceFirstOpen)(int major, int minor, void *arg);
-  int     (*deviceLastClose)(int major, int minor, void *arg);
-  int     (*deviceRead)(int minor);
-  int     (*deviceWrite)(int minor, const char *buf, int len);
-  void    (*deviceInitialize)(int minor);
-  void    (*deviceWritePolled)(int minor, char cChar);
-  int     (*deviceSetAttributes)(int minor, const struct termios *t);
-  int       deviceOutputUsesInterrupts;
-} console_fns;
-
-typedef struct _console_flow {
-  int (*deviceStopRemoteTx)(int minor);
-  int (*deviceStartRemoteTx)(int minor);
-} console_flow;
-
-typedef enum {
-  SERIAL_MC68681,              /* Motorola MC68681 or Exar 88681 */
-  SERIAL_NS16550,              /* National Semiconductor NS16550 */
-  SERIAL_Z85C30,               /* Zilog Z85C30 */
-  SERIAL_CUSTOM                /* BSP specific driver */
-} console_devs;
-
-/*
- * Each field is interpreted thus:
- * 
- * sDeviceName  This is the name of the device. 
- *
- * deviceType   This indicates the chip type.  It is especially important when
- *              multiple devices share the same interrupt vector and must be
- *              distinguished.
- *
- * pDeviceFns   This is a pointer to the set of driver routines to use.
- *
- * pDeviceFlow  This is a pointer to the set of flow control routines to
- *              use. Serial device drivers will typically supply RTSCTS
- *              and DTRCTS handshake routines for DCE to DCE communication,
- *              however for DCE to DTE communication, no such routines
- *              should be necessary as RTS will be driven automatically
- *              when the transmitter is active.
- *
- * ulMargin     The high water mark in the input buffer is set to the buffer
- *              size less ulMargin. Once this level is reached, the driver's
- *              flow control routine used to stop the remote transmitter will
- *              be called. This figure should be greater than or equal to
- *              the number of stages of FIFO between the transmitter and
- *              receiver. 
- *
- *              NOTE: At the current time, this parameter is hard coded
- *                    in termios and this number is ignored.
- *
- * ulHysteresis After the high water mark specified by ulMargin has been
- *              reached, the driver's routine to re-start the remote
- *              transmitter will be called once the level in the input
- *              buffer has fallen by ulHysteresis bytes.
- *
- *              NOTE: At the current time, this parameter is hard coded
- *                    in termios and this number is ignored.
- *
- * pDeviceParams This contains either device specific data or a pointer to a
- *              device specific structure containing additional information
- *              not provided in this table. 
- *
- * ulCtrlPort1  This is the primary control port number for the device. This
- *              may be used to specify different instances of the same device
- *              type.
- *
- * ulCtrlPort2  This is the secondary control port number, of use when a given
- *              device has more than one available channel.
- *
- * ulDataPort   This is the port number for the data port of the device
- *
- * getRegister  This is the routine used to read register values.
- *
- * setRegister  This is the routine used to write register values.
- *
- * getData      This is the routine used to read the data register (RX).
- *
- * setData      This is the routine used to write the data register (TX).
- *
- * ulClock      This is the baud rate clock speed.
- *
- * ulIntVector  This encodes the interrupt vector of the device.
- */
-
-typedef struct _console_tbl {
-  char          *sDeviceName;
-  console_devs   deviceType;
-  console_fns   *pDeviceFns;
-  boolean      (*deviceProbe)(int minor);
-  console_flow  *pDeviceFlow;
-  unsigned32     ulMargin;
-  unsigned32     ulHysteresis;
-  void          *pDeviceParams;
-  unsigned32     ulCtrlPort1;
-  unsigned32     ulCtrlPort2;
-  unsigned32     ulDataPort;
-  getRegister_f  getRegister;
-  setRegister_f  setRegister;
-  getData_f      getData;
-  setData_f      setData;
-  unsigned32     ulClock;
-  unsigned int   ulIntVector;
-} console_tbl;
-
-typedef struct _console_data {
-  void                   *termios_data;
-  volatile boolean        bActive;
-  /*
-   * This field may be used for any purpose required by the driver
-   */
-  void                   *pDeviceContext;
-} console_data;
-
-extern console_tbl  Console_Port_Tbl[];
-extern console_data Console_Port_Data[];
-extern unsigned long  Console_Port_Count;
-
-#endif
-/* end of include file */
diff --git a/c/src/lib/libchip/serial/serprobe.c b/c/src/lib/libchip/serial/serprobe.c
deleted file mode 100644
index b76bbebe3c..0000000000
--- a/c/src/lib/libchip/serial/serprobe.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- *  $Id$
- */
-
-#include <rtems.h>
-#include <libchip/serial.h>
-#include "sersupp.h"
-
-boolean libchip_serial_default_probe(int minor)
-{
-  /*
-   * If the configuration dependent probe has located the device then
-   * assume it is there
-   */
-
-  return TRUE;
-}
-
-
-
diff --git a/c/src/lib/libchip/serial/sersupp.h b/c/src/lib/libchip/serial/sersupp.h
deleted file mode 100644
index a996d53c7c..0000000000
--- a/c/src/lib/libchip/serial/sersupp.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- *  $Id$
- */
-
-#ifndef __LIBCHIP_SERIAL_SUPPORT_h
-#define __LIBCHIP_SERIAL_SUPPORT_h
-
-int termios_baud_to_index(
-  int termios_baud
-);
-
-int termios_baud_to_number(
-  int termios_baud
-);
-
-boolean libchip_serial_default_probe(
-  int minor
-);
-
-
-#endif
-/* end of include file */
diff --git a/c/src/lib/libchip/serial/termios_baud2index.c b/c/src/lib/libchip/serial/termios_baud2index.c
deleted file mode 100644
index b4bf3623a2..0000000000
--- a/c/src/lib/libchip/serial/termios_baud2index.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- *  $Id$
- */
-
-#include <sys/termios.h>
-
-int termios_baud_to_index(
-  int termios_baud
-)
-{
-  int baud_index;
-
-  switch (termios_baud) {
-    case B0:        baud_index =  0;  break;
-    case B50:       baud_index =  1;  break;
-    case B75:       baud_index =  2;  break;
-    case B110:      baud_index =  3;  break;
-    case B134:      baud_index =  4;  break;
-    case B150:      baud_index =  5;  break;
-    case B200:      baud_index =  6;  break;
-    case B300:      baud_index =  7;  break;
-    case B600:      baud_index =  8;  break;
-    case B1200:     baud_index =  9;  break;
-    case B1800:     baud_index = 10;  break;
-    case B2400:     baud_index = 11;  break;
-    case B4800:     baud_index = 12;  break;
-    case B9600:     baud_index = 13;  break;
-    case B19200:    baud_index = 14;  break;
-    case B38400:    baud_index = 15;  break;
-    case B57600:    baud_index = 16;  break;
-    case B115200:   baud_index = 17;  break;
-    case B230400:   baud_index = 18;  break;
-    case B460800:   baud_index = 19;  break;
-    default:        baud_index = -1;  break;
-  }
-
-  return baud_index;
-}
-
diff --git a/c/src/lib/libchip/serial/termios_baud2num.c b/c/src/lib/libchip/serial/termios_baud2num.c
deleted file mode 100644
index 9c2ddc047e..0000000000
--- a/c/src/lib/libchip/serial/termios_baud2num.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- *  $Id$
- */
-
-#include <sys/termios.h>
-
-int termios_baud_to_number(
-  int termios_baud
-)
-{
-  int baud;
-
-  switch (termios_baud) {
-    case B0:        baud =      0;  break;
-    case B50:       baud =     50;  break;
-    case B75:       baud =     75;  break;
-    case B110:      baud =    110;  break;
-    case B134:      baud =    135;  break;
-    case B150:      baud =    150;  break;
-    case B200:      baud =    200;  break;
-    case B300:      baud =    300;  break;
-    case B600:      baud =    600;  break;
-    case B1200:     baud =   1200;  break;
-    case B1800:     baud =   1800;  break;
-    case B2400:     baud =   2400;  break;
-    case B4800:     baud =   4800;  break;
-    case B9600:     baud =   9600;  break;
-    case B19200:    baud =  19200;  break;
-    case B38400:    baud =  38400;  break;
-    case B57600:    baud =  57600;  break;
-    case B115200:   baud = 115200;  break;
-    case B230400:   baud = 230400;  break;
-    case B460800:   baud = 460800;  break;
-    default:        baud =     -1;  break;
-  }
-
-  return baud;
-}
-
diff --git a/c/src/lib/libchip/serial/z85c30.c b/c/src/lib/libchip/serial/z85c30.c
deleted file mode 100644
index a4f3aaceee..0000000000
--- a/c/src/lib/libchip/serial/z85c30.c
+++ /dev/null
@@ -1,888 +0,0 @@
-/*
- *  This file contains the console driver chip level routines for the
- *  Zilog z85c30 chip.
- *
- *  The Zilog Z8530 is also available as:
- *
- *    + Intel 82530
- *    + AMD ???
- *
- *  COPYRIGHT (c) 1998 by Radstone Technology
- *
- *
- * THIS FILE IS PROVIDED TO YOU, THE USER, "AS IS", WITHOUT WARRANTY OF ANY
- * KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTY OF FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK
- * AS TO THE QUALITY AND PERFORMANCE OF ALL CODE IN THIS FILE IS WITH YOU.
- *
- * You are hereby granted permission to use, copy, modify, and distribute
- * this file, provided that this notice, plus the above copyright notice
- * and disclaimer, appears in all copies. Radstone Technology will provide
- * no support for this code.
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems.h>
-#include <rtems/libio.h>
-#include <stdlib.h>
-
-#include <libchip/serial.h>
-#include "z85c30_p.h"
-#include "sersupp.h"
-
-/*
- * Flow control is only supported when using interrupts
- */
-
-console_flow z85c30_flow_RTSCTS = {
-  z85c30_negate_RTS,    /* deviceStopRemoteTx */
-  z85c30_assert_RTS     /* deviceStartRemoteTx */
-};
-
-console_flow z85c30_flow_DTRCTS = {
-  z85c30_negate_DTR,    /* deviceStopRemoteTx */
-  z85c30_assert_DTR     /* deviceStartRemoteTx */
-};
-
-/*
- * Exported driver function table
- */
-
-console_fns z85c30_fns = {
-  libchip_serial_default_probe,  /* deviceProbe */
-  z85c30_open,                   /* deviceFirstOpen */
-  NULL,                          /* deviceLastClose */
-  NULL,                          /* deviceRead */
-  z85c30_write_support_int,      /* deviceWrite */
-  z85c30_initialize_interrupts,  /* deviceInitialize */
-  z85c30_write_polled,           /* deviceWritePolled */
-  NULL,                          /* deviceSetAttributes */
-  TRUE                           /* deviceOutputUsesInterrupts */
-};
-
-console_fns z85c30_fns_polled = {
-  libchip_serial_default_probe,      /* deviceProbe */
-  z85c30_open,                       /* deviceFirstOpen */
-  z85c30_close,                      /* deviceLastClose */
-  z85c30_inbyte_nonblocking_polled,  /* deviceRead */
-  z85c30_write_support_polled,       /* deviceWrite */
-  z85c30_init,                       /* deviceInitialize */
-  z85c30_write_polled,               /* deviceWritePolled */
-  NULL,                              /* deviceSetAttributes */
-  FALSE                              /* deviceOutputUsesInterrupts */
-};
-
-extern void set_vector( rtems_isr_entry, rtems_vector_number, int );
-
-/* 
- *  z85c30_initialize_port
- *
- *  initialize a z85c30 Port
- */
-
-Z85C30_STATIC void z85c30_initialize_port(
-  int minor
-)
-{
-  unsigned32      ulCtrlPort;
-  unsigned32      ulBaudDivisor;
-  setRegister_f   setReg;
-
-  ulCtrlPort = Console_Port_Tbl[minor].ulCtrlPort1;
-  setReg   = Console_Port_Tbl[minor].setRegister;
-
-  /*
-   * Using register 4
-   * Set up the clock rate is 16 times the data
-   * rate, 8 bit sync char, 1 stop bit, no parity
-   */
-
-  (*setReg)( ulCtrlPort, SCC_WR0_SEL_WR4, SCC_WR4_1_STOP | SCC_WR4_16_CLOCK );
-
-  /*
-   * Set up for 8 bits/character on receive with
-   * receiver disable via register 3
-   */
-  (*setReg)( ulCtrlPort, SCC_WR0_SEL_WR3, SCC_WR3_RX_8_BITS );
-
-  /*
-   * Set up for 8 bits/character on transmit
-   * with transmitter disable via register 5
-   */
-  (*setReg)( ulCtrlPort, SCC_WR0_SEL_WR5, SCC_WR5_TX_8_BITS );
-
-  /*
-   * Clear misc control bits
-   */
-  (*setReg)( ulCtrlPort, SCC_WR0_SEL_WR10, 0x00 );
-
-  /*
-   * Setup the source of the receive and xmit
-   * clock as BRG output and the transmit clock
-   * as the output source for TRxC pin via register 11
-   */
-  (*setReg)(
-    ulCtrlPort,
-    SCC_WR0_SEL_WR11,
-    SCC_WR11_OUT_BR_GEN | SCC_WR11_TRXC_OI | 
-      SCC_WR11_TX_BR_GEN | SCC_WR11_RX_BR_GEN
-  );
-
-  ulBaudDivisor = Z85C30_Baud( 
-    (unsigned32) Console_Port_Tbl[minor].ulClock,
-    (unsigned32) Console_Port_Tbl[minor].pDeviceParams
-  );
-
-  /*
-   * Setup the lower 8 bits time constants=1E.
-   * If the time constans=1E, then the desire
-   * baud rate will be equilvalent to 9600, via register 12.
-   */
-  (*setReg)( ulCtrlPort, SCC_WR0_SEL_WR12, ulBaudDivisor & 0xff );
-
-  /*
-   * using register 13
-   * Setup the upper 8 bits time constant
-   */
-  (*setReg)( ulCtrlPort, SCC_WR0_SEL_WR13, (ulBaudDivisor>>8) & 0xff );
-           
-  /*
-   * Enable the baud rate generator enable with clock from the
-   * SCC's PCLK input via register 14.
-   */
-  (*setReg)(
-    ulCtrlPort,
-    SCC_WR0_SEL_WR14,
-    SCC_WR14_BR_EN | SCC_WR14_BR_SRC | SCC_WR14_NULL
-  );
-
-  /*
-   * We are only interested in CTS state changes
-   */
-  (*setReg)( ulCtrlPort, SCC_WR0_SEL_WR15, SCC_WR15_CTS_IE );
-
-  /*
-   * Reset errors
-   */
-  (*setReg)( ulCtrlPort, SCC_WR0_SEL_WR0, SCC_WR0_RST_INT );
-
-  (*setReg)( ulCtrlPort, SCC_WR0_SEL_WR0, SCC_WR0_ERR_RST );
-
-  /*
-   * Enable the receiver via register 3
-   */
-  (*setReg)( ulCtrlPort, SCC_WR0_SEL_WR3, SCC_WR3_RX_8_BITS | SCC_WR3_RX_EN );
-
-  /*
-   * Enable the transmitter pins set via register 5.
-   */
-  (*setReg)( ulCtrlPort, SCC_WR0_SEL_WR5, SCC_WR5_TX_8_BITS | SCC_WR5_TX_EN );
-
-  /*
-   * Disable interrupts
-   */
-  (*setReg)( ulCtrlPort, SCC_WR0_SEL_WR1, 0 );
-
-  /*
-   * Reset TX CRC
-   */
-  (*setReg)( ulCtrlPort, SCC_WR0_SEL_WR0, SCC_WR0_RST_TX_CRC );
-
-  /*
-   * Reset interrupts
-   */
-  (*setReg)( ulCtrlPort, SCC_WR0_SEL_WR0, SCC_WR0_RST_INT );
-}
-
-/*
- *  z85c30_open
- */
-
-Z85C30_STATIC int z85c30_open(
-  int   major,
-  int   minor,
-  void *arg
-)
-{
-
-  z85c30_initialize_port(minor);
-
-  /*
-   * Assert DTR
-   */
-
-  if (Console_Port_Tbl[minor].pDeviceFlow !=&z85c30_flow_DTRCTS) {
-    z85c30_assert_DTR(minor);
-  }
-
-  return(RTEMS_SUCCESSFUL);
-}
-
-/*
- *  z85c30_close
- */
-
-Z85C30_STATIC int z85c30_close(
-  int   major,
-  int   minor,
-  void *arg
-)
-{
-  /*
-   * Negate DTR
-   */
-
-  if (Console_Port_Tbl[minor].pDeviceFlow !=&z85c30_flow_DTRCTS) {
-    z85c30_negate_DTR(minor);
-  }
-
-  return(RTEMS_SUCCESSFUL);
-}
-
-/*
- *  z85c30_init
- */
-
-Z85C30_STATIC void z85c30_init(int minor)
-{
-  unsigned32       ulCtrlPort;
-  unsigned8        dummy;
-  z85c30_context  *pz85c30Context;
-  setRegister_f    setReg;
-  getRegister_f    getReg;
-
-  setReg = Console_Port_Tbl[minor].setRegister;
-  getReg   = Console_Port_Tbl[minor].getRegister;
-
-  pz85c30Context = (z85c30_context *)malloc(sizeof(z85c30_context));
-
-  Console_Port_Data[minor].pDeviceContext = (void *)pz85c30Context;
-
-  pz85c30Context->ucModemCtrl = SCC_WR5_TX_8_BITS | SCC_WR5_TX_EN;
-
-  ulCtrlPort = Console_Port_Tbl[minor].ulCtrlPort1;
-  if ( ulCtrlPort == Console_Port_Tbl[minor].ulCtrlPort2 ) {
-    /*
-     * This is channel A
-     */
-    /*
-     * Ensure port state machine is reset
-     */
-    dummy = (*getReg)(ulCtrlPort, SCC_WR0_SEL_RD0);
-
-    (*setReg)(ulCtrlPort, SCC_WR0_SEL_WR9, SCC_WR9_CH_A_RST);
-
-  } else {
-    /*
-     * This is channel B
-     */
-    /*
-     * Ensure port state machine is reset
-     */
-    dummy = (*getReg)(ulCtrlPort, SCC_WR0_SEL_RD0);
-
-    (*setReg)(ulCtrlPort, SCC_WR0_SEL_WR9, SCC_WR9_CH_B_RST);
-  }
-}
-
-/*
- * These routines provide control of the RTS and DTR lines
- */
-
-/*
- *  z85c30_assert_RTS
- */
-
-Z85C30_STATIC int z85c30_assert_RTS(int minor)
-{
-  rtems_interrupt_level  Irql;
-  z85c30_context        *pz85c30Context;
-  setRegister_f          setReg;
-
-  setReg = Console_Port_Tbl[minor].setRegister;
-
-  pz85c30Context = (z85c30_context *) Console_Port_Data[minor].pDeviceContext;
-  
-  /*
-   * Assert RTS
-   */
-
-  rtems_interrupt_disable(Irql);
-    pz85c30Context->ucModemCtrl|=SCC_WR5_RTS;
-    (*setReg)(
-      Console_Port_Tbl[minor].ulCtrlPort1,
-      SCC_WR0_SEL_WR5,
-      pz85c30Context->ucModemCtrl
-    );
-  rtems_interrupt_enable(Irql);
-  return 0;
-}
-
-/*
- *  z85c30_negate_RTS
- */
-
-Z85C30_STATIC int z85c30_negate_RTS(int minor)
-{
-  rtems_interrupt_level  Irql;
-  z85c30_context        *pz85c30Context;
-  setRegister_f          setReg;
-
-  setReg = Console_Port_Tbl[minor].setRegister;
-
-  pz85c30Context = (z85c30_context *) Console_Port_Data[minor].pDeviceContext;
-  
-  /*
-   * Negate RTS
-   */
-
-  rtems_interrupt_disable(Irql);
-    pz85c30Context->ucModemCtrl&=~SCC_WR5_RTS;
-    (*setReg)(
-      Console_Port_Tbl[minor].ulCtrlPort1,
-      SCC_WR0_SEL_WR5,
-      pz85c30Context->ucModemCtrl
-    );
-  rtems_interrupt_enable(Irql);
-  return 0;
-}
-
-/*
- * These flow control routines utilise a connection from the local DTR
- * line to the remote CTS line
- */
-
-/*
- *  z85c30_assert_DTR
- */
-
-Z85C30_STATIC int z85c30_assert_DTR(int minor)
-{
-  rtems_interrupt_level  Irql;
-  z85c30_context        *pz85c30Context;
-  setRegister_f          setReg;
-
-  setReg = Console_Port_Tbl[minor].setRegister;
-
-  pz85c30Context = (z85c30_context *) Console_Port_Data[minor].pDeviceContext;
-  
-  /*
-   * Assert DTR
-   */
-
-  rtems_interrupt_disable(Irql);
-    pz85c30Context->ucModemCtrl|=SCC_WR5_DTR;
-    (*setReg)(
-      Console_Port_Tbl[minor].ulCtrlPort1,
-      SCC_WR0_SEL_WR5,
-      pz85c30Context->ucModemCtrl
-  );
-  rtems_interrupt_enable(Irql);
-  return 0;
-}
-
-/*
- *  z85c30_negate_DTR
- */
-
-Z85C30_STATIC int z85c30_negate_DTR(int minor)
-{
-  rtems_interrupt_level  Irql;
-  z85c30_context        *pz85c30Context;
-  setRegister_f          setReg;
-
-  setReg = Console_Port_Tbl[minor].setRegister;
-
-  pz85c30Context = (z85c30_context *) Console_Port_Data[minor].pDeviceContext;
-  
-  /*
-   * Negate DTR
-   */
-
-  rtems_interrupt_disable(Irql);
-    pz85c30Context->ucModemCtrl&=~SCC_WR5_DTR;
-    (*setReg)(
-      Console_Port_Tbl[minor].ulCtrlPort1,
-      SCC_WR0_SEL_WR5,
-      pz85c30Context->ucModemCtrl
-  );
-  rtems_interrupt_enable(Irql);
-  return 0;
-}
-
-/*
- *  z85c30_set_attributes
- *
- *  This function sets the SCC channel to reflect the requested termios
- *  port settings.
- */
-
-Z85C30_STATIC int z85c30_set_attributes(
-  int                   minor,
-  const struct termios *t
-)
-{
-  unsigned32             ulCtrlPort;
-  unsigned32             ulBaudDivisor;
-  unsigned32             wr3;
-  unsigned32             wr4;
-  unsigned32             wr5;
-  int                    baud_requested;
-  setRegister_f          setReg;
-  rtems_interrupt_level  Irql;
-
-  ulCtrlPort = Console_Port_Tbl[minor].ulCtrlPort1;
-  setReg     = Console_Port_Tbl[minor].setRegister;
-
-  /*
-   *  Calculate the baud rate divisor
-   */
-
-  baud_requested = t->c_cflag & CBAUD;
-  if (!baud_requested)
-    baud_requested = B9600;              /* default to 9600 baud */
-
-  ulBaudDivisor = Z85C30_Baud( 
-    (unsigned32) Console_Port_Tbl[minor].ulClock,
-    (unsigned32) termios_baud_to_number( baud_requested )
-  );
-
-  wr3 = SCC_WR3_RX_EN;
-  wr4 = SCC_WR4_16_CLOCK;
-  wr5 = SCC_WR5_TX_EN;
-
-  /*
-   *  Parity
-   */
-
-  if (t->c_cflag & PARENB) {
-    wr4 |= SCC_WR4_PAR_EN;
-    if (!(t->c_cflag & PARODD))
-      wr4 |= SCC_WR4_PAR_EVEN;
-  } 
-
-  /*
-   *  Character Size
-   */
-
-  if (t->c_cflag & CSIZE) {
-    switch (t->c_cflag & CSIZE) {
-      case CS5:   break;
-      case CS6:  wr3 |= SCC_WR3_RX_6_BITS;  wr5 |= SCC_WR5_TX_6_BITS;  break;
-      case CS7:  wr3 |= SCC_WR3_RX_7_BITS;  wr5 |= SCC_WR5_TX_7_BITS;  break;
-      case CS8:  wr3 |= SCC_WR3_RX_8_BITS;  wr5 |= SCC_WR5_TX_8_BITS;  break;
-    }
-  } else {
-    wr3 |= SCC_WR3_RX_8_BITS;       /* default to 9600,8,N,1 */
-    wr5 |= SCC_WR5_TX_8_BITS;       /* default to 9600,8,N,1 */
-  }
-
-  /*
-   *  Stop Bits
-   */
-
-  if (t->c_cflag & CSTOPB) {
-    wr4 |= SCC_WR4_2_STOP;                      /* 2 stop bits */
-  } else {
-    wr4 |= SCC_WR4_1_STOP;                      /* 1 stop bits */
-  }
-
-  /*
-   *  Now actually set the chip
-   */
-
-  rtems_interrupt_disable(Irql);
-    (*setReg)( ulCtrlPort, SCC_WR0_SEL_WR4, wr4 );
-    (*setReg)( ulCtrlPort, SCC_WR0_SEL_WR3, wr3 );
-    (*setReg)( ulCtrlPort, SCC_WR0_SEL_WR5, wr5 );
-
-    /*
-     * Setup the lower 8 bits time constants=1E.
-     * If the time constans=1E, then the desire
-     * baud rate will be equilvalent to 9600, via register 12.
-     */
-
-    (*setReg)( ulCtrlPort, SCC_WR0_SEL_WR12, ulBaudDivisor & 0xff );
-
-    /*
-     * using register 13
-     * Setup the upper 8 bits time constant
-     */
-
-    (*setReg)( ulCtrlPort, SCC_WR0_SEL_WR13, (ulBaudDivisor>>8) & 0xff );
-
-  rtems_interrupt_enable(Irql);
-
-  return 0;
-}
-
-/*
- *  z85c30_process
- *
- *  This is the per port ISR handler.
- */
-
-Z85C30_STATIC void z85c30_process(
-  int        minor,
-  unsigned8  ucIntPend
-)
-{
-  unsigned32          ulCtrlPort;
-  volatile unsigned8  z85c30_status;
-  unsigned char       cChar;
-  setRegister_f       setReg;
-  getRegister_f       getReg;
-
-  ulCtrlPort = Console_Port_Tbl[minor].ulCtrlPort1;
-  setReg     = Console_Port_Tbl[minor].setRegister;
-  getReg     = Console_Port_Tbl[minor].getRegister;
-
-  /*
-   * Deal with any received characters
-   */
-
-  while (ucIntPend&SCC_RR3_B_RX_IP)
-  {
-    z85c30_status = (*getReg)(ulCtrlPort, SCC_WR0_SEL_RD0);
-    if (!Z85C30_Status_Is_RX_character_available(z85c30_status)) {
-      break;
-    }
-
-    /*
-     * Return the character read.
-     */
-
-    cChar = (*getReg)(ulCtrlPort, SCC_WR0_SEL_RD8);
-
-    rtems_termios_enqueue_raw_characters(
-      Console_Port_Data[minor].termios_data,
-      &cChar,
-      1
-    );
-  }
-
-  /*
-   *  There could be a race condition here if there is not yet a TX
-   *  interrupt pending but the buffer is empty.  This condition has
-   *  been seen before on other z8530 drivers but has not been seen
-   *  with this one.  The typical solution is to use "vector includes
-   *  status" or to only look at the interrupts actually pending
-   *  in RR3.
-   */
-
-  while (TRUE) {
-    z85c30_status = (*getReg)(ulCtrlPort, SCC_WR0_SEL_RD0);
-    if (!Z85C30_Status_Is_TX_buffer_empty(z85c30_status)) {
-      /*
-       * We'll get another interrupt when
-       * the transmitter holding reg. becomes
-       * free again and we are clear to send
-       */
-      break;
-    }
-  
-#if 0
-    if (!Z85C30_Status_Is_CTS_asserted(z85c30_status)) {
-      /*
-       * We can't transmit yet
-       */
-      (*setReg)(ulCtrlPort, SCC_WR0_SEL_WR0, SCC_WR0_RST_TX_INT);
-      /*
-       * The next state change of CTS will wake us up
-       */
-      break;
-    }
-#endif
-  
-    rtems_termios_dequeue_characters(Console_Port_Data[minor].termios_data, 1);
-    if (rtems_termios_is_more_to_tx( Console_Port_Data[minor].termios_data )) {
-      if (Console_Port_Tbl[minor].pDeviceFlow != &z85c30_flow_RTSCTS) {
-        z85c30_negate_RTS(minor);
-      }
-      Console_Port_Data[minor].bActive = FALSE;
-      z85c30_enable_interrupts(minor, SCC_ENABLE_ALL_INTR_EXCEPT_TX);
-      (*setReg)(ulCtrlPort, SCC_WR0_SEL_WR0, SCC_WR0_RST_TX_INT);
-      break;
-    }
-
-  }
-
-  if (ucIntPend & SCC_RR3_B_EXT_IP) {
-    /*
-     * Clear the external status interrupt
-     */
-    (*setReg)(ulCtrlPort, SCC_WR0_SEL_WR0, SCC_WR0_RST_INT);
-    z85c30_status = (*getReg)(ulCtrlPort, SCC_WR0_SEL_RD0);
-  }
-
-  /*
-   * Reset interrupts
-   */
-  (*setReg)(ulCtrlPort, SCC_WR0_SEL_WR0, SCC_WR0_RST_HI_IUS);
-}
-
-/*
- *  z85c30_isr
- *
- *  This is the ISR handler for each Z8530.
- */
-
-Z85C30_STATIC rtems_isr z85c30_isr(
-  rtems_vector_number vector
-)
-{
-  int                 minor;
-  unsigned32          ulCtrlPort;
-  volatile unsigned8  ucIntPend;
-  volatile unsigned8  ucIntPendPort;
-  getRegister_f       getReg;
-
-  for (minor=0;minor<Console_Port_Count;minor++) {
-    if(Console_Port_Tbl[minor].ulIntVector == vector && 
-       Console_Port_Tbl[minor].deviceType == SERIAL_Z85C30 ) {
-      ulCtrlPort = Console_Port_Tbl[minor].ulCtrlPort2;
-      getReg     = Console_Port_Tbl[minor].getRegister;
-      do {
-        ucIntPend = (*getReg)(ulCtrlPort, SCC_WR0_SEL_RD3);
-
-          /*
-           * If this is channel A select channel A status
-           */
-
-          if (ulCtrlPort == Console_Port_Tbl[minor].ulCtrlPort1) {
-            ucIntPendPort = ucIntPend>>3;
-            ucIntPendPort = ucIntPendPort&=7;
-          } else {
-            ucIntPendPort = ucIntPend &= 7;
-          }
-
-          if (ucIntPendPort) {
-            z85c30_process(minor, ucIntPendPort);
-          }
-      } while (ucIntPendPort);
-    }
-  }
-}
-
-/*
- *  z85c30_enable_interrupts
- *
- *  This routine enables the specified interrupts for this minor.
- */
-
-Z85C30_STATIC void z85c30_enable_interrupts(
-  int minor,
-  int interrupt_mask
-)
-{
-  unsigned32     ulCtrlPort;
-  setRegister_f  setReg;
-
-  ulCtrlPort = Console_Port_Tbl[minor].ulCtrlPort1;
-  setReg     = Console_Port_Tbl[minor].setRegister;
-
-  (*setReg)(ulCtrlPort, SCC_WR0_SEL_WR1, interrupt_mask);
-}
-
-/*
- *  z85c30_initialize_interrupts
- *
- *  This routine initializes the port to use interrupts.
- */
-
-Z85C30_STATIC void z85c30_initialize_interrupts(
-  int minor
-)
-{
-  unsigned32     ulCtrlPort1;
-  unsigned32     ulCtrlPort2;
-  setRegister_f  setReg;
-
-  ulCtrlPort1 = Console_Port_Tbl[minor].ulCtrlPort1;
-  ulCtrlPort2 = Console_Port_Tbl[minor].ulCtrlPort2;
-  setReg      = Console_Port_Tbl[minor].setRegister;
-
-
-  z85c30_init(minor);
-
-  Console_Port_Data[minor].bActive=FALSE;
-
-  z85c30_initialize_port( minor );
-
-  if (Console_Port_Tbl[minor].pDeviceFlow != &z85c30_flow_RTSCTS) {
-    z85c30_negate_RTS(minor);
-  }
-
-  set_vector(z85c30_isr, Console_Port_Tbl[minor].ulIntVector, 1);
-
-  z85c30_enable_interrupts(minor, SCC_ENABLE_ALL_INTR_EXCEPT_TX);
-
-  (*setReg)(ulCtrlPort1, SCC_WR0_SEL_WR2, 0);              /* XXX vector */
-  (*setReg)(ulCtrlPort1, SCC_WR0_SEL_WR9, SCC_WR9_MIE);
-
-  /*
-   * Reset interrupts
-   */
-
-  (*setReg)(ulCtrlPort1, SCC_WR0_SEL_WR0, SCC_WR0_RST_INT);
-}
-
-/* 
- *  z85c30_write_support_int
- *
- *  Console Termios output entry point.
- *
- */
-
-Z85C30_STATIC int z85c30_write_support_int(
-  int   minor, 
-  const char *buf, 
-  int   len)
-{
-  unsigned32     Irql;
-  unsigned32     ulCtrlPort;
-  setRegister_f  setReg;
-
-  ulCtrlPort = Console_Port_Tbl[minor].ulCtrlPort1;
-  setReg     = Console_Port_Tbl[minor].setRegister;
-
-  /*
-   *  We are using interrupt driven output and termios only sends us
-   *  one character at a time.
-   */
-
-  if ( !len )
-    return 0;
-
-  /*
-   *  Put the character out and enable interrupts if necessary.
-   */
-
-  if (Console_Port_Tbl[minor].pDeviceFlow != &z85c30_flow_RTSCTS) {
-    z85c30_assert_RTS(minor);
-  }
-  rtems_interrupt_disable(Irql);
-    if ( Console_Port_Data[minor].bActive == FALSE) {
-      Console_Port_Data[minor].bActive = TRUE;
-      z85c30_enable_interrupts(minor, SCC_ENABLE_ALL_INTR);
-    }
-    (*setReg)(ulCtrlPort, SCC_WR0_SEL_WR8, *buf);
-  rtems_interrupt_enable(Irql);
-
-  return 1;
-}
-
-/* 
- *  z85c30_inbyte_nonblocking_polled
- *
- *  This routine polls for a character.
- */
-
-Z85C30_STATIC int z85c30_inbyte_nonblocking_polled(
-  int  minor
-)
-{
-  volatile unsigned8  z85c30_status;
-  unsigned32          ulCtrlPort;
-  getRegister_f       getReg;
-
-  ulCtrlPort = Console_Port_Tbl[minor].ulCtrlPort1;
-  getReg     = Console_Port_Tbl[minor].getRegister;
-
-  /*
-   * return -1 if a character is not available.
-   */
-  z85c30_status = (*getReg)(ulCtrlPort, SCC_WR0_SEL_RD0);
-  if (!Z85C30_Status_Is_RX_character_available(z85c30_status)) {
-    return -1;
-  }
-
-  /*
-   * Return the character read.
-   */
-
-  return (*getReg)(ulCtrlPort, SCC_WR0_SEL_RD8);
-}
-
-/* 
- *  z85c30_write_support_polled
- *
- *  Console Termios output entry point.
- *
- */
-
-Z85C30_STATIC int z85c30_write_support_polled(
-  int   minor,
-  const char *buf,
-  int   len)
-{
-  int nwrite=0;
-
-  /*
-   * poll each byte in the string out of the port.
-   */
-  while (nwrite < len) {
-    z85c30_write_polled(minor, *buf++);
-    nwrite++;
-  }
-
-  /*
-   * return the number of bytes written.
-   */
-  return nwrite;
-}
-
-/* 
- *  z85c30_write_polled
- *
- *  This routine transmits a character using polling.
- */
-
-Z85C30_STATIC void z85c30_write_polled(
-  int   minor,
-  char  cChar
-)
-{
-  volatile unsigned8 z85c30_status;
-  unsigned32         ulCtrlPort;
-  getRegister_f      getReg;
-  setRegister_f      setReg;
-
-  ulCtrlPort = Console_Port_Tbl[minor].ulCtrlPort1;
-  getReg     = Console_Port_Tbl[minor].getRegister;
-  setReg     = Console_Port_Tbl[minor].setRegister;
-
-  /*
-   * Wait for the Transmit buffer to indicate that it is empty.
-   */
-
-  z85c30_status = (*getReg)( ulCtrlPort, SCC_WR0_SEL_RD0 );
-
-  while (!Z85C30_Status_Is_TX_buffer_empty(z85c30_status)) {
-    /*
-     * Yield while we wait
-     */
-#if 0
-    if (_System_state_Is_up(_System_state_Get())) {
-      rtems_task_wake_after(RTEMS_YIELD_PROCESSOR);
-    }
-#endif
-    z85c30_status = (*getReg)(ulCtrlPort, SCC_WR0_SEL_RD0);
-  }
-
-  /*
-   * Write the character.
-   */
-
-  (*setReg)( ulCtrlPort, SCC_WR0_SEL_WR8, cChar );
-}
-
diff --git a/c/src/lib/libchip/serial/z85c30.h b/c/src/lib/libchip/serial/z85c30.h
deleted file mode 100644
index f1beeef5e0..0000000000
--- a/c/src/lib/libchip/serial/z85c30.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- *  This include file contains all console driver definitions for the
- *  Zilog z85c30.
- *
- *  COPYRIGHT (c) 1998 by Radstone Technology
- *
- *
- * THIS FILE IS PROVIDED TO YOU, THE USER, "AS IS", WITHOUT WARRANTY OF ANY
- * KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTY OF FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK
- * AS TO THE QUALITY AND PERFORMANCE OF ALL CODE IN THIS FILE IS WITH YOU.
- *
- * You are hereby granted permission to use, copy, modify, and distribute
- * this file, provided that this notice, plus the above copyright notice
- * and disclaimer, appears in all copies. Radstone Technology will provide
- * no support for this code.
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id: 
- */
-
-#ifndef __Z85C30_H
-#define __Z85C30_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- *  Driver function table
- */
-
-extern console_fns z85c30_fns;
-extern console_fns z85c30_fns_polled;
-
-/*
- *  Flow control function tables
- */
-
-extern console_flow z85c30_flow_RTSCTS;
-extern console_flow z85c30_flow_DTRCTS;
-
-/*
- * Default register access routines
- */
-
-unsigned8 z85c30_get_register(   /* registers are byte-wide */
-  unsigned32  ulCtrlPort,
-  unsigned8   ucRegNum
-);
-
-void z85c30_set_register(
-  unsigned32  ulCtrlPort,
-  unsigned8   ucRegNum,
-  unsigned8   ucData
-);
-
-unsigned8 z85c30_get_data(
-  unsigned32  ulDataPort
-);
-
-void z85c30_set_data(
-  unsigned32  ulDataPort,
-  unsigned8   ucData
-);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/c/src/lib/libchip/serial/z85c30_p.h b/c/src/lib/libchip/serial/z85c30_p.h
deleted file mode 100644
index 0076fbeaef..0000000000
--- a/c/src/lib/libchip/serial/z85c30_p.h
+++ /dev/null
@@ -1,410 +0,0 @@
-/*
- *  This include file contains all private driver definitions for the
- *  Zilog z85c30.
- *
- *  COPYRIGHT (c) 1998 by Radstone Technology
- *
- *
- * THIS FILE IS PROVIDED TO YOU, THE USER, "AS IS", WITHOUT WARRANTY OF ANY
- * KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTY OF FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK
- * AS TO THE QUALITY AND PERFORMANCE OF ALL CODE IN THIS FILE IS WITH YOU.
- *
- * You are hereby granted permission to use, copy, modify, and distribute
- * this file, provided that this notice, plus the above copyright notice
- * and disclaimer, appears in all copies. Radstone Technology will provide
- * no support for this code.
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __Z85C30_P_H
-#define __Z85C30_P_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- *  Define Z85C30_STATIC to nothing while debugging so the entry points
- *  will show up in the symbol table.
- */
-
-#define Z85C30_STATIC
-
-/* #define Z85C30_STATIC static */
-
-/* bit values for write register 0 */
-/* command register */
-
-#define SCC_WR0_SEL_WR0   0x00
-#define SCC_WR0_SEL_WR1   0x01
-#define SCC_WR0_SEL_WR2   0x02
-#define SCC_WR0_SEL_WR3   0x03
-#define SCC_WR0_SEL_WR4   0x04
-#define SCC_WR0_SEL_WR5   0x05
-#define SCC_WR0_SEL_WR6   0x06
-#define SCC_WR0_SEL_WR7   0x07
-#define SCC_WR0_SEL_WR8   0x08
-#define SCC_WR0_SEL_WR9   0x09
-#define SCC_WR0_SEL_WR10  0x0a
-#define SCC_WR0_SEL_WR11  0x0b
-#define SCC_WR0_SEL_WR12  0x0c
-#define SCC_WR0_SEL_WR13  0x0d
-#define SCC_WR0_SEL_WR14  0x0e
-#define SCC_WR0_SEL_WR15  0x0f
-#define SCC_WR0_SEL_RD0   0x00
-#define SCC_WR0_SEL_RD1   0x01
-#define SCC_WR0_SEL_RD2   0x02
-#define SCC_WR0_SEL_RD3   0x03
-#define SCC_WR0_SEL_RD4   0x04
-#define SCC_WR0_SEL_RD5   0x05
-#define SCC_WR0_SEL_RD6   0x06
-#define SCC_WR0_SEL_RD7   0x07
-#define SCC_WR0_SEL_RD8   0x08
-#define SCC_WR0_SEL_RD9   0x09
-#define SCC_WR0_SEL_RD10  0x0a
-#define SCC_WR0_SEL_RD11  0x0b
-#define SCC_WR0_SEL_RD12  0x0c
-#define SCC_WR0_SEL_RD13  0x0d
-#define SCC_WR0_SEL_RD14  0x0e
-#define SCC_WR0_SEL_RD15  0x0f
-#define SCC_WR0_NULL_CODE 0x00
-#define SCC_WR0_RST_INT   0x10
-#define SCC_WR0_SEND_ABORT  0x18
-#define SCC_WR0_EN_INT_RX 0x20
-#define SCC_WR0_RST_TX_INT  0x28
-#define SCC_WR0_ERR_RST   0x30
-#define SCC_WR0_RST_HI_IUS  0x38
-#define SCC_WR0_RST_RX_CRC  0x40
-#define SCC_WR0_RST_TX_CRC  0x80
-#define SCC_WR0_RST_TX_UND  0xc0
-
-/* write register 2 */
-/* interrupt vector */
-
-/* bit values for write register 1 */
-/* tx/rx interrupt and data transfer mode definition */
-
-#define SCC_WR1_EXT_INT_EN  0x01
-#define SCC_WR1_TX_INT_EN   0x02
-#define SCC_WR1_PARITY      0x04
-#define SCC_WR1_RX_INT_DIS  0x00
-#define SCC_WR1_RX_INT_FIR  0x08
-#define SCC_WR1_INT_ALL_RX  0x10
-#define SCC_WR1_RX_INT_SPE  0x18
-#define SCC_WR1_RDMA_RECTR  0x20
-#define SCC_WR1_RDMA_FUNC   0x40
-#define SCC_WR1_RDMA_EN     0x80
-
-#define SCC_ENABLE_ALL_INTR \
-    (SCC_WR1_EXT_INT_EN | SCC_WR1_TX_INT_EN | SCC_WR1_INT_ALL_RX)
-
-#define SCC_DISABLE_ALL_INTR 0x00
-
-#define SCC_ENABLE_ALL_INTR_EXCEPT_TX \
-    (SCC_WR1_EXT_INT_EN | SCC_WR1_INT_ALL_RX)
-
-/* bit values for write register 3 */
-/* receive parameters and control */
-
-#define SCC_WR3_RX_EN   0x01
-#define SCC_WR3_SYNC_CHAR 0x02
-#define SCC_WR3_ADR_SEARCH  0x04
-#define SCC_WR3_RX_CRC_EN 0x08
-#define SCC_WR3_ENTER_HUNT  0x10
-#define SCC_WR3_AUTO_EN   0x20
-#define SCC_WR3_RX_5_BITS 0x00
-#define SCC_WR3_RX_7_BITS 0x40
-#define SCC_WR3_RX_6_BITS 0x80
-#define SCC_WR3_RX_8_BITS 0xc0
-
-/* bit values for write register 4 */
-/* tx/rx misc parameters and modes */
-
-#define SCC_WR4_PAR_EN    0x01
-#define SCC_WR4_PAR_EVEN  0x02
-#define SCC_WR4_SYNC_EN   0x00
-#define SCC_WR4_1_STOP    0x04
-#define SCC_WR4_2_STOP    0x0c
-#define SCC_WR4_8_SYNC    0x00
-#define SCC_WR4_16_SYNC   0x10
-#define SCC_WR4_SDLC    0x20
-#define SCC_WR4_EXT_SYNC  0x30
-#define SCC_WR4_1_CLOCK   0x00
-#define SCC_WR4_16_CLOCK  0x40
-#define SCC_WR4_32_CLOCK  0x80
-#define SCC_WR4_64_CLOCK  0xc0
-
-/* bit values for write register 5 */
-/* transmit parameter and controls */
-
-#define SCC_WR5_TX_CRC_EN 0x01
-#define SCC_WR5_RTS   0x02
-#define SCC_WR5_SDLC    0x04
-#define SCC_WR5_TX_EN   0x08
-#define SCC_WR5_SEND_BRK  0x10
-
-#define SCC_WR5_TX_5_BITS 0x00
-#define SCC_WR5_TX_7_BITS 0x20
-#define SCC_WR5_TX_6_BITS 0x40
-#define SCC_WR5_TX_8_BITS 0x60
-#define SCC_WR5_DTR   0x80
-
-/* write register 6 */
-/* sync chars or sdlc address field */
-
-/* write register 7 */
-/* sync char or sdlc flag */
-
-/* write register 8 */
-/* transmit buffer */
-
-/* bit values for write register 9 */
-/* master interrupt control */
-
-#define SCC_WR9_VIS   0x01
-#define SCC_WR9_NV    0x02
-#define SCC_WR9_DLC   0x04
-#define SCC_WR9_MIE   0x08
-#define SCC_WR9_STATUS_HI 0x10
-#define SCC_WR9_NO_RST    0x00
-#define SCC_WR9_CH_B_RST  0x40
-#define SCC_WR9_CH_A_RST  0x80
-#define SCC_WR9_HDWR_RST  0xc0
-
-/* bit values for write register 10 */
-/* misc tx/rx control bits */
-
-#define SCC_WR10_6_BIT_SYNC 0x01
-#define SCC_WR10_LOOP_MODE  0x02
-#define SCC_WR10_ABORT_UND  0x04
-#define SCC_WR10_MARK_IDLE  0x08
-#define SCC_WR10_ACT_POLL 0x10
-#define SCC_WR10_NRZ    0x00
-#define SCC_WR10_NRZI   0x20
-#define SCC_WR10_FM1    0x40
-#define SCC_WR10_FM0    0x60
-#define SCC_WR10_CRC_PRESET 0x80
-
-/* bit values for write register 11 */
-/* clock mode control */
-
-#define SCC_WR11_OUT_XTAL 0x00
-#define SCC_WR11_OUT_TX_CLK 0x01
-#define SCC_WR11_OUT_BR_GEN 0x02
-#define SCC_WR11_OUT_DPLL 0x03
-#define SCC_WR11_TRXC_OI  0x04
-#define SCC_WR11_TX_RTXC  0x00
-#define SCC_WR11_TX_TRXC  0x08
-#define SCC_WR11_TX_BR_GEN  0x10
-#define SCC_WR11_TX_DPLL  0x18
-#define SCC_WR11_RX_RTXC  0x00
-#define SCC_WR11_RX_TRXC  0x20
-#define SCC_WR11_RX_BR_GEN  0x40
-#define SCC_WR11_RX_DPLL  0x60
-#define SCC_WR11_RTXC_XTAL  0x80
-
-/* write register 12 */
-/* lower byte of baud rate generator time constant */
-
-/* write register 13 */
-/* upper byte of baud rate generator time constant */
-
-/* bit values for write register 14 */
-/* misc control bits */
-
-#define SCC_WR14_BR_EN    0x01
-#define SCC_WR14_BR_SRC   0x02
-#define SCC_WR14_DTR_FUNC 0x04
-#define SCC_WR14_AUTO_ECHO  0x08
-#define SCC_WR14_LCL_LOOP 0x10
-#define SCC_WR14_NULL   0x00
-#define SCC_WR14_SEARCH   0x20
-#define SCC_WR14_RST_CLK  0x40
-#define SCC_WR14_DIS_DPLL 0x60
-#define SCC_WR14_SRC_BR   0x80
-#define SCC_WR14_SRC_RTXC 0xa0
-#define SCC_WR14_FM_MODE  0xc0
-#define SCC_WR14_NRZI   0xe0
-
-/* bit values for write register 15 */
-/* external/status interrupt control */
-
-#define SCC_WR15_ZERO_CNT 0x02
-#define SCC_WR15_CD_IE    0x08
-#define SCC_WR15_SYNC_IE  0x10
-#define SCC_WR15_CTS_IE   0x20
-#define SCC_WR15_TX_UND_IE  0x40
-#define SCC_WR15_BREAK_IE 0x80
-
-/* bit values for read register 0 */
-/* tx/rx buffer status and external status  */
-
-#define SCC_RR0_RX_AVAIL  0x01
-#define SCC_RR0_ZERO_CNT  0x02
-#define SCC_RR0_TX_EMPTY  0x04
-#define SCC_RR0_CD    0x08
-#define SCC_RR0_SYNC    0x10
-#define SCC_RR0_CTS   0x20
-#define SCC_RR0_TX_UND    0x40
-#define SCC_RR0_BREAK   0x80
-
-/* bit values for read register 1 */
-
-#define SCC_RR1_ALL_SENT  0x01
-#define SCC_RR1_RES_CD_2  0x02
-#define SCC_RR1_RES_CD_1  0x01
-#define SCC_RR1_RES_CD_0  0x08
-#define SCC_RR1_PAR_ERR   0x10
-#define SCC_RR1_RX_OV_ERR 0x20
-#define SCC_RR1_CRC_ERR   0x40
-#define SCC_RR1_END_FRAME 0x80
-
-/* read register 2 */
-/* interrupt vector */
-
-/* bit values for read register 3 */
-/* interrupt pending register */
-
-#define SCC_RR3_B_EXT_IP  0x01
-#define SCC_RR3_B_TX_IP   0x02
-#define SCC_RR3_B_RX_IP   0x04
-#define SCC_RR3_A_EXT_IP  0x08
-#define SCC_RR3_A_TX_IP   0x10
-#define SCC_RR3_A_RX_IP   0x20
-
-/* read register 8 */
-/* receive data register */
-
-/* bit values for read register 10 */
-/* misc status bits */
-
-#define SCC_RR10_ON_LOOP  0x02
-#define SCC_RR10_LOOP_SEND  0x10
-#define SCC_RR10_2_CLK_MIS  0x40
-#define SCC_RR10_1_CLK_MIS  0x80
-
-/* read register 12 */
-/* lower byte of time constant */
-
-/* read register 13 */
-/* upper byte of time constant */
-
-/* bit values for read register 15 */
-/* external/status ie bits */
-
-#define SCC_RR15_ZERO_CNT 0x02
-#define SCC_RR15_CD_IE    0x08
-#define SCC_RR15_SYNC_IE  0x10
-#define SCC_RR15_CTS_IE   0x20
-#define SCC_RR15_TX_UND_IE  0x40
-#define SCC_RR15_BREAK_IE 0x80
-
-typedef struct _z85c30_context
-{
-  unsigned8 ucModemCtrl;
-} z85c30_context;
-
-/*
- * The following macro calculates the Baud constant. For the Z85C30 chip.
- *
- * Note: baud constant = ((clock frequency / Clock_X) / (2 * Baud Rate)) - 2
- *       eg ((10,000,000 / 16) / (2 * Baud Rate)) - 2
- */
-
-#define Z85C30_Baud( _clock, _baud_rate  )   \
-  ( ((_clock) /(  16 * 2 * _baud_rate))  - 2)
-
-#define Z85C30_Status_Is_RX_character_available(_status) \
-  ((_status) & SCC_RR0_RX_AVAIL)
-
-#define Z85C30_Status_Is_TX_buffer_empty(_status) \
-  ((_status) & SCC_RR0_TX_EMPTY)
-
-#define Z85C30_Status_Is_CTS_asserted(_status) \
-  ((_status) & SCC_RR0_CTS)
-
-#define Z85C30_Status_Is_break_abort(_status) \
-  ((_status) & SCC_RR0_BREAK)
-
-/*
- * Private routines
- */
-
-Z85C30_STATIC void z85c30_init(int minor);
-
-Z85C30_STATIC int z85c30_set_attributes(
-  int                   minor,
-  const struct termios *t
-);
-
-Z85C30_STATIC int z85c30_open(
-  int major,
-  int minor,
-  void  * arg
-);
-
-Z85C30_STATIC int z85c30_close(
-  int major,
-  int minor,
-  void  * arg
-);
-
-Z85C30_STATIC void z85c30_write_polled(
-  int   minor, 
-  char  cChar
-);
-
-Z85C30_STATIC int z85c30_assert_RTS(
-  int minor
-);
-
-Z85C30_STATIC int z85c30_negate_RTS(
-  int minor
-);
-
-Z85C30_STATIC int z85c30_assert_DTR(
-  int minor
-);
-
-Z85C30_STATIC int z85c30_negate_DTR(
-  int minor
-);
-
-Z85C30_STATIC void z85c30_initialize_interrupts(int minor);
-
-Z85C30_STATIC int z85c30_write_support_int(
-  int   minor,
-  const char *buf,
-  int   len
-);
-
-Z85C30_STATIC int z85c30_write_support_polled(
-  int   minor,
-  const char *buf,
-  int   len
-);
-
-Z85C30_STATIC int z85c30_inbyte_nonblocking_polled(
-  int minor
-);
-
-Z85C30_STATIC void z85c30_enable_interrupts(
-  int minor,
-  int interrupt_mask
-);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/c/src/lib/libchip/serial/z85c30_reg.c b/c/src/lib/libchip/serial/z85c30_reg.c
deleted file mode 100644
index 889dad4530..0000000000
--- a/c/src/lib/libchip/serial/z85c30_reg.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- *  This file contains a typical set of register access routines which may be
- *  used with the z85c30 chip if accesses to the chip are as follows:
- *
- *    + registers are accessed as bytes
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems.h>
-
-#ifndef _Z85C30_MULTIPLIER
-#define _Z85C30_MULTIPLIER 1
-#define _Z85C30_NAME(_X) _X
-#define _Z85C30_TYPE unsigned8
-#endif
-
-/*
- *  Z85C30 Get Register Routine
- */
-
-unsigned8 _Z85C30_NAME(z85c30_get_register)(
-  unsigned32  ulCtrlPort,
-  unsigned8   ucRegNum
-)
-{
-  _Z85C30_TYPE          *port;
-  unsigned8              data;
-  rtems_interrupt_level  level;
-
-  port = (_Z85C30_TYPE *)ulCtrlPort;
-
-  rtems_interrupt_disable(level);
-
-    if(ucRegNum) {
-      *port = ucRegNum;
-    }
-    data = *port;
-  rtems_interrupt_enable(level);
-
-  return data;
-}
-
-/*
- *  Z85C30 Set Register Routine
- */
-
-void _Z85C30_NAME(z85c30_set_register)(
-  unsigned32  ulCtrlPort,
-  unsigned8   ucRegNum,
-  unsigned8   ucData
-)
-{
-  _Z85C30_TYPE          *port;
-  rtems_interrupt_level  level;
-
-  port = (_Z85C30_TYPE *)ulCtrlPort;
-
-  rtems_interrupt_disable(level);
-    if(ucRegNum) {
-      *port = ucRegNum;
-    }
-    *port = ucData;
-  rtems_interrupt_enable(level);
-}
diff --git a/c/src/lib/libcpu/i386/idt.c b/c/src/lib/libcpu/i386/idt.c
deleted file mode 100644
index 5f44bd0d2b..0000000000
--- a/c/src/lib/libcpu/i386/idt.c
+++ /dev/null
@@ -1,288 +0,0 @@
-/*
- * cpu.c  - This file contains implementation of C function to
- *          Instanciate IDT entries. More detailled information can be found
- *	    on Intel site and more precisely in the following book :
- *
- *		Pentium Processor familly
- *		Developper's Manual
- *
- *		Volume 3 : Architecture and Programming Manual
- *
- * Copyright (C) 1998  Eric Valette (valette@crf.canon.fr)
- *                     Canon Centre Recherche France.
- *
- *  The license and distribution terms for this file may be
- *  found in found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- * $Id$
- */
-
-#include <libcpu/cpu.h>
-#include <irq.h>
-
-static rtems_raw_irq_connect_data* 	raw_irq_table;
-static rtems_raw_irq_connect_data  	default_raw_irq_entry;
-static interrupt_gate_descriptor   	default_idt_entry;
-static rtems_raw_irq_global_settings* 	local_settings;
-
-void create_interrupt_gate_descriptor (interrupt_gate_descriptor* idtEntry,
-				       rtems_raw_irq_hdl hdl)
-{
-    idtEntry->low_offsets_bits	= (((unsigned) hdl) & 0xffff);
-    idtEntry->segment_selector	= i386_get_cs(); 
-    idtEntry->fixed_value_bits	= 0;
-    idtEntry->gate_type		= 0xe; 
-    idtEntry->privilege		= 0;
-    idtEntry->present		= 1;
-    idtEntry->high_offsets_bits	= ((((unsigned) hdl) >> 16) & 0xffff);
-}
-
-rtems_raw_irq_hdl get_hdl_from_vector(rtems_vector_offset index)
-{
-    rtems_raw_irq_hdl		hdl;
-    interrupt_gate_descriptor* 	idt_entry_tbl;
-    unsigned			limit;
-
-    i386_get_info_from_IDTR (&idt_entry_tbl, &limit);
-	
-    /* Convert limit into number of entries */
-    limit = (limit + 1) / sizeof(interrupt_gate_descriptor);
-  
-    if(index >= limit) {
-        return 0;
-    }
-
-    * ((unsigned int*) &hdl) = (idt_entry_tbl[index].low_offsets_bits | 
-			      (idt_entry_tbl[index].high_offsets_bits << 16));
-    return hdl;
-}
-
-int i386_set_idt_entry  (const rtems_raw_irq_connect_data* irq)
-{
-    interrupt_gate_descriptor* 	idt_entry_tbl;
-    unsigned			limit;
-    unsigned int 		level;
-
-    
-    i386_get_info_from_IDTR (&idt_entry_tbl, &limit);
-
-    /* Convert limit into number of entries */
-    limit = (limit + 1) / sizeof(interrupt_gate_descriptor);
-
-    if (irq->idtIndex >= limit) {
-      return 0;
-    }
-    /*
-     * Check if default handler is actually connected. If not issue an error.
-     * You must first get the current handler via i386_get_current_idt_entry
-     * and then disconnect it using i386_delete_idt_entry.
-     * RATIONALE : to always have the same transition by forcing the user
-     * to get the previous handler before accepting to disconnect.
-     */
-    if (get_hdl_from_vector(irq->idtIndex) != default_raw_irq_entry.hdl) {
-      return 0;
-    }
-
-    _CPU_ISR_Disable(level);
-    
-    raw_irq_table [irq->idtIndex] = *irq;
-    create_interrupt_gate_descriptor (&idt_entry_tbl[irq->idtIndex], irq->hdl);
-    irq->on(irq);
-    
-    _CPU_ISR_Enable(level);
-    return 1;
-}
-
-void _CPU_ISR_install_vector (unsigned vector,
-			      void* hdl,
-			      void** oldHdl)
-{
-    interrupt_gate_descriptor* 	idt_entry_tbl;
-    unsigned			limit;
-    interrupt_gate_descriptor	new;
-    unsigned int 		level;
-    
-    i386_get_info_from_IDTR (&idt_entry_tbl, &limit);
-
-    /* Convert limit into number of entries */
-    limit = (limit + 1) / sizeof(interrupt_gate_descriptor);
-
-    if (vector >= limit) {
-      return;
-    }
-    _CPU_ISR_Disable(level)
-    * ((unsigned int *) oldHdl) = idt_entry_tbl[vector].low_offsets_bits |
-	(idt_entry_tbl[vector].high_offsets_bits << 16);
-
-    create_interrupt_gate_descriptor(&new,  hdl);
-    idt_entry_tbl[vector] = new;
-
-    _CPU_ISR_Enable(level);
-}
-				
-int i386_get_current_idt_entry (rtems_raw_irq_connect_data* irq)
-{
-    interrupt_gate_descriptor* 	idt_entry_tbl;
-    unsigned			limit;
-
-    i386_get_info_from_IDTR (&idt_entry_tbl, &limit);
-
-    /* Convert limit into number of entries */
-    limit = (limit + 1) / sizeof(interrupt_gate_descriptor);
-
-    if (irq->idtIndex >= limit) {
-      return 0;
-    }
-    raw_irq_table [irq->idtIndex].hdl = get_hdl_from_vector(irq->idtIndex);
-    
-    *irq = raw_irq_table [irq->idtIndex];
-    
-    return 1;
-}
-
-int i386_delete_idt_entry (const rtems_raw_irq_connect_data* irq)
-{
-    interrupt_gate_descriptor* 	idt_entry_tbl;
-    unsigned			limit;
-    unsigned int 		level;
-    
-    i386_get_info_from_IDTR (&idt_entry_tbl, &limit);
-
-    /* Convert limit into number of entries */
-    limit = (limit + 1) / sizeof(interrupt_gate_descriptor);
-
-    if (irq->idtIndex >= limit) {
-      return 0;
-    }
-    /*
-     * Check if handler passed is actually connected. If not issue an error.
-     * You must first get the current handler via i386_get_current_idt_entry
-     * and then disconnect it using i386_delete_idt_entry.
-     * RATIONALE : to always have the same transition by forcing the user
-     * to get the previous handler before accepting to disconnect.
-     */
-    if (get_hdl_from_vector(irq->idtIndex) != irq->hdl){
-      return 0;
-    }
-    _CPU_ISR_Disable(level);
-
-    idt_entry_tbl[irq->idtIndex] = default_idt_entry;
-
-    irq->off(irq);
-    
-    raw_irq_table[irq->idtIndex] = default_raw_irq_entry;
-    raw_irq_table[irq->idtIndex].idtIndex = irq->idtIndex;
-
-    _CPU_ISR_Enable(level);
-    
-    return 1;
-}
-
-/*
- * Caution this function assumes the IDTR has been already set.
- */
-int i386_init_idt (rtems_raw_irq_global_settings* config)
-{
-    unsigned			limit;
-    unsigned 			i;
-    unsigned 			level;
-    interrupt_gate_descriptor*	idt_entry_tbl;
-    
-    i386_get_info_from_IDTR (&idt_entry_tbl, &limit);
-
-    /* Convert limit into number of entries */
-    limit = (limit + 1) / sizeof(interrupt_gate_descriptor);
-      
-    if (config->idtSize != limit) {
-      return 0;
-    }
-    /*
-     * store various accelarators
-     */
-    raw_irq_table 		= config->rawIrqHdlTbl;
-    local_settings 		= config;
-    default_raw_irq_entry 	= config->defaultRawEntry;
-
-    _CPU_ISR_Disable(level);
-
-    create_interrupt_gate_descriptor (&default_idt_entry, default_raw_irq_entry.hdl);
-
-    for (i=0; i < limit; i++) {
-      interrupt_gate_descriptor new;
-      create_interrupt_gate_descriptor (&new, raw_irq_table[i].hdl);
-      idt_entry_tbl[i] = new;
-      if (raw_irq_table[i].hdl != default_raw_irq_entry.hdl) {
-	raw_irq_table[i].on(&raw_irq_table[i]);
-      }
-      else {
-	raw_irq_table[i].off(&raw_irq_table[i]);
-      }
-    }
-    _CPU_ISR_Enable(level);
-
-    return 1;
-}
-
-int i386_get_idt_config (rtems_raw_irq_global_settings** config)
-{
-  *config = local_settings;
-  return 1;
-}
-
-/*
- * Caution this function assumes the GDTR has been already set.
- */
-int i386_set_gdt_entry (unsigned short segment_selector, unsigned base,
-			unsigned limit)
-{
-    unsigned 			gdt_limit;
-    unsigned short              tmp_segment = 0;
-    unsigned int                limit_adjusted;
-    segment_descriptors* 	gdt_entry_tbl;
-
-      
-    i386_get_info_from_GDTR (&gdt_entry_tbl, &gdt_limit);
-
-    if (segment_selector > limit) {
-      return 0;
-    }
-    /*
-     * set up limit first
-     */
-    limit_adjusted = limit;
-    if ( limit > 4095 ) {
-      gdt_entry_tbl[segment_selector].granularity = 1;
-      limit_adjusted /= 4096;
-    }
-    gdt_entry_tbl[segment_selector].limit_15_0  = limit_adjusted & 0xffff;
-    gdt_entry_tbl[segment_selector].limit_19_16 = (limit_adjusted >> 16) & 0xf;
-    /*
-     * set up base
-     */
-    gdt_entry_tbl[segment_selector].base_address_15_0  = base & 0xffff;
-    gdt_entry_tbl[segment_selector].base_address_23_16 = (base >> 16) & 0xff;
-    gdt_entry_tbl[segment_selector].base_address_31_24 = (base >> 24) & 0xff;
-    /*
-     * set up descriptor type (this may well becomes a parameter if needed)
-     */
-    gdt_entry_tbl[segment_selector].type 		= 2;   	/* Data R/W */
-    gdt_entry_tbl[segment_selector].descriptor_type 	= 1;	/* Code or Data */
-    gdt_entry_tbl[segment_selector].privilege 		= 0; 	/* ring 0 */
-    gdt_entry_tbl[segment_selector].present 		= 1; 	/* not present */
-
-    /*
-     * Now, reload all segment registers so the limit takes effect.
-     */
-
-    asm volatile( "movw %%ds,%0 ; movw %0,%%ds
-                   movw %%es,%0 ; movw %0,%%es
-                   movw %%fs,%0 ; movw %0,%%fs
-                   movw %%gs,%0 ; movw %0,%%gs
-                   movw %%ss,%0 ; movw %0,%%ss"
-                   : "=r" (tmp_segment)
-                   : "0"  (tmp_segment)
-		  );
-    
-    return 1;
-}
diff --git a/c/src/lib/libcpu/m68k/shared/misc/memcpy.c b/c/src/lib/libcpu/m68k/shared/misc/memcpy.c
deleted file mode 100644
index 3948411f4b..0000000000
--- a/c/src/lib/libcpu/m68k/shared/misc/memcpy.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- *  C library memcpy routine
- *
- *  This routine has code to optimize performance on the CPU32+
- *  and another version for other 68k machines.
- *
- *  It could be optimized more for machines with MOVE16 instructions.
- *
- *  The routine is placed in this source directory to ensure that it
- *  is picked up by all applications.
- *
- *  W. Eric Norum
- *  Saskatchewan Accelerator Laboratory
- *  University of Saskatchewan
- *  Saskatoon, Saskatchewan, CANADA
- *  eric@skatter.usask.ca
- */
-
-#include <string.h>
-#include <rtems/score/m68k.h>
-
-#if defined(__mcpu32__)
-#define COPYSETUP(n)	n--
-#define COPY(to,from,n,size) \
-	asm volatile ("1:\n" \
-	     "\tmove." size " (%0)+,(%1)+\n" \
-	     "\tdbf %2,1b\n"  \
-	     "\tsub.l #0x10000,%2\n" \
-	     "\tbpl.b 1b\n" : \
-		"=a" (from), "=a" (to), "=d" (n) :\
-		 "0" (from),  "1" (to), "2" (n) : \
-		 "cc", "memory")
-#else
-#define COPYSETUP(n)
-#define COPY(to,from,n,size) \
-	asm volatile ("1:\n" \
-	     "\tmove." size " (%0)+,(%1)+\n" \
-	     "\tsubq.l #1,%2\n\tbne.b 1b\n" : \
-		"=a" (from), "=a" (to), "=d" (n) :\
-		 "0" (from),  "1" (to), "2" (n) : \
-		 "cc", "memory")
-#endif
-
-void *
-memcpy(void *s1, const void *s2, size_t n)
-{
-	char *p1 = s1;
-	const char *p2 = s2;
-
-	if (n) {
-		if (n < 16) {
-			COPYSETUP (n);
-			COPY (p1, p2, n, "b");
-		}
-		else {
-			int nbyte;
-			int nl;
-			nbyte = (int)p1 & 0x3;
-			if (nbyte) {
-				nbyte = 4 - nbyte;
-				n -= nbyte;
-				COPYSETUP (nbyte);
-				COPY (p1, p2, nbyte, "b");
-			}
-#if (M68K_HAS_MISALIGNED == 0)
-			/*
-			 * Take care of machines that can't
-			 * handle misaligned references.
-			 */
-			if ((int)p2 & 0x1) {
-				COPYSETUP (n);
-				COPY (p1, p2, n, "b");
-				return s1;
-			}
-#endif
-			nl = (unsigned int)n >> 2;
-			COPYSETUP (nl);
-			COPY (p1, p2, nl, "l");
-			nbyte = (int)n & 0x3;
-			if (nbyte) {
-				COPYSETUP (nbyte);
-				COPY (p1, p2, nbyte, "b");
-			}
-		}
-	}
-	return s1;
-}
diff --git a/c/src/lib/libcpu/mips/clock/ckinit.c b/c/src/lib/libcpu/mips/clock/ckinit.c
deleted file mode 100644
index 60b3187223..0000000000
--- a/c/src/lib/libcpu/mips/clock/ckinit.c
+++ /dev/null
@@ -1,249 +0,0 @@
-
-/*  ckinit.c
- *
- *  This file contains the clock driver initialization for the IDT 4650.
- *
- *  Author:     Craig Lebakken <craigl@transition.com>
- *
- *  COPYRIGHT (c) 1996 by Transition Networks Inc.
- *
- *  To anyone who acknowledges that this file is provided "AS IS"
- *  without any express or implied warranty:
- *      permission to use, copy, modify, and distribute this file
- *      for any purpose is hereby granted without fee, provided that
- *      the above copyright notice and this notice appears in all
- *      copies, and that the name of Transition Networks not be used in
- *      advertising or publicity pertaining to distribution of the
- *      software without specific, written prior permission.
- *      Transition Networks makes no representations about the suitability
- *      of this software for any purpose.
- *
- *  Derived from c/src/lib/libbsp/no_cpu/no_bsp/clock/ckinit.c:
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-/*
- *  Rather than deleting this, it is commented out to (hopefully) help
- *  the submitter send updates.
- *
- *  static char _sccsid[] = "@(#)ckinit.c 08/20/96     1.3\n";
- */
-
-
-#include <stdlib.h>
-
-#include <rtems.h>
-#include <rtems/libio.h>
-#include <bsp.h>
-
-#define EXT_INT5    0x8000  /* external interrupt 5 */
-
-#include "clock.h"
-
-#define CLOCKS_PER_MICROSECOND ( CPU_CLOCK_RATE_MHZ ) /* equivalent to CPU clock speed in MHz */
-
-void Clock_exit( void );
-rtems_isr Clock_isr( rtems_vector_number vector );
-
-
-/*
- *  The interrupt vector number associated with the clock tick device
- *  driver.
- */
-
-#define CLOCK_VECTOR_MASK    EXT_INT5
-#define CLOCK_VECTOR         0x7
-
-/*
- *  Clock_driver_ticks is a monotonically increasing counter of the
- *  number of clock ticks since the driver was initialized.
- */
-
-volatile rtems_unsigned32 Clock_driver_ticks;
-
-/*
- *  Clock_isrs is the number of clock ISRs until the next invocation of
- *  the RTEMS clock tick routine.  The clock tick device driver
- *  gets an interrupt once a millisecond and counts down until the
- *  length of time between the user configured microseconds per tick
- *  has passed.
- */
-
-rtems_unsigned32 Clock_isrs;              /* ISRs until next tick */
-
-/*
- * These are set by clock driver during its init
- */
- 
-rtems_device_major_number rtems_clock_major = ~0;
-rtems_device_minor_number rtems_clock_minor;
-
-/*
- *  The previous ISR on this clock tick interrupt vector.
- */
-
-rtems_isr_entry  Old_ticker;
-
-void Clock_exit( void );
-
-static unsigned32 mips_timer_rate = 0;
-
-/*
- *  Isr Handler
- */
-
-rtems_isr Clock_isr(
-  rtems_vector_number vector
-)
-{
-/*
- * bump the number of clock driver ticks since initialization
- *
- * determine if it is time to announce the passing of tick as configured
- * to RTEMS through the rtems_clock_tick directive
- *
- * perform any timer dependent tasks
- */
-
-  /* refresh the internal CPU timer */
-  mips_set_timer( mips_timer_rate );
-
-  Clock_driver_ticks += 1;
-
-  rtems_clock_tick();
-}
-
-/* User callback shell (set from Clock_Control) */
-static void (*user_callback)(void);
-
-rtems_isr User_Clock_isr(
-  rtems_vector_number vector
-)
-{
-   /* refresh the internal CPU timer */
-   mips_set_timer( mips_timer_rate );
-
-   if (user_callback)
-      user_callback();
-}
-
-/*
- *  Install_clock
- *
- *  Install a clock tick handleR and reprograms the chip.  This
- *  is used to initially establish the clock tick.
- */
-
-void Install_clock(
-  rtems_isr_entry clock_isr
-)
-{
-  /*
-   *  Initialize the clock tick device driver variables
-   */
-
-  Clock_driver_ticks = 0;
-  Clock_isrs = BSP_Configuration.microseconds_per_tick / 1000;
-
-  /*
-   *  If ticks_per_timeslice is configured as non-zero, then the user
-   *  wants a clock tick.
-   */
-
-  if ( BSP_Configuration.ticks_per_timeslice ) {
-    Old_ticker = (rtems_isr_entry) set_vector( clock_isr, CLOCK_VECTOR, 1 );
-    /*
-     *  Hardware specific initialize goes here
-     */
-
-    mips_timer_rate = BSP_Configuration.microseconds_per_tick * CLOCKS_PER_MICROSECOND;
-    mips_set_timer( mips_timer_rate );
-    enable_int(CLOCK_VECTOR_MASK);
-  }
-
-  /*
-   *  Schedule the clock cleanup routine to execute if the application exits.
-   */
-
-  atexit( Clock_exit );
-}
-
-/*
- *  Clean up before the application exits
- */
-
-void Clock_exit( void )
-{
-  if ( BSP_Configuration.ticks_per_timeslice ) {
-
-    /* mips: turn off the timer interrupts */
-    disable_int(CLOCK_VECTOR_MASK);
-
-  }
-}
-
-/*
- *  Clock_initialize
- *
- *  Device driver entry point for clock tick driver initialization.
- */
-
-rtems_device_driver Clock_initialize(
-  rtems_device_major_number major,
-  rtems_device_minor_number minor,
-  void *pargp
-)
-{
-  Install_clock( Clock_isr );
- 
-  /*
-   * make major/minor avail to others such as shared memory driver
-   */
- 
-  rtems_clock_major = major;
-  rtems_clock_minor = minor;
- 
-  return RTEMS_SUCCESSFUL;
-}
-
-rtems_device_driver Clock_control(
-  rtems_device_major_number major,
-  rtems_device_minor_number minor,
-  void *pargp
-)
-{
-    rtems_unsigned32 isrlevel;
-    rtems_libio_ioctl_args_t *args = pargp;
- 
-    if (args == 0)
-        goto done;
- 
-    /*
-     * This is hokey, but until we get a defined interface
-     * to do this, it will just be this simple...
-     */
- 
-    if (args->command == rtems_build_name('I', 'S', 'R', ' '))
-    {
-        Clock_isr(CLOCK_VECTOR);
-    }
-    else if (args->command == rtems_build_name('N', 'E', 'W', ' '))
-    {
-      rtems_interrupt_disable( isrlevel );
-      user_callback = (void (*)(void))args->buffer;
-      (void) set_vector( User_Clock_isr, CLOCK_VECTOR, 1 );
-      rtems_interrupt_enable( isrlevel );
-    }
- 
-done:
-    return RTEMS_SUCCESSFUL;
-}
diff --git a/c/src/lib/libcpu/mips/clock/clock.S b/c/src/lib/libcpu/mips/clock/clock.S
deleted file mode 100644
index ec0280f494..0000000000
--- a/c/src/lib/libcpu/mips/clock/clock.S
+++ /dev/null
@@ -1,45 +0,0 @@
-/*  clock.s 
- *
- *  This file contains the assembly code for the IDT 4650 clock driver.
- *
- *  Author:     Craig Lebakken <craigl@transition.com>
- *
- *  COPYRIGHT (c) 1996 by Transition Networks Inc.
- *
- *  To anyone who acknowledges that this file is provided "AS IS"
- *  without any express or implied warranty:
- *      permission to use, copy, modify, and distribute this file
- *      for any purpose is hereby granted without fee, provided that
- *      the above copyright notice and this notice appears in all
- *      copies, and that the name of Transition Networks not be used in
- *      advertising or publicity pertaining to distribution of the
- *      software without specific, written prior permission.
- *      Transition Networks makes no representations about the suitability
- *      of this software for any purpose.
- *
- *  $Id$
- */
-/* @(#)clock.S       08/20/96     1.2 */
-
-#include <rtems/score/iregdef.h>
-#include <rtems/score/idtcpu.h>
-#include <rtems/score/idtmon.h>
-
-FRAME(mips_set_timer,sp,0,ra)
-	.set noreorder
-        mfc0 t0,C0_COUNT
-        nop
-        addu t0,a0,t0
-        mtc0 t0,C0_COMPARE
-        nop
-        j ra
-	.set reorder
-ENDFRAME(mips_set_timer)
-
-FRAME(mips_get_timer,sp,0,ra)
-	.set noreorder
-        mfc0 v0,C0_COUNT
-        nop
-        j ra
-	.set reorder
-ENDFRAME(mips_get_timer)
diff --git a/c/src/lib/libcpu/mips/clock/clock.h b/c/src/lib/libcpu/mips/clock/clock.h
deleted file mode 100644
index a14304f668..0000000000
--- a/c/src/lib/libcpu/mips/clock/clock.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*  clock.s
- *
- *  This file contains the assembly code for the IDT 4650 clock driver.
- *
- *  Author:     Craig Lebakken <craigl@transition.com>
- *
- *  COPYRIGHT (c) 1996 by Transition Networks Inc.
- *
- *  To anyone who acknowledges that this file is provided "AS IS"
- *  without any express or implied warranty:
- *      permission to use, copy, modify, and distribute this file
- *      for any purpose is hereby granted without fee, provided that
- *      the above copyright notice and this notice appears in all
- *      copies, and that the name of Transition Networks not be used in
- *      advertising or publicity pertaining to distribution of the
- *      software without specific, written prior permission.
- *      Transition Networks makes no representations about the suitability
- *      of this software for any purpose.
- *
- *  $Id$
- */
-
-/* @(#)clock.h       08/20/96     1.2 */
-
-extern void mips_set_timer( unsigned32 timer_clock_interval );
diff --git a/c/src/lib/libcpu/mips/timer/gettime.S b/c/src/lib/libcpu/mips/timer/gettime.S
deleted file mode 100644
index a00f2d5819..0000000000
--- a/c/src/lib/libcpu/mips/timer/gettime.S
+++ /dev/null
@@ -1,35 +0,0 @@
-/*  gettime.s
- *
- *  This file contains the assembly code for the IDT 4650 timer driver.
- *
- *  Author:     Craig Lebakken <craigl@transition.com>
- *
- *  COPYRIGHT (c) 1996 by Transition Networks Inc.
- *
- *  To anyone who acknowledges that this file is provided "AS IS"
- *  without any express or implied warranty:
- *      permission to use, copy, modify, and distribute this file
- *      for any purpose is hereby granted without fee, provided that
- *      the above copyright notice and this notice appears in all
- *      copies, and that the name of Transition Networks not be used in
- *      advertising or publicity pertaining to distribution of the
- *      software without specific, written prior permission.
- *      Transition Networks makes no representations about the suitability
- *      of this software for any purpose.
- *
- *  $Id$
- */
-
-/* @(#)gettime.S       08/20/96     1.2 */
-
-#include <rtems/score/iregdef.h>
-#include <rtems/score/idtcpu.h>
-#include <rtems/score/idtmon.h>
-
-FRAME(mips_read_timer,sp,0,ra)
-	.set noreorder
-        mfc0 v0,C0_COUNT
-        nop
-        j ra
-	.set reorder
-ENDFRAME(mips_read_timer)
diff --git a/c/src/lib/libcpu/mips/timer/timer.c b/c/src/lib/libcpu/mips/timer/timer.c
deleted file mode 100644
index 167a9b3804..0000000000
--- a/c/src/lib/libcpu/mips/timer/timer.c
+++ /dev/null
@@ -1,140 +0,0 @@
-/*  timer.c
- *
- *  This file contains the initialization code for the IDT 4650 timer driver.
- *
- *  Author:     Craig Lebakken <craigl@transition.com>
- *
- *  COPYRIGHT (c) 1996 by Transition Networks Inc.
- *
- *  To anyone who acknowledges that this file is provided "AS IS"
- *  without any express or implied warranty:
- *      permission to use, copy, modify, and distribute this file
- *      for any purpose is hereby granted without fee, provided that
- *      the above copyright notice and this notice appears in all
- *      copies, and that the name of Transition Networks not be used in
- *      advertising or publicity pertaining to distribution of the
- *      software without specific, written prior permission.
- *      Transition Networks makes no representations about the suitability
- *      of this software for any purpose.
- *
- *  derived from src/lib/libbsp/no_cpu/no_bsp/timer/timer.c
- *
- *  This file manages the benchmark timer used by the RTEMS Timing Test
- *  Suite.  Each measured time period is demarcated by calls to
- *  Timer_initialize() and Read_timer().  Read_timer() usually returns
- *  the number of microseconds since Timer_initialize() exitted.
- *
- *  NOTE: It is important that the timer start/stop overhead be
- *        determined when porting or modifying this code.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-/*
- *  Rather than deleting this, it is commented out to (hopefully) help
- *  the submitter send updates.
- *
- *  static char _sccsid[] = "@(#)timer.c 08/20/96     1.5\n";
- */
-
-
-#include <rtems.h>
-#include <bsp.h>
-
-#define CLOCKS_PER_MICROSECOND ( CPU_CLOCK_RATE_MHZ )
-#define TIMER_MAX_VALUE 0xffffffff
-
-extern unsigned32 mips_read_timer( void );
-
-static rtems_boolean Timer_driver_Find_average_overhead;
-static unsigned32 Timer_initial_value = 0;
-
-void Timer_initialize( void )
-{
-   Timer_initial_value = mips_read_timer();
-  /*
-   *  Somehow start the timer
-   */
-
-  /* Timer on 4650 is always running */
-}
-
-/*
- *  The following controls the behavior of Read_timer().
- *
- *  AVG_OVEREHAD is the overhead for starting and stopping the timer.  It
- *  is usually deducted from the number returned.
- *
- *  LEAST_VALID is the lowest number this routine should trust.  Numbers
- *  below this are "noise" and zero is returned.
- */
-
-#define AVG_OVERHEAD      8  /* It typically takes X.X microseconds */
-                             /* (Y countdowns) to start/stop the timer. */
-                             /* This value is in cycles. */
-#define LEAST_VALID       1  /* Don't trust a clicks value lower than this */
-
-int Read_timer( void )
-{
-  unsigned64 clicks;
-  unsigned32 total;
-
-  /*
-   *  Read the timer and see how many clicks it has been since we started.
-   */
-
-  clicks = mips_read_timer();   /* XXX: read some HW here */
-  if (clicks < Timer_initial_value)
-  {
-      clicks += TIMER_MAX_VALUE;
-  }
-  clicks -= Timer_initial_value;
-
-  /*
-   *  Total is calculated by taking into account the number of timer overflow
-   *  interrupts since the timer was initialized and clicks since the last
-   *  interrupts.
-   */
-#if 0 /* leave total in number of cycles */
-   total = clicks / CLOCKS_PER_MICROSECOND;
-#else
-   total = clicks;
-#endif
-
-  if ( Timer_driver_Find_average_overhead == 1 )
-    return total;          /* in # cycles units */
-  else {
-    if ( total < LEAST_VALID )
-      return 0;            /* below timer resolution */
-  /*
-   *  leave total in cycles
-   */
-      return (total - AVG_OVERHEAD);
-    }
-}
-
-/*
- *  Empty function call used in loops to measure basic cost of looping
- *  in Timing Test Suite.
- */
-
-rtems_status_code Empty_function( void )
-{
-  return RTEMS_SUCCESSFUL;
-}
-
-void Set_find_average_overhead(
-  rtems_boolean find_flag
-)
-{
-  Timer_driver_Find_average_overhead = find_flag;
-}
-
diff --git a/c/src/lib/libcpu/sh/sh7032/score/cpu_asm.c b/c/src/lib/libcpu/sh/sh7032/score/cpu_asm.c
deleted file mode 100644
index 42764f6eb1..0000000000
--- a/c/src/lib/libcpu/sh/sh7032/score/cpu_asm.c
+++ /dev/null
@@ -1,311 +0,0 @@
-/*
- *  This file contains the basic algorithms for all assembly code used
- *  in an specific CPU port of RTEMS.  These algorithms must be implemented
- *  in assembly language
- *
- *  NOTE:  This port uses a C file with inline assembler instructions
- *
- *  Authors: Ralf Corsepius (corsepiu@faw.uni-ulm.de) and
- *           Bernd Becker (becker@faw.uni-ulm.de)
- *
- *  COPYRIGHT (c) 1997-1998, FAW Ulm, Germany
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * 
- *
- *  COPYRIGHT (c) 1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- *
- *  This material may be reproduced by or for the U.S. Government pursuant
- *  to the copyright license under the clause at DFARS 252.227-7013.  This
- *  notice must appear in all copies of this file and its derivatives.
- *
- */
-
-/*
- *  This is supposed to be an assembly file.  This means that system.h
- *  and cpu.h should not be included in a "real" cpu_asm file.  An
- *  implementation in assembly should include "cpu_asm.h"
- */
-
-#include <rtems/system.h>
-#include <rtems/score/cpu.h>
-#include <rtems/score/isr.h>
-#include <rtems/score/thread.h>
-#include <rtems/score/cpu_isps.h>
-#include <rtems/score/sh_io.h>
-#include <rtems/score/sh.h>
-#include <rtems/score/iosh7030.h>
-
-/* from cpu_isps.c */
-extern proc_ptr         _Hardware_isr_Table[];
-
-#if( CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE)
-  unsigned long    *_old_stack_ptr;
-#endif
-
-register unsigned long  *stack_ptr asm("r15"); 
-
-/* 
- * sh_set_irq_priority
- * 
- * this function sets the interrupt level of the specified interrupt
- *
- * parameters:
- *             - irq : interrupt number 
- *             - prio: priority to set for this interrupt number
- *
- * returns:    0 if ok
- *             -1 on error
- */
-
-unsigned int sh_set_irq_priority( 
-  unsigned int irq, 
-  unsigned int prio )
-{
-  unsigned32 shiftcount;
-  unsigned32 prioreg;
-  unsigned16 temp16;
-  unsigned32 level;
-
-  /*
-   * first check for valid interrupt
-   */
-  if(( irq > 113) || (_Hardware_isr_Table[irq] == _dummy_isp))
-    return -1;
-  /*
-   * check for valid irq priority
-   */
-  if( prio > 15 )
-    return -1;
-
-  /*
-   * look up appropriate interrupt priority register
-   */
-  if( irq > 71)
-    {
-      irq = irq - 72;
-      shiftcount = 12 - ((irq & ~0x03) % 16);
-      
-      switch( irq / 16)
-	{
-	case 0: { prioreg = INTC_IPRC; break;}
-	case 1: { prioreg = INTC_IPRD; break;}
-	case 2: { prioreg = INTC_IPRE; break;}
-	default: return -1;
-	}
-    }
-  else
-    {
-      shiftcount = 12 - 4 * ( irq % 4);
-      if( irq > 67)
-	prioreg = INTC_IPRB;
-      else
-	prioreg = INTC_IPRA;
-    }
-
-  /*
-   * Set the interrupt priority register
-   */
-  _CPU_ISR_Disable( level );
-
-  temp16 = read16( prioreg);
-  temp16 &= ~( 15 << shiftcount);
-  temp16 |= prio << shiftcount;
-  write16( temp16, prioreg);
-
-  _CPU_ISR_Enable( level );
-
-  return 0;
-}
-
-/*
- *  _CPU_Context_save_fp_context
- *
- *  This routine is responsible for saving the FP context
- *  at *fp_context_ptr.  If the point to load the FP context
- *  from is changed then the pointer is modified by this routine.
- *
- *  Sometimes a macro implementation of this is in cpu.h which dereferences
- *  the ** and a similarly named routine in this file is passed something
- *  like a (Context_Control_fp *).  The general rule on making this decision
- *  is to avoid writing assembly language.
- */
-
-void _CPU_Context_save_fp(
-  void **fp_context_ptr
-)
-{
-}
-
-/*
- *  _CPU_Context_restore_fp_context
- *
- *  This routine is responsible for restoring the FP context
- *  at *fp_context_ptr.  If the point to load the FP context
- *  from is changed then the pointer is modified by this routine.
- *
- *  Sometimes a macro implementation of this is in cpu.h which dereferences
- *  the ** and a similarly named routine in this file is passed something
- *  like a (Context_Control_fp *).  The general rule on making this decision
- *  is to avoid writing assembly language.
- */
-
-void _CPU_Context_restore_fp(
-  void **fp_context_ptr
-)
-{
-}
-
-/*  _CPU_Context_switch
- *
- *  This routine performs a normal non-FP context switch.
- */
-
-/*  within __CPU_Context_switch:
- *  _CPU_Context_switch
- *  _CPU_Context_restore
- *
- *  This routine is generally used only to restart self in an
- *  efficient manner.  It may simply be a label in _CPU_Context_switch.
- *
- * NOTE: It should be safe not to store r4, r5
- *
- * NOTE: It is doubtful if r0 is really needed to be stored
- *
- * NOTE: gbr is added, but should not be necessary, as it is
- *	only used globally in this port.
- */
-
-/*
- * FIXME: This is an ugly hack, but we wanted to avoid recalculating 
- *        the offset each time Context_Control is changed
- */
-void __CPU_Context_switch(
-  Context_Control  *run,	/* r4 */
-  Context_Control  *heir	/* r5 */
-)
-{
-
-asm volatile("
-	.global __CPU_Context_switch
-__CPU_Context_switch:
-
-	add	%0,r4
-  
-	stc.l   sr,@-r4
-	stc.l	gbr,@-r4
-	mov.l   r0,@-r4
-	mov.l   r1,@-r4
-	mov.l   r2,@-r4
-	mov.l   r3,@-r4
-
-	mov.l   r6,@-r4
-	mov.l   r7,@-r4
-	mov.l	r8,@-r4
-	mov.l	r9,@-r4
-	mov.l	r10,@-r4
-	mov.l	r11,@-r4
-	mov.l	r12,@-r4
-	mov.l	r13,@-r4
-	mov.l   r14,@-r4
-	sts.l   pr,@-r4
-	sts.l   mach,@-r4
-	sts.l   macl,@-r4
-	mov.l   r15,@-r4
-
-	mov     r5, r4"
-  :: "I" (sizeof(Context_Control))
-  );
-
-  asm volatile("
-	.global __CPU_Context_restore
-__CPU_Context_restore:
-	mov.l   @r4+,r15
-	lds.l   @r4+,macl
-	lds.l   @r4+,mach
-	lds.l   @r4+,pr
-	mov.l   @r4+,r14
-	mov.l   @r4+,r13
-	mov.l   @r4+,r12
-	mov.l   @r4+,r11
-	mov.l   @r4+,r10
-	mov.l   @r4+,r9
-	mov.l   @r4+,r8
-	mov.l   @r4+,r7
-	mov.l   @r4+,r6
-
-	mov.l   @r4+,r3
-	mov.l   @r4+,r2
-	mov.l   @r4+,r1
-	mov.l   @r4+,r0
-	ldc.l   @r4+,gbr
-	ldc.l   @r4+,sr
-
-	rts
-	nop" );
-}
-
-/*  
- *  This routine provides the RTEMS interrupt management.
- */
- 
-void __ISR_Handler( unsigned32 vector)
-{
-  register unsigned32 level;
-
-  _CPU_ISR_Disable( level );
-
-  _Thread_Dispatch_disable_level++;
-
-#if( CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE)
-  if( _ISR_Nest_level == 0 )
-    {
-      /* Install irq stack */
-      _old_stack_ptr = stack_ptr;
-      stack_ptr = _CPU_Interrupt_stack_high;
-    }
-
-#endif
-
-  _ISR_Nest_level++;
-
-  _CPU_ISR_Enable( level );
-
-  /* call isp */
-  if( _ISR_Vector_table[ vector])
-    (*_ISR_Vector_table[ vector ])( vector );
-
-  _CPU_ISR_Disable( level );
-
-  _ISR_Nest_level--;
-
-#if( CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE)
-
-  if( _ISR_Nest_level == 0 )
-    /* restore old stack pointer */
-    stack_ptr = _old_stack_ptr;  
-#endif
-
-  _Thread_Dispatch_disable_level--;
-
-  _CPU_ISR_Enable( level );
-
-  if ( _Thread_Dispatch_disable_level == 0 )
-    {
-      if(( _Context_Switch_necessary) || (! _ISR_Signals_to_thread_executing))
-	{
-	  _ISR_Signals_to_thread_executing = FALSE;
-	  _Thread_Dispatch();
-	}
-  }
-}
diff --git a/c/src/lib/libcpu/sh/sh7032/score/ispsh7032.c b/c/src/lib/libcpu/sh/sh7032/score/ispsh7032.c
deleted file mode 100644
index 3ef3c32465..0000000000
--- a/c/src/lib/libcpu/sh/sh7032/score/ispsh7032.c
+++ /dev/null
@@ -1,252 +0,0 @@
-/*
- * This file contains the isp frames for the user interrupts.
- * From these procedures __ISR_Handler is called with the vector number
- * as argument.
- *
- * __ISR_Handler is kept in a separate file (cpu_asm.c), because a bug in 
- * some releases of gcc doesn't properly handle #pragma interrupt, if a 
- * file contains both isrs and normal functions.
- *
- *  Authors: Ralf Corsepius (corsepiu@faw.uni-ulm.de) and
- *           Bernd Becker (becker@faw.uni-ulm.de)
- *
- *  COPYRIGHT (c) 1997-1998, FAW Ulm, Germany
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE
- * 
- *
- *  COPYRIGHT (c) 1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems/system.h>
-#include <rtems/score/shtypes.h>
-#include <rtems/score/cpu_isps.h>
-
-/*
- * This is a exception vector table
- *
- * It has the same structure like the actual vector table (vectab)
- */
-proc_ptr _Hardware_isr_Table[256]={
-_dummy_isp, _dummy_isp, _dummy_isp, _dummy_isp,
-_dummy_isp, _dummy_isp, _dummy_isp, _dummy_isp, 
-_dummy_isp, _dummy_isp, _dummy_isp,
-_nmi_isp, _usb_isp, 
-_dummy_isp, _dummy_isp, _dummy_isp, _dummy_isp, 
-_dummy_isp, _dummy_isp, _dummy_isp, _dummy_isp, 
-_dummy_isp, _dummy_isp, _dummy_isp, _dummy_isp, 
-_dummy_isp, _dummy_isp, _dummy_isp, _dummy_isp, 
-_dummy_isp, _dummy_isp, _dummy_isp, 
-/* trapa 0 -31 */
-_dummy_isp, _dummy_isp, _dummy_isp, _dummy_isp, 
-_dummy_isp, _dummy_isp, _dummy_isp, _dummy_isp, 
-_dummy_isp, _dummy_isp, _dummy_isp, _dummy_isp, 
-_dummy_isp, _dummy_isp, _dummy_isp, _dummy_isp, 
-_dummy_isp, _dummy_isp, _dummy_isp, _dummy_isp,
-_dummy_isp, _dummy_isp, _dummy_isp, _dummy_isp, 
-_dummy_isp, _dummy_isp, _dummy_isp, _dummy_isp, 
-_dummy_isp, _dummy_isp, _dummy_isp, _dummy_isp, 
-/* irq 64 ... */
-_irq0_isp, _irq1_isp, _irq2_isp, _irq3_isp, 
-_irq4_isp, _irq5_isp, _irq6_isp, _irq7_isp,
-_dma0_isp, _dummy_isp, _dma1_isp, _dummy_isp, 
-_dma2_isp, _dummy_isp, _dma3_isp, _dummy_isp, 
-_imia0_isp, _imib0_isp, _ovi0_isp, _dummy_isp, 
-_imia1_isp, _imib1_isp, _ovi1_isp, _dummy_isp, 
-_imia2_isp, _imib2_isp, _ovi2_isp, _dummy_isp, 
-_imia3_isp, _imib3_isp, _ovi3_isp, _dummy_isp, 
-_imia4_isp, _imib4_isp, _ovi4_isp, _dummy_isp, 
-_eri0_isp, _rxi0_isp, _txi0_isp, _tei0_isp,
-_eri1_isp, _rxi1_isp, _txi1_isp, _tei1_isp,
-_prt_isp, _adu_isp, _dummy_isp, _dummy_isp, 
-_wdt_isp, 
-/* 113 */ _dref_isp
-};
-
-#define Str(a)#a
-
-/*
- * Some versions of gcc and all version of egcs at least until egcs-1.1b
- * are not able to handle #pragma interrupt correctly if more than 1 isr is 
- * contained in a file and when optimizing.
- * We try to work around this problem by using the macro below.
- */
-#define isp( name, number, func)\
-asm (".global _"Str(name)"\n\t" \
-     "_"Str(name)":       \n\t" \
-     "    mov.l r0,@-r15   \n\t" \
-     "    mov.l r1,@-r15   \n\t" \
-     "    mov.l r2,@-r15   \n\t" \
-     "    mov.l r3,@-r15   \n\t" \
-     "    mov.l r4,@-r15   \n\t" \
-     "    mov.l r5,@-r15   \n\t" \
-     "    mov.l r6,@-r15   \n\t" \
-     "    mov.l r7,@-r15   \n\t" \
-     "    mov.l r14,@-r15  \n\t" \
-     "    sts.l pr,@-r15   \n\t" \
-     "    sts.l mach,@-r15 \n\t" \
-     "    sts.l macl,@-r15 \n\t" \
-     "    mov r15,r14      \n\t" \
-     "    mov.l "Str(name)"_k, r1\n\t" \
-     "    jsr @r1           \n\t" \
-     "    mov #"Str(number)", r4\n\t" \
-     "    mov   r14,r15    \n\t" \
-     "    lds.l @r15+,macl \n\t" \
-     "    lds.l @r15+,mach \n\t" \
-     "    lds.l @r15+,pr   \n\t" \
-     "    mov.l @r15+,r14  \n\t" \
-     "    mov.l @r15+,r7   \n\t" \
-     "    mov.l @r15+,r6   \n\t" \
-     "    mov.l @r15+,r5   \n\t" \
-     "    mov.l @r15+,r4   \n\t" \
-     "    mov.l @r15+,r3   \n\t" \
-     "    mov.l @r15+,r2   \n\t" \
-     "    mov.l @r15+,r1   \n\t" \
-     "    mov.l @r15+,r0   \n\t" \
-     "    rte              \n\t" \
-     "    nop              \n\t" \
-     "    .align 2         \n\t" \
-     #name"_k: \n\t" \
-     ".long "Str(func));
-
-/************************************************
- * Dummy interrupt service procedure for 
- * interrupts being not allowed --> Trap 34 
- ************************************************/
-asm(" .section .text
-.global __dummy_isp
-__dummy_isp:
-      mov.l r14,@-r15
-      mov   r15, r14
-      trapa #34
-      mov.l @r15+,r14
-      rte
-      nop");
-
-/*****************************
- * Non maskable interrupt 
- *****************************/
-isp( _nmi_isp, NMI_ISP_V, ___ISR_Handler);
-
-/***************************** 
- * User break controller 
- *****************************/
-isp( _usb_isp, USB_ISP_V, ___ISR_Handler);
-
-/*****************************
- *  External interrupts 0-7 
- *****************************/
-isp( _irq0_isp, IRQ0_ISP_V, ___ISR_Handler);
-isp( _irq1_isp, IRQ1_ISP_V, ___ISR_Handler);
-isp( _irq2_isp, IRQ2_ISP_V, ___ISR_Handler);
-isp( _irq3_isp, IRQ3_ISP_V, ___ISR_Handler);
-isp( _irq4_isp, IRQ4_ISP_V, ___ISR_Handler);
-isp( _irq5_isp, IRQ5_ISP_V, ___ISR_Handler);
-isp( _irq6_isp, IRQ6_ISP_V, ___ISR_Handler);
-isp( _irq7_isp, IRQ7_ISP_V, ___ISR_Handler);
-
-/*****************************
- * DMA - controller 
- *****************************/
-isp( _dma0_isp, DMA0_ISP_V, ___ISR_Handler);
-isp( _dma1_isp, DMA1_ISP_V, ___ISR_Handler);
-isp( _dma2_isp, DMA2_ISP_V, ___ISR_Handler);
-isp( _dma3_isp, DMA3_ISP_V, ___ISR_Handler);
-
-
-/***************************** 
- * Interrupt timer unit 
- *****************************/
-
-/*****************************
- * Timer 0 
- *****************************/
-isp( _imia0_isp, IMIA0_ISP_V, ___ISR_Handler);
-isp( _imib0_isp, IMIB0_ISP_V, ___ISR_Handler);
-isp( _ovi0_isp,  OVI0_ISP_V, ___ISR_Handler);
-
-/*****************************
- * Timer 1
- *****************************/
-isp( _imia1_isp, IMIA1_ISP_V, ___ISR_Handler);
-isp( _imib1_isp, IMIB1_ISP_V, ___ISR_Handler);
-isp( _ovi1_isp,  OVI1_ISP_V, ___ISR_Handler);
-
-/*****************************
- * Timer 2
- *****************************/
-isp( _imia2_isp, IMIA2_ISP_V, ___ISR_Handler);
-isp( _imib2_isp, IMIB2_ISP_V, ___ISR_Handler);
-isp( _ovi2_isp,  OVI2_ISP_V, ___ISR_Handler);
-
-/*****************************
- * Timer 3
- *****************************/
-isp( _imia3_isp, IMIA3_ISP_V, ___ISR_Handler);
-isp( _imib3_isp, IMIB3_ISP_V, ___ISR_Handler);
-isp( _ovi3_isp,  OVI3_ISP_V, ___ISR_Handler);
-
-/*****************************
- * Timer 4
- *****************************/
-isp( _imia4_isp, IMIA4_ISP_V, ___ISR_Handler);
-isp( _imib4_isp, IMIB4_ISP_V, ___ISR_Handler);
-isp( _ovi4_isp,  OVI4_ISP_V, ___ISR_Handler);
-
-
-/*****************************
- * Serial interfaces 
- *****************************/
-
-/*****************************
- * Serial interface 0
- *****************************/
-isp( _eri0_isp,  ERI0_ISP_V, ___ISR_Handler);
-isp( _rxi0_isp,  RXI0_ISP_V, ___ISR_Handler);
-isp( _txi0_isp,  TXI0_ISP_V, ___ISR_Handler);
-isp( _tei0_isp,  TEI0_ISP_V, ___ISR_Handler);
-
-/*****************************
- * Serial interface 1
- *****************************/
-isp( _eri1_isp,  ERI1_ISP_V, ___ISR_Handler);
-isp( _rxi1_isp,  RXI1_ISP_V, ___ISR_Handler);
-isp( _txi1_isp,  TXI1_ISP_V, ___ISR_Handler);
-isp( _tei1_isp,  TEI1_ISP_V, ___ISR_Handler);
-
-
-/*****************************
- * Parity control unit of 
- * the bus state controller 
- *****************************/
-isp( _prt_isp,  PRT_ISP_V, ___ISR_Handler);
-
-
-/****************************** 
- * Analog digital converter
- * ADC 
- ******************************/
-isp( _adu_isp,  ADU_ISP_V, ___ISR_Handler);
-
-
-/******************************
- *  Watchdog timer 
- ******************************/
-isp( _wdt_isp,  WDT_ISP_V, ___ISR_Handler);
-
-
-/******************************
- * DRAM refresh control unit 
- * of bus state controller 
- ******************************/
-isp( _dref_isp,  DREF_ISP_V, ___ISR_Handler);
diff --git a/c/src/lib/libcpu/sh/sh7045/score/cpu_asm.c b/c/src/lib/libcpu/sh/sh7045/score/cpu_asm.c
deleted file mode 100644
index 42764f6eb1..0000000000
--- a/c/src/lib/libcpu/sh/sh7045/score/cpu_asm.c
+++ /dev/null
@@ -1,311 +0,0 @@
-/*
- *  This file contains the basic algorithms for all assembly code used
- *  in an specific CPU port of RTEMS.  These algorithms must be implemented
- *  in assembly language
- *
- *  NOTE:  This port uses a C file with inline assembler instructions
- *
- *  Authors: Ralf Corsepius (corsepiu@faw.uni-ulm.de) and
- *           Bernd Becker (becker@faw.uni-ulm.de)
- *
- *  COPYRIGHT (c) 1997-1998, FAW Ulm, Germany
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * 
- *
- *  COPYRIGHT (c) 1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- *
- *  This material may be reproduced by or for the U.S. Government pursuant
- *  to the copyright license under the clause at DFARS 252.227-7013.  This
- *  notice must appear in all copies of this file and its derivatives.
- *
- */
-
-/*
- *  This is supposed to be an assembly file.  This means that system.h
- *  and cpu.h should not be included in a "real" cpu_asm file.  An
- *  implementation in assembly should include "cpu_asm.h"
- */
-
-#include <rtems/system.h>
-#include <rtems/score/cpu.h>
-#include <rtems/score/isr.h>
-#include <rtems/score/thread.h>
-#include <rtems/score/cpu_isps.h>
-#include <rtems/score/sh_io.h>
-#include <rtems/score/sh.h>
-#include <rtems/score/iosh7030.h>
-
-/* from cpu_isps.c */
-extern proc_ptr         _Hardware_isr_Table[];
-
-#if( CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE)
-  unsigned long    *_old_stack_ptr;
-#endif
-
-register unsigned long  *stack_ptr asm("r15"); 
-
-/* 
- * sh_set_irq_priority
- * 
- * this function sets the interrupt level of the specified interrupt
- *
- * parameters:
- *             - irq : interrupt number 
- *             - prio: priority to set for this interrupt number
- *
- * returns:    0 if ok
- *             -1 on error
- */
-
-unsigned int sh_set_irq_priority( 
-  unsigned int irq, 
-  unsigned int prio )
-{
-  unsigned32 shiftcount;
-  unsigned32 prioreg;
-  unsigned16 temp16;
-  unsigned32 level;
-
-  /*
-   * first check for valid interrupt
-   */
-  if(( irq > 113) || (_Hardware_isr_Table[irq] == _dummy_isp))
-    return -1;
-  /*
-   * check for valid irq priority
-   */
-  if( prio > 15 )
-    return -1;
-
-  /*
-   * look up appropriate interrupt priority register
-   */
-  if( irq > 71)
-    {
-      irq = irq - 72;
-      shiftcount = 12 - ((irq & ~0x03) % 16);
-      
-      switch( irq / 16)
-	{
-	case 0: { prioreg = INTC_IPRC; break;}
-	case 1: { prioreg = INTC_IPRD; break;}
-	case 2: { prioreg = INTC_IPRE; break;}
-	default: return -1;
-	}
-    }
-  else
-    {
-      shiftcount = 12 - 4 * ( irq % 4);
-      if( irq > 67)
-	prioreg = INTC_IPRB;
-      else
-	prioreg = INTC_IPRA;
-    }
-
-  /*
-   * Set the interrupt priority register
-   */
-  _CPU_ISR_Disable( level );
-
-  temp16 = read16( prioreg);
-  temp16 &= ~( 15 << shiftcount);
-  temp16 |= prio << shiftcount;
-  write16( temp16, prioreg);
-
-  _CPU_ISR_Enable( level );
-
-  return 0;
-}
-
-/*
- *  _CPU_Context_save_fp_context
- *
- *  This routine is responsible for saving the FP context
- *  at *fp_context_ptr.  If the point to load the FP context
- *  from is changed then the pointer is modified by this routine.
- *
- *  Sometimes a macro implementation of this is in cpu.h which dereferences
- *  the ** and a similarly named routine in this file is passed something
- *  like a (Context_Control_fp *).  The general rule on making this decision
- *  is to avoid writing assembly language.
- */
-
-void _CPU_Context_save_fp(
-  void **fp_context_ptr
-)
-{
-}
-
-/*
- *  _CPU_Context_restore_fp_context
- *
- *  This routine is responsible for restoring the FP context
- *  at *fp_context_ptr.  If the point to load the FP context
- *  from is changed then the pointer is modified by this routine.
- *
- *  Sometimes a macro implementation of this is in cpu.h which dereferences
- *  the ** and a similarly named routine in this file is passed something
- *  like a (Context_Control_fp *).  The general rule on making this decision
- *  is to avoid writing assembly language.
- */
-
-void _CPU_Context_restore_fp(
-  void **fp_context_ptr
-)
-{
-}
-
-/*  _CPU_Context_switch
- *
- *  This routine performs a normal non-FP context switch.
- */
-
-/*  within __CPU_Context_switch:
- *  _CPU_Context_switch
- *  _CPU_Context_restore
- *
- *  This routine is generally used only to restart self in an
- *  efficient manner.  It may simply be a label in _CPU_Context_switch.
- *
- * NOTE: It should be safe not to store r4, r5
- *
- * NOTE: It is doubtful if r0 is really needed to be stored
- *
- * NOTE: gbr is added, but should not be necessary, as it is
- *	only used globally in this port.
- */
-
-/*
- * FIXME: This is an ugly hack, but we wanted to avoid recalculating 
- *        the offset each time Context_Control is changed
- */
-void __CPU_Context_switch(
-  Context_Control  *run,	/* r4 */
-  Context_Control  *heir	/* r5 */
-)
-{
-
-asm volatile("
-	.global __CPU_Context_switch
-__CPU_Context_switch:
-
-	add	%0,r4
-  
-	stc.l   sr,@-r4
-	stc.l	gbr,@-r4
-	mov.l   r0,@-r4
-	mov.l   r1,@-r4
-	mov.l   r2,@-r4
-	mov.l   r3,@-r4
-
-	mov.l   r6,@-r4
-	mov.l   r7,@-r4
-	mov.l	r8,@-r4
-	mov.l	r9,@-r4
-	mov.l	r10,@-r4
-	mov.l	r11,@-r4
-	mov.l	r12,@-r4
-	mov.l	r13,@-r4
-	mov.l   r14,@-r4
-	sts.l   pr,@-r4
-	sts.l   mach,@-r4
-	sts.l   macl,@-r4
-	mov.l   r15,@-r4
-
-	mov     r5, r4"
-  :: "I" (sizeof(Context_Control))
-  );
-
-  asm volatile("
-	.global __CPU_Context_restore
-__CPU_Context_restore:
-	mov.l   @r4+,r15
-	lds.l   @r4+,macl
-	lds.l   @r4+,mach
-	lds.l   @r4+,pr
-	mov.l   @r4+,r14
-	mov.l   @r4+,r13
-	mov.l   @r4+,r12
-	mov.l   @r4+,r11
-	mov.l   @r4+,r10
-	mov.l   @r4+,r9
-	mov.l   @r4+,r8
-	mov.l   @r4+,r7
-	mov.l   @r4+,r6
-
-	mov.l   @r4+,r3
-	mov.l   @r4+,r2
-	mov.l   @r4+,r1
-	mov.l   @r4+,r0
-	ldc.l   @r4+,gbr
-	ldc.l   @r4+,sr
-
-	rts
-	nop" );
-}
-
-/*  
- *  This routine provides the RTEMS interrupt management.
- */
- 
-void __ISR_Handler( unsigned32 vector)
-{
-  register unsigned32 level;
-
-  _CPU_ISR_Disable( level );
-
-  _Thread_Dispatch_disable_level++;
-
-#if( CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE)
-  if( _ISR_Nest_level == 0 )
-    {
-      /* Install irq stack */
-      _old_stack_ptr = stack_ptr;
-      stack_ptr = _CPU_Interrupt_stack_high;
-    }
-
-#endif
-
-  _ISR_Nest_level++;
-
-  _CPU_ISR_Enable( level );
-
-  /* call isp */
-  if( _ISR_Vector_table[ vector])
-    (*_ISR_Vector_table[ vector ])( vector );
-
-  _CPU_ISR_Disable( level );
-
-  _ISR_Nest_level--;
-
-#if( CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE)
-
-  if( _ISR_Nest_level == 0 )
-    /* restore old stack pointer */
-    stack_ptr = _old_stack_ptr;  
-#endif
-
-  _Thread_Dispatch_disable_level--;
-
-  _CPU_ISR_Enable( level );
-
-  if ( _Thread_Dispatch_disable_level == 0 )
-    {
-      if(( _Context_Switch_necessary) || (! _ISR_Signals_to_thread_executing))
-	{
-	  _ISR_Signals_to_thread_executing = FALSE;
-	  _Thread_Dispatch();
-	}
-  }
-}
diff --git a/c/src/lib/libcpu/sparc/include/erc32.h b/c/src/lib/libcpu/sparc/include/erc32.h
deleted file mode 100644
index 50df21267f..0000000000
--- a/c/src/lib/libcpu/sparc/include/erc32.h
+++ /dev/null
@@ -1,521 +0,0 @@
-/*  erc32.h
- *
- *  This include file contains information pertaining to the ERC32.
- *  The ERC32 is a custom SPARC V7 implementation based on the Cypress
- *  601/602 chipset.  This CPU has a number of on-board peripherals and
- *  was developed by the European Space Agency to target space applications.
- *
- *  NOTE:  Other than where absolutely required, this version currently 
- *         supports only the peripherals and bits used by the basic board 
- *         support package. This includes at least significant pieces of 
- *         the following items:
- *
- *           + UART Channels A and B
- *           + General Purpose Timer
- *           + Real Time Clock
- *           + Watchdog Timer (so it can be disabled)
- *           + Control Register (so powerdown mode can be enabled)
- *           + Memory Control Register
- *           + Interrupt Control
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  Ported to ERC32 implementation of the SPARC by On-Line Applications
- *  Research Corporation (OAR) under contract to the European Space 
- *  Agency (ESA).
- *
- *  ERC32 modifications of respective RTEMS file: COPYRIGHT (c) 1995. 
- *  European Space Agency.
- *
- *  $Id$
- */
- 
-#ifndef _INCLUDE_ERC32_h
-#define _INCLUDE_ERC32_h
-
-#include <rtems/score/sparc.h>
- 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- *  Interrupt Sources
- *
- *  The interrupt source numbers directly map to the trap type and to 
- *  the bits used in the Interrupt Clear, Interrupt Force, Interrupt Mask,
- *  and the Interrupt Pending Registers.
- */
-
-#define ERC32_INTERRUPT_MASKED_ERRORS             1
-#define ERC32_INTERRUPT_EXTERNAL_1                2
-#define ERC32_INTERRUPT_EXTERNAL_2                3
-#define ERC32_INTERRUPT_UART_A_RX_TX              4
-#define ERC32_INTERRUPT_UART_B_RX_TX              5
-#define ERC32_INTERRUPT_CORRECTABLE_MEMORY_ERROR  6
-#define ERC32_INTERRUPT_UART_ERROR                7
-#define ERC32_INTERRUPT_DMA_ACCESS_ERROR          8
-#define ERC32_INTERRUPT_DMA_TIMEOUT               9
-#define ERC32_INTERRUPT_EXTERNAL_3               10
-#define ERC32_INTERRUPT_EXTERNAL_4               11
-#define ERC32_INTERRUPT_GENERAL_PURPOSE_TIMER    12
-#define ERC32_INTERRUPT_REAL_TIME_CLOCK          13
-#define ERC32_INTERRUPT_EXTERNAL_5               14
-#define ERC32_INTERRUPT_WATCHDOG_TIMEOUT         15
-
-#ifndef ASM
-
-/*
- *  Trap Types for on-chip peripherals
- *
- *  Source: Table 8 - Interrupt Trap Type and Default Priority Assignments
- *
- *  NOTE: The priority level for each source corresponds to the least 
- *        significant nibble of the trap type.
- */
-
-#define ERC32_TRAP_TYPE( _source ) SPARC_ASYNCHRONOUS_TRAP((_source) + 0x10)
-
-#define ERC32_TRAP_SOURCE( _trap ) ((_trap) - 0x10)
-
-#define ERC32_Is_MEC_Trap( _trap ) \
-  ( (_trap) >= ERC32_TRAP_TYPE( ERC32_INTERRUPT_MASKED_ERRORS ) && \
-    (_trap) <= ERC32_TRAP_TYPE( ERC32_INTERRUPT_WATCHDOG_TIMEOUT ) )
-
-/*
- *  Structure for ERC32 memory mapped registers.  
- *
- *  Source: Section 3.25.2 - Register Address Map
- *
- *  NOTE:  There is only one of these structures per CPU, its base address 
- *         is 0x01f80000, and the variable MEC is placed there by the 
- *         linkcmds file.
- */
-
-typedef struct {
-  volatile unsigned32  Control;                              /* offset 0x00 */
-  volatile unsigned32  Software_Reset;                       /* offset 0x04 */
-  volatile unsigned32  Power_Down;                           /* offset 0x08 */
-  volatile unsigned32  Unimplemented_0;                      /* offset 0x0c */
-  volatile unsigned32  Memory_Configuration;                 /* offset 0x10 */
-  volatile unsigned32  IO_Configuration;                     /* offset 0x14 */
-  volatile unsigned32  Wait_State_Configuration;             /* offset 0x18 */
-  volatile unsigned32  Unimplemented_1;                      /* offset 0x1c */
-  volatile unsigned32  Memory_Access_0;                      /* offset 0x20 */
-  volatile unsigned32  Memory_Access_1;                      /* offset 0x24 */
-  volatile unsigned32  Unimplemented_2[ 7 ];                 /* offset 0x28 */
-  volatile unsigned32  Interrupt_Shape;                      /* offset 0x44 */
-  volatile unsigned32  Interrupt_Pending;                    /* offset 0x48 */
-  volatile unsigned32  Interrupt_Mask;                       /* offset 0x4c */
-  volatile unsigned32  Interrupt_Clear;                      /* offset 0x50 */
-  volatile unsigned32  Interrupt_Force;                      /* offset 0x54 */
-  volatile unsigned32  Unimplemented_3[ 2 ];                 /* offset 0x58 */
-                                                             /* offset 0x60 */
-  volatile unsigned32  Watchdog_Program_and_Timeout_Acknowledge; 
-  volatile unsigned32  Watchdog_Trap_Door_Set;               /* offset 0x64 */
-  volatile unsigned32  Unimplemented_4[ 6 ];                 /* offset 0x68 */
-  volatile unsigned32  Real_Time_Clock_Counter;              /* offset 0x80 */
-  volatile unsigned32  Real_Time_Clock_Scalar;               /* offset 0x84 */
-  volatile unsigned32  General_Purpose_Timer_Counter;        /* offset 0x88 */
-  volatile unsigned32  General_Purpose_Timer_Scalar;         /* offset 0x8c */
-  volatile unsigned32  Unimplemented_5[ 2 ];                 /* offset 0x90 */
-  volatile unsigned32  Timer_Control;                        /* offset 0x98 */
-  volatile unsigned32  Unimplemented_6;                      /* offset 0x9c */
-  volatile unsigned32  System_Fault_Status;                  /* offset 0xa0 */
-  volatile unsigned32  First_Failing_Address;                /* offset 0xa4 */
-  volatile unsigned32  First_Failing_Data;                   /* offset 0xa8 */
-  volatile unsigned32  First_Failing_Syndrome_and_Check_Bits;/* offset 0xac */
-  volatile unsigned32  Error_and_Reset_Status;               /* offset 0xb0 */
-  volatile unsigned32  Error_Mask;                           /* offset 0xb4 */
-  volatile unsigned32  Unimplemented_7[ 2 ];                 /* offset 0xb8 */
-  volatile unsigned32  Debug_Control;                        /* offset 0xc0 */
-  volatile unsigned32  Breakpoint;                           /* offset 0xc4 */
-  volatile unsigned32  Watchpoint;                           /* offset 0xc8 */
-  volatile unsigned32  Unimplemented_8;                      /* offset 0xcc */
-  volatile unsigned32  Test_Control;                         /* offset 0xd0 */
-  volatile unsigned32  Test_Data;                            /* offset 0xd4 */
-  volatile unsigned32  Unimplemented_9[ 2 ];                 /* offset 0xd8 */
-  volatile unsigned32  UART_Channel_A;                       /* offset 0xe0 */
-  volatile unsigned32  UART_Channel_B;                       /* offset 0xe4 */
-  volatile unsigned32  UART_Status;                          /* offset 0xe8 */
-} ERC32_Register_Map;
-
-#endif
-
-/*
- *  The following constants are intended to be used ONLY in assembly
- *  language files.
- *
- *  NOTE:  The intended style of usage is to load the address of MEC
- *         into a register and then use these as displacements from
- *         that register.
- */
-
-#ifdef ASM
-
-#define  ERC32_MEC_CONTROL_OFFSET                                  0x00
-#define  ERC32_MEC_SOFTWARE_RESET_OFFSET                           0x04
-#define  ERC32_MEC_POWER_DOWN_OFFSET                               0x08
-#define  ERC32_MEC_UNIMPLEMENTED_0_OFFSET                          0x0C
-#define  ERC32_MEC_MEMORY_CONFIGURATION_OFFSET                     0x10
-#define  ERC32_MEC_IO_CONFIGURATION_OFFSET                         0x14
-#define  ERC32_MEC_WAIT_STATE_CONFIGURATION_OFFSET                 0x18
-#define  ERC32_MEC_UNIMPLEMENTED_1_OFFSET                          0x1C
-#define  ERC32_MEC_MEMORY_ACCESS_0_OFFSET                          0x20
-#define  ERC32_MEC_MEMORY_ACCESS_1_OFFSET                          0x24
-#define  ERC32_MEC_UNIMPLEMENTED_2_OFFSET                          0x28
-#define  ERC32_MEC_INTERRUPT_SHAPE_OFFSET                          0x44
-#define  ERC32_MEC_INTERRUPT_PENDING_OFFSET                        0x48
-#define  ERC32_MEC_INTERRUPT_MASK_OFFSET                           0x4C
-#define  ERC32_MEC_INTERRUPT_CLEAR_OFFSET                          0x50
-#define  ERC32_MEC_INTERRUPT_FORCE_OFFSET                          0x54
-#define  ERC32_MEC_UNIMPLEMENTED_3_OFFSET                          0x58
-#define  ERC32_MEC_WATCHDOG_PROGRAM_AND_TIMEOUT_ACKNOWLEDGE_OFFSET 0x60
-#define  ERC32_MEC_WATCHDOG_TRAP_DOOR_SET_OFFSET                   0x64
-#define  ERC32_MEC_UNIMPLEMENTED_4_OFFSET                          0x6C
-#define  ERC32_MEC_REAL_TIME_CLOCK_COUNTER_OFFSET                  0x80
-#define  ERC32_MEC_REAL_TIME_CLOCK_SCALAR_OFFSET                   0x84
-#define  ERC32_MEC_GENERAL_PURPOSE_TIMER_COUNTER_OFFSET            0x88
-#define  ERC32_MEC_GENERAL_PURPOSE_TIMER_SCALAR_OFFSET             0x8C
-#define  ERC32_MEC_UNIMPLEMENTED_5_OFFSET                          0x90
-#define  ERC32_MEC_TIMER_CONTROL_OFFSET                            0x98
-#define  ERC32_MEC_UNIMPLEMENTED_6_OFFSET                          0x9C
-#define  ERC32_MEC_SYSTEM_FAULT_STATUS_OFFSET                      0xA0
-#define  ERC32_MEC_FIRST_FAILING_ADDRESS_OFFSET                    0xA4
-#define  ERC32_MEC_FIRST_FAILING_DATA_OFFSET                       0xA8
-#define  ERC32_MEC_FIRST_FAILING_SYNDROME_AND_CHECK_BITS_OFFSET    0xAC
-#define  ERC32_MEC_ERROR_AND_RESET_STATUS_OFFSET                   0xB0
-#define  ERC32_MEC_ERROR_MASK_OFFSET                               0xB4
-#define  ERC32_MEC_UNIMPLEMENTED_7_OFFSET                          0xB8
-#define  ERC32_MEC_DEBUG_CONTROL_OFFSET                            0xC0
-#define  ERC32_MEC_BREAKPOINT_OFFSET                               0xC4
-#define  ERC32_MEC_WATCHPOINT_OFFSET                               0xC8
-#define  ERC32_MEC_UNIMPLEMENTED_8_OFFSET                          0xCC
-#define  ERC32_MEC_TEST_CONTROL_OFFSET                             0xD0
-#define  ERC32_MEC_TEST_DATA_OFFSET                                0xD4
-#define  ERC32_MEC_UNIMPLEMENTED_9_OFFSET                          0xD8
-#define  ERC32_MEC_UART_CHANNEL_A_OFFSET                           0xE0
-#define  ERC32_MEC_UART_CHANNEL_B_OFFSET                           0xE4
-#define  ERC32_MEC_UART_STATUS_OFFSET                              0xE8
-
-#endif
-
-/*
- *  The following defines the bits in the Configuration Register.
- */
-
-#define ERC32_CONFIGURATION_POWER_DOWN_MASK               0x00000001
-#define ERC32_CONFIGURATION_POWER_DOWN_ALLOWED            0x00000001
-#define ERC32_CONFIGURATION_POWER_DOWN_DISABLED           0x00000000
-
-#define ERC32_CONFIGURATION_SOFTWARE_RESET_MASK           0x00000002
-#define ERC32_CONFIGURATION_SOFTWARE_RESET_ALLOWED        0x00000002
-#define ERC32_CONFIGURATION_SOFTWARE_RESET_DISABLED       0x00000000
-
-#define ERC32_CONFIGURATION_BUS_TIMEOUT_MASK              0x00000004
-#define ERC32_CONFIGURATION_BUS_TIMEOUT_ENABLED           0x00000004
-#define ERC32_CONFIGURATION_BUS_TIMEOUT_DISABLED          0x00000000
-
-#define ERC32_CONFIGURATION_ACCESS_PROTECTION_MASK        0x00000008
-#define ERC32_CONFIGURATION_ACCESS_PROTECTION_ENABLED     0x00000008
-#define ERC32_CONFIGURATION_ACCESS_PROTECTION_DISABLED    0x00000000
-
-
-/*
- *  The following defines the bits in the Memory Configuration Register.
- */
-
-#define ERC32_MEMORY_CONFIGURATION_RAM_SIZE_MASK  0x00001C00
-#define ERC32_MEMORY_CONFIGURATION_RAM_SIZE_256K  ( 0 << 10 )
-#define ERC32_MEMORY_CONFIGURATION_RAM_SIZE_512K  ( 1 << 10 )
-#define ERC32_MEMORY_CONFIGURATION_RAM_SIZE_1MB   ( 2 << 10 )
-#define ERC32_MEMORY_CONFIGURATION_RAM_SIZE_2MB   ( 3 << 10 )
-#define ERC32_MEMORY_CONFIGURATION_RAM_SIZE_4MB   ( 4 << 10 )
-#define ERC32_MEMORY_CONFIGURATION_RAM_SIZE_8MB   ( 5 << 10 )
-#define ERC32_MEMORY_CONFIGURATION_RAM_SIZE_16MB  ( 6 << 10 )
-#define ERC32_MEMORY_CONFIGURATION_RAM_SIZE_32MB  ( 7 << 10 )
-
-#define ERC32_MEMORY_CONFIGURATION_PROM_SIZE_MASK  0x001C0000
-#define ERC32_MEMORY_CONFIGURATION_PROM_SIZE_128K    ( 0 << 18 )
-#define ERC32_MEMORY_CONFIGURATION_PROM_SIZE_256K    ( 1 << 18 )
-#define ERC32_MEMORY_CONFIGURATION_PROM_SIZE_512K   ( 2 << 18 )
-#define ERC32_MEMORY_CONFIGURATION_PROM_SIZE_1M   ( 3 << 18 )
-#define ERC32_MEMORY_CONFIGURATION_PROM_SIZE_2M   ( 4 << 18 )
-#define ERC32_MEMORY_CONFIGURATION_PROM_SIZE_4M  ( 5 << 18 )
-#define ERC32_MEMORY_CONFIGURATION_PROM_SIZE_8M  ( 6 << 18 )
-#define ERC32_MEMORY_CONFIGURATION_PROM_SIZE_16M  ( 7 << 18 )
- 
-/*
- *  The following defines the bits in the Timer Control Register.
- */
-
-#define ERC32_MEC_TIMER_CONTROL_GCR    0x00000001  /* 1 = reload at 0 */
-                                               /* 0 = stop at 0 */
-#define ERC32_MEC_TIMER_CONTROL_GCL    0x00000002  /* 1 = load and start */
-                                               /* 0 = no function */
-#define ERC32_MEC_TIMER_CONTROL_GSE    0x00000004  /* 1 = enable counting */
-                                               /* 0 = hold scalar and counter */
-#define ERC32_MEC_TIMER_CONTROL_GSL    0x00000008  /* 1 = load scalar and start */
-                                               /* 0 = no function */
-
-#define ERC32_MEC_TIMER_CONTROL_RTCCR  0x00000100  /* 1 = reload at 0 */
-                                               /* 0 = stop at 0 */
-#define ERC32_MEC_TIMER_CONTROL_RTCCL  0x00000200  /* 1 = load and start */
-                                               /* 0 = no function */
-#define ERC32_MEC_TIMER_CONTROL_RTCSE  0x00000400  /* 1 = enable counting */
-                                               /* 0 = hold scalar and counter */
-#define ERC32_MEC_TIMER_CONTROL_RTCSL  0x00000800  /* 1 = load scalar and start */
-                                               /* 0 = no function */
-
-/*
- *  The following defines the bits in the UART Control Registers.
- *
- */
-
-#define ERC32_MEC_UART_CONTROL_RTD  0x000000FF /* RX/TX data */ 
- 
-/*
- *  The following defines the bits in the MEC UART Control Registers.
- */
-
-#define ERC32_MEC_UART_STATUS_DR   0x00000001 /* Data Ready */
-#define ERC32_MEC_UART_STATUS_TSE  0x00000002 /* TX Send Register Empty */
-#define ERC32_MEC_UART_STATUS_THE  0x00000004 /* TX Hold Register Empty */
-#define ERC32_MEC_UART_STATUS_FE   0x00000010 /* RX Framing Error */
-#define ERC32_MEC_UART_STATUS_PE   0x00000020 /* RX Parity Error */
-#define ERC32_MEC_UART_STATUS_OE   0x00000040 /* RX Overrun Error */
-#define ERC32_MEC_UART_STATUS_CU   0x00000080 /* Clear Errors */
-#define ERC32_MEC_UART_STATUS_TXE  0x00000006 /* TX Empty */
-#define ERC32_MEC_UART_STATUS_CLRA 0x00000080 /* Clear UART A */
-#define ERC32_MEC_UART_STATUS_CLRB 0x00800000 /* Clear UART B */
-#define ERC32_MEC_UART_STATUS_ERRA 0x00000070 /* Error in UART A */
-#define ERC32_MEC_UART_STATUS_ERRB 0x00700000 /* Error in UART B */
-
-#define ERC32_MEC_UART_STATUS_DRA   (ERC32_MEC_UART_STATUS_DR  << 0)
-#define ERC32_MEC_UART_STATUS_TSEA  (ERC32_MEC_UART_STATUS_TSE << 0)
-#define ERC32_MEC_UART_STATUS_THEA  (ERC32_MEC_UART_STATUS_THE << 0)
-#define ERC32_MEC_UART_STATUS_FEA   (ERC32_MEC_UART_STATUS_FE  << 0)
-#define ERC32_MEC_UART_STATUS_PEA   (ERC32_MEC_UART_STATUS_PE  << 0)
-#define ERC32_MEC_UART_STATUS_OEA   (ERC32_MEC_UART_STATUS_OE  << 0)
-#define ERC32_MEC_UART_STATUS_CUA   (ERC32_MEC_UART_STATUS_CU  << 0)
-#define ERC32_MEC_UART_STATUS_TXEA  (ERC32_MEC_UART_STATUS_TXE << 0)
-
-#define ERC32_MEC_UART_STATUS_DRB   (ERC32_MEC_UART_STATUS_DR  << 16)
-#define ERC32_MEC_UART_STATUS_TSEB  (ERC32_MEC_UART_STATUS_TSE << 16)
-#define ERC32_MEC_UART_STATUS_THEB  (ERC32_MEC_UART_STATUS_THE << 16)
-#define ERC32_MEC_UART_STATUS_FEB   (ERC32_MEC_UART_STATUS_FE  << 16)
-#define ERC32_MEC_UART_STATUS_PEB   (ERC32_MEC_UART_STATUS_PE  << 16)
-#define ERC32_MEC_UART_STATUS_OEB   (ERC32_MEC_UART_STATUS_OE  << 16)
-#define ERC32_MEC_UART_STATUS_CUB   (ERC32_MEC_UART_STATUS_CU  << 16)
-#define ERC32_MEC_UART_STATUS_TXEB  (ERC32_MEC_UART_STATUS_TXE << 16)
-
-#ifndef ASM
-
-/*
- *  This is used to manipulate the on-chip registers.
- *
- *  The following symbol must be defined in the linkcmds file and point
- *  to the correct location.
- */
-
-extern ERC32_Register_Map ERC32_MEC;
- 
-/*
- *  Macros to manipulate the Interrupt Clear, Interrupt Force, Interrupt Mask,
- *  and the Interrupt Pending Registers.
- *
- *  NOTE: For operations which are not atomic, this code disables interrupts
- *        to guarantee there are no intervening accesses to the same register.
- *        The operations which read the register, modify the value and then
- *        store the result back are vulnerable.
- */
-
-#define ERC32_Clear_interrupt( _source ) \
-  do { \
-    ERC32_MEC.Interrupt_Clear = (1 << (_source)); \
-  } while (0)
-
-#define ERC32_Force_interrupt( _source ) \
-  do { \
-    unsigned32 _level; \
-    \
-    sparc_disable_interrupts( _level ); \
-    ERC32_MEC.Test_Control = ERC32_MEC.Test_Control | 0x80000; \
-    ERC32_MEC.Interrupt_Force = (1 << (_source)); \
-    sparc_enable_interrupts( _level ); \
-  } while (0)
- 
-#define ERC32_Is_interrupt_pending( _source ) \
-  (ERC32_MEC.Interrupt_Pending & (1 << (_source)))
- 
-#define ERC32_Is_interrupt_masked( _source ) \
-  (ERC32_MEC.Interrupt_Masked & (1 << (_source)))
- 
-#define ERC32_Mask_interrupt( _source ) \
-  do { \
-    unsigned32 _level; \
-    \
-    sparc_disable_interrupts( _level ); \
-      ERC32_MEC.Interrupt_Mask |= (1 << (_source)); \
-    sparc_enable_interrupts( _level ); \
-  } while (0)
- 
-#define ERC32_Unmask_interrupt( _source ) \
-  do { \
-    unsigned32 _level; \
-    \
-    sparc_disable_interrupts( _level ); \
-      ERC32_MEC.Interrupt_Mask &= ~(1 << (_source)); \
-    sparc_enable_interrupts( _level ); \
-  } while (0)
-
-#define ERC32_Disable_interrupt( _source, _previous ) \
-  do { \
-    unsigned32 _level; \
-    unsigned32 _mask = 1 << (_source); \
-    \
-    sparc_disable_interrupts( _level ); \
-      (_previous) = ERC32_MEC.Interrupt_Mask; \
-      ERC32_MEC.Interrupt_Mask = _previous | _mask; \
-    sparc_enable_interrupts( _level ); \
-    (_previous) &= ~_mask; \
-  } while (0)
- 
-#define ERC32_Restore_interrupt( _source, _previous ) \
-  do { \
-    unsigned32 _level; \
-    unsigned32 _mask = 1 << (_source); \
-    \
-    sparc_disable_interrupts( _level ); \
-      ERC32_MEC.Interrupt_Mask = \
-        (ERC32_MEC.Interrupt_Mask & ~_mask) | (_previous); \
-    sparc_enable_interrupts( _level ); \
-  } while (0)
-
-/*
- *  The following macros attempt to hide the fact that the General Purpose
- *  Timer and Real Time Clock Timer share the Timer Control Register.  Because
- *  the Timer Control Register is write only, we must mirror it in software
- *  and insure that writes to one timer do not alter the current settings
- *  and status of the other timer.
- *
- *  This code promotes the view that the two timers are completely independent.
- *  By exclusively using the routines below to access the Timer Control 
- *  Register, the application can view the system as having a General Purpose
- *  Timer Control Register and a Real Time Clock Timer Control Register 
- *  rather than the single shared value.
- *
- *  Each logical timer control register is organized as follows:
- *
- *    D0 - Counter Reload
- *          1 = reload counter at zero and restart
- *          0 = stop counter at zero
- *
- *    D1 - Counter Load
- *          1 = load counter with preset value and restart
- *          0 = no function
- *
- *    D2 - Enable
- *          1 = enable counting
- *          0 = hold scaler and counter
- *
- *    D3 - Scaler Load
- *          1 = load scalar with preset value and restart
- *          0 = no function
- *
- *  To insure the management of the mirror is atomic, we disable interrupts
- *  around updates.
- */
-
-#define ERC32_MEC_TIMER_COUNTER_RELOAD_AT_ZERO     0x00000001
-#define ERC32_MEC_TIMER_COUNTER_STOP_AT_ZERO       0x00000000
-
-#define ERC32_MEC_TIMER_COUNTER_LOAD_COUNTER       0x00000002
-
-#define ERC32_MEC_TIMER_COUNTER_ENABLE_COUNTING    0x00000004
-#define ERC32_MEC_TIMER_COUNTER_DISABLE_COUNTING   0x00000000
-
-#define ERC32_MEC_TIMER_COUNTER_LOAD_SCALER        0x00000008
-
-#define ERC32_MEC_TIMER_COUNTER_RELOAD_MASK        0x00000001
-#define ERC32_MEC_TIMER_COUNTER_ENABLE_MASK        0x00000004
-
-#define ERC32_MEC_TIMER_COUNTER_DEFINED_MASK       0x0000000F
-#define ERC32_MEC_TIMER_COUNTER_CURRENT_MODE_MASK  0x00000005
-
-extern unsigned32 _ERC32_MEC_Timer_Control_Mirror;
-
-/*
- *  This macros manipulate the General Purpose Timer portion of the 
- *  Timer Control register and promote the view that there are actually
- *  two independent Timer Control Registers.
- */
-
-#define ERC32_MEC_Set_General_Purpose_Timer_Control( _value ) \
-  do { \
-    unsigned32 _level; \
-    unsigned32 _control; \
-    unsigned32 __value; \
-    \
-    __value = ((_value) & 0x0f); \
-    sparc_disable_interrupts( _level ); \
-      _control = _ERC32_MEC_Timer_Control_Mirror; \
-      _control &= ERC32_MEC_TIMER_COUNTER_DEFINED_MASK << 8; \
-      _ERC32_MEC_Timer_Control_Mirror = _control | _value; \
-      _control &= (ERC32_MEC_TIMER_COUNTER_CURRENT_MODE_MASK << 8); \
-      _control |= __value; \
-      /* printf( "GPT 0x%x 0x%x 0x%x\n", _value, __value, _control );  */ \
-      ERC32_MEC.Timer_Control = _control; \
-    sparc_enable_interrupts( _level ); \
-  } while ( 0 )
-
-#define ERC32_MEC_Get_General_Purpose_Timer_Control( _value ) \
-  do { \
-    (_value) = _ERC32_MEC_Timer_Control_Mirror & 0xf; \
-  } while ( 0 )
-
-/*
- *  This macros manipulate the Real Timer Clock Timer portion of the 
- *  Timer Control register and promote the view that there are actually
- *  two independent Timer Control Registers.
- */
- 
-#define ERC32_MEC_Set_Real_Time_Clock_Timer_Control( _value ) \
-  do { \
-    unsigned32 _level; \
-    unsigned32 _control; \
-    unsigned32 __value; \
-    \
-    __value = ((_value) & 0x0f) << 8; \
-    sparc_disable_interrupts( _level ); \
-      _control = _ERC32_MEC_Timer_Control_Mirror; \
-      _control &= ERC32_MEC_TIMER_COUNTER_DEFINED_MASK; \
-      _ERC32_MEC_Timer_Control_Mirror = _control | __value; \
-      _control &= ERC32_MEC_TIMER_COUNTER_CURRENT_MODE_MASK; \
-      _control |= __value; \
-      /* printf( "RTC 0x%x 0x%x 0x%x\n", _value, __value, _control ); */ \
-      ERC32_MEC.Timer_Control = _control; \
-    sparc_enable_interrupts( _level ); \
-  } while ( 0 )
- 
-#define ERC32_MEC_Get_Real_Time_Clock_Timer_Control( _value ) \
-  do { \
-    (_value) = (_ERC32_MEC_Timer_Control_Mirror >> 8) & 0xf; \
-  } while ( 0 )
-
-
-#endif /* !ASM */
-
-#ifdef __cplusplus
-}
-#endif
- 
-#endif /* !_INCLUDE_ERC32_h */
-/* end of include file */
-
diff --git a/c/src/libchip/rtc/Makefile.in b/c/src/libchip/rtc/Makefile.in
deleted file mode 100644
index 724a1af380..0000000000
--- a/c/src/libchip/rtc/Makefile.in
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-LIBNAME=librtcio.a
-LIB=${ARCH}/${LIBNAME}
-
-C_PIECES=\
-  rtcprobe \
-  icm7170 icm7170_reg icm7170_reg2 icm7170_reg4 icm7170_reg8 \
-  m48t08 m48t08_reg m48t08_reg2 m48t08_reg4 m48t08_reg8
-
-C_FILES=$(C_PIECES:%=%.c)
-C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
-
-INSTALLED_H_FILES=$(srcdir)/rtc.h \
-    $(srcdir)/icm7170.h $(srcdir)/m48t08.h
-
-SRCS=$(C_FILES) $(H_FILES) $(SYS_H_FILES) $(RTEMS_H_FILES) $(PRIVATE_H_FILES)
-OBJS=$(C_O_FILES)
-
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/lib.cfg
-
-#
-# Add local stuff here using +=
-#
-
-DEFINES  +=
-CPPFLAGS +=
-CFLAGS   += $(LIBC_DEFINES)
-
-#
-# Add your list of files to delete here.  The config files
-#  already know how to delete some stuff, so you may want
-#  to just run 'make clean' first to see what gets missed.
-#  'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS += $(LIB)
-CLOBBER_ADDITIONS +=
-
-all:	${ARCH} preinstall $(LIB)
-	$(INSTALL_VARIANT) -m 644 ${LIB} ${PROJECT_RELEASE}/lib
-
-$(LIB): $(SRCS) ${OBJS}
-	$(make-library)
-
-# Install the library, appending _g or _p as appropriate.
-# for include files, just use $(INSTALL)
-preinstall:
-	$(INSTALL) -m 444 $(INSTALLED_H_FILES) $(PROJECT_INCLUDE)/libchip
-
-
diff --git a/c/src/libchip/rtc/README.ds1643 b/c/src/libchip/rtc/README.ds1643
deleted file mode 100644
index 4fab5b62c6..0000000000
--- a/c/src/libchip/rtc/README.ds1643
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-#  $Id$
-#
-
-The Mostek M48T08 is compatible with the Dallas Semiconductor DS1643.  Please
-use that driver.
-
diff --git a/c/src/libchip/rtc/README.icm7170 b/c/src/libchip/rtc/README.icm7170
deleted file mode 100644
index de2199339d..0000000000
--- a/c/src/libchip/rtc/README.icm7170
+++ /dev/null
@@ -1,52 +0,0 @@
-#
-#  $Id$
-#
-
-
-Configuration Table Use
-=======================
-
-sDeviceName
-
-   The name of this device.
-
-deviceType
-
-   This field must be RTC_ICM7170.
-
-pDeviceFns
-
-   The device interface control table.  This must be icm7170_fns.
-
-deviceProbe
-
-   This is the address of the routine which probes to see if the device
-   is present.
-
-pDeviceParams
-
-    This field specifies the clock frequency.  It may be one of the
-    following:
-        ICM7170_AT_32_KHZ
-        ICM7170_AT_1_MHZ
-        ICM7170_AT_2_MHZ
-        ICM7170_AT_4_MHZ
-
-ulCtrlPort1
-
-   This field is the base address of the RTC area of the chip.
-
-ulCtrlPort2
-
-   This field is ignored.
-
-ulDataPort
-
-   This field is ignored.
-
-
-getRegister
-setRegister
-
-   These follow standard conventions.
-
diff --git a/c/src/libchip/rtc/README.m48t08 b/c/src/libchip/rtc/README.m48t08
deleted file mode 100644
index d792d7957e..0000000000
--- a/c/src/libchip/rtc/README.m48t08
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-#  $Id$
-#
-
-
-Configuration Table Use
-=======================
-
-sDeviceName
-
-   The name of this device.
-
-deviceType
-
-   This field must be RTC_M48T08.
-
-pDeviceFns
-
-   The device interface control table.  This must be m48t08_fns.
-
-deviceProbe
-
-   This is the address of the routine which probes to see if the device
-   is present.
-
-pDeviceParams
-
-    This is ignored and should be NULL.
-
-ulCtrlPort1
-
-   This field is the base address of the RTC area of the chip.  The
-   NVRAM portion of the chip is ignored.
-
-ulCtrlPort2
-
-   This field is ignored.
-
-ulDataPort
-
-   This field is ignored.
-
-
-getRegister
-setRegister
-
-   These follow standard conventions.
-
diff --git a/c/src/libchip/rtc/README.m48t18 b/c/src/libchip/rtc/README.m48t18
deleted file mode 100644
index 85fe918f23..0000000000
--- a/c/src/libchip/rtc/README.m48t18
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-#  $Id$
-#
-
-This is supported by the m48t08 driver.
diff --git a/c/src/libchip/rtc/STATUS b/c/src/libchip/rtc/STATUS
deleted file mode 100644
index e95a924ae9..0000000000
--- a/c/src/libchip/rtc/STATUS
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-#  $Id$
-#
-
-General
-=======
-
-+ It would be nice to utilize the interrupt capabilities of some
-  RTC parts.  This could be used to trigger checking the software
-  clock against the hardware clock.
-
-+ The periodic capability of most RTCs is not suitable for use
-  as a general purpose flexible clock tick source.  For example,
-  many RTCs generate only a handful of periods with 100 Hz being the
-  most frequent. 
-
-+ The tick field is not set on get.  Anything smaller than a second
-  is ignored on set and get operations.
-
-+ Day of week is ignored since RTEMS does not set it internally.
-
-+ There is no attempt in RTEMS to know about time zones.
-
-Harris ICM7170
-==============
-
-+ Tested on a DMV177.
-
-+ Interrupt capabilities are ignored.
-
-Mostek 48T08
-============
-
-+ Untested.
-
-+ NVRAM is ignored.
-
diff --git a/c/src/libchip/rtc/icm7170.c b/c/src/libchip/rtc/icm7170.c
deleted file mode 100644
index f3cf513d2e..0000000000
--- a/c/src/libchip/rtc/icm7170.c
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- *  This file interfaces with the real-time clock found in 
- *  a Harris ICM7170
- *
- *  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-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems.h>
-#include <libchip/rtc.h>
-#include <libchip/icm7170.h>
-
-/*
- *  Control register bits
- */
-
-/* XXX */
-
-/*
- *  icm7170_initialize
- */
-
-void icm7170_initialize(
-  int minor
-)
-{
-  unsigned32     icm7170;
-  setRegister_f  setReg;            
-  unsigned32     clock;
-
-  icm7170 = RTC_Table[ minor ].ulCtrlPort1;
-  setReg = RTC_Table[ minor ].setRegister;
-
-  /*
-   *  Initialize the RTC with the proper clock frequency
-   */
-
-  clock = (unsigned32) RTC_Table[ minor ].pDeviceParams;
-  (*setReg)( icm7170, ICM7170_CONTROL, 0x0c | clock );
-}
-
-/*
- *  icm7170_get_time
- */
-
-int icm7170_get_time(
-  int                minor,
-  rtems_time_of_day *time
-)
-{
-  unsigned32     icm7170;
-  getRegister_f  getReg;
-  setRegister_f  setReg;
-  unsigned32     year;
-
-  icm7170 = RTC_Table[ minor ].ulCtrlPort1;
-  getReg = RTC_Table[ minor ].getRegister;
-  setReg = RTC_Table[ minor ].setRegister;
-
-  /*
-   *  Put the RTC into read mode
-   */
-
-  (void) (*getReg)( icm7170, ICM7170_COUNTER_HUNDREDTHS );
-
-  /*
-   *  Now get the time
-   */
-
-
-  year = (*getReg)( icm7170, ICM7170_YEAR );
-  if ( year < 88 )
-    year += 2000;
-  else
-    year += 1900;
-
-  time->year   = year;
-  time->month  = (*getReg)( icm7170, ICM7170_MONTH );
-  time->day    = (*getReg)( icm7170, ICM7170_DATE );
-  time->hour   = (*getReg)( icm7170, ICM7170_HOUR );
-  time->minute = (*getReg)( icm7170, ICM7170_MINUTE );
-  time->second = (*getReg)( icm7170, ICM7170_SECOND );
-  
-  time->ticks  = 0;
-
-  /*
-   *  Put the RTC back into normal mode.
-   */
-
-  (void) (*getReg)( icm7170, ICM7170_COUNTER_HUNDREDTHS );
-
-  return 0;
-}
-
-/*
- *  icm7170_set_time
- */
-
-int icm7170_set_time(
-  int                minor,
-  rtems_time_of_day *time
-)
-{
-  unsigned32     icm7170;
-  getRegister_f  getReg;
-  setRegister_f  setReg;
-  unsigned32     year;
-  unsigned32     clock;
-
-  icm7170 = RTC_Table[ minor ].ulCtrlPort1;
-  getReg = RTC_Table[ minor ].getRegister;
-  setReg = RTC_Table[ minor ].setRegister;
-  clock = (unsigned32) RTC_Table[ minor ].pDeviceParams;
-
-  year = time->year;
-
-  if ( year >= 2088 )
-    rtems_fatal_error_occurred( RTEMS_INVALID_NUMBER );
-
-  if ( year >= 2000 )
-    year -= 2000;
-  else
-    year -= 1900;
-
-  (*setReg)( icm7170, ICM7170_CONTROL, 0x04 | clock );
-
-  (*setReg)( icm7170, ICM7170_YEAR,    year );
-  (*setReg)( icm7170, ICM7170_MONTH,   time->month );
-  (*setReg)( icm7170, ICM7170_DATE,    time->day );
-  (*setReg)( icm7170, ICM7170_HOUR,    time->hour );
-  (*setReg)( icm7170, ICM7170_MINUTE,  time->minute );
-  (*setReg)( icm7170, ICM7170_SECOND,  time->second );
- 
-  /*
-   *  This is not really right.
-   */
-
-  (*setReg)( icm7170, ICM7170_DAY_OF_WEEK,  1 );
-
-  /*
-   *  Put the RTC back into normal mode.
-   */
-
-  (*setReg)( icm7170, ICM7170_CONTROL, 0x0c | clock );
-
-  return 0;
-}
-
-/*
- *  Driver function table
- */
-
-rtc_fns icm7170_fns = {
-  icm7170_initialize,
-  icm7170_get_time,
-  icm7170_set_time
-};
-
diff --git a/c/src/libchip/rtc/icm7170.h b/c/src/libchip/rtc/icm7170.h
deleted file mode 100644
index 5bf9fd065c..0000000000
--- a/c/src/libchip/rtc/icm7170.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- *  This file contains the definitions for the following real-time clocks:
- *
- *    + Harris Semiconduction ICM7170
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __LIBCHIP_ICM7170_h
-#define __LIBCHIP_ICM7170_h
-
-/*
- *  Register indices
- */
-
-#define ICM7170_CONTROL             0x11
-
-
-#define ICM7170_COUNTER_HUNDREDTHS  0x00
-#define ICM7170_HOUR                0x01
-#define ICM7170_MINUTE              0x02
-#define ICM7170_SECOND              0x03
-#define ICM7170_MONTH               0x04
-#define ICM7170_DATE                0x05
-#define ICM7170_YEAR                0x06
-#define ICM7170_DAY_OF_WEEK         0x07
-
-/*
- *  Configuration information in the parameters field
- */
-
-#define ICM7170_AT_32_KHZ  0x00
-#define ICM7170_AT_1_MHZ   0x01
-#define ICM7170_AT_2_MHZ   0x02
-#define ICM7170_AT_4_MHZ   0x03
-
-/*
- *  Driver function table
- */
-
-extern rtc_fns icm7170_fns;
-
-/*
- * Default register access routines
- */
-
-unsigned32 icm7170_get_register(    /* registers are at 1 byte boundaries */
-  unsigned32  ulCtrlPort,           /*   and accessed as bytes            */
-  unsigned8   ucRegNum
-);
-
-void  icm7170_set_register(
-  unsigned32  ulCtrlPort,
-  unsigned8   ucRegNum,
-  unsigned32  ucData
-);
-
-unsigned32 icm7170_get_register_2(  /* registers are at 2 byte boundaries */
-  unsigned32  ulCtrlPort,           /*   and accessed as bytes            */
-  unsigned8   ucRegNum
-);
-
-void  icm7170_set_register_2(
-  unsigned32  ulCtrlPort,
-  unsigned8   ucRegNum,
-  unsigned32  ucData
-);
-
-unsigned32 icm7170_get_register_4(  /* registers are at 4 byte boundaries */
-  unsigned32  ulCtrlPort,           /*   and accessed as bytes            */
-  unsigned8   ucRegNum
-);
-
-void  icm7170_set_register_4(
-  unsigned32  ulCtrlPort,
-  unsigned8   ucRegNum,
-  unsigned32  ucData
-);
-
-unsigned32 icm7170_get_register_8(  /* registers are at 8 byte boundaries */
-  unsigned32  ulCtrlPort,           /*   and accessed as bytes            */
-  unsigned8   ucRegNum
-);
-
-void  icm7170_set_register_8(
-  unsigned32  ulCtrlPort,
-  unsigned8   ucRegNum,
-  unsigned32  ucData
-);
-
-#endif
-/* end of include file */
diff --git a/c/src/libchip/rtc/icm7170_reg.c b/c/src/libchip/rtc/icm7170_reg.c
deleted file mode 100644
index b6961824b6..0000000000
--- a/c/src/libchip/rtc/icm7170_reg.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- *  This file contains a typical set of register access routines which may be
- *  used with the icm7170 chip if accesses to the chip are as follows:
- *
- *    + registers are accessed as bytes
- *    + registers are only byte-aligned (no address gaps)
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems.h>
-
-#ifndef _ICM7170_MULTIPLIER
-#define _ICM7170_MULTIPLIER 1
-#define _ICM7170_NAME(_X) _X
-#define _ICM7170_TYPE unsigned8
-#endif
-
-#define CALCULATE_REGISTER_ADDRESS( _base, _reg ) \
-  (_ICM7170_TYPE *)((_base) + ((_reg) * _ICM7170_MULTIPLIER ))
-
-/* 
- *  ICM7170 Get Register Routine
- */
-
-unsigned32 _ICM7170_NAME(icm7170_get_register)(
-  unsigned32  ulCtrlPort,
-  unsigned8   ucRegNum
-)
-{
-  _ICM7170_TYPE *port;
-
-  port = CALCULATE_REGISTER_ADDRESS( ulCtrlPort, ucRegNum );
-
-  return *port;
-}
-
-/*
- *  ICM7170 Set Register Routine
- */
-
-void  _ICM7170_NAME(icm7170_set_register)(
-  unsigned32  ulCtrlPort,
-  unsigned8   ucRegNum,
-  unsigned32  ucData
-)
-{
-  _ICM7170_TYPE *port;
-
-  port = CALCULATE_REGISTER_ADDRESS( ulCtrlPort, ucRegNum );
-
-  *port = ucData;
-}
diff --git a/c/src/libchip/rtc/icm7170_reg2.c b/c/src/libchip/rtc/icm7170_reg2.c
deleted file mode 100644
index bab92697bf..0000000000
--- a/c/src/libchip/rtc/icm7170_reg2.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- *  This file contains a typical set of register access routines which may be
- *  used with the icm7170 chip if accesses to the chip are as follows:
- *
- *    + registers are accessed as bytes
- *    + registers are on 16-bit boundaries
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define _ICM7170_MULTIPLIER 2
-#define _ICM7170_NAME(_X) _X##_2
-#define _ICM7170_TYPE unsigned8
-
-#include "icm7170_reg.c"
-
diff --git a/c/src/libchip/rtc/icm7170_reg4.c b/c/src/libchip/rtc/icm7170_reg4.c
deleted file mode 100644
index 896e0cbc0b..0000000000
--- a/c/src/libchip/rtc/icm7170_reg4.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- *  This file contains a typical set of register access routines which may be
- *  used with the icm7170 chip if accesses to the chip are as follows:
- *
- *    + registers are accessed as bytes
- *    + registers are on 32-bit boundaries
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define _ICM7170_MULTIPLIER 4
-#define _ICM7170_NAME(_X) _X##_4
-#define _ICM7170_TYPE unsigned8
-
-#include "icm7170_reg.c"
-
diff --git a/c/src/libchip/rtc/icm7170_reg8.c b/c/src/libchip/rtc/icm7170_reg8.c
deleted file mode 100644
index d2ed2844ac..0000000000
--- a/c/src/libchip/rtc/icm7170_reg8.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- *  This file contains a typical set of register access routines which may be
- *  used with the icm7170 chip if accesses to the chip are as follows:
- *
- *    + registers are accessed as bytes
- *    + registers are on 64-bit boundaries
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define _ICM7170_MULTIPLIER 8
-#define _ICM7170_NAME(_X) _X##_8
-#define _ICM7170_TYPE unsigned8
-
-#include "icm7170_reg.c"
-
diff --git a/c/src/libchip/rtc/m48t08.c b/c/src/libchip/rtc/m48t08.c
deleted file mode 100644
index b3d0dcb0de..0000000000
--- a/c/src/libchip/rtc/m48t08.c
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- *  This file interfaces with the real-time clock found in 
- *  a Mostek M48T08 or M48T18 or compatibles.
- *
- *  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-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems.h>
-#include <libchip/rtc.h>
-#include <libchip/m48t08.h>
-
-/*
- *  Control register bits
- */
-
-#define M48T08_CONTROL_WRITE  0x80
-#define M48T08_CONTROL_READ   0x40
-#define M48T08_CONTROL_SIGN   0x20
-
-/*
- *  m48t08_initialize
- */
-
-void m48t08_initialize(
-  int minor
-)
-{
-}
-
-/*
- *  m48t08_get_time
- */
-
-#define From_BCD( _x ) ((((_x) >> 4) * 10) + ((_x) & 0x0F))
-#define To_BCD( _x )   ((((_x) / 10) << 4) + ((_x) % 10))
-
-int m48t08_get_time(
-  int                minor,
-  rtems_time_of_day *time
-)
-{
-  unsigned32     m48t08;
-  getRegister_f  getReg;
-  setRegister_f  setReg;
-  unsigned8      controlReg;
-  unsigned32     value1;
-  unsigned32     value2;
-
-  m48t08 = RTC_Table[ minor ].ulCtrlPort1;
-  getReg = RTC_Table[ minor ].getRegister;
-  setReg = RTC_Table[ minor ].setRegister;
-
-  /*
-   *  Put the RTC into read mode
-   */
-
-  controlReg = (*getReg)( m48t08, M48T08_CONTROL );
-  (*setReg)( m48t08, M48T08_CONTROL, controlReg | M48T08_CONTROL_READ );
-  
-  value1 = (*getReg)( m48t08, M48T08_YEAR );
-  value2 = From_BCD( value1 );
-  if ( value2 < 88 )
-    time->year = 2000 + value2;
-  else
-    time->year = 1900 + value2;
-
-  value1 = (*getReg)( m48t08, M48T08_MONTH );
-  time->month = From_BCD( value1 );
-
-  value1 = (*getReg)( m48t08, M48T08_DATE );
-  time->day = From_BCD( value1 );
-
-  value1 = (*getReg)( m48t08, M48T08_HOUR );
-  time->hour = From_BCD( value1 );
-
-  value1 = (*getReg)( m48t08, M48T08_MINUTE );
-  time->minute = From_BCD( value1 );
-
-  value1 = (*getReg)( m48t08, M48T08_SECOND );
-  time->second = From_BCD( value1 );
-  
-  time->ticks  = 0;
-
-  /*
-   *  Put the RTC back into normal mode.
-   */
-
-  (*setReg)( m48t08, M48T08_CONTROL, controlReg );
-
-  return 0;
-}
-
-/*
- *  m48t08_set_time
- */
-
-int m48t08_set_time(
-  int                minor,
-  rtems_time_of_day *time
-)
-{
-  unsigned32     m48t08;
-  getRegister_f  getReg;
-  setRegister_f  setReg;
-  unsigned8      controlReg;
-
-  m48t08 = RTC_Table[ minor ].ulCtrlPort1;
-  getReg = RTC_Table[ minor ].getRegister;
-  setReg = RTC_Table[ minor ].setRegister;
-
-  /*
-   *  Put the RTC into read mode
-   */
-
-  controlReg = (*getReg)( m48t08, M48T08_CONTROL );
-  (*setReg)( m48t08, M48T08_CONTROL, controlReg | M48T08_CONTROL_WRITE );
-  
-  if ( time->year >= 2088 )
-    rtems_fatal_error_occurred( RTEMS_INVALID_NUMBER );
-
-  (*setReg)( m48t08, M48T08_YEAR,    To_BCD(time->year % 100) );
-  (*setReg)( m48t08, M48T08_MONTH,   To_BCD(time->month) );
-  (*setReg)( m48t08, M48T08_DATE,    To_BCD(time->day) );
-  (*setReg)( m48t08, M48T08_HOUR,    To_BCD(time->hour) );
-  (*setReg)( m48t08, M48T08_MINUTE,  To_BCD(time->minute) );
-  (*setReg)( m48t08, M48T08_SECOND,  To_BCD(time->second) );
- 
-  /*
-   *  Put the RTC back into normal mode.
-   */
-
-  (*setReg)( m48t08, M48T08_CONTROL, controlReg );
-
-  return 0;
-}
-
-/*
- *  Driver function table
- */
-
-rtc_fns m48t08_fns = {
-  m48t08_initialize,
-  m48t08_get_time,
-  m48t08_set_time
-};
-
diff --git a/c/src/libchip/rtc/m48t08.h b/c/src/libchip/rtc/m48t08.h
deleted file mode 100644
index 7d27215e1e..0000000000
--- a/c/src/libchip/rtc/m48t08.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- *  This file contains the definitions for the following real-time clocks:
- *
- *    + Mostek M48T08
- *    + Mostek M48T18 
- *    + Dallas Semiconductor DS1643
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __LIBCHIP_M48T08_h
-#define __LIBCHIP_M48T08_h
-
-/*
- *  Register indices
- */
-
-#define M48T08_CONTROL     0
-#define M48T08_SECOND      1
-#define M48T08_MINUTE      2
-#define M48T08_HOUR        3
-#define M48T08_DAY_OF_WEEK 4
-#define M48T08_DATE        5
-#define M48T08_MONTH       6
-#define M48T08_YEAR        7
- 
-/*
- *  Driver function table
- */
-
-extern rtc_fns m48t08_fns;
-
-/*
- * Default register access routines
- */
-
-unsigned32 m48t08_get_register(     /* registers are at 1 byte boundaries */
-  unsigned32  ulCtrlPort,           /*   and accessed as bytes            */
-  unsigned8   ucRegNum
-);
-
-void  m48t08_set_register(
-  unsigned32  ulCtrlPort,
-  unsigned8   ucRegNum,
-  unsigned32  ucData
-);
-
-unsigned32 m48t08_get_register_2(   /* registers are at 2 byte boundaries */
-  unsigned32  ulCtrlPort,           /*   and accessed as bytes            */
-  unsigned8   ucRegNum
-);
-
-void  m48t08_set_register_2(
-  unsigned32  ulCtrlPort,
-  unsigned8   ucRegNum,
-  unsigned32  ucData
-);
-
-unsigned32 m48t08_get_register_4(   /* registers are at 4 byte boundaries */
-  unsigned32  ulCtrlPort,           /*   and accessed as bytes            */
-  unsigned8   ucRegNum
-);
-
-void  m48t08_set_register_4(
-  unsigned32  ulCtrlPort,
-  unsigned8   ucRegNum,
-  unsigned32  ucData
-);
-
-unsigned32 m48t08_get_register_8(   /* registers are at 8 byte boundaries */
-  unsigned32  ulCtrlPort,           /*   and accessed as bytes            */
-  unsigned8   ucRegNum
-);
-
-void  m48t08_set_register_8(
-  unsigned32  ulCtrlPort,
-  unsigned8   ucRegNum,
-  unsigned32  ucData
-);
-
-#endif
-/* end of include file */
diff --git a/c/src/libchip/rtc/m48t08_reg.c b/c/src/libchip/rtc/m48t08_reg.c
deleted file mode 100644
index abb37c628c..0000000000
--- a/c/src/libchip/rtc/m48t08_reg.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- *  This file contains a typical set of register access routines which may be
- *  used with the m48t08 chip if accesses to the chip are as follows:
- *
- *    + registers are accessed as bytes
- *    + registers are only byte-aligned (no address gaps)
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems.h>
-
-#ifndef _M48T08_MULTIPLIER
-#define _M48T08_MULTIPLIER 1
-#define _M48T08_NAME(_X) _X
-#define _M48T08_TYPE unsigned8
-#endif
-
-#define CALCULATE_REGISTER_ADDRESS( _base, _reg ) \
-  (_M48T08_TYPE *)((_base) + ((_reg) * _M48T08_MULTIPLIER ))
-
-/* 
- *  M48T08 Get Register Routine
- */
-
-unsigned32 _M48T08_NAME(m48t08_get_register)(
-  unsigned32  ulCtrlPort,
-  unsigned8   ucRegNum
-)
-{
-  _M48T08_TYPE *port;
-
-  port = CALCULATE_REGISTER_ADDRESS( ulCtrlPort, ucRegNum );
-
-  return *port;
-}
-
-/*
- *  M48T08 Set Register Routine
- */
-
-void  _M48T08_NAME(m48t08_set_register)(
-  unsigned32  ulCtrlPort,
-  unsigned8   ucRegNum,
-  unsigned32  ucData
-)
-{
-  _M48T08_TYPE *port;
-
-  port = CALCULATE_REGISTER_ADDRESS( ulCtrlPort, ucRegNum );
-
-  *port = ucData;
-}
diff --git a/c/src/libchip/rtc/m48t08_reg2.c b/c/src/libchip/rtc/m48t08_reg2.c
deleted file mode 100644
index a6f294a3f7..0000000000
--- a/c/src/libchip/rtc/m48t08_reg2.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- *  This file contains a typical set of register access routines which may be
- *  used with the m48t08 chip if accesses to the chip are as follows:
- *
- *    + registers are accessed as bytes
- *    + registers are on 16-bit boundaries
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define _M48T08_MULTIPLIER 2
-#define _M48T08_NAME(_X) _X##_2
-#define _M48T08_TYPE unsigned8
-
-#include "m48t08_reg.c"
-
diff --git a/c/src/libchip/rtc/m48t08_reg4.c b/c/src/libchip/rtc/m48t08_reg4.c
deleted file mode 100644
index a84b988a34..0000000000
--- a/c/src/libchip/rtc/m48t08_reg4.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- *  This file contains a typical set of register access routines which may be
- *  used with the m48t08 chip if accesses to the chip are as follows:
- *
- *    + registers are accessed as bytes
- *    + registers are on 32-bit boundaries
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define _M48T08_MULTIPLIER 4
-#define _M48T08_NAME(_X) _X##_4
-#define _M48T08_TYPE unsigned8
-
-#include "m48t08_reg.c"
-
diff --git a/c/src/libchip/rtc/m48t08_reg8.c b/c/src/libchip/rtc/m48t08_reg8.c
deleted file mode 100644
index dcc2a9b39b..0000000000
--- a/c/src/libchip/rtc/m48t08_reg8.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- *  This file contains a typical set of register access routines which may be
- *  used with the m48t08 chip if accesses to the chip are as follows:
- *
- *    + registers are accessed as bytes
- *    + registers are on 64-bit boundaries
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define _M48T08_MULTIPLIER 8
-#define _M48T08_NAME(_X) _X##_8
-#define _M48T08_TYPE unsigned8
-
-#include "m48t08_reg.c"
-
diff --git a/c/src/libchip/rtc/rtc.h b/c/src/libchip/rtc/rtc.h
deleted file mode 100644
index 94b42e3f34..0000000000
--- a/c/src/libchip/rtc/rtc.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- *  This file contains the Real-Time Clock definitions.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *
- *  $Id$
- */
-
-#ifndef __LIBCHIP_RTC_h
-#define __LIBCHIP_RTC_h
-
-/*
- *  Types for get and set register routines
- */
-
-typedef unsigned32 (*getRegister_f)(unsigned32 port, unsigned8 register);
-typedef void       (*setRegister_f)(
-                            unsigned32 port, unsigned8 reg, unsigned32 value);
-
-typedef struct _rtc_fns {
-  void    (*deviceInitialize)(int minor);
-  int     (*deviceGetTime)(int minor, rtems_time_of_day *time);
-  int     (*deviceSetTime)(int minor, rtems_time_of_day *time);
-} rtc_fns;
-
-typedef enum {
-  RTC_M48T08,                  /* SGS-Thomsom M48T08 or M48T18 */
-  RTC_ICM7170,                 /* Harris ICM-7170 */
-  RTC_CUSTOM                   /* BSP specific driver */
-} rtc_devs;
-
-/*
- * Each field is interpreted thus:
- * 
- * sDeviceName  This is the name of the device. 
- *
- * deviceType   This indicates the chip type.
- *
- * pDeviceFns   This is a pointer to the set of driver routines to use.
- *
- * pDeviceParams This contains either device specific data or a pointer to a
- *              device specific information table.
- *
- * ulCtrlPort1  This is the primary control port number for the device.
- *
- * ulCtrlPort2  This is the secondary control port number.
- *
- * ulDataPort   This is the port number for the data port of the device
- *
- * getRegister  This is the routine used to read register values.
- *
- * setRegister  This is the routine used to write register values.
- */
-
-typedef struct _rtc_tbl {
-  char          *sDeviceName;
-  rtc_devs       deviceType;
-  rtc_fns       *pDeviceFns;
-  boolean      (*deviceProbe)(int minor);
-  void          *pDeviceParams;
-  unsigned32     ulCtrlPort1;
-  unsigned32     ulDataPort;
-  getRegister_f  getRegister;
-  setRegister_f  setRegister;
-} rtc_tbl;
-
-extern rtc_tbl        RTC_Table[];
-extern unsigned long  RTC_Count;
-
-
-boolean rtc_probe( int minor );
-
-#endif
-/* end of include file */
diff --git a/c/src/libchip/rtc/rtcprobe.c b/c/src/libchip/rtc/rtcprobe.c
deleted file mode 100644
index 6aaad89486..0000000000
--- a/c/src/libchip/rtc/rtcprobe.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- *  This file contains the default Real-Time Clock probe routine.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems.h>
-#include <libchip/rtc.h>
-
-
-boolean rtc_probe(
-  int minor
-)
-{
-  return TRUE;
-}
diff --git a/c/src/libchip/serial/Makefile.in b/c/src/libchip/serial/Makefile.in
deleted file mode 100644
index d9c78faf97..0000000000
--- a/c/src/libchip/serial/Makefile.in
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-LIBNAME=libserialio.a
-LIB=${ARCH}/${LIBNAME}
-
-C_PIECES=\
-    mc68681 mc68681_baud mc68681_reg mc68681_reg2 mc68681_reg4 mc68681_reg8 \
-    ns16550 \
-    z85c30 z85c30_reg \
-    serprobe termios_baud2index termios_baud2num
-
-C_FILES=$(C_PIECES:%=%.c)
-C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
-
-INSTALLED_H_FILES=$(srcdir)/mc68681.h $(srcdir)/ns16550.h $(srcdir)/z85c30.h \
-                  $(srcdir)/serial.h
-SRCS=$(C_FILES) $(H_FILES) $(SYS_H_FILES) $(RTEMS_H_FILES) $(PRIVATE_H_FILES)
-OBJS=$(C_O_FILES)
-
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/lib.cfg
-
-#
-# Add local stuff here using +=
-#
-
-DEFINES  +=
-CPPFLAGS +=
-CFLAGS   += $(LIBC_DEFINES)
-
-#
-# Add your list of files to delete here.  The config files
-#  already know how to delete some stuff, so you may want
-#  to just run 'make clean' first to see what gets missed.
-#  'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS += $(LIB)
-CLOBBER_ADDITIONS +=
-
-all:	${ARCH} preinstall $(LIB)
-	$(INSTALL_VARIANT) -m 644 ${LIB} ${PROJECT_RELEASE}/lib
-
-$(LIB): $(SRCS) ${OBJS}
-	$(make-library)
-
-# Install the library, appending _g or _p as appropriate.
-# for include files, just use $(INSTALL)
-preinstall:
-	$(INSTALL) -m 444 $(INSTALLED_H_FILES) $(PROJECT_INCLUDE)/libchip
-
-
diff --git a/c/src/libchip/serial/README b/c/src/libchip/serial/README
deleted file mode 100644
index 3a1013b45b..0000000000
--- a/c/src/libchip/serial/README
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-#  $Id$
-#
-
-This is the serial controller portion of the libchip library.  This 
-directory contains the source code for reusable console driver
-support code.  Each individual driver is configured using the
-console_tbl data structure.  This structure is defined and explained
-in the console.h file.
-
-The reusable chip drivers do not directly access the serial controller.
-They access the registers on the controller via a set of up to four 
-functions which are provided by the BSP.  These functins set and get
-general registers and data buffers.  Some chips can access the data
-buffers as general registers and thus the driver may not require
-those interface routines.
-
diff --git a/c/src/libchip/serial/README.mc68681 b/c/src/libchip/serial/README.mc68681
deleted file mode 100644
index 240faf759b..0000000000
--- a/c/src/libchip/serial/README.mc68681
+++ /dev/null
@@ -1,87 +0,0 @@
-#
-#  $Id$
-#
-
-Configuration Table Use
-=======================
-
-sDeviceName
-
-   The name of this device.
-
-deviceType
-
-   This field must be SERIAL_MC68681.
-
-pDeviceFns
-
-   The device interface control table.  This may be:
-      + mc68681_fns for interrupt driven IO
-      + mc68681_fns_polled for polled IO
-
-deviceProbe
-
-   This is the address of the routine which probes to see if the device
-   is present.
-
-pDeviceFlow
-
-   This field is ignored as hardware flow control is not currently supported.
-
-ulMargin
-
-    This is currently unused.
-
-ulHysteresis
-
-    This is currently unused.
-
-pDeviceParams
-
-    This is set to the default settings.
-
-ulCtrlPort1
-
-   This field is the base address of the entire DUART.
-
-ulCtrlPort2
-
-   This field is the base address of the port specific registers.
-
-ulDataPort
-
-   This field is bit mapped as follows:
-     bit 0:  baud rate set a or b
-     bit 1-2: BRG selection ("Select Extend bit")
-
-   Note: If both ports on single DUART are not configured for the same
-         baud rate set, then unexpected results will occur.
-
-   Note: On the Exar 88c681, if a standard clock of 3.6864 Mhz is used
-         and the "Select Extend bit" is 0 (disabled), then the default
-         MC68681 baud rate table is selected.
-
-getRegister
-setRegister
-
-   These follow standard conventions.
-
-getData
-setData
-
-   These are unused since the TX and RX data registers can be accessed
-   as regular registers.
-
-ulClock
-
-   This is a pointer to a baud rate mapping table.  If set to
-   mc68681_baud_rate_table, then the CSR/ACR/X bit mappings shown
-   in the 68681 and 88681 manuals are used.  Otherwise, the board
-   specific baud rate mapping is used.
-
-   NULL is not a valid value.
-
-ulIntVector
-
-   This is the interrupt vector number associated with this chip.
-
diff --git a/c/src/libchip/serial/README.ns16550 b/c/src/libchip/serial/README.ns16550
deleted file mode 100644
index 2956173b1b..0000000000
--- a/c/src/libchip/serial/README.ns16550
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-#  $Id$
-#
-
-This driver needs to be debugged before this is written.
diff --git a/c/src/libchip/serial/README.xr88681 b/c/src/libchip/serial/README.xr88681
deleted file mode 100644
index 37364aaec6..0000000000
--- a/c/src/libchip/serial/README.xr88681
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-#  $Id$
-#
-
-The Exar XR88681 is an enhanced version of the Motorola MC68681 and is
-supported by the mc68681 driver.
diff --git a/c/src/libchip/serial/README.z85c30 b/c/src/libchip/serial/README.z85c30
deleted file mode 100644
index 4442b5ef40..0000000000
--- a/c/src/libchip/serial/README.z85c30
+++ /dev/null
@@ -1,78 +0,0 @@
-#
-#  $Id$
-#
-
-Configuration Table Use
-=======================
-
-sDeviceName
-
-   The name of this device.
-
-deviceType
-
-   This field must be SERIAL_Z85C30.
-
-pDeviceFns
-
-   The device interface control table.  This may be:
-      + z85c30_fns for interrupt driven IO
-      + z85c30_fns_polled for polled IO
-
-deviceProbe
-
-   This is the address of the routine which probes to see if the device
-   is present.
-
-pDeviceFlow
-
-   This field is set to one of the following values:
-      + NULL for no hardware flow control
-      + z85c30_flow_RTSCTS for RTS/CTS based flow control
-      + z85c30_flow_DTRCTS for DTR/CTS based flow control
-
-ulMargin
-
-    This is currently unused.
-
-ulHysteresis
-
-    This is currently unused.
-
-pDeviceParams
-
-    This is set to the default settings.
-
-ulCtrlPort1
-
-   This field is the address of the control register for this port.
-
-ulCtrlPort2
-
-   This field is the address of the control register for chip.
-
-ulDataPort
-
-   This field is the address of the data register for this port.
-
-getRegister
-setRegister
-
-   These follow standard conventions.
-
-getData
-setData
-
-   These follow standard conventions.
-
-ulClock
-
-   This is the clock speed of the baud rate clock.
-   NULL, then the CSR/ACR/X bit mappings shown in the 68681 and 88681
-   manuals are used.  Otherwise, the board specific baud rate mapping
-   is used.
-
-ulIntVector
-
-   This is the interrupt vector number associated with this chip.
-
diff --git a/c/src/libchip/serial/STATUS b/c/src/libchip/serial/STATUS
deleted file mode 100644
index 6eb7fa4171..0000000000
--- a/c/src/libchip/serial/STATUS
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-#  $Id$
-#
-
-General
-=======
-
-+ Hardware flow control is not currently supported.  Some of the chip
-  drivers (in particular the z8530) have support for hardware flow control
-  but this has not been tested in the libchip context.  There will need
-  to be a way to totally disabled hardware flow control which is not
-  currently in this.
-
-+ "ulClockSpeed" configuration item field to become a pointer to a table
-  of chip specific information.  For example, the z8530 should specify
-  clock speed and clock divisor setting.
-
-+ A termios structure should be included to specify  the initial settings.
-  Right now all drivers default to 9600, 8N1.
- 
-+ Need to switch to passing pointers rather than a minor number to 
-  functions which are strictly internal to each chip driver.  This
-  should be a performance win.
-
-+ Need a test which prompts you for termios settings and tests them.  Until
-  this happens, testing for the variety of settings possible will be limited.
-  This test should be able to test any serial port while prompts come to the
-  console.
-
-MC68681
-=======
-
-+ Works interrupt and polled.
-
-+ Hardware flow control not included.
-
-NS16650
-=======
-
-+ Not tested in libchip context.  Based on Radstone PPC2 driver which worked 
-  well.
-
-+ Interrupt code has been reworked to not use ring buffer and may be broken
-  as it has not been tested since this was done.
-
-+ ns16550_set-attributes function is untested.
-
-+ Hardware flow control included but is currently disabled in ISR.
-
-Z85C30
-======
-
-+ Works polled and interrupt.
-
-+ Hardware flow control included but is currently disabled in ISR.
-
-+ Needs to support mode where more specific vectors are generated.
-
diff --git a/c/src/libchip/serial/mc68681.c b/c/src/libchip/serial/mc68681.c
deleted file mode 100644
index a41a00d1ae..0000000000
--- a/c/src/libchip/serial/mc68681.c
+++ /dev/null
@@ -1,756 +0,0 @@
-/*
- *  This file contains the termios TTY driver for the Motorola MC68681.
- *
- *  This part is available from a number of secondary sources.
- *  In particular, we know about the following:
- *
- *     + Exar 88c681 and 68c681
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems.h>
-#include <rtems/libio.h>
-#include <stdlib.h>
-
-#include <libchip/serial.h>
-#include <libchip/mc68681.h>
-#include "sersupp.h"
-#include "mc68681_p.h"
-
-/*
- * Flow control is only supported when using interrupts
- */
-
-console_fns mc68681_fns =
-{
-  libchip_serial_default_probe,   /* deviceProbe */
-  mc68681_open,                   /* deviceFirstOpen */
-  NULL,                           /* deviceLastClose */
-  NULL,                           /* deviceRead */
-  mc68681_write_support_int,      /* deviceWrite */
-  mc68681_initialize_interrupts,  /* deviceInitialize */
-  mc68681_write_polled,           /* deviceWritePolled */
-  mc68681_set_attributes,         /* deviceSetAttributes */
-  TRUE                            /* deviceOutputUsesInterrupts */
-};
-
-console_fns mc68681_fns_polled =
-{
-  libchip_serial_default_probe,        /* deviceProbe */
-  mc68681_open,                        /* deviceFirstOpen */
-  mc68681_close,                       /* deviceLastClose */
-  mc68681_inbyte_nonblocking_polled,   /* deviceRead */
-  mc68681_write_support_polled,        /* deviceWrite */
-  mc68681_init,                        /* deviceInitialize */
-  mc68681_write_polled,                /* deviceWritePolled */
-  mc68681_set_attributes,              /* deviceSetAttributes */
-  FALSE,                               /* deviceOutputUsesInterrupts */
-};
-
-extern void set_vector( rtems_isr_entry, rtems_vector_number, int );
-
-/*
- *  Console Device Driver Entry Points
- */
-
-/*
- *  mc68681_baud_rate
- *
- *  This routine returns the proper ACR bit and baud rate field values
- *  based on the requested baud rate.  The baud rate set to be used
- *  must be configured by the user.
- */
-
-MC68681_STATIC int mc68681_baud_rate(
-  int           minor,
-  int           baud,
-  unsigned int *baud_mask_p,
-  unsigned int *acr_bit_p,
-  unsigned int *command
-);
-
-/*
- *  mc68681_set_attributes
- *
- *  This function sets the DUART channel to reflect the requested termios
- *  port settings.
- */
-
-MC68681_STATIC int mc68681_set_attributes( 
-  int minor,
-  const struct termios *t
-)
-{
-  unsigned32             pMC68681_port;
-  unsigned32             pMC68681;
-  unsigned int           mode1;
-  unsigned int           mode2;
-  unsigned int           baud_mask;
-  unsigned int           acr_bit;
-  unsigned int           cmd;
-  setRegister_f          setReg;
-  rtems_interrupt_level  Irql;
-
-  pMC68681      = Console_Port_Tbl[minor].ulCtrlPort1;
-  pMC68681_port = Console_Port_Tbl[minor].ulCtrlPort2;
-  setReg        = Console_Port_Tbl[minor].setRegister;
-
-  /*
-   *  Set the baud rate
-   */
-
-  if (mc68681_baud_rate( minor, t->c_cflag, &baud_mask, &acr_bit, &cmd ) == -1)
-    return -1;
-
-  baud_mask |=  baud_mask << 4;
-  acr_bit   <<= 7;
-
-  /*
-   *  Parity
-   */
-
-  mode1 = 0;
-  mode2 = 0;
-
-  if (t->c_cflag & PARENB) {
-    if (t->c_cflag & PARODD)
-      mode1 |= 0x04;
-    else
-      mode1 |= 0x04;
-  } else {
-   mode1 |= 0x10;
-  }
-
-  /*
-   *  Character Size
-   */
-
-  if (t->c_cflag & CSIZE) {
-    switch (t->c_cflag & CSIZE) {
-      case CS5:  break;
-      case CS6:  mode1 |= 0x01;  break;
-      case CS7:  mode1 |= 0x02;  break;
-      case CS8:  mode1 |= 0x03;  break;
-    }
-  } else {
-    mode1 |= 0x03;       /* default to 9600,8,N,1 */
-  }
-
-  /*
-   *  Stop Bits
-   */
-  
-  if (t->c_cflag & CSTOPB) {
-    mode2 |= 0x07;                      /* 2 stop bits */
-  } else {
-    if ((t->c_cflag & CSIZE) == CS5)    /* CS5 and 2 stop bits not supported */
-      return -1;
-    mode2 |= 0x0F;                      /* 1 stop bit */
-  }
-
-  rtems_interrupt_disable(Irql);
-    (*setReg)( pMC68681, MC68681_AUX_CTRL_REG, acr_bit );
-    (*setReg)( pMC68681_port, MC68681_CLOCK_SELECT, baud_mask );
-    if ( cmd ) {
-      (*setReg)( pMC68681_port, MC68681_COMMAND, cmd );         /* RX */
-      (*setReg)( pMC68681_port, MC68681_COMMAND, cmd | 0x20 );  /* TX */
-    }
-    (*setReg)( pMC68681_port, MC68681_COMMAND, MC68681_MODE_REG_RESET_MR_PTR );
-    (*setReg)( pMC68681_port, MC68681_MODE, mode1 );
-    (*setReg)( pMC68681_port, MC68681_MODE, mode2 );
-  rtems_interrupt_enable(Irql);
-  return 0;
-}
-
-/*
- *  mc68681_initialize_context
- *
- *  This function sets the default values of the per port context structure.
- */
-
-MC68681_STATIC void mc68681_initialize_context(
-  int               minor,
-  mc68681_context  *pmc68681Context
-)
-{
-  int          port;
-  unsigned int pMC68681;
-  unsigned int pMC68681_port;
-  
-  pMC68681      = Console_Port_Tbl[minor].ulCtrlPort1;
-  pMC68681_port = Console_Port_Tbl[minor].ulCtrlPort2;
-
-  pmc68681Context->mate = -1;
-
-  for (port=0 ; port<Console_Port_Count ; port++ ) {
-    if ( Console_Port_Tbl[port].ulCtrlPort1 == pMC68681 && 
-         Console_Port_Tbl[port].ulCtrlPort2 != pMC68681_port ) {
-      pmc68681Context->mate = port;
-      pmc68681Context->imr  = 0;
-      break;
-    }
-  }
-
-}
-
-/*
- *  mc68681_init
- *
- *  This function initializes the DUART to a quiecsent state.
- */
-
-MC68681_STATIC void mc68681_init(int minor)
-{
-  unsigned32              pMC68681_port;
-  unsigned32              pMC68681;
-  mc68681_context        *pmc68681Context;
-  setRegister_f           setReg;
-  getRegister_f           getReg;
-
-  pmc68681Context = (mc68681_context *) malloc(sizeof(mc68681_context));
-
-  Console_Port_Data[minor].pDeviceContext = (void *)pmc68681Context;
-
-  mc68681_initialize_context( minor, pmc68681Context );
-
-  pMC68681      = Console_Port_Tbl[minor].ulCtrlPort1;
-  pMC68681_port = Console_Port_Tbl[minor].ulCtrlPort2;
-  setReg        = Console_Port_Tbl[minor].setRegister;
-  getReg        = Console_Port_Tbl[minor].getRegister;
-
-  /*
-   *  Reset everything and leave this port disabled.
-   */
-
-  (*setReg)( pMC68681_port, MC68681_COMMAND, MC68681_MODE_REG_RESET_RX );
-  (*setReg)( pMC68681_port, MC68681_COMMAND, MC68681_MODE_REG_RESET_TX );
-  (*setReg)( pMC68681_port, MC68681_COMMAND, MC68681_MODE_REG_RESET_ERROR );
-  (*setReg)( pMC68681_port, MC68681_COMMAND, MC68681_MODE_REG_RESET_BREAK );
-  (*setReg)( pMC68681_port, MC68681_COMMAND, MC68681_MODE_REG_STOP_BREAK );
-  (*setReg)( pMC68681_port, MC68681_COMMAND, MC68681_MODE_REG_DISABLE_TX );
-  (*setReg)( pMC68681_port, MC68681_COMMAND, MC68681_MODE_REG_DISABLE_RX );
-
-
-  (*setReg)( pMC68681_port, MC68681_MODE_REG_1A, 0x00 );
-  (*setReg)( pMC68681_port, MC68681_MODE_REG_2A, 0x02 );
-
-  /*
-   *  Disable interrupts on RX and TX for this port
-   */
-
-  mc68681_enable_interrupts( minor, MC68681_IMR_DISABLE_ALL );
-}
-
-/*
- *  mc68681_open
- *
- *  This function opens a port for communication.
- *
- *  Default state is 9600 baud, 8 bits, No parity, and 1 stop bit.
- */
-
-MC68681_STATIC int mc68681_open(
-  int      major,
-  int      minor,
-  void    *arg
-)
-{
-  unsigned32             pMC68681;
-  unsigned32             pMC68681_port;
-  unsigned int           baud;
-  unsigned int           acr;
-  unsigned int           vector;
-  unsigned int           command;
-  rtems_interrupt_level  Irql;
-  setRegister_f          setReg;
-
-  pMC68681      = Console_Port_Tbl[minor].ulCtrlPort1;
-  pMC68681_port = Console_Port_Tbl[minor].ulCtrlPort2;
-  setReg        = Console_Port_Tbl[minor].setRegister;
-  vector        = Console_Port_Tbl[minor].ulIntVector;
-
-  /* XXX default baud rate should be from configuration table */
-
-  (void) mc68681_baud_rate( minor, B9600, &baud, &acr, &command );
-
-  /*
-   *  Set the DUART channel to a default useable state
-   */
-
-  rtems_interrupt_disable(Irql);
-    (*setReg)( pMC68681, MC68681_AUX_CTRL_REG, acr );
-    (*setReg)( pMC68681_port, MC68681_CLOCK_SELECT, baud );
-    if ( command ) {
-      (*setReg)( pMC68681_port, MC68681_COMMAND, command );         /* RX */
-      (*setReg)( pMC68681_port, MC68681_COMMAND, command | 0x20 );  /* TX */
-    }
-    (*setReg)( pMC68681_port, MC68681_COMMAND, MC68681_MODE_REG_RESET_MR_PTR );
-    (*setReg)( pMC68681_port, MC68681_MODE, 0x13 );
-    (*setReg)( pMC68681_port, MC68681_MODE, 0x07 );
-  rtems_interrupt_enable(Irql);
-
-  (*setReg)( pMC68681_port, MC68681_COMMAND, MC68681_MODE_REG_ENABLE_TX );
-  (*setReg)( pMC68681_port, MC68681_COMMAND, MC68681_MODE_REG_ENABLE_RX );
-
-  (*setReg)( pMC68681, MC68681_INTERRUPT_VECTOR_REG, vector );
-
-  return RTEMS_SUCCESSFUL;
-}
-
-/*
- *  mc68681_close
- *
- *  This function shuts down the requested port.
- */
-
-MC68681_STATIC int mc68681_close(
-  int      major,
-  int      minor,
-  void    *arg
-)
-{
-  unsigned32      pMC68681;
-  unsigned32      pMC68681_port;
-  setRegister_f   setReg;
-
-  pMC68681      = Console_Port_Tbl[minor].ulCtrlPort1;
-  pMC68681_port = Console_Port_Tbl[minor].ulCtrlPort2;
-  setReg        = Console_Port_Tbl[minor].setRegister;
-
-  /*
-   *  Disable interrupts from this channel and then disable it totally.
-   */
-
-#if 0
-  (*setReg)( pMC68681_port, MC68681_COMMAND, MC68681_MODE_REG_DISABLE_TX );
-  (*setReg)( pMC68681_port, MC68681_COMMAND, MC68681_MODE_REG_DISABLE_RX );
-#endif
-
-  return(RTEMS_SUCCESSFUL);
-}
-
-/* 
- *  mc68681_write_polled
- *
- *  This routine polls out the requested character.
- */
-
-MC68681_STATIC void mc68681_write_polled(
-  int   minor, 
-  char  cChar
-)
-{
-  unsigned32              pMC68681_port;
-  unsigned char           ucLineStatus;
-  int                     iTimeout;
-  getRegister_f           getReg;
-  setRegister_f           setReg;
-
-  pMC68681_port = Console_Port_Tbl[minor].ulCtrlPort2;
-  getReg        = Console_Port_Tbl[minor].getRegister;
-  setReg        = Console_Port_Tbl[minor].setRegister;
-
-  /*
-   * wait for transmitter holding register to be empty
-   */
-  iTimeout = 1000;
-  ucLineStatus = (*getReg)(pMC68681_port, MC68681_STATUS);
-  while ((ucLineStatus & (MC68681_TX_READY|MC68681_TX_EMPTY)) == 0) {
-
-    if ((ucLineStatus & 0xF0))
-      (*setReg)( pMC68681_port, MC68681_COMMAND, MC68681_MODE_REG_RESET_ERROR );
-
-    /*
-     * Yield while we wait
-     */
-
-#if 0
-     if(_System_state_Is_up(_System_state_Get())) {
-       rtems_task_wake_after(RTEMS_YIELD_PROCESSOR);
-     }
-#endif
-     ucLineStatus = (*getReg)(pMC68681_port, MC68681_STATUS);
-     if(!--iTimeout) {
-       break;
-     }
-  }
-
-  /*
-   * transmit character
-   */
-
-  (*setReg)(pMC68681_port, MC68681_TX_BUFFER, cChar);
-}
-
-/*
- *  mc68681_isr
- *
- *  This is the single interrupt entry point which parcels interrupts
- *  out to the various ports.
- */
-
-MC68681_STATIC rtems_isr mc68681_isr(
-  rtems_vector_number vector
-)
-{
-  int     minor;
-
-  for(minor=0 ; minor<Console_Port_Count ; minor++) {
-    if(Console_Port_Tbl[minor].ulIntVector == vector && 
-       Console_Port_Tbl[minor].deviceType == SERIAL_MC68681 ) {
-      mc68681_process(minor);
-    }
-  }
-}
-
-/*
- *  mc68681_initialize_interrupts
- *
- *  This routine initializes the console's receive and transmit
- *  ring buffers and loads the appropriate vectors to handle the interrupts.
- */
-
-MC68681_STATIC void mc68681_initialize_interrupts(int minor)
-{
-  mc68681_init(minor);
-
-  Console_Port_Data[minor].bActive = FALSE;
-
-  set_vector(mc68681_isr, Console_Port_Tbl[minor].ulIntVector, 1);
-
-  mc68681_enable_interrupts(minor,MC68681_IMR_ENABLE_ALL_EXCEPT_TX);
-}
-
-/* 
- *  mc68681_write_support_int
- *
- *  Console Termios output entry point when using interrupt driven output.
- */
-
-MC68681_STATIC int mc68681_write_support_int(
-  int         minor, 
-  const char *buf, 
-  int         len
-)
-{
-  unsigned32      Irql;
-  unsigned32      pMC68681_port;
-  setRegister_f   setReg;
-
-  pMC68681_port = Console_Port_Tbl[minor].ulCtrlPort2;
-  setReg        = Console_Port_Tbl[minor].setRegister;
-
-  /*
-   *  We are using interrupt driven output and termios only sends us
-   *  one character at a time.
-   */
-
-  if ( !len )
-    return 0;
-
-  /*
-   *  Put the character out and enable interrupts if necessary.
-   */
-
-  rtems_interrupt_disable(Irql);
-    if ( Console_Port_Data[minor].bActive == FALSE ) {
-      Console_Port_Data[minor].bActive = TRUE;
-      mc68681_enable_interrupts(minor, MC68681_IMR_ENABLE_ALL);
-    }
-    (*setReg)(pMC68681_port, MC68681_TX_BUFFER, *buf);
-  rtems_interrupt_enable(Irql);
-
-  return 1;
-}
-
-/* 
- *  mc68681_write_support_polled
- *
- *  Console Termios output entry point when using polled output.
- *
- */
-
-MC68681_STATIC int mc68681_write_support_polled(
-  int         minor, 
-  const char *buf, 
-  int         len
-)
-{
-  int nwrite = 0;
-
-  /*
-   * poll each byte in the string out of the port.
-   */
-  while (nwrite < len) {
-    /*
-     * transmit character
-     */
-    mc68681_write_polled(minor, *buf++);
-    nwrite++;
-  }
-
-  /*
-   * return the number of bytes written.
-   */
-  return nwrite;
-}
-
-/* 
- *  mc68681_inbyte_nonblocking_polled 
- *
- *  Console Termios polling input entry point.
- */
-
-MC68681_STATIC int mc68681_inbyte_nonblocking_polled( 
-  int minor 
-)
-{
-  unsigned32           pMC68681_port;
-  unsigned char        ucLineStatus;
-  unsigned char        cChar;
-  getRegister_f        getReg;
-
-  pMC68681_port = Console_Port_Tbl[minor].ulCtrlPort2;
-  getReg        = Console_Port_Tbl[minor].getRegister;
-
-  ucLineStatus = (*getReg)(pMC68681_port, MC68681_STATUS);
-  if(ucLineStatus & MC68681_RX_READY) {
-    cChar = (*getReg)(pMC68681_port, MC68681_RX_BUFFER);
-    return (int)cChar;
-  } else {
-    return -1;
-  }
-}
-
-/*
- *  mc68681_baud_rate
- */
-
-MC68681_STATIC int mc68681_baud_rate(
-  int           minor,
-  int           baud,
-  unsigned int *baud_mask_p,
-  unsigned int *acr_bit_p,
-  unsigned int *command
-)
-{
-  unsigned int           baud_mask;
-  unsigned int           acr_bit;
-  int                    status;
-  int                    is_extended;
-  int                    baud_requested;
-  mc68681_baud_table_t  *baud_tbl;
-
-  baud_mask = 0;
-  acr_bit = 0;
-  status = 0;
-
-  if ( !(Console_Port_Tbl[minor].ulDataPort & MC68681_DATA_BAUD_RATE_SET_1) )
-    acr_bit = 1;
-
-  is_extended = 0;
-
-  switch (Console_Port_Tbl[minor].ulDataPort & MC68681_XBRG_MASK) {
-    case MC68681_XBRG_IGNORED:
-      *command = 0x00;
-      break;
-    case MC68681_XBRG_ENABLED:
-      *command = 0x80;
-      is_extended = 1;
-      break;
-    case MC68681_XBRG_DISABLED:
-      *command = 0x90;
-      break;
-  }
-
-  baud_requested = baud & CBAUD;
-  if (!baud_requested)
-    baud_requested = B9600;              /* default to 9600 baud */
-  
-  baud_requested = termios_baud_to_index( baud_requested );
-
-  baud_tbl = (mc68681_baud_table_t *) Console_Port_Tbl[minor].ulClock;
-  if (!baud_tbl)
-    rtems_fatal_error_occurred(RTEMS_INVALID_ADDRESS);
-
-  if ( is_extended )
-    baud_mask = (unsigned int)baud_tbl[ acr_bit + 2 ][ baud_requested ];
-  else
-    baud_mask = baud_tbl[ acr_bit ][ baud_requested ];
-
-  if ( baud_mask == MC68681_BAUD_NOT_VALID )
-    status = -1;
-
-  /*
-   *  upper nibble is receiver and lower nibble is transmitter
-   */
-
-  *baud_mask_p = (baud_mask << 4) | baud_mask;
-  *acr_bit_p   = acr_bit;
-  return status;
-}
-
-/*
- *  mc68681_process
- *
- *  This routine is the per port console interrupt handler.
- */
-
-MC68681_STATIC void mc68681_process(
-  int  minor
-)
-{
-  unsigned32              pMC68681;
-  unsigned32              pMC68681_port;
-  volatile unsigned8      ucLineStatus; 
-  unsigned char           cChar;
-  getRegister_f           getReg;
-  setRegister_f           setReg;
-
-  pMC68681      = Console_Port_Tbl[minor].ulCtrlPort1;
-  pMC68681_port = Console_Port_Tbl[minor].ulCtrlPort2;
-  getReg        = Console_Port_Tbl[minor].getRegister;
-  setReg        = Console_Port_Tbl[minor].setRegister;
-
-  /*
-   * Deal with any received characters
-   */
-  while(TRUE) {
-    ucLineStatus = (*getReg)(pMC68681_port, MC68681_STATUS);
-    if(!(ucLineStatus & MC68681_RX_READY)) {
-      break;
-    }
-    /*
-     *  If there is a RX error, then dump all the data.
-     */
-    if ( ucLineStatus & MC68681_RX_ERRORS ) {
-      do {
-        cChar = (*getReg)(pMC68681_port, MC68681_RX_BUFFER);
-        ucLineStatus = (*getReg)(pMC68681_port, MC68681_STATUS);
-      } while ( ucLineStatus & MC68681_RX_READY );
-      continue;
-    }
-    cChar = (*getReg)(pMC68681_port, MC68681_RX_BUFFER);
-    rtems_termios_enqueue_raw_characters( 
-      Console_Port_Data[minor].termios_data,
-      &cChar, 
-      1 
-    );
-  }
-
-  /*
-   *  Deal with the transmitter
-   */
-
-  ucLineStatus = (*getReg)(pMC68681, MC68681_INTERRUPT_STATUS_REG);
-  if (pMC68681 != pMC68681_port)
-    ucLineStatus >>= 4;
-
-  if(ucLineStatus & MC68681_IR_TX_READY) {
-    rtems_termios_dequeue_characters(Console_Port_Data[minor].termios_data, 1);
-    if (rtems_termios_is_more_to_tx( Console_Port_Data[minor].termios_data )) {
-      Console_Port_Data[minor].bActive = FALSE;
-      mc68681_enable_interrupts(minor, MC68681_IMR_ENABLE_ALL_EXCEPT_TX);
-    }
-  }
-
-}
-
-/*
- *  mc68681_build_imr
- *
- *  This function returns the value for the interrupt mask register for this
- *  DUART.  Since this is a shared register, we must look at the other port
- *  on this chip to determine whether or not it is using interrupts.
- */
-
-MC68681_STATIC unsigned int mc68681_build_imr(
-  int  minor,
-  int  enable_flag
-)
-{
-  int              mate;
-  int              is_a;
-  unsigned int     mask;
-  unsigned int     mate_mask;
-  unsigned int     pMC68681;
-  unsigned int     pMC68681_port;
-  mc68681_context *pmc68681Context;
-  mc68681_context *mateContext;
-  
-  pMC68681        = Console_Port_Tbl[minor].ulCtrlPort1;
-  pMC68681_port   = Console_Port_Tbl[minor].ulCtrlPort2;
-  pmc68681Context = (mc68681_context *) Console_Port_Data[minor].pDeviceContext;
-  mate            = pmc68681Context->mate;
-
-  mask = 0;
-  mate_mask = 0;
-
-  is_a = (pMC68681 == pMC68681_port);
- 
-  /*
-   *  If there is a mate for this port, get its IMR mask.
-   */
-
-  if ( mate != -1 ) {
-    mateContext = Console_Port_Data[mate].pDeviceContext;
-    
-    if (mateContext)
-      mate_mask = mateContext->imr;
-  }
-
-  /*
-   *  Calculate this port's IMR mask and save it in the context area.
-   */
-
-  if ( Console_Port_Tbl[minor].pDeviceFns->deviceOutputUsesInterrupts )
-    mask = enable_flag;
-
-  pmc68681Context->imr = mask;
-
-  /*
-   *  Now return the full IMR value
-   */
-
-  if (is_a)
-    return (mate_mask << 4) | mask;
-
-  return (mask << 4) | mate_mask;
-}
-
-/*
- *  mc68681_enable_interrupts
- *
- *  This function enables specific interrupt sources on the DUART.
- */
-
-MC68681_STATIC void mc68681_enable_interrupts(
-  int minor,
-  int imr_mask
-)
-{
-  unsigned32            pMC68681;
-  setRegister_f         setReg;
-
-  pMC68681 = Console_Port_Tbl[minor].ulCtrlPort1;
-  setReg   = Console_Port_Tbl[minor].setRegister;
-
-  /*
-   *  Enable interrupts on RX and TX -- not break
-   */
-
-  (*setReg)(
-     pMC68681,
-     MC68681_INTERRUPT_MASK_REG,
-     mc68681_build_imr(minor, imr_mask)
-  );
-}
diff --git a/c/src/libchip/serial/mc68681.h b/c/src/libchip/serial/mc68681.h
deleted file mode 100644
index 57713e3eff..0000000000
--- a/c/src/libchip/serial/mc68681.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef _MC68681_H_
-#define _MC68681_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- *  These are just used in the interface between this driver and
- *  the read/write register routines when accessing the first
- *  control port.
- */
-
-#define MC68681_STATUS          1
-#define MC68681_RX_BUFFER       3
-
-#define MC68681_MODE            0
-#define MC68681_CLOCK_SELECT    1
-#define MC68681_COMMAND         2
-#define MC68681_TX_BUFFER       3
-
-/*
- *  Data Port bit map configuration
- *
- *   D0      : Baud Rate Set Selection
- *   D1 - D2 : Extended Baud Rate Setting
- */
-
-#define MC68681_DATA_BAUD_RATE_SET_1      0  /* ACR[7] = 0 */
-#define MC68681_DATA_BAUD_RATE_SET_2      1  /* ACR[7] = 1 */
-
-#define MC68681_XBRG_IGNORED              (0 << 1)
-#define MC68681_XBRG_ENABLED              (1 << 1)
-#define MC68681_XBRG_DISABLED             (2 << 1)
-#define MC68681_XBRG_MASK                 (3 << 1)
-
-/*
- *  Custom baud rate table information
- */
-
-typedef unsigned char mc68681_baud_t;
-typedef mc68681_baud_t mc68681_baud_table_t[RTEMS_TERMIOS_NUMBER_BAUD_RATES];
-
-#define MC68681_BAUD_NOT_VALID 0xFF
-
-extern mc68681_baud_t 
-    mc68681_baud_rate_table[4][RTEMS_TERMIOS_NUMBER_BAUD_RATES];
-
-
-/*
- * Driver function table
- */
-
-extern console_fns mc68681_fns;
-extern console_fns mc68681_fns_polled;
-
-/*
- * Default register access routines
- */
-
-unsigned8 mc68681_get_register(     /* registers are at 1 byte boundaries */
-  unsigned32  ulCtrlPort,           /*   and accessed as bytes            */
-  unsigned8   ucRegNum
-);
-
-void  mc68681_set_register(
-  unsigned32  ulCtrlPort,
-  unsigned8   ucRegNum,
-  unsigned8   ucData
-);
-
-unsigned8 mc68681_get_register_2(   /* registers are at 2 byte boundaries */
-  unsigned32  ulCtrlPort,           /*   and accessed as bytes            */
-  unsigned8   ucRegNum
-);
-
-void  mc68681_set_register_2(
-  unsigned32  ulCtrlPort,
-  unsigned8   ucRegNum,
-  unsigned8   ucData
-);
-
-unsigned8 mc68681_get_register_4(   /* registers are at 4 byte boundaries */
-  unsigned32  ulCtrlPort,           /*   and accessed as bytes            */
-  unsigned8   ucRegNum
-);
-
-void  mc68681_set_register_4(
-  unsigned32  ulCtrlPort,
-  unsigned8   ucRegNum,
-  unsigned8   ucData
-);
-
-unsigned8 mc68681_get_register_8(   /* registers are at 8 byte boundaries */
-  unsigned32  ulCtrlPort,           /*   and accessed as bytes            */
-  unsigned8   ucRegNum
-);
-
-void  mc68681_set_register_8(
-  unsigned32  ulCtrlPort,
-  unsigned8   ucRegNum,
-  unsigned8   ucData
-);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _MC68681_H_ */
diff --git a/c/src/libchip/serial/mc68681_baud.c b/c/src/libchip/serial/mc68681_baud.c
deleted file mode 100644
index d91774e501..0000000000
--- a/c/src/libchip/serial/mc68681_baud.c
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- *  MC68681 Default Baud Rate Table
- *
- *  $Id$
- */
-
-#include <rtems.h>
-#include <libchip/serial.h>
-#include <libchip/mc68681.h>
-
-/* major index of 0 : ACR[7] = 0, X = 0 -- 68c681 only has these */
-/* major index of 1 : ACR[7] = 1, X = 0 -- 68c681 only has these */
-/* major index of 2 : ACR[7] = 0, X = 1 */
-/* major index of 3 : ACR[7] = 1, X = 1 */
-
-/* mc68681_baud_table_t mc68681_baud_rate_table[4] = { */
-mc68681_baud_t mc68681_baud_rate_table[4][RTEMS_TERMIOS_NUMBER_BAUD_RATES] = {
-  { /* ACR[7] = 0, X = 0 */
-    MC68681_BAUD_NOT_VALID,    /* B0 */
-    0x00,                      /* B50 */
-    MC68681_BAUD_NOT_VALID,    /* B75 */
-    0x01,                      /* B110 */
-    0x02,                      /* B134 */
-    MC68681_BAUD_NOT_VALID,    /* B150 */
-    0x03,                      /* B200 */
-    0x04,                      /* B300 */
-    0x05,                      /* B600 */
-    0x06,                      /* B1200 */
-    MC68681_BAUD_NOT_VALID,    /* B1800 */
-    0x08,                      /* B2400 */
-    0x09,                      /* B4800 */
-    0x0B,                      /* B9600 */
-    MC68681_BAUD_NOT_VALID,    /* B19200 */
-    0x0C,                      /* B38400 */
-    MC68681_BAUD_NOT_VALID,    /* B57600 */
-    MC68681_BAUD_NOT_VALID,    /* B115200 */
-    MC68681_BAUD_NOT_VALID,    /* B230400 */
-    MC68681_BAUD_NOT_VALID     /* B460800 */
-  },
-  { /* ACR[7] = 1, X = 0 */
-    MC68681_BAUD_NOT_VALID,    /* B0 */
-    MC68681_BAUD_NOT_VALID,    /* B50 */
-    0x00,                      /* B75 */
-    0x01,                      /* B110 */
-    0x02,                      /* B134 */
-    0x03,                      /* B150 */
-    MC68681_BAUD_NOT_VALID,    /* B200 */
-    0x04,                      /* B300 */
-    0x05,                      /* B600 */
-    0x06,                      /* B1200 */
-    0x0A,                      /* B1800 */
-    0x08,                      /* B2400 */
-    0x09,                      /* B4800 */
-    0x0B,                      /* B9600 */
-    0x0C,                      /* B19200 */
-    MC68681_BAUD_NOT_VALID,    /* B38400 */
-    MC68681_BAUD_NOT_VALID,    /* B57600 */
-    MC68681_BAUD_NOT_VALID,    /* B115200 */
-    MC68681_BAUD_NOT_VALID,    /* B230400 */
-    MC68681_BAUD_NOT_VALID     /* B460800 */
-  },
-  { /* ACR[7] = 0, X = 1 */
-    MC68681_BAUD_NOT_VALID,    /* B0 */
-    MC68681_BAUD_NOT_VALID,    /* B50 */
-    0x00,                      /* B75 */
-    0x01,                      /* B110 */
-    0x02,                      /* B134 */
-    0x03,                      /* B150 */
-    MC68681_BAUD_NOT_VALID,    /* B200 */
-    MC68681_BAUD_NOT_VALID,    /* B300 */
-    MC68681_BAUD_NOT_VALID,    /* B600 */
-    MC68681_BAUD_NOT_VALID,    /* B1200 */
-    0x0A,                      /* B1800 */
-    MC68681_BAUD_NOT_VALID,    /* B2400 */
-    0x08,                      /* B4800 */
-    0x0B,                      /* B9600 */
-    0x0C,                      /* B19200 */
-    MC68681_BAUD_NOT_VALID,    /* B38400 */
-    0x07,                      /* B57600 */
-    0x08,                      /* B115200 */
-    MC68681_BAUD_NOT_VALID,    /* B230400 */
-    MC68681_BAUD_NOT_VALID     /* B460800 */
-  },
-  { /* ACR[7] = 1, X = 1 */
-    MC68681_BAUD_NOT_VALID,    /* B0 */
-    0x00,                      /* B50 */
-    MC68681_BAUD_NOT_VALID,    /* B75 */
-    0x01,                      /* B110 */
-    0x02,                      /* B134 */
-    MC68681_BAUD_NOT_VALID,    /* B150 */
-    0x03,                      /* B200 */
-    MC68681_BAUD_NOT_VALID,    /* B300 */
-    MC68681_BAUD_NOT_VALID,    /* B600 */
-    MC68681_BAUD_NOT_VALID,    /* B1200 */
-    MC68681_BAUD_NOT_VALID,    /* B1800 */
-    MC68681_BAUD_NOT_VALID,    /* B2400 */
-    0x09,                      /* B4800 */
-    0x0B,                      /* B9600 */
-    MC68681_BAUD_NOT_VALID,    /* B19200 */
-    0x0C,                      /* B38400 */
-    0x07,                      /* B57600 */
-    0x08,                      /* B115200 */
-    MC68681_BAUD_NOT_VALID,    /* B230400 */
-    MC68681_BAUD_NOT_VALID     /* B460800 */
-  },
-};
-
diff --git a/c/src/libchip/serial/mc68681_p.h b/c/src/libchip/serial/mc68681_p.h
deleted file mode 100644
index 471b0ae42e..0000000000
--- a/c/src/libchip/serial/mc68681_p.h
+++ /dev/null
@@ -1,317 +0,0 @@
-/*
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef _MC68681_P_H_
-#define _MC68681_P_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- *  Define MC68681_STATIC to nothing while debugging so the entry points
- *  will show up in the symbol table.
- */
-
-#define MC68681_STATIC
-
-/* #define MC68681_STATIC static */
-
-/*
- * mc68681 register offsets Read/Write Addresses
- */
-
-#define MC68681_MODE_REG_1A  0  /* MR1A-MR Prior to Read */
-#define MC68681_MODE_REG_2A  0  /* MR2A-MR After Read    */
-
-#define MC68681_COUNT_MODE_CURRENT_MSB       6  /* CTU   */
-#define MC68681_COUNTER_TIMER_UPPER_REG      6  /* CTU   */
-#define MC68681_COUNT_MODE_CURRENT_LSB       7  /* CTL   */
-#define MC68681_COUNTER_TIMER_LOWER_REG      7  /* CTL   */
-#define MC68681_INTERRUPT_VECTOR_REG        12  /* IVR   */
-
-#define MC68681_MODE_REG_1B  8  /* MR1B-MR Prior to Read */
-#define MC68681_MODE_REG_2B  8  /* MR2BA-MR After Read   */
-
-/*
- * mc68681 register offsets Read Only  Addresses
- */
-
-#define MC68681_STATUS_REG_A                 1  /* SRA   */
-#define MC68681_MASK_ISR_REG                 2  /* MISR  */
-#define MC68681_RECEIVE_BUFFER_A             3  /* RHRA  */
-#define MC68681_INPUT_PORT_CHANGE_REG        4  /* IPCR  */
-#define MC68681_INTERRUPT_STATUS_REG         5  /* ISR   */
-#define MC68681_STATUS_REG_B                 9  /* SRB   */
-#define MC68681_RECEIVE_BUFFER_B            11  /* RHRB  */
-#define MC68681_INPUT_PORT                  13  /* IP    */
-#define MC68681_START_COUNT_CMD             14  /* SCC   */
-#define MC68681_STOP_COUNT_CMD              15  /* STC   */
-
-/*
- * mc68681 register offsets Write Only  Addresses
- */
-
-#define MC68681_CLOCK_SELECT_REG_A           1  /* CSRA  */
-#define MC68681_COMMAND_REG_A                2  /* CRA   */
-#define MC68681_TRANSMIT_BUFFER_A            3  /* THRA  */
-#define MC68681_AUX_CTRL_REG                 4  /* ACR   */
-#define MC68681_INTERRUPT_MASK_REG           5  /* IMR   */
-#define MC68681_CLOCK_SELECT_REG_B           9  /* CSRB  */
-#define MC68681_COMMAND_REG_B               10  /* CRB   */
-#define MC68681_TRANSMIT_BUFFER_B           11  /* THRB  */
-#define MC68681_OUTPUT_PORT_CONFIG_REG      13  /* OPCR  */
-#define MC68681_OUTPUT_PORT_SET_REG         14  /* SOPBC */
-#define MC68681_OUTPUT_PORT_RESET_BITS      15  /* COPBC */
-
-/*
- *  DUART Command Register Definitions:
- *
- *  MC68681_COMMAND_REG_A,MC68681_COMMAND_REG_B
- */
-
-#define MC68681_MODE_REG_ENABLE_RX                          0x01
-#define MC68681_MODE_REG_DISABLE_RX                         0x02
-#define MC68681_MODE_REG_ENABLE_TX                          0x04
-#define MC68681_MODE_REG_DISABLE_TX                         0x08
-#define MC68681_MODE_REG_RESET_MR_PTR                       0x10
-#define MC68681_MODE_REG_RESET_RX                           0x20
-#define MC68681_MODE_REG_RESET_TX                           0x30
-#define MC68681_MODE_REG_RESET_ERROR                        0x40
-#define MC68681_MODE_REG_RESET_BREAK                        0x50
-#define MC68681_MODE_REG_START_BREAK                        0x60
-#define MC68681_MODE_REG_STOP_BREAK                         0x70
-#define MC68681_MODE_REG_SET_RX_BRG                         0x80
-#define MC68681_MODE_REG_CLEAR_RX_BRG                       0x90
-#define MC68681_MODE_REG_SET_TX_BRG                         0xa0
-#define MC68681_MODE_REG_CLEAR_TX_BRG                       0xb0
-#define MC68681_MODE_REG_SET_STANDBY                        0xc0
-#define MC68681_MODE_REG_SET_ACTIVE                         0xd0
-
-/*
- * Mode Register Definitions
- *
- *  MC68681_MODE_REG_1A
- *  MC68681_MODE_REG_1B
- */
-
-#define MC68681_5BIT_CHARS                                  0x00
-#define MC68681_6BIT_CHARS                                  0x01
-#define MC68681_7BIT_CHARS                                  0x02
-#define MC68681_8BIT_CHARS                                  0x03
-
-#define MC68681_ODD_PARITY                                  0x00
-#define MC68681_EVEN_PARITY                                 0x04
-
-#define MC68681_WITH_PARITY                                 0x00
-#define MC68681_FORCE_PARITY                                0x08
-#define MC68681_NO_PARITY                                   0x10
-#define MC68681_MULTI_DROP                                  0x18
-
-#define MC68681_ERR_MODE_CHAR                               0x00
-#define MC68681_ERR_MODE_BLOCK                              0x20
-
-#define MC68681_RX_INTR_RX_READY                            0x00
-#define MC68681_RX_INTR_FFULL                               0x40
-
-#define MC68681_NO_RX_RTS_CTL                               0x00
-#define MC68681_RX_RTS_CTRL                                 0x80
-
-/*
- * Mode Register Definitions
- *
- *  MC68681_MODE_REG_2A
- *  MC68681_MODE_REG_2B
- */
-
-#define MC68681_STOP_BIT_LENGTH__563                        0x00
-#define MC68681_STOP_BIT_LENGTH__625                        0x01
-#define MC68681_STOP_BIT_LENGTH__688                        0x02
-#define MC68681_STOP_BIT_LENGTH__75                         0x03
-#define MC68681_STOP_BIT_LENGTH__813                        0x04
-#define MC68681_STOP_BIT_LENGTH__875                        0x05
-#define MC68681_STOP_BIT_LENGTH__938                        0x06
-#define MC68681_STOP_BIT_LENGTH_1                           0x07
-#define MC68681_STOP_BIT_LENGTH_1_563                       0x08
-#define MC68681_STOP_BIT_LENGTH_1_625                       0x09
-#define MC68681_STOP_BIT_LENGTH_1_688                       0x0a
-#define MC68681_STOP_BIT_LENGTH_1_75                        0x0b
-#define MC68681_STOP_BIT_LENGTH_1_813                       0x0c
-#define MC68681_STOP_BIT_LENGTH_1_875                       0x0d
-#define MC68681_STOP_BIT_LENGTH_1_938                       0x0e
-#define MC68681_STOP_BIT_LENGTH_2                           0x0f
-
-#define MC68681_CTS_ENABLE_TX                               0x10
-#define MC68681_TX_RTS_CTRL                                 0x20
-
-#define MC68681_CHANNEL_MODE_NORMAL                         0x00
-#define MC68681_CHANNEL_MODE_ECHO                           0x40
-#define MC68681_CHANNEL_MODE_LOCAL_LOOP                     0x80
-#define MC68681_CHANNEL_MODE_REMOTE_LOOP                    0xc0
-
-/*
- * Status Register Definitions
- *
- *    MC68681_STATUS_REG_A,  MC68681_STATUS_REG_B
- */
-
-#define MC68681_RX_READY                                    0x01
-#define MC68681_FFULL                                       0x02
-#define MC68681_TX_READY                                    0x04
-#define MC68681_TX_EMPTY                                    0x08
-#define MC68681_OVERRUN_ERROR                               0x10
-#define MC68681_PARITY_ERROR                                0x20
-#define MC68681_FRAMING_ERROR                               0x40
-#define MC68681_RECEIVED_BREAK                              0x80
-
-#define MC68681_RX_ERRORS \
-  (MC68681_OVERRUN_ERROR|MC68681_PARITY_ERROR| \
-   MC68681_FRAMING_ERROR|MC68681_RECEIVED_BREAK)
-
-/*
- * Interupt Status Register Definitions.
- *
- * MC68681_INTERRUPT_STATUS_REG
- */
-
-/*
- *  Interupt Mask Register Definitions
- *
- *  MC68681_INTERRUPT_MASK_REG
- */
-
-/* These are passed to mc68681_build_imr */
-#define MC68681_IR_TX_READY                                 0x01
-#define MC68681_IR_RX_READY                                 0x02
-#define MC68681_IR_BREAK                                    0x04
-#define MC68681_IMR_ENABLE_ALL                              0x07
-#define MC68681_IMR_DISABLE_ALL                             0x00
-#define MC68681_IMR_ENABLE_ALL_EXCEPT_TX                    0x06
-
-#define MC68681_IR_TX_READY_A                               0x01
-#define MC68681_IR_RX_READY_A                               0x02
-#define MC68681_IR_BREAK_A                                  0x04
-#define MC68681_IR_COUNTER_READY                            0x08
-#define MC68681_IR_TX_READY_B                               0x10
-#define MC68681_IR_RX_READY_B                               0x20
-#define MC68681_IR_BREAK_B                                  0x40
-#define MC68681_IR_INPUT_PORT_CHANGE                        0x80
-
-/*
- * Status Register Definitions.
- *
- * MC68681_STATUS_REG_A,MC68681_STATUS_REG_B
- */
-
-#define MC68681_STATUS_RXRDY                                0x01
-#define MC68681_STATUS_FFULL                                0x02
-#define MC68681_STATUS_TXRDY                                0x04
-#define MC68681_STATUS_TXEMT                                0x08
-#define MC68681_STATUS_OVERRUN_ERROR                        0x10
-#define MC68681_STATUS_PARITY_ERROR                         0x20
-#define MC68681_STATUS_FRAMING_ERROR                        0x40
-#define MC68681_STATUS_RECEIVED_BREAK                       0x80
-
-/*
- * Definitions for the Interrupt Vector Register:
- *
- * MC68681_INTERRUPT_VECTOR_REG
- */
-
-#define  MC68681_INTERRUPT_VECTOR_INIT                      0x0f
-
-/*
- * Definitions for the Auxiliary Control Register
- *
- * MC68681_AUX_CTRL_REG
- */
-
-#define MC68681_AUX_BRG_SET1                                0x00
-#define MC68681_AUX_BRG_SET2                                0x80
-
-/*
- *  Per chip context control
- */
-
-typedef struct _mc68681_context
-{
-  int            mate;
-  unsigned char  imr;
-} mc68681_context;
-
-/*
- * Driver functions
- */
-MC68681_STATIC boolean mc68681_probe(int minor);
-
-MC68681_STATIC int mc68681_set_attributes( 
-  int minor,
-  const struct termios *t
-);
-
-MC68681_STATIC void mc68681_init(int minor);
-
-MC68681_STATIC int mc68681_open(
-  int major,
-  int minor,
-  void  * arg
-);
-
-MC68681_STATIC int mc68681_close(
-  int major,
-  int minor,
-  void  * arg
-);
-
-MC68681_STATIC void mc68681_write_polled(
-  int   minor, 
-  char  cChar
-);
-
-MC68681_STATIC void mc68681_initialize_interrupts(int minor);
-
-MC68681_STATIC int mc68681_write_support_int(
-  int   minor,
-  const char *buf,
-  int   len
-);
-
-MC68681_STATIC int mc68681_write_support_polled(
-  int   minor,
-  const char *buf,
-  int   len
-  );
-
-MC68681_STATIC int mc68681_inbyte_nonblocking_polled(
-  int minor
-);
-
-MC68681_STATIC unsigned int mc68681_build_imr(
-  int  minor,
-  int  enable_flag
-);
-
-MC68681_STATIC void mc68681_process(
-  int  minor
-);
-
-MC68681_STATIC void mc68681_enable_interrupts(
-  int minor,
-  int imr_mask
-);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _MC68681_P_H_ */
diff --git a/c/src/libchip/serial/mc68681_reg.c b/c/src/libchip/serial/mc68681_reg.c
deleted file mode 100644
index 115bafdfe8..0000000000
--- a/c/src/libchip/serial/mc68681_reg.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- *  This file contains a typical set of register access routines which may be
- *  used with the mc68681 chip if accesses to the chip are as follows:
- *
- *    + registers are accessed as bytes
- *    + registers are only byte-aligned (no address gaps)
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems.h>
-
-#ifndef _MC68681_MULTIPLIER
-#define _MC68681_MULTIPLIER 1
-#define _MC68681_NAME(_X) _X
-#define _MC68681_TYPE unsigned8
-#endif
-
-#define CALCULATE_REGISTER_ADDRESS( _base, _reg ) \
-  (_MC68681_TYPE *)((_base) + ((_reg) * _MC68681_MULTIPLIER ))
-
-/* 
- *  MC68681 Get Register Routine
- */
-
-unsigned8 _MC68681_NAME(mc68681_get_register)(
-  unsigned32  ulCtrlPort,
-  unsigned8   ucRegNum
-)
-{
-  _MC68681_TYPE *port;
-
-  port = CALCULATE_REGISTER_ADDRESS( ulCtrlPort, ucRegNum );
-
-  return *port;
-}
-
-/*
- *  MC68681 Set Register Routine
- */
-
-void  _MC68681_NAME(mc68681_set_register)(
-  unsigned32  ulCtrlPort,
-  unsigned8   ucRegNum,
-  unsigned8   ucData
-)
-{
-  _MC68681_TYPE *port;
-
-  port = CALCULATE_REGISTER_ADDRESS( ulCtrlPort, ucRegNum );
-
-  *port = ucData;
-}
diff --git a/c/src/libchip/serial/mc68681_reg2.c b/c/src/libchip/serial/mc68681_reg2.c
deleted file mode 100644
index f786ab5df5..0000000000
--- a/c/src/libchip/serial/mc68681_reg2.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- *  This file contains a typical set of register access routines which may be
- *  used with the mc68681 chip if accesses to the chip are as follows:
- *
- *    + registers are accessed as bytes
- *    + registers are on 16-bit boundaries
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define _MC68681_MULTIPLIER 2
-#define _MC68681_NAME(_X) _X##_2
-#define _MC68681_TYPE unsigned8
-
-#include "mc68681_reg.c"
-
diff --git a/c/src/libchip/serial/mc68681_reg4.c b/c/src/libchip/serial/mc68681_reg4.c
deleted file mode 100644
index 075a9b2564..0000000000
--- a/c/src/libchip/serial/mc68681_reg4.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- *  This file contains a typical set of register access routines which may be
- *  used with the mc68681 chip if accesses to the chip are as follows:
- *
- *    + registers are accessed as bytes
- *    + registers are on 32-bit boundaries
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define _MC68681_MULTIPLIER 4
-#define _MC68681_NAME(_X) _X##_4
-#define _MC68681_TYPE unsigned8
-
-#include "mc68681_reg.c"
-
diff --git a/c/src/libchip/serial/mc68681_reg8.c b/c/src/libchip/serial/mc68681_reg8.c
deleted file mode 100644
index b83ccd2b46..0000000000
--- a/c/src/libchip/serial/mc68681_reg8.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- *  This file contains a typical set of register access routines which may be
- *  used with the mc68681 chip if accesses to the chip are as follows:
- *
- *    + registers are accessed as bytes
- *    + registers are on 64-bit boundaries
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define _MC68681_MULTIPLIER 8
-#define _MC68681_NAME(_X) _X##_8
-#define _MC68681_TYPE unsigned8
-
-#include "mc68681_reg.c"
-
diff --git a/c/src/libchip/serial/ns16550.c b/c/src/libchip/serial/ns16550.c
deleted file mode 100644
index 6f8c3f759f..0000000000
--- a/c/src/libchip/serial/ns16550.c
+++ /dev/null
@@ -1,659 +0,0 @@
-/*
- *  This file contains the TTY driver for the National Semiconductor NS16550.
- *
- *  This part is widely cloned and second sourced.  It is found in a number 
- *  of "Super IO" controllers.
- *
- *  COPYRIGHT (c) 1998 by Radstone Technology
- *
- *
- * THIS FILE IS PROVIDED TO YOU, THE USER, "AS IS", WITHOUT WARRANTY OF ANY
- * KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTY OF FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK
- * AS TO THE QUALITY AND PERFORMANCE OF ALL CODE IN THIS FILE IS WITH YOU.
- *
- * You are hereby granted permission to use, copy, modify, and distribute
- * this file, provided that this notice, plus the above copyright notice
- * and disclaimer, appears in all copies. Radstone Technology will provide
- * no support for this code.
- *
- *  This driver uses the termios pseudo driver.
- */
-
-#include <rtems.h>
-#include <rtems/libio.h>
-#include <stdlib.h>
-#include <ringbuf.h>
-
-#include <libchip/serial.h>
-#include "ns16550_p.h"
-#include "sersupp.h"
-
-/*
- * Flow control is only supported when using interrupts
- */
-
-console_flow ns16550_flow_RTSCTS = {
-  ns16550_negate_RTS,             /* deviceStopRemoteTx */
-  ns16550_assert_RTS              /* deviceStartRemoteTx */
-};
-
-console_flow ns16550_flow_DTRCTS = {
-  ns16550_negate_DTR,             /* deviceStopRemoteTx */
-  ns16550_assert_DTR              /* deviceStartRemoteTx */
-};
-
-console_fns ns16550_fns = {
-  libchip_serial_default_probe,   /* deviceProbe */
-  ns16550_open,                   /* deviceFirstOpen */
-  NULL,                           /* deviceLastClose */
-  NULL,                           /* deviceRead */
-  ns16550_write_support_int,      /* deviceWrite */
-  ns16550_initialize_interrupts,  /* deviceInitialize */
-  ns16550_write_polled,           /* deviceWritePolled */
-  ns16550_set_attributes,         /* deviceSetAttributes */
-  TRUE                            /* deviceOutputUsesInterrupts */
-};
-
-console_fns ns16550_fns_polled = {
-  libchip_serial_default_probe,        /* deviceProbe */
-  ns16550_open,                        /* deviceFirstOpen */
-  ns16550_close,                       /* deviceLastClose */
-  ns16550_inbyte_nonblocking_polled,   /* deviceRead */
-  ns16550_write_support_polled,        /* deviceWrite */
-  ns16550_init,                        /* deviceInitialize */
-  ns16550_write_polled,                /* deviceWritePolled */
-  ns16550_set_attributes,              /* deviceSetAttributes */
-  FALSE                                /* deviceOutputUsesInterrupts */
-};
-
-extern void set_vector( rtems_isr_entry, rtems_vector_number, int );
-
-/*
- *  ns16550_init
- */
-
-NS16550_STATIC void ns16550_init(int minor)
-{
-  unsigned32              pNS16550;
-  unsigned8               ucTrash;
-  unsigned8               ucDataByte;
-  unsigned32              ulBaudDivisor;
-  ns16550_context        *pns16550Context;
-  setRegister_f           setReg;
-  getRegister_f           getReg;
-
-  pns16550Context=(ns16550_context *)malloc(sizeof(ns16550_context));
-
-  Console_Port_Data[minor].pDeviceContext=(void *)pns16550Context;
-  pns16550Context->ucModemCtrl=SP_MODEM_IRQ;
-
-  pNS16550 = Console_Port_Tbl[minor].ulCtrlPort1;
-  setReg   = Console_Port_Tbl[minor].setRegister;
-  getReg   = Console_Port_Tbl[minor].getRegister;
-
-  /* Clear the divisor latch, clear all interrupt enables,
-   * and reset and
-   * disable the FIFO's.
-   */
-
-  (*setReg)(pNS16550, NS16550_LINE_CONTROL, 0x0);
-  ns16550_enable_interrupts(minor, NS16550_DISABLE_ALL_INTR);
-
-  /* Set the divisor latch and set the baud rate. */
-
-  ulBaudDivisor=NS16550_Baud((unsigned32)Console_Port_Tbl[minor].pDeviceParams);
-  ucDataByte = SP_LINE_DLAB;
-  (*setReg)(pNS16550, NS16550_LINE_CONTROL, ucDataByte);
-
-  /* XXX */
-  (*setReg)(pNS16550, NS16550_TRANSMIT_BUFFER, ulBaudDivisor&0xff);
-  (*setReg)(pNS16550, NS16550_INTERRUPT_ENABLE, (ulBaudDivisor>>8)&0xff);
-
-  /* Clear the divisor latch and set the character size to eight bits */
-  /* with one stop bit and no parity checking. */
-  ucDataByte = EIGHT_BITS;
-  (*setReg)(pNS16550, NS16550_LINE_CONTROL, ucDataByte);
-
-  /* Enable and reset transmit and receive FIFOs. TJA     */
-  ucDataByte = SP_FIFO_ENABLE;
-  (*setReg)(pNS16550, NS16550_FIFO_CONTROL, ucDataByte);
-
-  ucDataByte = SP_FIFO_ENABLE | SP_FIFO_RXRST | SP_FIFO_TXRST;
-  (*setReg)(pNS16550, NS16550_FIFO_CONTROL, ucDataByte);
-
-  ns16550_enable_interrupts(minor, NS16550_DISABLE_ALL_INTR);
-
-  /* Set data terminal ready. */
-  /* And open interrupt tristate line */
-  (*setReg)(pNS16550, NS16550_MODEM_CONTROL,pns16550Context->ucModemCtrl);
-
-  ucTrash = (*getReg)(pNS16550, NS16550_LINE_STATUS );
-  ucTrash = (*getReg)(pNS16550, NS16550_RECEIVE_BUFFER );
-}
-
-/*
- *  ns16550_open
- */
-
-NS16550_STATIC int ns16550_open(
-  int      major,
-  int      minor,
-  void    * arg
-)
-{
-  /*
-   * Assert DTR
-   */
-
-  if(Console_Port_Tbl[minor].pDeviceFlow != &ns16550_flow_DTRCTS) {
-    ns16550_assert_DTR(minor);
-  }
-
-  return(RTEMS_SUCCESSFUL);
-}
-
-/*
- *  ns16550_close
- */
-
-NS16550_STATIC int ns16550_close(
-  int      major,
-  int      minor,
-  void    * arg
-)
-{
-  /*
-   * Negate DTR
-   */
-  if(Console_Port_Tbl[minor].pDeviceFlow != &ns16550_flow_DTRCTS) {
-    ns16550_negate_DTR(minor);
-  }
-
-  return(RTEMS_SUCCESSFUL);
-}
-
-/* 
- *  ns16550_write_polled
- */
-
-NS16550_STATIC void ns16550_write_polled(
-  int   minor, 
-  char  cChar
-)
-{
-  unsigned32              pNS16550;
-  unsigned char           ucLineStatus;
-  int                     iTimeout;
-  getRegister_f           getReg;
-  setRegister_f           setReg;
-
-  pNS16550 = Console_Port_Tbl[minor].ulCtrlPort1;
-  getReg   = Console_Port_Tbl[minor].getRegister;
-  setReg   = Console_Port_Tbl[minor].setRegister;
-
-  /*
-   * wait for transmitter holding register to be empty
-   */
-  iTimeout=1000;
-  ucLineStatus = (*getReg)(pNS16550, NS16550_LINE_STATUS);
-  while ((ucLineStatus & SP_LSR_THOLD) == 0) {
-    /*
-     * Yield while we wait
-     */
-#if 0
-     if(_System_state_Is_up(_System_state_Get())) {
-       rtems_task_wake_after(RTEMS_YIELD_PROCESSOR);
-     }
-#endif
-     ucLineStatus = (*getReg)(pNS16550, NS16550_LINE_STATUS);
-     if(!--iTimeout) {
-       break;
-     }
-  }
-
-  /*
-   * transmit character
-   */
-  (*setReg)(pNS16550, NS16550_TRANSMIT_BUFFER, cChar);
-}
-
-/*
- * These routines provide control of the RTS and DTR lines
- */
-
-/*
- *  ns16550_assert_RTS
- */
-
-NS16550_STATIC int ns16550_assert_RTS(int minor)
-{
-  unsigned32              pNS16550;
-  unsigned32              Irql;
-  ns16550_context        *pns16550Context;
-  setRegister_f           setReg;
-
-  pns16550Context=(ns16550_context *) Console_Port_Data[minor].pDeviceContext;
-
-  pNS16550 = Console_Port_Tbl[minor].ulCtrlPort1;
-  setReg   = Console_Port_Tbl[minor].setRegister;
-
-  /*
-   * Assert RTS
-   */
-  rtems_interrupt_disable(Irql);
-  pns16550Context->ucModemCtrl|=SP_MODEM_RTS;
-  (*setReg)(pNS16550, NS16550_MODEM_CONTROL, pns16550Context->ucModemCtrl);
-  rtems_interrupt_enable(Irql);
-  return 0;
-}
-
-/*
- *  ns16550_negate_RTS
- */
-
-NS16550_STATIC int ns16550_negate_RTS(int minor)
-{
-  unsigned32              pNS16550;
-  unsigned32              Irql;
-  ns16550_context        *pns16550Context;
-  setRegister_f           setReg;
-
-  pns16550Context=(ns16550_context *) Console_Port_Data[minor].pDeviceContext;
-
-  pNS16550 = Console_Port_Tbl[minor].ulCtrlPort1;
-  setReg   = Console_Port_Tbl[minor].setRegister;
-
-  /*
-   * Negate RTS
-   */
-  rtems_interrupt_disable(Irql);
-  pns16550Context->ucModemCtrl&=~SP_MODEM_RTS;
-  (*setReg)(pNS16550, NS16550_MODEM_CONTROL, pns16550Context->ucModemCtrl);
-  rtems_interrupt_enable(Irql);
-  return 0;
-}
-
-/*
- * These flow control routines utilise a connection from the local DTR
- * line to the remote CTS line
- */
-
-/*
- *  ns16550_assert_DTR
- */
-
-NS16550_STATIC int ns16550_assert_DTR(int minor)
-{
-  unsigned32              pNS16550;
-  unsigned32              Irql;
-  ns16550_context        *pns16550Context;
-  setRegister_f           setReg;
-
-  pns16550Context=(ns16550_context *) Console_Port_Data[minor].pDeviceContext;
-
-  pNS16550 = Console_Port_Tbl[minor].ulCtrlPort1;
-  setReg   = Console_Port_Tbl[minor].setRegister;
-
-  /*
-   * Assert DTR
-   */
-  rtems_interrupt_disable(Irql);
-  pns16550Context->ucModemCtrl|=SP_MODEM_DTR;
-  (*setReg)(pNS16550, NS16550_MODEM_CONTROL, pns16550Context->ucModemCtrl);
-  rtems_interrupt_enable(Irql);
-  return 0;
-}
-
-/*
- *  ns16550_negate_DTR
- */
-
-NS16550_STATIC int ns16550_negate_DTR(int minor)
-{
-  unsigned32              pNS16550;
-  unsigned32              Irql;
-  ns16550_context        *pns16550Context;
-  setRegister_f           setReg;
-
-  pns16550Context=(ns16550_context *) Console_Port_Data[minor].pDeviceContext;
-
-  pNS16550 = Console_Port_Tbl[minor].ulCtrlPort1;
-  setReg   = Console_Port_Tbl[minor].setRegister;
-
-  /*
-   * Negate DTR
-   */
-  rtems_interrupt_disable(Irql);
-  pns16550Context->ucModemCtrl&=~SP_MODEM_DTR;
-  (*setReg)(pNS16550, NS16550_MODEM_CONTROL,pns16550Context->ucModemCtrl);
-  rtems_interrupt_enable(Irql);
-  return 0;
-}
-
-/*
- *  ns16550_set_attributes
- *
- *  This function sets the channel to reflect the requested termios
- *  port settings.
- */
-
-NS16550_STATIC int ns16550_set_attributes(
-  int                   minor,
-  const struct termios *t
-)
-{
-  unsigned32              pNS16550;
-  unsigned32              ulBaudDivisor;
-  unsigned8               ucLineControl;
-  unsigned32              baud_requested;
-  setRegister_f           setReg;
-  getRegister_f           getReg;
-  unsigned32              Irql;
-
-  pNS16550 = Console_Port_Tbl[minor].ulCtrlPort1;
-  setReg   = Console_Port_Tbl[minor].setRegister;
-  getReg   = Console_Port_Tbl[minor].getRegister;
-
-  /*
-   *  Calculate the baud rate divisor
-   */
-
-  baud_requested = t->c_cflag & CBAUD;
-  if (!baud_requested)
-    baud_requested = B9600;              /* default to 9600 baud */
-
-  ulBaudDivisor = termios_baud_to_number(baud_requested);
-
-  ucLineControl = 0;
-
-  /*
-   *  Parity
-   */
-
-  if (t->c_cflag & PARENB) {
-    ucLineControl |= SP_LINE_PAR;
-    if (!(t->c_cflag & PARODD))
-      ucLineControl |= SP_LINE_ODD;
-  }
-
-  /*
-   *  Character Size
-   */
-
-  if (t->c_cflag & CSIZE) {
-    switch (t->c_cflag & CSIZE) {
-      case CS5:  ucLineControl |= FIVE_BITS;  break;
-      case CS6:  ucLineControl |= SIX_BITS;   break;
-      case CS7:  ucLineControl |= SEVEN_BITS; break;
-      case CS8:  ucLineControl |= EIGHT_BITS; break;
-    }
-  } else {
-    ucLineControl |= EIGHT_BITS;               /* default to 9600,8,N,1 */
-  }
-
-  /*
-   *  Stop Bits
-   */
-
-  if (t->c_cflag & CSTOPB) {
-    ucLineControl |= SP_LINE_STOP;              /* 2 stop bits */
-  } else {
-    ;                                           /* 1 stop bit */
-  }
-
-  /*
-   *  Now actually set the chip
-   */
-
-  rtems_interrupt_disable(Irql);
-
-    /*
-     *  Set the baud rate 
-     */
-
-    (*setReg)(pNS16550, NS16550_LINE_CONTROL, SP_LINE_DLAB);
-    /* XXX are these registers right? */
-    (*setReg)(pNS16550, NS16550_TRANSMIT_BUFFER, ulBaudDivisor&0xff);
-    (*setReg)(pNS16550, NS16550_INTERRUPT_ENABLE, (ulBaudDivisor>>8)&0xff);
-
-    /*
-     *  Now write the line control
-     */
-    (*setReg)(pNS16550, NS16550_LINE_CONTROL, ucLineControl );
-
-  rtems_interrupt_enable(Irql);
-
-}
-
-/*
- *  ns16550_process
- *
- *  This routine is the console interrupt handler for A port.
- */
-
-NS16550_STATIC void ns16550_process(
-        int             minor
-)
-{
-  unsigned32              pNS16550;
-  volatile unsigned8      ucLineStatus; 
-  volatile unsigned8      ucInterruptId;
-  unsigned char           cChar;
-  getRegister_f           getReg;
-  setRegister_f           setReg;
-
-  pNS16550 = Console_Port_Tbl[minor].ulCtrlPort1;
-  getReg   = Console_Port_Tbl[minor].getRegister;
-  setReg   = Console_Port_Tbl[minor].setRegister;
-
-  do {
-    /*
-     * Deal with any received characters
-     */
-    while(TRUE) {
-      ucLineStatus = (*getReg)(pNS16550, NS16550_LINE_STATUS);
-      if(~ucLineStatus & SP_LSR_RDY) {
-        break;
-      }
-      cChar = (*getReg)(pNS16550, NS16550_RECEIVE_BUFFER);
-      rtems_termios_enqueue_raw_characters( 
-        Console_Port_Data[minor].termios_data,
-        &cChar, 
-        1 
-      );
-    }
-
-    /*
-     *  TX all the characters we can
-     */
-
-    while(TRUE) {
-        ucLineStatus = (*getReg)(pNS16550, NS16550_LINE_STATUS);
-        if(~ucLineStatus & SP_LSR_THOLD) {
-          /*
-           * We'll get another interrupt when
-           * the transmitter holding reg. becomes
-           * free again
-           */
-          break;
-        }
-
-#if 0
-        /* XXX flow control not completely supported in libchip */
-
-        if(Console_Port_Tbl[minor].pDeviceFlow != &ns16550_flow_RTSCTS) {
-          ns16550_negate_RTS(minor);
-        }
-#endif
-
-    rtems_termios_dequeue_characters(Console_Port_Data[minor].termios_data, 1);
-    if (rtems_termios_is_more_to_tx( Console_Port_Data[minor].termios_data )) {
-        if (Console_Port_Tbl[minor].pDeviceFlow != &ns16550_flow_RTSCTS) {
-          ns16550_negate_RTS(minor);
-        }
-        Console_Port_Data[minor].bActive = FALSE;
-        ns16550_enable_interrupts(minor, NS16550_ENABLE_ALL_INTR_EXCEPT_TX);
-        break;
-      }
-
-      ucInterruptId = (*getReg)(pNS16550, NS16550_INTERRUPT_ID);
-    }
-  } while((ucInterruptId&0xf)!=0x1);
-}
-
-/*
- *  ns16550_isr
- */
-
-NS16550_STATIC rtems_isr ns16550_isr(
-  rtems_vector_number vector
-)
-{
-  int     minor;
-
-  for(minor=0;minor<Console_Port_Count;minor++) {
-    if(Console_Port_Tbl[minor].ulIntVector == vector && 
-       Console_Port_Tbl[minor].deviceType == SERIAL_NS16550 ) {
-      ns16550_process(minor);
-    }
-  }
-}
-
-/*
- *  ns16550_enable_interrupts
- *
- *  This routine initializes the port to have the specified interrupts masked.
- */
-
-NS16550_STATIC void ns16550_enable_interrupts(
-  int minor,
-  int mask
-)
-{
-  unsigned32     pNS16550;
-  setRegister_f  setReg;
-
-  pNS16550 = Console_Port_Tbl[minor].ulCtrlPort1;
-  setReg   = Console_Port_Tbl[minor].setRegister;
-
-  (*setReg)(pNS16550, NS16550_INTERRUPT_ENABLE, mask);
-}
-
-/*
- *  ns16550_initialize_interrupts
- *
- *  This routine initializes the port to operate in interrupt driver mode.
- */ 
-
-NS16550_STATIC void ns16550_initialize_interrupts(int minor)
-{
-  ns16550_init(minor);
-
-  Console_Port_Data[minor].bActive = FALSE;
-
-  set_vector(ns16550_isr, Console_Port_Tbl[minor].ulIntVector, 1);
-
-  ns16550_enable_interrupts(minor, NS16550_ENABLE_ALL_INTR);
-}
-
-/* 
- *  ns16550_write_support_int
- *
- *  Console Termios output entry point.
- */
-
-NS16550_STATIC int ns16550_write_support_int(
-  int   minor, 
-  const char *buf, 
-  int   len
-)
-{
-  unsigned32     Irql;
-  unsigned32     pNS16550;
-  setRegister_f  setReg;
-
-  setReg   = Console_Port_Tbl[minor].setRegister;
-  pNS16550 = Console_Port_Tbl[minor].ulCtrlPort1;
-
-  /*
-   *  We are using interrupt driven output and termios only sends us
-   *  one character at a time.
-   */
-
-  if ( !len )
-    return 0;
-
-  if(Console_Port_Tbl[minor].pDeviceFlow != &ns16550_flow_RTSCTS) {
-    ns16550_assert_RTS(minor);
-  }
-
-  rtems_interrupt_disable(Irql);
-    if ( Console_Port_Data[minor].bActive == FALSE) {
-      Console_Port_Data[minor].bActive = TRUE;
-      ns16550_enable_interrupts(minor, NS16550_ENABLE_ALL_INTR);
-    }
-    (*setReg)(pNS16550, NS16550_TRANSMIT_BUFFER, *buf);
-  rtems_interrupt_enable(Irql);
-
-  return 1;
-}
-
-/* 
- *  ns16550_write_support_polled
- *
- *  Console Termios output entry point.
- *
- */
-
-NS16550_STATIC int ns16550_write_support_polled(
-  int         minor, 
-  const char *buf, 
-  int         len
-)
-{
-  int nwrite = 0;
-
-  /*
-   * poll each byte in the string out of the port.
-   */
-  while (nwrite < len) {
-    /*
-     * transmit character
-     */
-    ns16550_write_polled(minor, *buf++);
-    nwrite++;
-  }
-
-  /*
-   * return the number of bytes written.
-   */
-  return nwrite;
-}
-
-/* 
- *  ns16550_inbyte_nonblocking_polled 
- *
- *  Console Termios polling input entry point.
- */
-
-NS16550_STATIC int ns16550_inbyte_nonblocking_polled( 
-  int minor 
-)
-{
-  unsigned32           pNS16550;
-  unsigned char        ucLineStatus;
-  char                 cChar;
-  getRegister_f        getReg;
-
-  pNS16550 = Console_Port_Tbl[minor].ulCtrlPort1;
-  getReg   = Console_Port_Tbl[minor].getRegister;
-
-  ucLineStatus = (*getReg)(pNS16550, NS16550_LINE_STATUS);
-  if(ucLineStatus & SP_LSR_RDY) {
-    cChar = (*getReg)(pNS16550, NS16550_RECEIVE_BUFFER);
-    return (int)cChar;
-  } else {
-    return -1;
-  }
-}
diff --git a/c/src/libchip/serial/ns16550.h b/c/src/libchip/serial/ns16550.h
deleted file mode 100644
index cb01d20a85..0000000000
--- a/c/src/libchip/serial/ns16550.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *  COPYRIGHT (c) 1998 by Radstone Technology
- *
- *
- * THIS FILE IS PROVIDED TO YOU, THE USER, "AS IS", WITHOUT WARRANTY OF ANY
- * KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTY OF FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK
- * AS TO THE QUALITY AND PERFORMANCE OF ALL CODE IN THIS FILE IS WITH YOU.
- *
- * You are hereby granted permission to use, copy, modify, and distribute
- * this file, provided that this notice, plus the above copyright notice
- * and disclaimer, appears in all copies. Radstone Technology will provide
- * no support for this code.
- *
- */
-
-#ifndef _NS16550_H_
-#define _NS16550_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * Driver function table
- */
-
-extern console_fns ns16550_fns;
-extern console_fns ns16550_fns_polled;
-
-/*
- * Flow control function tables
- */
-
-extern console_flow ns16550_flow_RTSCTS;
-extern console_flow ns16550_flow_DTRCTS;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _NS16550_H_ */
diff --git a/c/src/libchip/serial/ns16550_p.h b/c/src/libchip/serial/ns16550_p.h
deleted file mode 100644
index 27c3502a0d..0000000000
--- a/c/src/libchip/serial/ns16550_p.h
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
- *  COPYRIGHT (c) 1998 by Radstone Technology
- *
- *
- * THIS FILE IS PROVIDED TO YOU, THE USER, "AS IS", WITHOUT WARRANTY OF ANY
- * KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTY OF FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK
- * AS TO THE QUALITY AND PERFORMANCE OF ALL CODE IN THIS FILE IS WITH YOU.
- *
- * You are hereby granted permission to use, copy, modify, and distribute
- * this file, provided that this notice, plus the above copyright notice
- * and disclaimer, appears in all copies. Radstone Technology will provide
- * no support for this code.
- *
- *  $Id$
- */
-
-#ifndef _NS16550_P_H_
-#define _NS16550_P_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- *  Define NS16550_STATIC to nothing while debugging so the entry points
- *  will show up in the symbol table.
- */
-
-#define NS16550_STATIC
-
-/* #define NS16550_STATIC static */
-
-/*
- * Define serial port read registers structure.
- */
-
-typedef volatile struct _SP_READ_REGISTERS {
-    unsigned char ReceiveBuffer;
-    unsigned char InterruptEnable;
-    unsigned char InterruptId;
-    unsigned char LineControl;
-    unsigned char ModemControl;
-    unsigned char LineStatus;
-    unsigned char ModemStatus;
-    unsigned char ScratchPad;
-} SP_READ_REGISTERS, *PSP_READ_REGISTERS;
-
-#define NS16550_RECEIVE_BUFFER   0
-#define NS16550_INTERRUPT_ENABLE 1
-#define NS16550_INTERRUPT_ID     2
-#define NS16550_LINE_CONTROL     3
-#define NS16550_MODEM_CONTROL    4
-#define NS16550_LINE_STATUS      5
-#define NS16550_MODEM_STATUS     6
-#define NS16550_SCRATCH_PAD      7
-
-/*
- * Define serial port write registers structure.
- */
-
-typedef volatile struct _SP_WRITE_REGISTERS {
-    unsigned char TransmitBuffer;
-    unsigned char InterruptEnable;
-    unsigned char FifoControl;
-    unsigned char LineControl;
-    unsigned char ModemControl;
-    unsigned char Reserved1;
-    unsigned char ModemStatus;
-    unsigned char ScratchPad;
-} SP_WRITE_REGISTERS, *PSP_WRITE_REGISTERS;
-
-#define NS16550_TRANSMIT_BUFFER  0
-#define NS16550_FIFO_CONTROL     2
-
-/*
- * Define serial port interrupt enable register structure.
- */
-
-#define SP_INT_RX_ENABLE  0x01
-#define SP_INT_TX_ENABLE  0x02
-#define SP_INT_LS_ENABLE  0x04
-#define SP_INT_MS_ENABLE  0x08
-
-#define NS16550_ENABLE_ALL_INTR           (SP_INT_RX_ENABLE | SP_INT_TX_ENABLE)
-#define NS16550_DISABLE_ALL_INTR          0x00
-#define NS16550_ENABLE_ALL_INTR_EXCEPT_TX (SP_INT_RX_ENABLE)
-
-/*
- * Define serial port interrupt id register structure.
- */
-
-typedef struct _SP_INTERRUPT_ID {
-    unsigned char InterruptPending : 1;
-    unsigned char Identification : 3;
-    unsigned char Reserved1 : 2;
-    unsigned char FifoEnabled : 2;
-} SP_INTERRUPT_ID, *PSP_INTERRUPT_ID;
-
-/*
- * Define serial port fifo control register structure.
- */
-
-#define SP_FIFO_ENABLE  0x01
-#define SP_FIFO_RXRST 0x02
-#define SP_FIFO_TXRST 0x04
-#define SP_FIFO_DMA   0x08
-#define SP_FIFO_RXLEVEL 0xc0
-
-/*
- * Define serial port line control register structure.
- */
-
-#define SP_LINE_SIZE  0x03
-#define SP_LINE_STOP  0x04
-#define SP_LINE_PAR   0x08
-#define SP_LINE_ODD   0x10
-#define SP_LINE_STICK 0x20
-#define SP_LINE_BREAK 0x40
-#define SP_LINE_DLAB  0x80
-
-/*
- * Line status register character size definitions.
- */
-
-#define FIVE_BITS 0x0                   /* five bits per character */
-#define SIX_BITS 0x1                    /* six bits per character */
-#define SEVEN_BITS 0x2                  /* seven bits per character */
-#define EIGHT_BITS 0x3                  /* eight bits per character */
-
-/*
- * Line speed divisor definition.
- */
-
-#define NS16550_Baud(baud_rate) (115200/baud_rate)
-
-/*
- * Define serial port modem control register structure.
- */
-
-#define SP_MODEM_DTR  0x01
-#define SP_MODEM_RTS  0x02
-#define SP_MODEM_IRQ  0x08
-#define SP_MODEM_LOOP 0x10
-#define SP_MODEM_DIV4 0x80
-
-/*
- * Define serial port line status register structure.
- */
-
-#define SP_LSR_RDY    0x01
-#define SP_LSR_EOVRUN 0x02
-#define SP_LSR_EPAR   0x04
-#define SP_LSR_EFRAME 0x08
-#define SP_LSR_BREAK  0x10
-#define SP_LSR_THOLD  0x20
-#define SP_LSR_TX   0x40
-#define SP_LSR_EFIFO  0x80
-
-typedef struct _ns16550_context
-{
-        unsigned8       ucModemCtrl;
-} ns16550_context;
-
-/*
- * Driver functions
- */
-
-NS16550_STATIC boolean ns16550_probe(int minor);
-
-NS16550_STATIC void ns16550_init(int minor);
-
-NS16550_STATIC int ns16550_open(
-  int major,
-  int minor,
-  void  * arg
-);
-
-NS16550_STATIC int ns16550_close(
-  int major,
-  int minor,
-  void  * arg
-);
-
-NS16550_STATIC void ns16550_write_polled(
-  int   minor, 
-  char  cChar
-);
-
-NS16550_STATIC int ns16550_assert_RTS(
-  int minor
-);
-
-NS16550_STATIC int ns16550_negate_RTS(
-  int minor
-);
-
-NS16550_STATIC int ns16550_assert_DTR(
-  int minor
-);
-
-NS16550_STATIC int ns16550_negate_DTR(
-  int minor
-);
-
-NS16550_STATIC void ns16550_initialize_interrupts(int minor);
-
-NS16550_STATIC int ns16550_write_support_int(
-  int   minor,
-  const char *buf,
-  int   len
-);
-
-NS16550_STATIC int ns16550_write_support_polled(
-  int   minor,
-  const char *buf,
-  int   len
-  );
-
-NS16550_STATIC int ns16550_inbyte_nonblocking_polled(
-  int minor
-);
-
-NS16550_STATIC void ns16550_enable_interrupts(
-  int minor,
-  int mask
-);
-
-NS16550_STATIC int ns16550_set_attributes(
-  int                   minor,
-  const struct termios *t
-);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _NS16550_P_H_ */
diff --git a/c/src/libchip/serial/serial.h b/c/src/libchip/serial/serial.h
deleted file mode 100644
index aa0e7f58aa..0000000000
--- a/c/src/libchip/serial/serial.h
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- *  This file contains the TTY driver table definition
- *
- *  This driver uses the termios pseudo driver.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __LIBCHIP_SERIAL_h
-#define __LIBCHIP_SERIAL_h
-
-#include <termios.h>
-
-/*
- *  Types for get and set register routines
- */
-
-typedef unsigned8 (*getRegister_f)(unsigned32 port, unsigned8 register);
-typedef void      (*setRegister_f)(
-                            unsigned32 port, unsigned8 reg, unsigned8 value);
-typedef unsigned8 (*getData_f)(unsigned32 port);
-typedef void      (*setData_f)(unsigned32 port, unsigned8 value);
-
-typedef struct _console_fns {
-  boolean (*deviceProbe)(int minor);
-  int     (*deviceFirstOpen)(int major, int minor, void *arg);
-  int     (*deviceLastClose)(int major, int minor, void *arg);
-  int     (*deviceRead)(int minor);
-  int     (*deviceWrite)(int minor, const char *buf, int len);
-  void    (*deviceInitialize)(int minor);
-  void    (*deviceWritePolled)(int minor, char cChar);
-  int     (*deviceSetAttributes)(int minor, const struct termios *t);
-  int       deviceOutputUsesInterrupts;
-} console_fns;
-
-typedef struct _console_flow {
-  int (*deviceStopRemoteTx)(int minor);
-  int (*deviceStartRemoteTx)(int minor);
-} console_flow;
-
-typedef enum {
-  SERIAL_MC68681,              /* Motorola MC68681 or Exar 88681 */
-  SERIAL_NS16550,              /* National Semiconductor NS16550 */
-  SERIAL_Z85C30,               /* Zilog Z85C30 */
-  SERIAL_CUSTOM                /* BSP specific driver */
-} console_devs;
-
-/*
- * Each field is interpreted thus:
- * 
- * sDeviceName  This is the name of the device. 
- *
- * deviceType   This indicates the chip type.  It is especially important when
- *              multiple devices share the same interrupt vector and must be
- *              distinguished.
- *
- * pDeviceFns   This is a pointer to the set of driver routines to use.
- *
- * pDeviceFlow  This is a pointer to the set of flow control routines to
- *              use. Serial device drivers will typically supply RTSCTS
- *              and DTRCTS handshake routines for DCE to DCE communication,
- *              however for DCE to DTE communication, no such routines
- *              should be necessary as RTS will be driven automatically
- *              when the transmitter is active.
- *
- * ulMargin     The high water mark in the input buffer is set to the buffer
- *              size less ulMargin. Once this level is reached, the driver's
- *              flow control routine used to stop the remote transmitter will
- *              be called. This figure should be greater than or equal to
- *              the number of stages of FIFO between the transmitter and
- *              receiver. 
- *
- *              NOTE: At the current time, this parameter is hard coded
- *                    in termios and this number is ignored.
- *
- * ulHysteresis After the high water mark specified by ulMargin has been
- *              reached, the driver's routine to re-start the remote
- *              transmitter will be called once the level in the input
- *              buffer has fallen by ulHysteresis bytes.
- *
- *              NOTE: At the current time, this parameter is hard coded
- *                    in termios and this number is ignored.
- *
- * pDeviceParams This contains either device specific data or a pointer to a
- *              device specific structure containing additional information
- *              not provided in this table. 
- *
- * ulCtrlPort1  This is the primary control port number for the device. This
- *              may be used to specify different instances of the same device
- *              type.
- *
- * ulCtrlPort2  This is the secondary control port number, of use when a given
- *              device has more than one available channel.
- *
- * ulDataPort   This is the port number for the data port of the device
- *
- * getRegister  This is the routine used to read register values.
- *
- * setRegister  This is the routine used to write register values.
- *
- * getData      This is the routine used to read the data register (RX).
- *
- * setData      This is the routine used to write the data register (TX).
- *
- * ulClock      This is the baud rate clock speed.
- *
- * ulIntVector  This encodes the interrupt vector of the device.
- */
-
-typedef struct _console_tbl {
-  char          *sDeviceName;
-  console_devs   deviceType;
-  console_fns   *pDeviceFns;
-  boolean      (*deviceProbe)(int minor);
-  console_flow  *pDeviceFlow;
-  unsigned32     ulMargin;
-  unsigned32     ulHysteresis;
-  void          *pDeviceParams;
-  unsigned32     ulCtrlPort1;
-  unsigned32     ulCtrlPort2;
-  unsigned32     ulDataPort;
-  getRegister_f  getRegister;
-  setRegister_f  setRegister;
-  getData_f      getData;
-  setData_f      setData;
-  unsigned32     ulClock;
-  unsigned int   ulIntVector;
-} console_tbl;
-
-typedef struct _console_data {
-  void                   *termios_data;
-  volatile boolean        bActive;
-  /*
-   * This field may be used for any purpose required by the driver
-   */
-  void                   *pDeviceContext;
-} console_data;
-
-extern console_tbl  Console_Port_Tbl[];
-extern console_data Console_Port_Data[];
-extern unsigned long  Console_Port_Count;
-
-#endif
-/* end of include file */
diff --git a/c/src/libchip/serial/serprobe.c b/c/src/libchip/serial/serprobe.c
deleted file mode 100644
index b76bbebe3c..0000000000
--- a/c/src/libchip/serial/serprobe.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- *  $Id$
- */
-
-#include <rtems.h>
-#include <libchip/serial.h>
-#include "sersupp.h"
-
-boolean libchip_serial_default_probe(int minor)
-{
-  /*
-   * If the configuration dependent probe has located the device then
-   * assume it is there
-   */
-
-  return TRUE;
-}
-
-
-
diff --git a/c/src/libchip/serial/sersupp.h b/c/src/libchip/serial/sersupp.h
deleted file mode 100644
index a996d53c7c..0000000000
--- a/c/src/libchip/serial/sersupp.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- *  $Id$
- */
-
-#ifndef __LIBCHIP_SERIAL_SUPPORT_h
-#define __LIBCHIP_SERIAL_SUPPORT_h
-
-int termios_baud_to_index(
-  int termios_baud
-);
-
-int termios_baud_to_number(
-  int termios_baud
-);
-
-boolean libchip_serial_default_probe(
-  int minor
-);
-
-
-#endif
-/* end of include file */
diff --git a/c/src/libchip/serial/termios_baud2index.c b/c/src/libchip/serial/termios_baud2index.c
deleted file mode 100644
index b4bf3623a2..0000000000
--- a/c/src/libchip/serial/termios_baud2index.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- *  $Id$
- */
-
-#include <sys/termios.h>
-
-int termios_baud_to_index(
-  int termios_baud
-)
-{
-  int baud_index;
-
-  switch (termios_baud) {
-    case B0:        baud_index =  0;  break;
-    case B50:       baud_index =  1;  break;
-    case B75:       baud_index =  2;  break;
-    case B110:      baud_index =  3;  break;
-    case B134:      baud_index =  4;  break;
-    case B150:      baud_index =  5;  break;
-    case B200:      baud_index =  6;  break;
-    case B300:      baud_index =  7;  break;
-    case B600:      baud_index =  8;  break;
-    case B1200:     baud_index =  9;  break;
-    case B1800:     baud_index = 10;  break;
-    case B2400:     baud_index = 11;  break;
-    case B4800:     baud_index = 12;  break;
-    case B9600:     baud_index = 13;  break;
-    case B19200:    baud_index = 14;  break;
-    case B38400:    baud_index = 15;  break;
-    case B57600:    baud_index = 16;  break;
-    case B115200:   baud_index = 17;  break;
-    case B230400:   baud_index = 18;  break;
-    case B460800:   baud_index = 19;  break;
-    default:        baud_index = -1;  break;
-  }
-
-  return baud_index;
-}
-
diff --git a/c/src/libchip/serial/termios_baud2num.c b/c/src/libchip/serial/termios_baud2num.c
deleted file mode 100644
index 9c2ddc047e..0000000000
--- a/c/src/libchip/serial/termios_baud2num.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- *  $Id$
- */
-
-#include <sys/termios.h>
-
-int termios_baud_to_number(
-  int termios_baud
-)
-{
-  int baud;
-
-  switch (termios_baud) {
-    case B0:        baud =      0;  break;
-    case B50:       baud =     50;  break;
-    case B75:       baud =     75;  break;
-    case B110:      baud =    110;  break;
-    case B134:      baud =    135;  break;
-    case B150:      baud =    150;  break;
-    case B200:      baud =    200;  break;
-    case B300:      baud =    300;  break;
-    case B600:      baud =    600;  break;
-    case B1200:     baud =   1200;  break;
-    case B1800:     baud =   1800;  break;
-    case B2400:     baud =   2400;  break;
-    case B4800:     baud =   4800;  break;
-    case B9600:     baud =   9600;  break;
-    case B19200:    baud =  19200;  break;
-    case B38400:    baud =  38400;  break;
-    case B57600:    baud =  57600;  break;
-    case B115200:   baud = 115200;  break;
-    case B230400:   baud = 230400;  break;
-    case B460800:   baud = 460800;  break;
-    default:        baud =     -1;  break;
-  }
-
-  return baud;
-}
-
diff --git a/c/src/libchip/serial/z85c30.c b/c/src/libchip/serial/z85c30.c
deleted file mode 100644
index a4f3aaceee..0000000000
--- a/c/src/libchip/serial/z85c30.c
+++ /dev/null
@@ -1,888 +0,0 @@
-/*
- *  This file contains the console driver chip level routines for the
- *  Zilog z85c30 chip.
- *
- *  The Zilog Z8530 is also available as:
- *
- *    + Intel 82530
- *    + AMD ???
- *
- *  COPYRIGHT (c) 1998 by Radstone Technology
- *
- *
- * THIS FILE IS PROVIDED TO YOU, THE USER, "AS IS", WITHOUT WARRANTY OF ANY
- * KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTY OF FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK
- * AS TO THE QUALITY AND PERFORMANCE OF ALL CODE IN THIS FILE IS WITH YOU.
- *
- * You are hereby granted permission to use, copy, modify, and distribute
- * this file, provided that this notice, plus the above copyright notice
- * and disclaimer, appears in all copies. Radstone Technology will provide
- * no support for this code.
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems.h>
-#include <rtems/libio.h>
-#include <stdlib.h>
-
-#include <libchip/serial.h>
-#include "z85c30_p.h"
-#include "sersupp.h"
-
-/*
- * Flow control is only supported when using interrupts
- */
-
-console_flow z85c30_flow_RTSCTS = {
-  z85c30_negate_RTS,    /* deviceStopRemoteTx */
-  z85c30_assert_RTS     /* deviceStartRemoteTx */
-};
-
-console_flow z85c30_flow_DTRCTS = {
-  z85c30_negate_DTR,    /* deviceStopRemoteTx */
-  z85c30_assert_DTR     /* deviceStartRemoteTx */
-};
-
-/*
- * Exported driver function table
- */
-
-console_fns z85c30_fns = {
-  libchip_serial_default_probe,  /* deviceProbe */
-  z85c30_open,                   /* deviceFirstOpen */
-  NULL,                          /* deviceLastClose */
-  NULL,                          /* deviceRead */
-  z85c30_write_support_int,      /* deviceWrite */
-  z85c30_initialize_interrupts,  /* deviceInitialize */
-  z85c30_write_polled,           /* deviceWritePolled */
-  NULL,                          /* deviceSetAttributes */
-  TRUE                           /* deviceOutputUsesInterrupts */
-};
-
-console_fns z85c30_fns_polled = {
-  libchip_serial_default_probe,      /* deviceProbe */
-  z85c30_open,                       /* deviceFirstOpen */
-  z85c30_close,                      /* deviceLastClose */
-  z85c30_inbyte_nonblocking_polled,  /* deviceRead */
-  z85c30_write_support_polled,       /* deviceWrite */
-  z85c30_init,                       /* deviceInitialize */
-  z85c30_write_polled,               /* deviceWritePolled */
-  NULL,                              /* deviceSetAttributes */
-  FALSE                              /* deviceOutputUsesInterrupts */
-};
-
-extern void set_vector( rtems_isr_entry, rtems_vector_number, int );
-
-/* 
- *  z85c30_initialize_port
- *
- *  initialize a z85c30 Port
- */
-
-Z85C30_STATIC void z85c30_initialize_port(
-  int minor
-)
-{
-  unsigned32      ulCtrlPort;
-  unsigned32      ulBaudDivisor;
-  setRegister_f   setReg;
-
-  ulCtrlPort = Console_Port_Tbl[minor].ulCtrlPort1;
-  setReg   = Console_Port_Tbl[minor].setRegister;
-
-  /*
-   * Using register 4
-   * Set up the clock rate is 16 times the data
-   * rate, 8 bit sync char, 1 stop bit, no parity
-   */
-
-  (*setReg)( ulCtrlPort, SCC_WR0_SEL_WR4, SCC_WR4_1_STOP | SCC_WR4_16_CLOCK );
-
-  /*
-   * Set up for 8 bits/character on receive with
-   * receiver disable via register 3
-   */
-  (*setReg)( ulCtrlPort, SCC_WR0_SEL_WR3, SCC_WR3_RX_8_BITS );
-
-  /*
-   * Set up for 8 bits/character on transmit
-   * with transmitter disable via register 5
-   */
-  (*setReg)( ulCtrlPort, SCC_WR0_SEL_WR5, SCC_WR5_TX_8_BITS );
-
-  /*
-   * Clear misc control bits
-   */
-  (*setReg)( ulCtrlPort, SCC_WR0_SEL_WR10, 0x00 );
-
-  /*
-   * Setup the source of the receive and xmit
-   * clock as BRG output and the transmit clock
-   * as the output source for TRxC pin via register 11
-   */
-  (*setReg)(
-    ulCtrlPort,
-    SCC_WR0_SEL_WR11,
-    SCC_WR11_OUT_BR_GEN | SCC_WR11_TRXC_OI | 
-      SCC_WR11_TX_BR_GEN | SCC_WR11_RX_BR_GEN
-  );
-
-  ulBaudDivisor = Z85C30_Baud( 
-    (unsigned32) Console_Port_Tbl[minor].ulClock,
-    (unsigned32) Console_Port_Tbl[minor].pDeviceParams
-  );
-
-  /*
-   * Setup the lower 8 bits time constants=1E.
-   * If the time constans=1E, then the desire
-   * baud rate will be equilvalent to 9600, via register 12.
-   */
-  (*setReg)( ulCtrlPort, SCC_WR0_SEL_WR12, ulBaudDivisor & 0xff );
-
-  /*
-   * using register 13
-   * Setup the upper 8 bits time constant
-   */
-  (*setReg)( ulCtrlPort, SCC_WR0_SEL_WR13, (ulBaudDivisor>>8) & 0xff );
-           
-  /*
-   * Enable the baud rate generator enable with clock from the
-   * SCC's PCLK input via register 14.
-   */
-  (*setReg)(
-    ulCtrlPort,
-    SCC_WR0_SEL_WR14,
-    SCC_WR14_BR_EN | SCC_WR14_BR_SRC | SCC_WR14_NULL
-  );
-
-  /*
-   * We are only interested in CTS state changes
-   */
-  (*setReg)( ulCtrlPort, SCC_WR0_SEL_WR15, SCC_WR15_CTS_IE );
-
-  /*
-   * Reset errors
-   */
-  (*setReg)( ulCtrlPort, SCC_WR0_SEL_WR0, SCC_WR0_RST_INT );
-
-  (*setReg)( ulCtrlPort, SCC_WR0_SEL_WR0, SCC_WR0_ERR_RST );
-
-  /*
-   * Enable the receiver via register 3
-   */
-  (*setReg)( ulCtrlPort, SCC_WR0_SEL_WR3, SCC_WR3_RX_8_BITS | SCC_WR3_RX_EN );
-
-  /*
-   * Enable the transmitter pins set via register 5.
-   */
-  (*setReg)( ulCtrlPort, SCC_WR0_SEL_WR5, SCC_WR5_TX_8_BITS | SCC_WR5_TX_EN );
-
-  /*
-   * Disable interrupts
-   */
-  (*setReg)( ulCtrlPort, SCC_WR0_SEL_WR1, 0 );
-
-  /*
-   * Reset TX CRC
-   */
-  (*setReg)( ulCtrlPort, SCC_WR0_SEL_WR0, SCC_WR0_RST_TX_CRC );
-
-  /*
-   * Reset interrupts
-   */
-  (*setReg)( ulCtrlPort, SCC_WR0_SEL_WR0, SCC_WR0_RST_INT );
-}
-
-/*
- *  z85c30_open
- */
-
-Z85C30_STATIC int z85c30_open(
-  int   major,
-  int   minor,
-  void *arg
-)
-{
-
-  z85c30_initialize_port(minor);
-
-  /*
-   * Assert DTR
-   */
-
-  if (Console_Port_Tbl[minor].pDeviceFlow !=&z85c30_flow_DTRCTS) {
-    z85c30_assert_DTR(minor);
-  }
-
-  return(RTEMS_SUCCESSFUL);
-}
-
-/*
- *  z85c30_close
- */
-
-Z85C30_STATIC int z85c30_close(
-  int   major,
-  int   minor,
-  void *arg
-)
-{
-  /*
-   * Negate DTR
-   */
-
-  if (Console_Port_Tbl[minor].pDeviceFlow !=&z85c30_flow_DTRCTS) {
-    z85c30_negate_DTR(minor);
-  }
-
-  return(RTEMS_SUCCESSFUL);
-}
-
-/*
- *  z85c30_init
- */
-
-Z85C30_STATIC void z85c30_init(int minor)
-{
-  unsigned32       ulCtrlPort;
-  unsigned8        dummy;
-  z85c30_context  *pz85c30Context;
-  setRegister_f    setReg;
-  getRegister_f    getReg;
-
-  setReg = Console_Port_Tbl[minor].setRegister;
-  getReg   = Console_Port_Tbl[minor].getRegister;
-
-  pz85c30Context = (z85c30_context *)malloc(sizeof(z85c30_context));
-
-  Console_Port_Data[minor].pDeviceContext = (void *)pz85c30Context;
-
-  pz85c30Context->ucModemCtrl = SCC_WR5_TX_8_BITS | SCC_WR5_TX_EN;
-
-  ulCtrlPort = Console_Port_Tbl[minor].ulCtrlPort1;
-  if ( ulCtrlPort == Console_Port_Tbl[minor].ulCtrlPort2 ) {
-    /*
-     * This is channel A
-     */
-    /*
-     * Ensure port state machine is reset
-     */
-    dummy = (*getReg)(ulCtrlPort, SCC_WR0_SEL_RD0);
-
-    (*setReg)(ulCtrlPort, SCC_WR0_SEL_WR9, SCC_WR9_CH_A_RST);
-
-  } else {
-    /*
-     * This is channel B
-     */
-    /*
-     * Ensure port state machine is reset
-     */
-    dummy = (*getReg)(ulCtrlPort, SCC_WR0_SEL_RD0);
-
-    (*setReg)(ulCtrlPort, SCC_WR0_SEL_WR9, SCC_WR9_CH_B_RST);
-  }
-}
-
-/*
- * These routines provide control of the RTS and DTR lines
- */
-
-/*
- *  z85c30_assert_RTS
- */
-
-Z85C30_STATIC int z85c30_assert_RTS(int minor)
-{
-  rtems_interrupt_level  Irql;
-  z85c30_context        *pz85c30Context;
-  setRegister_f          setReg;
-
-  setReg = Console_Port_Tbl[minor].setRegister;
-
-  pz85c30Context = (z85c30_context *) Console_Port_Data[minor].pDeviceContext;
-  
-  /*
-   * Assert RTS
-   */
-
-  rtems_interrupt_disable(Irql);
-    pz85c30Context->ucModemCtrl|=SCC_WR5_RTS;
-    (*setReg)(
-      Console_Port_Tbl[minor].ulCtrlPort1,
-      SCC_WR0_SEL_WR5,
-      pz85c30Context->ucModemCtrl
-    );
-  rtems_interrupt_enable(Irql);
-  return 0;
-}
-
-/*
- *  z85c30_negate_RTS
- */
-
-Z85C30_STATIC int z85c30_negate_RTS(int minor)
-{
-  rtems_interrupt_level  Irql;
-  z85c30_context        *pz85c30Context;
-  setRegister_f          setReg;
-
-  setReg = Console_Port_Tbl[minor].setRegister;
-
-  pz85c30Context = (z85c30_context *) Console_Port_Data[minor].pDeviceContext;
-  
-  /*
-   * Negate RTS
-   */
-
-  rtems_interrupt_disable(Irql);
-    pz85c30Context->ucModemCtrl&=~SCC_WR5_RTS;
-    (*setReg)(
-      Console_Port_Tbl[minor].ulCtrlPort1,
-      SCC_WR0_SEL_WR5,
-      pz85c30Context->ucModemCtrl
-    );
-  rtems_interrupt_enable(Irql);
-  return 0;
-}
-
-/*
- * These flow control routines utilise a connection from the local DTR
- * line to the remote CTS line
- */
-
-/*
- *  z85c30_assert_DTR
- */
-
-Z85C30_STATIC int z85c30_assert_DTR(int minor)
-{
-  rtems_interrupt_level  Irql;
-  z85c30_context        *pz85c30Context;
-  setRegister_f          setReg;
-
-  setReg = Console_Port_Tbl[minor].setRegister;
-
-  pz85c30Context = (z85c30_context *) Console_Port_Data[minor].pDeviceContext;
-  
-  /*
-   * Assert DTR
-   */
-
-  rtems_interrupt_disable(Irql);
-    pz85c30Context->ucModemCtrl|=SCC_WR5_DTR;
-    (*setReg)(
-      Console_Port_Tbl[minor].ulCtrlPort1,
-      SCC_WR0_SEL_WR5,
-      pz85c30Context->ucModemCtrl
-  );
-  rtems_interrupt_enable(Irql);
-  return 0;
-}
-
-/*
- *  z85c30_negate_DTR
- */
-
-Z85C30_STATIC int z85c30_negate_DTR(int minor)
-{
-  rtems_interrupt_level  Irql;
-  z85c30_context        *pz85c30Context;
-  setRegister_f          setReg;
-
-  setReg = Console_Port_Tbl[minor].setRegister;
-
-  pz85c30Context = (z85c30_context *) Console_Port_Data[minor].pDeviceContext;
-  
-  /*
-   * Negate DTR
-   */
-
-  rtems_interrupt_disable(Irql);
-    pz85c30Context->ucModemCtrl&=~SCC_WR5_DTR;
-    (*setReg)(
-      Console_Port_Tbl[minor].ulCtrlPort1,
-      SCC_WR0_SEL_WR5,
-      pz85c30Context->ucModemCtrl
-  );
-  rtems_interrupt_enable(Irql);
-  return 0;
-}
-
-/*
- *  z85c30_set_attributes
- *
- *  This function sets the SCC channel to reflect the requested termios
- *  port settings.
- */
-
-Z85C30_STATIC int z85c30_set_attributes(
-  int                   minor,
-  const struct termios *t
-)
-{
-  unsigned32             ulCtrlPort;
-  unsigned32             ulBaudDivisor;
-  unsigned32             wr3;
-  unsigned32             wr4;
-  unsigned32             wr5;
-  int                    baud_requested;
-  setRegister_f          setReg;
-  rtems_interrupt_level  Irql;
-
-  ulCtrlPort = Console_Port_Tbl[minor].ulCtrlPort1;
-  setReg     = Console_Port_Tbl[minor].setRegister;
-
-  /*
-   *  Calculate the baud rate divisor
-   */
-
-  baud_requested = t->c_cflag & CBAUD;
-  if (!baud_requested)
-    baud_requested = B9600;              /* default to 9600 baud */
-
-  ulBaudDivisor = Z85C30_Baud( 
-    (unsigned32) Console_Port_Tbl[minor].ulClock,
-    (unsigned32) termios_baud_to_number( baud_requested )
-  );
-
-  wr3 = SCC_WR3_RX_EN;
-  wr4 = SCC_WR4_16_CLOCK;
-  wr5 = SCC_WR5_TX_EN;
-
-  /*
-   *  Parity
-   */
-
-  if (t->c_cflag & PARENB) {
-    wr4 |= SCC_WR4_PAR_EN;
-    if (!(t->c_cflag & PARODD))
-      wr4 |= SCC_WR4_PAR_EVEN;
-  } 
-
-  /*
-   *  Character Size
-   */
-
-  if (t->c_cflag & CSIZE) {
-    switch (t->c_cflag & CSIZE) {
-      case CS5:   break;
-      case CS6:  wr3 |= SCC_WR3_RX_6_BITS;  wr5 |= SCC_WR5_TX_6_BITS;  break;
-      case CS7:  wr3 |= SCC_WR3_RX_7_BITS;  wr5 |= SCC_WR5_TX_7_BITS;  break;
-      case CS8:  wr3 |= SCC_WR3_RX_8_BITS;  wr5 |= SCC_WR5_TX_8_BITS;  break;
-    }
-  } else {
-    wr3 |= SCC_WR3_RX_8_BITS;       /* default to 9600,8,N,1 */
-    wr5 |= SCC_WR5_TX_8_BITS;       /* default to 9600,8,N,1 */
-  }
-
-  /*
-   *  Stop Bits
-   */
-
-  if (t->c_cflag & CSTOPB) {
-    wr4 |= SCC_WR4_2_STOP;                      /* 2 stop bits */
-  } else {
-    wr4 |= SCC_WR4_1_STOP;                      /* 1 stop bits */
-  }
-
-  /*
-   *  Now actually set the chip
-   */
-
-  rtems_interrupt_disable(Irql);
-    (*setReg)( ulCtrlPort, SCC_WR0_SEL_WR4, wr4 );
-    (*setReg)( ulCtrlPort, SCC_WR0_SEL_WR3, wr3 );
-    (*setReg)( ulCtrlPort, SCC_WR0_SEL_WR5, wr5 );
-
-    /*
-     * Setup the lower 8 bits time constants=1E.
-     * If the time constans=1E, then the desire
-     * baud rate will be equilvalent to 9600, via register 12.
-     */
-
-    (*setReg)( ulCtrlPort, SCC_WR0_SEL_WR12, ulBaudDivisor & 0xff );
-
-    /*
-     * using register 13
-     * Setup the upper 8 bits time constant
-     */
-
-    (*setReg)( ulCtrlPort, SCC_WR0_SEL_WR13, (ulBaudDivisor>>8) & 0xff );
-
-  rtems_interrupt_enable(Irql);
-
-  return 0;
-}
-
-/*
- *  z85c30_process
- *
- *  This is the per port ISR handler.
- */
-
-Z85C30_STATIC void z85c30_process(
-  int        minor,
-  unsigned8  ucIntPend
-)
-{
-  unsigned32          ulCtrlPort;
-  volatile unsigned8  z85c30_status;
-  unsigned char       cChar;
-  setRegister_f       setReg;
-  getRegister_f       getReg;
-
-  ulCtrlPort = Console_Port_Tbl[minor].ulCtrlPort1;
-  setReg     = Console_Port_Tbl[minor].setRegister;
-  getReg     = Console_Port_Tbl[minor].getRegister;
-
-  /*
-   * Deal with any received characters
-   */
-
-  while (ucIntPend&SCC_RR3_B_RX_IP)
-  {
-    z85c30_status = (*getReg)(ulCtrlPort, SCC_WR0_SEL_RD0);
-    if (!Z85C30_Status_Is_RX_character_available(z85c30_status)) {
-      break;
-    }
-
-    /*
-     * Return the character read.
-     */
-
-    cChar = (*getReg)(ulCtrlPort, SCC_WR0_SEL_RD8);
-
-    rtems_termios_enqueue_raw_characters(
-      Console_Port_Data[minor].termios_data,
-      &cChar,
-      1
-    );
-  }
-
-  /*
-   *  There could be a race condition here if there is not yet a TX
-   *  interrupt pending but the buffer is empty.  This condition has
-   *  been seen before on other z8530 drivers but has not been seen
-   *  with this one.  The typical solution is to use "vector includes
-   *  status" or to only look at the interrupts actually pending
-   *  in RR3.
-   */
-
-  while (TRUE) {
-    z85c30_status = (*getReg)(ulCtrlPort, SCC_WR0_SEL_RD0);
-    if (!Z85C30_Status_Is_TX_buffer_empty(z85c30_status)) {
-      /*
-       * We'll get another interrupt when
-       * the transmitter holding reg. becomes
-       * free again and we are clear to send
-       */
-      break;
-    }
-  
-#if 0
-    if (!Z85C30_Status_Is_CTS_asserted(z85c30_status)) {
-      /*
-       * We can't transmit yet
-       */
-      (*setReg)(ulCtrlPort, SCC_WR0_SEL_WR0, SCC_WR0_RST_TX_INT);
-      /*
-       * The next state change of CTS will wake us up
-       */
-      break;
-    }
-#endif
-  
-    rtems_termios_dequeue_characters(Console_Port_Data[minor].termios_data, 1);
-    if (rtems_termios_is_more_to_tx( Console_Port_Data[minor].termios_data )) {
-      if (Console_Port_Tbl[minor].pDeviceFlow != &z85c30_flow_RTSCTS) {
-        z85c30_negate_RTS(minor);
-      }
-      Console_Port_Data[minor].bActive = FALSE;
-      z85c30_enable_interrupts(minor, SCC_ENABLE_ALL_INTR_EXCEPT_TX);
-      (*setReg)(ulCtrlPort, SCC_WR0_SEL_WR0, SCC_WR0_RST_TX_INT);
-      break;
-    }
-
-  }
-
-  if (ucIntPend & SCC_RR3_B_EXT_IP) {
-    /*
-     * Clear the external status interrupt
-     */
-    (*setReg)(ulCtrlPort, SCC_WR0_SEL_WR0, SCC_WR0_RST_INT);
-    z85c30_status = (*getReg)(ulCtrlPort, SCC_WR0_SEL_RD0);
-  }
-
-  /*
-   * Reset interrupts
-   */
-  (*setReg)(ulCtrlPort, SCC_WR0_SEL_WR0, SCC_WR0_RST_HI_IUS);
-}
-
-/*
- *  z85c30_isr
- *
- *  This is the ISR handler for each Z8530.
- */
-
-Z85C30_STATIC rtems_isr z85c30_isr(
-  rtems_vector_number vector
-)
-{
-  int                 minor;
-  unsigned32          ulCtrlPort;
-  volatile unsigned8  ucIntPend;
-  volatile unsigned8  ucIntPendPort;
-  getRegister_f       getReg;
-
-  for (minor=0;minor<Console_Port_Count;minor++) {
-    if(Console_Port_Tbl[minor].ulIntVector == vector && 
-       Console_Port_Tbl[minor].deviceType == SERIAL_Z85C30 ) {
-      ulCtrlPort = Console_Port_Tbl[minor].ulCtrlPort2;
-      getReg     = Console_Port_Tbl[minor].getRegister;
-      do {
-        ucIntPend = (*getReg)(ulCtrlPort, SCC_WR0_SEL_RD3);
-
-          /*
-           * If this is channel A select channel A status
-           */
-
-          if (ulCtrlPort == Console_Port_Tbl[minor].ulCtrlPort1) {
-            ucIntPendPort = ucIntPend>>3;
-            ucIntPendPort = ucIntPendPort&=7;
-          } else {
-            ucIntPendPort = ucIntPend &= 7;
-          }
-
-          if (ucIntPendPort) {
-            z85c30_process(minor, ucIntPendPort);
-          }
-      } while (ucIntPendPort);
-    }
-  }
-}
-
-/*
- *  z85c30_enable_interrupts
- *
- *  This routine enables the specified interrupts for this minor.
- */
-
-Z85C30_STATIC void z85c30_enable_interrupts(
-  int minor,
-  int interrupt_mask
-)
-{
-  unsigned32     ulCtrlPort;
-  setRegister_f  setReg;
-
-  ulCtrlPort = Console_Port_Tbl[minor].ulCtrlPort1;
-  setReg     = Console_Port_Tbl[minor].setRegister;
-
-  (*setReg)(ulCtrlPort, SCC_WR0_SEL_WR1, interrupt_mask);
-}
-
-/*
- *  z85c30_initialize_interrupts
- *
- *  This routine initializes the port to use interrupts.
- */
-
-Z85C30_STATIC void z85c30_initialize_interrupts(
-  int minor
-)
-{
-  unsigned32     ulCtrlPort1;
-  unsigned32     ulCtrlPort2;
-  setRegister_f  setReg;
-
-  ulCtrlPort1 = Console_Port_Tbl[minor].ulCtrlPort1;
-  ulCtrlPort2 = Console_Port_Tbl[minor].ulCtrlPort2;
-  setReg      = Console_Port_Tbl[minor].setRegister;
-
-
-  z85c30_init(minor);
-
-  Console_Port_Data[minor].bActive=FALSE;
-
-  z85c30_initialize_port( minor );
-
-  if (Console_Port_Tbl[minor].pDeviceFlow != &z85c30_flow_RTSCTS) {
-    z85c30_negate_RTS(minor);
-  }
-
-  set_vector(z85c30_isr, Console_Port_Tbl[minor].ulIntVector, 1);
-
-  z85c30_enable_interrupts(minor, SCC_ENABLE_ALL_INTR_EXCEPT_TX);
-
-  (*setReg)(ulCtrlPort1, SCC_WR0_SEL_WR2, 0);              /* XXX vector */
-  (*setReg)(ulCtrlPort1, SCC_WR0_SEL_WR9, SCC_WR9_MIE);
-
-  /*
-   * Reset interrupts
-   */
-
-  (*setReg)(ulCtrlPort1, SCC_WR0_SEL_WR0, SCC_WR0_RST_INT);
-}
-
-/* 
- *  z85c30_write_support_int
- *
- *  Console Termios output entry point.
- *
- */
-
-Z85C30_STATIC int z85c30_write_support_int(
-  int   minor, 
-  const char *buf, 
-  int   len)
-{
-  unsigned32     Irql;
-  unsigned32     ulCtrlPort;
-  setRegister_f  setReg;
-
-  ulCtrlPort = Console_Port_Tbl[minor].ulCtrlPort1;
-  setReg     = Console_Port_Tbl[minor].setRegister;
-
-  /*
-   *  We are using interrupt driven output and termios only sends us
-   *  one character at a time.
-   */
-
-  if ( !len )
-    return 0;
-
-  /*
-   *  Put the character out and enable interrupts if necessary.
-   */
-
-  if (Console_Port_Tbl[minor].pDeviceFlow != &z85c30_flow_RTSCTS) {
-    z85c30_assert_RTS(minor);
-  }
-  rtems_interrupt_disable(Irql);
-    if ( Console_Port_Data[minor].bActive == FALSE) {
-      Console_Port_Data[minor].bActive = TRUE;
-      z85c30_enable_interrupts(minor, SCC_ENABLE_ALL_INTR);
-    }
-    (*setReg)(ulCtrlPort, SCC_WR0_SEL_WR8, *buf);
-  rtems_interrupt_enable(Irql);
-
-  return 1;
-}
-
-/* 
- *  z85c30_inbyte_nonblocking_polled
- *
- *  This routine polls for a character.
- */
-
-Z85C30_STATIC int z85c30_inbyte_nonblocking_polled(
-  int  minor
-)
-{
-  volatile unsigned8  z85c30_status;
-  unsigned32          ulCtrlPort;
-  getRegister_f       getReg;
-
-  ulCtrlPort = Console_Port_Tbl[minor].ulCtrlPort1;
-  getReg     = Console_Port_Tbl[minor].getRegister;
-
-  /*
-   * return -1 if a character is not available.
-   */
-  z85c30_status = (*getReg)(ulCtrlPort, SCC_WR0_SEL_RD0);
-  if (!Z85C30_Status_Is_RX_character_available(z85c30_status)) {
-    return -1;
-  }
-
-  /*
-   * Return the character read.
-   */
-
-  return (*getReg)(ulCtrlPort, SCC_WR0_SEL_RD8);
-}
-
-/* 
- *  z85c30_write_support_polled
- *
- *  Console Termios output entry point.
- *
- */
-
-Z85C30_STATIC int z85c30_write_support_polled(
-  int   minor,
-  const char *buf,
-  int   len)
-{
-  int nwrite=0;
-
-  /*
-   * poll each byte in the string out of the port.
-   */
-  while (nwrite < len) {
-    z85c30_write_polled(minor, *buf++);
-    nwrite++;
-  }
-
-  /*
-   * return the number of bytes written.
-   */
-  return nwrite;
-}
-
-/* 
- *  z85c30_write_polled
- *
- *  This routine transmits a character using polling.
- */
-
-Z85C30_STATIC void z85c30_write_polled(
-  int   minor,
-  char  cChar
-)
-{
-  volatile unsigned8 z85c30_status;
-  unsigned32         ulCtrlPort;
-  getRegister_f      getReg;
-  setRegister_f      setReg;
-
-  ulCtrlPort = Console_Port_Tbl[minor].ulCtrlPort1;
-  getReg     = Console_Port_Tbl[minor].getRegister;
-  setReg     = Console_Port_Tbl[minor].setRegister;
-
-  /*
-   * Wait for the Transmit buffer to indicate that it is empty.
-   */
-
-  z85c30_status = (*getReg)( ulCtrlPort, SCC_WR0_SEL_RD0 );
-
-  while (!Z85C30_Status_Is_TX_buffer_empty(z85c30_status)) {
-    /*
-     * Yield while we wait
-     */
-#if 0
-    if (_System_state_Is_up(_System_state_Get())) {
-      rtems_task_wake_after(RTEMS_YIELD_PROCESSOR);
-    }
-#endif
-    z85c30_status = (*getReg)(ulCtrlPort, SCC_WR0_SEL_RD0);
-  }
-
-  /*
-   * Write the character.
-   */
-
-  (*setReg)( ulCtrlPort, SCC_WR0_SEL_WR8, cChar );
-}
-
diff --git a/c/src/libchip/serial/z85c30.h b/c/src/libchip/serial/z85c30.h
deleted file mode 100644
index f1beeef5e0..0000000000
--- a/c/src/libchip/serial/z85c30.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- *  This include file contains all console driver definitions for the
- *  Zilog z85c30.
- *
- *  COPYRIGHT (c) 1998 by Radstone Technology
- *
- *
- * THIS FILE IS PROVIDED TO YOU, THE USER, "AS IS", WITHOUT WARRANTY OF ANY
- * KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTY OF FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK
- * AS TO THE QUALITY AND PERFORMANCE OF ALL CODE IN THIS FILE IS WITH YOU.
- *
- * You are hereby granted permission to use, copy, modify, and distribute
- * this file, provided that this notice, plus the above copyright notice
- * and disclaimer, appears in all copies. Radstone Technology will provide
- * no support for this code.
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id: 
- */
-
-#ifndef __Z85C30_H
-#define __Z85C30_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- *  Driver function table
- */
-
-extern console_fns z85c30_fns;
-extern console_fns z85c30_fns_polled;
-
-/*
- *  Flow control function tables
- */
-
-extern console_flow z85c30_flow_RTSCTS;
-extern console_flow z85c30_flow_DTRCTS;
-
-/*
- * Default register access routines
- */
-
-unsigned8 z85c30_get_register(   /* registers are byte-wide */
-  unsigned32  ulCtrlPort,
-  unsigned8   ucRegNum
-);
-
-void z85c30_set_register(
-  unsigned32  ulCtrlPort,
-  unsigned8   ucRegNum,
-  unsigned8   ucData
-);
-
-unsigned8 z85c30_get_data(
-  unsigned32  ulDataPort
-);
-
-void z85c30_set_data(
-  unsigned32  ulDataPort,
-  unsigned8   ucData
-);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/c/src/libchip/serial/z85c30_p.h b/c/src/libchip/serial/z85c30_p.h
deleted file mode 100644
index 0076fbeaef..0000000000
--- a/c/src/libchip/serial/z85c30_p.h
+++ /dev/null
@@ -1,410 +0,0 @@
-/*
- *  This include file contains all private driver definitions for the
- *  Zilog z85c30.
- *
- *  COPYRIGHT (c) 1998 by Radstone Technology
- *
- *
- * THIS FILE IS PROVIDED TO YOU, THE USER, "AS IS", WITHOUT WARRANTY OF ANY
- * KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTY OF FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK
- * AS TO THE QUALITY AND PERFORMANCE OF ALL CODE IN THIS FILE IS WITH YOU.
- *
- * You are hereby granted permission to use, copy, modify, and distribute
- * this file, provided that this notice, plus the above copyright notice
- * and disclaimer, appears in all copies. Radstone Technology will provide
- * no support for this code.
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __Z85C30_P_H
-#define __Z85C30_P_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- *  Define Z85C30_STATIC to nothing while debugging so the entry points
- *  will show up in the symbol table.
- */
-
-#define Z85C30_STATIC
-
-/* #define Z85C30_STATIC static */
-
-/* bit values for write register 0 */
-/* command register */
-
-#define SCC_WR0_SEL_WR0   0x00
-#define SCC_WR0_SEL_WR1   0x01
-#define SCC_WR0_SEL_WR2   0x02
-#define SCC_WR0_SEL_WR3   0x03
-#define SCC_WR0_SEL_WR4   0x04
-#define SCC_WR0_SEL_WR5   0x05
-#define SCC_WR0_SEL_WR6   0x06
-#define SCC_WR0_SEL_WR7   0x07
-#define SCC_WR0_SEL_WR8   0x08
-#define SCC_WR0_SEL_WR9   0x09
-#define SCC_WR0_SEL_WR10  0x0a
-#define SCC_WR0_SEL_WR11  0x0b
-#define SCC_WR0_SEL_WR12  0x0c
-#define SCC_WR0_SEL_WR13  0x0d
-#define SCC_WR0_SEL_WR14  0x0e
-#define SCC_WR0_SEL_WR15  0x0f
-#define SCC_WR0_SEL_RD0   0x00
-#define SCC_WR0_SEL_RD1   0x01
-#define SCC_WR0_SEL_RD2   0x02
-#define SCC_WR0_SEL_RD3   0x03
-#define SCC_WR0_SEL_RD4   0x04
-#define SCC_WR0_SEL_RD5   0x05
-#define SCC_WR0_SEL_RD6   0x06
-#define SCC_WR0_SEL_RD7   0x07
-#define SCC_WR0_SEL_RD8   0x08
-#define SCC_WR0_SEL_RD9   0x09
-#define SCC_WR0_SEL_RD10  0x0a
-#define SCC_WR0_SEL_RD11  0x0b
-#define SCC_WR0_SEL_RD12  0x0c
-#define SCC_WR0_SEL_RD13  0x0d
-#define SCC_WR0_SEL_RD14  0x0e
-#define SCC_WR0_SEL_RD15  0x0f
-#define SCC_WR0_NULL_CODE 0x00
-#define SCC_WR0_RST_INT   0x10
-#define SCC_WR0_SEND_ABORT  0x18
-#define SCC_WR0_EN_INT_RX 0x20
-#define SCC_WR0_RST_TX_INT  0x28
-#define SCC_WR0_ERR_RST   0x30
-#define SCC_WR0_RST_HI_IUS  0x38
-#define SCC_WR0_RST_RX_CRC  0x40
-#define SCC_WR0_RST_TX_CRC  0x80
-#define SCC_WR0_RST_TX_UND  0xc0
-
-/* write register 2 */
-/* interrupt vector */
-
-/* bit values for write register 1 */
-/* tx/rx interrupt and data transfer mode definition */
-
-#define SCC_WR1_EXT_INT_EN  0x01
-#define SCC_WR1_TX_INT_EN   0x02
-#define SCC_WR1_PARITY      0x04
-#define SCC_WR1_RX_INT_DIS  0x00
-#define SCC_WR1_RX_INT_FIR  0x08
-#define SCC_WR1_INT_ALL_RX  0x10
-#define SCC_WR1_RX_INT_SPE  0x18
-#define SCC_WR1_RDMA_RECTR  0x20
-#define SCC_WR1_RDMA_FUNC   0x40
-#define SCC_WR1_RDMA_EN     0x80
-
-#define SCC_ENABLE_ALL_INTR \
-    (SCC_WR1_EXT_INT_EN | SCC_WR1_TX_INT_EN | SCC_WR1_INT_ALL_RX)
-
-#define SCC_DISABLE_ALL_INTR 0x00
-
-#define SCC_ENABLE_ALL_INTR_EXCEPT_TX \
-    (SCC_WR1_EXT_INT_EN | SCC_WR1_INT_ALL_RX)
-
-/* bit values for write register 3 */
-/* receive parameters and control */
-
-#define SCC_WR3_RX_EN   0x01
-#define SCC_WR3_SYNC_CHAR 0x02
-#define SCC_WR3_ADR_SEARCH  0x04
-#define SCC_WR3_RX_CRC_EN 0x08
-#define SCC_WR3_ENTER_HUNT  0x10
-#define SCC_WR3_AUTO_EN   0x20
-#define SCC_WR3_RX_5_BITS 0x00
-#define SCC_WR3_RX_7_BITS 0x40
-#define SCC_WR3_RX_6_BITS 0x80
-#define SCC_WR3_RX_8_BITS 0xc0
-
-/* bit values for write register 4 */
-/* tx/rx misc parameters and modes */
-
-#define SCC_WR4_PAR_EN    0x01
-#define SCC_WR4_PAR_EVEN  0x02
-#define SCC_WR4_SYNC_EN   0x00
-#define SCC_WR4_1_STOP    0x04
-#define SCC_WR4_2_STOP    0x0c
-#define SCC_WR4_8_SYNC    0x00
-#define SCC_WR4_16_SYNC   0x10
-#define SCC_WR4_SDLC    0x20
-#define SCC_WR4_EXT_SYNC  0x30
-#define SCC_WR4_1_CLOCK   0x00
-#define SCC_WR4_16_CLOCK  0x40
-#define SCC_WR4_32_CLOCK  0x80
-#define SCC_WR4_64_CLOCK  0xc0
-
-/* bit values for write register 5 */
-/* transmit parameter and controls */
-
-#define SCC_WR5_TX_CRC_EN 0x01
-#define SCC_WR5_RTS   0x02
-#define SCC_WR5_SDLC    0x04
-#define SCC_WR5_TX_EN   0x08
-#define SCC_WR5_SEND_BRK  0x10
-
-#define SCC_WR5_TX_5_BITS 0x00
-#define SCC_WR5_TX_7_BITS 0x20
-#define SCC_WR5_TX_6_BITS 0x40
-#define SCC_WR5_TX_8_BITS 0x60
-#define SCC_WR5_DTR   0x80
-
-/* write register 6 */
-/* sync chars or sdlc address field */
-
-/* write register 7 */
-/* sync char or sdlc flag */
-
-/* write register 8 */
-/* transmit buffer */
-
-/* bit values for write register 9 */
-/* master interrupt control */
-
-#define SCC_WR9_VIS   0x01
-#define SCC_WR9_NV    0x02
-#define SCC_WR9_DLC   0x04
-#define SCC_WR9_MIE   0x08
-#define SCC_WR9_STATUS_HI 0x10
-#define SCC_WR9_NO_RST    0x00
-#define SCC_WR9_CH_B_RST  0x40
-#define SCC_WR9_CH_A_RST  0x80
-#define SCC_WR9_HDWR_RST  0xc0
-
-/* bit values for write register 10 */
-/* misc tx/rx control bits */
-
-#define SCC_WR10_6_BIT_SYNC 0x01
-#define SCC_WR10_LOOP_MODE  0x02
-#define SCC_WR10_ABORT_UND  0x04
-#define SCC_WR10_MARK_IDLE  0x08
-#define SCC_WR10_ACT_POLL 0x10
-#define SCC_WR10_NRZ    0x00
-#define SCC_WR10_NRZI   0x20
-#define SCC_WR10_FM1    0x40
-#define SCC_WR10_FM0    0x60
-#define SCC_WR10_CRC_PRESET 0x80
-
-/* bit values for write register 11 */
-/* clock mode control */
-
-#define SCC_WR11_OUT_XTAL 0x00
-#define SCC_WR11_OUT_TX_CLK 0x01
-#define SCC_WR11_OUT_BR_GEN 0x02
-#define SCC_WR11_OUT_DPLL 0x03
-#define SCC_WR11_TRXC_OI  0x04
-#define SCC_WR11_TX_RTXC  0x00
-#define SCC_WR11_TX_TRXC  0x08
-#define SCC_WR11_TX_BR_GEN  0x10
-#define SCC_WR11_TX_DPLL  0x18
-#define SCC_WR11_RX_RTXC  0x00
-#define SCC_WR11_RX_TRXC  0x20
-#define SCC_WR11_RX_BR_GEN  0x40
-#define SCC_WR11_RX_DPLL  0x60
-#define SCC_WR11_RTXC_XTAL  0x80
-
-/* write register 12 */
-/* lower byte of baud rate generator time constant */
-
-/* write register 13 */
-/* upper byte of baud rate generator time constant */
-
-/* bit values for write register 14 */
-/* misc control bits */
-
-#define SCC_WR14_BR_EN    0x01
-#define SCC_WR14_BR_SRC   0x02
-#define SCC_WR14_DTR_FUNC 0x04
-#define SCC_WR14_AUTO_ECHO  0x08
-#define SCC_WR14_LCL_LOOP 0x10
-#define SCC_WR14_NULL   0x00
-#define SCC_WR14_SEARCH   0x20
-#define SCC_WR14_RST_CLK  0x40
-#define SCC_WR14_DIS_DPLL 0x60
-#define SCC_WR14_SRC_BR   0x80
-#define SCC_WR14_SRC_RTXC 0xa0
-#define SCC_WR14_FM_MODE  0xc0
-#define SCC_WR14_NRZI   0xe0
-
-/* bit values for write register 15 */
-/* external/status interrupt control */
-
-#define SCC_WR15_ZERO_CNT 0x02
-#define SCC_WR15_CD_IE    0x08
-#define SCC_WR15_SYNC_IE  0x10
-#define SCC_WR15_CTS_IE   0x20
-#define SCC_WR15_TX_UND_IE  0x40
-#define SCC_WR15_BREAK_IE 0x80
-
-/* bit values for read register 0 */
-/* tx/rx buffer status and external status  */
-
-#define SCC_RR0_RX_AVAIL  0x01
-#define SCC_RR0_ZERO_CNT  0x02
-#define SCC_RR0_TX_EMPTY  0x04
-#define SCC_RR0_CD    0x08
-#define SCC_RR0_SYNC    0x10
-#define SCC_RR0_CTS   0x20
-#define SCC_RR0_TX_UND    0x40
-#define SCC_RR0_BREAK   0x80
-
-/* bit values for read register 1 */
-
-#define SCC_RR1_ALL_SENT  0x01
-#define SCC_RR1_RES_CD_2  0x02
-#define SCC_RR1_RES_CD_1  0x01
-#define SCC_RR1_RES_CD_0  0x08
-#define SCC_RR1_PAR_ERR   0x10
-#define SCC_RR1_RX_OV_ERR 0x20
-#define SCC_RR1_CRC_ERR   0x40
-#define SCC_RR1_END_FRAME 0x80
-
-/* read register 2 */
-/* interrupt vector */
-
-/* bit values for read register 3 */
-/* interrupt pending register */
-
-#define SCC_RR3_B_EXT_IP  0x01
-#define SCC_RR3_B_TX_IP   0x02
-#define SCC_RR3_B_RX_IP   0x04
-#define SCC_RR3_A_EXT_IP  0x08
-#define SCC_RR3_A_TX_IP   0x10
-#define SCC_RR3_A_RX_IP   0x20
-
-/* read register 8 */
-/* receive data register */
-
-/* bit values for read register 10 */
-/* misc status bits */
-
-#define SCC_RR10_ON_LOOP  0x02
-#define SCC_RR10_LOOP_SEND  0x10
-#define SCC_RR10_2_CLK_MIS  0x40
-#define SCC_RR10_1_CLK_MIS  0x80
-
-/* read register 12 */
-/* lower byte of time constant */
-
-/* read register 13 */
-/* upper byte of time constant */
-
-/* bit values for read register 15 */
-/* external/status ie bits */
-
-#define SCC_RR15_ZERO_CNT 0x02
-#define SCC_RR15_CD_IE    0x08
-#define SCC_RR15_SYNC_IE  0x10
-#define SCC_RR15_CTS_IE   0x20
-#define SCC_RR15_TX_UND_IE  0x40
-#define SCC_RR15_BREAK_IE 0x80
-
-typedef struct _z85c30_context
-{
-  unsigned8 ucModemCtrl;
-} z85c30_context;
-
-/*
- * The following macro calculates the Baud constant. For the Z85C30 chip.
- *
- * Note: baud constant = ((clock frequency / Clock_X) / (2 * Baud Rate)) - 2
- *       eg ((10,000,000 / 16) / (2 * Baud Rate)) - 2
- */
-
-#define Z85C30_Baud( _clock, _baud_rate  )   \
-  ( ((_clock) /(  16 * 2 * _baud_rate))  - 2)
-
-#define Z85C30_Status_Is_RX_character_available(_status) \
-  ((_status) & SCC_RR0_RX_AVAIL)
-
-#define Z85C30_Status_Is_TX_buffer_empty(_status) \
-  ((_status) & SCC_RR0_TX_EMPTY)
-
-#define Z85C30_Status_Is_CTS_asserted(_status) \
-  ((_status) & SCC_RR0_CTS)
-
-#define Z85C30_Status_Is_break_abort(_status) \
-  ((_status) & SCC_RR0_BREAK)
-
-/*
- * Private routines
- */
-
-Z85C30_STATIC void z85c30_init(int minor);
-
-Z85C30_STATIC int z85c30_set_attributes(
-  int                   minor,
-  const struct termios *t
-);
-
-Z85C30_STATIC int z85c30_open(
-  int major,
-  int minor,
-  void  * arg
-);
-
-Z85C30_STATIC int z85c30_close(
-  int major,
-  int minor,
-  void  * arg
-);
-
-Z85C30_STATIC void z85c30_write_polled(
-  int   minor, 
-  char  cChar
-);
-
-Z85C30_STATIC int z85c30_assert_RTS(
-  int minor
-);
-
-Z85C30_STATIC int z85c30_negate_RTS(
-  int minor
-);
-
-Z85C30_STATIC int z85c30_assert_DTR(
-  int minor
-);
-
-Z85C30_STATIC int z85c30_negate_DTR(
-  int minor
-);
-
-Z85C30_STATIC void z85c30_initialize_interrupts(int minor);
-
-Z85C30_STATIC int z85c30_write_support_int(
-  int   minor,
-  const char *buf,
-  int   len
-);
-
-Z85C30_STATIC int z85c30_write_support_polled(
-  int   minor,
-  const char *buf,
-  int   len
-);
-
-Z85C30_STATIC int z85c30_inbyte_nonblocking_polled(
-  int minor
-);
-
-Z85C30_STATIC void z85c30_enable_interrupts(
-  int minor,
-  int interrupt_mask
-);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/c/src/libchip/serial/z85c30_reg.c b/c/src/libchip/serial/z85c30_reg.c
deleted file mode 100644
index 889dad4530..0000000000
--- a/c/src/libchip/serial/z85c30_reg.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- *  This file contains a typical set of register access routines which may be
- *  used with the z85c30 chip if accesses to the chip are as follows:
- *
- *    + registers are accessed as bytes
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems.h>
-
-#ifndef _Z85C30_MULTIPLIER
-#define _Z85C30_MULTIPLIER 1
-#define _Z85C30_NAME(_X) _X
-#define _Z85C30_TYPE unsigned8
-#endif
-
-/*
- *  Z85C30 Get Register Routine
- */
-
-unsigned8 _Z85C30_NAME(z85c30_get_register)(
-  unsigned32  ulCtrlPort,
-  unsigned8   ucRegNum
-)
-{
-  _Z85C30_TYPE          *port;
-  unsigned8              data;
-  rtems_interrupt_level  level;
-
-  port = (_Z85C30_TYPE *)ulCtrlPort;
-
-  rtems_interrupt_disable(level);
-
-    if(ucRegNum) {
-      *port = ucRegNum;
-    }
-    data = *port;
-  rtems_interrupt_enable(level);
-
-  return data;
-}
-
-/*
- *  Z85C30 Set Register Routine
- */
-
-void _Z85C30_NAME(z85c30_set_register)(
-  unsigned32  ulCtrlPort,
-  unsigned8   ucRegNum,
-  unsigned8   ucData
-)
-{
-  _Z85C30_TYPE          *port;
-  rtems_interrupt_level  level;
-
-  port = (_Z85C30_TYPE *)ulCtrlPort;
-
-  rtems_interrupt_disable(level);
-    if(ucRegNum) {
-      *port = ucRegNum;
-    }
-    *port = ucData;
-  rtems_interrupt_enable(level);
-}
diff --git a/c/src/libchip/shmdr/README b/c/src/libchip/shmdr/README
deleted file mode 100644
index 5ed9e861b0..0000000000
--- a/c/src/libchip/shmdr/README
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-#  $Id$
-#
-
-The mpci.h file provided in here is too simple for an MPCI with
-multiple ways to get to a node.
-
-This version of the shm driver needs to be reorganized to follow
-the better model of the Ada version.
diff --git a/c/src/libchip/shmdr/addlq.c b/c/src/libchip/shmdr/addlq.c
deleted file mode 100644
index 2eace43e4d..0000000000
--- a/c/src/libchip/shmdr/addlq.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/*  void Shm_Locked_queue_Add( lq_cb, ecb )
- *
- *  This routine adds an envelope control block to a shared memory queue.
- *
- *  Input parameters:
- *    lq_cb - pointer to a locked queue control block
- *    ecb   - pointer to an envelope control block
- *
- *  Output parameters: NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems.h>
-#include "shm.h"
-
-void Shm_Locked_queue_Add(
-  Shm_Locked_queue_Control *lq_cb,
-  Shm_Envelope_control     *ecb
-)
-{
-  rtems_unsigned32 index;
-
-  ecb->next  = Shm_Locked_queue_End_of_list;
-  ecb->queue = lq_cb->owner;
-  index      = ecb->index;
-
-  Shm_Lock( lq_cb );
-    if ( Shm_Convert(lq_cb->front) != Shm_Locked_queue_End_of_list )
-      Shm_Envelopes[ Shm_Convert(lq_cb->rear) ].next = index;
-    else
-      lq_cb->front = index;
-    lq_cb->rear  = index;
-  Shm_Unlock( lq_cb );
-}
diff --git a/c/src/libchip/shmdr/cnvpkt.c b/c/src/libchip/shmdr/cnvpkt.c
deleted file mode 100644
index 4a9a4006db..0000000000
--- a/c/src/libchip/shmdr/cnvpkt.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/*  void Shm_Convert_packet( &packet )
- *
- *  This routine is the shared memory locked queue MPCI driver routine
- *  used to convert the RTEMS's information in a packet from non-native
- *  format to processor native format.
- *
- *  Input parameters:
- *    packet  - pointer to a packet
- *
- *  Output parameters:
- *    *packet - packet in native format
- *
- *  NOTE: Message buffers are not manipulated.
- *        Endian conversion is currently the only conversion.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems.h>
-#include "shm.h"
-
-void Shm_Convert_packet(
-  rtems_packet_prefix *packet
-)
-{
-  rtems_unsigned32 *pkt, i;
-
-  pkt = (rtems_unsigned32 *) packet;
-  for ( i=RTEMS_MINIMUN_HETERO_CONVERSION ; i ; i--, pkt++ )
-    *pkt = CPU_swap_u32( *pkt );
-
-  for ( i=packet->to_convert ; i ; i--, pkt++ )
-    *pkt = CPU_swap_u32( *pkt );
-}
diff --git a/c/src/libchip/shmdr/dump.c b/c/src/libchip/shmdr/dump.c
deleted file mode 100644
index 6cd4e2129f..0000000000
--- a/c/src/libchip/shmdr/dump.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- *  This routine is invoked following a reset to report the statistics
- *  gathered during the previous execution.
- *
- *  Input parameters:  NONE
- *
- *  Output parameters: NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems.h>
-#include <stdio.h>
-
-#include "shm.h"
-
-void
-Shm_Print_statistics(void)
-{
-  rtems_unsigned32  ticks;
-  rtems_unsigned32  ticks_per_second;
-  rtems_unsigned32  seconds;
-  int               packets_per_second;
-
-  (void) rtems_clock_get( RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &ticks );
-  (void) rtems_clock_get( RTEMS_CLOCK_GET_TICKS_PER_SECOND, &ticks_per_second );
-
-  seconds = ticks / ticks_per_second;
-  if ( seconds == 0 )
-    seconds = 1;
-
-  packets_per_second = Shm_Receive_message_count / seconds;
-  if ( (Shm_Receive_message_count % seconds) >= (seconds / 2) )
-    packets_per_second++;
-
-  printf( "\n\nSHMDR STATISTICS (NODE %d)\n", Shm_Local_node );
-  printf( "TICKS SINCE BOOT = %d\n", ticks );
-  printf( "TICKS PER SECOND = %d\n", ticks_per_second );
-  printf( "ISRs=%d\n",     Shm_Interrupt_count );
-  printf( "RECV=%d\n",     Shm_Receive_message_count );
-  printf( "NULL=%d\n",     Shm_Null_message_count );
-  printf( "PKTS/SEC=%d\n", packets_per_second );
-}
diff --git a/c/src/libchip/shmdr/fatal.c b/c/src/libchip/shmdr/fatal.c
deleted file mode 100644
index b0558c92f0..0000000000
--- a/c/src/libchip/shmdr/fatal.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/*  void MPCI_Fatal( error )
- *
- *  This routine is the shared memory driver fatal error handler.
- *
- *  Input parameters:
- *    error - fatal error code
- *
- *  Output parameters:  NEVER RETURNS
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems.h>
-#include "shm.h"
-
-void MPCI_Fatal(
-  Internal_errors_Source  source,
-  boolean                 is_internal,
-  rtems_unsigned32        error
-)
-{
-   /*   Eventually need to attempt to broadcast a K_FATAL message
-    *   without checking for all possible errors (do not want to
-    *   recurse).
-    *
-    *   Also need to avoid using Shm_Node_statuses if the driver has not been
-    *   initialized.
-    */
-
-   Shm_Local_node_status->error = Shm_Convert(error);
-}
diff --git a/c/src/libchip/shmdr/getlq.c b/c/src/libchip/shmdr/getlq.c
deleted file mode 100644
index 7b525b2d92..0000000000
--- a/c/src/libchip/shmdr/getlq.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*  Shm_Envelope_control *Shm_Locked_queue_Get( lq_cb )
- *
- *  This routine returns an envelope control block from a shared
- *  memory queue.
- *
- *  Input parameters:
- *    lq_cb - pointer to a locked queue control block
- *
- *  Output parameters:
- *    returns - pointer to an envelope control block
- *            - NULL if no envelopes on specified queue
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems.h>
-#include <shm.h>
-
-Shm_Envelope_control *Shm_Locked_queue_Get(
-  Shm_Locked_queue_Control *lq_cb
-)
-{
-  Shm_Envelope_control *tmp_ecb;
-  rtems_unsigned32 tmpfront;
-
-  tmp_ecb = NULL;
-  Shm_Lock( lq_cb );
-
-    tmpfront = Shm_Convert(lq_cb->front);
-    if ( tmpfront != Shm_Locked_queue_End_of_list ) {
-      tmp_ecb = &Shm_Envelopes[ tmpfront ];
-      lq_cb->front = tmp_ecb->next;
-      if ( tmp_ecb->next == Shm_Locked_queue_End_of_list )
-        lq_cb->rear = Shm_Locked_queue_End_of_list;
-      tmp_ecb->next = Shm_Locked_queue_Not_on_list;
-    }
-
-  Shm_Unlock( lq_cb );
-  return( tmp_ecb );
-}
diff --git a/c/src/libchip/shmdr/getpkt.c b/c/src/libchip/shmdr/getpkt.c
deleted file mode 100644
index 03971ea022..0000000000
--- a/c/src/libchip/shmdr/getpkt.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/*  Shm_Get_packet
- *
- *  This routine is the shared memory locked queue MPCI driver
- *  routine used to obtain an empty message packet.
- *
- *  Input parameters:
- *    packet             - address of pointer to packet
- *
- *  Output parameters:
- *    *(cpb->get_packet) - address of allocated packet
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems.h>
-#include "shm.h"
-
-rtems_mpci_entry Shm_Get_packet(
-  rtems_packet_prefix **packet
-)
-{
-  Shm_Envelope_control *ecb;
-
-  ecb = Shm_Allocate_envelope();
-  if ( !ecb )
-    rtems_fatal_error_occurred ( SHM_NO_FREE_PKTS );
-  *packet = Shm_Envelope_control_to_packet_prefix_pointer( ecb );
-}
diff --git a/c/src/libchip/shmdr/init.c b/c/src/libchip/shmdr/init.c
deleted file mode 100644
index 4e1df20be0..0000000000
--- a/c/src/libchip/shmdr/init.c
+++ /dev/null
@@ -1,254 +0,0 @@
-/*  Shm_Initialization
- *
- *  This routine is the shared memory communications initerface
- *  driver initialization routine.
- *
- *  Input parameters:  NONE
- *
- *  Output parameters: NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define _SHM_INIT
-
-#include <rtems.h>
-#include <shm.h>
-
-#include <string.h>    /* memset() */
-#include <stdlib.h>    /* malloc() */
-#include <assert.h>
-
-/*
- * User extension to install MPCI_Fatal as a fatal error
- * handler extension
- */
- 
-rtems_extensions_table MPCI_Shm_extensions;
-
-rtems_mpci_entry Shm_Initialization( void )
-
-{
-  rtems_unsigned32         i, all_initialized;
-  rtems_unsigned32         interrupt_cause, interrupt_value;
-  void                    *interrupt_address;
-  Shm_Node_status_control *nscb;
-  rtems_unsigned32         extension_id;    /* for installation of MPCI_Fatal */
-  rtems_unsigned32         remaining_memory;
-/* XXX these should use "public" methods to set their values.... */
-  rtems_configuration_table   *configuration = _Configuration_Table;
-  rtems_multiprocessing_table *mp_configuration = _Configuration_MP_table;
-
-  Shm_RTEMS_Configuration    = configuration;
-  Shm_RTEMS_MP_Configuration = mp_configuration;
-
-  Shm_Local_node    = Shm_RTEMS_MP_Configuration->node;
-  Shm_Maximum_nodes = Shm_RTEMS_MP_Configuration->maximum_nodes;
-
-  Shm_Get_configuration( Shm_Local_node, &Shm_Configuration );
-
-  Shm_Interrupt_table = (Shm_Interrupt_information *) malloc(
-    sizeof(Shm_Interrupt_information) * (Shm_Maximum_nodes + 1)
-  );
-
-  assert( Shm_Interrupt_table );
-
-
-  Shm_Receive_message_count = 0;
-  Shm_Null_message_count    = 0;
-  Shm_Interrupt_count       = 0;
-
-  /*
-   *  Set the Node Status indicators
-   */
-
-  Shm_Pending_initialization = 
-    Shm_Convert(rtems_build_name( 'P', 'E', 'N', 'D' ));
-  Shm_Initialization_complete = 
-    Shm_Convert(rtems_build_name( 'C', 'O', 'M', 'P' ));
-  Shm_Active_node = 
-    Shm_Convert(rtems_build_name( 'A', 'C', 'T', 'V' ));
-
-  /*
-   *  Initialize the constants used by the Locked Queue code.
-   */
-
-  Shm_Locked_queue_End_of_list = Shm_Convert( 0xffffffff );
-  Shm_Locked_queue_Not_on_list = Shm_Convert( 0xfffffffe );
-
-  /*
-   *  Set the base addresses for the:
-   *     + Node Status Table
-   *     + Free Pool and Receive Queues
-   *     + Envelopes
-   */
-
-  Shm_Node_statuses  = (Shm_Node_status_control *) START_NS_CBS;
-  Shm_Locked_queues  = (Shm_Locked_queue_Control *) START_LQ_CBS;
-  Shm_Envelopes      = (Shm_Envelope_control *) START_ENVELOPES;
-
-  /*
-   *  Calculate the maximum number of envelopes which can be
-   *  placed the remaining shared memory.
-   */
-
-  remaining_memory =
-     ((void *)Shm_Configuration->base + Shm_Configuration->length) -
-     ((void *)Shm_Envelopes);
-
-  Shm_Maximum_envelopes = remaining_memory / sizeof( Shm_Envelope_control );
-  Shm_Maximum_envelopes -= 1;
-
-  /*
-   *  Set the pointer to the receive queue for the local node.
-   *  When we receive a node, we will get it from here before
-   *  processing it.
-   */
-
-  Shm_Local_receive_queue  = &Shm_Locked_queues[ Shm_Local_node ];
-  Shm_Local_node_status    = &Shm_Node_statuses[ Shm_Local_node ];
-
-  /*
-   *  Convert local interrupt cause information into the
-   *  neutral format so other nodes will be able to
-   *  understand it.
-   */
-
-  interrupt_address =
-    (void *) Shm_Convert( (rtems_unsigned32)Shm_Configuration->Intr.address );
-  interrupt_value   = Shm_Convert( Shm_Configuration->Intr.value );
-  interrupt_cause   = Shm_Convert( Shm_Configuration->Intr.length );
-
-  if ( Shm_Configuration->poll_intr == POLLED_MODE ) Shm_setclockvec();
-  else                                               Shm_setvec();
-
-  if ( Shm_Is_master_node() ) {
-
-    /*
-     *  Zero out the shared memory area.
-     */
-
-    (void) memset(
-      (void *) Shm_Configuration->base,
-      0,
-      Shm_Configuration->length
-    );
-
-    /*
-     *  Initialize all of the locked queues (the free envelope
-     *  pool and a receive queue per node) and set all of the
-     *  node's status so they will be waiting to initialization
-     *  to complete.
-     */
-
-    Shm_Locked_queue_Initialize( FREE_ENV_CB, FREE_ENV_POOL );
-
-    for ( i=SHM_FIRST_NODE ; i<=Shm_Maximum_nodes ; i++ ) {
-      Shm_Initialize_receive_queue( i );
-
-      Shm_Node_statuses[ i ].status = Shm_Pending_initialization;
-      Shm_Node_statuses[ i ].error  = 0;
-    }
-
-    /*
-     *  Initialize all of the envelopes and place them in the
-     *  free pool.
-     */
-
-    for ( i=0 ; i<Shm_Maximum_envelopes ; i++ ) {
-      Shm_Envelopes[ i ].index = Shm_Convert(i);
-      Shm_Free_envelope( &Shm_Envelopes[ i ] );
-    }
-
-    /*
-     *  Initialize this node's interrupt information in the
-     *  shared area so other nodes can interrupt us.
-     */
-
-    Shm_Local_node_status->int_address = (rtems_unsigned32) interrupt_address;
-    Shm_Local_node_status->int_value   = interrupt_value;
-    Shm_Local_node_status->int_length  = interrupt_cause;
-
-    Shm_Local_node_status->status      = Shm_Initialization_complete;
-
-    /*
-     *  Loop until all nodes have completed initialization.
-     */
-
-    do {
-      all_initialized = 1;
-
-      for ( i = SHM_FIRST_NODE ; i <= Shm_Maximum_nodes ; i++ )
-        if ( Shm_Node_statuses[ i ].status != Shm_Initialization_complete )
-          all_initialized = 0;
-
-    } while ( all_initialized == 0 );
-
-    /*
-     *  Tell the other nodes we think that the system is up.
-     */
-
-    for ( i = SHM_FIRST_NODE ; i <= Shm_Maximum_nodes ; i++ )
-      Shm_Node_statuses[ i ].status = Shm_Active_node;
-
-  } else {   /* is not MASTER node */
-
-    /*
-     *  Initialize the node status for the non-master nodes.
-     *  Because the master node zeroes out memory, it is
-     *  necessary for them to keep putting their values in
-     *  the node status area until the master says they
-     *  should become active.
-     */
-
-    Shm_Local_node_status->status = Shm_Pending_initialization;
-
-    do {
-
-      if ( Shm_Local_node_status->status == Shm_Pending_initialization ) {
-
-        /*
-         *  Initialize this node's interrupt information in the
-         *  shared area so other nodes can interrupt us.
-         */
-
-        Shm_Local_node_status->int_address =
-          (rtems_unsigned32) interrupt_address;
-        Shm_Local_node_status->int_value   = interrupt_value;
-        Shm_Local_node_status->int_length  = interrupt_cause;
-
-        Shm_Local_node_status->status      = Shm_Initialization_complete;
-      }
-    } while ( Shm_Local_node_status->status != Shm_Active_node ) ;
-  }
-
-  /*
-   *  Initialize the Interrupt Information Table
-   */
-
-  for ( i = SHM_FIRST_NODE ; i <= Shm_Maximum_nodes ; i++ ) {
-    nscb = &Shm_Node_statuses[ i ];
-
-    Shm_Interrupt_table[i].address = Shm_Convert_address(
-      (void *)Shm_Convert(((vol_u32) nscb->int_address))
-    );
-    Shm_Interrupt_table[i].value = Shm_Convert( nscb->int_value );
-    Shm_Interrupt_table[i].length = Shm_Convert( nscb->int_length );
-  }
-
-  MPCI_Shm_extensions.fatal = MPCI_Fatal;
-
-  (void) rtems_extension_create(
-    rtems_build_name( 'M', 'P', 'E', 'X' ),
-    &MPCI_Shm_extensions,
-    &extension_id
-  );
-}
diff --git a/c/src/libchip/shmdr/initlq.c b/c/src/libchip/shmdr/initlq.c
deleted file mode 100644
index f876d4b43d..0000000000
--- a/c/src/libchip/shmdr/initlq.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/*  void Shm_Locked_queue_Initialize( lq_cb, owner )
- *
- *  This routine initializes a shared memory locked queue.
- *
- *  Input parameters:
- *    lq_cb - pointer to the control block of the queue
- *            to be initialized
- *    owner - unique idenitifier of who owns this queue.
- *
- *  Output parameters: NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems.h>
-#include "shm.h"
-
-void Shm_Locked_queue_Initialize(
-  Shm_Locked_queue_Control *lq_cb,
-  rtems_unsigned32 owner
-)
-{
-  Shm_Initialize_lock( lq_cb );
-  lq_cb->front = Shm_Locked_queue_End_of_list;
-  lq_cb->rear  = Shm_Locked_queue_End_of_list;
-  lq_cb->owner = Shm_Convert(owner);
-}
diff --git a/c/src/libchip/shmdr/intr.c b/c/src/libchip/shmdr/intr.c
deleted file mode 100644
index 1483cd3afe..0000000000
--- a/c/src/libchip/shmdr/intr.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*  void Shm_Cause_interrupt( node )
- *
- *  This routine is the shared memory driver routine which
- *  generates interrupts to other CPUs.
- *
- *  It uses the information placed in the node status control
- *  block by each node.  For example, when used with the Motorola
- *  MVME136 board, the MPCSR is used.
- *
- *  Input parameters:
- *    node          - destination of this packet (0 = broadcast)
- *
- *  Output parameters: NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems.h>
-#include "shm.h"
-
-void Shm_Cause_interrupt(
-  rtems_unsigned32 node
-)
-{
-  Shm_Interrupt_information *intr;
-  rtems_unsigned8  *u8;
-  rtems_unsigned16 *u16;
-  rtems_unsigned32 *u32;
-  rtems_unsigned32  value;
-
-  intr = &Shm_Interrupt_table[node];
-  value = intr->value;
-
-  switch ( intr->length ) {
-    case NO_INTERRUPT:
-       break;
-    case BYTE:
-      u8   = (rtems_unsigned8 *)intr->address;
-      *u8  = (rtems_unsigned8) value;
-      break;
-    case WORD:
-      u16   = (rtems_unsigned16 *)intr->address;
-      *u16  = (rtems_unsigned16) value;
-      break;
-    case LONG:
-      u32   = (rtems_unsigned32 *)intr->address;
-      *u32  = (rtems_unsigned32) value;
-      break;
-  }
-}
diff --git a/c/src/libchip/shmdr/mpci.h b/c/src/libchip/shmdr/mpci.h
deleted file mode 100644
index 5e08cc4ec4..0000000000
--- a/c/src/libchip/shmdr/mpci.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*  mpci.h
- *
- *  This include file contains all the renaming necessary to
- *  have an application use the Shared Memory Driver as its
- *  sole mechanism for MPCI.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __SHM_MPCI_h
-#define __SHM_MPCI_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <shm.h>
-
-#define MPCI_Initialization( _configuration ) \
-  Shm_Initialization( _configuration )
-
-#define MPCI_Get_packet( _the_packet ) \
-  Shm_Get_packet( _the_packet )
-
-#define MPCI_Return_packet( _the_packet ) \
-  Shm_Return_packet( _the_packet )
-
-#define MPCI_Receive_packet( _the_packet ) \
-  Shm_Receive_packet( _the_packet )
-
-#define MPCI_Send_packet( _destination, _the_packet ) \
-  Shm_Send_packet( _destination, _the_packet )
-
-/* Unnecessary... mapped in shm.h
-#define MPCI_Fatal( _the_error ) \
-  Shm_Fatal( _the_error )
-*/
-
-#define MPCI_Enable_statistics()
-
-#define MPCI_Print_statistics() \
-  Shm_Print_statistics()
-
-/* no need to rename the MPCI_Table either */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/c/src/libchip/shmdr/mpisr.c b/c/src/libchip/shmdr/mpisr.c
deleted file mode 100644
index 573a4ebd21..0000000000
--- a/c/src/libchip/shmdr/mpisr.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/*  _Shm_isr()
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems.h>
-#include "shm.h"
-
-rtems_isr Shm_isr(
-  rtems_vector_number vector
-)
-{
-  Shm_Interrupt_count += 1;
-  rtems_multiprocessing_announce();
-}
diff --git a/c/src/libchip/shmdr/poll.c b/c/src/libchip/shmdr/poll.c
deleted file mode 100644
index 22dc116435..0000000000
--- a/c/src/libchip/shmdr/poll.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*  void Shm_Poll()
- *
- *  This routine polls to see if a packet has arrived.  If one
- *  has it informs the executive.  It is typically called from
- *  the clock tick interrupt service routine.
- *
- *  Input parameters:  NONE
- *
- *  Output parameters: NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems.h>
-#include <rtems/score/sysstate.h>
-#include <rtems/libio.h>
-
-#include "shm.h"
-
-void Shm_Poll()
-{
-  rtems_unsigned32 tmpfront;
-  rtems_libio_ioctl_args_t args;
-
-  /* invoke clock isr */
-  args.iop = 0;
-  args.command = rtems_build_name('I', 'S', 'R', ' ');
-  (void) rtems_io_control(rtems_clock_major, rtems_clock_minor, &args);
-
-  /*
-   * Check for msgs only if we are "up"
-   * This avoids a race condition where we may get a clock
-   * interrupt before MPCI has completed its init
-   */
-  
-  if (_System_state_Is_up(_System_state_Get()))
-  {
-      tmpfront = Shm_Local_receive_queue->front;
-      if ( Shm_Convert(tmpfront) != Shm_Locked_queue_End_of_list )
-      {
-          rtems_multiprocessing_announce();
-          Shm_Interrupt_count++;
-      }
-  }
-}
diff --git a/c/src/libchip/shmdr/receive.c b/c/src/libchip/shmdr/receive.c
deleted file mode 100644
index 98fd23b29d..0000000000
--- a/c/src/libchip/shmdr/receive.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/*  Shm_Receive_packet
- *
- *  This routine is the shared memory locked queue MPCI driver routine
- *  used to obtain a packet containing a message from this node's
- *  receive queue.
- *
- *  Input parameters:
- *    packet         - address of a pointer to a packet
- *
- *  Output parameters:
- *    *(rpb->packet) - pointer to packet
- *                     NULL if no packet currently available
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems.h>
-#include "shm.h"
-
-rtems_mpci_entry Shm_Receive_packet(
-  rtems_packet_prefix **packet
-)
-{
-  Shm_Envelope_control *ecb;
-
-  ecb = Shm_Locked_queue_Get( Shm_Local_receive_queue );
-  if ( ecb ) {
-    *(packet) = Shm_Envelope_control_to_packet_prefix_pointer( ecb );
-    if ( ecb->Preamble.endian != Shm_Configuration->format )
-      Shm_Convert_packet( *packet );
-    Shm_Receive_message_count++;
-  } else {
-    *(packet) = NULL;
-    Shm_Null_message_count++;
-  }
-}
diff --git a/c/src/libchip/shmdr/retpkt.c b/c/src/libchip/shmdr/retpkt.c
deleted file mode 100644
index d14b6e26e1..0000000000
--- a/c/src/libchip/shmdr/retpkt.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/*  Shm_Return_packet
- *
- *  This routine is the shared memory locked queue MPCI driver
- *  routine used to return a message packet to a free envelope
- *  pool accessible by this node.
- *
- *  Input parameters:
- *    packet             - address of pointer to packet
- *
- *  Output parameters: NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems.h>
-#include "shm.h"
-
-rtems_mpci_entry Shm_Return_packet(
-  rtems_packet_prefix *packet
-)
-{
-  Shm_Free_envelope( Shm_Packet_prefix_to_envelope_control_pointer(packet) );
-}
-
diff --git a/c/src/libchip/shmdr/send.c b/c/src/libchip/shmdr/send.c
deleted file mode 100644
index f26445cb42..0000000000
--- a/c/src/libchip/shmdr/send.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/*  Shm_Send_packet
- *
- *  This routine is the shared memory driver locked queue write
- *  MPCI driver routine.  This routine sends the specified packet
- *  to the destination specified by "node".  A "node" value of
- *  zero designates that this packet is to be broadcasted.
- *
- *  Input parameters:
- *    node          - destination of this packet (0 = broadcast)
- *    packet        - address of packet
- *
- *  Output parameters: NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems.h>
-#include "shm.h"
-
-struct pkt_cpy {
-  rtems_unsigned32 packet[MAX_PACKET_SIZE/4];
-};
-
-rtems_mpci_entry Shm_Send_packet(
-  rtems_unsigned32 node,
-  rtems_packet_prefix *packet
-)
-{
-  Shm_Envelope_control *ecb, *tmp_ecb;
-  rtems_unsigned32 nnum;
-
-  ecb = Shm_Packet_prefix_to_envelope_control_pointer( packet );
-  if ( node ) {
-    Shm_Build_preamble( ecb, node );
-    Shm_Build_postamble( ecb );
-    Shm_Append_to_receive_queue( node, ecb );
-    (*Shm_Configuration->cause_intr)( node );
-  }
-  else {
-    for( nnum = SHM_FIRST_NODE ; nnum <= Shm_Maximum_nodes ; nnum++ )
-      if ( Shm_Local_node != nnum ) {
-        tmp_ecb = Shm_Allocate_envelope();
-        if ( !tmp_ecb )
-          rtems_fatal_error_occurred( SHM_NO_FREE_PKTS );
-        Shm_Build_preamble( tmp_ecb, nnum );
-        *((struct pkt_cpy *)tmp_ecb->packet) = *((struct pkt_cpy *)packet);
-        Shm_Build_postamble( tmp_ecb );
-        Shm_Append_to_receive_queue( nnum, tmp_ecb );
-        (*Shm_Configuration->cause_intr)( nnum );
-      }
-    Shm_Free_envelope( ecb );
-  }
-}
diff --git a/c/src/libchip/shmdr/setckvec.c b/c/src/libchip/shmdr/setckvec.c
deleted file mode 100644
index 1e56e5737b..0000000000
--- a/c/src/libchip/shmdr/setckvec.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/*  Shm_setclockvec
- *
- *  This routines installs the shared memory clock interrupt handler
- *  used when the driver is used in polling mode.
- *
- *  INPUT PARAMETERS:  NONE
- *
- *  OUTPUT PARAMETERS: NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems.h>
-#include <rtems/libio.h>
-
-#include "shm.h"
-
-rtems_isr Shm_setclockvec()
-{
-    rtems_libio_ioctl_args_t args;
-    args.iop = 0;
-    args.command = rtems_build_name('N', 'E', 'W', ' ');
-    args.buffer = (void *) Shm_Poll;
-
-    (void) rtems_io_control(rtems_clock_major, rtems_clock_minor, &args);
-}
diff --git a/c/src/libchip/shmdr/shm_driver.h b/c/src/libchip/shmdr/shm_driver.h
deleted file mode 100644
index 8875525983..0000000000
--- a/c/src/libchip/shmdr/shm_driver.h
+++ /dev/null
@@ -1,542 +0,0 @@
-/*  shm.h
- *
- *  This include file contains all the constants, structures,
- *  and global variables for this RTEMS based shared memory
- *  communications interface driver.
- *
- *  Processor board dependencies are in other files.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __SHM_h
-#define __SHM_h
-
-#include <clockdrv.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*  The information contained in the Node Status, Locked Queue, and
- *  Envelope Control Blocks must be maintained in a NEUTRAL format.
- *  Currently the neutral format may be selected as big or little
- *  endian by simply defining either NEUTRAL_BIG or NEUTRAL_LITTLE.
- *
- *  It is CRITICAL to note that the neutral format can ONLY be
- *  changed by modifying this file and recompiling the ENTIRE
- *  SHM driver including ALL target specific support files.
- *
- *  The following table details the memory contents for the endian
- *  field of the Node Status Control Block in the various
- *  data format configurations (data is in hexadecimal):
- *
- *   NEUTRAL NATIVE BYTE 0  BYTE 1  BYTE 2  BYTE 3
- *   ======= ====== ======  ======  ======  ======
- *    BIG     BIG     00      00      00      01
- *    BIG    LITTLE   10      00      00      00
- *   LITTLE   BIG     01      00      00      00
- *   LITTLE  LITTLE   00      00      00      10
- *
- *
- *  NOTE: XXX
- *                PORTABILITY OF LOCKING INSTRUCTIONS
- *                ===================================
- *            The locking mechanism described below is not
- *            general enough.  Where the hardware supports
- *            it we should use "atomic swap" instructions
- *            so the values in the lock can be tailored to
- *            support a CPU with only weak atomic memory
- *            instructions.  There are combinations of
- *            CPUs with inflexible atomic memory instructions
- *            which appear to be incompatible.  For example,
- *            the SPARClite instruction uses a byte which is
- *            0xFF when locked.  The PA-RISC uses 1 to indicate
- *            locked and 0 when unlocked.  These CPUs appear to
- *            have incompatible lock instructions.  But
- *            they could be used in a heterogenous system
- *            with does not mix SPARCs and PA-RISCs.  For
- *            example, the i386 and SPARC or i386 and SPARC
- *            could work together.  The bottom line is that
- *            not every CPU will work together using this
- *            locking scheme.  There are supposed to be
- *            algorithms to do this without hardware assist
- *            and one of these should be incorporated into
- *            the shared memory driver.
- *
- *            The most flexible scheme using the instructions
- *            of the various CPUs for efficiency would be to use
- *            "atomic swaps" wherever possible.  Make the lock
- *            and unlock configurable much like BIG vs LITTLE
- *            endian use of shared memory is now.  The values
- *            of the lock could then reflect the "worst"
- *            CPU in a system.  This still results in mixes
- *            of CPUs which are incompatible.
- *
- *  The current locking mechanism is based upon the MC68020
- *  "tas" instruction which is atomic.  All ports to other CPUs
- *  comply with the restrictive placement of lock bit by this
- *  instruction.  The lock bit is the most significant bit in a
- *  big-endian rtems_unsigned32.  On other processors, the lock is
- *  typically implemented via an atomic swap or atomic modify
- *  bits type instruction.
- */
-
-#define NEUTRAL_BIG
-
-#ifdef NEUTRAL_BIG
-#define SHM_BIG       0x00000001
-#define SHM_LITTLE    0x10000000
-#endif
-
-#ifdef NEUTRAL_LITTLE
-#define SHM_BIG       0x01000000
-#define SHM_LITTLE    0x00000010
-#endif
-
-/*
- *  The following are the values used to fill in the lock field.  Some CPUs
- *  are able to write only a single value into field.  By making the
- *  lock and unlock values configurable, CPUs which support "atomic swap"
- *  instructions can generally be made to work in any heterogeneous
- *  configuration.  However, it is possible for two CPUs to be incompatible
- *  in regards to the lock field values.  This occurs when two CPUs
- *  which write only a single value to the field are used in a system
- *  but the two CPUs write different incompatible values.
- *
- *  NOTE:  The following is a first attempt at defining values which
- *         have a chance at working together.  The m68k should use
- *         chk2 instead of tas to be less restrictive.  Target endian
- *         problems (like the Force CPU386 which has (broken) big endian
- *         view of the VMEbus address space) are not addressed yet.
- */
-
-#if defined(__i960__)
-#define SHM_LOCK_VALUE    0x00000080
-#define SHM_UNLOCK_VALUE  0
-#elif defined(__mc68000__)
-#define SHM_LOCK_VALUE    0x80000000
-#define SHM_UNLOCK_VALUE  0
-#define SHM_LOCK_VALUE    0x80000000
-#define SHM_UNLOCK_VALUE  0
-#elif defined(__i386__)
-#define SHM_LOCK_VALUE    0x80000000
-#define SHM_UNLOCK_VALUE  0
-#elif defined(__mips__)
-#define SHM_LOCK_VALUE    0x80000000
-#define SHM_UNLOCK_VALUE  0
-#elif defined(__hppa__)
-#define SHM_LOCK_VALUE    0
-#define SHM_UNLOCK_VALUE  1
-#elif defined(__PPC__)
-#define SHM_LOCK_VALUE    1
-#define SHM_UNLOCK_VALUE  0
-#elif defined(__unix__)
-#define SHM_LOCK_VALUE    0
-#define SHM_UNLOCK_VALUE  1
-#elif defined(no_cpu)               /* for this values are irrelevant */
-#define SHM_LOCK_VALUE    1
-#define SHM_UNLOCK_VALUE  0
-#else
-#error "shm.h - no SHM_LOCK_VALUE defined for this CPU architecture"
-#endif
-
-#define Shm_Convert( value ) \
-  ((Shm_Configuration->convert) ? \
-    (*Shm_Configuration->convert)(value) : (value))
-
-/* constants */
-
-#define SHM_MASTER                  1     /* master initialization node */
-#define SHM_FIRST_NODE              1
-
-/* size constants */
-
-#define KILOBYTE          (1024)
-#define MEGABYTE          (1024*1024)
-
-/* inter-node interrupt values */
-
-#define NO_INTERRUPT            0     /* used for polled nodes */
-#define BYTE                    1
-#define WORD                    2
-#define LONG                    4
-
-/* operational mode constants -- used in SHM Configuration Table */
-#define POLLED_MODE             0
-#define INTR_MODE               1
-
-/* error codes */
-
-#define NO_ERROR                0
-#define SHM_NO_FREE_PKTS        0xf0000
-
-/* null pointers of different types */
-
-#define NULL_ENV_CB             ((Shm_Envelope_control *) 0)
-#define NULL_CONVERT            0
-
-/*
- * size of stuff before preamble in envelope.
- * It must be a constant since we will use it to generate MAX_PACKET_SIZE
- */
- 
-#define SHM_ENVELOPE_PREFIX_OVERHEAD    (4 * sizeof(vol_u32))
-
-/*
- *  The following is adjusted so envelopes are MAX_ENVELOPE_SIZE bytes long.
- *  It must be >= RTEMS_MINIMUM_PACKET_SIZE in mppkt.h.
- */
- 
-#ifndef MAX_ENVELOPE_SIZE
-#define MAX_ENVELOPE_SIZE 0x180
-#endif
-
-#define MAX_PACKET_SIZE  (MAX_ENVELOPE_SIZE -               \
-                          SHM_ENVELOPE_PREFIX_OVERHEAD +    \
-                          sizeof(Shm_Envelope_preamble) +   \
-                          sizeof(Shm_Envelope_postamble))
-
-
-/* constants pertinent to Locked Queue routines */
-
-#define LQ_UNLOCKED              SHM_UNLOCK_VALUE
-#define LQ_LOCKED                SHM_LOCK_VALUE
-
-/* constants related to the Free Envelope Pool */
-
-#define FREE_ENV_POOL            0
-#define FREE_ENV_CB              (&Shm_Locked_queues[ FREE_ENV_POOL ])
-
-/*  The following are important when dealing with
- *  the shared memory communications interface area.
- *
- *  NOTE: The starting address and length of the shared memory
- *        is defined in a system dependent file.
- */
-
-#define START_NS_CBS     ((void *)Shm_Configuration->base)
-#define START_LQ_CBS     ((START_NS_CBS) + \
-        ( (sizeof (Shm_Node_status_control)) * (Shm_Maximum_nodes + 1) ) )
-#define START_ENVELOPES  ( ((void *) START_LQ_CBS) + \
-        ( (sizeof (Shm_Locked_queue_Control)) * (Shm_Maximum_nodes + 1) ) )
-#define END_SHMCI_AREA    ( (void *) START_ENVELOPES + \
-        ( (sizeof (Shm_Envelope_control)) * Shm_Maximum_envelopes ) )
-#define END_SHARED_MEM   (START_NS_CBS+Shm_Configuration->length)
-
-/* macros */
-
-#define Shm_Is_master_node()  \
-  ( SHM_MASTER == Shm_Local_node )
-
-#define Shm_Free_envelope( ecb ) \
-  Shm_Locked_queue_Add( FREE_ENV_CB, (ecb) )
-#define Shm_Allocate_envelope() \
-  Shm_Locked_queue_Get(FREE_ENV_CB)
-
-#define Shm_Initialize_receive_queue(node) \
-  Shm_Locked_queue_Initialize( &Shm_Locked_queues[node], node )
-
-#define Shm_Append_to_receive_queue(node, ecb) \
-  Shm_Locked_queue_Add( &Shm_Locked_queues[node], (ecb) )
-
-#define Shm_Envelope_control_to_packet_prefix_pointer(ecb)  \
-   ((void *)(ecb)->packet)
-
-#define Shm_Packet_prefix_to_envelope_control_pointer( pkt )   \
-   ((Shm_Envelope_control *)((rtems_unsigned8 *)(pkt) - \
-   (sizeof(Shm_Envelope_preamble) + SHM_ENVELOPE_PREFIX_OVERHEAD)))
-
-#define Shm_Build_preamble(ecb, node) \
-       (ecb)->Preamble.endian = Shm_Configuration->format
-
-#define Shm_Build_postamble( ecb )
-
-/* volatile types */
-
-typedef volatile rtems_unsigned8  vol_u8;
-typedef volatile rtems_unsigned32 vol_u32;
-
-/* shm control information */
-
-struct shm_info {
-  vol_u32 not_currently_used_0;
-  vol_u32 not_currently_used_1;
-  vol_u32 not_currently_used_2;
-  vol_u32 not_currently_used_3;
-};
-
-typedef struct {
-  /*byte start_of_text;*/
-  vol_u32 endian;
-  vol_u32 not_currently_used_0;
-  vol_u32 not_currently_used_1;
-  vol_u32 not_currently_used_2;
-} Shm_Envelope_preamble;
-
-typedef struct {
-} Shm_Envelope_postamble;
-
-/* WARNING! If you change this structure, don't forget to change
- *          SHM_ENVELOPE_PREFIX_OVERHEAD and
- *          Shm_Packet_prefix_to_envelope_control_pointer() above.
- */
-
-/*  This comment block describes the contents of each field
- *  of the Envelope Control Block:
- *
- *  next      - The index of the next envelope on this queue.
- *  queue     - The index of the queue this envelope is on.
- *  index     - The index of this envelope.
- *  Preamble  - Generic packet preamble.  One day this structure
- *              could be enhanced to contain routing information.
- *  packet    - RTEMS MPCI packet.  Untouched by SHM Driver
- *              other than copying and format conversion as
- *              documented in the RTEMS User's Guide.
- *  Postamble - Generic packet postamble.  One day this structure
- *              could be enhanced to contain checksum information.
- */
-
-typedef struct {
-  vol_u32           next;     /* next envelope on queue       */
-  vol_u32           queue;    /* queue on which this resides  */
-  vol_u32           index;    /* index into array of envelopes*/
-  vol_u32           pad0;     /* insure the next one is aligned */
-  Shm_Envelope_preamble    Preamble; /* header information           */
-  vol_u8            packet[MAX_PACKET_SIZE]; /* RTEMS INFO    */
-  Shm_Envelope_postamble   Postamble;/* trailer information          */
-} Shm_Envelope_control;
-
-/*  This comment block describes the contents of each field
- *  of the Locked Queue Control Block:
- *
- *  lock      - Lock used to insure mutually exclusive access.
- *  front     - Index of first envelope on queue.  This field
- *              is used to remove head of queue (receive).
- *  rear      - Index of last envelope on queue.  This field
- *              is used to add evelope to queue (send).
- *  owner     - The node number of the recipient (owning) node.
- *              RTEMS does not use the node number zero (0).
- *              The zero node is used by the SHM Driver for the
- *              Free Envelope Queue shared by all nodes.
- */
-
-typedef struct {
-  vol_u32 lock;  /* lock field for this queue    */
-  vol_u32 front; /* first envelope on queue      */
-  vol_u32 rear;  /* last envelope on queue       */
-  vol_u32 owner; /* receiving (i.e. owning) node */
-} Shm_Locked_queue_Control;
-
-/*  This comment block describes the contents of each field
- *  of the Node Status Control Block:
- *
- *  status    - Node status.  Current values are Pending Initialization,
- *              Initialization Complete, and Active Node.  Other values
- *              could be added to enhance fault tolerance.
- *  error     - Zero if the node has not failed.  Otherwise,
- *              this field contains a status indicating the
- *              failure reason.
- *  int_address, int_value, and int_length
- *            - These field are the Interrupt Information table
- *              for this node in neutral format.  This is how
- *              each node knows how to generate interrupts.
- */
-
-typedef struct {
-  vol_u32  status;         /* node status information     */
-  vol_u32  error;          /* fatal error code            */
-  vol_u32  int_address;    /* write here for interrupt    */
-  vol_u32  int_value;      /* this value causes interrupt */
-  vol_u32  int_length;     /* for this length (0,1,2,4)   */
-  vol_u32  not_currently_used_0;
-  vol_u32  not_currently_used_1;
-  vol_u32  not_currently_used_2;
-} Shm_Node_status_control;
-
-/*  This comment block describes the contents of each field
- *  of the Interrupt Information Table.  This table describes
- *  how another node can generate an interrupt to this node.
- *  This information is target board dependent.  If the
- *  SHM Driver is in POLLED_MODE, then all fields should
- *  be initialized to NO_INTERRUPT.
- *
- *  address   - The address to which another node should
- *              write to cause an interrupt.
- *  value     - The value which must be written
- *  length    - The size of the value to write.  Valid
- *              values are BYTE, WORD, and LONG.
- *
- *  NOTE:  The Node Status Control Block contains this
- *         information in neutral format and not in a
- *         structure to avoid potential alignment problems.
- */
-
-typedef struct {
-  vol_u32 *address;        /* write here for interrupt    */
-  vol_u32  value;          /* this value causes interrupt */
-  vol_u32  length;         /* for this length (0,1,2,4)   */
-} Shm_Interrupt_information;
-
-/*  SHM Configuration Table
- *
- *  This comment block describes the contents of each field
- *  of the SHM Configuration Table.
- *
- *  base       - The base address of the shared memory.  This
- *               address may be specific to this node.
- *  length     - The length of the shared memory in bytes.
- *  format     - The natural format for rtems_unsigned32's in the
- *               shared memory.  Valid values are currently
- *               only SHM_LITTLE and SHM_BIG.
- *  convert    - The address of the routine which converts
- *               between neutral and local format.
- *  poll_intr  - The operational mode of the driver.  Some
- *               target boards may not provide hardware for
- *               an interprocessor interrupt.  If POLLED_MODE
- *               is selected, the SHM driver will install a
- *               wrapper around the Clock_isr() to poll for
- *               incoming packets.  Throughput is dependent
- *               on the time between clock interrupts.
- *               Valid values are POLLED_MODE and INTR_MODE.
- *  cause_intr - This is the address of the routine used to
- *               write to a particular address and cause an
- *               interrupt on another node.  This routine
- *               may need to be target dependent if something
- *               other than a normal write from C does not work.
- *  Intr       - This structure describes the operation required
- *               to cause an interrupt to this node.  The actual
- *               contents of this structure are described above.
- */
-
-struct shm_config_info {
-  vol_u32           *base;     /* base address of SHM         */
-  vol_u32            length;   /* length (in bytes) of SHM    */
-  vol_u32            format;   /* SHM is big or little endian */
-  vol_u32          (*convert)();/* neutral conversion routine */
-  vol_u32            poll_intr;/* POLLED or INTR driven mode  */
-  void             (*cause_intr)( rtems_unsigned32 );
-  Shm_Interrupt_information   Intr;     /* cause intr information      */
-};
-
-typedef struct shm_config_info shm_config_table;
-
-/* global variables */
-
-#ifdef _SHM_INIT
-#define SHM_EXTERN
-#else
-#define SHM_EXTERN extern
-#endif
-
-SHM_EXTERN shm_config_table             *Shm_Configuration;
-SHM_EXTERN Shm_Interrupt_information    *Shm_Interrupt_table;
-SHM_EXTERN Shm_Node_status_control      *Shm_Node_statuses;
-SHM_EXTERN Shm_Locked_queue_Control     *Shm_Locked_queues;
-SHM_EXTERN Shm_Envelope_control         *Shm_Envelopes;
-SHM_EXTERN rtems_configuration_table    *Shm_RTEMS_Configuration;
-SHM_EXTERN rtems_multiprocessing_table  *Shm_RTEMS_MP_Configuration;
-SHM_EXTERN rtems_unsigned32              Shm_Receive_message_count;
-SHM_EXTERN rtems_unsigned32              Shm_Null_message_count;
-SHM_EXTERN rtems_unsigned32              Shm_Interrupt_count;
-SHM_EXTERN rtems_unsigned32              Shm_Local_node;
-SHM_EXTERN Shm_Locked_queue_Control      *Shm_Local_receive_queue;
-SHM_EXTERN Shm_Node_status_control       *Shm_Local_node_status;
-SHM_EXTERN rtems_unsigned32              Shm_isrstat;
-                                                     /* reported by shmdr */
-
-SHM_EXTERN rtems_unsigned32 Shm_Pending_initialization;
-SHM_EXTERN rtems_unsigned32 Shm_Initialization_complete;
-SHM_EXTERN rtems_unsigned32 Shm_Active_node;
-
-SHM_EXTERN rtems_unsigned32 Shm_Maximum_nodes;
-SHM_EXTERN rtems_unsigned32 Shm_Maximum_envelopes;
-
-SHM_EXTERN rtems_unsigned32 Shm_Locked_queue_End_of_list;
-SHM_EXTERN rtems_unsigned32 Shm_Locked_queue_Not_on_list;
-
-/* functions */
-
-/* locked queue routines */
-void           Shm_Locked_queue_Add(
-                  Shm_Locked_queue_Control *, Shm_Envelope_control * );
-Shm_Envelope_control *Shm_Locked_queue_Get( Shm_Locked_queue_Control * );
-void           Shm_Locked_queue_Initialize(
-                  Shm_Locked_queue_Control *, rtems_unsigned32 );
-            /* Shm_Initialize_lock is CPU dependent */
-            /* Shm_Lock is CPU dependent */
-            /* Shm_Unlock is CPU dependent */
-
-/* portable routines */
-void           Init_env_pool();
-void           Shm_Print_statistics( void );
-void           MPCI_Fatal( Internal_errors_Source, boolean, rtems_unsigned32 );
-rtems_task     Shm_Cause_interrupt( rtems_unsigned32 );
-void           Shm_Poll();
-void           Shm_setclockvec();
-void           Shm_Convert_packet( rtems_packet_prefix * );
-
-/* CPU specific routines are inlined in shmcpu.h */
-
-/* target specific routines */
-void          *Shm_Convert_address( void * );
-void           Shm_Get_configuration( rtems_unsigned32, shm_config_table ** );
-void           Shm_isr();
-void           Shm_setvec( void );
-
-void           Shm_Initialize_lock( Shm_Locked_queue_Control * );
-void           Shm_Lock( Shm_Locked_queue_Control * );
-void           Shm_Unlock( Shm_Locked_queue_Control * );
-
-/* MPCI entry points */
-rtems_mpci_entry Shm_Get_packet(
-  rtems_packet_prefix **
-);
-
-rtems_mpci_entry Shm_Initialization( void );
-
-rtems_mpci_entry Shm_Receive_packet(
-  rtems_packet_prefix **
-);
-
-rtems_mpci_entry Shm_Return_packet(
-  rtems_packet_prefix *
-);
-
-rtems_mpci_entry Shm_Send_packet(
-  rtems_unsigned32,
-  rtems_packet_prefix *
-);
-
-extern rtems_mpci_table MPCI_table;
-
-#ifdef _SHM_INIT
-
-/* multiprocessor communications interface (MPCI) table */
-
-rtems_mpci_table MPCI_table  = {
-  100000,                     /* default timeout value in ticks */
-  MAX_PACKET_SIZE,            /* maximum packet size */
-  Shm_Initialization,         /* initialization procedure   */
-  Shm_Get_packet,             /* get packet procedure       */
-  Shm_Return_packet,          /* return packet procedure    */
-  Shm_Send_packet,            /* packet send procedure      */
-  Shm_Receive_packet          /* packet receive procedure   */
-};
-
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/c/src/libmisc/README b/c/src/libmisc/README
deleted file mode 100644
index bbde4feeae..0000000000
--- a/c/src/libmisc/README
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-#  $Id$
-#
-
-This directory contains for the "miscellaneous" library.  Currently
-this library contains a number of useful support libraries:
-
-  + Task Stack Overflow Checker
-  + Workspace Consistency Checker
-  + Task Execution Time Monitor
-  + Period Statistics Monitor
-  + Debug Monitor
-
-The following ideas have been mentioned for items which could go
-in this library, but this list is not all inclusive:
-
-  + there are no outstanding suggestions.
-
-The intent of this library is to provide a home for useful utility routines
-which are dependent upon RTEMS.
-
---joel
-16 Sept 97
diff --git a/c/src/libmisc/assoc/Makefile.in b/c/src/libmisc/assoc/Makefile.in
deleted file mode 100644
index a547bb6565..0000000000
--- a/c/src/libmisc/assoc/Makefile.in
+++ /dev/null
@@ -1,52 +0,0 @@
-#	
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-LIB=${ARCH}/libassoc-tmp.a
-
-# C source names, if any, go here -- minus the .c
-C_PIECES=assoc
-C_FILES=$(C_PIECES:%=%.c)
-C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
-
-H_FILES=$(srcdir)/assoc.h
-
-SRCS=$(C_FILES) $(H_FILES) $(INSTALLED_H_FILES)
-OBJS=$(C_O_FILES)
-
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/lib.cfg
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES  +=
-CPPFLAGS += -I.
-CFLAGS   +=
-
-LD_PATHS  +=
-LD_LIBS   +=
-LDFLAGS   +=
-
-#
-# Add your list of files to delete here.  The config files
-#  already know how to delete some stuff, so you may want
-#  to just run 'make clean' first to see what gets missed.
-#  'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
-
-${LIB}: ${SRCS} ${OBJS}
-	$(make-library)
-
-all:	${ARCH} $(SRCS) $(LIB)
-	$(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems
diff --git a/c/src/libmisc/assoc/assoc.c b/c/src/libmisc/assoc/assoc.c
deleted file mode 100644
index 74387a8c5b..0000000000
--- a/c/src/libmisc/assoc/assoc.c
+++ /dev/null
@@ -1,260 +0,0 @@
-/*
- * assoc.c
- *      rtems assoc routines
- *
- *  $Id$
- */
-
-#include <rtems.h>
-#include "assoc.h"
-
-#include <stdio.h>              /* sprintf */
-#include <string.h>             /* strcat, strcmp */
-
-#define STREQ(a,b)      (strcmp((a), (b)) == 0)
-#define rtems_assoc_is_default(ap)  ((ap)->name && STREQ(ap->name, RTEMS_ASSOC_DEFAULT_NAME))
-
-const rtems_assoc_t *
-rtems_assoc_ptr_by_name(
-    const rtems_assoc_t *ap,
-    const char *name
-  )
-{
-    const rtems_assoc_t *default_ap = 0;
-
-    if (rtems_assoc_is_default(ap))
-        default_ap = ap++;
-    
-    for ( ; ap->name; ap++)
-        if (strcmp(ap->name, name) == 0)
-            return ap;
-
-    return default_ap;
-}
-
-const rtems_assoc_t *
-rtems_assoc_ptr_by_local(
-    const rtems_assoc_t *ap,
-    unsigned32     local_value
-  )
-{
-    const rtems_assoc_t *default_ap = 0;
-
-    if (rtems_assoc_is_default(ap))
-        default_ap = ap++;
-    
-    for ( ; ap->name; ap++)
-        if (ap->local_value == local_value)
-            return ap;
-
-    return default_ap;
-}
-
-
-const rtems_assoc_t *
-rtems_assoc_ptr_by_remote(
-    const rtems_assoc_t *ap,
-    unsigned32     remote_value
-  )
-{
-    const rtems_assoc_t *default_ap = 0;
-
-    if (rtems_assoc_is_default(ap))
-        default_ap = ap++;
-    
-    for ( ; ap->name; ap++)
-        if (ap->remote_value == remote_value)
-            return ap;
-
-    return default_ap;
-}
-
-
-/*
- * Get values
- */
-
-unsigned32
-rtems_assoc_remote_by_local(
-    const rtems_assoc_t *ap,
-    unsigned32     local_value
-  )
-{
-    const rtems_assoc_t *nap;
-    nap = rtems_assoc_ptr_by_local(ap, local_value);
-    if (nap)
-        return nap->remote_value;
-    
-    return 0;
-}
-
-unsigned32
-rtems_assoc_local_by_remote(
-    const rtems_assoc_t *ap,
-    unsigned32     remote_value
-  )
-{
-    const rtems_assoc_t *nap;
-    nap = rtems_assoc_ptr_by_remote(ap, remote_value);
-    if (nap)
-        return nap->local_value;
-    
-    return 0;
-}
-
-unsigned32
-rtems_assoc_remote_by_name(
-    const rtems_assoc_t *ap,
-    const char          *name
-  )
-{
-    const rtems_assoc_t *nap;
-    nap = rtems_assoc_ptr_by_name(ap, name);
-    if (nap)
-        return nap->remote_value;
-    
-    return 0;
-}
-
-unsigned32
-rtems_assoc_local_by_name(
-    const rtems_assoc_t *ap,
-    const char          *name
-  )
-{
-    const rtems_assoc_t *nap;
-    nap = rtems_assoc_ptr_by_name(ap, name);
-    if (nap)
-        return nap->local_value;
-    
-    return 0;
-}
-
-/*
- * what to return if a value is not found
- * this is not reentrant, but it really shouldn't be invoked anyway
- */
-
-const char *
-rtems_assoc_name_bad(
-    unsigned32 bad_value
-)
-{
-#ifdef RTEMS_DEBUG
-    static char bad_buffer[32];
-
-    sprintf(bad_buffer, "< %d [0x%x] >", bad_value, bad_value);
-#else
-    static char bad_buffer[32] = "<assoc.c: BAD NAME>";
-#endif
-    return bad_buffer;
-}
-
-
-const char *
-rtems_assoc_name_by_local(
-    const rtems_assoc_t *ap,
-    unsigned32     local_value
-  )
-{
-    const rtems_assoc_t *nap;
-    nap = rtems_assoc_ptr_by_local(ap, local_value);
-    if (nap)
-        return nap->name;
-    
-    return rtems_assoc_name_bad(local_value);
-}
-
-const char *
-rtems_assoc_name_by_remote(
-    const rtems_assoc_t *ap,
-    unsigned32     remote_value
-  )
-{
-    const rtems_assoc_t *nap;
-    nap = rtems_assoc_ptr_by_remote(ap, remote_value);
-    if (nap)
-        return nap->name;
-    
-    return rtems_assoc_name_bad(remote_value);
-}
-
-/*
- * Bitfield functions assume just 1 bit set in each of remote and local
- *      entries; they do not check for this.
- */
-
-unsigned32 rtems_assoc_remote_by_local_bitfield(
-    const rtems_assoc_t *ap,
-    unsigned32     local_value
-  )
-{  
-    unsigned32 b;
-    unsigned32 remote_value = 0;
-
-    for (b = 1; b; b <<= 1)
-        if (b & local_value)
-            remote_value |= rtems_assoc_remote_by_local(ap, b);
-        
-    return remote_value;
-}
-
-
-unsigned32 rtems_assoc_local_by_remote_bitfield(
-    const rtems_assoc_t *ap,
-    unsigned32     remote_value
-  )
-{  
-    unsigned32 b;
-    unsigned32 local_value = 0;
-
-    for (b = 1; b; b <<= 1)
-        if (b & remote_value)
-            local_value |= rtems_assoc_local_by_remote(ap, b);
-        
-    return local_value;
-}
-
-char *
-rtems_assoc_name_by_remote_bitfield(
-    const rtems_assoc_t *ap,
-    unsigned32     value,
-    char          *buffer
-  )
-{  
-    unsigned32 b;
-
-    *buffer = 0;
-
-    for (b = 1; b; b <<= 1)
-        if (b & value)
-        {
-            if (*buffer)
-                strcat(buffer, " ");
-            strcat(buffer, rtems_assoc_name_by_remote(ap, b));
-        }
-        
-    return buffer;
-}
-
-char *
-rtems_assoc_name_by_local_bitfield(
-    const rtems_assoc_t *ap,
-    unsigned32     value,
-    char          *buffer
-  )
-{  
-    unsigned32 b;
-
-    *buffer = 0;
-
-    for (b = 1; b; b <<= 1)
-        if (b & value)
-        {
-            if (*buffer)
-                strcat(buffer, " ");
-            strcat(buffer, rtems_assoc_name_by_local(ap, b));
-        }
-        
-    return buffer;
-}
diff --git a/c/src/libmisc/assoc/assoc.h b/c/src/libmisc/assoc/assoc.h
deleted file mode 100644
index 1982d654ac..0000000000
--- a/c/src/libmisc/assoc/assoc.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *
- *  Rtems associativity routines.  Mainly used to convert a value from
- *  one space to another (eg: our errno's to host errno's and v.v)
- *
- *
- *  $Id$
- */
-
-#ifndef _INCLUDE_ASSOC_H
-#define _INCLUDE_ASSOC_H
-
-typedef struct {
-    const char   *name;
-    unsigned32   local_value;
-    unsigned32   remote_value;
-} rtems_assoc_t;
-
-/*
- * Flag/marker for optional default value in each table
- */
-
-#define RTEMS_ASSOC_DEFAULT_NAME "(default)"
-
-const rtems_assoc_t *rtems_assoc_ptr_by_name(const rtems_assoc_t *, const char *);
-const rtems_assoc_t *rtems_assoc_ptr_by_value(const rtems_assoc_t *, unsigned32);
-const rtems_assoc_t *rtems_assoc_ptr_by_remote(const rtems_assoc_t *, unsigned32);
-
-unsigned32   rtems_assoc_remote_by_local(const rtems_assoc_t *, unsigned32);
-unsigned32   rtems_assoc_local_by_remote(const rtems_assoc_t *, unsigned32);
-unsigned32   rtems_assoc_remote_by_name(const rtems_assoc_t *, const char *);
-unsigned32   rtems_assoc_local_by_name(const rtems_assoc_t *, const char *);
-const char  *rtems_assoc_name_by_local(const rtems_assoc_t *, unsigned32);
-const char  *rtems_assoc_name_by_remote(const rtems_assoc_t *, unsigned32);
-
-unsigned32   rtems_assoc_remote_by_local_bitfield(const rtems_assoc_t *, unsigned32);
-char  *rtems_assoc_name_by_local_bitfield(const rtems_assoc_t *, unsigned32, char *);
-char  *rtems_assoc_name_by_remote_bitfield(const rtems_assoc_t *, unsigned32, char *);
-unsigned32   rtems_assoc_local_by_remote_bitfield(const rtems_assoc_t *, unsigned32);
-
-
-#endif /* ! _INCLUDE_ASSOC_H */
diff --git a/c/src/libmisc/cpuuse/Makefile.in b/c/src/libmisc/cpuuse/Makefile.in
deleted file mode 100644
index 391b6cac8f..0000000000
--- a/c/src/libmisc/cpuuse/Makefile.in
+++ /dev/null
@@ -1,54 +0,0 @@
-#	
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-LIB=${ARCH}/libcpuuse-tmp.a
-
-# C source names, if any, go here -- minus the .c
-C_PIECES=cpuuse
-C_FILES=$(C_PIECES:%=%.c)
-C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
-
-H_FILES=
-INSTALLED_H_FILES=$(srcdir)/cpuuse.h
-
-SRCS=$(C_FILES) $(H_FILES) $(INSTALLED_H_FILES)
-OBJS=$(C_O_FILES)
-
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/lib.cfg
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES  +=
-CPPFLAGS += -I.
-CFLAGS   +=
-
-LD_PATHS  +=
-LD_LIBS   +=
-LDFLAGS   +=
-
-#
-# Add your list of files to delete here.  The config files
-#  already know how to delete some stuff, so you may want
-#  to just run 'make clean' first to see what gets missed.
-#  'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
-
-${LIB}: ${SRCS} ${OBJS}
-	$(make-library)
-
-all: ${ARCH} $(SRCS) $(LIB)
-	$(INSTALL) -m 444 ${INSTALLED_H_FILES} $(PROJECT_INCLUDE)
-#	$(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems
diff --git a/c/src/libmisc/cpuuse/README b/c/src/libmisc/cpuuse/README
deleted file mode 100644
index 20e76f07bc..0000000000
--- a/c/src/libmisc/cpuuse/README
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-#  $Id$
-#
-
-This directory contains a stack bounds checker.  It provides two
-primary features:
-
-   + check for stack overflow at each context switch
-   + provides an educated guess at each task's stack usage
-
-The stack overflow check at context switch works by looking for
-a 16 byte pattern at the logical end of the stack to be corrupted.
-The "guesser" assumes that the entire stack was prefilled with a known
-pattern and assumes that the pattern is still in place if the memory
-has not been used as a stack.
-
-Both of these can be fooled by pushing large holes onto the stack
-and not writing to them... or (much more unlikely) writing the
-magic patterns into memory.
-
-This code has not been extensively tested.  It is provided as a tool
-for RTEMS users to catch the most common mistake in multitasking
-systems ... too little stack space.  Suggestions and comments are appreciated.
-
-NOTES:
-
-1.  Stack usage information is questionable on CPUs which push
-    large holes on stack.
-
-2.  The stack checker has a tendency to generate a fault when
-    trying to print the helpful diagnostic message.  If it comes
-    out, congratulations. If not, then the variable Stack_check_Blown_task
-    contains a pointer to the TCB of the offending task.  This
-    is usually enough to go on.
-
-FUTURE:
-
-1.  Determine how/if gcc will generate stack probe calls and support that.
-
-2.  Get accurate stack usage numbers on i960.. it pushes very large
-    holes on the stack.
diff --git a/c/src/libmisc/cpuuse/cpuuse.c b/c/src/libmisc/cpuuse/cpuuse.c
deleted file mode 100644
index db43fbf3ee..0000000000
--- a/c/src/libmisc/cpuuse/cpuuse.c
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- *  CPU Usage Reporter
- *
- *  COPYRIGHT (c) 1989-1998. 1996.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- *
- */
-
-#include <rtems.h>
-
-extern rtems_configuration_table BSP_Configuration;
-
-#include <assert.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include "cpuuse.h"
-
-unsigned32 CPU_usage_Ticks_at_last_reset;
-
-/*PAGE
- *
- *  CPU_usage_Dump
- */
-
-void CPU_usage_Dump( void )
-{
-  unsigned32           i;
-  unsigned32           class_index;
-  Thread_Control      *the_thread;
-  Objects_Information *information;
-  unsigned32           u32_name;
-  char                 name[5];
-  unsigned32           total_units = 0;
-
-  for ( class_index = OBJECTS_CLASSES_FIRST ;
-        class_index <= OBJECTS_CLASSES_LAST ;
-        class_index++ ) {
-    information = _Objects_Information_table[ class_index ];
-    if ( information && information->is_thread ) {
-      for ( i=1 ; i <= information->maximum ; i++ ) {
-        the_thread = (Thread_Control *)information->local_table[ i ];
- 
-        if ( the_thread )
-          total_units += the_thread->ticks_executed;
-      }
-    }
-  }
-
-  printf("CPU Usage by thread\n");
-#if defined(unix) || ( CPU_HARDWARE_FP == TRUE )
-  printf( "   ID        NAME        TICKS    PERCENT\n" );
-#else
-  printf( "   ID        NAME        TICKS\n" );
-#endif
-
-  for ( class_index = OBJECTS_CLASSES_FIRST ; 
-        class_index <= OBJECTS_CLASSES_LAST ; 
-        class_index++ ) {
-    information = _Objects_Information_table[ class_index ];
-    if ( information && information->is_thread ) {
-      for ( i=1 ; i <= information->maximum ; i++ ) {
-        the_thread = (Thread_Control *)information->local_table[ i ];
-        
-        if ( !the_thread )
-          continue;
-
-        u32_name = *(unsigned32 *)the_thread->Object.name;
-
-        name[ 0 ] = (u32_name >> 24) & 0xff;
-        name[ 1 ] = (u32_name >> 16) & 0xff;
-        name[ 2 ] = (u32_name >>  8) & 0xff;
-        name[ 3 ] = (u32_name >>  0) & 0xff;
-        name[ 4 ] = '\0';
-
-#if defined(unix) || ( CPU_HARDWARE_FP == TRUE )
-        printf( "0x%08x   %4s    %8d     %5.3f\n",
-          the_thread->Object.id,
-          name,
-          the_thread->ticks_executed,
-          (total_units) ? 
-            (double)the_thread->ticks_executed / (double)total_units :
-            (double)total_units
-        );
-#else
-        printf( "0x%08x   %4s   %8d\n",
-          the_thread->Object.id,
-          name,
-          the_thread->ticks_executed
-        );
-#endif
-      }
-    }
-  }
-
-  printf(
-    "\nTicks since last reset = %d\n",
-    _Watchdog_Ticks_since_boot - CPU_usage_Ticks_at_last_reset
-  );
-  printf( "\nTotal Units = %d\n", total_units );
-}
-
-/*PAGE
- *
- *  CPU_usage_Reset
- */
-
-void CPU_usage_Reset( void )
-{
-  unsigned32           i;
-  unsigned32           class_index;
-  Thread_Control      *the_thread;
-  Objects_Information *information;
- 
-  CPU_usage_Ticks_at_last_reset = _Watchdog_Ticks_since_boot;
-
-  for ( class_index = OBJECTS_CLASSES_FIRST ;
-        class_index <= OBJECTS_CLASSES_LAST ;
-        class_index++ ) {
-    information = _Objects_Information_table[ class_index ];
-    if ( information && information->is_thread ) {
-      for ( i=1 ; i <= information->maximum ; i++ ) {
-        the_thread = (Thread_Control *)information->local_table[ i ];
- 
-        if ( !the_thread )
-          continue;
- 
-        the_thread->ticks_executed = 0;
-      }
-    }
-  }
- 
-}
-
diff --git a/c/src/libmisc/cpuuse/cpuuse.h b/c/src/libmisc/cpuuse/cpuuse.h
deleted file mode 100644
index bc678bb284..0000000000
--- a/c/src/libmisc/cpuuse/cpuuse.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*  cpuuse.h
- *
- *  This include file contains information necessary to utilize
- *  and install the cpu usage reporting mechanism.
- *
- *  COPYRIGHT (c) 1989-1998. 1996.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __CPU_USE_h
-#define __CPU_USE_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- *  CPU_usage_Dump
- */
-
-void CPU_usage_Dump( void );
-
-/*
- *  CPU_usage_Reset
- */
-
-void CPU_usage_Reset( void );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/c/src/libmisc/cpuuse/internal.h b/c/src/libmisc/cpuuse/internal.h
deleted file mode 100644
index 96d0c3f10a..0000000000
--- a/c/src/libmisc/cpuuse/internal.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/*  internal.h
- *
- *  This include file contains internal information
- *  for the RTEMS stack checker.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __INTERNAL_STACK_CHECK_h
-#define __INTERNAL_STACK_CHECK_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- *  This structure is used to fill in and compare the "end of stack"
- *  marker pattern.
- *  pattern area must be a multiple of 4 words.
- */
-
-#ifdef CPU_STACK_CHECK_SIZE
-#define PATTERN_SIZE_WORDS      (((CPU_STACK_CHECK_SIZE / 4) + 3) & ~0x3)
-#else
-#define PATTERN_SIZE_WORDS      4
-#endif
-
-#define PATTERN_SIZE_BYTES      (PATTERN_SIZE_WORDS * 4)
-
-typedef struct {
-   unsigned32  pattern[ PATTERN_SIZE_WORDS ];
-} Stack_check_Control;
-
-/*
- *  The pattern used to fill the entire stack.
- */
-
-#define BYTE_PATTERN 0xA5
-#define U32_PATTERN 0xA5A5A5A5
-
-/*
- *  Stack_check_Create_extension
- */
-
-boolean Stack_check_Create_extension(
-  Thread_Control *running,
-  Thread_Control *the_thread
-);
-
-/*
- *  Stack_check_Begin_extension
- */
-
-void Stack_check_Begin_extension(
-  Thread_Control *the_thread
-);
-
-/*
- *  Stack_check_Switch_extension
- */
-
-void Stack_check_Switch_extension(
-  Thread_Control *running,
-  Thread_Control *heir
-);
-
-/*
- *  Stack_check_Fatal_extension
- */
-
-void Stack_check_Fatal_extension(
-    Internal_errors_Source  source,
-    boolean                 is_internal,
-    unsigned32              status
-);
-
-/*
- *  Stack_check_Dump_usage
- */
-
-void Stack_check_Dump_usage( void );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/c/src/libmisc/error/Makefile.in b/c/src/libmisc/error/Makefile.in
deleted file mode 100644
index 5cc51de586..0000000000
--- a/c/src/libmisc/error/Makefile.in
+++ /dev/null
@@ -1,52 +0,0 @@
-#	
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-LIB=${ARCH}/liberror-tmp.a
-
-# C source names, if any, go here -- minus the .c
-C_PIECES=error
-C_FILES=$(C_PIECES:%=%.c)
-C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
-
-H_FILES=$(srcdir)/error.h
-
-SRCS=$(C_FILES) $(H_FILES) $(INSTALLED_H_FILES)
-OBJS=$(C_O_FILES)
-
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/lib.cfg
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES  +=
-CPPFLAGS += -I.
-CFLAGS   +=
-
-LD_PATHS  +=
-LD_LIBS   +=
-LDFLAGS   +=
-
-#
-# Add your list of files to delete here.  The config files
-#  already know how to delete some stuff, so you may want
-#  to just run 'make clean' first to see what gets missed.
-#  'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
-
-${LIB}: ${SRCS} ${OBJS}
-	$(make-library)
-
-all:	${ARCH} $(SRCS) $(LIB)
-	$(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems
diff --git a/c/src/libmisc/error/error.c b/c/src/libmisc/error/error.c
deleted file mode 100644
index dd32fb8b66..0000000000
--- a/c/src/libmisc/error/error.c
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- *  report errors and panics to RTEMS' stderr.
- *  Currently just used by RTEMS monitor.
- *
- *  $Id$
- */
-
-
-/*
- * These routines provide general purpose error reporting.
- * rtems_error reports an error to stderr and allows use of
- * printf style formatting.  A newline is appended to all messages.
- * 
- * error_flag can be specified as any of the following:
- *
- *  	RTEMS_ERROR_ERRNO       -- include errno text in output
- *  	RTEMS_ERROR_PANIC       -- halts local system after output
- *  	RTEMS_ERROR_ABORT       -- abort after output
- *
- * It can also include a rtems_status value which can be OR'd
- * with the above flags. * 
- *
- * EXAMPLE
- *	#include <rtems.h>
- *	#include <rtems/error.h>
- *	rtems_error(0, "stray interrupt %d", intr);
- *
- * EXAMPLE
- *        if ((status = rtems_task_create(...)) != RTEMS_SUCCCESSFUL)
- *        {
- *            rtems_error(status | RTEMS_ERROR_ABORT,
- *                        "could not create task");
- *        }
- *
- * EXAMPLE
- *        if ((fd = open(pathname, O_RDNLY)) < 0)
- *        {
- *            rtems_error(RTEMS_ERROR_ERRNO, "open of '%s' failed", pathname);
- *            goto failed;
- *        }
- */
-
-#define __RTEMS_VIOLATE_KERNEL_VISIBILITY__
-#include <rtems.h>
-
-#include "error.h"
-#include <rtems/assoc.h>
-
-#include <stdio.h>
-#include <stdarg.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>		/* _exit() */
-
-/* bug in hpux <errno.h>: no prototypes unless you are C++ */
-#ifdef hpux9
-char *strerror(int);
-#endif
-
-extern char *rtems_progname;
-int          rtems_panic_in_progress;
-
-rtems_assoc_t rtems_status_assoc[] = {
-    { "successful completion",              RTEMS_SUCCESSFUL, },
-    { "returned from a thread",             RTEMS_TASK_EXITTED, },
-    { "multiprocessing not configured",     RTEMS_MP_NOT_CONFIGURED, },
-    { "invalid object name",                RTEMS_INVALID_NAME, },
-    { "invalid object id",                  RTEMS_INVALID_ID, },
-    { "too many",                           RTEMS_TOO_MANY, },
-    { "timed out waiting",                  RTEMS_TIMEOUT, },
-    { "object deleted while waiting",       RTEMS_OBJECT_WAS_DELETED, },
-    { "specified size was invalid",         RTEMS_INVALID_SIZE, },
-    { "address specified is invalid",       RTEMS_INVALID_ADDRESS, },
-    { "number was invalid",                 RTEMS_INVALID_NUMBER, },
-    { "item has not been initialized",      RTEMS_NOT_DEFINED, },
-    { "resources still outstanding",        RTEMS_RESOURCE_IN_USE, },
-    { "request not satisfied",              RTEMS_UNSATISFIED, },
-    { "thread is in wrong state",           RTEMS_INCORRECT_STATE, },
-    { "thread already in state",            RTEMS_ALREADY_SUSPENDED, },
-    { "illegal on calling thread",          RTEMS_ILLEGAL_ON_SELF, },
-    { "illegal for remote object",          RTEMS_ILLEGAL_ON_REMOTE_OBJECT, },
-    { "called from wrong environment",      RTEMS_CALLED_FROM_ISR, },
-    { "invalid thread priority",            RTEMS_INVALID_PRIORITY, },
-    { "invalid date/time",                  RTEMS_INVALID_CLOCK, },
-    { "invalid node id",                    RTEMS_INVALID_NODE, },
-    { "directive not configured",           RTEMS_NOT_CONFIGURED, },
-    { "not owner of resource",              RTEMS_NOT_OWNER_OF_RESOURCE , },
-    { "directive not implemented",          RTEMS_NOT_IMPLEMENTED, },
-    { "RTEMS inconsistency detected",       RTEMS_INTERNAL_ERROR, },
-    { "could not get enough memory",        RTEMS_NO_MEMORY, },
-    { "internal multiprocessing only",      THREAD_STATUS_PROXY_BLOCKING, },
-    { 0, 0, 0 },
-};
-
-
-const char *
-rtems_status_text(
-    rtems_status_code status
-)
-{
-    return rtems_assoc_name_by_local(rtems_status_assoc, status);
-}
-
-
-static int rtems_verror(
-    unsigned32   error_flag,
-    const char   *printf_format,
-    va_list      arglist
-)
-{
-    int               local_errno = 0;
-    int               chars_written = 0;
-    rtems_status_code status;
-
-    if (error_flag & RTEMS_ERROR_PANIC)
-    {
-        if (rtems_panic_in_progress++)
-            _Thread_Disable_dispatch();       /* disable task switches */
-
-        /* don't aggravate things */
-        if (rtems_panic_in_progress > 2)
-            return 0;
-    }
-
-    (void) fflush(stdout);  	    /* in case stdout/stderr same */
-
-    status = error_flag & ~RTEMS_ERROR_MASK;
-    if (error_flag & RTEMS_ERROR_ERRNO)     /* include errno? */
-        local_errno = errno;
-
-    if (_System_state_Is_multiprocessing)
-        fprintf(stderr, "[%d] ", _Configuration_MP_table->node);
-    
-    if (rtems_progname && *rtems_progname)
-        chars_written += fprintf(stderr, "%s: ", rtems_progname);
-    chars_written += vfprintf(stderr, printf_format, arglist);
-    
-    if (status)
-        chars_written += fprintf(stderr, " (status: %s)", rtems_status_text(status));
-
-    if (local_errno)
-    {
-      if ((local_errno > 0) && *strerror(local_errno))
-        chars_written += fprintf(stderr, " (errno: %s)", strerror(local_errno));
-      else
-        chars_written += fprintf(stderr, " (unknown errno=%d)", local_errno);
-    }
-    
-    chars_written += fprintf(stderr, "\n");
-
-    (void) fflush(stderr);
-
-    if (error_flag & (RTEMS_ERROR_PANIC | RTEMS_ERROR_ABORT))
-    {
-        if (error_flag & RTEMS_ERROR_PANIC)
-        {
-            rtems_error(0, "fatal error, exiting");
-            _exit(local_errno);
-        }
-        else
-        {
-            rtems_error(0, "fatal error, aborting");
-            abort();
-        }
-    }
-    return chars_written;
-}
-
-
-/*
- * Report an error.
- * error_flag is as above; printf_format is a normal
- * printf(3) format string, with its concommitant arguments.
- * 
- * Returns the number of characters written.
- */
-
-int rtems_error(
-    int   error_flag,
-    const char *printf_format,
-    ...
-  )
-{
-    va_list arglist;
-    int chars_written;
-
-    va_start(arglist, printf_format);
-    chars_written = rtems_verror(error_flag, printf_format, arglist);
-    va_end(arglist);
-    
-    return chars_written;
-}
-
-/* 
- * rtems_panic is shorthand for rtems_error(RTEMS_ERROR_PANIC, ...)
- */
-
-void rtems_panic(
-    const char *printf_format,
-    ...
-  )
-{
-    va_list arglist;
-
-    va_start(arglist, printf_format);
-    (void) rtems_verror(RTEMS_ERROR_PANIC, printf_format, arglist);
-    va_end(arglist);
-}
diff --git a/c/src/libmisc/error/error.h b/c/src/libmisc/error/error.h
deleted file mode 100644
index a0698afb5d..0000000000
--- a/c/src/libmisc/error/error.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- *  Defines and externs for rtems error reporting
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_ERROR_h
-#define __RTEMS_ERROR_h
-
-/*
- * rtems_error() and rtems_panic() support
- */
-
-#define RTEMS_ERROR_ERRNO  (1<<((sizeof(int) * 8) - 2)) /* hi bit; use 'errno' */
-#define RTEMS_ERROR_PANIC  (RTEMS_ERROR_ERRNO / 2)       /* err fatal; no return */
-#define RTEMS_ERROR_ABORT  (RTEMS_ERROR_ERRNO / 4)       /* err is fatal; panic */
-
-#define RTEMS_ERROR_MASK  (RTEMS_ERROR_ERRNO | RTEMS_ERROR_ABORT | \
-                             RTEMS_ERROR_PANIC) /* all */
-
-const char *rtems_status_text(rtems_status_code);
-int   rtems_error(int error_code, const char *printf_format, ...);
-#ifdef __GNUC__
-void  rtems_panic(const char *printf_format, ...);
-/*
- *  We should be able to use this attribute but gcc complains that
- *  rtems_panic does in fact return. :(
- *
- *      __attribute__ ((__noreturn__));
- */
-#else
-void  rtems_panic(const char *printf_format, ...);
-#endif
-
-extern int rtems_panic_in_progress;
-
-#endif
-/* end of include file */
diff --git a/c/src/libmisc/monitor/Makefile.in b/c/src/libmisc/monitor/Makefile.in
deleted file mode 100644
index 1ed5d13cb1..0000000000
--- a/c/src/libmisc/monitor/Makefile.in
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-LIB=${ARCH}/libmonitor-tmp.a
-# C source names, if any, go here -- minus the .c
-C_PIECES=mon-command mon-symbols mon-prmisc mon-monitor mon-object mon-server \
-	 mon-task mon-queue mon-driver mon-dname mon-itask \
-	 mon-extension mon-manager mon-config mon-mpci
-C_FILES=$(C_PIECES:%=%.c)
-C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
-
-H_FILES=
-INSTALLED_H_FILES=$(srcdir)/monitor.h $(srcdir)/symbols.h
-
-SRCS=README $(C_FILES) $(H_FILES) $(INSTALLED_H_FILES)
-OBJS=$(C_O_FILES)
-
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/lib.cfg
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES  +=
-CPPFLAGS += -I$(srcdir)
-CFLAGS   +=
-
-LD_PATHS  +=
-LD_LIBS   +=
-LDFLAGS   +=
-
-#
-# Add your list of files to delete here.  The config files
-#  already know how to delete some stuff, so you may want
-#  to just run 'make clean' first to see what gets missed.
-#  'make clobber' already includes 'make clean'
-#
-
-.PHONY: preinstall
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
-
-${LIB}: ${SRCS} ${OBJS}
-	$(make-library)
-
-all:	preinstall ${ARCH} $(SRCS) $(LIB)
-
-preinstall: $(INSTALLED_H_FILES)
-	$(INSTALL) -m 444 ${INSTALLED_H_FILES} $(PROJECT_INCLUDE)/rtems
diff --git a/c/src/libmisc/monitor/README b/c/src/libmisc/monitor/README
deleted file mode 100644
index d5a73da140..0000000000
--- a/c/src/libmisc/monitor/README
+++ /dev/null
@@ -1,97 +0,0 @@
-#
-#  $Id$
-#
-
-monitor task
-
-The monitor task is an optional task that knows about RTEMS
-data structures and can print out information about them.
-It is a work-in-progress and needs many more commands, but
-is useful now.
-
-The monitor works best when it is the highest priority task,
-so all your other tasks should ideally be at some priority
-greater than 1.
-
-To use the monitor:
--------------------
-
-    #include <rtems/monitor.h>
-
-        ...
-
-    rtems_monitor_init(0);
-
-    The parameter to rtems_monitor_init() tells the monitor whether
-    to suspend itself on startup.  A value of 0 causes the monitor
-    to immediately enter command mode; a non-zero value causes the
-    monitor to suspend itself after creation and wait for explicit
-    wakeup.
-
-
-    rtems_monitor_wakeup();
-    
-    wakes up a suspended monitor and causes it to reenter command mode.
-
-Monitor commands
-----------------
-
-    The monitor prompt is 'rtems> '.
-    Can abbreviate commands to "uniquity"
-    There is a 'help' command.  Here is the output from various
-    help commands:
-
-        Commands (may be abbreviated)
-
-          help      -- get this message or command specific help
-          task      -- show task information
-          queue     -- show message queue information
-          symbol    -- show entries from symbol table
-          pause     -- pause monitor for a specified number of ticks
-          fatal     -- invoke a fatal RTEMS error
-
-        task [id [id ...] ]
-          display information about the specified tasks.
-          Default is to display information about all tasks on this node
-
-        queue [id [id ... ] ]
-          display information about the specified message queues
-          Default is to display information about all queues on this node
-
-        symbol [ symbolname [symbolname ... ] ]
-          display value associated with specified symbol.
-          Defaults to displaying all known symbols.
-
-        pause [ticks]
-          monitor goes to "sleep" for specified ticks (default is 1)
-          monitor will resume at end of period or if explicitly awakened
-
-        fatal [status]
-          Invoke 'rtems_fatal_error_occurred' with 'status'
-          (default is RTEMS_INTERNAL_ERROR)
-
-        continue
-          put the monitor to sleep waiting for an explicit wakeup from the
-          program running.
-
-
-Sample output from 'task' command
----------------------------------
-
-    rtems> task
-      ID       NAME   PRIO   STAT   MODES  EVENTS   WAITID  WAITARG  NOTES
-    ------------------------------------------------------------------------
-    00010001   UI1     2    READY    P:T:nA    NONE15: 0x40606348
-    00010002   RMON    1    READY    nP    NONE15: 0x40604110
-
-    'RMON' is the monitor itself, so we have 1 "user" task.
-    Its modes are P:T:nA which translate to:
-
-        preemptable
-        timesliced
-        no ASRS
-
-    It has no events.
-    It has a notepad value for notepad 15 which is 0x40606348
-    (this is the libc thread state)
-
diff --git a/c/src/libmisc/monitor/mon-command.c b/c/src/libmisc/monitor/mon-command.c
deleted file mode 100644
index 1fe495e0ae..0000000000
--- a/c/src/libmisc/monitor/mon-command.c
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * Command parsing routines for RTEMS monitor
- *
- * TODO:
- *
- *  $Id$
- */
-
-#include <rtems.h>
-
-#include <rtems/monitor.h>
-
-#include <stdio.h>
-#include <string.h>
-
-/*
- * make_argv(cp): token-count
- *	Break up the command line in 'cp' into global argv[] and argc (return
- *	value).
- */
-
-int
-rtems_monitor_make_argv(
-    char *cp,
-    int  *argc_p,
-    char **argv)
-{
-    int argc = 0;
-
-    while ((cp = strtok(cp, " \t\n\r")))
-    {
-	argv[argc++] = cp;
-	cp = (char *) NULL;
-    }
-    argv[argc] = (char *) NULL;			/* end of argv */
-
-    return *argc_p = argc;
-}
-
-
-/*
- * Read and break up a monitor command
- *
- * We have to loop on the gets call, since it will return NULL under UNIX
- *  RTEMS when we get a signal (eg: SIGALRM).
- */
-
-int
-rtems_monitor_command_read(char *command,
-                           int  *argc,
-                           char **argv)
-{
-    extern rtems_configuration_table  BSP_Configuration;
-    static char monitor_prompt[32];
-    
-    /*
-     * put node number in the prompt if we are multiprocessing
-     */
-
-    if (BSP_Configuration.User_multiprocessing_table == 0)
-        sprintf(monitor_prompt, "%s", MONITOR_PROMPT);
-    else if (rtems_monitor_default_node != rtems_monitor_node)
-        sprintf(monitor_prompt, "%d-%s-%d", rtems_monitor_node, MONITOR_PROMPT, rtems_monitor_default_node);
-    else
-        sprintf(monitor_prompt, "%d-%s", rtems_monitor_node, MONITOR_PROMPT);
-
-#ifdef RTEMS_UNIX
-    /* RTEMS on unix gets so many interrupt system calls this is hosed */
-    printf("%s> ", monitor_prompt);
-    fflush(stdout);
-    while (gets(command) == (char *) 0)
-        ;
-#else
-    do
-    {
-        printf("%s> ", monitor_prompt);
-        fflush(stdout);
-    } while (gets(command) == (char *) 0);
-#endif
-
-    return rtems_monitor_make_argv(command, argc, argv);
-}
-
-/*
- * Look up a command in a command table
- *
- */
-
-rtems_monitor_command_entry_t *
-rtems_monitor_command_lookup(
-    rtems_monitor_command_entry_t *table,
-    int                            argc,
-    char                          **argv
-)
-{
-    rtems_monitor_command_entry_t *p;
-    rtems_monitor_command_entry_t *abbreviated_match = 0;
-    int abbreviated_matches = 0;
-    char *command;
-    int command_length;
-
-    command = argv[0];
-
-    if ((table == 0) || (command == 0))
-        goto failed;
-    
-    command_length = strlen(command);
-
-    for (p = table; p->command; p++)
-        if (STREQ(command, p->command))    /* exact match */
-            goto done;
-        else if (STRNEQ(command, p->command, command_length))
-        {
-            abbreviated_matches++;
-            abbreviated_match = p;
-        }
-
-    /* no perfect match; is there a non-ambigous abbreviated match? */
-    if ( ! abbreviated_match)
-    {
-        printf("Unrecognized command '%s'; try 'help'\n", command);
-        goto failed;
-    }    
-
-    if (abbreviated_matches > 1)
-    {
-        printf("Command '%s' is ambiguous; try 'help'\n", command);
-        goto failed;
-    }
-    
-    p = abbreviated_match;
-
-done:
-    if (p->command_function == 0)
-        goto failed;
-    return p;
-
-failed:
-    return 0;
-}
-
-void
-rtems_monitor_command_usage(rtems_monitor_command_entry_t *table,
-                            char *command_string)
-{
-    rtems_monitor_command_entry_t *help = 0;
-    char *help_command_argv[2];
-    
-    /* if first entry in table is a usage, then print it out */
-    if (command_string == 0)
-    {        
-        if (STREQ(table->command, "--usage--") && table->usage)
-            help = table;
-    }
-    else
-    {
-        help_command_argv[0] = command_string;
-        help_command_argv[1] = 0;
-        help = rtems_monitor_command_lookup(table, 1, help_command_argv);
-    }
-
-    if (help)
-        printf("%s\n", help->usage);
-}
-
-
-void
-rtems_monitor_help_cmd(
-    int          argc,
-    char       **argv,
-    unsigned32   command_arg,
-    boolean verbose
-)
-{
-    int arg;
-    rtems_monitor_command_entry_t *command;
-
-    command = (rtems_monitor_command_entry_t *) command_arg;
-    
-    if (argc == 1)
-        rtems_monitor_command_usage(command, 0);
-    else
-    {
-        for (arg=1; argv[arg]; arg++)
-            rtems_monitor_command_usage(command, argv[arg]);
-    }
-}
diff --git a/c/src/libmisc/monitor/mon-config.c b/c/src/libmisc/monitor/mon-config.c
deleted file mode 100644
index 5efd480b14..0000000000
--- a/c/src/libmisc/monitor/mon-config.c
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * RTEMS Config display support
- *
- * TODO
- *
- *  $Id$
- */
-
-
-#define __RTEMS_VIOLATE_KERNEL_VISIBILITY__
-#include <rtems.h>
-#include <rtems/monitor.h>
-
-#include <stdio.h>
-#include <stdlib.h>             /* strtoul() */
-
-#define DATACOL 15
-#define CONTCOL DATACOL		/* continued col */
-
-/*
- * Fill in entire monitor config table
- * for sending to a remote monitor or printing on the local system
- */
-
-void
-rtems_monitor_config_canonical(
-    rtems_monitor_config_t *canonical_config,
-    void                   *config_void
-)
-{
-    rtems_configuration_table *c = (rtems_configuration_table *) config_void;
-    rtems_api_configuration_table *r = c->RTEMS_api_configuration;
-
-    canonical_config->work_space_start = c->work_space_start;
-    canonical_config->work_space_size = c->work_space_size;
-    canonical_config->maximum_tasks = r->maximum_tasks;
-    canonical_config->maximum_timers = r->maximum_timers;
-    canonical_config->maximum_semaphores = r->maximum_semaphores;
-    canonical_config->maximum_message_queues = r->maximum_message_queues;
-    canonical_config->maximum_partitions = r->maximum_partitions;
-    canonical_config->maximum_regions = r->maximum_regions;
-    canonical_config->maximum_ports = r->maximum_ports;
-    canonical_config->maximum_periods = r->maximum_periods;
-    canonical_config->maximum_extensions = c->maximum_extensions;
-    canonical_config->microseconds_per_tick = c->microseconds_per_tick;
-    canonical_config->ticks_per_timeslice = c->ticks_per_timeslice;
-    canonical_config->number_of_initialization_tasks = r->number_of_initialization_tasks;
-}    
-
-/*
- * This is easy, since there is only 1 (altho we could get them from
- *    other nodes...)
- */
-
-void *
-rtems_monitor_config_next(
-    void                  *object_info,
-    rtems_monitor_config_t *canonical_config,
-    rtems_id              *next_id
-)
-{
-    rtems_configuration_table *c = _Configuration_Table;
-    int n = rtems_get_index(*next_id);
-
-    if (n >= 1)
-        goto failed;
-    
-    _Thread_Disable_dispatch();
-
-    *next_id += 1;
-    return (void *) c;
-
-failed:
-    *next_id = RTEMS_OBJECT_ID_FINAL;
-    return 0;
-}
-
-
-void
-rtems_monitor_config_dump_header(
-    boolean verbose
-)
-{
-    printf("\
-INITIAL (startup) Configuration Info\n");
-/*23456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789
-0         1         2         3         4         5         6         7       */
-    rtems_monitor_separator();
-}
-
-
-void
-rtems_monitor_config_dump(
-    rtems_monitor_config_t *monitor_config,
-    boolean                 verbose
-)
-{
-    unsigned32   length = 0;
-
-    length = 0;
-    length += printf("WORKSPACE");
-    length += rtems_monitor_pad(DATACOL, length);
-    length += printf("start: 0x%x;  size: 0x%x\n",
-                     (unsigned32) monitor_config->work_space_start,
-                     monitor_config->work_space_size);
-
-    length = 0;
-    length += printf("TIME");
-    length += rtems_monitor_pad(DATACOL, length);
-    length += printf("usec/tick: %d;  tick/timeslice: %d;  tick/sec: %d\n",
-                     monitor_config->microseconds_per_tick,
-                     monitor_config->ticks_per_timeslice,
-                     1000000 / monitor_config->microseconds_per_tick);
-
-    length = 0;
-    length += printf("MAXIMUMS");
-    length += rtems_monitor_pad(DATACOL, length);
-    length += printf("tasks: %d;  timers: %d;  sems: %d;  que's: %d;  ext's: %d\n",
-                     monitor_config->maximum_tasks,
-                     monitor_config->maximum_timers,
-                     monitor_config->maximum_semaphores,
-                     monitor_config->maximum_message_queues,
-                     monitor_config->maximum_extensions);
-    length = 0;
-    length += rtems_monitor_pad(CONTCOL, length);
-    length += printf("partitions: %d;  regions: %d;  ports: %d;  periods: %d\n",
-                     monitor_config->maximum_partitions,
-                     monitor_config->maximum_regions,
-                     monitor_config->maximum_ports,
-                     monitor_config->maximum_periods);
-}
diff --git a/c/src/libmisc/monitor/mon-dname.c b/c/src/libmisc/monitor/mon-dname.c
deleted file mode 100644
index 45c28342ff..0000000000
--- a/c/src/libmisc/monitor/mon-dname.c
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * RTEMS monitor driver names support.
- *
- * There are 2 "driver" things the monitor knows about.
- *
- *    1. Regular RTEMS drivers.
- *         This is a table indexed by major device number and
- *         containing driver entry points only.
- *
- *    2. Driver name table.
- *         A separate table of names for drivers.
- *         The table converts driver names to a major number
- *         as index into the driver table and a minor number
- *         for an argument to driver.
- *
- *  Drivers are displayed with 'driver' command.
- *  Names are displayed with 'dname' command.
- *
- *  $Id$
- */
-
-#define __RTEMS_VIOLATE_KERNEL_VISIBILITY__
-#include <rtems.h>
-
-#include <rtems/monitor.h>
-
-#include <stdio.h>
-#include <stdlib.h>             /* strtoul() */
-#include <string.h>		/* strncpy() */
-
-#define DATACOL 15
-#define CONTCOL DATACOL		/* continued col */
-
-void
-rtems_monitor_dname_canonical(
-    rtems_monitor_dname_t  *canonical_dname,
-    void                  *dname_void
-)
-{
-    rtems_driver_name_t    *np = (rtems_driver_name_t *) dname_void;
-
-    (void) strncpy(canonical_dname->name_string, np->device_name, sizeof(canonical_dname->name_string));
-    canonical_dname->major = np->major;
-    canonical_dname->minor = np->minor;
-}    
-
-void *
-rtems_monitor_dname_next(
-    void                   *object_information,
-    rtems_monitor_dname_t  *canonical_dname,
-    rtems_id               *next_id
-)
-{
-    rtems_unsigned32      n = rtems_get_index(*next_id);
-    rtems_driver_name_t  *table = _IO_Driver_name_table;
-    rtems_driver_name_t  *np = 0;
-
-/* XXX should we be using _IO_Number_of_devices */
-    for (np = table + n ; n<_IO_Number_of_devices; n++, np++)
-        if (np->device_name)
-            goto done;
-    
-    *next_id = RTEMS_OBJECT_ID_FINAL;
-    return 0;
-
-done:
-    _Thread_Disable_dispatch();
-
-    /*
-     * dummy up a fake id and name for this item
-     */
-
-    canonical_dname->id = n;
-    canonical_dname->name = rtems_build_name('-', '-', '-', '-');
-
-    *next_id += 1;
-    return np;
-}    
-
-void
-rtems_monitor_dname_dump_header(
-    boolean verbose
-)
-{
-    printf("\
-  Major:Minor   Name\n");
-/*23456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789
-0         1         2         3         4         5         6         7       */
-    rtems_monitor_separator();
-}
-
-void
-rtems_monitor_dname_dump(
-    rtems_monitor_dname_t *monitor_dname,
-    boolean                 verbose
-)
-{
-    unsigned32             length = 0;
-
-    length += rtems_monitor_pad(6, length);
-    length += rtems_monitor_dump_hex(monitor_dname->major);
-    length += printf(":");
-    length += rtems_monitor_dump_hex(monitor_dname->minor);
-
-    length += rtems_monitor_pad(16, length);
-    length += printf("%.*s",
-                     (int) sizeof(monitor_dname->name_string),
-                     (char *) monitor_dname->name_string);
-
-    length += printf("\n");
-    length = 0;
-}
diff --git a/c/src/libmisc/monitor/mon-driver.c b/c/src/libmisc/monitor/mon-driver.c
deleted file mode 100644
index c8eb36ab4e..0000000000
--- a/c/src/libmisc/monitor/mon-driver.c
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * RTEMS monitor IO (device drivers) support
- *
- * There are 2 "driver" things the monitor knows about.
- *
- *    1. Regular RTEMS drivers.
- *         This is a table indexed by major device number and
- *         containing driver entry points only.
- *
- *    2. Driver name table.
- *         A separate table of names for drivers.
- *         The table converts driver names to a major number
- *         as index into the driver table and a minor number
- *         for an argument to driver.
- *
- *  Drivers are displayed with 'driver' command.
- *  Names are displayed with 'name' command.
- *
- *  $Id$
- */
-
-#define __RTEMS_VIOLATE_KERNEL_VISIBILITY__
-#include <rtems.h>
-
-#include <rtems/monitor.h>
-
-#include <stdio.h>
-#include <stdlib.h>             /* strtoul() */
-
-#define DATACOL 15
-#define CONTCOL DATACOL		/* continued col */
-
-
-void
-rtems_monitor_driver_canonical(
-    rtems_monitor_driver_t *canonical_driver,
-    void                   *driver_void
-)
-{
-    rtems_driver_address_table *d = (rtems_driver_address_table *) driver_void;
-
-    rtems_monitor_symbol_canonical_by_value(&canonical_driver->initialization,
-                                            (void *) d->initialization);
-
-    rtems_monitor_symbol_canonical_by_value(&canonical_driver->open,
-                                            (void *) d->open);
-    rtems_monitor_symbol_canonical_by_value(&canonical_driver->close,
-                                            (void *) d->close);
-    rtems_monitor_symbol_canonical_by_value(&canonical_driver->read,
-                                            (void *) d->read);
-    rtems_monitor_symbol_canonical_by_value(&canonical_driver->write,
-                                            (void *) d->write);
-    rtems_monitor_symbol_canonical_by_value(&canonical_driver->control,
-                                            (void *) d->control);
-}
-
-
-void *
-rtems_monitor_driver_next(
-    void                  *object_info,
-    rtems_monitor_driver_t *canonical_driver,
-    rtems_id              *next_id
-)
-{
-    rtems_configuration_table *c = _Configuration_Table;
-    rtems_unsigned32 n = rtems_get_index(*next_id);
-
-    if (n >= c->number_of_device_drivers)
-        goto failed;
-    
-    _Thread_Disable_dispatch();
-
-    /*
-     * dummy up a fake id and name for this item
-     */
-
-    canonical_driver->id = n;
-    canonical_driver->name = rtems_build_name('-', '-', '-', '-');
-
-    *next_id += 1;
-    return (void *) (c->Device_driver_table + n);
-
-failed:
-    *next_id = RTEMS_OBJECT_ID_FINAL;
-    return 0;
-}
-
-
-void
-rtems_monitor_driver_dump_header(
-    boolean verbose
-)
-{
-    printf("\
-  Major      Entry points\n");
-/*23456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789
-0         1         2         3         4         5         6         7       */
-    rtems_monitor_separator();
-}
-
-void
-rtems_monitor_driver_dump(
-    rtems_monitor_driver_t *monitor_driver,
-    boolean                 verbose
-)
-{
-    unsigned32          length = 0;
-
-    length += printf("  %d", monitor_driver->id);
-
-    length += rtems_monitor_pad(13, length);
-    length += printf("init: ");
-    length += rtems_monitor_symbol_dump(&monitor_driver->initialization, verbose);
-    length += printf(";  control: ");
-    length += rtems_monitor_symbol_dump(&monitor_driver->control, verbose);
-    length += printf("\n");
-    length = 0;
-
-    length += rtems_monitor_pad(13, length);
-
-    length += printf("open: ");
-    length += rtems_monitor_symbol_dump(&monitor_driver->open, verbose);
-    length += printf(";  close: ");
-    length += rtems_monitor_symbol_dump(&monitor_driver->close, verbose);
-    length += printf("\n");
-    length = 0;
-
-    length += rtems_monitor_pad(13, length);
-
-    length += printf("read: ");
-    length += rtems_monitor_symbol_dump(&monitor_driver->read, verbose);
-    length += printf(";  write: ");
-    length += rtems_monitor_symbol_dump(&monitor_driver->write, verbose);
-    length += printf("\n");
-    length = 0;
-}
diff --git a/c/src/libmisc/monitor/mon-extension.c b/c/src/libmisc/monitor/mon-extension.c
deleted file mode 100644
index 107fd5184e..0000000000
--- a/c/src/libmisc/monitor/mon-extension.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * RTEMS Monitor extension support
- *
- *  $Id$
- */
-
-#include <rtems.h>
-#include <rtems/monitor.h>
-
-#include <stdio.h>
-
-void
-rtems_monitor_extension_canonical(
-    rtems_monitor_extension_t *canonical_extension,
-    void                  *extension_void
-)
-{
-    Extension_Control     *rtems_extension = (Extension_Control *) extension_void;
-    rtems_extensions_table *e = &rtems_extension->Extension.Callouts;
-
-    rtems_monitor_symbol_canonical_by_value(&canonical_extension->e_create,
-                                            (void *) e->thread_create);
-
-    rtems_monitor_symbol_canonical_by_value(&canonical_extension->e_start,
-                                            (void *) e->thread_start);
-    rtems_monitor_symbol_canonical_by_value(&canonical_extension->e_restart,
-                                            (void *) e->thread_restart);
-    rtems_monitor_symbol_canonical_by_value(&canonical_extension->e_delete,
-                                            (void *) e->thread_delete);
-    rtems_monitor_symbol_canonical_by_value(&canonical_extension->e_tswitch,
-                                            (void *) e->thread_switch);
-    rtems_monitor_symbol_canonical_by_value(&canonical_extension->e_begin,
-                                            (void *) e->thread_begin);
-    rtems_monitor_symbol_canonical_by_value(&canonical_extension->e_exitted,
-                                            (void *) e->thread_exitted);
-    rtems_monitor_symbol_canonical_by_value(&canonical_extension->e_fatal,
-                                            (void *) e->fatal);
-}
-
-void
-rtems_monitor_extension_dump_header(
-    boolean verbose
-)
-{
-    printf("\
-  ID       NAME\n");
-/*23456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789
-0         1         2         3         4         5         6         7       */
-           
-    rtems_monitor_separator();
-}
-
-
-/*
- * Dump out the canonical form
- */
-
-void
-rtems_monitor_extension_dump(
-    rtems_monitor_extension_t *monitor_extension,
-    boolean  verbose
-)
-{
-    unsigned32           length = 0;
-
-    length += rtems_monitor_dump_id(monitor_extension->id);
-    length += rtems_monitor_pad(11, length);
-    length += rtems_monitor_dump_name(monitor_extension->name);
-
-    length += rtems_monitor_pad(18, length);
-    length += printf("create: ");
-    length += rtems_monitor_symbol_dump(&monitor_extension->e_create, verbose);
-    length += printf(";  start: ");
-    length += rtems_monitor_symbol_dump(&monitor_extension->e_start, verbose);
-    length += printf(";  restart: ");
-    length += rtems_monitor_symbol_dump(&monitor_extension->e_restart, verbose);
-    length += printf("\n");
-    length = 0;
-
-    length += rtems_monitor_pad(18, length);
-    length += printf("delete: ");
-    length += rtems_monitor_symbol_dump(&monitor_extension->e_delete, verbose);
-    length += printf(";  switch: ");
-    length += rtems_monitor_symbol_dump(&monitor_extension->e_tswitch, verbose);
-    length += printf(";  begin: ");
-    length += rtems_monitor_symbol_dump(&monitor_extension->e_begin, verbose);
-    length += printf("\n");
-    length = 0;
-
-    length += rtems_monitor_pad(18, length);
-    length += printf("exitted: ");
-    length += rtems_monitor_symbol_dump(&monitor_extension->e_exitted, verbose);
-    length += printf(";  fatal: ");
-    length += rtems_monitor_symbol_dump(&monitor_extension->e_fatal, verbose);
-    length += printf("\n");
-    length = 0;
-    printf("\n");
-}
diff --git a/c/src/libmisc/monitor/mon-itask.c b/c/src/libmisc/monitor/mon-itask.c
deleted file mode 100644
index 59a3a4f284..0000000000
--- a/c/src/libmisc/monitor/mon-itask.c
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * RTEMS Monitor init task support
- *
- *  $Id$
- */
-
-#define __RTEMS_VIOLATE_KERNEL_VISIBILITY__
-#include <rtems.h>
-#include <rtems/monitor.h>
-
-#include <stdio.h>
-
-/*
- * As above, but just for init tasks
- */
-void
-rtems_monitor_init_task_canonical(
-    rtems_monitor_init_task_t *canonical_itask,
-    void                  *itask_void
-)
-{
-    rtems_initialization_tasks_table *rtems_itask = itask_void;
-    
-    rtems_monitor_symbol_canonical_by_value(&canonical_itask->entry,
-                                            (void *) rtems_itask->entry_point);
-
-    canonical_itask->argument = rtems_itask->argument;
-    canonical_itask->stack_size = rtems_itask->stack_size;
-    canonical_itask->priority = rtems_itask->initial_priority;
-    canonical_itask->modes = rtems_itask->mode_set;
-    canonical_itask->attributes = rtems_itask->attribute_set;
-}
-
-void *
-rtems_monitor_init_task_next(
-    void                  *object_info,
-    rtems_monitor_init_task_t *canonical_init_task,
-    rtems_id              *next_id
-)
-{
-    rtems_configuration_table *c = _Configuration_Table;
-    rtems_initialization_tasks_table *itask;
-    rtems_unsigned32 n = rtems_get_index(*next_id);
-
-    if (n >= c->RTEMS_api_configuration->number_of_initialization_tasks)
-        goto failed;
-    
-    _Thread_Disable_dispatch();
-
-    itask = c->RTEMS_api_configuration->User_initialization_tasks_table + n;
-
-    /*
-     * dummy up a fake id and name for this item
-     */
-
-    canonical_init_task->id = n;
-    canonical_init_task->name = itask->name;
-
-    *next_id += 1;
-    return (void *) itask;
-
-failed:
-    *next_id = RTEMS_OBJECT_ID_FINAL;
-    return 0;
-}
-
-
-void
-rtems_monitor_init_task_dump_header(
-    boolean verbose
-)
-{
-    printf("\
-  #    NAME   ENTRY        ARGUMENT    PRIO   MODES  ATTRIBUTES   STACK SIZE\n");
-/*23456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789
-0         1         2         3         4         5         6         7       */
-    rtems_monitor_separator();
-}
-
-/*
- */
-
-void
-rtems_monitor_init_task_dump(
-    rtems_monitor_init_task_t *monitor_itask,
-    boolean  verbose
-)
-{
-    int length = 0;
-
-    length += rtems_monitor_dump_decimal(monitor_itask->id);
-
-    length += rtems_monitor_pad(7, length);
-    length += rtems_monitor_dump_name(monitor_itask->name);
-
-    length += rtems_monitor_pad(14, length);
-    length += rtems_monitor_symbol_dump(&monitor_itask->entry, verbose);
-
-    length += rtems_monitor_pad(25, length);
-    length += printf("%d [0x%x]", monitor_itask->argument, monitor_itask->argument);
-
-    length += rtems_monitor_pad(39, length);
-    length += rtems_monitor_dump_priority(monitor_itask->priority);
-
-    length += rtems_monitor_pad(46, length);
-    length += rtems_monitor_dump_modes(monitor_itask->modes);
-
-    length += rtems_monitor_pad(54, length);
-    length += rtems_monitor_dump_attributes(monitor_itask->attributes);
-    
-    length += rtems_monitor_pad(66, length);
-    length += printf("%d [0x%x]", monitor_itask->stack_size, monitor_itask->stack_size);
-
-    printf("\n");
-}
diff --git a/c/src/libmisc/monitor/mon-manager.c b/c/src/libmisc/monitor/mon-manager.c
deleted file mode 100644
index 497f0255a0..0000000000
--- a/c/src/libmisc/monitor/mon-manager.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * RTEMS Monitor "manager" support.
- * Used to traverse object (chain) lists and print them out.
- *
- *  $Id$
- */
-
-#include <rtems.h>
-#include <rtems/monitor.h>
-
-#include <stdio.h>
-
-/*
- * "next" routine for all objects that are RTEMS manager objects
- */
-
-void *
-rtems_monitor_manager_next(
-    void      *table_void,
-    void      *canonical,
-    rtems_id  *next_id
-)
-{
-    Objects_Information     *table = table_void;
-    rtems_monitor_generic_t *copy;
-    Objects_Control         *object = 0;
-    Objects_Locations        location;
-
-    /*
-     * When we are called, it must be local
-     */
-       
-    if ( ! _Objects_Is_local_id(*next_id))
-        goto done;
-    
-    object = _Objects_Get_next(table, *next_id, &location, next_id);
-
-    if (object)
-    {
-        copy = (rtems_monitor_generic_t *) canonical;
-        copy->id = object->id;
-        _Objects_Copy_name_raw(object->name, &copy->name, sizeof(copy->name));
-    }    
-    
-done:
-    return object;
-}
-
diff --git a/c/src/libmisc/monitor/mon-monitor.c b/c/src/libmisc/monitor/mon-monitor.c
deleted file mode 100644
index 289425d8e4..0000000000
--- a/c/src/libmisc/monitor/mon-monitor.c
+++ /dev/null
@@ -1,518 +0,0 @@
-/*
- * RTEMS monitor main body
- *	
- *  TODO:
- *      add stuff to RTEMS api
- *            rtems_get_name(id)
- *            rtems_get_type(id)
- *            rtems_build_id(node, type, num)
- *      Add a command to dump out info about an arbitrary id when
- *         types are added to id's
- *         rtems> id idnum
- *                idnum: node n, object: whatever, id: whatever
- *      allow id's to be specified as n:t:id, where 'n:t' is optional
- *      should have a separate monitor FILE stream (ala the debugger)
- *      remote request/response stuff should be cleaned up
- *         maybe we can use real rpc??
- *      'info' command to print out:
- *           interrupt stack location, direction and size
- *           floating point config stuff
- *           interrupt config stuff
- *
- *  $Id$
- */
-
-#include <rtems.h>
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#include <rtems/monitor.h>
-
-/* set by trap handler */
-extern rtems_tcb       *debugger_interrupted_task;
-extern rtems_context   *debugger_interrupted_task_context;
-extern rtems_unsigned32 debugger_trap;
-
-/*
- * Various id's for the monitor
- * They need to be public variables for access by other agencies
- * such as debugger and remote servers'
- */
-
-rtems_id  rtems_monitor_task_id;
-
-unsigned32 rtems_monitor_node;		/* our node number */
-unsigned32 rtems_monitor_default_node;  /* current default for commands */
-
-/*
- * The rtems symbol table
- */
-
-rtems_symbol_table_t *rtems_monitor_symbols;
-
-/*
- * The top-level commands
- */
-
-rtems_monitor_command_entry_t rtems_monitor_commands[] = {
-    { "--usage--",
-      "\n"
-      "RTEMS monitor\n"
-      "\n"
-      "Commands (may be abbreviated)\n"
-      "\n"
-      "  help      -- get this message or command specific help\n"
-      "  pause     -- pause monitor for a specified number of ticks\n"
-      "  exit      -- invoke a fatal RTEMS error\n"
-      "  symbol    -- show entries from symbol table\n"
-      "  continue  -- put monitor to sleep waiting for explicit wakeup\n"
-      "  config    -- show system configuration\n"
-      "  itask     -- list init tasks\n"
-      "  mpci      -- list mpci config\n"
-      "  task      -- show task information\n"
-      "  queue     -- show message queue information\n"
-      "  extension -- user extensions\n"
-      "  driver    -- show information about named drivers\n"
-      "  dname     -- show information about named drivers\n"
-      "  object    -- generic object information\n"
-      "  node      -- specify default node for commands that take id's\n"
-#ifdef CPU_INVOKE_DEBUGGER
-      "  debugger  -- invoke system debugger\n"
-#endif
-      ,
-      0,
-      0,
-      (unsigned32) rtems_monitor_commands,
-    },
-    { "config",
-      "config\n"
-      "  Show the system configuration.\n",
-      0,
-      rtems_monitor_object_cmd,
-      RTEMS_MONITOR_OBJECT_CONFIG,
-    },
-    { "itask",
-      "itask\n"
-      "  List init tasks for the system\n",
-      0,
-      rtems_monitor_object_cmd,
-      RTEMS_MONITOR_OBJECT_INIT_TASK,
-    }, 
-   { "mpci",
-      "mpci\n"
-      "  Show the MPCI system configuration, if configured.\n",
-      0,
-      rtems_monitor_object_cmd,
-      RTEMS_MONITOR_OBJECT_MPCI,
-    },
-    { "pause",
-      "pause [ticks]\n"
-      "  monitor goes to \"sleep\" for specified ticks (default is 1)\n"
-      "  monitor will resume at end of period or if explicitly awakened\n",
-      0,
-      rtems_monitor_pause_cmd,
-      0,
-    },
-    { "continue",
-      "continue\n"
-      "  put the monitor to sleep waiting for an explicit wakeup from the\n"
-      "  program running.\n",
-      0,
-      rtems_monitor_continue_cmd,
-      0,
-    },
-    { "go",
-      "go\n"
-      "  Alias for 'continue'\n",
-      0,
-      rtems_monitor_continue_cmd,
-      0,
-    },
-    { "node",
-      "node [ node number ]\n"
-      "  Specify default node number for commands that take id's\n",
-      0,
-      rtems_monitor_node_cmd,
-      0,
-    },
-    { "symbol",
-      "symbol [ symbolname [symbolname ... ] ]\n"
-      "  display value associated with specified symbol.\n"
-      "  Defaults to displaying all known symbols.\n",
-      0,
-      rtems_monitor_symbol_cmd,
-      (unsigned32) &rtems_monitor_symbols,
-    },
-    { "extension",
-      "extension [id [id ...] ]\n"
-      "  display information about specified extensions.\n"
-      "  Default is to display information about all extensions on this node\n",
-      0,
-      rtems_monitor_object_cmd,
-      RTEMS_MONITOR_OBJECT_EXTENSION,
-    },
-    { "task",
-      "task [id [id ...] ]\n"
-      "  display information about the specified tasks.\n"
-      "  Default is to display information about all tasks on this node\n",
-      0,
-      rtems_monitor_object_cmd,
-      RTEMS_MONITOR_OBJECT_TASK,
-    },
-    { "queue",
-      "queue [id [id ... ] ]\n"
-      "  display information about the specified message queues\n"
-      "  Default is to display information about all queues on this node\n",
-      0,
-      rtems_monitor_object_cmd,
-      RTEMS_MONITOR_OBJECT_QUEUE,
-    },
-    { "object",
-      "object [id [id ...] ]\n"
-      "  display information about specified RTEMS objects.\n"
-      "  Object id's must include 'type' information.\n"
-      "  (which may normally be defaulted)\n",
-      0,
-      rtems_monitor_object_cmd,
-      RTEMS_MONITOR_OBJECT_INVALID,
-    },
-    { "driver",
-      "driver [ major [ major ... ] ]\n"
-      "  Display the RTEMS device driver table.\n",
-      0,
-      rtems_monitor_object_cmd,
-      RTEMS_MONITOR_OBJECT_DRIVER,
-    },
-    { "dname",
-      "dname\n"
-      "  Displays information about named drivers.\n",
-      0,
-      rtems_monitor_object_cmd,
-      RTEMS_MONITOR_OBJECT_DNAME,
-    },
-    { "exit",
-      "exit [status]\n"
-      "  Invoke 'rtems_fatal_error_occurred' with 'status'\n"
-      "  (default is RTEMS_SUCCESSFUL)\n",
-      0,
-      rtems_monitor_fatal_cmd,
-      RTEMS_SUCCESSFUL,
-    },
-    { "fatal",
-      "fatal [status]\n"
-      "  'exit' with fatal error; default error is RTEMS_TASK_EXITTED\n",
-      0,
-      rtems_monitor_fatal_cmd,
-      RTEMS_TASK_EXITTED,			/* exit value */
-    },
-    { "quit",
-      "quit [status]\n"
-      "  Alias for 'exit'\n",
-      0,
-      rtems_monitor_fatal_cmd,
-      RTEMS_SUCCESSFUL,				/* exit value */
-    },
-    { "help",
-      "help [ command [ command ] ]\n"
-      "  provide information about commands\n"
-      "  Default is show basic command summary.\n",
-      0,
-      rtems_monitor_help_cmd,
-      (unsigned32) rtems_monitor_commands,
-    },
-#ifdef CPU_INVOKE_DEBUGGER
-    { "debugger",
-      "debugger\n"
-      "  Enter the debugger, if possible.\n"
-      "  A continue from the debugger will return to the monitor.\n",
-      0,
-      rtems_monitor_debugger_cmd,
-      0,
-    },
-#endif            
-    { 0, 0, 0, 0, 0 },
-};
-
-
-rtems_status_code
-rtems_monitor_suspend(rtems_interval timeout)
-{
-    rtems_event_set event_set;
-    rtems_status_code status;
-    
-    status = rtems_event_receive(MONITOR_WAKEUP_EVENT,
-                                 RTEMS_DEFAULT_OPTIONS,
-                                 timeout,
-                                 &event_set);
-    return status;
-}
-
-void
-rtems_monitor_wakeup(void)
-{
-    rtems_status_code status;
-    
-    status = rtems_event_send(rtems_monitor_task_id, MONITOR_WAKEUP_EVENT);
-}
-
-void
-rtems_monitor_debugger_cmd(
-    int        argc,
-    char     **argv,
-    unsigned32 command_arg,
-    boolean    verbose
-)
-{
-#ifdef CPU_INVOKE_DEBUGGER
-    CPU_INVOKE_DEBUGGER;
-#endif
-}
-
-void
-rtems_monitor_pause_cmd(
-    int        argc,
-    char     **argv,
-    unsigned32 command_arg,
-    boolean    verbose
-)
-{
-    if (argc == 1)
-        rtems_monitor_suspend(1);
-    else
-        rtems_monitor_suspend(strtoul(argv[1], 0, 0));
-}
-
-void
-rtems_monitor_fatal_cmd(
-    int     argc,
-    char  **argv,
-    unsigned32 command_arg,
-    boolean verbose
-)
-{
-    if (argc == 1)
-        rtems_fatal_error_occurred(command_arg);
-    else
-        rtems_fatal_error_occurred(strtoul(argv[1], 0, 0));
-}
-
-void
-rtems_monitor_continue_cmd(
-    int     argc,
-    char  **argv,
-    unsigned32 command_arg,
-    boolean verbose
-)
-{
-    rtems_monitor_suspend(RTEMS_NO_TIMEOUT);
-}
-
-void
-rtems_monitor_node_cmd(
-    int     argc,
-    char  **argv,
-    unsigned32 command_arg,
-    boolean verbose
-)
-{
-    unsigned32 new_node = rtems_monitor_default_node;
-    
-    switch (argc)
-    {
-        case 1: 		/* no node, just set back to ours */
-            new_node = rtems_monitor_node;
-            break;
-
-        case 2:
-            new_node = strtoul(argv[1], 0, 0);
-            break;
-
-        default:
-            printf("invalid syntax, try 'help node'\n");
-            break;
-    }
-
-    if ((new_node >= 1) &&
-        _Configuration_MP_table &&
-        (new_node <= _Configuration_MP_table->maximum_nodes))
-            rtems_monitor_default_node = new_node;
-}
-
-
-/*
- *  Function:   rtems_monitor_symbols_loadup
- *
- *  Description:
- *      Create and load the monitor's symbol table.
- *      We are reading the output format of 'gnm' which looks like this:
- *
- *              400a7068 ? _Rate_monotonic_Information
- *              400a708c ? _Thread_Dispatch_disable_level
- *              400a7090 ? _Configuration_Table
- *
- *      We ignore the type field.
- *
- *  Side Effects:
- *      Creates and fills in 'rtems_monitor_symbols' table
- *
- *  TODO
- *      there should be a BSP #define or something like that
- *         to do this;  Assuming stdio is crazy.
- *      Someday this should know BFD
- *              Maybe we could get objcopy to just copy the symbol areas
- *              and copy that down.
- *
- */
-
-void
-rtems_monitor_symbols_loadup(void)
-{
-    FILE *fp;
-    char buffer[128];
-
-    if (rtems_monitor_symbols)
-        rtems_symbol_table_destroy(rtems_monitor_symbols);
-    
-    rtems_monitor_symbols = rtems_symbol_table_create(10);
-    if (rtems_monitor_symbols == 0)
-        return;
-
-    fp = fopen("symbols", "r");
-    
-    if (fp == 0)
-        return;
-
-    while (fgets(buffer, sizeof(buffer) - 1, fp))
-    {
-        char *symbol;
-        char *value;
-        char *ignored_type;
-
-        value = strtok(buffer, " \t\n");
-        ignored_type = strtok(0, " \t\n");
-        symbol = strtok(0, " \t\n");
-
-        if (symbol && ignored_type && value)
-        {
-            rtems_symbol_t *sp;
-            sp = rtems_symbol_create(rtems_monitor_symbols,
-                                     symbol,
-                                     (rtems_unsigned32) strtoul(value, 0, 16));
-            if (sp == 0)
-            {
-                printf("could not define symbol '%s'\n", symbol);
-                goto done;
-            }
-        }
-        else
-        {
-            printf("parsing error on '%s'\n", buffer);
-            goto done;
-        }
-    }
-
-done:
-    return;
-}
-
-
-/*
- * Main monitor command loop
- */
-
-void
-rtems_monitor_task(
-    rtems_task_argument monitor_flags
-)
-{
-    rtems_tcb *debugee = 0;
-    rtems_context *rp;
-    rtems_context_fp *fp;
-    char command_buffer[513];
-    int argc;
-    char *argv[64];        
-    boolean verbose = FALSE;
-
-    if (monitor_flags & RTEMS_MONITOR_SUSPEND)
-        (void) rtems_monitor_suspend(RTEMS_NO_TIMEOUT);
-
-    for (;;)
-    {
-        extern rtems_tcb * _Thread_Executing;
-        rtems_monitor_command_entry_t *command;
-
-        debugee = _Thread_Executing;
-        rp = &debugee->Registers;
-        fp = (rtems_context_fp *) debugee->fp_context;  /* possibly 0 */
-
-        if (0 == rtems_monitor_command_read(command_buffer, &argc, argv))
-            continue;
-        if ((command = rtems_monitor_command_lookup(rtems_monitor_commands,
-                                                    argc,
-                                                    argv)) == 0)
-            continue;
-
-        command->command_function(argc, argv, command->command_arg, verbose);
-
-        fflush(stdout);
-    }
-}
-
-
-void
-rtems_monitor_kill(void)
-{
-    if (rtems_monitor_task_id)
-        rtems_task_delete(rtems_monitor_task_id);
-    rtems_monitor_task_id = 0;
-    
-    rtems_monitor_server_kill();
-}
-
-void
-rtems_monitor_init(
-    unsigned32 monitor_flags
-)
-{
-    rtems_status_code status;
-    
-    rtems_monitor_kill();
-
-    status = rtems_task_create(RTEMS_MONITOR_NAME,
-                               1,
-                               RTEMS_MINIMUM_STACK_SIZE * 2,
-                               RTEMS_INTERRUPT_LEVEL(0),
-                               RTEMS_DEFAULT_ATTRIBUTES,
-                               &rtems_monitor_task_id);
-    if (status != RTEMS_SUCCESSFUL)
-    {
-        rtems_error(status, "could not create monitor task");
-        goto done;
-    }
-
-    rtems_monitor_node = rtems_get_node(rtems_monitor_task_id);
-    rtems_monitor_default_node = rtems_monitor_node;
-
-    rtems_monitor_symbols_loadup();
-
-    if (monitor_flags & RTEMS_MONITOR_GLOBAL)
-        rtems_monitor_server_init(monitor_flags);
-
-    /*
-     * Start the monitor task itself
-     */
-    
-    status = rtems_task_start(rtems_monitor_task_id,
-                              rtems_monitor_task,
-                              monitor_flags);
-    if (status != RTEMS_SUCCESSFUL)
-    {
-        rtems_error(status, "could not start monitor");
-        goto done;
-    }
-
-done:
-}
diff --git a/c/src/libmisc/monitor/mon-mpci.c b/c/src/libmisc/monitor/mon-mpci.c
deleted file mode 100644
index 5399f37555..0000000000
--- a/c/src/libmisc/monitor/mon-mpci.c
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * RTEMS MPCI Config display support
- *
- * TODO
- *
- *  $Id$
- */
-
-
-#define __RTEMS_VIOLATE_KERNEL_VISIBILITY__
-#include <rtems.h>
-#include <rtems/monitor.h>
-
-#include <stdio.h>
-#include <stdlib.h>             /* strtoul() */
-
-#define DATACOL 15
-
-/*
- * Fill in entire monitor config table
- * for sending to a remote monitor or printing on the local system
- */
-
-void
-rtems_monitor_mpci_canonical(
-    rtems_monitor_mpci_t *canonical_mpci,
-    void                  *config_void
-)
-{
-    rtems_configuration_table *c = _Configuration_Table;
-    rtems_multiprocessing_table *m;
-    rtems_mpci_table *mt;
-
-    m = c->User_multiprocessing_table;
-    if (m == 0)
-        return;
-    mt = m->User_mpci_table;
-    
-    canonical_mpci->node = m->node;
-    canonical_mpci->maximum_nodes = m->maximum_nodes;
-    canonical_mpci->maximum_global_objects = m->maximum_global_objects;
-    canonical_mpci->maximum_proxies = m->maximum_proxies;
-
-    canonical_mpci->default_timeout = mt->default_timeout;
-    canonical_mpci->maximum_packet_size = mt->maximum_packet_size;
-
-    rtems_monitor_symbol_canonical_by_value(&canonical_mpci->initialization,
-                                            (void *) mt->initialization);
-
-    rtems_monitor_symbol_canonical_by_value(&canonical_mpci->get_packet,
-                                            (void *) mt->get_packet);
-    rtems_monitor_symbol_canonical_by_value(&canonical_mpci->return_packet,
-                                            (void *) mt->return_packet);
-    rtems_monitor_symbol_canonical_by_value(&canonical_mpci->send_packet,
-                                            (void *) mt->send_packet);
-    rtems_monitor_symbol_canonical_by_value(&canonical_mpci->receive_packet,
-                                            (void *) mt->receive_packet);
-}    
-
-/*
- * This is easy, since there is only 1 (altho we could get them from
- *    other nodes...)
- */
-
-void *
-rtems_monitor_mpci_next(
-    void                  *object_info,
-    rtems_monitor_mpci_t  *canonical_mpci,
-    rtems_id              *next_id
-)
-{
-    rtems_configuration_table *c = _Configuration_Table;
-    int n = rtems_get_index(*next_id);
-
-    if (n >= 1)
-        goto failed;
-    
-    if ( ! c->User_multiprocessing_table)
-        goto failed;
-    
-    _Thread_Disable_dispatch();
-
-    *next_id += 1;
-    return (void *) c;
-
-failed:
-    *next_id = RTEMS_OBJECT_ID_FINAL;
-    return 0;
-}
-
-
-void
-rtems_monitor_mpci_dump_header(
-    boolean verbose
-)
-{
-    printf("\
-           max     max     max     default    max\n\
-   node   nodes  globals  proxies  timeout  pktsize\n");
-/*23456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789
-0         1         2         3         4         5         6         7       */
-           
-    rtems_monitor_separator();
-}
-
-
-void
-rtems_monitor_mpci_dump(
-    rtems_monitor_mpci_t *monitor_mpci,
-    boolean               verbose
-)
-{
-    unsigned32   length = 0;
-
-    length += rtems_monitor_pad(2, length);
-    length += printf("  %d", monitor_mpci->node);
-    length += rtems_monitor_pad(11, length);
-    length += printf("%d", monitor_mpci->maximum_nodes);
-    
-    length += rtems_monitor_pad(18, length);
-    length += rtems_monitor_dump_decimal(monitor_mpci->maximum_global_objects);
-    
-    length += rtems_monitor_pad(28, length);
-    length += rtems_monitor_dump_decimal(monitor_mpci->maximum_proxies);
-
-    length += rtems_monitor_pad(37, length);
-    length += rtems_monitor_dump_decimal(monitor_mpci->default_timeout);
-
-    length += rtems_monitor_pad(46, length);
-    length += rtems_monitor_dump_decimal(monitor_mpci->maximum_packet_size);
-
-    printf("\n");
-    length = 0;
-    length += rtems_monitor_pad(DATACOL, length);
-
-    length += printf("init: ");
-    length += rtems_monitor_symbol_dump(&monitor_mpci->initialization, verbose);
-
-    printf("\n");
-    length = 0;
-    length += rtems_monitor_pad(DATACOL, length);
-
-    length += printf("get: ");
-    length += rtems_monitor_symbol_dump(&monitor_mpci->get_packet, verbose);
-    length += printf(";  return: ");
-    length += rtems_monitor_symbol_dump(&monitor_mpci->return_packet, verbose);
-
-    printf("\n");
-    length = 0;
-    length += rtems_monitor_pad(DATACOL, length);
-
-    length += printf("send: ");
-    length += rtems_monitor_symbol_dump(&monitor_mpci->send_packet, verbose);
-    length += printf(";  receive: ");
-    length += rtems_monitor_symbol_dump(&monitor_mpci->receive_packet, verbose);
-
-    printf("\n");
-    length = 0;
-}
diff --git a/c/src/libmisc/monitor/mon-object.c b/c/src/libmisc/monitor/mon-object.c
deleted file mode 100644
index 8d5a9c395f..0000000000
--- a/c/src/libmisc/monitor/mon-object.c
+++ /dev/null
@@ -1,374 +0,0 @@
-/*
- * RTEMS Monitor "object" support.
- *
- * Used to traverse object lists and print them out.
- * An object can be an RTEMS object (chain based stuff) or
- * a "misc" object such as a device driver.
- *
- * Each object has its own file in this directory (eg: extension.c)
- * That file provides routines to convert a "native" structure
- * to its canonical form, print a canonical structure, etc.
- *
- * TODO:
- *     should allow for non-numeric id's???
- *
- *  $Id$
- */
-
-#define __RTEMS_VIOLATE_KERNEL_VISIBILITY__
-#include <rtems.h>
-#include <rtems/monitor.h>
-
-#include <stdio.h>
-#include <stdlib.h>             /* strtoul() */
-#include <string.h>             /* memcpy() */
-
-#define NUMELEMS(arr)	(sizeof(arr) / sizeof(arr[0]))
-
-/*
- * add:
- *     next
- */
-
-rtems_monitor_object_info_t rtems_monitor_object_info[] =
-{
-    { RTEMS_MONITOR_OBJECT_CONFIG,
-      (void *) 0,
-      sizeof(rtems_monitor_config_t),
-      (rtems_monitor_object_next_fn)        rtems_monitor_config_next,
-      (rtems_monitor_object_canonical_fn)   rtems_monitor_config_canonical,
-      (rtems_monitor_object_dump_header_fn) rtems_monitor_config_dump_header,
-      (rtems_monitor_object_dump_fn)        rtems_monitor_config_dump,
-    },
-    { RTEMS_MONITOR_OBJECT_MPCI,
-      (void *) 0,
-      sizeof(rtems_monitor_mpci_t),
-      (rtems_monitor_object_next_fn)        rtems_monitor_mpci_next,
-      (rtems_monitor_object_canonical_fn)   rtems_monitor_mpci_canonical,
-      (rtems_monitor_object_dump_header_fn) rtems_monitor_mpci_dump_header,
-      (rtems_monitor_object_dump_fn)        rtems_monitor_mpci_dump,
-    },
-    { RTEMS_MONITOR_OBJECT_INIT_TASK,
-      (void *) 0,
-      sizeof(rtems_monitor_init_task_t),
-      (rtems_monitor_object_next_fn)        rtems_monitor_init_task_next,
-      (rtems_monitor_object_canonical_fn)   rtems_monitor_init_task_canonical,
-      (rtems_monitor_object_dump_header_fn) rtems_monitor_init_task_dump_header,
-      (rtems_monitor_object_dump_fn)        rtems_monitor_init_task_dump,
-    },
-    { RTEMS_MONITOR_OBJECT_TASK,
-      (void *) &_RTEMS_tasks_Information,
-      sizeof(rtems_monitor_task_t),
-      (rtems_monitor_object_next_fn)        rtems_monitor_manager_next,
-      (rtems_monitor_object_canonical_fn)   rtems_monitor_task_canonical,
-      (rtems_monitor_object_dump_header_fn) rtems_monitor_task_dump_header,
-      (rtems_monitor_object_dump_fn)        rtems_monitor_task_dump,
-    },
-    { RTEMS_MONITOR_OBJECT_QUEUE,
-      (void *) &_Message_queue_Information,
-      sizeof(rtems_monitor_queue_t),
-      (rtems_monitor_object_next_fn)        rtems_monitor_manager_next,
-      (rtems_monitor_object_canonical_fn)   rtems_monitor_queue_canonical,
-      (rtems_monitor_object_dump_header_fn) rtems_monitor_queue_dump_header,
-      (rtems_monitor_object_dump_fn)        rtems_monitor_queue_dump,
-    },
-    { RTEMS_MONITOR_OBJECT_EXTENSION,
-      (void *) &_Extension_Information,
-      sizeof(rtems_monitor_extension_t),
-      (rtems_monitor_object_next_fn)        rtems_monitor_manager_next,
-      (rtems_monitor_object_canonical_fn)   rtems_monitor_extension_canonical,
-      (rtems_monitor_object_dump_header_fn) rtems_monitor_extension_dump_header,
-      (rtems_monitor_object_dump_fn)        rtems_monitor_extension_dump,
-    },
-    { RTEMS_MONITOR_OBJECT_DRIVER,
-      (void *) 0,
-      sizeof(rtems_monitor_driver_t),
-      (rtems_monitor_object_next_fn)        rtems_monitor_driver_next,
-      (rtems_monitor_object_canonical_fn)   rtems_monitor_driver_canonical,
-      (rtems_monitor_object_dump_header_fn) rtems_monitor_driver_dump_header,
-      (rtems_monitor_object_dump_fn)        rtems_monitor_driver_dump,
-    },
-    { RTEMS_MONITOR_OBJECT_DNAME,
-      /* XXX now that the driver name table is allocated from the */
-      /* XXX Workspace, this does not work */
-      (void *) 0,
-      /* (void *) _IO_Driver_name_table, */
-      sizeof(rtems_monitor_dname_t),
-      (rtems_monitor_object_next_fn)        rtems_monitor_dname_next,
-      (rtems_monitor_object_canonical_fn)   rtems_monitor_dname_canonical,
-      (rtems_monitor_object_dump_header_fn) rtems_monitor_dname_dump_header,
-      (rtems_monitor_object_dump_fn)        rtems_monitor_dname_dump,
-    },
-};
-
-/*
- * Allow id's to be specified without the node number or
- * type for convenience.
- */
-
-rtems_id
-rtems_monitor_id_fixup(
-    rtems_id            id,
-    unsigned32          default_node,
-    rtems_monitor_object_type_t type
-)
-{
-    unsigned32  node;
-    
-    node = rtems_get_node(id);
-    if (node == 0)
-    {
-        if (rtems_get_class(id) != OBJECTS_NO_CLASS)
-            type = rtems_get_class(id);
-
-        id = _Objects_Build_id(type, default_node, rtems_get_index(id));
-    }
-    return id;
-}
-
-
-rtems_monitor_object_info_t *
-rtems_monitor_object_lookup(
-    rtems_monitor_object_type_t type
-)
-{
-    rtems_monitor_object_info_t *p;
-    for (p = &rtems_monitor_object_info[0];
-         p < &rtems_monitor_object_info[NUMELEMS(rtems_monitor_object_info)];
-         p++)
-    {
-        if (p->type == type)
-            return p;
-    }
-    return 0;
-}
-
-rtems_id
-rtems_monitor_object_canonical_next_remote(
-    rtems_monitor_object_type_t type,
-    rtems_id            id,
-    void               *canonical
-)
-{
-    rtems_id                        next_id;
-    rtems_status_code               status;
-    rtems_monitor_server_request_t  request;
-    rtems_monitor_server_response_t response;
-
-    /*
-     * Send request
-     */
-    
-    request.command = RTEMS_MONITOR_SERVER_CANONICAL;
-    request.argument0 = (unsigned32) type;
-    request.argument1 = (unsigned32) id;
-
-    status = rtems_monitor_server_request(rtems_get_node(id), &request, &response);
-    if (status != RTEMS_SUCCESSFUL)
-        goto failed;
-
-    /*
-     * process response
-     */
-    
-    next_id = (rtems_id) response.result0;
-    if (next_id != RTEMS_OBJECT_ID_FINAL)
-        (void) memcpy(canonical, &response.payload, response.result1);
-
-    return next_id;
-
-failed:
-    return RTEMS_OBJECT_ID_FINAL;
-
-}
-
-
-rtems_id
-rtems_monitor_object_canonical_next(
-    rtems_monitor_object_info_t *info,
-    rtems_id                     id,
-    void                        *canonical
-)
-{
-    rtems_id                     next_id;
-    void                        *raw_item;
-
-    if ( ! _Objects_Is_local_id(id))
-        next_id = rtems_monitor_object_canonical_next_remote(info->type,
-                                                             id,
-                                                             canonical);
-    else
-    {
-        next_id = id;
-        
-        raw_item = (void *) info->next(info->object_information,
-                                       canonical,
-                                       &next_id);
-
-        if (raw_item)
-        {
-            info->canonical(canonical, raw_item);
-            _Thread_Enable_dispatch();
-        }    
-    }    
-    return next_id;
-}
-
-
-/*
- * this is routine server invokes locally to get the type
- */
-
-rtems_id
-rtems_monitor_object_canonical_get(
-    rtems_monitor_object_type_t  type,
-    rtems_id             id,
-    void                *canonical,
-    unsigned32          *size_p
-)
-{
-    rtems_monitor_object_info_t *info;
-    rtems_id                     next_id;
-
-    *size_p = 0;
-
-    info = rtems_monitor_object_lookup(type);
-
-    if (info == 0)
-        return RTEMS_OBJECT_ID_FINAL;
-
-    next_id = rtems_monitor_object_canonical_next(info, id, canonical);
-    *size_p = info->size;
-
-    return next_id;
-}
-
-
-void
-rtems_monitor_object_dump_1(
-    rtems_monitor_object_info_t *info,
-    rtems_id                     id,
-    boolean                      verbose
-)
-{
-    rtems_id next_id;
-    rtems_monitor_union_t canonical;
-
-    if ((next_id = rtems_monitor_object_canonical_next(
-                                     info,
-                                     id,
-                                     &canonical)) != RTEMS_OBJECT_ID_FINAL)
-    {
-        /*
-         * If the one we actually got is the one we wanted, then
-         * print it out.
-         * For ones that have an id field, this works fine,
-         * for all others, always dump it out.
-         *
-         * HACK: the way we determine whether there is an id is a hack.
-         *
-         * by the way: the reason we try to not have an id, is that some
-         *   of the canonical structures are almost too big for shared
-         *   memory driver (eg: mpci)
-         */
-        
-        if ((info->next != rtems_monitor_manager_next) ||
-            (id == canonical.generic.id))
-            info->dump(&canonical, verbose);
-    }
-}
-
-void
-rtems_monitor_object_dump_all(
-    rtems_monitor_object_info_t *info,
-    boolean                      verbose
-)
-{
-    rtems_id next_id;
-    rtems_monitor_union_t canonical;
-
-    next_id = RTEMS_OBJECT_ID_INITIAL(info->type, rtems_monitor_default_node);
-
-    while ((next_id = rtems_monitor_object_canonical_next(
-                                         info,
-                                         next_id,
-                                         &canonical)) != RTEMS_OBJECT_ID_FINAL)
-    {
-        info->dump(&canonical, verbose);
-    }
-}
-
-void
-rtems_monitor_object_cmd(
-    int        argc,
-    char     **argv,
-    unsigned32 command_arg,
-    boolean    verbose
-)
-{
-    int arg;
-    rtems_monitor_object_info_t *info = 0;
-    rtems_monitor_object_type_t  type = (rtems_monitor_object_type_t) command_arg;
-    
-    /* what is the default type? */
-    type = (rtems_monitor_object_type_t) command_arg;
-
-    if (argc == 1)
-    {
-        if (type == RTEMS_MONITOR_OBJECT_INVALID)
-        {
-            printf("A type must be specified to \"dump all\"\n");
-            goto done;
-        }
-        
-        info = rtems_monitor_object_lookup(type);
-        if (info == 0)
-            goto not_found;
-
-        if (info->dump_header)
-            info->dump_header(verbose);
-        rtems_monitor_object_dump_all(info, verbose);
-    }
-    else
-    {
-        unsigned32          default_node = rtems_monitor_default_node;
-        rtems_monitor_object_type_t last_type = RTEMS_MONITOR_OBJECT_INVALID;
-        rtems_id            id;
-
-        for (arg=1; argv[arg]; arg++)
-        {
-            id = (rtems_id) strtoul(argv[arg], 0, 16);
-            id = rtems_monitor_id_fixup(id, default_node, type);
-            type = (rtems_monitor_object_type_t) rtems_get_class(id);
-
-            /*
-             * Allow the item type to change in the middle
-             * of the command.  If the type changes, then
-             * just dump out a new header and keep on going.
-             */
-            if (type != last_type)
-            {
-                info = rtems_monitor_object_lookup(type);
-                if (info == 0)
-                    goto not_found;
-            
-                if (info->dump_header)
-                    info->dump_header(verbose);
-            }
-
-            if (info == 0)
-            {
-not_found:      printf("Invalid or unsupported type %d\n", type);
-                goto done;
-            }
-
-            rtems_monitor_object_dump_1(info, id, verbose);
-
-            default_node = rtems_get_node(id);
-            
-            last_type = type;
-        }
-    }
-done:
-    return;
-}
diff --git a/c/src/libmisc/monitor/mon-prmisc.c b/c/src/libmisc/monitor/mon-prmisc.c
deleted file mode 100644
index ce9aa9a554..0000000000
--- a/c/src/libmisc/monitor/mon-prmisc.c
+++ /dev/null
@@ -1,259 +0,0 @@
-/*
- * Print misc stuff for the monitor dump routines
- * Each routine returns the number of characters it output.
- *
- * TODO:
- *
- *  $Id$
- */
-
-#include <rtems.h>
-#include <rtems/monitor.h>
-
-#include <rtems/assoc.h>
-
-#include <stdio.h>
-#include <ctype.h>
-
-void
-rtems_monitor_separator(void)
-{
-    printf("------------------------------------------------------------------------------\n");
-}
-
-unsigned32
-rtems_monitor_pad(
-    unsigned32  destination_column,
-    unsigned32  current_column
-)
-{
-    int pad_length;
-    
-    if (destination_column <= current_column)
-        pad_length = 1;
-    else
-        pad_length = destination_column - current_column;
-
-    return printf("%*s", pad_length, "");
-}
-
-unsigned32
-rtems_monitor_dump_char(rtems_unsigned8 ch)
-{
-    if (isprint(ch))
-        return printf("%c", ch);
-    else
-        return printf("%02x", ch);
-}
-
-unsigned32
-rtems_monitor_dump_decimal(unsigned32 num)
-{
-    return printf("%4d", num);
-}
-
-unsigned32
-rtems_monitor_dump_hex(unsigned32 num)
-{
-    return printf("0x%x", num);
-}
-
-unsigned32
-rtems_monitor_dump_assoc_bitfield(
-    rtems_assoc_t *ap,
-    char          *separator,
-    unsigned32     value
-  )
-{  
-    unsigned32 b;
-    unsigned32 length = 0;
-    const char *name;
-
-    for (b = 1; b; b <<= 1)
-        if (b & value)
-        {
-            if (length)
-                length += printf("%s", separator);
-
-            name = rtems_assoc_name_by_local(ap, b);
-            
-            if (name)
-                length += printf("%s", name);
-            else
-                length += printf("0x%x", b);
-        }
-        
-    return length;
-}
-
-unsigned32
-rtems_monitor_dump_id(rtems_id id)
-{
-    return printf("%08x", id);
-}
-
-unsigned32
-rtems_monitor_dump_name(rtems_name name)
-{
-    unsigned32 i;
-    unsigned32 length = 0;
-    union {
-        unsigned32 ui;
-        char       c[4];
-    } u;
-    
-    u.ui = (rtems_unsigned32) name;
-    
-#if (CPU_BIG_ENDIAN == TRUE)
-    for (i=0; i<sizeof(u.c); i++)
-        length += rtems_monitor_dump_char(u.c[i]);
-#else
-    for (i=sizeof(u.c)-1; i ; i--)
-        length += rtems_monitor_dump_char(u.c[i]);
-#endif
-    return length;
-}
-
-unsigned32
-rtems_monitor_dump_priority(rtems_task_priority priority)
-{
-    return printf("%3d", priority);
-}
-
-
-rtems_assoc_t rtems_monitor_state_assoc[] = {
-    { "DORM",   STATES_DORMANT },
-    { "SUSP",   STATES_SUSPENDED },
-    { "TRANS",  STATES_TRANSIENT },
-    { "DELAY",  STATES_DELAYING },
-    { "Wbuf",   STATES_WAITING_FOR_BUFFER },
-    { "Wseg",   STATES_WAITING_FOR_SEGMENT },
-    { "Wmsg" ,  STATES_WAITING_FOR_MESSAGE },
-    { "Wevnt",  STATES_WAITING_FOR_EVENT },
-    { "Wsem",   STATES_WAITING_FOR_SEMAPHORE },
-    { "Wtime",  STATES_WAITING_FOR_TIME },
-    { "Wrpc",   STATES_WAITING_FOR_RPC_REPLY },
-    { "WRATE",  STATES_WAITING_FOR_PERIOD },
-    { 0, 0, 0 },
-};
-
-unsigned32
-rtems_monitor_dump_state(States_Control state)
-{
-    unsigned32 length = 0;
-
-    if (state == STATES_READY)  /* assoc doesn't deal with this as it is 0 */
-        length += printf("READY");
-    
-    length += rtems_monitor_dump_assoc_bitfield(rtems_monitor_state_assoc,
-                                                ":",
-                                                state);
-    return length;
-}
-
-rtems_assoc_t rtems_monitor_attribute_assoc[] = {
-    { "FL",  RTEMS_FLOATING_POINT },
-    { "GL",  RTEMS_GLOBAL },
-    { "PR",  RTEMS_PRIORITY },
-    { "BI",  RTEMS_BINARY_SEMAPHORE },
-    { "IN",  RTEMS_INHERIT_PRIORITY },
-    { 0, 0, 0 },
-};
-
-unsigned32
-rtems_monitor_dump_attributes(rtems_attribute attributes)
-{
-    unsigned32 length = 0;
-
-    if (attributes == RTEMS_DEFAULT_ATTRIBUTES)  /* value is 0 */
-        length += printf("DEFAULT");
-    
-    length += rtems_monitor_dump_assoc_bitfield(rtems_monitor_attribute_assoc,
-                                                ":",
-                                                attributes);
-    return length;
-}
-
-rtems_assoc_t rtems_monitor_modes_assoc[] = {
-    { "nP",     RTEMS_NO_PREEMPT },
-    { "T",      RTEMS_TIMESLICE },
-    { "nA",     RTEMS_NO_ASR },
-    { 0, 0, 0 },
-};
-
-unsigned32
-rtems_monitor_dump_modes(rtems_mode modes)
-{
-    unsigned32 length = 0;
-
-    if (modes == RTEMS_DEFAULT_MODES)  /* value is 0 */
-        length += printf("P:T:nA");
-    
-    length += rtems_monitor_dump_assoc_bitfield(rtems_monitor_modes_assoc,
-                                                ":",
-                                                modes);
-    return length;
-}
-
-rtems_assoc_t rtems_monitor_events_assoc[] = {
-    { "0",   RTEMS_EVENT_0 },
-    { "1",   RTEMS_EVENT_1 },
-    { "2",   RTEMS_EVENT_2 },
-    { "3",   RTEMS_EVENT_3 },
-    { "4",   RTEMS_EVENT_4 },
-    { "5",   RTEMS_EVENT_5 },
-    { "6",   RTEMS_EVENT_6 },
-    { "7",   RTEMS_EVENT_7 },
-    { "8",   RTEMS_EVENT_8 },
-    { "9",   RTEMS_EVENT_9 },
-    { "10",  RTEMS_EVENT_10 },
-    { "11",  RTEMS_EVENT_11 },
-    { "12",  RTEMS_EVENT_12 },
-    { "13",  RTEMS_EVENT_13 },
-    { "14",  RTEMS_EVENT_14 },
-    { "15",  RTEMS_EVENT_15 },
-    { "16",  RTEMS_EVENT_16 },
-    { "17",  RTEMS_EVENT_17 },
-    { "18",  RTEMS_EVENT_18 },
-    { "19",  RTEMS_EVENT_19 },
-    { "20",  RTEMS_EVENT_20 },
-    { "21",  RTEMS_EVENT_21 },
-    { "22",  RTEMS_EVENT_22 },
-    { "23",  RTEMS_EVENT_23 },
-    { "24",  RTEMS_EVENT_24 },
-    { "25",  RTEMS_EVENT_25 },
-    { "26",  RTEMS_EVENT_26 },
-    { "27",  RTEMS_EVENT_27 },
-    { "28",  RTEMS_EVENT_28 },
-    { "29",  RTEMS_EVENT_29 },
-    { "30",  RTEMS_EVENT_30 },
-    { "31",  RTEMS_EVENT_31 },
-    { 0, 0, 0 },
-};
-
-unsigned32
-rtems_monitor_dump_events(rtems_event_set events)
-{
-    unsigned32 length = 0;
-
-    if (events == EVENT_SETS_NONE_PENDING)  /* value is 0 */
-        length += printf("NONE");
-    
-    length += rtems_monitor_dump_assoc_bitfield(rtems_monitor_events_assoc,
-                                                ":",
-                                                events);
-    return length;
-}
-
-unsigned32
-rtems_monitor_dump_notepad(unsigned32 *notepad)
-{
-    unsigned32 length = 0;
-    int i;
-
-    for (i=0; i < RTEMS_NUMBER_NOTEPADS; i++)
-        if (notepad[i])
-            length += printf("%d: 0x%x ", i, notepad[i]);
-
-    return length;
-}
diff --git a/c/src/libmisc/monitor/mon-queue.c b/c/src/libmisc/monitor/mon-queue.c
deleted file mode 100644
index b165062e28..0000000000
--- a/c/src/libmisc/monitor/mon-queue.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- *  $Id$
- */
-
-#include <rtems.h>
-#include <rtems/monitor.h>
-
-#include <stdio.h>
-
-void
-rtems_monitor_queue_canonical(
-    rtems_monitor_queue_t *canonical_queue,
-    void                  *queue_void
-)
-{
-    Message_queue_Control *rtems_queue = (Message_queue_Control *) queue_void;
-
-    canonical_queue->attributes = rtems_queue->attribute_set;
-    canonical_queue->maximum_message_size = rtems_queue->message_queue.maximum_message_size;
-    canonical_queue->maximum_pending_messages = rtems_queue->message_queue.maximum_pending_messages;
-    canonical_queue->number_of_pending_messages = rtems_queue->message_queue.number_of_pending_messages;
-}
-
-void
-rtems_monitor_queue_dump_header(
-    boolean verbose
-)
-{
-    printf("\
-  ID       NAME   ATTRIBUTES   PEND   MAXPEND  MAXSIZE\n");
-/*23456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789
-0         1         2         3         4         5         6         7       */
-    rtems_monitor_separator();
-}
-
-
-/*
- * Dump out the "next" queue indicated by 'id'.
- * Returns next one to check.
- * Returns RTEMS_OBJECT_ID_FINAL when all done
- */
-
-void
-rtems_monitor_queue_dump(
-    rtems_monitor_queue_t *monitor_queue,
-    boolean  verbose
-)
-{
-    unsigned32            length = 0;
-
-    length += rtems_monitor_dump_id(monitor_queue->id);
-    length += rtems_monitor_pad(11, length);
-    length += rtems_monitor_dump_name(monitor_queue->name);
-    length += rtems_monitor_pad(19, length);
-    length += rtems_monitor_dump_attributes(monitor_queue->attributes);
-    length += rtems_monitor_pad(31, length);
-    length += rtems_monitor_dump_decimal(monitor_queue->number_of_pending_messages);
-    length += rtems_monitor_pad(39, length);
-    length += rtems_monitor_dump_decimal(monitor_queue->maximum_pending_messages);
-    length += rtems_monitor_pad(48, length);
-    length += rtems_monitor_dump_decimal(monitor_queue->maximum_message_size);
-
-    printf("\n");
-}
diff --git a/c/src/libmisc/monitor/mon-server.c b/c/src/libmisc/monitor/mon-server.c
deleted file mode 100644
index 3ae56058d3..0000000000
--- a/c/src/libmisc/monitor/mon-server.c
+++ /dev/null
@@ -1,303 +0,0 @@
-/*
- * RTEMS monitor server (handles requests for info from RTEMS monitors
- *             running on other nodes)
- *
- *  $Id$
- */
-
-#include <rtems.h>
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#include <rtems/monitor.h>
-
-/*
- * Various id's for the server
- */
-
-rtems_id  rtems_monitor_server_task_id;
-rtems_id  rtems_monitor_server_request_queue_id;	/* our server */
-rtems_id *rtems_monitor_server_request_queue_ids;       /* all servers */
-rtems_id  rtems_monitor_server_response_queue_id;       /* our server */
-
-
-/*
- * Send a request to a server task
- */
-
-rtems_status_code
-rtems_monitor_server_request(
-    unsigned32                       server_node,
-    rtems_monitor_server_request_t  *request,
-    rtems_monitor_server_response_t *response
-)
-{
-    rtems_id          server_id;
-    rtems_status_code status;
-    unsigned32        size;
-
-    /*
-     * What is id of monitor on target node?
-     * Look it up if we don't know it yet.
-     */
-    
-    server_id = rtems_monitor_server_request_queue_ids[server_node];
-    if (server_id == 0)
-    {
-        status = rtems_message_queue_ident(RTEMS_MONITOR_QUEUE_NAME,
-                                           server_node,
-                                           &server_id);
-        if (status != RTEMS_SUCCESSFUL)
-        {
-            rtems_error(status, "ident of remote server failed");
-            goto done;
-        }
-        
-        rtems_monitor_server_request_queue_ids[server_node] = server_id;
-    }
-
-    request->return_id = rtems_monitor_server_response_queue_id;
-
-    status = rtems_message_queue_send(server_id, request, sizeof(*request));
-    if (status != RTEMS_SUCCESSFUL)
-    {
-        rtems_error(status, "monitor server request send failed");
-        goto done;
-    }
-    
-    /*
-     * Await response, if requested
-     */
-
-    if (response)
-    {
-        status = rtems_message_queue_receive(rtems_monitor_server_response_queue_id,
-                                             response,
-                                             &size,
-                                             RTEMS_WAIT,
-                                             100);
-        if (status != RTEMS_SUCCESSFUL)
-        {
-            rtems_error(status, "server did not respond");
-
-            /* maybe server task was restarted; look it up again next time */
-            rtems_monitor_server_request_queue_ids[server_node] = 0;
-
-            goto done;
-        }
-
-        if (response->command != RTEMS_MONITOR_SERVER_RESPONSE)
-        {
-            status = RTEMS_INCORRECT_STATE;
-            goto done;
-        }            
-    }
-    
-done:
-    return status;
-}
-
-
-
-/*
- * monitor server task
- */
-
-void
-rtems_monitor_server_task(
-    rtems_task_argument monitor_flags
-)
-{
-    rtems_monitor_server_request_t  request;
-    rtems_monitor_server_response_t response;
-    rtems_status_code               status;
-    unsigned32                      size;
-
-    for (;;)
-    {
-        status = rtems_message_queue_receive(
-                        rtems_monitor_server_request_queue_id,
-                        &request,
-                        &size,
-                        RTEMS_WAIT,
-                        (rtems_interval) 0);
-
-        if (status != RTEMS_SUCCESSFUL)
-        {
-            rtems_error(status, "monitor server msg queue receive error");
-            goto failed;
-        }
-                                             
-        if (size != sizeof(request))
-        {
-            rtems_error(0, "monitor server bad size on receive");
-            goto failed;
-        }
-        
-        switch (request.command)
-        {
-            case RTEMS_MONITOR_SERVER_CANONICAL:
-            {
-                rtems_monitor_object_type_t object_type;
-                rtems_id            id;
-                rtems_id            next_id;
-
-                object_type = (rtems_monitor_object_type_t) request.argument0;
-                id          = (rtems_id)            request.argument1;
-                next_id = rtems_monitor_object_canonical_get(object_type,
-                                                             id,
-                                                             &response.payload,
-                                                             &size);
-
-                response.command = RTEMS_MONITOR_SERVER_RESPONSE;
-                response.result0 = next_id;
-                response.result1 = size;
-
-#define SERVER_OVERHEAD  (RTEMS_offsetof(rtems_monitor_server_response_t, \
-                                         payload))
-                    
-                status = rtems_message_queue_send(request.return_id,
-                                                  &response,
-                                                  size + SERVER_OVERHEAD);
-                if (status != RTEMS_SUCCESSFUL)
-                {
-                    rtems_error(status, "response send failed");
-                    goto failed;
-                }
-                break;
-            }
-
-            default:
-            {
-                rtems_error(0, "invalid command to monitor server: %d", request.command);
-                goto failed;
-            }
-        }
-    }
-
-failed:
-    rtems_task_delete(RTEMS_SELF);
-}
-
-    
-/*
- * Kill off any old server
- * Not sure if this is useful, but it doesn't help
- */
-
-void
-rtems_monitor_server_kill(void)
-{
-    if (rtems_monitor_server_task_id)
-        rtems_task_delete(rtems_monitor_server_task_id);
-    rtems_monitor_task_id = 0;
-
-    if (rtems_monitor_server_request_queue_id)
-        rtems_message_queue_delete(rtems_monitor_server_request_queue_id);
-    rtems_monitor_server_response_queue_id = 0;
-
-    if (rtems_monitor_server_response_queue_id)
-        rtems_message_queue_delete(rtems_monitor_server_response_queue_id);
-    rtems_monitor_server_request_queue_ids = 0;
-
-    if (rtems_monitor_server_request_queue_ids)
-        free(rtems_monitor_server_request_queue_ids);
-    rtems_monitor_server_request_queue_ids = 0;
-}
-
-
-void
-rtems_monitor_server_init(
-    unsigned32 monitor_flags
-)
-{
-    rtems_status_code status;
-    
-    if (_System_state_Is_multiprocessing    &&
-        (_Configuration_MP_table->maximum_nodes > 1))
-    {
-        unsigned32 maximum_nodes = _Configuration_MP_table->maximum_nodes;
-        
-        /*
-         * create the msg que our server will listen
-         * Since we only get msgs from other RTEMS monitors, we just
-         * need reserve space for 1 msg from each node.
-         */
-
-        status = rtems_message_queue_create(
-                       RTEMS_MONITOR_QUEUE_NAME,
-                       maximum_nodes,
-                       sizeof(rtems_monitor_server_request_t),
-                       RTEMS_GLOBAL,
-                       &rtems_monitor_server_request_queue_id);
-        
-        if (status != RTEMS_SUCCESSFUL)
-        {
-            rtems_error(status, "could not create monitor server message queue");
-            goto done;
-        }
-          
-        /*
-         * create the msg que our responses will come on
-         * Since monitor just does one thing at a time, we only need 1 item
-         * message queue.
-         */
-        
-        status = rtems_message_queue_create(
-                       RTEMS_MONITOR_RESPONSE_QUEUE_NAME,
-                       1, /* depth */
-                       sizeof(rtems_monitor_server_response_t),
-                       RTEMS_GLOBAL,
-                       &rtems_monitor_server_response_queue_id);
-        
-        if (status != RTEMS_SUCCESSFUL)
-        {
-            rtems_error(status, "could not create monitor response message queue");
-            goto done;
-        }
-          
-        /* need an id for queue of each other server we might talk to */
-        /* indexed by node, so add 1 to maximum_nodes */
-        rtems_monitor_server_request_queue_ids =
-                   (rtems_id *) malloc((maximum_nodes + 1) * sizeof(rtems_id));
-        (void) memset(rtems_monitor_server_request_queue_ids,
-                      0,
-                      (maximum_nodes + 1) * sizeof(rtems_id));
-
-        rtems_monitor_server_request_queue_ids[rtems_monitor_node] =
-                   rtems_monitor_server_request_queue_id;
-
-        /*
-         * create the server task
-         */
-        status = rtems_task_create(RTEMS_MONITOR_SERVER_NAME,
-                                   1,
-                                   0 /* default stack */,
-                                   RTEMS_INTERRUPT_LEVEL(0),
-                                   RTEMS_DEFAULT_ATTRIBUTES,
-                                   &rtems_monitor_server_task_id);
-        if (status != RTEMS_SUCCESSFUL)
-        {
-            rtems_error(status, "could not create monitor server task");
-            goto done;
-        }
-
-        /*
-         * Start the server task
-         */
-        status = rtems_task_start(rtems_monitor_server_task_id,
-                                  rtems_monitor_server_task,
-                                  monitor_flags);
-        if (status != RTEMS_SUCCESSFUL)
-        {
-            rtems_error(status, "could not start monitor server");
-            goto done;
-        }
-    }
-
-done:
-    return;
-}
diff --git a/c/src/libmisc/monitor/mon-symbols.c b/c/src/libmisc/monitor/mon-symbols.c
deleted file mode 100644
index 48781bb6cc..0000000000
--- a/c/src/libmisc/monitor/mon-symbols.c
+++ /dev/null
@@ -1,487 +0,0 @@
-/*
- *  File:	symbols.c
- *
- *  Description:
- *    Symbol table manager for the RTEMS monitor.
- *    These routines may be used by other system resources also.
- *
- *
- *  TODO:
- *
- *  $Id$
- */
-
-/* for strcasecmp in linux and solaris */
-#if defined(__linux__)
-#include <features.h>
-#define __USE_BSD
-#endif
-#include <string.h>
-
-#define __RTEMS_VIOLATE_KERNEL_VISIBILITY__
-#include <rtems.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <rtems/monitor.h>
-#include <rtems/symbols.h>
-
-
-rtems_symbol_table_t *
-rtems_symbol_table_create()
-{
-    rtems_symbol_table_t *table;
-
-    table = (rtems_symbol_table_t *) malloc(sizeof(rtems_symbol_table_t));
-    memset((void *) table, 0, sizeof(*table));
-
-    table->growth_factor = 30;          /* 30 percent */
-
-    return table;
-}
-
-void
-rtems_symbol_table_destroy(rtems_symbol_table_t *table)
-{
-    rtems_symbol_string_block_t *p, *pnext;
-
-    if (table)
-    {
-        if (table->addresses)
-            (void) free(table->addresses);
-        table->addresses = 0;
-        p = table->string_buffer_head;
-        while (p)
-        {
-            pnext = p->next;
-            free(p);
-            p = pnext;
-        }
-        table->string_buffer_head = 0;
-        table->string_buffer_current = 0;
-
-        free(table);
-    }
-}
-
-rtems_symbol_t *
-rtems_symbol_create(
-    rtems_symbol_table_t *table,
-    char                 *name,
-    rtems_unsigned32     value
-    )
-{
-    int symbol_length;
-    size_t newsize;
-    rtems_symbol_t *sp;
-
-    symbol_length = strlen(name) + 1;   /* include '\000' in length */
-
-    /* need to grow the table? */
-    if (table->next >= table->size)
-    {
-        if (table->size == 0)
-            newsize = 100;
-        else
-            newsize = table->size + (table->size / (100 / table->growth_factor));
-
-        table->addresses = (rtems_symbol_t *) realloc((void *) table->addresses, newsize * sizeof(rtems_symbol_t));
-        if (table->addresses == 0)        /* blew it; lost orig */
-            goto failed;
-        table->size = newsize;
-    }
-
-    sp = &table->addresses[table->next];
-    sp->value = value;
-
-    /* Have to add it to string pool */
-    /* need to grow pool? */
-
-    if ((table->string_buffer_head == 0) ||
-        (table->strings_next + symbol_length) >= SYMBOL_STRING_BLOCK_SIZE)
-    {
-        rtems_symbol_string_block_t *p;
-
-        p = (rtems_symbol_string_block_t *) malloc(sizeof(rtems_symbol_string_block_t));
-        if (p == 0)
-            goto failed;
-        p->next = 0;
-        if (table->string_buffer_head == 0)
-            table->string_buffer_head = p;
-        else
-            table->string_buffer_current->next = p;
-        table->string_buffer_current = p;
-
-        table->strings_next = 0;
-    }
-
-    sp->name = table->string_buffer_current->buffer + table->strings_next;
-    (void) strcpy(sp->name, name);
-
-    table->strings_next += symbol_length;
-    table->sorted = 0;
-    table->next++;
-
-    return sp;
-
-/* XXX Not sure what to do here.  We've possibly destroyed the initial
-   symbol table due to realloc failure */
-failed:
-    return 0;
-}
-
-/*
- * Qsort entry point for compare by address
- */
-
-static int
-rtems_symbol_compare(const void *e1,
-                     const void *e2)
-{
-    rtems_symbol_t *s1, *s2;
-    s1 = (rtems_symbol_t *) e1;
-    s2 = (rtems_symbol_t *) e2;
-
-    if (s1->value < s2->value)
-        return -1;
-    if (s1->value > s2->value)
-        return 1;
-    return 0;
-}
-
-
-/*
- * Sort the symbol table using qsort
- */
-
-static void
-rtems_symbol_sort(rtems_symbol_table_t *table)
-{
-    qsort((void *) table->addresses, (size_t) table->next,
-          sizeof(rtems_symbol_t), rtems_symbol_compare);
-    table->sorted = 1;
-}
-
-
-/*
- * Search the symbol table by address
- * This code based on CYGNUS newlib bsearch, but changed
- * to allow for finding closest symbol <= key
- */
-
-rtems_symbol_t *
-rtems_symbol_value_lookup(
-    rtems_symbol_table_t *table,
-    rtems_unsigned32      value
-  )
-{
-    rtems_symbol_t *sp;
-    rtems_symbol_t *base;
-    rtems_symbol_t *best = 0;
-    rtems_unsigned32 distance;
-    rtems_unsigned32 best_distance = ~0;
-    rtems_unsigned32 elements;
-
-    if (table == 0)
-        table = rtems_monitor_symbols;
-
-    if ((table == 0) || (table->size == 0))
-        return 0;
-
-    if (table->sorted == 0)
-        rtems_symbol_sort(table);
-
-    base = table->addresses;
-    elements = table->next;
-
-    while (elements)
-    {
-        sp = base + (elements / 2);
-        if (value < sp->value)
-            elements /= 2;
-        else if (value > sp->value)
-        {
-            distance = value - sp->value;
-            if (distance < best_distance)
-            {
-                best_distance = distance;
-                best = sp;
-            }
-            base = sp + 1;
-            elements = (elements / 2) - (elements % 2 ? 0 : 1);
-        }
-        else
-            return sp;
-    }
-
-    if (value == base->value)
-        return base;
-
-    return best;
-}
-
-/*
- * Search the symbol table for the exact matching address.
- * If the symbol table has already been sorted, then
- * call the regular symbol value lookup, however, it it
- * has not yet been sorted, search it sequentially.
- * This routine is primarily used for low level symbol
- * lookups (eg. from exception handler and interrupt routines)
- * where the penality of sorted is not wanted and where
- * an exact match is needed such that symbol table order
- * is not important.
- */
-const rtems_symbol_t *
-rtems_symbol_value_lookup_exact(
-    rtems_symbol_table_t *table,
-    rtems_unsigned32      value
-  )
-{
-    rtems_unsigned32 s;
-    rtems_symbol_t *sp;
-
-    if (table == 0)
-    {
-        table = rtems_monitor_symbols;
-        if (table == 0)
-            return NULL;
-    }
-    
-    if (table->sorted)
-    {
-        sp = rtems_symbol_value_lookup(table, value);
-        if ( rtems_symbol_value(sp) == value )
-            return sp;
-        else
-            return NULL;  /* not an exact match */
-    }
- 
-    for (s = 0, sp = table->addresses; s < table->next; s++, sp++)
-    {
-        if ( sp->value == value )
-            return sp;
-    }
-
-    return NULL;
-
-}
-
-
-/*
- * Search the symbol table by string name (case independent)
- */
-
-rtems_symbol_t *
-rtems_symbol_name_lookup(
-    rtems_symbol_table_t *table,
-    char                 *name
-  )
-{
-    rtems_unsigned32 s;
-    rtems_symbol_t *sp;
-
-    if (table == 0)
-    {
-        table = rtems_monitor_symbols;
-        if (table == 0)
-            return NULL;
-    }
-    
-    for (s = 0, sp = table->addresses; s < table->next; s++, sp++)
-    {
-        if ( strcasecmp(sp->name, name) == 0 )
-            return sp;
-    }
-
-    return NULL;
-}
-
-void *
-rtems_monitor_symbol_next(
-    void                   *object_info,
-    rtems_monitor_symbol_t *canonical,
-    rtems_id               *next_id
-)
-{
-    rtems_symbol_table_t *table;
-    rtems_unsigned32 n = rtems_get_index(*next_id);
-
-    table = *(rtems_symbol_table_t **) object_info;
-    if (table == 0)
-        goto failed;
-
-    if (n >= table->next)
-        goto failed;
-
-    /* NOTE: symbols do not have id and name fields */
-      
-    if (table->sorted == 0)
-        rtems_symbol_sort(table);
-
-    _Thread_Disable_dispatch();
-
-    *next_id += 1;
-    return (void *) (table->addresses + n);
-
-failed:
-    *next_id = RTEMS_OBJECT_ID_FINAL;
-    return 0;
-}
-
-void
-rtems_monitor_symbol_canonical(
-    rtems_monitor_symbol_t *canonical_symbol,
-    rtems_symbol_t *sp
-)
-{
-    canonical_symbol->value = sp->value;
-    canonical_symbol->offset = 0;
-    strncpy(canonical_symbol->name, sp->name, sizeof(canonical_symbol->name));
-}
-
-
-void
-rtems_monitor_symbol_canonical_by_name(
-    rtems_monitor_symbol_t *canonical_symbol,
-    char                   *name
-)
-{
-    rtems_symbol_t *sp;
-
-    sp = rtems_symbol_name_lookup(0, name);
-
-    canonical_symbol->value = sp ? sp->value : 0;
-
-    strncpy(canonical_symbol->name, name, sizeof(canonical_symbol->name));
-    canonical_symbol->offset = 0;
-}
-
-void
-rtems_monitor_symbol_canonical_by_value(
-    rtems_monitor_symbol_t *canonical_symbol,
-    void                   *value_void_p
-)
-{
-    unsigned32 value = (unsigned32) value_void_p;
-    rtems_symbol_t *sp;
-
-    sp = rtems_symbol_value_lookup(0, value);
-    if (sp)
-    {
-        canonical_symbol->value = sp->value;
-        canonical_symbol->offset = value - sp->value;
-        strncpy(canonical_symbol->name, sp->name, sizeof(canonical_symbol->name));
-    }
-    else
-    {
-        canonical_symbol->value = value;
-        canonical_symbol->offset = 0;
-        canonical_symbol->name[0] = '\0';
-    }
-}
-
-
-unsigned32
-rtems_monitor_symbol_dump(
-    rtems_monitor_symbol_t *canonical_symbol,
-    boolean                 verbose
-)
-{
-    unsigned32 length = 0;
-
-    /*
-     * print the name if it exists AND if value is non-zero
-     * Ie: don't print some garbage symbol for address 0
-     */
-
-    if (canonical_symbol->name[0] && (canonical_symbol->value != 0))
-    {
-        if (canonical_symbol->offset == 0)
-            length += printf("%.*s",
-                             (int) sizeof(canonical_symbol->name),
-                             canonical_symbol->name);
-        else
-            length += printf("<%.*s+0x%x>",
-                             (int) sizeof(canonical_symbol->name),
-                             canonical_symbol->name,
-                             canonical_symbol->offset);
-        if (verbose)
-            length += printf(" [0x%x]", canonical_symbol->value);
-    }
-    else
-        length += printf("[0x%x]", canonical_symbol->value);
-
-    return length;
-}
-
-
-void
-rtems_monitor_symbol_dump_all(
-    rtems_symbol_table_t *table,
-    boolean               verbose
-)
-{
-    rtems_unsigned32 s;
-    rtems_symbol_t *sp;
-
-    if (table == 0)
-    {
-        table = rtems_monitor_symbols;
-        if (table == 0)
-            return;
-    }
-
-    if (table->sorted == 0)
-        rtems_symbol_sort(table);
-
-    for (s = 0, sp = table->addresses; s < table->next; s++, sp++)
-    {
-        rtems_monitor_symbol_t canonical_symbol;
-
-        rtems_monitor_symbol_canonical(&canonical_symbol, sp);
-        rtems_monitor_symbol_dump(&canonical_symbol, TRUE);
-        printf("\n");
-    }
-}
-
-
-/*
- * 'symbol' command
- */
-
-void
-rtems_monitor_symbol_cmd(
-    int        argc,
-    char     **argv,
-    unsigned32 command_arg,
-    boolean    verbose
-)
-{
-    int arg;
-    rtems_symbol_table_t *table;
-
-    table = *(rtems_symbol_table_t **) command_arg;
-    if (table == 0)
-    {
-        table = rtems_monitor_symbols;
-        if (table == 0)
-            return;
-    }
-
-    /*
-     * Use object command to dump out whole symbol table
-     */
-    if (argc == 1)
-        rtems_monitor_symbol_dump_all(table, verbose);
-    else
-    {
-        rtems_monitor_symbol_t canonical_symbol;
-
-        for (arg=1; argv[arg]; arg++)
-        {
-            rtems_monitor_symbol_canonical_by_name(&canonical_symbol, argv[arg]);
-            rtems_monitor_symbol_dump(&canonical_symbol, verbose);
-            printf("\n");
-        }
-    }
-}
diff --git a/c/src/libmisc/monitor/mon-task.c b/c/src/libmisc/monitor/mon-task.c
deleted file mode 100644
index b6ca36ddd1..0000000000
--- a/c/src/libmisc/monitor/mon-task.c
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * RTEMS Monitor task support
- *
- *  $Id$
- */
-
-#include <rtems.h>
-#include <rtems/monitor.h>
-
-#include <stdio.h>
-#include <string.h>    /* memcpy() */
-
-void
-rtems_monitor_task_canonical(
-    rtems_monitor_task_t  *canonical_task,
-    void                  *thread_void
-)
-{
-    Thread_Control       *rtems_thread = (Thread_Control *) thread_void;
-    RTEMS_API_Control    *api;
-
-    api = rtems_thread->API_Extensions[ THREAD_API_RTEMS ];
-    
-    canonical_task->entry = rtems_thread->Start.entry_point;
-    canonical_task->argument = rtems_thread->Start.numeric_argument;
-    canonical_task->stack = rtems_thread->Start.Initial_stack.area;
-    canonical_task->stack_size = rtems_thread->Start.Initial_stack.size;
-    canonical_task->priority = rtems_thread->current_priority;
-    canonical_task->state = rtems_thread->current_state;
-    canonical_task->wait_id = rtems_thread->Wait.id;
-    canonical_task->events = api->pending_events;
-
-/* XXX modes and attributes only exist in the RTEMS API .. */
-/* XXX not directly in the core thread.. they will have to be derived */
-/* XXX if they are important enough to include anymore.   */
-    canonical_task->modes = 0; /* XXX FIX ME.... rtems_thread->current_modes; */
-    canonical_task->attributes = 0 /* XXX FIX ME rtems_thread->API_Extensions[ THREAD_API_RTEMS ]->attribute_set */;
-    (void) memcpy(canonical_task->notepad, api ->Notepads, sizeof(canonical_task->notepad));
-/* XXX more to fix */
-/*
-    (void) memcpy(&canonical_task->wait_args, &rtems_thread->Wait.Extra, sizeof(canonical_task->wait_args));
-*/
-}
-
-
-void
-rtems_monitor_task_dump_header(
-    boolean verbose
-)
-{
-    printf("\
-  ID       NAME   PRIO   STAT   MODES  EVENTS   WAITID  WAITARG  NOTES\n");
-/*23456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789
-0         1         2         3         4         5         6         7       */
-           
-    rtems_monitor_separator();
-}
-
-/*
- */
-
-void
-rtems_monitor_task_dump(
-    rtems_monitor_task_t *monitor_task,
-    boolean  verbose
-)
-{
-    int length = 0;
-
-    length += rtems_monitor_dump_id(monitor_task->id);
-    length += rtems_monitor_pad(11, length);
-    length += rtems_monitor_dump_name(monitor_task->name);
-    length += rtems_monitor_pad(18, length);
-    length += rtems_monitor_dump_priority(monitor_task->priority);
-    length += rtems_monitor_pad(24, length);
-    length += rtems_monitor_dump_state(monitor_task->state);
-    length += rtems_monitor_pad(31, length);
-    length += rtems_monitor_dump_modes(monitor_task->modes);
-    length += rtems_monitor_pad(39, length);
-    length += rtems_monitor_dump_events(monitor_task->events);
-    if (monitor_task->wait_id)
-    {
-        length += rtems_monitor_pad(47, length);
-        length += rtems_monitor_dump_id(monitor_task->wait_id);
-        length += rtems_monitor_pad(57, length);
-        length += rtems_monitor_dump_hex(monitor_task->wait_args);
-    }
-
-    length += rtems_monitor_pad(65, length);
-    length += rtems_monitor_dump_notepad(monitor_task->notepad);
-    printf("\n");
-}
-
diff --git a/c/src/libmisc/monitor/monitor.h b/c/src/libmisc/monitor/monitor.h
deleted file mode 100644
index 16efd7c41f..0000000000
--- a/c/src/libmisc/monitor/monitor.h
+++ /dev/null
@@ -1,443 +0,0 @@
-/*
- *  File:	monitor.h
- *
- *  Description:
- *    The RTEMS monitor task include file.
- *
- *  TODO:
- *
- *  $Id$
- */
-
-#ifndef __MONITOR_H
-#define __MONITOR_H
-
-#include <rtems/symbols.h>
-#include <rtems/error.h>		/* rtems_error() */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * Monitor types are derived from rtems object classes
- */
-
-typedef enum {
-    RTEMS_MONITOR_OBJECT_INVALID   =  OBJECTS_NO_CLASS,
-    RTEMS_MONITOR_OBJECT_TASK      =  OBJECTS_RTEMS_TASKS,
-    RTEMS_MONITOR_OBJECT_EXTENSION =  OBJECTS_RTEMS_EXTENSIONS,
-    RTEMS_MONITOR_OBJECT_QUEUE     =  OBJECTS_RTEMS_MESSAGE_QUEUES,
-    RTEMS_MONITOR_OBJECT_SEMAPHORE =  OBJECTS_RTEMS_SEMAPHORES,
-    RTEMS_MONITOR_OBJECT_PARTITION =  OBJECTS_RTEMS_PARTITIONS,
-    RTEMS_MONITOR_OBJECT_REGION    =  OBJECTS_RTEMS_REGIONS,
-    RTEMS_MONITOR_OBJECT_PORT      =  OBJECTS_RTEMS_PORTS,
-
-    /* following monitor objects are not known to RTEMS, but
-     * we like to have "types" for them anyway */
-    
-    RTEMS_MONITOR_OBJECT_DRIVER    =  OBJECTS_CLASSES_LAST+1,
-    RTEMS_MONITOR_OBJECT_DNAME,
-    RTEMS_MONITOR_OBJECT_CONFIG,
-    RTEMS_MONITOR_OBJECT_INIT_TASK,
-    RTEMS_MONITOR_OBJECT_MPCI,
-    RTEMS_MONITOR_OBJECT_SYMBOL
-} rtems_monitor_object_type_t;
-
-/*
- * rtems_monitor_init() flags
- */
-
-#define RTEMS_MONITOR_SUSPEND	0x0001		/* suspend monitor on startup */
-#define RTEMS_MONITOR_GLOBAL    0x0002          /* monitor should be global */
-
-
-/*
- * Public interfaces for RTEMS data structures monitor is aware of.
- * These are only used by the monitor.
- *
- * NOTE:
- *  All the canonical objects that correspond to RTEMS managed "objects"
- *  must have an identical first portion with 'id' and 'name' fields.
- *
- *  Others do not have that restriction, even tho we would like them to.
- *  This is because some of the canonical structures are almost too big
- *  for shared memory driver (eg: mpci) and we are nickel and diming it.
- */
-
-/*
- * Type of a pointer that may be a symbol
- */
-    
-#define MONITOR_SYMBOL_LEN 20
-typedef struct {
-    char       name[MONITOR_SYMBOL_LEN];
-    unsigned32 value;
-    unsigned32 offset;
-} rtems_monitor_symbol_t;    
-
-typedef struct {
-    rtems_id            id;
-    rtems_name          name;
-  /* end of common portion */
-} rtems_monitor_generic_t;        
-
-/*
- * Task
- */
-typedef struct {
-    rtems_id            id;
-    rtems_name          name;
-  /* end of common portion */
-    Thread_Entry        entry;
-    unsigned32          argument;
-    void               *stack;
-    unsigned32          stack_size;
-    rtems_task_priority priority;
-    States_Control      state;
-    rtems_event_set     events;
-    rtems_mode          modes;
-    rtems_attribute     attributes;
-    unsigned32          notepad[RTEMS_NUMBER_NOTEPADS];
-    rtems_id            wait_id;
-    unsigned32          wait_args;
-} rtems_monitor_task_t;
-
-/*
- * Init task
- */
-
-typedef struct {
-    rtems_id            id;		/* not really an id */
-    rtems_name          name;
-  /* end of common portion */
-    rtems_monitor_symbol_t entry;
-    unsigned32             argument;
-    unsigned32             stack_size;
-    rtems_task_priority    priority;
-    rtems_mode             modes;
-    rtems_attribute        attributes;
-} rtems_monitor_init_task_t;
-
-
-/*
- * Message queue
- */
-typedef struct {
-    rtems_id            id;
-    rtems_name          name;
-  /* end of common portion */
-    rtems_attribute     attributes;
-    unsigned32          number_of_pending_messages;
-    unsigned32          maximum_pending_messages;
-    unsigned32          maximum_message_size;
-} rtems_monitor_queue_t;
-
-/*
- * Extension
- */
-typedef struct {
-    rtems_id                 id;
-    rtems_name               name;
-  /* end of common portion */
-    rtems_monitor_symbol_t  e_create;
-    rtems_monitor_symbol_t  e_start;
-    rtems_monitor_symbol_t  e_restart;
-    rtems_monitor_symbol_t  e_delete;
-    rtems_monitor_symbol_t  e_tswitch;
-    rtems_monitor_symbol_t  e_begin;
-    rtems_monitor_symbol_t  e_exitted;
-    rtems_monitor_symbol_t  e_fatal;
-} rtems_monitor_extension_t;
-
-/*
- * Device driver
- */
-
-typedef struct {
-    rtems_id            id;		   /* not really an id (should be tho) */
-    rtems_name          name;              /* ditto */
-  /* end of common portion */
-    rtems_monitor_symbol_t initialization; /* initialization procedure */
-    rtems_monitor_symbol_t open;           /* open request procedure */
-    rtems_monitor_symbol_t close;          /* close request procedure */
-    rtems_monitor_symbol_t read;           /* read request procedure */
-    rtems_monitor_symbol_t write;          /* write request procedure */
-    rtems_monitor_symbol_t control;        /* special functions procedure */
-} rtems_monitor_driver_t;
-
-typedef struct {
-    rtems_id            id;		    /* not used for drivers (yet) */
-    rtems_name          name;               /* not used for drivers (yet) */
-  /* end of common portion */
-    unsigned32          major;
-    unsigned32          minor;
-    char                name_string[64];
-} rtems_monitor_dname_t;
-
-/*
- * System config
- */
-
-typedef struct {
-    void               *work_space_start;
-    unsigned32          work_space_size;
-    unsigned32          maximum_tasks;
-    unsigned32          maximum_timers;
-    unsigned32          maximum_semaphores;
-    unsigned32          maximum_message_queues;
-    unsigned32          maximum_partitions;
-    unsigned32          maximum_regions;
-    unsigned32          maximum_ports;
-    unsigned32          maximum_periods;
-    unsigned32          maximum_extensions;
-    unsigned32          microseconds_per_tick;
-    unsigned32          ticks_per_timeslice;
-    unsigned32          number_of_initialization_tasks;
-} rtems_monitor_config_t;
-
-/*
- * MPCI config
- */
-
-typedef struct {
-    unsigned32  node;                   /* local node number */
-    unsigned32  maximum_nodes;          /* maximum # nodes in system */
-    unsigned32  maximum_global_objects; /* maximum # global objects */
-    unsigned32  maximum_proxies;        /* maximum # proxies */
-
-    unsigned32               default_timeout;        /* in ticks */
-    unsigned32               maximum_packet_size;
-    rtems_monitor_symbol_t   initialization;
-    rtems_monitor_symbol_t   get_packet;
-    rtems_monitor_symbol_t   return_packet;
-    rtems_monitor_symbol_t   send_packet;
-    rtems_monitor_symbol_t   receive_packet;
-} rtems_monitor_mpci_t;
-
-/*
- * The generic canonical information union
- */
-
-typedef union {
-    rtems_monitor_generic_t    generic;
-    rtems_monitor_task_t       task;
-    rtems_monitor_queue_t      queue;
-    rtems_monitor_extension_t  extension;
-    rtems_monitor_driver_t     driver;
-    rtems_monitor_dname_t      dname;
-    rtems_monitor_config_t     config;
-    rtems_monitor_mpci_t       mpci;
-    rtems_monitor_init_task_t  itask;
-} rtems_monitor_union_t;
-
-/*
- * Support for talking to other monitors
- */
-
-/*
- * Names of other monitors
- */
-
-#define RTEMS_MONITOR_NAME        (rtems_build_name('R', 'M', 'O', 'N'))
-#define RTEMS_MONITOR_SERVER_NAME (rtems_build_name('R', 'M', 'S', 'V'))
-#define RTEMS_MONITOR_QUEUE_NAME  (rtems_build_name('R', 'M', 'S', 'Q'))
-#define RTEMS_MONITOR_RESPONSE_QUEUE_NAME (rtems_build_name('R', 'M', 'R', 'Q'))
-
-#define RTEMS_MONITOR_SERVER_RESPONSE    0x0001
-#define RTEMS_MONITOR_SERVER_CANONICAL   0x0002
-
-typedef struct
-{
-    unsigned32  command;
-    rtems_id    return_id;
-    unsigned32  argument0;
-    unsigned32  argument1;
-    unsigned32  argument2;
-    unsigned32  argument3;
-    unsigned32  argument4;
-    unsigned32  argument5;
-} rtems_monitor_server_request_t;
-
-typedef struct
-{
-    unsigned32  command;
-    unsigned32  result0;
-    unsigned32  result1;
-    rtems_monitor_union_t payload;
-} rtems_monitor_server_response_t;
-
-extern rtems_id  rtems_monitor_task_id;
-
-extern unsigned32 rtems_monitor_node;	       /* our node number */
-extern unsigned32 rtems_monitor_default_node;  /* current default for commands */
-
-/*
- * Monitor command function and table entry
- */
-
-typedef struct rtems_monitor_command_entry_s rtems_monitor_command_entry_t;
-
-typedef void ( *rtems_monitor_command_function_t )(
-                 int         argc,
-                 char      **argv,
-                 unsigned32  command_arg,
-                 boolean     verbose
-             );
-
-struct rtems_monitor_command_entry_s {
-    char        *command;      /* command name */
-    char        *usage;        /* usage string for the command */
-    unsigned32   arguments_required;    /* # of required args */
-    rtems_monitor_command_function_t command_function;
-
-                               /* Some argument for the command */
-    unsigned32          command_arg;
-};
-
-typedef void *(*rtems_monitor_object_next_fn)(void *, void *, rtems_id *);
-typedef void (*rtems_monitor_object_canonical_fn)(void *, void *);
-typedef void (*rtems_monitor_object_dump_header_fn)(boolean);
-typedef void (*rtems_monitor_object_dump_fn)(void *, boolean);
-
-typedef struct {
-    rtems_monitor_object_type_t         type;
-    void                               *object_information;
-    int                                 size;	/* of canonical object */
-    rtems_monitor_object_next_fn        next;
-    rtems_monitor_object_canonical_fn   canonical;
-    rtems_monitor_object_dump_header_fn dump_header;
-    rtems_monitor_object_dump_fn        dump;
-} rtems_monitor_object_info_t;
-
-
-/* monitor.c */
-void    rtems_monitor_kill(void);
-void    rtems_monitor_init(unsigned32);
-void    rtems_monitor_wakeup(void);
-void    rtems_monitor_pause_cmd(int, char **, unsigned32, boolean);
-void    rtems_monitor_fatal_cmd(int, char **, unsigned32, boolean);
-void    rtems_monitor_continue_cmd(int, char **, unsigned32, boolean);
-void    rtems_monitor_debugger_cmd(int, char **, unsigned32, boolean);
-void    rtems_monitor_node_cmd(int, char **, unsigned32, boolean);
-void    rtems_monitor_symbols_loadup(void);
-void    rtems_monitor_task(rtems_task_argument);
-
-/* server.c */
-void    rtems_monitor_server_kill(void);
-rtems_status_code rtems_monitor_server_request(unsigned32, rtems_monitor_server_request_t *, rtems_monitor_server_response_t *);
-void    rtems_monitor_server_task(rtems_task_argument);
-void    rtems_monitor_server_init(unsigned32);
-  
-/* command.c */
-int     rtems_monitor_make_argv(char *, int *, char **);
-int     rtems_monitor_command_read(char *, int *, char **);
-rtems_monitor_command_entry_t *rtems_monitor_command_lookup(
-    rtems_monitor_command_entry_t * table, int argc, char **argv);
-void    rtems_monitor_command_usage(rtems_monitor_command_entry_t *, char *);
-void    rtems_monitor_help_cmd(int, char **, unsigned32, boolean);
-
-/* prmisc.c */
-void       rtems_monitor_separator(void);
-unsigned32 rtems_monitor_pad(unsigned32 dest_col, unsigned32 curr_col);
-unsigned32 rtems_monitor_dump_char(unsigned8 ch);
-unsigned32 rtems_monitor_dump_decimal(unsigned32 num);
-unsigned32 rtems_monitor_dump_hex(unsigned32 num);
-unsigned32 rtems_monitor_dump_id(rtems_id id);
-unsigned32 rtems_monitor_dump_name(rtems_name name);
-unsigned32 rtems_monitor_dump_priority(rtems_task_priority priority);
-unsigned32 rtems_monitor_dump_state(States_Control state);
-unsigned32 rtems_monitor_dump_modes(rtems_mode modes);
-unsigned32 rtems_monitor_dump_attributes(rtems_attribute attributes);
-unsigned32 rtems_monitor_dump_events(rtems_event_set events);
-unsigned32 rtems_monitor_dump_notepad(unsigned32 *notepad);
-
-/* object.c */
-rtems_id   rtems_monitor_id_fixup(rtems_id, unsigned32, rtems_monitor_object_type_t);
-rtems_id   rtems_monitor_object_canonical_get(rtems_monitor_object_type_t, rtems_id, void *, unsigned32 *size_p);
-rtems_id   rtems_monitor_object_canonical_next(rtems_monitor_object_info_t *, rtems_id, void *);
-void      *rtems_monitor_object_next(void *, void *, rtems_id, rtems_id *);
-rtems_id   rtems_monitor_object_canonical(rtems_id, void *);
-void       rtems_monitor_object_cmd(int, char **, unsigned32, boolean);
-
-/* manager.c */
-void      *rtems_monitor_manager_next(void *, void *, rtems_id *);
-
-/* config.c */
-void       rtems_monitor_config_canonical(rtems_monitor_config_t *, void *);
-void      *rtems_monitor_config_next(void *, rtems_monitor_config_t *, rtems_id *);
-void       rtems_monitor_config_dump_header(boolean);
-void       rtems_monitor_config_dump(rtems_monitor_config_t *, boolean verbose);
-
-/* mpci.c */
-void       rtems_monitor_mpci_canonical(rtems_monitor_mpci_t *, void *);
-void      *rtems_monitor_mpci_next(void *, rtems_monitor_mpci_t *, rtems_id *);
-void       rtems_monitor_mpci_dump_header(boolean);
-void       rtems_monitor_mpci_dump(rtems_monitor_mpci_t *, boolean verbose);
-
-/* itask.c */
-void       rtems_monitor_init_task_canonical(rtems_monitor_init_task_t *, void *);
-void      *rtems_monitor_init_task_next(void *, rtems_monitor_init_task_t *, rtems_id *);
-void       rtems_monitor_init_task_dump_header(boolean);
-void       rtems_monitor_init_task_dump(rtems_monitor_init_task_t *, boolean verbose);
-
-/* extension.c */
-void       rtems_monitor_extension_canonical(rtems_monitor_extension_t *, void *);
-void       rtems_monitor_extension_dump_header(boolean verbose);
-void       rtems_monitor_extension_dump(rtems_monitor_extension_t *, boolean);
-
-/* task.c */
-void    rtems_monitor_task_canonical(rtems_monitor_task_t *, void *);
-void    rtems_monitor_task_dump_header(boolean verbose);
-void    rtems_monitor_task_dump(rtems_monitor_task_t *, boolean);
-
-/* queue.c */
-void    rtems_monitor_queue_canonical(rtems_monitor_queue_t *, void *);
-void    rtems_monitor_queue_dump_header(boolean verbose);
-void    rtems_monitor_queue_dump(rtems_monitor_queue_t *, boolean);
-
-/* driver.c */
-void    *rtems_monitor_driver_next(void *, rtems_monitor_driver_t *, rtems_id *);
-void     rtems_monitor_driver_canonical(rtems_monitor_driver_t *, void *);
-void     rtems_monitor_driver_dump_header(boolean);
-void     rtems_monitor_driver_dump(rtems_monitor_driver_t *, boolean);
-
-/* dname.c */
-void    *rtems_monitor_dname_next(void *, rtems_monitor_dname_t *, rtems_id *);
-void     rtems_monitor_dname_canonical(rtems_monitor_dname_t *, void *);
-void     rtems_monitor_dname_dump_header(boolean);
-void     rtems_monitor_dname_dump(rtems_monitor_dname_t *, boolean);
-
-/* symbols.c */
-rtems_symbol_table_t *rtems_symbol_table_create();
-void                  rtems_symbol_table_destroy(rtems_symbol_table_t *table);
-
-rtems_symbol_t *rtems_symbol_create(rtems_symbol_table_t *, char *, unsigned32);
-rtems_symbol_t *rtems_symbol_value_lookup(rtems_symbol_table_t *, unsigned32);
-const rtems_symbol_t *rtems_symbol_value_lookup_exact(rtems_symbol_table_t *, unsigned32);
-rtems_symbol_t *rtems_symbol_name_lookup(rtems_symbol_table_t *, char *);
-void   *rtems_monitor_symbol_next(void *object_info, rtems_monitor_symbol_t *, rtems_id *);
-void    rtems_monitor_symbol_canonical(rtems_monitor_symbol_t *, rtems_symbol_t *);
-void    rtems_monitor_symbol_canonical_by_name(rtems_monitor_symbol_t *, char *);
-void    rtems_monitor_symbol_canonical_by_value(rtems_monitor_symbol_t *, void *);
-unsigned32 rtems_monitor_symbol_dump(rtems_monitor_symbol_t *, boolean);
-void    rtems_monitor_symbol_cmd(int, char **, unsigned32, boolean);
-
-
-extern rtems_symbol_table_t *rtems_monitor_symbols;
-
-#ifndef MONITOR_PROMPT
-#define MONITOR_PROMPT "rtems"		/* will have '> ' appended */
-#endif
-
-#define MONITOR_WAKEUP_EVENT   RTEMS_EVENT_0
-
-
-#define STREQ(a,b)	(strcmp(a,b) == 0)
-#define STRNEQ(a,b,n)	(strncmp(a,b,n) == 0)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  /* ! __MONITOR_H */
diff --git a/c/src/libmisc/monitor/symbols.h b/c/src/libmisc/monitor/symbols.h
deleted file mode 100644
index 119c879d54..0000000000
--- a/c/src/libmisc/monitor/symbols.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- *  RTEMS monitor symbol table functions
- *
- *  Description:
- *      Entry points for symbol table routines.
- *
- *
- *
- *  TODO:
- *
- *  $Id$
- */
-
-#ifndef _INCLUDE_SYMBOLS_H
-#define _INCLUDE_SYMBOLS_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct {
-    rtems_unsigned32 value;
-    char            *name;
-} rtems_symbol_t;
-
-#define SYMBOL_STRING_BLOCK_SIZE 4080
-typedef struct rtems_symbol_string_block_s {
-    struct rtems_symbol_string_block_s *next;
-    char   buffer[SYMBOL_STRING_BLOCK_SIZE];
-} rtems_symbol_string_block_t;
-
-typedef struct {
-
-    rtems_unsigned32 sorted;          /* are symbols sorted right now? */
-    rtems_unsigned32 growth_factor;   /* % to grow by when needed */
-    rtems_unsigned32 next;            /* next symbol slot to use when adding */
-    rtems_unsigned32 size;            /* max # of symbols */
-
-    /*
-     * Symbol list -- sorted by address (when we do a lookup)
-     */
-
-    rtems_symbol_t  *addresses;         /* symbol array by address */
-
-    /*
-     * String pool, unsorted, a list of blocks of string data
-     */
-
-    rtems_symbol_string_block_t *string_buffer_head;
-    rtems_symbol_string_block_t *string_buffer_current;
-    rtems_unsigned32 strings_next;      /* next byte to use in this block */
-
-} rtems_symbol_table_t;
-
-#define rtems_symbol_name(sp)   ((sp)->name)
-#define rtems_symbol_value(sp)  ((sp)->value)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* ! _INCLUDE_SYMBOLS_H */
diff --git a/c/src/libmisc/rtmonuse/Makefile.in b/c/src/libmisc/rtmonuse/Makefile.in
deleted file mode 100644
index a344c894b6..0000000000
--- a/c/src/libmisc/rtmonuse/Makefile.in
+++ /dev/null
@@ -1,54 +0,0 @@
-#	
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-LIB=${ARCH}/librtmonuse-tmp.a
-
-# C source names, if any, go here -- minus the .c
-C_PIECES=rtmonuse
-C_FILES=$(C_PIECES:%=%.c)
-C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
-
-H_FILES=
-INSTALLED_H_FILES=$(srcdir)/rtmonuse.h
-
-SRCS=$(C_FILES) $(H_FILES) $(INSTALLED_H_FILES)
-OBJS=$(C_O_FILES)
-
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/lib.cfg
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES  +=
-CPPFLAGS += -I.
-CFLAGS   +=
-
-LD_PATHS  +=
-LD_LIBS   +=
-LDFLAGS   +=
-
-#
-# Add your list of files to delete here.  The config files
-#  already know how to delete some stuff, so you may want
-#  to just run 'make clean' first to see what gets missed.
-#  'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
-
-${LIB}: ${SRCS} ${OBJS}
-	$(make-library)
-
-all: ${ARCH} $(SRCS) $(LIB)
-	$(INSTALL) -m 444 ${INSTALLED_H_FILES} $(PROJECT_INCLUDE)
-#	$(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems
diff --git a/c/src/libmisc/rtmonuse/rtmonuse.c b/c/src/libmisc/rtmonuse/rtmonuse.c
deleted file mode 100644
index 843d29468e..0000000000
--- a/c/src/libmisc/rtmonuse/rtmonuse.c
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- *  $Id$
- */
-
-#include <rtems.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <assert.h>
-
-#include "rtmonuse.h"
-
-typedef struct {
-  rtems_id     id;
-  unsigned32   count;
-  unsigned32   missed_count;
-  unsigned32   min_cpu_time;
-  unsigned32   max_cpu_time;
-  unsigned32   total_cpu_time;
-  unsigned32   min_wall_time;
-  unsigned32   max_wall_time;
-  unsigned32   total_wall_time;
-}  Period_usage_t;
-
-Period_usage_t *Period_usage_Information;
-
-/*PAGE
- *
- *  Period_usage_Initialize
- */
-
-void Period_usage_Initialize( void )
-{
-  int             maximum;
-
-  maximum = _Configuration_Table->RTEMS_api_configuration->maximum_periods;
- 
-  Period_usage_Information = malloc( sizeof(Period_usage_t) * (maximum+1) );
-
-  Period_usage_Reset();
-}
-
-/*PAGE
- *
- *  Period_usage_Reset
- */
-
-void Period_usage_Reset( void )
-{
-  unsigned32      i;
-  Period_usage_t *the_usage;
-
-  for ( i=0 ;
-        i<_Configuration_Table->RTEMS_api_configuration->maximum_periods ;
-        i++ ) {
-    the_usage = &Period_usage_Information[ i ];
- 
-    the_usage->count           = 0;
-    the_usage->missed_count    = 0;
-    the_usage->min_cpu_time    = 0xFFFFFFFF;
-    the_usage->max_cpu_time    = 0;
-    the_usage->total_cpu_time  = 0;
-    the_usage->min_wall_time   = 0xFFFFFFFF;
-    the_usage->max_wall_time   = 0;
-    the_usage->total_wall_time = 0;
- 
-  }
-}
-
-/*PAGE
- *
- *  Period_usage_Update
- */
-
-void Period_usage_Update( 
-  rtems_id     id
-)
-{
-  rtems_rate_monotonic_period_status rm_status;
-  rtems_status_code                  status;
-  Period_usage_t                    *the_usage;
-
-  assert( Period_usage_Information );
-
-  status = rtems_rate_monotonic_get_status( id, &rm_status );
-  assert( status == RTEMS_SUCCESSFUL );
-
-  the_usage = &Period_usage_Information[ rtems_get_index( id ) ];
-
-  the_usage->id = id;
-  the_usage->count++;
-  if ( rm_status.state == RATE_MONOTONIC_EXPIRED )
-    the_usage->missed_count++;
-  the_usage->total_cpu_time  += rm_status.ticks_executed_since_last_period;
-  the_usage->total_wall_time += rm_status.ticks_since_last_period;
-
-  /*
-   *  Update CPU time
-   */
-
-  if ( rm_status.ticks_executed_since_last_period < the_usage->min_cpu_time )
-    the_usage->min_cpu_time = rm_status.ticks_executed_since_last_period;
-
-  if ( rm_status.ticks_executed_since_last_period > the_usage->max_cpu_time )
-    the_usage->max_cpu_time = rm_status.ticks_executed_since_last_period;
-
-  /*
-   *  Update Wall time
-   */
-
-  if ( rm_status.ticks_since_last_period < the_usage->min_wall_time )
-    the_usage->min_wall_time = rm_status.ticks_since_last_period;
-
-  if ( rm_status.ticks_since_last_period > the_usage->max_wall_time )
-    the_usage->max_wall_time = rm_status.ticks_since_last_period;
-
-}
-
-/*PAGE
- *
- *  Period_usage_Dump
- */
-
-void Period_usage_Dump( void )
-{
-  unsigned32              i;
-  Period_usage_t         *the_usage;
-  Rate_monotonic_Control *the_period;
-  unsigned32              u32_name;
-  char                    name[5];
- 
-  if ( !Period_usage_Information ) {
-    printf( "Period statistics library is not initialized\n" );
-    return;
-  }
-
-  printf( "Period information by period\n" ); 
-  printf( "   ID      OWNER   PERIODS  MISSED    CPU TIME    WALL TIME\n" );
-
-  /*
-   *  RTEMS does not use an index of zero for object ids.
-   */
-
-  for ( i=1 ;
-        i<_Configuration_Table->RTEMS_api_configuration->maximum_periods ;
-        i++ ) {
-    the_usage = &Period_usage_Information[ i ];
-    if ( the_usage->count == 0 )
-      continue;
-
-    the_period =
-      (Rate_monotonic_Control *)_Rate_monotonic_Information.local_table[ i ];
-
-    if ( the_period->owner )
-      u32_name = *(unsigned32 *)the_period->owner->Object.name;
-    else
-      u32_name = rtems_build_name(' ', ' ', ' ', ' ');
-
-    name[ 0 ] = (u32_name >> 24) & 0xff;
-    name[ 1 ] = (u32_name >> 16) & 0xff;
-    name[ 2 ] = (u32_name >>  8) & 0xff;
-    name[ 3 ] = (u32_name >>  0) & 0xff;
-    name[ 4 ] = '\0';
-
-    printf(
-      "0x%08x  %4s   %6d   %3d       %d/%d/%5.2f    %d/%d/%3.2f\n",
-      the_usage->id,
-      name,
-      the_usage->count,
-      the_usage->missed_count,
-      the_usage->min_cpu_time,
-      the_usage->max_cpu_time,
-      (double) the_usage->total_cpu_time / (double) the_usage->count,
-      the_usage->min_wall_time,
-      the_usage->max_wall_time,
-      (double) the_usage->total_wall_time / (double) the_usage->count
-    );
-  }
-}
diff --git a/c/src/libmisc/rtmonuse/rtmonuse.h b/c/src/libmisc/rtmonuse/rtmonuse.h
deleted file mode 100644
index f0580a4f0b..0000000000
--- a/c/src/libmisc/rtmonuse/rtmonuse.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- *  $Id$
- */
-
-#ifndef __RATE_MONOTONIC_USAGE_h
-#define __RATE_MONOTONIC_USAGE_h
-
-void Period_usage_Initialize( void );
-
-void Period_usage_Reset( void );
-
-void Period_usage_Update( 
-  rtems_id     id
-);
-
-void Period_usage_Dump( void );
-
-#endif
diff --git a/c/src/libmisc/stackchk/Makefile.in b/c/src/libmisc/stackchk/Makefile.in
deleted file mode 100644
index 2708e825bc..0000000000
--- a/c/src/libmisc/stackchk/Makefile.in
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-LIB=${ARCH}/libstackchk-tmp.a
-
-# C source names, if any, go here -- minus the .c
-C_PIECES=check
-C_FILES=$(C_PIECES:%=%.c)
-C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
-
-H_FILES=internal.h
-INSTALLED_H_FILES=$(srcdir)/stackchk.h
-
-SRCS=$(C_FILES) $(H_FILES) $(INSTALLED_H_FILES)
-OBJS=$(C_O_FILES)
-
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/lib.cfg
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES  +=
-CPPFLAGS +=
-CFLAGS   +=
-
-LD_PATHS  +=
-LD_LIBS   +=
-LDFLAGS   +=
-
-#
-# Add your list of files to delete here.  The config files
-#  already know how to delete some stuff, so you may want
-#  to just run 'make clean' first to see what gets missed.
-#  'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
-
-${LIB}: ${SRCS} ${OBJS}
-	$(make-library)
-
-all:	${ARCH} $(SRCS) $(LIB)
-	 $(INSTALL) -m 444 ${INSTALLED_H_FILES} $(PROJECT_INCLUDE)
diff --git a/c/src/libmisc/stackchk/README b/c/src/libmisc/stackchk/README
deleted file mode 100644
index 0f6e2f2b10..0000000000
--- a/c/src/libmisc/stackchk/README
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-#  $Id$
-#
-
-Introduction
-============
-
-This directory contains a stack bounds checker.  It provides two
-primary features:
-
-   + check for stack overflow at each context switch
-   + provides an educated guess at each task's stack usage
-
-Enabling
-========
-
-Add the stack checker extension to the initial user extension set.
-If using confdefs.h to build your configuration table, this is
-as simple as adding -DSTACK_CHECK_ON to the gcc command line which
-compiles the file defining the configuration table.  In the RTEMS
-test suites and samples, this is always init.c
-
-Background
-==========
-
-The stack overflow check at context switch works by looking for
-a 16 byte pattern at the logical end of the stack to be corrupted.
-The "guesser" assumes that the entire stack was prefilled with a known
-pattern and assumes that the pattern is still in place if the memory
-has not been used as a stack.
-
-Both of these can be fooled by pushing large holes onto the stack
-and not writing to them... or (much more unlikely) writing the
-magic patterns into memory.
-
-This code has not been extensively tested.  It is provided as a tool
-for RTEMS users to catch the most common mistake in multitasking
-systems ... too little stack space.  Suggestions and comments are appreciated.
-
-NOTES:
-
-1.  Stack usage information is questionable on CPUs which push
-    large holes on stack.
-
-2.  The stack checker has a tendency to generate a fault when
-    trying to print the helpful diagnostic message.  If it comes
-    out, congratulations. If not, then the variable Stack_check_Blown_task
-    contains a pointer to the TCB of the offending task.  This
-    is usually enough to go on.
-
-FUTURE:
-
-1.  Determine how/if gcc will generate stack probe calls and support that.
-
-2.  Get accurate stack usage numbers on i960.. it pushes very large
-    holes on the stack.
diff --git a/c/src/libmisc/stackchk/check.c b/c/src/libmisc/stackchk/check.c
deleted file mode 100644
index 5bfb69bfb6..0000000000
--- a/c/src/libmisc/stackchk/check.c
+++ /dev/null
@@ -1,535 +0,0 @@
-/*
- *  Stack Overflow Check User Extension Set
- *
- *  NOTE:  This extension set automatically determines at
- *         initialization time whether the stack for this
- *         CPU grows up or down and installs the correct
- *         extension routines for that direction.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- *
- */
-
-#include <rtems.h>
-
-/*
- * HACK
- * the stack dump information should be printed by a "fatal" extension.
- * Fatal extensions only get called via rtems_fatal_error_occurred()
- * and not when rtems_shutdown_executive() is called.
- * I hope/think this is changing so that fatal extensions are renamed
- * to "shutdown" extensions.
- * When that happens, this #define should be deleted and all the code
- * it marks.
- */
-#define DONT_USE_FATAL_EXTENSION
-
-
-extern rtems_configuration_table BSP_Configuration;
-
-#include <assert.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include "stackchk.h"
-#include "internal.h"
-
-/*
- *  This variable contains the name of the task which "blew" the stack.
- *  It is NULL if the system is all right.
- */
-
-Thread_Control *Stack_check_Blown_task;
-
-/*
- *  The extension table for the stack checker.
- */
-
-rtems_extensions_table Stack_check_Extension_table = {
-  Stack_check_Create_extension,     /* rtems_task_create  */
-  0,                                /* rtems_task_start   */
-  0,                                /* rtems_task_restart */
-  0,                                /* rtems_task_delete  */
-  Stack_check_Switch_extension,     /* task_switch  */
-  Stack_check_Begin_extension,      /* task_begin   */
-  0,                                /* task_exitted */
-#ifdef DONT_USE_FATAL_EXTENSION
-  0,                                /* fatal        */
-#else
-  Stack_check_Fatal_extension,      /* fatal        */
-#endif
-};
-
-/*
- *  The "magic pattern" used to mark the end of the stack.
- */
-
-Stack_check_Control Stack_check_Pattern;
-
-/*
- *  Where the pattern goes in the stack area is dependent upon
- *  whether the stack grow to the high or low area of the memory.
- *
- */
-
-#if ( CPU_STACK_GROWS_UP == TRUE )
-
-#define Stack_check_Get_pattern_area( _the_stack ) \
-  ((Stack_check_Control *) ((char *)(_the_stack)->area + \
-       (_the_stack)->size - sizeof( Stack_check_Control ) ))
-
-#define Stack_check_Calculate_used( _low, _size, _high_water ) \
-    ((char *)(_high_water) - (char *)(_low))
-
-#define Stack_check_usable_stack_start(_the_stack) \
-    ((_the_stack)->area)
-
-#else
-
-#define Stack_check_Get_pattern_area( _the_stack ) \
-  ((Stack_check_Control *) ((char *)(_the_stack)->area + HEAP_OVERHEAD))
-
-#define Stack_check_Calculate_used( _low, _size, _high_water) \
-    ( ((char *)(_low) + (_size)) - (char *)(_high_water) )
-
-#define Stack_check_usable_stack_start(_the_stack) \
-    ((char *)(_the_stack)->area + sizeof(Stack_check_Control))
-
-#endif
-
-#define Stack_check_usable_stack_size(_the_stack) \
-    ((_the_stack)->size - sizeof(Stack_check_Control))
-
-
-/*
- * Do we have an interrupt stack?
- * XXX it would sure be nice if the interrupt stack were also
- *     stored in a "stack" structure!
- */
-
-
-Stack_Control stack_check_interrupt_stack;
-
-/*
- * Prototypes necessary for forward references
- */
-
-void Stack_check_Dump_usage( void );
-
-/*
- * Fill an entire stack area with BYTE_PATTERN.
- * This will be used by a Fatal extension to check for
- * amount of actual stack used
- */
-
-void
-stack_check_dope_stack(Stack_Control *stack)
-{
-    memset(stack->area, BYTE_PATTERN, stack->size);
-}
-
-
-/*PAGE
- *
- *  Stack_check_Initialize
- */
-
-unsigned32 stack_check_initialized = 0;
-
-void Stack_check_Initialize( void )
-{
-#if 0
-  rtems_status_code    status;
-  Objects_Id           id_ignored;
-#endif
-  unsigned32          *p;
-#if 0
-  unsigned32           i;
-  unsigned32           class_index;
-  Thread_Control      *the_thread;
-  Objects_Information *information;
-#endif
-
-  if (stack_check_initialized)
-      return;
-
-  /*
-   * Dope the pattern and fill areas
-   */
-
-  for ( p = Stack_check_Pattern.pattern;
-        p < &Stack_check_Pattern.pattern[PATTERN_SIZE_WORDS];
-        p += 4
-      )
-  {
-      p[0] = 0xFEEDF00D;          /* FEED FOOD to BAD DOG */
-      p[1] = 0x0BAD0D06;
-      p[2] = 0xDEADF00D;          /* DEAD FOOD GOOD DOG */
-      p[3] = 0x600D0D06;
-  };
-
-#if 0
-  status = rtems_extension_create(
-    rtems_build_name( 'S', 'T', 'C', 'K' ),
-    &Stack_check_Extension_table,
-    &id_ignored
-  );
-  assert ( status == RTEMS_SUCCESSFUL );
-#endif
-
-  Stack_check_Blown_task = 0;
-
-  /*
-   * If installed by a task, that task will not get setup properly
-   * since it missed out on the create hook.  This will cause a
-   * failure on first switch out of that task.
-   * So pretend here that we actually ran create and begin extensions.
-   */
-
-  /* XXX
-   *
-   *  Technically this has not been done for any task created before this
-   *  happened.  So just run through them and fix the situation.
-   */
-#if 0
-  if (_Thread_Executing)
-  {
-      Stack_check_Create_extension(_Thread_Executing, _Thread_Executing);
-  }
-#endif
-
-#if 0
-  for ( class_index = OBJECTS_CLASSES_FIRST ;
-        class_index <= OBJECTS_CLASSES_LAST ;
-        class_index++ ) {
-    information = _Objects_Information_table[ class_index ];
-    if ( information && information->is_thread ) {
-      for ( i=1 ; i <= information->maximum ; i++ ) {
-        the_thread = (Thread_Control *)information->local_table[ i ];
-        Stack_check_Create_extension( the_thread, the_thread );
-      }
-    }
-  }
-#endif
-
-  /*
-   * If appropriate, setup the interrupt stack for high water testing
-   * also.
-   */
-  if (_CPU_Interrupt_stack_low && _CPU_Interrupt_stack_high)
-  {
-      stack_check_interrupt_stack.area = _CPU_Interrupt_stack_low;
-      stack_check_interrupt_stack.size = (char *) _CPU_Interrupt_stack_high -
-                                              (char *) _CPU_Interrupt_stack_low;
-
-      stack_check_dope_stack(&stack_check_interrupt_stack);
-  }
-
-#ifdef DONT_USE_FATAL_EXTENSION
-#ifdef RTEMS_DEBUG
-    /*
-     * this would normally be called by a fatal extension
-     * handler, but we don't run fatal extensions unless
-     * we fatal error.
-     */
-  atexit(Stack_check_Dump_usage);
-#endif
-#endif
-
-  stack_check_initialized = 1;
-}
-
-/*PAGE
- *
- *  Stack_check_Create_extension
- */
-
-boolean Stack_check_Create_extension(
-  Thread_Control *running,
-  Thread_Control *the_thread
-)
-{
-    if (!stack_check_initialized)
-      Stack_check_Initialize();
-
-    if (the_thread /* XXX && (the_thread != _Thread_Executing) */ )
-        stack_check_dope_stack(&the_thread->Start.Initial_stack);
-
-    return TRUE;
-}
-
-/*PAGE
- *
- *  Stack_check_Begin_extension
- */
-
-void Stack_check_Begin_extension(
-  Thread_Control *the_thread
-)
-{
-  Stack_check_Control  *the_pattern;
-
-  if (!stack_check_initialized)
-    Stack_check_Initialize();
-
-  if ( the_thread->Object.id == 0 )        /* skip system tasks */
-    return;
-
-  the_pattern = Stack_check_Get_pattern_area(&the_thread->Start.Initial_stack);
-
-  *the_pattern = Stack_check_Pattern;
-}
-
-/*PAGE
- *
- *  Stack_check_report_blown_task
- *  Report a blown stack.  Needs to be a separate routine
- *  so that interrupt handlers can use this too.
- *
- *  Caller must have set the Stack_check_Blown_task.
- *
- *  NOTE: The system is in a questionable state... we may not get
- *        the following message out.
- */
-
-void Stack_check_report_blown_task(void)
-{
-    Stack_Control *stack;
-    Thread_Control *running;
-
-    running = Stack_check_Blown_task;
-    stack = &running->Start.Initial_stack;
-
-    fprintf(
-        stderr,
-        "BLOWN STACK!!! Offending task(%p): id=0x%08x; name=0x%08x",
-        running,
-        running->Object.id,
-        *(unsigned32 *)running->Object.name
-    );
-    fflush(stderr);
-
-    if (BSP_Configuration.User_multiprocessing_table)
-        fprintf(
-          stderr,
-          "; node=%d\n",
-          BSP_Configuration.User_multiprocessing_table->node
-       );
-    else
-        fprintf(stderr, "\n");
-    fflush(stderr);
-
-    fprintf(
-        stderr,
-        "  stack covers range 0x%08x - 0x%08x (%d bytes)\n",
-        (unsigned32) stack->area,
-        (unsigned32) stack->area + stack->size - 1,
-        (unsigned32) stack->size);
-    fflush(stderr);
-
-    fprintf(
-        stderr,
-        "  Damaged pattern begins at 0x%08x and is %d bytes long\n",
-        (unsigned32) Stack_check_Get_pattern_area(stack), PATTERN_SIZE_BYTES);
-    fflush(stderr);
-
-    rtems_fatal_error_occurred( (unsigned32) "STACK BLOWN" );
-}
-
-/*PAGE
- *
- *  Stack_check_Switch_extension
- */
-
-void Stack_check_Switch_extension(
-  Thread_Control *running,
-  Thread_Control *heir
-)
-{
-  if ( running->Object.id == 0 )        /* skip system tasks */
-    return;
-
-  if (0 != memcmp( (void *) Stack_check_Get_pattern_area( &running->Start.Initial_stack)->pattern,
-                  (void *) Stack_check_Pattern.pattern,
-                  PATTERN_SIZE_BYTES))
-  {
-      Stack_check_Blown_task = running;
-      Stack_check_report_blown_task();
-  }
-}
-
-void *Stack_check_find_high_water_mark(
-  const void *s,
-  size_t n
-)
-{
-  const unsigned32 *base, *ebase;
-  unsigned32 length;
-
-  base = s;
-  length = n/4;
-
-#if ( CPU_STACK_GROWS_UP == TRUE )
-  /*
-   * start at higher memory and find first word that does not
-   * match pattern
-   */
-
-  base += length - 1;
-  for (ebase = s; base > ebase; base--)
-      if (*base != U32_PATTERN)
-          return (void *) base;
-#else
-  /*
-   * start at lower memory and find first word that does not
-   * match pattern
-   */
-
-  base += PATTERN_SIZE_WORDS;
-  for (ebase = base + length; base < ebase; base++)
-      if (*base != U32_PATTERN)
-          return (void *) base;
-#endif
-
-  return (void *)0;
-}
-
-/*PAGE
- *
- *  Stack_check_Dump_threads_usage
- *  Try to print out how much stack was actually used by the task.
- *
- */
-
-void Stack_check_Dump_threads_usage(
-  Thread_Control *the_thread
-)
-{
-  unsigned32      size, used;
-  void           *low;
-  void           *high_water_mark;
-  Stack_Control  *stack;
-  unsigned32      u32_name;
-  char            name[5];
-
-
-  if ( !the_thread )
-    return;
-
-  /*
-   * XXX HACK to get to interrupt stack
-   */
-
-  if (the_thread == (Thread_Control *) -1)
-  {
-      if (stack_check_interrupt_stack.area)
-      {
-          stack = &stack_check_interrupt_stack;
-          the_thread = 0;
-      }
-      else
-          return;
-  }
-  else
-      stack = &the_thread->Start.Initial_stack;
-
-  low  = Stack_check_usable_stack_start(stack);
-  size = Stack_check_usable_stack_size(stack);
-
-  high_water_mark = Stack_check_find_high_water_mark(low, size);
-
-  if ( high_water_mark )
-    used = Stack_check_Calculate_used( low, size, high_water_mark );
-  else
-    used = 0;
-
-  if ( the_thread )
-    u32_name = *(unsigned32 *)the_thread->Object.name;
-  else
-    u32_name = rtems_build_name('I', 'N', 'T', 'R');
-
-  name[ 0 ] = (u32_name >> 24) & 0xff;
-  name[ 1 ] = (u32_name >> 16) & 0xff;
-  name[ 2 ] = (u32_name >>  8) & 0xff;
-  name[ 3 ] = (u32_name >>  0) & 0xff;
-  name[ 4 ] = '\0';
-
-  printf( "0x%08x  %4s  0x%08x  0x%08x   %8d   %8d\n",
-          the_thread ? the_thread->Object.id : ~0,
-          name,
-          (unsigned32) stack->area,
-          (unsigned32) stack->area + (unsigned32) stack->size - 1,
-          size,
-          used
-  );
-}
-
-/*PAGE
- *
- *  Stack_check_Fatal_extension
- */
-
-void Stack_check_Fatal_extension(
-    Internal_errors_Source  source,
-    boolean                 is_internal,
-    unsigned32              status
-)
-{
-#ifndef DONT_USE_FATAL_EXTENSION
-    if (status == 0)
-        Stack_check_Dump_usage();
-#endif
-}
-
-
-/*PAGE
- *
- *  Stack_check_Dump_usage
- */
-
-void Stack_check_Dump_usage( void )
-{
-  unsigned32           i;
-  unsigned32           class_index;
-  Thread_Control      *the_thread;
-  unsigned32           hit_running = 0;
-  Objects_Information *information;
-
-  if (stack_check_initialized == 0)
-      return;
-
-  printf("Stack usage by thread\n");
-  printf(
-    "    ID      NAME       LOW        HIGH     AVAILABLE      USED\n"
-  );
-
-  for ( class_index = OBJECTS_CLASSES_FIRST ; 
-        class_index <= OBJECTS_CLASSES_LAST ; 
-        class_index++ ) {
-    information = _Objects_Information_table[ class_index ];
-    if ( information && information->is_thread ) {
-      for ( i=1 ; i <= information->maximum ; i++ ) {
-        the_thread = (Thread_Control *)information->local_table[ i ];
-        Stack_check_Dump_threads_usage( the_thread );
-        if ( the_thread == _Thread_Executing )
-          hit_running = 1;
-      }
-    }
-  }
-
-  if ( !hit_running )
-    Stack_check_Dump_threads_usage( _Thread_Executing );
-
-  /* dump interrupt stack info if any */
-  Stack_check_Dump_threads_usage((Thread_Control *) -1);
-}
-
diff --git a/c/src/libmisc/stackchk/internal.h b/c/src/libmisc/stackchk/internal.h
deleted file mode 100644
index 96d0c3f10a..0000000000
--- a/c/src/libmisc/stackchk/internal.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/*  internal.h
- *
- *  This include file contains internal information
- *  for the RTEMS stack checker.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __INTERNAL_STACK_CHECK_h
-#define __INTERNAL_STACK_CHECK_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- *  This structure is used to fill in and compare the "end of stack"
- *  marker pattern.
- *  pattern area must be a multiple of 4 words.
- */
-
-#ifdef CPU_STACK_CHECK_SIZE
-#define PATTERN_SIZE_WORDS      (((CPU_STACK_CHECK_SIZE / 4) + 3) & ~0x3)
-#else
-#define PATTERN_SIZE_WORDS      4
-#endif
-
-#define PATTERN_SIZE_BYTES      (PATTERN_SIZE_WORDS * 4)
-
-typedef struct {
-   unsigned32  pattern[ PATTERN_SIZE_WORDS ];
-} Stack_check_Control;
-
-/*
- *  The pattern used to fill the entire stack.
- */
-
-#define BYTE_PATTERN 0xA5
-#define U32_PATTERN 0xA5A5A5A5
-
-/*
- *  Stack_check_Create_extension
- */
-
-boolean Stack_check_Create_extension(
-  Thread_Control *running,
-  Thread_Control *the_thread
-);
-
-/*
- *  Stack_check_Begin_extension
- */
-
-void Stack_check_Begin_extension(
-  Thread_Control *the_thread
-);
-
-/*
- *  Stack_check_Switch_extension
- */
-
-void Stack_check_Switch_extension(
-  Thread_Control *running,
-  Thread_Control *heir
-);
-
-/*
- *  Stack_check_Fatal_extension
- */
-
-void Stack_check_Fatal_extension(
-    Internal_errors_Source  source,
-    boolean                 is_internal,
-    unsigned32              status
-);
-
-/*
- *  Stack_check_Dump_usage
- */
-
-void Stack_check_Dump_usage( void );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/c/src/libmisc/stackchk/stackchk.h b/c/src/libmisc/stackchk/stackchk.h
deleted file mode 100644
index 1b40da5e0c..0000000000
--- a/c/src/libmisc/stackchk/stackchk.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*  stackchk.h
- *
- *  This include file contains information necessary to utilize
- *  and install the stack checker mechanism.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __STACK_CHECK_h
-#define __STACK_CHECK_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- *  Stack_check_Initialize
- */
-
-void Stack_check_Initialize( void );
-
-/*
- *  Stack_check_Dump_usage
- */
-
-void Stack_check_Dump_usage( void );
-
-/*
- *  Stack_check_Create_extension
- */
-
-boolean Stack_check_Create_extension(
-  Thread_Control *running,
-  Thread_Control *the_thread
-);
-
-/*
- *  Stack_check_Begin_extension
- */
-
-void Stack_check_Begin_extension(
-  Thread_Control *the_thread
-);
-
-/*
- *  Stack_check_Switch_extension
- */
-
-void Stack_check_Switch_extension(
-  Thread_Control *running,
-  Thread_Control *heir
-);
-
-/*
- *  Extension set definition
- */
-
-#define STACK_CHECKER_EXTENSION \
-{ \
-  Stack_check_Create_extension,        /* rtems_task_create  */ \
-  0,                                   /* rtems_task_start   */ \
-  0,                                   /* rtems_task_restart */ \
-  0,                                   /* rtems_task_delete  */ \
-  Stack_check_Switch_extension,        /* task_switch  */ \
-  Stack_check_Begin_extension,         /* task_begin   */ \
-  0,                                   /* task_exitted */ \
-  0 /* Stack_check_Fatal_extension */, /* fatal        */ \
-}
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/c/src/libmisc/wrapup/Makefile.in b/c/src/libmisc/wrapup/Makefile.in
deleted file mode 100644
index 6a78cf222a..0000000000
--- a/c/src/libmisc/wrapup/Makefile.in
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-LIB=$(ARCH)/libmisc.a
-
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/lib.cfg
-
-#  Using the wildcard on the Purify support makes sure it may not be there
-
-LIBS=../monitor/$(ARCH)/libmonitor-tmp.a \
-     ../error/$(ARCH)/liberror-tmp.a \
-     ../assoc/$(ARCH)/libassoc-tmp.a \
-     ../stackchk/$(ARCH)/libstackchk-tmp.a \
-     ../cpuuse/$(ARCH)/libcpuuse-tmp.a \
-     ../rtmonuse/$(ARCH)/librtmonuse-tmp.a \
-     $(wildcard ../purify/$(ARCH)/libpurify-tmp.a)
-RELS=
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
-
-$(LIB): ${LIBS} $(RELS)
-	$(RM) -r $(ARCH)
-	$(MKDIR) $(ARCH)
-	cd $(ARCH); for lib in $(LIBS:%=../%); do \
-                         $(AR) -xv $$lib; \
-                    done
-	$(RM) $@
-	$(AR) ruv $@ $(ARCH)/*
-	$(MKLIB) $@
-
-all:	${ARCH} $(SRCS) $(LIB)
-	$(INSTALL_VARIANT) -m 644 $(LIB) ${PROJECT_RELEASE}/lib
-
diff --git a/c/src/libnetworking/CHANGELOG b/c/src/libnetworking/CHANGELOG
deleted file mode 100644
index dd504eb885..0000000000
--- a/c/src/libnetworking/CHANGELOG
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-#  $Id$
-#
-
-19-AUG-1998 snapshot
-	- Pulled BOOTP initialization out of rtems_glue.  Applications which
-	  don't used BOOTP are now about 5k smaller.
-	- Loopback interface is not installed by default, rather it is
-	  attached like any other interface.  Saves about 0.5 kbytes.
-	- Add rtems_bsdnet_show_if_stats();
-	- Moved test programs from below freebsd directory.
-
-18-AUG-1998 snapshot
-	- Removed some include files that were already part of RTEMS.
-	- Cleaned up machine/types.h to prepare for inclusion in RTEMS source.
-	- Added syslog library routines -- much simpler than KA9Q version.
-	  Sockets can be shared among tasks (as long as the send is
-	  protected by a mutex) so there's no need for a Syslog Daemon.
-
-16-AUG-1998 snapshot
-	- Table-driven configuration (networkconfig.h).
-	- Cleaned up rtems_bsdnet.h.
-	- BOOTP now retries properly -- Note to Joel:
-		The dichotomy between RTEMS and UNIX error codes is
-		a real pain!
-
-14-AUG-1998 snapshot
-	- Added dummy getprotobyname() and getprotobynum() functions.
-	- Added socket ioctl.
-	- Added application-level entry to manipulate routing tables.
-	- Added non-BOOTP network initialization.
-
-13-AUG-1998 snapshot
-	- Changed some BOOTP addresses from sockaddr_in to inaddr;
-	- Get DNS information from BOOTP reply.
-	- Got DNS lookups working.
-	  Bloatware comes to RTEMS -- invoking gethostbyname() drags in
-	  and extra 40 kbytes of code!
-	- Added hostname lookup program.
-
-12-AUG-1998 snapshot
-	- Added startup delay to network initialization.
-	- More statistic-printing routines.
-	- Added TFTP driver and test program
-	- Modified TFTP test program to use networkconfig.h.
-	- Removed unused include files.
-	- Added from ftp://ftp.ca.FreeBSD.ORG/pub/FreeBSD/FreeBSD-current/src/lib/libc/net.
-
-11-AUG-1998 snapshot.
-	- Added getpeername()
-	- Added M68k versions of IP checksum code
-	- Added TCP timing program to snapshot.
-
-02-AUG-1998 snapshot.
diff --git a/c/src/libnetworking/Makefile.in b/c/src/libnetworking/Makefile.in
deleted file mode 100644
index 7fce70b9aa..0000000000
--- a/c/src/libnetworking/Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/directory.cfg
-
-SUB_DIRS=kern lib libc net netinet nfs rtems wrapup
diff --git a/c/src/libnetworking/README b/c/src/libnetworking/README
deleted file mode 100644
index d0c22ec688..0000000000
--- a/c/src/libnetworking/README
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-#  $Id$
-#
-
-This is a snapshot of my attempt to fit the FreeBSD networking code into
-RTEMS.  Things seem to be working!
-
-Things that need to be done:
-	1) More documentation!
-	2) Figure out what's still not working :-)
-	3) Rationalize the include files.  Right now I have a special
-	   hack in the Makefile to ensure that I pick up the FreeBSD versions
-	   of the include files that are duplicated between RTEMS
-	   and FreeBSD.
-	   The network device driver source should move to the BSP source tree.
-	4) Have a look at all the FIXME comments.
-	5) Go through and make sure that all the source files are
-	   free of undesired copyright restrictions.
diff --git a/c/src/libnetworking/arpa/ftp.h b/c/src/libnetworking/arpa/ftp.h
deleted file mode 100644
index 584d290bc9..0000000000
--- a/c/src/libnetworking/arpa/ftp.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright (c) 1983, 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)ftp.h	8.1 (Berkeley) 6/2/93
- *
- *  $Id$
- */
-
-#ifndef _ARPA_FTP_H_
-#define	_ARPA_FTP_H_
-
-/* Definitions for FTP; see RFC-765. */
-
-/*
- * Reply codes.
- */
-#define PRELIM		1	/* positive preliminary */
-#define COMPLETE	2	/* positive completion */
-#define CONTINUE	3	/* positive intermediate */
-#define TRANSIENT	4	/* transient negative completion */
-#define ERROR		5	/* permanent negative completion */
-
-/*
- * Type codes
- */
-#define	TYPE_A		1	/* ASCII */
-#define	TYPE_E		2	/* EBCDIC */
-#define	TYPE_I		3	/* image */
-#define	TYPE_L		4	/* local byte size */
-
-#ifdef FTP_NAMES
-char *typenames[] =  {"0", "ASCII", "EBCDIC", "Image", "Local" };
-#endif
-
-/*
- * Form codes
- */
-#define	FORM_N		1	/* non-print */
-#define	FORM_T		2	/* telnet format effectors */
-#define	FORM_C		3	/* carriage control (ASA) */
-#ifdef FTP_NAMES
-char *formnames[] =  {"0", "Nonprint", "Telnet", "Carriage-control" };
-#endif
-
-/*
- * Structure codes
- */
-#define	STRU_F		1	/* file (no record structure) */
-#define	STRU_R		2	/* record structure */
-#define	STRU_P		3	/* page structure */
-#ifdef FTP_NAMES
-char *strunames[] =  {"0", "File", "Record", "Page" };
-#endif
-
-/*
- * Mode types
- */
-#define	MODE_S		1	/* stream */
-#define	MODE_B		2	/* block */
-#define	MODE_C		3	/* compressed */
-#ifdef FTP_NAMES
-char *modenames[] =  {"0", "Stream", "Block", "Compressed" };
-#endif
-
-/*
- * Record Tokens
- */
-#define	REC_ESC		'\377'	/* Record-mode Escape */
-#define	REC_EOR		'\001'	/* Record-mode End-of-Record */
-#define REC_EOF		'\002'	/* Record-mode End-of-File */
-
-/*
- * Block Header
- */
-#define	BLK_EOR		0x80	/* Block is End-of-Record */
-#define	BLK_EOF		0x40	/* Block is End-of-File */
-#define BLK_ERRORS	0x20	/* Block is suspected of containing errors */
-#define	BLK_RESTART	0x10	/* Block is Restart Marker */
-
-#define	BLK_BYTECOUNT	2	/* Bytes in this block */
-
-#endif /* !_FTP_H_ */
diff --git a/c/src/libnetworking/arpa/inet.h b/c/src/libnetworking/arpa/inet.h
deleted file mode 100644
index ad5332e7ab..0000000000
--- a/c/src/libnetworking/arpa/inet.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * -
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-/*
- *	@(#)inet.h	8.1 (Berkeley) 6/2/93
- *	From: Id: inet.h,v 8.5 1997/01/29 08:48:09 vixie Exp $
- *	$Id$
- */
-
-#ifndef _ARPA_INET_H_
-#define	_ARPA_INET_H_
-
-/* External definitions for functions in inet(3), addr2ascii(3) */
-
-#include <sys/types.h>
-#include <sys/cdefs.h>
-
-struct in_addr;
-
-#if 0	/* RTEMS -- Why rename these? */
-/* XXX all new diversions!! argh!! */
-#define	inet_addr	__inet_addr
-#define	inet_aton	__inet_aton
-#define	inet_lnaof	__inet_lnaof
-#define	inet_makeaddr	__inet_makeaddr
-#define	inet_neta	__inet_neta
-#define	inet_netof	__inet_netof
-#define	inet_network	__inet_network
-#define	inet_net_ntop	__inet_net_ntop
-#define	inet_net_pton	__inet_net_pton
-#define	inet_ntoa	__inet_ntoa
-#define	inet_pton	__inet_pton
-#define	inet_ntop	__inet_ntop
-#define	inet_nsap_addr	__inet_nsap_addr
-#define	inet_nsap_ntoa	__inet_nsap_ntoa
-#endif
-
-__BEGIN_DECLS
-int		 ascii2addr __P((int, const char *, void *));
-char		*addr2ascii __P((int, const void *, int, char *));
-unsigned long	 inet_addr __P((const char *));
-int		 inet_aton __P((const char *, struct in_addr *));
-unsigned long	 inet_lnaof __P((struct in_addr));
-struct in_addr	 inet_makeaddr __P((u_long , u_long));
-char *		 inet_neta __P((u_long, char *, size_t));
-unsigned long	 inet_netof __P((struct in_addr));
-unsigned long	 inet_network __P((const char *));
-char		*inet_net_ntop __P((int, const void *, int, char *, size_t));
-int		 inet_net_pton __P((int, const char *, void *, size_t));
-char		*inet_ntoa __P((struct in_addr));
-int              inet_pton __P((int, const char *, void *));
-const char	*inet_ntop __P((int, const void *, char *, size_t));
-u_int		 inet_nsap_addr __P((const char *, u_char *, int));
-char		*inet_nsap_ntoa __P((int, const u_char *, char *));
-__END_DECLS
-
-#endif /* !_INET_H_ */
diff --git a/c/src/libnetworking/arpa/nameser.h b/c/src/libnetworking/arpa/nameser.h
deleted file mode 100644
index 634dece37b..0000000000
--- a/c/src/libnetworking/arpa/nameser.h
+++ /dev/null
@@ -1,448 +0,0 @@
-/*
- * Copyright (c) 1983, 1989, 1993
- *    The Regents of the University of California.  All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- * 	This product includes software developed by the University of
- * 	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-/*
- *	From: Id: nameser.h,v 8.16 1998/02/06 00:35:58 halley Exp
- *	$Id$
- */
-
-#ifndef _ARPA_NAMESER_H_
-#define _ARPA_NAMESER_H_
-
-#define BIND_4_COMPAT
-
-#include <sys/types.h>
-#include <sys/cdefs.h>
-
-/*
- * revision information.  this is the release date in YYYYMMDD format.
- * it can change every day so the right thing to do with it is use it
- * in preprocessor commands such as "#if (__NAMESER > 19931104)".  do not
- * compare for equality; rather, use it to determine whether your libnameser.a
- * is new enough to contain a certain feature.
- */
-
-/* XXXRTH I made this bigger than __BIND in 4.9.5 T6B */
-#define __NAMESER	19961001	/* New interface version stamp. */
-
-/*
- * Define constants based on RFC 883, RFC 1034, RFC 1035
- */
-#define NS_PACKETSZ	512	/* maximum packet size */
-#define NS_MAXDNAME	1025	/* maximum domain name */
-#define NS_MAXCDNAME	255	/* maximum compressed domain name */
-#define NS_MAXLABEL	63	/* maximum length of domain label */
-#define NS_HFIXEDSZ	12	/* #/bytes of fixed data in header */
-#define NS_QFIXEDSZ	4	/* #/bytes of fixed data in query */
-#define NS_RRFIXEDSZ	10	/* #/bytes of fixed data in r record */
-#define NS_INT32SZ	4	/* #/bytes of data in a u_int32_t */
-#define NS_INT16SZ	2	/* #/bytes of data in a u_int16_t */
-#define NS_INT8SZ	1	/* #/bytes of data in a u_int8_t */
-#define NS_INADDRSZ	4	/* IPv4 T_A */
-#define NS_IN6ADDRSZ	16	/* IPv6 T_AAAA */
-#define NS_CMPRSFLGS	0xc0	/* Flag bits indicating name compression. */
-#define NS_DEFAULTPORT	53	/* For both TCP and UDP. */
-
-/*
- * These can be expanded with synonyms, just keep ns_parse.c:ns_parserecord()
- * in synch with it.
- */
-typedef enum __ns_sect {
-	ns_s_qd = 0,		/* Query: Question. */
-	ns_s_zn = 0,		/* Update: Zone. */
-	ns_s_an = 1,		/* Query: Answer. */
-	ns_s_pr = 1,		/* Update: Prerequisites. */
-	ns_s_ns = 2,		/* Query: Name servers. */
-	ns_s_ud = 2,		/* Update: Update. */
-	ns_s_ar = 3,		/* Query|Update: Additional records. */
-	ns_s_max = 4
-} ns_sect;
-
-/*
- * This is a message handle.  It is caller allocated and has no dynamic data.
- * This structure is intended to be opaque to all but ns_parse.c, thus the
- * leading _'s on the member names.  Use the accessor functions, not the _'s.
- */
-typedef struct __ns_msg {
-	const u_char	*_msg, *_eom;
-	u_int16_t	_id, _flags, _counts[ns_s_max];
-	const u_char	*_sections[ns_s_max];
-	ns_sect		_sect;
-	int		_rrnum;
-	const u_char	*_ptr;
-} ns_msg;
-
-/* Private data structure - do not use from outside library. */
-struct _ns_flagdata {  int mask, shift;  };
-extern struct _ns_flagdata _ns_flagdata[];
-
-/* Accessor macros - this is part of the public interface. */
-#define ns_msg_getflag(handle, flag) ( \
-			((handle)._flags & _ns_flagdata[flag].mask) \
-			 >> _ns_flagdata[flag].shift \
-			)
-#define ns_msg_id(handle) ((handle)._id + 0)
-#define ns_msg_base(handle) ((handle)._msg + 0)
-#define ns_msg_end(handle) ((handle)._eom + 0)
-#define ns_msg_size(handle) ((handle)._eom - (handle)._msg)
-#define ns_msg_count(handle, section) ((handle)._counts[section] + 0)
-
-/*
- * This is a parsed record.  It is caller allocated and has no dynamic data.
- */
-typedef	struct __ns_rr {
-	char		name[NS_MAXDNAME];	/* XXX need to malloc */
-	u_int16_t	type;
-	u_int16_t	class;
-	u_int32_t	ttl;
-	u_int16_t	rdlength;
-	const u_char	*rdata;
-} ns_rr;
-
-/* Accessor macros - this is part of the public interface. */
-#define ns_rr_name(rr)	(((rr).name[0] != '\0') ? (rr).name : ".")
-#define ns_rr_type(rr)	((rr).type + 0)
-#define ns_rr_class(rr)	((rr).class + 0)
-#define ns_rr_ttl(rr)	((rr).ttl + 0)
-#define ns_rr_rdlen(rr)	((rr).rdlength + 0)
-#define ns_rr_rdata(rr)	((rr).rdata + 0)
-
-/*
- * These don't have to be in the same order as in the packet flags word,
- * and they can even overlap in some cases, but they will need to be kept
- * in synch with ns_parse.c:ns_flagdata[].
- */
-typedef enum __ns_flag {
-	ns_f_qr,		/* Question/Response. */
-	ns_f_opcode,		/* Operation code. */
-	ns_f_aa,		/* Authoritative Answer. */
-	ns_f_tc,		/* Truncation occurred. */
-	ns_f_rd,		/* Recursion Desired. */
-	ns_f_ra,		/* Recursion Available. */
-	ns_f_z,			/* MBZ. */
-	ns_f_ad,		/* Authentic Data (DNSSEC). */
-	ns_f_cd,		/* Checking Disabled (DNSSEC). */
-	ns_f_rcode,		/* Response code. */
-	ns_f_max
-} ns_flag;
-
-/*
- * Currently defined opcodes.
- */
-typedef enum __ns_opcode {
-	ns_o_query = 0,		/* Standard query. */
-	ns_o_iquery = 1,	/* Inverse query (deprecated/unsupported). */
-	ns_o_status = 2,	/* Name server status query (unsupported). */
-				/* Opcode 3 is undefined/reserved. */
-	ns_o_notify = 4,	/* Zone change notification. */
-	ns_o_update = 5,	/* Zone update message. */
-	ns_o_max = 6
-} ns_opcode;
-
-/*
- * Currently defined response codes.
- */
-typedef	enum __ns_rcode {
-	ns_r_noerror = 0,	/* No error occurred. */
-	ns_r_formerr = 1,	/* Format error. */
-	ns_r_servfail = 2,	/* Server failure. */
-	ns_r_nxdomain = 3,	/* Name error. */
-	ns_r_notimpl = 4,	/* Unimplemented. */
-	ns_r_refused = 5,	/* Operation refused. */
-	/* these are for BIND_UPDATE */
-	ns_r_yxdomain = 6,	/* Name exists */
-	ns_r_yxrrset = 7,	/* RRset exists */
-	ns_r_nxrrset = 8,	/* RRset does not exist */
-	ns_r_notauth = 9,	/* Not authoritative for zone */
-	ns_r_notzone = 10,	/* Zone of record different from zone section */
-	ns_r_max = 11
-} ns_rcode;
-
-/* BIND_UPDATE */
-typedef enum __ns_update_operation {
-	ns_uop_delete = 0,
-	ns_uop_add = 1,
-	ns_uop_max = 2
-} ns_update_operation;
-
-/*
- * This RR-like structure is particular to UPDATE.
- */
-struct ns_updrec {
-	struct ns_updrec *r_prev;	/* prev record */
-	struct ns_updrec *r_next;	/* next record */
-	u_int8_t	r_section;	/* ZONE/PREREQUISITE/UPDATE */
-	char *		r_dname;	/* owner of the RR */
-	u_int16_t	r_class;	/* class number */
-	u_int16_t	r_type;		/* type number */
-	u_int32_t	r_ttl;		/* time to live */
-	u_char *	r_data;		/* rdata fields as text string */
-	u_int16_t	r_size;		/* size of r_data field */
-	int		r_opcode;	/* type of operation */
-	/* following fields for private use by the resolver/server routines */
-	struct ns_updrec *r_grpnext;	/* next record when grouped */
-	struct databuf *r_dp;		/* databuf to process */
-	struct databuf *r_deldp;	/* databuf's deleted/overwritten */
-	u_int16_t	r_zone;		/* zone number on server */
-};
-typedef struct ns_updrec ns_updrec;
-
-/*
- * Currently defined type values for resources and queries.
- */
-typedef enum __ns_type {
-	ns_t_a = 1,		/* Host address. */
-	ns_t_ns = 2,		/* Authoritative server. */
-	ns_t_md = 3,		/* Mail destination. */
-	ns_t_mf = 4,		/* Mail forwarder. */
-	ns_t_cname = 5,		/* Canonical name. */
-	ns_t_soa = 6,		/* Start of authority zone. */
-	ns_t_mb = 7,		/* Mailbox domain name. */
-	ns_t_mg = 8,		/* Mail group member. */
-	ns_t_mr = 9,		/* Mail rename name. */
-	ns_t_null = 10,		/* Null resource record. */
-	ns_t_wks = 11,		/* Well known service. */
-	ns_t_ptr = 12,		/* Domain name pointer. */
-	ns_t_hinfo = 13,	/* Host information. */
-	ns_t_minfo = 14,	/* Mailbox information. */
-	ns_t_mx = 15,		/* Mail routing information. */
-	ns_t_txt = 16,		/* Text strings. */
-	ns_t_rp = 17,		/* Responsible person. */
-	ns_t_afsdb = 18,	/* AFS cell database. */
-	ns_t_x25 = 19,		/* X_25 calling address. */
-	ns_t_isdn = 20,		/* ISDN calling address. */
-	ns_t_rt = 21,		/* Router. */
-	ns_t_nsap = 22,		/* NSAP address. */
-	ns_t_nsap_ptr = 23,	/* Reverse NSAP lookup (deprecated). */
-	ns_t_sig = 24,		/* Security signature. */
-	ns_t_key = 25,		/* Security key. */
-	ns_t_px = 26,		/* X.400 mail mapping. */
-	ns_t_gpos = 27,		/* Geographical position (withdrawn). */
-	ns_t_aaaa = 28,		/* Ip6 Address. */
-	ns_t_loc = 29,		/* Location Information. */
-	ns_t_nxt = 30,		/* Next domain (security). */
-	ns_t_eid = 31,		/* Endpoint identifier. */
-	ns_t_nimloc = 32,	/* Nimrod Locator. */
-	ns_t_srv = 33,		/* Server Selection. */
-	ns_t_atma = 34,		/* ATM Address */
-	ns_t_naptr = 35,	/* Naming Authority PoinTeR */
-	/* Query type values which do not appear in resource records. */
-	ns_t_ixfr = 251,	/* Incremental zone transfer. */
-	ns_t_axfr = 252,	/* Transfer zone of authority. */
-	ns_t_mailb = 253,	/* Transfer mailbox records. */
-	ns_t_maila = 254,	/* Transfer mail agent records. */
-	ns_t_any = 255,		/* Wildcard match. */
-	ns_t_max = 65536
-} ns_type;
-
-/*
- * Values for class field
- */
-typedef enum __ns_class {
-	ns_c_in = 1,		/* Internet. */
-				/* Class 2 unallocated/unsupported. */
-	ns_c_chaos = 3,		/* MIT Chaos-net. */
-	ns_c_hs = 4,		/* MIT Hesiod. */
-	/* Query class values which do not appear in resource records */
-	ns_c_none = 254,	/* for prereq. sections in update requests */
-	ns_c_any = 255,		/* Wildcard match. */
-	ns_c_max = 65536
-} ns_class;
-
-/*
- * Flags field of the KEY RR rdata
- */
-#define	NS_KEY_TYPEMASK		0xC000	/* Mask for "type" bits */
-#define	NS_KEY_TYPE_AUTH_CONF	0x0000	/* Key usable for both */
-#define	NS_KEY_TYPE_CONF_ONLY	0x8000	/* Key usable for confidentiality */
-#define	NS_KEY_TYPE_AUTH_ONLY	0x4000	/* Key usable for authentication */
-#define	NS_KEY_TYPE_NO_KEY	0xC000	/* No key usable for either; no key */
-/* The type bits can also be interpreted independently, as single bits: */
-#define	NS_KEY_NO_AUTH		0x8000	/* Key unusable for authentication */
-#define	NS_KEY_NO_CONF		0x4000	/* Key unusable for confidentiality */
-#define	NS_KEY_EXPERIMENTAL	0x2000	/* Security is *mandatory* if bit=0 */
-#define	NS_KEY_RESERVED3	0x1000  /* reserved - must be zero */
-#define	NS_KEY_RESERVED4	0x0800  /* reserved - must be zero */
-#define	NS_KEY_USERACCOUNT	0x0400	/* key is assoc. with a user acct */
-#define	NS_KEY_ENTITY		0x0200	/* key is assoc. with entity eg host */
-#define	NS_KEY_ZONEKEY		0x0100	/* key is zone key */
-#define	NS_KEY_IPSEC		0x0080  /* key is for IPSEC (host or user)*/
-#define	NS_KEY_EMAIL		0x0040  /* key is for email (MIME security) */
-#define	NS_KEY_RESERVED10	0x0020  /* reserved - must be zero */
-#define	NS_KEY_RESERVED11	0x0010  /* reserved - must be zero */
-#define	NS_KEY_SIGNATORYMASK	0x000F	/* key can sign RR's of same name */
-
-#define	NS_KEY_RESERVED_BITMASK ( NS_KEY_RESERVED3 | \
-				  NS_KEY_RESERVED4 | \
-				  NS_KEY_RESERVED10 | \
-				  NS_KEY_RESERVED11 )
-
-/* The Algorithm field of the KEY and SIG RR's is an integer, {1..254} */
-#define	NS_ALG_MD5RSA		1	/* MD5 with RSA */
-#define	NS_ALG_EXPIRE_ONLY	253	/* No alg, no security */
-#define	NS_ALG_PRIVATE_OID	254	/* Key begins with OID giving alg */
-
-/* Signatures */
-#define	NS_MD5RSA_MIN_BITS	 512	/* Size of a mod or exp in bits */
-#define	NS_MD5RSA_MAX_BITS	2552
-	/* Total of binary mod and exp */
-#define	NS_MD5RSA_MAX_BYTES	((NS_MD5RSA_MAX_BITS+7/8)*2+3)
-	/* Max length of text sig block */
-#define	NS_MD5RSA_MAX_BASE64	(((NS_MD5RSA_MAX_BYTES+2)/3)*4)
-
-/* Offsets into SIG record rdata to find various values */
-#define	NS_SIG_TYPE	0	/* Type flags */
-#define	NS_SIG_ALG	2	/* Algorithm */
-#define	NS_SIG_LABELS	3	/* How many labels in name */
-#define	NS_SIG_OTTL	4	/* Original TTL */
-#define	NS_SIG_EXPIR	8	/* Expiration time */
-#define	NS_SIG_SIGNED	12	/* Signature time */
-#define	NS_SIG_FOOT	16	/* Key footprint */
-#define	NS_SIG_SIGNER	18	/* Domain name of who signed it */
-
-/* How RR types are represented as bit-flags in NXT records */
-#define	NS_NXT_BITS 8
-#define	NS_NXT_BIT_SET(  n,p) (p[(n)/NS_NXT_BITS] |=  (0x80>>((n)%NS_NXT_BITS)))
-#define	NS_NXT_BIT_CLEAR(n,p) (p[(n)/NS_NXT_BITS] &= ~(0x80>>((n)%NS_NXT_BITS)))
-#define	NS_NXT_BIT_ISSET(n,p) (p[(n)/NS_NXT_BITS] &   (0x80>>((n)%NS_NXT_BITS)))
-
-
-/*
- * Inline versions of get/put short/long.  Pointer is advanced.
- */
-#define NS_GET16(s, cp) { \
-	register u_char *t_cp = (u_char *)(cp); \
-	(s) = ((u_int16_t)t_cp[0] << 8) \
-	    | ((u_int16_t)t_cp[1]) \
-	    ; \
-	(cp) += NS_INT16SZ; \
-}
-
-#define NS_GET32(l, cp) { \
-	register u_char *t_cp = (u_char *)(cp); \
-	(l) = ((u_int32_t)t_cp[0] << 24) \
-	    | ((u_int32_t)t_cp[1] << 16) \
-	    | ((u_int32_t)t_cp[2] << 8) \
-	    | ((u_int32_t)t_cp[3]) \
-	    ; \
-	(cp) += NS_INT32SZ; \
-}
-
-#define NS_PUT16(s, cp) { \
-	register u_int16_t t_s = (u_int16_t)(s); \
-	register u_char *t_cp = (u_char *)(cp); \
-	*t_cp++ = t_s >> 8; \
-	*t_cp   = t_s; \
-	(cp) += NS_INT16SZ; \
-}
-
-#define NS_PUT32(l, cp) { \
-	register u_int32_t t_l = (u_int32_t)(l); \
-	register u_char *t_cp = (u_char *)(cp); \
-	*t_cp++ = t_l >> 24; \
-	*t_cp++ = t_l >> 16; \
-	*t_cp++ = t_l >> 8; \
-	*t_cp   = t_l; \
-	(cp) += NS_INT32SZ; \
-}
-
-/*
- * ANSI C identifier hiding.
- */
-#define ns_get16		__ns_get16
-#define ns_get32		__ns_get32
-#define ns_put16		__ns_put16
-#define ns_put32		__ns_put32
-#define ns_initparse		__ns_initparse
-#define ns_parserr		__ns_parserr
-#define	ns_sprintrr		__ns_sprintrr
-#define	ns_sprintrrf		__ns_sprintrrf
-#define	ns_format_ttl		__ns_format_ttl
-#define	ns_parse_ttl		__ns_parse_ttl
-#define	ns_name_ntop		__ns_name_ntop
-#define	ns_name_pton		__ns_name_pton
-#define	ns_name_unpack		__ns_name_unpack
-#define	ns_name_pack		__ns_name_pack
-#define	ns_name_compress	__ns_name_compress
-#define	ns_name_uncompress	__ns_name_uncompress
-
-__BEGIN_DECLS
-u_int		ns_get16 __P((const u_char *));
-u_long		ns_get32 __P((const u_char *));
-void		ns_put16 __P((u_int, u_char *));
-void		ns_put32 __P((u_long, u_char *));
-int		ns_initparse __P((const u_char *, int, ns_msg *));
-int		ns_parserr __P((ns_msg *, ns_sect, int, ns_rr *));
-int		ns_sprintrr __P((const ns_msg *, const ns_rr *,
-				 const char *, const char *, char *, size_t));
-int		ns_sprintrrf __P((const u_char *, size_t, const char *,
-				  ns_class, ns_type, u_long, const u_char *,
-				  size_t, const char *, const char *,
-				  char *, size_t));
-int		ns_format_ttl __P((u_long, char *, size_t));
-int		ns_parse_ttl __P((const char *, u_long *));
-int		ns_name_ntop __P((const u_char *, char *, size_t));
-int		ns_name_pton __P((const char *, u_char *, size_t));
-int		ns_name_unpack __P((const u_char *, const u_char *,
-				    const u_char *, u_char *, size_t));
-int		ns_name_pack __P((const u_char *, u_char *, int,
-				  const u_char **, const u_char **));
-int		ns_name_uncompress __P((const u_char *, const u_char *,
-					const u_char *, char *, size_t));
-int		ns_name_compress __P((const char *, u_char *, size_t,
-				      const u_char **, const u_char **));
-int		ns_name_skip __P((const u_char **, const u_char *));
-__END_DECLS
-
-#ifdef BIND_4_COMPAT
-#include <arpa/nameser_compat.h>
-#endif
-
-#endif /* !_ARPA_NAMESER_H_ */
diff --git a/c/src/libnetworking/arpa/nameser_compat.h b/c/src/libnetworking/arpa/nameser_compat.h
deleted file mode 100644
index 2ab5b47386..0000000000
--- a/c/src/libnetworking/arpa/nameser_compat.h
+++ /dev/null
@@ -1,194 +0,0 @@
-/* Copyright (c) 1983, 1989
- *    The Regents of the University of California.  All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- * 	This product includes software developed by the University of
- * 	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- *      from nameser.h	8.1 (Berkeley) 6/2/93
- *	From: Id: nameser_compat.h,v 8.9 1998/03/20 23:25:10 halley Exp
- *	$Id$
- */
-
-#ifndef _ARPA_NAMESER_COMPAT_
-#define	_ARPA_NAMESER_COMPAT_
-
-#define	__BIND		19950621	/* (DEAD) interface version stamp. */
-
-#include <machine/endian.h>
-
-#if !defined(BYTE_ORDER) || \
-    (BYTE_ORDER != BIG_ENDIAN && BYTE_ORDER != LITTLE_ENDIAN && \
-    BYTE_ORDER != PDP_ENDIAN)
-	/* you must determine what the correct bit order is for
-	 * your compiler - the next line is an intentional error
-	 * which will force your compiles to bomb until you fix
-	 * the above macros.
-	 */
-  error "Undefined or invalid BYTE_ORDER";
-#endif
-
-/*
- * Structure for query header.  The order of the fields is machine- and
- * compiler-dependent, depending on the byte/bit order and the layout
- * of bit fields.  We use bit fields only in int variables, as this
- * is all ANSI requires.  This requires a somewhat confusing rearrangement.
- */
-
-typedef struct {
-	unsigned	id :16;		/* query identification number */
-#if BYTE_ORDER == BIG_ENDIAN
-			/* fields in third byte */
-	unsigned	qr: 1;		/* response flag */
-	unsigned	opcode: 4;	/* purpose of message */
-	unsigned	aa: 1;		/* authoritive answer */
-	unsigned	tc: 1;		/* truncated message */
-	unsigned	rd: 1;		/* recursion desired */
-			/* fields in fourth byte */
-	unsigned	ra: 1;		/* recursion available */
-	unsigned	unused :1;	/* unused bits (MBZ as of 4.9.3a3) */
-	unsigned	ad: 1;		/* authentic data from named */
-	unsigned	cd: 1;		/* checking disabled by resolver */
-	unsigned	rcode :4;	/* response code */
-#endif
-#if BYTE_ORDER == LITTLE_ENDIAN || BYTE_ORDER == PDP_ENDIAN
-			/* fields in third byte */
-	unsigned	rd :1;		/* recursion desired */
-	unsigned	tc :1;		/* truncated message */
-	unsigned	aa :1;		/* authoritive answer */
-	unsigned	opcode :4;	/* purpose of message */
-	unsigned	qr :1;		/* response flag */
-			/* fields in fourth byte */
-	unsigned	rcode :4;	/* response code */
-	unsigned	cd: 1;		/* checking disabled by resolver */
-	unsigned	ad: 1;		/* authentic data from named */
-	unsigned	unused :1;	/* unused bits (MBZ as of 4.9.3a3) */
-	unsigned	ra :1;		/* recursion available */
-#endif
-			/* remaining bytes */
-	unsigned	qdcount :16;	/* number of question entries */
-	unsigned	ancount :16;	/* number of answer entries */
-	unsigned	nscount :16;	/* number of authority entries */
-	unsigned	arcount :16;	/* number of resource entries */
-} HEADER;
-
-#define PACKETSZ	NS_PACKETSZ
-#define MAXDNAME	NS_MAXDNAME
-#define MAXCDNAME	NS_MAXCDNAME
-#define MAXLABEL	NS_MAXLABEL
-#define	HFIXEDSZ	NS_HFIXEDSZ
-#define QFIXEDSZ	NS_QFIXEDSZ
-#define RRFIXEDSZ	NS_RRFIXEDSZ
-#define	INT32SZ		NS_INT32SZ
-#define	INT16SZ		NS_INT16SZ
-#define	INADDRSZ	NS_INADDRSZ
-#define	IN6ADDRSZ	NS_IN6ADDRSZ
-#define	INDIR_MASK	NS_CMPRSFLGS
-#define NAMESERVER_PORT	NS_DEFAULTPORT
-
-#define S_ZONE		ns_s_zn
-#define S_PREREQ	ns_s_pr
-#define S_UPDATE	ns_s_ud
-#define S_ADDT		ns_s_ar
-
-#define QUERY		ns_o_query
-#define IQUERY		ns_o_iquery
-#define STATUS		ns_o_status
-#define	NS_NOTIFY_OP	ns_o_notify
-#define	NS_UPDATE_OP	ns_o_update
-
-#define NOERROR		ns_r_noerror
-#define FORMERR		ns_r_formerr
-#define SERVFAIL	ns_r_servfail
-#define NXDOMAIN	ns_r_nxdomain
-#define NOTIMP		ns_r_notimpl
-#define REFUSED		ns_r_refused
-#define YXDOMAIN	ns_r_yxdomain
-#define YXRRSET		ns_r_yxrrset
-#define NXRRSET		ns_r_nxrrset
-#define NOTAUTH		ns_r_notauth
-#define NOTZONE		ns_r_notzone
-
-#define DELETE		ns_uop_delete
-#define ADD		ns_uop_add
-
-#define T_A		ns_t_a
-#define T_NS		ns_t_ns
-#define T_MD		ns_t_md
-#define T_MF		ns_t_mf
-#define T_CNAME		ns_t_cname
-#define T_SOA		ns_t_soa
-#define T_MB		ns_t_mb
-#define T_MG		ns_t_mg
-#define T_MR		ns_t_mr
-#define T_NULL		ns_t_null
-#define T_WKS		ns_t_wks
-#define T_PTR		ns_t_ptr
-#define T_HINFO		ns_t_hinfo
-#define T_MINFO		ns_t_minfo
-#define T_MX		ns_t_mx
-#define T_TXT		ns_t_txt
-#define	T_RP		ns_t_rp
-#define T_AFSDB		ns_t_afsdb
-#define T_X25		ns_t_x25
-#define T_ISDN		ns_t_isdn
-#define T_RT		ns_t_rt
-#define T_NSAP		ns_t_nsap
-#define T_NSAP_PTR	ns_t_nsap_ptr
-#define	T_SIG		ns_t_sig
-#define	T_KEY		ns_t_key
-#define	T_PX		ns_t_px
-#define	T_GPOS		ns_t_gpos
-#define	T_AAAA		ns_t_aaaa
-#define	T_LOC		ns_t_loc
-#define	T_NXT		ns_t_nxt
-#define	T_EID		ns_t_eid
-#define	T_NIMLOC	ns_t_nimloc
-#define	T_SRV		ns_t_srv
-#define T_ATMA		ns_t_atma
-#define T_NAPTR		ns_t_naptr
-#define	T_IXFR		ns_t_ixfr
-#define T_AXFR		ns_t_axfr
-#define T_MAILB		ns_t_mailb
-#define T_MAILA		ns_t_maila
-#define T_ANY		ns_t_any
-
-#define C_IN		ns_c_in
-#define C_CHAOS		ns_c_chaos
-#define C_HS		ns_c_hs
-/* BIND_UPDATE */
-#define C_NONE		ns_c_none
-#define C_ANY		ns_c_any
-
-#define	GETSHORT		NS_GET16
-#define	GETLONG			NS_GET32
-#define	PUTSHORT		NS_PUT16
-#define	PUTLONG			NS_PUT32
-
-#endif /* _ARPA_NAMESER_COMPAT_ */
diff --git a/c/src/libnetworking/arpa/telnet.h b/c/src/libnetworking/arpa/telnet.h
deleted file mode 100644
index 09b85692da..0000000000
--- a/c/src/libnetworking/arpa/telnet.h
+++ /dev/null
@@ -1,342 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)telnet.h	8.2 (Berkeley) 12/15/93
- *
- *  $Id$
- */
-
-#ifndef _ARPA_TELNET_H_
-#define	_ARPA_TELNET_H_
-
-/*
- * Definitions for the TELNET protocol.
- */
-#define	IAC	255		/* interpret as command: */
-#define	DONT	254		/* you are not to use option */
-#define	DO	253		/* please, you use option */
-#define	WONT	252		/* I won't use option */
-#define	WILL	251		/* I will use option */
-#define	SB	250		/* interpret as subnegotiation */
-#define	GA	249		/* you may reverse the line */
-#define	EL	248		/* erase the current line */
-#define	EC	247		/* erase the current character */
-#define	AYT	246		/* are you there */
-#define	AO	245		/* abort output--but let prog finish */
-#define	IP	244		/* interrupt process--permanently */
-#define	BREAK	243		/* break */
-#define	DM	242		/* data mark--for connect. cleaning */
-#define	NOP	241		/* nop */
-#define	SE	240		/* end sub negotiation */
-#define EOR     239             /* end of record (transparent mode) */
-#define	ABORT	238		/* Abort process */
-#define	SUSP	237		/* Suspend process */
-#define	xEOF	236		/* End of file: EOF is already used... */
-
-#define SYNCH	242		/* for telfunc calls */
-
-#ifdef TELCMDS
-char *telcmds[] = {
-	"EOF", "SUSP", "ABORT", "EOR",
-	"SE", "NOP", "DMARK", "BRK", "IP", "AO", "AYT", "EC",
-	"EL", "GA", "SB", "WILL", "WONT", "DO", "DONT", "IAC",
-	0
-};
-#else
-extern char *telcmds[];
-#endif
-
-#define	TELCMD_FIRST	xEOF
-#define	TELCMD_LAST	IAC
-#define	TELCMD_OK(x)	((unsigned int)(x) <= TELCMD_LAST && \
-			 (unsigned int)(x) >= TELCMD_FIRST)
-#define	TELCMD(x)	telcmds[(x)-TELCMD_FIRST]
-
-/* telnet options */
-#define TELOPT_BINARY	0	/* 8-bit data path */
-#define TELOPT_ECHO	1	/* echo */
-#define	TELOPT_RCP	2	/* prepare to reconnect */
-#define	TELOPT_SGA	3	/* suppress go ahead */
-#define	TELOPT_NAMS	4	/* approximate message size */
-#define	TELOPT_STATUS	5	/* give status */
-#define	TELOPT_TM	6	/* timing mark */
-#define	TELOPT_RCTE	7	/* remote controlled transmission and echo */
-#define TELOPT_NAOL 	8	/* negotiate about output line width */
-#define TELOPT_NAOP 	9	/* negotiate about output page size */
-#define TELOPT_NAOCRD	10	/* negotiate about CR disposition */
-#define TELOPT_NAOHTS	11	/* negotiate about horizontal tabstops */
-#define TELOPT_NAOHTD	12	/* negotiate about horizontal tab disposition */
-#define TELOPT_NAOFFD	13	/* negotiate about formfeed disposition */
-#define TELOPT_NAOVTS	14	/* negotiate about vertical tab stops */
-#define TELOPT_NAOVTD	15	/* negotiate about vertical tab disposition */
-#define TELOPT_NAOLFD	16	/* negotiate about output LF disposition */
-#define TELOPT_XASCII	17	/* extended ascic character set */
-#define	TELOPT_LOGOUT	18	/* force logout */
-#define	TELOPT_BM	19	/* byte macro */
-#define	TELOPT_DET	20	/* data entry terminal */
-#define	TELOPT_SUPDUP	21	/* supdup protocol */
-#define	TELOPT_SUPDUPOUTPUT 22	/* supdup output */
-#define	TELOPT_SNDLOC	23	/* send location */
-#define	TELOPT_TTYPE	24	/* terminal type */
-#define	TELOPT_EOR	25	/* end or record */
-#define	TELOPT_TUID	26	/* TACACS user identification */
-#define	TELOPT_OUTMRK	27	/* output marking */
-#define	TELOPT_TTYLOC	28	/* terminal location number */
-#define	TELOPT_3270REGIME 29	/* 3270 regime */
-#define	TELOPT_X3PAD	30	/* X.3 PAD */
-#define	TELOPT_NAWS	31	/* window size */
-#define	TELOPT_TSPEED	32	/* terminal speed */
-#define	TELOPT_LFLOW	33	/* remote flow control */
-#define TELOPT_LINEMODE	34	/* Linemode option */
-#define TELOPT_XDISPLOC	35	/* X Display Location */
-#define TELOPT_OLD_ENVIRON 36	/* Old - Environment variables */
-#define	TELOPT_AUTHENTICATION 37/* Authenticate */
-#define	TELOPT_ENCRYPT	38	/* Encryption option */
-#define TELOPT_NEW_ENVIRON 39	/* New - Environment variables */
-#define	TELOPT_EXOPL	255	/* extended-options-list */
-
-
-#define	NTELOPTS	(1+TELOPT_NEW_ENVIRON)
-#ifdef TELOPTS
-char *telopts[NTELOPTS+1] = {
-	"BINARY", "ECHO", "RCP", "SUPPRESS GO AHEAD", "NAME",
-	"STATUS", "TIMING MARK", "RCTE", "NAOL", "NAOP",
-	"NAOCRD", "NAOHTS", "NAOHTD", "NAOFFD", "NAOVTS",
-	"NAOVTD", "NAOLFD", "EXTEND ASCII", "LOGOUT", "BYTE MACRO",
-	"DATA ENTRY TERMINAL", "SUPDUP", "SUPDUP OUTPUT",
-	"SEND LOCATION", "TERMINAL TYPE", "END OF RECORD",
-	"TACACS UID", "OUTPUT MARKING", "TTYLOC",
-	"3270 REGIME", "X.3 PAD", "NAWS", "TSPEED", "LFLOW",
-	"LINEMODE", "XDISPLOC", "OLD-ENVIRON", "AUTHENTICATION",
-	"ENCRYPT", "NEW-ENVIRON",
-	0
-};
-#define	TELOPT_FIRST	TELOPT_BINARY
-#define	TELOPT_LAST	TELOPT_NEW_ENVIRON
-#define	TELOPT_OK(x)	((unsigned int)(x) <= TELOPT_LAST)
-#define	TELOPT(x)	telopts[(x)-TELOPT_FIRST]
-#endif
-
-/* sub-option qualifiers */
-#define	TELQUAL_IS	0	/* option is... */
-#define	TELQUAL_SEND	1	/* send option */
-#define	TELQUAL_INFO	2	/* ENVIRON: informational version of IS */
-#define	TELQUAL_REPLY	2	/* AUTHENTICATION: client version of IS */
-#define	TELQUAL_NAME	3	/* AUTHENTICATION: client version of IS */
-
-#define	LFLOW_OFF		0	/* Disable remote flow control */
-#define	LFLOW_ON		1	/* Enable remote flow control */
-#define	LFLOW_RESTART_ANY	2	/* Restart output on any char */
-#define	LFLOW_RESTART_XON	3	/* Restart output only on XON */
-
-/*
- * LINEMODE suboptions
- */
-
-#define	LM_MODE		1
-#define	LM_FORWARDMASK	2
-#define	LM_SLC		3
-
-#define	MODE_EDIT	0x01
-#define	MODE_TRAPSIG	0x02
-#define	MODE_ACK	0x04
-#define MODE_SOFT_TAB	0x08
-#define MODE_LIT_ECHO	0x10
-
-#define	MODE_MASK	0x1f
-
-/* Not part of protocol, but needed to simplify things... */
-#define MODE_FLOW		0x0100
-#define MODE_ECHO		0x0200
-#define MODE_INBIN		0x0400
-#define MODE_OUTBIN		0x0800
-#define MODE_FORCE		0x1000
-
-#define	SLC_SYNCH	1
-#define	SLC_BRK		2
-#define	SLC_IP		3
-#define	SLC_AO		4
-#define	SLC_AYT		5
-#define	SLC_EOR		6
-#define	SLC_ABORT	7
-#define	SLC_EOF		8
-#define	SLC_SUSP	9
-#define	SLC_EC		10
-#define	SLC_EL		11
-#define	SLC_EW		12
-#define	SLC_RP		13
-#define	SLC_LNEXT	14
-#define	SLC_XON		15
-#define	SLC_XOFF	16
-#define	SLC_FORW1	17
-#define	SLC_FORW2	18
-#define SLC_MCL         19
-#define SLC_MCR         20
-#define SLC_MCWL        21
-#define SLC_MCWR        22
-#define SLC_MCBOL       23
-#define SLC_MCEOL       24
-#define SLC_INSRT       25
-#define SLC_OVER        26
-#define SLC_ECR         27
-#define SLC_EWR         28
-#define SLC_EBOL        29
-#define SLC_EEOL        30
-
-#define	NSLC		30
-
-/*
- * For backwards compatability, we define SLC_NAMES to be the
- * list of names if SLC_NAMES is not defined.
- */
-#define	SLC_NAMELIST	"0", "SYNCH", "BRK", "IP", "AO", "AYT", "EOR",	\
-			"ABORT", "EOF", "SUSP", "EC", "EL", "EW", "RP",	\
-			"LNEXT", "XON", "XOFF", "FORW1", "FORW2",	\
-			"MCL", "MCR", "MCWL", "MCWR", "MCBOL",		\
-			"MCEOL", "INSRT", "OVER", "ECR", "EWR",		\
-			"EBOL", "EEOL",					\
-			0
-
-#ifdef	SLC_NAMES
-char *slc_names[] = {
-	SLC_NAMELIST
-};
-#else
-extern char *slc_names[];
-#define	SLC_NAMES SLC_NAMELIST
-#endif
-
-#define	SLC_NAME_OK(x)	((unsigned int)(x) <= NSLC)
-#define SLC_NAME(x)	slc_names[x]
-
-#define	SLC_NOSUPPORT	0
-#define	SLC_CANTCHANGE	1
-#define	SLC_VARIABLE	2
-#define	SLC_DEFAULT	3
-#define	SLC_LEVELBITS	0x03
-
-#define	SLC_FUNC	0
-#define	SLC_FLAGS	1
-#define	SLC_VALUE	2
-
-#define	SLC_ACK		0x80
-#define	SLC_FLUSHIN	0x40
-#define	SLC_FLUSHOUT	0x20
-
-#define	OLD_ENV_VAR	1
-#define	OLD_ENV_VALUE	0
-#define	NEW_ENV_VAR	0
-#define	NEW_ENV_VALUE	1
-#define	ENV_ESC		2
-#define ENV_USERVAR	3
-
-/*
- * AUTHENTICATION suboptions
- */
-
-/*
- * Who is authenticating who ...
- */
-#define	AUTH_WHO_CLIENT		0	/* Client authenticating server */
-#define	AUTH_WHO_SERVER		1	/* Server authenticating client */
-#define	AUTH_WHO_MASK		1
-
-/*
- * amount of authentication done
- */
-#define	AUTH_HOW_ONE_WAY	0
-#define	AUTH_HOW_MUTUAL		2
-#define	AUTH_HOW_MASK		2
-
-#define	AUTHTYPE_NULL		0
-#define	AUTHTYPE_KERBEROS_V4	1
-#define	AUTHTYPE_KERBEROS_V5	2
-#define	AUTHTYPE_SPX		3
-#define	AUTHTYPE_MINK		4
-#define	AUTHTYPE_CNT		5
-
-#define	AUTHTYPE_TEST		99
-
-#ifdef	AUTH_NAMES
-char *authtype_names[] = {
-	"NULL", "KERBEROS_V4", "KERBEROS_V5", "SPX", "MINK",
-	0
-};
-#else
-extern char *authtype_names[];
-#endif
-
-#define	AUTHTYPE_NAME_OK(x)	((unsigned int)(x) < AUTHTYPE_CNT)
-#define	AUTHTYPE_NAME(x)	authtype_names[x]
-
-/*
- * ENCRYPTion suboptions
- */
-#define	ENCRYPT_IS		0	/* I pick encryption type ... */
-#define	ENCRYPT_SUPPORT		1	/* I support encryption types ... */
-#define	ENCRYPT_REPLY		2	/* Initial setup response */
-#define	ENCRYPT_START		3	/* Am starting to send encrypted */
-#define	ENCRYPT_END		4	/* Am ending encrypted */
-#define	ENCRYPT_REQSTART	5	/* Request you start encrypting */
-#define	ENCRYPT_REQEND		6	/* Request you end encrypting */
-#define	ENCRYPT_ENC_KEYID	7
-#define	ENCRYPT_DEC_KEYID	8
-#define	ENCRYPT_CNT		9
-
-#define	ENCTYPE_ANY		0
-#define	ENCTYPE_DES_CFB64	1
-#define	ENCTYPE_DES_OFB64	2
-#define	ENCTYPE_CNT		3
-
-#ifdef	ENCRYPT_NAMES
-char *encrypt_names[] = {
-	"IS", "SUPPORT", "REPLY", "START", "END",
-	"REQUEST-START", "REQUEST-END", "ENC-KEYID", "DEC-KEYID",
-	0
-};
-char *enctype_names[] = {
-	"ANY", "DES_CFB64",  "DES_OFB64",
-	0
-};
-#else
-extern char *encrypt_names[];
-extern char *enctype_names[];
-#endif
-
-
-#define	ENCRYPT_NAME_OK(x)	((unsigned int)(x) < ENCRYPT_CNT)
-#define	ENCRYPT_NAME(x)		encrypt_names[x]
-
-#define	ENCTYPE_NAME_OK(x)	((unsigned int)(x) < ENCTYPE_CNT)
-#define	ENCTYPE_NAME(x)		enctype_names[x]
-
-#endif /* !_TELNET_H_ */
diff --git a/c/src/libnetworking/bpfilter.h b/c/src/libnetworking/bpfilter.h
deleted file mode 100644
index 5a6ee0337b..0000000000
--- a/c/src/libnetworking/bpfilter.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/*
- *  $Id$
- */
-
-/* intentionally empty file */
-
diff --git a/c/src/libnetworking/include/Makefile.in b/c/src/libnetworking/include/Makefile.in
deleted file mode 100644
index f2746d78f0..0000000000
--- a/c/src/libnetworking/include/Makefile.in
+++ /dev/null
@@ -1,65 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-H_PIECES=bpfilter loop netdb opt_ipfw opt_mrouting \
-    opt_tcpdebug poll resolv syslog
-H_FILES=$(H_PIECES:%=$(srcdir)/../%.h)
-
-SYS_H_PIECES=buf callout cdefs conf domain filio ioccom ioctl kernel \
-    libkern malloc mbuf mount param proc protosw queue reboot \
-    resourcevar rtprio select signalvar socket socketvar \
-    sockio sysctl syslimits syslog systm ttycom ttydefaults \
-    ucred uio
-SYS_H_FILES=$(SYS_H_PIECES:%=$(srcdir)/../sys/%.h)
-
-RTEMS_H_PIECES= rtems_bsdnet rtems_bsdnet_internal tftp
-RTEMS_H_FILES=$(RTEMS_H_PIECES:%=$(srcdir)/../rtems/%.h)
-
-MACHINE_H_PIECES= conf cpu cpufunc endian in_cksum limits param types vmparam
-MACHINE_H_FILES=$(MACHINE_H_PIECES:%=$(srcdir)/../machine/%.h)
-
-VM_H_PIECES= vm vm_extern vm_kern vm_param
-VM_H_FILES=$(VM_H_PIECES:%=$(srcdir)/../vm/%.h)
-
-NET_H_PIECES= bpf ethernet if if_arp if_dl if_llc if_types netisr \
-    radix raw_cb route
-NET_H_FILES=$(NET_H_PIECES:%=$(srcdir)/../net/%.h)
-
-NETINET_H_PIECES= icmp_var if_ether igmp igmp_var in in_pcb in_systm in_var \
-    ip ip_fw ip_icmp ip_mroute ip_var tcp tcp_debug tcp_fsm \
-    tcp_seq tcp_timer tcp_var tcpip udp udp_var
-NETINET_H_FILES=$(NETINET_H_PIECES:%=$(srcdir)/../netinet/%.h)
-
-ARPA_H_PIECES= ftp inet nameser nameser_compat telnet
-ARPA_H_FILES=$(ARPA_H_PIECES:%=$(srcdir)/../arpa/%.h)
-
-NFS_H_PIECES= krpc nfs nfsdiskless nfsproto rpcv2 xdr_subs
-NFS_H_FILES=$(NFS_H_PIECES:%=$(srcdir)/../nfs/%.h)
-
-SRCS=$(H_FILES) $(SYS_H_FILES) $(RTEMS_H_FILES) $(MACHINE_H_FILES) \
-     $(VM_H_FILES) $(NET_H_FILES) $(NETINET_H_FILES) $(ARPA_H_FILES) \
-     $(NFS_H_FILES)
-
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
-
-all:	$(SRCS)
-	$(INSTALL) -m 444 $(H_FILES) $(PROJECT_INCLUDE)/networking
-	$(INSTALL) -m 444 $(SYS_H_FILES) $(PROJECT_INCLUDE)/networking/sys
-	$(INSTALL) -m 444 $(RTEMS_H_FILES) $(PROJECT_INCLUDE)/networking/rtems
-	$(INSTALL) -m 444 $(MACHINE_H_FILES) $(PROJECT_INCLUDE)/networking/machine
-	$(INSTALL) -m 444 $(VM_H_FILES) $(PROJECT_INCLUDE)/networking/vm
-	$(INSTALL) -m 444 $(NET_H_FILES) $(PROJECT_INCLUDE)/networking/net
-	$(INSTALL) -m 444 $(NETINET_H_FILES) $(PROJECT_INCLUDE)/networking/netinet
-	$(INSTALL) -m 444 $(ARPA_H_FILES) $(PROJECT_INCLUDE)/networking/arpa
-	$(INSTALL) -m 444 $(NFS_H_FILES) $(PROJECT_INCLUDE)/networking/nfs
diff --git a/c/src/libnetworking/kern/Makefile.in b/c/src/libnetworking/kern/Makefile.in
deleted file mode 100644
index 35804e14ef..0000000000
--- a/c/src/libnetworking/kern/Makefile.in
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-LIBNAME=lib.a
-LIB=${ARCH}/${LIBNAME}
-
-# C and C++ source names, if any, go here -- minus the .c or .cc
-C_PIECES=kern_subr uipc_domain uipc_mbuf uipc_socket uipc_socket2
-C_FILES=$(C_PIECES:%=%.c)
-C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
-
-SRCS=$(C_FILES)
-OBJS=$(C_O_FILES)
-
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/lib.cfg
-
-#
-# Add local stuff here using +=
-#
-
-DEFINES  += -D_COMPILING_BSD_KERNEL_ -DKERNEL -DINET -DNFS \
-     -DDIAGNOSTIC -DBOOTP_COMPAT
-CPPFLAGS +=
-CFLAGS   +=
-
-#
-# Add your list of files to delete here.  The config files
-#  already know how to delete some stuff, so you may want
-#  to just run 'make clean' first to see what gets missed.
-#  'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS += $(LIB)
-CLOBBER_ADDITIONS +=
-
-all:	${ARCH} $(LIB)
-
-$(LIB): $(SRCS) ${OBJS}
-	$(make-library)
diff --git a/c/src/libnetworking/kern/kern_subr.c b/c/src/libnetworking/kern/kern_subr.c
deleted file mode 100644
index 71e51fc442..0000000000
--- a/c/src/libnetworking/kern/kern_subr.c
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)kern_subr.c	8.3 (Berkeley) 1/21/94
- * $Id$
- */
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/proc.h>
-#include <sys/malloc.h>
-#include <sys/queue.h>
-
-int
-uiomove(cp, n, uio)
-	register caddr_t cp;
-	register int n;
-	register struct uio *uio;
-{
-	register struct iovec *iov;
-	u_int cnt;
-	int error;
-
-#ifdef DIAGNOSTIC
-	if (uio->uio_rw != UIO_READ && uio->uio_rw != UIO_WRITE)
-		panic("uiomove: mode");
-#endif
-	while (n > 0 && uio->uio_resid) {
-		iov = uio->uio_iov;
-		cnt = iov->iov_len;
-		if (cnt == 0) {
-			uio->uio_iov++;
-			uio->uio_iovcnt--;
-			continue;
-		}
-		if (cnt > n)
-			cnt = n;
-
-		switch (uio->uio_segflg) {
-
-		case UIO_USERSPACE:
-		case UIO_USERISPACE:
-			if (uio->uio_rw == UIO_READ)
-				error = copyout(cp, iov->iov_base, cnt);
-			else
-				error = copyin(iov->iov_base, cp, cnt);
-			if (error)
-				return (error);
-			break;
-
-		case UIO_SYSSPACE:
-			if (uio->uio_rw == UIO_READ)
-				bcopy((caddr_t)cp, iov->iov_base, cnt);
-			else
-				bcopy(iov->iov_base, (caddr_t)cp, cnt);
-			break;
-		case UIO_NOCOPY:
-			break;
-		}
-		iov->iov_base += cnt;
-		iov->iov_len -= cnt;
-		uio->uio_resid -= cnt;
-		uio->uio_offset += cnt;
-		cp += cnt;
-		n -= cnt;
-	}
-	return (0);
-}
-
-#ifdef vax	/* unused except by ct.c, other oddities XXX */
-/*
- * Get next character written in by user from uio.
- */
-int
-uwritec(uio)
-	struct uio *uio;
-{
-	register struct iovec *iov;
-	register int c;
-
-	if (uio->uio_resid <= 0)
-		return (-1);
-again:
-	if (uio->uio_iovcnt <= 0)
-		panic("uwritec");
-	iov = uio->uio_iov;
-	if (iov->iov_len == 0) {
-		uio->uio_iov++;
-		if (--uio->uio_iovcnt == 0)
-			return (-1);
-		goto again;
-	}
-	switch (uio->uio_segflg) {
-
-	case UIO_USERSPACE:
-		c = fubyte(iov->iov_base);
-		break;
-
-	case UIO_SYSSPACE:
-		c = *(u_char *) iov->iov_base;
-		break;
-
-	case UIO_USERISPACE:
-		c = fuibyte(iov->iov_base);
-		break;
-	}
-	if (c < 0)
-		return (-1);
-	iov->iov_base++;
-	iov->iov_len--;
-	uio->uio_resid--;
-	uio->uio_offset++;
-	return (c);
-}
-#endif /* vax */
-
-/*
- * General routine to allocate a hash table.
- */
-void *
-hashinit(elements, type, hashmask)
-	int elements, type;
-	u_long *hashmask;
-{
-	long hashsize;
-	LIST_HEAD(generic, generic) *hashtbl;
-	int i;
-
-	if (elements <= 0)
-		panic("hashinit: bad elements");
-	for (hashsize = 1; hashsize <= elements; hashsize <<= 1)
-		continue;
-	hashsize >>= 1;
-	hashtbl = malloc((u_long)hashsize * sizeof(*hashtbl), type, M_WAITOK);
-	for (i = 0; i < hashsize; i++)
-		LIST_INIT(&hashtbl[i]);
-	*hashmask = hashsize - 1;
-	return (hashtbl);
-}
-
-#define NPRIMES 27
-static int primes[] = { 1, 13, 31, 61, 127, 251, 509, 761, 1021, 1531, 2039,
-			2557, 3067, 3583, 4093, 4603, 5119, 5623, 6143, 6653,
-			7159, 7673, 8191, 12281, 16381, 24571, 32749 };
-
-/*
- * General routine to allocate a prime number sized hash table.
- */
-void *
-phashinit(elements, type, nentries)
-	int elements, type;
-	u_long *nentries;
-{
-	long hashsize;
-	LIST_HEAD(generic, generic) *hashtbl;
-	int i;
-
-	if (elements <= 0)
-		panic("phashinit: bad elements");
-	for (i = 1, hashsize = primes[1]; hashsize <= elements;) {
-		i++;
-		if (i == NPRIMES)
-			break;
-		hashsize = primes[i];
-	}
-	hashsize = primes[i - 1];
-	hashtbl = malloc((u_long)hashsize * sizeof(*hashtbl), type, M_WAITOK);
-	for (i = 0; i < hashsize; i++)
-		LIST_INIT(&hashtbl[i]);
-	*nentries = hashsize;
-	return (hashtbl);
-}
diff --git a/c/src/libnetworking/kern/uipc_domain.c b/c/src/libnetworking/kern/uipc_domain.c
deleted file mode 100644
index 910007395c..0000000000
--- a/c/src/libnetworking/kern/uipc_domain.c
+++ /dev/null
@@ -1,228 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)uipc_domain.c	8.2 (Berkeley) 10/18/93
- * $Id$
- */
-
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <sys/protosw.h>
-#include <sys/domain.h>
-#include <sys/mbuf.h>
-#include <sys/kernel.h>
-#include <sys/systm.h>
-
-/*
- * System initialization
- *
- * Note: domain initialization wants to take place on a per domain basis
- * as a result of traversing a linker set.  Most likely, each domain
- * want to call a registration function rather than being handled here
- * in domaininit().  Probably this will look like:
- *
- * SYSINIT(unique, SI_SUB_PROTO_DOMAI, SI_ORDER_ANY, domain_add, xxx)
- *
- * Where 'xxx' is replaced by the address of a parameter struct to be
- * passed to the doamin_add() function.
- */
-
-#if !defined(__rtems__)
-static int	x_save_spl;			/* used by kludge*/
-static void kludge_splimp __P((void *));
-static void kludge_splx __P((void *));
-       void domaininit __P((void *));
-SYSINIT(splimp, SI_SUB_PROTO_BEGIN, SI_ORDER_FIRST, kludge_splimp, &x_save_spl)
-SYSINIT(domain, SI_SUB_PROTO_DOMAIN, SI_ORDER_FIRST, domaininit, NULL)
-SYSINIT(splx, SI_SUB_PROTO_END, SI_ORDER_FIRST, kludge_splx, &x_save_spl)
-#endif
-
-static void	pffasttimo __P((void *));
-static void	pfslowtimo __P((void *));
-
-struct domain *domains;
-
-#define	ADDDOMAIN(x)	{ \
-	__CONCAT(x,domain.dom_next) = domains; \
-	domains = &__CONCAT(x,domain); \
-}
-
-extern struct linker_set domain_set;
-
-/* ARGSUSED*/
-void
-domaininit(dummy)
-	void *dummy;
-{
-	register struct domain *dp;
-	register struct protosw *pr;
-
-/* - not in our sources
-#ifdef ISDN
-	ADDDOMAIN(isdn);
-#endif
-*/
-
-	for (dp = domains; dp; dp = dp->dom_next) {
-		if (dp->dom_init)
-			(*dp->dom_init)();
-		for (pr = dp->dom_protosw; pr < dp->dom_protoswNPROTOSW; pr++){
-#ifdef PRU_OLDSTYLE
-			/* See comments in uipc_socket2.c. */
-			if (pr->pr_usrreqs == 0 && pr->pr_ousrreq)
-				pr->pr_usrreqs = &pru_oldstyle;
-#endif
-			if (pr->pr_init)
-				(*pr->pr_init)();
-		}
-	}
-
-	if (max_linkhdr < 16)		/* XXX */
-		max_linkhdr = 16;
-	max_hdr = max_linkhdr + max_protohdr;
-	max_datalen = MHLEN - max_hdr;
-	timeout(pffasttimo, (void *)0, 1);
-	timeout(pfslowtimo, (void *)0, 1);
-}
-
-
-/*
- * The following two operations are kludge code.  Most likely, they should
- * be done as a "domainpreinit()" for the first function and then rolled
- * in as the last act of "domaininit()" for the second.
- *
- * In point of fact, it is questionable why other initialization prior
- * to this does not also take place at splimp by default.
- */
-static void
-kludge_splimp(udata)
-	void *udata;
-{
-	int	*savesplp = udata;
-
-	*savesplp = splimp();
-}
-
-static void
-kludge_splx(udata)
-	void *udata;
-{
-	int	*savesplp = udata;
-
-	splx( *savesplp);
-}
-
-
-
-struct protosw *
-pffindtype(int family, int type)
-{
-	register struct domain *dp;
-	register struct protosw *pr;
-
-	for (dp = domains; dp; dp = dp->dom_next)
-		if (dp->dom_family == family)
-			goto found;
-	return (0);
-found:
-	for (pr = dp->dom_protosw; pr < dp->dom_protoswNPROTOSW; pr++)
-		if (pr->pr_type && pr->pr_type == type)
-			return (pr);
-	return (0);
-}
-
-struct protosw *
-pffindproto(int family, int protocol, int type)
-{
-	register struct domain *dp;
-	register struct protosw *pr;
-	struct protosw *maybe = 0;
-
-	if (family == 0)
-		return (0);
-	for (dp = domains; dp; dp = dp->dom_next)
-		if (dp->dom_family == family)
-			goto found;
-	return (0);
-found:
-	for (pr = dp->dom_protosw; pr < dp->dom_protoswNPROTOSW; pr++) {
-		if ((pr->pr_protocol == protocol) && (pr->pr_type == type))
-			return (pr);
-
-		if (type == SOCK_RAW && pr->pr_type == SOCK_RAW &&
-		    pr->pr_protocol == 0 && maybe == (struct protosw *)0)
-			maybe = pr;
-	}
-	return (maybe);
-}
-
-void
-pfctlinput(cmd, sa)
-	int cmd;
-	struct sockaddr *sa;
-{
-	register struct domain *dp;
-	register struct protosw *pr;
-
-	for (dp = domains; dp; dp = dp->dom_next)
-		for (pr = dp->dom_protosw; pr < dp->dom_protoswNPROTOSW; pr++)
-			if (pr->pr_ctlinput)
-				(*pr->pr_ctlinput)(cmd, sa, (void *)0);
-}
-
-static void
-pfslowtimo(arg)
-	void *arg;
-{
-	register struct domain *dp;
-	register struct protosw *pr;
-
-	for (dp = domains; dp; dp = dp->dom_next)
-		for (pr = dp->dom_protosw; pr < dp->dom_protoswNPROTOSW; pr++)
-			if (pr->pr_slowtimo)
-				(*pr->pr_slowtimo)();
-	timeout(pfslowtimo, (void *)0, hz/2);
-}
-
-static void
-pffasttimo(arg)
-	void *arg;
-{
-	register struct domain *dp;
-	register struct protosw *pr;
-
-	for (dp = domains; dp; dp = dp->dom_next)
-		for (pr = dp->dom_protosw; pr < dp->dom_protoswNPROTOSW; pr++)
-			if (pr->pr_fasttimo)
-				(*pr->pr_fasttimo)();
-	timeout(pffasttimo, (void *)0, hz/5);
-}
diff --git a/c/src/libnetworking/kern/uipc_mbuf.c b/c/src/libnetworking/kern/uipc_mbuf.c
deleted file mode 100644
index f682be94a7..0000000000
--- a/c/src/libnetworking/kern/uipc_mbuf.c
+++ /dev/null
@@ -1,851 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1988, 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)uipc_mbuf.c	8.2 (Berkeley) 1/4/94
- * $Id$
- */
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/proc.h>
-#include <sys/malloc.h>
-#define MBTYPES
-#include <sys/mbuf.h>
-#include <sys/kernel.h>
-#include <sys/syslog.h>
-#include <sys/domain.h>
-#include <sys/protosw.h>
-
-#include <vm/vm.h>
-#include <vm/vm_param.h>
-#include <vm/vm_kern.h>
-#include <vm/vm_extern.h>
-
-static void mbinit __P((void *));
-SYSINIT(mbuf, SI_SUB_MBUF, SI_ORDER_FIRST, mbinit, NULL)
-
-struct mbuf *mbutl;
-char	*mclrefcnt;
-struct mbstat mbstat;
-struct mbuf *mmbfree;
-union mcluster *mclfree;
-int	max_linkhdr;
-int	max_protohdr;
-int	max_hdr;
-int	max_datalen;
-
-static void	m_reclaim __P((void));
-
-/* "number of clusters of pages" */
-#define NCL_INIT	1
-
-#define NMB_INIT	16
-
-/* ARGSUSED*/
-static void
-mbinit(dummy)
-	void *dummy;
-{
-	int s;
-
-	mmbfree = NULL; mclfree = NULL;
-	s = splimp();
-	if (m_mballoc(NMB_INIT, M_DONTWAIT) == 0)
-		goto bad;
-	if (m_clalloc(NCL_INIT, M_DONTWAIT) == 0)
-		goto bad;
-	splx(s);
-	return;
-bad:
-	panic("mbinit");
-}
-
-/*
- * Allocate at least nmb mbufs and place on mbuf free list.
- * Must be called at splimp.
- */
-/* ARGSUSED */
-int
-m_mballoc(nmb, nowait)
-	register int nmb;
-	int nowait;
-{
-	register caddr_t p;
-	register int i;
-	int nbytes;
-
-	/* Once we run out of map space, it will be impossible to get
-	 * any more (nothing is ever freed back to the map) (XXX which
-	 * is dumb). (however you are not dead as m_reclaim might
-	 * still be able to free a substantial amount of space).
-	 */
-	if (mb_map_full)
-		return (0);
-
-	nbytes = round_page(nmb * MSIZE);
-	p = (caddr_t)kmem_malloc(mb_map, nbytes, nowait ? M_NOWAIT : M_WAITOK);
-	/*
-	 * Either the map is now full, or this is nowait and there
-	 * are no pages left.
-	 */
-	if (p == NULL)
-		return (0);
-
-	nmb = nbytes / MSIZE;
-	for (i = 0; i < nmb; i++) {
-		((struct mbuf *)p)->m_next = mmbfree;
-		mmbfree = (struct mbuf *)p;
-		p += MSIZE;
-	}
-	mbstat.m_mbufs += nmb;
-	return (1);
-}
-
-/*
- * Allocate some number of mbuf clusters
- * and place on cluster free list.
- * Must be called at splimp.
- */
-/* ARGSUSED */
-int
-m_clalloc(ncl, nowait)
-	register int ncl;
-	int nowait;
-{
-	register caddr_t p;
-	register int i;
-
-	/*
-	 * Once we run out of map space, it will be impossible
-	 * to get any more (nothing is ever freed back to the
-	 * map).
-	 */
-	if (mb_map_full)
-		return (0);
-
-	p = (caddr_t)kmem_malloc(mb_map, ncl*MCLBYTES,
-				 nowait ? M_NOWAIT : M_WAITOK);
-	/*
-	 * Either the map is now full, or this is nowait and there
-	 * are no pages left.
-	 */
-	if (p == NULL)
-		return (0);
-
-	for (i = 0; i < ncl; i++) {
-		((union mcluster *)p)->mcl_next = mclfree;
-		mclfree = (union mcluster *)p;
-		p += MCLBYTES;
-		mbstat.m_clfree++;
-	}
-	mbstat.m_clusters += ncl;
-	return (1);
-}
-
-/*
- * When MGET failes, ask protocols to free space when short of memory,
- * then re-attempt to allocate an mbuf.
- */
-struct mbuf *
-m_retry(i, t)
-	int i, t;
-{
-	register struct mbuf *m;
-
-	m_reclaim();
-#define m_retry(i, t)	(struct mbuf *)0
-	MGET(m, i, t);
-#undef m_retry
-	if (m != NULL)
-		mbstat.m_wait++;
-	else
-		mbstat.m_drops++;
-	return (m);
-}
-
-/*
- * As above; retry an MGETHDR.
- */
-struct mbuf *
-m_retryhdr(i, t)
-	int i, t;
-{
-	register struct mbuf *m;
-
-	m_reclaim();
-#define m_retryhdr(i, t) (struct mbuf *)0
-	MGETHDR(m, i, t);
-#undef m_retryhdr
-	if (m != NULL)
-		mbstat.m_wait++;
-	else
-		mbstat.m_drops++;
-	return (m);
-}
-
-static void
-m_reclaim()
-{
-	register struct domain *dp;
-	register struct protosw *pr;
-	int s = splimp();
-
-	for (dp = domains; dp; dp = dp->dom_next)
-		for (pr = dp->dom_protosw; pr < dp->dom_protoswNPROTOSW; pr++)
-			if (pr->pr_drain)
-				(*pr->pr_drain)();
-	splx(s);
-	mbstat.m_drain++;
-}
-
-/*
- * Space allocation routines.
- * These are also available as macros
- * for critical paths.
- */
-struct mbuf *
-m_get(nowait, type)
-	int nowait, type;
-{
-	register struct mbuf *m;
-
-	MGET(m, nowait, type);
-	return (m);
-}
-
-struct mbuf *
-m_gethdr(nowait, type)
-	int nowait, type;
-{
-	register struct mbuf *m;
-
-	MGETHDR(m, nowait, type);
-	return (m);
-}
-
-struct mbuf *
-m_getclr(nowait, type)
-	int nowait, type;
-{
-	register struct mbuf *m;
-
-	MGET(m, nowait, type);
-	if (m == 0)
-		return (0);
-	bzero(mtod(m, caddr_t), MLEN);
-	return (m);
-}
-
-struct mbuf *
-m_free(m)
-	struct mbuf *m;
-{
-	register struct mbuf *n;
-
-	MFREE(m, n);
-	return (n);
-}
-
-void
-m_freem(m)
-	register struct mbuf *m;
-{
-	register struct mbuf *n;
-
-	if (m == NULL)
-		return;
-	do {
-		MFREE(m, n);
-		m = n;
-	} while (m);
-}
-
-/*
- * Mbuffer utility routines.
- */
-
-/*
- * Lesser-used path for M_PREPEND:
- * allocate new mbuf to prepend to chain,
- * copy junk along.
- */
-struct mbuf *
-m_prepend(m, len, how)
-	register struct mbuf *m;
-	int len, how;
-{
-	struct mbuf *mn;
-
-	MGET(mn, how, m->m_type);
-	if (mn == (struct mbuf *)NULL) {
-		m_freem(m);
-		return ((struct mbuf *)NULL);
-	}
-	if (m->m_flags & M_PKTHDR) {
-		M_COPY_PKTHDR(mn, m);
-		m->m_flags &= ~M_PKTHDR;
-	}
-	mn->m_next = m;
-	m = mn;
-	if (len < MHLEN)
-		MH_ALIGN(m, len);
-	m->m_len = len;
-	return (m);
-}
-
-/*
- * Make a copy of an mbuf chain starting "off0" bytes from the beginning,
- * continuing for "len" bytes.  If len is M_COPYALL, copy to end of mbuf.
- * The wait parameter is a choice of M_WAIT/M_DONTWAIT from caller.
- */
-static int MCFail;
-
-struct mbuf *
-m_copym(m, off0, len, wait)
-	register struct mbuf *m;
-	int off0, wait;
-	register int len;
-{
-	register struct mbuf *n, **np;
-	register int off = off0;
-	struct mbuf *top;
-	int copyhdr = 0;
-
-	if (off < 0 || len < 0)
-		panic("m_copym");
-	if (off == 0 && m->m_flags & M_PKTHDR)
-		copyhdr = 1;
-	while (off > 0) {
-		if (m == 0)
-			panic("m_copym");
-		if (off < m->m_len)
-			break;
-		off -= m->m_len;
-		m = m->m_next;
-	}
-	np = &top;
-	top = 0;
-	while (len > 0) {
-		if (m == 0) {
-			if (len != M_COPYALL)
-				panic("m_copym");
-			break;
-		}
-		MGET(n, wait, m->m_type);
-		*np = n;
-		if (n == 0)
-			goto nospace;
-		if (copyhdr) {
-			M_COPY_PKTHDR(n, m);
-			if (len == M_COPYALL)
-				n->m_pkthdr.len -= off0;
-			else
-				n->m_pkthdr.len = len;
-			copyhdr = 0;
-		}
-		n->m_len = min(len, m->m_len - off);
-		if (m->m_flags & M_EXT) {
-			n->m_data = m->m_data + off;
-			if(!m->m_ext.ext_ref)
-				mclrefcnt[mtocl(m->m_ext.ext_buf)]++;
-			else
-				(*(m->m_ext.ext_ref))(m->m_ext.ext_buf,
-							m->m_ext.ext_size);
-			n->m_ext = m->m_ext;
-			n->m_flags |= M_EXT;
-		} else
-			bcopy(mtod(m, caddr_t)+off, mtod(n, caddr_t),
-			    (unsigned)n->m_len);
-		if (len != M_COPYALL)
-			len -= n->m_len;
-		off = 0;
-		m = m->m_next;
-		np = &n->m_next;
-	}
-	if (top == 0)
-		MCFail++;
-	return (top);
-nospace:
-	m_freem(top);
-	MCFail++;
-	return (0);
-}
-
-/*
- * Copy an entire packet, including header (which must be present).
- * An optimization of the common case `m_copym(m, 0, M_COPYALL, how)'.
- */
-struct mbuf *
-m_copypacket(m, how)
-	struct mbuf *m;
-	int how;
-{
-	struct mbuf *top, *n, *o;
-
-	MGET(n, how, m->m_type);
-	top = n;
-	if (!n)
-		goto nospace;
-
-	M_COPY_PKTHDR(n, m);
-	n->m_len = m->m_len;
-	if (m->m_flags & M_EXT) {
-		n->m_data = m->m_data;
-		mclrefcnt[mtocl(m->m_ext.ext_buf)]++;
-		n->m_ext = m->m_ext;
-		n->m_flags |= M_EXT;
-	} else {
-		bcopy(mtod(m, char *), mtod(n, char *), n->m_len);
-	}
-
-	m = m->m_next;
-	while (m) {
-		MGET(o, how, m->m_type);
-		if (!o)
-			goto nospace;
-
-		n->m_next = o;
-		n = n->m_next;
-
-		n->m_len = m->m_len;
-		if (m->m_flags & M_EXT) {
-			n->m_data = m->m_data;
-			mclrefcnt[mtocl(m->m_ext.ext_buf)]++;
-			n->m_ext = m->m_ext;
-			n->m_flags |= M_EXT;
-		} else {
-			bcopy(mtod(m, char *), mtod(n, char *), n->m_len);
-		}
-
-		m = m->m_next;
-	}
-	return top;
-nospace:
-	m_freem(top);
-	MCFail++;
-	return 0;
-}
-
-/*
- * Copy data from an mbuf chain starting "off" bytes from the beginning,
- * continuing for "len" bytes, into the indicated buffer.
- */
-void
-m_copydata(m, off, len, cp)
-	register struct mbuf *m;
-	register int off;
-	register int len;
-	caddr_t cp;
-{
-	register unsigned count;
-
-	if (off < 0 || len < 0)
-		panic("m_copydata");
-	while (off > 0) {
-		if (m == 0)
-			panic("m_copydata");
-		if (off < m->m_len)
-			break;
-		off -= m->m_len;
-		m = m->m_next;
-	}
-	while (len > 0) {
-		if (m == 0)
-			panic("m_copydata");
-		count = min(m->m_len - off, len);
-		bcopy(mtod(m, caddr_t) + off, cp, count);
-		len -= count;
-		cp += count;
-		off = 0;
-		m = m->m_next;
-	}
-}
-
-/*
- * Concatenate mbuf chain n to m.
- * Both chains must be of the same type (e.g. MT_DATA).
- * Any m_pkthdr is not updated.
- */
-void
-m_cat(m, n)
-	register struct mbuf *m, *n;
-{
-	while (m->m_next)
-		m = m->m_next;
-	while (n) {
-		if (m->m_flags & M_EXT ||
-		    m->m_data + m->m_len + n->m_len >= &m->m_dat[MLEN]) {
-			/* just join the two chains */
-			m->m_next = n;
-			return;
-		}
-		/* splat the data from one into the other */
-		bcopy(mtod(n, caddr_t), mtod(m, caddr_t) + m->m_len,
-		    (u_int)n->m_len);
-		m->m_len += n->m_len;
-		n = m_free(n);
-	}
-}
-
-void
-m_adj(mp, req_len)
-	struct mbuf *mp;
-	int req_len;
-{
-	register int len = req_len;
-	register struct mbuf *m;
-	register int count;
-
-	if ((m = mp) == NULL)
-		return;
-	if (len >= 0) {
-		/*
-		 * Trim from head.
-		 */
-		while (m != NULL && len > 0) {
-			if (m->m_len <= len) {
-				len -= m->m_len;
-				m->m_len = 0;
-				m = m->m_next;
-			} else {
-				m->m_len -= len;
-				m->m_data += len;
-				len = 0;
-			}
-		}
-		m = mp;
-		if (mp->m_flags & M_PKTHDR)
-			m->m_pkthdr.len -= (req_len - len);
-	} else {
-		/*
-		 * Trim from tail.  Scan the mbuf chain,
-		 * calculating its length and finding the last mbuf.
-		 * If the adjustment only affects this mbuf, then just
-		 * adjust and return.  Otherwise, rescan and truncate
-		 * after the remaining size.
-		 */
-		len = -len;
-		count = 0;
-		for (;;) {
-			count += m->m_len;
-			if (m->m_next == (struct mbuf *)0)
-				break;
-			m = m->m_next;
-		}
-		if (m->m_len >= len) {
-			m->m_len -= len;
-			if (mp->m_flags & M_PKTHDR)
-				mp->m_pkthdr.len -= len;
-			return;
-		}
-		count -= len;
-		if (count < 0)
-			count = 0;
-		/*
-		 * Correct length for chain is "count".
-		 * Find the mbuf with last data, adjust its length,
-		 * and toss data from remaining mbufs on chain.
-		 */
-		m = mp;
-		if (m->m_flags & M_PKTHDR)
-			m->m_pkthdr.len = count;
-		for (; m; m = m->m_next) {
-			if (m->m_len >= count) {
-				m->m_len = count;
-				break;
-			}
-			count -= m->m_len;
-		}
-		while (m->m_next)
-			(m = m->m_next) ->m_len = 0;
-	}
-}
-
-/*
- * Rearange an mbuf chain so that len bytes are contiguous
- * and in the data area of an mbuf (so that mtod and dtom
- * will work for a structure of size len).  Returns the resulting
- * mbuf chain on success, frees it and returns null on failure.
- * If there is room, it will add up to max_protohdr-len extra bytes to the
- * contiguous region in an attempt to avoid being called next time.
- */
-static int MPFail;
-
-struct mbuf *
-m_pullup(n, len)
-	register struct mbuf *n;
-	int len;
-{
-	register struct mbuf *m;
-	register int count;
-	int space;
-
-	/*
-	 * If first mbuf has no cluster, and has room for len bytes
-	 * without shifting current data, pullup into it,
-	 * otherwise allocate a new mbuf to prepend to the chain.
-	 */
-	if ((n->m_flags & M_EXT) == 0 &&
-	    n->m_data + len < &n->m_dat[MLEN] && n->m_next) {
-		if (n->m_len >= len)
-			return (n);
-		m = n;
-		n = n->m_next;
-		len -= m->m_len;
-	} else {
-		if (len > MHLEN)
-			goto bad;
-		MGET(m, M_DONTWAIT, n->m_type);
-		if (m == 0)
-			goto bad;
-		m->m_len = 0;
-		if (n->m_flags & M_PKTHDR) {
-			M_COPY_PKTHDR(m, n);
-			n->m_flags &= ~M_PKTHDR;
-		}
-	}
-	space = &m->m_dat[MLEN] - (m->m_data + m->m_len);
-	do {
-		count = min(min(max(len, max_protohdr), space), n->m_len);
-		bcopy(mtod(n, caddr_t), mtod(m, caddr_t) + m->m_len,
-		  (unsigned)count);
-		len -= count;
-		m->m_len += count;
-		n->m_len -= count;
-		space -= count;
-		if (n->m_len)
-			n->m_data += count;
-		else
-			n = m_free(n);
-	} while (len > 0 && n);
-	if (len > 0) {
-		(void) m_free(m);
-		goto bad;
-	}
-	m->m_next = n;
-	return (m);
-bad:
-	m_freem(n);
-	MPFail++;
-	return (0);
-}
-
-/*
- * Partition an mbuf chain in two pieces, returning the tail --
- * all but the first len0 bytes.  In case of failure, it returns NULL and
- * attempts to restore the chain to its original state.
- */
-struct mbuf *
-m_split(m0, len0, wait)
-	register struct mbuf *m0;
-	int len0, wait;
-{
-	register struct mbuf *m, *n;
-	unsigned len = len0, remain;
-
-	for (m = m0; m && len > m->m_len; m = m->m_next)
-		len -= m->m_len;
-	if (m == 0)
-		return (0);
-	remain = m->m_len - len;
-	if (m0->m_flags & M_PKTHDR) {
-		MGETHDR(n, wait, m0->m_type);
-		if (n == 0)
-			return (0);
-		n->m_pkthdr.rcvif = m0->m_pkthdr.rcvif;
-		n->m_pkthdr.len = m0->m_pkthdr.len - len0;
-		m0->m_pkthdr.len = len0;
-		if (m->m_flags & M_EXT)
-			goto extpacket;
-		if (remain > MHLEN) {
-			/* m can't be the lead packet */
-			MH_ALIGN(n, 0);
-			n->m_next = m_split(m, len, wait);
-			if (n->m_next == 0) {
-				(void) m_free(n);
-				return (0);
-			} else
-				return (n);
-		} else
-			MH_ALIGN(n, remain);
-	} else if (remain == 0) {
-		n = m->m_next;
-		m->m_next = 0;
-		return (n);
-	} else {
-		MGET(n, wait, m->m_type);
-		if (n == 0)
-			return (0);
-		M_ALIGN(n, remain);
-	}
-extpacket:
-	if (m->m_flags & M_EXT) {
-		n->m_flags |= M_EXT;
-		n->m_ext = m->m_ext;
-		if(!m->m_ext.ext_ref)
-			mclrefcnt[mtocl(m->m_ext.ext_buf)]++;
-		else
-			(*(m->m_ext.ext_ref))(m->m_ext.ext_buf,
-						m->m_ext.ext_size);
-		m->m_ext.ext_size = 0; /* For Accounting XXXXXX danger */
-		n->m_data = m->m_data + len;
-	} else {
-		bcopy(mtod(m, caddr_t) + len, mtod(n, caddr_t), remain);
-	}
-	n->m_len = remain;
-	m->m_len = len;
-	n->m_next = m->m_next;
-	m->m_next = 0;
-	return (n);
-}
-/*
- * Routine to copy from device local memory into mbufs.
- */
-struct mbuf *
-m_devget(buf, totlen, off0, ifp, copy)
-	char *buf;
-	int totlen, off0;
-	struct ifnet *ifp;
-	void (*copy) __P((char *from, caddr_t to, u_int len));
-{
-	register struct mbuf *m;
-	struct mbuf *top = 0, **mp = &top;
-	register int off = off0, len;
-	register char *cp;
-	char *epkt;
-
-	cp = buf;
-	epkt = cp + totlen;
-	if (off) {
-		cp += off + 2 * sizeof(u_short);
-		totlen -= 2 * sizeof(u_short);
-	}
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
-	if (m == 0)
-		return (0);
-	m->m_pkthdr.rcvif = ifp;
-	m->m_pkthdr.len = totlen;
-	m->m_len = MHLEN;
-
-	while (totlen > 0) {
-		if (top) {
-			MGET(m, M_DONTWAIT, MT_DATA);
-			if (m == 0) {
-				m_freem(top);
-				return (0);
-			}
-			m->m_len = MLEN;
-		}
-		len = min(totlen, epkt - cp);
-		if (len >= MINCLSIZE) {
-			MCLGET(m, M_DONTWAIT);
-			if (m->m_flags & M_EXT)
-				m->m_len = len = min(len, MCLBYTES);
-			else
-				len = m->m_len;
-		} else {
-			/*
-			 * Place initial small packet/header at end of mbuf.
-			 */
-			if (len < m->m_len) {
-				if (top == 0 && len + max_linkhdr <= m->m_len)
-					m->m_data += max_linkhdr;
-				m->m_len = len;
-			} else
-				len = m->m_len;
-		}
-		if (copy)
-			copy(cp, mtod(m, caddr_t), (unsigned)len);
-		else
-			bcopy(cp, mtod(m, caddr_t), (unsigned)len);
-		cp += len;
-		*mp = m;
-		mp = &m->m_next;
-		totlen -= len;
-		if (cp == epkt)
-			cp = buf;
-	}
-	return (top);
-}
-
-/*
- * Copy data from a buffer back into the indicated mbuf chain,
- * starting "off" bytes from the beginning, extending the mbuf
- * chain if necessary.
- */
-void
-m_copyback(m0, off, len, cp)
-	struct	mbuf *m0;
-	register int off;
-	register int len;
-	caddr_t cp;
-{
-	register int mlen;
-	register struct mbuf *m = m0, *n;
-	int totlen = 0;
-
-	if (m0 == 0)
-		return;
-	while (off > (mlen = m->m_len)) {
-		off -= mlen;
-		totlen += mlen;
-		if (m->m_next == 0) {
-			n = m_getclr(M_DONTWAIT, m->m_type);
-			if (n == 0)
-				goto out;
-			n->m_len = min(MLEN, len + off);
-			m->m_next = n;
-		}
-		m = m->m_next;
-	}
-	while (len > 0) {
-		mlen = min (m->m_len - off, len);
-		bcopy(cp, off + mtod(m, caddr_t), (unsigned)mlen);
-		cp += mlen;
-		len -= mlen;
-		mlen += off;
-		off = 0;
-		totlen += mlen;
-		if (len == 0)
-			break;
-		if (m->m_next == 0) {
-			n = m_get(M_DONTWAIT, m->m_type);
-			if (n == 0)
-				break;
-			n->m_len = min(MLEN, len);
-			m->m_next = n;
-		}
-		m = m->m_next;
-	}
-out:	if (((m = m0)->m_flags & M_PKTHDR) && (m->m_pkthdr.len < totlen))
-		m->m_pkthdr.len = totlen;
-}
diff --git a/c/src/libnetworking/kern/uipc_socket.c b/c/src/libnetworking/kern/uipc_socket.c
deleted file mode 100644
index 895d1c7d45..0000000000
--- a/c/src/libnetworking/kern/uipc_socket.c
+++ /dev/null
@@ -1,1100 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1988, 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)uipc_socket.c	8.3 (Berkeley) 4/15/94
- * $Id$
- */
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/systm.h>
-#include <sys/proc.h>
-#include <sys/file.h>
-#include <sys/malloc.h>
-#include <sys/mbuf.h>
-#include <sys/domain.h>
-#include <sys/kernel.h>
-#include <sys/protosw.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/resourcevar.h>
-#include <sys/signalvar.h>
-#include <sys/sysctl.h>
-
-static int somaxconn = SOMAXCONN;
-SYSCTL_INT(_kern, KERN_SOMAXCONN, somaxconn, CTLFLAG_RW, &somaxconn, 0, "");
-
-/*
- * Socket operation routines.
- * These routines are called by the routines in
- * sys_socket.c or from a system process, and
- * implement the semantics of socket operations by
- * switching out to the protocol specific routines.
- */
-/*ARGSUSED*/
-int
-socreate(dom, aso, type, proto, p)
-	int dom;
-	struct socket **aso;
-	register int type;
-	int proto;
-	struct proc *p;
-{
-	register struct protosw *prp;
-	register struct socket *so;
-	register int error;
-
-	if (proto)
-		prp = pffindproto(dom, proto, type);
-	else
-		prp = pffindtype(dom, type);
-	if (prp == 0 || prp->pr_usrreqs == 0)
-		return (EPROTONOSUPPORT);
-	if (prp->pr_type != type)
-		return (EPROTOTYPE);
-	MALLOC(so, struct socket *, sizeof(*so), M_SOCKET, M_WAIT);
-	bzero((caddr_t)so, sizeof(*so));
-	TAILQ_INIT(&so->so_incomp);
-	TAILQ_INIT(&so->so_comp);
-	so->so_type = type;
-	so->so_state = SS_PRIV;
-	so->so_uid = 0;
-	so->so_proto = prp;
-	error = (*prp->pr_usrreqs->pru_attach)(so, proto);
-	if (error) {
-		so->so_state |= SS_NOFDREF;
-		sofree(so);
-		return (error);
-	}
-	*aso = so;
-	return (0);
-}
-
-int
-sobind(so, nam)
-	struct socket *so;
-	struct mbuf *nam;
-{
-	int s = splnet();
-	int error;
-
-	error = (*so->so_proto->pr_usrreqs->pru_bind)(so, nam);
-	splx(s);
-	return (error);
-}
-
-int
-solisten(so, backlog)
-	register struct socket *so;
-	int backlog;
-{
-	int s = splnet(), error;
-
-	error = (*so->so_proto->pr_usrreqs->pru_listen)(so);
-	if (error) {
-		splx(s);
-		return (error);
-	}
-	if (so->so_comp.tqh_first == NULL)
-		so->so_options |= SO_ACCEPTCONN;
-	if (backlog < 0 || backlog > somaxconn)
-		backlog = somaxconn;
-	so->so_qlimit = backlog;
-	splx(s);
-	return (0);
-}
-
-void
-sofree(so)
-	register struct socket *so;
-{
-	struct socket *head = so->so_head;
-
-	if (so->so_pcb || (so->so_state & SS_NOFDREF) == 0)
-		return;
-	if (head != NULL) {
-		if (so->so_state & SS_INCOMP) {
-			TAILQ_REMOVE(&head->so_incomp, so, so_list);
-			head->so_incqlen--;
-		} else if (so->so_state & SS_COMP) {
-			TAILQ_REMOVE(&head->so_comp, so, so_list);
-		} else {
-			panic("sofree: not queued");
-		}
-		head->so_qlen--;
-		so->so_state &= ~(SS_INCOMP|SS_COMP);
-		so->so_head = NULL;
-	}
-	sbrelease(&so->so_snd);
-	sorflush(so);
-	FREE(so, M_SOCKET);
-}
-
-/*
- * Close a socket on last file table reference removal.
- * Initiate disconnect if connected.
- * Free socket when disconnect complete.
- */
-int
-soclose(so)
-	register struct socket *so;
-{
-	int s = splnet();		/* conservative */
-	int error = 0;
-
-	if (so->so_options & SO_ACCEPTCONN) {
-		struct socket *sp, *sonext;
-
-		for (sp = so->so_incomp.tqh_first; sp != NULL; sp = sonext) {
-			sonext = sp->so_list.tqe_next;
-			(void) soabort(sp);
-		}
-		for (sp = so->so_comp.tqh_first; sp != NULL; sp = sonext) {
-			sonext = sp->so_list.tqe_next;
-			(void) soabort(sp);
-		}
-	}
-	if (so->so_pcb == 0)
-		goto discard;
-	if (so->so_state & SS_ISCONNECTED) {
-		if ((so->so_state & SS_ISDISCONNECTING) == 0) {
-			error = sodisconnect(so);
-			if (error)
-				goto drop;
-		}
-		if (so->so_options & SO_LINGER) {
-			if ((so->so_state & SS_ISDISCONNECTING) &&
-			    (so->so_state & SS_NBIO))
-				goto drop;
-			while (so->so_state & SS_ISCONNECTED) {
-				soconnsleep (so);
-			}
-		}
-	}
-drop:
-	if (so->so_pcb) {
-		int error2 = (*so->so_proto->pr_usrreqs->pru_detach)(so);
-		if (error == 0)
-			error = error2;
-	}
-discard:
-	if (so->so_state & SS_NOFDREF)
-		panic("soclose: NOFDREF");
-	so->so_state |= SS_NOFDREF;
-	sofree(so);
-	splx(s);
-	return (error);
-}
-
-/*
- * Must be called at splnet...
- */
-int
-soabort(so)
-	struct socket *so;
-{
-
-	return (*so->so_proto->pr_usrreqs->pru_abort)(so);
-}
-
-int
-soaccept(so, nam)
-	register struct socket *so;
-	struct mbuf *nam;
-{
-	int s = splnet();
-	int error;
-
-	if ((so->so_state & SS_NOFDREF) == 0)
-		panic("soaccept: !NOFDREF");
-	so->so_state &= ~SS_NOFDREF;
-	error = (*so->so_proto->pr_usrreqs->pru_accept)(so, nam);
-	splx(s);
-	return (error);
-}
-
-int
-soconnect(so, nam)
-	register struct socket *so;
-	struct mbuf *nam;
-{
-	int s;
-	int error;
-
-	if (so->so_options & SO_ACCEPTCONN)
-		return (EOPNOTSUPP);
-	s = splnet();
-	/*
-	 * If protocol is connection-based, can only connect once.
-	 * Otherwise, if connected, try to disconnect first.
-	 * This allows user to disconnect by connecting to, e.g.,
-	 * a null address.
-	 */
-	if (so->so_state & (SS_ISCONNECTED|SS_ISCONNECTING) &&
-	    ((so->so_proto->pr_flags & PR_CONNREQUIRED) ||
-	    (error = sodisconnect(so))))
-		error = EISCONN;
-	else
-		error = (*so->so_proto->pr_usrreqs->pru_connect)(so, nam);
-	splx(s);
-	return (error);
-}
-
-int
-soconnect2(so1, so2)
-	register struct socket *so1;
-	struct socket *so2;
-{
-	int s = splnet();
-	int error;
-
-	error = (*so1->so_proto->pr_usrreqs->pru_connect2)(so1, so2);
-	splx(s);
-	return (error);
-}
-
-int
-sodisconnect(so)
-	register struct socket *so;
-{
-	int s = splnet();
-	int error;
-
-	if ((so->so_state & SS_ISCONNECTED) == 0) {
-		error = ENOTCONN;
-		goto bad;
-	}
-	if (so->so_state & SS_ISDISCONNECTING) {
-		error = EALREADY;
-		goto bad;
-	}
-	error = (*so->so_proto->pr_usrreqs->pru_disconnect)(so);
-bad:
-	splx(s);
-	return (error);
-}
-
-#define	SBLOCKWAIT(f)	(((f) & MSG_DONTWAIT) ? M_NOWAIT : M_WAITOK)
-/*
- * Send on a socket.
- * If send must go all at once and message is larger than
- * send buffering, then hard error.
- * Lock against other senders.
- * If must go all at once and not enough room now, then
- * inform user that this would block and do nothing.
- * Otherwise, if nonblocking, send as much as possible.
- * The data to be sent is described by "uio" if nonzero,
- * otherwise by the mbuf chain "top" (which must be null
- * if uio is not).  Data provided in mbuf chain must be small
- * enough to send all at once.
- *
- * Returns nonzero on error, timeout or signal; callers
- * must check for short counts if EINTR/ERESTART are returned.
- * Data and control buffers are freed on return.
- */
-int
-sosend(so, addr, uio, top, control, flags)
-	register struct socket *so;
-	struct mbuf *addr;
-	struct uio *uio;
-	struct mbuf *top;
-	struct mbuf *control;
-	int flags;
-{
-	struct mbuf **mp;
-	register struct mbuf *m;
-	register long space, len, resid;
-	int clen = 0, error, s, dontroute, mlen;
-	int atomic = sosendallatonce(so) || top;
-
-	if (uio)
-		resid = uio->uio_resid;
-	else
-		resid = top->m_pkthdr.len;
-	/*
-	 * In theory resid should be unsigned.
-	 * However, space must be signed, as it might be less than 0
-	 * if we over-committed, and we must use a signed comparison
-	 * of space and resid.  On the other hand, a negative resid
-	 * causes us to loop sending 0-length segments to the protocol.
-	 *
-	 * Also check to make sure that MSG_EOR isn't used on SOCK_STREAM
-	 * type sockets since that's an error.
-	 */
-	if ((resid < 0) || (so->so_type == SOCK_STREAM && (flags & MSG_EOR))) {
-		error = EINVAL;
-		goto out;
-	}
-
-	dontroute =
-	    (flags & MSG_DONTROUTE) && (so->so_options & SO_DONTROUTE) == 0 &&
-	    (so->so_proto->pr_flags & PR_ATOMIC);
-	if (control)
-		clen = control->m_len;
-#define	snderr(errno)	{ error = errno; splx(s); goto release; }
-
-restart:
-	error = sblock(&so->so_snd, SBLOCKWAIT(flags));
-	if (error)
-		goto out;
-	do {
-		s = splnet();
-		if (so->so_state & SS_CANTSENDMORE)
-			snderr(EPIPE);
-		if (so->so_error) {
-			error = so->so_error;
-			so->so_error = 0;
-			splx(s);
-			goto release;
-		}
-		if ((so->so_state & SS_ISCONNECTED) == 0) {
-			/*
-			 * `sendto' and `sendmsg' is allowed on a connection-
-			 * based socket if it supports implied connect.
-			 * Return ENOTCONN if not connected and no address is
-			 * supplied.
-			 */
-			if ((so->so_proto->pr_flags & PR_CONNREQUIRED) &&
-			    (so->so_proto->pr_flags & PR_IMPLOPCL) == 0) {
-				if ((so->so_state & SS_ISCONFIRMING) == 0 &&
-				    !(resid == 0 && clen != 0))
-					snderr(ENOTCONN);
-			} else if (addr == 0)
-			    snderr(so->so_proto->pr_flags & PR_CONNREQUIRED ?
-				   ENOTCONN : EDESTADDRREQ);
-		}
-		space = sbspace(&so->so_snd);
-		if (flags & MSG_OOB)
-			space += 1024;
-		if ((atomic && resid > so->so_snd.sb_hiwat) ||
-		    clen > so->so_snd.sb_hiwat)
-			snderr(EMSGSIZE);
-		if (space < resid + clen && uio &&
-		    (atomic || space < so->so_snd.sb_lowat || space < clen)) {
-			if (so->so_state & SS_NBIO)
-				snderr(EWOULDBLOCK);
-			sbunlock(&so->so_snd);
-			error = sbwait(&so->so_snd);
-			splx(s);
-			if (error)
-				goto out;
-			goto restart;
-		}
-		splx(s);
-		mp = &top;
-		space -= clen;
-		do {
-		    if (uio == NULL) {
-			/*
-			 * Data is prepackaged in "top".
-			 */
-			resid = 0;
-			if (flags & MSG_EOR)
-				top->m_flags |= M_EOR;
-		    } else do {
-			if (top == 0) {
-				MGETHDR(m, M_WAIT, MT_DATA);
-				mlen = MHLEN;
-				m->m_pkthdr.len = 0;
-				m->m_pkthdr.rcvif = (struct ifnet *)0;
-			} else {
-				MGET(m, M_WAIT, MT_DATA);
-				mlen = MLEN;
-			}
-			if (resid >= MINCLSIZE) {
-				MCLGET(m, M_WAIT);
-				if ((m->m_flags & M_EXT) == 0)
-					goto nopages;
-				mlen = MCLBYTES;
-				len = min(min(mlen, resid), space);
-			} else {
-nopages:
-				len = min(min(mlen, resid), space);
-				/*
-				 * For datagram protocols, leave room
-				 * for protocol headers in first mbuf.
-				 */
-				if (atomic && top == 0 && len < mlen)
-					MH_ALIGN(m, len);
-			}
-			space -= len;
-			error = uiomove(mtod(m, caddr_t), (int)len, uio);
-			resid = uio->uio_resid;
-			m->m_len = len;
-			*mp = m;
-			top->m_pkthdr.len += len;
-			if (error)
-				goto release;
-			mp = &m->m_next;
-			if (resid <= 0) {
-				if (flags & MSG_EOR)
-					top->m_flags |= M_EOR;
-				break;
-			}
-		    } while (space > 0 && atomic);
-		    if (dontroute)
-			    so->so_options |= SO_DONTROUTE;
-		    s = splnet();				/* XXX */
-		    error = (*so->so_proto->pr_usrreqs->pru_send)(so,
-			(flags & MSG_OOB) ? PRUS_OOB :
-			/*
-			 * If the user set MSG_EOF, the protocol
-			 * understands this flag and nothing left to
-			 * send then use PRU_SEND_EOF instead of PRU_SEND.
-			 */
-			((flags & MSG_EOF) &&
-			 (so->so_proto->pr_flags & PR_IMPLOPCL) &&
-			 (resid <= 0)) ?
-				PRUS_EOF : 0,
-			top, addr, control);
-		    splx(s);
-		    if (dontroute)
-			    so->so_options &= ~SO_DONTROUTE;
-		    clen = 0;
-		    control = 0;
-		    top = 0;
-		    mp = &top;
-		    if (error)
-			goto release;
-		} while (resid && space > 0);
-	} while (resid);
-
-release:
-	sbunlock(&so->so_snd);
-out:
-	if (top)
-		m_freem(top);
-	if (control)
-		m_freem(control);
-	return (error);
-}
-
-/*
- * Implement receive operations on a socket.
- * We depend on the way that records are added to the sockbuf
- * by sbappend*.  In particular, each record (mbufs linked through m_next)
- * must begin with an address if the protocol so specifies,
- * followed by an optional mbuf or mbufs containing ancillary data,
- * and then zero or more mbufs of data.
- * In order to avoid blocking network interrupts for the entire time here,
- * we splx() while doing the actual copy to user space.
- * Although the sockbuf is locked, new data may still be appended,
- * and thus we must maintain consistency of the sockbuf during that time.
- *
- * The caller may receive the data as a single mbuf chain by supplying
- * an mbuf **mp0 for use in returning the chain.  The uio is then used
- * only for the count in uio_resid.
- */
-int
-soreceive(so, paddr, uio, mp0, controlp, flagsp)
-	register struct socket *so;
-	struct mbuf **paddr;
-	struct uio *uio;
-	struct mbuf **mp0;
-	struct mbuf **controlp;
-	int *flagsp;
-{
-	register struct mbuf *m, **mp;
-	register int flags, len, error, s, offset;
-	struct protosw *pr = so->so_proto;
-	struct mbuf *nextrecord;
-	int moff, type = 0;
-	int orig_resid = uio->uio_resid;
-
-	mp = mp0;
-	if (paddr)
-		*paddr = 0;
-	if (controlp)
-		*controlp = 0;
-	if (flagsp)
-		flags = *flagsp &~ MSG_EOR;
-	else
-		flags = 0;
-	if (flags & MSG_OOB) {
-		m = m_get(M_WAIT, MT_DATA);
-		error = (*pr->pr_usrreqs->pru_rcvoob)(so, m, flags & MSG_PEEK);
-		if (error)
-			goto bad;
-		do {
-			error = uiomove(mtod(m, caddr_t),
-			    (int) min(uio->uio_resid, m->m_len), uio);
-			m = m_free(m);
-		} while (uio->uio_resid && error == 0 && m);
-bad:
-		if (m)
-			m_freem(m);
-		return (error);
-	}
-	if (mp)
-		*mp = (struct mbuf *)0;
-	if (so->so_state & SS_ISCONFIRMING && uio->uio_resid)
-		(*pr->pr_usrreqs->pru_rcvd)(so, 0);
-
-restart:
-	error = sblock(&so->so_rcv, SBLOCKWAIT(flags));
-	if (error)
-		return (error);
-	s = splnet();
-
-	m = so->so_rcv.sb_mb;
-	/*
-	 * If we have less data than requested, block awaiting more
-	 * (subject to any timeout) if:
-	 *   1. the current count is less than the low water mark, or
-	 *   2. MSG_WAITALL is set, and it is possible to do the entire
-	 *	receive operation at once if we block (resid <= hiwat).
-	 *   3. MSG_DONTWAIT is not set
-	 * If MSG_WAITALL is set but resid is larger than the receive buffer,
-	 * we have to do the receive in sections, and thus risk returning
-	 * a short count if a timeout or signal occurs after we start.
-	 */
-	if (m == 0 || (((flags & MSG_DONTWAIT) == 0 &&
-	    so->so_rcv.sb_cc < uio->uio_resid) &&
-	    (so->so_rcv.sb_cc < so->so_rcv.sb_lowat ||
-	    ((flags & MSG_WAITALL) && uio->uio_resid <= so->so_rcv.sb_hiwat)) &&
-	    m->m_nextpkt == 0 && (pr->pr_flags & PR_ATOMIC) == 0)) {
-#ifdef DIAGNOSTIC
-		if (m == 0 && so->so_rcv.sb_cc)
-			panic("receive 1");
-#endif
-		if (so->so_error) {
-			if (m)
-				goto dontblock;
-			error = so->so_error;
-			if ((flags & MSG_PEEK) == 0)
-				so->so_error = 0;
-			goto release;
-		}
-		if (so->so_state & SS_CANTRCVMORE) {
-			if (m)
-				goto dontblock;
-			else
-				goto release;
-		}
-		for (; m; m = m->m_next)
-			if (m->m_type == MT_OOBDATA  || (m->m_flags & M_EOR)) {
-				m = so->so_rcv.sb_mb;
-				goto dontblock;
-			}
-		if ((so->so_state & (SS_ISCONNECTED|SS_ISCONNECTING)) == 0 &&
-		    (so->so_proto->pr_flags & PR_CONNREQUIRED)) {
-			error = ENOTCONN;
-			goto release;
-		}
-		if (uio->uio_resid == 0)
-			goto release;
-		if ((so->so_state & SS_NBIO) || (flags & MSG_DONTWAIT)) {
-			error = EWOULDBLOCK;
-			goto release;
-		}
-		sbunlock(&so->so_rcv);
-		error = sbwait(&so->so_rcv);
-		splx(s);
-		if (error)
-			return (error);
-		goto restart;
-	}
-dontblock:
-	nextrecord = m->m_nextpkt;
-	if (pr->pr_flags & PR_ADDR) {
-#ifdef DIAGNOSTIC
-		if (m->m_type != MT_SONAME)
-			panic("receive 1a");
-#endif
-		orig_resid = 0;
-		if (flags & MSG_PEEK) {
-			if (paddr)
-				*paddr = m_copy(m, 0, m->m_len);
-			m = m->m_next;
-		} else {
-			sbfree(&so->so_rcv, m);
-			if (paddr) {
-				*paddr = m;
-				so->so_rcv.sb_mb = m->m_next;
-				m->m_next = 0;
-				m = so->so_rcv.sb_mb;
-			} else {
-				MFREE(m, so->so_rcv.sb_mb);
-				m = so->so_rcv.sb_mb;
-			}
-		}
-	}
-	while (m && m->m_type == MT_CONTROL && error == 0) {
-		if (flags & MSG_PEEK) {
-			if (controlp)
-				*controlp = m_copy(m, 0, m->m_len);
-			m = m->m_next;
-		} else {
-			sbfree(&so->so_rcv, m);
-			if (controlp) {
-				if (pr->pr_domain->dom_externalize &&
-				    mtod(m, struct cmsghdr *)->cmsg_type ==
-				    SCM_RIGHTS)
-				   error = (*pr->pr_domain->dom_externalize)(m);
-				*controlp = m;
-				so->so_rcv.sb_mb = m->m_next;
-				m->m_next = 0;
-				m = so->so_rcv.sb_mb;
-			} else {
-				MFREE(m, so->so_rcv.sb_mb);
-				m = so->so_rcv.sb_mb;
-			}
-		}
-		if (controlp) {
-			orig_resid = 0;
-			controlp = &(*controlp)->m_next;
-		}
-	}
-	if (m) {
-		if ((flags & MSG_PEEK) == 0)
-			m->m_nextpkt = nextrecord;
-		type = m->m_type;
-		if (type == MT_OOBDATA)
-			flags |= MSG_OOB;
-	}
-	moff = 0;
-	offset = 0;
-	while (m && uio->uio_resid > 0 && error == 0) {
-		if (m->m_type == MT_OOBDATA) {
-			if (type != MT_OOBDATA)
-				break;
-		} else if (type == MT_OOBDATA)
-			break;
-#ifdef DIAGNOSTIC
-		else if (m->m_type != MT_DATA && m->m_type != MT_HEADER)
-			panic("receive 3");
-#endif
-		so->so_state &= ~SS_RCVATMARK;
-		len = uio->uio_resid;
-		if (so->so_oobmark && len > so->so_oobmark - offset)
-			len = so->so_oobmark - offset;
-		if (len > m->m_len - moff)
-			len = m->m_len - moff;
-		/*
-		 * If mp is set, just pass back the mbufs.
-		 * Otherwise copy them out via the uio, then free.
-		 * Sockbuf must be consistent here (points to current mbuf,
-		 * it points to next record) when we drop priority;
-		 * we must note any additions to the sockbuf when we
-		 * block interrupts again.
-		 */
-		if (mp == 0) {
-			splx(s);
-			error = uiomove(mtod(m, caddr_t) + moff, (int)len, uio);
-			s = splnet();
-			if (error)
-				goto release;
-		} else
-			uio->uio_resid -= len;
-		if (len == m->m_len - moff) {
-			if (m->m_flags & M_EOR)
-				flags |= MSG_EOR;
-			if (flags & MSG_PEEK) {
-				m = m->m_next;
-				moff = 0;
-			} else {
-				nextrecord = m->m_nextpkt;
-				sbfree(&so->so_rcv, m);
-				if (mp) {
-					*mp = m;
-					mp = &m->m_next;
-					so->so_rcv.sb_mb = m = m->m_next;
-					*mp = (struct mbuf *)0;
-				} else {
-					MFREE(m, so->so_rcv.sb_mb);
-					m = so->so_rcv.sb_mb;
-				}
-				if (m)
-					m->m_nextpkt = nextrecord;
-			}
-		} else {
-			if (flags & MSG_PEEK)
-				moff += len;
-			else {
-				if (mp)
-					*mp = m_copym(m, 0, len, M_WAIT);
-				m->m_data += len;
-				m->m_len -= len;
-				so->so_rcv.sb_cc -= len;
-			}
-		}
-		if (so->so_oobmark) {
-			if ((flags & MSG_PEEK) == 0) {
-				so->so_oobmark -= len;
-				if (so->so_oobmark == 0) {
-					so->so_state |= SS_RCVATMARK;
-					break;
-				}
-			} else {
-				offset += len;
-				if (offset == so->so_oobmark)
-					break;
-			}
-		}
-		if (flags & MSG_EOR)
-			break;
-		/*
-		 * If the MSG_WAITALL flag is set (for non-atomic socket),
-		 * we must not quit until "uio->uio_resid == 0" or an error
-		 * termination.  If a signal/timeout occurs, return
-		 * with a short count but without error.
-		 * Keep sockbuf locked against other readers.
-		 */
-		while (flags & MSG_WAITALL && m == 0 && uio->uio_resid > 0 &&
-		    !sosendallatonce(so) && !nextrecord) {
-			if (so->so_error || so->so_state & SS_CANTRCVMORE)
-				break;
-			error = sbwait(&so->so_rcv);
-			if (error) {
-				sbunlock(&so->so_rcv);
-				splx(s);
-				return (0);
-			}
-			m = so->so_rcv.sb_mb;
-			if (m)
-				nextrecord = m->m_nextpkt;
-		}
-	}
-
-	if (m && pr->pr_flags & PR_ATOMIC) {
-		flags |= MSG_TRUNC;
-		if ((flags & MSG_PEEK) == 0)
-			(void) sbdroprecord(&so->so_rcv);
-	}
-	if ((flags & MSG_PEEK) == 0) {
-		if (m == 0)
-			so->so_rcv.sb_mb = nextrecord;
-		if (pr->pr_flags & PR_WANTRCVD && so->so_pcb)
-			(*pr->pr_usrreqs->pru_rcvd)(so, flags);
-	}
-	if (orig_resid == uio->uio_resid && orig_resid &&
-	    (flags & MSG_EOR) == 0 && (so->so_state & SS_CANTRCVMORE) == 0) {
-		sbunlock(&so->so_rcv);
-		splx(s);
-		goto restart;
-	}
-
-	if (flagsp)
-		*flagsp |= flags;
-release:
-	sbunlock(&so->so_rcv);
-	splx(s);
-	return (error);
-}
-
-int
-soshutdown(so, how)
-	register struct socket *so;
-	register int how;
-{
-	register struct protosw *pr = so->so_proto;
-
-	how++;
-	if (how & FREAD)
-		sorflush(so);
-	if (how & FWRITE)
-		return ((*pr->pr_usrreqs->pru_shutdown)(so));
-	return (0);
-}
-
-void
-sorflush(so)
-	register struct socket *so;
-{
-	register struct sockbuf *sb = &so->so_rcv;
-	register struct protosw *pr = so->so_proto;
-	register int s;
-	struct sockbuf asb;
-
-	sb->sb_flags |= SB_NOINTR;
-	(void) sblock(sb, M_WAITOK);
-	s = splimp();
-	socantrcvmore(so);
-	sbunlock(sb);
-	asb = *sb;
-	bzero((caddr_t)sb, sizeof (*sb));
-	splx(s);
-	if (pr->pr_flags & PR_RIGHTS && pr->pr_domain->dom_dispose)
-		(*pr->pr_domain->dom_dispose)(asb.sb_mb);
-	sbrelease(&asb);
-}
-
-int
-sosetopt(so, level, optname, m0)
-	register struct socket *so;
-	int level, optname;
-	struct mbuf *m0;
-{
-	int error = 0;
-	register struct mbuf *m = m0;
-
-	if (level != SOL_SOCKET) {
-		if (so->so_proto && so->so_proto->pr_ctloutput)
-			return ((*so->so_proto->pr_ctloutput)
-				  (PRCO_SETOPT, so, level, optname, &m0));
-		error = ENOPROTOOPT;
-	} else {
-		switch (optname) {
-
-		case SO_LINGER:
-			if (m == NULL || m->m_len != sizeof (struct linger)) {
-				error = EINVAL;
-				goto bad;
-			}
-			so->so_linger = mtod(m, struct linger *)->l_linger;
-			/* fall thru... */
-
-		case SO_DEBUG:
-		case SO_KEEPALIVE:
-		case SO_DONTROUTE:
-		case SO_USELOOPBACK:
-		case SO_BROADCAST:
-		case SO_REUSEADDR:
-		case SO_REUSEPORT:
-		case SO_OOBINLINE:
-		case SO_TIMESTAMP:
-			if (m == NULL || m->m_len < sizeof (int)) {
-				error = EINVAL;
-				goto bad;
-			}
-			if (*mtod(m, int *))
-				so->so_options |= optname;
-			else
-				so->so_options &= ~optname;
-			break;
-
-		case SO_SNDBUF:
-		case SO_RCVBUF:
-		case SO_SNDLOWAT:
-		case SO_RCVLOWAT:
-		    {
-			int optval;
-
-			if (m == NULL || m->m_len < sizeof (int)) {
-				error = EINVAL;
-				goto bad;
-			}
-
-			/*
-			 * Values < 1 make no sense for any of these
-			 * options, so disallow them.
-			 */
-			optval = *mtod(m, int *);
-			if (optval < 1) {
-				error = EINVAL;
-				goto bad;
-			}
-
-			switch (optname) {
-
-			case SO_SNDBUF:
-			case SO_RCVBUF:
-				if (sbreserve(optname == SO_SNDBUF ?
-				    &so->so_snd : &so->so_rcv,
-				    (u_long) optval) == 0) {
-					error = ENOBUFS;
-					goto bad;
-				}
-				break;
-
-			/*
-			 * Make sure the low-water is never greater than
-			 * the high-water.
-			 */
-			case SO_SNDLOWAT:
-				so->so_snd.sb_lowat =
-				    (optval > so->so_snd.sb_hiwat) ?
-				    so->so_snd.sb_hiwat : optval;
-				break;
-			case SO_RCVLOWAT:
-				so->so_rcv.sb_lowat =
-				    (optval > so->so_rcv.sb_hiwat) ?
-				    so->so_rcv.sb_hiwat : optval;
-				break;
-			}
-			break;
-		    }
-
-		case SO_SNDTIMEO:
-		case SO_RCVTIMEO:
-		    {
-			struct timeval *tv;
-			short val;
-
-			if (m == NULL || m->m_len < sizeof (*tv)) {
-				error = EINVAL;
-				goto bad;
-			}
-			tv = mtod(m, struct timeval *);
-			if (tv->tv_sec > SHRT_MAX / hz - hz) {
-				error = EDOM;
-				goto bad;
-			}
-			val = tv->tv_sec * hz + tv->tv_usec / tick;
-
-			switch (optname) {
-
-			case SO_SNDTIMEO:
-				so->so_snd.sb_timeo = val;
-				break;
-			case SO_RCVTIMEO:
-				so->so_rcv.sb_timeo = val;
-				break;
-			}
-			break;
-		    }
-
-		case SO_PRIVSTATE:
-			/* we don't care what the parameter is... */
-			so->so_state &= ~SS_PRIV;
-			break;
-
-		default:
-			error = ENOPROTOOPT;
-			break;
-		}
-		if (error == 0 && so->so_proto && so->so_proto->pr_ctloutput) {
-			(void) ((*so->so_proto->pr_ctloutput)
-				  (PRCO_SETOPT, so, level, optname, &m0));
-			m = NULL;	/* freed by protocol */
-		}
-	}
-bad:
-	if (m)
-		(void) m_free(m);
-	return (error);
-}
-
-int
-sogetopt(so, level, optname, mp)
-	register struct socket *so;
-	int level, optname;
-	struct mbuf **mp;
-{
-	register struct mbuf *m;
-
-	if (level != SOL_SOCKET) {
-		if (so->so_proto && so->so_proto->pr_ctloutput) {
-			return ((*so->so_proto->pr_ctloutput)
-				  (PRCO_GETOPT, so, level, optname, mp));
-		} else
-			return (ENOPROTOOPT);
-	} else {
-		m = m_get(M_WAIT, MT_SOOPTS);
-		m->m_len = sizeof (int);
-
-		switch (optname) {
-
-		case SO_LINGER:
-			m->m_len = sizeof (struct linger);
-			mtod(m, struct linger *)->l_onoff =
-				so->so_options & SO_LINGER;
-			mtod(m, struct linger *)->l_linger = so->so_linger;
-			break;
-
-		case SO_USELOOPBACK:
-		case SO_DONTROUTE:
-		case SO_DEBUG:
-		case SO_KEEPALIVE:
-		case SO_REUSEADDR:
-		case SO_REUSEPORT:
-		case SO_BROADCAST:
-		case SO_OOBINLINE:
-		case SO_TIMESTAMP:
-			*mtod(m, int *) = so->so_options & optname;
-			break;
-
-		case SO_PRIVSTATE:
-			*mtod(m, int *) = so->so_state & SS_PRIV;
-			break;
-
-		case SO_TYPE:
-			*mtod(m, int *) = so->so_type;
-			break;
-
-		case SO_ERROR:
-			*mtod(m, int *) = so->so_error;
-			so->so_error = 0;
-			break;
-
-		case SO_SNDBUF:
-			*mtod(m, int *) = so->so_snd.sb_hiwat;
-			break;
-
-		case SO_RCVBUF:
-			*mtod(m, int *) = so->so_rcv.sb_hiwat;
-			break;
-
-		case SO_SNDLOWAT:
-			*mtod(m, int *) = so->so_snd.sb_lowat;
-			break;
-
-		case SO_RCVLOWAT:
-			*mtod(m, int *) = so->so_rcv.sb_lowat;
-			break;
-
-		case SO_SNDTIMEO:
-		case SO_RCVTIMEO:
-		    {
-			int val = (optname == SO_SNDTIMEO ?
-			     so->so_snd.sb_timeo : so->so_rcv.sb_timeo);
-
-			m->m_len = sizeof(struct timeval);
-			mtod(m, struct timeval *)->tv_sec = val / hz;
-			mtod(m, struct timeval *)->tv_usec =
-			    (val % hz) * tick;
-			break;
-		    }
-
-		default:
-			(void)m_free(m);
-			return (ENOPROTOOPT);
-		}
-		*mp = m;
-		return (0);
-	}
-}
-
-void
-sohasoutofband(so)
-	register struct socket *so;
-{
-#if 0	/* FIXME: For now we just ignore out of band data */
-	struct proc *p;
-
-	if (so->so_pgid < 0)
-		gsignal(-so->so_pgid, SIGURG);
-	else if (so->so_pgid > 0 && (p = pfind(so->so_pgid)) != 0)
-		psignal(p, SIGURG);
-	selwakeup(&so->so_rcv.sb_sel);
-#endif
-}
diff --git a/c/src/libnetworking/kern/uipc_socket2.c b/c/src/libnetworking/kern/uipc_socket2.c
deleted file mode 100644
index 0539d2c5f3..0000000000
--- a/c/src/libnetworking/kern/uipc_socket2.c
+++ /dev/null
@@ -1,965 +0,0 @@
-/*
- * This file has undergone several changes to reflect the
- * differences between the RTEMS and FreeBSD kernels.
- */
-
-/*
- * Copyright (c) 1982, 1986, 1988, 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)uipc_socket2.c	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/proc.h>
-#include <sys/file.h>
-#include <sys/buf.h>
-#include <sys/malloc.h>
-#include <sys/mbuf.h>
-#include <sys/protosw.h>
-#include <sys/stat.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/signalvar.h>
-#include <sys/sysctl.h>
-
-/*
- * Primitive routines for operating on sockets and socket buffers
- */
-
-u_long	sb_max = SB_MAX;		/* XXX should be static */
-SYSCTL_INT(_kern, KERN_MAXSOCKBUF, maxsockbuf, CTLFLAG_RW, &sb_max, 0, "")
-
-static	u_long sb_efficiency = 8;	/* parameter for sbreserve() */
-SYSCTL_INT(_kern, OID_AUTO, sockbuf_waste_factor, CTLFLAG_RW, &sb_efficiency,
-	   0, "");
-
-/*
- * Procedures to manipulate state flags of socket
- * and do appropriate wakeups.  Normal sequence from the
- * active (originating) side is that soisconnecting() is
- * called during processing of connect() call,
- * resulting in an eventual call to soisconnected() if/when the
- * connection is established.  When the connection is torn down
- * soisdisconnecting() is called during processing of disconnect() call,
- * and soisdisconnected() is called when the connection to the peer
- * is totally severed.  The semantics of these routines are such that
- * connectionless protocols can call soisconnected() and soisdisconnected()
- * only, bypassing the in-progress calls when setting up a ``connection''
- * takes no time.
- *
- * From the passive side, a socket is created with
- * two queues of sockets: so_q0 for connections in progress
- * and so_q for connections already made and awaiting user acceptance.
- * As a protocol is preparing incoming connections, it creates a socket
- * structure queued on so_q0 by calling sonewconn().  When the connection
- * is established, soisconnected() is called, and transfers the
- * socket structure to so_q, making it available to accept().
- *
- * If a socket is closed with sockets on either
- * so_q0 or so_q, these sockets are dropped.
- *
- * If higher level protocols are implemented in
- * the kernel, the wakeups done here will sometimes
- * cause software-interrupt process scheduling.
- */
-
-void
-soisconnecting(so)
-	register struct socket *so;
-{
-
-	so->so_state &= ~(SS_ISCONNECTED|SS_ISDISCONNECTING);
-	so->so_state |= SS_ISCONNECTING;
-}
-
-void
-soisconnected(so)
-	register struct socket *so;
-{
-	register struct socket *head = so->so_head;
-
-	so->so_state &= ~(SS_ISCONNECTING|SS_ISDISCONNECTING|SS_ISCONFIRMING);
-	so->so_state |= SS_ISCONNECTED;
-	if (head && (so->so_state & SS_INCOMP)) {
-		TAILQ_REMOVE(&head->so_incomp, so, so_list);
-		head->so_incqlen--;
-		so->so_state &= ~SS_INCOMP;
-		TAILQ_INSERT_TAIL(&head->so_comp, so, so_list);
-		so->so_state |= SS_COMP;
-		sorwakeup(head);
-		soconnwakeup(head);
-	} else {
-		soconnwakeup(so);
-		sorwakeup(so);
-		sowwakeup(so);
-	}
-}
-
-void
-soisdisconnecting(so)
-	register struct socket *so;
-{
-
-	so->so_state &= ~SS_ISCONNECTING;
-	so->so_state |= (SS_ISDISCONNECTING|SS_CANTRCVMORE|SS_CANTSENDMORE);
-	soconnwakeup(so);
-	sowwakeup(so);
-	sorwakeup(so);
-}
-
-void
-soisdisconnected(so)
-	register struct socket *so;
-{
-
-	so->so_state &= ~(SS_ISCONNECTING|SS_ISCONNECTED|SS_ISDISCONNECTING);
-	so->so_state |= (SS_CANTRCVMORE|SS_CANTSENDMORE);
-	soconnwakeup(so);
-	sowwakeup(so);
-	sorwakeup(so);
-}
-
-/*
- * Return a random connection that hasn't been serviced yet and
- * is eligible for discard.  There is a one in qlen chance that
- * we will return a null, saying that there are no dropable
- * requests.  In this case, the protocol specific code should drop
- * the new request.  This insures fairness.
- *
- * This may be used in conjunction with protocol specific queue
- * congestion routines.
- */
-struct socket *
-sodropablereq(head)
-	register struct socket *head;
-{
-	register struct socket *so;
-	unsigned int i, j, qlen, m;
-
-	static int rnd;
-	static long old_mono_secs;
-	static unsigned int cur_cnt, old_cnt;
-
-	if ((i = (m = rtems_bsdnet_seconds_since_boot()) - old_mono_secs) != 0) {
-		old_mono_secs = m;
-		old_cnt = cur_cnt / i;
-		cur_cnt = 0;
-	}
-
-	so = TAILQ_FIRST(&head->so_incomp);
-	if (!so)
-		return (so);
-
-	qlen = head->so_incqlen;
-	if (++cur_cnt > qlen || old_cnt > qlen) {
-		rnd = (314159 * rnd + 66329) & 0xffff;
-		j = ((qlen + 1) * rnd) >> 16;
-
-		while (j-- && so)
-		    so = TAILQ_NEXT(so, so_list);
-	}
-
-	return (so);
-}
-
-/*
- * When an attempt at a new connection is noted on a socket
- * which accepts connections, sonewconn is called.  If the
- * connection is possible (subject to space constraints, etc.)
- * then we allocate a new structure, propoerly linked into the
- * data structure of the original socket, and return this.
- * Connstatus may be 0, or SO_ISCONFIRMING, or SO_ISCONNECTED.
- *
- * Currently, sonewconn() is defined as sonewconn1() in socketvar.h
- * to catch calls that are missing the (new) second parameter.
- */
-struct socket *
-sonewconn1(head, connstatus)
-	register struct socket *head;
-	int connstatus;
-{
-	register struct socket *so;
-
-	if (head->so_qlen > 3 * head->so_qlimit / 2)
-		return ((struct socket *)0);
-	MALLOC(so, struct socket *, sizeof(*so), M_SOCKET, M_DONTWAIT);
-	if (so == NULL)
-		return ((struct socket *)0);
-	bzero((caddr_t)so, sizeof(*so));
-	so->so_head = head;
-	so->so_type = head->so_type;
-	so->so_options = head->so_options &~ SO_ACCEPTCONN;
-	so->so_linger = head->so_linger;
-	so->so_state = head->so_state | SS_NOFDREF;
-	so->so_proto = head->so_proto;
-	so->so_timeo = head->so_timeo;
-	so->so_pgid = head->so_pgid;
-	so->so_uid = head->so_uid;
-	(void) soreserve(so, head->so_snd.sb_hiwat, head->so_rcv.sb_hiwat);
-	if (connstatus) {
-		TAILQ_INSERT_TAIL(&head->so_comp, so, so_list);
-		so->so_state |= SS_COMP;
-	} else {
-		TAILQ_INSERT_TAIL(&head->so_incomp, so, so_list);
-		so->so_state |= SS_INCOMP;
-		head->so_incqlen++;
-	}
-	head->so_qlen++;
-	if ((*so->so_proto->pr_usrreqs->pru_attach)(so, 0)) {
-		if (so->so_state & SS_COMP) {
-			TAILQ_REMOVE(&head->so_comp, so, so_list);
-		} else {
-			TAILQ_REMOVE(&head->so_incomp, so, so_list);
-			head->so_incqlen--;
-		}
-		head->so_qlen--;
-		(void) free((caddr_t)so, M_SOCKET);
-		return ((struct socket *)0);
-	}
-	if (connstatus) {
-		sorwakeup(head);
-		soconnwakeup(head);
-		so->so_state |= connstatus;
-	}
-	return (so);
-}
-
-/*
- * Socantsendmore indicates that no more data will be sent on the
- * socket; it would normally be applied to a socket when the user
- * informs the system that no more data is to be sent, by the protocol
- * code (in case PRU_SHUTDOWN).  Socantrcvmore indicates that no more data
- * will be received, and will normally be applied to the socket by a
- * protocol when it detects that the peer will send no more data.
- * Data queued for reading in the socket may yet be read.
- */
-
-void
-socantsendmore(so)
-	struct socket *so;
-{
-
-	so->so_state |= SS_CANTSENDMORE;
-	sowwakeup(so);
-}
-
-void
-socantrcvmore(so)
-	struct socket *so;
-{
-
-	so->so_state |= SS_CANTRCVMORE;
-	sorwakeup(so);
-}
-
-/*
- * Socket buffer (struct sockbuf) utility routines.
- *
- * Each socket contains two socket buffers: one for sending data and
- * one for receiving data.  Each buffer contains a queue of mbufs,
- * information about the number of mbufs and amount of data in the
- * queue, and other fields allowing select() statements and notification
- * on data availability to be implemented.
- *
- * Data stored in a socket buffer is maintained as a list of records.
- * Each record is a list of mbufs chained together with the m_next
- * field.  Records are chained together with the m_nextpkt field. The upper
- * level routine soreceive() expects the following conventions to be
- * observed when placing information in the receive buffer:
- *
- * 1. If the protocol requires each message be preceded by the sender's
- *    name, then a record containing that name must be present before
- *    any associated data (mbuf's must be of type MT_SONAME).
- * 2. If the protocol supports the exchange of ``access rights'' (really
- *    just additional data associated with the message), and there are
- *    ``rights'' to be received, then a record containing this data
- *    should be present (mbuf's must be of type MT_RIGHTS).
- * 3. If a name or rights record exists, then it must be followed by
- *    a data record, perhaps of zero length.
- *
- * Before using a new socket structure it is first necessary to reserve
- * buffer space to the socket, by calling sbreserve().  This should commit
- * some of the available buffer space in the system buffer pool for the
- * socket (currently, it does nothing but enforce limits).  The space
- * should be released by calling sbrelease() when the socket is destroyed.
- */
-
-int
-soreserve(so, sndcc, rcvcc)
-	register struct socket *so;
-	u_long sndcc, rcvcc;
-{
-
-	if (sbreserve(&so->so_snd, sndcc) == 0)
-		goto bad;
-	if (sbreserve(&so->so_rcv, rcvcc) == 0)
-		goto bad2;
-	if (so->so_rcv.sb_lowat == 0)
-		so->so_rcv.sb_lowat = 1;
-	if (so->so_snd.sb_lowat == 0)
-		so->so_snd.sb_lowat = MCLBYTES;
-	if (so->so_snd.sb_lowat > so->so_snd.sb_hiwat)
-		so->so_snd.sb_lowat = so->so_snd.sb_hiwat;
-	return (0);
-bad2:
-	sbrelease(&so->so_snd);
-bad:
-	return (ENOBUFS);
-}
-
-/*
- * Allot mbufs to a sockbuf.
- * Attempt to scale mbmax so that mbcnt doesn't become limiting
- * if buffering efficiency is near the normal case.
- */
-int
-sbreserve(sb, cc)
-	struct sockbuf *sb;
-	u_long cc;
-{
-
-	if (cc > sb_max * MCLBYTES / (MSIZE + MCLBYTES))
-		return (0);
-	sb->sb_hiwat = cc;
-	sb->sb_mbmax = min(cc * sb_efficiency, sb_max);
-	if (sb->sb_lowat > sb->sb_hiwat)
-		sb->sb_lowat = sb->sb_hiwat;
-	return (1);
-}
-
-/*
- * Free mbufs held by a socket, and reserved mbuf space.
- */
-void
-sbrelease(sb)
-	struct sockbuf *sb;
-{
-
-	sbflush(sb);
-	sb->sb_hiwat = sb->sb_mbmax = 0;
-}
-
-/*
- * Routines to add and remove
- * data from an mbuf queue.
- *
- * The routines sbappend() or sbappendrecord() are normally called to
- * append new mbufs to a socket buffer, after checking that adequate
- * space is available, comparing the function sbspace() with the amount
- * of data to be added.  sbappendrecord() differs from sbappend() in
- * that data supplied is treated as the beginning of a new record.
- * To place a sender's address, optional access rights, and data in a
- * socket receive buffer, sbappendaddr() should be used.  To place
- * access rights and data in a socket receive buffer, sbappendrights()
- * should be used.  In either case, the new data begins a new record.
- * Note that unlike sbappend() and sbappendrecord(), these routines check
- * for the caller that there will be enough space to store the data.
- * Each fails if there is not enough space, or if it cannot find mbufs
- * to store additional information in.
- *
- * Reliable protocols may use the socket send buffer to hold data
- * awaiting acknowledgement.  Data is normally copied from a socket
- * send buffer in a protocol with m_copy for output to a peer,
- * and then removing the data from the socket buffer with sbdrop()
- * or sbdroprecord() when the data is acknowledged by the peer.
- */
-
-/*
- * Append mbuf chain m to the last record in the
- * socket buffer sb.  The additional space associated
- * the mbuf chain is recorded in sb.  Empty mbufs are
- * discarded and mbufs are compacted where possible.
- */
-void
-sbappend(sb, m)
-	struct sockbuf *sb;
-	struct mbuf *m;
-{
-	register struct mbuf *n;
-
-	if (m == 0)
-		return;
-	n = sb->sb_mb;
-	if (n) {
-		while (n->m_nextpkt)
-			n = n->m_nextpkt;
-		do {
-			if (n->m_flags & M_EOR) {
-				sbappendrecord(sb, m); /* XXXXXX!!!! */
-				return;
-			}
-		} while (n->m_next && (n = n->m_next));
-	}
-	sbcompress(sb, m, n);
-}
-
-#ifdef SOCKBUF_DEBUG
-void
-sbcheck(sb)
-	register struct sockbuf *sb;
-{
-	register struct mbuf *m;
-	register int len = 0, mbcnt = 0;
-
-	for (m = sb->sb_mb; m; m = m->m_next) {
-		len += m->m_len;
-		mbcnt += MSIZE;
-		if (m->m_flags & M_EXT) /*XXX*/ /* pretty sure this is bogus */
-			mbcnt += m->m_ext.ext_size;
-		if (m->m_nextpkt)
-			panic("sbcheck nextpkt");
-	}
-	if (len != sb->sb_cc || mbcnt != sb->sb_mbcnt) {
-		printf("cc %d != %d || mbcnt %d != %d\n", len, sb->sb_cc,
-		    mbcnt, sb->sb_mbcnt);
-		panic("sbcheck");
-	}
-}
-#endif
-
-/*
- * As above, except the mbuf chain
- * begins a new record.
- */
-void
-sbappendrecord(sb, m0)
-	register struct sockbuf *sb;
-	register struct mbuf *m0;
-{
-	register struct mbuf *m;
-
-	if (m0 == 0)
-		return;
-	m = sb->sb_mb;
-	if (m)
-		while (m->m_nextpkt)
-			m = m->m_nextpkt;
-	/*
-	 * Put the first mbuf on the queue.
-	 * Note this permits zero length records.
-	 */
-	sballoc(sb, m0);
-	if (m)
-		m->m_nextpkt = m0;
-	else
-		sb->sb_mb = m0;
-	m = m0->m_next;
-	m0->m_next = 0;
-	if (m && (m0->m_flags & M_EOR)) {
-		m0->m_flags &= ~M_EOR;
-		m->m_flags |= M_EOR;
-	}
-	sbcompress(sb, m, m0);
-}
-
-/*
- * As above except that OOB data
- * is inserted at the beginning of the sockbuf,
- * but after any other OOB data.
- */
-void
-sbinsertoob(sb, m0)
-	register struct sockbuf *sb;
-	register struct mbuf *m0;
-{
-	register struct mbuf *m;
-	register struct mbuf **mp;
-
-	if (m0 == 0)
-		return;
-	for (mp = &sb->sb_mb; *mp ; mp = &((*mp)->m_nextpkt)) {
-	    m = *mp;
-	    again:
-		switch (m->m_type) {
-
-		case MT_OOBDATA:
-			continue;		/* WANT next train */
-
-		case MT_CONTROL:
-			m = m->m_next;
-			if (m)
-				goto again;	/* inspect THIS train further */
-		}
-		break;
-	}
-	/*
-	 * Put the first mbuf on the queue.
-	 * Note this permits zero length records.
-	 */
-	sballoc(sb, m0);
-	m0->m_nextpkt = *mp;
-	*mp = m0;
-	m = m0->m_next;
-	m0->m_next = 0;
-	if (m && (m0->m_flags & M_EOR)) {
-		m0->m_flags &= ~M_EOR;
-		m->m_flags |= M_EOR;
-	}
-	sbcompress(sb, m, m0);
-}
-
-/*
- * Append address and data, and optionally, control (ancillary) data
- * to the receive queue of a socket.  If present,
- * m0 must include a packet header with total length.
- * Returns 0 if no space in sockbuf or insufficient mbufs.
- */
-int
-sbappendaddr(sb, asa, m0, control)
-	register struct sockbuf *sb;
-	struct sockaddr *asa;
-	struct mbuf *m0, *control;
-{
-	register struct mbuf *m, *n;
-	int space = asa->sa_len;
-
-if (m0 && (m0->m_flags & M_PKTHDR) == 0)
-panic("sbappendaddr");
-	if (m0)
-		space += m0->m_pkthdr.len;
-	for (n = control; n; n = n->m_next) {
-		space += n->m_len;
-		if (n->m_next == 0)	/* keep pointer to last control buf */
-			break;
-	}
-	if (space > sbspace(sb))
-		return (0);
-	if (asa->sa_len > MLEN)
-		return (0);
-	MGET(m, M_DONTWAIT, MT_SONAME);
-	if (m == 0)
-		return (0);
-	m->m_len = asa->sa_len;
-	bcopy((caddr_t)asa, mtod(m, caddr_t), asa->sa_len);
-	if (n)
-		n->m_next = m0;		/* concatenate data to control */
-	else
-		control = m0;
-	m->m_next = control;
-	for (n = m; n; n = n->m_next)
-		sballoc(sb, n);
-	n = sb->sb_mb;
-	if (n) {
-		while (n->m_nextpkt)
-			n = n->m_nextpkt;
-		n->m_nextpkt = m;
-	} else
-		sb->sb_mb = m;
-	return (1);
-}
-
-int
-sbappendcontrol(sb, m0, control)
-	struct sockbuf *sb;
-	struct mbuf *control, *m0;
-{
-	register struct mbuf *m, *n;
-	int space = 0;
-
-	if (control == 0)
-		panic("sbappendcontrol");
-	for (m = control; ; m = m->m_next) {
-		space += m->m_len;
-		if (m->m_next == 0)
-			break;
-	}
-	n = m;			/* save pointer to last control buffer */
-	for (m = m0; m; m = m->m_next)
-		space += m->m_len;
-	if (space > sbspace(sb))
-		return (0);
-	n->m_next = m0;			/* concatenate data to control */
-	for (m = control; m; m = m->m_next)
-		sballoc(sb, m);
-	n = sb->sb_mb;
-	if (n) {
-		while (n->m_nextpkt)
-			n = n->m_nextpkt;
-		n->m_nextpkt = control;
-	} else
-		sb->sb_mb = control;
-	return (1);
-}
-
-/*
- * Compress mbuf chain m into the socket
- * buffer sb following mbuf n.  If n
- * is null, the buffer is presumed empty.
- */
-void
-sbcompress(sb, m, n)
-	register struct sockbuf *sb;
-	register struct mbuf *m, *n;
-{
-	register int eor = 0;
-	register struct mbuf *o;
-
-	while (m) {
-		eor |= m->m_flags & M_EOR;
-		if (m->m_len == 0 &&
-		    (eor == 0 ||
-		     (((o = m->m_next) || (o = n)) &&
-		      o->m_type == m->m_type))) {
-			m = m_free(m);
-			continue;
-		}
-		if (n && (n->m_flags & (M_EXT | M_EOR)) == 0 &&
-		    (n->m_data + n->m_len + m->m_len) < &n->m_dat[MLEN] &&
-		    n->m_type == m->m_type) {
-			bcopy(mtod(m, caddr_t), mtod(n, caddr_t) + n->m_len,
-			    (unsigned)m->m_len);
-			n->m_len += m->m_len;
-			sb->sb_cc += m->m_len;
-			m = m_free(m);
-			continue;
-		}
-		if (n)
-			n->m_next = m;
-		else
-			sb->sb_mb = m;
-		sballoc(sb, m);
-		n = m;
-		m->m_flags &= ~M_EOR;
-		m = m->m_next;
-		n->m_next = 0;
-	}
-	if (eor) {
-		if (n)
-			n->m_flags |= eor;
-		else
-			printf("semi-panic: sbcompress\n");
-	}
-}
-
-/*
- * Free all mbufs in a sockbuf.
- * Check that all resources are reclaimed.
- */
-void
-sbflush(sb)
-	register struct sockbuf *sb;
-{
-
-	if (sb->sb_flags & SB_LOCK)
-		panic("sbflush");
-	while (sb->sb_mbcnt)
-		sbdrop(sb, (int)sb->sb_cc);
-	if (sb->sb_cc || sb->sb_mb)
-		panic("sbflush 2");
-}
-
-/*
- * Drop data from (the front of) a sockbuf.
- */
-void
-sbdrop(sb, len)
-	register struct sockbuf *sb;
-	register int len;
-{
-	register struct mbuf *m, *mn;
-	struct mbuf *next;
-
-	next = (m = sb->sb_mb) ? m->m_nextpkt : 0;
-	while (len > 0) {
-		if (m == 0) {
-			if (next == 0)
-				panic("sbdrop");
-			m = next;
-			next = m->m_nextpkt;
-			continue;
-		}
-		if (m->m_len > len) {
-			m->m_len -= len;
-			m->m_data += len;
-			sb->sb_cc -= len;
-			break;
-		}
-		len -= m->m_len;
-		sbfree(sb, m);
-		MFREE(m, mn);
-		m = mn;
-	}
-	while (m && m->m_len == 0) {
-		sbfree(sb, m);
-		MFREE(m, mn);
-		m = mn;
-	}
-	if (m) {
-		sb->sb_mb = m;
-		m->m_nextpkt = next;
-	} else
-		sb->sb_mb = next;
-}
-
-/*
- * Drop a record off the front of a sockbuf
- * and move the next record to the front.
- */
-void
-sbdroprecord(sb)
-	register struct sockbuf *sb;
-{
-	register struct mbuf *m, *mn;
-
-	m = sb->sb_mb;
-	if (m) {
-		sb->sb_mb = m->m_nextpkt;
-		do {
-			sbfree(sb, m);
-			MFREE(m, mn);
-			m = mn;
-		} while (m);
-	}
-}
-
-/*
- * Create a "control" mbuf containing the specified data
- * with the specified type for presentation on a socket buffer.
- */
-struct mbuf *
-sbcreatecontrol(p, size, type, level)
-	caddr_t p;
-	register int size;
-	int type, level;
-{
-	register struct cmsghdr *cp;
-	struct mbuf *m;
-
-	if ((m = m_get(M_DONTWAIT, MT_CONTROL)) == NULL)
-		return ((struct mbuf *) NULL);
-	cp = mtod(m, struct cmsghdr *);
-	/* XXX check size? */
-	(void)memcpy(CMSG_DATA(cp), p, size);
-	size += sizeof(*cp);
-	m->m_len = size;
-	cp->cmsg_len = size;
-	cp->cmsg_level = level;
-	cp->cmsg_type = type;
-	return (m);
-}
-
-#ifdef PRU_OLDSTYLE
-/*
- * The following routines mediate between the old-style `pr_usrreq'
- * protocol implementations and the new-style `struct pr_usrreqs'
- * calling convention.
- */
-
-/* syntactic sugar */
-#define	nomb	(struct mbuf *)0
-
-static int
-old_abort(struct socket *so)
-{
-	return so->so_proto->pr_ousrreq(so, PRU_ABORT, nomb, nomb, nomb);
-}
-
-static int
-old_accept(struct socket *so, struct mbuf *nam)
-{
-	return so->so_proto->pr_ousrreq(so, PRU_ACCEPT, nomb,  nam, nomb);
-}
-
-static int
-old_attach(struct socket *so, int proto)
-{
-	return so->so_proto->pr_ousrreq(so, PRU_ATTACH, nomb,
-				       (struct mbuf *)proto, /* XXX */
-				       nomb);
-}
-
-static int
-old_bind(struct socket *so, struct mbuf *nam)
-{
-	return so->so_proto->pr_ousrreq(so, PRU_BIND, nomb, nam, nomb);
-}
-
-static int
-old_connect(struct socket *so, struct mbuf *nam)
-{
-	return so->so_proto->pr_ousrreq(so, PRU_CONNECT, nomb, nam, nomb);
-}
-
-static int
-old_connect2(struct socket *so1, struct socket *so2)
-{
-	return so1->so_proto->pr_ousrreq(so1, PRU_CONNECT2, nomb, 
-				       (struct mbuf *)so2, nomb);
-}
-
-static int
-old_control(struct socket *so, int cmd, caddr_t data, struct ifnet *ifp)
-{
-	return so->so_proto->pr_ousrreq(so, PRU_CONTROL, (struct mbuf *)cmd, 
-				       (struct mbuf *)data, 
-				       (struct mbuf *)ifp);
-}
-
-static int
-old_detach(struct socket *so)
-{
-	return so->so_proto->pr_ousrreq(so, PRU_DETACH, nomb, nomb, nomb);
-}
-
-static int
-old_disconnect(struct socket *so)
-{
-	return so->so_proto->pr_ousrreq(so, PRU_DISCONNECT, nomb, nomb, nomb);
-}
-
-static int
-old_listen(struct socket *so)
-{
-	return so->so_proto->pr_ousrreq(so, PRU_LISTEN, nomb, nomb, nomb);
-}
-
-static int
-old_peeraddr(struct socket *so, struct mbuf *nam)
-{
-	return so->so_proto->pr_ousrreq(so, PRU_PEERADDR, nomb, nam, nomb);
-}
-
-static int
-old_rcvd(struct socket *so, int flags)
-{
-	return so->so_proto->pr_ousrreq(so, PRU_RCVD, nomb,
-				       (struct mbuf *)flags, /* XXX */
-				       nomb);
-}
-
-static int
-old_rcvoob(struct socket *so, struct mbuf *m, int flags)
-{
-	return so->so_proto->pr_ousrreq(so, PRU_RCVOOB, m,
-				       (struct mbuf *)flags, /* XXX */
-				       nomb);
-}
-
-static int
-old_send(struct socket *so, int flags, struct mbuf *m, struct mbuf *addr,
-	 struct mbuf *control)
-{
-	int req;
-
-	if (flags & PRUS_OOB) {
-		req = PRU_SENDOOB;
-	} else if(flags & PRUS_EOF) {
-		req = PRU_SEND_EOF;
-	} else {
-		req = PRU_SEND;
-	}
-	return so->so_proto->pr_ousrreq(so, req, m, addr, control);
-}
-
-static int
-old_sense(struct socket *so, struct stat *sb)
-{
-	return so->so_proto->pr_ousrreq(so, PRU_SENSE, (struct mbuf *)sb,
-				       nomb, nomb);
-}
-
-static int
-old_shutdown(struct socket *so)
-{
-	return so->so_proto->pr_ousrreq(so, PRU_SHUTDOWN, nomb, nomb, nomb);
-}
-
-static int
-old_sockaddr(struct socket *so, struct mbuf *nam)
-{
-	return so->so_proto->pr_ousrreq(so, PRU_SOCKADDR, nomb, nam, nomb);
-}
-
-struct pr_usrreqs pru_oldstyle = {
-	old_abort, old_accept, old_attach, old_bind, old_connect,
-	old_connect2, old_control, old_detach, old_disconnect,
-	old_listen, old_peeraddr, old_rcvd, old_rcvoob, old_send,
-	old_sense, old_shutdown, old_sockaddr
-};
-
-#endif /* PRU_OLDSTYLE */
-
-/*
- * Some routines that return EOPNOTSUPP for entry points that are not
- * supported by a protocol.  Fill in as needed.
- */
-int
-pru_accept_notsupp(struct socket *so, struct mbuf *nam)
-{
-	return EOPNOTSUPP;
-}
-
-int
-pru_connect2_notsupp(struct socket *so1, struct socket *so2)
-{
-	return EOPNOTSUPP;
-}
-
-int
-pru_control_notsupp(struct socket *so, int cmd, caddr_t data,
-		    struct ifnet *ifp)
-{
-	return EOPNOTSUPP;
-}
-
-int
-pru_listen_notsupp(struct socket *so)
-{
-	return EOPNOTSUPP;
-}
-
-int
-pru_rcvd_notsupp(struct socket *so, int flags)
-{
-	return EOPNOTSUPP;
-}
-
-int
-pru_rcvoob_notsupp(struct socket *so, struct mbuf *m, int flags)
-{
-	return EOPNOTSUPP;
-}
-
-/*
- * This isn't really a ``null'' operation, but it's the default one
- * and doesn't do anything destructive.
- */
-int
-pru_sense_null(struct socket *so, struct stat *sb)
-{
-	sb->st_blksize = so->so_snd.sb_hiwat;
-	return 0;
-}
-
diff --git a/c/src/libnetworking/lib/Makefile.in b/c/src/libnetworking/lib/Makefile.in
deleted file mode 100644
index 869818fadf..0000000000
--- a/c/src/libnetworking/lib/Makefile.in
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-LIBNAME=lib.a
-LIB=${ARCH}/${LIBNAME}
-
-# C and C++ source names, if any, go here -- minus the .c or .cc
-C_PIECES=getprotoby syslog tftpDriver
-C_FILES=$(C_PIECES:%=%.c)
-C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
-
-SRCS=$(C_FILES)
-OBJS=$(C_O_FILES)
-
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/lib.cfg
-
-#
-# Add local stuff here using +=
-#
-
-DEFINES  += -DNOPOLL -DNOSELECT
-CPPFLAGS +=
-CFLAGS   +=
-
-#
-# Add your list of files to delete here.  The config files
-#  already know how to delete some stuff, so you may want
-#  to just run 'make clean' first to see what gets missed.
-#  'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS += $(LIB)
-CLOBBER_ADDITIONS +=
-
-all:	${ARCH} $(LIB)
-
-$(LIB): $(SRCS) ${OBJS}
-	$(make-library)
diff --git a/c/src/libnetworking/lib/README b/c/src/libnetworking/lib/README
deleted file mode 100644
index 998bd5e708..0000000000
--- a/c/src/libnetworking/lib/README
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-#  $Id$
-#
-
-Sources from application-level (as opposed to kernel-level) libraries.
diff --git a/c/src/libnetworking/lib/getprotoby.c b/c/src/libnetworking/lib/getprotoby.c
deleted file mode 100644
index fc8de6e402..0000000000
--- a/c/src/libnetworking/lib/getprotoby.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- *  $Id$
- */
-
-#include <netdb.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-
-static const struct protoent prototab[] = {
-					{ "ip",    NULL, IPPROTO_IP },
-					{ "icmp",  NULL, IPPROTO_ICMP },
-					{ "tcp",   NULL, IPPROTO_TCP },
-					{ "udp",   NULL, IPPROTO_UDP },
-					};
-
-/*
- * Dummy version of BSD getprotobyname()
- */
-struct protoent *
-getprotobyname (const char *name)
-{
-	int i;
-
-	for (i = 0 ; i < (sizeof prototab / sizeof prototab[0]) ; i++) {
-		if (strcmp (name, prototab[i].p_name) == 0)
-			return (struct protoent *) &prototab[i];
-	}
-	return NULL;
-}
-
-/*
- * Dummy version of BSD getprotobynumber()
- */
-struct protoent *
-getprotobynumber (int proto)
-{
-	int i;
-
-	for (i = 0 ; i < (sizeof prototab / sizeof prototab[0]) ; i++) {
-		if (proto == prototab[i].p_proto)
-			return (struct protoent *) &prototab[i];
-	}
-	return NULL;
-}
diff --git a/c/src/libnetworking/lib/syslog.c b/c/src/libnetworking/lib/syslog.c
deleted file mode 100644
index 0bb15bc78e..0000000000
--- a/c/src/libnetworking/lib/syslog.c
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * RTEMS version of syslog and associated routines
- *
- * $Id$
- */
-
-#include <rtems.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <errno.h>
-#include <syslog.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-
-#include <unistd.h>
-
-static int LogStatus = LOG_CONS;
-static const char *LogTag = "syslog";
-static int LogFacility = LOG_USER;
-static int LogMask = 0xff;
-
-static int LogFd = -1;
-static rtems_id LogSemaphore;
-extern struct in_addr rtems_bsdnet_log_host_address;
-
-#define SYSLOG_PORT	514
-
-void
-syslog (int pri, const char *fmt, ...)
-{
-	va_list ap;
-
-	va_start (ap, fmt);
-	vsyslog (pri, fmt, ap);
-	va_end (ap);
-}
-
-/*
- * FIXME: Should cbuf be static?  It could be if we put the mutex
- *        around the entire body of this routine.  Then we wouldn't
- *        have to worry about blowing stacks with a local variable
- *        that large.  Could make cbuf bigger, too.
- */
-void
-vsyslog (int pri, const char *fmt, va_list ap)
-{
-	int cnt;
-	char *cp;
-	char *msgp, cbuf[200];
-	int sent;
-
-	if (pri & ~(LOG_PRIMASK|LOG_FACMASK)) {
-		syslog (LOG_ERR|LOG_CONS|LOG_PERROR|LOG_PID,
-								"syslog: unknown facility/priority: %#x", pri);
-		pri &= LOG_PRIMASK|LOG_FACMASK;
-	}
-
-	if (!LOG_MASK(LOG_PRI(pri)) & LogMask)
-		return;
-
-	if ((pri & LOG_FACMASK) == 0)
-		pri |= LogFacility;
-
-	cnt = sprintf (cbuf, "<%d>", pri);
-	cp = msgp = cbuf + cnt;
-	if (LogTag) {
-		const char *lp = LogTag;
-		while ((*cp = *lp++) != '\0')
-			cp++;
-	}
-	if (LogStatus & LOG_PID) {
-		rtems_id tid;
-		rtems_task_ident (RTEMS_SELF, 0, &tid);
-		cnt = sprintf (cp, "[%#lx]", (unsigned long)tid);
-		cp += cnt;
-	}
-	if (LogTag) {
-		*cp++ = ':';
-		*cp++ = ' ';
-	}
-	cnt = vsprintf (cp, fmt, ap);
-	cnt += cp - cbuf;
-	if (cbuf[cnt-1] == '\n')
-		cbuf[--cnt] = '\0';
-
-	if (LogStatus & LOG_PERROR)
-		printf ("%s\n", cbuf);
-
-	/*
-	 * Grab the mutex
-	 */
-	sent = 0;
-	if ((rtems_bsdnet_log_host_address.s_addr != INADDR_ANY)
-	 && (LogFd >= 0)
-	 && (rtems_semaphore_obtain (LogSemaphore, RTEMS_WAIT, RTEMS_NO_TIMEOUT) == RTEMS_SUCCESSFUL)) {
-		/*
-		 * Set the destination address/port
-		 */
-		struct sockaddr_in farAddress;
-		farAddress.sin_family = AF_INET;
-		farAddress.sin_port = htons (SYSLOG_PORT);
-		farAddress.sin_addr = rtems_bsdnet_log_host_address;
-		memset (farAddress.sin_zero, '\0', sizeof farAddress.sin_zero);
-
-		/*
-		 * Send the message
-		 */
-		if (sendto (LogFd, cbuf, cnt, 0, (struct sockaddr *)&farAddress, sizeof farAddress) >= 0)
-			sent = 1;
-		rtems_semaphore_release (LogSemaphore);
-	}
-	if (!sent && (LogStatus & LOG_CONS) && !(LogStatus & LOG_PERROR))
-		printf ("%s\n", msgp);
-}
-
-void
-openlog (const char *ident, int logstat, int logfac)
-{
-	rtems_status_code sc;
-	struct sockaddr_in myAddress;
-
-	if (ident != NULL)
-		LogTag = ident;
-	LogStatus = logstat;
-	if (logfac != 0 && (logfac & ~LOG_FACMASK) == 0)
-		LogFacility = logfac;
-
-	/*
-	 * Create the socket
-	 */
-	if ((LogFd = socket (AF_INET, SOCK_DGRAM, 0)) < 0) {
-		printf ("Can't create syslog socket: %d\n", errno);
-		return;
-	}
-
-	/*
-	 * Bind socket to name
-	 */
-	myAddress.sin_family = AF_INET;
-	myAddress.sin_addr.s_addr = INADDR_ANY;
-	myAddress.sin_port = 0;
-	memset (myAddress.sin_zero, '\0', sizeof myAddress.sin_zero);
-	if (bind (LogFd, (struct sockaddr *)&myAddress, sizeof (myAddress)) < 0) {
-		close (LogFd);
-		LogFd = -1;
-		printf ("Can't bind syslog socket: %d\n", errno);
-		return;
-	}
-
-	/*
-	 * Create the mutex
-	 */
-	sc = rtems_semaphore_create (rtems_build_name('s', 'L', 'o', 'g'),
-					1,
-					RTEMS_PRIORITY |
-						RTEMS_BINARY_SEMAPHORE |
-						RTEMS_INHERIT_PRIORITY |
-						RTEMS_NO_PRIORITY_CEILING |
-						RTEMS_LOCAL,
-					0,
-					&LogSemaphore);
-	if (sc != RTEMS_SUCCESSFUL) {
-		printf ("Can't create syslog seamphore: %d\n", sc);
-		close (LogFd);
-		LogFd = -1;
-	}
-}
-
-void
-closelog(void)
-{
-	if (LogFd >= 0) {
-		close (LogFd);
-		LogFd = -1;
-		rtems_semaphore_delete (LogSemaphore);
-	}
-}
-
-int
-setlogmask (int pmask)
-{
-	int omask;
-
-	omask = LogMask;
-	if (pmask != 0)
-		LogMask = pmask;
-	return (omask);
-}
diff --git a/c/src/libnetworking/lib/tftpDriver.c b/c/src/libnetworking/lib/tftpDriver.c
deleted file mode 100644
index cf75623580..0000000000
--- a/c/src/libnetworking/lib/tftpDriver.c
+++ /dev/null
@@ -1,609 +0,0 @@
-/*
- * Trivial File Transfer Protocol (RFC 1350)
- *
- * Transfer file to/from remote host
- *
- * W. Eric Norum
- * Saskatchewan Accelerator Laboratory
- * University of Saskatchewan
- * Saskatoon, Saskatchewan, CANADA
- * eric@skatter.usask.ca
- *
- *  $Id$
- */
-
-#include <stdio.h>
-#include <errno.h>
-#include <malloc.h>
-#include <string.h>
-#include <unistd.h>
-#include <rtems.h>
-#include <rtems/libio.h>
-#include <rtems/rtems_bsdnet.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-/*
- * Range of UDP ports to try
- */
-#define UDP_PORT_BASE	3180
-
-/*
- * Pathname prefix
- */
-#define TFTP_PATHNAME_PREFIX	"/TFTP/"
-
-/*
- * Default limits
- */
-#define PACKET_REPLY_MILLISECONDS	6000
-#define OPEN_RETRY_LIMIT	10
-#define IO_RETRY_LIMIT		10
-
-/*
- * TFTP opcodes
- */
-#define TFTP_OPCODE_RRQ		1
-#define TFTP_OPCODE_WRQ		2
-#define TFTP_OPCODE_DATA	3
-#define TFTP_OPCODE_ACK		4
-#define TFTP_OPCODE_ERROR	5
-
-/*
- * Largest data transfer
- */
-#define TFTP_BUFSIZE	512
-
-/*
- * Packets transferred between machines
- */
-union tftpPacket {
-	/*
-	 * RRQ/WRQ packet
-	 */
-	struct tftpRWRQ {
-		rtems_unsigned16	opcode;
-		char			filename_mode[TFTP_BUFSIZE];
-	} tftpRWRQ;
-
-	/*
-	 * DATA packet
-	 */
-	struct tftpDATA {
-		rtems_unsigned16	opcode;
-		rtems_unsigned16	blocknum;
-		rtems_unsigned8		data[TFTP_BUFSIZE];
-	} tftpDATA;
-
-	/*
-	 * ACK packet
-	 */
-	struct tftpACK {
-		rtems_unsigned16	opcode;
-		rtems_unsigned16	blocknum;
-	} tftpACK;
-
-	/*
-	 * ERROR packet
-	 */
-	struct tftpERROR {
-		rtems_unsigned16	opcode;
-		rtems_unsigned16	errorCode;
-		char			errorMessage[TFTP_BUFSIZE];
-	} tftpERROR;
-};
-
-/*
- * State of each TFTP stream
- */
-struct tftpStream {
-	/*
-	 * Buffer for storing most recently-received packet
-	 */
-	union tftpPacket	pkbuf;
-
-	/*
-	 * Last block number received
-	 */
-	rtems_unsigned16	blocknum;
-
-	/*
-	 * Data transfer socket
-	 */
-	int			socket;
-	struct sockaddr_in	myAddress;
-	struct sockaddr_in	farAddress;
-
-	/*
-	 * Indices into buffer
-	 */
-	int	nleft;
-	int	nused;
-
-	/*
-	 * Flags
-	 */
-	int	firstReply;
-	int	eof;
-};
-
-/*
- * Number of streams open at the same time
- */
-static rtems_id tftp_mutex;
-static int nStreams;
-static struct tftpStream ** volatile tftpStreams;
-
-/*
- * Initialize the TFTP driver
- */
-rtems_device_driver rtems_tftp_initialize(
-  rtems_device_major_number major,
-  rtems_device_minor_number minor,
-  void *pargp
-)
-{
-	rtems_status_code sc;
-
-	sc = rtems_semaphore_create (rtems_build_name('T', 'F', 'T', 'P'),
-					1,
-					RTEMS_FIFO |
-						RTEMS_BINARY_SEMAPHORE |
-						RTEMS_NO_INHERIT_PRIORITY |
-						RTEMS_NO_PRIORITY_CEILING |
-						RTEMS_LOCAL,
-					0,
-					&tftp_mutex);
-	if (sc != RTEMS_SUCCESSFUL)
-		return sc;
-	rtems_io_register_name (TFTP_PATHNAME_PREFIX, major, minor);
-	return RTEMS_SUCCESSFUL;
-}
-
-/*
- * Set error message
- * This RTEMS/UNIX error mapping needs to be fixed!
- */
-static void
-tftpSetErrno (struct tftpStream *tp)
-{
-	unsigned int tftpError;
-	static const int errorMap[] = {
-		0,
-		ENOENT,
-		EPERM,
-		ENOSPC,
-		EINVAL,
-		ENXIO,
-		EEXIST,
-		ESRCH,
-		0,
-	};
-
-	tftpError = ntohs (tp->pkbuf.tftpERROR.errorCode);
-	if (tftpError < (sizeof errorMap / sizeof errorMap[0]))
-		errno = errorMap[tftpError];
-	else
-		errno = 1000 + tftpError;
-}
-
-/*
- * Send a message to make the other end shut up
- */
-static void
-sendStifle (struct tftpStream *tp, struct sockaddr_in *to)
-{
-	int len;
-
-	/*
-	 * Create the error packet (Unknown transfer ID).
-	 */
-	tp->pkbuf.tftpERROR.opcode = htons (TFTP_OPCODE_ERROR);
-	tp->pkbuf.tftpERROR.errorCode = htons (5);
-	len = sizeof tp->pkbuf.tftpERROR.opcode +
-				sizeof tp->pkbuf.tftpERROR.errorCode + 1;
-	len += sprintf (tp->pkbuf.tftpERROR.errorMessage, "GO AWAY"); 
-
-	/*
-	 * Send it
-	 */
-	sendto (tp->socket, (char *)&tp->pkbuf, len, 0,
-					(struct sockaddr *)to, sizeof *to);
-}
-
-/*
- * Wait for a data packet
- */
-static int
-getPacket (struct tftpStream *tp)
-{
-	int len;
-	struct timeval tv;
-
-	tv.tv_sec = 6;
-	tv.tv_usec = 0;
-	setsockopt (tp->socket, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof tv);
-	for (;;) {
-		union {
-			struct sockaddr s;
-			struct sockaddr_in i;
-		} from;
-		int fromlen = sizeof from;
-		len = recvfrom (tp->socket, (char *)&tp->pkbuf,
-							sizeof tp->pkbuf, 0,
-							&from.s, &fromlen);
-		if (len < 0)
-			break;
-		if (from.i.sin_addr.s_addr == tp->farAddress.sin_addr.s_addr) {
-			if (tp->firstReply) {
-				tp->firstReply = 0;
-				tp->farAddress.sin_port = from.i.sin_port;
-			}
-			if (tp->farAddress.sin_port == from.i.sin_port) 
-				break;
-		}
-
-		/*
-		 * Packet is from someone with whom we are
-		 * not interested.  Tell them to go away.
-		 */
-		sendStifle (tp, &from.i);
-	}
-	tv.tv_sec = 0;
-	setsockopt (tp->socket, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof tv);
-	return len;
-}
-
-/*
- * Send an acknowledgement
- */
-static int
-sendAck (struct tftpStream *tp)
-{
-	/*
-	 * Create the acknowledgement
-	 */
-	tp->pkbuf.tftpACK.opcode = htons (TFTP_OPCODE_ACK);
-	tp->pkbuf.tftpACK.blocknum = htons (tp->blocknum);
-
-	/*
-	 * Send it
-	 */
-	if (sendto (tp->socket, (char *)&tp->pkbuf, sizeof tp->pkbuf.tftpACK, 0,
-					(struct sockaddr *)&tp->farAddress,
-					sizeof tp->farAddress) < 0)
-		return errno;
-	return 0;
-}
-
-/*
- * Release a stream and clear the pointer to it
- */
-static void
-releaseStream (int s)
-{
-	rtems_semaphore_obtain (tftp_mutex, RTEMS_WAIT, RTEMS_NO_TIMEOUT);
-	free (tftpStreams[s]);
-	tftpStreams[s] = NULL;
-	rtems_semaphore_release (tftp_mutex);
-}
-
-/*
- * Open a TFTP stream
- */
-rtems_device_driver rtems_tftp_open(
-  rtems_device_major_number major,
-  rtems_device_minor_number minor,
-  void *pargp
-)
-{
-	rtems_libio_open_close_args_t *ap = pargp;
-	struct tftpStream *tp;
-	int retryCount;
-	rtems_unsigned32 farAddress;
-	int s;
-	int len;
-	char *cp1, *cp2;
-	char *remoteFilename;
-	rtems_interval now;
-	rtems_status_code sc;
-
-	/*
-	 * Read-only for now
-	 */
-	if (ap->flags & LIBIO_FLAGS_WRITE)
-		return RTEMS_NOT_IMPLEMENTED;
-
-	/*
-	 * Pick apart the name into a host:pathname pair
-	 */
-	if (strlen (ap->iop->pathname) <= strlen (TFTP_PATHNAME_PREFIX))
-		return RTEMS_INVALID_NAME;
-	cp2 = ap->iop->pathname + strlen (TFTP_PATHNAME_PREFIX);
-	if (*cp2 == '/') {
-		farAddress = rtems_bsdnet_bootp_server_address.s_addr;
-	}
-	else {
-		char *hostname;
-
-		cp1 = cp2;
-		while (*cp2 != '/') {
-			if (*cp2 == '\0')
-				return RTEMS_INVALID_NAME;
-			cp2++;
-		}
-		len = cp2 - cp1;
-		hostname = malloc (len + 1);
-		if (hostname == NULL)
-			return RTEMS_NO_MEMORY;
-		strncpy (hostname, cp1, len);
-		hostname[len] = '\0';
-		farAddress = inet_addr (hostname);
-		free (hostname);
-	}
-	if ((farAddress == 0) || (farAddress == ~0))
-		return RTEMS_INVALID_NAME;
-	if (*++cp2 == '\0')
-		return RTEMS_INVALID_NAME;
-	remoteFilename = cp2;
-	if (strlen (remoteFilename) > (TFTP_BUFSIZE - 10))
-		return RTEMS_INVALID_NAME;
-
-	/*
-	 * Find a free stream
-	 */
-	sc = rtems_semaphore_obtain (tftp_mutex, RTEMS_WAIT, RTEMS_NO_TIMEOUT);
-	if (sc != RTEMS_SUCCESSFUL)
-		return sc;
-	for (s = 0 ; s < nStreams ; s++) {
-		if (tftpStreams[s] == NULL)
-			break;
-	}
-	if (s == nStreams) {
-		/*
-		 * Reallocate stream pointers
-		 * Guard against the case where realloc() returns NULL.
-		 */
-		struct tftpStream **np;
-
-		np = realloc (tftpStreams, ++nStreams * sizeof *tftpStreams);
-		if (np == NULL) {
-			rtems_semaphore_release (tftp_mutex);
-			return RTEMS_NO_MEMORY;
-		}
-		tftpStreams = np;
-	}
-	tp = tftpStreams[s] = malloc (sizeof (struct tftpStream));
-	rtems_semaphore_release (tftp_mutex);
-	if (tp == NULL)
-		return RTEMS_NO_MEMORY;
-	ap->iop->data0 = s;
-	ap->iop->data1 = tp;
-
-	/*
-	 * Create the socket
-	 */
-	if ((tp->socket = socket (AF_INET, SOCK_DGRAM, 0)) < 0) {
-		releaseStream (s);
-		return RTEMS_TOO_MANY;
-	}
-
-	/*
-	 * Bind the socket to a local address
-	 */
-	retryCount = 0;
-	rtems_clock_get (RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &now);
-	for (;;) {
-		int try = (now + retryCount) % 10;
-
-		tp->myAddress.sin_family = AF_INET;
-		tp->myAddress.sin_port = htons (UDP_PORT_BASE + nStreams * try + minor);
-		tp->myAddress.sin_addr.s_addr = htonl (INADDR_ANY);
-		if (bind (tp->socket, (struct sockaddr *)&tp->myAddress, sizeof tp->myAddress) >= 0)
-			break;
-		if (++retryCount == 10) {
-			close (tp->socket);
-			releaseStream (minor);
-			return RTEMS_RESOURCE_IN_USE;
-		}
-	}
-
-	/*
-	 * Set the UDP destination to the TFTP server
-	 * port on the remote machine.
-	 */
-	tp->farAddress.sin_family = AF_INET;
-	tp->farAddress.sin_addr.s_addr = farAddress;
-	tp->farAddress.sin_port = htons (69);
-
-	/*
-	 * Start the transfer
-	 */
-	tp->firstReply = 1;
-	for (;;) {
-		/*
-		 * Create the request
-		 */
-		tp->pkbuf.tftpRWRQ.opcode = htons (TFTP_OPCODE_RRQ);
-		cp1 = tp->pkbuf.tftpRWRQ.filename_mode;
-		cp2 = remoteFilename;
-		while ((*cp1++ = *cp2++) != '\0')
-			continue;
-		cp2 = "octet";
-		while ((*cp1++ = *cp2++) != '\0')
-			continue;
-		len = cp1 - (char *)&tp->pkbuf.tftpRWRQ;
-
-		/*
-		 * Send the request
-		 */
-		if (sendto (tp->socket, (char *)&tp->pkbuf, len, 0, 
-					(struct sockaddr *)&tp->farAddress,
-					sizeof tp->farAddress) < 0) {
-			close (tp->socket);
-			releaseStream (minor);
-			return RTEMS_UNSATISFIED;
-		}
-
-		/*
-		 * Get reply
-		 */
-		len = getPacket (tp);
-		if (len >= (int) sizeof tp->pkbuf.tftpACK) {
-			int opcode = ntohs (tp->pkbuf.tftpDATA.opcode);
-			if ((opcode == TFTP_OPCODE_DATA)
-			 && (ntohs (tp->pkbuf.tftpDATA.blocknum) == 1)) {
-				tp->nused = 0;
-				tp->blocknum = 1;
-				tp->nleft = len - 2 * sizeof (rtems_unsigned16);
-				tp->eof = (tp->nleft < TFTP_BUFSIZE);
-				if (sendAck (tp) != 0) {
-					close (tp->socket);
-					releaseStream (minor);
-					return RTEMS_UNSATISFIED;
-				}
-				break;
-			}
-			if (opcode == TFTP_OPCODE_ERROR) {
-				tftpSetErrno (tp);
-				close (tp->socket);
-				releaseStream (ap->iop->data0);
-				return RTEMS_INTERNAL_ERROR;
-			}
-		}
-
-		/*
-		 * Keep trying
-		 */
-		if (++retryCount >= OPEN_RETRY_LIMIT) {
-			close (tp->socket);
-			releaseStream (minor);
-			return RTEMS_UNSATISFIED;
-		}
-	}
-	return RTEMS_SUCCESSFUL;
-}
-
-/*
- * Read from a TFTP stream
- */
-rtems_device_driver rtems_tftp_read(
-  rtems_device_major_number major,
-  rtems_device_minor_number minor,
-  void *pargp
-)
-{
-	rtems_libio_rw_args_t *ap = pargp;
-	char *bp;
-	struct tftpStream *tp;
-	int retryCount;
-	int nwant;
-
-	tp = ap->iop->data1;
-
-	/*
-	 * Read till user request is satisfied or EOF is reached
-	 */
-	bp = ap->buffer;
-	nwant = ap->count;
-	while (nwant) {
-		if (tp->nleft) {
-			int count;
-			if (nwant < tp->nleft)
-				count = nwant;
-			else
-				count = tp->nleft;
-			memcpy (bp, &tp->pkbuf.tftpDATA.data[tp->nused], count);
-			tp->nused += count;
-			tp->nleft -= count;
-			bp += count;
-			nwant -= count;
-			if (nwant == 0)
-				break;
-		}
-		if (tp->eof)
-			break;
-
-		/*
-		 * Wait for the next packet
-		 */
-		retryCount = 0;
-		for (;;) {
-			int len = getPacket (tp);
-			if (len >= (int)sizeof tp->pkbuf.tftpACK) {
-				int opcode = ntohs (tp->pkbuf.tftpDATA.opcode);
-				rtems_unsigned16 nextBlock = tp->blocknum + 1;
-				if ((opcode == TFTP_OPCODE_DATA)
-				 && (ntohs (tp->pkbuf.tftpDATA.blocknum) == nextBlock)) {
-					tp->nused = 0;
-					tp->nleft = len - 2 * sizeof (rtems_unsigned16);
-					tp->eof = (tp->nleft < TFTP_BUFSIZE);
-					tp->blocknum++;
-					if (sendAck (tp) != 0)
-						return RTEMS_IO_ERROR;
-					break;
-				}
-				if (opcode == TFTP_OPCODE_ERROR) {
-					tftpSetErrno (tp);
-					return RTEMS_INTERNAL_ERROR;
-				}
-			}
-
-			/*
-			 * Keep trying?
-			 */
-			if (++retryCount == IO_RETRY_LIMIT)
-				return RTEMS_IO_ERROR;
-			if (sendAck (tp) != 0)
-				return RTEMS_IO_ERROR;
-		}
-	}
-	ap->bytes_moved = ap->count - nwant;
-	return RTEMS_SUCCESSFUL;
-}
-
-/*
- * Close a TFTP stream
- */
-rtems_device_driver rtems_tftp_close(
-  rtems_device_major_number major,
-  rtems_device_minor_number minor,
-  void *pargp
-)
-{
-	rtems_libio_open_close_args_t *ap = pargp;
-	struct tftpStream *tp = ap->iop->data1;;
-
-	if (!tp->eof && !tp->firstReply) {
-		/*
-		 * Tell the other end to stop
-		 */
-		rtems_interval ticksPerSecond;
-		sendStifle (tp, &tp->farAddress);
-		rtems_clock_get (RTEMS_CLOCK_GET_TICKS_PER_SECOND, &ticksPerSecond);
-		rtems_task_wake_after (1 + ticksPerSecond / 10);
-	}
-	close (tp->socket);
-	releaseStream (ap->iop->data0);
-	return RTEMS_SUCCESSFUL;
-}
-
-rtems_device_driver rtems_tftp_write(
-  rtems_device_major_number major,
-  rtems_device_minor_number minor,
-  void *pargp
-)
-{
-	return RTEMS_NOT_CONFIGURED;
-}
-
-rtems_device_driver rtems_tftp_control(
-  rtems_device_major_number major,
-  rtems_device_minor_number minor,
-  void *pargp
-)
-{
-	return RTEMS_NOT_CONFIGURED;
-}
diff --git a/c/src/libnetworking/libc/Makefile.in b/c/src/libnetworking/libc/Makefile.in
deleted file mode 100644
index 132c059cab..0000000000
--- a/c/src/libnetworking/libc/Makefile.in
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-LIBNAME=lib.a
-LIB=${ARCH}/${LIBNAME}
-
-# C and C++ source names, if any, go here -- minus the .c or .cc
-C_PIECES= base64 \
-        gethostbydns gethostbyht gethostbynis gethostnamadr \
-        herror \
-        inet_addr inet_ntoa inet_ntop inet_pton \
-        map_v4v6 \
-        nsap_addr ns_name ns_netint ns_parse ns_print ns_ttl \
-        res_comp res_data res_debug res_init res_mkquery res_mkupdate \
-        res_query res_send res_stubs res_update \
-        strsep
-C_FILES=$(C_PIECES:%=%.c)
-C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
-
-SRCS=$(C_FILES)
-OBJS=$(C_O_FILES)
-
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/lib.cfg
-
-#
-# Add local stuff here using +=
-#
-
-DEFINES  += -DNOPOLL -DNOSELECT
-CPPFLAGS +=
-CFLAGS   +=
-
-#
-# Add your list of files to delete here.  The config files
-#  already know how to delete some stuff, so you may want
-#  to just run 'make clean' first to see what gets missed.
-#  'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS += $(LIB)
-CLOBBER_ADDITIONS +=
-
-all:	${ARCH} $(LIB)
-
-$(LIB): $(SRCS) ${OBJS}
-	$(make-library)
diff --git a/c/src/libnetworking/libc/addr2ascii.3 b/c/src/libnetworking/libc/addr2ascii.3
deleted file mode 100644
index 10c839ea74..0000000000
--- a/c/src/libnetworking/libc/addr2ascii.3
+++ /dev/null
@@ -1,217 +0,0 @@
-.\"
-.\" Copyright 1996 Massachusetts Institute of Technology
-.\"
-.\" Permission to use, copy, modify, and distribute this software and
-.\" its documentation for any purpose and without fee is hereby
-.\" granted, provided that both the above copyright notice and this
-.\" permission notice appear in all copies, that both the above
-.\" copyright notice and this permission notice appear in all
-.\" supporting documentation, and that the name of M.I.T. not be used
-.\" in advertising or publicity pertaining to distribution of the
-.\" software without specific, written prior permission.  M.I.T. makes
-.\" no representations about the suitability of this software for any
-.\" purpose.  It is provided "as is" without express or implied
-.\" warranty.
-.\" 
-.\" THIS SOFTWARE IS PROVIDED BY M.I.T. ``AS IS''.  M.I.T. DISCLAIMS
-.\" ALL EXPRESS OR IMPLIED WARRANTIES WITH REGARD TO THIS SOFTWARE,
-.\" INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-.\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT
-.\" SHALL M.I.T. BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-.\" SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-.\" LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-.\" USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-.\" ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-.\" OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-.\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"	$ANA: addr2ascii.3,v 1.1 1996/06/13 18:41:46 wollman Exp $
-.\"     $Id$
-.\"
-.Dd June 13, 1996
-.Dt ADDR2ASCII 3
-.Os
-.Sh NAME
-.Nm addr2ascii ,
-.Nm ascii2addr
-.Nd Generic address formatting routines
-.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <netinet/in.h>
-.Fd #include <arpa/inet.h>
-.Ft "char *"
-.Fn addr2ascii "int af" "const void *addrp" "int len" "char *buf"
-.Ft int
-.Fn ascii2addr "int af" "const char *ascii" "void *result"
-.Sh DESCRIPTION
-The routines
-.Fn addr2ascii
-and
-.Fn ascii2addr
-are used to convert network addresses between binary form and a
-printable form appropriate to the address family.  Both functions take
-an
-.Fa af
-argument, specifying the address family to be used in the conversion
-process.
-(Currently, only the
-.Dv AF_INET
-and
-.Dv AF_LINK
-address families are supported.)
-.Pp
-The
-.Fn addr2ascii
-function
-is used to convert binary, network-format addresses into printable
-form.  In addition to
-.Fa af ,
-there are three other arguments.  The
-.Fa addrp
-argument is a pointer to the network address to be converted.
-The
-.Fa len
-argument is the length of the address.  The
-.Fa buf
-argument is an optional pointer to a caller-allocated buffer to hold
-the result; if a null pointer is passed,
-.Fn addr2ascii
-uses a statically-allocated buffer.
-.Pp
-The
-.Fn ascii2addr
-function performs the inverse operation to
-.Fn addr2ascii .
-In addition to
-.Fa af ,
-it takes two parameters,
-.Fa ascii
-and
-.Fa result .
-The
-.Fa ascii
-parameter is a pointer to the string which is to be converted into
-binary.  The
-.Fa result
-parameter is a pointer to an appropriate network address structure for
-the specified family.
-.Pp
-The following gives the appropriate structure to use for binary
-addresses in the specified family:
-.Pp
-.Bl -tag -width AF_INETxxxx -compact
-.It Dv AF_INET
-.Li struct in_addr
-.Pq in Aq Pa netinet/in.h
-.It Dv AF_LINK
-.Li struct sockaddr_dl
-.Pq in Aq Pa net/if_dl.h
-.\" .It Dv AF_INET6
-.\" .Li struct in6_addr
-.\" .Pq in Aq Pa netinet6/in6.h
-.El
-.Sh RETURN VALUES
-The
-.Fn addr2ascii
-function returns the address of the buffer it was passed, or a static
-buffer if the a null pointer was passed; on failure, it returns a null
-pointer.
-The
-.Fn ascii2addr
-function returns the length of the binary address in bytes, or -1 on
-failure.
-.Sh EXAMPLES
-The
-.Xr inet 3
-functions
-.Fn inet_ntoa
-and
-.Fn inet_aton
-could be implemented thusly:
-.Bd -literal -offset indent
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-char *
-inet_ntoa(struct in_addr addr)
-{
-	return addr2ascii(AF_INET, &addr, sizeof addr, 0);
-}
-
-int
-inet_aton(const char *ascii, struct in_addr *addr)
-{
-	return (ascii2addr(AF_INET, ascii, addr) 
-	    == sizeof(*addr));
-}
-.Ed
-.Pp
-In actuality, this cannot be done because
-.Fn addr2ascii
-and
-.Fn ascii2addr
-are implemented in terms of the
-.Xr inet 3
-functions, rather than the other way around.
-.Sh ERRORS
-When a failure is returned,
-.Li errno
-is set to one of the following values:
-.Bl -tag -width [EPROTONOSUPPORT]
-.It Bq Er ENAMETOOLONG
-The
-.Fn addr2ascii
-routine was passed a
-.Fa len
-parameter which was inappropriate for the address family given by
-.Fa af .
-.It Bq Er EPROTONOSUPPORT
-Either routine was passed an
-.Fa af
-parameter other than
-.Dv AF_INET
-or
-.Dv AF_LINK .
-.It Bq Er EINVAL
-The string passed to
-.Fn ascii2addr
-was improperly formatted for address family
-.Fa af .
-.El
-.Sh SEE ALSO
-.Xr inet 3 ,
-.Xr linkaddr 3 ,
-.Xr inet 4
-.Sh HISTORY
-An interface close to this one was originally suggested by Craig
-Partridge.  This particular interface originally appeared in the
-.Tn INRIA
-.Tn IPv6
-implementation.
-.Sh AUTHORS
-Code and documentation by
-.An Garrett A. Wollman ,
-MIT Laboratory for Computer Science.
-.Sh BUGS
-The original implementations supported IPv6.  This support should
-eventually be resurrected.  The
-.Tn NRL
-implementation also included support for the
-.Dv AF_ISO
-and
-.Dv AF_NS
-address families.
-.Pp
-The genericity of this interface is somewhat questionable.  A truly
-generic interface would provide a means for determining the length of
-the buffer to be used so that it could be dynamically allocated, and
-would always require a
-.Dq Li "struct sockaddr"
-to hold the binary address.  Unfortunately, this is incompatible with existing
-practice.  This limitation means that a routine for printing network
-addresses from arbitrary address families must still have internal
-knowledge of the maximum buffer length needed and the appropriate part
-of the address to use as the binary address.
diff --git a/c/src/libnetworking/libc/addr2ascii.c b/c/src/libnetworking/libc/addr2ascii.c
deleted file mode 100644
index dc651743b6..0000000000
--- a/c/src/libnetworking/libc/addr2ascii.c
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright 1996 Massachusetts Institute of Technology
- *
- * Permission to use, copy, modify, and distribute this software and
- * its documentation for any purpose and without fee is hereby
- * granted, provided that both the above copyright notice and this
- * permission notice appear in all copies, that both the above
- * copyright notice and this permission notice appear in all
- * supporting documentation, and that the name of M.I.T. not be used
- * in advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission.  M.I.T. makes
- * no representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied
- * warranty.
- * 
- * THIS SOFTWARE IS PROVIDED BY M.I.T. ``AS IS''.  M.I.T. DISCLAIMS
- * ALL EXPRESS OR IMPLIED WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT
- * SHALL M.I.T. BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	$ANA: addr2ascii.c,v 1.1 1996/06/13 18:41:46 wollman Exp $
- *
- *  $Id$
- */
-
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <errno.h>
-#include <string.h>
-
-#include <net/if_dl.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-/*-
- * Convert a network address from binary to printable numeric format.
- * This API is copied from INRIA's IPv6 implementation, but it is a
- * bit bogus in two ways:
- *
- *	1) There is no value in passing both an address family and
- *	   an address length; either one should imply the other,
- *	   or we should be passing sockaddrs instead.
- *	2) There should by contrast be /added/ a length for the buffer
- *	   that we pass in, so that programmers are spared the need to
- *	   manually calculate (read: ``guess'') the maximum length.
- *
- * Flash: the API is also the same in the NRL implementation, and seems to
- * be some sort of standard, so we appear to be stuck with both the bad
- * naming and the poor choice of arguments.
- */
-char *
-addr2ascii(af, addrp, len, buf)
-	int af;
-	const void *addrp;
-	int len;		/* should be size_t XXX */
-	char *buf;		/* XXX should pass length of buffer */
-{
-	static char staticbuf[64]; /* 64 for AF_LINK > 16 for AF_INET */
-
-	if (!buf)
-		buf = staticbuf;
-
-	switch(af) {
-	case AF_INET:
-		if (len != sizeof(struct in_addr)) {
-			errno = ENAMETOOLONG;
-			return 0;
-		}
-		strcpy(buf, inet_ntoa(*(const struct in_addr *)addrp));
-		break;
-
-	case AF_LINK:
-		if (len != sizeof(struct sockaddr_dl)) {
-			errno = ENAMETOOLONG;
-			return 0;
-		}
-		strcpy(buf, link_ntoa((const struct sockaddr_dl *)addrp));
-		break;
-			
-	default:
-		errno = EPROTONOSUPPORT;
-		return 0;
-	}
-	return buf;
-}
diff --git a/c/src/libnetworking/libc/ascii2addr.c b/c/src/libnetworking/libc/ascii2addr.c
deleted file mode 100644
index e140244737..0000000000
--- a/c/src/libnetworking/libc/ascii2addr.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright 1996 Massachusetts Institute of Technology
- *
- * Permission to use, copy, modify, and distribute this software and
- * its documentation for any purpose and without fee is hereby
- * granted, provided that both the above copyright notice and this
- * permission notice appear in all copies, that both the above
- * copyright notice and this permission notice appear in all
- * supporting documentation, and that the name of M.I.T. not be used
- * in advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission.  M.I.T. makes
- * no representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied
- * warranty.
- * 
- * THIS SOFTWARE IS PROVIDED BY M.I.T. ``AS IS''.  M.I.T. DISCLAIMS
- * ALL EXPRESS OR IMPLIED WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT
- * SHALL M.I.T. BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	$ANA: ascii2addr.c,v 1.2 1996/06/13 18:46:02 wollman Exp $
- *
- *  $Id$
- */
-
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <errno.h>
-#include <string.h>
-
-#include <net/if_dl.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-int
-ascii2addr(af, ascii, result)
-	int af;
-	const char *ascii;
-	void *result;
-{
-	struct in_addr *ina;
-	char strbuf[4*sizeof("123")]; /* long enough for V4 only */
-
-	switch(af) {
-	case AF_INET:
-		ina = result;
-		strbuf[0] = '\0';
-		strncat(strbuf, ascii, (sizeof strbuf)-1);
-		if (inet_aton(strbuf, ina))
-			return sizeof(struct in_addr);
-		errno = EINVAL;
-		break;
-
-	case AF_LINK:
-		link_addr(ascii, result);
-		/* oops... no way to detect failure */
-		return sizeof(struct sockaddr_dl);
-
-	default:
-		errno = EPROTONOSUPPORT;
-		break;
-	}
-
-	return -1;
-}
diff --git a/c/src/libnetworking/libc/base64.c b/c/src/libnetworking/libc/base64.c
deleted file mode 100644
index 3017ccc01c..0000000000
--- a/c/src/libnetworking/libc/base64.c
+++ /dev/null
@@ -1,318 +0,0 @@
-/*
- * Copyright (c) 1996, 1998 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-/*
- * Portions Copyright (c) 1995 by International Business Machines, Inc.
- *
- * International Business Machines, Inc. (hereinafter called IBM) grants
- * permission under its copyrights to use, copy, modify, and distribute this
- * Software with or without fee, provided that the above copyright notice and
- * all paragraphs of this notice appear in all copies, and that the name of IBM
- * not be used in connection with the marketing of any product incorporating
- * the Software or modifications thereof, without specific, written prior
- * permission.
- *
- * To the extent it has a right to do so, IBM grants an immunity from suit
- * under its patents, if any, for the use, sale or manufacture of products to
- * the extent that such products are used for performing Domain Name System
- * dynamic updates in TCP/IP networks by means of the Software.  No immunity is
- * granted for any product per se or for any other function of any product.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", AND IBM DISCLAIMS ALL WARRANTIES,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL IBM BE LIABLE FOR ANY SPECIAL,
- * DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE, EVEN
- * IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES.
- */
-
-#if !defined(__rtems__)
-#if !defined(LINT) && !defined(CODECENTER)
-static char rcsid[] = "$Id$";
-#endif /* not lint */
-#endif /* not rtems */
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-
-#include <ctype.h>
-#include <resolv.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#define Assert(Cond) if (!(Cond)) abort()
-
-static const char Base64[] =
-	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-static const char Pad64 = '=';
-
-/* (From RFC1521 and draft-ietf-dnssec-secext-03.txt)
-   The following encoding technique is taken from RFC 1521 by Borenstein
-   and Freed.  It is reproduced here in a slightly edited form for
-   convenience.
-
-   A 65-character subset of US-ASCII is used, enabling 6 bits to be
-   represented per printable character. (The extra 65th character, "=",
-   is used to signify a special processing function.)
-
-   The encoding process represents 24-bit groups of input bits as output
-   strings of 4 encoded characters. Proceeding from left to right, a
-   24-bit input group is formed by concatenating 3 8-bit input groups.
-   These 24 bits are then treated as 4 concatenated 6-bit groups, each
-   of which is translated into a single digit in the base64 alphabet.
-
-   Each 6-bit group is used as an index into an array of 64 printable
-   characters. The character referenced by the index is placed in the
-   output string.
-
-                         Table 1: The Base64 Alphabet
-
-      Value Encoding  Value Encoding  Value Encoding  Value Encoding
-          0 A            17 R            34 i            51 z
-          1 B            18 S            35 j            52 0
-          2 C            19 T            36 k            53 1
-          3 D            20 U            37 l            54 2
-          4 E            21 V            38 m            55 3
-          5 F            22 W            39 n            56 4
-          6 G            23 X            40 o            57 5
-          7 H            24 Y            41 p            58 6
-          8 I            25 Z            42 q            59 7
-          9 J            26 a            43 r            60 8
-         10 K            27 b            44 s            61 9
-         11 L            28 c            45 t            62 +
-         12 M            29 d            46 u            63 /
-         13 N            30 e            47 v
-         14 O            31 f            48 w         (pad) =
-         15 P            32 g            49 x
-         16 Q            33 h            50 y
-
-   Special processing is performed if fewer than 24 bits are available
-   at the end of the data being encoded.  A full encoding quantum is
-   always completed at the end of a quantity.  When fewer than 24 input
-   bits are available in an input group, zero bits are added (on the
-   right) to form an integral number of 6-bit groups.  Padding at the
-   end of the data is performed using the '=' character.
-
-   Since all base64 input is an integral number of octets, only the
-         -------------------------------------------------                       
-   following cases can arise:
-   
-       (1) the final quantum of encoding input is an integral
-           multiple of 24 bits; here, the final unit of encoded
-	   output will be an integral multiple of 4 characters
-	   with no "=" padding,
-       (2) the final quantum of encoding input is exactly 8 bits;
-           here, the final unit of encoded output will be two
-	   characters followed by two "=" padding characters, or
-       (3) the final quantum of encoding input is exactly 16 bits;
-           here, the final unit of encoded output will be three
-	   characters followed by one "=" padding character.
-   */
-
-int
-b64_ntop(u_char const *src, size_t srclength, char *target, size_t targsize) {
-	size_t datalength = 0;
-	u_char input[3];
-	u_char output[4];
-	size_t i;
-
-	while (2 < srclength) {
-		input[0] = *src++;
-		input[1] = *src++;
-		input[2] = *src++;
-		srclength -= 3;
-
-		output[0] = input[0] >> 2;
-		output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4);
-		output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6);
-		output[3] = input[2] & 0x3f;
-		Assert(output[0] < 64);
-		Assert(output[1] < 64);
-		Assert(output[2] < 64);
-		Assert(output[3] < 64);
-
-		if (datalength + 4 > targsize)
-			return (-1);
-		target[datalength++] = Base64[output[0]];
-		target[datalength++] = Base64[output[1]];
-		target[datalength++] = Base64[output[2]];
-		target[datalength++] = Base64[output[3]];
-	}
-    
-	/* Now we worry about padding. */
-	if (0 != srclength) {
-		/* Get what's left. */
-		input[0] = input[1] = input[2] = '\0';
-		for (i = 0; i < srclength; i++)
-			input[i] = *src++;
-	
-		output[0] = input[0] >> 2;
-		output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4);
-		output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6);
-		Assert(output[0] < 64);
-		Assert(output[1] < 64);
-		Assert(output[2] < 64);
-
-		if (datalength + 4 > targsize)
-			return (-1);
-		target[datalength++] = Base64[output[0]];
-		target[datalength++] = Base64[output[1]];
-		if (srclength == 1)
-			target[datalength++] = Pad64;
-		else
-			target[datalength++] = Base64[output[2]];
-		target[datalength++] = Pad64;
-	}
-	if (datalength >= targsize)
-		return (-1);
-	target[datalength] = '\0';	/* Returned value doesn't count \0. */
-	return (datalength);
-}
-
-/* skips all whitespace anywhere.
-   converts characters, four at a time, starting at (or after)
-   src from base - 64 numbers into three 8 bit bytes in the target area.
-   it returns the number of data bytes stored at the target, or -1 on error.
- */
-
-int
-b64_pton(src, target, targsize)
-	char const *src;
-	u_char *target;
-	size_t targsize;
-{
-	int tarindex, state, ch;
-	char *pos;
-
-	state = 0;
-	tarindex = 0;
-
-	while ((ch = *src++) != '\0') {
-		if (isspace(ch))	/* Skip whitespace anywhere. */
-			continue;
-
-		if (ch == Pad64)
-			break;
-
-		pos = strchr(Base64, ch);
-		if (pos == 0) 		/* A non-base64 character. */
-			return (-1);
-
-		switch (state) {
-		case 0:
-			if (target) {
-				if ((size_t)tarindex >= targsize)
-					return (-1);
-				target[tarindex] = (pos - Base64) << 2;
-			}
-			state = 1;
-			break;
-		case 1:
-			if (target) {
-				if ((size_t)tarindex + 1 >= targsize)
-					return (-1);
-				target[tarindex]   |=  (pos - Base64) >> 4;
-				target[tarindex+1]  = ((pos - Base64) & 0x0f)
-							<< 4 ;
-			}
-			tarindex++;
-			state = 2;
-			break;
-		case 2:
-			if (target) {
-				if ((size_t)tarindex + 1 >= targsize)
-					return (-1);
-				target[tarindex]   |=  (pos - Base64) >> 2;
-				target[tarindex+1]  = ((pos - Base64) & 0x03)
-							<< 6;
-			}
-			tarindex++;
-			state = 3;
-			break;
-		case 3:
-			if (target) {
-				if ((size_t)tarindex >= targsize)
-					return (-1);
-				target[tarindex] |= (pos - Base64);
-			}
-			tarindex++;
-			state = 0;
-			break;
-		default:
-			abort();
-		}
-	}
-
-	/*
-	 * We are done decoding Base-64 chars.  Let's see if we ended
-	 * on a byte boundary, and/or with erroneous trailing characters.
-	 */
-
-	if (ch == Pad64) {		/* We got a pad char. */
-		ch = *src++;		/* Skip it, get next. */
-		switch (state) {
-		case 0:		/* Invalid = in first position */
-		case 1:		/* Invalid = in second position */
-			return (-1);
-
-		case 2:		/* Valid, means one byte of info */
-			/* Skip any number of spaces. */
-			for ((void)NULL; ch != '\0'; ch = *src++)
-				if (!isspace(ch))
-					break;
-			/* Make sure there is another trailing = sign. */
-			if (ch != Pad64)
-				return (-1);
-			ch = *src++;		/* Skip the = */
-			/* Fall through to "single trailing =" case. */
-			/* FALLTHROUGH */
-
-		case 3:		/* Valid, means two bytes of info */
-			/*
-			 * We know this char is an =.  Is there anything but
-			 * whitespace after it?
-			 */
-			for ((void)NULL; ch != '\0'; ch = *src++)
-				if (!isspace(ch))
-					return (-1);
-
-			/*
-			 * Now make sure for cases 2 and 3 that the "extra"
-			 * bits that slopped past the last full byte were
-			 * zeros.  If we don't check them, they become a
-			 * subliminal channel.
-			 */
-			if (target && target[tarindex] != 0)
-				return (-1);
-		}
-	} else {
-		/*
-		 * We ended by seeing the end of the string.  Make sure we
-		 * have no partial bytes lying around.
-		 */
-		if (state != 0)
-			return (-1);
-	}
-
-	return (tarindex);
-}
diff --git a/c/src/libnetworking/libc/byteorder.3 b/c/src/libnetworking/libc/byteorder.3
deleted file mode 100644
index 81bf604867..0000000000
--- a/c/src/libnetworking/libc/byteorder.3
+++ /dev/null
@@ -1,77 +0,0 @@
-.\" Copyright (c) 1983, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"     @(#)byteorder.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
-.\"
-.Dd June 4, 1993
-.Dt BYTEORDER 3
-.Os BSD 4.2
-.Sh NAME
-.Nm htonl ,
-.Nm htons ,
-.Nm ntohl ,
-.Nm ntohs
-.Nd convert values between host and network byte order
-.Sh SYNOPSIS
-.Fd #include <sys/param.h>
-.Ft u_long
-.Fn htonl "u_long hostlong"
-.Ft u_short
-.Fn htons "u_short hostshort"
-.Ft u_long
-.Fn ntohl "u_long netlong"
-.Ft u_short
-.Fn ntohs "u_short netshort"
-.Sh DESCRIPTION
-These routines convert 16 and 32 bit quantities between network
-byte order and host byte order.
-On machines which have a byte order which is the same as the network
-order, routines are defined as null macros.
-.Pp
-These routines are most often used in conjunction with Internet
-addresses and ports as returned by
-.Xr gethostbyname 3
-and
-.Xr getservent 3 .
-.Sh SEE ALSO
-.Xr gethostbyname 3 ,
-.Xr getservent 3
-.Sh HISTORY
-The
-.Nm byteorder
-functions appeared in 
-.Bx 4.2 .
-.Sh BUGS
-On the
-.Tn VAX
-bytes are handled backwards from most everyone else in
-the world.  This is not expected to be fixed in the near future.
diff --git a/c/src/libnetworking/libc/ether_addr.c b/c/src/libnetworking/libc/ether_addr.c
deleted file mode 100644
index 9b7a9abf44..0000000000
--- a/c/src/libnetworking/libc/ether_addr.c
+++ /dev/null
@@ -1,226 +0,0 @@
-/*
- * Copyright (c) 1995
- *	Bill Paul <wpaul@ctr.columbia.edu>.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by Bill Paul.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY Bill Paul AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * ethernet address conversion and lookup routines
- *
- * Written by Bill Paul <wpaul@ctr.columbia.edu>
- * Center for Telecommunications Research
- * Columbia University, New York City
- *
- *	$Id$
- */
-
-
-#include <stdio.h>
-#include <paths.h>
-#include <sys/types.h>
-#include <string.h>
-#include <stdlib.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <net/ethernet.h>
-#ifdef YP
-#include <rpc/rpc.h>
-#include <rpcsvc/yp_prot.h>
-#include <rpcsvc/ypclnt.h>
-#endif
-
-#ifndef _PATH_ETHERS
-#define _PATH_ETHERS "/etc/ethers"
-#endif
-
-/*
- * Parse a string of text containing an ethernet address and hostname
- * and separate it into its component parts.
- */
-int ether_line(l, e, hostname)
-        char *l;
-	struct ether_addr *e;
-	char *hostname;
-{
-        int i, o[6];
-
-        i = sscanf(l, "%x:%x:%x:%x:%x:%x %s", &o[0], &o[1], &o[2],
-                                              &o[3], &o[4], &o[5],
-					      hostname);
-	if (i != 7)
-                return (i);
-
-        for (i=0; i<6; i++)
-                e->octet[i] = o[i];
-        return (0);
-}
-
-/*
- * Convert an ASCII representation of an ethernet address to
- * binary form.
- */
-struct ether_addr *ether_aton(a)
-        char *a;
-{
-        int i;
-	static struct ether_addr o;
-	unsigned int o0, o1, o2, o3, o4, o5;
-
-        i = sscanf(a, "%x:%x:%x:%x:%x:%x", &o0, &o1, &o2, &o3, &o4, &o5);
-
-        if (i != 6)
-                return (NULL);
-
-        o.octet[0]=o0;
-	o.octet[1]=o1;
-	o.octet[2]=o2;
-	o.octet[3]=o3;
-	o.octet[4]=o4;
-	o.octet[5]=o5;
-
-        return ((struct ether_addr *)&o);
-}
-
-/*
- * Convert a binary representation of an ethernet address to
- * an ASCII string.
- */
-char *ether_ntoa(n)
-        struct ether_addr *n;
-{
-        int i;
-	static char a[18];
-
-        i = sprintf(a,"%x:%x:%x:%x:%x:%x",n->octet[0],n->octet[1],n->octet[2],
-                                          n->octet[3],n->octet[4],n->octet[5]);
-        if (i < 11)
-                return (NULL);
-        return ((char *)&a);
-}
-
-/*
- * Map an ethernet address to a hostname. Use either /etc/ethers or
- * NIS/YP.
- */
-
-int ether_ntohost(hostname, e)
-	char *hostname;
-	struct ether_addr *e;
-{
-	FILE *fp;
-	char buf[BUFSIZ + 2];
-	struct ether_addr local_ether;
-	char local_host[MAXHOSTNAMELEN];
-#ifdef YP
-	char *result;
-	int resultlen;
-	char *ether_a;
-	char *yp_domain;
-#endif
-	if ((fp = fopen(_PATH_ETHERS, "r")) == NULL)
-		return (1);
-
-	while (fgets(buf,BUFSIZ,fp)) {
-		if (buf[0] == '#')
-			continue;
-#ifdef YP
-		if (buf[0] == '+') {
-			if (yp_get_default_domain(&yp_domain))
-				continue;
-			ether_a = ether_ntoa(e);
-			if (yp_match(yp_domain, "ethers.byaddr", ether_a,
-				strlen(ether_a), &result, &resultlen)) {
-				continue;
-			}
-			strncpy(buf, result, resultlen);
-			buf[resultlen] = '\0';
-			free(result);
-		}
-#endif
-		if (!ether_line(buf, &local_ether, local_host)) {
-			if (!bcmp((char *)&local_ether.octet[0],
-				(char *)&e->octet[0], 6)) {
-			/* We have a match */
-				strcpy(hostname, local_host);
-				fclose(fp);
-				return(0);
-			}
-		}
-	}
-	fclose(fp);
-	return (1);
-}
-
-/*
- * Map a hostname to an ethernet address using /etc/ethers or
- * NIS/YP.
- */
-int ether_hostton(hostname, e)
-	char *hostname;
-	struct ether_addr *e;
-{
-	FILE *fp;
-	char buf[BUFSIZ + 2];
-	struct ether_addr local_ether;
-	char local_host[MAXHOSTNAMELEN];
-#ifdef YP
-	char *result;
-	int resultlen;
-	char *yp_domain;
-#endif
-	if ((fp = fopen(_PATH_ETHERS, "r")) == NULL)
-		return (1);
-
-	while (fgets(buf,BUFSIZ,fp)) {
-		if (buf[0] == '#')
-			continue;
-#ifdef YP
-		if (buf[0] == '+') {
-			if (yp_get_default_domain(&yp_domain))
-				continue;
-			if (yp_match(yp_domain, "ethers.byname", hostname,
-				strlen(hostname), &result, &resultlen)) {
-				continue;
-			}
-			strncpy(buf, result, resultlen);
-			buf[resultlen] = '\0';
-			free(result);
-		}
-#endif
-		if (!ether_line(buf, &local_ether, local_host)) {
-			if (!strcmp(hostname, local_host)) {
-				/* We have a match */
-				bcopy((char *)&local_ether.octet[0],
-					(char *)&e->octet[0], 6);
-				fclose(fp);
-				return(0);
-			}
-		}
-	}
-	fclose(fp);
-	return (1);
-}
diff --git a/c/src/libnetworking/libc/ethers.3 b/c/src/libnetworking/libc/ethers.3
deleted file mode 100644
index afea48320a..0000000000
--- a/c/src/libnetworking/libc/ethers.3
+++ /dev/null
@@ -1,193 +0,0 @@
-.\" Copyright (c) 1995
-.\"	Bill Paul <wpaul@ctr.columbia.edu>.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by Bill Paul.
-.\" 4. Neither the name of the author nor the names of any co-contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY Bill Paul AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"     $Id$
-.\"
-.Dd April 12, 1995
-.Dt ETHERS 3
-.Os FreeBSD 2.1
-.Sh NAME
-.Nm ethers ,
-.Nm ether_line ,
-.Nm ether_aton ,
-.Nm ether_ntoa ,
-.Nm ether_ntohost ,
-.Nm ether_hostton
-.Nd Ethernet address conversion and lookup routines
-.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/socket.h>
-.Fd #include <net/ethernet.h>
-.Ft int
-.Fn ether_line "char *l" "struct ether_addr *e" "char *hostname"
-.Ft struct ether_addr *
-.Fn ether_aton "char *a"
-.Ft char *
-.Fn ether_ntoa "struct ether_addr *n"
-.Ft int
-.Fn ether_ntohost "char *hostname" "struct ether_addr *e"
-.Ft int
-.Fn ether_hostton "char *hostname" "struct ether_addr *e"
-.Sh DESCRIPTION
-These functions operate on ethernet addresses using an
-.Ar ether_addr
-structure, which is defined in the header file
-.Aq Pa netinet/if_ether.h :
-.Bd -literal -offset indent
-/*
- * The number of bytes in an ethernet (MAC) address.
- */
-#define ETHER_ADDR_LEN		6
-
-/*
- * Structure of a 48-bit Ethernet address.
- */
-struct  ether_addr {
-        u_char octet[ETHER_ADDR_LEN];
-};
-.Ed
-.Pp
-The function
-.Fn ether_line
-scans
-.Ar l ,
-an
-.Tn ASCII
-string in
-.Xr ethers 5
-format and sets
-.Ar e
-to the ethernet address specified in the string and
-.Ar h
-to the hostname. This function is used to parse lines from
-.Pa /etc/ethers
-into their component parts.
-.Pp
-The
-.Fn ether_aton
-function converts an
-.Tn ASCII
-representation of an ethernet address into an
-.Ar ether_addr
-structure. Likewise,
-.Fn ether_ntoa
-converts an ethernet address specified as an
-.Ar ether_addr
-structure into an
-.Tn ASCII
-string.
-.Pp
-The
-.Fn ether_ntohost
-and
-.Fn ether_hostton
-functions map ethernet addresses to their corresponding hostnames
-as specified in the
-.Pa /etc/ethers
-database. 
-.Fn ether_ntohost
-converts from ethernet address to hostname, and
-.Fn ether_hostton
-converts from hostname to ethernet address.
-.Sh RETURN VALUES
-.Fn ether_line
-returns zero on success and non-zero if it was unable to parse
-any part of the supplied line
-.Ar l .
-It returns the extracted ethernet address in the supplied
-.Ar ether_addr
-structure
-.Ar e
-and the hostname in the supplied string
-.Ar h .
-.Pp
-On success, 
-.Fn ether_ntoa
-returns a pointer to a string containing an
-.Tn ASCII
-representation of an ethernet address. If it is unable to convert
-the supplied
-.Ar ether_addr
-structure, it returns a
-.Dv NULL
-pointer. Likewise,
-.Fn ether_aton
-returns a pointer to an
-.Ar ether_addr
-structure on success and a
-.Dv NULL
-pointer on failure.
-.Pp
-The
-.Fn ether_ntohost
-and
-.Fn ether_hostton
-functions both return zero on success or non-zero if they were
-unable to find a match in the
-.Pa /etc/ethers
-database.
-.Sh NOTES
-The user must insure that the hostname strings passed to the
-the
-.Fn ether_line ,
-.Fn ether_ntohost
-and
-.Fn ether_hostton
-functions are large enough to contain the returned hostnames.
-.Sh NIS INTERACTION
-If the
-.Pa /etc/ethers
-contains a line with a single + in it, the
-.Fn ether_ntohost
-and
-.Fn ether_hostton
-functions will attempt to consult the NIS
-.Pa ethers.byname
-and
-.Pa ethers.byaddr
-maps in addition to the data in the
-.Pa /etc/ethers
-file.
-.Sh SEE ALSO
-.Xr yp 4 ,
-.Xr ethers 5
-.Sh BUGS
-.Pp
-The
-.Fn ether_aton
-and
-.Fn ether_ntoa
-functions returns values that are stored in static memory areas
-which may be overwritten the next time they are called.
-.Sh HISTORY
-This particular implementation of the
-.Nm ethers
-library functions were written for and first appeared in
-.Fx 2.1 .
diff --git a/c/src/libnetworking/libc/gethostbydns.c b/c/src/libnetworking/libc/gethostbydns.c
deleted file mode 100644
index 3d80ffde7a..0000000000
--- a/c/src/libnetworking/libc/gethostbydns.c
+++ /dev/null
@@ -1,773 +0,0 @@
-/*
- * ++Copyright++ 1985, 1988, 1993
- * -
- * Copyright (c) 1985, 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * -
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- * -
- * --Copyright--
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)gethostnamadr.c	8.1 (Berkeley) 6/4/93";
-static char fromrcsid[] = "From: Id: gethnamaddr.c,v 8.23 1998/04/07 04:59:46 vixie Exp $";
-static char rcsid[] = "$Id$";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-
-#include <stdio.h>
-#include <unistd.h>
-#include <string.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <ctype.h>
-#include <errno.h>
-#include <syslog.h>
-
-#include "res_config.h"
-
-#define SPRINTF(x) ((size_t)sprintf x)
-
-#define	MAXALIASES	35
-#define	MAXADDRS	35
-
-static const char AskedForGot[] =
-		"gethostby*.gethostanswer: asked for \"%s\", got \"%s\"";
-
-static char *h_addr_ptrs[MAXADDRS + 1];
-
-static struct hostent host;
-static char *host_aliases[MAXALIASES];
-static char hostbuf[8*1024];
-static u_char host_addr[16];	/* IPv4 or IPv6 */
-
-#ifdef RESOLVSORT
-static void addrsort __P((char **, int));
-#endif
-
-#if PACKETSZ > 1024
-#define	MAXPACKET	PACKETSZ
-#else
-#define	MAXPACKET	1024
-#endif
-
-typedef union {
-    HEADER hdr;
-    u_char buf[MAXPACKET];
-} querybuf;
-
-typedef union {
-    int32_t al;
-    char ac;
-} align;
-
-extern int h_errno;
-int _dns_ttl_;
-
-#ifdef DEBUG
-static void
-dprintf(msg, num)
-	char *msg;
-	int num;
-{
-	if (_res.options & RES_DEBUG) {
-		int save = errno;
-
-		printf(msg, num);
-		errno = save;
-	}
-}
-#else
-# define dprintf(msg, num) /*nada*/
-#endif
-
-#define BOUNDED_INCR(x) \
-	do { \
-		cp += x; \
-		if (cp > eom) { \
-			h_errno = NO_RECOVERY; \
-			return (NULL); \
-		} \
-	} while (0)
-
-#define BOUNDS_CHECK(ptr, count) \
-	do { \
-		if ((ptr) + (count) > eom) { \
-			h_errno = NO_RECOVERY; \
-			return (NULL); \
-		} \
-	} while (0)
-
-static struct hostent *
-gethostanswer(answer, anslen, qname, qtype)
-	const querybuf *answer;
-	int anslen;
-	const char *qname;
-	int qtype;
-{
-	register const HEADER *hp;
-	register const u_char *cp;
-	register int n;
-	const u_char *eom, *erdata;
-	char *bp, **ap, **hap;
-	int type, class, buflen, ancount, qdcount;
-	int haveanswer, had_error;
-	int toobig = 0;
-	char tbuf[MAXDNAME];
-	const char *tname;
-	int (*name_ok) __P((const char *));
-
-	tname = qname;
-	host.h_name = NULL;
-	eom = answer->buf + anslen;
-	switch (qtype) {
-	case T_A:
-	case T_AAAA:
-		name_ok = res_hnok;
-		break;
-	case T_PTR:
-		name_ok = res_dnok;
-		break;
-	default:
-		h_errno = NO_RECOVERY;
-		return (NULL);	/* XXX should be abort(); */
-	}
-	/*
-	 * find first satisfactory answer
-	 */
-	hp = &answer->hdr;
-	ancount = ntohs(hp->ancount);
-	qdcount = ntohs(hp->qdcount);
-	bp = hostbuf;
-	buflen = sizeof hostbuf;
-	cp = answer->buf;
-	BOUNDED_INCR(HFIXEDSZ);
-	if (qdcount != 1) {
-		h_errno = NO_RECOVERY;
-		return (NULL);
-	}
-	n = dn_expand(answer->buf, eom, cp, bp, buflen);
-	if ((n < 0) || !(*name_ok)(bp)) {
-		h_errno = NO_RECOVERY;
-		return (NULL);
-	}
-	BOUNDED_INCR(n + QFIXEDSZ);
-	if (qtype == T_A || qtype == T_AAAA) {
-		/* res_send() has already verified that the query name is the
-		 * same as the one we sent; this just gets the expanded name
-		 * (i.e., with the succeeding search-domain tacked on).
-		 */
-		n = strlen(bp) + 1;		/* for the \0 */
-		if (n >= MAXHOSTNAMELEN) {
-			h_errno = NO_RECOVERY;
-			return (NULL);
-		}
-		host.h_name = bp;
-		bp += n;
-		buflen -= n;
-		/* The qname can be abbreviated, but h_name is now absolute. */
-		qname = host.h_name;
-	}
-	ap = host_aliases;
-	*ap = NULL;
-	host.h_aliases = host_aliases;
-	hap = h_addr_ptrs;
-	*hap = NULL;
-	host.h_addr_list = h_addr_ptrs;
-	haveanswer = 0;
-	had_error = 0;
-	_dns_ttl_ = -1;
-	while (ancount-- > 0 && cp < eom && !had_error) {
-		n = dn_expand(answer->buf, eom, cp, bp, buflen);
-		if ((n < 0) || !(*name_ok)(bp)) {
-			had_error++;
-			continue;
-		}
-		cp += n;			/* name */
-		BOUNDS_CHECK(cp, 3 * INT16SZ + INT32SZ);
-		type = _getshort(cp);
- 		cp += INT16SZ;			/* type */
-		class = _getshort(cp);
- 		cp += INT16SZ;			/* class */
-		if (qtype == T_A  && type == T_A)
-			_dns_ttl_ = _getlong(cp);
-		cp += INT32SZ;			/* TTL */
-		n = _getshort(cp);
-		cp += INT16SZ;			/* len */
-		BOUNDS_CHECK(cp, n);
-		erdata = cp + n;
-		if (class != C_IN) {
-			/* XXX - debug? syslog? */
-			cp += n;
-			continue;		/* XXX - had_error++ ? */
-		}
-		if ((qtype == T_A || qtype == T_AAAA) && type == T_CNAME) {
-			if (ap >= &host_aliases[MAXALIASES-1])
-				continue;
-			n = dn_expand(answer->buf, eom, cp, tbuf, sizeof tbuf);
-			if ((n < 0) || !(*name_ok)(tbuf)) {
-				had_error++;
-				continue;
-			}
-			cp += n;
-			if (cp != erdata) {
-				h_errno = NO_RECOVERY;
-				return (NULL);
-			}
-			/* Store alias. */
-			*ap++ = bp;
-			n = strlen(bp) + 1;	/* for the \0 */
-			if (n >= MAXHOSTNAMELEN) {
-				had_error++;
-				continue;
-			}
-			bp += n;
-			buflen -= n;
-			/* Get canonical name. */
-			n = strlen(tbuf) + 1;	/* for the \0 */
-			if (n > buflen || n >= MAXHOSTNAMELEN) {
-				had_error++;
-				continue;
-			}
-			strcpy(bp, tbuf);
-			host.h_name = bp;
-			bp += n;
-			buflen -= n;
-			continue;
-		}
-		if (qtype == T_PTR && type == T_CNAME) {
-			n = dn_expand(answer->buf, eom, cp, tbuf, sizeof tbuf);
-			if (n < 0 || !res_dnok(tbuf)) {
-				had_error++;
-				continue;
-			}
-			cp += n;
-			if (cp != erdata) {
-				h_errno = NO_RECOVERY;
-				return (NULL);
-			}
-			/* Get canonical name. */
-			n = strlen(tbuf) + 1;	/* for the \0 */
-			if (n > buflen || n >= MAXHOSTNAMELEN) {
-				had_error++;
-				continue;
-			}
-			strcpy(bp, tbuf);
-			tname = bp;
-			bp += n;
-			buflen -= n;
-			continue;
-		}
-		if (type != qtype) {
-			syslog(LOG_NOTICE|LOG_AUTH,
-	"gethostby*.gethostanswer: asked for \"%s %s %s\", got type \"%s\"",
-			       qname, p_class(C_IN), p_type(qtype),
-			       p_type(type));
-			cp += n;
-			continue;		/* XXX - had_error++ ? */
-		}
-		switch (type) {
-		case T_PTR:
-			if (strcasecmp(tname, bp) != 0) {
-				syslog(LOG_NOTICE|LOG_AUTH,
-				       AskedForGot, qname, bp);
-				cp += n;
-				continue;	/* XXX - had_error++ ? */
-			}
-			n = dn_expand(answer->buf, eom, cp, bp, buflen);
-			if ((n < 0) || !res_hnok(bp)) {
-				had_error++;
-				break;
-			}
-#if MULTI_PTRS_ARE_ALIASES
-			cp += n;
-			if (cp != erdata) {
-				h_errno = NO_RECOVERY;
-				return (NULL);
-			}
-			if (!haveanswer)
-				host.h_name = bp;
-			else if (ap < &host_aliases[MAXALIASES-1])
-				*ap++ = bp;
-			else
-				n = -1;
-			if (n != -1) {
-				n = strlen(bp) + 1;	/* for the \0 */
-				if (n >= MAXHOSTNAMELEN) {
-					had_error++;
-					break;
-				}
-				bp += n;
-				buflen -= n;
-			}
-			break;
-#else
-			host.h_name = bp;
-			if (_res.options & RES_USE_INET6) {
-				n = strlen(bp) + 1;	/* for the \0 */
-				if (n >= MAXHOSTNAMELEN) {
-					had_error++;
-					break;
-				}
-				bp += n;
-				buflen -= n;
-				_map_v4v6_hostent(&host, &bp, &buflen);
-			}
-			h_errno = NETDB_SUCCESS;
-			return (&host);
-#endif
-		case T_A:
-		case T_AAAA:
-			if (strcasecmp(host.h_name, bp) != 0) {
-				syslog(LOG_NOTICE|LOG_AUTH,
-				       AskedForGot, host.h_name, bp);
-				cp += n;
-				continue;	/* XXX - had_error++ ? */
-			}
-			if (n != host.h_length) {
-				cp += n;
-				continue;
-			}
-			if (!haveanswer) {
-				register int nn;
-
-				host.h_name = bp;
-				nn = strlen(bp) + 1;	/* for the \0 */
-				bp += nn;
-				buflen -= nn;
-			}
-
-			bp += sizeof(align) - ((u_long)bp % sizeof(align));
-
-			if (bp + n >= &hostbuf[sizeof hostbuf]) {
-				dprintf("size (%d) too big\n", n);
-				had_error++;
-				continue;
-			}
-			if (hap >= &h_addr_ptrs[MAXADDRS-1]) {
-				if (!toobig++)
-					dprintf("Too many addresses (%d)\n",
-						MAXADDRS);
-				cp += n;
-				continue;
-			}
-			bcopy(cp, *hap++ = bp, n);
-			bp += n;
-			buflen -= n;
-			cp += n;
-			if (cp != erdata) {
-				h_errno = NO_RECOVERY;
-				return (NULL);
-			}
-			break;
-		default:
-			dprintf("Impossible condition (type=%d)\n", type);
-			h_errno = NO_RECOVERY;
-			return (NULL);
-			/* BIND has abort() here, too risky on bad data */
-		}
-		if (!had_error)
-			haveanswer++;
-	}
-	if (haveanswer) {
-		*ap = NULL;
-		*hap = NULL;
-# if defined(RESOLVSORT)
-		/*
-		 * Note: we sort even if host can take only one address
-		 * in its return structures - should give it the "best"
-		 * address in that case, not some random one
-		 */
-		if (_res.nsort && haveanswer > 1 && qtype == T_A)
-			addrsort(h_addr_ptrs, haveanswer);
-# endif /*RESOLVSORT*/
-		if (!host.h_name) {
-			n = strlen(qname) + 1;	/* for the \0 */
-			if (n > buflen || n >= MAXHOSTNAMELEN)
-				goto no_recovery;
-			strcpy(bp, qname);
-			host.h_name = bp;
-			bp += n;
-			buflen -= n;
-		}
-		if (_res.options & RES_USE_INET6)
-			_map_v4v6_hostent(&host, &bp, &buflen);
-		h_errno = NETDB_SUCCESS;
-		return (&host);
-	}
- no_recovery:
-	h_errno = NO_RECOVERY;
-	return (NULL);
-}
-
-struct hostent *
-__dns_getanswer(answer, anslen, qname, qtype)
-	const char *answer;
-	int anslen;
-	const char *qname;
-	int qtype;
-{
-	switch(qtype) {
-	case T_AAAA:
-		host.h_addrtype = AF_INET6;
-		host.h_length = IN6ADDRSZ;
-		break;
-	case T_A:
-	default:
-		host.h_addrtype = AF_INET;
-		host.h_length = INADDRSZ;
-		break;
-	}
-
-	return(gethostanswer((const querybuf *)answer, anslen, qname, qtype));
-}
-
-struct hostent *
-_gethostbydnsname(name, af)
-	const char *name;
-	int af;
-{
-	querybuf buf;
-	register const char *cp;
-	char *bp;
-	int n, size, type, len;
-
-	if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
-		h_errno = NETDB_INTERNAL;
-		return (NULL);
-	}
-
-	switch (af) {
-	case AF_INET:
-		size = INADDRSZ;
-		type = T_A;
-		break;
-	case AF_INET6:
-		size = IN6ADDRSZ;
-		type = T_AAAA;
-		break;
-	default:
-		h_errno = NETDB_INTERNAL;
-		errno = EAFNOSUPPORT;
-		return (NULL);
-	}
-
-	host.h_addrtype = af;
-	host.h_length = size;
-
-	/*
-	 * if there aren't any dots, it could be a user-level alias.
-	 * this is also done in res_query() since we are not the only
-	 * function that looks up host names.
-	 */
-	if (!strchr(name, '.') && (cp = __hostalias(name)))
-		name = cp;
-
-	/*
-	 * disallow names consisting only of digits/dots, unless
-	 * they end in a dot.
-	 */
-	if (isdigit((int)name[0]))
-		for (cp = name;; ++cp) {
-			if (!*cp) {
-				if (*--cp == '.')
-					break;
-				/*
-				 * All-numeric, no dot at the end.
-				 * Fake up a hostent as if we'd actually
-				 * done a lookup.
-				 */
-				if (inet_pton(af, name, host_addr) <= 0) {
-					h_errno = HOST_NOT_FOUND;
-					return (NULL);
-				}
-				strncpy(hostbuf, name, MAXDNAME);
-				hostbuf[MAXDNAME] = '\0';
-				bp = hostbuf + MAXDNAME;
-				len = sizeof hostbuf - MAXDNAME;
-				host.h_name = hostbuf;
-				host.h_aliases = host_aliases;
-				host_aliases[0] = NULL;
-				h_addr_ptrs[0] = (char *)host_addr;
-				h_addr_ptrs[1] = NULL;
-				host.h_addr_list = h_addr_ptrs;
-				if (_res.options & RES_USE_INET6)
-					_map_v4v6_hostent(&host, &bp, &len);
-				h_errno = NETDB_SUCCESS;
-				return (&host);
-			}
-			if (!isdigit((int)*cp) && *cp != '.') 
-				break;
-		}
-	if ((isxdigit((int)name[0]) && strchr(name, ':') != NULL) ||
-	    name[0] == ':')
-		for (cp = name;; ++cp) {
-			if (!*cp) {
-				if (*--cp == '.')
-					break;
-				/*
-				 * All-IPv6-legal, no dot at the end.
-				 * Fake up a hostent as if we'd actually
-				 * done a lookup.
-				 */
-				if (inet_pton(af, name, host_addr) <= 0) {
-					h_errno = HOST_NOT_FOUND;
-					return (NULL);
-				}
-				strncpy(hostbuf, name, MAXDNAME);
-				hostbuf[MAXDNAME] = '\0';
-				bp = hostbuf + MAXDNAME;
-				len = sizeof hostbuf - MAXDNAME;
-				host.h_name = hostbuf;
-				host.h_aliases = host_aliases;
-				host_aliases[0] = NULL;
-				h_addr_ptrs[0] = (char *)host_addr;
-				h_addr_ptrs[1] = NULL;
-				host.h_addr_list = h_addr_ptrs;
-				h_errno = NETDB_SUCCESS;
-				return (&host);
-			}
-			if (!isxdigit((int)*cp) && *cp != ':' && *cp != '.') 
-				break;
-		}
-
-	if ((n = res_search(name, C_IN, type, buf.buf, sizeof(buf))) < 0) {
-		dprintf("res_search failed (%d)\n", n);
-		return (NULL);
-	}
-	return (gethostanswer(&buf, n, name, type));
-}
-
-struct hostent *
-_gethostbydnsaddr(addr, len, af)
-	const char *addr;	/* XXX should have been def'd as u_char! */
-	int len, af;
-{
-	const u_char *uaddr = (const u_char *)addr;
-	static const u_char mapped[] = { 0,0, 0,0, 0,0, 0,0, 0,0, 0xff,0xff };
-	static const u_char tunnelled[] = { 0,0, 0,0, 0,0, 0,0, 0,0, 0,0 };
-	int n, size;
-	querybuf buf;
-	register struct hostent *hp;
-	char qbuf[MAXDNAME+1], *qp;
-#ifdef SUNSECURITY
-	register struct hostent *rhp;
-	char **haddr;
-	u_long old_options;
-	char hname2[MAXDNAME+1];
-#endif /*SUNSECURITY*/
-	
-	if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
-		h_errno = NETDB_INTERNAL;
-		return (NULL);
-	}
-	if (af == AF_INET6 && len == IN6ADDRSZ &&
-	    (!bcmp(uaddr, mapped, sizeof mapped) ||
-	     !bcmp(uaddr, tunnelled, sizeof tunnelled))) {
-		/* Unmap. */
-		addr += sizeof mapped;
-		uaddr += sizeof mapped;
-		af = AF_INET;
-		len = INADDRSZ;
-	}
-	switch (af) {
-	case AF_INET:
-		size = INADDRSZ;
-		break;
-	case AF_INET6:
-		size = IN6ADDRSZ;
-		break;
-	default:
-		errno = EAFNOSUPPORT;
-		h_errno = NETDB_INTERNAL;
-		return (NULL);
-	}
-	if (size != len) {
-		errno = EINVAL;
-		h_errno = NETDB_INTERNAL;
-		return (NULL);
-	}
-	switch (af) {
-	case AF_INET:
-		(void) sprintf(qbuf, "%u.%u.%u.%u.in-addr.arpa",
-			       (uaddr[3] & 0xff),
-			       (uaddr[2] & 0xff),
-			       (uaddr[1] & 0xff),
-			       (uaddr[0] & 0xff));
-		break;
-	case AF_INET6:
-		qp = qbuf;
-		for (n = IN6ADDRSZ - 1; n >= 0; n--) {
-			qp += SPRINTF((qp, "%x.%x.",
-				       uaddr[n] & 0xf,
-				       (uaddr[n] >> 4) & 0xf));
-		}
-		strcpy(qp, "ip6.int");
-		break;
-	default:
-		abort();
-	}
-	n = res_query(qbuf, C_IN, T_PTR, (u_char *)buf.buf, sizeof buf.buf);
-	if (n < 0) {
-		dprintf("res_query failed (%d)\n", n);
-		return (NULL);
-	}
-	if (!(hp = gethostanswer(&buf, n, qbuf, T_PTR)))
-		return (NULL);	/* h_errno was set by gethostanswer() */
-#ifdef SUNSECURITY
-	if (af == AF_INET) {
-	    /*
-	     * turn off search as the name should be absolute,
-	     * 'localhost' should be matched by defnames
-	     */
-	    strncpy(hname2, hp->h_name, MAXDNAME);
-	    hname2[MAXDNAME] = '\0';
-	    old_options = _res.options;
-	    _res.options &= ~RES_DNSRCH;
-	    _res.options |= RES_DEFNAMES;
-	    if (!(rhp = gethostbyname(hname2))) {
-		syslog(LOG_NOTICE|LOG_AUTH,
-		       "gethostbyaddr: No A record for %s (verifying [%s])",
-		       hname2, inet_ntoa(*((struct in_addr *)addr)));
-		_res.options = old_options;
-		h_errno = HOST_NOT_FOUND;
-		return (NULL);
-	    }
-	    _res.options = old_options;
-	    for (haddr = rhp->h_addr_list; *haddr; haddr++)
-		if (!memcmp(*haddr, addr, INADDRSZ))
-			break;
-	    if (!*haddr) {
-		syslog(LOG_NOTICE|LOG_AUTH,
-		       "gethostbyaddr: A record of %s != PTR record [%s]",
-		       hname2, inet_ntoa(*((struct in_addr *)addr)));
-		h_errno = HOST_NOT_FOUND;
-		return (NULL);
-	    }
-	}
-#endif /*SUNSECURITY*/
-	hp->h_addrtype = af;
-	hp->h_length = len;
-	bcopy(addr, host_addr, len);
-	h_addr_ptrs[0] = (char *)host_addr;
-	h_addr_ptrs[1] = NULL;
-	if (af == AF_INET && (_res.options & RES_USE_INET6)) {
-		_map_v4v6_address((char*)host_addr, (char*)host_addr);
-		hp->h_addrtype = AF_INET6;
-		hp->h_length = IN6ADDRSZ;
-	}
-	h_errno = NETDB_SUCCESS;
-	return (hp);
-}
-
-#ifdef RESOLVSORT
-static void
-addrsort(ap, num)
-	char **ap;
-	int num;
-{
-	int i, j;
-	char **p;
-	short aval[MAXADDRS];
-	int needsort = 0;
-
-	p = ap;
-	for (i = 0; i < num; i++, p++) {
-	    for (j = 0 ; (unsigned)j < _res.nsort; j++)
-		if (_res.sort_list[j].addr.s_addr == 
-		    (((struct in_addr *)(*p))->s_addr & _res.sort_list[j].mask))
-			break;
-	    aval[i] = j;
-	    if (needsort == 0 && i > 0 && j < aval[i-1])
-		needsort = i;
-	}
-	if (!needsort)
-	    return;
-
-	while (needsort < num) {
-	    for (j = needsort - 1; j >= 0; j--) {
-		if (aval[j] > aval[j+1]) {
-		    char *hp;
-
-		    i = aval[j];
-		    aval[j] = aval[j+1];
-		    aval[j+1] = i;
-
-		    hp = ap[j];
-		    ap[j] = ap[j+1];
-		    ap[j+1] = hp;
-
-		} else
-		    break;
-	    }
-	    needsort++;
-	}
-}
-#endif
-void
-_sethostdnsent(stayopen)
-	int stayopen;
-{
-	if ((_res.options & RES_INIT) == 0 && res_init() == -1)
-		return;
-	if (stayopen)
-		_res.options |= RES_STAYOPEN | RES_USEVC;
-}
-
-void
-_endhostdnsent()
-{
-	_res.options &= ~(RES_STAYOPEN | RES_USEVC);
-	res_close();
-}
diff --git a/c/src/libnetworking/libc/gethostbyht.c b/c/src/libnetworking/libc/gethostbyht.c
deleted file mode 100644
index 29f2805367..0000000000
--- a/c/src/libnetworking/libc/gethostbyht.c
+++ /dev/null
@@ -1,202 +0,0 @@
-/*-
- * Copyright (c) 1985, 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * -
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- * -
- * --Copyright--
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)gethostnamadr.c	8.1 (Berkeley) 6/4/93";
-static char rcsid[] = "$Id$";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <errno.h>
-#include <string.h>
-#include <arpa/nameser.h>	/* XXX */
-#include <resolv.h>		/* XXX */
-
-#define	MAXALIASES	35
-
-static struct hostent host;
-static char *host_aliases[MAXALIASES];
-static char hostbuf[BUFSIZ+1];
-static FILE *hostf = NULL;
-static u_char host_addr[16];	/* IPv4 or IPv6 */
-static char *h_addr_ptrs[2];
-static int stayopen = 0;
-
-void
-_sethosthtent(f)
-	int f;
-{
-	if (!hostf)
-		hostf = fopen(_PATH_HOSTS, "r" );
-	else
-		rewind(hostf);
-	stayopen = f;
-}
-
-void
-_endhosthtent()
-{
-	if (hostf && !stayopen) {
-		(void) fclose(hostf);
-		hostf = NULL;
-	}
-}
-
-struct hostent *
-gethostent()
-{
-	char *p;
-	register char *cp, **q;
-	int af, len;
-
-	if (!hostf && !(hostf = fopen(_PATH_HOSTS, "r" ))) {
-		h_errno = NETDB_INTERNAL;
-		return (NULL);
-	}
- again:
-	if (!(p = fgets(hostbuf, sizeof hostbuf, hostf))) {
-		h_errno = HOST_NOT_FOUND;
-		return (NULL);
-	}
-	if (*p == '#')
-		goto again;
-	if (!(cp = strpbrk(p, "#\n")))
-		goto again;
-	*cp = '\0';
-	if (!(cp = strpbrk(p, " \t")))
-		goto again;
-	*cp++ = '\0';
-	if (inet_pton(AF_INET6, p, host_addr) > 0) {
-		af = AF_INET6;
-		len = IN6ADDRSZ;
-	} else if (inet_pton(AF_INET, p, host_addr) > 0) {
-		if (_res.options & RES_USE_INET6) {
-			_map_v4v6_address((char*)host_addr, (char*)host_addr);
-			af = AF_INET6;
-			len = IN6ADDRSZ;
-		} else {
-			af = AF_INET;
-			len = INADDRSZ;
-		}
-	} else {
-		goto again;
-	}
-	h_addr_ptrs[0] = (char *)host_addr;
-	h_addr_ptrs[1] = NULL;
-	host.h_addr_list = h_addr_ptrs;
-	host.h_length = len;
-	host.h_addrtype = af;
-	while (*cp == ' ' || *cp == '\t')
-		cp++;
-	host.h_name = cp;
-	q = host.h_aliases = host_aliases;
-	if ((cp = strpbrk(cp, " \t")) != NULL)
-		*cp++ = '\0';
-	while (cp && *cp) {
-		if (*cp == ' ' || *cp == '\t') {
-			cp++;
-			continue;
-		}
-		if (q < &host_aliases[MAXALIASES - 1])
-			*q++ = cp;
-		if ((cp = strpbrk(cp, " \t")) != NULL)
-			*cp++ = '\0';
-	}
-	*q = NULL;
-	h_errno = NETDB_SUCCESS;
-	return (&host);
-}
-
-struct hostent *
-_gethostbyhtname(name, af)
-	const char *name;
-	int af;
-{
-	register struct hostent *p;
-	register char **cp;
-	
-	sethostent(0);
-	while ((p = gethostent()) != NULL) {
-		if (p->h_addrtype != af)
-			continue;
-		if (strcasecmp(p->h_name, name) == 0)
-			break;
-		for (cp = p->h_aliases; *cp != 0; cp++)
-			if (strcasecmp(*cp, name) == 0)
-				goto found;
-	}
-found:
-	endhostent();
-	return (p);
-}
-
-struct hostent *
-_gethostbyhtaddr(addr, len, af)
-	const char *addr;
-	int len, af;
-{
-	register struct hostent *p;
-
-	sethostent(0);
-	while ((p = gethostent()) != NULL)
-		if (p->h_addrtype == af && !bcmp(p->h_addr, addr, len))
-			break;
-	endhostent();
-	return (p);
-}
diff --git a/c/src/libnetworking/libc/gethostbyname.3 b/c/src/libnetworking/libc/gethostbyname.3
deleted file mode 100644
index e21dc79f1d..0000000000
--- a/c/src/libnetworking/libc/gethostbyname.3
+++ /dev/null
@@ -1,305 +0,0 @@
-.\" Copyright (c) 1983, 1987, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"     From: @(#)gethostbyname.3	8.4 (Berkeley) 5/25/95
-.\"     $Id$
-.\"
-.Dd May 25, 1995
-.Dt GETHOSTBYNAME 3
-.Os BSD 4.2
-.Sh NAME
-.Nm gethostbyname ,
-.Nm gethostbyname2 ,
-.Nm gethostbyaddr ,
-.Nm gethostent ,
-.Nm sethostent ,
-.Nm endhostent ,
-.Nm herror ,
-.Nm hstrerror
-.Nd get network host entry
-.Sh SYNOPSIS
-.Fd #include <netdb.h>
-.Vt extern int h_errno;
-.Ft struct hostent *
-.Fn gethostbyname "const char *name"
-.Ft struct hostent *
-.Fn gethostbyname2 "const char *name" "int af"
-.Ft struct hostent *
-.Fn gethostbyaddr "const char *addr" "int len" "int type"
-.Ft struct hostent *
-.Fn gethostent void
-.Ft void
-.Fn sethostent "int stayopen"
-.Ft void
-.Fn endhostent void
-.Ft void
-.Fn herror "const char *string"
-.Ft const char *
-.Fn hstrerror "int err"
-.Sh DESCRIPTION
-The
-.Fn gethostbyname ,
-.Fn gethostbyname2
-and
-.Fn gethostbyaddr
-functions
-each return a pointer to an object with the
-following structure describing an internet host
-referenced by name or by address, respectively.
-This structure contains either the information obtained from the name server,
-.Xr named 8 ,
-or broken-out fields from a line in 
-.Pa /etc/hosts .
-If the local name server is not running these routines do a lookup in
-.Pa /etc/hosts .
-.Bd -literal
-struct	hostent {
-	char	*h_name;	/* official name of host */
-	char	**h_aliases;	/* alias list */
-	int	h_addrtype;	/* host address type */
-	int	h_length;	/* length of address */
-	char	**h_addr_list;	/* list of addresses from name server */
-};
-#define	h_addr  h_addr_list[0]	/* address, for backward compatibility */
-.Ed
-.Pp
-The members of this structure are:
-.Bl -tag -width h_addr_list
-.It Fa h_name
-Official name of the host.
-.It Fa h_aliases
-A NULL-terminated array of alternate names for the host.
-.It Fa h_addrtype
-The type of address being returned; usually
-.Dv AF_INET .
-.It Fa h_length
-The length, in bytes, of the address.
-.It Fa h_addr_list
-A NULL-terminated array of network addresses for the host.
-Host addresses are returned in network byte order.
-.It Fa h_addr
-The first address in
-.Fa h_addr_list ;
-this is for backward compatibility.
-.El
-.Pp
-When using the nameserver,
-.Fn gethostbyname
-and
-.Fn gethostbyname
-will search for the named host in the current domain and its parents
-unless the name ends in a dot.
-If the name contains no dot, and if the environment variable
-.Dq Ev HOSTALIASES
-contains the name of an alias file, the alias file will first be searched
-for an alias matching the input name.
-See
-.Xr hostname 7
-for the domain search procedure and the alias file format.
-.Pp
-The
-.Fn gethostbyname2
-function is an evolution of
-.Fn gethostbyname
-which is intended to allow lookups in address families other than
-.Dv AF_INET ,
-for example
-.Dv AF_INET6 .
-Currently the
-.Fa af
-argument must be specified as
-.Dv AF_INET
-else the function will return
-.Dv NULL
-after having set
-.Va h_errno
-to
-.Dv NETDB_INTERNAL
-.Pp
-The
-.Fn sethostent
-function
-may be used to request the use of a connected
-.Tn TCP
-socket for queries.
-If the
-.Fa stayopen
-flag is non-zero,
-this sets the option to send all queries to the name server using
-.Tn TCP
-and to retain the connection after each call to 
-.Fn gethostbyname ,
-.Fn gethostbyname2
-or
-.Fn gethostbyaddr .
-Otherwise, queries are performed using
-.Tn UDP
-datagrams.
-.Pp
-The
-.Fn endhostent
-function
-closes the
-.Tn TCP
-connection.
-.Pp
-The
-.Fn herror
-function writes a message to the diagnostic output consisting of the
-string parameter
-.Fa s ,
-the constant string ": ", and a message corresponding to the value of
-.Va h_errno .
-.Pp
-The
-.Fn hstrerror
-function returns a string which is the message text corresponding to the
-value of the
-.Fa err
-parameter.
-.Sh FILES
-.Bl -tag -width /etc/resolv.conf -compact
-.It Pa /etc/hosts
-.It Pa /etc/host.conf
-.It Pa /etc/resolv.conf
-.El
-.Sh DIAGNOSTICS
-Error return status from 
-.Fn gethostbyname ,
-.Fn gethostbyname2
-and
-.Fn gethostbyaddr
-is indicated by return of a null pointer.
-The external integer
-.Va h_errno
-may then be checked to see whether this is a temporary failure
-or an invalid or unknown host.
-The routine
-.Fn herror
-can be used to print an error message describing the failure.
-If its argument
-.Fa string
-is
-.Pf non Dv -NULL ,
-it is printed, followed by a colon and a space.
-The error message is printed with a trailing newline.
-.Pp
-The variable
-.Va h_errno
-can have the following values:
-.Bl -tag -width HOST_NOT_FOUND
-.It Dv HOST_NOT_FOUND
-No such host is known.
-.It Dv TRY_AGAIN
-This is usually a temporary error
-and means that the local server did not receive
-a response from an authoritative server.
-A retry at some later time may succeed.
-.It Dv NO_RECOVERY
-Some unexpected server failure was encountered.
-This is a non-recoverable error.
-.It Dv NO_DATA
-The requested name is valid but does not have an IP address; 
-this is not a temporary error.  
-This means that the name is known to the name server but there is no address
-associated with this name.
-Another type of request to the name server using this domain name
-will result in an answer;
-for example, a mail-forwarder may be registered for this domain.
-.El
-.Sh SEE ALSO
-.Xr resolver 3 ,
-.Xr hosts 5 ,
-.Xr hostname 7 ,
-.Xr named 8
-.Sh CAVEAT
-The
-.Fn gethostent
-function
-is defined, and
-.Fn sethostent
-and
-.Fn endhostent
-are redefined,
-when
-.Xr libc 3
-is built to use only the routines to lookup in
-.Pa /etc/hosts
-and not the name server.
-.Pp
-The
-.Fn gethostent
-function
-reads the next line of
-.Pa /etc/hosts ,
-opening the file if necessary.
-.Pp
-The
-.Fn sethostent
-function
-opens and/or rewinds the file
-.Pa /etc/hosts .
-If the
-.Fa stayopen
-argument is non-zero,
-the file will not be closed after each call to
-.Fn gethostbyname ,
-.Fn gethostbyname2
-or
-.Fn gethostbyaddr .
-.Pp
-The
-.Fn endhostent
-function
-closes the file.
-.Sh HISTORY
-The
-.Fn herror
-function appeared in 
-.Bx 4.3 .
-The
-.Fn endhostent ,
-.Fn gethostbyaddr ,
-.Fn gethostbyname ,
-.Fn gethostent ,
-and
-.Fn sethostent
-functions appeared in
-.Bx 4.2 .
-The
-.Fn gethostbyname2
-function first appeared in bind-4.9.4.
-.Sh BUGS
-These functions use static data storage;
-if the data is needed for future use, it should be
-copied before any subsequent calls overwrite it.
-Only the Internet
-address format is currently understood.
diff --git a/c/src/libnetworking/libc/gethostbynis.c b/c/src/libnetworking/libc/gethostbynis.c
deleted file mode 100644
index 45dbe5a85d..0000000000
--- a/c/src/libnetworking/libc/gethostbynis.c
+++ /dev/null
@@ -1,142 +0,0 @@
-/*-
- * Copyright (c) 1994, Garrett Wollman
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)$Id$";
-static char rcsid[] = "$Id$";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <errno.h>
-#include <string.h>
-#ifdef YP
-#include <rpc/rpc.h>
-#include <rpcsvc/yp_prot.h>
-#include <rpcsvc/ypclnt.h>
-#endif
-
-#define	MAXALIASES	35
-#define	MAXADDRS	35
-
-#ifdef YP
-static char *host_aliases[MAXALIASES];
-static char hostaddr[MAXADDRS];
-static char *host_addrs[2];
-#endif /* YP */
-
-static struct hostent *
-_gethostbynis(name, map, af)
-	const char *name;
-	char *map;
-	int af;
-{
-#ifdef YP
-	register char *cp, **q;
-	char *result;
-	int resultlen;
-	static struct hostent h;
-	static char *domain = (char *)NULL;
-	static char ypbuf[YPMAXRECORD + 2];
-
-	switch(af) {
-	case AF_INET:
-		break;
-	default:
-	case AF_INET6:
-		errno = EAFNOSUPPORT;
-		return NULL;
-	}
-
-	if (domain == (char *)NULL)
-		if (yp_get_default_domain (&domain))
-			return ((struct hostent *)NULL);
-
-	if (yp_match(domain, map, name, strlen(name), &result, &resultlen))
-		return ((struct hostent *)NULL);
-
-	/* avoid potential memory leak */
-	bcopy((char *)result, (char *)&ypbuf, resultlen);
-	ypbuf[resultlen] = '\0';
-	free(result);
-	result = (char *)&ypbuf;
-
-	if ((cp = index(result, '\n')))
-		*cp = '\0';
-
-	cp = strpbrk(result, " \t");
-	*cp++ = '\0';
-	h.h_addr_list = host_addrs;
-	h.h_addr = hostaddr;
-	*((u_long *)h.h_addr) = inet_addr(result);
-	h.h_length = sizeof(u_long);
-	h.h_addrtype = AF_INET;
-	while (*cp == ' ' || *cp == '\t')
-		cp++;
-	h.h_name = cp;
-	q = h.h_aliases = host_aliases;
-	cp = strpbrk(cp, " \t");
-	if (cp != NULL)
-		*cp++ = '\0';
-	while (cp && *cp) {
-		if (*cp == ' ' || *cp == '\t') {
-			cp++;
-			continue;
-		}
-		if (q < &host_aliases[MAXALIASES - 1])
-			*q++ = cp;
-		cp = strpbrk(cp, " \t");
-		if (cp != NULL)
-			*cp++ = '\0';
-	}
-	*q = NULL;
-	return (&h);
-#else
-	return (NULL);
-#endif /* YP */
-}
-
-struct hostent *
-_gethostbynisname(name, af)
-	const char *name;
-	int af;
-{
-	return _gethostbynis(name, "hosts.byname", af);
-}
-
-struct hostent *
-_gethostbynisaddr(addr, len, af)
-	const char *addr;
-	int len;
-	int af;
-{
-	return _gethostbynis(inet_ntoa(*(struct in_addr *)addr),"hosts.byaddr", af);
-}
diff --git a/c/src/libnetworking/libc/gethostnamadr.c b/c/src/libnetworking/libc/gethostnamadr.c
deleted file mode 100644
index 92f7a21014..0000000000
--- a/c/src/libnetworking/libc/gethostnamadr.c
+++ /dev/null
@@ -1,224 +0,0 @@
-/*-
- * Copyright (c) 1994, Garrett Wollman
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)$Id$";
-static char rcsid[] = "$Id$";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <errno.h>
-#include <string.h>
-#include <arpa/nameser.h>		/* XXX hack for _res */
-#include <resolv.h>			/* XXX hack for _res */
-
-#define _PATH_HOSTCONF	"/etc/host.conf"
-
-enum service_type {
-  SERVICE_NONE = 0,
-  SERVICE_BIND,
-  SERVICE_HOSTS,
-  SERVICE_NIS };
-#define SERVICE_MAX	SERVICE_NIS
-
-static struct {
-  const char *name;
-  enum service_type type;
-} service_names[] = {
-  { "hosts", SERVICE_HOSTS },
-  { "/etc/hosts", SERVICE_HOSTS },
-  { "hosttable", SERVICE_HOSTS },
-  { "htable", SERVICE_HOSTS },
-  { "bind", SERVICE_BIND },
-  { "dns", SERVICE_BIND },
-  { "domain", SERVICE_BIND },
-  { "yp", SERVICE_NIS },
-  { "yellowpages", SERVICE_NIS },
-  { "nis", SERVICE_NIS },
-  { 0, SERVICE_NONE }
-};
-
-static enum service_type service_order[SERVICE_MAX + 1];
-static int service_done = 0;
-
-static enum service_type
-get_service_name(const char *name) {
-	int i;
-	for(i = 0; service_names[i].type != SERVICE_NONE; i++) {
-		if(!strcasecmp(name, service_names[i].name)) {
-			return service_names[i].type;
-		}
-	}
-	return SERVICE_NONE;
-}
-
-static void
-init_services()
-{
-	char *cp, *p, buf[BUFSIZ];
-	register int cc = 0;
-	FILE *fd;
-
-	if ((fd = (FILE *)fopen(_PATH_HOSTCONF, "r")) == NULL) {
-				/* make some assumptions */
-		service_order[0] = SERVICE_BIND;
-		service_order[1] = SERVICE_HOSTS;
-		service_order[2] = SERVICE_NONE;
-	} else {
-		while (fgets(buf, BUFSIZ, fd) != NULL && cc < SERVICE_MAX) {
-			if(buf[0] == '#')
-				continue;
-
-			p = buf;
-			while ((cp = strsep(&p, "\n \t,:;")) != NULL && *cp == '\0')
-				;
-			if (cp == NULL)
-				continue;
-			do {
-				if (isalpha((int)cp[0])) {
-					service_order[cc] = get_service_name(cp);
-					if(service_order[cc] != SERVICE_NONE)
-						cc++;
-				}
-				while ((cp = strsep(&p, "\n \t,:;")) != NULL && *cp == '\0')
-					;
-			} while(cp != NULL && cc < SERVICE_MAX);
-		}
-		service_order[cc] = SERVICE_NONE;
-		fclose(fd);
-	}
-	service_done = 1;
-}
-
-struct hostent *
-gethostbyname(const char *name)
-{
-	struct hostent *hp;
-
-	if (_res.options & RES_USE_INET6) {		/* XXX */
-		hp = gethostbyname2(name, AF_INET6);	/* XXX */
-		if (hp)					/* XXX */
-			return (hp);			/* XXX */
-	}						/* XXX */
-	return (gethostbyname2(name, AF_INET));
-}
-
-struct hostent *
-gethostbyname2(const char *name, int type)
-{
-	struct hostent *hp = 0;
-	int nserv = 0;
-
-	if (!service_done)
-		init_services();
-
-	while (!hp) {
-		switch (service_order[nserv]) {
-		      case SERVICE_NONE:
-			return NULL;
-		      case SERVICE_HOSTS:
-			hp = _gethostbyhtname(name, type);
-			break;
-		      case SERVICE_BIND:
-			hp = _gethostbydnsname(name, type);
-			break;
-		      case SERVICE_NIS:
-			hp = _gethostbynisname(name, type);
-			break;
-		}
-		nserv++;
-	}
-	return hp;
-}
-
-struct hostent *
-gethostbyaddr(const char *addr, int len, int type)
-{
-	struct hostent *hp = 0;
-	int nserv = 0;
-
-	if (!service_done)
-		init_services();
-
-	while (!hp) {
-		switch (service_order[nserv]) {
-		      case SERVICE_NONE:
-			return 0;
-		      case SERVICE_HOSTS:
-			hp = _gethostbyhtaddr(addr, len, type);
-			break;
-		      case SERVICE_BIND:
-			hp = _gethostbydnsaddr(addr, len, type);
-			break;
-		      case SERVICE_NIS:
-			hp = _gethostbynisaddr(addr, len, type);
-			break;
-		}
-		nserv++;
-	}
-	return hp;
-}
-
-#ifdef _THREAD_SAFE
-struct hostent_data;
-
-/*
- * Temporary function (not thread safe)
- */
-int gethostbyaddr_r(const char *addr, int len, int type,
-	struct hostent *result, struct hostent_data *buffer)
-{
-	struct hostent *hp;
-	int ret;
-	if ((hp = gethostbyaddr(addr, len, type)) == NULL) {
-		ret = -1;
-	} else {
-		memcpy(result, hp, sizeof(struct hostent));
-		ret = 0;
-	}
-	return(ret);
-}
-#endif
-
-void
-sethostent(stayopen)
-	int stayopen;
-{
-	_sethosthtent(stayopen);
-	_sethostdnsent(stayopen);
-}
-
-void
-endhostent()
-{
-	_endhosthtent();
-	_endhostdnsent();
-}
diff --git a/c/src/libnetworking/libc/gethostname.c b/c/src/libnetworking/libc/gethostname.c
deleted file mode 100644
index 81dc2267c2..0000000000
--- a/c/src/libnetworking/libc/gethostname.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- *  $Id$
- */
-
-#include "config.h"
-
-/*
- * Solaris doesn't include the gethostname call by default.
- */
-#include <sys/utsname.h>
-#include <sys/systeminfo.h>
-
-#include <netdb.h>
-
-/*
- * PUBLIC: #ifndef HAVE_GETHOSTNAME
- * PUBLIC: int gethostname __P((char *, int));
- * PUBLIC: #endif
- */
-int
-gethostname(host, len)
-	char *host;
-	int len;
-{
-	return (sysinfo(SI_HOSTNAME, host, len) == -1 ? -1 : 0);
-}
diff --git a/c/src/libnetworking/libc/getnetbydns.c b/c/src/libnetworking/libc/getnetbydns.c
deleted file mode 100644
index 8f8c576332..0000000000
--- a/c/src/libnetworking/libc/getnetbydns.c
+++ /dev/null
@@ -1,313 +0,0 @@
-/*-
- * Copyright (c) 1985, 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * -
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- * -
- * --Copyright--
- */
-/* Portions Copyright (c) 1993 Carlos Leandro and Rui Salgueiro
- *	Dep. Matematica Universidade de Coimbra, Portugal, Europe
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)gethostnamadr.c	8.1 (Berkeley) 6/4/93";
-static char rcsid[] = "$Id$";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-
-#include <stdio.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <ctype.h>
-#include <errno.h>
-#include <string.h>
-#include <unistd.h>
-#include <syslog.h>
-
-#include "res_config.h"
-
-extern int h_errno;
-
-#define BYADDR 0
-#define BYNAME 1
-#define	MAXALIASES	35
-
-#if PACKETSZ > 1024
-#define	MAXPACKET	PACKETSZ
-#else
-#define	MAXPACKET	1024
-#endif
-
-typedef union {
-	HEADER	hdr;
-	u_char	buf[MAXPACKET];
-} querybuf;
-
-typedef union {
-	long	al;
-	char	ac;
-} align;
-
-static struct netent *
-getnetanswer(answer, anslen, net_i)
-	querybuf *answer;
-	int anslen;
-	int net_i;
-{
-
-	register HEADER *hp;
-	register u_char *cp;
-	register int n;
-	u_char *eom;
-	int type, class, buflen, ancount, qdcount, haveanswer, i, nchar;
-	char aux1[MAXHOSTNAMELEN], aux2[MAXHOSTNAMELEN], ans[MAXHOSTNAMELEN];
-	char *in, *st, *pauxt, *bp, **ap;
-	char *paux1 = &aux1[0], *paux2 = &aux2[0], flag = 0;
-static	struct netent net_entry;
-static	char *net_aliases[MAXALIASES], netbuf[PACKETSZ];
-
-	/*
-	 * find first satisfactory answer
-	 *
-	 *      answer --> +------------+  ( MESSAGE )
-	 *		   |   Header   |
-	 *		   +------------+
-	 *		   |  Question  | the question for the name server
-	 *		   +------------+
-	 *		   |   Answer   | RRs answering the question
-	 *		   +------------+
-	 *		   | Authority  | RRs pointing toward an authority
-	 *		   | Additional | RRs holding additional information
-	 *		   +------------+
-	 */
-	eom = answer->buf + anslen;
-	hp = &answer->hdr;
-	ancount = ntohs(hp->ancount); /* #/records in the answer section */
-	qdcount = ntohs(hp->qdcount); /* #/entries in the question section */
-	bp = netbuf;
-	buflen = sizeof(netbuf);
-	cp = answer->buf + HFIXEDSZ;
-	if (!qdcount) {
-		if (hp->aa)
-			h_errno = HOST_NOT_FOUND;
-		else
-			h_errno = TRY_AGAIN;
-		return (NULL);
-	}
-	while (qdcount-- > 0)
-		cp += __dn_skipname(cp, eom) + QFIXEDSZ;
-	ap = net_aliases;
-	*ap = NULL;
-	net_entry.n_aliases = net_aliases;
-	haveanswer = 0;
-	while (--ancount >= 0 && cp < eom) {
-		n = dn_expand(answer->buf, eom, cp, bp, buflen);
-		if ((n < 0) || !res_dnok(bp))
-			break;
-		cp += n;
-		ans[0] = '\0';
-		(void)strncpy(&ans[0], bp, sizeof(ans) - 1);
-		ans[sizeof(ans) - 1] = '\0';
-		GETSHORT(type, cp);
-		GETSHORT(class, cp);
-		cp += INT32SZ;		/* TTL */
-		GETSHORT(n, cp);
-		if (class == C_IN && type == T_PTR) {
-			n = dn_expand(answer->buf, eom, cp, bp, buflen);
-			if ((n < 0) || !res_hnok(bp)) {
-				cp += n;
-				return (NULL);
-			}
-			cp += n; 
-			*ap++ = bp;
-			bp += strlen(bp) + 1;
-			net_entry.n_addrtype =
-				(class == C_IN) ? AF_INET : AF_UNSPEC;
-			haveanswer++;
-		}
-	}
-	if (haveanswer) {
-		*ap = NULL;
-		switch (net_i) {
-		case BYADDR:
-			net_entry.n_name = *net_entry.n_aliases;
-			net_entry.n_net = 0L;
-			break;
-		case BYNAME:
-			in = *net_entry.n_aliases;
-			net_entry.n_name = &ans[0];
-			aux2[0] = '\0';
-			for (i = 0; i < 4; i++) {
-				for (st = in, nchar = 0;
-				     *st != '.';
-				     st++, nchar++)
-					;
-				if (nchar != 1 || *in != '0' || flag) {
-					flag = 1;
-					(void)strncpy(paux1,
-						      (i==0) ? in : in-1,
-						      (i==0) ?nchar : nchar+1);
-					paux1[(i==0) ? nchar : nchar+1] = '\0';
-					pauxt = paux2;
-					paux2 = strcat(paux1, paux2);
-					paux1 = pauxt;
-				}
-				in = ++st;
-			}		  
-			net_entry.n_net = inet_network(paux2);
-			break;
-		}
-		net_entry.n_aliases++;
-		return (&net_entry);
-	}
-	h_errno = TRY_AGAIN;
-	return (NULL);
-}
-
-struct netent *
-_getnetbydnsaddr(net, net_type)
-	register unsigned long net;
-	register int net_type;
-{
-	unsigned int netbr[4];
-	int nn, anslen;
-	querybuf buf;
-	char qbuf[MAXDNAME];
-	unsigned long net2;
-	struct netent *net_entry;
-
-	if (net_type != AF_INET)
-		return (NULL);
-
-	for (nn = 4, net2 = net; net2; net2 >>= 8)
-		netbr[--nn] = net2 & 0xff;
-	switch (nn) {
-	case 3: 	/* Class A */
-		sprintf(qbuf, "0.0.0.%u.in-addr.arpa", netbr[3]);
-		break;
-	case 2: 	/* Class B */
-		sprintf(qbuf, "0.0.%u.%u.in-addr.arpa", netbr[3], netbr[2]);
-		break;
-	case 1: 	/* Class C */
-		sprintf(qbuf, "0.%u.%u.%u.in-addr.arpa", netbr[3], netbr[2],
-		    netbr[1]);
-		break;
-	case 0: 	/* Class D - E */
-		sprintf(qbuf, "%u.%u.%u.%u.in-addr.arpa", netbr[3], netbr[2],
-		    netbr[1], netbr[0]);
-		break;
-	}
-	anslen = res_query(qbuf, C_IN, T_PTR, (u_char *)&buf, sizeof(buf));
-	if (anslen < 0) {
-#ifdef DEBUG
-		if (_res.options & RES_DEBUG)
-			printf("res_query failed\n");
-#endif
-		return (NULL);
-	}
-	net_entry = getnetanswer(&buf, anslen, BYADDR);
-	if (net_entry) {
-		unsigned u_net = net;	/* maybe net should be unsigned ? */
-
-		/* Strip trailing zeros */
-		while ((u_net & 0xff) == 0 && u_net != 0)
-			u_net >>= 8;
-		net_entry->n_net = u_net;
-		return (net_entry);
-	}
-	return (NULL);
-}
-
-struct netent *
-_getnetbydnsname(net)
-	register const char *net;
-{
-	int anslen;
-	querybuf buf;
-	char qbuf[MAXDNAME];
-
-	if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
-		h_errno = NETDB_INTERNAL;
-		return (NULL);
-	}
-	strncpy(qbuf, net, sizeof(qbuf) - 1);
-	qbuf[sizeof(qbuf) - 1] = '\0';
-	anslen = res_search(qbuf, C_IN, T_PTR, (u_char *)&buf, sizeof(buf));
-	if (anslen < 0) {
-#ifdef DEBUG
-		if (_res.options & RES_DEBUG)
-			printf("res_query failed\n");
-#endif
-		return (NULL);
-	}
-	return getnetanswer(&buf, anslen, BYNAME);
-}
-
-void
-_setnetdnsent(stayopen)
-	int stayopen;
-{
-	if (stayopen)
-		_res.options |= RES_STAYOPEN | RES_USEVC;
-}
-
-void
-_endnetdnsent()
-{
-	_res.options &= ~(RES_STAYOPEN | RES_USEVC);
-	res_close();
-}
diff --git a/c/src/libnetworking/libc/getnetbyht.c b/c/src/libnetworking/libc/getnetbyht.c
deleted file mode 100644
index f7b7b1091d..0000000000
--- a/c/src/libnetworking/libc/getnetbyht.c
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/* Portions Copyright (c) 1993 Carlos Leandro and Rui Salgueiro
- *	Dep. Matematica Universidade de Coimbra, Portugal, Europe
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * from getnetent.c	1.1 (Coimbra) 93/06/02
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getnetent.c	8.1 (Berkeley) 6/4/93";
-static char orig_rcsid[] = "From: Id: getnetent.c,v 8.4 1997/06/01 20:34:37 vixie Exp";
-static chat rcsid[] = "$Id$";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <string.h>
-
-#define	MAXALIASES	35
-
-static FILE *netf;
-static char line[BUFSIZ+1];
-static struct netent net;
-static char *net_aliases[MAXALIASES];
-static int _net_stayopen;
-
-void
-_setnethtent(f)
-	int f;
-{
-
-	if (netf == NULL)
-		netf = fopen(_PATH_NETWORKS, "r" );
-	else
-		rewind(netf);
-	_net_stayopen |= f;
-}
-
-void
-_endnethtent()
-{
-
-	if (netf) {
-		fclose(netf);
-		netf = NULL;
-	}
-	_net_stayopen = 0;
-}
-
-struct netent *
-getnetent()
-{
-	char *p;
-	register char *cp, **q;
-
-	if (netf == NULL && (netf = fopen(_PATH_NETWORKS, "r" )) == NULL)
-		return (NULL);
-again:
-	p = fgets(line, sizeof line, netf);
-	if (p == NULL)
-		return (NULL);
-	if (*p == '#')
-		goto again;
-	cp = strpbrk(p, "#\n");
-	if (cp == NULL)
-		goto again;
-	*cp = '\0';
-	net.n_name = p;
-	cp = strpbrk(p, " \t");
-	if (cp == NULL)
-		goto again;
-	*cp++ = '\0';
-	while (*cp == ' ' || *cp == '\t')
-		cp++;
-	p = strpbrk(cp, " \t");
-	if (p != NULL)
-		*p++ = '\0';
-	net.n_net = inet_network(cp);
-	net.n_addrtype = AF_INET;
-	q = net.n_aliases = net_aliases;
-	if (p != NULL) 
-		cp = p;
-	while (cp && *cp) {
-		if (*cp == ' ' || *cp == '\t') {
-			cp++;
-			continue;
-		}
-		if (q < &net_aliases[MAXALIASES - 1])
-			*q++ = cp;
-		cp = strpbrk(cp, " \t");
-		if (cp != NULL)
-			*cp++ = '\0';
-	}
-	*q = NULL;
-	return (&net);
-}
-
-struct netent *
-_getnetbyhtname(name)
-	register const char *name;
-{
-	register struct netent *p;
-	register char **cp;
-
-	setnetent(_net_stayopen);
-	while ( (p = getnetent()) ) {
-		if (strcasecmp(p->n_name, name) == 0)
-			break;
-		for (cp = p->n_aliases; *cp != 0; cp++)
-			if (strcasecmp(*cp, name) == 0)
-				goto found;
-	}
-found:
-	if (!_net_stayopen)
-		endnetent();
-	return (p);
-}
-
-struct netent *
-_getnetbyhtaddr(net, type)
-	register unsigned long net;
-	register int type;
-{
-	register struct netent *p;
-
-	setnetent(_net_stayopen);
-	while ( (p = getnetent()) )
-		if (p->n_addrtype == type && p->n_net == net)
-			break;
-	if (!_net_stayopen)
-		endnetent();
-	return (p);
-}
diff --git a/c/src/libnetworking/libc/getnetbynis.c b/c/src/libnetworking/libc/getnetbynis.c
deleted file mode 100644
index 0549016ba2..0000000000
--- a/c/src/libnetworking/libc/getnetbynis.c
+++ /dev/null
@@ -1,177 +0,0 @@
-/*-
- * Copyright (c) 1994, Garrett Wollman
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)$Id$";
-static char rcsid[] = "$Id$";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <errno.h>
-#include <string.h>
-#include <arpa/nameser.h>
-#ifdef YP
-#include <rpc/rpc.h>
-#include <rpcsvc/yp_prot.h>
-#include <rpcsvc/ypclnt.h>
-#endif
-
-#define	MAXALIASES	35
-#define	MAXADDRS	35
-
-#ifdef YP
-static char *host_aliases[MAXALIASES];
-#endif /* YP */
-
-static struct netent *
-_getnetbynis(name, map, af)
-	const char *name;
-	char *map;
-	int af;
-{
-#ifdef YP
-	register char *cp, **q;
-	static char *result;
-	int resultlen;
-	static struct netent h;
-	static char *domain = (char *)NULL;
-	static char ypbuf[YPMAXRECORD + 2];
-
-	switch(af) {
-	case AF_INET:
-		break;
-	default:
-	case AF_INET6:
-		errno = EAFNOSUPPORT;
-		return NULL;
-	}
-
-	if (domain == (char *)NULL)
-		if (yp_get_default_domain (&domain))
-			return (NULL);
-
-	if (yp_match(domain, map, name, strlen(name), &result, &resultlen))
-		return (NULL);
-
-	bcopy((char *)result, (char *)&ypbuf, resultlen);
-	ypbuf[resultlen] = '\0';
-	free(result);
-	result = (char *)&ypbuf;
-
-	if ((cp = index(result, '\n')))
-		*cp = '\0';
-
-	cp = strpbrk(result, " \t");
-	*cp++ = '\0';
-	h.n_name = result;
-
-	while (*cp == ' ' || *cp == '\t')
-		cp++;
-
-	h.n_net = inet_network(cp);
-	h.n_addrtype = AF_INET;
-
-	q = h.n_aliases = host_aliases;
-	cp = strpbrk(cp, " \t");
-	if (cp != NULL)
-		*cp++ = '\0';
-	while (cp && *cp) {
-		if (*cp == ' ' || *cp == '\t') {
-			cp++;
-			continue;
-		}
-		if (q < &host_aliases[MAXALIASES - 1])
-			*q++ = cp;
-		cp = strpbrk(cp, " \t");
-		if (cp != NULL)
-			*cp++ = '\0';
-	}
-	*q = NULL;
-	return (&h);
-#else
-	return (NULL);
-#endif
-}
-
-struct netent *
-_getnetbynisname(name)
-	const char *name;
-{
-	return _getnetbynis(name, "networks.byname", AF_INET);
-}
-
-struct netent *
-_getnetbynisaddr(addr, af)
-	unsigned long addr;
-	int af;
-{
-	char *str, *cp;
-	unsigned long net2;
-	int nn;
-	unsigned int netbr[4];
-	char buf[MAXDNAME];
-
-	if (af != AF_INET) {
-		errno = EAFNOSUPPORT;
-		return (NULL);
-	}
-
-        for (nn = 4, net2 = addr; net2; net2 >>= 8) {
-                netbr[--nn] = net2 & 0xff;
-	}
-
-	switch (nn) {
-	case 3:		/* Class A */
-		sprintf(buf, "%u", netbr[3]);
-		break;
-        case 2:		/* Class B */
-		sprintf(buf, "%u.%u", netbr[2], netbr[3]);
-		break;
-        case 1:		/* Class C */
-		sprintf(buf, "%u.%u.%u", netbr[1], netbr[2], netbr[3]);
-                break;
-        case 0:		/* Class D - E */
-		sprintf(buf, "%u.%u.%u.%u", netbr[0], netbr[1],
-			netbr[2], netbr[3]);
-		break;
-	}
-
-	str = (char *)&buf;
-	cp = str + (strlen(str) - 2);
-
-	while(!strcmp(cp, ".0")) {
-		*cp = '\0';
-		cp = str + (strlen(str) - 2);
-	}
-
-	return _getnetbynis(str, "networks.byaddr", af);
-}
diff --git a/c/src/libnetworking/libc/getnetent.3 b/c/src/libnetworking/libc/getnetent.3
deleted file mode 100644
index aec93b5876..0000000000
--- a/c/src/libnetworking/libc/getnetent.3
+++ /dev/null
@@ -1,159 +0,0 @@
-.\" Copyright (c) 1983, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"     @(#)getnetent.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
-.\"
-.Dd June 4, 1993
-.Dt GETNETENT 3
-.Os BSD 4.2
-.Sh NAME
-.Nm getnetent ,
-.Nm getnetbyaddr ,
-.Nm getnetbyname ,
-.Nm setnetent ,
-.Nm endnetent
-.Nd get network entry
-.Sh SYNOPSIS
-.Fd #include <netdb.h>
-.Ft struct netent *
-.Fn getnetent void
-.Ft struct netent *
-.Fn getnetbyname "const char *name"
-.Ft struct netent *
-.Fn getnetbyaddr "unsigned long net" "int type"
-.Ft void
-.Fn setnetent "int stayopen"
-.Ft void
-.Fn endnetent void
-.Sh DESCRIPTION
-The
-.Fn getnetent ,
-.Fn getnetbyname ,
-and
-.Fn getnetbyaddr
-functions
-each return a pointer to an object with the
-following structure
-containing the broken-out
-fields of a line in the network data base,
-.Pa /etc/networks .
-.Bd -literal -offset indent
-struct	netent {
-	char		*n_name;	/* official name of net */
-	char		**n_aliases;	/* alias list */
-	int		n_addrtype;	/* net number type */
-	unsigned long	n_net;		/* net number */
-};
-.Ed
-.Pp
-The members of this structure are:
-.Bl -tag -width n_addrtype
-.It Fa n_name
-The official name of the network.
-.It Fa n_aliases
-A zero terminated list of alternate names for the network.
-.It Fa n_addrtype
-The type of the network number returned; currently only AF_INET.
-.It Fa n_net
-The network number.  Network numbers are returned in machine byte
-order.
-.El
-.Pp
-The
-.Fn getnetent
-function
-reads the next line of the file, opening the file if necessary.
-.Pp
-The
-.Fn setnetent
-function
-opens and rewinds the file.  If the
-.Fa stayopen
-flag is non-zero,
-the net data base will not be closed after each call to 
-.Fn getnetbyname
-or
-.Fn getnetbyaddr .
-.Pp
-The
-.Fn endnetent
-function
-closes the file.
-.Pp
-The
-.Fn getnetbyname
-function
-and
-.Fn getnetbyaddr
-sequentially search from the beginning
-of the file until a matching
-net name or
-net address and type is found,
-or until
-.Dv EOF
-is encountered. The
-.Fa type
-must be
-.Dv AF_INET .
-Network numbers are supplied in host order.
-.Sh FILES
-.Bl -tag -width /etc/networks -compact
-.It Pa /etc/networks
-.El
-.Sh DIAGNOSTICS
-Null pointer
-(0) returned on
-.Dv EOF
-or error.
-.Sh SEE ALSO
-.Xr networks 5
-.Pp
-.%T RFC 1101
-.Sh HISTORY
-The
-.Fn getnetent ,
-.Fn getnetbyaddr ,
-.Fn getnetbyname ,
-.Fn setnetent ,
-and
-.Fn endnetent
-functions appeared in 
-.Bx 4.2 .
-.Sh BUGS
-The data space used by
-these functions is static; if future use requires the data, it should be
-copied before any subsequent calls to these functions overwrite it.
-Only Internet network
-numbers are currently understood.
-Expecting network numbers to fit
-in no more than 32 bits is probably
-naive.
diff --git a/c/src/libnetworking/libc/getnetnamadr.c b/c/src/libnetworking/libc/getnetnamadr.c
deleted file mode 100644
index 4d6597f98c..0000000000
--- a/c/src/libnetworking/libc/getnetnamadr.c
+++ /dev/null
@@ -1,190 +0,0 @@
-/*-
- * Copyright (c) 1994, Garrett Wollman
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$Id$";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <errno.h>
-#include <string.h>
-
-#ifndef _PATH_NETCONF
-#define _PATH_NETCONF	"/etc/host.conf"
-#endif
-
-enum service_type {
-  SERVICE_NONE = 0,
-  SERVICE_BIND,
-  SERVICE_TABLE,
-  SERVICE_NIS };
-#define SERVICE_MAX	SERVICE_NIS
-
-static struct {
-  const char *name;
-  enum service_type type;
-} service_names[] = {
-  { "hosts", SERVICE_TABLE },
-  { "/etc/hosts", SERVICE_TABLE },
-  { "hosttable", SERVICE_TABLE },
-  { "htable", SERVICE_TABLE },
-  { "bind", SERVICE_BIND },
-  { "dns", SERVICE_BIND },
-  { "domain", SERVICE_BIND },
-  { "yp", SERVICE_NIS },
-  { "yellowpages", SERVICE_NIS },
-  { "nis", SERVICE_NIS },
-  { 0, SERVICE_NONE }
-};
-
-static enum service_type service_order[SERVICE_MAX + 1];
-static int service_done = 0;
-
-static enum service_type
-get_service_name(const char *name) {
-	int i;
-	for(i = 0; service_names[i].type != SERVICE_NONE; i++) {
-		if(!strcasecmp(name, service_names[i].name)) {
-			return service_names[i].type;
-		}
-	}
-	return SERVICE_NONE;
-}
-
-static void
-init_services()
-{
-	char *cp, *p, buf[BUFSIZ];
-	register int cc = 0;
-	FILE *fd;
-
-	if ((fd = (FILE *)fopen(_PATH_NETCONF, "r")) == NULL) {
-				/* make some assumptions */
-		service_order[0] = SERVICE_TABLE;
-		service_order[1] = SERVICE_NONE;
-	} else {
-		while (fgets(buf, BUFSIZ, fd) != NULL && cc < SERVICE_MAX) {
-			if(buf[0] == '#')
-				continue;
-
-			p = buf;
-			while ((cp = strsep(&p, "\n \t,:;")) != NULL && *cp == '\0')
-				;
-			if (cp == NULL)
-				continue;
-			do {
-				if (isalpha(cp[0])) {
-					service_order[cc] = get_service_name(cp);
-					if(service_order[cc] != SERVICE_NONE)
-						cc++;
-				}
-				while ((cp = strsep(&p, "\n \t,:;")) != NULL && *cp == '\0')
-					;
-			} while(cp != NULL && cc < SERVICE_MAX);
-		}
-		service_order[cc] = SERVICE_NONE;
-		fclose(fd);
-	}
-	service_done = 1;
-}
-
-struct netent *
-getnetbyname(const char *name)
-{
-	struct netent *hp = 0;
-	int nserv = 0;
-
-	if (!service_done)
-		init_services();
-
-	while (!hp) {
-		switch (service_order[nserv]) {
-		      case SERVICE_NONE:
-			return NULL;
-		      case SERVICE_TABLE:
-			hp = _getnetbyhtname(name);
-			break;
-		      case SERVICE_BIND:
-			hp = _getnetbydnsname(name);
-			break;
-		      case SERVICE_NIS:
-			hp = _getnetbynisname(name);
-			break;
-		}
-		nserv++;
-	}
-	return hp;
-}
-
-struct netent *
-getnetbyaddr(addr, af)
-	u_long addr;
-	int af;
-{
-	struct netent *hp = 0;
-	int nserv = 0;
-
-	if (!service_done)
-		init_services();
-
-	while (!hp) {
-		switch (service_order[nserv]) {
-		      case SERVICE_NONE:
-			return 0;
-		      case SERVICE_TABLE:
-			hp = _getnetbyhtaddr(addr, af);
-			break;
-		      case SERVICE_BIND:
-			hp = _getnetbydnsaddr(addr, af);
-			break;
-		      case SERVICE_NIS:
-			hp = _getnetbynisaddr(addr, af);
-			break;
-		}
-		nserv++;
-	}
-	return hp;
-}
-
-void
-setnetent(stayopen)
-	int stayopen;
-{
-	_setnethtent(stayopen);
-	_setnetdnsent(stayopen);
-}
-
-void
-endnetent()
-{
-	_endnethtent();
-	_endnetdnsent();
-}
diff --git a/c/src/libnetworking/libc/getproto.c b/c/src/libnetworking/libc/getproto.c
deleted file mode 100644
index c2a653f4b4..0000000000
--- a/c/src/libnetworking/libc/getproto.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *  $Id$
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getproto.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
-#include <netdb.h>
-
-extern int _proto_stayopen;
-
-struct protoent *
-getprotobynumber(proto)
-	register int proto;
-{
-	register struct protoent *p;
-
-	setprotoent(_proto_stayopen);
-	while ( (p = getprotoent()) )
-		if (p->p_proto == proto)
-			break;
-	if (!_proto_stayopen)
-		endprotoent();
-	return (p);
-}
diff --git a/c/src/libnetworking/libc/getprotoent.3 b/c/src/libnetworking/libc/getprotoent.3
deleted file mode 100644
index 784461d7e3..0000000000
--- a/c/src/libnetworking/libc/getprotoent.3
+++ /dev/null
@@ -1,147 +0,0 @@
-.\" Copyright (c) 1983, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"     @(#)getprotoent.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
-.\"
-.Dd June 4, 1993
-.Dt GETPROTOENT 3
-.Os BSD 4.2
-.Sh NAME
-.Nm getprotoent ,
-.Nm getprotobynumber ,
-.Nm getprotobyname ,
-.Nm setprotoent ,
-.Nm endprotoent
-.Nd get protocol entry
-.Sh SYNOPSIS
-.Fd #include <netdb.h>
-.Ft struct protoent *
-.Fn getprotoent void
-.Ft struct protoent *
-.Fn getprotobyname "const char *name"
-.Ft struct protoent *
-.Fn getprotobynumber "int proto"
-.Ft void
-.Fn setprotoent "int stayopen"
-.Ft void
-.Fn endprotoent void
-.Sh DESCRIPTION
-The
-.Fn getprotoent ,
-.Fn getprotobyname ,
-and
-.Fn getprotobynumber
-functions
-each return a pointer to an object with the
-following structure
-containing the broken-out
-fields of a line in the network protocol data base,
-.Pa /etc/protocols .
-.Bd -literal -offset indent
-.Pp
-struct	protoent {
-	char	*p_name;	/* official name of protocol */
-	char	**p_aliases;	/* alias list */
-	int	p_proto;	/* protocol number */
-};
-.Ed
-.Pp
-The members of this structure are:
-.Bl -tag -width p_aliases
-.It Fa p_name
-The official name of the protocol.
-.It Fa p_aliases
-A zero terminated list of alternate names for the protocol.
-.It Fa p_proto
-The protocol number.
-.El
-.Pp
-The
-.Fn getprotoent
-function
-reads the next line of the file, opening the file if necessary.
-.Pp
-The
-.Fn setprotoent
-function
-opens and rewinds the file.  If the
-.Fa stayopen
-flag is non-zero,
-the net data base will not be closed after each call to 
-.Fn getprotobyname
-or
-.Fn getprotobynumber .
-.Pp
-The
-.Fn endprotoent
-function
-closes the file.
-.Pp
-The
-.Fn getprotobyname
-function
-and
-.Fn getprotobynumber
-sequentially search from the beginning
-of the file until a matching
-protocol name or
-protocol number is found,
-or until
-.Dv EOF
-is encountered.
-.Sh RETURN VALUES
-Null pointer
-(0) returned on
-.Dv EOF
-or error.
-.Sh FILES
-.Bl -tag -width /etc/protocols -compact
-.It Pa /etc/protocols
-.El
-.Sh SEE ALSO
-.Xr protocols 5
-.Sh HISTORY
-The
-.Fn getprotoent ,
-.Fn getprotobynumber ,
-.Fn getprotobyname ,
-.Fn setprotoent ,
-and
-.Fn endprotoent
-functions appeared in 
-.Bx 4.2 .
-.Sh BUGS
-These functions use a static data space;
-if the data is needed for future use, it should be
-copied before any subsequent calls overwrite it.
-Only the Internet
-protocols are currently understood.
diff --git a/c/src/libnetworking/libc/getprotoent.c b/c/src/libnetworking/libc/getprotoent.c
deleted file mode 100644
index 0b9cefec68..0000000000
--- a/c/src/libnetworking/libc/getprotoent.c
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *  $Id$
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getprotoent.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#define	MAXALIASES	35
-
-static FILE *protof = NULL;
-static char line[BUFSIZ+1];
-static struct protoent proto;
-static char *proto_aliases[MAXALIASES];
-int _proto_stayopen;
-
-void
-setprotoent(f)
-	int f;
-{
-	if (protof == NULL)
-		protof = fopen(_PATH_PROTOCOLS, "r" );
-	else
-		rewind(protof);
-	_proto_stayopen |= f;
-}
-
-void
-endprotoent()
-{
-	if (protof) {
-		fclose(protof);
-		protof = NULL;
-	}
-	_proto_stayopen = 0;
-}
-
-struct protoent *
-getprotoent()
-{
-	char *p;
-	register char *cp, **q;
-
-	if (protof == NULL && (protof = fopen(_PATH_PROTOCOLS, "r" )) == NULL)
-		return (NULL);
-again:
-	if ((p = fgets(line, BUFSIZ, protof)) == NULL)
-		return (NULL);
-	if (*p == '#')
-		goto again;
-	cp = strpbrk(p, "#\n");
-	if (cp == NULL)
-		goto again;
-	*cp = '\0';
-	proto.p_name = p;
-	cp = strpbrk(p, " \t");
-	if (cp == NULL)
-		goto again;
-	*cp++ = '\0';
-	while (*cp == ' ' || *cp == '\t')
-		cp++;
-	p = strpbrk(cp, " \t");
-	if (p != NULL)
-		*p++ = '\0';
-	proto.p_proto = atoi(cp);
-	q = proto.p_aliases = proto_aliases;
-	if (p != NULL) {
-		cp = p;
-		while (cp && *cp) {
-			if (*cp == ' ' || *cp == '\t') {
-				cp++;
-				continue;
-			}
-			if (q < &proto_aliases[MAXALIASES - 1])
-				*q++ = cp;
-			cp = strpbrk(cp, " \t");
-			if (cp != NULL)
-				*cp++ = '\0';
-		}
-	}
-	*q = NULL;
-	return (&proto);
-}
diff --git a/c/src/libnetworking/libc/getprotoname.c b/c/src/libnetworking/libc/getprotoname.c
deleted file mode 100644
index 46880eb005..0000000000
--- a/c/src/libnetworking/libc/getprotoname.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *  $Id$
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getprotoname.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
-#include <netdb.h>
-#include <string.h>
-
-extern int _proto_stayopen;
-
-struct protoent *
-getprotobyname(name)
-	register const char *name;
-{
-	register struct protoent *p;
-	register char **cp;
-
-	setprotoent(_proto_stayopen);
-	while ( (p = getprotoent()) ) {
-		if (strcmp(p->p_name, name) == 0)
-			break;
-		for (cp = p->p_aliases; *cp != 0; cp++)
-			if (strcmp(*cp, name) == 0)
-				goto found;
-	}
-found:
-	if (!_proto_stayopen)
-		endprotoent();
-	return (p);
-}
diff --git a/c/src/libnetworking/libc/getservbyname.c b/c/src/libnetworking/libc/getservbyname.c
deleted file mode 100644
index 19936907d3..0000000000
--- a/c/src/libnetworking/libc/getservbyname.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *  $Id$
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getservbyname.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
-#include <netdb.h>
-#include <string.h>
-
-extern int _serv_stayopen;
-
-struct servent *
-getservbyname(name, proto)
-	const char *name, *proto;
-{
-	register struct servent *p;
-	register char **cp;
-
-#ifdef YP
-	extern char *___getservbyname_yp;
-	extern char *___getservbyproto_yp;
-
-	___getservbyname_yp = (char *)name;
-	___getservbyproto_yp = (char *)proto;
-#endif
-
-	setservent(_serv_stayopen);
-	while ( (p = getservent()) ) {
-		if (strcmp(name, p->s_name) == 0)
-			goto gotname;
-		for (cp = p->s_aliases; *cp; cp++)
-			if (strcmp(name, *cp) == 0)
-				goto gotname;
-		continue;
-gotname:
-		if (proto == 0 || strcmp(p->s_proto, proto) == 0)
-			break;
-	}
-	if (!_serv_stayopen)
-		endservent();
-
-#ifdef YP
-	___getservbyname_yp = NULL;
-	___getservbyproto_yp = NULL;
-#endif
-
-	return (p);
-}
diff --git a/c/src/libnetworking/libc/getservbyport.c b/c/src/libnetworking/libc/getservbyport.c
deleted file mode 100644
index c8433954e1..0000000000
--- a/c/src/libnetworking/libc/getservbyport.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *  $Id$
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getservbyport.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
-#include <netdb.h>
-#include <string.h>
-
-extern int _serv_stayopen;
-
-struct servent *
-getservbyport(port, proto)
-	int port;
-	const char *proto;
-{
-	register struct servent *p;
-
-#ifdef YP
-	extern int ___getservbyport_yp;
-	extern char *___getservbyproto_yp;
-
-	___getservbyport_yp = port;
-	___getservbyproto_yp = (char *)proto;
-#endif
-
-	setservent(_serv_stayopen);
-	while ( (p = getservent()) ) {
-		if (p->s_port != port)
-			continue;
-		if (proto == 0 || strcmp(p->s_proto, proto) == 0)
-			break;
-	}
-	if (!_serv_stayopen)
-		endservent();
-
-#ifdef YP
-	___getservbyport_yp = 0;
-	___getservbyproto_yp = NULL;
-#endif
-
-	return (p);
-}
diff --git a/c/src/libnetworking/libc/getservent.3 b/c/src/libnetworking/libc/getservent.3
deleted file mode 100644
index 79c18a3beb..0000000000
--- a/c/src/libnetworking/libc/getservent.3
+++ /dev/null
@@ -1,156 +0,0 @@
-.\" Copyright (c) 1983, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"     From: @(#)getservent.3	8.3 (Berkeley) 1/12/94
-.\"	$Id$
-.\"
-.Dd July 9, 1995
-.Dt GETSERVENT 3
-.Os BSD 4.2
-.Sh NAME
-.Nm getservent ,
-.Nm getservbyport ,
-.Nm getservbyname ,
-.Nm setservent ,
-.Nm endservent
-.Nd get service entry
-.Sh SYNOPSIS
-.Fd #include <netdb.h>
-.Ft struct servent *
-.Fn getservent 
-.Ft struct servent *
-.Fn getservbyname "const char *name" "const char *proto"
-.Ft struct servent *
-.Fn getservbyport "int port" "const char *proto"
-.Ft void
-.Fn setservent "int stayopen"
-.Ft void
-.Fn endservent void
-.Sh DESCRIPTION
-The
-.Fn getservent ,
-.Fn getservbyname ,
-and
-.Fn getservbyport
-functions
-each return a pointer to an object with the
-following structure
-containing the broken-out
-fields of a line in the network services data base,
-.Pa /etc/services .
-.Bd -literal -offset indent
-struct	servent {
-	char	*s_name;	/* official name of service */
-	char	**s_aliases;	/* alias list */
-	int	s_port;		/* port service resides at */
-	char	*s_proto;	/* protocol to use */
-};
-.Ed
-.Pp
-The members of this structure are:
-.Bl -tag -width s_aliases
-.It Fa s_name
-The official name of the service.
-.It Fa s_aliases
-A zero terminated list of alternate names for the service.
-.It Fa s_port
-The port number at which the service resides.
-Port numbers are returned in network byte order.
-.It Fa s_proto
-The name of the protocol to use when contacting the
-service.
-.El
-.Pp
-The
-.Fn getservent
-function
-reads the next line of the file, opening the file if necessary.
-.Pp
-The
-.Fn setservent
-function
-opens and rewinds the file.  If the
-.Fa stayopen
-flag is non-zero,
-the net data base will not be closed after each call to 
-.Fn getservbyname
-or
-.Fn getservbyport .
-.Pp
-The
-.Fn endservent
-function
-closes the file.
-.Pp
-The
-.Fn getservbyname
-and
-.Fn getservbyport
-functions
-sequentially search from the beginning
-of the file until a matching
-protocol name or
-port number is found,
-or until
-.Dv EOF
-is encountered.
-If a protocol name is also supplied (non-
-.Dv NULL ) , 
-searches must also match the protocol.
-.ne 1i
-.Sh FILES
-.Bl -tag -width /etc/services -compact
-.It Pa /etc/services
-.El
-.Sh DIAGNOSTICS
-Null pointer
-(0) returned on
-.Dv EOF
-or error.
-.Sh SEE ALSO
-.Xr getprotoent 3 ,
-.Xr services 5
-.Sh HISTORY
-The
-.Fn getservent ,
-.Fn getservbyport ,
-.Fn getservbyname ,
-.Fn setservent ,
-and
-.Fn endservent
-functions appeared in 
-.Bx 4.2 .
-.Sh BUGS
-These functions use static data storage;
-if the data is needed for future use, it should be
-copied before any subsequent calls overwrite it.
-Expecting port numbers to fit in a 32 bit
-quantity is probably naive.
diff --git a/c/src/libnetworking/libc/getservent.c b/c/src/libnetworking/libc/getservent.c
deleted file mode 100644
index 08a05c0975..0000000000
--- a/c/src/libnetworking/libc/getservent.c
+++ /dev/null
@@ -1,280 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *  $Id$
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getservent.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#ifdef YP
-#include <rpc/rpc.h>
-#include <rpcsvc/yp_prot.h>
-#include <rpcsvc/ypclnt.h>
-static int serv_stepping_yp = 0;
-extern int _yp_check __P(( char ** ));
-#endif
-
-
-#define	MAXALIASES	35
-
-static FILE *servf = NULL;
-static char line[BUFSIZ+1];
-static struct servent serv;
-static char *serv_aliases[MAXALIASES];
-int _serv_stayopen;
-
-#ifdef YP
-char *___getservbyname_yp = NULL;
-char *___getservbyproto_yp = NULL;
-int ___getservbyport_yp = 0;
-static char *yp_domain = NULL;
-
-static int
-_getservbyport_yp(line)
-	char *line;
-{
-	char *result;
-	int resultlen;
-	char buf[YPMAXRECORD + 2];
-	int rv;
-
-	snprintf(buf, sizeof(buf), "%d/%s", ntohs(___getservbyport_yp),
-						___getservbyproto_yp);
-
-	___getservbyport_yp = 0;
-	___getservbyproto_yp = NULL;
-
-	if(!yp_domain) {
-		if(yp_get_default_domain(&yp_domain))
-			return (0);
-	}
-
-	/*
-	 * We have to be a little flexible here. Ideally you're supposed
-	 * to have both a services.byname and a services.byport map, but
-	 * some systems have only services.byname. FreeBSD cheats a little
-	 * by putting the services.byport information in the same map as
-	 * services.byname so that either case will work. We allow for both
-	 * possibilities here: if there is no services.byport map, we try
-	 * services.byname instead.
-	 */
-	if ((rv = yp_match(yp_domain, "services.byport", buf, strlen(buf),
-						&result, &resultlen))) {
-		if (rv == YPERR_MAP) {
-			if (yp_match(yp_domain, "services.byname", buf,
-					strlen(buf), &result, &resultlen))
-			return(0);
-		} else
-			return(0);
-	}
-		
-	/* getservent() expects lines terminated with \n -- make it happy */
-	snprintf(line, BUFSIZ, "%.*s\n", resultlen, result);
-
-	free(result);
-	return(1);
-}
-
-static int
-_getservbyname_yp(line)
-	char *line;
-{
-	char *result;
-	int resultlen;
-	char buf[YPMAXRECORD + 2];
-
-	if(!yp_domain) {
-		if(yp_get_default_domain(&yp_domain))
-			return (0);
-	}
-
-	snprintf(buf, sizeof(buf), "%s/%s", ___getservbyname_yp,
-						___getservbyproto_yp);
-
-	___getservbyname_yp = 0;
-	___getservbyproto_yp = NULL;
-
-	if (yp_match(yp_domain, "services.byname", buf, strlen(buf),
-						&result, &resultlen)) {
-		return(0);
-	}
-		
-	/* getservent() expects lines terminated with \n -- make it happy */
-	snprintf(line, BUFSIZ, "%.*s\n", resultlen, result);
-
-	free(result);
-	return(1);
-}
-
-static int
-_getservent_yp(line)
-	char *line;
-{
-	static char *key = NULL;
-	static int keylen;
-	char *lastkey, *result;
-	int resultlen;
-	int rv;
-
-	if(!yp_domain) {
-		if(yp_get_default_domain(&yp_domain))
-			return (0);
-	}
-
-	if (!serv_stepping_yp) {
-		if (key)
-			free(key);
-		if ((rv = yp_first(yp_domain, "services.byname", &key, &keylen,
-			     &result, &resultlen))) {
-			serv_stepping_yp = 0;
-			return(0);
-		}
-		serv_stepping_yp = 1;
-	} else {
-		lastkey = key;
-		rv = yp_next(yp_domain, "services.byname", key, keylen, &key,
-			     &keylen, &result, &resultlen);
-		free(lastkey);
-		if (rv) {
-			serv_stepping_yp = 0;
-			return (0);
-		}
-	}
-
-	/* getservent() expects lines terminated with \n -- make it happy */
-	snprintf(line, BUFSIZ, "%.*s\n", resultlen, result);
-
-	free(result);
-
-	return(1);
-}
-#endif
-
-void
-setservent(f)
-	int f;
-{
-	if (servf == NULL)
-		servf = fopen(_PATH_SERVICES, "r" );
-	else
-		rewind(servf);
-	_serv_stayopen |= f;
-}
-
-void
-endservent()
-{
-	if (servf) {
-		fclose(servf);
-		servf = NULL;
-	}
-	_serv_stayopen = 0;
-}
-
-struct servent *
-getservent()
-{
-	char *p;
-	register char *cp, **q;
-
-#ifdef YP
-	if (serv_stepping_yp && _getservent_yp(line)) {
-		p = (char *)&line;
-		goto unpack;
-	}
-tryagain:
-#endif
-	if (servf == NULL && (servf = fopen(_PATH_SERVICES, "r" )) == NULL)
-		return (NULL);
-again:
-	if ((p = fgets(line, BUFSIZ, servf)) == NULL)
-		return (NULL);
-#ifdef YP
-	if (*p == '+' && _yp_check(NULL)) {
-		if (___getservbyname_yp != NULL) {
-			if (!_getservbyname_yp(line))
-				goto tryagain;
-		} 
-		else if (___getservbyport_yp != 0) {
-			if (!_getservbyport_yp(line))
-				goto tryagain;
-		}
-		else if (!_getservent_yp(line))
-			goto tryagain;
-	}
-unpack:
-#endif
-	if (*p == '#')
-		goto again;
-	cp = strpbrk(p, "#\n");
-	if (cp == NULL)
-		goto again;
-	*cp = '\0';
-	serv.s_name = p;
-	p = strpbrk(p, " \t");
-	if (p == NULL)
-		goto again;
-	*p++ = '\0';
-	while (*p == ' ' || *p == '\t')
-		p++;
-	cp = strpbrk(p, ",/");
-	if (cp == NULL)
-		goto again;
-	*cp++ = '\0';
-	serv.s_port = htons((u_short)atoi(p));
-	serv.s_proto = cp;
-	q = serv.s_aliases = serv_aliases;
-	cp = strpbrk(cp, " \t");
-	if (cp != NULL)
-		*cp++ = '\0';
-	while (cp && *cp) {
-		if (*cp == ' ' || *cp == '\t') {
-			cp++;
-			continue;
-		}
-		if (q < &serv_aliases[MAXALIASES - 1])
-			*q++ = cp;
-		cp = strpbrk(cp, " \t");
-		if (cp != NULL)
-			*cp++ = '\0';
-	}
-	*q = NULL;
-	return (&serv);
-}
diff --git a/c/src/libnetworking/libc/herror.c b/c/src/libnetworking/libc/herror.c
deleted file mode 100644
index ba1dae934d..0000000000
--- a/c/src/libnetworking/libc/herror.c
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright (c) 1987, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * Portions Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)herror.c	8.1 (Berkeley) 6/4/93";
-static char rcsid[] = "$Id$";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <sys/uio.h>
-#include <netdb.h>
-#include <string.h>
-#include <unistd.h>
-
-const char *h_errlist[] = {
-	"Resolver Error 0 (no error)",
-	"Unknown host",				/* 1 HOST_NOT_FOUND */
-	"Host name lookup failure",		/* 2 TRY_AGAIN */
-	"Unknown server error",			/* 3 NO_RECOVERY */
-	"No address associated with name",	/* 4 NO_ADDRESS */
-};
-int	h_nerr = { sizeof h_errlist / sizeof h_errlist[0] };
-
-int	h_errno;
-
-/*
- * herror --
- *	print the error indicated by the h_errno value.
- */
-void
-herror(s)
-	const char *s;
-{
-#if 0
-	struct iovec iov[4];
-	register struct iovec *v = iov;
-
-	if (s && *s) {
-		v->iov_base = (char *)s;
-		v->iov_len = strlen(s);
-		v++;
-		v->iov_base = ": ";
-		v->iov_len = 2;
-		v++;
-	}
-	v->iov_base = (char *)hstrerror(h_errno);
-	v->iov_len = strlen(v->iov_base);
-	v++;
-	v->iov_base = "\n";
-	v->iov_len = 1;
-	writev(STDERR_FILENO, iov, (v - iov) + 1);
-#else
-	/*
-	 * RTEMS: no writev yet
-	 */
-	if (s && *s) {
-		write (2, s, strlen (s));
-		write (2, ": ", 2);
-	}
-	s = (char *)hstrerror(h_errno);
-	write (2, s, strlen (s));
-	write (2, "\n", 1);
-#endif
-}
-
-const char *
-hstrerror(err)
-	int err;
-{
-	if (err < 0)
-		return ("Resolver internal error");
-	else if (err < h_nerr)
-		return (h_errlist[err]);
-	return ("Unknown resolver error");
-}
diff --git a/c/src/libnetworking/libc/inet.3 b/c/src/libnetworking/libc/inet.3
deleted file mode 100644
index 1052f538f2..0000000000
--- a/c/src/libnetworking/libc/inet.3
+++ /dev/null
@@ -1,210 +0,0 @@
-.\" Copyright (c) 1983, 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"     From: @(#)inet.3	8.1 (Berkeley) 6/4/93
-.\"	$Id$
-.\"
-.Dd June 17, 1996
-.Dt INET 3
-.Os BSD 4.2
-.Sh NAME
-.Nm inet_aton ,
-.Nm inet_addr ,
-.Nm inet_network ,
-.Nm inet_ntoa ,
-.Nm inet_makeaddr ,
-.Nm inet_lnaof ,
-.Nm inet_netof
-.Nd Internet address manipulation routines
-.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/socket.h>
-.Fd #include <netinet/in.h>
-.Fd #include <arpa/inet.h>
-.Ft int 
-.Fn inet_aton "const char *cp" "struct in_addr *pin"
-.Ft unsigned long 
-.Fn inet_addr "const char *cp"
-.Ft unsigned long 
-.Fn inet_network "const char *cp"
-.Ft char *
-.Fn inet_ntoa "struct in_addr in"
-.Ft struct in_addr 
-.Fn inet_makeaddr "unsigned long net" "unsigned long lna"
-.Ft unsigned long 
-.Fn inet_lnaof "struct in_addr in"
-.Ft unsigned long 
-.Fn inet_netof "struct in_addr in"
-.Sh DESCRIPTION
-The routines
-.Fn inet_aton ,
-.Fn inet_addr
-and
-.Fn inet_network
-interpret character strings representing
-numbers expressed in the Internet standard
-.Ql \&.
-notation.
-The
-.Fn inet_aton
-routine interprets the specified character string as an Internet address,
-placing the address into the structure provided.
-It returns 1 if the string was successfully interpreted,
-or 0 if the string is invalid.
-The
-.Fn inet_addr
-and
-.Fn inet_network
-functions return numbers suitable for use
-as Internet addresses and Internet network
-numbers, respectively.
-The routine
-.Fn inet_ntoa
-takes an Internet address and returns an
-.Tn ASCII
-string representing the address in
-.Ql \&.
-notation.  The routine
-.Fn inet_makeaddr
-takes an Internet network number and a local
-network address and constructs an Internet address
-from it.  The routines
-.Fn inet_netof
-and
-.Fn inet_lnaof
-break apart Internet host addresses, returning
-the network number and local network address part,
-respectively.
-.Pp
-All Internet addresses are returned in network
-order (bytes ordered from left to right).
-All network numbers and local address parts are
-returned as machine format integer values.
-.Sh INTERNET ADDRESSES
-Values specified using the
-.Ql \&.
-notation take one
-of the following forms:
-.Bd -literal -offset indent
-a.b.c.d
-a.b.c
-a.b
-a
-.Ed
-.Pp
-When four parts are specified, each is interpreted
-as a byte of data and assigned, from left to right,
-to the four bytes of an Internet address.  Note
-that when an Internet address is viewed as a 32-bit
-integer quantity on the
-.Tn VAX
-the bytes referred to
-above appear as
-.Dq Li d.c.b.a .
-That is,
-.Tn VAX
-bytes are
-ordered from right to left.
-.Pp
-When a three part address is specified, the last
-part is interpreted as a 16-bit quantity and placed
-in the right-most two bytes of the network address.
-This makes the three part address format convenient
-for specifying Class B network addresses as
-.Dq Li 128.net.host .
-.Pp
-When a two part address is supplied, the last part
-is interpreted as a 24-bit quantity and placed in
-the right most three bytes of the network address.
-This makes the two part address format convenient
-for specifying Class A network addresses as
-.Dq Li net.host .
-.Pp
-When only one part is given, the value is stored
-directly in the network address without any byte
-rearrangement.
-.Pp
-All numbers supplied as
-.Dq parts
-in a
-.Ql  \&.
-notation
-may be decimal, octal, or hexadecimal, as specified
-in the C language (i.e., a leading 0x or 0X implies
-hexadecimal; otherwise, a leading 0 implies octal;
-otherwise, the number is interpreted as decimal).
-.Pp
-The
-.Fn inet_aton
-and
-.Fn inet_ntoa
-functions are semi-deprecated in favor of the
-.Xr addr2ascii 3
-family.  However, since those functions are not yet widely implemented,
-portable programs cannot rely on their presence and will continue
-to use the
-.Xr inet 3
-functions for some time.
-.Sh DIAGNOSTICS
-The constant
-.Dv INADDR_NONE
-is returned by
-.Fn inet_addr
-and
-.Fn inet_network
-for malformed requests.
-.Sh SEE ALSO
-.Xr addr2ascii 3 ,
-.Xr gethostbyname 3 ,
-.Xr getnetent 3 ,
-.Xr hosts 5 ,
-.Xr networks 5
-.Sh HISTORY
-These
-functions appeared in 
-.Bx 4.2 .
-.Sh BUGS
-The value
-.Dv INADDR_NONE
-(0xffffffff) is a valid broadcast address, but
-.Fn inet_addr
-cannot return that value without indicating failure.
-The newer
-.Fn inet_aton
-function does not share this problem.
-The problem of host byte ordering versus network byte ordering is
-confusing.
-The string returned by
-.Fn inet_ntoa
-resides in a static memory area.
-.Pp
-Inet_addr should return a
-.Fa struct in_addr .
diff --git a/c/src/libnetworking/libc/inet_addr.c b/c/src/libnetworking/libc/inet_addr.c
deleted file mode 100644
index 225ccc1269..0000000000
--- a/c/src/libnetworking/libc/inet_addr.c
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- * ++Copyright++ 1983, 1990, 1993
- * -
- * Copyright (c) 1983, 1990, 1993
- *    The Regents of the University of California.  All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- * 	This product includes software developed by the University of
- * 	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * -
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- * -
- * --Copyright--
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)inet_addr.c	8.1 (Berkeley) 6/17/93";
-static char rcsid[] = "$Id$";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/param.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <ctype.h>
-
-/*
- * Ascii internet address interpretation routine.
- * The value returned is in network order.
- */
-u_long
-inet_addr(cp)
-	register const char *cp;
-{
-	struct in_addr val;
-
-	if (inet_aton(cp, &val))
-		return (val.s_addr);
-	return (INADDR_NONE);
-}
-
-/* 
- * Check whether "cp" is a valid ascii representation
- * of an Internet address and convert to a binary address.
- * Returns 1 if the address is valid, 0 if not.
- * This replaces inet_addr, the return value from which
- * cannot distinguish between failure and a local broadcast address.
- */
-int
-inet_aton(cp, addr)
-	register const char *cp;
-	struct in_addr *addr;
-{
-	register u_long val;
-	register int base, n;
-	register char c;
-	u_int parts[4];
-	register u_int *pp = parts;
-
-	c = *cp;
-	for (;;) {
-		/*
-		 * Collect number up to ``.''.
-		 * Values are specified as for C:
-		 * 0x=hex, 0=octal, isdigit=decimal.
-		 */
-		if (!isdigit((int)c))
-			return (0);
-		val = 0; base = 10;
-		if (c == '0') {
-			c = *++cp;
-			if (c == 'x' || c == 'X')
-				base = 16, c = *++cp;
-			else
-				base = 8;
-		}
-		for (;;) {
-			if (isascii((int)c) && isdigit((int)c)) {
-				val = (val * base) + (c - '0');
-				c = *++cp;
-			} else if (base == 16 && isascii((int)c) && isxdigit((int)c)) {
-				val = (val << 4) |
-					(c + 10 - (islower((int)c) ? 'a' : 'A'));
-				c = *++cp;
-			} else
-				break;
-		}
-		if (c == '.') {
-			/*
-			 * Internet format:
-			 *	a.b.c.d
-			 *	a.b.c	(with c treated as 16 bits)
-			 *	a.b	(with b treated as 24 bits)
-			 */
-			if (pp >= parts + 3)
-				return (0);
-			*pp++ = val;
-			c = *++cp;
-		} else
-			break;
-	}
-	/*
-	 * Check for trailing characters.
-	 */
-	if (c != '\0' && (!isascii((int)c) || !isspace((int)c)))
-		return (0);
-	/*
-	 * Concoct the address according to
-	 * the number of parts specified.
-	 */
-	n = pp - parts + 1;
-	switch (n) {
-
-	case 0:
-		return (0);		/* initial nondigit */
-
-	case 1:				/* a -- 32 bits */
-		break;
-
-	case 2:				/* a.b -- 8.24 bits */
-		if (val > 0xffffff)
-			return (0);
-		val |= parts[0] << 24;
-		break;
-
-	case 3:				/* a.b.c -- 8.8.16 bits */
-		if (val > 0xffff)
-			return (0);
-		val |= (parts[0] << 24) | (parts[1] << 16);
-		break;
-
-	case 4:				/* a.b.c.d -- 8.8.8.8 bits */
-		if (val > 0xff)
-			return (0);
-		val |= (parts[0] << 24) | (parts[1] << 16) | (parts[2] << 8);
-		break;
-	}
-	if (addr)
-		addr->s_addr = htonl(val);
-	return (1);
-}
diff --git a/c/src/libnetworking/libc/inet_lnaof.c b/c/src/libnetworking/libc/inet_lnaof.c
deleted file mode 100644
index 6ec6a9aef1..0000000000
--- a/c/src/libnetworking/libc/inet_lnaof.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *  $Id$
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)inet_lnaof.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/param.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-/*
- * Return the local network address portion of an
- * internet address; handles class a/b/c network
- * number formats.
- */
-u_long
-inet_lnaof(in)
-	struct in_addr in;
-{
-	register u_long i = ntohl(in.s_addr);
-
-	if (IN_CLASSA(i))
-		return ((i)&IN_CLASSA_HOST);
-	else if (IN_CLASSB(i))
-		return ((i)&IN_CLASSB_HOST);
-	else
-		return ((i)&IN_CLASSC_HOST);
-}
diff --git a/c/src/libnetworking/libc/inet_makeaddr.c b/c/src/libnetworking/libc/inet_makeaddr.c
deleted file mode 100644
index ce84170ed9..0000000000
--- a/c/src/libnetworking/libc/inet_makeaddr.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *  $Id$
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)inet_makeaddr.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/param.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-/*
- * Formulate an Internet address from network + host.  Used in
- * building addresses stored in the ifnet structure.
- */
-struct in_addr
-inet_makeaddr(net, host)
-	u_long net, host;
-{
-	u_long addr;
-
-	if (net < 128)
-		addr = (net << IN_CLASSA_NSHIFT) | (host & IN_CLASSA_HOST);
-	else if (net < 65536)
-		addr = (net << IN_CLASSB_NSHIFT) | (host & IN_CLASSB_HOST);
-	else if (net < 16777216L)
-		addr = (net << IN_CLASSC_NSHIFT) | (host & IN_CLASSC_HOST);
-	else
-		addr = net | host;
-	addr = htonl(addr);
-	return (*(struct in_addr *)&addr);
-}
diff --git a/c/src/libnetworking/libc/inet_net_ntop.c b/c/src/libnetworking/libc/inet_net_ntop.c
deleted file mode 100644
index 4c7893d417..0000000000
--- a/c/src/libnetworking/libc/inet_net_ntop.c
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char orig_rcsid[] = "From Id: inet_net_ntop.c,v 8.2 1996/08/08 06:54:44 vixie Exp";
-static const char rcsid[] = "$Id$";
-#endif
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#ifdef SPRINTF_CHAR
-# define SPRINTF(x) strlen(sprintf/**/x)
-#else
-# define SPRINTF(x) ((size_t)sprintf x)
-#endif
-
-static char *	inet_net_ntop_ipv4 __P((const u_char *src, int bits,
-					char *dst, size_t size));
-
-/*
- * char *
- * inet_net_ntop(af, src, bits, dst, size)
- *	convert network number from network to presentation format.
- *	generates CIDR style result always.
- * return:
- *	pointer to dst, or NULL if an error occurred (check errno).
- * author:
- *	Paul Vixie (ISC), July 1996
- */
-char *
-inet_net_ntop(af, src, bits, dst, size)
-	int af;
-	const void *src;
-	int bits;
-	char *dst;
-	size_t size;
-{
-	switch (af) {
-	case AF_INET:
-		return (inet_net_ntop_ipv4(src, bits, dst, size));
-	default:
-		errno = EAFNOSUPPORT;
-		return (NULL);
-	}
-}
-
-/*
- * static char *
- * inet_net_ntop_ipv4(src, bits, dst, size)
- *	convert IPv4 network number from network to presentation format.
- *	generates CIDR style result always.
- * return:
- *	pointer to dst, or NULL if an error occurred (check errno).
- * note:
- *	network byte order assumed.  this means 192.5.5.240/28 has
- *	0x11110000 in its fourth octet.
- * author:
- *	Paul Vixie (ISC), July 1996
- */
-static char *
-inet_net_ntop_ipv4(src, bits, dst, size)
-	const u_char *src;
-	int bits;
-	char *dst;
-	size_t size;
-{
-	char *odst = dst;
-	char *t;
-	u_int m;
-	int b;
-
-	if (bits < 0 || bits > 32) {
-		errno = EINVAL;
-		return (NULL);
-	}
-	if (bits == 0) {
-		if (size < sizeof "0")
-			goto emsgsize;
-		*dst++ = '0';
-		*dst = '\0';
-	}
-
-	/* Format whole octets. */
-	for (b = bits / 8; b > 0; b--) {
-		if (size < sizeof "255.")
-			goto emsgsize;
-		t = dst;
-		dst += SPRINTF((dst, "%u", *src++));
-		if (b > 1) {
-			*dst++ = '.';
-			*dst = '\0';
-		}
-		size -= (size_t)(dst - t);
-	}
-
-	/* Format partial octet. */
-	b = bits % 8;
-	if (b > 0) {
-		if (size < sizeof ".255")
-			goto emsgsize;
-		t = dst;
-		if (dst != odst)
-			*dst++ = '.';
-		m = ((1 << b) - 1) << (8 - b);
-		dst += SPRINTF((dst, "%u", *src & m));
-		size -= (size_t)(dst - t);
-	}
-
-	/* Format CIDR /width. */
-	if (size < sizeof "/32")
-		goto emsgsize;
-	dst += SPRINTF((dst, "/%u", bits));
-	return (odst);
-
- emsgsize:
-	errno = EMSGSIZE;
-	return (NULL);
-}
diff --git a/c/src/libnetworking/libc/inet_net_pton.c b/c/src/libnetworking/libc/inet_net_pton.c
deleted file mode 100644
index 8915c2a5be..0000000000
--- a/c/src/libnetworking/libc/inet_net_pton.c
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- * Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char orig_rcsid[] = "From Id: inet_net_pton.c,v 1.8 1996/11/21 10:28:12 vixie Exp $";
-static const char rcsid[] = "$Id$";
-#endif
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include <assert.h>
-#include <ctype.h>
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#ifdef SPRINTF_CHAR
-# define SPRINTF(x) strlen(sprintf/**/x)
-#else
-# define SPRINTF(x) ((size_t)sprintf x)
-#endif
-
-static int	inet_net_pton_ipv4 __P((const char *src, u_char *dst,
-					size_t size));
-
-/*
- * static int
- * inet_net_pton(af, src, dst, size)
- *	convert network number from presentation to network format.
- *	accepts hex octets, hex strings, decimal octets, and /CIDR.
- *	"size" is in bytes and describes "dst".
- * return:
- *	number of bits, either imputed classfully or specified with /CIDR,
- *	or -1 if some failure occurred (check errno).  ENOENT means it was
- *	not a valid network specification.
- * author:
- *	Paul Vixie (ISC), June 1996
- */
-int
-inet_net_pton(af, src, dst, size)
-	int af;
-	const char *src;
-	void *dst;
-	size_t size;
-{
-	switch (af) {
-	case AF_INET:
-		return (inet_net_pton_ipv4(src, dst, size));
-	default:
-		errno = EAFNOSUPPORT;
-		return (-1);
-	}
-}
-
-/*
- * static int
- * inet_net_pton_ipv4(src, dst, size)
- *	convert IPv4 network number from presentation to network format.
- *	accepts hex octets, hex strings, decimal octets, and /CIDR.
- *	"size" is in bytes and describes "dst".
- * return:
- *	number of bits, either imputed classfully or specified with /CIDR,
- *	or -1 if some failure occurred (check errno).  ENOENT means it was
- *	not an IPv4 network specification.
- * note:
- *	network byte order assumed.  this means 192.5.5.240/28 has
- *	0x11110000 in its fourth octet.
- * author:
- *	Paul Vixie (ISC), June 1996
- */
-static int
-inet_net_pton_ipv4(src, dst, size)
-	const char *src;
-	u_char *dst;
-	size_t size;
-{
-	static const char
-		xdigits[] = "0123456789abcdef",
-		digits[] = "0123456789";
-	int n, ch, tmp, dirty, bits;
-	const u_char *odst = dst;
-
-	ch = *src++;
-	if (ch == '0' && (src[0] == 'x' || src[0] == 'X')
-	    && isascii(src[1]) && isxdigit(src[1])) {
-		/* Hexadecimal: Eat nybble string. */
-		if (size <= 0)
-			goto emsgsize;
-		*dst = 0, dirty = 0;
-		src++;	/* skip x or X. */
-		while ((ch = *src++) != '\0' &&
-		       isascii(ch) && isxdigit(ch)) {
-			if (isupper(ch))
-				ch = tolower(ch);
-			n = strchr(xdigits, ch) - xdigits;
-			assert(n >= 0 && n <= 15);
-			*dst |= n;
-			if (!dirty++)
-				*dst <<= 4;
-			else if (size-- > 0)
-				*++dst = 0, dirty = 0;
-			else
-				goto emsgsize;
-		}
-		if (dirty)
-			size--;
-	} else if (isascii(ch) && isdigit(ch)) {
-		/* Decimal: eat dotted digit string. */
-		for (;;) {
-			tmp = 0;
-			do {
-				n = strchr(digits, ch) - digits;
-				assert(n >= 0 && n <= 9);
-				tmp *= 10;
-				tmp += n;
-				if (tmp > 255)
-					goto enoent;
-			} while ((ch = *src++) != '\0' &&
-				 isascii(ch) && isdigit(ch));
-			if (size-- <= 0)
-				goto emsgsize;
-			*dst++ = (u_char) tmp;
-			if (ch == '\0' || ch == '/')
-				break;
-			if (ch != '.')
-				goto enoent;
-			ch = *src++;
-			if (!isascii(ch) || !isdigit(ch))
-				goto enoent;
-		}
-	} else
-		goto enoent;
-
-	bits = -1;
-	if (ch == '/' && isascii(src[0]) && isdigit(src[0]) && dst > odst) {
-		/* CIDR width specifier.  Nothing can follow it. */
-		ch = *src++;	/* Skip over the /. */
-		bits = 0;
-		do {
-			n = strchr(digits, ch) - digits;
-			assert(n >= 0 && n <= 9);
-			bits *= 10;
-			bits += n;
-		} while ((ch = *src++) != '\0' && isascii(ch) && isdigit(ch));
-		if (ch != '\0')
-			goto enoent;
-		if (bits > 32)
-			goto emsgsize;
-	}
-
-	/* Firey death and destruction unless we prefetched EOS. */
-	if (ch != '\0')
-		goto enoent;
-
-	/* If nothing was written to the destination, we found no address. */
-	if (dst == odst)
-		goto enoent;
-	/* If no CIDR spec was given, infer width from net class. */
-	if (bits == -1) {
-		if (*odst >= 240)	/* Class E */
-			bits = 32;
-		else if (*odst >= 224)	/* Class D */
-			bits = 4;
-		else if (*odst >= 192)	/* Class C */
-			bits = 24;
-		else if (*odst >= 128)	/* Class B */
-			bits = 16;
-		else			/* Class A */
-			bits = 8;
-		/* If imputed mask is narrower than specified octets, widen. */
-		if (bits >= 8 && bits < ((dst - odst) * 8))
-			bits = (dst - odst) * 8;
-	}
-	/* Extend network to cover the actual mask. */
-	while (bits > ((dst - odst) * 8)) {
-		if (size-- <= 0)
-			goto emsgsize;
-		*dst++ = '\0';
-	}
-	return (bits);
-
- enoent:
-	errno = ENOENT;
-	return (-1);
-
- emsgsize:
-	errno = EMSGSIZE;
-	return (-1);
-}
diff --git a/c/src/libnetworking/libc/inet_neta.c b/c/src/libnetworking/libc/inet_neta.c
deleted file mode 100644
index 59b156f7f6..0000000000
--- a/c/src/libnetworking/libc/inet_neta.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char orig_rcsid[] = "From Id: inet_neta.c,v 8.2 1996/08/08 06:54:44 vixie Exp";
-static const char rcsid[] = "$Id$";
-#endif
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-
-#ifdef SPRINTF_CHAR
-# define SPRINTF(x) strlen(sprintf/**/x)
-#else
-# define SPRINTF(x) ((size_t)sprintf x)
-#endif
-
-/*
- * char *
- * inet_neta(src, dst, size)
- *	format a u_long network number into presentation format.
- * return:
- *	pointer to dst, or NULL if an error occurred (check errno).
- * note:
- *	format of ``src'' is as for inet_network().
- * author:
- *	Paul Vixie (ISC), July 1996
- */
-char *
-inet_neta(src, dst, size)
-	u_long src;
-	char *dst;
-	size_t size;
-{
-	char *odst = dst;
-	char *tp;
-
-	while (src & 0xffffffff) {
-		u_char b = (src & 0xff000000) >> 24;
-
-		src <<= 8;
-		if (b) {
-			if (size < sizeof "255.")
-				goto emsgsize;
-			tp = dst;
-			dst += SPRINTF((dst, "%u", b));
-			if (src != 0L) {
-				*dst++ = '.';
-				*dst = '\0';
-			}
-			size -= (size_t)(dst - tp);
-		}
-	}
-	if (dst == odst) {
-		if (size < sizeof "0.0.0.0")
-			goto emsgsize;
-		strcpy(dst, "0.0.0.0");
-	}
-	return (odst);
-
- emsgsize:
-	errno = EMSGSIZE;
-	return (NULL);
-}
diff --git a/c/src/libnetworking/libc/inet_netof.c b/c/src/libnetworking/libc/inet_netof.c
deleted file mode 100644
index 179731efc3..0000000000
--- a/c/src/libnetworking/libc/inet_netof.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *  $Id$
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)inet_netof.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/param.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-/*
- * Return the network number from an internet
- * address; handles class a/b/c network #'s.
- */
-u_long
-inet_netof(in)
-	struct in_addr in;
-{
-	register u_long i = ntohl(in.s_addr);
-
-	if (IN_CLASSA(i))
-		return (((i)&IN_CLASSA_NET) >> IN_CLASSA_NSHIFT);
-	else if (IN_CLASSB(i))
-		return (((i)&IN_CLASSB_NET) >> IN_CLASSB_NSHIFT);
-	else
-		return (((i)&IN_CLASSC_NET) >> IN_CLASSC_NSHIFT);
-}
diff --git a/c/src/libnetworking/libc/inet_network.c b/c/src/libnetworking/libc/inet_network.c
deleted file mode 100644
index ac0073bf0a..0000000000
--- a/c/src/libnetworking/libc/inet_network.c
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *  $Id$
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)inet_network.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <ctype.h>
-
-/*
- * Internet network address interpretation routine.
- * The library routines call this routine to interpret
- * network numbers.
- */
-u_long
-inet_network(cp)
-	register const char *cp;
-{
-	register u_long val, base, n, i;
-	register char c;
-	u_long parts[4], *pp = parts;
-
-again:
-	val = 0; base = 10;
-	if (*cp == '0')
-		base = 8, cp++;
-	if (*cp == 'x' || *cp == 'X')
-		base = 16, cp++;
-	while ((c = *cp) != 0) {
-		if (isdigit(c)) {
-			val = (val * base) + (c - '0');
-			cp++;
-			continue;
-		}
-		if (base == 16 && isxdigit(c)) {
-			val = (val << 4) + (c + 10 - (islower(c) ? 'a' : 'A'));
-			cp++;
-			continue;
-		}
-		break;
-	}
-	if (*cp == '.') {
-		if (pp >= parts + 3)
-			return (INADDR_NONE);
-		*pp++ = val, cp++;
-		goto again;
-	}
-	if (*cp && !isspace(*cp))
-		return (INADDR_NONE);
-	*pp++ = val;
-	n = pp - parts;
-	for (val = 0, i = 0; i < n; i++) {
-		val <<= 8;
-		val |= parts[i] & 0xff;
-	}
-	return (val);
-}
diff --git a/c/src/libnetworking/libc/inet_ntoa.c b/c/src/libnetworking/libc/inet_ntoa.c
deleted file mode 100644
index 44b686f0b3..0000000000
--- a/c/src/libnetworking/libc/inet_ntoa.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *  $Id$
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)inet_ntoa.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <stdio.h>
-
-/*
- * Convert network-format internet address
- * to base 256 d.d.d.d representation.
- */
-char *
-inet_ntoa(in)
-	struct in_addr in;
-{
-	static char ret[18];
-
-	strcpy(ret, "[inet_ntoa error]");
-	(void) inet_ntop(AF_INET, &in, ret, sizeof ret);
-	return (ret);
-}
diff --git a/c/src/libnetworking/libc/inet_ntop.c b/c/src/libnetworking/libc/inet_ntop.c
deleted file mode 100644
index 76a538755a..0000000000
--- a/c/src/libnetworking/libc/inet_ntop.c
+++ /dev/null
@@ -1,191 +0,0 @@
-/* Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$Id$";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-
-#define SPRINTF(x) ((size_t)sprintf x)
-
-/*
- * WARNING: Don't even consider trying to compile this on a system where
- * sizeof(int) < 4.  sizeof(int) > 4 is fine; all the world's not a VAX.
- */
-
-static const char *inet_ntop4 __P((const u_char *src, char *dst, size_t size));
-static const char *inet_ntop6 __P((const u_char *src, char *dst, size_t size));
-
-/* char *
- * inet_ntop(af, src, dst, size)
- *	convert a network format address to presentation format.
- * return:
- *	pointer to presentation format address (`dst'), or NULL (see errno).
- * author:
- *	Paul Vixie, 1996.
- */
-const char *
-inet_ntop(af, src, dst, size)
-	int af;
-	const void *src;
-	char *dst;
-	size_t size;
-{
-	switch (af) {
-	case AF_INET:
-		return (inet_ntop4(src, dst, size));
-	case AF_INET6:
-		return (inet_ntop6(src, dst, size));
-	default:
-		errno = EAFNOSUPPORT;
-		return (NULL);
-	}
-	/* NOTREACHED */
-}
-
-/* const char *
- * inet_ntop4(src, dst, size)
- *	format an IPv4 address, more or less like inet_ntoa()
- * return:
- *	`dst' (as a const)
- * notes:
- *	(1) uses no statics
- *	(2) takes a u_char* not an in_addr as input
- * author:
- *	Paul Vixie, 1996.
- */
-static const char *
-inet_ntop4(src, dst, size)
-	const u_char *src;
-	char *dst;
-	size_t size;
-{
-	static const char fmt[] = "%u.%u.%u.%u";
-	char tmp[sizeof "255.255.255.255"];
-
-	if (SPRINTF((tmp, fmt, src[0], src[1], src[2], src[3])) > size) {
-		errno = ENOSPC;
-		return (NULL);
-	}
-	strcpy(dst, tmp);
-	return (dst);
-}
-
-/* const char *
- * inet_ntop6(src, dst, size)
- *	convert IPv6 binary address into presentation (printable) format
- * author:
- *	Paul Vixie, 1996.
- */
-static const char *
-inet_ntop6(src, dst, size)
-	const u_char *src;
-	char *dst;
-	size_t size;
-{
-	/*
-	 * Note that int32_t and int16_t need only be "at least" large enough
-	 * to contain a value of the specified size.  On some systems, like
-	 * Crays, there is no such thing as an integer variable with 16 bits.
-	 * Keep this in mind if you think this function should have been coded
-	 * to use pointer overlays.  All the world's not a VAX.
-	 */
-	char tmp[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255"], *tp;
-	struct { int base, len; } best, cur;
-	u_int words[NS_IN6ADDRSZ / NS_INT16SZ];
-	int i;
-
-	/*
-	 * Preprocess:
-	 *	Copy the input (bytewise) array into a wordwise array.
-	 *	Find the longest run of 0x00's in src[] for :: shorthanding.
-	 */
-	memset(words, '\0', sizeof words);
-	for (i = 0; i < NS_IN6ADDRSZ; i++)
-		words[i / 2] |= (src[i] << ((1 - (i % 2)) << 3));
-	best.base = -1;
-	cur.base = -1;
-	for (i = 0; i < (NS_IN6ADDRSZ / NS_INT16SZ); i++) {
-		if (words[i] == 0) {
-			if (cur.base == -1)
-				cur.base = i, cur.len = 1;
-			else
-				cur.len++;
-		} else {
-			if (cur.base != -1) {
-				if (best.base == -1 || cur.len > best.len)
-					best = cur;
-				cur.base = -1;
-			}
-		}
-	}
-	if (cur.base != -1) {
-		if (best.base == -1 || cur.len > best.len)
-			best = cur;
-	}
-	if (best.base != -1 && best.len < 2)
-		best.base = -1;
-
-	/*
-	 * Format the result.
-	 */
-	tp = tmp;
-	for (i = 0; i < (NS_IN6ADDRSZ / NS_INT16SZ); i++) {
-		/* Are we inside the best run of 0x00's? */
-		if (best.base != -1 && i >= best.base &&
-		    i < (best.base + best.len)) {
-			if (i == best.base)
-				*tp++ = ':';
-			continue;
-		}
-		/* Are we following an initial run of 0x00s or any real hex? */
-		if (i != 0)
-			*tp++ = ':';
-		/* Is this address an encapsulated IPv4? */
-		if (i == 6 && best.base == 0 &&
-		    (best.len == 6 || (best.len == 5 && words[5] == 0xffff))) {
-			if (!inet_ntop4(src+12, tp, sizeof tmp - (tp - tmp)))
-				return (NULL);
-			tp += strlen(tp);
-			break;
-		}
-		tp += SPRINTF((tp, "%x", words[i]));
-	}
-	/* Was it a trailing run of 0x00's? */
-	if (best.base != -1 && (best.base + best.len) ==
-	    (NS_IN6ADDRSZ / NS_INT16SZ))
-		*tp++ = ':';
-	*tp++ = '\0';
-
-	/*
-	 * Check for overflow, copy, and we're done.
-	 */
-	if ((size_t)(tp - tmp) > size) {
-		errno = ENOSPC;
-		return (NULL);
-	}
-	strcpy(dst, tmp);
-	return (dst);
-}
diff --git a/c/src/libnetworking/libc/inet_pton.c b/c/src/libnetworking/libc/inet_pton.c
deleted file mode 100644
index 8d21111cfa..0000000000
--- a/c/src/libnetworking/libc/inet_pton.c
+++ /dev/null
@@ -1,214 +0,0 @@
-/* Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$Id$";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-#include <string.h>
-#include <errno.h>
-
-/*
- * WARNING: Don't even consider trying to compile this on a system where
- * sizeof(int) < 4.  sizeof(int) > 4 is fine; all the world's not a VAX.
- */
-
-static int	inet_pton4 __P((const char *src, u_char *dst));
-static int	inet_pton6 __P((const char *src, u_char *dst));
-
-/* int
- * inet_pton(af, src, dst)
- *	convert from presentation format (which usually means ASCII printable)
- *	to network format (which is usually some kind of binary format).
- * return:
- *	1 if the address was valid for the specified address family
- *	0 if the address wasn't valid (`dst' is untouched in this case)
- *	-1 if some other error occurred (`dst' is untouched in this case, too)
- * author:
- *	Paul Vixie, 1996.
- */
-int
-inet_pton(af, src, dst)
-	int af;
-	const char *src;
-	void *dst;
-{
-	switch (af) {
-	case AF_INET:
-		return (inet_pton4(src, dst));
-	case AF_INET6:
-		return (inet_pton6(src, dst));
-	default:
-		errno = EAFNOSUPPORT;
-		return (-1);
-	}
-	/* NOTREACHED */
-}
-
-/* int
- * inet_pton4(src, dst)
- *	like inet_aton() but without all the hexadecimal and shorthand.
- * return:
- *	1 if `src' is a valid dotted quad, else 0.
- * notice:
- *	does not touch `dst' unless it's returning 1.
- * author:
- *	Paul Vixie, 1996.
- */
-static int
-inet_pton4(src, dst)
-	const char *src;
-	u_char *dst;
-{
-	static const char digits[] = "0123456789";
-	int saw_digit, octets, ch;
-	u_char tmp[NS_INADDRSZ], *tp;
-
-	saw_digit = 0;
-	octets = 0;
-	*(tp = tmp) = 0;
-	while ((ch = *src++) != '\0') {
-		const char *pch;
-
-		if ((pch = strchr(digits, ch)) != NULL) {
-			u_int new = *tp * 10 + (pch - digits);
-
-			if (new > 255)
-				return (0);
-			*tp = new;
-			if (! saw_digit) {
-				if (++octets > 4)
-					return (0);
-				saw_digit = 1;
-			}
-		} else if (ch == '.' && saw_digit) {
-			if (octets == 4)
-				return (0);
-			*++tp = 0;
-			saw_digit = 0;
-		} else
-			return (0);
-	}
-	if (octets < 4)
-		return (0);
-
-	memcpy(dst, tmp, NS_INADDRSZ);
-	return (1);
-}
-
-/* int
- * inet_pton6(src, dst)
- *	convert presentation level address to network order binary form.
- * return:
- *	1 if `src' is a valid [RFC1884 2.2] address, else 0.
- * notice:
- *	(1) does not touch `dst' unless it's returning 1.
- *	(2) :: in a full address is silently ignored.
- * credit:
- *	inspired by Mark Andrews.
- * author:
- *	Paul Vixie, 1996.
- */
-static int
-inet_pton6(src, dst)
-	const char *src;
-	u_char *dst;
-{
-	static const char xdigits_l[] = "0123456789abcdef",
-			  xdigits_u[] = "0123456789ABCDEF";
-	u_char tmp[NS_IN6ADDRSZ], *tp, *endp, *colonp;
-	const char *xdigits, *curtok;
-	int ch, saw_xdigit;
-	u_int val;
-
-	memset((tp = tmp), '\0', NS_IN6ADDRSZ);
-	endp = tp + NS_IN6ADDRSZ;
-	colonp = NULL;
-	/* Leading :: requires some special handling. */
-	if (*src == ':')
-		if (*++src != ':')
-			return (0);
-	curtok = src;
-	saw_xdigit = 0;
-	val = 0;
-	while ((ch = *src++) != '\0') {
-		const char *pch;
-
-		if ((pch = strchr((xdigits = xdigits_l), ch)) == NULL)
-			pch = strchr((xdigits = xdigits_u), ch);
-		if (pch != NULL) {
-			val <<= 4;
-			val |= (pch - xdigits);
-			if (val > 0xffff)
-				return (0);
-			saw_xdigit = 1;
-			continue;
-		}
-		if (ch == ':') {
-			curtok = src;
-			if (!saw_xdigit) {
-				if (colonp)
-					return (0);
-				colonp = tp;
-				continue;
-			}
-			if (tp + NS_INT16SZ > endp)
-				return (0);
-			*tp++ = (u_char) (val >> 8) & 0xff;
-			*tp++ = (u_char) val & 0xff;
-			saw_xdigit = 0;
-			val = 0;
-			continue;
-		}
-		if (ch == '.' && ((tp + NS_INADDRSZ) <= endp) &&
-		    inet_pton4(curtok, tp) > 0) {
-			tp += NS_INADDRSZ;
-			saw_xdigit = 0;
-			break;	/* '\0' was seen by inet_pton4(). */
-		}
-		return (0);
-	}
-	if (saw_xdigit) {
-		if (tp + NS_INT16SZ > endp)
-			return (0);
-		*tp++ = (u_char) (val >> 8) & 0xff;
-		*tp++ = (u_char) val & 0xff;
-	}
-	if (colonp != NULL) {
-		/*
-		 * Since some memmove()'s erroneously fail to handle
-		 * overlapping regions, we'll do the shift by hand.
-		 */
-		const int n = tp - colonp;
-		int i;
-
-		for (i = 1; i <= n; i++) {
-			endp[- i] = colonp[n - i];
-			colonp[n - i] = 0;
-		}
-		tp = endp;
-	}
-	if (tp != endp)
-		return (0);
-	memcpy(dst, tmp, NS_IN6ADDRSZ);
-	return (1);
-}
diff --git a/c/src/libnetworking/libc/iso_addr.3 b/c/src/libnetworking/libc/iso_addr.3
deleted file mode 100644
index 0c9973bef4..0000000000
--- a/c/src/libnetworking/libc/iso_addr.3
+++ /dev/null
@@ -1,111 +0,0 @@
-.\" Copyright (c) 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"     @(#)iso_addr.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
-.\"
-.Dd June 4, 1993
-.Dt ISO_ADDR 3
-.Os
-.Sh NAME
-.Nm iso_addr ,
-.Nm iso_ntoa
-.Nd "elementary network address conversion routines for Open System Interconnection
-.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <netiso/iso.h>
-.Ft struct iso_addr *
-.Fn iso_addr "char *cp"
-.Ft char *
-.Fn iso_ntoa "struct iso_addr *isoa"
-.Sh DESCRIPTION
-The routine
-.Fn iso_addr
-interprets character strings representing
-.Tn OSI
-addresses, returning binary information suitable
-for use in system calls.
-The routine
-.Fn iso_ntoa
-takes
-.Tn OSI
-addresses and returns
-.Tn ASCII
-strings representing NSAPs (network service
-access points) in a
-notation inverse to that accepted by 
-.Fn iso_addr .
-.Pp
-Unfortunately, no universal standard exists for representing
-.Tn OSI
-network addresses.
-.Pp
-The format employed by
-.Fn iso_addr
-is a sequence of hexadecimal
-.Dq digits
-(optionally separated by periods),
-of the form:
-.Bd -filled -offset indent
-<hex digits>.<hex digits>.<hex digits>
-.Ed
-.Pp
-Each pair of hexadecimal digits represents a byte
-with the leading digit indicating the higher-ordered bits.
-A period following an even number of bytes has no
-effect (but may be used to increase legibility).
-A period following an odd number of bytes has the
-effect of causing the byte of address being translated
-to have its higher order bits filled with zeros.
-.Sh RETURN VALUES
-.Fn iso_ntoa
-always returns a null terminated string.
-.Fn iso_addr
-always returns a pointer to a struct iso_addr.
-(See
-.Sx BUGS . )
-.Sh SEE ALSO
-.Xr iso 4
-.Sh HISTORY
-The
-.Fn iso_addr
-and
-.Fn iso_ntoa
-functions appeared in 
-.Bx 4.3 Reno .
-.Sh BUGS
-The returned values
-reside in a static memory area.
-.Pp
-The function
-.Fn iso_addr
-should diagnose improperly formed input, and there should be an unambiguous
-way to recognize this.
diff --git a/c/src/libnetworking/libc/iso_addr.c b/c/src/libnetworking/libc/iso_addr.c
deleted file mode 100644
index eb14e8a72b..0000000000
--- a/c/src/libnetworking/libc/iso_addr.c
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *  $Id$
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)iso_addr.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <netiso/iso.h>
-#include <string.h>
-
-/* States*/
-#define VIRGIN	0
-#define GOTONE	1
-#define GOTTWO	2
-/* Inputs */
-#define	DIGIT	(4*0)
-#define	END	(4*1)
-#define DELIM	(4*2)
-
-struct iso_addr *
-iso_addr(addr)
-	register const char *addr;
-{
-	static struct iso_addr out_addr;
-	register char *cp = out_addr.isoa_genaddr;
-	char *cplim = cp + sizeof(out_addr.isoa_genaddr);
-	register int byte = 0, state = VIRGIN, new;
-
-	bzero((char *)&out_addr, sizeof(out_addr));
-	do {
-		if ((*addr >= '0') && (*addr <= '9')) {
-			new = *addr - '0';
-		} else if ((*addr >= 'a') && (*addr <= 'f')) {
-			new = *addr - 'a' + 10;
-		} else if ((*addr >= 'A') && (*addr <= 'F')) {
-			new = *addr - 'A' + 10;
-		} else if (*addr == 0)
-			state |= END;
-		else
-			state |= DELIM;
-		addr++;
-		switch (state /* | INPUT */) {
-		case GOTTWO | DIGIT:
-			*cp++ = byte; /*FALLTHROUGH*/
-		case VIRGIN | DIGIT:
-			state = GOTONE; byte = new; continue;
-		case GOTONE | DIGIT:
-			state = GOTTWO; byte = new + (byte << 4); continue;
-		default: /* | DELIM */
-			state = VIRGIN; *cp++ = byte; byte = 0; continue;
-		case GOTONE | END:
-		case GOTTWO | END:
-			*cp++ = byte; /* FALLTHROUGH */
-		case VIRGIN | END:
-			break;
-		}
-		break;
-	} while (cp < cplim);
-	out_addr.isoa_len = cp - out_addr.isoa_genaddr;
-	return (&out_addr);
-}
-
-static char hexlist[] = "0123456789abcdef";
-
-char *
-iso_ntoa(isoa)
-	const struct iso_addr *isoa;
-{
-	static char tmpbuf[sizeof(isoa->isoa_genaddr)*3];
-	const u_char *binary;
-	char *cp;
-	int i;
-
-	binary = isoa->isoa_genaddr;
-	cp = tmpbuf;
-
-	for (i = 0; i < isoa->isoa_len; i++) {
-		*cp++ = hexlist[*binary >> 4];
-		*cp++ = hexlist[*binary++ & 0xf];
-
-		if ((((i % 2) == 0) && ((i + 1) < isoa->isoa_len)))
-			*cp++ = '.';
-	}
-	*cp = '\0';
-	return tmpbuf;
-}
diff --git a/c/src/libnetworking/libc/linkaddr.3 b/c/src/libnetworking/libc/linkaddr.3
deleted file mode 100644
index 6999add0e8..0000000000
--- a/c/src/libnetworking/libc/linkaddr.3
+++ /dev/null
@@ -1,138 +0,0 @@
-.\" Copyright (c) 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Donn Seeley at BSDI.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"     From: @(#)linkaddr.3	8.1 (Berkeley) 7/28/93
-.\"	$Id$
-.\"
-.Dd June 17, 1996
-.Dt LINK_ADDR 3
-.Os BSD 4.4
-.Sh NAME
-.Nm link_addr ,
-.Nm link_ntoa
-.Nd elementary address specification routines for link level access
-.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/socket.h>
-.Fd #include <net/if_dl.h>
-.Ft void
-.Fn link_addr "const char *addr" "struct sockaddr_dl *sdl"
-.Ft char *
-.Fn link_ntoa "const struct sockaddr_dl *sdl"
-.Sh DESCRIPTION
-The routine
-.Fn link_addr
-interprets character strings representing
-link-level addresses, returning binary information suitable
-for use in system calls.
-The routine
-.Fn link_ntoa
-takes
-a link-level
-address and returns an
-.Tn ASCII
-string representing some of the information present,
-including the link level address itself, and the interface name
-or number, if present.
-This facility is experimental and is
-still subject to change.
-.Pp
-For
-.Fn link_addr ,
-the string
-.Fa addr
-may contain
-an optional network interface identifier of the form
-.Dq "name unit-number" ,
-suitable for the first argument to
-.Xr ifconfig 8 ,
-followed in all cases by a colon and
-an interface address in the form of
-groups of hexadecimal digits
-separated by periods.
-Each group represents a byte of address;
-address bytes are filled left to right from
-low order bytes through high order bytes.
-.Pp
-.\" A regular expression may make this format clearer:
-.\" .Bd -literal -offset indent
-.\" ([a-z]+[0-9]+:)?[0-9a-f]+(\e.[0-9a-f]+)*
-.\" .Ed
-.\" .Pp
-Thus
-.Li le0:8.0.9.13.d.30
-represents an ethernet address
-to be transmitted on the first Lance ethernet interface.
-.Pp
-The direct use of these functions is deprecated in favor of the
-.Xr addr2ascii 3
-interface; however, portable programs cannot rely on the latter as it is
-not yet widely implemented.
-.Sh RETURN VALUES
-.Fn link_ntoa
-always returns a null terminated string.
-.Fn link_addr
-has no return value.
-(See
-.Sx BUGS . )
-.Sh SEE ALSO
-.Xr addr2ascii 3
-.\" .Xr iso 4
-.Sh HISTORY
-The
-.Fn link_addr
-and
-.Fn link_ntoa
-functions appeared in 
-.Bx 4.3 Reno  .
-.Sh BUGS
-The returned values for link_ntoa
-reside in a static memory area.
-.Pp
-The function
-.Fn link_addr
-should diagnose improperly formed input, and there should be an unambiguous
-way to recognize this.
-.Pp
-If the
-.Va sdl_len
-field of the link socket address
-.Fa sdl
-is 0,
-.Fn link_ntoa
-will not insert a colon before the interface address bytes.
-If this translated address is given to
-.Fn link_addr
-without inserting an initial colon,
-the latter will not interpret it correctly.
diff --git a/c/src/libnetworking/libc/linkaddr.c b/c/src/libnetworking/libc/linkaddr.c
deleted file mode 100644
index 28c16cff05..0000000000
--- a/c/src/libnetworking/libc/linkaddr.c
+++ /dev/null
@@ -1,160 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *  $Id$
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)linkaddr.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <net/if_dl.h>
-#include <string.h>
-
-/* States*/
-#define NAMING	0
-#define GOTONE	1
-#define GOTTWO	2
-#define RESET	3
-/* Inputs */
-#define	DIGIT	(4*0)
-#define	END	(4*1)
-#define DELIM	(4*2)
-#define LETTER	(4*3)
-
-void
-link_addr(addr, sdl)
-	register const char *addr;
-	register struct sockaddr_dl *sdl;
-{
-	register char *cp = sdl->sdl_data;
-	char *cplim = sdl->sdl_len + (char *)sdl;
-	register int byte = 0, state = NAMING, new;
-
-	bzero((char *)&sdl->sdl_family, sdl->sdl_len - 1);
-	sdl->sdl_family = AF_LINK;
-	do {
-		state &= ~LETTER;
-		if ((*addr >= '0') && (*addr <= '9')) {
-			new = *addr - '0';
-		} else if ((*addr >= 'a') && (*addr <= 'f')) {
-			new = *addr - 'a' + 10;
-		} else if ((*addr >= 'A') && (*addr <= 'F')) {
-			new = *addr - 'A' + 10;
-		} else if (*addr == 0) {
-			state |= END;
-		} else if (state == NAMING &&
-			   (((*addr >= 'A') && (*addr <= 'Z')) ||
-			   ((*addr >= 'a') && (*addr <= 'z'))))
-			state |= LETTER;
-		else
-			state |= DELIM;
-		addr++;
-		switch (state /* | INPUT */) {
-		case NAMING | DIGIT:
-		case NAMING | LETTER:
-			*cp++ = addr[-1];
-			continue;
-		case NAMING | DELIM:
-			state = RESET;
-			sdl->sdl_nlen = cp - sdl->sdl_data;
-			continue;
-		case GOTTWO | DIGIT:
-			*cp++ = byte;
-			/* FALLTHROUGH */
-		case RESET | DIGIT:
-			state = GOTONE;
-			byte = new;
-			continue;
-		case GOTONE | DIGIT:
-			state = GOTTWO;
-			byte = new + (byte << 4);
-			continue;
-		default: /* | DELIM */
-			state = RESET;
-			*cp++ = byte;
-			byte = 0;
-			continue;
-		case GOTONE | END:
-		case GOTTWO | END:
-			*cp++ = byte;
-			/* FALLTHROUGH */
-		case RESET | END:
-			break;
-		}
-		break;
-	} while (cp < cplim);
-	sdl->sdl_alen = cp - LLADDR(sdl);
-	new = cp - (char *)sdl;
-	if (new > sizeof(*sdl))
-		sdl->sdl_len = new;
-	return;
-}
-
-static char hexlist[] = "0123456789abcdef";
-
-char *
-link_ntoa(sdl)
-	register const struct sockaddr_dl *sdl;
-{
-	static char obuf[64];
-	register char *out = obuf;
-	register int i;
-	register u_char *in = (u_char *)LLADDR(sdl);
-	u_char *inlim = in + sdl->sdl_alen;
-	int firsttime = 1;
-
-	if (sdl->sdl_nlen) {
-		bcopy(sdl->sdl_data, obuf, sdl->sdl_nlen);
-		out += sdl->sdl_nlen;
-		if (sdl->sdl_alen)
-			*out++ = ':';
-	}
-	while (in < inlim) {
-		if (firsttime)
-			firsttime = 0;
-		else
-			*out++ = '.';
-		i = *in++;
-		if (i > 0xf) {
-			out[1] = hexlist[i & 0xf];
-			i >>= 4;
-			out[0] = hexlist[i];
-			out += 2;
-		} else
-			*out++ = hexlist[i];
-	}
-	*out = 0;
-	return (obuf);
-}
diff --git a/c/src/libnetworking/libc/map_v4v6.c b/c/src/libnetworking/libc/map_v4v6.c
deleted file mode 100644
index 0f8658e117..0000000000
--- a/c/src/libnetworking/libc/map_v4v6.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * ++Copyright++ 1985, 1988, 1993
- * -
- * Copyright (c) 1985, 1988, 1993
- *    The Regents of the University of California.  All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- * 	This product includes software developed by the University of
- * 	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * -
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- * -
- * --Copyright--
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)gethostnamadr.c	8.1 (Berkeley) 6/4/93";
-static char rcsid[] = "$Id$";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-
-#include <stdio.h>
-#include <string.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <ctype.h>
-#include <errno.h>
-#include <syslog.h>
-
-typedef union {
-	int32_t al;
-	char ac;
-} align;
-
-void
-_map_v4v6_address(src, dst)
-	const char *src;
-	char *dst;
-{
-	u_char *p = (u_char *)dst;
-	char tmp[INADDRSZ];
-	int i;
-
-	/* Stash a temporary copy so our caller can update in place. */
-	bcopy(src, tmp, INADDRSZ);
-	/* Mark this ipv6 addr as a mapped ipv4. */
-	for (i = 0; i < 10; i++)
-		*p++ = 0x00;
-	*p++ = 0xff;
-	*p++ = 0xff;
-	/* Retrieve the saved copy and we're done. */
-	bcopy(tmp, (void*)p, INADDRSZ);
-}
-
-void
-_map_v4v6_hostent(hp, bpp, lenp)
-	struct hostent *hp;
-	char **bpp;
-	int *lenp;
-{
-	char **ap;
-
-	if (hp->h_addrtype != AF_INET || hp->h_length != INADDRSZ)
-		return;
-	hp->h_addrtype = AF_INET6;
-	hp->h_length = IN6ADDRSZ;
-	for (ap = hp->h_addr_list; *ap; ap++) {
-		int i = sizeof(align) - ((u_long)*bpp % sizeof(align));
-
-		if (*lenp < (i + IN6ADDRSZ)) {
-			/* Out of memory.  Truncate address list here.  XXX */
-			*ap = NULL;
-			return;
-		}
-		*bpp += i;
-		*lenp -= i;
-		_map_v4v6_address(*ap, *bpp);
-		*ap = *bpp;
-		*bpp += IN6ADDRSZ;
-		*lenp -= IN6ADDRSZ;
-	}
-}
diff --git a/c/src/libnetworking/libc/ns.3 b/c/src/libnetworking/libc/ns.3
deleted file mode 100644
index e621ad2d90..0000000000
--- a/c/src/libnetworking/libc/ns.3
+++ /dev/null
@@ -1,131 +0,0 @@
-.\" Copyright (c) 1986, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"     @(#)ns.3	8.1 (Berkeley) 6/4/93
-.\"	$Id$
-.\"
-.Dd June 4, 1993
-.Dt NS 3
-.Os BSD 4.3
-.Sh NAME
-.Nm ns_addr ,
-.Nm ns_ntoa
-.Nd Xerox
-.Tn NS Ns (tm)
-address conversion routines
-.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <netns/ns.h>
-.Ft struct ns_addr 
-.Fn ns_addr "char *cp"
-.Ft char *
-.Fn ns_ntoa "struct ns_addr ns"
-.Sh DESCRIPTION
-The routine
-.Fn ns_addr
-interprets character strings representing
-.Tn XNS
-addresses, returning binary information suitable
-for use in system calls.
-The routine
-.Fn ns_ntoa
-takes
-.Tn XNS
-addresses and returns
-.Tn ASCII
-strings representing the address in a
-notation in common use in the Xerox Development Environment:
-.Bd -filled -offset indent
-<network number>.<host number>.<port number>
-.Ed
-.Pp
-Trailing zero fields are suppressed, and each number is printed in hexadecimal,
-in a format suitable for input to 
-.Fn ns_addr .
-Any fields lacking super-decimal digits will have a
-trailing
-.Ql H
-appended.
-.Pp
-Unfortunately, no universal standard exists for representing
-.Tn XNS
-addresses.
-An effort has been made to insure that
-.Fn ns_addr
-be compatible with most formats in common use.
-It will first separate an address into 1 to 3 fields using a single delimiter
-chosen from
-period
-.Ql \&. ,
-colon
-.Ql \&:
-or pound-sign
-.Ql \&# .
-Each field is then examined for byte separators (colon or period).
-If there are byte separators, each subfield separated is taken to be
-a small hexadecimal number, and the entirety is taken as a network-byte-ordered
-quantity to be zero extended in the high-network-order bytes.
-Next, the field is inspected for hyphens, in which case
-the field is assumed to be a number in decimal notation
-with hyphens separating the millenia.
-Next, the field is assumed to be a number:
-It is interpreted
-as hexadecimal if there is a leading
-.Ql 0x
-(as in C),
-a trailing
-.Ql H
-(as in Mesa), or there are any super-decimal digits present.
-It is interpreted as octal is there is a leading
-.Ql 0
-and there are no super-octal digits.
-Otherwise, it is converted as a decimal number.
-.Sh RETURN VALUES
-None. (See
-.Sx BUGS . )
-.Sh SEE ALSO
-.Xr hosts 5 ,
-.Xr networks 5
-.Sh HISTORY
-The
-.Fn ns_addr
-and
-.Fn ns_toa
-functions appeared in 
-.Bx 4.3 .
-.Sh BUGS
-The string returned by
-.Fn ns_ntoa
-resides in a static memory area.
-The function
-.Fn ns_addr
-should diagnose improperly formed input, and there should be an unambiguous
-way to recognize this.
diff --git a/c/src/libnetworking/libc/ns_addr.c b/c/src/libnetworking/libc/ns_addr.c
deleted file mode 100644
index 18fabe91f1..0000000000
--- a/c/src/libnetworking/libc/ns_addr.c
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
- * Copyright (c) 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * J.Q. Johnson.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *  $Id$
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)ns_addr.c	8.1 (Berkeley) 6/7/93";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/param.h>
-#include <netns/ns.h>
-#include <stdio.h>
-#include <string.h>
-
-static struct ns_addr addr, zero_addr;
-
-static void Field(), cvtbase();
-
-struct ns_addr
-ns_addr(name)
-	const char *name;
-{
-	char separator;
-	char *hostname, *socketname, *cp;
-	char buf[50];
-
-	(void)strncpy(buf, name, sizeof(buf) - 1);
-	buf[sizeof(buf) - 1] = '\0';
-
-	/*
-	 * First, figure out what he intends as a field separtor.
-	 * Despite the way this routine is written, the prefered
-	 * form  2-272.AA001234H.01777, i.e. XDE standard.
-	 * Great efforts are made to insure backward compatability.
-	 */
-	if ((hostname = strchr(buf, '#')) != NULL)
-		separator = '#';
-	else {
-		hostname = strchr(buf, '.');
-		if ((cp = strchr(buf, ':')) &&
-		    ((hostname && cp < hostname) || (hostname == 0))) {
-			hostname = cp;
-			separator = ':';
-		} else
-			separator = '.';
-	}
-	if (hostname)
-		*hostname++ = 0;
-
-	addr = zero_addr;
-	Field(buf, addr.x_net.c_net, 4);
-	if (hostname == 0)
-		return (addr);  /* No separator means net only */
-
-	socketname = strchr(hostname, separator);
-	if (socketname) {
-		*socketname++ = 0;
-		Field(socketname, (u_char *)&addr.x_port, 2);
-	}
-
-	Field(hostname, addr.x_host.c_host, 6);
-
-	return (addr);
-}
-
-static void
-Field(buf, out, len)
-	char *buf;
-	u_char *out;
-	int len;
-{
-	register char *bp = buf;
-	int i, ibase, base16 = 0, base10 = 0, clen = 0;
-	int hb[6], *hp;
-	char *fmt;
-
-	/*
-	 * first try 2-273#2-852-151-014#socket
-	 */
-	if ((*buf != '-') &&
-	    (1 < (i = sscanf(buf, "%d-%d-%d-%d-%d",
-			&hb[0], &hb[1], &hb[2], &hb[3], &hb[4])))) {
-		cvtbase(1000L, 256, hb, i, out, len);
-		return;
-	}
-	/*
-	 * try form 8E1#0.0.AA.0.5E.E6#socket
-	 */
-	if (1 < (i = sscanf(buf,"%x.%x.%x.%x.%x.%x",
-			&hb[0], &hb[1], &hb[2], &hb[3], &hb[4], &hb[5]))) {
-		cvtbase(256L, 256, hb, i, out, len);
-		return;
-	}
-	/*
-	 * try form 8E1#0:0:AA:0:5E:E6#socket
-	 */
-	if (1 < (i = sscanf(buf,"%x:%x:%x:%x:%x:%x",
-			&hb[0], &hb[1], &hb[2], &hb[3], &hb[4], &hb[5]))) {
-		cvtbase(256L, 256, hb, i, out, len);
-		return;
-	}
-	/*
-	 * This is REALLY stretching it but there was a
-	 * comma notation separting shorts -- definitely non standard
-	 */
-	if (1 < (i = sscanf(buf,"%x,%x,%x",
-			&hb[0], &hb[1], &hb[2]))) {
-		hb[0] = htons(hb[0]); hb[1] = htons(hb[1]);
-		hb[2] = htons(hb[2]);
-		cvtbase(65536L, 256, hb, i, out, len);
-		return;
-	}
-
-	/* Need to decide if base 10, 16 or 8 */
-	while (*bp) switch (*bp++) {
-
-	case '0': case '1': case '2': case '3': case '4': case '5':
-	case '6': case '7': case '-':
-		break;
-
-	case '8': case '9':
-		base10 = 1;
-		break;
-
-	case 'a': case 'b': case 'c': case 'd': case 'e': case 'f':
-	case 'A': case 'B': case 'C': case 'D': case 'E': case 'F':
-		base16 = 1;
-		break;
-
-	case 'x': case 'X':
-		*--bp = '0';
-		base16 = 1;
-		break;
-
-	case 'h': case 'H':
-		base16 = 1;
-		/* fall into */
-
-	default:
-		*--bp = 0; /* Ends Loop */
-	}
-	if (base16) {
-		fmt = "%3x";
-		ibase = 4096;
-	} else if (base10 == 0 && *buf == '0') {
-		fmt = "%3o";
-		ibase = 512;
-	} else {
-		fmt = "%3d";
-		ibase = 1000;
-	}
-
-	for (bp = buf; *bp++; ) clen++;
-	if (clen == 0) clen++;
-	if (clen > 18) clen = 18;
-	i = ((clen - 1) / 3) + 1;
-	bp = clen + buf - 3;
-	hp = hb + i - 1;
-
-	while (hp > hb) {
-		(void)sscanf(bp, fmt, hp);
-		bp[0] = 0;
-		hp--;
-		bp -= 3;
-	}
-	(void)sscanf(buf, fmt, hp);
-	cvtbase((long)ibase, 256, hb, i, out, len);
-}
-
-static void
-cvtbase(oldbase,newbase,input,inlen,result,reslen)
-	long oldbase;
-	int newbase;
-	int input[];
-	int inlen;
-	unsigned char result[];
-	int reslen;
-{
-	int d, e;
-	long sum;
-
-	e = 1;
-	while (e > 0 && reslen > 0) {
-		d = 0; e = 0; sum = 0;
-		/* long division: input=input/newbase */
-		while (d < inlen) {
-			sum = sum*oldbase + (long) input[d];
-			e += (sum > 0);
-			input[d++] = sum / newbase;
-			sum %= newbase;
-		}
-		result[--reslen] = sum;	/* accumulate remainder */
-	}
-	for (d=0; d < reslen; d++)
-		result[d] = 0;
-}
diff --git a/c/src/libnetworking/libc/ns_name.c b/c/src/libnetworking/libc/ns_name.c
deleted file mode 100644
index af10d2f062..0000000000
--- a/c/src/libnetworking/libc/ns_name.c
+++ /dev/null
@@ -1,595 +0,0 @@
-/*
- * Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#if !defined(__rtems__)
-#if !defined(LINT) && !defined(CODECENTER)
-static char rcsid[] = "$Id$";
-#endif /* not lint */
-#endif /* not rtems */
-
-#include <sys/types.h>
-
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-
-#include <errno.h>
-#include <resolv.h>
-#include <string.h>
-
-/* Data. */
-
-static char		digits[] = "0123456789";
-
-/* Forward. */
-
-static int		special(int);
-static int		printable(int);
-static int		dn_find(const u_char *, const u_char *,
-				const u_char * const *,
-				const u_char * const *);
-
-/* Public. */
-
-/*
- * ns_name_ntop(src, dst, dstsiz)
- *	Convert an encoded domain name to printable ascii as per RFC1035.
- * return:
- *	Number of bytes written to buffer, or -1 (with errno set)
- * notes:
- *	The root is returned as "."
- *	All other domains are returned in non absolute form
- */
-int
-ns_name_ntop(const u_char *src, char *dst, size_t dstsiz) {
-	const u_char *cp;
-	char *dn, *eom;
-	u_char c;
-	u_int n;
-
-	cp = src;
-	dn = dst;
-	eom = dst + dstsiz;
-
-	while ((n = *cp++) != 0) {
-		if ((n & NS_CMPRSFLGS) != 0) {
-			/* Some kind of compression pointer. */
-			errno = EMSGSIZE;
-			return (-1);
-		}
-		if (dn != dst) {
-			if (dn >= eom) {
-				errno = EMSGSIZE;
-				return (-1);
-			}
-			*dn++ = '.';
-		}
-		if (dn + n >= eom) {
-			errno = EMSGSIZE;
-			return (-1);
-		}
-		for ((void)NULL; n > 0; n--) {
-			c = *cp++;
-			if (special(c)) {
-				if (dn + 1 >= eom) {
-					errno = EMSGSIZE;
-					return (-1);
-				}
-				*dn++ = '\\';
-				*dn++ = (char)c;
-			} else if (!printable(c)) {
-				if (dn + 3 >= eom) {
-					errno = EMSGSIZE;
-					return (-1);
-				}
-				*dn++ = '\\';
-				*dn++ = digits[c / 100];
-				*dn++ = digits[(c % 100) / 10];
-				*dn++ = digits[c % 10];
-			} else {
-				if (dn >= eom) {
-					errno = EMSGSIZE;
-					return (-1);
-				}
-				*dn++ = (char)c;
-			}
-		}
-	}
-	if (dn == dst) {
-		if (dn >= eom) {
-			errno = EMSGSIZE;
-			return (-1);
-		}
-		*dn++ = '.';
-	}
-	if (dn >= eom) {
-		errno = EMSGSIZE;
-		return (-1);
-	}
-	*dn++ = '\0';
-	return (dn - dst);
-}
-
-/*
- * ns_name_pton(src, dst, dstsiz)
- *	Convert a ascii string into an encoded domain name as per RFC1035.
- * return:
- *	-1 if it fails
- *	1 if string was fully qualified
- *	0 is string was not fully qualified
- * notes:
- *	Enforces label and domain length limits.
- */
-
-int
-ns_name_pton(const char *src, u_char *dst, size_t dstsiz) {
-	u_char *label, *bp, *eom;
-	int c, n, escaped;
-	char *cp;
-
-	escaped = 0;
-	bp = dst;
-	eom = dst + dstsiz;
-	label = bp++;
-
-	while ((c = *src++) != 0) {
-		if (escaped) {
-			if ((cp = strchr(digits, c)) != NULL) {
-				n = (cp - digits) * 100;
-				if ((c = *src++) == 0 ||
-				    (cp = strchr(digits, c)) == NULL) {
-					errno = EMSGSIZE;
-					return (-1);
-				}
-				n += (cp - digits) * 10;
-				if ((c = *src++) == 0 ||
-				    (cp = strchr(digits, c)) == NULL) {
-					errno = EMSGSIZE;
-					return (-1);
-				}
-				n += (cp - digits);
-				if (n > 255) {
-					errno = EMSGSIZE;
-					return (-1);
-				}
-				c = n;
-			}
-			escaped = 0;
-		} else if (c == '\\') {
-			escaped = 1;
-			continue;
-		} else if (c == '.') {
-			c = (bp - label - 1);
-			if ((c & NS_CMPRSFLGS) != 0) {	/* Label too big. */
-				errno = EMSGSIZE;
-				return (-1);
-			}
-			if (label >= eom) {
-				errno = EMSGSIZE;
-				return (-1);
-			}
-			*label = c;
-			/* Fully qualified ? */
-			if (*src == '\0') {
-				if (c != 0) {
-					if (bp >= eom) {
-						errno = EMSGSIZE;
-						return (-1);
-					}
-					*bp++ = '\0';
-				}
-				if ((bp - dst) > MAXCDNAME) {
-					errno = EMSGSIZE;
-					return (-1);
-				}
-				return (1);
-			}
-			if (c == 0) {
-				errno = EMSGSIZE;
-				return (-1);
-			}
-			label = bp++;
-			continue;
-		}
-		if (bp >= eom) {
-			errno = EMSGSIZE;
-			return (-1);
-		}
-		*bp++ = (u_char)c;
-	}
-	c = (bp - label - 1);
-	if ((c & NS_CMPRSFLGS) != 0) {		/* Label too big. */
-		errno = EMSGSIZE;
-		return (-1);
-	}
-	if (label >= eom) {
-		errno = EMSGSIZE;
-		return (-1);
-	}
-	*label = c;
-	if (c != 0) {
-		if (bp >= eom) {
-			errno = EMSGSIZE;
-			return (-1);
-		}
-		*bp++ = 0;
-	}
-	if ((bp - dst) > MAXCDNAME) {	/* src too big */
-		errno = EMSGSIZE;
-		return (-1);
-	}
-	return (0);
-}
-
-/*
- * ns_name_unpack(msg, eom, src, dst, dstsiz)
- *	Unpack a domain name from a message, source may be compressed.
- * return:
- *	-1 if it fails, or consumed octets if it succeeds.
- */
-int
-ns_name_unpack(const u_char *msg, const u_char *eom, const u_char *src,
-	       u_char *dst, size_t dstsiz)
-{
-	const u_char *srcp, *dstlim;
-	u_char *dstp;
-	int n, len, checked;
-
-	len = -1;
-	checked = 0;
-	dstp = dst;
-	srcp = src;
-	dstlim = dst + dstsiz;
-	if (srcp < msg || srcp >= eom) {
-		errno = EMSGSIZE;
-		return (-1);
-	}
-	/* Fetch next label in domain name. */
-	while ((n = *srcp++) != 0) {
-		/* Check for indirection. */
-		switch (n & NS_CMPRSFLGS) {
-		case 0:
-			/* Limit checks. */
-			if (dstp + n + 1 >= dstlim || srcp + n >= eom) {
-				errno = EMSGSIZE;
-				return (-1);
-			}
-			checked += n + 1;
-			*dstp++ = n;
-			memcpy(dstp, srcp, n);
-			dstp += n;
-			srcp += n;
-			break;
-
-		case NS_CMPRSFLGS:
-			if (srcp >= eom) {
-				errno = EMSGSIZE;
-				return (-1);
-			}
-			if (len < 0)
-				len = srcp - src + 1;
-			srcp = msg + (((n & 0x3f) << 8) | (*srcp & 0xff));
-			if (srcp < msg || srcp >= eom) {  /* Out of range. */
-				errno = EMSGSIZE;
-				return (-1);
-			}
-			checked += 2;
-			/*
-			 * Check for loops in the compressed name;
-			 * if we've looked at the whole message,
-			 * there must be a loop.
-			 */
-			if (checked >= eom - msg) {
-				errno = EMSGSIZE;
-				return (-1);
-			}
-			break;
-
-		default:
-			errno = EMSGSIZE;
-			return (-1);			/* flag error */
-		}
-	}
-	*dstp = '\0';
-	if (len < 0)
-		len = srcp - src;
-	return (len);
-}
-
-/*
- * ns_name_pack(src, dst, dstsiz, dnptrs, lastdnptr)
- *	Pack domain name 'domain' into 'comp_dn'.
- * return:
- *	Size of the compressed name, or -1.
- * notes:
- *	'dnptrs' is an array of pointers to previous compressed names.
- *	dnptrs[0] is a pointer to the beginning of the message. The array
- *	ends with NULL.
- *	'lastdnptr' is a pointer to the end of the array pointed to
- *	by 'dnptrs'.
- * Side effects:
- *	The list of pointers in dnptrs is updated for labels inserted into
- *	the message as we compress the name.  If 'dnptr' is NULL, we don't
- *	try to compress names. If 'lastdnptr' is NULL, we don't update the
- *	list.
- */
-int
-ns_name_pack(const u_char *src, u_char *dst, int dstsiz,
-	     const u_char **dnptrs, const u_char **lastdnptr)
-{
-	u_char *dstp;
-	const u_char **cpp, **lpp, *eob, *msg;
-	const u_char *srcp;
-	int n, l;
-
-	srcp = src;
-	dstp = dst;
-	eob = dstp + dstsiz;
-	lpp = cpp = NULL;
-	if (dnptrs != NULL) {
-		if ((msg = *dnptrs++) != NULL) {
-			for (cpp = dnptrs; *cpp != NULL; cpp++)
-				(void)NULL;
-			lpp = cpp;	/* end of list to search */
-		}
-	} else
-		msg = NULL;
-
-	/* make sure the domain we are about to add is legal */
-	l = 0;
-	do {
-		n = *srcp;
-		if ((n & NS_CMPRSFLGS) != 0) {
-			errno = EMSGSIZE;
-			return (-1);
-		}
-		l += n + 1;
-		if (l > MAXCDNAME) {
-			errno = EMSGSIZE;
-			return (-1);
-		}
-		srcp += n + 1;
-	} while (n != 0);
-
-	srcp = src;
-	do {
-		/* Look to see if we can use pointers. */
-		n = *srcp;
-		if (n != 0 && msg != NULL) {
-			l = dn_find(srcp, msg, (const u_char * const *)dnptrs,
-				    (const u_char * const *)lpp);
-			if (l >= 0) {
-				if (dstp + 1 >= eob) {
-					errno = EMSGSIZE;
-					return (-1);
-				}
-				*dstp++ = (l >> 8) | NS_CMPRSFLGS;
-				*dstp++ = l % 256;
-				return (dstp - dst);
-			}
-			/* Not found, save it. */
-			if (lastdnptr != NULL && cpp < lastdnptr - 1 &&
-			    (dstp - msg) < 0x4000) {
-				*cpp++ = dstp;
-				*cpp = NULL;
-			}
-		}
-		/* copy label to buffer */
-		if (n & NS_CMPRSFLGS) {		/* Should not happen. */
-			errno = EMSGSIZE;
-			return (-1);
-		}
-		if (dstp + 1 + n >= eob) {
-			errno = EMSGSIZE;
-			return (-1);
-		}
-		memcpy(dstp, srcp, n + 1);
-		srcp += n + 1;
-		dstp += n + 1;
-	} while (n != 0);
-
-	if (dstp > eob) {
-		if (msg != NULL)
-			*lpp = NULL;
-		errno = EMSGSIZE;
-		return (-1);
-	} 
-	return (dstp - dst);
-}
-
-/*
- * ns_name_uncompress(msg, eom, src, dst, dstsiz)
- *	Expand compressed domain name to presentation format.
- * return:
- *	Number of bytes read out of `src', or -1 (with errno set).
- * note:
- *	Root domain returns as "." not "".
- */
-int
-ns_name_uncompress(const u_char *msg, const u_char *eom, const u_char *src,
-		   char *dst, size_t dstsiz)
-{
-	u_char tmp[NS_MAXCDNAME];
-	int n;
-	
-	if ((n = ns_name_unpack(msg, eom, src, tmp, sizeof tmp)) == -1)
-		return (-1);
-	if (ns_name_ntop(tmp, dst, dstsiz) == -1)
-		return (-1);
-	return (n);
-}
-
-/*
- * ns_name_compress(src, dst, dstsiz, dnptrs, lastdnptr)
- *	Compress a domain name into wire format, using compression pointers.
- * return:
- *	Number of bytes consumed in `dst' or -1 (with errno set).
- * notes:
- *	'dnptrs' is an array of pointers to previous compressed names.
- *	dnptrs[0] is a pointer to the beginning of the message.
- *	The list ends with NULL.  'lastdnptr' is a pointer to the end of the
- *	array pointed to by 'dnptrs'. Side effect is to update the list of
- *	pointers for labels inserted into the message as we compress the name.
- *	If 'dnptr' is NULL, we don't try to compress names. If 'lastdnptr'
- *	is NULL, we don't update the list.
- */
-int
-ns_name_compress(const char *src, u_char *dst, size_t dstsiz,
-		 const u_char **dnptrs, const u_char **lastdnptr)
-{
-	u_char tmp[NS_MAXCDNAME];
-
-	if (ns_name_pton(src, tmp, sizeof tmp) == -1)
-		return (-1);
-	return (ns_name_pack(tmp, dst, dstsiz, dnptrs, lastdnptr));
-}
-
-/*
- * ns_name_skip(ptrptr, eom)
- *	Advance *ptrptr to skip over the compressed name it points at.
- * return:
- *	0 on success, -1 (with errno set) on failure.
- */
-int
-ns_name_skip(const u_char **ptrptr, const u_char *eom) {
-	const u_char *cp;
-	u_int n;
-
-	cp = *ptrptr;
-	while (cp < eom && (n = *cp++) != 0) {
-		/* Check for indirection. */
-		switch (n & NS_CMPRSFLGS) {
-		case 0:			/* normal case, n == len */
-			cp += n;
-			continue;
-		case NS_CMPRSFLGS:	/* indirection */
-			cp++;
-			break;
-		default:		/* illegal type */
-			errno = EMSGSIZE;
-			return (-1);
-		}
-		break;
-	}
-	if (cp > eom) {
-		errno = EMSGSIZE;
-		return (-1);
-	}
-	*ptrptr = cp;
-	return (0);
-}
-
-/* Private. */
-
-/*
- * special(ch)
- *	Thinking in noninternationalized USASCII (per the DNS spec),
- *	is this characted special ("in need of quoting") ?
- * return:
- *	boolean.
- */
-static int
-special(int ch) {
-	switch (ch) {
-	case 0x22: /* '"' */
-	case 0x2E: /* '.' */
-	case 0x3B: /* ';' */
-	case 0x5C: /* '\\' */
-	/* Special modifiers in zone files. */
-	case 0x40: /* '@' */
-	case 0x24: /* '$' */
-		return (1);
-	default:
-		return (0);
-	}
-}
-
-/*
- * printable(ch)
- *	Thinking in noninternationalized USASCII (per the DNS spec),
- *	is this character visible and not a space when printed ?
- * return:
- *	boolean.
- */
-static int
-printable(int ch) {
-	return (ch > 0x20 && ch < 0x7f);
-}
-
-/*
- *	Thinking in noninternationalized USASCII (per the DNS spec),
- *	convert this character to lower case if it's upper case.
- */
-static int
-mklower(int ch) {
-	if (ch >= 0x41 && ch <= 0x5A)
-		return (ch + 0x20);
-	return (ch);
-}
-
-/*
- * dn_find(domain, msg, dnptrs, lastdnptr)
- *	Search for the counted-label name in an array of compressed names.
- * return:
- *	offset from msg if found, or -1.
- * notes:
- *	dnptrs is the pointer to the first name on the list,
- *	not the pointer to the start of the message.
- */
-static int
-dn_find(const u_char *domain, const u_char *msg,
-	const u_char * const *dnptrs,
-	const u_char * const *lastdnptr)
-{
-	const u_char *dn, *cp, *sp;
-	const u_char * const *cpp;
-	u_int n;
-
-	for (cpp = dnptrs; cpp < lastdnptr; cpp++) {
-		dn = domain;
-		sp = cp = *cpp;
-		while ((n = *cp++) != 0) {
-			/*
-			 * check for indirection
-			 */
-			switch (n & NS_CMPRSFLGS) {
-			case 0:			/* normal case, n == len */
-				if (n != *dn++)
-					goto next;
-				for ((void)NULL; n > 0; n--)
-					if (mklower(*dn++) != mklower(*cp++))
-						goto next;
-				/* Is next root for both ? */
-				if (*dn == '\0' && *cp == '\0')
-					return (sp - msg);
-				if (*dn)
-					continue;
-				goto next;
-
-			case NS_CMPRSFLGS:	/* indirection */
-				cp = msg + (((n & 0x3f) << 8) | *cp);
-				break;
-
-			default:	/* illegal type */
-				errno = EMSGSIZE;
-				return (-1);
-			}
-		}
- next: ;
-	}
-	errno = ENOENT;
-	return (-1);
-}
diff --git a/c/src/libnetworking/libc/ns_netint.c b/c/src/libnetworking/libc/ns_netint.c
deleted file mode 100644
index 3c09da8f8c..0000000000
--- a/c/src/libnetworking/libc/ns_netint.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#if !defined(__rtems__)
-#if !defined(LINT) && !defined(CODECENTER)
-static char rcsid[] = "$Id$";
-#endif /* not lint */
-#endif /* not rtems */
-
-/* Import. */
-
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-
-u_int
-ns_get16(const u_char *src) {
-	u_int dst;
-
-	NS_GET16(dst, src);
-	return (dst);
-}
-
-u_long
-ns_get32(const u_char *src) {
-	u_long dst;
-
-	NS_GET32(dst, src);
-	return (dst);
-}
-
-void
-ns_put16(u_int src, u_char *dst) {
-	NS_PUT16(src, dst);
-}
-
-void
-ns_put32(u_long src, u_char *dst) {
-	NS_PUT32(src, dst);
-}
diff --git a/c/src/libnetworking/libc/ns_ntoa.c b/c/src/libnetworking/libc/ns_ntoa.c
deleted file mode 100644
index 9d0be2e1dc..0000000000
--- a/c/src/libnetworking/libc/ns_ntoa.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright (c) 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *  $Id$
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)ns_ntoa.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/param.h>
-#include <netns/ns.h>
-#include <stdio.h>
-
-char *
-ns_ntoa(addr)
-	struct ns_addr addr;
-{
-	static char obuf[40];
-	union { union ns_net net_e; u_long long_e; } net;
-	u_short port = htons(addr.x_port);
-	register char *cp;
-	char *cp2;
-	register u_char *up = addr.x_host.c_host;
-	u_char *uplim = up + 6;
-	static char *spectHex();
-
-	net.net_e = addr.x_net;
-	sprintf(obuf, "%lx", (u_long)ntohl(net.long_e));
-	cp = spectHex(obuf);
-	cp2 = cp + 1;
-	while (*up==0 && up < uplim) up++;
-	if (up == uplim) {
-		if (port) {
-			sprintf(cp, ".0");
-			cp += 2;
-		}
-	} else {
-		sprintf(cp, ".%x", *up++);
-		while (up < uplim) {
-			while (*cp) cp++;
-			sprintf(cp, "%02x", *up++);
-		}
-		cp = spectHex(cp2);
-	}
-	if (port) {
-		sprintf(cp, ".%x", port);
-		spectHex(cp + 1);
-	}
-	return (obuf);
-}
-
-static char *
-spectHex(p0)
-	char *p0;
-{
-	int ok = 0;
-	int nonzero = 0;
-	register char *p = p0;
-	for (; *p; p++) switch (*p) {
-
-	case 'a': case 'b': case 'c': case 'd': case 'e': case 'f':
-		*p += ('A' - 'a');
-		/* fall into . . . */
-	case 'A': case 'B': case 'C': case 'D': case 'E': case 'F':
-		ok = 1;
-	case '1': case '2': case '3': case '4': case '5':
-	case '6': case '7': case '8': case '9':
-		nonzero = 1;
-	}
-	if (nonzero && !ok) { *p++ = 'H'; *p = 0; }
-	return (p);
-}
diff --git a/c/src/libnetworking/libc/ns_parse.c b/c/src/libnetworking/libc/ns_parse.c
deleted file mode 100644
index cc1f070156..0000000000
--- a/c/src/libnetworking/libc/ns_parse.c
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- * Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#if !defined(__rtems__)
-#if !defined(LINT) && !defined(CODECENTER)
-static char rcsid[] = "$Id$";
-#endif /* not lint */
-#endif /* not rtems */
-
-#include <sys/types.h>
-
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-
-#include <errno.h>
-#include <resolv.h>
-#include <string.h>
-
-/* These need to be in the same order as the nres.h:ns_flag enum. */
-struct _ns_flagdata _ns_flagdata[16] = {
-	{ 0x8000, 15 },		/* qr. */
-	{ 0x7800, 11 },		/* opcode. */
-	{ 0x0400, 10 },		/* aa. */
-	{ 0x0200, 9 },		/* tc. */
-	{ 0x0100, 8 },		/* rd. */
-	{ 0x0080, 7 },		/* ra. */
-	{ 0x0040, 6 },		/* z. */
-	{ 0x0020, 5 },		/* ad. */
-	{ 0x0010, 4 },		/* cd. */
-	{ 0x000f, 0 },		/* rcode. */
-	{ 0x0000, 0 },		/* expansion (1/6). */
-	{ 0x0000, 0 },		/* expansion (2/6). */
-	{ 0x0000, 0 },		/* expansion (3/6). */
-	{ 0x0000, 0 },		/* expansion (4/6). */
-	{ 0x0000, 0 },		/* expansion (5/6). */
-	{ 0x0000, 0 },		/* expansion (6/6). */
-};
-
-static int
-skiprr(const u_char *ptr, const u_char *eom, ns_sect section, int count) {
-	const u_char *optr = ptr;
-
-	for ((void)NULL; count > 0; count--) {
-		int b, rdlength;
-
-		b = dn_skipname(ptr, eom);
-		if (b < 0)
-			goto emsgsize;
-		ptr += b/*Name*/ + NS_INT16SZ/*Type*/ + NS_INT16SZ/*Class*/;
-		if (section != ns_s_qd) {
-			if (ptr + NS_INT32SZ > eom)
-				goto emsgsize;
-			ptr += NS_INT32SZ/*TTL*/;
-			if (ptr + NS_INT16SZ > eom)
-				goto emsgsize;
-			NS_GET16(rdlength, ptr);
-			ptr += rdlength/*RData*/;
-		}
-	}
-	if (ptr > eom)
-		goto emsgsize;
-	return (ptr - optr);
- emsgsize:
-	errno = EMSGSIZE;
-	return (-1);
-}
-
-int
-ns_initparse(const u_char *msg, int msglen, ns_msg *handle) {
-	const u_char *eom = msg + msglen;
-	int i;
-
-	memset(handle, 0x5e, sizeof *handle);
-	handle->_msg = msg;
-	handle->_eom = eom;
-	if (msg + NS_INT16SZ > eom)
-		goto emsgsize;
-	NS_GET16(handle->_id, msg);
-	if (msg + NS_INT16SZ > eom)
-		goto emsgsize;
-	NS_GET16(handle->_flags, msg);
-	for (i = 0; i < ns_s_max; i++) {
-		if (msg + NS_INT16SZ > eom)
-			goto emsgsize;
-		NS_GET16(handle->_counts[i], msg);
-	}
-	for (i = 0; i < ns_s_max; i++)
-		if (handle->_counts[i] == 0)
-			handle->_sections[i] = NULL;
-		else {
-			int b = skiprr(msg, eom, (ns_sect)i,
-				       handle->_counts[i]);
-
-			if (b < 0)
-				return (-1);
-			handle->_sections[i] = msg;
-			msg += b;
-		}
-	if (msg != eom)
-		goto emsgsize;
-	handle->_sect = ns_s_max;
-	handle->_rrnum = -1;
-	handle->_ptr = NULL;
-	return (0);
- emsgsize:
-	errno = EMSGSIZE;
-	return (-1);
-}
-
-int
-ns_parserr(ns_msg *handle, ns_sect section, int rrnum, ns_rr *rr) {
-	int b;
-
-	/* Make section right. */
-	if (section < 0 || section >= ns_s_max)
-		goto enodev;
-	if ((int)section != (int)handle->_sect) {
-		handle->_sect = section;
-		handle->_rrnum = 0;
-		handle->_ptr = handle->_sections[(int)section];
-	}
-
-	/* Make rrnum right. */
-	if (rrnum == -1)
-		rrnum = handle->_rrnum;
-	if (rrnum < 0 || rrnum >= handle->_counts[(int)section])
-		goto enodev;
-	if (rrnum < handle->_rrnum) {
-		handle->_rrnum = 0;
-		handle->_ptr = handle->_sections[(int)section];
-	}
-	
-	b = skiprr(handle->_msg, handle->_eom, section,
-		   rrnum - handle->_rrnum);
-	if (b < 0)
-		return (-1);
-	handle->_ptr += b;
-	handle->_rrnum = rrnum;
-
-	/* Do the parse. */
-	b = dn_expand(handle->_msg, handle->_eom,
-		      handle->_ptr, rr->name, NS_MAXDNAME);
-	if (b < 0)
-		return (-1);
-	handle->_ptr += b;
-	if (handle->_ptr + NS_INT16SZ > handle->_eom)
-		goto emsgsize;
-	NS_GET16(rr->type, handle->_ptr);
-	if (handle->_ptr + NS_INT16SZ > handle->_eom)
-		goto emsgsize;
-	NS_GET16(rr->class, handle->_ptr);
-	if (section == ns_s_qd) {
-		rr->ttl = 0;
-		rr->rdlength = 0;
-		rr->rdata = NULL;
-	} else {
-		if (handle->_ptr + NS_INT32SZ > handle->_eom)
-			goto emsgsize;
-		NS_GET32(rr->ttl, handle->_ptr);
-		if (handle->_ptr + NS_INT16SZ > handle->_eom)
-			goto emsgsize;
-		NS_GET16(rr->rdlength, handle->_ptr);
-		if (handle->_ptr + rr->rdlength > handle->_eom)
-			goto emsgsize;
-		rr->rdata = handle->_ptr;
-		handle->_ptr += rr->rdlength;
-	}
-	handle->_rrnum++;
-
-	/* All done. */
-	return (0);
- enodev:
-	errno = ENODEV;
-	return (-1);
- emsgsize:
-	errno = EMSGSIZE;
-	return (-1);
-}
diff --git a/c/src/libnetworking/libc/ns_print.c b/c/src/libnetworking/libc/ns_print.c
deleted file mode 100644
index f7d7d16c64..0000000000
--- a/c/src/libnetworking/libc/ns_print.c
+++ /dev/null
@@ -1,745 +0,0 @@
-/*
- * Copyright (c) 1996, 1998 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#if !defined(__rtems__)
-#if !defined(LINT) && !defined(CODECENTER)
-static char rcsid[] = "$Id$";
-#endif /* not lint */
-#endif /* not rtems */
-
-/* Import. */
-
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <arpa/inet.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <resolv.h>
-#include <string.h>
-#include <ctype.h>
-
-#define SPRINTF(x) ((size_t)sprintf x)
-
-/* Forward. */
-
-static size_t	prune_origin(const char *name, const char *origin);
-static int	charstr(const u_char *rdata, const u_char *edata,
-			char **buf, size_t *buflen);
-static int	addname(const u_char *msg, size_t msglen,
-			const u_char **p, const char *origin,
-			char **buf, size_t *buflen);
-static void	addlen(size_t len, char **buf, size_t *buflen);
-static int	addstr(const char *src, size_t len,
-		       char **buf, size_t *buflen);
-static int	addtab(size_t len, size_t target, int spaced,
-		       char **buf, size_t *buflen);
-
-/* Macros. */
-
-#define	T(x) \
-	do { \
-		if ((x) < 0) \
-			return (-1); \
-	} while (0)
-
-/* Public. */
-
-/*
- * int
- * ns_sprintrr(handle, rr, name_ctx, origin, buf, buflen)
- *	Convert an RR to presentation format.
- * return:
- *	Number of characters written to buf, or -1 (check errno).
- */
-int
-ns_sprintrr(const ns_msg *handle, const ns_rr *rr,
-	    const char *name_ctx, const char *origin,
-	    char *buf, size_t buflen)
-{
-	int n;
-
-	n = ns_sprintrrf(ns_msg_base(*handle), ns_msg_size(*handle),
-			 ns_rr_name(*rr), ns_rr_class(*rr), ns_rr_type(*rr),
-			 ns_rr_ttl(*rr), ns_rr_rdata(*rr), ns_rr_rdlen(*rr),
-			 name_ctx, origin, buf, buflen);
-	return (n);
-}
-
-/*
- * int
- * ns_sprintrrf(msg, msglen, name, class, type, ttl, rdata, rdlen,
- *	       name_ctx, origin, buf, buflen)
- *	Convert the fields of an RR into presentation format.
- * return:
- *	Number of characters written to buf, or -1 (check errno).
- */
-int
-ns_sprintrrf(const u_char *msg, size_t msglen,
-	    const char *name, ns_class class, ns_type type,
-	    u_long ttl, const u_char *rdata, size_t rdlen,
-	    const char *name_ctx, const char *origin,
-	    char *buf, size_t buflen)
-{
-	const char *obuf = buf;
-	const u_char *edata = rdata + rdlen;
-	int spaced = 0;
-
-	const char *comment;
-	char tmp[100];
-	int len, x;
-
-	/*
-	 * Owner.
-	 */
-	if (name_ctx != NULL && strcasecmp(name_ctx, name) == 0) {
-		T(addstr("\t\t\t", 3, &buf, &buflen));
-	} else {
-		len = prune_origin(name, origin);
-		if (len == 0) {
-			T(addstr("@\t\t\t", 4, &buf, &buflen));
-		} else {
-			T(addstr(name, len, &buf, &buflen));
-			/* Origin not used and no trailing dot? */
-			if ((!origin || !origin[0] || name[len] == '\0') &&
-			    name[len - 1] != '.') {
-				T(addstr(".", 1, &buf, &buflen));
-				len++;
-			}
-			T(spaced = addtab(len, 24, spaced, &buf, &buflen));
-		}
-	}
-
-	/*
-	 * TTL, Class, Type.
-	 */
-	T(x = ns_format_ttl(ttl, buf, buflen));
-	addlen(x, &buf, &buflen);
-	len = SPRINTF((tmp, " %s %s", p_class(class), p_type(type)));
-	T(addstr(tmp, len, &buf, &buflen));
-	T(spaced = addtab(x + len, 16, spaced, &buf, &buflen));
-
-	/*
-	 * RData.
-	 */
-	switch (type) {
-	case ns_t_a:
-		if (rdlen != NS_INADDRSZ)
-			goto formerr;
-		(void) inet_ntop(AF_INET, rdata, buf, buflen);
-		addlen(strlen(buf), &buf, &buflen);
-		break;
-
-	case ns_t_cname:
-	case ns_t_mb:
-	case ns_t_mg:
-	case ns_t_mr:
-	case ns_t_ns:
-	case ns_t_ptr:
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-		break;
-
-	case ns_t_hinfo:
-	case ns_t_isdn:
-		/* First word. */
-		T(len = charstr(rdata, edata, &buf, &buflen));
-		if (len == 0)
-			goto formerr;
-		rdata += len;
-		T(addstr(" ", 1, &buf, &buflen));
-
-		/* Second word. */
-		T(len = charstr(rdata, edata, &buf, &buflen));
-		if (len == 0)
-			goto formerr;
-		rdata += len;
-		break;
-
-	case ns_t_soa: {
-		u_long t;
-
-		/* Server name. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-		T(addstr(" ", 1, &buf, &buflen));
-
-		/* Administrator name. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-		T(addstr(" (\n", 3, &buf, &buflen));
-		spaced = 0;
-
-		if ((edata - rdata) != 5*NS_INT32SZ)
-			goto formerr;
-
-		/* Serial number. */
-		t = ns_get32(rdata);  rdata += NS_INT32SZ;
-		T(addstr("\t\t\t\t\t", 5, &buf, &buflen));
-		len = SPRINTF((tmp, "%lu", t));
-		T(addstr(tmp, len, &buf, &buflen));
-		T(spaced = addtab(len, 16, spaced, &buf, &buflen));
-		T(addstr("; serial\n", 9, &buf, &buflen));
-		spaced = 0;
-
-		/* Refresh interval. */
-		t = ns_get32(rdata);  rdata += NS_INT32SZ;
-		T(addstr("\t\t\t\t\t", 5, &buf, &buflen));
-		T(len = ns_format_ttl(t, buf, buflen));
-		addlen(len, &buf, &buflen);
-		T(spaced = addtab(len, 16, spaced, &buf, &buflen));
-		T(addstr("; refresh\n", 10, &buf, &buflen));
-		spaced = 0;
-
-		/* Retry interval. */
-		t = ns_get32(rdata);  rdata += NS_INT32SZ;
-		T(addstr("\t\t\t\t\t", 5, &buf, &buflen));
-		T(len = ns_format_ttl(t, buf, buflen));
-		addlen(len, &buf, &buflen);
-		T(spaced = addtab(len, 16, spaced, &buf, &buflen));
-		T(addstr("; retry\n", 8, &buf, &buflen));
-		spaced = 0;
-
-		/* Expiry. */
-		t = ns_get32(rdata);  rdata += NS_INT32SZ;
-		T(addstr("\t\t\t\t\t", 5, &buf, &buflen));
-		T(len = ns_format_ttl(t, buf, buflen));
-		addlen(len, &buf, &buflen);
-		T(spaced = addtab(len, 16, spaced, &buf, &buflen));
-		T(addstr("; expiry\n", 9, &buf, &buflen));
-		spaced = 0;
-
-		/* Minimum TTL. */
-		t = ns_get32(rdata);  rdata += NS_INT32SZ;
-		T(addstr("\t\t\t\t\t", 5, &buf, &buflen));
-		T(len = ns_format_ttl(t, buf, buflen));
-		addlen(len, &buf, &buflen);
-		T(addstr(" )", 2, &buf, &buflen));
-		T(spaced = addtab(len, 16, spaced, &buf, &buflen));
-		T(addstr("; minimum\n", 10, &buf, &buflen));
-
-		break;
-	    }
-
-	case ns_t_mx:
-	case ns_t_afsdb:
-	case ns_t_rt: {
-		u_int t;
-
-		if (rdlen < NS_INT16SZ)
-			goto formerr;
-
-		/* Priority. */
-		t = ns_get16(rdata);
-		rdata += NS_INT16SZ;
-		len = SPRINTF((tmp, "%u ", t));
-		T(addstr(tmp, len, &buf, &buflen));
-
-		/* Target. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-
-		break;
-	    }
-
-	case ns_t_px: {
-		u_int t;
-
-		if (rdlen < NS_INT16SZ)
-			goto formerr;
-
-		/* Priority. */
-		t = ns_get16(rdata);
-		rdata += NS_INT16SZ;
-		len = SPRINTF((tmp, "%u ", t));
-		T(addstr(tmp, len, &buf, &buflen));
-
-		/* Name1. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-		T(addstr(" ", 1, &buf, &buflen));
-
-		/* Name2. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-
-		break;
-	    }
-
-	case ns_t_x25:
-		T(len = charstr(rdata, edata, &buf, &buflen));
-		if (len == 0)
-			goto formerr;
-		rdata += len;
-		break;
-
-	case ns_t_txt:
-		while (rdata < edata) {
-			T(len = charstr(rdata, edata, &buf, &buflen));
-			if (len == 0)
-				goto formerr;
-			rdata += len;
-			if (rdata < edata)
-				T(addstr(" ", 1, &buf, &buflen));
-		}
-		break;
-
-	case ns_t_nsap: {
-		char t[255*3];
-
-		(void) inet_nsap_ntoa(rdlen, rdata, t);
-		T(addstr(t, strlen(t), &buf, &buflen));
-		break;
-	    }
-
-	case ns_t_aaaa:
-		if (rdlen != NS_IN6ADDRSZ)
-			goto formerr;
-		(void) inet_ntop(AF_INET6, rdata, buf, buflen);
-		addlen(strlen(buf), &buf, &buflen);
-		break;
-
-	case ns_t_loc: {
-		char t[255];
-
-		/* XXX protocol format checking? */
-		(void) loc_ntoa(rdata, t);
-		T(addstr(t, strlen(t), &buf, &buflen));
-		break;
-	    }
-
-	case ns_t_naptr: {
-		u_int order, preference;
-		char t[50];
-
-		if (rdlen < 2*NS_INT16SZ)
-			goto formerr;
-
-		/* Order, Precedence. */
-		order = ns_get16(rdata);	rdata += NS_INT16SZ;
-		preference = ns_get16(rdata);	rdata += NS_INT16SZ;
-		len = SPRINTF((t, "%u %u ", order, preference));
-		T(addstr(t, len, &buf, &buflen));
-
-		/* Flags. */
-		T(len = charstr(rdata, edata, &buf, &buflen));
-		if (len == 0)
-			goto formerr;
-		rdata += len;
-		T(addstr(" ", 1, &buf, &buflen));
-
-		/* Service. */
-		T(len = charstr(rdata, edata, &buf, &buflen));
-		if (len == 0)
-			goto formerr;
-		rdata += len;
-		T(addstr(" ", 1, &buf, &buflen));
-
-		/* Regexp. */
-		T(len = charstr(rdata, edata, &buf, &buflen));
-		if (len < 0)
-			return (-1);
-		if (len == 0)
-			goto formerr;
-		rdata += len;
-		T(addstr(" ", 1, &buf, &buflen));
-
-		/* Server. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-		break;
-	    }
-
-	case ns_t_srv: {
-		u_int priority, weight, port;
-		char t[50];
-
-		if (rdlen < NS_INT16SZ*3)
-			goto formerr;
-
-		/* Priority, Weight, Port. */
-		priority = ns_get16(rdata);  rdata += NS_INT16SZ;
-		weight   = ns_get16(rdata);  rdata += NS_INT16SZ;
-		port     = ns_get16(rdata);  rdata += NS_INT16SZ;
-		len = SPRINTF((t, "%u %u %u ", priority, weight, port));
-		T(addstr(t, len, &buf, &buflen));
-
-		/* Server. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-		break;
-	    }
-
-	case ns_t_minfo:
-	case ns_t_rp:
-		/* Name1. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-		T(addstr(" ", 1, &buf, &buflen));
-
-		/* Name2. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-
-		break;
-
-	case ns_t_wks: {
-		int n, lcnt;
-
-		if (rdlen < NS_INT32SZ + 1)
-			goto formerr;
-
-		/* Address. */
-		(void) inet_ntop(AF_INET, rdata, buf, buflen);
-		addlen(strlen(buf), &buf, &buflen);
-		rdata += NS_INADDRSZ;
-
-		/* Protocol. */
-		len = SPRINTF((tmp, " %u ( ", *rdata));
-		T(addstr(tmp, len, &buf, &buflen));
-		rdata += NS_INT8SZ;
-
-		/* Bit map. */
-		n = 0;
-		lcnt = 0;
-		while (rdata < edata) {
-			u_int c = *rdata++;
-			do {
-				if (c & 0200) {
-					if (lcnt == 0) {
-						T(addstr("\n\t\t\t\t", 5,
-							 &buf, &buflen));
-						lcnt = 10;
-						spaced = 0;
-					}
-					len = SPRINTF((tmp, "%d ", n));
-					T(addstr(tmp, len, &buf, &buflen));
-					lcnt--;
-				}
-				c <<= 1;
-			} while (++n & 07);
-		}
-		T(addstr(")", 1, &buf, &buflen));
-
-		break;
-	    }
-
-	case ns_t_key: {
-		char base64_key[NS_MD5RSA_MAX_BASE64];
-		u_int keyflags, protocol, algorithm;
-		const char *leader;
-		int n;
-
-		if (rdlen < NS_INT16SZ + NS_INT8SZ + NS_INT8SZ)
-			goto formerr;
-
-		/* Key flags, Protocol, Algorithm. */
-		keyflags = ns_get16(rdata);  rdata += NS_INT16SZ;
-		protocol = *rdata++;
-		algorithm = *rdata++;
-		len = SPRINTF((tmp, "0x%04x %u %u",
-			       keyflags, protocol, algorithm));
-		T(addstr(tmp, len, &buf, &buflen));
-
-		/* Public key data. */
-		len = b64_ntop(rdata, edata - rdata,
-			       base64_key, sizeof base64_key);
-		if (len < 0)
-			goto formerr;
-		if (len > 15) {
-			T(addstr(" (", 2, &buf, &buflen));
-			leader = "\n\t\t";
-			spaced = 0;
-		} else
-			leader = " ";
-		for (n = 0; n < len; n += 48) {
-			T(addstr(leader, strlen(leader), &buf, &buflen));
-			T(addstr(base64_key + n, MIN(len - n, 48),
-				 &buf, &buflen));
-		}
-		if (len > 15)
-			T(addstr(" )", 2, &buf, &buflen));
-
-		break;
-	    }
-
-	case ns_t_sig: {
-		char base64_key[NS_MD5RSA_MAX_BASE64];
-		u_int type, algorithm, labels, footprint;
-		const char *leader;
-		u_long t;
-		int n;
-
-		if (rdlen < 22)
-			goto formerr;
-
-		/* Type covered, Algorithm, Label count, Original TTL. */
-	        type = ns_get16(rdata);  rdata += NS_INT16SZ;
-		algorithm = *rdata++;
-		labels = *rdata++;
-		t = ns_get32(rdata);  rdata += NS_INT32SZ;
-		len = SPRINTF((tmp, " %s %d %lu ",
-			       p_type(type), algorithm, t));
-		T(addstr(tmp, len, &buf, &buflen));
-		if (labels != (u_int)dn_count_labels(name))
-			goto formerr;
-
-		/* Signature expiry. */
-		t = ns_get32(rdata);  rdata += NS_INT32SZ;
-		len = SPRINTF((tmp, "%s ", p_secstodate(t)));
-		T(addstr(tmp, len, &buf, &buflen));
-
-		/* Time signed. */
-		t = ns_get32(rdata);  rdata += NS_INT32SZ;
-		len = SPRINTF((tmp, "%s ", p_secstodate(t)));
-		T(addstr(tmp, len, &buf, &buflen));
-
-		/* Signature Footprint. */
-		footprint = ns_get16(rdata);  rdata += NS_INT16SZ;
-		len = SPRINTF((tmp, "%u ", footprint));
-		T(addstr(tmp, len, &buf, &buflen));
-
-		/* Signer's name. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-
-		/* Signature. */
-		len = b64_ntop(rdata, edata - rdata,
-			       base64_key, sizeof base64_key);
-		if (len > 15) {
-			T(addstr(" (", 2, &buf, &buflen));
-			leader = "\n\t\t";
-			spaced = 0;
-		} else
-			leader = " ";
-		if (len < 0)
-			goto formerr;
-		for (n = 0; n < len; n += 48) {
-			T(addstr(leader, strlen(leader), &buf, &buflen));
-			T(addstr(base64_key + n, MIN(len - n, 48),
-				 &buf, &buflen));
-		}
-		if (len > 15)
-			T(addstr(" )", 2, &buf, &buflen));
-
-		break;
-	    }
-
-	case ns_t_nxt: {
-		int n, c;
-
-		/* Next domain name. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-
-		/* Type bit map. */
-		n = edata - rdata;
-		for (c = 0; c < n*8; c++)
-			if (NS_NXT_BIT_ISSET(c, rdata)) {
-				len = SPRINTF((tmp, " %s", p_type(c)));
-				T(addstr(tmp, len, &buf, &buflen));
-			}
-		break;
-	    }
-
-	default:
-		comment = "unknown RR type";
-		goto hexify;
-	}
-	return (buf - obuf);
- formerr:
-	comment = "RR format error";
- hexify: {
-	int n, m;
-	char *p;
-
-	len = SPRINTF((tmp, "\\#(\t\t; %s", comment));
-	T(addstr(tmp, len, &buf, &buflen));
-	while (rdata < edata) {
-		p = tmp;
-		p += SPRINTF((p, "\n\t"));
-		spaced = 0;
-		n = MIN(16, edata - rdata);
-		for (m = 0; m < n; m++)
-			p += SPRINTF((p, "%02x ", rdata[m]));
-		T(addstr(tmp, p - tmp, &buf, &buflen));
-		if (n < 16) {
-			T(addstr(")", 1, &buf, &buflen));
-			T(addtab(p - tmp + 1, 48, spaced, &buf, &buflen));
-		}
-		p = tmp;
-		p += SPRINTF((p, "; "));
-		for (m = 0; m < n; m++)
-			*p++ = (isascii(rdata[m]) && isprint(rdata[m]))
-				? rdata[m]
-				: '.';
-		T(addstr(tmp, p - tmp, &buf, &buflen));
-		rdata += n;
-	}
-	return (buf - obuf);
-    }
-}
-
-/* Private. */
-
-/*
- * size_t
- * prune_origin(name, origin)
- *	Find out if the name is at or under the current origin.
- * return:
- *	Number of characters in name before start of origin,
- *	or length of name if origin does not match.
- * notes:
- *	This function should share code with samedomain().
- */
-static size_t
-prune_origin(const char *name, const char *origin) {
-	const char *oname = name;
-
-	while (*name != '\0') {
-		if (origin != NULL && strcasecmp(name, origin) == 0)
-			return (name - oname - (name > oname));
-		while (*name != '\0') {
-			if (*name == '\\') {
-				name++;
-				/* XXX need to handle \nnn form. */
-				if (*name == '\0')
-					break;
-			} else if (*name == '.') {
-				name++;
-				break;
-			}
-			name++;
-		}
-	}
-	return (name - oname);
-}
-
-/*
- * int
- * charstr(rdata, edata, buf, buflen)
- *	Format a <character-string> into the presentation buffer.
- * return:
- *	Number of rdata octets consumed
- *	0 for protocol format error
- *	-1 for output buffer error
- * side effects:
- *	buffer is advanced on success.
- */
-static int
-charstr(const u_char *rdata, const u_char *edata, char **buf, size_t *buflen) {
-	const u_char *odata = rdata;
-	size_t save_buflen = *buflen;
-	char *save_buf = *buf;
-
-	if (addstr("\"", 1, buf, buflen) < 0)
-		goto enospc;
-	if (rdata < edata) {
-		int n = *rdata;
-
-		if (rdata + 1 + n <= edata) {
-			rdata++;
-			while (n-- > 0) {
-				if (strchr("\n\"\\", *rdata) != NULL)
-					if (addstr("\\", 1, buf, buflen) < 0)
-						goto enospc;
-				if (addstr((const char *)rdata, 1,
-					   buf, buflen) < 0)
-					goto enospc;
-				rdata++;
-			}
-		}
-	}
-	if (addstr("\"", 1, buf, buflen) < 0)
-		goto enospc;
-	return (rdata - odata);
- enospc:
-	errno = ENOSPC;
-	*buf = save_buf;
-	*buflen = save_buflen;
-	return (-1);
-}
-
-static int
-addname(const u_char *msg, size_t msglen,
-	const u_char **pp, const char *origin,
-	char **buf, size_t *buflen)
-{
-	size_t newlen, save_buflen = *buflen;
-	char *save_buf = *buf;
-	int n;
-
-	n = dn_expand(msg, msg + msglen, *pp, *buf, *buflen);
-	if (n < 0)
-		goto enospc;	/* Guess. */
-	newlen = prune_origin(*buf, origin);
-	if ((origin == NULL || origin[0] == '\0' || (*buf)[newlen] == '\0') &&
-	    (newlen == 0 || (*buf)[newlen - 1] != '.')) {
-		/* No trailing dot. */
-		if (newlen + 2 > *buflen)
-			goto enospc;	/* No room for ".\0". */
-		(*buf)[newlen++] = '.';
-		(*buf)[newlen] = '\0';
-	}
-	if (newlen == 0) {
-		/* Use "@" instead of name. */
-		if (newlen + 2 > *buflen)
-			goto enospc;        /* No room for "@\0". */
-		(*buf)[newlen++] = '@';
-		(*buf)[newlen] = '\0';
-	}
-	*pp += n;
-	addlen(newlen, buf, buflen);
-	**buf = '\0';
-	return (newlen);
- enospc:
-	errno = ENOSPC;
-	*buf = save_buf;
-	*buflen = save_buflen;
-	return (-1);
-}
-
-static void
-addlen(size_t len, char **buf, size_t *buflen) {
-	assert(len <= *buflen);
-	*buf += len;
-	*buflen -= len;
-}
-
-static int
-addstr(const char *src, size_t len, char **buf, size_t *buflen) {
-	if (len > *buflen) {
-		errno = ENOSPC;
-		return (-1);
-	}
-	memcpy(*buf, src, len);
-	addlen(len, buf, buflen);
-	**buf = '\0';
-	return (0);
-}
-
-static int
-addtab(size_t len, size_t target, int spaced, char **buf, size_t *buflen) {
-	size_t save_buflen = *buflen;
-	char *save_buf = *buf;
-	int t;
-
-	if (spaced || len >= target - 1) {
-		T(addstr("  ", 2, buf, buflen));
-		spaced = 1;
-	} else {
-		for (t = (target - len - 1) / 8; t >= 0; t--)
-			if (addstr("\t", 1, buf, buflen) < 0) {
-				*buflen = save_buflen;
-				*buf = save_buf;
-				return (-1);
-			}
-		spaced = 0;
-	}
-	return (spaced);
-}
diff --git a/c/src/libnetworking/libc/ns_ttl.c b/c/src/libnetworking/libc/ns_ttl.c
deleted file mode 100644
index 75093c1dbc..0000000000
--- a/c/src/libnetworking/libc/ns_ttl.c
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#if !defined(__rtems__)
-#if !defined(LINT) && !defined(CODECENTER)
-static char rcsid[] = "$Id$";
-#endif /* not lint */
-#endif /* not rtems */
-
-/* Import. */
-
-#include <arpa/nameser.h>
-
-#include <ctype.h>
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-
-#define SPRINTF(x) ((size_t)sprintf x)
-
-/* Forward. */
-
-static int	fmt1(int t, char s, char **buf, size_t *buflen);
-
-/* Macros. */
-
-#define T(x) if ((x) < 0) return (-1); else (void)NULL
-
-/* Public. */
-
-int
-ns_format_ttl(u_long src, char *dst, size_t dstlen) {
-	char *odst = dst;
-	int secs, mins, hours, days, weeks, x;
-	char *p;
-
-	secs = src % 60;   src /= 60;
-	mins = src % 60;   src /= 60;
-	hours = src % 24;  src /= 24;
-	days = src % 7;    src /= 7;
-	weeks = src;       src = 0;
-
-	x = 0;
-	if (weeks) {
-		T(fmt1(weeks, 'W', &dst, &dstlen));
-		x++;
-	}
-	if (days) {
-		T(fmt1(days, 'D', &dst, &dstlen));
-		x++;
-	}
-	if (hours) {
-		T(fmt1(hours, 'H', &dst, &dstlen));
-		x++;
-	}
-	if (mins) {
-		T(fmt1(mins, 'M', &dst, &dstlen));
-		x++;
-	}
-	if (secs || !(weeks || days || hours || mins)) {
-		T(fmt1(secs, 'S', &dst, &dstlen));
-		x++;
-	}
-
-	if (x > 1) {
-		int ch;
-
-		for (p = odst; (ch = *p) != '\0'; p++)
-			if (isascii(ch) && isupper(ch))
-				*p = tolower(ch);
-	}
-
-	return (dst - odst);
-}
-
-int
-ns_parse_ttl(const char *src, u_long *dst) {
-	u_long ttl, tmp;
-	int ch, digits, dirty;
-
-	ttl = 0;
-	tmp = 0;
-	digits = 0;
-	dirty = 0;
-	while ((ch = *src++) != '\0') {
-		if (!isascii(ch) || !isprint(ch))
-			goto einval;
-		if (isdigit(ch)) {
-			tmp *= 10;
-			tmp += (ch - '0');
-			digits++;
-			continue;
-		}
-		if (digits == 0)
-			goto einval;
-		if (islower(ch))
-			ch = toupper(ch);
-		switch (ch) {
-		case 'W':  tmp *= 7;
-		case 'D':  tmp *= 24;
-		case 'H':  tmp *= 60;
-		case 'M':  tmp *= 60;
-		case 'S':  break;
-		default:   goto einval;
-		}
-		ttl += tmp;
-		tmp = 0;
-		digits = 0;
-		dirty = 1;
-	}
-	if (digits > 0) {
-		if (dirty)
-			goto einval;
-		else
-			ttl += tmp;
-	}
-	*dst = ttl;
-	return (0);
-
- einval:
-	errno = EINVAL;
-	return (-1);
-}
-
-/* Private. */
-
-static int
-fmt1(int t, char s, char **buf, size_t *buflen) {
-	char tmp[50];
-	size_t len;
-
-	len = SPRINTF((tmp, "%d%c", t, s));
-	if (len + 1 > *buflen)
-		return (-1);
-	strcpy(*buf, tmp);
-	*buf += len;
-	*buflen -= len;
-	return (0);
-}
diff --git a/c/src/libnetworking/libc/nsap_addr.c b/c/src/libnetworking/libc/nsap_addr.c
deleted file mode 100644
index a7af57a266..0000000000
--- a/c/src/libnetworking/libc/nsap_addr.c
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (c) 1996, 1998 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$Id$";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-#include <ctype.h>
-#include <resolv.h>
-
-static char
-xtob(c)
-	register int c;
-{
-	return (c - (((c >= '0') && (c <= '9')) ? '0' : '7'));
-}
-
-u_int
-inet_nsap_addr(ascii, binary, maxlen)
-	const char *ascii;
-	u_char *binary;
-	int maxlen;
-{
-	u_char c, nib;
-	u_int len = 0;
-
-	while ((c = *ascii++) != '\0' && len < (u_int)maxlen) {
-		if (c == '.' || c == '+' || c == '/')
-			continue;
-		if (!isascii(c))
-			return (0);
-		if (islower(c))
-			c = toupper(c);
-		if (isxdigit(c)) {
-			nib = xtob(c);
-			c = *ascii++;
-			if (c != '\0') {
-				c = toupper(c);
-				if (isxdigit(c)) {
-					*binary++ = (nib << 4) | xtob(c);
-					len++;
-				} else
-					return (0);
-			}
-			else
-				return (0);
-		}
-		else
-			return (0);
-	}
-	return (len);
-}
-
-char *
-inet_nsap_ntoa(binlen, binary, ascii)
-	int binlen;
-	register const u_char *binary;
-	register char *ascii;
-{
-	register int nib;
-	int i;
-	static char tmpbuf[255*3];
-	char *start;
-
-	if (ascii)
-		start = ascii;
-	else {
-		ascii = tmpbuf;
-		start = tmpbuf;
-	}
-
-	if (binlen > 255)
-		binlen = 255;
-
-	for (i = 0; i < binlen; i++) {
-		nib = *binary >> 4;
-		*ascii++ = nib + (nib < 10 ? '0' : '7');
-		nib = *binary++ & 0x0f;
-		*ascii++ = nib + (nib < 10 ? '0' : '7');
-		if (((i % 2) == 0 && (i + 1) < binlen))
-			*ascii++ = '.';
-	}
-	*ascii = '\0';
-	return (start);
-}
diff --git a/c/src/libnetworking/libc/rcmd.3 b/c/src/libnetworking/libc/rcmd.3
deleted file mode 100644
index e25057fa4e..0000000000
--- a/c/src/libnetworking/libc/rcmd.3
+++ /dev/null
@@ -1,204 +0,0 @@
-.\" Copyright (c) 1983, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"     From: @(#)rcmd.3	8.1 (Berkeley) 6/4/93
-.\"	$Id$
-.\"
-.Dd February 15, 1996
-.Dt RCMD 3
-.Os BSD 4.2
-.Sh NAME
-.Nm rcmd ,
-.Nm rresvport ,
-.Nm iruserok ,
-.Nm ruserok
-.Nd routines for returning a stream to a remote command
-.Sh SYNOPSIS
-.Fd #include <unistd.h>
-.Ft int
-.Fn rcmd "char **ahost" "int inport" "const char *locuser" "const char *remuser" "const char *cmd" "int *fd2p"
-.Ft int
-.Fn rresvport "int *port"
-.Ft int
-.Fn iruserok "u_long raddr" "int superuser" "const char *ruser" "const char *luser"
-.Ft int
-.Fn ruserok "const char *rhost" "int superuser" "const char *ruser" "const char *luser"
-.Sh DESCRIPTION
-The
-.Fn rcmd
-function
-is used by the super-user to execute a command on
-a remote machine using an authentication scheme based
-on reserved port numbers.
-The
-.Fn rresvport
-function
-returns a descriptor to a socket
-with an address in the privileged port space.
-The
-.Fn ruserok
-function
-is used by servers
-to authenticate clients requesting service with
-.Fn rcmd .
-All three functions are present in the same file and are used
-by the
-.Xr rshd 8
-server (among others).
-.Pp
-The
-.Fn rcmd
-function
-looks up the host
-.Fa *ahost
-using
-.Xr gethostbyname 3 ,
-returning \-1 if the host does not exist.
-Otherwise
-.Fa *ahost
-is set to the standard name of the host
-and a connection is established to a server
-residing at the well-known Internet port
-.Fa inport .
-.Pp
-If the connection succeeds,
-a socket in the Internet domain of type
-.Dv SOCK_STREAM
-is returned to the caller, and given to the remote
-command as 
-.Em stdin
-and
-.Em stdout .
-If
-.Fa fd2p
-is non-zero, then an auxiliary channel to a control
-process will be set up, and a descriptor for it will be placed
-in
-.Fa *fd2p .
-The control process will return diagnostic
-output from the command (unit 2) on this channel, and will also
-accept bytes on this channel as being
-.Tn UNIX
-signal numbers, to be
-forwarded to the process group of the command.
-If
-.Fa fd2p
-is 0, then the 
-.Em stderr
-(unit 2 of the remote
-command) will be made the same as the 
-.Em stdout
-and no
-provision is made for sending arbitrary signals to the remote process,
-although you may be able to get its attention by using out-of-band data.
-.Pp
-The protocol is described in detail in
-.Xr rshd 8 .
-.Pp
-The
-.Fn rresvport
-function is used to obtain a socket with a privileged
-address bound to it.  This socket is suitable for use
-by 
-.Fn rcmd
-and several other functions.  Privileged Internet ports are those
-in the range 0 to 1023.  Only the super-user
-is allowed to bind an address of this sort to a socket.
-.Pp
-The
-.Fn iruserok
-and
-.Fn ruserok
-functions take a remote host's IP address or name, as returned by the
-.Xr gethostbyname 3
-routines, two user names and a flag indicating whether the local user's
-name is that of the super-user.
-Then, if the user is
-.Em NOT
-the super-user, it checks the
-.Pa /etc/hosts.equiv
-file.
-If that lookup is not done, or is unsuccessful, the
-.Pa .rhosts
-in the local user's home directory is checked to see if the request for
-service is allowed.
-.Pp
-If this file does not exist, is not a regular file, is owned by anyone
-other than the user or the super-user, or is writable by anyone other
-than the owner, the check automatically fails.
-Zero is returned if the machine name is listed in the
-.Dq Pa hosts.equiv
-file, or the host and remote user name are found in the
-.Dq Pa .rhosts
-file; otherwise
-.Fn iruserok
-and
-.Fn ruserok
-return \-1.
-If the local domain (as obtained from
-.Xr gethostname 3 )
-is the same as the remote domain, only the machine name need be specified.
-.Pp
-The
-.Fn iruserok
-function is strongly preferred for security reasons.
-It requires trusting the local DNS at most, while the
-.Fn ruserok
-function requires trusting the entire DNS, which can be spoofed.
-.Sh DIAGNOSTICS
-The
-.Fn rcmd
-function
-returns a valid socket descriptor on success.
-It returns \-1 on error and prints a diagnostic message on the standard error.
-.Pp
-The
-.Fn rresvport
-function
-returns a valid, bound socket descriptor on success.
-It returns \-1 on error with the global value
-.Va errno
-set according to the reason for failure.
-The error code
-.Dv EAGAIN
-is overloaded to mean ``All network ports in use.''
-.Sh SEE ALSO
-.Xr rlogin 1 ,
-.Xr rsh 1 ,
-.Xr intro 2 ,
-.Xr rexec 3 ,
-.Xr rexecd 8 ,
-.Xr rlogind 8 ,
-.Xr rshd 8
-.Sh HISTORY
-These
-functions appeared in 
-.Bx 4.2 .
diff --git a/c/src/libnetworking/libc/rcmd.c b/c/src/libnetworking/libc/rcmd.c
deleted file mode 100644
index 32e4953e9b..0000000000
--- a/c/src/libnetworking/libc/rcmd.c
+++ /dev/null
@@ -1,520 +0,0 @@
-/*
- * Copyright (c) 1983, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *  $Id$
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)rcmd.c	8.3 (Berkeley) 3/26/94";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include <signal.h>
-#include <fcntl.h>
-#include <netdb.h>
-#include <unistd.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <string.h>
-#ifdef YP
-#include <rpc/rpc.h>
-#include <rpcsvc/yp_prot.h>
-#include <rpcsvc/ypclnt.h>
-#endif
-
-extern int innetgr __P(( const char *, const char *, const char *, const char * ));
-
-#define max(a, b)	((a > b) ? a : b)
-
-int	__ivaliduser __P((FILE *, u_long, const char *, const char *));
-static int __icheckhost __P((u_long, char *));
-
-int
-rcmd(ahost, rport, locuser, remuser, cmd, fd2p)
-	char **ahost;
-	u_short rport;
-	const char *locuser, *remuser, *cmd;
-	int *fd2p;
-{
-	struct hostent *hp;
-	struct sockaddr_in sin, from;
-	fd_set reads;
-	long oldmask;
-	pid_t pid;
-	int s, lport, timo;
-	char c;
-
-	pid = getpid();
-	hp = gethostbyname(*ahost);
-	if (hp == NULL) {
-		herror(*ahost);
-		return (-1);
-	}
-	*ahost = hp->h_name;
-	oldmask = sigblock(sigmask(SIGURG));
-	for (timo = 1, lport = IPPORT_RESERVED - 1;;) {
-		s = rresvport(&lport);
-		if (s < 0) {
-			if (errno == EAGAIN)
-				(void)fprintf(stderr,
-				    "rcmd: socket: All ports in use\n");
-			else
-				(void)fprintf(stderr, "rcmd: socket: %s\n",
-				    strerror(errno));
-			sigsetmask(oldmask);
-			return (-1);
-		}
-		fcntl(s, F_SETOWN, pid);
-		bzero(&sin, sizeof sin);
-		sin.sin_len = sizeof(struct sockaddr_in);
-		sin.sin_family = hp->h_addrtype;
-		sin.sin_port = rport;
-		bcopy(hp->h_addr_list[0], &sin.sin_addr, MIN(hp->h_length, sizeof sin.sin_addr));
-		if (connect(s, (struct sockaddr *)&sin, sizeof(sin)) >= 0)
-			break;
-		(void)close(s);
-		if (errno == EADDRINUSE) {
-			lport--;
-			continue;
-		}
-		if (errno == ECONNREFUSED && timo <= 16) {
-			(void)sleep(timo);
-			timo *= 2;
-			continue;
-		}
-		if (hp->h_addr_list[1] != NULL) {
-			int oerrno = errno;
-
-			(void)fprintf(stderr, "connect to address %s: ",
-			    inet_ntoa(sin.sin_addr));
-			errno = oerrno;
-			perror(0);
-			hp->h_addr_list++;
-			bcopy(hp->h_addr_list[0], &sin.sin_addr, MIN(hp->h_length, sizeof sin.sin_addr));
-			(void)fprintf(stderr, "Trying %s...\n",
-			    inet_ntoa(sin.sin_addr));
-			continue;
-		}
-		(void)fprintf(stderr, "%s: %s\n", hp->h_name, strerror(errno));
-		sigsetmask(oldmask);
-		return (-1);
-	}
-	lport--;
-	if (fd2p == 0) {
-		write(s, "", 1);
-		lport = 0;
-	} else {
-		char num[8];
-		int s2 = rresvport(&lport), s3;
-		int len = sizeof(from);
-		int nfds;
-
-		if (s2 < 0)
-			goto bad;
-		listen(s2, 1);
-		(void)snprintf(num, sizeof(num), "%d", lport);
-		if (write(s, num, strlen(num)+1) != strlen(num)+1) {
-			(void)fprintf(stderr,
-			    "rcmd: write (setting up stderr): %s\n",
-			    strerror(errno));
-			(void)close(s2);
-			goto bad;
-		}
-		nfds = max(s, s2)+1;
-		if(nfds > FD_SETSIZE) {
-			fprintf(stderr, "rcmd: too many files\n");
-			(void)close(s2);
-			goto bad;
-		}
-again:
-		FD_ZERO(&reads);
-		FD_SET(s, &reads);
-		FD_SET(s2, &reads);
-		errno = 0;
-		if (select(nfds, &reads, 0, 0, 0) < 1 || !FD_ISSET(s2, &reads)){
-			if (errno != 0)
-				(void)fprintf(stderr,
-				    "rcmd: select (setting up stderr): %s\n",
-				    strerror(errno));
-			else
-				(void)fprintf(stderr,
-				"select: protocol failure in circuit setup\n");
-			(void)close(s2);
-			goto bad;
-		}
-		s3 = accept(s2, (struct sockaddr *)&from, &len);
-		/*
-		 * XXX careful for ftp bounce attacks. If discovered, shut them
-		 * down and check for the real auxiliary channel to connect.
-		 */
-		if (from.sin_family == AF_INET && from.sin_port == htons(20)) {
-			close(s3);
-			goto again;
-		}
-		(void)close(s2);
-		if (s3 < 0) {
-			(void)fprintf(stderr,
-			    "rcmd: accept: %s\n", strerror(errno));
-			lport = 0;
-			goto bad;
-		}
-		*fd2p = s3;
-		from.sin_port = ntohs((u_short)from.sin_port);
-		if (from.sin_family != AF_INET ||
-		    from.sin_port >= IPPORT_RESERVED ||
-		    from.sin_port < IPPORT_RESERVED / 2) {
-			(void)fprintf(stderr,
-			    "socket: protocol failure in circuit setup.\n");
-			goto bad2;
-		}
-	}
-	(void)write(s, locuser, strlen(locuser)+1);
-	(void)write(s, remuser, strlen(remuser)+1);
-	(void)write(s, cmd, strlen(cmd)+1);
-	if (read(s, &c, 1) != 1) {
-		(void)fprintf(stderr,
-		    "rcmd: %s: %s\n", *ahost, strerror(errno));
-		goto bad2;
-	}
-	if (c != 0) {
-		while (read(s, &c, 1) == 1) {
-			(void)write(STDERR_FILENO, &c, 1);
-			if (c == '\n')
-				break;
-		}
-		goto bad2;
-	}
-	sigsetmask(oldmask);
-	return (s);
-bad2:
-	if (lport)
-		(void)close(*fd2p);
-bad:
-	(void)close(s);
-	sigsetmask(oldmask);
-	return (-1);
-}
-
-int
-rresvport(alport)
-	int *alport;
-{
-	struct sockaddr_in sin;
-	int s;
-
-	bzero(&sin, sizeof sin);
-	sin.sin_len = sizeof(struct sockaddr_in);
-	sin.sin_family = AF_INET;
-	sin.sin_addr.s_addr = INADDR_ANY;
-	s = socket(AF_INET, SOCK_STREAM, 0);
-	if (s < 0)
-		return (-1);
-#if 0 /* compat_exact_traditional_rresvport_semantics */
-	sin.sin_port = htons((u_short)*alport);
-	if (bind(s, (struct sockaddr *)&sin, sizeof(sin)) >= 0)
-		return (s);
-	if (errno != EADDRINUSE) {
-		(void)close(s);
-		return (-1);
-	}
-#endif
-	sin.sin_port = 0;
-	if (bindresvport(s, &sin) == -1) {
-		(void)close(s);
-		return (-1);
-	}
-	*alport = (int)ntohs(sin.sin_port);
-	return (s);
-}
-
-int	__check_rhosts_file = 1;
-char	*__rcmd_errstr;
-
-int
-ruserok(rhost, superuser, ruser, luser)
-	const char *rhost, *ruser, *luser;
-	int superuser;
-{
-	struct hostent *hp;
-	u_long addr;
-	char **ap;
-
-	if ((hp = gethostbyname(rhost)) == NULL)
-		return (-1);
-	for (ap = hp->h_addr_list; *ap; ++ap) {
-		bcopy(*ap, &addr, sizeof(addr));
-		if (iruserok(addr, superuser, ruser, luser) == 0)
-			return (0);
-	}
-	return (-1);
-}
-
-/*
- * New .rhosts strategy: We are passed an ip address. We spin through
- * hosts.equiv and .rhosts looking for a match. When the .rhosts only
- * has ip addresses, we don't have to trust a nameserver.  When it
- * contains hostnames, we spin through the list of addresses the nameserver
- * gives us and look for a match.
- *
- * Returns 0 if ok, -1 if not ok.
- */
-int
-iruserok(raddr, superuser, ruser, luser)
-	u_long raddr;
-	int superuser;
-	const char *ruser, *luser;
-{
-	register char *cp;
-	struct stat sbuf;
-	struct passwd *pwd;
-	FILE *hostf;
-	uid_t uid;
-	int first;
-	char pbuf[MAXPATHLEN];
-
-	first = 1;
-	hostf = superuser ? NULL : fopen(_PATH_HEQUIV, "r");
-again:
-	if (hostf) {
-		if (__ivaliduser(hostf, raddr, luser, ruser) == 0) {
-			(void)fclose(hostf);
-			return (0);
-		}
-		(void)fclose(hostf);
-	}
-	if (first == 1 && (__check_rhosts_file || superuser)) {
-		first = 0;
-		if ((pwd = getpwnam(luser)) == NULL)
-			return (-1);
-		(void)strcpy(pbuf, pwd->pw_dir);
-		(void)strcat(pbuf, "/.rhosts");
-
-		/*
-		 * Change effective uid while opening .rhosts.  If root and
-		 * reading an NFS mounted file system, can't read files that
-		 * are protected read/write owner only.
-		 */
-		uid = geteuid();
-		(void)seteuid(pwd->pw_uid);
-		hostf = fopen(pbuf, "r");
-		(void)seteuid(uid);
-
-		if (hostf == NULL)
-			return (-1);
-		/*
-		 * If not a regular file, or is owned by someone other than
-		 * user or root or if writeable by anyone but the owner, quit.
-		 */
-		cp = NULL;
-		if (lstat(pbuf, &sbuf) < 0)
-			cp = ".rhosts lstat failed";
-		else if (!S_ISREG(sbuf.st_mode))
-			cp = ".rhosts not regular file";
-		else if (fstat(fileno(hostf), &sbuf) < 0)
-			cp = ".rhosts fstat failed";
-		else if (sbuf.st_uid && sbuf.st_uid != pwd->pw_uid)
-			cp = "bad .rhosts owner";
-		else if (sbuf.st_mode & (S_IWGRP|S_IWOTH))
-			cp = ".rhosts writeable by other than owner";
-		/* If there were any problems, quit. */
-		if (cp) {
-			__rcmd_errstr = cp;
-			(void)fclose(hostf);
-			return (-1);
-		}
-		goto again;
-	}
-	return (-1);
-}
-
-/*
- * XXX
- * Don't make static, used by lpd(8).
- *
- * Returns 0 if ok, -1 if not ok.
- */
-int
-__ivaliduser(hostf, raddr, luser, ruser)
-	FILE *hostf;
-	u_long raddr;
-	const char *luser, *ruser;
-{
-	register char *user, *p;
-	int ch;
-	char buf[MAXHOSTNAMELEN + 128];		/* host + login */
-	char hname[MAXHOSTNAMELEN];
-	struct hostent *hp;
-	/* Presumed guilty until proven innocent. */
-	int userok = 0, hostok = 0;
-#ifdef YP
-	char *ypdomain;
-
-	if (yp_get_default_domain(&ypdomain))
-		ypdomain = NULL;
-#else
-#define	ypdomain NULL
-#endif
-	/* We need to get the damn hostname back for netgroup matching. */
-	if ((hp = gethostbyaddr((char *)&raddr, sizeof(u_long),
-							AF_INET)) == NULL)
-		return (-1);
-	strncpy(hname, hp->h_name, sizeof(hname));
-	hname[sizeof(hname) - 1] = '\0';
-
-	while (fgets(buf, sizeof(buf), hostf)) {
-		p = buf;
-		/* Skip lines that are too long. */
-		if (strchr(p, '\n') == NULL) {
-			while ((ch = getc(hostf)) != '\n' && ch != EOF);
-			continue;
-		}
-		if (*p == '\n' || *p == '#') {
-			/* comment... */
-			continue;
-		}
-		while (*p != '\n' && *p != ' ' && *p != '\t' && *p != '\0') {
-			*p = isupper(*p) ? tolower(*p) : *p;
-			p++;
-		}
-		if (*p == ' ' || *p == '\t') {
-			*p++ = '\0';
-			while (*p == ' ' || *p == '\t')
-				p++;
-			user = p;
-			while (*p != '\n' && *p != ' ' &&
-			    *p != '\t' && *p != '\0')
-				p++;
-		} else
-			user = p;
-		*p = '\0';
-		/*
-		 * Do +/- and +@/-@ checking. This looks really nasty,
-		 * but it matches SunOS's behavior so far as I can tell.
-		 */
-		switch(buf[0]) {
-		case '+':
-			if (!buf[1]) {     /* '+' matches all hosts */
-				hostok = 1;
-				break;
-			}
-			if (buf[1] == '@')  /* match a host by netgroup */
-				hostok = innetgr((char *)&buf[2],
-					(char *)&hname, NULL, ypdomain);
-			else		/* match a host by addr */
-				hostok = __icheckhost(raddr,(char *)&buf[1]);
-			break;
-		case '-':     /* reject '-' hosts and all their users */
-			if (buf[1] == '@') {
-				if (innetgr((char *)&buf[2],
-					      (char *)&hname, NULL, ypdomain))
-					return(-1);
-			} else {
-				if (__icheckhost(raddr,(char *)&buf[1]))
-					return(-1);
-			}
-			break;
-		default:  /* if no '+' or '-', do a simple match */
-			hostok = __icheckhost(raddr, buf);
-			break;
-		}
-		switch(*user) {
-		case '+':
-			if (!*(user+1)) {      /* '+' matches all users */
-				userok = 1;
-				break;
-			}
-			if (*(user+1) == '@')  /* match a user by netgroup */
-				userok = innetgr(user+2, NULL, ruser, ypdomain);
-			else	   /* match a user by direct specification */
-				userok = !(strcmp(ruser, user+1));
-			break;
-		case '-': 		/* if we matched a hostname, */
-			if (hostok) {   /* check for user field rejections */
-				if (!*(user+1))
-					return(-1);
-				if (*(user+1) == '@') {
-					if (innetgr(user+2, NULL,
-							ruser, ypdomain))
-						return(-1);
-				} else {
-					if (!strcmp(ruser, user+1))
-						return(-1);
-				}
-			}
-			break;
-		default:	/* no rejections: try to match the user */
-			if (hostok)
-				userok = !(strcmp(ruser,*user ? user : luser));
-			break;
-		}
-		if (hostok && userok)
-			return(0);
-	}
-	return (-1);
-}
-
-/*
- * Returns "true" if match, 0 if no match.
- */
-static int
-__icheckhost(raddr, lhost)
-	u_long raddr;
-	register char *lhost;
-{
-	register struct hostent *hp;
-	register u_long laddr;
-	register char **pp;
-
-	/* Try for raw ip address first. */
-	if (isdigit(*lhost) && (long)(laddr = inet_addr(lhost)) != -1)
-		return (raddr == laddr);
-
-	/* Better be a hostname. */
-	if ((hp = gethostbyname(lhost)) == NULL)
-		return (0);
-
-	/* Spin through ip addresses. */
-	for (pp = hp->h_addr_list; *pp; ++pp)
-		if (!bcmp(&raddr, *pp, sizeof(u_long)))
-			return (1);
-
-	/* No match. */
-	return (0);
-}
diff --git a/c/src/libnetworking/libc/recv.c b/c/src/libnetworking/libc/recv.c
deleted file mode 100644
index a842244caf..0000000000
--- a/c/src/libnetworking/libc/recv.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *  $Id$
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)recv.c	8.2 (Berkeley) 2/21/94";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <stddef.h>
-
-ssize_t
-recv(s, buf, len, flags)
-	int s, flags;
-	size_t len;
-	void *buf;
-{
-	return (recvfrom(s, buf, len, flags, NULL, 0));
-}
diff --git a/c/src/libnetworking/libc/res_comp.c b/c/src/libnetworking/libc/res_comp.c
deleted file mode 100644
index 93043276f2..0000000000
--- a/c/src/libnetworking/libc/res_comp.c
+++ /dev/null
@@ -1,258 +0,0 @@
-/*
- * Copyright (c) 1985, 1993
- *    The Regents of the University of California.  All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- * 	This product includes software developed by the University of
- * 	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-/*
- * Portions Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)res_comp.c	8.1 (Berkeley) 6/4/93";
-static char orig_rcsid[] = "From: Id: res_comp.c,v 8.11 1997/05/21 19:31:04 halley Exp $";
-static char rcsid[] = "$Id$";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <ctype.h>
-#include <resolv.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-
-#define BIND_4_COMPAT
-
-/*
- * Expand compressed domain name 'comp_dn' to full domain name.
- * 'msg' is a pointer to the begining of the message,
- * 'eomorig' points to the first location after the message,
- * 'exp_dn' is a pointer to a buffer of size 'length' for the result.
- * Return size of compressed name or -1 if there was an error.
- */
-int
-dn_expand(const u_char *msg, const u_char *eom, const u_char *src,
-	  char *dst, int dstsiz)
-{
-	int n = ns_name_uncompress(msg, eom, src, dst, (size_t)dstsiz);
-
-	if (n > 0 && dst[0] == '.')
-		dst[0] = '\0';
-	return (n);
-}
-
-/*
- * Pack domain name 'exp_dn' in presentation form into 'comp_dn'.
- * Return the size of the compressed name or -1.
- * 'length' is the size of the array pointed to by 'comp_dn'.
- */
-int
-dn_comp(const char *src, u_char *dst, int dstsiz,
-	u_char **dnptrs, u_char **lastdnptr)
-{
-	return (ns_name_compress(src, dst, (size_t)dstsiz,
-				 (const u_char **)dnptrs,
-				 (const u_char **)lastdnptr));
-}
-
-/*
- * Skip over a compressed domain name. Return the size or -1.
- */
-int
-dn_skipname(const u_char *ptr, const u_char *eom) {
-	const u_char *saveptr = ptr;
-
-	if (ns_name_skip(&ptr, eom) == -1)
-		return (-1);
-	return (ptr - saveptr);
-}
-
-/*
- * Verify that a domain name uses an acceptable character set.
- */
-
-/*
- * Note the conspicuous absence of ctype macros in these definitions.  On
- * non-ASCII hosts, we can't depend on string literals or ctype macros to
- * tell us anything about network-format data.  The rest of the BIND system
- * is not careful about this, but for some reason, we're doing it right here.
- */
-#define PERIOD 0x2e
-#define	hyphenchar(c) ((c) == 0x2d)
-#define bslashchar(c) ((c) == 0x5c)
-#define periodchar(c) ((c) == PERIOD)
-#define asterchar(c) ((c) == 0x2a)
-#define alphachar(c) (((c) >= 0x41 && (c) <= 0x5a) \
-		   || ((c) >= 0x61 && (c) <= 0x7a))
-#define digitchar(c) ((c) >= 0x30 && (c) <= 0x39)
-
-#define borderchar(c) (alphachar(c) || digitchar(c))
-#define middlechar(c) (borderchar(c) || hyphenchar(c))
-#define	domainchar(c) ((c) > 0x20 && (c) < 0x7f)
-
-int
-res_hnok(dn)
-	const char *dn;
-{
-	int ppch = '\0', pch = PERIOD, ch = *dn++;
-
-	while (ch != '\0') {
-		int nch = *dn++;
-
-		if (periodchar(ch)) {
-			(void)NULL;
-		} else if (periodchar(pch)) {
-			if (!borderchar(ch))
-				return (0);
-		} else if (periodchar(nch) || nch == '\0') {
-			if (!borderchar(ch))
-				return (0);
-		} else {
-			if (!middlechar(ch))
-				return (0);
-		}
-		ppch = pch, pch = ch, ch = nch;
-	}
-	return (1);
-}
-
-/*
- * hostname-like (A, MX, WKS) owners can have "*" as their first label
- * but must otherwise be as a host name.
- */
-int
-res_ownok(dn)
-	const char *dn;
-{
-	if (asterchar(dn[0])) {
-		if (periodchar(dn[1]))
-			return (res_hnok(dn+2));
-		if (dn[1] == '\0')
-			return (1);
-	}
-	return (res_hnok(dn));
-}
-
-/*
- * SOA RNAMEs and RP RNAMEs can have any printable character in their first
- * label, but the rest of the name has to look like a host name.
- */
-int
-res_mailok(dn)
-	const char *dn;
-{
-	int ch, escaped = 0;
-
-	/* "." is a valid missing representation */
-	if (*dn == '\0')
-		return (1);
-
-	/* otherwise <label>.<hostname> */
-	while ((ch = *dn++) != '\0') {
-		if (!domainchar(ch))
-			return (0);
-		if (!escaped && periodchar(ch))
-			break;
-		if (escaped)
-			escaped = 0;
-		else if (bslashchar(ch))
-			escaped = 1;
-	}
-	if (periodchar(ch))
-		return (res_hnok(dn));
-	return (0);
-}
-
-/*
- * This function is quite liberal, since RFC 1034's character sets are only
- * recommendations.
- */
-int
-res_dnok(dn)
-	const char *dn;
-{
-	int ch;
-
-	while ((ch = *dn++) != '\0')
-		if (!domainchar(ch))
-			return (0);
-	return (1);
-}
-
-#ifdef BIND_4_COMPAT
-/*
- * This module must export the following externally-visible symbols:
- *    ___putlong
- *    ___putshort
- *    __getlong
- *    __getshort
- * Note that one _ comes from C and the others come from us.
- */
-void __putlong(u_int32_t src, u_char *dst) { ns_put32(src, dst); }
-void __putshort(u_int16_t src, u_char *dst) { ns_put16(src, dst); }
-u_int32_t _getlong(const u_char *src) { return (ns_get32(src)); }
-u_int16_t _getshort(const u_char *src) { return (ns_get16(src)); }
-#endif /*BIND_4_COMPAT*/
diff --git a/c/src/libnetworking/libc/res_config.h b/c/src/libnetworking/libc/res_config.h
deleted file mode 100644
index 57ec414226..0000000000
--- a/c/src/libnetworking/libc/res_config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- *  $Id$
- */
-
-#define	DEBUG	1	/* enable debugging code (needed for dig) */
-#define	RESOLVSORT	/* allow sorting of addresses in gethostbyname */
-#define	RFC1535		/* comply with RFC1535 (STRONGLY reccomended by vixie)*/
-#undef	USELOOPBACK	/* res_init() bind to localhost */
-#undef	SUNSECURITY	/* verify gethostbyaddr() calls - WE DONT NEED IT  */
-#define MULTI_PTRS_ARE_ALIASES 1 /* fold multiple PTR records into aliases */
-#define	CHECK_SRVR_ADDR 1 /* confirm that the server requested sent the reply */
-#define BIND_UPDATE 1	/* update support */
-
-#if defined(__rtems__)
-u_int16_t _getshort(const u_char *src);
-u_int32_t _getlong(const u_char *src);
-int gethostname (char *name, int namelen);
-int sethostname (char *name, int namelen);
-int issetugid (void);
-#endif
diff --git a/c/src/libnetworking/libc/res_data.c b/c/src/libnetworking/libc/res_data.c
deleted file mode 100644
index fb7d2c66eb..0000000000
--- a/c/src/libnetworking/libc/res_data.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (c) 1995,1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$Id$";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-#include <ctype.h>
-#include <resolv.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "res_config.h"
-
-const char *_res_opcodes[] = {
-	"QUERY",
-	"IQUERY",
-	"CQUERYM",
-	"CQUERYU",	/* experimental */
-	"NOTIFY",	/* experimental */
-	"UPDATE",
-	"6",
-	"7",
-	"8",
-	"9",
-	"10",
-	"11",
-	"12",
-	"13",
-	"ZONEINIT",
-	"ZONEREF",
-};
-
-const char *_res_resultcodes[] = {
-	"NOERROR",
-	"FORMERR",
-	"SERVFAIL",
-	"NXDOMAIN",
-	"NOTIMP",
-	"REFUSED",
-	"YXDOMAIN",
-	"YXRRSET",
-	"NXRRSET",
-	"NOTAUTH",
-	"ZONEERR",
-	"11",
-	"12",
-	"13",
-	"14",
-	"NOCHANGE",
-};
-
-#ifdef BIND_UPDATE
-const char *_res_sectioncodes[] = {
-	"ZONE",
-	"PREREQUISITES",
-	"UPDATE",
-	"ADDITIONAL",
-};
-#endif
diff --git a/c/src/libnetworking/libc/res_debug.c b/c/src/libnetworking/libc/res_debug.c
deleted file mode 100644
index b747b6e6d2..0000000000
--- a/c/src/libnetworking/libc/res_debug.c
+++ /dev/null
@@ -1,966 +0,0 @@
-/*
- * Copyright (c) 1985
- *    The Regents of the University of California.  All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- * 	This product includes software developed by the University of
- * 	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-/*
- * Portions Copyright (c) 1995 by International Business Machines, Inc.
- *
- * International Business Machines, Inc. (hereinafter called IBM) grants
- * permission under its copyrights to use, copy, modify, and distribute this
- * Software with or without fee, provided that the above copyright notice and
- * all paragraphs of this notice appear in all copies, and that the name of IBM
- * not be used in connection with the marketing of any product incorporating
- * the Software or modifications thereof, without specific, written prior
- * permission.
- *
- * To the extent it has a right to do so, IBM grants an immunity from suit
- * under its patents, if any, for the use, sale or manufacture of products to
- * the extent that such products are used for performing Domain Name System
- * dynamic updates in TCP/IP networks by means of the Software.  No immunity is
- * granted for any product per se or for any other function of any product.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", AND IBM DISCLAIMS ALL WARRANTIES,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL IBM BE LIABLE FOR ANY SPECIAL,
- * DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE, EVEN
- * IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES.
- */
-
-/*
- * Portions Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)res_debug.c	8.1 (Berkeley) 6/4/93";
-static char rcsid[] = "$Id$";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-
-#include <ctype.h>
-#include <errno.h>
-#include <math.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-
-#define SPRINTF(x) sprintf x
-
-extern const char *_res_opcodes[];
-extern const char *_res_resultcodes[];
-extern const char *_res_sectioncodes[];
-
-/*
- * Print the current options.
- */
-void
-fp_resstat(struct __res_state *statp, FILE *file) {
-	u_long mask;
-
-	fprintf(file, ";; res options:");
-	if (!statp)
-		statp = &_res;
-	for (mask = 1;  mask != 0;  mask <<= 1)
-		if (statp->options & mask)
-			fprintf(file, " %s", p_option(mask));
-	putc('\n', file);
-}
-
-static void
-do_section(ns_msg *handle, ns_sect section, int pflag, FILE *file) {
-	int n, sflag, rrnum;
-	char buf[2048];	/* XXX need to malloc */
-	ns_opcode opcode;
-	ns_rr rr;
-
-	/*
-	 * Print answer records.
-	 */
-	sflag = (_res.pfcode & pflag);
-	if (_res.pfcode && !sflag)
-		return;
-
-	opcode = ns_msg_getflag(*handle, ns_f_opcode);
-	rrnum = 0;
-	for (;;) {
-		if (ns_parserr(handle, section, rrnum, &rr)) {
-			if (errno != ENODEV)
-				fprintf(file, ";; ns_parserr: %s\n",
-					strerror(errno));
-			else if (rrnum > 0 && sflag != 0 &&
-				 (_res.pfcode & RES_PRF_HEAD1))
-				putc('\n', file);
-			return;
-		}
-		if (rrnum == 0 && sflag != 0 && (_res.pfcode & RES_PRF_HEAD1))
-			fprintf(file, ";; %s SECTION:\n",
-				p_section(section, opcode));
-		if (section == ns_s_qd)
-			fprintf(file, ";;\t%s, type = %s, class = %s\n",
-				ns_rr_name(rr),
-				p_type(ns_rr_type(rr)),
-				p_class(ns_rr_class(rr)));
-		else {
-			n = ns_sprintrr(handle, &rr, NULL, NULL,
-					buf, sizeof buf);
-			if (n < 0) {
-				fprintf(file, ";; ns_sprintrr: %s\n",
-					strerror(errno));
-				return;
-			}
-			fputs(buf, file);
-			fputc('\n', file);
-		}
-		rrnum++;
-	}
-}
-
-void
-p_query(const u_char *msg) {
-	fp_query(msg, stdout);
-}
-
-void
-fp_query(const u_char *msg, FILE *file) {
-	fp_nquery(msg, PACKETSZ, file);
-}
-
-/*
- * Print the contents of a query.
- * This is intended to be primarily a debugging routine.
- */
-void
-fp_nquery(const u_char *msg, int len, FILE *file) {
-	ns_msg handle;
-	int qdcount, ancount, nscount, arcount;
-	u_int opcode, rcode, id;
-
-	if ((_res.options & RES_INIT) == 0 && res_init() == -1)
-		return;
-
-	if (ns_initparse(msg, len, &handle) < 0) {
-		fprintf(file, ";; ns_initparse: %s\n", strerror(errno));
-		return;
-	}
-	opcode = ns_msg_getflag(handle, ns_f_opcode);
-	rcode = ns_msg_getflag(handle, ns_f_rcode);
-	id = ns_msg_id(handle);
-	qdcount = ns_msg_count(handle, ns_s_qd);
-	ancount = ns_msg_count(handle, ns_s_an);
-	nscount = ns_msg_count(handle, ns_s_ns);
-	arcount = ns_msg_count(handle, ns_s_ar);
-
-	/*
-	 * Print header fields.
-	 */
-	if ((!_res.pfcode) || (_res.pfcode & RES_PRF_HEADX) || rcode)
-		fprintf(file,
-			";; ->>HEADER<<- opcode: %s, status: %s, id: %d\n",
-			_res_opcodes[opcode], _res_resultcodes[rcode], id);
-	if ((!_res.pfcode) || (_res.pfcode & RES_PRF_HEADX))
-		putc(';', file);
-	if ((!_res.pfcode) || (_res.pfcode & RES_PRF_HEAD2)) {
-		fprintf(file, "; flags:");
-		if (ns_msg_getflag(handle, ns_f_qr))
-			fprintf(file, " qr");
-		if (ns_msg_getflag(handle, ns_f_aa))
-			fprintf(file, " aa");
-		if (ns_msg_getflag(handle, ns_f_tc))
-			fprintf(file, " tc");
-		if (ns_msg_getflag(handle, ns_f_rd))
-			fprintf(file, " rd");
-		if (ns_msg_getflag(handle, ns_f_ra))
-			fprintf(file, " ra");
-		if (ns_msg_getflag(handle, ns_f_z))
-			fprintf(file, " ??");
-		if (ns_msg_getflag(handle, ns_f_ad))
-			fprintf(file, " ad");
-		if (ns_msg_getflag(handle, ns_f_cd))
-			fprintf(file, " cd");
-	}
-	if ((!_res.pfcode) || (_res.pfcode & RES_PRF_HEAD1)) {
-		fprintf(file, "; %s: %d",
-			p_section(ns_s_qd, opcode), qdcount);
-		fprintf(file, ", %s: %d",
-			p_section(ns_s_an, opcode), ancount);
-		fprintf(file, ", %s: %d",
-			p_section(ns_s_ns, opcode), nscount);
-		fprintf(file, ", %s: %d",
-			p_section(ns_s_ar, opcode), arcount);
-	}
-	if ((!_res.pfcode) || (_res.pfcode & 
-		(RES_PRF_HEADX | RES_PRF_HEAD2 | RES_PRF_HEAD1))) {
-		putc('\n',file);
-	}
-	/*
-	 * Print the various sections.
-	 */
-	do_section(&handle, ns_s_qd, RES_PRF_QUES, file);
-	do_section(&handle, ns_s_an, RES_PRF_ANS, file);
-	do_section(&handle, ns_s_ns, RES_PRF_AUTH, file);
-	do_section(&handle, ns_s_ar, RES_PRF_ADD, file);
-	if (qdcount == 0 && ancount == 0 &&
-	    nscount == 0 && arcount == 0)
-		putc('\n', file);
-}
-
-const u_char *
-p_cdnname(const u_char *cp, const u_char *msg, int len, FILE *file) {
-	char name[MAXDNAME];
-	int n;
-
-	if ((n = dn_expand(msg, msg + len, cp, name, sizeof name)) < 0)
-		return (NULL);
-	if (name[0] == '\0')
-		putc('.', file);
-	else
-		fputs(name, file);
-	return (cp + n);
-}
-
-const u_char *
-p_cdname(const u_char *cp, const u_char *msg, FILE *file) {
-	return (p_cdnname(cp, msg, PACKETSZ, file));
-}
-
-/* Return a fully-qualified domain name from a compressed name (with
-   length supplied).  */
-
-const u_char *
-p_fqnname(cp, msg, msglen, name, namelen)
-	const u_char *cp, *msg;
-	int msglen;
-	char *name;
-	int namelen;
-{
-	int n, newlen;
-
-	if ((n = dn_expand(msg, cp + msglen, cp, name, namelen)) < 0)
-		return (NULL);
-	newlen = strlen(name);
-	if (newlen == 0 || name[newlen - 1] != '.') {
-		if (newlen + 1 >= namelen)	/* Lack space for final dot */
-			return (NULL);
-		else
-			strcpy(name + newlen, ".");
-	}
-	return (cp + n);
-}
-
-/* XXX:	the rest of these functions need to become length-limited, too. */
-
-const u_char *
-p_fqname(const u_char *cp, const u_char *msg, FILE *file) {
-	char name[MAXDNAME];
-	const u_char *n;
-
-	n = p_fqnname(cp, msg, MAXCDNAME, name, sizeof name);
-	if (n == NULL)
-		return (NULL);
-	fputs(name, file);
-	return (n);
-}
-
-/*
- * Names of RR classes and qclasses.  Classes and qclasses are the same, except
- * that C_ANY is a qclass but not a class.  (You can ask for records of class
- * C_ANY, but you can't have any records of that class in the database.)
- */
-const struct res_sym __p_class_syms[] = {
-	{C_IN,		"IN"},
-	{C_CHAOS,	"CHAOS"},
-	{C_HS,		"HS"},
-	{C_HS,		"HESIOD"},
-	{C_ANY,		"ANY"},
-	{C_NONE,	"NONE"},
-	{C_IN, 		(char *)0}
-};
-
-/*
- * Names of message sections.
- */
-const struct res_sym __p_default_section_syms[] = {
-	{ns_s_qd,	"QUERY"},
-	{ns_s_an,	"ANSWER"},
-	{ns_s_ns,	"AUTHORITY"},
-	{ns_s_ar,	"ADDITIONAL"},
-	{0,             (char *)0}
-};
-
-const struct res_sym __p_update_section_syms[] = {
-	{S_ZONE,	"ZONE"},
-	{S_PREREQ,	"PREREQUISITE"},
-	{S_UPDATE,	"UPDATE"},
-	{S_ADDT,	"ADDITIONAL"},
-	{0,             (char *)0}
-};
-
-/*
- * Names of RR types and qtypes.  Types and qtypes are the same, except
- * that T_ANY is a qtype but not a type.  (You can ask for records of type
- * T_ANY, but you can't have any records of that type in the database.)
- */
-const struct res_sym __p_type_syms[] = {
-	{T_A,		"A",		"address"},
-	{T_NS,		"NS",		"name server"},
-	{T_MD,		"MD",		"mail destination (deprecated)"},
-	{T_MF,		"MF",		"mail forwarder (deprecated)"},
-	{T_CNAME,	"CNAME",	"canonical name"},
-	{T_SOA,		"SOA",		"start of authority"},
-	{T_MB,		"MB",		"mailbox"},
-	{T_MG,		"MG",		"mail group member"},
-	{T_MR,		"MR",		"mail rename"},
-	{T_NULL,	"NULL",		"null"},
-	{T_WKS,		"WKS",		"well-known service (deprecated)"},
-	{T_PTR,		"PTR",		"domain name pointer"},
-	{T_HINFO,	"HINFO",	"host information"},
-	{T_MINFO,	"MINFO",	"mailbox information"},
-	{T_MX,		"MX",		"mail exchanger"},
-	{T_TXT,		"TXT",		"text"},
-	{T_RP,		"RP",		"responsible person"},
-	{T_AFSDB,	"AFSDB",	"DCE or AFS server"},
-	{T_X25,		"X25",		"X25 address"},
-	{T_ISDN,	"ISDN",		"ISDN address"},
-	{T_RT,		"RT",		"router"},
-	{T_NSAP,	"NSAP",		"nsap address"},
-	{T_NSAP_PTR,	"NSAP_PTR",	"domain name pointer"},
-	{T_SIG,		"SIG",		"signature"},
-	{T_KEY,		"KEY",		"key"},
-	{T_PX,		"PX",		"mapping information"},
-	{T_GPOS,	"GPOS",		"geographical position (withdrawn)"},
-	{T_AAAA,	"AAAA",		"IPv6 address"},
-	{T_LOC,		"LOC",		"location"},
-	{T_NXT,		"NXT",		"next valid name (unimplemented)"},
-	{T_EID,		"EID",		"endpoint identifier (unimplemented)"},
-	{T_NIMLOC,	"NIMLOC",	"NIMROD locator (unimplemented)"},
-	{T_SRV,		"SRV",		"server selection"},
-	{T_ATMA,	"ATMA",		"ATM address (unimplemented)"},
-	{T_IXFR,	"IXFR",		"incremental zone transfer"},
-	{T_AXFR,	"AXFR",		"zone transfer"},
-	{T_MAILB,	"MAILB",	"mailbox-related data (deprecated)"},
-	{T_MAILA,	"MAILA",	"mail agent (deprecated)"},
-	{T_NAPTR,	"NAPTR",	"URN Naming Authority"},
-	{T_ANY,		"ANY",		"\"any\""},
-	{0, 		NULL,		NULL}
-};
-
-int
-sym_ston(const struct res_sym *syms, const char *name, int *success) {
-	for ((void)NULL; syms->name != 0; syms++) {
-		if (strcasecmp (name, syms->name) == 0) {
-			if (success)
-				*success = 1;
-			return (syms->number);
-		}
-	}
-	if (success)
-		*success = 0;
-	return (syms->number);		/* The default value. */
-}
-
-const char *
-sym_ntos(const struct res_sym *syms, int number, int *success) {
-	static char unname[20];
-
-	for ((void)NULL; syms->name != 0; syms++) {
-		if (number == syms->number) {
-			if (success)
-				*success = 1;
-			return (syms->name);
-		}
-	}
-
-	sprintf(unname, "%d", number);
-	if (success)
-		*success = 0;
-	return (unname);
-}
-
-const char *
-sym_ntop(const struct res_sym *syms, int number, int *success) {
-	static char unname[20];
-
-	for ((void)NULL; syms->name != 0; syms++) {
-		if (number == syms->number) {
-			if (success)
-				*success = 1;
-			return (syms->humanname);
-		}
-	}
-	sprintf(unname, "%d", number);
-	if (success)
-		*success = 0;
-	return (unname);
-}
-
-/*
- * Return a string for the type.
- */
-const char *
-p_type(int type) {
-	return (sym_ntos(__p_type_syms, type, (int *)0));
-}
-
-/*
- * Return a string for the type.
- */
-const char *
-p_section(int section, int opcode) {
-	const struct res_sym *symbols;
-
-	switch (opcode) {
-	case ns_o_update:
-		symbols = __p_update_section_syms;
-		break;
-	default:
-		symbols = __p_default_section_syms;
-		break;
-	}
-	return (sym_ntos(symbols, section, (int *)0));
-}
-
-/*
- * Return a mnemonic for class.
- */
-const char *
-p_class(int class) {
-	return (sym_ntos(__p_class_syms, class, (int *)0));
-}
-
-/*
- * Return a mnemonic for an option
- */
-const char *
-p_option(u_long option) {
-	static char nbuf[40];
-
-	switch (option) {
-	case RES_INIT:		return "init";
-	case RES_DEBUG:		return "debug";
-	case RES_AAONLY:	return "aaonly(unimpl)";
-	case RES_USEVC:		return "usevc";
-	case RES_PRIMARY:	return "primry(unimpl)";
-	case RES_IGNTC:		return "igntc";
-	case RES_RECURSE:	return "recurs";
-	case RES_DEFNAMES:	return "defnam";
-	case RES_STAYOPEN:	return "styopn";
-	case RES_DNSRCH:	return "dnsrch";
-	case RES_INSECURE1:	return "insecure1";
-	case RES_INSECURE2:	return "insecure2";
-	default:		sprintf(nbuf, "?0x%lx?", (u_long)option);
-				return (nbuf);
-	}
-}
-
-/*
- * Return a mnemonic for a time to live.
- */
-const char *
-p_time(u_int32_t value) {
-	static char nbuf[40];
-
-	if (ns_format_ttl(value, nbuf, sizeof nbuf) < 0)
-		sprintf(nbuf, "%u", value);
-	return (nbuf);
-}
-
-
-/*
- * routines to convert between on-the-wire RR format and zone file format.
- * Does not contain conversion to/from decimal degrees; divide or multiply
- * by 60*60*1000 for that.
- */
-
-static unsigned int poweroften[10] = {1, 10, 100, 1000, 10000, 100000,
-				      1000000,10000000,100000000,1000000000};
-
-/* takes an XeY precision/size value, returns a string representation. */
-static const char *
-precsize_ntoa(prec)
-	u_int8_t prec;
-{
-	static char retbuf[sizeof "90000000.00"];
-	unsigned long val;
-	int mantissa, exponent;
-
-	mantissa = (int)((prec >> 4) & 0x0f) % 10;
-	exponent = (int)((prec >> 0) & 0x0f) % 10;
-
-	val = mantissa * poweroften[exponent];
-
-	(void) sprintf(retbuf, "%ld.%.2ld", val/100, val%100);
-	return (retbuf);
-}
-
-/* converts ascii size/precision X * 10**Y(cm) to 0xXY.  moves pointer. */
-static u_int8_t
-precsize_aton(strptr)
-	char **strptr;
-{
-	unsigned int mval = 0, cmval = 0;
-	u_int8_t retval = 0;
-	char *cp;
-	int exponent;
-	int mantissa;
-
-	cp = *strptr;
-
-	while (isdigit((int)*cp))
-		mval = mval * 10 + (*cp++ - '0');
-
-	if (*cp == '.') {		/* centimeters */
-		cp++;
-		if (isdigit((int)*cp)) {
-			cmval = (*cp++ - '0') * 10;
-			if (isdigit((int)*cp)) {
-				cmval += (*cp++ - '0');
-			}
-		}
-	}
-	cmval = (mval * 100) + cmval;
-
-	for (exponent = 0; exponent < 9; exponent++)
-		if (cmval < poweroften[exponent+1])
-			break;
-
-	mantissa = cmval / poweroften[exponent];
-	if (mantissa > 9)
-		mantissa = 9;
-
-	retval = (mantissa << 4) | exponent;
-
-	*strptr = cp;
-
-	return (retval);
-}
-
-/* converts ascii lat/lon to unsigned encoded 32-bit number.  moves pointer. */
-static u_int32_t
-latlon2ul(latlonstrptr,which)
-	char **latlonstrptr;
-	int *which;
-{
-	char *cp;
-	u_int32_t retval;
-	int deg = 0, min = 0, secs = 0, secsfrac = 0;
-
-	cp = *latlonstrptr;
-
-	while (isdigit((int)*cp))
-		deg = deg * 10 + (*cp++ - '0');
-
-	while (isspace((int)*cp))
-		cp++;
-
-	if (!(isdigit((int)*cp)))
-		goto fndhemi;
-
-	while (isdigit((int)*cp))
-		min = min * 10 + (*cp++ - '0');
-
-	while (isspace((int)*cp))
-		cp++;
-
-	if (!(isdigit((int)*cp)))
-		goto fndhemi;
-
-	while (isdigit((int)*cp))
-		secs = secs * 10 + (*cp++ - '0');
-
-	if (*cp == '.') {		/* decimal seconds */
-		cp++;
-		if (isdigit((int)*cp)) {
-			secsfrac = (*cp++ - '0') * 100;
-			if (isdigit((int)*cp)) {
-				secsfrac += (*cp++ - '0') * 10;
-				if (isdigit((int)*cp)) {
-					secsfrac += (*cp++ - '0');
-				}
-			}
-		}
-	}
-
-	while (!isspace((int)*cp))	/* if any trailing garbage */
-		cp++;
-
-	while (isspace((int)*cp))
-		cp++;
-
- fndhemi:
-	switch (*cp) {
-	case 'N': case 'n':
-	case 'E': case 'e':
-		retval = ((unsigned)1<<31)
-			+ (((((deg * 60) + min) * 60) + secs) * 1000)
-			+ secsfrac;
-		break;
-	case 'S': case 's':
-	case 'W': case 'w':
-		retval = ((unsigned)1<<31)
-			- (((((deg * 60) + min) * 60) + secs) * 1000)
-			- secsfrac;
-		break;
-	default:
-		retval = 0;	/* invalid value -- indicates error */
-		break;
-	}
-
-	switch (*cp) {
-	case 'N': case 'n':
-	case 'S': case 's':
-		*which = 1;	/* latitude */
-		break;
-	case 'E': case 'e':
-	case 'W': case 'w':
-		*which = 2;	/* longitude */
-		break;
-	default:
-		*which = 0;	/* error */
-		break;
-	}
-
-	cp++;			/* skip the hemisphere */
-
-	while (!isspace((int)*cp))	/* if any trailing garbage */
-		cp++;
-
-	while (isspace((int)*cp))	/* move to next field */
-		cp++;
-
-	*latlonstrptr = cp;
-
-	return (retval);
-}
-
-/* converts a zone file representation in a string to an RDATA on-the-wire
- * representation. */
-int
-loc_aton(ascii, binary)
-	const char *ascii;
-	u_char *binary;
-{
-	const char *cp, *maxcp;
-	u_char *bcp;
-
-	u_int32_t latit = 0, longit = 0, alt = 0;
-	u_int32_t lltemp1 = 0, lltemp2 = 0;
-	int altmeters = 0, altfrac = 0, altsign = 1;
-	u_int8_t hp = 0x16;	/* default = 1e6 cm = 10000.00m = 10km */
-	u_int8_t vp = 0x13;	/* default = 1e3 cm = 10.00m */
-	u_int8_t siz = 0x12;	/* default = 1e2 cm = 1.00m */
-	int which1 = 0, which2 = 0;
-
-	cp = ascii;
-	maxcp = cp + strlen(ascii);
-
-	lltemp1 = latlon2ul(&cp, &which1);
-
-	lltemp2 = latlon2ul(&cp, &which2);
-
-	switch (which1 + which2) {
-	case 3:			/* 1 + 2, the only valid combination */
-		if ((which1 == 1) && (which2 == 2)) { /* normal case */
-			latit = lltemp1;
-			longit = lltemp2;
-		} else if ((which1 == 2) && (which2 == 1)) { /* reversed */
-			longit = lltemp1;
-			latit = lltemp2;
-		} else {	/* some kind of brokenness */
-			return (0);
-		}
-		break;
-	default:		/* we didn't get one of each */
-		return (0);
-	}
-
-	/* altitude */
-	if (*cp == '-') {
-		altsign = -1;
-		cp++;
-	}
-    
-	if (*cp == '+')
-		cp++;
-
-	while (isdigit((int)*cp))
-		altmeters = altmeters * 10 + (*cp++ - '0');
-
-	if (*cp == '.') {		/* decimal meters */
-		cp++;
-		if (isdigit((int)*cp)) {
-			altfrac = (*cp++ - '0') * 10;
-			if (isdigit((int)*cp)) {
-				altfrac += (*cp++ - '0');
-			}
-		}
-	}
-
-	alt = (10000000 + (altsign * (altmeters * 100 + altfrac)));
-
-	while (!isspace((int)*cp) && (cp < maxcp)) /* if trailing garbage or m */
-		cp++;
-
-	while (isspace((int)*cp) && (cp < maxcp))
-		cp++;
-
-	if (cp >= maxcp)
-		goto defaults;
-
-	siz = precsize_aton(&cp);
-	
-	while (!isspace((int)*cp) && (cp < maxcp))	/* if trailing garbage or m */
-		cp++;
-
-	while (isspace((int)*cp) && (cp < maxcp))
-		cp++;
-
-	if (cp >= maxcp)
-		goto defaults;
-
-	hp = precsize_aton(&cp);
-
-	while (!isspace((int)*cp) && (cp < maxcp))	/* if trailing garbage or m */
-		cp++;
-
-	while (isspace((int)*cp) && (cp < maxcp))
-		cp++;
-
-	if (cp >= maxcp)
-		goto defaults;
-
-	vp = precsize_aton(&cp);
-
- defaults:
-
-	bcp = binary;
-	*bcp++ = (u_int8_t) 0;	/* version byte */
-	*bcp++ = siz;
-	*bcp++ = hp;
-	*bcp++ = vp;
-	PUTLONG(latit,bcp);
-	PUTLONG(longit,bcp);
-	PUTLONG(alt,bcp);
-    
-	return (16);		/* size of RR in octets */
-}
-
-/* takes an on-the-wire LOC RR and formats it in a human readable format. */
-const char *
-loc_ntoa(binary, ascii)
-	const u_char *binary;
-	char *ascii;
-{
-	static char *error = "?";
-	const u_char *cp = binary;
-
-	int latdeg, latmin, latsec, latsecfrac;
-	int longdeg, longmin, longsec, longsecfrac;
-	char northsouth, eastwest;
-	int altmeters, altfrac, altsign;
-
-	const u_int32_t referencealt = 100000 * 100;
-
-	int32_t latval, longval, altval;
-	u_int32_t templ;
-	u_int8_t sizeval, hpval, vpval, versionval;
-    
-	char *sizestr, *hpstr, *vpstr;
-
-	versionval = *cp++;
-
-	if (versionval) {
-		(void) sprintf(ascii, "; error: unknown LOC RR version");
-		return (ascii);
-	}
-
-	sizeval = *cp++;
-
-	hpval = *cp++;
-	vpval = *cp++;
-
-	GETLONG(templ, cp);
-	latval = (templ - ((unsigned)1<<31));
-
-	GETLONG(templ, cp);
-	longval = (templ - ((unsigned)1<<31));
-
-	GETLONG(templ, cp);
-	if (templ < referencealt) { /* below WGS 84 spheroid */
-		altval = referencealt - templ;
-		altsign = -1;
-	} else {
-		altval = templ - referencealt;
-		altsign = 1;
-	}
-
-	if (latval < 0) {
-		northsouth = 'S';
-		latval = -latval;
-	} else
-		northsouth = 'N';
-
-	latsecfrac = latval % 1000;
-	latval = latval / 1000;
-	latsec = latval % 60;
-	latval = latval / 60;
-	latmin = latval % 60;
-	latval = latval / 60;
-	latdeg = latval;
-
-	if (longval < 0) {
-		eastwest = 'W';
-		longval = -longval;
-	} else
-		eastwest = 'E';
-
-	longsecfrac = longval % 1000;
-	longval = longval / 1000;
-	longsec = longval % 60;
-	longval = longval / 60;
-	longmin = longval % 60;
-	longval = longval / 60;
-	longdeg = longval;
-
-	altfrac = altval % 100;
-	altmeters = (altval / 100) * altsign;
-
-	if ((sizestr = strdup(precsize_ntoa(sizeval))) == NULL)
-		sizestr = error;
-	if ((hpstr = strdup(precsize_ntoa(hpval))) == NULL)
-		hpstr = error;
-	if ((vpstr = strdup(precsize_ntoa(vpval))) == NULL)
-		vpstr = error;
-
-	sprintf(ascii,
-	      "%d %.2d %.2d.%.3d %c %d %.2d %.2d.%.3d %c %d.%.2dm %sm %sm %sm",
-		latdeg, latmin, latsec, latsecfrac, northsouth,
-		longdeg, longmin, longsec, longsecfrac, eastwest,
-		altmeters, altfrac, sizestr, hpstr, vpstr);
-
-	if (sizestr != error)
-		free(sizestr);
-	if (hpstr != error)
-		free(hpstr);
-	if (vpstr != error)
-		free(vpstr);
-
-	return (ascii);
-}
-
-
-/* Return the number of DNS hierarchy levels in the name. */
-int
-dn_count_labels(const char *name) {
-	int i, len, count;
-
-	len = strlen(name);
-	for (i = 0, count = 0; i < len; i++) {
-		/* XXX need to check for \. or use named's nlabels(). */
-		if (name[i] == '.')
-			count++;
-	}
-
-	/* don't count initial wildcard */
-	if (name[0] == '*')
-		if (count)
-			count--;
-
-	/* don't count the null label for root. */
-	/* if terminating '.' not found, must adjust */
-	/* count to include last label */
-	if (len > 0 && name[len-1] != '.')
-		count++;
-	return (count);
-}
-
-
-/* 
- * Make dates expressed in seconds-since-Jan-1-1970 easy to read.  
- * SIG records are required to be printed like this, by the Secure DNS RFC.
- */
-char *
-p_secstodate (u_long secs) {
-	static char output[15];		/* YYYYMMDDHHMMSS and null */
-	time_t clock = secs;
-	struct tm *time;
-	
-	time = gmtime(&clock);
-	time->tm_year += 1900;
-	time->tm_mon += 1;
-	sprintf(output, "%04d%02d%02d%02d%02d%02d",
-		time->tm_year, time->tm_mon, time->tm_mday,
-		time->tm_hour, time->tm_min, time->tm_sec);
-	return (output);
-}
diff --git a/c/src/libnetworking/libc/res_init.c b/c/src/libnetworking/libc/res_init.c
deleted file mode 100644
index 9371e9fa82..0000000000
--- a/c/src/libnetworking/libc/res_init.c
+++ /dev/null
@@ -1,497 +0,0 @@
-/*
- * Copyright (c) 1985, 1989, 1993
- *    The Regents of the University of California.  All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- * 	This product includes software developed by the University of
- * 	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-/*
- * Portions Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)res_init.c	8.1 (Berkeley) 6/7/93";
-static char orig_rcsid[] = "From: Id: res_init.c,v 8.7 1996/11/18 09:10:04 vixie Exp $";
-static char rcsid[] = "$Id$";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-#include <ctype.h>
-#include <resolv.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "res_config.h"
-
-static void res_setoptions __P((char *, char *));
-
-#ifdef RESOLVSORT
-static const char sort_mask[] = "/&";
-#define ISSORTMASK(ch) (strchr(sort_mask, ch) != NULL)
-static u_int32_t net_mask __P((struct in_addr));
-#endif
-
-#if !defined(isascii) /* XXX - could be a function */
-# define isascii(c) (!(c & 0200))
-#endif
-
-/*
- * Resolver state default settings.
- */
-
-struct __res_state _res
-# if defined(__BIND_RES_TEXT)
-	= { RES_TIMEOUT, }	/* Motorola, et al. */
-# endif
-	;
-
-
-/*
- * Set up default settings.  If the configuration file exist, the values
- * there will have precedence.  Otherwise, the server address is set to
- * INADDR_ANY and the default domain name comes from the gethostname().
- *
- * An interrim version of this code (BIND 4.9, pre-4.4BSD) used 127.0.0.1
- * rather than INADDR_ANY ("0.0.0.0") as the default name server address
- * since it was noted that INADDR_ANY actually meant ``the first interface
- * you "ifconfig"'d at boot time'' and if this was a SLIP or PPP interface,
- * it had to be "up" in order for you to reach your own name server.  It
- * was later decided that since the recommended practice is to always 
- * install local static routes through 127.0.0.1 for all your network
- * interfaces, that we could solve this problem without a code change.
- *
- * The configuration file should always be used, since it is the only way
- * to specify a default domain.  If you are running a server on your local
- * machine, you should say "nameserver 0.0.0.0" or "nameserver 127.0.0.1"
- * in the configuration file.
- *
- * Return 0 if completes successfully, -1 on error
- */
-int
-res_init()
-{
-	register FILE *fp;
-	register char *cp, **pp;
-	register int n;
-	char buf[MAXDNAME];
-	int nserv = 0;    /* number of nameserver records read from file */
-	int haveenv = 0;
-	int havesearch = 0;
-#ifdef RESOLVSORT
-	int nsort = 0;
-	char *net;
-#endif
-#ifndef RFC1535
-	int dots;
-#endif
-
-	/*
-	 * These three fields used to be statically initialized.  This made
-	 * it hard to use this code in a shared library.  It is necessary,
-	 * now that we're doing dynamic initialization here, that we preserve
-	 * the old semantics: if an application modifies one of these three
-	 * fields of _res before res_init() is called, res_init() will not
-	 * alter them.  Of course, if an application is setting them to
-	 * _zero_ before calling res_init(), hoping to override what used
-	 * to be the static default, we can't detect it and unexpected results
-	 * will follow.  Zero for any of these fields would make no sense,
-	 * so one can safely assume that the applications were already getting
-	 * unexpected results.
-	 *
-	 * _res.options is tricky since some apps were known to diddle the bits
-	 * before res_init() was first called. We can't replicate that semantic
-	 * with dynamic initialization (they may have turned bits off that are
-	 * set in RES_DEFAULT).  Our solution is to declare such applications
-	 * "broken".  They could fool us by setting RES_INIT but none do (yet).
-	 */
-	if (!_res.retrans)
-		_res.retrans = RES_TIMEOUT;
-	if (!_res.retry)
-		_res.retry = 4;
-	if (!(_res.options & RES_INIT))
-		_res.options = RES_DEFAULT;
-
-	/*
-	 * This one used to initialize implicitly to zero, so unless the app
-	 * has set it to something in particular, we can randomize it now.
-	 */
-	if (!_res.id)
-		_res.id = res_randomid();
-
-#ifdef USELOOPBACK
-	_res.nsaddr.sin_addr = inet_makeaddr(IN_LOOPBACKNET, 1);
-#else
-	_res.nsaddr.sin_addr.s_addr = INADDR_ANY;
-#endif
-	_res.nsaddr.sin_family = AF_INET;
-	_res.nsaddr.sin_port = htons(NAMESERVER_PORT);
-	_res.nscount = 1;
-	_res.ndots = 1;
-	_res.pfcode = 0;
-
-	/*
-	 * RTEMS -- Set up name servers
-	 */
-	{
-#include <rtems/rtems_bsdnet_internal.h>
-	int n = 0;
-	while ((n < rtems_bsdnet_nameserver_count) && (nserv < MAXNS)) {
-		_res.nsaddr_list[nserv].sin_addr = rtems_bsdnet_nameserver[n];
-		_res.nsaddr_list[nserv].sin_family = AF_INET;
-		_res.nsaddr_list[nserv].sin_port = htons(NAMESERVER_PORT);
-		nserv++;
-		n++;
-	}
-	if (rtems_bsdnet_domain_name)
-		(void)strncpy(_res.defdname, rtems_bsdnet_domain_name, sizeof(_res.defdname) - 1);
-	}
-
-	/* Allow user to override the local domain definition */
-	if ((cp = getenv("LOCALDOMAIN")) != NULL) {
-		(void)strncpy(_res.defdname, cp, sizeof(_res.defdname) - 1);
-		haveenv++;
-
-		/*
-		 * Set search list to be blank-separated strings
-		 * from rest of env value.  Permits users of LOCALDOMAIN
-		 * to still have a search list, and anyone to set the
-		 * one that they want to use as an individual (even more
-		 * important now that the rfc1535 stuff restricts searches)
-		 */
-		cp = _res.defdname;
-		pp = _res.dnsrch;
-		*pp++ = cp;
-		for (n = 0; *cp && pp < _res.dnsrch + MAXDNSRCH; cp++) {
-			if (*cp == '\n')	/* silly backwards compat */
-				break;
-			else if (*cp == ' ' || *cp == '\t') {
-				*cp = 0;
-				n = 1;
-			} else if (n) {
-				*pp++ = cp;
-				n = 0;
-				havesearch = 1;
-			}
-		}
-		/* null terminate last domain if there are excess */
-		while (*cp != '\0' && *cp != ' ' && *cp != '\t' && *cp != '\n')
-			cp++;
-		*cp = '\0';
-		*pp++ = 0;
-	}
-
-#define	MATCH(line, name) \
-	(!strncmp(line, name, sizeof(name) - 1) && \
-	(line[sizeof(name) - 1] == ' ' || \
-	 line[sizeof(name) - 1] == '\t'))
-
-	if ((fp = fopen(_PATH_RESCONF, "r")) != NULL) {
-	    /* read the config file */
-	    while (fgets(buf, sizeof(buf), fp) != NULL) {
-		/* skip comments */
-		if (*buf == ';' || *buf == '#')
-			continue;
-		/* read default domain name */
-		if (MATCH(buf, "domain")) {
-		    if (haveenv)	/* skip if have from environ */
-			    continue;
-		    cp = buf + sizeof("domain") - 1;
-		    while (*cp == ' ' || *cp == '\t')
-			    cp++;
-		    if ((*cp == '\0') || (*cp == '\n'))
-			    continue;
-		    strncpy(_res.defdname, cp, sizeof(_res.defdname) - 1);
-		    if ((cp = strpbrk(_res.defdname, " \t\n")) != NULL)
-			    *cp = '\0';
-		    havesearch = 0;
-		    continue;
-		}
-		/* set search list */
-		if (MATCH(buf, "search")) {
-		    if (haveenv)	/* skip if have from environ */
-			    continue;
-		    cp = buf + sizeof("search") - 1;
-		    while (*cp == ' ' || *cp == '\t')
-			    cp++;
-		    if ((*cp == '\0') || (*cp == '\n'))
-			    continue;
-		    strncpy(_res.defdname, cp, sizeof(_res.defdname) - 1);
-		    if ((cp = strchr(_res.defdname, '\n')) != NULL)
-			    *cp = '\0';
-		    /*
-		     * Set search list to be blank-separated strings
-		     * on rest of line.
-		     */
-		    cp = _res.defdname;
-		    pp = _res.dnsrch;
-		    *pp++ = cp;
-		    for (n = 0; *cp && pp < _res.dnsrch + MAXDNSRCH; cp++) {
-			    if (*cp == ' ' || *cp == '\t') {
-				    *cp = 0;
-				    n = 1;
-			    } else if (n) {
-				    *pp++ = cp;
-				    n = 0;
-			    }
-		    }
-		    /* null terminate last domain if there are excess */
-		    while (*cp != '\0' && *cp != ' ' && *cp != '\t')
-			    cp++;
-		    *cp = '\0';
-		    *pp++ = 0;
-		    havesearch = 1;
-		    continue;
-		}
-		/* read nameservers to query */
-		if (MATCH(buf, "nameserver") && nserv < MAXNS) {
-		    struct in_addr a;
-
-		    cp = buf + sizeof("nameserver") - 1;
-		    while (*cp == ' ' || *cp == '\t')
-			cp++;
-		    if ((*cp != '\0') && (*cp != '\n') && inet_aton(cp, &a)) {
-			_res.nsaddr_list[nserv].sin_addr = a;
-			_res.nsaddr_list[nserv].sin_family = AF_INET;
-			_res.nsaddr_list[nserv].sin_port =
-				htons(NAMESERVER_PORT);
-			nserv++;
-		    }
-		    continue;
-		}
-#ifdef RESOLVSORT
-		if (MATCH(buf, "sortlist")) {
-		    struct in_addr a;
-
-		    cp = buf + sizeof("sortlist") - 1;
-		    while (nsort < MAXRESOLVSORT) {
-			while (*cp == ' ' || *cp == '\t')
-			    cp++;
-			if (*cp == '\0' || *cp == '\n' || *cp == ';')
-			    break;
-			net = cp;
-			while (*cp && !ISSORTMASK(*cp) && *cp != ';' &&
-			       isascii((int)*cp) && !isspace((int)*cp))
-				cp++;
-			n = *cp;
-			*cp = 0;
-			if (inet_aton(net, &a)) {
-			    _res.sort_list[nsort].addr = a;
-			    if (ISSORTMASK(n)) {
-				*cp++ = n;
-				net = cp;
-				while (*cp && *cp != ';' &&
-					isascii((int)*cp) && !isspace((int)*cp))
-				    cp++;
-				n = *cp;
-				*cp = 0;
-				if (inet_aton(net, &a)) {
-				    _res.sort_list[nsort].mask = a.s_addr;
-				} else {
-				    _res.sort_list[nsort].mask = 
-					net_mask(_res.sort_list[nsort].addr);
-				}
-			    } else {
-				_res.sort_list[nsort].mask = 
-				    net_mask(_res.sort_list[nsort].addr);
-			    }
-			    nsort++;
-			}
-			*cp = n;
-		    }
-		    continue;
-		}
-#endif
-		if (MATCH(buf, "options")) {
-		    res_setoptions(buf + sizeof("options") - 1, "conf");
-		    continue;
-		}
-	    }
-	    if (nserv > 1) 
-		_res.nscount = nserv;
-#ifdef RESOLVSORT
-	    _res.nsort = nsort;
-#endif
-	    (void) fclose(fp);
-	}
-	if (_res.defdname[0] == 0 &&
-	    gethostname(buf, sizeof(_res.defdname) - 1) == 0 &&
-	    (cp = strchr(buf, '.')) != NULL)
-		strcpy(_res.defdname, cp + 1);
-
-	/* find components of local domain that might be searched */
-	if (havesearch == 0) {
-		pp = _res.dnsrch;
-		*pp++ = _res.defdname;
-		*pp = NULL;
-
-#ifndef RFC1535
-		dots = 0;
-		for (cp = _res.defdname; *cp; cp++)
-			dots += (*cp == '.');
-
-		cp = _res.defdname;
-		while (pp < _res.dnsrch + MAXDFLSRCH) {
-			if (dots < LOCALDOMAINPARTS)
-				break;
-			cp = strchr(cp, '.') + 1;    /* we know there is one */
-			*pp++ = cp;
-			dots--;
-		}
-		*pp = NULL;
-#ifdef DEBUG
-		if (_res.options & RES_DEBUG) {
-			printf(";; res_init()... default dnsrch list:\n");
-			for (pp = _res.dnsrch; *pp; pp++)
-				printf(";;\t%s\n", *pp);
-			printf(";;\t..END..\n");
-		}
-#endif
-#endif /* !RFC1535 */
-	}
-
-	if ((cp = getenv("RES_OPTIONS")) != NULL)
-		res_setoptions(cp, "env");
-	_res.options |= RES_INIT;
-	return (0);
-}
-
-static void
-res_setoptions(options, source)
-	char *options, *source;
-{
-	char *cp = options;
-	int i;
-
-#ifdef DEBUG
-	if (_res.options & RES_DEBUG)
-		printf(";; res_setoptions(\"%s\", \"%s\")...\n",
-		       options, source);
-#endif
-	while (*cp) {
-		/* skip leading and inner runs of spaces */
-		while (*cp == ' ' || *cp == '\t')
-			cp++;
-		/* search for and process individual options */
-		if (!strncmp(cp, "ndots:", sizeof("ndots:") - 1)) {
-			i = atoi(cp + sizeof("ndots:") - 1);
-			if (i <= RES_MAXNDOTS)
-				_res.ndots = i;
-			else
-				_res.ndots = RES_MAXNDOTS;
-#ifdef DEBUG
-			if (_res.options & RES_DEBUG)
-				printf(";;\tndots=%d\n", _res.ndots);
-#endif
-		} else if (!strncmp(cp, "debug", sizeof("debug") - 1)) {
-#ifdef DEBUG
-			if (!(_res.options & RES_DEBUG)) {
-				printf(";; res_setoptions(\"%s\", \"%s\")..\n",
-				       options, source);
-				_res.options |= RES_DEBUG;
-			}
-			printf(";;\tdebug\n");
-#endif
-		} else if (!strncmp(cp, "inet6", sizeof("inet6") - 1)) {
-			_res.options |= RES_USE_INET6;
-		} else if (!strncmp(cp, "no_tld_query", sizeof("no_tld_query") - 1)) {
-			_res.options |= RES_NOTLDQUERY;
-		} else {
-			/* XXX - print a warning here? */
-		}
-		/* skip to next run of spaces */
-		while (*cp && *cp != ' ' && *cp != '\t')
-			cp++;
-	}
-}
-
-#ifdef RESOLVSORT
-/* XXX - should really support CIDR which means explicit masks always. */
-static u_int32_t
-net_mask(in)		/* XXX - should really use system's version of this */
-	struct in_addr in;
-{
-	register u_int32_t i = ntohl(in.s_addr);
-
-	if (IN_CLASSA(i))
-		return (htonl(IN_CLASSA_NET));
-	else if (IN_CLASSB(i))
-		return (htonl(IN_CLASSB_NET));
-	return (htonl(IN_CLASSC_NET));
-}
-#endif
-
-u_int
-res_randomid()
-{
-	struct timeval now;
-
-	gettimeofday(&now, NULL);
-	return (0xffff & (now.tv_sec ^ now.tv_usec ^ getpid()));
-}
diff --git a/c/src/libnetworking/libc/res_mkquery.c b/c/src/libnetworking/libc/res_mkquery.c
deleted file mode 100644
index d3fabfa5ab..0000000000
--- a/c/src/libnetworking/libc/res_mkquery.c
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * Copyright (c) 1985, 1993
- *    The Regents of the University of California.  All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- * 	This product includes software developed by the University of
- * 	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-/*
- * Portions Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)res_mkquery.c	8.1 (Berkeley) 6/4/93";
-static char orig_rcsid[] = "From: Id: res_mkquery.c,v 8.9 1997/04/24 22:22:36 vixie Exp $";
-static char rcsid[] = "$Id$";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "res_config.h"
-
-/*
- * Form all types of queries.
- * Returns the size of the result or -1.
- */
-int
-res_mkquery(op, dname, class, type, data, datalen, newrr_in, buf, buflen)
-	int op;			/* opcode of query */
-	const char *dname;	/* domain name */
-	int class, type;	/* class and type of query */
-	const u_char *data;	/* resource record data */
-	int datalen;		/* length of data */
-	const u_char *newrr_in;	/* new rr for modify or append */
-	u_char *buf;		/* buffer to put query */
-	int buflen;		/* size of buffer */
-{
-	register HEADER *hp;
-	register u_char *cp;
-	register int n;
-	u_char *dnptrs[20], **dpp, **lastdnptr;
-
-	if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
-		h_errno = NETDB_INTERNAL;
-		return (-1);
-	}
-#ifdef DEBUG
-	if (_res.options & RES_DEBUG)
-		printf(";; res_mkquery(%d, %s, %d, %d)\n",
-		       op, dname, class, type);
-#endif
-	/*
-	 * Initialize header fields.
-	 */
-	if ((buf == NULL) || (buflen < HFIXEDSZ))
-		return (-1);
-	memset(buf, 0, HFIXEDSZ);
-	hp = (HEADER *) buf;
-	hp->id = htons(++_res.id);
-	hp->opcode = op;
-	hp->rd = (_res.options & RES_RECURSE) != 0;
-	hp->rcode = NOERROR;
-	cp = buf + HFIXEDSZ;
-	buflen -= HFIXEDSZ;
-	dpp = dnptrs;
-	*dpp++ = buf;
-	*dpp++ = NULL;
-	lastdnptr = dnptrs + sizeof dnptrs / sizeof dnptrs[0];
-	/*
-	 * perform opcode specific processing
-	 */
-	switch (op) {
-	case QUERY:	/*FALLTHROUGH*/
-	case NS_NOTIFY_OP:
-		if ((buflen -= QFIXEDSZ) < 0)
-			return (-1);
-		if ((n = dn_comp(dname, cp, buflen, dnptrs, lastdnptr)) < 0)
-			return (-1);
-		cp += n;
-		buflen -= n;
-		__putshort(type, cp);
-		cp += INT16SZ;
-		__putshort(class, cp);
-		cp += INT16SZ;
-		hp->qdcount = htons(1);
-		if (op == QUERY || data == NULL)
-			break;
-		/*
-		 * Make an additional record for completion domain.
-		 */
-		buflen -= RRFIXEDSZ;
-		n = dn_comp((char *)data, cp, buflen, dnptrs, lastdnptr);
-		if (n < 0)
-			return (-1);
-		cp += n;
-		buflen -= n;
-		__putshort(T_NULL, cp);
-		cp += INT16SZ;
-		__putshort(class, cp);
-		cp += INT16SZ;
-		__putlong(0, cp);
-		cp += INT32SZ;
-		__putshort(0, cp);
-		cp += INT16SZ;
-		hp->arcount = htons(1);
-		break;
-
-	case IQUERY:
-		/*
-		 * Initialize answer section
-		 */
-		if (buflen < 1 + RRFIXEDSZ + datalen)
-			return (-1);
-		*cp++ = '\0';	/* no domain name */
-		__putshort(type, cp);
-		cp += INT16SZ;
-		__putshort(class, cp);
-		cp += INT16SZ;
-		__putlong(0, cp);
-		cp += INT32SZ;
-		__putshort(datalen, cp);
-		cp += INT16SZ;
-		if (datalen) {
-			memcpy(cp, data, datalen);
-			cp += datalen;
-		}
-		hp->ancount = htons(1);
-		break;
-
-	default:
-		return (-1);
-	}
-	return (cp - buf);
-}
diff --git a/c/src/libnetworking/libc/res_mkupdate.c b/c/src/libnetworking/libc/res_mkupdate.c
deleted file mode 100644
index 56362f650b..0000000000
--- a/c/src/libnetworking/libc/res_mkupdate.c
+++ /dev/null
@@ -1,415 +0,0 @@
-/*
- * Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-/*
- * Based on the Dynamic DNS reference implementation by Viraj Bais
- * <viraj_bais@ccm.fm.intel.com>
- */
-
-#if !defined(__rtems__)
-#if !defined(lint) && !defined(SABER)
-static char rcsid[] = "$Id$";
-#endif /* not lint */
-#endif /* not rtems */
-
-#include <sys/types.h>
-#include <sys/param.h>
-
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <arpa/inet.h>
-
-#include <errno.h>
-#include <limits.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <ctype.h>
-
-#include "res_config.h"
-
-static int getnum_str(u_char **, u_char *);
-static int getword_str(char *, int, u_char **, u_char *);
-
-#define ShrinkBuffer(x)  if ((buflen -= x) < 0) return (-2);
-
-/*
- * Form update packets.
- * Returns the size of the resulting packet if no error
- * On error,
- *	returns -1 if error in reading a word/number in rdata
- *		   portion for update packets
- *		-2 if length of buffer passed is insufficient
- *		-3 if zone section is not the first section in
- *		   the linked list, or section order has a problem
- *		-4 on a number overflow
- *		-5 unknown operation or no records
- */
-int
-res_mkupdate(ns_updrec *rrecp_in, u_char *buf, int buflen) {
-	ns_updrec *rrecp_start = rrecp_in;
-	HEADER *hp;
-	u_char *cp, *sp1, *sp2, *startp, *endp;
-	int n, i, soanum, multiline;
-	ns_updrec *rrecp;
-	struct in_addr ina;
-        char buf2[MAXDNAME];
-	int section, numrrs = 0, counts[ns_s_max];
-	u_int16_t rtype, rclass;
-	u_int32_t n1, rttl;
-	u_char *dnptrs[20], **dpp, **lastdnptr;
-
-	if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
-		h_errno = NETDB_INTERNAL;
-		return (-1);
-	}
-
-	/*
-	 * Initialize header fields.
-	 */
-	if ((buf == NULL) || (buflen < HFIXEDSZ))
-		return (-1);
-	memset(buf, 0, HFIXEDSZ);
-	hp = (HEADER *) buf;
-	hp->id = htons(++_res.id);
-	hp->opcode = ns_o_update;
-	hp->rcode = NOERROR;
-	sp1 = buf + 2*INT16SZ;  /* save pointer to zocount */
-	cp = buf + HFIXEDSZ;
-	buflen -= HFIXEDSZ;
-	dpp = dnptrs;
-	*dpp++ = buf;
-	*dpp++ = NULL;
-	lastdnptr = dnptrs + sizeof dnptrs / sizeof dnptrs[0];
-
-	if (rrecp_start == NULL)
-		return (-5);
-	else if (rrecp_start->r_section != S_ZONE)
-		return (-3);
-
-	memset(counts, 0, sizeof counts);
-	for (rrecp = rrecp_start; rrecp; rrecp = rrecp->r_grpnext) {
-		numrrs++;
-                section = rrecp->r_section;
-		if (section < 0 || section >= ns_s_max)
-			return (-1);
-		counts[section]++;
-		for (i = section + 1; i < ns_s_max; i++)
-			if (counts[i])
-				return (-3);
-		rtype = rrecp->r_type;
-		rclass = rrecp->r_class;
-		rttl = rrecp->r_ttl;
-		/* overload class and type */
-		if (section == S_PREREQ) {
-			rttl = 0;
-			switch (rrecp->r_opcode) {
-			case YXDOMAIN:
-				rclass = C_ANY;
-				rtype = T_ANY;
-				rrecp->r_size = 0;
-				break;
-			case NXDOMAIN:
-				rclass = C_NONE;
-				rtype = T_ANY;
-				rrecp->r_size = 0;
-				break;
-			case NXRRSET:
-				rclass = C_NONE;
-				rrecp->r_size = 0;
-				break;
-			case YXRRSET:
-				if (rrecp->r_size == 0)
-					rclass = C_ANY;
-				break;
-			default:
-				fprintf(stderr,
-					"res_mkupdate: incorrect opcode: %d\n",
-					rrecp->r_opcode);
-				fflush(stderr);
-				return (-1);
-			}
-		} else if (section == S_UPDATE) {
-			switch (rrecp->r_opcode) {
-			case DELETE:
-				rclass = rrecp->r_size == 0 ? C_ANY : C_NONE;
-				break;
-			case ADD:
-				break;
-			default:
-				fprintf(stderr,
-					"res_mkupdate: incorrect opcode: %d\n",
-					rrecp->r_opcode);
-				fflush(stderr);
-				return (-1);
-			}
-		}
-
-		/*
-		 * XXX	appending default domain to owner name is omitted,
-		 *	fqdn must be provided
-		 */
-		if ((n = dn_comp(rrecp->r_dname, cp, buflen, dnptrs,
-				 lastdnptr)) < 0)
-			return (-1);
-		cp += n;
-		ShrinkBuffer(n + 2*INT16SZ);
-		PUTSHORT(rtype, cp);
-		PUTSHORT(rclass, cp);
-		if (section == S_ZONE) {
-			if (numrrs != 1 || rrecp->r_type != T_SOA)
-				return (-3);
-			continue;
-		}
-		ShrinkBuffer(INT32SZ + INT16SZ);
-		PUTLONG(rttl, cp);
-		sp2 = cp;  /* save pointer to length byte */
-		cp += INT16SZ;
-		if (rrecp->r_size == 0) {
-			if (section == S_UPDATE && rclass != C_ANY)
-				return (-1);
-			else {
-				PUTSHORT(0, sp2);
-				continue;
-			}
-		}
-		startp = rrecp->r_data;
-		endp = startp + rrecp->r_size - 1;
-		/* XXX this should be done centrally. */
-		switch (rrecp->r_type) {
-		case T_A:
-			if (!getword_str(buf2, sizeof buf2, &startp, endp))
-				return (-1);
-			if (!inet_aton(buf2, &ina))
-				return (-1);
-			n1 = ntohl(ina.s_addr);
-			ShrinkBuffer(INT32SZ);
-			PUTLONG(n1, cp);
-			break;
-		case T_CNAME:
-		case T_MB:
-		case T_MG:
-		case T_MR:
-		case T_NS:
-		case T_PTR:
-			if (!getword_str(buf2, sizeof buf2, &startp, endp))
-				return (-1);
-			n = dn_comp(buf2, cp, buflen, dnptrs, lastdnptr);
-			if (n < 0)
-				return (-1);
-			cp += n;
-			ShrinkBuffer(n);
-			break;
-		case T_MINFO:
-		case T_SOA:
-		case T_RP:
-			for (i = 0; i < 2; i++) {
-				if (!getword_str(buf2, sizeof buf2, &startp,
-						 endp))
-				return (-1);
-				n = dn_comp(buf2, cp, buflen,
-					    dnptrs, lastdnptr);
-				if (n < 0)
-					return (-1);
-				cp += n;
-				ShrinkBuffer(n);
-			}
-			if (rrecp->r_type == T_SOA) {
-				ShrinkBuffer(5 * INT32SZ);
-				while (isspace(*startp) || !*startp)
-					startp++;
-				if (*startp == '(') {
-					multiline = 1;
-					startp++;
-				} else
-					multiline = 0;
-				/* serial, refresh, retry, expire, minimum */
-				for (i = 0; i < 5; i++) {
-					soanum = getnum_str(&startp, endp);
-					if (soanum < 0)
-						return (-1);
-					PUTLONG(soanum, cp);
-				}
-				if (multiline) {
-					while (isspace(*startp) || !*startp)
-						startp++;
-					if (*startp != ')')
-						return (-1);
-				}
-			}
-			break;
-		case T_MX:
-		case T_AFSDB:
-		case T_RT:
-			n = getnum_str(&startp, endp);
-			if (n < 0)
-				return (-1);
-			PUTSHORT(n, cp);
-			ShrinkBuffer(INT16SZ);
-			if (!getword_str(buf2, sizeof buf2, &startp, endp))
-				return (-1);
-			n = dn_comp(buf2, cp, buflen, dnptrs, lastdnptr);
-			if (n < 0)
-				return (-1);
-			cp += n;
-			ShrinkBuffer(n);
-			break;
-		case T_PX:
-			n = getnum_str(&startp, endp);
-			if (n < 0)
-				return (-1);
-			PUTSHORT(n, cp);
-			ShrinkBuffer(INT16SZ);
-			for (i = 0; i < 2; i++) {
-				if (!getword_str(buf2, sizeof buf2, &startp,
-						 endp))
-					return (-1);
-				n = dn_comp(buf2, cp, buflen, dnptrs,
-					    lastdnptr);
-				if (n < 0)
-					return (-1);
-				cp += n;
-				ShrinkBuffer(n);
-			}
-			break;
-		case T_WKS:
-		case T_HINFO:
-		case T_TXT:
-		case T_X25:
-		case T_ISDN:
-		case T_NSAP:
-		case T_LOC:
-			/* XXX - more fine tuning needed here */
-			ShrinkBuffer(rrecp->r_size);
-			memcpy(cp, rrecp->r_data, rrecp->r_size);
-			cp += rrecp->r_size;
-			break;
-		default:
-			return (-1);
-		} /*switch*/
-		n = (u_int16_t)((cp - sp2) - INT16SZ);
-		PUTSHORT(n, sp2);
-	} /*for*/
-		
-	hp->qdcount = htons(counts[0]);
-	hp->ancount = htons(counts[1]);
-	hp->nscount = htons(counts[2]);
-	hp->arcount = htons(counts[3]);
-	return (cp - buf);
-}
-
-/*
- * Get a whitespace delimited word from a string (not file)
- * into buf. modify the start pointer to point after the
- * word in the string.
- */
-static int
-getword_str(char *buf, int size, u_char **startpp, u_char *endp) {
-        char *cp;
-        int c;
- 
-        for (cp = buf; *startpp <= endp; ) {
-                c = **startpp;
-                if (isspace(c) || c == '\0') {
-                        if (cp != buf) /* trailing whitespace */
-                                break;
-                        else { /* leading whitespace */
-                                (*startpp)++;
-                                continue;
-                        }
-                }
-                (*startpp)++;
-                if (cp >= buf+size-1)
-                        break;
-                *cp++ = (u_char)c;
-        }
-        *cp = '\0';
-        return (cp != buf);
-}
-
-/*
- * Get a whitespace delimited number from a string (not file) into buf
- * update the start pointer to point after the number in the string.
- */
-static int
-getnum_str(u_char **startpp, u_char *endp) {
-        int c, n;
-        int seendigit = 0;
-        int m = 0;
-
-        for (n = 0; *startpp <= endp; ) {
-                c = **startpp;
-                if (isspace(c) || c == '\0') {
-                        if (seendigit) /* trailing whitespace */
-                                break;
-                        else { /* leading whitespace */
-                                (*startpp)++;
-                                continue;
-                        }
-                }
-                if (c == ';') {
-                        while ((*startpp <= endp) &&
-			       ((c = **startpp) != '\n'))
-					(*startpp)++;
-                        if (seendigit)
-                                break;
-                        continue;
-                }
-                if (!isdigit(c)) {
-                        if (c == ')' && seendigit) {
-                                (*startpp)--;
-                                break;
-                        }
-			return (-1);
-                }        
-                (*startpp)++;
-                n = n * 10 + (c - '0');
-                seendigit = 1;
-        }
-        return (n + m);
-}
-
-/*
- * Allocate a resource record buffer & save rr info.
- */
-ns_updrec *
-res_mkupdrec(int section, const char *dname,
-	     u_int class, u_int type, u_long ttl) {
-	ns_updrec *rrecp = (ns_updrec *)calloc(1, sizeof(ns_updrec));
-
-	if (!rrecp || !(rrecp->r_dname = strdup(dname)))
-		return (NULL);
- 	rrecp->r_class = class;
-	rrecp->r_type = type;
-	rrecp->r_ttl = ttl;
-	rrecp->r_section = section;
-	return (rrecp);
-}
-
-/*
- * Free a resource record buffer created by res_mkupdrec.
- */
-void
-res_freeupdrec(ns_updrec *rrecp) {
-	/* Note: freeing r_dp is the caller's responsibility. */
-	if (rrecp->r_dname != NULL)
-		free(rrecp->r_dname);
-	free(rrecp);
-}
diff --git a/c/src/libnetworking/libc/res_query.c b/c/src/libnetworking/libc/res_query.c
deleted file mode 100644
index 784fa433bc..0000000000
--- a/c/src/libnetworking/libc/res_query.c
+++ /dev/null
@@ -1,410 +0,0 @@
-/*
- * Copyright (c) 1988, 1993
- *    The Regents of the University of California.  All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- * 	This product includes software developed by the University of
- * 	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-/*
- * Portions Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)res_query.c	8.1 (Berkeley) 6/4/93";
-static char orig_rcsid = "From: Id: res_query.c,v 8.14 1997/06/09 17:47:05 halley Exp $";
-static char rcsid[] = "$Id$";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-#include <ctype.h>
-#include <errno.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "res_config.h"
-
-#if PACKETSZ > 1024
-#define MAXPACKET	PACKETSZ
-#else
-#define MAXPACKET	1024
-#endif
-
-/*
- * Formulate a normal query, send, and await answer.
- * Returned answer is placed in supplied buffer "answer".
- * Perform preliminary check of answer, returning success only
- * if no error is indicated and the answer count is nonzero.
- * Return the size of the response on success, -1 on error.
- * Error number is left in h_errno.
- *
- * Caller must parse answer and determine whether it answers the question.
- */
-int
-res_query(name, class, type, answer, anslen)
-	const char *name;	/* domain name */
-	int class, type;	/* class and type of query */
-	u_char *answer;		/* buffer to put answer */
-	int anslen;		/* size of answer buffer */
-{
-	u_char buf[MAXPACKET];
-	HEADER *hp = (HEADER *) answer;
-	int n;
-
-	hp->rcode = NOERROR;	/* default */
-
-	if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
-		h_errno = NETDB_INTERNAL;
-		return (-1);
-	}
-#ifdef DEBUG
-	if (_res.options & RES_DEBUG)
-		printf(";; res_query(%s, %d, %d)\n", name, class, type);
-#endif
-
-	n = res_mkquery(QUERY, name, class, type, NULL, 0, NULL,
-			buf, sizeof(buf));
-	if (n <= 0) {
-#ifdef DEBUG
-		if (_res.options & RES_DEBUG)
-			printf(";; res_query: mkquery failed\n");
-#endif
-		h_errno = NO_RECOVERY;
-		return (n);
-	}
-	n = res_send(buf, n, answer, anslen);
-	if (n < 0) {
-#ifdef DEBUG
-		if (_res.options & RES_DEBUG)
-			printf(";; res_query: send error\n");
-#endif
-		h_errno = TRY_AGAIN;
-		return (n);
-	}
-
-	if (hp->rcode != NOERROR || ntohs(hp->ancount) == 0) {
-#ifdef DEBUG
-		if (_res.options & RES_DEBUG)
-			printf(";; rcode = %d, ancount=%d\n", hp->rcode,
-			    ntohs(hp->ancount));
-#endif
-		switch (hp->rcode) {
-		case NXDOMAIN:
-			h_errno = HOST_NOT_FOUND;
-			break;
-		case SERVFAIL:
-			h_errno = TRY_AGAIN;
-			break;
-		case NOERROR:
-			h_errno = NO_DATA;
-			break;
-		case FORMERR:
-		case NOTIMP:
-		case REFUSED:
-		default:
-			h_errno = NO_RECOVERY;
-			break;
-		}
-		return (-1);
-	}
-	return (n);
-}
-
-/*
- * Formulate a normal query, send, and retrieve answer in supplied buffer.
- * Return the size of the response on success, -1 on error.
- * If enabled, implement search rules until answer or unrecoverable failure
- * is detected.  Error code, if any, is left in h_errno.
- */
-int
-res_search(name, class, type, answer, anslen)
-	const char *name;	/* domain name */
-	int class, type;	/* class and type of query */
-	u_char *answer;		/* buffer to put answer */
-	int anslen;		/* size of answer */
-{
-	const char *cp, * const *domain;
-	HEADER *hp = (HEADER *) answer;
-	u_int dots;
-	int trailing_dot, ret, saved_herrno;
-	int got_nodata = 0, got_servfail = 0, tried_as_is = 0;
-
-	if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
-		h_errno = NETDB_INTERNAL;
-		return (-1);
-	}
-	errno = 0;
-	h_errno = HOST_NOT_FOUND;	/* default, if we never query */
-	dots = 0;
-	for (cp = name; *cp; cp++)
-		dots += (*cp == '.');
-	trailing_dot = 0;
-	if (cp > name && *--cp == '.')
-		trailing_dot++;
-
-	/* If there aren't any dots, it could be a user-level alias */
-	if (!dots && (cp = hostalias(name)) != NULL)
-		return (res_query(cp, class, type, answer, anslen));
-
-	/*
-	 * If there are dots in the name already, let's just give it a try
-	 * 'as is'.  The threshold can be set with the "ndots" option.
-	 */
-	saved_herrno = -1;
-	if (dots >= _res.ndots) {
-		ret = res_querydomain(name, NULL, class, type, answer, anslen);
-		if (ret > 0)
-			return (ret);
-		saved_herrno = h_errno;
-		tried_as_is++;
-	}
-
-	/*
-	 * We do at least one level of search if
-	 *	- there is no dot and RES_DEFNAME is set, or
-	 *	- there is at least one dot, there is no trailing dot,
-	 *	  and RES_DNSRCH is set.
-	 */
-	if ((!dots && (_res.options & RES_DEFNAMES)) ||
-	    (dots && !trailing_dot && (_res.options & RES_DNSRCH))) {
-		int done = 0;
-
-		for (domain = (const char * const *)_res.dnsrch;
-		     *domain && !done;
-		     domain++) {
-
-			ret = res_querydomain(name, *domain, class, type,
-					      answer, anslen);
-			if (ret > 0)
-				return (ret);
-
-			/*
-			 * If no server present, give up.
-			 * If name isn't found in this domain,
-			 * keep trying higher domains in the search list
-			 * (if that's enabled).
-			 * On a NO_DATA error, keep trying, otherwise
-			 * a wildcard entry of another type could keep us
-			 * from finding this entry higher in the domain.
-			 * If we get some other error (negative answer or
-			 * server failure), then stop searching up,
-			 * but try the input name below in case it's
-			 * fully-qualified.
-			 */
-			if (errno == ECONNREFUSED) {
-				h_errno = TRY_AGAIN;
-				return (-1);
-			}
-
-			switch (h_errno) {
-			case NO_DATA:
-				got_nodata++;
-				/* FALLTHROUGH */
-			case HOST_NOT_FOUND:
-				/* keep trying */
-				break;
-			case TRY_AGAIN:
-				if (hp->rcode == SERVFAIL) {
-					/* try next search element, if any */
-					got_servfail++;
-					break;
-				}
-				/* FALLTHROUGH */
-			default:
-				/* anything else implies that we're done */
-				done++;
-			}
-
-			/* if we got here for some reason other than DNSRCH,
-			 * we only wanted one iteration of the loop, so stop.
-			 */
-			if (!(_res.options & RES_DNSRCH))
-				done++;
-		}
-	}
-
-	/*
-	 * If we have not already tried the name "as is", do that now.
-	 * note that we do this regardless of how many dots were in the
-	 * name or whether it ends with a dot unless NOTLDQUERY is set.
-	 */
-	if (!tried_as_is && (dots || !(_res.options & RES_NOTLDQUERY))) {
-		ret = res_querydomain(name, NULL, class, type, answer, anslen);
-		if (ret > 0)
-			return (ret);
-	}
-
-	/* if we got here, we didn't satisfy the search.
-	 * if we did an initial full query, return that query's h_errno
-	 * (note that we wouldn't be here if that query had succeeded).
-	 * else if we ever got a nodata, send that back as the reason.
-	 * else send back meaningless h_errno, that being the one from
-	 * the last DNSRCH we did.
-	 */
-	if (saved_herrno != -1)
-		h_errno = saved_herrno;
-	else if (got_nodata)
-		h_errno = NO_DATA;
-	else if (got_servfail)
-		h_errno = TRY_AGAIN;
-	return (-1);
-}
-
-/*
- * Perform a call on res_query on the concatenation of name and domain,
- * removing a trailing dot from name if domain is NULL.
- */
-int
-res_querydomain(name, domain, class, type, answer, anslen)
-	const char *name, *domain;
-	int class, type;	/* class and type of query */
-	u_char *answer;		/* buffer to put answer */
-	int anslen;		/* size of answer */
-{
-	char nbuf[MAXDNAME];
-	const char *longname = nbuf;
-	int n, d;
-
-	if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
-		h_errno = NETDB_INTERNAL;
-		return (-1);
-	}
-#ifdef DEBUG
-	if (_res.options & RES_DEBUG)
-		printf(";; res_querydomain(%s, %s, %d, %d)\n",
-		       name, domain?domain:"<Nil>", class, type);
-#endif
-	if (domain == NULL) {
-		/*
-		 * Check for trailing '.';
-		 * copy without '.' if present.
-		 */
-		n = strlen(name);
-		if (n >= MAXDNAME) {
-			h_errno = NO_RECOVERY;
-			return (-1);
-		}
-		n--;
-		if (n >= 0 && name[n] == '.') {
-			strncpy(nbuf, name, n);
-			nbuf[n] = '\0';
-		} else
-			longname = name;
-	} else {
-		n = strlen(name);
-		d = strlen(domain);
-		if (n + d + 1 >= MAXDNAME) {
-			h_errno = NO_RECOVERY;
-			return (-1);
-		}
-		sprintf(nbuf, "%s.%s", name, domain);
-	}
-	return (res_query(longname, class, type, answer, anslen));
-}
-
-const char *
-hostalias(name)
-	const char *name;
-{
-	register char *cp1, *cp2;
-	FILE *fp;
-	char *file;
-	char buf[BUFSIZ];
-	static char abuf[MAXDNAME];
-
-	if (_res.options & RES_NOALIASES)
-		return (NULL);
-	if (issetugid())
-		return (NULL);
-	file = getenv("HOSTALIASES");
-	if (file == NULL || (fp = fopen(file, "r")) == NULL)
-		return (NULL);
-	setbuf(fp, NULL);
-	buf[sizeof(buf) - 1] = '\0';
-	while (fgets(buf, sizeof(buf), fp)) {
-		for (cp1 = buf; *cp1 && !isspace((int)*cp1); ++cp1)
-			;
-		if (!*cp1)
-			break;
-		*cp1 = '\0';
-		if (!strcasecmp(buf, name)) {
-			while (isspace((int)*++cp1))
-				;
-			if (!*cp1)
-				break;
-			for (cp2 = cp1 + 1; *cp2 && !isspace((int)*cp2); ++cp2)
-				;
-			abuf[sizeof(abuf) - 1] = *cp2 = '\0';
-			strncpy(abuf, cp1, sizeof(abuf) - 1);
-			fclose(fp);
-			return (abuf);
-		}
-	}
-	fclose(fp);
-	return (NULL);
-}
diff --git a/c/src/libnetworking/libc/res_send.c b/c/src/libnetworking/libc/res_send.c
deleted file mode 100644
index 08cb78490f..0000000000
--- a/c/src/libnetworking/libc/res_send.c
+++ /dev/null
@@ -1,929 +0,0 @@
-/*
- * Copyright (c) 1985, 1989, 1993
- *    The Regents of the University of California.  All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- * 	This product includes software developed by the University of
- * 	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-/*
- * Portions Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)res_send.c	8.1 (Berkeley) 6/4/93";
-static char orig_rcsid[] = "From: Id: res_send.c,v 8.20 1998/04/06 23:27:51 halley Exp $";
-static char rcsid[] = "$Id$";
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * Send query to name server and wait for reply.
- */
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/socket.h>
-#include <sys/uio.h>
-
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <arpa/inet.h>
-
-#include <errno.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <poll.h>
-
-#include "res_config.h"
-
-#if !defined(__rtems__)
-#ifdef NOPOLL			/* libc_r doesn't wrap poll yet() */
-static int use_poll = 0;
-#else
-static int use_poll = 1;	/* adapt to poll() syscall availability */
-				/* 0 = not present, 1 = try it, 2 = exists */
-#endif
-#endif
-
-static int s = -1;		/* socket used for communications */
-static int connected = 0;	/* is the socket connected */
-static int vc = 0;		/* is the socket a virtual circuit? */
-static res_send_qhook Qhook = NULL;
-static res_send_rhook Rhook = NULL;
-
-
-#define CAN_RECONNECT 1
-
-#ifndef DEBUG
-#   define Dprint(cond, args) /*empty*/
-#   define DprintQ(cond, args, query, size) /*empty*/
-#   define Aerror(file, string, error, address) /*empty*/
-#   define Perror(file, string, error) /*empty*/
-#else
-#   define Dprint(cond, args) if (cond) {fprintf args;} else {}
-#   define DprintQ(cond, args, query, size) if (cond) {\
-			fprintf args;\
-			__fp_nquery(query, size, stdout);\
-		} else {}
-    static void
-    Aerror(file, string, error, address)
-	FILE *file;
-	char *string;
-	int error;
-	struct sockaddr_in address;
-    {
-	int save = errno;
-
-	if (_res.options & RES_DEBUG) {
-		fprintf(file, "res_send: %s ([%s].%u): %s\n",
-			string,
-			inet_ntoa(address.sin_addr),
-			ntohs(address.sin_port),
-			strerror(error));
-	}
-	errno = save;
-    }
-    static void
-    Perror(file, string, error)
-	FILE *file;
-	char *string;
-	int error;
-    {
-	int save = errno;
-
-	if (_res.options & RES_DEBUG) {
-		fprintf(file, "res_send: %s: %s\n",
-			string, strerror(error));
-	}
-	errno = save;
-    }
-#endif
-
-void
-res_send_setqhook(hook)
-	res_send_qhook hook;
-{
-
-	Qhook = hook;
-}
-
-void
-res_send_setrhook(hook)
-	res_send_rhook hook;
-{
-
-	Rhook = hook;
-}
-
-/* int
- * res_isourserver(ina)
- *	looks up "ina" in _res.ns_addr_list[]
- * returns:
- *	0  : not found
- *	>0 : found
- * author:
- *	paul vixie, 29may94
- */
-int
-res_isourserver(inp)
-	const struct sockaddr_in *inp;
-{
-	struct sockaddr_in ina;
-	int ns, ret;
-
-	ina = *inp;
-	ret = 0;
-	for (ns = 0;  ns < _res.nscount;  ns++) {
-		const struct sockaddr_in *srv = &_res.nsaddr_list[ns];
-
-		if (srv->sin_family == ina.sin_family &&
-		    srv->sin_port == ina.sin_port &&
-		    (srv->sin_addr.s_addr == INADDR_ANY ||
-		     srv->sin_addr.s_addr == ina.sin_addr.s_addr)) {
-			ret++;
-			break;
-		}
-	}
-	return (ret);
-}
-
-/* int
- * res_nameinquery(name, type, class, buf, eom)
- *	look for (name,type,class) in the query section of packet (buf,eom)
- * requires:
- *	buf + HFIXEDSZ <= eom
- * returns:
- *	-1 : format error
- *	0  : not found
- *	>0 : found
- * author:
- *	paul vixie, 29may94
- */
-int
-res_nameinquery(name, type, class, buf, eom)
-	const char *name;
-	int type, class;
-	const u_char *buf, *eom;
-{
-	const u_char *cp = buf + HFIXEDSZ;
-	int qdcount = ntohs(((HEADER*)buf)->qdcount);
-
-	while (qdcount-- > 0) {
-		char tname[MAXDNAME+1];
-		int n, ttype, tclass;
-
-		n = dn_expand(buf, eom, cp, tname, sizeof tname);
-		if (n < 0)
-			return (-1);
-		cp += n;
-		if (cp + 2 * INT16SZ > eom)
-			return (-1);
-		ttype = ns_get16(cp); cp += INT16SZ;
-		tclass = ns_get16(cp); cp += INT16SZ;
-		if (ttype == type &&
-		    tclass == class &&
-		    strcasecmp(tname, name) == 0)
-			return (1);
-	}
-	return (0);
-}
-
-/* int
- * res_queriesmatch(buf1, eom1, buf2, eom2)
- *	is there a 1:1 mapping of (name,type,class)
- *	in (buf1,eom1) and (buf2,eom2)?
- * returns:
- *	-1 : format error
- *	0  : not a 1:1 mapping
- *	>0 : is a 1:1 mapping
- * author:
- *	paul vixie, 29may94
- */
-int
-res_queriesmatch(buf1, eom1, buf2, eom2)
-	const u_char *buf1, *eom1;
-	const u_char *buf2, *eom2;
-{
-	const u_char *cp = buf1 + HFIXEDSZ;
-	int qdcount = ntohs(((HEADER*)buf1)->qdcount);
-
-	if (buf1 + HFIXEDSZ > eom1 || buf2 + HFIXEDSZ > eom2)
-		return (-1);
-
-	/*
-	 * Only header section present in replies to
-	 * dynamic update packets.
-	 */
-	if ( (((HEADER *)buf1)->opcode == ns_o_update) &&
-	     (((HEADER *)buf2)->opcode == ns_o_update) )
-		return (1);
-
-	if (qdcount != ntohs(((HEADER*)buf2)->qdcount))
-		return (0);
-	while (qdcount-- > 0) {
-		char tname[MAXDNAME+1];
-		int n, ttype, tclass;
-
-		n = dn_expand(buf1, eom1, cp, tname, sizeof tname);
-		if (n < 0)
-			return (-1);
-		cp += n;
-		if (cp + 2 * INT16SZ > eom1)
-			return (-1);
-		ttype = ns_get16(cp);	cp += INT16SZ;
-		tclass = ns_get16(cp); cp += INT16SZ;
-		if (!res_nameinquery(tname, ttype, tclass, buf2, eom2))
-			return (0);
-	}
-	return (1);
-}
-
-int
-res_send(buf, buflen, ans, anssiz)
-	const u_char *buf;
-	int buflen;
-	u_char *ans;
-	int anssiz;
-{
-	HEADER *hp = (HEADER *) buf;
-	HEADER *anhp = (HEADER *) ans;
-	int gotsomewhere, connreset, terrno, try, v_circuit, resplen, ns, n;
-	u_int badns;	/* XXX NSMAX can't exceed #/bits in this variable */
-
-	if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
-		/* errno should have been set by res_init() in this case. */
-		return (-1);
-	}
-	if (anssiz < HFIXEDSZ) {
-		errno = EINVAL;
-		return (-1);
-	}
-	DprintQ((_res.options & RES_DEBUG) || (_res.pfcode & RES_PRF_QUERY),
-		(stdout, ";; res_send()\n"), buf, buflen);
-	v_circuit = (_res.options & RES_USEVC) || buflen > PACKETSZ;
-	gotsomewhere = 0;
-	connreset = 0;
-	terrno = ETIMEDOUT;
-	badns = 0;
-
-	/*
-	 * Send request, RETRY times, or until successful
-	 */
-	for (try = 0; try < _res.retry; try++) {
-	    for (ns = 0; ns < _res.nscount; ns++) {
-		struct sockaddr_in *nsap = &_res.nsaddr_list[ns];
-    same_ns:
-		if (badns & (1 << ns)) {
-			res_close();
-			goto next_ns;
-		}
-
-		if (Qhook) {
-			int done = 0, loops = 0;
-
-			do {
-				res_sendhookact act;
-
-				act = (*Qhook)(&nsap, &buf, &buflen,
-					       ans, anssiz, &resplen);
-				switch (act) {
-				case res_goahead:
-					done = 1;
-					break;
-				case res_nextns:
-					res_close();
-					goto next_ns;
-				case res_done:
-					return (resplen);
-				case res_modified:
-					/* give the hook another try */
-					if (++loops < 42) /*doug adams*/
-						break;
-					/*FALLTHROUGH*/
-				case res_error:
-					/*FALLTHROUGH*/
-				default:
-					return (-1);
-				}
-			} while (!done);
-		}
-
-		Dprint(_res.options & RES_DEBUG,
-		       (stdout, ";; Querying server (# %d) address = %s\n",
-			ns + 1, inet_ntoa(nsap->sin_addr)));
-
-		if (v_circuit) {
-			int truncated;
-#if !defined(__rtems__)
-			struct iovec iov[2];
-#endif
-			u_short len;
-			u_char *cp;
-
-			/*
-			 * Use virtual circuit;
-			 * at most one attempt per server.
-			 */
-			try = _res.retry;
-			truncated = 0;
-			if (s < 0 || !vc || hp->opcode == ns_o_update) {
-				if (s >= 0)
-					res_close();
-
-				s = socket(PF_INET, SOCK_STREAM, 0);
-				if (s < 0) {
-					terrno = errno;
-					Perror(stderr, "socket(vc)", errno);
-					return (-1);
-				}
-				errno = 0;
-				if (connect(s, (struct sockaddr *)nsap,
-					    sizeof *nsap) < 0) {
-					terrno = errno;
-					Aerror(stderr, "connect/vc",
-					       errno, *nsap);
-					badns |= (1 << ns);
-					res_close();
-					goto next_ns;
-				}
-				vc = 1;
-			}
-			/*
-			 * Send length & message
-			 */
-			putshort((u_short)buflen, (u_char*)&len);
-#if !defined(__rtems__)
-			iov[0].iov_base = (caddr_t)&len;
-			iov[0].iov_len = INT16SZ;
-			iov[1].iov_base = (caddr_t)buf;
-			iov[1].iov_len = buflen;
-			if (writev(s, iov, 2) != (INT16SZ + buflen)) {
-#else
-			/*
-			 * RTEMS doesn't have writev (yet)
-			 */
-			if ((write (s, &len, INT16SZ) != INT16SZ)
-			 || (write (s, buf, buflen) != buflen)) {
-#endif
-				terrno = errno;
-				Perror(stderr, "write failed", errno);
-				badns |= (1 << ns);
-				res_close();
-				goto next_ns;
-			}
-			/*
-			 * Receive length & response
-			 */
-read_len:
-			cp = ans;
-			len = INT16SZ;
-			while ((n = read(s, (char *)cp, (int)len)) > 0) {
-				cp += n;
-				if ((len -= n) <= 0)
-					break;
-			}
-			if (n <= 0) {
-				terrno = errno;
-				Perror(stderr, "read failed", errno);
-				res_close();
-				/*
-				 * A long running process might get its TCP
-				 * connection reset if the remote server was
-				 * restarted.  Requery the server instead of
-				 * trying a new one.  When there is only one
-				 * server, this means that a query might work
-				 * instead of failing.  We only allow one reset
-				 * per query to prevent looping.
-				 */
-				if (terrno == ECONNRESET && !connreset) {
-					connreset = 1;
-					res_close();
-					goto same_ns;
-				}
-				res_close();
-				goto next_ns;
-			}
-			resplen = ns_get16(ans);
-			if (resplen > anssiz) {
-				Dprint(_res.options & RES_DEBUG,
-				       (stdout, ";; response truncated\n")
-				       );
-				truncated = 1;
-				len = anssiz;
-			} else
-				len = resplen;
-			if (len < HFIXEDSZ) {
-				/*
-				 * Undersized message.
-				 */
-				Dprint(_res.options & RES_DEBUG,
-				       (stdout, ";; undersized: %d\n", len));
-				terrno = EMSGSIZE;
-				badns |= (1 << ns);
-				res_close();
-				goto next_ns;
-			}
-			cp = ans;
-			while (len != 0 &&
-			       (n = read(s, (char *)cp, (int)len)) > 0) {
-				cp += n;
-				len -= n;
-			}
-			if (n <= 0) {
-				terrno = errno;
-				Perror(stderr, "read(vc)", errno);
-				res_close();
-				goto next_ns;
-			}
-			if (truncated) {
-				/*
-				 * Flush rest of answer
-				 * so connection stays in synch.
-				 */
-				anhp->tc = 1;
-				len = resplen - anssiz;
-				while (len != 0) {
-					char junk[PACKETSZ];
-
-					n = (len > sizeof(junk)
-					     ? sizeof(junk)
-					     : len);
-					if ((n = read(s, junk, n)) > 0)
-						len -= n;
-					else
-						break;
-				}
-			}
-			/*
-			 * The calling applicating has bailed out of
-			 * a previous call and failed to arrange to have
-			 * the circuit closed or the server has got
-			 * itself confused. Anyway drop the packet and
-			 * wait for the correct one.
-			 */
-			if (hp->id != anhp->id) {
-				DprintQ((_res.options & RES_DEBUG) ||
-					(_res.pfcode & RES_PRF_REPLY),
-					(stdout, ";; old answer (unexpected):\n"),
-					ans, (resplen>anssiz)?anssiz:resplen);
-				goto read_len;
-			}
-		} else {
-			/*
-			 * Use datagrams.
-			 */
-#ifndef NOPOLL
-			struct pollfd pfd;
-			int msec;
-#endif
-			struct timeval timeout;
-#ifndef NOSELECT
-			fd_set dsmask, *dsmaskp;
-			int dsmasklen;
-#endif
-			struct sockaddr_in from;
-			int fromlen;
-
-			if ((s < 0) || vc) {
-				if (vc)
-					res_close();
-				s = socket(PF_INET, SOCK_DGRAM, 0);
-				if (s < 0) {
-#ifndef CAN_RECONNECT
- bad_dg_sock:
-#endif
-					terrno = errno;
-					Perror(stderr, "socket(dg)", errno);
-					return (-1);
-				}
-				connected = 0;
-			}
-#ifndef CANNOT_CONNECT_DGRAM
-			/*
-			 * On a 4.3BSD+ machine (client and server,
-			 * actually), sending to a nameserver datagram
-			 * port with no nameserver will cause an
-			 * ICMP port unreachable message to be returned.
-			 * If our datagram socket is "connected" to the
-			 * server, we get an ECONNREFUSED error on the next
-			 * socket operation, and select returns if the
-			 * error message is received.  We can thus detect
-			 * the absence of a nameserver without timing out.
-			 * If we have sent queries to at least two servers,
-			 * however, we don't want to remain connected,
-			 * as we wish to receive answers from the first
-			 * server to respond.
-			 */
-			if (_res.nscount == 1 || (try == 0 && ns == 0)) {
-				/*
-				 * Connect only if we are sure we won't
-				 * receive a response from another server.
-				 */
-				if (!connected) {
-					if (connect(s, (struct sockaddr *)nsap,
-						    sizeof *nsap
-						    ) < 0) {
-						Aerror(stderr,
-						       "connect(dg)",
-						       errno, *nsap);
-						badns |= (1 << ns);
-						res_close();
-						goto next_ns;
-					}
-					connected = 1;
-				}
-				if (send(s, (char*)buf, buflen, 0) != buflen) {
-					Perror(stderr, "send", errno);
-					badns |= (1 << ns);
-					res_close();
-					goto next_ns;
-				}
-			} else {
-				/*
-				 * Disconnect if we want to listen
-				 * for responses from more than one server.
-				 */
-				if (connected) {
-#ifdef CAN_RECONNECT
-					struct sockaddr_in no_addr;
-
-					no_addr.sin_family = AF_INET;
-					no_addr.sin_addr.s_addr = INADDR_ANY;
-					no_addr.sin_port = 0;
-					(void) connect(s,
-						       (struct sockaddr *)
-						        &no_addr,
-						       sizeof no_addr);
-#else
-					int s1 = socket(PF_INET, SOCK_DGRAM,0);
-					if (s1 < 0)
-						goto bad_dg_sock;
-					(void) dup2(s1, s);
-					(void) close(s1);
-					Dprint(_res.options & RES_DEBUG,
-						(stdout, ";; new DG socket\n"))
-#endif /* CAN_RECONNECT */
-					connected = 0;
-					errno = 0;
-				}
-#endif /* !CANNOT_CONNECT_DGRAM */
-				if (sendto(s, (char*)buf, buflen, 0,
-					   (struct sockaddr *)nsap,
-					   sizeof *nsap)
-				    != buflen) {
-					Aerror(stderr, "sendto", errno, *nsap);
-					badns |= (1 << ns);
-					res_close();
-					goto next_ns;
-				}
-#ifndef CANNOT_CONNECT_DGRAM
-			}
-#endif /* !CANNOT_CONNECT_DGRAM */
-
-			/*
-			 * Wait for reply
-			 */
-#ifndef NOPOLL
-    othersyscall:
-			if (use_poll) {
-				msec = (_res.retrans << try) * 1000;
-				if (try > 0)
-					msec /= _res.nscount;
-				if (msec <= 0)
-					msec = 1000;
-			} else {
-#endif
-				timeout.tv_sec = (_res.retrans << try);
-				if (try > 0)
-					timeout.tv_sec /= _res.nscount;
-				if ((long) timeout.tv_sec <= 0)
-					timeout.tv_sec = 1;
-				timeout.tv_usec = 0;
-#ifndef NOPOLL
-			}
-#endif
-    wait:
-			if (s < 0) {
-				Perror(stderr, "s out-of-bounds", EMFILE);
-				res_close();
-				goto next_ns;
-			}
-#ifndef NOPOLL
-			if (use_poll) {
-				struct sigaction sa, osa;
-				int sigsys_installed = 0;
-
-				pfd.fd = s;
-				pfd.events = POLLIN;
-				if (use_poll == 1) {
-					bzero(&sa, sizeof(sa));
-					sa.sa_handler = SIG_IGN;
-					if (sigaction(SIGSYS, &sa, &osa) >= 0)
-						sigsys_installed = 1;
-				}
-				n = poll(&pfd, 1, msec);
-				if (sigsys_installed == 1) {
-					int oerrno = errno;
-					sigaction(SIGSYS, &osa, NULL);
-					errno = oerrno;
-				}
-				/* XXX why does nosys() return EINVAL? */
-				if (n < 0 && (errno == ENOSYS ||
-				    errno == EINVAL)) {
-					use_poll = 0;
-					goto othersyscall;
-				} else if (use_poll == 1)
-					use_poll = 2;
-				if (n < 0) {
-					if (errno == EINTR)
-						goto wait;
-					Perror(stderr, "poll", errno);
-					res_close();
-					goto next_ns;
-				}
-			} else {
-#endif
-#ifndef NOSELECT
-				dsmasklen = howmany(s + 1, NFDBITS) *
-					    sizeof(fd_mask);
-				if (dsmasklen > sizeof(fd_set)) {
-					dsmaskp = (fd_set *)malloc(dsmasklen);
-					if (dsmaskp == NULL) {
-						res_close();
-						goto next_ns;
-					}
-				} else
-					dsmaskp = &dsmask;
-				/* only zero what we need */
-				bzero((char *)dsmaskp, dsmasklen);
-				FD_SET(s, dsmaskp);
-				n = select(s + 1, dsmaskp, (fd_set *)NULL,
-					   (fd_set *)NULL, &timeout);
-				if (dsmaskp != &dsmask)
-					free(dsmaskp);
-				if (n < 0) {
-					if (errno == EINTR)
-						goto wait;
-					Perror(stderr, "select", errno);
-					res_close();
-					goto next_ns;
-				}
-#endif
-#ifndef NOPOLL
-			}
-#endif
-
-#ifdef NOSELECT
-			setsockopt (s, SOL_SOCKET, SO_RCVTIMEO, &timeout, sizeof timeout);
-#else
-			if (n == 0) {
-				/*
-				 * timeout
-				 */
-				Dprint(_res.options & RES_DEBUG,
-				       (stdout, ";; timeout\n"));
-				gotsomewhere = 1;
-				res_close();
-				goto next_ns;
-			}
-#endif
-			errno = 0;
-			fromlen = sizeof(struct sockaddr_in);
-			resplen = recvfrom(s, (char*)ans, anssiz, 0,
-					   (struct sockaddr *)&from, &fromlen);
-			if (resplen <= 0) {
-#ifdef NOSELECT
-				if (errno == ETIMEDOUT) {
-					Dprint(_res.options & RES_DEBUG,
-					       (stdout, ";; timeout\n"));
-					gotsomewhere = 1;
-					res_close();
-					goto next_ns;
-				}
-#endif
-				Perror(stderr, "recvfrom", errno);
-				res_close();
-				goto next_ns;
-			}
-			gotsomewhere = 1;
-			if (resplen < HFIXEDSZ) {
-				/*
-				 * Undersized message.
-				 */
-				Dprint(_res.options & RES_DEBUG,
-				       (stdout, ";; undersized: %d\n",
-					resplen));
-				terrno = EMSGSIZE;
-				badns |= (1 << ns);
-				res_close();
-				goto next_ns;
-			}
-			if (hp->id != anhp->id) {
-				/*
-				 * response from old query, ignore it.
-				 * XXX - potential security hazard could
-				 *	 be detected here.
-				 */
-				DprintQ((_res.options & RES_DEBUG) ||
-					(_res.pfcode & RES_PRF_REPLY),
-					(stdout, ";; old answer:\n"),
-					ans, (resplen>anssiz)?anssiz:resplen);
-				goto wait;
-			}
-#ifdef CHECK_SRVR_ADDR
-			if (!(_res.options & RES_INSECURE1) &&
-			    !res_isourserver(&from)) {
-				/*
-				 * response from wrong server? ignore it.
-				 * XXX - potential security hazard could
-				 *	 be detected here.
-				 */
-				DprintQ((_res.options & RES_DEBUG) ||
-					(_res.pfcode & RES_PRF_REPLY),
-					(stdout, ";; not our server:\n"),
-					ans, (resplen>anssiz)?anssiz:resplen);
-				goto wait;
-			}
-#endif
-			if (!(_res.options & RES_INSECURE2) &&
-			    !res_queriesmatch(buf, buf + buflen,
-					      ans, ans + anssiz)) {
-				/*
-				 * response contains wrong query? ignore it.
-				 * XXX - potential security hazard could
-				 *	 be detected here.
-				 */
-				DprintQ((_res.options & RES_DEBUG) ||
-					(_res.pfcode & RES_PRF_REPLY),
-					(stdout, ";; wrong query name:\n"),
-					ans, (resplen>anssiz)?anssiz:resplen);
-				goto wait;
-			}
-			if (anhp->rcode == SERVFAIL ||
-			    anhp->rcode == NOTIMP ||
-			    anhp->rcode == REFUSED) {
-				DprintQ(_res.options & RES_DEBUG,
-					(stdout, "server rejected query:\n"),
-					ans, (resplen>anssiz)?anssiz:resplen);
-				badns |= (1 << ns);
-				res_close();
-				/* don't retry if called from dig */
-				if (!_res.pfcode)
-					goto next_ns;
-			}
-			if (!(_res.options & RES_IGNTC) && anhp->tc) {
-				/*
-				 * get rest of answer;
-				 * use TCP with same server.
-				 */
-				Dprint(_res.options & RES_DEBUG,
-				       (stdout, ";; truncated answer\n"));
-				v_circuit = 1;
-				res_close();
-				goto same_ns;
-			}
-		} /*if vc/dg*/
-		Dprint((_res.options & RES_DEBUG) ||
-		       ((_res.pfcode & RES_PRF_REPLY) &&
-			(_res.pfcode & RES_PRF_HEAD1)),
-		       (stdout, ";; got answer:\n"));
-		DprintQ((_res.options & RES_DEBUG) ||
-			(_res.pfcode & RES_PRF_REPLY),
-			(stdout, "%s", ""),
-			ans, (resplen>anssiz)?anssiz:resplen);
-		/*
-		 * If using virtual circuits, we assume that the first server
-		 * is preferred over the rest (i.e. it is on the local
-		 * machine) and only keep that one open.
-		 * If we have temporarily opened a virtual circuit,
-		 * or if we haven't been asked to keep a socket open,
-		 * close the socket.
-		 */
-		if ((v_circuit && (!(_res.options & RES_USEVC) || ns != 0)) ||
-		    !(_res.options & RES_STAYOPEN)) {
-			res_close();
-		}
-		if (Rhook) {
-			int done = 0, loops = 0;
-
-			do {
-				res_sendhookact act;
-
-				act = (*Rhook)(nsap, buf, buflen,
-					       ans, anssiz, &resplen);
-				switch (act) {
-				case res_goahead:
-				case res_done:
-					done = 1;
-					break;
-				case res_nextns:
-					res_close();
-					goto next_ns;
-				case res_modified:
-					/* give the hook another try */
-					if (++loops < 42) /*doug adams*/
-						break;
-					/*FALLTHROUGH*/
-				case res_error:
-					/*FALLTHROUGH*/
-				default:
-					return (-1);
-				}
-			} while (!done);
-
-		}
-		return (resplen);
-    next_ns: ;
-	   } /*foreach ns*/
-	} /*foreach retry*/
-	res_close();
-	if (!v_circuit) {
-		if (!gotsomewhere)
-			errno = ECONNREFUSED;	/* no nameservers found */
-		else
-			errno = ETIMEDOUT;	/* no answer obtained */
-	} else
-		errno = terrno;
-	return (-1);
-}
-
-/*
- * This routine is for closing the socket if a virtual circuit is used and
- * the program wants to close it.  This provides support for endhostent()
- * which expects to close the socket.
- *
- * This routine is not expected to be user visible.
- */
-void
-res_close()
-{
-	if (s >= 0) {
-		(void) close(s);
-		s = -1;
-		connected = 0;
-		vc = 0;
-	}
-}
diff --git a/c/src/libnetworking/libc/res_stubs.c b/c/src/libnetworking/libc/res_stubs.c
deleted file mode 100644
index 92cf0fac54..0000000000
--- a/c/src/libnetworking/libc/res_stubs.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (C) 1996 Peter Wemm <peter@freebsd.org>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $Id$
- */
-
-/*
- * This file is for FreeBSD-3.0 that has a bind-4.9.5-P1 derived
- * resolver in the libc.  It provides aliases for functions that
- * have moved since 4.9.4-P1.
- *
- * I'll save everybody the trouble and say it now:  *THIS IS A HACK*!
- *
- * Yes, many of these are private functions to the resolver, but some are
- * needed as there is no other way to provide the functionality and they've
- * turned up all over the place. :-(
- */
-
-#include <sys/types.h>
-#include <sys/cdefs.h>
-
-__weak_reference(__inet_addr, inet_addr);
-__weak_reference(__inet_aton, inet_aton);
-__weak_reference(__inet_lnaof, inet_lnaof);
-__weak_reference(__inet_makeaddr, inet_makeaddr);
-__weak_reference(__inet_neta, inet_neta);
-__weak_reference(__inet_netof, inet_netof);
-__weak_reference(__inet_network, inet_network);
-__weak_reference(__inet_net_ntop, inet_net_ntop);
-__weak_reference(__inet_net_pton, inet_net_pton);
-__weak_reference(__inet_ntoa, inet_ntoa);
-__weak_reference(__inet_pton, inet_pton);
-__weak_reference(__inet_ntop, inet_ntop);
-__weak_reference(__inet_nsap_addr, inet_nsap_addr);
-__weak_reference(__inet_nsap_ntoa, inet_nsap_ntoa);
-
-__weak_reference(__sym_ston, sym_ston);
-__weak_reference(__sym_ntos, sym_ntos);
-__weak_reference(__sym_ntop, sym_ntop);
-__weak_reference(__fp_resstat, fp_resstat);
-__weak_reference(__p_query, p_query);
-__weak_reference(__p_fqnname, p_fqnname);
-__weak_reference(__p_secstodate, p_secstodate);
-__weak_reference(__dn_count_labels, dn_count_labels);
-__weak_reference(__dn_comp, dn_comp);
-__weak_reference(__res_close, _res_close);
-__weak_reference(__dn_expand, dn_expand);
-__weak_reference(__res_init, res_init);
-__weak_reference(__res_query, res_query);
-__weak_reference(__res_search, res_search);
-__weak_reference(__res_querydomain, res_querydomain);
-__weak_reference(__res_mkquery, res_mkquery);
-__weak_reference(__res_send, res_send);
diff --git a/c/src/libnetworking/libc/res_update.c b/c/src/libnetworking/libc/res_update.c
deleted file mode 100644
index ef591e0674..0000000000
--- a/c/src/libnetworking/libc/res_update.c
+++ /dev/null
@@ -1,518 +0,0 @@
-#if !defined(__rtems__)
-#if !defined(lint) && !defined(SABER)
-static char rcsid[] = "$Id$";
-#endif /* not lint */
-#endif /* not rtems */
-
-/*
- * Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-/*
- * Based on the Dynamic DNS reference implementation by Viraj Bais
- * <viraj_bais@ccm.fm.intel.com>
- */
-
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-#include <errno.h>
-#include <limits.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-/*
- * Separate a linked list of records into groups so that all records
- * in a group will belong to a single zone on the nameserver.
- * Create a dynamic update packet for each zone and send it to the
- * nameservers for that zone, and await answer.
- * Abort if error occurs in updating any zone.
- * Return the number of zones updated on success, < 0 on error.
- *
- * On error, caller must deal with the unsynchronized zones
- * eg. an A record might have been successfully added to the forward
- * zone but the corresponding PTR record would be missing if error
- * was encountered while updating the reverse zone.
- */
-
-#define NSMAX 16
-
-struct ns1 {
-	char nsname[MAXDNAME];
-	struct in_addr nsaddr1;
-};
-
-struct zonegrp {
-	char 		z_origin[MAXDNAME];
-	int16_t		z_class;
-	char		z_soardata[MAXDNAME + 5 * INT32SZ];
-	struct ns1 	z_ns[NSMAX];
-	int		z_nscount;
-	ns_updrec *	z_rr;
-	struct zonegrp *z_next;
-};
-
-
-int
-res_update(ns_updrec *rrecp_in) {
-	ns_updrec *rrecp, *tmprrecp;
-	u_char buf[PACKETSZ], answer[PACKETSZ], packet[2*PACKETSZ];
-	char name[MAXDNAME], zname[MAXDNAME], primary[MAXDNAME],
-	     mailaddr[MAXDNAME];
-	u_char soardata[2*MAXCDNAME+5*INT32SZ];
-	char *dname, *svdname, *cp1, *target;
-	u_char *cp, *eom;
-	HEADER *hp = (HEADER *) answer;
-	struct zonegrp *zptr = NULL, *tmpzptr, *prevzptr, *zgrp_start = NULL;
-	int i, j, k = 0, n, ancount, nscount, arcount, rcode, rdatasize,
-	    newgroup, done, myzone, seen_before, numzones = 0;
-	u_int16_t dlen, class, qclass, type, qtype;
-	u_int32_t ttl;
-
-	if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
-		h_errno = NETDB_INTERNAL;
-		return (-1);
-	}
-
-	for (rrecp = rrecp_in; rrecp; rrecp = rrecp->r_next) {
-		dname = rrecp->r_dname;
-		n = strlen(dname);
-		if (dname[n-1] == '.')
-			dname[n-1] = '\0';
-		qtype = T_SOA;
-		qclass = rrecp->r_class;
-		done = 0;
-		seen_before = 0;
-
-		while (!done && dname) {
-		    if (qtype == T_SOA) {
-			for (tmpzptr = zgrp_start;
-			     tmpzptr && !seen_before;
-			     tmpzptr = tmpzptr->z_next) {
-				if (strcasecmp(dname,
-					       tmpzptr->z_origin) == 0 &&
-				    tmpzptr->z_class == qclass)
-					seen_before++;
-				for (tmprrecp = tmpzptr->z_rr;
-				     tmprrecp && !seen_before;
-				     tmprrecp = tmprrecp->r_grpnext)
-				if (strcasecmp(dname, tmprrecp->r_dname) == 0
-				    && tmprrecp->r_class == qclass) {
-					seen_before++;
-					break;
-				}
-				if (seen_before) {
-					/*
-					 * Append to the end of
-					 * current group.
-					 */
-					for (tmprrecp = tmpzptr->z_rr;
-					     tmprrecp->r_grpnext;
-					     tmprrecp = tmprrecp->r_grpnext)
-						(void)NULL;
-					tmprrecp->r_grpnext = rrecp;
-					rrecp->r_grpnext = NULL;
-					done = 1;
-					break;
-				}
-			}
-		} else if (qtype == T_A) {
-		    for (tmpzptr = zgrp_start;
-			 tmpzptr && !done;
-			 tmpzptr = tmpzptr->z_next)
-			    for (i = 0; i < tmpzptr->z_nscount; i++)
-				if (tmpzptr->z_class == qclass &&
-				    strcasecmp(tmpzptr->z_ns[i].nsname,
-					       dname) == 0 &&
-				    tmpzptr->z_ns[i].nsaddr1.s_addr != 0) {
-					zptr->z_ns[k].nsaddr1.s_addr =
-					 tmpzptr->z_ns[i].nsaddr1.s_addr;
-					done = 1;
-					break;
-				}
-		}
-		if (done)
-		    break;
-		n = res_mkquery(QUERY, dname, qclass, qtype, NULL,
-				0, NULL, buf, sizeof buf);
-		if (n <= 0) {
-		    fprintf(stderr, "res_update: mkquery failed\n");
-		    return (n);
-		}
-		n = res_send(buf, n, answer, sizeof answer);
-		if (n < 0) {
-		    fprintf(stderr, "res_update: send error for %s\n",
-			    rrecp->r_dname);
-		    return (n);
-		}
-		if (n < HFIXEDSZ)
-			return (-1);
-		ancount = ntohs(hp->ancount);
-		nscount = ntohs(hp->nscount);
-		arcount = ntohs(hp->arcount);
-		rcode = hp->rcode;
-		cp = answer + HFIXEDSZ;
-		eom = answer + n;
-		/* skip the question section */
-		n = dn_skipname(cp, eom);
-		if (n < 0 || cp + n + 2 * INT16SZ > eom)
-			return (-1);
-		cp += n + 2 * INT16SZ;
-
-		if (qtype == T_SOA) {
-		    if (ancount == 0 && nscount == 0 && arcount == 0) {
-			/*
-			 * if (rcode == NOERROR) then the dname exists but
-			 * has no soa record associated with it.
-			 * if (rcode == NXDOMAIN) then the dname does not
-			 * exist and the server is replying out of NCACHE.
-			 * in either case, proceed with the next try
-			 */
-			dname = strchr(dname, '.');
-			if (dname != NULL)
-				dname++;
-			continue;
-		    } else if ((rcode == NOERROR || rcode == NXDOMAIN) &&
-			       ancount == 0 &&
-			       nscount == 1 && arcount == 0) {
-			/*
-			 * name/data does not exist, soa record supplied in the
-			 * authority section
-			 */
-			/* authority section must contain the soa record */
-			if ((n = dn_expand(answer, eom, cp, zname,
-					sizeof zname)) < 0)
-			    return (n);
-			cp += n;
-			if (cp + 2 * INT16SZ > eom)
-				return (-1);
-			GETSHORT(type, cp);
-			GETSHORT(class, cp);
-			if (type != T_SOA || class != qclass) {
-			    fprintf(stderr, "unknown answer\n");
-			    return (-1);
-			}
-			myzone = 0;
-			svdname = dname;
-			while (dname)
-			    if (strcasecmp(dname, zname) == 0) {
-				myzone = 1;
-				break;
-			    } else if ((dname = strchr(dname, '.')) != NULL)
-				dname++;
-			if (!myzone) {
-			    dname = strchr(svdname, '.');
-			    if (dname != NULL)
-				dname++;
-			    continue;
-			}
-			nscount = 0;
-			/* fallthrough */
-		    } else if (rcode == NOERROR && ancount == 1) {
-			/*
-			 * found the zone name
-			 * new servers will supply NS records for the zone
-			 * in authority section and A records for those 
-			 * nameservers in the additional section
-			 * older servers have to be explicitly queried for
-			 * NS records for the zone
-			 */
-			/* answer section must contain the soa record */
-			if ((n = dn_expand(answer, eom, cp, zname,
-			 	       	   sizeof zname)) < 0)
-				return (n);
-			else
-				cp += n;
-			if (cp + 2 * INT16SZ > eom)
-				return (-1);
-			GETSHORT(type, cp);
-			GETSHORT(class, cp);
-			if (type == T_CNAME) {
-				dname = strchr(dname, '.');
-				if (dname != NULL)
-					dname++;
-				continue;
-			}
-			if (strcasecmp(dname, zname) != 0 ||
-			    type != T_SOA ||
-			    class != rrecp->r_class) {
-				fprintf(stderr, "unknown answer\n");
-				return (-1);
-			}
-			/* FALLTHROUGH */
-		    } else {
-			fprintf(stderr,
-		"unknown response: ans=%d, auth=%d, add=%d, rcode=%d\n",
-				ancount, nscount, arcount, hp->rcode);
-			return (-1);
-		    }
-		    if (cp + INT32SZ + INT16SZ > eom)
-			    return (-1);
-		    /* continue processing the soa record */
-		    GETLONG(ttl, cp);
-		    GETSHORT(dlen, cp);
-		    if (cp + dlen > eom)
-			    return (-1);
-		    newgroup = 1;
-		    zptr = zgrp_start;
-		    prevzptr = NULL;
-		    while (zptr) {
-			if (strcasecmp(zname, zptr->z_origin) == 0 &&
-			    type == T_SOA && class == qclass) {
-				newgroup = 0;
-				break;
-			}
-			prevzptr = zptr;
-			zptr = zptr->z_next;
-		    }
-		    if (!newgroup) {
-			for (tmprrecp = zptr->z_rr;
-			     tmprrecp->r_grpnext;
-			     tmprrecp = tmprrecp->r_grpnext)
-				    ;
-			tmprrecp->r_grpnext = rrecp;
-			rrecp->r_grpnext = NULL;
-			done = 1;
-			cp += dlen;
-			break;
-		    } else {
-			if ((n = dn_expand(answer, eom, cp, primary,
-				       	   sizeof primary)) < 0)
-			    return (n);
-			cp += n;
-			/* 
-			 * We don't have to bounds check here because the
-			 * next use of 'cp' is in dn_expand().
-			 */
-			cp1 = (char *)soardata;
-			strcpy(cp1, primary);
-			cp1 += strlen(cp1) + 1;
-			if ((n = dn_expand(answer, eom, cp, mailaddr,
-				       	   sizeof mailaddr)) < 0)
-			    return (n);
-			cp += n;
-			strcpy(cp1, mailaddr);
-			cp1 += strlen(cp1) + 1;
-			if (cp + 5*INT32SZ > eom)
-				return (-1);
-			memcpy(cp1, cp, 5*INT32SZ);
-			cp += 5*INT32SZ;
-			cp1 += 5*INT32SZ;
-			rdatasize = (u_char *)cp1 - soardata;
-			zptr = calloc(1, sizeof(struct zonegrp));
-			if (zptr == NULL)
-                	    return (-1);
-			if (zgrp_start == NULL)
-			    zgrp_start = zptr;
-			else
-			    prevzptr->z_next = zptr;
-			zptr->z_rr = rrecp;
-			rrecp->r_grpnext = NULL;
-			strcpy(zptr->z_origin, zname);
-			zptr->z_class = class;
-			memcpy(zptr->z_soardata, soardata, rdatasize);
-			/* fallthrough to process NS and A records */
-		    }
-		} else if (qtype == T_NS) {
-		    if (rcode == NOERROR && ancount > 0) {
-			strcpy(zname, dname);
-			for (zptr = zgrp_start; zptr; zptr = zptr->z_next) {
-			    if (strcasecmp(zname, zptr->z_origin) == 0)
-				break;
-			}
-			if (zptr == NULL)
-			    /* should not happen */
-			    return (-1);
-			if (nscount > 0) {
-			    /*
-			     * answer and authority sections contain
-			     * the same information, skip answer section
-			     */
-			    for (j = 0; j < ancount; j++) {
-				n = dn_skipname(cp, eom);
-				if (n < 0)
-					return (-1);
-				n += 2*INT16SZ + INT32SZ;
-				if (cp + n + INT16SZ > eom)
-					return (-1);
-				cp += n;
-				GETSHORT(dlen, cp);
-				cp += dlen;
-			    }
-			} else
-			    nscount = ancount;
-			/* fallthrough to process NS and A records */
-		    } else {
-			fprintf(stderr, "cannot determine nameservers for %s:\
-ans=%d, auth=%d, add=%d, rcode=%d\n",
-				dname, ancount, nscount, arcount, hp->rcode);
-			return (-1);
-		    }
-		} else if (qtype == T_A) {
-		    if (rcode == NOERROR && ancount > 0) {
-			arcount = ancount;
-			ancount = nscount = 0;
-			/* fallthrough to process A records */
-		    } else {
-			fprintf(stderr, "cannot determine address for %s:\
-ans=%d, auth=%d, add=%d, rcode=%d\n",
-				dname, ancount, nscount, arcount, hp->rcode);
-			return (-1);
-		    }
-		}
-		/* process NS records for the zone */
-		j = 0;
-		for (i = 0; i < nscount; i++) {
-		    if ((n = dn_expand(answer, eom, cp, name,
-					sizeof name)) < 0)
-			return (n);
-		    cp += n;
-		    if (cp + 3 * INT16SZ + INT32SZ > eom)
-			    return (-1);
-		    GETSHORT(type, cp);
-		    GETSHORT(class, cp);
-		    GETLONG(ttl, cp);
-		    GETSHORT(dlen, cp);
-		    if (cp + dlen > eom)
-			return (-1);
-		    if (strcasecmp(name, zname) == 0 &&
-			type == T_NS && class == qclass) {
-				if ((n = dn_expand(answer, eom, cp,
-						   name, sizeof name)) < 0)
-					return (n);
-			    target = zptr->z_ns[j++].nsname;
-			    strcpy(target, name);
-		    }
-		    cp += dlen;
-		}
-		if (zptr->z_nscount == 0)
-		    zptr->z_nscount = j;
-		/* get addresses for the nameservers */
-		for (i = 0; i < arcount; i++) {
-		    if ((n = dn_expand(answer, eom, cp, name,
-					sizeof name)) < 0)
-			return (n);
-		    cp += n;
-		    if (cp + 3 * INT16SZ + INT32SZ > eom)
-			return (-1);
-		    GETSHORT(type, cp);
-		    GETSHORT(class, cp);
-		    GETLONG(ttl, cp);
-		    GETSHORT(dlen, cp);
-		    if (cp + dlen > eom)
-			    return (-1);
-		    if (type == T_A && dlen == INT32SZ && class == qclass) {
-			for (j = 0; j < zptr->z_nscount; j++)
-			    if (strcasecmp(name, zptr->z_ns[j].nsname) == 0) {
-				memcpy(&zptr->z_ns[j].nsaddr1.s_addr, cp,
-				       INT32SZ);
-				break;
-			    }
-		    }
-		    cp += dlen;
-		}
-		if (zptr->z_nscount == 0) {
-		    dname = zname;
-		    qtype = T_NS;
-		    continue;
-		}
-		done = 1;
-		for (k = 0; k < zptr->z_nscount; k++)
-		    if (zptr->z_ns[k].nsaddr1.s_addr == 0) {
-			done = 0;
-			dname = zptr->z_ns[k].nsname;
-			qtype = T_A;
-		    }
-
- 	    } /* while */
-	}
-
-	_res.options |= RES_DEBUG;
-	for (zptr = zgrp_start; zptr; zptr = zptr->z_next) {
-
-		/* append zone section */
-		rrecp = res_mkupdrec(ns_s_zn, zptr->z_origin,
-				     zptr->z_class, ns_t_soa, 0);
-		if (rrecp == NULL) {
-			fprintf(stderr, "saverrec error\n");
-			fflush(stderr);
-			return (-1);
-		}
-		rrecp->r_grpnext = zptr->z_rr;
-		zptr->z_rr = rrecp;
-
-		n = res_mkupdate(zptr->z_rr, packet, sizeof packet);
-		if (n < 0) {
-			fprintf(stderr, "res_mkupdate error\n");
-			fflush(stderr);
-			return (-1);
-		} else
-			fprintf(stdout, "res_mkupdate: packet size = %d\n", n);
-
-		/*
-		 * Override the list of NS records from res_init() with
-		 * the authoritative nameservers for the zone being updated.
-		 * Sort primary to be the first in the list of nameservers.
-		 */
-		for (i = 0; i < zptr->z_nscount; i++) {
-			if (strcasecmp(zptr->z_ns[i].nsname,
-				       zptr->z_soardata) == 0) {
-				struct in_addr tmpaddr;
-
-				if (i != 0) {
-					strcpy(zptr->z_ns[i].nsname,
-					       zptr->z_ns[0].nsname);
-					strcpy(zptr->z_ns[0].nsname,
-					       zptr->z_soardata);
-					tmpaddr = zptr->z_ns[i].nsaddr1;
-					zptr->z_ns[i].nsaddr1 =
-						zptr->z_ns[0].nsaddr1;
-					zptr->z_ns[0].nsaddr1 = tmpaddr;
-				}
-				break;
-			}
-		}
-		for (i = 0; i < MAXNS; i++) {
-			_res.nsaddr_list[i].sin_addr = zptr->z_ns[i].nsaddr1;
-			_res.nsaddr_list[i].sin_family = AF_INET;
-			_res.nsaddr_list[i].sin_port = htons(NAMESERVER_PORT);
-		}
-		_res.nscount = (zptr->z_nscount < MAXNS) ? 
-					zptr->z_nscount : MAXNS;
-		n = res_send(packet, n, answer, sizeof(answer));
-		if (n < 0) {
-			fprintf(stderr, "res_send: send error, n=%d\n", n);
-			break;
-		} else
-			numzones++;
-	}
-
-	/* free malloc'ed memory */
-	while(zgrp_start) {
-		zptr = zgrp_start;
-		zgrp_start = zgrp_start->z_next;
-		res_freeupdrec(zptr->z_rr);  /* Zone section we allocated. */
-		free((char *)zptr);
-	}
-
-	return (numzones);
-}
diff --git a/c/src/libnetworking/libc/resolver.3 b/c/src/libnetworking/libc/resolver.3
deleted file mode 100644
index 8c6f18334f..0000000000
--- a/c/src/libnetworking/libc/resolver.3
+++ /dev/null
@@ -1,352 +0,0 @@
-.\" Copyright (c) 1985, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"     @(#)resolver.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
-.\"
-.Dd June 4, 1993
-.Dt RESOLVER 3
-.Os BSD 4.3
-.Sh NAME
-.Nm res_query ,
-.Nm res_search ,
-.Nm res_mkquery ,
-.Nm res_send ,
-.Nm res_init ,
-.Nm dn_comp ,
-.Nm dn_expand
-.Nd resolver routines
-.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <netinet/in.h>
-.Fd #include <arpa/nameser.h>
-.Fd #include <resolv.h>
-.Ft int
-.Fo res_query
-.Fa "const char *dname"
-.Fa "int class"
-.Fa "int type"
-.Fa "u_char *answer"
-.Fa "int anslen"
-.Fc
-.Ft int
-.Fo res_search
-.Fa "const char *dname"
-.Fa "int class"
-.Fa "int type"
-.Fa "u_char *answer"
-.Fa "int anslen"
-.Fc
-.Ft int
-.Fo res_mkquery
-.Fa "int op"
-.Fa "const char *dname"
-.Fa "int class"
-.Fa "int type"
-.Fa "const u_char *data"
-.Fa "int datalen"
-.Fa "const u_char *newrr_in"
-.Fa "u_char *buf"
-.Fa "int buflen"
-.Fc
-.Ft int
-.Fo res_send
-.Fa "const u_char *msg"
-.Fa "int msglen"
-.Fa "u_char *answer"
-.Fa "int anslen"
-.Fc
-.Ft int
-.Fn res_init 
-.Fo dn_comp
-.Fa "const char *exp_dn"
-.Fa "u_char *comp_dn"
-.Fa "int length"
-.Fa "u_char **dnptrs"
-.Fa "u_char **lastdnptr"
-.Fc
-.Ft int
-.Fo dn_expand
-.Fa "const u_char *msg"
-.Fa "const u_char *eomorig"
-.Fa "const u_char *comp_dn"
-.Fa "char *exp_dn"
-.Fa "int length"
-.Fc
-.Sh DESCRIPTION
-These routines are used for making, sending and interpreting
-query and reply messages with Internet domain name servers.
-.Pp
-Global configuration and state information that is used by the
-resolver routines is kept in the structure
-.Em _res .
-Most of the values have reasonable defaults and can be ignored.
-Options
-stored in
-.Em _res.options
-are defined in
-.Pa resolv.h
-and are as follows.
-Options are stored as a simple bit mask containing the bitwise ``or''
-of the options enabled.
-.Bl -tag -width RES_DEFNAMES
-.It Dv RES_INIT
-True if the initial name server address and default domain name are
-initialized (i.e.,
-.Fn res_init
-has been called).
-.It Dv RES_DEBUG
-Print debugging messages.
-.It Dv RES_AAONLY
-Accept authoritative answers only.
-With this option,
-.Fn res_send
-should continue until it finds an authoritative answer or finds an error.
-Currently this is not implemented.
-.It Dv RES_USEVC
-Use
-.Tn TCP
-connections for queries instead of
-.Tn UDP
-datagrams.
-.It Dv RES_STAYOPEN
-Used with
-.Dv RES_USEVC
-to keep the
-.Tn TCP
-connection open between
-queries.
-This is useful only in programs that regularly do many queries.
-.Tn UDP
-should be the normal mode used.
-.It Dv RES_IGNTC
-Unused currently (ignore truncation errors, i.e., don't retry with
-.Tn TCP ) .
-.It Dv RES_RECURSE
-Set the recursion-desired bit in queries.
-This is the default.
-.Pf ( Fn res_send
-does not do iterative queries and expects the name server
-to handle recursion.)
-.It Dv RES_DEFNAMES
-If set,
-.Fn res_search
-will append the default domain name to single-component names
-(those that do not contain a dot).
-This option is enabled by default.
-.It Dv RES_DNSRCH
-If this option is set,
-.Fn res_search
-will search for host names in the current domain and in parent domains; see
-.Xr hostname 7 .
-This is used by the standard host lookup routine
-.Xr gethostbyname 3 .
-This option is enabled by default.
-.It Dv RES_NOALIASES
-This option turns off the user level aliasing feature controlled by the
-.Dq Ev HOSTALIASES
-environment variable.  Network daemons should set this option.
-.El
-.Pp
-The
-.Fn res_init
-routine
-reads the configuration file (if any; see
-.Xr resolver 5 )
-to get the default domain name,
-search list and
-the Internet address of the local name server(s).
-If no server is configured, the host running
-the resolver is tried.
-The current domain name is defined by the hostname
-if not specified in the configuration file;
-it can be overridden by the environment variable
-.Ev LOCALDOMAIN .
-This environment variable may contain several blank-separated
-tokens if you wish to override the
-.Em "search list"
-on a per-process basis.  This is similar to the
-.Em search
-command in the configuration file.
-Another environment variable (
-.Dq Ev RES_OPTIONS
-can be set to
-override certain internal resolver options which are otherwise
-set by changing fields in the
-.Em _res
-structure or are inherited from the configuration file's
-.Em options
-command.  The syntax of the
-.Dq Ev RES_OPTIONS
-environment variable is explained in
-.Xr resolver 5 .
-Initialization normally occurs on the first call
-to one of the following routines.
-.Pp
-The
-.Fn res_query
-function provides an interface to the server query mechanism.
-It constructs a query, sends it to the local server,
-awaits a response, and makes preliminary checks on the reply.
-The query requests information of the specified
-.Fa type
-and
-.Fa class
-for the specified fully-qualified domain name
-.Fa dname .
-The reply message is left in the
-.Fa answer
-buffer with length
-.Fa anslen
-supplied by the caller.
-.Pp
-The
-.Fn res_search
-routine makes a query and awaits a response like
-.Fn res_query ,
-but in addition, it implements the default and search rules
-controlled by the
-.Dv RES_DEFNAMES
-and
-.Dv RES_DNSRCH
-options.
-It returns the first successful reply.
-.Pp
-The remaining routines are lower-level routines used by
-.Fn res_query .
-The
-.Fn res_mkquery
-function
-constructs a standard query message and places it in
-.Fa buf .
-It returns the size of the query, or \-1 if the query is
-larger than
-.Fa buflen .
-The query type
-.Fa op
-is usually
-.Dv QUERY ,
-but can be any of the query types defined in
-.Aq Pa arpa/nameser.h .
-The domain name for the query is given by
-.Fa dname .
-.Fa Newrr
-is currently unused but is intended for making update messages.
-.Pp
-The
-.Fn res_send
-routine
-sends a pre-formatted query and returns an answer.
-It will call
-.Fn res_init
-if
-.Dv RES_INIT
-is not set, send the query to the local name server, and
-handle timeouts and retries.
-The length of the reply message is returned, or
-\-1 if there were errors.
-.Pp
-The
-.Fn dn_comp
-function
-compresses the domain name
-.Fa exp_dn
-and stores it in
-.Fa comp_dn .
-The size of the compressed name is returned or \-1 if there were errors.
-The size of the array pointed to by
-.Fa comp_dn
-is given by
-.Fa length .
-The compression uses
-an array of pointers
-.Fa dnptrs
-to previously-compressed names in the current message.
-The first pointer points to
-to the beginning of the message and the list ends with
-.Dv NULL .
-The limit to the array is specified by
-.Fa lastdnptr .
-A side effect of
-.Fn dn_comp
-is to update the list of pointers for
-labels inserted into the message
-as the name is compressed.
-If
-.Em dnptr
-is
-.Dv NULL, names are not compressed.
-If
-.Fa lastdnptr
-is
-.Dv NULL ,
-the list of labels is not updated.
-.Pp
-The
-.Fn dn_expand
-entry
-expands the compressed domain name
-.Fa comp_dn
-to a full domain name
-The compressed name is contained in a query or reply message;
-.Fa msg
-is a pointer to the beginning of the message.
-The uncompressed name is placed in the buffer indicated by
-.Fa exp_dn
-which is of size
-.Fa length .
-The size of compressed name is returned or \-1 if there was an error.
-.Sh FILES
-.Bl -tag -width Pa
-/etc/resolv.conf
-The configuration file
-see
-.Xr resolver 5 .
-.El
-.Sh SEE ALSO
-.Xr gethostbyname 3 ,
-.Xr resolver 5 ,
-.Xr hostname 7 ,
-.Xr named 8
-.Pp
-.%T RFC1032 ,
-.%T RFC1033 ,
-.%T RFC1034 ,
-.%T RFC1035 ,
-.%T RFC974
-.Rs
-.%T "Name Server Operations Guide for BIND"
-.Re
-.Sh HISTORY
-The
-.Nm
-function appeared in 
-.Bx 4.3 .
diff --git a/c/src/libnetworking/libc/send.c b/c/src/libnetworking/libc/send.c
deleted file mode 100644
index ad14bd3cd2..0000000000
--- a/c/src/libnetworking/libc/send.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *  $Id$
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)send.c	8.2 (Berkeley) 2/21/94";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <stddef.h>
-
-ssize_t
-send(s, msg, len, flags)
-	int s, flags;
-	size_t len;
-	const void *msg;
-{
-	return (sendto(s, msg, len, flags, NULL, 0));
-}
diff --git a/c/src/libnetworking/libc/strsep.c b/c/src/libnetworking/libc/strsep.c
deleted file mode 100644
index 182319493d..0000000000
--- a/c/src/libnetworking/libc/strsep.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *  $Id$
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char sccsid[] = "@(#)strsep.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
-#include <string.h>
-#include <stdio.h>
-
-/*
- * Get next token from string *stringp, where tokens are possibly-empty
- * strings separated by characters from delim.  
- *
- * Writes NULs into the string at *stringp to end tokens.
- * delim need not remain constant from call to call.
- * On return, *stringp points past the last NUL written (if there might
- * be further tokens), or is NULL (if there are definitely no more tokens).
- *
- * If *stringp is NULL, strsep returns NULL.
- *
- * PUBLIC: #ifndef HAVE_STRSEP
- * PUBLIC: char *strsep __P((char **, const char *));
- * PUBLIC: #endif
- */
-char *
-strsep(stringp, delim)
-	register char **stringp;
-	register const char *delim;
-{
-	register char *s;
-	register const char *spanp;
-	register int c, sc;
-	char *tok;
-
-	if ((s = *stringp) == NULL)
-		return (NULL);
-	for (tok = s;;) {
-		c = *s++;
-		spanp = delim;
-		do {
-			if ((sc = *spanp++) == c) {
-				if (c == 0)
-					s = NULL;
-				else
-					s[-1] = 0;
-				*stringp = s;
-				return (tok);
-			}
-		} while (sc != 0);
-	}
-	/* NOTREACHED */
-}
diff --git a/c/src/libnetworking/loop.h b/c/src/libnetworking/loop.h
deleted file mode 100644
index 34e0b828e4..0000000000
--- a/c/src/libnetworking/loop.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
- *  $Id$
- */
-
-#define NLOOP 1
diff --git a/c/src/libnetworking/machine/conf.h b/c/src/libnetworking/machine/conf.h
deleted file mode 100644
index 5a6ee0337b..0000000000
--- a/c/src/libnetworking/machine/conf.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/*
- *  $Id$
- */
-
-/* intentionally empty file */
-
diff --git a/c/src/libnetworking/machine/cpu.h b/c/src/libnetworking/machine/cpu.h
deleted file mode 100644
index 5a6ee0337b..0000000000
--- a/c/src/libnetworking/machine/cpu.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/*
- *  $Id$
- */
-
-/* intentionally empty file */
-
diff --git a/c/src/libnetworking/machine/cpufunc.h b/c/src/libnetworking/machine/cpufunc.h
deleted file mode 100644
index 2b4c47e48f..0000000000
--- a/c/src/libnetworking/machine/cpufunc.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
- *  $Id$
- */
-
-/* intentionally empty file */
diff --git a/c/src/libnetworking/machine/endian.h b/c/src/libnetworking/machine/endian.h
deleted file mode 100644
index 6b17da58d3..0000000000
--- a/c/src/libnetworking/machine/endian.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- *  $Id$
- */
-
-#ifndef _MACHINE_ENDIAN_H_
-#define _MACHINE_ENDIAN_H_
-
-#include <rtems/score/cpu.h>
-
-/*
- * BSD-style endian declaration
- */
-#define BIG_ENDIAN	4321
-#define LITTLE_ENDIAN	1234
-
-#if CPU_BIG_ENDIAN
-# define BYTE_ORDER BIG_ENDIAN
-#elif CPU_LITTLE_ENDIAN
-# define BYTE_ORDER LITTLE_ENDIAN
-#else
-# error "Can't decide which end is which!"
-#endif
-
-#if ( CPU_HAS_OWN_HOST_TO_NETWORK_ROUTINES == FALSE )
-
-#if ( CPU_BIG_ENDIAN == TRUE )
-
-/*
- *  Very simply on big endian CPUs
- */
-
-#define       ntohl(_x)        (_x)
-#define       ntohs(_x)        (_x)
-#define       htonl(_x)        (_x)
-#define       htons(_x)        (_x)
-
-#define NTOHS(x)
-#define HTONS(x)
-#define NTOHL(x)
-#define HTONL(x)
-
-#elif ( CPU_LITTLE_ENDIAN == TRUE )
-
-/*
- *  A little more complicated on little endian CPUs
- */
-
-#define       ntohl(_x)        ((long)  CPU_swap_u32((unsigned32)_x))
-#define       ntohs(_x)        ((short) CPU_swap_u16((unsigned16)_x))
-#define       htonl(_x)        ((long)  CPU_swap_u32((unsigned32)_x))
-#define       htons(_x)        ((short) CPU_swap_u16((unsigned16)_x))
-
-#define NTOHS(x) (x) = ntohs(x)
-#define HTONS(x) (x) = htons(x)
-#define NTOHL(x) (x) = ntohl(x)
-#define HTONL(x) (x) = htonl(x)
-
-#else
-#error "Unknown endian-ness for this cpu"
-#endif
-
-#endif  /* CPU_HAS_OWN_HOST_TO_NETWORK_ROUTINES */
-
-#endif /* _MACHINE_ENDIAN_H_ */
diff --git a/c/src/libnetworking/machine/in_cksum.h b/c/src/libnetworking/machine/in_cksum.h
deleted file mode 100644
index 15509b3888..0000000000
--- a/c/src/libnetworking/machine/in_cksum.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	from tahoe:	in_cksum.c	1.2	86/01/05
- *	from:		@(#)in_cksum.c	1.3 (Berkeley) 1/19/91
- *	from: Id: in_cksum.c,v 1.8 1995/12/03 18:35:19 bde Exp
- *	$Id$
- */
-
-#ifndef _MACHINE_IN_CKSUM_H_
-#define	_MACHINE_IN_CKSUM_H_	1
-
-#include <sys/cdefs.h>
-
-/*
- * It it useful to have an Internet checksum routine which is inlineable
- * and optimized specifically for the task of computing IP header checksums
- * in the normal case (where there are no options and the header length is
- * therefore always exactly five 32-bit words.
- */
-#if (defined(__GNUC__) && defined(__i386__))
-static __inline u_int
-in_cksum_hdr(const struct ip *ip)
-{
-	register u_int sum = 0;
-		    
-#define ADD(n)	__asm("addl " #n "(%2), %0" : "=r" (sum) : "0" (sum), "r" (ip))
-#define ADDC(n)	__asm("adcl " #n "(%2), %0" : "=r" (sum) : "0" (sum), "r" (ip))
-#define MOP	__asm("adcl         $0, %0" : "=r" (sum) : "0" (sum))
-
-	ADD(0);
-	ADDC(4);
-	ADDC(8);
-	ADDC(12);
-	ADDC(16);
-	MOP;
-	sum = (sum & 0xffff) + (sum >> 16);
-	if (sum > 0xffff)
-		sum -= 0xffff;
-
-	return ~sum & 0xffff;
-}
-
-static __inline void
-in_cksum_update(struct ip *ip)
-{
-	int __tmpsum;
-	__tmpsum = (int)ntohs(ip->ip_sum) + 256;
-	ip->ip_sum = htons(__tmpsum + (__tmpsum >> 16));
-}
-
-#elif (defined(__GNUC__) && (defined(__mc68000__) || defined(__m68k__)))
-
-static __inline__ u_int
-in_cksum_hdr(const struct ip *ip)
-{
-	register u_int *ap = (u_int *)ip;
-	register u_int sum = *ap++;
-	register u_int tmp;
-		    
-	__asm__("addl  %2@+,%0\n\t"
-	        "movel %2@+,%1\n\t"
-	        "addxl %1,%0\n\t"
-	        "movel %2@+,%1\n\t"
-	        "addxl %1,%0\n\t"
-	        "movel %2@,%1\n\t"
-	        "addxl %1,%0\n\t"
-	        "moveq #0,%1\n\t"
-	        "addxl %1,%0\n" :
-		"=d" (sum), "=d" (tmp), "=a" (ap) :
-		"0" (sum), "2" (ap));
-	sum = (sum & 0xffff) + (sum >> 16);
-	if (sum > 0xffff)
-		sum -= 0xffff;
-	return ~sum & 0xffff;
-}
-
-#else
-u_int in_cksum_hdr __P((const struct ip *));
-#define	in_cksum_update(ip) \
-	do { \
-		int __tmpsum; \
-		__tmpsum = (int)ntohs(ip->ip_sum) + 256; \
-		ip->ip_sum = htons(__tmpsum + (__tmpsum >> 16)); \
-	} while(0)
-
-#endif
-
-#endif /* _MACHINE_IN_CKSUM_H_ */
diff --git a/c/src/libnetworking/machine/limits.h b/c/src/libnetworking/machine/limits.h
deleted file mode 100644
index 5a6ee0337b..0000000000
--- a/c/src/libnetworking/machine/limits.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/*
- *  $Id$
- */
-
-/* intentionally empty file */
-
diff --git a/c/src/libnetworking/machine/param.h b/c/src/libnetworking/machine/param.h
deleted file mode 100644
index 4168f1f6cf..0000000000
--- a/c/src/libnetworking/machine/param.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- *  $Id$
- */
-
-#ifndef _MACHINE_PARAM_H_
-#define	_MACHINE_PARAM_H_
-
-/*
- * These aren't really machine-dependent for RTEMS.....
- */
-
-/*
-#define MACHINE		"i386"
-#define MID_MACHINE	MID_I386
-*/
-
-/*
- * Round p (pointer or byte index) up to a correctly-aligned value
- * for all data types (int, long, ...).   The result is unsigned int
- * and must be cast to any desired pointer type.
- */
-#define ALIGNBYTES	(sizeof(int) - 1)
-#define ALIGN(p)	(((unsigned)(p) + ALIGNBYTES) & ~ALIGNBYTES)
-
-#define PAGE_SHIFT	12		/* LOG2(PAGE_SIZE) */
-#define PAGE_SIZE	(1<<PAGE_SHIFT)	/* bytes/page */
-#define PAGE_MASK	(PAGE_SIZE-1)
-#define NPTEPG		(PAGE_SIZE/(sizeof (pt_entry_t)))
-
-#define NPDEPG		(PAGE_SIZE/(sizeof (pd_entry_t)))
-#define PDRSHIFT	22		/* LOG2(NBPDR) */
-#define NBPDR		(1<<PDRSHIFT)	/* bytes/page dir */
-
-#define DEV_BSHIFT	9		/* log2(DEV_BSIZE) */
-#define DEV_BSIZE	(1<<DEV_BSHIFT)
-
-#define BLKDEV_IOSIZE	2048
-#define MAXPHYS		(64 * 1024)	/* max raw I/O transfer size */
-
-#define UPAGES	2		/* pages of u-area */
-
-/*
- * Constants related to network buffer management.
- * MCLBYTES must be no larger than CLBYTES (the software page size), and,
- * on machines that exchange pages of input or output buffers with mbuf
- * clusters (MAPPED_MBUFS), MCLBYTES must also be an integral multiple
- * of the hardware page size.
- */
-#ifndef	MSIZE
-#define MSIZE		128		/* size of an mbuf */
-#endif	/* MSIZE */
-
-#ifndef	MCLSHIFT
-#define MCLSHIFT	11		/* convert bytes to m_buf clusters */
-#endif	/* MCLSHIFT */
-#define MCLBYTES	(1 << MCLSHIFT)	/* size of an m_buf cluster */
-#define MCLOFSET	(MCLBYTES - 1)	/* offset within an m_buf cluster */
-
-/*
- * Some macros for units conversion
- */
-
-/* clicks to bytes */
-#define ctob(x)	((x)<<PAGE_SHIFT)
-
-/* bytes to clicks */
-#define btoc(x)	(((unsigned)(x)+PAGE_MASK)>>PAGE_SHIFT)
-
-/*
- * btodb() is messy and perhaps slow because `bytes' may be an off_t.  We
- * want to shift an unsigned type to avoid sign extension and we don't
- * want to widen `bytes' unnecessarily.  Assume that the result fits in
- * a daddr_t.
- */
-#define btodb(bytes)	 		/* calculates (bytes / DEV_BSIZE) */ \
-	(sizeof (bytes) > sizeof(long) \
-	 ? (daddr_t)((unsigned long long)(bytes) >> DEV_BSHIFT) \
-	 : (daddr_t)((unsigned long)(bytes) >> DEV_BSHIFT))
-
-#define dbtob(db)			/* calculates (db * DEV_BSIZE) */ \
-	((off_t)(db) << DEV_BSHIFT)
-
-/*
- * Mach derived conversion macros
- */
-#define trunc_page(x)		((unsigned)(x) & ~PAGE_MASK)
-#define round_page(x)		((((unsigned)(x)) + PAGE_MASK) & ~PAGE_MASK)
-
-#define atop(x)			((unsigned)(x) >> PAGE_SHIFT)
-#define ptoa(x)			((unsigned)(x) << PAGE_SHIFT)
-
-#endif /* !_MACHINE_PARAM_H_ */
diff --git a/c/src/libnetworking/machine/types.h b/c/src/libnetworking/machine/types.h
deleted file mode 100644
index 730a6dec1d..0000000000
--- a/c/src/libnetworking/machine/types.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * This file will have to be incorparated into the RTEMS source
- * tree (probably in the existing <machine/types.h> so that these
- * contents are included when an application source file includes
- * <sys/types.h>.
- *
- *  $Id$
- */
-
-#ifndef _MACHINE_TYPES_H_
-#define _MACHINE_TYPES_H_
-
-#include <rtems.h>
-#include <machine/endian.h>
-
-typedef rtems_signed64		int64_t;
-typedef rtems_signed32		int32_t;
-typedef rtems_signed16		int16_t;
-typedef rtems_signed8		int8_t;
-
-typedef rtems_unsigned64	u_int64_t;
-typedef rtems_unsigned32	u_int32_t;
-typedef rtems_unsigned16	u_int16_t;
-typedef rtems_unsigned8		u_int8_t;
-
-#define	_CLOCK_T_	unsigned long
-#define	_TIME_T_	long
-
-#ifdef _COMPILING_BSD_KERNEL_
-#include <rtems/rtems_bsdnet_internal.h>
-#include <rtems/rtems_bsdnet.h>
-#endif
-
-#endif /* _MACHINE_TYPES_H_ */
diff --git a/c/src/libnetworking/machine/vmparam.h b/c/src/libnetworking/machine/vmparam.h
deleted file mode 100644
index 5a6ee0337b..0000000000
--- a/c/src/libnetworking/machine/vmparam.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/*
- *  $Id$
- */
-
-/* intentionally empty file */
-
diff --git a/c/src/libnetworking/net/Makefile.in b/c/src/libnetworking/net/Makefile.in
deleted file mode 100644
index 5a68c81ec0..0000000000
--- a/c/src/libnetworking/net/Makefile.in
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-LIBNAME=lib.a
-LIB=${ARCH}/${LIBNAME}
-
-# C and C++ source names, if any, go here -- minus the .c or .cc
-C_PIECES=if if_ethersubr if_loop \
-        radix route rtsock \
-        raw_cb raw_usrreq
-C_FILES=$(C_PIECES:%=%.c)
-C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
-
-SRCS=$(C_FILES)
-OBJS=$(C_O_FILES)
-
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/lib.cfg
-
-#
-# Add local stuff here using +=
-#
-
-DEFINES  += -D_COMPILING_BSD_KERNEL_ -DKERNEL -DINET -DNFS \
-    -DDIAGNOSTIC -DBOOTP_COMPAT
-CPPFLAGS +=
-CFLAGS   +=
-
-#
-# Add your list of files to delete here.  The config files
-#  already know how to delete some stuff, so you may want
-#  to just run 'make clean' first to see what gets missed.
-#  'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS += $(LIB)
-CLOBBER_ADDITIONS +=
-
-all:	${ARCH} $(LIB)
-
-$(LIB): $(SRCS) ${OBJS}
-	$(make-library)
diff --git a/c/src/libnetworking/net/bpf.h b/c/src/libnetworking/net/bpf.h
deleted file mode 100644
index 7847d72470..0000000000
--- a/c/src/libnetworking/net/bpf.h
+++ /dev/null
@@ -1,236 +0,0 @@
-/*
- * Copyright (c) 1990, 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from the Stanford/CMU enet packet filter,
- * (net/enet.c) distributed as part of 4.3BSD, and code contributed
- * to Berkeley by Steven McCanne and Van Jacobson both of Lawrence
- * Berkeley Laboratory.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *      @(#)bpf.h	8.1 (Berkeley) 6/10/93
- *	@(#)bpf.h	1.34 (LBL)     6/16/96
- *
- * $Id$
- */
-
-#ifndef _NET_BPF_H_
-#define _NET_BPF_H_
-
-/* BSD style release date */
-#define	BPF_RELEASE 199606
-
-typedef	int32_t	  bpf_int32;
-typedef	u_int32_t bpf_u_int32;
-
-/*
- * Alignment macros.  BPF_WORDALIGN rounds up to the next
- * even multiple of BPF_ALIGNMENT.
- */
-#define BPF_ALIGNMENT sizeof(bpf_int32)
-#define BPF_WORDALIGN(x) (((x)+(BPF_ALIGNMENT-1))&~(BPF_ALIGNMENT-1))
-
-#define BPF_MAXINSNS 512
-#define BPF_MAXBUFSIZE 0x8000
-#define BPF_MINBUFSIZE 32
-
-/*
- *  Structure for BIOCSETF.
- */
-struct bpf_program {
-	u_int bf_len;
-	struct bpf_insn *bf_insns;
-};
-
-/*
- * Struct returned by BIOCGSTATS.
- */
-struct bpf_stat {
-	u_int bs_recv;		/* number of packets received */
-	u_int bs_drop;		/* number of packets dropped */
-};
-
-/*
- * Struct return by BIOCVERSION.  This represents the version number of
- * the filter language described by the instruction encodings below.
- * bpf understands a program iff kernel_major == filter_major &&
- * kernel_minor >= filter_minor, that is, if the value returned by the
- * running kernel has the same major number and a minor number equal
- * equal to or less than the filter being downloaded.  Otherwise, the
- * results are undefined, meaning an error may be returned or packets
- * may be accepted haphazardly.
- * It has nothing to do with the source code version.
- */
-struct bpf_version {
-	u_short bv_major;
-	u_short bv_minor;
-};
-/* Current version number of filter architecture. */
-#define BPF_MAJOR_VERSION 1
-#define BPF_MINOR_VERSION 1
-
-#define	BIOCGBLEN	_IOR('B',102, u_int)
-#define	BIOCSBLEN	_IOWR('B',102, u_int)
-#define	BIOCSETF	_IOW('B',103, struct bpf_program)
-#define	BIOCFLUSH	_IO('B',104)
-#define BIOCPROMISC	_IO('B',105)
-#define	BIOCGDLT	_IOR('B',106, u_int)
-#define BIOCGETIF	_IOR('B',107, struct ifreq)
-#define BIOCSETIF	_IOW('B',108, struct ifreq)
-#define BIOCSRTIMEOUT	_IOW('B',109, struct timeval)
-#define BIOCGRTIMEOUT	_IOR('B',110, struct timeval)
-#define BIOCGSTATS	_IOR('B',111, struct bpf_stat)
-#define BIOCIMMEDIATE	_IOW('B',112, u_int)
-#define BIOCVERSION	_IOR('B',113, struct bpf_version)
-#define BIOCGRSIG	_IOR('B',114, u_int)
-#define BIOCSRSIG	_IOW('B',115, u_int)
-
-/*
- * Structure prepended to each packet.
- */
-struct bpf_hdr {
-	struct timeval	bh_tstamp;	/* time stamp */
-	bpf_u_int32	bh_caplen;	/* length of captured portion */
-	bpf_u_int32	bh_datalen;	/* original length of packet */
-	u_short		bh_hdrlen;	/* length of bpf header (this struct
-					   plus alignment padding) */
-};
-/*
- * Because the structure above is not a multiple of 4 bytes, some compilers
- * will insist on inserting padding; hence, sizeof(struct bpf_hdr) won't work.
- * Only the kernel needs to know about it; applications use bh_hdrlen.
- */
-#ifdef KERNEL
-#define SIZEOF_BPF_HDR 18
-#endif
-
-/*
- * Data-link level type codes.
- */
-#define DLT_NULL	0	/* no link-layer encapsulation */
-#define DLT_EN10MB	1	/* Ethernet (10Mb) */
-#define DLT_EN3MB	2	/* Experimental Ethernet (3Mb) */
-#define DLT_AX25	3	/* Amateur Radio AX.25 */
-#define DLT_PRONET	4	/* Proteon ProNET Token Ring */
-#define DLT_CHAOS	5	/* Chaos */
-#define DLT_IEEE802	6	/* IEEE 802 Networks */
-#define DLT_ARCNET	7	/* ARCNET */
-#define DLT_SLIP	8	/* Serial Line IP */
-#define DLT_PPP		9	/* Point-to-point Protocol */
-#define DLT_FDDI	10	/* FDDI */
-#define DLT_ATM_RFC1483	11	/* LLC/SNAP encapsulated atm */
-
-/*
- * The instruction encodings.
- */
-/* instruction classes */
-#define BPF_CLASS(code) ((code) & 0x07)
-#define		BPF_LD		0x00
-#define		BPF_LDX		0x01
-#define		BPF_ST		0x02
-#define		BPF_STX		0x03
-#define		BPF_ALU		0x04
-#define		BPF_JMP		0x05
-#define		BPF_RET		0x06
-#define		BPF_MISC	0x07
-
-/* ld/ldx fields */
-#define BPF_SIZE(code)	((code) & 0x18)
-#define		BPF_W		0x00
-#define		BPF_H		0x08
-#define		BPF_B		0x10
-#define BPF_MODE(code)	((code) & 0xe0)
-#define		BPF_IMM 	0x00
-#define		BPF_ABS		0x20
-#define		BPF_IND		0x40
-#define		BPF_MEM		0x60
-#define		BPF_LEN		0x80
-#define		BPF_MSH		0xa0
-
-/* alu/jmp fields */
-#define BPF_OP(code)	((code) & 0xf0)
-#define		BPF_ADD		0x00
-#define		BPF_SUB		0x10
-#define		BPF_MUL		0x20
-#define		BPF_DIV		0x30
-#define		BPF_OR		0x40
-#define		BPF_AND		0x50
-#define		BPF_LSH		0x60
-#define		BPF_RSH		0x70
-#define		BPF_NEG		0x80
-#define		BPF_JA		0x00
-#define		BPF_JEQ		0x10
-#define		BPF_JGT		0x20
-#define		BPF_JGE		0x30
-#define		BPF_JSET	0x40
-#define BPF_SRC(code)	((code) & 0x08)
-#define		BPF_K		0x00
-#define		BPF_X		0x08
-
-/* ret - BPF_K and BPF_X also apply */
-#define BPF_RVAL(code)	((code) & 0x18)
-#define		BPF_A		0x10
-
-/* misc */
-#define BPF_MISCOP(code) ((code) & 0xf8)
-#define		BPF_TAX		0x00
-#define		BPF_TXA		0x80
-
-/*
- * The instruction data structure.
- */
-struct bpf_insn {
-	u_short		code;
-	u_char		jt;
-	u_char		jf;
-	bpf_u_int32	k;
-};
-
-/*
- * Macros for insn array initializers.
- */
-#define BPF_STMT(code, k) { (u_short)(code), 0, 0, k }
-#define BPF_JUMP(code, k, jt, jf) { (u_short)(code), jt, jf, k }
-
-#ifdef KERNEL
-int	 bpf_validate __P((struct bpf_insn *, int));
-void	 bpf_tap __P((struct ifnet *, u_char *, u_int));
-void	 bpf_mtap __P((struct ifnet *, struct mbuf *));
-void	 bpfattach __P((struct ifnet *, u_int, u_int));
-void	 bpfilterattach __P((int));
-u_int	 bpf_filter __P((struct bpf_insn *, u_char *, u_int, u_int));
-#endif
-
-/*
- * Number of scratch memory words (for BPF_LD|BPF_MEM and BPF_ST).
- */
-#define BPF_MEMWORDS 16
-
-#endif
diff --git a/c/src/libnetworking/net/ethernet.h b/c/src/libnetworking/net/ethernet.h
deleted file mode 100644
index c6c07189ec..0000000000
--- a/c/src/libnetworking/net/ethernet.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Fundamental constants relating to ethernet.
- *
- * $Id$
- *
- */
-
-#ifndef _NET_ETHERNET_H_
-#define _NET_ETHERNET_H_
-
-/*
- * The number of bytes in an ethernet (MAC) address.
- */
-#define	ETHER_ADDR_LEN		6
-
-/*
- * The number of bytes in the type field.
- */
-#define	ETHER_TYPE_LEN		2
-
-/*
- * The number of bytes in the trailing CRC field.
- */
-#define	ETHER_CRC_LEN		4
-
-/*
- * The length of the combined header.
- */
-#define	ETHER_HDR_LEN		(ETHER_ADDR_LEN*2+ETHER_TYPE_LEN)
-
-/*
- * The minimum packet length.
- */
-#define	ETHER_MIN_LEN		64
-
-/*
- * The maximum packet length.
- */
-#define	ETHER_MAX_LEN		1518
-
-/*
- * A macro to validate a length with
- */
-#define	ETHER_IS_VALID_LEN(foo)	\
-	((foo) >= ETHER_MIN_LEN && (foo) <= ETHER_MAX_LEN)
-
-/*
- * Structure of a 10Mb/s Ethernet header.
- */
-struct	ether_header {
-	u_char	ether_dhost[ETHER_ADDR_LEN];
-	u_char	ether_shost[ETHER_ADDR_LEN];
-	u_short	ether_type;
-};
-
-/*
- * Structure of a 48-bit Ethernet address.
- */
-struct	ether_addr {
-	u_char octet[ETHER_ADDR_LEN];
-};
-
-#endif
diff --git a/c/src/libnetworking/net/if.c b/c/src/libnetworking/net/if.c
deleted file mode 100644
index af6f003de3..0000000000
--- a/c/src/libnetworking/net/if.c
+++ /dev/null
@@ -1,783 +0,0 @@
-/*
- * Copyright (c) 1980, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)if.c	8.3 (Berkeley) 1/4/94
- * $Id$
- */
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/mbuf.h>
-#include <sys/systm.h>
-#include <sys/proc.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/protosw.h>
-#include <sys/kernel.h>
-#include <sys/ioctl.h>
-#include <sys/errno.h>
-#include <sys/syslog.h>
-#include <sys/sysctl.h>
-
-#include <net/if.h>
-#include <net/if_dl.h>
-#include <net/if_types.h>
-#include <net/radix.h>
-
-/*
- * System initialization
- */
-
-static int ifconf __P((int, caddr_t));
-       void ifinit __P((void *));
-static void if_qflush __P((struct ifqueue *));
-static void if_slowtimo __P((void *));
-static void link_rtrequest __P((int, struct rtentry *, struct sockaddr *));
-
-SYSINIT(interfaces, SI_SUB_PROTO_IF, SI_ORDER_FIRST, ifinit, NULL)
-
-
-int	ifqmaxlen = IFQ_MAXLEN;
-struct	ifnet *ifnet;
-
-/*
- * Network interface utility routines.
- *
- * Routines with ifa_ifwith* names take sockaddr *'s as
- * parameters.
- *
- * This routine assumes that it will be called at splimp() or higher.
- */
-/* ARGSUSED*/
-void
-ifinit(dummy)
-	void *dummy;
-{
-	register struct ifnet *ifp;
-
-	for (ifp = ifnet; ifp; ifp = ifp->if_next)
-		if (ifp->if_snd.ifq_maxlen == 0)
-			ifp->if_snd.ifq_maxlen = ifqmaxlen;
-	if_slowtimo(0);
-}
-
-int if_index = 0;
-struct ifaddr **ifnet_addrs;
-
-
-/*
- * Attach an interface to the
- * list of "active" interfaces.
- */
-void
-if_attach(ifp)
-	struct ifnet *ifp;
-{
-	unsigned socksize, ifasize;
-	int namelen, masklen;
-	char workbuf[64];
-	register struct ifnet **p = &ifnet;
-	register struct sockaddr_dl *sdl;
-	register struct ifaddr *ifa;
-	static int if_indexlim = 8;
-
-
-	while (*p)
-		p = &((*p)->if_next);
-	*p = ifp;
-	ifp->if_index = ++if_index;
-	microtime(&ifp->if_lastchange);
-	if (ifnet_addrs == 0 || if_index >= if_indexlim) {
-		unsigned n = (if_indexlim <<= 1) * sizeof(ifa);
-		struct ifaddr **q = (struct ifaddr **)
-					malloc(n, M_IFADDR, M_WAITOK);
-		bzero((caddr_t)q, n);
-		if (ifnet_addrs) {
-			bcopy((caddr_t)ifnet_addrs, (caddr_t)q, n/2);
-			free((caddr_t)ifnet_addrs, M_IFADDR);
-		}
-		ifnet_addrs = q;
-	}
-	/*
-	 * create a Link Level name for this device
-	 */
-	namelen = sprintf(workbuf, "%s%d", ifp->if_name, ifp->if_unit);
-#define _offsetof(t, m) ((int)((caddr_t)&((t *)0)->m))
-	masklen = _offsetof(struct sockaddr_dl, sdl_data[0]) + namelen;
-	socksize = masklen + ifp->if_addrlen;
-#define ROUNDUP(a) (1 + (((a) - 1) | (sizeof(long) - 1)))
-	socksize = ROUNDUP(socksize);
-	if (socksize < sizeof(*sdl))
-		socksize = sizeof(*sdl);
-	ifasize = sizeof(*ifa) + 2 * socksize;
-	ifa = (struct ifaddr *)malloc(ifasize, M_IFADDR, M_WAITOK);
-	if (ifa) {
-		bzero((caddr_t)ifa, ifasize);
-		sdl = (struct sockaddr_dl *)(ifa + 1);
-		sdl->sdl_len = socksize;
-		sdl->sdl_family = AF_LINK;
-		bcopy(workbuf, sdl->sdl_data, namelen);
-		sdl->sdl_nlen = namelen;
-		sdl->sdl_index = ifp->if_index;
-		sdl->sdl_type = ifp->if_type;
-		ifnet_addrs[if_index - 1] = ifa;
-		ifa->ifa_ifp = ifp;
-		ifa->ifa_next = ifp->if_addrlist;
-		ifa->ifa_rtrequest = link_rtrequest;
-		ifp->if_addrlist = ifa;
-		ifa->ifa_addr = (struct sockaddr *)sdl;
-
-		sdl = (struct sockaddr_dl *)(socksize + (caddr_t)sdl);
-		ifa->ifa_netmask = (struct sockaddr *)sdl;
-		sdl->sdl_len = masklen;
-		while (namelen != 0)
-			sdl->sdl_data[--namelen] = 0xff;
-	}
-}
-/*
- * Locate an interface based on a complete address.
- */
-/*ARGSUSED*/
-struct ifaddr *
-ifa_ifwithaddr(addr)
-	register struct sockaddr *addr;
-{
-	register struct ifnet *ifp;
-	register struct ifaddr *ifa;
-
-#define	equal(a1, a2) \
-  (bcmp((caddr_t)(a1), (caddr_t)(a2), ((struct sockaddr *)(a1))->sa_len) == 0)
-	for (ifp = ifnet; ifp; ifp = ifp->if_next)
-	    for (ifa = ifp->if_addrlist; ifa; ifa = ifa->ifa_next) {
-		if (ifa->ifa_addr->sa_family != addr->sa_family)
-			continue;
-		if (equal(addr, ifa->ifa_addr))
-			return (ifa);
-		if ((ifp->if_flags & IFF_BROADCAST) && ifa->ifa_broadaddr &&
-		    equal(ifa->ifa_broadaddr, addr))
-			return (ifa);
-	}
-	return ((struct ifaddr *)0);
-}
-/*
- * Locate the point to point interface with a given destination address.
- */
-/*ARGSUSED*/
-struct ifaddr *
-ifa_ifwithdstaddr(addr)
-	register struct sockaddr *addr;
-{
-	register struct ifnet *ifp;
-	register struct ifaddr *ifa;
-
-	for (ifp = ifnet; ifp; ifp = ifp->if_next)
-	    if (ifp->if_flags & IFF_POINTOPOINT)
-		for (ifa = ifp->if_addrlist; ifa; ifa = ifa->ifa_next) {
-			if (ifa->ifa_addr->sa_family != addr->sa_family)
-				continue;
-			if (ifa->ifa_dstaddr && equal(addr, ifa->ifa_dstaddr))
-				return (ifa);
-	}
-	return ((struct ifaddr *)0);
-}
-
-/*
- * Find an interface on a specific network.  If many, choice
- * is most specific found.
- */
-struct ifaddr *
-ifa_ifwithnet(addr)
-	struct sockaddr *addr;
-{
-	register struct ifnet *ifp;
-	register struct ifaddr *ifa;
-	struct ifaddr *ifa_maybe = (struct ifaddr *) 0;
-	u_int af = addr->sa_family;
-	char *addr_data = addr->sa_data, *cplim;
-
-	if (af == AF_LINK) {
-	    register struct sockaddr_dl *sdl = (struct sockaddr_dl *)addr;
-	    if (sdl->sdl_index && sdl->sdl_index <= if_index)
-		return (ifnet_addrs[sdl->sdl_index - 1]);
-	}
-	for (ifp = ifnet; ifp; ifp = ifp->if_next) {
-		for (ifa = ifp->if_addrlist; ifa; ifa = ifa->ifa_next) {
-			register char *cp, *cp2, *cp3;
-
-			if (ifa->ifa_addr->sa_family != af)
-				next: continue;
-			if (ifp->if_flags & IFF_POINTOPOINT) {
-				if (ifa->ifa_dstaddr != 0
-				    && equal(addr, ifa->ifa_dstaddr))
- 					return (ifa);
-			} else {
-				/*
-				 * if we have a special address handler,
-				 * then use it instead of the generic one.
-				 */
-	          		if (ifa->ifa_claim_addr) {
-					if ((*ifa->ifa_claim_addr)(ifa, addr)) {
-						return (ifa);
-					} else {
-						continue;
-					}
-				}
-
-				/*
-				 * Scan all the bits in the ifa's address.
-				 * If a bit dissagrees with what we are
-				 * looking for, mask it with the netmask
-				 * to see if it really matters.
-				 * (A byte at a time)
-				 */
-				if (ifa->ifa_netmask == 0)
-					continue;
-				cp = addr_data;
-				cp2 = ifa->ifa_addr->sa_data;
-				cp3 = ifa->ifa_netmask->sa_data;
-				cplim = ifa->ifa_netmask->sa_len + (char *)ifa->ifa_netmask;
-				while (cp3 < cplim)
-					if ((*cp++ ^ *cp2++) & *cp3++)
-						goto next;
-				if (ifa_maybe == 0 ||
-				    rn_refines((caddr_t)ifa->ifa_netmask,
-				    (caddr_t)ifa_maybe->ifa_netmask))
-					ifa_maybe = ifa;
-			}
-		}
-	}
-	return (ifa_maybe);
-}
-
-/*
- * Find an interface address specific to an interface best matching
- * a given address.
- */
-struct ifaddr *
-ifaof_ifpforaddr(addr, ifp)
-	struct sockaddr *addr;
-	register struct ifnet *ifp;
-{
-	register struct ifaddr *ifa;
-	register char *cp, *cp2, *cp3;
-	register char *cplim;
-	struct ifaddr *ifa_maybe = 0;
-	u_int af = addr->sa_family;
-
-	if (af >= AF_MAX)
-		return (0);
-	for (ifa = ifp->if_addrlist; ifa; ifa = ifa->ifa_next) {
-		if (ifa->ifa_addr->sa_family != af)
-			continue;
-		if (ifa_maybe == 0)
-			ifa_maybe = ifa;
-		if (ifa->ifa_netmask == 0) {
-			if (equal(addr, ifa->ifa_addr) ||
-			    (ifa->ifa_dstaddr && equal(addr, ifa->ifa_dstaddr)))
-				return (ifa);
-			continue;
-		}
-		if (ifp->if_flags & IFF_POINTOPOINT) {
-			if (equal(addr, ifa->ifa_dstaddr))
-				return (ifa);
-		} else {
-			cp = addr->sa_data;
-			cp2 = ifa->ifa_addr->sa_data;
-			cp3 = ifa->ifa_netmask->sa_data;
-			cplim = ifa->ifa_netmask->sa_len + (char *)ifa->ifa_netmask;
-			for (; cp3 < cplim; cp3++)
-				if ((*cp++ ^ *cp2++) & *cp3)
-					break;
-			if (cp3 == cplim)
-				return (ifa);
-		}
-	}
-	return (ifa_maybe);
-}
-
-#include <net/route.h>
-
-/*
- * Default action when installing a route with a Link Level gateway.
- * Lookup an appropriate real ifa to point to.
- * This should be moved to /sys/net/link.c eventually.
- */
-static void
-link_rtrequest(cmd, rt, sa)
-	int cmd;
-	register struct rtentry *rt;
-	struct sockaddr *sa;
-{
-	register struct ifaddr *ifa;
-	struct sockaddr *dst;
-	struct ifnet *ifp;
-
-	if (cmd != RTM_ADD || ((ifa = rt->rt_ifa) == 0) ||
-	    ((ifp = ifa->ifa_ifp) == 0) || ((dst = rt_key(rt)) == 0))
-		return;
-	ifa = ifaof_ifpforaddr(dst, ifp);
-	if (ifa) {
-		IFAFREE(rt->rt_ifa);
-		rt->rt_ifa = ifa;
-		ifa->ifa_refcnt++;
-		if (ifa->ifa_rtrequest && ifa->ifa_rtrequest != link_rtrequest)
-			ifa->ifa_rtrequest(cmd, rt, sa);
-	}
-}
-
-/*
- * Mark an interface down and notify protocols of
- * the transition.
- * NOTE: must be called at splnet or eqivalent.
- */
-void
-if_down(ifp)
-	register struct ifnet *ifp;
-{
-	register struct ifaddr *ifa;
-
-	ifp->if_flags &= ~IFF_UP;
-	microtime(&ifp->if_lastchange);
-	for (ifa = ifp->if_addrlist; ifa; ifa = ifa->ifa_next)
-		pfctlinput(PRC_IFDOWN, ifa->ifa_addr);
-	if_qflush(&ifp->if_snd);
-	rt_ifmsg(ifp);
-}
-
-/*
- * Mark an interface up and notify protocols of
- * the transition.
- * NOTE: must be called at splnet or eqivalent.
- */
-void
-if_up(ifp)
-	register struct ifnet *ifp;
-{
-
-	ifp->if_flags |= IFF_UP;
-	microtime(&ifp->if_lastchange);
-#ifdef notyet
-	register struct ifaddr *ifa;
-	/* this has no effect on IP, and will kill all iso connections XXX */
-	for (ifa = ifp->if_addrlist; ifa; ifa = ifa->ifa_next)
-		pfctlinput(PRC_IFUP, ifa->ifa_addr);
-#endif
-	rt_ifmsg(ifp);
-}
-
-/*
- * Flush an interface queue.
- */
-static void
-if_qflush(ifq)
-	register struct ifqueue *ifq;
-{
-	register struct mbuf *m, *n;
-
-	n = ifq->ifq_head;
-	while ((m = n) != 0) {
-		n = m->m_act;
-		m_freem(m);
-	}
-	ifq->ifq_head = 0;
-	ifq->ifq_tail = 0;
-	ifq->ifq_len = 0;
-}
-
-/*
- * Handle interface watchdog timer routines.  Called
- * from softclock, we decrement timers (if set) and
- * call the appropriate interface routine on expiration.
- */
-static void
-if_slowtimo(arg)
-	void *arg;
-{
-	register struct ifnet *ifp;
-	int s = splimp();
-
-	for (ifp = ifnet; ifp; ifp = ifp->if_next) {
-		if (ifp->if_timer == 0 || --ifp->if_timer)
-			continue;
-		if (ifp->if_watchdog)
-			(*ifp->if_watchdog)(ifp);
-	}
-	splx(s);
-	timeout(if_slowtimo, (void *)0, hz / IFNET_SLOWHZ);
-}
-
-/*
- * Map interface name to
- * interface structure pointer.
- */
-struct ifnet *
-ifunit(name)
-	register char *name;
-{
-	register char *cp;
-	register struct ifnet *ifp;
-	int unit;
-	unsigned len;
-	char *ep, c;
-
-	for (cp = name; cp < name + IFNAMSIZ && *cp; cp++)
-		if (*cp >= '0' && *cp <= '9')
-			break;
-	if (*cp == '\0' || cp == name + IFNAMSIZ)
-		return ((struct ifnet *)0);
-	/*
-	 * Save first char of unit, and pointer to it,
-	 * so we can put a null there to avoid matching
-	 * initial substrings of interface names.
-	 */
-	len = cp - name + 1;
-	c = *cp;
-	ep = cp;
-	for (unit = 0; *cp >= '0' && *cp <= '9'; )
-		unit = unit * 10 + *cp++ - '0';
-	if (*cp != '\0')
-		return 0;	/* no trailing garbage allowed */
-	*ep = 0;
-	for (ifp = ifnet; ifp; ifp = ifp->if_next) {
-		if (bcmp(ifp->if_name, name, len))
-			continue;
-		if (unit == ifp->if_unit)
-			break;
-	}
-	*ep = c;
-	return (ifp);
-}
-
-/*
- * Interface ioctls.
- */
-int
-ifioctl(so, cmd, data, p)
-	struct socket *so;
-	int cmd;
-	caddr_t data;
-	struct proc *p;
-{
-	register struct ifnet *ifp;
-	register struct ifreq *ifr;
-	int error;
-
-	switch (cmd) {
-
-	case SIOCGIFCONF:
-	case OSIOCGIFCONF:
-		return (ifconf(cmd, data));
-	}
-	ifr = (struct ifreq *)data;
-	ifp = ifunit(ifr->ifr_name);
-	if (ifp == 0)
-		return (ENXIO);
-	switch (cmd) {
-
-	case SIOCGIFFLAGS:
-		ifr->ifr_flags = ifp->if_flags;
-		break;
-
-	case SIOCGIFMETRIC:
-		ifr->ifr_metric = ifp->if_metric;
-		break;
-
-	case SIOCGIFMTU:
-		ifr->ifr_mtu = ifp->if_mtu;
-		break;
-
-	case SIOCGIFPHYS:
-		ifr->ifr_phys = ifp->if_physical;
-		break;
-
-	case SIOCSIFFLAGS:
-		error = suser(p->p_ucred, &p->p_acflag);
-		if (error)
-			return (error);
-		if (ifp->if_flags & IFF_UP && (ifr->ifr_flags & IFF_UP) == 0) {
-			int s = splimp();
-			if_down(ifp);
-			splx(s);
-		}
-		if (ifr->ifr_flags & IFF_UP && (ifp->if_flags & IFF_UP) == 0) {
-			int s = splimp();
-			if_up(ifp);
-			splx(s);
-		}
-		ifp->if_flags = (ifp->if_flags & IFF_CANTCHANGE) |
-			(ifr->ifr_flags &~ IFF_CANTCHANGE);
-		if (ifp->if_ioctl)
-			(void) (*ifp->if_ioctl)(ifp, cmd, data);
-		microtime(&ifp->if_lastchange);
-		break;
-
-	case SIOCSIFMETRIC:
-		error = suser(p->p_ucred, &p->p_acflag);
-		if (error)
-			return (error);
-		ifp->if_metric = ifr->ifr_metric;
-		microtime(&ifp->if_lastchange);
-		break;
-
-	case SIOCSIFPHYS:
-		error = suser(p->p_ucred, &p->p_acflag);
-		if (error)
-			return error;
-		if (!ifp->if_ioctl)
-		        return EOPNOTSUPP;
-		error = (*ifp->if_ioctl)(ifp, cmd, data);
-		if (error == 0)
-			microtime(&ifp->if_lastchange);
-		return(error);
-
-	case SIOCSIFMTU:
-		error = suser(p->p_ucred, &p->p_acflag);
-		if (error)
-			return (error);
-		if (ifp->if_ioctl == NULL)
-			return (EOPNOTSUPP);
-		/*
-		 * 72 was chosen below because it is the size of a TCP/IP
-		 * header (40) + the minimum mss (32).
-		 */
-		if (ifr->ifr_mtu < 72 || ifr->ifr_mtu > 65535)
-			return (EINVAL);
-		error = (*ifp->if_ioctl)(ifp, cmd, data);
-		if (error == 0)
-			microtime(&ifp->if_lastchange);
-		return(error);
-
-	case SIOCADDMULTI:
-	case SIOCDELMULTI:
-		error = suser(p->p_ucred, &p->p_acflag);
-		if (error)
-			return (error);
-		if (ifp->if_ioctl == NULL)
-			return (EOPNOTSUPP);
-		error = (*ifp->if_ioctl)(ifp, cmd, data);
-		if (error == 0 )
-		    	microtime(&ifp->if_lastchange);
-		return(error);
-
-        case SIOCSIFMEDIA:
-		error = suser(p->p_ucred, &p->p_acflag);
-		if (error)
-			return (error);
-		if (ifp->if_ioctl == 0)
-			return (EOPNOTSUPP);
-		error = (*ifp->if_ioctl)(ifp, cmd, data);
-		if (error == 0)
-			microtime(&ifp->if_lastchange);
-		return error;
-
-	case SIOCGIFMEDIA:
-		if (ifp->if_ioctl == 0)
-			return (EOPNOTSUPP);
-		return ((*ifp->if_ioctl)(ifp, cmd, data));
-
-	default:
-		if (so->so_proto == 0)
-			return (EOPNOTSUPP);
-#ifndef COMPAT_43
-		return ((*so->so_proto->pr_usrreqs->pru_control)(so, cmd,
-								 data,
-								 ifp));
-#else
-	    {
-		int ocmd = cmd;
-
-		switch (cmd) {
-
-		case SIOCSIFDSTADDR:
-		case SIOCSIFADDR:
-		case SIOCSIFBRDADDR:
-		case SIOCSIFNETMASK:
-#if BYTE_ORDER != BIG_ENDIAN
-			if (ifr->ifr_addr.sa_family == 0 &&
-			    ifr->ifr_addr.sa_len < 16) {
-				ifr->ifr_addr.sa_family = ifr->ifr_addr.sa_len;
-				ifr->ifr_addr.sa_len = 16;
-			}
-#else
-			if (ifr->ifr_addr.sa_len == 0)
-				ifr->ifr_addr.sa_len = 16;
-#endif
-			break;
-
-		case OSIOCGIFADDR:
-			cmd = SIOCGIFADDR;
-			break;
-
-		case OSIOCGIFDSTADDR:
-			cmd = SIOCGIFDSTADDR;
-			break;
-
-		case OSIOCGIFBRDADDR:
-			cmd = SIOCGIFBRDADDR;
-			break;
-
-		case OSIOCGIFNETMASK:
-			cmd = SIOCGIFNETMASK;
-		}
-		error =  ((*so->so_proto->pr_usrreqs->pru_control)(so,
-								   cmd,
-								   data,
-								   ifp));
-		switch (ocmd) {
-
-		case OSIOCGIFADDR:
-		case OSIOCGIFDSTADDR:
-		case OSIOCGIFBRDADDR:
-		case OSIOCGIFNETMASK:
-			*(u_short *)&ifr->ifr_addr = ifr->ifr_addr.sa_family;
-		}
-		return (error);
-
-	    }
-#endif
-	}
-	return (0);
-}
-
-/*
- * Set/clear promiscuous mode on interface ifp based on the truth value
- * of pswitch.  The calls are reference counted so that only the first
- * "on" request actually has an effect, as does the final "off" request.
- * Results are undefined if the "off" and "on" requests are not matched.
- */
-int
-ifpromisc(ifp, pswitch)
-	struct ifnet *ifp;
-	int pswitch;
-{
-	struct ifreq ifr;
-
-	if (pswitch) {
-		/*
-		 * If the device is not configured up, we cannot put it in
-		 * promiscuous mode.
-		 */
-		if ((ifp->if_flags & IFF_UP) == 0)
-			return (ENETDOWN);
-		if (ifp->if_pcount++ != 0)
-			return (0);
-		ifp->if_flags |= IFF_PROMISC;
-		log(LOG_INFO, "%s%d: promiscuous mode enabled\n",
-		    ifp->if_name, ifp->if_unit);
-	} else {
-		if (--ifp->if_pcount > 0)
-			return (0);
-		ifp->if_flags &= ~IFF_PROMISC;
-	}
-	ifr.ifr_flags = ifp->if_flags;
-	return ((*ifp->if_ioctl)(ifp, SIOCSIFFLAGS, (caddr_t)&ifr));
-}
-
-/*
- * Return interface configuration
- * of system.  List may be used
- * in later ioctl's (above) to get
- * other information.
- */
-/*ARGSUSED*/
-static int
-ifconf(cmd, data)
-	int cmd;
-	caddr_t data;
-{
-	register struct ifconf *ifc = (struct ifconf *)data;
-	register struct ifnet *ifp = ifnet;
-	register struct ifaddr *ifa;
-	struct ifreq ifr, *ifrp;
-	int space = ifc->ifc_len, error = 0;
-
-	ifrp = ifc->ifc_req;
-	for (; space > sizeof (ifr) && ifp; ifp = ifp->if_next) {
-		char workbuf[64];
-		int ifnlen;
-
-		ifnlen = sprintf(workbuf, "%s%d", ifp->if_name, ifp->if_unit);
-		if(ifnlen + 1 > sizeof ifr.ifr_name) {
-			error = ENAMETOOLONG;
-		} else {
-			strcpy(ifr.ifr_name, workbuf);
-		}
-
-		if ((ifa = ifp->if_addrlist) == 0) {
-			bzero((caddr_t)&ifr.ifr_addr, sizeof(ifr.ifr_addr));
-			error = copyout((caddr_t)&ifr, (caddr_t)ifrp,
-			    sizeof (ifr));
-			if (error)
-				break;
-			space -= sizeof (ifr), ifrp++;
-		} else
-		    for ( ; space > sizeof (ifr) && ifa; ifa = ifa->ifa_next) {
-			register struct sockaddr *sa = ifa->ifa_addr;
-#ifdef COMPAT_43
-			if (cmd == OSIOCGIFCONF) {
-				struct osockaddr *osa =
-					 (struct osockaddr *)&ifr.ifr_addr;
-				ifr.ifr_addr = *sa;
-				osa->sa_family = sa->sa_family;
-				error = copyout((caddr_t)&ifr, (caddr_t)ifrp,
-						sizeof (ifr));
-				ifrp++;
-			} else
-#endif
-			if (sa->sa_len <= sizeof(*sa)) {
-				ifr.ifr_addr = *sa;
-				error = copyout((caddr_t)&ifr, (caddr_t)ifrp,
-						sizeof (ifr));
-				ifrp++;
-			} else {
-				space -= sa->sa_len - sizeof(*sa);
-				if (space < sizeof (ifr))
-					break;
-				error = copyout((caddr_t)&ifr, (caddr_t)ifrp,
-						sizeof (ifr.ifr_name));
-				if (error == 0)
-				    error = copyout((caddr_t)sa,
-				      (caddr_t)&ifrp->ifr_addr, sa->sa_len);
-				ifrp = (struct ifreq *)
-					(sa->sa_len + (caddr_t)&ifrp->ifr_addr);
-			}
-			if (error)
-				break;
-			space -= sizeof (ifr);
-		}
-	}
-	ifc->ifc_len -= space;
-	return (error);
-}
-
-SYSCTL_NODE(_net, PF_LINK, link, CTLFLAG_RW, 0, "Link layers");
-SYSCTL_NODE(_net_link, 0, generic, CTLFLAG_RW, 0, "Generic link-management");
diff --git a/c/src/libnetworking/net/if.h b/c/src/libnetworking/net/if.h
deleted file mode 100644
index acddd4f095..0000000000
--- a/c/src/libnetworking/net/if.h
+++ /dev/null
@@ -1,467 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)if.h	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#ifndef _NET_IF_H_
-#define	_NET_IF_H_
-
-/*
- * Structures defining a network interface, providing a packet
- * transport mechanism (ala level 0 of the PUP protocols).
- *
- * Each interface accepts output datagrams of a specified maximum
- * length, and provides higher level routines with input datagrams
- * received from its medium.
- *
- * Output occurs when the routine if_output is called, with three parameters:
- *	(*ifp->if_output)(ifp, m, dst, rt)
- * Here m is the mbuf chain to be sent and dst is the destination address.
- * The output routine encapsulates the supplied datagram if necessary,
- * and then transmits it on its medium.
- *
- * On input, each interface unwraps the data received by it, and either
- * places it on the input queue of a internetwork datagram routine
- * and posts the associated software interrupt, or passes the datagram to a raw
- * packet input routine.
- *
- * Routines exist for locating interfaces by their addresses
- * or for locating a interface on a certain network, as well as more general
- * routing and gateway routines maintaining information used to locate
- * interfaces.  These routines live in the files if.c and route.c
- */
-
-#ifndef _TIME_ /*  XXX fast fix for SNMP, going away soon */
-#include <sys/time.h>
-#endif
-
-#ifdef __STDC__
-/*
- * Forward structure declarations for function prototypes [sic].
- */
-struct	mbuf;
-struct	proc;
-struct	rtentry;
-struct	socket;
-struct	ether_header;
-#endif
-
-/*
- * Structure describing information about an interface
- * which may be of interest to management entities.
- */
-struct if_data {
-	/* generic interface information */
-	u_char	ifi_type;		/* ethernet, tokenring, etc */
-	u_char	ifi_physical;		/* e.g., AUI, Thinnet, 10base-T, etc */
-	u_char	ifi_addrlen;		/* media address length */
-	u_char	ifi_hdrlen;		/* media header length */
-	u_char	ifi_recvquota;		/* polling quota for receive intrs */
-	u_char	ifi_xmitquota;		/* polling quota for xmit intrs */
-	u_long	ifi_mtu;		/* maximum transmission unit */
-	u_long	ifi_metric;		/* routing metric (external only) */
-	u_long	ifi_baudrate;		/* linespeed */
-	/* volatile statistics */
-	u_long	ifi_ipackets;		/* packets received on interface */
-	u_long	ifi_ierrors;		/* input errors on interface */
-	u_long	ifi_opackets;		/* packets sent on interface */
-	u_long	ifi_oerrors;		/* output errors on interface */
-	u_long	ifi_collisions;		/* collisions on csma interfaces */
-	u_long	ifi_ibytes;		/* total number of octets received */
-	u_long	ifi_obytes;		/* total number of octets sent */
-	u_long	ifi_imcasts;		/* packets received via multicast */
-	u_long	ifi_omcasts;		/* packets sent via multicast */
-	u_long	ifi_iqdrops;		/* dropped on input, this interface */
-	u_long	ifi_noproto;		/* destined for unsupported protocol */
-	u_long	ifi_recvtiming;		/* usec spent receiving when timing */
-	u_long	ifi_xmittiming;		/* usec spent xmitting when timing */
-	struct	timeval ifi_lastchange;	/* time of last administrative change */
-};
-
-/*
- * Structure defining a queue for a network interface.
- */
-struct	ifqueue {
-	struct	mbuf *ifq_head;
-	struct	mbuf *ifq_tail;
-	int	ifq_len;
-	int	ifq_maxlen;
-	int	ifq_drops;
-};
-
-/*
- * Structure defining a network interface.
- *
- * (Would like to call this struct ``if'', but C isn't PL/1.)
- */
-struct ifnet {
-	void	*if_softc;		/* pointer to driver state */
-	char	*if_name;		/* name, e.g. ``en'' or ``lo'' */
-	struct	ifnet *if_next;		/* all struct ifnets are chained */
-	struct	ifaddr *if_addrlist;	/* linked list of addresses per if */
-        int	if_pcount;		/* number of promiscuous listeners */
-	struct	bpf_if *if_bpf;		/* packet filter structure */
-	u_short	if_index;		/* numeric abbreviation for this if  */
-	short	if_unit;		/* sub-unit for lower level driver */
-	short	if_timer;		/* time 'til if_watchdog called */
-	short	if_flags;		/* up/down, broadcast, etc. */
-	int	if_ipending;		/* interrupts pending */
-	void	*if_linkmib;		/* link-type-specific MIB data */
-	size_t	if_linkmiblen;		/* length of above data */
-	struct	if_data if_data;
-/* procedure handles */
-	int	(*if_output)		/* output routine (enqueue) */
-		__P((struct ifnet *, struct mbuf *, struct sockaddr *,
-		     struct rtentry *));
-	void	(*if_start)		/* initiate output routine */
-		__P((struct ifnet *));
-	int	(*if_done)		/* output complete routine */
-		__P((struct ifnet *));	/* (XXX not used; fake prototype) */
-	int	(*if_ioctl)		/* ioctl routine */
-		__P((struct ifnet *, int, caddr_t));
-	void	(*if_watchdog)		/* timer routine */
-		__P((struct ifnet *));
-	int	(*if_poll_recv)		/* polled receive routine */
-		__P((struct ifnet *, int *));
-	int	(*if_poll_xmit)		/* polled transmit routine */
-		__P((struct ifnet *, int *));
-	void	(*if_poll_intren)	/* polled interrupt reenable routine */
-		__P((struct ifnet *));
-	void	(*if_poll_slowinput)	/* input routine for slow devices */
-		__P((struct ifnet *, struct mbuf *));
-	void	(*if_init)		/* Init routine */
-		__P((void *));
-	struct	ifqueue if_snd;		/* output queue */
-	struct	ifqueue *if_poll_slowq;	/* input queue for slow devices */
-};
-typedef void if_init_f_t __P((void *));       
-
-#define	if_mtu		if_data.ifi_mtu
-#define	if_type		if_data.ifi_type
-#define if_physical	if_data.ifi_physical
-#define	if_addrlen	if_data.ifi_addrlen
-#define	if_hdrlen	if_data.ifi_hdrlen
-#define	if_metric	if_data.ifi_metric
-#define	if_baudrate	if_data.ifi_baudrate
-#define	if_ipackets	if_data.ifi_ipackets
-#define	if_ierrors	if_data.ifi_ierrors
-#define	if_opackets	if_data.ifi_opackets
-#define	if_oerrors	if_data.ifi_oerrors
-#define	if_collisions	if_data.ifi_collisions
-#define	if_ibytes	if_data.ifi_ibytes
-#define	if_obytes	if_data.ifi_obytes
-#define	if_imcasts	if_data.ifi_imcasts
-#define	if_omcasts	if_data.ifi_omcasts
-#define	if_iqdrops	if_data.ifi_iqdrops
-#define	if_noproto	if_data.ifi_noproto
-#define	if_lastchange	if_data.ifi_lastchange
-#define if_recvquota	if_data.ifi_recvquota
-#define	if_xmitquota	if_data.ifi_xmitquota
-#define if_rawoutput(if, m, sa) if_output(if, m, sa, (struct rtentry *)0)
-
-#define	IFF_UP		0x1		/* interface is up */
-#define	IFF_BROADCAST	0x2		/* broadcast address valid */
-#define	IFF_DEBUG	0x4		/* turn on debugging */
-#define	IFF_LOOPBACK	0x8		/* is a loopback net */
-#define	IFF_POINTOPOINT	0x10		/* interface is point-to-point link */
-/*#define IFF_NOTRAILERS 0x20		 * obsolete: avoid use of trailers */
-#define	IFF_RUNNING	0x40		/* resources allocated */
-#define	IFF_NOARP	0x80		/* no address resolution protocol */
-#define	IFF_PROMISC	0x100		/* receive all packets */
-#define	IFF_ALLMULTI	0x200		/* receive all multicast packets */
-#define	IFF_OACTIVE	0x400		/* transmission in progress */
-#define	IFF_SIMPLEX	0x800		/* can't hear own transmissions */
-#define	IFF_LINK0	0x1000		/* per link layer defined bit */
-#define	IFF_LINK1	0x2000		/* per link layer defined bit */
-#define	IFF_LINK2	0x4000		/* per link layer defined bit */
-#define	IFF_ALTPHYS	IFF_LINK2	/* use alternate physical connection */
-#define	IFF_MULTICAST	0x8000		/* supports multicast */
-
-/* flags set internally only: */
-#define	IFF_CANTCHANGE \
-	(IFF_BROADCAST|IFF_POINTOPOINT|IFF_RUNNING|IFF_OACTIVE|\
-	    IFF_SIMPLEX|IFF_MULTICAST|IFF_ALLMULTI)
-
-
-/*
- * These really don't belong here, but there's no other obviously appropriate
- * location.
- */
-#define IFP_AUI		0
-#define IFP_10BASE2	1
-#define IFP_10BASET	2
-/* etc. */
-
-/*
- * Bit values in if_ipending
- */
-#define	IFI_RECV	1	/* I want to receive */
-#define	IFI_XMIT	2	/* I want to transmit */
-
-/*
- * Output queues (ifp->if_snd) and slow device input queues (*ifp->if_slowq)
- * are queues of messages stored on ifqueue structures
- * (defined above).  Entries are added to and deleted from these structures
- * by these macros, which should be called with ipl raised to splimp().
- */
-#define	IF_QFULL(ifq)		((ifq)->ifq_len >= (ifq)->ifq_maxlen)
-#define	IF_DROP(ifq)		((ifq)->ifq_drops++)
-#define	IF_ENQUEUE(ifq, m) { \
-	(m)->m_nextpkt = 0; \
-	if ((ifq)->ifq_tail == 0) \
-		(ifq)->ifq_head = m; \
-	else \
-		(ifq)->ifq_tail->m_nextpkt = m; \
-	(ifq)->ifq_tail = m; \
-	(ifq)->ifq_len++; \
-}
-#define	IF_PREPEND(ifq, m) { \
-	(m)->m_nextpkt = (ifq)->ifq_head; \
-	if ((ifq)->ifq_tail == 0) \
-		(ifq)->ifq_tail = (m); \
-	(ifq)->ifq_head = (m); \
-	(ifq)->ifq_len++; \
-}
-#define	IF_DEQUEUE(ifq, m) { \
-	(m) = (ifq)->ifq_head; \
-	if (m) { \
-		if (((ifq)->ifq_head = (m)->m_nextpkt) == 0) \
-			(ifq)->ifq_tail = 0; \
-		(m)->m_nextpkt = 0; \
-		(ifq)->ifq_len--; \
-	} \
-}
-
-#ifdef KERNEL
-#define	IF_ENQ_DROP(ifq, m)	if_enq_drop(ifq, m)
-
-#if defined(__GNUC__) && defined(MT_HEADER)
-static inline int
-if_queue_drop(struct ifqueue *ifq, struct mbuf *m)
-{
-	IF_DROP(ifq);
-	return 0;
-}
-
-static inline int
-if_enq_drop(struct ifqueue *ifq, struct mbuf *m)
-{
-	if (IF_QFULL(ifq) &&
-	    !if_queue_drop(ifq, m))
-		return 0;
-	IF_ENQUEUE(ifq, m);
-	return 1;
-}
-#else
-
-#ifdef MT_HEADER
-int	if_enq_drop __P((struct ifqueue *, struct mbuf *));
-#endif
-
-#endif
-#endif /* KERNEL */
-
-#define	IFQ_MAXLEN	50
-#define	IFNET_SLOWHZ	1		/* granularity is 1 second */
-
-/*
- * The ifaddr structure contains information about one address
- * of an interface.  They are maintained by the different address families,
- * are allocated and attached when an address is set, and are linked
- * together so all addresses for an interface can be located.
- */
-struct ifaddr {
-	struct	sockaddr *ifa_addr;	/* address of interface */
-	struct	sockaddr *ifa_dstaddr;	/* other end of p-to-p link */
-#define	ifa_broadaddr	ifa_dstaddr	/* broadcast address interface */
-	struct	sockaddr *ifa_netmask;	/* used to determine subnet */
-	struct	ifnet *ifa_ifp;		/* back-pointer to interface */
-	struct	ifaddr *ifa_next;	/* next address for interface */
-	void	(*ifa_rtrequest)	/* check or clean routes (+ or -)'d */
-		__P((int, struct rtentry *, struct sockaddr *));
-	u_short	ifa_flags;		/* mostly rt_flags for cloning */
-	short	ifa_refcnt;		/* references to this structure */
-	int	ifa_metric;		/* cost of going out this interface */
-#ifdef notdef
-	struct	rtentry *ifa_rt;	/* XXXX for ROUTETOIF ????? */
-#endif
-	int (*ifa_claim_addr)		/* check if an addr goes to this if */
-		__P((struct ifaddr *, struct sockaddr *));
-
-};
-#define	IFA_ROUTE	RTF_UP		/* route installed */
-
-/*
- * Message format for use in obtaining information about interfaces
- * from getkerninfo and the routing socket
- */
-struct if_msghdr {
-	u_short	ifm_msglen;	/* to skip over non-understood messages */
-	u_char	ifm_version;	/* future binary compatability */
-	u_char	ifm_type;	/* message type */
-	int	ifm_addrs;	/* like rtm_addrs */
-	int	ifm_flags;	/* value of if_flags */
-	u_short	ifm_index;	/* index for associated ifp */
-	struct	if_data ifm_data;/* statistics and other data about if */
-};
-
-/*
- * Message format for use in obtaining information about interface addresses
- * from getkerninfo and the routing socket
- */
-struct ifa_msghdr {
-	u_short	ifam_msglen;	/* to skip over non-understood messages */
-	u_char	ifam_version;	/* future binary compatability */
-	u_char	ifam_type;	/* message type */
-	int	ifam_addrs;	/* like rtm_addrs */
-	int	ifam_flags;	/* value of ifa_flags */
-	u_short	ifam_index;	/* index for associated ifp */
-	int	ifam_metric;	/* value of ifa_metric */
-};
-
-/*
- * Interface request structure used for socket
- * ioctl's.  All interface ioctl's must have parameter
- * definitions which begin with ifr_name.  The
- * remainder may be interface specific.
- */
-struct	ifreq {
-#define	IFNAMSIZ	16
-	char	ifr_name[IFNAMSIZ];		/* if name, e.g. "en0" */
-	union {
-		struct	sockaddr ifru_addr;
-		struct	sockaddr ifru_dstaddr;
-		struct	sockaddr ifru_broadaddr;
-		short	ifru_flags;
-		int	ifru_metric;
-		int	ifru_mtu;
-		int	ifru_phys;
-		int	ifru_media;
-		caddr_t	ifru_data;
-	} ifr_ifru;
-#define	ifr_addr	ifr_ifru.ifru_addr	/* address */
-#define	ifr_dstaddr	ifr_ifru.ifru_dstaddr	/* other end of p-to-p link */
-#define	ifr_broadaddr	ifr_ifru.ifru_broadaddr	/* broadcast address */
-#define	ifr_flags	ifr_ifru.ifru_flags	/* flags */
-#define	ifr_metric	ifr_ifru.ifru_metric	/* metric */
-#define	ifr_mtu		ifr_ifru.ifru_mtu	/* mtu */
-#define ifr_phys	ifr_ifru.ifru_phys	/* physical wire */
-#define ifr_media	ifr_ifru.ifru_media	/* physical media */
-#define	ifr_data	ifr_ifru.ifru_data	/* for use by interface */
-};
-
-struct ifaliasreq {
-	char	ifra_name[IFNAMSIZ];		/* if name, e.g. "en0" */
-	struct	sockaddr ifra_addr;
-	struct	sockaddr ifra_broadaddr;
-	struct	sockaddr ifra_mask;
-};
-
-struct ifmediareq {
-	char	ifm_name[IFNAMSIZ];	/* if name, e.g. "en0" */
-	int	ifm_current;		/* current media options */
-	int	ifm_mask;		/* don't care mask */
-	int	ifm_status;		/* media status */
-	int	ifm_active;		/* active options */
-	int	ifm_count;		/* # entries in ifm_ulist array */
-	int	*ifm_ulist;		/* media words */
-};
-/*
- * Structure used in SIOCGIFCONF request.
- * Used to retrieve interface configuration
- * for machine (useful for programs which
- * must know all networks accessible).
- */
-struct	ifconf {
-	int	ifc_len;		/* size of associated buffer */
-	union {
-		caddr_t	ifcu_buf;
-		struct	ifreq *ifcu_req;
-	} ifc_ifcu;
-#define	ifc_buf	ifc_ifcu.ifcu_buf	/* buffer address */
-#define	ifc_req	ifc_ifcu.ifcu_req	/* array of structures returned */
-};
-
-#include <net/if_arp.h>
-
-#ifdef KERNEL
-#define	IFAFREE(ifa) \
-	if ((ifa)->ifa_refcnt <= 0) \
-		ifafree(ifa); \
-	else \
-		(ifa)->ifa_refcnt--;
-
-extern struct	ifnet	*ifnet;
-extern int	ifqmaxlen;
-extern struct	ifnet	loif[];
-extern int	if_index;
-extern struct	ifaddr	**ifnet_addrs;
-
-void	ether_ifattach __P((struct ifnet *));
-void	ether_input __P((struct ifnet *, struct ether_header *, struct mbuf *));
-int	ether_output __P((struct ifnet *,
-	   struct mbuf *, struct sockaddr *, struct rtentry *));
-int	ether_ioctl __P((struct ifnet *, int , caddr_t ));
-
-void	if_attach __P((struct ifnet *));
-void	if_down __P((struct ifnet *));
-void	if_up __P((struct ifnet *));
-#ifdef vax
-void	ifubareset __P((int));
-#endif
-/*void	ifinit __P((void));*/ /* declared in systm.h for main() */
-int	ifioctl __P((struct socket *, int, caddr_t, struct proc *));
-int	ifpromisc __P((struct ifnet *, int));
-struct	ifnet *ifunit __P((char *));
-
-int	if_poll_recv_slow __P((struct ifnet *ifp, int *quotap));
-void	if_poll_xmit_slow __P((struct ifnet *ifp, int *quotap));
-void	if_poll_throttle __P((void));
-void	if_poll_unthrottle __P((void *));
-void	if_poll_init __P((void));
-void	if_poll __P((void));
-
-struct	ifaddr *ifa_ifwithaddr __P((struct sockaddr *));
-struct	ifaddr *ifa_ifwithdstaddr __P((struct sockaddr *));
-struct	ifaddr *ifa_ifwithnet __P((struct sockaddr *));
-struct	ifaddr *ifa_ifwithroute __P((int, struct sockaddr *,
-					struct sockaddr *));
-struct	ifaddr *ifaof_ifpforaddr __P((struct sockaddr *, struct ifnet *));
-void	ifafree __P((struct ifaddr *));
-
-int	looutput __P((struct ifnet *,
-	   struct mbuf *, struct sockaddr *, struct rtentry *));
-#endif /* KERNEL */
-
-#endif /* !_NET_IF_H_ */
diff --git a/c/src/libnetworking/net/if_arp.h b/c/src/libnetworking/net/if_arp.h
deleted file mode 100644
index dd726bf856..0000000000
--- a/c/src/libnetworking/net/if_arp.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright (c) 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)if_arp.h	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#ifndef _NET_IF_ARP_H_
-#define	_NET_IF_ARP_H_
-
-/*
- * Address Resolution Protocol.
- *
- * See RFC 826 for protocol description.  ARP packets are variable
- * in size; the arphdr structure defines the fixed-length portion.
- * Protocol type values are the same as those for 10 Mb/s Ethernet.
- * It is followed by the variable-sized fields ar_sha, arp_spa,
- * arp_tha and arp_tpa in that order, according to the lengths
- * specified.  Field names used correspond to RFC 826.
- */
-struct	arphdr {
-	u_short	ar_hrd;		/* format of hardware address */
-#define ARPHRD_ETHER 	1	/* ethernet hardware format */
-#define ARPHRD_FRELAY 	15	/* frame relay hardware format */
-	u_short	ar_pro;		/* format of protocol address */
-	u_char	ar_hln;		/* length of hardware address */
-	u_char	ar_pln;		/* length of protocol address */
-	u_short	ar_op;		/* one of: */
-#define	ARPOP_REQUEST	1	/* request to resolve address */
-#define	ARPOP_REPLY	2	/* response to previous request */
-#define	ARPOP_REVREQUEST 3	/* request protocol address given hardware */
-#define	ARPOP_REVREPLY	4	/* response giving protocol address */
-#define ARPOP_INVREQUEST 8 	/* request to identify peer */
-#define ARPOP_INVREPLY	9	/* response identifying peer */
-/*
- * The remaining fields are variable in size,
- * according to the sizes above.
- */
-#ifdef COMMENT_ONLY
-	u_char	ar_sha[];	/* sender hardware address */
-	u_char	ar_spa[];	/* sender protocol address */
-	u_char	ar_tha[];	/* target hardware address */
-	u_char	ar_tpa[];	/* target protocol address */
-#endif
-};
-
-/*
- * ARP ioctl request
- */
-struct arpreq {
-	struct	sockaddr arp_pa;		/* protocol address */
-	struct	sockaddr arp_ha;		/* hardware address */
-	int	arp_flags;			/* flags */
-};
-/*  arp_flags and at_flags field values */
-#define	ATF_INUSE	0x01	/* entry in use */
-#define ATF_COM		0x02	/* completed entry (enaddr valid) */
-#define	ATF_PERM	0x04	/* permanent entry */
-#define	ATF_PUBL	0x08	/* publish entry (respond for other host) */
-#define	ATF_USETRAILERS	0x10	/* has requested trailers */
-
-#endif /* !_NET_IF_ARP_H_ */
diff --git a/c/src/libnetworking/net/if_dl.h b/c/src/libnetworking/net/if_dl.h
deleted file mode 100644
index 053ae3e92f..0000000000
--- a/c/src/libnetworking/net/if_dl.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)if_dl.h	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#ifndef _NET_IF_DL_H_
-#define _NET_IF_DL_H_
-
-/*
- * A Link-Level Sockaddr may specify the interface in one of two
- * ways: either by means of a system-provided index number (computed
- * anew and possibly differently on every reboot), or by a human-readable
- * string such as "il0" (for managerial convenience).
- *
- * Census taking actions, such as something akin to SIOCGCONF would return
- * both the index and the human name.
- *
- * High volume transactions (such as giving a link-level ``from'' address
- * in a recvfrom or recvmsg call) may be likely only to provide the indexed
- * form, (which requires fewer copy operations and less space).
- *
- * The form and interpretation  of the link-level address is purely a matter
- * of convention between the device driver and its consumers; however, it is
- * expected that all drivers for an interface of a given if_type will agree.
- */
-
-/*
- * Structure of a Link-Level sockaddr:
- */
-struct sockaddr_dl {
-	u_char	sdl_len;	/* Total length of sockaddr */
-	u_char	sdl_family;	/* AF_DLI */
-	u_short	sdl_index;	/* if != 0, system given index for interface */
-	u_char	sdl_type;	/* interface type */
-	u_char	sdl_nlen;	/* interface name length, no trailing 0 reqd. */
-	u_char	sdl_alen;	/* link level address length */
-	u_char	sdl_slen;	/* link layer selector length */
-	char	sdl_data[12];	/* minimum work area, can be larger;
-				   contains both if name and ll address */
-};
-
-#define LLADDR(s) ((caddr_t)((s)->sdl_data + (s)->sdl_nlen))
-
-#ifndef KERNEL
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-void	link_addr __P((const char *, struct sockaddr_dl *));
-char	*link_ntoa __P((const struct sockaddr_dl *));
-__END_DECLS
-
-#endif /* !KERNEL */
-
-#endif
diff --git a/c/src/libnetworking/net/if_ethersubr.c b/c/src/libnetworking/net/if_ethersubr.c
deleted file mode 100644
index 4d1675ca3c..0000000000
--- a/c/src/libnetworking/net/if_ethersubr.c
+++ /dev/null
@@ -1,988 +0,0 @@
-/*
- * Copyright (c) 1982, 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)if_ethersubr.c	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/malloc.h>
-#include <sys/mbuf.h>
-#include <sys/protosw.h>
-#include <sys/socket.h>
-#include <sys/ioctl.h>
-#include <sys/errno.h>
-#include <sys/syslog.h>
-#include <sys/sysctl.h>
-
-#include <net/if.h>
-#include <net/netisr.h>
-#include <net/route.h>
-#include <net/if_llc.h>
-#include <net/if_dl.h>
-#include <net/if_types.h>
-#include <net/ethernet.h>
-
-#ifdef INET
-#include <netinet/in.h>
-#include <netinet/in_var.h>
-#endif
-#include <netinet/if_ether.h>
-
-#ifdef IPX
-#include <netipx/ipx.h>
-#include <netipx/ipx_if.h>
-#endif
-
-#ifdef NS
-#include <netns/ns.h>
-#include <netns/ns_if.h>
-ushort ns_nettype;
-int ether_outputdebug = 0;
-int ether_inputdebug = 0;
-#endif
-
-#ifdef ISO
-#include <netiso/argo_debug.h>
-#include <netiso/iso.h>
-#include <netiso/iso_var.h>
-#include <netiso/iso_snpac.h>
-#endif
-
-/*#ifdef LLC
-#include <netccitt/dll.h>
-#include <netccitt/llc_var.h>
-#endif*/
-
-#if defined(LLC) && defined(CCITT)
-extern struct ifqueue pkintrq;
-#endif
-
-#ifdef NETATALK
-#include <netatalk/at.h>
-#include <netatalk/at_var.h>
-#include <netatalk/at_extern.h>
-
-#define llc_snap_org_code llc_un.type_snap.org_code
-#define llc_snap_ether_type llc_un.type_snap.ether_type
-
-extern u_char	at_org_code[ 3 ];
-extern u_char	aarp_org_code[ 3 ];
-#endif NETATALK
-
-u_char	etherbroadcastaddr[6] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
-#define senderr(e) { error = (e); goto bad;}
-
-/*
- * Ethernet output routine.
- * Encapsulate a packet of type family for the local net.
- * Use trailer local net encapsulation if enough data in first
- * packet leaves a multiple of 512 bytes of data in remainder.
- * Assumes that ifp is actually pointer to arpcom structure.
- */
-int
-ether_output(ifp, m0, dst, rt0)
-	register struct ifnet *ifp;
-	struct mbuf *m0;
-	struct sockaddr *dst;
-	struct rtentry *rt0;
-{
-	short type;
-	int s, error = 0;
-#ifdef NS
- 	u_char *cp
-	register struct ifqueue *inq;
-	register struct mbuf *m2;
-#endif
-	u_char  edst[6];
-	register struct mbuf *m = m0;
-	register struct rtentry *rt;
-	struct mbuf *mcopy = (struct mbuf *)0;
-	register struct ether_header *eh;
-	int off, len = m->m_pkthdr.len;
-	struct arpcom *ac = (struct arpcom *)ifp;
-#ifdef NETATALK
-	struct at_ifaddr *aa;
-#endif NETATALK
-
-	if ((ifp->if_flags & (IFF_UP|IFF_RUNNING)) != (IFF_UP|IFF_RUNNING))
-		senderr(ENETDOWN);
-	rt = rt0;
-	if (rt) {
-		if ((rt->rt_flags & RTF_UP) == 0) {
-			rt0 = rt = rtalloc1(dst, 1, 0UL);
-			if (rt0)
-				rt->rt_refcnt--;
-			else
-				senderr(EHOSTUNREACH);
-		}
-		if (rt->rt_flags & RTF_GATEWAY) {
-			if (rt->rt_gwroute == 0)
-				goto lookup;
-			if (((rt = rt->rt_gwroute)->rt_flags & RTF_UP) == 0) {
-				rtfree(rt); rt = rt0;
-			lookup: rt->rt_gwroute = rtalloc1(rt->rt_gateway, 1,
-							  0UL);
-				if ((rt = rt->rt_gwroute) == 0)
-					senderr(EHOSTUNREACH);
-			}
-		}
-		if (rt->rt_flags & RTF_REJECT)
-			if (rt->rt_rmx.rmx_expire == 0 ||
-			    rtems_bsdnet_seconds_since_boot() < rt->rt_rmx.rmx_expire)
-				senderr(rt == rt0 ? EHOSTDOWN : EHOSTUNREACH);
-	}
-	switch (dst->sa_family) {
-
-#ifdef INET
-	case AF_INET:
-		if (!arpresolve(ac, rt, m, dst, edst, rt0))
-			return (0);	/* if not yet resolved */
-		/* If broadcasting on a simplex interface, loopback a copy */
-		if ((m->m_flags & M_BCAST) && (ifp->if_flags & IFF_SIMPLEX))
-			mcopy = m_copy(m, 0, (int)M_COPYALL);
-		off = m->m_pkthdr.len - m->m_len;
-		type = htons(ETHERTYPE_IP);
-		break;
-#endif
-#ifdef IPX
-	case AF_IPX:
-		{
-		struct ifaddr *ia;
-
-		type = htons(ETHERTYPE_IPX);
- 		bcopy((caddr_t)&(((struct sockaddr_ipx *)dst)->sipx_addr.x_host),
-		    (caddr_t)edst, sizeof (edst));
-		for (ia = ifp->if_addrlist; ia != NULL; ia = ia->ifa_next)
-			if(ia->ifa_addr->sa_family == AF_IPX &&
-			   !bcmp((caddr_t)edst,
-				 (caddr_t)&((struct ipx_ifaddr *)ia)->ia_addr.sipx_addr.x_host,
-				 sizeof(edst)))
-				return (looutput(ifp, m, dst, rt));
-		/* If broadcasting on a simplex interface, loopback a copy */
-		if ((m->m_flags & M_BCAST) && (ifp->if_flags & IFF_SIMPLEX))
-			mcopy = m_copy(m, 0, (int)M_COPYALL);
-		break;
-		}
-#endif
-#ifdef NETATALK
-	case AF_APPLETALK:
-	    {
-		struct sockaddr_at *sat = (struct sockaddr_at *)dst;
-
-		/*
-		 * super hack..
-		 * Most of this loopback code should move into the appletalk
-		 * code, but it's here for now.. remember to move it! [JRE]
-		 * This may not get the same interface we started with
-		 * fix asap. XXX
-		 */
-		aa = at_ifawithnet( sat );
-		if (aa == NULL) {
-			goto bad;
-		}
-		if( aa->aa_ifa.ifa_ifp != ifp ) {
-			(*aa->aa_ifa.ifa_ifp->if_output)(aa->aa_ifa.ifa_ifp,
-							m,dst,rt);
-		}
-		if (((sat->sat_addr.s_net == ATADDR_ANYNET)
-		  && (sat->sat_addr.s_node == ATADDR_ANYNODE))
-		|| ((sat->sat_addr.s_net == aa->aa_addr.sat_addr.s_net )
-		  && (sat->sat_addr.s_node == aa->aa_addr.sat_addr.s_node))) {
-			(void) looutput(ifp, m, dst, rt);
-			return(0);
-		}
-
-        	if (!aarpresolve(ac, m, (struct sockaddr_at *)dst, edst)) {
-#ifdef NETATALKDEBUG
-                	extern char *prsockaddr(struct sockaddr *);
-                	printf("aarpresolv: failed for %s\n", prsockaddr(dst));
-#endif NETATALKDEBUG
-                	return (0);
-        	}
-
-		/*
-		 * If broadcasting on a simplex interface, loopback a copy
-		 */
-		if ((m->m_flags & M_BCAST) && (ifp->if_flags & IFF_SIMPLEX))
-			mcopy = m_copy(m, 0, (int)M_COPYALL);
-	    }
-	    /*
-	     * In the phase 2 case, we need to prepend an mbuf for the llc header.
-	     * Since we must preserve the value of m, which is passed to us by
-	     * value, we m_copy() the first mbuf, and use it for our llc header.
-	     */
-	    if ( aa->aa_flags & AFA_PHASE2 ) {
-		struct llc llc;
-
-		M_PREPEND(m, sizeof(struct llc), M_WAIT);
-		len += sizeof(struct llc);
-		llc.llc_dsap = llc.llc_ssap = LLC_SNAP_LSAP;
-		llc.llc_control = LLC_UI;
-		bcopy(at_org_code, llc.llc_snap_org_code, sizeof(at_org_code));
-		llc.llc_snap_ether_type = htons( ETHERTYPE_AT );
-		bcopy(&llc, mtod(m, caddr_t), sizeof(struct llc));
-		type = htons(m->m_pkthdr.len);
-	    } else {
-		type = htons(ETHERTYPE_AT);
-	    }
-	    break;
-#endif NETATALK
-#ifdef NS
-	case AF_NS:
-		switch(ns_nettype){
-		default:
-		case 0x8137: /* Novell Ethernet_II Ethernet TYPE II */
-			type = 0x8137;
-			break;
-		case 0x0: /* Novell 802.3 */
-			type = htons( m->m_pkthdr.len);
-			break;
-		case 0xe0e0: /* Novell 802.2 and Token-Ring */
-			M_PREPEND(m, 3, M_WAIT);
-			type = htons( m->m_pkthdr.len);
-			cp = mtod(m, u_char *);
-			*cp++ = 0xE0;
-			*cp++ = 0xE0;
-			*cp++ = 0x03;
-			break;
-		}
- 		bcopy((caddr_t)&(((struct sockaddr_ns *)dst)->sns_addr.x_host),
-		    (caddr_t)edst, sizeof (edst));
-		if (!bcmp((caddr_t)edst, (caddr_t)&ns_thishost, sizeof(edst))){
-			m->m_pkthdr.rcvif = ifp;
-			schednetisr(NETISR_NS);
-			inq = &nsintrq;
-			s = splimp();
-			if (IF_QFULL(inq)) {
-				IF_DROP(inq);
-				m_freem(m);
-			} else
-				IF_ENQUEUE(inq, m);
-			splx(s);
-			return (error);
-		}
-		if (!bcmp((caddr_t)edst, (caddr_t)&ns_broadhost, sizeof(edst))){
-			m2 = m_copy(m, 0, (int)M_COPYALL);
-			m2->m_pkthdr.rcvif = ifp;
-			schednetisr(NETISR_NS);
-			inq = &nsintrq;
-			s = splimp();
-			if (IF_QFULL(inq)) {
-				IF_DROP(inq);
-				m_freem(m2);
-			} else
-				IF_ENQUEUE(inq, m2);
-			splx(s);
-		}
-		/* If broadcasting on a simplex interface, loopback a copy */
-		if ((m->m_flags & M_BCAST) && (ifp->if_flags & IFF_SIMPLEX)){
-			mcopy = m_copy(m, 0, (int)M_COPYALL);
-		}
-		break;
-#endif /* NS */
-#ifdef	ISO
-	case AF_ISO: {
-		int	snpalen;
-		struct	llc *l;
-		register struct sockaddr_dl *sdl;
-
-		if (rt && (sdl = (struct sockaddr_dl *)rt->rt_gateway) &&
-		    sdl->sdl_family == AF_LINK && sdl->sdl_alen > 0) {
-			bcopy(LLADDR(sdl), (caddr_t)edst, sizeof(edst));
-		} else if (error =
-			    iso_snparesolve(ifp, (struct sockaddr_iso *)dst,
-					    (char *)edst, &snpalen))
-			goto bad; /* Not Resolved */
-		/* If broadcasting on a simplex interface, loopback a copy */
-		if (*edst & 1)
-			m->m_flags |= (M_BCAST|M_MCAST);
-		if ((m->m_flags & M_BCAST) && (ifp->if_flags & IFF_SIMPLEX) &&
-		    (mcopy = m_copy(m, 0, (int)M_COPYALL))) {
-			M_PREPEND(mcopy, sizeof (*eh), M_DONTWAIT);
-			if (mcopy) {
-				eh = mtod(mcopy, struct ether_header *);
-				bcopy((caddr_t)edst,
-				      (caddr_t)eh->ether_dhost, sizeof (edst));
-				bcopy((caddr_t)ac->ac_enaddr,
-				      (caddr_t)eh->ether_shost, sizeof (edst));
-			}
-		}
-		M_PREPEND(m, 3, M_DONTWAIT);
-		if (m == NULL)
-			return (0);
-		type = htons(m->m_pkthdr.len);
-		l = mtod(m, struct llc *);
-		l->llc_dsap = l->llc_ssap = LLC_ISO_LSAP;
-		l->llc_control = LLC_UI;
-		len += 3;
-		IFDEBUG(D_ETHER)
-			int i;
-			printf("unoutput: sending pkt to: ");
-			for (i=0; i<6; i++)
-				printf("%x ", edst[i] & 0xff);
-			printf("\n");
-		ENDDEBUG
-		} break;
-#endif /* ISO */
-#ifdef	LLC
-/*	case AF_NSAP: */
-	case AF_CCITT: {
-		register struct sockaddr_dl *sdl =
-			(struct sockaddr_dl *) rt -> rt_gateway;
-
-		if (sdl && sdl->sdl_family == AF_LINK
-		    && sdl->sdl_alen > 0) {
-			bcopy(LLADDR(sdl), (char *)edst,
-				sizeof(edst));
-		} else goto bad; /* Not a link interface ? Funny ... */
-		if ((ifp->if_flags & IFF_SIMPLEX) && (*edst & 1) &&
-		    (mcopy = m_copy(m, 0, (int)M_COPYALL))) {
-			M_PREPEND(mcopy, sizeof (*eh), M_DONTWAIT);
-			if (mcopy) {
-				eh = mtod(mcopy, struct ether_header *);
-				bcopy((caddr_t)edst,
-				      (caddr_t)eh->ether_dhost, sizeof (edst));
-				bcopy((caddr_t)ac->ac_enaddr,
-				      (caddr_t)eh->ether_shost, sizeof (edst));
-			}
-		}
-		type = htons(m->m_pkthdr.len);
-#ifdef LLC_DEBUG
-		{
-			int i;
-			register struct llc *l = mtod(m, struct llc *);
-
-			printf("ether_output: sending LLC2 pkt to: ");
-			for (i=0; i<6; i++)
-				printf("%x ", edst[i] & 0xff);
-			printf(" len 0x%x dsap 0x%x ssap 0x%x control 0x%x\n",
-			       type & 0xff, l->llc_dsap & 0xff, l->llc_ssap &0xff,
-			       l->llc_control & 0xff);
-
-		}
-#endif /* LLC_DEBUG */
-		} break;
-#endif /* LLC */
-
-	case AF_UNSPEC:
-		eh = (struct ether_header *)dst->sa_data;
- 		(void)memcpy(edst, eh->ether_dhost, sizeof (edst));
-		type = eh->ether_type;
-		break;
-
-	default:
-		printf("%s%d: can't handle af%d\n", ifp->if_name, ifp->if_unit,
-			dst->sa_family);
-		senderr(EAFNOSUPPORT);
-	}
-
-
-	if (mcopy)
-		(void) looutput(ifp, mcopy, dst, rt);
-	/*
-	 * Add local net header.  If no space in first mbuf,
-	 * allocate another.
-	 */
-	M_PREPEND(m, sizeof (struct ether_header), M_DONTWAIT);
-	if (m == 0)
-		senderr(ENOBUFS);
-	eh = mtod(m, struct ether_header *);
-	(void)memcpy(&eh->ether_type, &type,
-		sizeof(eh->ether_type));
- 	(void)memcpy(eh->ether_dhost, edst, sizeof (edst));
- 	(void)memcpy(eh->ether_shost, ac->ac_enaddr,
-	    sizeof(eh->ether_shost));
-	s = splimp();
-	/*
-	 * Queue message on interface, and start output if interface
-	 * not yet active.
-	 */
-	if (IF_QFULL(&ifp->if_snd)) {
-		IF_DROP(&ifp->if_snd);
-		splx(s);
-		senderr(ENOBUFS);
-	}
-	IF_ENQUEUE(&ifp->if_snd, m);
-	if ((ifp->if_flags & IFF_OACTIVE) == 0)
-		(*ifp->if_start)(ifp);
-	splx(s);
-	ifp->if_obytes += len + sizeof (struct ether_header);
-	if (m->m_flags & M_MCAST)
-		ifp->if_omcasts++;
-	return (error);
-
-bad:
-	if (m)
-		m_freem(m);
-	return (error);
-}
-
-/*
- * Process a received Ethernet packet;
- * the packet is in the mbuf chain m without
- * the ether header, which is provided separately.
- */
-void
-ether_input(ifp, eh, m)
-	struct ifnet *ifp;
-	register struct ether_header *eh;
-	struct mbuf *m;
-{
-	register struct ifqueue *inq;
-	u_short ether_type;
-#ifdef NS
-	u_short *checksum;
-#endif
-	int s;
-#if defined (ISO) || defined (LLC) || defined(NETATALK)
-	register struct llc *l;
-#endif
-
-	if ((ifp->if_flags & IFF_UP) == 0) {
-		m_freem(m);
-		return;
-	}
-	ifp->if_ibytes += m->m_pkthdr.len + sizeof (*eh);
-	if (bcmp((caddr_t)etherbroadcastaddr, (caddr_t)eh->ether_dhost,
-	    sizeof(etherbroadcastaddr)) == 0)
-		m->m_flags |= M_BCAST;
-	else if (eh->ether_dhost[0] & 1)
-		m->m_flags |= M_MCAST;
-	if (m->m_flags & (M_BCAST|M_MCAST))
-		ifp->if_imcasts++;
-
-	ether_type = ntohs(eh->ether_type);
-
-	switch (ether_type) {
-#ifdef INET
-	case ETHERTYPE_IP:
-		schednetisr(NETISR_IP);
-		inq = &ipintrq;
-		break;
-
-	case ETHERTYPE_ARP:
-		schednetisr(NETISR_ARP);
-		inq = &arpintrq;
-		break;
-#endif
-#ifdef IPX
-	case ETHERTYPE_IPX:
-		schednetisr(NETISR_IPX);
-		inq = &ipxintrq;
-		break;
-#endif
-#ifdef NS
-	case 0x8137: /* Novell Ethernet_II Ethernet TYPE II */
-		schednetisr(NETISR_NS);
-		inq = &nsintrq;
-		break;
-
-#endif /* NS */
-#ifdef NETATALK
-        case ETHERTYPE_AT:
-                schednetisr(NETISR_ATALK);
-                inq = &atintrq1;
-                break;
-        case ETHERTYPE_AARP:
-		/* probably this should be done with a NETISR as well */
-                aarpinput((struct arpcom *)ifp, m); /* XXX */
-                return;
-#endif NETATALK
-	default:
-#ifdef NS
-		checksum = mtod(m, ushort *);
-		/* Novell 802.3 */
-		if ((ether_type <= ETHERMTU) &&
-			((*checksum == 0xffff) || (*checksum == 0xE0E0))){
-			if(*checksum == 0xE0E0) {
-				m->m_pkthdr.len -= 3;
-				m->m_len -= 3;
-				m->m_data += 3;
-			}
-				schednetisr(NETISR_NS);
-				inq = &nsintrq;
-				break;
-		}
-#endif /* NS */
-#if defined (ISO) || defined (LLC) || defined(NETATALK)
-		if (ether_type > ETHERMTU)
-			goto dropanyway;
-		l = mtod(m, struct llc *);
-		switch (l->llc_dsap) {
-#ifdef NETATALK
-		case LLC_SNAP_LSAP:
-		    switch (l->llc_control) {
-		    case LLC_UI:
-			if (l->llc_ssap != LLC_SNAP_LSAP)
-			    goto dropanyway;
-	
-			if (Bcmp(&(l->llc_snap_org_code)[0], at_org_code,
-				   sizeof(at_org_code)) == 0 &&
-			     ntohs(l->llc_snap_ether_type) == ETHERTYPE_AT) {
-			    inq = &atintrq2;
-			    m_adj( m, sizeof( struct llc ));
-			    schednetisr(NETISR_ATALK);
-			    break;
-			}
-
-			if (Bcmp(&(l->llc_snap_org_code)[0], aarp_org_code,
-				   sizeof(aarp_org_code)) == 0 &&
-			     ntohs(l->llc_snap_ether_type) == ETHERTYPE_AARP) {
-			    m_adj( m, sizeof( struct llc ));
-			    aarpinput((struct arpcom *)ifp, m); /* XXX */
-			    return;
-			}
-		
-		    default:
-			goto dropanyway;
-		    }
-		    break;
-#endif NETATALK	
-#ifdef	ISO
-		case LLC_ISO_LSAP:
-			switch (l->llc_control) {
-			case LLC_UI:
-				/* LLC_UI_P forbidden in class 1 service */
-				if ((l->llc_dsap == LLC_ISO_LSAP) &&
-				    (l->llc_ssap == LLC_ISO_LSAP)) {
-					/* LSAP for ISO */
-					if (m->m_pkthdr.len > ether_type)
-						m_adj(m, ether_type - m->m_pkthdr.len);
-					m->m_data += 3;		/* XXX */
-					m->m_len -= 3;		/* XXX */
-					m->m_pkthdr.len -= 3;	/* XXX */
-					M_PREPEND(m, sizeof *eh, M_DONTWAIT);
-					if (m == 0)
-						return;
-					*mtod(m, struct ether_header *) = *eh;
-					IFDEBUG(D_ETHER)
-						printf("clnp packet");
-					ENDDEBUG
-					schednetisr(NETISR_ISO);
-					inq = &clnlintrq;
-					break;
-				}
-				goto dropanyway;
-
-			case LLC_XID:
-			case LLC_XID_P:
-				if(m->m_len < 6)
-					goto dropanyway;
-				l->llc_window = 0;
-				l->llc_fid = 9;
-				l->llc_class = 1;
-				l->llc_dsap = l->llc_ssap = 0;
-				/* Fall through to */
-			case LLC_TEST:
-			case LLC_TEST_P:
-			{
-				struct sockaddr sa;
-				register struct ether_header *eh2;
-				int i;
-				u_char c = l->llc_dsap;
-
-				l->llc_dsap = l->llc_ssap;
-				l->llc_ssap = c;
-				if (m->m_flags & (M_BCAST | M_MCAST))
-					bcopy((caddr_t)ac->ac_enaddr,
-					      (caddr_t)eh->ether_dhost, 6);
-				sa.sa_family = AF_UNSPEC;
-				sa.sa_len = sizeof(sa);
-				eh2 = (struct ether_header *)sa.sa_data;
-				for (i = 0; i < 6; i++) {
-					eh2->ether_shost[i] = c = eh->ether_dhost[i];
-					eh2->ether_dhost[i] =
-						eh->ether_dhost[i] = eh->ether_shost[i];
-					eh->ether_shost[i] = c;
-				}
-				ifp->if_output(ifp, m, &sa, NULL);
-				return;
-			}
-			default:
-				m_freem(m);
-				return;
-			}
-			break;
-#endif /* ISO */
-#ifdef LLC
-		case LLC_X25_LSAP:
-		{
-			if (m->m_pkthdr.len > ether_type)
-				m_adj(m, ether_type - m->m_pkthdr.len);
-			M_PREPEND(m, sizeof(struct sdl_hdr) , M_DONTWAIT);
-			if (m == 0)
-				return;
-			if ( !sdl_sethdrif(ifp, eh->ether_shost, LLC_X25_LSAP,
-					    eh->ether_dhost, LLC_X25_LSAP, 6,
-					    mtod(m, struct sdl_hdr *)))
-				panic("ETHER cons addr failure");
-			mtod(m, struct sdl_hdr *)->sdlhdr_len = ether_type;
-#ifdef LLC_DEBUG
-				printf("llc packet\n");
-#endif /* LLC_DEBUG */
-			schednetisr(NETISR_CCITT);
-			inq = &llcintrq;
-			break;
-		}
-#endif /* LLC */
-		dropanyway:
-		default:
-			m_freem(m);
-			return;
-		}
-#else /* ISO || LLC || NETATALK */
-	    m_freem(m);
-	    return;
-#endif /* ISO || LLC || NETATALK */
-	}
-
-	s = splimp();
-	if (IF_QFULL(inq)) {
-		IF_DROP(inq);
-		m_freem(m);
-	} else
-		IF_ENQUEUE(inq, m);
-	splx(s);
-}
-
-/*
- * Perform common duties while attaching to interface list
- */
-void
-ether_ifattach(ifp)
-	register struct ifnet *ifp;
-{
-	register struct ifaddr *ifa;
-	register struct sockaddr_dl *sdl;
-
-	ifp->if_type = IFT_ETHER;
-	ifp->if_addrlen = 6;
-	ifp->if_hdrlen = 14;
-	ifp->if_mtu = ETHERMTU;
-	if (ifp->if_baudrate == 0)
-	    ifp->if_baudrate = 10000000;
-	for (ifa = ifp->if_addrlist; ifa; ifa = ifa->ifa_next)
-		if ((sdl = (struct sockaddr_dl *)ifa->ifa_addr) &&
-		    sdl->sdl_family == AF_LINK) {
-			sdl->sdl_type = IFT_ETHER;
-			sdl->sdl_alen = ifp->if_addrlen;
-			bcopy((caddr_t)((struct arpcom *)ifp)->ac_enaddr,
-			      LLADDR(sdl), ifp->if_addrlen);
-			break;
-		}
-}
-
-static u_char ether_ipmulticast_min[6] = 
-	{ 0x01, 0x00, 0x5e, 0x00, 0x00, 0x00 };
-static u_char ether_ipmulticast_max[6] =
-	{ 0x01, 0x00, 0x5e, 0x7f, 0xff, 0xff };
-/*
- * Add an Ethernet multicast address or range of addresses to the list for a
- * given interface.
- */
-int
-ether_addmulti(ifr, ac)
-	struct ifreq *ifr;
-	register struct arpcom *ac;
-{
-	register struct ether_multi *enm;
-	struct sockaddr_in *sin;
-	u_char addrlo[6];
-	u_char addrhi[6];
-        int set_allmulti = 0;
-	int s = splimp();
-
-	switch (ifr->ifr_addr.sa_family) {
-
-	case AF_UNSPEC:
-		bcopy(ifr->ifr_addr.sa_data, addrlo, 6);
-		bcopy(addrlo, addrhi, 6);
-		break;
-
-#ifdef INET
-	case AF_INET:
-		sin = (struct sockaddr_in *)&(ifr->ifr_addr);
-		if (sin->sin_addr.s_addr == INADDR_ANY) {
-			/*
-			 * An IP address of INADDR_ANY means listen to all
-			 * of the Ethernet multicast addresses used for IP.
-			 * (This is for the sake of IP multicast routers.)
-			 */
-			bcopy(ether_ipmulticast_min, addrlo, 6);
-			bcopy(ether_ipmulticast_max, addrhi, 6);
-                      set_allmulti = 1;
-		}
-		else {
-			ETHER_MAP_IP_MULTICAST(&sin->sin_addr, addrlo);
-			bcopy(addrlo, addrhi, 6);
-		}
-		break;
-#endif
-
-	default:
-		splx(s);
-		return (EAFNOSUPPORT);
-	}
-
-	/*
-	 * Verify that we have valid Ethernet multicast addresses.
-	 */
-	if ((addrlo[0] & 0x01) != 1 || (addrhi[0] & 0x01) != 1) {
-		splx(s);
-		return (EINVAL);
-	}
-	/*
-	 * See if the address range is already in the list.
-	 */
-	ETHER_LOOKUP_MULTI(addrlo, addrhi, ac, enm);
-	if (enm != NULL) {
-		/*
-		 * Found it; just increment the reference count.
-		 */
-		++enm->enm_refcount;
-		splx(s);
-		return (0);
-	}
-	/*
-	 * New address or range; malloc a new multicast record
-	 * and link it into the interface's multicast list.
-	 */
-	enm = (struct ether_multi *)malloc(sizeof(*enm), M_IFMADDR, M_NOWAIT);
-	if (enm == NULL) {
-		splx(s);
-		return (ENOBUFS);
-	}
-	bcopy(addrlo, enm->enm_addrlo, 6);
-	bcopy(addrhi, enm->enm_addrhi, 6);
-	enm->enm_ac = ac;
-	enm->enm_refcount = 1;
-	enm->enm_next = ac->ac_multiaddrs;
-	ac->ac_multiaddrs = enm;
-	ac->ac_multicnt++;
-	splx(s);
-        if (set_allmulti)
-        	ac->ac_if.if_flags |= IFF_ALLMULTI;
-
-	/*
-	 * Return ENETRESET to inform the driver that the list has changed
-	 * and its reception filter should be adjusted accordingly.
-	 */
-	return (ENETRESET);
-}
-
-/*
- * Delete a multicast address record.
- */
-int
-ether_delmulti(ifr, ac)
-	struct ifreq *ifr;
-	register struct arpcom *ac;
-{
-	register struct ether_multi *enm;
-	register struct ether_multi **p;
-	struct sockaddr_in *sin;
-	u_char addrlo[6];
-	u_char addrhi[6];
-      int unset_allmulti = 0;
-	int s = splimp();
-
-	switch (ifr->ifr_addr.sa_family) {
-
-	case AF_UNSPEC:
-		bcopy(ifr->ifr_addr.sa_data, addrlo, 6);
-		bcopy(addrlo, addrhi, 6);
-		break;
-
-#ifdef INET
-	case AF_INET:
-		sin = (struct sockaddr_in *)&(ifr->ifr_addr);
-		if (sin->sin_addr.s_addr == INADDR_ANY) {
-			/*
-			 * An IP address of INADDR_ANY means stop listening
-			 * to the range of Ethernet multicast addresses used
-			 * for IP.
-			 */
-			bcopy(ether_ipmulticast_min, addrlo, 6);
-			bcopy(ether_ipmulticast_max, addrhi, 6);
-                      unset_allmulti = 1;
-		}
-		else {
-			ETHER_MAP_IP_MULTICAST(&sin->sin_addr, addrlo);
-			bcopy(addrlo, addrhi, 6);
-		}
-		break;
-#endif
-
-	default:
-		splx(s);
-		return (EAFNOSUPPORT);
-	}
-
-	/*
-	 * Look up the address in our list.
-	 */
-	ETHER_LOOKUP_MULTI(addrlo, addrhi, ac, enm);
-	if (enm == NULL) {
-		splx(s);
-		return (ENXIO);
-	}
-	if (--enm->enm_refcount != 0) {
-		/*
-		 * Still some claims to this record.
-		 */
-		splx(s);
-		return (0);
-	}
-	/*
-	 * No remaining claims to this record; unlink and free it.
-	 */
-	for (p = &enm->enm_ac->ac_multiaddrs;
-	     *p != enm;
-	     p = &(*p)->enm_next)
-		continue;
-	*p = (*p)->enm_next;
-	free(enm, M_IFMADDR);
-	ac->ac_multicnt--;
-	splx(s);
-      if (unset_allmulti)
-              ac->ac_if.if_flags &= ~IFF_ALLMULTI;
-
-	/*
-	 * Return ENETRESET to inform the driver that the list has changed
-	 * and its reception filter should be adjusted accordingly.
-	 */
-	return (ENETRESET);
-}
-
-SYSCTL_NODE(_net_link, IFT_ETHER, ether, CTLFLAG_RW, 0, "Ethernet");
-
-int
-ether_ioctl(struct ifnet *ifp, int command, caddr_t data)
-{
-	struct ifaddr *ifa = (struct ifaddr *) data;
-	struct ifreq *ifr = (struct ifreq *) data;
-	int error = 0;
-
-	switch (command) {
-	case SIOCSIFADDR:
-		ifp->if_flags |= IFF_UP;
-
-		switch (ifa->ifa_addr->sa_family) {
-#ifdef INET
-		case AF_INET:
-			ifp->if_init(ifp->if_softc);	/* before arpwhohas */
-			arp_ifinit((struct arpcom *)ifp, ifa);
-			break;
-#endif
-#ifdef IPX
-		/*
-		 * XXX - This code is probably wrong
-		 */
-		case AF_IPX:
-			{
-			register struct ipx_addr *ina = &(IA_SIPX(ifa)->sipx_addr);
-			struct arpcom *ac = (struct arpcom *) (ifp->if_softc);
-
-			if (ipx_nullhost(*ina))
-				ina->x_host =
-				    *(union ipx_host *) 
-			            ac->ac_enaddr;
-			else {
-				bcopy((caddr_t) ina->x_host.c_host,
-				      (caddr_t) ac->ac_enaddr,
-				      sizeof(ac->ac_enaddr));
-			}
-
-			/*
-			 * Set new address
-			 */
-			ifp->if_init(ifp->if_softc);
-			break;
-			}
-#endif
-#ifdef NS
-		/*
-		 * XXX - This code is probably wrong
-		 */
-		case AF_NS:
-		{
-			register struct ns_addr *ina = &(IA_SNS(ifa)->sns_addr);
-			struct arpcom *ac = (struct arpcom *) (ifp->if_softc);
-
-			if (ns_nullhost(*ina))
-				ina->x_host =
-				    *(union ns_host *) (ac->ac_enaddr);
-			else {
-				bcopy((caddr_t) ina->x_host.c_host,
-				      (caddr_t) ac->ac_enaddr,
-				      sizeof(ac->ac_enaddr));
-			}
-
-			/*
-			 * Set new address
-			 */
-			ifp->if_init(ifp->if_softc);
-			break;
-		}
-#endif
-		default:
-			ifp->if_init(ifp->if_softc);
-			break;
-		}
-		break;
-
-	case SIOCGIFADDR:
-		{
-			struct sockaddr *sa;
-
-			sa = (struct sockaddr *) & ifr->ifr_data;
-			bcopy(((struct arpcom *)ifp->if_softc)->ac_enaddr,
-			      (caddr_t) sa->sa_data, ETHER_ADDR_LEN);
-		}
-		break;
-
-	case SIOCSIFMTU:
-		/*
-		 * Set the interface MTU.
-		 */
-		if (ifr->ifr_mtu > ETHERMTU) {
-			error = EINVAL;
-		} else {
-			ifp->if_mtu = ifr->ifr_mtu;
-		}
-		break;
-	}
-	return (error);
-}
diff --git a/c/src/libnetworking/net/if_llc.h b/c/src/libnetworking/net/if_llc.h
deleted file mode 100644
index 3cdf652167..0000000000
--- a/c/src/libnetworking/net/if_llc.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Copyright (c) 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *      @(#)if_llc.h	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#ifndef _NET_IF_LLC_H_
-#define _NET_IF_LLC_H_
-
-/*
- * IEEE 802.2 Link Level Control headers, for use in conjunction with
- * 802.{3,4,5} media access control methods.
- *
- * Headers here do not use bit fields due to shortcomings in many
- * compilers.
- */
-
-struct llc {
-	u_char	llc_dsap;
-	u_char	llc_ssap;
-	union {
-	    struct {
-		u_char control;
-		u_char format_id;
-		u_char class;
-		u_char window_x2;
-	    } type_u;
-	    struct {
-		u_char num_snd_x2;
-		u_char num_rcv_x2;
-	    } type_i;
-	    struct {
-		u_char control;
-		u_char num_rcv_x2;
-	    } type_s;
-	    struct {
-	        u_char control;
-		struct frmrinfo {
-			u_char rej_pdu_0;
-			u_char rej_pdu_1;
-			u_char frmr_control;
-			u_char frmr_control_ext;
-			u_char frmr_cause;
-		} frmrinfo;
-	    } type_frmr;
-	    struct {
-		u_char control;
-		u_char org_code[3];
-		u_short ether_type;
-	    } type_snap;
-	    struct {
-		u_char control;
-		u_char control_ext;
-	    } type_raw;
-	} llc_un;
-};
-#define llc_control            llc_un.type_u.control
-#define	llc_control_ext        llc_un.type_raw.control_ext
-#define llc_fid                llc_un.type_u.format_id
-#define llc_class              llc_un.type_u.class
-#define llc_window             llc_un.type_u.window_x2
-#define llc_frmrinfo           llc_un.type_frmr.frmrinfo
-#define llc_frmr_pdu0          llc_un.type_frmr.frmrinfo.rej_pdu0
-#define llc_frmr_pdu1          llc_un.type_frmr.frmrinfo.rej_pdu1
-#define llc_frmr_control       llc_un.type_frmr.frmrinfo.frmr_control
-#define llc_frmr_control_ext   llc_un.type_frmr.frmrinfo.frmr_control_ext
-#define llc_frmr_cause         llc_un.type_frmr.frmrinfo.frmr_control_ext
-
-/*
- * Don't use sizeof(struct llc_un) for LLC header sizes
- */
-#define LLC_ISFRAMELEN 4
-#define LLC_UFRAMELEN  3
-#define LLC_FRMRLEN    7
-
-/*
- * Unnumbered LLC format commands
- */
-#define LLC_UI		0x3
-#define LLC_UI_P	0x13
-#define LLC_DISC	0x43
-#define	LLC_DISC_P	0x53
-#define LLC_UA		0x63
-#define LLC_UA_P	0x73
-#define LLC_TEST	0xe3
-#define LLC_TEST_P	0xf3
-#define LLC_FRMR	0x87
-#define	LLC_FRMR_P	0x97
-#define LLC_DM		0x0f
-#define	LLC_DM_P	0x1f
-#define LLC_XID		0xaf
-#define LLC_XID_P	0xbf
-#define LLC_SABME	0x6f
-#define LLC_SABME_P	0x7f
-
-/*
- * Supervisory LLC commands
- */
-#define	LLC_RR		0x01
-#define	LLC_RNR		0x05
-#define	LLC_REJ		0x09
-
-/*
- * Info format - dummy only
- */
-#define	LLC_INFO	0x00
-
-/*
- * ISO PDTR 10178 contains among others
- */
-#define LLC_X25_LSAP	0x7e
-#define LLC_SNAP_LSAP	0xaa
-#define LLC_ISO_LSAP	0xfe
-
-#endif
diff --git a/c/src/libnetworking/net/if_loop.c b/c/src/libnetworking/net/if_loop.c
deleted file mode 100644
index 3823c28744..0000000000
--- a/c/src/libnetworking/net/if_loop.c
+++ /dev/null
@@ -1,301 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)if_loop.c	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-/*
- * Loopback interface driver for protocol testing and timing.
- */
-#include "loop.h"
-#if NLOOP > 0
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/mbuf.h>
-#include <sys/socket.h>
-#include <sys/errno.h>
-#include <sys/ioctl.h>
-#include <sys/time.h>
-
-#include <net/if.h>
-#include <net/if_types.h>
-#include <net/netisr.h>
-#include <net/route.h>
-#include <net/bpf.h>
-
-#ifdef	INET
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/in_var.h>
-#include <netinet/ip.h>
-#endif
-
-#ifdef IPX
-#include <netipx/ipx.h>
-#include <netipx/ipx_if.h>
-#endif
-
-#ifdef NS
-#include <netns/ns.h>
-#include <netns/ns_if.h>
-#endif
-
-#ifdef ISO
-#include <netiso/iso.h>
-#include <netiso/iso_var.h>
-#endif
-
-#ifdef NETATALK
-#include <netinet/if_ether.h>
-#include <netatalk/at.h>
-#include <netatalk/at_var.h>
-#endif NETATALK
-
-#include "bpfilter.h"
-
-static int loioctl __P((struct ifnet *, int, caddr_t));
-static void lortrequest __P((int, struct rtentry *, struct sockaddr *));
-
-       void rtems_bsdnet_loopattach __P((void *));
-PSEUDO_SET(loopattach, if_loop);
-
-#ifdef TINY_LOMTU
-#define	LOMTU	(1024+512)
-#else
-#define LOMTU	16384
-#endif
-
-struct	ifnet loif[NLOOP];
-
-/* ARGSUSED */
-void
-rtems_bsdnet_loopattach(dummy)
-	void *dummy;
-{
-	register struct ifnet *ifp;
-	register int i = 0;
-
-	for (ifp = loif; i < NLOOP; ifp++) {
-	    ifp->if_name = "lo";
-	    ifp->if_next = NULL;
-	    ifp->if_unit = i++;
-	    ifp->if_mtu = LOMTU;
-	    ifp->if_flags = IFF_LOOPBACK | IFF_MULTICAST;
-	    ifp->if_ioctl = loioctl;
-	    ifp->if_output = looutput;
-	    ifp->if_type = IFT_LOOP;
-	    ifp->if_hdrlen = 0;
-	    ifp->if_addrlen = 0;
-	    if_attach(ifp);
-#if NBPFILTER > 0
-	    bpfattach(ifp, DLT_NULL, sizeof(u_int));
-#endif
-	}
-}
-
-int
-looutput(ifp, m, dst, rt)
-	struct ifnet *ifp;
-	register struct mbuf *m;
-	struct sockaddr *dst;
-	register struct rtentry *rt;
-{
-	int s, isr;
-	register struct ifqueue *ifq = 0;
-
-	if ((m->m_flags & M_PKTHDR) == 0)
-		panic("looutput no HDR");
-#if NBPFILTER > 0
-	/* BPF write needs to be handled specially */
-	if (dst->sa_family == AF_UNSPEC) {
-		dst->sa_family = *(mtod(m, int *));
-		m->m_len -= sizeof(int);
-		m->m_pkthdr.len -= sizeof(int);
-		m->m_data += sizeof(int);
-	}
-
-	if (ifp->if_bpf) {
-		/*
-		 * We need to prepend the address family as
-		 * a four byte field.  Cons up a dummy header
-		 * to pacify bpf.  This is safe because bpf
-		 * will only read from the mbuf (i.e., it won't
-		 * try to free it or keep a pointer a to it).
-		 */
-		struct mbuf m0;
-		u_int af = dst->sa_family;
-
-		m0.m_next = m;
-		m0.m_len = 4;
-		m0.m_data = (char *)&af;
-
-		bpf_mtap(ifp, &m0);
-	}
-#endif
-	m->m_pkthdr.rcvif = ifp;
-
-	if (rt && rt->rt_flags & (RTF_REJECT|RTF_BLACKHOLE)) {
-		m_freem(m);
-		return (rt->rt_flags & RTF_BLACKHOLE ? 0 :
-		        rt->rt_flags & RTF_HOST ? EHOSTUNREACH : ENETUNREACH);
-	}
-	ifp->if_opackets++;
-	ifp->if_obytes += m->m_pkthdr.len;
-	switch (dst->sa_family) {
-
-#ifdef INET
-	case AF_INET:
-		ifq = &ipintrq;
-		isr = NETISR_IP;
-		break;
-#endif
-#ifdef IPX
-	case AF_IPX:
-		ifq = &ipxintrq;
-		isr = NETISR_IPX;
-		break;
-#endif
-#ifdef NS
-	case AF_NS:
-		ifq = &nsintrq;
-		isr = NETISR_NS;
-		break;
-#endif
-#ifdef ISO
-	case AF_ISO:
-		ifq = &clnlintrq;
-		isr = NETISR_ISO;
-		break;
-#endif
-#ifdef NETATALK
-	case AF_APPLETALK:
-	        ifq = &atintrq2;
-		isr = NETISR_ATALK;
-		break;
-#endif NETATALK
-	default:
-		printf("lo%d: can't handle af%d\n", ifp->if_unit,
-			dst->sa_family);
-		m_freem(m);
-		return (EAFNOSUPPORT);
-	}
-	s = splimp();
-	if (IF_QFULL(ifq)) {
-		IF_DROP(ifq);
-		m_freem(m);
-		splx(s);
-		return (ENOBUFS);
-	}
-	IF_ENQUEUE(ifq, m);
-	schednetisr(isr);
-	ifp->if_ipackets++;
-	ifp->if_ibytes += m->m_pkthdr.len;
-	splx(s);
-	return (0);
-}
-
-/* ARGSUSED */
-static void
-lortrequest(cmd, rt, sa)
-	int cmd;
-	struct rtentry *rt;
-	struct sockaddr *sa;
-{
-	if (rt) {
-		rt->rt_rmx.rmx_mtu = rt->rt_ifp->if_mtu; /* for ISO */
-		/*
-		 * For optimal performance, the send and receive buffers
-		 * should be at least twice the MTU plus a little more for
-		 * overhead.
-		 */
-		rt->rt_rmx.rmx_recvpipe = 
-			rt->rt_rmx.rmx_sendpipe = 3 * LOMTU;
-	}
-}
-
-/*
- * Process an ioctl request.
- */
-/* ARGSUSED */
-static int
-loioctl(ifp, cmd, data)
-	register struct ifnet *ifp;
-	int cmd;
-	caddr_t data;
-{
-	register struct ifaddr *ifa;
-	register struct ifreq *ifr = (struct ifreq *)data;
-	register int error = 0;
-
-	switch (cmd) {
-
-	case SIOCSIFADDR:
-		ifp->if_flags |= IFF_UP | IFF_RUNNING;
-		ifa = (struct ifaddr *)data;
-		ifa->ifa_rtrequest = lortrequest;
-		/*
-		 * Everything else is done at a higher level.
-		 */
-		break;
-
-	case SIOCADDMULTI:
-	case SIOCDELMULTI:
-		if (ifr == 0) {
-			error = EAFNOSUPPORT;		/* XXX */
-			break;
-		}
-		switch (ifr->ifr_addr.sa_family) {
-
-#ifdef INET
-		case AF_INET:
-			break;
-#endif
-
-		default:
-			error = EAFNOSUPPORT;
-			break;
-		}
-		break;
-
-	case SIOCSIFMTU:
-		ifp->if_mtu = ifr->ifr_mtu;
-		break;
-
-	default:
-		error = EINVAL;
-	}
-	return (error);
-}
-#endif /* NLOOP > 0 */
diff --git a/c/src/libnetworking/net/if_types.h b/c/src/libnetworking/net/if_types.h
deleted file mode 100644
index 833ba471c3..0000000000
--- a/c/src/libnetworking/net/if_types.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright (c) 1989, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)if_types.h	8.2 (Berkeley) 4/20/94
- * $Id$
- */
-
-#ifndef _NET_IF_TYPES_H_
-#define _NET_IF_TYPES_H_
-
-/*
- * Interface types for benefit of parsing media address headers.
- * This list is derived from the SNMP list of ifTypes, currently
- * documented in RFC1573.
- */
-
-#define	IFT_OTHER	0x1		/* none of the following */
-#define	IFT_1822	0x2		/* old-style arpanet imp */
-#define	IFT_HDH1822	0x3		/* HDH arpanet imp */
-#define	IFT_X25DDN	0x4		/* x25 to imp */
-#define	IFT_X25		0x5		/* PDN X25 interface (RFC877) */
-#define	IFT_ETHER	0x6		/* Ethernet CSMACD */
-#define	IFT_ISO88023	0x7		/* CMSA CD */
-#define	IFT_ISO88024	0x8		/* Token Bus */
-#define	IFT_ISO88025	0x9		/* Token Ring */
-#define	IFT_ISO88026	0xa		/* MAN */
-#define	IFT_STARLAN	0xb
-#define	IFT_P10		0xc		/* Proteon 10MBit ring */
-#define	IFT_P80		0xd		/* Proteon 80MBit ring */
-#define	IFT_HY		0xe		/* Hyperchannel */
-#define	IFT_FDDI	0xf
-#define	IFT_LAPB	0x10
-#define	IFT_SDLC	0x11
-#define	IFT_T1		0x12
-#define	IFT_CEPT	0x13		/* E1 - european T1 */
-#define	IFT_ISDNBASIC	0x14
-#define	IFT_ISDNPRIMARY	0x15
-#define	IFT_PTPSERIAL	0x16		/* Proprietary PTP serial */
-#define	IFT_PPP		0x17		/* RFC 1331 */
-#define	IFT_LOOP	0x18		/* loopback */
-#define	IFT_EON		0x19		/* ISO over IP */
-#define	IFT_XETHER	0x1a		/* obsolete 3MB experimental ethernet */
-#define	IFT_NSIP	0x1b		/* XNS over IP */
-#define	IFT_SLIP	0x1c		/* IP over generic TTY */
-#define	IFT_ULTRA	0x1d		/* Ultra Technologies */
-#define	IFT_DS3		0x1e		/* Generic T3 */
-#define	IFT_SIP		0x1f		/* SMDS */
-#define	IFT_FRELAY	0x20		/* Frame Relay DTE only */
-#define	IFT_RS232	0x21
-#define	IFT_PARA	0x22		/* parallel-port */
-#define	IFT_ARCNET	0x23
-#define	IFT_ARCNETPLUS	0x24
-#define	IFT_ATM		0x25		/* ATM cells */
-#define	IFT_MIOX25	0x26
-#define	IFT_SONET	0x27		/* SONET or SDH */
-#define	IFT_X25PLE	0x28
-#define	IFT_ISO88022LLC	0x29
-#define	IFT_LOCALTALK	0x2a
-#define	IFT_SMDSDXI	0x2b
-#define	IFT_FRELAYDCE	0x2c		/* Frame Relay DCE */
-#define	IFT_V35		0x2d
-#define	IFT_HSSI	0x2e
-#define	IFT_HIPPI	0x2f
-#define	IFT_MODEM	0x30		/* Generic Modem */
-#define	IFT_AAL5	0x31		/* AAL5 over ATM */
-#define	IFT_SONETPATH	0x32
-#define	IFT_SONETVT	0x33
-#define	IFT_SMDSICIP	0x34		/* SMDS InterCarrier Interface */
-#define	IFT_PROPVIRTUAL	0x35		/* Proprietary Virtual/internal */
-#define	IFT_PROPMUX	0x36		/* Proprietary Multiplexing */
-
-#endif
diff --git a/c/src/libnetworking/net/netisr.h b/c/src/libnetworking/net/netisr.h
deleted file mode 100644
index 73269a4442..0000000000
--- a/c/src/libnetworking/net/netisr.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (c) 1980, 1986, 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)netisr.h	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#ifndef _NET_NETISR_H_
-#define _NET_NETISR_H_
-
-/*
- * The networking code runs off software interrupts.
- *
- * You can switch into the network by doing splnet() and return by splx().
- * The software interrupt level for the network is higher than the software
- * level for the clock (so you can enter the network in routines called
- * at timeout time).
- */
-#if defined(vax) || defined(tahoe)
-#define	setsoftnet()	mtpr(SIRR, 12)
-#endif
-
-/*
- * Each ``pup-level-1'' input queue has a bit in a ``netisr'' status
- * word which is used to de-multiplex a single software
- * interrupt used for scheduling the network code to calls
- * on the lowest level routine of each protocol.
- */
-#define	NETISR_RAW	0		/* same as AF_UNSPEC */
-#define	NETISR_IP	2		/* same as AF_INET */
-#define	NETISR_IMP	3		/* same as AF_IMPLINK */
-#define	NETISR_NS	6		/* same as AF_NS */
-#define	NETISR_ISO	7		/* same as AF_ISO */
-#define	NETISR_CCITT	10		/* same as AF_CCITT */
-#define NETISR_ATALK    16              /* same as AF_APPLETALK */
-#define	NETISR_ARP	18		/* same as AF_LINK */
-#define NETISR_IPX	23		/* same as AF_IPX */
-#define	NETISR_ISDN	26		/* same as AF_E164 */
-#define	NETISR_PPP	27		/* PPP soft interrupt */
-
-#define	schednetisr(anisr)	rtems_bsdnet_schednetisr(anisr)
-
-#ifndef LOCORE
-#ifdef KERNEL
-extern volatile unsigned int	netisr;	/* scheduling bits for network */
-
-typedef void netisr_t(void);
-
-struct netisrtab {
-	int nit_num;
-	netisr_t *nit_isr;
-};
-
-#define NETISR_SET(num, isr)
-
-int register_netisr __P((int, netisr_t *));
-
-#endif
-#endif
-
-#endif
diff --git a/c/src/libnetworking/net/radix.c b/c/src/libnetworking/net/radix.c
deleted file mode 100644
index bc1b7ee1d1..0000000000
--- a/c/src/libnetworking/net/radix.c
+++ /dev/null
@@ -1,1028 +0,0 @@
-/*
- * Copyright (c) 1988, 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)radix.c	8.4 (Berkeley) 11/2/94
- *	$Id$
- */
-
-/*
- * Routines to build and maintain radix trees for routing lookups.
- */
-#ifndef _RADIX_H_
-#include <sys/param.h>
-#ifdef	KERNEL
-#include <sys/systm.h>
-#include <sys/malloc.h>
-#define	M_DONTWAIT M_NOWAIT
-#include <sys/domain.h>
-#else
-#include <stdlib.h>
-#endif
-#include <sys/syslog.h>
-#include <net/radix.h>
-#endif
-
-static struct radix_node *
-		rn_lookup __P((void *v_arg, void *m_arg,
-			       struct radix_node_head *head));
-static int	rn_walktree_from __P((struct radix_node_head *h, void *a,
-				      void *m, walktree_f_t *f, void *w));
-static int rn_walktree __P((struct radix_node_head *, walktree_f_t *, void *));
-static struct radix_node
-	 *rn_delete __P((void *, void *, struct radix_node_head *)),
-	 *rn_insert __P((void *, struct radix_node_head *, int *,
-			struct radix_node [2])),
-	 *rn_newpair __P((void *, int, struct radix_node[2])),
-	 *rn_search __P((void *, struct radix_node *)),
-	 *rn_search_m __P((void *, struct radix_node *, void *));
-
-static int	max_keylen;
-static struct radix_mask *rn_mkfreelist;
-static struct radix_node_head *mask_rnhead;
-static char *addmask_key;
-static char normal_chars[] = {0, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfe, -1};
-static char *rn_zeros, *rn_ones;
-
-#define rn_masktop (mask_rnhead->rnh_treetop)
-#undef Bcmp
-#define Bcmp(a, b, l) (l == 0 ? 0 : bcmp((caddr_t)(a), (caddr_t)(b), (u_long)l))
-
-static int	rn_lexobetter __P((void *m_arg, void *n_arg));
-static struct radix_mask *
-		rn_new_radix_mask __P((struct radix_node *tt,
-				       struct radix_mask *next));
-static int	rn_satsifies_leaf __P((char *trial, struct radix_node *leaf,
-				       int skip));
-
-/*
- * The data structure for the keys is a radix tree with one way
- * branching removed.  The index rn_b at an internal node n represents a bit
- * position to be tested.  The tree is arranged so that all descendants
- * of a node n have keys whose bits all agree up to position rn_b - 1.
- * (We say the index of n is rn_b.)
- *
- * There is at least one descendant which has a one bit at position rn_b,
- * and at least one with a zero there.
- *
- * A route is determined by a pair of key and mask.  We require that the
- * bit-wise logical and of the key and mask to be the key.
- * We define the index of a route to associated with the mask to be
- * the first bit number in the mask where 0 occurs (with bit number 0
- * representing the highest order bit).
- *
- * We say a mask is normal if every bit is 0, past the index of the mask.
- * If a node n has a descendant (k, m) with index(m) == index(n) == rn_b,
- * and m is a normal mask, then the route applies to every descendant of n.
- * If the index(m) < rn_b, this implies the trailing last few bits of k
- * before bit b are all 0, (and hence consequently true of every descendant
- * of n), so the route applies to all descendants of the node as well.
- *
- * Similar logic shows that a non-normal mask m such that
- * index(m) <= index(n) could potentially apply to many children of n.
- * Thus, for each non-host route, we attach its mask to a list at an internal
- * node as high in the tree as we can go.
- *
- * The present version of the code makes use of normal routes in short-
- * circuiting an explict mask and compare operation when testing whether
- * a key satisfies a normal route, and also in remembering the unique leaf
- * that governs a subtree.
- */
-
-static struct radix_node *
-rn_search(v_arg, head)
-	void *v_arg;
-	struct radix_node *head;
-{
-	register struct radix_node *x;
-	register caddr_t v;
-
-	for (x = head, v = v_arg; x->rn_b >= 0;) {
-		if (x->rn_bmask & v[x->rn_off])
-			x = x->rn_r;
-		else
-			x = x->rn_l;
-	}
-	return (x);
-};
-
-static struct radix_node *
-rn_search_m(v_arg, head, m_arg)
-	struct radix_node *head;
-	void *v_arg, *m_arg;
-{
-	register struct radix_node *x;
-	register caddr_t v = v_arg, m = m_arg;
-
-	for (x = head; x->rn_b >= 0;) {
-		if ((x->rn_bmask & m[x->rn_off]) &&
-		    (x->rn_bmask & v[x->rn_off]))
-			x = x->rn_r;
-		else
-			x = x->rn_l;
-	}
-	return x;
-};
-
-int
-rn_refines(m_arg, n_arg)
-	void *m_arg, *n_arg;
-{
-	register caddr_t m = m_arg, n = n_arg;
-	register caddr_t lim, lim2 = lim = n + *(u_char *)n;
-	int longer = (*(u_char *)n++) - (int)(*(u_char *)m++);
-	int masks_are_equal = 1;
-
-	if (longer > 0)
-		lim -= longer;
-	while (n < lim) {
-		if (*n & ~(*m))
-			return 0;
-		if (*n++ != *m++)
-			masks_are_equal = 0;
-	}
-	while (n < lim2)
-		if (*n++)
-			return 0;
-	if (masks_are_equal && (longer < 0))
-		for (lim2 = m - longer; m < lim2; )
-			if (*m++)
-				return 1;
-	return (!masks_are_equal);
-}
-
-struct radix_node *
-rn_lookup(v_arg, m_arg, head)
-	void *v_arg, *m_arg;
-	struct radix_node_head *head;
-{
-	register struct radix_node *x;
-	caddr_t netmask = 0;
-
-	if (m_arg) {
-		if ((x = rn_addmask(m_arg, 1, head->rnh_treetop->rn_off)) == 0)
-			return (0);
-		netmask = x->rn_key;
-	}
-	x = rn_match(v_arg, head);
-	if (x && netmask) {
-		while (x && x->rn_mask != netmask)
-			x = x->rn_dupedkey;
-	}
-	return x;
-}
-
-static int
-rn_satsifies_leaf(trial, leaf, skip)
-	char *trial;
-	register struct radix_node *leaf;
-	int skip;
-{
-	register char *cp = trial, *cp2 = leaf->rn_key, *cp3 = leaf->rn_mask;
-	char *cplim;
-	int length = min(*(u_char *)cp, *(u_char *)cp2);
-
-	if (cp3 == 0)
-		cp3 = rn_ones;
-	else
-		length = min(length, *(u_char *)cp3);
-	cplim = cp + length; cp3 += skip; cp2 += skip;
-	for (cp += skip; cp < cplim; cp++, cp2++, cp3++)
-		if ((*cp ^ *cp2) & *cp3)
-			return 0;
-	return 1;
-}
-
-struct radix_node *
-rn_match(v_arg, head)
-	void *v_arg;
-	struct radix_node_head *head;
-{
-	caddr_t v = v_arg;
-	register struct radix_node *t = head->rnh_treetop, *x;
-	register caddr_t cp = v, cp2;
-	caddr_t cplim;
-	struct radix_node *saved_t, *top = t;
-	int off = t->rn_off, vlen = *(u_char *)cp, matched_off;
-	register int test, b, rn_b;
-
-	/*
-	 * Open code rn_search(v, top) to avoid overhead of extra
-	 * subroutine call.
-	 */
-	for (; t->rn_b >= 0; ) {
-		if (t->rn_bmask & cp[t->rn_off])
-			t = t->rn_r;
-		else
-			t = t->rn_l;
-	}
-	/*
-	 * See if we match exactly as a host destination
-	 * or at least learn how many bits match, for normal mask finesse.
-	 *
-	 * It doesn't hurt us to limit how many bytes to check
-	 * to the length of the mask, since if it matches we had a genuine
-	 * match and the leaf we have is the most specific one anyway;
-	 * if it didn't match with a shorter length it would fail
-	 * with a long one.  This wins big for class B&C netmasks which
-	 * are probably the most common case...
-	 */
-	if (t->rn_mask)
-		vlen = *(u_char *)t->rn_mask;
-	cp += off; cp2 = t->rn_key + off; cplim = v + vlen;
-	for (; cp < cplim; cp++, cp2++)
-		if (*cp != *cp2)
-			goto on1;
-	/*
-	 * This extra grot is in case we are explicitly asked
-	 * to look up the default.  Ugh!
-	 */
-	if ((t->rn_flags & RNF_ROOT) && t->rn_dupedkey)
-		t = t->rn_dupedkey;
-	return t;
-on1:
-	test = (*cp ^ *cp2) & 0xff; /* find first bit that differs */
-	for (b = 7; (test >>= 1) > 0;)
-		b--;
-	matched_off = cp - v;
-	b += matched_off << 3;
-	rn_b = -1 - b;
-	/*
-	 * If there is a host route in a duped-key chain, it will be first.
-	 */
-	if ((saved_t = t)->rn_mask == 0)
-		t = t->rn_dupedkey;
-	for (; t; t = t->rn_dupedkey)
-		/*
-		 * Even if we don't match exactly as a host,
-		 * we may match if the leaf we wound up at is
-		 * a route to a net.
-		 */
-		if (t->rn_flags & RNF_NORMAL) {
-			if (rn_b <= t->rn_b)
-				return t;
-		} else if (rn_satsifies_leaf(v, t, matched_off))
-				return t;
-	t = saved_t;
-	/* start searching up the tree */
-	do {
-		register struct radix_mask *m;
-		t = t->rn_p;
-		m = t->rn_mklist;
-		if (m) {
-			/*
-			 * If non-contiguous masks ever become important
-			 * we can restore the masking and open coding of
-			 * the search and satisfaction test and put the
-			 * calculation of "off" back before the "do".
-			 */
-			do {
-				if (m->rm_flags & RNF_NORMAL) {
-					if (rn_b <= m->rm_b)
-						return (m->rm_leaf);
-				} else {
-					off = min(t->rn_off, matched_off);
-					x = rn_search_m(v, t, m->rm_mask);
-					while (x && x->rn_mask != m->rm_mask)
-						x = x->rn_dupedkey;
-					if (x && rn_satsifies_leaf(v, x, off))
-						    return x;
-				}
-				m = m->rm_mklist;
-			} while (m);
-		}
-	} while (t != top);
-	return 0;
-};
-
-#ifdef RN_DEBUG
-int	rn_nodenum;
-struct	radix_node *rn_clist;
-int	rn_saveinfo;
-int	rn_debug =  1;
-#endif
-
-static struct radix_node *
-rn_newpair(v, b, nodes)
-	void *v;
-	int b;
-	struct radix_node nodes[2];
-{
-	register struct radix_node *tt = nodes, *t = tt + 1;
-	t->rn_b = b; t->rn_bmask = 0x80 >> (b & 7);
-	t->rn_l = tt; t->rn_off = b >> 3;
-	tt->rn_b = -1; tt->rn_key = (caddr_t)v; tt->rn_p = t;
-	tt->rn_flags = t->rn_flags = RNF_ACTIVE;
-#ifdef RN_DEBUG
-	tt->rn_info = rn_nodenum++; t->rn_info = rn_nodenum++;
-	tt->rn_twin = t; tt->rn_ybro = rn_clist; rn_clist = tt;
-#endif
-	return t;
-}
-
-static struct radix_node *
-rn_insert(v_arg, head, dupentry, nodes)
-	void *v_arg;
-	struct radix_node_head *head;
-	int *dupentry;
-	struct radix_node nodes[2];
-{
-	caddr_t v = v_arg;
-	struct radix_node *top = head->rnh_treetop;
-	int head_off = top->rn_off, vlen = (int)*((u_char *)v);
-	register struct radix_node *t = rn_search(v_arg, top);
-	register caddr_t cp = v + head_off;
-	register int b;
-	struct radix_node *tt;
-    	/*
-	 * Find first bit at which v and t->rn_key differ
-	 */
-    {
-	register caddr_t cp2 = t->rn_key + head_off;
-	register int cmp_res;
-	caddr_t cplim = v + vlen;
-
-	while (cp < cplim)
-		if (*cp2++ != *cp++)
-			goto on1;
-	*dupentry = 1;
-	return t;
-on1:
-	*dupentry = 0;
-	cmp_res = (cp[-1] ^ cp2[-1]) & 0xff;
-	for (b = (cp - v) << 3; cmp_res; b--)
-		cmp_res >>= 1;
-    }
-    {
-	register struct radix_node *p, *x = top;
-	cp = v;
-	do {
-		p = x;
-		if (cp[x->rn_off] & x->rn_bmask)
-			x = x->rn_r;
-		else x = x->rn_l;
-	} while (b > (unsigned) x->rn_b); /* x->rn_b < b && x->rn_b >= 0 */
-#ifdef RN_DEBUG
-	if (rn_debug)
-		log(LOG_DEBUG, "rn_insert: Going In:\n"), traverse(p);
-#endif
-	t = rn_newpair(v_arg, b, nodes); tt = t->rn_l;
-	if ((cp[p->rn_off] & p->rn_bmask) == 0)
-		p->rn_l = t;
-	else
-		p->rn_r = t;
-	x->rn_p = t; t->rn_p = p; /* frees x, p as temp vars below */
-	if ((cp[t->rn_off] & t->rn_bmask) == 0) {
-		t->rn_r = x;
-	} else {
-		t->rn_r = tt; t->rn_l = x;
-	}
-#ifdef RN_DEBUG
-	if (rn_debug)
-		log(LOG_DEBUG, "rn_insert: Coming Out:\n"), traverse(p);
-#endif
-    }
-	return (tt);
-}
-
-struct radix_node *
-rn_addmask(n_arg, search, skip)
-	int search, skip;
-	void *n_arg;
-{
-	caddr_t netmask = (caddr_t)n_arg;
-	register struct radix_node *x;
-	register caddr_t cp, cplim;
-	register int b = 0, mlen, j;
-	int maskduplicated, m0, isnormal;
-	struct radix_node *saved_x;
-	static int last_zeroed = 0;
-
-	if ((mlen = *(u_char *)netmask) > max_keylen)
-		mlen = max_keylen;
-	if (skip == 0)
-		skip = 1;
-	if (mlen <= skip)
-		return (mask_rnhead->rnh_nodes);
-	if (skip > 1)
-		Bcopy(rn_ones + 1, addmask_key + 1, skip - 1);
-	if ((m0 = mlen) > skip)
-		Bcopy(netmask + skip, addmask_key + skip, mlen - skip);
-	/*
-	 * Trim trailing zeroes.
-	 */
-	for (cp = addmask_key + mlen; (cp > addmask_key) && cp[-1] == 0;)
-		cp--;
-	mlen = cp - addmask_key;
-	if (mlen <= skip) {
-		if (m0 >= last_zeroed)
-			last_zeroed = mlen;
-		return (mask_rnhead->rnh_nodes);
-	}
-	if (m0 < last_zeroed)
-		Bzero(addmask_key + m0, last_zeroed - m0);
-	*addmask_key = last_zeroed = mlen;
-	x = rn_search(addmask_key, rn_masktop);
-	if (Bcmp(addmask_key, x->rn_key, mlen) != 0)
-		x = 0;
-	if (x || search)
-		return (x);
-	R_Malloc(x, struct radix_node *, max_keylen + 2 * sizeof (*x));
-	if ((saved_x = x) == 0)
-		return (0);
-	Bzero(x, max_keylen + 2 * sizeof (*x));
-	netmask = cp = (caddr_t)(x + 2);
-	Bcopy(addmask_key, cp, mlen);
-	x = rn_insert(cp, mask_rnhead, &maskduplicated, x);
-	if (maskduplicated) {
-		log(LOG_ERR, "rn_addmask: mask impossibly already in tree");
-		Free(saved_x);
-		return (x);
-	}
-	/*
-	 * Calculate index of mask, and check for normalcy.
-	 */
-	cplim = netmask + mlen; isnormal = 1;
-	for (cp = netmask + skip; (cp < cplim) && *(u_char *)cp == 0xff;)
-		cp++;
-	if (cp != cplim) {
-		for (j = 0x80; (j & *cp) != 0; j >>= 1)
-			b++;
-		if (*cp != normal_chars[b] || cp != (cplim - 1))
-			isnormal = 0;
-	}
-	b += (cp - netmask) << 3;
-	x->rn_b = -1 - b;
-	if (isnormal)
-		x->rn_flags |= RNF_NORMAL;
-	return (x);
-}
-
-static int	/* XXX: arbitrary ordering for non-contiguous masks */
-rn_lexobetter(m_arg, n_arg)
-	void *m_arg, *n_arg;
-{
-	register u_char *mp = m_arg, *np = n_arg, *lim;
-
-	if (*mp > *np)
-		return 1;  /* not really, but need to check longer one first */
-	if (*mp == *np)
-		for (lim = mp + *mp; mp < lim;)
-			if (*mp++ > *np++)
-				return 1;
-	return 0;
-}
-
-static struct radix_mask *
-rn_new_radix_mask(tt, next)
-	register struct radix_node *tt;
-	register struct radix_mask *next;
-{
-	register struct radix_mask *m;
-
-	MKGet(m);
-	if (m == 0) {
-		log(LOG_ERR, "Mask for route not entered\n");
-		return (0);
-	}
-	Bzero(m, sizeof *m);
-	m->rm_b = tt->rn_b;
-	m->rm_flags = tt->rn_flags;
-	if (tt->rn_flags & RNF_NORMAL)
-		m->rm_leaf = tt;
-	else
-		m->rm_mask = tt->rn_mask;
-	m->rm_mklist = next;
-	tt->rn_mklist = m;
-	return m;
-}
-
-struct radix_node *
-rn_addroute(v_arg, n_arg, head, treenodes)
-	void *v_arg, *n_arg;
-	struct radix_node_head *head;
-	struct radix_node treenodes[2];
-{
-	caddr_t v = (caddr_t)v_arg, netmask = (caddr_t)n_arg;
-	register struct radix_node *t, *x = 0, *tt;
-	struct radix_node *saved_tt, *top = head->rnh_treetop;
-	short b = 0, b_leaf = 0;
-	int keyduplicated;
-	caddr_t mmask;
-	struct radix_mask *m, **mp;
-
-	/*
-	 * In dealing with non-contiguous masks, there may be
-	 * many different routes which have the same mask.
-	 * We will find it useful to have a unique pointer to
-	 * the mask to speed avoiding duplicate references at
-	 * nodes and possibly save time in calculating indices.
-	 */
-	if (netmask)  {
-		if ((x = rn_addmask(netmask, 0, top->rn_off)) == 0)
-			return (0);
-		b_leaf = x->rn_b;
-		b = -1 - x->rn_b;
-		netmask = x->rn_key;
-	}
-	/*
-	 * Deal with duplicated keys: attach node to previous instance
-	 */
-	saved_tt = tt = rn_insert(v, head, &keyduplicated, treenodes);
-	if (keyduplicated) {
-		for (t = tt; tt; t = tt, tt = tt->rn_dupedkey) {
-			if (tt->rn_mask == netmask)
-				return (0);
-			if (netmask == 0 ||
-			    (tt->rn_mask &&
-			     ((b_leaf < tt->rn_b) || /* index(netmask) > node */
-			       rn_refines(netmask, tt->rn_mask) ||
-			       rn_lexobetter(netmask, tt->rn_mask))))
-				break;
-		}
-		/*
-		 * If the mask is not duplicated, we wouldn't
-		 * find it among possible duplicate key entries
-		 * anyway, so the above test doesn't hurt.
-		 *
-		 * We sort the masks for a duplicated key the same way as
-		 * in a masklist -- most specific to least specific.
-		 * This may require the unfortunate nuisance of relocating
-		 * the head of the list.
-		 */
-		if (tt == saved_tt) {
-			struct	radix_node *xx = x;
-			/* link in at head of list */
-			(tt = treenodes)->rn_dupedkey = t;
-			tt->rn_flags = t->rn_flags;
-			tt->rn_p = x = t->rn_p;
-			t->rn_p = tt;				/* parent */
-			if (x->rn_l == t) x->rn_l = tt; else x->rn_r = tt;
-			saved_tt = tt; x = xx;
-		} else {
-			(tt = treenodes)->rn_dupedkey = t->rn_dupedkey;
-			t->rn_dupedkey = tt;
-			tt->rn_p = t;				/* parent */
-			if (tt->rn_dupedkey)			/* parent */
-				tt->rn_dupedkey->rn_p = tt;	/* parent */
-		}
-#ifdef RN_DEBUG
-		t=tt+1; tt->rn_info = rn_nodenum++; t->rn_info = rn_nodenum++;
-		tt->rn_twin = t; tt->rn_ybro = rn_clist; rn_clist = tt;
-#endif
-		tt->rn_key = (caddr_t) v;
-		tt->rn_b = -1;
-		tt->rn_flags = RNF_ACTIVE;
-	}
-	/*
-	 * Put mask in tree.
-	 */
-	if (netmask) {
-		tt->rn_mask = netmask;
-		tt->rn_b = x->rn_b;
-		tt->rn_flags |= x->rn_flags & RNF_NORMAL;
-	}
-	t = saved_tt->rn_p;
-	if (keyduplicated)
-		goto on2;
-	b_leaf = -1 - t->rn_b;
-	if (t->rn_r == saved_tt) x = t->rn_l; else x = t->rn_r;
-	/* Promote general routes from below */
-	if (x->rn_b < 0) {
-	    for (mp = &t->rn_mklist; x; x = x->rn_dupedkey)
-		if (x->rn_mask && (x->rn_b >= b_leaf) && x->rn_mklist == 0) {
-			*mp = m = rn_new_radix_mask(x, 0);
-			if (m)
-				mp = &m->rm_mklist;
-		}
-	} else if (x->rn_mklist) {
-		/*
-		 * Skip over masks whose index is > that of new node
-		 */
-		for (mp = &x->rn_mklist; (m = *mp); mp = &m->rm_mklist)
-			if (m->rm_b >= b_leaf)
-				break;
-		t->rn_mklist = m; *mp = 0;
-	}
-on2:
-	/* Add new route to highest possible ancestor's list */
-	if ((netmask == 0) || (b > t->rn_b ))
-		return tt; /* can't lift at all */
-	b_leaf = tt->rn_b;
-	do {
-		x = t;
-		t = t->rn_p;
-	} while (b <= t->rn_b && x != top);
-	/*
-	 * Search through routes associated with node to
-	 * insert new route according to index.
-	 * Need same criteria as when sorting dupedkeys to avoid
-	 * double loop on deletion.
-	 */
-	for (mp = &x->rn_mklist; (m = *mp); mp = &m->rm_mklist) {
-		if (m->rm_b < b_leaf)
-			continue;
-		if (m->rm_b > b_leaf)
-			break;
-		if (m->rm_flags & RNF_NORMAL) {
-			mmask = m->rm_leaf->rn_mask;
-			if (tt->rn_flags & RNF_NORMAL) {
-				log(LOG_ERR,
-				   "Non-unique normal route, mask not entered");
-				return tt;
-			}
-		} else
-			mmask = m->rm_mask;
-		if (mmask == netmask) {
-			m->rm_refs++;
-			tt->rn_mklist = m;
-			return tt;
-		}
-		if (rn_refines(netmask, mmask) || rn_lexobetter(netmask, mmask))
-			break;
-	}
-	*mp = rn_new_radix_mask(tt, *mp);
-	return tt;
-}
-
-static struct radix_node *
-rn_delete(v_arg, netmask_arg, head)
-	void *v_arg, *netmask_arg;
-	struct radix_node_head *head;
-{
-	register struct radix_node *t, *p, *x, *tt;
-	struct radix_mask *m, *saved_m, **mp;
-	struct radix_node *dupedkey, *saved_tt, *top;
-	caddr_t v, netmask;
-	int b, head_off, vlen;
-
-	v = v_arg;
-	netmask = netmask_arg;
-	x = head->rnh_treetop;
-	tt = rn_search(v, x);
-	head_off = x->rn_off;
-	vlen =  *(u_char *)v;
-	saved_tt = tt;
-	top = x;
-	if (tt == 0 ||
-	    Bcmp(v + head_off, tt->rn_key + head_off, vlen - head_off))
-		return (0);
-	/*
-	 * Delete our route from mask lists.
-	 */
-	if (netmask) {
-		if ((x = rn_addmask(netmask, 1, head_off)) == 0)
-			return (0);
-		netmask = x->rn_key;
-		while (tt->rn_mask != netmask)
-			if ((tt = tt->rn_dupedkey) == 0)
-				return (0);
-	}
-	if (tt->rn_mask == 0 || (saved_m = m = tt->rn_mklist) == 0)
-		goto on1;
-	if (tt->rn_flags & RNF_NORMAL) {
-		if (m->rm_leaf != tt || m->rm_refs > 0) {
-			log(LOG_ERR, "rn_delete: inconsistent annotation\n");
-			return 0;  /* dangling ref could cause disaster */
-		}
-	} else {
-		if (m->rm_mask != tt->rn_mask) {
-			log(LOG_ERR, "rn_delete: inconsistent annotation\n");
-			goto on1;
-		}
-		if (--m->rm_refs >= 0)
-			goto on1;
-	}
-	b = -1 - tt->rn_b;
-	t = saved_tt->rn_p;
-	if (b > t->rn_b)
-		goto on1; /* Wasn't lifted at all */
-	do {
-		x = t;
-		t = t->rn_p;
-	} while (b <= t->rn_b && x != top);
-	for (mp = &x->rn_mklist; (m = *mp); mp = &m->rm_mklist)
-		if (m == saved_m) {
-			*mp = m->rm_mklist;
-			MKFree(m);
-			break;
-		}
-	if (m == 0) {
-		log(LOG_ERR, "rn_delete: couldn't find our annotation\n");
-		if (tt->rn_flags & RNF_NORMAL)
-			return (0); /* Dangling ref to us */
-	}
-on1:
-	/*
-	 * Eliminate us from tree
-	 */
-	if (tt->rn_flags & RNF_ROOT)
-		return (0);
-#ifdef RN_DEBUG
-	/* Get us out of the creation list */
-	for (t = rn_clist; t && t->rn_ybro != tt; t = t->rn_ybro) {}
-	if (t) t->rn_ybro = tt->rn_ybro;
-#endif
-	t = tt->rn_p;
-	dupedkey = saved_tt->rn_dupedkey;
-	if (dupedkey) {
-		/*
-		 * at this point, tt is the deletion target and saved_tt
-		 * is the head of the dupekey chain
-		 */
-		if (tt == saved_tt) {
-			/* remove from head of chain */
-			x = dupedkey; x->rn_p = t;
-			if (t->rn_l == tt) t->rn_l = x; else t->rn_r = x;
-		} else {
-			/* find node in front of tt on the chain */
-			for (x = p = saved_tt; p && p->rn_dupedkey != tt;)
-				p = p->rn_dupedkey;
-			if (p) {
-				p->rn_dupedkey = tt->rn_dupedkey;
-				if (tt->rn_dupedkey)		   /* parent */
-					tt->rn_dupedkey->rn_p = p; /* parent */
-			} else log(LOG_ERR, "rn_delete: couldn't find us\n");
-		}
-		t = tt + 1;
-		if  (t->rn_flags & RNF_ACTIVE) {
-#ifndef RN_DEBUG
-			*++x = *t; p = t->rn_p;
-#else
-			b = t->rn_info; *++x = *t; t->rn_info = b; p = t->rn_p;
-#endif
-			if (p->rn_l == t) p->rn_l = x; else p->rn_r = x;
-			x->rn_l->rn_p = x; x->rn_r->rn_p = x;
-		}
-		goto out;
-	}
-	if (t->rn_l == tt) x = t->rn_r; else x = t->rn_l;
-	p = t->rn_p;
-	if (p->rn_r == t) p->rn_r = x; else p->rn_l = x;
-	x->rn_p = p;
-	/*
-	 * Demote routes attached to us.
-	 */
-	if (t->rn_mklist) {
-		if (x->rn_b >= 0) {
-			for (mp = &x->rn_mklist; (m = *mp);)
-				mp = &m->rm_mklist;
-			*mp = t->rn_mklist;
-		} else {
-			/* If there are any key,mask pairs in a sibling
-			   duped-key chain, some subset will appear sorted
-			   in the same order attached to our mklist */
-			for (m = t->rn_mklist; m && x; x = x->rn_dupedkey)
-				if (m == x->rn_mklist) {
-					struct radix_mask *mm = m->rm_mklist;
-					x->rn_mklist = 0;
-					if (--(m->rm_refs) < 0)
-						MKFree(m);
-					m = mm;
-				}
-			if (m)
-				log(LOG_ERR, "%s %p at %x\n",
-					    "rn_delete: Orphaned Mask", m, x);
-		}
-	}
-	/*
-	 * We may be holding an active internal node in the tree.
-	 */
-	x = tt + 1;
-	if (t != x) {
-#ifndef RN_DEBUG
-		*t = *x;
-#else
-		b = t->rn_info; *t = *x; t->rn_info = b;
-#endif
-		t->rn_l->rn_p = t; t->rn_r->rn_p = t;
-		p = x->rn_p;
-		if (p->rn_l == x) p->rn_l = t; else p->rn_r = t;
-	}
-out:
-	tt->rn_flags &= ~RNF_ACTIVE;
-	tt[1].rn_flags &= ~RNF_ACTIVE;
-	return (tt);
-}
-
-/*
- * This is the same as rn_walktree() except for the parameters and the
- * exit.
- */
-static int
-rn_walktree_from(h, a, m, f, w)
-	struct radix_node_head *h;
-	void *a, *m;
-	walktree_f_t *f;
-	void *w;
-{
-	int error;
-	struct radix_node *base, *next;
-	u_char *xa = (u_char *)a;
-	u_char *xm = (u_char *)m;
-	register struct radix_node *rn, *last = 0 /* shut up gcc */;
-	int stopping = 0;
-	int lastb;
-
-	/*
-	 * rn_search_m is sort-of-open-coded here.
-	 */
-	/* printf("about to search\n"); */
-	for (rn = h->rnh_treetop; rn->rn_b >= 0; ) {
-		last = rn;
-		/* printf("rn_b %d, rn_bmask %x, xm[rn_off] %x\n",
-		       rn->rn_b, rn->rn_bmask, xm[rn->rn_off]); */
-		if (!(rn->rn_bmask & xm[rn->rn_off])) {
-			break;
-		}
-		if (rn->rn_bmask & xa[rn->rn_off]) {
-			rn = rn->rn_r;
-		} else {
-			rn = rn->rn_l;
-		}
-	}
-	/* printf("done searching\n"); */
-
-	/*
-	 * Two cases: either we stepped off the end of our mask,
-	 * in which case last == rn, or we reached a leaf, in which
-	 * case we want to start from the last node we looked at.
-	 * Either way, last is the node we want to start from.
-	 */
-	rn = last;
-	lastb = rn->rn_b;
-
-	/* printf("rn %p, lastb %d\n", rn, lastb);*/
-
-	/*
-	 * This gets complicated because we may delete the node
-	 * while applying the function f to it, so we need to calculate
-	 * the successor node in advance.
-	 */
-	while (rn->rn_b >= 0)
-		rn = rn->rn_l;
-
-	while (!stopping) {
-		/* printf("node %p (%d)\n", rn, rn->rn_b); */
-		base = rn;
-		/* If at right child go back up, otherwise, go right */
-		while (rn->rn_p->rn_r == rn && !(rn->rn_flags & RNF_ROOT)) {
-			rn = rn->rn_p;
-
-			/* if went up beyond last, stop */
-			if (rn->rn_b < lastb) {
-				stopping = 1;
-				/* printf("up too far\n"); */
-			}
-		}
-
-		/* Find the next *leaf* since next node might vanish, too */
-		for (rn = rn->rn_p->rn_r; rn->rn_b >= 0;)
-			rn = rn->rn_l;
-		next = rn;
-		/* Process leaves */
-		while ((rn = base) != 0) {
-			base = rn->rn_dupedkey;
-			/* printf("leaf %p\n", rn); */
-			if (!(rn->rn_flags & RNF_ROOT)
-			    && (error = (*f)(rn, w)))
-				return (error);
-		}
-		rn = next;
-
-		if (rn->rn_flags & RNF_ROOT) {
-			/* printf("root, stopping"); */
-			stopping = 1;
-		}
-
-	}
-	return 0;
-}
-
-static int
-rn_walktree(h, f, w)
-	struct radix_node_head *h;
-	walktree_f_t *f;
-	void *w;
-{
-	int error;
-	struct radix_node *base, *next;
-	register struct radix_node *rn = h->rnh_treetop;
-	/*
-	 * This gets complicated because we may delete the node
-	 * while applying the function f to it, so we need to calculate
-	 * the successor node in advance.
-	 */
-	/* First time through node, go left */
-	while (rn->rn_b >= 0)
-		rn = rn->rn_l;
-	for (;;) {
-		base = rn;
-		/* If at right child go back up, otherwise, go right */
-		while (rn->rn_p->rn_r == rn && (rn->rn_flags & RNF_ROOT) == 0)
-			rn = rn->rn_p;
-		/* Find the next *leaf* since next node might vanish, too */
-		for (rn = rn->rn_p->rn_r; rn->rn_b >= 0;)
-			rn = rn->rn_l;
-		next = rn;
-		/* Process leaves */
-		while ((rn = base)) {
-			base = rn->rn_dupedkey;
-			if (!(rn->rn_flags & RNF_ROOT) && (error = (*f)(rn, w)))
-				return (error);
-		}
-		rn = next;
-		if (rn->rn_flags & RNF_ROOT)
-			return (0);
-	}
-	/* NOTREACHED */
-}
-
-int
-rn_inithead(head, off)
-	void **head;
-	int off;
-{
-	register struct radix_node_head *rnh;
-	register struct radix_node *t, *tt, *ttt;
-	if (*head)
-		return (1);
-	R_Malloc(rnh, struct radix_node_head *, sizeof (*rnh));
-	if (rnh == 0)
-		return (0);
-	Bzero(rnh, sizeof (*rnh));
-	*head = rnh;
-	t = rn_newpair(rn_zeros, off, rnh->rnh_nodes);
-	ttt = rnh->rnh_nodes + 2;
-	t->rn_r = ttt;
-	t->rn_p = t;
-	tt = t->rn_l;
-	tt->rn_flags = t->rn_flags = RNF_ROOT | RNF_ACTIVE;
-	tt->rn_b = -1 - off;
-	*ttt = *tt;
-	ttt->rn_key = rn_ones;
-	rnh->rnh_addaddr = rn_addroute;
-	rnh->rnh_deladdr = rn_delete;
-	rnh->rnh_matchaddr = rn_match;
-	rnh->rnh_lookup = rn_lookup;
-	rnh->rnh_walktree = rn_walktree;
-	rnh->rnh_walktree_from = rn_walktree_from;
-	rnh->rnh_treetop = t;
-	return (1);
-}
-
-void
-rn_init()
-{
-	char *cp, *cplim;
-#ifdef KERNEL
-	struct domain *dom;
-
-	for (dom = domains; dom; dom = dom->dom_next)
-		if (dom->dom_maxrtkey > max_keylen)
-			max_keylen = dom->dom_maxrtkey;
-#endif
-	if (max_keylen == 0) {
-		log(LOG_ERR,
-		    "rn_init: radix functions require max_keylen be set\n");
-		return;
-	}
-	R_Malloc(rn_zeros, char *, 3 * max_keylen);
-	if (rn_zeros == NULL)
-		panic("rn_init");
-	Bzero(rn_zeros, 3 * max_keylen);
-	rn_ones = cp = rn_zeros + max_keylen;
-	addmask_key = cplim = rn_ones + max_keylen;
-	while (cp < cplim)
-		*cp++ = -1;
-	if (rn_inithead((void **)&mask_rnhead, 0) == 0)
-		panic("rn_init 2");
-}
diff --git a/c/src/libnetworking/net/radix.h b/c/src/libnetworking/net/radix.h
deleted file mode 100644
index 6ef9aafbac..0000000000
--- a/c/src/libnetworking/net/radix.h
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * Copyright (c) 1988, 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)radix.h	8.2 (Berkeley) 10/31/94
- *	$Id$
- */
-
-#ifndef _RADIX_H_
-#define	_RADIX_H_
-
-/*
- * Radix search tree node layout.
- */
-
-struct radix_node {
-	struct	radix_mask *rn_mklist;	/* list of masks contained in subtree */
-	struct	radix_node *rn_p;	/* parent */
-	short	rn_b;			/* bit offset; -1-index(netmask) */
-	char	rn_bmask;		/* node: mask for bit test*/
-	u_char	rn_flags;		/* enumerated next */
-#define RNF_NORMAL	1		/* leaf contains normal route */
-#define RNF_ROOT	2		/* leaf is root leaf for tree */
-#define RNF_ACTIVE	4		/* This node is alive (for rtfree) */
-	union {
-		struct {			/* leaf only data: */
-			caddr_t	rn_Key;		/* object of search */
-			caddr_t	rn_Mask;	/* netmask, if present */
-			struct	radix_node *rn_Dupedkey;
-		} rn_leaf;
-		struct {			/* node only data: */
-			int	rn_Off;		/* where to start compare */
-			struct	radix_node *rn_L;/* progeny */
-			struct	radix_node *rn_R;/* progeny */
-		} rn_node;
-	}		rn_u;
-#ifdef RN_DEBUG
-	int rn_info;
-	struct radix_node *rn_twin;
-	struct radix_node *rn_ybro;
-#endif
-};
-
-#define rn_dupedkey rn_u.rn_leaf.rn_Dupedkey
-#define rn_key rn_u.rn_leaf.rn_Key
-#define rn_mask rn_u.rn_leaf.rn_Mask
-#define rn_off rn_u.rn_node.rn_Off
-#define rn_l rn_u.rn_node.rn_L
-#define rn_r rn_u.rn_node.rn_R
-
-/*
- * Annotations to tree concerning potential routes applying to subtrees.
- */
-
-extern struct radix_mask {
-	short	rm_b;			/* bit offset; -1-index(netmask) */
-	char	rm_unused;		/* cf. rn_bmask */
-	u_char	rm_flags;		/* cf. rn_flags */
-	struct	radix_mask *rm_mklist;	/* more masks to try */
-	union	{
-		caddr_t	rmu_mask;		/* the mask */
-		struct	radix_node *rmu_leaf;	/* for normal routes */
-	}	rm_rmu;
-	int	rm_refs;		/* # of references to this struct */
-} *rn_mkfreelist;
-
-#define rm_mask rm_rmu.rmu_mask
-#define rm_leaf rm_rmu.rmu_leaf		/* extra field would make 32 bytes */
-
-#define MKGet(m) {\
-	if (rn_mkfreelist) {\
-		m = rn_mkfreelist; \
-		rn_mkfreelist = (m)->rm_mklist; \
-	} else \
-		R_Malloc(m, struct radix_mask *, sizeof (*(m))); }\
-
-#define MKFree(m) { (m)->rm_mklist = rn_mkfreelist; rn_mkfreelist = (m);}
-
-typedef int walktree_f_t __P((struct radix_node *, void *));
-
-struct radix_node_head {
-	struct	radix_node *rnh_treetop;
-	int	rnh_addrsize;		/* permit, but not require fixed keys */
-	int	rnh_pktsize;		/* permit, but not require fixed keys */
-	struct	radix_node *(*rnh_addaddr)	/* add based on sockaddr */
-		__P((void *v, void *mask,
-		     struct radix_node_head *head, struct radix_node nodes[]));
-	struct	radix_node *(*rnh_addpkt)	/* add based on packet hdr */
-		__P((void *v, void *mask,
-		     struct radix_node_head *head, struct radix_node nodes[]));
-	struct	radix_node *(*rnh_deladdr)	/* remove based on sockaddr */
-		__P((void *v, void *mask, struct radix_node_head *head));
-	struct	radix_node *(*rnh_delpkt)	/* remove based on packet hdr */
-		__P((void *v, void *mask, struct radix_node_head *head));
-	struct	radix_node *(*rnh_matchaddr)	/* locate based on sockaddr */
-		__P((void *v, struct radix_node_head *head));
-	struct	radix_node *(*rnh_lookup)	/* locate based on sockaddr */
-		__P((void *v, void *mask, struct radix_node_head *head));
-	struct	radix_node *(*rnh_matchpkt)	/* locate based on packet hdr */
-		__P((void *v, struct radix_node_head *head));
-	int	(*rnh_walktree)			/* traverse tree */
-		__P((struct radix_node_head *head, walktree_f_t *f, void *w));
-	int	(*rnh_walktree_from)		/* traverse tree below a */
-		__P((struct radix_node_head *head, void *a, void *m,
-		     walktree_f_t *f, void *w));
-	void	(*rnh_close)	/* do something when the last ref drops */
-		__P((struct radix_node *rn, struct radix_node_head *head));
-	struct	radix_node rnh_nodes[3];	/* empty tree for common case */
-};
-
-#ifndef KERNEL
-#define Bcmp(a, b, n) bcmp(((char *)(a)), ((char *)(b)), (n))
-#define Bcopy(a, b, n) bcopy(((char *)(a)), ((char *)(b)), (unsigned)(n))
-#define Bzero(p, n) bzero((char *)(p), (int)(n));
-#define R_Malloc(p, t, n) (p = (t) malloc((unsigned int)(n)))
-#define Free(p) free((char *)p);
-#else
-#define Bcmp(a, b, n) bcmp(((caddr_t)(a)), ((caddr_t)(b)), (unsigned)(n))
-#define Bcopy(a, b, n) bcopy(((caddr_t)(a)), ((caddr_t)(b)), (unsigned)(n))
-#define Bzero(p, n) bzero((caddr_t)(p), (unsigned)(n));
-#define R_Malloc(p, t, n) (p = (t) malloc((unsigned long)(n), M_RTABLE, M_DONTWAIT))
-#define Free(p) free((caddr_t)p, M_RTABLE);
-#endif /*KERNEL*/
-
-extern struct radix_node_head *mask_rnhead;
-
-void	 rn_init __P((void));
-int	 rn_inithead __P((void **, int));
-int	 rn_refines __P((void *, void *));
-struct radix_node
-	 *rn_addmask __P((void *, int, int)),
-	 *rn_addroute __P((void *, void *, struct radix_node_head *,
-			struct radix_node [2])),
-	 *rn_match __P((void *, struct radix_node_head *));
-
-
-#endif /* _RADIX_H_ */
diff --git a/c/src/libnetworking/net/raw_cb.c b/c/src/libnetworking/net/raw_cb.c
deleted file mode 100644
index 0676931cdc..0000000000
--- a/c/src/libnetworking/net/raw_cb.c
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * Copyright (c) 1980, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)raw_cb.c	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/systm.h>
-#include <sys/mbuf.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/domain.h>
-#include <sys/protosw.h>
-#include <sys/errno.h>
-
-#include <net/if.h>
-#include <net/route.h>
-#include <net/raw_cb.h>
-#include <netinet/in.h>
-
-/*
- * Routines to manage the raw protocol control blocks.
- *
- * TODO:
- *	hash lookups by protocol family/protocol + address family
- *	take care of unique address problems per AF?
- *	redo address binding to allow wildcards
- */
-
-struct rawcb rawcb;
-static u_long	raw_sendspace = RAWSNDQ;
-static u_long	raw_recvspace = RAWRCVQ;
-
-/*
- * Allocate a control block and a nominal amount
- * of buffer space for the socket.
- */
-int
-raw_attach(so, proto)
-	register struct socket *so;
-	int proto;
-{
-	register struct rawcb *rp = sotorawcb(so);
-	int error;
-
-	/*
-	 * It is assumed that raw_attach is called
-	 * after space has been allocated for the
-	 * rawcb.
-	 */
-	if (rp == 0)
-		return (ENOBUFS);
-	error = soreserve(so, raw_sendspace, raw_recvspace);
-	if (error)
-		return (error);
-	rp->rcb_socket = so;
-	rp->rcb_proto.sp_family = so->so_proto->pr_domain->dom_family;
-	rp->rcb_proto.sp_protocol = proto;
-	insque(rp, &rawcb);
-	return (0);
-}
-
-/*
- * Detach the raw connection block and discard
- * socket resources.
- */
-void
-raw_detach(rp)
-	register struct rawcb *rp;
-{
-	struct socket *so = rp->rcb_socket;
-
-	so->so_pcb = 0;
-	sofree(so);
-	remque(rp);
-#ifdef notdef
-	if (rp->rcb_laddr)
-		m_freem(dtom(rp->rcb_laddr));
-	rp->rcb_laddr = 0;
-#endif
-	free((caddr_t)(rp), M_PCB);
-}
-
-/*
- * Disconnect and possibly release resources.
- */
-void
-raw_disconnect(rp)
-	struct rawcb *rp;
-{
-
-#ifdef notdef
-	if (rp->rcb_faddr)
-		m_freem(dtom(rp->rcb_faddr));
-	rp->rcb_faddr = 0;
-#endif
-	if (rp->rcb_socket->so_state & SS_NOFDREF)
-		raw_detach(rp);
-}
-
-#ifdef notdef
-int
-raw_bind(so, nam)
-	register struct socket *so;
-	struct mbuf *nam;
-{
-	struct sockaddr *addr = mtod(nam, struct sockaddr *);
-	register struct rawcb *rp;
-
-	if (ifnet == 0)
-		return (EADDRNOTAVAIL);
-	rp = sotorawcb(so);
-	nam = m_copym(nam, 0, M_COPYALL, M_WAITOK);
-	rp->rcb_laddr = mtod(nam, struct sockaddr *);
-	return (0);
-}
-#endif
diff --git a/c/src/libnetworking/net/raw_cb.h b/c/src/libnetworking/net/raw_cb.h
deleted file mode 100644
index c1ed5e5e0a..0000000000
--- a/c/src/libnetworking/net/raw_cb.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 1980, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)raw_cb.h	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#ifndef _NET_RAW_CB_H_
-#define _NET_RAW_CB_H_
-
-/*
- * Raw protocol interface control block.  Used
- * to tie a socket to the generic raw interface.
- */
-struct rawcb {
-	struct	rawcb *rcb_next;	/* doubly linked list */
-	struct	rawcb *rcb_prev;
-	struct	socket *rcb_socket;	/* back pointer to socket */
-	struct	sockaddr *rcb_faddr;	/* destination address */
-	struct	sockaddr *rcb_laddr;	/* socket's address */
-	struct	sockproto rcb_proto;	/* protocol family, protocol */
-};
-
-#define	sotorawcb(so)		((struct rawcb *)(so)->so_pcb)
-
-/*
- * Nominal space allocated to a raw socket.
- */
-#define	RAWSNDQ		8192
-#define	RAWRCVQ		8192
-
-#ifdef KERNEL
-extern struct rawcb rawcb;		/* head of list */
-
-int	 raw_attach __P((struct socket *, int));
-void	 raw_ctlinput __P((int, struct sockaddr *, void *));
-void	 raw_detach __P((struct rawcb *));
-void	 raw_disconnect __P((struct rawcb *));
-void	 raw_init __P((void));
-void	 raw_input __P((struct mbuf *,
-	    struct sockproto *, struct sockaddr *, struct sockaddr *));
-int	 raw_usrreq __P((struct socket *,
-	    int, struct mbuf *, struct mbuf *, struct mbuf *));
-#endif
-
-#endif
diff --git a/c/src/libnetworking/net/raw_usrreq.c b/c/src/libnetworking/net/raw_usrreq.c
deleted file mode 100644
index fb4faf4d6d..0000000000
--- a/c/src/libnetworking/net/raw_usrreq.c
+++ /dev/null
@@ -1,315 +0,0 @@
-/*
- * Copyright (c) 1980, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)raw_usrreq.c	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/systm.h>
-#include <sys/mbuf.h>
-#include <sys/domain.h>
-#include <sys/protosw.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/errno.h>
-
-#include <net/if.h>
-#include <net/route.h>
-#include <net/netisr.h>
-#include <net/raw_cb.h>
-
-/*
- * Initialize raw connection block q.
- */
-void
-raw_init()
-{
-
-	rawcb.rcb_next = rawcb.rcb_prev = &rawcb;
-}
-
-
-/*
- * Raw protocol input routine.  Find the socket
- * associated with the packet(s) and move them over.  If
- * nothing exists for this packet, drop it.
- */
-/*
- * Raw protocol interface.
- */
-void
-raw_input(m0, proto, src, dst)
-	struct mbuf *m0;
-	register struct sockproto *proto;
-	struct sockaddr *src, *dst;
-{
-	register struct rawcb *rp;
-	register struct mbuf *m = m0;
-	register int sockets = 0;
-	struct socket *last;
-
-	last = 0;
-	for (rp = rawcb.rcb_next; rp != &rawcb; rp = rp->rcb_next) {
-		if (rp->rcb_proto.sp_family != proto->sp_family)
-			continue;
-		if (rp->rcb_proto.sp_protocol  &&
-		    rp->rcb_proto.sp_protocol != proto->sp_protocol)
-			continue;
-		/*
-		 * We assume the lower level routines have
-		 * placed the address in a canonical format
-		 * suitable for a structure comparison.
-		 *
-		 * Note that if the lengths are not the same
-		 * the comparison will fail at the first byte.
-		 */
-#define	equal(a1, a2) \
-  (bcmp((caddr_t)(a1), (caddr_t)(a2), a1->sa_len) == 0)
-		if (rp->rcb_laddr && !equal(rp->rcb_laddr, dst))
-			continue;
-		if (rp->rcb_faddr && !equal(rp->rcb_faddr, src))
-			continue;
-		if (last) {
-			struct mbuf *n;
-			n = m_copy(m, 0, (int)M_COPYALL);
-			if (n) {
-				if (sbappendaddr(&last->so_rcv, src,
-				    n, (struct mbuf *)0) == 0)
-					/* should notify about lost packet */
-					m_freem(n);
-				else {
-					sorwakeup(last);
-					sockets++;
-				}
-			}
-		}
-		last = rp->rcb_socket;
-	}
-	if (last) {
-		if (sbappendaddr(&last->so_rcv, src,
-		    m, (struct mbuf *)0) == 0)
-			m_freem(m);
-		else {
-			sorwakeup(last);
-			sockets++;
-		}
-	} else
-		m_freem(m);
-}
-
-/*ARGSUSED*/
-void
-raw_ctlinput(cmd, arg, dummy)
-	int cmd;
-	struct sockaddr *arg;
-	void *dummy;
-{
-
-	if (cmd < 0 || cmd > PRC_NCMDS)
-		return;
-	/* INCOMPLETE */
-}
-
-/*ARGSUSED*/
-int
-raw_usrreq(so, req, m, nam, control)
-	struct socket *so;
-	int req;
-	struct mbuf *m, *nam, *control;
-{
-	register struct rawcb *rp = sotorawcb(so);
-	register int error = 0;
-	int len;
-
-	if (req == PRU_CONTROL)
-		return (EOPNOTSUPP);
-	if (control && control->m_len) {
-		error = EOPNOTSUPP;
-		goto release;
-	}
-	if (rp == 0) {
-		error = EINVAL;
-		goto release;
-	}
-	switch (req) {
-
-	/*
-	 * Allocate a raw control block and fill in the
-	 * necessary info to allow packets to be routed to
-	 * the appropriate raw interface routine.
-	 */
-	case PRU_ATTACH:
-		if ((so->so_state & SS_PRIV) == 0) {
-			error = EACCES;
-			break;
-		}
-		error = raw_attach(so, (int)nam);
-		break;
-
-	/*
-	 * Destroy state just before socket deallocation.
-	 * Flush data or not depending on the options.
-	 */
-	case PRU_DETACH:
-		if (rp == 0) {
-			error = ENOTCONN;
-			break;
-		}
-		raw_detach(rp);
-		break;
-
-	/*
-	 * If a socket isn't bound to a single address,
-	 * the raw input routine will hand it anything
-	 * within that protocol family (assuming there's
-	 * nothing else around it should go to).
-	 */
-	case PRU_CONNECT:
-		error = EINVAL;
-#if 0
-		if (rp->rcb_faddr) {
-			error = EISCONN;
-			break;
-		}
-		nam = m_copym(nam, 0, M_COPYALL, M_WAIT);
-		rp->rcb_faddr = mtod(nam, struct sockaddr *);
-		soisconnected(so);
-#endif
-		break;
-
-	case PRU_BIND:
-		error = EINVAL;
-#if 0
-		if (rp->rcb_laddr) {
-			error = EINVAL;			/* XXX */
-			break;
-		}
-		error = raw_bind(so, nam);
-#endif
-		break;
-
-	case PRU_CONNECT2:
-		error = EOPNOTSUPP;
-		goto release;
-
-	case PRU_DISCONNECT:
-		if (rp->rcb_faddr == 0) {
-			error = ENOTCONN;
-			break;
-		}
-		raw_disconnect(rp);
-		soisdisconnected(so);
-		break;
-
-	/*
-	 * Mark the connection as being incapable of further input.
-	 */
-	case PRU_SHUTDOWN:
-		socantsendmore(so);
-		break;
-
-	/*
-	 * Ship a packet out.  The appropriate raw output
-	 * routine handles any massaging necessary.
-	 */
-	case PRU_SEND:
-		if (nam) {
-			if (rp->rcb_faddr) {
-				error = EISCONN;
-				break;
-			}
-			rp->rcb_faddr = mtod(nam, struct sockaddr *);
-		} else if (rp->rcb_faddr == 0) {
-			error = ENOTCONN;
-			break;
-		}
-		error = (*so->so_proto->pr_output)(m, so);
-		m = NULL;
-		if (nam)
-			rp->rcb_faddr = 0;
-		break;
-
-	case PRU_ABORT:
-		raw_disconnect(rp);
-		sofree(so);
-		soisdisconnected(so);
-		break;
-
-	case PRU_SENSE:
-		/*
-		 * stat: don't bother with a blocksize.
-		 */
-		return (0);
-
-	/*
-	 * Not supported.
-	 */
-	case PRU_RCVOOB:
-	case PRU_RCVD:
-		return(EOPNOTSUPP);
-
-	case PRU_LISTEN:
-	case PRU_ACCEPT:
-	case PRU_SENDOOB:
-		error = EOPNOTSUPP;
-		break;
-
-	case PRU_SOCKADDR:
-		if (rp->rcb_laddr == 0) {
-			error = EINVAL;
-			break;
-		}
-		len = rp->rcb_laddr->sa_len;
-		bcopy((caddr_t)rp->rcb_laddr, mtod(nam, caddr_t), (unsigned)len);
-		nam->m_len = len;
-		break;
-
-	case PRU_PEERADDR:
-		if (rp->rcb_faddr == 0) {
-			error = ENOTCONN;
-			break;
-		}
-		len = rp->rcb_faddr->sa_len;
-		bcopy((caddr_t)rp->rcb_faddr, mtod(nam, caddr_t), (unsigned)len);
-		nam->m_len = len;
-		break;
-
-	default:
-		panic("raw_usrreq");
-	}
-release:
-	if (m != NULL)
-		m_freem(m);
-	return (error);
-}
diff --git a/c/src/libnetworking/net/route.c b/c/src/libnetworking/net/route.c
deleted file mode 100644
index 683ddafee9..0000000000
--- a/c/src/libnetworking/net/route.c
+++ /dev/null
@@ -1,959 +0,0 @@
-/*
- * Copyright (c) 1980, 1986, 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)route.c	8.2 (Berkeley) 11/15/93
- *	$Id$
- */
-
-#include "opt_mrouting.h"
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/proc.h>
-#include <sys/mbuf.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/domain.h>
-#include <sys/protosw.h>
-#include <sys/ioctl.h>
-
-#include <net/if.h>
-#include <net/route.h>
-#include <net/raw_cb.h>
-
-#include <netinet/in.h>
-#include <netinet/in_var.h>
-#include <netinet/ip_mroute.h>
-
-#define	SA(p) ((struct sockaddr *)(p))
-
-struct route_cb route_cb;
-static struct rtstat rtstat;
-struct radix_node_head *rt_tables[AF_MAX+1];
-
-static int	rttrash;		/* routes not in table but not freed */
-
-static void rt_maskedcopy __P((struct sockaddr *,
-	    struct sockaddr *, struct sockaddr *));
-static void rtable_init __P((void **));
-
-static void
-rtable_init(table)
-	void **table;
-{
-	struct domain *dom;
-	for (dom = domains; dom; dom = dom->dom_next)
-		if (dom->dom_rtattach)
-			dom->dom_rtattach(&table[dom->dom_family],
-			    dom->dom_rtoffset);
-}
-
-void
-route_init()
-{
-	rn_init();	/* initialize all zeroes, all ones, mask table */
-	rtable_init((void **)rt_tables);
-}
-
-/*
- * Packet routing routines.
- */
-void
-rtalloc(ro)
-	register struct route *ro;
-{
-	if (ro->ro_rt && ro->ro_rt->rt_ifp && (ro->ro_rt->rt_flags & RTF_UP))
-		return;				 /* XXX */
-	ro->ro_rt = rtalloc1(&ro->ro_dst, 1, 0UL);
-}
-
-void
-rtalloc_ign(ro, ignore)
-	register struct route *ro;
-	u_long ignore;
-{
-	if (ro->ro_rt && ro->ro_rt->rt_ifp && (ro->ro_rt->rt_flags & RTF_UP))
-		return;				 /* XXX */
-	ro->ro_rt = rtalloc1(&ro->ro_dst, 1, ignore);
-}
-
-/*
- * Look up the route that matches the address given
- * Or, at least try.. Create a cloned route if needed.
- */
-struct rtentry *
-rtalloc1(dst, report, ignflags)
-	register struct sockaddr *dst;
-	int report;
-	u_long ignflags;
-{
-	register struct radix_node_head *rnh = rt_tables[dst->sa_family];
-	register struct rtentry *rt;
-	register struct radix_node *rn;
-	struct rtentry *newrt = 0;
-	struct rt_addrinfo info;
-	u_long nflags;
-	int  s = splnet(), err = 0, msgtype = RTM_MISS;
-
-	/* 
-	 * Look up the address in the table for that Address Family
-	 */
-	if (rnh && (rn = rnh->rnh_matchaddr((caddr_t)dst, rnh)) &&
-	    ((rn->rn_flags & RNF_ROOT) == 0)) {
-		/*
-		 * If we find it and it's not the root node, then
-		 * get a refernce on the rtentry associated.
-		 */
-		newrt = rt = (struct rtentry *)rn;
-		nflags = rt->rt_flags & ~ignflags;
-		if (report && (nflags & (RTF_CLONING | RTF_PRCLONING))) {
-			/*
-			 * We are apparently adding (report = 0 in delete).
-			 * If it requires that it be cloned, do so.
-			 * (This implies it wasn't a HOST route.)
-			 */
-			err = rtrequest(RTM_RESOLVE, dst, SA(0),
-					      SA(0), 0, &newrt);
-			if (err) {
-				/*
-				 * If the cloning didn't succeed, maybe
-				 * what we have will do. Return that.
-				 */
-				newrt = rt;
-				rt->rt_refcnt++;
-				goto miss;
-			}
-			if ((rt = newrt) && (rt->rt_flags & RTF_XRESOLVE)) {
-				/*
-				 * If the new route specifies it be 
-				 * externally resolved, then go do that.
-				 */
-				msgtype = RTM_RESOLVE;
-				goto miss;
-			}
-		} else
-			rt->rt_refcnt++;
-	} else {
-		/*
-		 * Either we hit the root or couldn't find any match,
-		 * Which basically means
-		 * "caint get there frm here"
-		 */
-		rtstat.rts_unreach++;
-	miss:	if (report) {
-			/*
-			 * If required, report the failure to the supervising
-			 * Authorities.
-			 * For a delete, this is not an error. (report == 0)
-			 */
-			bzero((caddr_t)&info, sizeof(info));
-			info.rti_info[RTAX_DST] = dst;
-			rt_missmsg(msgtype, &info, 0, err);
-		}
-	}
-	splx(s);
-	return (newrt);
-}
-
-void
-rtfree(rt)
-	register struct rtentry *rt;
-{
-	register struct radix_node_head *rnh =
-		rt_tables[rt_key(rt)->sa_family];
-	register struct ifaddr *ifa;
-
-	if (rt == 0 || rnh == 0)
-		panic("rtfree");
-	rt->rt_refcnt--;
-	if(rnh->rnh_close && rt->rt_refcnt == 0) {
-		rnh->rnh_close((struct radix_node *)rt, rnh);
-	}
-	if (rt->rt_refcnt <= 0 && (rt->rt_flags & RTF_UP) == 0) {
-		if (rt->rt_nodes->rn_flags & (RNF_ACTIVE | RNF_ROOT))
-			panic ("rtfree 2");
-		rttrash--;
-		if (rt->rt_refcnt < 0) {
-			printf("rtfree: %p not freed (neg refs)\n", rt);
-			return;
-		}
-		ifa = rt->rt_ifa;
-		IFAFREE(ifa);
-		if (rt->rt_parent) {
-			RTFREE(rt->rt_parent);
-		}
-		Free(rt_key(rt));
-		Free(rt);
-	}
-}
-
-void
-ifafree(ifa)
-	register struct ifaddr *ifa;
-{
-	if (ifa == NULL)
-		panic("ifafree");
-	if (ifa->ifa_refcnt == 0)
-		free(ifa, M_IFADDR);
-	else
-		ifa->ifa_refcnt--;
-}
-
-/*
- * Force a routing table entry to the specified
- * destination to go through the given gateway.
- * Normally called as a result of a routing redirect
- * message from the network layer.
- *
- * N.B.: must be called at splnet
- *
- */
-void
-rtredirect(dst, gateway, netmask, flags, src, rtp)
-	struct sockaddr *dst, *gateway, *netmask, *src;
-	int flags;
-	struct rtentry **rtp;
-{
-	register struct rtentry *rt;
-	int error = 0;
-	short *stat = 0;
-	struct rt_addrinfo info;
-	struct ifaddr *ifa;
-
-	/* verify the gateway is directly reachable */
-	if ((ifa = ifa_ifwithnet(gateway)) == 0) {
-		error = ENETUNREACH;
-		goto out;
-	}
-	rt = rtalloc1(dst, 0, 0UL);
-	/*
-	 * If the redirect isn't from our current router for this dst,
-	 * it's either old or wrong.  If it redirects us to ourselves,
-	 * we have a routing loop, perhaps as a result of an interface
-	 * going down recently.
-	 */
-#define	equal(a1, a2) (bcmp((caddr_t)(a1), (caddr_t)(a2), (a1)->sa_len) == 0)
-	if (!(flags & RTF_DONE) && rt &&
-	     (!equal(src, rt->rt_gateway) || rt->rt_ifa != ifa))
-		error = EINVAL;
-	else if (ifa_ifwithaddr(gateway))
-		error = EHOSTUNREACH;
-	if (error)
-		goto done;
-	/*
-	 * Create a new entry if we just got back a wildcard entry
-	 * or the the lookup failed.  This is necessary for hosts
-	 * which use routing redirects generated by smart gateways
-	 * to dynamically build the routing tables.
-	 */
-	if ((rt == 0) || (rt_mask(rt) && rt_mask(rt)->sa_len < 2))
-		goto create;
-	/*
-	 * Don't listen to the redirect if it's
-	 * for a route to an interface.
-	 */
-	if (rt->rt_flags & RTF_GATEWAY) {
-		if (((rt->rt_flags & RTF_HOST) == 0) && (flags & RTF_HOST)) {
-			/*
-			 * Changing from route to net => route to host.
-			 * Create new route, rather than smashing route to net.
-			 */
-		create:
-			flags |=  RTF_GATEWAY | RTF_DYNAMIC;
-			error = rtrequest((int)RTM_ADD, dst, gateway,
-				    netmask, flags,
-				    (struct rtentry **)0);
-			stat = &rtstat.rts_dynamic;
-		} else {
-			/*
-			 * Smash the current notion of the gateway to
-			 * this destination.  Should check about netmask!!!
-			 */
-			rt->rt_flags |= RTF_MODIFIED;
-			flags |= RTF_MODIFIED;
-			stat = &rtstat.rts_newgateway;
-			rt_setgate(rt, rt_key(rt), gateway);
-		}
-	} else
-		error = EHOSTUNREACH;
-done:
-	if (rt) {
-		if (rtp && !error)
-			*rtp = rt;
-		else
-			rtfree(rt);
-	}
-out:
-	if (error)
-		rtstat.rts_badredirect++;
-	else if (stat != NULL)
-		(*stat)++;
-	bzero((caddr_t)&info, sizeof(info));
-	info.rti_info[RTAX_DST] = dst;
-	info.rti_info[RTAX_GATEWAY] = gateway;
-	info.rti_info[RTAX_NETMASK] = netmask;
-	info.rti_info[RTAX_AUTHOR] = src;
-	rt_missmsg(RTM_REDIRECT, &info, flags, error);
-}
-
-/*
-* Routing table ioctl interface.
-*/
-int
-rtioctl(req, data, p)
-	int req;
-	caddr_t data;
-	struct proc *p;
-{
-#ifdef INET
-	/* Multicast goop, grrr... */
-#ifdef MROUTING
-	return mrt_ioctl(req, data);
-#else
-	return mrt_ioctl(req, data, p);
-#endif
-#else /* INET */
-	return ENXIO;
-#endif /* INET */
-}
-
-struct ifaddr *
-ifa_ifwithroute(flags, dst, gateway)
-	int flags;
-	struct sockaddr	*dst, *gateway;
-{
-	register struct ifaddr *ifa;
-	if ((flags & RTF_GATEWAY) == 0) {
-		/*
-		 * If we are adding a route to an interface,
-		 * and the interface is a pt to pt link
-		 * we should search for the destination
-		 * as our clue to the interface.  Otherwise
-		 * we can use the local address.
-		 */
-		ifa = 0;
-		if (flags & RTF_HOST) {
-			ifa = ifa_ifwithdstaddr(dst);
-		}
-		if (ifa == 0)
-			ifa = ifa_ifwithaddr(gateway);
-	} else {
-		/*
-		 * If we are adding a route to a remote net
-		 * or host, the gateway may still be on the
-		 * other end of a pt to pt link.
-		 */
-		ifa = ifa_ifwithdstaddr(gateway);
-	}
-	if (ifa == 0)
-		ifa = ifa_ifwithnet(gateway);
-	if (ifa == 0) {
-		struct rtentry *rt = rtalloc1(dst, 0, 0UL);
-		if (rt == 0)
-			return (0);
-		rt->rt_refcnt--;
-		if ((ifa = rt->rt_ifa) == 0)
-			return (0);
-	}
-	if (ifa->ifa_addr->sa_family != dst->sa_family) {
-		struct ifaddr *oifa = ifa;
-		ifa = ifaof_ifpforaddr(dst, ifa->ifa_ifp);
-		if (ifa == 0)
-			ifa = oifa;
-	}
-	return (ifa);
-}
-
-#define ROUNDUP(a) (a>0 ? (1 + (((a) - 1) | (sizeof(long) - 1))) : sizeof(long))
-
-static int rt_fixdelete(struct radix_node *, void *);
-static int rt_fixchange(struct radix_node *, void *);
-
-struct rtfc_arg {
-	struct rtentry *rt0;
-	struct radix_node_head *rnh;
-};
-
-/*
- * Do appropriate manipulations of a routing tree given
- * all the bits of info needed
- */
-int
-rtrequest(req, dst, gateway, netmask, flags, ret_nrt)
-	int req, flags;
-	struct sockaddr *dst, *gateway, *netmask;
-	struct rtentry **ret_nrt;
-{
-	int s = splnet(); int error = 0;
-	register struct rtentry *rt;
-	register struct radix_node *rn;
-	register struct radix_node_head *rnh;
-	struct ifaddr *ifa;
-	struct sockaddr *ndst;
-#define senderr(x) { error = x ; goto bad; }
-
-	/*
-	 * Find the correct routing tree to use for this Address Family
-	 */
-	if ((rnh = rt_tables[dst->sa_family]) == 0)
-		senderr(ESRCH);
-	/*
-	 * If we are adding a host route then we don't want to put
-	 * a netmask in the tree
-	 */
-	if (flags & RTF_HOST)
-		netmask = 0;
-	switch (req) {
-	case RTM_DELETE:
-		/*
-		 * Remove the item from the tree and return it.
-		 * Complain if it is not there and do no more processing.
-		 */
-		if ((rn = rnh->rnh_deladdr(dst, netmask, rnh)) == 0)
-			senderr(ESRCH);
-		if (rn->rn_flags & (RNF_ACTIVE | RNF_ROOT))
-			panic ("rtrequest delete");
-		rt = (struct rtentry *)rn;
-
-		/*
-		 * Now search what's left of the subtree for any cloned
-		 * routes which might have been formed from this node.
-		 */
-		if ((rt->rt_flags & RTF_PRCLONING) && netmask) {
-			rnh->rnh_walktree_from(rnh, dst, netmask,
-					       rt_fixdelete, rt);
-		}
-
-		/*
-		 * Remove any external references we may have.
-		 * This might result in another rtentry being freed if
-		 * we held it's last reference.
-		 */
-		if (rt->rt_gwroute) {
-			rt = rt->rt_gwroute;
-			RTFREE(rt);
-			(rt = (struct rtentry *)rn)->rt_gwroute = 0;
-		}
-
-		/*
-		 * NB: RTF_UP must be set during the search above,
-		 * because we might delete the last ref, causing
-		 * rt to get freed prematurely.
-		 */
-		rt->rt_flags &= ~RTF_UP;
-
-		/* 
-		 * If there is llinfo or similar associated with the 
-		 * route, give the interface a chance to deal with it..
-		 */
-		if ((ifa = rt->rt_ifa) && ifa->ifa_rtrequest)
-			ifa->ifa_rtrequest(RTM_DELETE, rt, SA(0));
-		rttrash++;
-		/*
-		 * If the caller wants it, then it can have it, but it's up to it
-		 * to free the rtentry as we won't be doing it.
-		 */
-		if (ret_nrt)
-			*ret_nrt = rt;
-		else if (rt->rt_refcnt <= 0) {
-			rt->rt_refcnt++; /* make a 1->0 transition */
-			rtfree(rt);
-		}
-		break;
-
-	case RTM_RESOLVE:
-		if (ret_nrt == 0 || (rt = *ret_nrt) == 0)
-			senderr(EINVAL);
-		ifa = rt->rt_ifa;
-		flags = rt->rt_flags &
-		    ~(RTF_CLONING | RTF_PRCLONING | RTF_STATIC);
-		flags |= RTF_WASCLONED;
-		gateway = rt->rt_gateway;
-		if ((netmask = rt->rt_genmask) == 0)
-			flags |= RTF_HOST;
-		goto makeroute;
-
-	case RTM_ADD:
-		if ((flags & RTF_GATEWAY) && !gateway)
-			panic("rtrequest: GATEWAY but no gateway");
-
-		if ((ifa = ifa_ifwithroute(flags, dst, gateway)) == 0)
-			senderr(ENETUNREACH);
-
-	makeroute:
-		R_Malloc(rt, struct rtentry *, sizeof(*rt));
-		if (rt == 0)
-			senderr(ENOBUFS);
-		Bzero(rt, sizeof(*rt));
-		rt->rt_flags = RTF_UP | flags;
-		if ((error = rt_setgate(rt, dst, gateway))) {
-			Free(rt);
-			senderr(error);
-		}
-		ndst = rt_key(rt);
-		if (netmask) {
-			rt_maskedcopy(dst, ndst, netmask);
-		} else
-			Bcopy(dst, ndst, dst->sa_len);
-
-		/*
-		 * This moved from below so that rnh->rnh_addaddr() can
-		 * examine the ifa and ifp if it so desires.
-		 */
-		ifa->ifa_refcnt++;
-		rt->rt_ifa = ifa;
-		rt->rt_ifp = ifa->ifa_ifp;
-
-		rn = rnh->rnh_addaddr((caddr_t)ndst, (caddr_t)netmask,
-					rnh, rt->rt_nodes);
-		if (rn == 0) {
-			struct rtentry *rt2;
-			/*
-			 * Uh-oh, we already have one of these in the tree.
-			 * We do a special hack: if the route that's already
-			 * there was generated by the protocol-cloning
-			 * mechanism, then we just blow it away and retry
-			 * the insertion of the new one.
-			 */
-			rt2 = rtalloc1(dst, 0, RTF_PRCLONING);
-			if (rt2 && rt2->rt_parent) {
-				rtrequest(RTM_DELETE, 
-					  (struct sockaddr *)rt_key(rt2),
-					  rt2->rt_gateway,
-					  rt_mask(rt2), rt2->rt_flags, 0);
-				RTFREE(rt2);
-				rn = rnh->rnh_addaddr((caddr_t)ndst,
-						      (caddr_t)netmask,
-						      rnh, rt->rt_nodes);
-			} else if (rt2) {
-				RTFREE(rt2);
-			}
-		}
-
-		if (rn == 0) {
-			if (rt->rt_gwroute)
-				rtfree(rt->rt_gwroute);
-			if (rt->rt_ifa) {
-				IFAFREE(rt->rt_ifa);
-			}
-			Free(rt_key(rt));
-			Free(rt);
-			senderr(EEXIST);
-		}
-		rt->rt_parent = 0;
-
-		if (req == RTM_RESOLVE) {
-			rt->rt_rmx = (*ret_nrt)->rt_rmx; /* copy metrics */
-			if ((*ret_nrt)->rt_flags & RTF_PRCLONING) {
-				rt->rt_parent = (*ret_nrt);
-				(*ret_nrt)->rt_refcnt++;
-			}
-		}
-		if (ifa->ifa_rtrequest)
-			ifa->ifa_rtrequest(req, rt, SA(ret_nrt ? *ret_nrt : 0));
-		/*
-		 * We repeat the same procedure from rt_setgate() here because
-		 * it doesn't fire when we call it there because the node
-		 * hasn't been added to the tree yet.
-		 */
-		if (!(rt->rt_flags & RTF_HOST) && rt_mask(rt) != 0) {
-			struct rtfc_arg arg;
-			arg.rnh = rnh;
-			arg.rt0 = rt;
-			rnh->rnh_walktree_from(rnh, rt_key(rt), rt_mask(rt),
-					       rt_fixchange, &arg);
-		}
-
-		if (ret_nrt) {
-			*ret_nrt = rt;
-			rt->rt_refcnt++;
-		}
-		break;
-	}
-bad:
-	splx(s);
-	return (error);
-}
-
-/*
- * Called from rtrequest(RTM_DELETE, ...) to fix up the route's ``family''
- * (i.e., the routes related to it by the operation of cloning).  This
- * routine is iterated over all potential former-child-routes by way of
- * rnh->rnh_walktree_from() above, and those that actually are children of
- * the late parent (passed in as VP here) are themselves deleted.
- */
-static int
-rt_fixdelete(struct radix_node *rn, void *vp)
-{
-	struct rtentry *rt = (struct rtentry *)rn;
-	struct rtentry *rt0 = vp;
-
-	if (rt->rt_parent == rt0 && !(rt->rt_flags & RTF_PINNED)) {
-		return rtrequest(RTM_DELETE, rt_key(rt),
-				 (struct sockaddr *)0, rt_mask(rt),
-				 rt->rt_flags, (struct rtentry **)0);
-	}
-	return 0;
-}
-
-/*
- * This routine is called from rt_setgate() to do the analogous thing for
- * adds and changes.  There is the added complication in this case of a
- * middle insert; i.e., insertion of a new network route between an older
- * network route and (cloned) host routes.  For this reason, a simple check
- * of rt->rt_parent is insufficient; each candidate route must be tested
- * against the (mask, value) of the new route (passed as before in vp)
- * to see if the new route matches it.  Unfortunately, this has the obnoxious
- * property of also triggering for insertion /above/ a pre-existing network
- * route and clones.  Sigh.  This may be fixed some day.
- *
- * XXX - it may be possible to do fixdelete() for changes and reserve this
- * routine just for adds.  I'm not sure why I thought it was necessary to do
- * changes this way.
- */
-#ifdef DEBUG
-int rtfcdebug = 0;
-#endif
-
-static int
-rt_fixchange(struct radix_node *rn, void *vp)
-{
-	struct rtentry *rt = (struct rtentry *)rn;
-	struct rtfc_arg *ap = vp;
-	struct rtentry *rt0 = ap->rt0;
-	struct radix_node_head *rnh = ap->rnh;
-	u_char *xk1, *xm1, *xk2;
-	int i, len;
-
-#ifdef DEBUG
-	if (rtfcdebug)
-		printf("rt_fixchange: rt %p, rt0 %p\n", rt, rt0);
-#endif
-
-	if (!rt->rt_parent || (rt->rt_flags & RTF_PINNED)) {
-#ifdef DEBUG
-		if(rtfcdebug) printf("no parent or pinned\n");
-#endif
-		return 0;
-	}
-
-	if (rt->rt_parent == rt0) {
-#ifdef DEBUG
-		if(rtfcdebug) printf("parent match\n");
-#endif
-		return rtrequest(RTM_DELETE, rt_key(rt),
-				 (struct sockaddr *)0, rt_mask(rt),
-				 rt->rt_flags, (struct rtentry **)0);
-	}
-
-	/*
-	 * There probably is a function somewhere which does this...
-	 * if not, there should be.
-	 */
-	len = imin(((struct sockaddr *)rt_key(rt0))->sa_len,
-		   ((struct sockaddr *)rt_key(rt))->sa_len);
-
-	xk1 = (u_char *)rt_key(rt0);
-	xm1 = (u_char *)rt_mask(rt0);
-	xk2 = (u_char *)rt_key(rt);
-
-	for (i = rnh->rnh_treetop->rn_off; i < len; i++) {
-		if ((xk2[i] & xm1[i]) != xk1[i]) {
-#ifdef DEBUG
-			if(rtfcdebug) printf("no match\n");
-#endif
-			return 0;
-		}
-	}
-
-	/*
-	 * OK, this node is a clone, and matches the node currently being
-	 * changed/added under the node's mask.  So, get rid of it.
-	 */
-#ifdef DEBUG
-	if(rtfcdebug) printf("deleting\n");
-#endif
-	return rtrequest(RTM_DELETE, rt_key(rt), (struct sockaddr *)0,
-			 rt_mask(rt), rt->rt_flags, (struct rtentry **)0);
-}
-
-int
-rt_setgate(rt0, dst, gate)
-	struct rtentry *rt0;
-	struct sockaddr *dst, *gate;
-{
-	caddr_t new, old;
-	int dlen = ROUNDUP(dst->sa_len), glen = ROUNDUP(gate->sa_len);
-	register struct rtentry *rt = rt0;
-	struct radix_node_head *rnh = rt_tables[dst->sa_family];
-
-	/*
-	 * A host route with the destination equal to the gateway
-	 * will interfere with keeping LLINFO in the routing
-	 * table, so disallow it.
-	 */
-	if (((rt0->rt_flags & (RTF_HOST|RTF_GATEWAY|RTF_LLINFO)) ==
-					(RTF_HOST|RTF_GATEWAY)) &&
-	    (dst->sa_len == gate->sa_len) &&
-	    (bcmp(dst, gate, dst->sa_len) == 0)) {
-		/*
-		 * The route might already exist if this is an RTM_CHANGE
-		 * or a routing redirect, so try to delete it.
-		 */
-		if (rt_key(rt0))
-			rtrequest(RTM_DELETE, (struct sockaddr *)rt_key(rt0),
-			    rt0->rt_gateway, rt_mask(rt0), rt0->rt_flags, 0);
-		return EADDRNOTAVAIL;
-	}
-
-	if (rt->rt_gateway == 0 || glen > ROUNDUP(rt->rt_gateway->sa_len)) {
-		old = (caddr_t)rt_key(rt);
-		R_Malloc(new, caddr_t, dlen + glen);
-		if (new == 0)
-			return ENOBUFS;
-		rt->rt_nodes->rn_key = new;
-	} else {
-		new = rt->rt_nodes->rn_key;
-		old = 0;
-	}
-	Bcopy(gate, (rt->rt_gateway = (struct sockaddr *)(new + dlen)), glen);
-	if (old) {
-		Bcopy(dst, new, dlen);
-		Free(old);
-	}
-	if (rt->rt_gwroute) {
-		rt = rt->rt_gwroute; RTFREE(rt);
-		rt = rt0; rt->rt_gwroute = 0;
-	}
-	/*
-	 * Cloning loop avoidance:
-	 * In the presence of protocol-cloning and bad configuration,
-	 * it is possible to get stuck in bottomless mutual recursion
-	 * (rtrequest rt_setgate rtalloc1).  We avoid this by not allowing
-	 * protocol-cloning to operate for gateways (which is probably the
-	 * correct choice anyway), and avoid the resulting reference loops
-	 * by disallowing any route to run through itself as a gateway.
-	 * This is obviuosly mandatory when we get rt->rt_output().
-	 */
-	if (rt->rt_flags & RTF_GATEWAY) {
-		rt->rt_gwroute = rtalloc1(gate, 1, RTF_PRCLONING);
-		if (rt->rt_gwroute == rt) {
-			RTFREE(rt->rt_gwroute);
-			rt->rt_gwroute = 0;
-			return EDQUOT; /* failure */
-		}
-	}
-
-	/*
-	 * This isn't going to do anything useful for host routes, so
-	 * don't bother.  Also make sure we have a reasonable mask
-	 * (we don't yet have one during adds).
-	 */
-	if (!(rt->rt_flags & RTF_HOST) && rt_mask(rt) != 0) {
-		struct rtfc_arg arg;
-		arg.rnh = rnh;
-		arg.rt0 = rt;
-		rnh->rnh_walktree_from(rnh, rt_key(rt), rt_mask(rt),
-				       rt_fixchange, &arg);
-	}
-
-	return 0;
-}
-
-static void
-rt_maskedcopy(src, dst, netmask)
-	struct sockaddr *src, *dst, *netmask;
-{
-	register u_char *cp1 = (u_char *)src;
-	register u_char *cp2 = (u_char *)dst;
-	register u_char *cp3 = (u_char *)netmask;
-	u_char *cplim = cp2 + *cp3;
-	u_char *cplim2 = cp2 + *cp1;
-
-	*cp2++ = *cp1++; *cp2++ = *cp1++; /* copies sa_len & sa_family */
-	cp3 += 2;
-	if (cplim > cplim2)
-		cplim = cplim2;
-	while (cp2 < cplim)
-		*cp2++ = *cp1++ & *cp3++;
-	if (cp2 < cplim2)
-		bzero((caddr_t)cp2, (unsigned)(cplim2 - cp2));
-}
-
-/*
- * Set up a routing table entry, normally
- * for an interface.
- */
-int
-rtinit(ifa, cmd, flags)
-	register struct ifaddr *ifa;
-	int cmd, flags;
-{
-	register struct rtentry *rt;
-	register struct sockaddr *dst;
-	register struct sockaddr *deldst;
-	struct mbuf *m = 0;
-	struct rtentry *nrt = 0;
-	int error;
-
-	dst = flags & RTF_HOST ? ifa->ifa_dstaddr : ifa->ifa_addr;
-	/*
-	 * If it's a delete, check that if it exists, it's on the correct
-	 * interface or we might scrub a route to another ifa which would
-	 * be confusing at best and possibly worse.
-	 */
-	if (cmd == RTM_DELETE) {
-		/* 
-		 * It's a delete, so it should already exist..
-		 * If it's a net, mask off the host bits
-		 * (Assuming we have a mask)
-		 */
-		if ((flags & RTF_HOST) == 0 && ifa->ifa_netmask) {
-			m = m_get(M_WAIT, MT_SONAME);
-			deldst = mtod(m, struct sockaddr *);
-			rt_maskedcopy(dst, deldst, ifa->ifa_netmask);
-			dst = deldst;
-		}
-		/*
-		 * Get an rtentry that is in the routing tree and
-		 * contains the correct info. (if this fails we can't get there).
-		 * We set "report" to FALSE so that if it doesn't exist,
-		 * it doesn't report an error or clone a route, etc. etc.
-		 */
-		rt = rtalloc1(dst, 0, 0UL);
-		if (rt) {
-			/*
-			 * Ok so we found the rtentry. it has an extra reference
-			 * for us at this stage. we won't need that so
-			 * lop that off now.
-			 */
-			rt->rt_refcnt--;
-			if (rt->rt_ifa != ifa) {
-				/*
-				 * If the interface in the rtentry doesn't match
-				 * the interface we are using, then we don't
-				 * want to delete it, so return an error.
-				 * This seems to be the only point of 
-				 * this whole RTM_DELETE clause.
-				 */
-				if (m)
-					(void) m_free(m);
-				return (flags & RTF_HOST ? EHOSTUNREACH
-							: ENETUNREACH);
-			}
-		}
-		/* XXX */
-#if 0
-		else {
-			/* 
-			 * One would think that as we are deleting, and we know
-			 * it doesn't exist, we could just return at this point
-			 * with an "ELSE" clause, but apparently not..
-			 */
-			return (flags & RTF_HOST ? EHOSTUNREACH
-							: ENETUNREACH);
-		}
-#endif
-	}
-	/*
-	 * Do the actual request
-	 */
-	error = rtrequest(cmd, dst, ifa->ifa_addr, ifa->ifa_netmask,
-			flags | ifa->ifa_flags, &nrt);
-	if (m)
-		(void) m_free(m);
-	/*
-	 * If we are deleting, and we found an entry, then
-	 * it's been removed from the tree.. now throw it away.
-	 */
-	if (cmd == RTM_DELETE && error == 0 && (rt = nrt)) {
-		/*
-		 * notify any listenning routing agents of the change
-		 */
-		rt_newaddrmsg(cmd, ifa, error, nrt);
-		if (rt->rt_refcnt <= 0) {
-			rt->rt_refcnt++; /* need a 1->0 transition to free */
-			rtfree(rt);
-		}
-	}
-
-	/*
-	 * We are adding, and we have a returned routing entry.
-	 * We need to sanity check the result.
-	 */
-	if (cmd == RTM_ADD && error == 0 && (rt = nrt)) {
-		/*
-		 * We just wanted to add it.. we don't actually need a reference
-		 */
-		rt->rt_refcnt--;
-		/*
-		 * If it came back with an unexpected interface, then it must 
-		 * have already existed or something. (XXX)
-		 */
-		if (rt->rt_ifa != ifa) {
-			printf("rtinit: wrong ifa (%p) was (%p)\n", ifa,
-				rt->rt_ifa);
-			/*
-			 * Ask that the route we got back be removed
-			 * from the routing tables as we are trying
-			 * to supersede it.
-			 */
-			if (rt->rt_ifa->ifa_rtrequest)
-			    rt->rt_ifa->ifa_rtrequest(RTM_DELETE, rt, SA(0));
-			/* 
-			 * Remove the referenve to the it's ifaddr.
-			 */
-			IFAFREE(rt->rt_ifa);
-			/*
-			 * And substitute in references to the ifaddr
-			 * we are adding.
-			 */
-			rt->rt_ifa = ifa;
-			rt->rt_ifp = ifa->ifa_ifp;
-			ifa->ifa_refcnt++;
-			/*
-			 * Now add it to the routing table
-			 * XXX could we have just left it?
-			 * as it might have been in the right place..
-			 */
-			if (ifa->ifa_rtrequest)
-			    ifa->ifa_rtrequest(RTM_ADD, rt, SA(0));
-		}
-		/*
-		 * notify any listenning routing agents of the change
-		 */
-		rt_newaddrmsg(cmd, ifa, error, nrt);
-	}
-	return (error);
-}
diff --git a/c/src/libnetworking/net/route.h b/c/src/libnetworking/net/route.h
deleted file mode 100644
index 69d76909fc..0000000000
--- a/c/src/libnetworking/net/route.h
+++ /dev/null
@@ -1,284 +0,0 @@
-/*
- * Copyright (c) 1980, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)route.h	8.3 (Berkeley) 4/19/94
- * $Id$
- */
-
-#ifndef _NET_ROUTE_H_
-#define _NET_ROUTE_H_
-
-/*
- * Kernel resident routing tables.
- *
- * The routing tables are initialized when interface addresses
- * are set by making entries for all directly connected interfaces.
- */
-
-/*
- * A route consists of a destination address and a reference
- * to a routing entry.  These are often held by protocols
- * in their control blocks, e.g. inpcb.
- */
-struct route {
-	struct	rtentry *ro_rt;
-	struct	sockaddr ro_dst;
-};
-
-/*
- * These numbers are used by reliable protocols for determining
- * retransmission behavior and are included in the routing structure.
- */
-struct rt_metrics {
-	u_long	rmx_locks;	/* Kernel must leave these values alone */
-	u_long	rmx_mtu;	/* MTU for this path */
-	u_long	rmx_hopcount;	/* max hops expected */
-	u_long	rmx_expire;	/* lifetime for route, e.g. redirect */
-	u_long	rmx_recvpipe;	/* inbound delay-bandwidth product */
-	u_long	rmx_sendpipe;	/* outbound delay-bandwidth product */
-	u_long	rmx_ssthresh;	/* outbound gateway buffer limit */
-	u_long	rmx_rtt;	/* estimated round trip time */
-	u_long	rmx_rttvar;	/* estimated rtt variance */
-	u_long	rmx_pksent;	/* packets sent using this route */
-	u_long	rmx_filler[4];	/* will be used for T/TCP later */
-};
-
-/*
- * rmx_rtt and rmx_rttvar are stored as microseconds;
- * RTTTOPRHZ(rtt) converts to a value suitable for use
- * by a protocol slowtimo counter.
- */
-#define	RTM_RTTUNIT	1000000	/* units for rtt, rttvar, as units per sec */
-#define	RTTTOPRHZ(r)	((r) / (RTM_RTTUNIT / PR_SLOWHZ))
-
-/*
- * XXX kernel function pointer `rt_output' is visible to applications.
- */
-struct mbuf;
-
-/*
- * We distinguish between routes to hosts and routes to networks,
- * preferring the former if available.  For each route we infer
- * the interface to use from the gateway address supplied when
- * the route was entered.  Routes that forward packets through
- * gateways are marked so that the output routines know to address the
- * gateway rather than the ultimate destination.
- */
-#ifndef RNF_NORMAL
-#include <net/radix.h>
-#endif
-struct rtentry {
-	struct	radix_node rt_nodes[2];	/* tree glue, and other values */
-#define	rt_key(r)	((struct sockaddr *)((r)->rt_nodes->rn_key))
-#define	rt_mask(r)	((struct sockaddr *)((r)->rt_nodes->rn_mask))
-	struct	sockaddr *rt_gateway;	/* value */
-	short	rt_filler;		/* was short flags field */
-	short	rt_refcnt;		/* # held references */
-	u_long	rt_flags;		/* up/down?, host/net */
-	struct	ifnet *rt_ifp;		/* the answer: interface to use */
-	struct	ifaddr *rt_ifa;		/* the answer: interface to use */
-	struct	sockaddr *rt_genmask;	/* for generation of cloned routes */
-	caddr_t	rt_llinfo;		/* pointer to link level info cache */
-	struct	rt_metrics rt_rmx;	/* metrics used by rx'ing protocols */
-	struct	rtentry *rt_gwroute;	/* implied entry for gatewayed routes */
-	int	(*rt_output) __P((struct ifnet *, struct mbuf *,
-				  struct sockaddr *, struct rtentry *));
-					/* output routine for this (rt,if) */
-	struct	rtentry *rt_parent; 	/* cloning parent of this route */
-	void	*rt_filler2;		/* more filler */
-};
-
-/*
- * Following structure necessary for 4.3 compatibility;
- * We should eventually move it to a compat file.
- */
-struct ortentry {
-	u_long	rt_hash;		/* to speed lookups */
-	struct	sockaddr rt_dst;	/* key */
-	struct	sockaddr rt_gateway;	/* value */
-	short	rt_flags;		/* up/down?, host/net */
-	short	rt_refcnt;		/* # held references */
-	u_long	rt_use;			/* raw # packets forwarded */
-	struct	ifnet *rt_ifp;		/* the answer: interface to use */
-};
-
-#define rt_use rt_rmx.rmx_pksent
-
-#define	RTF_UP		0x1		/* route usable */
-#define	RTF_GATEWAY	0x2		/* destination is a gateway */
-#define	RTF_HOST	0x4		/* host entry (net otherwise) */
-#define	RTF_REJECT	0x8		/* host or net unreachable */
-#define	RTF_DYNAMIC	0x10		/* created dynamically (by redirect) */
-#define	RTF_MODIFIED	0x20		/* modified dynamically (by redirect) */
-#define RTF_DONE	0x40		/* message confirmed */
-/*			0x80		   unused */
-#define RTF_CLONING	0x100		/* generate new routes on use */
-#define RTF_XRESOLVE	0x200		/* external daemon resolves name */
-#define RTF_LLINFO	0x400		/* generated by link layer (e.g. ARP) */
-#define RTF_STATIC	0x800		/* manually added */
-#define RTF_BLACKHOLE	0x1000		/* just discard pkts (during updates) */
-#define RTF_PROTO2	0x4000		/* protocol specific routing flag */
-#define RTF_PROTO1	0x8000		/* protocol specific routing flag */
-
-#define RTF_PRCLONING	0x10000		/* protocol requires cloning */
-#define RTF_WASCLONED	0x20000		/* route generated through cloning */
-#define RTF_PROTO3	0x40000		/* protocol specific routing flag */
-/*			0x80000		   unused */
-#define RTF_PINNED	0x100000	/* future use */
-#define	RTF_LOCAL	0x200000 	/* route represents a local address */
-#define	RTF_BROADCAST	0x400000	/* route represents a bcast address */
-#define	RTF_MULTICAST	0x800000	/* route represents a mcast address */
-					/* 0x1000000 and up unassigned */
-
-/*
- * Routing statistics.
- */
-struct	rtstat {
-	short	rts_badredirect;	/* bogus redirect calls */
-	short	rts_dynamic;		/* routes created by redirects */
-	short	rts_newgateway;		/* routes modified by redirects */
-	short	rts_unreach;		/* lookups which failed */
-	short	rts_wildcard;		/* lookups satisfied by a wildcard */
-};
-/*
- * Structures for routing messages.
- */
-struct rt_msghdr {
-	u_short	rtm_msglen;	/* to skip over non-understood messages */
-	u_char	rtm_version;	/* future binary compatibility */
-	u_char	rtm_type;	/* message type */
-	u_short	rtm_index;	/* index for associated ifp */
-	int	rtm_flags;	/* flags, incl. kern & message, e.g. DONE */
-	int	rtm_addrs;	/* bitmask identifying sockaddrs in msg */
-	pid_t	rtm_pid;	/* identify sender */
-	int	rtm_seq;	/* for sender to identify action */
-	int	rtm_errno;	/* why failed */
-	int	rtm_use;	/* from rtentry */
-	u_long	rtm_inits;	/* which metrics we are initializing */
-	struct	rt_metrics rtm_rmx; /* metrics themselves */
-};
-
-#define RTM_VERSION	5	/* Up the ante and ignore older versions */
-
-#define RTM_ADD		0x1	/* Add Route */
-#define RTM_DELETE	0x2	/* Delete Route */
-#define RTM_CHANGE	0x3	/* Change Metrics or flags */
-#define RTM_GET		0x4	/* Report Metrics */
-#define RTM_LOSING	0x5	/* Kernel Suspects Partitioning */
-#define RTM_REDIRECT	0x6	/* Told to use different route */
-#define RTM_MISS	0x7	/* Lookup failed on this address */
-#define RTM_LOCK	0x8	/* fix specified metrics */
-#define RTM_OLDADD	0x9	/* caused by SIOCADDRT */
-#define RTM_OLDDEL	0xa	/* caused by SIOCDELRT */
-#define RTM_RESOLVE	0xb	/* req to resolve dst to LL addr */
-#define RTM_NEWADDR	0xc	/* address being added to iface */
-#define RTM_DELADDR	0xd	/* address being removed from iface */
-#define RTM_IFINFO	0xe	/* iface going up/down etc. */
-
-#define RTV_MTU		0x1	/* init or lock _mtu */
-#define RTV_HOPCOUNT	0x2	/* init or lock _hopcount */
-#define RTV_EXPIRE	0x4	/* init or lock _hopcount */
-#define RTV_RPIPE	0x8	/* init or lock _recvpipe */
-#define RTV_SPIPE	0x10	/* init or lock _sendpipe */
-#define RTV_SSTHRESH	0x20	/* init or lock _ssthresh */
-#define RTV_RTT		0x40	/* init or lock _rtt */
-#define RTV_RTTVAR	0x80	/* init or lock _rttvar */
-
-/*
- * Bitmask values for rtm_addr.
- */
-#define RTA_DST		0x1	/* destination sockaddr present */
-#define RTA_GATEWAY	0x2	/* gateway sockaddr present */
-#define RTA_NETMASK	0x4	/* netmask sockaddr present */
-#define RTA_GENMASK	0x8	/* cloning mask sockaddr present */
-#define RTA_IFP		0x10	/* interface name sockaddr present */
-#define RTA_IFA		0x20	/* interface addr sockaddr present */
-#define RTA_AUTHOR	0x40	/* sockaddr for author of redirect */
-#define RTA_BRD		0x80	/* for NEWADDR, broadcast or p-p dest addr */
-
-/*
- * Index offsets for sockaddr array for alternate internal encoding.
- */
-#define RTAX_DST	0	/* destination sockaddr present */
-#define RTAX_GATEWAY	1	/* gateway sockaddr present */
-#define RTAX_NETMASK	2	/* netmask sockaddr present */
-#define RTAX_GENMASK	3	/* cloning mask sockaddr present */
-#define RTAX_IFP	4	/* interface name sockaddr present */
-#define RTAX_IFA	5	/* interface addr sockaddr present */
-#define RTAX_AUTHOR	6	/* sockaddr for author of redirect */
-#define RTAX_BRD	7	/* for NEWADDR, broadcast or p-p dest addr */
-#define RTAX_MAX	8	/* size of array to allocate */
-
-struct rt_addrinfo {
-	int	rti_addrs;
-	struct	sockaddr *rti_info[RTAX_MAX];
-};
-
-struct route_cb {
-	int	ip_count;
-	int	ipx_count;
-	int	ns_count;
-	int	iso_count;
-	int	any_count;
-};
-
-#ifdef KERNEL
-#define	RTFREE(rt) \
-	if ((rt)->rt_refcnt <= 1) \
-		rtfree(rt); \
-	else \
-		(rt)->rt_refcnt--;
-
-extern struct route_cb route_cb;
-extern struct rtstat rtstat;
-extern struct radix_node_head *rt_tables[AF_MAX+1];
-
-void	 route_init __P((void));
-void	 rt_ifmsg __P((struct ifnet *));
-void	 rt_missmsg __P((int, struct rt_addrinfo *, int, int));
-void	 rt_newaddrmsg __P((int, struct ifaddr *, int, struct rtentry *));
-int	 rt_setgate __P((struct rtentry *,
-	    struct sockaddr *, struct sockaddr *));
-void	 rtalloc __P((struct route *));
-void	 rtalloc_ign __P((struct route *, unsigned long));
-struct rtentry *
-	 rtalloc1 __P((struct sockaddr *, int, unsigned long));
-void	 rtfree __P((struct rtentry *));
-int	 rtinit __P((struct ifaddr *, int, int));
-int	 rtioctl __P((int, caddr_t, struct proc *));
-void	 rtredirect __P((struct sockaddr *, struct sockaddr *,
-	    struct sockaddr *, int, struct sockaddr *, struct rtentry **));
-int	 rtrequest __P((int, struct sockaddr *,
-	    struct sockaddr *, struct sockaddr *, int, struct rtentry **));
-#endif
-
-#endif
diff --git a/c/src/libnetworking/net/rtsock.c b/c/src/libnetworking/net/rtsock.c
deleted file mode 100644
index 57e777906a..0000000000
--- a/c/src/libnetworking/net/rtsock.c
+++ /dev/null
@@ -1,829 +0,0 @@
-/*
- * Copyright (c) 1988, 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)rtsock.c	8.5 (Berkeley) 11/2/94
- *	$Id$
- */
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/sysctl.h>
-#include <sys/proc.h>
-#include <sys/mbuf.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/domain.h>
-#include <sys/protosw.h>
-
-#include <net/if.h>
-#include <net/route.h>
-#include <net/raw_cb.h>
-
-static struct	sockaddr route_dst = { 2, PF_ROUTE, };
-static struct	sockaddr route_src = { 2, PF_ROUTE, };
-static struct	sockaddr sa_zero   = { sizeof(sa_zero), AF_INET, };
-static struct	sockproto route_proto = { PF_ROUTE, };
-
-struct walkarg {
-	int	w_tmemsize;
-	int	w_op, w_arg;
-	caddr_t	w_tmem;
-	struct sysctl_req *w_req;
-};
-
-static struct mbuf *
-		rt_msg1 __P((int, struct rt_addrinfo *));
-static int	rt_msg2 __P((int,
-		    struct rt_addrinfo *, caddr_t, struct walkarg *));
-static int	rt_xaddrs __P((caddr_t, caddr_t, struct rt_addrinfo *));
-static int	sysctl_dumpentry __P((struct radix_node *rn, void *vw));
-static int	sysctl_iflist __P((int af, struct walkarg *w));
-static int	 route_output __P((struct mbuf *, struct socket *));
-static int	 route_usrreq __P((struct socket *,
-	    int, struct mbuf *, struct mbuf *, struct mbuf *));
-static void	 rt_setmetrics __P((u_long, struct rt_metrics *, struct rt_metrics *));
-
-/* Sleazy use of local variables throughout file, warning!!!! */
-#define dst	info.rti_info[RTAX_DST]
-#define gate	info.rti_info[RTAX_GATEWAY]
-#define netmask	info.rti_info[RTAX_NETMASK]
-#define genmask	info.rti_info[RTAX_GENMASK]
-#define ifpaddr	info.rti_info[RTAX_IFP]
-#define ifaaddr	info.rti_info[RTAX_IFA]
-#define brdaddr	info.rti_info[RTAX_BRD]
-
-/*ARGSUSED*/
-static int
-route_usrreq(so, req, m, nam, control)
-	register struct socket *so;
-	int req;
-	struct mbuf *m, *nam, *control;
-{
-	register int error = 0;
-	register struct rawcb *rp = sotorawcb(so);
-	int s;
-
-	if (req == PRU_ATTACH) {
-		MALLOC(rp, struct rawcb *, sizeof(*rp), M_PCB, M_WAITOK);
-		so->so_pcb = (caddr_t)rp;
-		if (so->so_pcb)
-			bzero(so->so_pcb, sizeof(*rp));
-	}
-	if (req == PRU_DETACH && rp) {
-		int af = rp->rcb_proto.sp_protocol;
-		if (af == AF_INET)
-			route_cb.ip_count--;
-		else if (af == AF_IPX)
-			route_cb.ipx_count--;
-		else if (af == AF_NS)
-			route_cb.ns_count--;
-		else if (af == AF_ISO)
-			route_cb.iso_count--;
-		route_cb.any_count--;
-	}
-	s = splnet();
-	error = raw_usrreq(so, req, m, nam, control);
-	rp = sotorawcb(so);
-	if (req == PRU_ATTACH && rp) {
-		int af = rp->rcb_proto.sp_protocol;
-		if (error) {
-			free((caddr_t)rp, M_PCB);
-			splx(s);
-			return (error);
-		}
-		if (af == AF_INET)
-			route_cb.ip_count++;
-		else if (af == AF_IPX)
-			route_cb.ipx_count++;
-		else if (af == AF_NS)
-			route_cb.ns_count++;
-		else if (af == AF_ISO)
-			route_cb.iso_count++;
-		rp->rcb_faddr = &route_src;
-		route_cb.any_count++;
-		soisconnected(so);
-		so->so_options |= SO_USELOOPBACK;
-	}
-	splx(s);
-	return (error);
-}
-
-/*ARGSUSED*/
-static int
-route_output(m, so)
-	register struct mbuf *m;
-	struct socket *so;
-{
-	register struct rt_msghdr *rtm = 0;
-	register struct rtentry *rt = 0;
-	struct rtentry *saved_nrt = 0;
-	struct radix_node_head *rnh;
-	struct rt_addrinfo info;
-	int len, error = 0;
-	struct ifnet *ifp = 0;
-	struct ifaddr *ifa = 0;
-
-#define senderr(e) { error = e; goto flush;}
-	if (m == 0 || ((m->m_len < sizeof(long)) &&
-		       (m = m_pullup(m, sizeof(long))) == 0))
-		return (ENOBUFS);
-	if ((m->m_flags & M_PKTHDR) == 0)
-		panic("route_output");
-	len = m->m_pkthdr.len;
-	if (len < sizeof(*rtm) ||
-	    len != mtod(m, struct rt_msghdr *)->rtm_msglen) {
-		dst = 0;
-		senderr(EINVAL);
-	}
-	R_Malloc(rtm, struct rt_msghdr *, len);
-	if (rtm == 0) {
-		dst = 0;
-		senderr(ENOBUFS);
-	}
-	m_copydata(m, 0, len, (caddr_t)rtm);
-	if (rtm->rtm_version != RTM_VERSION) {
-		dst = 0;
-		senderr(EPROTONOSUPPORT);
-	}
-	info.rti_addrs = rtm->rtm_addrs;
-	if (rt_xaddrs((caddr_t)(rtm + 1), len + (caddr_t)rtm, &info)) {
-		dst = 0;
-		senderr(EINVAL);
-	}
-	if (dst == 0 || (dst->sa_family >= AF_MAX)
-	    || (gate != 0 && (gate->sa_family >= AF_MAX)))
-		senderr(EINVAL);
-	if (genmask) {
-		struct radix_node *t;
-		t = rn_addmask((caddr_t)genmask, 0, 1);
-		if (t && Bcmp(genmask, t->rn_key, *(u_char *)genmask) == 0)
-			genmask = (struct sockaddr *)(t->rn_key);
-		else
-			senderr(ENOBUFS);
-	}
-	switch (rtm->rtm_type) {
-
-	case RTM_ADD:
-		if (gate == 0)
-			senderr(EINVAL);
-		error = rtrequest(RTM_ADD, dst, gate, netmask,
-					rtm->rtm_flags, &saved_nrt);
-		if (error == 0 && saved_nrt) {
-			rt_setmetrics(rtm->rtm_inits,
-				&rtm->rtm_rmx, &saved_nrt->rt_rmx);
-			saved_nrt->rt_rmx.rmx_locks &= ~(rtm->rtm_inits);
-			saved_nrt->rt_rmx.rmx_locks |=
-				(rtm->rtm_inits & rtm->rtm_rmx.rmx_locks);
-			saved_nrt->rt_refcnt--;
-			saved_nrt->rt_genmask = genmask;
-		}
-		break;
-
-	case RTM_DELETE:
-		error = rtrequest(RTM_DELETE, dst, gate, netmask,
-				rtm->rtm_flags, &saved_nrt);
-		if (error == 0) {
-			if ((rt = saved_nrt))
-				rt->rt_refcnt++;
-			goto report;
-		}
-		break;
-
-	case RTM_GET:
-	case RTM_CHANGE:
-	case RTM_LOCK:
-		if ((rnh = rt_tables[dst->sa_family]) == 0) {
-			senderr(EAFNOSUPPORT);
-		} else if ((rt = (struct rtentry *)
-				rnh->rnh_lookup(dst, netmask, rnh)))
-			rt->rt_refcnt++;
-		else
-			senderr(ESRCH);
-		switch(rtm->rtm_type) {
-
-		case RTM_GET:
-		report:
-			dst = rt_key(rt);
-			gate = rt->rt_gateway;
-			netmask = rt_mask(rt);
-			genmask = rt->rt_genmask;
-			if (rtm->rtm_addrs & (RTA_IFP | RTA_IFA)) {
-				ifp = rt->rt_ifp;
-				if (ifp) {
-					ifpaddr = ifp->if_addrlist->ifa_addr;
-					ifaaddr = rt->rt_ifa->ifa_addr;
-					rtm->rtm_index = ifp->if_index;
-				} else {
-					ifpaddr = 0;
-					ifaaddr = 0;
-			    }
-			}
-			len = rt_msg2(rtm->rtm_type, &info, (caddr_t)0,
-				(struct walkarg *)0);
-			if (len > rtm->rtm_msglen) {
-				struct rt_msghdr *new_rtm;
-				R_Malloc(new_rtm, struct rt_msghdr *, len);
-				if (new_rtm == 0)
-					senderr(ENOBUFS);
-				Bcopy(rtm, new_rtm, rtm->rtm_msglen);
-				Free(rtm); rtm = new_rtm;
-			}
-			(void)rt_msg2(rtm->rtm_type, &info, (caddr_t)rtm,
-				(struct walkarg *)0);
-			rtm->rtm_flags = rt->rt_flags;
-			rtm->rtm_rmx = rt->rt_rmx;
-			rtm->rtm_addrs = info.rti_addrs;
-			break;
-
-		case RTM_CHANGE:
-			if (gate && (error = rt_setgate(rt, rt_key(rt), gate)))
-				senderr(error);
-
-			/*
-			 * If they tried to change things but didn't specify
-			 * the required gateway, then just use the old one.
-			 * This can happen if the user tries to change the
-			 * flags on the default route without changing the
-			 * default gateway.  Changing flags still doesn't work.
-			 */
-			if ((rt->rt_flags & RTF_GATEWAY) && !gate)
-				gate = rt->rt_gateway;
-
-			/* new gateway could require new ifaddr, ifp;
-			   flags may also be different; ifp may be specified
-			   by ll sockaddr when protocol address is ambiguous */
-			if (ifpaddr && (ifa = ifa_ifwithnet(ifpaddr)) &&
-			    (ifp = ifa->ifa_ifp) && (ifaaddr || gate))
-				ifa = ifaof_ifpforaddr(ifaaddr ? ifaaddr : gate,
-							ifp);
-			else if ((ifaaddr && (ifa = ifa_ifwithaddr(ifaaddr))) ||
-				 (gate && (ifa = ifa_ifwithroute(rt->rt_flags,
-							rt_key(rt), gate))))
-				ifp = ifa->ifa_ifp;
-			if (ifa) {
-				register struct ifaddr *oifa = rt->rt_ifa;
-				if (oifa != ifa) {
-				    if (oifa && oifa->ifa_rtrequest)
-					oifa->ifa_rtrequest(RTM_DELETE,
-								rt, gate);
-				    IFAFREE(rt->rt_ifa);
-				    rt->rt_ifa = ifa;
-				    ifa->ifa_refcnt++;
-				    rt->rt_ifp = ifp;
-				}
-			}
-			rt_setmetrics(rtm->rtm_inits, &rtm->rtm_rmx,
-					&rt->rt_rmx);
-			if (rt->rt_ifa && rt->rt_ifa->ifa_rtrequest)
-			       rt->rt_ifa->ifa_rtrequest(RTM_ADD, rt, gate);
-			if (genmask)
-				rt->rt_genmask = genmask;
-			/*
-			 * Fall into
-			 */
-		case RTM_LOCK:
-			rt->rt_rmx.rmx_locks &= ~(rtm->rtm_inits);
-			rt->rt_rmx.rmx_locks |=
-				(rtm->rtm_inits & rtm->rtm_rmx.rmx_locks);
-			break;
-		}
-		break;
-
-	default:
-		senderr(EOPNOTSUPP);
-	}
-
-flush:
-	if (rtm) {
-		if (error)
-			rtm->rtm_errno = error;
-		else
-			rtm->rtm_flags |= RTF_DONE;
-	}
-	if (rt)
-		rtfree(rt);
-    {
-	register struct rawcb *rp = 0;
-	/*
-	 * Check to see if we don't want our own messages.
-	 */
-	if ((so->so_options & SO_USELOOPBACK) == 0) {
-		if (route_cb.any_count <= 1) {
-			if (rtm)
-				Free(rtm);
-			m_freem(m);
-			return (error);
-		}
-		/* There is another listener, so construct message */
-		rp = sotorawcb(so);
-	}
-	if (rtm) {
-		m_copyback(m, 0, rtm->rtm_msglen, (caddr_t)rtm);
-		Free(rtm);
-	}
-	if (rp)
-		rp->rcb_proto.sp_family = 0; /* Avoid us */
-	if (dst)
-		route_proto.sp_protocol = dst->sa_family;
-	raw_input(m, &route_proto, &route_src, &route_dst);
-	if (rp)
-		rp->rcb_proto.sp_family = PF_ROUTE;
-    }
-	return (error);
-}
-
-static void
-rt_setmetrics(which, in, out)
-	u_long which;
-	register struct rt_metrics *in, *out;
-{
-#define metric(f, e) if (which & (f)) out->e = in->e;
-	metric(RTV_RPIPE, rmx_recvpipe);
-	metric(RTV_SPIPE, rmx_sendpipe);
-	metric(RTV_SSTHRESH, rmx_ssthresh);
-	metric(RTV_RTT, rmx_rtt);
-	metric(RTV_RTTVAR, rmx_rttvar);
-	metric(RTV_HOPCOUNT, rmx_hopcount);
-	metric(RTV_MTU, rmx_mtu);
-	metric(RTV_EXPIRE, rmx_expire);
-#undef metric
-}
-
-#define ROUNDUP(a) \
-	((a) > 0 ? (1 + (((a) - 1) | (sizeof(long) - 1))) : sizeof(long))
-#define ADVANCE(x, n) (x += ROUNDUP((n)->sa_len))
-
-
-/*
- * Extract the addresses of the passed sockaddrs.
- * Do a little sanity checking so as to avoid bad memory references.
- * This data is derived straight from userland.
- */
-static int
-rt_xaddrs(cp, cplim, rtinfo)
-	register caddr_t cp, cplim;
-	register struct rt_addrinfo *rtinfo;
-{
-	register struct sockaddr *sa;
-	register int i;
-
-	bzero(rtinfo->rti_info, sizeof(rtinfo->rti_info));
-	for (i = 0; (i < RTAX_MAX) && (cp < cplim); i++) {
-		if ((rtinfo->rti_addrs & (1 << i)) == 0)
-			continue;
-		sa = (struct sockaddr *)cp;
-		/*
-		 * It won't fit.
-		 */
-		if ( (cp + sa->sa_len) > cplim ) {
-			return (EINVAL);
-		}
-
-		/*
-		 * there are no more.. quit now
-		 * If there are more bits, they are in error.
-		 * I've seen this. route(1) can evidently generate these. 
-		 * This causes kernel to core dump.
-		 * for compatibility, If we see this, point to a safe address.
-		 */
-		if (sa->sa_len == 0) {
-			rtinfo->rti_info[i] = &sa_zero;
-			return (0); /* should be EINVAL but for compat */
-		}
-
-		/* accept it */
-		rtinfo->rti_info[i] = sa;
-		ADVANCE(cp, sa);
-	}
-	return (0);
-}
-
-static struct mbuf *
-rt_msg1(type, rtinfo)
-	int type;
-	register struct rt_addrinfo *rtinfo;
-{
-	register struct rt_msghdr *rtm;
-	register struct mbuf *m;
-	register int i;
-	register struct sockaddr *sa;
-	int len, dlen;
-
-	m = m_gethdr(M_DONTWAIT, MT_DATA);
-	if (m == 0)
-		return (m);
-	switch (type) {
-
-	case RTM_DELADDR:
-	case RTM_NEWADDR:
-		len = sizeof(struct ifa_msghdr);
-		break;
-
-	case RTM_IFINFO:
-		len = sizeof(struct if_msghdr);
-		break;
-
-	default:
-		len = sizeof(struct rt_msghdr);
-	}
-	if (len > MHLEN)
-		panic("rt_msg1");
-	m->m_pkthdr.len = m->m_len = len;
-	m->m_pkthdr.rcvif = 0;
-	rtm = mtod(m, struct rt_msghdr *);
-	bzero((caddr_t)rtm, len);
-	for (i = 0; i < RTAX_MAX; i++) {
-		if ((sa = rtinfo->rti_info[i]) == NULL)
-			continue;
-		rtinfo->rti_addrs |= (1 << i);
-		dlen = ROUNDUP(sa->sa_len);
-		m_copyback(m, len, dlen, (caddr_t)sa);
-		len += dlen;
-	}
-	if (m->m_pkthdr.len != len) {
-		m_freem(m);
-		return (NULL);
-	}
-	rtm->rtm_msglen = len;
-	rtm->rtm_version = RTM_VERSION;
-	rtm->rtm_type = type;
-	return (m);
-}
-
-static int
-rt_msg2(type, rtinfo, cp, w)
-	int type;
-	register struct rt_addrinfo *rtinfo;
-	caddr_t cp;
-	struct walkarg *w;
-{
-	register int i;
-	int len, dlen, second_time = 0;
-	caddr_t cp0;
-
-	rtinfo->rti_addrs = 0;
-again:
-	switch (type) {
-
-	case RTM_DELADDR:
-	case RTM_NEWADDR:
-		len = sizeof(struct ifa_msghdr);
-		break;
-
-	case RTM_IFINFO:
-		len = sizeof(struct if_msghdr);
-		break;
-
-	default:
-		len = sizeof(struct rt_msghdr);
-	}
-	cp0 = cp;
-	if (cp0)
-		cp += len;
-	for (i = 0; i < RTAX_MAX; i++) {
-		register struct sockaddr *sa;
-
-		if ((sa = rtinfo->rti_info[i]) == 0)
-			continue;
-		rtinfo->rti_addrs |= (1 << i);
-		dlen = ROUNDUP(sa->sa_len);
-		if (cp) {
-			bcopy((caddr_t)sa, cp, (unsigned)dlen);
-			cp += dlen;
-		}
-		len += dlen;
-	}
-	if (cp == 0 && w != NULL && !second_time) {
-		register struct walkarg *rw = w;
-
-		if (rw->w_req) {
-			if (rw->w_tmemsize < len) {
-				if (rw->w_tmem)
-					free(rw->w_tmem, M_RTABLE);
-				rw->w_tmem = (caddr_t)
-					malloc(len, M_RTABLE, M_NOWAIT);
-				if (rw->w_tmem)
-					rw->w_tmemsize = len;
-			}
-			if (rw->w_tmem) {
-				cp = rw->w_tmem;
-				second_time = 1;
-				goto again;
-			}
-		}
-	}
-	if (cp) {
-		register struct rt_msghdr *rtm = (struct rt_msghdr *)cp0;
-
-		rtm->rtm_version = RTM_VERSION;
-		rtm->rtm_type = type;
-		rtm->rtm_msglen = len;
-	}
-	return (len);
-}
-
-/*
- * This routine is called to generate a message from the routing
- * socket indicating that a redirect has occured, a routing lookup
- * has failed, or that a protocol has detected timeouts to a particular
- * destination.
- */
-void
-rt_missmsg(type, rtinfo, flags, error)
-	int type, flags, error;
-	register struct rt_addrinfo *rtinfo;
-{
-	register struct rt_msghdr *rtm;
-	register struct mbuf *m;
-	struct sockaddr *sa = rtinfo->rti_info[RTAX_DST];
-
-	if (route_cb.any_count == 0)
-		return;
-	m = rt_msg1(type, rtinfo);
-	if (m == 0)
-		return;
-	rtm = mtod(m, struct rt_msghdr *);
-	rtm->rtm_flags = RTF_DONE | flags;
-	rtm->rtm_errno = error;
-	rtm->rtm_addrs = rtinfo->rti_addrs;
-	route_proto.sp_protocol = sa ? sa->sa_family : 0;
-	raw_input(m, &route_proto, &route_src, &route_dst);
-}
-
-/*
- * This routine is called to generate a message from the routing
- * socket indicating that the status of a network interface has changed.
- */
-void
-rt_ifmsg(ifp)
-	register struct ifnet *ifp;
-{
-	register struct if_msghdr *ifm;
-	struct mbuf *m;
-	struct rt_addrinfo info;
-
-	if (route_cb.any_count == 0)
-		return;
-	bzero((caddr_t)&info, sizeof(info));
-	m = rt_msg1(RTM_IFINFO, &info);
-	if (m == 0)
-		return;
-	ifm = mtod(m, struct if_msghdr *);
-	ifm->ifm_index = ifp->if_index;
-	ifm->ifm_flags = (u_short)ifp->if_flags;
-	ifm->ifm_data = ifp->if_data;
-	ifm->ifm_addrs = 0;
-	route_proto.sp_protocol = 0;
-	raw_input(m, &route_proto, &route_src, &route_dst);
-}
-
-/*
- * This is called to generate messages from the routing socket
- * indicating a network interface has had addresses associated with it.
- * if we ever reverse the logic and replace messages TO the routing
- * socket indicate a request to configure interfaces, then it will
- * be unnecessary as the routing socket will automatically generate
- * copies of it.
- */
-void
-rt_newaddrmsg(cmd, ifa, error, rt)
-	int cmd, error;
-	register struct ifaddr *ifa;
-	register struct rtentry *rt;
-{
-	struct rt_addrinfo info;
-	struct sockaddr *sa = 0;
-	int pass;
-	struct mbuf *m = 0;
-	struct ifnet *ifp = ifa->ifa_ifp;
-
-	if (route_cb.any_count == 0)
-		return;
-	for (pass = 1; pass < 3; pass++) {
-		bzero((caddr_t)&info, sizeof(info));
-		if ((cmd == RTM_ADD && pass == 1) ||
-		    (cmd == RTM_DELETE && pass == 2)) {
-			register struct ifa_msghdr *ifam;
-			int ncmd = cmd == RTM_ADD ? RTM_NEWADDR : RTM_DELADDR;
-
-			ifaaddr = sa = ifa->ifa_addr;
-			ifpaddr = ifp->if_addrlist->ifa_addr;
-			netmask = ifa->ifa_netmask;
-			brdaddr = ifa->ifa_dstaddr;
-			if ((m = rt_msg1(ncmd, &info)) == NULL)
-				continue;
-			ifam = mtod(m, struct ifa_msghdr *);
-			ifam->ifam_index = ifp->if_index;
-			ifam->ifam_metric = ifa->ifa_metric;
-			ifam->ifam_flags = ifa->ifa_flags;
-			ifam->ifam_addrs = info.rti_addrs;
-		}
-		if ((cmd == RTM_ADD && pass == 2) ||
-		    (cmd == RTM_DELETE && pass == 1)) {
-			register struct rt_msghdr *rtm;
-
-			if (rt == 0)
-				continue;
-			netmask = rt_mask(rt);
-			dst = sa = rt_key(rt);
-			gate = rt->rt_gateway;
-			if ((m = rt_msg1(cmd, &info)) == NULL)
-				continue;
-			rtm = mtod(m, struct rt_msghdr *);
-			rtm->rtm_index = ifp->if_index;
-			rtm->rtm_flags |= rt->rt_flags;
-			rtm->rtm_errno = error;
-			rtm->rtm_addrs = info.rti_addrs;
-		}
-		route_proto.sp_protocol = sa ? sa->sa_family : 0;
-		raw_input(m, &route_proto, &route_src, &route_dst);
-	}
-}
-
-
-/*
- * This is used in dumping the kernel table via sysctl().
- */
-int
-sysctl_dumpentry(rn, vw)
-	struct radix_node *rn;
-	void *vw;
-{
-	register struct walkarg *w = vw;
-	register struct rtentry *rt = (struct rtentry *)rn;
-	int error = 0, size;
-	struct rt_addrinfo info;
-
-	if (w->w_op == NET_RT_FLAGS && !(rt->rt_flags & w->w_arg))
-		return 0;
-	bzero((caddr_t)&info, sizeof(info));
-	dst = rt_key(rt);
-	gate = rt->rt_gateway;
-	netmask = rt_mask(rt);
-	genmask = rt->rt_genmask;
-	size = rt_msg2(RTM_GET, &info, 0, w);
-	if (w->w_req && w->w_tmem) {
-		register struct rt_msghdr *rtm = (struct rt_msghdr *)w->w_tmem;
-
-		rtm->rtm_flags = rt->rt_flags;
-		rtm->rtm_use = rt->rt_use;
-		rtm->rtm_rmx = rt->rt_rmx;
-		rtm->rtm_index = rt->rt_ifp->if_index;
-		rtm->rtm_errno = rtm->rtm_pid = rtm->rtm_seq = 0;
-		rtm->rtm_addrs = info.rti_addrs;
-		error = 0;
-		return (error);
-	}
-	return (error);
-}
-
-int
-sysctl_iflist(af, w)
-	int	af;
-	register struct	walkarg *w;
-{
-	register struct ifnet *ifp;
-	register struct ifaddr *ifa;
-	struct	rt_addrinfo info;
-	int	len, error = 0;
-
-	bzero((caddr_t)&info, sizeof(info));
-	for (ifp = ifnet; ifp; ifp = ifp->if_next) {
-		if (w->w_arg && w->w_arg != ifp->if_index)
-			continue;
-		ifa = ifp->if_addrlist;
-		ifpaddr = ifa->ifa_addr;
-		len = rt_msg2(RTM_IFINFO, &info, (caddr_t)0, w);
-		ifpaddr = 0;
-		if (w->w_req && w->w_tmem) {
-			register struct if_msghdr *ifm;
-
-			ifm = (struct if_msghdr *)w->w_tmem;
-			ifm->ifm_index = ifp->if_index;
-			ifm->ifm_flags = (u_short)ifp->if_flags;
-			ifm->ifm_data = ifp->if_data;
-			ifm->ifm_addrs = info.rti_addrs;
-			error =0;
-			if (error)
-				return (error);
-		}
-		while ((ifa = ifa->ifa_next) != 0) {
-			if (af && af != ifa->ifa_addr->sa_family)
-				continue;
-			ifaaddr = ifa->ifa_addr;
-			netmask = ifa->ifa_netmask;
-			brdaddr = ifa->ifa_dstaddr;
-			len = rt_msg2(RTM_NEWADDR, &info, 0, w);
-			if (w->w_req && w->w_tmem) {
-				register struct ifa_msghdr *ifam;
-
-				ifam = (struct ifa_msghdr *)w->w_tmem;
-				ifam->ifam_index = ifa->ifa_ifp->if_index;
-				ifam->ifam_flags = ifa->ifa_flags;
-				ifam->ifam_metric = ifa->ifa_metric;
-				ifam->ifam_addrs = info.rti_addrs;
-				error = 0;
-				if (error)
-					return (error);
-			}
-		}
-		ifaaddr = netmask = brdaddr = 0;
-	}
-	return (0);
-}
-
-static int
-sysctl_rtsock SYSCTL_HANDLER_ARGS
-{
-	int	*name = (int *)arg1;
-	u_int	namelen = arg2;
-	register struct radix_node_head *rnh;
-	int	i, s, error = EINVAL;
-	u_char  af;
-	struct	walkarg w;
-
-	name ++;
-	namelen--;
-	if (req->newptr)
-		return (EPERM);
-	if (namelen != 3)
-		return (EINVAL);
-	af = name[0];
-	Bzero(&w, sizeof(w));
-	w.w_op = name[1];
-	w.w_arg = name[2];
-	w.w_req = req;
-
-	s = splnet();
-	switch (w.w_op) {
-
-	case NET_RT_DUMP:
-	case NET_RT_FLAGS:
-		for (i = 1; i <= AF_MAX; i++)
-			if ((rnh = rt_tables[i]) && (af == 0 || af == i) &&
-			    (error = rnh->rnh_walktree(rnh,
-							sysctl_dumpentry, &w)))
-				break;
-		break;
-
-	case NET_RT_IFLIST:
-		error = sysctl_iflist(af, &w);
-	}
-	splx(s);
-	if (w.w_tmem)
-		free(w.w_tmem, M_RTABLE);
-	return (error);
-}
-
-SYSCTL_NODE(_net, PF_ROUTE, routetable, CTLFLAG_RD, sysctl_rtsock,"");
-
-/*
- * Definitions of protocols supported in the ROUTE domain.
- */
-
-extern struct domain routedomain;		/* or at least forward */
-
-static struct protosw routesw[] = {
-{ SOCK_RAW,	&routedomain,	0,		PR_ATOMIC|PR_ADDR,
-  0,		route_output,	raw_ctlinput,	0,
-  route_usrreq,
-  raw_init
-}
-};
-
-struct domain routedomain =
-    { PF_ROUTE, "route", route_init, 0, 0,
-      routesw, &routesw[sizeof(routesw)/sizeof(routesw[0])] };
-
-DOMAIN_SET(route);
diff --git a/c/src/libnetworking/netdb.h b/c/src/libnetworking/netdb.h
deleted file mode 100644
index ec274f851f..0000000000
--- a/c/src/libnetworking/netdb.h
+++ /dev/null
@@ -1,182 +0,0 @@
-/*-
- * Copyright (c) 1980, 1983, 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * -
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- * -
- * --Copyright--
- */
-
-/*
- *      @(#)netdb.h	8.1 (Berkeley) 6/2/93
- *      From: Id: netdb.h,v 8.9 1996/11/19 08:39:29 vixie Exp $
- *	$Id$
- */
-
-#ifndef _NETDB_H_
-#define _NETDB_H_
-
-#include <sys/cdefs.h>
-
-#ifndef _PATH_HEQUIV
-# define	_PATH_HEQUIV	"/etc/hosts.equiv"
-#endif
-#define	_PATH_HOSTS	"/etc/hosts"
-#define	_PATH_NETWORKS	"/etc/networks"
-#define	_PATH_PROTOCOLS	"/etc/protocols"
-#define	_PATH_SERVICES	"/etc/services"
-
-extern int h_errno;
-
-/*
- * Structures returned by network data base library.  All addresses are
- * supplied in host order, and returned in network order (suitable for
- * use in system calls).
- */
-struct	hostent {
-	char	*h_name;	/* official name of host */
-	char	**h_aliases;	/* alias list */
-	int	h_addrtype;	/* host address type */
-	int	h_length;	/* length of address */
-	char	**h_addr_list;	/* list of addresses from name server */
-#define	h_addr	h_addr_list[0]	/* address, for backward compatibility */
-};
-
-/*
- * Assumption here is that a network number
- * fits in an unsigned long -- probably a poor one.
- */
-struct	netent {
-	char		*n_name;	/* official name of net */
-	char		**n_aliases;	/* alias list */
-	int		n_addrtype;	/* net address type */
-	unsigned long	n_net;		/* network # */
-};
-
-struct	servent {
-	char	*s_name;	/* official service name */
-	char	**s_aliases;	/* alias list */
-	int	s_port;		/* port # */
-	char	*s_proto;	/* protocol to use */
-};
-
-struct	protoent {
-	char	*p_name;	/* official protocol name */
-	char	**p_aliases;	/* alias list */
-	int	p_proto;	/* protocol # */
-};
-
-/*
- * Error return codes from gethostbyname() and gethostbyaddr()
- * (left in extern int h_errno).
- */
-
-#define	NETDB_INTERNAL	-1	/* see errno */
-#define	NETDB_SUCCESS	0	/* no problem */
-#define	HOST_NOT_FOUND	1 /* Authoritative Answer Host not found */
-#define	TRY_AGAIN	2 /* Non-Authoritative Host not found, or SERVERFAIL */
-#define	NO_RECOVERY	3 /* Non recoverable errors, FORMERR, REFUSED, NOTIMP */
-#define	NO_DATA		4 /* Valid name, no data record of requested type */
-#define	NO_ADDRESS	NO_DATA		/* no address, look for MX record */
-
-__BEGIN_DECLS
-void		endhostent __P((void));
-void		endnetent __P((void));
-void		endprotoent __P((void));
-void		endservent __P((void));
-struct hostent	*gethostbyaddr __P((const char *, int, int));
-struct hostent	*gethostbyname __P((const char *));
-struct hostent	*gethostbyname2 __P((const char *, int));
-struct hostent	*gethostent __P((void));
-struct netent	*getnetbyaddr __P((unsigned long, int));
-struct netent	*getnetbyname __P((const char *));
-struct netent	*getnetent __P((void));
-struct protoent	*getprotobyname __P((const char *));
-struct protoent	*getprotobynumber __P((int));
-struct protoent	*getprotoent __P((void));
-struct servent	*getservbyname __P((const char *, const char *));
-struct servent	*getservbyport __P((int, const char *));
-struct servent	*getservent __P((void));
-void		herror __P((const char *));
-__const char	*hstrerror __P((int));
-void		sethostent __P((int));
-/* void		sethostfile __P((const char *)); */
-void		setnetent __P((int));
-void		setprotoent __P((int));
-void		setservent __P((int));
-
-/*
- * PRIVATE functions specific to the FreeBSD implementation
- */
-
-/* DO NOT USE THESE, THEY ARE SUBJECT TO CHANGE AND ARE NOT PORTABLE!!! */
-void	_sethosthtent __P((int));
-void	_endhosthtent __P((void));
-void	_sethostdnsent __P((int));
-void	_endhostdnsent __P((void));
-void	_setnethtent __P((int));
-void	_endnethtent __P((void));
-void	_setnetdnsent __P((int));
-void	_endnetdnsent __P((void));
-struct hostent * _gethostbyhtname  __P((const char *, int));
-struct hostent * _gethostbydnsname __P((const char *, int));
-struct hostent * _gethostbynisname __P((const char *, int));
-struct hostent * _gethostbyhtaddr  __P((const char *, int, int));
-struct hostent * _gethostbydnsaddr __P((const char *, int, int));
-struct hostent * _gethostbynisaddr __P((const char *, int, int));
-struct netent *  _getnetbyhtname  __P((const char *));
-struct netent *  _getnetbydnsname __P((const char *));
-struct netent *  _getnetbynisname __P((const char *));
-struct netent *  _getnetbyhtaddr  __P((unsigned long, int));
-struct netent *  _getnetbydnsaddr __P((unsigned long, int));
-struct netent *  _getnetbynisaddr __P((unsigned long, int));
-void _map_v4v6_address __P((const char *src, char *dst));
-void _map_v4v6_hostent __P((struct hostent *hp, char **bp, int *len));
-__END_DECLS
-
-#endif /* !_NETDB_H_ */
diff --git a/c/src/libnetworking/netinet/Makefile.in b/c/src/libnetworking/netinet/Makefile.in
deleted file mode 100644
index 94a8f2f0b8..0000000000
--- a/c/src/libnetworking/netinet/Makefile.in
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-LIBNAME=lib.a
-LIB=${ARCH}/${LIBNAME}
-
-# C and C++ source names, if any, go here -- minus the .c or .cc
-C_PIECES=if_ether \
-        igmp \
-        in in_cksum in_pcb in_proto in_rmx \
-        ip_divert ip_fw ip_icmp ip_input ip_mroute ip_output \
-        raw_ip \
-        tcp_debug tcp_input tcp_output tcp_subr tcp_timer tcp_usrreq \
-        udp_usrreq
-C_FILES=$(C_PIECES:%=%.c)
-C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
-
-SRCS=$(C_FILES)
-OBJS=$(C_O_FILES)
-
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/lib.cfg
-
-#
-# Add local stuff here using +=
-#
-
-DEFINES  += -D_COMPILING_BSD_KERNEL_ -DKERNEL -DINET -DNFS \
-    -DDIAGNOSTIC -DBOOTP_COMPAT
-CPPFLAGS +=
-CFLAGS   +=
-
-#
-# Add your list of files to delete here.  The config files
-#  already know how to delete some stuff, so you may want
-#  to just run 'make clean' first to see what gets missed.
-#  'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS += $(LIB)
-CLOBBER_ADDITIONS +=
-
-all:	${ARCH} $(LIB)
-
-$(LIB): $(SRCS) ${OBJS}
-	$(make-library)
diff --git a/c/src/libnetworking/netinet/icmp_var.h b/c/src/libnetworking/netinet/icmp_var.h
deleted file mode 100644
index 7657f31acf..0000000000
--- a/c/src/libnetworking/netinet/icmp_var.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)icmp_var.h	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#ifndef _NETINET_ICMP_VAR_H_
-#define _NETINET_ICMP_VAR_H_
-
-/*
- * Variables related to this implementation
- * of the internet control message protocol.
- */
-struct	icmpstat {
-/* statistics related to icmp packets generated */
-	u_long	icps_error;		/* # of calls to icmp_error */
-	u_long	icps_oldshort;		/* no error 'cuz old ip too short */
-	u_long	icps_oldicmp;		/* no error 'cuz old was icmp */
-	u_long	icps_outhist[ICMP_MAXTYPE + 1];
-/* statistics related to input messages processed */
- 	u_long	icps_badcode;		/* icmp_code out of range */
-	u_long	icps_tooshort;		/* packet < ICMP_MINLEN */
-	u_long	icps_checksum;		/* bad checksum */
-	u_long	icps_badlen;		/* calculated bound mismatch */
-	u_long	icps_reflect;		/* number of responses */
-	u_long	icps_inhist[ICMP_MAXTYPE + 1];
-	u_long	icps_bmcastecho; 	/* b/mcast echo requests dropped */
-	u_long	icps_bmcasttstamp; 	/* b/mcast tstamp requests dropped */
-};
-
-/*
- * Names for ICMP sysctl objects
- */
-#define	ICMPCTL_MASKREPL	1	/* allow replies to netmask requests */
-#define	ICMPCTL_STATS		2	/* statistics (read-only) */
-#define ICMPCTL_MAXID		3
-
-#define ICMPCTL_NAMES { \
-	{ 0, 0 }, \
-	{ "maskrepl", CTLTYPE_INT }, \
-	{ "stats", CTLTYPE_STRUCT }, \
-}
-
-#ifdef KERNEL
-extern struct	icmpstat icmpstat;
-#endif
-
-#endif
diff --git a/c/src/libnetworking/netinet/if_ether.c b/c/src/libnetworking/netinet/if_ether.c
deleted file mode 100644
index 985ce6e7d9..0000000000
--- a/c/src/libnetworking/netinet/if_ether.c
+++ /dev/null
@@ -1,638 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)if_ether.c	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-/*
- * Ethernet address resolution protocol.
- * TODO:
- *	add "inuse/lock" bit (or ref. count) along with valid bit
- */
-
-#include <sys/param.h>
-#include <sys/kernel.h>
-#include <sys/sysctl.h>
-#include <sys/queue.h>
-#include <sys/systm.h>
-#include <sys/mbuf.h>
-#include <sys/malloc.h>
-#include <sys/socket.h>
-#include <sys/syslog.h>
-
-#include <net/if.h>
-#include <net/if_dl.h>
-#include <net/route.h>
-#include <net/netisr.h>
-
-#include <netinet/in.h>
-#include <netinet/in_var.h>
-#include <netinet/if_ether.h>
-
-#define SIN(s) ((struct sockaddr_in *)s)
-#define SDL(s) ((struct sockaddr_dl *)s)
-
-SYSCTL_NODE(_net_link_ether, PF_INET, inet, CTLFLAG_RW, 0, "");
-
-/* timer values */
-static int arpt_prune = (5*60*1); /* walk list every 5 minutes */
-static int arpt_keep = (20*60); /* once resolved, good for 20 more minutes */
-static int arpt_down = 20;	/* once declared down, don't send for 20 sec */
-
-SYSCTL_INT(_net_link_ether_inet, OID_AUTO, prune_intvl, CTLFLAG_RW,
-	   &arpt_prune, 0, "");
-SYSCTL_INT(_net_link_ether_inet, OID_AUTO, max_age, CTLFLAG_RW, 
-	   &arpt_keep, 0, "");
-SYSCTL_INT(_net_link_ether_inet, OID_AUTO, host_down_time, CTLFLAG_RW,
-	   &arpt_down, 0, "");
-
-#define	rt_expire rt_rmx.rmx_expire
-
-struct llinfo_arp {
-	LIST_ENTRY(llinfo_arp) la_le;
-	struct	rtentry *la_rt;
-	struct	mbuf *la_hold;		/* last packet until resolved/timeout */
-	long	la_asked;		/* last time we QUERIED for this addr */
-#define la_timer la_rt->rt_rmx.rmx_expire /* deletion time in seconds */
-};
-
-static	LIST_HEAD(, llinfo_arp) llinfo_arp;
-
-struct	ifqueue arpintrq = {0, 0, 0, 50};
-static int	arp_inuse, arp_allocated;
-
-static int	arp_maxtries = 5;
-static int	useloopback = 1; /* use loopback interface for local traffic */
-static int	arp_proxyall = 0;
-
-SYSCTL_INT(_net_link_ether_inet, OID_AUTO, maxtries, CTLFLAG_RW,
-	   &arp_maxtries, 0, "");
-SYSCTL_INT(_net_link_ether_inet, OID_AUTO, useloopback, CTLFLAG_RW,
-	   &useloopback, 0, "");
-SYSCTL_INT(_net_link_ether_inet, OID_AUTO, proxyall, CTLFLAG_RW,
-	   &arp_proxyall, 0, "");
-
-static void	arp_rtrequest __P((int, struct rtentry *, struct sockaddr *));
-static void	arprequest __P((struct arpcom *, u_long *, u_long *, u_char *));
-void	arpintr __P((void));
-static void	arptfree __P((struct llinfo_arp *));
-static void	arptimer __P((void *));
-static struct llinfo_arp
-		*arplookup __P((u_long, int, int));
-static void	in_arpinput __P((struct mbuf *));
-
-/*
- * Timeout routine.  Age arp_tab entries periodically.
- */
-/* ARGSUSED */
-static void
-arptimer(ignored_arg)
-	void *ignored_arg;
-{
-	int s = splnet();
-	register struct llinfo_arp *la = llinfo_arp.lh_first;
-	struct llinfo_arp *ola;
-
-	timeout(arptimer, (caddr_t)0, arpt_prune * hz);
-	while ((ola = la) != 0) {
-		register struct rtentry *rt = la->la_rt;
-		la = la->la_le.le_next;
-		if (rt->rt_expire && rt->rt_expire <= rtems_bsdnet_seconds_since_boot())
-			arptfree(ola); /* timer has expired, clear */
-	}
-	splx(s);
-}
-
-/*
- * Parallel to llc_rtrequest.
- */
-static void
-arp_rtrequest(req, rt, sa)
-	int req;
-	register struct rtentry *rt;
-	struct sockaddr *sa;
-{
-	register struct sockaddr *gate = rt->rt_gateway;
-	register struct llinfo_arp *la = (struct llinfo_arp *)rt->rt_llinfo;
-	static struct sockaddr_dl null_sdl = {sizeof(null_sdl), AF_LINK};
-	static int arpinit_done;
-
-	if (!arpinit_done) {
-		arpinit_done = 1;
-		LIST_INIT(&llinfo_arp);
-		timeout(arptimer, (caddr_t)0, hz);
-	}
-	if (rt->rt_flags & RTF_GATEWAY)
-		return;
-	switch (req) {
-
-	case RTM_ADD:
-		/*
-		 * XXX: If this is a manually added route to interface
-		 * such as older version of routed or gated might provide,
-		 * restore cloning bit.
-		 */
-		if ((rt->rt_flags & RTF_HOST) == 0 &&
-		    SIN(rt_mask(rt))->sin_addr.s_addr != 0xffffffff)
-			rt->rt_flags |= RTF_CLONING;
-		if (rt->rt_flags & RTF_CLONING) {
-			/*
-			 * Case 1: This route should come from a route to iface.
-			 */
-			rt_setgate(rt, rt_key(rt),
-					(struct sockaddr *)&null_sdl);
-			gate = rt->rt_gateway;
-			SDL(gate)->sdl_type = rt->rt_ifp->if_type;
-			SDL(gate)->sdl_index = rt->rt_ifp->if_index;
-			rt->rt_expire = rtems_bsdnet_seconds_since_boot();
-			break;
-		}
-		/* Announce a new entry if requested. */
-		if (rt->rt_flags & RTF_ANNOUNCE)
-			arprequest((struct arpcom *)rt->rt_ifp,
-			    &SIN(rt_key(rt))->sin_addr.s_addr,
-			    &SIN(rt_key(rt))->sin_addr.s_addr,
-			    (u_char *)LLADDR(SDL(gate)));
-		/*FALLTHROUGH*/
-	case RTM_RESOLVE:
-		if (gate->sa_family != AF_LINK ||
-		    gate->sa_len < sizeof(null_sdl)) {
-			log(LOG_DEBUG, "arp_rtrequest: bad gateway value\n");
-			break;
-		}
-		SDL(gate)->sdl_type = rt->rt_ifp->if_type;
-		SDL(gate)->sdl_index = rt->rt_ifp->if_index;
-		if (la != 0)
-			break; /* This happens on a route change */
-		/*
-		 * Case 2:  This route may come from cloning, or a manual route
-		 * add with a LL address.
-		 */
-		R_Malloc(la, struct llinfo_arp *, sizeof(*la));
-		rt->rt_llinfo = (caddr_t)la;
-		if (la == 0) {
-			log(LOG_DEBUG, "arp_rtrequest: malloc failed\n");
-			break;
-		}
-		arp_inuse++, arp_allocated++;
-		Bzero(la, sizeof(*la));
-		la->la_rt = rt;
-		rt->rt_flags |= RTF_LLINFO;
-		LIST_INSERT_HEAD(&llinfo_arp, la, la_le);
-
-		/*
-		 * This keeps the multicast addresses from showing up
-		 * in `arp -a' listings as unresolved.  It's not actually
-		 * functional.  Then the same for broadcast.
-		 */
-		if (IN_MULTICAST(ntohl(SIN(rt_key(rt))->sin_addr.s_addr))) {
-			ETHER_MAP_IP_MULTICAST(&SIN(rt_key(rt))->sin_addr,
-					       LLADDR(SDL(gate)));
-			SDL(gate)->sdl_alen = 6;
-			rt->rt_expire = 0;
-		}
-		if (in_broadcast(SIN(rt_key(rt))->sin_addr, rt->rt_ifp)) {
-			memcpy(LLADDR(SDL(gate)), etherbroadcastaddr, 6);
-			SDL(gate)->sdl_alen = 6;
-			rt->rt_expire = 0;
-		}
-
-		if (SIN(rt_key(rt))->sin_addr.s_addr ==
-		    (IA_SIN(rt->rt_ifa))->sin_addr.s_addr) {
-		    /*
-		     * This test used to be
-		     *	if (loif.if_flags & IFF_UP)
-		     * It allowed local traffic to be forced
-		     * through the hardware by configuring the loopback down.
-		     * However, it causes problems during network configuration
-		     * for boards that can't receive packets they send.
-		     * It is now necessary to clear "useloopback" and remove
-		     * the route to force traffic out to the hardware.
-		     */
-			rt->rt_expire = 0;
-			Bcopy(((struct arpcom *)rt->rt_ifp)->ac_enaddr,
-				LLADDR(SDL(gate)), SDL(gate)->sdl_alen = 6);
-			if (useloopback)
-				rt->rt_ifp = loif;
-
-		}
-		break;
-
-	case RTM_DELETE:
-		if (la == 0)
-			break;
-		arp_inuse--;
-		LIST_REMOVE(la, la_le);
-		rt->rt_llinfo = 0;
-		rt->rt_flags &= ~RTF_LLINFO;
-		if (la->la_hold)
-			m_freem(la->la_hold);
-		Free((caddr_t)la);
-	}
-}
-
-/*
- * Broadcast an ARP request. Caller specifies:
- *	- arp header source ip address
- *	- arp header target ip address
- *	- arp header source ethernet address
- */
-static void
-arprequest(ac, sip, tip, enaddr)
-	register struct arpcom *ac;
-	register u_long *sip, *tip;
-	register u_char *enaddr;
-{
-	register struct mbuf *m;
-	register struct ether_header *eh;
-	register struct ether_arp *ea;
-	struct sockaddr sa;
-
-	if ((m = m_gethdr(M_DONTWAIT, MT_DATA)) == NULL)
-		return;
-	m->m_len = sizeof(*ea);
-	m->m_pkthdr.len = sizeof(*ea);
-	MH_ALIGN(m, sizeof(*ea));
-	ea = mtod(m, struct ether_arp *);
-	eh = (struct ether_header *)sa.sa_data;
-	bzero((caddr_t)ea, sizeof (*ea));
-	(void)memcpy(eh->ether_dhost, etherbroadcastaddr, sizeof(eh->ether_dhost));
-	eh->ether_type = htons(ETHERTYPE_ARP);	/* if_output will not swap */
-	ea->arp_hrd = htons(ARPHRD_ETHER);
-	ea->arp_pro = htons(ETHERTYPE_IP);
-	ea->arp_hln = sizeof(ea->arp_sha);	/* hardware address length */
-	ea->arp_pln = sizeof(ea->arp_spa);	/* protocol address length */
-	ea->arp_op = htons(ARPOP_REQUEST);
-	(void)memcpy(ea->arp_sha, enaddr, sizeof(ea->arp_sha));
-	(void)memcpy(ea->arp_spa, sip, sizeof(ea->arp_spa));
-	(void)memcpy(ea->arp_tpa, tip, sizeof(ea->arp_tpa));
-	sa.sa_family = AF_UNSPEC;
-	sa.sa_len = sizeof(sa);
-	(*ac->ac_if.if_output)(&ac->ac_if, m, &sa, (struct rtentry *)0);
-}
-
-/*
- * Resolve an IP address into an ethernet address.  If success,
- * desten is filled in.  If there is no entry in arptab,
- * set one up and broadcast a request for the IP address.
- * Hold onto this mbuf and resend it once the address
- * is finally resolved.  A return value of 1 indicates
- * that desten has been filled in and the packet should be sent
- * normally; a 0 return indicates that the packet has been
- * taken over here, either now or for later transmission.
- */
-int
-arpresolve(ac, rt, m, dst, desten, rt0)
-	register struct arpcom *ac;
-	register struct rtentry *rt;
-	struct mbuf *m;
-	register struct sockaddr *dst;
-	register u_char *desten;
-	struct rtentry *rt0;
-{
-	register struct llinfo_arp *la;
-	struct sockaddr_dl *sdl;
-
-	if (m->m_flags & M_BCAST) {	/* broadcast */
-		(void)memcpy(desten, etherbroadcastaddr, sizeof(etherbroadcastaddr));
-		return (1);
-	}
-	if (m->m_flags & M_MCAST) {	/* multicast */
-		ETHER_MAP_IP_MULTICAST(&SIN(dst)->sin_addr, desten);
-		return(1);
-	}
-	if (rt)
-		la = (struct llinfo_arp *)rt->rt_llinfo;
-	else {
-		la = arplookup(SIN(dst)->sin_addr.s_addr, 1, 0);
-		if (la)
-			rt = la->la_rt;
-	}
-	if (la == 0 || rt == 0) {
-		log(LOG_DEBUG, "arpresolve: can't allocate llinfo for %s\n",
-			inet_ntoa(SIN(dst)->sin_addr));
-		m_freem(m);
-		return (0);
-	}
-	sdl = SDL(rt->rt_gateway);
-	/*
-	 * Check the address family and length is valid, the address
-	 * is resolved; otherwise, try to resolve.
-	 */
-	if ((rt->rt_expire == 0 || rt->rt_expire > rtems_bsdnet_seconds_since_boot()) &&
-	    sdl->sdl_family == AF_LINK && sdl->sdl_alen != 0) {
-		bcopy(LLADDR(sdl), desten, sdl->sdl_alen);
-		return 1;
-	}
-	/*
-	 * There is an arptab entry, but no ethernet address
-	 * response yet.  Replace the held mbuf with this
-	 * latest one.
-	 */
-	if (la->la_hold)
-		m_freem(la->la_hold);
-	la->la_hold = m;
-	if (rt->rt_expire) {
-		rt->rt_flags &= ~RTF_REJECT;
-		if (la->la_asked == 0 || rt->rt_expire != rtems_bsdnet_seconds_since_boot()) {
-			rt->rt_expire = rtems_bsdnet_seconds_since_boot();
-			if (la->la_asked++ < arp_maxtries)
-			    arprequest(ac,
-			        &(SIN(rt->rt_ifa->ifa_addr)->sin_addr.s_addr),
-				&(SIN(dst)->sin_addr.s_addr),
-				ac->ac_enaddr);
-			else {
-				rt->rt_flags |= RTF_REJECT;
-				rt->rt_expire += arpt_down;
-				la->la_asked = 0;
-			}
-
-		}
-	}
-	return (0);
-}
-
-/*
- * Common length and type checks are done here,
- * then the protocol-specific routine is called.
- */
-void
-arpintr(void)
-{
-	register struct mbuf *m;
-	register struct arphdr *ar;
-	int s;
-
-	while (arpintrq.ifq_head) {
-		s = splimp();
-		IF_DEQUEUE(&arpintrq, m);
-		splx(s);
-		if (m == 0 || (m->m_flags & M_PKTHDR) == 0)
-			panic("arpintr");
-		if (m->m_len >= sizeof(struct arphdr) &&
-		    (ar = mtod(m, struct arphdr *)) &&
-		    ntohs(ar->ar_hrd) == ARPHRD_ETHER &&
-		    m->m_len >=
-		      sizeof(struct arphdr) + 2 * ar->ar_hln + 2 * ar->ar_pln)
-
-			    switch (ntohs(ar->ar_pro)) {
-
-			    case ETHERTYPE_IP:
-				    in_arpinput(m);
-				    continue;
-			    }
-		m_freem(m);
-	}
-}
-
-NETISR_SET(NETISR_ARP, arpintr);
-
-/*
- * ARP for Internet protocols on 10 Mb/s Ethernet.
- * Algorithm is that given in RFC 826.
- * In addition, a sanity check is performed on the sender
- * protocol address, to catch impersonators.
- * We no longer handle negotiations for use of trailer protocol:
- * Formerly, ARP replied for protocol type ETHERTYPE_TRAIL sent
- * along with IP replies if we wanted trailers sent to us,
- * and also sent them in response to IP replies.
- * This allowed either end to announce the desire to receive
- * trailer packets.
- * We no longer reply to requests for ETHERTYPE_TRAIL protocol either,
- * but formerly didn't normally send requests.
- */
-static void
-in_arpinput(m)
-	struct mbuf *m;
-{
-	register struct ether_arp *ea;
-	register struct arpcom *ac = (struct arpcom *)m->m_pkthdr.rcvif;
-	struct ether_header *eh;
-	register struct llinfo_arp *la = 0;
-	register struct rtentry *rt;
-	struct in_ifaddr *ia, *maybe_ia = 0;
-	struct sockaddr_dl *sdl;
-	struct sockaddr sa;
-	struct in_addr isaddr, itaddr, myaddr;
-	int op;
-
-	ea = mtod(m, struct ether_arp *);
-	op = ntohs(ea->arp_op);
-	(void)memcpy(&isaddr, ea->arp_spa, sizeof (isaddr));
-	(void)memcpy(&itaddr, ea->arp_tpa, sizeof (itaddr));
-	for (ia = in_ifaddr; ia; ia = ia->ia_next)
-		if (ia->ia_ifp == &ac->ac_if) {
-			maybe_ia = ia;
-			if ((itaddr.s_addr == ia->ia_addr.sin_addr.s_addr) ||
-			     (isaddr.s_addr == ia->ia_addr.sin_addr.s_addr))
-				break;
-		}
-	if (maybe_ia == 0) {
-		m_freem(m);
-		return;
-	}
-	myaddr = ia ? ia->ia_addr.sin_addr : maybe_ia->ia_addr.sin_addr;
-	if (!bcmp((caddr_t)ea->arp_sha, (caddr_t)ac->ac_enaddr,
-	    sizeof (ea->arp_sha))) {
-		m_freem(m);	/* it's from me, ignore it. */
-		return;
-	}
-	if (!bcmp((caddr_t)ea->arp_sha, (caddr_t)etherbroadcastaddr,
-	    sizeof (ea->arp_sha))) {
-		log(LOG_ERR,
-		    "arp: ether address is broadcast for IP address %s!\n",
-		    inet_ntoa(isaddr));
-		m_freem(m);
-		return;
-	}
-	if (isaddr.s_addr == myaddr.s_addr) {
-		log(LOG_ERR,
-		   "arp: %6D is using my IP address %s!\n",
-		   ea->arp_sha, ":", inet_ntoa(isaddr));
-		itaddr = myaddr;
-		goto reply;
-	}
-	la = arplookup(isaddr.s_addr, itaddr.s_addr == myaddr.s_addr, 0);
-	if (la && (rt = la->la_rt) && (sdl = SDL(rt->rt_gateway))) {
-		if (sdl->sdl_alen &&
-		    bcmp((caddr_t)ea->arp_sha, LLADDR(sdl), sdl->sdl_alen))
-			log(LOG_INFO, "arp: %s moved from %6D to %6D\n",
-			    inet_ntoa(isaddr), (u_char *)LLADDR(sdl), ":",
-			    ea->arp_sha, ":");
-		(void)memcpy(LLADDR(sdl), ea->arp_sha, sizeof(ea->arp_sha));
-		sdl->sdl_alen = sizeof(ea->arp_sha);
-		if (rt->rt_expire)
-			rt->rt_expire = rtems_bsdnet_seconds_since_boot() + arpt_keep;
-		rt->rt_flags &= ~RTF_REJECT;
-		la->la_asked = 0;
-		if (la->la_hold) {
-			(*ac->ac_if.if_output)(&ac->ac_if, la->la_hold,
-				rt_key(rt), rt);
-			la->la_hold = 0;
-		}
-	}
-reply:
-	if (op != ARPOP_REQUEST) {
-		m_freem(m);
-		return;
-	}
-	if (itaddr.s_addr == myaddr.s_addr) {
-		/* I am the target */
-		(void)memcpy(ea->arp_tha, ea->arp_sha, sizeof(ea->arp_sha));
-		(void)memcpy(ea->arp_sha, ac->ac_enaddr, sizeof(ea->arp_sha));
-	} else {
-		la = arplookup(itaddr.s_addr, 0, SIN_PROXY);
-		if (la == NULL) {
-			struct sockaddr_in sin;
-
-			if (!arp_proxyall) {
-				m_freem(m);
-				return;
-			}
-
-			bzero(&sin, sizeof sin);
-			sin.sin_family = AF_INET;
-			sin.sin_len = sizeof sin;
-			sin.sin_addr = itaddr;
-
-			rt = rtalloc1((struct sockaddr *)&sin, 0, 0UL);
-			if (!rt) {
-				m_freem(m);
-				return;
-			}
-			/*
-			 * Don't send proxies for nodes on the same interface
-			 * as this one came out of, or we'll get into a fight
-			 * over who claims what Ether address.
-			 */
-			if (rt->rt_ifp == &ac->ac_if) {
-				rtfree(rt);
-				m_freem(m);
-				return;
-			}
-			(void)memcpy(ea->arp_tha, ea->arp_sha, sizeof(ea->arp_sha));
-			(void)memcpy(ea->arp_sha, ac->ac_enaddr, sizeof(ea->arp_sha));
-			rtfree(rt);
-#ifdef DEBUG_PROXY
-			printf("arp: proxying for %s\n",
-			       inet_ntoa(itaddr));
-#endif
-		} else {
-			rt = la->la_rt;
-			(void)memcpy(ea->arp_tha, ea->arp_sha, sizeof(ea->arp_sha));
-			sdl = SDL(rt->rt_gateway);
-			(void)memcpy(ea->arp_sha, LLADDR(sdl), sizeof(ea->arp_sha));
-		}
-	}
-
-	(void)memcpy(ea->arp_tpa, ea->arp_spa, sizeof(ea->arp_spa));
-	(void)memcpy(ea->arp_spa, &itaddr, sizeof(ea->arp_spa));
-	ea->arp_op = htons(ARPOP_REPLY);
-	ea->arp_pro = htons(ETHERTYPE_IP); /* let's be sure! */
-	eh = (struct ether_header *)sa.sa_data;
-	(void)memcpy(eh->ether_dhost, ea->arp_tha, sizeof(eh->ether_dhost));
-	eh->ether_type = htons(ETHERTYPE_ARP);
-	sa.sa_family = AF_UNSPEC;
-	sa.sa_len = sizeof(sa);
-	(*ac->ac_if.if_output)(&ac->ac_if, m, &sa, (struct rtentry *)0);
-	return;
-}
-
-/*
- * Free an arp entry.
- */
-static void
-arptfree(la)
-	register struct llinfo_arp *la;
-{
-	register struct rtentry *rt = la->la_rt;
-	register struct sockaddr_dl *sdl;
-	if (rt == 0)
-		panic("arptfree");
-	if (rt->rt_refcnt > 0 && (sdl = SDL(rt->rt_gateway)) &&
-	    sdl->sdl_family == AF_LINK) {
-		sdl->sdl_alen = 0;
-		la->la_asked = 0;
-		rt->rt_flags &= ~RTF_REJECT;
-		return;
-	}
-	rtrequest(RTM_DELETE, rt_key(rt), (struct sockaddr *)0, rt_mask(rt),
-			0, (struct rtentry **)0);
-}
-/*
- * Lookup or enter a new address in arptab.
- */
-static struct llinfo_arp *
-arplookup(addr, create, proxy)
-	u_long addr;
-	int create, proxy;
-{
-	register struct rtentry *rt;
-	static struct sockaddr_inarp sin = {sizeof(sin), AF_INET };
-	const char *why = 0;
-
-	sin.sin_addr.s_addr = addr;
-	sin.sin_other = proxy ? SIN_PROXY : 0;
-	rt = rtalloc1((struct sockaddr *)&sin, create, 0UL);
-	if (rt == 0)
-		return (0);
-	rt->rt_refcnt--;
-
-	if (rt->rt_flags & RTF_GATEWAY)
-		why = "host is not on local network";
-	else if ((rt->rt_flags & RTF_LLINFO) == 0)
-		why = "could not allocate llinfo";
-	else if (rt->rt_gateway->sa_family != AF_LINK)
-		why = "gateway route is not ours";
-
-	if (why && create) {
-		log(LOG_DEBUG, "arplookup %s failed: %s\n",
-		    inet_ntoa(sin.sin_addr), why);
-		return 0;
-	} else if (why) {
-		return 0;
-	}
-	return ((struct llinfo_arp *)rt->rt_llinfo);
-}
-
-void
-arp_ifinit(ac, ifa)
-	struct arpcom *ac;
-	struct ifaddr *ifa;
-{
-	if (ntohl(IA_SIN(ifa)->sin_addr.s_addr) != INADDR_ANY)
-		arprequest(ac, &(IA_SIN(ifa)->sin_addr.s_addr),
-			       &(IA_SIN(ifa)->sin_addr.s_addr), ac->ac_enaddr);
-	ifa->ifa_rtrequest = arp_rtrequest;
-	ifa->ifa_flags |= RTF_CLONING;
-}
diff --git a/c/src/libnetworking/netinet/if_ether.h b/c/src/libnetworking/netinet/if_ether.h
deleted file mode 100644
index 22c8e97187..0000000000
--- a/c/src/libnetworking/netinet/if_ether.h
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)if_ether.h	8.3 (Berkeley) 5/2/95
- *	$Id$
- */
-
-#ifndef _NETINET_IF_ETHER_H_
-#define _NETINET_IF_ETHER_H_
-
-#include <net/ethernet.h>
-
-#define	ETHERTYPE_PUP		0x0200	/* PUP protocol */
-#define	ETHERTYPE_IP		0x0800	/* IP protocol */
-#define ETHERTYPE_ARP		0x0806	/* Addr. resolution protocol */
-#define ETHERTYPE_REVARP	0x8035	/* reverse Addr. resolution protocol */
-
-/*
- * The ETHERTYPE_NTRAILER packet types starting at ETHERTYPE_TRAIL have
- * (type-ETHERTYPE_TRAIL)*512 bytes of data followed
- * by an ETHER type (as given above) and then the (variable-length) header.
- */
-#define	ETHERTYPE_TRAIL		0x1000		/* Trailer packet */
-#define	ETHERTYPE_NTRAILER	16
-
-#define	ETHERMTU	(ETHER_MAX_LEN-ETHER_HDR_LEN-ETHER_CRC_LEN)
-#define	ETHERMIN	(ETHER_MIN_LEN-ETHER_HDR_LEN-ETHER_CRC_LEN)
-
-#ifdef KERNEL
-/*
- * Macro to map an IP multicast address to an Ethernet multicast address.
- * The high-order 25 bits of the Ethernet address are statically assigned,
- * and the low-order 23 bits are taken from the low end of the IP address.
- */
-#define ETHER_MAP_IP_MULTICAST(ipaddr, enaddr) \
-	/* struct in_addr *ipaddr; */ \
-	/* u_char enaddr[ETHER_ADDR_LEN];	   */ \
-{ \
-	(enaddr)[0] = 0x01; \
-	(enaddr)[1] = 0x00; \
-	(enaddr)[2] = 0x5e; \
-	(enaddr)[3] = ((u_char *)ipaddr)[1] & 0x7f; \
-	(enaddr)[4] = ((u_char *)ipaddr)[2]; \
-	(enaddr)[5] = ((u_char *)ipaddr)[3]; \
-}
-#endif
-
-/*
- * Ethernet Address Resolution Protocol.
- *
- * See RFC 826 for protocol description.  Structure below is adapted
- * to resolving internet addresses.  Field names used correspond to
- * RFC 826.
- */
-struct	ether_arp {
-	struct	arphdr ea_hdr;	/* fixed-size header */
-	u_char	arp_sha[ETHER_ADDR_LEN];	/* sender hardware address */
-	u_char	arp_spa[4];	/* sender protocol address */
-	u_char	arp_tha[ETHER_ADDR_LEN];	/* target hardware address */
-	u_char	arp_tpa[4];	/* target protocol address */
-};
-#define	arp_hrd	ea_hdr.ar_hrd
-#define	arp_pro	ea_hdr.ar_pro
-#define	arp_hln	ea_hdr.ar_hln
-#define	arp_pln	ea_hdr.ar_pln
-#define	arp_op	ea_hdr.ar_op
-
-
-/*
- * Structure shared between the ethernet driver modules and
- * the address resolution code.  For example, each ec_softc or il_softc
- * begins with this structure.
- */
-struct	arpcom {
-	/*
-	 * The ifnet struct _must_ be at the head of this structure.
-	 */
-	struct 	ifnet ac_if;		/* network-visible interface */
-	u_char	ac_enaddr[ETHER_ADDR_LEN];		/* ethernet hardware address */
-	struct	ether_multi *ac_multiaddrs; /* list of ether multicast addrs */
-	int	ac_multicnt;		/* length of ac_multiaddrs list */
-};
-
-struct sockaddr_inarp {
-	u_char	sin_len;
-	u_char	sin_family;
-	u_short sin_port;
-	struct	in_addr sin_addr;
-	struct	in_addr sin_srcaddr;
-	u_short	sin_tos;
-	u_short	sin_other;
-#define SIN_PROXY 1
-};
-/*
- * IP and ethernet specific routing flags
- */
-#define	RTF_USETRAILERS	RTF_PROTO1	/* use trailers */
-#define RTF_ANNOUNCE	RTF_PROTO2	/* announce new arp entry */
-
-#ifdef	KERNEL
-extern u_char	etherbroadcastaddr[ETHER_ADDR_LEN];
-extern u_char	ether_ipmulticast_min[ETHER_ADDR_LEN];
-extern u_char	ether_ipmulticast_max[ETHER_ADDR_LEN];
-extern struct	ifqueue arpintrq;
-
-int	arpresolve __P((struct arpcom *, struct rtentry *, struct mbuf *,
-			struct sockaddr *, u_char *, struct rtentry *));
-void	arp_ifinit __P((struct arpcom *, struct ifaddr *));
-int	ether_addmulti __P((struct ifreq *, struct arpcom *));
-int	ether_delmulti __P((struct ifreq *, struct arpcom *));
-
-/*
- * Ethernet multicast address structure.  There is one of these for each
- * multicast address or range of multicast addresses that we are supposed
- * to listen to on a particular interface.  They are kept in a linked list,
- * rooted in the interface's arpcom structure.  (This really has nothing to
- * do with ARP, or with the Internet address family, but this appears to be
- * the minimally-disrupting place to put it.)
- */
-struct ether_multi {
-	u_char	enm_addrlo[ETHER_ADDR_LEN];		/* low  or only address of range */
-	u_char	enm_addrhi[ETHER_ADDR_LEN];		/* high or only address of range */
-	struct	arpcom *enm_ac;		/* back pointer to arpcom */
-	u_int	enm_refcount;		/* no. claims to this addr/range */
-	struct	ether_multi *enm_next;	/* ptr to next ether_multi */
-};
-
-/*
- * Structure used by macros below to remember position when stepping through
- * all of the ether_multi records.
- */
-struct ether_multistep {
-	struct ether_multi  *e_enm;
-};
-
-/*
- * Macro for looking up the ether_multi record for a given range of Ethernet
- * multicast addresses connected to a given arpcom structure.  If no matching
- * record is found, "enm" returns NULL.
- */
-#define ETHER_LOOKUP_MULTI(addrlo, addrhi, ac, enm) \
-	/* u_char addrlo[ETHER_ADDR_LEN]; */ \
-	/* u_char addrhi[ETHER_ADDR_LEN]; */ \
-	/* struct arpcom *ac; */ \
-	/* struct ether_multi *enm; */ \
-{ \
-	for ((enm) = (ac)->ac_multiaddrs; \
-	    (enm) != NULL && \
-	    (bcmp((enm)->enm_addrlo, (addrlo), ETHER_ADDR_LEN) != 0 || \
-	     bcmp((enm)->enm_addrhi, (addrhi), ETHER_ADDR_LEN) != 0); \
-		(enm) = (enm)->enm_next); \
-}
-
-/*
- * Macro to step through all of the ether_multi records, one at a time.
- * The current position is remembered in "step", which the caller must
- * provide.  ETHER_FIRST_MULTI(), below, must be called to initialize "step"
- * and get the first record.  Both macros return a NULL "enm" when there
- * are no remaining records.
- */
-#define ETHER_NEXT_MULTI(step, enm) \
-	/* struct ether_multistep step; */  \
-	/* struct ether_multi *enm; */  \
-{ \
-	if (((enm) = (step).e_enm) != NULL) \
-		(step).e_enm = (enm)->enm_next; \
-}
-
-#define ETHER_FIRST_MULTI(step, ac, enm) \
-	/* struct ether_multistep step; */ \
-	/* struct arpcom *ac; */ \
-	/* struct ether_multi *enm; */ \
-{ \
-	(step).e_enm = (ac)->ac_multiaddrs; \
-	ETHER_NEXT_MULTI((step), (enm)); \
-}
-
-#endif
-
-#endif
diff --git a/c/src/libnetworking/netinet/igmp.c b/c/src/libnetworking/netinet/igmp.c
deleted file mode 100644
index 2af8b7038e..0000000000
--- a/c/src/libnetworking/netinet/igmp.c
+++ /dev/null
@@ -1,479 +0,0 @@
-/*
- * Copyright (c) 1988 Stephen Deering.
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Stephen Deering of Stanford University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)igmp.c	8.1 (Berkeley) 7/19/93
- * $Id$
- */
-
-/*
- * Internet Group Management Protocol (IGMP) routines.
- *
- * Written by Steve Deering, Stanford, May 1988.
- * Modified by Rosen Sharma, Stanford, Aug 1994.
- * Modified by Bill Fenner, Xerox PARC, Feb 1995.
- * Modified to fully comply to IGMPv2 by Bill Fenner, Oct 1995.
- *
- * MULTICAST Revision: 3.5.1.4
- */
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/mbuf.h>
-#include <sys/socket.h>
-#include <sys/protosw.h>
-#include <sys/kernel.h>
-#include <sys/sysctl.h>
-
-#include <net/if.h>
-#include <net/route.h>
-
-#include <netinet/in.h>
-#include <netinet/in_var.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/ip_var.h>
-#include <netinet/igmp.h>
-#include <netinet/igmp_var.h>
-
-static struct router_info *
-		find_rti __P((struct ifnet *ifp));
-
-static struct igmpstat igmpstat;
-
-SYSCTL_STRUCT(_net_inet_igmp, IGMPCTL_STATS, stats, CTLFLAG_RD,
-	&igmpstat, igmpstat, "");
-
-static int igmp_timers_are_running;
-static u_long igmp_all_hosts_group;
-static u_long igmp_all_rtrs_group;
-static struct mbuf *router_alert;
-static struct router_info *Head;
-
-static void igmp_sendpkt(struct in_multi *, int, unsigned long);
-
-void
-igmp_init()
-{
-	struct ipoption *ra;
-
-	/*
-	 * To avoid byte-swapping the same value over and over again.
-	 */
-	igmp_all_hosts_group = htonl(INADDR_ALLHOSTS_GROUP);
-	igmp_all_rtrs_group = htonl(INADDR_ALLRTRS_GROUP);
-
-	igmp_timers_are_running = 0;
-
-	/*
-	 * Construct a Router Alert option to use in outgoing packets
-	 */
-	MGET(router_alert, M_DONTWAIT, MT_DATA);
-	ra = mtod(router_alert, struct ipoption *);
-	ra->ipopt_dst.s_addr = 0;
-	ra->ipopt_list[0] = IPOPT_RA;	/* Router Alert Option */
-	ra->ipopt_list[1] = 0x04;	/* 4 bytes long */
-	ra->ipopt_list[2] = 0x00;
-	ra->ipopt_list[3] = 0x00;
-	router_alert->m_len = sizeof(ra->ipopt_dst) + ra->ipopt_list[1];
-
-	Head = (struct router_info *) 0;
-}
-
-static struct router_info *
-find_rti(ifp)
-	struct ifnet *ifp;
-{
-        register struct router_info *rti = Head;
-
-#ifdef IGMP_DEBUG
-	printf("[igmp.c, _find_rti] --> entering \n");
-#endif
-        while (rti) {
-                if (rti->rti_ifp == ifp) {
-#ifdef IGMP_DEBUG
-			printf("[igmp.c, _find_rti] --> found old entry \n");
-#endif
-                        return rti;
-                }
-                rti = rti->rti_next;
-        }
-	MALLOC(rti, struct router_info *, sizeof *rti, M_MRTABLE, M_NOWAIT);
-        rti->rti_ifp = ifp;
-        rti->rti_type = IGMP_V2_ROUTER;
-        rti->rti_time = 0;
-        rti->rti_next = Head;
-        Head = rti;
-#ifdef IGMP_DEBUG
-	printf("[igmp.c, _find_rti] --> created an entry \n");
-#endif
-        return rti;
-}
-
-void
-igmp_input(m, iphlen)
-	register struct mbuf *m;
-	register int iphlen;
-{
-	register struct igmp *igmp;
-	register struct ip *ip;
-	register int igmplen;
-	register struct ifnet *ifp = m->m_pkthdr.rcvif;
-	register int minlen;
-	register struct in_multi *inm;
-	register struct in_ifaddr *ia;
-	struct in_multistep step;
-	struct router_info *rti;
-	
-	int timer; /** timer value in the igmp query header **/
-
-	++igmpstat.igps_rcv_total;
-
-	ip = mtod(m, struct ip *);
-	igmplen = ip->ip_len;
-
-	/*
-	 * Validate lengths
-	 */
-	if (igmplen < IGMP_MINLEN) {
-		++igmpstat.igps_rcv_tooshort;
-		m_freem(m);
-		return;
-	}
-	minlen = iphlen + IGMP_MINLEN;
-	if ((m->m_flags & M_EXT || m->m_len < minlen) &&
-	    (m = m_pullup(m, minlen)) == 0) {
-		++igmpstat.igps_rcv_tooshort;
-		return;
-	}
-
-	/*
-	 * Validate checksum
-	 */
-	m->m_data += iphlen;
-	m->m_len -= iphlen;
-	igmp = mtod(m, struct igmp *);
-	if (in_cksum(m, igmplen)) {
-		++igmpstat.igps_rcv_badsum;
-		m_freem(m);
-		return;
-	}
-	m->m_data -= iphlen;
-	m->m_len += iphlen;
-
-	ip = mtod(m, struct ip *);
-	timer = igmp->igmp_code * PR_FASTHZ / IGMP_TIMER_SCALE;
-	rti = find_rti(ifp);
-
-	/*
-	 * In the IGMPv2 specification, there are 3 states and a flag.
-	 *
-	 * In Non-Member state, we simply don't have a membership record.
-	 * In Delaying Member state, our timer is running (inm->inm_timer)
-	 * In Idle Member state, our timer is not running (inm->inm_timer==0)
-	 *
-	 * The flag is inm->inm_state, it is set to IGMP_OTHERMEMBER if
-	 * we have heard a report from another member, or IGMP_IREPORTEDLAST
-	 * if I sent the last report.
-	 */
-	switch (igmp->igmp_type) {
-
-	case IGMP_MEMBERSHIP_QUERY:
-		++igmpstat.igps_rcv_queries;
-
-		if (ifp->if_flags & IFF_LOOPBACK)
-			break;
-
-		if (igmp->igmp_code == 0) {
-			/*
-			 * Old router.  Remember that the querier on this
-			 * interface is old, and set the timer to the
-			 * value in RFC 1112.
-			 */
-
-			rti->rti_type = IGMP_V1_ROUTER;
-			rti->rti_time = 0;
-
-			timer = IGMP_MAX_HOST_REPORT_DELAY * PR_FASTHZ;
-
-			if (ip->ip_dst.s_addr != igmp_all_hosts_group ||
-			    igmp->igmp_group.s_addr != 0) {
-				++igmpstat.igps_rcv_badqueries;
-				m_freem(m);
-				return;
-			}
-		} else {
-			/*
-			 * New router.  Simply do the new validity check.
-			 */
-			
-			if (igmp->igmp_group.s_addr != 0 &&
-			    !IN_MULTICAST(ntohl(igmp->igmp_group.s_addr))) {
-				++igmpstat.igps_rcv_badqueries;
-				m_freem(m);
-				return;
-			}
-		}
-
-		/*
-		 * - Start the timers in all of our membership records
-		 *   that the query applies to for the interface on
-		 *   which the query arrived excl. those that belong
-		 *   to the "all-hosts" group (224.0.0.1).
-		 * - Restart any timer that is already running but has
-		 *   a value longer than the requested timeout.
-		 * - Use the value specified in the query message as
-		 *   the maximum timeout.
-		 */
-		IN_FIRST_MULTI(step, inm);
-		while (inm != NULL) {
-			if (inm->inm_ifp == ifp &&
-			    inm->inm_addr.s_addr != igmp_all_hosts_group &&
-			    (igmp->igmp_group.s_addr == 0 ||
-			     igmp->igmp_group.s_addr == inm->inm_addr.s_addr)) {
-				if (inm->inm_timer == 0 ||
-				    inm->inm_timer > timer) {
-					inm->inm_timer =
-						IGMP_RANDOM_DELAY(timer);
-					igmp_timers_are_running = 1;
-				}
-			}
-			IN_NEXT_MULTI(step, inm);
-		}
-
-		break;
-
-	case IGMP_V1_MEMBERSHIP_REPORT:
-	case IGMP_V2_MEMBERSHIP_REPORT:
-		/*
-		 * For fast leave to work, we have to know that we are the
-		 * last person to send a report for this group.  Reports
-		 * can potentially get looped back if we are a multicast
-		 * router, so discard reports sourced by me.
-		 */
-		IFP_TO_IA(ifp, ia);
-		if (ia && ip->ip_src.s_addr == IA_SIN(ia)->sin_addr.s_addr)
-			break;
-
-		++igmpstat.igps_rcv_reports;
-
-		if (ifp->if_flags & IFF_LOOPBACK)
-			break;
-
-		if (!IN_MULTICAST(ntohl(igmp->igmp_group.s_addr))) {
-			++igmpstat.igps_rcv_badreports;
-			m_freem(m);
-			return;
-		}
-
-		/*
-		 * KLUDGE: if the IP source address of the report has an
-		 * unspecified (i.e., zero) subnet number, as is allowed for
-		 * a booting host, replace it with the correct subnet number
-		 * so that a process-level multicast routing demon can
-		 * determine which subnet it arrived from.  This is necessary
-		 * to compensate for the lack of any way for a process to
-		 * determine the arrival interface of an incoming packet.
-		 */
-		if ((ntohl(ip->ip_src.s_addr) & IN_CLASSA_NET) == 0)
-			if (ia) ip->ip_src.s_addr = htonl(ia->ia_subnet);
-
-		/*
-		 * If we belong to the group being reported, stop
-		 * our timer for that group.
-		 */
-		IN_LOOKUP_MULTI(igmp->igmp_group, ifp, inm);
-
-		if (inm != NULL) {
-			inm->inm_timer = 0;
-			++igmpstat.igps_rcv_ourreports;
-
-			inm->inm_state = IGMP_OTHERMEMBER;
-		}
-
-		break;
-	}
-
-	/*
-	 * Pass all valid IGMP packets up to any process(es) listening
-	 * on a raw IGMP socket.
-	 */
-	rip_input(m, iphlen);
-}
-
-void
-igmp_joingroup(inm)
-	struct in_multi *inm;
-{
-	int s = splnet();
-
-	if (inm->inm_addr.s_addr == igmp_all_hosts_group
-	    || inm->inm_ifp->if_flags & IFF_LOOPBACK) {
-		inm->inm_timer = 0;
-		inm->inm_state = IGMP_OTHERMEMBER;
-	} else {
-		inm->inm_rti = find_rti(inm->inm_ifp);
-		igmp_sendpkt(inm, inm->inm_rti->rti_type, 0);
-		inm->inm_timer = IGMP_RANDOM_DELAY(
-					IGMP_MAX_HOST_REPORT_DELAY*PR_FASTHZ);
-		inm->inm_state = IGMP_IREPORTEDLAST;
-		igmp_timers_are_running = 1;
-	}
-	splx(s);
-}
-
-void
-igmp_leavegroup(inm)
-	struct in_multi *inm;
-{
-	if (inm->inm_state == IGMP_IREPORTEDLAST &&
-	    inm->inm_addr.s_addr != igmp_all_hosts_group &&
-	    !(inm->inm_ifp->if_flags & IFF_LOOPBACK) &&
-	    inm->inm_rti->rti_type != IGMP_V1_ROUTER)
-		igmp_sendpkt(inm, IGMP_V2_LEAVE_GROUP, igmp_all_rtrs_group);
-}
-
-void
-igmp_fasttimo()
-{
-	register struct in_multi *inm;
-	struct in_multistep step;
-	int s;
-
-	/*
-	 * Quick check to see if any work needs to be done, in order
-	 * to minimize the overhead of fasttimo processing.
-	 */
-
-	if (!igmp_timers_are_running)
-		return;
-
-	s = splnet();
-	igmp_timers_are_running = 0;
-	IN_FIRST_MULTI(step, inm);
-	while (inm != NULL) {
-		if (inm->inm_timer == 0) {
-			/* do nothing */
-		} else if (--inm->inm_timer == 0) {
-			igmp_sendpkt(inm, inm->inm_rti->rti_type, 0);
-			inm->inm_state = IGMP_IREPORTEDLAST;
-		} else {
-			igmp_timers_are_running = 1;
-		}
-		IN_NEXT_MULTI(step, inm);
-	}
-	splx(s);
-}
-
-void
-igmp_slowtimo()
-{
-	int s = splnet();
-	register struct router_info *rti =  Head;
-
-#ifdef IGMP_DEBUG
-	printf("[igmp.c,_slowtimo] -- > entering \n");
-#endif
-	while (rti) {
-	    if (rti->rti_type == IGMP_V1_ROUTER) {
-		rti->rti_time++;
-		if (rti->rti_time >= IGMP_AGE_THRESHOLD) {
-			rti->rti_type = IGMP_V2_ROUTER;
-		}
-	    }
-	    rti = rti->rti_next;
-	}
-#ifdef IGMP_DEBUG	
-	printf("[igmp.c,_slowtimo] -- > exiting \n");
-#endif
-	splx(s);
-}
-
-static struct route igmprt;
-
-static void
-igmp_sendpkt(inm, type, addr)
-	struct in_multi *inm;
-	int type;
-	unsigned long addr;
-{
-        struct mbuf *m;
-        struct igmp *igmp;
-        struct ip *ip;
-        struct ip_moptions imo;
-
-        MGETHDR(m, M_DONTWAIT, MT_HEADER);
-        if (m == NULL)
-                return;
-
-	m->m_pkthdr.rcvif = loif;
-	m->m_pkthdr.len = sizeof(struct ip) + IGMP_MINLEN;
-	MH_ALIGN(m, IGMP_MINLEN + sizeof(struct ip));
-	m->m_data += sizeof(struct ip);
-        m->m_len = IGMP_MINLEN;
-        igmp = mtod(m, struct igmp *);
-        igmp->igmp_type   = type;
-        igmp->igmp_code   = 0;
-        igmp->igmp_group  = inm->inm_addr;
-        igmp->igmp_cksum  = 0;
-        igmp->igmp_cksum  = in_cksum(m, IGMP_MINLEN);
-
-        m->m_data -= sizeof(struct ip);
-        m->m_len += sizeof(struct ip);
-        ip = mtod(m, struct ip *);
-        ip->ip_tos        = 0;
-        ip->ip_len        = sizeof(struct ip) + IGMP_MINLEN;
-        ip->ip_off        = 0;
-        ip->ip_p          = IPPROTO_IGMP;
-        ip->ip_src.s_addr = INADDR_ANY;
-        ip->ip_dst.s_addr = addr ? addr : igmp->igmp_group.s_addr;
-
-        imo.imo_multicast_ifp  = inm->inm_ifp;
-        imo.imo_multicast_ttl  = 1;
-	imo.imo_multicast_vif  = -1;
-        /*
-         * Request loopback of the report if we are acting as a multicast
-         * router, so that the process-level routing demon can hear it.
-         */
-        imo.imo_multicast_loop = (ip_mrouter != NULL);
-
-	/*
-	 * XXX
-	 * Do we have to worry about reentrancy here?  Don't think so.
-	 */
-        ip_output(m, router_alert, &igmprt, 0, &imo);
-
-        ++igmpstat.igps_snd_reports;
-}
diff --git a/c/src/libnetworking/netinet/igmp.h b/c/src/libnetworking/netinet/igmp.h
deleted file mode 100644
index 01d6d09179..0000000000
--- a/c/src/libnetworking/netinet/igmp.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (c) 1988 Stephen Deering.
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Stephen Deering of Stanford University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)igmp.h	8.1 (Berkeley) 6/10/93
- *	$Id$
- */
-
-#ifndef _NETINET_IGMP_H_
-#define _NETINET_IGMP_H_
-
-/*
- * Internet Group Management Protocol (IGMP) definitions.
- *
- * Written by Steve Deering, Stanford, May 1988.
- *
- * MULTICAST Revision: 3.5.1.2
- */
-
-/*
- * IGMP packet format.
- */
-struct igmp {
-	u_char		igmp_type;	/* version & type of IGMP message  */
-	u_char		igmp_code;	/* subtype for routing msgs        */
-	u_short		igmp_cksum;	/* IP-style checksum               */
-	struct in_addr	igmp_group;	/* group address being reported    */
-};					/*  (zero for queries)             */
-
-#define IGMP_MINLEN		     8
-
-/*
- * Message types, including version number.
- */
-#define IGMP_MEMBERSHIP_QUERY   	0x11	/* membership query         */
-#define IGMP_V1_MEMBERSHIP_REPORT	0x12	/* Ver. 1 membership report */
-#define IGMP_V2_MEMBERSHIP_REPORT	0x16	/* Ver. 2 membership report */
-#define IGMP_V2_LEAVE_GROUP		0x17	/* Leave-group message	    */
-
-#define IGMP_DVMRP			0x13	/* DVMRP routing message    */
-#define IGMP_PIM			0x14	/* PIM routing message	    */
-
-#define IGMP_MTRACE_RESP		0x1e  /* traceroute resp.(to sender)*/
-#define IGMP_MTRACE			0x1f  /* mcast traceroute messages  */
-
-#define IGMP_MAX_HOST_REPORT_DELAY   10    /* max delay for response to     */
-					   /*  query (in seconds) according */
-					   /*  to RFC1112                   */
-
-
-#define IGMP_TIMER_SCALE     10		/* denotes that the igmp code field */
-					/* specifies time in 10th of seconds*/
-
-/*
- * The following four defininitions are for backwards compatibility.
- * They should be removed as soon as all applications are updated to
- * use the new constant names.
- */
-#define IGMP_HOST_MEMBERSHIP_QUERY	IGMP_MEMBERSHIP_QUERY
-#define IGMP_HOST_MEMBERSHIP_REPORT	IGMP_V1_MEMBERSHIP_REPORT
-#define IGMP_HOST_NEW_MEMBERSHIP_REPORT	IGMP_V2_MEMBERSHIP_REPORT
-#define IGMP_HOST_LEAVE_MESSAGE		IGMP_V2_LEAVE_GROUP
-
-#endif /* _NETINET_IGMP_H_ */
diff --git a/c/src/libnetworking/netinet/igmp_var.h b/c/src/libnetworking/netinet/igmp_var.h
deleted file mode 100644
index f408bf2bc1..0000000000
--- a/c/src/libnetworking/netinet/igmp_var.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright (c) 1988 Stephen Deering.
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Stephen Deering of Stanford University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)igmp_var.h	8.1 (Berkeley) 7/19/93
- * $Id$
- */
-
-#ifndef _NETINET_IGMP_VAR_H_
-#define _NETINET_IGMP_VAR_H_
-
-/*
- * Internet Group Management Protocol (IGMP),
- * implementation-specific definitions.
- *
- * Written by Steve Deering, Stanford, May 1988.
- *
- * MULTICAST Revision: 3.5.1.3
- */
-
-struct igmpstat {
-	u_int	igps_rcv_total;		/* total IGMP messages received */
-	u_int	igps_rcv_tooshort;	/* received with too few bytes */
-	u_int	igps_rcv_badsum;	/* received with bad checksum */
-	u_int	igps_rcv_queries;	/* received membership queries */
-	u_int	igps_rcv_badqueries;	/* received invalid queries */
-	u_int	igps_rcv_reports;	/* received membership reports */
-	u_int	igps_rcv_badreports;	/* received invalid reports */
-	u_int	igps_rcv_ourreports;	/* received reports for our groups */
-	u_int	igps_snd_reports;	/* sent membership reports */
-};
-
-#ifdef KERNEL
-extern struct igmpstat igmpstat;
-
-#define IGMP_RANDOM_DELAY(X) (random() % (X) + 1)
-
-/*
- * States for IGMPv2's leave processing
- */
-#define IGMP_OTHERMEMBER			0
-#define IGMP_IREPORTEDLAST			1
-
-/*
- * We must remember what version the subnet's querier is.
- * We conveniently use the IGMP message type for the proper
- * membership report to keep this state.
- */
-#define IGMP_V1_ROUTER				IGMP_V1_MEMBERSHIP_REPORT
-#define IGMP_V2_ROUTER				IGMP_V2_MEMBERSHIP_REPORT
-
-/*
- * Revert to new router if we haven't heard from an old router in
- * this amount of time.
- */
-#define IGMP_AGE_THRESHOLD			540
-
-void	igmp_init __P((void));
-void	igmp_input __P((struct mbuf *, int));
-void	igmp_joingroup __P((struct in_multi *));
-void	igmp_leavegroup __P((struct in_multi *));
-void	igmp_fasttimo __P((void));
-void	igmp_slowtimo __P((void));
-#endif
-
-/*
- * Names for IGMP sysctl objects
- */
-#define IGMPCTL_STATS		1	/* statistics (read-only) */
-#define IGMPCTL_MAXID		2
-
-#define IGMPCTL_NAMES { \
-	{ 0, 0 }, \
-	{ "stats", CTLTYPE_STRUCT }, \
-}
-
-#endif
-
-
diff --git a/c/src/libnetworking/netinet/in.c b/c/src/libnetworking/netinet/in.c
deleted file mode 100644
index 701406f207..0000000000
--- a/c/src/libnetworking/netinet/in.c
+++ /dev/null
@@ -1,728 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)in.c	8.4 (Berkeley) 1/9/95
- *	$Id$
- */
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/systm.h>
-#include <sys/ioctl.h>
-#include <sys/errno.h>
-#include <sys/malloc.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/kernel.h>
-#include <sys/sysctl.h>
-
-#include <net/if.h>
-#include <net/route.h>
-
-#include <netinet/in_systm.h>
-#include <netinet/in.h>
-#include <netinet/in_var.h>
-#include <netinet/if_ether.h>
-
-#include <netinet/igmp_var.h>
-
-/*
- * This structure is used to keep track of in_multi chains which belong to
- * deleted interface addresses.
- */
-static LIST_HEAD(, multi_kludge) in_mk; /* XXX BSS initialization */
-
-struct multi_kludge {
-	LIST_ENTRY(multi_kludge) mk_entry;
-	struct ifnet *mk_ifp;
-	struct in_multihead mk_head;
-};
-
-static void	in_socktrim __P((struct sockaddr_in *));
-static int	in_ifinit __P((struct ifnet *,
-	    struct in_ifaddr *, struct sockaddr_in *, int));
-static void	in_ifscrub __P((struct ifnet *, struct in_ifaddr *));
-
-static int subnetsarelocal = 0;
-SYSCTL_INT(_net_inet_ip, OID_AUTO, subnets_are_local, CTLFLAG_RW, 
-	&subnetsarelocal, 0, "");
-/*
- * Return 1 if an internet address is for a ``local'' host
- * (one to which we have a connection).  If subnetsarelocal
- * is true, this includes other subnets of the local net.
- * Otherwise, it includes only the directly-connected (sub)nets.
- */
-int
-in_localaddr(in)
-	struct in_addr in;
-{
-	register u_long i = ntohl(in.s_addr);
-	register struct in_ifaddr *ia;
-
-	if (subnetsarelocal) {
-		for (ia = in_ifaddr; ia; ia = ia->ia_next)
-			if ((i & ia->ia_netmask) == ia->ia_net)
-				return (1);
-	} else {
-		for (ia = in_ifaddr; ia; ia = ia->ia_next)
-			if ((i & ia->ia_subnetmask) == ia->ia_subnet)
-				return (1);
-	}
-	return (0);
-}
-
-/*
- * Determine whether an IP address is in a reserved set of addresses
- * that may not be forwarded, or whether datagrams to that destination
- * may be forwarded.
- */
-int
-in_canforward(in)
-	struct in_addr in;
-{
-	register u_long i = ntohl(in.s_addr);
-	register u_long net;
-
-	if (IN_EXPERIMENTAL(i) || IN_MULTICAST(i))
-		return (0);
-	if (IN_CLASSA(i)) {
-		net = i & IN_CLASSA_NET;
-		if (net == 0 || net == (IN_LOOPBACKNET << IN_CLASSA_NSHIFT))
-			return (0);
-	}
-	return (1);
-}
-
-/*
- * Trim a mask in a sockaddr
- */
-static void
-in_socktrim(ap)
-struct sockaddr_in *ap;
-{
-    register char *cplim = (char *) &ap->sin_addr;
-    register char *cp = (char *) (&ap->sin_addr + 1);
-
-    ap->sin_len = 0;
-    while (--cp >= cplim)
-        if (*cp) {
-	    (ap)->sin_len = cp - (char *) (ap) + 1;
-	    break;
-	}
-}
-
-static int in_interfaces;	/* number of external internet interfaces */
-
-/*
- * Generic internet control operations (ioctl's).
- * Ifp is 0 if not an interface-specific ioctl.
- */
-/* ARGSUSED */
-int
-in_control(so, cmd, data, ifp)
-	struct socket *so;
-	u_long cmd;
-	caddr_t data;
-	register struct ifnet *ifp;
-{
-	register struct ifreq *ifr = (struct ifreq *)data;
-	register struct in_ifaddr *ia = 0, *iap;
-	register struct ifaddr *ifa;
-	struct in_ifaddr *oia;
-	struct in_aliasreq *ifra = (struct in_aliasreq *)data;
-	struct sockaddr_in oldaddr;
-	int error, hostIsNew, maskIsNew, s;
-	u_long i;
-	struct multi_kludge *mk;
-
-	/*
-	 * Find address for this interface, if it exists.
-	 *
-	 * If an alias address was specified, find that one instead of
-	 * the first one on the interface.
-	 */
-	if (ifp)
-		for (iap = in_ifaddr; iap; iap = iap->ia_next)
-			if (iap->ia_ifp == ifp) {
-				if (((struct sockaddr_in *)&ifr->ifr_addr)->sin_addr.s_addr ==
-				    iap->ia_addr.sin_addr.s_addr) {
-					ia = iap;
-					break;
-				} else if (ia == NULL) {
-					ia = iap;
-					if (ifr->ifr_addr.sa_family != AF_INET)
-						break;
-				}
-			}
-
-	switch (cmd) {
-
-	case SIOCAIFADDR:
-	case SIOCDIFADDR:
-		if (ifra->ifra_addr.sin_family == AF_INET) {
-			for (oia = ia; ia; ia = ia->ia_next) {
-				if (ia->ia_ifp == ifp  &&
-				    ia->ia_addr.sin_addr.s_addr ==
-				    ifra->ifra_addr.sin_addr.s_addr)
-					break;
-			}
-			if ((ifp->if_flags & IFF_POINTOPOINT)
-			    && (cmd == SIOCAIFADDR)
-			    && (ifra->ifra_dstaddr.sin_addr.s_addr
-				== INADDR_ANY)) {
-				return EDESTADDRREQ;
-			}
-		}
-		if (cmd == SIOCDIFADDR && ia == 0)
-			return (EADDRNOTAVAIL);
-		/* FALLTHROUGH */
-	case SIOCSIFADDR:
-	case SIOCSIFNETMASK:
-	case SIOCSIFDSTADDR:
-		if ((so->so_state & SS_PRIV) == 0)
-			return (EPERM);
-
-		if (ifp == 0)
-			panic("in_control");
-		if (ia == (struct in_ifaddr *)0) {
-			oia = (struct in_ifaddr *)
-				malloc(sizeof *oia, M_IFADDR, M_WAITOK);
-			if (oia == (struct in_ifaddr *)NULL)
-				return (ENOBUFS);
-			bzero((caddr_t)oia, sizeof *oia);
-			ia = in_ifaddr;
-			/*
-			 * Protect from ipintr() traversing address list
-			 * while we're modifying it.
-			 */
-			s = splnet();
-
-			if (ia) {
-				for ( ; ia->ia_next; ia = ia->ia_next)
-					continue;
-				ia->ia_next = oia;
-			} else
-				in_ifaddr = oia;
-			ia = oia;
-			ifa = ifp->if_addrlist;
-			if (ifa) {
-				for ( ; ifa->ifa_next; ifa = ifa->ifa_next)
-					continue;
-				ifa->ifa_next = (struct ifaddr *) ia;
-			} else
-				ifp->if_addrlist = (struct ifaddr *) ia;
-			ia->ia_ifa.ifa_addr = (struct sockaddr *)&ia->ia_addr;
-			ia->ia_ifa.ifa_dstaddr
-					= (struct sockaddr *)&ia->ia_dstaddr;
-			ia->ia_ifa.ifa_netmask
-					= (struct sockaddr *)&ia->ia_sockmask;
-			ia->ia_sockmask.sin_len = 8;
-			if (ifp->if_flags & IFF_BROADCAST) {
-				ia->ia_broadaddr.sin_len = sizeof(ia->ia_addr);
-				ia->ia_broadaddr.sin_family = AF_INET;
-			}
-			ia->ia_ifp = ifp;
-			if (!(ifp->if_flags & IFF_LOOPBACK))
-				in_interfaces++;
-			splx(s);
-		}
-		break;
-
-	case SIOCSIFBRDADDR:
-		if ((so->so_state & SS_PRIV) == 0)
-			return (EPERM);
-		/* FALLTHROUGH */
-
-	case SIOCGIFADDR:
-	case SIOCGIFNETMASK:
-	case SIOCGIFDSTADDR:
-	case SIOCGIFBRDADDR:
-		if (ia == (struct in_ifaddr *)0)
-			return (EADDRNOTAVAIL);
-		break;
-	}
-	switch (cmd) {
-
-	case SIOCGIFADDR:
-		*((struct sockaddr_in *)&ifr->ifr_addr) = ia->ia_addr;
-		break;
-
-	case SIOCGIFBRDADDR:
-		if ((ifp->if_flags & IFF_BROADCAST) == 0)
-			return (EINVAL);
-		*((struct sockaddr_in *)&ifr->ifr_dstaddr) = ia->ia_broadaddr;
-		break;
-
-	case SIOCGIFDSTADDR:
-		if ((ifp->if_flags & IFF_POINTOPOINT) == 0)
-			return (EINVAL);
-		*((struct sockaddr_in *)&ifr->ifr_dstaddr) = ia->ia_dstaddr;
-		break;
-
-	case SIOCGIFNETMASK:
-		*((struct sockaddr_in *)&ifr->ifr_addr) = ia->ia_sockmask;
-		break;
-
-	case SIOCSIFDSTADDR:
-		if ((ifp->if_flags & IFF_POINTOPOINT) == 0)
-			return (EINVAL);
-		oldaddr = ia->ia_dstaddr;
-		ia->ia_dstaddr = *(struct sockaddr_in *)&ifr->ifr_dstaddr;
-		if (ifp->if_ioctl && (error = (*ifp->if_ioctl)
-					(ifp, SIOCSIFDSTADDR, (caddr_t)ia))) {
-			ia->ia_dstaddr = oldaddr;
-			return (error);
-		}
-		if (ia->ia_flags & IFA_ROUTE) {
-			ia->ia_ifa.ifa_dstaddr = (struct sockaddr *)&oldaddr;
-			rtinit(&(ia->ia_ifa), (int)RTM_DELETE, RTF_HOST);
-			ia->ia_ifa.ifa_dstaddr =
-					(struct sockaddr *)&ia->ia_dstaddr;
-			rtinit(&(ia->ia_ifa), (int)RTM_ADD, RTF_HOST|RTF_UP);
-		}
-		break;
-
-	case SIOCSIFBRDADDR:
-		if ((ifp->if_flags & IFF_BROADCAST) == 0)
-			return (EINVAL);
-		ia->ia_broadaddr = *(struct sockaddr_in *)&ifr->ifr_broadaddr;
-		break;
-
-	case SIOCSIFADDR:
-		return (in_ifinit(ifp, ia,
-		    (struct sockaddr_in *) &ifr->ifr_addr, 1));
-
-	case SIOCSIFNETMASK:
-		i = ifra->ifra_addr.sin_addr.s_addr;
-		ia->ia_subnetmask = ntohl(ia->ia_sockmask.sin_addr.s_addr = i);
-		break;
-
-	case SIOCAIFADDR:
-		maskIsNew = 0;
-		hostIsNew = 1;
-		error = 0;
-		if (ia->ia_addr.sin_family == AF_INET) {
-			if (ifra->ifra_addr.sin_len == 0) {
-				ifra->ifra_addr = ia->ia_addr;
-				hostIsNew = 0;
-			} else if (ifra->ifra_addr.sin_addr.s_addr ==
-					       ia->ia_addr.sin_addr.s_addr)
-				hostIsNew = 0;
-		}
-		if (ifra->ifra_mask.sin_len) {
-			in_ifscrub(ifp, ia);
-			ia->ia_sockmask = ifra->ifra_mask;
-			ia->ia_subnetmask =
-			     ntohl(ia->ia_sockmask.sin_addr.s_addr);
-			maskIsNew = 1;
-		}
-		if ((ifp->if_flags & IFF_POINTOPOINT) &&
-		    (ifra->ifra_dstaddr.sin_family == AF_INET)) {
-			in_ifscrub(ifp, ia);
-			ia->ia_dstaddr = ifra->ifra_dstaddr;
-			maskIsNew  = 1; /* We lie; but the effect's the same */
-		}
-		if (ifra->ifra_addr.sin_family == AF_INET &&
-		    (hostIsNew || maskIsNew))
-			error = in_ifinit(ifp, ia, &ifra->ifra_addr, 0);
-		if ((ifp->if_flags & IFF_BROADCAST) &&
-		    (ifra->ifra_broadaddr.sin_family == AF_INET))
-			ia->ia_broadaddr = ifra->ifra_broadaddr;
-		return (error);
-
-	case SIOCDIFADDR:
-		mk = malloc(sizeof *mk, M_IPMADDR, M_WAITOK);
-		if (!mk)
-			return ENOBUFS;
-
-		in_ifscrub(ifp, ia);
-		/*
-		 * Protect from ipintr() traversing address list
-		 * while we're modifying it.
-		 */
-		s = splnet();
-
-		if ((ifa = ifp->if_addrlist) == (struct ifaddr *)ia)
-			ifp->if_addrlist = ifa->ifa_next;
-		else {
-			while (ifa->ifa_next &&
-			       (ifa->ifa_next != (struct ifaddr *)ia))
-				    ifa = ifa->ifa_next;
-			if (ifa->ifa_next)
-				ifa->ifa_next = ((struct ifaddr *)ia)->ifa_next;
-			else
-				printf("Couldn't unlink inifaddr from ifp\n");
-		}
-		oia = ia;
-		if (oia == (ia = in_ifaddr))
-			in_ifaddr = ia->ia_next;
-		else {
-			while (ia->ia_next && (ia->ia_next != oia))
-				ia = ia->ia_next;
-			if (ia->ia_next)
-				ia->ia_next = oia->ia_next;
-			else
-				printf("Didn't unlink inifadr from list\n");
-		}
-
-		if (!oia->ia_multiaddrs.lh_first) {
-			IFAFREE(&oia->ia_ifa);
-			FREE(mk, M_IPMADDR);
-			splx(s);
-			break;
-		}
-
-		/*
-		 * Multicast address kludge:
-		 * If there were any multicast addresses attached to this
-		 * interface address, either move them to another address
-		 * on this interface, or save them until such time as this
-		 * interface is reconfigured for IP.
-		 */
-		IFP_TO_IA(oia->ia_ifp, ia);
-		if (ia) {	/* there is another address */
-			struct in_multi *inm;
-			for(inm = oia->ia_multiaddrs.lh_first; inm;
-			    inm = inm->inm_entry.le_next) {
-				IFAFREE(&inm->inm_ia->ia_ifa);
-				ia->ia_ifa.ifa_refcnt++;
-				inm->inm_ia = ia;
-				LIST_INSERT_HEAD(&ia->ia_multiaddrs, inm,
-						 inm_entry);
-			}
-			FREE(mk, M_IPMADDR);
-		} else {	/* last address on this if deleted, save */
-			struct in_multi *inm;
-
-			LIST_INIT(&mk->mk_head);
-			mk->mk_ifp = ifp;
-
-			for(inm = oia->ia_multiaddrs.lh_first; inm;
-			    inm = inm->inm_entry.le_next) {
-				LIST_INSERT_HEAD(&mk->mk_head, inm, inm_entry);
-			}
-
-			if (mk->mk_head.lh_first) {
-				LIST_INSERT_HEAD(&in_mk, mk, mk_entry);
-			} else {
-				FREE(mk, M_IPMADDR);
-			}
-		}
-
-		IFAFREE((&oia->ia_ifa));
-		splx(s);
-		break;
-
-	default:
-		if (ifp == 0 || ifp->if_ioctl == 0)
-			return (EOPNOTSUPP);
-		return ((*ifp->if_ioctl)(ifp, cmd, data));
-	}
-	return (0);
-}
-
-/*
- * Delete any existing route for an interface.
- */
-static void
-in_ifscrub(ifp, ia)
-	register struct ifnet *ifp;
-	register struct in_ifaddr *ia;
-{
-
-	if ((ia->ia_flags & IFA_ROUTE) == 0)
-		return;
-	if (ifp->if_flags & (IFF_LOOPBACK|IFF_POINTOPOINT))
-		rtinit(&(ia->ia_ifa), (int)RTM_DELETE, RTF_HOST);
-	else
-		rtinit(&(ia->ia_ifa), (int)RTM_DELETE, 0);
-	ia->ia_flags &= ~IFA_ROUTE;
-}
-
-/*
- * Initialize an interface's internet address
- * and routing table entry.
- */
-static int
-in_ifinit(ifp, ia, sin, scrub)
-	register struct ifnet *ifp;
-	register struct in_ifaddr *ia;
-	struct sockaddr_in *sin;
-	int scrub;
-{
-	register u_long i = ntohl(sin->sin_addr.s_addr);
-	struct sockaddr_in oldaddr;
-	int s = splimp(), flags = RTF_UP, error;
-	struct multi_kludge *mk;
-
-	oldaddr = ia->ia_addr;
-	ia->ia_addr = *sin;
-	/*
-	 * Give the interface a chance to initialize
-	 * if this is its first address,
-	 * and to validate the address if necessary.
-	 */
-	if (ifp->if_ioctl &&
-	    (error = (*ifp->if_ioctl)(ifp, SIOCSIFADDR, (caddr_t)ia))) {
-		splx(s);
-		ia->ia_addr = oldaddr;
-		return (error);
-	}
-	splx(s);
-	if (scrub) {
-		ia->ia_ifa.ifa_addr = (struct sockaddr *)&oldaddr;
-		in_ifscrub(ifp, ia);
-		ia->ia_ifa.ifa_addr = (struct sockaddr *)&ia->ia_addr;
-	}
-	if (IN_CLASSA(i))
-		ia->ia_netmask = IN_CLASSA_NET;
-	else if (IN_CLASSB(i))
-		ia->ia_netmask = IN_CLASSB_NET;
-	else
-		ia->ia_netmask = IN_CLASSC_NET;
-	/*
-	 * The subnet mask usually includes at least the standard network part,
-	 * but may may be smaller in the case of supernetting.
-	 * If it is set, we believe it.
-	 */
-	if (ia->ia_subnetmask == 0) {
-		ia->ia_subnetmask = ia->ia_netmask;
-		ia->ia_sockmask.sin_addr.s_addr = htonl(ia->ia_subnetmask);
-	} else
-		ia->ia_netmask &= ia->ia_subnetmask;
-	ia->ia_net = i & ia->ia_netmask;
-	ia->ia_subnet = i & ia->ia_subnetmask;
-	in_socktrim(&ia->ia_sockmask);
-	/*
-	 * Add route for the network.
-	 */
-	ia->ia_ifa.ifa_metric = ifp->if_metric;
-	if (ifp->if_flags & IFF_BROADCAST) {
-		ia->ia_broadaddr.sin_addr.s_addr =
-			htonl(ia->ia_subnet | ~ia->ia_subnetmask);
-		ia->ia_netbroadcast.s_addr =
-			htonl(ia->ia_net | ~ ia->ia_netmask);
-	} else if (ifp->if_flags & IFF_LOOPBACK) {
-		ia->ia_ifa.ifa_dstaddr = ia->ia_ifa.ifa_addr;
-		flags |= RTF_HOST;
-	} else if (ifp->if_flags & IFF_POINTOPOINT) {
-		if (ia->ia_dstaddr.sin_family != AF_INET)
-			return (0);
-		flags |= RTF_HOST;
-	}
-	if ((error = rtinit(&(ia->ia_ifa), (int)RTM_ADD, flags)) == 0)
-		ia->ia_flags |= IFA_ROUTE;
-
-	LIST_INIT(&ia->ia_multiaddrs);
-	/*
-	 * If the interface supports multicast, join the "all hosts"
-	 * multicast group on that interface.
-	 */
-	if (ifp->if_flags & IFF_MULTICAST) {
-		struct in_addr addr;
-
-		/*
-		 * Continuation of multicast address hack:
-		 * If there was a multicast group list previously saved
-		 * for this interface, then we re-attach it to the first
-		 * address configured on the i/f.
-		 */
-		for(mk = in_mk.lh_first; mk; mk = mk->mk_entry.le_next) {
-			if(mk->mk_ifp == ifp) {
-				struct in_multi *inm;
-
-				for(inm = mk->mk_head.lh_first; inm;
-				    inm = inm->inm_entry.le_next) {
-					IFAFREE(&inm->inm_ia->ia_ifa);
-					ia->ia_ifa.ifa_refcnt++;
-					inm->inm_ia = ia;
-					LIST_INSERT_HEAD(&ia->ia_multiaddrs,
-							 inm, inm_entry);
-				}
-				LIST_REMOVE(mk, mk_entry);
-				free(mk, M_IPMADDR);
-				break;
-			}
-		}
-
-		addr.s_addr = htonl(INADDR_ALLHOSTS_GROUP);
-		in_addmulti(&addr, ifp);
-	}
-	return (error);
-}
-
-
-/*
- * Return 1 if the address might be a local broadcast address.
- */
-int
-in_broadcast(in, ifp)
-	struct in_addr in;
-        struct ifnet *ifp;
-{
-	register struct ifaddr *ifa;
-	u_long t;
-
-	if (in.s_addr == INADDR_BROADCAST ||
-	    in.s_addr == INADDR_ANY)
-		return 1;
-	if ((ifp->if_flags & IFF_BROADCAST) == 0)
-		return 0;
-	t = ntohl(in.s_addr);
-	/*
-	 * Look through the list of addresses for a match
-	 * with a broadcast address.
-	 */
-#define ia ((struct in_ifaddr *)ifa)
-	for (ifa = ifp->if_addrlist; ifa; ifa = ifa->ifa_next)
-		if (ifa->ifa_addr->sa_family == AF_INET &&
-		    (in.s_addr == ia->ia_broadaddr.sin_addr.s_addr ||
-		     in.s_addr == ia->ia_netbroadcast.s_addr ||
-		     /*
-		      * Check for old-style (host 0) broadcast.
-		      */
-		     t == ia->ia_subnet || t == ia->ia_net) &&
-		     /*
-		      * Check for an all one subnetmask. These
-		      * only exist when an interface gets a secondary
-		      * address.
-		      */
-		     ia->ia_subnetmask != (u_long)0xffffffff)
-			    return 1;
-	return (0);
-#undef ia
-}
-/*
- * Add an address to the list of IP multicast addresses for a given interface.
- */
-struct in_multi *
-in_addmulti(ap, ifp)
-	register struct in_addr *ap;
-	register struct ifnet *ifp;
-{
-	register struct in_multi *inm;
-	struct ifreq ifr;
-	struct in_ifaddr *ia;
-	int s = splnet();
-
-	/*
-	 * See if address already in list.
-	 */
-	IN_LOOKUP_MULTI(*ap, ifp, inm);
-	if (inm != NULL) {
-		/*
-		 * Found it; just increment the reference count.
-		 */
-		++inm->inm_refcount;
-	}
-	else {
-		/*
-		 * New address; allocate a new multicast record
-		 * and link it into the interface's multicast list.
-		 */
-		inm = (struct in_multi *)malloc(sizeof(*inm),
-		    M_IPMADDR, M_NOWAIT);
-		if (inm == NULL) {
-			splx(s);
-			return (NULL);
-		}
-		inm->inm_addr = *ap;
-		inm->inm_ifp = ifp;
-		inm->inm_refcount = 1;
-		IFP_TO_IA(ifp, ia);
-		if (ia == NULL) {
-			free(inm, M_IPMADDR);
-			splx(s);
-			return (NULL);
-		}
-		inm->inm_ia = ia;
-		ia->ia_ifa.ifa_refcnt++; /* gain a reference */
-		LIST_INSERT_HEAD(&ia->ia_multiaddrs, inm, inm_entry);
-
-		/*
-		 * Ask the network driver to update its multicast reception
-		 * filter appropriately for the new address.
-		 */
-		((struct sockaddr_in *)&ifr.ifr_addr)->sin_family = AF_INET;
-		((struct sockaddr_in *)&ifr.ifr_addr)->sin_addr = *ap;
-		if ((ifp->if_ioctl == NULL) ||
-		    (*ifp->if_ioctl)(ifp, SIOCADDMULTI,(caddr_t)&ifr) != 0) {
-			LIST_REMOVE(inm, inm_entry);
-			IFAFREE(&ia->ia_ifa); /* release reference */
-			free(inm, M_IPMADDR);
-			splx(s);
-			return (NULL);
-		}
-		/*
-		 * Let IGMP know that we have joined a new IP multicast group.
-		 */
-		igmp_joingroup(inm);
-	}
-	splx(s);
-	return (inm);
-}
-
-/*
- * Delete a multicast address record.
- */
-void
-in_delmulti(inm)
-	register struct in_multi *inm;
-{
-	struct ifreq ifr;
-	int s = splnet();
-
-	if (--inm->inm_refcount == 0) {
-		/*
-		 * No remaining claims to this record; let IGMP know that
-		 * we are leaving the multicast group.
-		 */
-		igmp_leavegroup(inm);
-		/*
-		 * Unlink from list.
-		 */
-		LIST_REMOVE(inm, inm_entry);
-		IFAFREE(&inm->inm_ia->ia_ifa); /* release reference */
-
-		/*
-		 * Notify the network driver to update its multicast reception
-		 * filter.
-		 */
-		((struct sockaddr_in *)&(ifr.ifr_addr))->sin_family = AF_INET;
-		((struct sockaddr_in *)&(ifr.ifr_addr))->sin_addr =
-								inm->inm_addr;
-		(*inm->inm_ifp->if_ioctl)(inm->inm_ifp, SIOCDELMULTI,
-							     (caddr_t)&ifr);
-		free(inm, M_IPMADDR);
-	}
-	splx(s);
-}
diff --git a/c/src/libnetworking/netinet/in.h b/c/src/libnetworking/netinet/in.h
deleted file mode 100644
index ba3cbb21cc..0000000000
--- a/c/src/libnetworking/netinet/in.h
+++ /dev/null
@@ -1,433 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)in.h	8.3 (Berkeley) 1/3/94
- * $Id$
- */
-
-#ifndef _NETINET_IN_H_
-#define _NETINET_IN_H_
-
-/*
- * Constants and structures defined by the internet system,
- * Per RFC 790, September 1981, and numerous additions.
- */
-
-/*
- * Protocols (RFC 1700)
- */
-#define	IPPROTO_IP		0		/* dummy for IP */
-#define	IPPROTO_ICMP		1		/* control message protocol */
-#define	IPPROTO_IGMP		2		/* group mgmt protocol */
-#define	IPPROTO_GGP		3		/* gateway^2 (deprecated) */
-#define IPPROTO_IPIP		4 		/* IP encapsulation in IP */
-#define	IPPROTO_TCP		6		/* tcp */
-#define	IPPROTO_ST		7		/* Stream protocol II */
-#define	IPPROTO_EGP		8		/* exterior gateway protocol */
-#define	IPPROTO_PIGP		9		/* private interior gateway */
-#define	IPPROTO_RCCMON		10		/* BBN RCC Monitoring */
-#define	IPPROTO_NVPII		11		/* network voice protocol*/
-#define	IPPROTO_PUP		12		/* pup */
-#define	IPPROTO_ARGUS		13		/* Argus */
-#define	IPPROTO_EMCON		14		/* EMCON */
-#define	IPPROTO_XNET		15		/* Cross Net Debugger */
-#define	IPPROTO_CHAOS		16		/* Chaos*/
-#define	IPPROTO_UDP		17		/* user datagram protocol */
-#define	IPPROTO_MUX		18		/* Multiplexing */
-#define	IPPROTO_MEAS		19		/* DCN Measurement Subsystems */
-#define	IPPROTO_HMP		20		/* Host Monitoring */
-#define	IPPROTO_PRM		21		/* Packet Radio Measurement */
-#define	IPPROTO_IDP		22		/* xns idp */
-#define	IPPROTO_TRUNK1		23		/* Trunk-1 */
-#define	IPPROTO_TRUNK2		24		/* Trunk-2 */
-#define	IPPROTO_LEAF1		25		/* Leaf-1 */
-#define	IPPROTO_LEAF2		26		/* Leaf-2 */
-#define	IPPROTO_RDP		27		/* Reliable Data */
-#define	IPPROTO_IRTP		28		/* Reliable Transaction */
-#define	IPPROTO_TP		29 		/* tp-4 w/ class negotiation */
-#define	IPPROTO_BLT		30		/* Bulk Data Transfer */
-#define	IPPROTO_NSP		31		/* Network Services */
-#define	IPPROTO_INP		32		/* Merit Internodal */
-#define	IPPROTO_SEP		33		/* Sequential Exchange */
-#define	IPPROTO_3PC		34		/* Third Party Connect */
-#define	IPPROTO_IDPR		35		/* InterDomain Policy Routing */
-#define	IPPROTO_XTP		36		/* XTP */
-#define	IPPROTO_DDP		37		/* Datagram Delivery */
-#define	IPPROTO_CMTP		38		/* Control Message Transport */
-#define	IPPROTO_TPXX		39		/* TP++ Transport */
-#define	IPPROTO_IL		40		/* IL transport protocol */
-#define	IPPROTO_SIP		41		/* Simple Internet Protocol */
-#define	IPPROTO_SDRP		42		/* Source Demand Routing */
-#define	IPPROTO_SIPSR		43		/* SIP Source Route */
-#define	IPPROTO_SIPFRAG		44		/* SIP Fragment */
-#define	IPPROTO_IDRP		45		/* InterDomain Routing*/
-#define IPPROTO_RSVP		46 		/* resource reservation */
-#define	IPPROTO_GRE		47		/* General Routing Encap. */
-#define	IPPROTO_MHRP		48		/* Mobile Host Routing */
-#define	IPPROTO_BHA		49		/* BHA */
-#define	IPPROTO_ESP		50		/* SIPP Encap Sec. Payload */
-#define	IPPROTO_AH		51		/* SIPP Auth Header */
-#define	IPPROTO_INLSP		52		/* Integ. Net Layer Security */
-#define	IPPROTO_SWIPE		53		/* IP with encryption */
-#define	IPPROTO_NHRP		54		/* Next Hop Resolution */
-/* 55-60: Unassigned */
-#define	IPPROTO_AHIP		61		/* any host internal protocol */
-#define	IPPROTO_CFTP		62		/* CFTP */
-#define	IPPROTO_HELLO		63		/* "hello" routing protocol */
-#define	IPPROTO_SATEXPAK	64		/* SATNET/Backroom EXPAK */
-#define	IPPROTO_KRYPTOLAN	65		/* Kryptolan */
-#define	IPPROTO_RVD		66		/* Remote Virtual Disk */
-#define	IPPROTO_IPPC		67		/* Pluribus Packet Core */
-#define	IPPROTO_ADFS		68		/* Any distributed FS */
-#define	IPPROTO_SATMON		69		/* Satnet Monitoring */
-#define	IPPROTO_VISA		70		/* VISA Protocol */
-#define	IPPROTO_IPCV		71		/* Packet Core Utility */
-#define	IPPROTO_CPNX		72		/* Comp. Prot. Net. Executive */
-#define	IPPROTO_CPHB		73		/* Comp. Prot. HeartBeat */
-#define	IPPROTO_WSN		74		/* Wang Span Network */
-#define	IPPROTO_PVP		75		/* Packet Video Protocol */
-#define	IPPROTO_BRSATMON	76		/* BackRoom SATNET Monitoring */
-#define	IPPROTO_ND		77		/* Sun net disk proto (temp.) */
-#define	IPPROTO_WBMON		78		/* WIDEBAND Monitoring */
-#define	IPPROTO_WBEXPAK		79		/* WIDEBAND EXPAK */
-#define	IPPROTO_EON		80		/* ISO cnlp */
-#define	IPPROTO_VMTP		81		/* VMTP */
-#define	IPPROTO_SVMTP		82		/* Secure VMTP */
-#define	IPPROTO_VINES		83		/* Banyon VINES */
-#define	IPPROTO_TTP		84		/* TTP */
-#define	IPPROTO_IGP		85		/* NSFNET-IGP */
-#define	IPPROTO_DGP		86		/* dissimilar gateway prot. */
-#define	IPPROTO_TCF		87		/* TCF */
-#define	IPPROTO_IGRP		88		/* Cisco/GXS IGRP */
-#define	IPPROTO_OSPFIGP		89		/* OSPFIGP */
-#define	IPPROTO_SRPC		90		/* Strite RPC protocol */
-#define	IPPROTO_LARP		91		/* Locus Address Resoloution */
-#define	IPPROTO_MTP		92		/* Multicast Transport */
-#define	IPPROTO_AX25		93		/* AX.25 Frames */
-#define	IPPROTO_IPEIP		94		/* IP encapsulated in IP */
-#define	IPPROTO_MICP		95		/* Mobile Int.ing control */
-#define	IPPROTO_SCCSP		96		/* Semaphore Comm. security */
-#define	IPPROTO_ETHERIP		97		/* Ethernet IP encapsulation */
-#define	IPPROTO_ENCAP		98		/* encapsulation header */
-#define	IPPROTO_APES		99		/* any private encr. scheme */
-#define	IPPROTO_GMTP		100		/* GMTP*/
-/* 101-254: Unassigned */
-/* 255: Reserved */
-/* BSD Private, local use, namespace incursion */
-#define	IPPROTO_DIVERT		254		/* divert pseudo-protocol */
-#define	IPPROTO_RAW		255		/* raw IP packet */
-#define	IPPROTO_MAX		256
-
-
-/*
- * Local port number conventions:
- *
- * When a user does a bind(2) or connect(2) with a port number of zero,
- * a non-conflicting local port address is chosen.
- * The default range is IPPORT_RESERVED through
- * IPPORT_USERRESERVED, although that is settable by sysctl.
- *
- * A user may set the IPPROTO_IP option IP_PORTRANGE to change this
- * default assignment range.
- *
- * The value IP_PORTRANGE_DEFAULT causes the default behavior.
- *
- * The value IP_PORTRANGE_HIGH changes the range of candidate port numbers
- * into the "high" range.  These are reserved for client outbound connections
- * which do not want to be filtered by any firewalls.
- *
- * The value IP_PORTRANGE_LOW changes the range to the "low" are
- * that is (by convention) restricted to privileged processes.  This
- * convention is based on "vouchsafe" principles only.  It is only secure
- * if you trust the remote host to restrict these ports.
- *
- * The default range of ports and the high range can be changed by
- * sysctl(3).  (net.inet.ip.port{hi,low}{first,last}_auto)
- *
- * Changing those values has bad security implications if you are
- * using a a stateless firewall that is allowing packets outside of that
- * range in order to allow transparent outgoing connections.
- *
- * Such a firewall configuration will generally depend on the use of these
- * default values.  If you change them, you may find your Security
- * Administrator looking for you with a heavy object.
- */
-
-/*
- * Ports < IPPORT_RESERVED are reserved for
- * privileged processes (e.g. root).         (IP_PORTRANGE_LOW)
- * Ports > IPPORT_USERRESERVED are reserved
- * for servers, not necessarily privileged.  (IP_PORTRANGE_DEFAULT)
- */
-#define	IPPORT_RESERVED		1024
-#define	IPPORT_USERRESERVED	5000
-
-/*
- * Default local port range to use by setting IP_PORTRANGE_HIGH
- */
-#define	IPPORT_HIFIRSTAUTO	40000
-#define	IPPORT_HILASTAUTO	44999
-
-/*
- * Scanning for a free reserved port return a value below IPPORT_RESERVED,
- * but higher than IPPORT_RESERVEDSTART.  Traditionally the start value was
- * 512, but that conflicts with some well-known-services that firewalls may
- * have a fit if we use.
- */
-#define IPPORT_RESERVEDSTART	600
-
-/*
- * Internet address (a structure for historical reasons)
- */
-struct in_addr {
-	u_long s_addr;
-};
-
-/*
- * Definitions of bits in internet address integers.
- * On subnets, the decomposition of addresses to host and net parts
- * is done according to subnet mask, not the masks here.
- */
-#define	IN_CLASSA(i)		(((long)(i) & 0x80000000) == 0)
-#define	IN_CLASSA_NET		0xff000000
-#define	IN_CLASSA_NSHIFT	24
-#define	IN_CLASSA_HOST		0x00ffffff
-#define	IN_CLASSA_MAX		128
-
-#define	IN_CLASSB(i)		(((long)(i) & 0xc0000000) == 0x80000000)
-#define	IN_CLASSB_NET		0xffff0000
-#define	IN_CLASSB_NSHIFT	16
-#define	IN_CLASSB_HOST		0x0000ffff
-#define	IN_CLASSB_MAX		65536
-
-#define	IN_CLASSC(i)		(((long)(i) & 0xe0000000) == 0xc0000000)
-#define	IN_CLASSC_NET		0xffffff00
-#define	IN_CLASSC_NSHIFT	8
-#define	IN_CLASSC_HOST		0x000000ff
-
-#define	IN_CLASSD(i)		(((long)(i) & 0xf0000000) == 0xe0000000)
-#define	IN_CLASSD_NET		0xf0000000	/* These ones aren't really */
-#define	IN_CLASSD_NSHIFT	28		/* net and host fields, but */
-#define	IN_CLASSD_HOST		0x0fffffff	/* routing needn't know.    */
-#define	IN_MULTICAST(i)		IN_CLASSD(i)
-
-#define	IN_EXPERIMENTAL(i)	(((long)(i) & 0xf0000000) == 0xf0000000)
-#define	IN_BADCLASS(i)		(((long)(i) & 0xf0000000) == 0xf0000000)
-
-#define	INADDR_ANY		(u_long)0x00000000
-#define	INADDR_BROADCAST	(u_long)0xffffffff	/* must be masked */
-#ifndef KERNEL
-#define	INADDR_NONE		0xffffffff		/* -1 return */
-#endif
-
-#define	INADDR_UNSPEC_GROUP	(u_long)0xe0000000	/* 224.0.0.0 */
-#define	INADDR_ALLHOSTS_GROUP	(u_long)0xe0000001	/* 224.0.0.1 */
-#define	INADDR_ALLRTRS_GROUP	(u_long)0xe0000002	/* 224.0.0.2 */
-#define	INADDR_MAX_LOCAL_GROUP	(u_long)0xe00000ff	/* 224.0.0.255 */
-
-#define	IN_LOOPBACKNET		127			/* official! */
-
-/*
- * Socket address, internet style.
- */
-struct sockaddr_in {
-	u_char	sin_len;
-	u_char	sin_family;
-	u_short	sin_port;
-	struct	in_addr sin_addr;
-	char	sin_zero[8];
-};
-
-/*
- * Structure used to describe IP options.
- * Used to store options internally, to pass them to a process,
- * or to restore options retrieved earlier.
- * The ip_dst is used for the first-hop gateway when using a source route
- * (this gets put into the header proper).
- */
-struct ip_opts {
-	struct	in_addr ip_dst;		/* first hop, 0 w/o src rt */
-	char	ip_opts[40];		/* actually variable in size */
-};
-
-/*
- * Options for use with [gs]etsockopt at the IP level.
- * First word of comment is data type; bool is stored in int.
- */
-#define	IP_OPTIONS		1    /* buf/ip_opts; set/get IP options */
-#define	IP_HDRINCL		2    /* int; header is included with data */
-#define	IP_TOS			3    /* int; IP type of service and preced. */
-#define	IP_TTL			4    /* int; IP time to live */
-#define	IP_RECVOPTS		5    /* bool; receive all IP opts w/dgram */
-#define	IP_RECVRETOPTS		6    /* bool; receive IP opts for response */
-#define	IP_RECVDSTADDR		7    /* bool; receive IP dst addr w/dgram */
-#define	IP_RETOPTS		8    /* ip_opts; set/get IP options */
-#define	IP_MULTICAST_IF		9    /* u_char; set/get IP multicast i/f  */
-#define	IP_MULTICAST_TTL	10   /* u_char; set/get IP multicast ttl */
-#define	IP_MULTICAST_LOOP	11   /* u_char; set/get IP multicast loopback */
-#define	IP_ADD_MEMBERSHIP	12   /* ip_mreq; add an IP group membership */
-#define	IP_DROP_MEMBERSHIP	13   /* ip_mreq; drop an IP group membership */
-#define IP_MULTICAST_VIF	14   /* set/get IP mcast virt. iface */
-#define IP_RSVP_ON		15   /* enable RSVP in kernel */
-#define IP_RSVP_OFF		16   /* disable RSVP in kernel */
-#define IP_RSVP_VIF_ON		17   /* set RSVP per-vif socket */
-#define IP_RSVP_VIF_OFF		18   /* unset RSVP per-vif socket */
-#define IP_PORTRANGE		19   /* int; range to choose for unspec port */
-#define	IP_RECVIF		20   /* bool; receive reception if w/dgram */
-
-#define IP_FW_ADD     		50   /* add a firewall rule to chain */
-#define IP_FW_DEL    		51   /* delete a firewall rule from chain */
-#define IP_FW_FLUSH   		52   /* flush firewall rule chain */
-#define IP_FW_ZERO    		53   /* clear single/all firewall counter(s) */
-#define IP_FW_GET     		54   /* get entire firewall rule chain */
-#define IP_NAT			55   /* set/get NAT opts */
-
-/*
- * Defaults and limits for options
- */
-#define	IP_DEFAULT_MULTICAST_TTL  1	/* normally limit m'casts to 1 hop  */
-#define	IP_DEFAULT_MULTICAST_LOOP 1	/* normally hear sends if a member  */
-#define	IP_MAX_MEMBERSHIPS	20	/* per socket */
-
-/*
- * Argument structure for IP_ADD_MEMBERSHIP and IP_DROP_MEMBERSHIP.
- */
-struct ip_mreq {
-	struct	in_addr imr_multiaddr;	/* IP multicast address of group */
-	struct	in_addr imr_interface;	/* local IP address of interface */
-};
-
-/*
- * Argument for IP_PORTRANGE:
- * - which range to search when port is unspecified at bind() or connect()
- */
-#define	IP_PORTRANGE_DEFAULT	0	/* default range */
-#define	IP_PORTRANGE_HIGH	1	/* "high" - request firewall bypass */
-#define	IP_PORTRANGE_LOW	2	/* "low" - vouchsafe security */
-
-/*
- * Definitions for inet sysctl operations.
- *
- * Third level is protocol number.
- * Fourth level is desired variable within that protocol.
- */
-#define	IPPROTO_MAXID	(IPPROTO_IDP + 1)	/* don't list to IPPROTO_MAX */
-
-#define	CTL_IPPROTO_NAMES { \
-	{ "ip", CTLTYPE_NODE }, \
-	{ "icmp", CTLTYPE_NODE }, \
-	{ "igmp", CTLTYPE_NODE }, \
-	{ "ggp", CTLTYPE_NODE }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ "tcp", CTLTYPE_NODE }, \
-	{ 0, 0 }, \
-	{ "egp", CTLTYPE_NODE }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ "pup", CTLTYPE_NODE }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ "udp", CTLTYPE_NODE }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ "idp", CTLTYPE_NODE }, \
-}
-
-/*
- * Names for IP sysctl objects
- */
-#define	IPCTL_FORWARDING	1	/* act as router */
-#define	IPCTL_SENDREDIRECTS	2	/* may send redirects when forwarding */
-#define	IPCTL_DEFTTL		3	/* default TTL */
-#ifdef notyet
-#define	IPCTL_DEFMTU		4	/* default MTU */
-#endif
-#define IPCTL_RTEXPIRE		5	/* cloned route expiration time */
-#define IPCTL_RTMINEXPIRE	6	/* min value for expiration time */
-#define IPCTL_RTMAXCACHE	7	/* trigger level for dynamic expire */
-#define	IPCTL_SOURCEROUTE	8	/* may perform source routes */
-#define	IPCTL_DIRECTEDBROADCAST	9	/* may re-broadcast received packets */
-#define IPCTL_INTRQMAXLEN	10	/* max length of netisr queue */
-#define IPCTL_INTRQDROPS	11	/* number of netisr q drops */
-#define	IPCTL_ACCEPTSOURCEROUTE	13	/* may accept source routed packets */
-#define	IPCTL_MAXID		13
-
-#define	IPCTL_NAMES { \
-	{ 0, 0 }, \
-	{ "forwarding", CTLTYPE_INT }, \
-	{ "redirect", CTLTYPE_INT }, \
-	{ "ttl", CTLTYPE_INT }, \
-	{ "mtu", CTLTYPE_INT }, \
-	{ "rtexpire", CTLTYPE_INT }, \
-	{ "rtminexpire", CTLTYPE_INT }, \
-	{ "rtmaxcache", CTLTYPE_INT }, \
-	{ "sourceroute", CTLTYPE_INT }, \
- 	{ "directed-broadcast", CTLTYPE_INT }, \
-	{ "intr-queue-maxlen", CTLTYPE_INT }, \
-	{ "intr-queue-drops", CTLTYPE_INT }, \
-	{ "accept_sourceroute", CTLTYPE_INT }, \
-}
-
-
-#ifdef KERNEL
-struct ifnet; struct mbuf;	/* forward declarations for Standard C */
-
-int	 in_broadcast __P((struct in_addr, struct ifnet *));
-int	 in_canforward __P((struct in_addr));
-int	 in_cksum __P((struct mbuf *, int));
-int	 in_localaddr __P((struct in_addr));
-char 	*inet_ntoa __P((struct in_addr)); /* in libkern */
-
-/* Firewall hooks */
-struct ip;
-typedef	int ip_fw_chk_t __P((struct ip**, int, struct ifnet*, int, struct mbuf**));
-typedef	int ip_fw_ctl_t __P((int, struct mbuf**));
-extern	ip_fw_chk_t *ip_fw_chk_ptr;
-extern	ip_fw_ctl_t *ip_fw_ctl_ptr;
-
-/* IP NAT hooks */
-typedef	int ip_nat_t __P((struct ip**, struct mbuf**, struct ifnet*, int));
-typedef	int ip_nat_ctl_t __P((int, struct mbuf**));
-extern	ip_nat_t *ip_nat_ptr;
-extern	ip_nat_ctl_t *ip_nat_ctl_ptr;
-#define	IP_NAT_IN	0x00000001
-#define	IP_NAT_OUT	0x00000002
-
-#endif /* KERNEL */
-
-#endif
diff --git a/c/src/libnetworking/netinet/in_cksum.c b/c/src/libnetworking/netinet/in_cksum.c
deleted file mode 100644
index 9cffad3221..0000000000
--- a/c/src/libnetworking/netinet/in_cksum.c
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * Copyright (c) 1988, 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)in_cksum.c	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#include <sys/param.h>
-#include <sys/mbuf.h>
-
-/*
- *  Try to use a CPU specific version, then punt to the portable C one.
- */
-
-#if (defined(__GNUC__) && (defined(__mc68000__) || defined(__m68k__)))
-
-#include "in_cksum_m68k.c"
-
-#elif (defined(__GNUC__) && defined(__i386__))
-
-#include "in_cksum_i386.c"
-
-#else
-
-/*
- * Checksum routine for Internet Protocol family headers (Portable Version).
- *
- * This routine is very heavily used in the network
- * code and should be modified for each CPU to be as fast as possible.
- */
-
-#define ADDCARRY(x)  (x > 65535 ? x -= 65535 : x)
-#define REDUCE \
-  {l_util.l = sum; sum = l_util.s[0] + l_util.s[1];  ADDCARRY(sum);}
-
-int
-in_cksum(m, len)
-	register struct mbuf *m;
-	register int len;
-{
-	register u_short *w;
-	register int sum = 0;
-	register int mlen = 0;
-	int byte_swapped = 0;
-
-	union {
-		char	c[2];
-		u_short	s;
-	} s_util;
-	union {
-		u_short s[2];
-		long	l;
-	} l_util;
-
-	for (;m && len; m = m->m_next) {
-		if (m->m_len == 0)
-			continue;
-		w = mtod(m, u_short *);
-		if (mlen == -1) {
-			/*
-			 * The first byte of this mbuf is the continuation
-			 * of a word spanning between this mbuf and the
-			 * last mbuf.
-			 *
-			 * s_util.c[0] is already saved when scanning previous
-			 * mbuf.
-			 */
-			s_util.c[1] = *(char *)w;
-			sum += s_util.s;
-			w = (u_short *)((char *)w + 1);
-			mlen = m->m_len - 1;
-			len--;
-		} else
-			mlen = m->m_len;
-		if (len < mlen)
-			mlen = len;
-		len -= mlen;
-		/*
-		 * Force to even boundary.
-		 */
-		if ((1 & (int) w) && (mlen > 0)) {
-			REDUCE;
-			sum <<= 8;
-			s_util.c[0] = *(u_char *)w;
-			w = (u_short *)((char *)w + 1);
-			mlen--;
-			byte_swapped = 1;
-		}
-		/*
-		 * Unroll the loop to make overhead from
-		 * branches &c small.
-		 */
-		while ((mlen -= 32) >= 0) {
-			sum += w[0]; sum += w[1]; sum += w[2]; sum += w[3];
-			sum += w[4]; sum += w[5]; sum += w[6]; sum += w[7];
-			sum += w[8]; sum += w[9]; sum += w[10]; sum += w[11];
-			sum += w[12]; sum += w[13]; sum += w[14]; sum += w[15];
-			w += 16;
-		}
-		mlen += 32;
-		while ((mlen -= 8) >= 0) {
-			sum += w[0]; sum += w[1]; sum += w[2]; sum += w[3];
-			w += 4;
-		}
-		mlen += 8;
-		if (mlen == 0 && byte_swapped == 0)
-			continue;
-		REDUCE;
-		while ((mlen -= 2) >= 0) {
-			sum += *w++;
-		}
-		if (byte_swapped) {
-			REDUCE;
-			sum <<= 8;
-			byte_swapped = 0;
-			if (mlen == -1) {
-				s_util.c[1] = *(char *)w;
-				sum += s_util.s;
-				mlen = 0;
-			} else
-				mlen = -1;
-		} else if (mlen == -1)
-			s_util.c[0] = *(char *)w;
-	}
-	if (len)
-		printf("cksum: out of data\n");
-	if (mlen == -1) {
-		/* The last mbuf has odd # of bytes. Follow the
-		   standard (the odd byte may be shifted left by 8 bits
-		   or not as determined by endian-ness of the machine) */
-		s_util.c[1] = 0;
-		sum += s_util.s;
-	}
-	REDUCE;
-	return (~sum & 0xffff);
-}
-#endif
diff --git a/c/src/libnetworking/netinet/in_cksum_i386.c b/c/src/libnetworking/netinet/in_cksum_i386.c
deleted file mode 100644
index 2057ab3fd6..0000000000
--- a/c/src/libnetworking/netinet/in_cksum_i386.c
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * Checksum routine for Internet Protocol family headers.
- *
- * This routine is very heavily used in the network
- * code and should be modified for each CPU to be as fast as possible.
- *
- * This implementation is 386 version.
- *
- *  $Id$
- */
-
-#undef	ADDCARRY
-#define ADDCARRY(x)     if ((x) > 0xffff) (x) -= 0xffff
-#define REDUCE          {sum = (sum & 0xffff) + (sum >> 16); ADDCARRY(sum);}
-
-/*
- * Thanks to gcc we don't have to guess
- * which registers contain sum & w.
- */
-#define ADD(n)	asm("addl " #n "(%2), %0" : "=r" (sum) : "0" (sum), "r" (w))
-#define ADDC(n)	asm("adcl " #n "(%2), %0" : "=r" (sum) : "0" (sum), "r" (w))
-#define LOAD(n)	asm volatile("movb " #n "(%1), %0" : "=r" (junk) : "r" (w))
-#define MOP	asm("adcl         $0, %0" : "=r" (sum) : "0" (sum))
-
-int
-in_cksum(m, len)
-	register struct mbuf *m;
-	register int len;
-{
-	register u_short *w;
-	register unsigned sum = 0;
-	register int mlen = 0;
-	int byte_swapped = 0;
-	union { char	c[2]; u_short	s; } su;
-
-	for (;m && len; m = m->m_next) {
-		if (m->m_len == 0)
-			continue;
-		w = mtod(m, u_short *);
-		if (mlen == -1) {
-			/*
-			 * The first byte of this mbuf is the continuation
-			 * of a word spanning between this mbuf and the
-			 * last mbuf.
-			 */
-
-			/* su.c[0] is already saved when scanning previous
-			 * mbuf.  sum was REDUCEd when we found mlen == -1
-			 */
-			su.c[1] = *(u_char *)w;
-			sum += su.s;
-			w = (u_short *)((char *)w + 1);
-			mlen = m->m_len - 1;
-			len--;
-		} else
-			mlen = m->m_len;
-		if (len < mlen)
-			mlen = len;
-		len -= mlen;
-		/*
-		 * Force to long boundary so we do longword aligned
-		 * memory operations
-		 */
-		if (3 & (int) w) {
-			REDUCE;
-			if ((1 & (int) w) && (mlen > 0)) {
-				sum <<= 8;
-				su.c[0] = *(char *)w;
-				w = (u_short *)((char *)w + 1);
-				mlen--;
-				byte_swapped = 1;
-			}
-			if ((2 & (int) w) && (mlen >= 2)) {
-				sum += *w++;
-				mlen -= 2;
-			}
-		}
-		/*
-		 * Advance to a 486 cache line boundary.
-		 */
-		if (4 & (int) w && mlen >= 4) {
-			ADD(0);
-			MOP;
-			w += 2;
-			mlen -= 4;
-		}
-		if (8 & (int) w && mlen >= 8) {
-			ADD(0);
-			ADDC(4);
-			MOP;
-			w += 4;
-			mlen -= 8;
-		}
-		/*
-		 * Do as much of the checksum as possible 32 bits at at time.
-		 * In fact, this loop is unrolled to make overhead from
-		 * branches &c small.
-		 */
-		mlen -= 1;
-		while ((mlen -= 32) >= 0) {
-			u_char junk;
-			/*
-			 * Add with carry 16 words and fold in the last
-			 * carry by adding a 0 with carry.
-			 *
-			 * The early ADD(16) and the LOAD(32) are to load
-			 * the next 2 cache lines in advance on 486's.  The
-			 * 486 has a penalty of 2 clock cycles for loading
-			 * a cache line, plus whatever time the external
-			 * memory takes to load the first word(s) addressed.
-			 * These penalties are unavoidable.  Subsequent
-			 * accesses to a cache line being loaded (and to
-			 * other external memory?) are delayed until the
-			 * whole load finishes.  These penalties are mostly
-			 * avoided by not accessing external memory for
-			 * 8 cycles after the ADD(16) and 12 cycles after
-			 * the LOAD(32).  The loop terminates when mlen
-			 * is initially 33 (not 32) to guaranteed that
-			 * the LOAD(32) is within bounds.
-			 */
-			ADD(16);
-			ADDC(0);
-			ADDC(4);
-			ADDC(8);
-			ADDC(12);
-			LOAD(32);
-			ADDC(20);
-			ADDC(24);
-			ADDC(28);
-			MOP;
-			w += 16;
-		}
-		mlen += 32 + 1;
-		if (mlen >= 32) {
-			ADD(16);
-			ADDC(0);
-			ADDC(4);
-			ADDC(8);
-			ADDC(12);
-			ADDC(20);
-			ADDC(24);
-			ADDC(28);
-			MOP;
-			w += 16;
-			mlen -= 32;
-		}
-		if (mlen >= 16) {
-			ADD(0);
-			ADDC(4);
-			ADDC(8);
-			ADDC(12);
-			MOP;
-			w += 8;
-			mlen -= 16;
-		}
-		if (mlen >= 8) {
-			ADD(0);
-			ADDC(4);
-			MOP;
-			w += 4;
-			mlen -= 8;
-		}
-		if (mlen == 0 && byte_swapped == 0)
-			continue;       /* worth 1% maybe ?? */
-		REDUCE;
-		while ((mlen -= 2) >= 0) {
-			sum += *w++;
-		}
-		if (byte_swapped) {
-			sum <<= 8;
-			byte_swapped = 0;
-			if (mlen == -1) {
-				su.c[1] = *(char *)w;
-				sum += su.s;
-				mlen = 0;
-			} else
-				mlen = -1;
-		} else if (mlen == -1)
-			/*
-			 * This mbuf has odd number of bytes.
-			 * There could be a word split betwen
-			 * this mbuf and the next mbuf.
-			 * Save the last byte (to prepend to next mbuf).
-			 */
-			su.c[0] = *(char *)w;
-	}
-
-	if (len)
-		printf("cksum: out of data\n");
-	if (mlen == -1) {
-		/* The last mbuf has odd # of bytes. Follow the
-		   standard (the odd byte is shifted left by 8 bits) */
-		su.c[1] = 0;
-		sum += su.s;
-	}
-	REDUCE;
-	return (~sum & 0xffff);
-}
diff --git a/c/src/libnetworking/netinet/in_cksum_m68k.c b/c/src/libnetworking/netinet/in_cksum_m68k.c
deleted file mode 100644
index 58199c3adf..0000000000
--- a/c/src/libnetworking/netinet/in_cksum_m68k.c
+++ /dev/null
@@ -1,223 +0,0 @@
-/*
- * Copyright (c) 1988, 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)in_cksum.c	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#include <sys/param.h>
-#include <sys/mbuf.h>
-
-#if (defined (__mcf5200__))
-# define IS_COLDFIRE 1
-#else
-# define IS_COLDFIRE 0
-#endif
-
-#define REDUCE { sum = (sum & 0xFFFF) + (sum >> 16); if (sum > 0xFFFF) sum -= 0xFFFF; }
-
-/*
- * Motorola 68k version of Internet Protocol Checksum routine
- * W. Eric Norum
- * Saskatchewan Accelerator Laboratory
- * August, 1998
- */
-int
-in_cksum(m, len)
-	struct mbuf *m;
-	int len;
-{
-	unsigned short *w;
-	unsigned long sum = 0;
-	int mlen = 0;
-	int byte_swapped = 0;
-	union {
-		char	c[2];
-		u_short	s;
-	} s_util;
-
-	for ( ; m && len ; m = m->m_next) {
-		if (m->m_len == 0)
-			continue;
-		w = mtod(m, u_short *);
-		if (mlen == -1) {
-			/*
-			 * The first byte of this mbuf is the continuation
-			 * of a word spanning between this mbuf and the
-			 * last mbuf.
-			 *
-			 * s_util.c[0] is already saved when scanning previous
-			 * mbuf.
-			 */
-			s_util.c[1] = *(char *)w;
-			sum += s_util.s;
-			w = (u_short *)((char *)w + 1);
-			mlen = m->m_len - 1;
-			len--;
-		} else
-			mlen = m->m_len;
-		if (len < mlen)
-			mlen = len;
-		len -= mlen;
-
-		/*
-		 * Force to longword boundary.
-		 */
-		if (3 & (int)w) {
-			REDUCE;
-			if ((1 & (int) w) && (mlen > 0)) {
-				sum <<= 8;
-				s_util.c[0] = *(u_char *)w;
-				w = (u_short *)((char *)w + 1);
-				mlen--;
-				byte_swapped = 1;
-			}
-			if ((2 & (int) w) && (mlen >= 2)) {
-				sum += *w++;
-				mlen -= 2;
-			}
-		}
-
-		/*
-		 * Sum all the longwords in the buffer.
-		 * See RFC 1071 -- Computing the Internet Checksum.
-		 * It should work for all 68k family members.
-		 */
-		{
-		unsigned long tcnt = mlen, t1;
-		__asm__ volatile (
-		"movel   %2,%3\n\t"
-		"lsrl    #6,%2       | count/64 = # loop traversals\n\t"
-		"andl    #0x3c,%3    | Then find fractions of a chunk\n\t"
-		"negl    %3\n\t      | Each long uses 4 instruction bytes\n\t"
-#if IS_COLDFIRE
-		"addql   #1,%2       | Clear X (extended carry flag)\n\t"
-		"subql   #1,%2       | \n\t"
-#else
-		"andi    #0xf,%%cc   | Clear X (extended carry flag)\n\t"
-#endif
-		"jmp     %%pc@(lcsum2_lbl-.-2:b,%3)  | Jump into loop\n"
-		"lcsum1_lbl:         | Begin inner loop...\n\t"
-		"movel   %1@+,%3     |  0: Fetch 32-bit word\n\t"
-		"addxl   %3,%0       |    Add word + previous carry\n\t"
-		"movel   %1@+,%3     |  1: Fetch 32-bit word\n\t"
-		"addxl   %3,%0       |    Add word + previous carry\n\t"
-		"movel   %1@+,%3     |  2: Fetch 32-bit word\n\t"
-		"addxl   %3,%0       |    Add word + previous carry\n\t"
-		"movel   %1@+,%3     |  3: Fetch 32-bit word\n\t"
-		"addxl   %3,%0       |    Add word + previous carry\n\t"
-		"movel   %1@+,%3     |  4: Fetch 32-bit word\n\t"
-		"addxl   %3,%0       |    Add word + previous carry\n\t"
-		"movel   %1@+,%3     |  5: Fetch 32-bit word\n\t"
-		"addxl   %3,%0       |    Add word + previous carry\n\t"
-		"movel   %1@+,%3     |  6: Fetch 32-bit word\n\t"
-		"addxl   %3,%0       |    Add word + previous carry\n\t"
-		"movel   %1@+,%3     |  7: Fetch 32-bit word\n\t"
-		"addxl   %3,%0       |    Add word + previous carry\n\t"
-		"movel   %1@+,%3     |  8: Fetch 32-bit word\n\t"
-		"addxl   %3,%0       |    Add word + previous carry\n\t"
-		"movel   %1@+,%3     |  9: Fetch 32-bit word\n\t"
-		"addxl   %3,%0       |    Add word + previous carry\n\t"
-		"movel   %1@+,%3     |  A: Fetch 32-bit word\n\t"
-		"addxl   %3,%0       |    Add word + previous carry\n\t"
-		"movel   %1@+,%3     |  B: Fetch 32-bit word\n\t"
-		"addxl   %3,%0       |    Add word + previous carry\n\t"
-		"movel   %1@+,%3     |  C: Fetch 32-bit word\n\t"
-		"addxl   %3,%0       |    Add word + previous carry\n\t"
-		"movel   %1@+,%3     |  D: Fetch 32-bit word\n\t"
-		"addxl   %3,%0       |    Add word + previous carry\n\t"
-		"movel   %1@+,%3     |  E: Fetch 32-bit word\n\t"
-		"addxl   %3,%0       |    Add word + previous carry\n\t"
-		"movel   %1@+,%3     |  F: Fetch 32-bit word\n\t"
-		"addxl   %3,%0       |    Add word + previous carry\n"
-		"lcsum2_lbl:         |  End of unrolled loop\n\t"
-#if IS_COLDFIRE
-		"moveq   #0,%3       | Add in last carry\n\t"
-		"addxl   %3,%0       |\n\t"
-		"subql 	 #1,%2       | Update loop count\n\t"
-		"bplb    lcsum1_lbl  | Loop (with X clear) if not done\n\t"
-		"movel   #0xffff,%2  | Get word mask\n\t"
-		"movel   %0,%3       | Fold 32 bit sum to 16 bits\n\t"
-		"swap    %3          |\n\t"
-		"andl    %2,%0       | Mask to 16-bit sum\n\t"
-		"andl    %2,%3       | Mask to 16-bit sum\n\t"
-		"addl    %3,%0       |\n\t"
-		"movel   %0,%3       | Add in last carry\n\t"
-		"swap    %3          |\n\t"
-		"addl    %3,%0       |\n\t"
-		"andl    %2,%0       | Mask to 16-bit sum\n\t"
-#else
-		"dbf     %2,lcsum1_lbl | (NB- dbf doesn't affect X)\n\t"
-		"movel   %0,%3       | Fold 32 bit sum to 16 bits\n\t"
-		"swap    %3          | (NB- swap doesn't affect X)\n\t"
-		"addxw   %3,%0       |\n\t"
-		"moveq   #0,%3       | Add in last carry\n\t"
-		"addxw   %3,%0       |\n\t"
-		"andl    #0xffff,%0  | Mask to 16-bit sum\n"
-#endif
-			:
-			"=d" (sum), "=a" (w), "=d" (tcnt) , "=d" (t1) :
-			"0" (sum), "1" (w), "2" (tcnt) :
-			"cc", "memory");
-		}
-		mlen &= 3;
-
-		/*
-		 * Soak up the last 1, 2 or 3 bytes
-		 */
-		while ((mlen -= 2) >= 0)
-			sum += *w++;
-		if (byte_swapped) {
-			REDUCE;
-			sum <<= 8;
-			byte_swapped = 0;
-			if (mlen == -1) {
-				s_util.c[1] = *(char *)w;
-				sum += s_util.s;
-				mlen = 0;
-			} else
-				mlen = -1;
-		} else if (mlen == -1)
-			s_util.c[0] = *(char *)w;
-	}
-	if (len)
-		sum = 0xDEAD;
-	if (mlen == -1) {
-		/* The last mbuf has odd # of bytes. Follow the
-		   standard (the odd byte may be shifted left by 8 bits
-		   or not as determined by endian-ness of the machine) */
-		s_util.c[1] = 0;
-		sum += s_util.s;
-	}
-	REDUCE;
-	return (~sum & 0xffff);
-}
diff --git a/c/src/libnetworking/netinet/in_pcb.c b/c/src/libnetworking/netinet/in_pcb.c
deleted file mode 100644
index 116f70eebf..0000000000
--- a/c/src/libnetworking/netinet/in_pcb.c
+++ /dev/null
@@ -1,757 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1991, 1993, 1995
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)in_pcb.c	8.4 (Berkeley) 5/24/95
- *	$Id$
- */
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/systm.h>
-#include <sys/malloc.h>
-#include <sys/mbuf.h>
-#include <sys/protosw.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/ioctl.h>
-#include <sys/errno.h>
-#include <sys/time.h>
-#include <sys/proc.h>
-#include <sys/kernel.h>
-#include <sys/sysctl.h>
-
-#include <net/if.h>
-#include <net/route.h>
-
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/in_pcb.h>
-#include <netinet/in_var.h>
-#include <netinet/ip_var.h>
-
-struct	in_addr zeroin_addr;
-
-static void	 in_pcbinshash __P((struct inpcb *));
-static void	 in_rtchange __P((struct inpcb *, int));
-
-/*
- * These configure the range of local port addresses assigned to
- * "unspecified" outgoing connections/packets/whatever.
- */
-static int ipport_lowfirstauto  = IPPORT_RESERVED - 1;	/* 1023 */
-static int ipport_lowlastauto = IPPORT_RESERVEDSTART;	/* 600 */
-static int ipport_firstauto = IPPORT_RESERVED;		/* 1024 */
-static int ipport_lastauto  = IPPORT_USERRESERVED;	/* 5000 */
-static int ipport_hifirstauto = IPPORT_HIFIRSTAUTO;	/* 40000 */
-static int ipport_hilastauto  = IPPORT_HILASTAUTO;	/* 44999 */
-
-#define RANGECHK(var, min, max) \
-	if ((var) < (min)) { (var) = (min); } \
-	else if ((var) > (max)) { (var) = (max); }
-
-#if 0
-static int
-sysctl_net_ipport_check SYSCTL_HANDLER_ARGS
-{
-	int error = sysctl_handle_int(oidp,
-		oidp->oid_arg1, oidp->oid_arg2, req);
-	if (!error) {
-		RANGECHK(ipport_lowfirstauto, 1, IPPORT_RESERVED - 1);
-		RANGECHK(ipport_lowlastauto, 1, IPPORT_RESERVED - 1);
-		RANGECHK(ipport_firstauto, IPPORT_RESERVED, USHRT_MAX);
-		RANGECHK(ipport_lastauto, IPPORT_RESERVED, USHRT_MAX);
-		RANGECHK(ipport_hifirstauto, IPPORT_RESERVED, USHRT_MAX);
-		RANGECHK(ipport_hilastauto, IPPORT_RESERVED, USHRT_MAX);
-	}
-	return error;
-}
-#endif
-
-#undef RANGECHK
-
-SYSCTL_NODE(_net_inet_ip, IPPROTO_IP, portrange, CTLFLAG_RW, 0, "IP Ports");
-
-SYSCTL_PROC(_net_inet_ip_portrange, OID_AUTO, lowfirst, CTLTYPE_INT|CTLFLAG_RW,
-	   &ipport_lowfirstauto, 0, &sysctl_net_ipport_check, "I", "");
-SYSCTL_PROC(_net_inet_ip_portrange, OID_AUTO, lowlast, CTLTYPE_INT|CTLFLAG_RW,
-	   &ipport_lowlastauto, 0, &sysctl_net_ipport_check, "I", "");
-SYSCTL_PROC(_net_inet_ip_portrange, OID_AUTO, first, CTLTYPE_INT|CTLFLAG_RW,
-	   &ipport_firstauto, 0, &sysctl_net_ipport_check, "I", "");
-SYSCTL_PROC(_net_inet_ip_portrange, OID_AUTO, last, CTLTYPE_INT|CTLFLAG_RW,
-	   &ipport_lastauto, 0, &sysctl_net_ipport_check, "I", "");
-SYSCTL_PROC(_net_inet_ip_portrange, OID_AUTO, hifirst, CTLTYPE_INT|CTLFLAG_RW,
-	   &ipport_hifirstauto, 0, &sysctl_net_ipport_check, "I", "");
-SYSCTL_PROC(_net_inet_ip_portrange, OID_AUTO, hilast, CTLTYPE_INT|CTLFLAG_RW,
-	   &ipport_hilastauto, 0, &sysctl_net_ipport_check, "I", "");
-
-int
-in_pcballoc(so, pcbinfo)
-	struct socket *so;
-	struct inpcbinfo *pcbinfo;
-{
-	register struct inpcb *inp;
-	int s;
-
-	MALLOC(inp, struct inpcb *, sizeof(*inp), M_PCB, M_NOWAIT);
-	if (inp == NULL)
-		return (ENOBUFS);
-	bzero((caddr_t)inp, sizeof(*inp));
-	inp->inp_pcbinfo = pcbinfo;
-	inp->inp_socket = so;
-	s = splnet();
-	LIST_INSERT_HEAD(pcbinfo->listhead, inp, inp_list);
-	in_pcbinshash(inp);
-	splx(s);
-	so->so_pcb = (caddr_t)inp;
-	return (0);
-}
-
-int
-in_pcbbind(inp, nam)
-	register struct inpcb *inp;
-	struct mbuf *nam;
-{
-	register struct socket *so = inp->inp_socket;
-	unsigned short *lastport;
-	struct sockaddr_in *sin;
-	u_short lport = 0;
-	int wild = 0, reuseport = (so->so_options & SO_REUSEPORT);
-	int error;
-
-	if (in_ifaddr == 0)
-		return (EADDRNOTAVAIL);
-	if (inp->inp_lport || inp->inp_laddr.s_addr != INADDR_ANY)
-		return (EINVAL);
-	if ((so->so_options & (SO_REUSEADDR|SO_REUSEPORT)) == 0 &&
-	    ((so->so_proto->pr_flags & PR_CONNREQUIRED) == 0 ||
-	     (so->so_options & SO_ACCEPTCONN) == 0))
-		wild = 1;
-	if (nam) {
-		sin = mtod(nam, struct sockaddr_in *);
-		if (nam->m_len != sizeof (*sin))
-			return (EINVAL);
-#ifdef notdef
-		/*
-		 * We should check the family, but old programs
-		 * incorrectly fail to initialize it.
-		 */
-		if (sin->sin_family != AF_INET)
-			return (EAFNOSUPPORT);
-#endif
-		lport = sin->sin_port;
-		if (IN_MULTICAST(ntohl(sin->sin_addr.s_addr))) {
-			/*
-			 * Treat SO_REUSEADDR as SO_REUSEPORT for multicast;
-			 * allow complete duplication of binding if
-			 * SO_REUSEPORT is set, or if SO_REUSEADDR is set
-			 * and a multicast address is bound on both
-			 * new and duplicated sockets.
-			 */
-			if (so->so_options & SO_REUSEADDR)
-				reuseport = SO_REUSEADDR|SO_REUSEPORT;
-		} else if (sin->sin_addr.s_addr != INADDR_ANY) {
-			sin->sin_port = 0;		/* yech... */
-			if (ifa_ifwithaddr((struct sockaddr *)sin) == 0)
-				return (EADDRNOTAVAIL);
-		}
-		if (lport) {
-			struct inpcb *t;
-
-			/* GROSS */
-			if (ntohs(lport) < IPPORT_RESERVED &&
-			    (error = suser(p->p_ucred, &p->p_acflag)))
-				return (EACCES);
-			if (so->so_uid) {
-				t = in_pcblookup(inp->inp_pcbinfo, zeroin_addr,
-				    0, sin->sin_addr, lport,
-				    INPLOOKUP_WILDCARD);
-				if (t && (so->so_uid != t->inp_socket->so_uid))
-					return (EADDRINUSE);
-			}
-			t = in_pcblookup(inp->inp_pcbinfo, zeroin_addr, 0,
-			    sin->sin_addr, lport, wild);
-			if (t && (reuseport & t->inp_socket->so_options) == 0)
-				return (EADDRINUSE);
-		}
-		inp->inp_laddr = sin->sin_addr;
-	}
-	if (lport == 0) {
-		ushort first, last;
-		int count;
-
-		inp->inp_flags |= INP_ANONPORT;
-
-		if (inp->inp_flags & INP_HIGHPORT) {
-			first = ipport_hifirstauto;	/* sysctl */
-			last  = ipport_hilastauto;
-			lastport = &inp->inp_pcbinfo->lasthi;
-		} else if (inp->inp_flags & INP_LOWPORT) {
-			if ((error = suser(p->p_ucred, &p->p_acflag)))
-				return (EACCES);
-			first = ipport_lowfirstauto;	/* 1023 */
-			last  = ipport_lowlastauto;	/* 600 */
-			lastport = &inp->inp_pcbinfo->lastlow;
-		} else {
-			first = ipport_firstauto;	/* sysctl */
-			last  = ipport_lastauto;
-			lastport = &inp->inp_pcbinfo->lastport;
-		}
-		/*
-		 * Simple check to ensure all ports are not used up causing
-		 * a deadlock here.
-		 *
-		 * We split the two cases (up and down) so that the direction
-		 * is not being tested on each round of the loop.
-		 */
-		if (first > last) {
-			/*
-			 * counting down
-			 */
-			count = first - last;
-
-			do {
-				if (count-- <= 0)	/* completely used? */
-					return (EADDRNOTAVAIL);
-				--*lastport;
-				if (*lastport > first || *lastport < last)
-					*lastport = first;
-				lport = htons(*lastport);
-			} while (in_pcblookup(inp->inp_pcbinfo,
-				 zeroin_addr, 0, inp->inp_laddr, lport, wild));
-		} else {
-			/*
-			 * counting up
-			 */
-			count = last - first;
-
-			do {
-				if (count-- <= 0)	/* completely used? */
-					return (EADDRNOTAVAIL);
-				++*lastport;
-				if (*lastport < first || *lastport > last)
-					*lastport = first;
-				lport = htons(*lastport);
-			} while (in_pcblookup(inp->inp_pcbinfo,
-				 zeroin_addr, 0, inp->inp_laddr, lport, wild));
-		}
-	}
-	inp->inp_lport = lport;
-	in_pcbrehash(inp);
-	return (0);
-}
-
-/*
- *   Transform old in_pcbconnect() into an inner subroutine for new
- *   in_pcbconnect(): Do some validity-checking on the remote
- *   address (in mbuf 'nam') and then determine local host address
- *   (i.e., which interface) to use to access that remote host.
- *
- *   This preserves definition of in_pcbconnect(), while supporting a
- *   slightly different version for T/TCP.  (This is more than
- *   a bit of a kludge, but cleaning up the internal interfaces would
- *   have forced minor changes in every protocol).
- */
-
-int
-in_pcbladdr(inp, nam, plocal_sin)
-	register struct inpcb *inp;
-	struct mbuf *nam;
-	struct sockaddr_in **plocal_sin;
-{
-	struct in_ifaddr *ia;
-	register struct sockaddr_in *sin = mtod(nam, struct sockaddr_in *);
-
-	if (nam->m_len != sizeof (*sin))
-		return (EINVAL);
-	if (sin->sin_family != AF_INET)
-		return (EAFNOSUPPORT);
-	if (sin->sin_port == 0)
-		return (EADDRNOTAVAIL);
-	if (in_ifaddr) {
-		/*
-		 * If the destination address is INADDR_ANY,
-		 * use the primary local address.
-		 * If the supplied address is INADDR_BROADCAST,
-		 * and the primary interface supports broadcast,
-		 * choose the broadcast address for that interface.
-		 */
-#define	satosin(sa)	((struct sockaddr_in *)(sa))
-#define sintosa(sin)	((struct sockaddr *)(sin))
-#define ifatoia(ifa)	((struct in_ifaddr *)(ifa))
-		if (sin->sin_addr.s_addr == INADDR_ANY)
-		    sin->sin_addr = IA_SIN(in_ifaddr)->sin_addr;
-		else if (sin->sin_addr.s_addr == (u_long)INADDR_BROADCAST &&
-		  (in_ifaddr->ia_ifp->if_flags & IFF_BROADCAST))
-		    sin->sin_addr = satosin(&in_ifaddr->ia_broadaddr)->sin_addr;
-	}
-	if (inp->inp_laddr.s_addr == INADDR_ANY) {
-		register struct route *ro;
-
-		ia = (struct in_ifaddr *)0;
-		/*
-		 * If route is known or can be allocated now,
-		 * our src addr is taken from the i/f, else punt.
-		 */
-		ro = &inp->inp_route;
-		if (ro->ro_rt &&
-		    (satosin(&ro->ro_dst)->sin_addr.s_addr !=
-			sin->sin_addr.s_addr ||
-		    inp->inp_socket->so_options & SO_DONTROUTE)) {
-			RTFREE(ro->ro_rt);
-			ro->ro_rt = (struct rtentry *)0;
-		}
-		if ((inp->inp_socket->so_options & SO_DONTROUTE) == 0 && /*XXX*/
-		    (ro->ro_rt == (struct rtentry *)0 ||
-		    ro->ro_rt->rt_ifp == (struct ifnet *)0)) {
-			/* No route yet, so try to acquire one */
-			ro->ro_dst.sa_family = AF_INET;
-			ro->ro_dst.sa_len = sizeof(struct sockaddr_in);
-			((struct sockaddr_in *) &ro->ro_dst)->sin_addr =
-				sin->sin_addr;
-			rtalloc(ro);
-		}
-		/*
-		 * If we found a route, use the address
-		 * corresponding to the outgoing interface
-		 * unless it is the loopback (in case a route
-		 * to our address on another net goes to loopback).
-		 */
-		if (ro->ro_rt && !(ro->ro_rt->rt_ifp->if_flags & IFF_LOOPBACK))
-			ia = ifatoia(ro->ro_rt->rt_ifa);
-		if (ia == 0) {
-			u_short fport = sin->sin_port;
-
-			sin->sin_port = 0;
-			ia = ifatoia(ifa_ifwithdstaddr(sintosa(sin)));
-			if (ia == 0)
-				ia = ifatoia(ifa_ifwithnet(sintosa(sin)));
-			sin->sin_port = fport;
-			if (ia == 0)
-				ia = in_ifaddr;
-			if (ia == 0)
-				return (EADDRNOTAVAIL);
-		}
-		/*
-		 * If the destination address is multicast and an outgoing
-		 * interface has been set as a multicast option, use the
-		 * address of that interface as our source address.
-		 */
-		if (IN_MULTICAST(ntohl(sin->sin_addr.s_addr)) &&
-		    inp->inp_moptions != NULL) {
-			struct ip_moptions *imo;
-			struct ifnet *ifp;
-
-			imo = inp->inp_moptions;
-			if (imo->imo_multicast_ifp != NULL) {
-				ifp = imo->imo_multicast_ifp;
-				for (ia = in_ifaddr; ia; ia = ia->ia_next)
-					if (ia->ia_ifp == ifp)
-						break;
-				if (ia == 0)
-					return (EADDRNOTAVAIL);
-			}
-		}
-	/*
-	 * Don't do pcblookup call here; return interface in plocal_sin
-	 * and exit to caller, that will do the lookup.
-	 */
-		*plocal_sin = &ia->ia_addr;
-
-	}
-	return(0);
-}
-
-/*
- * Outer subroutine:
- * Connect from a socket to a specified address.
- * Both address and port must be specified in argument sin.
- * If don't have a local address for this socket yet,
- * then pick one.
- */
-int
-in_pcbconnect(inp, nam)
-	register struct inpcb *inp;
-	struct mbuf *nam;
-{
-	struct sockaddr_in *ifaddr;
-	register struct sockaddr_in *sin = mtod(nam, struct sockaddr_in *);
-	int error;
-
-	/*
-	 *   Call inner routine, to assign local interface address.
-	 */
-	if ((error = in_pcbladdr(inp, nam, &ifaddr)))
-		return(error);
-
-	if (in_pcblookuphash(inp->inp_pcbinfo, sin->sin_addr, sin->sin_port,
-	    inp->inp_laddr.s_addr ? inp->inp_laddr : ifaddr->sin_addr,
-	    inp->inp_lport, 0) != NULL)
-		return (EADDRINUSE);
-	if (inp->inp_laddr.s_addr == INADDR_ANY) {
-		if (inp->inp_lport == 0)
-			(void)in_pcbbind(inp, (struct mbuf *)0);
-		inp->inp_laddr = ifaddr->sin_addr;
-	}
-	inp->inp_faddr = sin->sin_addr;
-	inp->inp_fport = sin->sin_port;
-	in_pcbrehash(inp);
-	return (0);
-}
-
-void
-in_pcbdisconnect(inp)
-	struct inpcb *inp;
-{
-
-	inp->inp_faddr.s_addr = INADDR_ANY;
-	inp->inp_fport = 0;
-	in_pcbrehash(inp);
-	if (inp->inp_socket->so_state & SS_NOFDREF)
-		in_pcbdetach(inp);
-}
-
-void
-in_pcbdetach(inp)
-	struct inpcb *inp;
-{
-	struct socket *so = inp->inp_socket;
-	int s;
-
-	so->so_pcb = 0;
-	sofree(so);
-	if (inp->inp_options)
-		(void)m_free(inp->inp_options);
-	if (inp->inp_route.ro_rt)
-		rtfree(inp->inp_route.ro_rt);
-	ip_freemoptions(inp->inp_moptions);
-	s = splnet();
-	LIST_REMOVE(inp, inp_hash);
-	LIST_REMOVE(inp, inp_list);
-	splx(s);
-	FREE(inp, M_PCB);
-}
-
-void
-in_setsockaddr(inp, nam)
-	register struct inpcb *inp;
-	struct mbuf *nam;
-{
-	register struct sockaddr_in *sin;
-
-	nam->m_len = sizeof (*sin);
-	sin = mtod(nam, struct sockaddr_in *);
-	bzero((caddr_t)sin, sizeof (*sin));
-	sin->sin_family = AF_INET;
-	sin->sin_len = sizeof(*sin);
-	sin->sin_port = inp->inp_lport;
-	sin->sin_addr = inp->inp_laddr;
-}
-
-void
-in_setpeeraddr(inp, nam)
-	struct inpcb *inp;
-	struct mbuf *nam;
-{
-	register struct sockaddr_in *sin;
-
-	nam->m_len = sizeof (*sin);
-	sin = mtod(nam, struct sockaddr_in *);
-	bzero((caddr_t)sin, sizeof (*sin));
-	sin->sin_family = AF_INET;
-	sin->sin_len = sizeof(*sin);
-	sin->sin_port = inp->inp_fport;
-	sin->sin_addr = inp->inp_faddr;
-}
-
-/*
- * Pass some notification to all connections of a protocol
- * associated with address dst.  The local address and/or port numbers
- * may be specified to limit the search.  The "usual action" will be
- * taken, depending on the ctlinput cmd.  The caller must filter any
- * cmds that are uninteresting (e.g., no error in the map).
- * Call the protocol specific routine (if any) to report
- * any errors for each matching socket.
- *
- * Must be called at splnet.
- */
-void
-in_pcbnotify(head, dst, fport_arg, laddr, lport_arg, cmd, notify)
-	struct inpcbhead *head;
-	struct sockaddr *dst;
-	u_int fport_arg, lport_arg;
-	struct in_addr laddr;
-	int cmd;
-	void (*notify) __P((struct inpcb *, int));
-{
-	register struct inpcb *inp, *oinp;
-	struct in_addr faddr;
-	u_short fport = fport_arg, lport = lport_arg;
-	int errnum, s;
-
-	if ((unsigned)cmd > PRC_NCMDS || dst->sa_family != AF_INET)
-		return;
-	faddr = ((struct sockaddr_in *)dst)->sin_addr;
-	if (faddr.s_addr == INADDR_ANY)
-		return;
-
-	/*
-	 * Redirects go to all references to the destination,
-	 * and use in_rtchange to invalidate the route cache.
-	 * Dead host indications: notify all references to the destination.
-	 * Otherwise, if we have knowledge of the local port and address,
-	 * deliver only to that socket.
-	 */
-	if (PRC_IS_REDIRECT(cmd) || cmd == PRC_HOSTDEAD) {
-		fport = 0;
-		lport = 0;
-		laddr.s_addr = 0;
-		if (cmd != PRC_HOSTDEAD)
-			notify = in_rtchange;
-	}
-	errnum = inetctlerrmap[cmd];
-	s = splnet();
-	for (inp = head->lh_first; inp != NULL;) {
-		if (inp->inp_faddr.s_addr != faddr.s_addr ||
-		    inp->inp_socket == 0 ||
-		    (lport && inp->inp_lport != lport) ||
-		    (laddr.s_addr && inp->inp_laddr.s_addr != laddr.s_addr) ||
-		    (fport && inp->inp_fport != fport)) {
-			inp = inp->inp_list.le_next;
-			continue;
-		}
-		oinp = inp;
-		inp = inp->inp_list.le_next;
-		if (notify)
-			(*notify)(oinp, errnum);
-	}
-	splx(s);
-}
-
-/*
- * Check for alternatives when higher level complains
- * about service problems.  For now, invalidate cached
- * routing information.  If the route was created dynamically
- * (by a redirect), time to try a default gateway again.
- */
-void
-in_losing(inp)
-	struct inpcb *inp;
-{
-	register struct rtentry *rt;
-	struct rt_addrinfo info;
-
-	if ((rt = inp->inp_route.ro_rt)) {
-		inp->inp_route.ro_rt = 0;
-		bzero((caddr_t)&info, sizeof(info));
-		info.rti_info[RTAX_DST] =
-			(struct sockaddr *)&inp->inp_route.ro_dst;
-		info.rti_info[RTAX_GATEWAY] = rt->rt_gateway;
-		info.rti_info[RTAX_NETMASK] = rt_mask(rt);
-		rt_missmsg(RTM_LOSING, &info, rt->rt_flags, 0);
-		if (rt->rt_flags & RTF_DYNAMIC)
-			(void) rtrequest(RTM_DELETE, rt_key(rt),
-				rt->rt_gateway, rt_mask(rt), rt->rt_flags,
-				(struct rtentry **)0);
-		else
-		/*
-		 * A new route can be allocated
-		 * the next time output is attempted.
-		 */
-			rtfree(rt);
-	}
-}
-
-/*
- * After a routing change, flush old routing
- * and allocate a (hopefully) better one.
- */
-static void
-in_rtchange(inp, errnum)
-	register struct inpcb *inp;
-	int errnum;
-{
-	if (inp->inp_route.ro_rt) {
-		rtfree(inp->inp_route.ro_rt);
-		inp->inp_route.ro_rt = 0;
-		/*
-		 * A new route can be allocated the next time
-		 * output is attempted.
-		 */
-	}
-}
-
-struct inpcb *
-in_pcblookup(pcbinfo, faddr, fport_arg, laddr, lport_arg, wild_okay)
-	struct inpcbinfo *pcbinfo;
-	struct in_addr faddr, laddr;
-	u_int fport_arg, lport_arg;
-	int wild_okay;
-{
-	register struct inpcb *inp, *match = NULL;
-	int matchwild = 3, wildcard;
-	u_short fport = fport_arg, lport = lport_arg;
-	int s;
-
-	s = splnet();
-
-	for (inp = pcbinfo->listhead->lh_first; inp != NULL; inp = inp->inp_list.le_next) {
-		if (inp->inp_lport != lport)
-			continue;
-		wildcard = 0;
-		if (inp->inp_faddr.s_addr != INADDR_ANY) {
-			if (faddr.s_addr == INADDR_ANY)
-				wildcard++;
-			else if (inp->inp_faddr.s_addr != faddr.s_addr ||
-			    inp->inp_fport != fport)
-				continue;
-		} else {
-			if (faddr.s_addr != INADDR_ANY)
-				wildcard++;
-		}
-		if (inp->inp_laddr.s_addr != INADDR_ANY) {
-			if (laddr.s_addr == INADDR_ANY)
-				wildcard++;
-			else if (inp->inp_laddr.s_addr != laddr.s_addr)
-				continue;
-		} else {
-			if (laddr.s_addr != INADDR_ANY)
-				wildcard++;
-		}
-		if (wildcard && wild_okay == 0)
-			continue;
-		if (wildcard < matchwild) {
-			match = inp;
-			matchwild = wildcard;
-			if (matchwild == 0) {
-				break;
-			}
-		}
-	}
-	splx(s);
-	return (match);
-}
-
-/*
- * Lookup PCB in hash list.
- */
-struct inpcb *
-in_pcblookuphash(pcbinfo, faddr, fport_arg, laddr, lport_arg, wildcard)
-	struct inpcbinfo *pcbinfo;
-	struct in_addr faddr, laddr;
-	u_int fport_arg, lport_arg;
-	int wildcard;
-{
-	struct inpcbhead *head;
-	register struct inpcb *inp;
-	u_short fport = fport_arg, lport = lport_arg;
-	int s;
-
-	s = splnet();
-	/*
-	 * First look for an exact match.
-	 */
-	head = &pcbinfo->hashbase[INP_PCBHASH(faddr.s_addr, lport, fport, pcbinfo->hashmask)];
-	for (inp = head->lh_first; inp != NULL; inp = inp->inp_hash.le_next) {
-		if (inp->inp_faddr.s_addr == faddr.s_addr &&
-		    inp->inp_laddr.s_addr == laddr.s_addr &&
-		    inp->inp_fport == fport &&
-		    inp->inp_lport == lport)
-			goto found;
-	}
-	if (wildcard) {
-		struct inpcb *local_wild = NULL;
-
-		head = &pcbinfo->hashbase[INP_PCBHASH(INADDR_ANY, lport, 0, pcbinfo->hashmask)];
-		for (inp = head->lh_first; inp != NULL; inp = inp->inp_hash.le_next) {
-			if (inp->inp_faddr.s_addr == INADDR_ANY &&
-			    inp->inp_fport == 0 && inp->inp_lport == lport) {
-				if (inp->inp_laddr.s_addr == laddr.s_addr)
-					goto found;
-				else if (inp->inp_laddr.s_addr == INADDR_ANY)
-					local_wild = inp;
-			}
-		}
-		if (local_wild != NULL) {
-			inp = local_wild;
-			goto found;
-		}
-	}
-	splx(s);
-	return (NULL);
-
-found:
-	/*
-	 * Move PCB to head of this hash chain so that it can be
-	 * found more quickly in the future.
-	 * XXX - this is a pessimization on machines with few
-	 * concurrent connections.
-	 */
-	if (inp != head->lh_first) {
-		LIST_REMOVE(inp, inp_hash);
-		LIST_INSERT_HEAD(head, inp, inp_hash);
-	}
-	splx(s);
-	return (inp);
-}
-
-/*
- * Insert PCB into hash chain. Must be called at splnet.
- */
-static void
-in_pcbinshash(inp)
-	struct inpcb *inp;
-{
-	struct inpcbhead *head;
-
-	head = &inp->inp_pcbinfo->hashbase[INP_PCBHASH(inp->inp_faddr.s_addr,
-		 inp->inp_lport, inp->inp_fport, inp->inp_pcbinfo->hashmask)];
-
-	LIST_INSERT_HEAD(head, inp, inp_hash);
-}
-
-void
-in_pcbrehash(inp)
-	struct inpcb *inp;
-{
-	struct inpcbhead *head;
-	int s;
-
-	s = splnet();
-	LIST_REMOVE(inp, inp_hash);
-
-	head = &inp->inp_pcbinfo->hashbase[INP_PCBHASH(inp->inp_faddr.s_addr,
-		inp->inp_lport, inp->inp_fport, inp->inp_pcbinfo->hashmask)];
-
-	LIST_INSERT_HEAD(head, inp, inp_hash);
-	splx(s);
-}
diff --git a/c/src/libnetworking/netinet/in_pcb.h b/c/src/libnetworking/netinet/in_pcb.h
deleted file mode 100644
index 9390cfda6c..0000000000
--- a/c/src/libnetworking/netinet/in_pcb.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)in_pcb.h	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#ifndef _NETINET_IN_PCB_H_
-#define _NETINET_IN_PCB_H_
-
-#include <sys/queue.h>
-
-/*
- * Common structure pcb for internet protocol implementation.
- * Here are stored pointers to local and foreign host table
- * entries, local and foreign socket numbers, and pointers
- * up (to a socket structure) and down (to a protocol-specific)
- * control block.
- */
-LIST_HEAD(inpcbhead, inpcb);
-
-struct inpcb {
-	LIST_ENTRY(inpcb) inp_list;		/* list for all PCBs of this proto */
-	LIST_ENTRY(inpcb) inp_hash;		/* hash list */
-	struct	inpcbinfo *inp_pcbinfo;	/* PCB list info */
-	struct	in_addr inp_faddr;	/* foreign host table entry */
-	struct	in_addr inp_laddr;	/* local host table entry */
-	u_short	inp_fport;		/* foreign port */
-	u_short	inp_lport;		/* local port */
-	caddr_t	inp_ppcb;		/* pointer to per-protocol pcb */
-	struct	socket *inp_socket;	/* back pointer to socket */
-	struct	mbuf *inp_options;	/* IP options */
-	struct	route inp_route;	/* placeholder for routing entry */
-	int	inp_flags;		/* generic IP/datagram flags */
-	u_char	inp_ip_tos;		/* type of service proto */
-	u_char	inp_ip_ttl;		/* time to live proto */
-	u_char	inp_ip_p;		/* protocol proto */
-	u_char	pad[1];			/* alignment */
-	struct	ip_moptions *inp_moptions; /* IP multicast options */
-#if 0 /* Someday, perhaps... */
-	struct	ip inp_ip;		/* header prototype; should have more */
-#endif
-};
-
-struct inpcbinfo {
-	struct inpcbhead *listhead;
-	struct inpcbhead *hashbase;
-	unsigned long hashmask;
-	unsigned short lastport;
-	unsigned short lastlow;
-	unsigned short lasthi;
-};
-
-#define INP_PCBHASH(faddr, lport, fport, mask) \
-	(((faddr) ^ ((faddr) >> 16) ^ (lport) ^ (fport)) & (mask))
-
-/* flags in inp_flags: */
-#define	INP_RECVOPTS		0x01	/* receive incoming IP options */
-#define	INP_RECVRETOPTS		0x02	/* receive IP options for reply */
-#define	INP_RECVDSTADDR		0x04	/* receive IP dst address */
-#define	INP_HDRINCL		0x08	/* user supplies entire IP header */
-#define	INP_HIGHPORT		0x10	/* user wants "high" port binding */
-#define	INP_LOWPORT		0x20	/* user wants "low" port binding */
-#define	INP_ANONPORT		0x40	/* port chosen for user */
-#define	INP_RECVIF		0x80	/* receive incoming interface */
-#define	INP_CONTROLOPTS		(INP_RECVOPTS|INP_RECVRETOPTS|INP_RECVDSTADDR|\
-					INP_RECVIF)
-
-#define	INPLOOKUP_WILDCARD	1
-
-#define	sotoinpcb(so)	((struct inpcb *)(so)->so_pcb)
-
-#ifdef KERNEL
-void	 in_losing __P((struct inpcb *));
-int	 in_pcballoc __P((struct socket *, struct inpcbinfo *));
-int	 in_pcbbind __P((struct inpcb *, struct mbuf *));
-int	 in_pcbconnect __P((struct inpcb *, struct mbuf *));
-void	 in_pcbdetach __P((struct inpcb *));
-void	 in_pcbdisconnect __P((struct inpcb *));
-int	 in_pcbladdr __P((struct inpcb *, struct mbuf *,
-	    struct sockaddr_in **));
-struct inpcb *
-	 in_pcblookup __P((struct inpcbinfo *,
-	    struct in_addr, u_int, struct in_addr, u_int, int));
-struct inpcb *
-	 in_pcblookuphash __P((struct inpcbinfo *,
-	    struct in_addr, u_int, struct in_addr, u_int, int));
-void	 in_pcbnotify __P((struct inpcbhead *, struct sockaddr *,
-	    u_int, struct in_addr, u_int, int, void (*)(struct inpcb *, int)));
-void	 in_pcbrehash __P((struct inpcb *));
-void	 in_setpeeraddr __P((struct inpcb *, struct mbuf *));
-void	 in_setsockaddr __P((struct inpcb *, struct mbuf *));
-#endif
-
-#endif
diff --git a/c/src/libnetworking/netinet/in_proto.c b/c/src/libnetworking/netinet/in_proto.c
deleted file mode 100644
index 3fa845955e..0000000000
--- a/c/src/libnetworking/netinet/in_proto.c
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)in_proto.c	8.2 (Berkeley) 2/9/95
- *	$Id$
- */
-
-#include "opt_tcpdebug.h"
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/kernel.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/domain.h>
-#include <sys/mbuf.h>
-#include <sys/protosw.h>
-#include <sys/sysctl.h>
-
-#include <net/if.h>
-#include <net/radix.h>
-#include <net/route.h>
-
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/ip_var.h>
-#include <netinet/ip_icmp.h>
-#include <netinet/in_pcb.h>
-#include <netinet/igmp_var.h>
-#include <netinet/tcp.h>
-#include <netinet/tcp_fsm.h>
-#include <netinet/tcp_seq.h>
-#include <netinet/tcp_timer.h>
-#include <netinet/tcp_var.h>
-#include <netinet/tcpip.h>
-#ifdef TCPDEBUG
-#include <netinet/tcp_debug.h>
-#endif
-#include <netinet/udp.h>
-#include <netinet/udp_var.h>
-/*
- * TCP/IP protocol family: IP, ICMP, UDP, TCP.
- */
-
-#ifdef IPXIP
-#include <netipx/ipx.h>
-#include <netipx/ipx_ip.h>
-#endif
-
-#ifdef NSIP
-#include <netns/ns.h>
-#include <netns/ns_if.h>
-#endif
-
-#ifdef TPIP
-void	tpip_input(), tpip_ctlinput(), tp_init(), tp_slowtimo(), tp_drain();
-int	tp_ctloutput(), tp_usrreq();
-#endif
-
-#ifdef EON
-void	eoninput(), eonctlinput(), eonprotoinit();
-#endif /* EON */
-
-extern	struct domain inetdomain;
-
-struct protosw inetsw[] = {
-{ 0,		&inetdomain,	0,		0,
-  0,		0,		0,		0,
-  0,
-  ip_init,	0,		ip_slowtimo,	ip_drain
-},
-{ SOCK_DGRAM,	&inetdomain,	IPPROTO_UDP,	PR_ATOMIC|PR_ADDR,
-  udp_input,	0,		udp_ctlinput,	ip_ctloutput,
-  udp_usrreq,
-  udp_init
-},
-{ SOCK_STREAM,	&inetdomain,	IPPROTO_TCP,
-	PR_CONNREQUIRED|PR_IMPLOPCL|PR_WANTRCVD,
-  tcp_input,	0,		tcp_ctlinput,	tcp_ctloutput,
-  0,
-  tcp_init,	tcp_fasttimo,	tcp_slowtimo,	tcp_drain,
-  &tcp_usrreqs
-},
-{ SOCK_RAW,	&inetdomain,	IPPROTO_RAW,	PR_ATOMIC|PR_ADDR,
-  rip_input,	0,		0,		rip_ctloutput,
-  rip_usrreq,
-  0,		0,		0,		0,
-},
-{ SOCK_RAW,	&inetdomain,	IPPROTO_ICMP,	PR_ATOMIC|PR_ADDR,
-  icmp_input,	0,		0,		rip_ctloutput,
-  rip_usrreq
-},
-{ SOCK_RAW,	&inetdomain,	IPPROTO_IGMP,	PR_ATOMIC|PR_ADDR,
-  igmp_input,	0,		0,		rip_ctloutput,
-  rip_usrreq,
-  igmp_init,	igmp_fasttimo,	igmp_slowtimo
-},
-{ SOCK_RAW,	&inetdomain,	IPPROTO_RSVP,	PR_ATOMIC|PR_ADDR,
-  rsvp_input,	0,		0,		rip_ctloutput,
-  rip_usrreq,
-  0,		0,		0,		0,
-},
-{ SOCK_RAW,	&inetdomain,	IPPROTO_IPIP,	PR_ATOMIC|PR_ADDR,
-  ipip_input,	0,	 	0,		rip_ctloutput,
-  rip_usrreq,
-  0,		0,		0,		0,
-},
-#ifdef IPDIVERT
-{ SOCK_RAW,	&inetdomain,	IPPROTO_DIVERT,	PR_ATOMIC|PR_ADDR,
-  div_input,	0,	 	0,		ip_ctloutput,
-  div_usrreq,
-  div_init,	0,		0,		0,
-},
-#endif
-#ifdef TPIP
-{ SOCK_SEQPACKET,&inetdomain,	IPPROTO_TP,	PR_CONNREQUIRED|PR_WANTRCVD,
-  tpip_input,	0,		tpip_ctlinput,	tp_ctloutput,
-  tp_usrreq,
-  tp_init,	0,		tp_slowtimo,	tp_drain,
-},
-#endif
-/* EON (ISO CLNL over IP) */
-#ifdef EON
-{ SOCK_RAW,	&inetdomain,	IPPROTO_EON,	0,
-  eoninput,	0,		eonctlinput,		0,
-  0,
-  eonprotoinit,	0,		0,		0,
-},
-#endif
-#ifdef IPXIP
-{ SOCK_RAW,	&inetdomain,	IPPROTO_IDP,	PR_ATOMIC|PR_ADDR,
-  ipxip_input,	0,		ipxip_ctlinput,	0,
-  rip_usrreq,
-  0,		0,		0,		0,
-},
-#endif
-#ifdef NSIP
-{ SOCK_RAW,	&inetdomain,	IPPROTO_IDP,	PR_ATOMIC|PR_ADDR,
-  idpip_input,	0,		nsip_ctlinput,	0,
-  rip_usrreq,
-  0,		0,		0,		0,
-},
-#endif
-	/* raw wildcard */
-{ SOCK_RAW,	&inetdomain,	0,		PR_ATOMIC|PR_ADDR,
-  rip_input,	0,		0,		rip_ctloutput,
-  rip_usrreq,
-  rip_init,	0,		0,		0,
-},
-};
-
-extern int in_inithead(void **, int);
-
-struct domain inetdomain =
-    { AF_INET, "internet", 0, 0, 0, 
-      inetsw, &inetsw[sizeof(inetsw)/sizeof(inetsw[0])], 0,
-      in_inithead, 32, sizeof(struct sockaddr_in)
-    };
-
-DOMAIN_SET(inet);
-
-SYSCTL_NODE(_net,      PF_INET,		inet,	CTLFLAG_RW, 0,
-	"Internet Family");
-
-SYSCTL_NODE(_net_inet, IPPROTO_IP,	ip,	CTLFLAG_RW, 0,	"IP");
-SYSCTL_NODE(_net_inet, IPPROTO_ICMP,	icmp,	CTLFLAG_RW, 0,	"ICMP");
-SYSCTL_NODE(_net_inet, IPPROTO_UDP,	udp,	CTLFLAG_RW, 0,	"UDP");
-SYSCTL_NODE(_net_inet, IPPROTO_TCP,	tcp,	CTLFLAG_RW, 0,	"TCP");
-SYSCTL_NODE(_net_inet, IPPROTO_IGMP,	igmp,	CTLFLAG_RW, 0,	"IGMP");
-#ifdef IPDIVERT
-SYSCTL_NODE(_net_inet, IPPROTO_DIVERT,	div,	CTLFLAG_RW, 0,	"DIVERT");
-#endif
-
diff --git a/c/src/libnetworking/netinet/in_rmx.c b/c/src/libnetworking/netinet/in_rmx.c
deleted file mode 100644
index ba1793b3b4..0000000000
--- a/c/src/libnetworking/netinet/in_rmx.c
+++ /dev/null
@@ -1,384 +0,0 @@
-/*
- * Copyright 1994, 1995 Massachusetts Institute of Technology
- *
- * Permission to use, copy, modify, and distribute this software and
- * its documentation for any purpose and without fee is hereby
- * granted, provided that both the above copyright notice and this
- * permission notice appear in all copies, that both the above
- * copyright notice and this permission notice appear in all
- * supporting documentation, and that the name of M.I.T. not be used
- * in advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission.  M.I.T. makes
- * no representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied
- * warranty.
- *
- * THIS SOFTWARE IS PROVIDED BY M.I.T. ``AS IS''.  M.I.T. DISCLAIMS
- * ALL EXPRESS OR IMPLIED WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT
- * SHALL M.I.T. BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $Id$
- */
-
-/*
- * This code does two things necessary for the enhanced TCP metrics to
- * function in a useful manner:
- *  1) It marks all non-host routes as `cloning', thus ensuring that
- *     every actual reference to such a route actually gets turned
- *     into a reference to a host route to the specific destination
- *     requested.
- *  2) When such routes lose all their references, it arranges for them
- *     to be deleted in some random collection of circumstances, so that
- *     a large quantity of stale routing data is not kept in kernel memory
- *     indefinitely.  See in_rtqtimo() below for the exact mechanism.
- */
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/sysctl.h>
-#include <sys/queue.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/mbuf.h>
-#include <sys/syslog.h>
-
-#include <net/if.h>
-#include <net/route.h>
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/in_var.h>
-
-#include <netinet/ip.h>
-#include <netinet/ip_var.h>
-
-#include <netinet/tcp.h>
-#include <netinet/tcp_seq.h>
-#include <netinet/tcp_timer.h>
-#include <netinet/tcp_var.h>
-
-extern int	in_inithead __P((void **head, int off));
-
-#define RTPRF_OURS		RTF_PROTO3	/* set on routes we manage */
-
-/*
- * Do what we need to do when inserting a route.
- */
-static struct radix_node *
-in_addroute(void *v_arg, void *n_arg, struct radix_node_head *head,
-	    struct radix_node *treenodes)
-{
-	struct rtentry *rt = (struct rtentry *)treenodes;
-	struct sockaddr_in *sin = (struct sockaddr_in *)rt_key(rt);
-	struct radix_node *ret;
-
-	/*
-	 * For IP, all unicast non-host routes are automatically cloning.
-	 */
-	if(IN_MULTICAST(ntohl(sin->sin_addr.s_addr)))
-		rt->rt_flags |= RTF_MULTICAST;
-
-	if(!(rt->rt_flags & (RTF_HOST | RTF_CLONING | RTF_MULTICAST))) {
-		rt->rt_flags |= RTF_PRCLONING;
-	}
-
-	/*
-	 * A little bit of help for both IP output and input:
-	 *   For host routes, we make sure that RTF_BROADCAST
-	 *   is set for anything that looks like a broadcast address.
-	 *   This way, we can avoid an expensive call to in_broadcast()
-	 *   in ip_output() most of the time (because the route passed
-	 *   to ip_output() is almost always a host route).
-	 *
-	 *   We also do the same for local addresses, with the thought
-	 *   that this might one day be used to speed up ip_input().
-	 *
-	 * We also mark routes to multicast addresses as such, because
-	 * it's easy to do and might be useful (but this is much more
-	 * dubious since it's so easy to inspect the address).  (This
-	 * is done above.)
-	 */
-	if (rt->rt_flags & RTF_HOST) {
-		if (in_broadcast(sin->sin_addr, rt->rt_ifp)) {
-			rt->rt_flags |= RTF_BROADCAST;
-		} else {
-#define satosin(sa) ((struct sockaddr_in *)sa)
-			if (satosin(rt->rt_ifa->ifa_addr)->sin_addr.s_addr
-			    == sin->sin_addr.s_addr)
-				rt->rt_flags |= RTF_LOCAL;
-#undef satosin
-		}
-	}
-
-	/*
-	 * We also specify a send and receive pipe size for every
-	 * route added, to help TCP a bit.  TCP doesn't actually
-	 * want a true pipe size, which would be prohibitive in memory
-	 * costs and is hard to compute anyway; it simply uses these
-	 * values to size its buffers.  So, we fill them in with the
-	 * same values that TCP would have used anyway, and allow the
-	 * installing program or the link layer to override these values
-	 * as it sees fit.  This will hopefully allow TCP more
-	 * opportunities to save its ssthresh value.
-	 */
-	if (!rt->rt_rmx.rmx_sendpipe && !(rt->rt_rmx.rmx_locks & RTV_SPIPE))
-		rt->rt_rmx.rmx_sendpipe = tcp_sendspace;
-
-	if (!rt->rt_rmx.rmx_recvpipe && !(rt->rt_rmx.rmx_locks & RTV_RPIPE))
-		rt->rt_rmx.rmx_recvpipe = tcp_recvspace;
-
-	if (!rt->rt_rmx.rmx_mtu && !(rt->rt_rmx.rmx_locks & RTV_MTU) 
-	    && rt->rt_ifp)
-		rt->rt_rmx.rmx_mtu = rt->rt_ifp->if_mtu;
-
-	ret = rn_addroute(v_arg, n_arg, head, treenodes);
-	if (ret == NULL && rt->rt_flags & RTF_HOST) {
-		struct rtentry *rt2;
-		/*
-		 * We are trying to add a host route, but can't.
-		 * Find out if it is because of an
-		 * ARP entry and delete it if so.
-		 */
-		rt2 = rtalloc1((struct sockaddr *)sin, 0,
-				RTF_CLONING | RTF_PRCLONING);
-		if (rt2) {
-			if (rt2->rt_flags & RTF_LLINFO &&
-				rt2->rt_flags & RTF_HOST &&
-				rt2->rt_gateway &&
-				rt2->rt_gateway->sa_family == AF_LINK) {
-				rtrequest(RTM_DELETE,
-					  (struct sockaddr *)rt_key(rt2),
-					  rt2->rt_gateway,
-					  rt_mask(rt2), rt2->rt_flags, 0);
-				ret = rn_addroute(v_arg, n_arg, head,
-					treenodes);
-			}
-			RTFREE(rt2);
-		}
-	}
-	return ret;
-}
-
-/*
- * This code is the inverse of in_clsroute: on first reference, if we
- * were managing the route, stop doing so and set the expiration timer
- * back off again.
- */
-static struct radix_node *
-in_matroute(void *v_arg, struct radix_node_head *head)
-{
-	struct radix_node *rn = rn_match(v_arg, head);
-	struct rtentry *rt = (struct rtentry *)rn;
-
-	if(rt && rt->rt_refcnt == 0) { /* this is first reference */
-		if(rt->rt_flags & RTPRF_OURS) {
-			rt->rt_flags &= ~RTPRF_OURS;
-			rt->rt_rmx.rmx_expire = 0;
-		}
-	}
-	return rn;
-}
-
-static int rtq_reallyold = 60*60;
-	/* one hour is ``really old'' */
-SYSCTL_INT(_net_inet_ip, IPCTL_RTEXPIRE, rtexpire,
-	CTLFLAG_RW, &rtq_reallyold , 0, "");
-				   
-static int rtq_minreallyold = 10;
-	/* never automatically crank down to less */
-SYSCTL_INT(_net_inet_ip, IPCTL_RTMINEXPIRE, rtminexpire,
-	CTLFLAG_RW, &rtq_minreallyold , 0, "");
-				   
-static int rtq_toomany = 128;
-	/* 128 cached routes is ``too many'' */
-SYSCTL_INT(_net_inet_ip, IPCTL_RTMAXCACHE, rtmaxcache,
-	CTLFLAG_RW, &rtq_toomany , 0, "");
-				   
-
-/*
- * On last reference drop, mark the route as belong to us so that it can be
- * timed out.
- */
-static void
-in_clsroute(struct radix_node *rn, struct radix_node_head *head)
-{
-	struct rtentry *rt = (struct rtentry *)rn;
-
-	if(!(rt->rt_flags & RTF_UP))
-		return;		/* prophylactic measures */
-
-	if((rt->rt_flags & (RTF_LLINFO | RTF_HOST)) != RTF_HOST)
-		return;
-
-	if((rt->rt_flags & (RTF_WASCLONED | RTPRF_OURS))
-	   != RTF_WASCLONED)
-		return;
-
-	/*
-	 * As requested by David Greenman:
-	 * If rtq_reallyold is 0, just delete the route without
-	 * waiting for a timeout cycle to kill it.
-	 */
-	if(rtq_reallyold != 0) {
-		rt->rt_flags |= RTPRF_OURS;
-		rt->rt_rmx.rmx_expire = rtems_bsdnet_seconds_since_boot() + rtq_reallyold;
-	} else {
-		rtrequest(RTM_DELETE,
-			  (struct sockaddr *)rt_key(rt),
-			  rt->rt_gateway, rt_mask(rt),
-			  rt->rt_flags, 0);
-	}
-}
-
-struct rtqk_arg {
-	struct radix_node_head *rnh;
-	int draining;
-	int killed;
-	int found;
-	int updating;
-	time_t nextstop;
-};
-
-/*
- * Get rid of old routes.  When draining, this deletes everything, even when
- * the timeout is not expired yet.  When updating, this makes sure that
- * nothing has a timeout longer than the current value of rtq_reallyold.
- */
-static int
-in_rtqkill(struct radix_node *rn, void *rock)
-{
-	struct rtqk_arg *ap = rock;
-	struct rtentry *rt = (struct rtentry *)rn;
-	int err;
-
-	if(rt->rt_flags & RTPRF_OURS) {
-		ap->found++;
-
-		if(ap->draining || rt->rt_rmx.rmx_expire <= rtems_bsdnet_seconds_since_boot()) {
-			if(rt->rt_refcnt > 0)
-				panic("rtqkill route really not free");
-
-			err = rtrequest(RTM_DELETE,
-					(struct sockaddr *)rt_key(rt),
-					rt->rt_gateway, rt_mask(rt),
-					rt->rt_flags, 0);
-			if(err) {
-				log(LOG_WARNING, "in_rtqkill: error %d\n", err);
-			} else {
-				ap->killed++;
-			}
-		} else {
-			if(ap->updating
-			   && (rt->rt_rmx.rmx_expire - rtems_bsdnet_seconds_since_boot()
-			       > rtq_reallyold)) {
-				rt->rt_rmx.rmx_expire = rtems_bsdnet_seconds_since_boot()
-					+ rtq_reallyold;
-			}
-			ap->nextstop = lmin(ap->nextstop,
-					    rt->rt_rmx.rmx_expire);
-		}
-	}
-
-	return 0;
-}
-
-#define RTQ_TIMEOUT	60*10	/* run no less than once every ten minutes */
-static int rtq_timeout = RTQ_TIMEOUT;
-
-static void
-in_rtqtimo(void *rock)
-{
-	struct radix_node_head *rnh = rock;
-	struct rtqk_arg arg;
-	struct timeval atv;
-	static time_t last_adjusted_timeout = 0;
-	int s;
-
-	arg.found = arg.killed = 0;
-	arg.rnh = rnh;
-	arg.nextstop = rtems_bsdnet_seconds_since_boot() + rtq_timeout;
-	arg.draining = arg.updating = 0;
-	s = splnet();
-	rnh->rnh_walktree(rnh, in_rtqkill, &arg);
-	splx(s);
-
-	/*
-	 * Attempt to be somewhat dynamic about this:
-	 * If there are ``too many'' routes sitting around taking up space,
-	 * then crank down the timeout, and see if we can't make some more
-	 * go away.  However, we make sure that we will never adjust more
-	 * than once in rtq_timeout seconds, to keep from cranking down too
-	 * hard.
-	 */
-	if((arg.found - arg.killed > rtq_toomany)
-	   && (rtems_bsdnet_seconds_since_boot() - last_adjusted_timeout >= rtq_timeout)
-	   && rtq_reallyold > rtq_minreallyold) {
-		rtq_reallyold = 2*rtq_reallyold / 3;
-		if(rtq_reallyold < rtq_minreallyold) {
-			rtq_reallyold = rtq_minreallyold;
-		}
-
-		last_adjusted_timeout = rtems_bsdnet_seconds_since_boot();
-#ifdef DIAGNOSTIC
-		log(LOG_DEBUG, "in_rtqtimo: adjusted rtq_reallyold to %d\n",
-		    rtq_reallyold);
-#endif
-		arg.found = arg.killed = 0;
-		arg.updating = 1;
-		s = splnet();
-		rnh->rnh_walktree(rnh, in_rtqkill, &arg);
-		splx(s);
-	}
-
-	atv.tv_usec = 0;
-	atv.tv_sec = arg.nextstop;
-	timeout(in_rtqtimo, rock, hzto(&atv));
-}
-
-void
-in_rtqdrain(void)
-{
-	struct radix_node_head *rnh = rt_tables[AF_INET];
-	struct rtqk_arg arg;
-	int s;
-	arg.found = arg.killed = 0;
-	arg.rnh = rnh;
-	arg.nextstop = 0;
-	arg.draining = 1;
-	arg.updating = 0;
-	s = splnet();
-	rnh->rnh_walktree(rnh, in_rtqkill, &arg);
-	splx(s);
-}
-
-/*
- * Initialize our routing tree.
- */
-int
-in_inithead(void **head, int off)
-{
-	struct radix_node_head *rnh;
-
-	if(!rn_inithead(head, off))
-		return 0;
-
-	if(head != (void **)&rt_tables[AF_INET]) /* BOGUS! */
-		return 1;	/* only do this for the real routing table */
-
-	rnh = *head;
-	rnh->rnh_addaddr = in_addroute;
-	rnh->rnh_matchaddr = in_matroute;
-	rnh->rnh_close = in_clsroute;
-	in_rtqtimo(rnh);	/* kick off timeout first time */
-	return 1;
-}
-
diff --git a/c/src/libnetworking/netinet/in_systm.h b/c/src/libnetworking/netinet/in_systm.h
deleted file mode 100644
index d72e9b4665..0000000000
--- a/c/src/libnetworking/netinet/in_systm.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)in_systm.h	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#ifndef _NETINET_IN_SYSTM_H_
-#define _NETINET_IN_SYSTM_H_
-
-/*
- * Miscellaneous internetwork
- * definitions for kernel.
- */
-
-/*
- * Network types.
- *
- * Internally the system keeps counters in the headers with the bytes
- * swapped so that VAX instructions will work on them.  It reverses
- * the bytes before transmission at each protocol level.  The n_ types
- * represent the types with the bytes in ``high-ender'' order.
- */
-typedef u_short n_short;		/* short as received from the net */
-typedef u_long	n_long;			/* long as received from the net */
-
-typedef	u_long	n_time;			/* ms since 00:00 GMT, byte rev */
-
-#ifdef KERNEL
-n_time	 iptime __P((void));
-#endif
-
-#endif
diff --git a/c/src/libnetworking/netinet/in_var.h b/c/src/libnetworking/netinet/in_var.h
deleted file mode 100644
index e7a54d5e85..0000000000
--- a/c/src/libnetworking/netinet/in_var.h
+++ /dev/null
@@ -1,235 +0,0 @@
-/*
- * Copyright (c) 1985, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)in_var.h	8.2 (Berkeley) 1/9/95
- *	$Id$
- */
-
-#ifndef _NETINET_IN_VAR_H_
-#define _NETINET_IN_VAR_H_
-
-#include <sys/queue.h>
-
-/*
- * Interface address, Internet version.  One of these structures
- * is allocated for each interface with an Internet address.
- * The ifaddr structure contains the protocol-independent part
- * of the structure and is assumed to be first.
- */
-struct in_ifaddr {
-	struct	ifaddr ia_ifa;		/* protocol-independent info */
-#define	ia_ifp		ia_ifa.ifa_ifp
-#define ia_flags	ia_ifa.ifa_flags
-					/* ia_{,sub}net{,mask} in host order */
-	u_long	ia_net;			/* network number of interface */
-	u_long	ia_netmask;		/* mask of net part */
-	u_long	ia_subnet;		/* subnet number, including net */
-	u_long	ia_subnetmask;		/* mask of subnet part */
-	struct	in_addr ia_netbroadcast; /* to recognize net broadcasts */
-	struct	in_ifaddr *ia_next;	/* next in list of internet addresses */
-	struct	sockaddr_in ia_addr;	/* reserve space for interface name */
-	struct	sockaddr_in ia_dstaddr; /* reserve space for broadcast addr */
-#define	ia_broadaddr	ia_dstaddr
-	struct	sockaddr_in ia_sockmask; /* reserve space for general netmask */
-	LIST_HEAD(in_multihead, in_multi) ia_multiaddrs;
-					/* list of multicast addresses */
-};
-
-struct	in_aliasreq {
-	char	ifra_name[IFNAMSIZ];		/* if name, e.g. "en0" */
-	struct	sockaddr_in ifra_addr;
-	struct	sockaddr_in ifra_broadaddr;
-#define ifra_dstaddr ifra_broadaddr
-	struct	sockaddr_in ifra_mask;
-};
-/*
- * Given a pointer to an in_ifaddr (ifaddr),
- * return a pointer to the addr as a sockaddr_in.
- */
-#define IA_SIN(ia)    (&(((struct in_ifaddr *)(ia))->ia_addr))
-#define IA_DSTSIN(ia) (&(((struct in_ifaddr *)(ia))->ia_dstaddr))
-
-#define IN_LNAOF(in, ifa) \
-	((ntohl((in).s_addr) & ~((struct in_ifaddr *)(ifa)->ia_subnetmask))
-
-
-#ifdef	KERNEL
-extern	struct	in_ifaddr *in_ifaddr;
-extern	struct	ifqueue	ipintrq;		/* ip packet input queue */
-extern	struct	in_addr zeroin_addr;
-extern	u_char	inetctlerrmap[];
-extern	int rtq_reallyold;	/* XXX */
-extern	int rtq_minreallyold;	/* XXX */
-extern	int rtq_toomany;	/* XXX */
-
-/*
- * Macro for finding the interface (ifnet structure) corresponding to one
- * of our IP addresses.
- */
-#define INADDR_TO_IFP(addr, ifp) \
-	/* struct in_addr addr; */ \
-	/* struct ifnet *ifp; */ \
-{ \
-	register struct in_ifaddr *ia; \
-\
-	for (ia = in_ifaddr; \
-	    ia != NULL && ((ia->ia_ifp->if_flags & IFF_POINTOPOINT)? \
-		IA_DSTSIN(ia):IA_SIN(ia))->sin_addr.s_addr != (addr).s_addr; \
-	    ia = ia->ia_next) \
-		 continue; \
-	if (ia == NULL) \
-	    for (ia = in_ifaddr; \
-		ia != NULL; \
-		ia = ia->ia_next) \
-		    if (ia->ia_ifp->if_flags & IFF_POINTOPOINT && \
-			IA_SIN(ia)->sin_addr.s_addr == (addr).s_addr) \
-			    break; \
-	(ifp) = (ia == NULL) ? NULL : ia->ia_ifp; \
-}
-
-/*
- * Macro for finding the internet address structure (in_ifaddr) corresponding
- * to a given interface (ifnet structure).
- */
-#define IFP_TO_IA(ifp, ia) \
-	/* struct ifnet *ifp; */ \
-	/* struct in_ifaddr *ia; */ \
-{ \
-	for ((ia) = in_ifaddr; \
-	    (ia) != NULL && (ia)->ia_ifp != (ifp); \
-	    (ia) = (ia)->ia_next) \
-		continue; \
-}
-#endif
-
-/*
- * This information should be part of the ifnet structure but we don't wish
- * to change that - as it might break a number of things
- */
-
-struct router_info {
-	struct ifnet *rti_ifp;
-	int    rti_type; /* type of router which is querier on this interface */
-	int    rti_time; /* # of slow timeouts since last old query */
-	struct router_info *rti_next;
-};
-
-/*
- * Internet multicast address structure.  There is one of these for each IP
- * multicast group to which this host belongs on a given network interface.
- * They are kept in a linked list, rooted in the interface's in_ifaddr
- * structure.
- */
-struct in_multi {
-	LIST_ENTRY(in_multi) inm_entry; /* list glue */
-	struct	in_addr inm_addr;	/* IP multicast address */
-	struct	ifnet *inm_ifp;		/* back pointer to ifnet */
-	struct	in_ifaddr *inm_ia;	/* back pointer to in_ifaddr */
-	u_int	inm_refcount;		/* no. membership claims by sockets */
-	u_int	inm_timer;		/* IGMP membership report timer */
-	u_int	inm_state;		/*  state of the membership */
-	struct	router_info *inm_rti;	/* router info*/
-};
-
-#ifdef KERNEL
-/*
- * Structure used by macros below to remember position when stepping through
- * all of the in_multi records.
- */
-struct in_multistep {
-	struct in_ifaddr *i_ia;
-	struct in_multi *i_inm;
-};
-
-/*
- * Macro for looking up the in_multi record for a given IP multicast address
- * on a given interface.  If no matching record is found, "inm" returns NULL.
- */
-#define IN_LOOKUP_MULTI(addr, ifp, inm) \
-	/* struct in_addr addr; */ \
-	/* struct ifnet *ifp; */ \
-	/* struct in_multi *inm; */ \
-{ \
-	register struct in_ifaddr *ia; \
-\
-	IFP_TO_IA((ifp), ia); \
-	if (ia == NULL) \
-		(inm) = NULL; \
-	else \
-		for ((inm) = ia->ia_multiaddrs.lh_first; \
-		    (inm) != NULL && (inm)->inm_addr.s_addr != (addr).s_addr; \
-		     (inm) = inm->inm_entry.le_next) \
-			 continue; \
-}
-
-/*
- * Macro to step through all of the in_multi records, one at a time.
- * The current position is remembered in "step", which the caller must
- * provide.  IN_FIRST_MULTI(), below, must be called to initialize "step"
- * and get the first record.  Both macros return a NULL "inm" when there
- * are no remaining records.
- */
-#define IN_NEXT_MULTI(step, inm) \
-	/* struct in_multistep  step; */ \
-	/* struct in_multi *inm; */ \
-{ \
-	if (((inm) = (step).i_inm) != NULL) \
-		(step).i_inm = (inm)->inm_entry.le_next; \
-	else \
-		while ((step).i_ia != NULL) { \
-			(inm) = (step).i_ia->ia_multiaddrs.lh_first; \
-			(step).i_ia = (step).i_ia->ia_next; \
-			if ((inm) != NULL) { \
-				(step).i_inm = (inm)->inm_entry.le_next; \
-				break; \
-			} \
-		} \
-}
-
-#define IN_FIRST_MULTI(step, inm) \
-	/* struct in_multistep step; */ \
-	/* struct in_multi *inm; */ \
-{ \
-	(step).i_ia = in_ifaddr; \
-	(step).i_inm = NULL; \
-	IN_NEXT_MULTI((step), (inm)); \
-}
-
-struct	in_multi *in_addmulti __P((struct in_addr *, struct ifnet *));
-void	in_delmulti __P((struct in_multi *));
-int	in_control __P((struct socket *, u_long, caddr_t, struct ifnet *));
-void	in_rtqdrain __P((void));
-void	ip_input __P((struct mbuf *));
-
-#endif /* KERNEL */
-
-#endif /* _NETINET_IN_VAR_H_ */
diff --git a/c/src/libnetworking/netinet/ip.h b/c/src/libnetworking/netinet/ip.h
deleted file mode 100644
index e7f824ca6f..0000000000
--- a/c/src/libnetworking/netinet/ip.h
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)ip.h	8.2 (Berkeley) 6/1/94
- *	$Id$
- */
-
-#ifndef _NETINET_IP_H_
-#define _NETINET_IP_H_
-
-/*
- * Definitions for internet protocol version 4.
- * Per RFC 791, September 1981.
- */
-#define	IPVERSION	4
-
-/*
- * Structure of an internet header, naked of options.
- *
- * We declare ip_len and ip_off to be short, rather than u_short
- * pragmatically since otherwise unsigned comparisons can result
- * against negative integers quite easily, and fail in subtle ways.
- */
-struct ip {
-#ifdef _IP_VHL
-	u_char	ip_vhl;			/* version << 4 | header length >> 2 */
-#else
-#if BYTE_ORDER == LITTLE_ENDIAN
-	u_char	ip_hl:4,		/* header length */
-		ip_v:4;			/* version */
-#endif
-#if BYTE_ORDER == BIG_ENDIAN
-	u_char	ip_v:4,			/* version */
-		ip_hl:4;		/* header length */
-#endif
-#endif /* not _IP_VHL */
-	u_char	ip_tos;			/* type of service */
-	u_short	ip_len;			/* total length */
-	u_short	ip_id;			/* identification */
-	u_short	ip_off;			/* fragment offset field */
-#define	IP_RF 0x8000			/* reserved fragment flag */
-#define	IP_DF 0x4000			/* dont fragment flag */
-#define	IP_MF 0x2000			/* more fragments flag */
-#define	IP_OFFMASK 0x1fff		/* mask for fragmenting bits */
-	u_char	ip_ttl;			/* time to live */
-	u_char	ip_p;			/* protocol */
-	u_short	ip_sum;			/* checksum */
-	struct	in_addr ip_src,ip_dst;	/* source and dest address */
-};
-
-#ifdef _IP_VHL
-#define	IP_MAKE_VHL(v, hl)	((v) << 4 | (hl))
-#define	IP_VHL_HL(vhl)		((vhl) & 0x0f)
-#define	IP_VHL_V(vhl)		((vhl) >> 4)
-#define	IP_VHL_BORING		0x45
-#endif
-
-#define	IP_MAXPACKET	65535		/* maximum packet size */
-
-/*
- * Definitions for IP type of service (ip_tos)
- */
-#define	IPTOS_LOWDELAY		0x10
-#define	IPTOS_THROUGHPUT	0x08
-#define	IPTOS_RELIABILITY	0x04
-#define	IPTOS_MINCOST		0x02
-
-/*
- * Definitions for IP precedence (also in ip_tos) (hopefully unused)
- */
-#define	IPTOS_PREC_NETCONTROL		0xe0
-#define	IPTOS_PREC_INTERNETCONTROL	0xc0
-#define	IPTOS_PREC_CRITIC_ECP		0xa0
-#define	IPTOS_PREC_FLASHOVERRIDE	0x80
-#define	IPTOS_PREC_FLASH		0x60
-#define	IPTOS_PREC_IMMEDIATE		0x40
-#define	IPTOS_PREC_PRIORITY		0x20
-#define	IPTOS_PREC_ROUTINE		0x00
-
-/*
- * Definitions for options.
- */
-#define	IPOPT_COPIED(o)		((o)&0x80)
-#define	IPOPT_CLASS(o)		((o)&0x60)
-#define	IPOPT_NUMBER(o)		((o)&0x1f)
-
-#define	IPOPT_CONTROL		0x00
-#define	IPOPT_RESERVED1		0x20
-#define	IPOPT_DEBMEAS		0x40
-#define	IPOPT_RESERVED2		0x60
-
-#define	IPOPT_EOL		0		/* end of option list */
-#define	IPOPT_NOP		1		/* no operation */
-
-#define	IPOPT_RR		7		/* record packet route */
-#define	IPOPT_TS		68		/* timestamp */
-#define	IPOPT_SECURITY		130		/* provide s,c,h,tcc */
-#define	IPOPT_LSRR		131		/* loose source route */
-#define	IPOPT_SATID		136		/* satnet id */
-#define	IPOPT_SSRR		137		/* strict source route */
-#define	IPOPT_RA		148		/* router alert */
-
-/*
- * Offsets to fields in options other than EOL and NOP.
- */
-#define	IPOPT_OPTVAL		0		/* option ID */
-#define	IPOPT_OLEN		1		/* option length */
-#define IPOPT_OFFSET		2		/* offset within option */
-#define	IPOPT_MINOFF		4		/* min value of above */
-
-/*
- * Time stamp option structure.
- */
-struct	ip_timestamp {
-	u_char	ipt_code;		/* IPOPT_TS */
-	u_char	ipt_len;		/* size of structure (variable) */
-	u_char	ipt_ptr;		/* index of current entry */
-#if BYTE_ORDER == LITTLE_ENDIAN
-	u_char	ipt_flg:4,		/* flags, see below */
-		ipt_oflw:4;		/* overflow counter */
-#endif
-#if BYTE_ORDER == BIG_ENDIAN
-	u_char	ipt_oflw:4,		/* overflow counter */
-		ipt_flg:4;		/* flags, see below */
-#endif
-	union ipt_timestamp {
-		n_long	ipt_time[1];
-		struct	ipt_ta {
-			struct in_addr ipt_addr;
-			n_long ipt_time;
-		} ipt_ta[1];
-	} ipt_timestamp;
-};
-
-#include <machine/in_cksum.h>
-
-/* flag bits for ipt_flg */
-#define	IPOPT_TS_TSONLY		0		/* timestamps only */
-#define	IPOPT_TS_TSANDADDR	1		/* timestamps and addresses */
-#define	IPOPT_TS_PRESPEC	3		/* specified modules only */
-
-/* bits for security (not byte swapped) */
-#define	IPOPT_SECUR_UNCLASS	0x0000
-#define	IPOPT_SECUR_CONFID	0xf135
-#define	IPOPT_SECUR_EFTO	0x789a
-#define	IPOPT_SECUR_MMMM	0xbc4d
-#define	IPOPT_SECUR_RESTR	0xaf13
-#define	IPOPT_SECUR_SECRET	0xd788
-#define	IPOPT_SECUR_TOPSECRET	0x6bc5
-
-/*
- * Internet implementation parameters.
- */
-#define	MAXTTL		255		/* maximum time to live (seconds) */
-#define	IPDEFTTL	64		/* default ttl, from RFC 1340 */
-#define	IPFRAGTTL	60		/* time to live for frags, slowhz */
-#define	IPTTLDEC	1		/* subtracted when forwarding */
-
-#define	IP_MSS		576		/* default maximum segment size */
-
-#endif
diff --git a/c/src/libnetworking/netinet/ip_divert.c b/c/src/libnetworking/netinet/ip_divert.c
deleted file mode 100644
index 2955e811ad..0000000000
--- a/c/src/libnetworking/netinet/ip_divert.c
+++ /dev/null
@@ -1,382 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	$Id$
- */
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/malloc.h>
-#include <sys/mbuf.h>
-#include <sys/socket.h>
-#include <sys/protosw.h>
-#include <sys/socketvar.h>
-#include <sys/errno.h>
-#include <sys/systm.h>
-
-#include <net/if.h>
-#include <net/route.h>
-
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/in_pcb.h>
-#include <netinet/in_var.h>
-#include <netinet/ip_var.h>
-
-/*
- * Divert sockets
- */
-
-/*
- * Allocate enough space to hold a full IP packet
- */
-#define	DIVSNDQ		(65536 + 100)
-#define	DIVRCVQ		(65536 + 100)
-
-/* Global variables */
-
-/*
- * ip_input() and ip_output() set this secret value before calling us to
- * let us know which divert port to divert a packet to; this is done so
- * we can use the existing prototype for struct protosw's pr_input().
- * This is stored in host order.
- */
-u_short ip_divert_port;
-
-/*
- * We set this value to a non-zero port number when we want the call to
- * ip_fw_chk() in ip_input() or ip_output() to ignore ``divert <port>''
- * chain entries. This is stored in host order.
- */
-u_short ip_divert_ignore;
-
-/* Internal variables */
-
-static struct inpcbhead divcb;
-static struct inpcbinfo divcbinfo;
-
-static u_long	div_sendspace = DIVSNDQ;	/* XXX sysctl ? */
-static u_long	div_recvspace = DIVRCVQ;	/* XXX sysctl ? */
-
-/* Optimization: have this preinitialized */
-static struct sockaddr_in divsrc = { sizeof(divsrc), AF_INET };
-
-/* Internal functions */
-
-static int div_output(struct socket *so,
-		struct mbuf *m, struct mbuf *addr, struct mbuf *control);
-
-/*
- * Initialize divert connection block queue.
- */
-void
-div_init(void)
-{
-	LIST_INIT(&divcb);
-	divcbinfo.listhead = &divcb;
-	/*
-	 * XXX We don't use the hash list for divert IP, but it's easier
-	 * to allocate a one entry hash list than it is to check all
-	 * over the place for hashbase == NULL.
-	 */
-	divcbinfo.hashbase = hashinit(1, M_PCB, &divcbinfo.hashmask);
-}
-
-/*
- * Setup generic address and protocol structures
- * for div_input routine, then pass them along with
- * mbuf chain. ip->ip_len is assumed to have had
- * the header length (hlen) subtracted out already.
- * We tell whether the packet was incoming or outgoing
- * by seeing if hlen == 0, which is a hack.
- */
-void
-div_input(struct mbuf *m, int hlen)
-{
-	struct ip *ip;
-	struct inpcb *inp;
-	struct socket *sa;
-
-	/* Sanity check */
-	if (ip_divert_port == 0)
-		panic("div_input: port is 0");
-
-	/* Assure header */
-	if (m->m_len < sizeof(struct ip) &&
-	    (m = m_pullup(m, sizeof(struct ip))) == 0) {
-		return;
-	}
-	ip = mtod(m, struct ip *);
-
-	/* Record divert port */
-	divsrc.sin_port = htons(ip_divert_port);
-
-	/* Restore packet header fields */
-	ip->ip_len += hlen;
-	HTONS(ip->ip_len);
-	HTONS(ip->ip_off);
-
-	/* Record receive interface address, if any */
-	divsrc.sin_addr.s_addr = 0;
-	if (hlen) {
-		struct ifaddr *ifa;
-
-#ifdef DIAGNOSTIC
-		/* Sanity check */
-		if (!(m->m_flags & M_PKTHDR))
-			panic("div_input: no pkt hdr");
-#endif
-
-		/* More fields affected by ip_input() */
-		HTONS(ip->ip_id);
-
-		/* Find IP address for recieve interface */
-		for (ifa = m->m_pkthdr.rcvif->if_addrlist;
-		    ifa != NULL; ifa = ifa->ifa_next) {
-			if (ifa->ifa_addr == NULL)
-				continue;
-			if (ifa->ifa_addr->sa_family != AF_INET)
-				continue;
-			divsrc.sin_addr =
-			    ((struct sockaddr_in *) ifa->ifa_addr)->sin_addr;
-			break;
-		}
-	}
-
-	/* Put packet on socket queue, if any */
-	sa = NULL;
-	for (inp = divcb.lh_first; inp != NULL; inp = inp->inp_list.le_next) {
-		if (inp->inp_lport == htons(ip_divert_port))
-			sa = inp->inp_socket;
-	}
-	if (sa) {
-		if (sbappendaddr(&sa->so_rcv, (struct sockaddr *)&divsrc,
-				m, (struct mbuf *)0) == 0)
-			m_freem(m);
-		else
-			sorwakeup(sa);
-	} else {
-		m_freem(m);
-		ipstat.ips_noproto++;
-		ipstat.ips_delivered--;
-        }
-}
-
-/*
- * Deliver packet back into the IP processing machinery.
- *
- * If no address specified, or address is 0.0.0.0, send to ip_output();
- * otherwise, send to ip_input() and mark as having been received on
- * the interface with that address.
- *
- * If no address specified, or dest port is 0, allow packet to divert
- * back to this socket; otherwise, don't.
- */
-static int
-div_output(so, m, addr, control)
-	struct socket *so;
-	register struct mbuf *m;
-	struct mbuf *addr, *control;
-{
-	register struct inpcb *const inp = sotoinpcb(so);
-	register struct ip *const ip = mtod(m, struct ip *);
-	struct sockaddr_in *sin = NULL;
-	int error = 0;
-
-	if (control)
-		m_freem(control);		/* XXX */
-	if (addr)
-		sin = mtod(addr, struct sockaddr_in *);
-
-	/* Loopback avoidance option */
-	ip_divert_ignore = ntohs(inp->inp_lport);
-
-	/* Reinject packet into the system as incoming or outgoing */
-	if (!sin || sin->sin_addr.s_addr == 0) {
-		/* Don't allow both user specified and setsockopt options,
-		   and don't allow packet length sizes that will crash */
-		if (((ip->ip_hl != (sizeof (*ip) >> 2)) && inp->inp_options) ||
-		     ((u_short)ntohs(ip->ip_len) > m->m_pkthdr.len)) {
-			error = EINVAL;
-			goto cantsend;
-		}
-
-		/* Convert fields to host order for ip_output() */
-		NTOHS(ip->ip_len);
-		NTOHS(ip->ip_off);
-
-		/* Send packet to output processing */
-		ipstat.ips_rawout++;			/* XXX */
-		error = ip_output(m, inp->inp_options, &inp->inp_route,
-			(so->so_options & SO_DONTROUTE) |
-			IP_ALLOWBROADCAST | IP_RAWOUTPUT, inp->inp_moptions);
-	} else {
-		struct ifaddr *ifa;
-
-		/* Find receive interface with the given IP address */
-		sin->sin_port = 0;
-		if ((ifa = ifa_ifwithaddr((struct sockaddr *) sin)) == 0) {
-			error = EADDRNOTAVAIL;
-			goto cantsend;
-		}
-		m->m_pkthdr.rcvif = ifa->ifa_ifp;
-
-		/* Send packet to input processing */
-		ip_input(m);
-	}
-
-	/* Reset for next time (and other packets) */
-	ip_divert_ignore = 0;
-	return error;
-
-cantsend:
-	ip_divert_ignore = 0;
-	m_freem(m);
-	return error;
-}
-
-/*ARGSUSED*/
-int
-div_usrreq(so, req, m, nam, control)
-	register struct socket *so;
-	int req;
-	struct mbuf *m, *nam, *control;
-{
-	register int error = 0;
-	register struct inpcb *inp = sotoinpcb(so);
-	int s;
-
-	if (inp == NULL && req != PRU_ATTACH) {
-		error = EINVAL;
-		goto release;
-	}
-	switch (req) {
-
-	case PRU_ATTACH:
-		if (inp)
-			panic("div_attach");
-		if ((so->so_state & SS_PRIV) == 0) {
-			error = EACCES;
-			break;
-		}
-		s = splnet();
-		error = in_pcballoc(so, &divcbinfo);
-		splx(s);
-		if (error)
-			break;
-		error = soreserve(so, div_sendspace, div_recvspace);
-		if (error)
-			break;
-		inp = (struct inpcb *)so->so_pcb;
-		inp->inp_ip_p = (int)nam;	/* XXX */
-		inp->inp_flags |= INP_HDRINCL;
-		/* The socket is always "connected" because
-		   we always know "where" to send the packet */
-		so->so_state |= SS_ISCONNECTED;
-		break;
-
-	case PRU_DISCONNECT:
-		if ((so->so_state & SS_ISCONNECTED) == 0) {
-			error = ENOTCONN;
-			break;
-		}
-		/* FALLTHROUGH */
-	case PRU_ABORT:
-		soisdisconnected(so);
-		/* FALLTHROUGH */
-	case PRU_DETACH:
-		if (inp == 0)
-			panic("div_detach");
-		in_pcbdetach(inp);
-		break;
-
-	case PRU_BIND:
-		s = splnet();
-		error = in_pcbbind(inp, nam);
-		splx(s);
-		break;
-
-	/*
-	 * Mark the connection as being incapable of further input.
-	 */
-	case PRU_SHUTDOWN:
-		socantsendmore(so);
-		break;
-
-	case PRU_SEND:
-		/* Packet must have a header (but that's about it) */
-		if (m->m_len < sizeof (struct ip) ||
-		    (m = m_pullup(m, sizeof (struct ip))) == 0) {
-			ipstat.ips_toosmall++;
-			error = EINVAL;
-			break;
-		}
-
-		/* Send packet */
-		error = div_output(so, m, nam, control); 
-		m = NULL;
-		break;
-
-	case PRU_SOCKADDR:
-		in_setsockaddr(inp, nam);
-		break;
-
-	case PRU_SENSE:
-		/*
-		 * stat: don't bother with a blocksize.
-		 */
-		return (0);
-
-	/*
-	 * Not supported.
-	 */
-	case PRU_CONNECT:
-	case PRU_CONNECT2:
-	case PRU_CONTROL:
-	case PRU_RCVOOB:
-	case PRU_RCVD:
-	case PRU_LISTEN:
-	case PRU_ACCEPT:
-	case PRU_SENDOOB:
-	case PRU_PEERADDR:
-		error = EOPNOTSUPP;
-		break;
-
-	default:
-		panic("div_usrreq");
-	}
-release:
-	if (m)
-		m_freem(m);
-	return (error);
-}
diff --git a/c/src/libnetworking/netinet/ip_fw.c b/c/src/libnetworking/netinet/ip_fw.c
deleted file mode 100644
index aeb09b0bbe..0000000000
--- a/c/src/libnetworking/netinet/ip_fw.c
+++ /dev/null
@@ -1,1069 +0,0 @@
-/*
- * Copyright (c) 1996 Alex Nash
- * Copyright (c) 1993 Daniel Boulet
- * Copyright (c) 1994 Ugen J.S.Antsilevich
- *
- * Redistribution and use in source forms, with and without modification,
- * are permitted provided that this entire comment appears intact.
- *
- * Redistribution in binary form may occur without any restrictions.
- * Obviously, it would be nice if you gave credit where credit is due
- * but requiring it would be too onerous.
- *
- * This software is provided ``AS IS'' without any warranties of any kind.
- *
- *	$Id$
- */
-
-/*
- * Implement IP packet firewall
- */
-
-#ifndef IPFIREWALL_MODULE
-#include "opt_ipfw.h"
-#endif
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/malloc.h>
-#include <sys/mbuf.h>
-#include <sys/queue.h>
-#include <sys/kernel.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <sys/sysctl.h>
-#include <net/if.h>
-#include <net/route.h>
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/ip_var.h>
-#include <netinet/ip_icmp.h>
-#include <netinet/ip_fw.h>
-#include <netinet/tcp.h>
-#include <netinet/tcp_timer.h>
-#include <netinet/tcp_var.h>
-#include <netinet/tcpip.h>
-#include <netinet/udp.h>
-
-static int fw_debug = 1;
-#ifdef IPFIREWALL_VERBOSE
-static int fw_verbose = 1;
-#else
-static int fw_verbose = 0;
-#endif
-#ifdef IPFIREWALL_VERBOSE_LIMIT
-static int fw_verbose_limit = IPFIREWALL_VERBOSE_LIMIT;
-#else
-static int fw_verbose_limit = 0;
-#endif
-
-LIST_HEAD (ip_fw_head, ip_fw_chain) ip_fw_chain;
-
-#ifdef SYSCTL_NODE
-SYSCTL_NODE(_net_inet_ip, OID_AUTO, fw, CTLFLAG_RW, 0, "Firewall");
-SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, debug, CTLFLAG_RW, &fw_debug, 0, "");
-SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, verbose, CTLFLAG_RW, &fw_verbose, 0, "");
-SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, verbose_limit, CTLFLAG_RW, &fw_verbose_limit, 0, "");
-#endif
-
-#define dprintf(a)	if (!fw_debug); else printf a
-
-#define print_ip(a)	 printf("%ld.%ld.%ld.%ld",(ntohl(a.s_addr)>>24)&0xFF,\
-				 		  (ntohl(a.s_addr)>>16)&0xFF,\
-						  (ntohl(a.s_addr)>>8)&0xFF,\
-						  (ntohl(a.s_addr))&0xFF);
-
-#define dprint_ip(a)	if (!fw_debug); else print_ip(a)
-
-static int	add_entry __P((struct ip_fw_head *chainptr, struct ip_fw *frwl));
-static int	del_entry __P((struct ip_fw_head *chainptr, u_short number));
-static int	zero_entry __P((struct mbuf *m));
-static struct ip_fw *check_ipfw_struct __P((struct ip_fw *m));
-static struct ip_fw *check_ipfw_mbuf __P((struct mbuf *fw));
-static int	ipopts_match __P((struct ip *ip, struct ip_fw *f));
-static int	port_match __P((u_short *portptr, int nports, u_short port,
-				int range_flag));
-static int	tcpflg_match __P((struct tcphdr *tcp, struct ip_fw *f));
-static int	icmptype_match __P((struct icmp *  icmp, struct ip_fw * f));
-static void	ipfw_report __P((struct ip_fw *f, struct ip *ip,
-				struct ifnet *rif, struct ifnet *oif));
-
-#ifdef IPFIREWALL_MODULE
-static ip_fw_chk_t *old_chk_ptr;
-static ip_fw_ctl_t *old_ctl_ptr;
-#endif
-
-static int	ip_fw_chk __P((struct ip **pip, int hlen,
-			struct ifnet *oif, int ignport, struct mbuf **m));
-static int	ip_fw_ctl __P((int stage, struct mbuf **mm));
-
-static char err_prefix[] = "ip_fw_ctl:";
-
-/*
- * Returns 1 if the port is matched by the vector, 0 otherwise
- */
-static inline int 
-port_match(u_short *portptr, int nports, u_short port, int range_flag)
-{
-	if (!nports)
-		return 1;
-	if (range_flag) {
-		if (portptr[0] <= port && port <= portptr[1]) {
-			return 1;
-		}
-		nports -= 2;
-		portptr += 2;
-	}
-	while (nports-- > 0) {
-		if (*portptr++ == port) {
-			return 1;
-		}
-	}
-	return 0;
-}
-
-static int
-tcpflg_match(struct tcphdr *tcp, struct ip_fw *f)
-{
-	u_char		flg_set, flg_clr;
-	
-	if ((f->fw_tcpf & IP_FW_TCPF_ESTAB) &&
-	    (tcp->th_flags & (IP_FW_TCPF_RST | IP_FW_TCPF_ACK)))
-		return 1;
-
-	flg_set = tcp->th_flags & f->fw_tcpf;
-	flg_clr = tcp->th_flags & f->fw_tcpnf;
-
-	if (flg_set != f->fw_tcpf)
-		return 0;
-	if (flg_clr)
-		return 0;
-
-	return 1;
-}
-
-static int
-icmptype_match(struct icmp *icmp, struct ip_fw *f)
-{
-	int type;
-
-	if (!(f->fw_flg & IP_FW_F_ICMPBIT))
-		return(1);
-
-	type = icmp->icmp_type;
-
-	/* check for matching type in the bitmap */
-	if (type < IP_FW_ICMPTYPES_DIM * sizeof(unsigned) * 8 &&
-		(f->fw_icmptypes[type / (sizeof(unsigned) * 8)] & 
-		(1U << (type % (8 * sizeof(unsigned))))))
-		return(1);
-
-	return(0); /* no match */
-}
-
-static int
-ipopts_match(struct ip *ip, struct ip_fw *f)
-{
-	register u_char *cp;
-	int opt, optlen, cnt;
-	u_char	opts, nopts, nopts_sve;
-
-	cp = (u_char *)(ip + 1);
-	cnt = (ip->ip_hl << 2) - sizeof (struct ip);
-	opts = f->fw_ipopt;
-	nopts = nopts_sve = f->fw_ipnopt;
-
-	for (; cnt > 0; cnt -= optlen, cp += optlen) {
-		opt = cp[IPOPT_OPTVAL];
-		if (opt == IPOPT_EOL)
-			break;
-		if (opt == IPOPT_NOP)
-			optlen = 1;
-		else {
-			optlen = cp[IPOPT_OLEN];
-			if (optlen <= 0 || optlen > cnt) {
-				return 0; /*XXX*/
-			}
-		}
-		switch (opt) {
-
-		default:
-			break;
-
-		case IPOPT_LSRR:
-			opts &= ~IP_FW_IPOPT_LSRR;
-			nopts &= ~IP_FW_IPOPT_LSRR;
-			break;
-
-		case IPOPT_SSRR:
-			opts &= ~IP_FW_IPOPT_SSRR;
-			nopts &= ~IP_FW_IPOPT_SSRR;
-			break;
-
-		case IPOPT_RR:
-			opts &= ~IP_FW_IPOPT_RR;
-			nopts &= ~IP_FW_IPOPT_RR;
-			break;
-		case IPOPT_TS:
-			opts &= ~IP_FW_IPOPT_TS;
-			nopts &= ~IP_FW_IPOPT_TS;
-			break;
-		}
-		if (opts == nopts)
-			break;
-	}
-	if (opts == 0 && nopts == nopts_sve)
-		return 1;
-	else
-		return 0;
-}
-
-static inline int
-iface_match(struct ifnet *ifp, union ip_fw_if *ifu, int byname)
-{
-	/* Check by name or by IP address */
-	if (byname) {
-		/* Check unit number (-1 is wildcard) */
-		if (ifu->fu_via_if.unit != -1
-		    && ifp->if_unit != ifu->fu_via_if.unit)
-			return(0);
-		/* Check name */
-		if (strncmp(ifp->if_name, ifu->fu_via_if.name, FW_IFNLEN))
-			return(0);
-		return(1);
-	} else if (ifu->fu_via_ip.s_addr != 0) {	/* Zero == wildcard */
-		struct ifaddr *ia;
-
-		for (ia = ifp->if_addrlist; ia; ia = ia->ifa_next) {
-			if (ia->ifa_addr == NULL)
-				continue;
-			if (ia->ifa_addr->sa_family != AF_INET)
-				continue;
-			if (ifu->fu_via_ip.s_addr != ((struct sockaddr_in *)
-			    (ia->ifa_addr))->sin_addr.s_addr)
-				continue;
-			return(1);
-		}
-		return(0);
-	}
-	return(1);
-}
-
-static void
-ipfw_report(struct ip_fw *f, struct ip *ip,
-	struct ifnet *rif, struct ifnet *oif)
-{
-	static int counter;
-	struct tcphdr *const tcp = (struct tcphdr *) ((u_long *) ip+ ip->ip_hl);
-	struct udphdr *const udp = (struct udphdr *) ((u_long *) ip+ ip->ip_hl);
-	struct icmp *const icmp = (struct icmp *) ((u_long *) ip + ip->ip_hl);
-	int count;
-
-	count = f ? f->fw_pcnt : ++counter;
-	if (fw_verbose_limit != 0 && count > fw_verbose_limit)
-		return;
-
-	/* Print command name */
-	printf("ipfw: %d ", f ? f->fw_number : -1);
-	if (!f)
-		printf("Refuse");
-	else
-		switch (f->fw_flg & IP_FW_F_COMMAND) {
-		case IP_FW_F_DENY:
-			printf("Deny");
-			break;
-		case IP_FW_F_REJECT:
-			if (f->fw_reject_code == IP_FW_REJECT_RST)
-				printf("Reset");
-			else
-				printf("Unreach");
-			break;
-		case IP_FW_F_ACCEPT:
-			printf("Accept");
-			break;
-		case IP_FW_F_COUNT:
-			printf("Count");
-			break;
-		case IP_FW_F_DIVERT:
-			printf("Divert %d", f->fw_divert_port);
-			break;
-		case IP_FW_F_TEE:
-			printf("Tee %d", f->fw_divert_port);
-			break;
-		case IP_FW_F_SKIPTO:
-			printf("SkipTo %d", f->fw_skipto_rule);
-			break;
-		default:	
-			printf("UNKNOWN");
-			break;
-		}
-	printf(" ");
-
-	switch (ip->ip_p) {
-	case IPPROTO_TCP:
-		printf("TCP ");
-		print_ip(ip->ip_src);
-		if ((ip->ip_off & IP_OFFMASK) == 0)
-			printf(":%d ", ntohs(tcp->th_sport));
-		else
-			printf(" ");
-		print_ip(ip->ip_dst);
-		if ((ip->ip_off & IP_OFFMASK) == 0)
-			printf(":%d", ntohs(tcp->th_dport));
-		break;
-	case IPPROTO_UDP:
-		printf("UDP ");
-		print_ip(ip->ip_src);
-		if ((ip->ip_off & IP_OFFMASK) == 0)
-			printf(":%d ", ntohs(udp->uh_sport));
-		else
-			printf(" ");
-		print_ip(ip->ip_dst);
-		if ((ip->ip_off & IP_OFFMASK) == 0)
-			printf(":%d", ntohs(udp->uh_dport));
-		break;
-	case IPPROTO_ICMP:
-		printf("ICMP:%u.%u ", icmp->icmp_type, icmp->icmp_code);
-		print_ip(ip->ip_src);
-		printf(" ");
-		print_ip(ip->ip_dst);
-		break;
-	default:
-		printf("P:%d ", ip->ip_p);
-		print_ip(ip->ip_src);
-		printf(" ");
-		print_ip(ip->ip_dst);
-		break;
-	}
-	if (oif)
-		printf(" out via %s%d", oif->if_name, oif->if_unit);
-	else if (rif)
-		printf(" in via %s%d", rif->if_name, rif->if_unit);
-	if ((ip->ip_off & IP_OFFMASK)) 
-		printf(" Fragment = %d",ip->ip_off & IP_OFFMASK);
-	printf("\n");
-	if (fw_verbose_limit != 0 && count == fw_verbose_limit)
-		printf("ipfw: limit reached on rule #%d\n",
-		f ? f->fw_number : -1);
-}
-
-/*
- * Parameters:
- *
- *	ip	Pointer to packet header (struct ip *)
- *	hlen	Packet header length
- *	oif	Outgoing interface, or NULL if packet is incoming
- *	ignport	Ignore all divert/tee rules to this port (if non-zero)
- *	*m	The packet; we set to NULL when/if we nuke it.
- *
- * Return value:
- *
- *	0	The packet is to be accepted and routed normally OR
- *      	the packet was denied/rejected and has been dropped;
- *		in the latter case, *m is equal to NULL upon return.
- *	port	Divert the packet to port.
- */
-
-static int 
-ip_fw_chk(struct ip **pip, int hlen,
-	struct ifnet *oif, int ignport, struct mbuf **m)
-{
-	struct ip_fw_chain *chain;
-	struct ip_fw *rule = NULL;
-	struct ip *ip = *pip;
-	struct ifnet *const rif = (*m)->m_pkthdr.rcvif;
-	u_short offset = (ip->ip_off & IP_OFFMASK);
-	u_short src_port, dst_port;
-
-	/*
-	 * Go down the chain, looking for enlightment
-	 */
-	for (chain=ip_fw_chain.lh_first; chain; chain = chain->chain.le_next) {
-		register struct ip_fw *const f = chain->rule;
-
-		/* Check direction inbound */
-		if (!oif && !(f->fw_flg & IP_FW_F_IN))
-			continue;
-
-		/* Check direction outbound */
-		if (oif && !(f->fw_flg & IP_FW_F_OUT))
-			continue;
-
-		/* Fragments */
-		if ((f->fw_flg & IP_FW_F_FRAG) && !(ip->ip_off & IP_OFFMASK))
-			continue;
-
-		/* If src-addr doesn't match, not this rule. */
-		if (((f->fw_flg & IP_FW_F_INVSRC) != 0) ^ ((ip->ip_src.s_addr
-		    & f->fw_smsk.s_addr) != f->fw_src.s_addr))
-			continue;
-
-		/* If dest-addr doesn't match, not this rule. */
-		if (((f->fw_flg & IP_FW_F_INVDST) != 0) ^ ((ip->ip_dst.s_addr
-		    & f->fw_dmsk.s_addr) != f->fw_dst.s_addr))
-			continue;
-
-		/* Interface check */
-		if ((f->fw_flg & IF_FW_F_VIAHACK) == IF_FW_F_VIAHACK) {
-			struct ifnet *const iface = oif ? oif : rif;
-
-			/* Backwards compatibility hack for "via" */
-			if (!iface || !iface_match(iface,
-			    &f->fw_in_if, f->fw_flg & IP_FW_F_OIFNAME))
-				continue;
-		} else {
-			/* Check receive interface */
-			if ((f->fw_flg & IP_FW_F_IIFACE)
-			    && (!rif || !iface_match(rif,
-			      &f->fw_in_if, f->fw_flg & IP_FW_F_IIFNAME)))
-				continue;
-			/* Check outgoing interface */
-			if ((f->fw_flg & IP_FW_F_OIFACE)
-			    && (!oif || !iface_match(oif,
-			      &f->fw_out_if, f->fw_flg & IP_FW_F_OIFNAME)))
-				continue;
-		}
-
-		/* Check IP options */
-		if (f->fw_ipopt != f->fw_ipnopt && !ipopts_match(ip, f))
-			continue;
-
-		/* Check protocol; if wildcard, match */
-		if (f->fw_prot == IPPROTO_IP)
-			goto got_match;
-
-		/* If different, don't match */
-		if (ip->ip_p != f->fw_prot) 
-			continue;
-
-#define PULLUP_TO(len)	do {						\
-			    if ((*m)->m_len < (len)			\
-				&& (*m = m_pullup(*m, (len))) == 0) {	\
-				    goto bogusfrag;			\
-			    }						\
-			    *pip = ip = mtod(*m, struct ip *);		\
-			    offset = (ip->ip_off & IP_OFFMASK);		\
-			} while (0)
-
-		/* Protocol specific checks */
-		switch (ip->ip_p) {
-		case IPPROTO_TCP:
-		    {
-			struct tcphdr *tcp;
-
-			if (offset == 1)	/* cf. RFC 1858 */
-				goto bogusfrag;
-			if (offset != 0) {
-				/*
-				 * TCP flags and ports aren't available in this
-				 * packet -- if this rule specified either one,
-				 * we consider the rule a non-match.
-				 */
-				if (f->fw_nports != 0 ||
-				    f->fw_tcpf != f->fw_tcpnf)
-					continue;
-
-				break;
-			}
-			PULLUP_TO(hlen + 14);
-			tcp = (struct tcphdr *) ((u_long *)ip + ip->ip_hl);
-			if (f->fw_tcpf != f->fw_tcpnf && !tcpflg_match(tcp, f))
-				continue;
-			src_port = ntohs(tcp->th_sport);
-			dst_port = ntohs(tcp->th_dport);
-			goto check_ports;
-		    }
-
-		case IPPROTO_UDP:
-		    {
-			struct udphdr *udp;
-
-			if (offset != 0) {
-				/*
-				 * Port specification is unavailable -- if this
-				 * rule specifies a port, we consider the rule
-				 * a non-match.
-				 */
-				if (f->fw_nports != 0)
-					continue;
-
-				break;
-			}
-			PULLUP_TO(hlen + 4);
-			udp = (struct udphdr *) ((u_long *)ip + ip->ip_hl);
-			src_port = ntohs(udp->uh_sport);
-			dst_port = ntohs(udp->uh_dport);
-check_ports:
-			if (!port_match(&f->fw_pts[0],
-			    IP_FW_GETNSRCP(f), src_port,
-			    f->fw_flg & IP_FW_F_SRNG))
-				continue;
-			if (!port_match(&f->fw_pts[IP_FW_GETNSRCP(f)],
-			    IP_FW_GETNDSTP(f), dst_port,
-			    f->fw_flg & IP_FW_F_DRNG)) 
-				continue;
-			break;
-		    }
-
-		case IPPROTO_ICMP:
-		    {
-			struct icmp *icmp;
-
-			if (offset != 0)	/* Type isn't valid */
-				break;
-			PULLUP_TO(hlen + 2);
-			icmp = (struct icmp *) ((u_long *)ip + ip->ip_hl);
-			if (!icmptype_match(icmp, f))
-				continue;
-			break;
-		    }
-#undef PULLUP_TO
-
-bogusfrag:
-			if (fw_verbose)
-				ipfw_report(NULL, ip, rif, oif);
-			goto dropit;
-		}
-
-got_match:
-		/* Ignore divert/tee rule if socket port is "ignport" */
-		switch (f->fw_flg & IP_FW_F_COMMAND) {
-		case IP_FW_F_DIVERT:
-		case IP_FW_F_TEE:
-			if (f->fw_divert_port == ignport)
-				continue;       /* ignore this rule */
-			break;
-		}
-
-		/* Update statistics */
-		f->fw_pcnt += 1;
-		f->fw_bcnt += ip->ip_len;
-		f->timestamp = rtems_bsdnet_seconds_since_boot();
-
-		/* Log to console if desired */
-		if ((f->fw_flg & IP_FW_F_PRN) && fw_verbose)
-			ipfw_report(f, ip, rif, oif);
-
-		/* Take appropriate action */
-		switch (f->fw_flg & IP_FW_F_COMMAND) {
-		case IP_FW_F_ACCEPT:
-			return(0);
-		case IP_FW_F_COUNT:
-			continue;
-		case IP_FW_F_DIVERT:
-			return(f->fw_divert_port);
-		case IP_FW_F_TEE:
-			/*
-			 * XXX someday tee packet here, but beware that you
-			 * can't use m_copym() or m_copypacket() because
-			 * the divert input routine modifies the mbuf
-			 * (and these routines only increment reference
-			 * counts in the case of mbuf clusters), so need
-			 * to write custom routine.
-			 */
-			continue;
-		case IP_FW_F_SKIPTO:
-#ifdef DIAGNOSTIC
-			while (chain->chain.le_next
-			    && chain->chain.le_next->rule->fw_number
-				< f->fw_skipto_rule)
-#else
-			while (chain->chain.le_next->rule->fw_number
-			    < f->fw_skipto_rule)
-#endif
-				chain = chain->chain.le_next;
-			continue;
-		}
-
-		/* Deny/reject this packet using this rule */
-		rule = f;
-		break;
-	}
-
-#ifdef DIAGNOSTIC
-	/* Rule 65535 should always be there and should always match */
-	if (!chain)
-		panic("ip_fw: chain");
-#endif
-
-	/*
-	 * At this point, we're going to drop the packet.
-	 * Send a reject notice if all of the following are true:
-	 *
-	 * - The packet matched a reject rule
-	 * - The packet is not an ICMP packet
-	 * - The packet is not a multicast or broadcast packet
-	 */
-	if ((rule->fw_flg & IP_FW_F_COMMAND) == IP_FW_F_REJECT
-	    && ip->ip_p != IPPROTO_ICMP
-	    && !((*m)->m_flags & (M_BCAST|M_MCAST))
-	    && !IN_MULTICAST(ntohl(ip->ip_dst.s_addr))) {
-		switch (rule->fw_reject_code) {
-		case IP_FW_REJECT_RST:
-		  {
-			struct tcphdr *const tcp =
-				(struct tcphdr *) ((u_long *)ip + ip->ip_hl);
-			struct tcpiphdr ti, *const tip = (struct tcpiphdr *) ip;
-
-			if (offset != 0 || (tcp->th_flags & TH_RST))
-				break;
-			ti.ti_i = *((struct ipovly *) ip);
-			ti.ti_t = *tcp;
-			bcopy(&ti, ip, sizeof(ti));
-			NTOHL(tip->ti_seq);
-			NTOHL(tip->ti_ack);
-			tip->ti_len = ip->ip_len - hlen - (tip->ti_off << 2);
-			if (tcp->th_flags & TH_ACK) {
-				tcp_respond(NULL, tip, *m,
-				    (tcp_seq)0, ntohl(tcp->th_ack), TH_RST);
-			} else {
-				if (tcp->th_flags & TH_SYN)
-					tip->ti_len++;
-				tcp_respond(NULL, tip, *m, tip->ti_seq
-				    + tip->ti_len, (tcp_seq)0, TH_RST|TH_ACK);
-			}
-			*m = NULL;
-			break;
-		  }
-		default:	/* Send an ICMP unreachable using code */
-			icmp_error(*m, ICMP_UNREACH,
-			    rule->fw_reject_code, 0L, 0);
-			*m = NULL;
-			break;
-		}
-	}
-
-dropit:
-	/*
-	 * Finally, drop the packet.
-	 */
-	if (*m) {
-		m_freem(*m);
-		*m = NULL;
-	}
-	return(0);
-}
-
-static int
-add_entry(struct ip_fw_head *chainptr, struct ip_fw *frwl)
-{
-	struct ip_fw *ftmp = 0;
-	struct ip_fw_chain *fwc = 0, *fcp, *fcpl = 0;
-	u_short nbr = 0;
-	int s;
-
-	fwc = malloc(sizeof *fwc, M_IPFW, M_DONTWAIT);
-	ftmp = malloc(sizeof *ftmp, M_IPFW, M_DONTWAIT);
-	if (!fwc || !ftmp) {
-		dprintf(("%s malloc said no\n", err_prefix));
-		if (fwc)  free(fwc, M_IPFW);
-		if (ftmp) free(ftmp, M_IPFW);
-		return (ENOSPC);
-	}
-
-	bcopy(frwl, ftmp, sizeof(struct ip_fw));
-	ftmp->fw_in_if.fu_via_if.name[FW_IFNLEN - 1] = '\0';
-	ftmp->fw_pcnt = 0L;
-	ftmp->fw_bcnt = 0L;
-	fwc->rule = ftmp;
-	
-	s = splnet();
-
-	if (!chainptr->lh_first) {
-		LIST_INSERT_HEAD(chainptr, fwc, chain);
-		splx(s);
-		return(0);
-        } else if (ftmp->fw_number == (u_short)-1) {
-		if (fwc)  free(fwc, M_IPFW);
-		if (ftmp) free(ftmp, M_IPFW);
-		splx(s);
-		dprintf(("%s bad rule number\n", err_prefix));
-		return (EINVAL);
-        }
-
-	/* If entry number is 0, find highest numbered rule and add 100 */
-	if (ftmp->fw_number == 0) {
-		for (fcp = chainptr->lh_first; fcp; fcp = fcp->chain.le_next) {
-			if (fcp->rule->fw_number != (u_short)-1)
-				nbr = fcp->rule->fw_number;
-			else
-				break;
-		}
-		if (nbr < (u_short)-1 - 100)
-			nbr += 100;
-		ftmp->fw_number = nbr;
-	}
-
-	/* Got a valid number; now insert it, keeping the list ordered */
-	for (fcp = chainptr->lh_first; fcp; fcp = fcp->chain.le_next) {
-		if (fcp->rule->fw_number > ftmp->fw_number) {
-			if (fcpl) {
-				LIST_INSERT_AFTER(fcpl, fwc, chain);
-			} else {
-				LIST_INSERT_HEAD(chainptr, fwc, chain);
-			}
-			break;
-		} else {
-			fcpl = fcp;
-		}
-	}
-
-	splx(s);
-	return (0);
-}
-
-static int
-del_entry(struct ip_fw_head *chainptr, u_short number)
-{
-	struct ip_fw_chain *fcp;
-	int s;
-
-	s = splnet();
-
-	fcp = chainptr->lh_first; 
-	if (number != (u_short)-1) {
-		for (; fcp; fcp = fcp->chain.le_next) {
-			if (fcp->rule->fw_number == number) {
-				LIST_REMOVE(fcp, chain);
-				splx(s);
-				free(fcp->rule, M_IPFW);
-				free(fcp, M_IPFW);
-				return 0;
-			}
-		}
-	}
-
-	splx(s);
-	return (EINVAL);
-}
-
-static int
-zero_entry(struct mbuf *m)
-{
-	struct ip_fw *frwl;
-	struct ip_fw_chain *fcp;
-	int s;
-
-	if (m) {
-		if (m->m_len != sizeof(struct ip_fw))
-			return(EINVAL);
-		frwl = mtod(m, struct ip_fw *);
-	}
-	else
-		frwl = NULL;
-
-	/*
-	 *	It's possible to insert multiple chain entries with the
-	 *	same number, so we don't stop after finding the first
-	 *	match if zeroing a specific entry.
-	 */
-	s = splnet();
-	for (fcp = ip_fw_chain.lh_first; fcp; fcp = fcp->chain.le_next)
-		if (!frwl || frwl->fw_number == fcp->rule->fw_number) {
-			fcp->rule->fw_bcnt = fcp->rule->fw_pcnt = 0;
-			fcp->rule->timestamp = 0;
-		}
-	splx(s);
-
-	if (fw_verbose) {
-		if (frwl)
-			printf("ipfw: Entry %d cleared.\n", frwl->fw_number);
-		else
-			printf("ipfw: Accounting cleared.\n");
-	}
-
-	return(0);
-}
-
-static struct ip_fw *
-check_ipfw_mbuf(struct mbuf *m)
-{
-	/* Check length */
-	if (m->m_len != sizeof(struct ip_fw)) {
-		dprintf(("%s len=%d, want %d\n", err_prefix, m->m_len,
-		    (int)sizeof(struct ip_fw)));
-		return (NULL);
-	}
-	return(check_ipfw_struct(mtod(m, struct ip_fw *)));
-}
-
-static struct ip_fw *
-check_ipfw_struct(struct ip_fw *frwl)
-{
-	/* Check for invalid flag bits */
-	if ((frwl->fw_flg & ~IP_FW_F_MASK) != 0) {
-		dprintf(("%s undefined flag bits set (flags=%x)\n",
-		    err_prefix, frwl->fw_flg));
-		return (NULL);
-	}
-	/* Must apply to incoming or outgoing (or both) */
-	if (!(frwl->fw_flg & (IP_FW_F_IN | IP_FW_F_OUT))) {
-		dprintf(("%s neither in nor out\n", err_prefix));
-		return (NULL);
-	}
-	/* Empty interface name is no good */
-	if (((frwl->fw_flg & IP_FW_F_IIFNAME)
-	      && !*frwl->fw_in_if.fu_via_if.name)
-	    || ((frwl->fw_flg & IP_FW_F_OIFNAME)
-	      && !*frwl->fw_out_if.fu_via_if.name)) {
-		dprintf(("%s empty interface name\n", err_prefix));
-		return (NULL);
-	}
-	/* Sanity check interface matching */
-	if ((frwl->fw_flg & IF_FW_F_VIAHACK) == IF_FW_F_VIAHACK) {
-		;		/* allow "via" backwards compatibility */
-	} else if ((frwl->fw_flg & IP_FW_F_IN)
-	    && (frwl->fw_flg & IP_FW_F_OIFACE)) {
-		dprintf(("%s outgoing interface check on incoming\n",
-		    err_prefix));
-		return (NULL);
-	}
-	/* Sanity check port ranges */
-	if ((frwl->fw_flg & IP_FW_F_SRNG) && IP_FW_GETNSRCP(frwl) < 2) {
-		dprintf(("%s src range set but n_src_p=%d\n",
-		    err_prefix, IP_FW_GETNSRCP(frwl)));
-		return (NULL);
-	}
-	if ((frwl->fw_flg & IP_FW_F_DRNG) && IP_FW_GETNDSTP(frwl) < 2) {
-		dprintf(("%s dst range set but n_dst_p=%d\n",
-		    err_prefix, IP_FW_GETNDSTP(frwl)));
-		return (NULL);
-	}
-	if (IP_FW_GETNSRCP(frwl) + IP_FW_GETNDSTP(frwl) > IP_FW_MAX_PORTS) {
-		dprintf(("%s too many ports (%d+%d)\n",
-		    err_prefix, IP_FW_GETNSRCP(frwl), IP_FW_GETNDSTP(frwl)));
-		return (NULL);
-	}
-	/*
-	 *	Protocols other than TCP/UDP don't use port range
-	 */
-	if ((frwl->fw_prot != IPPROTO_TCP) &&
-	    (frwl->fw_prot != IPPROTO_UDP) &&
-	    (IP_FW_GETNSRCP(frwl) || IP_FW_GETNDSTP(frwl))) {
-		dprintf(("%s port(s) specified for non TCP/UDP rule\n",
-		    err_prefix));
-		return(NULL);
-	}
-
-	/*
-	 *	Rather than modify the entry to make such entries work, 
-	 *	we reject this rule and require user level utilities
-	 *	to enforce whatever policy they deem appropriate.
-	 */
-	if ((frwl->fw_src.s_addr & (~frwl->fw_smsk.s_addr)) || 
-		(frwl->fw_dst.s_addr & (~frwl->fw_dmsk.s_addr))) {
-		dprintf(("%s rule never matches\n", err_prefix));
-		return(NULL);
-	}
-
-	if ((frwl->fw_flg & IP_FW_F_FRAG) &&
-		(frwl->fw_prot == IPPROTO_UDP || frwl->fw_prot == IPPROTO_TCP)) {
-		if (frwl->fw_nports) {
-			dprintf(("%s cannot mix 'frag' and ports\n", err_prefix));
-			return(NULL);
-		}
-		if (frwl->fw_prot == IPPROTO_TCP &&
-			frwl->fw_tcpf != frwl->fw_tcpnf) {
-			dprintf(("%s cannot mix 'frag' with TCP flags\n", err_prefix));
-			return(NULL);
-		}
-	}
-
-	/* Check command specific stuff */
-	switch (frwl->fw_flg & IP_FW_F_COMMAND)
-	{
-	case IP_FW_F_REJECT:
-		if (frwl->fw_reject_code >= 0x100
-		    && !(frwl->fw_prot == IPPROTO_TCP
-		      && frwl->fw_reject_code == IP_FW_REJECT_RST)) {
-			dprintf(("%s unknown reject code\n", err_prefix));
-			return(NULL);
-		}
-		break;
-	case IP_FW_F_DIVERT:		/* Diverting to port zero is invalid */
-	case IP_FW_F_TEE:
-		if (frwl->fw_divert_port == 0) {
-			dprintf(("%s can't divert to port 0\n", err_prefix));
-			return (NULL);
-		}
-		break;
-	case IP_FW_F_DENY:
-	case IP_FW_F_ACCEPT:
-	case IP_FW_F_COUNT:
-	case IP_FW_F_SKIPTO:
-		break;
-	default:
-		dprintf(("%s invalid command\n", err_prefix));
-		return(NULL);
-	}
-
-	return frwl;
-}
-
-static int
-ip_fw_ctl(int stage, struct mbuf **mm)
-{
-	int error;
-	struct mbuf *m;
-
-	if (stage == IP_FW_GET) {
-		struct ip_fw_chain *fcp = ip_fw_chain.lh_first;
-		*mm = m = m_get(M_WAIT, MT_SOOPTS);
-		for (; fcp; fcp = fcp->chain.le_next) {
-			memcpy(m->m_data, fcp->rule, sizeof *(fcp->rule));
-			m->m_len = sizeof *(fcp->rule);
-			m->m_next = m_get(M_WAIT, MT_SOOPTS);
-			m = m->m_next;
-			m->m_len = 0;
-		}
-		return (0);
-	}
-	m = *mm;
-	/* only allow get calls if secure mode > 2 */
-	if (securelevel > 2) {
-		if (m) (void)m_free(m);
-		return(EPERM);
-	}
-	if (stage == IP_FW_FLUSH) {
-		while (ip_fw_chain.lh_first != NULL && 
-		    ip_fw_chain.lh_first->rule->fw_number != (u_short)-1) {
-			struct ip_fw_chain *fcp = ip_fw_chain.lh_first;
-			int s = splnet();
-			LIST_REMOVE(ip_fw_chain.lh_first, chain);
-			splx(s);
-			free(fcp->rule, M_IPFW);
-			free(fcp, M_IPFW);
-		}
-		if (m) (void)m_free(m);
-		return (0);
-	}
-	if (stage == IP_FW_ZERO) {
-		error = zero_entry(m);
-		if (m) (void)m_free(m);
-		return (error);
-	}
-	if (m == NULL) {
-		printf("%s NULL mbuf ptr\n", err_prefix);
-		return (EINVAL);
-	}
-
-	if (stage == IP_FW_ADD) {
-		struct ip_fw *frwl = check_ipfw_mbuf(m);
-
-		if (!frwl)
-			error = EINVAL;
-		else
-			error = add_entry(&ip_fw_chain, frwl);
-		if (m) (void)m_free(m);
-		return error;
-	}
-	if (stage == IP_FW_DEL) {
-		if (m->m_len != sizeof(struct ip_fw)) {
-			dprintf(("%s len=%d, want %d\n", err_prefix, m->m_len,
-			    (int)sizeof(struct ip_fw)));
-			error = EINVAL;
-		} else if (mtod(m, struct ip_fw *)->fw_number == (u_short)-1) {
-			dprintf(("%s can't delete rule 65535\n", err_prefix));
-			error = EINVAL;
-		} else
-			error = del_entry(&ip_fw_chain,
-			    mtod(m, struct ip_fw *)->fw_number);
-		if (m) (void)m_free(m);
-		return error;
-	}
-
-	dprintf(("%s unknown request %d\n", err_prefix, stage));
-	if (m) (void)m_free(m);
-	return (EINVAL);
-}
-
-void
-ip_fw_init(void)
-{
-	struct ip_fw default_rule;
-
-	ip_fw_chk_ptr = ip_fw_chk;
-	ip_fw_ctl_ptr = ip_fw_ctl;
-	LIST_INIT(&ip_fw_chain);
-
-	bzero(&default_rule, sizeof default_rule);
-	default_rule.fw_prot = IPPROTO_IP;
-	default_rule.fw_number = (u_short)-1;
-#ifdef IPFIREWALL_DEFAULT_TO_ACCEPT
-	default_rule.fw_flg |= IP_FW_F_ACCEPT;
-#else
-	default_rule.fw_flg |= IP_FW_F_DENY;
-#endif
-	default_rule.fw_flg |= IP_FW_F_IN | IP_FW_F_OUT;
-	if (check_ipfw_struct(&default_rule) == NULL ||
-		add_entry(&ip_fw_chain, &default_rule))
-		panic(__FUNCTION__);
-
-	printf("IP packet filtering initialized, "
-#ifdef IPDIVERT
-		"divert enabled, ");
-#else
-		"divert disabled, ");
-#endif
-#ifdef IPFIREWALL_DEFAULT_TO_ACCEPT
-	printf("default to accept, ");
-#endif
-#ifndef IPFIREWALL_VERBOSE
-	printf("logging disabled\n");
-#else
-	if (fw_verbose_limit == 0)
-		printf("unlimited logging\n");
-	else
-		printf("logging limited to %d packets/entry\n",
-		    fw_verbose_limit);
-#endif
-}
-
-#ifdef IPFIREWALL_MODULE
-
-#include <sys/exec.h>
-#include <sys/sysent.h>
-#include <sys/lkm.h>
-
-MOD_MISC(ipfw);
-
-static int
-ipfw_load(struct lkm_table *lkmtp, int cmd)
-{
-	int s=splnet();
-
-	old_chk_ptr = ip_fw_chk_ptr;
-	old_ctl_ptr = ip_fw_ctl_ptr;
-
-	ip_fw_init();
-	splx(s);
-	return 0;
-}
-
-static int
-ipfw_unload(struct lkm_table *lkmtp, int cmd)
-{
-	int s=splnet();
-
-	ip_fw_chk_ptr =  old_chk_ptr;
-	ip_fw_ctl_ptr =  old_ctl_ptr;
-
-	while (ip_fw_chain.lh_first != NULL) {
-		struct ip_fw_chain *fcp = ip_fw_chain.lh_first;
-		LIST_REMOVE(ip_fw_chain.lh_first, chain);
-		free(fcp->rule, M_IPFW);
-		free(fcp, M_IPFW);
-	}
-	
-	splx(s);
-	printf("IP firewall unloaded\n");
-	return 0;
-}
-
-int
-ipfw_mod(struct lkm_table *lkmtp, int cmd, int ver)
-{
-	DISPATCH(lkmtp, cmd, ver, ipfw_load, ipfw_unload, lkm_nullcmd);
-}
-#endif
diff --git a/c/src/libnetworking/netinet/ip_fw.h b/c/src/libnetworking/netinet/ip_fw.h
deleted file mode 100644
index cab7f4ac93..0000000000
--- a/c/src/libnetworking/netinet/ip_fw.h
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * Copyright (c) 1993 Daniel Boulet
- * Copyright (c) 1994 Ugen J.S.Antsilevich
- *
- * Redistribution and use in source forms, with and without modification,
- * are permitted provided that this entire comment appears intact.
- *
- * Redistribution in binary form may occur without any restrictions.
- * Obviously, it would be nice if you gave credit where credit is due
- * but requiring it would be too onerous.
- *
- * This software is provided ``AS IS'' without any warranties of any kind.
- *
- *	$Id$
- */
-
-#ifndef _IP_FW_H
-#define _IP_FW_H
-
-#include <net/if.h>
-
-/*
- * This union structure identifies an interface, either explicitly
- * by name or implicitly by IP address. The flags IP_FW_F_IIFNAME
- * and IP_FW_F_OIFNAME say how to interpret this structure. An
- * interface unit number of -1 matches any unit number, while an
- * IP address of 0.0.0.0 indicates matches any interface.
- *
- * The receive and transmit interfaces are only compared against the
- * the packet if the corresponding bit (IP_FW_F_IIFACE or IP_FW_F_OIFACE)
- * is set. Note some packets lack a receive or transmit interface
- * (in which case the missing "interface" never matches).
- */
-
-union ip_fw_if {
-    struct in_addr fu_via_ip;	/* Specified by IP address */
-    struct {			/* Specified by interface name */
-#define FW_IFNLEN     IFNAMSIZ
-	    char  name[FW_IFNLEN];
-	    short unit;		/* -1 means match any unit */
-    } fu_via_if;
-};
-
-/*
- * Format of an IP firewall descriptor
- *
- * fw_src, fw_dst, fw_smsk, fw_dmsk are always stored in network byte order.
- * fw_flg and fw_n*p are stored in host byte order (of course).
- * Port numbers are stored in HOST byte order.
- * Warning: setsockopt() will fail if sizeof(struct ip_fw) > MLEN (108)
- */
-
-struct ip_fw {
-    u_long fw_pcnt,fw_bcnt;		/* Packet and byte counters */
-    struct in_addr fw_src, fw_dst;	/* Source and destination IP addr */
-    struct in_addr fw_smsk, fw_dmsk;	/* Mask for src and dest IP addr */
-    u_short fw_number;			/* Rule number */
-    u_short fw_flg;			/* Flags word */
-#define IP_FW_MAX_PORTS	10		/* A reasonable maximum */
-    u_short fw_pts[IP_FW_MAX_PORTS];	/* Array of port numbers to match */
-    u_char fw_ipopt,fw_ipnopt;		/* IP options set/unset */
-    u_char fw_tcpf,fw_tcpnf;		/* TCP flags set/unset */
-#define IP_FW_ICMPTYPES_DIM (32 / (sizeof(unsigned) * 8))
-    unsigned fw_icmptypes[IP_FW_ICMPTYPES_DIM]; /* ICMP types bitmap */
-    long timestamp;			/* timestamp (tv_sec) of last match */
-    union ip_fw_if fw_in_if, fw_out_if;	/* Incoming and outgoing interfaces */
-    union {
-	u_short fu_divert_port;		/* Divert/tee port (options IPDIVERT) */
-	u_short fu_skipto_rule;		/* SKIPTO command rule number */
-	u_short fu_reject_code;		/* REJECT response code */
-    } fw_un;
-    u_char fw_prot;			/* IP protocol */
-    u_char fw_nports;			/* N'of src ports and # of dst ports */
-					/* in ports array (dst ports follow */
-					/* src ports; max of 10 ports in all; */
-					/* count of 0 means match all ports) */
-};
-
-#define IP_FW_GETNSRCP(rule)		((rule)->fw_nports & 0x0f)
-#define IP_FW_SETNSRCP(rule, n)		do {				\
-					  (rule)->fw_nports &= ~0x0f;	\
-					  (rule)->fw_nports |= (n);	\
-					} while (0)
-#define IP_FW_GETNDSTP(rule)		((rule)->fw_nports >> 4)
-#define IP_FW_SETNDSTP(rule, n)		do {				\
-					  (rule)->fw_nports &= ~0xf0;	\
-					  (rule)->fw_nports |= (n) << 4;\
-					} while (0)
-
-#define fw_divert_port	fw_un.fu_divert_port
-#define fw_skipto_rule	fw_un.fu_skipto_rule
-#define fw_reject_code	fw_un.fu_reject_code
-
-struct ip_fw_chain {
-        LIST_ENTRY(ip_fw_chain) chain;
-        struct ip_fw    *rule;
-};
-
-/*
- * Values for "flags" field .
- */
-#define IP_FW_F_IN	0x0001	/* Check inbound packets		*/
-#define IP_FW_F_OUT	0x0002	/* Check outbound packets		*/
-#define IP_FW_F_IIFACE	0x0004	/* Apply inbound interface test		*/
-#define IP_FW_F_OIFACE	0x0008	/* Apply outbound interface test	*/
-
-#define IP_FW_F_COMMAND 0x0070	/* Mask for type of chain entry:	*/
-#define IP_FW_F_DENY	0x0000	/* This is a deny rule			*/
-#define IP_FW_F_REJECT	0x0010	/* Deny and send a response packet	*/
-#define IP_FW_F_ACCEPT	0x0020	/* This is an accept rule		*/
-#define IP_FW_F_COUNT	0x0030	/* This is a count rule			*/
-#define IP_FW_F_DIVERT	0x0040	/* This is a divert rule		*/
-#define IP_FW_F_TEE	0x0050	/* This is a tee rule			*/
-#define IP_FW_F_SKIPTO	0x0060	/* This is a skipto rule		*/
-
-#define IP_FW_F_PRN	0x0080	/* Print if this rule matches		*/
-
-#define IP_FW_F_SRNG	0x0100	/* The first two src ports are a min	*
-				 * and max range (stored in host byte	*
-				 * order).				*/
-
-#define IP_FW_F_DRNG	0x0200	/* The first two dst ports are a min	*
-				 * and max range (stored in host byte	*
-				 * order).				*/
-
-#define IP_FW_F_IIFNAME	0x0400	/* In interface by name/unit (not IP)	*/
-#define IP_FW_F_OIFNAME	0x0800	/* Out interface by name/unit (not IP)	*/
-
-#define IP_FW_F_INVSRC	0x1000	/* Invert sense of src check		*/
-#define IP_FW_F_INVDST	0x2000	/* Invert sense of dst check		*/
-
-#define IP_FW_F_FRAG	0x4000	/* Fragment				*/
-
-#define IP_FW_F_ICMPBIT 0x8000	/* ICMP type bitmap is valid		*/
-
-#define IP_FW_F_MASK	0xFFFF	/* All possible flag bits mask		*/
-
-/*
- * For backwards compatibility with rules specifying "via iface" but
- * not restricted to only "in" or "out" packets, we define this combination
- * of bits to represent this configuration.
- */
-
-#define IF_FW_F_VIAHACK	(IP_FW_F_IN|IP_FW_F_OUT|IP_FW_F_IIFACE|IP_FW_F_OIFACE)
-
-/*
- * Definitions for REJECT response codes.
- * Values less than 256 correspond to ICMP unreachable codes.
- */
-#define IP_FW_REJECT_RST	0x0100		/* TCP packets: send RST */
-
-/*
- * Definitions for IP option names.
- */
-#define IP_FW_IPOPT_LSRR	0x01
-#define IP_FW_IPOPT_SSRR	0x02
-#define IP_FW_IPOPT_RR		0x04
-#define IP_FW_IPOPT_TS		0x08
-
-/*
- * Definitions for TCP flags.
- */
-#define IP_FW_TCPF_FIN		TH_FIN
-#define IP_FW_TCPF_SYN		TH_SYN
-#define IP_FW_TCPF_RST		TH_RST
-#define IP_FW_TCPF_PSH		TH_PUSH
-#define IP_FW_TCPF_ACK		TH_ACK
-#define IP_FW_TCPF_URG		TH_URG
-#define IP_FW_TCPF_ESTAB	0x40
-
-/*
- * Main firewall chains definitions and global var's definitions.
- */
-#ifdef KERNEL
-
-/*
- * Function definitions.
- */
-void ip_fw_init(void);
-
-#endif /* KERNEL */
-
-#endif /* _IP_FW_H */
diff --git a/c/src/libnetworking/netinet/ip_icmp.c b/c/src/libnetworking/netinet/ip_icmp.c
deleted file mode 100644
index a18dacca99..0000000000
--- a/c/src/libnetworking/netinet/ip_icmp.c
+++ /dev/null
@@ -1,710 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)ip_icmp.c	8.2 (Berkeley) 1/4/94
- *	$Id$
- */
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/malloc.h>
-#include <sys/mbuf.h>
-#include <sys/protosw.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <sys/kernel.h>
-#include <sys/socket.h>
-#include <sys/sysctl.h>
-
-#include <net/if.h>
-#include <net/route.h>
-
-#define _IP_VHL
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/in_var.h>
-#include <netinet/ip.h>
-#include <netinet/ip_icmp.h>
-#include <netinet/ip_var.h>
-#include <netinet/icmp_var.h>
-
-/*
- * ICMP routines: error generation, receive packet processing, and
- * routines to turnaround packets back to the originator, and
- * host table maintenance routines.
- */
-
-       struct	icmpstat icmpstat;
-SYSCTL_STRUCT(_net_inet_icmp, ICMPCTL_STATS, stats, CTLFLAG_RD,
-	&icmpstat, icmpstat, "");
-
-static int	icmpmaskrepl = 0;
-SYSCTL_INT(_net_inet_icmp, ICMPCTL_MASKREPL, maskrepl, CTLFLAG_RW,
-	&icmpmaskrepl, 0, "");
-
-static int	icmpbmcastecho = 1;
-SYSCTL_INT(_net_inet_icmp, OID_AUTO, bmcastecho, CTLFLAG_RW, &icmpbmcastecho,
-	   0, "");
-
-#ifdef ICMPPRINTFS
-int	icmpprintfs = 0;
-#endif
-
-static void	icmp_reflect __P((struct mbuf *));
-static void	icmp_send __P((struct mbuf *, struct mbuf *));
-static int	ip_next_mtu __P((int, int));
-
-extern	struct protosw inetsw[];
-
-/*
- * Generate an error packet of type error
- * in response to bad packet ip.
- */
-void
-icmp_error(n, type, code, dest, destifp)
-	struct mbuf *n;
-	int type, code;
-	n_long dest;
-	struct ifnet *destifp;
-{
-	register struct ip *oip = mtod(n, struct ip *), *nip;
-	register unsigned oiplen = IP_VHL_HL(oip->ip_vhl) << 2;
-	register struct icmp *icp;
-	register struct mbuf *m;
-	unsigned icmplen;
-
-#ifdef ICMPPRINTFS
-	if (icmpprintfs)
-		printf("icmp_error(%p, %x, %d)\n", oip, type, code);
-#endif
-	if (type != ICMP_REDIRECT)
-		icmpstat.icps_error++;
-	/*
-	 * Don't send error if not the first fragment of message.
-	 * Don't error if the old packet protocol was ICMP
-	 * error message, only known informational types.
-	 */
-	if (oip->ip_off &~ (IP_MF|IP_DF))
-		goto freeit;
-	if (oip->ip_p == IPPROTO_ICMP && type != ICMP_REDIRECT &&
-	  n->m_len >= oiplen + ICMP_MINLEN &&
-	  !ICMP_INFOTYPE(((struct icmp *)((caddr_t)oip + oiplen))->icmp_type)) {
-		icmpstat.icps_oldicmp++;
-		goto freeit;
-	}
-	/* Don't send error in response to a multicast or broadcast packet */
-	if (n->m_flags & (M_BCAST|M_MCAST))
-		goto freeit;
-	/*
-	 * First, formulate icmp message
-	 */
-	m = m_gethdr(M_DONTWAIT, MT_HEADER);
-	if (m == NULL)
-		goto freeit;
-	icmplen = oiplen + min(8, oip->ip_len);
-	m->m_len = icmplen + ICMP_MINLEN;
-	MH_ALIGN(m, m->m_len);
-	icp = mtod(m, struct icmp *);
-	if ((u_int)type > ICMP_MAXTYPE)
-		panic("icmp_error");
-	icmpstat.icps_outhist[type]++;
-	icp->icmp_type = type;
-	if (type == ICMP_REDIRECT)
-		icp->icmp_gwaddr.s_addr = dest;
-	else {
-		icp->icmp_void = 0;
-		/*
-		 * The following assignments assume an overlay with the
-		 * zeroed icmp_void field.
-		 */
-		if (type == ICMP_PARAMPROB) {
-			icp->icmp_pptr = code;
-			code = 0;
-		} else if (type == ICMP_UNREACH &&
-			code == ICMP_UNREACH_NEEDFRAG && destifp) {
-			icp->icmp_nextmtu = htons(destifp->if_mtu);
-		}
-	}
-
-	icp->icmp_code = code;
-	bcopy((caddr_t)oip, (caddr_t)&icp->icmp_ip, icmplen);
-	nip = &icp->icmp_ip;
-	nip->ip_len = htons((u_short)(nip->ip_len + oiplen));
-
-	/*
-	 * Now, copy old ip header (without options)
-	 * in front of icmp message.
-	 */
-	if (m->m_data - sizeof(struct ip) < m->m_pktdat)
-		panic("icmp len");
-	m->m_data -= sizeof(struct ip);
-	m->m_len += sizeof(struct ip);
-	m->m_pkthdr.len = m->m_len;
-	m->m_pkthdr.rcvif = n->m_pkthdr.rcvif;
-	nip = mtod(m, struct ip *);
-	bcopy((caddr_t)oip, (caddr_t)nip, sizeof(struct ip));
-	nip->ip_len = m->m_len;
-	nip->ip_vhl = IP_VHL_BORING;
-	nip->ip_p = IPPROTO_ICMP;
-	nip->ip_tos = 0;
-	icmp_reflect(m);
-
-freeit:
-	m_freem(n);
-}
-
-static struct sockaddr_in icmpsrc = { sizeof (struct sockaddr_in), AF_INET };
-static struct sockaddr_in icmpdst = { sizeof (struct sockaddr_in), AF_INET };
-static struct sockaddr_in icmpgw = { sizeof (struct sockaddr_in), AF_INET };
-
-/*
- * Process a received ICMP message.
- */
-void
-icmp_input(m, hlen)
-	register struct mbuf *m;
-	int hlen;
-{
-	register struct icmp *icp;
-	register struct ip *ip = mtod(m, struct ip *);
-	int icmplen = ip->ip_len;
-	register int i;
-	struct in_ifaddr *ia;
-	void (*ctlfunc) __P((int, struct sockaddr *, void *));
-	int code;
-
-	/*
-	 * Locate icmp structure in mbuf, and check
-	 * that not corrupted and of at least minimum length.
-	 */
-#ifdef ICMPPRINTFS
-	if (icmpprintfs) {
-		char buf[4 * sizeof "123"];
-		strcpy(buf, inet_ntoa(ip->ip_src));
-		printf("icmp_input from %s to %s, len %d\n",
-		       buf, inet_ntoa(ip->ip_dst), icmplen);
-	}
-#endif
-	if (icmplen < ICMP_MINLEN) {
-		icmpstat.icps_tooshort++;
-		goto freeit;
-	}
-	i = hlen + min(icmplen, ICMP_ADVLENMIN);
-	if (m->m_len < i && (m = m_pullup(m, i)) == 0)  {
-		icmpstat.icps_tooshort++;
-		return;
-	}
-	ip = mtod(m, struct ip *);
-	m->m_len -= hlen;
-	m->m_data += hlen;
-	icp = mtod(m, struct icmp *);
-	if (in_cksum(m, icmplen)) {
-		icmpstat.icps_checksum++;
-		goto freeit;
-	}
-	m->m_len += hlen;
-	m->m_data -= hlen;
-
-#ifdef ICMPPRINTFS
-	if (icmpprintfs)
-		printf("icmp_input, type %d code %d\n", icp->icmp_type,
-		    icp->icmp_code);
-#endif
-
-	/*
-	 * Message type specific processing.
-	 */
-	if (icp->icmp_type > ICMP_MAXTYPE)
-		goto raw;
-	icmpstat.icps_inhist[icp->icmp_type]++;
-	code = icp->icmp_code;
-	switch (icp->icmp_type) {
-
-	case ICMP_UNREACH:
-		switch (code) {
-			case ICMP_UNREACH_NET:
-			case ICMP_UNREACH_HOST:
-			case ICMP_UNREACH_PROTOCOL:
-			case ICMP_UNREACH_PORT:
-			case ICMP_UNREACH_SRCFAIL:
-				code += PRC_UNREACH_NET;
-				break;
-
-			case ICMP_UNREACH_NEEDFRAG:
-				code = PRC_MSGSIZE;
-				break;
-
-			case ICMP_UNREACH_NET_UNKNOWN:
-			case ICMP_UNREACH_NET_PROHIB:
-			case ICMP_UNREACH_TOSNET:
-				code = PRC_UNREACH_NET;
-				break;
-
-			case ICMP_UNREACH_HOST_UNKNOWN:
-			case ICMP_UNREACH_ISOLATED:
-			case ICMP_UNREACH_HOST_PROHIB:
-			case ICMP_UNREACH_TOSHOST:
-				code = PRC_UNREACH_HOST;
-				break;
-
-			case ICMP_UNREACH_FILTER_PROHIB:
-			case ICMP_UNREACH_HOST_PRECEDENCE:
-			case ICMP_UNREACH_PRECEDENCE_CUTOFF:
-				code = PRC_UNREACH_PORT;
-				break;
-
-			default:
-				goto badcode;
-		}
-		goto deliver;
-
-	case ICMP_TIMXCEED:
-		if (code > 1)
-			goto badcode;
-		code += PRC_TIMXCEED_INTRANS;
-		goto deliver;
-
-	case ICMP_PARAMPROB:
-		if (code > 1)
-			goto badcode;
-		code = PRC_PARAMPROB;
-		goto deliver;
-
-	case ICMP_SOURCEQUENCH:
-		if (code)
-			goto badcode;
-		code = PRC_QUENCH;
-	deliver:
-		/*
-		 * Problem with datagram; advise higher level routines.
-		 */
-		if (icmplen < ICMP_ADVLENMIN || icmplen < ICMP_ADVLEN(icp) ||
-		    IP_VHL_HL(icp->icmp_ip.ip_vhl) < (sizeof(struct ip) >> 2)) {
-			icmpstat.icps_badlen++;
-			goto freeit;
-		}
-		NTOHS(icp->icmp_ip.ip_len);
-		/* Discard ICMP's in response to multicast packets */
-		if (IN_MULTICAST(ntohl(icp->icmp_ip.ip_dst.s_addr)))
-			goto badcode;
-#ifdef ICMPPRINTFS
-		if (icmpprintfs)
-			printf("deliver to protocol %d\n", icp->icmp_ip.ip_p);
-#endif
-		icmpsrc.sin_addr = icp->icmp_ip.ip_dst;
-#if 1
-		/*
-		 * MTU discovery:
-		 * If we got a needfrag and there is a host route to the
-		 * original destination, and the MTU is not locked, then
-		 * set the MTU in the route to the suggested new value
-		 * (if given) and then notify as usual.  The ULPs will
-		 * notice that the MTU has changed and adapt accordingly.
-		 * If no new MTU was suggested, then we guess a new one
-		 * less than the current value.  If the new MTU is 
-		 * unreasonably small (arbitrarily set at 296), then
-		 * we reset the MTU to the interface value and enable the
-		 * lock bit, indicating that we are no longer doing MTU
-		 * discovery.
-		 */
-		if (code == PRC_MSGSIZE) {
-			struct rtentry *rt;
-			int mtu;
-
-			rt = rtalloc1((struct sockaddr *)&icmpsrc, 0,
-				      RTF_CLONING | RTF_PRCLONING);
-			if (rt && (rt->rt_flags & RTF_HOST)
-			    && !(rt->rt_rmx.rmx_locks & RTV_MTU)) {
-				mtu = ntohs(icp->icmp_nextmtu);
-				if (!mtu)
-					mtu = ip_next_mtu(rt->rt_rmx.rmx_mtu,
-							  1);
-#ifdef DEBUG_MTUDISC
-				printf("MTU for %s reduced to %d\n",
-					inet_ntoa(icmpsrc.sin_addr), mtu);
-#endif
-				if (mtu < 296) {
-					/* rt->rt_rmx.rmx_mtu =
-						rt->rt_ifp->if_mtu; */
-					rt->rt_rmx.rmx_locks |= RTV_MTU;
-				} else if (rt->rt_rmx.rmx_mtu > mtu) {
-					rt->rt_rmx.rmx_mtu = mtu;
-				}
-			}
-			if (rt)
-				RTFREE(rt);
-		}
-
-#endif
-		ctlfunc = inetsw[ip_protox[icp->icmp_ip.ip_p]].pr_ctlinput;
-		if (ctlfunc)
-			(*ctlfunc)(code, (struct sockaddr *)&icmpsrc,
-				   (void *)&icp->icmp_ip);
-		break;
-
-	badcode:
-		icmpstat.icps_badcode++;
-		break;
-
-	case ICMP_ECHO:
-		if (!icmpbmcastecho
-		    && (m->m_flags & (M_MCAST | M_BCAST)) != 0
-		    && IN_MULTICAST(ntohl(ip->ip_dst.s_addr))) {
-			icmpstat.icps_bmcastecho++;
-			break;
-		}
-		icp->icmp_type = ICMP_ECHOREPLY;
-		goto reflect;
-
-	case ICMP_TSTAMP:
-		if (!icmpbmcastecho
-		    && (m->m_flags & (M_MCAST | M_BCAST)) != 0
-		    && IN_MULTICAST(ntohl(ip->ip_dst.s_addr))) {
-			icmpstat.icps_bmcasttstamp++;
-			break;
-		}
-		if (icmplen < ICMP_TSLEN) {
-			icmpstat.icps_badlen++;
-			break;
-		}
-		icp->icmp_type = ICMP_TSTAMPREPLY;
-		icp->icmp_rtime = iptime();
-		icp->icmp_ttime = icp->icmp_rtime;	/* bogus, do later! */
-		goto reflect;
-
-	case ICMP_MASKREQ:
-#define	satosin(sa)	((struct sockaddr_in *)(sa))
-		if (icmpmaskrepl == 0)
-			break;
-		/*
-		 * We are not able to respond with all ones broadcast
-		 * unless we receive it over a point-to-point interface.
-		 */
-		if (icmplen < ICMP_MASKLEN)
-			break;
-		switch (ip->ip_dst.s_addr) {
-
-		case INADDR_BROADCAST:
-		case INADDR_ANY:
-			icmpdst.sin_addr = ip->ip_src;
-			break;
-
-		default:
-			icmpdst.sin_addr = ip->ip_dst;
-		}
-		ia = (struct in_ifaddr *)ifaof_ifpforaddr(
-			    (struct sockaddr *)&icmpdst, m->m_pkthdr.rcvif);
-		if (ia == 0)
-			break;
-		if (ia->ia_ifp == 0)
-			break;
-		icp->icmp_type = ICMP_MASKREPLY;
-		icp->icmp_mask = ia->ia_sockmask.sin_addr.s_addr;
-		if (ip->ip_src.s_addr == 0) {
-			if (ia->ia_ifp->if_flags & IFF_BROADCAST)
-			    ip->ip_src = satosin(&ia->ia_broadaddr)->sin_addr;
-			else if (ia->ia_ifp->if_flags & IFF_POINTOPOINT)
-			    ip->ip_src = satosin(&ia->ia_dstaddr)->sin_addr;
-		}
-reflect:
-		ip->ip_len += hlen;	/* since ip_input deducts this */
-		icmpstat.icps_reflect++;
-		icmpstat.icps_outhist[icp->icmp_type]++;
-		icmp_reflect(m);
-		return;
-
-	case ICMP_REDIRECT:
-		if (code > 3)
-			goto badcode;
-		if (icmplen < ICMP_ADVLENMIN || icmplen < ICMP_ADVLEN(icp) ||
-		    IP_VHL_HL(icp->icmp_ip.ip_vhl) < (sizeof(struct ip) >> 2)) {
-			icmpstat.icps_badlen++;
-			break;
-		}
-		/*
-		 * Short circuit routing redirects to force
-		 * immediate change in the kernel's routing
-		 * tables.  The message is also handed to anyone
-		 * listening on a raw socket (e.g. the routing
-		 * daemon for use in updating its tables).
-		 */
-		icmpgw.sin_addr = ip->ip_src;
-		icmpdst.sin_addr = icp->icmp_gwaddr;
-#ifdef	ICMPPRINTFS
-		if (icmpprintfs) {
-			char buf[4 * sizeof "123"];
-			strcpy(buf, inet_ntoa(icp->icmp_ip.ip_dst));
-
-			printf("redirect dst %s to %s\n",
-			       buf, inet_ntoa(icp->icmp_gwaddr));
-		}
-#endif
-		icmpsrc.sin_addr = icp->icmp_ip.ip_dst;
-		rtredirect((struct sockaddr *)&icmpsrc,
-		  (struct sockaddr *)&icmpdst,
-		  (struct sockaddr *)0, RTF_GATEWAY | RTF_HOST,
-		  (struct sockaddr *)&icmpgw, (struct rtentry **)0);
-		pfctlinput(PRC_REDIRECT_HOST, (struct sockaddr *)&icmpsrc);
-		break;
-
-	/*
-	 * No kernel processing for the following;
-	 * just fall through to send to raw listener.
-	 */
-	case ICMP_ECHOREPLY:
-	case ICMP_ROUTERADVERT:
-	case ICMP_ROUTERSOLICIT:
-	case ICMP_TSTAMPREPLY:
-	case ICMP_IREQREPLY:
-	case ICMP_MASKREPLY:
-	default:
-		break;
-	}
-
-raw:
-	rip_input(m, hlen);
-	return;
-
-freeit:
-	m_freem(m);
-}
-
-/*
- * Reflect the ip packet back to the source
- */
-static void
-icmp_reflect(m)
-	struct mbuf *m;
-{
-	register struct ip *ip = mtod(m, struct ip *);
-	register struct in_ifaddr *ia;
-	struct in_addr t;
-	struct mbuf *opts = 0;
-	int optlen = (IP_VHL_HL(ip->ip_vhl) << 2) - sizeof(struct ip);
-
-	if (!in_canforward(ip->ip_src) &&
-	    ((ntohl(ip->ip_src.s_addr) & IN_CLASSA_NET) !=
-	     (IN_LOOPBACKNET << IN_CLASSA_NSHIFT))) {
-		m_freem(m);	/* Bad return address */
-		goto done;	/* Ip_output() will check for broadcast */
-	}
-	t = ip->ip_dst;
-	ip->ip_dst = ip->ip_src;
-	/*
-	 * If the incoming packet was addressed directly to us,
-	 * use dst as the src for the reply.  Otherwise (broadcast
-	 * or anonymous), use the address which corresponds
-	 * to the incoming interface.
-	 */
-	for (ia = in_ifaddr; ia; ia = ia->ia_next) {
-		if (t.s_addr == IA_SIN(ia)->sin_addr.s_addr)
-			break;
-		if (ia->ia_ifp && (ia->ia_ifp->if_flags & IFF_BROADCAST) &&
-		    t.s_addr == satosin(&ia->ia_broadaddr)->sin_addr.s_addr)
-			break;
-	}
-	icmpdst.sin_addr = t;
-	if ((ia == (struct in_ifaddr *)0) && m->m_pkthdr.rcvif)
-		ia = (struct in_ifaddr *)ifaof_ifpforaddr(
-			(struct sockaddr *)&icmpdst, m->m_pkthdr.rcvif);
-	/*
-	 * The following happens if the packet was not addressed to us,
-	 * and was received on an interface with no IP address.
-	 */
-	if (ia == (struct in_ifaddr *)0)
-		ia = in_ifaddr;
-	t = IA_SIN(ia)->sin_addr;
-	ip->ip_src = t;
-	ip->ip_ttl = MAXTTL;
-
-	if (optlen > 0) {
-		register u_char *cp;
-		int opt, cnt;
-		u_int len;
-
-		/*
-		 * Retrieve any source routing from the incoming packet;
-		 * add on any record-route or timestamp options.
-		 */
-		cp = (u_char *) (ip + 1);
-		if ((opts = ip_srcroute()) == 0 &&
-		    (opts = m_gethdr(M_DONTWAIT, MT_HEADER))) {
-			opts->m_len = sizeof(struct in_addr);
-			mtod(opts, struct in_addr *)->s_addr = 0;
-		}
-		if (opts) {
-#ifdef ICMPPRINTFS
-		    if (icmpprintfs)
-			    printf("icmp_reflect optlen %d rt %d => ",
-				optlen, opts->m_len);
-#endif
-		    for (cnt = optlen; cnt > 0; cnt -= len, cp += len) {
-			    opt = cp[IPOPT_OPTVAL];
-			    if (opt == IPOPT_EOL)
-				    break;
-			    if (opt == IPOPT_NOP)
-				    len = 1;
-			    else {
-				    len = cp[IPOPT_OLEN];
-				    if (len <= 0 || len > cnt)
-					    break;
-			    }
-			    /*
-			     * Should check for overflow, but it "can't happen"
-			     */
-			    if (opt == IPOPT_RR || opt == IPOPT_TS ||
-				opt == IPOPT_SECURITY) {
-				    bcopy((caddr_t)cp,
-					mtod(opts, caddr_t) + opts->m_len, len);
-				    opts->m_len += len;
-			    }
-		    }
-		    /* Terminate & pad, if necessary */
-		    cnt = opts->m_len % 4;
-		    if (cnt) {
-			    for (; cnt < 4; cnt++) {
-				    *(mtod(opts, caddr_t) + opts->m_len) =
-					IPOPT_EOL;
-				    opts->m_len++;
-			    }
-		    }
-#ifdef ICMPPRINTFS
-		    if (icmpprintfs)
-			    printf("%d\n", opts->m_len);
-#endif
-		}
-		/*
-		 * Now strip out original options by copying rest of first
-		 * mbuf's data back, and adjust the IP length.
-		 */
-		ip->ip_len -= optlen;
-		ip->ip_vhl = IP_VHL_BORING;
-		m->m_len -= optlen;
-		if (m->m_flags & M_PKTHDR)
-			m->m_pkthdr.len -= optlen;
-		optlen += sizeof(struct ip);
-		bcopy((caddr_t)ip + optlen, (caddr_t)(ip + 1),
-			 (unsigned)(m->m_len - sizeof(struct ip)));
-	}
-	m->m_flags &= ~(M_BCAST|M_MCAST);
-	icmp_send(m, opts);
-done:
-	if (opts)
-		(void)m_free(opts);
-}
-
-/*
- * Send an icmp packet back to the ip level,
- * after supplying a checksum.
- */
-static void
-icmp_send(m, opts)
-	register struct mbuf *m;
-	struct mbuf *opts;
-{
-	register struct ip *ip = mtod(m, struct ip *);
-	register int hlen;
-	register struct icmp *icp;
-	struct route ro;
-
-	hlen = IP_VHL_HL(ip->ip_vhl) << 2;
-	m->m_data += hlen;
-	m->m_len -= hlen;
-	icp = mtod(m, struct icmp *);
-	icp->icmp_cksum = 0;
-	icp->icmp_cksum = in_cksum(m, ip->ip_len - hlen);
-	m->m_data -= hlen;
-	m->m_len += hlen;
-#ifdef ICMPPRINTFS
-	if (icmpprintfs) {
-		char buf[4 * sizeof "123"];
-		strcpy(buf, inet_ntoa(ip->ip_dst));
-		printf("icmp_send dst %s src %s\n",
-		       buf, inet_ntoa(ip->ip_src));
-	}
-#endif
-	bzero(&ro, sizeof ro);
-	(void) ip_output(m, opts, &ro, 0, NULL);
-	if (ro.ro_rt)
-		RTFREE(ro.ro_rt);
-}
-
-n_time
-iptime()
-{
-	struct timeval atv;
-	u_long t;
-
-	microtime(&atv);
-	t = (atv.tv_sec % (24*60*60)) * 1000 + atv.tv_usec / 1000;
-	return (htonl(t));
-}
-
-#if 1
-/*
- * Return the next larger or smaller MTU plateau (table from RFC 1191)
- * given current value MTU.  If DIR is less than zero, a larger plateau
- * is returned; otherwise, a smaller value is returned.
- */
-static int
-ip_next_mtu(mtu, dir)
-	int mtu;
-	int dir;
-{
-	static int mtutab[] = {
-		65535, 32000, 17914, 8166, 4352, 2002, 1492, 1006, 508, 296,
-		68, 0
-	};
-	int i;
-
-	for (i = 0; i < (sizeof mtutab) / (sizeof mtutab[0]); i++) {
-		if (mtu >= mtutab[i])
-			break;
-	}
-
-	if (dir < 0) {
-		if (i == 0) {
-			return 0;
-		} else {
-			return mtutab[i - 1];
-		}
-	} else {
-		if (mtutab[i] == 0) {
-			return 0;
-		} else if(mtu > mtutab[i]) {
-			return mtutab[i];
-		} else {
-			return mtutab[i + 1];
-		}
-	}
-}
-#endif
diff --git a/c/src/libnetworking/netinet/ip_icmp.h b/c/src/libnetworking/netinet/ip_icmp.h
deleted file mode 100644
index 9d07a682de..0000000000
--- a/c/src/libnetworking/netinet/ip_icmp.h
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)ip_icmp.h	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#ifndef _NETINET_IP_ICMP_H_
-#define _NETINET_IP_ICMP_H_
-
-/*
- * Interface Control Message Protocol Definitions.
- * Per RFC 792, September 1981.
- */
-
-/*
- * Internal of an ICMP Router Advertisement
- */
-struct icmp_ra_addr {
-	u_int32_t ira_addr;
-	u_int32_t ira_preference;
-};
-
-/*
- * Structure of an icmp header.
- */
-struct icmp {
-	u_char	icmp_type;		/* type of message, see below */
-	u_char	icmp_code;		/* type sub code */
-	u_short	icmp_cksum;		/* ones complement cksum of struct */
-	union {
-		u_char ih_pptr;			/* ICMP_PARAMPROB */
-		struct in_addr ih_gwaddr;	/* ICMP_REDIRECT */
-		struct ih_idseq {
-			n_short	icd_id;
-			n_short	icd_seq;
-		} ih_idseq;
-		int ih_void;
-
-		/* ICMP_UNREACH_NEEDFRAG -- Path MTU Discovery (RFC1191) */
-		struct ih_pmtu {
-			n_short ipm_void;
-			n_short ipm_nextmtu;
-		} ih_pmtu;
-
-		struct ih_rtradv {
-			u_char irt_num_addrs;
-			u_char irt_wpa;
-			u_int16_t irt_lifetime;
-		} ih_rtradv;
-	} icmp_hun;
-#define	icmp_pptr	icmp_hun.ih_pptr
-#define	icmp_gwaddr	icmp_hun.ih_gwaddr
-#define	icmp_id		icmp_hun.ih_idseq.icd_id
-#define	icmp_seq	icmp_hun.ih_idseq.icd_seq
-#define	icmp_void	icmp_hun.ih_void
-#define	icmp_pmvoid	icmp_hun.ih_pmtu.ipm_void
-#define	icmp_nextmtu	icmp_hun.ih_pmtu.ipm_nextmtu
-#define	icmp_num_addrs	icmp_hun.ih_rtradv.irt_num_addrs
-#define	icmp_wpa	icmp_hun.ih_rtradv.irt_wpa
-#define	icmp_lifetime	icmp_hun.ih_rtradv.irt_lifetime
-	union {
-		struct id_ts {
-			n_time its_otime;
-			n_time its_rtime;
-			n_time its_ttime;
-		} id_ts;
-		struct id_ip  {
-			struct ip idi_ip;
-			/* options and then 64 bits of data */
-		} id_ip;
-		struct icmp_ra_addr id_radv;
-		u_long	id_mask;
-		char	id_data[1];
-	} icmp_dun;
-#define	icmp_otime	icmp_dun.id_ts.its_otime
-#define	icmp_rtime	icmp_dun.id_ts.its_rtime
-#define	icmp_ttime	icmp_dun.id_ts.its_ttime
-#define	icmp_ip		icmp_dun.id_ip.idi_ip
-#define	icmp_radv	icmp_dun.id_radv
-#define	icmp_mask	icmp_dun.id_mask
-#define	icmp_data	icmp_dun.id_data
-};
-
-/*
- * Lower bounds on packet lengths for various types.
- * For the error advice packets must first insure that the
- * packet is large enough to contain the returned ip header.
- * Only then can we do the check to see if 64 bits of packet
- * data have been returned, since we need to check the returned
- * ip header length.
- */
-#define	ICMP_MINLEN	8				/* abs minimum */
-#define	ICMP_TSLEN	(8 + 3 * sizeof (n_time))	/* timestamp */
-#define	ICMP_MASKLEN	12				/* address mask */
-#define	ICMP_ADVLENMIN	(8 + sizeof (struct ip) + 8)	/* min */
-#ifndef _IP_VHL
-#define	ICMP_ADVLEN(p)	(8 + ((p)->icmp_ip.ip_hl << 2) + 8)
-	/* N.B.: must separately check that ip_hl >= 5 */
-#else
-#define	ICMP_ADVLEN(p)	(8 + (IP_VHL_HL((p)->icmp_ip.ip_vhl) << 2) + 8)
-	/* N.B.: must separately check that header length >= 5 */
-#endif
-
-/*
- * Definition of type and code field values.
- */
-#define	ICMP_ECHOREPLY		0		/* echo reply */
-#define	ICMP_UNREACH		3		/* dest unreachable, codes: */
-#define		ICMP_UNREACH_NET	0		/* bad net */
-#define		ICMP_UNREACH_HOST	1		/* bad host */
-#define		ICMP_UNREACH_PROTOCOL	2		/* bad protocol */
-#define		ICMP_UNREACH_PORT	3		/* bad port */
-#define		ICMP_UNREACH_NEEDFRAG	4		/* IP_DF caused drop */
-#define		ICMP_UNREACH_SRCFAIL	5		/* src route failed */
-#define		ICMP_UNREACH_NET_UNKNOWN 6		/* unknown net */
-#define		ICMP_UNREACH_HOST_UNKNOWN 7		/* unknown host */
-#define		ICMP_UNREACH_ISOLATED	8		/* src host isolated */
-#define		ICMP_UNREACH_NET_PROHIB	9		/* prohibited access */
-#define		ICMP_UNREACH_HOST_PROHIB 10		/* ditto */
-#define		ICMP_UNREACH_TOSNET	11		/* bad tos for net */
-#define		ICMP_UNREACH_TOSHOST	12		/* bad tos for host */
-#define		ICMP_UNREACH_FILTER_PROHIB 13		/* admin prohib */
-#define		ICMP_UNREACH_HOST_PRECEDENCE 14		/* host prec vio. */
-#define		ICMP_UNREACH_PRECEDENCE_CUTOFF 15	/* prec cutoff */
-#define	ICMP_SOURCEQUENCH	4		/* packet lost, slow down */
-#define	ICMP_REDIRECT		5		/* shorter route, codes: */
-#define		ICMP_REDIRECT_NET	0		/* for network */
-#define		ICMP_REDIRECT_HOST	1		/* for host */
-#define		ICMP_REDIRECT_TOSNET	2		/* for tos and net */
-#define		ICMP_REDIRECT_TOSHOST	3		/* for tos and host */
-#define	ICMP_ECHO		8		/* echo service */
-#define	ICMP_ROUTERADVERT	9		/* router advertisement */
-#define	ICMP_ROUTERSOLICIT	10		/* router solicitation */
-#define	ICMP_TIMXCEED		11		/* time exceeded, code: */
-#define		ICMP_TIMXCEED_INTRANS	0		/* ttl==0 in transit */
-#define		ICMP_TIMXCEED_REASS	1		/* ttl==0 in reass */
-#define	ICMP_PARAMPROB		12		/* ip header bad */
-#define		ICMP_PARAMPROB_OPTABSENT 1		/* req. opt. absent */
-#define	ICMP_TSTAMP		13		/* timestamp request */
-#define	ICMP_TSTAMPREPLY	14		/* timestamp reply */
-#define	ICMP_IREQ		15		/* information request */
-#define	ICMP_IREQREPLY		16		/* information reply */
-#define	ICMP_MASKREQ		17		/* address mask request */
-#define	ICMP_MASKREPLY		18		/* address mask reply */
-
-#define	ICMP_MAXTYPE		18
-
-#define	ICMP_INFOTYPE(type) \
-	((type) == ICMP_ECHOREPLY || (type) == ICMP_ECHO || \
-	(type) == ICMP_ROUTERADVERT || (type) == ICMP_ROUTERSOLICIT || \
-	(type) == ICMP_TSTAMP || (type) == ICMP_TSTAMPREPLY || \
-	(type) == ICMP_IREQ || (type) == ICMP_IREQREPLY || \
-	(type) == ICMP_MASKREQ || (type) == ICMP_MASKREPLY)
-
-#ifdef KERNEL
-void	icmp_error __P((struct mbuf *, int, int, n_long, struct ifnet *));
-void	icmp_input __P((struct mbuf *, int));
-#endif
-
-#endif
diff --git a/c/src/libnetworking/netinet/ip_input.c b/c/src/libnetworking/netinet/ip_input.c
deleted file mode 100644
index 4cc141933f..0000000000
--- a/c/src/libnetworking/netinet/ip_input.c
+++ /dev/null
@@ -1,1488 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)ip_input.c	8.2 (Berkeley) 1/4/94
- * $Id$
- *	$ANA: ip_input.c,v 1.5 1996/09/18 14:34:59 wollman Exp $
- */
-
-#define	_IP_VHL
-
-#include "opt_ipfw.h"
-
-#include <stddef.h>
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/malloc.h>
-#include <sys/mbuf.h>
-#include <sys/domain.h>
-#include <sys/protosw.h>
-#include <sys/socket.h>
-#include <sys/errno.h>
-#include <sys/time.h>
-#include <sys/kernel.h>
-#include <sys/syslog.h>
-#include <sys/sysctl.h>
-
-#include <net/if.h>
-#include <net/if_dl.h>
-#include <net/route.h>
-#include <net/netisr.h>
-
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/in_var.h>
-#include <netinet/ip.h>
-#include <netinet/in_pcb.h>
-#include <netinet/in_var.h>
-#include <netinet/ip_var.h>
-#include <netinet/ip_icmp.h>
-#include <machine/in_cksum.h>
-
-#include <sys/socketvar.h>
-
-#ifdef IPFIREWALL
-#include <netinet/ip_fw.h>
-#endif
-
-int rsvp_on = 0;
-static int ip_rsvp_on;
-struct socket *ip_rsvpd;
-
-static int	ipforwarding = 0;
-SYSCTL_INT(_net_inet_ip, IPCTL_FORWARDING, forwarding, CTLFLAG_RW,
-	&ipforwarding, 0, "");
-
-static int	ipsendredirects = 1; /* XXX */
-SYSCTL_INT(_net_inet_ip, IPCTL_SENDREDIRECTS, redirect, CTLFLAG_RW,
-	&ipsendredirects, 0, "");
-
-int	ip_defttl = IPDEFTTL;
-SYSCTL_INT(_net_inet_ip, IPCTL_DEFTTL, ttl, CTLFLAG_RW,
-	&ip_defttl, 0, "");
-
-static int	ip_dosourceroute = 0;
-SYSCTL_INT(_net_inet_ip, IPCTL_SOURCEROUTE, sourceroute, CTLFLAG_RW,
-	&ip_dosourceroute, 0, "");
-
-static int	ip_acceptsourceroute = 0;
-SYSCTL_INT(_net_inet_ip, IPCTL_ACCEPTSOURCEROUTE, accept_sourceroute,
-	CTLFLAG_RW, &ip_acceptsourceroute, 0, "");
-#ifdef DIAGNOSTIC
-static int	ipprintfs = 0;
-#endif
-
-extern	struct domain inetdomain;
-extern	struct protosw inetsw[];
-u_char	ip_protox[IPPROTO_MAX];
-static int	ipqmaxlen = IFQ_MAXLEN;
-struct	in_ifaddr *in_ifaddr;			/* first inet address */
-struct	ifqueue ipintrq;
-SYSCTL_INT(_net_inet_ip, IPCTL_INTRQMAXLEN, intr_queue_maxlen, CTLFLAG_RD,
-	&ipintrq.ifq_maxlen, 0, "");
-SYSCTL_INT(_net_inet_ip, IPCTL_INTRQDROPS, intr_queue_drops, CTLFLAG_RD,
-	&ipintrq.ifq_drops, 0, "");
-
-struct ipstat ipstat;
-
-/* Packet reassembly stuff */
-#define IPREASS_NHASH_LOG2      6
-#define IPREASS_NHASH           (1 << IPREASS_NHASH_LOG2)
-#define IPREASS_HMASK           (IPREASS_NHASH - 1)
-#define IPREASS_HASH(x,y) \
-	(((((x) & 0xF) | ((((x) >> 8) & 0xF) << 4)) ^ (y)) & IPREASS_HMASK)
-
-static struct ipq ipq[IPREASS_NHASH];
-static int    nipq = 0;         /* total # of reass queues */
-static int    maxnipq;
-
-#ifdef IPCTL_DEFMTU
-SYSCTL_INT(_net_inet_ip, IPCTL_DEFMTU, mtu, CTLFLAG_RW,
-	&ip_mtu, 0, "");
-#endif
-
-#if !defined(COMPAT_IPFW) || COMPAT_IPFW == 1
-#undef COMPAT_IPFW
-#define COMPAT_IPFW 1
-#else
-#undef COMPAT_IPFW
-#endif
-
-#ifdef COMPAT_IPFW
-/* Firewall hooks */
-ip_fw_chk_t *ip_fw_chk_ptr;
-ip_fw_ctl_t *ip_fw_ctl_ptr;
-
-/* IP Network Address Translation (NAT) hooks */ 
-ip_nat_t *ip_nat_ptr;
-ip_nat_ctl_t *ip_nat_ctl_ptr;
-#endif
-
-/*
- * We need to save the IP options in case a protocol wants to respond
- * to an incoming packet over the same route if the packet got here
- * using IP source routing.  This allows connection establishment and
- * maintenance when the remote end is on a network that is not known
- * to us.
- */
-static int	ip_nhops = 0;
-static	struct ip_srcrt {
-	struct	in_addr dst;			/* final destination */
-	char	nop;				/* one NOP to align */
-	char	srcopt[IPOPT_OFFSET + 1];	/* OPTVAL, OLEN and OFFSET */
-	struct	in_addr route[MAX_IPOPTLEN/sizeof(struct in_addr)];
-} ip_srcrt;
-
-#ifdef IPDIVERT
-/*
- * Shared variable between ip_input() and ip_reass() to communicate
- * about which packets, once assembled from fragments, get diverted,
- * and to which port.
- */
-static u_short	frag_divert_port;
-#endif
-
-static void save_rte __P((u_char *, struct in_addr));
-static void	 ip_deq __P((struct ipasfrag *));
-static int	 ip_dooptions __P((struct mbuf *));
-static void	 ip_enq __P((struct ipasfrag *, struct ipasfrag *));
-static void	 ip_forward __P((struct mbuf *, int));
-static void	 ip_freef __P((struct ipq *));
-static struct ip *
-	 ip_reass __P((struct ipasfrag *, struct ipq *, struct ipq *));
-static struct in_ifaddr *
-	 ip_rtaddr __P((struct in_addr));
-void	ipintr __P((void));
-/*
- * IP initialization: fill in IP protocol switch table.
- * All protocols not implemented in kernel go to raw IP protocol handler.
- */
-void
-ip_init()
-{
-	register struct protosw *pr;
-	register int i;
-
-	pr = pffindproto(PF_INET, IPPROTO_RAW, SOCK_RAW);
-	if (pr == 0)
-		panic("ip_init");
-	for (i = 0; i < IPPROTO_MAX; i++)
-		ip_protox[i] = pr - inetsw;
-	for (pr = inetdomain.dom_protosw;
-	    pr < inetdomain.dom_protoswNPROTOSW; pr++)
-		if (pr->pr_domain->dom_family == PF_INET &&
-		    pr->pr_protocol && pr->pr_protocol != IPPROTO_RAW)
-			ip_protox[pr->pr_protocol] = pr - inetsw;
-
-	for (i = 0; i < IPREASS_NHASH; i++)
-	    ipq[i].next = ipq[i].prev = &ipq[i];
-
-	maxnipq = nmbclusters/4;
-
-	ip_id = rtems_bsdnet_seconds_since_boot() & 0xffff;
-	ipintrq.ifq_maxlen = ipqmaxlen;
-#ifdef IPFIREWALL
-	ip_fw_init();
-#endif
-#ifdef IPNAT
-        ip_nat_init(); 
-#endif
-
-}
-
-static struct	sockaddr_in ipaddr = { sizeof(ipaddr), AF_INET };
-static struct	route ipforward_rt;
-
-/*
- * Ip input routine.  Checksum and byte swap header.  If fragmented
- * try to reassemble.  Process options.  Pass to next level.
- */
-void
-ip_input(struct mbuf *m)
-{
-	struct ip *ip;
-	struct ipq *fp;
-	struct in_ifaddr *ia;
-	int    i, hlen;
-	u_short sum;
-
-#ifdef	DIAGNOSTIC
-	if ((m->m_flags & M_PKTHDR) == 0)
-		panic("ip_input no HDR");
-#endif
-	/*
-	 * If no IP addresses have been set yet but the interfaces
-	 * are receiving, can't do anything with incoming packets yet.
-	 */
-	if (in_ifaddr == NULL)
-		goto bad;
-	ipstat.ips_total++;
-
-	if (m->m_pkthdr.len < sizeof(struct ip))
-		goto tooshort;
-
-#ifdef	DIAGNOSTIC
-	if (m->m_len < sizeof(struct ip))
-		panic("ipintr mbuf too short");
-#endif
-
-	if (m->m_len < sizeof (struct ip) &&
-	    (m = m_pullup(m, sizeof (struct ip))) == 0) {
-		ipstat.ips_toosmall++;
-		return;
-	}
-	ip = mtod(m, struct ip *);
-
-	if (IP_VHL_V(ip->ip_vhl) != IPVERSION) {
-		ipstat.ips_badvers++;
-		goto bad;
-	}
-
-	hlen = IP_VHL_HL(ip->ip_vhl) << 2;
-	if (hlen < sizeof(struct ip)) {	/* minimum header length */
-		ipstat.ips_badhlen++;
-		goto bad;
-	}
-	if (hlen > m->m_len) {
-		if ((m = m_pullup(m, hlen)) == 0) {
-			ipstat.ips_badhlen++;
-			return;
-		}
-		ip = mtod(m, struct ip *);
-	}
-	if (hlen == sizeof(struct ip)) {
-		sum = in_cksum_hdr(ip);
-	} else {
-		sum = in_cksum(m, hlen);
-	}
-	if (sum) {
-		ipstat.ips_badsum++;
-		goto bad;
-	}
-
-	/*
-	 * Convert fields to host representation.
-	 */
-	NTOHS(ip->ip_len);
-	if (ip->ip_len < hlen) {
-		ipstat.ips_badlen++;
-		goto bad;
-	}
-	NTOHS(ip->ip_id);
-	NTOHS(ip->ip_off);
-
-	/*
-	 * Check that the amount of data in the buffers
-	 * is as at least much as the IP header would have us expect.
-	 * Trim mbufs if longer than we expect.
-	 * Drop packet if shorter than we expect.
-	 */
-	if (m->m_pkthdr.len < ip->ip_len) {
-tooshort:
-		ipstat.ips_tooshort++;
-		goto bad;
-	}
-	if (m->m_pkthdr.len > ip->ip_len) {
-		if (m->m_len == m->m_pkthdr.len) {
-			m->m_len = ip->ip_len;
-			m->m_pkthdr.len = ip->ip_len;
-		} else
-			m_adj(m, ip->ip_len - m->m_pkthdr.len);
-	}
-	/*
-	 * IpHack's section.
-	 * Right now when no processing on packet has done
-	 * and it is still fresh out of network we do our black
-	 * deals with it.
-	 * - Firewall: deny/allow/divert
-	 * - Xlate: translate packet's addr/port (NAT).
-	 * - Wrap: fake packet's addr/port <unimpl.>
-	 * - Encapsulate: put it in another IP and send out. <unimp.>
- 	 */
-
-#ifdef COMPAT_IPFW
-	if (ip_fw_chk_ptr) {
-#ifdef IPDIVERT
-		u_short port;
-
-		port = (*ip_fw_chk_ptr)(&ip, hlen, NULL, ip_divert_ignore, &m);
-		ip_divert_ignore = 0;
-		if (port) {			/* Divert packet */
-			frag_divert_port = port;
-			goto ours;
-		}
-#else
-		/* If ipfw says divert, we have to just drop packet */
-		if ((*ip_fw_chk_ptr)(&ip, hlen, NULL, 0, &m)) {
-			m_freem(m);
-			m = NULL;
-		}
-#endif
-		if (!m)
-			return;
-	}
-
-        if (ip_nat_ptr && !(*ip_nat_ptr)(&ip, &m, m->m_pkthdr.rcvif, IP_NAT_IN))
-		return;
-#endif
-
-	/*
-	 * Process options and, if not destined for us,
-	 * ship it on.  ip_dooptions returns 1 when an
-	 * error was detected (causing an icmp message
-	 * to be sent and the original packet to be freed).
-	 */
-	ip_nhops = 0;		/* for source routed packets */
-	if (hlen > sizeof (struct ip) && ip_dooptions(m))
-		return;
-
-        /* greedy RSVP, snatches any PATH packet of the RSVP protocol and no
-         * matter if it is destined to another node, or whether it is 
-         * a multicast one, RSVP wants it! and prevents it from being forwarded
-         * anywhere else. Also checks if the rsvp daemon is running before
-	 * grabbing the packet.
-         */
-	if (rsvp_on && ip->ip_p==IPPROTO_RSVP) 
-		goto ours;
-
-	/*
-	 * Check our list of addresses, to see if the packet is for us.
-	 */
-	for (ia = in_ifaddr; ia; ia = ia->ia_next) {
-#define	satosin(sa)	((struct sockaddr_in *)(sa))
-
-		if (IA_SIN(ia)->sin_addr.s_addr == ip->ip_dst.s_addr)
-			goto ours;
-#ifdef BOOTP_COMPAT
-		if (IA_SIN(ia)->sin_addr.s_addr == INADDR_ANY)
-			goto ours;
-#endif
-		if (ia->ia_ifp && ia->ia_ifp->if_flags & IFF_BROADCAST) {
-			if (satosin(&ia->ia_broadaddr)->sin_addr.s_addr ==
-			    ip->ip_dst.s_addr)
-				goto ours;
-			if (ip->ip_dst.s_addr == ia->ia_netbroadcast.s_addr)
-				goto ours;
-		}
-	}
-	if (IN_MULTICAST(ntohl(ip->ip_dst.s_addr))) {
-		struct in_multi *inm;
-		if (ip_mrouter) {
-			/*
-			 * If we are acting as a multicast router, all
-			 * incoming multicast packets are passed to the
-			 * kernel-level multicast forwarding function.
-			 * The packet is returned (relatively) intact; if
-			 * ip_mforward() returns a non-zero value, the packet
-			 * must be discarded, else it may be accepted below.
-			 *
-			 * (The IP ident field is put in the same byte order
-			 * as expected when ip_mforward() is called from
-			 * ip_output().)
-			 */
-			ip->ip_id = htons(ip->ip_id);
-			if (ip_mforward(ip, m->m_pkthdr.rcvif, m, 0) != 0) {
-				ipstat.ips_cantforward++;
-				m_freem(m);
-				return;
-			}
-			ip->ip_id = ntohs(ip->ip_id);
-
-			/*
-			 * The process-level routing demon needs to receive
-			 * all multicast IGMP packets, whether or not this
-			 * host belongs to their destination groups.
-			 */
-			if (ip->ip_p == IPPROTO_IGMP)
-				goto ours;
-			ipstat.ips_forward++;
-		}
-		/*
-		 * See if we belong to the destination multicast group on the
-		 * arrival interface.
-		 */
-		IN_LOOKUP_MULTI(ip->ip_dst, m->m_pkthdr.rcvif, inm);
-		if (inm == NULL) {
-			ipstat.ips_cantforward++;
-			m_freem(m);
-			return;
-		}
-		goto ours;
-	}
-	if (ip->ip_dst.s_addr == (u_long)INADDR_BROADCAST)
-		goto ours;
-	if (ip->ip_dst.s_addr == INADDR_ANY)
-		goto ours;
-
-	/*
-	 * Not for us; forward if possible and desirable.
-	 */
-	if (ipforwarding == 0) {
-		ipstat.ips_cantforward++;
-		m_freem(m);
-	} else
-		ip_forward(m, 0);
-	return;
-
-ours:
-
-	/*
-	 * If offset or IP_MF are set, must reassemble.
-	 * Otherwise, nothing need be done.
-	 * (We could look in the reassembly queue to see
-	 * if the packet was previously fragmented,
-	 * but it's not worth the time; just let them time out.)
-	 */
-	if (ip->ip_off &~ (IP_DF | IP_RF)) {
-		if (m->m_flags & M_EXT) {		/* XXX */
-			if ((m = m_pullup(m, sizeof (struct ip))) == 0) {
-				ipstat.ips_toosmall++;
-#ifdef IPDIVERT
-				frag_divert_port = 0;
-#endif
-				return;
-			}
-			ip = mtod(m, struct ip *);
-		}
-		sum = IPREASS_HASH(ip->ip_src.s_addr, ip->ip_id);
-		/*
-		 * Look for queue of fragments
-		 * of this datagram.
-		 */
-		for (fp = ipq[sum].next; fp != &ipq[sum]; fp = fp->next)
-			if (ip->ip_id == fp->ipq_id &&
-			    ip->ip_src.s_addr == fp->ipq_src.s_addr &&
-			    ip->ip_dst.s_addr == fp->ipq_dst.s_addr &&
-			    ip->ip_p == fp->ipq_p)
-				goto found;
-
-		fp = 0;
-
-		/* check if there's a place for the new queue */
-		if (nipq > maxnipq) {
-		    /*
-		     * drop something from the tail of the current queue
-		     * before proceeding further
-		     */
-		    if (ipq[sum].prev == &ipq[sum]) {   /* gak */
-			for (i = 0; i < IPREASS_NHASH; i++) {
-			    if (ipq[i].prev != &ipq[i]) {
-				ip_freef(ipq[i].prev);
-				break;
-			    }
-			}
-		    } else
-			ip_freef(ipq[sum].prev);
-		}
-found:
-		/*
-		 * Adjust ip_len to not reflect header,
-		 * set ip_mff if more fragments are expected,
-		 * convert offset of this to bytes.
-		 */
-		ip->ip_len -= hlen;
-		((struct ipasfrag *)ip)->ipf_mff &= ~1;
-		if (ip->ip_off & IP_MF)
-			((struct ipasfrag *)ip)->ipf_mff |= 1;
-		ip->ip_off <<= 3;
-
-		/*
-		 * If datagram marked as having more fragments
-		 * or if this is not the first fragment,
-		 * attempt reassembly; if it succeeds, proceed.
-		 */
-		if (((struct ipasfrag *)ip)->ipf_mff & 1 || ip->ip_off) {
-			ipstat.ips_fragments++;
-			ip = ip_reass((struct ipasfrag *)ip, fp, &ipq[sum]);
-			if (ip == 0)
-				return;
-			ipstat.ips_reassembled++;
-			m = dtom(ip);
-#ifdef IPDIVERT
-			if (frag_divert_port) {
-				ip->ip_len += hlen;
-				HTONS(ip->ip_len);
-				HTONS(ip->ip_off);
-				HTONS(ip->ip_id);
-				ip->ip_sum = 0;
-				ip->ip_sum = in_cksum_hdr(ip);
-				NTOHS(ip->ip_id);
-				NTOHS(ip->ip_off);
-				NTOHS(ip->ip_len);
-				ip->ip_len -= hlen;
-			}
-#endif
-		} else
-			if (fp)
-				ip_freef(fp);
-	} else
-		ip->ip_len -= hlen;
-
-#ifdef IPDIVERT
-	/*
-	 * Divert reassembled packets to the divert protocol if required
-	 */
-	if (frag_divert_port) {
-		ipstat.ips_delivered++;
-		ip_divert_port = frag_divert_port;
-		frag_divert_port = 0;
-		(*inetsw[ip_protox[IPPROTO_DIVERT]].pr_input)(m, hlen);
-		return;
-	}
-
-	/* Don't let packets divert themselves */
-	if (ip->ip_p == IPPROTO_DIVERT) {
-		ipstat.ips_noproto++;
-		goto bad;
-	}
-#endif
-
-	/*
-	 * Switch out to protocol's input routine.
-	 */
-	ipstat.ips_delivered++;
-	(*inetsw[ip_protox[ip->ip_p]].pr_input)(m, hlen);
-	return;
-bad:
-	m_freem(m);
-}
-
-/*
- * IP software interrupt routine - to go away sometime soon
- */
-void
-ipintr(void)
-{
-	int s;
-	struct mbuf *m;
-
-	while(1) {
-		s = splimp();
-		IF_DEQUEUE(&ipintrq, m);
-		splx(s);
-		if (m == 0)
-			return;
-		ip_input(m);
-	}
-}
-
-NETISR_SET(NETISR_IP, ipintr);
-  
-/*
- * Take incoming datagram fragment and try to
- * reassemble it into whole datagram.  If a chain for
- * reassembly of this datagram already exists, then it
- * is given as fp; otherwise have to make a chain.
- */
-static struct ip *
-ip_reass(ip, fp, where)
-	register struct ipasfrag *ip;
-	register struct ipq *fp;
-	struct   ipq    *where;
-{
-	register struct mbuf *m = dtom(ip);
-	register struct ipasfrag *q;
-	struct mbuf *t;
-	int hlen = ip->ip_hl << 2;
-	int i, next;
-
-	/*
-	 * Presence of header sizes in mbufs
-	 * would confuse code below.
-	 */
-	m->m_data += hlen;
-	m->m_len -= hlen;
-
-	/*
-	 * If first fragment to arrive, create a reassembly queue.
-	 */
-	if (fp == 0) {
-		if ((t = m_get(M_DONTWAIT, MT_FTABLE)) == NULL)
-			goto dropfrag;
-		fp = mtod(t, struct ipq *);
-		insque(fp, where);
-		nipq++;
-		fp->ipq_ttl = IPFRAGTTL;
-		fp->ipq_p = ip->ip_p;
-		fp->ipq_id = ip->ip_id;
-		fp->ipq_next = fp->ipq_prev = (struct ipasfrag *)fp;
-		fp->ipq_src = ((struct ip *)ip)->ip_src;
-		fp->ipq_dst = ((struct ip *)ip)->ip_dst;
-#ifdef IPDIVERT
-		fp->ipq_divert = 0;
-#endif
-		q = (struct ipasfrag *)fp;
-		goto insert;
-	}
-
-	/*
-	 * Find a segment which begins after this one does.
-	 */
-	for (q = fp->ipq_next; q != (struct ipasfrag *)fp; q = q->ipf_next)
-		if (q->ip_off > ip->ip_off)
-			break;
-
-	/*
-	 * If there is a preceding segment, it may provide some of
-	 * our data already.  If so, drop the data from the incoming
-	 * segment.  If it provides all of our data, drop us.
-	 */
-	if (q->ipf_prev != (struct ipasfrag *)fp) {
-		i = q->ipf_prev->ip_off + q->ipf_prev->ip_len - ip->ip_off;
-		if (i > 0) {
-			if (i >= ip->ip_len)
-				goto dropfrag;
-			m_adj(dtom(ip), i);
-			ip->ip_off += i;
-			ip->ip_len -= i;
-		}
-	}
-
-	/*
-	 * While we overlap succeeding segments trim them or,
-	 * if they are completely covered, dequeue them.
-	 */
-	while (q != (struct ipasfrag *)fp && ip->ip_off + ip->ip_len > q->ip_off) {
-		struct mbuf *m0;
-
-		i = (ip->ip_off + ip->ip_len) - q->ip_off;
-		if (i < q->ip_len) {
-			q->ip_len -= i;
-			q->ip_off += i;
-			m_adj(dtom(q), i);
-			break;
-		}
-		m0 = dtom(q);
-		q = q->ipf_next;
-		ip_deq(q->ipf_prev);
-		m_freem(m0);
-	}
-
-insert:
-
-#ifdef IPDIVERT
-	/*
-	 * Any fragment diverting causes the whole packet to divert
-	 */
-	if (frag_divert_port != 0)
-		fp->ipq_divert = frag_divert_port;
-	frag_divert_port = 0;
-#endif
-
-	/*
-	 * Stick new segment in its place;
-	 * check for complete reassembly.
-	 */
-	ip_enq(ip, q->ipf_prev);
-	next = 0;
-	for (q = fp->ipq_next; q != (struct ipasfrag *)fp; q = q->ipf_next) {
-		if (q->ip_off != next)
-			return (0);
-		next += q->ip_len;
-	}
-	if (q->ipf_prev->ipf_mff & 1)
-		return (0);
-
-	/*
-	 * Reassembly is complete.  Make sure the packet is a sane size.
-	 */
-	if (next + (IP_VHL_HL(((struct ip *)fp->ipq_next)->ip_vhl) << 2)
-							> IP_MAXPACKET) {
-		ipstat.ips_toolong++;
-		ip_freef(fp);
-		return (0);
-	}
-
-	/*
-	 * Concatenate fragments.
-	 */
-	q = fp->ipq_next;
-	m = dtom(q);
-	t = m->m_next;
-	m->m_next = 0;
-	m_cat(m, t);
-	q = q->ipf_next;
-	while (q != (struct ipasfrag *)fp) {
-		t = dtom(q);
-		q = q->ipf_next;
-		m_cat(m, t);
-	}
-
-#ifdef IPDIVERT
-	/*
-	 * Record divert port for packet, if any
-	 */
-	frag_divert_port = fp->ipq_divert;
-#endif
-
-	/*
-	 * Create header for new ip packet by
-	 * modifying header of first packet;
-	 * dequeue and discard fragment reassembly header.
-	 * Make header visible.
-	 */
-	ip = fp->ipq_next;
-	ip->ip_len = next;
-	ip->ipf_mff &= ~1;
-	((struct ip *)ip)->ip_src = fp->ipq_src;
-	((struct ip *)ip)->ip_dst = fp->ipq_dst;
-	remque(fp);
-	nipq--;
-	(void) m_free(dtom(fp));
-	m = dtom(ip);
-	m->m_len += (ip->ip_hl << 2);
-	m->m_data -= (ip->ip_hl << 2);
-	/* some debugging cruft by sklower, below, will go away soon */
-	if (m->m_flags & M_PKTHDR) { /* XXX this should be done elsewhere */
-		register int plen = 0;
-		for (t = m; m; m = m->m_next)
-			plen += m->m_len;
-		t->m_pkthdr.len = plen;
-	}
-	return ((struct ip *)ip);
-
-dropfrag:
-	ipstat.ips_fragdropped++;
-	m_freem(m);
-	return (0);
-}
-
-/*
- * Free a fragment reassembly header and all
- * associated datagrams.
- */
-static void
-ip_freef(fp)
-	struct ipq *fp;
-{
-	register struct ipasfrag *q, *p;
-
-	for (q = fp->ipq_next; q != (struct ipasfrag *)fp; q = p) {
-		p = q->ipf_next;
-		ip_deq(q);
-		m_freem(dtom(q));
-	}
-	remque(fp);
-	(void) m_free(dtom(fp));
-	nipq--;
-}
-
-/*
- * Put an ip fragment on a reassembly chain.
- * Like insque, but pointers in middle of structure.
- */
-static void
-ip_enq(p, prev)
-	register struct ipasfrag *p, *prev;
-{
-
-	p->ipf_prev = prev;
-	p->ipf_next = prev->ipf_next;
-	prev->ipf_next->ipf_prev = p;
-	prev->ipf_next = p;
-}
-
-/*
- * To ip_enq as remque is to insque.
- */
-static void
-ip_deq(p)
-	register struct ipasfrag *p;
-{
-
-	p->ipf_prev->ipf_next = p->ipf_next;
-	p->ipf_next->ipf_prev = p->ipf_prev;
-}
-
-/*
- * IP timer processing;
- * if a timer expires on a reassembly
- * queue, discard it.
- */
-void
-ip_slowtimo()
-{
-	register struct ipq *fp;
-	int s = splnet();
-	int i;
-
-	for (i = 0; i < IPREASS_NHASH; i++) {
-		fp = ipq[i].next;
-		if (fp == 0)
-			continue;
-		while (fp != &ipq[i]) {
-			--fp->ipq_ttl;
-			fp = fp->next;
-			if (fp->prev->ipq_ttl == 0) {
-				ipstat.ips_fragtimeout++;
-				ip_freef(fp->prev);
-			}
-		}
-	}
-	splx(s);
-}
-
-/*
- * Drain off all datagram fragments.
- */
-void
-ip_drain()
-{
-	int     i;
-
-	for (i = 0; i < IPREASS_NHASH; i++) {
-		while (ipq[i].next != &ipq[i]) {
-			ipstat.ips_fragdropped++;
-			ip_freef(ipq[i].next);
-		}
-	}
-	in_rtqdrain();
-}
-
-/*
- * Do option processing on a datagram,
- * possibly discarding it if bad options are encountered,
- * or forwarding it if source-routed.
- * Returns 1 if packet has been forwarded/freed,
- * 0 if the packet should be processed further.
- */
-static int
-ip_dooptions(m)
-	struct mbuf *m;
-{
-	register struct ip *ip = mtod(m, struct ip *);
-	register u_char *cp;
-	register struct ip_timestamp *ipt;
-	register struct in_ifaddr *ia;
-	int opt, optlen, cnt, off, code, type = ICMP_PARAMPROB, forward = 0;
-	struct in_addr *sin, dst;
-	n_time ntime;
-
-	dst = ip->ip_dst;
-	cp = (u_char *)(ip + 1);
-	cnt = (IP_VHL_HL(ip->ip_vhl) << 2) - sizeof (struct ip);
-	for (; cnt > 0; cnt -= optlen, cp += optlen) {
-		opt = cp[IPOPT_OPTVAL];
-		if (opt == IPOPT_EOL)
-			break;
-		if (opt == IPOPT_NOP)
-			optlen = 1;
-		else {
-			optlen = cp[IPOPT_OLEN];
-			if (optlen <= 0 || optlen > cnt) {
-				code = &cp[IPOPT_OLEN] - (u_char *)ip;
-				goto bad;
-			}
-		}
-		switch (opt) {
-
-		default:
-			break;
-
-		/*
-		 * Source routing with record.
-		 * Find interface with current destination address.
-		 * If none on this machine then drop if strictly routed,
-		 * or do nothing if loosely routed.
-		 * Record interface address and bring up next address
-		 * component.  If strictly routed make sure next
-		 * address is on directly accessible net.
-		 */
-		case IPOPT_LSRR:
-		case IPOPT_SSRR:
-			if ((off = cp[IPOPT_OFFSET]) < IPOPT_MINOFF) {
-				code = &cp[IPOPT_OFFSET] - (u_char *)ip;
-				goto bad;
-			}
-			ipaddr.sin_addr = ip->ip_dst;
-			ia = (struct in_ifaddr *)
-				ifa_ifwithaddr((struct sockaddr *)&ipaddr);
-			if (ia == 0) {
-				if (opt == IPOPT_SSRR) {
-					type = ICMP_UNREACH;
-					code = ICMP_UNREACH_SRCFAIL;
-					goto bad;
-				}
-				if (!ip_dosourceroute)
-					goto nosourcerouting;
-				/*
-				 * Loose routing, and not at next destination
-				 * yet; nothing to do except forward.
-				 */
-				break;
-			}
-			off--;			/* 0 origin */
-			if (off > optlen - sizeof(struct in_addr)) {
-				/*
-				 * End of source route.  Should be for us.
-				 */
-				if (!ip_acceptsourceroute)
-					goto nosourcerouting;
-				save_rte(cp, ip->ip_src);
-				break;
-			}
-
-			if (!ip_dosourceroute) {
-				char buf[4*sizeof "123"];
-
-nosourcerouting:
-				strcpy(buf, inet_ntoa(ip->ip_dst));
-				log(LOG_WARNING, 
-				    "attempted source route from %s to %s\n",
-				    inet_ntoa(ip->ip_src), buf);
-				type = ICMP_UNREACH;
-				code = ICMP_UNREACH_SRCFAIL;
-				goto bad;
-			}
-
-			/*
-			 * locate outgoing interface
-			 */
-			(void)memcpy(&ipaddr.sin_addr, cp + off,
-			    sizeof(ipaddr.sin_addr));
-
-			if (opt == IPOPT_SSRR) {
-#define	INA	struct in_ifaddr *
-#define	SA	struct sockaddr *
-			    if ((ia = (INA)ifa_ifwithdstaddr((SA)&ipaddr)) == 0)
-				ia = (INA)ifa_ifwithnet((SA)&ipaddr);
-			} else
-				ia = ip_rtaddr(ipaddr.sin_addr);
-			if (ia == 0) {
-				type = ICMP_UNREACH;
-				code = ICMP_UNREACH_SRCFAIL;
-				goto bad;
-			}
-			ip->ip_dst = ipaddr.sin_addr;
-			(void)memcpy(cp + off, &(IA_SIN(ia)->sin_addr),
-			    sizeof(struct in_addr));
-			cp[IPOPT_OFFSET] += sizeof(struct in_addr);
-			/*
-			 * Let ip_intr's mcast routing check handle mcast pkts
-			 */
-			forward = !IN_MULTICAST(ntohl(ip->ip_dst.s_addr));
-			break;
-
-		case IPOPT_RR:
-			if ((off = cp[IPOPT_OFFSET]) < IPOPT_MINOFF) {
-				code = &cp[IPOPT_OFFSET] - (u_char *)ip;
-				goto bad;
-			}
-			/*
-			 * If no space remains, ignore.
-			 */
-			off--;			/* 0 origin */
-			if (off > optlen - sizeof(struct in_addr))
-				break;
-			(void)memcpy(&ipaddr.sin_addr, &ip->ip_dst,
-			    sizeof(ipaddr.sin_addr));
-			/*
-			 * locate outgoing interface; if we're the destination,
-			 * use the incoming interface (should be same).
-			 */
-			if ((ia = (INA)ifa_ifwithaddr((SA)&ipaddr)) == 0 &&
-			    (ia = ip_rtaddr(ipaddr.sin_addr)) == 0) {
-				type = ICMP_UNREACH;
-				code = ICMP_UNREACH_HOST;
-				goto bad;
-			}
-			(void)memcpy(cp + off, &(IA_SIN(ia)->sin_addr),
-			    sizeof(struct in_addr));
-			cp[IPOPT_OFFSET] += sizeof(struct in_addr);
-			break;
-
-		case IPOPT_TS:
-			code = cp - (u_char *)ip;
-			ipt = (struct ip_timestamp *)cp;
-			if (ipt->ipt_len < 5)
-				goto bad;
-			if (ipt->ipt_ptr > ipt->ipt_len - sizeof (long)) {
-				if (++ipt->ipt_oflw == 0)
-					goto bad;
-				break;
-			}
-			sin = (struct in_addr *)(cp + ipt->ipt_ptr - 1);
-			switch (ipt->ipt_flg) {
-
-			case IPOPT_TS_TSONLY:
-				break;
-
-			case IPOPT_TS_TSANDADDR:
-				if (ipt->ipt_ptr + sizeof(n_time) +
-				    sizeof(struct in_addr) > ipt->ipt_len)
-					goto bad;
-				ipaddr.sin_addr = dst;
-				ia = (INA)ifaof_ifpforaddr((SA)&ipaddr,
-							    m->m_pkthdr.rcvif);
-				if (ia == 0)
-					continue;
-				(void)memcpy(sin, &IA_SIN(ia)->sin_addr,
-				    sizeof(struct in_addr));
-				ipt->ipt_ptr += sizeof(struct in_addr);
-				break;
-
-			case IPOPT_TS_PRESPEC:
-				if (ipt->ipt_ptr + sizeof(n_time) +
-				    sizeof(struct in_addr) > ipt->ipt_len)
-					goto bad;
-				(void)memcpy(&ipaddr.sin_addr, sin,
-				    sizeof(struct in_addr));
-				if (ifa_ifwithaddr((SA)&ipaddr) == 0)
-					continue;
-				ipt->ipt_ptr += sizeof(struct in_addr);
-				break;
-
-			default:
-				goto bad;
-			}
-			ntime = iptime();
-			(void)memcpy(cp + ipt->ipt_ptr - 1, &ntime,
-			    sizeof(n_time));
-			ipt->ipt_ptr += sizeof(n_time);
-		}
-	}
-	if (forward && ipforwarding) {
-		ip_forward(m, 1);
-		return (1);
-	}
-	return (0);
-bad:
-	ip->ip_len -= IP_VHL_HL(ip->ip_vhl) << 2;   /* XXX icmp_error adds in hdr length */
-	icmp_error(m, type, code, 0, 0);
-	ipstat.ips_badoptions++;
-	return (1);
-}
-
-/*
- * Given address of next destination (final or next hop),
- * return internet address info of interface to be used to get there.
- */
-static struct in_ifaddr *
-ip_rtaddr(dst)
-	 struct in_addr dst;
-{
-	register struct sockaddr_in *sin;
-
-	sin = (struct sockaddr_in *) &ipforward_rt.ro_dst;
-
-	if (ipforward_rt.ro_rt == 0 || dst.s_addr != sin->sin_addr.s_addr) {
-		if (ipforward_rt.ro_rt) {
-			RTFREE(ipforward_rt.ro_rt);
-			ipforward_rt.ro_rt = 0;
-		}
-		sin->sin_family = AF_INET;
-		sin->sin_len = sizeof(*sin);
-		sin->sin_addr = dst;
-
-		rtalloc_ign(&ipforward_rt, RTF_PRCLONING);
-	}
-	if (ipforward_rt.ro_rt == 0)
-		return ((struct in_ifaddr *)0);
-	return ((struct in_ifaddr *) ipforward_rt.ro_rt->rt_ifa);
-}
-
-/*
- * Save incoming source route for use in replies,
- * to be picked up later by ip_srcroute if the receiver is interested.
- */
-void
-save_rte(option, dst)
-	u_char *option;
-	struct in_addr dst;
-{
-	unsigned olen;
-
-	olen = option[IPOPT_OLEN];
-#ifdef DIAGNOSTIC
-	if (ipprintfs)
-		printf("save_rte: olen %d\n", olen);
-#endif
-	if (olen > sizeof(ip_srcrt) - (1 + sizeof(dst)))
-		return;
-	bcopy(option, ip_srcrt.srcopt, olen);
-	ip_nhops = (olen - IPOPT_OFFSET - 1) / sizeof(struct in_addr);
-	ip_srcrt.dst = dst;
-}
-
-/*
- * Retrieve incoming source route for use in replies,
- * in the same form used by setsockopt.
- * The first hop is placed before the options, will be removed later.
- */
-struct mbuf *
-ip_srcroute()
-{
-	register struct in_addr *p, *q;
-	register struct mbuf *m;
-
-	if (ip_nhops == 0)
-		return ((struct mbuf *)0);
-	m = m_get(M_DONTWAIT, MT_SOOPTS);
-	if (m == 0)
-		return ((struct mbuf *)0);
-
-#define OPTSIZ	(sizeof(ip_srcrt.nop) + sizeof(ip_srcrt.srcopt))
-
-	/* length is (nhops+1)*sizeof(addr) + sizeof(nop + srcrt header) */
-	m->m_len = ip_nhops * sizeof(struct in_addr) + sizeof(struct in_addr) +
-	    OPTSIZ;
-#ifdef DIAGNOSTIC
-	if (ipprintfs)
-		printf("ip_srcroute: nhops %d mlen %d", ip_nhops, m->m_len);
-#endif
-
-	/*
-	 * First save first hop for return route
-	 */
-	p = &ip_srcrt.route[ip_nhops - 1];
-	*(mtod(m, struct in_addr *)) = *p--;
-#ifdef DIAGNOSTIC
-	if (ipprintfs)
-		printf(" hops %lx", ntohl(mtod(m, struct in_addr *)->s_addr));
-#endif
-
-	/*
-	 * Copy option fields and padding (nop) to mbuf.
-	 */
-	ip_srcrt.nop = IPOPT_NOP;
-	ip_srcrt.srcopt[IPOPT_OFFSET] = IPOPT_MINOFF;
-	(void)memcpy(mtod(m, caddr_t) + sizeof(struct in_addr),
-	    &ip_srcrt.nop, OPTSIZ);
-	q = (struct in_addr *)(mtod(m, caddr_t) +
-	    sizeof(struct in_addr) + OPTSIZ);
-#undef OPTSIZ
-	/*
-	 * Record return path as an IP source route,
-	 * reversing the path (pointers are now aligned).
-	 */
-	while (p >= ip_srcrt.route) {
-#ifdef DIAGNOSTIC
-		if (ipprintfs)
-			printf(" %lx", ntohl(q->s_addr));
-#endif
-		*q++ = *p--;
-	}
-	/*
-	 * Last hop goes to final destination.
-	 */
-	*q = ip_srcrt.dst;
-#ifdef DIAGNOSTIC
-	if (ipprintfs)
-		printf(" %lx\n", ntohl(q->s_addr));
-#endif
-	return (m);
-}
-
-/*
- * Strip out IP options, at higher
- * level protocol in the kernel.
- * Second argument is buffer to which options
- * will be moved, and return value is their length.
- * XXX should be deleted; last arg currently ignored.
- */
-void
-ip_stripoptions(m, mopt)
-	register struct mbuf *m;
-	struct mbuf *mopt;
-{
-	register int i;
-	struct ip *ip = mtod(m, struct ip *);
-	register caddr_t opts;
-	int olen;
-
-	olen = (IP_VHL_HL(ip->ip_vhl) << 2) - sizeof (struct ip);
-	opts = (caddr_t)(ip + 1);
-	i = m->m_len - (sizeof (struct ip) + olen);
-	bcopy(opts + olen, opts, (unsigned)i);
-	m->m_len -= olen;
-	if (m->m_flags & M_PKTHDR)
-		m->m_pkthdr.len -= olen;
-	ip->ip_vhl = IP_MAKE_VHL(IPVERSION, sizeof(struct ip) >> 2);
-}
-
-u_char inetctlerrmap[PRC_NCMDS] = {
-	0,		0,		0,		0,
-	0,		EMSGSIZE,	EHOSTDOWN,	EHOSTUNREACH,
-	EHOSTUNREACH,	EHOSTUNREACH,	ECONNREFUSED,	ECONNREFUSED,
-	EMSGSIZE,	EHOSTUNREACH,	0,		0,
-	0,		0,		0,		0,
-	ENOPROTOOPT
-};
-
-/*
- * Forward a packet.  If some error occurs return the sender
- * an icmp packet.  Note we can't always generate a meaningful
- * icmp message because icmp doesn't have a large enough repertoire
- * of codes and types.
- *
- * If not forwarding, just drop the packet.  This could be confusing
- * if ipforwarding was zero but some routing protocol was advancing
- * us as a gateway to somewhere.  However, we must let the routing
- * protocol deal with that.
- *
- * The srcrt parameter indicates whether the packet is being forwarded
- * via a source route.
- */
-static void
-ip_forward(m, srcrt)
-	struct mbuf *m;
-	int srcrt;
-{
-	register struct ip *ip = mtod(m, struct ip *);
-	register struct sockaddr_in *sin;
-	register struct rtentry *rt;
-	int error, type = 0, code = 0;
-	struct mbuf *mcopy;
-	n_long dest;
-	struct ifnet *destifp;
-
-	dest = 0;
-#ifdef DIAGNOSTIC
-	if (ipprintfs)
-		printf("forward: src %lx dst %lx ttl %x\n",
-			ip->ip_src.s_addr, ip->ip_dst.s_addr, ip->ip_ttl);
-#endif
-
-
-	if (m->m_flags & M_BCAST || in_canforward(ip->ip_dst) == 0) {
-		ipstat.ips_cantforward++;
-		m_freem(m);
-		return;
-	}
-	HTONS(ip->ip_id);
-	if (ip->ip_ttl <= IPTTLDEC) {
-		icmp_error(m, ICMP_TIMXCEED, ICMP_TIMXCEED_INTRANS, dest, 0);
-		return;
-	}
-	ip->ip_ttl -= IPTTLDEC;
-
-	sin = (struct sockaddr_in *)&ipforward_rt.ro_dst;
-	if ((rt = ipforward_rt.ro_rt) == 0 ||
-	    ip->ip_dst.s_addr != sin->sin_addr.s_addr) {
-		if (ipforward_rt.ro_rt) {
-			RTFREE(ipforward_rt.ro_rt);
-			ipforward_rt.ro_rt = 0;
-		}
-		sin->sin_family = AF_INET;
-		sin->sin_len = sizeof(*sin);
-		sin->sin_addr = ip->ip_dst;
-
-		rtalloc_ign(&ipforward_rt, RTF_PRCLONING);
-		if (ipforward_rt.ro_rt == 0) {
-			icmp_error(m, ICMP_UNREACH, ICMP_UNREACH_HOST, dest, 0);
-			return;
-		}
-		rt = ipforward_rt.ro_rt;
-	}
-
-	/*
-	 * Save at most 64 bytes of the packet in case
-	 * we need to generate an ICMP message to the src.
-	 */
-	mcopy = m_copy(m, 0, imin((int)ip->ip_len, 64));
-
-	/*
-	 * If forwarding packet using same interface that it came in on,
-	 * perhaps should send a redirect to sender to shortcut a hop.
-	 * Only send redirect if source is sending directly to us,
-	 * and if packet was not source routed (or has any options).
-	 * Also, don't send redirect if forwarding using a default route
-	 * or a route modified by a redirect.
-	 */
-#define	satosin(sa)	((struct sockaddr_in *)(sa))
-	if (rt->rt_ifp == m->m_pkthdr.rcvif &&
-	    (rt->rt_flags & (RTF_DYNAMIC|RTF_MODIFIED)) == 0 &&
-	    satosin(rt_key(rt))->sin_addr.s_addr != 0 &&
-	    ipsendredirects && !srcrt) {
-#define	RTA(rt)	((struct in_ifaddr *)(rt->rt_ifa))
-		u_long src = ntohl(ip->ip_src.s_addr);
-
-		if (RTA(rt) &&
-		    (src & RTA(rt)->ia_subnetmask) == RTA(rt)->ia_subnet) {
-		    if (rt->rt_flags & RTF_GATEWAY)
-			dest = satosin(rt->rt_gateway)->sin_addr.s_addr;
-		    else
-			dest = ip->ip_dst.s_addr;
-		    /* Router requirements says to only send host redirects */
-		    type = ICMP_REDIRECT;
-		    code = ICMP_REDIRECT_HOST;
-#ifdef DIAGNOSTIC
-		    if (ipprintfs)
-		        printf("redirect (%d) to %lx\n", code, (u_long)dest);
-#endif
-		}
-	}
-
-	error = ip_output(m, (struct mbuf *)0, &ipforward_rt, 
-			  IP_FORWARDING, 0);
-	if (error)
-		ipstat.ips_cantforward++;
-	else {
-		ipstat.ips_forward++;
-		if (type)
-			ipstat.ips_redirectsent++;
-		else {
-			if (mcopy)
-				m_freem(mcopy);
-			return;
-		}
-	}
-	if (mcopy == NULL)
-		return;
-	destifp = NULL;
-
-	switch (error) {
-
-	case 0:				/* forwarded, but need redirect */
-		/* type, code set above */
-		break;
-
-	case ENETUNREACH:		/* shouldn't happen, checked above */
-	case EHOSTUNREACH:
-	case ENETDOWN:
-	case EHOSTDOWN:
-	default:
-		type = ICMP_UNREACH;
-		code = ICMP_UNREACH_HOST;
-		break;
-
-	case EMSGSIZE:
-		type = ICMP_UNREACH;
-		code = ICMP_UNREACH_NEEDFRAG;
-		if (ipforward_rt.ro_rt)
-			destifp = ipforward_rt.ro_rt->rt_ifp;
-		ipstat.ips_cantfrag++;
-		break;
-
-	case ENOBUFS:
-		type = ICMP_SOURCEQUENCH;
-		code = 0;
-		break;
-	}
-	icmp_error(mcopy, type, code, dest, destifp);
-}
-
-void
-ip_savecontrol(inp, mp, ip, m)
-	register struct inpcb *inp;
-	register struct mbuf **mp;
-	register struct ip *ip;
-	register struct mbuf *m;
-{
-	if (inp->inp_socket->so_options & SO_TIMESTAMP) {
-		struct timeval tv;
-
-		microtime(&tv);
-		*mp = sbcreatecontrol((caddr_t) &tv, sizeof(tv),
-			SCM_TIMESTAMP, SOL_SOCKET);
-		if (*mp)
-			mp = &(*mp)->m_next;
-	}
-	if (inp->inp_flags & INP_RECVDSTADDR) {
-		*mp = sbcreatecontrol((caddr_t) &ip->ip_dst,
-		    sizeof(struct in_addr), IP_RECVDSTADDR, IPPROTO_IP);
-		if (*mp)
-			mp = &(*mp)->m_next;
-	}
-#ifdef notyet
-	/* XXX
-	 * Moving these out of udp_input() made them even more broken
-	 * than they already were.
-	 */
-	/* options were tossed already */
-	if (inp->inp_flags & INP_RECVOPTS) {
-		*mp = sbcreatecontrol((caddr_t) opts_deleted_above,
-		    sizeof(struct in_addr), IP_RECVOPTS, IPPROTO_IP);
-		if (*mp)
-			mp = &(*mp)->m_next;
-	}
-	/* ip_srcroute doesn't do what we want here, need to fix */
-	if (inp->inp_flags & INP_RECVRETOPTS) {
-		*mp = sbcreatecontrol((caddr_t) ip_srcroute(),
-		    sizeof(struct in_addr), IP_RECVRETOPTS, IPPROTO_IP);
-		if (*mp)
-			mp = &(*mp)->m_next;
-	}
-#endif
-	if (inp->inp_flags & INP_RECVIF) {
-		struct sockaddr_dl sdl;
-
-		sdl.sdl_len = offsetof(struct sockaddr_dl, sdl_data[0]);
-		sdl.sdl_family = AF_LINK;
-		sdl.sdl_index = m->m_pkthdr.rcvif ?
-			m->m_pkthdr.rcvif->if_index : 0;
-		sdl.sdl_nlen = sdl.sdl_alen = sdl.sdl_slen = 0;
-		*mp = sbcreatecontrol((caddr_t) &sdl, sdl.sdl_len,
-			IP_RECVIF, IPPROTO_IP);
-		if (*mp)
-			mp = &(*mp)->m_next;
-	}
-}
-
-int
-ip_rsvp_init(struct socket *so)
-{
-	if (so->so_type != SOCK_RAW ||
-	    so->so_proto->pr_protocol != IPPROTO_RSVP)
-	  return EOPNOTSUPP;
-
-	if (ip_rsvpd != NULL)
-	  return EADDRINUSE;
-
-	ip_rsvpd = so;
-	/*
-	 * This may seem silly, but we need to be sure we don't over-increment
-	 * the RSVP counter, in case something slips up.
-	 */
-	if (!ip_rsvp_on) {
-		ip_rsvp_on = 1;
-		rsvp_on++;
-	}
-
-	return 0;
-}
-
-int
-ip_rsvp_done(void)
-{
-	ip_rsvpd = NULL;
-	/*
-	 * This may seem silly, but we need to be sure we don't over-decrement
-	 * the RSVP counter, in case something slips up.
-	 */
-	if (ip_rsvp_on) {
-		ip_rsvp_on = 0;
-		rsvp_on--;
-	}
-	return 0;
-}
diff --git a/c/src/libnetworking/netinet/ip_mroute.c b/c/src/libnetworking/netinet/ip_mroute.c
deleted file mode 100644
index 662d695dfe..0000000000
--- a/c/src/libnetworking/netinet/ip_mroute.c
+++ /dev/null
@@ -1,2302 +0,0 @@
-/*
- * IP multicast forwarding procedures
- *
- * Written by David Waitzman, BBN Labs, August 1988.
- * Modified by Steve Deering, Stanford, February 1989.
- * Modified by Mark J. Steiglitz, Stanford, May, 1991
- * Modified by Van Jacobson, LBL, January 1993
- * Modified by Ajit Thyagarajan, PARC, August 1993
- * Modified by Bill Fenner, PARC, April 1995
- *
- * MROUTING Revision: 3.5
- * $Id$
- */
-
-#include "opt_mrouting.h"
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/systm.h>
-#include <sys/mbuf.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/protosw.h>
-#include <sys/errno.h>
-#include <sys/time.h>
-#include <sys/kernel.h>
-#include <sys/ioctl.h>
-#include <sys/syslog.h>
-#include <net/if.h>
-#include <net/route.h>
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/ip_var.h>
-#include <netinet/in_pcb.h>
-#include <netinet/in_var.h>
-#include <netinet/igmp.h>
-#include <netinet/igmp_var.h>
-#include <netinet/ip_mroute.h>
-#include <netinet/udp.h>
-
-#ifndef NTOHL
-#if BYTE_ORDER != BIG_ENDIAN
-#define NTOHL(d) ((d) = ntohl((d)))
-#define NTOHS(d) ((d) = ntohs((u_short)(d)))
-#define HTONL(d) ((d) = htonl((d)))
-#define HTONS(d) ((d) = htons((u_short)(d)))
-#else
-#define NTOHL(d)
-#define NTOHS(d)
-#define HTONL(d)
-#define HTONS(d)
-#endif
-#endif
-
-#ifndef MROUTING
-extern u_long	_ip_mcast_src __P((int vifi));
-extern int	_ip_mforward __P((struct ip *ip, struct ifnet *ifp,
-				  struct mbuf *m, struct ip_moptions *imo));
-extern int	_ip_mrouter_done __P((void));
-extern int	_ip_mrouter_get __P((int cmd, struct socket *so,
-				     struct mbuf **m));
-extern int	_ip_mrouter_set __P((int cmd, struct socket *so,
-				     struct mbuf *m));
-extern int	_mrt_ioctl __P((int req, caddr_t data, struct proc *p));
-
-/*
- * Dummy routines and globals used when multicast routing is not compiled in.
- */
-
-struct socket  *ip_mrouter  = NULL;
-/* static u_int		ip_mrtproto = 0; */
-/* static struct mrtstat	mrtstat; */
-u_int		rsvpdebug = 0;
-
-int
-_ip_mrouter_set(cmd, so, m)
-	int cmd;
-	struct socket *so;
-	struct mbuf *m;
-{
-	return(EOPNOTSUPP);
-}
-
-int (*ip_mrouter_set)(int, struct socket *, struct mbuf *) = _ip_mrouter_set;
-
-
-int
-_ip_mrouter_get(cmd, so, m)
-	int cmd;
-	struct socket *so;
-	struct mbuf **m;
-{
-	return(EOPNOTSUPP);
-}
-
-int (*ip_mrouter_get)(int, struct socket *, struct mbuf **) = _ip_mrouter_get;
-
-int
-_ip_mrouter_done()
-{
-	return(0);
-}
-
-int (*ip_mrouter_done)(void) = _ip_mrouter_done;
-
-int
-_ip_mforward(ip, ifp, m, imo)
-	struct ip *ip;
-	struct ifnet *ifp;
-	struct mbuf *m;
-	struct ip_moptions *imo;
-{
-	return(0);
-}
-
-int (*ip_mforward)(struct ip *, struct ifnet *, struct mbuf *,
-		   struct ip_moptions *) = _ip_mforward;
-
-int
-_mrt_ioctl(int req, caddr_t data, struct proc *p)
-{
-	return EOPNOTSUPP;
-}
-
-int (*mrt_ioctl)(int, caddr_t, struct proc *) = _mrt_ioctl;
-
-void
-rsvp_input(m, iphlen)		/* XXX must fixup manually */
-	struct mbuf *m;
-	int iphlen;
-{
-    /* Can still get packets with rsvp_on = 0 if there is a local member
-     * of the group to which the RSVP packet is addressed.  But in this
-     * case we want to throw the packet away.
-     */
-    if (!rsvp_on) {
-	m_freem(m);
-	return;
-    }
- 
-    if (ip_rsvpd != NULL) {
-	if (rsvpdebug)
-	    printf("rsvp_input: Sending packet up old-style socket\n");
-	rip_input(m, iphlen);
-	return;
-    }
-    /* Drop the packet */
-    m_freem(m);
-}
-
-void ipip_input(struct mbuf *m, int iphlen) { /* XXX must fixup manually */
-	rip_input(m, iphlen);
-}
-
-int (*legal_vif_num)(int) = 0;
-
-/*
- * This should never be called, since IP_MULTICAST_VIF should fail, but
- * just in case it does get called, the code a little lower in ip_output
- * will assign the packet a local address.
- */
-u_long
-_ip_mcast_src(int vifi) { return INADDR_ANY; }
-u_long (*ip_mcast_src)(int) = _ip_mcast_src;
-
-int
-ip_rsvp_vif_init(so, m)
-    struct socket *so;
-    struct mbuf *m;
-{
-    return(EINVAL);
-}
-
-int
-ip_rsvp_vif_done(so, m)
-    struct socket *so;
-    struct mbuf *m;
-{
-    return(EINVAL);
-}
-
-void
-ip_rsvp_force_done(so)
-    struct socket *so;
-{
-    return;
-}
-
-#else /* MROUTING */
-
-#define M_HASCL(m)	((m)->m_flags & M_EXT)
-
-#define INSIZ		sizeof(struct in_addr)
-#define	same(a1, a2) \
-	(bcmp((caddr_t)(a1), (caddr_t)(a2), INSIZ) == 0)
-
-#define MT_MRTABLE MT_RTABLE	/* since nothing else uses it */
-
-/*
- * Globals.  All but ip_mrouter and ip_mrtproto could be static,
- * except for netstat or debugging purposes.
- */
-#ifndef MROUTE_LKM
-struct socket  *ip_mrouter  = NULL;
-struct mrtstat	mrtstat;
-
-int		ip_mrtproto = IGMP_DVMRP;    /* for netstat only */
-#else /* MROUTE_LKM */
-extern void	X_ipip_input __P((struct mbuf *m, int iphlen));
-extern struct mrtstat mrtstat;
-static int ip_mrtproto;
-#endif
-
-#define NO_RTE_FOUND 	0x1
-#define RTE_FOUND	0x2
-
-static struct mbuf    *mfctable[MFCTBLSIZ];
-static u_char		nexpire[MFCTBLSIZ];
-static struct vif	viftable[MAXVIFS];
-static u_int	mrtdebug = 0;	  /* debug level 	*/
-#define		DEBUG_MFC	0x02
-#define		DEBUG_FORWARD	0x04
-#define		DEBUG_EXPIRE	0x08
-#define		DEBUG_XMIT	0x10
-static u_int  	tbfdebug = 0;     /* tbf debug level 	*/
-static u_int	rsvpdebug = 0;	  /* rsvp debug level   */
-
-#define		EXPIRE_TIMEOUT	(hz / 4)	/* 4x / second		*/
-#define		UPCALL_EXPIRE	6		/* number of timeouts	*/
-
-/*
- * Define the token bucket filter structures
- * tbftable -> each vif has one of these for storing info 
- */
-
-static struct tbf tbftable[MAXVIFS];
-#define		TBF_REPROCESS	(hz / 100)	/* 100x / second */
-
-/*
- * 'Interfaces' associated with decapsulator (so we can tell
- * packets that went through it from ones that get reflected
- * by a broken gateway).  These interfaces are never linked into
- * the system ifnet list & no routes point to them.  I.e., packets
- * can't be sent this way.  They only exist as a placeholder for
- * multicast source verification.
- */
-static struct ifnet multicast_decap_if[MAXVIFS];
-
-#define ENCAP_TTL 64
-#define ENCAP_PROTO IPPROTO_IPIP	/* 4 */
-
-/* prototype IP hdr for encapsulated packets */
-static struct ip multicast_encap_iphdr = {
-#if BYTE_ORDER == LITTLE_ENDIAN
-	sizeof(struct ip) >> 2, IPVERSION,
-#else
-	IPVERSION, sizeof(struct ip) >> 2,
-#endif
-	0,				/* tos */
-	sizeof(struct ip),		/* total length */
-	0,				/* id */
-	0,				/* frag offset */
-	ENCAP_TTL, ENCAP_PROTO,	
-	0,				/* checksum */
-};
-
-/*
- * Private variables.
- */
-static vifi_t	   numvifs = 0;
-static int have_encap_tunnel = 0;
-
-/*
- * one-back cache used by ipip_input to locate a tunnel's vif
- * given a datagram's src ip address.
- */
-static u_long last_encap_src;
-static struct vif *last_encap_vif;
-
-static u_long	X_ip_mcast_src __P((int vifi));
-static int	X_ip_mforward __P((struct ip *ip, struct ifnet *ifp, struct mbuf *m, struct ip_moptions *imo));
-static int	X_ip_mrouter_done __P((void));
-static int	X_ip_mrouter_get __P((int cmd, struct socket *so, struct mbuf **m));
-static int	X_ip_mrouter_set __P((int cmd, struct socket *so, struct mbuf *m));
-static int	X_legal_vif_num __P((int vif));
-static int	X_mrt_ioctl __P((int cmd, caddr_t data));
-
-static int get_sg_cnt(struct sioc_sg_req *);
-static int get_vif_cnt(struct sioc_vif_req *);
-static int ip_mrouter_init(struct socket *, struct mbuf *);
-static int add_vif(struct vifctl *);
-static int del_vif(vifi_t *);
-static int add_mfc(struct mfcctl *);
-static int del_mfc(struct mfcctl *);
-static int socket_send(struct socket *, struct mbuf *, struct sockaddr_in *);
-static int get_version(struct mbuf *);
-static int get_assert(struct mbuf *);
-static int set_assert(int *);
-static void expire_upcalls(void *);
-static int ip_mdq(struct mbuf *, struct ifnet *, struct mfc *,
-		  vifi_t);
-static void phyint_send(struct ip *, struct vif *, struct mbuf *);
-static void encap_send(struct ip *, struct vif *, struct mbuf *);
-static void tbf_control(struct vif *, struct mbuf *, struct ip *, u_long);
-static void tbf_queue(struct vif *, struct mbuf *);
-static void tbf_process_q(struct vif *);
-static void tbf_reprocess_q(void *);
-static int tbf_dq_sel(struct vif *, struct ip *);
-static void tbf_send_packet(struct vif *, struct mbuf *);
-static void tbf_update_tokens(struct vif *);
-static int priority(struct vif *, struct ip *);
-void multiencap_decap(struct mbuf *);
-
-/*
- * whether or not special PIM assert processing is enabled.
- */
-static int pim_assert;
-/*
- * Rate limit for assert notification messages, in usec
- */
-#define ASSERT_MSG_TIME		3000000
-
-/*
- * Hash function for a source, group entry
- */
-#define MFCHASH(a, g) MFCHASHMOD(((a) >> 20) ^ ((a) >> 10) ^ (a) ^ \
-			((g) >> 20) ^ ((g) >> 10) ^ (g))
-
-/*
- * Find a route for a given origin IP address and Multicast group address
- * Type of service parameter to be added in the future!!!
- */
-
-#define MFCFIND(o, g, rt) { \
-	register struct mbuf *_mb_rt = mfctable[MFCHASH(o,g)]; \
-	register struct mfc *_rt = NULL; \
-	rt = NULL; \
-	++mrtstat.mrts_mfc_lookups; \
-	while (_mb_rt) { \
-		_rt = mtod(_mb_rt, struct mfc *); \
-		if ((_rt->mfc_origin.s_addr == o) && \
-		    (_rt->mfc_mcastgrp.s_addr == g) && \
-		    (_mb_rt->m_act == NULL)) { \
-			rt = _rt; \
-			break; \
-		} \
-		_mb_rt = _mb_rt->m_next; \
-	} \
-	if (rt == NULL) { \
-		++mrtstat.mrts_mfc_misses; \
-	} \
-}
-
-
-/*
- * Macros to compute elapsed time efficiently
- * Borrowed from Van Jacobson's scheduling code
- */
-#define TV_DELTA(a, b, delta) { \
-	    register int xxs; \
-		\
-	    delta = (a).tv_usec - (b).tv_usec; \
-	    if ((xxs = (a).tv_sec - (b).tv_sec)) { \
-	       switch (xxs) { \
-		      case 2: \
-			  delta += 1000000; \
-			      /* fall through */ \
-		      case 1: \
-			  delta += 1000000; \
-			  break; \
-		      default: \
-			  delta += (1000000 * xxs); \
-	       } \
-	    } \
-}
-
-#define TV_LT(a, b) (((a).tv_usec < (b).tv_usec && \
-	      (a).tv_sec <= (b).tv_sec) || (a).tv_sec < (b).tv_sec)
-
-#ifdef UPCALL_TIMING
-u_long upcall_data[51];
-static void collate(struct timeval *);
-#endif /* UPCALL_TIMING */
-
-
-/*
- * Handle MRT setsockopt commands to modify the multicast routing tables.
- */
-static int
-X_ip_mrouter_set(cmd, so, m)
-    int cmd;
-    struct socket *so;
-    struct mbuf *m;
-{
-   if (cmd != MRT_INIT && so != ip_mrouter) return EACCES;
-
-    switch (cmd) {
-	case MRT_INIT:     return ip_mrouter_init(so, m);
-	case MRT_DONE:     return ip_mrouter_done();
-	case MRT_ADD_VIF:  return add_vif (mtod(m, struct vifctl *));
-	case MRT_DEL_VIF:  return del_vif (mtod(m, vifi_t *));
-	case MRT_ADD_MFC:  return add_mfc (mtod(m, struct mfcctl *));
-	case MRT_DEL_MFC:  return del_mfc (mtod(m, struct mfcctl *));
-	case MRT_ASSERT:   return set_assert(mtod(m, int *));
-	default:             return EOPNOTSUPP;
-    }
-}
-
-#ifndef MROUTE_LKM
-int (*ip_mrouter_set)(int, struct socket *, struct mbuf *) = X_ip_mrouter_set;
-#endif
-
-/*
- * Handle MRT getsockopt commands
- */
-static int
-X_ip_mrouter_get(cmd, so, m)
-    int cmd;
-    struct socket *so;
-    struct mbuf **m;
-{
-    struct mbuf *mb;
-
-    if (so != ip_mrouter) return EACCES;
-
-    *m = mb = m_get(M_WAIT, MT_SOOPTS);
-  
-    switch (cmd) {
-	case MRT_VERSION:   return get_version(mb);
-	case MRT_ASSERT:    return get_assert(mb);
-	default:            return EOPNOTSUPP;
-    }
-}
-
-#ifndef MROUTE_LKM
-int (*ip_mrouter_get)(int, struct socket *, struct mbuf **) = X_ip_mrouter_get;
-#endif
-
-/*
- * Handle ioctl commands to obtain information from the cache
- */
-static int
-X_mrt_ioctl(cmd, data)
-    int cmd;
-    caddr_t data;
-{
-    int error = 0;
-
-    switch (cmd) {
-	case (SIOCGETVIFCNT):
-	    return (get_vif_cnt((struct sioc_vif_req *)data));
-	    break;
-	case (SIOCGETSGCNT):
-	    return (get_sg_cnt((struct sioc_sg_req *)data));
-	    break;
-	default:
-	    return (EINVAL);
-	    break;
-    }
-    return error;
-}
-
-#ifndef MROUTE_LKM
-int (*mrt_ioctl)(int, caddr_t) = X_mrt_ioctl;
-#endif
-
-/*
- * returns the packet, byte, rpf-failure count for the source group provided
- */
-static int
-get_sg_cnt(req)
-    register struct sioc_sg_req *req;
-{
-    register struct mfc *rt;
-    int s;
-
-    s = splnet();
-    MFCFIND(req->src.s_addr, req->grp.s_addr, rt);
-    splx(s);
-    if (rt != NULL) {
-	req->pktcnt = rt->mfc_pkt_cnt;
-	req->bytecnt = rt->mfc_byte_cnt;
-	req->wrong_if = rt->mfc_wrong_if;
-    } else
-	req->pktcnt = req->bytecnt = req->wrong_if = 0xffffffff;
-
-    return 0;
-}
-
-/*
- * returns the input and output packet and byte counts on the vif provided
- */
-static int
-get_vif_cnt(req)
-    register struct sioc_vif_req *req;
-{
-    register vifi_t vifi = req->vifi;
-
-    if (vifi >= numvifs) return EINVAL;
-
-    req->icount = viftable[vifi].v_pkt_in;
-    req->ocount = viftable[vifi].v_pkt_out;
-    req->ibytes = viftable[vifi].v_bytes_in;
-    req->obytes = viftable[vifi].v_bytes_out;
-
-    return 0;
-}
-
-/*
- * Enable multicast routing
- */
-static int
-ip_mrouter_init(so, m)
-	struct socket *so;
-	struct mbuf *m;
-{
-    int *v;
-
-    if (mrtdebug)
-	log(LOG_DEBUG,"ip_mrouter_init: so_type = %d, pr_protocol = %d\n",
-		so->so_type, so->so_proto->pr_protocol);
-
-    if (so->so_type != SOCK_RAW ||
-	so->so_proto->pr_protocol != IPPROTO_IGMP) return EOPNOTSUPP;
-
-    if (!m || (m->m_len != sizeof(int *)))
-	return ENOPROTOOPT;
-
-    v = mtod(m, int *);
-    if (*v != 1)
-	return ENOPROTOOPT;
-
-    if (ip_mrouter != NULL) return EADDRINUSE;
-
-    ip_mrouter = so;
-
-    bzero((caddr_t)mfctable, sizeof(mfctable));
-    bzero((caddr_t)nexpire, sizeof(nexpire));
-
-    pim_assert = 0;
-
-    timeout(expire_upcalls, (caddr_t)NULL, EXPIRE_TIMEOUT);
-
-    if (mrtdebug)
-	log(LOG_DEBUG, "ip_mrouter_init\n");
-
-    return 0;
-}
-
-/*
- * Disable multicast routing
- */
-static int
-X_ip_mrouter_done()
-{
-    vifi_t vifi;
-    int i;
-    struct ifnet *ifp;
-    struct ifreq ifr;
-    struct mbuf *mb_rt;
-    struct mbuf *m;
-    struct rtdetq *rte;
-    int s;
-
-    s = splnet();
-
-    /*
-     * For each phyint in use, disable promiscuous reception of all IP
-     * multicasts.
-     */
-    for (vifi = 0; vifi < numvifs; vifi++) {
-	if (viftable[vifi].v_lcl_addr.s_addr != 0 &&
-	    !(viftable[vifi].v_flags & VIFF_TUNNEL)) {
-	    ((struct sockaddr_in *)&(ifr.ifr_addr))->sin_family = AF_INET;
-	    ((struct sockaddr_in *)&(ifr.ifr_addr))->sin_addr.s_addr
-								= INADDR_ANY;
-	    ifp = viftable[vifi].v_ifp;
-	    (*ifp->if_ioctl)(ifp, SIOCDELMULTI, (caddr_t)&ifr);
-	}
-    }
-    bzero((caddr_t)tbftable, sizeof(tbftable));
-    bzero((caddr_t)viftable, sizeof(viftable));
-    numvifs = 0;
-    pim_assert = 0;
-
-    untimeout(expire_upcalls, (caddr_t)NULL);
-
-    /*
-     * Free all multicast forwarding cache entries.
-     */
-    for (i = 0; i < MFCTBLSIZ; i++) {
-	mb_rt = mfctable[i];
-	while (mb_rt) {
-	    if (mb_rt->m_act != NULL) {
-		while (mb_rt->m_act) {
-		    m = mb_rt->m_act;
-		    mb_rt->m_act = m->m_act;
-		    rte = mtod(m, struct rtdetq *);
-		    m_freem(rte->m);
-		    m_free(m);
-		}
-	    }
-	    mb_rt = m_free(mb_rt);
-	}
-    }
-
-    bzero((caddr_t)mfctable, sizeof(mfctable));
-
-    /*
-     * Reset de-encapsulation cache
-     */
-    last_encap_src = 0;
-    last_encap_vif = NULL;
-    have_encap_tunnel = 0;
- 
-    ip_mrouter = NULL;
-
-    splx(s);
-
-    if (mrtdebug)
-	log(LOG_DEBUG, "ip_mrouter_done\n");
-
-    return 0;
-}
-
-#ifndef MROUTE_LKM
-int (*ip_mrouter_done)(void) = X_ip_mrouter_done;
-#endif
-
-static int
-get_version(mb)
-    struct mbuf *mb;
-{
-    int *v;
-
-    v = mtod(mb, int *);
-
-    *v = 0x0305;	/* XXX !!!! */
-    mb->m_len = sizeof(int);
-
-    return 0;
-}
-
-/*
- * Set PIM assert processing global
- */
-static int
-set_assert(i)
-    int *i;
-{
-    if ((*i != 1) && (*i != 0))
-	return EINVAL;
-
-    pim_assert = *i;
-
-    return 0;
-}
-
-/*
- * Get PIM assert processing global
- */
-static int
-get_assert(m)
-    struct mbuf *m;
-{
-    int *i;
-
-    i = mtod(m, int *);
-
-    *i = pim_assert;
-
-    return 0;
-}
-
-/*
- * Add a vif to the vif table
- */
-static int
-add_vif(vifcp)
-    register struct vifctl *vifcp;
-{
-    register struct vif *vifp = viftable + vifcp->vifc_vifi;
-    static struct sockaddr_in sin = {sizeof sin, AF_INET};
-    struct ifaddr *ifa;
-    struct ifnet *ifp;
-    struct ifreq ifr;
-    int error, s;
-    struct tbf *v_tbf = tbftable + vifcp->vifc_vifi;
-
-    if (vifcp->vifc_vifi >= MAXVIFS)  return EINVAL;
-    if (vifp->v_lcl_addr.s_addr != 0) return EADDRINUSE;
-
-    /* Find the interface with an address in AF_INET family */
-    sin.sin_addr = vifcp->vifc_lcl_addr;
-    ifa = ifa_ifwithaddr((struct sockaddr *)&sin);
-    if (ifa == 0) return EADDRNOTAVAIL;
-    ifp = ifa->ifa_ifp;
-
-    if (vifcp->vifc_flags & VIFF_TUNNEL) {
-	if ((vifcp->vifc_flags & VIFF_SRCRT) == 0) {
-		/*
-		 * An encapsulating tunnel is wanted.  Tell ipip_input() to
-		 * start paying attention to encapsulated packets.
-		 */
-		if (have_encap_tunnel == 0) {
-			have_encap_tunnel = 1;
-			for (s = 0; s < MAXVIFS; ++s) {
-				multicast_decap_if[s].if_name = "mdecap";
-				multicast_decap_if[s].if_unit = s;
-			}
-		}
-		/*
-		 * Set interface to fake encapsulator interface
-		 */
-		ifp = &multicast_decap_if[vifcp->vifc_vifi];
-		/*
-		 * Prepare cached route entry
-		 */
-		bzero(&vifp->v_route, sizeof(vifp->v_route));
-	} else {
-	    log(LOG_ERR, "source routed tunnels not supported\n");
-	    return EOPNOTSUPP;
-	}
-    } else {
-	/* Make sure the interface supports multicast */
-	if ((ifp->if_flags & IFF_MULTICAST) == 0)
-	    return EOPNOTSUPP;
-
-	/* Enable promiscuous reception of all IP multicasts from the if */
-	((struct sockaddr_in *)&(ifr.ifr_addr))->sin_family = AF_INET;
-	((struct sockaddr_in *)&(ifr.ifr_addr))->sin_addr.s_addr = INADDR_ANY;
-	s = splnet();
-	error = (*ifp->if_ioctl)(ifp, SIOCADDMULTI, (caddr_t)&ifr);
-	splx(s);
-	if (error)
-	    return error;
-    }
-
-    s = splnet();
-    /* define parameters for the tbf structure */
-    vifp->v_tbf = v_tbf;
-    GET_TIME(vifp->v_tbf->tbf_last_pkt_t);
-    vifp->v_tbf->tbf_n_tok = 0;
-    vifp->v_tbf->tbf_q_len = 0;
-    vifp->v_tbf->tbf_max_q_len = MAXQSIZE;
-    vifp->v_tbf->tbf_q = vifp->v_tbf->tbf_t = NULL;
-
-    vifp->v_flags     = vifcp->vifc_flags;
-    vifp->v_threshold = vifcp->vifc_threshold;
-    vifp->v_lcl_addr  = vifcp->vifc_lcl_addr;
-    vifp->v_rmt_addr  = vifcp->vifc_rmt_addr;
-    vifp->v_ifp       = ifp;
-    /* scaling up here allows division by 1024 in critical code */
-    vifp->v_rate_limit= vifcp->vifc_rate_limit * 1024 / 1000;
-    vifp->v_rsvp_on   = 0;
-    vifp->v_rsvpd     = NULL;
-    /* initialize per vif pkt counters */
-    vifp->v_pkt_in    = 0;
-    vifp->v_pkt_out   = 0;
-    vifp->v_bytes_in  = 0;
-    vifp->v_bytes_out = 0;
-    splx(s);
-
-    /* Adjust numvifs up if the vifi is higher than numvifs */
-    if (numvifs <= vifcp->vifc_vifi) numvifs = vifcp->vifc_vifi + 1;
-
-    if (mrtdebug)
-	log(LOG_DEBUG, "add_vif #%d, lcladdr %x, %s %x, thresh %x, rate %d\n",
-	    vifcp->vifc_vifi, 
-	    ntohl(vifcp->vifc_lcl_addr.s_addr),
-	    (vifcp->vifc_flags & VIFF_TUNNEL) ? "rmtaddr" : "mask",
-	    ntohl(vifcp->vifc_rmt_addr.s_addr),
-	    vifcp->vifc_threshold,
-	    vifcp->vifc_rate_limit);    
-
-    return 0;
-}
-
-/*
- * Delete a vif from the vif table
- */
-static int
-del_vif(vifip)
-    vifi_t *vifip;
-{
-    register struct vif *vifp = viftable + *vifip;
-    register vifi_t vifi;
-    register struct mbuf *m;
-    struct ifnet *ifp;
-    struct ifreq ifr;
-    int s;
-
-    if (*vifip >= numvifs) return EINVAL;
-    if (vifp->v_lcl_addr.s_addr == 0) return EADDRNOTAVAIL;
-
-    s = splnet();
-
-    if (!(vifp->v_flags & VIFF_TUNNEL)) {
-	((struct sockaddr_in *)&(ifr.ifr_addr))->sin_family = AF_INET;
-	((struct sockaddr_in *)&(ifr.ifr_addr))->sin_addr.s_addr = INADDR_ANY;
-	ifp = vifp->v_ifp;
-	(*ifp->if_ioctl)(ifp, SIOCDELMULTI, (caddr_t)&ifr);
-    }
-
-    if (vifp == last_encap_vif) {
-	last_encap_vif = 0;
-	last_encap_src = 0;
-    }
-
-    /*
-     * Free packets queued at the interface
-     */
-    while (vifp->v_tbf->tbf_q) {
-	m = vifp->v_tbf->tbf_q;
-	vifp->v_tbf->tbf_q = m->m_act;
-	m_freem(m);
-    }
-
-    bzero((caddr_t)vifp->v_tbf, sizeof(*(vifp->v_tbf)));
-    bzero((caddr_t)vifp, sizeof (*vifp));
-
-    /* Adjust numvifs down */
-    for (vifi = numvifs; vifi > 0; vifi--)
-	if (viftable[vifi-1].v_lcl_addr.s_addr != 0) break;
-    numvifs = vifi;
-
-    splx(s);
-
-    if (mrtdebug)
-      log(LOG_DEBUG, "del_vif %d, numvifs %d\n", *vifip, numvifs);
-
-    return 0;
-}
-
-/*
- * Add an mfc entry
- */
-static int
-add_mfc(mfccp)
-    struct mfcctl *mfccp;
-{
-    struct mfc *rt;
-    register struct mbuf *mb_rt;
-    u_long hash;
-    struct mbuf *mb_ntry;
-    struct rtdetq *rte;
-    register u_short nstl;
-    int s;
-    int i;
-
-    MFCFIND(mfccp->mfcc_origin.s_addr, mfccp->mfcc_mcastgrp.s_addr, rt);
-
-    /* If an entry already exists, just update the fields */
-    if (rt) {
-	if (mrtdebug & DEBUG_MFC)
-	    log(LOG_DEBUG,"add_mfc update o %x g %x p %x\n",
-		ntohl(mfccp->mfcc_origin.s_addr),
-		ntohl(mfccp->mfcc_mcastgrp.s_addr),
-		mfccp->mfcc_parent);
-
-	s = splnet();
-	rt->mfc_parent = mfccp->mfcc_parent;
-	for (i = 0; i < numvifs; i++)
-	    rt->mfc_ttls[i] = mfccp->mfcc_ttls[i];
-	splx(s);
-	return 0;
-    }
-
-    /* 
-     * Find the entry for which the upcall was made and update
-     */
-    s = splnet();
-    hash = MFCHASH(mfccp->mfcc_origin.s_addr, mfccp->mfcc_mcastgrp.s_addr);
-    for (mb_rt = mfctable[hash], nstl = 0; mb_rt; mb_rt = mb_rt->m_next) {
-
-	rt = mtod(mb_rt, struct mfc *);
-	if ((rt->mfc_origin.s_addr == mfccp->mfcc_origin.s_addr) &&
-	    (rt->mfc_mcastgrp.s_addr == mfccp->mfcc_mcastgrp.s_addr) &&
-	    (mb_rt->m_act != NULL)) {
-  
-	    if (nstl++)
-		log(LOG_ERR, "add_mfc %s o %x g %x p %x dbx %x\n",
-		    "multiple kernel entries",
-		    ntohl(mfccp->mfcc_origin.s_addr),
-		    ntohl(mfccp->mfcc_mcastgrp.s_addr),
-		    mfccp->mfcc_parent, mb_rt->m_act);
-
-	    if (mrtdebug & DEBUG_MFC)
-		log(LOG_DEBUG,"add_mfc o %x g %x p %x dbg %x\n",
-		    ntohl(mfccp->mfcc_origin.s_addr),
-		    ntohl(mfccp->mfcc_mcastgrp.s_addr),
-		    mfccp->mfcc_parent, mb_rt->m_act);
-
-	    rt->mfc_origin     = mfccp->mfcc_origin;
-	    rt->mfc_mcastgrp   = mfccp->mfcc_mcastgrp;
-	    rt->mfc_parent     = mfccp->mfcc_parent;
-	    for (i = 0; i < numvifs; i++)
-		rt->mfc_ttls[i] = mfccp->mfcc_ttls[i];
-	    /* initialize pkt counters per src-grp */
-	    rt->mfc_pkt_cnt    = 0;
-	    rt->mfc_byte_cnt   = 0;
-	    rt->mfc_wrong_if   = 0;
-	    rt->mfc_last_assert.tv_sec = rt->mfc_last_assert.tv_usec = 0;
-
-	    rt->mfc_expire = 0;	/* Don't clean this guy up */
-	    nexpire[hash]--;
-
-	    /* free packets Qed at the end of this entry */
-	    while (mb_rt->m_act) {
-		mb_ntry = mb_rt->m_act;
-		rte = mtod(mb_ntry, struct rtdetq *);
-/* #ifdef RSVP_ISI */
-		ip_mdq(rte->m, rte->ifp, rt, -1);
-/* #endif */
-		mb_rt->m_act = mb_ntry->m_act;
-		m_freem(rte->m);
-#ifdef UPCALL_TIMING
-		collate(&(rte->t));
-#endif /* UPCALL_TIMING */
-		m_free(mb_ntry);
-	    }
-	}
-    }
-
-    /*
-     * It is possible that an entry is being inserted without an upcall
-     */
-    if (nstl == 0) {
-	if (mrtdebug & DEBUG_MFC)
-	    log(LOG_DEBUG,"add_mfc no upcall h %d o %x g %x p %x\n",
-		hash, ntohl(mfccp->mfcc_origin.s_addr),
-		ntohl(mfccp->mfcc_mcastgrp.s_addr),
-		mfccp->mfcc_parent);
-	
-	for (mb_rt = mfctable[hash]; mb_rt; mb_rt = mb_rt->m_next) {
-	    
-	    rt = mtod(mb_rt, struct mfc *);
-	    if ((rt->mfc_origin.s_addr == mfccp->mfcc_origin.s_addr) &&
-		(rt->mfc_mcastgrp.s_addr == mfccp->mfcc_mcastgrp.s_addr)) {
-
-		rt->mfc_origin     = mfccp->mfcc_origin;
-		rt->mfc_mcastgrp   = mfccp->mfcc_mcastgrp;
-		rt->mfc_parent     = mfccp->mfcc_parent;
-		for (i = 0; i < numvifs; i++)
-		    rt->mfc_ttls[i] = mfccp->mfcc_ttls[i];
-		/* initialize pkt counters per src-grp */
-		rt->mfc_pkt_cnt    = 0;
-		rt->mfc_byte_cnt   = 0;
-		rt->mfc_wrong_if   = 0;
-		rt->mfc_last_assert.tv_sec = rt->mfc_last_assert.tv_usec = 0;
-		if (rt->mfc_expire)
-		    nexpire[hash]--;
-		rt->mfc_expire	   = 0;
-	    }
-	}
-	if (mb_rt == NULL) {
-	    /* no upcall, so make a new entry */
-	    MGET(mb_rt, M_DONTWAIT, MT_MRTABLE);
-	    if (mb_rt == NULL) {
-		splx(s);
-		return ENOBUFS;
-	    }
-	    
-	    rt = mtod(mb_rt, struct mfc *);
-	    
-	    /* insert new entry at head of hash chain */
-	    rt->mfc_origin     = mfccp->mfcc_origin;
-	    rt->mfc_mcastgrp   = mfccp->mfcc_mcastgrp;
-	    rt->mfc_parent     = mfccp->mfcc_parent;
-	    for (i = 0; i < numvifs; i++)
-		    rt->mfc_ttls[i] = mfccp->mfcc_ttls[i];
-	    /* initialize pkt counters per src-grp */
-	    rt->mfc_pkt_cnt    = 0;
-	    rt->mfc_byte_cnt   = 0;
-	    rt->mfc_wrong_if   = 0;
-	    rt->mfc_last_assert.tv_sec = rt->mfc_last_assert.tv_usec = 0;
-	    rt->mfc_expire     = 0;
-	    
-	    /* link into table */
-	    mb_rt->m_next  = mfctable[hash];
-	    mfctable[hash] = mb_rt;
-	    mb_rt->m_act = NULL;
-	}
-    }
-    splx(s);
-    return 0;
-}
-
-#ifdef UPCALL_TIMING
-/*
- * collect delay statistics on the upcalls 
- */
-static void collate(t)
-register struct timeval *t;
-{
-    register u_long d;
-    register struct timeval tp;
-    register u_long delta;
-    
-    GET_TIME(tp);
-    
-    if (TV_LT(*t, tp))
-    {
-	TV_DELTA(tp, *t, delta);
-	
-	d = delta >> 10;
-	if (d > 50)
-	    d = 50;
-	
-	++upcall_data[d];
-    }
-}
-#endif /* UPCALL_TIMING */
-
-/*
- * Delete an mfc entry
- */
-static int
-del_mfc(mfccp)
-    struct mfcctl *mfccp;
-{
-    struct in_addr 	origin;
-    struct in_addr 	mcastgrp;
-    struct mfc 		*rt;
-    struct mbuf 	*mb_rt;
-    struct mbuf 	**nptr;
-    u_long 		hash;
-    int s;
-
-    origin = mfccp->mfcc_origin;
-    mcastgrp = mfccp->mfcc_mcastgrp;
-    hash = MFCHASH(origin.s_addr, mcastgrp.s_addr);
-
-    if (mrtdebug & DEBUG_MFC)
-	log(LOG_DEBUG,"del_mfc orig %x mcastgrp %x\n",
-	    ntohl(origin.s_addr), ntohl(mcastgrp.s_addr));
-
-    s = splnet();
-
-    nptr = &mfctable[hash];
-    while ((mb_rt = *nptr) != NULL) {
-        rt = mtod(mb_rt, struct mfc *);
-	if (origin.s_addr == rt->mfc_origin.s_addr &&
-	    mcastgrp.s_addr == rt->mfc_mcastgrp.s_addr &&
-	    mb_rt->m_act == NULL)
-	    break;
-
-	nptr = &mb_rt->m_next;
-    }
-    if (mb_rt == NULL) {
-	splx(s);
-	return EADDRNOTAVAIL;
-    }
-
-    MFREE(mb_rt, *nptr);
-
-    splx(s);
-
-    return 0;
-}
-
-/*
- * Send a message to mrouted on the multicast routing socket
- */
-static int
-socket_send(s, mm, src)
-	struct socket *s;
-	struct mbuf *mm;
-	struct sockaddr_in *src;
-{
-	if (s) {
-		if (sbappendaddr(&s->so_rcv,
-				 (struct sockaddr *)src,
-				 mm, (struct mbuf *)0) != 0) {
-			sorwakeup(s);
-			return 0;
-		}
-	}
-	m_freem(mm);
-	return -1;
-}
-
-/*
- * IP multicast forwarding function. This function assumes that the packet
- * pointed to by "ip" has arrived on (or is about to be sent to) the interface
- * pointed to by "ifp", and the packet is to be relayed to other networks
- * that have members of the packet's destination IP multicast group.
- *
- * The packet is returned unscathed to the caller, unless it is
- * erroneous, in which case a non-zero return value tells the caller to
- * discard it.
- */
-
-#define IP_HDR_LEN  20	/* # bytes of fixed IP header (excluding options) */
-#define TUNNEL_LEN  12  /* # bytes of IP option for tunnel encapsulation  */
-
-static int
-X_ip_mforward(ip, ifp, m, imo)
-    register struct ip *ip;
-    struct ifnet *ifp;
-    struct mbuf *m;
-    struct ip_moptions *imo;
-{
-    register struct mfc *rt;
-    register u_char *ipoptions;
-    static struct sockaddr_in 	k_igmpsrc	= { sizeof k_igmpsrc, AF_INET };
-    static int srctun = 0;
-    register struct mbuf *mm;
-    int s;
-    vifi_t vifi;
-    struct vif *vifp;
-
-    if (mrtdebug & DEBUG_FORWARD)
-	log(LOG_DEBUG, "ip_mforward: src %x, dst %x, ifp %x\n",
-	    ntohl(ip->ip_src.s_addr), ntohl(ip->ip_dst.s_addr), ifp);
-
-    if (ip->ip_hl < (IP_HDR_LEN + TUNNEL_LEN) >> 2 ||
-	(ipoptions = (u_char *)(ip + 1))[1] != IPOPT_LSRR ) {
-	/*
-	 * Packet arrived via a physical interface or
-	 * an encapsulated tunnel.
-	 */
-    } else {
-	/*
-	 * Packet arrived through a source-route tunnel.
-	 * Source-route tunnels are no longer supported.
-	 */
-	if ((srctun++ % 1000) == 0)
-	    log(LOG_ERR, "ip_mforward: received source-routed packet from %x\n",
-		ntohl(ip->ip_src.s_addr));
-
-	return 1;
-    }
-
-    if ((imo) && ((vifi = imo->imo_multicast_vif) < numvifs)) {
-	if (ip->ip_ttl < 255)
-		ip->ip_ttl++;	/* compensate for -1 in *_send routines */
-	if (rsvpdebug && ip->ip_p == IPPROTO_RSVP) {
-	    vifp = viftable + vifi;
-	    printf("Sending IPPROTO_RSVP from %lx to %lx on vif %d (%s%s%d)\n",
-		ntohl(ip->ip_src.s_addr), ntohl(ip->ip_dst.s_addr), vifi,
-		(vifp->v_flags & VIFF_TUNNEL) ? "tunnel on " : "",
-		vifp->v_ifp->if_name, vifp->v_ifp->if_unit);
-	}
-	return (ip_mdq(m, ifp, NULL, vifi));
-    }
-    if (rsvpdebug && ip->ip_p == IPPROTO_RSVP) {
-	printf("Warning: IPPROTO_RSVP from %lx to %lx without vif option\n",
-	    ntohl(ip->ip_src.s_addr), ntohl(ip->ip_dst.s_addr));
-	if(!imo)
-		printf("In fact, no options were specified at all\n");
-    }
-
-    /*
-     * Don't forward a packet with time-to-live of zero or one,
-     * or a packet destined to a local-only group.
-     */
-    if (ip->ip_ttl <= 1 ||
-	ntohl(ip->ip_dst.s_addr) <= INADDR_MAX_LOCAL_GROUP)
-	return 0;
-
-    /*
-     * Determine forwarding vifs from the forwarding cache table
-     */
-    s = splnet();
-    MFCFIND(ip->ip_src.s_addr, ip->ip_dst.s_addr, rt);
-
-    /* Entry exists, so forward if necessary */
-    if (rt != NULL) {
-	splx(s);
-	return (ip_mdq(m, ifp, rt, -1));
-    } else {
-	/*
-	 * If we don't have a route for packet's origin,
-	 * Make a copy of the packet &
-	 * send message to routing daemon
-	 */
-
-	register struct mbuf *mb_rt;
-	register struct mbuf *mb_ntry;
-	register struct mbuf *mb0;
-	register struct rtdetq *rte;
-	register struct mbuf *rte_m;
-	register u_long hash;
-	register int npkts;
-	int hlen = ip->ip_hl << 2;
-#ifdef UPCALL_TIMING
-	struct timeval tp;
-
-	GET_TIME(tp);
-#endif
-
-	mrtstat.mrts_no_route++;
-	if (mrtdebug & (DEBUG_FORWARD | DEBUG_MFC))
-	    log(LOG_DEBUG, "ip_mforward: no rte s %x g %x\n",
-		ntohl(ip->ip_src.s_addr),
-		ntohl(ip->ip_dst.s_addr));
-
-	/*
-	 * Allocate mbufs early so that we don't do extra work if we are
-	 * just going to fail anyway.  Make sure to pullup the header so
-	 * that other people can't step on it.
-	 */
-	MGET(mb_ntry, M_DONTWAIT, MT_DATA);
-	if (mb_ntry == NULL) {
-	    splx(s);
-	    return ENOBUFS;
-	}
-	mb0 = m_copy(m, 0, M_COPYALL);
-	if (mb0 && (M_HASCL(mb0) || mb0->m_len < hlen))
-	    mb0 = m_pullup(mb0, hlen);
-	if (mb0 == NULL) {
-	    m_free(mb_ntry);
-	    splx(s);
-	    return ENOBUFS;
-	}
-
-	/* is there an upcall waiting for this packet? */
-	hash = MFCHASH(ip->ip_src.s_addr, ip->ip_dst.s_addr);
-	for (mb_rt = mfctable[hash]; mb_rt; mb_rt = mb_rt->m_next) {
-	    rt = mtod(mb_rt, struct mfc *);
-	    if ((ip->ip_src.s_addr == rt->mfc_origin.s_addr) &&
-		(ip->ip_dst.s_addr == rt->mfc_mcastgrp.s_addr) &&
-		(mb_rt->m_act != NULL))
-		break;
-	}
-
-	if (mb_rt == NULL) {
-	    int i;
-	    struct igmpmsg *im;
-
-	    /* no upcall, so make a new entry */
-	    MGET(mb_rt, M_DONTWAIT, MT_MRTABLE);
-	    if (mb_rt == NULL) {
-		m_free(mb_ntry);
-		m_freem(mb0);
-		splx(s);
-		return ENOBUFS;
-	    }
-	    /* Make a copy of the header to send to the user level process */
-	    mm = m_copy(mb0, 0, hlen);
-	    if (mm == NULL) {
-		m_free(mb_ntry);
-		m_freem(mb0);
-		m_free(mb_rt);
-		splx(s);
-		return ENOBUFS;
-	    }
-
-	    /* 
-	     * Send message to routing daemon to install 
-	     * a route into the kernel table
-	     */
-	    k_igmpsrc.sin_addr = ip->ip_src;
-	    
-	    im = mtod(mm, struct igmpmsg *);
-	    im->im_msgtype	= IGMPMSG_NOCACHE;
-	    im->im_mbz		= 0;
-
-	    mrtstat.mrts_upcalls++;
-
-	    if (socket_send(ip_mrouter, mm, &k_igmpsrc) < 0) {
-		log(LOG_WARNING, "ip_mforward: ip_mrouter socket queue full\n");
-		++mrtstat.mrts_upq_sockfull;
-		m_free(mb_ntry);
-		m_freem(mb0);
-		m_free(mb_rt);
-		splx(s);
-		return ENOBUFS;
-	    }
-
-	    rt = mtod(mb_rt, struct mfc *);
-
-	    /* insert new entry at head of hash chain */
-	    rt->mfc_origin.s_addr     = ip->ip_src.s_addr;
-	    rt->mfc_mcastgrp.s_addr   = ip->ip_dst.s_addr;
-	    rt->mfc_expire	      = UPCALL_EXPIRE;
-	    nexpire[hash]++;
-	    for (i = 0; i < numvifs; i++)
-		rt->mfc_ttls[i] = 0;
-	    rt->mfc_parent = -1;
-
-	    /* link into table */
-	    mb_rt->m_next  = mfctable[hash];
-	    mfctable[hash] = mb_rt;
-	    mb_rt->m_act = NULL;
-
-	    rte_m = mb_rt;
-	} else {
-	    /* determine if q has overflowed */
-	    for (rte_m = mb_rt, npkts = 0; rte_m->m_act; rte_m = rte_m->m_act)
-		npkts++;
-
-	    if (npkts > MAX_UPQ) {
-		mrtstat.mrts_upq_ovflw++;
-		m_free(mb_ntry);
-		m_freem(mb0);
-		splx(s);
-		return 0;
-	    }
-	}
-
-	mb_ntry->m_act = NULL;
-	rte = mtod(mb_ntry, struct rtdetq *);
-
-	rte->m 			= mb0;
-	rte->ifp 		= ifp;
-#ifdef UPCALL_TIMING
-	rte->t			= tp;
-#endif
-
-	/* Add this entry to the end of the queue */
-	rte_m->m_act		= mb_ntry;
-
-	splx(s);
-
-	return 0;
-    }		
-}
-
-#ifndef MROUTE_LKM
-int (*ip_mforward)(struct ip *, struct ifnet *, struct mbuf *,
-		   struct ip_moptions *) = X_ip_mforward;
-#endif
-
-/*
- * Clean up the cache entry if upcall is not serviced
- */
-static void
-expire_upcalls(void *unused)
-{
-    struct mbuf *mb_rt, *m, **nptr;
-    struct rtdetq *rte;
-    struct mfc *mfc;
-    int i;
-    int s;
-
-    s = splnet();
-    for (i = 0; i < MFCTBLSIZ; i++) {
-	if (nexpire[i] == 0)
-	    continue;
-	nptr = &mfctable[i];
-	for (mb_rt = *nptr; mb_rt != NULL; mb_rt = *nptr) {
-	    mfc = mtod(mb_rt, struct mfc *);
-
-	    /*
-	     * Skip real cache entries
-	     * Make sure it wasn't marked to not expire (shouldn't happen)
-	     * If it expires now
-	     */
-	    if (mb_rt->m_act != NULL &&
-	        mfc->mfc_expire != 0 &&
-		--mfc->mfc_expire == 0) {
-		if (mrtdebug & DEBUG_EXPIRE)
-		    log(LOG_DEBUG, "expire_upcalls: expiring (%x %x)\n",
-			ntohl(mfc->mfc_origin.s_addr),
-			ntohl(mfc->mfc_mcastgrp.s_addr));
-		/*
-		 * drop all the packets
-		 * free the mbuf with the pkt, if, timing info
-		 */
-		while (mb_rt->m_act) {
-		    m = mb_rt->m_act;
-		    mb_rt->m_act = m->m_act;
-	     
-		    rte = mtod(m, struct rtdetq *);
-		    m_freem(rte->m);
-		    m_free(m);
-		}
-		++mrtstat.mrts_cache_cleanups;
-		nexpire[i]--;
-
-		MFREE(mb_rt, *nptr);
-	    } else {
-		nptr = &mb_rt->m_next;
-	    }
-	}
-    }
-    splx(s);
-    timeout(expire_upcalls, (caddr_t)NULL, EXPIRE_TIMEOUT);
-}
-
-/*
- * Packet forwarding routine once entry in the cache is made
- */
-static int
-ip_mdq(m, ifp, rt, xmt_vif)
-    register struct mbuf *m;
-    register struct ifnet *ifp;
-    register struct mfc *rt;
-    register vifi_t xmt_vif;
-{
-    register struct ip  *ip = mtod(m, struct ip *);
-    register vifi_t vifi;
-    register struct vif *vifp;
-    register int plen = ntohs(ip->ip_len);
-
-/*
- * Macro to send packet on vif.  Since RSVP packets don't get counted on
- * input, they shouldn't get counted on output, so statistics keeping is
- * seperate.
- */
-#define MC_SEND(ip,vifp,m) {                             \
-                if ((vifp)->v_flags & VIFF_TUNNEL)  	 \
-                    encap_send((ip), (vifp), (m));       \
-                else                                     \
-                    phyint_send((ip), (vifp), (m));      \
-}
-
-    /*
-     * If xmt_vif is not -1, send on only the requested vif.
-     *
-     * (since vifi_t is u_short, -1 becomes MAXUSHORT, which > numvifs.)
-     */
-    if (xmt_vif < numvifs) {
-	MC_SEND(ip, viftable + xmt_vif, m);
-	return 1;
-    }
-
-    /*
-     * Don't forward if it didn't arrive from the parent vif for its origin.
-     */
-    vifi = rt->mfc_parent;
-    if ((vifi >= numvifs) || (viftable[vifi].v_ifp != ifp)) {
-	/* came in the wrong interface */
-	if (mrtdebug & DEBUG_FORWARD)
-	    log(LOG_DEBUG, "wrong if: ifp %x vifi %d vififp %x\n",
-		ifp, vifi, viftable[vifi].v_ifp); 
-	++mrtstat.mrts_wrong_if;
-	++rt->mfc_wrong_if;
-	/*
-	 * If we are doing PIM assert processing, and we are forwarding
-	 * packets on this interface, and it is a broadcast medium
-	 * interface (and not a tunnel), send a message to the routing daemon.
-	 */
-	if (pim_assert && rt->mfc_ttls[vifi] &&
-		(ifp->if_flags & IFF_BROADCAST) &&
-		!(viftable[vifi].v_flags & VIFF_TUNNEL)) {
-	    struct sockaddr_in k_igmpsrc;
-	    struct mbuf *mm;
-	    struct igmpmsg *im;
-	    int hlen = ip->ip_hl << 2;
-	    struct timeval now;
-	    register u_long delta;
-
-	    GET_TIME(now);
-
-	    TV_DELTA(rt->mfc_last_assert, now, delta);
-
-	    if (delta > ASSERT_MSG_TIME) {
-		mm = m_copy(m, 0, hlen);
-		if (mm && (M_HASCL(mm) || mm->m_len < hlen))
-		    mm = m_pullup(mm, hlen);
-		if (mm == NULL) {
-		    return ENOBUFS;
-		}
-
-		rt->mfc_last_assert = now;
-
-		im = mtod(mm, struct igmpmsg *);
-		im->im_msgtype	= IGMPMSG_WRONGVIF;
-		im->im_mbz		= 0;
-		im->im_vif		= vifi;
-
-		k_igmpsrc.sin_addr = im->im_src;
-
-		socket_send(ip_mrouter, mm, &k_igmpsrc);
-	    }
-	}
-	return 0;
-    }
-
-    /* If I sourced this packet, it counts as output, else it was input. */
-    if (ip->ip_src.s_addr == viftable[vifi].v_lcl_addr.s_addr) {
-	viftable[vifi].v_pkt_out++;
-	viftable[vifi].v_bytes_out += plen;
-    } else {
-	viftable[vifi].v_pkt_in++;
-	viftable[vifi].v_bytes_in += plen;
-    }
-    rt->mfc_pkt_cnt++;
-    rt->mfc_byte_cnt += plen;
-
-    /*
-     * For each vif, decide if a copy of the packet should be forwarded.
-     * Forward if:
-     *		- the ttl exceeds the vif's threshold
-     *		- there are group members downstream on interface
-     */
-    for (vifp = viftable, vifi = 0; vifi < numvifs; vifp++, vifi++)
-	if ((rt->mfc_ttls[vifi] > 0) &&
-	    (ip->ip_ttl > rt->mfc_ttls[vifi])) {
-	    vifp->v_pkt_out++;
-	    vifp->v_bytes_out += plen;
-	    MC_SEND(ip, vifp, m);
-	}
-
-    return 0;
-}
-
-/*
- * check if a vif number is legal/ok. This is used by ip_output, to export
- * numvifs there, 
- */
-static int
-X_legal_vif_num(vif)
-    int vif;
-{
-    if (vif >= 0 && vif < numvifs)
-       return(1);
-    else
-       return(0);
-}
-
-#ifndef MROUTE_LKM
-int (*legal_vif_num)(int) = X_legal_vif_num;
-#endif
-
-/*
- * Return the local address used by this vif
- */
-static u_long
-X_ip_mcast_src(vifi)
-    int vifi;
-{
-    if (vifi >= 0 && vifi < numvifs)
-	return viftable[vifi].v_lcl_addr.s_addr;
-    else
-	return INADDR_ANY;
-}
-
-#ifndef MROUTE_LKM
-u_long (*ip_mcast_src)(int) = X_ip_mcast_src;
-#endif
-
-static void
-phyint_send(ip, vifp, m)
-    struct ip *ip;
-    struct vif *vifp;
-    struct mbuf *m;
-{
-    register struct mbuf *mb_copy;
-    register int hlen = ip->ip_hl << 2;
-
-    /*
-     * Make a new reference to the packet; make sure that
-     * the IP header is actually copied, not just referenced,
-     * so that ip_output() only scribbles on the copy.
-     */
-    mb_copy = m_copy(m, 0, M_COPYALL);
-    if (mb_copy && (M_HASCL(mb_copy) || mb_copy->m_len < hlen))
-	mb_copy = m_pullup(mb_copy, hlen);
-    if (mb_copy == NULL)
-	return;
-
-    if (vifp->v_rate_limit <= 0)
-	tbf_send_packet(vifp, mb_copy);
-    else
-	tbf_control(vifp, mb_copy, mtod(mb_copy, struct ip *), ip->ip_len);
-}
-
-static void
-encap_send(ip, vifp, m)
-    register struct ip *ip;
-    register struct vif *vifp;
-    register struct mbuf *m;
-{
-    register struct mbuf *mb_copy;
-    register struct ip *ip_copy;
-    register int i, len = ip->ip_len;
-
-    /*
-     * copy the old packet & pullup it's IP header into the
-     * new mbuf so we can modify it.  Try to fill the new
-     * mbuf since if we don't the ethernet driver will.
-     */
-    MGETHDR(mb_copy, M_DONTWAIT, MT_HEADER);
-    if (mb_copy == NULL)
-	return;
-    mb_copy->m_data += max_linkhdr;
-    mb_copy->m_len = sizeof(multicast_encap_iphdr);
-
-    if ((mb_copy->m_next = m_copy(m, 0, M_COPYALL)) == NULL) {
-	m_freem(mb_copy);
-	return;
-    }
-    i = MHLEN - M_LEADINGSPACE(mb_copy);
-    if (i > len)
-	i = len;
-    mb_copy = m_pullup(mb_copy, i);
-    if (mb_copy == NULL)
-	return;
-    mb_copy->m_pkthdr.len = len + sizeof(multicast_encap_iphdr);
-
-    /*
-     * fill in the encapsulating IP header.
-     */
-    ip_copy = mtod(mb_copy, struct ip *);
-    *ip_copy = multicast_encap_iphdr;
-    ip_copy->ip_id = htons(ip_id++);
-    ip_copy->ip_len += len;
-    ip_copy->ip_src = vifp->v_lcl_addr;
-    ip_copy->ip_dst = vifp->v_rmt_addr;
-
-    /*
-     * turn the encapsulated IP header back into a valid one.
-     */
-    ip = (struct ip *)((caddr_t)ip_copy + sizeof(multicast_encap_iphdr));
-    --ip->ip_ttl;
-    HTONS(ip->ip_len);
-    HTONS(ip->ip_off);
-    ip->ip_sum = 0;
-    mb_copy->m_data += sizeof(multicast_encap_iphdr);
-    ip->ip_sum = in_cksum(mb_copy, ip->ip_hl << 2);
-    mb_copy->m_data -= sizeof(multicast_encap_iphdr);
-
-    if (vifp->v_rate_limit <= 0)
-	tbf_send_packet(vifp, mb_copy);
-    else
-	tbf_control(vifp, mb_copy, ip, ip_copy->ip_len);
-}
-
-/*
- * De-encapsulate a packet and feed it back through ip input (this
- * routine is called whenever IP gets a packet with proto type
- * ENCAP_PROTO and a local destination address).
- */
-void
-#ifdef MROUTE_LKM
-X_ipip_input(m, iphlen)
-#else
-ipip_input(m, iphlen)
-#endif
-	register struct mbuf *m;
-	int iphlen;
-{
-    struct ifnet *ifp = m->m_pkthdr.rcvif;
-    register struct ip *ip = mtod(m, struct ip *);
-    register int hlen = ip->ip_hl << 2;
-    register int s;
-    register struct ifqueue *ifq;
-    register struct vif *vifp;
-
-    if (!have_encap_tunnel) {
-	    rip_input(m, iphlen);
-	    return;
-    }
-    /*
-     * dump the packet if it's not to a multicast destination or if
-     * we don't have an encapsulating tunnel with the source.
-     * Note:  This code assumes that the remote site IP address
-     * uniquely identifies the tunnel (i.e., that this site has
-     * at most one tunnel with the remote site).
-     */
-    if (! IN_MULTICAST(ntohl(((struct ip *)((char *)ip + hlen))->ip_dst.s_addr))) {
-	++mrtstat.mrts_bad_tunnel;
-	m_freem(m);
-	return;
-    }
-    if (ip->ip_src.s_addr != last_encap_src) {
-	register struct vif *vife;
-	
-	vifp = viftable;
-	vife = vifp + numvifs;
-	last_encap_src = ip->ip_src.s_addr;
-	last_encap_vif = 0;
-	for ( ; vifp < vife; ++vifp)
-	    if (vifp->v_rmt_addr.s_addr == ip->ip_src.s_addr) {
-		if ((vifp->v_flags & (VIFF_TUNNEL|VIFF_SRCRT))
-		    == VIFF_TUNNEL)
-		    last_encap_vif = vifp;
-		break;
-	    }
-    }
-    if ((vifp = last_encap_vif) == 0) {
-	last_encap_src = 0;
-	mrtstat.mrts_cant_tunnel++; /*XXX*/
-	m_freem(m);
-	if (mrtdebug)
-          log(LOG_DEBUG, "ip_mforward: no tunnel with %x\n",
-		ntohl(ip->ip_src.s_addr));
-	return;
-    }
-    ifp = vifp->v_ifp;
-
-    if (hlen > IP_HDR_LEN)
-      ip_stripoptions(m, (struct mbuf *) 0);
-    m->m_data += IP_HDR_LEN;
-    m->m_len -= IP_HDR_LEN;
-    m->m_pkthdr.len -= IP_HDR_LEN;
-    m->m_pkthdr.rcvif = ifp;
-
-    ifq = &ipintrq;
-    s = splimp();
-    if (IF_QFULL(ifq)) {
-	IF_DROP(ifq);
-	m_freem(m);
-    } else {
-	IF_ENQUEUE(ifq, m);
-	/*
-	 * normally we would need a "schednetisr(NETISR_IP)"
-	 * here but we were called by ip_input and it is going
-	 * to loop back & try to dequeue the packet we just
-	 * queued as soon as we return so we avoid the
-	 * unnecessary software interrrupt.
-	 */
-    }
-    splx(s);
-}
-
-/*
- * Token bucket filter module
- */
-
-static void
-tbf_control(vifp, m, ip, p_len)
-	register struct vif *vifp;
-	register struct mbuf *m;
-	register struct ip *ip;
-	register u_long p_len;
-{
-    register struct tbf *t = vifp->v_tbf;
-
-    if (p_len > MAX_BKT_SIZE) {
-	/* drop if packet is too large */
-	mrtstat.mrts_pkt2large++;
-	m_freem(m);
-	return;
-    }
-
-    tbf_update_tokens(vifp);
-
-    /* if there are enough tokens, 
-     * and the queue is empty,
-     * send this packet out
-     */
-
-    if (t->tbf_q_len == 0) {
-	/* queue empty, send packet if enough tokens */
-	if (p_len <= t->tbf_n_tok) {
-	    t->tbf_n_tok -= p_len;
-	    tbf_send_packet(vifp, m);
-	} else {
-	    /* queue packet and timeout till later */
-	    tbf_queue(vifp, m);
-	    timeout(tbf_reprocess_q, (caddr_t)vifp, TBF_REPROCESS);
-	}
-    } else if (t->tbf_q_len < t->tbf_max_q_len) {
-	/* finite queue length, so queue pkts and process queue */
-	tbf_queue(vifp, m);
-	tbf_process_q(vifp);
-    } else {
-	/* queue length too much, try to dq and queue and process */
-	if (!tbf_dq_sel(vifp, ip)) {
-	    mrtstat.mrts_q_overflow++;
-	    m_freem(m);
-	    return;
-	} else {
-	    tbf_queue(vifp, m);
-	    tbf_process_q(vifp);
-	}
-    }
-    return;
-}
-
-/* 
- * adds a packet to the queue at the interface
- */
-static void
-tbf_queue(vifp, m) 
-	register struct vif *vifp;
-	register struct mbuf *m;
-{
-    register int s = splnet();
-    register struct tbf *t = vifp->v_tbf;
-
-    if (t->tbf_t == NULL) {
-	/* Queue was empty */
-	t->tbf_q = m;
-    } else {
-	/* Insert at tail */
-	t->tbf_t->m_act = m;
-    }
-
-    /* Set new tail pointer */
-    t->tbf_t = m;
-
-#ifdef DIAGNOSTIC
-    /* Make sure we didn't get fed a bogus mbuf */
-    if (m->m_act)
-	panic("tbf_queue: m_act");
-#endif
-    m->m_act = NULL;
-
-    t->tbf_q_len++;
-
-    splx(s);
-}
-
-
-/* 
- * processes the queue at the interface
- */
-static void
-tbf_process_q(vifp)
-    register struct vif *vifp;
-{
-    register struct mbuf *m;
-    register int len;
-    register int s = splnet();
-    register struct tbf *t = vifp->v_tbf;
-
-    /* loop through the queue at the interface and send as many packets
-     * as possible
-     */
-    while (t->tbf_q_len > 0) {
-	m = t->tbf_q;
-
-	len = mtod(m, struct ip *)->ip_len;
-
-	/* determine if the packet can be sent */
-	if (len <= t->tbf_n_tok) {
-	    /* if so,
-	     * reduce no of tokens, dequeue the packet,
-	     * send the packet.
-	     */
-	    t->tbf_n_tok -= len;
-
-	    t->tbf_q = m->m_act;
-	    if (--t->tbf_q_len == 0)
-		t->tbf_t = NULL;
-
-	    m->m_act = NULL;
-	    tbf_send_packet(vifp, m);
-
-	} else break;
-    }
-    splx(s);
-}
-
-static void
-tbf_reprocess_q(xvifp)
-	void *xvifp;
-{
-    register struct vif *vifp = xvifp;
-    if (ip_mrouter == NULL) 
-	return;
-
-    tbf_update_tokens(vifp);
-
-    tbf_process_q(vifp);
-
-    if (vifp->v_tbf->tbf_q_len)
-	timeout(tbf_reprocess_q, (caddr_t)vifp, TBF_REPROCESS);
-}
-
-/* function that will selectively discard a member of the queue
- * based on the precedence value and the priority
- */
-static int
-tbf_dq_sel(vifp, ip)
-    register struct vif *vifp;
-    register struct ip *ip;
-{
-    register int s = splnet();
-    register u_int p;
-    register struct mbuf *m, *last;
-    register struct mbuf **np;
-    register struct tbf *t = vifp->v_tbf;
-
-    p = priority(vifp, ip);
-
-    np = &t->tbf_q;
-    last = NULL;
-    while ((m = *np) != NULL) {
-	if (p > priority(vifp, mtod(m, struct ip *))) {
-	    *np = m->m_act;
-	    /* If we're removing the last packet, fix the tail pointer */
-	    if (m == t->tbf_t)
-		t->tbf_t = last;
-	    m_freem(m);
-	    /* it's impossible for the queue to be empty, but
-	     * we check anyway. */
-	    if (--t->tbf_q_len == 0)
-		t->tbf_t = NULL;
-	    splx(s);
-	    mrtstat.mrts_drop_sel++;
-	    return(1);
-	}
-	np = &m->m_act;
-	last = m;
-    }
-    splx(s);
-    return(0);
-}
-
-static void
-tbf_send_packet(vifp, m)
-    register struct vif *vifp;
-    register struct mbuf *m;
-{
-    struct ip_moptions imo;
-    int error;
-    static struct route ro;
-    int s = splnet();
-
-    if (vifp->v_flags & VIFF_TUNNEL) {
-	/* If tunnel options */
-	ip_output(m, (struct mbuf *)0, &vifp->v_route,
-		  IP_FORWARDING, (struct ip_moptions *)0);
-    } else {
-	imo.imo_multicast_ifp  = vifp->v_ifp;
-	imo.imo_multicast_ttl  = mtod(m, struct ip *)->ip_ttl - 1;
-	imo.imo_multicast_loop = 1;
-	imo.imo_multicast_vif  = -1;
-
-	/*
-	 * Re-entrancy should not be a problem here, because
-	 * the packets that we send out and are looped back at us
-	 * should get rejected because they appear to come from
-	 * the loopback interface, thus preventing looping.
-	 */
-	error = ip_output(m, (struct mbuf *)0, &ro,
-			  IP_FORWARDING, &imo);
-
-	if (mrtdebug & DEBUG_XMIT)
-	    log(LOG_DEBUG, "phyint_send on vif %d err %d\n", 
-		vifp - viftable, error);
-    }
-    splx(s);
-}
-
-/* determine the current time and then
- * the elapsed time (between the last time and time now)
- * in milliseconds & update the no. of tokens in the bucket
- */
-static void
-tbf_update_tokens(vifp)
-    register struct vif *vifp;
-{
-    struct timeval tp;
-    register u_long tm;
-    register int s = splnet();
-    register struct tbf *t = vifp->v_tbf;
-
-    GET_TIME(tp);
-
-    TV_DELTA(tp, t->tbf_last_pkt_t, tm);
-
-    /*
-     * This formula is actually
-     * "time in seconds" * "bytes/second".
-     *
-     * (tm / 1000000) * (v_rate_limit * 1000 * (1000/1024) / 8)
-     *
-     * The (1000/1024) was introduced in add_vif to optimize
-     * this divide into a shift.
-     */
-    t->tbf_n_tok += tm * vifp->v_rate_limit / 1024 / 8;
-    t->tbf_last_pkt_t = tp;
-
-    if (t->tbf_n_tok > MAX_BKT_SIZE)
-	t->tbf_n_tok = MAX_BKT_SIZE;
-
-    splx(s);
-}
-
-static int
-priority(vifp, ip)
-    register struct vif *vifp;
-    register struct ip *ip;
-{
-    register int prio;
-
-    /* temporary hack; may add general packet classifier some day */
-
-    /*
-     * The UDP port space is divided up into four priority ranges:
-     * [0, 16384)     : unclassified - lowest priority
-     * [16384, 32768) : audio - highest priority
-     * [32768, 49152) : whiteboard - medium priority
-     * [49152, 65536) : video - low priority
-     */
-    if (ip->ip_p == IPPROTO_UDP) {
-	struct udphdr *udp = (struct udphdr *)(((char *)ip) + (ip->ip_hl << 2));
-	switch (ntohs(udp->uh_dport) & 0xc000) {
-	    case 0x4000:
-		prio = 70;
-		break;
-	    case 0x8000:
-		prio = 60;
-		break;
-	    case 0xc000:
-		prio = 55;
-		break;
-	    default:
-		prio = 50;
-		break;
-	}
-	if (tbfdebug > 1)
-		log(LOG_DEBUG, "port %x prio%d\n", ntohs(udp->uh_dport), prio);
-    } else {
-	    prio = 50;
-    }
-    return prio;
-}
-
-/*
- * End of token bucket filter modifications 
- */
-
-int
-ip_rsvp_vif_init(so, m)
-    struct socket *so;
-    struct mbuf *m;
-{
-    int i;
-    register int s;
-
-    if (rsvpdebug)
-	printf("ip_rsvp_vif_init: so_type = %d, pr_protocol = %d\n",
-	       so->so_type, so->so_proto->pr_protocol);
-
-    if (so->so_type != SOCK_RAW || so->so_proto->pr_protocol != IPPROTO_RSVP)
-	return EOPNOTSUPP;
-
-    /* Check mbuf. */
-    if (m == NULL || m->m_len != sizeof(int)) {
-	return EINVAL;
-    }
-    i = *(mtod(m, int *));
- 
-    if (rsvpdebug)
-	printf("ip_rsvp_vif_init: vif = %d rsvp_on = %d\n",i,rsvp_on);
- 
-    s = splnet();
-
-    /* Check vif. */
-    if (!legal_vif_num(i)) {
-	splx(s);
-	return EADDRNOTAVAIL;
-    }
-
-    /* Check if socket is available. */
-    if (viftable[i].v_rsvpd != NULL) {
-	splx(s);
-	return EADDRINUSE;
-    }
-
-    viftable[i].v_rsvpd = so;
-    /* This may seem silly, but we need to be sure we don't over-increment
-     * the RSVP counter, in case something slips up.
-     */
-    if (!viftable[i].v_rsvp_on) {
-	viftable[i].v_rsvp_on = 1;
-	rsvp_on++;
-    }
-
-    splx(s);
-    return 0;
-}
-
-int
-ip_rsvp_vif_done(so, m)
-    struct socket *so;
-    struct mbuf *m;
-{
-	int i;
-	register int s;
- 
-    if (rsvpdebug)
-	printf("ip_rsvp_vif_done: so_type = %d, pr_protocol = %d\n",
-	       so->so_type, so->so_proto->pr_protocol);
- 
-    if (so->so_type != SOCK_RAW || so->so_proto->pr_protocol != IPPROTO_RSVP)
-	return EOPNOTSUPP;
- 
-    /* Check mbuf. */
-    if (m == NULL || m->m_len != sizeof(int)) {
-	    return EINVAL;
-    }
-    i = *(mtod(m, int *));
- 
-    s = splnet();
- 
-    /* Check vif. */
-    if (!legal_vif_num(i)) {
-	splx(s);
-        return EADDRNOTAVAIL;
-    }
-
-    if (rsvpdebug)
-	printf("ip_rsvp_vif_done: v_rsvpd = %p so = %p\n",
-	       viftable[i].v_rsvpd, so);
-
-    viftable[i].v_rsvpd = NULL;
-    /* This may seem silly, but we need to be sure we don't over-decrement
-     * the RSVP counter, in case something slips up.
-     */
-    if (viftable[i].v_rsvp_on) {
-	viftable[i].v_rsvp_on = 0;
-	rsvp_on--;
-    }
-
-    splx(s);
-    return 0;
-}
-
-void
-ip_rsvp_force_done(so)
-    struct socket *so;
-{
-    int vifi;
-    register int s;
-
-    /* Don't bother if it is not the right type of socket. */
-    if (so->so_type != SOCK_RAW || so->so_proto->pr_protocol != IPPROTO_RSVP)
-	return;
-
-    s = splnet();
-
-    /* The socket may be attached to more than one vif...this
-     * is perfectly legal.
-     */
-    for (vifi = 0; vifi < numvifs; vifi++) {
-	if (viftable[vifi].v_rsvpd == so) {
-	    viftable[vifi].v_rsvpd = NULL;
-	    /* This may seem silly, but we need to be sure we don't
-	     * over-decrement the RSVP counter, in case something slips up.
-	     */
-	    if (viftable[vifi].v_rsvp_on) {
-		viftable[vifi].v_rsvp_on = 0;
-		rsvp_on--;
-	    }
-	}
-    }
-
-    splx(s);
-    return;
-}
-
-void
-rsvp_input(m, iphlen)
-	struct mbuf *m;
-	int iphlen;
-{
-    int vifi;
-    register struct ip *ip = mtod(m, struct ip *);
-    static struct sockaddr_in rsvp_src = { sizeof rsvp_src, AF_INET };
-    register int s;
-    struct ifnet *ifp;
-
-    if (rsvpdebug)
-	printf("rsvp_input: rsvp_on %d\n",rsvp_on);
-
-    /* Can still get packets with rsvp_on = 0 if there is a local member
-     * of the group to which the RSVP packet is addressed.  But in this
-     * case we want to throw the packet away.
-     */
-    if (!rsvp_on) {
-	m_freem(m);
-	return;
-    }
-
-    /* If the old-style non-vif-associated socket is set, then use
-     * it and ignore the new ones.
-     */
-    if (ip_rsvpd != NULL) {
-	if (rsvpdebug)
-	    printf("rsvp_input: Sending packet up old-style socket\n");
-	rip_input(m, iphlen);
-	return;
-    }
-
-    s = splnet();
-
-    if (rsvpdebug)
-	printf("rsvp_input: check vifs\n");
-
-#ifdef DIAGNOSTIC
-    if (!(m->m_flags & M_PKTHDR))
-	    panic("rsvp_input no hdr");
-#endif
-
-    ifp = m->m_pkthdr.rcvif;
-    /* Find which vif the packet arrived on. */
-    for (vifi = 0; vifi < numvifs; vifi++) {
-	if (viftable[vifi].v_ifp == ifp)
- 		break;
- 	}
- 
-    if (vifi == numvifs) {
-	/* Can't find vif packet arrived on. Drop packet. */
-	if (rsvpdebug)
-	    printf("rsvp_input: Can't find vif for packet...dropping it.\n");
-	m_freem(m);
-	splx(s);
-	return;
-    }
-
-    if (rsvpdebug)
-	printf("rsvp_input: check socket\n");
-
-    if (viftable[vifi].v_rsvpd == NULL) {
-	/* drop packet, since there is no specific socket for this
-	 * interface */
-	    if (rsvpdebug)
-		    printf("rsvp_input: No socket defined for vif %d\n",vifi);
-	    m_freem(m);
-	    splx(s);
-	    return;
-    }
-    rsvp_src.sin_addr = ip->ip_src;
-
-    if (rsvpdebug && m)
-	printf("rsvp_input: m->m_len = %d, sbspace() = %ld\n",
-	       m->m_len,sbspace(&(viftable[vifi].v_rsvpd->so_rcv)));
-
-    if (socket_send(viftable[vifi].v_rsvpd, m, &rsvp_src) < 0)
-	if (rsvpdebug)
-	    printf("rsvp_input: Failed to append to socket\n");
-    else
-	if (rsvpdebug)
-	    printf("rsvp_input: send packet up\n");
-    
-    splx(s);
-}
-
-#ifdef MROUTE_LKM
-#include <sys/conf.h>
-#include <sys/exec.h>
-#include <sys/sysent.h>
-#include <sys/lkm.h>
-
-MOD_MISC("ip_mroute_mod")
-
-static int
-ip_mroute_mod_handle(struct lkm_table *lkmtp, int cmd)
-{
-	int i;
-	struct lkm_misc	*args = lkmtp->private.lkm_misc;
-	int err = 0;
-
-	switch(cmd) {
-		static int (*old_ip_mrouter_cmd)();
-		static int (*old_ip_mrouter_done)();
-		static int (*old_ip_mforward)();
-		static int (*old_mrt_ioctl)();
-		static void (*old_proto4_input)();
-		static int (*old_legal_vif_num)();
-		extern struct protosw inetsw[];
-
-	case LKM_E_LOAD:
-		if(lkmexists(lkmtp) || ip_mrtproto)
-		  return(EEXIST);
-		old_ip_mrouter_cmd = ip_mrouter_cmd;
-		ip_mrouter_cmd = X_ip_mrouter_cmd;
-		old_ip_mrouter_done = ip_mrouter_done;
-		ip_mrouter_done = X_ip_mrouter_done;
-		old_ip_mforward = ip_mforward;
-		ip_mforward = X_ip_mforward;
-		old_mrt_ioctl = mrt_ioctl;
-		mrt_ioctl = X_mrt_ioctl;
-              old_proto4_input = inetsw[ip_protox[ENCAP_PROTO]].pr_input;
-              inetsw[ip_protox[ENCAP_PROTO]].pr_input = X_ipip_input;
-		old_legal_vif_num = legal_vif_num;
-		legal_vif_num = X_legal_vif_num;
-		ip_mrtproto = IGMP_DVMRP;
-
-		printf("\nIP multicast routing loaded\n");
-		break;
-
-	case LKM_E_UNLOAD:
-		if (ip_mrouter)
-		  return EINVAL;
-
-		ip_mrouter_cmd = old_ip_mrouter_cmd;
-		ip_mrouter_done = old_ip_mrouter_done;
-		ip_mforward = old_ip_mforward;
-		mrt_ioctl = old_mrt_ioctl;
-              inetsw[ip_protox[ENCAP_PROTO]].pr_input = old_proto4_input;
-		legal_vif_num = old_legal_vif_num;
-		ip_mrtproto = 0;
-		break;
-
-	default:
-		err = EINVAL;
-		break;
-	}
-
-	return(err);
-}
-
-int
-ip_mroute_mod(struct lkm_table *lkmtp, int cmd, int ver) {
-	DISPATCH(lkmtp, cmd, ver, ip_mroute_mod_handle, ip_mroute_mod_handle,
-		 nosys);
-}
-
-#endif /* MROUTE_LKM */
-#endif /* MROUTING */
diff --git a/c/src/libnetworking/netinet/ip_mroute.h b/c/src/libnetworking/netinet/ip_mroute.h
deleted file mode 100644
index 5ddd6799d2..0000000000
--- a/c/src/libnetworking/netinet/ip_mroute.h
+++ /dev/null
@@ -1,262 +0,0 @@
-/*
- * Copyright (c) 1989 Stephen Deering.
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Stephen Deering of Stanford University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)ip_mroute.h	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#ifndef _NETINET_IP_MROUTE_H_
-#define _NETINET_IP_MROUTE_H_
-
-/*
- * Definitions for IP multicast forwarding.
- *
- * Written by David Waitzman, BBN Labs, August 1988.
- * Modified by Steve Deering, Stanford, February 1989.
- * Modified by Ajit Thyagarajan, PARC, August 1993.
- * Modified by Ajit Thyagarajan, PARC, August 1994.
- *
- * MROUTING Revision: 3.3.1.3
- */
-
-
-/*
- * Multicast Routing set/getsockopt commands.
- */
-#define	MRT_INIT	100	/* initialize forwarder */
-#define	MRT_DONE	101	/* shut down forwarder */
-#define	MRT_ADD_VIF	102	/* create virtual interface */
-#define	MRT_DEL_VIF	103	/* delete virtual interface */
-#define MRT_ADD_MFC	104	/* insert forwarding cache entry */
-#define MRT_DEL_MFC	105	/* delete forwarding cache entry */
-#define MRT_VERSION	106	/* get kernel version number */
-#define MRT_ASSERT      107     /* enable PIM assert processing */
-
-
-#define GET_TIME(t)	microtime(&t)
-
-/*
- * Types and macros for handling bitmaps with one bit per virtual interface.
- */
-#define	MAXVIFS 32
-typedef u_long vifbitmap_t;
-typedef u_short vifi_t;		/* type of a vif index */
-#define ALL_VIFS (vifi_t)-1
-
-#define	VIFM_SET(n, m)		((m) |= (1 << (n)))
-#define	VIFM_CLR(n, m)		((m) &= ~(1 << (n)))
-#define	VIFM_ISSET(n, m)	((m) & (1 << (n)))
-#define	VIFM_CLRALL(m)		((m) = 0x00000000)
-#define	VIFM_COPY(mfrom, mto)	((mto) = (mfrom))
-#define	VIFM_SAME(m1, m2)	((m1) == (m2))
-
-
-/*
- * Argument structure for MRT_ADD_VIF.
- * (MRT_DEL_VIF takes a single vifi_t argument.)
- */
-struct vifctl {
-	vifi_t	vifc_vifi;	    	/* the index of the vif to be added */
-	u_char	vifc_flags;     	/* VIFF_ flags defined below */
-	u_char	vifc_threshold; 	/* min ttl required to forward on vif */
-	u_int	vifc_rate_limit;	/* max rate */
-	struct	in_addr vifc_lcl_addr;	/* local interface address */
-	struct	in_addr vifc_rmt_addr;	/* remote address (tunnels only) */
-};
-
-#define	VIFF_TUNNEL	0x1		/* vif represents a tunnel end-point */
-#define VIFF_SRCRT	0x2		/* tunnel uses IP source routing */
-
-/*
- * Argument structure for MRT_ADD_MFC and MRT_DEL_MFC
- * (mfcc_tos to be added at a future point)
- */
-struct mfcctl {
-    struct in_addr  mfcc_origin;		/* ip origin of mcasts       */
-    struct in_addr  mfcc_mcastgrp; 		/* multicast group associated*/
-    vifi_t	    mfcc_parent;   		/* incoming vif              */
-    u_char	    mfcc_ttls[MAXVIFS]; 	/* forwarding ttls on vifs   */
-};
-
-/*
- * The kernel's multicast routing statistics.
- */
-struct mrtstat {
-    u_long	mrts_mfc_lookups;	/* # forw. cache hash table hits   */
-    u_long	mrts_mfc_misses;	/* # forw. cache hash table misses */
-    u_long	mrts_upcalls;		/* # calls to mrouted              */
-    u_long	mrts_no_route;		/* no route for packet's origin    */
-    u_long	mrts_bad_tunnel;	/* malformed tunnel options        */
-    u_long	mrts_cant_tunnel;	/* no room for tunnel options      */
-    u_long	mrts_wrong_if;		/* arrived on wrong interface	   */
-    u_long	mrts_upq_ovflw;		/* upcall Q overflow		   */
-    u_long	mrts_cache_cleanups;	/* # entries with no upcalls 	   */
-    u_long  	mrts_drop_sel;     	/* pkts dropped selectively        */
-    u_long  	mrts_q_overflow;    	/* pkts dropped - Q overflow       */
-    u_long  	mrts_pkt2large;     	/* pkts dropped - size > BKT SIZE  */
-    u_long	mrts_upq_sockfull;	/* upcalls dropped - socket full */
-};
-
-/*
- * Argument structure used by mrouted to get src-grp pkt counts
- */
-struct sioc_sg_req {
-    struct in_addr src;
-    struct in_addr grp;
-    u_long pktcnt;
-    u_long bytecnt;
-    u_long wrong_if;
-};
-
-/*
- * Argument structure used by mrouted to get vif pkt counts
- */
-struct sioc_vif_req {
-    vifi_t vifi;		/* vif number				*/
-    u_long icount;		/* Input packet count on vif		*/
-    u_long ocount;		/* Output packet count on vif		*/
-    u_long ibytes;		/* Input byte count on vif		*/
-    u_long obytes;		/* Output byte count on vif		*/
-};
-    
-
-/*
- * The kernel's virtual-interface structure.
- */
-struct vif {
-    u_char   		v_flags;     	/* VIFF_ flags defined above         */
-    u_char   		v_threshold;	/* min ttl required to forward on vif*/
-    u_int      		v_rate_limit; 	/* max rate			     */
-    struct tbf 	       *v_tbf;       	/* token bucket structure at intf.   */
-    struct in_addr 	v_lcl_addr;   	/* local interface address           */
-    struct in_addr 	v_rmt_addr;   	/* remote address (tunnels only)     */
-    struct ifnet       *v_ifp;	     	/* pointer to interface              */
-    u_long		v_pkt_in;	/* # pkts in on interface            */
-    u_long		v_pkt_out;	/* # pkts out on interface           */
-    u_long		v_bytes_in;	/* # bytes in on interface	     */
-    u_long		v_bytes_out;	/* # bytes out on interface	     */
-    struct route	v_route;	/* cached route if this is a tunnel */
-    u_int		v_rsvp_on;	/* RSVP listening on this vif */
-    struct socket      *v_rsvpd;	/* RSVP daemon socket */
-};
-
-/*
- * The kernel's multicast forwarding cache entry structure 
- * (A field for the type of service (mfc_tos) is to be added 
- * at a future point)
- */
-struct mfc {
-    struct in_addr  mfc_origin;	 		/* IP origin of mcasts   */
-    struct in_addr  mfc_mcastgrp;  		/* multicast group associated*/
-    vifi_t	    mfc_parent; 		/* incoming vif              */
-    u_char	    mfc_ttls[MAXVIFS]; 		/* forwarding ttls on vifs   */
-    u_long	    mfc_pkt_cnt;		/* pkt count for src-grp     */
-    u_long	    mfc_byte_cnt;		/* byte count for src-grp    */
-    u_long	    mfc_wrong_if;		/* wrong if for src-grp	     */
-    int		    mfc_expire;			/* time to clean entry up    */
-    struct timeval  mfc_last_assert;		/* last time I sent an assert*/
-};
-
-/*
- * Struct used to communicate from kernel to multicast router
- * note the convenient similarity to an IP packet
- */
-struct igmpmsg {
-    u_long	    unused1;
-    u_long	    unused2;
-    u_char	    im_msgtype;			/* what type of message	    */
-#define IGMPMSG_NOCACHE		1
-#define IGMPMSG_WRONGVIF	2
-    u_char	    im_mbz;			/* must be zero		    */
-    u_char	    im_vif;			/* vif rec'd on		    */
-    u_char	    unused3;
-    struct in_addr  im_src, im_dst;
-};
-
-/*
- * Argument structure used for pkt info. while upcall is made
- */
-struct rtdetq {
-    struct mbuf 	*m;		/* A copy of the packet		    */
-    struct ifnet	*ifp;		/* Interface pkt came in on	    */
-    vifi_t		xmt_vif;	/* Saved copy of imo_multicast_vif  */
-#ifdef UPCALL_TIMING
-    struct timeval	t;		/* Timestamp */
-#endif /* UPCALL_TIMING */
-};
-
-#define MFCTBLSIZ	256
-#if (MFCTBLSIZ & (MFCTBLSIZ - 1)) == 0	  /* from sys:route.h */
-#define MFCHASHMOD(h)	((h) & (MFCTBLSIZ - 1))
-#else
-#define MFCHASHMOD(h)	((h) % MFCTBLSIZ)
-#endif
-
-#define MAX_UPQ	4		/* max. no of pkts in upcall Q */
-
-/*
- * Token Bucket filter code 
- */
-#define MAX_BKT_SIZE    10000             /* 10K bytes size 		*/
-#define MAXQSIZE        10                /* max # of pkts in queue 	*/
-
-/*
- * the token bucket filter at each vif
- */
-struct tbf
-{
-    struct timeval tbf_last_pkt_t; /* arr. time of last pkt 	*/
-    u_long tbf_n_tok;      	/* no of tokens in bucket 	*/
-    u_long tbf_q_len;    	/* length of queue at this vif	*/
-    u_long tbf_max_q_len;	/* max. queue length		*/
-    struct mbuf *tbf_q;		/* Packet queue			*/
-    struct mbuf *tbf_t;		/* tail-insertion pointer	*/
-};
-
-#ifdef KERNEL
-
-extern int	(*ip_mrouter_set) __P((int, struct socket *, struct mbuf *));
-extern int	(*ip_mrouter_get) __P((int, struct socket *, struct mbuf **));
-extern int	(*ip_mrouter_done) __P((void));
-#ifdef MROUTING
-extern int	(*mrt_ioctl) __P((int, caddr_t));
-#else
-extern int	(*mrt_ioctl) __P((int, caddr_t, struct proc *));
-#endif
-
-#endif /* KERNEL */
-
-#endif /* _NETINET_IP_MROUTE_H_ */
diff --git a/c/src/libnetworking/netinet/ip_output.c b/c/src/libnetworking/netinet/ip_output.c
deleted file mode 100644
index 810f6c7479..0000000000
--- a/c/src/libnetworking/netinet/ip_output.c
+++ /dev/null
@@ -1,1307 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1988, 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)ip_output.c	8.3 (Berkeley) 1/21/94
- *	$Id$
- */
-
-#define _IP_VHL
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/systm.h>
-#include <sys/malloc.h>
-#include <sys/mbuf.h>
-#include <sys/errno.h>
-#include <sys/protosw.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-
-#include <net/if.h>
-#include <net/route.h>
-
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/in_pcb.h>
-#include <netinet/in_var.h>
-#include <netinet/ip_var.h>
-
-#ifdef vax
-#include <machine/mtpr.h>
-#endif
-#include <machine/in_cksum.h>
-
-#if !defined(COMPAT_IPFW) || COMPAT_IPFW == 1
-#undef COMPAT_IPFW
-#define COMPAT_IPFW 1
-#else
-#undef COMPAT_IPFW
-#endif
-
-u_short ip_id;
-
-static struct mbuf *ip_insertoptions __P((struct mbuf *, struct mbuf *, int *));
-static void	ip_mloopback
-	__P((struct ifnet *, struct mbuf *, struct sockaddr_in *, int));
-static int	ip_getmoptions
-	__P((int, struct ip_moptions *, struct mbuf **));
-static int	ip_optcopy __P((struct ip *, struct ip *));
-static int	ip_pcbopts __P((struct mbuf **, struct mbuf *));
-static int	ip_setmoptions
-	__P((int, struct ip_moptions **, struct mbuf *));
-
-extern	struct protosw inetsw[];
-
-/*
- * IP output.  The packet in mbuf chain m contains a skeletal IP
- * header (with len, off, ttl, proto, tos, src, dst).
- * The mbuf chain containing the packet will be freed.
- * The mbuf opt, if present, will not be freed.
- */
-int
-ip_output(m0, opt, ro, flags, imo)
-	struct mbuf *m0;
-	struct mbuf *opt;
-	struct route *ro;
-	int flags;
-	struct ip_moptions *imo;
-{
-	struct ip *ip, *mhip;
-	struct ifnet *ifp;
-	struct mbuf *m = m0;
-	int hlen = sizeof (struct ip);
-	int len, off, error = 0;
-	struct sockaddr_in *dst;
-	struct in_ifaddr *ia;
-	int isbroadcast;
-
-#ifdef	DIAGNOSTIC
-	if ((m->m_flags & M_PKTHDR) == 0)
-		panic("ip_output no HDR");
-	if (!ro)
-		panic("ip_output no route, proto = %d",
-		      mtod(m, struct ip *)->ip_p);
-#endif
-	if (opt) {
-		m = ip_insertoptions(m, opt, &len);
-		hlen = len;
-	}
-	ip = mtod(m, struct ip *);
-	/*
-	 * Fill in IP header.
-	 */
-	if ((flags & (IP_FORWARDING|IP_RAWOUTPUT)) == 0) {
-		ip->ip_vhl = IP_MAKE_VHL(IPVERSION, hlen >> 2);
-		ip->ip_off &= IP_DF;
-		ip->ip_id = htons(ip_id++);
-		ipstat.ips_localout++;
-	} else {
-		hlen = IP_VHL_HL(ip->ip_vhl) << 2;
-	}
-
-	dst = (struct sockaddr_in *)&ro->ro_dst;
-	/*
-	 * If there is a cached route,
-	 * check that it is to the same destination
-	 * and is still up.  If not, free it and try again.
-	 */
-	if (ro->ro_rt && ((ro->ro_rt->rt_flags & RTF_UP) == 0 ||
-	   dst->sin_addr.s_addr != ip->ip_dst.s_addr)) {
-		RTFREE(ro->ro_rt);
-		ro->ro_rt = (struct rtentry *)0;
-	}
-	if (ro->ro_rt == 0) {
-		dst->sin_family = AF_INET;
-		dst->sin_len = sizeof(*dst);
-		dst->sin_addr = ip->ip_dst;
-	}
-	/*
-	 * If routing to interface only,
-	 * short circuit routing lookup.
-	 */
-#define ifatoia(ifa)	((struct in_ifaddr *)(ifa))
-#define sintosa(sin)	((struct sockaddr *)(sin))
-	if (flags & IP_ROUTETOIF) {
-		if ((ia = ifatoia(ifa_ifwithdstaddr(sintosa(dst)))) == 0 &&
-		    (ia = ifatoia(ifa_ifwithnet(sintosa(dst)))) == 0) {
-			ipstat.ips_noroute++;
-			error = ENETUNREACH;
-			goto bad;
-		}
-		ifp = ia->ia_ifp;
-		ip->ip_ttl = 1;
-		isbroadcast = in_broadcast(dst->sin_addr, ifp);
-	} else {
-		/*
-		 * If this is the case, we probably don't want to allocate
-		 * a protocol-cloned route since we didn't get one from the
-		 * ULP.  This lets TCP do its thing, while not burdening
-		 * forwarding or ICMP with the overhead of cloning a route.
-		 * Of course, we still want to do any cloning requested by
-		 * the link layer, as this is probably required in all cases
-		 * for correct operation (as it is for ARP).
-		 */
-		if (ro->ro_rt == 0)
-			rtalloc_ign(ro, RTF_PRCLONING);
-		if (ro->ro_rt == 0) {
-			ipstat.ips_noroute++;
-			error = EHOSTUNREACH;
-			goto bad;
-		}
-		ia = ifatoia(ro->ro_rt->rt_ifa);
-		ifp = ro->ro_rt->rt_ifp;
-		ro->ro_rt->rt_use++;
-		if (ro->ro_rt->rt_flags & RTF_GATEWAY)
-			dst = (struct sockaddr_in *)ro->ro_rt->rt_gateway;
-		if (ro->ro_rt->rt_flags & RTF_HOST)
-			isbroadcast = (ro->ro_rt->rt_flags & RTF_BROADCAST);
-		else
-			isbroadcast = in_broadcast(dst->sin_addr, ifp);
-	}
-	if (IN_MULTICAST(ntohl(ip->ip_dst.s_addr))) {
-		struct in_multi *inm;
-
-		m->m_flags |= M_MCAST;
-		/*
-		 * IP destination address is multicast.  Make sure "dst"
-		 * still points to the address in "ro".  (It may have been
-		 * changed to point to a gateway address, above.)
-		 */
-		dst = (struct sockaddr_in *)&ro->ro_dst;
-		/*
-		 * See if the caller provided any multicast options
-		 */
-		if (imo != NULL) {
-			ip->ip_ttl = imo->imo_multicast_ttl;
-			if (imo->imo_multicast_ifp != NULL)
-				ifp = imo->imo_multicast_ifp;
-			if (imo->imo_multicast_vif != -1)
-				ip->ip_src.s_addr =
-				    ip_mcast_src(imo->imo_multicast_vif);
-		} else
-			ip->ip_ttl = IP_DEFAULT_MULTICAST_TTL;
-		/*
-		 * Confirm that the outgoing interface supports multicast.
-		 */
-		if ((imo == NULL) || (imo->imo_multicast_vif == -1)) {
-			if ((ifp->if_flags & IFF_MULTICAST) == 0) {
-				ipstat.ips_noroute++;
-				error = ENETUNREACH;
-				goto bad;
-			}
-		}
-		/*
-		 * If source address not specified yet, use address
-		 * of outgoing interface.
-		 */
-		if (ip->ip_src.s_addr == INADDR_ANY) {
-			register struct in_ifaddr *ia;
-
-			for (ia = in_ifaddr; ia; ia = ia->ia_next)
-				if (ia->ia_ifp == ifp) {
-					ip->ip_src = IA_SIN(ia)->sin_addr;
-					break;
-				}
-		}
-
-		IN_LOOKUP_MULTI(ip->ip_dst, ifp, inm);
-		if (inm != NULL &&
-		   (imo == NULL || imo->imo_multicast_loop)) {
-			/*
-			 * If we belong to the destination multicast group
-			 * on the outgoing interface, and the caller did not
-			 * forbid loopback, loop back a copy.
-			 */
-			ip_mloopback(ifp, m, dst, hlen);
-		}
-		else {
-			/*
-			 * If we are acting as a multicast router, perform
-			 * multicast forwarding as if the packet had just
-			 * arrived on the interface to which we are about
-			 * to send.  The multicast forwarding function
-			 * recursively calls this function, using the
-			 * IP_FORWARDING flag to prevent infinite recursion.
-			 *
-			 * Multicasts that are looped back by ip_mloopback(),
-			 * above, will be forwarded by the ip_input() routine,
-			 * if necessary.
-			 */
-			if (ip_mrouter && (flags & IP_FORWARDING) == 0) {
-				/*
-				 * Check if rsvp daemon is running. If not, don't
-				 * set ip_moptions. This ensures that the packet
-				 * is multicast and not just sent down one link
-				 * as prescribed by rsvpd.
-				 */
-				if (!rsvp_on)
-				  imo = NULL;
-				if (ip_mforward(ip, ifp, m, imo) != 0) {
-					m_freem(m);
-					goto done;
-				}
-			}
-		}
-
-		/*
-		 * Multicasts with a time-to-live of zero may be looped-
-		 * back, above, but must not be transmitted on a network.
-		 * Also, multicasts addressed to the loopback interface
-		 * are not sent -- the above call to ip_mloopback() will
-		 * loop back a copy if this host actually belongs to the
-		 * destination group on the loopback interface.
-		 */
-		if (ip->ip_ttl == 0 || ifp->if_flags & IFF_LOOPBACK) {
-			m_freem(m);
-			goto done;
-		}
-
-		goto sendit;
-	}
-#ifndef notdef
-	/*
-	 * If source address not specified yet, use address
-	 * of outgoing interface.
-	 */
-	if (ip->ip_src.s_addr == INADDR_ANY)
-		ip->ip_src = IA_SIN(ia)->sin_addr;
-#endif
-	/*
-	 * Verify that we have any chance at all of being able to queue
-	 *      the packet or packet fragments
-	 */
-	if ((ifp->if_snd.ifq_len + ip->ip_len / ifp->if_mtu + 1) >=
-		ifp->if_snd.ifq_maxlen) {
-			error = ENOBUFS;
-			goto bad;
-	}
-
-	/*
-	 * Look for broadcast address and
-	 * and verify user is allowed to send
-	 * such a packet.
-	 */
-	if (isbroadcast) {
-		if ((ifp->if_flags & IFF_BROADCAST) == 0) {
-			error = EADDRNOTAVAIL;
-			goto bad;
-		}
-		if ((flags & IP_ALLOWBROADCAST) == 0) {
-			error = EACCES;
-			goto bad;
-		}
-		/* don't allow broadcast messages to be fragmented */
-		if ((u_short)ip->ip_len > ifp->if_mtu) {
-			error = EMSGSIZE;
-			goto bad;
-		}
-		m->m_flags |= M_BCAST;
-	} else {
-		m->m_flags &= ~M_BCAST;
-	}
-
-sendit:
-        /*
-	 * IpHack's section.
-	 * - Xlate: translate packet's addr/port (NAT).
-	 * - Firewall: deny/allow/etc.
-	 * - Wrap: fake packet's addr/port <unimpl.>
-	 * - Encapsulate: put it in another IP and send out. <unimp.>
-	 */ 
-
-#ifdef COMPAT_IPFW
-        if (ip_nat_ptr && !(*ip_nat_ptr)(&ip, &m, ifp, IP_NAT_OUT)) {
-		error = EACCES; 
-		goto done;
-	}
-
-	/*
-	 * Check with the firewall...
-	 */
-	if (ip_fw_chk_ptr) {
-#ifdef IPDIVERT
-		ip_divert_port = (*ip_fw_chk_ptr)(&ip,
-		    hlen, ifp, ip_divert_ignore, &m);
-		ip_divert_ignore = 0;
-		if (ip_divert_port) {		/* Divert packet */
-			(*inetsw[ip_protox[IPPROTO_DIVERT]].pr_input)(m, 0);
-			goto done;
-		}
-#else
-		/* If ipfw says divert, we have to just drop packet */
-		if ((*ip_fw_chk_ptr)(&ip, hlen, ifp, 0, &m)) {
-			m_freem(m);
-			goto done;
-		}
-#endif
-		if (!m) {
-			error = EACCES;
-			goto done;
-		}
-	}
-#endif /* COMPAT_IPFW */
-
-	/*
-	 * If small enough for interface, can just send directly.
-	 */
-	if ((u_short)ip->ip_len <= ifp->if_mtu) {
-		ip->ip_len = htons((u_short)ip->ip_len);
-		ip->ip_off = htons((u_short)ip->ip_off);
-		ip->ip_sum = 0;
-		if (ip->ip_vhl == IP_VHL_BORING) {
-			ip->ip_sum = in_cksum_hdr(ip);
-		} else {
-			ip->ip_sum = in_cksum(m, hlen);
-		}
-		error = (*ifp->if_output)(ifp, m,
-				(struct sockaddr *)dst, ro->ro_rt);
-		goto done;
-	}
-	/*
-	 * Too large for interface; fragment if possible.
-	 * Must be able to put at least 8 bytes per fragment.
-	 */
-	if (ip->ip_off & IP_DF) {
-		error = EMSGSIZE;
-		/*
-		 * This case can happen if the user changed the MTU
-		 * of an interface after enabling IP on it.  Because
-		 * most netifs don't keep track of routes pointing to
-		 * them, there is no way for one to update all its
-		 * routes when the MTU is changed.
-		 */
-		if ((ro->ro_rt->rt_flags & (RTF_UP | RTF_HOST))
-		    && !(ro->ro_rt->rt_rmx.rmx_locks & RTV_MTU)
-		    && (ro->ro_rt->rt_rmx.rmx_mtu > ifp->if_mtu)) {
-			ro->ro_rt->rt_rmx.rmx_mtu = ifp->if_mtu;
-		}
-		ipstat.ips_cantfrag++;
-		goto bad;
-	}
-	len = (ifp->if_mtu - hlen) &~ 7;
-	if (len < 8) {
-		error = EMSGSIZE;
-		goto bad;
-	}
-
-    {
-	int mhlen, firstlen = len;
-	struct mbuf **mnext = &m->m_nextpkt;
-
-	/*
-	 * Loop through length of segment after first fragment,
-	 * make new header and copy data of each part and link onto chain.
-	 */
-	m0 = m;
-	mhlen = sizeof (struct ip);
-	for (off = hlen + len; off < (u_short)ip->ip_len; off += len) {
-		MGETHDR(m, M_DONTWAIT, MT_HEADER);
-		if (m == 0) {
-			error = ENOBUFS;
-			ipstat.ips_odropped++;
-			goto sendorfree;
-		}
-		m->m_data += max_linkhdr;
-		mhip = mtod(m, struct ip *);
-		*mhip = *ip;
-		if (hlen > sizeof (struct ip)) {
-			mhlen = ip_optcopy(ip, mhip) + sizeof (struct ip);
-			mhip->ip_vhl = IP_MAKE_VHL(IPVERSION, mhlen >> 2);
-		}
-		m->m_len = mhlen;
-		mhip->ip_off = ((off - hlen) >> 3) + (ip->ip_off & ~IP_MF);
-		if (ip->ip_off & IP_MF)
-			mhip->ip_off |= IP_MF;
-		if (off + len >= (u_short)ip->ip_len)
-			len = (u_short)ip->ip_len - off;
-		else
-			mhip->ip_off |= IP_MF;
-		mhip->ip_len = htons((u_short)(len + mhlen));
-		m->m_next = m_copy(m0, off, len);
-		if (m->m_next == 0) {
-			(void) m_free(m);
-			error = ENOBUFS;	/* ??? */
-			ipstat.ips_odropped++;
-			goto sendorfree;
-		}
-		m->m_pkthdr.len = mhlen + len;
-		m->m_pkthdr.rcvif = (struct ifnet *)0;
-		mhip->ip_off = htons((u_short)mhip->ip_off);
-		mhip->ip_sum = 0;
-		if (mhip->ip_vhl == IP_VHL_BORING) {
-			mhip->ip_sum = in_cksum_hdr(mhip);
-		} else {
-			mhip->ip_sum = in_cksum(m, mhlen);
-		}
-		*mnext = m;
-		mnext = &m->m_nextpkt;
-		ipstat.ips_ofragments++;
-	}
-	/*
-	 * Update first fragment by trimming what's been copied out
-	 * and updating header, then send each fragment (in order).
-	 */
-	m = m0;
-	m_adj(m, hlen + firstlen - (u_short)ip->ip_len);
-	m->m_pkthdr.len = hlen + firstlen;
-	ip->ip_len = htons((u_short)m->m_pkthdr.len);
-	ip->ip_off = htons((u_short)(ip->ip_off | IP_MF));
-	ip->ip_sum = 0;
-	if (ip->ip_vhl == IP_VHL_BORING) {
-		ip->ip_sum = in_cksum_hdr(ip);
-	} else {
-		ip->ip_sum = in_cksum(m, hlen);
-	}
-sendorfree:
-	for (m = m0; m; m = m0) {
-		m0 = m->m_nextpkt;
-		m->m_nextpkt = 0;
-		if (error == 0)
-			error = (*ifp->if_output)(ifp, m,
-			    (struct sockaddr *)dst, ro->ro_rt);
-		else
-			m_freem(m);
-	}
-
-	if (error == 0)
-		ipstat.ips_fragmented++;
-    }
-done:
-	return (error);
-bad:
-	m_freem(m0);
-	goto done;
-}
-
-/*
- * Insert IP options into preformed packet.
- * Adjust IP destination as required for IP source routing,
- * as indicated by a non-zero in_addr at the start of the options.
- *
- * XXX This routine assumes that the packet has no options in place.
- */
-static struct mbuf *
-ip_insertoptions(m, opt, phlen)
-	register struct mbuf *m;
-	struct mbuf *opt;
-	int *phlen;
-{
-	register struct ipoption *p = mtod(opt, struct ipoption *);
-	struct mbuf *n;
-	register struct ip *ip = mtod(m, struct ip *);
-	unsigned optlen;
-
-	optlen = opt->m_len - sizeof(p->ipopt_dst);
-	if (optlen + (u_short)ip->ip_len > IP_MAXPACKET)
-		return (m);		/* XXX should fail */
-	if (p->ipopt_dst.s_addr)
-		ip->ip_dst = p->ipopt_dst;
-	if (m->m_flags & M_EXT || m->m_data - optlen < m->m_pktdat) {
-		MGETHDR(n, M_DONTWAIT, MT_HEADER);
-		if (n == 0)
-			return (m);
-		n->m_pkthdr.len = m->m_pkthdr.len + optlen;
-		m->m_len -= sizeof(struct ip);
-		m->m_data += sizeof(struct ip);
-		n->m_next = m;
-		m = n;
-		m->m_len = optlen + sizeof(struct ip);
-		m->m_data += max_linkhdr;
-		(void)memcpy(mtod(m, void *), ip, sizeof(struct ip));
-	} else {
-		m->m_data -= optlen;
-		m->m_len += optlen;
-		m->m_pkthdr.len += optlen;
-		ovbcopy((caddr_t)ip, mtod(m, caddr_t), sizeof(struct ip));
-	}
-	ip = mtod(m, struct ip *);
-	bcopy(p->ipopt_list, ip + 1, optlen);
-	*phlen = sizeof(struct ip) + optlen;
-	ip->ip_vhl = IP_MAKE_VHL(IPVERSION, *phlen >> 2);
-	ip->ip_len += optlen;
-	return (m);
-}
-
-/*
- * Copy options from ip to jp,
- * omitting those not copied during fragmentation.
- */
-static int
-ip_optcopy(ip, jp)
-	struct ip *ip, *jp;
-{
-	register u_char *cp, *dp;
-	int opt, optlen, cnt;
-
-	cp = (u_char *)(ip + 1);
-	dp = (u_char *)(jp + 1);
-	cnt = (IP_VHL_HL(ip->ip_vhl) << 2) - sizeof (struct ip);
-	for (; cnt > 0; cnt -= optlen, cp += optlen) {
-		opt = cp[0];
-		if (opt == IPOPT_EOL)
-			break;
-		if (opt == IPOPT_NOP) {
-			/* Preserve for IP mcast tunnel's LSRR alignment. */
-			*dp++ = IPOPT_NOP;
-			optlen = 1;
-			continue;
-		} else
-			optlen = cp[IPOPT_OLEN];
-		/* bogus lengths should have been caught by ip_dooptions */
-		if (optlen > cnt)
-			optlen = cnt;
-		if (IPOPT_COPIED(opt)) {
-			bcopy(cp, dp, optlen);
-			dp += optlen;
-		}
-	}
-	for (optlen = dp - (u_char *)(jp+1); optlen & 0x3; optlen++)
-		*dp++ = IPOPT_EOL;
-	return (optlen);
-}
-
-/*
- * IP socket option processing.
- */
-int
-ip_ctloutput(op, so, level, optname, mp)
-	int op;
-	struct socket *so;
-	int level, optname;
-	struct mbuf **mp;
-{
-	register struct inpcb *inp = sotoinpcb(so);
-	register struct mbuf *m = *mp;
-	register int optval = 0;
-	int error = 0;
-
-	if (level != IPPROTO_IP) {
-		error = EINVAL;
-		if (op == PRCO_SETOPT && *mp)
-			(void) m_free(*mp);
-	} else switch (op) {
-
-	case PRCO_SETOPT:
-		switch (optname) {
-		case IP_OPTIONS:
-#ifdef notyet
-		case IP_RETOPTS:
-			return (ip_pcbopts(optname, &inp->inp_options, m));
-#else
-			return (ip_pcbopts(&inp->inp_options, m));
-#endif
-
-		case IP_TOS:
-		case IP_TTL:
-		case IP_RECVOPTS:
-		case IP_RECVRETOPTS:
-		case IP_RECVDSTADDR:
-		case IP_RECVIF:
-			if (m == 0 || m->m_len != sizeof(int))
-				error = EINVAL;
-			else {
-				optval = *mtod(m, int *);
-				switch (optname) {
-
-				case IP_TOS:
-					inp->inp_ip_tos = optval;
-					break;
-
-				case IP_TTL:
-					inp->inp_ip_ttl = optval;
-					break;
-#define	OPTSET(bit) \
-	if (optval) \
-		inp->inp_flags |= bit; \
-	else \
-		inp->inp_flags &= ~bit;
-
-				case IP_RECVOPTS:
-					OPTSET(INP_RECVOPTS);
-					break;
-
-				case IP_RECVRETOPTS:
-					OPTSET(INP_RECVRETOPTS);
-					break;
-
-				case IP_RECVDSTADDR:
-					OPTSET(INP_RECVDSTADDR);
-					break;
-
-				case IP_RECVIF:
-					OPTSET(INP_RECVIF);
-					break;
-				}
-			}
-			break;
-#undef OPTSET
-
-		case IP_MULTICAST_IF:
-		case IP_MULTICAST_VIF:
-		case IP_MULTICAST_TTL:
-		case IP_MULTICAST_LOOP:
-		case IP_ADD_MEMBERSHIP:
-		case IP_DROP_MEMBERSHIP:
-			error = ip_setmoptions(optname, &inp->inp_moptions, m);
-			break;
-
-		case IP_PORTRANGE:
-			if (m == 0 || m->m_len != sizeof(int))
-				error = EINVAL;
-			else {
-				optval = *mtod(m, int *);
-
-				switch (optval) {
-
-				case IP_PORTRANGE_DEFAULT:
-					inp->inp_flags &= ~(INP_LOWPORT);
-					inp->inp_flags &= ~(INP_HIGHPORT);
-					break;
-
-				case IP_PORTRANGE_HIGH:
-					inp->inp_flags &= ~(INP_LOWPORT);
-					inp->inp_flags |= INP_HIGHPORT;
-					break;
-
-				case IP_PORTRANGE_LOW:
-					inp->inp_flags &= ~(INP_HIGHPORT);
-					inp->inp_flags |= INP_LOWPORT;
-					break;
-
-				default:
-					error = EINVAL;
-					break;
-				}
-			}
-			break;
-
-		default:
-			error = ENOPROTOOPT;
-			break;
-		}
-		if (m)
-			(void)m_free(m);
-		break;
-
-	case PRCO_GETOPT:
-		switch (optname) {
-		case IP_OPTIONS:
-		case IP_RETOPTS:
-			*mp = m = m_get(M_WAIT, MT_SOOPTS);
-			if (inp->inp_options) {
-				m->m_len = inp->inp_options->m_len;
-				bcopy(mtod(inp->inp_options, void *),
-				    mtod(m, void *), m->m_len);
-			} else
-				m->m_len = 0;
-			break;
-
-		case IP_TOS:
-		case IP_TTL:
-		case IP_RECVOPTS:
-		case IP_RECVRETOPTS:
-		case IP_RECVDSTADDR:
-		case IP_RECVIF:
-			*mp = m = m_get(M_WAIT, MT_SOOPTS);
-			m->m_len = sizeof(int);
-			switch (optname) {
-
-			case IP_TOS:
-				optval = inp->inp_ip_tos;
-				break;
-
-			case IP_TTL:
-				optval = inp->inp_ip_ttl;
-				break;
-
-#define	OPTBIT(bit)	(inp->inp_flags & bit ? 1 : 0)
-
-			case IP_RECVOPTS:
-				optval = OPTBIT(INP_RECVOPTS);
-				break;
-
-			case IP_RECVRETOPTS:
-				optval = OPTBIT(INP_RECVRETOPTS);
-				break;
-
-			case IP_RECVDSTADDR:
-				optval = OPTBIT(INP_RECVDSTADDR);
-				break;
-
-			case IP_RECVIF:
-				optval = OPTBIT(INP_RECVIF);
-				break;
-			}
-			*mtod(m, int *) = optval;
-			break;
-
-		case IP_MULTICAST_IF:
-		case IP_MULTICAST_VIF:
-		case IP_MULTICAST_TTL:
-		case IP_MULTICAST_LOOP:
-		case IP_ADD_MEMBERSHIP:
-		case IP_DROP_MEMBERSHIP:
-			error = ip_getmoptions(optname, inp->inp_moptions, mp);
-			break;
-
-		case IP_PORTRANGE:
-			*mp = m = m_get(M_WAIT, MT_SOOPTS);
-			m->m_len = sizeof(int);
-
-			if (inp->inp_flags & INP_HIGHPORT)
-				optval = IP_PORTRANGE_HIGH;
-			else if (inp->inp_flags & INP_LOWPORT)
-				optval = IP_PORTRANGE_LOW;
-			else
-				optval = 0;
-
-			*mtod(m, int *) = optval;
-			break;
-
-		default:
-			error = ENOPROTOOPT;
-			break;
-		}
-		break;
-	}
-	return (error);
-}
-
-/*
- * Set up IP options in pcb for insertion in output packets.
- * Store in mbuf with pointer in pcbopt, adding pseudo-option
- * with destination address if source routed.
- */
-static int
-#ifdef notyet
-ip_pcbopts(optname, pcbopt, m)
-	int optname;
-#else
-ip_pcbopts(pcbopt, m)
-#endif
-	struct mbuf **pcbopt;
-	register struct mbuf *m;
-{
-	register int cnt, optlen;
-	register u_char *cp;
-	u_char opt;
-
-	/* turn off any old options */
-	if (*pcbopt)
-		(void)m_free(*pcbopt);
-	*pcbopt = 0;
-	if (m == (struct mbuf *)0 || m->m_len == 0) {
-		/*
-		 * Only turning off any previous options.
-		 */
-		if (m)
-			(void)m_free(m);
-		return (0);
-	}
-
-#ifndef	vax
-	if (m->m_len % sizeof(long))
-		goto bad;
-#endif
-	/*
-	 * IP first-hop destination address will be stored before
-	 * actual options; move other options back
-	 * and clear it when none present.
-	 */
-	if (m->m_data + m->m_len + sizeof(struct in_addr) >= &m->m_dat[MLEN])
-		goto bad;
-	cnt = m->m_len;
-	m->m_len += sizeof(struct in_addr);
-	cp = mtod(m, u_char *) + sizeof(struct in_addr);
-	ovbcopy(mtod(m, caddr_t), (caddr_t)cp, (unsigned)cnt);
-	bzero(mtod(m, caddr_t), sizeof(struct in_addr));
-
-	for (; cnt > 0; cnt -= optlen, cp += optlen) {
-		opt = cp[IPOPT_OPTVAL];
-		if (opt == IPOPT_EOL)
-			break;
-		if (opt == IPOPT_NOP)
-			optlen = 1;
-		else {
-			optlen = cp[IPOPT_OLEN];
-			if (optlen <= IPOPT_OLEN || optlen > cnt)
-				goto bad;
-		}
-		switch (opt) {
-
-		default:
-			break;
-
-		case IPOPT_LSRR:
-		case IPOPT_SSRR:
-			/*
-			 * user process specifies route as:
-			 *	->A->B->C->D
-			 * D must be our final destination (but we can't
-			 * check that since we may not have connected yet).
-			 * A is first hop destination, which doesn't appear in
-			 * actual IP option, but is stored before the options.
-			 */
-			if (optlen < IPOPT_MINOFF - 1 + sizeof(struct in_addr))
-				goto bad;
-			m->m_len -= sizeof(struct in_addr);
-			cnt -= sizeof(struct in_addr);
-			optlen -= sizeof(struct in_addr);
-			cp[IPOPT_OLEN] = optlen;
-			/*
-			 * Move first hop before start of options.
-			 */
-			bcopy((caddr_t)&cp[IPOPT_OFFSET+1], mtod(m, caddr_t),
-			    sizeof(struct in_addr));
-			/*
-			 * Then copy rest of options back
-			 * to close up the deleted entry.
-			 */
-			ovbcopy((caddr_t)(&cp[IPOPT_OFFSET+1] +
-			    sizeof(struct in_addr)),
-			    (caddr_t)&cp[IPOPT_OFFSET+1],
-			    (unsigned)cnt + sizeof(struct in_addr));
-			break;
-		}
-	}
-	if (m->m_len > MAX_IPOPTLEN + sizeof(struct in_addr))
-		goto bad;
-	*pcbopt = m;
-	return (0);
-
-bad:
-	(void)m_free(m);
-	return (EINVAL);
-}
-
-/*
- * Set the IP multicast options in response to user setsockopt().
- */
-static int
-ip_setmoptions(optname, imop, m)
-	int optname;
-	struct ip_moptions **imop;
-	struct mbuf *m;
-{
-	register int error = 0;
-	u_char loop;
-	register int i;
-	struct in_addr addr;
-	register struct ip_mreq *mreq;
-	register struct ifnet *ifp;
-	register struct ip_moptions *imo = *imop;
-	struct route ro;
-	register struct sockaddr_in *dst;
-	int s;
-
-	if (imo == NULL) {
-		/*
-		 * No multicast option buffer attached to the pcb;
-		 * allocate one and initialize to default values.
-		 */
-		imo = (struct ip_moptions*)malloc(sizeof(*imo), M_IPMOPTS,
-		    M_WAITOK);
-
-		if (imo == NULL)
-			return (ENOBUFS);
-		*imop = imo;
-		imo->imo_multicast_ifp = NULL;
-		imo->imo_multicast_vif = -1;
-		imo->imo_multicast_ttl = IP_DEFAULT_MULTICAST_TTL;
-		imo->imo_multicast_loop = IP_DEFAULT_MULTICAST_LOOP;
-		imo->imo_num_memberships = 0;
-	}
-
-	switch (optname) {
-	/* store an index number for the vif you wanna use in the send */
-	case IP_MULTICAST_VIF:
-		if (!legal_vif_num) {
-			error = EOPNOTSUPP;
-			break;
-		}
-		if (m == NULL || m->m_len != sizeof(int)) {
-			error = EINVAL;
-			break;
-		}
-		i = *(mtod(m, int *));
-		if (!legal_vif_num(i) && (i != -1)) {
-			error = EINVAL;
-			break;
-		}
-		imo->imo_multicast_vif = i;
-		break;
-
-	case IP_MULTICAST_IF:
-		/*
-		 * Select the interface for outgoing multicast packets.
-		 */
-		if (m == NULL || m->m_len != sizeof(struct in_addr)) {
-			error = EINVAL;
-			break;
-		}
-		addr = *(mtod(m, struct in_addr *));
-		/*
-		 * INADDR_ANY is used to remove a previous selection.
-		 * When no interface is selected, a default one is
-		 * chosen every time a multicast packet is sent.
-		 */
-		if (addr.s_addr == INADDR_ANY) {
-			imo->imo_multicast_ifp = NULL;
-			break;
-		}
-		/*
-		 * The selected interface is identified by its local
-		 * IP address.  Find the interface and confirm that
-		 * it supports multicasting.
-		 */
-		s = splimp();
-		INADDR_TO_IFP(addr, ifp);
-		if (ifp == NULL || (ifp->if_flags & IFF_MULTICAST) == 0) {
-			splx(s);
-			error = EADDRNOTAVAIL;
-			break;
-		}
-		imo->imo_multicast_ifp = ifp;
-		splx(s);
-		break;
-
-	case IP_MULTICAST_TTL:
-		/*
-		 * Set the IP time-to-live for outgoing multicast packets.
-		 */
-		if (m == NULL || m->m_len != 1) {
-			error = EINVAL;
-			break;
-		}
-		imo->imo_multicast_ttl = *(mtod(m, u_char *));
-		break;
-
-	case IP_MULTICAST_LOOP:
-		/*
-		 * Set the loopback flag for outgoing multicast packets.
-		 * Must be zero or one.
-		 */
-		if (m == NULL || m->m_len != 1 ||
-		   (loop = *(mtod(m, u_char *))) > 1) {
-			error = EINVAL;
-			break;
-		}
-		imo->imo_multicast_loop = loop;
-		break;
-
-	case IP_ADD_MEMBERSHIP:
-		/*
-		 * Add a multicast group membership.
-		 * Group must be a valid IP multicast address.
-		 */
-		if (m == NULL || m->m_len != sizeof(struct ip_mreq)) {
-			error = EINVAL;
-			break;
-		}
-		mreq = mtod(m, struct ip_mreq *);
-		if (!IN_MULTICAST(ntohl(mreq->imr_multiaddr.s_addr))) {
-			error = EINVAL;
-			break;
-		}
-		s = splimp();
-		/*
-		 * If no interface address was provided, use the interface of
-		 * the route to the given multicast address.
-		 */
-		if (mreq->imr_interface.s_addr == INADDR_ANY) {
-			bzero((caddr_t)&ro, sizeof(ro));
-			dst = (struct sockaddr_in *)&ro.ro_dst;
-			dst->sin_len = sizeof(*dst);
-			dst->sin_family = AF_INET;
-			dst->sin_addr = mreq->imr_multiaddr;
-			rtalloc(&ro);
-			if (ro.ro_rt == NULL) {
-				error = EADDRNOTAVAIL;
-				splx(s);
-				break;
-			}
-			ifp = ro.ro_rt->rt_ifp;
-			rtfree(ro.ro_rt);
-		}
-		else {
-			INADDR_TO_IFP(mreq->imr_interface, ifp);
-		}
-
-		/*
-		 * See if we found an interface, and confirm that it
-		 * supports multicast.
-		 */
-		if (ifp == NULL || (ifp->if_flags & IFF_MULTICAST) == 0) {
-			error = EADDRNOTAVAIL;
-			splx(s);
-			break;
-		}
-		/*
-		 * See if the membership already exists or if all the
-		 * membership slots are full.
-		 */
-		for (i = 0; i < imo->imo_num_memberships; ++i) {
-			if (imo->imo_membership[i]->inm_ifp == ifp &&
-			    imo->imo_membership[i]->inm_addr.s_addr
-						== mreq->imr_multiaddr.s_addr)
-				break;
-		}
-		if (i < imo->imo_num_memberships) {
-			error = EADDRINUSE;
-			splx(s);
-			break;
-		}
-		if (i == IP_MAX_MEMBERSHIPS) {
-			error = ETOOMANYREFS;
-			splx(s);
-			break;
-		}
-		/*
-		 * Everything looks good; add a new record to the multicast
-		 * address list for the given interface.
-		 */
-		if ((imo->imo_membership[i] =
-		    in_addmulti(&mreq->imr_multiaddr, ifp)) == NULL) {
-			error = ENOBUFS;
-			splx(s);
-			break;
-		}
-		++imo->imo_num_memberships;
-		splx(s);
-		break;
-
-	case IP_DROP_MEMBERSHIP:
-		/*
-		 * Drop a multicast group membership.
-		 * Group must be a valid IP multicast address.
-		 */
-		if (m == NULL || m->m_len != sizeof(struct ip_mreq)) {
-			error = EINVAL;
-			break;
-		}
-		mreq = mtod(m, struct ip_mreq *);
-		if (!IN_MULTICAST(ntohl(mreq->imr_multiaddr.s_addr))) {
-			error = EINVAL;
-			break;
-		}
-
-		s = splimp();
-		/*
-		 * If an interface address was specified, get a pointer
-		 * to its ifnet structure.
-		 */
-		if (mreq->imr_interface.s_addr == INADDR_ANY)
-			ifp = NULL;
-		else {
-			INADDR_TO_IFP(mreq->imr_interface, ifp);
-			if (ifp == NULL) {
-				error = EADDRNOTAVAIL;
-				splx(s);
-				break;
-			}
-		}
-		/*
-		 * Find the membership in the membership array.
-		 */
-		for (i = 0; i < imo->imo_num_memberships; ++i) {
-			if ((ifp == NULL ||
-			     imo->imo_membership[i]->inm_ifp == ifp) &&
-			     imo->imo_membership[i]->inm_addr.s_addr ==
-			     mreq->imr_multiaddr.s_addr)
-				break;
-		}
-		if (i == imo->imo_num_memberships) {
-			error = EADDRNOTAVAIL;
-			splx(s);
-			break;
-		}
-		/*
-		 * Give up the multicast address record to which the
-		 * membership points.
-		 */
-		in_delmulti(imo->imo_membership[i]);
-		/*
-		 * Remove the gap in the membership array.
-		 */
-		for (++i; i < imo->imo_num_memberships; ++i)
-			imo->imo_membership[i-1] = imo->imo_membership[i];
-		--imo->imo_num_memberships;
-		splx(s);
-		break;
-
-	default:
-		error = EOPNOTSUPP;
-		break;
-	}
-
-	/*
-	 * If all options have default values, no need to keep the mbuf.
-	 */
-	if (imo->imo_multicast_ifp == NULL &&
-	    imo->imo_multicast_vif == -1 &&
-	    imo->imo_multicast_ttl == IP_DEFAULT_MULTICAST_TTL &&
-	    imo->imo_multicast_loop == IP_DEFAULT_MULTICAST_LOOP &&
-	    imo->imo_num_memberships == 0) {
-		free(*imop, M_IPMOPTS);
-		*imop = NULL;
-	}
-
-	return (error);
-}
-
-/*
- * Return the IP multicast options in response to user getsockopt().
- */
-static int
-ip_getmoptions(optname, imo, mp)
-	int optname;
-	register struct ip_moptions *imo;
-	register struct mbuf **mp;
-{
-	u_char *ttl;
-	u_char *loop;
-	struct in_addr *addr;
-	struct in_ifaddr *ia;
-
-	*mp = m_get(M_WAIT, MT_SOOPTS);
-
-	switch (optname) {
-
-	case IP_MULTICAST_VIF: 
-		if (imo != NULL)
-			*(mtod(*mp, int *)) = imo->imo_multicast_vif;
-		else
-			*(mtod(*mp, int *)) = -1;
-		(*mp)->m_len = sizeof(int);
-		return(0);
-
-	case IP_MULTICAST_IF:
-		addr = mtod(*mp, struct in_addr *);
-		(*mp)->m_len = sizeof(struct in_addr);
-		if (imo == NULL || imo->imo_multicast_ifp == NULL)
-			addr->s_addr = INADDR_ANY;
-		else {
-			IFP_TO_IA(imo->imo_multicast_ifp, ia);
-			addr->s_addr = (ia == NULL) ? INADDR_ANY
-					: IA_SIN(ia)->sin_addr.s_addr;
-		}
-		return (0);
-
-	case IP_MULTICAST_TTL:
-		ttl = mtod(*mp, u_char *);
-		(*mp)->m_len = 1;
-		*ttl = (imo == NULL) ? IP_DEFAULT_MULTICAST_TTL
-				     : imo->imo_multicast_ttl;
-		return (0);
-
-	case IP_MULTICAST_LOOP:
-		loop = mtod(*mp, u_char *);
-		(*mp)->m_len = 1;
-		*loop = (imo == NULL) ? IP_DEFAULT_MULTICAST_LOOP
-				      : imo->imo_multicast_loop;
-		return (0);
-
-	default:
-		return (EOPNOTSUPP);
-	}
-}
-
-/*
- * Discard the IP multicast options.
- */
-void
-ip_freemoptions(imo)
-	register struct ip_moptions *imo;
-{
-	register int i;
-
-	if (imo != NULL) {
-		for (i = 0; i < imo->imo_num_memberships; ++i)
-			in_delmulti(imo->imo_membership[i]);
-		free(imo, M_IPMOPTS);
-	}
-}
-
-/*
- * Routine called from ip_output() to loop back a copy of an IP multicast
- * packet to the input queue of a specified interface.  Note that this
- * calls the output routine of the loopback "driver", but with an interface
- * pointer that might NOT be a loopback interface -- evil, but easier than
- * replicating that code here.
- */
-static void
-ip_mloopback(ifp, m, dst, hlen)
-	struct ifnet *ifp;
-	register struct mbuf *m;
-	register struct sockaddr_in *dst;
-	int hlen;
-{
-	register struct ip *ip;
-	struct mbuf *copym;
-
-	copym = m_copy(m, 0, M_COPYALL);
-	if (copym != NULL && (copym->m_flags & M_EXT || copym->m_len < hlen))
-		copym = m_pullup(copym, hlen);
-	if (copym != NULL) {
-		/*
-		 * We don't bother to fragment if the IP length is greater
-		 * than the interface's MTU.  Can this possibly matter?
-		 */
-		ip = mtod(copym, struct ip *);
-		ip->ip_len = htons((u_short)ip->ip_len);
-		ip->ip_off = htons((u_short)ip->ip_off);
-		ip->ip_sum = 0;
-		if (ip->ip_vhl == IP_VHL_BORING) {
-			ip->ip_sum = in_cksum_hdr(ip);
-		} else {
-			ip->ip_sum = in_cksum(copym, hlen);
-		}
-		/*
-		 * NB:
-		 * It's not clear whether there are any lingering
-		 * reentrancy problems in other areas which might
-		 * be exposed by using ip_input directly (in
-		 * particular, everything which modifies the packet
-		 * in-place).  Yet another option is using the
-		 * protosw directly to deliver the looped back
-		 * packet.  For the moment, we'll err on the side
-		 * of safety by continuing to abuse looutput().
-		 */
-#ifdef notdef
-		copym->m_pkthdr.rcvif = ifp;
-		ip_input(copym)
-#else
-		(void) looutput(ifp, copym, (struct sockaddr *)dst, NULL);
-#endif
-	}
-}
diff --git a/c/src/libnetworking/netinet/ip_var.h b/c/src/libnetworking/netinet/ip_var.h
deleted file mode 100644
index cc7908e9a3..0000000000
--- a/c/src/libnetworking/netinet/ip_var.h
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)ip_var.h	8.2 (Berkeley) 1/9/95
- *	$Id$
- */
-
-#ifndef _NETINET_IP_VAR_H_
-#define	_NETINET_IP_VAR_H_
-
-/*
- * Overlay for ip header used by other protocols (tcp, udp).
- */
-struct ipovly {
-	caddr_t	ih_next, ih_prev;	/* for protocol sequence q's */
-	u_char	ih_x1;			/* (unused) */
-	u_char	ih_pr;			/* protocol */
-	u_short	ih_len;			/* protocol length */
-	struct	in_addr ih_src;		/* source internet address */
-	struct	in_addr ih_dst;		/* destination internet address */
-};
-
-/*
- * Ip reassembly queue structure.  Each fragment
- * being reassembled is attached to one of these structures.
- * They are timed out after ipq_ttl drops to 0, and may also
- * be reclaimed if memory becomes tight.
- */
-struct ipq {
-	struct	ipq *next,*prev;	/* to other reass headers */
-	u_char	ipq_ttl;		/* time for reass q to live */
-	u_char	ipq_p;			/* protocol of this fragment */
-	u_short	ipq_id;			/* sequence id for reassembly */
-	struct	ipasfrag *ipq_next,*ipq_prev;
-					/* to ip headers of fragments */
-	struct	in_addr ipq_src,ipq_dst;
-#ifdef IPDIVERT
-	u_short ipq_divert;		/* divert protocol port */
-#endif
-};
-
-/*
- * Ip header, when holding a fragment.
- *
- * Note: ipf_next must be at same offset as ipq_next above
- */
-struct	ipasfrag {
-#if BYTE_ORDER == LITTLE_ENDIAN 
-	u_char	ip_hl:4,
-		ip_v:4;
-#endif
-#if BYTE_ORDER == BIG_ENDIAN 
-	u_char	ip_v:4,
-		ip_hl:4;
-#endif
-	u_char	ipf_mff;		/* XXX overlays ip_tos: use low bit
-					 * to avoid destroying tos;
-					 * copied from (ip_off&IP_MF) */
-	u_short	ip_len;
-	u_short	ip_id;
-	u_short	ip_off;
-	u_char	ip_ttl;
-	u_char	ip_p;
-	u_short	ip_sum;
-	struct	ipasfrag *ipf_next;	/* next fragment */
-	struct	ipasfrag *ipf_prev;	/* previous fragment */
-};
-
-/*
- * Structure stored in mbuf in inpcb.ip_options
- * and passed to ip_output when ip options are in use.
- * The actual length of the options (including ipopt_dst)
- * is in m_len.
- */
-#define MAX_IPOPTLEN	40
-
-struct ipoption {
-	struct	in_addr ipopt_dst;	/* first-hop dst if source routed */
-	char	ipopt_list[MAX_IPOPTLEN];	/* options proper */
-};
-
-/*
- * Structure attached to inpcb.ip_moptions and
- * passed to ip_output when IP multicast options are in use.
- */
-struct ip_moptions {
-	struct	ifnet *imo_multicast_ifp; /* ifp for outgoing multicasts */
-	u_char	imo_multicast_ttl;	/* TTL for outgoing multicasts */
-	u_char	imo_multicast_loop;	/* 1 => hear sends if a member */
-	u_short	imo_num_memberships;	/* no. memberships this socket */
-	struct	in_multi *imo_membership[IP_MAX_MEMBERSHIPS];
-	u_long	imo_multicast_vif;	/* vif num outgoing multicasts */
-};
-
-struct	ipstat {
-	u_long	ips_total;		/* total packets received */
-	u_long	ips_badsum;		/* checksum bad */
-	u_long	ips_tooshort;		/* packet too short */
-	u_long	ips_toosmall;		/* not enough data */
-	u_long	ips_badhlen;		/* ip header length < data size */
-	u_long	ips_badlen;		/* ip length < ip header length */
-	u_long	ips_fragments;		/* fragments received */
-	u_long	ips_fragdropped;	/* frags dropped (dups, out of space) */
-	u_long	ips_fragtimeout;	/* fragments timed out */
-	u_long	ips_forward;		/* packets forwarded */
-	u_long	ips_cantforward;	/* packets rcvd for unreachable dest */
-	u_long	ips_redirectsent;	/* packets forwarded on same net */
-	u_long	ips_noproto;		/* unknown or unsupported protocol */
-	u_long	ips_delivered;		/* datagrams delivered to upper level*/
-	u_long	ips_localout;		/* total ip packets generated here */
-	u_long	ips_odropped;		/* lost packets due to nobufs, etc. */
-	u_long	ips_reassembled;	/* total packets reassembled ok */
-	u_long	ips_fragmented;		/* datagrams successfully fragmented */
-	u_long	ips_ofragments;		/* output fragments created */
-	u_long	ips_cantfrag;		/* don't fragment flag was set, etc. */
-	u_long	ips_badoptions;		/* error in option processing */
-	u_long	ips_noroute;		/* packets discarded due to no route */
-	u_long	ips_badvers;		/* ip version != 4 */
-	u_long	ips_rawout;		/* total raw ip packets generated */
-	u_long	ips_toolong;		/* ip length > max ip packet size */
-};
-
-#ifdef KERNEL
-/* flags passed to ip_output as last parameter */
-#define	IP_FORWARDING		0x1		/* most of ip header exists */
-#define	IP_RAWOUTPUT		0x2		/* raw ip header exists */
-#define	IP_ROUTETOIF		SO_DONTROUTE	/* bypass routing tables */
-#define	IP_ALLOWBROADCAST	SO_BROADCAST	/* can send broadcast packets */
-
-struct inpcb;
-struct route;
-
-extern struct	ipstat	ipstat;
-extern u_short	ip_id;				/* ip packet ctr, for ids */
-extern int	ip_defttl;			/* default IP ttl */
-extern u_char	ip_protox[];
-extern struct socket *ip_rsvpd;	/* reservation protocol daemon */
-extern struct socket *ip_mrouter; /* multicast routing daemon */
-extern int	(*legal_vif_num) __P((int));
-extern u_long	(*ip_mcast_src) __P((int));
-extern int rsvp_on;
-
-int	 ip_ctloutput __P((int, struct socket *, int, int, struct mbuf **));
-void	 ip_drain __P((void));
-void	 ip_freemoptions __P((struct ip_moptions *));
-void	 ip_init __P((void));
-extern int	 (*ip_mforward) __P((struct ip *, struct ifnet *, struct mbuf *,
-			  struct ip_moptions *));
-int	 ip_output __P((struct mbuf *,
-	    struct mbuf *, struct route *, int, struct ip_moptions *));
-void	 ip_savecontrol __P((struct inpcb *, struct mbuf **, struct ip *,
-		struct mbuf *));
-void	 ip_slowtimo __P((void));
-struct mbuf *
-	 ip_srcroute __P((void));
-void	 ip_stripoptions __P((struct mbuf *, struct mbuf *));
-int	 rip_ctloutput __P((int, struct socket *, int, int, struct mbuf **));
-void	 rip_init __P((void));
-void	 rip_input __P((struct mbuf *, int));
-int	 rip_output __P((struct mbuf *, struct socket *, u_long));
-int	 rip_usrreq __P((struct socket *,
-	    int, struct mbuf *, struct mbuf *, struct mbuf *));
-void	ipip_input __P((struct mbuf *, int));
-void	rsvp_input __P((struct mbuf *, int));
-int	ip_rsvp_init __P((struct socket *));
-int	ip_rsvp_done __P((void));
-int	ip_rsvp_vif_init __P((struct socket *, struct mbuf *));
-int	ip_rsvp_vif_done __P((struct socket *, struct mbuf *));
-void	ip_rsvp_force_done __P((struct socket *));
-
-#ifdef IPDIVERT
-void	div_init __P((void));
-void	div_input __P((struct mbuf *, int));
-int	div_usrreq __P((struct socket *,
-		int, struct mbuf *, struct mbuf *, struct mbuf *));
-extern u_short ip_divert_port;
-extern u_short ip_divert_ignore;
-#endif /* IPDIVERT */
-
-#endif /* KERNEL */
-
-#endif /* _NETINET_IP_VAR_H_ */
diff --git a/c/src/libnetworking/netinet/raw_ip.c b/c/src/libnetworking/netinet/raw_ip.c
deleted file mode 100644
index 44d58f1844..0000000000
--- a/c/src/libnetworking/netinet/raw_ip.c
+++ /dev/null
@@ -1,486 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)raw_ip.c	8.7 (Berkeley) 5/15/95
- *	$Id$
- */
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/malloc.h>
-#include <sys/mbuf.h>
-#include <sys/socket.h>
-#include <sys/protosw.h>
-#include <sys/socketvar.h>
-#include <sys/errno.h>
-#include <sys/systm.h>
-
-#include <net/if.h>
-#include <net/route.h>
-
-#define _IP_VHL
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/in_pcb.h>
-#include <netinet/in_var.h>
-#include <netinet/ip_var.h>
-#include <netinet/ip_mroute.h>
-
-#include <netinet/ip_fw.h>
-
-#if !defined(COMPAT_IPFW) || COMPAT_IPFW == 1
-#undef COMPAT_IPFW
-#define COMPAT_IPFW 1
-#else
-#undef COMPAT_IPFW
-#endif
-
-static struct inpcbhead ripcb;
-static struct inpcbinfo ripcbinfo;
-
-/*
- * Nominal space allocated to a raw ip socket.
- */
-#define	RIPSNDQ		8192
-#define	RIPRCVQ		8192
-
-/*
- * Raw interface to IP protocol.
- */
-
-/*
- * Initialize raw connection block q.
- */
-void
-rip_init()
-{
-	LIST_INIT(&ripcb);
-	ripcbinfo.listhead = &ripcb;
-	/*
-	 * XXX We don't use the hash list for raw IP, but it's easier
-	 * to allocate a one entry hash list than it is to check all
-	 * over the place for hashbase == NULL.
-	 */
-	ripcbinfo.hashbase = hashinit(1, M_PCB, &ripcbinfo.hashmask);
-}
-
-static struct	sockaddr_in ripsrc = { sizeof(ripsrc), AF_INET };
-/*
- * Setup generic address and protocol structures
- * for raw_input routine, then pass them along with
- * mbuf chain.
- */
-void
-rip_input(m, iphlen)
-	struct mbuf *m;
-	int iphlen;
-{
-	register struct ip *ip = mtod(m, struct ip *);
-	register struct inpcb *inp;
-	struct inpcb *last = 0;
-	struct mbuf *opts = 0;
-
-	ripsrc.sin_addr = ip->ip_src;
-	for (inp = ripcb.lh_first; inp != NULL; inp = inp->inp_list.le_next) {
-		if (inp->inp_ip_p && inp->inp_ip_p != ip->ip_p)
-			continue;
-		if (inp->inp_laddr.s_addr &&
-                  inp->inp_laddr.s_addr != ip->ip_dst.s_addr)
-			continue;
-		if (inp->inp_faddr.s_addr &&
-                  inp->inp_faddr.s_addr != ip->ip_src.s_addr)
-			continue;
-		if (last) {
-			struct mbuf *n = m_copy(m, 0, (int)M_COPYALL);
-			if (n) {
-				if (last->inp_flags & INP_CONTROLOPTS ||
-				    last->inp_socket->so_options & SO_TIMESTAMP)
-				    ip_savecontrol(last, &opts, ip, n);
-				if (sbappendaddr(&last->inp_socket->so_rcv,
-				    (struct sockaddr *)&ripsrc, n,
-				    opts) == 0) {
-					/* should notify about lost packet */
-					m_freem(n);
-					if (opts)
-					    m_freem(opts);
-				} else
-					sorwakeup(last->inp_socket);
-				opts = 0;
-			}
-		}
-		last = inp;
-	}
-	if (last) {
-		if (last->inp_flags & INP_CONTROLOPTS ||
-		    last->inp_socket->so_options & SO_TIMESTAMP)
-			ip_savecontrol(last, &opts, ip, m);
-		if (sbappendaddr(&last->inp_socket->so_rcv,
-		    (struct sockaddr *)&ripsrc, m, opts) == 0) {
-			m_freem(m);
-			if (opts)
-			    m_freem(opts);
-		} else
-			sorwakeup(last->inp_socket);
-	} else {
-		m_freem(m);
-              ipstat.ips_noproto++;
-              ipstat.ips_delivered--;
-      }
-}
-
-/*
- * Generate IP header and pass packet to ip_output.
- * Tack on options user may have setup with control call.
- */
-int
-rip_output(m, so, dst)
-	register struct mbuf *m;
-	struct socket *so;
-	u_long dst;
-{
-	register struct ip *ip;
-	register struct inpcb *inp = sotoinpcb(so);
-	int flags = (so->so_options & SO_DONTROUTE) | IP_ALLOWBROADCAST;
-
-	/*
-	 * If the user handed us a complete IP packet, use it.
-	 * Otherwise, allocate an mbuf for a header and fill it in.
-	 */
-	if ((inp->inp_flags & INP_HDRINCL) == 0) {
-		if (m->m_pkthdr.len + sizeof(struct ip) > IP_MAXPACKET) {
-			m_freem(m);
-			return(EMSGSIZE);
-		}
-		M_PREPEND(m, sizeof(struct ip), M_WAIT);
-		ip = mtod(m, struct ip *);
-		ip->ip_tos = 0;
-		ip->ip_off = 0;
-		ip->ip_p = inp->inp_ip_p;
-		ip->ip_len = m->m_pkthdr.len;
-		ip->ip_src = inp->inp_laddr;
-		ip->ip_dst.s_addr = dst;
-		ip->ip_ttl = MAXTTL;
-	} else {
-		if (m->m_pkthdr.len > IP_MAXPACKET) {
-			m_freem(m);
-			return(EMSGSIZE);
-		}
-		ip = mtod(m, struct ip *);
-		/* don't allow both user specified and setsockopt options,
-		   and don't allow packet length sizes that will crash */
-		if (((IP_VHL_HL(ip->ip_vhl) != (sizeof (*ip) >> 2)) 
-		     && inp->inp_options)
-		    || (ip->ip_len > m->m_pkthdr.len)
-		    || (ip->ip_len < (IP_VHL_HL(ip->ip_vhl) << 2))) {
-			m_freem(m);
-			return EINVAL;
-		}
-		if (ip->ip_id == 0)
-			ip->ip_id = htons(ip_id++);
-		/* XXX prevent ip_output from overwriting header fields */
-		flags |= IP_RAWOUTPUT;
-		ipstat.ips_rawout++;
-	}
-	return (ip_output(m, inp->inp_options, &inp->inp_route, flags,
-			  inp->inp_moptions));
-}
-
-/*
- * Raw IP socket option processing.
- */
-int
-rip_ctloutput(op, so, level, optname, m)
-	int op;
-	struct socket *so;
-	int level, optname;
-	struct mbuf **m;
-{
-	register struct inpcb *inp = sotoinpcb(so);
-	register int error;
-
-	if (level != IPPROTO_IP) {
-		if (op == PRCO_SETOPT && *m)
-			(void)m_free(*m);
-		return (EINVAL);
-	}
-
-	switch (optname) {
-
-	case IP_HDRINCL:
-		error = 0;
-		if (op == PRCO_SETOPT) {
-			if (m == 0 || *m == 0 || (*m)->m_len < sizeof (int))
-				error = EINVAL;
-			else if (*mtod(*m, int *))
-				inp->inp_flags |= INP_HDRINCL;
-			else
-				inp->inp_flags &= ~INP_HDRINCL;
-			if (*m)
-				(void)m_free(*m);
-		} else {
-			*m = m_get(M_WAIT, MT_SOOPTS);
-			(*m)->m_len = sizeof (int);
-			*mtod(*m, int *) = inp->inp_flags & INP_HDRINCL;
-		}
-		return (error);
-
-#ifdef COMPAT_IPFW
-	case IP_FW_GET:
-		if (ip_fw_ctl_ptr == NULL || op == PRCO_SETOPT) {
-			if (*m) (void)m_free(*m);
-			return(EINVAL);
-		}
-		return (*ip_fw_ctl_ptr)(optname, m); 
-
-	case IP_FW_ADD:
-	case IP_FW_DEL:
-	case IP_FW_FLUSH:
-	case IP_FW_ZERO:
-		if (ip_fw_ctl_ptr == NULL || op != PRCO_SETOPT) {
-			if (*m) (void)m_free(*m);
-			return(EINVAL);
-		}
-		return (*ip_fw_ctl_ptr)(optname, m); 
-
-	case IP_NAT:
-		if (ip_nat_ctl_ptr == NULL) {
-			if (*m) (void)m_free(*m);
-			return(EINVAL);
-		}
-		return (*ip_nat_ctl_ptr)(op, m); 
-
-#endif
-	case IP_RSVP_ON:
-		return ip_rsvp_init(so);
-		break;
-
-	case IP_RSVP_OFF:
-		return ip_rsvp_done();
-		break;
-
-	case IP_RSVP_VIF_ON:
-		return ip_rsvp_vif_init(so, *m);
-
-	case IP_RSVP_VIF_OFF:
-		return ip_rsvp_vif_done(so, *m);
-
-	case MRT_INIT:
-	case MRT_DONE:
-	case MRT_ADD_VIF:
-	case MRT_DEL_VIF:
-	case MRT_ADD_MFC:
-	case MRT_DEL_MFC:
-	case MRT_VERSION:
-	case MRT_ASSERT:
-		if (op == PRCO_SETOPT) {
-			error = ip_mrouter_set(optname, so, *m);
-			if (*m)
-				(void)m_free(*m);
-		} else if (op == PRCO_GETOPT) {
-			error = ip_mrouter_get(optname, so, m);
-		} else
-			error = EINVAL;
-		return (error);
-	}
-	return (ip_ctloutput(op, so, level, optname, m));
-}
-
-static u_long	rip_sendspace = RIPSNDQ; /* XXX sysctl ? */
-static u_long	rip_recvspace = RIPRCVQ; /* XXX sysctl ? */
-
-/*ARGSUSED*/
-int
-rip_usrreq(so, req, m, nam, control)
-	register struct socket *so;
-	int req;
-	struct mbuf *m, *nam, *control;
-{
-	register int error = 0;
-	register struct inpcb *inp = sotoinpcb(so);
-	int s;
-
-	if (req == PRU_CONTROL)
-		return (in_control(so, (u_long)m, (caddr_t)nam,
-			(struct ifnet *)control));
-
-	switch (req) {
-
-	case PRU_ATTACH:
-		if (inp)
-			panic("rip_attach");
-		if ((so->so_state & SS_PRIV) == 0) {
-			error = EACCES;
-			break;
-		}
-		s = splnet();
-		error = in_pcballoc(so, &ripcbinfo);
-		splx(s);
-		if (error)
-			break;
-		error = soreserve(so, rip_sendspace, rip_recvspace);
-		if (error)
-			break;
-		inp = (struct inpcb *)so->so_pcb;
-		inp->inp_ip_p = (int)nam;
-		break;
-
-	case PRU_DISCONNECT:
-		if ((so->so_state & SS_ISCONNECTED) == 0) {
-			error = ENOTCONN;
-			break;
-		}
-		/* FALLTHROUGH */
-	case PRU_ABORT:
-		soisdisconnected(so);
-		/* FALLTHROUGH */
-	case PRU_DETACH:
-		if (inp == 0)
-			panic("rip_detach");
-		if (so == ip_mrouter)
-			ip_mrouter_done();
-		ip_rsvp_force_done(so);
-		if (so == ip_rsvpd)
-			ip_rsvp_done();
-		in_pcbdetach(inp);
-		break;
-
-	case PRU_BIND:
-	    {
-		struct sockaddr_in *addr = mtod(nam, struct sockaddr_in *);
-
-		if (nam->m_len != sizeof(*addr)) {
-			error = EINVAL;
-			break;
-		}
-		if ((ifnet == 0) ||
-		    ((addr->sin_family != AF_INET) &&
-		     (addr->sin_family != AF_IMPLINK)) ||
-		    (addr->sin_addr.s_addr &&
-		     ifa_ifwithaddr((struct sockaddr *)addr) == 0)) {
-			error = EADDRNOTAVAIL;
-			break;
-		}
-		inp->inp_laddr = addr->sin_addr;
-		break;
-	    }
-	case PRU_CONNECT:
-	    {
-		struct sockaddr_in *addr = mtod(nam, struct sockaddr_in *);
-
-		if (nam->m_len != sizeof(*addr)) {
-			error = EINVAL;
-			break;
-		}
-		if (ifnet == 0) {
-			error = EADDRNOTAVAIL;
-			break;
-		}
-		if ((addr->sin_family != AF_INET) &&
-		     (addr->sin_family != AF_IMPLINK)) {
-			error = EAFNOSUPPORT;
-			break;
-		}
-		inp->inp_faddr = addr->sin_addr;
-		soisconnected(so);
-		break;
-	    }
-
-	case PRU_CONNECT2:
-		error = EOPNOTSUPP;
-		break;
-
-	/*
-	 * Mark the connection as being incapable of further input.
-	 */
-	case PRU_SHUTDOWN:
-		socantsendmore(so);
-		break;
-
-	/*
-	 * Ship a packet out.  The appropriate raw output
-	 * routine handles any massaging necessary.
-	 */
-	case PRU_SEND:
-	    {
-		register u_long dst;
-
-		if (so->so_state & SS_ISCONNECTED) {
-			if (nam) {
-				error = EISCONN;
-				break;
-			}
-			dst = inp->inp_faddr.s_addr;
-		} else {
-			if (nam == NULL) {
-				error = ENOTCONN;
-				break;
-			}
-			dst = mtod(nam, struct sockaddr_in *)->sin_addr.s_addr;
-		}
-		error = rip_output(m, so, dst);
-		m = NULL;
-		break;
-	    }
-
-	case PRU_SENSE:
-		/*
-		 * stat: don't bother with a blocksize.
-		 */
-		return (0);
-
-	/*
-	 * Not supported.
-	 */
-	case PRU_RCVOOB:
-	case PRU_RCVD:
-	case PRU_LISTEN:
-	case PRU_ACCEPT:
-	case PRU_SENDOOB:
-		error = EOPNOTSUPP;
-		break;
-
-	case PRU_SOCKADDR:
-		in_setsockaddr(inp, nam);
-		break;
-
-	case PRU_PEERADDR:
-		in_setpeeraddr(inp, nam);
-		break;
-
-	default:
-		panic("rip_usrreq");
-	}
-	if (m != NULL)
-		m_freem(m);
-	return (error);
-}
diff --git a/c/src/libnetworking/netinet/tcp.h b/c/src/libnetworking/netinet/tcp.h
deleted file mode 100644
index 3585917aa3..0000000000
--- a/c/src/libnetworking/netinet/tcp.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)tcp.h	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#ifndef _NETINET_TCP_H_
-#define _NETINET_TCP_H_
-
-typedef	u_long	tcp_seq;
-typedef u_long	tcp_cc;			/* connection count per rfc1644 */
-
-/*
- * TCP header.
- * Per RFC 793, September, 1981.
- */
-struct tcphdr {
-	u_short	th_sport;		/* source port */
-	u_short	th_dport;		/* destination port */
-	tcp_seq	th_seq;			/* sequence number */
-	tcp_seq	th_ack;			/* acknowledgement number */
-#if BYTE_ORDER == LITTLE_ENDIAN
-	u_char	th_x2:4,		/* (unused) */
-		th_off:4;		/* data offset */
-#endif
-#if BYTE_ORDER == BIG_ENDIAN
-	u_char	th_off:4,		/* data offset */
-		th_x2:4;		/* (unused) */
-#endif
-	u_char	th_flags;
-#define	TH_FIN	0x01
-#define	TH_SYN	0x02
-#define	TH_RST	0x04
-#define	TH_PUSH	0x08
-#define	TH_ACK	0x10
-#define	TH_URG	0x20
-#define TH_FLAGS (TH_FIN|TH_SYN|TH_RST|TH_ACK|TH_URG)
-
-	u_short	th_win;			/* window */
-	u_short	th_sum;			/* checksum */
-	u_short	th_urp;			/* urgent pointer */
-};
-
-#define	TCPOPT_EOL		0
-#define	TCPOPT_NOP		1
-#define	TCPOPT_MAXSEG		2
-#define    TCPOLEN_MAXSEG		4
-#define TCPOPT_WINDOW		3
-#define    TCPOLEN_WINDOW		3
-#define TCPOPT_SACK_PERMITTED	4		/* Experimental */
-#define    TCPOLEN_SACK_PERMITTED	2
-#define TCPOPT_SACK		5		/* Experimental */
-#define TCPOPT_TIMESTAMP	8
-#define    TCPOLEN_TIMESTAMP		10
-#define    TCPOLEN_TSTAMP_APPA		(TCPOLEN_TIMESTAMP+2) /* appendix A */
-#define    TCPOPT_TSTAMP_HDR		\
-    (TCPOPT_NOP<<24|TCPOPT_NOP<<16|TCPOPT_TIMESTAMP<<8|TCPOLEN_TIMESTAMP)
-
-#define	TCPOPT_CC		11		/* CC options: RFC-1644 */
-#define TCPOPT_CCNEW		12
-#define TCPOPT_CCECHO		13
-#define	   TCPOLEN_CC			6
-#define	   TCPOLEN_CC_APPA		(TCPOLEN_CC+2)
-#define	   TCPOPT_CC_HDR(ccopt)		\
-    (TCPOPT_NOP<<24|TCPOPT_NOP<<16|(ccopt)<<8|TCPOLEN_CC)
-
-/*
- * Default maximum segment size for TCP.
- * With an IP MSS of 576, this is 536,
- * but 512 is probably more convenient.
- * This should be defined as MIN(512, IP_MSS - sizeof (struct tcpiphdr)).
- */
-#define	TCP_MSS	512
-
-#define	TCP_MAXWIN	65535	/* largest value for (unscaled) window */
-#define	TTCP_CLIENT_SND_WND	4096	/* dflt send window for T/TCP client */
-
-#define TCP_MAX_WINSHIFT	14	/* maximum window shift */
-
-#define TCP_MAXHLEN	(0xf<<2)	/* max length of header in bytes */
-#define TCP_MAXOLEN	(TCP_MAXHLEN - sizeof(struct tcphdr))
-					/* max space left for options */
-
-/*
- * User-settable options (used with setsockopt).
- */
-#define	TCP_NODELAY	0x01	/* don't delay send to coalesce packets */
-#define	TCP_MAXSEG	0x02	/* set maximum segment size */
-#define TCP_NOPUSH	0x04	/* don't push last block of write */
-#define TCP_NOOPT	0x08	/* don't use TCP options */
-
-#endif
diff --git a/c/src/libnetworking/netinet/tcp_debug.c b/c/src/libnetworking/netinet/tcp_debug.c
deleted file mode 100644
index 864a01cb1a..0000000000
--- a/c/src/libnetworking/netinet/tcp_debug.c
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)tcp_debug.c	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#include "opt_tcpdebug.h"
-
-#ifdef TCPDEBUG
-/* load symbolic names */
-#define PRUREQUESTS
-#define TCPSTATES
-#define	TCPTIMERS
-#define	TANAMES
-#endif
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/systm.h>
-#include <sys/mbuf.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/protosw.h>
-#include <sys/errno.h>
-
-#include <net/route.h>
-#include <net/if.h>
-
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/in_pcb.h>
-#include <netinet/ip_var.h>
-#include <netinet/tcp.h>
-#include <netinet/tcp_fsm.h>
-#include <netinet/tcp_seq.h>
-#include <netinet/tcp_timer.h>
-#include <netinet/tcp_var.h>
-#include <netinet/tcpip.h>
-#include <netinet/tcp_debug.h>
-
-#ifdef TCPDEBUG
-static int	tcpconsdebug = 0;
-#endif
-
-static struct tcp_debug tcp_debug[TCP_NDEBUG];
-static int	tcp_debx;
-
-/*
- * Tcp debug routines
- */
-void
-tcp_trace(act, ostate, tp, ti, req)
-	short act, ostate;
-	struct tcpcb *tp;
-	struct tcpiphdr *ti;
-	int req;
-{
-#ifdef TCPDEBUG
-	tcp_seq seq, ack;
-	int len, flags;
-#endif
-	struct tcp_debug *td = &tcp_debug[tcp_debx++];
-
-	if (tcp_debx == TCP_NDEBUG)
-		tcp_debx = 0;
-	td->td_time = iptime();
-	td->td_act = act;
-	td->td_ostate = ostate;
-	td->td_tcb = (caddr_t)tp;
-	if (tp)
-		td->td_cb = *tp;
-	else
-		bzero((caddr_t)&td->td_cb, sizeof (*tp));
-	if (ti)
-		td->td_ti = *ti;
-	else
-		bzero((caddr_t)&td->td_ti, sizeof (*ti));
-	td->td_req = req;
-#ifdef TCPDEBUG
-	if (tcpconsdebug == 0)
-		return;
-	if (tp)
-		printf("%p %s:", tp, tcpstates[ostate]);
-	else
-		printf("???????? ");
-	printf("%s ", tanames[act]);
-	switch (act) {
-
-	case TA_INPUT:
-	case TA_OUTPUT:
-	case TA_DROP:
-		if (ti == 0)
-			break;
-		seq = ti->ti_seq;
-		ack = ti->ti_ack;
-		len = ti->ti_len;
-		if (act == TA_OUTPUT) {
-			seq = ntohl(seq);
-			ack = ntohl(ack);
-			len = ntohs((u_short)len);
-		}
-		if (act == TA_OUTPUT)
-			len -= sizeof (struct tcphdr);
-		if (len)
-			printf("[%x..%x)", seq, seq+len);
-		else
-			printf("%x", seq);
-		printf("@%x, urp=%x", ack, ti->ti_urp);
-		flags = ti->ti_flags;
-		if (flags) {
-			char *cp = "<";
-#define pf(f) {					\
-	if (ti->ti_flags & TH_##f) {		\
-		printf("%s%s", cp, #f);		\
-		cp = ",";			\
-	}					\
-}
-			pf(SYN); pf(ACK); pf(FIN); pf(RST); pf(PUSH); pf(URG);
-			printf(">");
-		}
-		break;
-
-	case TA_USER:
-		printf("%s", prurequests[req&0xff]);
-		if ((req & 0xff) == PRU_SLOWTIMO)
-			printf("<%s>", tcptimers[req>>8]);
-		break;
-	}
-	if (tp)
-		printf(" -> %s", tcpstates[tp->t_state]);
-	/* print out internal state of tp !?! */
-	printf("\n");
-	if (tp == 0)
-		return;
-	printf("\trcv_(nxt,wnd,up) (%x,%x,%x) snd_(una,nxt,max) (%x,%x,%x)\n",
-	    tp->rcv_nxt, tp->rcv_wnd, tp->rcv_up, tp->snd_una, tp->snd_nxt,
-	    tp->snd_max);
-	printf("\tsnd_(wl1,wl2,wnd) (%x,%x,%x)\n",
-	    tp->snd_wl1, tp->snd_wl2, tp->snd_wnd);
-#endif /* TCPDEBUG */
-}
diff --git a/c/src/libnetworking/netinet/tcp_debug.h b/c/src/libnetworking/netinet/tcp_debug.h
deleted file mode 100644
index a33743b077..0000000000
--- a/c/src/libnetworking/netinet/tcp_debug.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)tcp_debug.h	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#ifndef _NETINET_TCP_DEBUG_H_
-#define	_NETINET_TCP_DEBUG_H_
-
-struct	tcp_debug {
-	n_time	td_time;
-	short	td_act;
-	short	td_ostate;
-	caddr_t	td_tcb;
-	struct	tcpiphdr td_ti;
-	short	td_req;
-	struct	tcpcb td_cb;
-};
-
-#define	TA_INPUT 	0
-#define	TA_OUTPUT	1
-#define	TA_USER		2
-#define	TA_RESPOND	3
-#define	TA_DROP		4
-
-#ifdef TANAMES
-static char	*tanames[] =
-    { "input", "output", "user", "respond", "drop" };
-#endif
-
-#define	TCP_NDEBUG 100
-
-#ifndef KERNEL
-/* XXX common variables for broken applications. */
-struct	tcp_debug tcp_debug[TCP_NDEBUG];
-int	tcp_debx;
-#endif
-
-#endif /* !_NETINET_TCP_DEBUG_H_ */
diff --git a/c/src/libnetworking/netinet/tcp_fsm.h b/c/src/libnetworking/netinet/tcp_fsm.h
deleted file mode 100644
index 3f2c12f54f..0000000000
--- a/c/src/libnetworking/netinet/tcp_fsm.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)tcp_fsm.h	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#ifndef _NETINET_TCP_FSM_H_
-#define _NETINET_TCP_FSM_H_
-
-/*
- * TCP FSM state definitions.
- * Per RFC793, September, 1981.
- */
-
-#define	TCP_NSTATES	11
-
-#define	TCPS_CLOSED		0	/* closed */
-#define	TCPS_LISTEN		1	/* listening for connection */
-#define	TCPS_SYN_SENT		2	/* active, have sent syn */
-#define	TCPS_SYN_RECEIVED	3	/* have send and received syn */
-/* states < TCPS_ESTABLISHED are those where connections not established */
-#define	TCPS_ESTABLISHED	4	/* established */
-#define	TCPS_CLOSE_WAIT		5	/* rcvd fin, waiting for close */
-/* states > TCPS_CLOSE_WAIT are those where user has closed */
-#define	TCPS_FIN_WAIT_1		6	/* have closed, sent fin */
-#define	TCPS_CLOSING		7	/* closed xchd FIN; await FIN ACK */
-#define	TCPS_LAST_ACK		8	/* had fin and close; await FIN ACK */
-/* states > TCPS_CLOSE_WAIT && < TCPS_FIN_WAIT_2 await ACK of FIN */
-#define	TCPS_FIN_WAIT_2		9	/* have closed, fin is acked */
-#define	TCPS_TIME_WAIT		10	/* in 2*msl quiet wait after close */
-
-#define	TCPS_HAVERCVDSYN(s)	((s) >= TCPS_SYN_RECEIVED)
-#define TCPS_HAVEESTABLISHED(s)	((s) >= TCPS_ESTABLISHED)
-#define	TCPS_HAVERCVDFIN(s)	((s) >= TCPS_TIME_WAIT)
-
-#ifdef	TCPOUTFLAGS
-/*
- * Flags used when sending segments in tcp_output.
- * Basic flags (TH_RST,TH_ACK,TH_SYN,TH_FIN) are totally
- * determined by state, with the proviso that TH_FIN is sent only
- * if all data queued for output is included in the segment.
- */
-static u_char	tcp_outflags[TCP_NSTATES] = {
-    TH_RST|TH_ACK, 0, TH_SYN, TH_SYN|TH_ACK,
-    TH_ACK, TH_ACK,
-    TH_FIN|TH_ACK, TH_FIN|TH_ACK, TH_FIN|TH_ACK, TH_ACK, TH_ACK,
-};
-#endif
-
-#ifdef KPROF
-int	tcp_acounts[TCP_NSTATES][PRU_NREQ];
-#endif
-
-#ifdef	TCPSTATES
-char *tcpstates[] = {
-	"CLOSED",	"LISTEN",	"SYN_SENT",	"SYN_RCVD",
-	"ESTABLISHED",	"CLOSE_WAIT",	"FIN_WAIT_1",	"CLOSING",
-	"LAST_ACK",	"FIN_WAIT_2",	"TIME_WAIT",
-};
-#endif
-
-#endif
diff --git a/c/src/libnetworking/netinet/tcp_input.c b/c/src/libnetworking/netinet/tcp_input.c
deleted file mode 100644
index bc55a79ae2..0000000000
--- a/c/src/libnetworking/netinet/tcp_input.c
+++ /dev/null
@@ -1,2149 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1988, 1990, 1993, 1994, 1995
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)tcp_input.c	8.12 (Berkeley) 5/24/95
- *	$Id$
- */
-
-#include "opt_tcpdebug.h"
-
-#ifndef TUBA_INCLUDE
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/sysctl.h>
-#include <sys/malloc.h>
-#include <sys/mbuf.h>
-#include <sys/protosw.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/errno.h>
-#include <sys/syslog.h>
-
-#include <machine/cpu.h>	/* before tcp_seq.h, for tcp_random18() */
-
-#include <net/if.h>
-#include <net/route.h>
-
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/in_pcb.h>
-#include <netinet/ip_var.h>
-#include <netinet/tcp.h>
-#include <netinet/tcp_fsm.h>
-#include <netinet/tcp_seq.h>
-#include <netinet/tcp_timer.h>
-#include <netinet/tcp_var.h>
-#include <netinet/tcpip.h>
-#ifdef TCPDEBUG
-#include <netinet/tcp_debug.h>
-static struct	tcpiphdr tcp_saveti;
-#endif
-
-static int	tcprexmtthresh = 3;
-tcp_seq	tcp_iss;
-tcp_cc	tcp_ccgen;
-
-struct	tcpstat tcpstat;
-SYSCTL_STRUCT(_net_inet_tcp, TCPCTL_STATS, stats,
-	CTLFLAG_RD, &tcpstat , tcpstat, "");
-
-static int log_in_vain = 0;
-SYSCTL_INT(_net_inet_tcp, OID_AUTO, log_in_vain, CTLFLAG_RW, 
-	&log_in_vain, 0, "");
-
-u_long	tcp_now;
-struct inpcbhead tcb;
-struct inpcbinfo tcbinfo;
-
-static void	 tcp_dooptions __P((struct tcpcb *,
-	    u_char *, int, struct tcpiphdr *, struct tcpopt *));
-static void	 tcp_pulloutofband __P((struct socket *,
-	    struct tcpiphdr *, struct mbuf *));
-static int	 tcp_reass __P((struct tcpcb *, struct tcpiphdr *, struct mbuf *));
-static void	 tcp_xmit_timer __P((struct tcpcb *, int));
-
-#endif /* TUBA_INCLUDE */
-
-/*
- * Insert segment ti into reassembly queue of tcp with
- * control block tp.  Return TH_FIN if reassembly now includes
- * a segment with FIN.  The macro form does the common case inline
- * (segment is the next to be received on an established connection,
- * and the queue is empty), avoiding linkage into and removal
- * from the queue and repetition of various conversions.
- * Set DELACK for segments received in order, but ack immediately
- * when segments are out of order (so fast retransmit can work).
- */
-#ifdef TCP_ACK_HACK
-#define	TCP_REASS(tp, ti, m, so, flags) { \
-	if ((ti)->ti_seq == (tp)->rcv_nxt && \
-	    (tp)->seg_next == (struct tcpiphdr *)(tp) && \
-	    (tp)->t_state == TCPS_ESTABLISHED) { \
-		if (ti->ti_flags & TH_PUSH) \
-			tp->t_flags |= TF_ACKNOW; \
-		else \
-			tp->t_flags |= TF_DELACK; \
-		(tp)->rcv_nxt += (ti)->ti_len; \
-		flags = (ti)->ti_flags & TH_FIN; \
-		tcpstat.tcps_rcvpack++;\
-		tcpstat.tcps_rcvbyte += (ti)->ti_len;\
-		sbappend(&(so)->so_rcv, (m)); \
-		sorwakeup(so); \
-	} else { \
-		(flags) = tcp_reass((tp), (ti), (m)); \
-		tp->t_flags |= TF_ACKNOW; \
-	} \
-}
-#else
-#define	TCP_REASS(tp, ti, m, so, flags) { \
-	if ((ti)->ti_seq == (tp)->rcv_nxt && \
-	    (tp)->seg_next == (struct tcpiphdr *)(tp) && \
-	    (tp)->t_state == TCPS_ESTABLISHED) { \
-		tp->t_flags |= TF_DELACK; \
-		(tp)->rcv_nxt += (ti)->ti_len; \
-		flags = (ti)->ti_flags & TH_FIN; \
-		tcpstat.tcps_rcvpack++;\
-		tcpstat.tcps_rcvbyte += (ti)->ti_len;\
-		sbappend(&(so)->so_rcv, (m)); \
-		sorwakeup(so); \
-	} else { \
-		(flags) = tcp_reass((tp), (ti), (m)); \
-		tp->t_flags |= TF_ACKNOW; \
-	} \
-}
-#endif
-#ifndef TUBA_INCLUDE
-
-static int
-tcp_reass(tp, ti, m)
-	register struct tcpcb *tp;
-	register struct tcpiphdr *ti;
-	struct mbuf *m;
-{
-	register struct tcpiphdr *q;
-	struct socket *so = tp->t_inpcb->inp_socket;
-	int flags;
-
-	/*
-	 * Call with ti==0 after become established to
-	 * force pre-ESTABLISHED data up to user socket.
-	 */
-	if (ti == 0)
-		goto present;
-
-	/*
-	 * Find a segment which begins after this one does.
-	 */
-	for (q = tp->seg_next; q != (struct tcpiphdr *)tp;
-	    q = (struct tcpiphdr *)q->ti_next)
-		if (SEQ_GT(q->ti_seq, ti->ti_seq))
-			break;
-
-	/*
-	 * If there is a preceding segment, it may provide some of
-	 * our data already.  If so, drop the data from the incoming
-	 * segment.  If it provides all of our data, drop us.
-	 */
-	if ((struct tcpiphdr *)q->ti_prev != (struct tcpiphdr *)tp) {
-		register int i;
-		q = (struct tcpiphdr *)q->ti_prev;
-		/* conversion to int (in i) handles seq wraparound */
-		i = q->ti_seq + q->ti_len - ti->ti_seq;
-		if (i > 0) {
-			if (i >= ti->ti_len) {
-				tcpstat.tcps_rcvduppack++;
-				tcpstat.tcps_rcvdupbyte += ti->ti_len;
-				m_freem(m);
-				/*
-				 * Try to present any queued data
-				 * at the left window edge to the user.
-				 * This is needed after the 3-WHS
-				 * completes.
-				 */
-				goto present;	/* ??? */
-			}
-			m_adj(m, i);
-			ti->ti_len -= i;
-			ti->ti_seq += i;
-		}
-		q = (struct tcpiphdr *)(q->ti_next);
-	}
-	tcpstat.tcps_rcvoopack++;
-	tcpstat.tcps_rcvoobyte += ti->ti_len;
-	REASS_MBUF(ti) = m;		/* XXX */
-
-	/*
-	 * While we overlap succeeding segments trim them or,
-	 * if they are completely covered, dequeue them.
-	 */
-	while (q != (struct tcpiphdr *)tp) {
-		register int i = (ti->ti_seq + ti->ti_len) - q->ti_seq;
-		if (i <= 0)
-			break;
-		if (i < q->ti_len) {
-			q->ti_seq += i;
-			q->ti_len -= i;
-			m_adj(REASS_MBUF(q), i);
-			break;
-		}
-		q = (struct tcpiphdr *)q->ti_next;
-		m = REASS_MBUF((struct tcpiphdr *)q->ti_prev);
-		remque(q->ti_prev);
-		m_freem(m);
-	}
-
-	/*
-	 * Stick new segment in its place.
-	 */
-	insque(ti, q->ti_prev);
-
-present:
-	/*
-	 * Present data to user, advancing rcv_nxt through
-	 * completed sequence space.
-	 */
-	if (!TCPS_HAVEESTABLISHED(tp->t_state))
-		return (0);
-	ti = tp->seg_next;
-	if (ti == (struct tcpiphdr *)tp || ti->ti_seq != tp->rcv_nxt)
-		return (0);
-	do {
-		tp->rcv_nxt += ti->ti_len;
-		flags = ti->ti_flags & TH_FIN;
-		remque(ti);
-		m = REASS_MBUF(ti);
-		ti = (struct tcpiphdr *)ti->ti_next;
-		if (so->so_state & SS_CANTRCVMORE)
-			m_freem(m);
-		else
-			sbappend(&so->so_rcv, m);
-	} while (ti != (struct tcpiphdr *)tp && ti->ti_seq == tp->rcv_nxt);
-	sorwakeup(so);
-	return (flags);
-}
-
-/*
- * TCP input routine, follows pages 65-76 of the
- * protocol specification dated September, 1981 very closely.
- */
-void
-tcp_input(m, iphlen)
-	register struct mbuf *m;
-	int iphlen;
-{
-	register struct tcpiphdr *ti;
-	register struct inpcb *inp;
-	u_char *optp = NULL;
-	int optlen = 0;
-	int len, tlen, off;
-	register struct tcpcb *tp = 0;
-	register int tiflags;
-	struct socket *so = 0;
-	int todrop, acked, ourfinisacked, needoutput = 0;
-	struct in_addr laddr;
-	int dropsocket = 0;
-	int iss = 0;
-	u_long tiwin;
-	struct tcpopt to;		/* options in this segment */
-	struct rmxp_tao *taop;		/* pointer to our TAO cache entry */
-	struct rmxp_tao	tao_noncached;	/* in case there's no cached entry */
-#ifdef TCPDEBUG
-	short ostate = 0;
-#endif
-
-	bzero((char *)&to, sizeof(to));
-
-	tcpstat.tcps_rcvtotal++;
-	/*
-	 * Get IP and TCP header together in first mbuf.
-	 * Note: IP leaves IP header in first mbuf.
-	 */
-	ti = mtod(m, struct tcpiphdr *);
-	if (iphlen > sizeof (struct ip))
-		ip_stripoptions(m, (struct mbuf *)0);
-	if (m->m_len < sizeof (struct tcpiphdr)) {
-		if ((m = m_pullup(m, sizeof (struct tcpiphdr))) == 0) {
-			tcpstat.tcps_rcvshort++;
-			return;
-		}
-		ti = mtod(m, struct tcpiphdr *);
-	}
-
-	/*
-	 * Checksum extended TCP header and data.
-	 */
-	tlen = ((struct ip *)ti)->ip_len;
-	len = sizeof (struct ip) + tlen;
-	ti->ti_next = ti->ti_prev = 0;
-	ti->ti_x1 = 0;
-	ti->ti_len = (u_short)tlen;
-	HTONS(ti->ti_len);
-	ti->ti_sum = in_cksum(m, len);
-	if (ti->ti_sum) {
-		tcpstat.tcps_rcvbadsum++;
-		goto drop;
-	}
-#endif /* TUBA_INCLUDE */
-
-	/*
-	 * Check that TCP offset makes sense,
-	 * pull out TCP options and adjust length.		XXX
-	 */
-	off = ti->ti_off << 2;
-	if (off < sizeof (struct tcphdr) || off > tlen) {
-		tcpstat.tcps_rcvbadoff++;
-		goto drop;
-	}
-	tlen -= off;
-	ti->ti_len = tlen;
-	if (off > sizeof (struct tcphdr)) {
-		if (m->m_len < sizeof(struct ip) + off) {
-			if ((m = m_pullup(m, sizeof (struct ip) + off)) == 0) {
-				tcpstat.tcps_rcvshort++;
-				return;
-			}
-			ti = mtod(m, struct tcpiphdr *);
-		}
-		optlen = off - sizeof (struct tcphdr);
-		optp = mtod(m, u_char *) + sizeof (struct tcpiphdr);
-	}
-	tiflags = ti->ti_flags;
-
-	/*
-	 * Convert TCP protocol specific fields to host format.
-	 */
-	NTOHL(ti->ti_seq);
-	NTOHL(ti->ti_ack);
-	NTOHS(ti->ti_win);
-	NTOHS(ti->ti_urp);
-
-	/*
-	 * Drop TCP, IP headers and TCP options.
-	 */
-	m->m_data += sizeof(struct tcpiphdr)+off-sizeof(struct tcphdr);
-	m->m_len  -= sizeof(struct tcpiphdr)+off-sizeof(struct tcphdr);
-
-	/*
-	 * Locate pcb for segment.
-	 */
-findpcb:
-	inp = in_pcblookuphash(&tcbinfo, ti->ti_src, ti->ti_sport,
-	    ti->ti_dst, ti->ti_dport, 1);
-
-	/*
-	 * If the state is CLOSED (i.e., TCB does not exist) then
-	 * all data in the incoming segment is discarded.
-	 * If the TCB exists but is in CLOSED state, it is embryonic,
-	 * but should either do a listen or a connect soon.
-	 */
-	if (inp == NULL) {
-		if (log_in_vain && tiflags & TH_SYN) {
-			char buf[4*sizeof "123"];
-
-			strcpy(buf, inet_ntoa(ti->ti_dst));
-			log(LOG_INFO, "Connection attempt to TCP %s:%d"
-			    " from %s:%d\n",
-			    buf, ntohs(ti->ti_dport),
-			    inet_ntoa(ti->ti_src), ntohs(ti->ti_sport));
-		}
-		goto dropwithreset;
-	}
-	tp = intotcpcb(inp);
-	if (tp == 0)
-		goto dropwithreset;
-	if (tp->t_state == TCPS_CLOSED)
-		goto drop;
-
-	/* Unscale the window into a 32-bit value. */
-	if ((tiflags & TH_SYN) == 0)
-		tiwin = ti->ti_win << tp->snd_scale;
-	else
-		tiwin = ti->ti_win;
-
-	so = inp->inp_socket;
-	if (so->so_options & (SO_DEBUG|SO_ACCEPTCONN)) {
-#ifdef TCPDEBUG
-		if (so->so_options & SO_DEBUG) {
-			ostate = tp->t_state;
-			tcp_saveti = *ti;
-		}
-#endif
-		if (so->so_options & SO_ACCEPTCONN) {
-			register struct tcpcb *tp0 = tp;
-			struct socket *so2;
-			if ((tiflags & (TH_RST|TH_ACK|TH_SYN)) != TH_SYN) {
-				/*
-				 * Note: dropwithreset makes sure we don't
-				 * send a RST in response to a RST.
-				 */
-				if (tiflags & TH_ACK) {
-					tcpstat.tcps_badsyn++;
-					goto dropwithreset;
-				}
-				goto drop;
-			}
-			so2 = sonewconn(so, 0);
-			if (so2 == 0) {
-				tcpstat.tcps_listendrop++;
-				so2 = sodropablereq(so);
-				if (so2) {
-					tcp_drop(sototcpcb(so2), ETIMEDOUT);
-					so2 = sonewconn(so, 0);
-				}
-				if (!so2)
-					goto drop;
-			}
-			so = so2;
-			/*
-			 * This is ugly, but ....
-			 *
-			 * Mark socket as temporary until we're
-			 * committed to keeping it.  The code at
-			 * ``drop'' and ``dropwithreset'' check the
-			 * flag dropsocket to see if the temporary
-			 * socket created here should be discarded.
-			 * We mark the socket as discardable until
-			 * we're committed to it below in TCPS_LISTEN.
-			 */
-			dropsocket++;
-			inp = (struct inpcb *)so->so_pcb;
-			inp->inp_laddr = ti->ti_dst;
-			inp->inp_lport = ti->ti_dport;
-			in_pcbrehash(inp);
-#if BSD>=43
-			inp->inp_options = ip_srcroute();
-#endif
-			tp = intotcpcb(inp);
-			tp->t_state = TCPS_LISTEN;
-			tp->t_flags |= tp0->t_flags & (TF_NOPUSH|TF_NOOPT);
-
-			/* Compute proper scaling value from buffer space */
-			while (tp->request_r_scale < TCP_MAX_WINSHIFT &&
-			   TCP_MAXWIN << tp->request_r_scale < so->so_rcv.sb_hiwat)
-				tp->request_r_scale++;
-		}
-	}
-
-	/*
-	 * Segment received on connection.
-	 * Reset idle time and keep-alive timer.
-	 */
-	tp->t_idle = 0;
-	if (TCPS_HAVEESTABLISHED(tp->t_state))
-		tp->t_timer[TCPT_KEEP] = tcp_keepidle;
-
-	/*
-	 * Process options if not in LISTEN state,
-	 * else do it below (after getting remote address).
-	 */
-	if (tp->t_state != TCPS_LISTEN)
-		tcp_dooptions(tp, optp, optlen, ti, &to);
-
-	/*
-	 * Header prediction: check for the two common cases
-	 * of a uni-directional data xfer.  If the packet has
-	 * no control flags, is in-sequence, the window didn't
-	 * change and we're not retransmitting, it's a
-	 * candidate.  If the length is zero and the ack moved
-	 * forward, we're the sender side of the xfer.  Just
-	 * free the data acked & wake any higher level process
-	 * that was blocked waiting for space.  If the length
-	 * is non-zero and the ack didn't move, we're the
-	 * receiver side.  If we're getting packets in-order
-	 * (the reassembly queue is empty), add the data to
-	 * the socket buffer and note that we need a delayed ack.
-	 * Make sure that the hidden state-flags are also off.
-	 * Since we check for TCPS_ESTABLISHED above, it can only
-	 * be TH_NEEDSYN.
-	 */
-	if (tp->t_state == TCPS_ESTABLISHED &&
-	    (tiflags & (TH_SYN|TH_FIN|TH_RST|TH_URG|TH_ACK)) == TH_ACK &&
-	    ((tp->t_flags & (TF_NEEDSYN|TF_NEEDFIN)) == 0) &&
-	    ((to.to_flag & TOF_TS) == 0 ||
-	     TSTMP_GEQ(to.to_tsval, tp->ts_recent)) &&
-	    /*
-	     * Using the CC option is compulsory if once started:
-	     *   the segment is OK if no T/TCP was negotiated or
-	     *   if the segment has a CC option equal to CCrecv
-	     */
-	    ((tp->t_flags & (TF_REQ_CC|TF_RCVD_CC)) != (TF_REQ_CC|TF_RCVD_CC) ||
-	     ((to.to_flag & TOF_CC) != 0 && to.to_cc == tp->cc_recv)) &&
-	    ti->ti_seq == tp->rcv_nxt &&
-	    tiwin && tiwin == tp->snd_wnd &&
-	    tp->snd_nxt == tp->snd_max) {
-
-		/*
-		 * If last ACK falls within this segment's sequence numbers,
-		 * record the timestamp.
-		 * NOTE that the test is modified according to the latest
-		 * proposal of the tcplw@cray.com list (Braden 1993/04/26).
-		 */
-		if ((to.to_flag & TOF_TS) != 0 &&
-		   SEQ_LEQ(ti->ti_seq, tp->last_ack_sent)) {
-			tp->ts_recent_age = tcp_now;
-			tp->ts_recent = to.to_tsval;
-		}
-
-		if (ti->ti_len == 0) {
-			if (SEQ_GT(ti->ti_ack, tp->snd_una) &&
-			    SEQ_LEQ(ti->ti_ack, tp->snd_max) &&
-			    tp->snd_cwnd >= tp->snd_wnd &&
-			    tp->t_dupacks < tcprexmtthresh) {
-				/*
-				 * this is a pure ack for outstanding data.
-				 */
-				++tcpstat.tcps_predack;
-				if ((to.to_flag & TOF_TS) != 0)
-					tcp_xmit_timer(tp,
-					    tcp_now - to.to_tsecr + 1);
-				else if (tp->t_rtt &&
-					    SEQ_GT(ti->ti_ack, tp->t_rtseq))
-					tcp_xmit_timer(tp, tp->t_rtt);
-				acked = ti->ti_ack - tp->snd_una;
-				tcpstat.tcps_rcvackpack++;
-				tcpstat.tcps_rcvackbyte += acked;
-				sbdrop(&so->so_snd, acked);
-				tp->snd_una = ti->ti_ack;
-				m_freem(m);
-
-				/*
-				 * If all outstanding data are acked, stop
-				 * retransmit timer, otherwise restart timer
-				 * using current (possibly backed-off) value.
-				 * If process is waiting for space,
-				 * wakeup/selwakeup/signal.  If data
-				 * are ready to send, let tcp_output
-				 * decide between more output or persist.
-				 */
-				if (tp->snd_una == tp->snd_max)
-					tp->t_timer[TCPT_REXMT] = 0;
-				else if (tp->t_timer[TCPT_PERSIST] == 0)
-					tp->t_timer[TCPT_REXMT] = tp->t_rxtcur;
-
-				if (so->so_snd.sb_flags & SB_NOTIFY)
-					sowwakeup(so);
-				if (so->so_snd.sb_cc)
-					(void) tcp_output(tp);
-				return;
-			}
-		} else if (ti->ti_ack == tp->snd_una &&
-		    tp->seg_next == (struct tcpiphdr *)tp &&
-		    ti->ti_len <= sbspace(&so->so_rcv)) {
-			/*
-			 * this is a pure, in-sequence data packet
-			 * with nothing on the reassembly queue and
-			 * we have enough buffer space to take it.
-			 */
-			++tcpstat.tcps_preddat;
-			tp->rcv_nxt += ti->ti_len;
-			tcpstat.tcps_rcvpack++;
-			tcpstat.tcps_rcvbyte += ti->ti_len;
-			/*
-			 * Add data to socket buffer.
-			 */
-			sbappend(&so->so_rcv, m);
-			sorwakeup(so);
-#ifdef TCP_ACK_HACK
-			/*
-			 * If this is a short packet, then ACK now - with Nagel
-			 *	congestion avoidance sender won't send more until
-			 *	he gets an ACK.
-			 */
-			if (tiflags & TH_PUSH) {
-				tp->t_flags |= TF_ACKNOW;
-				tcp_output(tp);
-			} else {
-				tp->t_flags |= TF_DELACK;
-			}
-#else
-			tp->t_flags |= TF_DELACK;
-#endif
-			return;
-		}
-	}
-
-	/*
-	 * Calculate amount of space in receive window,
-	 * and then do TCP input processing.
-	 * Receive window is amount of space in rcv queue,
-	 * but not less than advertised window.
-	 */
-	{ int win;
-
-	win = sbspace(&so->so_rcv);
-	if (win < 0)
-		win = 0;
-	tp->rcv_wnd = imax(win, (int)(tp->rcv_adv - tp->rcv_nxt));
-	}
-
-	switch (tp->t_state) {
-
-	/*
-	 * If the state is LISTEN then ignore segment if it contains an RST.
-	 * If the segment contains an ACK then it is bad and send a RST.
-	 * If it does not contain a SYN then it is not interesting; drop it.
-	 * If it is from this socket, drop it, it must be forged.
-	 * Don't bother responding if the destination was a broadcast.
-	 * Otherwise initialize tp->rcv_nxt, and tp->irs, select an initial
-	 * tp->iss, and send a segment:
-	 *     <SEQ=ISS><ACK=RCV_NXT><CTL=SYN,ACK>
-	 * Also initialize tp->snd_nxt to tp->iss+1 and tp->snd_una to tp->iss.
-	 * Fill in remote peer address fields if not previously specified.
-	 * Enter SYN_RECEIVED state, and process any other fields of this
-	 * segment in this state.
-	 */
-	case TCPS_LISTEN: {
-		struct mbuf *am;
-		register struct sockaddr_in *sin;
-
-		if (tiflags & TH_RST)
-			goto drop;
-		if (tiflags & TH_ACK)
-			goto dropwithreset;
-		if ((tiflags & TH_SYN) == 0)
-			goto drop;
-		if ((ti->ti_dport == ti->ti_sport) &&
-		    (ti->ti_dst.s_addr == ti->ti_src.s_addr))
-			goto drop;
-		/*
-		 * RFC1122 4.2.3.10, p. 104: discard bcast/mcast SYN
-		 * in_broadcast() should never return true on a received
-		 * packet with M_BCAST not set.
-		 */
-		if (m->m_flags & (M_BCAST|M_MCAST) ||
-		    IN_MULTICAST(ntohl(ti->ti_dst.s_addr)))
-			goto drop;
-		am = m_get(M_DONTWAIT, MT_SONAME);	/* XXX */
-		if (am == NULL)
-			goto drop;
-		am->m_len = sizeof (struct sockaddr_in);
-		sin = mtod(am, struct sockaddr_in *);
-		sin->sin_family = AF_INET;
-		sin->sin_len = sizeof(*sin);
-		sin->sin_addr = ti->ti_src;
-		sin->sin_port = ti->ti_sport;
-		bzero((caddr_t)sin->sin_zero, sizeof(sin->sin_zero));
-		laddr = inp->inp_laddr;
-		if (inp->inp_laddr.s_addr == INADDR_ANY)
-			inp->inp_laddr = ti->ti_dst;
-		if (in_pcbconnect(inp, am)) {
-			inp->inp_laddr = laddr;
-			(void) m_free(am);
-			goto drop;
-		}
-		(void) m_free(am);
-		tp->t_template = tcp_template(tp);
-		if (tp->t_template == 0) {
-			tp = tcp_drop(tp, ENOBUFS);
-			dropsocket = 0;		/* socket is already gone */
-			goto drop;
-		}
-		if ((taop = tcp_gettaocache(inp)) == NULL) {
-			taop = &tao_noncached;
-			bzero(taop, sizeof(*taop));
-		}
-		tcp_dooptions(tp, optp, optlen, ti, &to);
-		if (iss)
-			tp->iss = iss;
-		else
-			tp->iss = tcp_iss;
-		tcp_iss += TCP_ISSINCR/4;
-		tp->irs = ti->ti_seq;
-		tcp_sendseqinit(tp);
-		tcp_rcvseqinit(tp);
-		/*
-		 * Initialization of the tcpcb for transaction;
-		 *   set SND.WND = SEG.WND,
-		 *   initialize CCsend and CCrecv.
-		 */
-		tp->snd_wnd = tiwin;	/* initial send-window */
-		tp->cc_send = CC_INC(tcp_ccgen);
-		tp->cc_recv = to.to_cc;
-		/*
-		 * Perform TAO test on incoming CC (SEG.CC) option, if any.
-		 * - compare SEG.CC against cached CC from the same host,
-		 *	if any.
-		 * - if SEG.CC > chached value, SYN must be new and is accepted
-		 *	immediately: save new CC in the cache, mark the socket
-		 *	connected, enter ESTABLISHED state, turn on flag to
-		 *	send a SYN in the next segment.
-		 *	A virtual advertised window is set in rcv_adv to
-		 *	initialize SWS prevention.  Then enter normal segment
-		 *	processing: drop SYN, process data and FIN.
-		 * - otherwise do a normal 3-way handshake.
-		 */
-		if ((to.to_flag & TOF_CC) != 0) {
-		    if (taop->tao_cc != 0 && CC_GT(to.to_cc, taop->tao_cc)) {
-			taop->tao_cc = to.to_cc;
-			tp->t_state = TCPS_ESTABLISHED;
-
-			/*
-			 * If there is a FIN, or if there is data and the
-			 * connection is local, then delay SYN,ACK(SYN) in
-			 * the hope of piggy-backing it on a response
-			 * segment.  Otherwise must send ACK now in case
-			 * the other side is slow starting.
-			 */
-			if ((tiflags & TH_FIN) || (ti->ti_len != 0 &&
-			    in_localaddr(inp->inp_faddr)))
-				tp->t_flags |= (TF_DELACK | TF_NEEDSYN);
-			else
-				tp->t_flags |= (TF_ACKNOW | TF_NEEDSYN);
-
-			/*
-			 * Limit the `virtual advertised window' to TCP_MAXWIN
-			 * here.  Even if we requested window scaling, it will
-			 * become effective only later when our SYN is acked.
-			 */
-			tp->rcv_adv += min(tp->rcv_wnd, TCP_MAXWIN);
-			tcpstat.tcps_connects++;
-			soisconnected(so);
-			tp->t_timer[TCPT_KEEP] = tcp_keepinit;
-			dropsocket = 0;		/* committed to socket */
-			tcpstat.tcps_accepts++;
-			goto trimthenstep6;
-		    }
-		/* else do standard 3-way handshake */
-		} else {
-		    /*
-		     * No CC option, but maybe CC.NEW:
-		     *   invalidate cached value.
-		     */
-		     taop->tao_cc = 0;
-		}
-		/*
-		 * TAO test failed or there was no CC option,
-		 *    do a standard 3-way handshake.
-		 */
-		tp->t_flags |= TF_ACKNOW;
-		tp->t_state = TCPS_SYN_RECEIVED;
-		tp->t_timer[TCPT_KEEP] = tcp_keepinit;
-		dropsocket = 0;		/* committed to socket */
-		tcpstat.tcps_accepts++;
-		goto trimthenstep6;
-		}
-
-	/*
-	 * If the state is SYN_RECEIVED:
-	 *	if seg contains SYN/ACK, send a RST.
-	 *	if seg contains an ACK, but not for our SYN/ACK, send a RST.
-	 */
-	case TCPS_SYN_RECEIVED:
-		if (tiflags & TH_ACK) {
-			if (tiflags & TH_SYN) {
-				tcpstat.tcps_badsyn++;
-				goto dropwithreset;
-			}
-			if (SEQ_LEQ(ti->ti_ack, tp->snd_una) ||
-			    SEQ_GT(ti->ti_ack, tp->snd_max))
-				goto dropwithreset;
-		}
-		break;
-
-	/*
-	 * If the state is SYN_SENT:
-	 *	if seg contains an ACK, but not for our SYN, drop the input.
-	 *	if seg contains a RST, then drop the connection.
-	 *	if seg does not contain SYN, then drop it.
-	 * Otherwise this is an acceptable SYN segment
-	 *	initialize tp->rcv_nxt and tp->irs
-	 *	if seg contains ack then advance tp->snd_una
-	 *	if SYN has been acked change to ESTABLISHED else SYN_RCVD state
-	 *	arrange for segment to be acked (eventually)
-	 *	continue processing rest of data/controls, beginning with URG
-	 */
-	case TCPS_SYN_SENT:
-		if ((taop = tcp_gettaocache(inp)) == NULL) {
-			taop = &tao_noncached;
-			bzero(taop, sizeof(*taop));
-		}
-
-		if ((tiflags & TH_ACK) &&
-		    (SEQ_LEQ(ti->ti_ack, tp->iss) ||
-		     SEQ_GT(ti->ti_ack, tp->snd_max))) {
-			/*
-			 * If we have a cached CCsent for the remote host,
-			 * hence we haven't just crashed and restarted,
-			 * do not send a RST.  This may be a retransmission
-			 * from the other side after our earlier ACK was lost.
-			 * Our new SYN, when it arrives, will serve as the
-			 * needed ACK.
-			 */
-			if (taop->tao_ccsent != 0)
-				goto drop;
-			else
-				goto dropwithreset;
-		}
-		if (tiflags & TH_RST) {
-			if (tiflags & TH_ACK)
-				tp = tcp_drop(tp, ECONNREFUSED);
-			goto drop;
-		}
-		if ((tiflags & TH_SYN) == 0)
-			goto drop;
-		tp->snd_wnd = ti->ti_win;	/* initial send window */
-		tp->cc_recv = to.to_cc;		/* foreign CC */
-
-		tp->irs = ti->ti_seq;
-		tcp_rcvseqinit(tp);
-		if (tiflags & TH_ACK) {
-			/*
-			 * Our SYN was acked.  If segment contains CC.ECHO
-			 * option, check it to make sure this segment really
-			 * matches our SYN.  If not, just drop it as old
-			 * duplicate, but send an RST if we're still playing
-			 * by the old rules.  If no CC.ECHO option, make sure
-			 * we don't get fooled into using T/TCP.
-			 */
-			if (to.to_flag & TOF_CCECHO) {
-				if (tp->cc_send != to.to_ccecho)
-					if (taop->tao_ccsent != 0)
-						goto drop;
-					else
-						goto dropwithreset;
-			} else
-				tp->t_flags &= ~TF_RCVD_CC;
-			tcpstat.tcps_connects++;
-			soisconnected(so);
-			/* Do window scaling on this connection? */
-			if ((tp->t_flags & (TF_RCVD_SCALE|TF_REQ_SCALE)) ==
-				(TF_RCVD_SCALE|TF_REQ_SCALE)) {
-				tp->snd_scale = tp->requested_s_scale;
-				tp->rcv_scale = tp->request_r_scale;
-			}
-			/* Segment is acceptable, update cache if undefined. */
-			if (taop->tao_ccsent == 0)
-				taop->tao_ccsent = to.to_ccecho;
-
-			tp->rcv_adv += tp->rcv_wnd;
-			tp->snd_una++;		/* SYN is acked */
-			/*
-			 * If there's data, delay ACK; if there's also a FIN
-			 * ACKNOW will be turned on later.
-			 */
-			if (ti->ti_len != 0)
-				tp->t_flags |= TF_DELACK;
-			else
-				tp->t_flags |= TF_ACKNOW;
-			/*
-			 * Received <SYN,ACK> in SYN_SENT[*] state.
-			 * Transitions:
-			 *	SYN_SENT  --> ESTABLISHED
-			 *	SYN_SENT* --> FIN_WAIT_1
-			 */
-			if (tp->t_flags & TF_NEEDFIN) {
-				tp->t_state = TCPS_FIN_WAIT_1;
-				tp->t_flags &= ~TF_NEEDFIN;
-				tiflags &= ~TH_SYN;
-			} else {
-				tp->t_state = TCPS_ESTABLISHED;
-				tp->t_timer[TCPT_KEEP] = tcp_keepidle;
-			}
-		} else {
-		/*
-		 *  Received initial SYN in SYN-SENT[*] state => simul-
-		 *  taneous open.  If segment contains CC option and there is
-		 *  a cached CC, apply TAO test; if it succeeds, connection is
-		 *  half-synchronized.  Otherwise, do 3-way handshake:
-		 *        SYN-SENT -> SYN-RECEIVED
-		 *        SYN-SENT* -> SYN-RECEIVED*
-		 *  If there was no CC option, clear cached CC value.
-		 */
-			tp->t_flags |= TF_ACKNOW;
-			tp->t_timer[TCPT_REXMT] = 0;
-			if (to.to_flag & TOF_CC) {
-				if (taop->tao_cc != 0 &&
-				    CC_GT(to.to_cc, taop->tao_cc)) {
-					/*
-					 * update cache and make transition:
-					 *        SYN-SENT -> ESTABLISHED*
-					 *        SYN-SENT* -> FIN-WAIT-1*
-					 */
-					taop->tao_cc = to.to_cc;
-					if (tp->t_flags & TF_NEEDFIN) {
-						tp->t_state = TCPS_FIN_WAIT_1;
-						tp->t_flags &= ~TF_NEEDFIN;
-					} else {
-						tp->t_state = TCPS_ESTABLISHED;
-						tp->t_timer[TCPT_KEEP] = tcp_keepidle;
-					}
-					tp->t_flags |= TF_NEEDSYN;
-				} else
-					tp->t_state = TCPS_SYN_RECEIVED;
-			} else {
-				/* CC.NEW or no option => invalidate cache */
-				taop->tao_cc = 0;
-				tp->t_state = TCPS_SYN_RECEIVED;
-			}
-		}
-
-trimthenstep6:
-		/*
-		 * Advance ti->ti_seq to correspond to first data byte.
-		 * If data, trim to stay within window,
-		 * dropping FIN if necessary.
-		 */
-		ti->ti_seq++;
-		if (ti->ti_len > tp->rcv_wnd) {
-			todrop = ti->ti_len - tp->rcv_wnd;
-			m_adj(m, -todrop);
-			ti->ti_len = tp->rcv_wnd;
-			tiflags &= ~TH_FIN;
-			tcpstat.tcps_rcvpackafterwin++;
-			tcpstat.tcps_rcvbyteafterwin += todrop;
-		}
-		tp->snd_wl1 = ti->ti_seq - 1;
-		tp->rcv_up = ti->ti_seq;
-		/*
-		 *  Client side of transaction: already sent SYN and data.
-		 *  If the remote host used T/TCP to validate the SYN,
-		 *  our data will be ACK'd; if so, enter normal data segment
-		 *  processing in the middle of step 5, ack processing.
-		 *  Otherwise, goto step 6.
-		 */
- 		if (tiflags & TH_ACK)
-			goto process_ACK;
-		goto step6;
-	/*
-	 * If the state is LAST_ACK or CLOSING or TIME_WAIT:
-	 *	if segment contains a SYN and CC [not CC.NEW] option:
-	 *              if state == TIME_WAIT and connection duration > MSL,
-	 *                  drop packet and send RST;
-	 *
-	 *		if SEG.CC > CCrecv then is new SYN, and can implicitly
-	 *		    ack the FIN (and data) in retransmission queue.
-	 *                  Complete close and delete TCPCB.  Then reprocess
-	 *                  segment, hoping to find new TCPCB in LISTEN state;
-	 *
-	 *		else must be old SYN; drop it.
-	 *      else do normal processing.
-	 */
-	case TCPS_LAST_ACK:
-	case TCPS_CLOSING:
-	case TCPS_TIME_WAIT:
-		if ((tiflags & TH_SYN) &&
-		    (to.to_flag & TOF_CC) && tp->cc_recv != 0) {
-			if (tp->t_state == TCPS_TIME_WAIT &&
-					tp->t_duration > TCPTV_MSL)
-				goto dropwithreset;
-			if (CC_GT(to.to_cc, tp->cc_recv)) {
-				tp = tcp_close(tp);
-				goto findpcb;
-			}
-			else
-				goto drop;
-		}
- 		break;  /* continue normal processing */
-	}
-
-	/*
-	 * States other than LISTEN or SYN_SENT.
-	 * First check timestamp, if present.
-	 * Then check the connection count, if present.
-	 * Then check that at least some bytes of segment are within
-	 * receive window.  If segment begins before rcv_nxt,
-	 * drop leading data (and SYN); if nothing left, just ack.
-	 *
-	 * RFC 1323 PAWS: If we have a timestamp reply on this segment
-	 * and it's less than ts_recent, drop it.
-	 */
-	if ((to.to_flag & TOF_TS) != 0 && (tiflags & TH_RST) == 0 &&
-	    tp->ts_recent && TSTMP_LT(to.to_tsval, tp->ts_recent)) {
-
-		/* Check to see if ts_recent is over 24 days old.  */
-		if ((int)(tcp_now - tp->ts_recent_age) > TCP_PAWS_IDLE) {
-			/*
-			 * Invalidate ts_recent.  If this segment updates
-			 * ts_recent, the age will be reset later and ts_recent
-			 * will get a valid value.  If it does not, setting
-			 * ts_recent to zero will at least satisfy the
-			 * requirement that zero be placed in the timestamp
-			 * echo reply when ts_recent isn't valid.  The
-			 * age isn't reset until we get a valid ts_recent
-			 * because we don't want out-of-order segments to be
-			 * dropped when ts_recent is old.
-			 */
-			tp->ts_recent = 0;
-		} else {
-			tcpstat.tcps_rcvduppack++;
-			tcpstat.tcps_rcvdupbyte += ti->ti_len;
-			tcpstat.tcps_pawsdrop++;
-			goto dropafterack;
-		}
-	}
-
-	/*
-	 * T/TCP mechanism
-	 *   If T/TCP was negotiated and the segment doesn't have CC,
-	 *   or if it's CC is wrong then drop the segment.
-	 *   RST segments do not have to comply with this.
-	 */
-	if ((tp->t_flags & (TF_REQ_CC|TF_RCVD_CC)) == (TF_REQ_CC|TF_RCVD_CC) &&
-	    ((to.to_flag & TOF_CC) == 0 || tp->cc_recv != to.to_cc) &&
-	    (tiflags & TH_RST) == 0)
- 		goto dropafterack;
-
-	todrop = tp->rcv_nxt - ti->ti_seq;
-	if (todrop > 0) {
-		if (tiflags & TH_SYN) {
-			tiflags &= ~TH_SYN;
-			ti->ti_seq++;
-			if (ti->ti_urp > 1)
-				ti->ti_urp--;
-			else
-				tiflags &= ~TH_URG;
-			todrop--;
-		}
-		/*
-		 * Following if statement from Stevens, vol. 2, p. 960.
-		 */
-		if (todrop > ti->ti_len
-		    || (todrop == ti->ti_len && (tiflags & TH_FIN) == 0)) {
-			/*
-			 * Any valid FIN must be to the left of the window.
-			 * At this point the FIN must be a duplicate or out
-			 * of sequence; drop it.
-			 */
-			tiflags &= ~TH_FIN;
-
-			/*
-			 * Send an ACK to resynchronize and drop any data.
-			 * But keep on processing for RST or ACK.
-			 */
-			tp->t_flags |= TF_ACKNOW;
-			todrop = ti->ti_len;
-			tcpstat.tcps_rcvduppack++;
-			tcpstat.tcps_rcvdupbyte += todrop;
-		} else {
-			tcpstat.tcps_rcvpartduppack++;
-			tcpstat.tcps_rcvpartdupbyte += todrop;
-		}
-		m_adj(m, todrop);
-		ti->ti_seq += todrop;
-		ti->ti_len -= todrop;
-		if (ti->ti_urp > todrop)
-			ti->ti_urp -= todrop;
-		else {
-			tiflags &= ~TH_URG;
-			ti->ti_urp = 0;
-		}
-	}
-
-	/*
-	 * If new data are received on a connection after the
-	 * user processes are gone, then RST the other end.
-	 */
-	if ((so->so_state & SS_NOFDREF) &&
-	    tp->t_state > TCPS_CLOSE_WAIT && ti->ti_len) {
-		tp = tcp_close(tp);
-		tcpstat.tcps_rcvafterclose++;
-		goto dropwithreset;
-	}
-
-	/*
-	 * If segment ends after window, drop trailing data
-	 * (and PUSH and FIN); if nothing left, just ACK.
-	 */
-	todrop = (ti->ti_seq+ti->ti_len) - (tp->rcv_nxt+tp->rcv_wnd);
-	if (todrop > 0) {
-		tcpstat.tcps_rcvpackafterwin++;
-		if (todrop >= ti->ti_len) {
-			tcpstat.tcps_rcvbyteafterwin += ti->ti_len;
-			/*
-			 * If a new connection request is received
-			 * while in TIME_WAIT, drop the old connection
-			 * and start over if the sequence numbers
-			 * are above the previous ones.
-			 */
-			if (tiflags & TH_SYN &&
-			    tp->t_state == TCPS_TIME_WAIT &&
-			    SEQ_GT(ti->ti_seq, tp->rcv_nxt)) {
-				iss = tp->rcv_nxt + TCP_ISSINCR;
-				tp = tcp_close(tp);
-				goto findpcb;
-			}
-			/*
-			 * If window is closed can only take segments at
-			 * window edge, and have to drop data and PUSH from
-			 * incoming segments.  Continue processing, but
-			 * remember to ack.  Otherwise, drop segment
-			 * and ack.
-			 */
-			if (tp->rcv_wnd == 0 && ti->ti_seq == tp->rcv_nxt) {
-				tp->t_flags |= TF_ACKNOW;
-				tcpstat.tcps_rcvwinprobe++;
-			} else
-				goto dropafterack;
-		} else
-			tcpstat.tcps_rcvbyteafterwin += todrop;
-		m_adj(m, -todrop);
-		ti->ti_len -= todrop;
-		tiflags &= ~(TH_PUSH|TH_FIN);
-	}
-
-	/*
-	 * If last ACK falls within this segment's sequence numbers,
-	 * record its timestamp.
-	 * NOTE that the test is modified according to the latest
-	 * proposal of the tcplw@cray.com list (Braden 1993/04/26).
-	 */
-	if ((to.to_flag & TOF_TS) != 0 &&
-	    SEQ_LEQ(ti->ti_seq, tp->last_ack_sent)) {
-		tp->ts_recent_age = tcp_now;
-		tp->ts_recent = to.to_tsval;
-	}
-
-	/*
-	 * If the RST bit is set examine the state:
-	 *    SYN_RECEIVED STATE:
-	 *	If passive open, return to LISTEN state.
-	 *	If active open, inform user that connection was refused.
-	 *    ESTABLISHED, FIN_WAIT_1, FIN_WAIT2, CLOSE_WAIT STATES:
-	 *	Inform user that connection was reset, and close tcb.
-	 *    CLOSING, LAST_ACK, TIME_WAIT STATES
-	 *	Close the tcb.
-	 */
-	if (tiflags&TH_RST) switch (tp->t_state) {
-
-	case TCPS_SYN_RECEIVED:
-		so->so_error = ECONNREFUSED;
-		goto close;
-
-	case TCPS_ESTABLISHED:
-	case TCPS_FIN_WAIT_1:
-	case TCPS_FIN_WAIT_2:
-	case TCPS_CLOSE_WAIT:
-		so->so_error = ECONNRESET;
-	close:
-		tp->t_state = TCPS_CLOSED;
-		tcpstat.tcps_drops++;
-		tp = tcp_close(tp);
-		goto drop;
-
-	case TCPS_CLOSING:
-	case TCPS_LAST_ACK:
-	case TCPS_TIME_WAIT:
-		tp = tcp_close(tp);
-		goto drop;
-	}
-
-	/*
-	 * If a SYN is in the window, then this is an
-	 * error and we send an RST and drop the connection.
-	 */
-	if (tiflags & TH_SYN) {
-		tp = tcp_drop(tp, ECONNRESET);
-		goto dropwithreset;
-	}
-
-	/*
-	 * If the ACK bit is off:  if in SYN-RECEIVED state or SENDSYN
-	 * flag is on (half-synchronized state), then queue data for
-	 * later processing; else drop segment and return.
-	 */
-	if ((tiflags & TH_ACK) == 0) {
-		if (tp->t_state == TCPS_SYN_RECEIVED ||
-		    (tp->t_flags & TF_NEEDSYN))
-			goto step6;
-		else
-			goto drop;
-	}
-
-	/*
-	 * Ack processing.
-	 */
-	switch (tp->t_state) {
-
-	/*
-	 * In SYN_RECEIVED state, the ack ACKs our SYN, so enter
-	 * ESTABLISHED state and continue processing.
-	 * The ACK was checked above.
-	 */
-	case TCPS_SYN_RECEIVED:
-
-		tcpstat.tcps_connects++;
-		soisconnected(so);
-		/* Do window scaling? */
-		if ((tp->t_flags & (TF_RCVD_SCALE|TF_REQ_SCALE)) ==
-			(TF_RCVD_SCALE|TF_REQ_SCALE)) {
-			tp->snd_scale = tp->requested_s_scale;
-			tp->rcv_scale = tp->request_r_scale;
-		}
-		/*
-		 * Upon successful completion of 3-way handshake,
-		 * update cache.CC if it was undefined, pass any queued
-		 * data to the user, and advance state appropriately.
-		 */
-		if ((taop = tcp_gettaocache(inp)) != NULL &&
-		    taop->tao_cc == 0)
-			taop->tao_cc = tp->cc_recv;
-
-		/*
-		 * Make transitions:
-		 *      SYN-RECEIVED  -> ESTABLISHED
-		 *      SYN-RECEIVED* -> FIN-WAIT-1
-		 */
-		if (tp->t_flags & TF_NEEDFIN) {
-			tp->t_state = TCPS_FIN_WAIT_1;
-			tp->t_flags &= ~TF_NEEDFIN;
-		} else {
-			tp->t_state = TCPS_ESTABLISHED;
-			tp->t_timer[TCPT_KEEP] = tcp_keepidle;
-		}
-		/*
-		 * If segment contains data or ACK, will call tcp_reass()
-		 * later; if not, do so now to pass queued data to user.
-		 */
-		if (ti->ti_len == 0 && (tiflags & TH_FIN) == 0)
-			(void) tcp_reass(tp, (struct tcpiphdr *)0,
-			    (struct mbuf *)0);
-		tp->snd_wl1 = ti->ti_seq - 1;
-		/* fall into ... */
-
-	/*
-	 * In ESTABLISHED state: drop duplicate ACKs; ACK out of range
-	 * ACKs.  If the ack is in the range
-	 *	tp->snd_una < ti->ti_ack <= tp->snd_max
-	 * then advance tp->snd_una to ti->ti_ack and drop
-	 * data from the retransmission queue.  If this ACK reflects
-	 * more up to date window information we update our window information.
-	 */
-	case TCPS_ESTABLISHED:
-	case TCPS_FIN_WAIT_1:
-	case TCPS_FIN_WAIT_2:
-	case TCPS_CLOSE_WAIT:
-	case TCPS_CLOSING:
-	case TCPS_LAST_ACK:
-	case TCPS_TIME_WAIT:
-
-		if (SEQ_LEQ(ti->ti_ack, tp->snd_una)) {
-			if (ti->ti_len == 0 && tiwin == tp->snd_wnd) {
-				tcpstat.tcps_rcvdupack++;
-				/*
-				 * If we have outstanding data (other than
-				 * a window probe), this is a completely
-				 * duplicate ack (ie, window info didn't
-				 * change), the ack is the biggest we've
-				 * seen and we've seen exactly our rexmt
-				 * threshhold of them, assume a packet
-				 * has been dropped and retransmit it.
-				 * Kludge snd_nxt & the congestion
-				 * window so we send only this one
-				 * packet.
-				 *
-				 * We know we're losing at the current
-				 * window size so do congestion avoidance
-				 * (set ssthresh to half the current window
-				 * and pull our congestion window back to
-				 * the new ssthresh).
-				 *
-				 * Dup acks mean that packets have left the
-				 * network (they're now cached at the receiver)
-				 * so bump cwnd by the amount in the receiver
-				 * to keep a constant cwnd packets in the
-				 * network.
-				 */
-				if (tp->t_timer[TCPT_REXMT] == 0 ||
-				    ti->ti_ack != tp->snd_una)
-					tp->t_dupacks = 0;
-				else if (++tp->t_dupacks == tcprexmtthresh) {
-					tcp_seq onxt = tp->snd_nxt;
-					u_int win =
-					    min(tp->snd_wnd, tp->snd_cwnd) / 2 /
-						tp->t_maxseg;
-
-					if (win < 2)
-						win = 2;
-					tp->snd_ssthresh = win * tp->t_maxseg;
-					tp->t_timer[TCPT_REXMT] = 0;
-					tp->t_rtt = 0;
-					tp->snd_nxt = ti->ti_ack;
-					tp->snd_cwnd = tp->t_maxseg;
-					(void) tcp_output(tp);
-					tp->snd_cwnd = tp->snd_ssthresh +
-					       tp->t_maxseg * tp->t_dupacks;
-					if (SEQ_GT(onxt, tp->snd_nxt))
-						tp->snd_nxt = onxt;
-					goto drop;
-				} else if (tp->t_dupacks > tcprexmtthresh) {
-					tp->snd_cwnd += tp->t_maxseg;
-					(void) tcp_output(tp);
-					goto drop;
-				}
-			} else
-				tp->t_dupacks = 0;
-			break;
-		}
-		/*
-		 * If the congestion window was inflated to account
-		 * for the other side's cached packets, retract it.
-		 */
-		if (tp->t_dupacks >= tcprexmtthresh &&
-		    tp->snd_cwnd > tp->snd_ssthresh)
-			tp->snd_cwnd = tp->snd_ssthresh;
-		tp->t_dupacks = 0;
-		if (SEQ_GT(ti->ti_ack, tp->snd_max)) {
-			tcpstat.tcps_rcvacktoomuch++;
-			goto dropafterack;
-		}
-		/*
-		 *  If we reach this point, ACK is not a duplicate,
-		 *     i.e., it ACKs something we sent.
-		 */
-		if (tp->t_flags & TF_NEEDSYN) {
-			/*
-			 * T/TCP: Connection was half-synchronized, and our
-			 * SYN has been ACK'd (so connection is now fully
-			 * synchronized).  Go to non-starred state,
-			 * increment snd_una for ACK of SYN, and check if
-			 * we can do window scaling.
-			 */
-			tp->t_flags &= ~TF_NEEDSYN;
-			tp->snd_una++;
-			/* Do window scaling? */
-			if ((tp->t_flags & (TF_RCVD_SCALE|TF_REQ_SCALE)) ==
-				(TF_RCVD_SCALE|TF_REQ_SCALE)) {
-				tp->snd_scale = tp->requested_s_scale;
-				tp->rcv_scale = tp->request_r_scale;
-			}
-		}
-
-process_ACK:
-		acked = ti->ti_ack - tp->snd_una;
-		tcpstat.tcps_rcvackpack++;
-		tcpstat.tcps_rcvackbyte += acked;
-
-		/*
-		 * If we have a timestamp reply, update smoothed
-		 * round trip time.  If no timestamp is present but
-		 * transmit timer is running and timed sequence
-		 * number was acked, update smoothed round trip time.
-		 * Since we now have an rtt measurement, cancel the
-		 * timer backoff (cf., Phil Karn's retransmit alg.).
-		 * Recompute the initial retransmit timer.
-		 */
-		if (to.to_flag & TOF_TS)
-			tcp_xmit_timer(tp, tcp_now - to.to_tsecr + 1);
-		else if (tp->t_rtt && SEQ_GT(ti->ti_ack, tp->t_rtseq))
-			tcp_xmit_timer(tp,tp->t_rtt);
-
-		/*
-		 * If all outstanding data is acked, stop retransmit
-		 * timer and remember to restart (more output or persist).
-		 * If there is more data to be acked, restart retransmit
-		 * timer, using current (possibly backed-off) value.
-		 */
-		if (ti->ti_ack == tp->snd_max) {
-			tp->t_timer[TCPT_REXMT] = 0;
-			needoutput = 1;
-		} else if (tp->t_timer[TCPT_PERSIST] == 0)
-			tp->t_timer[TCPT_REXMT] = tp->t_rxtcur;
-
-		/*
-		 * If no data (only SYN) was ACK'd,
-		 *    skip rest of ACK processing.
-		 */
-		if (acked == 0)
-			goto step6;
-
-		/*
-		 * When new data is acked, open the congestion window.
-		 * If the window gives us less than ssthresh packets
-		 * in flight, open exponentially (maxseg per packet).
-		 * Otherwise open linearly: maxseg per window
-		 * (maxseg^2 / cwnd per packet).
-		 */
-		{
-		register u_int cw = tp->snd_cwnd;
-		register u_int incr = tp->t_maxseg;
-
-		if (cw > tp->snd_ssthresh)
-			incr = incr * incr / cw;
-		tp->snd_cwnd = min(cw + incr, TCP_MAXWIN<<tp->snd_scale);
-		}
-		if (acked > so->so_snd.sb_cc) {
-			tp->snd_wnd -= so->so_snd.sb_cc;
-			sbdrop(&so->so_snd, (int)so->so_snd.sb_cc);
-			ourfinisacked = 1;
-		} else {
-			sbdrop(&so->so_snd, acked);
-			tp->snd_wnd -= acked;
-			ourfinisacked = 0;
-		}
-		if (so->so_snd.sb_flags & SB_NOTIFY)
-			sowwakeup(so);
-		tp->snd_una = ti->ti_ack;
-		if (SEQ_LT(tp->snd_nxt, tp->snd_una))
-			tp->snd_nxt = tp->snd_una;
-
-		switch (tp->t_state) {
-
-		/*
-		 * In FIN_WAIT_1 STATE in addition to the processing
-		 * for the ESTABLISHED state if our FIN is now acknowledged
-		 * then enter FIN_WAIT_2.
-		 */
-		case TCPS_FIN_WAIT_1:
-			if (ourfinisacked) {
-				/*
-				 * If we can't receive any more
-				 * data, then closing user can proceed.
-				 * Starting the timer is contrary to the
-				 * specification, but if we don't get a FIN
-				 * we'll hang forever.
-				 */
-				if (so->so_state & SS_CANTRCVMORE) {
-					soisdisconnected(so);
-					tp->t_timer[TCPT_2MSL] = tcp_maxidle;
-				}
-				tp->t_state = TCPS_FIN_WAIT_2;
-			}
-			break;
-
-	 	/*
-		 * In CLOSING STATE in addition to the processing for
-		 * the ESTABLISHED state if the ACK acknowledges our FIN
-		 * then enter the TIME-WAIT state, otherwise ignore
-		 * the segment.
-		 */
-		case TCPS_CLOSING:
-			if (ourfinisacked) {
-				tp->t_state = TCPS_TIME_WAIT;
-				tcp_canceltimers(tp);
-				/* Shorten TIME_WAIT [RFC-1644, p.28] */
-				if (tp->cc_recv != 0 &&
-				    tp->t_duration < TCPTV_MSL)
-					tp->t_timer[TCPT_2MSL] =
-					    tp->t_rxtcur * TCPTV_TWTRUNC;
-				else
-					tp->t_timer[TCPT_2MSL] = 2 * TCPTV_MSL;
-				soisdisconnected(so);
-			}
-			break;
-
-		/*
-		 * In LAST_ACK, we may still be waiting for data to drain
-		 * and/or to be acked, as well as for the ack of our FIN.
-		 * If our FIN is now acknowledged, delete the TCB,
-		 * enter the closed state and return.
-		 */
-		case TCPS_LAST_ACK:
-			if (ourfinisacked) {
-				tp = tcp_close(tp);
-				goto drop;
-			}
-			break;
-
-		/*
-		 * In TIME_WAIT state the only thing that should arrive
-		 * is a retransmission of the remote FIN.  Acknowledge
-		 * it and restart the finack timer.
-		 */
-		case TCPS_TIME_WAIT:
-			tp->t_timer[TCPT_2MSL] = 2 * TCPTV_MSL;
-			goto dropafterack;
-		}
-	}
-
-step6:
-	/*
-	 * Update window information.
-	 * Don't look at window if no ACK: TAC's send garbage on first SYN.
-	 */
-	if ((tiflags & TH_ACK) &&
-	    (SEQ_LT(tp->snd_wl1, ti->ti_seq) ||
-	    (tp->snd_wl1 == ti->ti_seq && (SEQ_LT(tp->snd_wl2, ti->ti_ack) ||
-	     (tp->snd_wl2 == ti->ti_ack && tiwin > tp->snd_wnd))))) {
-		/* keep track of pure window updates */
-		if (ti->ti_len == 0 &&
-		    tp->snd_wl2 == ti->ti_ack && tiwin > tp->snd_wnd)
-			tcpstat.tcps_rcvwinupd++;
-		tp->snd_wnd = tiwin;
-		tp->snd_wl1 = ti->ti_seq;
-		tp->snd_wl2 = ti->ti_ack;
-		if (tp->snd_wnd > tp->max_sndwnd)
-			tp->max_sndwnd = tp->snd_wnd;
-		needoutput = 1;
-	}
-
-	/*
-	 * Process segments with URG.
-	 */
-	if ((tiflags & TH_URG) && ti->ti_urp &&
-	    TCPS_HAVERCVDFIN(tp->t_state) == 0) {
-		/*
-		 * This is a kludge, but if we receive and accept
-		 * random urgent pointers, we'll crash in
-		 * soreceive.  It's hard to imagine someone
-		 * actually wanting to send this much urgent data.
-		 */
-		if (ti->ti_urp + so->so_rcv.sb_cc > sb_max) {
-			ti->ti_urp = 0;			/* XXX */
-			tiflags &= ~TH_URG;		/* XXX */
-			goto dodata;			/* XXX */
-		}
-		/*
-		 * If this segment advances the known urgent pointer,
-		 * then mark the data stream.  This should not happen
-		 * in CLOSE_WAIT, CLOSING, LAST_ACK or TIME_WAIT STATES since
-		 * a FIN has been received from the remote side.
-		 * In these states we ignore the URG.
-		 *
-		 * According to RFC961 (Assigned Protocols),
-		 * the urgent pointer points to the last octet
-		 * of urgent data.  We continue, however,
-		 * to consider it to indicate the first octet
-		 * of data past the urgent section as the original
-		 * spec states (in one of two places).
-		 */
-		if (SEQ_GT(ti->ti_seq+ti->ti_urp, tp->rcv_up)) {
-			tp->rcv_up = ti->ti_seq + ti->ti_urp;
-			so->so_oobmark = so->so_rcv.sb_cc +
-			    (tp->rcv_up - tp->rcv_nxt) - 1;
-			if (so->so_oobmark == 0)
-				so->so_state |= SS_RCVATMARK;
-			sohasoutofband(so);
-			tp->t_oobflags &= ~(TCPOOB_HAVEDATA | TCPOOB_HADDATA);
-		}
-		/*
-		 * Remove out of band data so doesn't get presented to user.
-		 * This can happen independent of advancing the URG pointer,
-		 * but if two URG's are pending at once, some out-of-band
-		 * data may creep in... ick.
-		 */
-		if (ti->ti_urp <= (u_long)ti->ti_len
-#ifdef SO_OOBINLINE
-		     && (so->so_options & SO_OOBINLINE) == 0
-#endif
-		     )
-			tcp_pulloutofband(so, ti, m);
-	} else
-		/*
-		 * If no out of band data is expected,
-		 * pull receive urgent pointer along
-		 * with the receive window.
-		 */
-		if (SEQ_GT(tp->rcv_nxt, tp->rcv_up))
-			tp->rcv_up = tp->rcv_nxt;
-dodata:							/* XXX */
-
-	/*
-	 * Process the segment text, merging it into the TCP sequencing queue,
-	 * and arranging for acknowledgment of receipt if necessary.
-	 * This process logically involves adjusting tp->rcv_wnd as data
-	 * is presented to the user (this happens in tcp_usrreq.c,
-	 * case PRU_RCVD).  If a FIN has already been received on this
-	 * connection then we just ignore the text.
-	 */
-	if ((ti->ti_len || (tiflags&TH_FIN)) &&
-	    TCPS_HAVERCVDFIN(tp->t_state) == 0) {
-		TCP_REASS(tp, ti, m, so, tiflags);
-		/*
-		 * Note the amount of data that peer has sent into
-		 * our window, in order to estimate the sender's
-		 * buffer size.
-		 */
-		len = so->so_rcv.sb_hiwat - (tp->rcv_adv - tp->rcv_nxt);
-	} else {
-		m_freem(m);
-		tiflags &= ~TH_FIN;
-	}
-
-	/*
-	 * If FIN is received ACK the FIN and let the user know
-	 * that the connection is closing.
-	 */
-	if (tiflags & TH_FIN) {
-		if (TCPS_HAVERCVDFIN(tp->t_state) == 0) {
-			socantrcvmore(so);
-			/*
-			 *  If connection is half-synchronized
-			 *  (ie NEEDSYN flag on) then delay ACK,
-			 *  so it may be piggybacked when SYN is sent.
-			 *  Otherwise, since we received a FIN then no
-			 *  more input can be expected, send ACK now.
-			 */
-			if (tp->t_flags & TF_NEEDSYN)
-				tp->t_flags |= TF_DELACK;
-			else
-				tp->t_flags |= TF_ACKNOW;
-			tp->rcv_nxt++;
-		}
-		switch (tp->t_state) {
-
-	 	/*
-		 * In SYN_RECEIVED and ESTABLISHED STATES
-		 * enter the CLOSE_WAIT state.
-		 */
-		case TCPS_SYN_RECEIVED:
-		case TCPS_ESTABLISHED:
-			tp->t_state = TCPS_CLOSE_WAIT;
-			break;
-
-	 	/*
-		 * If still in FIN_WAIT_1 STATE FIN has not been acked so
-		 * enter the CLOSING state.
-		 */
-		case TCPS_FIN_WAIT_1:
-			tp->t_state = TCPS_CLOSING;
-			break;
-
-	 	/*
-		 * In FIN_WAIT_2 state enter the TIME_WAIT state,
-		 * starting the time-wait timer, turning off the other
-		 * standard timers.
-		 */
-		case TCPS_FIN_WAIT_2:
-			tp->t_state = TCPS_TIME_WAIT;
-			tcp_canceltimers(tp);
-			/* Shorten TIME_WAIT [RFC-1644, p.28] */
-			if (tp->cc_recv != 0 &&
-			    tp->t_duration < TCPTV_MSL) {
-				tp->t_timer[TCPT_2MSL] =
-				    tp->t_rxtcur * TCPTV_TWTRUNC;
-				/* For transaction client, force ACK now. */
-				tp->t_flags |= TF_ACKNOW;
-			}
-			else
-				tp->t_timer[TCPT_2MSL] = 2 * TCPTV_MSL;
-			soisdisconnected(so);
-			break;
-
-		/*
-		 * In TIME_WAIT state restart the 2 MSL time_wait timer.
-		 */
-		case TCPS_TIME_WAIT:
-			tp->t_timer[TCPT_2MSL] = 2 * TCPTV_MSL;
-			break;
-		}
-	}
-#ifdef TCPDEBUG
-	if (so->so_options & SO_DEBUG)
-		tcp_trace(TA_INPUT, ostate, tp, &tcp_saveti, 0);
-#endif
-
-	/*
-	 * Return any desired output.
-	 */
-	if (needoutput || (tp->t_flags & TF_ACKNOW))
-		(void) tcp_output(tp);
-	return;
-
-dropafterack:
-	/*
-	 * Generate an ACK dropping incoming segment if it occupies
-	 * sequence space, where the ACK reflects our state.
-	 */
-	if (tiflags & TH_RST)
-		goto drop;
-#ifdef TCPDEBUG
-	if (so->so_options & SO_DEBUG)
-		tcp_trace(TA_DROP, ostate, tp, &tcp_saveti, 0);
-#endif
-	m_freem(m);
-	tp->t_flags |= TF_ACKNOW;
-	(void) tcp_output(tp);
-	return;
-
-dropwithreset:
-	/*
-	 * Generate a RST, dropping incoming segment.
-	 * Make ACK acceptable to originator of segment.
-	 * Don't bother to respond if destination was broadcast/multicast.
-	 */
-	if ((tiflags & TH_RST) || m->m_flags & (M_BCAST|M_MCAST) ||
-	    IN_MULTICAST(ntohl(ti->ti_dst.s_addr)))
-		goto drop;
-#ifdef TCPDEBUG
-	if (tp == 0 || (tp->t_inpcb->inp_socket->so_options & SO_DEBUG))
-		tcp_trace(TA_DROP, ostate, tp, &tcp_saveti, 0);
-#endif
-	if (tiflags & TH_ACK)
-		tcp_respond(tp, ti, m, (tcp_seq)0, ti->ti_ack, TH_RST);
-	else {
-		if (tiflags & TH_SYN)
-			ti->ti_len++;
-		tcp_respond(tp, ti, m, ti->ti_seq+ti->ti_len, (tcp_seq)0,
-		    TH_RST|TH_ACK);
-	}
-	/* destroy temporarily created socket */
-	if (dropsocket)
-		(void) soabort(so);
-	return;
-
-drop:
-	/*
-	 * Drop space held by incoming segment and return.
-	 */
-#ifdef TCPDEBUG
-	if (tp == 0 || (tp->t_inpcb->inp_socket->so_options & SO_DEBUG))
-		tcp_trace(TA_DROP, ostate, tp, &tcp_saveti, 0);
-#endif
-	m_freem(m);
-	/* destroy temporarily created socket */
-	if (dropsocket)
-		(void) soabort(so);
-	return;
-#ifndef TUBA_INCLUDE
-}
-
-static void
-tcp_dooptions(tp, cp, cnt, ti, to)
-	struct tcpcb *tp;
-	u_char *cp;
-	int cnt;
-	struct tcpiphdr *ti;
-	struct tcpopt *to;
-{
-	u_short mss = 0;
-	int opt, optlen;
-
-	for (; cnt > 0; cnt -= optlen, cp += optlen) {
-		opt = cp[0];
-		if (opt == TCPOPT_EOL)
-			break;
-		if (opt == TCPOPT_NOP)
-			optlen = 1;
-		else {
-			optlen = cp[1];
-			if (optlen <= 0)
-				break;
-		}
-		switch (opt) {
-
-		default:
-			continue;
-
-		case TCPOPT_MAXSEG:
-			if (optlen != TCPOLEN_MAXSEG)
-				continue;
-			if (!(ti->ti_flags & TH_SYN))
-				continue;
-			bcopy((char *) cp + 2, (char *) &mss, sizeof(mss));
-			NTOHS(mss);
-			break;
-
-		case TCPOPT_WINDOW:
-			if (optlen != TCPOLEN_WINDOW)
-				continue;
-			if (!(ti->ti_flags & TH_SYN))
-				continue;
-			tp->t_flags |= TF_RCVD_SCALE;
-			tp->requested_s_scale = min(cp[2], TCP_MAX_WINSHIFT);
-			break;
-
-		case TCPOPT_TIMESTAMP:
-			if (optlen != TCPOLEN_TIMESTAMP)
-				continue;
-			to->to_flag |= TOF_TS;
-			bcopy((char *)cp + 2,
-			    (char *)&to->to_tsval, sizeof(to->to_tsval));
-			NTOHL(to->to_tsval);
-			bcopy((char *)cp + 6,
-			    (char *)&to->to_tsecr, sizeof(to->to_tsecr));
-			NTOHL(to->to_tsecr);
-
-			/*
-			 * A timestamp received in a SYN makes
-			 * it ok to send timestamp requests and replies.
-			 */
-			if (ti->ti_flags & TH_SYN) {
-				tp->t_flags |= TF_RCVD_TSTMP;
-				tp->ts_recent = to->to_tsval;
-				tp->ts_recent_age = tcp_now;
-			}
-			break;
-		case TCPOPT_CC:
-			if (optlen != TCPOLEN_CC)
-				continue;
-			to->to_flag |= TOF_CC;
-			bcopy((char *)cp + 2,
-			    (char *)&to->to_cc, sizeof(to->to_cc));
-			NTOHL(to->to_cc);
-			/*
-			 * A CC or CC.new option received in a SYN makes
-			 * it ok to send CC in subsequent segments.
-			 */
-			if (ti->ti_flags & TH_SYN)
-				tp->t_flags |= TF_RCVD_CC;
-			break;
-		case TCPOPT_CCNEW:
-			if (optlen != TCPOLEN_CC)
-				continue;
-			if (!(ti->ti_flags & TH_SYN))
-				continue;
-			to->to_flag |= TOF_CCNEW;
-			bcopy((char *)cp + 2,
-			    (char *)&to->to_cc, sizeof(to->to_cc));
-			NTOHL(to->to_cc);
-			/*
-			 * A CC or CC.new option received in a SYN makes
-			 * it ok to send CC in subsequent segments.
-			 */
-			tp->t_flags |= TF_RCVD_CC;
-			break;
-		case TCPOPT_CCECHO:
-			if (optlen != TCPOLEN_CC)
-				continue;
-			if (!(ti->ti_flags & TH_SYN))
-				continue;
-			to->to_flag |= TOF_CCECHO;
-			bcopy((char *)cp + 2,
-			    (char *)&to->to_ccecho, sizeof(to->to_ccecho));
-			NTOHL(to->to_ccecho);
-			break;
-		}
-	}
-	if (ti->ti_flags & TH_SYN)
-		tcp_mss(tp, mss);	/* sets t_maxseg */
-}
-
-/*
- * Pull out of band byte out of a segment so
- * it doesn't appear in the user's data queue.
- * It is still reflected in the segment length for
- * sequencing purposes.
- */
-static void
-tcp_pulloutofband(so, ti, m)
-	struct socket *so;
-	struct tcpiphdr *ti;
-	register struct mbuf *m;
-{
-	int cnt = ti->ti_urp - 1;
-
-	while (cnt >= 0) {
-		if (m->m_len > cnt) {
-			char *cp = mtod(m, caddr_t) + cnt;
-			struct tcpcb *tp = sototcpcb(so);
-
-			tp->t_iobc = *cp;
-			tp->t_oobflags |= TCPOOB_HAVEDATA;
-			bcopy(cp+1, cp, (unsigned)(m->m_len - cnt - 1));
-			m->m_len--;
-			return;
-		}
-		cnt -= m->m_len;
-		m = m->m_next;
-		if (m == 0)
-			break;
-	}
-	panic("tcp_pulloutofband");
-}
-
-/*
- * Collect new round-trip time estimate
- * and update averages and current timeout.
- */
-static void
-tcp_xmit_timer(tp, rtt)
-	register struct tcpcb *tp;
-	short rtt;
-{
-	register int delta;
-
-	tcpstat.tcps_rttupdated++;
-	tp->t_rttupdated++;
-	if (tp->t_srtt != 0) {
-		/*
-		 * srtt is stored as fixed point with 5 bits after the
-		 * binary point (i.e., scaled by 8).  The following magic
-		 * is equivalent to the smoothing algorithm in rfc793 with
-		 * an alpha of .875 (srtt = rtt/8 + srtt*7/8 in fixed
-		 * point).  Adjust rtt to origin 0.
-		 */
-		delta = ((rtt - 1) << TCP_DELTA_SHIFT)
-			- (tp->t_srtt >> (TCP_RTT_SHIFT - TCP_DELTA_SHIFT));
-
-		if ((tp->t_srtt += delta) <= 0)
-			tp->t_srtt = 1;
-
-		/*
-		 * We accumulate a smoothed rtt variance (actually, a
-		 * smoothed mean difference), then set the retransmit
-		 * timer to smoothed rtt + 4 times the smoothed variance.
-		 * rttvar is stored as fixed point with 4 bits after the
-		 * binary point (scaled by 16).  The following is
-		 * equivalent to rfc793 smoothing with an alpha of .75
-		 * (rttvar = rttvar*3/4 + |delta| / 4).  This replaces
-		 * rfc793's wired-in beta.
-		 */
-		if (delta < 0)
-			delta = -delta;
-		delta -= tp->t_rttvar >> (TCP_RTTVAR_SHIFT - TCP_DELTA_SHIFT);
-		if ((tp->t_rttvar += delta) <= 0)
-			tp->t_rttvar = 1;
-	} else {
-		/*
-		 * No rtt measurement yet - use the unsmoothed rtt.
-		 * Set the variance to half the rtt (so our first
-		 * retransmit happens at 3*rtt).
-		 */
-		tp->t_srtt = rtt << TCP_RTT_SHIFT;
-		tp->t_rttvar = rtt << (TCP_RTTVAR_SHIFT - 1);
-	}
-	tp->t_rtt = 0;
-	tp->t_rxtshift = 0;
-
-	/*
-	 * the retransmit should happen at rtt + 4 * rttvar.
-	 * Because of the way we do the smoothing, srtt and rttvar
-	 * will each average +1/2 tick of bias.  When we compute
-	 * the retransmit timer, we want 1/2 tick of rounding and
-	 * 1 extra tick because of +-1/2 tick uncertainty in the
-	 * firing of the timer.  The bias will give us exactly the
-	 * 1.5 tick we need.  But, because the bias is
-	 * statistical, we have to test that we don't drop below
-	 * the minimum feasible timer (which is 2 ticks).
-	 */
-	TCPT_RANGESET(tp->t_rxtcur, TCP_REXMTVAL(tp),
-		      max(tp->t_rttmin, rtt + 2), TCPTV_REXMTMAX);
-
-	/*
-	 * We received an ack for a packet that wasn't retransmitted;
-	 * it is probably safe to discard any error indications we've
-	 * received recently.  This isn't quite right, but close enough
-	 * for now (a route might have failed after we sent a segment,
-	 * and the return path might not be symmetrical).
-	 */
-	tp->t_softerror = 0;
-}
-
-/*
- * Determine a reasonable value for maxseg size.
- * If the route is known, check route for mtu.
- * If none, use an mss that can be handled on the outgoing
- * interface without forcing IP to fragment; if bigger than
- * an mbuf cluster (MCLBYTES), round down to nearest multiple of MCLBYTES
- * to utilize large mbufs.  If no route is found, route has no mtu,
- * or the destination isn't local, use a default, hopefully conservative
- * size (usually 512 or the default IP max size, but no more than the mtu
- * of the interface), as we can't discover anything about intervening
- * gateways or networks.  We also initialize the congestion/slow start
- * window to be a single segment if the destination isn't local.
- * While looking at the routing entry, we also initialize other path-dependent
- * parameters from pre-set or cached values in the routing entry.
- *
- * Also take into account the space needed for options that we
- * send regularly.  Make maxseg shorter by that amount to assure
- * that we can send maxseg amount of data even when the options
- * are present.  Store the upper limit of the length of options plus
- * data in maxopd.
- *
- * NOTE that this routine is only called when we process an incoming
- * segment, for outgoing segments only tcp_mssopt is called.
- *
- * In case of T/TCP, we call this routine during implicit connection
- * setup as well (offer = -1), to initialize maxseg from the cached
- * MSS of our peer.
- */
-void
-tcp_mss(tp, offer)
-	struct tcpcb *tp;
-	int offer;
-{
-	register struct rtentry *rt;
-	struct ifnet *ifp;
-	register int rtt, mss;
-	u_long bufsize;
-	struct inpcb *inp;
-	struct socket *so;
-	struct rmxp_tao *taop;
-	int origoffer = offer;
-
-	inp = tp->t_inpcb;
-	if ((rt = tcp_rtlookup(inp)) == NULL) {
-		tp->t_maxopd = tp->t_maxseg = tcp_mssdflt;
-		return;
-	}
-	ifp = rt->rt_ifp;
-	so = inp->inp_socket;
-
-	taop = rmx_taop(rt->rt_rmx);
-	/*
-	 * Offer == -1 means that we didn't receive SYN yet,
-	 * use cached value in that case;
-	 */
-	if (offer == -1)
-		offer = taop->tao_mssopt;
-	/*
-	 * Offer == 0 means that there was no MSS on the SYN segment,
-	 * in this case we use tcp_mssdflt.
-	 */
-	if (offer == 0)
-		offer = tcp_mssdflt;
-	else
-		/*
-		 * Sanity check: make sure that maxopd will be large
-		 * enough to allow some data on segments even is the
-		 * all the option space is used (40bytes).  Otherwise
-		 * funny things may happen in tcp_output.
-		 */
-		offer = max(offer, 64);
-	taop->tao_mssopt = offer;
-
-	/*
-	 * While we're here, check if there's an initial rtt
-	 * or rttvar.  Convert from the route-table units
-	 * to scaled multiples of the slow timeout timer.
-	 */
-	if (tp->t_srtt == 0 && (rtt = rt->rt_rmx.rmx_rtt)) {
-		/*
-		 * XXX the lock bit for RTT indicates that the value
-		 * is also a minimum value; this is subject to time.
-		 */
-		if (rt->rt_rmx.rmx_locks & RTV_RTT)
-			tp->t_rttmin = rtt / (RTM_RTTUNIT / PR_SLOWHZ);
-		tp->t_srtt = rtt / (RTM_RTTUNIT / (PR_SLOWHZ * TCP_RTT_SCALE));
-		tcpstat.tcps_usedrtt++;
-		if (rt->rt_rmx.rmx_rttvar) {
-			tp->t_rttvar = rt->rt_rmx.rmx_rttvar /
-			    (RTM_RTTUNIT / (PR_SLOWHZ * TCP_RTTVAR_SCALE));
-			tcpstat.tcps_usedrttvar++;
-		} else {
-			/* default variation is +- 1 rtt */
-			tp->t_rttvar =
-			    tp->t_srtt * TCP_RTTVAR_SCALE / TCP_RTT_SCALE;
-		}
-		TCPT_RANGESET(tp->t_rxtcur,
-		    ((tp->t_srtt >> 2) + tp->t_rttvar) >> 1,
-		    tp->t_rttmin, TCPTV_REXMTMAX);
-	}
-	/*
-	 * if there's an mtu associated with the route, use it
-	 */
-	if (rt->rt_rmx.rmx_mtu)
-		mss = rt->rt_rmx.rmx_mtu - sizeof(struct tcpiphdr);
-	else
-	{
-		mss = ifp->if_mtu - sizeof(struct tcpiphdr);
-		if (!in_localaddr(inp->inp_faddr))
-			mss = min(mss, tcp_mssdflt);
-	}
-	mss = min(mss, offer);
-	/*
-	 * maxopd stores the maximum length of data AND options
-	 * in a segment; maxseg is the amount of data in a normal
-	 * segment.  We need to store this value (maxopd) apart
-	 * from maxseg, because now every segment carries options
-	 * and thus we normally have somewhat less data in segments.
-	 */
-	tp->t_maxopd = mss;
-
-	/*
-	 * In case of T/TCP, origoffer==-1 indicates, that no segments
-	 * were received yet.  In this case we just guess, otherwise
-	 * we do the same as before T/TCP.
-	 */
- 	if ((tp->t_flags & (TF_REQ_TSTMP|TF_NOOPT)) == TF_REQ_TSTMP &&
-	    (origoffer == -1 ||
-	     (tp->t_flags & TF_RCVD_TSTMP) == TF_RCVD_TSTMP))
-		mss -= TCPOLEN_TSTAMP_APPA;
- 	if ((tp->t_flags & (TF_REQ_CC|TF_NOOPT)) == TF_REQ_CC &&
-	    (origoffer == -1 ||
-	     (tp->t_flags & TF_RCVD_CC) == TF_RCVD_CC))
-		mss -= TCPOLEN_CC_APPA;
-
-#if	(MCLBYTES & (MCLBYTES - 1)) == 0
-		if (mss > MCLBYTES)
-			mss &= ~(MCLBYTES-1);
-#else
-		if (mss > MCLBYTES)
-			mss = mss / MCLBYTES * MCLBYTES;
-#endif
-	/*
-	 * If there's a pipesize, change the socket buffer
-	 * to that size.  Make the socket buffers an integral
-	 * number of mss units; if the mss is larger than
-	 * the socket buffer, decrease the mss.
-	 */
-#ifdef RTV_SPIPE
-	if ((bufsize = rt->rt_rmx.rmx_sendpipe) == 0)
-#endif
-		bufsize = so->so_snd.sb_hiwat;
-	if (bufsize < mss)
-		mss = bufsize;
-	else {
-		bufsize = roundup(bufsize, mss);
-		if (bufsize > sb_max)
-			bufsize = sb_max;
-		(void)sbreserve(&so->so_snd, bufsize);
-	}
-	tp->t_maxseg = mss;
-
-#ifdef RTV_RPIPE
-	if ((bufsize = rt->rt_rmx.rmx_recvpipe) == 0)
-#endif
-		bufsize = so->so_rcv.sb_hiwat;
-	if (bufsize > mss) {
-		bufsize = roundup(bufsize, mss);
-		if (bufsize > sb_max)
-			bufsize = sb_max;
-		(void)sbreserve(&so->so_rcv, bufsize);
-	}
-	/*
-	 * Don't force slow-start on local network.
-	 */
-	if (!in_localaddr(inp->inp_faddr))
-		tp->snd_cwnd = mss;
-
-	if (rt->rt_rmx.rmx_ssthresh) {
-		/*
-		 * There's some sort of gateway or interface
-		 * buffer limit on the path.  Use this to set
-		 * the slow start threshhold, but set the
-		 * threshold to no less than 2*mss.
-		 */
-		tp->snd_ssthresh = max(2 * mss, rt->rt_rmx.rmx_ssthresh);
-		tcpstat.tcps_usedssthresh++;
-	}
-}
-
-/*
- * Determine the MSS option to send on an outgoing SYN.
- */
-int
-tcp_mssopt(tp)
-	struct tcpcb *tp;
-{
-	struct rtentry *rt;
-
-	rt = tcp_rtlookup(tp->t_inpcb);
-	if (rt == NULL)
-		return tcp_mssdflt;
-
-	return rt->rt_ifp->if_mtu - sizeof(struct tcpiphdr);
-}
-#endif /* TUBA_INCLUDE */
diff --git a/c/src/libnetworking/netinet/tcp_output.c b/c/src/libnetworking/netinet/tcp_output.c
deleted file mode 100644
index cbb5218dce..0000000000
--- a/c/src/libnetworking/netinet/tcp_output.c
+++ /dev/null
@@ -1,755 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1988, 1990, 1993, 1995
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)tcp_output.c	8.4 (Berkeley) 5/24/95
- *	$Id$
- */
-
-#include "opt_tcpdebug.h"
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/systm.h>
-#include <sys/malloc.h>
-#include <sys/mbuf.h>
-#include <sys/protosw.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/errno.h>
-
-#include <net/route.h>
-
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/in_pcb.h>
-#include <netinet/ip_var.h>
-#include <netinet/tcp.h>
-#define	TCPOUTFLAGS
-#include <netinet/tcp_fsm.h>
-#include <netinet/tcp_seq.h>
-#include <netinet/tcp_timer.h>
-#include <netinet/tcp_var.h>
-#include <netinet/tcpip.h>
-#ifdef TCPDEBUG
-#include <netinet/tcp_debug.h>
-#endif
-
-#ifdef notyet
-extern struct mbuf *m_copypack();
-#endif
-
-
-/*
- * Tcp output routine: figure out what should be sent and send it.
- */
-int
-tcp_output(tp)
-	register struct tcpcb *tp;
-{
-	register struct socket *so = tp->t_inpcb->inp_socket;
-	register long len, win;
-	int off, flags, error;
-	register struct mbuf *m;
-	register struct tcpiphdr *ti;
-	u_char opt[TCP_MAXOLEN];
-	unsigned optlen, hdrlen;
-	int idle, sendalot;
-	struct rmxp_tao *taop;
-	struct rmxp_tao tao_noncached;
-
-	/*
-	 * Determine length of data that should be transmitted,
-	 * and flags that will be used.
-	 * If there is some data or critical controls (SYN, RST)
-	 * to send, then transmit; otherwise, investigate further.
-	 */
-	idle = (tp->snd_max == tp->snd_una);
-	if (idle && tp->t_idle >= tp->t_rxtcur)
-		/*
-		 * We have been idle for "a while" and no acks are
-		 * expected to clock out any data we send --
-		 * slow start to get ack "clock" running again.
-		 */
-		tp->snd_cwnd = tp->t_maxseg;
-again:
-	sendalot = 0;
-	off = tp->snd_nxt - tp->snd_una;
-	win = min(tp->snd_wnd, tp->snd_cwnd);
-
-	flags = tcp_outflags[tp->t_state];
-	/*
-	 * Get standard flags, and add SYN or FIN if requested by 'hidden'
-	 * state flags.
-	 */
-	if (tp->t_flags & TF_NEEDFIN)
-		flags |= TH_FIN;
-	if (tp->t_flags & TF_NEEDSYN)
-		flags |= TH_SYN;
-
-	/*
-	 * If in persist timeout with window of 0, send 1 byte.
-	 * Otherwise, if window is small but nonzero
-	 * and timer expired, we will send what we can
-	 * and go to transmit state.
-	 */
-	if (tp->t_force) {
-		if (win == 0) {
-			/*
-			 * If we still have some data to send, then
-			 * clear the FIN bit.  Usually this would
-			 * happen below when it realizes that we
-			 * aren't sending all the data.  However,
-			 * if we have exactly 1 byte of unset data,
-			 * then it won't clear the FIN bit below,
-			 * and if we are in persist state, we wind
-			 * up sending the packet without recording
-			 * that we sent the FIN bit.
-			 *
-			 * We can't just blindly clear the FIN bit,
-			 * because if we don't have any more data
-			 * to send then the probe will be the FIN
-			 * itself.
-			 */
-			if (off < so->so_snd.sb_cc)
-				flags &= ~TH_FIN;
-			win = 1;
-		} else {
-			tp->t_timer[TCPT_PERSIST] = 0;
-			tp->t_rxtshift = 0;
-		}
-	}
-
-	len = min(so->so_snd.sb_cc, win) - off;
-
-	if ((taop = tcp_gettaocache(tp->t_inpcb)) == NULL) {
-		taop = &tao_noncached;
-		bzero(taop, sizeof(*taop));
-	}
-
-	/*
-	 * Lop off SYN bit if it has already been sent.  However, if this
-	 * is SYN-SENT state and if segment contains data and if we don't
-	 * know that foreign host supports TAO, suppress sending segment.
-	 */
-	if ((flags & TH_SYN) && SEQ_GT(tp->snd_nxt, tp->snd_una)) {
-		flags &= ~TH_SYN;
-		off--, len++;
-		if (len > 0 && tp->t_state == TCPS_SYN_SENT &&
-		    taop->tao_ccsent == 0)
-			return 0;
-	}
-
-	/*
-	 * Be careful not to send data and/or FIN on SYN segments
-	 * in cases when no CC option will be sent.
-	 * This measure is needed to prevent interoperability problems
-	 * with not fully conformant TCP implementations.
-	 */
-	if ((flags & TH_SYN) &&
-	    ((tp->t_flags & TF_NOOPT) || !(tp->t_flags & TF_REQ_CC) ||
-	     ((flags & TH_ACK) && !(tp->t_flags & TF_RCVD_CC)))) {
-		len = 0;
-		flags &= ~TH_FIN;
-	}
-
-	if (len < 0) {
-		/*
-		 * If FIN has been sent but not acked,
-		 * but we haven't been called to retransmit,
-		 * len will be -1.  Otherwise, window shrank
-		 * after we sent into it.  If window shrank to 0,
-		 * cancel pending retransmit, pull snd_nxt back
-		 * to (closed) window, and set the persist timer
-		 * if it isn't already going.  If the window didn't
-		 * close completely, just wait for an ACK.
-		 */
-		len = 0;
-		if (win == 0) {
-			tp->t_timer[TCPT_REXMT] = 0;
-			tp->t_rxtshift = 0;
-			tp->snd_nxt = tp->snd_una;
-			if (tp->t_timer[TCPT_PERSIST] == 0)
-				tcp_setpersist(tp);
-		}
-	}
-	if (len > tp->t_maxseg) {
-		len = tp->t_maxseg;
-		sendalot = 1;
-	}
-	if (SEQ_LT(tp->snd_nxt + len, tp->snd_una + so->so_snd.sb_cc))
-		flags &= ~TH_FIN;
-
-	win = sbspace(&so->so_rcv);
-
-	/*
-	 * Sender silly window avoidance.  If connection is idle
-	 * and can send all data, a maximum segment,
-	 * at least a maximum default-size segment do it,
-	 * or are forced, do it; otherwise don't bother.
-	 * If peer's buffer is tiny, then send
-	 * when window is at least half open.
-	 * If retransmitting (possibly after persist timer forced us
-	 * to send into a small window), then must resend.
-	 */
-	if (len) {
-		if (len == tp->t_maxseg)
-			goto send;
-		if ((idle || tp->t_flags & TF_NODELAY) &&
-		    (tp->t_flags & TF_NOPUSH) == 0 &&
-		    len + off >= so->so_snd.sb_cc)
-			goto send;
-		if (tp->t_force)
-			goto send;
-		if (len >= tp->max_sndwnd / 2 && tp->max_sndwnd > 0)
-			goto send;
-		if (SEQ_LT(tp->snd_nxt, tp->snd_max))
-			goto send;
-	}
-
-	/*
-	 * Compare available window to amount of window
-	 * known to peer (as advertised window less
-	 * next expected input).  If the difference is at least two
-	 * max size segments, or at least 50% of the maximum possible
-	 * window, then want to send a window update to peer.
-	 */
-	if (win > 0) {
-		/*
-		 * "adv" is the amount we can increase the window,
-		 * taking into account that we are limited by
-		 * TCP_MAXWIN << tp->rcv_scale.
-		 */
-		long adv = min(win, (long)TCP_MAXWIN << tp->rcv_scale) -
-			(tp->rcv_adv - tp->rcv_nxt);
-
-		if (adv >= (long) (2 * tp->t_maxseg))
-			goto send;
-		if (2 * adv >= (long) so->so_rcv.sb_hiwat)
-			goto send;
-	}
-
-	/*
-	 * Send if we owe peer an ACK.
-	 */
-	if (tp->t_flags & TF_ACKNOW)
-		goto send;
-	if ((flags & TH_RST) ||
-	    ((flags & TH_SYN) && (tp->t_flags & TF_NEEDSYN) == 0))
-		goto send;
-	if (SEQ_GT(tp->snd_up, tp->snd_una))
-		goto send;
-	/*
-	 * If our state indicates that FIN should be sent
-	 * and we have not yet done so, or we're retransmitting the FIN,
-	 * then we need to send.
-	 */
-	if (flags & TH_FIN &&
-	    ((tp->t_flags & TF_SENTFIN) == 0 || tp->snd_nxt == tp->snd_una))
-		goto send;
-
-	/*
-	 * TCP window updates are not reliable, rather a polling protocol
-	 * using ``persist'' packets is used to insure receipt of window
-	 * updates.  The three ``states'' for the output side are:
-	 *	idle			not doing retransmits or persists
-	 *	persisting		to move a small or zero window
-	 *	(re)transmitting	and thereby not persisting
-	 *
-	 * tp->t_timer[TCPT_PERSIST]
-	 *	is set when we are in persist state.
-	 * tp->t_force
-	 *	is set when we are called to send a persist packet.
-	 * tp->t_timer[TCPT_REXMT]
-	 *	is set when we are retransmitting
-	 * The output side is idle when both timers are zero.
-	 *
-	 * If send window is too small, there is data to transmit, and no
-	 * retransmit or persist is pending, then go to persist state.
-	 * If nothing happens soon, send when timer expires:
-	 * if window is nonzero, transmit what we can,
-	 * otherwise force out a byte.
-	 */
-	if (so->so_snd.sb_cc && tp->t_timer[TCPT_REXMT] == 0 &&
-	    tp->t_timer[TCPT_PERSIST] == 0) {
-		tp->t_rxtshift = 0;
-		tcp_setpersist(tp);
-	}
-
-	/*
-	 * No reason to send a segment, just return.
-	 */
-	return (0);
-
-send:
-	/*
-	 * Before ESTABLISHED, force sending of initial options
-	 * unless TCP set not to do any options.
-	 * NOTE: we assume that the IP/TCP header plus TCP options
-	 * always fit in a single mbuf, leaving room for a maximum
-	 * link header, i.e.
-	 *	max_linkhdr + sizeof (struct tcpiphdr) + optlen <= MHLEN
-	 */
-	optlen = 0;
-	hdrlen = sizeof (struct tcpiphdr);
-	if (flags & TH_SYN) {
-		tp->snd_nxt = tp->iss;
-		if ((tp->t_flags & TF_NOOPT) == 0) {
-			u_short mss;
-
-			opt[0] = TCPOPT_MAXSEG;
-			opt[1] = TCPOLEN_MAXSEG;
-			mss = htons((u_short) tcp_mssopt(tp));
-			(void)memcpy(opt + 2, &mss, sizeof(mss));
-			optlen = TCPOLEN_MAXSEG;
-
-			if ((tp->t_flags & TF_REQ_SCALE) &&
-			    ((flags & TH_ACK) == 0 ||
-			    (tp->t_flags & TF_RCVD_SCALE))) {
-				*((u_long *) (opt + optlen)) = htonl(
-					TCPOPT_NOP << 24 |
-					TCPOPT_WINDOW << 16 |
-					TCPOLEN_WINDOW << 8 |
-					tp->request_r_scale);
-				optlen += 4;
-			}
-		}
- 	}
-
- 	/*
-	 * Send a timestamp and echo-reply if this is a SYN and our side
-	 * wants to use timestamps (TF_REQ_TSTMP is set) or both our side
-	 * and our peer have sent timestamps in our SYN's.
- 	 */
- 	if ((tp->t_flags & (TF_REQ_TSTMP|TF_NOOPT)) == TF_REQ_TSTMP &&
- 	    (flags & TH_RST) == 0 &&
-	    ((flags & TH_ACK) == 0 ||
-	     (tp->t_flags & TF_RCVD_TSTMP))) {
-		u_long *lp = (u_long *)(opt + optlen);
-
- 		/* Form timestamp option as shown in appendix A of RFC 1323. */
- 		*lp++ = htonl(TCPOPT_TSTAMP_HDR);
- 		*lp++ = htonl(tcp_now);
- 		*lp   = htonl(tp->ts_recent);
- 		optlen += TCPOLEN_TSTAMP_APPA;
- 	}
-
- 	/*
-	 * Send `CC-family' options if our side wants to use them (TF_REQ_CC),
-	 * options are allowed (!TF_NOOPT) and it's not a RST.
- 	 */
- 	if ((tp->t_flags & (TF_REQ_CC|TF_NOOPT)) == TF_REQ_CC &&
- 	     (flags & TH_RST) == 0) {
-		switch (flags & (TH_SYN|TH_ACK)) {
-		/*
-		 * This is a normal ACK, send CC if we received CC before
-		 * from our peer.
-		 */
-		case TH_ACK:
-			if (!(tp->t_flags & TF_RCVD_CC))
-				break;
-			/*FALLTHROUGH*/
-
-		/*
-		 * We can only get here in T/TCP's SYN_SENT* state, when
-		 * we're a sending a non-SYN segment without waiting for
-		 * the ACK of our SYN.  A check above assures that we only
-		 * do this if our peer understands T/TCP.
-		 */
-		case 0:
-			opt[optlen++] = TCPOPT_NOP;
-			opt[optlen++] = TCPOPT_NOP;
-			opt[optlen++] = TCPOPT_CC;
-			opt[optlen++] = TCPOLEN_CC;
-			*(u_int32_t *)&opt[optlen] = htonl(tp->cc_send);
-
-			optlen += 4;
-			break;
-
-		/*
-		 * This is our initial SYN, check whether we have to use
-		 * CC or CC.new.
-		 */
-		case TH_SYN:
-			opt[optlen++] = TCPOPT_NOP;
-			opt[optlen++] = TCPOPT_NOP;
-			opt[optlen++] = tp->t_flags & TF_SENDCCNEW ?
-						TCPOPT_CCNEW : TCPOPT_CC;
-			opt[optlen++] = TCPOLEN_CC;
-			*(u_int32_t *)&opt[optlen] = htonl(tp->cc_send);
- 			optlen += 4;
-			break;
-
-		/*
-		 * This is a SYN,ACK; send CC and CC.echo if we received
-		 * CC from our peer.
-		 */
-		case (TH_SYN|TH_ACK):
-			if (tp->t_flags & TF_RCVD_CC) {
-				opt[optlen++] = TCPOPT_NOP;
-				opt[optlen++] = TCPOPT_NOP;
-				opt[optlen++] = TCPOPT_CC;
-				opt[optlen++] = TCPOLEN_CC;
-				*(u_int32_t *)&opt[optlen] =
-					htonl(tp->cc_send);
-				optlen += 4;
-				opt[optlen++] = TCPOPT_NOP;
-				opt[optlen++] = TCPOPT_NOP;
-				opt[optlen++] = TCPOPT_CCECHO;
-				opt[optlen++] = TCPOLEN_CC;
-				*(u_int32_t *)&opt[optlen] =
-					htonl(tp->cc_recv);
-				optlen += 4;
-			}
-			break;
-		}
- 	}
-
- 	hdrlen += optlen;
-
-	/*
-	 * Adjust data length if insertion of options will
-	 * bump the packet length beyond the t_maxopd length.
-	 * Clear the FIN bit because we cut off the tail of
-	 * the segment.
-	 */
-	 if (len + optlen > tp->t_maxopd) {
-		/*
-		 * If there is still more to send, don't close the connection.
-		 */
-		flags &= ~TH_FIN;
-		len = tp->t_maxopd - optlen;
-		sendalot = 1;
-	}
-
-/*#ifdef DIAGNOSTIC*/
- 	if (max_linkhdr + hdrlen > MHLEN)
-		panic("tcphdr too big");
-/*#endif*/
-
-	/*
-	 * Grab a header mbuf, attaching a copy of data to
-	 * be transmitted, and initialize the header from
-	 * the template for sends on this connection.
-	 */
-	if (len) {
-		if (tp->t_force && len == 1)
-			tcpstat.tcps_sndprobe++;
-		else if (SEQ_LT(tp->snd_nxt, tp->snd_max)) {
-			tcpstat.tcps_sndrexmitpack++;
-			tcpstat.tcps_sndrexmitbyte += len;
-		} else {
-			tcpstat.tcps_sndpack++;
-			tcpstat.tcps_sndbyte += len;
-		}
-#ifdef notyet
-		if ((m = m_copypack(so->so_snd.sb_mb, off,
-		    (int)len, max_linkhdr + hdrlen)) == 0) {
-			error = ENOBUFS;
-			goto out;
-		}
-		/*
-		 * m_copypack left space for our hdr; use it.
-		 */
-		m->m_len += hdrlen;
-		m->m_data -= hdrlen;
-#else
-		MGETHDR(m, M_DONTWAIT, MT_HEADER);
-		if (m == NULL) {
-			error = ENOBUFS;
-			goto out;
-		}
-		m->m_data += max_linkhdr;
-		m->m_len = hdrlen;
-		if (len <= MHLEN - hdrlen - max_linkhdr) {
-			m_copydata(so->so_snd.sb_mb, off, (int) len,
-			    mtod(m, caddr_t) + hdrlen);
-			m->m_len += len;
-		} else {
-			m->m_next = m_copy(so->so_snd.sb_mb, off, (int) len);
-			if (m->m_next == 0) {
-				(void) m_free(m);
-				error = ENOBUFS;
-				goto out;
-			}
-		}
-#endif
-		/*
-		 * If we're sending everything we've got, set PUSH.
-		 * (This will keep happy those implementations which only
-		 * give data to the user when a buffer fills or
-		 * a PUSH comes in.)
-		 */
-		if (off + len == so->so_snd.sb_cc)
-			flags |= TH_PUSH;
-	} else {
-		if (tp->t_flags & TF_ACKNOW)
-			tcpstat.tcps_sndacks++;
-		else if (flags & (TH_SYN|TH_FIN|TH_RST))
-			tcpstat.tcps_sndctrl++;
-		else if (SEQ_GT(tp->snd_up, tp->snd_una))
-			tcpstat.tcps_sndurg++;
-		else
-			tcpstat.tcps_sndwinup++;
-
-		MGETHDR(m, M_DONTWAIT, MT_HEADER);
-		if (m == NULL) {
-			error = ENOBUFS;
-			goto out;
-		}
-		m->m_data += max_linkhdr;
-		m->m_len = hdrlen;
-	}
-	m->m_pkthdr.rcvif = (struct ifnet *)0;
-	ti = mtod(m, struct tcpiphdr *);
-	if (tp->t_template == 0)
-		panic("tcp_output");
-	(void)memcpy(ti, tp->t_template, sizeof (struct tcpiphdr));
-
-	/*
-	 * Fill in fields, remembering maximum advertised
-	 * window for use in delaying messages about window sizes.
-	 * If resending a FIN, be sure not to use a new sequence number.
-	 */
-	if (flags & TH_FIN && tp->t_flags & TF_SENTFIN &&
-	    tp->snd_nxt == tp->snd_max)
-		tp->snd_nxt--;
-	/*
-	 * If we are doing retransmissions, then snd_nxt will
-	 * not reflect the first unsent octet.  For ACK only
-	 * packets, we do not want the sequence number of the
-	 * retransmitted packet, we want the sequence number
-	 * of the next unsent octet.  So, if there is no data
-	 * (and no SYN or FIN), use snd_max instead of snd_nxt
-	 * when filling in ti_seq.  But if we are in persist
-	 * state, snd_max might reflect one byte beyond the
-	 * right edge of the window, so use snd_nxt in that
-	 * case, since we know we aren't doing a retransmission.
-	 * (retransmit and persist are mutually exclusive...)
-	 */
-	if (len || (flags & (TH_SYN|TH_FIN)) || tp->t_timer[TCPT_PERSIST])
-		ti->ti_seq = htonl(tp->snd_nxt);
-	else
-		ti->ti_seq = htonl(tp->snd_max);
-	ti->ti_ack = htonl(tp->rcv_nxt);
-	if (optlen) {
-		bcopy(opt, ti + 1, optlen);
-		ti->ti_off = (sizeof (struct tcphdr) + optlen) >> 2;
-	}
-	ti->ti_flags = flags;
-	/*
-	 * Calculate receive window.  Don't shrink window,
-	 * but avoid silly window syndrome.
-	 */
-	if (win < (long)(so->so_rcv.sb_hiwat / 4) && win < (long)tp->t_maxseg)
-		win = 0;
-	if (win < (long)(tp->rcv_adv - tp->rcv_nxt))
-		win = (long)(tp->rcv_adv - tp->rcv_nxt);
-	if (win > (long)TCP_MAXWIN << tp->rcv_scale)
-		win = (long)TCP_MAXWIN << tp->rcv_scale;
-	ti->ti_win = htons((u_short) (win>>tp->rcv_scale));
-	if (SEQ_GT(tp->snd_up, tp->snd_nxt)) {
-		ti->ti_urp = htons((u_short)(tp->snd_up - tp->snd_nxt));
-		ti->ti_flags |= TH_URG;
-	} else
-		/*
-		 * If no urgent pointer to send, then we pull
-		 * the urgent pointer to the left edge of the send window
-		 * so that it doesn't drift into the send window on sequence
-		 * number wraparound.
-		 */
-		tp->snd_up = tp->snd_una;		/* drag it along */
-
-	/*
-	 * Put TCP length in extended header, and then
-	 * checksum extended header and data.
-	 */
-	if (len + optlen)
-		ti->ti_len = htons((u_short)(sizeof (struct tcphdr) +
-		    optlen + len));
-	ti->ti_sum = in_cksum(m, (int)(hdrlen + len));
-
-	/*
-	 * In transmit state, time the transmission and arrange for
-	 * the retransmit.  In persist state, just set snd_max.
-	 */
-	if (tp->t_force == 0 || tp->t_timer[TCPT_PERSIST] == 0) {
-		tcp_seq startseq = tp->snd_nxt;
-
-		/*
-		 * Advance snd_nxt over sequence space of this segment.
-		 */
-		if (flags & (TH_SYN|TH_FIN)) {
-			if (flags & TH_SYN)
-				tp->snd_nxt++;
-			if (flags & TH_FIN) {
-				tp->snd_nxt++;
-				tp->t_flags |= TF_SENTFIN;
-			}
-		}
-		tp->snd_nxt += len;
-		if (SEQ_GT(tp->snd_nxt, tp->snd_max)) {
-			tp->snd_max = tp->snd_nxt;
-			/*
-			 * Time this transmission if not a retransmission and
-			 * not currently timing anything.
-			 */
-			if (tp->t_rtt == 0) {
-				tp->t_rtt = 1;
-				tp->t_rtseq = startseq;
-				tcpstat.tcps_segstimed++;
-			}
-		}
-
-		/*
-		 * Set retransmit timer if not currently set,
-		 * and not doing an ack or a keep-alive probe.
-		 * Initial value for retransmit timer is smoothed
-		 * round-trip time + 2 * round-trip time variance.
-		 * Initialize shift counter which is used for backoff
-		 * of retransmit time.
-		 */
-		if (tp->t_timer[TCPT_REXMT] == 0 &&
-		    tp->snd_nxt != tp->snd_una) {
-			tp->t_timer[TCPT_REXMT] = tp->t_rxtcur;
-			if (tp->t_timer[TCPT_PERSIST]) {
-				tp->t_timer[TCPT_PERSIST] = 0;
-				tp->t_rxtshift = 0;
-			}
-		}
-	} else
-		if (SEQ_GT(tp->snd_nxt + len, tp->snd_max))
-			tp->snd_max = tp->snd_nxt + len;
-
-#ifdef TCPDEBUG
-	/*
-	 * Trace.
-	 */
-	if (so->so_options & SO_DEBUG)
-		tcp_trace(TA_OUTPUT, tp->t_state, tp, ti, 0);
-#endif
-
-	/*
-	 * Fill in IP length and desired time to live and
-	 * send to IP level.  There should be a better way
-	 * to handle ttl and tos; we could keep them in
-	 * the template, but need a way to checksum without them.
-	 */
-	m->m_pkthdr.len = hdrlen + len;
-#ifdef TUBA
-	if (tp->t_tuba_pcb)
-		error = tuba_output(m, tp);
-	else
-#endif
-    {
-#if 1
-	struct rtentry *rt;
-#endif
-	((struct ip *)ti)->ip_len = m->m_pkthdr.len;
-	((struct ip *)ti)->ip_ttl = tp->t_inpcb->inp_ip_ttl;	/* XXX */
-	((struct ip *)ti)->ip_tos = tp->t_inpcb->inp_ip_tos;	/* XXX */
-#if 1
-	/*
-	 * See if we should do MTU discovery.  We do it only if the following
-	 * are true:
-	 *	1) we have a valid route to the destination
-	 *	2) the MTU is not locked (if it is, then discovery has been
-	 *	   disabled)
-	 */
-	if ((rt = tp->t_inpcb->inp_route.ro_rt)
-	    && rt->rt_flags & RTF_UP
-	    && !(rt->rt_rmx.rmx_locks & RTV_MTU)) {
-		((struct ip *)ti)->ip_off |= IP_DF;
-	}
-#endif
-	error = ip_output(m, tp->t_inpcb->inp_options, &tp->t_inpcb->inp_route,
-	    so->so_options & SO_DONTROUTE, 0);
-    }
-	if (error) {
-out:
-		if (error == ENOBUFS) {
-			tcp_quench(tp->t_inpcb, 0);
-			return (0);
-		}
-#if 1
-		if (error == EMSGSIZE) {
-			/*
-			 * ip_output() will have already fixed the route
-			 * for us.  tcp_mtudisc() will, as its last action,
-			 * initiate retransmission, so it is important to
-			 * not do so here.
-			 */
-			tcp_mtudisc(tp->t_inpcb, 0);
-			return 0;
-		}
-#endif
-		if ((error == EHOSTUNREACH || error == ENETDOWN)
-		    && TCPS_HAVERCVDSYN(tp->t_state)) {
-			tp->t_softerror = error;
-			return (0);
-		}
-		return (error);
-	}
-	tcpstat.tcps_sndtotal++;
-
-	/*
-	 * Data sent (as far as we can tell).
-	 * If this advertises a larger window than any other segment,
-	 * then remember the size of the advertised window.
-	 * Any pending ACK has now been sent.
-	 */
-	if (win > 0 && SEQ_GT(tp->rcv_nxt+win, tp->rcv_adv))
-		tp->rcv_adv = tp->rcv_nxt + win;
-	tp->last_ack_sent = tp->rcv_nxt;
-	tp->t_flags &= ~(TF_ACKNOW|TF_DELACK);
-	if (sendalot)
-		goto again;
-	return (0);
-}
-
-void
-tcp_setpersist(tp)
-	register struct tcpcb *tp;
-{
-	register int t = ((tp->t_srtt >> 2) + tp->t_rttvar) >> 1;
-
-	if (tp->t_timer[TCPT_REXMT])
-		panic("tcp_output REXMT");
-	/*
-	 * Start/restart persistance timer.
-	 */
-	TCPT_RANGESET(tp->t_timer[TCPT_PERSIST],
-	    t * tcp_backoff[tp->t_rxtshift],
-	    TCPTV_PERSMIN, TCPTV_PERSMAX);
-	if (tp->t_rxtshift < TCP_MAXRXTSHIFT)
-		tp->t_rxtshift++;
-}
diff --git a/c/src/libnetworking/netinet/tcp_seq.h b/c/src/libnetworking/netinet/tcp_seq.h
deleted file mode 100644
index 8cccf199e1..0000000000
--- a/c/src/libnetworking/netinet/tcp_seq.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993, 1995
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)tcp_seq.h	8.3 (Berkeley) 6/21/95
- *	$Id$
- */
-
-#ifndef _NETINET_TCP_SEQ_H_
-#define _NETINET_TCP_SEQ_H_
-/*
- * TCP sequence numbers are 32 bit integers operated
- * on with modular arithmetic.  These macros can be
- * used to compare such integers.
- */
-#define	SEQ_LT(a,b)	((int)((a)-(b)) < 0)
-#define	SEQ_LEQ(a,b)	((int)((a)-(b)) <= 0)
-#define	SEQ_GT(a,b)	((int)((a)-(b)) > 0)
-#define	SEQ_GEQ(a,b)	((int)((a)-(b)) >= 0)
-
-/* for modulo comparisons of timestamps */
-#define TSTMP_LT(a,b)	((int)((a)-(b)) < 0)
-#define TSTMP_GEQ(a,b)	((int)((a)-(b)) >= 0)
-
-/*
- * TCP connection counts are 32 bit integers operated
- * on with modular arithmetic.  These macros can be
- * used to compare such integers.
- */
-#define	CC_LT(a,b)	((int)((a)-(b)) < 0)
-#define	CC_LEQ(a,b)	((int)((a)-(b)) <= 0)
-#define	CC_GT(a,b)	((int)((a)-(b)) > 0)
-#define	CC_GEQ(a,b)	((int)((a)-(b)) >= 0)
-
-/* Macro to increment a CC: skip 0 which has a special meaning */
-#define CC_INC(c)	(++(c) == 0 ? ++(c) : (c))
-
-/*
- * Macros to initialize tcp sequence numbers for
- * send and receive from initial send and receive
- * sequence numbers.
- */
-#define	tcp_rcvseqinit(tp) \
-	(tp)->rcv_adv = (tp)->rcv_nxt = (tp)->irs + 1
-
-#define	tcp_sendseqinit(tp) \
-	(tp)->snd_una = (tp)->snd_nxt = (tp)->snd_max = (tp)->snd_up = \
-	    (tp)->iss
-
-#define TCP_PAWS_IDLE	(24 * 24 * 60 * 60 * PR_SLOWHZ)
-					/* timestamp wrap-around time */
-
-#ifdef KERNEL
-extern tcp_cc	tcp_ccgen;		/* global connection count */
-
-/*
- * Increment for tcp_iss each second.
- * This is designed to increment at the standard 250 KB/s,
- * but with a random component averaging 128 KB.
- * We also increment tcp_iss by a quarter of this amount
- * each time we use the value for a new connection.
- * If defined, the tcp_random18() macro should produce a
- * number in the range [0-0x3ffff] that is hard to predict.
- */
-#ifndef tcp_random18
-#define	tcp_random18()	((random() >> 14) & 0x3ffff)
-#endif
-#define	TCP_ISSINCR	(122*1024 + tcp_random18())
-
-extern tcp_seq	tcp_iss;		/* tcp initial send seq # */
-#else
-#define	TCP_ISSINCR	(250*1024)	/* increment for tcp_iss each second */
-#endif /* KERNEL */
-#endif /* _NETINET_TCP_SEQ_H_ */
diff --git a/c/src/libnetworking/netinet/tcp_subr.c b/c/src/libnetworking/netinet/tcp_subr.c
deleted file mode 100644
index a9cde3fdf0..0000000000
--- a/c/src/libnetworking/netinet/tcp_subr.c
+++ /dev/null
@@ -1,634 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1988, 1990, 1993, 1995
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)tcp_subr.c	8.2 (Berkeley) 5/24/95
- *	$Id$
- */
-
-#include "opt_tcpdebug.h"
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/proc.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/sysctl.h>
-#include <sys/malloc.h>
-#include <sys/mbuf.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/protosw.h>
-#include <sys/errno.h>
-
-#include <net/route.h>
-#include <net/if.h>
-
-#define _IP_VHL
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/in_pcb.h>
-#include <netinet/in_var.h>
-#include <netinet/ip_var.h>
-#include <netinet/ip_icmp.h>
-#include <netinet/tcp.h>
-#include <netinet/tcp_fsm.h>
-#include <netinet/tcp_seq.h>
-#include <netinet/tcp_timer.h>
-#include <netinet/tcp_var.h>
-#include <netinet/tcpip.h>
-#ifdef TCPDEBUG
-#include <netinet/tcp_debug.h>
-#endif
-
-int 	tcp_mssdflt = TCP_MSS;
-SYSCTL_INT(_net_inet_tcp, TCPCTL_MSSDFLT, mssdflt,
-	CTLFLAG_RW, &tcp_mssdflt , 0, "");
-
-static int	tcp_do_rfc1323 = 1;
-static int	tcp_do_rfc1644 = 1;
-#if !defined(__rtems__)
-static int 	tcp_rttdflt = TCPTV_SRTTDFLT / PR_SLOWHZ;
-SYSCTL_INT(_net_inet_tcp, TCPCTL_RTTDFLT, rttdflt,
-	CTLFLAG_RW, &tcp_rttdflt , 0, "");
-
-SYSCTL_INT(_net_inet_tcp, TCPCTL_DO_RFC1323, rfc1323,
-	CTLFLAG_RW, &tcp_do_rfc1323 , 0, "");
-
-SYSCTL_INT(_net_inet_tcp, TCPCTL_DO_RFC1644, rfc1644,
-	CTLFLAG_RW, &tcp_do_rfc1644 , 0, "");
-#endif
-
-static void	tcp_cleartaocache(void);
-static void	tcp_notify __P((struct inpcb *, int));
-
-/*
- * Target size of TCP PCB hash table. Will be rounded down to a prime
- * number.
- */
-#ifndef TCBHASHSIZE
-#define TCBHASHSIZE	128
-#endif
-
-/*
- * Tcp initialization
- */
-void
-tcp_init()
-{
-
-	tcp_iss = random();	/* wrong, but better than a constant */
-	tcp_ccgen = 1;
-	tcp_cleartaocache();
-	LIST_INIT(&tcb);
-	tcbinfo.listhead = &tcb;
-	tcbinfo.hashbase = hashinit(TCBHASHSIZE, M_PCB, &tcbinfo.hashmask);
-	if (max_protohdr < sizeof(struct tcpiphdr))
-		max_protohdr = sizeof(struct tcpiphdr);
-	if (max_linkhdr + sizeof(struct tcpiphdr) > MHLEN)
-		panic("tcp_init");
-}
-
-/*
- * Create template to be used to send tcp packets on a connection.
- * Call after host entry created, allocates an mbuf and fills
- * in a skeletal tcp/ip header, minimizing the amount of work
- * necessary when the connection is used.
- */
-struct tcpiphdr *
-tcp_template(tp)
-	struct tcpcb *tp;
-{
-	register struct inpcb *inp = tp->t_inpcb;
-	register struct mbuf *m;
-	register struct tcpiphdr *n;
-
-	if ((n = tp->t_template) == 0) {
-		m = m_get(M_DONTWAIT, MT_HEADER);
-		if (m == NULL)
-			return (0);
-		m->m_len = sizeof (struct tcpiphdr);
-		n = mtod(m, struct tcpiphdr *);
-	}
-	n->ti_next = n->ti_prev = 0;
-	n->ti_x1 = 0;
-	n->ti_pr = IPPROTO_TCP;
-	n->ti_len = htons(sizeof (struct tcpiphdr) - sizeof (struct ip));
-	n->ti_src = inp->inp_laddr;
-	n->ti_dst = inp->inp_faddr;
-	n->ti_sport = inp->inp_lport;
-	n->ti_dport = inp->inp_fport;
-	n->ti_seq = 0;
-	n->ti_ack = 0;
-	n->ti_x2 = 0;
-	n->ti_off = 5;
-	n->ti_flags = 0;
-	n->ti_win = 0;
-	n->ti_sum = 0;
-	n->ti_urp = 0;
-	return (n);
-}
-
-/*
- * Send a single message to the TCP at address specified by
- * the given TCP/IP header.  If m == 0, then we make a copy
- * of the tcpiphdr at ti and send directly to the addressed host.
- * This is used to force keep alive messages out using the TCP
- * template for a connection tp->t_template.  If flags are given
- * then we send a message back to the TCP which originated the
- * segment ti, and discard the mbuf containing it and any other
- * attached mbufs.
- *
- * In any case the ack and sequence number of the transmitted
- * segment are as specified by the parameters.
- *
- * NOTE: If m != NULL, then ti must point to *inside* the mbuf.
- */
-void
-tcp_respond(tp, ti, m, ack, seq, flags)
-	struct tcpcb *tp;
-	register struct tcpiphdr *ti;
-	register struct mbuf *m;
-	tcp_seq ack, seq;
-	int flags;
-{
-	register int tlen;
-	int win = 0;
-	struct route *ro = 0;
-	struct route sro;
-
-	if (tp) {
-		win = sbspace(&tp->t_inpcb->inp_socket->so_rcv);
-		ro = &tp->t_inpcb->inp_route;
-	} else {
-		ro = &sro;
-		bzero(ro, sizeof *ro);
-	}
-	if (m == 0) {
-		m = m_gethdr(M_DONTWAIT, MT_HEADER);
-		if (m == NULL)
-			return;
-#ifdef TCP_COMPAT_42
-		tlen = 1;
-#else
-		tlen = 0;
-#endif
-		m->m_data += max_linkhdr;
-		*mtod(m, struct tcpiphdr *) = *ti;
-		ti = mtod(m, struct tcpiphdr *);
-		flags = TH_ACK;
-	} else {
-		m_freem(m->m_next);
-		m->m_next = 0;
-		m->m_data = (caddr_t)ti;
-		m->m_len = sizeof (struct tcpiphdr);
-		tlen = 0;
-#define xchg(a,b,type) { type t; t=a; a=b; b=t; }
-		xchg(ti->ti_dst.s_addr, ti->ti_src.s_addr, u_long);
-		xchg(ti->ti_dport, ti->ti_sport, u_short);
-#undef xchg
-	}
-	ti->ti_len = htons((u_short)(sizeof (struct tcphdr) + tlen));
-	tlen += sizeof (struct tcpiphdr);
-	m->m_len = tlen;
-	m->m_pkthdr.len = tlen;
-	m->m_pkthdr.rcvif = (struct ifnet *) 0;
-	ti->ti_next = ti->ti_prev = 0;
-	ti->ti_x1 = 0;
-	ti->ti_seq = htonl(seq);
-	ti->ti_ack = htonl(ack);
-	ti->ti_x2 = 0;
-	ti->ti_off = sizeof (struct tcphdr) >> 2;
-	ti->ti_flags = flags;
-	if (tp)
-		ti->ti_win = htons((u_short) (win >> tp->rcv_scale));
-	else
-		ti->ti_win = htons((u_short)win);
-	ti->ti_urp = 0;
-	ti->ti_sum = 0;
-	ti->ti_sum = in_cksum(m, tlen);
-	((struct ip *)ti)->ip_len = tlen;
-	((struct ip *)ti)->ip_ttl = ip_defttl;
-#ifdef TCPDEBUG
-	if (tp == NULL || (tp->t_inpcb->inp_socket->so_options & SO_DEBUG))
-		tcp_trace(TA_OUTPUT, 0, tp, ti, 0);
-#endif
-	(void) ip_output(m, NULL, ro, 0, NULL);
-	if (ro == &sro && ro->ro_rt) {
-		RTFREE(ro->ro_rt);
-	}
-}
-
-/*
- * Create a new TCP control block, making an
- * empty reassembly queue and hooking it to the argument
- * protocol control block.
- */
-struct tcpcb *
-tcp_newtcpcb(inp)
-	struct inpcb *inp;
-{
-	register struct tcpcb *tp;
-
-	tp = malloc(sizeof(*tp), M_PCB, M_NOWAIT);
-	if (tp == NULL)
-		return ((struct tcpcb *)0);
-	bzero((char *) tp, sizeof(struct tcpcb));
-	tp->seg_next = tp->seg_prev = (struct tcpiphdr *)tp;
-	tp->t_maxseg = tp->t_maxopd = tcp_mssdflt;
-
-	if (tcp_do_rfc1323)
-		tp->t_flags = (TF_REQ_SCALE|TF_REQ_TSTMP);
-	if (tcp_do_rfc1644)
-		tp->t_flags |= TF_REQ_CC;
-	tp->t_inpcb = inp;
-	/*
-	 * Init srtt to TCPTV_SRTTBASE (0), so we can tell that we have no
-	 * rtt estimate.  Set rttvar so that srtt + 4 * rttvar gives
-	 * reasonable initial retransmit time.
-	 */
-	tp->t_srtt = TCPTV_SRTTBASE;
-	tp->t_rttvar = ((TCPTV_RTOBASE - TCPTV_SRTTBASE) << TCP_RTTVAR_SHIFT) / 4;
-	tp->t_rttmin = TCPTV_MIN;
-	tp->t_rxtcur = TCPTV_RTOBASE;
-	tp->snd_cwnd = TCP_MAXWIN << TCP_MAX_WINSHIFT;
-	tp->snd_ssthresh = TCP_MAXWIN << TCP_MAX_WINSHIFT;
-	inp->inp_ip_ttl = ip_defttl;
-	inp->inp_ppcb = (caddr_t)tp;
-	return (tp);
-}
-
-/*
- * Drop a TCP connection, reporting
- * the specified error.  If connection is synchronized,
- * then send a RST to peer.
- */
-struct tcpcb *
-tcp_drop(tp, errnum)
-	register struct tcpcb *tp;
-	int errnum;
-{
-	struct socket *so = tp->t_inpcb->inp_socket;
-
-	if (TCPS_HAVERCVDSYN(tp->t_state)) {
-		tp->t_state = TCPS_CLOSED;
-		(void) tcp_output(tp);
-		tcpstat.tcps_drops++;
-	} else
-		tcpstat.tcps_conndrops++;
-	if (errnum == ETIMEDOUT && tp->t_softerror)
-		errnum = tp->t_softerror;
-	so->so_error = errnum;
-	return (tcp_close(tp));
-}
-
-/*
- * Close a TCP control block:
- *	discard all space held by the tcp
- *	discard internet protocol block
- *	wake up any sleepers
- */
-struct tcpcb *
-tcp_close(tp)
-	register struct tcpcb *tp;
-{
-	register struct tcpiphdr *t;
-	struct inpcb *inp = tp->t_inpcb;
-	struct socket *so = inp->inp_socket;
-	register struct mbuf *m;
-	register struct rtentry *rt;
-
-	/*
-	 * If we got enough samples through the srtt filter,
-	 * save the rtt and rttvar in the routing entry.
-	 * 'Enough' is arbitrarily defined as the 16 samples.
-	 * 16 samples is enough for the srtt filter to converge
-	 * to within 5% of the correct value; fewer samples and
-	 * we could save a very bogus rtt.
-	 *
-	 * Don't update the default route's characteristics and don't
-	 * update anything that the user "locked".
-	 */
-	if (tp->t_rttupdated >= 16 &&
-	    (rt = inp->inp_route.ro_rt) &&
-	    ((struct sockaddr_in *)rt_key(rt))->sin_addr.s_addr != INADDR_ANY) {
-		register u_long i = 0;
-
-		if ((rt->rt_rmx.rmx_locks & RTV_RTT) == 0) {
-			i = tp->t_srtt *
-			    (RTM_RTTUNIT / (PR_SLOWHZ * TCP_RTT_SCALE));
-			if (rt->rt_rmx.rmx_rtt && i)
-				/*
-				 * filter this update to half the old & half
-				 * the new values, converting scale.
-				 * See route.h and tcp_var.h for a
-				 * description of the scaling constants.
-				 */
-				rt->rt_rmx.rmx_rtt =
-				    (rt->rt_rmx.rmx_rtt + i) / 2;
-			else
-				rt->rt_rmx.rmx_rtt = i;
-			tcpstat.tcps_cachedrtt++;
-		}
-		if ((rt->rt_rmx.rmx_locks & RTV_RTTVAR) == 0) {
-			i = tp->t_rttvar *
-			    (RTM_RTTUNIT / (PR_SLOWHZ * TCP_RTTVAR_SCALE));
-			if (rt->rt_rmx.rmx_rttvar && i)
-				rt->rt_rmx.rmx_rttvar =
-				    (rt->rt_rmx.rmx_rttvar + i) / 2;
-			else
-				rt->rt_rmx.rmx_rttvar = i;
-			tcpstat.tcps_cachedrttvar++;
-		}
-		/*
-		 * update the pipelimit (ssthresh) if it has been updated
-		 * already or if a pipesize was specified & the threshhold
-		 * got below half the pipesize.  I.e., wait for bad news
-		 * before we start updating, then update on both good
-		 * and bad news.
-		 */
-		if (((rt->rt_rmx.rmx_locks & RTV_SSTHRESH) == 0 &&
-		    ((i = tp->snd_ssthresh) != 0) && rt->rt_rmx.rmx_ssthresh) ||
-		    i < (rt->rt_rmx.rmx_sendpipe / 2)) {
-			/*
-			 * convert the limit from user data bytes to
-			 * packets then to packet data bytes.
-			 */
-			i = (i + tp->t_maxseg / 2) / tp->t_maxseg;
-			if (i < 2)
-				i = 2;
-			i *= (u_long)(tp->t_maxseg + sizeof (struct tcpiphdr));
-			if (rt->rt_rmx.rmx_ssthresh)
-				rt->rt_rmx.rmx_ssthresh =
-				    (rt->rt_rmx.rmx_ssthresh + i) / 2;
-			else
-				rt->rt_rmx.rmx_ssthresh = i;
-			tcpstat.tcps_cachedssthresh++;
-		}
-	}
-	/* free the reassembly queue, if any */
-	t = tp->seg_next;
-	while (t != (struct tcpiphdr *)tp) {
-		t = (struct tcpiphdr *)t->ti_next;
-		m = REASS_MBUF((struct tcpiphdr *)t->ti_prev);
-		remque(t->ti_prev);
-		m_freem(m);
-	}
-	if (tp->t_template)
-		(void) m_free(dtom(tp->t_template));
-	free(tp, M_PCB);
-	inp->inp_ppcb = 0;
-	soisdisconnected(so);
-	in_pcbdetach(inp);
-	tcpstat.tcps_closed++;
-	return ((struct tcpcb *)0);
-}
-
-void
-tcp_drain()
-{
-
-}
-
-/*
- * Notify a tcp user of an asynchronous error;
- * store error as soft error, but wake up user
- * (for now, won't do anything until can select for soft error).
- */
-static void
-tcp_notify(inp, error)
-	struct inpcb *inp;
-	int error;
-{
-	register struct tcpcb *tp = (struct tcpcb *)inp->inp_ppcb;
-	register struct socket *so = inp->inp_socket;
-
-	/*
-	 * Ignore some errors if we are hooked up.
-	 * If connection hasn't completed, has retransmitted several times,
-	 * and receives a second error, give up now.  This is better
-	 * than waiting a long time to establish a connection that
-	 * can never complete.
-	 */
-	if (tp->t_state == TCPS_ESTABLISHED &&
-	     (error == EHOSTUNREACH || error == ENETUNREACH ||
-	      error == EHOSTDOWN)) {
-		return;
-	} else if (tp->t_state < TCPS_ESTABLISHED && tp->t_rxtshift > 3 &&
-	    tp->t_softerror)
-		so->so_error = error;
-	else
-		tp->t_softerror = error;
-	soconnwakeup (so);
-	sorwakeup(so);
-	sowwakeup(so);
-}
-
-void
-tcp_ctlinput(cmd, sa, vip)
-	int cmd;
-	struct sockaddr *sa;
-	void *vip;
-{
-	register struct ip *ip = vip;
-	register struct tcphdr *th;
-	void (*notify) __P((struct inpcb *, int)) = tcp_notify;
-
-	if (cmd == PRC_QUENCH)
-		notify = tcp_quench;
-#if 1
-	else if (cmd == PRC_MSGSIZE)
-		notify = tcp_mtudisc;
-#endif
-	else if (!PRC_IS_REDIRECT(cmd) &&
-		 ((unsigned)cmd > PRC_NCMDS || inetctlerrmap[cmd] == 0))
-		return;
-	if (ip) {
-		th = (struct tcphdr *)((caddr_t)ip 
-				       + (IP_VHL_HL(ip->ip_vhl) << 2));
-		in_pcbnotify(&tcb, sa, th->th_dport, ip->ip_src, th->th_sport,
-			cmd, notify);
-	} else
-		in_pcbnotify(&tcb, sa, 0, zeroin_addr, 0, cmd, notify);
-}
-
-/*
- * When a source quench is received, close congestion window
- * to one segment.  We will gradually open it again as we proceed.
- */
-void
-tcp_quench(inp, errnum)
-	struct inpcb *inp;
-	int errnum;
-{
-	struct tcpcb *tp = intotcpcb(inp);
-
-	if (tp)
-		tp->snd_cwnd = tp->t_maxseg;
-}
-
-#if 1
-/*
- * When `need fragmentation' ICMP is received, update our idea of the MSS
- * based on the new value in the route.  Also nudge TCP to send something,
- * since we know the packet we just sent was dropped.
- * This duplicates some code in the tcp_mss() function in tcp_input.c.
- */
-void
-tcp_mtudisc(inp, errnum)
-	struct inpcb *inp;
-	int errnum;
-{
-	struct tcpcb *tp = intotcpcb(inp);
-	struct rtentry *rt;
-	struct rmxp_tao *taop;
-	struct socket *so = inp->inp_socket;
-	int offered;
-	int mss;
-
-	if (tp) {
-		rt = tcp_rtlookup(inp);
-		if (!rt || !rt->rt_rmx.rmx_mtu) {
-			tp->t_maxopd = tp->t_maxseg = tcp_mssdflt;
-			return;
-		}
-		taop = rmx_taop(rt->rt_rmx);
-		offered = taop->tao_mssopt;
-		mss = rt->rt_rmx.rmx_mtu - sizeof(struct tcpiphdr);
-		if (offered)
-			mss = min(mss, offered);
-		/*
-		 * XXX - The above conditional probably violates the TCP
-		 * spec.  The problem is that, since we don't know the
-		 * other end's MSS, we are supposed to use a conservative
-		 * default.  But, if we do that, then MTU discovery will
-		 * never actually take place, because the conservative
-		 * default is much less than the MTUs typically seen
-		 * on the Internet today.  For the moment, we'll sweep
-		 * this under the carpet.
-		 *
-		 * The conservative default might not actually be a problem
-		 * if the only case this occurs is when sending an initial
-		 * SYN with options and data to a host we've never talked
-		 * to before.  Then, they will reply with an MSS value which
-		 * will get recorded and the new parameters should get
-		 * recomputed.  For Further Study.
-		 */
-		if (tp->t_maxopd <= mss)
-			return;
-		tp->t_maxopd = mss;
-
-		if ((tp->t_flags & (TF_REQ_TSTMP|TF_NOOPT)) == TF_REQ_TSTMP &&
-		    (tp->t_flags & TF_RCVD_TSTMP) == TF_RCVD_TSTMP)
-			mss -= TCPOLEN_TSTAMP_APPA;
-		if ((tp->t_flags & (TF_REQ_CC|TF_NOOPT)) == TF_REQ_CC &&
-		    (tp->t_flags & TF_RCVD_CC) == TF_RCVD_CC)
-			mss -= TCPOLEN_CC_APPA;
-#if	(MCLBYTES & (MCLBYTES - 1)) == 0
-		if (mss > MCLBYTES)
-			mss &= ~(MCLBYTES-1);
-#else
-		if (mss > MCLBYTES)
-			mss = mss / MCLBYTES * MCLBYTES;
-#endif
-		if (so->so_snd.sb_hiwat < mss)
-			mss = so->so_snd.sb_hiwat;
-
-		tp->t_maxseg = mss;
-
-		tcpstat.tcps_mturesent++;
-		tp->t_rtt = 0;
-		tp->snd_nxt = tp->snd_una;
-		tcp_output(tp);
-	}
-}
-#endif
-
-/*
- * Look-up the routing entry to the peer of this inpcb.  If no route
- * is found and it cannot be allocated the return NULL.  This routine
- * is called by TCP routines that access the rmx structure and by tcp_mss
- * to get the interface MTU.
- */
-struct rtentry *
-tcp_rtlookup(inp)
-	struct inpcb *inp;
-{
-	struct route *ro;
-	struct rtentry *rt;
-
-	ro = &inp->inp_route;
-	rt = ro->ro_rt;
-	if (rt == NULL || !(rt->rt_flags & RTF_UP)) {
-		/* No route yet, so try to acquire one */
-		if (inp->inp_faddr.s_addr != INADDR_ANY) {
-			ro->ro_dst.sa_family = AF_INET;
-			ro->ro_dst.sa_len = sizeof(ro->ro_dst);
-			((struct sockaddr_in *) &ro->ro_dst)->sin_addr =
-				inp->inp_faddr;
-			rtalloc(ro);
-			rt = ro->ro_rt;
-		}
-	}
-	return rt;
-}
-
-/*
- * Return a pointer to the cached information about the remote host.
- * The cached information is stored in the protocol specific part of
- * the route metrics.
- */
-struct rmxp_tao *
-tcp_gettaocache(inp)
-	struct inpcb *inp;
-{
-	struct rtentry *rt = tcp_rtlookup(inp);
-
-	/* Make sure this is a host route and is up. */
-	if (rt == NULL ||
-	    (rt->rt_flags & (RTF_UP|RTF_HOST)) != (RTF_UP|RTF_HOST))
-		return NULL;
-
-	return rmx_taop(rt->rt_rmx);
-}
-
-/*
- * Clear all the TAO cache entries, called from tcp_init.
- *
- * XXX
- * This routine is just an empty one, because we assume that the routing
- * routing tables are initialized at the same time when TCP, so there is
- * nothing in the cache left over.
- */
-static void
-tcp_cleartaocache(void)
-{ }
diff --git a/c/src/libnetworking/netinet/tcp_timer.c b/c/src/libnetworking/netinet/tcp_timer.c
deleted file mode 100644
index 04d3d604e2..0000000000
--- a/c/src/libnetworking/netinet/tcp_timer.c
+++ /dev/null
@@ -1,387 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1988, 1990, 1993, 1995
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)tcp_timer.c	8.2 (Berkeley) 5/24/95
- *	$Id$
- */
-
-#include "opt_tcpdebug.h"
-
-#ifndef TUBA_INCLUDE
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/sysctl.h>
-#include <sys/malloc.h>
-#include <sys/mbuf.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/protosw.h>
-#include <sys/errno.h>
-
-#include <machine/cpu.h>	/* before tcp_seq.h, for tcp_random18() */
-
-#include <net/if.h>
-#include <net/route.h>
-
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/in_pcb.h>
-#include <netinet/ip_var.h>
-#include <netinet/tcp.h>
-#include <netinet/tcp_fsm.h>
-#include <netinet/tcp_seq.h>
-#include <netinet/tcp_timer.h>
-#include <netinet/tcp_var.h>
-#include <netinet/tcpip.h>
-#ifdef TCPDEBUG
-#include <netinet/tcp_debug.h>
-#endif
-
-int	tcp_keepinit = TCPTV_KEEP_INIT;
-SYSCTL_INT(_net_inet_tcp, TCPCTL_KEEPINIT, keepinit,
-	CTLFLAG_RW, &tcp_keepinit , 0, "");
-
-int	tcp_keepidle = TCPTV_KEEP_IDLE;
-SYSCTL_INT(_net_inet_tcp, TCPCTL_KEEPIDLE, keepidle,
-	CTLFLAG_RW, &tcp_keepidle , 0, "");
-
-static int	tcp_keepintvl = TCPTV_KEEPINTVL;
-SYSCTL_INT(_net_inet_tcp, TCPCTL_KEEPINTVL, keepintvl,
-	CTLFLAG_RW, &tcp_keepintvl , 0, "");
-
-static int	always_keepalive = 0;
-SYSCTL_INT(_net_inet_tcp, OID_AUTO, always_keepalive,
-	CTLFLAG_RW, &always_keepalive , 0, "");
-
-static int	tcp_keepcnt = TCPTV_KEEPCNT;
-	/* max idle probes */
-static int	tcp_maxpersistidle = TCPTV_KEEP_IDLE;
-	/* max idle time in persist */
-int	tcp_maxidle;
-#else /* TUBA_INCLUDE */
-
-static	int tcp_maxpersistidle;
-#endif /* TUBA_INCLUDE */
-
-/*
- * Fast timeout routine for processing delayed acks
- */
-void
-tcp_fasttimo()
-{
-	register struct inpcb *inp;
-	register struct tcpcb *tp;
-	int s;
-
-	s = splnet();
-
-	for (inp = tcb.lh_first; inp != NULL; inp = inp->inp_list.le_next) {
-		if ((tp = (struct tcpcb *)inp->inp_ppcb) &&
-		    (tp->t_flags & TF_DELACK)) {
-			tp->t_flags &= ~TF_DELACK;
-			tp->t_flags |= TF_ACKNOW;
-			tcpstat.tcps_delack++;
-			(void) tcp_output(tp);
-		}
-	}
-	splx(s);
-}
-
-/*
- * Tcp protocol timeout routine called every 500 ms.
- * Updates the timers in all active tcb's and
- * causes finite state machine actions if timers expire.
- */
-void
-tcp_slowtimo()
-{
-	register struct inpcb *ip, *ipnxt;
-	register struct tcpcb *tp;
-	register int i;
-	int s;
-#ifdef TCPDEBUG
-	int ostate;
-#endif
-
-	s = splnet();
-
-	tcp_maxidle = tcp_keepcnt * tcp_keepintvl;
-
-	ip = tcb.lh_first;
-	if (ip == NULL) {
-		splx(s);
-		return;
-	}
-	/*
-	 * Search through tcb's and update active timers.
-	 */
-	for (; ip != NULL; ip = ipnxt) {
-		ipnxt = ip->inp_list.le_next;
-		tp = intotcpcb(ip);
-		if (tp == 0 || tp->t_state == TCPS_LISTEN)
-			continue;
-		for (i = 0; i < TCPT_NTIMERS; i++) {
-			if (tp->t_timer[i] && --tp->t_timer[i] == 0) {
-#ifdef TCPDEBUG
-				ostate = tp->t_state;
-#endif
-				tp = tcp_timers(tp, i);
-				if (tp == NULL)
-					goto tpgone;
-#ifdef TCPDEBUG
-				if (tp->t_inpcb->inp_socket->so_options
-				    & SO_DEBUG)
-					tcp_trace(TA_USER, ostate, tp,
-						  (struct tcpiphdr *)0,
-						  PRU_SLOWTIMO);
-#endif
-			}
-		}
-		tp->t_idle++;
-		tp->t_duration++;
-		if (tp->t_rtt)
-			tp->t_rtt++;
-tpgone:
-		;
-	}
-	tcp_iss += TCP_ISSINCR/PR_SLOWHZ;		/* increment iss */
-#ifdef TCP_COMPAT_42
-	if ((int)tcp_iss < 0)
-		tcp_iss = TCP_ISSINCR;			/* XXX */
-#endif
-	tcp_now++;					/* for timestamps */
-	splx(s);
-}
-#ifndef TUBA_INCLUDE
-
-/*
- * Cancel all timers for TCP tp.
- */
-void
-tcp_canceltimers(tp)
-	struct tcpcb *tp;
-{
-	register int i;
-
-	for (i = 0; i < TCPT_NTIMERS; i++)
-		tp->t_timer[i] = 0;
-}
-
-int	tcp_backoff[TCP_MAXRXTSHIFT + 1] =
-    { 1, 2, 4, 8, 16, 32, 64, 64, 64, 64, 64, 64, 64 };
-
-static int tcp_totbackoff = 511;	/* sum of tcp_backoff[] */
-
-/*
- * TCP timer processing.
- */
-struct tcpcb *
-tcp_timers(tp, timer)
-	register struct tcpcb *tp;
-	int timer;
-{
-	register int rexmt;
-
-	switch (timer) {
-
-	/*
-	 * 2 MSL timeout in shutdown went off.  If we're closed but
-	 * still waiting for peer to close and connection has been idle
-	 * too long, or if 2MSL time is up from TIME_WAIT, delete connection
-	 * control block.  Otherwise, check again in a bit.
-	 */
-	case TCPT_2MSL:
-		if (tp->t_state != TCPS_TIME_WAIT &&
-		    tp->t_idle <= tcp_maxidle)
-			tp->t_timer[TCPT_2MSL] = tcp_keepintvl;
-		else
-			tp = tcp_close(tp);
-		break;
-
-	/*
-	 * Retransmission timer went off.  Message has not
-	 * been acked within retransmit interval.  Back off
-	 * to a longer retransmit interval and retransmit one segment.
-	 */
-	case TCPT_REXMT:
-		if (++tp->t_rxtshift > TCP_MAXRXTSHIFT) {
-			tp->t_rxtshift = TCP_MAXRXTSHIFT;
-			tcpstat.tcps_timeoutdrop++;
-			tp = tcp_drop(tp, tp->t_softerror ?
-			    tp->t_softerror : ETIMEDOUT);
-			break;
-		}
-		tcpstat.tcps_rexmttimeo++;
-		rexmt = TCP_REXMTVAL(tp) * tcp_backoff[tp->t_rxtshift];
-		TCPT_RANGESET(tp->t_rxtcur, rexmt,
-		    tp->t_rttmin, TCPTV_REXMTMAX);
-		tp->t_timer[TCPT_REXMT] = tp->t_rxtcur;
-		/*
-		 * If losing, let the lower level know and try for
-		 * a better route.  Also, if we backed off this far,
-		 * our srtt estimate is probably bogus.  Clobber it
-		 * so we'll take the next rtt measurement as our srtt;
-		 * move the current srtt into rttvar to keep the current
-		 * retransmit times until then.
-		 */
-		if (tp->t_rxtshift > TCP_MAXRXTSHIFT / 4) {
-			in_losing(tp->t_inpcb);
-			tp->t_rttvar += (tp->t_srtt >> TCP_RTT_SHIFT);
-			tp->t_srtt = 0;
-		}
-		tp->snd_nxt = tp->snd_una;
-		/*
-		 * Force a segment to be sent.
-		 */
-		tp->t_flags |= TF_ACKNOW;
-		/*
-		 * If timing a segment in this window, stop the timer.
-		 */
-		tp->t_rtt = 0;
-		/*
-		 * Close the congestion window down to one segment
-		 * (we'll open it by one segment for each ack we get).
-		 * Since we probably have a window's worth of unacked
-		 * data accumulated, this "slow start" keeps us from
-		 * dumping all that data as back-to-back packets (which
-		 * might overwhelm an intermediate gateway).
-		 *
-		 * There are two phases to the opening: Initially we
-		 * open by one mss on each ack.  This makes the window
-		 * size increase exponentially with time.  If the
-		 * window is larger than the path can handle, this
-		 * exponential growth results in dropped packet(s)
-		 * almost immediately.  To get more time between
-		 * drops but still "push" the network to take advantage
-		 * of improving conditions, we switch from exponential
-		 * to linear window opening at some threshhold size.
-		 * For a threshhold, we use half the current window
-		 * size, truncated to a multiple of the mss.
-		 *
-		 * (the minimum cwnd that will give us exponential
-		 * growth is 2 mss.  We don't allow the threshhold
-		 * to go below this.)
-		 */
-		{
-		u_int win = min(tp->snd_wnd, tp->snd_cwnd) / 2 / tp->t_maxseg;
-		if (win < 2)
-			win = 2;
-		tp->snd_cwnd = tp->t_maxseg;
-		tp->snd_ssthresh = win * tp->t_maxseg;
-		tp->t_dupacks = 0;
-		}
-		(void) tcp_output(tp);
-		break;
-
-	/*
-	 * Persistance timer into zero window.
-	 * Force a byte to be output, if possible.
-	 */
-	case TCPT_PERSIST:
-		tcpstat.tcps_persisttimeo++;
-		/*
-		 * Hack: if the peer is dead/unreachable, we do not
-		 * time out if the window is closed.  After a full
-		 * backoff, drop the connection if the idle time
-		 * (no responses to probes) reaches the maximum
-		 * backoff that we would use if retransmitting.
-		 */
-		if (tp->t_rxtshift == TCP_MAXRXTSHIFT) {
-			u_long maxidle = TCP_REXMTVAL(tp);
-			if (maxidle < tp->t_rttmin)
-				maxidle = tp->t_rttmin;
-			maxidle *= tcp_totbackoff;
-			if (tp->t_idle >= tcp_maxpersistidle ||
-			    tp->t_idle >= maxidle) {
-				tcpstat.tcps_persistdrop++;
-				tp = tcp_drop(tp, ETIMEDOUT);
-				break;
-			}
-		}
-		tcp_setpersist(tp);
-		tp->t_force = 1;
-		(void) tcp_output(tp);
-		tp->t_force = 0;
-		break;
-
-	/*
-	 * Keep-alive timer went off; send something
-	 * or drop connection if idle for too long.
-	 */
-	case TCPT_KEEP:
-		tcpstat.tcps_keeptimeo++;
-		if (tp->t_state < TCPS_ESTABLISHED)
-			goto dropit;
-		if ((always_keepalive ||
-		    tp->t_inpcb->inp_socket->so_options & SO_KEEPALIVE) &&
-		    tp->t_state <= TCPS_CLOSING) {
-		    	if (tp->t_idle >= tcp_keepidle + tcp_maxidle)
-				goto dropit;
-			/*
-			 * Send a packet designed to force a response
-			 * if the peer is up and reachable:
-			 * either an ACK if the connection is still alive,
-			 * or an RST if the peer has closed the connection
-			 * due to timeout or reboot.
-			 * Using sequence number tp->snd_una-1
-			 * causes the transmitted zero-length segment
-			 * to lie outside the receive window;
-			 * by the protocol spec, this requires the
-			 * correspondent TCP to respond.
-			 */
-			tcpstat.tcps_keepprobe++;
-#ifdef TCP_COMPAT_42
-			/*
-			 * The keepalive packet must have nonzero length
-			 * to get a 4.2 host to respond.
-			 */
-			tcp_respond(tp, tp->t_template, (struct mbuf *)NULL,
-			    tp->rcv_nxt - 1, tp->snd_una - 1, 0);
-#else
-			tcp_respond(tp, tp->t_template, (struct mbuf *)NULL,
-			    tp->rcv_nxt, tp->snd_una - 1, 0);
-#endif
-			tp->t_timer[TCPT_KEEP] = tcp_keepintvl;
-		} else
-			tp->t_timer[TCPT_KEEP] = tcp_keepidle;
-		break;
-	dropit:
-		tcpstat.tcps_keepdrops++;
-		tp = tcp_drop(tp, ETIMEDOUT);
-		break;
-	}
-	return (tp);
-}
-#endif /* TUBA_INCLUDE */
diff --git a/c/src/libnetworking/netinet/tcp_timer.h b/c/src/libnetworking/netinet/tcp_timer.h
deleted file mode 100644
index 38ffac4ee7..0000000000
--- a/c/src/libnetworking/netinet/tcp_timer.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)tcp_timer.h	8.1 (Berkeley) 6/10/93
- *	$Id$
- */
-
-#ifndef _NETINET_TCP_TIMER_H_
-#define _NETINET_TCP_TIMER_H_
-
-/*
- * Definitions of the TCP timers.  These timers are counted
- * down PR_SLOWHZ times a second.
- */
-#define	TCPT_NTIMERS	4
-
-#define	TCPT_REXMT	0		/* retransmit */
-#define	TCPT_PERSIST	1		/* retransmit persistence */
-#define	TCPT_KEEP	2		/* keep alive */
-#define	TCPT_2MSL	3		/* 2*msl quiet time timer */
-
-/*
- * The TCPT_REXMT timer is used to force retransmissions.
- * The TCP has the TCPT_REXMT timer set whenever segments
- * have been sent for which ACKs are expected but not yet
- * received.  If an ACK is received which advances tp->snd_una,
- * then the retransmit timer is cleared (if there are no more
- * outstanding segments) or reset to the base value (if there
- * are more ACKs expected).  Whenever the retransmit timer goes off,
- * we retransmit one unacknowledged segment, and do a backoff
- * on the retransmit timer.
- *
- * The TCPT_PERSIST timer is used to keep window size information
- * flowing even if the window goes shut.  If all previous transmissions
- * have been acknowledged (so that there are no retransmissions in progress),
- * and the window is too small to bother sending anything, then we start
- * the TCPT_PERSIST timer.  When it expires, if the window is nonzero,
- * we go to transmit state.  Otherwise, at intervals send a single byte
- * into the peer's window to force him to update our window information.
- * We do this at most as often as TCPT_PERSMIN time intervals,
- * but no more frequently than the current estimate of round-trip
- * packet time.  The TCPT_PERSIST timer is cleared whenever we receive
- * a window update from the peer.
- *
- * The TCPT_KEEP timer is used to keep connections alive.  If an
- * connection is idle (no segments received) for TCPTV_KEEP_INIT amount of time,
- * but not yet established, then we drop the connection.  Once the connection
- * is established, if the connection is idle for TCPTV_KEEP_IDLE time
- * (and keepalives have been enabled on the socket), we begin to probe
- * the connection.  We force the peer to send us a segment by sending:
- *	<SEQ=SND.UNA-1><ACK=RCV.NXT><CTL=ACK>
- * This segment is (deliberately) outside the window, and should elicit
- * an ack segment in response from the peer.  If, despite the TCPT_KEEP
- * initiated segments we cannot elicit a response from a peer in TCPT_MAXIDLE
- * amount of time probing, then we drop the connection.
- */
-
-/*
- * Time constants.
- */
-#define	TCPTV_MSL	( 30*PR_SLOWHZ)		/* max seg lifetime (hah!) */
-#define	TCPTV_SRTTBASE	0			/* base roundtrip time;
-						   if 0, no idea yet */
-#define	TCPTV_RTOBASE	(  3*PR_SLOWHZ)		/* assumed RTO if no info */
-#define	TCPTV_SRTTDFLT	(  3*PR_SLOWHZ)		/* assumed RTT if no info */
-
-#define	TCPTV_PERSMIN	(  5*PR_SLOWHZ)		/* retransmit persistence */
-#define	TCPTV_PERSMAX	( 60*PR_SLOWHZ)		/* maximum persist interval */
-
-#define	TCPTV_KEEP_INIT	( 75*PR_SLOWHZ)		/* initial connect keep alive */
-#define	TCPTV_KEEP_IDLE	(120*60*PR_SLOWHZ)	/* dflt time before probing */
-#define	TCPTV_KEEPINTVL	( 75*PR_SLOWHZ)		/* default probe interval */
-#define	TCPTV_KEEPCNT	8			/* max probes before drop */
-
-#define	TCPTV_MIN	(  1*PR_SLOWHZ)		/* minimum allowable value */
-#define	TCPTV_REXMTMAX	( 64*PR_SLOWHZ)		/* max allowable REXMT value */
-
-#define TCPTV_TWTRUNC	8			/* RTO factor to truncate TW */
-
-#define	TCP_LINGERTIME	120			/* linger at most 2 minutes */
-
-#define	TCP_MAXRXTSHIFT	12			/* maximum retransmits */
-
-#ifdef	TCPTIMERS
-static char *tcptimers[] =
-    { "REXMT", "PERSIST", "KEEP", "2MSL" };
-#endif
-
-/*
- * Force a time value to be in a certain range.
- */
-#define	TCPT_RANGESET(tv, value, tvmin, tvmax) { \
-	(tv) = (value); \
-	if ((u_long)(tv) < (u_long)(tvmin)) \
-		(tv) = (tvmin); \
-	else if ((u_long)(tv) > (u_long)(tvmax)) \
-		(tv) = (tvmax); \
-}
-
-#ifdef KERNEL
-extern int tcp_keepinit;		/* time to establish connection */
-extern int tcp_keepidle;		/* time before keepalive probes begin */
-extern int tcp_keepintvl;		/* time between keepalive probes */
-extern int tcp_maxidle;			/* time to drop after starting probes */
-extern int tcp_ttl;			/* time to live for TCP segs */
-extern int tcp_backoff[];
-#endif
-
-#endif
diff --git a/c/src/libnetworking/netinet/tcp_usrreq.c b/c/src/libnetworking/netinet/tcp_usrreq.c
deleted file mode 100644
index ecd9d95636..0000000000
--- a/c/src/libnetworking/netinet/tcp_usrreq.c
+++ /dev/null
@@ -1,840 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	From: @(#)tcp_usrreq.c	8.2 (Berkeley) 1/3/94
- *	$Id$
- */
-
-#include "opt_tcpdebug.h"
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/sysctl.h>
-#include <sys/malloc.h>
-#include <sys/mbuf.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/protosw.h>
-#include <sys/errno.h>
-#include <sys/stat.h>
-
-#include <net/if.h>
-#include <net/route.h>
-
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/in_pcb.h>
-#include <netinet/in_var.h>
-#include <netinet/ip_var.h>
-#include <netinet/tcp.h>
-#include <netinet/tcp_fsm.h>
-#include <netinet/tcp_seq.h>
-#include <netinet/tcp_timer.h>
-#include <netinet/tcp_var.h>
-#include <netinet/tcpip.h>
-#ifdef TCPDEBUG
-#include <netinet/tcp_debug.h>
-#endif
-
-/*
- * TCP protocol interface to socket abstraction.
- */
-extern	char *tcpstates[];
-
-static int	tcp_attach __P((struct socket *));
-static int	tcp_connect __P((struct tcpcb *, struct mbuf *));
-static struct tcpcb *
-		tcp_disconnect __P((struct tcpcb *));
-static struct tcpcb *
-		tcp_usrclosed __P((struct tcpcb *));
-
-#ifdef TCPDEBUG
-#define	TCPDEBUG0	int ostate
-#define	TCPDEBUG1()	ostate = tp ? tp->t_state : 0
-#define	TCPDEBUG2(req)	if (tp && (so->so_options & SO_DEBUG)) \
-				tcp_trace(TA_USER, ostate, tp, 0, req)
-#else
-#define	TCPDEBUG0
-#define	TCPDEBUG1()
-#define	TCPDEBUG2(req)
-#endif
-
-/*
- * TCP attaches to socket via pru_attach(), reserving space,
- * and an internet control block.
- */
-static int
-tcp_usr_attach(struct socket *so, int proto)
-{
-	int s = splnet();
-	int error;
-	struct inpcb *inp = sotoinpcb(so);
-	struct tcpcb *tp = 0;
-	TCPDEBUG0;
-
-	TCPDEBUG1();
-	if (inp) {
-		error = EISCONN;
-		goto out;
-	}
-
-	error = tcp_attach(so);
-	if (error)
-		goto out;
-
-	if ((so->so_options & SO_LINGER) && so->so_linger == 0)
-		so->so_linger = TCP_LINGERTIME * hz;
-	tp = sototcpcb(so);
-out:
-	TCPDEBUG2(PRU_ATTACH);
-	splx(s);
-	return error;
-}
-
-/*
- * pru_detach() detaches the TCP protocol from the socket.
- * If the protocol state is non-embryonic, then can't
- * do this directly: have to initiate a pru_disconnect(),
- * which may finish later; embryonic TCB's can just
- * be discarded here.
- */
-static int
-tcp_usr_detach(struct socket *so)
-{
-	int s = splnet();
-	int error = 0;
-	struct inpcb *inp = sotoinpcb(so);
-	struct tcpcb *tp;
-	TCPDEBUG0;
-
-	if (inp == 0) {
-		splx(s);
-		return EINVAL;	/* XXX */
-	}
-	tp = intotcpcb(inp);
-	TCPDEBUG1();
-	if (tp->t_state > TCPS_LISTEN)
-		tp = tcp_disconnect(tp);
-	else
-		tp = tcp_close(tp);
-
-	TCPDEBUG2(PRU_DETACH);
-	splx(s);
-	return error;
-}
-
-#define	COMMON_START()	TCPDEBUG0; \
-			do { \
-				     if (inp == 0) { \
-					     splx(s); \
-					     return EINVAL; \
-				     } \
-				     tp = intotcpcb(inp); \
-				     TCPDEBUG1(); \
-		     } while(0)
-			     
-#define COMMON_END(req)	out: TCPDEBUG2(req); splx(s); return error; goto out
-
-
-/*
- * Give the socket an address.
- */
-static int
-tcp_usr_bind(struct socket *so, struct mbuf *nam)
-{
-	int s = splnet();
-	int error = 0;
-	struct inpcb *inp = sotoinpcb(so);
-	struct tcpcb *tp;
-	struct sockaddr_in *sinp;
-
-	COMMON_START();
-
-	/*
-	 * Must check for multicast addresses and disallow binding
-	 * to them.
-	 */
-	sinp = mtod(nam, struct sockaddr_in *);
-	if (sinp->sin_family == AF_INET &&
-	    IN_MULTICAST(ntohl(sinp->sin_addr.s_addr))) {
-		error = EAFNOSUPPORT;
-		goto out;
-	}
-	error = in_pcbbind(inp, nam);
-	if (error)
-		goto out;
-	COMMON_END(PRU_BIND);
-
-}
-
-/*
- * Prepare to accept connections.
- */
-static int
-tcp_usr_listen(struct socket *so)
-{
-	int s = splnet();
-	int error = 0;
-	struct inpcb *inp = sotoinpcb(so);
-	struct tcpcb *tp;
-
-	COMMON_START();
-	if (inp->inp_lport == 0)
-		error = in_pcbbind(inp, NULL);
-	if (error == 0)
-		tp->t_state = TCPS_LISTEN;
-	COMMON_END(PRU_LISTEN);
-}
-
-/*
- * Initiate connection to peer.
- * Create a template for use in transmissions on this connection.
- * Enter SYN_SENT state, and mark socket as connecting.
- * Start keep-alive timer, and seed output sequence space.
- * Send initial segment on connection.
- */
-static int
-tcp_usr_connect(struct socket *so, struct mbuf *nam)
-{
-	int s = splnet();
-	int error = 0;
-	struct inpcb *inp = sotoinpcb(so);
-	struct tcpcb *tp;
-	struct sockaddr_in *sinp;
-
-	COMMON_START();
-
-	/*
-	 * Must disallow TCP ``connections'' to multicast addresses.
-	 */
-	sinp = mtod(nam, struct sockaddr_in *);
-	if (sinp->sin_family == AF_INET
-	    && IN_MULTICAST(ntohl(sinp->sin_addr.s_addr))) {
-		error = EAFNOSUPPORT;
-		goto out;
-	}
-
-	if ((error = tcp_connect(tp, nam)) != 0)
-		goto out;
-	error = tcp_output(tp);
-	COMMON_END(PRU_CONNECT);
-}
-
-/*
- * Initiate disconnect from peer.
- * If connection never passed embryonic stage, just drop;
- * else if don't need to let data drain, then can just drop anyways,
- * else have to begin TCP shutdown process: mark socket disconnecting,
- * drain unread data, state switch to reflect user close, and
- * send segment (e.g. FIN) to peer.  Socket will be really disconnected
- * when peer sends FIN and acks ours.
- *
- * SHOULD IMPLEMENT LATER PRU_CONNECT VIA REALLOC TCPCB.
- */
-static int
-tcp_usr_disconnect(struct socket *so)
-{
-	int s = splnet();
-	int error = 0;
-	struct inpcb *inp = sotoinpcb(so);
-	struct tcpcb *tp;
-
-	COMMON_START();
-	tp = tcp_disconnect(tp);
-	COMMON_END(PRU_DISCONNECT);
-}
-
-/*
- * Accept a connection.  Essentially all the work is
- * done at higher levels; just return the address
- * of the peer, storing through addr.
- */
-static int
-tcp_usr_accept(struct socket *so, struct mbuf *nam)
-{
-	int s = splnet();
-	int error = 0;
-	struct inpcb *inp = sotoinpcb(so);
-	struct tcpcb *tp;
-
-	COMMON_START();
-	in_setpeeraddr(inp, nam);
-	COMMON_END(PRU_ACCEPT);
-}
-
-/*
- * Mark the connection as being incapable of further output.
- */
-static int
-tcp_usr_shutdown(struct socket *so)
-{
-	int s = splnet();
-	int error = 0;
-	struct inpcb *inp = sotoinpcb(so);
-	struct tcpcb *tp;
-
-	COMMON_START();
-	socantsendmore(so);
-	tp = tcp_usrclosed(tp);
-	if (tp)
-		error = tcp_output(tp);
-	COMMON_END(PRU_SHUTDOWN);
-}
-
-/*
- * After a receive, possibly send window update to peer.
- */
-static int
-tcp_usr_rcvd(struct socket *so, int flags)
-{
-	int s = splnet();
-	int error = 0;
-	struct inpcb *inp = sotoinpcb(so);
-	struct tcpcb *tp;
-
-	COMMON_START();
-	tcp_output(tp);
-	COMMON_END(PRU_RCVD);
-}
-
-/*
- * Do a send by putting data in output queue and updating urgent
- * marker if URG set.  Possibly send more data.
- */
-static int
-tcp_usr_send(struct socket *so, int flags, struct mbuf *m, struct mbuf *nam,
-	     struct mbuf *control)
-{
-	int s = splnet();
-	int error = 0;
-	struct inpcb *inp = sotoinpcb(so);
-	struct tcpcb *tp;
-
-	COMMON_START();
-	if (control && control->m_len) {
-		m_freem(control); /* XXX shouldn't caller do this??? */
-		if (m)
-			m_freem(m);
-		error = EINVAL;
-		goto out;
-	}
-
-	if(!(flags & PRUS_OOB)) {
-		sbappend(&so->so_snd, m);
-		if (nam && tp->t_state < TCPS_SYN_SENT) {
-			/*
-			 * Do implied connect if not yet connected,
-			 * initialize window to default value, and
-			 * initialize maxseg/maxopd using peer's cached
-			 * MSS.
-			 */
-			error = tcp_connect(tp, nam);
-			if (error)
-				goto out;
-			tp->snd_wnd = TTCP_CLIENT_SND_WND;
-			tcp_mss(tp, -1);
-		}
-
-		if (flags & PRUS_EOF) {
-			/*
-			 * Close the send side of the connection after
-			 * the data is sent.
-			 */
-			socantsendmore(so);
-			tp = tcp_usrclosed(tp);
-		}
-		if (tp != NULL)
-			error = tcp_output(tp);
-	} else {
-		if (sbspace(&so->so_snd) < -512) {
-			m_freem(m);
-			error = ENOBUFS;
-			goto out;
-		}
-		/*
-		 * According to RFC961 (Assigned Protocols),
-		 * the urgent pointer points to the last octet
-		 * of urgent data.  We continue, however,
-		 * to consider it to indicate the first octet
-		 * of data past the urgent section.
-		 * Otherwise, snd_up should be one lower.
-		 */
-		sbappend(&so->so_snd, m);
-		if (nam && tp->t_state < TCPS_SYN_SENT) {
-			/*
-			 * Do implied connect if not yet connected,
-			 * initialize window to default value, and
-			 * initialize maxseg/maxopd using peer's cached
-			 * MSS.
-			 */
-			error = tcp_connect(tp, nam);
-			if (error)
-				goto out;
-			tp->snd_wnd = TTCP_CLIENT_SND_WND;
-			tcp_mss(tp, -1);
-		}
-		tp->snd_up = tp->snd_una + so->so_snd.sb_cc;
-		tp->t_force = 1;
-		error = tcp_output(tp);
-		tp->t_force = 0;
-	}
-	COMMON_END((flags & PRUS_OOB) ? PRU_SENDOOB : 
-		   ((flags & PRUS_EOF) ? PRU_SEND_EOF : PRU_SEND));
-}
-
-/*
- * Abort the TCP.
- */
-static int
-tcp_usr_abort(struct socket *so)
-{
-	int s = splnet();
-	int error = 0;
-	struct inpcb *inp = sotoinpcb(so);
-	struct tcpcb *tp;
-
-	COMMON_START();
-	tp = tcp_drop(tp, ECONNABORTED);
-	COMMON_END(PRU_ABORT);
-}
-
-/*
- * Fill in st_bklsize for fstat() operations on a socket.
- */
-static int
-tcp_usr_sense(struct socket *so, struct stat *sb)
-{
-	int s = splnet();
-
-	sb->st_blksize = so->so_snd.sb_hiwat;
-	splx(s);
-	return 0;
-}
-
-/*
- * Receive out-of-band data.
- */
-static int
-tcp_usr_rcvoob(struct socket *so, struct mbuf *m, int flags)
-{
-	int s = splnet();
-	int error = 0;
-	struct inpcb *inp = sotoinpcb(so);
-	struct tcpcb *tp;
-
-	COMMON_START();
-	if ((so->so_oobmark == 0 &&
-	     (so->so_state & SS_RCVATMARK) == 0) ||
-	    so->so_options & SO_OOBINLINE ||
-	    tp->t_oobflags & TCPOOB_HADDATA) {
-		error = EINVAL;
-		goto out;
-	}
-	if ((tp->t_oobflags & TCPOOB_HAVEDATA) == 0) {
-		error = EWOULDBLOCK;
-		goto out;
-	}
-	m->m_len = 1;
-	*mtod(m, caddr_t) = tp->t_iobc;
-	if ((flags & MSG_PEEK) == 0)
-		tp->t_oobflags ^= (TCPOOB_HAVEDATA | TCPOOB_HADDATA);
-	COMMON_END(PRU_RCVOOB);
-}
-
-static int
-tcp_usr_sockaddr(struct socket *so, struct mbuf *nam)
-{
-	int s = splnet();
-	int error = 0;
-	struct inpcb *inp = sotoinpcb(so);
-	struct tcpcb *tp;
-
-	COMMON_START();
-	in_setsockaddr(inp, nam);
-	COMMON_END(PRU_SOCKADDR);
-}
-
-static int
-tcp_usr_peeraddr(struct socket *so, struct mbuf *nam)
-{
-	int s = splnet();
-	int error = 0;
-	struct inpcb *inp = sotoinpcb(so);
-	struct tcpcb *tp;
-
-	COMMON_START();
-	in_setpeeraddr(inp, nam);
-	COMMON_END(PRU_PEERADDR);
-}
-
-/*
- * XXX - this should just be a call to in_control, but we need to get
- * the types worked out.
- */
-static int
-tcp_usr_control(struct socket *so, int cmd, caddr_t arg, struct ifnet *ifp)
-{
-	return in_control(so, cmd, arg, ifp);
-}
-
-/* xxx - should be const */
-struct pr_usrreqs tcp_usrreqs = {
-	tcp_usr_abort, tcp_usr_accept, tcp_usr_attach, tcp_usr_bind,
-	tcp_usr_connect, pru_connect2_notsupp, tcp_usr_control, tcp_usr_detach,
-	tcp_usr_disconnect, tcp_usr_listen, tcp_usr_peeraddr, tcp_usr_rcvd,
-	tcp_usr_rcvoob, tcp_usr_send, tcp_usr_sense, tcp_usr_shutdown,
-	tcp_usr_sockaddr
-};
-
-/*
- * Common subroutine to open a TCP connection to remote host specified
- * by struct sockaddr_in in mbuf *nam.  Call in_pcbbind to assign a local
- * port number if needed.  Call in_pcbladdr to do the routing and to choose
- * a local host address (interface).  If there is an existing incarnation
- * of the same connection in TIME-WAIT state and if the remote host was
- * sending CC options and if the connection duration was < MSL, then
- * truncate the previous TIME-WAIT state and proceed.
- * Initialize connection parameters and enter SYN-SENT state.
- */
-static int
-tcp_connect(tp, nam)
-	register struct tcpcb *tp;
-	struct mbuf *nam;
-{
-	struct inpcb *inp = tp->t_inpcb, *oinp;
-	struct socket *so = inp->inp_socket;
-	struct tcpcb *otp;
-	struct sockaddr_in *sin = mtod(nam, struct sockaddr_in *);
-	struct sockaddr_in *ifaddr;
-	int error;
-	struct rmxp_tao *taop;
-	struct rmxp_tao tao_noncached;
-
-	if (inp->inp_lport == 0) {
-		error = in_pcbbind(inp, NULL);
-		if (error)
-			return error;
-	}
-
-	/*
-	 * Cannot simply call in_pcbconnect, because there might be an
-	 * earlier incarnation of this same connection still in
-	 * TIME_WAIT state, creating an ADDRINUSE error.
-	 */
-	error = in_pcbladdr(inp, nam, &ifaddr);
-	if (error)
-		return error;
-	oinp = in_pcblookuphash(inp->inp_pcbinfo,
-	    sin->sin_addr, sin->sin_port,
-	    inp->inp_laddr.s_addr != INADDR_ANY ? inp->inp_laddr
-						: ifaddr->sin_addr,
-	    inp->inp_lport,  0);
-	if (oinp) {
-		if (oinp != inp && (otp = intotcpcb(oinp)) != NULL &&
-		otp->t_state == TCPS_TIME_WAIT &&
-		    otp->t_duration < TCPTV_MSL &&
-		    (otp->t_flags & TF_RCVD_CC))
-			otp = tcp_close(otp);
-		else
-			return EADDRINUSE;
-	}
-	if (inp->inp_laddr.s_addr == INADDR_ANY)
-		inp->inp_laddr = ifaddr->sin_addr;
-	inp->inp_faddr = sin->sin_addr;
-	inp->inp_fport = sin->sin_port;
-	in_pcbrehash(inp);
-
-	tp->t_template = tcp_template(tp);
-	if (tp->t_template == 0) {
-		in_pcbdisconnect(inp);
-		return ENOBUFS;
-	}
-
-	/* Compute window scaling to request.  */
-	while (tp->request_r_scale < TCP_MAX_WINSHIFT &&
-	    (TCP_MAXWIN << tp->request_r_scale) < so->so_rcv.sb_hiwat)
-		tp->request_r_scale++;
-
-	soisconnecting(so);
-	tcpstat.tcps_connattempt++;
-	tp->t_state = TCPS_SYN_SENT;
-	tp->t_timer[TCPT_KEEP] = tcp_keepinit;
-	tp->iss = tcp_iss; tcp_iss += TCP_ISSINCR/2;
-	tcp_sendseqinit(tp);
-
-	/*
-	 * Generate a CC value for this connection and
-	 * check whether CC or CCnew should be used.
-	 */
-	if ((taop = tcp_gettaocache(tp->t_inpcb)) == NULL) {
-		taop = &tao_noncached;
-		bzero(taop, sizeof(*taop));
-	}
-
-	tp->cc_send = CC_INC(tcp_ccgen);
-	if (taop->tao_ccsent != 0 &&
-	    CC_GEQ(tp->cc_send, taop->tao_ccsent)) {
-		taop->tao_ccsent = tp->cc_send;
-	} else {
-		taop->tao_ccsent = 0;
-		tp->t_flags |= TF_SENDCCNEW;
-	}
-
-	return 0;
-}
-
-int
-tcp_ctloutput(op, so, level, optname, mp)
-	int op;
-	struct socket *so;
-	int level, optname;
-	struct mbuf **mp;
-{
-	int error = 0, s;
-	struct inpcb *inp;
-	register struct tcpcb *tp;
-	register struct mbuf *m;
-	register int i;
-
-	s = splnet();
-	inp = sotoinpcb(so);
-	if (inp == NULL) {
-		splx(s);
-		if (op == PRCO_SETOPT && *mp)
-			(void) m_free(*mp);
-		return (ECONNRESET);
-	}
-	if (level != IPPROTO_TCP) {
-		error = ip_ctloutput(op, so, level, optname, mp);
-		splx(s);
-		return (error);
-	}
-	tp = intotcpcb(inp);
-
-	switch (op) {
-
-	case PRCO_SETOPT:
-		m = *mp;
-		switch (optname) {
-
-		case TCP_NODELAY:
-			if (m == NULL || m->m_len < sizeof (int))
-				error = EINVAL;
-			else if (*mtod(m, int *))
-				tp->t_flags |= TF_NODELAY;
-			else
-				tp->t_flags &= ~TF_NODELAY;
-			break;
-
-		case TCP_MAXSEG:
-			if (m && (i = *mtod(m, int *)) > 0 && i <= tp->t_maxseg)
-				tp->t_maxseg = i;
-			else
-				error = EINVAL;
-			break;
-
-		case TCP_NOOPT:
-			if (m == NULL || m->m_len < sizeof (int))
-				error = EINVAL;
-			else if (*mtod(m, int *))
-				tp->t_flags |= TF_NOOPT;
-			else
-				tp->t_flags &= ~TF_NOOPT;
-			break;
-
-		case TCP_NOPUSH:
-			if (m == NULL || m->m_len < sizeof (int))
-				error = EINVAL;
-			else if (*mtod(m, int *))
-				tp->t_flags |= TF_NOPUSH;
-			else
-				tp->t_flags &= ~TF_NOPUSH;
-			break;
-
-		default:
-			error = ENOPROTOOPT;
-			break;
-		}
-		if (m)
-			(void) m_free(m);
-		break;
-
-	case PRCO_GETOPT:
-		*mp = m = m_get(M_WAIT, MT_SOOPTS);
-		m->m_len = sizeof(int);
-
-		switch (optname) {
-		case TCP_NODELAY:
-			*mtod(m, int *) = tp->t_flags & TF_NODELAY;
-			break;
-		case TCP_MAXSEG:
-			*mtod(m, int *) = tp->t_maxseg;
-			break;
-		case TCP_NOOPT:
-			*mtod(m, int *) = tp->t_flags & TF_NOOPT;
-			break;
-		case TCP_NOPUSH:
-			*mtod(m, int *) = tp->t_flags & TF_NOPUSH;
-			break;
-		default:
-			error = ENOPROTOOPT;
-			break;
-		}
-		break;
-	}
-	splx(s);
-	return (error);
-}
-
-/*
- * tcp_sendspace and tcp_recvspace are the default send and receive window
- * sizes, respectively.  These are obsolescent (this information should
- * be set by the route).
- */
-u_long	tcp_sendspace = 1024*16;
-SYSCTL_INT(_net_inet_tcp, TCPCTL_SENDSPACE, sendspace,
-	CTLFLAG_RW, &tcp_sendspace , 0, "");
-u_long	tcp_recvspace = 1024*16;
-SYSCTL_INT(_net_inet_tcp, TCPCTL_RECVSPACE, recvspace,
-	CTLFLAG_RW, &tcp_recvspace , 0, "");
-
-/*
- * Attach TCP protocol to socket, allocating
- * internet protocol control block, tcp control block,
- * bufer space, and entering LISTEN state if to accept connections.
- */
-static int
-tcp_attach(so)
-	struct socket *so;
-{
-	register struct tcpcb *tp;
-	struct inpcb *inp;
-	int error;
-
-	if (so->so_snd.sb_hiwat == 0 || so->so_rcv.sb_hiwat == 0) {
-		error = soreserve(so, tcp_sendspace, tcp_recvspace);
-		if (error)
-			return (error);
-	}
-	error = in_pcballoc(so, &tcbinfo);
-	if (error)
-		return (error);
-	inp = sotoinpcb(so);
-	tp = tcp_newtcpcb(inp);
-	if (tp == 0) {
-		int nofd = so->so_state & SS_NOFDREF;	/* XXX */
-
-		so->so_state &= ~SS_NOFDREF;	/* don't free the socket yet */
-		in_pcbdetach(inp);
-		so->so_state |= nofd;
-		return (ENOBUFS);
-	}
-	tp->t_state = TCPS_CLOSED;
-	return (0);
-}
-
-/*
- * Initiate (or continue) disconnect.
- * If embryonic state, just send reset (once).
- * If in ``let data drain'' option and linger null, just drop.
- * Otherwise (hard), mark socket disconnecting and drop
- * current input data; switch states based on user close, and
- * send segment to peer (with FIN).
- */
-static struct tcpcb *
-tcp_disconnect(tp)
-	register struct tcpcb *tp;
-{
-	struct socket *so = tp->t_inpcb->inp_socket;
-
-	if (tp->t_state < TCPS_ESTABLISHED)
-		tp = tcp_close(tp);
-	else if ((so->so_options & SO_LINGER) && so->so_linger == 0)
-		tp = tcp_drop(tp, 0);
-	else {
-		soisdisconnecting(so);
-		sbflush(&so->so_rcv);
-		tp = tcp_usrclosed(tp);
-		if (tp)
-			(void) tcp_output(tp);
-	}
-	return (tp);
-}
-
-/*
- * User issued close, and wish to trail through shutdown states:
- * if never received SYN, just forget it.  If got a SYN from peer,
- * but haven't sent FIN, then go to FIN_WAIT_1 state to send peer a FIN.
- * If already got a FIN from peer, then almost done; go to LAST_ACK
- * state.  In all other cases, have already sent FIN to peer (e.g.
- * after PRU_SHUTDOWN), and just have to play tedious game waiting
- * for peer to send FIN or not respond to keep-alives, etc.
- * We can let the user exit from the close as soon as the FIN is acked.
- */
-static struct tcpcb *
-tcp_usrclosed(tp)
-	register struct tcpcb *tp;
-{
-
-	switch (tp->t_state) {
-
-	case TCPS_CLOSED:
-	case TCPS_LISTEN:
-		tp->t_state = TCPS_CLOSED;
-		tp = tcp_close(tp);
-		break;
-
-	case TCPS_SYN_SENT:
-	case TCPS_SYN_RECEIVED:
-		tp->t_flags |= TF_NEEDFIN;
-		break;
-
-	case TCPS_ESTABLISHED:
-		tp->t_state = TCPS_FIN_WAIT_1;
-		break;
-
-	case TCPS_CLOSE_WAIT:
-		tp->t_state = TCPS_LAST_ACK;
-		break;
-	}
-	if (tp && tp->t_state >= TCPS_FIN_WAIT_2) {
-		soisdisconnected(tp->t_inpcb->inp_socket);
-		/* To prevent the connection hanging in FIN_WAIT_2 forever. */
-		if (tp->t_state == TCPS_FIN_WAIT_2)
-			tp->t_timer[TCPT_2MSL] = tcp_maxidle;
-	}
-	return (tp);
-}
-
diff --git a/c/src/libnetworking/netinet/tcp_var.h b/c/src/libnetworking/netinet/tcp_var.h
deleted file mode 100644
index 8e63a2cafe..0000000000
--- a/c/src/libnetworking/netinet/tcp_var.h
+++ /dev/null
@@ -1,374 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993, 1994, 1995
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)tcp_var.h	8.4 (Berkeley) 5/24/95
- * 	$Id$
- */
-
-#ifndef _NETINET_TCP_VAR_H_
-#define _NETINET_TCP_VAR_H_
-/*
- * Kernel variables for tcp.
- */
-
-/*
- * Tcp control block, one per tcp; fields:
- */
-struct tcpcb {
-	struct	tcpiphdr *seg_next;	/* sequencing queue */
-	struct	tcpiphdr *seg_prev;
-	int	t_state;		/* state of this connection */
-	int	t_timer[TCPT_NTIMERS];	/* tcp timers */
-	int	t_rxtshift;		/* log(2) of rexmt exp. backoff */
-	int	t_rxtcur;		/* current retransmit value */
-	int	t_dupacks;		/* consecutive dup acks recd */
-	u_int	t_maxseg;		/* maximum segment size */
-	u_int	t_maxopd;		/* mss plus options */
-	int	t_force;		/* 1 if forcing out a byte */
-	u_int	t_flags;
-#define	TF_ACKNOW	0x0001		/* ack peer immediately */
-#define	TF_DELACK	0x0002		/* ack, but try to delay it */
-#define	TF_NODELAY	0x0004		/* don't delay packets to coalesce */
-#define	TF_NOOPT	0x0008		/* don't use tcp options */
-#define	TF_SENTFIN	0x0010		/* have sent FIN */
-#define	TF_REQ_SCALE	0x0020		/* have/will request window scaling */
-#define	TF_RCVD_SCALE	0x0040		/* other side has requested scaling */
-#define	TF_REQ_TSTMP	0x0080		/* have/will request timestamps */
-#define	TF_RCVD_TSTMP	0x0100		/* a timestamp was received in SYN */
-#define	TF_SACK_PERMIT	0x0200		/* other side said I could SACK */
-#define TF_NEEDSYN	0x0400		/* send SYN (implicit state) */
-#define TF_NEEDFIN	0x0800		/* send FIN (implicit state) */
-#define TF_NOPUSH	0x1000		/* don't push */
-#define TF_REQ_CC	0x2000		/* have/will request CC */
-#define	TF_RCVD_CC	0x4000		/* a CC was received in SYN */
-#define TF_SENDCCNEW	0x8000		/* send CCnew instead of CC in SYN */
-
-	struct	tcpiphdr *t_template;	/* skeletal packet for transmit */
-	struct	inpcb *t_inpcb;		/* back pointer to internet pcb */
-/*
- * The following fields are used as in the protocol specification.
- * See RFC783, Dec. 1981, page 21.
- */
-/* send sequence variables */
-	tcp_seq	snd_una;		/* send unacknowledged */
-	tcp_seq	snd_nxt;		/* send next */
-	tcp_seq	snd_up;			/* send urgent pointer */
-	tcp_seq	snd_wl1;		/* window update seg seq number */
-	tcp_seq	snd_wl2;		/* window update seg ack number */
-	tcp_seq	iss;			/* initial send sequence number */
-	u_long	snd_wnd;		/* send window */
-/* receive sequence variables */
-	u_long	rcv_wnd;		/* receive window */
-	tcp_seq	rcv_nxt;		/* receive next */
-	tcp_seq	rcv_up;			/* receive urgent pointer */
-	tcp_seq	irs;			/* initial receive sequence number */
-/*
- * Additional variables for this implementation.
- */
-/* receive variables */
-	tcp_seq	rcv_adv;		/* advertised window */
-/* retransmit variables */
-	tcp_seq	snd_max;		/* highest sequence number sent;
-					 * used to recognize retransmits
-					 */
-/* congestion control (for slow start, source quench, retransmit after loss) */
-	u_long	snd_cwnd;		/* congestion-controlled window */
-	u_long	snd_ssthresh;		/* snd_cwnd size threshold for
-					 * for slow start exponential to
-					 * linear switch
-					 */
-/*
- * transmit timing stuff.  See below for scale of srtt and rttvar.
- * "Variance" is actually smoothed difference.
- */
-	u_int	t_idle;			/* inactivity time */
-	int	t_rtt;			/* round trip time */
-	tcp_seq	t_rtseq;		/* sequence number being timed */
-	int	t_srtt;			/* smoothed round-trip time */
-	int	t_rttvar;		/* variance in round-trip time */
-	u_int	t_rttmin;		/* minimum rtt allowed */
-	u_long	max_sndwnd;		/* largest window peer has offered */
-
-/* out-of-band data */
-	char	t_oobflags;		/* have some */
-	char	t_iobc;			/* input character */
-#define	TCPOOB_HAVEDATA	0x01
-#define	TCPOOB_HADDATA	0x02
-	int	t_softerror;		/* possible error not yet reported */
-
-/* RFC 1323 variables */
-	u_char	snd_scale;		/* window scaling for send window */
-	u_char	rcv_scale;		/* window scaling for recv window */
-	u_char	request_r_scale;	/* pending window scaling */
-	u_char	requested_s_scale;
-	u_long	ts_recent;		/* timestamp echo data */
-	u_long	ts_recent_age;		/* when last updated */
-	tcp_seq	last_ack_sent;
-/* RFC 1644 variables */
-	tcp_cc	cc_send;		/* send connection count */
-	tcp_cc	cc_recv;		/* receive connection count */
-	u_long	t_duration;		/* connection duration */
-
-/* TUBA stuff */
-	caddr_t	t_tuba_pcb;		/* next level down pcb for TCP over z */
-/* More RTT stuff */
-	u_long	t_rttupdated;		/* number of times rtt sampled */
-};
-
-/*
- * Structure to hold TCP options that are only used during segment
- * processing (in tcp_input), but not held in the tcpcb.
- * It's basically used to reduce the number of parameters
- * to tcp_dooptions.
- */
-struct tcpopt {
-	u_long	to_flag;		/* which options are present */
-#define TOF_TS		0x0001		/* timestamp */
-#define TOF_CC		0x0002		/* CC and CCnew are exclusive */
-#define TOF_CCNEW	0x0004
-#define	TOF_CCECHO	0x0008
-	u_long	to_tsval;
-	u_long	to_tsecr;
-	tcp_cc	to_cc;		/* holds CC or CCnew */
-	tcp_cc	to_ccecho;
-};
-
-/*
- * The TAO cache entry which is stored in the protocol family specific
- * portion of the route metrics.
- */
-struct rmxp_tao {
-	tcp_cc	tao_cc;			/* latest CC in valid SYN */
-	tcp_cc	tao_ccsent;		/* latest CC sent to peer */
-	u_short	tao_mssopt;		/* peer's cached MSS */
-#ifdef notyet
-	u_short	tao_flags;		/* cache status flags */
-#define	TAOF_DONT	0x0001		/* peer doesn't understand rfc1644 */
-#define	TAOF_OK		0x0002		/* peer does understand rfc1644 */
-#define	TAOF_UNDEF	0		/* we don't know yet */
-#endif /* notyet */
-};
-#define rmx_taop(r)	((struct rmxp_tao *)(r).rmx_filler)
-
-#define	intotcpcb(ip)	((struct tcpcb *)(ip)->inp_ppcb)
-#define	sototcpcb(so)	(intotcpcb(sotoinpcb(so)))
-
-/*
- * The smoothed round-trip time and estimated variance
- * are stored as fixed point numbers scaled by the values below.
- * For convenience, these scales are also used in smoothing the average
- * (smoothed = (1/scale)sample + ((scale-1)/scale)smoothed).
- * With these scales, srtt has 3 bits to the right of the binary point,
- * and thus an "ALPHA" of 0.875.  rttvar has 2 bits to the right of the
- * binary point, and is smoothed with an ALPHA of 0.75.
- */
-#define	TCP_RTT_SCALE		32	/* multiplier for srtt; 3 bits frac. */
-#define	TCP_RTT_SHIFT		5	/* shift for srtt; 3 bits frac. */
-#define	TCP_RTTVAR_SCALE	16	/* multiplier for rttvar; 2 bits */
-#define	TCP_RTTVAR_SHIFT	4	/* shift for rttvar; 2 bits */
-#define	TCP_DELTA_SHIFT		2	/* see tcp_input.c */
-
-/*
- * The initial retransmission should happen at rtt + 4 * rttvar.
- * Because of the way we do the smoothing, srtt and rttvar
- * will each average +1/2 tick of bias.  When we compute
- * the retransmit timer, we want 1/2 tick of rounding and
- * 1 extra tick because of +-1/2 tick uncertainty in the
- * firing of the timer.  The bias will give us exactly the
- * 1.5 tick we need.  But, because the bias is
- * statistical, we have to test that we don't drop below
- * the minimum feasible timer (which is 2 ticks).
- * This version of the macro adapted from a paper by Lawrence
- * Brakmo and Larry Peterson which outlines a problem caused
- * by insufficient precision in the original implementation,
- * which results in inappropriately large RTO values for very
- * fast networks.
- */
-#define	TCP_REXMTVAL(tp) \
-	((((tp)->t_srtt >> (TCP_RTT_SHIFT - TCP_DELTA_SHIFT))  \
-	  + (tp)->t_rttvar) >> TCP_DELTA_SHIFT)
-
-/* XXX
- * We want to avoid doing m_pullup on incoming packets but that
- * means avoiding dtom on the tcp reassembly code.  That in turn means
- * keeping an mbuf pointer in the reassembly queue (since we might
- * have a cluster).  As a quick hack, the source & destination
- * port numbers (which are no longer needed once we've located the
- * tcpcb) are overlayed with an mbuf pointer.
- */
-#define REASS_MBUF(ti) (*(struct mbuf **)&((ti)->ti_t))
-
-/*
- * TCP statistics.
- * Many of these should be kept per connection,
- * but that's inconvenient at the moment.
- */
-struct	tcpstat {
-	u_long	tcps_connattempt;	/* connections initiated */
-	u_long	tcps_accepts;		/* connections accepted */
-	u_long	tcps_connects;		/* connections established */
-	u_long	tcps_drops;		/* connections dropped */
-	u_long	tcps_conndrops;		/* embryonic connections dropped */
-	u_long	tcps_closed;		/* conn. closed (includes drops) */
-	u_long	tcps_segstimed;		/* segs where we tried to get rtt */
-	u_long	tcps_rttupdated;	/* times we succeeded */
-	u_long	tcps_delack;		/* delayed acks sent */
-	u_long	tcps_timeoutdrop;	/* conn. dropped in rxmt timeout */
-	u_long	tcps_rexmttimeo;	/* retransmit timeouts */
-	u_long	tcps_persisttimeo;	/* persist timeouts */
-	u_long	tcps_keeptimeo;		/* keepalive timeouts */
-	u_long	tcps_keepprobe;		/* keepalive probes sent */
-	u_long	tcps_keepdrops;		/* connections dropped in keepalive */
-
-	u_long	tcps_sndtotal;		/* total packets sent */
-	u_long	tcps_sndpack;		/* data packets sent */
-	u_long	tcps_sndbyte;		/* data bytes sent */
-	u_long	tcps_sndrexmitpack;	/* data packets retransmitted */
-	u_long	tcps_sndrexmitbyte;	/* data bytes retransmitted */
-	u_long	tcps_sndacks;		/* ack-only packets sent */
-	u_long	tcps_sndprobe;		/* window probes sent */
-	u_long	tcps_sndurg;		/* packets sent with URG only */
-	u_long	tcps_sndwinup;		/* window update-only packets sent */
-	u_long	tcps_sndctrl;		/* control (SYN|FIN|RST) packets sent */
-
-	u_long	tcps_rcvtotal;		/* total packets received */
-	u_long	tcps_rcvpack;		/* packets received in sequence */
-	u_long	tcps_rcvbyte;		/* bytes received in sequence */
-	u_long	tcps_rcvbadsum;		/* packets received with ccksum errs */
-	u_long	tcps_rcvbadoff;		/* packets received with bad offset */
-	u_long	tcps_rcvshort;		/* packets received too short */
-	u_long	tcps_rcvduppack;	/* duplicate-only packets received */
-	u_long	tcps_rcvdupbyte;	/* duplicate-only bytes received */
-	u_long	tcps_rcvpartduppack;	/* packets with some duplicate data */
-	u_long	tcps_rcvpartdupbyte;	/* dup. bytes in part-dup. packets */
-	u_long	tcps_rcvoopack;		/* out-of-order packets received */
-	u_long	tcps_rcvoobyte;		/* out-of-order bytes received */
-	u_long	tcps_rcvpackafterwin;	/* packets with data after window */
-	u_long	tcps_rcvbyteafterwin;	/* bytes rcvd after window */
-	u_long	tcps_rcvafterclose;	/* packets rcvd after "close" */
-	u_long	tcps_rcvwinprobe;	/* rcvd window probe packets */
-	u_long	tcps_rcvdupack;		/* rcvd duplicate acks */
-	u_long	tcps_rcvacktoomuch;	/* rcvd acks for unsent data */
-	u_long	tcps_rcvackpack;	/* rcvd ack packets */
-	u_long	tcps_rcvackbyte;	/* bytes acked by rcvd acks */
-	u_long	tcps_rcvwinupd;		/* rcvd window update packets */
-	u_long	tcps_pawsdrop;		/* segments dropped due to PAWS */
-	u_long	tcps_predack;		/* times hdr predict ok for acks */
-	u_long	tcps_preddat;		/* times hdr predict ok for data pkts */
-	u_long	tcps_pcbcachemiss;
-	u_long	tcps_cachedrtt;		/* times cached RTT in route updated */
-	u_long	tcps_cachedrttvar;	/* times cached rttvar updated */
-	u_long	tcps_cachedssthresh;	/* times cached ssthresh updated */
-	u_long	tcps_usedrtt;		/* times RTT initialized from route */
-	u_long	tcps_usedrttvar;	/* times RTTVAR initialized from rt */
-	u_long	tcps_usedssthresh;	/* times ssthresh initialized from rt*/
-	u_long	tcps_persistdrop;	/* timeout in persist state */
-	u_long	tcps_badsyn;		/* bogus SYN, e.g. premature ACK */
-	u_long	tcps_mturesent;		/* resends due to MTU discovery */
-	u_long	tcps_listendrop;	/* listen queue overflows */
-};
-
-/*
- * Names for TCP sysctl objects
- */
-#define	TCPCTL_DO_RFC1323	1	/* use RFC-1323 extensions */
-#define	TCPCTL_DO_RFC1644	2	/* use RFC-1644 extensions */
-#define	TCPCTL_MSSDFLT		3	/* MSS default */
-#define TCPCTL_STATS		4	/* statistics (read-only) */
-#define	TCPCTL_RTTDFLT		5	/* default RTT estimate */
-#define	TCPCTL_KEEPIDLE		6	/* keepalive idle timer */
-#define	TCPCTL_KEEPINTVL	7	/* interval to send keepalives */
-#define	TCPCTL_SENDSPACE	8	/* send buffer space */
-#define	TCPCTL_RECVSPACE	9	/* receive buffer space */
-#define	TCPCTL_KEEPINIT		10	/* receive buffer space */
-#define TCPCTL_MAXID		11
-
-#define TCPCTL_NAMES { \
-	{ 0, 0 }, \
-	{ "rfc1323", CTLTYPE_INT }, \
-	{ "rfc1644", CTLTYPE_INT }, \
-	{ "mssdflt", CTLTYPE_INT }, \
-	{ "stats", CTLTYPE_STRUCT }, \
-	{ "rttdflt", CTLTYPE_INT }, \
-	{ "keepidle", CTLTYPE_INT }, \
-	{ "keepintvl", CTLTYPE_INT }, \
-	{ "sendspace", CTLTYPE_INT }, \
-	{ "recvspace", CTLTYPE_INT }, \
-	{ "keepinit", CTLTYPE_INT }, \
-}
-
-#ifdef KERNEL
-extern	struct inpcbhead tcb;		/* head of queue of active tcpcb's */
-extern	struct inpcbinfo tcbinfo;
-extern	struct tcpstat tcpstat;	/* tcp statistics */
-extern	int tcp_mssdflt;	/* XXX */
-extern	u_long tcp_now;		/* for RFC 1323 timestamps */
-
-void	 tcp_canceltimers __P((struct tcpcb *));
-struct tcpcb *
-	 tcp_close __P((struct tcpcb *));
-void	 tcp_ctlinput __P((int, struct sockaddr *, void *));
-int	 tcp_ctloutput __P((int, struct socket *, int, int, struct mbuf **));
-struct tcpcb *
-	 tcp_drop __P((struct tcpcb *, int));
-void	 tcp_drain __P((void));
-void	 tcp_fasttimo __P((void));
-struct rmxp_tao *
-	 tcp_gettaocache __P((struct inpcb *));
-void	 tcp_init __P((void));
-void	 tcp_input __P((struct mbuf *, int));
-void	 tcp_mss __P((struct tcpcb *, int));
-int	 tcp_mssopt __P((struct tcpcb *));
-void	 tcp_mtudisc __P((struct inpcb *, int));
-struct tcpcb *
-	 tcp_newtcpcb __P((struct inpcb *));
-int	 tcp_output __P((struct tcpcb *));
-void	 tcp_quench __P((struct inpcb *, int));
-void	 tcp_respond __P((struct tcpcb *,
-	    struct tcpiphdr *, struct mbuf *, u_long, u_long, int));
-struct rtentry *
-	 tcp_rtlookup __P((struct inpcb *));
-void	 tcp_setpersist __P((struct tcpcb *));
-void	 tcp_slowtimo __P((void));
-struct tcpiphdr *
-	 tcp_template __P((struct tcpcb *));
-struct tcpcb *
-	 tcp_timers __P((struct tcpcb *, int));
-void	 tcp_trace __P((int, int, struct tcpcb *, struct tcpiphdr *, int));
-
-extern	struct pr_usrreqs tcp_usrreqs;
-extern	u_long tcp_sendspace;
-extern	u_long tcp_recvspace;
-
-#endif /* KERNEL */
-
-#endif /* _NETINET_TCP_VAR_H_ */
diff --git a/c/src/libnetworking/netinet/tcpip.h b/c/src/libnetworking/netinet/tcpip.h
deleted file mode 100644
index b8634bfd15..0000000000
--- a/c/src/libnetworking/netinet/tcpip.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)tcpip.h	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#ifndef _NETINET_TCPIP_H_
-#define _NETINET_TCPIP_H_
-
-/*
- * Tcp+ip header, after ip options removed.
- */
-struct tcpiphdr {
-	struct 	ipovly ti_i;		/* overlaid ip structure */
-	struct	tcphdr ti_t;		/* tcp header */
-};
-#ifdef notyet
-/*
- * Tcp+ip header, after ip options removed but including TCP options.
- */
-struct full_tcpiphdr {
-	struct 	ipovly ti_i;		/* overlaid ip structure */
-	struct	tcphdr ti_t;		/* tcp header */
-	char	ti_o[TCP_MAXOLEN];	/* space for tcp options */
-};
-#endif /* notyet */
-#define	ti_next		ti_i.ih_next
-#define	ti_prev		ti_i.ih_prev
-#define	ti_x1		ti_i.ih_x1
-#define	ti_pr		ti_i.ih_pr
-#define	ti_len		ti_i.ih_len
-#define	ti_src		ti_i.ih_src
-#define	ti_dst		ti_i.ih_dst
-#define	ti_sport	ti_t.th_sport
-#define	ti_dport	ti_t.th_dport
-#define	ti_seq		ti_t.th_seq
-#define	ti_ack		ti_t.th_ack
-#define	ti_x2		ti_t.th_x2
-#define	ti_off		ti_t.th_off
-#define	ti_flags	ti_t.th_flags
-#define	ti_win		ti_t.th_win
-#define	ti_sum		ti_t.th_sum
-#define	ti_urp		ti_t.th_urp
-
-#endif
diff --git a/c/src/libnetworking/netinet/udp.h b/c/src/libnetworking/netinet/udp.h
deleted file mode 100644
index e73e1f4ddb..0000000000
--- a/c/src/libnetworking/netinet/udp.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)udp.h	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#ifndef _NETINET_UDP_H_
-#define _NETINET_UDP_H_
-
-/*
- * Udp protocol header.
- * Per RFC 768, September, 1981.
- */
-struct udphdr {
-	u_short	uh_sport;		/* source port */
-	u_short	uh_dport;		/* destination port */
-	u_short	uh_ulen;		/* udp length */
-	u_short	uh_sum;			/* udp checksum */
-};
-
-#endif
diff --git a/c/src/libnetworking/netinet/udp_usrreq.c b/c/src/libnetworking/netinet/udp_usrreq.c
deleted file mode 100644
index 16c5fce2df..0000000000
--- a/c/src/libnetworking/netinet/udp_usrreq.c
+++ /dev/null
@@ -1,613 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1988, 1990, 1993, 1995
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)udp_usrreq.c	8.6 (Berkeley) 5/23/95
- *	$Id$
- */
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/systm.h>
-#include <sys/malloc.h>
-#include <sys/mbuf.h>
-#include <sys/protosw.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/errno.h>
-#include <sys/stat.h>
-#include <sys/kernel.h>
-#include <sys/sysctl.h>
-#include <sys/syslog.h>
-
-#include <net/if.h>
-#include <net/route.h>
-
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/in_pcb.h>
-#include <netinet/in_var.h>
-#include <netinet/ip_var.h>
-#include <netinet/ip_icmp.h>
-#include <netinet/udp.h>
-#include <netinet/udp_var.h>
-
-/*
- * UDP protocol implementation.
- * Per RFC 768, August, 1980.
- */
-#ifndef	COMPAT_42
-static int	udpcksum = 1;
-#else
-static int	udpcksum = 0;		/* XXX */
-#endif
-SYSCTL_INT(_net_inet_udp, UDPCTL_CHECKSUM, checksum, CTLFLAG_RW,
-		&udpcksum, 0, "");
-
-static int log_in_vain = 0;
-SYSCTL_INT(_net_inet_udp, OID_AUTO, log_in_vain, CTLFLAG_RW, 
-	&log_in_vain, 0, "");
-
-static struct	inpcbhead udb;		/* from udp_var.h */
-static struct	inpcbinfo udbinfo;
-
-#ifndef UDBHASHSIZE
-#define UDBHASHSIZE 64
-#endif
-
-       struct	udpstat udpstat;	/* from udp_var.h */
-SYSCTL_STRUCT(_net_inet_udp, UDPCTL_STATS, stats, CTLFLAG_RD,
-	&udpstat, udpstat, "");
-
-static struct	sockaddr_in udp_in = { sizeof(udp_in), AF_INET };
-
-static	void udp_detach __P((struct inpcb *));
-static	int udp_output __P((struct inpcb *, struct mbuf *, struct mbuf *,
-			    struct mbuf *));
-static	void udp_notify __P((struct inpcb *, int));
-
-void
-udp_init()
-{
-	LIST_INIT(&udb);
-	udbinfo.listhead = &udb;
-	udbinfo.hashbase = hashinit(UDBHASHSIZE, M_PCB, &udbinfo.hashmask);
-}
-
-void
-udp_input(m, iphlen)
-	register struct mbuf *m;
-	int iphlen;
-{
-	register struct ip *ip;
-	register struct udphdr *uh;
-	register struct inpcb *inp;
-	struct mbuf *opts = 0;
-	int len;
-	struct ip save_ip;
-
-	udpstat.udps_ipackets++;
-
-	/*
-	 * Strip IP options, if any; should skip this,
-	 * make available to user, and use on returned packets,
-	 * but we don't yet have a way to check the checksum
-	 * with options still present.
-	 */
-	if (iphlen > sizeof (struct ip)) {
-		ip_stripoptions(m, (struct mbuf *)0);
-		iphlen = sizeof(struct ip);
-	}
-
-	/*
-	 * Get IP and UDP header together in first mbuf.
-	 */
-	ip = mtod(m, struct ip *);
-	if (m->m_len < iphlen + sizeof(struct udphdr)) {
-		if ((m = m_pullup(m, iphlen + sizeof(struct udphdr))) == 0) {
-			udpstat.udps_hdrops++;
-			return;
-		}
-		ip = mtod(m, struct ip *);
-	}
-	uh = (struct udphdr *)((caddr_t)ip + iphlen);
-
-	/*
-	 * Make mbuf data length reflect UDP length.
-	 * If not enough data to reflect UDP length, drop.
-	 */
-	len = ntohs((u_short)uh->uh_ulen);
-	if (ip->ip_len != len) {
-		if (len > ip->ip_len || len < sizeof(struct udphdr)) {
-			udpstat.udps_badlen++;
-			goto bad;
-		}
-		m_adj(m, len - ip->ip_len);
-		/* ip->ip_len = len; */
-	}
-	/*
-	 * Save a copy of the IP header in case we want restore it
-	 * for sending an ICMP error message in response.
-	 */
-	save_ip = *ip;
-
-	/*
-	 * Checksum extended UDP header and data.
-	 */
-	if (uh->uh_sum) {
-		((struct ipovly *)ip)->ih_next = 0;
-		((struct ipovly *)ip)->ih_prev = 0;
-		((struct ipovly *)ip)->ih_x1 = 0;
-		((struct ipovly *)ip)->ih_len = uh->uh_ulen;
-		uh->uh_sum = in_cksum(m, len + sizeof (struct ip));
-		if (uh->uh_sum) {
-			udpstat.udps_badsum++;
-			m_freem(m);
-			return;
-		}
-	}
-
-	if (IN_MULTICAST(ntohl(ip->ip_dst.s_addr)) ||
-	    in_broadcast(ip->ip_dst, m->m_pkthdr.rcvif)) {
-		struct inpcb *last;
-		/*
-		 * Deliver a multicast or broadcast datagram to *all* sockets
-		 * for which the local and remote addresses and ports match
-		 * those of the incoming datagram.  This allows more than
-		 * one process to receive multi/broadcasts on the same port.
-		 * (This really ought to be done for unicast datagrams as
-		 * well, but that would cause problems with existing
-		 * applications that open both address-specific sockets and
-		 * a wildcard socket listening to the same port -- they would
-		 * end up receiving duplicates of every unicast datagram.
-		 * Those applications open the multiple sockets to overcome an
-		 * inadequacy of the UDP socket interface, but for backwards
-		 * compatibility we avoid the problem here rather than
-		 * fixing the interface.  Maybe 4.5BSD will remedy this?)
-		 */
-
-		/*
-		 * Construct sockaddr format source address.
-		 */
-		udp_in.sin_port = uh->uh_sport;
-		udp_in.sin_addr = ip->ip_src;
-		m->m_len -= sizeof (struct udpiphdr);
-		m->m_data += sizeof (struct udpiphdr);
-		/*
-		 * Locate pcb(s) for datagram.
-		 * (Algorithm copied from raw_intr().)
-		 */
-		last = NULL;
-		for (inp = udb.lh_first; inp != NULL; inp = inp->inp_list.le_next) {
-			if (inp->inp_lport != uh->uh_dport)
-				continue;
-			if (inp->inp_laddr.s_addr != INADDR_ANY) {
-				if (inp->inp_laddr.s_addr !=
-				    ip->ip_dst.s_addr)
-					continue;
-			}
-			if (inp->inp_faddr.s_addr != INADDR_ANY) {
-				if (inp->inp_faddr.s_addr !=
-				    ip->ip_src.s_addr ||
-				    inp->inp_fport != uh->uh_sport)
-					continue;
-			}
-
-			if (last != NULL) {
-				struct mbuf *n;
-
-				if ((n = m_copy(m, 0, M_COPYALL)) != NULL) {
-					if (last->inp_flags & INP_CONTROLOPTS
-					    || last->inp_socket->so_options & SO_TIMESTAMP)
-						ip_savecontrol(last, &opts, ip, n);
-					if (sbappendaddr(&last->inp_socket->so_rcv,
-						(struct sockaddr *)&udp_in,
-						n, opts) == 0) {
-						m_freem(n);
-						if (opts)
-						    m_freem(opts);
-						udpstat.udps_fullsock++;
-					} else
-						sorwakeup(last->inp_socket);
-					opts = 0;
-				}
-			}
-			last = inp;
-			/*
-			 * Don't look for additional matches if this one does
-			 * not have either the SO_REUSEPORT or SO_REUSEADDR
-			 * socket options set.  This heuristic avoids searching
-			 * through all pcbs in the common case of a non-shared
-			 * port.  It * assumes that an application will never
-			 * clear these options after setting them.
-			 */
-			if (((last->inp_socket->so_options&(SO_REUSEPORT|SO_REUSEADDR)) == 0))
-				break;
-		}
-
-		if (last == NULL) {
-			/*
-			 * No matching pcb found; discard datagram.
-			 * (No need to send an ICMP Port Unreachable
-			 * for a broadcast or multicast datgram.)
-			 */
-			udpstat.udps_noportbcast++;
-			goto bad;
-		}
-		if (last->inp_flags & INP_CONTROLOPTS
-		    || last->inp_socket->so_options & SO_TIMESTAMP)
-			ip_savecontrol(last, &opts, ip, m);
-		if (sbappendaddr(&last->inp_socket->so_rcv,
-		     (struct sockaddr *)&udp_in,
-		     m, opts) == 0) {
-			udpstat.udps_fullsock++;
-			goto bad;
-		}
-		sorwakeup(last->inp_socket);
-		return;
-	}
-	/*
-	 * Locate pcb for datagram.
-	 */
-	inp = in_pcblookuphash(&udbinfo, ip->ip_src, uh->uh_sport,
-	    ip->ip_dst, uh->uh_dport, 1);
-	if (inp == NULL) {
-		if (log_in_vain) {
-			char buf[4*sizeof "123"];
-
-			strcpy(buf, inet_ntoa(ip->ip_dst));
-			log(LOG_INFO, "Connection attempt to UDP %s:%d"
-			    " from %s:%d\n",
-				buf, ntohs(uh->uh_dport),
-				inet_ntoa(ip->ip_src), ntohs(uh->uh_sport));
-		}
-		udpstat.udps_noport++;
-		if (m->m_flags & (M_BCAST | M_MCAST)) {
-			udpstat.udps_noportbcast++;
-			goto bad;
-		}
-		*ip = save_ip;
-		icmp_error(m, ICMP_UNREACH, ICMP_UNREACH_PORT, 0, 0);
-		return;
-	}
-
-	/*
-	 * Construct sockaddr format source address.
-	 * Stuff source address and datagram in user buffer.
-	 */
-	udp_in.sin_port = uh->uh_sport;
-	udp_in.sin_addr = ip->ip_src;
-	if (inp->inp_flags & INP_CONTROLOPTS
-	    || inp->inp_socket->so_options & SO_TIMESTAMP)
-		ip_savecontrol(inp, &opts, ip, m);
-	iphlen += sizeof(struct udphdr);
-	m->m_len -= iphlen;
-	m->m_pkthdr.len -= iphlen;
-	m->m_data += iphlen;
-	if (sbappendaddr(&inp->inp_socket->so_rcv, (struct sockaddr *)&udp_in,
-	    m, opts) == 0) {
-		udpstat.udps_fullsock++;
-		goto bad;
-	}
-	sorwakeup(inp->inp_socket);
-	return;
-bad:
-	m_freem(m);
-	if (opts)
-		m_freem(opts);
-}
-
-/*
- * Notify a udp user of an asynchronous error;
- * just wake up so that he can collect error status.
- */
-static void
-udp_notify(inp, errnum)
-	register struct inpcb *inp;
-	int errnum;
-{
-	inp->inp_socket->so_error = errnum;
-	sorwakeup(inp->inp_socket);
-	sowwakeup(inp->inp_socket);
-}
-
-void
-udp_ctlinput(cmd, sa, vip)
-	int cmd;
-	struct sockaddr *sa;
-	void *vip;
-{
-	register struct ip *ip = vip;
-	register struct udphdr *uh;
-
-	if (!PRC_IS_REDIRECT(cmd) &&
-	    ((unsigned)cmd >= PRC_NCMDS || inetctlerrmap[cmd] == 0))
-		return;
-	if (ip) {
-		uh = (struct udphdr *)((caddr_t)ip + (ip->ip_hl << 2));
-		in_pcbnotify(&udb, sa, uh->uh_dport, ip->ip_src, uh->uh_sport,
-			cmd, udp_notify);
-	} else
-		in_pcbnotify(&udb, sa, 0, zeroin_addr, 0, cmd, udp_notify);
-}
-
-static int
-udp_output(inp, m, addr, control)
-	register struct inpcb *inp;
-	register struct mbuf *m;
-	struct mbuf *addr, *control;
-{
-	register struct udpiphdr *ui;
-	register int len = m->m_pkthdr.len;
-	struct in_addr laddr;
-	int s = 0, error = 0;
-
-	if (control)
-		m_freem(control);		/* XXX */
-
-	if (len + sizeof(struct udpiphdr) > IP_MAXPACKET) {
-		error = EMSGSIZE;
-		goto release;
-	}
-
-	if (addr) {
-		laddr = inp->inp_laddr;
-		if (inp->inp_faddr.s_addr != INADDR_ANY) {
-			error = EISCONN;
-			goto release;
-		}
-		/*
-		 * Must block input while temporarily connected.
-		 */
-		s = splnet();
-		error = in_pcbconnect(inp, addr);
-		if (error) {
-			splx(s);
-			goto release;
-		}
-	} else {
-		if (inp->inp_faddr.s_addr == INADDR_ANY) {
-			error = ENOTCONN;
-			goto release;
-		}
-	}
-	/*
-	 * Calculate data length and get a mbuf
-	 * for UDP and IP headers.
-	 */
-	M_PREPEND(m, sizeof(struct udpiphdr), M_DONTWAIT);
-	if (m == 0) {
-		error = ENOBUFS;
-		if (addr)
-			splx(s);
-		goto release;
-	}
-
-	/*
-	 * Fill in mbuf with extended UDP header
-	 * and addresses and length put into network format.
-	 */
-	ui = mtod(m, struct udpiphdr *);
-	ui->ui_next = ui->ui_prev = 0;
-	ui->ui_x1 = 0;
-	ui->ui_pr = IPPROTO_UDP;
-	ui->ui_len = htons((u_short)len + sizeof (struct udphdr));
-	ui->ui_src = inp->inp_laddr;
-	ui->ui_dst = inp->inp_faddr;
-	ui->ui_sport = inp->inp_lport;
-	ui->ui_dport = inp->inp_fport;
-	ui->ui_ulen = ui->ui_len;
-
-	/*
-	 * Stuff checksum and output datagram.
-	 */
-	ui->ui_sum = 0;
-	if (udpcksum) {
-	    if ((ui->ui_sum = in_cksum(m, sizeof (struct udpiphdr) + len)) == 0)
-		ui->ui_sum = 0xffff;
-	}
-	((struct ip *)ui)->ip_len = sizeof (struct udpiphdr) + len;
-	((struct ip *)ui)->ip_ttl = inp->inp_ip_ttl;	/* XXX */
-	((struct ip *)ui)->ip_tos = inp->inp_ip_tos;	/* XXX */
-	udpstat.udps_opackets++;
-	error = ip_output(m, inp->inp_options, &inp->inp_route,
-	    inp->inp_socket->so_options & (SO_DONTROUTE | SO_BROADCAST),
-	    inp->inp_moptions);
-
-	if (addr) {
-		in_pcbdisconnect(inp);
-		inp->inp_laddr = laddr;
-		splx(s);
-	}
-	return (error);
-
-release:
-	m_freem(m);
-	return (error);
-}
-
-static u_long	udp_sendspace = 9216;		/* really max datagram size */
-					/* 40 1K datagrams */
-SYSCTL_INT(_net_inet_udp, UDPCTL_MAXDGRAM, maxdgram, CTLFLAG_RW,
-	&udp_sendspace, 0, "");
-
-static u_long	udp_recvspace = 40 * (1024 + sizeof(struct sockaddr_in));
-SYSCTL_INT(_net_inet_udp, UDPCTL_RECVSPACE, recvspace, CTLFLAG_RW,
-	&udp_recvspace, 0, "");
-
-/*ARGSUSED*/
-int
-udp_usrreq(so, req, m, addr, control)
-	struct socket *so;
-	int req;
-	struct mbuf *m, *addr, *control;
-{
-	struct inpcb *inp = sotoinpcb(so);
-	int error = 0;
-	int s;
-
-	if (req == PRU_CONTROL)
-		return (in_control(so, (u_long)m, (caddr_t)addr,
-			(struct ifnet *)control));
-	if (inp == NULL && req != PRU_ATTACH) {
-		error = EINVAL;
-		goto release;
-	}
-	/*
-	 * Note: need to block udp_input while changing
-	 * the udp pcb queue and/or pcb addresses.
-	 */
-	switch (req) {
-
-	case PRU_ATTACH:
-		if (inp != NULL) {
-			error = EINVAL;
-			break;
-		}
-		s = splnet();
-		error = in_pcballoc(so, &udbinfo);
-		splx(s);
-		if (error)
-			break;
-		error = soreserve(so, udp_sendspace, udp_recvspace);
-		if (error)
-			break;
-		((struct inpcb *) so->so_pcb)->inp_ip_ttl = ip_defttl;
-		break;
-
-	case PRU_DETACH:
-		udp_detach(inp);
-		break;
-
-	case PRU_BIND:
-		s = splnet();
-		error = in_pcbbind(inp, addr);
-		splx(s);
-		break;
-
-	case PRU_LISTEN:
-		error = EOPNOTSUPP;
-		break;
-
-	case PRU_CONNECT:
-		if (inp->inp_faddr.s_addr != INADDR_ANY) {
-			error = EISCONN;
-			break;
-		}
-		s = splnet();
-		error = in_pcbconnect(inp, addr);
-		splx(s);
-		if (error == 0)
-			soisconnected(so);
-		break;
-
-	case PRU_CONNECT2:
-		error = EOPNOTSUPP;
-		break;
-
-	case PRU_ACCEPT:
-		error = EOPNOTSUPP;
-		break;
-
-	case PRU_DISCONNECT:
-		if (inp->inp_faddr.s_addr == INADDR_ANY) {
-			error = ENOTCONN;
-			break;
-		}
-		s = splnet();
-		in_pcbdisconnect(inp);
-		inp->inp_laddr.s_addr = INADDR_ANY;
-		splx(s);
-		so->so_state &= ~SS_ISCONNECTED;		/* XXX */
-		break;
-
-	case PRU_SHUTDOWN:
-		socantsendmore(so);
-		break;
-
-	case PRU_SEND:
-		return (udp_output(inp, m, addr, control));
-
-	case PRU_ABORT:
-		soisdisconnected(so);
-		udp_detach(inp);
-		break;
-
-	case PRU_SOCKADDR:
-		in_setsockaddr(inp, addr);
-		break;
-
-	case PRU_PEERADDR:
-		in_setpeeraddr(inp, addr);
-		break;
-
-	case PRU_SENSE:
-		/*
-		 * stat: don't bother with a blocksize.
-		 */
-		return (0);
-
-	case PRU_SENDOOB:
-	case PRU_FASTTIMO:
-	case PRU_SLOWTIMO:
-	case PRU_PROTORCV:
-	case PRU_PROTOSEND:
-		error =  EOPNOTSUPP;
-		break;
-
-	case PRU_RCVD:
-	case PRU_RCVOOB:
-		return (EOPNOTSUPP);	/* do not free mbuf's */
-
-	default:
-		panic("udp_usrreq");
-	}
-
-release:
-	if (control) {
-		printf("udp control data unexpectedly retained\n");
-		m_freem(control);
-	}
-	if (m)
-		m_freem(m);
-	return (error);
-}
-
-static void
-udp_detach(inp)
-	struct inpcb *inp;
-{
-	int s = splnet();
-
-	in_pcbdetach(inp);
-	splx(s);
-}
diff --git a/c/src/libnetworking/netinet/udp_var.h b/c/src/libnetworking/netinet/udp_var.h
deleted file mode 100644
index 90785b53de..0000000000
--- a/c/src/libnetworking/netinet/udp_var.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)udp_var.h	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#ifndef _NETINET_UDP_VAR_H_
-#define _NETINET_UDP_VAR_H_
-
-/*
- * UDP kernel structures and variables.
- */
-struct	udpiphdr {
-	struct 	ipovly ui_i;		/* overlaid ip structure */
-	struct	udphdr ui_u;		/* udp header */
-};
-#define	ui_next		ui_i.ih_next
-#define	ui_prev		ui_i.ih_prev
-#define	ui_x1		ui_i.ih_x1
-#define	ui_pr		ui_i.ih_pr
-#define	ui_len		ui_i.ih_len
-#define	ui_src		ui_i.ih_src
-#define	ui_dst		ui_i.ih_dst
-#define	ui_sport	ui_u.uh_sport
-#define	ui_dport	ui_u.uh_dport
-#define	ui_ulen		ui_u.uh_ulen
-#define	ui_sum		ui_u.uh_sum
-
-struct	udpstat {
-				/* input statistics: */
-	u_long	udps_ipackets;		/* total input packets */
-	u_long	udps_hdrops;		/* packet shorter than header */
-	u_long	udps_badsum;		/* checksum error */
-	u_long	udps_badlen;		/* data length larger than packet */
-	u_long	udps_noport;		/* no socket on port */
-	u_long	udps_noportbcast;	/* of above, arrived as broadcast */
-	u_long	udps_fullsock;		/* not delivered, input socket full */
-	u_long	udpps_pcbcachemiss;	/* input packets missing pcb cache */
-	u_long	udpps_pcbhashmiss;	/* input packets not for hashed pcb */
-				/* output statistics: */
-	u_long	udps_opackets;		/* total output packets */
-};
-
-/*
- * Names for UDP sysctl objects
- */
-#define	UDPCTL_CHECKSUM		1	/* checksum UDP packets */
-#define UDPCTL_STATS		2	/* statistics (read-only) */
-#define	UDPCTL_MAXDGRAM		3	/* max datagram size */
-#define	UDPCTL_RECVSPACE	4	/* default receive buffer space */
-#define UDPCTL_MAXID		5
-
-#define UDPCTL_NAMES { \
-	{ 0, 0 }, \
-	{ "checksum", CTLTYPE_INT }, \
-	{ "stats", CTLTYPE_STRUCT }, \
-	{ "maxdgram", CTLTYPE_INT }, \
-	{ "recvspace", CTLTYPE_INT }, \
-}
-
-#ifdef KERNEL
-extern struct	inpcbhead udb;
-extern struct	inpcbinfo udbinfo;
-extern struct	udpstat udpstat;
-
-void	 udp_ctlinput __P((int, struct sockaddr *, void *));
-void	 udp_init __P((void));
-void	 udp_input __P((struct mbuf *, int));
-int	 udp_usrreq __P((struct socket *,
-	    int, struct mbuf *, struct mbuf *, struct mbuf *));
-#endif
-
-#endif
diff --git a/c/src/libnetworking/nfs/Makefile.in b/c/src/libnetworking/nfs/Makefile.in
deleted file mode 100644
index 404d85040a..0000000000
--- a/c/src/libnetworking/nfs/Makefile.in
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-LIBNAME=lib.a
-LIB=${ARCH}/${LIBNAME}
-
-# C and C++ source names, if any, go here -- minus the .c or .cc
-C_PIECES= bootp_subr
-C_FILES=$(C_PIECES:%=%.c)
-C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
-
-SRCS=$(C_FILES)
-OBJS=$(C_O_FILES)
-
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/lib.cfg
-
-#
-# Add local stuff here using +=
-#
-
-DEFINES  += -D_COMPILING_BSD_KERNEL_ -DKERNEL -DINET -DNFS \
-    -DDIAGNOSTIC -DBOOTP_COMPAT
-CPPFLAGS +=
-CFLAGS   +=
-
-#
-# Add your list of files to delete here.  The config files
-#  already know how to delete some stuff, so you may want
-#  to just run 'make clean' first to see what gets missed.
-#  'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS += $(LIB)
-CLOBBER_ADDITIONS +=
-
-all:	${ARCH} $(LIB)
-
-$(LIB): $(SRCS) ${OBJS}
-	$(make-library)
diff --git a/c/src/libnetworking/nfs/bootp_subr.c b/c/src/libnetworking/nfs/bootp_subr.c
deleted file mode 100644
index cb7d3d3407..0000000000
--- a/c/src/libnetworking/nfs/bootp_subr.c
+++ /dev/null
@@ -1,968 +0,0 @@
-/*	$Id$	*/
-
-/*
- * Copyright (c) 1995 Gordon Ross, Adam Glass
- * Copyright (c) 1992 Regents of the University of California.
- * All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Lawrence Berkeley Laboratory and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * based on:
- *      nfs/krpc_subr.c
- *	$NetBSD: krpc_subr.c,v 1.10 1995/08/08 20:43:43 gwr Exp $
- */
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/conf.h>
-#include <sys/sockio.h>
-#include <sys/proc.h>
-#include <sys/mount.h>
-#include <sys/mbuf.h>
-#include <sys/reboot.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-
-#include <net/if.h>
-#include <net/route.h>
-
-#include <netinet/in.h>
-#include <net/if_types.h>
-#include <net/if_dl.h>
-#include <netinet/if_ether.h>
-
-#include <nfs/rpcv2.h>
-#include <nfs/nfsproto.h>
-#include <nfs/nfs.h>
-#include <nfs/nfsdiskless.h>
-#include <nfs/krpc.h>
-#include <nfs/xdr_subs.h>
-
-#define BOOTP_MIN_LEN		300	/* Minimum size of bootp udp packet */
-
-/*
- * What is the longest we will wait before re-sending a request?
- * Note this is also the frequency of "RPC timeout" messages.
- * The re-send loop count sup linearly to this maximum, so the
- * first complaint will happen after (1+2+3+4+5)=15 seconds.
- */
-#define	MAX_RESEND_DELAY 5	/* seconds */
-
-/* Definitions from RFC951 */
-struct bootp_packet {
-  u_int8_t op;
-  u_int8_t htype;
-  u_int8_t hlen;
-  u_int8_t hops;
-  u_int32_t xid;
-  u_int16_t secs;
-  u_int16_t flags;
-  struct in_addr ciaddr;
-  struct in_addr yiaddr;
-  struct in_addr siaddr;
-  struct in_addr giaddr;
-  unsigned char chaddr[16];
-  char sname[64];
-  char file[128];
-  unsigned char vend[256];
-};
-
-#define IPPORT_BOOTPC 68
-#define IPPORT_BOOTPS 67
-
-extern int nfs_diskless_valid;
-extern struct nfsv3_diskless nfsv3_diskless;
-
-/* mountd RPC */
-#if !defined(__rtems__)
-static int md_mount __P((struct sockaddr_in *mdsin, char *path,
-	u_char *fhp, int *fhsizep, struct nfs_args *args,struct proc *procp));
-static int md_lookup_swap __P((struct sockaddr_in *mdsin,char *path,
-			       u_char *fhp, int *fhsizep, 
-			       struct nfs_args *args,
-			       struct proc *procp));
-static int setfs __P((struct sockaddr_in *addr, char *path, char *p));
-#endif
-static int getdec __P((char **ptr));
-static char *substr __P((char *a,char *b));
-#if !defined(__rtems__)
-static void mountopts __P((struct nfs_args *args, char *p)); 
-static int xdr_opaque_decode __P((struct mbuf **ptr,u_char *buf,
-				  int len));
-static int xdr_int_decode __P((struct mbuf **ptr,int *iptr));
-#endif
-static void printip __P((char *prefix,struct in_addr addr));
-
-#ifdef BOOTP_DEBUG
-void bootpboot_p_sa(struct sockaddr *sa,struct sockaddr *ma);
-void bootpboot_p_ma(struct sockaddr *ma);
-void bootpboot_p_rtentry(struct rtentry *rt);
-void bootpboot_p_tree(struct radix_node *rn);
-void bootpboot_p_rtlist(void);
-void bootpboot_p_iflist(void);
-#endif
-
-int  bootpc_call(struct bootp_packet *call,
-		 struct bootp_packet *reply,
-		 struct proc *procp);
-
-int bootpc_fakeup_interface(struct ifreq *ireq,struct socket *so,
-			struct proc *procp);
-
-int 
-bootpc_adjust_interface(struct ifreq *ireq,struct socket *so,
-			struct sockaddr_in *myaddr,
-			struct sockaddr_in *netmask,
-			struct sockaddr_in *gw,
-			struct proc *procp);
-
-void bootpc_init(void);
-
-#ifdef BOOTP_DEBUG
-void bootpboot_p_sa(sa,ma)
-     struct sockaddr *sa;
-     struct sockaddr *ma;
-{
-  if (!sa) {
-    printf("(sockaddr *) <null>");
-    return;
-  }
-  switch (sa->sa_family) {
-  case AF_INET:
-    {
-      struct sockaddr_in *sin = (struct sockaddr_in *) sa;
-      printf("inet %x",ntohl(sin->sin_addr.s_addr));
-      if (ma) {
-	struct sockaddr_in *sin = (struct sockaddr_in *) ma;
-	printf(" mask %x",ntohl(sin->sin_addr.s_addr));
-      }
-    }
-  break;
-  case AF_LINK:
-    {
-      struct sockaddr_dl *sli = (struct sockaddr_dl *) sa;
-      int i;
-      printf("link %.*s ",sli->sdl_nlen,sli->sdl_data);
-      for (i=0;i<sli->sdl_alen;i++) {
-	if (i>0)
-	  printf(":");
-	printf("%x",(unsigned char) sli->sdl_data[i+sli->sdl_nlen]);
-      }
-    }
-  break;
-  default:
-    printf("af%d",sa->sa_family);
-  }
-}
-
-void bootpboot_p_ma(ma)
-     struct sockaddr *ma;
-{
-  if (!ma) {
-    printf("<null>");
-    return;
-  }
-  printf("%x",*(int*)ma);
-}
-
-void bootpboot_p_rtentry(rt)
-     struct rtentry *rt;
-{
-  bootpboot_p_sa(rt_key(rt),rt_mask(rt));
-  printf(" ");
-  bootpboot_p_ma(rt->rt_genmask);
-  printf(" ");
-  bootpboot_p_sa(rt->rt_gateway,NULL);
-  printf(" ");
-  printf("flags %x",(unsigned short) rt->rt_flags);
-  printf(" %d",rt->rt_rmx.rmx_expire);
-  printf(" %s%d\n",rt->rt_ifp->if_name,rt->rt_ifp->if_unit);
-}
-void  bootpboot_p_tree(rn)
-     struct radix_node *rn;
-{
-  while (rn) {
-    if (rn->rn_b < 0) {
-      if (rn->rn_flags & RNF_ROOT) {
-      } else {
-	bootpboot_p_rtentry((struct rtentry *) rn);
-      }
-      rn = rn->rn_dupedkey;
-    } else {
-      bootpboot_p_tree(rn->rn_l);
-      bootpboot_p_tree(rn->rn_r);
-      return;
-    }
-    
-  }
-}
-
-void bootpboot_p_rtlist(void)
-{
-  printf("Routing table:\n");
-  bootpboot_p_tree(rt_tables[AF_INET]->rnh_treetop);
-}
-
-void bootpboot_p_iflist(void)
-{
-  struct ifnet *ifp;
-  struct ifaddr *ifa;
-  printf("Interface list:\n");
-  for (ifp = TAILQ_FIRST(&ifnet); ifp != 0; ifp = TAILQ_NEXT(ifp,if_link))
-    {
-      for (ifa = TAILQ_FIRST(&ifp->if_addrhead) ;ifa; 
-	   ifa=TAILQ_NEXT(ifa,ifa_link))
-	if (ifa->ifa_addr->sa_family == AF_INET ) {
-	  printf("%s%d flags %x, addr %x, bcast %x, net %x\n",
-		 ifp->if_name,ifp->if_unit,
-		 (unsigned short) ifp->if_flags,
-		 ntohl(((struct sockaddr_in *) ifa->ifa_addr)->sin_addr.s_addr),
-		 ntohl(((struct sockaddr_in *) ifa->ifa_dstaddr)->sin_addr.s_addr),
-		 ntohl(((struct sockaddr_in *) ifa->ifa_netmask)->sin_addr.s_addr)
-		 );
-	}
-    }
-}
-#endif
-
-int
-bootpc_call(call,reply,procp)
-     struct bootp_packet *call;
-     struct bootp_packet *reply;	/* output */
-     struct proc *procp;
-{
-	struct socket *so;
-	struct sockaddr_in *sin;
-	struct mbuf *m, *nam;
-	struct uio auio;
-	struct iovec aio;
-	int error, rcvflg, timo, secs, len;
-
-	/* Free at end if not null. */
-	nam = NULL;
-
-	/*
-	 * Create socket and set its recieve timeout.
-	 */
-	if ((error = socreate(AF_INET, &so, SOCK_DGRAM, 0,procp)))
-		goto out;
-
-	m = m_get(M_WAIT, MT_SOOPTS);
-	if (m == NULL) {
-		error = ENOBUFS;
-		goto out;
-	} else {
-		struct timeval *tv;
-		tv = mtod(m, struct timeval *);
-		m->m_len = sizeof(*tv);
-		tv->tv_sec = 1;
-		tv->tv_usec = 0;
-		if ((error = sosetopt(so, SOL_SOCKET, SO_RCVTIMEO, m)))
-			goto out;
-	}
-
-	/*
-	 * Enable broadcast.
-	 */
-	{
-		int *on;
-		m = m_get(M_WAIT, MT_SOOPTS);
-		if (m == NULL) {
-			error = ENOBUFS;
-			goto out;
-		}
-		on = mtod(m, int *);
-		m->m_len = sizeof(*on);
-		*on = 1;
-		if ((error = sosetopt(so, SOL_SOCKET, SO_BROADCAST, m)))
-			goto out;
-	}
-
-	/*
-	 * Bind the local endpoint to a bootp client port.
-	 */
-	m = m_getclr(M_WAIT, MT_SONAME);
-	sin = mtod(m, struct sockaddr_in *);
-	sin->sin_len = m->m_len = sizeof(*sin);
-	sin->sin_family = AF_INET;
-	sin->sin_addr.s_addr = INADDR_ANY;
-	sin->sin_port = htons(IPPORT_BOOTPC);
-	error = sobind(so, m);
-	m_freem(m);
-	if (error) {
-		printf("bind failed\n");
-		goto out;
-	}
-
-	/*
-	 * Setup socket address for the server.
-	 */
-	nam = m_get(M_WAIT, MT_SONAME);
-	if (nam == NULL) {
-		error = ENOBUFS;
-		goto out;
-	}
-	sin = mtod(nam, struct sockaddr_in *);
-	sin-> sin_len = sizeof(*sin);
-	sin-> sin_family = AF_INET;
-	sin->sin_addr.s_addr = INADDR_BROADCAST;
-	sin->sin_port = htons(IPPORT_BOOTPS);
-
-	nam->m_len = sizeof(*sin);
-
-	/*
-	 * Send it, repeatedly, until a reply is received,
-	 * but delay each re-send by an increasing amount.
-	 * If the delay hits the maximum, start complaining.
-	 */
-	timo = 0;
-	for (;;) {
-		/* Send BOOTP request (or re-send). */
-		
-		aio.iov_base = (caddr_t) call;
-		aio.iov_len = sizeof(*call);
-		
-		auio.uio_iov = &aio;
-		auio.uio_iovcnt = 1;
-		auio.uio_segflg = UIO_SYSSPACE;
-		auio.uio_rw = UIO_WRITE;
-		auio.uio_offset = 0;
-		auio.uio_resid = sizeof(*call);
-		auio.uio_procp = procp;
-
-		error = sosend(so, nam, &auio, NULL, NULL, 0);
-		if (error) {
-			printf("bootpc_call: sosend: %d\n", error);
-			goto out;
-		}
-
-		/* Determine new timeout. */
-		if (timo < MAX_RESEND_DELAY)
-			timo++;
-		else
-			printf("BOOTP timeout for server 0x%x\n",
-			       (int)ntohl(sin->sin_addr.s_addr));
-
-		/*
-		 * Wait for up to timo seconds for a reply.
-		 * The socket receive timeout was set to 1 second.
-		 */
-		secs = timo;
-		while (secs > 0) {
-			aio.iov_base = (caddr_t) reply;
-			aio.iov_len = sizeof(*reply);
-
-			auio.uio_iov = &aio;
-			auio.uio_iovcnt = 1;
-			auio.uio_segflg = UIO_SYSSPACE;
-			auio.uio_rw = UIO_READ;
-			auio.uio_offset = 0;
-			auio.uio_resid = sizeof(*reply);
-			auio.uio_procp = procp;
-			
-			rcvflg = 0;
-			error = soreceive(so, NULL, &auio, NULL, NULL, &rcvflg);
-			if (error == EWOULDBLOCK) {
-				secs--;
-				call->secs=htons(ntohs(call->secs)+1);
-				continue;
-			}
-			if (error)
-				goto out;
-			len = sizeof(*reply) - auio.uio_resid;
-
-			/* Do we have the required number of bytes ? */
-			if (len < BOOTP_MIN_LEN)
-				continue;
-
-			/* Is it the right reply? */
-			if (reply->op != 2)
-			  continue;
-
-			if (reply->xid != call->xid)
-				continue;
-
-			if (reply->hlen != call->hlen)
-			  continue;
-
-			if (bcmp(reply->chaddr,call->chaddr,call->hlen))
-			  continue;
-
-			goto gotreply;	/* break two levels */
-
-		} /* while secs */
-	} /* forever send/receive */
-
-	error = ETIMEDOUT;
-	goto out;
-
- gotreply:
- out:
-	if (nam) m_freem(nam);
-	soclose(so);
-	return error;
-}
-
-int 
-bootpc_fakeup_interface(struct ifreq *ireq,struct socket *so,
-			struct proc *procp)
-{
-  struct sockaddr_in *sin;
-  int error;
-  struct sockaddr_in dst;
-  struct sockaddr_in gw;
-  struct sockaddr_in mask;
-
-  /*
-   * Bring up the interface.
-   *
-   * Get the old interface flags and or IFF_UP into them; if
-   * IFF_UP set blindly, interface selection can be clobbered.
-   */
-  error = ifioctl(so, SIOCGIFFLAGS, (caddr_t)ireq, procp);
-  if (error)
-    panic("bootpc_fakeup_interface: GIFFLAGS, error=%d", error);
-  ireq->ifr_flags |= IFF_UP;
-  error = ifioctl(so, SIOCSIFFLAGS, (caddr_t)ireq, procp);
-  if (error)
-    panic("bootpc_fakeup_interface: SIFFLAGS, error=%d", error);
-
-  /*
-   * Do enough of ifconfig(8) so that the chosen interface
-   * can talk to the servers.  (just set the address)
-   */
-  
-  /* addr is 0.0.0.0 */
-  
-  sin = (struct sockaddr_in *)&ireq->ifr_addr;
-  bzero((caddr_t)sin, sizeof(*sin));
-  sin->sin_len = sizeof(*sin);
-  sin->sin_family = AF_INET;
-  sin->sin_addr.s_addr = INADDR_ANY;
-  error = ifioctl(so, SIOCSIFADDR, (caddr_t)ireq, procp);
-  if (error)
-    panic("bootpc_fakeup_interface: set if addr, error=%d", error);
-  
-  /* netmask is 0.0.0.0 */
-  
-  sin = (struct sockaddr_in *)&ireq->ifr_addr;
-  bzero((caddr_t)sin, sizeof(*sin));
-  sin->sin_len = sizeof(*sin);
-  sin->sin_family = AF_INET;
-  sin->sin_addr.s_addr = INADDR_ANY;
-  error = ifioctl(so, SIOCSIFNETMASK, (caddr_t)ireq, procp);
-  if (error)
-    panic("bootpc_fakeup_interface: set if net addr, error=%d", error);
-  
-  /* Broadcast is 255.255.255.255 */
-  
-  sin = (struct sockaddr_in *)&ireq->ifr_addr;
-  bzero((caddr_t)sin, sizeof(*sin));
-  sin->sin_len = sizeof(*sin);
-  sin->sin_family = AF_INET;
-  sin->sin_addr.s_addr = INADDR_BROADCAST;
-  error = ifioctl(so, SIOCSIFBRDADDR, (caddr_t)ireq, procp);
-  if (error)
-    panic("bootpc_fakeup_interface: set if broadcast addr, error=%d", error);
-  
-  /* Add default route to 0.0.0.0 so we can send data */
-  
-  bzero((caddr_t) &dst, sizeof(dst));
-  dst.sin_len=sizeof(dst);
-  dst.sin_family=AF_INET;
-  dst.sin_addr.s_addr = htonl(0);
-  
-  bzero((caddr_t) &gw, sizeof(gw));
-  gw.sin_len=sizeof(gw);
-  gw.sin_family=AF_INET;
-  gw.sin_addr.s_addr = htonl(0x0);
-  
-  bzero((caddr_t) &mask, sizeof(mask));
-  mask.sin_len=sizeof(mask);
-  mask.sin_family=AF_INET;
-  mask.sin_addr.s_addr = htonl(0);
-  
-  error = rtrequest(RTM_ADD, 
-		    (struct sockaddr *) &dst, 
-		    (struct sockaddr *) &gw,
-		    (struct sockaddr *) &mask, 
-		    RTF_UP | RTF_STATIC
-		    , NULL);
-  if (error)
-    printf("bootpc_fakeup_interface: add default route, error=%d\n", error);
-  return error;
-}
-
-int 
-bootpc_adjust_interface(struct ifreq *ireq,struct socket *so,
-			struct sockaddr_in *myaddr,
-			struct sockaddr_in *netmask,
-			struct sockaddr_in *gw,
-			struct proc *procp)
-{
-  int error;
-  struct sockaddr_in oldgw;
-  struct sockaddr_in olddst;
-  struct sockaddr_in oldmask;
-  struct sockaddr_in *sin;
-
-  /* Remove old default route to 0.0.0.0 */
-  
-  bzero((caddr_t) &olddst, sizeof(olddst));
-  olddst.sin_len=sizeof(olddst);
-  olddst.sin_family=AF_INET;
-  olddst.sin_addr.s_addr = INADDR_ANY;
-  
-  bzero((caddr_t) &oldgw, sizeof(oldgw));
-  oldgw.sin_len=sizeof(oldgw);
-  oldgw.sin_family=AF_INET;
-  oldgw.sin_addr.s_addr = INADDR_ANY;
-  
-  bzero((caddr_t) &oldmask, sizeof(oldmask));
-  oldmask.sin_len=sizeof(oldmask);
-  oldmask.sin_family=AF_INET;
-  oldmask.sin_addr.s_addr = INADDR_ANY;
-  
-  error = rtrequest(RTM_DELETE, 
-		    (struct sockaddr *) &olddst,
-		    (struct sockaddr *) &oldgw,
-		    (struct sockaddr *) &oldmask, 
-		    (RTF_UP | RTF_STATIC), NULL);
-  if (error) {
-    printf("nfs_boot: del default route, error=%d\n", error);
-    return error;
-  }
-
-  /*
-   * Do enough of ifconfig(8) so that the chosen interface
-   * can talk to the servers.  (just set the address)
-   */
-  bcopy(netmask,&ireq->ifr_addr,sizeof(*netmask));
-  error = ifioctl(so, SIOCSIFNETMASK, (caddr_t)ireq, procp);
-  if (error)
-    panic("nfs_boot: set if netmask, error=%d", error);
-
-  /* Broadcast is with host part of IP address all 1's */
-  
-  sin = (struct sockaddr_in *)&ireq->ifr_addr;
-  bzero((caddr_t)sin, sizeof(*sin));
-  sin->sin_len = sizeof(*sin);
-  sin->sin_family = AF_INET;
-  sin->sin_addr.s_addr = myaddr->sin_addr.s_addr | ~ netmask->sin_addr.s_addr;
-  error = ifioctl(so, SIOCSIFBRDADDR, (caddr_t)ireq, procp);
-  if (error)
-    panic("bootpc_call: set if broadcast addr, error=%d", error);
-  
-  bcopy(myaddr,&ireq->ifr_addr,sizeof(*myaddr));
-  error = ifioctl(so, SIOCSIFADDR, (caddr_t)ireq, procp);
-  if (error)
-    panic("nfs_boot: set if addr, error=%d", error);
-
-  /* Add new default route */
-
-  error = rtrequest(RTM_ADD, 
-		    (struct sockaddr *) &olddst,
-		    (struct sockaddr *) gw,
-		    (struct sockaddr *) &oldmask,
-		    (RTF_UP | RTF_GATEWAY | RTF_STATIC), NULL);
-  if (error) {
-    printf("nfs_boot: add net route, error=%d\n", error);
-    return error;
-  }
-
-  return 0;
-}
-
-#if !defined(__rtems__)
-static int setfs(addr, path, p)
-	struct sockaddr_in *addr;
-	char *path;
-	char *p;
-{
-	unsigned ip = 0;
-	int val;
-
-	if (((val = getdec(&p)) < 0) || (val > 255)) return(0);
-	ip = val << 24;
-	if (*p != '.') return(0);
-	p++;
-	if (((val = getdec(&p)) < 0) || (val > 255)) return(0);
-	ip |= (val << 16);
-	if (*p != '.') return(0);
-	p++;
-	if (((val = getdec(&p)) < 0) || (val > 255)) return(0);
-	ip |= (val << 8);
-	if (*p != '.') return(0);
-	p++;
-	if (((val = getdec(&p)) < 0) || (val > 255)) return(0);
-	ip |= val;
-	if (*p != ':') return(0);
-	p++;
-
-	addr->sin_addr.s_addr = htonl(ip);
-	addr->sin_len = sizeof(struct sockaddr_in);
-	addr->sin_family = AF_INET;
-
-	strncpy(path,p,MNAMELEN-1);
-	return(1);
-}
-#endif
-
-static int getdec(ptr)
-	char **ptr;
-{
-	char *p = *ptr;
-	int ret=0;
-	if ((*p < '0') || (*p > '9')) return(-1);
-	while ((*p >= '0') && (*p <= '9')) {
-		ret = ret*10 + (*p - '0');
-		p++;
-	}
-	*ptr = p;
-	return(ret);
-}
-
-static char *substr(a,b)
-	char *a,*b;
-{
-	char *loc1;
-	char *loc2;
-
-        while (*a != '\0') {
-                loc1 = a;
-                loc2 = b;
-                while (*loc1 == *loc2++) {
-                        if (*loc1 == '\0') return (0);
-                        loc1++;
-                        if (*loc2 == '\0') return (loc1);
-                }
-        a++;
-        }
-        return (0);
-}
-
-static void printip(char *prefix,struct in_addr addr)
-{
-  unsigned int ip;
-
-  ip = ntohl(addr.s_addr);
-
-  printf("%s is %d.%d.%d.%d\n",prefix,
-	 ip >> 24, (ip >> 16) & 255 ,(ip >> 8) & 255 ,ip & 255 );
-}
-
-void
-bootpc_init(void)
-{
-  struct bootp_packet call;
-  struct bootp_packet reply;
-  static u_int32_t xid = ~0xFF;
-  
-  struct ifreq ireq;
-  struct ifnet *ifp;
-  struct socket *so;
-  int error;
-  int code,ncode,len;
-  int j;
-  char *p;
-  unsigned int ip;
-
-  struct sockaddr_in myaddr;
-  struct sockaddr_in netmask;
-  struct sockaddr_in gw;
-  int gotgw=0;
-  int gotnetmask=0;
-#if !defined(__rtems__)
-  int gotrootpath=0;
-  int gotswappath=0;
-#endif
-  char lookup_path[24];
-
-#define EALEN 6
-#if !defined(__rtems__)
-  unsigned char ea[EALEN];
-#endif
-  struct ifaddr *ifa;
-  struct sockaddr_dl *sdl = NULL;
-  char *delim;
-  struct proc *procp = NULL;
-
-  /*
-   * If already filled in, don't touch it here 
-   */
-  if (nfs_diskless_valid)
-    return;
-
-  /*
-   * Bump time if 0.
-  if (!time.tv_sec)
-    time.tv_sec++;
-   */
-
-  /*
-   * Find a network interface.
-   */
-  for (ifp = ifnet; ifp != 0; ifp = ifp->if_next)
-    if ((ifp->if_flags &
-      (IFF_LOOPBACK|IFF_POINTOPOINT)) == 0)
-	break;
-  if (ifp == NULL)
-    panic("bootpc_init: no suitable interface");
-  bzero(&ireq,sizeof(ireq));
-  sprintf(ireq.ifr_name, "%s%d", ifp->if_name,ifp->if_unit);
-  printf("bootpc_init: using network interface '%s'\n",
-	 ireq.ifr_name);
-
-  if ((error = socreate(AF_INET, &so, SOCK_DGRAM, 0,procp)) != 0)
-    panic("nfs_boot: socreate, error=%d", error);
-	  
-  bootpc_fakeup_interface(&ireq,so,procp);
-
-  printf("Bootpc testing starting\n");
-  
-  /* Get HW address */
-
-  for (ifa = ifp->if_addrlist;ifa; ifa = ifa->ifa_next)
-    if (ifa->ifa_addr->sa_family == AF_LINK &&
-	(sdl = ((struct sockaddr_dl *) ifa->ifa_addr)) &&
-	sdl->sdl_type == IFT_ETHER)
-      break;
-  
-  if (!sdl)
-    panic("bootpc: Unable to find HW address");
-  if (sdl->sdl_alen != EALEN ) 
-    panic("bootpc: HW address len is %d, expected value is %d",
-	  sdl->sdl_alen,EALEN);
-
-  printf("bootpc hw address is ");
-  delim="";
-  for (j=0;j<sdl->sdl_alen;j++) {
-    printf("%s%x",delim,((unsigned char *)LLADDR(sdl))[j]);
-    delim=":";
-  }
-  printf("\n");
-
-#if 0
-  bootpboot_p_iflist();
-  bootpboot_p_rtlist();
-#endif
-  
-  bzero((caddr_t) &call, sizeof(call));
-
-  /* bootpc part */
-  call.op = 1; 			/* BOOTREQUEST */
-  call.htype= 1;		/* 10mb ethernet */
-  call.hlen=sdl->sdl_alen;	/* Hardware address length */
-  call.hops=0;	
-  xid++;
-  call.xid = txdr_unsigned(xid);
-  bcopy(LLADDR(sdl),&call.chaddr,sdl->sdl_alen);
-  
-  call.vend[0]=99;
-  call.vend[1]=130;
-  call.vend[2]=83;
-  call.vend[3]=99;
-  call.vend[4]=255;
-  
-  call.secs = 0;
-  call.flags = htons(0x8000); /* We need an broadcast answer */
-  
-  error = bootpc_call(&call,&reply,procp);
-  
-  if (error)
-    panic("BOOTP call failed -- error %d", error);
-  
-  bzero(&myaddr,sizeof(myaddr));
-  bzero(&netmask,sizeof(netmask));
-  bzero(&gw,sizeof(gw));
-
-  myaddr.sin_len = sizeof(myaddr);
-  myaddr.sin_family = AF_INET;
-
-  netmask.sin_len = sizeof(netmask);
-  netmask.sin_family = AF_INET;
-
-  gw.sin_len = sizeof(gw);
-  gw.sin_family= AF_INET;
-
-  rtems_bsdnet_bootp_server_address = reply.siaddr;
-  rtems_bsdnet_log_host_address = reply.siaddr;
-
-  myaddr.sin_addr = reply.yiaddr;
-
-  ip = ntohl(myaddr.sin_addr.s_addr);
-  sprintf(lookup_path,"swap.%d.%d.%d.%d",
-	  ip >> 24, (ip >> 16) & 255 ,(ip >> 8) & 255 ,ip & 255 );
-
-  printip("My ip address",myaddr.sin_addr);
-
-  printip("Server ip address",reply.siaddr);
-
-  gw.sin_addr = reply.giaddr;
-  printip("Gateway ip address",reply.giaddr);
-
-  if (reply.sname[0])
-    printf("Server name is %s\n",reply.sname);
-  if (reply.file[0])
-    printf("boot file is %s\n",reply.file);
-  rtems_bsdnet_bootp_boot_file_name = strdup (reply.file);
-  if (reply.vend[0]==99 && reply.vend[1]==130 &&
-      reply.vend[2]==83 && reply.vend[3]==99) {
-    j=4;
-    ncode = reply.vend[j];
-    while (j<sizeof(reply.vend)) {
-      code = reply.vend[j] = ncode;
-      if (code==255)
-	break;
-      if (code==0) {
-	j++;
-	continue;
-      }
-      len = reply.vend[j+1];
-      j+=2;
-      if (len+j>=sizeof(reply.vend)) {
-	printf("Truncated field");
-	break;
-      }
-      ncode = reply.vend[j+len];
-      reply.vend[j+len]='\0';
-      p = &reply.vend[j];
-      switch (code) {
-      case 1:
-	if (len!=4) 
-	  panic("bootpc: subnet mask len is %d",len);
-	bcopy(&reply.vend[j],&netmask.sin_addr,4);
-	gotnetmask=1;
-	printip("Subnet mask",netmask.sin_addr);
-	break;
-      case 6:
-	/* Domain Name servers */
-	if (len % 4) 
-	  panic("bootpc: DNS Len is %d",len);
-	{
-	int dlen = 0;
-	while ((dlen < len) &&
-	  (rtems_bsdnet_nameserver_count < sizeof rtems_bsdnet_config.name_server /
-				  sizeof rtems_bsdnet_config.name_server[0])) {
-	    bcopy(&reply.vend[j+dlen],
-			&rtems_bsdnet_nameserver[rtems_bsdnet_nameserver_count],
-			4);
-	    printip("Domain Name Server",
-			rtems_bsdnet_nameserver[rtems_bsdnet_nameserver_count]);
-	    rtems_bsdnet_nameserver_count++;
-	    dlen += 4;
-	  }
-	}
-	break;
-      case 16:	/* Swap server IP address. unused */
-      case 2:
-	/* Time offset */
-	break;
-      case 3:
-	/* Routers */
-	if (len % 4) 
-	  panic("bootpc: Router Len is %d",len);
-	if (len > 0) {
-	  bcopy(&reply.vend[j],&gw.sin_addr,4);
-	  printip("Router",gw.sin_addr);
-	  gotgw=1;
-	}
-	break;
-      case 7:
-	/* Log servers */
-	if (len % 4) 
-	  panic("bootpc: Log server len is %d",len);
-	if (len > 0) {
-	  bcopy(&reply.vend[j],&rtems_bsdnet_log_host_address,4);
-	  printip("Log server",rtems_bsdnet_log_host_address);
-	}
-	break;
-      case 12:
-	if (len>=MAXHOSTNAMELEN)
-	  panic("bootpc: hostname  >=%d bytes",MAXHOSTNAMELEN);
-	if (sethostname (&reply.vend[j], len) < 0)
-	  panic("Can't set host name");
-	printf("Hostname is %.*s\n",len,&reply.vend[j]);
-	break;
-      case 15:
-	/* Domain name */
-	rtems_bsdnet_domain_name = strdup (&reply.vend[j]);
-	if (rtems_bsdnet_domain_name)
-		printf("Domain name is %s\n", rtems_bsdnet_domain_name);
-	break;
-      default:
-	printf("Ignoring field type %d\n",code);
-      }
-      j+=len;
-    }
-  }
-
-  if (!gotnetmask) {
-    if (IN_CLASSA(ntohl(myaddr.sin_addr.s_addr)))
-      netmask.sin_addr.s_addr = htonl(IN_CLASSA_NET);
-    else if (IN_CLASSB(ntohl(myaddr.sin_addr.s_addr)))
-      netmask.sin_addr.s_addr = htonl(IN_CLASSB_NET);
-    else 
-      netmask.sin_addr.s_addr = htonl(IN_CLASSC_NET);
-  }
-  if (!gotgw) {
-    /* Use proxyarp */
-    gw.sin_addr.s_addr = myaddr.sin_addr.s_addr;
-  }
-  
-#if 0
-  bootpboot_p_iflist();
-  bootpboot_p_rtlist();
-#endif
-  error = bootpc_adjust_interface(&ireq,so,
-				  &myaddr,&netmask,&gw,procp);
-  
-  soclose(so);
-
-#if 0
-  bootpboot_p_iflist();
-  bootpboot_p_rtlist();
-#endif
-
-
-#if 0
-    myaddr.sin_addr.s_addr | ~ netmask.sin_addr.s_addr;
-#endif
-
-#if 0
-  bootpboot_p_iflist();
-  bootpboot_p_rtlist();
-#endif
-  return;
-}
diff --git a/c/src/libnetworking/nfs/krpc.h b/c/src/libnetworking/nfs/krpc.h
deleted file mode 100644
index 8a21392657..0000000000
--- a/c/src/libnetworking/nfs/krpc.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*	$NetBSD: krpc.h,v 1.4 1995/12/19 23:07:11 cgd Exp $	*/
-/*	$Id$	*/
-
-#include <sys/cdefs.h>
-
-int krpc_call __P((struct sockaddr_in *sin,
-	u_int prog, u_int vers, u_int func,
-	struct mbuf **data, struct mbuf **from, struct proc *procp));
-
-int krpc_portmap __P((struct sockaddr_in *sin,
-	u_int prog, u_int vers, u_int16_t *portp, struct proc *procp));
-
-struct mbuf *xdr_string_encode __P((char *str, int len));
-
-/*
- * RPC definitions for the portmapper
- */
-#define	PMAPPORT		111
-#define	PMAPPROG		100000
-#define	PMAPVERS		2
-#define	PMAPPROC_NULL		0
-#define	PMAPPROC_SET		1
-#define	PMAPPROC_UNSET		2
-#define	PMAPPROC_GETPORT	3
-#define	PMAPPROC_DUMP		4
-#define	PMAPPROC_CALLIT		5
diff --git a/c/src/libnetworking/nfs/nfs.h b/c/src/libnetworking/nfs/nfs.h
deleted file mode 100644
index 68f206e213..0000000000
--- a/c/src/libnetworking/nfs/nfs.h
+++ /dev/null
@@ -1,620 +0,0 @@
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Rick Macklem at The University of Guelph.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)nfs.h	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#ifndef _NFS_NFS_H_
-#define _NFS_NFS_H_
-
-#include <nfs/rpcv2.h>
-
-/*
- * Tunable constants for nfs
- */
-
-#define	NFS_MAXIOVEC	34
-#define NFS_TICKINTVL	5		/* Desired time for a tick (msec) */
-#define NFS_HZ		(hz / nfs_ticks) /* Ticks/sec */
-#define	NFS_TIMEO	(1 * NFS_HZ)	/* Default timeout = 1 second */
-#define	NFS_MINTIMEO	(1 * NFS_HZ)	/* Min timeout to use */
-#define	NFS_MAXTIMEO	(60 * NFS_HZ)	/* Max timeout to backoff to */
-#define	NFS_MINIDEMTIMEO (5 * NFS_HZ)	/* Min timeout for non-idempotent ops*/
-#define	NFS_MAXREXMIT	100		/* Stop counting after this many */
-#define	NFS_MAXWINDOW	1024		/* Max number of outstanding requests */
-#define	NFS_RETRANS	10		/* Num of retrans for soft mounts */
-#define	NFS_MAXGRPS	16		/* Max. size of groups list */
-#ifndef NFS_MINATTRTIMO
-#define	NFS_MINATTRTIMO 5		/* Attribute cache timeout in sec */
-#endif
-#ifndef NFS_MAXATTRTIMO
-#define	NFS_MAXATTRTIMO 60
-#endif
-#define	NFS_WSIZE	8192		/* Def. write data size <= 8192 */
-#define	NFS_RSIZE	8192		/* Def. read data size <= 8192 */
-#define NFS_READDIRSIZE	8192		/* Def. readdir size */
-#define	NFS_DEFRAHEAD	1		/* Def. read ahead # blocks */
-#define	NFS_MAXRAHEAD	4		/* Max. read ahead # blocks */
-#define	NFS_MAXUIDHASH	64		/* Max. # of hashed uid entries/mp */
-#define	NFS_MAXASYNCDAEMON 	20	/* Max. number async_daemons runnable */
-#define NFS_MAXGATHERDELAY	100	/* Max. write gather delay (msec) */
-#ifndef NFS_GATHERDELAY
-#define NFS_GATHERDELAY		10	/* Default write gather delay (msec) */
-#endif
-#define	NFS_DIRBLKSIZ	4096		/* Must be a multiple of DIRBLKSIZ */
-
-/*
- * Oddballs
- */
-#define	NMOD(a)		((a) % nfs_asyncdaemons)
-#define NFS_CMPFH(n, f, s) \
-	((n)->n_fhsize == (s) && !bcmp((caddr_t)(n)->n_fhp, (caddr_t)(f), (s)))
-#define NFS_ISV3(v)	(VFSTONFS((v)->v_mount)->nm_flag & NFSMNT_NFSV3)
-#define NFS_SRVMAXDATA(n) \
-		(((n)->nd_flag & ND_NFSV3) ? (((n)->nd_nam2) ? \
-		 NFS_MAXDGRAMDATA : NFS_MAXDATA) : NFS_V2MAXDATA)
-
-/*
- * XXX
- * sys/buf.h should be edited to change B_APPENDWRITE --> B_NEEDCOMMIT, but
- * until then...
- * Same goes for sys/malloc.h, which needs M_NFSDIROFF,
- * M_NFSRVDESC and M_NFSBIGFH added.
- * The VA_EXCLUSIVE flag should be added for va_vaflags and set for an
- * exclusive create.
- * The B_INVAFTERWRITE flag should be set to whatever is required by the
- * buffer cache code to say "Invalidate the block after it is written back".
- */
-#ifndef B_NEEDCOMMIT
-#define B_NEEDCOMMIT	B_APPENDWRITE
-#endif
-#ifndef M_NFSRVDESC
-#define M_NFSRVDESC	M_TEMP
-#endif
-#ifndef M_NFSDIROFF
-#define M_NFSDIROFF	M_TEMP
-#endif
-#ifndef M_NFSBIGFH
-#define M_NFSBIGFH	M_TEMP
-#endif
-#ifndef VA_EXCLUSIVE
-#define VA_EXCLUSIVE	0
-#endif
-#ifdef __FreeBSD__
-#define	B_INVAFTERWRITE	B_NOCACHE
-#else
-#define	B_INVAFTERWRITE	B_INVAL
-#endif
-
-/*
- * These ifdefs try to handle the differences between the various 4.4BSD-Lite
- * based vfs interfaces.
- * btw: NetBSD-current does have a VOP_LEASDE(), but I don't know how to
- * differentiate between NetBSD-1.0 and NetBSD-current, so..
- * I also don't know about BSDi's 2.0 release.
- */
-#if !defined(HAS_VOPLEASE) && !defined(__FreeBSD__) && !defined(__NetBSD__)
-#define	HAS_VOPLEASE	1
-#endif
-#if !defined(HAS_VOPREVOKE) && !defined(__FreeBSD__) && !defined(__NetBSD__)
-#define HAS_VOPREVOKE	1
-#endif
-
-/*
- * The IO_METASYNC flag should be implemented for local file systems.
- * (Until then, it is nothin at all.)
- */
-#ifndef IO_METASYNC
-#define IO_METASYNC	0
-#endif
-
-/*
- * Set the attribute timeout based on how recently the file has been modified.
- */
-#define	NFS_ATTRTIMEO(np) \
-	((((np)->n_flag & NMODIFIED) || \
-	 (time.tv_sec - (np)->n_mtime) / 10 < NFS_MINATTRTIMO) ? NFS_MINATTRTIMO : \
-	 ((time.tv_sec - (np)->n_mtime) / 10 > NFS_MAXATTRTIMO ? NFS_MAXATTRTIMO : \
-	  (time.tv_sec - (np)->n_mtime) / 10))
-
-/*
- * Expected allocation sizes for major data structures. If the actual size
- * of the structure exceeds these sizes, then malloc() will be allocating
- * almost twice the memory required. This is used in nfs_init() to warn
- * the sysadmin that the size of a structure should be reduced.
- * (These sizes are always a power of 2. If the kernel malloc() changes
- *  to one that does not allocate space in powers of 2 size, then this all
- *  becomes bunk!)
- */
-#define NFS_NODEALLOC	256
-#define NFS_MNTALLOC	512
-#define NFS_SVCALLOC	256
-#define NFS_UIDALLOC	128
-
-/*
- * Structures for the nfssvc(2) syscall. Not that anyone but nfsd and mount_nfs
- * should ever try and use it.
- */
-struct nfsd_args {
-	int	sock;		/* Socket to serve */
-	caddr_t	name;		/* Client address for connection based sockets */
-	int	namelen;	/* Length of name */
-};
-
-struct nfsd_srvargs {
-	struct nfsd	*nsd_nfsd;	/* Pointer to in kernel nfsd struct */
-	uid_t		nsd_uid;	/* Effective uid mapped to cred */
-	u_long		nsd_haddr;	/* Ip address of client */
-	struct ucred	nsd_cr;		/* Cred. uid maps to */
-	int		nsd_authlen;	/* Length of auth string (ret) */
-	u_char		*nsd_authstr;	/* Auth string (ret) */
-	int		nsd_verflen;	/* and the verfier */
-	u_char		*nsd_verfstr;
-	struct timeval	nsd_timestamp;	/* timestamp from verifier */
-	u_long		nsd_ttl;	/* credential ttl (sec) */
-	NFSKERBKEY_T	nsd_key;	/* Session key */
-};
-
-struct nfsd_cargs {
-	char		*ncd_dirp;	/* Mount dir path */
-	uid_t		ncd_authuid;	/* Effective uid */
-	int		ncd_authtype;	/* Type of authenticator */
-	int		ncd_authlen;	/* Length of authenticator string */
-	u_char		*ncd_authstr;	/* Authenticator string */
-	int		ncd_verflen;	/* and the verifier */
-	u_char		*ncd_verfstr;
-	NFSKERBKEY_T	ncd_key;	/* Session key */
-};
-
-/*
- * Stats structure
- */
-struct nfsstats {
-	int	attrcache_hits;
-	int	attrcache_misses;
-	int	lookupcache_hits;
-	int	lookupcache_misses;
-	int	direofcache_hits;
-	int	direofcache_misses;
-	int	biocache_reads;
-	int	read_bios;
-	int	read_physios;
-	int	biocache_writes;
-	int	write_bios;
-	int	write_physios;
-	int	biocache_readlinks;
-	int	readlink_bios;
-	int	biocache_readdirs;
-	int	readdir_bios;
-	int	rpccnt[NFS_NPROCS];
-	int	rpcretries;
-	int	srvrpccnt[NFS_NPROCS];
-	int	srvrpc_errs;
-	int	srv_errs;
-	int	rpcrequests;
-	int	rpctimeouts;
-	int	rpcunexpected;
-	int	rpcinvalid;
-	int	srvcache_inproghits;
-	int	srvcache_idemdonehits;
-	int	srvcache_nonidemdonehits;
-	int	srvcache_misses;
-	int	srvnqnfs_leases;
-	int	srvnqnfs_maxleases;
-	int	srvnqnfs_getleases;
-	int	srvvop_writes;
-};
-
-/*
- * Flags for nfssvc() system call.
- */
-#define	NFSSVC_BIOD	0x002
-#define	NFSSVC_NFSD	0x004
-#define	NFSSVC_ADDSOCK	0x008
-#define	NFSSVC_AUTHIN	0x010
-#define	NFSSVC_GOTAUTH	0x040
-#define	NFSSVC_AUTHINFAIL 0x080
-#define	NFSSVC_MNTD	0x100
-
-/*
- * fs.nfs sysctl(3) identifiers
- */
-#define NFS_NFSSTATS	1		/* struct: struct nfsstats */
-#define NFS_NFSPRIVPORT	2		/* int: prohibit nfs to resvports */
-
-#define FS_NFS_NAMES { \
-		       { 0, 0 }, \
-		       { "nfsstats", CTLTYPE_STRUCT }, \
-		       { "nfsprivport", CTLTYPE_INT }, \
-}
-
-/*
- * The set of signals the interrupt an I/O in progress for NFSMNT_INT mounts.
- * What should be in this set is open to debate, but I believe that since
- * I/O system calls on ufs are never interrupted by signals the set should
- * be minimal. My reasoning is that many current programs that use signals
- * such as SIGALRM will not expect file I/O system calls to be interrupted
- * by them and break.
- */
-#if defined(KERNEL) || defined(_KERNEL)
-
-struct uio; struct buf; struct vattr; struct nameidata;	/* XXX */
-
-#define	NFSINT_SIGMASK	(sigmask(SIGINT)|sigmask(SIGTERM)|sigmask(SIGKILL)| \
-			 sigmask(SIGHUP)|sigmask(SIGQUIT))
-
-/*
- * Socket errors ignored for connectionless sockets??
- * For now, ignore them all
- */
-#define	NFSIGNORE_SOERROR(s, e) \
-		((e) != EINTR && (e) != ERESTART && (e) != EWOULDBLOCK && \
-		((s) & PR_CONNREQUIRED) == 0)
-
-/*
- * Nfs outstanding request list element
- */
-struct nfsreq {
-	TAILQ_ENTRY(nfsreq) r_chain;
-	struct mbuf	*r_mreq;
-	struct mbuf	*r_mrep;
-	struct mbuf	*r_md;
-	caddr_t		r_dpos;
-	struct nfsmount *r_nmp;
-	struct vnode	*r_vp;
-	u_long		r_xid;
-	int		r_flags;	/* flags on request, see below */
-	int		r_retry;	/* max retransmission count */
-	int		r_rexmit;	/* current retrans count */
-	int		r_timer;	/* tick counter on reply */
-	int		r_procnum;	/* NFS procedure number */
-	int		r_rtt;		/* RTT for rpc */
-	struct proc	*r_procp;	/* Proc that did I/O system call */
-};
-
-/*
- * Queue head for nfsreq's
- */
-extern TAILQ_HEAD(nfs_reqq, nfsreq) nfs_reqq;
-
-/* Flag values for r_flags */
-#define R_TIMING	0x01		/* timing request (in mntp) */
-#define R_SENT		0x02		/* request has been sent */
-#define	R_SOFTTERM	0x04		/* soft mnt, too many retries */
-#define	R_INTR		0x08		/* intr mnt, signal pending */
-#define	R_SOCKERR	0x10		/* Fatal error on socket */
-#define	R_TPRINTFMSG	0x20		/* Did a tprintf msg. */
-#define	R_MUSTRESEND	0x40		/* Must resend request */
-#define	R_GETONEREP	0x80		/* Probe for one reply only */
-
-/*
- * A list of nfssvc_sock structures is maintained with all the sockets
- * that require service by the nfsd.
- * The nfsuid structs hang off of the nfssvc_sock structs in both lru
- * and uid hash lists.
- */
-#ifndef NFS_UIDHASHSIZ
-#define	NFS_UIDHASHSIZ	29	/* Tune the size of nfssvc_sock with this */
-#endif
-#define	NUIDHASH(sock, uid) \
-	(&(sock)->ns_uidhashtbl[(uid) % NFS_UIDHASHSIZ])
-#ifndef NFS_WDELAYHASHSIZ
-#define	NFS_WDELAYHASHSIZ 16	/* and with this */
-#endif
-#define	NWDELAYHASH(sock, f) \
-	(&(sock)->ns_wdelayhashtbl[(*((u_long *)(f))) % NFS_WDELAYHASHSIZ])
-#ifndef NFS_MUIDHASHSIZ
-#define NFS_MUIDHASHSIZ	63	/* Tune the size of nfsmount with this */
-#endif
-#define	NMUIDHASH(nmp, uid) \
-	(&(nmp)->nm_uidhashtbl[(uid) % NFS_MUIDHASHSIZ])
-#define	NFSNOHASH(fhsum) \
-	(&nfsnodehashtbl[(fhsum) & nfsnodehash])
-
-/*
- * Network address hash list element
- */
-union nethostaddr {
-	u_long had_inetaddr;
-	struct mbuf *had_nam;
-};
-
-struct nfsuid {
-	TAILQ_ENTRY(nfsuid) nu_lru;	/* LRU chain */
-	LIST_ENTRY(nfsuid) nu_hash;	/* Hash list */
-	int		nu_flag;	/* Flags */
-	union nethostaddr nu_haddr;	/* Host addr. for dgram sockets */
-	struct ucred	nu_cr;		/* Cred uid mapped to */
-	int		nu_expire;	/* Expiry time (sec) */
-	struct timeval	nu_timestamp;	/* Kerb. timestamp */
-	u_long		nu_nickname;	/* Nickname on server */
-	NFSKERBKEY_T	nu_key;		/* and session key */
-};
-
-#define	nu_inetaddr	nu_haddr.had_inetaddr
-#define	nu_nam		nu_haddr.had_nam
-/* Bits for nu_flag */
-#define	NU_INETADDR	0x1
-#define NU_NAM		0x2
-#define NU_NETFAM(u)	(((u)->nu_flag & NU_INETADDR) ? AF_INET : AF_ISO)
-
-struct nfssvc_sock {
-	TAILQ_ENTRY(nfssvc_sock) ns_chain;	/* List of all nfssvc_sock's */
-	TAILQ_HEAD(, nfsuid) ns_uidlruhead;
-	struct file	*ns_fp;
-	struct socket	*ns_so;
-	struct mbuf	*ns_nam;
-	struct mbuf	*ns_raw;
-	struct mbuf	*ns_rawend;
-	struct mbuf	*ns_rec;
-	struct mbuf	*ns_recend;
-	struct mbuf	*ns_frag;
-	int		ns_flag;
-	int		ns_solock;
-	int		ns_cc;
-	int		ns_reclen;
-	int		ns_numuids;
-	u_long		ns_sref;
-	LIST_HEAD(, nfsrv_descript) ns_tq;	/* Write gather lists */
-	LIST_HEAD(, nfsuid) ns_uidhashtbl[NFS_UIDHASHSIZ];
-	LIST_HEAD(nfsrvw_delayhash, nfsrv_descript) ns_wdelayhashtbl[NFS_WDELAYHASHSIZ];
-};
-
-/* Bits for "ns_flag" */
-#define	SLP_VALID	0x01
-#define	SLP_DOREC	0x02
-#define	SLP_NEEDQ	0x04
-#define	SLP_DISCONN	0x08
-#define	SLP_GETSTREAM	0x10
-#define	SLP_LASTFRAG	0x20
-#define SLP_ALLFLAGS	0xff
-
-extern TAILQ_HEAD(nfssvc_sockhead, nfssvc_sock) nfssvc_sockhead;
-extern int nfssvc_sockhead_flag;
-#define	SLP_INIT	0x01
-#define	SLP_WANTINIT	0x02
-
-/*
- * One of these structures is allocated for each nfsd.
- */
-struct nfsd {
-	TAILQ_ENTRY(nfsd) nfsd_chain;	/* List of all nfsd's */
-	int		nfsd_flag;	/* NFSD_ flags */
-	struct nfssvc_sock *nfsd_slp;	/* Current socket */
-	int		nfsd_authlen;	/* Authenticator len */
-	u_char		nfsd_authstr[RPCAUTH_MAXSIZ]; /* Authenticator data */
-	int		nfsd_verflen;	/* and the Verifier */
-	u_char		nfsd_verfstr[RPCVERF_MAXSIZ];
-	struct proc	*nfsd_procp;	/* Proc ptr */
-	struct nfsrv_descript *nfsd_nd;	/* Associated nfsrv_descript */
-};
-
-/* Bits for "nfsd_flag" */
-#define	NFSD_WAITING	0x01
-#define	NFSD_REQINPROG	0x02
-#define	NFSD_NEEDAUTH	0x04
-#define	NFSD_AUTHFAIL	0x08
-
-/*
- * This structure is used by the server for describing each request.
- * Some fields are used only when write request gathering is performed.
- */
-struct nfsrv_descript {
-	u_quad_t		nd_time;	/* Write deadline (usec) */
-	off_t			nd_off;		/* Start byte offset */
-	off_t			nd_eoff;	/* and end byte offset */
-	LIST_ENTRY(nfsrv_descript) nd_hash;	/* Hash list */
-	LIST_ENTRY(nfsrv_descript) nd_tq;		/* and timer list */
-	LIST_HEAD(,nfsrv_descript) nd_coalesce;	/* coalesced writes */
-	struct mbuf		*nd_mrep;	/* Request mbuf list */
-	struct mbuf		*nd_md;		/* Current dissect mbuf */
-	struct mbuf		*nd_mreq;	/* Reply mbuf list */
-	struct mbuf		*nd_nam;	/* and socket addr */
-	struct mbuf		*nd_nam2;	/* return socket addr */
-	caddr_t			nd_dpos;	/* Current dissect pos */
-	int			nd_procnum;	/* RPC # */
-	int			nd_stable;	/* storage type */
-	int			nd_flag;	/* nd_flag */
-	int			nd_len;		/* Length of this write */
-	int			nd_repstat;	/* Reply status */
-	u_long			nd_retxid;	/* Reply xid */
-	u_long			nd_duration;	/* Lease duration */
-	struct timeval		nd_starttime;	/* Time RPC initiated */
-	fhandle_t		nd_fh;		/* File handle */
-	struct ucred		nd_cr;		/* Credentials */
-};
-
-/* Bits for "nd_flag" */
-#define	ND_READ		LEASE_READ
-#define ND_WRITE	LEASE_WRITE
-#define ND_CHECK	0x04
-#define ND_LEASE	(ND_READ | ND_WRITE | ND_CHECK)
-#define ND_NFSV3	0x08
-#define ND_NQNFS	0x10
-#define ND_KERBNICK	0x20
-#define ND_KERBFULL	0x40
-#define ND_KERBAUTH	(ND_KERBNICK | ND_KERBFULL)
-
-extern TAILQ_HEAD(nfsd_head, nfsd) nfsd_head;
-extern int nfsd_head_flag;
-#define	NFSD_CHECKSLP	0x01
-
-/*
- * These macros compare nfsrv_descript structures.
- */
-#define NFSW_CONTIG(o, n) \
-		((o)->nd_eoff >= (n)->nd_off && \
-		 !bcmp((caddr_t)&(o)->nd_fh, (caddr_t)&(n)->nd_fh, NFSX_V3FH))
-
-#define NFSW_SAMECRED(o, n) \
-	(((o)->nd_flag & ND_KERBAUTH) == ((n)->nd_flag & ND_KERBAUTH) && \
- 	 !bcmp((caddr_t)&(o)->nd_cr, (caddr_t)&(n)->nd_cr, \
-		sizeof (struct ucred)))
-
-int	nfs_reply __P((struct nfsreq *));
-int	nfs_getreq __P((struct nfsrv_descript *,struct nfsd *,int));
-int	nfs_send __P((struct socket *,struct mbuf *,struct mbuf *,struct nfsreq *));
-int	nfs_rephead __P((int,struct nfsrv_descript *,struct nfssvc_sock *,int,int,u_quad_t *,struct mbuf **,struct mbuf **,caddr_t *));
-int	nfs_sndlock __P((int *,struct nfsreq *));
-void	nfs_sndunlock __P((int *flagp));
-int	nfs_disct __P((struct mbuf **,caddr_t *,int,int,caddr_t *));
-int	nfs_vinvalbuf __P((struct vnode *,int,struct ucred *,struct proc *,int));
-int	nfs_readrpc __P((struct vnode *,struct uio *,struct ucred *));
-int	nfs_writerpc __P((struct vnode *,struct uio *,struct ucred *,int *,int *));
-int	nfs_readdirrpc __P((register struct vnode *,struct uio *,struct ucred *));
-int	nfs_asyncio __P((struct buf *,struct ucred *));
-int	nfs_doio __P((struct buf *,struct ucred *,struct proc *));
-int	nfs_readlinkrpc __P((struct vnode *,struct uio *,struct ucred *));
-int	nfs_sigintr __P((struct nfsmount *,struct nfsreq *r,struct proc *));
-int	nfs_readdirplusrpc __P((struct vnode *,register struct uio *,struct ucred *));
-int	nfsm_disct __P((struct mbuf **,caddr_t *,int,int,caddr_t *));
-void	nfsm_srvfattr __P((struct nfsrv_descript *,struct vattr *,struct nfs_fattr *));
-void	nfsm_srvwcc __P((struct nfsrv_descript *,int,struct vattr *,int,struct vattr *,struct mbuf **,char **));
-void	nfsm_srvpostopattr __P((struct nfsrv_descript *,int,struct vattr *,struct mbuf **,char **));
-int	netaddr_match __P((int,union nethostaddr *,struct mbuf *));
-int	nfs_request __P((struct vnode *,struct mbuf *,int,struct proc *,struct ucred *,struct mbuf **,struct mbuf **,caddr_t *));
-int	nfs_loadattrcache __P((struct vnode **,struct mbuf **,caddr_t *,struct vattr *));
-int	nfs_namei __P((struct nameidata *,fhandle_t *,int,struct nfssvc_sock *,struct mbuf *,struct mbuf **,caddr_t *,struct vnode **,struct proc *,int));
-void	nfsm_adj __P((struct mbuf *,int,int));
-int	nfsm_mbuftouio __P((struct mbuf **,struct uio *,int,caddr_t *));
-void	nfsrv_initcache __P((void));
-int	nfs_getauth __P((struct nfsmount *,struct nfsreq *,struct ucred *,char **,int *,char *,int *,NFSKERBKEY_T));
-int	nfs_getnickauth __P((struct nfsmount *,struct ucred *,char **,int *,char *,int));
-int	nfs_savenickauth __P((struct nfsmount *,struct ucred *,int,NFSKERBKEY_T,struct mbuf **,char **,struct mbuf *));
-int	nfs_adv __P((struct mbuf **,caddr_t *,int,int));
-void	nfs_nhinit __P((void));
-void	nfs_timer __P((void*));
-u_long nfs_hash __P((nfsfh_t *,int));
-void	nfsrv_slpderef __P((struct nfssvc_sock *slp));
-int	nfsrv_dorec __P((struct nfssvc_sock *,struct nfsd *,struct nfsrv_descript **));
-void	nfsrv_cleancache __P((void));
-int	nfsrv_getcache __P((struct nfsrv_descript *,struct nfssvc_sock *,struct mbuf **));
-int	nfs_init __P((void));
-void	nfsrv_updatecache __P((struct nfsrv_descript *,int,struct mbuf *));
-int	nfs_connect __P((struct nfsmount *,struct nfsreq *));
-void	nfs_disconnect __P((struct nfsmount *nmp));
-int	nfs_getattrcache __P((struct vnode *,struct vattr *));
-int	nfsm_strtmbuf __P((struct mbuf **,char **,char *,long));
-int	nfs_bioread __P((struct vnode *,struct uio *,int,struct ucred *, int getpages));
-int	nfsm_uiotombuf __P((struct uio *,struct mbuf **,int,caddr_t *));
-void	nfsrv_init __P((int));
-void	nfs_clearcommit __P((struct mount *));
-int	nfsrv_errmap __P((struct nfsrv_descript *, int));
-void	nfsrv_rcv __P((struct socket *so, caddr_t arg, int waitflag));
-void	nfsrvw_sort __P((gid_t [],int));
-void	nfsrv_setcred __P((struct ucred *,struct ucred *));
-int	nfs_writebp __P((struct buf *,int));
-int	nfsrv_object_create __P(( struct vnode * ));
-void	nfsrv_wakenfsd __P((struct nfssvc_sock *slp));
-int	nfsrv_writegather __P((struct nfsrv_descript **, struct nfssvc_sock *,
-			       struct proc *, struct mbuf **));
-int	nfs_fsinfo __P((struct nfsmount *, struct vnode *, struct ucred *,
-			struct proc *p));
-
-int	nfsrv3_access __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-			   struct proc *procp, struct mbuf **mrq));
-int	nfsrv_commit __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-			  struct proc *procp, struct mbuf **mrq));
-int	nfsrv_create __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-			  struct proc *procp, struct mbuf **mrq));
-int	nfsrv_fhtovp __P((fhandle_t *,int,struct vnode **,
-			struct ucred *,struct nfssvc_sock *,struct mbuf *,
-			int *,int));
-int	nfsrv_fsinfo __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-			  struct proc *procp, struct mbuf **mrq));
-int	nfsrv_getattr __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-			   struct proc *procp, struct mbuf **mrq));
-int	nfsrv_link __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-			struct proc *procp, struct mbuf **mrq));
-int	nfsrv_lookup __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-			  struct proc *procp, struct mbuf **mrq));
-int	nfsrv_mkdir __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-			 struct proc *procp, struct mbuf **mrq));
-int	nfsrv_mknod __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-			 struct proc *procp, struct mbuf **mrq));
-int	nfsrv_noop __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-			struct proc *procp, struct mbuf **mrq));
-int	nfsrv_null __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-			struct proc *procp, struct mbuf **mrq));
-int	nfsrv_pathconf __P((struct nfsrv_descript *nfsd,
-			    struct nfssvc_sock *slp, struct proc *procp,
-			    struct mbuf **mrq));
-int	nfsrv_read __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-			struct proc *procp, struct mbuf **mrq));
-int	nfsrv_readdir __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-			   struct proc *procp, struct mbuf **mrq));
-int	nfsrv_readdirplus __P((struct nfsrv_descript *nfsd,
-			       struct nfssvc_sock *slp, struct proc *procp,
-			       struct mbuf **mrq));
-int	nfsrv_readlink __P((struct nfsrv_descript *nfsd,
-			    struct nfssvc_sock *slp, struct proc *procp,
-			    struct mbuf **mrq));
-int	nfsrv_remove __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-			  struct proc *procp, struct mbuf **mrq));
-int	nfsrv_rename __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-			  struct proc *procp, struct mbuf **mrq));
-int	nfsrv_rmdir __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-			 struct proc *procp, struct mbuf **mrq));
-int	nfsrv_setattr __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-			   struct proc *procp, struct mbuf **mrq));
-int	nfsrv_statfs __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-			  struct proc *procp, struct mbuf **mrq));
-int	nfsrv_symlink __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-			   struct proc *procp, struct mbuf **mrq));
-int	nfsrv_write __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-			 struct proc *procp, struct mbuf **mrq));
-
-#ifdef NFS_DEBUG
-
-extern int nfs_debug;
-#define NFS_DEBUG_ASYNCIO	1 /* asynchronous i/o */
-#define NFS_DEBUG_WG		2 /* server write gathering */
-#define NFS_DEBUG_RC		4 /* server request caching */
-
-#define NFS_DPF(cat, args)					\
-	do {							\
-		if (nfs_debug & NFS_DEBUG_##cat) printf args;	\
-	} while (0)
-
-#else
-
-#define NFS_DPF(cat, args)
-
-#endif
-
-#endif	/* KERNEL */
-
-#endif
diff --git a/c/src/libnetworking/nfs/nfsdiskless.h b/c/src/libnetworking/nfs/nfsdiskless.h
deleted file mode 100644
index 0ed5c8f6f7..0000000000
--- a/c/src/libnetworking/nfs/nfsdiskless.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Rick Macklem at The University of Guelph.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)nfsdiskless.h	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#ifndef _NFS_NFSDISKLESS_H_
-#define _NFS_NFSDISKLESS_H_
-
-/*
- * Structure that must be initialized for a diskless nfs client.
- * This structure is used by nfs_mountroot() to set up the root and swap
- * vnodes plus do a partial ifconfig(8) and route(8) so that the critical net
- * interface can communicate with the server.
- * The primary bootstrap is expected to fill in the appropriate fields before
- * starting the kernel. Whether or not the swap area is nfs mounted is determined
- * by the value in swdevt[0]. (equal to NODEV --> swap over nfs)
- * Currently only works for AF_INET protocols.
- * NB: All fields are stored in net byte order to avoid hassles with
- * client/server byte ordering differences.
- */
-
-/*
- * I have defined a new structure that can handle an NFS Version 3 file handle
- * but the kernel still expects the old Version 2 one to be provided. The
- * changes required in nfs_vfsops.c for using the new are documented there in
- * comments. (I felt that breaking network booting code by changing this
- * structure would not be prudent at this time, since almost all servers are
- * still Version 2 anyhow.)
- */
-struct nfsv3_diskless {
-	struct ifaliasreq myif;			/* Default interface */
-	struct sockaddr_in mygateway;		/* Default gateway */
-	struct nfs_args	swap_args;		/* Mount args for swap file */
-	int		swap_fhsize;		/* Size of file handle */
-	u_char		swap_fh[NFSX_V3FHMAX];	/* Swap file's file handle */
-	struct sockaddr_in swap_saddr;		/* Address of swap server */
-	char		swap_hostnam[MNAMELEN];	/* Host name for mount pt */
-	int		swap_nblks;		/* Size of server swap file */
-	struct ucred	swap_ucred;		/* Swap credentials */
-	struct nfs_args	root_args;		/* Mount args for root fs */
-	int		root_fhsize;		/* Size of root file handle */
-	u_char		root_fh[NFSX_V3FHMAX];	/* File handle of root dir */
-	struct sockaddr_in root_saddr;		/* Address of root server */
-	char		root_hostnam[MNAMELEN];	/* Host name for mount pt */
-	long		root_time;		/* Timestamp of root fs */
-	char		my_hostnam[MAXHOSTNAMELEN]; /* Client host name */
-};
-
-struct nfs_diskless {
-	struct ifaliasreq myif;			/* Default interface */
-	struct sockaddr_in mygateway;		/* Default gateway */
-	struct nfs_args	swap_args;		/* Mount args for swap file */
-	u_char		swap_fh[NFSX_V2FH];	/* Swap file's file handle */
-	struct sockaddr_in swap_saddr;		/* Address of swap server */
-	char		swap_hostnam[MNAMELEN];	/* Host name for mount pt */
-	int		swap_nblks;		/* Size of server swap file */
-	struct ucred	swap_ucred;		/* Swap credentials */
-	struct nfs_args	root_args;		/* Mount args for root fs */
-	u_char		root_fh[NFSX_V2FH];	/* File handle of root dir */
-	struct sockaddr_in root_saddr;		/* Address of root server */
-	char		root_hostnam[MNAMELEN];	/* Host name for mount pt */
-	long		root_time;		/* Timestamp of root fs */
-	char		my_hostnam[MAXHOSTNAMELEN]; /* Client host name */
-};
-
-#endif
diff --git a/c/src/libnetworking/nfs/nfsproto.h b/c/src/libnetworking/nfs/nfsproto.h
deleted file mode 100644
index 6ce7c5b960..0000000000
--- a/c/src/libnetworking/nfs/nfsproto.h
+++ /dev/null
@@ -1,441 +0,0 @@
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Rick Macklem at The University of Guelph.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)nfsproto.h	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#ifndef _NFS_NFSPROTO_H_
-#define _NFS_NFSPROTO_H_
-
-/*
- * nfs definitions as per the Version 2 and 3 specs
- */
-
-/*
- * Constants as defined in the Sun NFS Version 2 and 3 specs.
- * "NFS: Network File System Protocol Specification" RFC1094
- * and in the "NFS: Network File System Version 3 Protocol
- * Specification"
- */
-
-#define NFS_PORT	2049
-#define	NFS_PROG	100003
-#define NFS_VER2	2
-#define	NFS_VER3	3
-#define NFS_V2MAXDATA	8192
-#define	NFS_MAXDGRAMDATA 16384
-#define	NFS_MAXDATA	32768
-#define	NFS_MAXPATHLEN	1024
-#define	NFS_MAXNAMLEN	255
-#define	NFS_MAXPKTHDR	404
-#define NFS_MAXPACKET	(NFS_MAXPKTHDR + NFS_MAXDATA)
-#define	NFS_MINPACKET	20
-#define	NFS_FABLKSIZE	512	/* Size in bytes of a block wrt fa_blocks */
-
-/* Stat numbers for rpc returns (version 2 and 3) */
-#define	NFS_OK			0
-#define	NFSERR_PERM		1
-#define	NFSERR_NOENT		2
-#define	NFSERR_IO		5
-#define	NFSERR_NXIO		6
-#define	NFSERR_ACCES		13
-#define	NFSERR_EXIST		17
-#define	NFSERR_XDEV		18	/* Version 3 only */
-#define	NFSERR_NODEV		19
-#define	NFSERR_NOTDIR		20
-#define	NFSERR_ISDIR		21
-#define	NFSERR_INVAL		22	/* Version 3 only */
-#define	NFSERR_FBIG		27
-#define	NFSERR_NOSPC		28
-#define	NFSERR_ROFS		30
-#define	NFSERR_MLINK		31	/* Version 3 only */
-#define	NFSERR_NAMETOL		63
-#define	NFSERR_NOTEMPTY		66
-#define	NFSERR_DQUOT		69
-#define	NFSERR_STALE		70
-#define	NFSERR_REMOTE		71	/* Version 3 only */
-#define	NFSERR_WFLUSH		99	/* Version 2 only */
-#define	NFSERR_BADHANDLE	10001	/* The rest Version 3 only */
-#define	NFSERR_NOT_SYNC		10002
-#define	NFSERR_BAD_COOKIE	10003
-#define	NFSERR_NOTSUPP		10004
-#define	NFSERR_TOOSMALL		10005
-#define	NFSERR_SERVERFAULT	10006
-#define	NFSERR_BADTYPE		10007
-#define	NFSERR_JUKEBOX		10008
-#define NFSERR_TRYLATER		NFSERR_JUKEBOX
-#define	NFSERR_STALEWRITEVERF	30001	/* Fake return for nfs_commit() */
-
-#define NFSERR_RETVOID		0x20000000 /* Return void, not error */
-#define NFSERR_AUTHERR		0x40000000 /* Mark an authentication error */
-#define NFSERR_RETERR		0x80000000 /* Mark an error return for V3 */
-
-/* Sizes in bytes of various nfs rpc components */
-#define	NFSX_UNSIGNED	4
-
-/* specific to NFS Version 2 */
-#define	NFSX_V2FH	32
-#define	NFSX_V2FATTR	68
-#define	NFSX_V2SATTR	32
-#define	NFSX_V2COOKIE	4
-#define NFSX_V2STATFS	20
-
-/* specific to NFS Version 3 */
-#define NFSX_V3FH		(sizeof (fhandle_t)) /* size this server uses */
-#define	NFSX_V3FHMAX		64	/* max. allowed by protocol */
-#define NFSX_V3FATTR		84
-#define NFSX_V3SATTR		60	/* max. all fields filled in */
-#define NFSX_V3SRVSATTR		(sizeof (struct nfsv3_sattr))
-#define NFSX_V3POSTOPATTR	(NFSX_V3FATTR + NFSX_UNSIGNED)
-#define NFSX_V3WCCDATA		(NFSX_V3POSTOPATTR + 8 * NFSX_UNSIGNED)
-#define NFSX_V3COOKIEVERF 	8
-#define NFSX_V3WRITEVERF 	8
-#define NFSX_V3CREATEVERF	8
-#define NFSX_V3STATFS		52
-#define NFSX_V3FSINFO		48
-#define NFSX_V3PATHCONF		24
-
-/* variants for both versions */
-#define NFSX_FH(v3)		((v3) ? (NFSX_V3FHMAX + NFSX_UNSIGNED) : \
-					NFSX_V2FH)
-#define NFSX_SRVFH(v3)		((v3) ? NFSX_V3FH : NFSX_V2FH)
-#define	NFSX_FATTR(v3)		((v3) ? NFSX_V3FATTR : NFSX_V2FATTR)
-#define NFSX_PREOPATTR(v3)	((v3) ? (7 * NFSX_UNSIGNED) : 0)
-#define NFSX_POSTOPATTR(v3)	((v3) ? (NFSX_V3FATTR + NFSX_UNSIGNED) : 0)
-#define NFSX_POSTOPORFATTR(v3)	((v3) ? (NFSX_V3FATTR + NFSX_UNSIGNED) : \
-					NFSX_V2FATTR)
-#define NFSX_WCCDATA(v3)	((v3) ? NFSX_V3WCCDATA : 0)
-#define NFSX_WCCORFATTR(v3)	((v3) ? NFSX_V3WCCDATA : NFSX_V2FATTR)
-#define	NFSX_SATTR(v3)		((v3) ? NFSX_V3SATTR : NFSX_V2SATTR)
-#define	NFSX_COOKIEVERF(v3)	((v3) ? NFSX_V3COOKIEVERF : 0)
-#define	NFSX_WRITEVERF(v3)	((v3) ? NFSX_V3WRITEVERF : 0)
-#define NFSX_READDIR(v3)	((v3) ? (5 * NFSX_UNSIGNED) : \
-					(2 * NFSX_UNSIGNED))
-#define	NFSX_STATFS(v3)		((v3) ? NFSX_V3STATFS : NFSX_V2STATFS)
-
-/* nfs rpc procedure numbers (before version mapping) */
-#define	NFSPROC_NULL		0
-#define	NFSPROC_GETATTR		1
-#define	NFSPROC_SETATTR		2
-#define	NFSPROC_LOOKUP		3
-#define	NFSPROC_ACCESS		4
-#define	NFSPROC_READLINK	5
-#define	NFSPROC_READ		6
-#define	NFSPROC_WRITE		7
-#define	NFSPROC_CREATE		8
-#define	NFSPROC_MKDIR		9
-#define	NFSPROC_SYMLINK		10
-#define	NFSPROC_MKNOD		11
-#define	NFSPROC_REMOVE		12
-#define	NFSPROC_RMDIR		13
-#define	NFSPROC_RENAME		14
-#define	NFSPROC_LINK		15
-#define	NFSPROC_READDIR		16
-#define	NFSPROC_READDIRPLUS	17
-#define	NFSPROC_FSSTAT		18
-#define	NFSPROC_FSINFO		19
-#define	NFSPROC_PATHCONF	20
-#define	NFSPROC_COMMIT		21
-
-/* And leasing (nqnfs) procedure numbers (must be last) */
-#define	NQNFSPROC_GETLEASE	22
-#define	NQNFSPROC_VACATED	23
-#define	NQNFSPROC_EVICTED	24
-
-#define NFSPROC_NOOP		25
-#define	NFS_NPROCS		26
-
-/* Actual Version 2 procedure numbers */
-#define	NFSV2PROC_NULL		0
-#define	NFSV2PROC_GETATTR	1
-#define	NFSV2PROC_SETATTR	2
-#define	NFSV2PROC_NOOP		3
-#define	NFSV2PROC_ROOT		NFSV2PROC_NOOP	/* Obsolete */
-#define	NFSV2PROC_LOOKUP	4
-#define	NFSV2PROC_READLINK	5
-#define	NFSV2PROC_READ		6
-#define	NFSV2PROC_WRITECACHE	NFSV2PROC_NOOP	/* Obsolete */
-#define	NFSV2PROC_WRITE		8
-#define	NFSV2PROC_CREATE	9
-#define	NFSV2PROC_REMOVE	10
-#define	NFSV2PROC_RENAME	11
-#define	NFSV2PROC_LINK		12
-#define	NFSV2PROC_SYMLINK	13
-#define	NFSV2PROC_MKDIR		14
-#define	NFSV2PROC_RMDIR		15
-#define	NFSV2PROC_READDIR	16
-#define	NFSV2PROC_STATFS	17
-
-/*
- * Constants used by the Version 3 protocol for various RPCs
- */
-#define NFSV3SATTRTIME_DONTCHANGE	0
-#define NFSV3SATTRTIME_TOSERVER		1
-#define NFSV3SATTRTIME_TOCLIENT		2
-
-#define NFSV3ACCESS_READ		0x01
-#define NFSV3ACCESS_LOOKUP		0x02
-#define NFSV3ACCESS_MODIFY		0x04
-#define NFSV3ACCESS_EXTEND		0x08
-#define NFSV3ACCESS_DELETE		0x10
-#define NFSV3ACCESS_EXECUTE		0x20
-
-#define NFSV3WRITE_UNSTABLE		0
-#define NFSV3WRITE_DATASYNC		1
-#define NFSV3WRITE_FILESYNC		2
-
-#define NFSV3CREATE_UNCHECKED		0
-#define NFSV3CREATE_GUARDED		1
-#define NFSV3CREATE_EXCLUSIVE		2
-
-#define NFSV3FSINFO_LINK		0x01
-#define NFSV3FSINFO_SYMLINK		0x02
-#define NFSV3FSINFO_HOMOGENEOUS		0x08
-#define NFSV3FSINFO_CANSETTIME		0x10
-
-/* Conversion macros */
-#define	vtonfsv2_mode(t,m) \
-		txdr_unsigned(((t) == VFIFO) ? MAKEIMODE(VCHR, (m)) : \
-				MAKEIMODE((t), (m)))
-#define vtonfsv3_mode(m)	txdr_unsigned((m) & 07777)
-#define	nfstov_mode(a)		(fxdr_unsigned(u_short, (a))&07777)
-#define	vtonfsv2_type(a)	txdr_unsigned(nfsv2_type[((long)(a))])
-#define	vtonfsv3_type(a)	txdr_unsigned(nfsv3_type[((long)(a))])
-#define	nfsv2tov_type(a)	nv2tov_type[fxdr_unsigned(u_long,(a))&0x7]
-#define	nfsv3tov_type(a)	nv3tov_type[fxdr_unsigned(u_long,(a))&0x7]
-
-/* File types */
-typedef enum { NFNON=0, NFREG=1, NFDIR=2, NFBLK=3, NFCHR=4, NFLNK=5,
-	NFSOCK=6, NFFIFO=7 } nfstype;
-
-/* Structs for common parts of the rpc's */
-/*
- * File Handle (32 bytes for version 2), variable up to 64 for version 3.
- * File Handles of up to NFS_SMALLFH in size are stored directly in the
- * nfs node, whereas larger ones are malloc'd. (This never happens when
- * NFS_SMALLFH is set to 64.)
- * NFS_SMALLFH should be in the range of 32 to 64 and be divisible by 4.
- */
-#ifndef NFS_SMALLFH
-#define NFS_SMALLFH	64
-#endif
-union nfsfh {
-	fhandle_t	fh_generic;
-	u_char		fh_bytes[NFS_SMALLFH];
-};
-typedef union nfsfh nfsfh_t;
-
-struct nfsv2_time {
-	u_long	nfsv2_sec;
-	u_long	nfsv2_usec;
-};
-typedef struct nfsv2_time	nfstime2;
-
-struct nfsv3_time {
-	u_long	nfsv3_sec;
-	u_long	nfsv3_nsec;
-};
-typedef struct nfsv3_time	nfstime3;
-
-/*
- * Quads are defined as arrays of 2 longs to ensure dense packing for the
- * protocol and to facilitate xdr conversion.
- */
-struct nfs_uquad {
-	u_long	nfsuquad[2];
-};
-typedef	struct nfs_uquad	nfsuint64;
-
-/*
- * Used to convert between two u_longs and a u_quad_t.
- */
-union nfs_quadconvert {
-	u_long		lval[2];
-	u_quad_t	qval;
-};
-typedef union nfs_quadconvert	nfsquad_t;
-
-/*
- * NFS Version 3 special file number.
- */
-struct nfsv3_spec {
-	u_long	specdata1;
-	u_long	specdata2;
-};
-typedef	struct nfsv3_spec	nfsv3spec;
-
-/*
- * File attributes and setable attributes. These structures cover both
- * NFS version 2 and the version 3 protocol. Note that the union is only
- * used so that one pointer can refer to both variants. These structures
- * go out on the wire and must be densely packed, so no quad data types
- * are used. (all fields are longs or u_longs or structures of same)
- * NB: You can't do sizeof(struct nfs_fattr), you must use the
- *     NFSX_FATTR(v3) macro.
- */
-struct nfs_fattr {
-	u_long	fa_type;
-	u_long	fa_mode;
-	u_long	fa_nlink;
-	u_long	fa_uid;
-	u_long	fa_gid;
-	union {
-		struct {
-			u_long		nfsv2fa_size;
-			u_long		nfsv2fa_blocksize;
-			u_long		nfsv2fa_rdev;
-			u_long		nfsv2fa_blocks;
-			u_long		nfsv2fa_fsid;
-			u_long		nfsv2fa_fileid;
-			nfstime2	nfsv2fa_atime;
-			nfstime2	nfsv2fa_mtime;
-			nfstime2	nfsv2fa_ctime;
-		} fa_nfsv2;
-		struct {
-			nfsuint64	nfsv3fa_size;
-			nfsuint64	nfsv3fa_used;
-			nfsv3spec	nfsv3fa_rdev;
-			nfsuint64	nfsv3fa_fsid;
-			nfsuint64	nfsv3fa_fileid;
-			nfstime3	nfsv3fa_atime;
-			nfstime3	nfsv3fa_mtime;
-			nfstime3	nfsv3fa_ctime;
-		} fa_nfsv3;
-	} fa_un;
-};
-
-/* and some ugly defines for accessing union components */
-#define	fa2_size		fa_un.fa_nfsv2.nfsv2fa_size
-#define	fa2_blocksize		fa_un.fa_nfsv2.nfsv2fa_blocksize
-#define	fa2_rdev		fa_un.fa_nfsv2.nfsv2fa_rdev
-#define	fa2_blocks		fa_un.fa_nfsv2.nfsv2fa_blocks
-#define	fa2_fsid		fa_un.fa_nfsv2.nfsv2fa_fsid
-#define	fa2_fileid		fa_un.fa_nfsv2.nfsv2fa_fileid
-#define	fa2_atime		fa_un.fa_nfsv2.nfsv2fa_atime
-#define	fa2_mtime		fa_un.fa_nfsv2.nfsv2fa_mtime
-#define	fa2_ctime		fa_un.fa_nfsv2.nfsv2fa_ctime
-#define	fa3_size		fa_un.fa_nfsv3.nfsv3fa_size
-#define	fa3_used		fa_un.fa_nfsv3.nfsv3fa_used
-#define	fa3_rdev		fa_un.fa_nfsv3.nfsv3fa_rdev
-#define	fa3_fsid		fa_un.fa_nfsv3.nfsv3fa_fsid
-#define	fa3_fileid		fa_un.fa_nfsv3.nfsv3fa_fileid
-#define	fa3_atime		fa_un.fa_nfsv3.nfsv3fa_atime
-#define	fa3_mtime		fa_un.fa_nfsv3.nfsv3fa_mtime
-#define	fa3_ctime		fa_un.fa_nfsv3.nfsv3fa_ctime
-
-struct nfsv2_sattr {
-	u_long		sa_mode;
-	u_long		sa_uid;
-	u_long		sa_gid;
-	u_long		sa_size;
-	nfstime2	sa_atime;
-	nfstime2	sa_mtime;
-};
-
-/*
- * NFS Version 3 sattr structure for the new node creation case.
- */
-struct nfsv3_sattr {
-	u_long		sa_modetrue;
-	u_long		sa_mode;
-	u_long		sa_uidtrue;
-	u_long		sa_uid;
-	u_long		sa_gidtrue;
-	u_long		sa_gid;
-	u_long		sa_sizefalse;
-	u_long		sa_atimetype;
-	nfstime3	sa_atime;
-	u_long		sa_mtimetype;
-	nfstime3	sa_mtime;
-};
-
-struct nfs_statfs {
-	union {
-		struct {
-			u_long		nfsv2sf_tsize;
-			u_long		nfsv2sf_bsize;
-			u_long		nfsv2sf_blocks;
-			u_long		nfsv2sf_bfree;
-			u_long		nfsv2sf_bavail;
-		} sf_nfsv2;
-		struct {
-			nfsuint64	nfsv3sf_tbytes;
-			nfsuint64	nfsv3sf_fbytes;
-			nfsuint64	nfsv3sf_abytes;
-			nfsuint64	nfsv3sf_tfiles;
-			nfsuint64	nfsv3sf_ffiles;
-			nfsuint64	nfsv3sf_afiles;
-			u_long		nfsv3sf_invarsec;
-		} sf_nfsv3;
-	} sf_un;
-};
-
-#define sf_tsize	sf_un.sf_nfsv2.nfsv2sf_tsize
-#define sf_bsize	sf_un.sf_nfsv2.nfsv2sf_bsize
-#define sf_blocks	sf_un.sf_nfsv2.nfsv2sf_blocks
-#define sf_bfree	sf_un.sf_nfsv2.nfsv2sf_bfree
-#define sf_bavail	sf_un.sf_nfsv2.nfsv2sf_bavail
-#define sf_tbytes	sf_un.sf_nfsv3.nfsv3sf_tbytes
-#define sf_fbytes	sf_un.sf_nfsv3.nfsv3sf_fbytes
-#define sf_abytes	sf_un.sf_nfsv3.nfsv3sf_abytes
-#define sf_tfiles	sf_un.sf_nfsv3.nfsv3sf_tfiles
-#define sf_ffiles	sf_un.sf_nfsv3.nfsv3sf_ffiles
-#define sf_afiles	sf_un.sf_nfsv3.nfsv3sf_afiles
-#define sf_invarsec	sf_un.sf_nfsv3.nfsv3sf_invarsec
-
-struct nfsv3_fsinfo {
-	u_long		fs_rtmax;
-	u_long		fs_rtpref;
-	u_long		fs_rtmult;
-	u_long		fs_wtmax;
-	u_long		fs_wtpref;
-	u_long		fs_wtmult;
-	u_long		fs_dtpref;
-	nfsuint64	fs_maxfilesize;
-	nfstime3	fs_timedelta;
-	u_long		fs_properties;
-};
-
-struct nfsv3_pathconf {
-	u_long		pc_linkmax;
-	u_long		pc_namemax;
-	u_long		pc_notrunc;
-	u_long		pc_chownrestricted;
-	u_long		pc_caseinsensitive;
-	u_long		pc_casepreserving;
-};
-
-#endif
diff --git a/c/src/libnetworking/nfs/rpcv2.h b/c/src/libnetworking/nfs/rpcv2.h
deleted file mode 100644
index 5fd6e7febf..0000000000
--- a/c/src/libnetworking/nfs/rpcv2.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Rick Macklem at The University of Guelph.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)rpcv2.h	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#ifndef _NFS_RPCV2_H_
-#define _NFS_RPCV2_H_
-
-/*
- * Definitions for Sun RPC Version 2, from
- * "RPC: Remote Procedure Call Protocol Specification" RFC1057
- */
-
-/* Version # */
-#define	RPC_VER2	2
-
-/* Authentication */
-#define	RPCAUTH_NULL	0
-#define	RPCAUTH_UNIX	1
-#define	RPCAUTH_SHORT	2
-#define RPCAUTH_KERB4	4
-#define	RPCAUTH_NQNFS	300000
-#define	RPCAUTH_MAXSIZ	400
-#define	RPCVERF_MAXSIZ	12	/* For Kerb, can actually be 400 */
-#define	RPCAUTH_UNIXGIDS 16
-
-/*
- * Constants associated with authentication flavours.
- */
-#define RPCAKN_FULLNAME	0
-#define RPCAKN_NICKNAME	1
-
-/* Rpc Constants */
-#define	RPC_CALL	0
-#define	RPC_REPLY	1
-#define	RPC_MSGACCEPTED	0
-#define	RPC_MSGDENIED	1
-#define	RPC_PROGUNAVAIL	1
-#define	RPC_PROGMISMATCH	2
-#define	RPC_PROCUNAVAIL	3
-#define	RPC_GARBAGE	4		/* I like this one */
-#define	RPC_MISMATCH	0
-#define	RPC_AUTHERR	1
-
-/* Authentication failures */
-#define	AUTH_BADCRED	1
-#define	AUTH_REJECTCRED	2
-#define	AUTH_BADVERF	3
-#define	AUTH_REJECTVERF	4
-#define	AUTH_TOOWEAK	5		/* Give em wheaties */
-
-/* Sizes of rpc header parts */
-#define	RPC_SIZ		24
-#define	RPC_REPLYSIZ	28
-
-/* RPC Prog definitions */
-#define	RPCPROG_MNT	100005
-#define	RPCMNT_VER1	1
-#define	RPCMNT_VER3	3
-#define	RPCMNT_MOUNT	1
-#define	RPCMNT_DUMP	2
-#define	RPCMNT_UMOUNT	3
-#define	RPCMNT_UMNTALL	4
-#define	RPCMNT_EXPORT	5
-#define	RPCMNT_NAMELEN	255
-#define	RPCMNT_PATHLEN	1024
-#define	RPCPROG_NFS	100003
-
-/*
- * Structures used for RPCAUTH_KERB4.
- */
-struct nfsrpc_fullverf {
-	u_long		t1;
-	u_long		t2;
-	u_long		w2;
-};
-
-struct nfsrpc_fullblock {
-	u_long		t1;
-	u_long		t2;
-	u_long		w1;
-	u_long		w2;
-};
-
-struct nfsrpc_nickverf {
-	u_long			kind;
-	struct nfsrpc_fullverf	verf;
-};
-
-/*
- * and their sizes in bytes.. If sizeof (struct nfsrpc_xx) != these
- * constants, well then things will break in mount_nfs and nfsd.
- */
-#define RPCX_FULLVERF	12
-#define RPCX_FULLBLOCK	16
-#define RPCX_NICKVERF	16
-
-#ifdef NFSKERB
-XXX
-#else
-typedef u_char			NFSKERBKEY_T[2];
-typedef u_char			NFSKERBKEYSCHED_T[2];
-#endif
-#define NFS_KERBSRV	"rcmd"		/* Kerberos Service for NFS */
-#define NFS_KERBTTL	(30 * 60)	/* Credential ttl (sec) */
-#define NFS_KERBCLOCKSKEW (5 * 60)	/* Clock skew (sec) */
-#define NFS_KERBW1(t)	(*((u_long *)(&((t).dat[((t).length + 3) & ~0x3]))))
-#endif
diff --git a/c/src/libnetworking/nfs/xdr_subs.h b/c/src/libnetworking/nfs/xdr_subs.h
deleted file mode 100644
index 874730378f..0000000000
--- a/c/src/libnetworking/nfs/xdr_subs.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Rick Macklem at The University of Guelph.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)xdr_subs.h	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#ifndef _NFS_XDR_SUBS_H_
-#define _NFS_XDR_SUBS_H_
-
-/*
- * Macros used for conversion to/from xdr representation by nfs...
- * These use the MACHINE DEPENDENT routines ntohl, htonl
- * As defined by "XDR: External Data Representation Standard" RFC1014
- *
- * To simplify the implementation, we use ntohl/htonl even on big-endian
- * machines, and count on them being `#define'd away.  Some of these
- * might be slightly more efficient as quad_t copies on a big-endian,
- * but we cannot count on their alignment anyway.
- */
-
-#define	fxdr_unsigned(t, v)	((t)ntohl((long)(v)))
-#define	txdr_unsigned(v)	(htonl((long)(v)))
-
-#define	fxdr_nfsv2time(f, t) { \
-	(t)->tv_sec = ntohl(((struct nfsv2_time *)(f))->nfsv2_sec); \
-	if (((struct nfsv2_time *)(f))->nfsv2_usec != 0xffffffff) \
-		(t)->tv_nsec = 1000 * ntohl(((struct nfsv2_time *)(f))->nfsv2_usec); \
-	else \
-		(t)->tv_nsec = 0; \
-}
-#define	txdr_nfsv2time(f, t) { \
-	((struct nfsv2_time *)(t))->nfsv2_sec = htonl((f)->tv_sec); \
-	if ((f)->tv_nsec != -1) \
-		((struct nfsv2_time *)(t))->nfsv2_usec = htonl((f)->tv_nsec / 1000); \
-	else \
-		((struct nfsv2_time *)(t))->nfsv2_usec = 0xffffffff; \
-}
-
-#define	fxdr_nfsv3time(f, t) { \
-	(t)->tv_sec = ntohl(((struct nfsv3_time *)(f))->nfsv3_sec); \
-	(t)->tv_nsec = ntohl(((struct nfsv3_time *)(f))->nfsv3_nsec); \
-}
-#define	txdr_nfsv3time(f, t) { \
-	((struct nfsv3_time *)(t))->nfsv3_sec = htonl((f)->tv_sec); \
-	((struct nfsv3_time *)(t))->nfsv3_nsec = htonl((f)->tv_nsec); \
-}
-
-#define	fxdr_hyper(f, t) { \
-	((long *)(t))[_QUAD_HIGHWORD] = ntohl(((long *)(f))[0]); \
-	((long *)(t))[_QUAD_LOWWORD] = ntohl(((long *)(f))[1]); \
-}
-#define	txdr_hyper(f, t) { \
-	((long *)(t))[0] = htonl(((long *)(f))[_QUAD_HIGHWORD]); \
-	((long *)(t))[1] = htonl(((long *)(f))[_QUAD_LOWWORD]); \
-}
-
-#endif
diff --git a/c/src/libnetworking/opt_ipfw.h b/c/src/libnetworking/opt_ipfw.h
deleted file mode 100644
index 5a6ee0337b..0000000000
--- a/c/src/libnetworking/opt_ipfw.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/*
- *  $Id$
- */
-
-/* intentionally empty file */
-
diff --git a/c/src/libnetworking/opt_mrouting.h b/c/src/libnetworking/opt_mrouting.h
deleted file mode 100644
index 5a6ee0337b..0000000000
--- a/c/src/libnetworking/opt_mrouting.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/*
- *  $Id$
- */
-
-/* intentionally empty file */
-
diff --git a/c/src/libnetworking/opt_tcpdebug.h b/c/src/libnetworking/opt_tcpdebug.h
deleted file mode 100644
index 5a6ee0337b..0000000000
--- a/c/src/libnetworking/opt_tcpdebug.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/*
- *  $Id$
- */
-
-/* intentionally empty file */
-
diff --git a/c/src/libnetworking/poll.h b/c/src/libnetworking/poll.h
deleted file mode 100644
index 74dfca76c1..0000000000
--- a/c/src/libnetworking/poll.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/*-
- * Copyright (c) 1997 Peter Wemm <peter@freebsd.org>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	$Id$
- */
-
-#ifndef _SYS_POLL_H_
-#define	_SYS_POLL_H_
-
-/*
- * This file is intended to be compatable with the traditional poll.h.
- */
-
-/*
- * This structure is passed as an array to poll(2).
- */
-struct pollfd {
-	int	fd;		/* which file descriptor to poll */
-	short	events;		/* events we are interested in */
-	short	revents;	/* events found on return */
-};
-
-/*
- * Requestable events.  If poll(2) finds any of these set, they are
- * copied to revents on return.
- * XXX Note that FreeBSD doesn't make much distinction between POLLPRI
- * and POLLRDBAND since none of the file types have distinct priority
- * bands - and only some have an urgent "mode".
- * XXX Note POLLIN isn't really supported in true SVSV terms.  Under SYSV
- * POLLIN includes all of normal, band and urgent data.  Most poll handlers
- * on FreeBSD only treat it as "normal" data.
- */
-#define	POLLIN		0x0001		/* any readable data available */
-#define	POLLPRI		0x0002		/* OOB/Urgent readable data */
-#define	POLLOUT		0x0004		/* file descriptor is writeable */
-#define	POLLRDNORM	0x0040		/* non-OOB/URG data available */
-#define	POLLWRNORM	POLLOUT		/* no write type differentiation */
-#define	POLLRDBAND	0x0080		/* OOB/Urgent readable data */
-#define	POLLWRBAND	0x0100		/* OOB/Urgent data can be written */
-
-/*
- * FreeBSD extensions: polling on a regular file might return one
- * of these events (currently only supported on UFS).
- */
-#define	POLLEXTEND	0x0200		/* file may have been extended */
-#define	POLLATTRIB	0x0400		/* file attributes may have changed */
-#define	POLLNLINK	0x0800		/* (un)link/rename may have happened */
-#define	POLLWRITE	0x1000		/* file's contents may have changed */
-
-/*
- * These events are set if they occur regardless of whether they were
- * requested.
- */
-#define	POLLERR		0x0008		/* some poll error occurred */
-#define	POLLHUP		0x0010		/* file descriptor was "hung up" */
-#define	POLLNVAL	0x0020		/* requested events "invalid" */
-
-#define	POLLSTANDARD	(POLLIN|POLLPRI|POLLOUT|POLLRDNORM|POLLRDBAND|\
-			 POLLWRBAND|POLLERR|POLLHUP|POLLNVAL)
-
-/*
- * Request that poll() wait forever.
- * XXX in SYSV, this is defined in stropts.h, which is not included
- * by poll.h.
- */
-#define	INFTIM		(-1)
-
-#ifndef KERNEL
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-/*
- * XXX logically, poll() should be declared in <poll.h>, but SVR4 at
- * least has it here in <sys/poll.h>.
- * XXX poll() has "unsigned long" nfds on SVR4, not unsigned as on the
- * other BSDs.
- */
-int	poll __P((struct pollfd *_pfd, unsigned _nfds, int _timeout));
-__END_DECLS
-
-#endif /* !KERNEL */
-
-#endif /* !_SYS_POLL_H_ */
diff --git a/c/src/libnetworking/resolv.h b/c/src/libnetworking/resolv.h
deleted file mode 100644
index 614f204706..0000000000
--- a/c/src/libnetworking/resolv.h
+++ /dev/null
@@ -1,306 +0,0 @@
-/*-
- * Copyright (c) 1983, 1987, 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * Portions Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-/*
- *	@(#)resolv.h	8.1 (Berkeley) 6/2/93
- *	From Id: resolv.h,v 8.12 1998/04/28 19:36:46 halley Exp $
- *	$Id$
- */
-
-#ifndef _RESOLV_H_
-#define	_RESOLV_H_
-
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/cdefs.h>
-#include <stdio.h>
-
-/*
- * Revision information.  This is the release date in YYYYMMDD format.
- * It can change every day so the right thing to do with it is use it
- * in preprocessor commands such as "#if (__RES > 19931104)".  Do not
- * compare for equality; rather, use it to determine whether your resolver
- * is new enough to contain a certain feature.
- */
-
-#define	__RES	19960801
-
-/*
- * This used to be defined in res_query.c, now it's in herror.c.  It was
- * never extern'd by any *.h file before it was placed here.  herror.c is
- * part of libresolv.a even though it might make more sense in libnetdb.a
- * or even libnet.a.
- */
-
-extern int h_errno;
-
-/*
- * Resolver configuration file.
- * Normally not present, but may contain the address of the
- * inital name server(s) to query and the domain search list.
- */
-
-#ifndef _PATH_RESCONF
-#define	_PATH_RESCONF        "/etc/resolv.conf"
-#endif
-
-/*
- * Global defines and variables for resolver stub.
- */
-#define	MAXNS			3	/* max # name servers we'll track */
-#define	MAXDFLSRCH		3	/* # default domain levels to try */
-#define	MAXDNSRCH		6	/* max # domains in search path */
-#define	LOCALDOMAINPARTS	2	/* min levels in name that is "local" */
-
-#define	RES_TIMEOUT		5	/* min. seconds between retries */
-#define	MAXRESOLVSORT		10	/* number of net to sort on */
-#define	RES_MAXNDOTS		15	/* should reflect bit field size */
-
-struct __res_state {
-	int	retrans;	 	/* retransmition time interval */
-	int	retry;			/* number of times to retransmit */
-	u_long	options;		/* option flags - see below. */
-	int	nscount;		/* number of name servers */
-	struct sockaddr_in
-		nsaddr_list[MAXNS];	/* address of name server */
-#define	nsaddr	nsaddr_list[0]		/* for backward compatibility */
-	u_short	id;			/* current message id */
-	char	*dnsrch[MAXDNSRCH+1];	/* components of domain to search */
-	char	defdname[256];		/* default domain (deprecated) */
-	u_long	pfcode;			/* RES_PRF_ flags - see below. */
-	unsigned ndots:4;		/* threshold for initial abs. query */
-	unsigned nsort:4;		/* number of elements in sort_list[] */
-	char	unused[3];
-	struct {
-		struct in_addr	addr;
-		u_int32_t	mask;
-	} sort_list[MAXRESOLVSORT];
-	char	pad[72];		/* on an i386 this means 512b total */
-};
-
-/*
- * Resolver options (keep these in synch with res_debug.c, please)
- */
-#define RES_INIT	0x00000001	/* address initialized */
-#define RES_DEBUG	0x00000002	/* print debug messages */
-#define RES_AAONLY	0x00000004	/* authoritative answers only (!IMPL)*/
-#define RES_USEVC	0x00000008	/* use virtual circuit */
-#define RES_PRIMARY	0x00000010	/* query primary server only (!IMPL) */
-#define RES_IGNTC	0x00000020	/* ignore truncation errors */
-#define RES_RECURSE	0x00000040	/* recursion desired */
-#define RES_DEFNAMES	0x00000080	/* use default domain name */
-#define RES_STAYOPEN	0x00000100	/* Keep TCP socket open */
-#define RES_DNSRCH	0x00000200	/* search up local domain tree */
-#define	RES_INSECURE1	0x00000400	/* type 1 security disabled */
-#define	RES_INSECURE2	0x00000800	/* type 2 security disabled */
-#define	RES_NOALIASES	0x00001000	/* shuts off HOSTALIASES feature */
-#define	RES_USE_INET6	0x00002000	/* use/map IPv6 in gethostbyname() */
-#define	RES_NOTLDQUERY	0x00004000	/* Don't query TLD names */
-
-#define RES_DEFAULT	(RES_RECURSE | RES_DEFNAMES | RES_DNSRCH)
-
-/*
- * Resolver "pfcode" values.  Used by dig.
- */
-#define	RES_PRF_STATS	0x00000001
-#define	RES_PRF_UPDATE	0x00000002
-#define	RES_PRF_CLASS   0x00000004
-#define	RES_PRF_CMD	0x00000008
-#define	RES_PRF_QUES	0x00000010
-#define	RES_PRF_ANS	0x00000020
-#define	RES_PRF_AUTH	0x00000040
-#define	RES_PRF_ADD	0x00000080
-#define	RES_PRF_HEAD1	0x00000100
-#define	RES_PRF_HEAD2	0x00000200
-#define	RES_PRF_TTLID	0x00000400
-#define	RES_PRF_HEADX	0x00000800
-#define	RES_PRF_QUERY	0x00001000
-#define	RES_PRF_REPLY	0x00002000
-#define	RES_PRF_INIT    0x00004000
-/*			0x00008000	*/
-
-typedef enum { res_goahead, res_nextns, res_modified, res_done, res_error }
-	res_sendhookact;
-
-typedef res_sendhookact (*res_send_qhook)__P((struct sockaddr_in * const *ns,
-					      const u_char **query,
-					      int *querylen,
-					      u_char *ans,
-					      int anssiz,
-					      int *resplen));
-
-typedef res_sendhookact (*res_send_rhook)__P((const struct sockaddr_in *ns,
-					      const u_char *query,
-					      int querylen,
-					      u_char *ans,
-					      int anssiz,
-					      int *resplen));
-
-struct res_sym {
-	int	number;		/* Identifying number, like T_MX */
-	char *	name;		/* Its symbolic name, like "MX" */
-	char *	humanname;	/* Its fun name, like "mail exchanger" */
-};
-
-extern struct __res_state _res;
-extern const struct res_sym __p_class_syms[];
-extern const struct res_sym __p_type_syms[];
-
-/* Private routines shared between libc/net, named, nslookup and others. */
-#define	res_hnok	__res_hnok
-#define	res_ownok	__res_ownok
-#define	res_mailok	__res_mailok
-#define	res_dnok	__res_dnok
-#define	sym_ston	__sym_ston
-#define	sym_ntos	__sym_ntos
-#define	sym_ntop	__sym_ntop
-#define	b64_ntop	__b64_ntop
-#define	b64_pton	__b64_pton
-#define	loc_ntoa	__loc_ntoa
-#define	loc_aton	__loc_aton
-#define	fp_resstat	__fp_resstat
-#define	p_query		__p_query
-#define	dn_skipname	__dn_skipname
-#define	fp_resstat	__fp_resstat
-#define	fp_query	__fp_query
-#define	fp_nquery	__fp_nquery
-#define	hostalias	__hostalias
-#define	putlong		__putlong
-#define	putshort	__putshort
-#define	p_class		__p_class
-#define	p_time		__p_time
-#define	p_type		__p_type
-#define	p_query		__p_query
-#define	p_cdnname	__p_cdnname
-#define	p_section	__p_section
-#define	p_cdname	__p_cdname
-#define	p_fqnname	__p_fqnname
-#define	p_fqname	__p_fqname
-#define	p_option	__p_option
-#define	p_secstodate	__p_secstodate
-#define	dn_count_labels	__dn_count_labels
-#define	dn_comp		__dn_comp
-#define	dn_expand	__dn_expand
-#define	res_init	__res_init
-#define	res_randomid	__res_randomid
-#define	res_query	__res_query
-#define	res_search	__res_search
-#define	res_querydomain	__res_querydomain
-#define	res_mkquery	__res_mkquery
-#define	res_send	__res_send
-#define	res_isourserver	__res_isourserver
-#define	res_nameinquery	__res_nameinquery
-#define	res_queriesmatch __res_queriesmatch
-#define	res_close	__res_close
-#define	res_mkupdate	__res_mkupdate
-#define	res_mkupdrec	__res_mkupdrec
-#define	res_freeupdrec	__res_freeupdrec
-
-__BEGIN_DECLS
-int		res_hnok __P((const char *));
-int		res_ownok __P((const char *));
-int		res_mailok __P((const char *));
-int		res_dnok __P((const char *));
-int		sym_ston __P((const struct res_sym *, const char *, int *));
-const char *	sym_ntos __P((const struct res_sym *, int, int *));
-const char *	sym_ntop __P((const struct res_sym *, int, int *));
-int		b64_ntop __P((u_char const *, size_t, char *, size_t));
-int		b64_pton __P((char const *, u_char *, size_t));
-int		loc_aton __P((const char *, u_char *));
-const char *	loc_ntoa __P((const u_char *, char *));
-int		dn_skipname __P((const u_char *, const u_char *));
-void		fp_resstat __P((struct __res_state *, FILE *));
-void		fp_query __P((const u_char *, FILE *));
-void		fp_nquery __P((const u_char *, int, FILE *));
-const char *	hostalias __P((const char *));
-void		putlong __P((u_int32_t, u_char *));
-void		putshort __P((u_int16_t, u_char *));
-const char *	p_class __P((int));
-const char *	p_time __P((u_int32_t));
-const char *	p_type __P((int));
-void		p_query __P((const u_char *));
-const u_char *	p_cdnname __P((const u_char *, const u_char *, int, FILE *));
-const u_char *	p_cdname __P((const u_char *, const u_char *, FILE *));
-const u_char *	p_fqnname __P((const u_char *, const u_char *,
-			       int, char *, int));
-const u_char *	p_fqname __P((const u_char *, const u_char *, FILE *));
-const char *	p_option __P((u_long));
-char *		p_secstodate __P((u_long));
-int		dn_count_labels __P((const char *));
-int		dn_comp __P((const char *, u_char *, int,
-			     u_char **, u_char **));
-int		dn_expand __P((const u_char *, const u_char *, const u_char *,
-			       char *, int));
-int		res_init __P((void));
-u_int		res_randomid __P((void));
-int		res_query __P((const char *, int, int, u_char *, int));
-int		res_search __P((const char *, int, int, u_char *, int));
-int		res_querydomain __P((const char *, const char *, int, int,
-				     u_char *, int));
-int		res_mkquery __P((int, const char *, int, int, const u_char *,
-				 int, const u_char *, u_char *, int));
-int		res_send __P((const u_char *, int, u_char *, int));
-int		res_isourserver __P((const struct sockaddr_in *));
-int		res_nameinquery __P((const char *, int, int,
-				     const u_char *, const u_char *));
-int		res_queriesmatch __P((const u_char *, const u_char *,
-				      const u_char *, const u_char *));
-void		res_close __P((void));
-const char *	p_section __P((int, int));
-/* XXX The following depend on the ns_updrec typedef in arpa/nameser.h */
-#ifdef _ARPA_NAMESER_H_
-int		res_update __P((ns_updrec *));
-int		res_mkupdate __P((ns_updrec *, u_char *, int));
-ns_updrec *	res_mkupdrec __P((int, const char *, u_int, u_int, u_long));
-void		res_freeupdrec __P((ns_updrec *));
-#endif
-__END_DECLS
-
-#endif /* !_RESOLV_H_ */
diff --git a/c/src/libnetworking/rtems/Makefile.in b/c/src/libnetworking/rtems/Makefile.in
deleted file mode 100644
index 038fb5c68e..0000000000
--- a/c/src/libnetworking/rtems/Makefile.in
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-LIBNAME=lib.a
-LIB=${ARCH}/${LIBNAME}
-
-# C and C++ source names, if any, go here -- minus the .c or .cc
-C_PIECES=sghostname issetugid \
-        rtems_glue rtems_syscall rtems_bootp \
-        rtems_showmbuf rtems_showroute \
-        rtems_showifstat rtems_showipstat rtems_showicmpstat \
-        rtems_showtcpstat rtems_showudpstat
-C_FILES=$(C_PIECES:%=%.c)
-C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
-
-SRCS=$(C_FILES)
-OBJS=$(C_O_FILES)
-
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/lib.cfg
-
-#
-# Add local stuff here using +=
-#
-
-DEFINES  += -D_COMPILING_BSD_KERNEL_ -DKERNEL -DINET -DNFS \
-    -DDIAGNOSTIC -DBOOTP_COMPAT
-CPPFLAGS +=
-CFLAGS   +=
-
-#
-# Add your list of files to delete here.  The config files
-#  already know how to delete some stuff, so you may want
-#  to just run 'make clean' first to see what gets missed.
-#  'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS += $(LIB)
-CLOBBER_ADDITIONS +=
-
-all:	${ARCH} $(LIB)
-
-$(LIB): $(SRCS) ${OBJS}
-	$(make-library)
diff --git a/c/src/libnetworking/rtems/issetugid.c b/c/src/libnetworking/rtems/issetugid.c
deleted file mode 100644
index 3baf0ec88b..0000000000
--- a/c/src/libnetworking/rtems/issetugid.c
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Dummy version of BSD routine
- *
- *  $Id$
- */
-
-int
-issetugid (void)
-{
-	return 0;
-}
diff --git a/c/src/libnetworking/rtems/rtems_bootp.c b/c/src/libnetworking/rtems/rtems_bootp.c
deleted file mode 100644
index 47e3db758f..0000000000
--- a/c/src/libnetworking/rtems/rtems_bootp.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- *  $Id$
- */
-
-#include <rtems.h>
-#include <rtems/error.h>
-#include <sys/types.h>
-#include <rtems/rtems_bsdnet.h>
-
-/*
- * Perform a BOOTP request
- */
-void
-rtems_bsdnet_do_bootp (void)
-{
-	rtems_bsdnet_semaphore_obtain ();
-	bootpc_init ();
-	rtems_bsdnet_semaphore_release ();
-}
diff --git a/c/src/libnetworking/rtems/rtems_bsdnet.h b/c/src/libnetworking/rtems/rtems_bsdnet.h
deleted file mode 100644
index 73ad92fa30..0000000000
--- a/c/src/libnetworking/rtems/rtems_bsdnet.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- *  $Id$
- */
-
-#ifndef _RTEMS_BSDNET_
-#define _RTEMS_BSDNET_
-
-#include <rtems.h>
-
-/*
- * Values that may be obtained by BOOTP
- */
-extern struct in_addr rtems_bsdnet_bootp_server_address;
-extern char *rtems_bsdnet_bootp_boot_file_name;
-
-/*
- * Manipulate routing tables
- */
-struct sockaddr;
-struct rtentry;
-int rtems_bsdnet_rtrequest (
-    int req,
-    struct sockaddr *dst,
-    struct sockaddr *gateway,
-    struct sockaddr *netmask,
-    int flags,
-    struct rtentry **net_nrt);
-
-/*
- * Diagnostics
- */
-void rtems_bsdnet_show_inet_routes (void);
-void rtems_bsdnet_show_mbuf_stats (void);
-void rtems_bsdnet_show_if_stats (void);
-void rtems_bsdnet_show_ip_stats (void);
-void rtems_bsdnet_show_icmp_stats (void);
-void rtems_bsdnet_show_udp_stats (void);
-void rtems_bsdnet_show_tcp_stats (void);
-
-/*
- * Network configuration
- */
-struct rtems_bsdnet_ifconfig {
-	/*
-	 * These two entries must be supplied for each interface.
-	 */
-	char		*name;
-	int		(*attach)(struct rtems_bsdnet_ifconfig *conf);
-
-	/*
-	 * Link to next interface
-	 */
-	struct rtems_bsdnet_ifconfig *next;
-
-	/*
-	 * The following entries may be obtained
-	 * from BOOTP or explicitily supplied.
-	 */
-	char		*ip_address;
-	char		*ip_netmask;
-	void		*hardware_address;
-
-	/*
-	 * The driver assigns defaults values to the following
-	 * entries if they are not explicitly supplied.
-	 */
-	int		ignore_broadcast;
-	int		mtu;
-	int		rbuf_count;
-	int		xbuf_count;
-
-	/*
-	 * For external ethernet controller board the following
-	 * parameters are needed
-	 */
-	unsigned int	port;   /* port of the board */
-	unsigned int	irno;   /* irq of the board */
-	unsigned int	bpar;   /* memory of the board */
-
-};
-
-struct rtems_bsdnet_config {
-	/*
-	 * This entry points to the head of the ifconfig chain.
-	 */
-	struct rtems_bsdnet_ifconfig *ifconfig;
-
-	/*
-	 * This entry should be rtems_bsdnet_do_bootp if BOOTP
-	 * is being used to configure the network, and NULL
-	 * if BOOTP is not being used.
-	 */
-	void			(*bootp)(void);
-
-	/*
-	 * The remaining items can be initialized to 0, in
-	 * which case the default value will be used.
-	 */
-	rtems_task_priority	network_task_priority;	/* 100		*/
-	unsigned long		mbuf_bytecount;		/* 64 kbytes	*/
-	unsigned long		mbuf_cluster_bytecount;	/* 128 kbytes	*/
-	char			*hostname;		/* BOOTP	*/
-	char			*domainname;		/* BOOTP	*/
-	char			*gateway;		/* BOOTP	*/
-	char			*log_host;		/* BOOTP	*/
-	char			*name_server[3];	/* BOOTP	*/
-};
-extern struct rtems_bsdnet_config rtems_bsdnet_config;
-int rtems_bsdnet_initialize_network (void);
-void rtems_bsdnet_do_bootp (void);
-
-#endif /* _RTEMS_BSDNET_ */
diff --git a/c/src/libnetworking/rtems/rtems_bsdnet_internal.h b/c/src/libnetworking/rtems/rtems_bsdnet_internal.h
deleted file mode 100644
index 559bafd4c5..0000000000
--- a/c/src/libnetworking/rtems/rtems_bsdnet_internal.h
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * Declarations to fit FreeBSD to RTEMS.
- *
- *******************************************************************
- *                            WARNING                              *
- * This file should *never* be included by any application program *
- *******************************************************************
- *
- *  $Id$
- */
-
-#ifndef _RTEMS_BSDNET_INTERNAL_H_
-#define _RTEMS_BSDNET_INTERNAL_H_
-
-typedef	unsigned int		vm_offset_t;
-typedef	long long		vm_ooffset_t;
-typedef	unsigned int		vm_pindex_t;
-typedef	unsigned int		vm_size_t;
-
-#define _BSD_OFF_T_	rtems_signed32
-#define _BSD_PID_T_	rtems_id
-#define _BSD_VA_LIST_	char *
-
-/* make sure we get the network versions of these */
-#include "../machine/types.h"
-#include "../machine/param.h"
-
-#include <sys/time.h>
-struct  itimerval {
-  struct  timeval it_interval;
-  struct  timeval it_value;
-};
-struct mdproc {
-	int	md_flags;
-	int	*md_regs;
-};
-
-#define USHRT_MAX	65535
-
-/*
- * Other RTEMS/BSD glue
- */
-struct socket;
-extern void soconnsleep (struct socket *so);
-extern void soconnwakeup (struct socket *so);
-#define splnet()	0
-#define splimp()	0
-#define splx(_s)	do { (_s) = 0; } while(0)
-
-#define ovbcopy(f,t,n) bcopy(f,t,n)
-#define copyout(f,t,n) (memcpy(t,f,n),0)
-#define copyin(f,t,n) (memcpy(t,f,n),0)
-
-#define random()	rtems_bsdnet_random()
-#define panic	rtems_panic
-#define suser(a,b)	0
-
-void	microtime (struct timeval *tv);
-#define hz rtems_bsdnet_ticks_per_second
-#define tick rtems_bsdnet_microseconds_per_tick
-
-#define SHRT_MAX 65535
-
-#define log	rtems_bsdnet_log
-
-/*
- * Since we can't have two sys/types.h files, we'll hack around
- * and copy the contents of the BSD sys/types.h to here....
- */
-#include <sys/cdefs.h>
-
-typedef	u_int64_t	u_quad_t;	/* quads */
-typedef	int64_t		quad_t;
-typedef	quad_t *	qaddr_t;
-
-typedef void __sighandler_t __P((int));
-typedef	__sighandler_t	*sig_t;	/* type of pointer to a signal function */
-#define NSIG    32
-struct	sigaltstack {
-	char	*ss_sp;			/* signal stack base */
-	int	ss_size;		/* signal stack length */
-	int	ss_flags;		/* SS_DISABLE and/or SS_ONSTACK */
-};
-
-#ifdef KERNEL
-typedef	int		boolean_t;
-typedef	struct vm_page	*vm_page_t;
-#endif
-
-#ifndef _POSIX_SOURCE
-/*
- * minor() gives a cookie instead of an index since we don't want to
- * change the meanings of bits 0-15 or waste time and space shifting
- * bits 16-31 for devices that don't use them.
- */
-#define	major(x)	((int)(((u_int)(x) >> 8)&0xff))	/* major number */
-#define	minor(x)	((int)((x)&0xffff00ff))		/* minor number */
-#define	makedev(x,y)	((dev_t)(((x) << 8) | (y)))	/* create dev_t */
-#endif
-
-#include <machine/endian.h>
-
-typedef quad_t          rlim_t;         /* resource limit */
-typedef	u_int32_t	fixpt_t;	/* fixed point number */
-
-/*
- * Forward structure declarations for function prototypes.  We include the
- * common structures that cross subsystem boundaries here; others are mostly
- * used in the same place that the structure is defined.
- */
-struct	proc;
-struct	pgrp;
-struct	ucred;
-struct	rusage;
-struct	file;
-struct	buf;
-struct	tty;
-struct	uio;
-
-/*
- * Redo kernel memory allocation
- */
-#define malloc rtems_bsdnet_malloc
-#define free rtems_bsdnet_free
-
-#define	M_NOWAIT	0x0001
-void *rtems_bsdnet_malloc (unsigned long size, int type, int flags);
-void rtems_bsdnet_free (void *addr, int type);
-
-void rtems_bsdnet_semaphore_obtain (void);
-void rtems_bsdnet_semaphore_release (void);
-void rtems_bsdnet_schednetisr (int n);
-
-unsigned long rtems_bsdnet_seconds_since_boot (void);
-unsigned long rtems_bsdnet_random (void);
-
-rtems_id rtems_bsdnet_newproc (
-  char  *name,
-  int   stacksize,
-  void  (*entry)(void *),
-  void  *arg
-);
-
-rtems_status_code rtems_bsdnet_event_receive (
-  rtems_event_set  event_in,
-  rtems_option     option_set,
-  rtems_interval   ticks,
-  rtems_event_set *event_out
-);
-
-/*
- * Network configuration
- */
-extern int rtems_bsdnet_ticks_per_second;
-extern int rtems_bsdnet_microseconds_per_tick;
-extern struct in_addr rtems_bsdnet_log_host_address;
-extern char *rtems_bsdnet_domain_name;
-extern struct in_addr rtems_bsdnet_nameserver[];
-extern int rtems_bsdnet_nameserver_count;
-
-/*
- * Internal IOCTL command
- */
-#define SIO_RTEMS_SHOW_STATS	_IO('i', 250)
-
-/*
- * Some extra prototypes
- */
-int sethostname (char *name, int namelen);
-void domaininit (void *);
-void ifinit (void *);
-void ipintr (void);
-void arpintr (void);
-void bootpc_init(void);
-int socket (int, int, int);
-int ioctl (int, unsigned long, ...);
-
-#endif /* _RTEMS_BSDNET_INTERNAL_H_ */
diff --git a/c/src/libnetworking/rtems/rtems_glue.c b/c/src/libnetworking/rtems/rtems_glue.c
deleted file mode 100644
index dd80a13d08..0000000000
--- a/c/src/libnetworking/rtems/rtems_glue.c
+++ /dev/null
@@ -1,905 +0,0 @@
-/*
- *  $Id$
- */
-
-#include <string.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <errno.h>
-
-#include <rtems.h>
-#include <rtems/libio.h>
-#include <rtems/error.h>
-#include <rtems/rtems_bsdnet.h>
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/domain.h>
-#include <sys/mbuf.h>
-#include <sys/socketvar.h>
-#include <sys/socket.h>
-#include <sys/sockio.h>
-#include <sys/callout.h>
-#include <sys/proc.h>
-#include <sys/ioctl.h>
-#include <net/if.h>
-#include <net/route.h>
-#include <netinet/in.h>
-#include <vm/vm.h>
-#include <arpa/inet.h>
-
-#include <net/netisr.h>
-#include <net/route.h>
-
-/*
- * Events used by networking routines.
- * Everything will break if the application
- * tries to use these events or if the `sleep'
- * events are equal to any of the NETISR * events.
- */
-#define SBWAIT_EVENT	RTEMS_EVENT_24
-#define SOSLEEP_EVENT	RTEMS_EVENT_25
-#define NETISR_IP_EVENT		(1 << NETISR_IP)
-#define NETISR_ARP_EVENT	(1 << NETISR_ARP)
-#define NETISR_EVENTS	(NETISR_IP_EVENT|NETISR_ARP_EVENT)
-
-
-/*
- * Memory allocation
- */
-static int nmbuf	= (64 * 1024) / MSIZE;
-       int nmbclusters	= (128 * 1024) / MCLBYTES;
-
-/*
- * Socket buffering parameters
- */
-unsigned long sb_efficiency = 8;
-
-/*
- * Network task synchronization
- */
-static rtems_id networkSemaphore;
-static rtems_id networkDaemonTid;
-static rtems_unsigned32 networkDaemonPriority;
-static void networkDaemon (void *task_argument);
-
-/*
- * Network timing
- */
-int			rtems_bsdnet_ticks_per_second;
-int			rtems_bsdnet_microseconds_per_tick;
-
-/*
- * Callout processing
- */
-static rtems_interval	ticksWhenCalloutsLastChecked;
-static struct callout *callfree, calltodo;
-
-/*
- * FreeBSD variables
- */
-int nfs_diskless_valid;
-
-/*
- * BOOTP values
- */
-struct in_addr rtems_bsdnet_log_host_address;
-struct in_addr rtems_bsdnet_bootp_server_address;
-char *rtems_bsdnet_bootp_boot_file_name;
-char *rtems_bsdnet_domain_name;
-struct in_addr rtems_bsdnet_nameserver[sizeof rtems_bsdnet_config.name_server /
-			sizeof rtems_bsdnet_config.name_server[0]];
-int rtems_bsdnet_nameserver_count;
-
-extern rtems_libio_handler_t rtems_bsdnet_io_handler;
-
-/*
- * Perform FreeBSD memory allocation.
- * FIXME: This should be modified to keep memory allocation statistics.
- */
-#undef malloc
-#undef free
-extern void *malloc (size_t);
-extern void free (void *);
-void *
-rtems_bsdnet_malloc (unsigned long size, int type, int flags)
-{
-	void *p;
-
-	for (;;) {
-		p = malloc (size);
-		if (p)
-			return p;
-		if (flags & M_NOWAIT)
-			return p;
-		/*
-		 * FIXME: This should be redone as:
-		 * static volatile int rtems_bsdnet_need_memory;
-		 *     
-		 *	rtems_bsdnet_need_memory = 1;
-		 *	message_queue_receive
-		 *
-		 * Then in rtems_bsdnet_freee:
-		 *	free (....);
-		 *	if (rtems_bsdnet_need_memory)
-		 *		rtems_bsdnet_need_memory = 0;
-		 *		message_queue_broadcast
-		 */
-		rtems_task_wake_after (rtems_bsdnet_ticks_per_second);
-	}
-}
-
-/*
- * Free FreeBSD memory
- * FIXME: This should be modified to keep memory allocation statistics.
- */
-void
-rtems_bsdnet_free (void *addr, int type)
-{
-	free (addr);
-}
-
-/*
- * Do the initializations required by the BSD code
- * FIXME: Maybe we should use a different memory allocation scheme that
- * would let us share space between mbufs and mbuf clusters.
- * For now, we'll just take the easy way out!
- */
-static void
-bsd_init ()
-{
-	/*
-	 * Set up mbuf data strutures
-	 * Cluster allocation *must* come first -- see comment on kmem_malloc().
-	 */
-	m_clalloc (nmbclusters, M_DONTWAIT);
-	mclrefcnt = malloc (nmbclusters);
-	if (mclrefcnt == NULL)
-		rtems_panic ("No memory for mbuf cluster reference counts.");
-	memset (mclrefcnt, '\0', nmbclusters);
-	m_mballoc (nmbuf, M_DONTWAIT);
-	mbstat.m_mtypes[MT_FREE] = nmbuf;
-
-
-	/*
-	 * Set up domains
-	 */
-	{
-	extern struct domain routedomain;
-	extern struct domain inetdomain;
-
-	routedomain.dom_next = domains;
-	domains = &routedomain;
-	inetdomain.dom_next = domains;
-	domains = &inetdomain;
-	domaininit (NULL);
-	}
-
-	/*
-	 * Set up interfaces
-	 */
-	ifinit (NULL);
-}
-
-/*
- * Initialize and start network operations
- */
-static void
-rtems_bsdnet_initialize (void)
-{
-	rtems_status_code sc;
-
-	/*
-	 * Set the priority of all network tasks
-	 */
-	if (rtems_bsdnet_config.network_task_priority == 0)
-		networkDaemonPriority = 100;
-	else
-		networkDaemonPriority = rtems_bsdnet_config.network_task_priority;
-
-	/*
-	 * Set the memory allocation limits
-	 */
-	if (rtems_bsdnet_config.mbuf_bytecount)
-		nmbuf = rtems_bsdnet_config.mbuf_bytecount / MSIZE;
-	if (rtems_bsdnet_config.mbuf_cluster_bytecount)
-		nmbclusters = rtems_bsdnet_config.mbuf_cluster_bytecount / MCLBYTES;
-
-	/*
-	 * Create the task-synchronization semaphore
-	 */
-	sc = rtems_semaphore_create (rtems_build_name('B', 'S', 'D', 'n'),
-					0,
-					RTEMS_FIFO |
-						RTEMS_BINARY_SEMAPHORE |
-						RTEMS_NO_INHERIT_PRIORITY |
-						RTEMS_NO_PRIORITY_CEILING |
-						RTEMS_LOCAL,
-					0,
-					&networkSemaphore);
-	if (sc != RTEMS_SUCCESSFUL)
-		rtems_panic ("Can't create network seamphore: `%s'\n", rtems_status_text (sc));
-
-	/*
-	 * Compute clock tick conversion factors
-	 */
-	rtems_clock_get (RTEMS_CLOCK_GET_TICKS_PER_SECOND, &rtems_bsdnet_ticks_per_second);
-	if (rtems_bsdnet_ticks_per_second <= 0)
-		rtems_bsdnet_ticks_per_second = 1;
-	rtems_bsdnet_microseconds_per_tick = 1000000 / rtems_bsdnet_ticks_per_second;
-
-	/*
-	 * Ensure that `seconds' is greater than 0
-	 */
-	rtems_task_wake_after (rtems_bsdnet_ticks_per_second);
-
-	/*
-	 * Set up BSD-style sockets
-	 */
-	bsd_init ();
-
-	/*
-	 * Start network daemon
-	 */
-	networkDaemonTid = rtems_bsdnet_newproc ("ntwk", 4096, networkDaemon, NULL);
-
-	/*
-	 * Register as an external I/O handler
-	 */
-	rtems_register_libio_handler (RTEMS_FILE_DESCRIPTOR_TYPE_SOCKET,
-						&rtems_bsdnet_io_handler);
-
-	/*
-	 * Let other network tasks begin
-	 */
-	rtems_bsdnet_semaphore_release ();
-}
-
-rtems_id TaskWithSemaphore;
-/*
- * Obtain network mutex
- */
-void
-rtems_bsdnet_semaphore_obtain (void)
-{
-	rtems_status_code sc;
-
-	sc = rtems_semaphore_obtain (networkSemaphore, RTEMS_WAIT, RTEMS_NO_TIMEOUT);
-rtems_task_ident (RTEMS_SELF, 0, &TaskWithSemaphore);
-	if (sc != RTEMS_SUCCESSFUL)
-		rtems_panic ("Can't obtain network semaphore: `%s'\n", rtems_status_text (sc));
-}
-
-/*
- * Release network mutex
- */
-void
-rtems_bsdnet_semaphore_release (void)
-{
-	rtems_status_code sc;
-
-TaskWithSemaphore = 0;
-	sc = rtems_semaphore_release (networkSemaphore);
-	if (sc != RTEMS_SUCCESSFUL)
-		rtems_panic ("Can't release network semaphore: `%s'\n", rtems_status_text (sc));
-										}
-
-/*
- * Wait for something to happen to a socket buffer
- */
-int
-sbwait(sb)
-	struct sockbuf *sb;
-{
-	rtems_event_set events;
-	rtems_id tid;
-	rtems_status_code sc;
-
-	/*
-	 * Soak up any pending events.
-	 * The sleep/wakeup synchronization in the FreeBSD
-	 * kernel has no memory.
-	 */
-	rtems_event_receive (SBWAIT_EVENT, RTEMS_EVENT_ANY | RTEMS_NO_WAIT, RTEMS_NO_TIMEOUT, &events); 
-
-	/*
-	 * Set this task as the target of the wakeup operation.
-	 */
-	if (sb->sb_sel.si_pid)
-		rtems_panic ("Another task is already sleeping on that socket buffer");
-	rtems_task_ident (RTEMS_SELF, 0, &tid);
-	sb->sb_sel.si_pid = tid;
-
-	/*
-	 * Mark the socket buffer as waiting.
-	 */
-	sb->sb_flags |= SB_WAIT;
-
-	/*
-	 * Release the network semaphore.
-	 */
-	rtems_bsdnet_semaphore_release ();
-
-	/*
-	 * Wait for the wakeup event.
-	 */
-	sc = rtems_event_receive (SBWAIT_EVENT, RTEMS_EVENT_ANY | RTEMS_WAIT, sb->sb_timeo, &events);
-
-	/*
-	 * Reobtain the network semaphore.
-	 */
-	rtems_bsdnet_semaphore_obtain ();
-
-	/*
-	 * Relinquish ownership of the socket buffer
-	 */
-	sb->sb_flags &= ~SB_WAIT;
-	sb->sb_sel.si_pid = 0;
-
-	/*
-	 * Return the status of the wait.
-	 */
-	switch (sc) {
-	case RTEMS_SUCCESSFUL:	return 0;
-	case RTEMS_TIMEOUT:	return EWOULDBLOCK;
-	default:		return ENXIO;
-	}
-}
-
-
-/*
- * Wake up the task waiting on a socket buffer.
- */
-void
-sowakeup(so, sb)
-	register struct socket *so;
-	register struct sockbuf *sb;
-{
-	if (sb->sb_flags & SB_WAIT) {
-		sb->sb_flags &= ~SB_WAIT;
-		rtems_event_send (sb->sb_sel.si_pid, SBWAIT_EVENT);
-	}
-}
-
-/*
- * For now, a socket can be used by only one task at a time.
- */
-int
-sb_lock(sb)
-	register struct sockbuf *sb;
-{
-	rtems_panic ("Socket buffer is already in use.");
-	return 0;
-}
-void
-wakeup (void *p)
-{
-	rtems_panic ("Wakeup called");
-}
-
-/*
- * Wait for a connection/disconnection event.
- */
-void
-soconnsleep (struct socket *so)
-{
-	rtems_event_set events;
-	rtems_id tid;
-
-	/*
-	 * Soak up any pending events.
-	 * The sleep/wakeup synchronization in the FreeBSD
-	 * kernel has no memory.
-	 */
-	rtems_event_receive (SOSLEEP_EVENT, RTEMS_EVENT_ANY | RTEMS_NO_WAIT, RTEMS_NO_TIMEOUT, &events); 
-
-	/*
-	 * Set this task as the target of the wakeup operation.
-	 */
-	if (so->so_pgid)
-		rtems_panic ("Another task is already sleeping on that socket");
-	rtems_task_ident (RTEMS_SELF, 0, &tid);
-	so->so_pgid = tid;
-
-	/*
-	 * Wait for the wakeup event.
-	 */
-	rtems_bsdnet_event_receive (SOSLEEP_EVENT, RTEMS_EVENT_ANY | RTEMS_WAIT, RTEMS_NO_TIMEOUT, &events);
-
-	/*
-	 * Relinquish ownership of the socket.
-	 */
-	so->so_pgid = 0;
-}
-
-/*
- * Wake up a task waiting for a connection/disconnection to complete.
- */
-void
-soconnwakeup (struct socket *so)
-{
-	if (so->so_pgid)
-		rtems_event_send (so->so_pgid, SOSLEEP_EVENT);
-}
-
-/*
- * Send an event to the network daemon.
- * This corresponds to sending a software interrupt in the BSD kernel.
- */
-void
-rtems_bsdnet_schednetisr (int n)
-{
-	rtems_event_send (networkDaemonTid, 1 << n);
-}
-
-/*
- * The network daemon
- * This provides a context to run BSD software interrupts
- */
-static void
-networkDaemon (void *task_argument)
-{
-	rtems_event_set events;
-	rtems_interval now;
-	int ticksPassed;
-	unsigned32 timeout;
-	struct callout *c;
-
-	for (;;) {
-		c = calltodo.c_next;
-		if (c)
-			timeout = c->c_time;
-		else
-			timeout = RTEMS_NO_TIMEOUT;
-		rtems_bsdnet_event_receive (NETISR_EVENTS,
-						RTEMS_EVENT_ANY | RTEMS_WAIT,
-						timeout,
-						&events);
-		if (events & NETISR_IP_EVENT)
-			ipintr ();
-		if (events & NETISR_ARP_EVENT)
-			arpintr ();
-		rtems_clock_get (RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &now);
-		ticksPassed = now - ticksWhenCalloutsLastChecked;
-		if (ticksPassed != 0) {
-			ticksWhenCalloutsLastChecked = now;
-			
-			c = calltodo.c_next;
-			if (c) {
-				c->c_time -= ticksPassed;
-				while ((c = calltodo.c_next) != NULL && c->c_time <= 0) {
-					void *arg;
-					void (*func) (void *);
-
-					func = c->c_func;
-					arg = c->c_arg;
-					calltodo.c_next = c->c_next;
-					c->c_next = callfree;
-					callfree = c;
-					(*func)(arg);
-				}
-			}
-		}
-	}
-}
-
-/*
- * Structure passed to task-start stub
- */
-struct newtask {
-	void (*entry)(void *);
-	void *arg;
-};
-
-/*
- * Task-start stub
- */
-static void
-taskEntry (rtems_task_argument arg)
-{
-	struct newtask t;
-	
-	/*
-	 * Pick up task information and free
-	 * the memory allocated to pass the
-	 * information to this task.
-	 */
-	t = *(struct newtask *)arg;
-	free ((struct newtask *)arg);
-
-	/*
-	 * Enter the competition for the network semaphore
-	 */
-	rtems_bsdnet_semaphore_obtain ();
-
-	/*
-	 * Enter the task
-	 */
-	(*t.entry)(t.arg);
-	rtems_panic ("Network task returned!\n");
-}
-
-/*
- * Start a network task
- */
-rtems_id
-rtems_bsdnet_newproc (char *name, int stacksize, void(*entry)(void *), void *arg)
-{
-	struct newtask *t;
-	char nm[4];
-	rtems_id tid;
-	rtems_status_code sc;
-
-	strncpy (nm, name, 4);
-	sc = rtems_task_create (rtems_build_name(nm[0], nm[1], nm[2], nm[3]),
-		networkDaemonPriority,
-		stacksize,
-		RTEMS_PREEMPT|RTEMS_NO_TIMESLICE|RTEMS_NO_ASR|RTEMS_INTERRUPT_LEVEL(0),
-		RTEMS_NO_FLOATING_POINT|RTEMS_LOCAL,
-		&tid);
-	if (sc != RTEMS_SUCCESSFUL)
-		rtems_panic ("Can't create network daemon `%s': `%s'\n", name, rtems_status_text (sc));
-
-	/*
-	 * Set up task arguments
-	 */
-	t = malloc (sizeof *t);
-	t->entry = entry;
-	t->arg = arg;
-
-	/*
-	 * Start the task
-	 */
-	sc = rtems_task_start (tid, taskEntry, (rtems_task_argument)t);
-	if (sc != RTEMS_SUCCESSFUL)
-		rtems_panic ("Can't start network daemon `%s': `%s'\n", name, rtems_status_text (sc));
-
-	/*
-	 * Let our caller know the i.d. of the new task
-	 */
-	return tid;
-}
-
-rtems_status_code rtems_bsdnet_event_receive (
-  rtems_event_set  event_in,
-  rtems_option     option_set,
-  rtems_interval   ticks,
-  rtems_event_set *event_out)
-{
-	rtems_status_code sc;
-
-	rtems_bsdnet_semaphore_release ();
-	sc = rtems_event_receive (event_in, option_set, ticks, event_out);
-	rtems_bsdnet_semaphore_obtain ();
-	return sc;
-}
-
-/*
- * Return time since startup
- */
-void
-microtime (struct timeval *t)
-{
-	rtems_interval now;
-
-	rtems_clock_get (RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &now);
-	t->tv_sec = now / rtems_bsdnet_ticks_per_second;
-	t->tv_usec = (now % rtems_bsdnet_ticks_per_second) * rtems_bsdnet_microseconds_per_tick;
-}
-
-unsigned long
-rtems_bsdnet_seconds_since_boot (void)
-{
-	rtems_interval now;
-
-	rtems_clock_get (RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &now);
-	return now / rtems_bsdnet_ticks_per_second;
-}
-
-/*
- * Fake random number generator
- */
-unsigned long
-rtems_bsdnet_random (void)
-{
-	rtems_interval now;
-
-	rtems_clock_get (RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &now);
-	return (now * 99991);
-}
-
-/*
- * Callout list processing
- */
-void
-timeout(void (*ftn)(void *), void *arg, int ticks)
-{
-	register struct callout *new, *p, *t;
-
-	if (ticks <= 0)
-		ticks = 1;
-
-	/* Fill in the next free callout structure. */
-	if (callfree == NULL) {
-		callfree = malloc (sizeof *callfree);
-		if (callfree == NULL)
-			rtems_panic ("No memory for timeout table entry");
-		callfree->c_next = NULL;
-	}
-
-	new = callfree;
-	callfree = new->c_next;
-	new->c_arg = arg;
-	new->c_func = ftn;
-
-	/*
-	 * The time for each event is stored as a difference from the time
-	 * of the previous event on the queue.  Walk the queue, correcting
-	 * the ticks argument for queue entries passed.  Correct the ticks
-	 * value for the queue entry immediately after the insertion point
-	 * as well.  Watch out for negative c_time values; these represent
-	 * overdue events.
-	 */
-	for (p = &calltodo;
-	    (t = p->c_next) != NULL && ticks > t->c_time; p = t)
-		if (t->c_time > 0)
-			ticks -= t->c_time;
-	new->c_time = ticks;
-	if (t != NULL)
-		t->c_time -= ticks;
-
-	/* Insert the new entry into the queue. */
-	p->c_next = new;
-	new->c_next = t;
-}
-
-/*
- * Ticks till specified time
- * FIXME: This version worries only about seconds, but that's good
- * enough for the way the network code uses this routine.
- */
-int
-hzto(struct timeval *tv)
-{
-	long diff = tv->tv_sec - rtems_bsdnet_seconds_since_boot();
-
-	if (diff <= 0)
-		return 1;
-	return diff * rtems_bsdnet_ticks_per_second;
-}
-
-/*
- * Kernel debugging
- */
-int rtems_bsdnet_log_priority;
-void
-rtems_bsdnet_log (int priority, const char *fmt, ...)
-{
-	va_list args;
-	
-	if (priority & rtems_bsdnet_log_priority) {
-		va_start (args, fmt);
-		vprintf (fmt, args);
-		va_end (args);
-	}
-}
-
-/*
- * Hack alert: kmem_malloc `knows' that its
- * first invocation is to get mbuf clusters!
- */
-int mb_map_full;
-vm_map_t mb_map;
-vm_offset_t
-kmem_malloc (vm_map_t *map, vm_size_t size, boolean_t waitflag)
-{
-	void *p;
-	
-	/*
-	 * Can't get memory if we're already running.
-	 */
-	if (networkDaemonTid) {
-		if (waitflag == M_WAITOK)
-			rtems_panic (
-"Network mbuf space can not be enlarged after rtems_bsdnet_initialize() has\n"
-"returned.  Enlarge the initial mbuf/cluster size in rtems_bsdnet_config.");
-		return 0;
-	}
-
-#define ROUNDSIZE 2048
-	p = malloc (size+ROUNDSIZE);
-	p = (void *)((unsigned long)p & ~(ROUNDSIZE-1));
-	if ((p == NULL) && (waitflag == M_WAITOK))
-		rtems_panic ("Can't get initial network memory!");
-	if (mbutl == NULL)
-		mbutl = p;
-	return (vm_offset_t)p;
-}
-
-/*
- * IP header checksum routine for processors which don't have an inline version
- */
-u_int
-in_cksum_hdr (const void *ip)
-{
-	rtems_unsigned32 sum;
-	const rtems_unsigned16 *sp;
-	int i;
-
-	sum = 0;
-	sp = (rtems_unsigned16 *)ip;
-	for (i = 0 ; i < 10 ; i++)
-		sum += *sp++;
-	while (sum > 0xFFFF)
-		sum = (sum & 0xffff) + (sum >> 16);
-	return ~sum & 0xFFFF;
-}
-
-/*
- * Manipulate routing tables
- */
-int rtems_bsdnet_rtrequest (
-    int req,
-    struct sockaddr *dst,
-    struct sockaddr *gateway,
-    struct sockaddr *netmask,
-    int flags,
-    struct rtentry **net_nrt)
-{
-	int error;
-
-	rtems_bsdnet_semaphore_obtain ();
-	error = rtrequest (req, dst, gateway, netmask, flags, net_nrt);
-	rtems_bsdnet_semaphore_release ();
-	if (error) {
-		errno = error;
-		return -1;
-	}
-	return 0;
-}
-
-static void
-rtems_bsdnet_setup (void)
-{
-	struct rtems_bsdnet_ifconfig *ifp;
-	int s;
-	struct ifreq ifreq;
-	struct sockaddr_in address;
-	struct sockaddr_in netmask;
-	struct sockaddr_in broadcast;
-	struct sockaddr_in gateway;
-	int i;
-
-	/*
-	 * Set local parameters
-	 */
-	if (rtems_bsdnet_config.hostname)
-		sethostname (rtems_bsdnet_config.hostname,
-					strlen (rtems_bsdnet_config.hostname));
-	if (rtems_bsdnet_config.domainname)
-		rtems_bsdnet_domain_name =
-					strdup (rtems_bsdnet_config.domainname);
-	if (rtems_bsdnet_config.log_host)
-		rtems_bsdnet_log_host_address.s_addr =
-				inet_addr (rtems_bsdnet_config.log_host);
-	for (i = 0 ; i < sizeof rtems_bsdnet_config.name_server /
-			sizeof rtems_bsdnet_config.name_server[0] ; i++) {
-		if (!rtems_bsdnet_config.name_server[i])
-			break;
-		rtems_bsdnet_nameserver[rtems_bsdnet_nameserver_count++].s_addr
-			= inet_addr (rtems_bsdnet_config.name_server[i]);
-	}
-
-	/*
-	 * Configure interfaces
-	 */
-	s = socket (AF_INET, SOCK_DGRAM, 0);
-	if (s < 0)
-		rtems_panic ("Can't create initial socket: %s", strerror (errno));
-	for (ifp = rtems_bsdnet_config.ifconfig ; ifp ; ifp = ifp->next) {
-		if (ifp->ip_address == NULL)
-			continue;
-
-		/*
-		 * Get the interface flags
-		 */
-		strcpy (ifreq.ifr_name, ifp->name);
-		if (ioctl (s, SIOCGIFFLAGS, &ifreq) < 0)
-			rtems_panic ("Can't get %s flags: %s", ifp->name, strerror (errno));
-
-		/*
-		 * Bring interface up
-		 */
-		ifreq.ifr_flags |= IFF_UP;
-		if (ioctl (s, SIOCSIFFLAGS, &ifreq) < 0)
-			rtems_panic ("Can't bring %s up: %s", ifp->name, strerror (errno));
-
-		/*
-		 * Set interface netmask
-		 */
-		memset (&netmask, '\0', sizeof netmask);
-		netmask.sin_len = sizeof netmask;
-		netmask.sin_family = AF_INET;
-		netmask.sin_addr.s_addr = inet_addr (ifp->ip_netmask);
-		memcpy (&ifreq.ifr_addr, &netmask, sizeof netmask);
-		if (ioctl (s, SIOCSIFNETMASK, &ifreq) < 0)
-			rtems_panic ("Can't set %s netmask: %s", ifp->name, strerror (errno));
-
-		/*
-		 * Set interface address
-		 */
-		memset (&address, '\0', sizeof address);
-		address.sin_len = sizeof address;
-		address.sin_family = AF_INET;
-		address.sin_addr.s_addr = inet_addr (ifp->ip_address);
-		memcpy (&ifreq.ifr_addr, &address, sizeof address);
-		if (ioctl (s, SIOCSIFADDR, &ifreq) < 0)
-			rtems_panic ("Can't set %s address: %s", ifp->name, strerror (errno));
-
-		/*
-		 * Set interface broadcast address
-		 */
-		memset (&broadcast, '\0', sizeof broadcast);
-		broadcast.sin_len = sizeof broadcast;
-		broadcast.sin_family = AF_INET;
-		broadcast.sin_addr.s_addr = address.sin_addr.s_addr | ~netmask.sin_addr.s_addr;
-		memcpy (&ifreq.ifr_broadaddr, &broadcast, sizeof broadcast);
-		if (ioctl (s, SIOCSIFBRDADDR, &ifreq) < 0)
-			rtems_panic ("Can't set %s broadcast address: %s", ifp->name, strerror (errno));
-	}
-
-	/*
-	 * We're done with the dummy socket
-	 */
-	close (s);
-
-	/*
-	 * Set default route
-	 */
-	if (rtems_bsdnet_config.gateway) {
-		address.sin_addr.s_addr = INADDR_ANY;
-		netmask.sin_addr.s_addr = INADDR_ANY;
-		memset (&gateway, '\0', sizeof gateway);
-		gateway.sin_len = sizeof gateway;
-		gateway.sin_family = AF_INET;
-		gateway.sin_addr.s_addr = inet_addr (rtems_bsdnet_config.gateway);
-		if (rtems_bsdnet_rtrequest (
-				RTM_ADD, 
-				(struct sockaddr *)&address,
-				(struct sockaddr *)&gateway,
-				(struct sockaddr *)&netmask,
-				(RTF_UP | RTF_GATEWAY | RTF_STATIC), NULL) < 0)
-			rtems_panic ("Can't set default route: %s", strerror (errno));
-	}
-}
-
-/*
- * Initialize the network
- */
-int
-rtems_bsdnet_initialize_network (void)
-{
-	struct rtems_bsdnet_ifconfig *ifp;
-
-	/*
-	 * Start network tasks.
-	 * Initialize BSD network data structures.
-	 */
-	rtems_bsdnet_initialize ();
-
-	/*
-	 * Attach interfaces
-	 */
-	for (ifp = rtems_bsdnet_config.ifconfig ; ifp ; ifp = ifp->next) {
-		rtems_bsdnet_semaphore_obtain ();
-		(ifp->attach)(ifp);
-		rtems_bsdnet_semaphore_release ();
-	}
-
-	/*
-	 * Bring up the network
-	 */
-	rtems_bsdnet_setup ();
-	if (rtems_bsdnet_config.bootp)
-		(*rtems_bsdnet_config.bootp)();
-	return 0;
-}
diff --git a/c/src/libnetworking/rtems/rtems_showicmpstat.c b/c/src/libnetworking/rtems/rtems_showicmpstat.c
deleted file mode 100644
index 1faea2512b..0000000000
--- a/c/src/libnetworking/rtems/rtems_showicmpstat.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- *  $Id$
- */
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/sysctl.h>
-#include <sys/proc.h>
-#include <sys/mbuf.h>
-#include <netinet/in_systm.h>
-#include <netinet/in.h>
-#include <netinet/ip.h>
-#include <netinet/ip_icmp.h>
-#include <netinet/icmp_var.h>
-
-/*
- * Display ICMP statistics
- * Don't lock the rest of the network tasks out while printing.
- * It's no big deal if the values change while being printed.
- */
-static void
-showicmpstat (const char *name, unsigned long n)
-{
-	if (n)
-		printf ("%35s%12lu\n", name, n);
-}
-
-void
-rtems_bsdnet_show_icmp_stats (void)
-{
-	int i;
-	char cbuf[20];
-
-	printf ("************ ICMP Statistics ************\n");
-	showicmpstat ("Calls to icmp_error()", icmpstat.icps_error);
-	showicmpstat ("Errors not sent -- old was icmp", icmpstat.icps_oldicmp);
-	for (i = 0 ; i <= ICMP_MAXTYPE ; i++) {
-		if (icmpstat.icps_outhist[i]) {
-			sprintf (cbuf, "Type %d sent", i);
-			showicmpstat (cbuf, icmpstat.icps_outhist[i]);
-		}
-	}
-	showicmpstat ("icmp_code out of range", icmpstat.icps_badcode);
-	showicmpstat ("packet < ICMP_MINLEN", icmpstat.icps_tooshort);
-	showicmpstat ("bad checksum", icmpstat.icps_checksum);
-	showicmpstat ("calculated bound mismatch", icmpstat.icps_badlen);
-	showicmpstat ("number of responses", icmpstat.icps_reflect);
-	showicmpstat ("b/mcast echo requests dropped", icmpstat.icps_bmcastecho);
-	showicmpstat ("b/mcast tstamp requests dropped", icmpstat.icps_bmcasttstamp);
-	for (i = 0 ; i <= ICMP_MAXTYPE ; i++) {
-		if (icmpstat.icps_inhist[i]) {
-			sprintf (cbuf, "Type %d received", i);
-			showicmpstat (cbuf, icmpstat.icps_inhist[i]);
-		}
-	}
-
-	printf ("\n");
-}
diff --git a/c/src/libnetworking/rtems/rtems_showifstat.c b/c/src/libnetworking/rtems/rtems_showifstat.c
deleted file mode 100644
index 9f9efc5ac2..0000000000
--- a/c/src/libnetworking/rtems/rtems_showifstat.c
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- *  $Id$
- */
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/sysctl.h>
-#include <sys/proc.h>
-#include <sys/socket.h>
-#include <sys/ioctl.h>
-#include <net/if.h>
-#include <netinet/in.h>
-
-/*
- * Display an address
- */
-static int
-showaddress (char *name, struct sockaddr *a)
-{
-	struct sockaddr_in *sa;
-
-	if (!a || (a->sa_family != AF_INET))
-		return 0;
-	printf ("%s:", name);
-	sa = (struct sockaddr_in *)a;
-	printf ("%-16s", inet_ntoa (sa->sin_addr));
-	return 1;
-}
-
-/*
- * Display interface statistics
- */
-void
-rtems_bsdnet_show_if_stats (void)
-{
-	struct ifnet *ifp;
-	struct ifaddr *ifa;
-	unsigned int bit, flags;
-	int printed;
-
-	printf ("************ INTERFACE STATISTICS ************\n");
-	for (ifp = ifnet; ifp; ifp = ifp->if_next) {
-		printf ("***** %s%d *****\n", ifp->if_name, ifp->if_unit);
-		for (ifa = ifp->if_addrlist ; ifa ; ifa = ifa->ifa_next) {
-			printed = showaddress ("Address", ifa->ifa_addr);
-			if (ifp->if_flags & IFF_BROADCAST)
-				printed |= showaddress ("Broadcast Address", ifa->ifa_broadaddr);
-			if (ifp->if_flags & IFF_POINTOPOINT)
-				printed |= showaddress ("Destination Address", ifa->ifa_dstaddr);
-			printed |= showaddress ("Net mask", ifa->ifa_netmask);
-			if (printed)
-				printf ("\n");
-		}
-
-		printf ("Flags:");
-		for (bit = 1, flags = ifp->if_flags ; flags ; bit <<= 1) {
-			char *cp;
-			switch (flags & bit) {
-			default:		cp = NULL;		break;
-			case IFF_UP:		cp = "Up";		break;
-			case IFF_BROADCAST:	cp = "Broadcast";	break;
-			case IFF_DEBUG:		cp = "Debug";		break;
-			case IFF_LOOPBACK:	cp = "Loopback";	break;
-			case IFF_POINTOPOINT:	cp = "Point-to-point";	break;
-			case IFF_RUNNING:	cp = "Running";		break;
-			case IFF_NOARP:		cp = "No-ARP";		break;
-			case IFF_PROMISC:	cp = "Promiscuous";	break;
-			case IFF_ALLMULTI:	cp = "All-multicast";	break;
-			case IFF_OACTIVE:	cp = "Active";		break;
-			case IFF_SIMPLEX:	cp = "Simplex";		break;
-			case IFF_LINK0:		cp = "Link0";		break;
-			case IFF_LINK1:		cp = "Link1";		break;
-			case IFF_LINK2:		cp = "Link2";		break;
-			case IFF_MULTICAST:	cp = "Multicast";	break;
-			}
-			if (cp) {
-				flags &= ~bit;
-				printf (" %s", cp);
-			}
-		}
-		printf ("\n");
-
-		printf ("Send queue limit:%-4d length:%-4d Dropped:%-8d\n",
-							ifp->if_snd.ifq_maxlen,
-							ifp->if_snd.ifq_len,
-							ifp->if_snd.ifq_drops);
-
-		/*
-		 * FIXME: Could print if_data statistics here,
-		 *        but right now the drivers maintain their
-		 *        own statistics.
-		 */
-
-		/*
-		 * Grab the network semaphore.
-		 * In most cases this is not necessary, but it's
-		 * easier to always call the driver ioctl function
-		 * while holding the semaphore than to try
-		 * and explain why some ioctl commands are invoked
-		 * while holding the semaphore and others are
-		 * invoked while not holding the semaphore.
-		 */
-		rtems_bsdnet_semaphore_obtain ();
-		(*ifp->if_ioctl)(ifp, SIO_RTEMS_SHOW_STATS, NULL);
-		rtems_bsdnet_semaphore_release ();
-	}
-	printf ("\n");
-}
diff --git a/c/src/libnetworking/rtems/rtems_showipstat.c b/c/src/libnetworking/rtems/rtems_showipstat.c
deleted file mode 100644
index 2dd499a8c0..0000000000
--- a/c/src/libnetworking/rtems/rtems_showipstat.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- *  $Id$
- */
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/sysctl.h>
-#include <sys/proc.h>
-#include <sys/mbuf.h>
-#include <netinet/in_systm.h>
-#include <netinet/in.h>
-#include <netinet/ip.h>
-#include <netinet/ip_var.h>
-
-/*
- * Display IP statistics
- * Don't lock the rest of the network tasks out while printing.
- * It's no big deal if the values change while being printed.
- */
-static void
-showipstat (const char *name, unsigned long n)
-{
-	if (n)
-		printf ("%35s%12lu\n", name, n);
-}
-
-void
-rtems_bsdnet_show_ip_stats (void)
-{
-	printf ("************ IP Statistics ************\n");
-	showipstat ("total packets received", ipstat.ips_total);
-	showipstat ("checksum bad", ipstat.ips_badsum);
-	showipstat ("packet too short", ipstat.ips_tooshort);
-	showipstat ("not enough data", ipstat.ips_toosmall);
-	showipstat ("ip header length < data size", ipstat.ips_badhlen);
-	showipstat ("ip length < ip header length", ipstat.ips_badlen);
-	showipstat ("fragments received", ipstat.ips_fragments);
-	showipstat ("frags dropped (dups, out of space)", ipstat.ips_fragdropped);
-	showipstat ("fragments timed out", ipstat.ips_fragtimeout);
-	showipstat ("packets forwarded", ipstat.ips_forward);
-	showipstat ("packets rcvd for unreachable dest", ipstat.ips_cantforward);
-	showipstat ("packets forwarded on same net", ipstat.ips_redirectsent);
-	showipstat ("unknown or unsupported protocol", ipstat.ips_noproto);
-	showipstat ("datagrams delivered to upper level", ipstat.ips_delivered);
-	showipstat ("total ip packets generated here", ipstat.ips_localout);
-	showipstat ("lost packets due to nobufs, etc.", ipstat.ips_odropped);
-	showipstat ("total packets reassembled ok", ipstat.ips_reassembled);
-	showipstat ("datagrams successfully fragmented", ipstat.ips_fragmented);
-	showipstat ("output fragments created", ipstat.ips_ofragments);
-	showipstat ("don't fragment flag was set, etc.", ipstat.ips_cantfrag);
-	showipstat ("error in option processing", ipstat.ips_badoptions);
-	showipstat ("packets discarded due to no route", ipstat.ips_noroute);
-	showipstat ("ip version != 4", ipstat.ips_badvers);
-	showipstat ("total raw ip packets generated", ipstat.ips_rawout);
-	showipstat ("ip length > max ip packet size", ipstat.ips_toolong);
-	printf ("\n");
-}
diff --git a/c/src/libnetworking/rtems/rtems_showmbuf.c b/c/src/libnetworking/rtems/rtems_showmbuf.c
deleted file mode 100644
index 39523bd00a..0000000000
--- a/c/src/libnetworking/rtems/rtems_showmbuf.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- *  $Id$
- */
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/sysctl.h>
-#include <sys/proc.h>
-#include <sys/mbuf.h>
-
-/*
- * Display MBUF statistics
- * Don't lock the rest of the network tasks out while printing.
- * It's no big deal if the values change while being printed.
- */
-void
-rtems_bsdnet_show_mbuf_stats (void)
-{
-	int i;
-	int printed = 0;
-	char *cp;
-
-	printf ("************ MBUF STATISTICS ************\n");
-	printf ("mbufs:%4lu    clusters:%4lu    free:%4lu\n",
-			mbstat.m_mbufs, mbstat.m_clusters, mbstat.m_clfree);
-	printf ("drops:%4lu       waits:%4lu  drains:%4lu\n",
-			mbstat.m_drops, mbstat.m_wait, mbstat.m_drain);
-	for (i = 0 ; i < 20 ; i++) {
-		switch (i) {
-		case MT_FREE:		cp = "free";		break;
-		case MT_DATA:		cp = "data";		break;
-		case MT_HEADER:		cp = "header";		break;
-		case MT_SOCKET:		cp = "socket";		break;
-		case MT_PCB:		cp = "pcb";		break;
-		case MT_RTABLE:		cp = "rtable";		break;
-		case MT_HTABLE:		cp = "htable";		break;
-		case MT_ATABLE:		cp = "atable";		break;
-		case MT_SONAME:		cp = "soname";		break;
-		case MT_SOOPTS:		cp = "soopts";		break;
-		case MT_FTABLE:		cp = "ftable";		break;
-		case MT_RIGHTS:		cp = "rights";		break;
-		case MT_IFADDR:		cp = "ifaddr";		break;
-		case MT_CONTROL:	cp = "control";		break;
-		case MT_OOBDATA:	cp = "oobdata";		break;
-		default:		cp = NULL;		break;
-		}
-		if ((cp != NULL) || (mbstat.m_mtypes[i] != 0)) {
-			char cbuf[16];
-			if (cp == NULL) {
-				sprintf (cbuf, "Type %d", i);
-				cp = cbuf;
-			}
-			printf ("%10s:%-8u", cp, mbstat.m_mtypes[i]);
-			if (++printed == 4) {
-				printf ("\n");
-				printed = 0;
-			}
-		}
-	}
-	if (printed)
-		printf ("\n");
-	printf ("\n");
-}
diff --git a/c/src/libnetworking/rtems/rtems_showroute.c b/c/src/libnetworking/rtems/rtems_showroute.c
deleted file mode 100644
index b8196de8d3..0000000000
--- a/c/src/libnetworking/rtems/rtems_showroute.c
+++ /dev/null
@@ -1,237 +0,0 @@
-/*
- *  $Id$
- */
-
-#include <stdlib.h>
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/sysctl.h>
-#include <sys/proc.h>
-#include <sys/mbuf.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/domain.h>
-
-#include <net/if.h>
-#include <net/if_dl.h>
-#include <net/route.h>
-
-#include <netinet/in.h>
-
-#include <arpa/inet.h>
-
-/*
- * We'll use the application versions of malloc and free.
- */
-#undef malloc
-#undef free
-
-/*
- * Information per route
- */
-struct rinfo {
-	struct sockaddr	dst;
-	union {
-		struct sockaddr		sa;
-		struct sockaddr_in	sin;
-		struct sockaddr_dl	sdl;
-	} un;
-	unsigned long	pksent;
-	unsigned long	expire;
-	int		flags;
-	char		ifname[16];
-	short		ifunit;
-	short		refcnt;
-};
-
-/*
- * Information per display
- */
-struct dinfo {
-	int		capacity;
-	int		count;
-	struct rinfo	*routes;
-};
-
-/*
- * Copy address
- */
-static void
-copyAddress (void *to, void *from, int tolen)
-{
-	int ncopy;
-	struct sockaddr dummy;
-
-	if (from == NULL) {
-		/*
-		 * Create a fake address of unspecified type
-		 */
-		from = &dummy;
-		dummy.sa_len = 4;
-		dummy.sa_family = AF_UNSPEC;
-	}
-	ncopy = ((struct sockaddr *)from)->sa_len;
-	if (ncopy > tolen)
-		ncopy = tolen;
-	memcpy (to, from, ncopy);
-}
-
-/*
- * Package everything up before printing it.
- * We don't want to block all network operations till
- * the printing completes!
- */
-static int
-show_inet_route (rn, vw)
-	struct radix_node *rn;
-	void *vw;
-{
-	struct rtentry *rt = (struct rtentry *)rn;
-	struct ifnet *ifp;
-	struct dinfo *dp = (struct dinfo *)vw;
-	struct rinfo *r;
-
-	/*
-	 * Get a pointer to a new route info structure
-	 */
-	if (dp->count >= dp->capacity) {
-		r = realloc (dp->routes, (sizeof *r) * (dp->capacity + 20));
-		if (r == 0)
-			return ENOMEM;
-		dp->capacity += 20;
-		dp->routes = r;
-	}
-	r = dp->routes + dp->count++;
-
-	/*
-	 * Fill in the route info structure
-	 */
-	copyAddress (&r->dst, rt_key(rt), sizeof r->dst);
-	if (rt->rt_flags & (RTF_GATEWAY | RTF_HOST)) {
-		copyAddress (&r->un, rt->rt_gateway, sizeof r->un);
-	}
-	else {
-		/*
-		 * Create a fake address to hold the mask
-		 */
-		struct sockaddr_in dummy;
-
-		dummy.sin_family = AF_INET;
-		dummy.sin_len = sizeof dummy;
-		dummy.sin_addr = ((struct sockaddr_in *)rt_mask(rt))->sin_addr;
-		copyAddress (&r->un, &dummy, sizeof r->un);
-	}
-	r->flags = rt->rt_flags;
-	r->refcnt = rt->rt_refcnt;
-	r->pksent = rt->rt_rmx.rmx_pksent;
-	r->expire = rt->rt_rmx.rmx_expire;
-	ifp = rt->rt_ifp;
-	strncpy (r->ifname, ifp->if_name, sizeof r->ifname);
-	r->ifunit = ifp->if_unit;
-	return 0;
-}
-
-/*
- * Convert link address to ASCII
- */
-static char *
-link_ascii (struct sockaddr_dl *sdl, char *buf, int bufsize)
-{
-	char *cp;
-	int i;
-	int first = 1;
-	int nleft = sdl->sdl_alen;
-	unsigned char *ap = LLADDR (sdl);
-	static const char hextab[16] = "0123456789ABCDEF";
-
-	cp = buf;
-	while (nleft && (bufsize > 4)) {
-		if (first) {
-			first = 0;
-		}
-		else {
-			*cp++ = ':';
-			bufsize--;
-		}
-		i = *ap++;
-		*cp++ = hextab[(i >> 4) & 0xf];
-		*cp++ = hextab[i & 0xf];
-		nleft--;
-		bufsize -= 2;
-	}
-	*cp = '\0';
-	return buf;
-}
-		
-void
-rtems_bsdnet_show_inet_routes (void)
-{
-	struct radix_node_head *rnh;
-	struct dinfo d;
-	struct rinfo *r;
-	int i, error;
-
-	/*
-	 * For now we'll handle only AF_INET
-	 */
-	rnh = rt_tables[AF_INET];
-	if (!rnh)
-		return;
-	d.count = d.capacity = 0;
-	d.routes = NULL;
-	rtems_bsdnet_semaphore_obtain ();
-	error = rnh->rnh_walktree(rnh, show_inet_route, &d);
-	rtems_bsdnet_semaphore_release ();
-	if (error) {
-		printf ("Can't get route info: %s\n", strerror (error));
-		return;
-	}
-	if (d.count == 0) {
-		printf ("No routes!\n");
-		return;
-	}
-	printf ("Destination     Gateway/Mask/Hw    Flags     Refs     Use Expire Interface\n");
-	for (i = 0, r = d.routes ; i < d.count ; i++, r++) {
-		char buf[30];
-		char *cp, *fc, flagbuf[10];
-		const char *addr;
-		unsigned long flagbit;
-		struct sockaddr_in *sin;
-
-		sin = (struct sockaddr_in *)&r->dst;
-		if (sin->sin_addr.s_addr == INADDR_ANY)
-			addr = "default";
-		else
-			addr = inet_ntop (AF_INET, &sin->sin_addr, buf, sizeof buf);
-		printf ("%-16s", addr);
-		switch (r->un.sa.sa_family) {
-		case AF_INET:
-			addr = inet_ntop (AF_INET, &r->un.sin.sin_addr, buf, sizeof buf);
-			break;
-
-		case AF_LINK:
-			addr = link_ascii (&r->un.sdl, buf, sizeof buf);
-			break;
-
-		default:
-			addr = "";
-			break;
-		}
-		printf ("%-19s", addr);
-		fc = "UGHRDM   XLS";
-		for (flagbit = 0x1, cp = flagbuf ; *fc ; flagbit <<= 1, fc++) {
-			if ((r->flags & flagbit) && (*fc != ' '))
-				*cp++ = *fc;
-		}
-		*cp = '\0';
-		printf ("%-10s%3d%9ld%7ld %.*s%d\n", flagbuf,
-					r->refcnt, r->pksent,
-					r->expire,
-					(int)sizeof r->ifname, r->ifname,
-					r->ifunit);
-	}
-	free (d.routes);
-}
diff --git a/c/src/libnetworking/rtems/rtems_showtcpstat.c b/c/src/libnetworking/rtems/rtems_showtcpstat.c
deleted file mode 100644
index b9a0366819..0000000000
--- a/c/src/libnetworking/rtems/rtems_showtcpstat.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- *  $Id$
- */
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/sysctl.h>
-#include <sys/proc.h>
-#include <sys/mbuf.h>
-#include <sys/socket.h>
-#include <net/if.h>
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/ip_var.h>
-#include <netinet/tcp.h>
-#include <netinet/tcp_timer.h>
-#include <netinet/tcp_seq.h>
-#include <netinet/tcp_var.h>
-
-/*
- * Display TCP statistics
- * Don't lock the rest of the network tasks out while printing.
- * It's no big deal if the values change while being printed.
- */
-static void
-showtcpstat (const char *name, unsigned long n)
-{
-	if (n)
-		printf ("%35s%12lu\n", name, n);
-}
-
-void
-rtems_bsdnet_show_tcp_stats (void)
-{
-	printf ("************ TCP Statistics ************\n");
-	showtcpstat ("connections initiated", tcpstat.tcps_connattempt);
-	showtcpstat ("connections accepted", tcpstat.tcps_accepts);
-	showtcpstat ("connections established", tcpstat.tcps_connects);
-	showtcpstat ("connections dropped", tcpstat.tcps_drops);
-	showtcpstat ("embryonic connections dropped", tcpstat.tcps_conndrops);
-	showtcpstat ("conn. closed (includes drops)", tcpstat.tcps_closed);
-	showtcpstat ("segs where we tried to get rtt", tcpstat.tcps_segstimed);
-	showtcpstat ("times we succeeded", tcpstat.tcps_rttupdated);
-	showtcpstat ("delayed acks sent", tcpstat.tcps_delack);
-	showtcpstat ("conn. dropped in rxmt timeout", tcpstat.tcps_timeoutdrop);
-	showtcpstat ("retransmit timeouts", tcpstat.tcps_rexmttimeo);
-	showtcpstat ("persist timeouts", tcpstat.tcps_persisttimeo);
-	showtcpstat ("keepalive timeouts", tcpstat.tcps_keeptimeo);
-	showtcpstat ("keepalive probes sent", tcpstat.tcps_keepprobe);
-	showtcpstat ("connections dropped in keepalive", tcpstat.tcps_keepdrops);
-
-	showtcpstat ("total packets sent", tcpstat.tcps_sndtotal);
-	showtcpstat ("data packets sent", tcpstat.tcps_sndpack);
-	showtcpstat ("data bytes sent", tcpstat.tcps_sndbyte);
-	showtcpstat ("data packets retransmitted", tcpstat.tcps_sndrexmitpack);
-	showtcpstat ("data bytes retransmitted", tcpstat.tcps_sndrexmitbyte);
-	showtcpstat ("ack-only packets sent", tcpstat.tcps_sndacks);
-	showtcpstat ("window probes sent", tcpstat.tcps_sndprobe);
-	showtcpstat ("packets sent with URG only", tcpstat.tcps_sndurg);
-	showtcpstat ("window update-only packets sent", tcpstat.tcps_sndwinup);
-	showtcpstat ("control (SYN|FIN|RST) packets sent", tcpstat.tcps_sndctrl);
-
-	showtcpstat ("total packets received", tcpstat.tcps_rcvtotal);
-	showtcpstat ("packets received in sequence", tcpstat.tcps_rcvpack);
-	showtcpstat ("bytes received in sequence", tcpstat.tcps_rcvbyte);
-	showtcpstat ("packets received with ccksum errs", tcpstat.tcps_rcvbadsum);
-	showtcpstat ("packets received with bad offset", tcpstat.tcps_rcvbadoff);
-	showtcpstat ("packets received too short", tcpstat.tcps_rcvshort);
-	showtcpstat ("duplicate-only packets received", tcpstat.tcps_rcvduppack);
-	showtcpstat ("duplicate-only bytes received", tcpstat.tcps_rcvdupbyte);
-	showtcpstat ("packets with some duplicate data", tcpstat.tcps_rcvpartduppack);
-	showtcpstat ("dup. bytes in part-dup. packets", tcpstat.tcps_rcvpartdupbyte);
-	showtcpstat ("out-of-order packets received", tcpstat.tcps_rcvoopack);
-	showtcpstat ("out-of-order bytes received", tcpstat.tcps_rcvoobyte);
-	showtcpstat ("packets with data after window", tcpstat.tcps_rcvpackafterwin);
-	showtcpstat ("bytes rcvd after window", tcpstat.tcps_rcvbyteafterwin);
-	showtcpstat ("packets rcvd after \"close\"", tcpstat.tcps_rcvafterclose);
-	showtcpstat ("rcvd window probe packets", tcpstat.tcps_rcvwinprobe);
-	showtcpstat ("rcvd duplicate acks", tcpstat.tcps_rcvdupack);
-	showtcpstat ("rcvd acks for unsent data", tcpstat.tcps_rcvacktoomuch);
-	showtcpstat ("rcvd ack packets", tcpstat.tcps_rcvackpack);
-	showtcpstat ("bytes acked by rcvd acks", tcpstat.tcps_rcvackbyte);
-	showtcpstat ("rcvd window update packets", tcpstat.tcps_rcvwinupd);
-	showtcpstat ("segments dropped due to PAWS", tcpstat.tcps_pawsdrop);
-	showtcpstat ("times hdr predict ok for acks", tcpstat.tcps_predack);
-	showtcpstat ("times hdr predict ok for data pkts", tcpstat.tcps_preddat);
-	showtcpstat ("pcb cache misses", tcpstat.tcps_pcbcachemiss);
-	showtcpstat ("times cached RTT in route updated", tcpstat.tcps_cachedrtt);
-	showtcpstat ("times cached rttvar updated", tcpstat.tcps_cachedrttvar);
-	showtcpstat ("times cached ssthresh updated", tcpstat.tcps_cachedssthresh);
-	showtcpstat ("times RTT initialized from route", tcpstat.tcps_usedrtt);
-	showtcpstat ("times RTTVAR initialized from rt", tcpstat.tcps_usedrttvar);
-	showtcpstat ("times ssthresh initialized from rt", tcpstat.tcps_usedssthresh);
-	showtcpstat ("timeout in persist state", tcpstat.tcps_persistdrop);
-	showtcpstat ("bogus SYN, e.g. premature ACK", tcpstat.tcps_badsyn);
-	showtcpstat ("resends due to MTU discovery", tcpstat.tcps_mturesent);
-	showtcpstat ("listen queue overflows", tcpstat.tcps_listendrop);
-	printf ("\n");
-}
diff --git a/c/src/libnetworking/rtems/rtems_showudpstat.c b/c/src/libnetworking/rtems/rtems_showudpstat.c
deleted file mode 100644
index 1fc2d15a0b..0000000000
--- a/c/src/libnetworking/rtems/rtems_showudpstat.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- *  $Id$
- */
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/sysctl.h>
-#include <sys/proc.h>
-#include <sys/mbuf.h>
-#include <sys/socket.h>
-#include <net/if.h>
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/ip_var.h>
-#include <netinet/udp.h>
-#include <netinet/udp_var.h>
-
-/*
- * Display UDP statistics
- * Don't lock the rest of the network tasks out while printing.
- * It's no big deal if the values change while being printed.
- */
-static void
-showudpstat (const char *name, unsigned long n)
-{
-	if (n)
-		printf ("%35s%12lu\n", name, n);
-}
-
-void
-rtems_bsdnet_show_udp_stats (void)
-{
-	printf ("************ UDP Statistics ************\n");
-	showudpstat ("total input packets", udpstat.udps_ipackets);
-	showudpstat ("packet shorter than header", udpstat.udps_hdrops);
-	showudpstat ("checksum error", udpstat.udps_badsum);
-	showudpstat ("data length larger than packet", udpstat.udps_badlen);
-	showudpstat ("no socket on port", udpstat.udps_noport);
-	showudpstat ("of above, arrived as broadcast", udpstat.udps_noportbcast);
-	showudpstat ("not delivered, input socket full", udpstat.udps_fullsock);
-	showudpstat ("input packets missing pcb cache", udpstat.udpps_pcbcachemiss);
-	showudpstat ("input packets not for hashed pcb", udpstat.udpps_pcbhashmiss);
-	showudpstat ("total output packets", udpstat.udps_opackets);
-	printf ("\n");
-}
diff --git a/c/src/libnetworking/rtems/rtems_syscall.c b/c/src/libnetworking/rtems/rtems_syscall.c
deleted file mode 100644
index 782a2f907b..0000000000
--- a/c/src/libnetworking/rtems/rtems_syscall.c
+++ /dev/null
@@ -1,761 +0,0 @@
-/*
- *  $Id$
- */
-
-#include <string.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-#include <rtems.h>
-#include <rtems/libio.h>
-#include <rtems/error.h>
-#include <rtems/rtems_bsdnet.h>
-
-#include <sys/errno.h>
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/mbuf.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/protosw.h>
-#include <sys/proc.h>
-#include <sys/filio.h>
-
-#include <net/if.h>
-#include <net/route.h>
-
-/*
- *********************************************************************
- *              Map RTEMS file descriptor to BSD socket              *
- *********************************************************************
- */
-struct fdsock {
-	int		indexFreeNext;
-	struct socket	*sock;
-};
-static struct fdsock *fdsock;
-static int fdsockCount;
-static int indexFreeHead = -1;
-
-/*
- * Convert an RTEMS file descriptor to a BSD socket pointer.
- */
-static struct socket *
-fdToSocket (int fd)
-{
-	int i;
-	struct socket *s;
-
-	if ((fd < 0)
-	 || (rtems_file_descriptor_type(fd) != RTEMS_FILE_DESCRIPTOR_TYPE_SOCKET)
-	 || ((i = rtems_file_descriptor_base(fd)) >= fdsockCount)
-	 || ((s = fdsock[i].sock) == NULL)) {
-		errno = EBADF;
-		return NULL;
-	}
-	return s;
-}
-
-/*
- * Enlarge the size of the file-descritor/socket pointer map.
- */
-static int
-enlargeFdMap (void)
-{
-	struct fdsock *nfdsock;
-	int i;
-
-	nfdsock = realloc (fdsock, sizeof *fdsock * (fdsockCount + 20));
-	if (nfdsock == NULL) {
-		errno = ENFILE;
-		return 0;
-	}
-	fdsock = nfdsock;
-	for (i = fdsockCount, fdsockCount += 20 ; i < fdsockCount ; i++) {
-		fdsock[i].sock = NULL;
-		fdsock[i].indexFreeNext = indexFreeHead;
-		indexFreeHead = i;
-	}
-	return 1;
-}
-
-/*
- * Create a file descriptor for a new socket
- */
-static int
-makeFd (struct socket *s)
-{
-	int i;
-
-	if ((indexFreeHead < 0) && !enlargeFdMap ())
-		return -1;
-	i = indexFreeHead;
-	indexFreeHead = fdsock[i].indexFreeNext;
-	fdsock[i].sock = s;
-	return rtems_make_file_descriptor(i,RTEMS_FILE_DESCRIPTOR_TYPE_SOCKET);
-}
-
-/*
- * Package system call argument into mbuf.
- */
-static int
-sockargstombuf (struct mbuf **mp, const void *buf, int buflen, int type)
-{
-	struct mbuf *m;
-
-	if ((u_int)buflen > MLEN)
-		return (EINVAL);
-	m = m_get(M_WAIT, type);
-	if (m == NULL)
-		return (ENOBUFS);
-	m->m_len = buflen;
-	memcpy (mtod(m, caddr_t), buf, buflen);
-	*mp = m;
-	if (type == MT_SONAME) {
-		struct sockaddr *sa;
-		sa = mtod(m, struct sockaddr *);
-		sa->sa_len = buflen;
-	}
-	return 0;
-}
-
-/*
- *********************************************************************
- *                       BSD-style entry points                      *
- *********************************************************************
- */
-int
-socket (int domain, int type, int protocol)
-{
-	int fd = -1;
-	int error;
-	struct socket *so;
-
-	rtems_bsdnet_semaphore_obtain ();
-	error = socreate(domain, &so, type, protocol, NULL);
-	if (error == 0) {
-		fd = makeFd (so);
-		if (fd < 0)
-			soclose (so);
-	}
-	else {
-		errno = error;
-		fd = -1;
-	}
-	rtems_bsdnet_semaphore_release ();
-	return fd;
-}
-
-int
-bind (int s, struct sockaddr *name, int namelen)
-{
-	int error;
-	int ret = -1;
-	struct socket *so;
-	struct mbuf *nam;
-
-	rtems_bsdnet_semaphore_obtain ();
-	if ((so = fdToSocket (s)) != NULL) {
-		error = sockargstombuf (&nam, name, namelen, MT_SONAME);
-		if (error == 0) {
-			error = sobind (so, nam);
-			if (error == 0)
-				ret = 0;
-			else
-				errno = error;
-			m_freem (nam);
-		}
-		else {
-			errno = error;
-		}
-	}
-	rtems_bsdnet_semaphore_release ();
-	return ret;
-}
-
-int
-connect (int s, struct sockaddr *name, int namelen)
-{
-	int error;
-	int ret = -1;
-	struct socket *so;
-	struct mbuf *nam;
-
-	rtems_bsdnet_semaphore_obtain ();
-	if ((so = fdToSocket (s)) == NULL) {
-		rtems_bsdnet_semaphore_release ();
-		return -1;
-	}
-	if ((so->so_state & SS_NBIO) && (so->so_state & SS_ISCONNECTING)) {
-		errno = EALREADY;
-		rtems_bsdnet_semaphore_release ();
-		return -1;
-	}
-	error = sockargstombuf (&nam, name, namelen, MT_SONAME);
-	if (error) {
-		errno = error;
-		rtems_bsdnet_semaphore_release ();
-		return -1;
-	}
-	error = soconnect (so, nam);
-	if (error) {
-		errno = error;
-		rtems_bsdnet_semaphore_release ();
-		return -1;
-	}
-	if ((so->so_state & SS_NBIO) && (so->so_state & SS_ISCONNECTING)) {
-		m_freem(nam);
-		errno = EINPROGRESS;
-		rtems_bsdnet_semaphore_release ();
-		return -1;
-	}
-	while ((so->so_state & SS_ISCONNECTING) && so->so_error == 0) {
-		soconnsleep (so);
-	}
-	if (error == 0) {
-		error = so->so_error;
-		so->so_error = 0;
-	}
-	so->so_state &= ~SS_ISCONNECTING;
-	m_freem (nam);
-	if (error == 0)
-		ret = 0;
-	rtems_bsdnet_semaphore_release ();
-	return ret;
-}
-
-int
-listen (int s, int backlog)
-{
-	int error;
-	int ret = -1;
-	struct socket *so;
-
-	rtems_bsdnet_semaphore_obtain ();
-	if ((so = fdToSocket (s)) != NULL) {
-		error = solisten (so, backlog);
-		if (error == 0)
-			ret = 0;
-		else
-			errno = error;
-	}
-	rtems_bsdnet_semaphore_release ();
-	return ret;
-}
-
-int
-accept (int s, struct sockaddr *name, int *namelen)
-{
-	int fd;
-	struct socket *head, *so;
-	struct mbuf *nam;
-
-	rtems_bsdnet_semaphore_obtain ();
-	if ((head = fdToSocket (s)) == NULL) {
-		rtems_bsdnet_semaphore_release ();
-		return -1;
-	}
-	if ((head->so_options & SO_ACCEPTCONN) == 0) {
-		errno = EINVAL;
-		rtems_bsdnet_semaphore_release ();
-		return -1;
-	}
-        if ((head->so_state & SS_NBIO) && head->so_comp.tqh_first == NULL) {
-                errno = EWOULDBLOCK;
-		rtems_bsdnet_semaphore_release ();
-		return -1;
-	}
-        while (head->so_comp.tqh_first == NULL && head->so_error == 0) {
-                if (head->so_state & SS_CANTRCVMORE) {
-                        head->so_error = ECONNABORTED;
-                        break;
-                }
-		soconnsleep (head);
-        }
-	if (head->so_error) {
-		errno = head->so_error;
-		head->so_error = 0;
-		rtems_bsdnet_semaphore_release ();
-		return -1;
-	}
-
-	so = head->so_comp.tqh_first;
-	TAILQ_REMOVE(&head->so_comp, so, so_list);
-	head->so_qlen--;
-
-	fd = makeFd (so);
-	if (fd < 0) {
-		TAILQ_INSERT_HEAD(&head->so_comp, so, so_list);
-		head->so_qlen++;
-		soconnwakeup (head);
-		rtems_bsdnet_semaphore_release ();
-		return -1;
-	}
-	so->so_state &= ~SS_COMP;
-	so->so_head = NULL;
-
-	nam = m_get(M_WAIT, MT_SONAME);
-	(void) soaccept(so, nam);
-	if (name) {
-		 /* check length before it is destroyed */
-		if (*namelen > nam->m_len)
-			*namelen = nam->m_len;
-		memcpy (name, mtod(nam, caddr_t), *namelen);
-	}
-	m_freem(nam);
-	rtems_bsdnet_semaphore_release ();
-	return (fd);
-
-}
-
-/*
- * All `transmit' operations end up calling this routine.
- */
-ssize_t
-sendmsg (int s, const struct msghdr *mp, int flags)
-{
-	int ret = -1;
-	int error;
-	struct uio auio;
-	struct iovec *iov;
-	struct socket *so;
-	struct mbuf *to, *control;
-	int i;
-	int len;
-
-	rtems_bsdnet_semaphore_obtain ();
-	if ((so = fdToSocket (s)) == NULL) {
-		rtems_bsdnet_semaphore_release ();
-		return -1;
-	}
-	auio.uio_iov = mp->msg_iov;
-	auio.uio_iovcnt = mp->msg_iovlen;
-	auio.uio_segflg = UIO_USERSPACE;
-	auio.uio_rw = UIO_WRITE;
-	auio.uio_offset = 0;
-	auio.uio_resid = 0;
-	iov = mp->msg_iov;
-	for (i = 0; i < mp->msg_iovlen; i++, iov++) {
-		if ((auio.uio_resid += iov->iov_len) < 0) {
-			errno = EINVAL;
-			rtems_bsdnet_semaphore_release ();
-			return -1;
-		}
-	}
-	if (mp->msg_name) {
-		error = sockargstombuf (&to, mp->msg_name, mp->msg_namelen, MT_SONAME);
-		if (error) {
-			errno = error;
-			rtems_bsdnet_semaphore_release ();
-			return -1;
-		}
-	}
-	else {
-		to = NULL;
-	}
-	if (mp->msg_control) {
-		if (mp->msg_controllen < sizeof (struct cmsghdr)) {
-			errno = EINVAL;
-			if (to)
-				m_freem(to);
-			rtems_bsdnet_semaphore_release ();
-			return -1;
-		}
-		sockargstombuf (&control, mp->msg_control, mp->msg_controllen, MT_CONTROL);
-	}
-	else {
-		control = NULL;
-	}
-	len = auio.uio_resid;
-	error = sosend (so, to, &auio, (struct mbuf *)0, control, flags);
-	if (error) {
-		if (auio.uio_resid != len && (error == EINTR || error == EWOULDBLOCK))
-			error = 0;
-	}
-	if (error) 
-		errno = error;
-	else
-		ret = len - auio.uio_resid;
-	if (to)
-		m_freem(to);
-	rtems_bsdnet_semaphore_release ();
-	return (ret);
-}
-
-/*
- * Send a message to a host
- */
-ssize_t
-sendto (int s, const void *buf, size_t buflen, int flags, const struct sockaddr *to, int tolen)
-{
-	struct msghdr msg;
-	struct iovec iov;
-
-	iov.iov_base = (void *)buf;
-	iov.iov_len = buflen;
-	msg.msg_name = (caddr_t)to;
-	msg.msg_namelen = tolen;
-	msg.msg_iov = &iov;
-	msg.msg_iovlen = 1;
-	msg.msg_control = NULL;
-	msg.msg_controllen = 0;
-	return sendmsg (s, &msg, flags);
-}
-
-/*
- * Send a message to a connected host
- */
-ssize_t
-send (int s, const void *buf, size_t buflen, int flags)
-{
-	return sendto (s, buf, buflen, flags, NULL, 0);
-}
-
-/*
- * All `receive' operations end up calling this routine.
- */
-ssize_t
-recvmsg (int s, struct msghdr *mp, int flags)
-{
-	int ret = -1;
-	int error;
-	struct uio auio;
-	struct iovec *iov;
-	struct socket *so;
-	struct mbuf *from = NULL, *control = NULL;
-	int i;
-	int len;
-
-	rtems_bsdnet_semaphore_obtain ();
-	if ((so = fdToSocket (s)) == NULL) {
-		rtems_bsdnet_semaphore_release ();
-		return -1;
-	}
-	auio.uio_iov = mp->msg_iov;
-	auio.uio_iovcnt = mp->msg_iovlen;
-	auio.uio_segflg = UIO_USERSPACE;
-	auio.uio_rw = UIO_READ;
-	auio.uio_offset = 0;
-	auio.uio_resid = 0;
-	iov = mp->msg_iov;
-	for (i = 0; i < mp->msg_iovlen; i++, iov++) {
-		if ((auio.uio_resid += iov->iov_len) < 0) {
-			errno = EINVAL;
-			rtems_bsdnet_semaphore_release ();
-			return -1;
-		}
-	}
-	len = auio.uio_resid;
-	mp->msg_flags = flags;
-	error = soreceive (so, &from, &auio, (struct mbuf **)NULL, 
-			mp->msg_control ? &control : (struct mbuf **)NULL,
-			&mp->msg_flags);
-	if (error) {
-		if (auio.uio_resid != len && (error == EINTR || error == EWOULDBLOCK))
-			error = 0;
-	}
-	if (error) {
-		errno = error;
-	}
-	else {
-		ret = len - auio.uio_resid;
-		if (mp->msg_name) {
-			len = mp->msg_namelen;
-			if ((len <= 0) || (from == NULL)) {
-				len = 0;
-			}
-			else {
-				if (len > from->m_len)
-					len = from->m_len;
-				memcpy (mp->msg_name, mtod(from, caddr_t), len);
-			}
-			mp->msg_namelen = len;
-		}
-		if (mp->msg_control) {
-			struct mbuf *m;
-			caddr_t ctlbuf;
-
-			len = mp->msg_controllen;
-			m = control;
-			mp->msg_controllen = 0;
-			ctlbuf = (caddr_t) mp->msg_control;
-
-			while (m && (len > 0)) {
-				unsigned int tocopy;
-
-				if (len >= m->m_len) 
-					tocopy = m->m_len;
-				else {
-					mp->msg_flags |= MSG_CTRUNC;
-					tocopy = len;
-				}
-				memcpy(ctlbuf, mtod(m, caddr_t), tocopy);
-				ctlbuf += tocopy;
-				len -= tocopy;
-				m = m->m_next;
-			}
-			mp->msg_controllen = ctlbuf - mp->msg_control;
-		}
-	}
-	if (from)
-		m_freem (from);
-	if (control)
-		m_freem (control);
-	rtems_bsdnet_semaphore_release ();
-	return (ret);
-}
-
-/*
- * Receive a message from a host
- */
-ssize_t
-recvfrom (int s, void *buf, size_t buflen, int flags, const struct sockaddr *from, int *fromlen)
-{
-	struct msghdr msg;
-	struct iovec iov;
-	int ret;
-
-	iov.iov_base = buf;
-	iov.iov_len = buflen;
-	msg.msg_name = (caddr_t)from;
-	msg.msg_namelen = *fromlen;
-	msg.msg_iov = &iov;
-	msg.msg_iovlen = 1;
-	msg.msg_control = NULL;
-	msg.msg_controllen = 0;
-	ret = recvmsg (s, &msg, flags);
-	if ((from != NULL) && (fromlen != NULL) && (ret >= 0))
-		*fromlen = msg.msg_namelen;
-	return ret;
-}
-
-/*
- * Receive a message from a connected host
- */
-ssize_t
-recv (int s, void *buf, size_t buflen, int flags)
-{
-	return recvfrom (s, buf, buflen, flags, NULL, NULL);
-}
-
-int
-setsockopt (int s, int level, int name, const void *val, int len)
-{
-	struct socket *so;
-	struct mbuf *m = NULL;
-	int error;
-
-	rtems_bsdnet_semaphore_obtain ();
-	if ((so = fdToSocket (s)) == NULL) {
-		rtems_bsdnet_semaphore_release ();
-		return -1;
-	}
-	if (len > MLEN) {
-		errno = EINVAL;
-		rtems_bsdnet_semaphore_release ();
-		return -1;
-	}
-	if (val) {
-		error = sockargstombuf (&m, val, len, MT_SOOPTS);
-		if (error) {
-			errno = error;
-			rtems_bsdnet_semaphore_release ();
-			return -1;
-		}
-	}
-	error = sosetopt(so, level, name, m);
-	if (error) {
-		errno = error;
-		rtems_bsdnet_semaphore_release ();
-		return -1;
-	}
-	rtems_bsdnet_semaphore_release ();
-	return 0;
-}
-
-int
-getsockopt (int s, int level, int name, void *aval, int *avalsize)
-{
-	struct socket *so;
-	struct mbuf *m = NULL, *m0;
-	char *val = aval;
-	int i, op, valsize;
-	int error;
-
-	rtems_bsdnet_semaphore_obtain ();
-	if ((so = fdToSocket (s)) == NULL) {
-		rtems_bsdnet_semaphore_release ();
-		return -1;
-	}
-	if (val)
-		valsize = *avalsize;
-	else
-		valsize = 0;
-	if (((error = sogetopt(so, level, name, &m)) == 0) && val && valsize && m) {
-		op = 0;
-		while (m && op < valsize) {
-			i = valsize - op;
-			if (i > m->m_len)
-				i = m->m_len;
-			memcpy (val, mtod(m, caddr_t), i);
-			op += i;
-			val += i;
-			m0 = m;
-			MFREE (m0, m);
-		}
-		*avalsize = op;
-	}
-	if (m != NULL)
-		(void) m_free(m);
-	if (error) {
-		errno = error;
-		rtems_bsdnet_semaphore_release ();
-		return -1;
-	}
-	rtems_bsdnet_semaphore_release ();
-	return 0;
-}
-
-static int
-getpeersockname (int s, struct sockaddr *name, int *namelen, int pflag)
-{
-	struct socket *so;
-	struct mbuf *m;
-	int len = *namelen;
-	int error;
-
-	rtems_bsdnet_semaphore_obtain ();
-	if ((so = fdToSocket (s)) == NULL) {
-		rtems_bsdnet_semaphore_release ();
-		return -1;
-	}
-	m = m_getclr(M_WAIT, MT_SONAME);
-	if (m == NULL) {
-		errno = ENOBUFS;
-		rtems_bsdnet_semaphore_release ();
-		return -1;
-	}
-	if (pflag)
-		error = (*so->so_proto->pr_usrreqs->pru_peeraddr)(so, m);
-	else
-		error = (*so->so_proto->pr_usrreqs->pru_sockaddr)(so, m);
-	if (error) {
-		errno = error;
-		rtems_bsdnet_semaphore_release ();
-		return -1;
-	}
-	if (len > m->m_len) {
-		len = m->m_len;
-		*namelen = len;
-	}
-	memcpy (name, mtod(m, caddr_t), len);
-	m_freem (m);
-	rtems_bsdnet_semaphore_release ();
-	return 0;
-}
-
-int
-getpeername (int s, struct sockaddr *name, int *namelen)
-{
-	return getpeersockname (s, name, namelen, 1);
-}
-int
-getsockname (int s, struct sockaddr *name, int *namelen)
-{
-	return getpeersockname (s, name, namelen, 0);
-}
-
-/*
- ************************************************************************
- *                 RTEMS EXTERNAL I/O HANDLER ROUTINES                  *
- ************************************************************************
- */
-static int
-rtems_bsdnet_close (int fd)
-{
-	struct socket *so;
-	int error;
-	int i;
-
-	rtems_bsdnet_semaphore_obtain ();
-	if ((so = fdToSocket (fd)) == NULL) {
-		rtems_bsdnet_semaphore_release ();
-		return -1;
-	}
-	i = rtems_file_descriptor_base(fd);
-	fdsock[i].indexFreeNext = indexFreeHead;;
-	indexFreeHead = i;
-	error = soclose (so);
-	rtems_bsdnet_semaphore_release ();
-	if (error) {
-		errno = error;
-		return -1;
-	}
-	return 0;
-}
-
-static int
-rtems_bsdnet_read (int fd, void *buffer, unsigned32 count)
-{
-	return recv (fd, buffer, count, 0);
-}
-
-static int
-rtems_bsdnet_write (int fd, const void *buffer, unsigned32 count)
-{
-	return send (fd, buffer, count, 0);
-}
-
-static int
-so_ioctl (struct socket *so, unsigned32 command, void *buffer)
-{
-	switch (command) {
-	case FIONBIO:
-		if (*(int *)buffer)
-			so->so_state |= SS_NBIO;
-		else
-			so->so_state &= ~SS_NBIO;
-		return 0;
-
-	case FIONREAD:
-		*(int *)buffer = so->so_rcv.sb_cc;
-		return 0;
-	}
-
-	if (IOCGROUP(command) == 'i')
-		return ifioctl (so, command, buffer, NULL);
-	if (IOCGROUP(command) == 'r')
-		return rtioctl (command, buffer, NULL);
-	return (*so->so_proto->pr_usrreqs->pru_control)(so, command, buffer, 0);
-}
-
-static int
-rtems_bsdnet_ioctl (int fd, unsigned32 command, void *buffer)
-{
-	struct socket *so;
-	int error;
-
-	rtems_bsdnet_semaphore_obtain ();
-	if ((so = fdToSocket (fd)) == NULL) {
-		rtems_bsdnet_semaphore_release ();
-		return -1;
-	}
-	error = so_ioctl (so, command, buffer);
-	rtems_bsdnet_semaphore_release ();
-	if (error) {
-		errno = error;
-		return -1;
-	}
-	return 0;
-}
-
-rtems_libio_handler_t rtems_bsdnet_io_handler = {
-	NULL,			/* open */
-	rtems_bsdnet_close,	/* close */
-	rtems_bsdnet_read,	/* read */
-	rtems_bsdnet_write,	/* write */
-	rtems_bsdnet_ioctl,	/* ioctl */
-	NULL,			/* lseek */
-};
-
diff --git a/c/src/libnetworking/rtems/sghostname.c b/c/src/libnetworking/rtems/sghostname.c
deleted file mode 100644
index 36894caa86..0000000000
--- a/c/src/libnetworking/rtems/sghostname.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * RTEMS versions of hostname functions
- * FIXME: Not thread-safe
- *
- *  $Id$
- */
-
-#include <string.h>
-#include <errno.h>
-#include <rtems/rtems_bsdnet.h>
-#include <sys/param.h>
-#include <sys/malloc.h>
-#include <sys/kernel.h>
-
-static char *rtems_hostname;
-
-int
-gethostname (char *name, int namelen)
-{
-	char *cp = rtems_hostname;
-
-	if (cp == NULL)
-		cp = "";
-	strncpy (name, cp, namelen);
-	return 0;
-}
-
-int
-sethostname (char *name, int namelen)
-{
-	char *old, *new;
-
-	if (namelen >= MAXHOSTNAMELEN) {
-		errno = EINVAL;
-		return -1;
-	}
-	new = malloc (namelen + 1, M_HTABLE, M_NOWAIT);
-	if (new == NULL) {
-		errno = ENOMEM;
-		return -1;
-	}
-	strncpy (new, name, namelen);
-	new[namelen] = '\0';
-	old = rtems_hostname;
-	rtems_hostname = new;
-	if (old)
-		free (old, M_HTABLE);
-	return 0;
-}
diff --git a/c/src/libnetworking/rtems/tftp.h b/c/src/libnetworking/rtems/tftp.h
deleted file mode 100644
index d09782e22b..0000000000
--- a/c/src/libnetworking/rtems/tftp.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- *  $Id$
- */
-
-/*
- * Trivial File Transfer Protocol (TFTP)
- *
- * Transfer file to/from remote host
- *
- * W. Eric Norum
- * Saskatchewan Accelerator Laboratory
- * University of Saskatchewan
- * Saskatoon, Saskatchewan, CANADA
- * eric@skatter.usask.ca
- */
-
-/*
- * Usage:
- * 
- * To open `/bootfiles/image' on `hostname' for reading:
- *         fd = open ("/TFTP/hostname/bootfiles/image", O_RDONLY);
- *
- * The `hostname' must be four dot-separated decimal values.
- *
- * To open a file on the host which supplied the BOOTP
- * information just leave the `hostname' part empty:
- *         fd = open ("/TFTP//bootfiles/image", O_RDONLY);
- *
- */
-
-#ifndef _TFTP_DRIVER_h
-#define _TFTP_DRIVER_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * Driver entry points
- */
-#define TFTP_DRIVER_TABLE_ENTRY \
-  { rtems_tftp_initialize, rtems_tftp_open, rtems_tftp_close, \
-    rtems_tftp_read, rtems_tftp_write, rtems_tftp_control }
-
-rtems_device_driver rtems_tftp_initialize(
-  rtems_device_major_number,
-  rtems_device_minor_number,
-  void *
-);
-
-rtems_device_driver rtems_tftp_open(
-  rtems_device_major_number,
-  rtems_device_minor_number,
-  void *
-);
-
-rtems_device_driver rtems_tftp_close(
-  rtems_device_major_number,
-  rtems_device_minor_number,
-  void *
-);
-
-rtems_device_driver rtems_tftp_read(
-  rtems_device_major_number,
-  rtems_device_minor_number,
-  void *
-);
-
-rtems_device_driver rtems_tftp_write(
-  rtems_device_major_number,
-  rtems_device_minor_number,
-  void *
-);
-
-rtems_device_driver rtems_tftp_control(
-  rtems_device_major_number,
-  rtems_device_minor_number,
-  void *
-);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/c/src/libnetworking/sys/buf.h b/c/src/libnetworking/sys/buf.h
deleted file mode 100644
index 6cca571141..0000000000
--- a/c/src/libnetworking/sys/buf.h
+++ /dev/null
@@ -1,248 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)buf.h	8.9 (Berkeley) 3/30/95
- * $Id$
- */
-
-#ifndef _SYS_BUF_H_
-#define	_SYS_BUF_H_
-
-#include <sys/queue.h>
-
-#define NOLIST ((struct buf *)0x87654321)
-
-struct buf;
-
-struct iodone_chain {
-	long	ic_prev_flags;
-	void	(*ic_prev_iodone) __P((struct buf *));
-	void	*ic_prev_iodone_chain;
-	struct {
-		long	ia_long;
-		void	*ia_ptr;
-	}	ic_args[5];
-};
-
-typedef TAILQ_HEAD(buf_queue_head, buf) buf_queue_head, *buf_queue_head_t;
-
-/*
- * The buffer header describes an I/O operation in the kernel.
- */
-struct buf {
-	LIST_ENTRY(buf) b_hash;		/* Hash chain. */
-	LIST_ENTRY(buf) b_vnbufs;	/* Buffer's associated vnode. */
-	TAILQ_ENTRY(buf) b_freelist;	/* Free list position if not active. */
-	TAILQ_ENTRY(buf) b_act;		/* Device driver queue when active. *new* */
-	struct  proc *b_proc;		/* Associated proc; NULL if kernel. */
-	long	b_flags;		/* B_* flags. */
-	unsigned short b_qindex;	/* buffer queue index */
-	unsigned char b_usecount;	/* buffer use count */
-	int	b_error;		/* Errno value. */
-	long	b_bufsize;		/* Allocated buffer size. */
-	long	b_bcount;		/* Valid bytes in buffer. */
-	long	b_resid;		/* Remaining I/O. */
-	dev_t	b_dev;			/* Device associated with buffer. */
-	struct {
-		caddr_t	b_addr;		/* Memory, superblocks, indirect etc. */
-	} b_un;
-	caddr_t	b_kvabase;		/* base kva for buffer */
-	int	b_kvasize;		/* size of kva for buffer */
-	void	*b_saveaddr;		/* Original b_addr for physio. */
-	daddr_t	b_lblkno;		/* Logical block number. */
-	daddr_t	b_blkno;		/* Underlying physical block number. */
-					/* Function to call upon completion. */
-	void	(*b_iodone) __P((struct buf *));
-					/* For nested b_iodone's. */
-	struct	iodone_chain *b_iodone_chain;
-	struct	vnode *b_vp;		/* Device vnode. */
-	int	b_dirtyoff;		/* Offset in buffer of dirty region. */
-	int	b_dirtyend;		/* Offset of end of dirty region. */
-	struct	ucred *b_rcred;		/* Read credentials reference. */
-	struct	ucred *b_wcred;		/* Write credentials reference. */
-	int	b_validoff;		/* Offset in buffer of valid region. */
-	int	b_validend;		/* Offset of end of valid region. */
-	daddr_t	b_pblkno;               /* physical block number */
-	caddr_t	b_savekva;              /* saved kva for transfer while bouncing */
-	void	*b_driver1;		/* for private use by the driver */
-	void	*b_driver2;		/* for private use by the driver */
-	void	*b_spc;
-	union	cluster_info {
-		TAILQ_HEAD(cluster_list_head, buf) cluster_head;
-		TAILQ_ENTRY(buf) cluster_entry;
-	} b_cluster;
-	struct	vm_page *b_pages[btoc(MAXPHYS)];
-	int		b_npages;
-};
-
-/* Device driver compatibility definitions. */
-#define	b_data	 b_un.b_addr		/* b_un.b_addr is not changeable. */
-
-/*
- * These flags are kept in b_flags.
- */
-#define	B_AGE		0x00000001	/* Move to age queue when I/O done. */
-#define	B_NEEDCOMMIT	0x00000002	/* Append-write in progress. */
-#define	B_ASYNC		0x00000004	/* Start I/O, do not wait. */
-#define	B_BAD		0x00000008	/* Bad block revectoring in progress. */
-#define	B_BUSY		0x00000010	/* I/O in progress. */
-#define	B_CACHE		0x00000020	/* Bread found us in the cache. */
-#define	B_CALL		0x00000040	/* Call b_iodone from biodone. */
-#define	B_DELWRI	0x00000080	/* Delay I/O until buffer reused. */
-#define	B_DIRTY		0x00000100	/* Dirty page to be pushed out async. */
-#define	B_DONE		0x00000200	/* I/O completed. */
-#define	B_EINTR		0x00000400	/* I/O was interrupted */
-#define	B_ERROR		0x00000800	/* I/O error occurred. */
-#define	B_GATHERED	0x00001000	/* LFS: already in a segment. */
-#define	B_INVAL		0x00002000	/* Does not contain valid info. */
-#define	B_LOCKED	0x00004000	/* Locked in core (not reusable). */
-#define	B_NOCACHE	0x00008000	/* Do not cache block after use. */
-#define	B_MALLOC	0x00010000	/* malloced b_data */
-#define	B_CLUSTEROK	0x00020000	/* Pagein op, so swap() can count it. */
-#define	B_PHYS		0x00040000	/* I/O to user memory. */
-#define	B_RAW		0x00080000	/* Set by physio for raw transfers. */
-#define	B_READ		0x00100000	/* Read buffer. */
-#define	B_TAPE		0x00200000	/* Magnetic tape I/O. */
-#define	B_RELBUF	0x00400000	/* Release VMIO buffer. */
-#define	B_WANTED	0x00800000	/* Process wants this buffer. */
-#define	B_WRITE		0x00000000	/* Write buffer (pseudo flag). */
-#define	B_WRITEINPROG	0x01000000	/* Write in progress. */
-#define	B_XXX		0x02000000	/* Debugging flag. */
-#define	B_PAGING	0x04000000	/* volatile paging I/O -- bypass VMIO */
-#define	B_ORDERED	0x08000000	/* Must guarantee I/O ordering */
-#define B_VMIO		0x20000000	/* VMIO flag */
-#define B_CLUSTER	0x40000000	/* pagein op, so swap() can count it */
-#define B_BOUNCE	0x80000000	/* bounce buffer flag */
-
-/*
- * number of buffer hash entries
- */
-#define BUFHSZ 512
-
-/*
- * buffer hash table calculation, originally by David Greenman
- */
-#define BUFHASH(vnp, bn)        \
-	(&bufhashtbl[(((unsigned long)(vnp) >> 7)+(int)(bn)) % BUFHSZ])
-
-/*
- * Definitions for the buffer free lists.
- */
-#define BUFFER_QUEUES	6	/* number of free buffer queues */
-
-extern LIST_HEAD(bufhashhdr, buf) bufhashtbl[BUFHSZ], invalhash;
-extern TAILQ_HEAD(bqueues, buf) bufqueues[BUFFER_QUEUES];
-
-#define QUEUE_NONE	0	/* on no queue */
-#define QUEUE_LOCKED	1	/* locked buffers */
-#define QUEUE_LRU	2	/* useful buffers */
-#define QUEUE_VMIO	3	/* VMIO buffers */
-#define QUEUE_AGE	4	/* not-useful buffers */
-#define QUEUE_EMPTY	5	/* empty buffer headers*/
-
-/*
- * Zero out the buffer's data area.
- */
-#define	clrbuf(bp) {							\
-	bzero((bp)->b_data, (u_int)(bp)->b_bcount);			\
-	(bp)->b_resid = 0;						\
-}
-
-/* Flags to low-level allocation routines. */
-#define B_CLRBUF	0x01	/* Request allocated buffer be cleared. */
-#define B_SYNC		0x02	/* Do all allocations synchronously. */
-
-#ifdef KERNEL
-extern int	nbuf;			/* The number of buffer headers */
-extern struct	buf *buf;		/* The buffer headers. */
-extern char	*buffers;		/* The buffer contents. */
-extern int	bufpages;		/* Number of memory pages in the buffer pool. */
-extern struct	buf *swbuf;		/* Swap I/O buffer headers. */
-extern int	nswbuf;			/* Number of swap I/O buffer headers. */
-extern TAILQ_HEAD(swqueue, buf) bswlist;
-
-void	bufinit __P((void));
-void	bremfree __P((struct buf *));
-int	bread __P((struct vnode *, daddr_t, int,
-	    struct ucred *, struct buf **));
-int	breadn __P((struct vnode *, daddr_t, int, daddr_t *, int *, int,
-	    struct ucred *, struct buf **));
-int	bwrite __P((struct buf *));
-void	bdwrite __P((struct buf *));
-void	bawrite __P((struct buf *));
-int	bowrite __P((struct buf *));
-void	brelse __P((struct buf *));
-void	bqrelse __P((struct buf *));
-int	vfs_bio_awrite __P((struct buf *));
-struct buf *     getpbuf __P((void));
-struct buf *incore __P((struct vnode *, daddr_t));
-struct buf *gbincore __P((struct vnode *, daddr_t));
-int	inmem __P((struct vnode *, daddr_t));
-struct buf *getblk __P((struct vnode *, daddr_t, int, int, int));
-struct buf *geteblk __P((int));
-int	allocbuf __P((struct buf *, int));
-int	biowait __P((struct buf *));
-void	biodone __P((struct buf *));
-
-void	cluster_callback __P((struct buf *));
-int	cluster_read __P((struct vnode *, u_quad_t, daddr_t, long,
-	    struct ucred *, struct buf **));
-int	cluster_wbuild __P((struct vnode *, long, daddr_t, int));
-void	cluster_write __P((struct buf *, u_quad_t));
-int	physio __P((void (*)(struct buf *), struct buf *, dev_t, 
-	    int, u_int (*)(struct buf *), struct uio *));
-u_int	minphys __P((struct buf *));
-void	vfs_bio_clrbuf __P((struct buf *));
-void	vfs_busy_pages __P((struct buf *, int clear_modify));
-void	vfs_unbusy_pages(struct buf *);
-void	vwakeup __P((struct buf *));
-void	vmapbuf __P((struct buf *));
-void	vunmapbuf __P((struct buf *));
-void	relpbuf __P((struct buf *));
-void	brelvp __P((struct buf *));
-void	bgetvp __P((struct vnode *, struct buf *));
-void	pbgetvp __P((struct vnode *, struct buf *));
-void	pbrelvp __P((struct buf *));
-void	reassignbuf __P((struct buf *, struct vnode *));
-struct	buf *trypbuf __P((void));
-void	vm_bounce_alloc __P((struct buf *));
-void	vm_bounce_free __P((struct buf *));
-vm_offset_t	vm_bounce_kva_alloc __P((int));
-void	vm_bounce_kva_alloc_free __P((vm_offset_t, int));
-#endif /* KERNEL */
-
-#endif /* !_SYS_BUF_H_ */
diff --git a/c/src/libnetworking/sys/callout.h b/c/src/libnetworking/sys/callout.h
deleted file mode 100644
index 5fec98f28b..0000000000
--- a/c/src/libnetworking/sys/callout.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)callout.h	8.2 (Berkeley) 1/21/94
- * $Id$
- */
-
-#ifndef _SYS_CALLOUT_H_
-#define _SYS_CALLOUT_H_
-
-struct callout {
-	struct	callout *c_next;		/* next callout in queue */
-	void	*c_arg;				/* function argument */
-	void	(*c_func) __P((void *));	/* function to call */
-	int	c_time;				/* ticks to the event */
-};
-
-#ifdef KERNEL
-extern struct	callout *callfree, *callout, calltodo;
-extern int	ncallout;
-#endif
-
-#endif
diff --git a/c/src/libnetworking/sys/cdefs.h b/c/src/libnetworking/sys/cdefs.h
deleted file mode 100644
index d089dc5894..0000000000
--- a/c/src/libnetworking/sys/cdefs.h
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Berkeley Software Design, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)cdefs.h	8.8 (Berkeley) 1/9/95
- * $Id$
- */
-
-#ifndef	_SYS_CDEFS_H_
-#define	_SYS_CDEFS_H_
-
-#if defined(__cplusplus)
-#define	__BEGIN_DECLS	extern "C" {
-#define	__END_DECLS	};
-#else
-#define	__BEGIN_DECLS
-#define	__END_DECLS
-#endif
-
-/*
- * The __CONCAT macro is used to concatenate parts of symbol names, e.g.
- * with "#define OLD(foo) __CONCAT(old,foo)", OLD(foo) produces oldfoo.
- * The __CONCAT macro is a bit tricky -- make sure you don't put spaces
- * in between its arguments.  __CONCAT can also concatenate double-quoted
- * strings produced by the __STRING macro, but this only works with ANSI C.
- *
- * __XSTRING is like __STRING, but it expands any macros in its argument
- * first.  It is only available with ANSI C.
- */
-#if defined(__STDC__) || defined(__cplusplus)
-#define	__P(protos)	protos		/* full-blown ANSI C */
-#define	__CONCAT1(x,y)	x ## y
-#define	__CONCAT(x,y)	__CONCAT1(x,y)
-#define	__STRING(x)	#x		/* stringify without expanding x */
-#define	__XSTRING(x)	__STRING(x)	/* expand x, then stringify */
-
-#define	__const		const		/* define reserved names to standard */
-#define	__signed	signed
-#define	__volatile	volatile
-#if defined(__cplusplus)
-#define	__inline	inline		/* convert to C++ keyword */
-#else
-#ifndef __GNUC__
-#define	__inline			/* delete GCC keyword */
-#endif /* !__GNUC__ */
-#endif /* !__cplusplus */
-
-#else	/* !(__STDC__ || __cplusplus) */
-#define	__P(protos)	()		/* traditional C preprocessor */
-#define	__CONCAT(x,y)	x/**/y
-#define	__STRING(x)	"x"
-
-#ifndef __GNUC__
-#define	__const				/* delete pseudo-ANSI C keywords */
-#define	__inline
-#define	__signed
-#define	__volatile
-/*
- * In non-ANSI C environments, new programs will want ANSI-only C keywords
- * deleted from the program and old programs will want them left alone.
- * When using a compiler other than gcc, programs using the ANSI C keywords
- * const, inline etc. as normal identifiers should define -DNO_ANSI_KEYWORDS.
- * When using "gcc -traditional", we assume that this is the intent; if
- * __GNUC__ is defined but __STDC__ is not, we leave the new keywords alone.
- */
-#ifndef	NO_ANSI_KEYWORDS
-#define	const				/* delete ANSI C keywords */
-#define	inline
-#define	signed
-#define	volatile
-#endif	/* !NO_ANSI_KEYWORDS */
-#endif	/* !__GNUC__ */
-#endif	/* !(__STDC__ || __cplusplus) */
-
-/*
- * GCC1 and some versions of GCC2 declare dead (non-returning) and
- * pure (no side effects) functions using "volatile" and "const";
- * unfortunately, these then cause warnings under "-ansi -pedantic".
- * GCC2.5 uses a new, peculiar __attribute__((attrs)) style.  All of
- * these work for GNU C++ (modulo a slight glitch in the C++ grammar
- * in the distribution version of 2.5.5).
- */
-#if __GNUC__ < 2
-#define __dead
-#define __dead2
-#define __pure
-#define __pure2
-#define __unused
-#define	__attribute__(x)
-#endif
-#if __GNUC__ == 2 && __GNUC_MINOR__ < 5
-#define	__dead		__volatile
-#define __dead2
-#define	__pure		__const
-#define __pure2
-#define __unused
-#endif
-#if __GNUC__ == 2 && __GNUC_MINOR__ >= 5 && __GNUC_MINOR__ < 7
-#define __dead
-#define __dead2		__attribute__((__noreturn__))
-#define __pure
-#define __pure2		__attribute__((__const__))
-#define __unused
-#endif
-#if __GNUC__ == 2 && __GNUC_MINOR__ >= 7 || __GNUC__ >= 3
-#define __dead
-#define __dead2		__attribute__((__noreturn__))
-#define __pure
-#define __pure2		__attribute__((__const__))
-#define __unused	__attribute__((__unused__))
-#endif
-
-#ifdef __GNUC__
-#ifdef __STDC__
-#define __weak_reference(sym,alias)	\
-	__asm__(".stabs \"_" #alias "\",11,0,0,0");	\
-	__asm__(".stabs \"_" #sym "\",1,0,0,0")
-#define __warn_references(sym,msg)	\
-	__asm__(".stabs \"" msg "\",30,0,0,0");		\
-	__asm__(".stabs \"_" #sym "\",1,0,0,0")
-#else
-#define __weak_reference(sym,alias)	\
-	__asm__(".stabs \"_/**/alias\",11,0,0,0");	\
-	__asm__(".stabs \"_/**/sym\",1,0,0,0")
-#define __warn_references(sym,msg)	\
-	__asm__(".stabs msg,30,0,0,0");			\
-	__asm__(".stabs \"_/**/sym\",1,0,0,0")
-#endif
-#endif
-
-#define	__IDSTRING(name,string) \
-	static const char name[] __attribute__((__unused__)) = string
-
-#ifndef	__RCSID
-#define	__RCSID(s)	__IDSTRING(rcsid,s)
-#endif
-
-#ifndef	__RCSID_SOURCE
-#define	__RCSID_SOURCE(s) __IDSTRING(rcsid_source,s)
-#endif
-
-#ifndef	__COPYRIGHT
-#define	__COPYRIGHT(s)	__IDSTRING(copyright,s)
-#endif
-
-#endif /* !_SYS_CDEFS_H_ */
diff --git a/c/src/libnetworking/sys/conf.h b/c/src/libnetworking/sys/conf.h
deleted file mode 100644
index 92d99d9d07..0000000000
--- a/c/src/libnetworking/sys/conf.h
+++ /dev/null
@@ -1,228 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)conf.h	8.5 (Berkeley) 1/9/95
- * $Id$
- */
-
-#ifndef _SYS_CONF_H_
-#define	_SYS_CONF_H_
-
-/*
- * Definitions of device driver entry switches
- */
-
-struct buf;
-struct proc;
-struct tty;
-struct uio;
-struct vnode;
-
-typedef int d_open_t __P((dev_t dev, int oflags, int devtype, struct proc *p));
-typedef int d_close_t __P((dev_t dev, int fflag, int devtype, struct proc *p));
-typedef void d_strategy_t __P((struct buf *bp));
-typedef int d_ioctl_t __P((dev_t dev, int cmd, caddr_t data,
-			   int fflag, struct proc *p));
-typedef int d_dump_t __P((dev_t dev));
-typedef int d_psize_t __P((dev_t dev));
-
-typedef int d_read_t __P((dev_t dev, struct uio *uio, int ioflag));
-typedef int d_write_t __P((dev_t dev, struct uio *uio, int ioflag));
-typedef void d_stop_t __P((struct tty *tp, int rw));
-typedef int d_reset_t __P((dev_t dev));
-typedef struct tty *d_devtotty_t __P((dev_t dev));
-typedef int d_select_t __P((dev_t dev, int which, struct proc *p));
-typedef int d_mmap_t __P((dev_t dev, int offset, int nprot));
-
-typedef int l_open_t __P((dev_t dev, struct tty *tp));
-typedef int l_close_t __P((struct tty *tp, int flag));
-typedef int l_read_t __P((struct tty *tp, struct uio *uio, int flag));
-typedef int l_write_t __P((struct tty *tp, struct uio *uio, int flag));
-typedef int l_ioctl_t __P((struct tty *tp, int cmd, caddr_t data,
-			   int flag, struct proc *p));
-typedef int l_rint_t __P((int c, struct tty *tp));
-typedef int l_start_t __P((struct tty *tp));
-typedef int l_modem_t __P((struct tty *tp, int flag));
-
-/*
- * Block device switch table
- */
-struct bdevsw {
-	d_open_t	*d_open;
-	d_close_t	*d_close;
-	d_strategy_t	*d_strategy;
-	d_ioctl_t	*d_ioctl;
-	d_dump_t	*d_dump;
-	d_psize_t	*d_psize;
-	int		d_flags;
-	char 		*d_name;	/* name of the driver e.g. audio */
-	struct cdevsw	*d_cdev; 	/* cross pointer to the cdev */
-	int		d_maj;		/* the major number we were assigned */
-};
-
-#ifdef KERNEL
-extern struct bdevsw *bdevsw[];
-#endif
-
-/*
- * Character device switch table
- */
-struct cdevsw {
-	d_open_t	*d_open;
-	d_close_t	*d_close;
-	d_read_t	*d_read;
-	d_write_t	*d_write;
-	d_ioctl_t	*d_ioctl;
-	d_stop_t	*d_stop;
-	d_reset_t	*d_reset;	/* XXX not used */
-	d_devtotty_t	*d_devtotty;
-	d_select_t	*d_select;
-	d_mmap_t	*d_mmap;
-	d_strategy_t	*d_strategy;
-	char		*d_name;	/* see above */
-	struct bdevsw	*d_bdev;
-	int		d_maj;
-};
-
-#ifdef KERNEL
-extern struct cdevsw *cdevsw[];
-#endif
-
-/*
- * Line discipline switch table
- */
-struct linesw {
-	l_open_t	*l_open;
-	l_close_t	*l_close;
-	l_read_t	*l_read;
-	l_write_t	*l_write;
-	l_ioctl_t	*l_ioctl;
-	l_rint_t	*l_rint;
-	l_start_t	*l_start;
-	l_modem_t	*l_modem;
-};
-
-#ifdef KERNEL
-extern struct linesw linesw[];
-extern int nlinesw;
-
-int ldisc_register __P((int , struct linesw *));
-void ldisc_deregister __P((int));
-#define LDISC_LOAD 	-1		/* Loadable line discipline */
-#endif
-
-/*
- * Swap device table
- */
-struct swdevt {
-	dev_t	sw_dev;
-	int	sw_flags;
-	int	sw_nblks;
-	struct	vnode *sw_vp;
-};
-#define	SW_FREED	0x01
-#define	SW_SEQUENTIAL	0x02
-#define	sw_freed	sw_flags	/* XXX compat */
-
-#ifdef KERNEL
-d_open_t	noopen;
-d_close_t	noclose;
-d_read_t	noread;
-d_write_t	nowrite;
-d_ioctl_t	noioctl;
-d_stop_t	nostop;
-d_reset_t	noreset;
-d_devtotty_t	nodevtotty;
-d_select_t	noselect;
-d_mmap_t	nommap;
-
-/* Bogus defines for compatibility. */
-#define	noioc		noioctl
-#define	nostrat		nostrategy
-#define zerosize	nopsize
-/*
- * XXX d_strategy seems to be unused for cdevs that aren't associated with
- * bdevs and called without checking for it being non-NULL for bdevs.
- */
-#define	nostrategy	((d_strategy_t *)NULL)
-
-d_dump_t	nodump;
-
-/*
- * nopsize is little used, so not worth having dummy functions for.
- */
-#define	nopsize	((d_psize_t *)NULL)
-
-d_open_t	nullopen;
-d_close_t	nullclose;
-#define	nullstop nostop		/* one void return is as good as another */
-#define	nullreset noreset	/* one unused function is as good as another */
-
-d_open_t	nxopen;
-d_close_t	nxclose;
-d_read_t	nxread;
-d_write_t	nxwrite;
-d_ioctl_t	nxioctl;
-#define	nxstop	nostop		/* one void return is as good as another */
-#define	nxreset	noreset		/* one unused function is as good as another */
-#define	nxdevtotty nodevtotty	/* one NULL return is as good as another */
-d_select_t	nxselect;
-#define	nxmmap	nommap		/* one -1 return is as good as another */
-#define	nxstrategy nostrategy	/* one NULL value is as good as another */
-d_dump_t	nxdump;
-#define	nxpsize	nopsize		/* one NULL value is as good as another */
-
-d_read_t	rawread;
-d_write_t	rawwrite;
-
-l_read_t	l_noread;
-l_write_t	l_nowrite;
-
-int	bdevsw_add __P((dev_t *descrip,struct bdevsw *new,struct bdevsw **old));
-int	cdevsw_add __P((dev_t *descrip,struct cdevsw *new,struct cdevsw **old));
-void	cdevsw_make __P((struct bdevsw *from));
-void	bdevsw_add_generic __P((int bdev, int cdev, struct bdevsw *bdevsw));
-dev_t	chrtoblk __P((dev_t dev));
-int	isdisk __P((dev_t dev, int type));
-int	iskmemdev __P((dev_t dev));
-int	iszerodev __P((dev_t dev));
-void	setconf __P((void));
-#endif /* KERNEL */
-
-#include <machine/conf.h>
-
-#endif /* !_SYS_CONF_H_ */
diff --git a/c/src/libnetworking/sys/domain.h b/c/src/libnetworking/sys/domain.h
deleted file mode 100644
index 2ec8a5fb05..0000000000
--- a/c/src/libnetworking/sys/domain.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)domain.h	8.1 (Berkeley) 6/2/93
- * $Id$
- */
-
-#ifndef _SYS_DOMAIN_H_
-#define _SYS_DOMAIN_H_
-
-/*
- * Structure per communications domain.
- */
-
-/*
- * Forward structure declarations for function prototypes [sic].
- */
-struct	mbuf;
-
-struct	domain {
-	int	dom_family;		/* AF_xxx */
-	char	*dom_name;
-	void	(*dom_init)		/* initialize domain data structures */
-		__P((void));
-	int	(*dom_externalize)	/* externalize access rights */
-		__P((struct mbuf *));
-	void	(*dom_dispose)		/* dispose of internalized rights */
-		__P((struct mbuf *));
-	struct	protosw *dom_protosw, *dom_protoswNPROTOSW;
-	struct	domain *dom_next;
-	int	(*dom_rtattach)		/* initialize routing table */
-		__P((void **, int));
-	int	dom_rtoffset;		/* an arg to rtattach, in bits */
-	int	dom_maxrtkey;		/* for routing layer */
-};
-
-#ifdef KERNEL
-extern struct	domain *domains;
-extern struct	domain localdomain;
-
-#define DOMAIN_SET(name) \
-	DATA_SET(domain_set, name ## domain);
-
-#endif
-
-#endif
diff --git a/c/src/libnetworking/sys/filio.h b/c/src/libnetworking/sys/filio.h
deleted file mode 100644
index b82a649c0f..0000000000
--- a/c/src/libnetworking/sys/filio.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)filio.h	8.1 (Berkeley) 3/28/94
- * $Id$
- */
-
-#ifndef	_SYS_FILIO_H_
-#define	_SYS_FILIO_H_
-
-#include <sys/ioccom.h>
-
-/* Generic file-descriptor ioctl's. */
-#define	FIOCLEX		 _IO('f', 1)		/* set close on exec on fd */
-#define	FIONCLEX	 _IO('f', 2)		/* remove close on exec */
-#define	FIONREAD	_IOR('f', 127, int)	/* get # bytes to read */
-#define	FIONBIO		_IOW('f', 126, int)	/* set/clear non-blocking i/o */
-#define	FIOASYNC	_IOW('f', 125, int)	/* set/clear async i/o */
-#define	FIOSETOWN	_IOW('f', 124, int)	/* set owner */
-#define	FIOGETOWN	_IOR('f', 123, int)	/* get owner */
-
-#endif /* !_SYS_FILIO_H_ */
diff --git a/c/src/libnetworking/sys/ioccom.h b/c/src/libnetworking/sys/ioccom.h
deleted file mode 100644
index 18c4b74741..0000000000
--- a/c/src/libnetworking/sys/ioccom.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)ioccom.h	8.2 (Berkeley) 3/28/94
- * $Id$
- */
-
-#ifndef	_SYS_IOCCOM_H_
-#define	_SYS_IOCCOM_H_
-
-/*
- * Ioctl's have the command encoded in the lower word, and the size of
- * any in or out parameters in the upper word.  The high 3 bits of the
- * upper word are used to encode the in/out status of the parameter.
- */
-#define	IOCPARM_MASK	0x1fff		/* parameter length, at most 13 bits */
-#define	IOCPARM_LEN(x)	(((x) >> 16) & IOCPARM_MASK)
-#define	IOCBASECMD(x)	((x) & ~(IOCPARM_MASK << 16))
-#define	IOCGROUP(x)	(((x) >> 8) & 0xff)
-
-#define	IOCPARM_MAX	PAGE_SIZE		/* max size of ioctl, mult. of PAGE_SIZE */
-#define	IOC_VOID	0x20000000	/* no parameters */
-#define	IOC_OUT		0x40000000	/* copy out parameters */
-#define	IOC_IN		0x80000000	/* copy in parameters */
-#define	IOC_INOUT	(IOC_IN|IOC_OUT)
-#define	IOC_DIRMASK	0xe0000000	/* mask for IN/OUT/VOID */
-
-#define	_IOC(inout,group,num,len) \
-	(inout | ((len & IOCPARM_MASK) << 16) | ((group) << 8) | (num))
-#define	_IO(g,n)	_IOC(IOC_VOID,	(g), (n), 0)
-#define	_IOR(g,n,t)	_IOC(IOC_OUT,	(g), (n), sizeof(t))
-#define	_IOW(g,n,t)	_IOC(IOC_IN,	(g), (n), sizeof(t))
-/* this should be _IORW, but stdio got there first */
-#define	_IOWR(g,n,t)	_IOC(IOC_INOUT,	(g), (n), sizeof(t))
-
-#ifndef KERNEL
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-int	ioctl __P((int, unsigned long, ...));
-__END_DECLS
-
-#endif /* !KERNEL */
-
-#endif /* !_SYS_IOCCOM_H_ */
diff --git a/c/src/libnetworking/sys/ioctl.h b/c/src/libnetworking/sys/ioctl.h
deleted file mode 100644
index e3a69a5a7f..0000000000
--- a/c/src/libnetworking/sys/ioctl.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)ioctl.h	8.6 (Berkeley) 3/28/94
- * $Id$
- */
-
-#ifndef	_SYS_IOCTL_H_
-#define	_SYS_IOCTL_H_
-
-#include <sys/ttycom.h>
-
-/*
- * Pun for SunOS prior to 3.2.  SunOS 3.2 and later support TIOCGWINSZ
- * and TIOCSWINSZ (yes, even 3.2-3.5, the fact that it wasn't documented
- * notwithstanding).
- */
-struct ttysize {
-	unsigned short	ts_lines;
-	unsigned short	ts_cols;
-	unsigned short	ts_xxx;
-	unsigned short	ts_yyy;
-};
-#define	TIOCGSIZE	TIOCGWINSZ
-#define	TIOCSSIZE	TIOCSWINSZ
-
-#include <sys/ioccom.h>
-
-#include <sys/filio.h>
-#include <sys/sockio.h>
-
-#endif /* !_SYS_IOCTL_H_ */
-
-/*
- * Keep outside _SYS_IOCTL_H_
- * Compatibility with old terminal driver
- *
- * Source level -> #define USE_OLD_TTY
- * Kernel level -> options COMPAT_43 or COMPAT_SUNOS
- */
-#if defined(USE_OLD_TTY) || defined(COMPAT_43) || defined(COMPAT_SUNOS)
-#include <sys/ioctl_compat.h>
-#endif
diff --git a/c/src/libnetworking/sys/kernel.h b/c/src/libnetworking/sys/kernel.h
deleted file mode 100644
index 35bce70bd6..0000000000
--- a/c/src/libnetworking/sys/kernel.h
+++ /dev/null
@@ -1,251 +0,0 @@
-/*-
- * Copyright (c) 1995 Terrence R. Lambert
- * All rights reserved.
- *
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)kernel.h	8.3 (Berkeley) 1/21/94
- * $Id$
- */
-
-#ifndef _SYS_KERNEL_H_
-#define _SYS_KERNEL_H_
-
-/* Global variables for the kernel. */
-
-/* 1.1 */
-extern long hostid;
-extern char hostname[MAXHOSTNAMELEN];
-extern int hostnamelen;
-extern char domainname[MAXHOSTNAMELEN];
-extern int domainnamelen;
-extern char kernelname[MAXPATHLEN];
-
-/* 1.2 */
-extern volatile struct timeval mono_time;
-extern struct timeval boottime;
-extern struct timeval runtime;
-/* extern volatile struct timeval time; */
-extern struct timezone tz;			/* XXX */
-
-extern int tick;			/* usec per tick (1000000 / hz) */
-extern int hz;				/* system clock's frequency */
-extern int psratio;			/* ratio: prof / stat */
-extern int stathz;			/* statistics clock's frequency */
-extern int profhz;			/* profiling clock's frequency */
-extern int ticks;
-extern int lbolt;			/* once a second sleep address */
-extern int tickdelta;
-extern long timedelta;
-
-/*
- * The following macros are used to declare global sets of objects, which
- * are collected by the linker into a `struct linker_set' as defined below.
- *
- * NB: the constants defined below must match those defined in
- * ld/ld.h.  Since their calculation requires arithmetic, we
- * can't name them symbolically (e.g., 23 is N_SETT | N_EXT).
- */
-#define MAKE_SET(set, sym, type)
-#define TEXT_SET(set, sym) MAKE_SET(set, sym, 23)
-#define DATA_SET(set, sym) MAKE_SET(set, sym, 25)
-#define BSS_SET(set, sym)  MAKE_SET(set, sym, 27)
-#define ABS_SET(set, sym)  MAKE_SET(set, sym, 21)
-
-
-/*
- * Enumerated types for known system startup interfaces.
- *
- * Startup occurs in ascending numeric order; the list entries are
- * sorted prior to attempting startup to guarantee order.  Items
- * of the same level are arbitrated for order based on the 'order'
- * element.
- *
- * These numbers are arbitrary and are chosen ONLY for ordering; the
- * enumeration values are explicit rather than implicit to provide
- * for binary compatibility with inserted elements.
- *
- * The SI_SUB_RUN_SCHEDULER value must have the highest lexical value.
- *
- * The SI_SUB_CONSOLE and SI_SUB_SWAP values represent values used by
- * the BSD 4.4Lite but not by FreeBSD; they are maintained in dependent
- * order to support porting.
- *
- * The SI_SUB_PROTO_BEGIN and SI_SUB_PROTO_END bracket a range of
- * initializations to take place at splimp().  This is a historical
- * wart that should be removed -- probably running everything at
- * splimp() until the first init that doesn't want it is the correct
- * fix.  They are currently present to ensure historical behavior.
- */
-enum sysinit_sub_id {
-	SI_SUB_DUMMY		= 0x00000000,	/* not executed; for linker*/
-	SI_SUB_CONSOLE		= 0x08000000,	/* console*/
-	SI_SUB_COPYRIGHT	= 0x08000001,	/* first use of console*/
-	SI_SUB_VM		= 0x10000000,	/* virtual memory system init*/
-	SI_SUB_KMEM		= 0x18000000,	/* kernel memory*/
-	SI_SUB_CPU		= 0x20000000,	/* CPU resource(s)*/
-	SI_SUB_DEVFS		= 0x22000000,	/* get DEVFS ready */
-	SI_SUB_DRIVERS		= 0x23000000,	/* Let Drivers initialize */
-	SI_SUB_CONFIGURE	= 0x24000000,	/* Configure devices */
-	SI_SUB_INTRINSIC	= 0x28000000,	/* proc 0*/
-	SI_SUB_RUN_QUEUE	= 0x30000000,	/* the run queue*/
-	SI_SUB_VM_CONF		= 0x38000000,	/* config VM, set limits*/
-	SI_SUB_VFS		= 0x40000000,	/* virtual file system*/
-	SI_SUB_CLOCKS		= 0x48000000,	/* real time and stat clocks*/
-	SI_SUB_MBUF		= 0x50000000,	/* mbufs*/
-	SI_SUB_CLIST		= 0x58000000,	/* clists*/
-	SI_SUB_SYSV_SHM		= 0x64000000,	/* System V shared memory*/
-	SI_SUB_SYSV_SEM		= 0x68000000,	/* System V semaphores*/
-	SI_SUB_SYSV_MSG		= 0x6C000000,	/* System V message queues*/
-	SI_SUB_PSEUDO		= 0x70000000,	/* pseudo devices*/
-	SI_SUB_PROTO_BEGIN	= 0x80000000,	/* XXX: set splimp (kludge)*/
-	SI_SUB_PROTO_IF		= 0x84000000,	/* interfaces*/
-	SI_SUB_PROTO_DOMAIN	= 0x88000000,	/* domains (address families?)*/
-	SI_SUB_PROTO_END	= 0x8fffffff,	/* XXX: set splx (kludge)*/
-	SI_SUB_KPROF		= 0x90000000,	/* kernel profiling*/
-	SI_SUB_KICK_SCHEDULER	= 0xa0000000,	/* start the timeout events*/
-	SI_SUB_ROOT		= 0xb0000000,	/* root mount*/
-	SI_SUB_ROOT_FDTAB	= 0xb8000000,	/* root vnode in fd table...*/
-	SI_SUB_SWAP		= 0xc0000000,	/* swap*/
-	SI_SUB_INTRINSIC_POST	= 0xd0000000,	/* proc 0 cleanup*/
-	SI_SUB_KTHREAD_INIT	= 0xe0000000,	/* init process*/
-	SI_SUB_KTHREAD_PAGE	= 0xe4000000,	/* pageout daemon*/
-	SI_SUB_KTHREAD_VM	= 0xe8000000,	/* vm daemon*/
-	SI_SUB_KTHREAD_UPDATE	= 0xec000000,	/* update daemon*/
-	SI_SUB_RUN_SCHEDULER	= 0xffffffff	/* scheduler: no return*/
-};
-
-
-/*
- * Some enumerated orders; "ANY" sorts last.
- */
-enum sysinit_elem_order {
-	SI_ORDER_FIRST		= 0x00000000,	/* first*/
-	SI_ORDER_SECOND		= 0x00000001,	/* second*/
-	SI_ORDER_THIRD		= 0x00000002,	/* third*/
-	SI_ORDER_MIDDLE		= 0x10000000,	/* somewhere in the middle */
-	SI_ORDER_ANY		= 0xffffffff	/* last*/
-};
-
-
-/*
- * System initialization call types; currently two are supported... one
- * to do a simple function call and one to cause a process to be started
- * by the kernel on the callers behalf.
- */
-typedef enum sysinit_elem_type {
-	SI_TYPE_DEFAULT		= 0x00000000,	/* No special processing*/
-	SI_TYPE_KTHREAD		= 0x00000001	/* start kernel thread*/
-} si_elem_t;
-
-
-/*
- * A system initialization call instance
- *
- * The subsystem
- */
-struct sysinit {
-	unsigned int	subsystem;		/* subsystem identifier*/
-	unsigned int	order;			/* init order within subsystem*/
-	void		(*func) __P((void *));	/* init function*/
-	void		*udata;			/* multiplexer/argument */
-	si_elem_t	type;			/* sysinit_elem_type*/
-};
-
-
-/*
- * Default: no special processing
- */
-#define	SYSINIT(uniquifier, subsystem, order, func, ident)	
-
-/*
- * Call 'fork()' before calling '(*func)(ident)';
- * for making a kernel 'thread' (or builtin process.)
- */
-#define	SYSINIT_KT(uniquifier, subsystem, order, func, ident)
-
-
-/*
- * A kernel process descriptor; used to start "internal" daemons
- *
- * Note: global_procpp may be NULL for no global save area
- */
-struct kproc_desc {
-	char		*arg0;			/* arg 0 (for 'ps' listing)*/
-	void		(*func) __P((void));	/* "main" for kernel process*/
-	struct proc	**global_procpp;	/* ptr to proc ptr save area*/
-};
-
-void	kproc_start __P((void *udata));
-
-#ifdef PSEUDO_LKM
-#include <sys/conf.h>
-#include <sys/exec.h>
-#include <sys/sysent.h>
-#include <sys/lkm.h>
-
-#define PSEUDO_SET(init, name) \
-	extern struct linker_set MODVNOPS; \
-	MOD_MISC(name); \
-	static int \
-	name ## _load(struct lkm_table *lkmtp, int cmd) \
-		{ init((void *)NULL /* XXX unused (?) */); return 0; } \
-	static int \
-	name ## _unload(struct lkm_table *lkmtp, int cmd) \
-		{ return EINVAL; } \
-	int \
-	name ## _mod(struct lkm_table *lkmtp, int cmd, int ver) { \
-		DISPATCH(lkmtp, cmd, ver, name ## _load, name ## _unload, \
-			 lkm_nullcmd); }
-#else /* PSEUDO_LKM */
-
-/*
- * Compatibility.  To be deprecated after LKM is updated.
- */
-#define	PSEUDO_SET(sym, name)	SYSINIT(ps, SI_SUB_PSEUDO, SI_ORDER_ANY, sym, 0)
-
-#endif /* PSEUDO_LKM */
-
-struct linker_set {
-	int		ls_length;
-	const void	*ls_items[1];		/* really ls_length of them,
-						 * trailing NULL */
-};
-
-extern struct linker_set execsw_set;
-
-#endif /* !_SYS_KERNEL_H_*/
diff --git a/c/src/libnetworking/sys/libkern.h b/c/src/libnetworking/sys/libkern.h
deleted file mode 100644
index c01e35b273..0000000000
--- a/c/src/libnetworking/sys/libkern.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)libkern.h	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#ifndef _SYS_LIBKERN_H_
-#define	_SYS_LIBKERN_H_
-
-#include <sys/cdefs.h>
-#include <sys/types.h>
-
-/* BCD conversions. */
-extern u_char const	bcd2bin_data[];
-extern u_char const	bin2bcd_data[];
-extern char const	hex2ascii_data[];
-
-#define	bcd2bin(bcd)	(bcd2bin_data[bcd])
-#define	bin2bcd(bin)	(bin2bcd_data[bin])
-#define	hex2ascii(hex)	(hex2ascii_data[hex])
-
-static __inline int imax(int a, int b) { return (a > b ? a : b); }
-static __inline int imin(int a, int b) { return (a < b ? a : b); }
-static __inline long lmax(long a, long b) { return (a > b ? a : b); }
-static __inline long lmin(long a, long b) { return (a < b ? a : b); }
-static __inline u_int max(u_int a, u_int b) { return (a > b ? a : b); }
-static __inline u_int min(u_int a, u_int b) { return (a < b ? a : b); }
-static __inline quad_t qmax(quad_t a, quad_t b) { return (a > b ? a : b); }
-static __inline quad_t qmin(quad_t a, quad_t b) { return (a < b ? a : b); }
-static __inline u_long ulmax(u_long a, u_long b) { return (a > b ? a : b); }
-static __inline u_long ulmin(u_long a, u_long b) { return (a < b ? a : b); }
-
-/* Prototypes for non-quad routines. */
-int	 bcmp __P((const void *, const void *, size_t));
-#ifndef HAVE_INLINE_FFS
-int	 ffs __P((int));
-#endif
-#ifndef	HAVE_INLINE_FLS
-int	 fls __P((int));
-#endif
-int	 locc __P((int, char *, u_int));
-void	 qsort __P((void *base, size_t nmemb, size_t size,
-		    int (*compar)(const void *, const void *)));
-u_long	 random __P((void));
-char	*index __P((const char *, int));
-char	*rindex __P((const char *, int));
-int	 scanc __P((u_int, const u_char *, const u_char *, int));
-int	 skpc __P((int, int, char *));
-void	 srandom __P((u_long));
-char	*strcat __P((char *, const char *));
-int	 strcmp __P((const char *, const char *));
-char	*strdup __P((const char *s));
-char	*strcpy __P((char *, const char *));
-size_t	 strlen __P((const char *));
-int	 strncmp __P((const char *, const char *, size_t));
-char	*strncpy __P((char *, const char *, size_t));
-char	*strerror __P((int errnum));
-
-#endif /* !_SYS_LIBKERN_H_ */
diff --git a/c/src/libnetworking/sys/malloc.h b/c/src/libnetworking/sys/malloc.h
deleted file mode 100644
index ec85c1814d..0000000000
--- a/c/src/libnetworking/sys/malloc.h
+++ /dev/null
@@ -1,355 +0,0 @@
-/*
- * Copyright (c) 1987, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)malloc.h	8.5 (Berkeley) 5/3/95
- * $Id$
- */
-
-#ifndef _SYS_MALLOC_H_
-#define	_SYS_MALLOC_H_
-
-#include <rtems/rtems_bsdnet_internal.h>  /* Ensure we get RTEMS malloc hooks */
-#define KMEMSTATS
-
-/*
- * flags to malloc
- */
-#define	M_WAITOK	0x0000
-#define	M_NOWAIT	0x0001
-#define M_KERNEL	0x0002
-
-/*
- * Types of memory to be allocated
- */
-#define	M_FREE		0	/* should be on free list */
-#define	M_MBUF		1	/* mbuf */
-#define	M_DEVBUF	2	/* device driver memory */
-#define	M_SOCKET	3	/* socket structure */
-#define	M_PCB		4	/* protocol control block */
-#define	M_RTABLE	5	/* routing tables */
-#define	M_HTABLE	6	/* IMP host tables */
-#define	M_FTABLE	7	/* fragment reassembly header */
-#define	M_ZOMBIE	8	/* zombie proc status */
-#define	M_IFADDR	9	/* interface address */
-#define	M_SOOPTS	10	/* socket options */
-#define	M_SONAME	11	/* socket name */
-#define	M_NAMEI		12	/* namei path name buffer */
-#define	M_GPROF		13	/* kernel profiling buffer */
-#define	M_IOCTLOPS	14	/* ioctl data buffer */
-#define	M_MAPMEM	15	/* mapped memory descriptors */
-#define	M_CRED		16	/* credentials */
-#define	M_PGRP		17	/* process group header */
-#define	M_SESSION	18	/* session header */
-#define	M_IOV		19	/* large iov's */
-#define	M_MOUNT		20	/* vfs mount struct */
-#define	M_FHANDLE	21	/* network file handle */
-#define	M_NFSREQ	22	/* NFS request header */
-#define	M_NFSMNT	23	/* NFS mount structure */
-#define	M_NFSNODE	24	/* NFS vnode private part */
-#define	M_VNODE		25	/* Dynamically allocated vnodes */
-#define	M_CACHE		26	/* Dynamically allocated cache entries */
-#define	M_DQUOT		27	/* UFS quota entries */
-#define	M_UFSMNT	28	/* UFS mount structure */
-#define	M_SHM		29	/* SVID compatible shared memory segments */
-#define	M_VMMAP		30	/* VM map structures */
-#define	M_VMMAPENT	31	/* VM map entry structures */
-#define	M_VMOBJ		32	/* VM object structure */
-#define	M_VMOBJHASH	33	/* VM object hash structure */
-#define	M_VMPMAP	34	/* VM pmap */
-#define	M_VMPVENT	35	/* VM phys-virt mapping entry */
-#define	M_VMPAGER	36	/* XXX: VM pager struct */
-#define	M_VMPGDATA	37	/* XXX: VM pager private data */
-#define	M_FILE		38	/* Open file structure */
-#define	M_FILEDESC	39	/* Open file descriptor table */
-#define	M_LOCKF		40	/* Byte-range locking structures */
-#define	M_PROC		41	/* Proc structures */
-#define	M_SUBPROC	42	/* Proc sub-structures */
-#define	M_SEGMENT	43	/* Segment for LFS */
-#define	M_LFSNODE	44	/* LFS vnode private part */
-#define	M_FFSNODE	45	/* FFS vnode private part */
-#define	M_MFSNODE	46	/* MFS vnode private part */
-#define	M_NQLEASE	47	/* Nqnfs lease */
-#define	M_NQMHOST	48	/* Nqnfs host address table */
-#define	M_NETADDR	49	/* Export host address structure */
-#define	M_NFSSVC	50	/* Nfs server structure */
-#define	M_NFSUID	51	/* Nfs uid mapping structure */
-#define	M_NFSD		52	/* Nfs server daemon structure */
-#define	M_IPMOPTS	53	/* internet multicast options */
-#define	M_IPMADDR	54	/* internet multicast address */
-#define	M_IFMADDR	55	/* link-level multicast address */
-#define	M_MRTABLE	56	/* multicast routing tables */
-#define M_ISOFSMNT	57	/* ISOFS mount structure */
-#define M_ISOFSNODE	58	/* ISOFS vnode private part */
-#define M_NFSRVDESC	59	/* NFS server socket descriptor */
-#define M_NFSDIROFF	60	/* NFS directory offset data */
-#define M_NFSBIGFH	61	/* NFS version 3 file handle */
-#define M_MSDOSFSMNT	67	/* MSDOSFS mount structure */
-#define M_MSDOSFSNODE	68	/* MSDOSFS vnode private part */
-#define M_MSDOSFSFAT	69	/* MSDOSFS file allocation table */
-#define M_DEVFSMNT	70	/* DEVFS mount structure */
-#define M_DEVFSBACK	71	/* DEVFS Back node */
-#define M_DEVFSFRONT	72	/* DEVFS Front node */
-#define M_DEVFSNODE	73	/* DEVFS node */
-#define	M_TEMP		74	/* misc temporary data buffers */
-#define M_TTYS		75	/* tty data structures */
-#define M_GZIP		76	/* Gzip trees */
-#define M_IPFW		77	/* IpFw/IpAcct chain's */
-#define M_DEVL		78	/* isa_device lists in userconfig() */
-#define M_PKTCLASS	79	/* structures used in packet classifier */
-#define	M_SYSCTL	80	/* sysctl internal magic */
-#define	M_SECA		81	/* security associations, key management */
-#define	M_BIOBUF	82	/* BIO buffer */
-#define	M_KTRACE	83	/* KTRACE */
-#define	M_SELECT	84	/* select() buffer */
-#define M_CFS		85	/* Coda */
-#define	M_LAST		86	/* Must be last type + 1 */
-
-#define INITKMEMNAMES { \
-	"free",		/* 0 M_FREE */ \
-	"mbuf",		/* 1 M_MBUF */ \
-	"devbuf",	/* 2 M_DEVBUF */ \
-	"socket",	/* 3 M_SOCKET */ \
-	"pcb",		/* 4 M_PCB */ \
-	"routetbl",	/* 5 M_RTABLE */ \
-	"hosttbl",	/* 6 M_HTABLE */ \
-	"fragtbl",	/* 7 M_FTABLE */ \
-	"zombie",	/* 8 M_ZOMBIE */ \
-	"ifaddr",	/* 9 M_IFADDR */ \
-	"soopts",	/* 10 M_SOOPTS */ \
-	"soname",	/* 11 M_SONAME */ \
-	"namei",	/* 12 M_NAMEI */ \
-	"gprof",	/* 13 M_GPROF */ \
-	"ioctlops",	/* 14 M_IOCTLOPS */ \
-	"mapmem",	/* 15 M_MAPMEM */ \
-	"cred",		/* 16 M_CRED */ \
-	"pgrp",		/* 17 M_PGRP */ \
-	"session",	/* 18 M_SESSION */ \
-	"iov",		/* 19 M_IOV */ \
-	"mount",	/* 20 M_MOUNT */ \
-	"fhandle",	/* 21 M_FHANDLE */ \
-	"NFS req",	/* 22 M_NFSREQ */ \
-	"NFS mount",	/* 23 M_NFSMNT */ \
-	"NFS node",	/* 24 M_NFSNODE */ \
-	"vnodes",	/* 25 M_VNODE */ \
-	"namecache",	/* 26 M_CACHE */ \
-	"UFS quota",	/* 27 M_DQUOT */ \
-	"UFS mount",	/* 28 M_UFSMNT */ \
-	"shm",		/* 29 M_SHM */ \
-	"VM map",	/* 30 M_VMMAP */ \
-	"VM mapent",	/* 31 M_VMMAPENT */ \
-	"VM object",	/* 32 M_VMOBJ */ \
-	"VM objhash",	/* 33 M_VMOBJHASH */ \
-	"VM pmap",	/* 34 M_VMPMAP */ \
-	"VM pvmap",	/* 35 M_VMPVENT */ \
-	"VM pager",	/* 36 M_VMPAGER */ \
-	"VM pgdata",	/* 37 M_VMPGDATA */ \
-	"file",		/* 38 M_FILE */ \
-	"file desc",	/* 39 M_FILEDESC */ \
-	"lockf",	/* 40 M_LOCKF */ \
-	"proc",		/* 41 M_PROC */ \
-	"subproc",	/* 42 M_SUBPROC */ \
-	"LFS segment",	/* 43 M_SEGMENT */ \
-	"LFS node",	/* 44 M_LFSNODE */ \
-	"FFS node",	/* 45 M_FFSNODE */ \
-	"MFS node",	/* 46 M_MFSNODE */ \
-	"NQNFS Lease",	/* 47 M_NQLEASE */ \
-	"NQNFS Host",	/* 48 M_NQMHOST */ \
-	"Export Host",	/* 49 M_NETADDR */ \
-	"NFS srvsock",	/* 50 M_NFSSVC */ \
-	"NFS uid",	/* 51 M_NFSUID */ \
-	"NFS daemon",	/* 52 M_NFSD */ \
-	"ip_moptions",	/* 53 M_IPMOPTS */ \
-	"in_multi",	/* 54 M_IPMADDR */ \
-	"ether_multi",	/* 55 M_IFMADDR */ \
-	"mrt",		/* 56 M_MRTABLE */ \
-	"ISOFS mount",	/* 57 M_ISOFSMNT */ \
-	"ISOFS node",	/* 58 M_ISOFSNODE */ \
-	"NFSV3 srvdesc",/* 59 M_NFSRVDESC */ \
-	"NFSV3 diroff",	/* 60 M_NFSDIROFF */ \
-	"NFSV3 bigfh",	/* 61 M_NFSBIGFH */ \
-	NULL, \
-	NULL, NULL, NULL, NULL, \
-	"MSDOSFS mount",/* 67 M_MSDOSFSMNT */ \
-	"MSDOSFS node",	/* 68 M_MSDOSFSNODE */ \
-	"MSDOSFS FAT",  /* 69 M_MSDOSFSFAR */ \
-	"DEVFS mount",	/* 70 M_DEVFSMNT */ \
-	"DEVFS back",	/* 71 M_DEVFSBACK */ \
-	"DEVFS front",	/* 72 M_DEVFSFRONT */ \
-	"DEVFS node",	/* 73 M_DEVFSNODE */ \
-	"temp",		/* 74 M_TEMP */ \
-	"ttys",		/* 75 M_TTYS */ \
-	"Gzip trees",	/* 76 M_GZIP */ \
-	"IpFw/IpAcct",	/* 77 M_IPFW */ \
-	"isa_devlist",	/* 78 M_DEVL */ \
-	"PktClass",	/* 79 M_PKTCLASS */ \
-	"sysctl",	/* 80 M_SYSCTL */ \
-	"key mgmt",	/* 81 M_SECA */ \
-	"BIO buffer",	/* 82 M_BIOBUF */ \
-	"KTRACE",	/* 83 M_KTRACE */ \
-	"select",	/* 84 M_SELECT */ \
-	"Coda",		/* 85 M_CFS */ \
-}
-
-struct kmemstats {
-	long	ks_inuse;	/* # of packets of this type currently in use */
-	long	ks_calls;	/* total packets of this type ever allocated */
-	long 	ks_memuse;	/* total memory held in bytes */
-	u_short	ks_limblocks;	/* number of times blocked for hitting limit */
-	u_short	ks_mapblocks;	/* number of times blocked for kernel map */
-	long	ks_maxused;	/* maximum number ever used */
-	long	ks_limit;	/* most that are allowed to exist */
-	long	ks_size;	/* sizes of this thing that are allocated */
-	long	ks_spare;
-};
-
-/*
- * Array of descriptors that describe the contents of each page
- */
-struct kmemusage {
-	short ku_indx;		/* bucket index */
-	union {
-		u_short freecnt;/* for small allocations, free pieces in page */
-		u_short pagecnt;/* for large allocations, pages alloced */
-	} ku_un;
-};
-#define ku_freecnt ku_un.freecnt
-#define ku_pagecnt ku_un.pagecnt
-
-/*
- * Set of buckets for each size of memory block that is retained
- */
-struct kmembuckets {
-	caddr_t kb_next;	/* list of free blocks */
-	caddr_t kb_last;	/* last free block */
-	long	kb_calls;	/* total calls to allocate this size */
-	long	kb_total;	/* total number of blocks allocated */
-	long	kb_totalfree;	/* # of free elements in this bucket */
-	long	kb_elmpercl;	/* # of elements in this sized allocation */
-	long	kb_highwat;	/* high water mark */
-	long	kb_couldfree;	/* over high water mark and could free */
-};
-
-#ifdef KERNEL
-#define	MINALLOCSIZE	(1 << MINBUCKET)
-#define BUCKETINDX(size) \
-	((size) <= (MINALLOCSIZE * 128) \
-		? (size) <= (MINALLOCSIZE * 8) \
-			? (size) <= (MINALLOCSIZE * 2) \
-				? (size) <= (MINALLOCSIZE * 1) \
-					? (MINBUCKET + 0) \
-					: (MINBUCKET + 1) \
-				: (size) <= (MINALLOCSIZE * 4) \
-					? (MINBUCKET + 2) \
-					: (MINBUCKET + 3) \
-			: (size) <= (MINALLOCSIZE* 32) \
-				? (size) <= (MINALLOCSIZE * 16) \
-					? (MINBUCKET + 4) \
-					: (MINBUCKET + 5) \
-				: (size) <= (MINALLOCSIZE * 64) \
-					? (MINBUCKET + 6) \
-					: (MINBUCKET + 7) \
-		: (size) <= (MINALLOCSIZE * 2048) \
-			? (size) <= (MINALLOCSIZE * 512) \
-				? (size) <= (MINALLOCSIZE * 256) \
-					? (MINBUCKET + 8) \
-					: (MINBUCKET + 9) \
-				: (size) <= (MINALLOCSIZE * 1024) \
-					? (MINBUCKET + 10) \
-					: (MINBUCKET + 11) \
-			: (size) <= (MINALLOCSIZE * 8192) \
-				? (size) <= (MINALLOCSIZE * 4096) \
-					? (MINBUCKET + 12) \
-					: (MINBUCKET + 13) \
-				: (size) <= (MINALLOCSIZE * 16384) \
-					? (MINBUCKET + 14) \
-					: (MINBUCKET + 15))
-
-/*
- * Turn virtual addresses into kmem map indices
- */
-#define kmemxtob(alloc)	(kmembase + (alloc) * PAGE_SIZE)
-#define btokmemx(addr)	(((caddr_t)(addr) - kmembase) / PAGE_SIZE)
-#define btokup(addr)	(&kmemusage[(caddr_t)(addr) - kmembase >> PAGE_SHIFT])
-
-/*
- * Macro versions for the usual cases of malloc/free
- */
-#if defined(KMEMSTATS) || defined(DIAGNOSTIC)
-#define	MALLOC(space, cast, size, type, flags) \
-	(space) = (cast)malloc((u_long)(size), type, flags)
-#define FREE(addr, type) free((addr), type)
-
-#else /* do not collect statistics */
-#define	MALLOC(space, cast, size, type, flags) { \
-	register struct kmembuckets *kbp = &bucket[BUCKETINDX(size)]; \
-	long s = splimp(); \
-	if (kbp->kb_next == NULL) { \
-		(space) = (cast)malloc((u_long)(size), type, flags); \
-	} else { \
-		(space) = (cast)kbp->kb_next; \
-		kbp->kb_next = *(caddr_t *)(space); \
-	} \
-	splx(s); \
-}
-
-#define FREE(addr, type) { \
-	register struct kmembuckets *kbp; \
-	register struct kmemusage *kup = btokup(addr); \
-	long s = splimp(); \
-	if (1 << kup->ku_indx > MAXALLOCSAVE) { \
-		free((addr), type); \
-	} else { \
-		kbp = &bucket[kup->ku_indx]; \
-		if (kbp->kb_next == NULL) \
-			kbp->kb_next = (caddr_t)(addr); \
-		else \
-			*(caddr_t *)(kbp->kb_last) = (caddr_t)(addr); \
-		*(caddr_t *)(addr) = NULL; \
-		kbp->kb_last = (caddr_t)(addr); \
-	} \
-	splx(s); \
-}
-#endif /* do not collect statistics */
-
-extern struct kmemstats kmemstats[];
-extern struct kmemusage *kmemusage;
-extern char *kmembase;
-extern struct kmembuckets bucket[];
-
-void	*contigmalloc __P((unsigned long size, int type, int flags,
-			   unsigned long low, unsigned long high,
-			   unsigned long alignment, unsigned long boundary));
-void	free __P((void *addr, int type));
-void	*malloc __P((unsigned long size, int type, int flags));
-#endif /* KERNEL */
-
-#endif /* !_SYS_MALLOC_H_ */
diff --git a/c/src/libnetworking/sys/mbuf.h b/c/src/libnetworking/sys/mbuf.h
deleted file mode 100644
index b380b3fca3..0000000000
--- a/c/src/libnetworking/sys/mbuf.h
+++ /dev/null
@@ -1,439 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)mbuf.h	8.5 (Berkeley) 2/19/95
- * $Id$
- */
-
-#ifndef _SYS_MBUF_H_
-#define _SYS_MBUF_H_
-
-#ifndef M_WAITOK
-#include <sys/malloc.h>
-#endif
-
-/*
- * Mbufs are of a single size, MSIZE (machine/machparam.h), which
- * includes overhead.  An mbuf may add a single "mbuf cluster" of size
- * MCLBYTES (also in machine/machparam.h), which has no additional overhead
- * and is used instead of the internal data area; this is done when
- * at least MINCLSIZE of data must be stored.
- */
-
-#define	MLEN		(MSIZE - sizeof(struct m_hdr))	/* normal data len */
-#define	MHLEN		(MLEN - sizeof(struct pkthdr))	/* data len w/pkthdr */
-
-#define	MINCLSIZE	(MHLEN + MLEN)	/* smallest amount to put in cluster */
-#define	M_MAXCOMPRESS	(MHLEN / 2)	/* max amount to copy for compression */
-
-/*
- * Macros for type conversion
- * mtod(m,t) -	convert mbuf pointer to data pointer of correct type
- * dtom(x) -	convert data pointer within mbuf to mbuf pointer (XXX)
- * mtocl(x) -	convert pointer within cluster to cluster index #
- * cltom(x) -	convert cluster # to ptr to beginning of cluster
- */
-#define	mtod(m,t)	((t)((m)->m_data))
-#define	dtom(x)		((struct mbuf *)((long)(x) & ~(MSIZE-1)))
-#define	mtocl(x)	(((u_long)(x) - (u_long)mbutl) >> MCLSHIFT)
-#define	cltom(x)	((caddr_t)((u_long)mbutl + ((u_long)(x) << MCLSHIFT)))
-
-/* header at beginning of each mbuf: */
-struct m_hdr {
-	struct	mbuf *mh_next;		/* next buffer in chain */
-	struct	mbuf *mh_nextpkt;	/* next chain in queue/record */
-	caddr_t	mh_data;		/* location of data */
-	int	mh_len;			/* amount of data in this mbuf */
-	short	mh_type;		/* type of data in this mbuf */
-	short	mh_flags;		/* flags; see below */
-};
-
-/* record/packet header in first mbuf of chain; valid if M_PKTHDR set */
-struct	pkthdr {
-	struct	ifnet *rcvif;		/* rcv interface */
-	int	len;			/* total packet length */
-};
-
-/* description of external storage mapped into mbuf, valid if M_EXT set */
-struct m_ext {
-	caddr_t	ext_buf;		/* start of buffer */
-	void	(*ext_free)		/* free routine if not the usual */
-		__P((caddr_t, u_int));
-	u_int	ext_size;		/* size of buffer, for ext_free */
-	void	(*ext_ref)		/* add a reference to the ext object */
-		__P((caddr_t, u_int));
-};
-
-struct mbuf {
-	struct	m_hdr m_hdr;
-	union {
-		struct {
-			struct	pkthdr MH_pkthdr;	/* M_PKTHDR set */
-			union {
-				struct	m_ext MH_ext;	/* M_EXT set */
-				char	MH_databuf[MHLEN];
-			} MH_dat;
-		} MH;
-		char	M_databuf[MLEN];		/* !M_PKTHDR, !M_EXT */
-	} M_dat;
-};
-#define	m_next		m_hdr.mh_next
-#define	m_len		m_hdr.mh_len
-#define	m_data		m_hdr.mh_data
-#define	m_type		m_hdr.mh_type
-#define	m_flags		m_hdr.mh_flags
-#define	m_nextpkt	m_hdr.mh_nextpkt
-#define	m_act		m_nextpkt
-#define	m_pkthdr	M_dat.MH.MH_pkthdr
-#define	m_ext		M_dat.MH.MH_dat.MH_ext
-#define	m_pktdat	M_dat.MH.MH_dat.MH_databuf
-#define	m_dat		M_dat.M_databuf
-
-/* mbuf flags */
-#define	M_EXT		0x0001	/* has associated external storage */
-#define	M_PKTHDR	0x0002	/* start of record */
-#define	M_EOR		0x0004	/* end of record */
-#define	M_PROTO1	0x0008	/* protocol-specific */
-
-/* mbuf pkthdr flags, also in m_flags */
-#define	M_BCAST		0x0100	/* send/received as link-level broadcast */
-#define	M_MCAST		0x0200	/* send/received as link-level multicast */
-
-/* flags copied when copying m_pkthdr */
-#define	M_COPYFLAGS	(M_PKTHDR|M_EOR|M_PROTO1|M_BCAST|M_MCAST)
-
-/* mbuf types */
-#define	MT_FREE		0	/* should be on free list */
-#define	MT_DATA		1	/* dynamic (data) allocation */
-#define	MT_HEADER	2	/* packet header */
-#define	MT_SOCKET	3	/* socket structure */
-#define	MT_PCB		4	/* protocol control block */
-#define	MT_RTABLE	5	/* routing tables */
-#define	MT_HTABLE	6	/* IMP host tables */
-#define	MT_ATABLE	7	/* address resolution tables */
-#define	MT_SONAME	8	/* socket name */
-#define	MT_SOOPTS	10	/* socket options */
-#define	MT_FTABLE	11	/* fragment reassembly header */
-#define	MT_RIGHTS	12	/* access rights */
-#define	MT_IFADDR	13	/* interface address */
-#define MT_CONTROL	14	/* extra-data protocol message */
-#define MT_OOBDATA	15	/* expedited data  */
-
-/* flags to m_get/MGET */
-#define	M_DONTWAIT	M_NOWAIT
-#define	M_WAIT		M_WAITOK
-
-/* Freelists:
- *
- * Normal mbuf clusters are normally treated as character arrays
- * after allocation, but use the first word of the buffer as a free list
- * pointer while on the free list.
- */
-union mcluster {
-	union	mcluster *mcl_next;
-	char	mcl_buf[MCLBYTES];
-};
-
-/*
- * mbuf utility macros:
- *
- *	MBUFLOCK(code)
- * prevents a section of code from from being interrupted by network
- * drivers.
- */
-#define	MBUFLOCK(code) \
-	{ int ms = splimp(); \
-	  { code } \
-	  splx(ms); \
-	}
-
-/*
- * mbuf allocation/deallocation macros:
- *
- *	MGET(struct mbuf *m, int how, int type)
- * allocates an mbuf and initializes it to contain internal data.
- *
- *	MGETHDR(struct mbuf *m, int how, int type)
- * allocates an mbuf and initializes it to contain a packet header
- * and internal data.
- */
-#define	MGET(m, how, type) { \
-	  int _ms = splimp(); \
-	  if (mmbfree == 0) \
-		(void)m_mballoc(1, (how)); \
-	  if (((m) = mmbfree) != 0) { \
-		mmbfree = (m)->m_next; \
-		mbstat.m_mtypes[MT_FREE]--; \
-		(m)->m_type = (type); \
-		mbstat.m_mtypes[type]++; \
-		(m)->m_next = (struct mbuf *)NULL; \
-		(m)->m_nextpkt = (struct mbuf *)NULL; \
-		(m)->m_data = (m)->m_dat; \
-		(m)->m_flags = 0; \
-		splx(_ms); \
-	} else { \
-		splx(_ms); \
-		(m) = m_retry((how), (type)); \
-	} \
-}
-
-#define	MGETHDR(m, how, type) { \
-	  int _ms = splimp(); \
-	  if (mmbfree == 0) \
-		(void)m_mballoc(1, (how)); \
-	  if (((m) = mmbfree) != 0) { \
-		mmbfree = (m)->m_next; \
-		mbstat.m_mtypes[MT_FREE]--; \
-		(m)->m_type = (type); \
-		mbstat.m_mtypes[type]++; \
-		(m)->m_next = (struct mbuf *)NULL; \
-		(m)->m_nextpkt = (struct mbuf *)NULL; \
-		(m)->m_data = (m)->m_pktdat; \
-		(m)->m_flags = M_PKTHDR; \
-		splx(_ms); \
-	} else { \
-		splx(_ms); \
-		(m) = m_retryhdr((how), (type)); \
-	} \
-}
-
-/*
- * Mbuf cluster macros.
- * MCLALLOC(caddr_t p, int how) allocates an mbuf cluster.
- * MCLGET adds such clusters to a normal mbuf;
- * the flag M_EXT is set upon success.
- * MCLFREE releases a reference to a cluster allocated by MCLALLOC,
- * freeing the cluster if the reference count has reached 0.
- */
-#define	MCLALLOC(p, how) \
-	MBUFLOCK( \
-	  if (mclfree == 0) \
-		(void)m_clalloc(1, (how)); \
-	  if (((p) = (caddr_t)mclfree) != 0) { \
-		++mclrefcnt[mtocl(p)]; \
-		mbstat.m_clfree--; \
-		mclfree = ((union mcluster *)(p))->mcl_next; \
-	  } \
-	)
-
-#define	MCLGET(m, how) \
-	{ MCLALLOC((m)->m_ext.ext_buf, (how)); \
-	  if ((m)->m_ext.ext_buf != NULL) { \
-		(m)->m_data = (m)->m_ext.ext_buf; \
-		(m)->m_flags |= M_EXT; \
-		(m)->m_ext.ext_free = NULL;  \
-		(m)->m_ext.ext_ref = NULL;  \
-		(m)->m_ext.ext_size = MCLBYTES;  \
-	  } \
-	}
-
-#define	MCLFREE(p) \
-	MBUFLOCK ( \
-	  if (--mclrefcnt[mtocl(p)] == 0) { \
-		((union mcluster *)(p))->mcl_next = mclfree; \
-		mclfree = (union mcluster *)(p); \
-		mbstat.m_clfree++; \
-	  } \
-	)
-
-/*
- * MFREE(struct mbuf *m, struct mbuf *n)
- * Free a single mbuf and associated external storage.
- * Place the successor, if any, in n.
- */
-#define	MFREE(m, n) \
-	MBUFLOCK(  \
-	  mbstat.m_mtypes[(m)->m_type]--; \
-	  if ((m)->m_flags & M_EXT) { \
-		if ((m)->m_ext.ext_free) \
-			(*((m)->m_ext.ext_free))((m)->m_ext.ext_buf, \
-			    (m)->m_ext.ext_size); \
-		else { \
-			char *p = (m)->m_ext.ext_buf; \
-			if (--mclrefcnt[mtocl(p)] == 0) { \
-				((union mcluster *)(p))->mcl_next = mclfree; \
-				mclfree = (union mcluster *)(p); \
-				mbstat.m_clfree++; \
-			} \
-		} \
-	  } \
-	  (n) = (m)->m_next; \
-	  (m)->m_type = MT_FREE; \
-	  mbstat.m_mtypes[MT_FREE]++; \
-	  (m)->m_next = mmbfree; \
-	  mmbfree = (m); \
-	)
-
-/*
- * Copy mbuf pkthdr from from to to.
- * from must have M_PKTHDR set, and to must be empty.
- */
-#define	M_COPY_PKTHDR(to, from) { \
-	(to)->m_pkthdr = (from)->m_pkthdr; \
-	(to)->m_flags = (from)->m_flags & M_COPYFLAGS; \
-	(to)->m_data = (to)->m_pktdat; \
-}
-
-/*
- * Set the m_data pointer of a newly-allocated mbuf (m_get/MGET) to place
- * an object of the specified size at the end of the mbuf, longword aligned.
- */
-#define	M_ALIGN(m, len) \
-	{ (m)->m_data += (MLEN - (len)) &~ (sizeof(long) - 1); }
-/*
- * As above, for mbufs allocated with m_gethdr/MGETHDR
- * or initialized by M_COPY_PKTHDR.
- */
-#define	MH_ALIGN(m, len) \
-	{ (m)->m_data += (MHLEN - (len)) &~ (sizeof(long) - 1); }
-
-/*
- * Compute the amount of space available
- * before the current start of data in an mbuf.
- */
-#define	M_LEADINGSPACE(m) \
-	((m)->m_flags & M_EXT ? /* (m)->m_data - (m)->m_ext.ext_buf */ 0 : \
-	    (m)->m_flags & M_PKTHDR ? (m)->m_data - (m)->m_pktdat : \
-	    (m)->m_data - (m)->m_dat)
-
-/*
- * Compute the amount of space available
- * after the end of data in an mbuf.
- */
-#define	M_TRAILINGSPACE(m) \
-	((m)->m_flags & M_EXT ? (m)->m_ext.ext_buf + (m)->m_ext.ext_size - \
-	    ((m)->m_data + (m)->m_len) : \
-	    &(m)->m_dat[MLEN] - ((m)->m_data + (m)->m_len))
-
-/*
- * Arrange to prepend space of size plen to mbuf m.
- * If a new mbuf must be allocated, how specifies whether to wait.
- * If how is M_DONTWAIT and allocation fails, the original mbuf chain
- * is freed and m is set to NULL.
- */
-#define	M_PREPEND(m, plen, how) { \
-	if (M_LEADINGSPACE(m) >= (plen)) { \
-		(m)->m_data -= (plen); \
-		(m)->m_len += (plen); \
-	} else \
-		(m) = m_prepend((m), (plen), (how)); \
-	if ((m) && (m)->m_flags & M_PKTHDR) \
-		(m)->m_pkthdr.len += (plen); \
-}
-
-/* change mbuf to new type */
-#define MCHTYPE(m, t) { \
-	MBUFLOCK(mbstat.m_mtypes[(m)->m_type]--; mbstat.m_mtypes[t]++;) \
-	(m)->m_type = t;\
-}
-
-/* length to m_copy to copy all */
-#define	M_COPYALL	1000000000
-
-/* compatibility with 4.3 */
-#define  m_copy(m, o, l)	m_copym((m), (o), (l), M_DONTWAIT)
-
-/*
- * Mbuf statistics.
- */
-struct mbstat {
-	u_long	m_mbufs;	/* mbufs obtained from page pool */
-	u_long	m_clusters;	/* clusters obtained from page pool */
-	u_long	m_spare;	/* spare field */
-	u_long	m_clfree;	/* free clusters */
-	u_long	m_drops;	/* times failed to find space */
-	u_long	m_wait;		/* times waited for space */
-	u_long	m_drain;	/* times drained protocols for space */
-	u_short	m_mtypes[256];	/* type specific mbuf allocations */
-};
-
-#ifdef	KERNEL
-extern struct mbuf *mbutl;		/* virtual address of mclusters */
-extern char	*mclrefcnt;		/* cluster reference counts */
-extern struct mbstat mbstat;
-extern int	nmbclusters;
-extern int	nmbufs;
-extern struct mbuf *mmbfree;
-extern union mcluster *mclfree;
-extern int	max_linkhdr;		/* largest link-level header */
-extern int	max_protohdr;		/* largest protocol header */
-extern int	max_hdr;		/* largest link+protocol header */
-extern int	max_datalen;		/* MHLEN - max_hdr */
-extern int	mbtypes[];		/* XXX */
-
-struct	mbuf *m_copym __P((struct mbuf *, int, int, int));
-struct	mbuf *m_copypacket __P((struct mbuf *, int));
-struct	mbuf *m_devget __P((char *, int, int, struct ifnet *,
-			    void (*copy)(char *, caddr_t, u_int)));
-struct	mbuf *m_free __P((struct mbuf *));
-struct	mbuf *m_get __P((int, int));
-struct	mbuf *m_getclr __P((int, int));
-struct	mbuf *m_gethdr __P((int, int));
-struct	mbuf *m_prepend __P((struct mbuf *,int,int));
-struct	mbuf *m_pullup __P((struct mbuf *, int));
-struct	mbuf *m_retry __P((int, int));
-struct	mbuf *m_retryhdr __P((int, int));
-struct	mbuf *m_split __P((struct mbuf *,int,int));
-void	m_adj __P((struct mbuf *, int));
-void	m_cat __P((struct mbuf *,struct mbuf *));
-int	m_mballoc __P((int, int));
-int	m_clalloc __P((int, int));
-void	m_copyback __P((struct mbuf *, int, int, caddr_t));
-void	m_copydata __P((struct mbuf *,int,int,caddr_t));
-void	m_freem __P((struct mbuf *));
-
-#ifdef MBTYPES
-int mbtypes[] = {				/* XXX */
-	M_FREE,		/* MT_FREE	0	   should be on free list */
-	M_MBUF,		/* MT_DATA	1	   dynamic (data) allocation */
-	M_MBUF,		/* MT_HEADER	2	   packet header */
-	M_SOCKET,	/* MT_SOCKET	3	   socket structure */
-	M_PCB,		/* MT_PCB	4	   protocol control block */
-	M_RTABLE,	/* MT_RTABLE	5	   routing tables */
-	M_HTABLE,	/* MT_HTABLE	6	   IMP host tables */
-	0,		/* MT_ATABLE	7	   address resolution tables */
-	M_MBUF,		/* MT_SONAME	8	   socket name */
-	0,		/* 		9 */
-	M_SOOPTS,	/* MT_SOOPTS	10	   socket options */
-	M_FTABLE,	/* MT_FTABLE	11	   fragment reassembly header */
-	M_MBUF,		/* MT_RIGHTS	12	   access rights */
-	M_IFADDR,	/* MT_IFADDR	13	   interface address */
-	M_MBUF,		/* MT_CONTROL	14	   extra-data protocol message */
-	M_MBUF,		/* MT_OOBDATA	15	   expedited data  */
-#ifdef DATAKIT
-	25, 26, 27, 28, 29, 30, 31, 32		/* datakit ugliness */
-#endif
-};
-#endif
-#endif
-
-#endif /* !_SYS_MBUF_H_ */
diff --git a/c/src/libnetworking/sys/mount.h b/c/src/libnetworking/sys/mount.h
deleted file mode 100644
index a6254e302d..0000000000
--- a/c/src/libnetworking/sys/mount.h
+++ /dev/null
@@ -1,531 +0,0 @@
-/*
- * Copyright (c) 1989, 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)mount.h	8.13 (Berkeley) 3/27/94
- *	$Id$
- */
-
-#ifndef _SYS_MOUNT_H_
-#define _SYS_MOUNT_H_
-
-#ifndef KERNEL
-#include <sys/ucred.h>
-#endif
-#include <sys/queue.h>
-
-typedef struct fsid { long val[2]; } fsid_t;	/* file system id type */
-
-/*
- * File identifier.
- * These are unique per filesystem on a single machine.
- */
-#define	MAXFIDSZ	16
-
-struct fid {
-	u_short		fid_len;		/* length of data in bytes */
-	u_short		fid_reserved;		/* force longword alignment */
-	char		fid_data[MAXFIDSZ];	/* data (variable length) */
-};
-
-/*
- * file system statistics
- */
-
-#define MNAMELEN 90	/* length of buffer for returned name */
-
-struct statfs {
-	long	f_spare2;		/* placeholder */
-	long	f_bsize;		/* fundamental file system block size */
-	long	f_iosize;		/* optimal transfer block size */
-	long	f_blocks;		/* total data blocks in file system */
-	long	f_bfree;		/* free blocks in fs */
-	long	f_bavail;		/* free blocks avail to non-superuser */
-	long	f_files;		/* total file nodes in file system */
-	long	f_ffree;		/* free file nodes in fs */
-	fsid_t	f_fsid;			/* file system id */
-	uid_t	f_owner;		/* user that mounted the filesystem */
-	int	f_type;			/* type of filesystem (see below) */
-	int	f_flags;		/* copy of mount flags */
-	long	f_spare[6];		/* spare for later */
-	char	f_mntonname[MNAMELEN];	/* directory on which mounted */
-	char	f_mntfromname[MNAMELEN];/* mounted filesystem */
-};
-
-/*
- * File system types.
- */
-#define	MOUNT_NONE	0
-#define	MOUNT_UFS	1	/* Fast Filesystem */
-#define	MOUNT_NFS	2	/* Sun-compatible Network Filesystem */
-#define	MOUNT_MFS	3	/* Memory-based Filesystem */
-#define	MOUNT_MSDOS	4	/* MS/DOS Filesystem */
-#define	MOUNT_LFS	5	/* Log-based Filesystem */
-#define	MOUNT_LOFS	6	/* Loopback Filesystem */
-#define	MOUNT_FDESC	7	/* File Descriptor Filesystem */
-#define	MOUNT_PORTAL	8	/* Portal Filesystem */
-#define MOUNT_NULL	9	/* Minimal Filesystem Layer */
-#define MOUNT_UMAP	10	/* User/Group Identifier Remapping Filesystem */
-#define MOUNT_KERNFS	11	/* Kernel Information Filesystem */
-#define MOUNT_PROCFS	12	/* /proc Filesystem */
-#define MOUNT_AFS	13	/* Andrew Filesystem */
-#define MOUNT_CD9660	14	/* ISO9660 (aka CDROM) Filesystem */
-#define MOUNT_UNION	15	/* Union (translucent) Filesystem */
-#define MOUNT_DEVFS	16	/* existing device Filesystem */
-#define	MOUNT_EXT2FS	17	/* Linux EXT2FS */
-#define MOUNT_TFS	18	/* Netcon Novell filesystem */
-#define	MOUNT_CFS	19	/* Coda filesystem */
-#define	MOUNT_MAXTYPE	19
-
-#define INITMOUNTNAMES { \
-	"none",		/*  0 MOUNT_NONE */ \
-	"ufs",		/*  1 MOUNT_UFS */ \
-	"nfs",		/*  2 MOUNT_NFS */ \
-	"mfs",		/*  3 MOUNT_MFS */ \
-	"msdos",	/*  4 MOUNT_MSDOS */ \
-	"lfs",		/*  5 MOUNT_LFS */ \
-	"lofs",		/*  6 MOUNT_LOFS */ \
-	"fdesc",	/*  7 MOUNT_FDESC */ \
-	"portal",	/*  8 MOUNT_PORTAL */ \
-	"null",		/*  9 MOUNT_NULL */ \
-	"umap",		/* 10 MOUNT_UMAP */ \
-	"kernfs",	/* 11 MOUNT_KERNFS */ \
-	"procfs",	/* 12 MOUNT_PROCFS */ \
-	"afs",		/* 13 MOUNT_AFS */ \
-	"cd9660",	/* 14 MOUNT_CD9660 */ \
-	"union",	/* 15 MOUNT_UNION */ \
-	"devfs",	/* 16 MOUNT_DEVFS */ \
-	"ext2fs",	/* 17 MOUNT_EXT2FS */ \
-	"tfs",		/* 18 MOUNT_TFS */ \
-	"cfs",		/* 19 MOUNT_CFS */ \
-	0,		/* 20 MOUNT_SPARE */ \
-}
-
-/*
- * Structure per mounted file system.  Each mounted file system has an
- * array of operations and an instance record.  The file systems are
- * put on a doubly linked list.
- */
-LIST_HEAD(vnodelst, vnode);
-
-struct mount {
-	CIRCLEQ_ENTRY(mount) mnt_list;		/* mount list */
-	struct vfsops	*mnt_op;		/* operations on fs */
-	struct vfsconf	*mnt_vfc;		/* configuration info */
-	struct vnode	*mnt_vnodecovered;	/* vnode we mounted on */
-	struct vnodelst	mnt_vnodelist;		/* list of vnodes this mount */
-	int		mnt_flag;		/* flags */
-	int		mnt_maxsymlinklen;	/* max size of short symlink */
-	struct statfs	mnt_stat;		/* cache of filesystem stats */
-	qaddr_t		mnt_data;		/* private data */
-/*	struct vfsconf	*mnt_vfc; */		/* configuration info */
-	time_t		mnt_time;		/* last time written*/
-};
-
-/*
- * Mount flags.
- *
- * Unmount uses MNT_FORCE flag.
- */
-#define	MNT_RDONLY	0x00000001	/* read only filesystem */
-#define	MNT_SYNCHRONOUS	0x00000002	/* file system written synchronously */
-#define	MNT_NOEXEC	0x00000004	/* can't exec from filesystem */
-#define	MNT_NOSUID	0x00000008	/* don't honor setuid bits on fs */
-#define	MNT_NODEV	0x00000010	/* don't interpret special files */
-#define	MNT_UNION	0x00000020	/* union with underlying filesystem */
-#define	MNT_ASYNC	0x00000040	/* file system written asynchronously */
-#define	MNT_NOATIME	0x10000000	/* Disable update of file access times */
-
-/*
- * exported mount flags.
- */
-#define	MNT_EXRDONLY	0x00000080	/* exported read only */
-#define	MNT_EXPORTED	0x00000100	/* file system is exported */
-#define	MNT_DEFEXPORTED	0x00000200	/* exported to the world */
-#define	MNT_EXPORTANON	0x00000400	/* use anon uid mapping for everyone */
-#define	MNT_EXKERB	0x00000800	/* exported with Kerberos uid mapping */
-
-/*
- * Flags set by internal operations.
- */
-#define	MNT_LOCAL	0x00001000	/* filesystem is stored locally */
-#define	MNT_QUOTA	0x00002000	/* quotas are enabled on filesystem */
-#define	MNT_ROOTFS	0x00004000	/* identifies the root filesystem */
-#define	MNT_USER	0x00008000	/* mounted by a user */
-
-/*
- * Mask of flags that are visible to statfs()
- */
-#define	MNT_VISFLAGMASK	(MNT_RDONLY|MNT_SYNCHRONOUS|MNT_NOEXEC|MNT_NOSUID| \
-			 MNT_NODEV|MNT_UNION|MNT_ASYNC|MNT_EXRDONLY|MNT_EXPORTED| \
-			 MNT_DEFEXPORTED|MNT_EXPORTANON|MNT_EXKERB|MNT_LOCAL| \
-			 MNT_QUOTA|MNT_ROOTFS|MNT_USER|MNT_NOATIME)
-
-/*
- * filesystem control flags.
- *
- * MNT_MLOCK lock the mount entry so that name lookup cannot proceed
- * past the mount point.  This keeps the subtree stable during mounts
- * and unmounts.
- */
-#define	MNT_UPDATE	0x00010000	/* not a real mount, just an update */
-#define	MNT_DELEXPORT	0x00020000	/* delete export host lists */
-#define	MNT_RELOAD	0x00040000	/* reload filesystem data */
-#define	MNT_FORCE	0x00080000	/* force unmount or readonly change */
-#define	MNT_MLOCK	0x00100000	/* lock so that subtree is stable */
-#define	MNT_MWAIT	0x00200000	/* someone is waiting for lock */
-#define MNT_MPBUSY	0x00400000	/* scan of mount point in progress */
-#define MNT_MPWANT	0x00800000	/* waiting for mount point */
-#define MNT_UNMOUNT	0x01000000	/* unmount in progress */
-#define MNT_WANTRDWR	0x02000000	/* want upgrade to read/write */
-
-/*
- * used to get configured filesystems information
- */
-#define VFS_MAXNAMELEN 32
-struct vfsconf {
-	void *vfc_vfsops;
-	char vfc_name[VFS_MAXNAMELEN];
-	int vfc_index;
-	int vfc_refcount;
-	int vfc_flags;
-};
-
-/*
- * NB: these flags refer to IMPLEMENTATION properties, not properties of
- * any actual mounts; i.e., it does not make sense to change the flags.
- */
-#define	VFCF_STATIC	0x00000001	/* statically compiled into kernel */
-#define	VFCF_NETWORK	0x00000002	/* may get data over the network */
-#define	VFCF_READONLY	0x00000004	/* writes are not implemented */
-#define VFCF_SYNTHETIC	0x00000008	/* data does not represent real files */
-#define	VFCF_LOOPBACK	0x00000010	/* aliases some other mounted FS */
-#define	VFCF_UNICODE	0x00000020	/* stores file names as Unicode*/
-
-/*
- * Operations supported on mounted file system.
- */
-#ifdef KERNEL
-
-extern	int	doforce;	/* Flag to permit forcible unmounting. */
-extern struct vfsconf void_vfsconf;
-extern struct vfsconf *vfsconf[];
-
-#ifdef __STDC__
-struct nameidata;
-struct mbuf;
-#endif
-
-struct vfsops {
-	int	(*vfs_mount)	__P((struct mount *mp, char *path, caddr_t data,
-				    struct nameidata *ndp, struct proc *p));
-	int	(*vfs_start)	__P((struct mount *mp, int flags,
-				    struct proc *p));
-	int	(*vfs_unmount)	__P((struct mount *mp, int mntflags,
-				    struct proc *p));
-	int	(*vfs_root)	__P((struct mount *mp, struct vnode **vpp));
-	int	(*vfs_quotactl)	__P((struct mount *mp, int cmds, uid_t uid,
-				    caddr_t arg, struct proc *p));
-	int	(*vfs_statfs)	__P((struct mount *mp, struct statfs *sbp,
-				    struct proc *p));
-	int	(*vfs_sync)	__P((struct mount *mp, int waitfor,
-				    struct ucred *cred, struct proc *p));
-	int	(*vfs_vget)	__P((struct mount *mp, ino_t ino,
-				    struct vnode **vpp));
-	int	(*vfs_fhtovp)	__P((struct mount *mp, struct fid *fhp,
-				    struct mbuf *nam, struct vnode **vpp,
-				    int *exflagsp, struct ucred **credanonp));
-	int	(*vfs_vptofh)	__P((struct vnode *vp, struct fid *fhp));
-	int	(*vfs_init)	__P((void));
-};
-
-#define VFS_MOUNT(MP, PATH, DATA, NDP, P) \
-	(*(MP)->mnt_op->vfs_mount)(MP, PATH, DATA, NDP, P)
-#define VFS_START(MP, FLAGS, P)	  (*(MP)->mnt_op->vfs_start)(MP, FLAGS, P)
-#define VFS_UNMOUNT(MP, FORCE, P) (*(MP)->mnt_op->vfs_unmount)(MP, FORCE, P)
-#define VFS_ROOT(MP, VPP)	  (*(MP)->mnt_op->vfs_root)(MP, VPP)
-#define VFS_QUOTACTL(MP,C,U,A,P)  (*(MP)->mnt_op->vfs_quotactl)(MP, C, U, A, P)
-#define VFS_STATFS(MP, SBP, P)	  (*(MP)->mnt_op->vfs_statfs)(MP, SBP, P)
-#define VFS_SYNC(MP, WAIT, C, P)  (*(MP)->mnt_op->vfs_sync)(MP, WAIT, C, P)
-#define VFS_VGET(MP, INO, VPP)	  (*(MP)->mnt_op->vfs_vget)(MP, INO, VPP)
-#define VFS_FHTOVP(MP, FIDP, NAM, VPP, EXFLG, CRED) \
-	(*(MP)->mnt_op->vfs_fhtovp)(MP, FIDP, NAM, VPP, EXFLG, CRED)
-#define	VFS_VPTOFH(VP, FIDP)	  (*(VP)->v_mount->mnt_op->vfs_vptofh)(VP, FIDP)
-
-#ifdef VFS_LKM
-#include <sys/conf.h>
-#include <sys/exec.h>
-#include <sys/sysent.h>
-#include <sys/lkm.h>
-
-#define VFS_SET(vfsops, fsname, index, flags) \
-	static struct vfsconf _fs_vfsconf = { \
-		&vfsops, \
-		#fsname, \
-		index, \
-		0, \
-		flags \
-	}; \
-	extern struct linker_set MODVNOPS; \
-	MOD_VFS(#fsname,index,&MODVNOPS,&_fs_vfsconf); \
-	int \
-	fsname ## _mod(struct lkm_table *lkmtp, int cmd, int ver) { \
-		DISPATCH(lkmtp, cmd, ver, lkm_nullcmd, lkm_nullcmd, lkm_nullcmd); }
-#else
-
-#define VFS_SET(vfsops, fsname, index, flags) \
-	static struct vfsconf _fs_vfsconf = { \
-		&vfsops, \
-		#fsname, \
-		index, \
-		0, \
-		flags | VFCF_STATIC \
-	}; \
-	DATA_SET(vfs_set,_fs_vfsconf)
-#endif /* VFS_LKM */
-
-#endif /* KERNEL */
-
-/*
- * Flags for various system call interfaces.
- *
- * waitfor flags to vfs_sync() and getfsstat()
- */
-#define MNT_WAIT	1
-#define MNT_NOWAIT	2
-
-/*
- * Generic file handle
- */
-struct fhandle {
-	fsid_t	fh_fsid;	/* File system id of mount point */
-	struct	fid fh_fid;	/* File sys specific id */
-};
-typedef struct fhandle	fhandle_t;
-
-#ifdef KERNEL
-#include <net/radix.h>
-#include <sys/socket.h>		/* XXX for AF_MAX */
-
-/*
- * Network address lookup element
- */
-struct netcred {
-	struct	radix_node netc_rnodes[2];
-	int	netc_exflags;
-	struct	ucred netc_anon;
-};
-
-/*
- * Network export information
- */
-struct netexport {
-	struct	netcred ne_defexported;		      /* Default export */
-	struct	radix_node_head *ne_rtable[AF_MAX+1]; /* Individual exports */
-};
-#endif /* KERNEL */
-
-/*
- * Export arguments for local filesystem mount calls.
- */
-struct export_args {
-	int	ex_flags;		/* export related flags */
-	uid_t	ex_root;		/* mapping for root uid */
-	struct	ucred ex_anon;		/* mapping for anonymous user */
-	struct	sockaddr *ex_addr;	/* net address to which exported */
-	int	ex_addrlen;		/* and the net address length */
-	struct	sockaddr *ex_mask;	/* mask of valid bits in saddr */
-	int	ex_masklen;		/* and the smask length */
-};
-
-/*
- * Arguments to mount UFS-based filesystems
- */
-struct ufs_args {
-	char	*fspec;			/* block special device to mount */
-	struct	export_args export;	/* network export information */
-};
-
-#ifdef MFS
-/*
- * Arguments to mount MFS
- */
-struct mfs_args {
-	char	*fspec;			/* name to export for statfs */
-	struct	export_args export;	/* if exported MFSes are supported */
-	caddr_t	base;			/* base of file system in memory */
-	u_long size;			/* size of file system */
-};
-#endif /* MFS */
-
-#ifdef MSDOSFS
-/*
- *  Arguments to mount MSDOS filesystems.
- */
-struct msdosfs_args {
-	char	*fspec;		/* blocks special holding the fs to mount */
-	struct	export_args export;	/* network export information */
-	uid_t	uid;		/* uid that owns msdosfs files */
-	gid_t	gid;		/* gid that owns msdosfs files */
-	mode_t	mask;		/* mask to be applied for msdosfs perms */
-};
-#endif
-
-#ifdef CD9660
-/*
- * Arguments to mount ISO 9660 filesystems.
- */
-struct iso_args {
-	char *fspec;			/* block special device to mount */
-	struct	export_args export;	/* network export info */
-	int flags;			/* mounting flags, see below */
-	int ssector;			/* starting sector */
-
-};
-#define ISOFSMNT_NORRIP		0x00000001 /* disable Rock Ridge Ext.*/
-#define ISOFSMNT_GENS		0x00000002 /* enable generation numbers */
-#define ISOFSMNT_EXTATT		0x00000004 /* enable extended attributes */
-#endif /* CD9660 */
-
-#ifdef NFS
-/*
- * Arguments to mount NFS
- */
-struct nfs_args {
-	struct sockaddr	*addr;		/* file server address */
-	int		addrlen;	/* length of address */
-	int		sotype;		/* Socket type */
-	int		proto;		/* and Protocol */
-	u_char		*fh;		/* File handle to be mounted */
-	int		fhsize;		/* Size, in bytes, of fh */
-	int		flags;		/* flags */
-	int		wsize;		/* write size in bytes */
-	int		rsize;		/* read size in bytes */
-	int		readdirsize;	/* readdir size in bytes */
-	int		timeo;		/* initial timeout in .1 secs */
-	int		retrans;	/* times to retry send */
-	int		maxgrouplist;	/* Max. size of group list */
-	int		readahead;	/* # of blocks to readahead */
-	int		leaseterm;	/* Term (sec) of lease */
-	int		deadthresh;	/* Retrans threshold */
-	char		*hostname;	/* server's name */
-};
-
-/*
- * NFS mount option flags
- */
-#define	NFSMNT_SOFT		0x00000001  /* soft mount (hard is default) */
-#define	NFSMNT_WSIZE		0x00000002  /* set write size */
-#define	NFSMNT_RSIZE		0x00000004  /* set read size */
-#define	NFSMNT_TIMEO		0x00000008  /* set initial timeout */
-#define	NFSMNT_RETRANS		0x00000010  /* set number of request retrys */
-#define	NFSMNT_MAXGRPS		0x00000020  /* set maximum grouplist size */
-#define	NFSMNT_INT		0x00000040  /* allow interrupts on hard mount */
-#define	NFSMNT_NOCONN		0x00000080  /* Don't Connect the socket */
-#define	NFSMNT_NQNFS		0x00000100  /* Use Nqnfs protocol */
-#define	NFSMNT_NFSV3		0x00000200  /* Use NFS Version 3 protocol */
-#define	NFSMNT_KERB		0x00000400  /* Use Kerberos authentication */
-#define	NFSMNT_DUMBTIMR		0x00000800  /* Don't estimate rtt dynamically */
-#define	NFSMNT_LEASETERM	0x00001000  /* set lease term (nqnfs) */
-#define	NFSMNT_READAHEAD	0x00002000  /* set read ahead */
-#define	NFSMNT_DEADTHRESH	0x00004000  /* set dead server retry thresh */
-#define	NFSMNT_RESVPORT		0x00008000  /* Allocate a reserved port */
-#define NFSMNT_RDIRPLUS		0x00010000  /* Use Readdirplus for V3 */
-#define NFSMNT_READDIRSIZE	0x00020000  /* Set readdir size */
-#define	NFSMNT_INTERNAL		0xfffc0000  /* Bits set internally */
-#define NFSMNT_HASWRITEVERF	0x00040000  /* Has write verifier for V3 */
-#define NFSMNT_GOTPATHCONF	0x00080000  /* Got the V3 pathconf info */
-#define NFSMNT_GOTFSINFO	0x00100000  /* Got the V3 fsinfo */
-#define	NFSMNT_MNTD		0x00200000  /* Mnt server for mnt point */
-#define	NFSMNT_DISMINPROG	0x00400000  /* Dismount in progress */
-#define	NFSMNT_DISMNT		0x00800000  /* Dismounted */
-#define	NFSMNT_SNDLOCK		0x01000000  /* Send socket lock */
-#define	NFSMNT_WANTSND		0x02000000  /* Want above */
-#define	NFSMNT_RCVLOCK		0x04000000  /* Rcv socket lock */
-#define	NFSMNT_WANTRCV		0x08000000  /* Want above */
-#define	NFSMNT_WAITAUTH		0x10000000  /* Wait for authentication */
-#define	NFSMNT_HASAUTH		0x20000000  /* Has authenticator */
-#define	NFSMNT_WANTAUTH		0x40000000  /* Wants an authenticator */
-#define	NFSMNT_AUTHERR		0x80000000  /* Authentication error */
-#endif /* NFS */
-
-#ifdef KERNEL
-extern	int (*mountroot) __P((void *));
-extern	struct vfsops	*mountrootvfsops;
-
-/*
- * exported vnode operations
- */
-int	dounmount __P((struct mount *, int, struct proc *));
-struct	mount *getvfs __P((fsid_t *));      /* return vfs given fsid */
-void	getnewfsid __P((struct mount *, int));
-int	vflush __P((struct mount *, struct vnode *, int));
-int	vfs_export			    /* process mount export info */
-	  __P((struct mount *, struct netexport *, struct export_args *));
-struct	netcred *vfs_export_lookup	    /* lookup host in fs export list */
-	  __P((struct mount *, struct netexport *, struct mbuf *));
-int	vfs_lock __P((struct mount *));         /* lock a vfs */
-int	vfs_mountedon __P((struct vnode *));    /* is a vfs mounted on vp */
-int	vfs_mountroot __P((void *));		/* XXX goes away? */
-void	vfs_msync __P((struct mount *, int));
-void	vfs_unlock __P((struct mount *));       /* unlock a vfs */
-void	vfs_unmountall __P((void));
-int	vfs_busy __P((struct mount *));         /* mark a vfs  busy */
-void	vfs_unbusy __P((struct mount *));       /* mark a vfs not busy */
-extern	CIRCLEQ_HEAD(mntlist, mount) mountlist;	/* mounted filesystem list */
-extern	struct vfsops *vfssw[];			/* filesystem type table */
-
-#else /* KERNEL */
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-int	fstatfs __P((int, struct statfs *));
-int	getfh __P((const char *, fhandle_t *));
-int	getfsstat __P((struct statfs *, long, int));
-int	getmntinfo __P((struct statfs **, int));
-int	mount __P((int, const char *, int, void *));
-int	statfs __P((const char *, struct statfs *));
-int	unmount __P((const char *, int));
-
-/* C library stuff */
-struct	vfsconf *getvfsbyname __P((const char *));
-struct	vfsconf *getvfsbytype __P((int));
-struct	vfsconf *getvfsent __P((void));
-void	setvfsent __P((int));
-void	endvfsent __P((void));
-int	vfsisloadable __P((const char *));
-int	vfsload __P((const char *));
-__END_DECLS
-
-#endif /* KERNEL */
-
-#endif /* !_SYS_MOUNT_H_ */
diff --git a/c/src/libnetworking/sys/param.h b/c/src/libnetworking/sys/param.h
deleted file mode 100644
index 21a9758520..0000000000
--- a/c/src/libnetworking/sys/param.h
+++ /dev/null
@@ -1,231 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)param.h	8.3 (Berkeley) 4/4/95
- * $Id$
- */
-
-#ifndef _SYS_PARAM_H_
-#define _SYS_PARAM_H_
-
-#include <unistd.h>
-
-#define	BSD	199506		/* System version (year & month). */
-#define BSD4_3	1
-#define BSD4_4	1
-
-#ifndef NULL
-#define	NULL	0
-#endif
-
-#ifndef LOCORE
-#include <sys/types.h>
-#endif
-
-/*
- * Machine-independent constants (some used in following include files).
- * Redefined constants are from POSIX 1003.1 limits file.
- *
- * MAXCOMLEN should be >= sizeof(ac_comm) (see <acct.h>)
- * MAXLOGNAME should be >= UT_NAMESIZE (see <utmp.h>)
- */
-#include <sys/syslimits.h>
-
-#define	MAXCOMLEN	16		/* max command name remembered */
-#define	MAXINTERP	32		/* max interpreter file name length */
-#define	MAXLOGNAME	12		/* max login name length */
-#define	MAXUPRC		CHILD_MAX	/* max simultaneous processes */
-#define	NCARGS		ARG_MAX		/* max bytes for an exec function */
-#define	NGROUPS		NGROUPS_MAX	/* max number groups */
-#define	NOFILE		OPEN_MAX	/* max open files per process */
-#define	NOGROUP		65535		/* marker for empty group set member */
-#define MAXHOSTNAMELEN	256		/* max hostname size */
-
-/* More types and definitions used throughout the kernel. */
-#ifdef KERNEL
-#include <sys/cdefs.h>
-#include <sys/errno.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-#include <sys/ucred.h>
-#include <sys/uio.h>
-#include <sys/rtprio.h>
-
-#ifndef FALSE
-#define	FALSE	0
-#endif
-#ifndef TRUE
-#define	TRUE	1
-#endif
-#endif
-
-/* Signals. */
-#include <sys/signal.h>
-
-/* Machine type dependent parameters. */
-#include <machine/param.h>
-#include <machine/limits.h>
-
-/*
- * Priorities.  Note that with 32 run queues, differences less than 4 are
- * insignificant.
- */
-#define	PSWP	0
-#define	PVM	4
-#define	PINOD	8
-#define	PRIBIO	16
-#define	PVFS	20
-#define	PZERO	22		/* No longer magic, shouldn't be here.  XXX */
-#define	PSOCK	24
-#define	PWAIT	32
-#define	PLOCK	36
-#define	PPAUSE	40
-#define	PUSER	50
-#define	MAXPRI	127		/* Priorities range from 0 through MAXPRI. */
-
-#define	PRIMASK	0x0ff
-#define	PCATCH	0x100		/* OR'd with pri for tsleep to check signals */
-
-#define	NZERO	0		/* default "nice" */
-
-#define	NBPW	sizeof(int)	/* number of bytes per word (integer) */
-
-#define	CMASK	022		/* default file mask: S_IWGRP|S_IWOTH */
-#define	NODEV	(dev_t)(-1)	/* non-existent device */
-
-/*
- * Clustering of hardware pages on machines with ridiculously small
- * page sizes is done here.  The paging subsystem deals with units of
- * CLSIZE pte's describing PAGE_SIZE (from machine/machparam.h) pages each.
- */
-#if 0
-#define	CLBYTES		(CLSIZE*PAGE_SIZE)
-#endif
-
-#define	CBLOCK	128		/* Clist block size, must be a power of 2. */
-#define CBQSIZE	(CBLOCK/NBBY)	/* Quote bytes/cblock - can do better. */
-				/* Data chars/clist. */
-#define	CBSIZE	(CBLOCK - sizeof(struct cblock *) - CBQSIZE)
-#define	CROUND	(CBLOCK - 1)	/* Clist rounding. */
-
-/*
- * File system parameters and macros.
- *
- * The file system is made out of blocks of at most MAXBSIZE units, with
- * smaller units (fragments) only in the last direct block.  MAXBSIZE
- * primarily determines the size of buffers in the buffer pool.  It may be
- * made larger without any effect on existing file systems; however making
- * it smaller make make some file systems unmountable.  Also, MAXBSIZE
- * must be less than MAXPHYS!!!  DFLTBSIZE is the average amount of
- * memory allocated by vfs_bio per nbuf.  BKVASIZE is the average amount
- * of kernel virtual space allocated per nbuf.  BKVASIZE should be >=
- * DFLTBSIZE.  If it is significantly bigger than DFLTBSIZE, then
- * kva fragmentation causes fewer performance problems.
- */
-#define	MAXBSIZE	65536
-#define BKVASIZE	8192
-#define DFLTBSIZE	4096
-#define MAXFRAG 	8
-
-/*
- * MAXPATHLEN defines the longest permissible path length after expanding
- * symbolic links. It is used to allocate a temporary buffer from the buffer
- * pool in which to do the name expansion, hence should be a power of two,
- * and must be less than or equal to MAXBSIZE.  MAXSYMLINKS defines the
- * maximum number of symbolic links that may be expanded in a path name.
- * It should be set high enough to allow all legitimate uses, but halt
- * infinite loops reasonably quickly.
- */
-#if !defined(__rtems__)
-#define	MAXPATHLEN	PATH_MAX
-#endif
-#define MAXSYMLINKS	32
-
-/* Bit map related macros. */
-#define	setbit(a,i)	((a)[(i)/NBBY] |= 1<<((i)%NBBY))
-#define	clrbit(a,i)	((a)[(i)/NBBY] &= ~(1<<((i)%NBBY)))
-#define	isset(a,i)	((a)[(i)/NBBY] & (1<<((i)%NBBY)))
-#define	isclr(a,i)	(((a)[(i)/NBBY] & (1<<((i)%NBBY))) == 0)
-
-/* Macros for counting and rounding. */
-#ifndef howmany
-#define	howmany(x, y)	(((x)+((y)-1))/(y))
-#endif
-#define	rounddown(x, y)	(((x)/(y))*(y))
-#define	roundup(x, y)	((((x)+((y)-1))/(y))*(y))  /* to any y */
-#define	roundup2(x, y)	(((x)+((y)-1))&(~((y)-1))) /* if y is powers of two */
-#define powerof2(x)	((((x)-1)&(x))==0)
-
-/* Macros for min/max. */
-#ifndef KERNEL
-#define	MIN(a,b) (((a)<(b))?(a):(b))
-#define	MAX(a,b) (((a)>(b))?(a):(b))
-#endif
-
-/*
- * Constants for setting the parameters of the kernel memory allocator.
- *
- * 2 ** MINBUCKET is the smallest unit of memory that will be
- * allocated. It must be at least large enough to hold a pointer.
- *
- * Units of memory less or equal to MAXALLOCSAVE will permanently
- * allocate physical memory; requests for these size pieces of
- * memory are quite fast. Allocations greater than MAXALLOCSAVE must
- * always allocate and free physical memory; requests for these
- * size allocations should be done infrequently as they will be slow.
- *
- * Constraints: PAGE_SIZE <= MAXALLOCSAVE <= 2 ** (MINBUCKET + 14), and
- * MAXALLOCSIZE must be a power of two.
- */
-#define MINBUCKET	4		/* 4 => min allocation of 16 bytes */
-#define MAXALLOCSAVE	(2 * PAGE_SIZE)
-
-/*
- * Scale factor for scaled integers used to count %cpu time and load avgs.
- *
- * The number of CPU `tick's that map to a unique `%age' can be expressed
- * by the formula (1 / (2 ^ (FSHIFT - 11))).  The maximum load average that
- * can be calculated (assuming 32 bits) can be closely approximated using
- * the formula (2 ^ (2 * (16 - FSHIFT))) for (FSHIFT < 15).
- *
- * For the scheduler to maintain a 1:1 mapping of CPU `tick' to `%age',
- * FSHIFT must be at least 11; this gives us a maximum load avg of ~1024.
- */
-#define	FSHIFT	11		/* bits to right of fixed binary point */
-#define FSCALE	(1<<FSHIFT)
-
-#endif	/* _SYS_PARAM_H_ */
diff --git a/c/src/libnetworking/sys/proc.h b/c/src/libnetworking/sys/proc.h
deleted file mode 100644
index 2189a33b11..0000000000
--- a/c/src/libnetworking/sys/proc.h
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * Dummy structure
- *
- *  $Id$
- */
-struct proc {
-	int	this_should_never_be_referenced;
-};
diff --git a/c/src/libnetworking/sys/protosw.h b/c/src/libnetworking/sys/protosw.h
deleted file mode 100644
index a7aa52feea..0000000000
--- a/c/src/libnetworking/sys/protosw.h
+++ /dev/null
@@ -1,300 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)protosw.h	8.1 (Berkeley) 6/2/93
- * $Id$
- */
-
-#ifndef _SYS_PROTOSW_H_
-#define _SYS_PROTOSW_H_
-
-struct ifnet;
-struct mbuf;
-struct sockaddr;
-struct socket;
-struct sockproto;
-struct stat;
-
-/*
- * Protocol switch table.
- *
- * Each protocol has a handle initializing one of these structures,
- * which is used for protocol-protocol and system-protocol communication.
- *
- * A protocol is called through the pr_init entry before any other.
- * Thereafter it is called every 200ms through the pr_fasttimo entry and
- * every 500ms through the pr_slowtimo for timer based actions.
- * The system will call the pr_drain entry if it is low on space and
- * this should throw away any non-critical data.
- *
- * Protocols pass data between themselves as chains of mbufs using
- * the pr_input and pr_output hooks.  Pr_input passes data up (towards
- * UNIX) and pr_output passes it down (towards the imps); control
- * information passes up and down on pr_ctlinput and pr_ctloutput.
- * The protocol is responsible for the space occupied by any the
- * arguments to these entries and must dispose it.
- *
- * The userreq routine interfaces protocols to the system and is
- * described below.
- */
-struct protosw {
-	short	pr_type;		/* socket type used for */
-	struct	domain *pr_domain;	/* domain protocol a member of */
-	short	pr_protocol;		/* protocol number */
-	short	pr_flags;		/* see below */
-/* protocol-protocol hooks */
-	void	(*pr_input) __P((struct mbuf *, int len));
-					/* input to protocol (from below) */
-	int	(*pr_output)	__P((struct mbuf *m, struct socket *so));
-					/* output to protocol (from above) */
-	void	(*pr_ctlinput)__P((int, struct sockaddr *, void *));
-					/* control input (from below) */
-	int	(*pr_ctloutput)__P((int, struct socket *, int, int,
-				    struct mbuf **));
-					/* control output (from above) */
-/* user-protocol hook */
-	int	(*pr_ousrreq) __P((struct socket *, int, struct mbuf *,
-				   struct mbuf *, struct mbuf *));
-					/* user request: see list below */
-/* utility hooks */
-	void	(*pr_init) __P((void));	/* initialization hook */
-	void	(*pr_fasttimo) __P((void));
-					/* fast timeout (200ms) */
-	void	(*pr_slowtimo) __P((void));
-					/* slow timeout (500ms) */
-	void	(*pr_drain) __P((void));
-					/* flush any excess space possible */
-	struct	pr_usrreqs *pr_usrreqs;	/* supersedes pr_usrreq() */
-};
-
-#define	PR_SLOWHZ	2		/* 2 slow timeouts per second */
-#define	PR_FASTHZ	5		/* 5 fast timeouts per second */
-
-/*
- * Values for pr_flags.
- * PR_ADDR requires PR_ATOMIC;
- * PR_ADDR and PR_CONNREQUIRED are mutually exclusive.
- * PR_IMPLOPCL means that the protocol allows sendto without prior connect,
- *	and the protocol understands the MSG_EOF flag.  The first property is
- *	is only relevant if PR_CONNREQUIRED is set (otherwise sendto is allowed
- *	anyhow).
- */
-#define	PR_ATOMIC	0x01		/* exchange atomic messages only */
-#define	PR_ADDR		0x02		/* addresses given with messages */
-#define	PR_CONNREQUIRED	0x04		/* connection required by protocol */
-#define	PR_WANTRCVD	0x08		/* want PRU_RCVD calls */
-#define	PR_RIGHTS	0x10		/* passes capabilities */
-#define PR_IMPLOPCL	0x20		/* implied open/close */
-
-/*
- * The arguments to usrreq are:
- *	(*protosw[].pr_usrreq)(up, req, m, nam, opt);
- * where up is a (struct socket *), req is one of these requests,
- * m is a optional mbuf chain containing a message,
- * nam is an optional mbuf chain containing an address,
- * and opt is a pointer to a socketopt structure or nil.
- * The protocol is responsible for disposal of the mbuf chain m,
- * the caller is responsible for any space held by nam and opt.
- * A non-zero return from usrreq gives an
- * UNIX error number which should be passed to higher level software.
- */
-#define	PRU_ATTACH		0	/* attach protocol to up */
-#define	PRU_DETACH		1	/* detach protocol from up */
-#define	PRU_BIND		2	/* bind socket to address */
-#define	PRU_LISTEN		3	/* listen for connection */
-#define	PRU_CONNECT		4	/* establish connection to peer */
-#define	PRU_ACCEPT		5	/* accept connection from peer */
-#define	PRU_DISCONNECT		6	/* disconnect from peer */
-#define	PRU_SHUTDOWN		7	/* won't send any more data */
-#define	PRU_RCVD		8	/* have taken data; more room now */
-#define	PRU_SEND		9	/* send this data */
-#define	PRU_ABORT		10	/* abort (fast DISCONNECT, DETATCH) */
-#define	PRU_CONTROL		11	/* control operations on protocol */
-#define	PRU_SENSE		12	/* return status into m */
-#define	PRU_RCVOOB		13	/* retrieve out of band data */
-#define	PRU_SENDOOB		14	/* send out of band data */
-#define	PRU_SOCKADDR		15	/* fetch socket's address */
-#define	PRU_PEERADDR		16	/* fetch peer's address */
-#define	PRU_CONNECT2		17	/* connect two sockets */
-/* begin for protocols internal use */
-#define	PRU_FASTTIMO		18	/* 200ms timeout */
-#define	PRU_SLOWTIMO		19	/* 500ms timeout */
-#define	PRU_PROTORCV		20	/* receive from below */
-#define	PRU_PROTOSEND		21	/* send to below */
-/* end for protocol's internal use */
-#define PRU_SEND_EOF		22	/* send and close */
-#define PRU_NREQ		22
-
-#ifdef PRUREQUESTS
-char *prurequests[] = {
-	"ATTACH",	"DETACH",	"BIND",		"LISTEN",
-	"CONNECT",	"ACCEPT",	"DISCONNECT",	"SHUTDOWN",
-	"RCVD",		"SEND",		"ABORT",	"CONTROL",
-	"SENSE",	"RCVOOB",	"SENDOOB",	"SOCKADDR",
-	"PEERADDR",	"CONNECT2",	"FASTTIMO",	"SLOWTIMO",
-	"PROTORCV",	"PROTOSEND",
-	"SEND_EOF",
-};
-#endif
-
-#ifdef	KERNEL			/* users shouldn't see this decl */
-struct stat;
-struct ifnet;
-
-/*
- * If the ordering here looks odd, that's because it's alphabetical.
- */
-struct pr_usrreqs {
-	int	(*pru_abort) __P((struct socket *so));
-	int	(*pru_accept) __P((struct socket *so, struct mbuf *nam));
-	int	(*pru_attach) __P((struct socket *so, int proto));
-	int	(*pru_bind) __P((struct socket *so, struct mbuf *nam));
-	int	(*pru_connect) __P((struct socket *so, struct mbuf *nam));
-	int	(*pru_connect2) __P((struct socket *so1, struct socket *so2));
-	int	(*pru_control) __P((struct socket *so, int cmd, caddr_t data,
-				    struct ifnet *ifp));
-	int	(*pru_detach) __P((struct socket *so));
-	int	(*pru_disconnect) __P((struct socket *so));
-	int	(*pru_listen) __P((struct socket *so));
-	int	(*pru_peeraddr) __P((struct socket *so, struct mbuf *nam));
-	int	(*pru_rcvd) __P((struct socket *so, int flags));
-	int	(*pru_rcvoob) __P((struct socket *so, struct mbuf *m,
-				   int flags));
-	/*
-	 * The `m' parameter here is almost certainly going to become a
-	 * `struct uio' at some point in the future.  Similar changes
-	 * will probably happen for the receive entry points.
-	 */
-	int	(*pru_send) __P((struct socket *so, int flags, struct mbuf *m, 
-			      struct mbuf *addr, struct mbuf *control));
-#define	PRUS_OOB	0x1
-#define	PRUS_EOF	0x2
-	int	(*pru_sense) __P((struct socket *so, struct stat *sb));
-	int	(*pru_shutdown) __P((struct socket *so));
-	int	(*pru_sockaddr) __P((struct socket *so, struct mbuf *nam));
-};
-
-int	pru_accept_notsupp __P((struct socket *so, struct mbuf *nam));
-int	pru_connect2_notsupp __P((struct socket *so1, struct socket *so2));
-int	pru_control_notsupp __P((struct socket *so, int cmd, caddr_t data,
-				 struct ifnet *ifp));
-int	pru_listen_notsupp __P((struct socket *so));
-int	pru_rcvd_notsupp __P((struct socket *so, int flags));
-int	pru_rcvoob_notsupp __P((struct socket *so, struct mbuf *m, int flags));
-int	pru_sense_null __P((struct socket *so, struct stat *sb));
-
-#define	PRU_OLDSTYLE
-
-#ifdef PRU_OLDSTYLE
-/*
- * Protocols which don't yet implement pr_usrreqs can point it to this
- * structure, which will call the old pr_usrreq() entry point with the
- * appropriate arguments.
- */
-extern	struct pr_usrreqs pru_oldstyle;
-#endif /* PRU_OLDSTYLE */
-
-#endif /* KERNEL */
-
-/*
- * The arguments to the ctlinput routine are
- *	(*protosw[].pr_ctlinput)(cmd, sa, arg);
- * where cmd is one of the commands below, sa is a pointer to a sockaddr,
- * and arg is a `void *' argument used within a protocol family.
- */
-#define	PRC_IFDOWN		0	/* interface transition */
-#define	PRC_ROUTEDEAD		1	/* select new route if possible ??? */
-#define	PRC_QUENCH2		3	/* DEC congestion bit says slow down */
-#define	PRC_QUENCH		4	/* some one said to slow down */
-#define	PRC_MSGSIZE		5	/* message size forced drop */
-#define	PRC_HOSTDEAD		6	/* host appears to be down */
-#define	PRC_HOSTUNREACH		7	/* deprecated (use PRC_UNREACH_HOST) */
-#define	PRC_UNREACH_NET		8	/* no route to network */
-#define	PRC_UNREACH_HOST	9	/* no route to host */
-#define	PRC_UNREACH_PROTOCOL	10	/* dst says bad protocol */
-#define	PRC_UNREACH_PORT	11	/* bad port # */
-/* was	PRC_UNREACH_NEEDFRAG	12	   (use PRC_MSGSIZE) */
-#define	PRC_UNREACH_SRCFAIL	13	/* source route failed */
-#define	PRC_REDIRECT_NET	14	/* net routing redirect */
-#define	PRC_REDIRECT_HOST	15	/* host routing redirect */
-#define	PRC_REDIRECT_TOSNET	16	/* redirect for type of service & net */
-#define	PRC_REDIRECT_TOSHOST	17	/* redirect for tos & host */
-#define	PRC_TIMXCEED_INTRANS	18	/* packet lifetime expired in transit */
-#define	PRC_TIMXCEED_REASS	19	/* lifetime expired on reass q */
-#define	PRC_PARAMPROB		20	/* header incorrect */
-
-#define	PRC_NCMDS		21
-
-#define	PRC_IS_REDIRECT(cmd)	\
-	((cmd) >= PRC_REDIRECT_NET && (cmd) <= PRC_REDIRECT_TOSHOST)
-
-#ifdef PRCREQUESTS
-char	*prcrequests[] = {
-	"IFDOWN", "ROUTEDEAD", "#2", "DEC-BIT-QUENCH2",
-	"QUENCH", "MSGSIZE", "HOSTDEAD", "#7",
-	"NET-UNREACH", "HOST-UNREACH", "PROTO-UNREACH", "PORT-UNREACH",
-	"#12", "SRCFAIL-UNREACH", "NET-REDIRECT", "HOST-REDIRECT",
-	"TOSNET-REDIRECT", "TOSHOST-REDIRECT", "TX-INTRANS", "TX-REASS",
-	"PARAMPROB"
-};
-#endif
-
-/*
- * The arguments to ctloutput are:
- *	(*protosw[].pr_ctloutput)(req, so, level, optname, optval);
- * req is one of the actions listed below, so is a (struct socket *),
- * level is an indication of which protocol layer the option is intended.
- * optname is a protocol dependent socket option request,
- * optval is a pointer to a mbuf-chain pointer, for value-return results.
- * The protocol is responsible for disposal of the mbuf chain *optval
- * if supplied,
- * the caller is responsible for any space held by *optval, when returned.
- * A non-zero return from usrreq gives an
- * UNIX error number which should be passed to higher level software.
- */
-#define	PRCO_GETOPT	0
-#define	PRCO_SETOPT	1
-
-#define	PRCO_NCMDS	2
-
-#ifdef PRCOREQUESTS
-char	*prcorequests[] = {
-	"GETOPT", "SETOPT",
-};
-#endif
-
-#ifdef KERNEL
-struct protosw *pffindproto __P((int family, int protocol, int type));
-struct protosw *pffindtype __P((int family, int type));
-#endif
-
-#endif
diff --git a/c/src/libnetworking/sys/queue.h b/c/src/libnetworking/sys/queue.h
deleted file mode 100644
index e8aa08cf5d..0000000000
--- a/c/src/libnetworking/sys/queue.h
+++ /dev/null
@@ -1,446 +0,0 @@
-/*
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)queue.h	8.5 (Berkeley) 8/20/94
- * $Id$
- */
-
-#ifndef _SYS_QUEUE_H_
-#define	_SYS_QUEUE_H_
-
-/*
- * This file defines five types of data structures: singly-linked lists,
- * slingly-linked tail queues, lists, tail queues, and circular queues.
- *
- * A singly-linked list is headed by a single forward pointer. The elements
- * are singly linked for minimum space and pointer manipulation overhead at
- * the expense of O(n) removal for arbitrary elements. New elements can be
- * added to the list after an existing element or at the head of the list.
- * Elements being removed from the head of the list should use the explicit
- * macro for this purpose for optimum efficiency. A singly-linked list may
- * only be traversed in the forward direction.  Singly-linked lists are ideal
- * for applications with large datasets and few or no removals or for
- * implementing a LIFO queue.
- *
- * A singly-linked tail queue is headed by a pair of pointers, one to the
- * head of the list and the other to the tail of the list. The elements are
- * singly linked for minimum space and pointer manipulation overhead at the
- * expense of O(n) removal for arbitrary elements. New elements can be added
- * to the list after an existing element, at the head of the list, or at the
- * end of the list. Elements being removed from the head of the tail queue
- * should use the explicit macro for this purpose for optimum efficiency.
- * A singly-linked tail queue may only be traversed in the forward direction.
- * Singly-linked tail queues are ideal for applications with large datasets
- * and few or no removals or for implementing a FIFO queue.
- *
- * A list is headed by a single forward pointer (or an array of forward
- * pointers for a hash table header). The elements are doubly linked
- * so that an arbitrary element can be removed without a need to
- * traverse the list. New elements can be added to the list before
- * or after an existing element or at the head of the list. A list
- * may only be traversed in the forward direction.
- *
- * A tail queue is headed by a pair of pointers, one to the head of the
- * list and the other to the tail of the list. The elements are doubly
- * linked so that an arbitrary element can be removed without a need to
- * traverse the list. New elements can be added to the list before or
- * after an existing element, at the head of the list, or at the end of
- * the list. A tail queue may only be traversed in the forward direction.
- *
- * A circle queue is headed by a pair of pointers, one to the head of the
- * list and the other to the tail of the list. The elements are doubly
- * linked so that an arbitrary element can be removed without a need to
- * traverse the list. New elements can be added to the list before or after
- * an existing element, at the head of the list, or at the end of the list.
- * A circle queue may be traversed in either direction, but has a more
- * complex end of list detection.
- *
- * For details on the use of these macros, see the queue(3) manual page.
- */
-
-/*
- * Singly-linked List definitions.
- */
-#define SLIST_HEAD(name, type)						\
-struct name {								\
-	struct type *slh_first;	/* first element */			\
-}
- 
-#define SLIST_ENTRY(type)						\
-struct {								\
-	struct type *sle_next;	/* next element */			\
-}
- 
-/*
- * Singly-linked List functions.
- */
-#define SLIST_INIT(head) {						\
-	(head)->slh_first = NULL;					\
-}
-
-#define SLIST_INSERT_AFTER(slistelm, elm, field) {			\
-	(elm)->field.sle_next = (slistelm)->field.sle_next;		\
-	(slistelm)->field.sle_next = (elm);				\
-}
-
-#define SLIST_INSERT_HEAD(head, elm, field) {				\
-	(elm)->field.sle_next = (head)->slh_first;			\
-	(head)->slh_first = (elm);					\
-}
-
-#define SLIST_REMOVE_HEAD(head, field) {				\
-	(head)->slh_first = (head)->slh_first->field.sle_next;		\
-}
-
-#define SLIST_REMOVE(head, elm, type, field) {				\
-	if ((head)->slh_first == (elm)) {				\
-		SLIST_REMOVE_HEAD((head), field);			\
-	}								\
-	else {								\
-		struct type *curelm = (head)->slh_first;		\
-		while( curelm->field.sle_next != (elm) )		\
-			curelm = curelm->field.sle_next;		\
-		curelm->field.sle_next =				\
-		    curelm->field.sle_next->field.sle_next;		\
-	}								\
-}
-
-/*
- * Singly-linked Tail queue definitions.
- */
-#define STAILQ_HEAD(name, type)						\
-struct name {								\
-	struct type *stqh_first;/* first element */			\
-	struct type **stqh_last;/* addr of last next element */		\
-}
-
-#define STAILQ_ENTRY(type)						\
-struct {								\
-	struct type *stqe_next;	/* next element */			\
-}
-
-/*
- * Singly-linked Tail queue functions.
- */
-#define	STAILQ_INIT(head) {						\
-	(head)->stqh_first = NULL;					\
-	(head)->stqh_last = &(head)->stqh_first;			\
-}
-
-#define STAILQ_INSERT_HEAD(head, elm, field) {				\
-	if (((elm)->field.stqe_next = (head)->stqh_first) == NULL)	\
-		(head)->stqh_last = &(elm)->field.stqe_next;		\
-	(head)->stqh_first = (elm);					\
-}
-
-#define STAILQ_INSERT_TAIL(head, elm, field) {				\
-	(elm)->field.stqe_next = NULL;					\
-	*(head)->stqh_last = (elm);					\
-	(head)->stqh_last = &(elm)->field.stqe_next;			\
-}
-
-#define STAILQ_INSERT_AFTER(head, tqelm, elm, field) {			\
-	if (((elm)->field.stqe_next = (tqelm)->field.stqe_next) == NULL)\
-		(head)->stqh_last = &(elm)->field.stqe_next;		\
-	(tqelm)->field.stqe_next = (elm);				\
-}
-
-#define STAILQ_REMOVE_HEAD(head, field) {				\
-	if (((head)->stqh_first =					\
-	     (head)->stqh_first->field.stqe_next) == NULL)		\
-		(head)->stqh_last = &(head)->stqh_first;		\
-}
-
-#define STAILQ_REMOVE(head, elm, type, field) {				\
-	if ((head)->stqh_first == (elm)) {				\
-		STAILQ_REMOVE_HEAD(head, field);			\
-	}								\
-	else {								\
-		struct type *curelm = (head)->stqh_first;		\
-		while( curelm->field.stqe_next != (elm) )		\
-			curelm = curelm->field.stqe_next;		\
-		if((curelm->field.stqe_next =				\
-		    curelm->field.stqe_next->field.stqe_next) == NULL)	\
-			(head)->stqh_last = &(curelm)->field.stqe_next;	\
-	}								\
-}
-
-/*
- * List definitions.
- */
-#define LIST_HEAD(name, type)						\
-struct name {								\
-	struct type *lh_first;	/* first element */			\
-}
-
-#define LIST_ENTRY(type)						\
-struct {								\
-	struct type *le_next;	/* next element */			\
-	struct type **le_prev;	/* address of previous next element */	\
-}
-
-/*
- * List functions.
- */
-#define	LIST_INIT(head) {						\
-	(head)->lh_first = NULL;					\
-}
-
-#define LIST_INSERT_AFTER(listelm, elm, field) {			\
-	if (((elm)->field.le_next = (listelm)->field.le_next) != NULL)	\
-		(listelm)->field.le_next->field.le_prev =		\
-		    &(elm)->field.le_next;				\
-	(listelm)->field.le_next = (elm);				\
-	(elm)->field.le_prev = &(listelm)->field.le_next;		\
-}
-
-#define LIST_INSERT_BEFORE(listelm, elm, field) {			\
-	(elm)->field.le_prev = (listelm)->field.le_prev;		\
-	(elm)->field.le_next = (listelm);				\
-	*(listelm)->field.le_prev = (elm);				\
-	(listelm)->field.le_prev = &(elm)->field.le_next;		\
-}
-
-#define LIST_INSERT_HEAD(head, elm, field) {				\
-	if (((elm)->field.le_next = (head)->lh_first) != NULL)		\
-		(head)->lh_first->field.le_prev = &(elm)->field.le_next;\
-	(head)->lh_first = (elm);					\
-	(elm)->field.le_prev = &(head)->lh_first;			\
-}
-
-#define LIST_REMOVE(elm, field) {					\
-	if ((elm)->field.le_next != NULL)				\
-		(elm)->field.le_next->field.le_prev = 			\
-		    (elm)->field.le_prev;				\
-	*(elm)->field.le_prev = (elm)->field.le_next;			\
-}
-
-/*
- * Tail queue definitions.
- */
-#define TAILQ_HEAD(name, type)						\
-struct name {								\
-	struct type *tqh_first;	/* first element */			\
-	struct type **tqh_last;	/* addr of last next element */		\
-}
-
-#define TAILQ_HEAD_INITIALIZER(head)					\
-	{ NULL, &(head).tqh_first }
-
-#define TAILQ_ENTRY(type)						\
-struct {								\
-	struct type *tqe_next;	/* next element */			\
-	struct type **tqe_prev;	/* address of previous next element */	\
-}
-
-/*
- * Tail queue functions.
- */
-#define	TAILQ_EMPTY(head) ((head)->tqh_first == NULL)
-
-#define	TAILQ_FIRST(head) ((head)->tqh_first)
-
-#define	TAILQ_LAST(head) ((head)->tqh_last)
-
-#define	TAILQ_NEXT(elm, field) ((elm)->field.tqe_next)
-
-#define TAILQ_PREV(elm, field) ((elm)->field.tqe_prev)
-
-#define	TAILQ_INIT(head) {						\
-	(head)->tqh_first = NULL;					\
-	(head)->tqh_last = &(head)->tqh_first;				\
-}
-
-#define TAILQ_INSERT_HEAD(head, elm, field) {				\
-	if (((elm)->field.tqe_next = (head)->tqh_first) != NULL)	\
-		(head)->tqh_first->field.tqe_prev =			\
-		    &(elm)->field.tqe_next;				\
-	else								\
-		(head)->tqh_last = &(elm)->field.tqe_next;		\
-	(head)->tqh_first = (elm);					\
-	(elm)->field.tqe_prev = &(head)->tqh_first;			\
-}
-
-#define TAILQ_INSERT_TAIL(head, elm, field) {				\
-	(elm)->field.tqe_next = NULL;					\
-	(elm)->field.tqe_prev = (head)->tqh_last;			\
-	*(head)->tqh_last = (elm);					\
-	(head)->tqh_last = &(elm)->field.tqe_next;			\
-}
-
-#define TAILQ_INSERT_AFTER(head, listelm, elm, field) {			\
-	if (((elm)->field.tqe_next = (listelm)->field.tqe_next) != NULL)\
-		(elm)->field.tqe_next->field.tqe_prev = 		\
-		    &(elm)->field.tqe_next;				\
-	else								\
-		(head)->tqh_last = &(elm)->field.tqe_next;		\
-	(listelm)->field.tqe_next = (elm);				\
-	(elm)->field.tqe_prev = &(listelm)->field.tqe_next;		\
-}
-
-#define TAILQ_INSERT_BEFORE(listelm, elm, field) {			\
-	(elm)->field.tqe_prev = (listelm)->field.tqe_prev;		\
-	(elm)->field.tqe_next = (listelm);				\
-	*(listelm)->field.tqe_prev = (elm);				\
-	(listelm)->field.tqe_prev = &(elm)->field.tqe_next;		\
-}
-
-#define TAILQ_REMOVE(head, elm, field) {				\
-	if (((elm)->field.tqe_next) != NULL)				\
-		(elm)->field.tqe_next->field.tqe_prev = 		\
-		    (elm)->field.tqe_prev;				\
-	else								\
-		(head)->tqh_last = (elm)->field.tqe_prev;		\
-	*(elm)->field.tqe_prev = (elm)->field.tqe_next;			\
-}
-
-/*
- * Circular queue definitions.
- */
-#define CIRCLEQ_HEAD(name, type)					\
-struct name {								\
-	struct type *cqh_first;		/* first element */		\
-	struct type *cqh_last;		/* last element */		\
-}
-
-#define CIRCLEQ_ENTRY(type)						\
-struct {								\
-	struct type *cqe_next;		/* next element */		\
-	struct type *cqe_prev;		/* previous element */		\
-}
-
-/*
- * Circular queue functions.
- */
-#define	CIRCLEQ_INIT(head) {						\
-	(head)->cqh_first = (void *)(head);				\
-	(head)->cqh_last = (void *)(head);				\
-}
-
-#define CIRCLEQ_INSERT_AFTER(head, listelm, elm, field) {		\
-	(elm)->field.cqe_next = (listelm)->field.cqe_next;		\
-	(elm)->field.cqe_prev = (listelm);				\
-	if ((listelm)->field.cqe_next == (void *)(head))		\
-		(head)->cqh_last = (elm);				\
-	else								\
-		(listelm)->field.cqe_next->field.cqe_prev = (elm);	\
-	(listelm)->field.cqe_next = (elm);				\
-}
-
-#define CIRCLEQ_INSERT_BEFORE(head, listelm, elm, field) {		\
-	(elm)->field.cqe_next = (listelm);				\
-	(elm)->field.cqe_prev = (listelm)->field.cqe_prev;		\
-	if ((listelm)->field.cqe_prev == (void *)(head))		\
-		(head)->cqh_first = (elm);				\
-	else								\
-		(listelm)->field.cqe_prev->field.cqe_next = (elm);	\
-	(listelm)->field.cqe_prev = (elm);				\
-}
-
-#define CIRCLEQ_INSERT_HEAD(head, elm, field) {				\
-	(elm)->field.cqe_next = (head)->cqh_first;			\
-	(elm)->field.cqe_prev = (void *)(head);				\
-	if ((head)->cqh_last == (void *)(head))				\
-		(head)->cqh_last = (elm);				\
-	else								\
-		(head)->cqh_first->field.cqe_prev = (elm);		\
-	(head)->cqh_first = (elm);					\
-}
-
-#define CIRCLEQ_INSERT_TAIL(head, elm, field) {				\
-	(elm)->field.cqe_next = (void *)(head);				\
-	(elm)->field.cqe_prev = (head)->cqh_last;			\
-	if ((head)->cqh_first == (void *)(head))			\
-		(head)->cqh_first = (elm);				\
-	else								\
-		(head)->cqh_last->field.cqe_next = (elm);		\
-	(head)->cqh_last = (elm);					\
-}
-
-#define	CIRCLEQ_REMOVE(head, elm, field) {				\
-	if ((elm)->field.cqe_next == (void *)(head))			\
-		(head)->cqh_last = (elm)->field.cqe_prev;		\
-	else								\
-		(elm)->field.cqe_next->field.cqe_prev =			\
-		    (elm)->field.cqe_prev;				\
-	if ((elm)->field.cqe_prev == (void *)(head))			\
-		(head)->cqh_first = (elm)->field.cqe_next;		\
-	else								\
-		(elm)->field.cqe_prev->field.cqe_next =			\
-		    (elm)->field.cqe_next;				\
-}
-
-#ifdef KERNEL
-
-/*
- * XXX insque() and remque() are an old way of handling certain queues.
- * They bogusly assumes that all queue heads look alike.
- */
-
-struct quehead {
-	struct quehead *qh_link;
-	struct quehead *qh_rlink;
-};
-
-#ifdef	__GNUC__
-
-static __inline void
-insque(void *a, void *b)
-{
-	struct quehead *element = a, *head = b;
-
-	element->qh_link = head->qh_link;
-	element->qh_rlink = head;
-	head->qh_link = element;
-	element->qh_link->qh_rlink = element;
-}
-
-static __inline void
-remque(void *a)
-{
-	struct quehead *element = a;
-
-	element->qh_link->qh_rlink = element->qh_rlink;
-	element->qh_rlink->qh_link = element->qh_link;
-	element->qh_rlink = 0;
-}
-
-#else /* !__GNUC__ */
-
-void	insque __P((void *a, void *b));
-void	remque __P((void *a));
-
-#endif /* __GNUC__ */
-
-#endif /* KERNEL */
-
-#endif /* !_SYS_QUEUE_H_ */
diff --git a/c/src/libnetworking/sys/reboot.h b/c/src/libnetworking/sys/reboot.h
deleted file mode 100644
index 48a7f0f782..0000000000
--- a/c/src/libnetworking/sys/reboot.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1988, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)reboot.h	8.3 (Berkeley) 12/13/94
- * $Id$
- */
-
-#ifndef _SYS_REBOOT_H_
-#define _SYS_REBOOT_H_
-
-/*
- * Arguments to reboot system call.  These are passed to
- * the boot program and on to init.
- */
-#define	RB_AUTOBOOT	0	/* flags for system auto-booting itself */
-
-#define	RB_ASKNAME	0x001	/* ask for file name to reboot from */
-#define	RB_SINGLE	0x002	/* reboot to single user only */
-#define	RB_NOSYNC	0x004	/* dont sync before reboot */
-#define	RB_HALT		0x008	/* don't reboot, just halt */
-#define	RB_INITNAME	0x010	/* name given for /etc/init (unused) */
-#define	RB_DFLTROOT	0x020	/* use compiled-in rootdev */
-#define	RB_KDB		0x040	/* give control to kernel debugger */
-#define	RB_RDONLY	0x080	/* mount root fs read-only */
-#define	RB_DUMP		0x100	/* dump kernel memory before reboot */
-#define	RB_MINIROOT	0x200	/* mini-root present in memory at boot time */
-#define RB_CONFIG	0x400	/* invoke user configuration routing */
-#define RB_VERBOSE	0x800	/* print all potentially useful info */
-#define	RB_SERIAL	0x1000	/* user serial port as console */
-#define	RB_CDROM	0x2000	/* use cdrom as root */
-#define	RB_POWEROFF	0x4000	/* if you can, turn the power off */
-#define	RB_GDB		0x8000	/* use GDB remote debugger instead of DDB */
-#define	RB_MUTE		0x10000	/* Come up with the console muted */
-#define	RB_SELFTEST	0x20000	/* don't boot to normal operation, do selftest */
-
-#define	RB_BOOTINFO	0x80000000	/* have `struct bootinfo *' arg */
-
-/*
- * Constants for converting boot-style device number to type,
- * adaptor (uba, mba, etc), unit number and partition number.
- * Type (== major device number) is in the low byte
- * for backward compatibility.  Except for that of the "magic
- * number", each mask applies to the shifted value.
- * Format:
- *	 (4) (4) (4) (4)  (8)     (8)
- *	--------------------------------
- *	|MA | AD| CT| UN| PART  | TYPE |
- *	--------------------------------
- */
-#define	B_ADAPTORSHIFT		24
-#define	B_ADAPTORMASK		0x0f
-#define	B_ADAPTOR(val)		(((val) >> B_ADAPTORSHIFT) & B_ADAPTORMASK)
-#define B_CONTROLLERSHIFT	20
-#define B_CONTROLLERMASK	0xf
-#define	B_CONTROLLER(val)	(((val)>>B_CONTROLLERSHIFT) & B_CONTROLLERMASK)
-#define B_SLICESHIFT		20
-#define B_SLICEMASK		0xff
-#define B_SLICE(val)		(((val)>>B_SLICESHIFT) & B_SLICEMASK)
-#define B_UNITSHIFT		16
-#define B_UNITMASK		0xf
-#define	B_UNIT(val)		(((val) >> B_UNITSHIFT) & B_UNITMASK)
-#define B_PARTITIONSHIFT	8
-#define B_PARTITIONMASK		0xff
-#define	B_PARTITION(val)	(((val) >> B_PARTITIONSHIFT) & B_PARTITIONMASK)
-#define	B_TYPESHIFT		0
-#define	B_TYPEMASK		0xff
-#define	B_TYPE(val)		(((val) >> B_TYPESHIFT) & B_TYPEMASK)
-
-#define	B_MAGICMASK	0xf0000000
-#define	B_DEVMAGIC	0xa0000000
-
-#define MAKEBOOTDEV(type, adaptor, controller, unit, partition) \
-	(((type) << B_TYPESHIFT) | ((adaptor) << B_ADAPTORSHIFT) | \
-	((controller) << B_CONTROLLERSHIFT) | ((unit) << B_UNITSHIFT) | \
-	((partition) << B_PARTITIONSHIFT) | B_DEVMAGIC)
-
-#endif
diff --git a/c/src/libnetworking/sys/resourcevar.h b/c/src/libnetworking/sys/resourcevar.h
deleted file mode 100644
index 2b4c47e48f..0000000000
--- a/c/src/libnetworking/sys/resourcevar.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
- *  $Id$
- */
-
-/* intentionally empty file */
diff --git a/c/src/libnetworking/sys/rtprio.h b/c/src/libnetworking/sys/rtprio.h
deleted file mode 100644
index dd9521e7c8..0000000000
--- a/c/src/libnetworking/sys/rtprio.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) 1994, Henrik Vestergaard Draboel
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by (name).
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	$Id$
- */
-
-#ifndef _SYS_RTPRIO_H_
-#define _SYS_RTPRIO_H_
-
-/*
- * Process realtime-priority specifications to rtprio.
- */
-
-/* priority types */
-#define RTP_PRIO_REALTIME	0
-#define RTP_PRIO_NORMAL		1
-#define RTP_PRIO_IDLE		2
-
-/* priority range */
-#define RTP_PRIO_MIN		0	/* Highest priority */
-#define RTP_PRIO_MAX		31	/* Lowest priority */
-
-/*
- * rtprio() syscall functions
- */
-#define RTP_LOOKUP		0
-#define RTP_SET			1
-
-#ifndef LOCORE
-struct rtprio {
-	u_short type;
-	u_short prio;
-};
-#endif
-
-#ifndef KERNEL
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-int	rtprio __P((int, pid_t, struct rtprio *));
-__END_DECLS
-#endif	/* !KERNEL */
-#endif	/* !_SYS_RTPRIO_H_ */
diff --git a/c/src/libnetworking/sys/select.h b/c/src/libnetworking/sys/select.h
deleted file mode 100644
index e69971e3b6..0000000000
--- a/c/src/libnetworking/sys/select.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)select.h	8.2 (Berkeley) 1/4/94
- * $Id$
- */
-
-#ifndef _SYS_SELECT_H_
-#define	_SYS_SELECT_H_
-
-/*
- * Used to maintain information about processes that wish to be
- * notified when I/O becomes possible.
- */
-struct selinfo {
-	pid_t	si_pid;		/* process to be notified */
-	short	si_flags;	/* see below */
-};
-#define	SI_COLL	0x0001		/* collision occurred */
-
-#ifdef KERNEL
-struct proc;
-
-void	selrecord __P((struct proc *selector, struct selinfo *));
-void	selwakeup __P((struct selinfo *));
-#endif
-
-#endif /* !_SYS_SELECT_H_ */
diff --git a/c/src/libnetworking/sys/signalvar.h b/c/src/libnetworking/sys/signalvar.h
deleted file mode 100644
index 8900458fdb..0000000000
--- a/c/src/libnetworking/sys/signalvar.h
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)signalvar.h	8.6 (Berkeley) 2/19/95
- * $Id$
- */
-
-#ifndef	_SYS_SIGNALVAR_H_		/* tmp for user.h */
-#define	_SYS_SIGNALVAR_H_
-
-/*
- * Kernel signal definitions and data structures,
- * not exported to user programs.
- */
-
-/*
- * Process signal actions and state, needed only within the process
- * (not necessarily resident).
- */
-struct	sigacts {
-	sig_t	ps_sigact[NSIG];	/* disposition of signals */
-	sigset_t ps_catchmask[NSIG];	/* signals to be blocked */
-	sigset_t ps_sigonstack;		/* signals to take on sigstack */
-	sigset_t ps_sigintr;		/* signals that interrupt syscalls */
-	sigset_t ps_sigreset;		/* signals that reset when caught */
-	sigset_t ps_signodefer;		/* signals not masked while handled */
-	sigset_t ps_oldmask;		/* saved mask from before sigpause */
-	int	ps_flags;		/* signal flags, below */
-	struct	sigaltstack ps_sigstk;	/* sp & on stack state variable */
-	int	ps_sig;			/* for core dump/debugger XXX */
-	u_long	ps_code;		/* for core dump/debugger XXX */
-	sigset_t ps_usertramp;		/* SunOS compat; libc sigtramp XXX */
-};
-
-/* signal flags */
-#define	SAS_OLDMASK	0x01		/* need to restore mask before pause */
-#define	SAS_ALTSTACK	0x02		/* have alternate signal stack */
-
-/* additional signal action values, used only temporarily/internally */
-#define	SIG_CATCH	((__sighandler_t *)2)
-#define	SIG_HOLD	((__sighandler_t *)3)
-
-/*
- * get signal action for process and signal; currently only for current process
- */
-#define SIGACTION(p, sig)	(p->p_sigacts->ps_sigact[(sig)])
-
-/*
- * Determine signal that should be delivered to process p, the current
- * process, 0 if none.  If there is a pending stop signal with default
- * action, the process stops in issignal().
- */
-#define	CURSIG(p)							\
-	(((p)->p_siglist == 0 ||					\
-	    (((p)->p_flag & P_TRACED) == 0 &&				\
-	     ((p)->p_siglist & ~(p)->p_sigmask) == 0)) ?		\
-	    0 : issignal(p))
-
-/*
- * Clear a pending signal from a process.
- */
-#define	CLRSIG(p, sig)	{ (p)->p_siglist &= ~sigmask(sig); }
-
-/*
- * Signal properties and actions.
- * The array below categorizes the signals and their default actions
- * according to the following properties:
- */
-#define	SA_KILL		0x01		/* terminates process by default */
-#define	SA_CORE		0x02		/* ditto and coredumps */
-#define	SA_STOP		0x04		/* suspend process */
-#define	SA_TTYSTOP	0x08		/* ditto, from tty */
-#define	SA_IGNORE	0x10		/* ignore by default */
-#define	SA_CONT		0x20		/* continue if suspended */
-#define	SA_CANTMASK	0x40		/* non-maskable, catchable */
-
-#ifdef	SIGPROP
-static int sigprop[NSIG + 1] = {
-	0,			/* unused */
-	SA_KILL,		/* SIGHUP */
-	SA_KILL,		/* SIGINT */
-	SA_KILL|SA_CORE,	/* SIGQUIT */
-	SA_KILL|SA_CORE,	/* SIGILL */
-	SA_KILL|SA_CORE,	/* SIGTRAP */
-	SA_KILL|SA_CORE,	/* SIGABRT */
-	SA_KILL|SA_CORE,	/* SIGEMT */
-	SA_KILL|SA_CORE,	/* SIGFPE */
-	SA_KILL,		/* SIGKILL */
-	SA_KILL|SA_CORE,	/* SIGBUS */
-	SA_KILL|SA_CORE,	/* SIGSEGV */
-	SA_KILL|SA_CORE,	/* SIGSYS */
-	SA_KILL,		/* SIGPIPE */
-	SA_KILL,		/* SIGALRM */
-	SA_KILL,		/* SIGTERM */
-	SA_IGNORE,		/* SIGURG */
-	SA_STOP,		/* SIGSTOP */
-	SA_STOP|SA_TTYSTOP,	/* SIGTSTP */
-	SA_IGNORE|SA_CONT,	/* SIGCONT */
-	SA_IGNORE,		/* SIGCHLD */
-	SA_STOP|SA_TTYSTOP,	/* SIGTTIN */
-	SA_STOP|SA_TTYSTOP,	/* SIGTTOU */
-	SA_IGNORE,		/* SIGIO */
-	SA_KILL,		/* SIGXCPU */
-	SA_KILL,		/* SIGXFSZ */
-	SA_KILL,		/* SIGVTALRM */
-	SA_KILL,		/* SIGPROF */
-	SA_IGNORE,		/* SIGWINCH  */
-	SA_IGNORE,		/* SIGINFO */
-	SA_KILL,		/* SIGUSR1 */
-	SA_KILL,		/* SIGUSR2 */
-};
-
-#define	contsigmask	(sigmask(SIGCONT))
-#define	stopsigmask	(sigmask(SIGSTOP) | sigmask(SIGTSTP) | \
-			    sigmask(SIGTTIN) | sigmask(SIGTTOU))
-
-#endif /* SIGPROP */
-
-#define	sigcantmask	(sigmask(SIGKILL) | sigmask(SIGSTOP))
-
-#ifdef KERNEL
-/*
- * Machine-independent functions:
- */
-void	execsigs __P((struct proc *p));
-void	gsignal __P((int pgid, int sig));
-int	issignal __P((struct proc *p));
-void	killproc __P((struct proc *p, char *why));
-void	pgsignal __P((struct pgrp *pgrp, int sig, int checkctty));
-void	postsig __P((int sig));
-void	psignal __P((struct proc *p, int sig));
-void	setsigvec __P((struct proc *p, int signum, struct sigaction *sa));
-void	sigexit __P((struct proc *p, int signum));
-void	siginit __P((struct proc *p));
-void	trapsignal __P((struct proc *p, int sig, u_long code));
-
-/*
- * Machine-dependent functions:
- */
-void	sendsig __P((sig_t action, int sig, int returnmask, u_long code));
-#endif	/* KERNEL */
-#endif	/* !_SYS_SIGNALVAR_H_ */
diff --git a/c/src/libnetworking/sys/socket.h b/c/src/libnetworking/sys/socket.h
deleted file mode 100644
index 7e0f6c7572..0000000000
--- a/c/src/libnetworking/sys/socket.h
+++ /dev/null
@@ -1,356 +0,0 @@
-/*
- * Copyright (c) 1982, 1985, 1986, 1988, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)socket.h	8.4 (Berkeley) 2/21/94
- * $Id$
- */
-
-#ifndef _SYS_SOCKET_H_
-#define	_SYS_SOCKET_H_
-
-/*
- * Definitions related to sockets: types, address families, options.
- */
-
-/*
- * Types
- */
-#define	SOCK_STREAM	1		/* stream socket */
-#define	SOCK_DGRAM	2		/* datagram socket */
-#define	SOCK_RAW	3		/* raw-protocol interface */
-#define	SOCK_RDM	4		/* reliably-delivered message */
-#define	SOCK_SEQPACKET	5		/* sequenced packet stream */
-
-/*
- * Option flags per-socket.
- */
-#define	SO_DEBUG	0x0001		/* turn on debugging info recording */
-#define	SO_ACCEPTCONN	0x0002		/* socket has had listen() */
-#define	SO_REUSEADDR	0x0004		/* allow local address reuse */
-#define	SO_KEEPALIVE	0x0008		/* keep connections alive */
-#define	SO_DONTROUTE	0x0010		/* just use interface addresses */
-#define	SO_BROADCAST	0x0020		/* permit sending of broadcast msgs */
-#define	SO_USELOOPBACK	0x0040		/* bypass hardware when possible */
-#define	SO_LINGER	0x0080		/* linger on close if data present */
-#define	SO_OOBINLINE	0x0100		/* leave received OOB data in line */
-#define	SO_REUSEPORT	0x0200		/* allow local address & port reuse */
-#define	SO_TIMESTAMP	0x0400		/* timestamp received dgram traffic */
-
-/*
- * Additional options, not kept in so_options.
- */
-#define SO_SNDBUF	0x1001		/* send buffer size */
-#define SO_RCVBUF	0x1002		/* receive buffer size */
-#define SO_SNDLOWAT	0x1003		/* send low-water mark */
-#define SO_RCVLOWAT	0x1004		/* receive low-water mark */
-#define SO_SNDTIMEO	0x1005		/* send timeout */
-#define SO_RCVTIMEO	0x1006		/* receive timeout */
-#define	SO_ERROR	0x1007		/* get error status and clear */
-#define	SO_TYPE		0x1008		/* get socket type */
-#define	SO_PRIVSTATE	0x1009		/* get/deny privileged state */
-
-/*
- * Structure used for manipulating linger option.
- */
-struct	linger {
-	int	l_onoff;		/* option on/off */
-	int	l_linger;		/* linger time */
-};
-
-/*
- * Level number for (get/set)sockopt() to apply to socket itself.
- */
-#define	SOL_SOCKET	0xffff		/* options for socket level */
-
-/*
- * Address families.
- */
-#define	AF_UNSPEC	0		/* unspecified */
-#define	AF_LOCAL	1		/* local to host (pipes, portals) */
-#define	AF_UNIX		AF_LOCAL	/* backward compatibility */
-#define	AF_INET		2		/* internetwork: UDP, TCP, etc. */
-#define	AF_IMPLINK	3		/* arpanet imp addresses */
-#define	AF_PUP		4		/* pup protocols: e.g. BSP */
-#define	AF_CHAOS	5		/* mit CHAOS protocols */
-#define	AF_NS		6		/* XEROX NS protocols */
-#define	AF_ISO		7		/* ISO protocols */
-#define	AF_OSI		AF_ISO
-#define	AF_ECMA		8		/* European computer manufacturers */
-#define	AF_DATAKIT	9		/* datakit protocols */
-#define	AF_CCITT	10		/* CCITT protocols, X.25 etc */
-#define	AF_SNA		11		/* IBM SNA */
-#define AF_DECnet	12		/* DECnet */
-#define AF_DLI		13		/* DEC Direct data link interface */
-#define AF_LAT		14		/* LAT */
-#define	AF_HYLINK	15		/* NSC Hyperchannel */
-#define	AF_APPLETALK	16		/* Apple Talk */
-#define	AF_ROUTE	17		/* Internal Routing Protocol */
-#define	AF_LINK		18		/* Link layer interface */
-#define	pseudo_AF_XTP	19		/* eXpress Transfer Protocol (no AF) */
-#define	AF_COIP		20		/* connection-oriented IP, aka ST II */
-#define	AF_CNT		21		/* Computer Network Technology */
-#define pseudo_AF_RTIP	22		/* Help Identify RTIP packets */
-#define	AF_IPX		23		/* Novell Internet Protocol */
-#define	AF_SIP		24		/* Simple Internet Protocol */
-#define	pseudo_AF_PIP	25		/* Help Identify PIP packets */
-#define	AF_ISDN		26		/* Integrated Services Digital Network*/
-#define	AF_E164		AF_ISDN		/* CCITT E.164 recommendation */
-#define	pseudo_AF_KEY	27		/* Internal key-management function */
-#define	AF_INET6	28		/* IPv6 */
-
-#define	AF_MAX		29
-
-/*
- * Structure used by kernel to store most
- * addresses.
- */
-struct sockaddr {
-	u_char	sa_len;			/* total length */
-	u_char	sa_family;		/* address family */
-	char	sa_data[14];		/* actually longer; address value */
-};
-
-/*
- * Structure used by kernel to pass protocol
- * information in raw sockets.
- */
-struct sockproto {
-	u_short	sp_family;		/* address family */
-	u_short	sp_protocol;		/* protocol */
-};
-
-/*
- * Protocol families, same as address families for now.
- */
-#define	PF_UNSPEC	AF_UNSPEC
-#define	PF_LOCAL	AF_LOCAL
-#define	PF_UNIX		PF_LOCAL	/* backward compatibility */
-#define	PF_INET		AF_INET
-#define	PF_IMPLINK	AF_IMPLINK
-#define	PF_PUP		AF_PUP
-#define	PF_CHAOS	AF_CHAOS
-#define	PF_NS		AF_NS
-#define	PF_ISO		AF_ISO
-#define	PF_OSI		AF_ISO
-#define	PF_ECMA		AF_ECMA
-#define	PF_DATAKIT	AF_DATAKIT
-#define	PF_CCITT	AF_CCITT
-#define	PF_SNA		AF_SNA
-#define PF_DECnet	AF_DECnet
-#define PF_DLI		AF_DLI
-#define PF_LAT		AF_LAT
-#define	PF_HYLINK	AF_HYLINK
-#define	PF_APPLETALK	AF_APPLETALK
-#define	PF_ROUTE	AF_ROUTE
-#define	PF_LINK		AF_LINK
-#define	PF_XTP		pseudo_AF_XTP	/* really just proto family, no AF */
-#define	PF_COIP		AF_COIP
-#define	PF_CNT		AF_CNT
-#define	PF_SIP		AF_SIP
-#define	PF_IPX		AF_IPX		/* same format as AF_NS */
-#define PF_RTIP		pseudo_AF_RTIP	/* same format as AF_INET */
-#define PF_PIP		pseudo_AF_PIP
-#define	PF_ISDN		AF_ISDN
-#define	PF_KEY		pseudo_AF_KEY
-#define	PF_INET6	AF_INET6
-
-#define	PF_MAX		AF_MAX
-
-/*
- * Definitions for network related sysctl, CTL_NET.
- *
- * Second level is protocol family.
- * Third level is protocol number.
- *
- * Further levels are defined by the individual families below.
- */
-#define NET_MAXID	AF_MAX
-
-#define CTL_NET_NAMES { \
-	{ 0, 0 }, \
-	{ "unix", CTLTYPE_NODE }, \
-	{ "inet", CTLTYPE_NODE }, \
-	{ "implink", CTLTYPE_NODE }, \
-	{ "pup", CTLTYPE_NODE }, \
-	{ "chaos", CTLTYPE_NODE }, \
-	{ "xerox_ns", CTLTYPE_NODE }, \
-	{ "iso", CTLTYPE_NODE }, \
-	{ "emca", CTLTYPE_NODE }, \
-	{ "datakit", CTLTYPE_NODE }, \
-	{ "ccitt", CTLTYPE_NODE }, \
-	{ "ibm_sna", CTLTYPE_NODE }, \
-	{ "decnet", CTLTYPE_NODE }, \
-	{ "dec_dli", CTLTYPE_NODE }, \
-	{ "lat", CTLTYPE_NODE }, \
-	{ "hylink", CTLTYPE_NODE }, \
-	{ "appletalk", CTLTYPE_NODE }, \
-	{ "route", CTLTYPE_NODE }, \
-	{ "link_layer", CTLTYPE_NODE }, \
-	{ "xtp", CTLTYPE_NODE }, \
-	{ "coip", CTLTYPE_NODE }, \
-	{ "cnt", CTLTYPE_NODE }, \
-	{ "rtip", CTLTYPE_NODE }, \
-	{ "ipx", CTLTYPE_NODE }, \
-	{ "sip", CTLTYPE_NODE }, \
-	{ "pip", CTLTYPE_NODE }, \
-	{ "isdn", CTLTYPE_NODE }, \
-	{ "key", CTLTYPE_NODE }, \
-}
-
-/*
- * PF_ROUTE - Routing table
- *
- * Three additional levels are defined:
- *	Fourth: address family, 0 is wildcard
- *	Fifth: type of info, defined below
- *	Sixth: flag(s) to mask with for NET_RT_FLAGS
- */
-#define NET_RT_DUMP	1		/* dump; may limit to a.f. */
-#define NET_RT_FLAGS	2		/* by flags, e.g. RESOLVING */
-#define NET_RT_IFLIST	3		/* survey interface list */
-#define	NET_RT_MAXID	4
-
-#define CTL_NET_RT_NAMES { \
-	{ 0, 0 }, \
-	{ "dump", CTLTYPE_STRUCT }, \
-	{ "flags", CTLTYPE_STRUCT }, \
-	{ "iflist", CTLTYPE_STRUCT }, \
-}
-
-/*
- * Maximum queue length specifiable by listen.
- */
-#define	SOMAXCONN	128
-
-/*
- * Message header for recvmsg and sendmsg calls.
- * Used value-result for recvmsg, value only for sendmsg.
- */
-struct msghdr {
-	caddr_t	msg_name;		/* optional address */
-	u_int	msg_namelen;		/* size of address */
-	struct	iovec *msg_iov;		/* scatter/gather array */
-	u_int	msg_iovlen;		/* # elements in msg_iov */
-	caddr_t	msg_control;		/* ancillary data, see below */
-	u_int	msg_controllen;		/* ancillary data buffer len */
-	int	msg_flags;		/* flags on received message */
-};
-
-#define	MSG_OOB		0x1		/* process out-of-band data */
-#define	MSG_PEEK	0x2		/* peek at incoming message */
-#define	MSG_DONTROUTE	0x4		/* send without using routing tables */
-#define	MSG_EOR		0x8		/* data completes record */
-#define	MSG_TRUNC	0x10		/* data discarded before delivery */
-#define	MSG_CTRUNC	0x20		/* control data lost before delivery */
-#define	MSG_WAITALL	0x40		/* wait for full request or error */
-#define	MSG_DONTWAIT	0x80		/* this message should be nonblocking */
-#define	MSG_EOF		0x100		/* data completes connection */
-#define MSG_COMPAT      0x8000		/* used in sendit() */
-
-/*
- * Header for ancillary data objects in msg_control buffer.
- * Used for additional information with/about a datagram
- * not expressible by flags.  The format is a sequence
- * of message elements headed by cmsghdr structures.
- */
-struct cmsghdr {
-	u_int	cmsg_len;		/* data byte count, including hdr */
-	int	cmsg_level;		/* originating protocol */
-	int	cmsg_type;		/* protocol-specific type */
-/* followed by	u_char  cmsg_data[]; */
-};
-
-/* given pointer to struct cmsghdr, return pointer to data */
-#define	CMSG_DATA(cmsg)		((u_char *)((cmsg) + 1))
-
-/* given pointer to struct cmsghdr, return pointer to next cmsghdr */
-#define	CMSG_NXTHDR(mhdr, cmsg)	\
-	(((caddr_t)(cmsg) + (cmsg)->cmsg_len + sizeof(struct cmsghdr) > \
-	    (mhdr)->msg_control + (mhdr)->msg_controllen) ? \
-	    (struct cmsghdr *)NULL : \
-	    (struct cmsghdr *)((caddr_t)(cmsg) + ALIGN((cmsg)->cmsg_len)))
-
-#define	CMSG_FIRSTHDR(mhdr)	((struct cmsghdr *)(mhdr)->msg_control)
-
-/* "Socket"-level control message types: */
-#define	SCM_RIGHTS	0x01		/* access rights (array of int) */
-#define	SCM_TIMESTAMP	0x02		/* timestamp (struct timeval) */
-
-/*
- * 4.3 compat sockaddr, move to compat file later
- */
-struct osockaddr {
-	u_short	sa_family;		/* address family */
-	char	sa_data[14];		/* up to 14 bytes of direct address */
-};
-
-/*
- * 4.3-compat message header (move to compat file later).
- */
-struct omsghdr {
-	caddr_t	msg_name;		/* optional address */
-	int	msg_namelen;		/* size of address */
-	struct	iovec *msg_iov;		/* scatter/gather array */
-	int	msg_iovlen;		/* # elements in msg_iov */
-	caddr_t	msg_accrights;		/* access rights sent/received */
-	int	msg_accrightslen;
-};
-
-#ifndef	KERNEL
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-int	accept __P((int, struct sockaddr *, int *));
-int	bind __P((int, const struct sockaddr *, int));
-int	connect __P((int, const struct sockaddr *, int));
-int	getpeername __P((int, struct sockaddr *, int *));
-int	getsockname __P((int, struct sockaddr *, int *));
-int	getsockopt __P((int, int, int, void *, int *));
-int	listen __P((int, int));
-ssize_t	recv __P((int, void *, size_t, int));
-ssize_t	recvfrom __P((int, void *, size_t, int, struct sockaddr *, int *));
-ssize_t	recvmsg __P((int, struct msghdr *, int));
-ssize_t	send __P((int, const void *, size_t, int));
-ssize_t	sendto __P((int, const void *,
-	    size_t, int, const struct sockaddr *, int));
-ssize_t	sendmsg __P((int, const struct msghdr *, int));
-int	setsockopt __P((int, int, int, const void *, int));
-int	shutdown __P((int, int));
-int	socket __P((int, int, int));
-int	socketpair __P((int, int, int, int *));
-__END_DECLS
-
-#else /* KERNEL */
-void	pfctlinput __P((int, struct sockaddr *));
-#endif /* !KERNEL */
-#endif /* !_SYS_SOCKET_H_ */
diff --git a/c/src/libnetworking/sys/socketvar.h b/c/src/libnetworking/sys/socketvar.h
deleted file mode 100644
index 257fee012b..0000000000
--- a/c/src/libnetworking/sys/socketvar.h
+++ /dev/null
@@ -1,279 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)socketvar.h	8.3 (Berkeley) 2/19/95
- * $Id$
- */
-
-#ifndef _SYS_SOCKETVAR_H_
-#define _SYS_SOCKETVAR_H_
-
-#include <sys/queue.h>			/* for TAILQ macros */
-#include <sys/select.h>			/* for struct selinfo */
-
-/*
- * Kernel structure per socket.
- * Contains send and receive buffer queues,
- * handle on protocol and pointer to protocol
- * private data and error information.
- */
-struct socket {
-	short	so_type;		/* generic type, see socket.h */
-	short	so_options;		/* from socket call, see socket.h */
-	short	so_linger;		/* time to linger while closing */
-	short	so_state;		/* internal state flags SS_*, below */
-	caddr_t	so_pcb;			/* protocol control block */
-	struct	protosw *so_proto;	/* protocol handle */
-/*
- * Variables for connection queuing.
- * Socket where accepts occur is so_head in all subsidiary sockets.
- * If so_head is 0, socket is not related to an accept.
- * For head socket so_q0 queues partially completed connections,
- * while so_q is a queue of connections ready to be accepted.
- * If a connection is aborted and it has so_head set, then
- * it has to be pulled out of either so_q0 or so_q.
- * We allow connections to queue up based on current queue lengths
- * and limit on number of queued connections for this socket.
- */
-	struct	socket *so_head;	/* back pointer to accept socket */
-	TAILQ_HEAD(, socket) so_incomp;	/* queue of partial unaccepted connections */
-	TAILQ_HEAD(, socket) so_comp;	/* queue of complete unaccepted connections */
-	TAILQ_ENTRY(socket) so_list;	/* list of unaccepted connections */
-	short	so_qlen;		/* number of unaccepted connections */
-	short	so_incqlen;		/* number of unaccepted incomplete
-					   connections */
-	short	so_qlimit;		/* max number queued connections */
-	short	so_timeo;		/* connection timeout */
-	u_short	so_error;		/* error affecting connection */
-	pid_t	so_pgid;		/* pgid for signals */
-	u_long	so_oobmark;		/* chars to oob mark */
-/*
- * Variables for socket buffering.
- */
-	struct	sockbuf {
-		u_long	sb_cc;		/* actual chars in buffer */
-		u_long	sb_hiwat;	/* max actual char count */
-		u_long	sb_mbcnt;	/* chars of mbufs used */
-		u_long	sb_mbmax;	/* max chars of mbufs to use */
-		long	sb_lowat;	/* low water mark */
-		struct	mbuf *sb_mb;	/* the mbuf chain */
-		struct	selinfo sb_sel;	/* process selecting read/write */
-		short	sb_flags;	/* flags, see below */
-		short	sb_timeo;	/* timeout for read/write */
-	} so_rcv, so_snd;
-#define	SB_MAX		(256*1024)	/* default for max chars in sockbuf */
-#define	SB_LOCK		0x01		/* lock on data queue */
-#define	SB_WANT		0x02		/* someone is waiting to lock */
-#define	SB_WAIT		0x04		/* someone is waiting for data/space */
-#define	SB_SEL		0x08		/* someone is selecting */
-#define	SB_ASYNC	0x10		/* ASYNC I/O, need signals */
-#define	SB_NOTIFY	(SB_WAIT|SB_SEL|SB_ASYNC)
-#define	SB_NOINTR	0x40		/* operations not interruptible */
-
-	caddr_t	so_tpcb;		/* Wisc. protocol control block XXX */
-	void	(*so_upcall) __P((struct socket *so, caddr_t arg, int waitf));
-	caddr_t	so_upcallarg;		/* Arg for above */
-	uid_t	so_uid;			/* who opened the socket */
-};
-
-/*
- * Socket state bits.
- */
-#define	SS_NOFDREF		0x0001	/* no file table ref any more */
-#define	SS_ISCONNECTED		0x0002	/* socket connected to a peer */
-#define	SS_ISCONNECTING		0x0004	/* in process of connecting to peer */
-#define	SS_ISDISCONNECTING	0x0008	/* in process of disconnecting */
-#define	SS_CANTSENDMORE		0x0010	/* can't send more data to peer */
-#define	SS_CANTRCVMORE		0x0020	/* can't receive more data from peer */
-#define	SS_RCVATMARK		0x0040	/* at mark on input */
-
-#define	SS_PRIV			0x0080	/* privileged for broadcast, raw... */
-#define	SS_NBIO			0x0100	/* non-blocking ops */
-#define	SS_ASYNC		0x0200	/* async i/o notify */
-#define	SS_ISCONFIRMING		0x0400	/* deciding to accept connection req */
-
-#define	SS_INCOMP		0x0800	/* unaccepted, incomplete connection */
-#define	SS_COMP			0x1000	/* unaccepted, complete connection */
-
-
-/*
- * Macros for sockets and socket buffering.
- */
-
-/*
- * How much space is there in a socket buffer (so->so_snd or so->so_rcv)?
- * This is problematical if the fields are unsigned, as the space might
- * still be negative (cc > hiwat or mbcnt > mbmax).  Should detect
- * overflow and return 0.  Should use "lmin" but it doesn't exist now.
- */
-#define	sbspace(sb) \
-    ((long) imin((int)((sb)->sb_hiwat - (sb)->sb_cc), \
-	 (int)((sb)->sb_mbmax - (sb)->sb_mbcnt)))
-
-/* do we have to send all at once on a socket? */
-#define	sosendallatonce(so) \
-    ((so)->so_proto->pr_flags & PR_ATOMIC)
-
-/* can we read something from so? */
-#define	soreadable(so) \
-    ((so)->so_rcv.sb_cc >= (so)->so_rcv.sb_lowat || \
-	((so)->so_state & SS_CANTRCVMORE) || \
-	(so)->so_comp.tqh_first || (so)->so_error)
-
-/* can we write something to so? */
-#define	sowriteable(so) \
-    ((sbspace(&(so)->so_snd) >= (so)->so_snd.sb_lowat && \
-	(((so)->so_state&SS_ISCONNECTED) || \
-	  ((so)->so_proto->pr_flags&PR_CONNREQUIRED)==0)) || \
-     ((so)->so_state & SS_CANTSENDMORE) || \
-     (so)->so_error)
-
-/* adjust counters in sb reflecting allocation of m */
-#define	sballoc(sb, m) { \
-	(sb)->sb_cc += (m)->m_len; \
-	(sb)->sb_mbcnt += MSIZE; \
-	if ((m)->m_flags & M_EXT) \
-		(sb)->sb_mbcnt += (m)->m_ext.ext_size; \
-}
-
-/* adjust counters in sb reflecting freeing of m */
-#define	sbfree(sb, m) { \
-	(sb)->sb_cc -= (m)->m_len; \
-	(sb)->sb_mbcnt -= MSIZE; \
-	if ((m)->m_flags & M_EXT) \
-		(sb)->sb_mbcnt -= (m)->m_ext.ext_size; \
-}
-
-/*
- * Set lock on sockbuf sb; sleep if lock is already held.
- * Unless SB_NOINTR is set on sockbuf, sleep is interruptible.
- * Returns error without lock if sleep is interrupted.
- */
-#define sblock(sb, wf) ((sb)->sb_flags & SB_LOCK ? \
-		(((wf) == M_WAITOK) ? sb_lock(sb) : EWOULDBLOCK) : \
-		((sb)->sb_flags |= SB_LOCK), 0)
-
-/* release lock on sockbuf sb */
-#define	sbunlock(sb) { \
-	(sb)->sb_flags &= ~SB_LOCK; \
-	if ((sb)->sb_flags & SB_WANT) { \
-		(sb)->sb_flags &= ~SB_WANT; \
-		wakeup((caddr_t)&(sb)->sb_flags); \
-	} \
-}
-
-#define	sorwakeup(so)	{ sowakeup((so), &(so)->so_rcv); \
-			  if ((so)->so_upcall) \
-			    (*((so)->so_upcall))((so), (so)->so_upcallarg, M_DONTWAIT); \
-			}
-
-#define	sowwakeup(so)	sowakeup((so), &(so)->so_snd)
-
-#ifdef KERNEL
-extern u_long	sb_max;
-
-/* to catch callers missing new second argument to sonewconn: */
-#define	sonewconn(head, connstatus)	sonewconn1((head), (connstatus))
-
-struct filedesc;
-struct mbuf;
-struct sockaddr;
-struct stat;
-
-/*
- * File operations on sockets.
- */
-int	soo_ioctl __P((struct file *fp, int cmd, caddr_t data,
-	    struct proc *p));
-int	soo_select __P((struct file *fp, int which, struct proc *p));
-int	soo_stat __P((struct socket *so, struct stat *ub));
-
-/*
- * From uipc_socket and friends
- */
-int	getsock __P((struct filedesc *fdp, int fdes, struct file **fpp));
-int	sockargs __P((struct mbuf **mp, caddr_t buf, int buflen, int type));
-void	sbappend __P((struct sockbuf *sb, struct mbuf *m));
-int	sbappendaddr __P((struct sockbuf *sb, struct sockaddr *asa,
-	    struct mbuf *m0, struct mbuf *control));
-int	sbappendcontrol __P((struct sockbuf *sb, struct mbuf *m0,
-	    struct mbuf *control));
-void	sbappendrecord __P((struct sockbuf *sb, struct mbuf *m0));
-void	sbcheck __P((struct sockbuf *sb));
-void	sbcompress __P((struct sockbuf *sb, struct mbuf *m, struct mbuf *n));
-struct mbuf *
-	sbcreatecontrol __P((caddr_t p, int size, int type, int level));
-void	sbdrop __P((struct sockbuf *sb, int len));
-void	sbdroprecord __P((struct sockbuf *sb));
-void	sbflush __P((struct sockbuf *sb));
-void	sbinsertoob __P((struct sockbuf *sb, struct mbuf *m0));
-void	sbrelease __P((struct sockbuf *sb));
-int	sbreserve __P((struct sockbuf *sb, u_long cc));
-int	sbwait __P((struct sockbuf *sb));
-int	sb_lock __P((struct sockbuf *sb));
-int	soabort __P((struct socket *so));
-int	soaccept __P((struct socket *so, struct mbuf *nam));
-int	sobind __P((struct socket *so, struct mbuf *nam));
-void	socantrcvmore __P((struct socket *so));
-void	socantsendmore __P((struct socket *so));
-int	soclose __P((struct socket *so));
-int	soconnect __P((struct socket *so, struct mbuf *nam));
-int	soconnect2 __P((struct socket *so1, struct socket *so2));
-int	socreate __P((int dom, struct socket **aso, int type, int proto,
-	    struct proc *p));
-int	sodisconnect __P((struct socket *so));
-void	sofree __P((struct socket *so));
-int	sogetopt __P((struct socket *so, int level, int optname,
-	    struct mbuf **mp));
-void	sohasoutofband __P((struct socket *so));
-void	soisconnected __P((struct socket *so));
-void	soisconnecting __P((struct socket *so));
-void	soisdisconnected __P((struct socket *so));
-void	soisdisconnecting __P((struct socket *so));
-int	solisten __P((struct socket *so, int backlog));
-struct socket *
-	sodropablereq __P((struct socket *head));
-struct socket *
-	sonewconn1 __P((struct socket *head, int connstatus));
-int	soreceive __P((struct socket *so, struct mbuf **paddr, struct uio *uio,
-	    struct mbuf **mp0, struct mbuf **controlp, int *flagsp));
-int	soreserve __P((struct socket *so, u_long sndcc, u_long rcvcc));
-void	sorflush __P((struct socket *so));
-int	sosend __P((struct socket *so, struct mbuf *addr, struct uio *uio,
-	    struct mbuf *top, struct mbuf *control, int flags));
-int	sosetopt __P((struct socket *so, int level, int optname,
-	    struct mbuf *m0));
-int	soshutdown __P((struct socket *so, int how));
-void	sowakeup __P((struct socket *so, struct sockbuf *sb));
-#endif /* KERNEL */
-
-#endif /* !_SYS_SOCKETVAR_H_ */
diff --git a/c/src/libnetworking/sys/sockio.h b/c/src/libnetworking/sys/sockio.h
deleted file mode 100644
index 020061170f..0000000000
--- a/c/src/libnetworking/sys/sockio.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)sockio.h	8.1 (Berkeley) 3/28/94
- * $Id$
- */
-
-#ifndef	_SYS_SOCKIO_H_
-#define	_SYS_SOCKIO_H_
-
-#include <sys/ioccom.h>
-
-/* Socket ioctl's. */
-#define	SIOCSHIWAT	 _IOW('s',  0, int)		/* set high watermark */
-#define	SIOCGHIWAT	 _IOR('s',  1, int)		/* get high watermark */
-#define	SIOCSLOWAT	 _IOW('s',  2, int)		/* set low watermark */
-#define	SIOCGLOWAT	 _IOR('s',  3, int)		/* get low watermark */
-#define	SIOCATMARK	 _IOR('s',  7, int)		/* at oob mark? */
-#define	SIOCSPGRP	 _IOW('s',  8, int)		/* set process group */
-#define	SIOCGPGRP	 _IOR('s',  9, int)		/* get process group */
-
-#define	SIOCADDRT	 _IOW('r', 10, struct ortentry)	/* add route */
-#define	SIOCDELRT	 _IOW('r', 11, struct ortentry)	/* delete route */
-#define	SIOCGETVIFCNT	_IOWR('r', 15, struct sioc_vif_req)/* get vif pkt cnt */
-#define	SIOCGETSGCNT	_IOWR('r', 16, struct sioc_sg_req) /* get s,g pkt cnt */
-
-#define	SIOCSIFADDR	 _IOW('i', 12, struct ifreq)	/* set ifnet address */
-#define	OSIOCGIFADDR	_IOWR('i', 13, struct ifreq)	/* get ifnet address */
-#define	SIOCGIFADDR	_IOWR('i', 33, struct ifreq)	/* get ifnet address */
-#define	SIOCSIFDSTADDR	 _IOW('i', 14, struct ifreq)	/* set p-p address */
-#define	OSIOCGIFDSTADDR	_IOWR('i', 15, struct ifreq)	/* get p-p address */
-#define	SIOCGIFDSTADDR	_IOWR('i', 34, struct ifreq)	/* get p-p address */
-#define	SIOCSIFFLAGS	 _IOW('i', 16, struct ifreq)	/* set ifnet flags */
-#define	SIOCGIFFLAGS	_IOWR('i', 17, struct ifreq)	/* get ifnet flags */
-#define	OSIOCGIFBRDADDR	_IOWR('i', 18, struct ifreq)	/* get broadcast addr */
-#define	SIOCGIFBRDADDR	_IOWR('i', 35, struct ifreq)	/* get broadcast addr */
-#define	SIOCSIFBRDADDR	 _IOW('i', 19, struct ifreq)	/* set broadcast addr */
-#define	OSIOCGIFCONF	_IOWR('i', 20, struct ifconf)	/* get ifnet list */
-#define	SIOCGIFCONF	_IOWR('i', 36, struct ifconf)	/* get ifnet list */
-#define	OSIOCGIFNETMASK	_IOWR('i', 21, struct ifreq)	/* get net addr mask */
-#define	SIOCGIFNETMASK	_IOWR('i', 37, struct ifreq)	/* get net addr mask */
-#define	SIOCSIFNETMASK	 _IOW('i', 22, struct ifreq)	/* set net addr mask */
-#define	SIOCGIFMETRIC	_IOWR('i', 23, struct ifreq)	/* get IF metric */
-#define	SIOCSIFMETRIC	 _IOW('i', 24, struct ifreq)	/* set IF metric */
-#define	SIOCDIFADDR	 _IOW('i', 25, struct ifreq)	/* delete IF addr */
-#define	SIOCAIFADDR	 _IOW('i', 26, struct ifaliasreq)/* add/chg IF alias */
-
-#define	SIOCADDMULTI	 _IOW('i', 49, struct ifreq)	/* add m'cast addr */
-#define	SIOCDELMULTI	 _IOW('i', 50, struct ifreq)	/* del m'cast addr */
-#define	SIOCGIFMTU	_IOWR('i', 51, struct ifreq)	/* get IF mtu */
-#define	SIOCSIFMTU	 _IOW('i', 52, struct ifreq)	/* set IF mtu */
-#define	SIOCGIFPHYS	_IOWR('i', 53, struct ifreq)	/* get IF wire */
-#define	SIOCSIFPHYS	 _IOW('i', 54, struct ifreq)	/* set IF wire */
-#define	SIOCSIFMEDIA	_IOWR('i', 55, struct ifreq)	/* set net media */
-#define	SIOCGIFMEDIA	_IOWR('i', 56, struct ifmediareq) /* get net media */
-
-#endif /* !_SYS_SOCKIO_H_ */
diff --git a/c/src/libnetworking/sys/sysctl.h b/c/src/libnetworking/sys/sysctl.h
deleted file mode 100644
index b25ba43c4f..0000000000
--- a/c/src/libnetworking/sys/sysctl.h
+++ /dev/null
@@ -1,379 +0,0 @@
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Mike Karels at Berkeley Software Design, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)sysctl.h	8.1 (Berkeley) 6/2/93
- * $Id$
- */
-
-#ifndef _SYS_SYSCTL_H_
-#define	_SYS_SYSCTL_H_
-
-/*
- * Definitions for sysctl call.  The sysctl call uses a hierarchical name
- * for objects that can be examined or modified.  The name is expressed as
- * a sequence of integers.  Like a file path name, the meaning of each
- * component depends on its place in the hierarchy.  The top-level and kern
- * identifiers are defined here, and other identifiers are defined in the
- * respective subsystem header files.
- */
-
-#define CTL_MAXNAME	12	/* largest number of components supported */
-
-/*
- * Each subsystem defined by sysctl defines a list of variables
- * for that subsystem. Each name is either a node with further
- * levels defined below it, or it is a leaf of some particular
- * type given below. Each sysctl level defines a set of name/type
- * pairs to be used by sysctl(1) in manipulating the subsystem.
- */
-struct ctlname {
-	char	*ctl_name;	/* subsystem name */
-	int	ctl_type;	/* type of name */
-};
-
-#define CTLTYPE		0xf	/* Mask for the type */
-#define	CTLTYPE_NODE	1	/* name is a node */
-#define	CTLTYPE_INT	2	/* name describes an integer */
-#define	CTLTYPE_STRING	3	/* name describes a string */
-#define	CTLTYPE_QUAD	4	/* name describes a 64-bit number */
-#define	CTLTYPE_OPAQUE	5	/* name describes a structure */
-#define	CTLTYPE_STRUCT	CTLTYPE_OPAQUE	/* name describes a structure */
-
-#define CTLFLAG_RD	0x80000000	/* Allow reads of variable */
-#define CTLFLAG_WR	0x40000000	/* Allow writes to the variable */
-#define CTLFLAG_RW	(CTLFLAG_RD|CTLFLAG_WR)
-#define CTLFLAG_NOLOCK	0x20000000	/* XXX Don't Lock */
-#define CTLFLAG_ANYBODY	0x10000000	/* All users can set this var */
-
-/*
- * USE THIS instead of a hardwired number from the categories below
- * to get dynamically assigned sysctl entries using the linker-set
- * technology. This is the way nearly all new sysctl variables should
- * be implimented.
- * e.g. SYSCTL_INT(_parent, OID_AUTO, name, CTLFLAG_RW, &variable, 0, "");
- */ 
-#define OID_AUTO	(-1)
-
-#ifdef KERNEL
-#define SYSCTL_HANDLER_ARGS (struct sysctl_oid *oidp, void *arg1, int arg2, \
-	struct sysctl_req *req)
-
-/*
- * This describes the access space for a sysctl request.  This is needed
- * so that we can use the interface from the kernel or from user-space.
- */
-struct sysctl_req {
-	struct proc	*p;
-	int		lock;
-	void		*oldptr;
-	int		oldlen;
-	int		oldidx;
-	int		(*oldfunc)(struct sysctl_req *, const void *, int);
-	void		*newptr;
-	int		newlen;
-	int		newidx;
-	int		(*newfunc)(struct sysctl_req *, void *, int);
-};
-
-/*
- * This describes one "oid" in the MIB tree.  Potentially more nodes can
- * be hidden behind it, expanded by the handler.
- */
-struct sysctl_oid {
-	int		oid_number;
-	int		oid_kind;
-	void		*oid_arg1;
-	int		oid_arg2;
-	const char	*oid_name;
-	int 		(*oid_handler) SYSCTL_HANDLER_ARGS;
-	const char	*oid_fmt;
-};
-
-#define SYSCTL_IN(r, p, l)
-#define SYSCTL_OUT(r, p, l)
-
-int sysctl_handle_int SYSCTL_HANDLER_ARGS;
-int sysctl_handle_string SYSCTL_HANDLER_ARGS;
-int sysctl_handle_opaque SYSCTL_HANDLER_ARGS;
-
-/* This is the "raw" function for a mib-oid */
-#define SYSCTL_OID(parent, nbr, name, kind, a1, a2, handler, fmt, descr)
-
-/* This makes a node from which other oids can hang */
-#define SYSCTL_NODE(parent, nbr, name, access, handler, descr)
-
-/* This is a string len can be 0 to indicate '\0' termination */
-#define SYSCTL_STRING(parent, nbr, name, access, arg, len, descr) 
-
-/* This is a integer, if ptr is NULL, val is returned */
-#define SYSCTL_INT(parent, nbr, name, access, ptr, val, descr) 
-
-/* This is anything, specified by a pointer and a lenth */
-#define SYSCTL_OPAQUE(parent, nbr, name, access, ptr, len, fmt, descr) 
-
-/* This is a struct, specified by a pointer and type */
-#define SYSCTL_STRUCT(parent, nbr, name, access, ptr, type, descr) 
-
-/* Needs a proc.  Specify by pointer and arg */
-#define SYSCTL_PROC(parent, nbr, name, access, ptr, arg, handler, fmt, descr) 
-#endif /* KERNEL */
-
-/*
- * Top-level identifiers
- */
-#define	CTL_UNSPEC	0		/* unused */
-#define	CTL_KERN	1		/* "high kernel": proc, limits */
-#define	CTL_VM		2		/* virtual memory */
-#define	CTL_VFS		3		/* file system, mount type is next */
-#define	CTL_NET		4		/* network, see socket.h */
-#define	CTL_DEBUG	5		/* debugging parameters */
-#define	CTL_HW		6		/* generic cpu/io */
-#define	CTL_MACHDEP	7		/* machine dependent */
-#define	CTL_USER	8		/* user-level */
-#define	CTL_MAXID	9		/* number of valid top-level ids */
-
-#define CTL_NAMES { \
-	{ 0, 0 }, \
-	{ "kern", CTLTYPE_NODE }, \
-	{ "vm", CTLTYPE_NODE }, \
-	{ "vfs", CTLTYPE_NODE }, \
-	{ "net", CTLTYPE_NODE }, \
-	{ "debug", CTLTYPE_NODE }, \
-	{ "hw", CTLTYPE_NODE }, \
-	{ "machdep", CTLTYPE_NODE }, \
-	{ "user", CTLTYPE_NODE }, \
-}
-
-/*
- * CTL_KERN identifiers
- */
-#define	KERN_OSTYPE	 	 1	/* string: system version */
-#define	KERN_OSRELEASE	 	 2	/* string: system release */
-#define	KERN_OSREV	 	 3	/* int: system revision */
-#define	KERN_VERSION	 	 4	/* string: compile time info */
-#define	KERN_MAXVNODES	 	 5	/* int: max vnodes */
-#define	KERN_MAXPROC	 	 6	/* int: max processes */
-#define	KERN_MAXFILES	 	 7	/* int: max open files */
-#define	KERN_ARGMAX	 	 8	/* int: max arguments to exec */
-#define	KERN_SECURELVL	 	 9	/* int: system security level */
-#define	KERN_HOSTNAME		10	/* string: hostname */
-#define	KERN_HOSTID		11	/* int: host identifier */
-#define	KERN_CLOCKRATE		12	/* struct: struct clockrate */
-#define	KERN_VNODE		13	/* struct: vnode structures */
-#define	KERN_PROC		14	/* struct: process entries */
-#define	KERN_FILE		15	/* struct: file entries */
-#define	KERN_PROF		16	/* node: kernel profiling info */
-#define	KERN_POSIX1		17	/* int: POSIX.1 version */
-#define	KERN_NGROUPS		18	/* int: # of supplemental group ids */
-#define	KERN_JOB_CONTROL	19	/* int: is job control available */
-#define	KERN_SAVED_IDS		20	/* int: saved set-user/group-ID */
-#define	KERN_BOOTTIME		21	/* struct: time kernel was booted */
-#define KERN_NISDOMAINNAME	22	/* string: YP domain name */
-#define KERN_UPDATEINTERVAL	23	/* int: update process sleep time */
-#define KERN_OSRELDATE		24	/* int: OS release date */
-#define KERN_NTP_PLL		25	/* node: NTP PLL control */
-#define	KERN_BOOTFILE		26	/* string: name of booted kernel */
-#define	KERN_MAXFILESPERPROC	27	/* int: max open files per proc */
-#define	KERN_MAXPROCPERUID 	28	/* int: max processes per uid */
-#define KERN_DUMPDEV		29	/* dev_t: device to dump on */
-#define	KERN_SOMAXCONN		30	/* int: max connections in listen q */
-#define	KERN_MAXSOCKBUF		31	/* int: max size of a socket buffer */
-#define	KERN_PS_STRINGS		32	/* int: address of PS_STRINGS */
-#define	KERN_USRSTACK		33	/* int: address of USRSTACK */
-#define KERN_MAXID		34      /* number of valid kern ids */
-
-#define CTL_KERN_NAMES { \
-	{ 0, 0 }, \
-	{ "ostype", CTLTYPE_STRING }, \
-	{ "osrelease", CTLTYPE_STRING }, \
-	{ "osrevision", CTLTYPE_INT }, \
-	{ "version", CTLTYPE_STRING }, \
-	{ "maxvnodes", CTLTYPE_INT }, \
-	{ "maxproc", CTLTYPE_INT }, \
-	{ "maxfiles", CTLTYPE_INT }, \
-	{ "argmax", CTLTYPE_INT }, \
-	{ "securelevel", CTLTYPE_INT }, \
-	{ "hostname", CTLTYPE_STRING }, \
-	{ "hostid", CTLTYPE_INT }, \
-	{ "clockrate", CTLTYPE_STRUCT }, \
-	{ "vnode", CTLTYPE_STRUCT }, \
-	{ "proc", CTLTYPE_STRUCT }, \
-	{ "file", CTLTYPE_STRUCT }, \
-	{ "profiling", CTLTYPE_NODE }, \
-	{ "posix1version", CTLTYPE_INT }, \
-	{ "ngroups", CTLTYPE_INT }, \
-	{ "job_control", CTLTYPE_INT }, \
-	{ "saved_ids", CTLTYPE_INT }, \
-	{ "boottime", CTLTYPE_STRUCT }, \
-	{ "nisdomainname", CTLTYPE_STRING }, \
-	{ "update", CTLTYPE_INT }, \
-	{ "osreldate", CTLTYPE_INT }, \
-        { "ntp_pll", CTLTYPE_NODE }, \
-	{ "bootfile", CTLTYPE_STRING }, \
-	{ "maxfilesperproc", CTLTYPE_INT }, \
-	{ "maxprocperuid", CTLTYPE_INT }, \
-	{ "dumpdev", CTLTYPE_STRUCT }, /* we lie; don't print as int */ \
-	{ "somaxconn", CTLTYPE_INT }, \
-	{ "maxsockbuf", CTLTYPE_INT }, \
-	{ "ps_strings", CTLTYPE_INT }, \
-	{ "usrstack", CTLTYPE_INT }, \
-}
-
-/*
- * CTL_VFS identifiers
- */
-#define VFS_VFSCONF		0	/* get configured filesystems */
-#define VFS_MAXID		1	/* number of items */
-
-#define CTL_VFS_NAMES { \
-	{ "vfsconf", CTLTYPE_STRUCT }, \
-}
-
-/*
- * KERN_PROC subtypes
- */
-#define KERN_PROC_ALL		0	/* everything */
-#define	KERN_PROC_PID		1	/* by process id */
-#define	KERN_PROC_PGRP		2	/* by process group id */
-#define	KERN_PROC_SESSION	3	/* by session of pid */
-#define	KERN_PROC_TTY		4	/* by controlling tty */
-#define	KERN_PROC_UID		5	/* by effective uid */
-#define	KERN_PROC_RUID		6	/* by real uid */
-
-/*
- * CTL_HW identifiers
- */
-#define	HW_MACHINE	 1		/* string: machine class */
-#define	HW_MODEL	 2		/* string: specific machine model */
-#define	HW_NCPU		 3		/* int: number of cpus */
-#define	HW_BYTEORDER	 4		/* int: machine byte order */
-#define	HW_PHYSMEM	 5		/* int: total memory */
-#define	HW_USERMEM	 6		/* int: non-kernel memory */
-#define	HW_PAGESIZE	 7		/* int: software page size */
-#define	HW_DISKNAMES	 8		/* strings: disk drive names */
-#define	HW_DISKSTATS	 9		/* struct: diskstats[] */
-#define HW_FLOATINGPT	10		/* int: has HW floating point? */
-#define HW_MACHINE_ARCH	11		/* string: machine architecture */
-#define	HW_MAXID	12		/* number of valid hw ids */
-
-#define CTL_HW_NAMES { \
-	{ 0, 0 }, \
-	{ "machine", CTLTYPE_STRING }, \
-	{ "model", CTLTYPE_STRING }, \
-	{ "ncpu", CTLTYPE_INT }, \
-	{ "byteorder", CTLTYPE_INT }, \
-	{ "physmem", CTLTYPE_INT }, \
-	{ "usermem", CTLTYPE_INT }, \
-	{ "pagesize", CTLTYPE_INT }, \
-	{ "disknames", CTLTYPE_STRUCT }, \
-	{ "diskstats", CTLTYPE_STRUCT }, \
-	{ "floatingpoint", CTLTYPE_INT }, \
-}
-
-/*
- * CTL_USER definitions
- */
-#define	USER_CS_PATH		 1	/* string: _CS_PATH */
-#define	USER_BC_BASE_MAX	 2	/* int: BC_BASE_MAX */
-#define	USER_BC_DIM_MAX		 3	/* int: BC_DIM_MAX */
-#define	USER_BC_SCALE_MAX	 4	/* int: BC_SCALE_MAX */
-#define	USER_BC_STRING_MAX	 5	/* int: BC_STRING_MAX */
-#define	USER_COLL_WEIGHTS_MAX	 6	/* int: COLL_WEIGHTS_MAX */
-#define	USER_EXPR_NEST_MAX	 7	/* int: EXPR_NEST_MAX */
-#define	USER_LINE_MAX		 8	/* int: LINE_MAX */
-#define	USER_RE_DUP_MAX		 9	/* int: RE_DUP_MAX */
-#define	USER_POSIX2_VERSION	10	/* int: POSIX2_VERSION */
-#define	USER_POSIX2_C_BIND	11	/* int: POSIX2_C_BIND */
-#define	USER_POSIX2_C_DEV	12	/* int: POSIX2_C_DEV */
-#define	USER_POSIX2_CHAR_TERM	13	/* int: POSIX2_CHAR_TERM */
-#define	USER_POSIX2_FORT_DEV	14	/* int: POSIX2_FORT_DEV */
-#define	USER_POSIX2_FORT_RUN	15	/* int: POSIX2_FORT_RUN */
-#define	USER_POSIX2_LOCALEDEF	16	/* int: POSIX2_LOCALEDEF */
-#define	USER_POSIX2_SW_DEV	17	/* int: POSIX2_SW_DEV */
-#define	USER_POSIX2_UPE		18	/* int: POSIX2_UPE */
-#define	USER_STREAM_MAX		19	/* int: POSIX2_STREAM_MAX */
-#define	USER_TZNAME_MAX		20	/* int: POSIX2_TZNAME_MAX */
-#define	USER_MAXID		21	/* number of valid user ids */
-
-#define	CTL_USER_NAMES { \
-	{ 0, 0 }, \
-	{ "cs_path", CTLTYPE_STRING }, \
-	{ "bc_base_max", CTLTYPE_INT }, \
-	{ "bc_dim_max", CTLTYPE_INT }, \
-	{ "bc_scale_max", CTLTYPE_INT }, \
-	{ "bc_string_max", CTLTYPE_INT }, \
-	{ "coll_weights_max", CTLTYPE_INT }, \
-	{ "expr_nest_max", CTLTYPE_INT }, \
-	{ "line_max", CTLTYPE_INT }, \
-	{ "re_dup_max", CTLTYPE_INT }, \
-	{ "posix2_version", CTLTYPE_INT }, \
-	{ "posix2_c_bind", CTLTYPE_INT }, \
-	{ "posix2_c_dev", CTLTYPE_INT }, \
-	{ "posix2_char_term", CTLTYPE_INT }, \
-	{ "posix2_fort_dev", CTLTYPE_INT }, \
-	{ "posix2_fort_run", CTLTYPE_INT }, \
-	{ "posix2_localedef", CTLTYPE_INT }, \
-	{ "posix2_sw_dev", CTLTYPE_INT }, \
-	{ "posix2_upe", CTLTYPE_INT }, \
-	{ "stream_max", CTLTYPE_INT }, \
-	{ "tzname_max", CTLTYPE_INT }, \
-}
-
-#ifdef KERNEL
-
-extern char	cpu_model[];
-extern char	machine[];
-extern char	osrelease[];
-extern char	ostype[];
-
-int kernel_sysctl(struct proc *p, int *name, u_int namelen, void *old, size_t *oldlenp, void *new, size_t newlen, int *retval);
-int userland_sysctl(struct proc *p, int *name, u_int namelen, void *old, size_t *oldlenp, int inkernel, void *new, size_t newlen, int *retval);
-/*
-int	sysctl_clockrate __P((char *, size_t*));
-int	sysctl_file __P((char *, size_t*));
-int	sysctl_doproc __P((int *, u_int, char *, size_t*));
-int	sysctl_doprof __P((int *, u_int, void *, size_t *, void *, size_t));
-*/
-
-#else	/* !KERNEL */
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-int	sysctl __P((int *, u_int, void *, size_t *, void *, size_t));
-int	sysctlbyname __P((const char *, void *, size_t *, void *, size_t));
-__END_DECLS
-#endif	/* KERNEL */
-
-#endif	/* !_SYS_SYSCTL_H_ */
diff --git a/c/src/libnetworking/sys/syslimits.h b/c/src/libnetworking/sys/syslimits.h
deleted file mode 100644
index 283a0241e3..0000000000
--- a/c/src/libnetworking/sys/syslimits.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (c) 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)syslimits.h	8.1 (Berkeley) 6/2/93
- * $Id$
- */
-
-#ifndef _SYS_SYSLIMITS_H_
-#define _SYS_SYSLIMITS_H_
-
-#if !defined(__rtems__)
-#define	ARG_MAX			65536	/* max bytes for an exec function */
-#endif
-
-#if !defined(__rtems__)
-#ifndef CHILD_MAX
-#define	CHILD_MAX		   40	/* max simultaneous processes */
-#endif
-#endif
-
-#if !defined(__rtems__)
-#define	LINK_MAX		32767	/* max file link count */
-#endif
-
-#define	MAX_CANON		  255	/* max bytes in term canon input line */
-
-#define	MAX_INPUT		  255	/* max bytes in terminal input */
-
-#if !defined(__rtems__)
-#define	NAME_MAX		  255	/* max bytes in a file name */
-#endif
-
-#define	NGROUPS_MAX		   16	/* max supplemental group id's */
-
-#if !defined(__rtems__)
-#ifndef OPEN_MAX
-#define	OPEN_MAX		   64	/* max open files per process */
-#endif
-#endif
-
-#if !defined(__rtems__)
-#define	PATH_MAX		 1024	/* max bytes in pathname */
-#endif
-
-#define	PIPE_BUF		  512	/* max bytes for atomic pipe writes */
-
-#define	BC_BASE_MAX		   99	/* max ibase/obase values in bc(1) */
-#define	BC_DIM_MAX		 2048	/* max array elements in bc(1) */
-#define	BC_SCALE_MAX		   99	/* max scale value in bc(1) */
-#define	BC_STRING_MAX		 1000	/* max const string length in bc(1) */
-#define	COLL_WEIGHTS_MAX	    0	/* max weights for order keyword */
-#define	EXPR_NEST_MAX		   32	/* max expressions nested in expr(1) */
-#define	LINE_MAX		 2048	/* max bytes in an input line */
-#define	RE_DUP_MAX		  255	/* max RE's in interval notation */
-
-#endif
diff --git a/c/src/libnetworking/sys/syslog.h b/c/src/libnetworking/sys/syslog.h
deleted file mode 100644
index 724bee62c7..0000000000
--- a/c/src/libnetworking/sys/syslog.h
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)syslog.h	8.1 (Berkeley) 6/2/93
- * $Id$
- */
-
-#ifndef _SYS_SYSLOG_H_
-#define _SYS_SYSLOG_H_
-
-#define	_PATH_LOG	"/var/run/log"
-#define	_PATH_OLDLOG	"/dev/log"	/* backward compatibility */
-
-/*
- * priorities/facilities are encoded into a single 32-bit quantity, where the
- * bottom 3 bits are the priority (0-7) and the top 28 bits are the facility
- * (0-big number).  Both the priorities and the facilities map roughly
- * one-to-one to strings in the syslogd(8) source code.  This mapping is
- * included in this file.
- *
- * priorities (these are ordered)
- */
-#define	LOG_EMERG	0	/* system is unusable */
-#define	LOG_ALERT	1	/* action must be taken immediately */
-#define	LOG_CRIT	2	/* critical conditions */
-#define	LOG_ERR		3	/* error conditions */
-#define	LOG_WARNING	4	/* warning conditions */
-#define	LOG_NOTICE	5	/* normal but significant condition */
-#define	LOG_INFO	6	/* informational */
-#define	LOG_DEBUG	7	/* debug-level messages */
-
-#define	LOG_PRIMASK	0x07	/* mask to extract priority part (internal) */
-				/* extract priority */
-#define	LOG_PRI(p)	((p) & LOG_PRIMASK)
-#define	LOG_MAKEPRI(fac, pri)	((fac) | (pri))
-
-#ifdef SYSLOG_NAMES
-#define	INTERNAL_NOPRI	0x10	/* the "no priority" priority */
-				/* mark "facility" */
-#define	INTERNAL_MARK	LOG_MAKEPRI((LOG_NFACILITIES<<3), 0)
-typedef struct _code {
-	char	*c_name;
-	int	c_val;
-} CODE;
-
-CODE prioritynames[] = {
-	{ "alert",	LOG_ALERT,	},
-	{ "crit",	LOG_CRIT,	},
-	{ "debug",	LOG_DEBUG,	},
-	{ "emerg",	LOG_EMERG,	},
-	{ "err",	LOG_ERR,	},
-	{ "error",	LOG_ERR,	},	/* DEPRECATED */
-	{ "info",	LOG_INFO,	},
-	{ "none",	INTERNAL_NOPRI,	},	/* INTERNAL */
-	{ "notice",	LOG_NOTICE,	},
-	{ "panic", 	LOG_EMERG,	},	/* DEPRECATED */
-	{ "warn",	LOG_WARNING,	},	/* DEPRECATED */
-	{ "warning",	LOG_WARNING,	},
-	{ NULL,		-1,		}
-};
-#endif
-
-/* facility codes */
-#define	LOG_KERN	(0<<3)	/* kernel messages */
-#define	LOG_USER	(1<<3)	/* random user-level messages */
-#define	LOG_MAIL	(2<<3)	/* mail system */
-#define	LOG_DAEMON	(3<<3)	/* system daemons */
-#define	LOG_AUTH	(4<<3)	/* security/authorization messages */
-#define	LOG_SYSLOG	(5<<3)	/* messages generated internally by syslogd */
-#define	LOG_LPR		(6<<3)	/* line printer subsystem */
-#define	LOG_NEWS	(7<<3)	/* network news subsystem */
-#define	LOG_UUCP	(8<<3)	/* UUCP subsystem */
-#define	LOG_CRON	(9<<3)	/* clock daemon */
-#define	LOG_AUTHPRIV	(10<<3)	/* security/authorization messages (private) */
-				/* Facility #10 clashes in DEC UNIX, where */
-				/* it's defined as LOG_MEGASAFE for AdvFS  */
-				/* event logging.                          */
-#define	LOG_FTP		(11<<3)	/* ftp daemon */
-#define	LOG_NTP		(12<<3)	/* NTP subsystem */
-
-	/* other codes through 15 reserved for system use */
-#define	LOG_LOCAL0	(16<<3)	/* reserved for local use */
-#define	LOG_LOCAL1	(17<<3)	/* reserved for local use */
-#define	LOG_LOCAL2	(18<<3)	/* reserved for local use */
-#define	LOG_LOCAL3	(19<<3)	/* reserved for local use */
-#define	LOG_LOCAL4	(20<<3)	/* reserved for local use */
-#define	LOG_LOCAL5	(21<<3)	/* reserved for local use */
-#define	LOG_LOCAL6	(22<<3)	/* reserved for local use */
-#define	LOG_LOCAL7	(23<<3)	/* reserved for local use */
-
-#define	LOG_NFACILITIES	24	/* current number of facilities */
-#define	LOG_FACMASK	0x03f8	/* mask to extract facility part */
-				/* facility of pri */
-#define	LOG_FAC(p)	(((p) & LOG_FACMASK) >> 3)
-
-#ifdef SYSLOG_NAMES
-CODE facilitynames[] = {
-	{ "auth",	LOG_AUTH,	},
-	{ "authpriv",	LOG_AUTHPRIV,	},
-	{ "cron", 	LOG_CRON,	},
-	{ "daemon",	LOG_DAEMON,	},
-	{ "ftp",	LOG_FTP,	},
-	{ "kern",	LOG_KERN,	},
-	{ "lpr",	LOG_LPR,	},
-	{ "mail",	LOG_MAIL,	},
-	{ "mark", 	INTERNAL_MARK,	},	/* INTERNAL */
-	{ "news",	LOG_NEWS,	},
-	{ "ntp",	LOG_NTP,	},
-	{ "security",	LOG_AUTH,	},	/* DEPRECATED */
-	{ "syslog",	LOG_SYSLOG,	},
-	{ "user",	LOG_USER,	},
-	{ "uucp",	LOG_UUCP,	},
-	{ "local0",	LOG_LOCAL0,	},
-	{ "local1",	LOG_LOCAL1,	},
-	{ "local2",	LOG_LOCAL2,	},
-	{ "local3",	LOG_LOCAL3,	},
-	{ "local4",	LOG_LOCAL4,	},
-	{ "local5",	LOG_LOCAL5,	},
-	{ "local6",	LOG_LOCAL6,	},
-	{ "local7",	LOG_LOCAL7,	},
-	{ NULL,		-1,		}
-};
-#endif
-
-#ifdef KERNEL
-#define	LOG_PRINTF	-1	/* pseudo-priority to indicate use of printf */
-#endif
-
-/*
- * arguments to setlogmask.
- */
-#define	LOG_MASK(pri)	(1 << (pri))		/* mask for one priority */
-#define	LOG_UPTO(pri)	((1 << ((pri)+1)) - 1)	/* all priorities through pri */
-
-/*
- * Option flags for openlog.
- *
- * LOG_ODELAY no longer does anything.
- * LOG_NDELAY is the inverse of what it used to be.
- */
-#define	LOG_PID		0x01	/* log the pid with each message */
-#define	LOG_CONS	0x02	/* log on the console if errors in sending */
-#define	LOG_ODELAY	0x04	/* delay open until first syslog() (default) */
-#define	LOG_NDELAY	0x08	/* don't delay open */
-#define	LOG_NOWAIT	0x10	/* don't wait for console forks: DEPRECATED */
-#define	LOG_PERROR	0x20	/* log to stderr as well */
-
-#ifdef KERNEL
-
-#else /* not KERNEL */
-
-#include <sys/cdefs.h>
-#include <stdarg.h>
-
-__BEGIN_DECLS
-void	closelog __P((void));
-void	openlog __P((const char *, int, int));
-int	setlogmask __P((int));
-void	syslog __P((int, const char *, ...));
-void	vsyslog __P((int, const char *, va_list));
-__END_DECLS
-
-#endif /* !KERNEL */
-
-#endif
diff --git a/c/src/libnetworking/sys/systm.h b/c/src/libnetworking/sys/systm.h
deleted file mode 100644
index 7e14867e70..0000000000
--- a/c/src/libnetworking/sys/systm.h
+++ /dev/null
@@ -1,198 +0,0 @@
-/*-
- * Copyright (c) 1982, 1988, 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)systm.h	8.7 (Berkeley) 3/29/95
- * $Id$
- */
-
-#ifndef _SYS_SYSTM_H_
-#define	_SYS_SYSTM_H_
-
-#include <machine/cpufunc.h>
-
-extern int securelevel;		/* system security level (see init(8)) */
-
-extern int cold;		/* nonzero if we are doing a cold boot */
-extern const char *panicstr;	/* panic message */
-extern char version[];		/* system version */
-extern char copyright[];	/* system copyright */
-
-extern int nblkdev;		/* number of entries in bdevsw */
-extern int nchrdev;		/* number of entries in cdevsw */
-extern struct swdevt *swdevt;	/* swap-device information */
-extern int nswdev;		/* number of swap devices */
-extern int nswap;		/* size of swap space */
-
-extern int selwait;		/* select timeout address */
-
-extern u_char curpriority;	/* priority of current process */
-
-extern int physmem;		/* physical memory */
-
-extern dev_t dumpdev;		/* dump device */
-extern long dumplo;		/* offset into dumpdev */
-
-extern dev_t rootdev;		/* root device */
-extern struct vnode *rootvp;	/* vnode equivalent to above */
-
-extern dev_t swapdev;		/* swapping device */
-extern struct vnode *swapdev_vp;/* vnode equivalent to above */
-
-extern int boothowto;		/* reboot flags, from console subsystem */
-extern int bootverbose;		/* nonzero to print verbose messages */
-
-/*
- * General function declarations.
- */
-void	Debugger __P((const char *msg));
-int	nullop __P((void));
-int	eopnotsupp __P((void));
-int	einval __P((void));
-int	seltrue __P((dev_t dev, int which, struct proc *p));
-int	ureadc __P((int, struct uio *));
-void	*hashinit __P((int count, int type, u_long *hashmask));
-void	*phashinit __P((int count, int type, u_long *nentries));
-
-void	panic __P((const char *, ...)) __dead2;
-void	boot __P((int)) __dead2;
-void	cpu_boot __P((int));
-void	tablefull __P((const char *));
-int	addlog __P((const char *, ...));
-int	kvprintf __P((char const *, void (*)(int, void*), void *, int,
-		      _BSD_VA_LIST_));
-void	log __P((int, const char *, ...));
-int	printf __P((const char *, ...));
-int	sprintf __P((char *buf, const char *, ...));
-void	uprintf __P((const char *, ...));
-void	ttyprintf __P((struct tty *, const char *, ...));
-
-#define bcopy(f,t,n) memcpy((t),(f),(n))
-#define bzero(p,n) memset((p),(0),(n))
-
-int	copystr __P((const void *kfaddr, void *kdaddr, size_t len,
-		size_t *lencopied));
-int	copyinstr __P((const void *udaddr, void *kaddr, size_t len,
-		size_t *lencopied));
-int	copyin __P((const void *udaddr, void *kaddr, size_t len));
-int	copyout __P((const void *kaddr, void *udaddr, size_t len));
-
-int	fubyte __P((const void *base));
-int	fuibyte __P((const void *base));
-int	subyte __P((void *base, int byte));
-int	suibyte __P((void *base, int byte));
-int	fuword __P((const void *base));
-int	suword __P((void *base, int word));
-int	susword __P((void *base, int word));
-
-int	hzto __P((struct timeval *tv));
-void	realitexpire __P((void *));
-
-struct clockframe;
-void	hardclock __P((struct clockframe *frame));
-void	softclock __P((void));
-void	statclock __P((struct clockframe *frame));
-
-void	startprofclock __P((struct proc *));
-void	stopprofclock __P((struct proc *));
-void	setstatclockrate __P((int hzrate));
-
-void	hardupdate __P((long));
-void	hardpps __P((struct timeval *tvp, long usec));
-
-#include <sys/libkern.h>
-
-/* Initialize the world */
-extern void consinit(void);
-extern void usrinfoinit(void);
-extern void cpu_initclocks(void);
-extern void vntblinit(void);
-extern void nchinit(void);
-
-/* Finalize the world. */
-void	shutdown_nice __P((void));
-
-/*
- * Kernel to clock driver interface.
- */
-void	inittodr __P((time_t base));
-void	resettodr __P((void));
-void	startrtclock __P((void));
-
-/* Timeouts */
-typedef void (timeout_t)(void *); /* actual timeout function type */
-typedef timeout_t *timeout_func_t; /* a pointer to this type */
-
-void timeout(timeout_func_t, void *, int);
-void untimeout(timeout_func_t, void *);
-void	logwakeup __P((void));
-
-/* Various other callout lists that modules might want to know about */
-/* shutdown callout list definitions */
-typedef void (*bootlist_fn)(int,void *);
-int at_shutdown(bootlist_fn function, void *arg, int);
-int rm_at_shutdown(bootlist_fn function, void *arg);
-#define SHUTDOWN_PRE_SYNC 0
-#define SHUTDOWN_POST_SYNC 1
-
-/* forking */ /* XXX not yet */
-typedef void (*forklist_fn)(struct proc *parent,struct proc *child,int flags);
-int at_fork(forklist_fn function);
-int rm_at_fork(forklist_fn function);
-
-/* exiting */
-typedef void (*exitlist_fn)(struct proc *procp);
-int at_exit(exitlist_fn function);
-int rm_at_exit(exitlist_fn function);
-
-/* Not exactly a callout LIST, but a callout entry.. 			*/
-/* Allow an external module to define a hardware watchdog tickler	*/
-/* Normally a process would do this, but there are times when the	*/
-/* kernel needs to be able to hold off the watchdog, when the process	*/
-/* is not active, e.g. when dumping core. Costs us a whole 4 bytes to	*/
-/* make this generic. the variable is in kern_shutdown.c */
-typedef void (*watchdog_tickle_fn)(void);
-extern watchdog_tickle_fn wdog_tickler;
-
-
-/* 
- * Common `proc' functions are declared here so that proc.h can be included
- * less often.
- */
-int	tsleep __P((void *chan, int pri, char *wmesg, int timo));
-void	wakeup __P((void *chan));
-
-#endif /* !_SYS_SYSTM_H_ */
diff --git a/c/src/libnetworking/sys/ttycom.h b/c/src/libnetworking/sys/ttycom.h
deleted file mode 100644
index f2e491bc50..0000000000
--- a/c/src/libnetworking/sys/ttycom.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)ttycom.h	8.1 (Berkeley) 3/28/94
- * $Id$
- */
-
-#ifndef	_SYS_TTYCOM_H_
-#define	_SYS_TTYCOM_H_
-
-#include <sys/ioccom.h>
-
-/*
- * Tty ioctl's except for those supported only for backwards compatibility
- * with the old tty driver.
- */
-
-/*
- * Window/terminal size structure.  This information is stored by the kernel
- * in order to provide a consistent interface, but is not used by the kernel.
- */
-struct winsize {
-	unsigned short	ws_row;		/* rows, in characters */
-	unsigned short	ws_col;		/* columns, in characters */
-	unsigned short	ws_xpixel;	/* horizontal size, pixels */
-	unsigned short	ws_ypixel;	/* vertical size, pixels */
-};
-
-#define	TIOCMODG	_IOR('t', 3, int)	/* get modem control state */
-#define	TIOCMODS	_IOW('t', 4, int)	/* set modem control state */
-#define		TIOCM_LE	0001		/* line enable */
-#define		TIOCM_DTR	0002		/* data terminal ready */
-#define		TIOCM_RTS	0004		/* request to send */
-#define		TIOCM_ST	0010		/* secondary transmit */
-#define		TIOCM_SR	0020		/* secondary receive */
-#define		TIOCM_CTS	0040		/* clear to send */
-#define		TIOCM_CAR	0100		/* carrier detect */
-#define		TIOCM_CD	TIOCM_CAR
-#define		TIOCM_RNG	0200		/* ring */
-#define		TIOCM_RI	TIOCM_RNG
-#define		TIOCM_DSR	0400		/* data set ready */
-						/* 8-10 compat */
-#define	TIOCEXCL	 _IO('t', 13)		/* set exclusive use of tty */
-#define	TIOCNXCL	 _IO('t', 14)		/* reset exclusive use of tty */
-						/* 15 unused */
-#define	TIOCFLUSH	_IOW('t', 16, int)	/* flush buffers */
-						/* 17-18 compat */
-#define	TIOCGETA	_IOR('t', 19, struct termios) /* get termios struct */
-#define	TIOCSETA	_IOW('t', 20, struct termios) /* set termios struct */
-#define	TIOCSETAW	_IOW('t', 21, struct termios) /* drain output, set */
-#define	TIOCSETAF	_IOW('t', 22, struct termios) /* drn out, fls in, set */
-#define	TIOCGETD	_IOR('t', 26, int)	/* get line discipline */
-#define	TIOCSETD	_IOW('t', 27, int)	/* set line discipline */
-						/* 127-124 compat */
-#define	TIOCSBRK	 _IO('t', 123)		/* set break bit */
-#define	TIOCCBRK	 _IO('t', 122)		/* clear break bit */
-#define	TIOCSDTR	 _IO('t', 121)		/* set data terminal ready */
-#define	TIOCCDTR	 _IO('t', 120)		/* clear data terminal ready */
-#define	TIOCGPGRP	_IOR('t', 119, int)	/* get pgrp of tty */
-#define	TIOCSPGRP	_IOW('t', 118, int)	/* set pgrp of tty */
-						/* 117-116 compat */
-#define	TIOCOUTQ	_IOR('t', 115, int)	/* output queue size */
-#define	TIOCSTI		_IOW('t', 114, char)	/* simulate terminal input */
-#define	TIOCNOTTY	 _IO('t', 113)		/* void tty association */
-#define	TIOCPKT		_IOW('t', 112, int)	/* pty: set/clear packet mode */
-#define		TIOCPKT_DATA		0x00	/* data packet */
-#define		TIOCPKT_FLUSHREAD	0x01	/* flush packet */
-#define		TIOCPKT_FLUSHWRITE	0x02	/* flush packet */
-#define		TIOCPKT_STOP		0x04	/* stop output */
-#define		TIOCPKT_START		0x08	/* start output */
-#define		TIOCPKT_NOSTOP		0x10	/* no more ^S, ^Q */
-#define		TIOCPKT_DOSTOP		0x20	/* now do ^S ^Q */
-#define		TIOCPKT_IOCTL		0x40	/* state change of pty driver */
-#define	TIOCSTOP	 _IO('t', 111)		/* stop output, like ^S */
-#define	TIOCSTART	 _IO('t', 110)		/* start output, like ^Q */
-#define	TIOCMSET	_IOW('t', 109, int)	/* set all modem bits */
-#define	TIOCMBIS	_IOW('t', 108, int)	/* bis modem bits */
-#define	TIOCMBIC	_IOW('t', 107, int)	/* bic modem bits */
-#define	TIOCMGET	_IOR('t', 106, int)	/* get all modem bits */
-#define	TIOCREMOTE	_IOW('t', 105, int)	/* remote input editing */
-#define	TIOCGWINSZ	_IOR('t', 104, struct winsize)	/* get window size */
-#define	TIOCSWINSZ	_IOW('t', 103, struct winsize)	/* set window size */
-#define	TIOCUCNTL	_IOW('t', 102, int)	/* pty: set/clr usr cntl mode */
-#define	TIOCSTAT	 _IO('t', 101)		/* simulate ^T status message */
-#define		UIOCCMD(n)	_IO('u', n)	/* usr cntl op "n" */
-#define	TIOCCONS	_IOW('t', 98, int)	/* become virtual console */
-#define	TIOCSCTTY	 _IO('t', 97)		/* become controlling tty */
-#define	TIOCEXT		_IOW('t', 96, int)	/* pty: external processing */
-#define	TIOCSIG		 _IO('t', 95)		/* pty: generate signal */
-#define	TIOCDRAIN	 _IO('t', 94)		/* wait till output drained */
-#define	TIOCMSDTRWAIT	_IOW('t', 91, int)	/* modem: set wait on close */
-#define	TIOCMGDTRWAIT	_IOR('t', 90, int)	/* modem: get wait on close */
-#define	TIOCTIMESTAMP	_IOR('t', 89, struct timeval)	/* enable/get timestamp
-						 * of last input event */
-#define	TIOCDCDTIMESTAMP _IOR('t', 88, struct timeval)	/* enable/get timestamp
-						 * of last DCd rise */
-#define	TIOCSDRAINWAIT	_IOW('t', 87, int)	/* set ttywait timeout */
-#define	TIOCGDRAINWAIT	_IOR('t', 86, int)	/* get ttywait timeout */
-#define	TIOCDSIMICROCODE _IO('t', 85)		/* download microcode to
-						 * DSI Softmodem */
-
-#define	TTYDISC		0		/* termios tty line discipline */
-#define	TABLDISC	3		/* tablet discipline */
-#define	SLIPDISC	4		/* serial IP discipline */
-#define	PPPDISC		5		/* PPP discipline */
-
-#endif /* !_SYS_TTYCOM_H_ */
diff --git a/c/src/libnetworking/sys/ttydefaults.h b/c/src/libnetworking/sys/ttydefaults.h
deleted file mode 100644
index 68f0ddbe77..0000000000
--- a/c/src/libnetworking/sys/ttydefaults.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)ttydefaults.h	8.4 (Berkeley) 1/21/94
- * $Id$
- */
-
-/*
- * System wide defaults for terminal state.
- */
-#ifndef _SYS_TTYDEFAULTS_H_
-#define	_SYS_TTYDEFAULTS_H_
-
-/*
- * Defaults on "first" open.
- */
-#define	TTYDEF_IFLAG	(BRKINT	| ICRNL	| IMAXBEL | IXON | IXANY)
-#define TTYDEF_OFLAG	(OPOST | ONLCR)
-#define TTYDEF_LFLAG	(ECHO | ICANON | ISIG | IEXTEN | ECHOE|ECHOKE|ECHOCTL)
-#define	TTYDEF_CFLAG	(CREAD | CS8 | HUPCL)
-#define TTYDEF_SPEED	(B9600)
-
-/*
- * Control Character Defaults
- */
-#define CTRL(x)	(x&037)
-#define	CEOF		CTRL('d')
-#define	CEOL		0xff		/* XXX avoid _POSIX_VDISABLE */
-#define	CERASE		0177
-#define	CINTR		CTRL('c')
-#define	CSTATUS		CTRL('t')
-#define	CKILL		CTRL('u')
-#define	CMIN		1
-#define	CQUIT		034		/* FS, ^\ */
-#define	CSUSP		CTRL('z')
-#define	CTIME		0
-#define	CDSUSP		CTRL('y')
-#define	CSTART		CTRL('q')
-#define	CSTOP		CTRL('s')
-#define	CLNEXT		CTRL('v')
-#define	CDISCARD 	CTRL('o')
-#define	CWERASE 	CTRL('w')
-#define	CREPRINT 	CTRL('r')
-#define	CEOT		CEOF
-/* compat */
-#define	CBRK		CEOL
-#define CRPRNT		CREPRINT
-#define	CFLUSH		CDISCARD
-
-/* PROTECTED INCLUSION ENDS HERE */
-#endif /* !_SYS_TTYDEFAULTS_H_ */
-
-/*
- * #define TTYDEFCHARS to include an array of default control characters.
- */
-#ifdef TTYDEFCHARS
-static cc_t	ttydefchars[NCCS] = {
-	CEOF,	CEOL,	CEOL,	CERASE, CWERASE, CKILL, CREPRINT,
-	_POSIX_VDISABLE, CINTR,	CQUIT,	CSUSP,	CDSUSP,	CSTART,	CSTOP,	CLNEXT,
-	CDISCARD, CMIN,	CTIME,  CSTATUS, _POSIX_VDISABLE
-};
-#undef TTYDEFCHARS
-#endif
diff --git a/c/src/libnetworking/sys/ucred.h b/c/src/libnetworking/sys/ucred.h
deleted file mode 100644
index d3899c3b4c..0000000000
--- a/c/src/libnetworking/sys/ucred.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)ucred.h	8.4 (Berkeley) 1/9/95
- * $Id$
- */
-
-#ifndef _SYS_UCRED_H_
-#define	_SYS_UCRED_H_
-
-/*
- * Credentials.
- */
-struct ucred {
-	u_short	cr_ref;			/* reference count */
-	uid_t	cr_uid;			/* effective user id */
-	short	cr_ngroups;		/* number of groups */
-	gid_t	cr_groups[NGROUPS];	/* groups */
-};
-#define cr_gid cr_groups[0]
-#define NOCRED ((struct ucred *)0)	/* no credential available */
-#define FSCRED ((struct ucred *)-1)	/* filesystem credential */
-
-#ifdef KERNEL
-#define	crhold(cr)	(cr)->cr_ref++
-
-struct ucred	*crcopy __P((struct ucred *cr));
-struct ucred	*crdup __P((struct ucred *cr));
-void		crfree __P((struct ucred *cr));
-struct ucred	*crget __P((void));
-int		suser __P((struct ucred *cred, u_short *acflag));
-int		groupmember __P((gid_t gid, struct ucred *cred));
-#endif /* KERNEL */
-
-#endif /* !_SYS_UCRED_H_ */
diff --git a/c/src/libnetworking/sys/uio.h b/c/src/libnetworking/sys/uio.h
deleted file mode 100644
index 305941500d..0000000000
--- a/c/src/libnetworking/sys/uio.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)uio.h	8.5 (Berkeley) 2/22/94
- * $Id$
- */
-
-#ifndef _SYS_UIO_H_
-#define	_SYS_UIO_H_
-
-/*
- * XXX
- * iov_base should be a void *.
- */
-struct iovec {
-	char	*iov_base;	/* Base address. */
-	size_t	 iov_len;	/* Length. */
-};
-
-enum	uio_rw { UIO_READ, UIO_WRITE };
-
-/* Segment flag values. */
-enum uio_seg {
-	UIO_USERSPACE,		/* from user data space */
-	UIO_SYSSPACE,		/* from system space */
-	UIO_USERISPACE,		/* from user I space */
-	UIO_NOCOPY		/* don't copy, already in object */
-};
-
-#ifdef KERNEL
-struct uio {
-	struct	iovec *uio_iov;
-	int	uio_iovcnt;
-	off_t	uio_offset;
-	int	uio_resid;
-	enum	uio_seg uio_segflg;
-	enum	uio_rw uio_rw;
-	struct	proc *uio_procp;
-};
-
-/*
- * Limits
- */
-#define UIO_MAXIOV	1024		/* max 1K of iov's */
-#define UIO_SMALLIOV	8		/* 8 on stack, else malloc */
-#endif /* KERNEL */
-
-#ifdef KERNEL
-
-int	uiomove __P((caddr_t, int, struct uio *));
-
-#else /* !KERNEL */
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-ssize_t	readv __P((int, const struct iovec *, int));
-ssize_t	writev __P((int, const struct iovec *, int));
-__END_DECLS
-
-#endif /* KERNEL */
-
-#endif /* !_SYS_UIO_H_ */
diff --git a/c/src/libnetworking/syslog.h b/c/src/libnetworking/syslog.h
deleted file mode 100644
index 6d223d00b7..0000000000
--- a/c/src/libnetworking/syslog.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
- *  $Id$
- */
-
-#include <sys/syslog.h>
diff --git a/c/src/libnetworking/vm/vm.h b/c/src/libnetworking/vm/vm.h
deleted file mode 100644
index 19ea10e5eb..0000000000
--- a/c/src/libnetworking/vm/vm.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)vm.h	8.2 (Berkeley) 12/13/93
- * $Id$
- */
-
-#ifndef VM_H
-#define VM_H
-
-typedef char vm_inherit_t;	/* XXX: inheritance codes */
-typedef u_char vm_prot_t;	/* protection codes */
-
-union vm_map_object;
-typedef union vm_map_object vm_map_object_t;
-
-struct vm_map_entry;
-typedef struct vm_map_entry *vm_map_entry_t;
-
-struct vm_map;
-typedef struct vm_map *vm_map_t;
-
-struct vm_object;
-typedef struct vm_object *vm_object_t;
-
-#ifndef KERNEL
-/*
- * This is defined in <sys/types.h> for the kernel so that non-vm kernel
- * sources (mainly Mach-derived ones such as ddb) don't have to include
- * vm stuff.  Defining it there for applications might break things.
- * Define it here for "applications" that include vm headers (e.g.,
- * genassym).
- */
-typedef int boolean_t;
-
-/*
- * This is defined in <sys/types.h> for the kernel so that vnode_if.h
- * doesn't have to include <vm/vm.h>.
- */
-struct vm_page;
-typedef struct vm_page *vm_page_t;
-#endif
-
-#endif				/* VM_H */
diff --git a/c/src/libnetworking/vm/vm_extern.h b/c/src/libnetworking/vm/vm_extern.h
deleted file mode 100644
index 720d42dc28..0000000000
--- a/c/src/libnetworking/vm/vm_extern.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)vm_extern.h	8.2 (Berkeley) 1/12/94
- * $Id$
- */
-
-#ifndef _VM_EXTERN_H_
-#define	_VM_EXTERN_H_
-
-struct buf;
-struct proc;
-struct vmspace;
-struct vmtotal;
-struct mount;
-struct vnode;
-
-#ifdef KERNEL
-
-#ifdef TYPEDEF_FOR_UAP
-int getpagesize __P((struct proc * p, void *, int *));
-int madvise __P((struct proc *, void *, int *));
-int mincore __P((struct proc *, void *, int *));
-int mprotect __P((struct proc *, void *, int *));
-int msync __P((struct proc *, void *, int *));
-int munmap __P((struct proc *, void *, int *));
-int obreak __P((struct proc *, void *, int *));
-int sbrk __P((struct proc *, void *, int *));
-int smmap __P((struct proc *, void *, int *));
-int sstk __P((struct proc *, void *, int *));
-int swapon __P((struct proc *, void *, int *));
-#endif
-
-void faultin __P((struct proc *p));
-int grow __P((struct proc *, u_int));
-int kernacc __P((caddr_t, int, int));
-vm_offset_t kmem_alloc __P((vm_map_t, vm_size_t));
-vm_offset_t kmem_alloc_pageable __P((vm_map_t, vm_size_t));
-vm_offset_t kmem_alloc_wait __P((vm_map_t, vm_size_t));
-void kmem_free __P((vm_map_t, vm_offset_t, vm_size_t));
-void kmem_free_wakeup __P((vm_map_t, vm_offset_t, vm_size_t));
-void kmem_init __P((vm_offset_t, vm_offset_t));
-vm_offset_t kmem_malloc __P((vm_map_t, vm_size_t, boolean_t));
-vm_map_t kmem_suballoc __P((vm_map_t, vm_offset_t *, vm_offset_t *, vm_size_t, boolean_t));
-void munmapfd __P((struct proc *, int));
-int pager_cache __P((vm_object_t, boolean_t));
-int swaponvp __P((struct proc *, struct vnode *, dev_t , u_long));
-void swapout_procs __P((void));
-int useracc __P((caddr_t, int, int));
-int vm_fault __P((vm_map_t, vm_offset_t, vm_prot_t, boolean_t));
-void vm_fault_copy_entry __P((vm_map_t, vm_map_t, vm_map_entry_t, vm_map_entry_t));
-void vm_fault_unwire __P((vm_map_t, vm_offset_t, vm_offset_t));
-int vm_fault_wire __P((vm_map_t, vm_offset_t, vm_offset_t));
-int vm_fault_user_wire __P((vm_map_t, vm_offset_t, vm_offset_t));
-int vm_fork __P((struct proc *, struct proc *));
-int vm_mmap __P((vm_map_t, vm_offset_t *, vm_size_t, vm_prot_t, vm_prot_t, int, caddr_t, vm_ooffset_t));
-vm_offset_t vm_page_alloc_contig __P((vm_offset_t, vm_offset_t, vm_offset_t, vm_offset_t));
-void vm_set_page_size __P((void));
-void vmmeter __P((void));
-struct vmspace *vmspace_alloc __P((vm_offset_t, vm_offset_t, int));
-struct vmspace *vmspace_fork __P((struct vmspace *));
-void vmspace_free __P((struct vmspace *));
-void vnode_pager_setsize __P((struct vnode *, vm_ooffset_t));
-void vnode_pager_umount __P((struct mount *));
-void vnode_pager_uncache __P((struct vnode *));
-void vslock __P((caddr_t, u_int));
-void vsunlock __P((caddr_t, u_int, int));
-void vm_object_print __P((/* db_expr_t */ int, boolean_t, /* db_expr_t */ int,
-			  char *));
-void vm_fault_quick __P((caddr_t v, int prot));
-
-#endif				/* KERNEL */
-
-#endif				/* !_VM_EXTERN_H_ */
diff --git a/c/src/libnetworking/vm/vm_kern.h b/c/src/libnetworking/vm/vm_kern.h
deleted file mode 100644
index b1e073dd3a..0000000000
--- a/c/src/libnetworking/vm/vm_kern.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * The Mach Operating System project at Carnegie-Mellon University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	from: @(#)vm_kern.h	8.1 (Berkeley) 6/11/93
- *
- *
- * Copyright (c) 1987, 1990 Carnegie-Mellon University.
- * All rights reserved.
- *
- * Authors: Avadis Tevanian, Jr., Michael Wayne Young
- *
- * Permission to use, copy, modify and distribute this software and
- * its documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- *
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- *
- * Carnegie Mellon requests users of this software to return to
- *
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- *
- * any improvements or extensions that they make and grant Carnegie the
- * rights to redistribute these changes.
- *
- * $Id$
- */
-
-#ifndef _VM_VM_KERN_H_
-#define _VM_VM_KERN_H_ 1
-
-/* Kernel memory management definitions. */
-extern vm_map_t buffer_map;
-extern vm_map_t kernel_map;
-extern vm_map_t kmem_map;
-extern vm_map_t mb_map;
-extern int mb_map_full;
-extern vm_map_t io_map;
-extern vm_map_t clean_map;
-extern vm_map_t phys_map;
-extern vm_map_t exec_map;
-extern vm_map_t u_map;
-
-extern vm_offset_t kernel_vm_end;
-
-#endif				/* _VM_VM_KERN_H_ */
diff --git a/c/src/libnetworking/vm/vm_param.h b/c/src/libnetworking/vm/vm_param.h
deleted file mode 100644
index f1cfca98ec..0000000000
--- a/c/src/libnetworking/vm/vm_param.h
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * The Mach Operating System project at Carnegie-Mellon University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	from: @(#)vm_param.h	8.1 (Berkeley) 6/11/93
- *
- *
- * Copyright (c) 1987, 1990 Carnegie-Mellon University.
- * All rights reserved.
- *
- * Authors: Avadis Tevanian, Jr., Michael Wayne Young
- *
- * Permission to use, copy, modify and distribute this software and
- * its documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- *
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- *
- * Carnegie Mellon requests users of this software to return to
- *
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- *
- * any improvements or extensions that they make and grant Carnegie the
- * rights to redistribute these changes.
- *
- * $Id$
- */
-
-/*
- *	Machine independent virtual memory parameters.
- */
-
-#ifndef	_VM_PARAM_
-#define	_VM_PARAM_
-
-#include <machine/vmparam.h>
-
-/*
- *	The machine independent pages are refered to as PAGES.  A page
- *	is some number of hardware pages, depending on the target machine.
- */
-#define DEFAULT_PAGE_SIZE	4096
-
-#if 0
-
-/*
- *	All references to the size of a page should be done with PAGE_SIZE
- *	or PAGE_SHIFT.  The fact they are variables is hidden here so that
- *	we can easily make them constant if we so desire.
- */
-#ifndef PAGE_SIZE
-#define	PAGE_SIZE	cnt.v_page_size	/* size of page */
-#endif
-#ifndef PAGE_MASK
-#define PAGE_MASK	page_mask	/* size of page - 1 */
-#endif
-#ifndef PAGE_SHIFT
-#define PAGE_SHIFT	page_shift	/* bits to shift for pages */
-#endif
-
-#endif
-
-#ifdef KERNEL
-extern vm_size_t page_mask;
-extern int page_shift;
-
-#endif
-
-/*
- * CTL_VM identifiers
- */
-#define	VM_METER		1	/* struct vmmeter */
-#define	VM_LOADAVG	 	2	/* struct loadavg */
-#define VM_V_FREE_MIN		3	/* cnt.v_free_min */
-#define VM_V_FREE_TARGET	4	/* cnt.v_free_target */
-#define VM_V_FREE_RESERVED	5	/* cnt.v_free_reserved */
-#define VM_V_INACTIVE_TARGET	6	/* cnt.v_inactive_target */
-#define VM_V_CACHE_MIN		7	/* cnt.v_cache_max */
-#define VM_V_CACHE_MAX		8	/* cnt.v_cache_min */
-#define VM_V_PAGEOUT_FREE_MIN	9	/* cnt.v_pageout_free_min */
-#define	VM_PAGEOUT_ALGORITHM	10	/* pageout algorithm */
-#define VM_SWAPPING_ENABLED	11	/* swapping enabled */
-#define	VM_MAXID		12	/* number of valid vm ids */
-
-#define CTL_VM_NAMES { \
-	{ 0, 0 }, \
-	{ "vmmeter", CTLTYPE_STRUCT }, \
-	{ "loadavg", CTLTYPE_STRUCT }, \
-	{ "v_free_min", CTLTYPE_INT }, \
-	{ "v_free_target", CTLTYPE_INT }, \
-	{ "v_free_reserved", CTLTYPE_INT }, \
-	{ "v_inactive_target", CTLTYPE_INT }, \
-	{ "v_cache_min", CTLTYPE_INT }, \
-	{ "v_cache_max", CTLTYPE_INT }, \
-	{ "v_pageout_free_min", CTLTYPE_INT}, \
-	{ "pageout_algorithm", CTLTYPE_INT}, \
-	{ "swapping_enabled", CTLTYPE_INT},\
-}
-
-/*
- *	Return values from the VM routines.
- */
-#define	KERN_SUCCESS		0
-#define	KERN_INVALID_ADDRESS	1
-#define	KERN_PROTECTION_FAILURE	2
-#define	KERN_NO_SPACE		3
-#define	KERN_INVALID_ARGUMENT	4
-#define	KERN_FAILURE		5
-#define	KERN_RESOURCE_SHORTAGE	6
-#define	KERN_NOT_RECEIVER	7
-#define	KERN_NO_ACCESS		8
-
-#ifndef ASSEMBLER
-/*
- *	Convert addresses to pages and vice versa.
- *	No rounding is used.
- */
-#ifdef KERNEL
-#define num_pages(x) \
-	((vm_offset_t)((((vm_offset_t)(x)) + PAGE_MASK) >> PAGE_SHIFT))
-
-extern vm_size_t mem_size;	/* size of physical memory (bytes) */
-extern vm_offset_t first_addr;	/* first physical page */
-extern vm_offset_t last_addr;	/* last physical page */
-#endif				/* KERNEL */
-#endif				/* ASSEMBLER */
-#endif				/* _VM_PARAM_ */
diff --git a/c/src/libnetworking/wrapup/Makefile.in b/c/src/libnetworking/wrapup/Makefile.in
deleted file mode 100644
index 55b9f618ed..0000000000
--- a/c/src/libnetworking/wrapup/Makefile.in
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-NET_PIECES=kern lib libc net netinet nfs rtems
-OBJS=$(foreach piece, $(NET_PIECES), ../$(piece)/$(ARCH)/*.o)
-LIB=$(ARCH)/libnetworking.a
-
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/lib.cfg
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES  +=
-CPPFLAGS +=
-CFLAGS   +=
-
-LD_PATHS  +=
-LD_LIBS   +=
-LDFLAGS   +=
-
-#
-# Add your list of files to delete here.  The config files
-#  already know how to delete some stuff, so you may want
-#  to just run 'make clean' first to see what gets missed.
-#  'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
-
-$(LIB): ${OBJS}
-	$(make-library)
-
-all:	${ARCH} $(SRCS) $(LIB)
-	$(INSTALL_VARIANT) -m 644 $(LIB) ${PROJECT_RELEASE}/lib
-
diff --git a/c/src/librtems++/README b/c/src/librtems++/README
deleted file mode 100644
index 65b0eb980e..0000000000
--- a/c/src/librtems++/README
+++ /dev/null
@@ -1,266 +0,0 @@
-#
-#  $Id$
-#
-
-RTEMS C++ Library
-=================
-
-The RTEMS C++ Library or librtems++ is a wrapper for the RTEMS API.
-The classes provide as close a match to the RTEMS C API, for
-performance, to share the existing C documentation as much as
-possible, and to allow easy tracking of any changes to the RTEMS C
-API.
-
-The C++ interface only uses RTEMS API calls.  No external references
-or internal interfaces are used.  This allows the classes to be used
-in separately compiled modules or applications which link to the RTEMS
-trap interface.
-
-(This is the goal, which has not quite been reached. The TOD macro for
-micro-seconds to ticks is used, and this uses an internal global RTEMS
-variable)
-
-The C++ interface does not deal with RTEMS initialisation or the
-device driver interface.  The current view is these parts of a system
-are best handled in the current manner.  This means BSP for
-initialisation and the C API for drivers.
-
-RTEMS C++ Classes
-=================
-
-The classes map to the managers of RTEMS.
-
-The methods have default values selected which try to fit most cases
-or follow the documented RTEMS default values.  Moving from left to
-right the parameters become less used, allowing the defaults to be
-selected. An example is the scope parameter for most classes.  This
-can be local or global.  I assume that most RTEMS objects are local,
-therefore it has been made the last parameter.
-
-Inline methods have been used for methods which are commonly used in
-applications.  This tries to add the minimum of overhead.  For
-example, the methods to send or receive events are inline, while all
-methods for control of a task are not.
-
-The RTEMS types, enumerations, and defines are used.  If a new type,
-enumeration or define is made it will map directly to the RTEMS
-equivalent.  For example the enumeration Scope is defined for various
-classes which can be local or global. The elements of the enumeration
-are forced to the same value as the RTEMS values.  An enumeration is
-used in this case to allow the compiler to type check a little
-better. It saves having to check only RTEMS_LOCAL or RTEMS_GLOBAL is
-passed as a parameter (I am not convinced this is really needed as the
-goal was to not define anything and to only use what RTEMS provided).
-
-Where possible the various parts of an option bit set, or mode can be
-controlled separately or controlled as a group.  An example is the
-task mode.  The RTEMS C API allows a set of modes to be modified at
-once.  The TaskMode class allows this to occur, while also providing
-methods to control a single mode item.
-
-The name of an object is always passed as a string.  The classes turn
-the string into a rtems_name variable.  The string does not have to be
-nul character terminated.
-
-The RTEMS C API uses 'delete' to remove or kill an RTEMS object.  This
-is a reserved word in C++, so the word 'destroy' is used instead.
-
-Calling the classes from interrupts follows the rules of RTEMS.  An
-exception introduced by the class library is the last status code.
-There is only one last status code for each instance of the library's
-classes and it is not protected.  This needs to be watched for.  Maybe
-a better solution needs to be found, such as interrupt calls do not set
-the last status code.
-
-RTEMS objects created by the C++ library can be operated on by C code
-just as any other RTEMS object. If limitations exist they should be
-documented in under the class.
-
-RTEMS Object Ownership
-======================
-
-The concept of ownership of an object is not defined as part of the
-RTEMS C API.  A piece of code executing as part a task can create a
-message queue.  Another piece of code running as part of a different
-task can destroy the message queue.  Correct behavior between the code
-that creates the message queue and the code which destroy's the
-message queue must be provided by the programmer.
-
-The librtems++ supports the concept of ownership of an RTEMS object.
-Only the C++ object that creates the RTEMS object can destroy it.  A
-C++ object can connect to an existing RTEMS object and control it,
-how-ever it can not destroy it.
-
-Copy constructors and assignment operators are provided to in-force
-this rule.
-
-Ownership only applies to classes that create RTEMS objects.  These
-classes contain a flag which signals ownership of the id.
-
-Timeouts
-========
-
-The timeout value is specified in micro-seconds.  The classes turn the
-micro-second timeout value into ticks required by the RTEMS C API.
-
-This causes a problem for timeout values which are less than one tick.
-This case is tested for and the timeout value is set to one tick.  All
-other cases round down to the nearest tick.
-
-Status Codes
-============
-
-All classes which form the C++ API are derived from the StatusCode
-class.  This class provides a common method for handling the status
-code returned by RTEMS.
-
-The last returned status code is held in the StatusCode object.  It
-can be queried directly, or as a boolean.  You can also obtain an
-error string for the status code.
-
-The setting of a status code is restricted to derived classes.
-
-The last status code attribute of the class is only ever set to an
-RTEMS defined status code.
-
-Event Class
-===========
-
-The event class allows users to send and receive events to and from
-tasks.
-
-Events objects are by default connected the RTEMS_SELF task.  A send
-or receive will operate on the task currently executing.
-
-An Event object can be connected to a task using the connect method.
-The name is the name of the task.  Connection can also be achieved by
-using the copy constructor or assignment operator.
-
-Events can be sent to a task by specifying an RTEMS task id, or by
-passing a reference to a Task object.
-
-Interrupt Class
-===============
-
-The interrupt class allows a protected virtual method of a derived
-class to be an interrupt handler.
-
-You derive from this class and provide the handler method.  The next
-interrupt after the vector is caught will cause the handler method to
-be entered.
-
-You can chain the interrupt by calling the chain method.  If the old
-handler is not an instance of this class the chain is passed as "void
-(*)(void)".  If it is an instance of this class, the handler method is
-directly called. (Chaining has not been tested)
-
-This class implements a table of pointers to the last instance to
-catch the interrupt.  A static method of the class catches the
-interrupt and re-directs the interrupt to the instance in the table.
-The re-direct adds a additional virtual function call and return to
-the overhead of the interrupt.  For a i386 type processor this is
-about 12 instructions including the function call entry.
-
-Message Queue Class
-===================
-
-The MessageQueue class allows message queue's to be created, or
-connected too.  Only the creator can destroy a message queue.
-
-The class implements, sending, urgent sending, broadcast, flushing,
-and receiving.
-
-Semaphore Class
-===============
-
-The Semaphore class allows semaphores to be created, or connected
-too.  Only the creator can destroy a semaphore.
-
-All types of semaphores can be created.
-
-(Not tested in the test code)
-
-Task Class
-==========
-
-The Task class allows tasks to be created, or connected too.  Only the
-creator can destroy a task.
-
-If creating a task, derive from the Task class and provide the body
-method.  The body method is the entry point for a task.  When
-connecting to an existing task, no body method is required to be
-provided.  It is how-ever required if you create a task.  This is not
-enforced by the compiler, how-ever the default body will be entered,
-and it contains no code.  The RTEMS default behaviour for a task that
-returns occurs.
-
-The mode of a task is controlled using the TaskMode class.
-
-The Task class allows you to start, restart, suspend, and resume a
-task.  You can control the priority, and access the note-pad
-registers.  The task can also be slept using the wake_after and
-wake_when methods.
-
-Currently the task argument is used to pass the 'this' pointer to the
-libraries default task body. The actual argument is held in the class
-instance and passed to the virtual body method. This means of passing
-the 'this' pointer through RTEMS to the default task body requires the
-actual task object to perform a restart call. This is not really the
-best solution to the problem. Another solution is to remove a notpad
-register, say 31 from the task and use it. This would mean any Task
-object could stop and restart a task how-ever a notpad register is
-lost. Any other ideas are welcome.
-
-Task Mode Class
-===============
-
-The TaskMode class allows you to query or change the mode of a task.
-The object only operates on the currently executing task.
-
-The standard flags defined in RTEMS are used.
-
-Methods are provided to operate on a group of modes which are required
-to be changed in a single operation.  The mode and mask is specified
-by ORing the required flags as documented in the RTEMS manual.
-
-Methods are provided for accessing and controlling a specific mode.
-The returned value will only contain the requested mode's flags, and
-only the that mode will be changed when setting a mode.
-
-Timer Class
-===========
-
-The Timer class allows timers to be created.  You cannot connect to an
-existing timer.
-
-You derive from the Timer class and provide the trigger method.  This
-method is called when the timer triggers or times out.
-
-You can request a single shot timer using the fire_after or fire_when
-methods, or a periodic timer by calling the repeat_file_at method.
-
-You cannot copy timer objects.
-
-Contact
-=======
-Send any question to me Chris Johns at cjohns@plessey.com.au, or the RTEMS
-mailing list.
-
-To Do
-=====
-
-1) Develop a complete test suite (under way, cjohns@plessey.com.au).
-
-2) Complete wrapping the remaining RTEMS C API.
-
-3) Provide light weight cout/cerr/clog classes based on printf for
-embedded systems.
-
-4) Provide a memory serial class which maps the <</>> operators onto
-raw memory in network byte order independent of CPU byte order.
-
-5) Fix the Task class so any Task object can restart a task.
-
-6) Provide some frame work classes which allow actor type objects that
-start in an ordered manner.
-
diff --git a/c/src/librtems++/include/rtems++/rtemsEvent.h b/c/src/librtems++/include/rtems++/rtemsEvent.h
deleted file mode 100644
index 3cc19eeb32..0000000000
--- a/c/src/librtems++/include/rtems++/rtemsEvent.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
-  ------------------------------------------------------------------------
-  $Id$
-  ------------------------------------------------------------------------
-
-  COPYRIGHT (c) 1997
-  Objective Design Systems Ltd Pty (ODS)
-  All rights reserved (R) Objective Design Systems Ltd Pty
-  
-  The license and distribution terms for this file may be found in the
-  file LICENSE in this distribution or at
-  http://www.OARcorp.com/rtems/license.html.
-
-  ------------------------------------------------------------------------
-
-  rtemsEvent class.
-
-  This class allows the user to send and receive RTEMS events to a task.
-
-  ------------------------------------------------------------------------ */
-
-#if !defined(_rtemsEvent_h_)
-#define _rtemsEvent_h_
-
-#include <rtems++/rtemsStatusCode.h>
-#include <rtems++/rtemsTask.h>
-
-/* ----
-    rtemsEvent
-*/
-
-class rtemsEvent
-  : public rtemsStatusCode
-{
-public:
-  // attribute a task can have
-  
-  enum WaitMode { wait = RTEMS_WAIT,
-                  no_wait = RTEMS_NO_WAIT};
-  enum Condition { any = RTEMS_EVENT_ANY,
-                   all = RTEMS_EVENT_ALL};
-  
-  // only the first 4 characters of the name are taken  
-
-  // connect to a task
-  rtemsEvent(const char* name, rtems_unsigned32 node = RTEMS_SEARCH_ALL_NODES);
-
-  // copy and default constructors
-  rtemsEvent(const rtemsEvent& event);
-  rtemsEvent();
-  
-  virtual ~rtemsEvent();    
-  
-  // connect to an existing task object, will not be the owner
-  const rtemsEvent& operator=(const rtemsEvent& event);
-  virtual const rtems_status_code connect(const char *name,
-                                          const rtems_unsigned32 node = RTEMS_SEARCH_ALL_NODES);
-  
-  // send an event
-  inline const rtems_status_code send(const rtems_id task,
-                                      const rtems_event_set events);
-  inline const rtems_status_code send(const rtemsTask& task,
-                                      const rtems_event_set events) ;
-  inline const rtems_status_code send(const rtems_event_set events);
-
-  // receive an event, can block a task if no events waiting
-  inline const rtems_status_code receive(const rtems_event_set event_in,
-                                         rtems_event_set& event_out,
-                                         const rtems_interval micro_secs = 0,
-                                         const WaitMode wait = wait,
-                                         const Condition condition = any);
-
-  // object id, and name
-  const rtems_id task_id_is() const { return id; }
-  const rtems_name task_name_is() const { return name; }
-  
-private:   
-  // task name
-  rtems_name name;
-
-  // the rtems task id, object handle
-  rtems_id id;
-
-};
-
-const rtems_status_code rtemsEvent::send(const rtems_id task,
-                                         const rtems_event_set events)
-{
-  set_status_code(rtems_event_send(task, events));
-  return last_status_code();
-}
-
-const rtems_status_code rtemsEvent::send(const rtemsTask& task,
-                                         const rtems_event_set events)
-{
-  set_status_code(rtems_event_send(task.id_is(), events));
-  return last_status_code();
-}
-
-const rtems_status_code rtemsEvent::send(const rtems_event_set events)
-{
-  set_status_code(rtems_event_send(id, events));
-  return last_status_code();
-}
-
-const rtems_status_code rtemsEvent::receive(const rtems_event_set event_in,
-                                            rtems_event_set& event_out,
-                                            const rtems_interval micro_secs,
-                                            const WaitMode wait,
-                                            const Condition condition)
-{
-  rtems_interval usecs =
-    micro_secs && (micro_secs < _TOD_Microseconds_per_tick) ?
-    _TOD_Microseconds_per_tick : micro_secs;
-  set_status_code(rtems_event_receive(event_in,
-                                      wait | condition,
-                                      TOD_MICROSECONDS_TO_TICKS(usecs),
-                                      &event_out));
-  return last_status_code();
-}
-
-#endif  // _rtemsEvent_h_
-
-
-
-
-
diff --git a/c/src/librtems++/include/rtems++/rtemsInterrupt.h b/c/src/librtems++/include/rtems++/rtemsInterrupt.h
deleted file mode 100644
index f722eb7683..0000000000
--- a/c/src/librtems++/include/rtems++/rtemsInterrupt.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
-  ------------------------------------------------------------------------
-  $Id$
-  ------------------------------------------------------------------------
-
-  COPYRIGHT (c) 1997
-  Objective Design Systems Ltd Pty (ODS)
-  All rights reserved (R) Objective Design Systems Ltd Pty
-  
-  The license and distribution terms for this file may be found in the
-  file LICENSE in this distribution or at
-  http://www.OARcorp.com/rtems/license.html.
-
-  ------------------------------------------------------------------------
-
-  rtemsInterrupt class.
-
-  This class catches an interrupt and passes control to the user's
-  derived class throught the handler method.
-
-  The interrupt is released back to the previous handler when this
-  object destructs.
-
-  The old handler can be chained to after the interrupt is
-  caught. Watch the stack usage!
-
-  More than one instance of this class can catch the same vector. The
-  application will have to chain to the other objects if required. If
-  the old handler is not an instance of this class the chain is passed
-  as "void (*)(void)". If it is an instance of this class, the handler
-  method is directly called.
-  
-  The isr catch extends the documented return codes with :
-
-    RTEMS_RESOURCE_IN_USE = interrupt already caught
-  
-  ------------------------------------------------------------------------ */
-
-#if !defined(_rtemsInterrupt_h_)
-#define _rtemsInterrupt_h_
-
-#include <rtems++/rtemsStatusCode.h>
-
-/* ----
-    rtemsInterrupt
-*/
-
-class rtemsInterrupt
-  : public rtemsStatusCode
-{
-public:
-  rtemsInterrupt();
-  virtual ~rtemsInterrupt();
-
-  // catch the interrupt
-  virtual const rtems_status_code isr_catch(const rtems_vector_number vector);
-  
-  // release the interrupt back to the previous handle
-  virtual const rtems_status_code release();
-
-  // the old handler
-  const rtems_isr_entry old_isr_handler() const { return old_handler; }
-  
-protected:
-
-  // called after the interrupt is caught and it goes off
-  virtual void handler() = 0;
-
-  // chain to the previous handler, 
-  inline void chain() const;
-  
-private:   
-  const rtemsInterrupt& operator=(const rtemsInterrupt& );
-  rtemsInterrupt(const rtemsInterrupt& );
-  
-  // the vector caught
-  rtems_vector_number vector;
-  
-  // true when the interrupt is caught
-  bool caught;
-  
-  // returned when catching the interrupt
-  rtems_isr_entry old_handler;
-
-  // old interrupt table entry
-  rtemsInterrupt *old_interrupt;
-
-  // common handler to redirect the interrupts
-  static void redirector(rtems_vector_number vector);
-};
-
-void rtemsInterrupt::chain() const
-{
-  if (old_interrupt)
-    old_interrupt->handler();
-  else if (old_handler)
-    ((void(*)()) old_handler)();
-}
-
-#endif  // _rtemsInterrupt_h_
-
-
-
-
-
diff --git a/c/src/librtems++/include/rtems++/rtemsMessageQueue.h b/c/src/librtems++/include/rtems++/rtemsMessageQueue.h
deleted file mode 100644
index 910c7279f7..0000000000
--- a/c/src/librtems++/include/rtems++/rtemsMessageQueue.h
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
-  ------------------------------------------------------------------------
-  $Id$
-  ------------------------------------------------------------------------
-
-  COPYRIGHT (c) 1997
-  Objective Design Systems Ltd Pty (ODS)
-  All rights reserved (R) Objective Design Systems Ltd Pty
-  
-  The license and distribution terms for this file may be found in the
-  file LICENSE in this distribution or at
-  http://www.OARcorp.com/rtems/license.html.
-
-  ------------------------------------------------------------------------
-
-  rtemsMessageQueue class.
-
-  This class allows the user to create a RTEMS message queue, or to
-  access and manage an already existing message queue.
-
-  The first constructor with the message queue parameters creates a
-  RTEMS message queue object. The destructor of this object also
-  deletes the message queue object. The last status code should be
-  checked after construction to see if the create completed
-  successfully.
-
-  The second constructor connects to an existing message queue
-  object. The last status code should be checked after construction to
-  see if the message queue existed.
-
-  The third constructor is a copy constructor. Connects to an existing
-  object which is in scope.
-
-  The fourth constructor allows for the message queue to be created
-  after construction, or to connect to a message queue later.
-  
-  ------------------------------------------------------------------------ */
-
-#if !defined(_rtemsMessageQueue_h_)
-#define _rtemsMessageQueue_h_
-
-#include <rtems++/rtemsStatusCode.h>
-
-/* ----
-    rtemsMessageQueue
-*/
-
-class rtemsMessageQueue
-  : public rtemsStatusCode
-{
-public:
-  // attribute a message queue can have
-  enum WaitMode { wait_by_fifo = RTEMS_FIFO,
-                  wait_by_priority = RTEMS_PRIORITY };
-  enum Scope { local = RTEMS_LOCAL,
-               global = RTEMS_GLOBAL };
-                  
-  // only the first 4 characters of the name are taken  
-
-  // creates a message queue
-  rtemsMessageQueue(const char* name,
-                    const rtems_unsigned32 count,
-                    const rtems_unsigned32 max_message_size,
-                    const WaitMode wait_mode = wait_by_fifo,
-                    const Scope scope = local);
-
-  // connects to a message queue
-  rtemsMessageQueue(const char *name, const rtems_unsigned32 node = RTEMS_SEARCH_ALL_NODES);
-
-  // copy and default constructors
-  rtemsMessageQueue(const rtemsMessageQueue& message_queue);
-  rtemsMessageQueue();
-  
-  // only the creator's destructor will delete the actual object
-  virtual ~rtemsMessageQueue();
-    
-  // create or destroy (delete) the message queue
-  virtual const rtems_status_code create(const char* name,
-                                         const rtems_unsigned32 count,
-                                         const rtems_unsigned32 max_message_size,
-                                         const WaitMode wait_mode = wait_by_fifo,
-                                         const Scope scope = local);
-  virtual const rtems_status_code destroy();
-
-  // connect to an existing message queue object, will not be the owner
-  const rtemsMessageQueue& operator=(const rtemsMessageQueue& message_queue);  
-  virtual const rtems_status_code connect(const char *name,
-                                          const rtems_unsigned32 node = RTEMS_SEARCH_ALL_NODES);
-  
-  // send a message of size from the buffer
-  inline const rtems_status_code send(const void *buffer,
-                                      const rtems_unsigned32 size);
-  inline const rtems_status_code urgent(const void *buffer,
-                                        const rtems_unsigned32 size);
-  inline const rtems_status_code broadcast(const void *buffer,
-                                           const rtems_unsigned32 size,
-                                           rtems_unsigned32& count);
-
-  // receive a message of size, the timeout is in micro-secs
-  inline const rtems_status_code receive(const void *buffer,
-                                         rtems_unsigned32& size,
-                                         rtems_interval micro_secs = RTEMS_NO_TIMEOUT,
-                                         bool wait = true);
-                    
-  // flush a message queue, returning the number of messages dropped
-  inline const rtems_status_code flush(rtems_unsigned32& size);
-                    
-  // object id, and name
-  const rtems_id id_is() const { return id; }
-  const rtems_name name_is() const { return name; }
-  const char *name_string() const { return name_str; }
-  
-private:
-
-  // make this object reference an invalid RTEMS object
-  void make_invalid();
-  
-  // message queue name
-  rtems_name name;
-  char name_str[5];
-  
-  // owner, true if this object owns the message queue
-  // will delete the message queue when it destructs
-  bool owner;
-    
-  // the rtems id, object handle
-  rtems_id id;
-};
-
-const rtems_status_code rtemsMessageQueue::send(const void *buffer,
-                                                const rtems_unsigned32 size)
-{
-  return set_status_code(rtems_message_queue_send(id, (void*) buffer, size));
-}
-
-const rtems_status_code rtemsMessageQueue::urgent(const void *buffer,
-                                                  const rtems_unsigned32 size)
-{
-  return set_status_code(rtems_message_queue_urgent(id, (void*) buffer, size));
-}
-
-const rtems_status_code rtemsMessageQueue::broadcast(const void *buffer,
-                                                     const rtems_unsigned32 size,
-                                                     rtems_unsigned32& count)
-{
-  return set_status_code(rtems_message_queue_broadcast(id,
-                                                       (void*) buffer,
-                                                       size,
-                                                       &count));
-}
-
-const rtems_status_code rtemsMessageQueue::receive(const void *buffer,
-                                                   rtems_unsigned32& size,
-                                                   rtems_interval micro_secs,
-                                                   bool wait)
-{
-  rtems_interval usecs =
-    micro_secs && (micro_secs < _TOD_Microseconds_per_tick) ?
-    _TOD_Microseconds_per_tick : micro_secs;
-  return set_status_code(rtems_message_queue_receive(id,
-                                                     (void*) buffer,
-                                                     &size,
-                                                     wait ? RTEMS_WAIT : RTEMS_NO_WAIT,
-                                                     TOD_MICROSECONDS_TO_TICKS(usecs)));
-}
-
-const rtems_status_code rtemsMessageQueue::flush(rtems_unsigned32& count)
-{
-  return set_status_code(rtems_message_queue_flush(id, &count));
-}
-
-#endif  // _rtemsMessageQueue_h_
-
-
-
-
diff --git a/c/src/librtems++/include/rtems++/rtemsSemaphore.h b/c/src/librtems++/include/rtems++/rtemsSemaphore.h
deleted file mode 100644
index 9d4fdbeb58..0000000000
--- a/c/src/librtems++/include/rtems++/rtemsSemaphore.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
-  ------------------------------------------------------------------------
-  $Id$
-  ------------------------------------------------------------------------
-
-  COPYRIGHT (c) 1997
-  Objective Design Systems Ltd Pty (ODS)
-  All rights reserved (R) Objective Design Systems Ltd Pty
-  
-  The license and distribution terms for this file may be found in the
-  file LICENSE in this distribution or at
-  http://www.OARcorp.com/rtems/license.html.
-
-  ------------------------------------------------------------------------
-
-  rtemsSemaphore class.
-
-  This class allows the user to create a RTEMS semaphore, or to use an
-  already existing semaphore. The type of semaphore is decitated by
-  the constructor used.
-
-  The first constructor with the semaphore parameters creates a RTEMS
-  semaphore object. The destructor of this object also deletes the
-  semaphore object. The last status code should be checked after
-  construction to see if the semaphore create was successfull.
-
-  The second constructor connects to an existing. The last status code
-  should be checked after construction to see if the semaphore
-  existed.
-
-  The third constructor is a copy constructor. Connects to an existing
-  object which is in scope.
-
-  ------------------------------------------------------------------------ */
-
-#if !defined(_rtemsSemaphore_h_)
-#define _rtemsSemaphore_h_
-
-#include <rtems++/rtemsStatusCode.h>
-
-/* ----
-    rtemsSemaphore
-*/
-
-class rtemsSemaphore
-  : public rtemsStatusCode
-{
-public:
-  // attribute a semaphore can have
-  enum WaitMode { wait_by_fifo = RTEMS_FIFO,
-                  wait_by_priority = RTEMS_PRIORITY };
-  enum Type { binary = RTEMS_BINARY_SEMAPHORE,
-              counting = RTEMS_COUNTING_SEMAPHORE };
-  enum Priority { no_priority_inherit = RTEMS_NO_INHERIT_PRIORITY,
-                  inherit_priority = RTEMS_INHERIT_PRIORITY };
-  enum Ceiling { no_priority_ceiling = RTEMS_NO_PRIORITY_CEILING,
-                 priority_ceiling = RTEMS_PRIORITY_CEILING };
-  enum Scope { local = RTEMS_LOCAL,
-               global = RTEMS_GLOBAL };
-
-  // only the first 4 characters of the name are taken,
-  // the counter must be set to 1 for binary semaphores
-
-  // create a semaphore object
-  rtemsSemaphore(const char* name,
-                 const Scope scope = local,
-                 const rtems_unsigned32 counter = 1,
-                 const WaitMode wait_mode = wait_by_fifo,
-                 const Type type = binary,
-                 const Priority priority = no_priority_inherit,
-                 const Ceiling ceiling = no_priority_ceiling,
-                 const rtems_task_priority priority_ceiling = 0);
-
-  // connect to an existing semaphore object by name
-  rtemsSemaphore(const char *name, const rtems_unsigned32 node);
-  
-  // attach this object to an other objects semaphore
-  rtemsSemaphore(const rtemsSemaphore& semaphore);
-  rtemsSemaphore();
-
-  // only the creator's destructor will delete the actual object
-  virtual ~rtemsSemaphore();
-
-  // create or destroy (delete) a semaphore
-  virtual const rtems_status_code create(const char* name,
-                                         const Scope scope = local,
-                                         const rtems_unsigned32 counter = 1,
-                                         const WaitMode wait_mode = wait_by_fifo,
-                                         const Type type = binary,
-                                         const Priority priority = no_priority_inherit,
-                                         const Ceiling ceiling = no_priority_ceiling,
-                                         const rtems_task_priority priority_ceiling = 0);
-  virtual const rtems_status_code destroy();
-  
-  // connect to an existing semaphore object, will not be the owner
-  const rtemsSemaphore& operator=(const rtemsSemaphore& semaphore);  
-  virtual const rtems_status_code connect(const char *name, rtems_unsigned32 node);
-  
-  // obtain the semaphore, timeout is in micro-seconds
-  inline const rtems_status_code obtain(bool wait = true,
-                                        const rtems_unsigned32 micro_secs = RTEMS_NO_TIMEOUT);
-  
-  // release the semaphore, blocks threads eligble
-  inline const rtems_status_code release();
-    
-  // object id, and name
-  const rtems_id id_is() const { return id; }
-  const rtems_name name_is() const { return name; }
-  const char *name_string() const { return name_str; }
-  
-private:
-
-  // make the object reference no valid RTEMS object
-  void make_invalid();
-  
-  // semaphore name
-  rtems_name name;
-  char name_str[5];
-
-  // owner, true if this object owns the semaphore
-  // will delete the semaphore when it destructs
-  bool owner;
-    
-  // the rtems id, object handle
-  rtems_id id;
-};
-
-const rtems_status_code rtemsSemaphore::obtain(const bool wait,
-                                               const rtems_unsigned32 micro_secs)
-{
-  rtems_interval usecs =
-    micro_secs && (micro_secs < _TOD_Microseconds_per_tick) ?
-    _TOD_Microseconds_per_tick : micro_secs;
-  return
-    set_status_code(rtems_semaphore_obtain(id,
-                                           wait ? RTEMS_WAIT : RTEMS_NO_WAIT,
-                                           TOD_MICROSECONDS_TO_TICKS(usecs)));
-}
-
-const rtems_status_code rtemsSemaphore::release(void)
-{  
-  return set_status_code(rtems_semaphore_release(id));
-}
-
-#endif  // _rtemsSemaphore_h_
diff --git a/c/src/librtems++/include/rtems++/rtemsStatusCode.h b/c/src/librtems++/include/rtems++/rtemsStatusCode.h
deleted file mode 100644
index fee230868b..0000000000
--- a/c/src/librtems++/include/rtems++/rtemsStatusCode.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-  ------------------------------------------------------------------------
-  $Id$
-  ------------------------------------------------------------------------
-
-  COPYRIGHT (c) 1997
-  Objective Design Systems Ltd Pty (ODS)
-  All rights reserved (R) Objective Design Systems Ltd Pty
-  
-  The license and distribution terms for this file may be found in the
-  file LICENSE in this distribution or at
-  http://www.OARcorp.com/rtems/license.html.
-
-  ------------------------------------------------------------------------
-
-  rtemsStatusCode controls and manages status codes from the RTEMS kernel.
-  
-  ------------------------------------------------------------------------
-*/
-
-#if !defined(_rtemsStatusCode_h_)
-#define _rtemsStatusCode_h_
-
-#include <rtems.h>
-
-/* ----
-    rtemsStatusCode
-*/
-
-class rtemsStatusCode
-{
-public:
-  
-  rtemsStatusCode() { last_status = RTEMS_NOT_CONFIGURED; }
-  
-  const bool successful() { return last_status == RTEMS_SUCCESSFUL; }
-  const bool unsuccessful() { return last_status != RTEMS_SUCCESSFUL; }
-  
-  // return the last status code
-  const rtems_status_code last_status_code() { return last_status; }
-  
-  // return the last status as a string
-  const char *last_status_string();
-
-  const char *status_string(rtems_status_code status_code);
-
-protected:
-  const rtems_status_code set_status_code(const rtems_status_code status)
-  { return (last_status = status); }
-  
-private:
-  
-  // public at the moment, this might change
-  rtems_status_code last_status;
-};
-
-#endif  // _rtemsStatusCode_h_
diff --git a/c/src/librtems++/include/rtems++/rtemsTask.h b/c/src/librtems++/include/rtems++/rtemsTask.h
deleted file mode 100644
index 08156428fb..0000000000
--- a/c/src/librtems++/include/rtems++/rtemsTask.h
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
-  ------------------------------------------------------------------------
-  $Id$
-  ------------------------------------------------------------------------
-
-  COPYRIGHT (c) 1997
-  Objective Design Systems Ltd Pty (ODS)
-  All rights reserved (R) Objective Design Systems Ltd Pty
-  
-  The license and distribution terms for this file may be found in the
-  file LICENSE in this distribution or at
-  http://www.OARcorp.com/rtems/license.html.
-
-  ------------------------------------------------------------------------
-
-  rtemsTask class.
-
-  This class allows the user to create a RTEMS task, or to access and
-  manage an already existing task.
-
-  The first constructor with the task parameters creates a RTEMS task
-  object. The destructor of this object also deletes the task
-  object. The last status code should be checked after construction to
-  see if the create completed successfully.
-
-  The second constructor connects to an existing task object. The last
-  status code should be checked after construction to see if the
-  task existed.
-
-  The third constructor is a copy constructor. Connects to an existing
-  object which is in scope.
-  
-  The RTEMS id is set to self in the default construction.
-
-  The creation of the task object can be defered until after
-  construction. This allows for static task objects to be created.
-
-  RTEMS should be initialised before static constructors run, how-ever
-  threads will will not. You need to watch the start-order.
-
-  A task object can change state from an owner of a task to being
-  connected to a task.
-
-  Task objects connected to another task do not receive notification
-  when the task connected to changes state.
-
-  The sleep methods operate on the current thread not the task
-  reference by this object.
-
-  Mode control is through the rtemsTaskMode class.
-
-  The rtemsTask class reserved notepad register 31.
-  
-  ------------------------------------------------------------------------ */
-
-#if !defined(_rtemsTask_h_)
-#define _rtemsTask_h_
-
-#include <rtems++/rtemsStatusCode.h>
-
-/* ----
-    rtemsTask
-*/
-
-class rtemsTask
-  : public rtemsStatusCode
-{
-public:
-  enum FloatingPoint { fpoff = RTEMS_NO_FLOATING_POINT,
-                       fpon = RTEMS_FLOATING_POINT };
-  enum Scope { local = RTEMS_LOCAL,
-               global = RTEMS_GLOBAL };
-
-  // only the first 4 characters of the name are taken  
-
-  // creates a task
-  rtemsTask(const char* name,
-            const rtems_task_priority initial_priority,
-            const rtems_unsigned32 stack_size,
-            const rtems_mode preemption = RTEMS_NO_PREEMPT,
-            const rtems_mode timeslice = RTEMS_NO_TIMESLICE,
-            const rtems_mode asr = RTEMS_NO_ASR,
-            const rtems_interrupt_level interrupt_level = 0,
-            const FloatingPoint floating_point = fpoff,
-            const Scope scope = local);
-
-  // connects to a task
-  rtemsTask(const char *name, const rtems_unsigned32 node = RTEMS_SEARCH_ALL_NODES);
-
-  // copy and default constructors
-  rtemsTask(const rtemsTask& task);
-  rtemsTask();
-  
-  // only the creator's destructor will delete the actual object
-  virtual ~rtemsTask();
-    
-  // create or destroy (delete) the task
-  virtual const rtems_status_code create(const char* name,
-                                         const rtems_task_priority initial_priority,
-                                         const rtems_unsigned32 stack_size,
-                                         const rtems_mode preemption = RTEMS_NO_PREEMPT,
-                                         const rtems_mode timeslice = RTEMS_NO_TIMESLICE,
-                                         const rtems_mode asr = RTEMS_NO_ASR,
-                                         const rtems_interrupt_level interrupt_level = 0,
-                                         const FloatingPoint floating_point = fpoff,
-                                         const Scope scope = local);
-  virtual const rtems_status_code destroy();
-
-  // connect to an existing task object, will not be the owner
-  const rtemsTask& operator=(const rtemsTask& task);
-  virtual const rtems_status_code connect(const char *name,
-                                          const rtems_unsigned32 node = RTEMS_SEARCH_ALL_NODES);
-  
-  // run control
-  virtual const rtems_status_code start(const rtems_task_argument argument);
-  virtual const rtems_status_code restart(const rtems_task_argument argument);
-  virtual const rtems_status_code suspend();
-  virtual const rtems_status_code resume();
-
-  // sleep control, the timeout is in micro-seconds
-  virtual const rtems_status_code wake_after(const rtems_interval micro_secs);
-  virtual const rtems_status_code wake_when(const rtems_time_of_day& tod);
-  
-  // priority control
-  const rtems_status_code get_priority(rtems_task_priority& priority);
-  const rtems_status_code set_priority(const rtems_task_priority priority);
-  const rtems_status_code set_priority(const rtems_task_priority priority,
-                                       rtems_task_priority& old_priority);
-  
-  // notepad control
-  const rtems_status_code get_note(const rtems_unsigned32 notepad,
-                                   rtems_unsigned32& note);
-  const rtems_status_code set_note(const rtems_unsigned32 notepad,
-                                   const rtems_unsigned32 note);
-
-  // object id, and name
-  const rtems_id id_is() const { return id; }
-  const rtems_name name_is() const { return name; }
-  const char *name_string() const { return name_str; }
-  
-protected:
-
-  // task entry point
-  virtual void body(rtems_task_argument argument);
-  
-private:
-
-  // make the object to point to RTEMS_SELF
-  void make_self();
-  
-  // task name
-  rtems_name name;
-  char name_str[5];
-
-  // owner, true if this object owns the task
-  // will delete the task when it destructs
-  bool owner;
-    
-  // the rtems id, object handle
-  rtems_id id;
-
-  // the argument for the task, this class uses the actual argument
-  // passed to RTEMS
-  rtems_task_argument argument;
-  
-  // common entry point to the task
-  static rtems_task origin(rtems_task_argument argument);
-};
-
-#endif  // _rtemsTask_h_
-
diff --git a/c/src/librtems++/include/rtems++/rtemsTaskMode.h b/c/src/librtems++/include/rtems++/rtemsTaskMode.h
deleted file mode 100644
index 6d32897cc0..0000000000
--- a/c/src/librtems++/include/rtems++/rtemsTaskMode.h
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
-  ------------------------------------------------------------------------
-  $Id$
-  ------------------------------------------------------------------------
-
-  COPYRIGHT (c) 1997
-  Objective Design Systems Ltd Pty (ODS)
-  All rights reserved (R) Objective Design Systems Ltd Pty
-  
-  The license and distribution terms for this file may be found in the
-  file LICENSE in this distribution or at
-  http://www.OARcorp.com/rtems/license.html.
-
-  ------------------------------------------------------------------------
-
-  rtemsTaskMode class.
-
-  This class allows the user to query or change the mode of an RTEMS
-  task.
-
-  This object only operates on the currently executing task.
-
-  The standard flags defined in RTEMS are used.
-
-  Methods are provided to operate on a group of modes which are
-  required to be changed in a single operation. The mode and mask is
-  specified by ORing the required flags.
-
-  Methods are provided for accessing and controlling a specific
-  mode. The returned value will only contain the requested mode's flags,
-  and only the that mode will be changed when setting a mode.
-  
-  ------------------------------------------------------------------------ */
-
-#if !defined(_rtemsTaskMode_h_)
-#define _rtemsTaskMode_h_
-
-#include <rtems++/rtemsStatusCode.h>
-
-/* ----
-    rtemsTaskMode
-*/
-
-class rtemsTaskMode
-  : public rtemsStatusCode
-{
-public:
-  
-  rtemsTaskMode() {};
-  
-  // group mode control, OR the values together
-  inline const rtems_status_code get_mode(rtems_mode& mode);
-  inline const rtems_status_code set_mode(const rtems_mode mode,
-                                          const rtems_mode mask);
-  inline const rtems_status_code set_mode(const rtems_mode mode,
-                                          const rtems_mode mask,
-                                          rtems_mode& old_mode);
-  
-  // preemption control
-  inline const rtems_status_code get_preemption_state(rtems_mode& preemption);
-  inline const rtems_status_code set_preemption_state(const rtems_mode preemption);
-  inline const rtems_status_code set_preemption_state(const rtems_mode preemption,
-                                                      rtems_mode& old_preemption);
-  inline const boolean preemption_set(const rtems_mode preemption);
-
-  // timeslice control
-  inline const rtems_status_code get_timeslice_state(rtems_mode& timeslice);
-  inline const rtems_status_code set_timeslice_state(const rtems_mode timeslice);
-  inline const rtems_status_code set_timeslice_state(const rtems_mode timeslice,
-                                                     rtems_mode& old_timeslice);
-  inline const boolean timeslice_set(const rtems_mode preemption);
-
-  // async-sub-routine control
-  inline const rtems_status_code get_asr_state(rtems_mode& asr);
-  inline const rtems_status_code set_asr_state(const rtems_mode asr);
-  inline const rtems_status_code set_asr_state(const rtems_mode asr,
-                                               rtems_mode& old_asr);
-  inline const boolean asr_set(const rtems_mode preemption);
-
-  // interrupt mask control
-  inline const rtems_status_code get_interrupt_level(rtems_interrupt_level& level);
-  inline const rtems_status_code set_interrupt_level(const rtems_interrupt_level level);
-  inline const rtems_status_code set_interrupt_level(const rtems_interrupt_level level,
-                                                     rtems_interrupt_level& old_level);
-};
-
-const rtems_status_code rtemsTaskMode::get_mode(rtems_mode& mode)
-{
-  return set_status_code(rtems_task_mode(0, RTEMS_CURRENT_MODE, &mode));
-}
-
-const rtems_status_code rtemsTaskMode::set_mode(const rtems_mode mode,
-                                                const rtems_mode mask)
-{
-  rtems_mode old_mode;
-  return set_status_code(rtems_task_mode(mode, mask, &old_mode));
-}
-
-const rtems_status_code rtemsTaskMode::set_mode(const rtems_mode mode,
-                                                const rtems_mode mask,
-                                                rtems_mode& old_mode)
-{
-  return set_status_code(rtems_task_mode(mode, mask, &old_mode));
-}
-
-const rtems_status_code rtemsTaskMode::get_preemption_state(rtems_mode& preemption)
-{
-  set_status_code(rtems_task_mode(0, RTEMS_CURRENT_MODE, &preemption));
-  preemption &= RTEMS_PREEMPT_MASK;
-  return last_status_code();
-}
-
-const rtems_status_code rtemsTaskMode::set_preemption_state(const rtems_mode preemption)
-{
-  rtems_mode old_mode;
-  return set_status_code(rtems_task_mode(preemption, RTEMS_PREEMPT_MASK, &old_mode));
-}
-
-const rtems_status_code rtemsTaskMode::set_preemption_state(const rtems_mode preemption,
-                                                       rtems_mode& old_preemption)
-{
-  set_status_code(rtems_task_mode(preemption, RTEMS_PREEMPT_MASK, &old_preemption));
-  old_preemption &= RTEMS_PREEMPT_MASK;
-  return last_status_code();
-}
-
-const boolean rtemsTaskMode::preemption_set(const rtems_mode preemption)
-{
-  return (preemption & RTEMS_PREEMPT_MASK) ? false : true;
-}
-
-const rtems_status_code rtemsTaskMode::get_timeslice_state(rtems_mode& timeslice)
-{
-  set_status_code(rtems_task_mode(0, RTEMS_CURRENT_MODE, &timeslice));
-  timeslice &= RTEMS_TIMESLICE_MASK;
-  return last_status_code();
-}
-
-const rtems_status_code rtemsTaskMode::set_timeslice_state(const rtems_mode timeslice)
-{
-  rtems_mode old_mode;
-  return set_status_code(rtems_task_mode(timeslice, RTEMS_TIMESLICE_MASK, &old_mode));
-}
-
-const rtems_status_code rtemsTaskMode::set_timeslice_state(const rtems_mode timeslice,
-                                                           rtems_mode& old_timeslice)
-{
-  set_status_code(rtems_task_mode(timeslice, RTEMS_TIMESLICE_MASK, &old_timeslice));
-  old_timeslice &= RTEMS_TIMESLICE_MASK;
-  return last_status_code();
-}
-
-const boolean rtemsTaskMode::timeslice_set(const rtems_mode timeslice)
-{
-  return (timeslice & RTEMS_TIMESLICE_MASK) ? true : false;
-}
-
-const rtems_status_code rtemsTaskMode::get_asr_state(rtems_mode& asr)
-{
-  set_status_code(rtems_task_mode(0, RTEMS_CURRENT_MODE, &asr));
-  asr &= RTEMS_ASR_MASK;
-  return last_status_code();
-}
-
-const rtems_status_code rtemsTaskMode::set_asr_state(const rtems_mode asr)
-{
-  rtems_mode old_mode;
-  return set_status_code(rtems_task_mode(asr, RTEMS_ASR_MASK, &old_mode));
-}
-
-const rtems_status_code rtemsTaskMode::set_asr_state(const rtems_mode asr,
-                                                     rtems_mode& old_asr)
-{
-  set_status_code(rtems_task_mode(asr, RTEMS_ASR_MASK, &old_asr));
-  old_asr &= RTEMS_ASR_MASK;
-  return last_status_code();
-}
-
-const boolean rtemsTaskMode::asr_set(const rtems_mode asr)
-{
-  return (asr & RTEMS_ASR_MASK) ? true : false;
-}
-
-const rtems_status_code rtemsTaskMode::get_interrupt_level(rtems_interrupt_level& level)
-{
-  rtems_mode mode;
-  set_status_code(rtems_task_mode(0, RTEMS_CURRENT_MODE, &mode));
-  level = mode & RTEMS_INTERRUPT_MASK;
-  return last_status_code();
-}
-
-const rtems_status_code rtemsTaskMode::set_interrupt_level(const rtems_interrupt_level level)
-{
-  rtems_mode old_mode;
-  return set_status_code(rtems_task_mode(level, RTEMS_INTERRUPT_MASK, &old_mode));
-}
-
-const rtems_status_code rtemsTaskMode::set_interrupt_level(rtems_interrupt_level level,
-                                                           rtems_interrupt_level& old_level)
-{
-  set_status_code(rtems_task_mode(level, RTEMS_INTERRUPT_MASK, &old_level));
-  old_level = old_level & RTEMS_INTERRUPT_MASK;
-  return last_status_code();
-}
-
-#endif  // _rtemsTaskMode_h_
-
-
-
-
diff --git a/c/src/librtems++/include/rtems++/rtemsTimer.h b/c/src/librtems++/include/rtems++/rtemsTimer.h
deleted file mode 100644
index 43401bab73..0000000000
--- a/c/src/librtems++/include/rtems++/rtemsTimer.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
-  ------------------------------------------------------------------------
-  $Id$
-  ------------------------------------------------------------------------
-
-  COPYRIGHT (c) 1997
-  Objective Design Systems Ltd Pty (ODS)
-  All rights reserved (R) Objective Design Systems Ltd Pty
-  
-  The license and distribution terms for this file may be found in the
-  file LICENSE in this distribution or at
-  http://www.OARcorp.com/rtems/license.html.
-
-  ------------------------------------------------------------------------
-
-  rtemsTimer class.
-
-  This class allows the user to create a RTEMS timer.
-
-  The trigger method is called when the timer expires. The method is
-  called using the thread which calls the RTEMS 'rtems_clock_tick'
-  method.
-
-  Timers are always local to a node.
-  
-  ------------------------------------------------------------------------ */
-
-#if !defined(_rtemsTimer_h_)
-#define _rtemsTimer_h_
-
-#include <rtems++/rtemsStatusCode.h>
-
-/* ----
-    rtemsTimer
-*/
-
-class rtemsTimer
-  : public rtemsStatusCode
-{
-public:
-  // only the first 4 characters of the name are taken,
-
-  // create a timer object
-  rtemsTimer(const char* name);
-  rtemsTimer();
-  
-  // destroies the actual object
-  virtual ~rtemsTimer();
-
-  // create or destroy (delete) the timer
-  virtual const rtems_status_code create(const char* name);
-  virtual const rtems_status_code destroy();
-  
-  // timer control
-  inline const rtems_status_code fire_after(const rtems_interval micro_secs);
-  inline const rtems_status_code repeat_fire_at(const rtems_interval micro_secs);
-  inline const rtems_status_code fire_when(const rtems_time_of_day& when);
-  
-  inline const rtems_status_code cancel();
-  inline const rtems_status_code reset();
-    
-  // object id, and name
-  const rtems_id id_is() const { return id; }
-  const rtems_name name_is() const { return name; }
-  const char *name_string() const { return name_str; }
-  
-protected:
-
-  // triggered method is called when the timer fires
-  virtual void triggered() = 0;
-  
-private:
-  // not permitted
-  rtemsTimer(const rtemsTimer& timer);
-  rtemsTimer& operator=(const rtemsTimer& timer);
-
-  // make this object reference an invalid RTEMS object
-  void make_invalid();
-  
-  // semaphore name
-  rtems_name name;
-  char name_str[5];
-
-  // repeat true restart the timer when it fires
-  bool repeat;
-
-  // the rtems id, object handle
-  rtems_id id;
-
-  // common timer handler
-  static void common_handler(rtems_id id, void *user_data);
-};
-
-const rtems_status_code rtemsTimer::fire_after(const rtems_interval micro_secs)
-{
-  repeat = false;
-  rtems_interval usecs =
-    micro_secs && (micro_secs < _TOD_Microseconds_per_tick) ?
-    _TOD_Microseconds_per_tick : micro_secs;
-  return set_status_code(rtems_timer_fire_after(id,
-                                                TOD_MICROSECONDS_TO_TICKS(usecs),
-                                                common_handler,
-                                                this));
-}
-
-const rtems_status_code rtemsTimer::repeat_fire_at(const rtems_interval micro_secs)
-{
-  repeat = true;
-  rtems_interval usecs =
-    micro_secs && (micro_secs < _TOD_Microseconds_per_tick) ?
-    _TOD_Microseconds_per_tick : micro_secs;
-  return set_status_code(rtems_timer_fire_after(id,
-                                                TOD_MICROSECONDS_TO_TICKS(usecs),
-                                                common_handler,
-                                                this));
-}
-
-const rtems_status_code rtemsTimer::fire_when(const rtems_time_of_day& when)
-{
-  return set_status_code(rtems_timer_fire_when(id,
-                                               (rtems_time_of_day*) &when,
-                                               common_handler,
-                                               this));
-}
-
-const rtems_status_code rtemsTimer::cancel()
-{
-  repeat = false;
-  return set_status_code(rtems_timer_cancel(id));
-}
-
-const rtems_status_code rtemsTimer::reset()
-{ 
-  return set_status_code(rtems_timer_reset(id));
-}
-
-#endif  // _rtemsTimer_h_
-
-
-
-
-
-
-
-
diff --git a/c/src/librtems++/src/Makefile.in b/c/src/librtems++/src/Makefile.in
deleted file mode 100644
index c69c34790a..0000000000
--- a/c/src/librtems++/src/Makefile.in
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-LIBNAME=librtems++.a
-LIB=${ARCH}/${LIBNAME}
-
-# C and C++ source names, if any, go here -- minus the .c or .cc
-CC_PIECES=rtemsEvent rtemsInterrupt rtemsMessageQueue rtemsSemaphore \
-		rtemsStatusCode rtemsTask rtemsTimer
-CC_FILES=$(CC_PIECES:%=%.cc)
-CC_O_FILES=$(CC_PIECES:%=${ARCH}/%.o)
-
-SRCS=$(CC_FILES)
-OBJS=$(CC_O_FILES)
-
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/lib.cfg
-
-#
-# Add local stuff here using +=
-#
-
-DEFINES  +=
-CPPFLAGS +=
-CFLAGS   += $(LIBC_DEFINES)
-
-#
-# Add your list of files to delete here.  The config files
-#  already know how to delete some stuff, so you may want
-#  to just run 'make clean' first to see what gets missed.
-#  'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS += $(LIB)
-CLOBBER_ADDITIONS +=
-
-all:	${ARCH} $(LIB)
-	$(INSTALL_VARIANT) -m 644 ${LIB} ${PROJECT_RELEASE}/lib
-
-$(LIB): $(SRCS) ${OBJS}
-	$(make-library)
-
-
diff --git a/c/src/librtems++/src/rtemsEvent.cc b/c/src/librtems++/src/rtemsEvent.cc
deleted file mode 100644
index a917f32836..0000000000
--- a/c/src/librtems++/src/rtemsEvent.cc
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
-  ------------------------------------------------------------------------
-  $Id$
-  ------------------------------------------------------------------------
-
-  COPYRIGHT (c) 1997
-  Objective Design Systems Ltd Pty (ODS)
-  All rights reserved (R) Objective Design Systems Ltd Pty
-  
-  The license and distribution terms for this file may be found in the
-  file LICENSE in this distribution or at
-  http://www.OARcorp.com/rtems/license.html.
-
-  ------------------------------------------------------------------------
-
-  See header file.
-
-  ------------------------------------------------------------------------
-*/
-
-#include <rtems++/rtemsEvent.h>
-
-/* ----
-    rtemsEvent
-*/
-
-rtemsEvent::rtemsEvent(const char *name_str, rtems_unsigned32 node)
-  : name(rtems_build_name('S', 'E', 'L', 'F')),
-    id(RTEMS_SELF)
-{
-  connect(name_str, node);
-}
-
-rtemsEvent::rtemsEvent(const rtemsEvent& event)
-{
-  name = event.name;
-  id = event.id;
-}
-
-rtemsEvent::rtemsEvent()
-  : name(rtems_build_name('S', 'E', 'L', 'F')),
-    id(RTEMS_SELF)
-{
-}
-
-rtemsEvent::~rtemsEvent()
-{
-}
-
-const rtemsEvent& rtemsEvent::operator=(const rtemsEvent& event)
-{
-  name = event.name;
-  id = event.id;
-
-  return *this;
-}
-
-const rtems_status_code rtemsEvent::connect(const char *name_str,
-                                            const rtems_unsigned32 node)
-{
-  name = rtems_build_name(name_str[0],
-                          name_str[1],
-                          name_str[2],
-                          name_str[3]);
-  
-  set_status_code(rtems_task_ident(name, node, &id));
-
-  if (unsuccessful())
-  {
-    name = rtems_build_name('S', 'E', 'L', 'F');
-    id = RTEMS_SELF;
-  }
-  
-  return last_status_code();
-}
diff --git a/c/src/librtems++/src/rtemsInterrupt.cc b/c/src/librtems++/src/rtemsInterrupt.cc
deleted file mode 100644
index 4cd5d9afa9..0000000000
--- a/c/src/librtems++/src/rtemsInterrupt.cc
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
-  ------------------------------------------------------------------------
-  $Id$
-  ------------------------------------------------------------------------
-
-  COPYRIGHT (c) 1997
-  Objective Design Systems Ltd Pty (ODS)
-  All rights reserved (R) Objective Design Systems Ltd Pty
-  
-  The license and distribution terms for this file may be found in the
-  file LICENSE in this distribution or at
-  http://www.OARcorp.com/rtems/license.html.
-
-  ------------------------------------------------------------------------
-
-  See header file.
-
-  ------------------------------------------------------------------------
-*/
-
-#include <rtems++/rtemsInterrupt.h>
-
-/* ----
-   Interrupt Table
-
-   This table is used to re-direct the call from RTEMS to a user
-   object
-*/
-
-static rtemsInterrupt *interrupt_table[CPU_INTERRUPT_NUMBER_OF_VECTORS];
-
-// has the table been initialised
-static bool initialised = false;
-
-/* ----
-   rtemsInterrupt
-*/
-
-rtemsInterrupt::rtemsInterrupt()
-  : vector(0),
-    caught(false),
-    old_handler(0),
-    old_interrupt(0)
-{
-  if (!initialised)
-  {
-    for (rtems_vector_number vec = 0;
-         vec < CPU_INTERRUPT_NUMBER_OF_VECTORS;
-         vec++)
-    {
-      interrupt_table[vector] = 0;
-    }
-    initialised = true;
-  }
-}
-
-rtemsInterrupt::~rtemsInterrupt()
-{
-  release();
-}
-
-const rtems_status_code rtemsInterrupt::isr_catch(const rtems_vector_number vec)
-{
-  if (vec >= CPU_INTERRUPT_NUMBER_OF_VECTORS)
-    return set_status_code(RTEMS_INVALID_NUMBER);
-  
-  if (caught)
-    return set_status_code(RTEMS_RESOURCE_IN_USE);
-
-  old_interrupt = interrupt_table[vector];
-  interrupt_table[vector] = this;
-  vector = vec;
-  
-  set_status_code(rtems_interrupt_catch(redirector,
-                                        vector,
-                                        &old_handler));
-
-  if (successful())
-    caught = true;
-  else
-  {
-    interrupt_table[vector] = old_interrupt;
-    old_interrupt = 0;
-    old_handler = 0;
-    vector = 0;
-  }
-  
-  return last_status_code();
-}
-
-const rtems_status_code rtemsInterrupt::release(void)
-{
-  if (caught)
-  {
-    set_status_code(rtems_interrupt_catch(old_handler,
-                                          vector,
-                                          &old_handler));
-
-    interrupt_table[vector] = old_interrupt;
-    old_interrupt = 0;
-    old_handler = 0;
-    vector = 0;
-    caught = false;
-  }
-  else
-    set_status_code(RTEMS_SUCCESSFUL);
-  
-  return last_status_code();
-}
-
-void rtemsInterrupt::redirector(rtems_vector_number vector)
-{
-  if (interrupt_table[vector])
-    interrupt_table[vector]->handler();
-}
diff --git a/c/src/librtems++/src/rtemsMessageQueue.cc b/c/src/librtems++/src/rtemsMessageQueue.cc
deleted file mode 100644
index c3183dc2b0..0000000000
--- a/c/src/librtems++/src/rtemsMessageQueue.cc
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
-  ------------------------------------------------------------------------
-  $Id$
-  ------------------------------------------------------------------------
-
-  COPYRIGHT (c) 1997
-  Objective Design Systems Ltd Pty (ODS)
-  All rights reserved (R) Objective Design Systems Ltd Pty
-  
-  The license and distribution terms for this file may be found in the
-  file LICENSE in this distribution or at
-  http://www.OARcorp.com/rtems/license.html.
-
-  ------------------------------------------------------------------------
-
-  See header file.
-
-  ------------------------------------------------------------------------
-*/
-
-#include <string.h>
-#include <rtems++/rtemsMessageQueue.h>
-
-/* ----
-   rtemsMessageQueue
-*/
-
-rtemsMessageQueue::rtemsMessageQueue(const char* mqname,
-                                     const rtems_unsigned32 count,
-                                     const rtems_unsigned32 max_message_size,
-                                     const WaitMode wait_mode,
-                                     const Scope scope)
-  : name(0),
-    owner(true),
-    id(0)
-{
-  strcpy(name_str, "NOID");
-  create(mqname, count, max_message_size, wait_mode, scope);
-}
-
-rtemsMessageQueue::rtemsMessageQueue(const char *mqname,
-                                     const rtems_unsigned32 node)
-  : name(0),
-    owner(false),
-    id(0)
-{
-  strcpy(name_str, "NOID");
-  connect(mqname, node);
-}
-
-rtemsMessageQueue::rtemsMessageQueue(const rtemsMessageQueue& message_queue)
-  : name(0),
-    owner(false),
-    id(0)
-{
-  name = message_queue.name;
-  strcpy(name_str, message_queue.name_str);
-  id = message_queue.id;
-}
-
-rtemsMessageQueue::rtemsMessageQueue()
-  : name(0),
-    owner(false),
-    id(0)
-{
-  strcpy(name_str, "NOID");
-}
-
-rtemsMessageQueue::~rtemsMessageQueue()
-{
-  destroy();
-}
-
-void rtemsMessageQueue::make_invalid()
-{
-  strcpy(name_str, "NOID");
-  name = 0;
-  id = 0;
-  owner = false;
-}
-
-const rtems_status_code rtemsMessageQueue::create(const char* mqname,
-                                                  const rtems_unsigned32 count,
-                                                  const rtems_unsigned32 max_message_size,
-                                                  const WaitMode wait_mode,
-                                                  const Scope scope)
-{
-  if (id)
-    return set_status_code(RTEMS_ILLEGAL_ON_SELF);
-
-  owner = true;
-  
-  strcpy(name_str, "    ");
-  for (int c = 0; (c < 4) && (mqname[c] != '\0'); c++)
-    name_str[c] = mqname[c];
-  name = rtems_build_name(name_str[0],
-                          name_str[1],
-                          name_str[2],
-                          name_str[3]);
-  
-  set_status_code(rtems_message_queue_create(name,
-                                             count,
-                                             max_message_size,
-                                             scope | wait_mode,
-                                             &id));
-
-  if (unsuccessful())
-  {
-    make_invalid();
-  }
-  
-  return last_status_code();
-}
-
-const rtems_status_code rtemsMessageQueue::destroy()
-{
-  if (id && owner)
-  {
-    set_status_code(rtems_message_queue_delete(id));
-    make_invalid();
-  }
-  else
-    set_status_code(RTEMS_NOT_OWNER_OF_RESOURCE);
-  
-  return last_status_code();
-}
-
-const rtemsMessageQueue& rtemsMessageQueue::operator=(const rtemsMessageQueue& message_queue)
-{
-  if (!owner)
-  {
-    name = message_queue.name;
-    strcpy(name_str, message_queue.name_str);
-    id = message_queue.id;
-  }
-
-  return *this;
-}
-  
-const rtems_status_code rtemsMessageQueue::connect(const char *mqname,
-                                                   const rtems_unsigned32 node)
-{
-  if (id && owner)
-    return set_status_code(RTEMS_UNSATISFIED);
-
-  // change state to not owner
-  owner = false;
-  
-  strcpy(name_str, "    ");
-  for (int c = 0; (c < 4) && (mqname[c] != '\0'); c++)
-    name_str[c] = mqname[c];
-  name = rtems_build_name(name_str[0],
-                          name_str[1],
-                          name_str[2],
-                          name_str[3]);
-  
-  set_status_code(rtems_message_queue_ident(name, node, &id));
-
-  if (unsuccessful())
-  {
-    make_invalid();
-  }
-  
-  return last_status_code();
-}
diff --git a/c/src/librtems++/src/rtemsSemaphore.cc b/c/src/librtems++/src/rtemsSemaphore.cc
deleted file mode 100644
index 5821612618..0000000000
--- a/c/src/librtems++/src/rtemsSemaphore.cc
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
-  ------------------------------------------------------------------------
-  $Id$
-  ------------------------------------------------------------------------
-
-  COPYRIGHT (c) 1997
-  Objective Design Systems Ltd Pty (ODS)
-  All rights reserved (R) Objective Design Systems Ltd Pty
-  
-  The license and distribution terms for this file may be found in the
-  file LICENSE in this distribution or at
-  http://www.OARcorp.com/rtems/license.html.
-
-  ------------------------------------------------------------------------
-
-  See header file.
-
-  ------------------------------------------------------------------------
-*/
-
-#include <string.h>
-#include <rtems++/rtemsSemaphore.h>
-
-/* ----
-    rtemsSemaphore
-*/
-
-rtemsSemaphore::rtemsSemaphore(const char* sname,
-                               const Scope scope,
-                               const rtems_unsigned32 counter,
-                               const WaitMode wait_mode,
-                               const Type type,
-                               const Priority priority,
-                               const Ceiling ceiling,
-                               const rtems_task_priority priority_ceiling)
-  : name(0),
-    owner(true),
-    id(0)
-{
-  strcpy(name_str, "NOID");
-  create(sname,
-         scope,
-         counter,
-         wait_mode,
-         type,
-         priority,
-         ceiling,
-         priority_ceiling);  
-}
-
-rtemsSemaphore::rtemsSemaphore(const char *sname, const rtems_unsigned32 node)
-  : name(0),
-    owner(false),
-    id(0)
-{
-  strcpy(name_str, "NOID");
-  connect(sname, node);
-}
-
-rtemsSemaphore::rtemsSemaphore(const rtemsSemaphore& semaphore)
-  : name(0),
-    owner(false),
-    id(0)
-{
-  name = semaphore.name;
-  strcpy(name_str, semaphore.name_str);
-  id = semaphore.id;
-}
-
-rtemsSemaphore::rtemsSemaphore()
-  : name(0),
-    owner(false),
-    id(0)
-{
-  strcpy(name_str, "NOID");
-}
-
-rtemsSemaphore::~rtemsSemaphore()
-{
-  destroy();
-}
-
-void rtemsSemaphore::make_invalid()
-{
-  strcpy(name_str, "NOID");
-  name = 0;
-  id = 0;
-  owner = false;
-}
-
-const rtems_status_code rtemsSemaphore::create(const char* sname,
-                                               const Scope scope,
-                                               const rtems_unsigned32 counter,
-                                               const WaitMode wait_mode,
-                                               const Type type,
-                                               const Priority priority,
-                                               const Ceiling ceiling,
-                                               const rtems_task_priority priority_ceiling)
-{
-  if (id)
-    return set_status_code(RTEMS_ILLEGAL_ON_SELF);
-
-  owner = true;
-  
-  strcpy(name_str, "    ");
-  for (int c = 0; (c < 4) && (sname[c] != '\0'); c++)
-    name_str[c] = sname[c];
-  name = rtems_build_name(name_str[0],
-                          name_str[1],
-                          name_str[2],
-                          name_str[3]);
-  
-  set_status_code(rtems_semaphore_create(name,
-                                         counter,
-                                         scope | wait_mode | type | priority | ceiling,
-                                         priority_ceiling,
-                                         &id));
-
-  if (unsuccessful())
-  {
-    make_invalid();
-  }
-  
-  return last_status_code();
-}
-
-const rtems_status_code rtemsSemaphore::destroy()
-{
-  if (id && owner)
-  {
-    set_status_code(rtems_semaphore_delete(id));
-    make_invalid();
-  }
-  else
-    set_status_code(RTEMS_NOT_OWNER_OF_RESOURCE);
-  
-  return last_status_code();
-}
-
-const rtemsSemaphore& rtemsSemaphore::operator=(const rtemsSemaphore& semaphore)
-{
-  if (!owner)
-  {
-    name = semaphore.name;
-    id = semaphore.id;
-  }
-  return *this;
-}
-
-const rtems_status_code rtemsSemaphore::connect(const char *sname,
-                                                const rtems_unsigned32 node)
-{
-  if (id && owner)
-    return set_status_code(RTEMS_UNSATISFIED);
-
-  // change state to not owner
-  owner = false;
-  
-  strcpy(name_str, "    ");
-  for (int c = 0; (c < 4) && (sname[c] != '\0'); c++)
-    name_str[c] = sname[c];
-  name = rtems_build_name(name_str[0],
-                          name_str[1],
-                          name_str[2],
-                          name_str[3]);
-  
-  set_status_code(rtems_semaphore_ident(name, node, &id));
-
-  if (unsuccessful())
-  {
-    make_invalid();
-  }
-  
-  return last_status_code();
-}
diff --git a/c/src/librtems++/src/rtemsStatusCode.cc b/c/src/librtems++/src/rtemsStatusCode.cc
deleted file mode 100644
index e8e3f965ba..0000000000
--- a/c/src/librtems++/src/rtemsStatusCode.cc
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
-  ------------------------------------------------------------------------
-  $Id$
-  ------------------------------------------------------------------------
-
-  COPYRIGHT (c) 1997
-  Objective Design Systems Ltd Pty (ODS)
-  All rights reserved (R) Objective Design Systems Ltd Pty
-  
-  The license and distribution terms for this file may be found in the
-  file LICENSE in this distribution or at
-  http://www.OARcorp.com/rtems/license.html.
-
-  ------------------------------------------------------------------------
-
-  See header file.
-
-  ------------------------------------------------------------------------
-*/
-
-#include <rtems++/rtemsStatusCode.h>
-
-/* ----
-    Status Code string table
-*/
-
-static char *status_strings[RTEMS_STATUS_CODES_LAST + 1] =
-{
-  "RTEMS[00] successful completion",
-  "RTEMS[01] task exitted, returned from a thread",
-  "RTEMS[02] multiprocessing not configured",
-  "RTEMS[03] invalid object name",
-  "RTEMS[04] invalid object id",
-  "RTEMS[05] too many",
-  "RTEMS[06] timed out waiting",
-  "RTEMS[07] object deleted while waiting",
-  "RTEMS[08] specified size was invalid",
-  "RTEMS[09] address specified is invalid",
-  "RTEMS[10] number was invalid",
-  "RTEMS[11] item has not been initialized",
-  "RTEMS[12] resources still outstanding",
-  "RTEMS[13] request not satisfied",
-  "RTEMS[14] thread is in wrong state",
-  "RTEMS[15] thread already in state",
-  "RTEMS[16] illegal on calling thread",
-  "RTEMS[17] illegal for remote object",
-  "RTEMS[18] called from wrong environment",
-  "RTEMS[19] invalid thread priority",
-  "RTEMS[20] invalid date/time",
-  "RTEMS[21] invalid node id",
-  "RTEMS[22] directive not configured",
-  "RTEMS[23] not owner of resource",
-  "RTEMS[24] directive not implemented",
-  "RTEMS[25] RTEMS inconsistency detected",
-  "RTEMS[26] could not get enough memory"
-};
-
-/* ----
-    StatusCode
-*/
-
-const char *rtemsStatusCode::last_status_string()
-{
-  return status_string(last_status);
-}
-
-const char *rtemsStatusCode::status_string(rtems_status_code status_code)
-{
-  // mapped from "rtems/rtems/status.h"
-  if (status_code <= RTEMS_STATUS_CODES_LAST)
-  {
-    return status_strings[status_code];
-  }
-
-  return "unknown status code";
-}
-
diff --git a/c/src/librtems++/src/rtemsTask.cc b/c/src/librtems++/src/rtemsTask.cc
deleted file mode 100644
index 619f7d4071..0000000000
--- a/c/src/librtems++/src/rtemsTask.cc
+++ /dev/null
@@ -1,288 +0,0 @@
-/*
-  ------------------------------------------------------------------------
-  $Id$
-  ------------------------------------------------------------------------
-
-  COPYRIGHT (c) 1997
-  Objective Design Systems Ltd Pty (ODS)
-  All rights reserved (R) Objective Design Systems Ltd Pty
-  
-  The license and distribution terms for this file may be found in the
-  file LICENSE in this distribution or at
-  http://www.OARcorp.com/rtems/license.html.
-
-  ------------------------------------------------------------------------
-
-  See header file.
-
-  ------------------------------------------------------------------------
-*/
-
-#include <string.h>
-#include <rtems++/rtemsTask.h>
-// include to allow it to be compiled
-#include <rtems++/rtemsTaskMode.h>
-
-/* ----
-    rtemsTask
-*/
-
-rtemsTask::rtemsTask(const char* tname,
-                     const rtems_task_priority initial_priority,
-                     const rtems_unsigned32 stack_size,
-                     const rtems_mode preemption,
-                     const rtems_mode timeslice,
-                     const rtems_mode asr,
-                     const rtems_interrupt_level interrupt_level,
-                     const FloatingPoint floating_point,
-                     const Scope scope)
-  : name(rtems_build_name('S', 'E', 'L', 'F')),
-    owner(true),
-    id(RTEMS_SELF),
-    argument(0)
-{
-  strcpy(name_str, "SELF");
-  create(tname,
-         initial_priority,
-         stack_size,
-         preemption,
-         timeslice,
-         asr,
-         interrupt_level,
-         floating_point,
-         scope);
-}
-
-rtemsTask::rtemsTask(const char *tname, rtems_unsigned32 node)
-  : name(rtems_build_name('S', 'E', 'L', 'F')),
-    owner(false),
-    id(RTEMS_SELF),
-    argument(0)
-{
-  strcpy(name_str, "SELF");
-  connect(tname, node);
-}
-
-rtemsTask::rtemsTask(const rtemsTask& task)
-  : name(rtems_build_name('S', 'E', 'L', 'F')),
-    owner(false),
-    id(RTEMS_SELF),
-    argument(0)
-{
-  name = task.name;
-  strcpy(name_str, task.name_str);
-  argument = task.argument;
-  id = task.id;
-}
-
-rtemsTask::rtemsTask()
-  : name(rtems_build_name('S', 'E', 'L', 'F')),
-    owner(false),
-    id(RTEMS_SELF),
-    argument(0)
-{
-  strcpy(name_str, "SELF");
-}
-
-rtemsTask::~rtemsTask()
-{
-  destroy();
-}
-
-void rtemsTask::make_self()
-{
-  strcpy(name_str, "SELF");
-  name = rtems_build_name('S', 'E', 'L', 'F');
-  id = RTEMS_SELF;
-  owner = false;
-}
-
-const rtems_status_code rtemsTask::create(const char* tname,
-                                          const rtems_task_priority initial_priority,
-                                          const rtems_unsigned32 stack_size,
-                                          const rtems_mode preemption,
-                                          const rtems_mode timeslice,
-                                          const rtems_mode asr,
-                                          const rtems_interrupt_level interrupt_level,
-                                          const FloatingPoint floating_point,
-                                          const Scope scope)
-{
-  if (id)
-    return set_status_code(RTEMS_ILLEGAL_ON_SELF);
-
-  owner = true;
-
-  strcpy(name_str, "    ");
-  for (int c = 0; (c < 4) && (tname[c] != '\0'); c++)
-    name_str[c] = tname[c];
-  name = rtems_build_name(name_str[0],
-                          name_str[1],
-                          name_str[2],
-                          name_str[3]);
-
-  // protect the values that be set as the parameters are not enums
-  set_status_code(rtems_task_create(name,
-                                    initial_priority,
-                                    stack_size,
-                                    (preemption & RTEMS_PREEMPT_MASK) |
-                                    (timeslice & RTEMS_TIMESLICE_MASK) |
-                                    (asr & RTEMS_ASR_MASK) |
-                                    (interrupt_level & RTEMS_INTERRUPT_MASK),
-                                    floating_point | scope,
-                                    &id));
-
-  if (unsuccessful())
-  {
-    make_self();
-  }
-  
-  return last_status_code();
-}
-
-const rtems_status_code rtemsTask::destroy()
-{
-  if (id && owner)
-  {
-    set_status_code(rtems_task_delete(id));
-    make_self();
-  }
-  else
-    set_status_code(RTEMS_NOT_OWNER_OF_RESOURCE);
-  
-  return last_status_code();
-}
-  
-const rtemsTask& rtemsTask::operator=(const rtemsTask& task)
-{
-  if (!owner)
-  {
-    name = task.name;
-    strcpy(name_str, task.name_str);
-    argument = task.argument;
-    id = task.id;
-  }
-  return *this;
-}
-
-const rtems_status_code rtemsTask::connect(const char *sname,
-                                           const rtems_unsigned32 node)
-{
-  if (id && owner)
-    return set_status_code(RTEMS_UNSATISFIED);
-
-  // change state to not owner
-  owner = false;
-  
-  strcpy(name_str, "    ");
-  for (int c = 0; (c < 4) && (sname[c] != '\0'); c++)
-    name_str[c] = sname[c];
-  name = rtems_build_name(name_str[0],
-                          name_str[1],
-                          name_str[2],
-                          name_str[3]);
-  
-  set_status_code(rtems_task_ident(name, node, &id));
-
-  if (unsuccessful())
-  {
-    make_self();
-  }
-  
-  return last_status_code();
-}
-
-const rtems_status_code rtemsTask::start(const rtems_task_argument arg)
-{
-  if (owner)
-  {
-    argument = arg;
-    // pass the this pointer as the argument
-    set_status_code(rtems_task_start(id,
-                                     origin,
-                                     (rtems_task_argument) this));
-  }
-  else
-    set_status_code(RTEMS_NOT_OWNER_OF_RESOURCE);
-  return last_status_code();
-}
-      
-const rtems_status_code rtemsTask::restart(const rtems_task_argument arg)
-{
-  if (owner)
-  {
-    argument = arg;
-    set_status_code(rtems_task_restart(id, (rtems_task_argument) this));
-  }
-  else
-    set_status_code(RTEMS_NOT_OWNER_OF_RESOURCE);
-  
-  return last_status_code();
-}
-  
-const rtems_status_code rtemsTask::suspend()
-{
-  return set_status_code(rtems_task_suspend(id));
-}
-
-const rtems_status_code rtemsTask::resume()
-{
-  return set_status_code(rtems_task_resume(id));
-}
-
-const rtems_status_code rtemsTask::wake_after(const rtems_interval micro_secs)
-{
-  rtems_interval usecs =
-    micro_secs && (micro_secs < _TOD_Microseconds_per_tick) ?
-    _TOD_Microseconds_per_tick : micro_secs;
-  return set_status_code(rtems_task_wake_after(TOD_MICROSECONDS_TO_TICKS(usecs)));
-}
-
-const rtems_status_code rtemsTask::wake_when(const rtems_time_of_day& tod)
-{
-  return set_status_code(rtems_task_wake_when((rtems_time_of_day*) &tod));
-}
-
-const rtems_status_code rtemsTask::get_priority(rtems_task_priority& priority)
-{
-  return set_status_code(rtems_task_set_priority(id,
-                                                 RTEMS_CURRENT_PRIORITY,
-                                                 &priority));
-}
-
-const rtems_status_code rtemsTask::set_priority(const rtems_task_priority priority)
-{
-  rtems_task_priority old_priority;
-  return set_status_code(rtems_task_set_priority(id,
-                                                 priority,
-                                                 &old_priority));
-}
-
-const rtems_status_code rtemsTask::set_priority(const rtems_task_priority priority,
-                                                rtems_task_priority& old_priority)
-{
-  return set_status_code(rtems_task_set_priority(id,
-                                                 priority,
-                                                 &old_priority));
-}
-  
-const rtems_status_code rtemsTask::get_note(const rtems_unsigned32 notepad,
-                                            rtems_unsigned32& note)
-{
-  return set_status_code(rtems_task_get_note(id, notepad, &note));
-}
-
-const rtems_status_code rtemsTask::set_note(const rtems_unsigned32 notepad,
-                                            const rtems_unsigned32 note)
-{
-  return set_status_code(rtems_task_set_note(id, notepad, note));
-}
-
-void rtemsTask::body(rtems_task_argument )
-{
-}
-
-rtems_task rtemsTask::origin(rtems_task_argument argument)
-{
-  rtemsTask *task = (rtemsTask*) argument;
-  task->body(task->argument);
-}
diff --git a/c/src/librtems++/src/rtemsTimer.cc b/c/src/librtems++/src/rtemsTimer.cc
deleted file mode 100644
index 835bfd74ce..0000000000
--- a/c/src/librtems++/src/rtemsTimer.cc
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
-  ------------------------------------------------------------------------
-  $Id$
-  ------------------------------------------------------------------------
-
-  COPYRIGHT (c) 1997
-  Objective Design Systems Ltd Pty (ODS)
-  All rights reserved (R) Objective Design Systems Ltd Pty
-  
-  The license and distribution terms for this file may be found in the
-  file LICENSE in this distribution or at
-  http://www.OARcorp.com/rtems/license.html.
-
-  ------------------------------------------------------------------------
-
-  See header file.
-
-  ------------------------------------------------------------------------
-*/
-
-#include <string.h>
-#include <rtems++/rtemsTimer.h>
-
-/* ----
-    rtemsTimer
-*/
-
-rtemsTimer::rtemsTimer(const char* tname)
-  : name(0),
-    repeat(false),
-    id(0)
-{
-  strcpy(name_str, "    ");
-  create(tname);
-}
-
-rtemsTimer::rtemsTimer()
-  : name(0),
-    repeat(false),
-    id(0)
-{
-  strcpy(name_str, "    ");
-}
-
-rtemsTimer::~rtemsTimer()
-{
-  destroy();
-}
-
-void rtemsTimer::make_invalid()
-{
-  strcpy(name_str, "    ");
-  name = 0;
-  id = 0;
-  repeat = false;
-}
-const rtems_status_code rtemsTimer::create(const char* tname)
-{
-  if (id)
-    return set_status_code(RTEMS_ILLEGAL_ON_SELF);
-
-  strcpy(name_str, "    ");
-  for (int c = 0; (c < 4) && (tname[c] != '\0'); c++)
-    name_str[c] = tname[c];
-  name = rtems_build_name(name_str[0],
-                          name_str[1],
-                          name_str[2],
-                          name_str[3]);
-  
-  set_status_code(rtems_timer_create(name, &id));
-
-  if (unsuccessful())
-  {
-    make_invalid();
-  }
-  
-  return last_status_code();
-}
-
-const rtems_status_code rtemsTimer::destroy()
-{
-  if (id)
-  {
-    set_status_code(rtems_timer_delete(id));
-    make_invalid();
-  }
-  else
-    set_status_code(RTEMS_NOT_OWNER_OF_RESOURCE);
-  
-  return last_status_code();
-}
-  
-void rtemsTimer::common_handler(rtems_id , void *user_data)
-{
-  rtemsTimer *timer = (rtemsTimer*) user_data;
-  
-  if (timer->repeat)
-    timer->reset();
-
-  timer->triggered();
-}
diff --git a/c/src/make/README b/c/src/make/README
deleted file mode 100644
index 6cdc4b2c6e..0000000000
--- a/c/src/make/README
+++ /dev/null
@@ -1,513 +0,0 @@
-#
-#  $Id$
-#
-
-    make/README
-
-    This file describes the layout and conventions of the make tree used in
-    the RTEMS software project and others.
-    All of these "make" trees are substantially similar; however this
-    file documents the current state of the rtems Makefile tree.
-
-    This make tree was developed originally to simplify porting projects
-    between various os's.  The primary goals are:
-
-        .  simple *and* customizable individual makefiles
-
-        .  use widely available GNU make.  There is no pre-processing or
-            automatic generation of Makefiles.
-
-        .  Same makefiles work on *many* host os's due to portability
-            of GNU make and the host os config files.
-
-        .  Support for different compilers and operating systems
-            on a per-user basis.  Using the same sources (including
-            Makefiles) one developer can develop and test under SVR4,
-            another under 4.x, another under HPUX.
-
-        .  Builtin support for compiling "variants" such as debug,
-            profile, and tcov versions.  These variants can be built
-            recursively.
-
-        .  Control of system dependencies.  "hidden" dependencies on
-            environment variables (such as PATH)
-            have been removed whenever possible.  No matter what your
-            PATH variable is set to, you should get the same thing
-            when you 'make' as everyone else on the project.
-
-    This description attempts to cover all aspects of the Makefile tree.  Most
-    of what is described here is maintained automatically by the configuration
-    files.
-
-    The example makefiles in make/Templates should be used as a starting
-    point for new directories.
-
-    There are 2 main types of Makefile:
-
-        directory and leaf.
-
-    Directory Makefiles
-    -------------------
-
-        A Makefile in a source directory with sub-directories is called a
-        "directory" Makefile.
-
-        Directory Makefile's are simply responsible for acting as "middle-men"
-        and recursing into their sub-directories and propagating the make.
-
-        For example, directory src/bin will contain only a Makefile and
-        sub-directories.  No actual source code will reside in the directory.
-        The following commands:
-
-            $ cd src/bin
-            $ make all
-
-        would descend into all the subdirectories of 'src/bin' and recursively
-        perform a 'make all'.
-
-        A 'make debug' will recurse thru sub-directories as a debug build.
-
-        A template directory Makefile which should work in almost all
-        cases is in make/Templates/Makefile.dir
-
-
-    Leaf Makefiles
-    --------------
-
-        Source directories that contain source code for libraries or
-        programs use a "leaf" Makefile.
-
-        These makefiles contain the rules necessary to build programs
-        (or libraries).
-
-        A template leaf Makefile is in Templates/Makefile.leaf .  A template
-        leaf Makefile for building libraries is in Templates/Makefile.lib .
-
-
-    NOTE: To simplify nested makefile's and source maintenance, we disallow
-    combining source and directories (that make(1) would be expected to
-    recurse into) in one source directory.  Ie., a directory in the source
-    tree may contain EITHER source files OR recursive sub directories, but NOT
-    both.
-
-    Variants (where objects go)
-    ---------------------------
-
-        All binary targets are placed in a sub-directory whose name is (for
-        example):
-
-            o-force386/                -- binaries (no debug, no profile)
-            o-force386-debug/          -- debug binaries
-            o-force386-profile/        -- profiling binaries
-
-        Using the template Makefiles, this will all happen automatically.
-
-        Within a Makefile, the ${ARCH} variable is set to o-force386,
-        o-force386-debug, etc., as appropriate.
-
-        Typing 'make' will place objects in o-force386.
-        'make debug' will place objects in o-force386-debug.
-        'make profile' will place objects in o-force386-profile.
-
-        NOTE:  For RTEMS work, the word 'force386' is the specified
-               RTEMS_BSP (specified in the modules file)
-
-        The debug and profile targets are equivalent to 'all' except that
-        CFLAGS and/or LDFLAGS are modified as per the compiler config file for
-        debug and profile support.
-
-        Targets debug_install and profile_install are equivalent to 'make
-        install' except that debug (or profile) variants are built and
-        installed.
-
-        The targets debug, profile, debug_install, profile_install, etc., can be
-        invoked recursively at the directory make level.  So from the top of a
-        tree, one could install a debug version of everything under that point
-        by:
-
-            $ cd src/lib
-            $ gmake debug_install
-
-        When building a command that is linked with a generated library, the
-        appropriate version of the library will be linked in.
-
-        For example, the following fragments link the normal, debug, or
-        profile version of "libmine.a" as appropriate:
-
-            LDLIBS   += $(LIBMINE)
-            LIBMINE = ../libmine/${ARCH}/libmine.a
-
-            ${ARCH}/pgm: $(LIBMINE) ${OBJS}
-                $(LINK.c) -o $@ ${OBJS} $(LDLIBS)
-
-        If we do 'gmake debug', then the library in
-        ../libmine/sparc-debug/libmine.a will be linked in.  If $(LIBMINE)
-        might not exist (or might be out of date) at this point, we could add
-
-            ${LIBMINE}: FORCEIT
-	        cd ../libmine; ${MAKE} ${VARIANT_VA}
-
-        The above would generate the following command to build libmine.a:
-
-            cd ../libmine; gmake debug
-
-        The macro reference ${VARIANT_VA} converts ${ARCH} to the word 'debug'
-        (in this example) and thus ensures the proper version of the library
-        is built.
-
-
-    Targets
-    -------
-
-        All Makefile's support the following targets:
-
-            all                     -- make "everything"
-            install                 -- install "everything"
-
-        The following targets are provided automatically by
-        the included config files:
-
-            clean                   -- delete all targets
-            clobber                 -- 'clean' plus delete sccs'd files
-            lint                    -- run lint or lint-like tool
-            get                     -- "sccs get" all sources
-            depend                  -- build a make dependency file
-            "variant targets"       -- special variants, see below
-
-
-        All directory Makefiles automatically propagate all these targets.  If
-        you don't wish to support 'all' or 'install' in your source directory,
-        you must leave the rules section empty, as the parent directory Makefile
-        will attempt it on recursive make's.
-
-
-    Configuration
-    -------------
-
-        All the real work described here happens in file(s) included
-        from your Makefile.
-
-        All Makefiles include a customization file which is used to select
-        compiler and host operating system.  The environment variable
-        RTEMS_CUSTOM must point to this file; eg:
-
-                /.../make/custom/force386.cfg
-
-        All leaf Makefile's also include either 'make/leaf.cfg' (or
-        'make/lib.cfg' for building libraries).  These config files provide
-        default rules and set up the command macros as appropriate.
-
-        All directory Makefiles include 'make/directory.cfg'.  directory.cfg
-        provides all the rules for recursing through sub directories.
-
-        The Makefile templates already perform these include's.
-
-        'make/leaf.cfg' (or directory.cfg) in turn includes:
-
-            a file specifying general purpose rules appropriate for
-                both leaf and directory makefiles.
-                ( make/main.cfg )
-
-            personality modules specified by the customization file for:
-                compiler            ( make/compilers/??.cfg )
-
-
-        private customization files
-        ---------------------------
-
-            [ $(RTEMS_CUSTOM) ]
-
-            Your own private configuration file.  Specifies which of the above
-            files you want to include.
-
-            Example: custom/force386.cfg
-
-               CONFIG.$(HOST_ARCH).OS = $(RTEMS_ROOT)/make/os/HPUX-9.0.cfg
-
-               # HOST Compiler config file
-               # You may also want to specify where the compiler resides here.
-               CC_$(HOST_ARCH)_DIR=/usr/local
-               CONFIG.$(HOST_ARCH).CC   = $(RTEMS_ROOT)/make/compilers/gcc.cfg
-
-               ## Target compiler config file, if any
-               CC_$(TARGET_ARCH)_DIR=$(RTEMS_GNUTOOLS)
-               CONFIG.$(TARGET_ARCH).CC = $(RTEMS_ROOT)/make/compilers/gcc-force386.cfg
-
-        generic rules file
-        ------------------
-
-            [ make/main.cfg ]
-            included by leaf.cfg or directory.cfg.
-
-            This file contains some standard rules and variable assignments
-            that all Makefiles need.
-
-            It also includes the FORCEIT: pseudo target.
-
-
-        OS config file for host machine
-        -------------------------------
-
-            [ make/os/OS-NAME.cfg ]
-            included by main.cfg
-
-            Figures out the target architecture and specifies command names
-            for the OS tools including RCS/CVS (but NOT for the compiler tools).
-
-
-        Compiler configuration for the target
-        -------------------------------------
-
-            [ compilers/COMPILER-NAME.cfg ]
-            included by leaf.cfg
-
-            Specifies the names of tools for compiling programs.
-            Names in here should be fully qualified, and NOT depend on $PATH.
-
-            Also specifies compiler flags to be used to generate optimized,
-            debugging and profile versions, as well as rules to compile
-            assembly language and make makefile dependencies.
-
-
-    Configuration Variables
-    -----------------------
-
-        Variables you have to set in the environment or in your Makefile.
-        Note: the rtems module files set RTEMS_ROOT and RTEMS_CUSTOM
-        for you.
-
-        Environment Variables
-        ---------------------
-
-            RTEMS_BSP      -- name of your 'bsp' eg: force386
-
-            RTEMS_ROOT     -- The root of your source tree.
-                              All other file names are derived from this.
-                              [ eg: % setenv RTEMS_ROOT $HOME/work/rtems ]
-
-            RTEMS_CUSTOM   -- name of your config files in make/custom
-                              Example:
-                                 $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-
-            RTEMS_GNUTOOLS -- root of the gcc tools for the target
-
-            The value RTEMS_ROOT is used in the custom
-            files to generate the make(1) variables:
-
-                PROJECT_ROOT
-                PROJECT_RELEASE
-                PROJECT_TOOLS
-
-            etc., which are used within the make config files themselves.
-            (The files in make/*.cfg try to avoid use of word RTEMS so
-            they can be more easily shared by other projects)
-
-        Preset variables
-        ----------------
-
-            Aside from command names set by the os and compiler config files,
-            a number of MAKE variables are automatically set and maintained by
-            the config files.
-
-            CONFIG.$(HOST_ARCH).CC
-                        -- full path of C compilation config file, set by custom
-                           config file.
-
-            PROJECT_RELEASE
-                        -- release/install directory
-                           [ $(PROJECT_ROOT) ]
-
-            PROJECT_BIN
-                        -- directory for installed binaries
-                           [ $(PROJECT_ROOT)/bin ]
-
-            PROJECT_TOOLS
-                        -- directory for build environment commands
-                           [ eg: $(PROJECT_ROOT)/build-tools ]
-
-            TARCH       -- ${TARGET_ARCH}
-                           [ eg: o-forc386 ]
-                           obsolete and should not be referenced
-
-            ARCH        -- target sub-directory for object code
-                           [ eg: o-force386 or o-force386-debug ]
-
-            HOST_ARCH
-                        -- host machine architecture name
-                           [ eg: sun4, sparc on SVR4 ]
-
-            VARIANTS    -- full list of all possible values for $(ARCH);
-                           used mainly for 'make clean'
-                           [ eg: "o-force386 o-force386-debug o-force386-profile" ]
-
-            VARIANT_VA  -- Variant name.
-                           Normally "", but for 'make debug' it is "debug",
-                           for 'make profile', "profile, etc.
-
-                           see make/leaf.cfg for more info.
-
-
-        Preset compilation variables
-        ----------------------------
-
-          This is a list of some of the compilation variables.
-          Refer to the compiler config files for the complete list.
-
-            CFLAGS_OPTIMIZE_V   -- value of optimize flag for compiler
-                                   [ eg: -O ]
-
-            CFLAGS_DEBUG_V      -- value of debug flag for compiler
-                                   [ eg: -g ]
-
-            CFLAGS_PROFILE_V    -- compiler profile flags
-                                   [ eg: -pg ]
-
-            CFLAGS_DEBUG_OPTIMIZE_V
-                                -- optimize flag if compiling for debug
-                                     [ eg: "" ]
-
-            CFLAGS_DEBUG
-            CFLAGS_PROFILE
-            CFLAGS_OPTIMIZE     -- current values for each depending
-                                    on make variant.
-
-            LDFLAGS_STATIC_LIBRARIES_V
-                                -- ld option for static libraries
-                                    -Bstatic or -dy (svr4)
-
-            LDFLAGS_SHARED_LIBRARIES_V
-                                -- ld option for dynamic libraries
-                                    -Bdynamic or -dn (svr4)
-
-            LIB_SOCKET
-                                -- ld(1) -l option(s) to provide
-                                    socket support.
-
-            LIB_MATH            -- ld(1) -l option(s) to provide
-                                    math library.
-
-
-            Makefile Variables
-            ------------------
-
-                The following variables may be set in a typical Makefile.
-
-                C_PIECES    -- File names of your .c files without '.c' suffix.
-                               [ eg: C_PIECES=main funcs stuff ]
-
-                CC_PIECES   -- ditto, except for .cc files
-
-                S_PIECES    -- ditto, except for .S files.
-
-                LIB         -- target library name in leaf library makefiles.
-                               [ eg: LIB=${ARCH}/libmine.a ]
-
-                H_FILES     -- your .h files in this directory.
-                               [ eg: H_FILES=stuff.h extra.h ]
-
-                DEFINES     -- cc -D items.  Included in CPPFLAGS.
-                               leaf Makefiles.
-                               [ eg: DEFINES += -DUNIX ]
-
-                CPPFLAGS    -- -I include directories.
-                               leaf Makefiles.
-                               [ eg: CPPFLAGS += -I../include ]
-
-                YFLAGS      -- Yacc flags.
-                               leaf Makefiles.
-                               [ eg: YFLAGS += -v ]
-
-                LD_PATHS    -- arguments to -L for ld.
-                               Will be prefixed with '-L' or '-L ' as appropriate
-                               and included in LDFLAGS.
-
-                LDFLAGS     -- -L arguments to ld; more may be ADDed.
-
-                LD_LIBS     -- libraries to be linked in.
-                               [ eg: LDLIBS += ../libfoo/${ARCH}/libfoo.a ]
-
-                XCFLAGS     -- "extra" CFLAGS for special needs.  Pre-pended
-                               to CFLAGS.
-                               Not set or used by Makefiles.
-                               Can be set on command line to pass extra flags
-                               to the compiler.
-
-                XCPPFLAGS   -- ditto for CPPFLAGS
-                               Can be set on command line to pass extra flags
-                               to the preprocessor.
-
-                XCCPPFLAGS  -- same as XCPPFLAGS for C++.
-
-                XCCFLAGS    -- same as XCFLAGS for C++.
-
-                SUB_DIRS    -- list of sub directories for make recursion.
-                               directory Makefiles only.
-                               [ eg: SUB_DIRS=cpu bsp ]
-
-                CLEAN_ADDITIONS
-                            -- list of files or directories that should
-                               be deleted by 'make clean'
-                               [ eg: CLEAN_ADDITIONS += y.tab.c ]
-
-                               See 'leaf.cfg' for the 'clean:' rule and its
-                               default deletions.
-
-                CLOBBER_ADDITIONS
-                            -- list of files or directories that should
-                               be deleted by 'make clobber'
-                               Since 'make clobber' includes 'make clean',
-                               you don't need to duplicate items in both.
-
-                TARGET_ARCH -- target architecture (eg: o-force386)
-                               leaf makefiles only.
-                               Should be specified before 'include leaf.cfg'.
-                               Only needs to be specified if your target is
-                               different from output of `arch`.
-
-            Command names
-            -------------
-
-                The following commands should only be called
-                as make variables:
-
-                    MAKE,INSTALL,SHELL
-
-                    ECHO,CAT,RM,CP,MV,LN,MKDIR,CHMOD
-
-                    ED,SED
-
-                    CC,CPP,AS,AR,LD,NM,SIZE,RANLIB,MKLIB,
-                    YACC,LEX,LINT,CTAGS,ETAGS
-
-            Special Directory Makefile Targets
-            ----------------------------------
-
-                all_WRAPUP
-                clean_WRAPUP
-                install_WRAPUP
-                clean_WRAPUP
-                clobber_WRAPUP
-                depend_WRAPUP
-                            -- Specify additional commands for recursive
-                               (directory level) targets.
-
-                               This is handy in certain cases where you need
-                               to do bit of work *after* a recursive make.
-
-    make/Templates
-    --------------
-
-        This directory contains Makefile and source file templates that
-        should help in creating or converting makefiles.
-
-        Makefile.leaf
-            Template leaf Makefiles.
-
-        Makefile.lib
-            Template leaf library Makefiles.
-
-        Makefile.dir
-            Template "directory" makefile.
-
-
-
diff --git a/c/src/make/compilers/gcc-target-default.cfg b/c/src/make/compilers/gcc-target-default.cfg
deleted file mode 100644
index c1b27435dc..0000000000
--- a/c/src/make/compilers/gcc-target-default.cfg
+++ /dev/null
@@ -1,330 +0,0 @@
-#
-#  Shared compiler for all GNU tools configurations
-#
-#  $Id$
-# 
-
-CPPFLAGS=$(CFLAGS) $(XCPPFLAGS)
-
-CPLUS_CPPFLAGS=$(CFLAGS) $(XCPPFLAGS)
-
-##
-# CFLAGS_OPTIMIZE_V, CFLAGS_DEBUG_V, CFLAGS_PROFILE_V are the values we
-# would want the corresponding macros to be set to.
-#
-# CFLAGS_OPTIMIZE, CFLAGS_DEBUG, CFLAGS_PROFILE are set in the leaf
-# Makefiles by the 'debug:' and 'profile:' targets to their _V values.
-#
-
-# default flags
-
-# We only include the header files for networking if it is enabled.
-INCLUDE_NETWORKING_yes_V = -I$(PROJECT_INCLUDE)/networking
-INCLUDE_NETWORKING = $(INCLUDE_NETWORKING_$(HAS_NETWORKING)_V)
-
-ifeq ($(RTEMS_USE_GCC272),yes)
-ifeq ($(RTEMS_CROSS_TARGET),no)
-
-ifdef RTEMS_LIBC_DIR
-RTEMS_LIBC_INCLUDES := -I$(RTEMS_LIBC_DIR)/include
-endif
-
-# Used for posix bsps
-CFLAGS_DEFAULT = $(CPU_DEFINES) $(CPU_CFLAGS) -Wall -ansi -fasm -g \
-  -I$(PROJECT_INCLUDE) \
-  $(INCLUDE_NETWORKING) \
-  $(RTEMS_LIBC_INCLUDES) $(DEFINES)
-
-ASMFLAGS=$(CPU_DEFINES) $(CPU_CFLAGS) -g \
-  -I$(PROJECT_INCLUDE) \
-  $(RTEMS_LIBC_INCLUDES) $(DEFINES)
-else
-# Used for embedded bsps
-# Ask gcc where it finds its own include files
-GCC_INCLUDE=$(shell $(CC) $(CPU_CFLAGS) -print-file-name=include $(GCCSED))
-
-CFLAGS_DEFAULT = $(CPU_DEFINES) $(CPU_CFLAGS) -Wall -ansi -fasm -g \
-  -nostdinc -I$(PROJECT_INCLUDE) \
-  $(INCLUDE_NETWORKING) \
-  -I$(RTEMS_LIBC_DIR)/include -I$(GCC_INCLUDE) $(DEFINES)
-
-ASMFLAGS=$(CPU_DEFINES) $(CPU_CFLAGS) -g \
-  -nostdinc -I$(PROJECT_INCLUDE) \
-  -I$(RTEMS_LIBC_DIR)/include -I$(GCC_INCLUDE) $(DEFINES)
-endif
-
-# default location of Standard C Library
-ifndef LIBC_LIBC
-LIBC_LIBC=$(RTEMS_LIBC_DIR)/lib/libc.a
-endif
-
-ifndef LIBC_LIBM
-LIBC_LIBM=$(RTEMS_LIBC_DIR)/lib/libm.a
-endif
-
-else
-CFLAGS_DEFAULT = $(CPU_DEFINES) $(CPU_CFLAGS) -Wall -ansi -fasm -g \
-	-B$(PROJECT_RELEASE)/lib/ -specs bsp_specs -qrtems \
-        $(INCLUDE_NETWORKING) $(DEFINES)
-
-ASMFLAGS=$(CPU_DEFINES) $(CPU_CFLAGS) -g -I$(srcdir) \
-	-B$(PROJECT_RELEASE)/lib/ -specs bsp_specs -qrtems $(DEFINES)
-
-# default location of Standard C Library
-ifndef LIBC_LIBC
-LIBC_LIBC=$(shell $(CC) $(CPU_CFLAGS) -print-file-name=libc.a $(GCCSED))
-endif
-
-ifndef LIBC_LIBM
-LIBC_LIBM=$(shell $(CC) $(CPU_CFLAGS) -print-file-name=libm.a $(GCCSED))
-endif
-endif
-
-# Define this to yes if C++ is included in the development environment.
-# This requires that at least the GNU C++ compiler and libg++ be installed.
-ifeq ($(RTEMS_HAS_CPLUSPLUS),yes)
-HAS_CPLUSPLUS=yes
-CPLUS_LD_LIBS += $(PROJECT_RELEASE)/lib/librtems++$(LIBSUFFIX_VA)
-else
-HAS_CPLUSPLUS=no
-endif
-
-# debug flag;
-CFLAGS_DEBUG_V+=-Wno-unused
-
-ifeq ($(RTEMS_USE_GCC272),no)
-CFLAGS_DEBUG_V+=-qrtems_debug
-endif
-
-# when debugging, optimize flag: typically empty
-# some compilers do allow optimization with their "-g"
-#CFLAGS_DEBUG_OPTIMIZE_V=
-
-# profile flag; use gprof(1)
-CFLAGS_PROFILE_V=-pg
-
-# default is to optimize
-CFLAGS_OPTIMIZE=$(CFLAGS_OPTIMIZE_V)
-
-# dynamic libraries
-CFLAGS_DYNAMIC_V=-fpic
-#ASFLAGS_DYNAMIC_V=
-
-CFLAGS=$(CFLAGS_DEFAULT) $(CFLAGS_OPTIMIZE) $(CFLAGS_DEBUG) $(CFLAGS_PROFILE)
-
-# List of library paths without -L
-LD_PATHS= $(PROJECT_RELEASE)/lib
-
-# libraries you want EVERYONE to link with
-#LD_LIBS=
-
-# ld flag to ensure pure-text
-#LDFLAGS_MUST_BE_PURE_V =
-
-# ld flag for [un]shared objects
-#LDFLAGS_STATIC_LIBRARIES_V =
-#LDFLAGS_SHARED_LIBRARIES_V =
-
-# ld flag for incomplete link
-LDFLAGS_INCOMPLETE = -r
-
-# Special linker options when building lib.so
-LDFLAGS_DYNAMIC_V = ??
-
-# Some dynamic linking systems want the preferred name recorded in the binary
-# ref: src/libxil/Makefile
-LDFLAGS_DYNAMIC_LIBNAME_V = -h $(DYNAMIC_VERSION_LIBNAME)
-
-# ld flags for profiling, debugging
-LDFLAGS_PROFILE_V =
-LDFLAGS_DEBUG_V =
-
-LDFLAGS=$(LDFLAGS_PROFILE) $(LDFLAGS_DEBUG) $(LD_PATHS:%=-L %)
-
-#
-# Stuff to clean and clobber for the compiler and its tools
-#
-
-CLEAN_CC = a.out *.o *.BAK
-CLOBBER_CC =
-
-#
-# Client compiler and support tools
-#
-
-# CPP command to write file to standard output
-CPP=$(CC) -E -ansi -w -Wp,-$$
-
-# flags set by cc when running cpp
-CPP_CC_FLAGS=-D__STDC__
-
-ASFLAGS= $(CPU_ASFLAGS)
-ASM4FLAGS := -I $(PROJECT_INCLUDE)
-
-# egrep regexp to ignore symbol table entries in ar archives.
-# Only used to make sure we skip them when coalescing libraries.
-# skip __.SYMDEF and empty names (maybe bug in ranlib??).
-AR_SYMBOL_TABLE="HIGHLY-UNLIKELY-TO-CONFLICT"
-ARFLAGS=ruv
-
-#
-# Command to convert a normal archive to one searchable by $(LD)
-#
-# NOTE: Obsolete, use $(RANLIB) instead, MKLIB may disappear soon 
-MKLIB=$(RANLIB)
-
-#
-# How to compile stuff into ${ARCH} subdirectory
-#
-# NOTE: we override COMPILE.c
-#
-
-COMPILE.c=$(CC) $(CFLAGS) $(XCFLAGS) -c
-COMPILE.cc=$(CXX) $(CFLAGS) $(CXXFLAGS) $(XCFLAGS) -c
-
-${ARCH}/%.o: %.c
-	${COMPILE.c} -o $@ $<
-
-${ARCH}/%.o: %.cc
-	${COMPILE.cc} -o $@ $<
-
-${ARCH}/%.o: %.S
-	${COMPILE.c} -DASM -o $@ $<
-
-# strip out C++ style comments.
-${ARCH}/%.o: %.s
-	sed -e 's/\/\/.*$$//' < $< | \
-	    $(CPP) $(ASMFLAGS) -I. -I$(srcdir) -DASM - >$(ARCH)/$*.i
-	$(AS) $(ASFLAGS) -o $@ $(ARCH)/$*.i
-
-#	$(CPP) $(CPPFLAGS) -DASM - < $<  >$(ARCH)/$*.i
-#	$(AS) $(ASFLAGS) -o $@ $(ARCH)/$*.i
-#	$(RM) $(ARCH)/$*.i
-
-# Specify our own default rule for this to prevent having CFLAGS and
-#  CPPFLAGS being passed to linker
-#
-#
-# NOTE (Ralf): Having this rule is a bug, IMO.
-# I have only kept it for the moment because some (broken) Makefiles 
-# might need it.
-#
-# ${ARCH}/%: ${ARCH}/%.o
-#	${CC} ${LDFLAGS} -o $@ $@.o ${LD_LIBS}
-#
-# Anyway, the rule above is wrong. The one below should be correct
-# (But this one should also not be necessary. If something breaks now,
-# have a look at the Makefile or custom/*.cfg :-)
-# $(ARCH)/%.exe: $(ARCH)/%.o
-#	$(make-exe)
-
-# Make foo.rel from foo.o
-${ARCH}/%.rel: ${ARCH}/%.o
-	${LD} $(LDFLAGS_INCOMPLETE) -o $@ $^
-
-# create $(ARCH)/pgm from pgm.sh
-${ARCH}/%: %.sh
-	$(RM) $@
-	$(CP) $< $@
-	$(CHMOD) +x $@
-
-# Dependency files for use by gmake
-# NOTE: we don't put in $(TARGET_ARCH)
-#       so that 'make clean' doesn't blow it away
-
-DEPEND=Depends-$(TARGET_ARCH:o-%=%)
-
-CLEAN_DEPEND=$(DEPEND).tmp
-CLOBBER_DEPEND=$(DEPEND)
-
-# We deliberately don't have anything depend on the
-# $(DEPEND) file; otherwise it will get rebuilt even
-# on 'make clean'
-#
-
-depend: $(C_FILES) $(CC_FILES) $(S_FILES)
-ifneq ($(words $(C_FILES) $(CC_FILES) $(S_FILES)), 0)
-#       Use gcc -M to generate dependencies
-#       Replace foo.o with $(ARCH)/foo.o
-#       Replace $(ARCH) value with string $(ARCH)
-#           so that it will for debug and profile cases
-	$(COMPILE.c) -M   $^    |  \
-	$(SED) -e 's?^\(.*\)\.o[ ]*:?$$(ARCH)/\1.o:?' \
-	    -e 's?$(ARCH)/?$$(ARCH)/?'   >$(DEPEND).tmp
-	$(MV) $(DEPEND).tmp $(DEPEND)
-endif
-
-# spell out all the LINK_FILE's, rather than using -lbsp, so
-#  that $(LINK_FILES) can be a dependency
-
-# Start file must be one of
-#    $(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).o
-#    $(PROJECT_RELEASE)/lib/asmiface$(LIB_VARIANT).o
-# It defaults to start.o, but an app can override it.
-
-ifeq ($(START_BASE),)
-  START_FILE=
-else
-  START_FILE=$(PROJECT_RELEASE)/lib/$(START_BASE)$(LIB_VARIANT).o
-endif
-
-CONSTRUCTOR=
-
-LIBC_LOW=
-
-ifndef LIBGCC
-LIBGCC = $(shell $(CC) $(CFLAGS) -print-libgcc-file-name $(GCCSED))
-endif
-
-#
-# NOTE: a rule to link an rtems' application should look similar to this
-#       (cf. "make-exe" in make/custom/*.cfg): 
-#
-# gcc27:
-# $(PGM): $(LINK_FILES)
-#	$(LD) $(LDFLAGS) -o $@ $(LINK_OBJS) \
-#	--start-group $(LINK_LIBS) --end-group
-#
-# gcc28:
-# $(PGM): $(LINK_FILES)
-#	$(CC) $(CFLAGS) -o $@ $(LINK_OBJS) $(LINK_LIBS)
-#
-
-LINK_OBJS =\
-    $(CONSTRUCTOR) \
-    $(OBJS) \
-    $(MANAGERS_NOT_WANTED:%=$(PROJECT_RELEASE)/lib/no-%$(LIB_VARIANT).rel) \
-    $(PROJECT_RELEASE)/lib/libtest$(LIBSUFFIX_VA)
-
-LINK_FILES =\
-    $(START_FILE) \
-    $(CONSTRUCTOR) \
-    $(OBJS) \
-    $(MANAGERS_NOT_WANTED:%=$(PROJECT_RELEASE)/lib/no-%$(LIB_VARIANT).rel) \
-    $(PROJECT_RELEASE)/lib/libtest$(LIBSUFFIX_VA) \
-    $(PROJECT_RELEASE)/lib/librtemsall$(LIBSUFFIX_VA)
-
-ifeq ($(RTEMS_USE_GCC272),yes)
-LINK_LIBS = $(PROJECT_RELEASE)/lib/librtemsall$(LIBSUFFIX_VA)
-ifeq ($(RTEMS_CROSS_TARGET),yes)
-# NOTE: add libc and libgcc only for embedded targets
-#       LIBC_LIBM should not be needed by rtems itself.
-# FIXME: If a BSP requires libm, its make/custom/*.cfg file should add
-#        LIBC_LIBM to LINK_LIBS (untested)
-LINK_LIBS += $(LIBC_LIBC) $(LIBGCC)
-endif
-endif
-
-LINK_LIBS += $(LD_LIBS)    
-
-#
-# Allow user to override link commands (to build a prom image, perhaps)
-#
-ifndef LINKCMDS
-LINKCMDS=$(PROJECT_RELEASE)/lib/linkcmds
-endif
-
-
-define make-rel
-	$(LD) $(LDFLAGS_INCOMPLETE) $(XLDFLAGS) -o $@ $(OBJS)
-endef
diff --git a/c/src/make/directory.cfg b/c/src/make/directory.cfg
deleted file mode 100644
index 68b68d79e0..0000000000
--- a/c/src/make/directory.cfg
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-#  $Id$
-#
-# make/directory.cfg
-#
-#   Make(1) configuration file include'd by all directory-level Makefile's.
-#
-#   See also make/main.cfg
-#
-
-# include $(RTEMS_ROOT)/make/main.cfg
-
-# on a 'make -k' we don't want to bomb out of directory list
-EXIT_CMD=exit 1
-ifeq (k, $(findstring k, $(MAKEFLAGS)))
-EXIT_CMD=true
-endif
-
-RULE=$(shell echo $@ | $(SED) -e s/debug_// -e s/profile_//)
-
-ifeq ($(RTEMS_USE_OWN_PDIR),yes)
-$(RECURSE_TARGETS):
-	@$(ECHO); \
-        BASEDIR=`pwd`; \
-        test -d $$BASEDIR || $(EXIT_CMD) ; \
-        for subd in $(SUB_DIRS) xxx; \
-	do if [ $$subd != xxx ] ; then  \
-	    cd $$BASEDIR; \
-	    if [ ! -d $$subd ] ; then \
-	      $(ECHO) "*** ERROR -- Directory ($$subd) does not exist!!!"; \
-	      $(EXIT_CMD) ; \
-	    fi ; \
-	    $(ECHO); \
-            $(ECHO) "***  $$BASEDIR/$$subd ($@)" ; \
-	    cmd="cd $$subd; $(MAKE) $(RULE)"; \
-	    $(ECHO) $$cmd; \
-	    eval $$cmd || $(EXIT_CMD); \
-  fi; done; \
-        $(ECHO); \
-        $(ECHO) "***  $$BASEDIR/$@ ($@) Finished."; \
-        $(ECHO)
-	$($@_WRAPUP)
-else
-ifdef RECURSE_TARGETS
-$(RECURSE_TARGETS):
-	@$(ECHO) ; set -e ; \
-	if [ "$(SUB_DIRS)" != "" ] ; then \
-	  sdirs="$(SUB_DIRS)" ; \
-	else \
-	  sdirs="xxx" ; \
-	fi ; \
-	if [ "$$sdirs" != "xxx" ] ; then \
-	  for subd in $$sdirs; do $(MAKE) -w -C $$subd $(RULE); done ;\
-	fi
-endif
-endif
-
diff --git a/c/src/make/host.cfg.in b/c/src/make/host.cfg.in
deleted file mode 100644
index 0c8f9cf408..0000000000
--- a/c/src/make/host.cfg.in
+++ /dev/null
@@ -1,74 +0,0 @@
-#
-#  $Id$
-#
-# OS-specific configuration 
-#
-# Author: Ralf Corsepius (corsepiu@faw.uni-ulm.de) 97/11/08
-#
-# Derived from rtems/c/make/os/*.cfg in previous RTEMS version.
-#
-
-RTEMS_HOST = @RTEMS_HOST@
-
-#
-# Stuff to clean and clobber for the OS
-#
-
-CLEAN_OS =
-CLOBBER_OS = *~ *.bak TAGS tags
-
-SHELL=/bin/sh
-ECHO=echo
-
-CAT=@CAT@
-RM=@RM@ -f
-CP=@CP@
-MV=@MV@
-LN=@LN@
-MKDIR=@MKDIR@
-CHMOD=@CHMOD@
-SED=@SED@
-M4=@M4@
-
-INSTALL=$(PROJECT_TOOLS)/install-if-change
-INSTALL_VARIANT=$(PROJECT_TOOLS)/install-if-change -V "$(LIB_VARIANT)"
-
-# FIXME: HACK for a bug in cygwin-hosted egcs which returns a mixture
-#        of '\\' and '/' as path separators.
-#        Should be removed as soon as this bug is fixed in egcs.
-GCCSED = @GCCSED@
-
-# ksh (or bash) is used by some shell scripts; ref build-tools/scripts/Makefile
-#
-#  Must have shell functions.  Some ksh's core dump mysteriously and 
-#  unreliably on RTEMS shell scripts.  bash appears to be the most
-#  reliable but late model ksh's are usually OK.
-KSH=@KSH@
-
-#
-# RCS support
-#
-RCS_CLEAN=$(PROJECT_TOOLS)/rcs-clean
-
-#
-#  Rule to install a shell script with the proper shell to run it.
-#
-
-# when debugging, one may want to save the previous incarnation of the
-# installed script.  Replace the first line of this rule to do this.
-#
-#	-$(RM) $@.old
-#	-$(MV) $@ $@.old >/dev/null 2>&1
-
-define make-script
-	-$(RM) $@
-	$(SED) -e '1,1s?^#!KSHELL?#!$(KSH)?' \
-               -e '1,1s?^#!SHELL?#!$(SHELL)?' < $< > $@
-	$(CHMOD) 0555 $@
-endef
-
-INSTBINFLAGS  = -m 0755
-INSTDATAFLAGS = -m 0644
-INSTLIBFLAGS  = -m 0644 
-INSTDIRFLAGS  = -m 0755 -d
-INSTINCFLAGS  = -m 0644
diff --git a/c/src/make/lib.cfg b/c/src/make/lib.cfg
deleted file mode 100644
index 6d170efed4..0000000000
--- a/c/src/make/lib.cfg
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-#  $Id$
-#
-# make/lib.cfg
-#
-#   Make(1) configuration file include'd by all "library" Makefile
-#   Assumes $(LIB) is set to $(ARCH)/libfoo.a
-#
-
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-define make-library
-$(RM) $@
-$(AR) $(ARFLAGS) $@ $(OBJS)
-$(MKLIB) $@
-endef
-
-CLEAN_ADDITIONS +=
-
-.PRECIOUS: $(LIB)
diff --git a/c/src/optman/rtems/no-dpmem.c b/c/src/optman/rtems/no-dpmem.c
deleted file mode 100644
index b3a122abb7..0000000000
--- a/c/src/optman/rtems/no-dpmem.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- *  Dual Port Memory Manager
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems/system.h>
-#include <rtems/score/address.h>
-#include <rtems/score/object.h>
-#include <rtems/score/thread.h>
-#include <rtems/score/interr.h>
-
-#include <rtems/rtems/status.h>
-#include <rtems/rtems/types.h>
-#include <rtems/rtems/dpmem.h>
-
-void _Dual_ported_memory_Manager_initialization(
-  unsigned32 maximum_ports
-)
-{
-}
-
-rtems_status_code rtems_port_create(
-  rtems_name    name,
-  void         *internal_start,
-  void         *external_start,
-  unsigned32    length,
-  Objects_Id   *id
-)
-{
-  _Internal_error_Occurred(
-    INTERNAL_ERROR_RTEMS_API,
-    FALSE,
-    RTEMS_NOT_CONFIGURED
-  );
-  return RTEMS_NOT_CONFIGURED;
-}
-
-rtems_status_code rtems_port_ident(
-  rtems_name    name,
-  Objects_Id   *id
-)
-{
-  _Internal_error_Occurred(
-    INTERNAL_ERROR_RTEMS_API,
-    FALSE,
-    RTEMS_NOT_CONFIGURED
-  );
-  return RTEMS_NOT_CONFIGURED;
-}
-
-rtems_status_code rtems_port_delete(
-  Objects_Id id
-)
-{
-  _Internal_error_Occurred(
-    INTERNAL_ERROR_RTEMS_API,
-    FALSE,
-    RTEMS_NOT_CONFIGURED
-  );
-  return RTEMS_NOT_CONFIGURED;
-}
-
-rtems_status_code rtems_port_internal_to_external(
-  Objects_Id   id,
-  void        *internal,
-  void       **external
-)
-{
-  _Internal_error_Occurred(
-    INTERNAL_ERROR_RTEMS_API,
-    FALSE,
-    RTEMS_NOT_CONFIGURED
-  );
-  return RTEMS_NOT_CONFIGURED;
-}
-
-rtems_status_code rtems_port_external_to_internal(
-  Objects_Id   id,
-  void        *external,
-  void       **internal
-)
-{
-  _Internal_error_Occurred(
-    INTERNAL_ERROR_RTEMS_API,
-    FALSE,
-    RTEMS_NOT_CONFIGURED
-  );
-  return RTEMS_NOT_CONFIGURED;
-}
diff --git a/c/src/optman/rtems/no-event.c b/c/src/optman/rtems/no-event.c
deleted file mode 100644
index 5aa427ce73..0000000000
--- a/c/src/optman/rtems/no-event.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- *  Event Manager
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems/system.h>
-#include <rtems/rtems/status.h>
-#include <rtems/rtems/event.h>
-#include <rtems/score/isr.h>
-#include <rtems/score/object.h>
-#include <rtems/rtems/options.h>
-#include <rtems/score/states.h>
-#include <rtems/score/thread.h>
-#include <rtems/score/interr.h>
-
-void _Event_Manager_initialization( void )
-{
-}
-
-rtems_status_code rtems_event_send(
-  Objects_Id         id,
-  rtems_event_set event_in
-)
-{
-  _Internal_error_Occurred(
-    INTERNAL_ERROR_RTEMS_API,
-    FALSE,
-    RTEMS_NOT_CONFIGURED
-  );
-  return RTEMS_NOT_CONFIGURED;
-}
-
-rtems_status_code rtems_event_receive(
-  rtems_event_set  event_in,
-  rtems_option     option_set,
-  rtems_interval   ticks,
-  rtems_event_set *event_out
-)
-{
-  _Internal_error_Occurred(
-    INTERNAL_ERROR_RTEMS_API,
-    FALSE,
-    RTEMS_NOT_CONFIGURED
-  );
-  return RTEMS_NOT_CONFIGURED;
-}
-
diff --git a/c/src/optman/rtems/no-mp.c b/c/src/optman/rtems/no-mp.c
deleted file mode 100644
index 71c38826f3..0000000000
--- a/c/src/optman/rtems/no-mp.c
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- *  Multiprocessing Manager
- *
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems/system.h>
-#include <rtems/rtems/status.h>
-#include <rtems/rtems/mp.h>
-#include <rtems/score/cpu.h>
-#include <rtems/score/interr.h>
-#include <rtems/score/mpci.h>
-#include <rtems/score/mppkt.h>
-#include <rtems/score/states.h>
-#include <rtems/score/thread.h>
-#include <rtems/score/threadq.h>
-#include <rtems/score/tqdata.h>
-#include <rtems/score/watchdog.h>
-#include <rtems/score/sysstate.h>
-#include <rtems/score/interr.h>
-
-void _Multiprocessing_Manager_initialization ( void )
-{
-}
-
-void rtems_multiprocessing_announce ( void )
-{
-  _Internal_error_Occurred(
-    INTERNAL_ERROR_RTEMS_API,
-    FALSE,
-    RTEMS_NOT_CONFIGURED
-  );
-}
-
-void _MPCI_Handler_initialization( 
-  MPCI_Control            *users_mpci_table,
-  unsigned32               timeout_status
-)
-{
-}
-
-void _MPCI_Create_server( void )
-{
-}
-
-void _MPCI_Initialization ( void )
-{
-}
-
-void _MPCI_Register_packet_processor(
-  MP_packet_Classes      the_class,
-  MPCI_Packet_processor  the_packet_processor
- 
-)
-{
-}
- 
-MP_packet_Prefix *_MPCI_Get_packet ( void )
-{
-  _Internal_error_Occurred(
-    INTERNAL_ERROR_RTEMS_API,
-    FALSE,
-    RTEMS_NOT_CONFIGURED
-  );
-  return NULL;
-}
-
-void _MPCI_Return_packet (
-  MP_packet_Prefix   *the_packet
-)
-{
-  _Internal_error_Occurred(
-    INTERNAL_ERROR_RTEMS_API,
-    FALSE,
-    RTEMS_NOT_CONFIGURED
-  );
-}
-
-void _MPCI_Send_process_packet (
-  unsigned32          destination,
-  MP_packet_Prefix   *the_packet
-)
-{
-  _Internal_error_Occurred(
-    INTERNAL_ERROR_RTEMS_API,
-    FALSE,
-    RTEMS_NOT_CONFIGURED
-  );
-}
-
-unsigned32 _MPCI_Send_request_packet (
-  unsigned32          destination,
-  MP_packet_Prefix   *the_packet,
-  States_Control      extra_state
-)
-{
-  _Internal_error_Occurred(
-    INTERNAL_ERROR_RTEMS_API,
-    FALSE,
-    RTEMS_NOT_CONFIGURED
-  );
-  return 0;
-}
-
-void _MPCI_Send_response_packet (
-  unsigned32          destination,
-  MP_packet_Prefix   *the_packet
-)
-{
-  _Internal_error_Occurred(
-    INTERNAL_ERROR_RTEMS_API,
-    FALSE,
-    RTEMS_NOT_CONFIGURED
-  );
-}
-
-MP_packet_Prefix  *_MPCI_Receive_packet ( void )
-{
-  _Internal_error_Occurred(
-    INTERNAL_ERROR_RTEMS_API,
-    FALSE,
-    RTEMS_NOT_CONFIGURED
-  );
-  return NULL;
-}
-
-Thread_Control *_MPCI_Process_response (
-  MP_packet_Prefix  *the_packet
-)
-{
-  _Internal_error_Occurred(
-    INTERNAL_ERROR_RTEMS_API,
-    FALSE,
-    RTEMS_NOT_CONFIGURED
-  );
-  return NULL;
-}
-
-Thread _MPCI_Receive_server(
-  unsigned32 ignore
-)
-{
-  _Internal_error_Occurred(
-    INTERNAL_ERROR_RTEMS_API,
-    FALSE,
-    RTEMS_NOT_CONFIGURED
-  );
-}
-
-void _MPCI_Announce ( void )
-{
-  _Internal_error_Occurred(
-    INTERNAL_ERROR_RTEMS_API,
-    FALSE,
-    RTEMS_NOT_CONFIGURED
-  );
-}
-
-
-void _MPCI_Internal_packets_Send_process_packet (
-   MPCI_Internal_Remote_operations operation
-)
-{
-  _Internal_error_Occurred(
-    INTERNAL_ERROR_RTEMS_API,
-    FALSE,
-    RTEMS_NOT_CONFIGURED
-  );
-}
- 
-void _MPCI_Internal_packets_Process_packet (
-  MP_packet_Prefix  *the_packet_prefix
-)
-{
-  _Internal_error_Occurred(
-    INTERNAL_ERROR_RTEMS_API,
-    FALSE,
-    RTEMS_NOT_CONFIGURED
-  );
-}
- 
-MPCI_Internal_packet *_MPCI_Internal_packets_Get_packet ( void )
-{
-  _Internal_error_Occurred(
-    INTERNAL_ERROR_RTEMS_API,
-    FALSE,
-    RTEMS_NOT_CONFIGURED
-  );
-  return NULL;
-}
-
-/* end of file */
diff --git a/c/src/optman/rtems/no-msg.c b/c/src/optman/rtems/no-msg.c
deleted file mode 100644
index 65103dcb7d..0000000000
--- a/c/src/optman/rtems/no-msg.c
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- *  Message Queue Manager
- *
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems/system.h>
-#include <rtems/rtems/status.h>
-#include <rtems/rtems/attr.h>
-#include <rtems/score/chain.h>
-#include <rtems/score/isr.h>
-#include <rtems/rtems/message.h>
-#include <rtems/score/object.h>
-#include <rtems/rtems/options.h>
-#include <rtems/score/states.h>
-#include <rtems/score/thread.h>
-#include <rtems/score/wkspace.h>
-#include <rtems/score/interr.h>
-
-void _Message_queue_Manager_initialization(
-  unsigned32 maximum_message_queues
-)
-{
-}
-
-rtems_status_code rtems_message_queue_create(
-  rtems_name          name,
-  unsigned32          count,
-  unsigned32          max_message_size,
-  rtems_attribute     attribute_set,
-  Objects_Id         *id
-)
-{
-  _Internal_error_Occurred(
-    INTERNAL_ERROR_RTEMS_API,
-    FALSE,
-    RTEMS_NOT_CONFIGURED
-  );
-  return RTEMS_NOT_CONFIGURED;
-}
-
-rtems_status_code rtems_message_queue_ident(
-  rtems_name    name,
-  unsigned32    node,
-  Objects_Id   *id
-)
-{
-  _Internal_error_Occurred(
-    INTERNAL_ERROR_RTEMS_API,
-    FALSE,
-    RTEMS_NOT_CONFIGURED
-  );
-  return RTEMS_NOT_CONFIGURED;
-}
-
-rtems_status_code rtems_message_queue_delete(
-  Objects_Id id
-)
-{
-  _Internal_error_Occurred(
-    INTERNAL_ERROR_RTEMS_API,
-    FALSE,
-    RTEMS_NOT_CONFIGURED
-  );
-  return RTEMS_NOT_CONFIGURED;
-}
-
-rtems_status_code rtems_message_queue_send(
-  Objects_Id            id,
-  void                 *buffer,
-  unsigned32            size
-)
-{
-  _Internal_error_Occurred(
-    INTERNAL_ERROR_RTEMS_API,
-    FALSE,
-    RTEMS_NOT_CONFIGURED
-  );
-  return RTEMS_NOT_CONFIGURED;
-}
-
-rtems_status_code rtems_message_queue_urgent(
-  Objects_Id            id,
-  void                 *buffer,
-  unsigned32            size
-)
-{
-  _Internal_error_Occurred(
-    INTERNAL_ERROR_RTEMS_API,
-    FALSE,
-    RTEMS_NOT_CONFIGURED
-  );
-  return RTEMS_NOT_CONFIGURED;
-}
-
-rtems_status_code rtems_message_queue_broadcast(
-  Objects_Id            id,
-  void                 *buffer,
-  unsigned32            size,
-  unsigned32           *count
-)
-{
-  _Internal_error_Occurred(
-    INTERNAL_ERROR_RTEMS_API,
-    FALSE,
-    RTEMS_NOT_CONFIGURED
-  );
-  return RTEMS_NOT_CONFIGURED;
-}
-
-rtems_status_code rtems_message_queue_receive(
-  Objects_Id            id,
-  void                 *buffer,
-  unsigned32           *size_p,
-  unsigned32            option_set,
-  rtems_interval        timeout
-)
-{
-  _Internal_error_Occurred(
-    INTERNAL_ERROR_RTEMS_API,
-    FALSE,
-    RTEMS_NOT_CONFIGURED
-  );
-  return RTEMS_NOT_CONFIGURED;
-}
-
-rtems_status_code rtems_message_queue_flush(
-  Objects_Id  id,
-  unsigned32 *count
-)
-{
-  _Internal_error_Occurred(
-    INTERNAL_ERROR_RTEMS_API,
-    FALSE,
-    RTEMS_NOT_CONFIGURED
-  );
-  return RTEMS_NOT_CONFIGURED;
-}
-
-unsigned32 _Message_queue_Flush_support(
-  Message_queue_Control *the_message_queue
-)
-{
-  _Internal_error_Occurred(
-    INTERNAL_ERROR_RTEMS_API,
-    FALSE,
-    RTEMS_NOT_CONFIGURED
-  );
-  return RTEMS_NOT_CONFIGURED;
-  return 0;
-}
-
-boolean _Message_queue_Seize(
-  Message_queue_Control  *the_message_queue,
-  rtems_option            option_set,
-  void                   *buffer,
-  unsigned32             *size_p
-)
-{
-  _Internal_error_Occurred(
-    INTERNAL_ERROR_RTEMS_API,
-    FALSE,
-    RTEMS_NOT_CONFIGURED
-  );
-  return RTEMS_NOT_CONFIGURED;
-  _Thread_Executing->Wait.return_code = RTEMS_UNSATISFIED;
-  return TRUE;
-}
-
-rtems_status_code _Message_queue_Submit(
-  Objects_Id                  id,
-  void                       *buffer,
-  unsigned32                  size,
-  Message_queue_Submit_types  submit_type
-)
-{
-  _Internal_error_Occurred(
-    INTERNAL_ERROR_RTEMS_API,
-    FALSE,
-    RTEMS_NOT_CONFIGURED
-  );
-  return RTEMS_NOT_CONFIGURED;
-}
diff --git a/c/src/optman/rtems/no-part.c b/c/src/optman/rtems/no-part.c
deleted file mode 100644
index 56abcb7af1..0000000000
--- a/c/src/optman/rtems/no-part.c
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- *  Partition Manager
- *
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems/system.h>
-#include <rtems/rtems/status.h>
-#include <rtems/score/address.h>
-#include <rtems/score/object.h>
-#include <rtems/rtems/part.h>
-#include <rtems/score/thread.h>
-#include <rtems/score/interr.h>
-
-void _Partition_Manager_initialization(
-  unsigned32 maximum_partitions
-)
-{
-}
-
-rtems_status_code rtems_partition_create(
-  rtems_name          name,
-  void               *starting_address,
-  unsigned32          length,
-  unsigned32          buffer_size,
-  rtems_attribute  attribute_set,
-  Objects_Id         *id
-)
-{
-  _Internal_error_Occurred(
-    INTERNAL_ERROR_RTEMS_API,
-    FALSE,
-    RTEMS_NOT_CONFIGURED
-  );
-  return RTEMS_NOT_CONFIGURED;
-}
-
-rtems_status_code rtems_partition_ident(
-  rtems_name    name,
-  unsigned32    node,
-  Objects_Id   *id
-)
-{
-  _Internal_error_Occurred(
-    INTERNAL_ERROR_RTEMS_API,
-    FALSE,
-    RTEMS_NOT_CONFIGURED
-  );
-  return RTEMS_NOT_CONFIGURED;
-}
-
-rtems_status_code rtems_partition_delete(
-  Objects_Id id
-)
-{
-  _Internal_error_Occurred(
-    INTERNAL_ERROR_RTEMS_API,
-    FALSE,
-    RTEMS_NOT_CONFIGURED
-  );
-  return RTEMS_NOT_CONFIGURED;
-}
-
-rtems_status_code rtems_partition_get_buffer(
-  Objects_Id   id,
-  void       **buffer
-)
-{
-  _Internal_error_Occurred(
-    INTERNAL_ERROR_RTEMS_API,
-    FALSE,
-    RTEMS_NOT_CONFIGURED
-  );
-  return RTEMS_NOT_CONFIGURED;
-}
-
-rtems_status_code rtems_partition_return_buffer(
-  Objects_Id  id,
-  void       *buffer
-)
-{
-  _Internal_error_Occurred(
-    INTERNAL_ERROR_RTEMS_API,
-    FALSE,
-    RTEMS_NOT_CONFIGURED
-  );
-  return RTEMS_NOT_CONFIGURED;
-}
diff --git a/c/src/optman/rtems/no-region.c b/c/src/optman/rtems/no-region.c
deleted file mode 100644
index 3ae7c86f35..0000000000
--- a/c/src/optman/rtems/no-region.c
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- *  Region Manager
- *
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems/system.h>
-#include <rtems/rtems/status.h>
-#include <rtems/score/object.h>
-#include <rtems/rtems/options.h>
-#include <rtems/rtems/region.h>
-#include <rtems/score/states.h>
-#include <rtems/score/thread.h>
-#include <rtems/score/interr.h>
-
-void _Region_Manager_initialization(
-  unsigned32 maximum_regions
-)
-{
-}
-
-rtems_status_code rtems_region_create(
-  rtems_name          name,
-  void               *starting_address,
-  unsigned32          length,
-  unsigned32          page_size,
-  rtems_attribute  attribute_set,
-  Objects_Id         *id
-)
-{
-  _Internal_error_Occurred(
-    INTERNAL_ERROR_RTEMS_API,
-    FALSE,
-    RTEMS_NOT_CONFIGURED
-  );
-  return RTEMS_NOT_CONFIGURED;
-}
-
-rtems_status_code rtems_region_ident(
-  rtems_name    name,
-  Objects_Id   *id
-)
-{
-  _Internal_error_Occurred(
-    INTERNAL_ERROR_RTEMS_API,
-    FALSE,
-    RTEMS_NOT_CONFIGURED
-  );
-  return RTEMS_NOT_CONFIGURED;
-}
-
-rtems_status_code rtems_region_delete(
-  Objects_Id id
-)
-{
-  _Internal_error_Occurred(
-    INTERNAL_ERROR_RTEMS_API,
-    FALSE,
-    RTEMS_NOT_CONFIGURED
-  );
-  return RTEMS_NOT_CONFIGURED;
-}
-
-rtems_status_code rtems_region_get_segment(
-  Objects_Id         id,
-  unsigned32         size,
-  rtems_option    option_set,
-  rtems_interval  timeout,
-  void              **segment
-)
-{
-  _Internal_error_Occurred(
-    INTERNAL_ERROR_RTEMS_API,
-    FALSE,
-    RTEMS_NOT_CONFIGURED
-  );
-  return RTEMS_NOT_CONFIGURED;
-}
-
-rtems_status_code rtems_region_get_segment_size(
-  Objects_Id         id,
-  void              *segment,
-  unsigned32        *size
-)
-{
-  _Internal_error_Occurred(
-    INTERNAL_ERROR_RTEMS_API,
-    FALSE,
-    RTEMS_NOT_CONFIGURED
-  );
-  return RTEMS_NOT_CONFIGURED;
-}
-
-rtems_status_code rtems_region_return_segment(
-  Objects_Id  id,
-  void       *segment
-)
-{
-  _Internal_error_Occurred(
-    INTERNAL_ERROR_RTEMS_API,
-    FALSE,
-    RTEMS_NOT_CONFIGURED
-  );
-  return RTEMS_NOT_CONFIGURED;
-}
diff --git a/c/src/optman/rtems/no-rtmon.c b/c/src/optman/rtems/no-rtmon.c
deleted file mode 100644
index 96e6fe8228..0000000000
--- a/c/src/optman/rtems/no-rtmon.c
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- *  Rate Monotonic Manager
- *
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems/system.h>
-#include <rtems/rtems/status.h>
-#include <rtems/score/isr.h>
-#include <rtems/score/object.h>
-#include <rtems/score/thread.h>
-#include <rtems/score/interr.h>
-
-#include <rtems/rtems/types.h>
-#include <rtems/rtems/ratemon.h>
-
-void _Rate_monotonic_Manager_initialization(
-  unsigned32 maximum_periods
-)
-{
-}
-
-rtems_status_code rtems_rate_monotonic_create(
-  rtems_name    name,
-  Objects_Id   *id
-)
-{
-  _Internal_error_Occurred(
-    INTERNAL_ERROR_RTEMS_API,
-    FALSE,
-    RTEMS_NOT_CONFIGURED
-  );
-  return RTEMS_NOT_CONFIGURED;
-}
-
-rtems_status_code rtems_rate_monotonic_ident(
-  rtems_name    name,
-  Objects_Id   *id
-)
-{
-  _Internal_error_Occurred(
-    INTERNAL_ERROR_RTEMS_API,
-    FALSE,
-    RTEMS_NOT_CONFIGURED
-  );
-  return RTEMS_NOT_CONFIGURED;
-}
-
-rtems_status_code rtems_rate_monotonic_cancel(
-  Objects_Id id
-)
-{
-  _Internal_error_Occurred(
-    INTERNAL_ERROR_RTEMS_API,
-    FALSE,
-    RTEMS_NOT_CONFIGURED
-  );
-  return RTEMS_NOT_CONFIGURED;
-}
-
-rtems_status_code rtems_rate_monotonic_delete(
-  Objects_Id id
-)
-{
-  _Internal_error_Occurred(
-    INTERNAL_ERROR_RTEMS_API,
-    FALSE,
-    RTEMS_NOT_CONFIGURED
-  );
-  return RTEMS_NOT_CONFIGURED;
-}
-
-rtems_status_code rtems_rate_monotonic_period(
-  Objects_Id        id,
-  rtems_interval length
-)
-{
-  _Internal_error_Occurred(
-    INTERNAL_ERROR_RTEMS_API,
-    FALSE,
-    RTEMS_NOT_CONFIGURED
-  );
-  return RTEMS_NOT_CONFIGURED;
-}
-
-void _Rate_monotonic_Timeout(
-  Objects_Id  id,
-  void       *ignored
-)
-{
-  _Internal_error_Occurred(
-    INTERNAL_ERROR_RTEMS_API,
-    FALSE,
-    RTEMS_NOT_CONFIGURED
-  );
-}
-
-boolean _Rate_monotonic_Set_state(
-Rate_monotonic_Control *the_period
-)
-{
-  _Internal_error_Occurred(
-    INTERNAL_ERROR_RTEMS_API,
-    FALSE,
-    RTEMS_NOT_CONFIGURED
-  );
-  return FALSE;
-}
diff --git a/c/src/optman/rtems/no-sem.c b/c/src/optman/rtems/no-sem.c
deleted file mode 100644
index 2f31e50cd9..0000000000
--- a/c/src/optman/rtems/no-sem.c
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- *  Semaphore Manager
- *
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems/system.h>
-#include <rtems/rtems/status.h>
-#include <rtems/rtems/attr.h>
-#include <rtems/score/isr.h>
-#include <rtems/score/object.h>
-#include <rtems/rtems/options.h>
-#include <rtems/rtems/sem.h>
-#include <rtems/score/states.h>
-#include <rtems/score/thread.h>
-#include <rtems/score/threadq.h>
-#include <rtems/score/interr.h>
-
-void _Semaphore_Manager_initialization(
-  unsigned32 maximum_semaphores
-)
-{
-}
-
-rtems_status_code rtems_semaphore_create(
-  rtems_name            name,
-  unsigned32            count,
-  rtems_attribute       attribute_set,
-  rtems_task_priority   priority_ceiling,
-  Objects_Id           *id
-)
-{
-  _Internal_error_Occurred(
-    INTERNAL_ERROR_RTEMS_API,
-    FALSE,
-    RTEMS_NOT_CONFIGURED
-  );
-  return RTEMS_NOT_CONFIGURED;
-}
-
-rtems_status_code rtems_semaphore_ident(
-  rtems_name    name,
-  unsigned32    node,
-  Objects_Id   *id
-)
-{
-  _Internal_error_Occurred(
-    INTERNAL_ERROR_RTEMS_API,
-    FALSE,
-    RTEMS_NOT_CONFIGURED
-  );
-  return RTEMS_NOT_CONFIGURED;
-}
-
-rtems_status_code rtems_semaphore_delete(
-  Objects_Id id
-)
-{
-  _Internal_error_Occurred(
-    INTERNAL_ERROR_RTEMS_API,
-    FALSE,
-    RTEMS_NOT_CONFIGURED
-  );
-  return RTEMS_NOT_CONFIGURED;
-}
-
-rtems_status_code rtems_semaphore_obtain(
-  Objects_Id        id,
-  unsigned32        option_set,
-  rtems_interval timeout
-)
-{
-  _Internal_error_Occurred(
-    INTERNAL_ERROR_RTEMS_API,
-    FALSE,
-    RTEMS_NOT_CONFIGURED
-  );
-  return RTEMS_NOT_CONFIGURED;
-}
-
-rtems_status_code rtems_semaphore_release(
-  Objects_Id id
-)
-{
-  _Internal_error_Occurred(
-    INTERNAL_ERROR_RTEMS_API,
-    FALSE,
-    RTEMS_NOT_CONFIGURED
-  );
-  return RTEMS_NOT_CONFIGURED;
-}
-
-boolean _Semaphore_Seize(
-  Semaphore_Control *the_semaphore,
-  rtems_option    option_set
-)
-{
-  _Internal_error_Occurred(
-    INTERNAL_ERROR_RTEMS_API,
-    FALSE,
-    RTEMS_NOT_CONFIGURED
-  );
-  _Thread_Executing->Wait.return_code = RTEMS_UNSATISFIED;
-  return TRUE;
-}
diff --git a/c/src/optman/rtems/no-signal.c b/c/src/optman/rtems/no-signal.c
deleted file mode 100644
index b73d12c97b..0000000000
--- a/c/src/optman/rtems/no-signal.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- *  Signal Manager
- *
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems/system.h>
-#include <rtems/rtems/status.h>
-#include <rtems/score/isr.h>
-#include <rtems/score/thread.h>
-#include <rtems/score/interr.h>
-
-#include <rtems/rtems/asr.h>
-#include <rtems/rtems/modes.h>
-#include <rtems/rtems/signal.h>
-
-void _Signal_Manager_initialization( void )
-{
-}
- 
-rtems_status_code rtems_signal_catch(
-  rtems_asr_entry   handler,
-  rtems_mode        mode_set
-)
-{
-  _Internal_error_Occurred(
-    INTERNAL_ERROR_RTEMS_API,
-    FALSE,
-    RTEMS_NOT_CONFIGURED
-  );
-  return RTEMS_NOT_CONFIGURED;
-}
-
-rtems_status_code rtems_signal_send(
-  rtems_id         id,
-  rtems_signal_set signal_set
-)
-{
-  _Internal_error_Occurred(
-    INTERNAL_ERROR_RTEMS_API,
-    FALSE,
-    RTEMS_NOT_CONFIGURED
-  );
-  return RTEMS_NOT_CONFIGURED;
-}
-
-/* end of file */
diff --git a/c/src/optman/rtems/no-timer.c b/c/src/optman/rtems/no-timer.c
deleted file mode 100644
index 5d6ec63d4e..0000000000
--- a/c/src/optman/rtems/no-timer.c
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- *  Timer Manager
- *
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems/system.h>
-#include <rtems/rtems/status.h>
-#include <rtems/score/object.h>
-#include <rtems/score/thread.h>
-#include <rtems/score/tod.h>
-#include <rtems/score/watchdog.h>
-#include <rtems/score/interr.h>
-
-#include <rtems/rtems/types.h>
-#include <rtems/rtems/timer.h>
-
-void _Timer_Manager_initialization(
-  unsigned32 maximum_timers
-)
-{
-}
-
-rtems_status_code rtems_timer_create(
-  rtems_name    name,
-  Objects_Id   *id
-)
-{
-  _Internal_error_Occurred(
-    INTERNAL_ERROR_RTEMS_API,
-    FALSE,
-    RTEMS_NOT_CONFIGURED
-  );
-  return RTEMS_NOT_CONFIGURED;
-}
-
-rtems_status_code rtems_timer_ident(
-  rtems_name    name,
-  Objects_Id   *id
-)
-{
-  _Internal_error_Occurred(
-    INTERNAL_ERROR_RTEMS_API,
-    FALSE,
-    RTEMS_NOT_CONFIGURED
-  );
-  return RTEMS_NOT_CONFIGURED;
-}
-
-rtems_status_code rtems_timer_cancel(
-  Objects_Id id
-)
-{
-  _Internal_error_Occurred(
-    INTERNAL_ERROR_RTEMS_API,
-    FALSE,
-    RTEMS_NOT_CONFIGURED
-  );
-  return RTEMS_NOT_CONFIGURED;
-}
-
-rtems_status_code rtems_timer_delete(
-  Objects_Id id
-)
-{
-  _Internal_error_Occurred(
-    INTERNAL_ERROR_RTEMS_API,
-    FALSE,
-    RTEMS_NOT_CONFIGURED
-  );
-  return RTEMS_NOT_CONFIGURED;
-}
-
-rtems_status_code rtems_timer_fire_after(
-  Objects_Id                         id,
-  rtems_interval                     ticks,
-  rtems_timer_service_routine_entry  routine,
-  void                              *user_data
-)
-{
-  _Internal_error_Occurred(
-    INTERNAL_ERROR_RTEMS_API,
-    FALSE,
-    RTEMS_NOT_CONFIGURED
-  );
-  return RTEMS_NOT_CONFIGURED;
-}
-
-rtems_status_code rtems_timer_fire_when(
-  Objects_Id                         id,
-  rtems_time_of_day                 *wall_time,
-  rtems_timer_service_routine_entry  routine,
-  void                              *user_data
-)
-{
-  _Internal_error_Occurred(
-    INTERNAL_ERROR_RTEMS_API,
-    FALSE,
-    RTEMS_NOT_CONFIGURED
-  );
-  return RTEMS_NOT_CONFIGURED;
-}
-
-rtems_status_code rtems_timer_reset(
-  Objects_Id id
-)
-{
-  _Internal_error_Occurred(
-    INTERNAL_ERROR_RTEMS_API,
-    FALSE,
-    RTEMS_NOT_CONFIGURED
-  );
-  return RTEMS_NOT_CONFIGURED;
-}
diff --git a/c/src/optman/sapi/no-ext.c b/c/src/optman/sapi/no-ext.c
deleted file mode 100644
index ae72a6e552..0000000000
--- a/c/src/optman/sapi/no-ext.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- *  Extension Manager
- *
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems/system.h>
-#include <rtems/rtems/status.h>
-#include <rtems/rtems/support.h>
-#include <rtems/score/object.h>
-#include <rtems/score/thread.h>
-#include <rtems/extension.h>
-#include <rtems/score/interr.h>
-
-void _Extension_Manager_initialization(
-  unsigned32 maximum_extensions
-)
-{
-}
-
-rtems_status_code rtems_extension_create(
-  rtems_name              name,
-  rtems_extensions_table *extension_table,
-  Objects_Id             *id
-)
-{
-  _Internal_error_Occurred(
-    INTERNAL_ERROR_RTEMS_API,
-    FALSE,
-    RTEMS_NOT_CONFIGURED
-  );
-  return RTEMS_NOT_CONFIGURED;
-}
-
-rtems_status_code rtems_extension_ident(
-  rtems_name    name,
-  Objects_Id   *id
-)
-{
-  _Internal_error_Occurred(
-    INTERNAL_ERROR_RTEMS_API,
-    FALSE,
-    RTEMS_NOT_CONFIGURED
-  );
-  return RTEMS_NOT_CONFIGURED;
-}
-
-rtems_status_code rtems_extension_delete(
-  Objects_Id id
-)
-{
-  _Internal_error_Occurred(
-    INTERNAL_ERROR_RTEMS_API,
-    FALSE,
-    RTEMS_NOT_CONFIGURED
-  );
-  return RTEMS_NOT_CONFIGURED;
-}
diff --git a/c/src/optman/sapi/no-io.c b/c/src/optman/sapi/no-io.c
deleted file mode 100644
index 7b38c436d4..0000000000
--- a/c/src/optman/sapi/no-io.c
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- *  Input/Output Manager
- *
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems/system.h>
-#include <rtems/rtems/status.h>
-#include <rtems/io.h>
-#include <rtems/score/isr.h>
-#include <rtems/score/thread.h>
-#include <rtems/score/interr.h>
-
-void _IO_Manager_initialization(
-  rtems_driver_address_table *driver_table,
-  unsigned32                  number_of_drivers,
-  unsigned32                  number_of_devices
-)
-{
-}
-
-void _IO_Initialize_all_drivers( void )
-{
-}
-
-rtems_status_code rtems_io_register_name(
-    char *device_name,
-    rtems_device_major_number major,
-    rtems_device_minor_number minor
-)
-{
-  _Internal_error_Occurred(
-    INTERNAL_ERROR_RTEMS_API,
-    FALSE,
-    RTEMS_NOT_CONFIGURED
-  );
-  return RTEMS_NOT_CONFIGURED;
-}
-
-rtems_status_code rtems_io_lookup_name(
-    const char *pathname,
-    rtems_driver_name_t **rnp
-)
-{
-  _Internal_error_Occurred(
-    INTERNAL_ERROR_RTEMS_API,
-    FALSE,
-    RTEMS_NOT_CONFIGURED
-  );
-  return RTEMS_NOT_CONFIGURED;
-}
-
-rtems_status_code rtems_io_initialize(
-  rtems_device_major_number  major,
-  rtems_device_minor_number  minor,
-  void             *argument
-)
-{
-  _Internal_error_Occurred(
-    INTERNAL_ERROR_RTEMS_API,
-    FALSE,
-    RTEMS_NOT_CONFIGURED
-  );
-  return RTEMS_NOT_CONFIGURED;
-}
-
-rtems_status_code rtems_io_open(
-  rtems_device_major_number  major,
-  rtems_device_minor_number  minor,
-  void             *argument
-)
-{
-  _Internal_error_Occurred(
-    INTERNAL_ERROR_RTEMS_API,
-    FALSE,
-    RTEMS_NOT_CONFIGURED
-  );
-  return RTEMS_NOT_CONFIGURED;
-}
-
-rtems_status_code rtems_io_close(
-  rtems_device_major_number  major,
-  rtems_device_minor_number  minor,
-  void             *argument
-)
-{
-  _Internal_error_Occurred(
-    INTERNAL_ERROR_RTEMS_API,
-    FALSE,
-    RTEMS_NOT_CONFIGURED
-  );
-  return RTEMS_NOT_CONFIGURED;
-}
-
-rtems_status_code rtems_io_read(
-  rtems_device_major_number  major,
-  rtems_device_minor_number  minor,
-  void             *argument
-)
-{
-  _Internal_error_Occurred(
-    INTERNAL_ERROR_RTEMS_API,
-    FALSE,
-    RTEMS_NOT_CONFIGURED
-  );
-  return RTEMS_NOT_CONFIGURED;
-}
-
-rtems_status_code rtems_io_write(
-  rtems_device_major_number  major,
-  rtems_device_minor_number  minor,
-  void             *argument
-)
-{
-  _Internal_error_Occurred(
-    INTERNAL_ERROR_RTEMS_API,
-    FALSE,
-    RTEMS_NOT_CONFIGURED
-  );
-  return RTEMS_NOT_CONFIGURED;
-}
-
-rtems_status_code rtems_io_control(
-  rtems_device_major_number  major,
-  rtems_device_minor_number  minor,
-  void             *argument
-)
-{
-  _Internal_error_Occurred(
-    INTERNAL_ERROR_RTEMS_API,
-    FALSE,
-    RTEMS_NOT_CONFIGURED
-  );
-  return RTEMS_NOT_CONFIGURED;
-}
diff --git a/c/src/tests/psxtests/include/pmacros.h b/c/src/tests/psxtests/include/pmacros.h
deleted file mode 100644
index 1f15dac9c0..0000000000
--- a/c/src/tests/psxtests/include/pmacros.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- *  $Id$
- */
-
-#ifndef __POSIX_TEST_MACROS_h
-#define __POSIX_TEST_MACROS_h
-
-#include <bsp.h>
-#include <pthread.h>
-#include <assert.h>
-#include <stdio.h>
-#include <string.h>
-#include <time.h>
-#include <unistd.h>
-
-/*
- *  These help manipulate the "struct tm" form of time
- */
-
-#define TM_SUNDAY    0
-#define TM_MONDAY    1
-#define TM_TUESDAY   2
-#define TM_WEDNESDAY 3
-#define TM_THURSDAY  4
-#define TM_FRIDAY    5
-#define TM_SATURDAY  6
- 
-#define TM_JANUARY     0
-#define TM_FEBRUARY    1
-#define TM_MARCH       2
-#define TM_APRIL       3
-#define TM_MAY         4
-#define TM_JUNE        5
-#define TM_JULY        6
-#define TM_AUGUST      7
-#define TM_SEPTEMBER   8
-#define TM_OCTOBER    10
-#define TM_NOVEMBER   12
-#define TM_DECEMBER   12
- 
-#define build_time( TM, WEEKDAY, MON, DAY, YR, HR, MIN, SEC ) \
-  { (TM)->tm_year = YR;  \
-    (TM)->tm_mon  = MON; \
-    (TM)->tm_mday = DAY; \
-    (TM)->tm_wday  = WEEKDAY; \
-    (TM)->tm_hour = HR;  \
-    (TM)->tm_min  = MIN; \
-    (TM)->tm_sec  = SEC; }
-
-#define set_time( WEEKDAY, MON, DAY, YR, HR, MIN, SEC ) \
-  do { \
-    struct tm tm; \
-    struct timespec tv; \
-    int status; \
-    \
-    build_time( &tm, WEEKDAY, MON, DAY, YR, HR, MIN, SEC ); \
-    \
-    tv.tv_sec = mktime( &tm ); \
-    tv.tv_nsec = 0; \
-    assert( tv.tv_sec != -1 ); \
-    \
-    status = clock_settime( CLOCK_REALTIME, &tv ); \
-    assert( !status ); \
-  } while ( 0 ) 
-
-#define print_current_time(s1, s2) \
-  do { \
-    char _buffer[32]; \
-    int  _status; \
-    struct timespec _tv; \
-    \
-    _status = clock_gettime( CLOCK_REALTIME, &_tv ); \
-    assert( !_status ); \
-    \
-    (void) ctime_r( &_tv.tv_sec, _buffer ); \
-    _buffer[ strlen( _buffer ) - 1 ] = 0; \
-    printf( "%s%s%s\n", s1, _buffer, s2 ); \
-    fflush(stdout); \
-  } while ( 0 )
-
-#define empty_line() puts( "" )
-
-#endif
-
-/* end of file */
diff --git a/c/src/wrapup/Makefile.in b/c/src/wrapup/Makefile.in
deleted file mode 100644
index de322d9d04..0000000000
--- a/c/src/wrapup/Makefile.in
+++ /dev/null
@@ -1,71 +0,0 @@
-#
-#  $Id$
-#
-#  build and install "glommed" librtemsall.a
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/lib.cfg
- 
-LIB=$(PROJECT_RELEASE)/lib/librtemsall${LIB_VARIANT}.a
- 
-SRCS=$(wildcard $(PROJECT_RELEASE)/lib/libbsp$(LIB_VARIANT).a) \
-     $(PROJECT_RELEASE)/lib/librtems$(LIB_VARIANT).a \
-     $(wildcard $(PROJECT_RELEASE)/lib/libposix$(LIB_VARIANT).a) \
-     $(wildcard $(PROJECT_RELEASE)/lib/libnetworking$(LIB_VARIANT).a) \
-     $(wildcard $(PROJECT_RELEASE)/lib/libcpu$(LIB_VARIANT).a) \
-     $(PROJECT_RELEASE)/lib/libcsupport$(LIB_VARIANT).a \
-     $(PROJECT_RELEASE)/lib/libmisc$(LIB_VARIANT).a \
-     $(wildcard $(PROJECT_RELEASE)/lib/rtems-ctor$(LIB_VARIANT).o) \
-     $(wildcard $(PROJECT_RELEASE)/lib/libno-ctor$(LIB_VARIANT).a)
- 
-CLEAN_ADDITIONS += $(ARCH)/check
-CLOBBER_ADDITIONS +=
- 
-all:    $(ARCH) $(LIB)
-
-install:  all
-
-$(ARCH)/check:: $(SRCS)
-	@$(RM) $@; touch $@;
-	@for f in $(SRCS); do \
-	  case $$f in \
-	  *.o)   echo " `basename $$f`" >> $@ \
-	    ;; \
-	  *.rel) echo " `basename $$f`" >> $@ \
-	    ;; \
-	  *.a) \
-	  ( list=`$(AR) t $$f`;\
-	    for i in $$list; do \
-	      if grep " $$i" $@; then \
-	        echo "ERROR -- $$i in multiple files"; exit 1; \
-	      fi;\
-	      echo " $$i" >> $@;\
-	    done; ) \
-	    ;; \
-	  esac; \
-	done;
-
-$(LIB):: $(ARCH)/check
-	@for f in $(SRCS); do \
-	  case $$f in \
-	  *.o) $(AR) ru $@ $$f \
-	    ;;\
-	  *.rel) $(AR) ru $@ $$f \
-	    ;;\
-	  *.a) \
-	    (cd $(ARCH); \
-	    list=`$(AR) t $$f`; \
-	    $(AR) x $$f $$list; $(AR) ru $@ $$list; \
-	    $(RM) $$list ;)\
-	    ;; \
-	  esac; \
-	done;
-	@$(RANLIB) $@
-	@echo "*** Glommed $@"
diff --git a/cpukit/ada/rtems.adb b/cpukit/ada/rtems.adb
deleted file mode 100644
index 9bd7432be1..0000000000
--- a/cpukit/ada/rtems.adb
+++ /dev/null
@@ -1,2035 +0,0 @@
---
---  RTEMS / Body
---  DESCRIPTION:
---
---  This package provides the interface to the RTEMS API.
---  
---
---  DEPENDENCIES:
---
---
---
---  COPYRIGHT (c) 1997.
---  On-Line Applications Research Corporation (OAR).
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with Ada;
-with Ada.Unchecked_Conversion;
-with System;
-with Interfaces; use Interfaces;
-with Interfaces.C;
-
-package body RTEMS is
-
-   --
-   --  Utility Functions
-   --
- 
-   function From_Ada_Boolean (
-      Ada_Boolean : Standard.Boolean
-   ) return RTEMS.Boolean is
-   begin
-
-      if Ada_Boolean = Standard.True then
-         return RTEMS.True;
-      end if;
-
-      return RTEMS.False;
-
-   end From_Ada_Boolean;
- 
-   function To_Ada_Boolean (
-      RTEMS_Boolean : RTEMS.Boolean
-   ) return Standard.Boolean is
-   begin
-
-      if RTEMS_Boolean = RTEMS.True then
-         return Standard.True;
-      end if;
-
-      return Standard.False;
-
-   end To_Ada_Boolean;
-
-   function Milliseconds_To_Microseconds (
-      Milliseconds : RTEMS.Unsigned32
-   ) return RTEMS.Unsigned32 is
-   begin
-
-      return Milliseconds * 1000;
-
-   end Milliseconds_To_Microseconds;
-
-   function Microseconds_To_Ticks (
-      Microseconds : RTEMS.Unsigned32
-   ) return RTEMS.Interval is
-      Microseconds_Per_Tick : RTEMS.Interval;
-      pragma Import (C, Microseconds_Per_Tick, "_TOD_Microseconds_per_tick");
-   begin
-
-      return Microseconds / Microseconds_Per_Tick; 
-
-   end Microseconds_To_Ticks;
-
-   function Milliseconds_To_Ticks (
-      Milliseconds : RTEMS.Unsigned32
-   ) return RTEMS.Interval is
-   begin
-
-      return Microseconds_To_Ticks(Milliseconds_To_Microseconds(Milliseconds));
-
-   end Milliseconds_To_Ticks;
-
-   function Build_Name (
-      C1 : in     Character;
-      C2 : in     Character;
-      C3 : in     Character;
-      C4 : in     Character
-   ) return RTEMS.Name is
-      C1_Value : RTEMS.Unsigned32;
-      C2_Value : RTEMS.Unsigned32;
-      C3_Value : RTEMS.Unsigned32;
-      C4_Value : RTEMS.Unsigned32;
-   begin
-
-     C1_Value := Character'Pos( C1 );
-     C2_Value := Character'Pos( C2 );
-     C3_Value := Character'Pos( C3 );
-     C4_Value := Character'Pos( C4 );
-
-     return Interfaces.Shift_Left( C1_Value, 24 ) or
-            Interfaces.Shift_Left( C2_Value, 16 ) or
-            Interfaces.Shift_Left( C3_Value, 8 )  or
-            C4_Value;
-
-   end Build_Name;
-
-   procedure Name_To_Characters (
-      Name : in     RTEMS.Name;
-      C1   :    out Character;
-      C2   :    out Character;
-      C3   :    out Character;
-      C4   :    out Character
-   ) is
-      C1_Value : RTEMS.Unsigned32;
-      C2_Value : RTEMS.Unsigned32;
-      C3_Value : RTEMS.Unsigned32;
-      C4_Value : RTEMS.Unsigned32;
-   begin
-
-     C1_Value := Interfaces.Shift_Right( Name, 24 );
-     C2_Value := Interfaces.Shift_Right( Name, 16 );
-     C3_Value := Interfaces.Shift_Right( Name, 8 );
-     C4_Value := Name;
-
-     C1_Value := C1_Value and 16#00FF#;
-     C2_Value := C2_Value and 16#00FF#;
-     C3_Value := C3_Value and 16#00FF#;
-     C4_Value := C4_Value and 16#00FF#;
-
-     C1 := Character'Val( C1_Value );
-     C2 := Character'Val( C2_Value );
-     C3 := Character'Val( C3_Value );
-     C4 := Character'Val( C4_Value );
-
-   end Name_To_Characters;
-
-   function Get_Node (
-      ID : in     RTEMS.ID
-   ) return RTEMS.Unsigned32 is
-   begin
-
-      -- May not be right
-      return Interfaces.Shift_Right( ID, 16 );
-
-   end Get_Node;
-
-   function Get_Index (
-      ID : in     RTEMS.ID
-   ) return RTEMS.Unsigned32 is
-   begin
-
-      -- May not be right
-      return ID and 16#FFFF#;
-
-   end Get_Index;
-
-
-   function Are_Statuses_Equal (
-      Status  : in     RTEMS.Status_Codes;
-      Desired : in     RTEMS.Status_Codes
-   ) return Standard.Boolean is
-   begin
-
-      if Status = Desired then
-         return Standard.True;
-      end if;
-
-      return Standard.False;
-
-   end Are_Statuses_Equal;
-
-   function Is_Status_Successful (
-      Status  : in     RTEMS.Status_Codes
-   ) return Standard.Boolean is
-   begin
-
-      if Status = RTEMS.Successful then
-         return Standard.True;
-      end if;
-
-      return Standard.False;
-
-   end Is_Status_Successful;
-
-   function Subtract (
-      Left   : in     RTEMS.Address;
-      Right  : in     RTEMS.Address
-   ) return RTEMS.Unsigned32 is
-      function To_Unsigned32 is
-         new Ada.Unchecked_Conversion (System.Address, RTEMS.Unsigned32);
-
-   begin
-      return To_Unsigned32(Left) - To_Unsigned32(Right);
-   end Subtract;
-
-   function Are_Equal (
-      Left   : in     RTEMS.Address;
-      Right  : in     RTEMS.Address
-   ) return Standard.Boolean is
-      function To_Unsigned32 is
-         new Ada.Unchecked_Conversion (System.Address, RTEMS.Unsigned32);
-
-   begin
-      return (To_Unsigned32(Left) = To_Unsigned32(Right));
-   end Are_Equal;
-
-
-   --
-   --
-   --  RTEMS API
-   --
-
-   --
-   --  Initialization Manager
-   --
-
-   procedure Initialize_Executive (
-      Configuration_Table   : in     RTEMS.Configuration_Table_Pointer;
-      CPU_Table             : in     RTEMS.CPU_Table_Pointer
-   ) is
-      procedure Initialize_Executive_Base (
-         Configuration_Table   : in     RTEMS.Configuration_Table_Pointer;
-         CPU_Table             : in     RTEMS.CPU_Table_Pointer
-      );
-      pragma Import (C, Initialize_Executive_Base,
-         "rtems_initialize_executive");
-
-   begin
-
-      Initialize_Executive_Base (Configuration_Table, CPU_Table);
-
-   end Initialize_Executive;
- 
-   procedure Initialize_Executive_Early (
-      Configuration_Table : in     RTEMS.Configuration_Table_Pointer;
-      CPU_Table           : in     RTEMS.CPU_Table_Pointer;
-      Level               :    out RTEMS.ISR_Level
-   ) is
-      function Initialize_Executive_Early_Base (
-         Configuration_Table   : in     RTEMS.Configuration_Table_Pointer;
-         CPU_Table             : in     RTEMS.CPU_Table_Pointer
-      ) return RTEMS.ISR_Level;
-      pragma Import (C, Initialize_Executive_Early_Base,
-         "rtems_initialize_executive_early");
-
-   begin
-
-      Level := Initialize_Executive_Early_Base (Configuration_Table, CPU_Table);
-
-   end Initialize_Executive_Early;
-
-   procedure Initialize_Executive_Late (
-      BSP_Level : in    RTEMS.ISR_Level
-   ) is
-      procedure Initialize_Executive_Late_Base (
-         Level : in     RTEMS.ISR_Level
-      );
-      pragma Import (C, Initialize_Executive_Late_Base,
-         "rtems_initialize_executive_late");
-
-   begin
-
-      Initialize_Executive_Late_Base (BSP_Level);
-
-   end Initialize_Executive_Late;
-
-   procedure Shutdown_Executive (
-      Result : in     RTEMS.Unsigned32
-   ) is
-      procedure Shutdown_Executive_Base;
-      pragma Import (C,Shutdown_Executive_Base,"rtems_shutdown_executive");
-   begin
-
-      Shutdown_Executive_Base;
-
-   end Shutdown_Executive;
-
-
-   --
-   --  Task Manager
-   --
-
-   procedure Task_Create (
-      Name             : in     RTEMS.Name;
-      Initial_Priority : in     RTEMS.Task_Priority;
-      Stack_Size       : in     RTEMS.Unsigned32;
-      Initial_Modes    : in     RTEMS.Mode;
-      Attribute_Set    : in     RTEMS.Attribute;
-      ID               :    out RTEMS.ID;
-      Result           :    out RTEMS.Status_Codes
-   ) is
-      function Task_Create_Base (
-         Name             : RTEMS.Name;
-         Initial_Priority : RTEMS.Task_Priority;
-         Stack_Size       : RTEMS.Unsigned32;
-         Initial_Modes    : RTEMS.Mode;
-         Attribute_Set    : RTEMS.Attribute;
-         ID               : access RTEMS.ID
-      )  return RTEMS.Status_Codes;
-         pragma Import (C, Task_Create_Base, "rtems_task_create");
-         ID_Base : aliased RTEMS.ID := ID;
-   begin
-      Result := Task_Create_Base (
-                   Name,
-                   Initial_Priority,
-                   Stack_Size,
-                   Initial_Modes,
-                   Attribute_Set,
-                   ID_Base'Unchecked_Access
-                );
-      ID := ID_Base;
-   end Task_Create;
-
-
-   procedure Task_Ident (
-      Name             : in     RTEMS.Name;
-      Node             : in     RTEMS.Node;
-      ID               :    out RTEMS.ID;
-      Result           :    out RTEMS.Status_Codes
-   ) is
-
-      function Task_Ident_Base (
-         Name             : RTEMS.Name;
-         Node             : RTEMS.Node;
-         ID               : access RTEMS.ID
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Task_Ident_Base, "rtems_task_ident");
-      ID_Base     : aliased RTEMS.ID := ID;
-
-   begin
-
-      Result := Task_Ident_Base (
-                        Name,
-                        Node,
-                        ID_Base'Unchecked_Access
-                     );
-
-      ID := ID_Base;
-
-   end Task_Ident;
-
-   procedure Task_Start (
-      ID          : in     RTEMS.ID;
-      Entry_Point : in     RTEMS.Task_Entry;
-      Argument    : in     RTEMS.Task_Argument;
-      Result      :    out RTEMS.Status_Codes
-   ) is
-
-      function Task_Start_Base (
-         ID          : RTEMS.ID;
-         Entry_Point : RTEMS.Task_Entry;
-         Argument    : RTEMS.Task_Argument
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Task_Start_Base, "rtems_task_start");
-
-   begin
-
-      Result := Task_Start_Base (
-                        ID,
-                        Entry_Point,
-                        Argument
-                     );
-
-   end Task_Start;
-
-   procedure Task_Restart (
-      ID       : in     RTEMS.ID;
-      Argument : in     RTEMS.Task_Argument;
-      Result   :    out RTEMS.Status_Codes
-   ) is
-      function Task_Restart_Base (
-         ID       : RTEMS.ID;
-         Argument : RTEMS.Task_Argument
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Task_Restart_Base, "rtems_task_restart");
-   begin
-
-      Result := Task_Restart_Base (
-                        ID,
-                        Argument
-                     );
- 
-   end Task_Restart;
- 
-   procedure Task_Delete (
-      ID     : in     RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   ) is
-      function Task_Delete_Base (
-         ID : RTEMS.ID
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Task_Delete_Base, "rtems_task_delete");
-   begin
-
-      Result := Task_Delete_Base ( ID );
- 
-   end Task_Delete;
- 
-   procedure Task_Suspend (
-      ID     : in     RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   ) is
-      function Task_Suspend_Base (
-         ID : RTEMS.ID
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Task_Suspend_Base, "rtems_task_suspend");
-   begin
-
-      Result := Task_Suspend_Base ( ID );
- 
-   end Task_Suspend;
- 
-   procedure Task_Resume (
-      ID     : in     RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   ) is
-      function Task_Resume_Base (
-         ID : RTEMS.ID
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Task_Resume_Base, "rtems_task_resume");
-   begin
-
-      Result := Task_Resume_Base ( ID );
-
-   end Task_Resume;
- 
-   procedure Task_Set_Priority (
-      ID           : in     RTEMS.ID;
-      New_Priority : in     RTEMS.Task_Priority;
-      Old_Priority :    out RTEMS.Task_Priority;
-      Result       :    out RTEMS.Status_Codes
-   ) is
-      function Task_Set_Priority_Base (
-         ID           : RTEMS.ID;
-         New_Priority : RTEMS.Task_Priority;
-         Old_Priority : access RTEMS.Task_Priority
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Task_Set_Priority_Base, "rtems_task_set_priority");
-      Old_Priority_Base : aliased RTEMS.Task_Priority := Old_Priority;
- 
-   begin
- 
-      Result := Task_Set_Priority_Base (
-                        ID,
-                        New_Priority,
-                        Old_Priority_Base'Unchecked_Access
-                     );
- 
-      Old_Priority := Old_Priority_Base;
-
-   end Task_Set_Priority;
- 
-   procedure Task_Mode (
-      Mode_Set          : in     RTEMS.Mode;
-      Mask              : in     RTEMS.Mode;
-      Previous_Mode_Set :    out RTEMS.Mode;
-      Result            :    out RTEMS.Status_Codes
-   ) is
-      function Task_Mode_Base (
-         Mode_Set          : RTEMS.Mode;
-         Mask              : RTEMS.Mode;
-         Previous_Mode_Set : access RTEMS.Mode
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Task_Mode_Base, "rtems_task_mode");
-      Previous_Mode_Set_Base : aliased RTEMS.Mode := Previous_Mode_Set;
-   begin
-
-      Result := Task_Mode_Base (
-         Mode_Set,
-         Mask,
-         Previous_Mode_Set_Base'Unchecked_Access
-      );
-
-      Previous_Mode_Set := Previous_Mode_Set_Base;
-
-   end Task_Mode;
- 
-   procedure Task_Get_Note (
-      ID      : in     RTEMS.ID;
-      Notepad : in     RTEMS.Notepad_Index;
-      Note    :    out RTEMS.Unsigned32;
-      Result  :    out RTEMS.Status_Codes
-   ) is
-      function Task_Get_Note_Base (
-         ID      : RTEMS.ID;
-         Notepad : RTEMS.Notepad_Index;
-         Note    : access RTEMS.Unsigned32
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Task_Get_Note_Base, "rtems_task_get_note");
-      Note_Base : aliased RTEMS.Unsigned32 := Note;
-   begin
-
-      Result := Task_Get_Note_Base (
-         ID,
-         Notepad,
-         Note_Base'Unchecked_Access
-      );
- 
-      Note := NOTE_Base;
-
-   end Task_Get_Note;
- 
-   procedure Task_Set_Note (
-      ID      : in     RTEMS.ID;
-      Notepad : in     RTEMS.Notepad_Index;
-      Note    : in     RTEMS.Unsigned32;
-      Result  :    out RTEMS.Status_Codes
-   ) is
-      function Task_Set_Note_Base (
-         ID      : RTEMS.ID;
-         Notepad : RTEMS.Notepad_Index;
-         Note    : RTEMS.Unsigned32
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Task_Set_Note_Base, "rtems_task_set_note");
-   begin
-
-      Result := Task_Set_Note_Base ( ID, Notepad, Note );
-
-   end Task_Set_Note;
- 
-   procedure Task_Wake_When (
-      Time_Buffer : in     RTEMS.Time_Of_Day;
-      Result      :    out RTEMS.Status_Codes
-   ) is
-      function Task_Wake_When_Base (
-         Time_Buffer : RTEMS.Time_Of_Day
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Task_Wake_When_Base, "rtems_task_wake_when");
-   begin
-
-      Result := Task_Wake_When_Base ( Time_Buffer );
-
-   end Task_Wake_When;
- 
-   procedure Task_Wake_After (
-      Ticks  : in     RTEMS.Interval;
-      Result :    out RTEMS.Status_Codes
-   ) is
-      function Task_Wake_After_Base (
-         Ticks : RTEMS.Interval
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Task_Wake_After_Base, "rtems_task_wake_after");
-   begin
-
-      Result := Task_Wake_After_Base ( Ticks );
-
-   end Task_Wake_After;
- 
-   --
-   -- Interrupt Manager
-   --
-
-   procedure Interrupt_Catch (
-      New_ISR_Handler : in     RTEMS.Address;
-      Vector          : in     RTEMS.Vector_Number;
-      Old_ISR_Handler :    out RTEMS.Address;
-      Result          :    out RTEMS.Status_Codes
-   ) is
-      function Interrupt_Catch_Base (
-         New_ISR_Handler : RTEMS.Address;
-         Vector          : RTEMS.Vector_Number;
-         Old_ISR_Handler : access RTEMS.Address
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Interrupt_Catch_Base, "rtems_interrupt_catch");
-      Old_ISR_Handler_Base : aliased RTEMS.Address := Old_ISR_Handler;
-   begin
- 
-      Result := Interrupt_Catch_Base (
-         New_ISR_Handler,
-         Vector,
-         OLD_ISR_HANDLER_Base'Unchecked_Access
-      );
- 
-      Old_ISR_Handler := OLD_ISR_HANDLER_Base;
- 
-   end Interrupt_Catch;
-
-   -- XXX
-   function Interrupt_Disable
-   return RTEMS.ISR_Level is
-   begin
-      return 0;
-   end Interrupt_Disable;
-
-   procedure Interrupt_Enable (
-      Level : in     RTEMS.ISR_Level
-   ) is
-   begin
-      Null;
-   end Interrupt_Enable;
-
-   procedure Interrupt_Flash (
-      Level : in     RTEMS.ISR_Level
-   ) is
-   begin
-      Null;
-   end Interrupt_Flash;
-
-   function Interrupt_Is_In_Progress
-   return RTEMS.Boolean is
-   begin
-      return RTEMS.From_Ada_Boolean (Standard.True);
-   end Interrupt_Is_In_Progress;
-
-   --
-   -- Clock Manager
-   -- 
- 
-   procedure Clock_Get (
-      Option      : in     RTEMS.Clock_Get_Options;
-      Time_Buffer : in     RTEMS.Address;
-      Result      :    out RTEMS.Status_Codes
-   ) is
-      function Clock_Get_base (
-         Option      : RTEMS.Clock_Get_Options;
-         Time_Buffer : RTEMS.Address
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Clock_Get_base, "rtems_clock_get");
-   begin
-
-      Result := Clock_Get_base ( Option, Time_Buffer );
-
-   end Clock_Get;
- 
-   procedure Clock_Set (
-      Time_Buffer : in     RTEMS.Time_Of_Day;
-      Result      :    out RTEMS.Status_Codes
-   ) is
-      function Clock_Set_base (
-         Time_Buffer : RTEMS.Time_Of_Day
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Clock_Set_base, "rtems_clock_set");
-   begin
- 
-      Result := Clock_Set_base ( Time_Buffer );
-
-   end Clock_Set;
- 
-   procedure Clock_Tick (
-      Result :    out RTEMS.Status_Codes
-   ) is
-      function Clock_Tick_Base return RTEMS.Status_Codes;
-      pragma Import (C, Clock_Tick_Base, "rtems_clock_tick");
-   begin
-
-      Result := Clock_Tick_Base;
-
-   end Clock_Tick;
- 
-   --
-   -- Extension Manager
-   --
- 
-   procedure Extension_Create (
-      Name   : in     RTEMS.Name;
-      Table  : in     RTEMS.Extensions_Table_Pointer;
-      ID     :    out RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   ) is
-      function Extension_Create_Base (
-         Name   : RTEMS.Name;
-         Table  : RTEMS.Extensions_Table_Pointer;
-         ID     : access RTEMS.ID
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Extension_Create_Base, "rtems_extension_create");
-      ID_Base : aliased RTEMS.ID := ID;
-   begin
- 
-      Result := Extension_Create_Base (
-         Name,
-         Table,
-         ID_Base'Unchecked_Access
-      );
- 
-      ID := ID_Base;
-
-   end Extension_Create;
- 
-   procedure Extension_Ident (
-      Name   : in     RTEMS.Name;
-      ID     :    out RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   ) is
-      function Extension_Ident_Base (
-         Name   : RTEMS.Name;
-         ID     : access RTEMS.ID
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Extension_Ident_Base, "rtems_extension_ident");
-      ID_Base : aliased RTEMS.ID := ID;
-   begin
- 
-      Result := Extension_Ident_Base (
-         Name,
-         ID_Base'Unchecked_Access
-      );
- 
-      ID := ID_Base;
-
-   end Extension_Ident;
- 
-   procedure Extension_Delete (
-      ID     : in     RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   ) is
-      function Extension_Delete_Base (
-         ID : RTEMS.ID
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Extension_Delete_Base, "rtems_extension_delete");
-   begin
- 
-      Result := Extension_Delete_Base ( ID );
-
-   end Extension_Delete;
- 
-   --
-   -- Timer Manager
-   --
- 
-   procedure Timer_Create (
-      Name   : in     RTEMS.Name;
-      ID     :    out RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   ) is
-      function Timer_Create_Base (
-         Name   : RTEMS.Name;
-         ID     : access RTEMS.ID
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Timer_Create_Base, "rtems_timer_create");
-      ID_Base : aliased RTEMS.ID := ID;
-   begin
- 
-      Result := Timer_Create_Base (
-         Name,
-         ID_Base'Unchecked_Access
-      );
- 
-      ID := ID_Base;
-
-   end Timer_Create;
- 
-   procedure Timer_Ident (
-      Name   : in     RTEMS.Name;
-      ID     :    out RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   ) is
-      function Timer_Ident_Base (
-         Name   : RTEMS.Name;
-         ID     : access RTEMS.ID
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Timer_Ident_Base, "rtems_timer_ident");
-      ID_Base : aliased RTEMS.ID := ID;
-   begin
- 
-      Result := Timer_Ident_Base (
-         Name,
-         ID_Base'Unchecked_Access
-      );
- 
-      ID := ID_Base;
-
-   end Timer_Ident;
- 
-   procedure Timer_Delete (
-      ID     : in     RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   ) is
-      function Timer_Delete_Base (
-         ID : RTEMS.ID
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Timer_Delete_Base, "rtems_timer_delete");
-   begin
- 
-      Result := Timer_Delete_Base ( ID );
-
-   end Timer_Delete;
- 
-   procedure Timer_Fire_After (
-      ID        : in     RTEMS.ID;
-      Ticks     : in     RTEMS.Interval;
-      Routine   : in     RTEMS.Timer_Service_Routine;
-      User_Data : in     RTEMS.Address;
-      Result    :    out RTEMS.Status_Codes
-   ) is
-      function Timer_Fire_After_Base (
-         ID        : RTEMS.ID;
-         Ticks     : RTEMS.Interval;
-         Routine   : RTEMS.Timer_Service_Routine;
-         User_Data : RTEMS.Address
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Timer_Fire_After_Base, "rtems_timer_fire_after");
-   begin
- 
-      Result := Timer_Fire_After_Base ( 
-                   ID,
-                   Ticks,
-                   Routine,
-                   User_Data
-                );
-
-   end Timer_Fire_After;
- 
-   procedure Timer_Fire_When (
-      ID        : in     RTEMS.ID;
-      Wall_Time : in     RTEMS.Time_Of_Day;
-      Routine   : in     RTEMS.Timer_Service_Routine;
-      User_Data : in     RTEMS.Address;
-      Result    :    out RTEMS.Status_Codes
-   ) is
-      function Timer_Fire_When (
-         ID        : RTEMS.ID;
-         Wall_Time : in     RTEMS.Time_Of_Day;
-         Routine   : RTEMS.Timer_Service_Routine;
-         User_Data : RTEMS.Address
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Timer_Fire_When, "rtems_timer_fire_when");
-   begin
- 
-      Result := Timer_Fire_When ( 
-                   ID,
-                   Wall_Time,
-                   Routine,
-                   User_Data
-                );
-
-   end Timer_Fire_When;
- 
-   procedure Timer_Reset (
-      ID     : in     RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   ) is
-      function Timer_Reset_Base (
-         ID : RTEMS.ID
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Timer_Reset_Base, "rtems_timer_reset");
-   begin
- 
-      Result := Timer_Reset_Base ( ID );
-
-   end Timer_Reset;
- 
-   procedure Timer_Cancel (
-      ID     : in     RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   ) is
-      function Timer_Cancel_Base (
-         ID : RTEMS.ID
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Timer_Cancel_Base, "rtems_timer_cancel");
-   begin
- 
-      Result := Timer_Cancel_Base ( ID );
-
-   end Timer_Cancel;
- 
-   --
-   -- Semaphore Manager
-   --
- 
-   procedure Semaphore_Create (
-      Name             : in     RTEMS.Name;
-      Count            : in     RTEMS.Unsigned32;
-      Attribute_Set    : in     RTEMS.Attribute;
-      Priority_Ceiling : in     RTEMS.Task_Priority;
-      ID               :    out RTEMS.ID;
-      Result           :    out RTEMS.Status_Codes
-   ) is
-      function Semaphore_Create_Base (
-         Name             : RTEMS.Name;
-         Count            : RTEMS.Unsigned32;
-         Attribute_Set    : RTEMS.Attribute;
-         Priority_Ceiling : RTEMS.Task_Priority;
-         ID               : access RTEMS.ID
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Semaphore_Create_Base, "rtems_semaphore_create");
-      ID_Base : aliased RTEMS.ID := ID;
-   begin
- 
-      Result := Semaphore_Create_Base (
-         Name,
-         Count,
-         Attribute_Set,
-         Priority_Ceiling,
-         ID_Base'Unchecked_Access
-      );
- 
-      ID := ID_Base;
-
-   end Semaphore_Create;
- 
-   procedure Semaphore_Delete (
-      ID     : in     RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   ) is
-      function Semaphore_Delete_Base (
-         ID : RTEMS.ID
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Semaphore_Delete_Base, "rtems_semaphore_delete");
-   begin
- 
-      Result := Semaphore_Delete_Base ( ID );
-
-   end Semaphore_Delete;
- 
-   procedure Semaphore_Ident (
-      Name   : in     RTEMS.Name;
-      Node   : in     RTEMS.Unsigned32;
-      ID     :    out RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   ) is
-      function Semaphore_Ident_Base (
-         Name : RTEMS.Name;
-         Node : RTEMS.Unsigned32;
-         ID   : access RTEMS.ID
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Semaphore_Ident_Base, "rtems_semaphore_ident");
-      ID_Base : aliased RTEMS.ID := ID;
-   begin
- 
-      Result := Semaphore_Ident_Base (
-         Name,
-         Node,
-         ID_Base'Unchecked_Access
-      );
- 
-      ID := ID_Base;
-
-   end Semaphore_Ident;
- 
-   procedure Semaphore_Obtain (
-      ID         : in     RTEMS.ID;
-      Option_Set : in     RTEMS.Option;
-      Timeout    : in     RTEMS.Interval;
-      Result     :    out RTEMS.Status_Codes
-   ) is
-      function Semaphore_Obtain_Base (
-         ID         : RTEMS.ID;
-         Option_Set : RTEMS.Option;
-         Timeout    : RTEMS.Interval
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Semaphore_Obtain_Base, "rtems_semaphore_obtain");
-   begin
- 
-      Result := Semaphore_Obtain_Base ( ID, Option_Set, Timeout );
-
-   end Semaphore_Obtain;
- 
-   procedure Semaphore_Release (
-      ID     : in     RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   ) is
-      function Semaphore_Release_Base (
-         ID : RTEMS.ID
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Semaphore_Release_Base, "rtems_semaphore_release");
-   begin
- 
-      Result := Semaphore_Release_Base ( ID );
-
-   end Semaphore_Release;
- 
-   --
-   -- Message Queue Manager
-   --
- 
-   procedure Message_Queue_Create (
-      Name             : in     RTEMS.Name;
-      Count            : in     RTEMS.Unsigned32;
-      Max_Message_Size : in     RTEMS.Unsigned32;
-      Attribute_Set    : in     RTEMS.Attribute;
-      ID               :    out RTEMS.ID;
-      Result           :    out RTEMS.Status_Codes
-   ) is
-      --  XXX broken
-      function Message_Queue_Create_Base (
-         Name             : RTEMS.Name;
-         Count            : RTEMS.Unsigned32;
-         Max_Message_Size : RTEMS.Unsigned32;
-         Attribute_Set    : RTEMS.Attribute;
-         ID               : access RTEMS.ID
-      )  return RTEMS.Status_Codes;
-      pragma Import (C,
-        Message_Queue_Create_Base, "rtems_message_queue_create");
-      ID_Base : aliased RTEMS.ID := ID;
-   begin
- 
-      Result := Message_Queue_Create_Base (
-         Name,
-         Count,
-         Max_Message_Size,
-         Attribute_Set,
-         ID_Base'Unchecked_Access
-      );
- 
-      ID := ID_Base;
-
-   end Message_Queue_Create;
- 
-   procedure Message_Queue_Ident (
-      Name   : in     RTEMS.Name;
-      Node   : in     RTEMS.Unsigned32;
-      ID     :    out RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   ) is
-      function Message_Queue_Ident_Base (
-         Name : RTEMS.Name;
-         Node : RTEMS.Unsigned32;
-         ID   : access RTEMS.ID
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Message_Queue_Ident_Base, "rtems_message_queue_ident");
-      ID_Base : aliased RTEMS.ID := ID;
-   begin
- 
-      Result := Message_Queue_Ident_Base (
-         Name,
-         Node,
-         ID_Base'Unchecked_Access
-      );
- 
-      ID := ID_Base;
-
-   end Message_Queue_Ident;
- 
-   procedure Message_Queue_Delete (
-      ID     : in     RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   ) is
-      function Message_Queue_Delete_Base (
-         ID : RTEMS.ID
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Message_Queue_Delete_Base,
-         "rtems_message_queue_delete");
-   begin
- 
-      Result := Message_Queue_Delete_Base ( ID );
-
-   end Message_Queue_Delete;
- 
-   procedure Message_Queue_Send (
-      ID     : in     RTEMS.ID;
-      Buffer : in     RTEMS.Address;
-      Size   : in     RTEMS.Unsigned32;
-      Result :    out RTEMS.Status_Codes
-   ) is
-      function Message_Queue_Send_Base (
-         ID     : RTEMS.ID;
-         Buffer : RTEMS.Address;
-         Size   : RTEMS.Unsigned32
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Message_Queue_Send_Base, "rtems_message_queue_send");
-   begin
- 
-      Result := Message_Queue_Send_Base ( ID, Buffer, Size );
-
-   end Message_Queue_Send;
- 
-   procedure Message_Queue_Urgent (
-      ID     : in     RTEMS.ID;
-      Buffer : in     RTEMS.Address;
-      Size   : in     RTEMS.Unsigned32;
-      Result :    out RTEMS.Status_Codes
-   ) is
-      function Message_Queue_Urgent_Base (
-         ID     : RTEMS.ID;
-         Buffer : RTEMS.Address;
-         Size   : RTEMS.Unsigned32
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Message_Queue_Urgent_Base,
-         "rtems_message_queue_urgent");
-   begin
- 
-      Result := Message_Queue_Urgent_Base ( ID, Buffer, Size );
-
-   end Message_Queue_Urgent;
- 
-   procedure Message_Queue_Broadcast (
-      ID     : in     RTEMS.ID;
-      Buffer : in     RTEMS.Address;
-      Size   : in     RTEMS.Unsigned32;
-      Count  :    out RTEMS.Unsigned32;
-      Result :    out RTEMS.Status_Codes
-   ) is
-      function Message_Queue_Broadcast_Base (
-         ID     : RTEMS.ID;
-         Buffer : RTEMS.Address;
-         Size   : RTEMS.Unsigned32;
-         Count  : access RTEMS.Unsigned32 
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Message_Queue_Broadcast_Base,
-         "rtems_message_queue_broadcast");
-      Count_Base : aliased RTEMS.Unsigned32 := Count;
-   begin
- 
-      Result := Message_Queue_Broadcast_Base ( 
-                   ID, 
-                   Buffer, 
-                   Size,
-                   Count_Base'Unchecked_Access
-                );
- 
-      Count := Count_Base;
-
-   end Message_Queue_Broadcast;
- 
-   procedure Message_Queue_Receive (
-      ID         : in     RTEMS.ID;
-      Buffer     : in     RTEMS.Address;
-      Option_Set : in     RTEMS.Option;
-      Timeout    : in     RTEMS.Interval;
-      Size       :    out RTEMS.Unsigned32;
-      Result     :    out RTEMS.Status_Codes
-   ) is
-      function Message_Queue_Receive_Base (
-         ID         : RTEMS.ID;
-         Buffer     : RTEMS.Address;
-         Size       : access RTEMS.Unsigned32;
-         Option_Set : RTEMS.Option;
-         Timeout    : RTEMS.Interval
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Message_Queue_Receive_Base,
-         "rtems_message_queue_receive");
-      Size_Base : aliased RTEMS.Unsigned32;
-   begin
- 
-      Result := Message_Queue_Receive_Base ( 
-                   ID,
-                   Buffer, 
-                   Size_Base'Unchecked_Access,
-                   Option_Set, 
-                   Timeout 
-                 );
-
-      Size := Size_Base;
-
-   end Message_Queue_Receive;
- 
-   procedure Message_Queue_Flush (
-      ID     : in     RTEMS.ID;
-      Count  :    out RTEMS.Unsigned32;
-      Result :    out RTEMS.Status_Codes
-   ) is
-      function Message_Queue_Flush_Base (
-         ID    : RTEMS.ID;
-         Count : access RTEMS.Unsigned32
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Message_Queue_Flush_Base, "rtems_message_queue_flush");
-      COUNT_Base : aliased RTEMS.Unsigned32 := Count;
-   begin
- 
-      Result := Message_Queue_Flush_Base (
-                   ID,
-                   COUNT_Base'Unchecked_Access
-                );
- 
-      Count := COUNT_Base;
-
-   end Message_Queue_Flush;
- 
-
-   --
-   -- Event Manager
-   --
-
-   procedure Event_Send (
-      ID       : in     RTEMS.ID;
-      Event_In : in     RTEMS.Event_Set;
-      Result   :    out RTEMS.Status_Codes
-   ) is
-      function Event_Send_Base (
-         ID       : RTEMS.ID;
-         Event_In : RTEMS.Event_Set
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Event_Send_Base, "rtems_event_send");
-   begin
-
-      Result := Event_Send_Base (
-                   ID,
-                   Event_In
-                );
-
-   end Event_Send;
-
-   procedure Event_Receive (
-      Event_In   : in     RTEMS.Event_Set;
-      Option_Set : in     RTEMS.Option;
-      Ticks      : in     RTEMS.Interval;
-      Event_Out  :    out RTEMS.Event_Set;
-      Result     :    out RTEMS.Status_Codes
-   ) is
-      function Event_Receive_Base (
-         Event_In   : RTEMS.Event_Set;
-         Option_Set : RTEMS.Option;
-         Ticks      : RTEMS.Interval;
-         Event_Out  : access RTEMS.Event_Set
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Event_Receive_Base, "rtems_event_receive");
-      Event_Out_Base : aliased RTEMS.Event_Set; -- := Event_Out;
-   begin
-
-      Result := Event_Receive_Base (
-                   Event_In,
-                   Option_Set,
-                   Ticks,
-                   Event_Out_Base'Access
-                );
-
-      Event_Out := Event_Out_Base;
-
-   end Event_Receive;
-
-   --
-   -- Signal Manager
-   --
- 
-   procedure Signal_Catch (
-      ASR_Handler : in     RTEMS.ASR_Handler;
-      Mode_Set    : in     RTEMS.Mode;
-      Result      :    out RTEMS.Status_Codes
-   ) is
-      function Signal_Catch_Base (
-         ASR_Handler : RTEMS.ASR_Handler;
-         Mode_Set    : RTEMS.Mode
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Signal_Catch_Base, "rtems_signal_catch");
-   begin
-
-      Result := Signal_Catch_Base ( ASR_Handler, Mode_Set );
-
-   end Signal_Catch;
- 
-   procedure Signal_Send (
-      ID         : in     RTEMS.ID;
-      Signal_Set : in     RTEMS.Signal_Set;
-      Result     :    out RTEMS.Status_Codes
-   ) is
-      function Signal_Send_Base (
-         ID         : RTEMS.ID;
-         Signal_Set : RTEMS.Signal_Set
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Signal_Send_Base, "rtems_signal_send");
-   begin
- 
-      Result := Signal_Send_Base ( ID, Signal_Set );
-
-   end Signal_Send;
- 
- 
-   --
-   -- Partition Manager
-   --
- 
-   procedure Partition_Create (
-      Name             : in     RTEMS.Name;
-      Starting_Address : in     RTEMS.Address;
-      Length           : in     RTEMS.Unsigned32;
-      Buffer_Size      : in     RTEMS.Unsigned32;
-      Attribute_Set    : in     RTEMS.Attribute;
-      ID               :    out RTEMS.ID;
-      Result           :    out RTEMS.Status_Codes
-   ) is
-      function Partition_Create_Base (
-         Name             : RTEMS.Name;
-         Starting_Address : RTEMS.Address;
-         Length           : RTEMS.Unsigned32;
-         Buffer_Size      : RTEMS.Unsigned32;
-         Attribute_Set    : RTEMS.Attribute;
-         ID               : access RTEMS.Event_Set
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Partition_Create_Base, "rtems_partition_create");
-      ID_Base : aliased RTEMS.ID := ID;
-   begin
- 
-      Result := Partition_Create_Base (
-         Name,
-         Starting_Address,
-         Length,
-         Buffer_Size,
-         Attribute_Set,
-         ID_Base'Unchecked_Access
-      );
- 
-      ID := ID_Base;
- 
-   end Partition_Create;
- 
-   procedure Partition_Ident (
-      Name   : in     RTEMS.Name;
-      Node   : in     RTEMS.Unsigned32;
-      ID     :    out RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   ) is
-      function Partition_Ident_Base (
-         Name : RTEMS.Name;
-         Node : RTEMS.Unsigned32;
-         ID   : access RTEMS.Event_Set
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Partition_Ident_Base, "rtems_partition_ident");
-      ID_Base : aliased RTEMS.ID := ID;
-   begin
- 
-      Result := Partition_Ident_Base (
-         Name,
-         Node,
-         ID_Base'Unchecked_Access
-      );
- 
-      ID := ID_Base;
-
-   end Partition_Ident;
- 
-   procedure Partition_Delete (
-      ID     : in     RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   ) is
-      function Partition_Delete_Base (
-         ID : RTEMS.ID
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Partition_Delete_Base, "rtems_partition_delete");
-   begin
- 
-      Result := Partition_Delete_Base ( ID );
-
-   end Partition_Delete;
- 
-   procedure Partition_Get_Buffer (
-      ID     : in     RTEMS.ID;
-      Buffer :    out RTEMS.Address;
-      Result :    out RTEMS.Status_Codes
-   ) is
-      function Partition_Get_Buffer_Base (
-         ID     : RTEMS.ID;
-         Buffer : access RTEMS.Address
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Partition_Get_Buffer_Base,
-         "rtems_partition_get_buffer");
-      Buffer_Base : aliased RTEMS.Address := Buffer;
-   begin
- 
-      Result := Partition_Get_Buffer_Base (
-         ID,
-         Buffer_Base'Unchecked_Access
-      );
- 
-      Buffer := Buffer_Base;
-
-   end Partition_Get_Buffer;
- 
-   procedure Partition_Return_Buffer (
-      ID     : in     RTEMS.ID;
-      Buffer : in     RTEMS.Address;
-      Result :    out RTEMS.Status_Codes
-   ) is
-      function Partition_Return_Buffer_Base (
-         ID     : RTEMS.Name;
-         Buffer : RTEMS.Address
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Partition_Return_Buffer_Base,
-         "rtems_partition_return_buffer");
-   begin
- 
-      Result := Partition_Return_Buffer_Base ( ID, Buffer );
-
-   end Partition_Return_Buffer;
-
-   --
-   -- Region Manager
-   --
- 
-   procedure Region_Create (
-      Name             : in     RTEMS.Name;
-      Starting_Address : in     RTEMS.Address;
-      Length           : in     RTEMS.Unsigned32;
-      Page_Size        : in     RTEMS.Unsigned32;
-      Attribute_Set    : in     RTEMS.Attribute;
-      ID               :    out RTEMS.ID;
-      Result           :    out RTEMS.Status_Codes
-   ) is
-      function Region_Create_Base (
-         Name             : RTEMS.Name;
-         Starting_Address : RTEMS.Address;
-         Length           : RTEMS.Unsigned32;
-         Page_Size        : RTEMS.Unsigned32;
-         Attribute_Set    : RTEMS.Attribute;
-         ID               : access RTEMS.ID
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Region_Create_Base, "rtems_region_create");
-      ID_Base : aliased RTEMS.ID := ID;
- 
-   begin
- 
-      Result := Region_Create_Base (
-                        Name,
-                        Starting_Address,
-                        Length,
-                        Page_Size,
-                        Attribute_Set,
-                        ID_Base'Unchecked_Access
-                     );
- 
-      ID := ID_Base;
-
-   end Region_Create;
- 
-   procedure Region_Ident (
-      Name   : in     RTEMS.Name;
-      ID     :    out RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   ) is
-      function Region_Ident_Base (
-         Name   : RTEMS.Name;
-         ID     : access RTEMS.ID
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Region_Ident_Base, "rtems_region_ident");
-      ID_Base : aliased RTEMS.ID := ID;
-   begin
- 
-      Result := Region_Ident_Base (
-         Name,
-         ID_Base'Unchecked_Access
-      );
- 
-      ID := ID_Base;
-
-   end Region_Ident;
- 
-   procedure Region_Delete (
-      ID     : in     RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   ) is
-      function Region_Delete_Base (
-         ID : RTEMS.ID
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Region_Delete_Base, "rtems_region_delete");
-   begin
- 
-      Result := Region_Delete_Base ( ID );
-
-   end Region_Delete;
- 
-   procedure Region_Extend (
-      ID               : in     RTEMS.ID;
-      Starting_Address : in     RTEMS.Address;
-      Length           : in     RTEMS.Unsigned32;
-      Result           :    out RTEMS.Status_Codes
-   ) is
-      function Region_Extend_Base (
-         ID               : RTEMS.ID;
-         Starting_Address : RTEMS.Address;
-         Length           : RTEMS.Unsigned32
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Region_Extend_Base, "rtems_region_extend");
-   begin
- 
-      Result := Region_Extend_Base ( ID, Starting_Address, Length );
-
-   end Region_Extend;
- 
-   procedure Region_Get_Segment (
-      ID         : in     RTEMS.ID;
-      Size       : in     RTEMS.Unsigned32;
-      Option_Set : in     RTEMS.Option;
-      Timeout    : in     RTEMS.Interval;
-      Segment    :    out RTEMS.Address;
-      Result     :    out RTEMS.Status_Codes
-   ) is
-      function Region_Get_Segment_Base (
-         ID         : RTEMS.ID;
-         Size       : RTEMS.Unsigned32;
-         Option_Set : RTEMS.Option;
-         Timeout    : RTEMS.Interval;
-         Segment    : access RTEMS.Address
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Region_Get_Segment_Base, "rtems_region_get_segment");
-      Segment_Base : aliased RTEMS.Address := Segment;
-   begin
- 
-      Result := Region_Get_Segment_Base (
-         ID,
-         Size,
-         Option_Set,
-         Timeout,
-         Segment_Base'Unchecked_Access
-      );
- 
-      Segment := SEGMENT_Base;
-
-   end Region_Get_Segment;
- 
-   procedure Region_Get_Segment_Size (
-      ID      : in     RTEMS.ID;
-      Segment : in     RTEMS.Address;
-      Size    :    out RTEMS.Unsigned32;
-      Result  :    out RTEMS.Status_Codes
-   ) is
-      function Region_Get_Segment_Size_Base (
-         ID      : RTEMS.ID;
-         Segment : RTEMS.Address;
-         Size    : access RTEMS.Unsigned32
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Region_Get_Segment_Size_Base,
-         "rtems_region_get_segment_size");
-      Size_Base : aliased RTEMS.Unsigned32 := Size;
-   begin
- 
-      Result := Region_Get_Segment_Size_Base (
-         ID,
-         Segment,
-         Size_Base'Unchecked_Access
-      );
- 
-      Size := SIZE_Base;
-
-   end Region_Get_Segment_Size;
- 
-   procedure Region_Return_Segment (
-      ID      : in     RTEMS.ID;
-      Segment : in     RTEMS.Address;
-      Result  :    out RTEMS.Status_Codes
-   ) is
-      function Region_Return_Segment_Base (
-         ID      : RTEMS.ID;
-         Segment : RTEMS.Address
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Region_Return_Segment_Base,
-         "rtems_region_return_segment");
-   begin
- 
-      Result := Region_Return_Segment_Base ( ID, Segment );
-
-   end Region_Return_Segment;
- 
-
-   --
-   -- Dual Ported Memory Manager
-   --
- 
-   procedure Port_Create (
-      Name           : in     RTEMS.Name;
-      Internal_Start : in     RTEMS.Address;
-      External_Start : in     RTEMS.Address;
-      Length         : in     RTEMS.Unsigned32;
-      ID             :    out RTEMS.ID;
-      Result         :    out RTEMS.Status_Codes
-   ) is
-      function Port_Create_Base (
-         Name           : RTEMS.Name;
-         Internal_Start : RTEMS.Address;
-         External_Start : RTEMS.Address;
-         Length         : RTEMS.Unsigned32;
-         ID             : access RTEMS.ID
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Port_Create_Base, "rtems_port_create");
-      ID_Base : aliased RTEMS.ID := ID;
- 
-   begin
- 
-      Result := Port_Create_Base (
-                   Name,
-                   Internal_Start,
-                   External_Start,
-                   Length,
-                   ID_Base'Unchecked_Access
-                );
- 
-      ID := ID_Base;
-
-   end Port_Create;
- 
-   procedure Port_Ident (
-      Name   : in     RTEMS.Name;
-      ID     :    out RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   ) is
-      function Port_Ident_Base (
-         Name : RTEMS.Name;
-         ID   : access RTEMS.ID
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Port_Ident_Base, "rtems_port_ident");
-      ID_Base : aliased RTEMS.ID := ID;
-   begin
- 
-      Result := Port_Ident_Base (
-         Name,
-         ID_Base'Unchecked_Access
-      );
- 
-      ID := ID_Base;
-
-   end Port_Ident;
- 
-   procedure Port_Delete (
-      ID     : in     RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   ) is
-      function Port_Delete_Base (
-         ID : RTEMS.ID
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Port_Delete_Base, "rtems_port_delete");
-   begin
- 
-      Result := Port_Delete_Base ( ID );
-
-   end Port_Delete;
- 
-   procedure Port_External_To_Internal (
-      ID       : in     RTEMS.ID;
-      External : in     RTEMS.Address;
-      Internal :    out RTEMS.Address;
-      Result   :    out RTEMS.Status_Codes
-   ) is
-      function Port_External_To_Internal_Base (
-         ID       : RTEMS.ID;
-         External : RTEMS.Address;
-         Internal : access RTEMS.Address
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Port_External_To_Internal_Base,
-         "rtems_port_external_to_internal");
-      Internal_Base : aliased RTEMS.Address := Internal;
-   begin
- 
-      Result := Port_External_To_Internal_Base (
-         ID,
-         External,
-         Internal_Base'Unchecked_Access
-      );
- 
-      Internal := INTERNAL_Base;
-
-   end Port_External_To_Internal;
- 
-   procedure Port_Internal_To_External (
-      ID       : in     RTEMS.ID;
-      Internal : in     RTEMS.Address;
-      External :    out RTEMS.Address;
-      Result   :    out RTEMS.Status_Codes
-   ) is
-      function Port_Internal_To_External_Base (
-         ID       : RTEMS.ID;
-         Internal : RTEMS.Address;
-         External : access RTEMS.Address
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Port_Internal_To_External_Base,
-         "rtems_port_internal_to_external");
-      External_Base : aliased RTEMS.Address := External;
-   begin
- 
-      Result := Port_Internal_To_External_Base (
-         ID,
-         Internal,
-         External_Base'Unchecked_Access
-      );
- 
-      External := EXTERNAL_Base;
-
-   end Port_Internal_To_External;
- 
-   --
-   -- Input/Output Manager
-   --
- 
-   procedure IO_Initialize (
-      Major        : in     RTEMS.Device_Major_Number;
-      Minor        : in     RTEMS.Device_Minor_Number;
-      Argument     : in     RTEMS.Address;
-      Return_Value :    out RTEMS.Unsigned32;
-      Result       :    out RTEMS.Status_Codes
-   ) is
-      function IO_Initialize_Base (
-         Major        : RTEMS.Device_Major_Number;
-         Minor        : RTEMS.Device_Minor_Number;
-         Argument     : RTEMS.Address;
-         Return_Value : access RTEMS.Unsigned32
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, IO_Initialize_Base, "rtems_io_initialize");
-      Return_Value_Base : aliased RTEMS.Unsigned32 := Return_Value;
-   begin
- 
-      Result := IO_Initialize_Base (
-         Major,
-         Minor,
-         Argument,
-         Return_Value_Base'Unchecked_Access
-      );
- 
-      Return_Value := Return_Value_Base;
-
-   end IO_Initialize;
- 
-   procedure IO_Register_Name (
-      Name   : in     String;
-      Major  : in     RTEMS.Device_Major_Number;
-      Minor  : in     RTEMS.Device_Minor_Number;
-      Result :    out RTEMS.Status_Codes
-   ) is
-      function IO_Register_Name_Base (
-         Name   : Interfaces.C.Char_Array;
-         Major  : RTEMS.Device_Major_Number;
-         Minor  : RTEMS.Device_Minor_Number
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, IO_Register_Name_Base, "rtems_io_register_name");
-   begin
-
-      Result := IO_Register_Name_Base (
-         Interfaces.C.To_C (Name),
-         Major,
-         Minor
-      );
-
-   end IO_Register_Name;
-
-   procedure IO_Lookup_Name (
-      Name         : in     String;
-      Device_Info  :    out RTEMS.Driver_Name_t;
-      Result       :    out RTEMS.Status_Codes
-   ) is
-      function IO_Lookup_Name_Base (
-         Name        : Interfaces.C.Char_Array;
-         Device_Info : access RTEMS.Driver_Name_t
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, IO_Lookup_Name_Base, "rtems_io_lookup_name");
-
-      Device_Info_Base : aliased RTEMS.Driver_Name_t;
-   begin
-
-      Result := IO_Lookup_Name_Base (
-         Interfaces.C.To_C (Name),
-         Device_Info_Base'Unchecked_Access
-      );
-
-      Device_Info := Device_Info_Base;
-
-   end IO_Lookup_Name;
-
-   procedure IO_Open (
-      Major        : in     RTEMS.Device_Major_Number;
-      Minor        : in     RTEMS.Device_Minor_Number;
-      Argument     : in     RTEMS.Address;
-      Result       :    out RTEMS.Status_Codes
-   ) is
-      function IO_Open_Base (
-         Major        : RTEMS.Device_Major_Number;
-         Minor        : RTEMS.Device_Minor_Number;
-         Argument     : RTEMS.Address
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, IO_Open_Base, "rtems_io_open");
-   begin
- 
-      Result := IO_Open_Base (Major, Minor, Argument);
- 
-   end IO_Open;
- 
-   procedure IO_Close (
-      Major        : in     RTEMS.Device_Major_Number;
-      Minor        : in     RTEMS.Device_Minor_Number;
-      Argument     : in     RTEMS.Address;
-      Result       :    out RTEMS.Status_Codes
-   ) is
-      function IO_Close_Base (
-         Major        : RTEMS.Device_Major_Number;
-         Minor        : RTEMS.Device_Minor_Number;
-         Argument     : RTEMS.Address
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, IO_Close_Base, "rtems_io_close");
-   begin
- 
-      Result := IO_Close_Base (Major, Minor, Argument);
- 
-   end IO_Close;
- 
-   procedure IO_Read (
-      Major        : in     RTEMS.Device_Major_Number;
-      Minor        : in     RTEMS.Device_Minor_Number;
-      Argument     : in     RTEMS.Address;
-      Result       :    out RTEMS.Status_Codes
-   ) is
-      function IO_Read_Base (
-         Major        : RTEMS.Device_Major_Number;
-         Minor        : RTEMS.Device_Minor_Number;
-         Argument     : RTEMS.Address
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, IO_Read_Base, "rtems_io_read");
-   begin
- 
-      Result := IO_Read_Base (Major, Minor, Argument);
- 
-   end IO_Read;
- 
-   procedure IO_Write (
-      Major        : in     RTEMS.Device_Major_Number;
-      Minor        : in     RTEMS.Device_Minor_Number;
-      Argument     : in     RTEMS.Address;
-      Result       :    out RTEMS.Status_Codes
-   ) is
-      function IO_Write_Base (
-         Major        : RTEMS.Device_Major_Number;
-         Minor        : RTEMS.Device_Minor_Number;
-         Argument     : RTEMS.Address
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, IO_Write_Base, "rtems_io_write");
-   begin
- 
-      Result := IO_Write_Base (Major, Minor, Argument);
- 
-   end IO_Write;
- 
-   procedure IO_Control (
-      Major        : in     RTEMS.Device_Major_Number;
-      Minor        : in     RTEMS.Device_Minor_Number;
-      Argument     : in     RTEMS.Address;
-      Result       :    out RTEMS.Status_Codes
-   ) is
-      function IO_Control_Base (
-         Major        : RTEMS.Device_Major_Number;
-         Minor        : RTEMS.Device_Minor_Number;
-         Argument     : RTEMS.Address
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, IO_Control_Base, "rtems_io_control");
-   begin
- 
-      Result := IO_Control_Base (Major, Minor, Argument);
- 
-   end IO_Control;
- 
- 
-   --
-   -- Fatal Error Manager
-   --
- 
-   procedure Fatal_Error_Occurred (
-      The_Error : in     RTEMS.Unsigned32
-   ) is
-      procedure Fatal_Error_Occurred_base (
-         The_Error : RTEMS.Unsigned32
-      );
-   pragma Import (C, Fatal_Error_Occurred_Base, "rtems_fatal_error_occurred");
-   begin
- 
-      Fatal_Error_Occurred_Base ( The_Error );
-
-   end Fatal_Error_Occurred; 
-   --
-   -- Rate Monotonic Manager
-   --
- 
-   procedure Rate_Monotonic_Create (
-      Name   : in     RTEMS.Name;
-      ID     :    out RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   ) is
-      function Rate_Monotonic_Create_base (
-         Name   : RTEMS.Name;
-         ID     : access RTEMS.ID
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Rate_Monotonic_Create_base, "rtems_rate_monotonic_create");
-      ID_Base : aliased RTEMS.ID := ID;
-   begin
- 
-      Result := Rate_Monotonic_Create_base (
-         Name,
-         ID_Base'Unchecked_Access
-      );
- 
-      ID := ID_Base;
-
-   end Rate_Monotonic_Create;
- 
-   procedure Rate_Monotonic_Ident (
-      Name   : in     RTEMS.Name;
-      ID     :    out RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   ) is
-      function Rate_Monotonic_Ident_Base (
-         Name   : RTEMS.Name;
-         ID     : access RTEMS.ID
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Rate_Monotonic_Ident_Base, "rtems_rate_monotonic_ident");
-      ID_Base : aliased RTEMS.ID := ID;
-   begin
- 
-      Result := Rate_Monotonic_Ident_Base (
-         Name,
-         ID_Base'Unchecked_Access
-      );
- 
-      ID := ID_Base;
-
-   end Rate_Monotonic_Ident;
- 
-   procedure Rate_Monotonic_Delete (
-      ID     : in     RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   ) is
-      function Rate_Monotonic_Delete_Base (
-         ID : RTEMS.ID
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Rate_Monotonic_Delete_Base,
-         "rtems_rate_monotonic_delete");
-   begin
- 
-      Result := Rate_Monotonic_Delete_base ( ID );
-
-   end Rate_Monotonic_Delete;
- 
-   procedure Rate_Monotonic_Cancel (
-      ID     : in     RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   ) is
-      function Rate_Monotonic_Cancel_Base (
-         ID : RTEMS.ID
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Rate_Monotonic_Cancel_Base,
-         "rtems_rate_monotonic_cancel");
-   begin
- 
-      Result := Rate_Monotonic_Cancel_Base ( ID );
-
-   end Rate_Monotonic_Cancel;
- 
-   procedure Rate_Monotonic_Period (
-      ID      : in     RTEMS.ID;
-      Length  : in     RTEMS.Interval;
-      Result  :    out RTEMS.Status_Codes
-   ) is
-      function Rate_Monotonic_Period_Base (
-         ID     : RTEMS.ID;
-         Length : RTEMS.Interval
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Rate_Monotonic_Period_Base,
-         "rtems_rate_monotonic_period");
-   begin
- 
-      Result := Rate_Monotonic_Period_base ( ID, Length );
-
-   end Rate_Monotonic_Period;
- 
- 
-   procedure Rate_Monotonic_Get_Status (
-      ID      : in     RTEMS.ID;
-      Status  :    out RTEMS.Rate_Monotonic_Period_Status;
-      Result  :    out RTEMS.Status_Codes
-   ) is
-      function Rate_Monotonic_Get_Status_Base (
-         ID      : RTEMS.ID;
-         Status  : access RTEMS.Rate_Monotonic_Period_Status
-      )  return RTEMS.Status_Codes;
-      pragma Import (C, Rate_Monotonic_Get_Status_Base,
-         "rtems_rate_monotonic_get_status");
-
-      Status_Base : aliased RTEMS.Rate_Monotonic_Period_Status;
-   begin
-
-      Result := Rate_Monotonic_Get_Status_Base (
-         ID,
-         Status_Base'Unchecked_Access
-      );
-
-      Status := Status_Base;
-
-
-   end Rate_Monotonic_Get_Status;
-
-   --
-   -- Multiprocessing Manager
-   --
- 
-   procedure Multiprocessing_Announce is
-      procedure Multiprocessing_Announce_Base;
-      pragma Import (C, Multiprocessing_Announce_Base,
-         "rtems_multiprocessing_announce");
-   begin
- 
-      Multiprocessing_Announce_Base;
-
-   end Multiprocessing_Announce;
- 
- 
-   --
-   -- Debug Manager
-   --
- 
-   procedure Debug_Enable (
-      To_Be_Enabled : in     RTEMS.Debug_Set
-   ) is
-      procedure Debug_Enable_Base (
-         To_Be_Enabled : RTEMS.Debug_Set
-      );
-   pragma Import (C, Debug_Enable_Base, "rtems_debug_enable");
-   begin
- 
-      Debug_Enable_Base ( To_Be_Enabled );
-
-   end Debug_Enable;
- 
-   procedure Debug_Disable (
-      To_Be_Disabled : in     RTEMS.Debug_Set
-   ) is
-      procedure Debug_Disable_Base (
-         To_Be_Disabled : RTEMS.Debug_Set
-      );
-   pragma Import (C, Debug_Disable_Base, "rtems_debug_disable");
-   begin
- 
-      Debug_Disable_Base ( To_Be_Disabled );
-
-   end Debug_Disable;
- 
-   function Debug_Is_Enabled (
-      Level : in     RTEMS.Debug_Set
-   ) return RTEMS.Boolean is
-      function Debug_Is_Enabled_Base (
-         Level : RTEMS.Debug_Set
-      )  return RTEMS.Boolean;
-      pragma Import (C, Debug_Is_Enabled_Base, "_Debug_Is_enabled");
-   begin
- 
-      return Debug_Is_Enabled_Base ( Level );
-
-   end Debug_Is_Enabled;
-
-    -- HACK
-    -- function Configuration 
-    -- return RTEMS.Configuration_Table_Pointer is
-    --    Configuration_base : RTEMS.Configuration_Table_Pointer;
-    --    pragma Import (C, Configuration_base, "_Configuration_Table");
-    -- begin
-    --    return Configuration_Base;
-    -- end Configuration;
-
-end RTEMS;
-
diff --git a/cpukit/ada/rtems.ads b/cpukit/ada/rtems.ads
deleted file mode 100644
index 508f24046f..0000000000
--- a/cpukit/ada/rtems.ads
+++ /dev/null
@@ -1,1430 +0,0 @@
---
---  RTEMS / Specification
---
---  DESCRIPTION:
---
---  This package provides the interface to the RTEMS API.
---
---  DEPENDENCIES:
---
---
---
---  COPYRIGHT (c) 1997.
---  On-Line Applications Research Corporation (OAR).
---
---  The license and distribution terms for this file may in
---  the file LICENSE in this distribution or at
---  http://www.OARcorp.com/rtems/license.html.
---
---  $Id$
---
-
-with System;
-with System.Storage_Elements; use System.Storage_Elements;
-with Interfaces;
-with Interfaces.C;
-
-package RTEMS is
-
-   Structure_Alignment : constant := 8;
-
-   --
-   --  RTEMS Base Types
-   --
-
-   subtype Unsigned8  is Interfaces.Unsigned_8;
-   subtype Unsigned16 is Interfaces.Unsigned_16;
-   subtype Unsigned32 is Interfaces.Unsigned_32;
-
-   type Unsigned32_Pointer     is access all RTEMS.Unsigned32;
-   type Unsigned16_Pointer     is access all RTEMS.Unsigned16;
-   type Unsigned8_Pointer      is access all RTEMS.Unsigned8;
-
-   subtype Boolean             is RTEMS.Unsigned32;
-   subtype Address             is System.Address;
-   subtype Single              is Interfaces.C.C_float;
-   subtype Double              is Interfaces.C.Double;
-
-   --
-   --  The following define the size of each of the base types in
-   --  both bits and system units.
-   --
-
-   Unsigned8_Bits   : constant := 7;
-   Unsigned16_Bits  : constant := 15;
-   Unsigned32_Bits  : constant := 31;
-   Boolean_Bits     : constant := 31;
-   Address_Bits     : constant := 31;
-   Single_Bits      : constant := 31;
-   Double_Bits      : constant := 63;
-
-   Unsigned8_Units  : constant := 1;
-   Unsigned16_Units : constant := 2;
-   Unsigned32_Units : constant := 4;
-   Boolean_Units    : constant := 4;
-   Address_Units    : constant := 4;
-   Single_Units     : constant := 4;
-   Double_Units     : constant := 8;
-
-   Null_Address     : constant RTEMS.Address :=
-      System.Storage_Elements.To_Address(0);
-
-   True  : constant RTEMS.Boolean := 1;
-   False : constant RTEMS.Boolean := 0;
-
-   --  More Types
-   --
-
-   subtype Name                is RTEMS.Unsigned32;
-   subtype ID                  is RTEMS.Unsigned32;
-   subtype Interval            is RTEMS.Unsigned32;
-   subtype Attribute           is RTEMS.Unsigned32;
-   subtype Mode                is RTEMS.Unsigned32;
-   subtype Option              is RTEMS.Unsigned32;
-   subtype Task_Priority       is RTEMS.Unsigned32;
-   subtype Notepad_Index       is RTEMS.Unsigned32 range 0 .. 15;
-
-   subtype Event_Set           is RTEMS.Unsigned32;
-   subtype Signal_Set          is RTEMS.Unsigned32;
-   subtype Debug_Set           is RTEMS.Unsigned32;
-   subtype Device_Major_Number is RTEMS.Unsigned32;
-   subtype Device_Minor_Number is RTEMS.Unsigned32;
-   subtype Vector_Number       is RTEMS.Unsigned32;
-   subtype ISR_Level           is RTEMS.Unsigned32;
-
-   subtype Node                is RTEMS.Unsigned32;
-
-   --
-   --  Task Related Types
-   --  XXXX fix this
-   subtype Task_Argument       is RTEMS.Unsigned32;
-   type Task_Argument_PTR      is access all Task_Argument;
-
-   -- XXXX fix this
-   subtype TCB                 is RTEMS.Unsigned32;
-   type    TCB_Pointer         is access all RTEMS.TCB;
-
-   subtype Task_States         is RTEMS.Unsigned32;
-
-   type Task_Entry is access procedure (
-      Argument : RTEMS.Unsigned32
-   );
-
-   --
-   --  Clock and Time of Day Types
-   --
-
-   type Time_Of_Day is
-      record
-         Year    : RTEMS.Unsigned32; -- year, A.D.
-         Month   : RTEMS.Unsigned32; -- month, 1 .. 12
-         Day     : RTEMS.Unsigned32; -- day, 1 .. 31
-         Hour    : RTEMS.Unsigned32; -- hour, 0 .. 23
-         Minute  : RTEMS.Unsigned32; -- minute, 0 .. 59
-         Second  : RTEMS.Unsigned32; -- second, 0 .. 59
-         Ticks   : RTEMS.Unsigned32; -- elapsed ticks between seconds
-      end record;
-
-   type Clock_Time_Value is
-      record
-         Seconds      : RTEMS.Unsigned32;
-         Microseconds : RTEMS.Unsigned32;
-      end record;
-
-   type Clock_Get_Options is (
-      Clock_Get_TOD,
-      Clock_Get_Seconds_Since_Epoch,
-      Clock_Get_Ticks_Since_Boot,
-      Clock_Get_Ticks_Per_Seconds,
-      Clock_Get_Time_Value
-   );
-
-   --
-   --  Device Driver Entry Prototype
-   --
-
-   type Device_Driver_Entry is access function (
-      Major    : in     RTEMS.Device_Major_Number;
-      Minor    : in     RTEMS.Device_Major_Number;
-      Argument : in     RTEMS.Unsigned32;
-      ID       : in     RTEMS.Unsigned32
-   ) return RTEMS.Unsigned32;
-
-   type Driver_Address_Table_Entry is
-      record
-         Initialization : RTEMS.Device_Driver_Entry;
-         Open           : RTEMS.Device_Driver_Entry;
-         Close          : RTEMS.Device_Driver_Entry;
-         Read           : RTEMS.Device_Driver_Entry;
-         Write          : RTEMS.Device_Driver_Entry;
-         Control        : RTEMS.Device_Driver_Entry;
-      end record;
-
-   type Driver_Address_Table is array ( RTEMS.Unsigned32
-     range 1 .. RTEMS.Unsigned32'Last ) of RTEMS.Driver_Address_Table_Entry;
-
-   type Driver_Address_Table_Pointer is access all Driver_Address_Table;
-
-   type Driver_Name_t is
-      record
-         Device_Name        : RTEMS.Address;
-         Device_Name_Length : RTEMS.Unsigned32;
-         Major              : RTEMS.Device_Major_Number;
-         Minor              : RTEMS.Device_Minor_Number;
-
-      end record;
-
-   --
-   --  Ident Options
-   --
-
-   Search_All_Nodes : constant RTEMS.Node := 0;
-
-   --
-   --  Options
-   --
-
-   Default_Options    : constant RTEMS.Option    := 16#0000#;
-
-   Wait      : constant RTEMS.Option := 16#0000#;
-   No_Wait   : constant RTEMS.Option := 16#0001#;
-
-   Event_All : constant RTEMS.Option := 16#0000#;
-   Event_Any : constant RTEMS.Option := 16#0002#;
-
-   --
-   --  Mode constants
-   --
-
-   Default_Modes      : constant RTEMS.Mode      := 16#0000#;
-
-   All_Mode_Masks     : constant RTEMS.Mode := 16#0000_ffff#;
-   Current_Mode       : constant RTEMS.Mode := 16#0000_0000#;
-   Preempt_Mask       : constant RTEMS.Mode := 16#0000_0100#;
-   Timeslice_Mask     : constant RTEMS.Mode := 16#0000_0200#;
-   ASR_Mask           : constant RTEMS.Mode := 16#0000_0400#;
-   Interrupt_Mask     : RTEMS.Mode;
-   Preempt            : constant RTEMS.Mode := 16#0000_0000#;
-   No_Preempt         : constant RTEMS.Mode := 16#0000_0100#;
-   No_Timeslice       : constant RTEMS.Mode := 16#0000_0000#;
-   Timeslice          : constant RTEMS.Mode := 16#0000_0200#;
-   ASR                : constant RTEMS.Mode := 16#0000_0000#;
-   No_ASR             : constant RTEMS.Mode := 16#0000_0400#;
-
-   pragma Import (C, Interrupt_Mask, "rtems_interrupt_mask");
-
-   --
-   --  Attribute constants
-   --
-
-   Default_Attributes  : constant RTEMS.Attribute := 16#00000000#;
-   No_Floating_Point   : constant RTEMS.Attribute := 16#00000000#;
-   Floating_Point      : constant RTEMS.Attribute := 16#00000001#;
-   Local               : constant RTEMS.Attribute := 16#00000000#;
-   Global              : constant RTEMS.Attribute := 16#00000002#;
-   FIFO                : constant RTEMS.Attribute := 16#00000000#;
-   Priority            : constant RTEMS.Attribute := 16#00000004#;
-   Counting_Semaphore  : constant RTEMS.Attribute := 16#00000000#;
-   Binary_Semaphore    : constant RTEMS.Attribute := 16#00000010#;
-   No_Inherit_Priority : constant RTEMS.Attribute := 16#00000000#;
-   Inherit_Priority    : constant RTEMS.Attribute := 16#00000020#;
-   No_Priority_Ceiling : constant RTEMS.Attribute := 16#00000000#;
-   Priority_Ceiling    : constant RTEMS.Attribute := 16#00000040#;
-
-   function Interrupt_Level (
-      Level : in     RTEMS.Unsigned32
-   ) return RTEMS.Attribute;
-   pragma Import (C, Interrupt_Level, "rtems_interrupt_level_attribute");
-   
-
-   Minimum_Stack_Size : RTEMS.Unsigned32;
-   pragma Import (C, Minimum_Stack_Size, "rtems_minimum_stack_size");
-
-
-   --
-   --  Notepad index constants
-   --
-
-   Notepad_0  : constant RTEMS.Unsigned32 := 0;
-   Notepad_1  : constant RTEMS.Unsigned32 := 1;
-   Notepad_2  : constant RTEMS.Unsigned32 := 2;
-   Notepad_3  : constant RTEMS.Unsigned32 := 3;
-   Notepad_4  : constant RTEMS.Unsigned32 := 4;
-   Notepad_5  : constant RTEMS.Unsigned32 := 5;
-   Notepad_6  : constant RTEMS.Unsigned32 := 6;
-   Notepad_7  : constant RTEMS.Unsigned32 := 7;
-   Notepad_8  : constant RTEMS.Unsigned32 := 8;
-   Notepad_9  : constant RTEMS.Unsigned32 := 9;
-   Notepad_10 : constant RTEMS.Unsigned32 := 10;
-   Notepad_11 : constant RTEMS.Unsigned32 := 11;
-   Notepad_12 : constant RTEMS.Unsigned32 := 12;
-   Notepad_13 : constant RTEMS.Unsigned32 := 13;
-   Notepad_14 : constant RTEMS.Unsigned32 := 14;
-   Notepad_15 : constant RTEMS.Unsigned32 := 15;
-
-   --
-   --  Miscellaneous
-   --
-
-   No_Timeout       : constant RTEMS.Interval := 0;
-   Self             : constant RTEMS.ID       := 0;
-   Period_Status    : constant RTEMS.Interval := 0;
-   Yield_Processor  : constant RTEMS.Interval := 0;
-   Current_Priority : constant RTEMS.Task_Priority := 0;
-   No_Priority      : constant RTEMS.Task_Priority := 0;
-
-
-   --
-   --  Extension Callouts and Table
-   --
-
-   type Thread_Create_Extension is access procedure (
-      Current_Task : in     RTEMS.TCB_Pointer;
-      New_Task     : in     RTEMS.TCB_Pointer
-   );
-
-   type Thread_Start_Extension is access procedure (
-      Current_Task : in     RTEMS.TCB_Pointer;
-      Started_Task : in     RTEMS.TCB_Pointer
-   );
-
-   type Thread_Restart_Extension is access procedure (
-      Current_Task   : in     RTEMS.TCB_Pointer;
-      Restarted_Task : in     RTEMS.TCB_Pointer
-   );
-
-   type Thread_Delete_Extension is access procedure (
-      Current_Task : in     RTEMS.TCB_Pointer;
-      Deleted_Task : in     RTEMS.TCB_Pointer
-   );
-
-   type Thread_Switch_Extension is access procedure (
-      Current_Task : in     RTEMS.TCB_Pointer;
-      Heir_Task    : in     RTEMS.TCB_Pointer
-   );
-
-   type Thread_Post_Switch_Extension is access procedure (
-      Current_Task : in     RTEMS.TCB_Pointer
-   );
-
-   type Thread_Begin_Extension is access procedure (
-      Current_Task : in     RTEMS.TCB_Pointer
-   );
-
-   type Thread_Exitted_Extension is access procedure (
-      Current_Task : in     RTEMS.TCB_Pointer
-   );
-
-   type Fatal_Error_Extension is access procedure (
-      Error : in     RTEMS.Unsigned32
-   );
-
-   type Extensions_Table is
-      record
-         Thread_Create      : RTEMS.Thread_Create_Extension;
-         Thread_Start       : RTEMS.Thread_Start_Extension;
-         Thread_Restart     : RTEMS.Thread_Restart_Extension;
-         Thread_Delete      : RTEMS.Thread_Delete_Extension;
-         Thread_Switch      : RTEMS.Thread_Switch_Extension;
-         Thread_Post_Switch : RTEMS.Thread_Post_Switch_Extension;
-         Thread_Begin       : RTEMS.Thread_Begin_Extension;
-         Thread_Exitted     : RTEMS.Thread_Exitted_Extension;
-         Fatal              : RTEMS.Fatal_Error_Extension;
-      end record;
-
-   type Extensions_Table_Pointer is access all Extensions_Table;
-
-   --
-   --  The following type define a pointer to a watchdog/timer service routine.
-   --
-
-   type Timer_Service_Routine is access procedure (
-      ID          : in     RTEMS.ID;
-      User_Data   : in     RTEMS.Address
-   );
-
-   --
-   --  The following type define a pointer to a signal service routine.
-   --
-
-   type ASR_Handler is access procedure (
-      Signals : in     RTEMS.Signal_Set
-   );
-
-   --
-   --  The following type defines the status information returned
-   --  about a period.
-   --
-
-   type Rate_Monotonic_Period_States is (
-     Inactive,               -- off chain, never initialized
-     Owner_Is_Blocking,      -- on chain, owner is blocking on it
-     Active,                 -- on chain, running continuously
-     Expired_While_Blocking, -- on chain, expired while owner was was blocking
-     Expired                 -- off chain, will be reset by next
-                             --   rtems_rate_monotonic_period
-   );
-
-   for Rate_Monotonic_Period_States'Size use 32;
-
-   for Rate_Monotonic_Period_States use (
-     Inactive                => 0,
-     Owner_Is_Blocking       => 1,
-     Active                  => 2,
-     Expired_While_Blocking  => 3,
-     Expired                 => 4
-   );
-
-   type Rate_Monotonic_Period_Status is
-      record
-         State                            : RTEMS.Rate_Monotonic_Period_States;
-         Ticks_Since_Last_Period          : RTEMS.Unsigned32;
-         Ticks_Executed_Since_Last_Period : RTEMS.Unsigned32;
-      end record;
-
-   --
-   --  Method Completions Status Codes
-   --
-
-   type Status_Codes is (
-      Successful,               -- successful completion
-      Task_Exitted,             -- returned from a task
-      MP_Not_Configured,        -- multiprocessing not configured
-      Invalid_Name,             -- invalid object name
-      Invalid_ID,               -- invalid object id
-      Too_Many,                 -- too many
-      Timeout,                  -- timed out waiting
-      Object_Was_Deleted,       -- object deleted while waiting
-      Invalid_Size,             -- specified size was invalid
-      Invalid_Address,          -- address specified is invalid
-      Invalid_Number,           -- number was invalid
-      Not_Defined,              -- item has not been initialized
-      Resource_In_Use,          -- resources still outstanding
-      Unsatisfied,              -- request not satisfied
-      Incorrect_State,          -- task is in wrong state
-      Already_Suspended,        -- task already in state
-      Illegal_On_Self,          -- illegal on calling task
-      Illegal_On_Remote_Object, -- illegal for remote object
-      Called_From_ISR,          -- called from wrong environment
-      Invalid_Priority,         -- invalid task priority
-      Invalid_Clock,            -- invalid date/time
-      Invalid_Node,             -- invalid node id
-      Not_Configured,           -- directive not configured
-      Not_Owner_Of_Resource,    -- not owner of resource
-      Not_Implemented,          -- directive not implemented
-      Internal_Error,           -- RTEMS inconsistency detected
-      No_Memory,                -- no memory left in heap
-      IO_Error,                 -- driver IO error
-      Proxy_Blocking            -- internal multiprocessing only
-   );
-
-   for Status_Codes'Size use 32;
-
-   for Status_Codes use (
-      Successful                  =>  0,
-      Task_Exitted                =>  1,
-      MP_Not_Configured           =>  2,
-      Invalid_Name                =>  3,
-      Invalid_ID                  =>  4,
-      Too_Many                    =>  5,
-      Timeout                     =>  6,
-      Object_Was_Deleted          =>  7,
-      Invalid_Size                =>  8,
-      Invalid_Address             =>  9,
-      Invalid_NumbeR              => 10,
-      Not_Defined                 => 11,
-      Resource_In_Use             => 12,
-      Unsatisfied                 => 13,
-      Incorrect_State             => 14,
-      Already_Suspended           => 15,
-      Illegal_On_Self             => 16,
-      Illegal_On_Remote_Object    => 17,
-      Called_From_ISR             => 18,
-      Invalid_Priority            => 19,
-      Invalid_Clock               => 20,
-      Invalid_Node                => 21,
-      Not_Configured              => 22,
-      Not_Owner_Of_Resource       => 23,
-      Not_ImplementeD             => 24,
-      Internal_Error              => 25,
-      No_Memory                   => 26,
-      IO_Error                    => 27,
-      Proxy_Blocking              => 28
-   );
-
-   --
-   --  RTEMS Events
-   --
-
-   Pending_Events : constant RTEMS.Event_Set := 16#0000_0000#;
-   All_Events     : constant RTEMS.Event_Set := 16#FFFF_FFFF#;
-   Event_0        : constant RTEMS.Event_Set := 16#0000_0001#;
-   Event_1        : constant RTEMS.Event_Set := 16#0000_0002#;
-   Event_2        : constant RTEMS.Event_Set := 16#0000_0004#;
-   Event_3        : constant RTEMS.Event_Set := 16#0000_0008#;
-   Event_4        : constant RTEMS.Event_Set := 16#0000_0010#;
-   Event_5        : constant RTEMS.Event_Set := 16#0000_0020#;
-   Event_6        : constant RTEMS.Event_Set := 16#0000_0040#;
-   Event_7        : constant RTEMS.Event_Set := 16#0000_0080#;
-   Event_8        : constant RTEMS.Event_Set := 16#0000_0100#;
-   Event_9        : constant RTEMS.Event_Set := 16#0000_0200#;
-   Event_10       : constant RTEMS.Event_Set := 16#0000_0400#;
-   Event_11       : constant RTEMS.Event_Set := 16#0000_0800#;
-   Event_12       : constant RTEMS.Event_Set := 16#0000_1000#;
-   Event_13       : constant RTEMS.Event_Set := 16#0000_2000#;
-   Event_14       : constant RTEMS.Event_Set := 16#0000_4000#;
-   Event_15       : constant RTEMS.Event_Set := 16#0000_8000#;
-   Event_16       : constant RTEMS.Event_Set := 16#0001_0000#;
-   Event_17       : constant RTEMS.Event_Set := 16#0002_0000#;
-   Event_18       : constant RTEMS.Event_Set := 16#0004_0000#;
-   Event_19       : constant RTEMS.Event_Set := 16#0008_0000#;
-   Event_20       : constant RTEMS.Event_Set := 16#0010_0000#;
-   Event_21       : constant RTEMS.Event_Set := 16#0020_0000#;
-   Event_22       : constant RTEMS.Event_Set := 16#0040_0000#;
-   Event_23       : constant RTEMS.Event_Set := 16#0080_0000#;
-   Event_24       : constant RTEMS.Event_Set := 16#0100_0000#;
-   Event_25       : constant RTEMS.Event_Set := 16#0200_0000#;
-   Event_26       : constant RTEMS.Event_Set := 16#0400_0000#;
-   Event_27       : constant RTEMS.Event_Set := 16#0800_0000#;
-   Event_28       : constant RTEMS.Event_Set := 16#1000_0000#;
-   Event_29       : constant RTEMS.Event_Set := 16#2000_0000#;
-   Event_30       : constant RTEMS.Event_Set := 16#4000_0000#;
-   Event_31       : constant RTEMS.Event_Set := 16#8000_0000#;
-
-   --
-   --  RTEMS Signals
-   --
-
-   All_Signals : constant RTEMS.Signal_Set := 16#7FFFFFFF#;
-   Signal_0    : constant RTEMS.Signal_Set := 16#00000001#;
-   Signal_1    : constant RTEMS.Signal_Set := 16#00000002#;
-   Signal_2    : constant RTEMS.Signal_Set := 16#00000004#;
-   Signal_3    : constant RTEMS.Signal_Set := 16#00000008#;
-   Signal_4    : constant RTEMS.Signal_Set := 16#00000010#;
-   Signal_5    : constant RTEMS.Signal_Set := 16#00000020#;
-   Signal_6    : constant RTEMS.Signal_Set := 16#00000040#;
-   Signal_7    : constant RTEMS.Signal_Set := 16#00000080#;
-   Signal_8    : constant RTEMS.Signal_Set := 16#00000100#;
-   Signal_9    : constant RTEMS.Signal_Set := 16#00000200#;
-   Signal_10   : constant RTEMS.Signal_Set := 16#00000400#;
-   Signal_11   : constant RTEMS.Signal_Set := 16#00000800#;
-   Signal_12   : constant RTEMS.Signal_Set := 16#00001000#;
-   Signal_13   : constant RTEMS.Signal_Set := 16#00002000#;
-   Signal_14   : constant RTEMS.Signal_Set := 16#00004000#;
-   Signal_15   : constant RTEMS.Signal_Set := 16#00008000#;
-   Signal_16   : constant RTEMS.Signal_Set := 16#00010000#;
-   Signal_17   : constant RTEMS.Signal_Set := 16#00020000#;
-   Signal_18   : constant RTEMS.Signal_Set := 16#00040000#;
-   Signal_19   : constant RTEMS.Signal_Set := 16#00080000#;
-   Signal_20   : constant RTEMS.Signal_Set := 16#00100000#;
-   Signal_21   : constant RTEMS.Signal_Set := 16#00200000#;
-   Signal_22   : constant RTEMS.Signal_Set := 16#00400000#;
-   Signal_23   : constant RTEMS.Signal_Set := 16#00800000#;
-   Signal_24   : constant RTEMS.Signal_Set := 16#01000000#;
-   Signal_25   : constant RTEMS.Signal_Set := 16#02000000#;
-   Signal_26   : constant RTEMS.Signal_Set := 16#04000000#;
-   Signal_27   : constant RTEMS.Signal_Set := 16#08000000#;
-   Signal_28   : constant RTEMS.Signal_Set := 16#10000000#;
-   Signal_29   : constant RTEMS.Signal_Set := 16#20000000#;
-   Signal_30   : constant RTEMS.Signal_Set := 16#40000000#;
-   Signal_31   : constant RTEMS.Signal_Set := 16#80000000#;
-
-   --
-   --  RTEMS API Configuration Information
-   --
-
-   type Initialization_Tasks_Table_Entry is
-      record
-         Name             : RTEMS.Name;          -- task name
-         Stack_Size       : RTEMS.Unsigned32;    -- task stack size
-         Initial_Priority : RTEMS.Task_priority; -- task priority
-         Attribute_Set    : RTEMS.Attribute;     -- task attributes
-         Entry_Point      : RTEMS.Task_Entry;    -- task entry point
-         Mode_Set         : RTEMS.Mode;          -- task initial mode
-         Argument         : RTEMS.Unsigned32;    -- task argument
-      end record;
-
-   type Initialization_Tasks_Table is array ( RTEMS.Unsigned32 range <> ) of
-     RTEMS.Initialization_Tasks_Table_Entry;
-
-   type Initialization_Tasks_Table_Pointer is access all
-        Initialization_Tasks_Table;
-
-   type API_Configuration_Table is
-      record
-         Maximum_Tasks                   : RTEMS.Unsigned32;
-         Maximum_Timers                  : RTEMS.Unsigned32;
-         Maximum_Semaphores              : RTEMS.Unsigned32;
-         Maximum_Message_queues          : RTEMS.Unsigned32;
-         Maximum_Partitions              : RTEMS.Unsigned32;
-         Maximum_Regions                 : RTEMS.Unsigned32;
-         Maximum_Ports                   : RTEMS.Unsigned32;
-         Maximum_Periods                 : RTEMS.Unsigned32;
-         Number_Of_Initialization_Tasks  : RTEMS.Unsigned32;
-         User_Initialization_Tasks_Table :
-                                   RTEMS.Initialization_Tasks_Table_Pointer;
-      end record;
-
-   type API_Configuration_Table_Pointer is access all API_Configuration_Table;
-
-   --
-   --  RTEMS POSIX API Configuration Information
-   --
-
-   type POSIX_Thread_Entry is access procedure (
-      Argument : in     RTEMS.Address
-   );
-
-   type POSIX_Initialization_Threads_Table_Entry is
-   record
-      Thread_Entry : RTEMS.POSIX_Thread_Entry;
-   end record;
-
-   type POSIX_Initialization_Threads_Table is array
-       ( RTEMS.Unsigned32 range <> ) of
-       RTEMS.POSIX_Initialization_Threads_Table_Entry;
-
-   type POSIX_Initialization_Threads_Table_Pointer is access all
-       POSIX_Initialization_Threads_Table;
-
-   type POSIX_API_Configuration_Table_Entry is
-      record
-         Maximum_Threads                 : Interfaces.C.Int;
-         Maximum_Mutexes                 : Interfaces.C.Int;
-         Maximum_Condition_Variables     : Interfaces.C.Int;
-         Maximum_Keys                    : Interfaces.C.Int;
-         Maximum_Queued_Signals          : Interfaces.C.Int;
-         Number_Of_Initialization_Tasks  : Interfaces.C.Int;
-         User_Initialization_Tasks_Table :
-            RTEMS.POSIX_Initialization_Threads_Table_Pointer;
-      end record;
-
-   type POSIX_API_Configuration_Table is array ( RTEMS.Unsigned32 range <> ) of
-      RTEMS.POSIX_API_Configuration_Table_Entry;
-
-   type POSIX_API_Configuration_Table_Pointer is access all
-          RTEMS.POSIX_API_Configuration_Table;
-
-   --
-   --  MPCI Information include MPCI Configuration
-   --
-
-   type Configuration_Table_Pointer;
-
-   type MP_Packet_Classes is (
-      MP_PACKET_MPCI_INTERNAL,
-      MP_PACKET_TASKS,
-      MP_PACKET_MESSAGE_QUEUE,
-      MP_PACKET_SEMAPHORE,
-      MP_PACKET_PARTITION,
-      MP_PACKET_REGION,
-      MP_PACKET_EVENT,
-      MP_PACKET_SIGNAL
-   );
-
-   for MP_Packet_Classes use (
-      MP_PACKET_MPCI_INTERNAL    => 0,
-      MP_PACKET_TASKS            => 1,
-      MP_PACKET_MESSAGE_QUEUE    => 2,
-      MP_PACKET_SEMAPHORE        => 3,
-      MP_PACKET_PARTITION        => 4,
-      MP_PACKET_REGION           => 5,
-      MP_PACKET_EVENT            => 6,
-      MP_PACKET_SIGNAL           => 7
-   );
-
-   type Packet_Prefix is
-      record
-         The_Class       : RTEMS.MP_Packet_Classes;
-         ID              : RTEMS.ID;
-         Source_TID      : RTEMS.ID;
-         Source_Priority : RTEMS.Task_Priority;
-         Return_Code     : RTEMS.Unsigned32;
-         Length          : RTEMS.Unsigned32;
-         To_Convert      : RTEMS.Unsigned32;
-         Timeout         : RTEMS.Interval;
-      end record;
-
-   type Packet_Prefix_Pointer is access all Packet_Prefix;
-
-   type MPCI_Initialization_Entry is access procedure (
-      Configuration : in     RTEMS.Configuration_Table_Pointer
-   );
-
-   type MPCI_Get_Packet_Entry is access procedure (
-      Packet : access RTEMS.Packet_Prefix_Pointer
-   );
-
-   type MPCI_Return_Packet_Entry is access procedure (
-      Packet : in     RTEMS.Packet_Prefix_Pointer
-   );
-
-   type MPCI_Send_Entry is access procedure (
-      Packet : in     RTEMS.Packet_Prefix_Pointer
-   );
-
-   type MPCI_Receive_Entry is access procedure (
-      Packet : access RTEMS.Packet_Prefix_Pointer
-   );
-
-   type MPCI_Table is
-      record
-         Default_Timeout     : RTEMS.Unsigned32; -- in ticks
-         Maximum_Packet_Size : RTEMS.Unsigned32;
-         Initialization      : RTEMS.MPCI_Initialization_Entry;
-         Get_Packet          : RTEMS.MPCI_Get_Packet_Entry;
-         Return_Packet       : RTEMS.MPCI_Return_Packet_Entry;
-         Send                : RTEMS.MPCI_Send_Entry;
-         Receive             : RTEMS.MPCI_Receive_Entry;
-      end record;
-
-   type MPCI_Table_Pointer is access all MPCI_Table;
-
-   --
-   --  Configuration Information
-   --
-
-   type Multiprocessing_Table is
-      record
-         Node                   : RTEMS.Unsigned32;
-         Maximum_Nodes          : RTEMS.Unsigned32;
-         Maximum_Global_Objects : RTEMS.Unsigned32;
-         Maximum_Proxies        : RTEMS.Unsigned32;
-         User_MPCI_Table        : RTEMS.MPCI_Table_Pointer;
-      end record;
-
-   type Multiprocessing_Table_Pointer is access all Multiprocessing_Table;
-
-   type Configuration_Table is
-      record
-          Work_Space_Start             : RTEMS.Address;
-          Work_Space_Size              : RTEMS.Unsigned32;
-          Maximum_Extensions           : RTEMS.Unsigned32;
-          Microseconds_Per_Tick        : RTEMS.Unsigned32;
-          Ticks_Per_Timeslice          : RTEMS.Unsigned32;
-          Maximum_Devices              : RTEMS.Unsigned32;
-          Number_Of_Device_Drivers     : RTEMS.Unsigned32;
-          Device_Driver_Table          : RTEMS.Driver_Address_Table_Pointer;
-          Number_Of_Initial_Extensions : RTEMS.Unsigned32;
-          User_Extension_Table         : RTEMS.Extensions_Table_Pointer;
-          User_Multiprocessing_Table   : RTEMS.Multiprocessing_Table_Pointer;
-          RTEMS_API_Configuration      : RTEMS.API_Configuration_Table_Pointer;
-          POSIX_API_Configuration      : RTEMS.POSIX_API_Configuration_Table_Pointer;
-      end record;
-
-   type Configuration_Table_Pointer is access all Configuration_Table;
-
-   --
-   --  For now, do not provide access to the CPU Table from Ada.
-   --  When this type is provided, a CPU dependent file must
-   --  define it.
-   --
-
-   subtype CPU_Table is RTEMS.Address;
-   type CPU_Table_Pointer is access all CPU_Table;
-
-   --
-   --  Utility Functions
-   --
-
-   function From_Ada_Boolean (
-      Ada_Boolean : Standard.Boolean
-   ) return RTEMS.Boolean;
-
-   function To_Ada_Boolean (
-      RTEMS_Boolean : RTEMS.Boolean
-   ) return Standard.Boolean;
-
-   function Milliseconds_To_Microseconds (
-      Milliseconds : RTEMS.Unsigned32
-   ) return RTEMS.Unsigned32;
-
-   function Microseconds_To_Ticks (
-      Microseconds : RTEMS.Unsigned32
-   ) return RTEMS.Interval;
-
-   function Milliseconds_To_Ticks (
-      Milliseconds : RTEMS.Unsigned32
-   ) return RTEMS.Interval;
-
-   function Build_Name (
-      C1 : in     Character;
-      C2 : in     Character;
-      C3 : in     Character;
-      C4 : in     Character
-   ) return RTEMS.Name;
-
-   procedure Name_To_Characters (
-      Name : in     RTEMS.Name;
-      C1   :    out Character;
-      C2   :    out Character;
-      C3   :    out Character;
-      C4   :    out Character
-   );
-
-   function Get_Node (
-      ID : in     RTEMS.ID
-   ) return RTEMS.Unsigned32;
-
-   function Get_Index (
-      ID : in     RTEMS.ID
-   ) return RTEMS.Unsigned32;
-
-   function Are_Statuses_Equal (
-      Status  : in     RTEMS.Status_Codes;
-      Desired : in     RTEMS.Status_Codes
-   ) return Standard.Boolean;
-
-   function Is_Status_Successful (
-      Status  : in     RTEMS.Status_Codes
-   ) return Standard.Boolean;
-
-   function Subtract (
-      Left   : in     RTEMS.Address;
-      Right  : in     RTEMS.Address
-   ) return RTEMS.Unsigned32;
-
-   function Are_Equal (
-      Left   : in     RTEMS.Address;
-      Right  : in     RTEMS.Address
-   ) return Standard.Boolean;
-   --
-   --  RTEMS API
-   --
-
-   --
-   --  Initialization Manager
-   --
-
-   procedure Initialize_Executive (
-      Configuration_Table   : in     RTEMS.Configuration_Table_Pointer;
-      CPU_Table             : in     RTEMS.CPU_Table_Pointer
-   );
-
-   procedure Initialize_Executive_Early (
-      Configuration_Table : in     RTEMS.Configuration_Table_Pointer;
-      CPU_Table           : in     RTEMS.CPU_Table_Pointer;
-      Level               :    out RTEMS.ISR_Level
-   );
-
-   procedure Initialize_Executive_Late (
-      BSP_Level : in    RTEMS.ISR_Level
-   );
-
-   procedure Shutdown_Executive (
-      Result : in     RTEMS.Unsigned32
-   );
-
-   --
-   --  Task Manager
-   --
-
-   procedure Task_Create (
-      Name             : in     RTEMS.Name;
-      Initial_Priority : in     RTEMS.Task_Priority;
-      Stack_Size       : in     Unsigned32;
-      Initial_Modes    : in     RTEMS.Mode;
-      Attribute_Set    : in     RTEMS.Attribute;
-      ID               :    out RTEMS.ID;
-      Result           :    out RTEMS.Status_Codes
-   );
-
-   procedure Task_Ident (
-      Name   : in     RTEMS.Name;
-      Node   : in     RTEMS.Node;
-      ID     :    out RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   );
-
-   procedure Task_Start (
-      ID          : in     RTEMS.ID;
-      Entry_Point : in     RTEMS.Task_Entry;
-      Argument    : in     RTEMS.Task_Argument;
-      Result      :    out RTEMS.Status_Codes
-   );
-
-   procedure Task_Restart (
-      ID       : in     RTEMS.ID;
-      Argument : in     RTEMS.Task_Argument;
-      Result   :    out RTEMS.Status_Codes
-   );
-
-   procedure Task_Delete (
-      ID     : in     RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   );
-
-   procedure Task_Suspend (
-      ID     : in     RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   );
-
-   procedure Task_Resume (
-      ID     : in     RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   );
-
-   procedure Task_Set_Priority (
-      ID           : in     RTEMS.ID;
-      New_Priority : in     RTEMS.Task_Priority;
-      Old_Priority :    out RTEMS.Task_Priority;
-      Result       :    out RTEMS.Status_Codes
-   );
-
-   procedure Task_Mode (
-      Mode_Set          : in     RTEMS.Mode;
-      Mask              : in     RTEMS.Mode;
-      Previous_Mode_Set :    out RTEMS.Mode;
-      Result            :    out RTEMS.Status_Codes
-   );
-
-   procedure Task_Get_Note (
-      ID      : in     RTEMS.ID;
-      Notepad : in     RTEMS.Notepad_Index;
-      Note    :    out RTEMS.Unsigned32;
-      Result  :    out RTEMS.Status_Codes
-   );
-
-   procedure Task_Set_Note (
-      ID      : in     RTEMS.ID;
-      Notepad : in     RTEMS.Notepad_Index;
-      Note    : in     RTEMS.Unsigned32;
-      Result  :    out RTEMS.Status_Codes
-   );
-
-   procedure Task_Wake_When (
-      Time_Buffer : in     RTEMS.Time_Of_Day;
-      Result      :    out RTEMS.Status_Codes
-   );
-
-   procedure Task_Wake_After (
-      Ticks  : in     RTEMS.Interval;
-      Result :    out RTEMS.Status_Codes
-   );
-
-   --
-   --  Interrupt Manager
-   --
-
-   procedure Interrupt_Catch (
-      New_ISR_Handler : in     RTEMS.Address;
-      Vector          : in     RTEMS.Vector_Number;
-      Old_ISR_Handler :    out RTEMS.Address;
-      Result          :    out RTEMS.Status_Codes
-   );
-
-   function Interrupt_Disable
-   return RTEMS.ISR_Level;
-
-   procedure Interrupt_Enable (
-      Level : in     RTEMS.ISR_Level
-   );
-
-   procedure Interrupt_Flash (
-      Level : in     RTEMS.ISR_Level
-   );
-
-   function Interrupt_Is_In_Progress
-   return RTEMS.Boolean;
-
-   --
-   --  Clock Manager
-   --
-
-   procedure Clock_Get (
-      Option      : in     RTEMS.Clock_Get_Options;
-      Time_Buffer : in     RTEMS.Address;
-      Result      :    out RTEMS.Status_Codes
-   );
-
-   procedure Clock_Set (
-      Time_Buffer : in     RTEMS.Time_Of_Day;
-      Result      :    out RTEMS.Status_Codes
-   );
-
-   procedure Clock_Tick (
-      Result :    out RTEMS.Status_Codes
-   );
-
-   --
-   --  Extension Manager
-   --
-
-   procedure Extension_Create (
-      Name   : in     RTEMS.Name;
-      Table  : in     RTEMS.Extensions_Table_Pointer;
-      ID     :    out RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   );
-
-   procedure Extension_Ident (
-      Name   : in     RTEMS.Name;
-      ID     :    out RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   );
-
-   procedure Extension_Delete (
-      ID     : in     RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   );
-
-
-   --
-   --  Timer Manager
-   --
-
-   procedure Timer_Create (
-      Name   : in     RTEMS.Name;
-      ID     :    out RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   );
-
-   procedure Timer_Ident (
-      Name   : in     RTEMS.Name;
-      ID     :    out RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   );
-
-   procedure Timer_Delete (
-      ID     : in     RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   );
-
-   procedure Timer_Fire_After (
-      ID        : in     RTEMS.ID;
-      Ticks     : in     RTEMS.Interval;
-      Routine   : in     RTEMS.Timer_Service_Routine;
-      User_Data : in     RTEMS.Address;
-      Result    :    out RTEMS.Status_Codes
-   );
-
-   procedure Timer_Fire_When (
-      ID        : in     RTEMS.ID;
-      Wall_Time : in     RTEMS.Time_Of_Day;
-      Routine   : in     RTEMS.Timer_Service_Routine;
-      User_Data : in     RTEMS.Address;
-      Result    :    out RTEMS.Status_Codes
-   );
-
-   procedure Timer_Reset (
-      ID     : in     RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   );
-
-   procedure Timer_Cancel (
-      ID     : in     RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   );
-
-   --
-   --  Semaphore Manager
-   --
-
-   procedure Semaphore_Create (
-      Name             : in     RTEMS.Name;
-      Count            : in     RTEMS.Unsigned32;
-      Attribute_Set    : in     RTEMS.Attribute;
-      Priority_Ceiling : in     RTEMS.Task_Priority;
-      ID               :    out RTEMS.ID;
-      Result           :    out RTEMS.Status_Codes
-   );
-
-   procedure Semaphore_Delete (
-      ID     : in     RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   );
-
-   procedure Semaphore_Ident (
-      Name   : in     RTEMS.Name;
-      Node   : in     RTEMS.Unsigned32;
-      ID     :    out RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   );
-
-   procedure Semaphore_Obtain (
-      ID         : in     RTEMS.ID;
-      Option_Set : in     RTEMS.Option;
-      Timeout    : in     RTEMS.Interval;
-      Result     :    out RTEMS.Status_Codes
-   );
-
-   procedure Semaphore_Release (
-      ID     : in     RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   );
-
-
-   --
-   --  Message Queue Manager
-   --
-
-   procedure Message_Queue_Create (
-      Name             : in     RTEMS.Name;
-      Count            : in     RTEMS.Unsigned32;
-      Max_Message_Size : in     RTEMS.Unsigned32;
-      Attribute_Set    : in     RTEMS.Attribute;
-      ID               :    out RTEMS.ID;
-      Result           :    out RTEMS.Status_Codes
-   );
-
-   procedure Message_Queue_Ident (
-      Name   : in     RTEMS.Name;
-      Node   : in     RTEMS.Unsigned32;
-      ID     :    out RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   );
-
-   procedure Message_Queue_Delete (
-      ID     : in     RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   );
-
-   procedure Message_Queue_Send (
-      ID     : in     RTEMS.ID;
-      Buffer : in     RTEMS.Address;
-      Size   : in     RTEMS.Unsigned32;
-      Result :    out RTEMS.Status_Codes
-   );
-
-   procedure Message_Queue_Urgent (
-      ID     : in     RTEMS.ID;
-      Buffer : in     RTEMS.Address;
-      Size   : in     RTEMS.Unsigned32;
-      Result :    out RTEMS.Status_Codes
-   );
-
-   procedure Message_Queue_Broadcast (
-      ID     : in     RTEMS.ID;
-      Buffer : in     RTEMS.Address;
-      Size   : in     RTEMS.Unsigned32;
-      Count  :    out RTEMS.Unsigned32;
-      Result :    out RTEMS.Status_Codes
-   );
-
-   procedure Message_Queue_Receive (
-      ID         : in     RTEMS.ID;
-      Buffer     : in     RTEMS.Address;
-      Option_Set : in     RTEMS.Option;
-      Timeout    : in     RTEMS.Interval;
-      Size       :    out RTEMS.Unsigned32;
-      Result     :    out RTEMS.Status_Codes
-   );
-
-   procedure Message_Queue_Flush (
-      ID     : in     RTEMS.ID;
-      Count  :    out RTEMS.Unsigned32;
-      Result :    out RTEMS.Status_Codes
-   );
-
-
-   --
-   --  Event Manager
-   --
-
-   procedure Event_Send (
-      ID       : in     RTEMS.ID;
-      Event_In : in     RTEMS.Event_Set;
-      Result   :    out RTEMS.Status_Codes
-   );
-
-   procedure Event_Receive (
-      Event_In   : in     RTEMS.Event_Set;
-      Option_Set : in     RTEMS.Option;
-      Ticks      : in     RTEMS.Interval;
-      Event_Out  :    out RTEMS.Event_Set;
-      Result     :    out RTEMS.Status_Codes
-   );
-
-   --
-   --  Signal Manager
-   --
-
-   procedure Signal_Catch (
-      ASR_Handler : in     RTEMS.ASR_Handler;
-      Mode_Set    : in     RTEMS.Mode;
-      Result      :    out RTEMS.Status_Codes
-   );
-
-   procedure Signal_Send (
-      ID         : in     RTEMS.ID;
-      Signal_Set : in     RTEMS.Signal_Set;
-      Result     :    out RTEMS.Status_Codes
-   );
-
-
-   --
-   --  Partition Manager
-   --
-
-   procedure Partition_Create (
-      Name             : in     RTEMS.Name;
-      Starting_Address : in     RTEMS.Address;
-      Length           : in     RTEMS.Unsigned32;
-      Buffer_Size      : in     RTEMS.Unsigned32;
-      Attribute_Set    : in     RTEMS.Attribute;
-      ID               :    out RTEMS.ID;
-      Result           :    out RTEMS.Status_Codes
-   );
-
-   procedure Partition_Ident (
-      Name   : in     RTEMS.Name;
-      Node   : in     RTEMS.Unsigned32;
-      ID     :    out RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   );
-
-   procedure Partition_Delete (
-      ID     : in     RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   );
-
-   procedure Partition_Get_Buffer (
-      ID     : in     RTEMS.ID;
-      Buffer :    out RTEMS.Address;
-      Result :    out RTEMS.Status_Codes
-   );
-
-   procedure Partition_Return_Buffer (
-      ID     : in     RTEMS.ID;
-      Buffer : in     RTEMS.Address;
-      Result :    out RTEMS.Status_Codes
-   );
-
-
-   --
-   --  Region Manager
-   --
-
-   procedure Region_Create (
-      Name             : in     RTEMS.Name;
-      Starting_Address : in     RTEMS.Address;
-      Length           : in     RTEMS.Unsigned32;
-      Page_Size        : in     RTEMS.Unsigned32;
-      Attribute_Set    : in     RTEMS.Attribute;
-      ID               :    out RTEMS.ID;
-      Result           :    out RTEMS.Status_Codes
-   );
-
-   procedure Region_Ident (
-      Name   : in     RTEMS.Name;
-      ID     :    out RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   );
-
-   procedure Region_Delete (
-      ID     : in     RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   );
-
-   procedure Region_Extend (
-      ID               : in     RTEMS.ID;
-      Starting_Address : in     RTEMS.Address;
-      Length           : in     RTEMS.Unsigned32;
-      Result           :    out RTEMS.Status_Codes
-   );
-
-   procedure Region_Get_Segment (
-      ID         : in     RTEMS.ID;
-      Size       : in     RTEMS.Unsigned32;
-      Option_Set : in     RTEMS.Option;
-      Timeout    : in     RTEMS.Interval;
-      Segment    :    out RTEMS.Address;
-      Result     :    out RTEMS.Status_Codes
-   );
-
-   procedure Region_Get_Segment_Size (
-      ID         : in     RTEMS.ID;
-      Segment    : in     RTEMS.Address;
-      Size       :    out RTEMS.Unsigned32;
-      Result     :    out RTEMS.Status_Codes
-   );
-
-   procedure Region_Return_Segment (
-      ID      : in     RTEMS.ID;
-      Segment : in     RTEMS.Address;
-      Result  :    out RTEMS.Status_Codes
-   );
-
-
-   --
-   --  Dual Ported Memory Manager
-   --
-
-   procedure Port_Create (
-      Name           : in     RTEMS.Name;
-      Internal_Start : in     RTEMS.Address;
-      External_Start : in     RTEMS.Address;
-      Length         : in     RTEMS.Unsigned32;
-      ID             :    out RTEMS.ID;
-      Result         :    out RTEMS.Status_Codes
-   );
-
-   procedure Port_Ident (
-      Name   : in     RTEMS.Name;
-      ID     :    out RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   );
-
-   procedure Port_Delete (
-      ID     : in     RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   );
-
-   procedure Port_External_To_Internal (
-      ID       : in     RTEMS.ID;
-      External : in     RTEMS.Address;
-      Internal :    out RTEMS.Address;
-      Result   :    out RTEMS.Status_Codes
-   );
-
-   procedure Port_Internal_To_External (
-      ID       : in     RTEMS.ID;
-      Internal : in     RTEMS.Address;
-      External :    out RTEMS.Address;
-      Result   :    out RTEMS.Status_Codes
-   );
-
-   --
-   --  Input/Output Manager
-   --
-
-   procedure IO_Initialize (
-      Major        : in     RTEMS.Device_Major_Number;
-      Minor        : in     RTEMS.Device_Minor_Number;
-      Argument     : in     RTEMS.Address;
-      Return_Value :    out RTEMS.Unsigned32;
-      Result       :    out RTEMS.Status_Codes
-   );
-
-   procedure IO_Register_Name (
-      Name   : in     String;
-      Major  : in     RTEMS.Device_Major_Number;
-      Minor  : in     RTEMS.Device_Minor_Number;
-      Result :    out RTEMS.Status_Codes
-   );
-
-   procedure IO_Lookup_Name (
-      Name         : in     String;
-      Device_Info  :    out RTEMS.Driver_Name_t;
-      Result       :    out RTEMS.Status_Codes
-   );
-
-   procedure IO_Open (
-      Major        : in     RTEMS.Device_Major_Number;
-      Minor        : in     RTEMS.Device_Minor_Number;
-      Argument     : in     RTEMS.Address;
-      Result       :    out RTEMS.Status_Codes
-   );
-
-   procedure IO_Close (
-      Major        : in     RTEMS.Device_Major_Number;
-      Minor        : in     RTEMS.Device_Minor_Number;
-      Argument     : in     RTEMS.Address;
-      Result       :    out RTEMS.Status_Codes
-   );
-
-   procedure IO_Read (
-      Major        : in     RTEMS.Device_Major_Number;
-      Minor        : in     RTEMS.Device_Minor_Number;
-      Argument     : in     RTEMS.Address;
-      Result       :    out RTEMS.Status_Codes
-   );
-
-   procedure IO_Write (
-      Major        : in     RTEMS.Device_Major_Number;
-      Minor        : in     RTEMS.Device_Minor_Number;
-      Argument     : in     RTEMS.Address;
-      Result       :    out RTEMS.Status_Codes
-   );
-
-   procedure IO_Control (
-      Major        : in     RTEMS.Device_Major_Number;
-      Minor        : in     RTEMS.Device_Minor_Number;
-      Argument     : in     RTEMS.Address;
-      Result       :    out RTEMS.Status_Codes
-   );
-
-
-   --
-   --  Fatal Error Manager
-   --
-
-   procedure Fatal_Error_Occurred (
-      The_Error : in     RTEMS.Unsigned32
-   );
-
-
-   --
-   --  Rate Monotonic Manager
-   --
-
-   procedure Rate_Monotonic_Create (
-      Name   : in     RTEMS.Name;
-      ID     :    out RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   );
-
-   procedure Rate_Monotonic_Ident (
-      Name   : in     RTEMS.Name;
-      ID     :    out RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   );
-
-   procedure Rate_Monotonic_Delete (
-      ID     : in     RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   );
-
-   procedure Rate_Monotonic_Cancel (
-      ID     : in     RTEMS.ID;
-      Result :    out RTEMS.Status_Codes
-   );
-
-   procedure Rate_Monotonic_Period (
-      ID      : in     RTEMS.ID;
-      Length  : in     RTEMS.Interval;
-      Result  :    out RTEMS.Status_Codes
-   );
-
-   procedure Rate_Monotonic_Get_Status (
-      ID      : in     RTEMS.ID;
-      Status  :    out RTEMS.Rate_Monotonic_Period_Status;
-      Result  :    out RTEMS.Status_Codes
-   );
-
-   --
-   --  Multiprocessing Manager
-   --
-
-   procedure Multiprocessing_Announce;
-
-
-   --
-   --  Debug Manager
-   --
-
-   Debug_All_Mask : constant RTEMS.Debug_Set := 16#ffffffff#;
-   Debug_Region   : constant RTEMS.Debug_Set := 16#00000001#;
-
-   procedure Debug_Enable (
-      To_Be_Enabled : in     RTEMS.Debug_Set
-   );
-
-   procedure Debug_Disable (
-      To_Be_Disabled : in     RTEMS.Debug_Set
-   );
-
-   function Debug_Is_Enabled (
-      Level : in     RTEMS.Debug_Set
-   ) return RTEMS.Boolean;
-
-  --
-  --  Some Useful Data Items
-  --
-
-  Configuration : RTEMS.Configuration_Table_Pointer;
-  pragma Import (C, Configuration, "_Configuration_Table");
-
-
-private
-end RTEMS;
diff --git a/cpukit/libcsupport/include/chain.h b/cpukit/libcsupport/include/chain.h
deleted file mode 100644
index 98cf2b1a86..0000000000
--- a/cpukit/libcsupport/include/chain.h
+++ /dev/null
@@ -1,362 +0,0 @@
-/*  chain.h
- * 
- *  This include file contains all the constants and structures associated
- *  with doubly linked chains.  This file actually just provides an
- *  interface to the chain object in rtems.
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- * $ld:
- */
-
-#ifndef __CHAIN_h
-#define __CHAIN_h
-
-#include <rtems.h>
-
-/* 
- *  Chain_Initialize
- *
- *  This routine initializes the_chain structure to manage the
- *  contiguous array of number_nodes nodes which starts at
- *  starting_address.  Each node is of node_size bytes.
- *
- *  Chain_Control                    *the_chain,		 * IN  * 
- *  void                             *starting_address,		 * IN  * 
- *  rtems_unsigned32                  number_nodes,		 * IN  * 
- *  rtems_unsigned32                  node_size			 * IN  * 
- */
-
-#define Chain_Initialize( the_chain, starting_address, \
-                          number_nodes, node_size ) \
-       _Chain_Initialize( the_chain, starting_address, \
-                          number_nodes, node_size ) \
-
-
-/* 
- *  Chain_Initialize_empty
- *
- *  This routine initializes the specified chain to contain zero nodes.
- *
- *  Chain_Control                    *the_chain			 * IN  * 
- */
-
-#define Chain_Initialize_empty( the_chain ) \
-       _Chain_Initialize_empty( the_chain )
- 
-
-/*
- *  Chain_Are_nodes_equal
- *
- *  This function returns TRUE if LEFT and RIGHT are equal,
- *  and FALSE otherwise.
- *
- *  Chain_Node                       *left,			 * IN  * 
- *  Chain_Node                       *right			 * IN  * 
- */
- 
-#define Chain_Are_nodes_equal( left, right ) \
-       _Chain_Are_nodes_equal( left, right )
-
-
-/* 
- *  Chain_Extract_unprotected
- *
- *  This routine extracts the_node from the chain on which it resides.
- *  It does NOT disable interrupts to insure the atomicity of the
- *  extract operation.
- *
- *  Chain_Node                       *the_node			 * IN  * 
- */
-
-#define Chain_Extract_unprotected( the_node ) \
-       _Chain_Extract_unprotected( the_node )
-
-
-/* 
- *  Chain_Extract
- *
- *  This routine extracts the_node from the chain on which it resides.
- *  It disables interrupts to insure the atomicity of the
- *  extract operation.
- *
- *  Chain_Node                       *the_node			 * IN  * 
- */
-
-#define Chain_Extract( the_node ) \
-       _Chain_Extract( the_node )
-
-
-/* 
- *  Chain_Get_unprotected
- *
- *  This function removes the first node from the_chain and returns
- *  a pointer to that node.  If the_chain is empty, then NULL is returned.
- *  It does NOT disable interrupts to insure the atomicity of the
- *  get operation.
- *
- *  Chain_Control                    *the_chain			 * IN  * 
- */
-
-#define Chain_Get_unprotected( the_chain ) \
-       _Chain_Get_unprotected( the_chain )
-
-
-/* 
- *  Chain_Get
- *
- *  This function removes the first node from the_chain and returns
- *  a pointer to that node.  If the_chain is empty, then NULL is returned.
- *  It disables interrupts to insure the atomicity of the
- *  get operation.
- *
- *  Chain_Control                    *the_chain			 * IN  * 
- */
-
-#define Chain_Get( the_chain ) \
-       _Chain_Get( the_chain )
-
-
-/* 
- *  Chain_Get_first_unprotected
- *
- *  This function removes the first node from the_chain and returns
- *  a pointer to that node.  It does NOT disable interrupts to insure
- *  the atomicity of the get operation.
- *
- *  Chain_Control                    *the_chain			 * IN  * 
- */
-
-#define Chain_Get_first_unprotected( the_chain ) \
-       _Chain_Get_first_unprotected( the_chain )
-
-
-/* 
- *  Chain_Insert_unprotected
- *
- *  This routine inserts the_node on a chain immediately following
- *  after_node.  It does NOT disable interrupts to insure the atomicity
- *  of the extract operation.
- *
- *  Chain_Node                       *after_node,		 * IN  * 
- *  Chain_Node                       *the_node			 * IN  * 
- */
-
-#define Chain_Insert_unprotected( after_node, the_node ) \
-       _Chain_Insert_unprotected( after_node, the_node )
-
-
-/* 
- *  Chain_Insert
- *
- *  This routine inserts the_node on a chain immediately following
- *  after_node.  It disables interrupts to insure the atomicity
- *  of the extract operation.
- *
- *  Chain_Node                       *after_node,		 * IN  * 
- *  Chain_Node                       *the_node			 * IN  * 
- */
-
-#define Chain_Insert( after_node, the_node ) \
-       _Chain_Insert( after_node, the_node )
-
-
-/* 
- *  Chain_Append_unprotected
- *
- *  This routine appends the_node onto the end of the_chain.
- *  It does NOT disable interrupts to insure the atomicity of the
- *  append operation.
- *
- *  Chain_Control                    *the_chain,		 * IN  * 
- *  Chain_Node                       *the_node			 * IN  * 
- */
-
-#define Chain_Append_unprotected( the_chain, the_node ) \
-       _Chain_Append_unprotected( the_chain, the_node )
-
-
-/* 
- *  Chain_Append
- *
- *  This routine appends the_node onto the end of the_chain.
- *  It disables interrupts to insure the atomicity of the
- *  append operation.
- *
- *  Chain_Control                    *the_chain,		 * IN  * 
- *  Chain_Node                       *the_node			 * IN  * 
- */
-
-#define Chain_Append( the_chain, the_node ) \
-       _Chain_Append( the_chain, the_node )
-
-
-/* 
- *  Chain_Prepend_unprotected
- *
- *  This routine prepends the_node onto the front of the_chain.
- *  It does NOT disable interrupts to insure the atomicity of the
- *  prepend operation.
- *
- *  Chain_Control                    *the_chain,		 * IN  * 
- *  Chain_Node                       *the_node			 * IN  * 
- */
-
-#define Chain_Prepend_unprotected( the_chain, the_node ) \
-       _Chain_Prepend_unprotected( the_chain, the_node )
-
-
-/* 
- *  Chain_Prepend
- *
- *  This routine prepends the_node onto the front of the_chain.
- *  It disables interrupts to insure the atomicity of the
- *  prepend operation.
- *
- *  Chain_Control                    *the_chain,		 * IN  * 
- *  Chain_Node                       *the_node			 * IN  * 
- */
-
-#define Chain_Prepend( the_chain, the_node ) \
-       _Chain_Prepend( the_chain, the_node )
-
-
-/* 
- *  Chain_Head
- *
- *  This function returns a pointer to the first node on the chain.
- *
- *  Chain_Control                    *the_chain			 * IN  * 
- */
-
-#define Chain_Head( the_chain ) \
-       _Chain_Head( the_chain )
-
-
-/* 
- *  Chain_Tail
- *
- *  This function returns a pointer to the last node on the chain.
- *
- *  Chain_Control                    *the_chain			 * IN  * 
- */
-
-#define Chain_Tail( the_chain ) \
-       _Chain_Tail( the_chain )
-
-
-/* 
- *  Chain_Is_head
- *
- *  This function returns TRUE if the_node is the head of the_chain and
- *  FALSE otherwise.
- *
- *  Chain_Control                    *the_chain,		 * IN  * 
- *  Chain_Node                       *the_node			 * IN  * 
- */
-
-#define Chain_Is_head( the_chain, the_node ) \
-       _Chain_Is_head( the_chain, the_node )
-
-
-/* 
- *  Chain_Is_tail
- *
- *  This function returns TRUE if the_node is the tail of the_chain and
- *  FALSE otherwise.
- *
- *  Chain_Control                    *the_chain,		 * IN  * 
- *  Chain_Node                       *the_node			 * IN  * 
- */
-
-#define Chain_Is_tail( the_chain, the_node ) \
-       _Chain_Is_tail( the_chain, the_node )
-
-
-/* 
- *  Chain_Is_first
- *
- *  This function returns TRUE if the_node is the first node on a chain and
- *  FALSE otherwise.
- *
- *  Chain_Node                       *the_node			 * IN  * 
- */
-
-#define Chain_Is_first( the_node ) \
-       _Chain_Is_first( the_node )
-
-
-/* 
- *  Chain_Is_last
- *
- *  This function returns TRUE if the_node is the last node on a chain and
- *  FALSE otherwise.
- *
- *  Chain_Node                       *the_node			 * IN  * 
- */
-
-#define Chain_Is_last( the_node ) \
-       _Chain_Is_last( the_node )
-
-
-/* 
- *  Chain_Is_empty
- *
- *  This function returns TRUE if there are no nodes on the_chain and
- *  FALSE otherwise.
- *
- *  Chain_Control                    *the_chain			 * IN  * 
- */
-
-#define Chain_Is_empty( the_chain ) \
-       _Chain_Is_empty( the_chain )
-
-
-/* 
- *  Chain_Has_only_one_node
- *
- *  This function returns TRUE if there is only one node on the_chain and
- *  FALSE otherwise.
- *
- *  Chain_Control                    *the_chain			 * IN  * 
- */
-
-#define Chain_Has_only_one_node( the_chain ) \
-       _Chain_Has_only_one_node( the_chain )
-
-
-/* 
- *  Chain_Is_null
- *
- *  This function returns TRUE if the_chain is NULL and FALSE otherwise.
- *
- *  Chain_Control                    *the_chain			 * IN  * 
- */
-
-#define Chain_Is_null( the_chain ) \
-       _Chain_Is_null( the_chain )
-
-
-/* 
- *  Chain_Is_null_node
- *
- *  This function returns TRUE if the_node is NULL and FALSE otherwise.
- *
- *  Chain_Node                       *the_node			 * IN  * 
- */
-
-#define Chain_Is_null_node( the_node ) \
-       _Chain_Is_null_node( the_node )
-
-
-#undef __RTEMS_APPLICATION__
-#include <rtems/score/chain.inl>
-#define __RTEMS_APPLICATION__
-#endif
-/* end of include file */
diff --git a/cpukit/libcsupport/include/clockdrv.h b/cpukit/libcsupport/include/clockdrv.h
deleted file mode 100644
index 74c9d5e9f7..0000000000
--- a/cpukit/libcsupport/include/clockdrv.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*  clock.h
- *
- *  This file describes the Clock Driver for all boards.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __CLOCK_DRIVER_h
-#define __CLOCK_DRIVER_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* variables */
-
-extern volatile rtems_unsigned32 Clock_driver_ticks;
-extern rtems_device_major_number rtems_clock_major;
-extern rtems_device_minor_number rtems_clock_minor;
-
-/* default clock driver entry */
-
-#define CLOCK_DRIVER_TABLE_ENTRY \
-  { Clock_initialize, NULL, NULL, NULL, NULL, Clock_control }
- 
-rtems_device_driver Clock_initialize(
-  rtems_device_major_number,
-  rtems_device_minor_number,
-  void *
-);
-
-rtems_device_driver Clock_control(
-  rtems_device_major_number major,
-  rtems_device_minor_number minor,
-  void *pargp
-);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/cpukit/libcsupport/include/console.h b/cpukit/libcsupport/include/console.h
deleted file mode 100644
index 2f5173d757..0000000000
--- a/cpukit/libcsupport/include/console.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*  console.h
- *
- *  This file describes the Console Device Driver for all boards.
- *  This driver provides support for the standard C Library.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef _CONSOLE_DRIVER_h
-#define _CONSOLE_DRIVER_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define CONSOLE_DRIVER_TABLE_ENTRY \
-  { console_initialize, console_open, console_close, \
-    console_read, console_write, console_control }
-
-void console_reserve_resources(
-  rtems_configuration_table *configuration
-);
-
-rtems_device_driver console_initialize(
-  rtems_device_major_number,
-  rtems_device_minor_number,
-  void *
-);
-
-rtems_device_driver console_open(
-  rtems_device_major_number,
-  rtems_device_minor_number,
-  void *
-);
-
-rtems_device_driver console_close(
-  rtems_device_major_number,
-  rtems_device_minor_number,
-  void *
-);
-
-rtems_device_driver console_read(
-  rtems_device_major_number,
-  rtems_device_minor_number,
-  void *
-);
-
-rtems_device_driver console_write(
-  rtems_device_major_number,
-  rtems_device_minor_number,
-  void *
-);
-
-rtems_device_driver console_control(
-  rtems_device_major_number,
-  rtems_device_minor_number,
-  void *
-);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/cpukit/libcsupport/include/iosupp.h b/cpukit/libcsupport/include/iosupp.h
deleted file mode 100644
index 97175e0a7b..0000000000
--- a/cpukit/libcsupport/include/iosupp.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*  iosupp.h
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __IOSUPP_h
-#define __IOSUPP_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* character constants */
-
-#define BS              0x08            /* backspace */
-#define LF              0x0a            /* line feed */
-#define CR              0x0d            /* carriage return */
-#define XON             0x11            /* control-Q */
-#define XOFF            0x13            /* control-S */
-
-/* structures */
-
-#ifdef IOSUPP_INIT
-#define IOSUPP_EXTERN
-#else
-#undef IOSUPP_EXTERN
-#define IOSUPP_EXTERN  extern
-#endif
-
-/* functions */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/cpukit/libcsupport/include/motorola/mc68230.h b/cpukit/libcsupport/include/motorola/mc68230.h
deleted file mode 100644
index bde00c4cdd..0000000000
--- a/cpukit/libcsupport/include/motorola/mc68230.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * mc68230.h -- Low level support code for the Motorola 68230 Parallel
- *              Interface/Timer (PIT)
- *
- * Modified by Doug McBride, Colorado Space Grant College
- *
- * Format taken partly from RTEMS code and mostly from Motorola IDP user's
- * manual.  RTEMS copyright information below.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __MC68230_H__
-#define __MC68230_H__
-
-/* Some Motorola IDP User manual defines: */
-#define PIT_ADDR	0x00c01003		/* base address of the PIT */
-#define REGOFF	0x04				/* Difference between addresses */
-#define VECT	64
-#define H1VECT	0x00
-#define H2VECT	0x01
-#define H3VECT	0x02
-#define H4VECT	0x03
-
-/*
- * mc68230 register offsets
- */
-#define PGCR	0x00
-#define PSRR	1*REGOFF
-#define PADDR	2*REGOFF
-#define PBDDR	3*REGOFF
-#define PCDDR	4*REGOFF
-#define PIVR	5*REGOFF
-#define PACR	6*REGOFF
-#define PBCR	7*REGOFF
-#define PADR	8*REGOFF
-#define PBDR	9*REGOFF
-#define PAAR	10*REGOFF
-#define PBAR	11*REGOFF
-#define PCDR	12*REGOFF
-#define PITSR	13*REGOFF
-#define TCR		16*REGOFF
-#define TIVR	17*REGOFF
-#define CPRH	19*REGOFF
-#define CPRM	20*REGOFF
-#define CPRL	21*REGOFF
-#define CNTRH	23*REGOFF
-#define CNTRM	24*REGOFF
-#define CNTRL	25*REGOFF
-#define TSR		26*REGOFF
-
-/* Some RTEMS style defines: */
-#ifndef VOL8
-#define VOL8( ptr )   ((volatile rtems_unsigned8 *)(ptr))
-#endif
-
-#define MC68230_WRITE( reg, data ) \
-   *(VOL8(PIT_ADDR+reg)) = (data)
-
-#define MC68230_READ( reg, data ) \
-   (data) = *(VOL8(PIT_ADDR+reg))
-
-#endif
diff --git a/cpukit/libcsupport/include/motorola/mc68681.h b/cpukit/libcsupport/include/motorola/mc68681.h
deleted file mode 100644
index 7602097fd8..0000000000
--- a/cpukit/libcsupport/include/motorola/mc68681.h
+++ /dev/null
@@ -1,306 +0,0 @@
-/*
- * mc68681-duart.h -- Low level support code for the Motorola mc68681
- *                   DUART.
- *
- *  Originally written by rob@cygnus.com (Rob Savoye) for the libgloss
- *    IDP support.
- *
- *  $Id$
- */
-
-#ifndef __MC68681_H__
-#define __MC68681_H__
-
-/*
- *  In the dark ages when this controller was designed, it was actually
- *  possible to access data on unaligned byte boundaries with no penalty.
- *  Now we find this chip in configurations in which the registers are
- *  at 16-bit, 32-bit, and 64-bit boundaries at the whim of the board
- *  designer.  If the registers are not at byte addresses, then
- *  set this multiplier before including this file to correct the offsets.
- */
-
-#ifndef MC68681_OFFSET_MULTIPLIER
-#define MC68681_OFFSET_MULTIPLIER 1
-#endif
-
-#define __MC68681_REG(_R) ((_R) * MC68681_OFFSET_MULTIPLIER)
-
-/*
- * mc68681 register offsets Read/Write Addresses
- */
-#define MC68681_MODE_REG_1A  __MC68681_REG(0)  /* MR1A-MR Prior to Read */
-#define MC68681_MODE_REG_2A  __MC68681_REG(0)  /* MR2A-MR After Read    */
-
-#define MC68681_COUNT_MODE_CURRENT_MSB       __MC68681_REG(6)  /* CTU   */
-#define MC68681_COUNTER_TIMER_UPPER_REG      __MC68681_REG(6)  /* CTU   */
-#define MC68681_COUNT_MODE_CURRENT_LSB       __MC68681_REG(7)  /* CTL   */
-#define MC68681_COUNTER_TIMER_LOWER_REG      __MC68681_REG(7)  /* CTL   */
-#define MC68681_INTERRUPT_VECTOR_REG         __MC68681_REG(12) /* IVR   */
-
-#define MC68681_MODE_REG_1B  __MC68681_REG(8)  /* MR1B-MR Prior to Read */
-#define MC68681_MODE_REG_2B  __MC68681_REG(8)  /* MR2BA-MR After Read   */
-
-/*
- * mc68681 register offsets Read Only  Addresses
- */
-#define MC68681_STATUS_REG_A                __MC68681_REG(1)   /* SRA   */
-#define MC68681_MASK_ISR_REG                __MC68681_REG(2)   /* MISR  */
-#define MC68681_RECEIVE_BUFFER_A            __MC68681_REG(3)   /* RHRA  */
-#define MC68681_INPUT_PORT_CHANGE_REG       __MC68681_REG(4)   /* IPCR  */
-#define MC68681_INTERRUPT_STATUS_REG        __MC68681_REG(5)   /* ISR   */
-#define MC68681_STATUS_REG_B                __MC68681_REG(9)   /* SRB   */
-#define MC68681_RECEIVE_BUFFER_B            __MC68681_REG(11)  /* RHRB  */
-#define MC68681_INPUT_PORT                  __MC68681_REG(13)  /* IP    */
-#define MC68681_START_COUNT_CMD             __MC68681_REG(14)  /* SCC   */
-#define MC68681_STOP_COUNT_CMD              __MC68681_REG(15)  /* STC   */
-
-/*
- * mc68681 register offsets Write Only  Addresses
- */
-#define MC68681_CLOCK_SELECT_REG_A          __MC68681_REG(1)   /* CSRA  */
-#define MC68681_COMMAND_REG_A               __MC68681_REG(2)   /* CRA   */
-#define MC68681_TRANSMIT_BUFFER_A           __MC68681_REG(3)   /* THRA  */
-#define MC68681_AUX_CTRL_REG                __MC68681_REG(4)   /* ACR   */
-#define MC68681_INTERRUPT_MASK_REG          __MC68681_REG(5)   /* IMR   */
-#define MC68681_CLOCK_SELECT_REG_B          __MC68681_REG(9)   /* CSRB  */
-#define MC68681_COMMAND_REG_B               __MC68681_REG(10)  /* CRB   */
-#define MC68681_TRANSMIT_BUFFER_B           __MC68681_REG(11)  /* THRB  */
-#define MC68681_OUTPUT_PORT_CONFIG_REG      __MC68681_REG(13)  /* OPCR  */
-#define MC68681_OUTPUT_PORT_SET_REG         __MC68681_REG(14)  /* SOPBC */
-#define MC68681_OUTPUT_PORT_RESET_BITS      __MC68681_REG(15)  /* COPBC */
-
-
-#ifndef MC6681_VOL
-#define MC6681_VOL( ptr )   ((volatile unsigned char *)(ptr))
-#endif
-
-#define MC68681_WRITE( _base, _reg, _data ) \
-   *((volatile unsigned char *)_base+_reg) = (_data)
-
-#define MC68681_READ( _base, _reg ) \
-   *(((volatile unsigned char *)_base+_reg))
-
-
-
-#define  MC68681_CLEAR                                     0x00 
-
-#define MC68681_PORT_A                                     0
-#define MC68681_PORT_B                                     1
-
-/* 
- *  DUART Command Register Definitions: 
- *
- *  MC68681_COMMAND_REG_A,MC68681_COMMAND_REG_B       
- */
-#define MC68681_MODE_REG_ENABLE_RX                          0x01
-#define MC68681_MODE_REG_DISABLE_RX                         0x02
-#define MC68681_MODE_REG_ENABLE_TX                          0x04
-#define MC68681_MODE_REG_DISABLE_TX                         0x08
-#define MC68681_MODE_REG_RESET_MR_PTR                       0x10
-#define MC68681_MODE_REG_RESET_RX                           0x20
-#define MC68681_MODE_REG_RESET_TX                           0x30
-#define MC68681_MODE_REG_RESET_ERROR                        0x40
-#define MC68681_MODE_REG_RESET_BREAK                        0x50
-#define MC68681_MODE_REG_START_BREAK                        0x60
-#define MC68681_MODE_REG_STOP_BREAK                         0x70
-#define MC68681_MODE_REG_SET_RX_BRG                         0x80
-#define MC68681_MODE_REG_CLEAR_RX_BRG                       0x90
-#define MC68681_MODE_REG_SET_TX_BRG                         0xa0
-#define MC68681_MODE_REG_CLEAR_TX_BRG                       0xb0
-#define MC68681_MODE_REG_SET_STANDBY                        0xc0
-#define MC68681_MODE_REG_SET_ACTIVE                         0xd0
-
-/*
- * Mode Register Definitions
- *
- *  MC68681_MODE_REG_1A 
- *  MC68681_MODE_REG_1B 
- */
-#define MC68681_5BIT_CHARS                                  0x00
-#define MC68681_6BIT_CHARS                                  0x01
-#define MC68681_7BIT_CHARS                                  0x02
-#define MC68681_8BIT_CHARS                                  0x03
-
-#define MC68681_ODD_PARITY                                  0x00
-#define MC68681_EVEN_PARITY                                 0x04
-
-#define MC68681_WITH_PARITY                                 0x00
-#define MC68681_FORCE_PARITY                                0x08
-#define MC68681_NO_PARITY                                   0x10
-#define MC68681_MULTI_DROP                                  0x18
-
-#define MC68681_ERR_MODE_CHAR                               0x00
-#define MC68681_ERR_MODE_BLOCK                              0x20
-
-#define MC68681_RX_INTR_RX_READY                            0x00
-#define MC68681_RX_INTR_FFULL                               0x40
-
-#define MC68681_NO_RX_RTS_CTL                               0x00
-#define MC68681_RX_RTS_CTRL                                 0x80
-
-
-/*
- * Mode Register Definitions
- *
- *  MC68681_MODE_REG_2A
- *  MC68681_MODE_REG_2B
- */
-#define MC68681_STOP_BIT_LENGTH__563                        0x00
-#define MC68681_STOP_BIT_LENGTH__625                        0x01
-#define MC68681_STOP_BIT_LENGTH__688                        0x02
-#define MC68681_STOP_BIT_LENGTH__75                         0x03
-#define MC68681_STOP_BIT_LENGTH__813                        0x04
-#define MC68681_STOP_BIT_LENGTH__875                        0x05
-#define MC68681_STOP_BIT_LENGTH__938                        0x06
-#define MC68681_STOP_BIT_LENGTH_1                           0x07
-#define MC68681_STOP_BIT_LENGTH_1_563                       0x08
-#define MC68681_STOP_BIT_LENGTH_1_625                       0x09
-#define MC68681_STOP_BIT_LENGTH_1_688                       0x0a
-#define MC68681_STOP_BIT_LENGTH_1_75                        0x0b
-#define MC68681_STOP_BIT_LENGTH_1_813                       0x0c
-#define MC68681_STOP_BIT_LENGTH_1_875                       0x0d
-#define MC68681_STOP_BIT_LENGTH_1_938                       0x0e
-#define MC68681_STOP_BIT_LENGTH_2                           0x0f
-
-#define MC68681_CTS_ENABLE_TX                               0x10
-#define MC68681_TX_RTS_CTRL                                 0x20
-
-#define MC68681_CHANNEL_MODE_NORMAL                         0x00
-#define MC68681_CHANNEL_MODE_ECHO                           0x40
-#define MC68681_CHANNEL_MODE_LOCAL_LOOP                     0x80
-#define MC68681_CHANNEL_MODE_REMOTE_LOOP                    0xc0
-
-/*
- * Status Register Definitions
- *
- *    MC68681_STATUS_REG_A,  MC68681_STATUS_REG_B
- */
-#define MC68681_RX_READY                                    0x01
-#define MC68681_FFULL                                       0x02
-#define MC68681_TX_READY                                    0x04
-#define MC68681_TX_EMPTY                                    0x08
-#define MC68681_OVERRUN_ERROR                               0x10
-#define MC68681_PARITY_ERROR                                0x20
-#define MC68681_FRAMING_ERROR                               0x40
-#define MC68681_RECEIVED_BREAK                              0x80
-
-
-/* 
- * Interupt Status Register Definitions.  
- *
- * MC68681_INTERRUPT_STATUS_REG          
- */
-
-
-/* 
- *  Interupt Mask Register Definitions     
- *
- *  MC68681_INTERRUPT_MASK_REG 
- */
-#define MC68681_IR_TX_READY_A                               0x01
-#define MC68681_IR_RX_READY_A                               0x02
-#define MC68681_IR_BREAK_A                                  0x04
-#define MC68681_IR_COUNTER_READY                            0x08
-#define MC68681_IR_TX_READY_B                               0x10
-#define MC68681_IR_RX_READY_B                               0x20
-#define MC68681_IR_BREAK_B                                  0x40
-#define MC68681_IR_INPUT_PORT_CHANGE                        0x80
-
-/* 
- * Status Register Definitions.  
- * 
- * MC68681_STATUS_REG_A,MC68681_STATUS_REG_B          
- */
-#define MC68681_STATUS_RXRDY                                0x01
-#define MC68681_STATUS_FFULL                                0x02
-#define MC68681_STATUS_TXRDY                                0x04
-#define MC68681_STATUS_TXEMT                                0x08
-#define MC68681_STATUS_OVERRUN_ERROR                        0x10
-#define MC68681_STATUS_PARITY_ERROR                         0x20
-#define MC68681_STATUS_FRAMING_ERROR                        0x40
-#define MC68681_STATUS_RECEIVED_BREAK                       0x80
-
-/* 
- * Definitions for the Interrupt Vector Register: 
- *
- * MC68681_INTERRUPT_VECTOR_REG  
- */
-#define  MC68681_INTERRUPT_VECTOR_INIT                      0x0f
-
-/* 
- * Definitions for the Auxiliary Control Register  
- *
- * MC68681_AUX_CTRL_REG 
- */
-#define MC68681_AUX_BRG_SET1                                0x00
-#define MC68681_AUX_BRG_SET2                                0x80
-
-
-/* 
- * The following Baud rates assume the X1 clock pin is driven with a 
- * 3.6864 MHz signal.  If a different frequency is used the DUART channel
- * is running at the follwoing baud rate:
- *       ((Table Baud Rate)*frequency)/3.6864 MHz 
- */
-
-/* 
- * Definitions for the Clock Select Register: 
- *
- * MC68681_CLOCK_SELECT_REG_A,MC68681_CLOCK_SELECT_REG_A 
- * 
- * Note:  ACR[7] is the MSB of the Auxiliary Control register
- *        X is the extend bit.
- *        CRA - 0x08  Set Rx BRG Select Extend Bit   (X=1)
- *        CRA - 0x09  Clear Rx BRG Select Extend Bit (X=0)
- *        CRB - 0x0a  Set Tx BRG Select Extend Bit   (X=1)
- *        CRB - 0x0b  Clear Tx BRG Select Extend Bit (x=1)
- */
-#define MC68681_BAUD_RATE_MASK_50           0x00   /* ACR[7]=0,X=0 */
-                                                   /* ARC[7]=1,X=1 */
-#define MC68681_BAUD_RATE_MASK_75           0x00   /* ACR[7]=0,X=0 */
-                                                   /* ARC[7]=1,X=1 */
-#define MC68681_BAUD_RATE_MASK_110          0x01   
-#define MC68681_BAUD_RATE_MASK_134_5        0x02   
-#define MC68681_BAUD_RATE_MASK_150          0x03   /* ACR[7]=0,X=0 */
-                                                   /* ARC[7]=1,X=1 */
-#define MC68681_BAUD_RATE_MASK_200          0x03   /* ACR[7]=0,X=0 */
-                                                   /* ARC[7]=1,X=1 */
-#define MC68681_BAUD_RATE_MASK_300          0x04   /* ACR[7]=0,X=0 */
-                                                   /* ARC[7]=1,X=1 */
-#define MC68681_BAUD_RATE_MASK_600          0x05   /* ACR[7]=0,X=0 */
-                                                   /* ARC[7]=1,X=1 */
-#define MC68681_BAUD_RATE_MASK_1050         0x07   /* ACR[7]=0,X=0 */
-                                                   /* ARC[7]=1,X=1 */
-#define MC68681_BAUD_RATE_MASK_1200         0x06   /* ACR[7]=0,X=0 */
-                                                   /* ARC[7]=1,X=1 */
-#define MC68681_BAUD_RATE_MASK_1800         0x0a   /* ACR[7]=0,X=0 */
-                                                   /* ARC[7]=1,X=1 */
-#define MC68681_BAUD_RATE_MASK_2400         0x08   /* ACR[7]=0,X=0 */
-                                                   /* ARC[7]=1,X=1 */
-#define MC68681_BAUD_RATE_MASK_3600         0x04   /* ACR[7]=0,X=0 */
-                                                   /* ARC[7]=1,X=1 */
-#define MC68681_BAUD_RATE_MASK_4800         0x09   
-#define MC68681_BAUD_RATE_MASK_7200         0x0a   /* ACR[7]=0,X=0 */
-                                                   /* ARC[7]=1,X=1 */
-#define MC68681_BAUD_RATE_MASK_9600         0xbb   
-
-#define MC68681_BAUD_RATE_MASK_14_4K        0x05   /* ACR[7]=0,X=0 */
-                                                   /* ARC[7]=1,X=1 */
-#define MC68681_BAUD_RATE_MASK_19_2K        0xcc   /* ACR[7]=1,X=0 */
-                                                   /* ARC[7]=0,X=1 */
-#define MC68681_BAUD_RATE_MASK_28_8K        0x06   /* ACR[7]=0,X=0 */
-                                                   /* ARC[7]=1,X=1 */
-#define MC68681_BAUD_RATE_MASK_38_4K        0xcc   /* ACR[7]=0,X=0 */
-                                                   /* ARC[7]=1,X=1 */
-#define MC68681_BAUD_RATE_MASK_57_6K        0x07   /* ACR[7]=0,X=0 */
-                                                   /* ARC[7]=1,X=1 */
-#define MC68681_BAUD_RATE_MASK_115_5K       0x08  
-#define MC68681_BAUD_RATE_MASK_TIMER        0xdd   
-#define MC68681_BAUD_RATE_MASK_TIMER_16X    0xee   
-#define MC68681_BAUD_RATE_MASK_TIMER_1X     0xff   
-
-#endif
-
-
-
diff --git a/cpukit/libcsupport/include/ringbuf.h b/cpukit/libcsupport/include/ringbuf.h
deleted file mode 100644
index 8c80aaf9c8..0000000000
--- a/cpukit/libcsupport/include/ringbuf.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- *  ringbuf.h 
- *
- *  This file provides simple ring buffer functionality.
- *
- *  $Id$
- */
-
-#ifndef __RINGBUF_H__
-#define __RINGBUF_H__
-
-#ifndef RINGBUF_QUEUE_LENGTH
-#define RINGBUF_QUEUE_LENGTH 128
-#endif
-
-typedef struct {
-  char buffer[RINGBUF_QUEUE_LENGTH];
-  volatile int  head;
-  volatile int  tail;
-} Ring_buffer_t;
-
-#define Ring_buffer_Initialize( _buffer ) \
-  do { \
-    (_buffer)->head = (_buffer)->tail = 0; \
-  } while ( 0 ) 
-  
-#define Ring_buffer_Is_empty( _buffer ) \
-   ( (_buffer)->head == (_buffer)->tail )
-
-#define Ring_buffer_Is_full( _buffer ) \
-   ( (_buffer)->head == ((_buffer)->tail + 1) % RINGBUF_QUEUE_LENGTH )
-
-#define Ring_buffer_Add_character( _buffer, _ch ) \
-  do { \
-    rtems_unsigned32 isrlevel; \
-    \
-    rtems_interrupt_disable( isrlevel ); \
-      (_buffer)->tail = ((_buffer)->tail+1) % RINGBUF_QUEUE_LENGTH; \
-      (_buffer)->buffer[ (_buffer)->tail ] = (_ch); \
-    rtems_interrupt_enable( isrlevel ); \
-  } while ( 0 ) 
-
-#define Ring_buffer_Remove_character( _buffer, _ch ) \
-  do { \
-    rtems_unsigned32 isrlevel; \
-    \
-    rtems_interrupt_disable( isrlevel ); \
-      (_buffer)->head = ((_buffer)->head+1) % RINGBUF_QUEUE_LENGTH; \
-      (_ch) = (_buffer)->buffer[ (_buffer)->head ]; \
-    rtems_interrupt_enable( isrlevel ); \
-  } while ( 0 ) 
-
-#endif
diff --git a/cpukit/libcsupport/include/rtems/assoc.h b/cpukit/libcsupport/include/rtems/assoc.h
deleted file mode 100644
index 1982d654ac..0000000000
--- a/cpukit/libcsupport/include/rtems/assoc.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *
- *  Rtems associativity routines.  Mainly used to convert a value from
- *  one space to another (eg: our errno's to host errno's and v.v)
- *
- *
- *  $Id$
- */
-
-#ifndef _INCLUDE_ASSOC_H
-#define _INCLUDE_ASSOC_H
-
-typedef struct {
-    const char   *name;
-    unsigned32   local_value;
-    unsigned32   remote_value;
-} rtems_assoc_t;
-
-/*
- * Flag/marker for optional default value in each table
- */
-
-#define RTEMS_ASSOC_DEFAULT_NAME "(default)"
-
-const rtems_assoc_t *rtems_assoc_ptr_by_name(const rtems_assoc_t *, const char *);
-const rtems_assoc_t *rtems_assoc_ptr_by_value(const rtems_assoc_t *, unsigned32);
-const rtems_assoc_t *rtems_assoc_ptr_by_remote(const rtems_assoc_t *, unsigned32);
-
-unsigned32   rtems_assoc_remote_by_local(const rtems_assoc_t *, unsigned32);
-unsigned32   rtems_assoc_local_by_remote(const rtems_assoc_t *, unsigned32);
-unsigned32   rtems_assoc_remote_by_name(const rtems_assoc_t *, const char *);
-unsigned32   rtems_assoc_local_by_name(const rtems_assoc_t *, const char *);
-const char  *rtems_assoc_name_by_local(const rtems_assoc_t *, unsigned32);
-const char  *rtems_assoc_name_by_remote(const rtems_assoc_t *, unsigned32);
-
-unsigned32   rtems_assoc_remote_by_local_bitfield(const rtems_assoc_t *, unsigned32);
-char  *rtems_assoc_name_by_local_bitfield(const rtems_assoc_t *, unsigned32, char *);
-char  *rtems_assoc_name_by_remote_bitfield(const rtems_assoc_t *, unsigned32, char *);
-unsigned32   rtems_assoc_local_by_remote_bitfield(const rtems_assoc_t *, unsigned32);
-
-
-#endif /* ! _INCLUDE_ASSOC_H */
diff --git a/cpukit/libcsupport/include/rtems/error.h b/cpukit/libcsupport/include/rtems/error.h
deleted file mode 100644
index a0698afb5d..0000000000
--- a/cpukit/libcsupport/include/rtems/error.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- *  Defines and externs for rtems error reporting
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_ERROR_h
-#define __RTEMS_ERROR_h
-
-/*
- * rtems_error() and rtems_panic() support
- */
-
-#define RTEMS_ERROR_ERRNO  (1<<((sizeof(int) * 8) - 2)) /* hi bit; use 'errno' */
-#define RTEMS_ERROR_PANIC  (RTEMS_ERROR_ERRNO / 2)       /* err fatal; no return */
-#define RTEMS_ERROR_ABORT  (RTEMS_ERROR_ERRNO / 4)       /* err is fatal; panic */
-
-#define RTEMS_ERROR_MASK  (RTEMS_ERROR_ERRNO | RTEMS_ERROR_ABORT | \
-                             RTEMS_ERROR_PANIC) /* all */
-
-const char *rtems_status_text(rtems_status_code);
-int   rtems_error(int error_code, const char *printf_format, ...);
-#ifdef __GNUC__
-void  rtems_panic(const char *printf_format, ...);
-/*
- *  We should be able to use this attribute but gcc complains that
- *  rtems_panic does in fact return. :(
- *
- *      __attribute__ ((__noreturn__));
- */
-#else
-void  rtems_panic(const char *printf_format, ...);
-#endif
-
-extern int rtems_panic_in_progress;
-
-#endif
-/* end of include file */
diff --git a/cpukit/libcsupport/include/rtems/libcsupport.h b/cpukit/libcsupport/include/rtems/libcsupport.h
deleted file mode 100644
index d007784526..0000000000
--- a/cpukit/libcsupport/include/rtems/libcsupport.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*  libcsupport.h
- *
- *  This include file contains the information regarding the
- *  RTEMS specific support for the standard C library.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __LIBC_SUPPORT_h
-#define __LIBC_SUPPORT_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <sys/types.h>
-
-void RTEMS_Malloc_Initialize(
-  void   *start,
-  size_t  length,
-  size_t  sbrk_amount
-);
-
-extern void malloc_dump(void);
-extern void malloc_walk(size_t source, size_t printf_enabled);
-extern void libc_init(int reentrant);
-extern int  host_errno(void);
-extern void fix_syscall_errno(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/cpukit/libcsupport/include/rtems/libio.h b/cpukit/libcsupport/include/rtems/libio.h
deleted file mode 100644
index dcdda85aec..0000000000
--- a/cpukit/libcsupport/include/rtems/libio.h
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * General purpose communication channel for RTEMS to allow UNIX/POSIX
- *    system call behavior on top of RTEMS IO devices.
- *
- * TODO
- *      stat(2)
- *      unlink(2)
- *      rename(2)
- *
- *  $Id$
- */
-
-#ifndef _RTEMS_LIBIO_H
-#define _RTEMS_LIBIO_H
-
-#include <sys/stat.h>
-
-typedef unsigned32 rtems_libio_offset_t;
-
-/*
- * An open file data structure, indexed by 'fd'
- * TODO:
- *    should really have a separate per/file data structure that this
- *    points to (eg: size, offset, driver, pathname should be in that)
- */
-
-typedef struct {
-    rtems_driver_name_t *driver;
-    rtems_libio_offset_t size;          /* size of file */
-    rtems_libio_offset_t offset;        /* current offset into the file */
-    unsigned32           flags;
-    char                *pathname;      /* opened pathname */
-    Objects_Id           sem;
-    unsigned32           data0;         /* private to "driver" */
-    void                *data1;         /* ... */
-} rtems_libio_t;
-
-
-/*
- * param block for read/write
- * Note: it must include 'offset' instead of using iop's offset since
- *       we can have multiple outstanding i/o's on a device.
- */
-
-typedef struct {
-    rtems_libio_t          *iop;
-    rtems_libio_offset_t    offset;
-    unsigned8              *buffer;
-    unsigned32              count;
-    unsigned32              flags;
-    unsigned32              bytes_moved;
-} rtems_libio_rw_args_t;
-
-/*
- * param block for open/close
- */
-
-typedef struct {
-    rtems_libio_t          *iop;
-    unsigned32              flags;
-    unsigned32              mode;
-} rtems_libio_open_close_args_t;
-
-/*
- * param block for ioctl
- */
-
-typedef struct {
-    rtems_libio_t          *iop;
-    unsigned32              command;
-    void                   *buffer;
-    unsigned32              ioctl_return;
-} rtems_libio_ioctl_args_t;
-
-
-/*
- * Values for 'flag'
- */
-
-#define LIBIO_FLAGS_NO_DELAY      0x0001  /* return immediately if no data */
-#define LIBIO_FLAGS_READ          0x0002  /* reading */
-#define LIBIO_FLAGS_WRITE         0x0004  /* writing */
-#define LIBIO_FLAGS_LINE_BUFFERED 0x0008  /* line buffered io (^h, ^u, etc) */
-#define LIBIO_FLAGS_OPEN          0x0100  /* device is open */
-#define LIBIO_FLAGS_APPEND        0x0200  /* all writes append */
-#define LIBIO_FLAGS_CREATE        0x0400  /* create file */
-
-#define LIBIO_FLAGS_READ_WRITE    (LIBIO_FLAGS_READ | LIBIO_FLAGS_WRITE)
-
-void rtems_libio_init(void);
-
-int __rtems_open(const char  *pathname, unsigned32 flag, unsigned32 mode);
-int __rtems_close(int  fd);
-int __rtems_read(int fd, void *buffer, unsigned32 count);
-int __rtems_write(int fd, const void *buffer, unsigned32 count);
-int __rtems_ioctl(int fd, unsigned32  command, void *buffer);
-int __rtems_lseek(int fd, rtems_libio_offset_t offset, int whence);
-int __rtems_fstat(int _fd, struct stat* _sbuf);
-
-/*
- * External I/O handlers
- */
-typedef struct {
-    int (*open)(const char  *pathname, unsigned32 flag, unsigned32 mode);
-    int (*close)(int  fd);
-    int (*read)(int fd, void *buffer, unsigned32 count);
-    int (*write)(int fd, const void *buffer, unsigned32 count);
-    int (*ioctl)(int fd, unsigned32  command, void *buffer);
-    int (*lseek)(int fd, rtems_libio_offset_t offset, int whence);
-} rtems_libio_handler_t;
-
-void rtems_register_libio_handler(int handler_flag,
-                                 const rtems_libio_handler_t *handler);
-
-#define RTEMS_FILE_DESCRIPTOR_TYPE_FILE         0x0000
-#define RTEMS_FILE_DESCRIPTOR_TYPE_SOCKET       0x1000
-#define rtems_make_file_descriptor(fd,flags)    ((fd)|(flags))
-#define rtems_file_descriptor_base(fd)          ((fd) & 0x0FFF)
-#define rtems_file_descriptor_type(fd)          ((fd) & 0xF000)
-#define rtems_file_descriptor_type_index(fd)    ((((fd) & 0xF000) >> 12) - 1)
-
-/*
- *  IOCTL values
- */
-
-#define       RTEMS_IO_GET_ATTRIBUTES 1
-#define       RTEMS_IO_SET_ATTRIBUTES 2
-#define       RTEMS_IO_TCDRAIN        3
-
-/*
- * Callbacks from TERMIOS routines to device-dependent code
- */
-#include <termios.h>
-typedef struct rtems_termios_callbacks {
-  int       (*firstOpen)(int major, int minor, void *arg);
-  int       (*lastClose)(int major, int minor, void *arg);
-  int       (*pollRead)(int minor);
-  int       (*write)(int minor, const char *buf, int len);
-  int       (*setAttributes)(int minor, const struct termios *t);
-  int       (*stopRemoteTx)(int minor);
-  int       (*startRemoteTx)(int minor);
-  int       outputUsesInterrupts;
-} rtems_termios_callbacks;
-
-/*
- * Device-independent TERMIOS routines
- */
-void rtems_termios_initialize (void);
-rtems_status_code rtems_termios_open (
-  rtems_device_major_number      major,
-  rtems_device_minor_number      minor,
-  void                          *arg,
-  const rtems_termios_callbacks *callbacks
-  );
-rtems_status_code rtems_termios_close (void *arg);
-rtems_status_code rtems_termios_read (void *arg);
-rtems_status_code rtems_termios_write (void *arg);
-rtems_status_code rtems_termios_ioctl (void *arg);
-int rtems_termios_enqueue_raw_characters (void *ttyp, char *buf, int len);
-int rtems_termios_dequeue_characters (void *ttyp, int len);
-void rtems_termios_reserve_resources(
-  rtems_configuration_table *configuration,
-  rtems_unsigned32           number_of_devices
-);
-
-#endif /* _RTEMS_LIBIO_H */
diff --git a/cpukit/libcsupport/include/spurious.h b/cpukit/libcsupport/include/spurious.h
deleted file mode 100644
index 36fcaba904..0000000000
--- a/cpukit/libcsupport/include/spurious.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*  spurious.h
- *
- *  This file describes the Spurious Interrupt Driver for all boards.
- *
- *  COPYRIGHT (c) 1989, 1990, 1991, 1992, 1993.
- *  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.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __SPURIOUS_h
-#define __SPURIOUS_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define SPURIOUS_DRIVER_TABLE_ENTRY \
-  { Spurious_Initialize, NULL, NULL, NULL, NULL, NULL }
-
-rtems_device_driver Spurious_Initialize(
-  rtems_device_major_number,
-  rtems_device_minor_number,
-  void *,
-  rtems_id,
-  rtems_unsigned32 *
-);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/cpukit/libcsupport/include/sys/filio.h b/cpukit/libcsupport/include/sys/filio.h
deleted file mode 100644
index b82a649c0f..0000000000
--- a/cpukit/libcsupport/include/sys/filio.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)filio.h	8.1 (Berkeley) 3/28/94
- * $Id$
- */
-
-#ifndef	_SYS_FILIO_H_
-#define	_SYS_FILIO_H_
-
-#include <sys/ioccom.h>
-
-/* Generic file-descriptor ioctl's. */
-#define	FIOCLEX		 _IO('f', 1)		/* set close on exec on fd */
-#define	FIONCLEX	 _IO('f', 2)		/* remove close on exec */
-#define	FIONREAD	_IOR('f', 127, int)	/* get # bytes to read */
-#define	FIONBIO		_IOW('f', 126, int)	/* set/clear non-blocking i/o */
-#define	FIOASYNC	_IOW('f', 125, int)	/* set/clear async i/o */
-#define	FIOSETOWN	_IOW('f', 124, int)	/* set owner */
-#define	FIOGETOWN	_IOR('f', 123, int)	/* get owner */
-
-#endif /* !_SYS_FILIO_H_ */
diff --git a/cpukit/libcsupport/include/sys/ioctl.h b/cpukit/libcsupport/include/sys/ioctl.h
deleted file mode 100644
index e3a69a5a7f..0000000000
--- a/cpukit/libcsupport/include/sys/ioctl.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)ioctl.h	8.6 (Berkeley) 3/28/94
- * $Id$
- */
-
-#ifndef	_SYS_IOCTL_H_
-#define	_SYS_IOCTL_H_
-
-#include <sys/ttycom.h>
-
-/*
- * Pun for SunOS prior to 3.2.  SunOS 3.2 and later support TIOCGWINSZ
- * and TIOCSWINSZ (yes, even 3.2-3.5, the fact that it wasn't documented
- * notwithstanding).
- */
-struct ttysize {
-	unsigned short	ts_lines;
-	unsigned short	ts_cols;
-	unsigned short	ts_xxx;
-	unsigned short	ts_yyy;
-};
-#define	TIOCGSIZE	TIOCGWINSZ
-#define	TIOCSSIZE	TIOCSWINSZ
-
-#include <sys/ioccom.h>
-
-#include <sys/filio.h>
-#include <sys/sockio.h>
-
-#endif /* !_SYS_IOCTL_H_ */
-
-/*
- * Keep outside _SYS_IOCTL_H_
- * Compatibility with old terminal driver
- *
- * Source level -> #define USE_OLD_TTY
- * Kernel level -> options COMPAT_43 or COMPAT_SUNOS
- */
-#if defined(USE_OLD_TTY) || defined(COMPAT_43) || defined(COMPAT_SUNOS)
-#include <sys/ioctl_compat.h>
-#endif
diff --git a/cpukit/libcsupport/include/sys/sockio.h b/cpukit/libcsupport/include/sys/sockio.h
deleted file mode 100644
index 020061170f..0000000000
--- a/cpukit/libcsupport/include/sys/sockio.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)sockio.h	8.1 (Berkeley) 3/28/94
- * $Id$
- */
-
-#ifndef	_SYS_SOCKIO_H_
-#define	_SYS_SOCKIO_H_
-
-#include <sys/ioccom.h>
-
-/* Socket ioctl's. */
-#define	SIOCSHIWAT	 _IOW('s',  0, int)		/* set high watermark */
-#define	SIOCGHIWAT	 _IOR('s',  1, int)		/* get high watermark */
-#define	SIOCSLOWAT	 _IOW('s',  2, int)		/* set low watermark */
-#define	SIOCGLOWAT	 _IOR('s',  3, int)		/* get low watermark */
-#define	SIOCATMARK	 _IOR('s',  7, int)		/* at oob mark? */
-#define	SIOCSPGRP	 _IOW('s',  8, int)		/* set process group */
-#define	SIOCGPGRP	 _IOR('s',  9, int)		/* get process group */
-
-#define	SIOCADDRT	 _IOW('r', 10, struct ortentry)	/* add route */
-#define	SIOCDELRT	 _IOW('r', 11, struct ortentry)	/* delete route */
-#define	SIOCGETVIFCNT	_IOWR('r', 15, struct sioc_vif_req)/* get vif pkt cnt */
-#define	SIOCGETSGCNT	_IOWR('r', 16, struct sioc_sg_req) /* get s,g pkt cnt */
-
-#define	SIOCSIFADDR	 _IOW('i', 12, struct ifreq)	/* set ifnet address */
-#define	OSIOCGIFADDR	_IOWR('i', 13, struct ifreq)	/* get ifnet address */
-#define	SIOCGIFADDR	_IOWR('i', 33, struct ifreq)	/* get ifnet address */
-#define	SIOCSIFDSTADDR	 _IOW('i', 14, struct ifreq)	/* set p-p address */
-#define	OSIOCGIFDSTADDR	_IOWR('i', 15, struct ifreq)	/* get p-p address */
-#define	SIOCGIFDSTADDR	_IOWR('i', 34, struct ifreq)	/* get p-p address */
-#define	SIOCSIFFLAGS	 _IOW('i', 16, struct ifreq)	/* set ifnet flags */
-#define	SIOCGIFFLAGS	_IOWR('i', 17, struct ifreq)	/* get ifnet flags */
-#define	OSIOCGIFBRDADDR	_IOWR('i', 18, struct ifreq)	/* get broadcast addr */
-#define	SIOCGIFBRDADDR	_IOWR('i', 35, struct ifreq)	/* get broadcast addr */
-#define	SIOCSIFBRDADDR	 _IOW('i', 19, struct ifreq)	/* set broadcast addr */
-#define	OSIOCGIFCONF	_IOWR('i', 20, struct ifconf)	/* get ifnet list */
-#define	SIOCGIFCONF	_IOWR('i', 36, struct ifconf)	/* get ifnet list */
-#define	OSIOCGIFNETMASK	_IOWR('i', 21, struct ifreq)	/* get net addr mask */
-#define	SIOCGIFNETMASK	_IOWR('i', 37, struct ifreq)	/* get net addr mask */
-#define	SIOCSIFNETMASK	 _IOW('i', 22, struct ifreq)	/* set net addr mask */
-#define	SIOCGIFMETRIC	_IOWR('i', 23, struct ifreq)	/* get IF metric */
-#define	SIOCSIFMETRIC	 _IOW('i', 24, struct ifreq)	/* set IF metric */
-#define	SIOCDIFADDR	 _IOW('i', 25, struct ifreq)	/* delete IF addr */
-#define	SIOCAIFADDR	 _IOW('i', 26, struct ifaliasreq)/* add/chg IF alias */
-
-#define	SIOCADDMULTI	 _IOW('i', 49, struct ifreq)	/* add m'cast addr */
-#define	SIOCDELMULTI	 _IOW('i', 50, struct ifreq)	/* del m'cast addr */
-#define	SIOCGIFMTU	_IOWR('i', 51, struct ifreq)	/* get IF mtu */
-#define	SIOCSIFMTU	 _IOW('i', 52, struct ifreq)	/* set IF mtu */
-#define	SIOCGIFPHYS	_IOWR('i', 53, struct ifreq)	/* get IF wire */
-#define	SIOCSIFPHYS	 _IOW('i', 54, struct ifreq)	/* set IF wire */
-#define	SIOCSIFMEDIA	_IOWR('i', 55, struct ifreq)	/* set net media */
-#define	SIOCGIFMEDIA	_IOWR('i', 56, struct ifmediareq) /* get net media */
-
-#endif /* !_SYS_SOCKIO_H_ */
diff --git a/cpukit/libcsupport/include/sys/termios.h b/cpukit/libcsupport/include/sys/termios.h
deleted file mode 100644
index 1112ec4f5e..0000000000
--- a/cpukit/libcsupport/include/sys/termios.h
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- *  POSIX termios implementation for RTEMS console device driver.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef	TERMIOS_H
-#define	TERMIOS_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef unsigned char	cc_t;
-typedef unsigned int	speed_t;
-typedef unsigned int	tcflag_t;
-
-#define NCCS 19
-struct termios {
-	tcflag_t c_iflag;		/* input mode flags */
-	tcflag_t c_oflag;		/* output mode flags */
-	tcflag_t c_cflag;		/* control mode flags */
-	tcflag_t c_lflag;		/* local mode flags */
-	cc_t c_line;			/* line discipline */
-	cc_t c_cc[NCCS];		/* control characters */
-};
-
-/* c_cc characters */
-#define VINTR 0
-#define VQUIT 1
-#define VERASE 2
-#define VKILL 3
-#define VEOF 4
-#define VTIME 5
-#define VMIN 6
-#define VSWTC 7
-#define VSTART 8
-#define VSTOP 9
-#define VSUSP 10
-#define VEOL 11
-#define VREPRINT 12
-#define VDISCARD 13
-#define VWERASE 14
-#define VLNEXT 15
-#define VEOL2 16
-
-/* c_iflag bits */
-#define IGNBRK	0000001
-#define BRKINT	0000002
-#define IGNPAR	0000004
-#define PARMRK	0000010
-#define INPCK	0000020
-#define ISTRIP	0000040
-#define INLCR	0000100
-#define IGNCR	0000200
-#define ICRNL	0000400
-#define IUCLC	0001000
-#define IXON	0002000
-#define IXANY	0004000
-#define IXOFF	0010000
-#define IMAXBEL	0020000
-
-/* c_oflag bits */
-#define OPOST	0000001
-#define OLCUC	0000002
-#define ONLCR	0000004
-#define OCRNL	0000010
-#define ONOCR	0000020
-#define ONLRET	0000040
-#define OFILL	0000100
-#define OFDEL	0000200
-#define NLDLY	0000400
-#define   NL0	0000000
-#define   NL1	0000400
-#define CRDLY	0003000
-#define   CR0	0000000
-#define   CR1	0001000
-#define   CR2	0002000
-#define   CR3	0003000
-#define TABDLY	0014000
-#define   TAB0	0000000
-#define   TAB1	0004000
-#define   TAB2	0010000
-#define   TAB3	0014000
-#define   XTABS	0014000
-#define BSDLY	0020000
-#define   BS0	0000000
-#define   BS1	0020000
-#define VTDLY	0040000
-#define   VT0	0000000
-#define   VT1	0040000
-#define FFDLY	0100000
-#define   FF0	0000000
-#define   FF1	0100000
-
-/* c_cflag bit meaning */
-#define CBAUD	0010017
-#define  B0	0000000		/* hang up */
-#define  B50	0000001
-#define  B75	0000002
-#define  B110	0000003
-#define  B134	0000004
-#define  B150	0000005
-#define  B200	0000006
-#define  B300	0000007
-#define  B600	0000010
-#define  B1200	0000011
-#define  B1800	0000012
-#define  B2400	0000013
-#define  B4800	0000014
-#define  B9600	0000015
-#define  B19200	0000016
-#define  B38400	0000017
-#define EXTA B19200
-#define EXTB B38400
-#define CSIZE	0000060
-#define   CS5	0000000
-#define   CS6	0000020
-#define   CS7	0000040
-#define   CS8	0000060
-#define CSTOPB	0000100
-#define CREAD	0000200
-#define PARENB	0000400
-#define PARODD	0001000
-#define HUPCL	0002000
-#define CLOCAL	0004000
-#define CBAUDEX 0010000
-#define  B57600  0010001
-#define  B115200 0010002
-#define  B230400 0010003
-#define  B460800 0010004
-#define CIBAUD	  002003600000	/* input baud rate (not used) */
-#define CRTSCTS	  020000000000		/* flow control */
-
-/* c_lflag bits */
-#define ISIG	0000001
-#define ICANON	0000002
-#define XCASE	0000004
-#define ECHO	0000010
-#define ECHOE	0000020
-#define ECHOK	0000040
-#define ECHONL	0000100
-#define NOFLSH	0000200
-#define TOSTOP	0000400
-#define ECHOCTL	0001000
-#define ECHOPRT	0002000
-#define ECHOKE	0004000
-#define FLUSHO	0010000
-#define PENDIN	0040000
-#define IEXTEN	0100000
-
-/* tcflow() and TCXONC use these */
-#define	TCOOFF		0
-#define	TCOON		1
-#define	TCIOFF		2
-#define	TCION		3
-
-/* tcflush() and TCFLSH use these */
-#define	TCIFLUSH	0
-#define	TCOFLUSH	1
-#define	TCIOFLUSH	2
-
-/* tcsetattr uses these */
-#define	TCSANOW		0
-#define	TCSADRAIN	1
-#define	TCSAFLUSH	2
-
-int	tcgetattr(int, struct termios *);
-int	tcsetattr(int, int, struct termios *);
-int	tcdrain(int);
-speed_t	cfgetospeed(const struct termios *tp);
-int	cfsetospeed(struct termios *tp, speed_t speed);
-speed_t	cfgetispeed(const struct termios *tp);
-int	cfsetispeed(struct termios *tp, speed_t speed);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif	/* TERMIOS_H */
diff --git a/cpukit/libcsupport/include/sys/utsname.h b/cpukit/libcsupport/include/sys/utsname.h
deleted file mode 100644
index ca15230d40..0000000000
--- a/cpukit/libcsupport/include/sys/utsname.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*  sys/utsname.h 
- *
- *  $Id$
- */
-
-#ifndef __POSIX_SYS_UTSNAME_h
-#define __POSIX_SYS_UTSNAME_h
-
-#include <sys/times.h>
-#include <sys/types.h>
-
-/*
- *  4.4.1 Get System Name (Table 4-1), P1003.1b-1993, p. 90
- *
- *  NOTE:  The lengths of the strings in this structure are 
- *         just long enough to reliably contain the RTEMS information.
- *         For example, the fields are not long enough to support 
- *         Internet hostnames.
- */
-
-struct utsname {
-  char sysname[ 32 ];  /* Name of this implementation of the operating system */
-  char nodename[ 32 ]; /* Name of this node within an implementation */
-                       /*   specified communication network */
-  char release[ 32 ];  /* Current release level of this implementation */
-  char version[ 32 ];  /* Current version level of this release */
-  char machine[ 32 ];  /* Name of the hardware type on which the system */
-                       /*   is running */
-};
-
-/*
- *  4.4.1 Get System Name, P1003.1b-1993, p. 90
- */
-
-int uname(
-  struct utsname *name
-);
-
-/*
- *  4.5.2 Get Process Times, P1003.1b-1993, p. 92
- */
-
-clock_t times(
-  struct tms   *buffer
-);
-
-#endif
-/* end of include file */
-
diff --git a/cpukit/libcsupport/include/timerdrv.h b/cpukit/libcsupport/include/timerdrv.h
deleted file mode 100644
index ed1ce2b9a2..0000000000
--- a/cpukit/libcsupport/include/timerdrv.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*  timerdrv.h
- *
- *  This file describes the Timer Driver for all boards.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __TIMER_DRIVER_h
-#define __TIMER_DRIVER_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* functions */
-
-void Timer_initialize( void );
-
-rtems_unsigned32 Read_timer( void );
-
-rtems_status_code Empty_function( void );
-
-void Set_find_average_overhead(
-  rtems_boolean find_flag
-);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/cpukit/libcsupport/include/vmeintr.h b/cpukit/libcsupport/include/vmeintr.h
deleted file mode 100644
index 6593ba12a5..0000000000
--- a/cpukit/libcsupport/include/vmeintr.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- *  vmeintr.h
- *
- *  This file is the specification for the VMEbus interface library
- *  which should be provided by all BSPs for VMEbus Single Board
- *  Computers but currently only a few do so.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __VME_INTERRUPT_h
-#define __VME_INTERRUPT_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- *  This defines the mask which is used to determine which
- *  interrupt levels are affected by a call to this package.
- *  The LSB corresponds to VME interrupt 0 and the MSB
- *  to VME interrupt 7.
- *
- */
-
-typedef rtems_unsigned8 VME_interrupt_Mask;
-
-/*
- *  VME_interrupt_Disable
- *
- */
-
-void VME_interrupt_Disable (
-  VME_interrupt_Mask                mask                        /* IN  */
-);
-
-/*
- *  VME_interrupt_Disable
- *
- */
-
-void VME_interrupt_Enable (
-  VME_interrupt_Mask                mask                        /* IN  */
-);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* end of include file */
diff --git a/cpukit/libcsupport/include/zilog/z8036.h b/cpukit/libcsupport/include/zilog/z8036.h
deleted file mode 100644
index 1c53c8afac..0000000000
--- a/cpukit/libcsupport/include/zilog/z8036.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/*  z8036.h
- *
- *  This include file defines information related to a Zilog Z8036
- *  Counter/Timer/IO Chip.  It is a memory mapped part.
- *
- *  Input parameters:  NONE
- *
- *  Output parameters:  NONE
- *
- *  NOTE: This file shares as much as possible with the include
- *        file for the Z8536 via z8x36.h.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __Z8036_h
-#define __Z8036_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* macros */
-
-#define Z8036( ptr ) ((volatile struct z8036_map *)(ptr))
-
-#define Z8x36_STATE0 ( z8036 ) \
-  { /*char *garbage = *(Z8036(z8036))->???; */ }
-
-
-#define Z8x36_WRITE( z8036, reg, data ) \
-   (Z8036(z8036))->reg = (data)
-
-
-#define Z8x36_READ( z8036, reg, data ) \
-   (Z8036(z8036))->reg = (data)
-
-/* structures */
-
-struct z8036_map {
-/* MAIN CONTROL REGISTERS (0x00-0x07) */
-  rtems_unsigned8 MASTER_INTR;           /* Master Interrupt Ctl Reg */
-  rtems_unsigned8 MASTER_CFG;            /* Master Configuration Ctl Reg */
-  rtems_unsigned8 PORTA_VECTOR;          /* Port A - Interrupt Vector */
-  rtems_unsigned8 PORTB_VECTOR;          /* Port B - Interrupt Vector */
-  rtems_unsigned8 CNT_TMR_VECTOR;        /* Counter/Timer Interrupt Vector */
-  rtems_unsigned8 PORTC_DATA_POLARITY;   /* Port C - Data Path Polarity */
-  rtems_unsigned8 PORTC_DIRECTION;       /* Port C - Data Direction */
-  rtems_unsigned8 PORTC_SPECIAL_IO_CTL;  /* Port C - Special IO Control */
-/* MOST OFTEN ACCESSED REGISTERS (0x08 - 0x0f) */
-  rtems_unsigned8 PORTA_CMD_STATUS;      /* Port A - Command Status Reg */
-  rtems_unsigned8 PORTB_CMD_STATUS;      /* Port B - Command Status Reg */
-  rtems_unsigned8 CT1_CMD_STATUS;        /* Ctr/Timer 1 - Command Status Reg */
-  rtems_unsigned8 CT2_CMD_STATUS;        /* Ctr/Timer 2 - Command Status Reg */
-  rtems_unsigned8 CT3_CMD_STATUS;        /* Ctr/Timer 3 - Command Status Reg */
-  rtems_unsigned8 PORTA_DATA;            /* Port A - Data */
-  rtems_unsigned8 PORTB_DATA;            /* Port B - Data */
-  rtems_unsigned8 PORTC_DATA;            /* Port C - Data */
-/* COUNTER/TIMER RELATED REGISTERS (0x10-0x1f) */
-  rtems_unsigned8 CT1_CUR_CNT_MSB;       /* Ctr/Timer 1 - Current Count (MSB) */
-  rtems_unsigned8 CT1_CUR_CNT_LSB;       /* Ctr/Timer 1 - Current Count (LSB) */
-  rtems_unsigned8 CT2_CUR_CNT_MSB;       /* Ctr/Timer 2 - Current Count (MSB) */
-  rtems_unsigned8 CT2_CUR_CNT_LSB;       /* Ctr/Timer 2 - Current Count (LSB) */
-  rtems_unsigned8 CT3_CUR_CNT_MSB;       /* Ctr/Timer 3 - Current Count (MSB) */
-  rtems_unsigned8 CT3_CUR_CNT_LSB;       /* Ctr/Timer 3 - Current Count (LSB) */
-  rtems_unsigned8 CT1_TIME_CONST_MSB;    /* Ctr/Timer 1 - Time Constant (MSB) */
-  rtems_unsigned8 CT1_TIME_CONST_LSB;    /* Ctr/Timer 1 - Time Constant (LSB) */
-  rtems_unsigned8 CT2_TIME_CONST_MSB;    /* Ctr/Timer 2 - Time Constant (MSB) */
-  rtems_unsigned8 CT2_TIME_CONST_LSB;    /* Ctr/Timer 2 - Time Constant (LSB) */
-  rtems_unsigned8 CT3_TIME_CONST_MSB;    /* Ctr/Timer 3 - Time Constant (MSB) */
-  rtems_unsigned8 CT3_TIME_CONST_LSB;    /* Ctr/Timer 3 - Time Constant (LSB) */
-  rtems_unsigned8 CT1_MODE_SPEC;         /* Ctr/Timer 1 - Mode Specification  */
-  rtems_unsigned8 CT2_MODE_SPEC;         /* Ctr/Timer 2 - Mode Specification  */
-  rtems_unsigned8 CT3_MODE_SPEC;         /* Ctr/Timer 3 - Mode Specification  */
-  rtems_unsigned8 CURRENT_VECTOR;        /* Current Vector */
-/* PORT A SPECIFICATION REGISTERS (0x20 -0x27) */
-  rtems_unsigned8 PORTA_MODE;            /* Port A - Mode Specification  */
-  rtems_unsigned8 PORTA_HANDSHAKE;       /* Port A - Handshake Specification  */
-  rtems_unsigned8 PORTA_DATA_POLARITY;   /* Port A - Data Path Polarity */
-  rtems_unsigned8 PORTA_DIRECTION;       /* Port A - Data Direction */
-  rtems_unsigned8 PORTA_SPECIAL_IO_CTL;  /* Port A - Special IO Control */
-  rtems_unsigned8 PORTA_PATT_POLARITY;   /* Port A - Pattern Polarity */
-  rtems_unsigned8 PORTA_PATT_TRANS;      /* Port A - Pattern Transition */
-  rtems_unsigned8 PORTA_PATT_MASK;       /* Port A - Pattern Mask */
-/* PORT B SPECIFICATION REGISTERS (0x28-0x2f) */
-  rtems_unsigned8 PORTB_MODE;            /* Port B - Mode Specification  */
-  rtems_unsigned8 PORTB_HANDSHAKE;       /* Port B - Handshake Specification  */
-  rtems_unsigned8 PORTB_DATA_POLARITY;   /* Port B - Data Path Polarity */
-  rtems_unsigned8 PORTB_DIRECTION;       /* Port B - Data Direction */
-  rtems_unsigned8 PORTB_SPECIAL_IO_CTL;  /* Port B - Special IO Control */
-  rtems_unsigned8 PORTB_PATT_POLARITY;   /* Port B - Pattern Polarity */
-  rtems_unsigned8 PORTB_PATT_TRANS;      /* Port B - Pattern Transition */
-  rtems_unsigned8 PORTB_PATT_MASK;       /* Port B - Pattern Mask */
-};
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
diff --git a/cpukit/libcsupport/include/zilog/z8530.h b/cpukit/libcsupport/include/zilog/z8530.h
deleted file mode 100644
index 60a3e3b771..0000000000
--- a/cpukit/libcsupport/include/zilog/z8530.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/*  z8530.h
- *
- *  This include file defines information related to a Zilog Z8530
- *  SCC Chip.  It is a IO mapped part.
- *
- *  Input parameters:   NONE
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __Z8530_h
-#define __Z8530_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* macros */
-
-#define VOL8( ptr )   ((volatile rtems_unsigned8 *)(ptr))
-
-#define Z8x30_STATE0 ( z8530 ) \
-  { char *garbage; \
-    (garbage) = *(VOL8(z8530)) \
-  }
-
-#define Z8x30_WRITE_CONTROL( z8530, reg, data ) \
-   *(VOL8(z8530)) = (reg); \
-   *(VOL8(z8530)) = (data)
-
-#define Z8x30_READ_CONTROL( z8530, reg, data ) \
-   *(VOL8(z8530)) = (reg); \
-   (data) = *(VOL8(z8530))
-
-#define Z8x30_WRITE_DATA( z8530, data ) \
-   *(VOL8(z8530)) = (data);
-
-#define Z8x30_READ_DATA( z8530, data ) \
-   (data) = *(VOL8(z8530));
-
-
-/* RR_0 Bit Definitions */
-
-#define RR_0_TX_BUFFER_EMPTY   0x04
-#define RR_0_RX_DATA_AVAILABLE 0x01
-
-/* read registers */
-
-#define RR_0       0x00
-#define RR_1       0x01
-#define RR_2       0x02
-#define RR_3       0x03
-#define RR_4       0x04
-#define RR_5       0x05
-#define RR_6       0x06
-#define RR_7       0x07
-#define RR_8       0x08
-#define RR_9       0x09
-#define RR_10      0x0A
-#define RR_11      0x0B
-#define RR_12      0x0C
-#define RR_13      0x0D
-#define RR_14      0x0E
-#define RR_15      0x0F
-
-/* write registers */
-
-#define WR_0       0x00
-#define WR_1       0x01
-#define WR_2       0x02
-#define WR_3       0x03
-#define WR_4       0x04
-#define WR_5       0x05
-#define WR_6       0x06
-#define WR_7       0x07
-#define WR_8       0x08
-#define WR_9       0x09
-#define WR_10      0x0A
-#define WR_11      0x0B
-#define WR_12      0x0C
-#define WR_13      0x0D
-#define WR_14      0x0E
-#define WR_15      0x0F
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/cpukit/libcsupport/include/zilog/z8536.h b/cpukit/libcsupport/include/zilog/z8536.h
deleted file mode 100644
index 0f0b5641e7..0000000000
--- a/cpukit/libcsupport/include/zilog/z8536.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/*  z8536.h
- *
- *  This include file defines information related to a Zilog Z8536
- *  Counter/Timer/IO Chip.  It is a IO mapped part.
- *
- *  Input parameters:   NONE
- *
- *  Output parameters:  NONE
- *
- *  NOTE: This file shares as much as possible with the include
- *        file for the Z8036 via z8x36.h.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __Z8536_h
-#define __Z8536_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* macros */
-
-#define VOL8( ptr )   ((volatile rtems_unsigned8 *)(ptr))
-
-#define Z8x36_STATE0 ( z8536 ) \
-  { char *garbage; \
-    (garbage) = *(VOL8(z8536+0xC)) \
-  }
-
-#define Z8x36_WRITE( z8536, reg, data ) \
-   *(VOL8(z8536+0xC)) = (reg); \
-   *(VOL8(z8536+0xC)) = (data)
-
-#define Z8x36_READ( z8536, reg, data ) \
-   *(VOL8(z8536+0xC)) = (reg); \
-   (data) = *(VOL8(z8536+0xC))
-
-/* structures */
-
-/* MAIN CONTROL REGISTERS (0x00-0x07) */
-#define MASTER_INTR           0x00   /* Master Interrupt Ctl Reg */
-#define MASTER_CFG            0x01   /* Master Configuration Ctl Reg */
-#define PORTA_VECTOR          0x02   /* Port A - Interrupt Vector */
-#define PORTB_VECTOR          0x03   /* Port B - Interrupt Vector */
-#define CNT_TMR_VECTOR        0x04   /* Counter/Timer Interrupt Vector */
-#define PORTC_DATA_POLARITY   0x05   /* Port C - Data Path Polarity */
-#define PORTC_DIRECTION       0x06   /* Port C - Data Direction */
-#define PORTC_SPECIAL_IO_CTL  0x07   /* Port C - Special IO Control */
-
-/* MOST OFTEN ACCESSED REGISTERS (0x08 - 0x0f) */
-#define PORTA_CMD_STATUS      0x08   /* Port A - Command Status Reg */
-#define PORTB_CMD_STATUS      0x09   /* Port B - Command Status Reg */
-#define CT1_CMD_STATUS        0x0a   /* Ctr/Timer 1 - Command Status Reg */
-#define CT2_CMD_STATUS        0x0b   /* Ctr/Timer 2 - Command Status Reg */
-#define CT3_CMD_STATUS        0x0c   /* Ctr/Timer 3 - Command Status Reg */
-#define PORTA_DATA            0x0d   /* Port A - Data */
-#define PORTB_DATA            0x0e   /* Port B - Data */
-#define PORTC_DATA            0x0f   /* Port C - Data */
-
-/* COUNTER/TIMER RELATED REGISTERS (0x10-0x1f) */
-#define CT1_CUR_CNT_MSB       0x10   /* Ctr/Timer 1 - Current Count (MSB) */
-#define CT1_CUR_CNT_LSB       0x11   /* Ctr/Timer 1 - Current Count (LSB) */
-#define CT2_CUR_CNT_MSB       0x12   /* Ctr/Timer 2 - Current Count (MSB) */
-#define CT2_CUR_CNT_LSB       0x13   /* Ctr/Timer 2 - Current Count (LSB) */
-#define CT3_CUR_CNT_MSB       0x14   /* Ctr/Timer 3 - Current Count (MSB) */
-#define CT3_CUR_CNT_LSB       0x15   /* Ctr/Timer 3 - Current Count (LSB) */
-#define CT1_TIME_CONST_MSB    0x16   /* Ctr/Timer 1 - Time Constant (MSB) */
-#define CT1_TIME_CONST_LSB    0x17   /* Ctr/Timer 1 - Time Constant (LSB) */
-#define CT2_TIME_CONST_MSB    0x18   /* Ctr/Timer 2 - Time Constant (MSB) */
-#define CT2_TIME_CONST_LSB    0x19   /* Ctr/Timer 2 - Time Constant (LSB) */
-#define CT3_TIME_CONST_MSB    0x1a   /* Ctr/Timer 3 - Time Constant (MSB) */
-#define CT3_TIME_CONST_LSB    0x1b   /* Ctr/Timer 3 - Time Constant (LSB) */
-#define CT1_MODE_SPEC         0x1c   /* Ctr/Timer 1 - Mode Specification  */
-#define CT2_MODE_SPEC         0x1d   /* Ctr/Timer 2 - Mode Specification  */
-#define CT3_MODE_SPEC         0x1e   /* Ctr/Timer 3 - Mode Specification  */
-#define CURRENT_VECTOR        0x1f   /* Current Vector */
-
-/* PORT A SPECIFICATION REGISTERS (0x20 -0x27) */
-#define PORTA_MODE            0x20   /* Port A - Mode Specification  */
-#define PORTA_HANDSHAKE       0x21   /* Port A - Handshake Specification  */
-#define PORTA_DATA_POLARITY   0x22   /* Port A - Data Path Polarity */
-#define PORTA_DIRECTION       0x23   /* Port A - Data Direction */
-#define PORTA_SPECIAL_IO_CTL  0x24   /* Port A - Special IO Control */
-#define PORTA_PATT_POLARITY   0x25   /* Port A - Pattern Polarity */
-#define PORTA_PATT_TRANS      0x26   /* Port A - Pattern Transition */
-#define PORTA_PATT_MASK       0x27   /* Port A - Pattern Mask */
-
-/* PORT B SPECIFICATION REGISTERS (0x28-0x2f) */
-#define PORTB_MODE            0x28   /* Port B - Mode Specification  */
-#define PORTB_HANDSHAKE       0x29   /* Port B - Handshake Specification  */
-#define PORTB_DATA_POLARITY   0x2a   /* Port B - Data Path Polarity */
-#define PORTB_DIRECTION       0x2b   /* Port B - Data Direction */
-#define PORTB_SPECIAL_IO_CTL  0x2c   /* Port B - Special IO Control */
-#define PORTB_PATT_POLARITY   0x2d   /* Port B - Pattern Polarity */
-#define PORTB_PATT_TRANS      0x2e   /* Port B - Pattern Transition */
-#define PORTB_PATT_MASK       0x2f   /* Port B - Pattern Mask */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/cpukit/libcsupport/src/README b/cpukit/libcsupport/src/README
deleted file mode 100644
index ee7a90501e..0000000000
--- a/cpukit/libcsupport/src/README
+++ /dev/null
@@ -1,37 +0,0 @@
---
---  $Id$
---
-
-Overview of newlib support (newlib is from CYGNUS)
-    Each task can have its own libc state including:
-        open stdio files
-        strtok
-        multi precision arithmetic state
-        etc.
-
-    This is implemented by a reentrancy data structure for each task.
-
-    When a task is "started" (in RTEMS sense) the reentrancy structure
-    is allocated.  Its address is stored in notepad[NOTEPAD_LAST].
-
-    When task is switched to, the value of global variable _impure_ptr
-    is changed to the value of the new tasks reentrancy structure.
-
-    When a task is deleted
-        atexit() processing (for that task) happens
-        task's stdio buffers are flushed
-
-    When exit(3) is called
-        calling task's atexit processing done
-        global libc state atexit processing done
-            (this will include any atexit routines installed by drivers)
-        executive is shutdown
-            causes a context switch back to bsp land
-
-
-NOTE:
-    libc extension are installed by bsp_libc_init()
-        iff we are using clock interrupts.
-        This hack is necessary to allow the tmtests to avoid
-        timing the extensions.
-
diff --git a/cpukit/libcsupport/src/__brk.c b/cpukit/libcsupport/src/__brk.c
deleted file mode 100644
index 4dab22c729..0000000000
--- a/cpukit/libcsupport/src/__brk.c
+++ /dev/null
@@ -1,44 +0,0 @@
-#if !defined(RTEMS_UNIX)
-
-/*
- *  RTEMS "Broken" __brk/__sbrk Implementation
- *
- *  NOTE: sbrk is BSP provided.
- *
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems.h>
-
-#include <signal.h>
-#include <errno.h>
-#include <sys/types.h>
-#ifdef RTEMS_NEWLIB
-#include <reent.h>
-#endif
-#include <unistd.h>
-
-/* we use RTEMS for memory management.  We don't need sbrk */
-
-void * __sbrk(int incr)
-{
-  errno = EINVAL;
-  return (void *)0;
-}
-
-int __brk( const void *endds )
-{
-  errno = EINVAL;
-  return -1;
-}
-
-#endif
diff --git a/cpukit/libcsupport/src/__gettod.c b/cpukit/libcsupport/src/__gettod.c
deleted file mode 100644
index dc83c47ce4..0000000000
--- a/cpukit/libcsupport/src/__gettod.c
+++ /dev/null
@@ -1,118 +0,0 @@
-#define __RTEMS_VIOLATE_KERNEL_VISIBILITY__
-
-#include <rtems.h>
-
-#if !defined(RTEMS_UNIX)
-/*
- *  RTEMS gettimeofday Implementation
- *
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifdef RTEMS_NEWLIB
-#include <sys/reent.h>
-#endif
-
-#include <sys/time.h>
-#include <time.h>
-
-#include <errno.h>
-#include <assert.h>
-
-/*
- *  Seconds from January 1, 1970 to January 1, 1988.  Used to account for
- *  differences between POSIX API and RTEMS core.
- */
-
-#define POSIX_TIME_SECONDS_1970_THROUGH_1988 \
-  (((1987 - 1970 + 1)  * TOD_SECONDS_PER_NON_LEAP_YEAR) + \
-  (4 * TOD_SECONDS_PER_DAY))
-
-/*
- *  NOTE:  The solaris gettimeofday does not have a second parameter.
- */
-
-int gettimeofday(
-  struct timeval  *tp,
-  struct timezone *tzp
-)
-{
-  rtems_interrupt_level level;
-  rtems_unsigned32      seconds;
-  rtems_unsigned32      microseconds;
-
-  if ( !tp ) {
-    errno = EFAULT;
-    return -1;
-  }
-
-  /*
-   *  POSIX does not seem to allow for not having a TOD so we just
-   *  grab the time of day.
-   *
-   *  NOTE: XXX this routine should really be in the executive proper.
-   */
-  
-  rtems_interrupt_disable(level);
-    seconds      = _TOD_Seconds_since_epoch;
-    microseconds = _TOD_Current.ticks;
-  rtems_interrupt_enable(level);
-
-  tp->tv_sec  = seconds + POSIX_TIME_SECONDS_1970_THROUGH_1988;
-  tp->tv_usec = microseconds * _TOD_Microseconds_per_tick;
-
-  /*
-   * newlib does not have timezone and daylight savings time
-   * yet.  When it does this needs to be fixed.
-   */
-
-#if 0
-  if ( tzp ) {
-    tzp->tz_minuteswest = 0;  /* at UTC */
-    tzp->tz_dsttime = 0;      /* no daylight savings */
-  tzp->minuteswest = timezone / 60; /* from seconds to minutes */
-  tzp->dsttime = daylight;
-  }
-#endif
-  return 0;
-}
-
-#if defined(RTEMS_NEWLIB) 
-
-/*
- *  "Reentrant" version
- */
-
-int _gettimeofday_r(
-  struct _reent   *ignored_reentrancy_stuff,
-  struct timeval  *tp,
-  struct timezone *tzp
-)
-{
-  return gettimeofday( tp, tzp );
-}
-
-/*
- *  "System call" version 
- */
-
-int _gettimeofday(
-  struct timeval  *tp,
-  struct timezone *tzp
-)
-{
-  return gettimeofday( tp, tzp );
-}
-
-#endif /* defined(RTEMS_NEWLIB) */
-
-#endif
diff --git a/cpukit/libcsupport/src/__times.c b/cpukit/libcsupport/src/__times.c
deleted file mode 100644
index 635bf8e062..0000000000
--- a/cpukit/libcsupport/src/__times.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- *  RTEMS _times Implementation
- *
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems.h>
-
-#include <sys/times.h>
-#include <time.h>
-#include <sys/time.h>
-#include <errno.h>
-#include <assert.h>
-
-clock_t _times(
-   struct tms  *ptms
-)
-{
-  rtems_status_code      status;
-  rtems_interval         ticks_since_boot;
-
-  if ( !ptms ) {
-    errno = EFAULT;
-    return -1;
-  }
-
-  /* "POSIX" does not seem to allow for not having a TOD */
-  status = rtems_clock_get(
-    RTEMS_CLOCK_GET_TICKS_SINCE_BOOT,
-    &ticks_since_boot
-  );
-  if ( status != RTEMS_SUCCESSFUL ) {
-    assert( 0 );
-    return -1;
-  }
-
-  /*
-   *  RTEMS has no notion of system versus user time and does
-   *  not (as of 3.2.0) keep track of CPU usage on a per task basis.
-   */
-
-  ptms->tms_utime  = ticks_since_boot;
-  ptms->tms_stime  = 0;
-  ptms->tms_cutime = 0;
-  ptms->tms_cstime = 0;
-
-  return 0;
-}
-
-clock_t times(
-   struct tms  *ptms
-)
-{
-  return _times( ptms );
-}
-
-#if defined(RTEMS_NEWLIB)
-clock_t _times_r(
-   struct _reent *ptr,
-   struct tms  *ptms
-)
-{
-  return _times(ptms);
-}
-#endif
diff --git a/cpukit/libcsupport/src/assoc.c b/cpukit/libcsupport/src/assoc.c
deleted file mode 100644
index 74387a8c5b..0000000000
--- a/cpukit/libcsupport/src/assoc.c
+++ /dev/null
@@ -1,260 +0,0 @@
-/*
- * assoc.c
- *      rtems assoc routines
- *
- *  $Id$
- */
-
-#include <rtems.h>
-#include "assoc.h"
-
-#include <stdio.h>              /* sprintf */
-#include <string.h>             /* strcat, strcmp */
-
-#define STREQ(a,b)      (strcmp((a), (b)) == 0)
-#define rtems_assoc_is_default(ap)  ((ap)->name && STREQ(ap->name, RTEMS_ASSOC_DEFAULT_NAME))
-
-const rtems_assoc_t *
-rtems_assoc_ptr_by_name(
-    const rtems_assoc_t *ap,
-    const char *name
-  )
-{
-    const rtems_assoc_t *default_ap = 0;
-
-    if (rtems_assoc_is_default(ap))
-        default_ap = ap++;
-    
-    for ( ; ap->name; ap++)
-        if (strcmp(ap->name, name) == 0)
-            return ap;
-
-    return default_ap;
-}
-
-const rtems_assoc_t *
-rtems_assoc_ptr_by_local(
-    const rtems_assoc_t *ap,
-    unsigned32     local_value
-  )
-{
-    const rtems_assoc_t *default_ap = 0;
-
-    if (rtems_assoc_is_default(ap))
-        default_ap = ap++;
-    
-    for ( ; ap->name; ap++)
-        if (ap->local_value == local_value)
-            return ap;
-
-    return default_ap;
-}
-
-
-const rtems_assoc_t *
-rtems_assoc_ptr_by_remote(
-    const rtems_assoc_t *ap,
-    unsigned32     remote_value
-  )
-{
-    const rtems_assoc_t *default_ap = 0;
-
-    if (rtems_assoc_is_default(ap))
-        default_ap = ap++;
-    
-    for ( ; ap->name; ap++)
-        if (ap->remote_value == remote_value)
-            return ap;
-
-    return default_ap;
-}
-
-
-/*
- * Get values
- */
-
-unsigned32
-rtems_assoc_remote_by_local(
-    const rtems_assoc_t *ap,
-    unsigned32     local_value
-  )
-{
-    const rtems_assoc_t *nap;
-    nap = rtems_assoc_ptr_by_local(ap, local_value);
-    if (nap)
-        return nap->remote_value;
-    
-    return 0;
-}
-
-unsigned32
-rtems_assoc_local_by_remote(
-    const rtems_assoc_t *ap,
-    unsigned32     remote_value
-  )
-{
-    const rtems_assoc_t *nap;
-    nap = rtems_assoc_ptr_by_remote(ap, remote_value);
-    if (nap)
-        return nap->local_value;
-    
-    return 0;
-}
-
-unsigned32
-rtems_assoc_remote_by_name(
-    const rtems_assoc_t *ap,
-    const char          *name
-  )
-{
-    const rtems_assoc_t *nap;
-    nap = rtems_assoc_ptr_by_name(ap, name);
-    if (nap)
-        return nap->remote_value;
-    
-    return 0;
-}
-
-unsigned32
-rtems_assoc_local_by_name(
-    const rtems_assoc_t *ap,
-    const char          *name
-  )
-{
-    const rtems_assoc_t *nap;
-    nap = rtems_assoc_ptr_by_name(ap, name);
-    if (nap)
-        return nap->local_value;
-    
-    return 0;
-}
-
-/*
- * what to return if a value is not found
- * this is not reentrant, but it really shouldn't be invoked anyway
- */
-
-const char *
-rtems_assoc_name_bad(
-    unsigned32 bad_value
-)
-{
-#ifdef RTEMS_DEBUG
-    static char bad_buffer[32];
-
-    sprintf(bad_buffer, "< %d [0x%x] >", bad_value, bad_value);
-#else
-    static char bad_buffer[32] = "<assoc.c: BAD NAME>";
-#endif
-    return bad_buffer;
-}
-
-
-const char *
-rtems_assoc_name_by_local(
-    const rtems_assoc_t *ap,
-    unsigned32     local_value
-  )
-{
-    const rtems_assoc_t *nap;
-    nap = rtems_assoc_ptr_by_local(ap, local_value);
-    if (nap)
-        return nap->name;
-    
-    return rtems_assoc_name_bad(local_value);
-}
-
-const char *
-rtems_assoc_name_by_remote(
-    const rtems_assoc_t *ap,
-    unsigned32     remote_value
-  )
-{
-    const rtems_assoc_t *nap;
-    nap = rtems_assoc_ptr_by_remote(ap, remote_value);
-    if (nap)
-        return nap->name;
-    
-    return rtems_assoc_name_bad(remote_value);
-}
-
-/*
- * Bitfield functions assume just 1 bit set in each of remote and local
- *      entries; they do not check for this.
- */
-
-unsigned32 rtems_assoc_remote_by_local_bitfield(
-    const rtems_assoc_t *ap,
-    unsigned32     local_value
-  )
-{  
-    unsigned32 b;
-    unsigned32 remote_value = 0;
-
-    for (b = 1; b; b <<= 1)
-        if (b & local_value)
-            remote_value |= rtems_assoc_remote_by_local(ap, b);
-        
-    return remote_value;
-}
-
-
-unsigned32 rtems_assoc_local_by_remote_bitfield(
-    const rtems_assoc_t *ap,
-    unsigned32     remote_value
-  )
-{  
-    unsigned32 b;
-    unsigned32 local_value = 0;
-
-    for (b = 1; b; b <<= 1)
-        if (b & remote_value)
-            local_value |= rtems_assoc_local_by_remote(ap, b);
-        
-    return local_value;
-}
-
-char *
-rtems_assoc_name_by_remote_bitfield(
-    const rtems_assoc_t *ap,
-    unsigned32     value,
-    char          *buffer
-  )
-{  
-    unsigned32 b;
-
-    *buffer = 0;
-
-    for (b = 1; b; b <<= 1)
-        if (b & value)
-        {
-            if (*buffer)
-                strcat(buffer, " ");
-            strcat(buffer, rtems_assoc_name_by_remote(ap, b));
-        }
-        
-    return buffer;
-}
-
-char *
-rtems_assoc_name_by_local_bitfield(
-    const rtems_assoc_t *ap,
-    unsigned32     value,
-    char          *buffer
-  )
-{  
-    unsigned32 b;
-
-    *buffer = 0;
-
-    for (b = 1; b; b <<= 1)
-        if (b & value)
-        {
-            if (*buffer)
-                strcat(buffer, " ");
-            strcat(buffer, rtems_assoc_name_by_local(ap, b));
-        }
-        
-    return buffer;
-}
diff --git a/cpukit/libcsupport/src/closedir.c b/cpukit/libcsupport/src/closedir.c
deleted file mode 100644
index 5edb3499e6..0000000000
--- a/cpukit/libcsupport/src/closedir.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- *  closedir() - POSIX 1003.1b - XXX
- *
- *  $Id$
- */
-
-
-#include <sys/types.h>
-#include <dirent.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <errno.h>
-
-int closedir(
-  register DIR *dirp
-)
-{
-  errno = ENOSYS;
-  return -1;
-}
diff --git a/cpukit/libcsupport/src/error.c b/cpukit/libcsupport/src/error.c
deleted file mode 100644
index dd32fb8b66..0000000000
--- a/cpukit/libcsupport/src/error.c
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- *  report errors and panics to RTEMS' stderr.
- *  Currently just used by RTEMS monitor.
- *
- *  $Id$
- */
-
-
-/*
- * These routines provide general purpose error reporting.
- * rtems_error reports an error to stderr and allows use of
- * printf style formatting.  A newline is appended to all messages.
- * 
- * error_flag can be specified as any of the following:
- *
- *  	RTEMS_ERROR_ERRNO       -- include errno text in output
- *  	RTEMS_ERROR_PANIC       -- halts local system after output
- *  	RTEMS_ERROR_ABORT       -- abort after output
- *
- * It can also include a rtems_status value which can be OR'd
- * with the above flags. * 
- *
- * EXAMPLE
- *	#include <rtems.h>
- *	#include <rtems/error.h>
- *	rtems_error(0, "stray interrupt %d", intr);
- *
- * EXAMPLE
- *        if ((status = rtems_task_create(...)) != RTEMS_SUCCCESSFUL)
- *        {
- *            rtems_error(status | RTEMS_ERROR_ABORT,
- *                        "could not create task");
- *        }
- *
- * EXAMPLE
- *        if ((fd = open(pathname, O_RDNLY)) < 0)
- *        {
- *            rtems_error(RTEMS_ERROR_ERRNO, "open of '%s' failed", pathname);
- *            goto failed;
- *        }
- */
-
-#define __RTEMS_VIOLATE_KERNEL_VISIBILITY__
-#include <rtems.h>
-
-#include "error.h"
-#include <rtems/assoc.h>
-
-#include <stdio.h>
-#include <stdarg.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>		/* _exit() */
-
-/* bug in hpux <errno.h>: no prototypes unless you are C++ */
-#ifdef hpux9
-char *strerror(int);
-#endif
-
-extern char *rtems_progname;
-int          rtems_panic_in_progress;
-
-rtems_assoc_t rtems_status_assoc[] = {
-    { "successful completion",              RTEMS_SUCCESSFUL, },
-    { "returned from a thread",             RTEMS_TASK_EXITTED, },
-    { "multiprocessing not configured",     RTEMS_MP_NOT_CONFIGURED, },
-    { "invalid object name",                RTEMS_INVALID_NAME, },
-    { "invalid object id",                  RTEMS_INVALID_ID, },
-    { "too many",                           RTEMS_TOO_MANY, },
-    { "timed out waiting",                  RTEMS_TIMEOUT, },
-    { "object deleted while waiting",       RTEMS_OBJECT_WAS_DELETED, },
-    { "specified size was invalid",         RTEMS_INVALID_SIZE, },
-    { "address specified is invalid",       RTEMS_INVALID_ADDRESS, },
-    { "number was invalid",                 RTEMS_INVALID_NUMBER, },
-    { "item has not been initialized",      RTEMS_NOT_DEFINED, },
-    { "resources still outstanding",        RTEMS_RESOURCE_IN_USE, },
-    { "request not satisfied",              RTEMS_UNSATISFIED, },
-    { "thread is in wrong state",           RTEMS_INCORRECT_STATE, },
-    { "thread already in state",            RTEMS_ALREADY_SUSPENDED, },
-    { "illegal on calling thread",          RTEMS_ILLEGAL_ON_SELF, },
-    { "illegal for remote object",          RTEMS_ILLEGAL_ON_REMOTE_OBJECT, },
-    { "called from wrong environment",      RTEMS_CALLED_FROM_ISR, },
-    { "invalid thread priority",            RTEMS_INVALID_PRIORITY, },
-    { "invalid date/time",                  RTEMS_INVALID_CLOCK, },
-    { "invalid node id",                    RTEMS_INVALID_NODE, },
-    { "directive not configured",           RTEMS_NOT_CONFIGURED, },
-    { "not owner of resource",              RTEMS_NOT_OWNER_OF_RESOURCE , },
-    { "directive not implemented",          RTEMS_NOT_IMPLEMENTED, },
-    { "RTEMS inconsistency detected",       RTEMS_INTERNAL_ERROR, },
-    { "could not get enough memory",        RTEMS_NO_MEMORY, },
-    { "internal multiprocessing only",      THREAD_STATUS_PROXY_BLOCKING, },
-    { 0, 0, 0 },
-};
-
-
-const char *
-rtems_status_text(
-    rtems_status_code status
-)
-{
-    return rtems_assoc_name_by_local(rtems_status_assoc, status);
-}
-
-
-static int rtems_verror(
-    unsigned32   error_flag,
-    const char   *printf_format,
-    va_list      arglist
-)
-{
-    int               local_errno = 0;
-    int               chars_written = 0;
-    rtems_status_code status;
-
-    if (error_flag & RTEMS_ERROR_PANIC)
-    {
-        if (rtems_panic_in_progress++)
-            _Thread_Disable_dispatch();       /* disable task switches */
-
-        /* don't aggravate things */
-        if (rtems_panic_in_progress > 2)
-            return 0;
-    }
-
-    (void) fflush(stdout);  	    /* in case stdout/stderr same */
-
-    status = error_flag & ~RTEMS_ERROR_MASK;
-    if (error_flag & RTEMS_ERROR_ERRNO)     /* include errno? */
-        local_errno = errno;
-
-    if (_System_state_Is_multiprocessing)
-        fprintf(stderr, "[%d] ", _Configuration_MP_table->node);
-    
-    if (rtems_progname && *rtems_progname)
-        chars_written += fprintf(stderr, "%s: ", rtems_progname);
-    chars_written += vfprintf(stderr, printf_format, arglist);
-    
-    if (status)
-        chars_written += fprintf(stderr, " (status: %s)", rtems_status_text(status));
-
-    if (local_errno)
-    {
-      if ((local_errno > 0) && *strerror(local_errno))
-        chars_written += fprintf(stderr, " (errno: %s)", strerror(local_errno));
-      else
-        chars_written += fprintf(stderr, " (unknown errno=%d)", local_errno);
-    }
-    
-    chars_written += fprintf(stderr, "\n");
-
-    (void) fflush(stderr);
-
-    if (error_flag & (RTEMS_ERROR_PANIC | RTEMS_ERROR_ABORT))
-    {
-        if (error_flag & RTEMS_ERROR_PANIC)
-        {
-            rtems_error(0, "fatal error, exiting");
-            _exit(local_errno);
-        }
-        else
-        {
-            rtems_error(0, "fatal error, aborting");
-            abort();
-        }
-    }
-    return chars_written;
-}
-
-
-/*
- * Report an error.
- * error_flag is as above; printf_format is a normal
- * printf(3) format string, with its concommitant arguments.
- * 
- * Returns the number of characters written.
- */
-
-int rtems_error(
-    int   error_flag,
-    const char *printf_format,
-    ...
-  )
-{
-    va_list arglist;
-    int chars_written;
-
-    va_start(arglist, printf_format);
-    chars_written = rtems_verror(error_flag, printf_format, arglist);
-    va_end(arglist);
-    
-    return chars_written;
-}
-
-/* 
- * rtems_panic is shorthand for rtems_error(RTEMS_ERROR_PANIC, ...)
- */
-
-void rtems_panic(
-    const char *printf_format,
-    ...
-  )
-{
-    va_list arglist;
-
-    va_start(arglist, printf_format);
-    (void) rtems_verror(RTEMS_ERROR_PANIC, printf_format, arglist);
-    va_end(arglist);
-}
diff --git a/cpukit/libcsupport/src/getdents.c b/cpukit/libcsupport/src/getdents.c
deleted file mode 100644
index 9b16d82409..0000000000
--- a/cpukit/libcsupport/src/getdents.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- *  Just enough to make newlib return an error.
- *
- *  $Id$
- */
-
-int getdents(
-  int   fd,
-  void *buf,
-  int   len
-)
-{
-  return -1;
-}
diff --git a/cpukit/libcsupport/src/hosterr.c b/cpukit/libcsupport/src/hosterr.c
deleted file mode 100644
index a55e4a7e84..0000000000
--- a/cpukit/libcsupport/src/hosterr.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- *  Routines to access a host errno
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems.h>
-#include <errno.h>
-
-int host_errno(void);
-
-/*
- * copy host errno, if any to thread aware errno, if any
- */
-
-void fix_syscall_errno(void)
-{
-    errno = host_errno();
-}
-
-/*
- * Get the host system errno, if any
- * When using newlib (or possibly other libc's) on top of UNIX
- * the errno returned by system calls may be unavailable due
- * to trickery of making errno thread aware.
- * This provides a kludge of getting at it.
- */
-
-#undef errno
-extern int errno;
-int host_errno(void)
-{
-    return errno;
-}
-
diff --git a/cpukit/libcsupport/src/libio.c b/cpukit/libcsupport/src/libio.c
deleted file mode 100644
index 12682c1190..0000000000
--- a/cpukit/libcsupport/src/libio.c
+++ /dev/null
@@ -1,524 +0,0 @@
-/*
- *  Provide UNIX/POSIX-like io system calls for RTEMS using the
- *  RTEMS IO manager
- *
- *  $Id$
- */
-
-#include <rtems.h>
-#include <rtems/assoc.h>                /* assoc.h not included by rtems.h */
-
-#include <stdio.h>                      /* O_RDONLY, et.al. */
-#include <fcntl.h>                      /* O_RDONLY, et.al. */
-#include <assert.h>
-
-#if ! defined(O_NDELAY)
-# if defined(solaris2)
-#  define O_NDELAY O_NONBLOCK
-# elif defined(RTEMS_NEWLIB)
-#  define O_NDELAY _FNBIO
-# endif
-#endif
-
-
-#include <errno.h>
-#include <string.h>                     /* strcmp */
-#include <unistd.h>
-#include <stdlib.h>                     /* calloc() */
-
-#include "libio.h"                      /* libio.h not pulled in by rtems */
-
-/*
- * Semaphore to protect the io table
- */
-
-Objects_Id rtems_libio_semaphore;
-
-#define RTEMS_LIBIO_SEM         rtems_build_name('L', 'B', 'I', 'O')
-#define RTEMS_LIBIO_IOP_SEM(n)  rtems_build_name('L', 'B', 'I', n)
-
-extern unsigned32     rtems_libio_number_iops;
-rtems_libio_t *rtems_libio_iops;
-rtems_libio_t *rtems_libio_last_iop;
-
-#define rtems_libio_iop(fd)    ((((unsigned32)(fd)) < rtems_libio_number_iops) ? \
-                                       &rtems_libio_iops[fd] : 0)
-
-#define rtems_libio_check_fd(fd) \
-    do { \
-        if ((unsigned32) (fd) >= rtems_libio_number_iops) \
-        { \
-            errno = EBADF; \
-            return -1; \
-        } \
-    } while (0)
-
-#define rtems_libio_check_buffer(buffer) \
-    do { \
-        if ((buffer) == 0) \
-        { \
-            errno = EINVAL; \
-            return -1; \
-        } \
-    } while (0)
-
-#define rtems_libio_check_count(count) \
-    do { \
-        if ((count) == 0) \
-        { \
-            return 0; \
-        } \
-    } while (0)
-
-#define rtems_libio_check_permissions(iop, flag) \
-    do { \
-        if (((iop)->flags & (flag)) == 0) \
-        { \
-              errno = EINVAL; \
-              return -1; \
-        } \
-    } while (0)
-
-/*
- * External I/O handlers
- * 
- * Space for all possible handlers is preallocated
- * to speed up dispatch to external handlers.
- */
-
-static rtems_libio_handler_t handlers[15];
-
-void
-rtems_register_libio_handler(
-    int                         handler_flag,
-    const rtems_libio_handler_t *handler
-)
-{
-  int handler_index = rtems_file_descriptor_type_index(handler_flag);
-
-  if ((handler_index < 0) || (handler_index >= 15))
-    rtems_fatal_error_occurred( RTEMS_INVALID_NUMBER );
-  handlers[handler_index] = *handler;
-}
-
-/*
- * Called by bsp startup code to init the libio area.
- */
-
-void
-rtems_libio_init(void)
-{
-    rtems_status_code rc;
-
-    if (rtems_libio_number_iops > 0)
-    {
-        rtems_libio_iops = (rtems_libio_t *) calloc(rtems_libio_number_iops,
-                                                    sizeof(rtems_libio_t));
-        if (rtems_libio_iops == NULL)
-            rtems_fatal_error_occurred(RTEMS_NO_MEMORY);
-
-        rtems_libio_last_iop = rtems_libio_iops + (rtems_libio_number_iops - 1);
-    }
-
-    rc = rtems_semaphore_create(
-      RTEMS_LIBIO_SEM,
-      1,
-      RTEMS_BINARY_SEMAPHORE | RTEMS_INHERIT_PRIORITY | RTEMS_PRIORITY,
-      RTEMS_NO_PRIORITY,
-      &rtems_libio_semaphore
-    );
-    if (rc != RTEMS_SUCCESSFUL)
-        rtems_fatal_error_occurred(rc);
-}
-
-/*
- * Convert RTEMS status to a UNIX errno
- */
-
-rtems_assoc_t errno_assoc[] = {
-    { "OK",                 RTEMS_SUCCESSFUL,                0 },
-    { "BUSY",               RTEMS_RESOURCE_IN_USE,           EBUSY },
-    { "INVALID NAME",       RTEMS_INVALID_NAME,              EINVAL },
-    { "NOT IMPLEMENTED",    RTEMS_NOT_IMPLEMENTED,           ENOSYS },
-    { "TIMEOUT",            RTEMS_TIMEOUT,                   ETIMEDOUT },
-    { "NO MEMORY",          RTEMS_NO_MEMORY,                 ENOMEM },
-    { "NO DEVICE",          RTEMS_UNSATISFIED,               ENODEV },
-    { "INVALID NUMBER",     RTEMS_INVALID_NUMBER,            EBADF},
-    { "NOT RESOURCE OWNER", RTEMS_NOT_OWNER_OF_RESOURCE,     EPERM},
-    { "IO ERROR",           RTEMS_IO_ERROR,                  EIO},
-    { 0, 0, 0 },
-};
-
-static unsigned32
-rtems_libio_errno(rtems_status_code code)
-{
-    int rc;
-    
-    if ((rc = rtems_assoc_remote_by_local(errno_assoc, (unsigned32) code)))
-    {
-        errno = rc;
-        return -1;
-    }
-    return -1;
-}
-
-/*
- * Convert UNIX fnctl(2) flags to ones that RTEMS drivers understand
- */
-
-rtems_assoc_t access_modes_assoc[] = {
-    { "READ",       LIBIO_FLAGS_READ,  O_RDONLY },
-    { "WRITE",      LIBIO_FLAGS_WRITE, O_WRONLY },
-    { "READ/WRITE", LIBIO_FLAGS_READ_WRITE, O_RDWR },
-    { 0, 0, 0 },
-};
-
-rtems_assoc_t status_flags_assoc[] = {
-    { "NO DELAY",  LIBIO_FLAGS_NO_DELAY,  O_NDELAY },
-    { "APPEND",    LIBIO_FLAGS_APPEND,    O_APPEND },
-    { "CREATE",    LIBIO_FLAGS_CREATE,    O_CREAT },
-    { 0, 0, 0 },
-};
-
-static unsigned32
-rtems_libio_fcntl_flags(unsigned32 fcntl_flags)
-{
-    unsigned32 flags = 0;
-    unsigned32 access_modes;
-
-    /*
-     * Access mode is a small integer
-     */
-    
-    access_modes = fcntl_flags & O_ACCMODE;
-    fcntl_flags &= ~O_ACCMODE;
-    flags = rtems_assoc_local_by_remote(access_modes_assoc, access_modes);
-
-    /*
-     * Everything else is single bits
-     */
-
-    flags |= rtems_assoc_local_by_remote_bitfield(status_flags_assoc, fcntl_flags);
-    return flags;
-}
-
-
-static rtems_libio_t *
-rtems_libio_allocate(void)
-{
-    rtems_libio_t *iop;
-    rtems_status_code rc;
-    
-    rtems_semaphore_obtain(rtems_libio_semaphore, RTEMS_WAIT, RTEMS_NO_TIMEOUT);
-
-    for (iop = rtems_libio_iops; iop <= rtems_libio_last_iop; iop++)
-        if ((iop->flags & LIBIO_FLAGS_OPEN) == 0)
-        {
-            /*
-             * Got one; create a semaphore for it
-             */
-
-            rc = rtems_semaphore_create(
-              RTEMS_LIBIO_IOP_SEM(iop - rtems_libio_iops),
-              1,
-              RTEMS_BINARY_SEMAPHORE | RTEMS_INHERIT_PRIORITY | RTEMS_PRIORITY,
-              RTEMS_NO_PRIORITY,
-              &iop->sem
-            );
-            if (rc != RTEMS_SUCCESSFUL)
-                goto failed;
-            
-            iop->flags = LIBIO_FLAGS_OPEN;
-            goto done;
-        }
-    
-failed:
-    iop = 0;
-    
-done:
-    rtems_semaphore_release(rtems_libio_semaphore);
-    return iop;
-}
-
-static void
-rtems_libio_free(rtems_libio_t *iop)
-{
-    rtems_semaphore_obtain(rtems_libio_semaphore, RTEMS_WAIT, RTEMS_NO_TIMEOUT);
-
-    if (iop->sem)
-        rtems_semaphore_delete(iop->sem);
-    (void) memset(iop, 0, sizeof(*iop));
-
-    rtems_semaphore_release(rtems_libio_semaphore);
-}
-
-int
-__rtems_open(
-    const char   *pathname,
-    unsigned32    flag,
-    unsigned32    mode)
-{
-    rtems_status_code rc;
-    rtems_libio_t *iop = 0;
-    rtems_driver_name_t *np;
-    rtems_libio_open_close_args_t args;
-
-    /*
-     * Additional external I/O handlers would be supported by
-     * adding code to pick apart the pathname appropriately.
-     * The networking code does not require changes here since
-     * network file descriptors are obtained using socket(), not
-     * open().
-     */
-
-    if ((rc = rtems_io_lookup_name(pathname, &np)) != RTEMS_SUCCESSFUL)
-        goto done;
-
-    iop = rtems_libio_allocate();
-    if (iop == 0)
-    {
-        rc = RTEMS_TOO_MANY;
-        goto done;
-    }
-    
-    iop->driver = np;
-    iop->pathname = (char *) pathname;
-    iop->flags |= rtems_libio_fcntl_flags(flag);
-
-    args.iop = iop;
-    args.flags = iop->flags;
-    args.mode = mode;
-
-    rc = rtems_io_open(np->major, np->minor, (void *) &args);
-    
-done:
-  
-    if (rc != RTEMS_SUCCESSFUL)
-    {
-        if (iop)
-            rtems_libio_free(iop);
-        return rtems_libio_errno(rc);
-    }
-    
-    return iop - rtems_libio_iops;
-}
-    
-int
-__rtems_close(
-    int  fd
-  )    
-{
-    rtems_status_code rc;
-    rtems_driver_name_t *np;
-    rtems_libio_t *iop;
-    rtems_libio_open_close_args_t args;
-    int status;
-
-    if (rtems_file_descriptor_type(fd)) {
-        int (*fp)(int fd);
-
-        fp = handlers[rtems_file_descriptor_type_index(fd)].close;
-        if (fp == NULL) {
-            errno = EBADF;
-            return -1;
-        }
-        status = (*fp)(fd);
-        return status;
-    }
-    iop = rtems_libio_iop(fd);
-    rtems_libio_check_fd(fd);
-
-    np = iop->driver;
-
-    args.iop = iop;
-    args.flags = 0;
-    args.mode = 0;
-    
-    rc = rtems_io_close(np->major, np->minor, (void *) &args);
-
-    rtems_libio_free(iop);
-
-    if (rc != RTEMS_SUCCESSFUL)
-        return rtems_libio_errno(rc);
-    return 0;
-}
-    
-int
-__rtems_read(
-    int       fd,
-    void *    buffer,
-    unsigned32 count
-  )
-{
-    rtems_status_code rc;
-    rtems_driver_name_t *np;
-    rtems_libio_t *iop;
-    rtems_libio_rw_args_t args;
-
-    if (rtems_file_descriptor_type(fd)) {
-        int (*fp)(int fd, void *buffer, unsigned32 count);
-
-        fp = handlers[rtems_file_descriptor_type_index(fd)].read;
-        if (fp == NULL) {
-            errno = EBADF;
-            return -1;
-        }
-        return (*fp)(fd, buffer, count);
-    }
-    iop = rtems_libio_iop(fd);
-    rtems_libio_check_fd(fd);
-    rtems_libio_check_buffer(buffer);
-    rtems_libio_check_count(count);
-    rtems_libio_check_permissions(iop, LIBIO_FLAGS_READ);
-
-    np = iop->driver;
-
-    args.iop = iop;
-    args.offset = iop->offset;
-    args.buffer = buffer;
-    args.count = count;
-    args.flags = iop->flags;
-    args.bytes_moved = 0;
-
-    rc = rtems_io_read(np->major, np->minor, (void *) &args);
-
-    iop->offset += args.bytes_moved;
-
-    if (rc != RTEMS_SUCCESSFUL)
-        return rtems_libio_errno(rc);
-
-    return args.bytes_moved;
-}
-
-int
-__rtems_write(
-    int         fd,
-    const void *buffer,
-    unsigned32  count
-  )
-{
-    rtems_status_code rc;
-    rtems_driver_name_t *np;
-    rtems_libio_t *iop;
-    rtems_libio_rw_args_t args;
-
-    if (rtems_file_descriptor_type(fd)) {
-        int (*fp)(int fd, const void *buffer, unsigned32 count);
-
-        fp = handlers[rtems_file_descriptor_type_index(fd)].write;
-        if (fp == NULL) {
-            errno = EBADF;
-            return -1;
-        }
-        return (*fp)(fd, buffer, count);
-    }
-    iop = rtems_libio_iop(fd);
-    rtems_libio_check_fd(fd);
-    rtems_libio_check_buffer(buffer);
-    rtems_libio_check_count(count);
-    rtems_libio_check_permissions(iop, LIBIO_FLAGS_WRITE);
-
-    np = iop->driver;
-
-    args.iop = iop;
-    args.offset = iop->offset;
-    args.buffer = (void *) buffer;
-    args.count = count;
-    args.flags = iop->flags;
-    args.bytes_moved = 0;
-
-    rc = rtems_io_write(np->major, np->minor, (void *) &args);
-
-    iop->offset += args.bytes_moved;
-
-    if (rc != RTEMS_SUCCESSFUL)
-        return rtems_libio_errno(rc);
-
-    return args.bytes_moved;
-}
-
-int
-__rtems_ioctl(
-    int         fd,
-    unsigned32  command,
-    void *      buffer)
-{
-    rtems_status_code rc;
-    rtems_driver_name_t *np;
-    rtems_libio_t *iop;
-    rtems_libio_ioctl_args_t args;
-
-    if (rtems_file_descriptor_type(fd)) {
-        int (*fp)(int fd, unsigned32 command, void *buffer);
-
-        fp = handlers[rtems_file_descriptor_type_index(fd)].ioctl;
-        if (fp == NULL) {
-            errno = EBADF;
-            return -1;
-        }
-        return (*fp)(fd, command, buffer);
-    }
-    iop = rtems_libio_iop(fd);
-    rtems_libio_check_fd(fd);
-
-    np = iop->driver;
-
-    args.iop = iop;
-    args.command = command;
-    args.buffer = buffer;
-
-    rc = rtems_io_control(np->major, np->minor, (void *) &args);
-
-    if (rc != RTEMS_SUCCESSFUL)
-        return rtems_libio_errno(rc);
-
-    return args.ioctl_return;
-}
-    
-/*
- * internal only??
- */
-
-
-int
-__rtems_lseek(
-    int                  fd,
-    rtems_libio_offset_t offset,
-    int                  whence
-  )    
-{
-    rtems_libio_t *iop;
-
-    if (rtems_file_descriptor_type(fd)) {
-        int (*fp)(int fd, rtems_libio_offset_t offset, int whence);
-
-        fp = handlers[rtems_file_descriptor_type_index(fd)].lseek;
-        if (fp == NULL) {
-            errno = EBADF;
-            return -1;
-        }
-        return (*fp)(fd, offset, whence);
-    }
-    iop = rtems_libio_iop(fd);
-    rtems_libio_check_fd(fd);
-
-    switch (whence)
-    {
-        case SEEK_SET:
-            iop->offset = offset;
-            break;
-
-        case SEEK_CUR:
-            iop->offset += offset;
-            break;
-
-        case SEEK_END:
-            iop->offset = iop->size - offset;
-            break;
-
-        default:
-            errno = EINVAL;
-            return -1;
-    }
-    return 0;
-}
diff --git a/cpukit/libcsupport/src/malloc.c b/cpukit/libcsupport/src/malloc.c
deleted file mode 100644
index fac38585a7..0000000000
--- a/cpukit/libcsupport/src/malloc.c
+++ /dev/null
@@ -1,424 +0,0 @@
-/*
- *  RTEMS Malloc Family Implementation
- *
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define __RTEMS_VIOLATE_KERNEL_VISIBILITY__
-#include <rtems.h>
-#include "libcsupport.h"
-#ifdef RTEMS_NEWLIB
-#include <sys/reent.h>
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <assert.h>
-#include <errno.h>
-#include <string.h>
-
-/* for sbrk prototype in linux */
-#if defined(__linux__)
-#define __USE_MISC
-#endif
-#include <unistd.h>    /* sbrk(2) */
-
-rtems_id RTEMS_Malloc_Heap;
-size_t RTEMS_Malloc_Sbrk_amount;
-
-extern rtems_cpu_table   Cpu_table;
-#ifdef RTEMS_DEBUG
-#define MALLOC_STATS
-#define MALLOC_DIRTY
-#endif
-
-#ifdef MALLOC_STATS
-#define MSBUMP(f,n)    rtems_malloc_stats.f += (n)
-
-struct {
-    unsigned32  space_available;             /* current size of malloc area */
-    unsigned32  malloc_calls;                /* # calls to malloc */
-    unsigned32  free_calls;
-    unsigned32  realloc_calls;
-    unsigned32  calloc_calls;
-    unsigned32  max_depth;		     /* most ever malloc'd at 1 time */
-    unsigned64  lifetime_allocated;
-    unsigned64  lifetime_freed;
-} rtems_malloc_stats;
-
-#else			/* No rtems_malloc_stats */
-#define MSBUMP(f,n)
-#endif
-
-void RTEMS_Malloc_Initialize(
-  void   *start,
-  size_t  length,
-  size_t  sbrk_amount
-)
-{
-  rtems_status_code   status;
-  void               *starting_address;
-  rtems_unsigned32    old_address;
-  rtems_unsigned32    u32_address;
-
-  /*
-   * If the starting address is 0 then we are to attempt to
-   * get length worth of memory using sbrk. Make sure we
-   * align the address that we get back.
-   */
-
-  starting_address = start;
-  RTEMS_Malloc_Sbrk_amount = sbrk_amount;
-
-  if (!starting_address) {
-    u32_address = (unsigned int)sbrk(length);
-
-    if (u32_address == (rtems_unsigned32) -1) {
-      rtems_fatal_error_occurred( RTEMS_NO_MEMORY );
-      /* DOES NOT RETURN!!! */
-    }
-
-    if (u32_address & (CPU_ALIGNMENT-1)) {
-      old_address = u32_address;
-      u32_address = (u32_address + CPU_ALIGNMENT) & ~(CPU_ALIGNMENT-1);
-
-       /*
-	* adjust the length by whatever we aligned by
-	*/
-
-      length -= u32_address - old_address;
-    }
-
-    starting_address = (void *)u32_address;
-  }
-
-  /*
-   *  If the BSP is not clearing out the workspace, then it is most likely
-   *  not clearing out the initial memory for the heap.  There is no 
-   *  standard supporting zeroing out the heap memory.  But much code
-   *  with UNIX history seems to assume that memory malloc'ed during
-   *  initialization (before any free's) is zero'ed.  This is true most
-   *  of the time under UNIX because zero'ing memory when it is first
-   *  given to a process eliminates the chance of a process seeing data
-   *  left over from another process.  This would be a security violation.
-   */
-
-  if ( Cpu_table.do_zero_of_workspace )
-     memset( starting_address, 0, length );
-
-  /*
-   *  Unfortunately we cannot use assert if this fails because if this
-   *  has failed we do not have a heap and if we do not have a heap
-   *  STDIO cannot work because there will be no buffers.
-   */
-
-  status = rtems_region_create(
-    rtems_build_name( 'H', 'E', 'A', 'P' ),
-    starting_address,
-    length,
-    CPU_ALIGNMENT,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &RTEMS_Malloc_Heap
-  );
-  if ( status != RTEMS_SUCCESSFUL )
-    rtems_fatal_error_occurred( status );
-
-#ifdef MALLOC_STATS
-  /* zero all the stats */
-  (void) memset(&rtems_malloc_stats, 0, sizeof(rtems_malloc_stats));
-#endif
-  
-  MSBUMP(space_available, length);
-}
-
-#ifdef RTEMS_NEWLIB
-void *malloc(
-  size_t  size
-)
-{
-  void              *return_this;
-  void              *starting_address;
-  rtems_unsigned32   the_size;
-  rtems_unsigned32   sbrk_amount;
-  rtems_status_code  status;
-
-  MSBUMP(malloc_calls, 1);
-
-  if ( !size )
-    return (void *) 0;
-
-  /*
-   * Try to give a segment in the current region if there is not
-   * enough space then try to grow the region using rtems_region_extend().
-   * If this fails then return a NULL pointer.
-   */
-
-  status = rtems_region_get_segment(
-    RTEMS_Malloc_Heap,
-    size,
-    RTEMS_NO_WAIT,
-    RTEMS_NO_TIMEOUT,
-    &return_this
-  );
-
-  if ( status != RTEMS_SUCCESSFUL ) {
-    /*
-     *  Round to the "requested sbrk amount" so hopefully we won't have
-     *  to grow again for a while.  This effectively does sbrk() calls
-     *  in "page" amounts.
-     */
-
-    sbrk_amount = RTEMS_Malloc_Sbrk_amount;
-
-    if ( sbrk_amount == 0 )
-      return (void *) 0;
-
-    the_size = ((size + sbrk_amount) / sbrk_amount * sbrk_amount);
-
-    if (((rtems_unsigned32)starting_address = (void *)sbrk(the_size)) 
-            == (rtems_unsigned32) -1)
-      return (void *) 0;
-
-    status = rtems_region_extend(
-      RTEMS_Malloc_Heap,
-      starting_address,
-      the_size
-    );
-    if ( status != RTEMS_SUCCESSFUL ) {
-      sbrk(-the_size);
-      errno = ENOMEM;
-      return (void *) 0;
-    }
-    
-    MSBUMP(space_available, the_size);
-
-    status = rtems_region_get_segment(
-      RTEMS_Malloc_Heap,
-       size,
-       RTEMS_NO_WAIT,
-       RTEMS_NO_TIMEOUT,
-       &return_this
-    );
-    if ( status != RTEMS_SUCCESSFUL ) {
-      errno = ENOMEM;
-      return (void *) 0;
-    }
-  }
-
-#ifdef MALLOC_STATS
-  if (return_this)
-  {
-      unsigned32 actual_size;
-      unsigned32 current_depth;
-      status = rtems_region_get_segment_size(RTEMS_Malloc_Heap, return_this, &actual_size);
-      MSBUMP(lifetime_allocated, actual_size);
-      current_depth = rtems_malloc_stats.lifetime_allocated - rtems_malloc_stats.lifetime_freed;
-      if (current_depth > rtems_malloc_stats.max_depth)
-          rtems_malloc_stats.max_depth = current_depth;
-  }
-#endif
-
-#ifdef MALLOC_DIRTY
-  (void) memset(return_this, 0xCF, size);
-#endif
-
-  return return_this;
-}
-
-void *calloc(
-  size_t nelem,
-  size_t elsize
-)
-{
-  register char *cptr;
-  int length;
-
-  MSBUMP(calloc_calls, 1);
-
-  length = nelem * elsize;
-  cptr = malloc( length );
-  if ( cptr )
-    memset( cptr, '\0', length );
-
-  MSBUMP(malloc_calls, -1);   /* subtract off the malloc */
-
-  return cptr;
-}
-
-void *realloc(
-  void *ptr,
-  size_t size
-)
-{
-  rtems_unsigned32  old_size;
-  rtems_status_code status;
-  char *new_area;
-
-  MSBUMP(realloc_calls, 1);
-
-  if ( !ptr )
-    return malloc( size );
-
-  if ( !size ) {
-    free( ptr );
-    return (void *) 0;
-  }
-
-  new_area = malloc( size );
- 
-  MSBUMP(malloc_calls, -1);   /* subtract off the malloc */
-
-  if ( !new_area ) {
-    free( ptr );
-    return (void *) 0;
-  }
-
-  status = rtems_region_get_segment_size( RTEMS_Malloc_Heap, ptr, &old_size );
-  if ( status != RTEMS_SUCCESSFUL ) {
-    errno = EINVAL;
-    return (void *) 0;
-  }
-
-  memcpy( new_area, ptr, (size < old_size) ? size : old_size );
-  free( ptr );
-
-  return new_area;
-
-}
-
-void free(
-  void *ptr
-)
-{
-  rtems_status_code status;
-
-  MSBUMP(free_calls, 1);
-
-  if ( !ptr )
-    return;
-
-#ifdef MALLOC_STATS
-  {
-      unsigned32        size;
-      status = rtems_region_get_segment_size( RTEMS_Malloc_Heap, ptr, &size );
-      if ( status == RTEMS_SUCCESSFUL ) {
-          MSBUMP(lifetime_freed, size);
-      }
-  }
-#endif
-  
-  status = rtems_region_return_segment( RTEMS_Malloc_Heap, ptr );
-  if ( status != RTEMS_SUCCESSFUL ) {
-    errno = EINVAL;
-    assert( 0 );
-  }
-}
-/* end if RTEMS_NEWLIB */
-#endif
-
-#ifdef MALLOC_STATS
-/*
- * Dump the malloc statistics
- * May be called via atexit()  (installable by our bsp) or
- * at any time by user
- */
-
-void malloc_dump(void)
-{
-    unsigned32 allocated = rtems_malloc_stats.lifetime_allocated - rtems_malloc_stats.lifetime_freed;
-
-    printf("Malloc stats\n");
-    printf("  avail:%uk  allocated:%uk (%d%%) max:%uk (%d%%) lifetime:%Luk freed:%Luk\n",
-           (unsigned int) rtems_malloc_stats.space_available / 1024,
-           (unsigned int) allocated / 1024,
-           /* avoid float! */
-           (allocated * 100) / rtems_malloc_stats.space_available,
-           (unsigned int) rtems_malloc_stats.max_depth / 1024,
-           (rtems_malloc_stats.max_depth * 100) / rtems_malloc_stats.space_available,
-           (unsigned64) rtems_malloc_stats.lifetime_allocated / 1024,
-           (unsigned64) rtems_malloc_stats.lifetime_freed / 1024);
-    printf("  Call counts:   malloc:%d   free:%d   realloc:%d   calloc:%d\n",
-           rtems_malloc_stats.malloc_calls,
-           rtems_malloc_stats.free_calls,
-           rtems_malloc_stats.realloc_calls,
-           rtems_malloc_stats.calloc_calls);
-}
-
-
-void malloc_walk(size_t source, size_t printf_enabled)
-{
-   register Region_Control *the_region;
-   Objects_Locations        location;
- 
-   the_region = _Region_Get( RTEMS_Malloc_Heap, &location );
-   if ( location == OBJECTS_LOCAL )
-   {
-      _Heap_Walk( &the_region->Memory, source, printf_enabled );
-      _Thread_Enable_dispatch();
-   }
-}
-
-#else
-
-void malloc_dump(void)
-{
-   return;
-}
- 
-void malloc_walk(size_t source, size_t printf_enabled)
-{
-   return;
-}
-
-#endif
-
-/*
- *  "Reentrant" versions of the above routines implemented above.
- */
-
-#ifdef RTEMS_NEWLIB
-void *_malloc_r(
-  struct _reent *ignored,
-  size_t  size
-)
-{
-  return malloc( size );
-}
-
-void *_calloc_r(
-  struct _reent *ignored,
-  size_t nelem,
-  size_t elsize
-)
-{
-  return calloc( nelem, elsize );
-}
-
-void *_realloc_r(
-  struct _reent *ignored,
-  void *ptr,
-  size_t size
-)
-{
-  return realloc( ptr, size );
-}
-
-void _free_r(
-  struct _reent *ignored,
-  void *ptr
-)
-{
-  free( ptr );
-}
-#endif
-
diff --git a/cpukit/libcsupport/src/newlibc.c b/cpukit/libcsupport/src/newlibc.c
deleted file mode 100644
index a6acc1c8d7..0000000000
--- a/cpukit/libcsupport/src/newlibc.c
+++ /dev/null
@@ -1,429 +0,0 @@
-
-/*
- *  COPYRIGHT (c) 1994 by Division Incorporated
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  Description:
- *      Implementation of hooks for the CYGNUS newlib libc
- *      These hooks set things up so that:
- *              '_REENT' is switched at task switch time.
- *
- *
- *  TODO:
- *
- *  NOTE:
- *
- *  $Id$
- *
- */
-
-#define __RTEMS_VIOLATE_KERNEL_VISIBILITY__
-#include <rtems.h>
-
-#if defined(RTEMS_NEWLIB)
-#include <libcsupport.h>
-#include <stdlib.h>             /* for free() */
-#include <string.h>             /* for memset() */
-
-#include <sys/reent.h>          /* for extern of _REENT (aka _impure_ptr) */
-#include <errno.h>
-
-/*
- *  NOTE:
- *        There is some problem with doing this on the hpux version
- *        of the UNIX simulator (symptom is printf core dumps), so
- *        we just don't for now.
- *        Not sure if this is a problem with hpux, newlib, or something else.
- */
- 
-#if defined(RTEMS_UNIX) && !defined(hpux)
-#define NEED_SETVBUF
-#endif
- 
-#ifdef NEED_SETVBUF
-#include <stdio.h>
-#endif
-
-#include "internal.h"
-
-#define LIBC_NOTEPAD RTEMS_NOTEPAD_LAST
-
-
-int              libc_reentrant;        /* do we think we are reentrant? */
-struct _reent    libc_global_reent = _REENT_INIT(libc_global_reent);
-
-/*
- * CYGNUS newlib routine that does atexit() processing and flushes
- *      stdio streams
- *      undocumented
- */
-
-extern void _wrapup_reent(struct _reent *);
-extern void _reclaim_reent(struct _reent *);
-
-#include <stdio.h>
-
-void
-libc_wrapup(void)
-{
-    /*
-     *  In case RTEMS is already down, don't do this.  It could be 
-     *  dangerous.
-     */
-
-    if (!_System_state_Is_up(_System_state_Get()))
-       return;
-
-    _wrapup_reent(0);
-    if (_REENT != &libc_global_reent)
-    {
-        _wrapup_reent(&libc_global_reent);
-#if 0
-        /* don't reclaim this one, just in case we do printfs */
-        /* on our way out to ROM */
-        _reclaim_reent(&libc_global_reent);
-#endif
-        _REENT = &libc_global_reent;
-    }
-    
-    /*
-     * Try to drain output buffers.
-     *
-     * Should this be changed to do *all* file streams?
-     *	_fwalk (_REENT, fclose);
-     */
-    fclose (stdin);
-    fclose (stdout);
-    fclose (stderr);
-}
-
-
-rtems_boolean
-libc_create_hook(rtems_tcb *current_task,
-                 rtems_tcb *creating_task)
-{
-    MY_task_set_note(creating_task, LIBC_NOTEPAD, 0);
-    return TRUE;
-}
-
-/*
- * Called for all user TASKS (system tasks are MPCI Receive Server and IDLE)
- */
-
-rtems_extension
-libc_start_hook(rtems_tcb *current_task,
-                rtems_tcb *starting_task)
-{
-    struct _reent *ptr;
-
-    /* NOTE: our malloc is reentrant without a reent ptr since
-     *  it is based on region manager
-     */
-
-    ptr = (struct _reent *) calloc(1, sizeof(struct _reent));
-
-    if (!ptr)
-       rtems_fatal_error_occurred(RTEMS_NO_MEMORY);
- 
-#ifdef __GNUC__
-    /* GCC extension: structure constants */
-    *ptr = (struct _reent) _REENT_INIT((*ptr));
-#else
-    /* 
-     *  Warning: THIS IS VERY DEPENDENT ON NEWLIB!!! WRITTEN FOR 1.7.0
-     */
-    ptr->_errno=0;
-    ptr->_stdin=&ptr->__sf[0];
-    ptr->_stdout=&ptr->__sf[1];
-    ptr->_stderr=&ptr->__sf[2];
-    ptr->_scanpoint=0;
-    ptr->_asctime[0]=0;
-    ptr->_next=1;
-    ptr->__sdidinit=0;
-#endif
-
-    MY_task_set_note(starting_task, LIBC_NOTEPAD, (rtems_unsigned32) ptr);
-}
-
-/*
- * Called for all user TASKS (system tasks are MPCI Receive Server and IDLE)
- */
- 
-#ifdef NEED_SETVBUF
-rtems_extension
-libc_begin_hook(rtems_tcb *current_task)
-{
-  setvbuf( stdout, NULL, _IOLBF, BUFSIZ );
-}
-#endif
-
-rtems_extension
-libc_switch_hook(rtems_tcb *current_task,
-                 rtems_tcb *heir_task)
-{
-    rtems_unsigned32 impure_value;
-
-    /* XXX We can't use rtems_task_set_note() here since SYSI task has a
-     * tid of 0, which is treated specially (optimized, actually)
-     * by rtems_task_set_note
-     *
-     * NOTE:  The above comment is no longer true and we need to use
-     *        the extension data areas added about the same time.
-     */
-
-    /*
-     *  Don't touch the outgoing task if it has been deleted.
-     */
-
-    if ( !_States_Is_transient( current_task->current_state ) ) {
-      impure_value = (rtems_unsigned32) _REENT;
-      MY_task_set_note(current_task, LIBC_NOTEPAD, impure_value);
-    }
-
-    _REENT = (struct _reent *) MY_task_get_note(heir_task, LIBC_NOTEPAD);
-
-}
-
-/*
- *  Function:   libc_delete_hook
- *  Created:    94/12/10
- *
- *  Description:
- *      Called when a task is deleted.
- *      Must restore the new lib reentrancy state for the new current
- *      task.
- *
- *  Parameters:
- *
- *
- *  Returns:
- *
- *
- *  Side Effects:
- *
- *  Notes:
- *
- *
- *  Deficiencies/ToDo:
- *
- *
- */
-rtems_extension
-libc_delete_hook(rtems_tcb *current_task,
-                 rtems_tcb *deleted_task)
-{
-    struct _reent *ptr;
-
-    /*
-     * The reentrancy structure was allocated by newlib using malloc()
-     */
-
-    if (current_task == deleted_task)
-    {
-      ptr = _REENT;
-    }
-    else
-    {
-      ptr = (struct _reent *) MY_task_get_note(deleted_task, LIBC_NOTEPAD);
-    }
-
-    /* if (ptr) */
-    if (ptr && ptr != &libc_global_reent)
-    {
-      _wrapup_reent(ptr);
-      _reclaim_reent(ptr);
-      free(ptr);
-    }
-
-    MY_task_set_note(deleted_task, LIBC_NOTEPAD, 0);
-
-    /*
-     * Require the switch back to another task to install its own
-     */
-
-    if (current_task == deleted_task)
-    {
-      _REENT = 0;
-    }
-}
-
-/*
- *  Function:   libc_init
- *  Created:    94/12/10
- *
- *  Description:
- *      Init libc for CYGNUS newlib
- *      Set up _REENT to use our global libc_global_reent.
- *      (newlib provides a global of its own, but we prefer our
- *      own name for it)
- *
- *      If reentrancy is desired (which it should be), then
- *      we install the task extension hooks to maintain the
- *      newlib reentrancy global variable _REENT on task
- *      create, delete, switch, exit, etc.
- *
- *  Parameters:
- *      reentrant               non-zero if reentrant library desired.
- *
- *  Returns:
- *
- *  Side Effects:
- *      installs libc extensions if reentrant.
- *
- *  Notes:
- *
- *
- *  Deficiencies/ToDo:
- *
- */
-
-void
-libc_init(int reentrant)
-{
-    rtems_extensions_table  libc_extension;
-    rtems_id                extension_id;
-    rtems_status_code       rc;
-
-    _REENT = &libc_global_reent;
-
-    if (reentrant)
-    {
-        memset(&libc_extension, 0, sizeof(libc_extension));
-
-        libc_extension.thread_create  = libc_create_hook;
-        libc_extension.thread_start   = libc_start_hook;
-#ifdef NEED_SETVBUF
-        libc_extension.thread_begin   = libc_begin_hook;
-#endif
-        libc_extension.thread_switch  = libc_switch_hook;
-        libc_extension.thread_delete  = libc_delete_hook;
-
-        rc = rtems_extension_create(rtems_build_name('L', 'I', 'B', 'C'),
-                              &libc_extension, &extension_id);
-        if (rc != RTEMS_SUCCESSFUL)
-            rtems_fatal_error_occurred(rc);
-
-        libc_reentrant = reentrant;
-    }
-}
-
-#if 0
-/*
- *  Routines required by the gnat runtime.
- */
-
-int get_errno()
-{
-  return errno;
-}
-#endif
-
-/*
- *  Function:   _exit
- *  Created:    94/12/10
- *
- *  Description:
- *      Called from exit() after it does atexit() processing and stdio fflush's
- *
- *      called from bottom of exit() to really delete the task.
- *      If we are using reentrant libc, then let the delete extension
- *      do all the work, otherwise if a shutdown is in progress,
- *      then just do it.
- *
- *  Parameters:
- *      exit status
- *
- *  Returns:
- *      does not return
- *
- *  Side Effects:
- *
- *  Notes:
- *
- *
- *  Deficiencies/ToDo:
- *
- *
- */
-
-#include <stdio.h>
-
-/* #if !defined(RTEMS_UNIX) && !defined(__GO32__) && !defined(_AM29K) */
-#if !defined(RTEMS_UNIX) && !defined(_AM29K)
-void _exit(int status)
-{
-    libc_wrapup(); /* Why? XXX */
-    rtems_shutdown_executive(status);
-}
-#else
-
-void exit(int status)
-{
-    libc_wrapup();
-    rtems_shutdown_executive(status);
-}
-#endif
-
-
-/*
- *  These are directly supported (and completely correct) in the posix api.
- */
-
-pid_t __getpid(void)
-{
-  return getpid();
-}
-
-/* #if !defined(RTEMS_POSIX_API) || defined(__GO32__) */
-#if !defined(RTEMS_POSIX_API)
-pid_t getpid(void)
-{
-  return (0);
-}
-#endif
-
-/* #if !defined(RTEMS_POSIX_API) || defined(__GO32__) */
-#if !defined(RTEMS_POSIX_API)
-int kill( pid_t pid, int sig )
-{
-  return 0;
-}
-#endif
-
-int __kill( pid_t pid, int sig )
-{
-  return 0;
-}
-
-#if !defined(RTEMS_POSIX_API)
-unsigned int sleep(
-  unsigned int seconds
-)
-{
-  rtems_status_code status;
-  rtems_interval    ticks_per_second;
-  rtems_interval    ticks;
- 
-  status = rtems_clock_get(
-    RTEMS_CLOCK_GET_TICKS_PER_SECOND,
-    &ticks_per_second
-  );
- 
-  ticks = seconds * ticks_per_second;
- 
-  status = rtems_task_wake_after( ticks );
- 
-  /*
-   *  Returns the "unslept" amount of time.  In RTEMS signals are not
-   *  interruptable, so tasks really sleep all of the requested time.
-   */
- 
-  return 0;
-}
-#endif
-
-
-#endif
diff --git a/cpukit/libcsupport/src/no_libc.c b/cpukit/libcsupport/src/no_libc.c
deleted file mode 100644
index 5a58ba761c..0000000000
--- a/cpukit/libcsupport/src/no_libc.c
+++ /dev/null
@@ -1,55 +0,0 @@
-
-/*  no_libc.h
- *
- *  This file contains stubs for the reentrancy hooks when
- *  an unknown C library is used.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-#include <rtems.h>
-#if  !defined(RTEMS_NEWLIB) && !defined(RTEMS_UNIX)
-
-#include "libcsupport.h"
-#include "internal.h"
-
-#include <stdlib.h>             /* for free() */
-
-void
-libc_init(int reentrant)
-{
-}
-
-void libc_suspend_main(void)
-{
-}
-
-
-void libc_global_exit(rtems_unsigned32 code)
-{
-}
-
-void _exit(int status)
-{
-}
-
-#else
-
-/* remove ANSI errors.
- *  A program must contain at least one external-declaration
- *  (X3.159-1989 p.82,L3).
- */
-void no_libc_dummy_function( void )
-{
-}
-
-#endif
diff --git a/cpukit/libcsupport/src/opendir.c b/cpukit/libcsupport/src/opendir.c
deleted file mode 100644
index e303eb28e5..0000000000
--- a/cpukit/libcsupport/src/opendir.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- *  opendir() - POSIX 1003.1b - XXX
- *
- *  $Id$
- */
-
-#include <dirent.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-DIR *opendir(
-  const char *name
-)
-{
-  return NULL;
-}
diff --git a/cpukit/libcsupport/src/readdir.c b/cpukit/libcsupport/src/readdir.c
deleted file mode 100644
index d592a62b99..0000000000
--- a/cpukit/libcsupport/src/readdir.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- *  readdir() - POSIX 1003.1b - XXX
- *
- *  $Id$
- */
-
-#include <dirent.h>
-
-struct dirent *readdir(
-  register DIR *dirp
-)
-{
-  return NULL;
-}
diff --git a/cpukit/libcsupport/src/rewinddir.c b/cpukit/libcsupport/src/rewinddir.c
deleted file mode 100644
index c85e6fd4d0..0000000000
--- a/cpukit/libcsupport/src/rewinddir.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- *  rewinddir() - POSIX 1003.1b - XXX
- *
- *  $Id$
- */
-
-#include <sys/types.h>
-#include <assert.h>
-#include <dirent.h>
-#include <stdio.h>
-#include <errno.h>
-#include <unistd.h>
-
-void rewinddir(
-  DIR *dirp
-)
-{
-  errno = ENOSYS;
-  return -1;
-}
diff --git a/cpukit/libcsupport/src/scandir.c b/cpukit/libcsupport/src/scandir.c
deleted file mode 100644
index 380415dd97..0000000000
--- a/cpukit/libcsupport/src/scandir.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- *  scandir() - POSIX 1003.1b - XXX
- *
- *  $Id$
- */
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <dirent.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-
-int scandir(
-  const char      *dirname,
-  struct dirent ***namelist,
-  int             (*select)(struct dirent *),
-  int             (*dcomp)(const void *, const void *)
-)
-{
-  errno = ENOSYS;
-  return -1;
-}
diff --git a/cpukit/libcsupport/src/seekdir.c b/cpukit/libcsupport/src/seekdir.c
deleted file mode 100644
index e591adbb9f..0000000000
--- a/cpukit/libcsupport/src/seekdir.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- *  seekdir() - POSIX 1003.1b - XXX
- *
- *  $Id$
- */
-
-#include <sys/param.h>
-#include <assert.h>
-#include <dirent.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <errno.h>
-
-void seekdir(
-  DIR  *dirp,
-  long  loc
-)
-{
-  errno = ENOSYS;
-  return -1;
-}
diff --git a/cpukit/libcsupport/src/tcdrain.c b/cpukit/libcsupport/src/tcdrain.c
deleted file mode 100644
index 585871cc90..0000000000
--- a/cpukit/libcsupport/src/tcdrain.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- *  This file contains the RTEMS implementation of the POSIX API
- *  routines tcdrain.
- *
- *  $Id$
- *
- */
-
-#include <rtems.h>
-#if defined(RTEMS_NEWLIB)
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <termios.h>
-
-#include "internal.h"
-#include "libio.h"
-
-int
-tcdrain(int fd)
-{
-	return __rtems_ioctl(fd,RTEMS_IO_TCDRAIN,0);
-}
-
-#endif
diff --git a/cpukit/libcsupport/src/telldir.c b/cpukit/libcsupport/src/telldir.c
deleted file mode 100644
index eee8d925ec..0000000000
--- a/cpukit/libcsupport/src/telldir.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- *  telldir() - XXX
- * 
- *  $Id$
- */
-
-#include <sys/param.h>
-#include <assert.h>
-#include <dirent.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <errno.h>
-
-#include <rtems.h>
-#include "libio.h"
-
-long telldir(
-  DIR *dirp
-)
-{
-  errno = ENOSYS;
-  return -1;
-}
diff --git a/cpukit/libcsupport/src/termios.c b/cpukit/libcsupport/src/termios.c
deleted file mode 100644
index c2a43c7707..0000000000
--- a/cpukit/libcsupport/src/termios.c
+++ /dev/null
@@ -1,935 +0,0 @@
-/*
- * TERMIOS serial line support
- *
- *  Author:
- *    W. Eric Norum
- *    Saskatchewan Accelerator Laboratory
- *    University of Saskatchewan
- *    Saskatoon, Saskatchewan, CANADA
- *    eric@skatter.usask.ca
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems.h>
-#include <rtems/libio.h>
-#include <ctype.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <termios.h>
-#include <unistd.h>
-
-/*
- *  FreeBSD does not support a full POSIX termios so we have to help it out
- */
-
-
-#if defined(__FreeBSD__)
-#define XTABS   0
-#define ONLRET  0
-#define ONOCR   0
-#define TABDLY  0
-#define OLCUC   0
-#define ILCUC   0
-#define OCRNL   0
-#define IUCLC   0
-#endif
-
-/*
- * The size of the cooked buffer
- */
-#define CBUFSIZE	256
-
-/*
- * The sizes of the raw message buffers.
- * On most architectures it is quite a bit more
- * efficient if these are powers of two.
- */
-#define RAW_INPUT_BUFFER_SIZE	128
-#define RAW_OUTPUT_BUFFER_SIZE	64
-
-/*
- * Variables associated with each termios instance.
- * One structure for each hardware I/O device.
- */
-struct rtems_termios_tty {
-	/*
-	 * Linked-list of active TERMIOS devices
-	 */
-	struct rtems_termios_tty	*forw;
-	struct rtems_termios_tty	*back;
-
-	/*
-	 * How many times has this device been opened
-	 */
-	int		refcount;
-
-	/*
-	 * This device
-	 */
-	rtems_device_major_number	major;
-	rtems_device_major_number	minor;
-
-	/*
-	 * Mutual-exclusion semaphores
-	 */
-	rtems_id	isem;
-	rtems_id	osem;
-
-	/*
-	 * The canonical (cooked) character buffer
-	 */
-	char		cbuf[CBUFSIZE];
-	int		ccount;
-	int		cindex;
-
-	/*
-	 * Keep track of cursor (printhead) position
-	 */
-	int		column;
-	int		read_start_column;
-
-	/*
-	 * The ioctl settings
-	 */
-	struct termios	termios;
-	rtems_interval	vtimeTicks;
-
-	/*
-	 * Raw input character buffer
-	 */
-	volatile char		rawInBuf[RAW_INPUT_BUFFER_SIZE];
-	volatile unsigned int	rawInBufHead;
-	volatile unsigned int	rawInBufTail;
-	rtems_id		rawInBufSemaphore;
-	rtems_unsigned32	rawInBufSemaphoreOptions;
-	rtems_interval		rawInBufSemaphoreTimeout;
-	rtems_interval		rawInBufSemaphoreFirstTimeout;
-	unsigned int		rawInBufDropped;	/* Statistics */
-
-	/*
-	 * Raw output character buffer
-	 */
-	volatile char		rawOutBuf[RAW_OUTPUT_BUFFER_SIZE];
-	volatile unsigned int	rawOutBufHead;
-	volatile unsigned int	rawOutBufTail;
-	rtems_id		rawOutBufSemaphore;
-	enum {rob_idle, rob_busy, rob_wait }	rawOutBufState;
-
-	/*
-	 * Callbacks to device-specific routines
-	 */
-	rtems_termios_callbacks	device;
-};
-
-static struct rtems_termios_tty *ttyHead, *ttyTail;
-static rtems_id ttyMutex;
-
-/*
- *  Reserve enough resources to open every physical device once.
- */
-
-static int first_time;   /* assumed to be zeroed by BSS initialization */
-
-void
-rtems_termios_reserve_resources (
-  rtems_configuration_table *configuration,
-  rtems_unsigned32           number_of_devices
-  )
-{
-	rtems_api_configuration_table *rtems_config;
-
-	if (!configuration)
-		rtems_fatal_error_occurred (0xFFF0F001);
-	rtems_config = configuration->RTEMS_api_configuration;
-	if (!rtems_config)
-		rtems_fatal_error_occurred (0xFFF0F002);
-	if (!first_time)
-		rtems_config->maximum_semaphores += 1;
-	first_time = 1;
-	rtems_config->maximum_semaphores += (4 * number_of_devices);
-}
-
-void
-rtems_termios_initialize (void)
-{
-	rtems_status_code sc;
-
-	/*
-	 * Create the mutex semaphore for the tty list
-	 */
-	if (!ttyMutex) {
-		sc = rtems_semaphore_create (
-			rtems_build_name ('T', 'R', 'm', 'i'),
-			1,
-			RTEMS_BINARY_SEMAPHORE | RTEMS_INHERIT_PRIORITY | RTEMS_PRIORITY,
-			RTEMS_NO_PRIORITY,
-			&ttyMutex);
-		if (sc != RTEMS_SUCCESSFUL)
-			rtems_fatal_error_occurred (sc);
-	}
-}
-	
-/*
- * Open a termios device
- */
-rtems_status_code
-rtems_termios_open (
-  rtems_device_major_number      major,
-  rtems_device_minor_number      minor,
-  void                          *arg,
-  const rtems_termios_callbacks *callbacks
-  )
-{
-	rtems_status_code sc;
-	rtems_libio_open_close_args_t *args = arg;
-	struct rtems_termios_tty *tty;
-
-	/*
-	 * See if the device has already been opened
-	 */
-	sc = rtems_semaphore_obtain (ttyMutex, RTEMS_WAIT, RTEMS_NO_TIMEOUT);
-	if (sc != RTEMS_SUCCESSFUL)
-		return sc;
-	for (tty = ttyHead ; tty != NULL ; tty = tty->forw) {
-		if ((tty->major == major) && (tty->minor == minor))
-			break;
-	}
-	if (tty == NULL) {
-		static char c = 'a';
-
-		/*
-		 * Create a new device
-		 */
-		tty = calloc (1, sizeof (struct rtems_termios_tty));
-		if (tty == NULL) {
-			rtems_semaphore_release (ttyMutex);
-			return RTEMS_NO_MEMORY;
-		}
-		tty->forw = ttyHead;
-		ttyHead = tty;
-		if (ttyTail == NULL)
-			ttyTail = tty;
-
-		tty->minor = minor;
-		tty->major = major;
-
-		/*
-		 * Set up mutex semaphores
-		 */
-		sc = rtems_semaphore_create (
-			rtems_build_name ('T', 'R', 'i', c),
-			1,
-			RTEMS_BINARY_SEMAPHORE | RTEMS_INHERIT_PRIORITY | RTEMS_PRIORITY,
-			RTEMS_NO_PRIORITY,
-			&tty->isem);
-		if (sc != RTEMS_SUCCESSFUL)
-			rtems_fatal_error_occurred (sc);
-		sc = rtems_semaphore_create (
-			rtems_build_name ('T', 'R', 'o', c),
-			1,
-			RTEMS_BINARY_SEMAPHORE | RTEMS_INHERIT_PRIORITY | RTEMS_PRIORITY,
-			RTEMS_NO_PRIORITY,
-			&tty->osem);
-		if (sc != RTEMS_SUCCESSFUL)
-			rtems_fatal_error_occurred (sc);
-		sc = rtems_semaphore_create (
-			rtems_build_name ('T', 'R', 'x', c),
-			0,
-			RTEMS_COUNTING_SEMAPHORE | RTEMS_PRIORITY,
-			RTEMS_NO_PRIORITY,
-			&tty->rawOutBufSemaphore);
-		if (sc != RTEMS_SUCCESSFUL)
-			rtems_fatal_error_occurred (sc);
-		tty->rawOutBufState = rob_idle;
-
-		/*
-		 * Set callbacks
-		 */
-		tty->device = *callbacks;
-		if (!tty->device.pollRead) {
-			sc = rtems_semaphore_create (
-				rtems_build_name ('T', 'R', 'r', c),
-				0,
-				RTEMS_COUNTING_SEMAPHORE | RTEMS_PRIORITY,
-				RTEMS_NO_PRIORITY,
-				&tty->rawInBufSemaphore);
-			if (sc != RTEMS_SUCCESSFUL)
-				rtems_fatal_error_occurred (sc);
-		}
-
-		/*
-		 * Set default parameters
-		 */
-		tty->termios.c_iflag = BRKINT | ICRNL | IXON | IMAXBEL;
-		tty->termios.c_oflag = OPOST | ONLCR | XTABS;
-		tty->termios.c_cflag = B9600 | CS8 | CREAD;
-		tty->termios.c_lflag = ISIG | ICANON | IEXTEN | ECHO | ECHOK | ECHOE | ECHOCTL;
-		tty->termios.c_cc[VINTR] = '\003';
-		tty->termios.c_cc[VQUIT] = '\034';
-		tty->termios.c_cc[VERASE] = '\177';
-		tty->termios.c_cc[VKILL] = '\025';
-		tty->termios.c_cc[VEOF] = '\004';
-		tty->termios.c_cc[VEOL] = '\000';
-		tty->termios.c_cc[VEOL2] = '\000';
-		tty->termios.c_cc[VSTART] = '\021';
-		tty->termios.c_cc[VSTOP] = '\023';
-		tty->termios.c_cc[VSUSP] = '\032';
-		tty->termios.c_cc[VREPRINT] = '\022';
-		tty->termios.c_cc[VDISCARD] = '\017';
-		tty->termios.c_cc[VWERASE] = '\027';
-		tty->termios.c_cc[VLNEXT] = '\026';
-
-		/*
-		 * Bump name characer
-		 */
-		if (c++ == 'z')
-			c = 'a';
-	}
-	args->iop->data1 = tty;
-	if (!tty->refcount++ && tty->device.firstOpen)
-		(*tty->device.firstOpen)(major, minor, arg);
-	rtems_semaphore_release (ttyMutex);
-	return RTEMS_SUCCESSFUL;
-}
-
-/*
- * Drain output queue
- */
-static void
-drainOutput (struct rtems_termios_tty *tty)
-{
-	rtems_interrupt_level level;
-	rtems_status_code sc;
-
-	if (tty->device.outputUsesInterrupts) {
-		rtems_interrupt_disable (level);
-		while (tty->rawOutBufTail != tty->rawOutBufHead) {
-			tty->rawOutBufState = rob_wait;
-			rtems_interrupt_enable (level);
-			sc = rtems_semaphore_obtain (tty->rawOutBufSemaphore,
-							RTEMS_WAIT,
-							RTEMS_NO_TIMEOUT);
-			if (sc != RTEMS_SUCCESSFUL)
-				rtems_fatal_error_occurred (sc);
-			rtems_interrupt_disable (level);
-		}
-		rtems_interrupt_enable (level);
-	}
-}
-
-rtems_status_code
-rtems_termios_close (void *arg)
-{
-	rtems_libio_open_close_args_t *args = arg;
-	struct rtems_termios_tty *tty = args->iop->data1;
-	rtems_status_code sc;
-
-	sc = rtems_semaphore_obtain (ttyMutex, RTEMS_WAIT, RTEMS_NO_TIMEOUT);
-	if (sc != RTEMS_SUCCESSFUL)
-		rtems_fatal_error_occurred (sc);
-	if (--tty->refcount == 0) {
-		drainOutput (tty);
-		if (tty->device.lastClose)
-			 (*tty->device.lastClose)(tty->major, tty->minor, arg);
-		if (tty->forw == NULL)
-			ttyTail = tty->back;
-		else
-			tty->forw->back = tty->back;
-		if (tty->back == NULL)
-			ttyHead = tty->forw;
-		else
-			tty->back->forw = tty->forw;
-		rtems_semaphore_delete (tty->isem);
-		rtems_semaphore_delete (tty->osem);
-		rtems_semaphore_delete (tty->rawOutBufSemaphore);
-		if (!tty->device.pollRead)
-			rtems_semaphore_delete (tty->rawInBufSemaphore);
-		free (tty);
-	}
-	rtems_semaphore_release (ttyMutex);
-	return RTEMS_SUCCESSFUL;
-}
-
-rtems_status_code
-rtems_termios_ioctl (void *arg)
-{
-	rtems_libio_ioctl_args_t *args = arg;
-	struct rtems_termios_tty *tty = args->iop->data1;
-	rtems_status_code sc;
-
- 	args->ioctl_return = 0;
-	sc = rtems_semaphore_obtain (tty->osem, RTEMS_WAIT, RTEMS_NO_TIMEOUT);
-	if (sc != RTEMS_SUCCESSFUL) {
-		args->ioctl_return = sc;
-		return sc;
-	}
-	switch (args->command) {
-	default:
-		sc = RTEMS_INVALID_NUMBER;
-		break;
-
-	case RTEMS_IO_GET_ATTRIBUTES:
-		*(struct termios *)args->buffer = tty->termios;
-		break;
-
-	case RTEMS_IO_SET_ATTRIBUTES:
-		tty->termios = *(struct termios *)args->buffer;
-		if (tty->termios.c_lflag & ICANON) {
-			tty->rawInBufSemaphoreOptions = RTEMS_WAIT;
-			tty->rawInBufSemaphoreTimeout = RTEMS_NO_TIMEOUT;
-			tty->rawInBufSemaphoreFirstTimeout = RTEMS_NO_TIMEOUT;
-		}
-		else {
-			rtems_interval ticksPerSecond;
-			rtems_clock_get (RTEMS_CLOCK_GET_TICKS_PER_SECOND, &ticksPerSecond);
-			tty->vtimeTicks = tty->termios.c_cc[VTIME] * ticksPerSecond / 10;
-			if (tty->termios.c_cc[VTIME]) {
-				tty->rawInBufSemaphoreOptions = RTEMS_WAIT;
-				tty->rawInBufSemaphoreTimeout = tty->vtimeTicks;
-				if (tty->termios.c_cc[VMIN])
-					tty->rawInBufSemaphoreFirstTimeout = RTEMS_NO_TIMEOUT;
-				else
-					tty->rawInBufSemaphoreFirstTimeout = tty->vtimeTicks;
-			}
-			else {
-				if (tty->termios.c_cc[VMIN]) {
-					tty->rawInBufSemaphoreOptions = RTEMS_WAIT;
-					tty->rawInBufSemaphoreTimeout = RTEMS_NO_TIMEOUT;
-					tty->rawInBufSemaphoreFirstTimeout = RTEMS_NO_TIMEOUT;
-				}
-				else {
-					tty->rawInBufSemaphoreOptions = RTEMS_NO_WAIT;
-				}
-			}
-		}
-		if (tty->device.setAttributes)
-			(*tty->device.setAttributes)(tty->minor, &tty->termios);
-		break;
-
-	case RTEMS_IO_TCDRAIN:
-		drainOutput (tty);
-		break;
-	}
-	rtems_semaphore_release (tty->osem);
-	args->ioctl_return = sc;
-	return sc;
-}
-
-/*
- * Send characters to device-specific code
- */
-static void
-osend (const char *buf, int len, struct rtems_termios_tty *tty)
-{
-	unsigned int newHead;
-	rtems_interrupt_level level;
-	rtems_status_code sc;
-
-	if (!tty->device.outputUsesInterrupts) {
-		(*tty->device.write)(tty->minor, buf, len);
-		return;
-	}
-	newHead = tty->rawOutBufHead;
-	while (len) {
-		/*
-		 * Performance improvement could be made here.
-		 * Copy multiple bytes to raw buffer:
-		 * if (len > 1) && (space to buffer end, or tail > 1)
-		 *	ncopy = MIN (len, space to buffer end or tail)
-		 *	memcpy (raw buffer, buf, ncopy)
-		 *	buf += ncopy
-		 *	len -= ncopy
-		 *
-		 * To minimize latency, the memcpy should be done
-		 * with interrupts enabled.
-		 */
-		newHead = (newHead + 1) % RAW_OUTPUT_BUFFER_SIZE;
-		rtems_interrupt_disable (level);
-		while (newHead == tty->rawOutBufTail) {
-			tty->rawOutBufState = rob_wait;
-			rtems_interrupt_enable (level);
-			sc = rtems_semaphore_obtain (tty->rawOutBufSemaphore,
-							RTEMS_WAIT,
-							RTEMS_NO_TIMEOUT);
-			if (sc != RTEMS_SUCCESSFUL)
-				rtems_fatal_error_occurred (sc);
-			rtems_interrupt_disable (level);
-		}
-		tty->rawOutBuf[tty->rawOutBufHead] = *buf++;
-		tty->rawOutBufHead = newHead;
-		if (tty->rawOutBufState == rob_idle) {
-			(*tty->device.write)(tty->minor,
-				(char *)&tty->rawOutBuf[tty->rawOutBufTail], 1);
-			tty->rawOutBufState = rob_busy;
-		}
-		rtems_interrupt_enable (level);
-		len--;
-	}
-}
-
-/*
- * Handle output processing
- */
-static void
-oproc (unsigned char c, struct rtems_termios_tty *tty)
-{
-	int	i;
-
-	if (tty->termios.c_oflag & OPOST) {
-		switch (c) {
-		case '\n':
-			if (tty->termios.c_oflag & ONLRET)
-				tty->column = 0;
-			if (tty->termios.c_oflag & ONLCR) {
-				osend ("\r", 1, tty);
-				tty->column = 0;
-			}
-			break;
-
-		case '\r':
-			if ((tty->termios.c_oflag & ONOCR) && (tty->column == 0))
-				return;
-			if (tty->termios.c_oflag & OCRNL) {
-				c = '\n';
-				if (tty->termios.c_oflag & ONLRET)
-					tty->column = 0;
-				break;
-			}
-			tty->column = 0;
-			break;
-
-		case '\t':
-			i = 8 - (tty->column & 7);
-			if ((tty->termios.c_oflag & TABDLY) == XTABS) {
-				tty->column += i;
-				osend ( "        ",  i, tty);
-				return;
-			}
-			tty->column += i;
-			break;
-
-		case '\b':
-			if (tty->column > 0)
-				tty->column--;
-			break;
-
-		default:
-			if (tty->termios.c_oflag & OLCUC)
-				c = toupper(c);
-			if (!iscntrl(c))
-				tty->column++;
-			break;
-		}
-	}
-	osend (&c, 1, tty);
-}
-
-rtems_status_code
-rtems_termios_write (void *arg)
-{
-	rtems_libio_rw_args_t *args = arg;
-	struct rtems_termios_tty *tty = args->iop->data1;
-	rtems_status_code sc;
-
-	sc = rtems_semaphore_obtain (tty->osem, RTEMS_WAIT, RTEMS_NO_TIMEOUT);
-	if (sc != RTEMS_SUCCESSFUL)
-		return sc;
-	if (tty->termios.c_oflag & OPOST) {
-		unsigned32 count = args->count;
-		unsigned8 *buffer = args->buffer;
-		while (count--)
-			oproc (*buffer++, tty);
-		args->bytes_moved = args->count;
-	}
-	else {
-		osend (args->buffer, args->count, tty);
-		args->bytes_moved = args->count;
-	}
-	rtems_semaphore_release (tty->osem);
-	return sc;
-}
-
-/*
- * Echo a typed character
- */
-static void
-echo (unsigned char c, struct rtems_termios_tty *tty)
-{
-	if ((tty->termios.c_lflag & ECHOCTL) && iscntrl(c) && (c != '\t') && (c != '\n')) {
-		char echobuf[2];
-
-		echobuf[0] = '^';
-		echobuf[1] = c ^ 0x40;
-		osend (echobuf, 2, tty);
-		tty->column += 2;
-	}
-	else {
-		oproc (c, tty);
-	}
-}
-
-/*
- * Erase a character or line
- * FIXME: Needs support for WERASE and ECHOPRT.
- * FIXME: Some of the tests should check for IEXTEN, too.
- */
-static void
-erase (struct rtems_termios_tty *tty, int lineFlag)
-{
-	if (tty->ccount == 0)
-		return;
-	if (lineFlag) {
-		if (!(tty->termios.c_lflag & ECHO)) {
-			tty->ccount = 0;
-			return;
-		}
-		if (!(tty->termios.c_lflag & ECHOE)) {
-			tty->ccount = 0;
-			echo (tty->termios.c_cc[VKILL], tty);
-			if (tty->termios.c_lflag & ECHOK)
-				echo ('\n', tty);
-			return;
-		}
-	}
-	while (tty->ccount) {
-		unsigned char c = tty->cbuf[--tty->ccount];
-
-		if (tty->termios.c_lflag & ECHO) {
-			if (!lineFlag && !(tty->termios.c_lflag & ECHOE)) {
-				echo (tty->termios.c_cc[VERASE], tty);
-			}
-			else if (c == '\t') {
-				int col = tty->read_start_column;
-				int i = 0;
-
-				/*
-				 * Find the character before the tab
-				 */
-				while (i != tty->ccount) {
-					c = tty->cbuf[i++];
-					if (c == '\t') {
-						col = (col | 7) + 1;
-					}
-					else if (iscntrl (c)) {
-						if (tty->termios.c_lflag & ECHOCTL)
-							col += 2;
-					}
-					else {
-						col++;
-					}
-				}
-
-				/*
-				 * Back up over the tab
-				 */
-				while (tty->column > col) {
-					osend ("\b", 1, tty);
-					tty->column--;
-				}
-			}
-			else {
-				if (iscntrl (c) && (tty->termios.c_lflag & ECHOCTL)) {
-					osend ("\b \b", 3, tty);
-					if (tty->column)
-						tty->column--;
-				}
-				if (!iscntrl (c) || (tty->termios.c_lflag & ECHOCTL)) {
-					osend ("\b \b", 3, tty);
-					if (tty->column)
-						tty->column--;
-				}
-			}
-		}
-		if (!lineFlag)
-			break;
-	}
-}
-
-/*
- * Process a single input character
- */
-static int
-iproc (unsigned char c, struct rtems_termios_tty *tty)
-{
-	if (tty->termios.c_iflag & ISTRIP)
-		c &= 0x7f;
-	if (tty->termios.c_iflag & IUCLC)
-		c = tolower (c);
-	if (c == '\r') {
-		if (tty->termios.c_iflag & IGNCR)
-			return 0;
-		if (tty->termios.c_iflag & ICRNL)
-			c = '\n';
-	}
-	else if ((c == '\n') && (tty->termios.c_iflag & INLCR)) {
-		c = '\r';
-	}
-	if ((c != '\0') && (tty->termios.c_lflag & ICANON)) {
-		if (c == tty->termios.c_cc[VERASE]) {
-			erase (tty, 0);
-			return 0;
-		}
-		else if (c == tty->termios.c_cc[VKILL]) {
-			erase (tty, 1);
-			return 0;
-		}
-		else if (c == tty->termios.c_cc[VEOF]) {
-			return 1;
-		}
-		else if (c == '\n') {
-			if (tty->termios.c_lflag & (ECHO | ECHONL))
-				echo (c, tty);
-			tty->cbuf[tty->ccount++] = c;
-			return 1;
-		}
-		else if ((c == tty->termios.c_cc[VEOL])
-		      || (c == tty->termios.c_cc[VEOL2])) {
-			if (tty->termios.c_lflag & ECHO)
-				echo (c, tty);
-			tty->cbuf[tty->ccount++] = c;
-			return 1;
-		}
-	}
-
-	/*
-	 * FIXME: Should do IMAXBEL handling somehow
-	 */
-	if (tty->ccount < (CBUFSIZE-1)) {
-		if (tty->termios.c_lflag & ECHO)
-			echo (c, tty);
-		tty->cbuf[tty->ccount++] = c;
-	}
-	return 0;
-}
-
-/*
- * Process input character, with semaphore.
- */
-static int
-siproc (unsigned char c, struct rtems_termios_tty *tty)
-{
-	int i;
-
-	/*
-	 * Obtain output semaphore if character will be echoed
-	 */
-	if (tty->termios.c_lflag & (ECHO|ECHOE|ECHOK|ECHONL|ECHOPRT|ECHOCTL|ECHOKE)) {
-		rtems_semaphore_obtain (tty->osem, RTEMS_WAIT, RTEMS_NO_TIMEOUT);
-		i = iproc (c, tty);
-		rtems_semaphore_release (tty->osem);
-	}
-	else {
-		i = iproc (c, tty);
-	}
-	return i;
-}
-
-/*
- * Fill the input buffer by polling the device
- */
-static rtems_status_code
-fillBufferPoll (struct rtems_termios_tty *tty)
-{
-	int n;
-
-	if (tty->termios.c_lflag & ICANON) {
-		for (;;) {
-			n = (*tty->device.pollRead)(tty->minor);
-			if (n < 0) {
-				rtems_task_wake_after (1);
-			}
-			else {
-				if  (siproc (n, tty))
-					break;
-			}
-		}
-	}
-	else {
-		rtems_interval then, now;
-		if (!tty->termios.c_cc[VMIN] && tty->termios.c_cc[VTIME])
-			rtems_clock_get (RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &then);
-		for (;;) {
-			n = (*tty->device.pollRead)(tty->minor);
-			if (n < 0) {
-				if (tty->termios.c_cc[VMIN]) {
-					if (tty->termios.c_cc[VTIME] && tty->ccount) {
-						rtems_clock_get (RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &now);
-						if ((now - then) > tty->vtimeTicks) {
-							break;
-						}
-					}
-				}
-				else {
-					if (!tty->termios.c_cc[VTIME])
-						break;
-					rtems_clock_get (RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &now);
-					if ((now - then) > tty->vtimeTicks) {
-						break;
-					}
-				}
-				rtems_task_wake_after (1);
-			}
-			else {
-				siproc (n, tty);
-				if (tty->ccount >= tty->termios.c_cc[VMIN])
-					break;
-				if (tty->termios.c_cc[VMIN] && tty->termios.c_cc[VTIME])
-					rtems_clock_get (RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &then);
-			}
-		}
-	}
-	return RTEMS_SUCCESSFUL;
-}
-
-/*
- * Fill the input buffer from the raw input queue
- */
-static rtems_status_code
-fillBufferQueue (struct rtems_termios_tty *tty)
-{
-	rtems_interval timeout = tty->rawInBufSemaphoreFirstTimeout;
-	rtems_status_code sc;
-
-	for (;;) {
-		/*
-		 * Process characters read from raw queue
-		 */
-		while (tty->rawInBufHead != tty->rawInBufTail) {
-			unsigned char c;
-			unsigned int newHead;
-
-			newHead = (tty->rawInBufHead + 1) % RAW_INPUT_BUFFER_SIZE;
-			c = tty->rawInBuf[newHead];
-			tty->rawInBufHead = newHead;
-			if (tty->termios.c_lflag & ICANON) {
-				if  (siproc (c, tty))
-					return RTEMS_SUCCESSFUL;
-			}
-			else {
-				siproc (c, tty);
-				if (tty->ccount >= tty->termios.c_cc[VMIN])
-					return RTEMS_SUCCESSFUL;
-			}
-			timeout = tty->rawInBufSemaphoreTimeout;
-		}
-
-		/*
-		 * Wait for characters
-		 */
-		sc = rtems_semaphore_obtain (tty->rawInBufSemaphore,
-						tty->rawInBufSemaphoreOptions,
-						timeout);
-		if (sc != RTEMS_SUCCESSFUL)
-			break;
-	}
-	return RTEMS_SUCCESSFUL;
-}
-
-rtems_status_code
-rtems_termios_read (void *arg)
-{
-	rtems_libio_rw_args_t *args = arg;
-	struct rtems_termios_tty *tty = args->iop->data1;
-	unsigned32 count = args->count;
-	unsigned8 *buffer = args->buffer;
-	rtems_status_code sc;
-
-	sc = rtems_semaphore_obtain (tty->isem, RTEMS_WAIT, RTEMS_NO_TIMEOUT);
-	if (sc != RTEMS_SUCCESSFUL)
-		return sc;
-	if (tty->cindex == tty->ccount) {
-		tty->cindex = tty->ccount = 0;
-		tty->read_start_column = tty->column;
-		if (tty->device.pollRead)
-			sc = fillBufferPoll (tty);
-		else
-			sc = fillBufferQueue (tty);
-		if (sc != RTEMS_SUCCESSFUL)
-			tty->cindex = tty->ccount = 0;
-	}
-	while (count && (tty->cindex < tty->ccount)) {
-		*buffer++ = tty->cbuf[tty->cindex++];
-		count--;
-	}
-	args->bytes_moved = args->count - count;
-	rtems_semaphore_release (tty->isem);
-	return sc;
-}
-
-/*
- * Place characters on raw queue.
- * NOTE: This routine runs in the context of the
- *       device receive interrupt handler.
- * Returns the number of characters dropped because of overlow.
- */
-int
-rtems_termios_enqueue_raw_characters (void *ttyp, char *buf, int len)
-{
-	struct rtems_termios_tty *tty = ttyp;
-	unsigned int newTail;
-
-	while (len) {
-		newTail = (tty->rawInBufTail + 1) % RAW_INPUT_BUFFER_SIZE;
-		if (newTail == tty->rawInBufHead) {
-			tty->rawInBufDropped += len;
-			break;
-		}
-		tty->rawInBuf[newTail] = *buf++;
-		len--;
-		tty->rawInBufTail = newTail;
-	}
-	rtems_semaphore_release (tty->rawInBufSemaphore);
-	return len;
-}
-
-/*
- * Characters have been transmitted
- * NOTE: This routine runs in the context of the
- *       device transmit interrupt handler.
- * The second argument is the number of characters transmitted so far.
- * This value will always be 1 for devices which generate an interrupt
- * for each transmitted character. 
- * It returns number of characters left to transmit
- */
-int
-rtems_termios_dequeue_characters (void *ttyp, int len)
-{
-	struct rtems_termios_tty *tty = ttyp;
-	unsigned int newTail;
-	int nToSend;
-
-	if (tty->rawOutBufState == rob_wait)
-		rtems_semaphore_release (tty->rawOutBufSemaphore);
-	if ( tty->rawOutBufHead == tty->rawOutBufTail )
-		return 0;
-	newTail = (tty->rawOutBufTail + len) % RAW_OUTPUT_BUFFER_SIZE;
-	if (newTail == tty->rawOutBufHead) {
-		/*
-		 * Buffer empty
-		 */
-		tty->rawOutBufState = rob_idle;
-		nToSend = 0;
-	}
-	else {
-		/*
-		 * Buffer not empty, start tranmitter
-		 */
-		if (newTail > tty->rawOutBufHead)
-			nToSend = RAW_OUTPUT_BUFFER_SIZE - newTail;
-		else
-			nToSend = tty->rawOutBufHead - newTail;
-		(*tty->device.write)(tty->minor, (char *)&tty->rawOutBuf[newTail], nToSend);
-		tty->rawOutBufState = rob_busy;
-	}
-	tty->rawOutBufTail = newTail;
-
-	return nToSend;
-}
-
-
diff --git a/cpukit/libcsupport/src/unixlibc.c b/cpukit/libcsupport/src/unixlibc.c
deleted file mode 100644
index 3e757e313d..0000000000
--- a/cpukit/libcsupport/src/unixlibc.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- *  $Id$
- */
-
-#include <rtems.h>
-
-#if defined(RTEMS_UNIXLIB)
-
-void libc_init(int reentrant)
-{
-}
-
-#else
- 
-/* remove ANSI errors.
- *  A program must contain at least one external-declaration
- *  (X3.159-1989 p.82,L3).
- */
-void unixlibc_dummy_function( void )
-{
-}
-
-#endif
diff --git a/cpukit/libcsupport/src/utsname.c b/cpukit/libcsupport/src/utsname.c
deleted file mode 100644
index 7fba3d610f..0000000000
--- a/cpukit/libcsupport/src/utsname.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- *  $Id$
- */
-
-#include <stdio.h>
-#include <string.h>
-
-#include <sys/utsname.h>
-
-#include <rtems/system.h>
-#include <rtems/score/system.h>
-#include <rtems/score/object.h>
-
-/*PAGE
- *
- *  4.4.1 Get System Name, P1003.1b-1993, p. 90
- */
-
-int uname(
-  struct utsname *name
-)
-{
-  /*  XXX: Here is what Solaris returns...
-          sysname = SunOS
-          nodename = node_name
-          release = 5.3
-          version = Generic_101318-12
-          machine = sun4m
-  */
-
-  strcpy( name->sysname, "RTEMS" );
-
-  sprintf( name->nodename, "Node %d\n", _Objects_Local_node );
-
-  /* XXX release string is in BAD format for this routine!!! */ 
-  strcpy( name->release, "3.2.0" );
- 
-  /* XXX does this have any meaning for RTEMS */
-   
-  strcpy( name->release, "" );
-
-  sprintf( name->machine, "%s/%s", CPU_NAME, CPU_MODEL_NAME );
-
-  return 0;
-}
-
-/*PAGE
- *
- *  4.5.2 Get Process Times, P1003.1b-1993, p. 92
- */
-
-clock_t times(
-  struct tms   *buffer
-)
-{
-  return POSIX_NOT_IMPLEMENTED();
-}
diff --git a/cpukit/libmisc/README b/cpukit/libmisc/README
deleted file mode 100644
index bbde4feeae..0000000000
--- a/cpukit/libmisc/README
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-#  $Id$
-#
-
-This directory contains for the "miscellaneous" library.  Currently
-this library contains a number of useful support libraries:
-
-  + Task Stack Overflow Checker
-  + Workspace Consistency Checker
-  + Task Execution Time Monitor
-  + Period Statistics Monitor
-  + Debug Monitor
-
-The following ideas have been mentioned for items which could go
-in this library, but this list is not all inclusive:
-
-  + there are no outstanding suggestions.
-
-The intent of this library is to provide a home for useful utility routines
-which are dependent upon RTEMS.
-
---joel
-16 Sept 97
diff --git a/cpukit/libmisc/cpuuse/README b/cpukit/libmisc/cpuuse/README
deleted file mode 100644
index 20e76f07bc..0000000000
--- a/cpukit/libmisc/cpuuse/README
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-#  $Id$
-#
-
-This directory contains a stack bounds checker.  It provides two
-primary features:
-
-   + check for stack overflow at each context switch
-   + provides an educated guess at each task's stack usage
-
-The stack overflow check at context switch works by looking for
-a 16 byte pattern at the logical end of the stack to be corrupted.
-The "guesser" assumes that the entire stack was prefilled with a known
-pattern and assumes that the pattern is still in place if the memory
-has not been used as a stack.
-
-Both of these can be fooled by pushing large holes onto the stack
-and not writing to them... or (much more unlikely) writing the
-magic patterns into memory.
-
-This code has not been extensively tested.  It is provided as a tool
-for RTEMS users to catch the most common mistake in multitasking
-systems ... too little stack space.  Suggestions and comments are appreciated.
-
-NOTES:
-
-1.  Stack usage information is questionable on CPUs which push
-    large holes on stack.
-
-2.  The stack checker has a tendency to generate a fault when
-    trying to print the helpful diagnostic message.  If it comes
-    out, congratulations. If not, then the variable Stack_check_Blown_task
-    contains a pointer to the TCB of the offending task.  This
-    is usually enough to go on.
-
-FUTURE:
-
-1.  Determine how/if gcc will generate stack probe calls and support that.
-
-2.  Get accurate stack usage numbers on i960.. it pushes very large
-    holes on the stack.
diff --git a/cpukit/libmisc/cpuuse/cpuuse.c b/cpukit/libmisc/cpuuse/cpuuse.c
deleted file mode 100644
index db43fbf3ee..0000000000
--- a/cpukit/libmisc/cpuuse/cpuuse.c
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- *  CPU Usage Reporter
- *
- *  COPYRIGHT (c) 1989-1998. 1996.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- *
- */
-
-#include <rtems.h>
-
-extern rtems_configuration_table BSP_Configuration;
-
-#include <assert.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include "cpuuse.h"
-
-unsigned32 CPU_usage_Ticks_at_last_reset;
-
-/*PAGE
- *
- *  CPU_usage_Dump
- */
-
-void CPU_usage_Dump( void )
-{
-  unsigned32           i;
-  unsigned32           class_index;
-  Thread_Control      *the_thread;
-  Objects_Information *information;
-  unsigned32           u32_name;
-  char                 name[5];
-  unsigned32           total_units = 0;
-
-  for ( class_index = OBJECTS_CLASSES_FIRST ;
-        class_index <= OBJECTS_CLASSES_LAST ;
-        class_index++ ) {
-    information = _Objects_Information_table[ class_index ];
-    if ( information && information->is_thread ) {
-      for ( i=1 ; i <= information->maximum ; i++ ) {
-        the_thread = (Thread_Control *)information->local_table[ i ];
- 
-        if ( the_thread )
-          total_units += the_thread->ticks_executed;
-      }
-    }
-  }
-
-  printf("CPU Usage by thread\n");
-#if defined(unix) || ( CPU_HARDWARE_FP == TRUE )
-  printf( "   ID        NAME        TICKS    PERCENT\n" );
-#else
-  printf( "   ID        NAME        TICKS\n" );
-#endif
-
-  for ( class_index = OBJECTS_CLASSES_FIRST ; 
-        class_index <= OBJECTS_CLASSES_LAST ; 
-        class_index++ ) {
-    information = _Objects_Information_table[ class_index ];
-    if ( information && information->is_thread ) {
-      for ( i=1 ; i <= information->maximum ; i++ ) {
-        the_thread = (Thread_Control *)information->local_table[ i ];
-        
-        if ( !the_thread )
-          continue;
-
-        u32_name = *(unsigned32 *)the_thread->Object.name;
-
-        name[ 0 ] = (u32_name >> 24) & 0xff;
-        name[ 1 ] = (u32_name >> 16) & 0xff;
-        name[ 2 ] = (u32_name >>  8) & 0xff;
-        name[ 3 ] = (u32_name >>  0) & 0xff;
-        name[ 4 ] = '\0';
-
-#if defined(unix) || ( CPU_HARDWARE_FP == TRUE )
-        printf( "0x%08x   %4s    %8d     %5.3f\n",
-          the_thread->Object.id,
-          name,
-          the_thread->ticks_executed,
-          (total_units) ? 
-            (double)the_thread->ticks_executed / (double)total_units :
-            (double)total_units
-        );
-#else
-        printf( "0x%08x   %4s   %8d\n",
-          the_thread->Object.id,
-          name,
-          the_thread->ticks_executed
-        );
-#endif
-      }
-    }
-  }
-
-  printf(
-    "\nTicks since last reset = %d\n",
-    _Watchdog_Ticks_since_boot - CPU_usage_Ticks_at_last_reset
-  );
-  printf( "\nTotal Units = %d\n", total_units );
-}
-
-/*PAGE
- *
- *  CPU_usage_Reset
- */
-
-void CPU_usage_Reset( void )
-{
-  unsigned32           i;
-  unsigned32           class_index;
-  Thread_Control      *the_thread;
-  Objects_Information *information;
- 
-  CPU_usage_Ticks_at_last_reset = _Watchdog_Ticks_since_boot;
-
-  for ( class_index = OBJECTS_CLASSES_FIRST ;
-        class_index <= OBJECTS_CLASSES_LAST ;
-        class_index++ ) {
-    information = _Objects_Information_table[ class_index ];
-    if ( information && information->is_thread ) {
-      for ( i=1 ; i <= information->maximum ; i++ ) {
-        the_thread = (Thread_Control *)information->local_table[ i ];
- 
-        if ( !the_thread )
-          continue;
- 
-        the_thread->ticks_executed = 0;
-      }
-    }
-  }
- 
-}
-
diff --git a/cpukit/libmisc/cpuuse/cpuuse.h b/cpukit/libmisc/cpuuse/cpuuse.h
deleted file mode 100644
index bc678bb284..0000000000
--- a/cpukit/libmisc/cpuuse/cpuuse.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*  cpuuse.h
- *
- *  This include file contains information necessary to utilize
- *  and install the cpu usage reporting mechanism.
- *
- *  COPYRIGHT (c) 1989-1998. 1996.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __CPU_USE_h
-#define __CPU_USE_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- *  CPU_usage_Dump
- */
-
-void CPU_usage_Dump( void );
-
-/*
- *  CPU_usage_Reset
- */
-
-void CPU_usage_Reset( void );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/cpukit/libmisc/monitor/README b/cpukit/libmisc/monitor/README
deleted file mode 100644
index d5a73da140..0000000000
--- a/cpukit/libmisc/monitor/README
+++ /dev/null
@@ -1,97 +0,0 @@
-#
-#  $Id$
-#
-
-monitor task
-
-The monitor task is an optional task that knows about RTEMS
-data structures and can print out information about them.
-It is a work-in-progress and needs many more commands, but
-is useful now.
-
-The monitor works best when it is the highest priority task,
-so all your other tasks should ideally be at some priority
-greater than 1.
-
-To use the monitor:
--------------------
-
-    #include <rtems/monitor.h>
-
-        ...
-
-    rtems_monitor_init(0);
-
-    The parameter to rtems_monitor_init() tells the monitor whether
-    to suspend itself on startup.  A value of 0 causes the monitor
-    to immediately enter command mode; a non-zero value causes the
-    monitor to suspend itself after creation and wait for explicit
-    wakeup.
-
-
-    rtems_monitor_wakeup();
-    
-    wakes up a suspended monitor and causes it to reenter command mode.
-
-Monitor commands
-----------------
-
-    The monitor prompt is 'rtems> '.
-    Can abbreviate commands to "uniquity"
-    There is a 'help' command.  Here is the output from various
-    help commands:
-
-        Commands (may be abbreviated)
-
-          help      -- get this message or command specific help
-          task      -- show task information
-          queue     -- show message queue information
-          symbol    -- show entries from symbol table
-          pause     -- pause monitor for a specified number of ticks
-          fatal     -- invoke a fatal RTEMS error
-
-        task [id [id ...] ]
-          display information about the specified tasks.
-          Default is to display information about all tasks on this node
-
-        queue [id [id ... ] ]
-          display information about the specified message queues
-          Default is to display information about all queues on this node
-
-        symbol [ symbolname [symbolname ... ] ]
-          display value associated with specified symbol.
-          Defaults to displaying all known symbols.
-
-        pause [ticks]
-          monitor goes to "sleep" for specified ticks (default is 1)
-          monitor will resume at end of period or if explicitly awakened
-
-        fatal [status]
-          Invoke 'rtems_fatal_error_occurred' with 'status'
-          (default is RTEMS_INTERNAL_ERROR)
-
-        continue
-          put the monitor to sleep waiting for an explicit wakeup from the
-          program running.
-
-
-Sample output from 'task' command
----------------------------------
-
-    rtems> task
-      ID       NAME   PRIO   STAT   MODES  EVENTS   WAITID  WAITARG  NOTES
-    ------------------------------------------------------------------------
-    00010001   UI1     2    READY    P:T:nA    NONE15: 0x40606348
-    00010002   RMON    1    READY    nP    NONE15: 0x40604110
-
-    'RMON' is the monitor itself, so we have 1 "user" task.
-    Its modes are P:T:nA which translate to:
-
-        preemptable
-        timesliced
-        no ASRS
-
-    It has no events.
-    It has a notepad value for notepad 15 which is 0x40606348
-    (this is the libc thread state)
-
diff --git a/cpukit/libmisc/monitor/mon-command.c b/cpukit/libmisc/monitor/mon-command.c
deleted file mode 100644
index 1fe495e0ae..0000000000
--- a/cpukit/libmisc/monitor/mon-command.c
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * Command parsing routines for RTEMS monitor
- *
- * TODO:
- *
- *  $Id$
- */
-
-#include <rtems.h>
-
-#include <rtems/monitor.h>
-
-#include <stdio.h>
-#include <string.h>
-
-/*
- * make_argv(cp): token-count
- *	Break up the command line in 'cp' into global argv[] and argc (return
- *	value).
- */
-
-int
-rtems_monitor_make_argv(
-    char *cp,
-    int  *argc_p,
-    char **argv)
-{
-    int argc = 0;
-
-    while ((cp = strtok(cp, " \t\n\r")))
-    {
-	argv[argc++] = cp;
-	cp = (char *) NULL;
-    }
-    argv[argc] = (char *) NULL;			/* end of argv */
-
-    return *argc_p = argc;
-}
-
-
-/*
- * Read and break up a monitor command
- *
- * We have to loop on the gets call, since it will return NULL under UNIX
- *  RTEMS when we get a signal (eg: SIGALRM).
- */
-
-int
-rtems_monitor_command_read(char *command,
-                           int  *argc,
-                           char **argv)
-{
-    extern rtems_configuration_table  BSP_Configuration;
-    static char monitor_prompt[32];
-    
-    /*
-     * put node number in the prompt if we are multiprocessing
-     */
-
-    if (BSP_Configuration.User_multiprocessing_table == 0)
-        sprintf(monitor_prompt, "%s", MONITOR_PROMPT);
-    else if (rtems_monitor_default_node != rtems_monitor_node)
-        sprintf(monitor_prompt, "%d-%s-%d", rtems_monitor_node, MONITOR_PROMPT, rtems_monitor_default_node);
-    else
-        sprintf(monitor_prompt, "%d-%s", rtems_monitor_node, MONITOR_PROMPT);
-
-#ifdef RTEMS_UNIX
-    /* RTEMS on unix gets so many interrupt system calls this is hosed */
-    printf("%s> ", monitor_prompt);
-    fflush(stdout);
-    while (gets(command) == (char *) 0)
-        ;
-#else
-    do
-    {
-        printf("%s> ", monitor_prompt);
-        fflush(stdout);
-    } while (gets(command) == (char *) 0);
-#endif
-
-    return rtems_monitor_make_argv(command, argc, argv);
-}
-
-/*
- * Look up a command in a command table
- *
- */
-
-rtems_monitor_command_entry_t *
-rtems_monitor_command_lookup(
-    rtems_monitor_command_entry_t *table,
-    int                            argc,
-    char                          **argv
-)
-{
-    rtems_monitor_command_entry_t *p;
-    rtems_monitor_command_entry_t *abbreviated_match = 0;
-    int abbreviated_matches = 0;
-    char *command;
-    int command_length;
-
-    command = argv[0];
-
-    if ((table == 0) || (command == 0))
-        goto failed;
-    
-    command_length = strlen(command);
-
-    for (p = table; p->command; p++)
-        if (STREQ(command, p->command))    /* exact match */
-            goto done;
-        else if (STRNEQ(command, p->command, command_length))
-        {
-            abbreviated_matches++;
-            abbreviated_match = p;
-        }
-
-    /* no perfect match; is there a non-ambigous abbreviated match? */
-    if ( ! abbreviated_match)
-    {
-        printf("Unrecognized command '%s'; try 'help'\n", command);
-        goto failed;
-    }    
-
-    if (abbreviated_matches > 1)
-    {
-        printf("Command '%s' is ambiguous; try 'help'\n", command);
-        goto failed;
-    }
-    
-    p = abbreviated_match;
-
-done:
-    if (p->command_function == 0)
-        goto failed;
-    return p;
-
-failed:
-    return 0;
-}
-
-void
-rtems_monitor_command_usage(rtems_monitor_command_entry_t *table,
-                            char *command_string)
-{
-    rtems_monitor_command_entry_t *help = 0;
-    char *help_command_argv[2];
-    
-    /* if first entry in table is a usage, then print it out */
-    if (command_string == 0)
-    {        
-        if (STREQ(table->command, "--usage--") && table->usage)
-            help = table;
-    }
-    else
-    {
-        help_command_argv[0] = command_string;
-        help_command_argv[1] = 0;
-        help = rtems_monitor_command_lookup(table, 1, help_command_argv);
-    }
-
-    if (help)
-        printf("%s\n", help->usage);
-}
-
-
-void
-rtems_monitor_help_cmd(
-    int          argc,
-    char       **argv,
-    unsigned32   command_arg,
-    boolean verbose
-)
-{
-    int arg;
-    rtems_monitor_command_entry_t *command;
-
-    command = (rtems_monitor_command_entry_t *) command_arg;
-    
-    if (argc == 1)
-        rtems_monitor_command_usage(command, 0);
-    else
-    {
-        for (arg=1; argv[arg]; arg++)
-            rtems_monitor_command_usage(command, argv[arg]);
-    }
-}
diff --git a/cpukit/libmisc/monitor/mon-config.c b/cpukit/libmisc/monitor/mon-config.c
deleted file mode 100644
index 5efd480b14..0000000000
--- a/cpukit/libmisc/monitor/mon-config.c
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * RTEMS Config display support
- *
- * TODO
- *
- *  $Id$
- */
-
-
-#define __RTEMS_VIOLATE_KERNEL_VISIBILITY__
-#include <rtems.h>
-#include <rtems/monitor.h>
-
-#include <stdio.h>
-#include <stdlib.h>             /* strtoul() */
-
-#define DATACOL 15
-#define CONTCOL DATACOL		/* continued col */
-
-/*
- * Fill in entire monitor config table
- * for sending to a remote monitor or printing on the local system
- */
-
-void
-rtems_monitor_config_canonical(
-    rtems_monitor_config_t *canonical_config,
-    void                   *config_void
-)
-{
-    rtems_configuration_table *c = (rtems_configuration_table *) config_void;
-    rtems_api_configuration_table *r = c->RTEMS_api_configuration;
-
-    canonical_config->work_space_start = c->work_space_start;
-    canonical_config->work_space_size = c->work_space_size;
-    canonical_config->maximum_tasks = r->maximum_tasks;
-    canonical_config->maximum_timers = r->maximum_timers;
-    canonical_config->maximum_semaphores = r->maximum_semaphores;
-    canonical_config->maximum_message_queues = r->maximum_message_queues;
-    canonical_config->maximum_partitions = r->maximum_partitions;
-    canonical_config->maximum_regions = r->maximum_regions;
-    canonical_config->maximum_ports = r->maximum_ports;
-    canonical_config->maximum_periods = r->maximum_periods;
-    canonical_config->maximum_extensions = c->maximum_extensions;
-    canonical_config->microseconds_per_tick = c->microseconds_per_tick;
-    canonical_config->ticks_per_timeslice = c->ticks_per_timeslice;
-    canonical_config->number_of_initialization_tasks = r->number_of_initialization_tasks;
-}    
-
-/*
- * This is easy, since there is only 1 (altho we could get them from
- *    other nodes...)
- */
-
-void *
-rtems_monitor_config_next(
-    void                  *object_info,
-    rtems_monitor_config_t *canonical_config,
-    rtems_id              *next_id
-)
-{
-    rtems_configuration_table *c = _Configuration_Table;
-    int n = rtems_get_index(*next_id);
-
-    if (n >= 1)
-        goto failed;
-    
-    _Thread_Disable_dispatch();
-
-    *next_id += 1;
-    return (void *) c;
-
-failed:
-    *next_id = RTEMS_OBJECT_ID_FINAL;
-    return 0;
-}
-
-
-void
-rtems_monitor_config_dump_header(
-    boolean verbose
-)
-{
-    printf("\
-INITIAL (startup) Configuration Info\n");
-/*23456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789
-0         1         2         3         4         5         6         7       */
-    rtems_monitor_separator();
-}
-
-
-void
-rtems_monitor_config_dump(
-    rtems_monitor_config_t *monitor_config,
-    boolean                 verbose
-)
-{
-    unsigned32   length = 0;
-
-    length = 0;
-    length += printf("WORKSPACE");
-    length += rtems_monitor_pad(DATACOL, length);
-    length += printf("start: 0x%x;  size: 0x%x\n",
-                     (unsigned32) monitor_config->work_space_start,
-                     monitor_config->work_space_size);
-
-    length = 0;
-    length += printf("TIME");
-    length += rtems_monitor_pad(DATACOL, length);
-    length += printf("usec/tick: %d;  tick/timeslice: %d;  tick/sec: %d\n",
-                     monitor_config->microseconds_per_tick,
-                     monitor_config->ticks_per_timeslice,
-                     1000000 / monitor_config->microseconds_per_tick);
-
-    length = 0;
-    length += printf("MAXIMUMS");
-    length += rtems_monitor_pad(DATACOL, length);
-    length += printf("tasks: %d;  timers: %d;  sems: %d;  que's: %d;  ext's: %d\n",
-                     monitor_config->maximum_tasks,
-                     monitor_config->maximum_timers,
-                     monitor_config->maximum_semaphores,
-                     monitor_config->maximum_message_queues,
-                     monitor_config->maximum_extensions);
-    length = 0;
-    length += rtems_monitor_pad(CONTCOL, length);
-    length += printf("partitions: %d;  regions: %d;  ports: %d;  periods: %d\n",
-                     monitor_config->maximum_partitions,
-                     monitor_config->maximum_regions,
-                     monitor_config->maximum_ports,
-                     monitor_config->maximum_periods);
-}
diff --git a/cpukit/libmisc/monitor/mon-dname.c b/cpukit/libmisc/monitor/mon-dname.c
deleted file mode 100644
index 45c28342ff..0000000000
--- a/cpukit/libmisc/monitor/mon-dname.c
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * RTEMS monitor driver names support.
- *
- * There are 2 "driver" things the monitor knows about.
- *
- *    1. Regular RTEMS drivers.
- *         This is a table indexed by major device number and
- *         containing driver entry points only.
- *
- *    2. Driver name table.
- *         A separate table of names for drivers.
- *         The table converts driver names to a major number
- *         as index into the driver table and a minor number
- *         for an argument to driver.
- *
- *  Drivers are displayed with 'driver' command.
- *  Names are displayed with 'dname' command.
- *
- *  $Id$
- */
-
-#define __RTEMS_VIOLATE_KERNEL_VISIBILITY__
-#include <rtems.h>
-
-#include <rtems/monitor.h>
-
-#include <stdio.h>
-#include <stdlib.h>             /* strtoul() */
-#include <string.h>		/* strncpy() */
-
-#define DATACOL 15
-#define CONTCOL DATACOL		/* continued col */
-
-void
-rtems_monitor_dname_canonical(
-    rtems_monitor_dname_t  *canonical_dname,
-    void                  *dname_void
-)
-{
-    rtems_driver_name_t    *np = (rtems_driver_name_t *) dname_void;
-
-    (void) strncpy(canonical_dname->name_string, np->device_name, sizeof(canonical_dname->name_string));
-    canonical_dname->major = np->major;
-    canonical_dname->minor = np->minor;
-}    
-
-void *
-rtems_monitor_dname_next(
-    void                   *object_information,
-    rtems_monitor_dname_t  *canonical_dname,
-    rtems_id               *next_id
-)
-{
-    rtems_unsigned32      n = rtems_get_index(*next_id);
-    rtems_driver_name_t  *table = _IO_Driver_name_table;
-    rtems_driver_name_t  *np = 0;
-
-/* XXX should we be using _IO_Number_of_devices */
-    for (np = table + n ; n<_IO_Number_of_devices; n++, np++)
-        if (np->device_name)
-            goto done;
-    
-    *next_id = RTEMS_OBJECT_ID_FINAL;
-    return 0;
-
-done:
-    _Thread_Disable_dispatch();
-
-    /*
-     * dummy up a fake id and name for this item
-     */
-
-    canonical_dname->id = n;
-    canonical_dname->name = rtems_build_name('-', '-', '-', '-');
-
-    *next_id += 1;
-    return np;
-}    
-
-void
-rtems_monitor_dname_dump_header(
-    boolean verbose
-)
-{
-    printf("\
-  Major:Minor   Name\n");
-/*23456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789
-0         1         2         3         4         5         6         7       */
-    rtems_monitor_separator();
-}
-
-void
-rtems_monitor_dname_dump(
-    rtems_monitor_dname_t *monitor_dname,
-    boolean                 verbose
-)
-{
-    unsigned32             length = 0;
-
-    length += rtems_monitor_pad(6, length);
-    length += rtems_monitor_dump_hex(monitor_dname->major);
-    length += printf(":");
-    length += rtems_monitor_dump_hex(monitor_dname->minor);
-
-    length += rtems_monitor_pad(16, length);
-    length += printf("%.*s",
-                     (int) sizeof(monitor_dname->name_string),
-                     (char *) monitor_dname->name_string);
-
-    length += printf("\n");
-    length = 0;
-}
diff --git a/cpukit/libmisc/monitor/mon-driver.c b/cpukit/libmisc/monitor/mon-driver.c
deleted file mode 100644
index c8eb36ab4e..0000000000
--- a/cpukit/libmisc/monitor/mon-driver.c
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * RTEMS monitor IO (device drivers) support
- *
- * There are 2 "driver" things the monitor knows about.
- *
- *    1. Regular RTEMS drivers.
- *         This is a table indexed by major device number and
- *         containing driver entry points only.
- *
- *    2. Driver name table.
- *         A separate table of names for drivers.
- *         The table converts driver names to a major number
- *         as index into the driver table and a minor number
- *         for an argument to driver.
- *
- *  Drivers are displayed with 'driver' command.
- *  Names are displayed with 'name' command.
- *
- *  $Id$
- */
-
-#define __RTEMS_VIOLATE_KERNEL_VISIBILITY__
-#include <rtems.h>
-
-#include <rtems/monitor.h>
-
-#include <stdio.h>
-#include <stdlib.h>             /* strtoul() */
-
-#define DATACOL 15
-#define CONTCOL DATACOL		/* continued col */
-
-
-void
-rtems_monitor_driver_canonical(
-    rtems_monitor_driver_t *canonical_driver,
-    void                   *driver_void
-)
-{
-    rtems_driver_address_table *d = (rtems_driver_address_table *) driver_void;
-
-    rtems_monitor_symbol_canonical_by_value(&canonical_driver->initialization,
-                                            (void *) d->initialization);
-
-    rtems_monitor_symbol_canonical_by_value(&canonical_driver->open,
-                                            (void *) d->open);
-    rtems_monitor_symbol_canonical_by_value(&canonical_driver->close,
-                                            (void *) d->close);
-    rtems_monitor_symbol_canonical_by_value(&canonical_driver->read,
-                                            (void *) d->read);
-    rtems_monitor_symbol_canonical_by_value(&canonical_driver->write,
-                                            (void *) d->write);
-    rtems_monitor_symbol_canonical_by_value(&canonical_driver->control,
-                                            (void *) d->control);
-}
-
-
-void *
-rtems_monitor_driver_next(
-    void                  *object_info,
-    rtems_monitor_driver_t *canonical_driver,
-    rtems_id              *next_id
-)
-{
-    rtems_configuration_table *c = _Configuration_Table;
-    rtems_unsigned32 n = rtems_get_index(*next_id);
-
-    if (n >= c->number_of_device_drivers)
-        goto failed;
-    
-    _Thread_Disable_dispatch();
-
-    /*
-     * dummy up a fake id and name for this item
-     */
-
-    canonical_driver->id = n;
-    canonical_driver->name = rtems_build_name('-', '-', '-', '-');
-
-    *next_id += 1;
-    return (void *) (c->Device_driver_table + n);
-
-failed:
-    *next_id = RTEMS_OBJECT_ID_FINAL;
-    return 0;
-}
-
-
-void
-rtems_monitor_driver_dump_header(
-    boolean verbose
-)
-{
-    printf("\
-  Major      Entry points\n");
-/*23456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789
-0         1         2         3         4         5         6         7       */
-    rtems_monitor_separator();
-}
-
-void
-rtems_monitor_driver_dump(
-    rtems_monitor_driver_t *monitor_driver,
-    boolean                 verbose
-)
-{
-    unsigned32          length = 0;
-
-    length += printf("  %d", monitor_driver->id);
-
-    length += rtems_monitor_pad(13, length);
-    length += printf("init: ");
-    length += rtems_monitor_symbol_dump(&monitor_driver->initialization, verbose);
-    length += printf(";  control: ");
-    length += rtems_monitor_symbol_dump(&monitor_driver->control, verbose);
-    length += printf("\n");
-    length = 0;
-
-    length += rtems_monitor_pad(13, length);
-
-    length += printf("open: ");
-    length += rtems_monitor_symbol_dump(&monitor_driver->open, verbose);
-    length += printf(";  close: ");
-    length += rtems_monitor_symbol_dump(&monitor_driver->close, verbose);
-    length += printf("\n");
-    length = 0;
-
-    length += rtems_monitor_pad(13, length);
-
-    length += printf("read: ");
-    length += rtems_monitor_symbol_dump(&monitor_driver->read, verbose);
-    length += printf(";  write: ");
-    length += rtems_monitor_symbol_dump(&monitor_driver->write, verbose);
-    length += printf("\n");
-    length = 0;
-}
diff --git a/cpukit/libmisc/monitor/mon-extension.c b/cpukit/libmisc/monitor/mon-extension.c
deleted file mode 100644
index 107fd5184e..0000000000
--- a/cpukit/libmisc/monitor/mon-extension.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * RTEMS Monitor extension support
- *
- *  $Id$
- */
-
-#include <rtems.h>
-#include <rtems/monitor.h>
-
-#include <stdio.h>
-
-void
-rtems_monitor_extension_canonical(
-    rtems_monitor_extension_t *canonical_extension,
-    void                  *extension_void
-)
-{
-    Extension_Control     *rtems_extension = (Extension_Control *) extension_void;
-    rtems_extensions_table *e = &rtems_extension->Extension.Callouts;
-
-    rtems_monitor_symbol_canonical_by_value(&canonical_extension->e_create,
-                                            (void *) e->thread_create);
-
-    rtems_monitor_symbol_canonical_by_value(&canonical_extension->e_start,
-                                            (void *) e->thread_start);
-    rtems_monitor_symbol_canonical_by_value(&canonical_extension->e_restart,
-                                            (void *) e->thread_restart);
-    rtems_monitor_symbol_canonical_by_value(&canonical_extension->e_delete,
-                                            (void *) e->thread_delete);
-    rtems_monitor_symbol_canonical_by_value(&canonical_extension->e_tswitch,
-                                            (void *) e->thread_switch);
-    rtems_monitor_symbol_canonical_by_value(&canonical_extension->e_begin,
-                                            (void *) e->thread_begin);
-    rtems_monitor_symbol_canonical_by_value(&canonical_extension->e_exitted,
-                                            (void *) e->thread_exitted);
-    rtems_monitor_symbol_canonical_by_value(&canonical_extension->e_fatal,
-                                            (void *) e->fatal);
-}
-
-void
-rtems_monitor_extension_dump_header(
-    boolean verbose
-)
-{
-    printf("\
-  ID       NAME\n");
-/*23456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789
-0         1         2         3         4         5         6         7       */
-           
-    rtems_monitor_separator();
-}
-
-
-/*
- * Dump out the canonical form
- */
-
-void
-rtems_monitor_extension_dump(
-    rtems_monitor_extension_t *monitor_extension,
-    boolean  verbose
-)
-{
-    unsigned32           length = 0;
-
-    length += rtems_monitor_dump_id(monitor_extension->id);
-    length += rtems_monitor_pad(11, length);
-    length += rtems_monitor_dump_name(monitor_extension->name);
-
-    length += rtems_monitor_pad(18, length);
-    length += printf("create: ");
-    length += rtems_monitor_symbol_dump(&monitor_extension->e_create, verbose);
-    length += printf(";  start: ");
-    length += rtems_monitor_symbol_dump(&monitor_extension->e_start, verbose);
-    length += printf(";  restart: ");
-    length += rtems_monitor_symbol_dump(&monitor_extension->e_restart, verbose);
-    length += printf("\n");
-    length = 0;
-
-    length += rtems_monitor_pad(18, length);
-    length += printf("delete: ");
-    length += rtems_monitor_symbol_dump(&monitor_extension->e_delete, verbose);
-    length += printf(";  switch: ");
-    length += rtems_monitor_symbol_dump(&monitor_extension->e_tswitch, verbose);
-    length += printf(";  begin: ");
-    length += rtems_monitor_symbol_dump(&monitor_extension->e_begin, verbose);
-    length += printf("\n");
-    length = 0;
-
-    length += rtems_monitor_pad(18, length);
-    length += printf("exitted: ");
-    length += rtems_monitor_symbol_dump(&monitor_extension->e_exitted, verbose);
-    length += printf(";  fatal: ");
-    length += rtems_monitor_symbol_dump(&monitor_extension->e_fatal, verbose);
-    length += printf("\n");
-    length = 0;
-    printf("\n");
-}
diff --git a/cpukit/libmisc/monitor/mon-itask.c b/cpukit/libmisc/monitor/mon-itask.c
deleted file mode 100644
index 59a3a4f284..0000000000
--- a/cpukit/libmisc/monitor/mon-itask.c
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * RTEMS Monitor init task support
- *
- *  $Id$
- */
-
-#define __RTEMS_VIOLATE_KERNEL_VISIBILITY__
-#include <rtems.h>
-#include <rtems/monitor.h>
-
-#include <stdio.h>
-
-/*
- * As above, but just for init tasks
- */
-void
-rtems_monitor_init_task_canonical(
-    rtems_monitor_init_task_t *canonical_itask,
-    void                  *itask_void
-)
-{
-    rtems_initialization_tasks_table *rtems_itask = itask_void;
-    
-    rtems_monitor_symbol_canonical_by_value(&canonical_itask->entry,
-                                            (void *) rtems_itask->entry_point);
-
-    canonical_itask->argument = rtems_itask->argument;
-    canonical_itask->stack_size = rtems_itask->stack_size;
-    canonical_itask->priority = rtems_itask->initial_priority;
-    canonical_itask->modes = rtems_itask->mode_set;
-    canonical_itask->attributes = rtems_itask->attribute_set;
-}
-
-void *
-rtems_monitor_init_task_next(
-    void                  *object_info,
-    rtems_monitor_init_task_t *canonical_init_task,
-    rtems_id              *next_id
-)
-{
-    rtems_configuration_table *c = _Configuration_Table;
-    rtems_initialization_tasks_table *itask;
-    rtems_unsigned32 n = rtems_get_index(*next_id);
-
-    if (n >= c->RTEMS_api_configuration->number_of_initialization_tasks)
-        goto failed;
-    
-    _Thread_Disable_dispatch();
-
-    itask = c->RTEMS_api_configuration->User_initialization_tasks_table + n;
-
-    /*
-     * dummy up a fake id and name for this item
-     */
-
-    canonical_init_task->id = n;
-    canonical_init_task->name = itask->name;
-
-    *next_id += 1;
-    return (void *) itask;
-
-failed:
-    *next_id = RTEMS_OBJECT_ID_FINAL;
-    return 0;
-}
-
-
-void
-rtems_monitor_init_task_dump_header(
-    boolean verbose
-)
-{
-    printf("\
-  #    NAME   ENTRY        ARGUMENT    PRIO   MODES  ATTRIBUTES   STACK SIZE\n");
-/*23456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789
-0         1         2         3         4         5         6         7       */
-    rtems_monitor_separator();
-}
-
-/*
- */
-
-void
-rtems_monitor_init_task_dump(
-    rtems_monitor_init_task_t *monitor_itask,
-    boolean  verbose
-)
-{
-    int length = 0;
-
-    length += rtems_monitor_dump_decimal(monitor_itask->id);
-
-    length += rtems_monitor_pad(7, length);
-    length += rtems_monitor_dump_name(monitor_itask->name);
-
-    length += rtems_monitor_pad(14, length);
-    length += rtems_monitor_symbol_dump(&monitor_itask->entry, verbose);
-
-    length += rtems_monitor_pad(25, length);
-    length += printf("%d [0x%x]", monitor_itask->argument, monitor_itask->argument);
-
-    length += rtems_monitor_pad(39, length);
-    length += rtems_monitor_dump_priority(monitor_itask->priority);
-
-    length += rtems_monitor_pad(46, length);
-    length += rtems_monitor_dump_modes(monitor_itask->modes);
-
-    length += rtems_monitor_pad(54, length);
-    length += rtems_monitor_dump_attributes(monitor_itask->attributes);
-    
-    length += rtems_monitor_pad(66, length);
-    length += printf("%d [0x%x]", monitor_itask->stack_size, monitor_itask->stack_size);
-
-    printf("\n");
-}
diff --git a/cpukit/libmisc/monitor/mon-manager.c b/cpukit/libmisc/monitor/mon-manager.c
deleted file mode 100644
index 497f0255a0..0000000000
--- a/cpukit/libmisc/monitor/mon-manager.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * RTEMS Monitor "manager" support.
- * Used to traverse object (chain) lists and print them out.
- *
- *  $Id$
- */
-
-#include <rtems.h>
-#include <rtems/monitor.h>
-
-#include <stdio.h>
-
-/*
- * "next" routine for all objects that are RTEMS manager objects
- */
-
-void *
-rtems_monitor_manager_next(
-    void      *table_void,
-    void      *canonical,
-    rtems_id  *next_id
-)
-{
-    Objects_Information     *table = table_void;
-    rtems_monitor_generic_t *copy;
-    Objects_Control         *object = 0;
-    Objects_Locations        location;
-
-    /*
-     * When we are called, it must be local
-     */
-       
-    if ( ! _Objects_Is_local_id(*next_id))
-        goto done;
-    
-    object = _Objects_Get_next(table, *next_id, &location, next_id);
-
-    if (object)
-    {
-        copy = (rtems_monitor_generic_t *) canonical;
-        copy->id = object->id;
-        _Objects_Copy_name_raw(object->name, &copy->name, sizeof(copy->name));
-    }    
-    
-done:
-    return object;
-}
-
diff --git a/cpukit/libmisc/monitor/mon-monitor.c b/cpukit/libmisc/monitor/mon-monitor.c
deleted file mode 100644
index 289425d8e4..0000000000
--- a/cpukit/libmisc/monitor/mon-monitor.c
+++ /dev/null
@@ -1,518 +0,0 @@
-/*
- * RTEMS monitor main body
- *	
- *  TODO:
- *      add stuff to RTEMS api
- *            rtems_get_name(id)
- *            rtems_get_type(id)
- *            rtems_build_id(node, type, num)
- *      Add a command to dump out info about an arbitrary id when
- *         types are added to id's
- *         rtems> id idnum
- *                idnum: node n, object: whatever, id: whatever
- *      allow id's to be specified as n:t:id, where 'n:t' is optional
- *      should have a separate monitor FILE stream (ala the debugger)
- *      remote request/response stuff should be cleaned up
- *         maybe we can use real rpc??
- *      'info' command to print out:
- *           interrupt stack location, direction and size
- *           floating point config stuff
- *           interrupt config stuff
- *
- *  $Id$
- */
-
-#include <rtems.h>
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#include <rtems/monitor.h>
-
-/* set by trap handler */
-extern rtems_tcb       *debugger_interrupted_task;
-extern rtems_context   *debugger_interrupted_task_context;
-extern rtems_unsigned32 debugger_trap;
-
-/*
- * Various id's for the monitor
- * They need to be public variables for access by other agencies
- * such as debugger and remote servers'
- */
-
-rtems_id  rtems_monitor_task_id;
-
-unsigned32 rtems_monitor_node;		/* our node number */
-unsigned32 rtems_monitor_default_node;  /* current default for commands */
-
-/*
- * The rtems symbol table
- */
-
-rtems_symbol_table_t *rtems_monitor_symbols;
-
-/*
- * The top-level commands
- */
-
-rtems_monitor_command_entry_t rtems_monitor_commands[] = {
-    { "--usage--",
-      "\n"
-      "RTEMS monitor\n"
-      "\n"
-      "Commands (may be abbreviated)\n"
-      "\n"
-      "  help      -- get this message or command specific help\n"
-      "  pause     -- pause monitor for a specified number of ticks\n"
-      "  exit      -- invoke a fatal RTEMS error\n"
-      "  symbol    -- show entries from symbol table\n"
-      "  continue  -- put monitor to sleep waiting for explicit wakeup\n"
-      "  config    -- show system configuration\n"
-      "  itask     -- list init tasks\n"
-      "  mpci      -- list mpci config\n"
-      "  task      -- show task information\n"
-      "  queue     -- show message queue information\n"
-      "  extension -- user extensions\n"
-      "  driver    -- show information about named drivers\n"
-      "  dname     -- show information about named drivers\n"
-      "  object    -- generic object information\n"
-      "  node      -- specify default node for commands that take id's\n"
-#ifdef CPU_INVOKE_DEBUGGER
-      "  debugger  -- invoke system debugger\n"
-#endif
-      ,
-      0,
-      0,
-      (unsigned32) rtems_monitor_commands,
-    },
-    { "config",
-      "config\n"
-      "  Show the system configuration.\n",
-      0,
-      rtems_monitor_object_cmd,
-      RTEMS_MONITOR_OBJECT_CONFIG,
-    },
-    { "itask",
-      "itask\n"
-      "  List init tasks for the system\n",
-      0,
-      rtems_monitor_object_cmd,
-      RTEMS_MONITOR_OBJECT_INIT_TASK,
-    }, 
-   { "mpci",
-      "mpci\n"
-      "  Show the MPCI system configuration, if configured.\n",
-      0,
-      rtems_monitor_object_cmd,
-      RTEMS_MONITOR_OBJECT_MPCI,
-    },
-    { "pause",
-      "pause [ticks]\n"
-      "  monitor goes to \"sleep\" for specified ticks (default is 1)\n"
-      "  monitor will resume at end of period or if explicitly awakened\n",
-      0,
-      rtems_monitor_pause_cmd,
-      0,
-    },
-    { "continue",
-      "continue\n"
-      "  put the monitor to sleep waiting for an explicit wakeup from the\n"
-      "  program running.\n",
-      0,
-      rtems_monitor_continue_cmd,
-      0,
-    },
-    { "go",
-      "go\n"
-      "  Alias for 'continue'\n",
-      0,
-      rtems_monitor_continue_cmd,
-      0,
-    },
-    { "node",
-      "node [ node number ]\n"
-      "  Specify default node number for commands that take id's\n",
-      0,
-      rtems_monitor_node_cmd,
-      0,
-    },
-    { "symbol",
-      "symbol [ symbolname [symbolname ... ] ]\n"
-      "  display value associated with specified symbol.\n"
-      "  Defaults to displaying all known symbols.\n",
-      0,
-      rtems_monitor_symbol_cmd,
-      (unsigned32) &rtems_monitor_symbols,
-    },
-    { "extension",
-      "extension [id [id ...] ]\n"
-      "  display information about specified extensions.\n"
-      "  Default is to display information about all extensions on this node\n",
-      0,
-      rtems_monitor_object_cmd,
-      RTEMS_MONITOR_OBJECT_EXTENSION,
-    },
-    { "task",
-      "task [id [id ...] ]\n"
-      "  display information about the specified tasks.\n"
-      "  Default is to display information about all tasks on this node\n",
-      0,
-      rtems_monitor_object_cmd,
-      RTEMS_MONITOR_OBJECT_TASK,
-    },
-    { "queue",
-      "queue [id [id ... ] ]\n"
-      "  display information about the specified message queues\n"
-      "  Default is to display information about all queues on this node\n",
-      0,
-      rtems_monitor_object_cmd,
-      RTEMS_MONITOR_OBJECT_QUEUE,
-    },
-    { "object",
-      "object [id [id ...] ]\n"
-      "  display information about specified RTEMS objects.\n"
-      "  Object id's must include 'type' information.\n"
-      "  (which may normally be defaulted)\n",
-      0,
-      rtems_monitor_object_cmd,
-      RTEMS_MONITOR_OBJECT_INVALID,
-    },
-    { "driver",
-      "driver [ major [ major ... ] ]\n"
-      "  Display the RTEMS device driver table.\n",
-      0,
-      rtems_monitor_object_cmd,
-      RTEMS_MONITOR_OBJECT_DRIVER,
-    },
-    { "dname",
-      "dname\n"
-      "  Displays information about named drivers.\n",
-      0,
-      rtems_monitor_object_cmd,
-      RTEMS_MONITOR_OBJECT_DNAME,
-    },
-    { "exit",
-      "exit [status]\n"
-      "  Invoke 'rtems_fatal_error_occurred' with 'status'\n"
-      "  (default is RTEMS_SUCCESSFUL)\n",
-      0,
-      rtems_monitor_fatal_cmd,
-      RTEMS_SUCCESSFUL,
-    },
-    { "fatal",
-      "fatal [status]\n"
-      "  'exit' with fatal error; default error is RTEMS_TASK_EXITTED\n",
-      0,
-      rtems_monitor_fatal_cmd,
-      RTEMS_TASK_EXITTED,			/* exit value */
-    },
-    { "quit",
-      "quit [status]\n"
-      "  Alias for 'exit'\n",
-      0,
-      rtems_monitor_fatal_cmd,
-      RTEMS_SUCCESSFUL,				/* exit value */
-    },
-    { "help",
-      "help [ command [ command ] ]\n"
-      "  provide information about commands\n"
-      "  Default is show basic command summary.\n",
-      0,
-      rtems_monitor_help_cmd,
-      (unsigned32) rtems_monitor_commands,
-    },
-#ifdef CPU_INVOKE_DEBUGGER
-    { "debugger",
-      "debugger\n"
-      "  Enter the debugger, if possible.\n"
-      "  A continue from the debugger will return to the monitor.\n",
-      0,
-      rtems_monitor_debugger_cmd,
-      0,
-    },
-#endif            
-    { 0, 0, 0, 0, 0 },
-};
-
-
-rtems_status_code
-rtems_monitor_suspend(rtems_interval timeout)
-{
-    rtems_event_set event_set;
-    rtems_status_code status;
-    
-    status = rtems_event_receive(MONITOR_WAKEUP_EVENT,
-                                 RTEMS_DEFAULT_OPTIONS,
-                                 timeout,
-                                 &event_set);
-    return status;
-}
-
-void
-rtems_monitor_wakeup(void)
-{
-    rtems_status_code status;
-    
-    status = rtems_event_send(rtems_monitor_task_id, MONITOR_WAKEUP_EVENT);
-}
-
-void
-rtems_monitor_debugger_cmd(
-    int        argc,
-    char     **argv,
-    unsigned32 command_arg,
-    boolean    verbose
-)
-{
-#ifdef CPU_INVOKE_DEBUGGER
-    CPU_INVOKE_DEBUGGER;
-#endif
-}
-
-void
-rtems_monitor_pause_cmd(
-    int        argc,
-    char     **argv,
-    unsigned32 command_arg,
-    boolean    verbose
-)
-{
-    if (argc == 1)
-        rtems_monitor_suspend(1);
-    else
-        rtems_monitor_suspend(strtoul(argv[1], 0, 0));
-}
-
-void
-rtems_monitor_fatal_cmd(
-    int     argc,
-    char  **argv,
-    unsigned32 command_arg,
-    boolean verbose
-)
-{
-    if (argc == 1)
-        rtems_fatal_error_occurred(command_arg);
-    else
-        rtems_fatal_error_occurred(strtoul(argv[1], 0, 0));
-}
-
-void
-rtems_monitor_continue_cmd(
-    int     argc,
-    char  **argv,
-    unsigned32 command_arg,
-    boolean verbose
-)
-{
-    rtems_monitor_suspend(RTEMS_NO_TIMEOUT);
-}
-
-void
-rtems_monitor_node_cmd(
-    int     argc,
-    char  **argv,
-    unsigned32 command_arg,
-    boolean verbose
-)
-{
-    unsigned32 new_node = rtems_monitor_default_node;
-    
-    switch (argc)
-    {
-        case 1: 		/* no node, just set back to ours */
-            new_node = rtems_monitor_node;
-            break;
-
-        case 2:
-            new_node = strtoul(argv[1], 0, 0);
-            break;
-
-        default:
-            printf("invalid syntax, try 'help node'\n");
-            break;
-    }
-
-    if ((new_node >= 1) &&
-        _Configuration_MP_table &&
-        (new_node <= _Configuration_MP_table->maximum_nodes))
-            rtems_monitor_default_node = new_node;
-}
-
-
-/*
- *  Function:   rtems_monitor_symbols_loadup
- *
- *  Description:
- *      Create and load the monitor's symbol table.
- *      We are reading the output format of 'gnm' which looks like this:
- *
- *              400a7068 ? _Rate_monotonic_Information
- *              400a708c ? _Thread_Dispatch_disable_level
- *              400a7090 ? _Configuration_Table
- *
- *      We ignore the type field.
- *
- *  Side Effects:
- *      Creates and fills in 'rtems_monitor_symbols' table
- *
- *  TODO
- *      there should be a BSP #define or something like that
- *         to do this;  Assuming stdio is crazy.
- *      Someday this should know BFD
- *              Maybe we could get objcopy to just copy the symbol areas
- *              and copy that down.
- *
- */
-
-void
-rtems_monitor_symbols_loadup(void)
-{
-    FILE *fp;
-    char buffer[128];
-
-    if (rtems_monitor_symbols)
-        rtems_symbol_table_destroy(rtems_monitor_symbols);
-    
-    rtems_monitor_symbols = rtems_symbol_table_create(10);
-    if (rtems_monitor_symbols == 0)
-        return;
-
-    fp = fopen("symbols", "r");
-    
-    if (fp == 0)
-        return;
-
-    while (fgets(buffer, sizeof(buffer) - 1, fp))
-    {
-        char *symbol;
-        char *value;
-        char *ignored_type;
-
-        value = strtok(buffer, " \t\n");
-        ignored_type = strtok(0, " \t\n");
-        symbol = strtok(0, " \t\n");
-
-        if (symbol && ignored_type && value)
-        {
-            rtems_symbol_t *sp;
-            sp = rtems_symbol_create(rtems_monitor_symbols,
-                                     symbol,
-                                     (rtems_unsigned32) strtoul(value, 0, 16));
-            if (sp == 0)
-            {
-                printf("could not define symbol '%s'\n", symbol);
-                goto done;
-            }
-        }
-        else
-        {
-            printf("parsing error on '%s'\n", buffer);
-            goto done;
-        }
-    }
-
-done:
-    return;
-}
-
-
-/*
- * Main monitor command loop
- */
-
-void
-rtems_monitor_task(
-    rtems_task_argument monitor_flags
-)
-{
-    rtems_tcb *debugee = 0;
-    rtems_context *rp;
-    rtems_context_fp *fp;
-    char command_buffer[513];
-    int argc;
-    char *argv[64];        
-    boolean verbose = FALSE;
-
-    if (monitor_flags & RTEMS_MONITOR_SUSPEND)
-        (void) rtems_monitor_suspend(RTEMS_NO_TIMEOUT);
-
-    for (;;)
-    {
-        extern rtems_tcb * _Thread_Executing;
-        rtems_monitor_command_entry_t *command;
-
-        debugee = _Thread_Executing;
-        rp = &debugee->Registers;
-        fp = (rtems_context_fp *) debugee->fp_context;  /* possibly 0 */
-
-        if (0 == rtems_monitor_command_read(command_buffer, &argc, argv))
-            continue;
-        if ((command = rtems_monitor_command_lookup(rtems_monitor_commands,
-                                                    argc,
-                                                    argv)) == 0)
-            continue;
-
-        command->command_function(argc, argv, command->command_arg, verbose);
-
-        fflush(stdout);
-    }
-}
-
-
-void
-rtems_monitor_kill(void)
-{
-    if (rtems_monitor_task_id)
-        rtems_task_delete(rtems_monitor_task_id);
-    rtems_monitor_task_id = 0;
-    
-    rtems_monitor_server_kill();
-}
-
-void
-rtems_monitor_init(
-    unsigned32 monitor_flags
-)
-{
-    rtems_status_code status;
-    
-    rtems_monitor_kill();
-
-    status = rtems_task_create(RTEMS_MONITOR_NAME,
-                               1,
-                               RTEMS_MINIMUM_STACK_SIZE * 2,
-                               RTEMS_INTERRUPT_LEVEL(0),
-                               RTEMS_DEFAULT_ATTRIBUTES,
-                               &rtems_monitor_task_id);
-    if (status != RTEMS_SUCCESSFUL)
-    {
-        rtems_error(status, "could not create monitor task");
-        goto done;
-    }
-
-    rtems_monitor_node = rtems_get_node(rtems_monitor_task_id);
-    rtems_monitor_default_node = rtems_monitor_node;
-
-    rtems_monitor_symbols_loadup();
-
-    if (monitor_flags & RTEMS_MONITOR_GLOBAL)
-        rtems_monitor_server_init(monitor_flags);
-
-    /*
-     * Start the monitor task itself
-     */
-    
-    status = rtems_task_start(rtems_monitor_task_id,
-                              rtems_monitor_task,
-                              monitor_flags);
-    if (status != RTEMS_SUCCESSFUL)
-    {
-        rtems_error(status, "could not start monitor");
-        goto done;
-    }
-
-done:
-}
diff --git a/cpukit/libmisc/monitor/mon-mpci.c b/cpukit/libmisc/monitor/mon-mpci.c
deleted file mode 100644
index 5399f37555..0000000000
--- a/cpukit/libmisc/monitor/mon-mpci.c
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * RTEMS MPCI Config display support
- *
- * TODO
- *
- *  $Id$
- */
-
-
-#define __RTEMS_VIOLATE_KERNEL_VISIBILITY__
-#include <rtems.h>
-#include <rtems/monitor.h>
-
-#include <stdio.h>
-#include <stdlib.h>             /* strtoul() */
-
-#define DATACOL 15
-
-/*
- * Fill in entire monitor config table
- * for sending to a remote monitor or printing on the local system
- */
-
-void
-rtems_monitor_mpci_canonical(
-    rtems_monitor_mpci_t *canonical_mpci,
-    void                  *config_void
-)
-{
-    rtems_configuration_table *c = _Configuration_Table;
-    rtems_multiprocessing_table *m;
-    rtems_mpci_table *mt;
-
-    m = c->User_multiprocessing_table;
-    if (m == 0)
-        return;
-    mt = m->User_mpci_table;
-    
-    canonical_mpci->node = m->node;
-    canonical_mpci->maximum_nodes = m->maximum_nodes;
-    canonical_mpci->maximum_global_objects = m->maximum_global_objects;
-    canonical_mpci->maximum_proxies = m->maximum_proxies;
-
-    canonical_mpci->default_timeout = mt->default_timeout;
-    canonical_mpci->maximum_packet_size = mt->maximum_packet_size;
-
-    rtems_monitor_symbol_canonical_by_value(&canonical_mpci->initialization,
-                                            (void *) mt->initialization);
-
-    rtems_monitor_symbol_canonical_by_value(&canonical_mpci->get_packet,
-                                            (void *) mt->get_packet);
-    rtems_monitor_symbol_canonical_by_value(&canonical_mpci->return_packet,
-                                            (void *) mt->return_packet);
-    rtems_monitor_symbol_canonical_by_value(&canonical_mpci->send_packet,
-                                            (void *) mt->send_packet);
-    rtems_monitor_symbol_canonical_by_value(&canonical_mpci->receive_packet,
-                                            (void *) mt->receive_packet);
-}    
-
-/*
- * This is easy, since there is only 1 (altho we could get them from
- *    other nodes...)
- */
-
-void *
-rtems_monitor_mpci_next(
-    void                  *object_info,
-    rtems_monitor_mpci_t  *canonical_mpci,
-    rtems_id              *next_id
-)
-{
-    rtems_configuration_table *c = _Configuration_Table;
-    int n = rtems_get_index(*next_id);
-
-    if (n >= 1)
-        goto failed;
-    
-    if ( ! c->User_multiprocessing_table)
-        goto failed;
-    
-    _Thread_Disable_dispatch();
-
-    *next_id += 1;
-    return (void *) c;
-
-failed:
-    *next_id = RTEMS_OBJECT_ID_FINAL;
-    return 0;
-}
-
-
-void
-rtems_monitor_mpci_dump_header(
-    boolean verbose
-)
-{
-    printf("\
-           max     max     max     default    max\n\
-   node   nodes  globals  proxies  timeout  pktsize\n");
-/*23456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789
-0         1         2         3         4         5         6         7       */
-           
-    rtems_monitor_separator();
-}
-
-
-void
-rtems_monitor_mpci_dump(
-    rtems_monitor_mpci_t *monitor_mpci,
-    boolean               verbose
-)
-{
-    unsigned32   length = 0;
-
-    length += rtems_monitor_pad(2, length);
-    length += printf("  %d", monitor_mpci->node);
-    length += rtems_monitor_pad(11, length);
-    length += printf("%d", monitor_mpci->maximum_nodes);
-    
-    length += rtems_monitor_pad(18, length);
-    length += rtems_monitor_dump_decimal(monitor_mpci->maximum_global_objects);
-    
-    length += rtems_monitor_pad(28, length);
-    length += rtems_monitor_dump_decimal(monitor_mpci->maximum_proxies);
-
-    length += rtems_monitor_pad(37, length);
-    length += rtems_monitor_dump_decimal(monitor_mpci->default_timeout);
-
-    length += rtems_monitor_pad(46, length);
-    length += rtems_monitor_dump_decimal(monitor_mpci->maximum_packet_size);
-
-    printf("\n");
-    length = 0;
-    length += rtems_monitor_pad(DATACOL, length);
-
-    length += printf("init: ");
-    length += rtems_monitor_symbol_dump(&monitor_mpci->initialization, verbose);
-
-    printf("\n");
-    length = 0;
-    length += rtems_monitor_pad(DATACOL, length);
-
-    length += printf("get: ");
-    length += rtems_monitor_symbol_dump(&monitor_mpci->get_packet, verbose);
-    length += printf(";  return: ");
-    length += rtems_monitor_symbol_dump(&monitor_mpci->return_packet, verbose);
-
-    printf("\n");
-    length = 0;
-    length += rtems_monitor_pad(DATACOL, length);
-
-    length += printf("send: ");
-    length += rtems_monitor_symbol_dump(&monitor_mpci->send_packet, verbose);
-    length += printf(";  receive: ");
-    length += rtems_monitor_symbol_dump(&monitor_mpci->receive_packet, verbose);
-
-    printf("\n");
-    length = 0;
-}
diff --git a/cpukit/libmisc/monitor/mon-object.c b/cpukit/libmisc/monitor/mon-object.c
deleted file mode 100644
index 8d5a9c395f..0000000000
--- a/cpukit/libmisc/monitor/mon-object.c
+++ /dev/null
@@ -1,374 +0,0 @@
-/*
- * RTEMS Monitor "object" support.
- *
- * Used to traverse object lists and print them out.
- * An object can be an RTEMS object (chain based stuff) or
- * a "misc" object such as a device driver.
- *
- * Each object has its own file in this directory (eg: extension.c)
- * That file provides routines to convert a "native" structure
- * to its canonical form, print a canonical structure, etc.
- *
- * TODO:
- *     should allow for non-numeric id's???
- *
- *  $Id$
- */
-
-#define __RTEMS_VIOLATE_KERNEL_VISIBILITY__
-#include <rtems.h>
-#include <rtems/monitor.h>
-
-#include <stdio.h>
-#include <stdlib.h>             /* strtoul() */
-#include <string.h>             /* memcpy() */
-
-#define NUMELEMS(arr)	(sizeof(arr) / sizeof(arr[0]))
-
-/*
- * add:
- *     next
- */
-
-rtems_monitor_object_info_t rtems_monitor_object_info[] =
-{
-    { RTEMS_MONITOR_OBJECT_CONFIG,
-      (void *) 0,
-      sizeof(rtems_monitor_config_t),
-      (rtems_monitor_object_next_fn)        rtems_monitor_config_next,
-      (rtems_monitor_object_canonical_fn)   rtems_monitor_config_canonical,
-      (rtems_monitor_object_dump_header_fn) rtems_monitor_config_dump_header,
-      (rtems_monitor_object_dump_fn)        rtems_monitor_config_dump,
-    },
-    { RTEMS_MONITOR_OBJECT_MPCI,
-      (void *) 0,
-      sizeof(rtems_monitor_mpci_t),
-      (rtems_monitor_object_next_fn)        rtems_monitor_mpci_next,
-      (rtems_monitor_object_canonical_fn)   rtems_monitor_mpci_canonical,
-      (rtems_monitor_object_dump_header_fn) rtems_monitor_mpci_dump_header,
-      (rtems_monitor_object_dump_fn)        rtems_monitor_mpci_dump,
-    },
-    { RTEMS_MONITOR_OBJECT_INIT_TASK,
-      (void *) 0,
-      sizeof(rtems_monitor_init_task_t),
-      (rtems_monitor_object_next_fn)        rtems_monitor_init_task_next,
-      (rtems_monitor_object_canonical_fn)   rtems_monitor_init_task_canonical,
-      (rtems_monitor_object_dump_header_fn) rtems_monitor_init_task_dump_header,
-      (rtems_monitor_object_dump_fn)        rtems_monitor_init_task_dump,
-    },
-    { RTEMS_MONITOR_OBJECT_TASK,
-      (void *) &_RTEMS_tasks_Information,
-      sizeof(rtems_monitor_task_t),
-      (rtems_monitor_object_next_fn)        rtems_monitor_manager_next,
-      (rtems_monitor_object_canonical_fn)   rtems_monitor_task_canonical,
-      (rtems_monitor_object_dump_header_fn) rtems_monitor_task_dump_header,
-      (rtems_monitor_object_dump_fn)        rtems_monitor_task_dump,
-    },
-    { RTEMS_MONITOR_OBJECT_QUEUE,
-      (void *) &_Message_queue_Information,
-      sizeof(rtems_monitor_queue_t),
-      (rtems_monitor_object_next_fn)        rtems_monitor_manager_next,
-      (rtems_monitor_object_canonical_fn)   rtems_monitor_queue_canonical,
-      (rtems_monitor_object_dump_header_fn) rtems_monitor_queue_dump_header,
-      (rtems_monitor_object_dump_fn)        rtems_monitor_queue_dump,
-    },
-    { RTEMS_MONITOR_OBJECT_EXTENSION,
-      (void *) &_Extension_Information,
-      sizeof(rtems_monitor_extension_t),
-      (rtems_monitor_object_next_fn)        rtems_monitor_manager_next,
-      (rtems_monitor_object_canonical_fn)   rtems_monitor_extension_canonical,
-      (rtems_monitor_object_dump_header_fn) rtems_monitor_extension_dump_header,
-      (rtems_monitor_object_dump_fn)        rtems_monitor_extension_dump,
-    },
-    { RTEMS_MONITOR_OBJECT_DRIVER,
-      (void *) 0,
-      sizeof(rtems_monitor_driver_t),
-      (rtems_monitor_object_next_fn)        rtems_monitor_driver_next,
-      (rtems_monitor_object_canonical_fn)   rtems_monitor_driver_canonical,
-      (rtems_monitor_object_dump_header_fn) rtems_monitor_driver_dump_header,
-      (rtems_monitor_object_dump_fn)        rtems_monitor_driver_dump,
-    },
-    { RTEMS_MONITOR_OBJECT_DNAME,
-      /* XXX now that the driver name table is allocated from the */
-      /* XXX Workspace, this does not work */
-      (void *) 0,
-      /* (void *) _IO_Driver_name_table, */
-      sizeof(rtems_monitor_dname_t),
-      (rtems_monitor_object_next_fn)        rtems_monitor_dname_next,
-      (rtems_monitor_object_canonical_fn)   rtems_monitor_dname_canonical,
-      (rtems_monitor_object_dump_header_fn) rtems_monitor_dname_dump_header,
-      (rtems_monitor_object_dump_fn)        rtems_monitor_dname_dump,
-    },
-};
-
-/*
- * Allow id's to be specified without the node number or
- * type for convenience.
- */
-
-rtems_id
-rtems_monitor_id_fixup(
-    rtems_id            id,
-    unsigned32          default_node,
-    rtems_monitor_object_type_t type
-)
-{
-    unsigned32  node;
-    
-    node = rtems_get_node(id);
-    if (node == 0)
-    {
-        if (rtems_get_class(id) != OBJECTS_NO_CLASS)
-            type = rtems_get_class(id);
-
-        id = _Objects_Build_id(type, default_node, rtems_get_index(id));
-    }
-    return id;
-}
-
-
-rtems_monitor_object_info_t *
-rtems_monitor_object_lookup(
-    rtems_monitor_object_type_t type
-)
-{
-    rtems_monitor_object_info_t *p;
-    for (p = &rtems_monitor_object_info[0];
-         p < &rtems_monitor_object_info[NUMELEMS(rtems_monitor_object_info)];
-         p++)
-    {
-        if (p->type == type)
-            return p;
-    }
-    return 0;
-}
-
-rtems_id
-rtems_monitor_object_canonical_next_remote(
-    rtems_monitor_object_type_t type,
-    rtems_id            id,
-    void               *canonical
-)
-{
-    rtems_id                        next_id;
-    rtems_status_code               status;
-    rtems_monitor_server_request_t  request;
-    rtems_monitor_server_response_t response;
-
-    /*
-     * Send request
-     */
-    
-    request.command = RTEMS_MONITOR_SERVER_CANONICAL;
-    request.argument0 = (unsigned32) type;
-    request.argument1 = (unsigned32) id;
-
-    status = rtems_monitor_server_request(rtems_get_node(id), &request, &response);
-    if (status != RTEMS_SUCCESSFUL)
-        goto failed;
-
-    /*
-     * process response
-     */
-    
-    next_id = (rtems_id) response.result0;
-    if (next_id != RTEMS_OBJECT_ID_FINAL)
-        (void) memcpy(canonical, &response.payload, response.result1);
-
-    return next_id;
-
-failed:
-    return RTEMS_OBJECT_ID_FINAL;
-
-}
-
-
-rtems_id
-rtems_monitor_object_canonical_next(
-    rtems_monitor_object_info_t *info,
-    rtems_id                     id,
-    void                        *canonical
-)
-{
-    rtems_id                     next_id;
-    void                        *raw_item;
-
-    if ( ! _Objects_Is_local_id(id))
-        next_id = rtems_monitor_object_canonical_next_remote(info->type,
-                                                             id,
-                                                             canonical);
-    else
-    {
-        next_id = id;
-        
-        raw_item = (void *) info->next(info->object_information,
-                                       canonical,
-                                       &next_id);
-
-        if (raw_item)
-        {
-            info->canonical(canonical, raw_item);
-            _Thread_Enable_dispatch();
-        }    
-    }    
-    return next_id;
-}
-
-
-/*
- * this is routine server invokes locally to get the type
- */
-
-rtems_id
-rtems_monitor_object_canonical_get(
-    rtems_monitor_object_type_t  type,
-    rtems_id             id,
-    void                *canonical,
-    unsigned32          *size_p
-)
-{
-    rtems_monitor_object_info_t *info;
-    rtems_id                     next_id;
-
-    *size_p = 0;
-
-    info = rtems_monitor_object_lookup(type);
-
-    if (info == 0)
-        return RTEMS_OBJECT_ID_FINAL;
-
-    next_id = rtems_monitor_object_canonical_next(info, id, canonical);
-    *size_p = info->size;
-
-    return next_id;
-}
-
-
-void
-rtems_monitor_object_dump_1(
-    rtems_monitor_object_info_t *info,
-    rtems_id                     id,
-    boolean                      verbose
-)
-{
-    rtems_id next_id;
-    rtems_monitor_union_t canonical;
-
-    if ((next_id = rtems_monitor_object_canonical_next(
-                                     info,
-                                     id,
-                                     &canonical)) != RTEMS_OBJECT_ID_FINAL)
-    {
-        /*
-         * If the one we actually got is the one we wanted, then
-         * print it out.
-         * For ones that have an id field, this works fine,
-         * for all others, always dump it out.
-         *
-         * HACK: the way we determine whether there is an id is a hack.
-         *
-         * by the way: the reason we try to not have an id, is that some
-         *   of the canonical structures are almost too big for shared
-         *   memory driver (eg: mpci)
-         */
-        
-        if ((info->next != rtems_monitor_manager_next) ||
-            (id == canonical.generic.id))
-            info->dump(&canonical, verbose);
-    }
-}
-
-void
-rtems_monitor_object_dump_all(
-    rtems_monitor_object_info_t *info,
-    boolean                      verbose
-)
-{
-    rtems_id next_id;
-    rtems_monitor_union_t canonical;
-
-    next_id = RTEMS_OBJECT_ID_INITIAL(info->type, rtems_monitor_default_node);
-
-    while ((next_id = rtems_monitor_object_canonical_next(
-                                         info,
-                                         next_id,
-                                         &canonical)) != RTEMS_OBJECT_ID_FINAL)
-    {
-        info->dump(&canonical, verbose);
-    }
-}
-
-void
-rtems_monitor_object_cmd(
-    int        argc,
-    char     **argv,
-    unsigned32 command_arg,
-    boolean    verbose
-)
-{
-    int arg;
-    rtems_monitor_object_info_t *info = 0;
-    rtems_monitor_object_type_t  type = (rtems_monitor_object_type_t) command_arg;
-    
-    /* what is the default type? */
-    type = (rtems_monitor_object_type_t) command_arg;
-
-    if (argc == 1)
-    {
-        if (type == RTEMS_MONITOR_OBJECT_INVALID)
-        {
-            printf("A type must be specified to \"dump all\"\n");
-            goto done;
-        }
-        
-        info = rtems_monitor_object_lookup(type);
-        if (info == 0)
-            goto not_found;
-
-        if (info->dump_header)
-            info->dump_header(verbose);
-        rtems_monitor_object_dump_all(info, verbose);
-    }
-    else
-    {
-        unsigned32          default_node = rtems_monitor_default_node;
-        rtems_monitor_object_type_t last_type = RTEMS_MONITOR_OBJECT_INVALID;
-        rtems_id            id;
-
-        for (arg=1; argv[arg]; arg++)
-        {
-            id = (rtems_id) strtoul(argv[arg], 0, 16);
-            id = rtems_monitor_id_fixup(id, default_node, type);
-            type = (rtems_monitor_object_type_t) rtems_get_class(id);
-
-            /*
-             * Allow the item type to change in the middle
-             * of the command.  If the type changes, then
-             * just dump out a new header and keep on going.
-             */
-            if (type != last_type)
-            {
-                info = rtems_monitor_object_lookup(type);
-                if (info == 0)
-                    goto not_found;
-            
-                if (info->dump_header)
-                    info->dump_header(verbose);
-            }
-
-            if (info == 0)
-            {
-not_found:      printf("Invalid or unsupported type %d\n", type);
-                goto done;
-            }
-
-            rtems_monitor_object_dump_1(info, id, verbose);
-
-            default_node = rtems_get_node(id);
-            
-            last_type = type;
-        }
-    }
-done:
-    return;
-}
diff --git a/cpukit/libmisc/monitor/mon-prmisc.c b/cpukit/libmisc/monitor/mon-prmisc.c
deleted file mode 100644
index ce9aa9a554..0000000000
--- a/cpukit/libmisc/monitor/mon-prmisc.c
+++ /dev/null
@@ -1,259 +0,0 @@
-/*
- * Print misc stuff for the monitor dump routines
- * Each routine returns the number of characters it output.
- *
- * TODO:
- *
- *  $Id$
- */
-
-#include <rtems.h>
-#include <rtems/monitor.h>
-
-#include <rtems/assoc.h>
-
-#include <stdio.h>
-#include <ctype.h>
-
-void
-rtems_monitor_separator(void)
-{
-    printf("------------------------------------------------------------------------------\n");
-}
-
-unsigned32
-rtems_monitor_pad(
-    unsigned32  destination_column,
-    unsigned32  current_column
-)
-{
-    int pad_length;
-    
-    if (destination_column <= current_column)
-        pad_length = 1;
-    else
-        pad_length = destination_column - current_column;
-
-    return printf("%*s", pad_length, "");
-}
-
-unsigned32
-rtems_monitor_dump_char(rtems_unsigned8 ch)
-{
-    if (isprint(ch))
-        return printf("%c", ch);
-    else
-        return printf("%02x", ch);
-}
-
-unsigned32
-rtems_monitor_dump_decimal(unsigned32 num)
-{
-    return printf("%4d", num);
-}
-
-unsigned32
-rtems_monitor_dump_hex(unsigned32 num)
-{
-    return printf("0x%x", num);
-}
-
-unsigned32
-rtems_monitor_dump_assoc_bitfield(
-    rtems_assoc_t *ap,
-    char          *separator,
-    unsigned32     value
-  )
-{  
-    unsigned32 b;
-    unsigned32 length = 0;
-    const char *name;
-
-    for (b = 1; b; b <<= 1)
-        if (b & value)
-        {
-            if (length)
-                length += printf("%s", separator);
-
-            name = rtems_assoc_name_by_local(ap, b);
-            
-            if (name)
-                length += printf("%s", name);
-            else
-                length += printf("0x%x", b);
-        }
-        
-    return length;
-}
-
-unsigned32
-rtems_monitor_dump_id(rtems_id id)
-{
-    return printf("%08x", id);
-}
-
-unsigned32
-rtems_monitor_dump_name(rtems_name name)
-{
-    unsigned32 i;
-    unsigned32 length = 0;
-    union {
-        unsigned32 ui;
-        char       c[4];
-    } u;
-    
-    u.ui = (rtems_unsigned32) name;
-    
-#if (CPU_BIG_ENDIAN == TRUE)
-    for (i=0; i<sizeof(u.c); i++)
-        length += rtems_monitor_dump_char(u.c[i]);
-#else
-    for (i=sizeof(u.c)-1; i ; i--)
-        length += rtems_monitor_dump_char(u.c[i]);
-#endif
-    return length;
-}
-
-unsigned32
-rtems_monitor_dump_priority(rtems_task_priority priority)
-{
-    return printf("%3d", priority);
-}
-
-
-rtems_assoc_t rtems_monitor_state_assoc[] = {
-    { "DORM",   STATES_DORMANT },
-    { "SUSP",   STATES_SUSPENDED },
-    { "TRANS",  STATES_TRANSIENT },
-    { "DELAY",  STATES_DELAYING },
-    { "Wbuf",   STATES_WAITING_FOR_BUFFER },
-    { "Wseg",   STATES_WAITING_FOR_SEGMENT },
-    { "Wmsg" ,  STATES_WAITING_FOR_MESSAGE },
-    { "Wevnt",  STATES_WAITING_FOR_EVENT },
-    { "Wsem",   STATES_WAITING_FOR_SEMAPHORE },
-    { "Wtime",  STATES_WAITING_FOR_TIME },
-    { "Wrpc",   STATES_WAITING_FOR_RPC_REPLY },
-    { "WRATE",  STATES_WAITING_FOR_PERIOD },
-    { 0, 0, 0 },
-};
-
-unsigned32
-rtems_monitor_dump_state(States_Control state)
-{
-    unsigned32 length = 0;
-
-    if (state == STATES_READY)  /* assoc doesn't deal with this as it is 0 */
-        length += printf("READY");
-    
-    length += rtems_monitor_dump_assoc_bitfield(rtems_monitor_state_assoc,
-                                                ":",
-                                                state);
-    return length;
-}
-
-rtems_assoc_t rtems_monitor_attribute_assoc[] = {
-    { "FL",  RTEMS_FLOATING_POINT },
-    { "GL",  RTEMS_GLOBAL },
-    { "PR",  RTEMS_PRIORITY },
-    { "BI",  RTEMS_BINARY_SEMAPHORE },
-    { "IN",  RTEMS_INHERIT_PRIORITY },
-    { 0, 0, 0 },
-};
-
-unsigned32
-rtems_monitor_dump_attributes(rtems_attribute attributes)
-{
-    unsigned32 length = 0;
-
-    if (attributes == RTEMS_DEFAULT_ATTRIBUTES)  /* value is 0 */
-        length += printf("DEFAULT");
-    
-    length += rtems_monitor_dump_assoc_bitfield(rtems_monitor_attribute_assoc,
-                                                ":",
-                                                attributes);
-    return length;
-}
-
-rtems_assoc_t rtems_monitor_modes_assoc[] = {
-    { "nP",     RTEMS_NO_PREEMPT },
-    { "T",      RTEMS_TIMESLICE },
-    { "nA",     RTEMS_NO_ASR },
-    { 0, 0, 0 },
-};
-
-unsigned32
-rtems_monitor_dump_modes(rtems_mode modes)
-{
-    unsigned32 length = 0;
-
-    if (modes == RTEMS_DEFAULT_MODES)  /* value is 0 */
-        length += printf("P:T:nA");
-    
-    length += rtems_monitor_dump_assoc_bitfield(rtems_monitor_modes_assoc,
-                                                ":",
-                                                modes);
-    return length;
-}
-
-rtems_assoc_t rtems_monitor_events_assoc[] = {
-    { "0",   RTEMS_EVENT_0 },
-    { "1",   RTEMS_EVENT_1 },
-    { "2",   RTEMS_EVENT_2 },
-    { "3",   RTEMS_EVENT_3 },
-    { "4",   RTEMS_EVENT_4 },
-    { "5",   RTEMS_EVENT_5 },
-    { "6",   RTEMS_EVENT_6 },
-    { "7",   RTEMS_EVENT_7 },
-    { "8",   RTEMS_EVENT_8 },
-    { "9",   RTEMS_EVENT_9 },
-    { "10",  RTEMS_EVENT_10 },
-    { "11",  RTEMS_EVENT_11 },
-    { "12",  RTEMS_EVENT_12 },
-    { "13",  RTEMS_EVENT_13 },
-    { "14",  RTEMS_EVENT_14 },
-    { "15",  RTEMS_EVENT_15 },
-    { "16",  RTEMS_EVENT_16 },
-    { "17",  RTEMS_EVENT_17 },
-    { "18",  RTEMS_EVENT_18 },
-    { "19",  RTEMS_EVENT_19 },
-    { "20",  RTEMS_EVENT_20 },
-    { "21",  RTEMS_EVENT_21 },
-    { "22",  RTEMS_EVENT_22 },
-    { "23",  RTEMS_EVENT_23 },
-    { "24",  RTEMS_EVENT_24 },
-    { "25",  RTEMS_EVENT_25 },
-    { "26",  RTEMS_EVENT_26 },
-    { "27",  RTEMS_EVENT_27 },
-    { "28",  RTEMS_EVENT_28 },
-    { "29",  RTEMS_EVENT_29 },
-    { "30",  RTEMS_EVENT_30 },
-    { "31",  RTEMS_EVENT_31 },
-    { 0, 0, 0 },
-};
-
-unsigned32
-rtems_monitor_dump_events(rtems_event_set events)
-{
-    unsigned32 length = 0;
-
-    if (events == EVENT_SETS_NONE_PENDING)  /* value is 0 */
-        length += printf("NONE");
-    
-    length += rtems_monitor_dump_assoc_bitfield(rtems_monitor_events_assoc,
-                                                ":",
-                                                events);
-    return length;
-}
-
-unsigned32
-rtems_monitor_dump_notepad(unsigned32 *notepad)
-{
-    unsigned32 length = 0;
-    int i;
-
-    for (i=0; i < RTEMS_NUMBER_NOTEPADS; i++)
-        if (notepad[i])
-            length += printf("%d: 0x%x ", i, notepad[i]);
-
-    return length;
-}
diff --git a/cpukit/libmisc/monitor/mon-queue.c b/cpukit/libmisc/monitor/mon-queue.c
deleted file mode 100644
index b165062e28..0000000000
--- a/cpukit/libmisc/monitor/mon-queue.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- *  $Id$
- */
-
-#include <rtems.h>
-#include <rtems/monitor.h>
-
-#include <stdio.h>
-
-void
-rtems_monitor_queue_canonical(
-    rtems_monitor_queue_t *canonical_queue,
-    void                  *queue_void
-)
-{
-    Message_queue_Control *rtems_queue = (Message_queue_Control *) queue_void;
-
-    canonical_queue->attributes = rtems_queue->attribute_set;
-    canonical_queue->maximum_message_size = rtems_queue->message_queue.maximum_message_size;
-    canonical_queue->maximum_pending_messages = rtems_queue->message_queue.maximum_pending_messages;
-    canonical_queue->number_of_pending_messages = rtems_queue->message_queue.number_of_pending_messages;
-}
-
-void
-rtems_monitor_queue_dump_header(
-    boolean verbose
-)
-{
-    printf("\
-  ID       NAME   ATTRIBUTES   PEND   MAXPEND  MAXSIZE\n");
-/*23456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789
-0         1         2         3         4         5         6         7       */
-    rtems_monitor_separator();
-}
-
-
-/*
- * Dump out the "next" queue indicated by 'id'.
- * Returns next one to check.
- * Returns RTEMS_OBJECT_ID_FINAL when all done
- */
-
-void
-rtems_monitor_queue_dump(
-    rtems_monitor_queue_t *monitor_queue,
-    boolean  verbose
-)
-{
-    unsigned32            length = 0;
-
-    length += rtems_monitor_dump_id(monitor_queue->id);
-    length += rtems_monitor_pad(11, length);
-    length += rtems_monitor_dump_name(monitor_queue->name);
-    length += rtems_monitor_pad(19, length);
-    length += rtems_monitor_dump_attributes(monitor_queue->attributes);
-    length += rtems_monitor_pad(31, length);
-    length += rtems_monitor_dump_decimal(monitor_queue->number_of_pending_messages);
-    length += rtems_monitor_pad(39, length);
-    length += rtems_monitor_dump_decimal(monitor_queue->maximum_pending_messages);
-    length += rtems_monitor_pad(48, length);
-    length += rtems_monitor_dump_decimal(monitor_queue->maximum_message_size);
-
-    printf("\n");
-}
diff --git a/cpukit/libmisc/monitor/mon-server.c b/cpukit/libmisc/monitor/mon-server.c
deleted file mode 100644
index 3ae56058d3..0000000000
--- a/cpukit/libmisc/monitor/mon-server.c
+++ /dev/null
@@ -1,303 +0,0 @@
-/*
- * RTEMS monitor server (handles requests for info from RTEMS monitors
- *             running on other nodes)
- *
- *  $Id$
- */
-
-#include <rtems.h>
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#include <rtems/monitor.h>
-
-/*
- * Various id's for the server
- */
-
-rtems_id  rtems_monitor_server_task_id;
-rtems_id  rtems_monitor_server_request_queue_id;	/* our server */
-rtems_id *rtems_monitor_server_request_queue_ids;       /* all servers */
-rtems_id  rtems_monitor_server_response_queue_id;       /* our server */
-
-
-/*
- * Send a request to a server task
- */
-
-rtems_status_code
-rtems_monitor_server_request(
-    unsigned32                       server_node,
-    rtems_monitor_server_request_t  *request,
-    rtems_monitor_server_response_t *response
-)
-{
-    rtems_id          server_id;
-    rtems_status_code status;
-    unsigned32        size;
-
-    /*
-     * What is id of monitor on target node?
-     * Look it up if we don't know it yet.
-     */
-    
-    server_id = rtems_monitor_server_request_queue_ids[server_node];
-    if (server_id == 0)
-    {
-        status = rtems_message_queue_ident(RTEMS_MONITOR_QUEUE_NAME,
-                                           server_node,
-                                           &server_id);
-        if (status != RTEMS_SUCCESSFUL)
-        {
-            rtems_error(status, "ident of remote server failed");
-            goto done;
-        }
-        
-        rtems_monitor_server_request_queue_ids[server_node] = server_id;
-    }
-
-    request->return_id = rtems_monitor_server_response_queue_id;
-
-    status = rtems_message_queue_send(server_id, request, sizeof(*request));
-    if (status != RTEMS_SUCCESSFUL)
-    {
-        rtems_error(status, "monitor server request send failed");
-        goto done;
-    }
-    
-    /*
-     * Await response, if requested
-     */
-
-    if (response)
-    {
-        status = rtems_message_queue_receive(rtems_monitor_server_response_queue_id,
-                                             response,
-                                             &size,
-                                             RTEMS_WAIT,
-                                             100);
-        if (status != RTEMS_SUCCESSFUL)
-        {
-            rtems_error(status, "server did not respond");
-
-            /* maybe server task was restarted; look it up again next time */
-            rtems_monitor_server_request_queue_ids[server_node] = 0;
-
-            goto done;
-        }
-
-        if (response->command != RTEMS_MONITOR_SERVER_RESPONSE)
-        {
-            status = RTEMS_INCORRECT_STATE;
-            goto done;
-        }            
-    }
-    
-done:
-    return status;
-}
-
-
-
-/*
- * monitor server task
- */
-
-void
-rtems_monitor_server_task(
-    rtems_task_argument monitor_flags
-)
-{
-    rtems_monitor_server_request_t  request;
-    rtems_monitor_server_response_t response;
-    rtems_status_code               status;
-    unsigned32                      size;
-
-    for (;;)
-    {
-        status = rtems_message_queue_receive(
-                        rtems_monitor_server_request_queue_id,
-                        &request,
-                        &size,
-                        RTEMS_WAIT,
-                        (rtems_interval) 0);
-
-        if (status != RTEMS_SUCCESSFUL)
-        {
-            rtems_error(status, "monitor server msg queue receive error");
-            goto failed;
-        }
-                                             
-        if (size != sizeof(request))
-        {
-            rtems_error(0, "monitor server bad size on receive");
-            goto failed;
-        }
-        
-        switch (request.command)
-        {
-            case RTEMS_MONITOR_SERVER_CANONICAL:
-            {
-                rtems_monitor_object_type_t object_type;
-                rtems_id            id;
-                rtems_id            next_id;
-
-                object_type = (rtems_monitor_object_type_t) request.argument0;
-                id          = (rtems_id)            request.argument1;
-                next_id = rtems_monitor_object_canonical_get(object_type,
-                                                             id,
-                                                             &response.payload,
-                                                             &size);
-
-                response.command = RTEMS_MONITOR_SERVER_RESPONSE;
-                response.result0 = next_id;
-                response.result1 = size;
-
-#define SERVER_OVERHEAD  (RTEMS_offsetof(rtems_monitor_server_response_t, \
-                                         payload))
-                    
-                status = rtems_message_queue_send(request.return_id,
-                                                  &response,
-                                                  size + SERVER_OVERHEAD);
-                if (status != RTEMS_SUCCESSFUL)
-                {
-                    rtems_error(status, "response send failed");
-                    goto failed;
-                }
-                break;
-            }
-
-            default:
-            {
-                rtems_error(0, "invalid command to monitor server: %d", request.command);
-                goto failed;
-            }
-        }
-    }
-
-failed:
-    rtems_task_delete(RTEMS_SELF);
-}
-
-    
-/*
- * Kill off any old server
- * Not sure if this is useful, but it doesn't help
- */
-
-void
-rtems_monitor_server_kill(void)
-{
-    if (rtems_monitor_server_task_id)
-        rtems_task_delete(rtems_monitor_server_task_id);
-    rtems_monitor_task_id = 0;
-
-    if (rtems_monitor_server_request_queue_id)
-        rtems_message_queue_delete(rtems_monitor_server_request_queue_id);
-    rtems_monitor_server_response_queue_id = 0;
-
-    if (rtems_monitor_server_response_queue_id)
-        rtems_message_queue_delete(rtems_monitor_server_response_queue_id);
-    rtems_monitor_server_request_queue_ids = 0;
-
-    if (rtems_monitor_server_request_queue_ids)
-        free(rtems_monitor_server_request_queue_ids);
-    rtems_monitor_server_request_queue_ids = 0;
-}
-
-
-void
-rtems_monitor_server_init(
-    unsigned32 monitor_flags
-)
-{
-    rtems_status_code status;
-    
-    if (_System_state_Is_multiprocessing    &&
-        (_Configuration_MP_table->maximum_nodes > 1))
-    {
-        unsigned32 maximum_nodes = _Configuration_MP_table->maximum_nodes;
-        
-        /*
-         * create the msg que our server will listen
-         * Since we only get msgs from other RTEMS monitors, we just
-         * need reserve space for 1 msg from each node.
-         */
-
-        status = rtems_message_queue_create(
-                       RTEMS_MONITOR_QUEUE_NAME,
-                       maximum_nodes,
-                       sizeof(rtems_monitor_server_request_t),
-                       RTEMS_GLOBAL,
-                       &rtems_monitor_server_request_queue_id);
-        
-        if (status != RTEMS_SUCCESSFUL)
-        {
-            rtems_error(status, "could not create monitor server message queue");
-            goto done;
-        }
-          
-        /*
-         * create the msg que our responses will come on
-         * Since monitor just does one thing at a time, we only need 1 item
-         * message queue.
-         */
-        
-        status = rtems_message_queue_create(
-                       RTEMS_MONITOR_RESPONSE_QUEUE_NAME,
-                       1, /* depth */
-                       sizeof(rtems_monitor_server_response_t),
-                       RTEMS_GLOBAL,
-                       &rtems_monitor_server_response_queue_id);
-        
-        if (status != RTEMS_SUCCESSFUL)
-        {
-            rtems_error(status, "could not create monitor response message queue");
-            goto done;
-        }
-          
-        /* need an id for queue of each other server we might talk to */
-        /* indexed by node, so add 1 to maximum_nodes */
-        rtems_monitor_server_request_queue_ids =
-                   (rtems_id *) malloc((maximum_nodes + 1) * sizeof(rtems_id));
-        (void) memset(rtems_monitor_server_request_queue_ids,
-                      0,
-                      (maximum_nodes + 1) * sizeof(rtems_id));
-
-        rtems_monitor_server_request_queue_ids[rtems_monitor_node] =
-                   rtems_monitor_server_request_queue_id;
-
-        /*
-         * create the server task
-         */
-        status = rtems_task_create(RTEMS_MONITOR_SERVER_NAME,
-                                   1,
-                                   0 /* default stack */,
-                                   RTEMS_INTERRUPT_LEVEL(0),
-                                   RTEMS_DEFAULT_ATTRIBUTES,
-                                   &rtems_monitor_server_task_id);
-        if (status != RTEMS_SUCCESSFUL)
-        {
-            rtems_error(status, "could not create monitor server task");
-            goto done;
-        }
-
-        /*
-         * Start the server task
-         */
-        status = rtems_task_start(rtems_monitor_server_task_id,
-                                  rtems_monitor_server_task,
-                                  monitor_flags);
-        if (status != RTEMS_SUCCESSFUL)
-        {
-            rtems_error(status, "could not start monitor server");
-            goto done;
-        }
-    }
-
-done:
-    return;
-}
diff --git a/cpukit/libmisc/monitor/mon-symbols.c b/cpukit/libmisc/monitor/mon-symbols.c
deleted file mode 100644
index 48781bb6cc..0000000000
--- a/cpukit/libmisc/monitor/mon-symbols.c
+++ /dev/null
@@ -1,487 +0,0 @@
-/*
- *  File:	symbols.c
- *
- *  Description:
- *    Symbol table manager for the RTEMS monitor.
- *    These routines may be used by other system resources also.
- *
- *
- *  TODO:
- *
- *  $Id$
- */
-
-/* for strcasecmp in linux and solaris */
-#if defined(__linux__)
-#include <features.h>
-#define __USE_BSD
-#endif
-#include <string.h>
-
-#define __RTEMS_VIOLATE_KERNEL_VISIBILITY__
-#include <rtems.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <rtems/monitor.h>
-#include <rtems/symbols.h>
-
-
-rtems_symbol_table_t *
-rtems_symbol_table_create()
-{
-    rtems_symbol_table_t *table;
-
-    table = (rtems_symbol_table_t *) malloc(sizeof(rtems_symbol_table_t));
-    memset((void *) table, 0, sizeof(*table));
-
-    table->growth_factor = 30;          /* 30 percent */
-
-    return table;
-}
-
-void
-rtems_symbol_table_destroy(rtems_symbol_table_t *table)
-{
-    rtems_symbol_string_block_t *p, *pnext;
-
-    if (table)
-    {
-        if (table->addresses)
-            (void) free(table->addresses);
-        table->addresses = 0;
-        p = table->string_buffer_head;
-        while (p)
-        {
-            pnext = p->next;
-            free(p);
-            p = pnext;
-        }
-        table->string_buffer_head = 0;
-        table->string_buffer_current = 0;
-
-        free(table);
-    }
-}
-
-rtems_symbol_t *
-rtems_symbol_create(
-    rtems_symbol_table_t *table,
-    char                 *name,
-    rtems_unsigned32     value
-    )
-{
-    int symbol_length;
-    size_t newsize;
-    rtems_symbol_t *sp;
-
-    symbol_length = strlen(name) + 1;   /* include '\000' in length */
-
-    /* need to grow the table? */
-    if (table->next >= table->size)
-    {
-        if (table->size == 0)
-            newsize = 100;
-        else
-            newsize = table->size + (table->size / (100 / table->growth_factor));
-
-        table->addresses = (rtems_symbol_t *) realloc((void *) table->addresses, newsize * sizeof(rtems_symbol_t));
-        if (table->addresses == 0)        /* blew it; lost orig */
-            goto failed;
-        table->size = newsize;
-    }
-
-    sp = &table->addresses[table->next];
-    sp->value = value;
-
-    /* Have to add it to string pool */
-    /* need to grow pool? */
-
-    if ((table->string_buffer_head == 0) ||
-        (table->strings_next + symbol_length) >= SYMBOL_STRING_BLOCK_SIZE)
-    {
-        rtems_symbol_string_block_t *p;
-
-        p = (rtems_symbol_string_block_t *) malloc(sizeof(rtems_symbol_string_block_t));
-        if (p == 0)
-            goto failed;
-        p->next = 0;
-        if (table->string_buffer_head == 0)
-            table->string_buffer_head = p;
-        else
-            table->string_buffer_current->next = p;
-        table->string_buffer_current = p;
-
-        table->strings_next = 0;
-    }
-
-    sp->name = table->string_buffer_current->buffer + table->strings_next;
-    (void) strcpy(sp->name, name);
-
-    table->strings_next += symbol_length;
-    table->sorted = 0;
-    table->next++;
-
-    return sp;
-
-/* XXX Not sure what to do here.  We've possibly destroyed the initial
-   symbol table due to realloc failure */
-failed:
-    return 0;
-}
-
-/*
- * Qsort entry point for compare by address
- */
-
-static int
-rtems_symbol_compare(const void *e1,
-                     const void *e2)
-{
-    rtems_symbol_t *s1, *s2;
-    s1 = (rtems_symbol_t *) e1;
-    s2 = (rtems_symbol_t *) e2;
-
-    if (s1->value < s2->value)
-        return -1;
-    if (s1->value > s2->value)
-        return 1;
-    return 0;
-}
-
-
-/*
- * Sort the symbol table using qsort
- */
-
-static void
-rtems_symbol_sort(rtems_symbol_table_t *table)
-{
-    qsort((void *) table->addresses, (size_t) table->next,
-          sizeof(rtems_symbol_t), rtems_symbol_compare);
-    table->sorted = 1;
-}
-
-
-/*
- * Search the symbol table by address
- * This code based on CYGNUS newlib bsearch, but changed
- * to allow for finding closest symbol <= key
- */
-
-rtems_symbol_t *
-rtems_symbol_value_lookup(
-    rtems_symbol_table_t *table,
-    rtems_unsigned32      value
-  )
-{
-    rtems_symbol_t *sp;
-    rtems_symbol_t *base;
-    rtems_symbol_t *best = 0;
-    rtems_unsigned32 distance;
-    rtems_unsigned32 best_distance = ~0;
-    rtems_unsigned32 elements;
-
-    if (table == 0)
-        table = rtems_monitor_symbols;
-
-    if ((table == 0) || (table->size == 0))
-        return 0;
-
-    if (table->sorted == 0)
-        rtems_symbol_sort(table);
-
-    base = table->addresses;
-    elements = table->next;
-
-    while (elements)
-    {
-        sp = base + (elements / 2);
-        if (value < sp->value)
-            elements /= 2;
-        else if (value > sp->value)
-        {
-            distance = value - sp->value;
-            if (distance < best_distance)
-            {
-                best_distance = distance;
-                best = sp;
-            }
-            base = sp + 1;
-            elements = (elements / 2) - (elements % 2 ? 0 : 1);
-        }
-        else
-            return sp;
-    }
-
-    if (value == base->value)
-        return base;
-
-    return best;
-}
-
-/*
- * Search the symbol table for the exact matching address.
- * If the symbol table has already been sorted, then
- * call the regular symbol value lookup, however, it it
- * has not yet been sorted, search it sequentially.
- * This routine is primarily used for low level symbol
- * lookups (eg. from exception handler and interrupt routines)
- * where the penality of sorted is not wanted and where
- * an exact match is needed such that symbol table order
- * is not important.
- */
-const rtems_symbol_t *
-rtems_symbol_value_lookup_exact(
-    rtems_symbol_table_t *table,
-    rtems_unsigned32      value
-  )
-{
-    rtems_unsigned32 s;
-    rtems_symbol_t *sp;
-
-    if (table == 0)
-    {
-        table = rtems_monitor_symbols;
-        if (table == 0)
-            return NULL;
-    }
-    
-    if (table->sorted)
-    {
-        sp = rtems_symbol_value_lookup(table, value);
-        if ( rtems_symbol_value(sp) == value )
-            return sp;
-        else
-            return NULL;  /* not an exact match */
-    }
- 
-    for (s = 0, sp = table->addresses; s < table->next; s++, sp++)
-    {
-        if ( sp->value == value )
-            return sp;
-    }
-
-    return NULL;
-
-}
-
-
-/*
- * Search the symbol table by string name (case independent)
- */
-
-rtems_symbol_t *
-rtems_symbol_name_lookup(
-    rtems_symbol_table_t *table,
-    char                 *name
-  )
-{
-    rtems_unsigned32 s;
-    rtems_symbol_t *sp;
-
-    if (table == 0)
-    {
-        table = rtems_monitor_symbols;
-        if (table == 0)
-            return NULL;
-    }
-    
-    for (s = 0, sp = table->addresses; s < table->next; s++, sp++)
-    {
-        if ( strcasecmp(sp->name, name) == 0 )
-            return sp;
-    }
-
-    return NULL;
-}
-
-void *
-rtems_monitor_symbol_next(
-    void                   *object_info,
-    rtems_monitor_symbol_t *canonical,
-    rtems_id               *next_id
-)
-{
-    rtems_symbol_table_t *table;
-    rtems_unsigned32 n = rtems_get_index(*next_id);
-
-    table = *(rtems_symbol_table_t **) object_info;
-    if (table == 0)
-        goto failed;
-
-    if (n >= table->next)
-        goto failed;
-
-    /* NOTE: symbols do not have id and name fields */
-      
-    if (table->sorted == 0)
-        rtems_symbol_sort(table);
-
-    _Thread_Disable_dispatch();
-
-    *next_id += 1;
-    return (void *) (table->addresses + n);
-
-failed:
-    *next_id = RTEMS_OBJECT_ID_FINAL;
-    return 0;
-}
-
-void
-rtems_monitor_symbol_canonical(
-    rtems_monitor_symbol_t *canonical_symbol,
-    rtems_symbol_t *sp
-)
-{
-    canonical_symbol->value = sp->value;
-    canonical_symbol->offset = 0;
-    strncpy(canonical_symbol->name, sp->name, sizeof(canonical_symbol->name));
-}
-
-
-void
-rtems_monitor_symbol_canonical_by_name(
-    rtems_monitor_symbol_t *canonical_symbol,
-    char                   *name
-)
-{
-    rtems_symbol_t *sp;
-
-    sp = rtems_symbol_name_lookup(0, name);
-
-    canonical_symbol->value = sp ? sp->value : 0;
-
-    strncpy(canonical_symbol->name, name, sizeof(canonical_symbol->name));
-    canonical_symbol->offset = 0;
-}
-
-void
-rtems_monitor_symbol_canonical_by_value(
-    rtems_monitor_symbol_t *canonical_symbol,
-    void                   *value_void_p
-)
-{
-    unsigned32 value = (unsigned32) value_void_p;
-    rtems_symbol_t *sp;
-
-    sp = rtems_symbol_value_lookup(0, value);
-    if (sp)
-    {
-        canonical_symbol->value = sp->value;
-        canonical_symbol->offset = value - sp->value;
-        strncpy(canonical_symbol->name, sp->name, sizeof(canonical_symbol->name));
-    }
-    else
-    {
-        canonical_symbol->value = value;
-        canonical_symbol->offset = 0;
-        canonical_symbol->name[0] = '\0';
-    }
-}
-
-
-unsigned32
-rtems_monitor_symbol_dump(
-    rtems_monitor_symbol_t *canonical_symbol,
-    boolean                 verbose
-)
-{
-    unsigned32 length = 0;
-
-    /*
-     * print the name if it exists AND if value is non-zero
-     * Ie: don't print some garbage symbol for address 0
-     */
-
-    if (canonical_symbol->name[0] && (canonical_symbol->value != 0))
-    {
-        if (canonical_symbol->offset == 0)
-            length += printf("%.*s",
-                             (int) sizeof(canonical_symbol->name),
-                             canonical_symbol->name);
-        else
-            length += printf("<%.*s+0x%x>",
-                             (int) sizeof(canonical_symbol->name),
-                             canonical_symbol->name,
-                             canonical_symbol->offset);
-        if (verbose)
-            length += printf(" [0x%x]", canonical_symbol->value);
-    }
-    else
-        length += printf("[0x%x]", canonical_symbol->value);
-
-    return length;
-}
-
-
-void
-rtems_monitor_symbol_dump_all(
-    rtems_symbol_table_t *table,
-    boolean               verbose
-)
-{
-    rtems_unsigned32 s;
-    rtems_symbol_t *sp;
-
-    if (table == 0)
-    {
-        table = rtems_monitor_symbols;
-        if (table == 0)
-            return;
-    }
-
-    if (table->sorted == 0)
-        rtems_symbol_sort(table);
-
-    for (s = 0, sp = table->addresses; s < table->next; s++, sp++)
-    {
-        rtems_monitor_symbol_t canonical_symbol;
-
-        rtems_monitor_symbol_canonical(&canonical_symbol, sp);
-        rtems_monitor_symbol_dump(&canonical_symbol, TRUE);
-        printf("\n");
-    }
-}
-
-
-/*
- * 'symbol' command
- */
-
-void
-rtems_monitor_symbol_cmd(
-    int        argc,
-    char     **argv,
-    unsigned32 command_arg,
-    boolean    verbose
-)
-{
-    int arg;
-    rtems_symbol_table_t *table;
-
-    table = *(rtems_symbol_table_t **) command_arg;
-    if (table == 0)
-    {
-        table = rtems_monitor_symbols;
-        if (table == 0)
-            return;
-    }
-
-    /*
-     * Use object command to dump out whole symbol table
-     */
-    if (argc == 1)
-        rtems_monitor_symbol_dump_all(table, verbose);
-    else
-    {
-        rtems_monitor_symbol_t canonical_symbol;
-
-        for (arg=1; argv[arg]; arg++)
-        {
-            rtems_monitor_symbol_canonical_by_name(&canonical_symbol, argv[arg]);
-            rtems_monitor_symbol_dump(&canonical_symbol, verbose);
-            printf("\n");
-        }
-    }
-}
diff --git a/cpukit/libmisc/monitor/mon-task.c b/cpukit/libmisc/monitor/mon-task.c
deleted file mode 100644
index b6ca36ddd1..0000000000
--- a/cpukit/libmisc/monitor/mon-task.c
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * RTEMS Monitor task support
- *
- *  $Id$
- */
-
-#include <rtems.h>
-#include <rtems/monitor.h>
-
-#include <stdio.h>
-#include <string.h>    /* memcpy() */
-
-void
-rtems_monitor_task_canonical(
-    rtems_monitor_task_t  *canonical_task,
-    void                  *thread_void
-)
-{
-    Thread_Control       *rtems_thread = (Thread_Control *) thread_void;
-    RTEMS_API_Control    *api;
-
-    api = rtems_thread->API_Extensions[ THREAD_API_RTEMS ];
-    
-    canonical_task->entry = rtems_thread->Start.entry_point;
-    canonical_task->argument = rtems_thread->Start.numeric_argument;
-    canonical_task->stack = rtems_thread->Start.Initial_stack.area;
-    canonical_task->stack_size = rtems_thread->Start.Initial_stack.size;
-    canonical_task->priority = rtems_thread->current_priority;
-    canonical_task->state = rtems_thread->current_state;
-    canonical_task->wait_id = rtems_thread->Wait.id;
-    canonical_task->events = api->pending_events;
-
-/* XXX modes and attributes only exist in the RTEMS API .. */
-/* XXX not directly in the core thread.. they will have to be derived */
-/* XXX if they are important enough to include anymore.   */
-    canonical_task->modes = 0; /* XXX FIX ME.... rtems_thread->current_modes; */
-    canonical_task->attributes = 0 /* XXX FIX ME rtems_thread->API_Extensions[ THREAD_API_RTEMS ]->attribute_set */;
-    (void) memcpy(canonical_task->notepad, api ->Notepads, sizeof(canonical_task->notepad));
-/* XXX more to fix */
-/*
-    (void) memcpy(&canonical_task->wait_args, &rtems_thread->Wait.Extra, sizeof(canonical_task->wait_args));
-*/
-}
-
-
-void
-rtems_monitor_task_dump_header(
-    boolean verbose
-)
-{
-    printf("\
-  ID       NAME   PRIO   STAT   MODES  EVENTS   WAITID  WAITARG  NOTES\n");
-/*23456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789
-0         1         2         3         4         5         6         7       */
-           
-    rtems_monitor_separator();
-}
-
-/*
- */
-
-void
-rtems_monitor_task_dump(
-    rtems_monitor_task_t *monitor_task,
-    boolean  verbose
-)
-{
-    int length = 0;
-
-    length += rtems_monitor_dump_id(monitor_task->id);
-    length += rtems_monitor_pad(11, length);
-    length += rtems_monitor_dump_name(monitor_task->name);
-    length += rtems_monitor_pad(18, length);
-    length += rtems_monitor_dump_priority(monitor_task->priority);
-    length += rtems_monitor_pad(24, length);
-    length += rtems_monitor_dump_state(monitor_task->state);
-    length += rtems_monitor_pad(31, length);
-    length += rtems_monitor_dump_modes(monitor_task->modes);
-    length += rtems_monitor_pad(39, length);
-    length += rtems_monitor_dump_events(monitor_task->events);
-    if (monitor_task->wait_id)
-    {
-        length += rtems_monitor_pad(47, length);
-        length += rtems_monitor_dump_id(monitor_task->wait_id);
-        length += rtems_monitor_pad(57, length);
-        length += rtems_monitor_dump_hex(monitor_task->wait_args);
-    }
-
-    length += rtems_monitor_pad(65, length);
-    length += rtems_monitor_dump_notepad(monitor_task->notepad);
-    printf("\n");
-}
-
diff --git a/cpukit/libmisc/monitor/monitor.h b/cpukit/libmisc/monitor/monitor.h
deleted file mode 100644
index 16efd7c41f..0000000000
--- a/cpukit/libmisc/monitor/monitor.h
+++ /dev/null
@@ -1,443 +0,0 @@
-/*
- *  File:	monitor.h
- *
- *  Description:
- *    The RTEMS monitor task include file.
- *
- *  TODO:
- *
- *  $Id$
- */
-
-#ifndef __MONITOR_H
-#define __MONITOR_H
-
-#include <rtems/symbols.h>
-#include <rtems/error.h>		/* rtems_error() */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * Monitor types are derived from rtems object classes
- */
-
-typedef enum {
-    RTEMS_MONITOR_OBJECT_INVALID   =  OBJECTS_NO_CLASS,
-    RTEMS_MONITOR_OBJECT_TASK      =  OBJECTS_RTEMS_TASKS,
-    RTEMS_MONITOR_OBJECT_EXTENSION =  OBJECTS_RTEMS_EXTENSIONS,
-    RTEMS_MONITOR_OBJECT_QUEUE     =  OBJECTS_RTEMS_MESSAGE_QUEUES,
-    RTEMS_MONITOR_OBJECT_SEMAPHORE =  OBJECTS_RTEMS_SEMAPHORES,
-    RTEMS_MONITOR_OBJECT_PARTITION =  OBJECTS_RTEMS_PARTITIONS,
-    RTEMS_MONITOR_OBJECT_REGION    =  OBJECTS_RTEMS_REGIONS,
-    RTEMS_MONITOR_OBJECT_PORT      =  OBJECTS_RTEMS_PORTS,
-
-    /* following monitor objects are not known to RTEMS, but
-     * we like to have "types" for them anyway */
-    
-    RTEMS_MONITOR_OBJECT_DRIVER    =  OBJECTS_CLASSES_LAST+1,
-    RTEMS_MONITOR_OBJECT_DNAME,
-    RTEMS_MONITOR_OBJECT_CONFIG,
-    RTEMS_MONITOR_OBJECT_INIT_TASK,
-    RTEMS_MONITOR_OBJECT_MPCI,
-    RTEMS_MONITOR_OBJECT_SYMBOL
-} rtems_monitor_object_type_t;
-
-/*
- * rtems_monitor_init() flags
- */
-
-#define RTEMS_MONITOR_SUSPEND	0x0001		/* suspend monitor on startup */
-#define RTEMS_MONITOR_GLOBAL    0x0002          /* monitor should be global */
-
-
-/*
- * Public interfaces for RTEMS data structures monitor is aware of.
- * These are only used by the monitor.
- *
- * NOTE:
- *  All the canonical objects that correspond to RTEMS managed "objects"
- *  must have an identical first portion with 'id' and 'name' fields.
- *
- *  Others do not have that restriction, even tho we would like them to.
- *  This is because some of the canonical structures are almost too big
- *  for shared memory driver (eg: mpci) and we are nickel and diming it.
- */
-
-/*
- * Type of a pointer that may be a symbol
- */
-    
-#define MONITOR_SYMBOL_LEN 20
-typedef struct {
-    char       name[MONITOR_SYMBOL_LEN];
-    unsigned32 value;
-    unsigned32 offset;
-} rtems_monitor_symbol_t;    
-
-typedef struct {
-    rtems_id            id;
-    rtems_name          name;
-  /* end of common portion */
-} rtems_monitor_generic_t;        
-
-/*
- * Task
- */
-typedef struct {
-    rtems_id            id;
-    rtems_name          name;
-  /* end of common portion */
-    Thread_Entry        entry;
-    unsigned32          argument;
-    void               *stack;
-    unsigned32          stack_size;
-    rtems_task_priority priority;
-    States_Control      state;
-    rtems_event_set     events;
-    rtems_mode          modes;
-    rtems_attribute     attributes;
-    unsigned32          notepad[RTEMS_NUMBER_NOTEPADS];
-    rtems_id            wait_id;
-    unsigned32          wait_args;
-} rtems_monitor_task_t;
-
-/*
- * Init task
- */
-
-typedef struct {
-    rtems_id            id;		/* not really an id */
-    rtems_name          name;
-  /* end of common portion */
-    rtems_monitor_symbol_t entry;
-    unsigned32             argument;
-    unsigned32             stack_size;
-    rtems_task_priority    priority;
-    rtems_mode             modes;
-    rtems_attribute        attributes;
-} rtems_monitor_init_task_t;
-
-
-/*
- * Message queue
- */
-typedef struct {
-    rtems_id            id;
-    rtems_name          name;
-  /* end of common portion */
-    rtems_attribute     attributes;
-    unsigned32          number_of_pending_messages;
-    unsigned32          maximum_pending_messages;
-    unsigned32          maximum_message_size;
-} rtems_monitor_queue_t;
-
-/*
- * Extension
- */
-typedef struct {
-    rtems_id                 id;
-    rtems_name               name;
-  /* end of common portion */
-    rtems_monitor_symbol_t  e_create;
-    rtems_monitor_symbol_t  e_start;
-    rtems_monitor_symbol_t  e_restart;
-    rtems_monitor_symbol_t  e_delete;
-    rtems_monitor_symbol_t  e_tswitch;
-    rtems_monitor_symbol_t  e_begin;
-    rtems_monitor_symbol_t  e_exitted;
-    rtems_monitor_symbol_t  e_fatal;
-} rtems_monitor_extension_t;
-
-/*
- * Device driver
- */
-
-typedef struct {
-    rtems_id            id;		   /* not really an id (should be tho) */
-    rtems_name          name;              /* ditto */
-  /* end of common portion */
-    rtems_monitor_symbol_t initialization; /* initialization procedure */
-    rtems_monitor_symbol_t open;           /* open request procedure */
-    rtems_monitor_symbol_t close;          /* close request procedure */
-    rtems_monitor_symbol_t read;           /* read request procedure */
-    rtems_monitor_symbol_t write;          /* write request procedure */
-    rtems_monitor_symbol_t control;        /* special functions procedure */
-} rtems_monitor_driver_t;
-
-typedef struct {
-    rtems_id            id;		    /* not used for drivers (yet) */
-    rtems_name          name;               /* not used for drivers (yet) */
-  /* end of common portion */
-    unsigned32          major;
-    unsigned32          minor;
-    char                name_string[64];
-} rtems_monitor_dname_t;
-
-/*
- * System config
- */
-
-typedef struct {
-    void               *work_space_start;
-    unsigned32          work_space_size;
-    unsigned32          maximum_tasks;
-    unsigned32          maximum_timers;
-    unsigned32          maximum_semaphores;
-    unsigned32          maximum_message_queues;
-    unsigned32          maximum_partitions;
-    unsigned32          maximum_regions;
-    unsigned32          maximum_ports;
-    unsigned32          maximum_periods;
-    unsigned32          maximum_extensions;
-    unsigned32          microseconds_per_tick;
-    unsigned32          ticks_per_timeslice;
-    unsigned32          number_of_initialization_tasks;
-} rtems_monitor_config_t;
-
-/*
- * MPCI config
- */
-
-typedef struct {
-    unsigned32  node;                   /* local node number */
-    unsigned32  maximum_nodes;          /* maximum # nodes in system */
-    unsigned32  maximum_global_objects; /* maximum # global objects */
-    unsigned32  maximum_proxies;        /* maximum # proxies */
-
-    unsigned32               default_timeout;        /* in ticks */
-    unsigned32               maximum_packet_size;
-    rtems_monitor_symbol_t   initialization;
-    rtems_monitor_symbol_t   get_packet;
-    rtems_monitor_symbol_t   return_packet;
-    rtems_monitor_symbol_t   send_packet;
-    rtems_monitor_symbol_t   receive_packet;
-} rtems_monitor_mpci_t;
-
-/*
- * The generic canonical information union
- */
-
-typedef union {
-    rtems_monitor_generic_t    generic;
-    rtems_monitor_task_t       task;
-    rtems_monitor_queue_t      queue;
-    rtems_monitor_extension_t  extension;
-    rtems_monitor_driver_t     driver;
-    rtems_monitor_dname_t      dname;
-    rtems_monitor_config_t     config;
-    rtems_monitor_mpci_t       mpci;
-    rtems_monitor_init_task_t  itask;
-} rtems_monitor_union_t;
-
-/*
- * Support for talking to other monitors
- */
-
-/*
- * Names of other monitors
- */
-
-#define RTEMS_MONITOR_NAME        (rtems_build_name('R', 'M', 'O', 'N'))
-#define RTEMS_MONITOR_SERVER_NAME (rtems_build_name('R', 'M', 'S', 'V'))
-#define RTEMS_MONITOR_QUEUE_NAME  (rtems_build_name('R', 'M', 'S', 'Q'))
-#define RTEMS_MONITOR_RESPONSE_QUEUE_NAME (rtems_build_name('R', 'M', 'R', 'Q'))
-
-#define RTEMS_MONITOR_SERVER_RESPONSE    0x0001
-#define RTEMS_MONITOR_SERVER_CANONICAL   0x0002
-
-typedef struct
-{
-    unsigned32  command;
-    rtems_id    return_id;
-    unsigned32  argument0;
-    unsigned32  argument1;
-    unsigned32  argument2;
-    unsigned32  argument3;
-    unsigned32  argument4;
-    unsigned32  argument5;
-} rtems_monitor_server_request_t;
-
-typedef struct
-{
-    unsigned32  command;
-    unsigned32  result0;
-    unsigned32  result1;
-    rtems_monitor_union_t payload;
-} rtems_monitor_server_response_t;
-
-extern rtems_id  rtems_monitor_task_id;
-
-extern unsigned32 rtems_monitor_node;	       /* our node number */
-extern unsigned32 rtems_monitor_default_node;  /* current default for commands */
-
-/*
- * Monitor command function and table entry
- */
-
-typedef struct rtems_monitor_command_entry_s rtems_monitor_command_entry_t;
-
-typedef void ( *rtems_monitor_command_function_t )(
-                 int         argc,
-                 char      **argv,
-                 unsigned32  command_arg,
-                 boolean     verbose
-             );
-
-struct rtems_monitor_command_entry_s {
-    char        *command;      /* command name */
-    char        *usage;        /* usage string for the command */
-    unsigned32   arguments_required;    /* # of required args */
-    rtems_monitor_command_function_t command_function;
-
-                               /* Some argument for the command */
-    unsigned32          command_arg;
-};
-
-typedef void *(*rtems_monitor_object_next_fn)(void *, void *, rtems_id *);
-typedef void (*rtems_monitor_object_canonical_fn)(void *, void *);
-typedef void (*rtems_monitor_object_dump_header_fn)(boolean);
-typedef void (*rtems_monitor_object_dump_fn)(void *, boolean);
-
-typedef struct {
-    rtems_monitor_object_type_t         type;
-    void                               *object_information;
-    int                                 size;	/* of canonical object */
-    rtems_monitor_object_next_fn        next;
-    rtems_monitor_object_canonical_fn   canonical;
-    rtems_monitor_object_dump_header_fn dump_header;
-    rtems_monitor_object_dump_fn        dump;
-} rtems_monitor_object_info_t;
-
-
-/* monitor.c */
-void    rtems_monitor_kill(void);
-void    rtems_monitor_init(unsigned32);
-void    rtems_monitor_wakeup(void);
-void    rtems_monitor_pause_cmd(int, char **, unsigned32, boolean);
-void    rtems_monitor_fatal_cmd(int, char **, unsigned32, boolean);
-void    rtems_monitor_continue_cmd(int, char **, unsigned32, boolean);
-void    rtems_monitor_debugger_cmd(int, char **, unsigned32, boolean);
-void    rtems_monitor_node_cmd(int, char **, unsigned32, boolean);
-void    rtems_monitor_symbols_loadup(void);
-void    rtems_monitor_task(rtems_task_argument);
-
-/* server.c */
-void    rtems_monitor_server_kill(void);
-rtems_status_code rtems_monitor_server_request(unsigned32, rtems_monitor_server_request_t *, rtems_monitor_server_response_t *);
-void    rtems_monitor_server_task(rtems_task_argument);
-void    rtems_monitor_server_init(unsigned32);
-  
-/* command.c */
-int     rtems_monitor_make_argv(char *, int *, char **);
-int     rtems_monitor_command_read(char *, int *, char **);
-rtems_monitor_command_entry_t *rtems_monitor_command_lookup(
-    rtems_monitor_command_entry_t * table, int argc, char **argv);
-void    rtems_monitor_command_usage(rtems_monitor_command_entry_t *, char *);
-void    rtems_monitor_help_cmd(int, char **, unsigned32, boolean);
-
-/* prmisc.c */
-void       rtems_monitor_separator(void);
-unsigned32 rtems_monitor_pad(unsigned32 dest_col, unsigned32 curr_col);
-unsigned32 rtems_monitor_dump_char(unsigned8 ch);
-unsigned32 rtems_monitor_dump_decimal(unsigned32 num);
-unsigned32 rtems_monitor_dump_hex(unsigned32 num);
-unsigned32 rtems_monitor_dump_id(rtems_id id);
-unsigned32 rtems_monitor_dump_name(rtems_name name);
-unsigned32 rtems_monitor_dump_priority(rtems_task_priority priority);
-unsigned32 rtems_monitor_dump_state(States_Control state);
-unsigned32 rtems_monitor_dump_modes(rtems_mode modes);
-unsigned32 rtems_monitor_dump_attributes(rtems_attribute attributes);
-unsigned32 rtems_monitor_dump_events(rtems_event_set events);
-unsigned32 rtems_monitor_dump_notepad(unsigned32 *notepad);
-
-/* object.c */
-rtems_id   rtems_monitor_id_fixup(rtems_id, unsigned32, rtems_monitor_object_type_t);
-rtems_id   rtems_monitor_object_canonical_get(rtems_monitor_object_type_t, rtems_id, void *, unsigned32 *size_p);
-rtems_id   rtems_monitor_object_canonical_next(rtems_monitor_object_info_t *, rtems_id, void *);
-void      *rtems_monitor_object_next(void *, void *, rtems_id, rtems_id *);
-rtems_id   rtems_monitor_object_canonical(rtems_id, void *);
-void       rtems_monitor_object_cmd(int, char **, unsigned32, boolean);
-
-/* manager.c */
-void      *rtems_monitor_manager_next(void *, void *, rtems_id *);
-
-/* config.c */
-void       rtems_monitor_config_canonical(rtems_monitor_config_t *, void *);
-void      *rtems_monitor_config_next(void *, rtems_monitor_config_t *, rtems_id *);
-void       rtems_monitor_config_dump_header(boolean);
-void       rtems_monitor_config_dump(rtems_monitor_config_t *, boolean verbose);
-
-/* mpci.c */
-void       rtems_monitor_mpci_canonical(rtems_monitor_mpci_t *, void *);
-void      *rtems_monitor_mpci_next(void *, rtems_monitor_mpci_t *, rtems_id *);
-void       rtems_monitor_mpci_dump_header(boolean);
-void       rtems_monitor_mpci_dump(rtems_monitor_mpci_t *, boolean verbose);
-
-/* itask.c */
-void       rtems_monitor_init_task_canonical(rtems_monitor_init_task_t *, void *);
-void      *rtems_monitor_init_task_next(void *, rtems_monitor_init_task_t *, rtems_id *);
-void       rtems_monitor_init_task_dump_header(boolean);
-void       rtems_monitor_init_task_dump(rtems_monitor_init_task_t *, boolean verbose);
-
-/* extension.c */
-void       rtems_monitor_extension_canonical(rtems_monitor_extension_t *, void *);
-void       rtems_monitor_extension_dump_header(boolean verbose);
-void       rtems_monitor_extension_dump(rtems_monitor_extension_t *, boolean);
-
-/* task.c */
-void    rtems_monitor_task_canonical(rtems_monitor_task_t *, void *);
-void    rtems_monitor_task_dump_header(boolean verbose);
-void    rtems_monitor_task_dump(rtems_monitor_task_t *, boolean);
-
-/* queue.c */
-void    rtems_monitor_queue_canonical(rtems_monitor_queue_t *, void *);
-void    rtems_monitor_queue_dump_header(boolean verbose);
-void    rtems_monitor_queue_dump(rtems_monitor_queue_t *, boolean);
-
-/* driver.c */
-void    *rtems_monitor_driver_next(void *, rtems_monitor_driver_t *, rtems_id *);
-void     rtems_monitor_driver_canonical(rtems_monitor_driver_t *, void *);
-void     rtems_monitor_driver_dump_header(boolean);
-void     rtems_monitor_driver_dump(rtems_monitor_driver_t *, boolean);
-
-/* dname.c */
-void    *rtems_monitor_dname_next(void *, rtems_monitor_dname_t *, rtems_id *);
-void     rtems_monitor_dname_canonical(rtems_monitor_dname_t *, void *);
-void     rtems_monitor_dname_dump_header(boolean);
-void     rtems_monitor_dname_dump(rtems_monitor_dname_t *, boolean);
-
-/* symbols.c */
-rtems_symbol_table_t *rtems_symbol_table_create();
-void                  rtems_symbol_table_destroy(rtems_symbol_table_t *table);
-
-rtems_symbol_t *rtems_symbol_create(rtems_symbol_table_t *, char *, unsigned32);
-rtems_symbol_t *rtems_symbol_value_lookup(rtems_symbol_table_t *, unsigned32);
-const rtems_symbol_t *rtems_symbol_value_lookup_exact(rtems_symbol_table_t *, unsigned32);
-rtems_symbol_t *rtems_symbol_name_lookup(rtems_symbol_table_t *, char *);
-void   *rtems_monitor_symbol_next(void *object_info, rtems_monitor_symbol_t *, rtems_id *);
-void    rtems_monitor_symbol_canonical(rtems_monitor_symbol_t *, rtems_symbol_t *);
-void    rtems_monitor_symbol_canonical_by_name(rtems_monitor_symbol_t *, char *);
-void    rtems_monitor_symbol_canonical_by_value(rtems_monitor_symbol_t *, void *);
-unsigned32 rtems_monitor_symbol_dump(rtems_monitor_symbol_t *, boolean);
-void    rtems_monitor_symbol_cmd(int, char **, unsigned32, boolean);
-
-
-extern rtems_symbol_table_t *rtems_monitor_symbols;
-
-#ifndef MONITOR_PROMPT
-#define MONITOR_PROMPT "rtems"		/* will have '> ' appended */
-#endif
-
-#define MONITOR_WAKEUP_EVENT   RTEMS_EVENT_0
-
-
-#define STREQ(a,b)	(strcmp(a,b) == 0)
-#define STRNEQ(a,b,n)	(strncmp(a,b,n) == 0)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  /* ! __MONITOR_H */
diff --git a/cpukit/libmisc/monitor/symbols.h b/cpukit/libmisc/monitor/symbols.h
deleted file mode 100644
index 119c879d54..0000000000
--- a/cpukit/libmisc/monitor/symbols.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- *  RTEMS monitor symbol table functions
- *
- *  Description:
- *      Entry points for symbol table routines.
- *
- *
- *
- *  TODO:
- *
- *  $Id$
- */
-
-#ifndef _INCLUDE_SYMBOLS_H
-#define _INCLUDE_SYMBOLS_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct {
-    rtems_unsigned32 value;
-    char            *name;
-} rtems_symbol_t;
-
-#define SYMBOL_STRING_BLOCK_SIZE 4080
-typedef struct rtems_symbol_string_block_s {
-    struct rtems_symbol_string_block_s *next;
-    char   buffer[SYMBOL_STRING_BLOCK_SIZE];
-} rtems_symbol_string_block_t;
-
-typedef struct {
-
-    rtems_unsigned32 sorted;          /* are symbols sorted right now? */
-    rtems_unsigned32 growth_factor;   /* % to grow by when needed */
-    rtems_unsigned32 next;            /* next symbol slot to use when adding */
-    rtems_unsigned32 size;            /* max # of symbols */
-
-    /*
-     * Symbol list -- sorted by address (when we do a lookup)
-     */
-
-    rtems_symbol_t  *addresses;         /* symbol array by address */
-
-    /*
-     * String pool, unsorted, a list of blocks of string data
-     */
-
-    rtems_symbol_string_block_t *string_buffer_head;
-    rtems_symbol_string_block_t *string_buffer_current;
-    rtems_unsigned32 strings_next;      /* next byte to use in this block */
-
-} rtems_symbol_table_t;
-
-#define rtems_symbol_name(sp)   ((sp)->name)
-#define rtems_symbol_value(sp)  ((sp)->value)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* ! _INCLUDE_SYMBOLS_H */
diff --git a/cpukit/libmisc/rtmonuse/rtmonuse.c b/cpukit/libmisc/rtmonuse/rtmonuse.c
deleted file mode 100644
index 843d29468e..0000000000
--- a/cpukit/libmisc/rtmonuse/rtmonuse.c
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- *  $Id$
- */
-
-#include <rtems.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <assert.h>
-
-#include "rtmonuse.h"
-
-typedef struct {
-  rtems_id     id;
-  unsigned32   count;
-  unsigned32   missed_count;
-  unsigned32   min_cpu_time;
-  unsigned32   max_cpu_time;
-  unsigned32   total_cpu_time;
-  unsigned32   min_wall_time;
-  unsigned32   max_wall_time;
-  unsigned32   total_wall_time;
-}  Period_usage_t;
-
-Period_usage_t *Period_usage_Information;
-
-/*PAGE
- *
- *  Period_usage_Initialize
- */
-
-void Period_usage_Initialize( void )
-{
-  int             maximum;
-
-  maximum = _Configuration_Table->RTEMS_api_configuration->maximum_periods;
- 
-  Period_usage_Information = malloc( sizeof(Period_usage_t) * (maximum+1) );
-
-  Period_usage_Reset();
-}
-
-/*PAGE
- *
- *  Period_usage_Reset
- */
-
-void Period_usage_Reset( void )
-{
-  unsigned32      i;
-  Period_usage_t *the_usage;
-
-  for ( i=0 ;
-        i<_Configuration_Table->RTEMS_api_configuration->maximum_periods ;
-        i++ ) {
-    the_usage = &Period_usage_Information[ i ];
- 
-    the_usage->count           = 0;
-    the_usage->missed_count    = 0;
-    the_usage->min_cpu_time    = 0xFFFFFFFF;
-    the_usage->max_cpu_time    = 0;
-    the_usage->total_cpu_time  = 0;
-    the_usage->min_wall_time   = 0xFFFFFFFF;
-    the_usage->max_wall_time   = 0;
-    the_usage->total_wall_time = 0;
- 
-  }
-}
-
-/*PAGE
- *
- *  Period_usage_Update
- */
-
-void Period_usage_Update( 
-  rtems_id     id
-)
-{
-  rtems_rate_monotonic_period_status rm_status;
-  rtems_status_code                  status;
-  Period_usage_t                    *the_usage;
-
-  assert( Period_usage_Information );
-
-  status = rtems_rate_monotonic_get_status( id, &rm_status );
-  assert( status == RTEMS_SUCCESSFUL );
-
-  the_usage = &Period_usage_Information[ rtems_get_index( id ) ];
-
-  the_usage->id = id;
-  the_usage->count++;
-  if ( rm_status.state == RATE_MONOTONIC_EXPIRED )
-    the_usage->missed_count++;
-  the_usage->total_cpu_time  += rm_status.ticks_executed_since_last_period;
-  the_usage->total_wall_time += rm_status.ticks_since_last_period;
-
-  /*
-   *  Update CPU time
-   */
-
-  if ( rm_status.ticks_executed_since_last_period < the_usage->min_cpu_time )
-    the_usage->min_cpu_time = rm_status.ticks_executed_since_last_period;
-
-  if ( rm_status.ticks_executed_since_last_period > the_usage->max_cpu_time )
-    the_usage->max_cpu_time = rm_status.ticks_executed_since_last_period;
-
-  /*
-   *  Update Wall time
-   */
-
-  if ( rm_status.ticks_since_last_period < the_usage->min_wall_time )
-    the_usage->min_wall_time = rm_status.ticks_since_last_period;
-
-  if ( rm_status.ticks_since_last_period > the_usage->max_wall_time )
-    the_usage->max_wall_time = rm_status.ticks_since_last_period;
-
-}
-
-/*PAGE
- *
- *  Period_usage_Dump
- */
-
-void Period_usage_Dump( void )
-{
-  unsigned32              i;
-  Period_usage_t         *the_usage;
-  Rate_monotonic_Control *the_period;
-  unsigned32              u32_name;
-  char                    name[5];
- 
-  if ( !Period_usage_Information ) {
-    printf( "Period statistics library is not initialized\n" );
-    return;
-  }
-
-  printf( "Period information by period\n" ); 
-  printf( "   ID      OWNER   PERIODS  MISSED    CPU TIME    WALL TIME\n" );
-
-  /*
-   *  RTEMS does not use an index of zero for object ids.
-   */
-
-  for ( i=1 ;
-        i<_Configuration_Table->RTEMS_api_configuration->maximum_periods ;
-        i++ ) {
-    the_usage = &Period_usage_Information[ i ];
-    if ( the_usage->count == 0 )
-      continue;
-
-    the_period =
-      (Rate_monotonic_Control *)_Rate_monotonic_Information.local_table[ i ];
-
-    if ( the_period->owner )
-      u32_name = *(unsigned32 *)the_period->owner->Object.name;
-    else
-      u32_name = rtems_build_name(' ', ' ', ' ', ' ');
-
-    name[ 0 ] = (u32_name >> 24) & 0xff;
-    name[ 1 ] = (u32_name >> 16) & 0xff;
-    name[ 2 ] = (u32_name >>  8) & 0xff;
-    name[ 3 ] = (u32_name >>  0) & 0xff;
-    name[ 4 ] = '\0';
-
-    printf(
-      "0x%08x  %4s   %6d   %3d       %d/%d/%5.2f    %d/%d/%3.2f\n",
-      the_usage->id,
-      name,
-      the_usage->count,
-      the_usage->missed_count,
-      the_usage->min_cpu_time,
-      the_usage->max_cpu_time,
-      (double) the_usage->total_cpu_time / (double) the_usage->count,
-      the_usage->min_wall_time,
-      the_usage->max_wall_time,
-      (double) the_usage->total_wall_time / (double) the_usage->count
-    );
-  }
-}
diff --git a/cpukit/libmisc/rtmonuse/rtmonuse.h b/cpukit/libmisc/rtmonuse/rtmonuse.h
deleted file mode 100644
index f0580a4f0b..0000000000
--- a/cpukit/libmisc/rtmonuse/rtmonuse.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- *  $Id$
- */
-
-#ifndef __RATE_MONOTONIC_USAGE_h
-#define __RATE_MONOTONIC_USAGE_h
-
-void Period_usage_Initialize( void );
-
-void Period_usage_Reset( void );
-
-void Period_usage_Update( 
-  rtems_id     id
-);
-
-void Period_usage_Dump( void );
-
-#endif
diff --git a/cpukit/libmisc/stackchk/README b/cpukit/libmisc/stackchk/README
deleted file mode 100644
index 0f6e2f2b10..0000000000
--- a/cpukit/libmisc/stackchk/README
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-#  $Id$
-#
-
-Introduction
-============
-
-This directory contains a stack bounds checker.  It provides two
-primary features:
-
-   + check for stack overflow at each context switch
-   + provides an educated guess at each task's stack usage
-
-Enabling
-========
-
-Add the stack checker extension to the initial user extension set.
-If using confdefs.h to build your configuration table, this is
-as simple as adding -DSTACK_CHECK_ON to the gcc command line which
-compiles the file defining the configuration table.  In the RTEMS
-test suites and samples, this is always init.c
-
-Background
-==========
-
-The stack overflow check at context switch works by looking for
-a 16 byte pattern at the logical end of the stack to be corrupted.
-The "guesser" assumes that the entire stack was prefilled with a known
-pattern and assumes that the pattern is still in place if the memory
-has not been used as a stack.
-
-Both of these can be fooled by pushing large holes onto the stack
-and not writing to them... or (much more unlikely) writing the
-magic patterns into memory.
-
-This code has not been extensively tested.  It is provided as a tool
-for RTEMS users to catch the most common mistake in multitasking
-systems ... too little stack space.  Suggestions and comments are appreciated.
-
-NOTES:
-
-1.  Stack usage information is questionable on CPUs which push
-    large holes on stack.
-
-2.  The stack checker has a tendency to generate a fault when
-    trying to print the helpful diagnostic message.  If it comes
-    out, congratulations. If not, then the variable Stack_check_Blown_task
-    contains a pointer to the TCB of the offending task.  This
-    is usually enough to go on.
-
-FUTURE:
-
-1.  Determine how/if gcc will generate stack probe calls and support that.
-
-2.  Get accurate stack usage numbers on i960.. it pushes very large
-    holes on the stack.
diff --git a/cpukit/libmisc/stackchk/check.c b/cpukit/libmisc/stackchk/check.c
deleted file mode 100644
index 5bfb69bfb6..0000000000
--- a/cpukit/libmisc/stackchk/check.c
+++ /dev/null
@@ -1,535 +0,0 @@
-/*
- *  Stack Overflow Check User Extension Set
- *
- *  NOTE:  This extension set automatically determines at
- *         initialization time whether the stack for this
- *         CPU grows up or down and installs the correct
- *         extension routines for that direction.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- *
- */
-
-#include <rtems.h>
-
-/*
- * HACK
- * the stack dump information should be printed by a "fatal" extension.
- * Fatal extensions only get called via rtems_fatal_error_occurred()
- * and not when rtems_shutdown_executive() is called.
- * I hope/think this is changing so that fatal extensions are renamed
- * to "shutdown" extensions.
- * When that happens, this #define should be deleted and all the code
- * it marks.
- */
-#define DONT_USE_FATAL_EXTENSION
-
-
-extern rtems_configuration_table BSP_Configuration;
-
-#include <assert.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include "stackchk.h"
-#include "internal.h"
-
-/*
- *  This variable contains the name of the task which "blew" the stack.
- *  It is NULL if the system is all right.
- */
-
-Thread_Control *Stack_check_Blown_task;
-
-/*
- *  The extension table for the stack checker.
- */
-
-rtems_extensions_table Stack_check_Extension_table = {
-  Stack_check_Create_extension,     /* rtems_task_create  */
-  0,                                /* rtems_task_start   */
-  0,                                /* rtems_task_restart */
-  0,                                /* rtems_task_delete  */
-  Stack_check_Switch_extension,     /* task_switch  */
-  Stack_check_Begin_extension,      /* task_begin   */
-  0,                                /* task_exitted */
-#ifdef DONT_USE_FATAL_EXTENSION
-  0,                                /* fatal        */
-#else
-  Stack_check_Fatal_extension,      /* fatal        */
-#endif
-};
-
-/*
- *  The "magic pattern" used to mark the end of the stack.
- */
-
-Stack_check_Control Stack_check_Pattern;
-
-/*
- *  Where the pattern goes in the stack area is dependent upon
- *  whether the stack grow to the high or low area of the memory.
- *
- */
-
-#if ( CPU_STACK_GROWS_UP == TRUE )
-
-#define Stack_check_Get_pattern_area( _the_stack ) \
-  ((Stack_check_Control *) ((char *)(_the_stack)->area + \
-       (_the_stack)->size - sizeof( Stack_check_Control ) ))
-
-#define Stack_check_Calculate_used( _low, _size, _high_water ) \
-    ((char *)(_high_water) - (char *)(_low))
-
-#define Stack_check_usable_stack_start(_the_stack) \
-    ((_the_stack)->area)
-
-#else
-
-#define Stack_check_Get_pattern_area( _the_stack ) \
-  ((Stack_check_Control *) ((char *)(_the_stack)->area + HEAP_OVERHEAD))
-
-#define Stack_check_Calculate_used( _low, _size, _high_water) \
-    ( ((char *)(_low) + (_size)) - (char *)(_high_water) )
-
-#define Stack_check_usable_stack_start(_the_stack) \
-    ((char *)(_the_stack)->area + sizeof(Stack_check_Control))
-
-#endif
-
-#define Stack_check_usable_stack_size(_the_stack) \
-    ((_the_stack)->size - sizeof(Stack_check_Control))
-
-
-/*
- * Do we have an interrupt stack?
- * XXX it would sure be nice if the interrupt stack were also
- *     stored in a "stack" structure!
- */
-
-
-Stack_Control stack_check_interrupt_stack;
-
-/*
- * Prototypes necessary for forward references
- */
-
-void Stack_check_Dump_usage( void );
-
-/*
- * Fill an entire stack area with BYTE_PATTERN.
- * This will be used by a Fatal extension to check for
- * amount of actual stack used
- */
-
-void
-stack_check_dope_stack(Stack_Control *stack)
-{
-    memset(stack->area, BYTE_PATTERN, stack->size);
-}
-
-
-/*PAGE
- *
- *  Stack_check_Initialize
- */
-
-unsigned32 stack_check_initialized = 0;
-
-void Stack_check_Initialize( void )
-{
-#if 0
-  rtems_status_code    status;
-  Objects_Id           id_ignored;
-#endif
-  unsigned32          *p;
-#if 0
-  unsigned32           i;
-  unsigned32           class_index;
-  Thread_Control      *the_thread;
-  Objects_Information *information;
-#endif
-
-  if (stack_check_initialized)
-      return;
-
-  /*
-   * Dope the pattern and fill areas
-   */
-
-  for ( p = Stack_check_Pattern.pattern;
-        p < &Stack_check_Pattern.pattern[PATTERN_SIZE_WORDS];
-        p += 4
-      )
-  {
-      p[0] = 0xFEEDF00D;          /* FEED FOOD to BAD DOG */
-      p[1] = 0x0BAD0D06;
-      p[2] = 0xDEADF00D;          /* DEAD FOOD GOOD DOG */
-      p[3] = 0x600D0D06;
-  };
-
-#if 0
-  status = rtems_extension_create(
-    rtems_build_name( 'S', 'T', 'C', 'K' ),
-    &Stack_check_Extension_table,
-    &id_ignored
-  );
-  assert ( status == RTEMS_SUCCESSFUL );
-#endif
-
-  Stack_check_Blown_task = 0;
-
-  /*
-   * If installed by a task, that task will not get setup properly
-   * since it missed out on the create hook.  This will cause a
-   * failure on first switch out of that task.
-   * So pretend here that we actually ran create and begin extensions.
-   */
-
-  /* XXX
-   *
-   *  Technically this has not been done for any task created before this
-   *  happened.  So just run through them and fix the situation.
-   */
-#if 0
-  if (_Thread_Executing)
-  {
-      Stack_check_Create_extension(_Thread_Executing, _Thread_Executing);
-  }
-#endif
-
-#if 0
-  for ( class_index = OBJECTS_CLASSES_FIRST ;
-        class_index <= OBJECTS_CLASSES_LAST ;
-        class_index++ ) {
-    information = _Objects_Information_table[ class_index ];
-    if ( information && information->is_thread ) {
-      for ( i=1 ; i <= information->maximum ; i++ ) {
-        the_thread = (Thread_Control *)information->local_table[ i ];
-        Stack_check_Create_extension( the_thread, the_thread );
-      }
-    }
-  }
-#endif
-
-  /*
-   * If appropriate, setup the interrupt stack for high water testing
-   * also.
-   */
-  if (_CPU_Interrupt_stack_low && _CPU_Interrupt_stack_high)
-  {
-      stack_check_interrupt_stack.area = _CPU_Interrupt_stack_low;
-      stack_check_interrupt_stack.size = (char *) _CPU_Interrupt_stack_high -
-                                              (char *) _CPU_Interrupt_stack_low;
-
-      stack_check_dope_stack(&stack_check_interrupt_stack);
-  }
-
-#ifdef DONT_USE_FATAL_EXTENSION
-#ifdef RTEMS_DEBUG
-    /*
-     * this would normally be called by a fatal extension
-     * handler, but we don't run fatal extensions unless
-     * we fatal error.
-     */
-  atexit(Stack_check_Dump_usage);
-#endif
-#endif
-
-  stack_check_initialized = 1;
-}
-
-/*PAGE
- *
- *  Stack_check_Create_extension
- */
-
-boolean Stack_check_Create_extension(
-  Thread_Control *running,
-  Thread_Control *the_thread
-)
-{
-    if (!stack_check_initialized)
-      Stack_check_Initialize();
-
-    if (the_thread /* XXX && (the_thread != _Thread_Executing) */ )
-        stack_check_dope_stack(&the_thread->Start.Initial_stack);
-
-    return TRUE;
-}
-
-/*PAGE
- *
- *  Stack_check_Begin_extension
- */
-
-void Stack_check_Begin_extension(
-  Thread_Control *the_thread
-)
-{
-  Stack_check_Control  *the_pattern;
-
-  if (!stack_check_initialized)
-    Stack_check_Initialize();
-
-  if ( the_thread->Object.id == 0 )        /* skip system tasks */
-    return;
-
-  the_pattern = Stack_check_Get_pattern_area(&the_thread->Start.Initial_stack);
-
-  *the_pattern = Stack_check_Pattern;
-}
-
-/*PAGE
- *
- *  Stack_check_report_blown_task
- *  Report a blown stack.  Needs to be a separate routine
- *  so that interrupt handlers can use this too.
- *
- *  Caller must have set the Stack_check_Blown_task.
- *
- *  NOTE: The system is in a questionable state... we may not get
- *        the following message out.
- */
-
-void Stack_check_report_blown_task(void)
-{
-    Stack_Control *stack;
-    Thread_Control *running;
-
-    running = Stack_check_Blown_task;
-    stack = &running->Start.Initial_stack;
-
-    fprintf(
-        stderr,
-        "BLOWN STACK!!! Offending task(%p): id=0x%08x; name=0x%08x",
-        running,
-        running->Object.id,
-        *(unsigned32 *)running->Object.name
-    );
-    fflush(stderr);
-
-    if (BSP_Configuration.User_multiprocessing_table)
-        fprintf(
-          stderr,
-          "; node=%d\n",
-          BSP_Configuration.User_multiprocessing_table->node
-       );
-    else
-        fprintf(stderr, "\n");
-    fflush(stderr);
-
-    fprintf(
-        stderr,
-        "  stack covers range 0x%08x - 0x%08x (%d bytes)\n",
-        (unsigned32) stack->area,
-        (unsigned32) stack->area + stack->size - 1,
-        (unsigned32) stack->size);
-    fflush(stderr);
-
-    fprintf(
-        stderr,
-        "  Damaged pattern begins at 0x%08x and is %d bytes long\n",
-        (unsigned32) Stack_check_Get_pattern_area(stack), PATTERN_SIZE_BYTES);
-    fflush(stderr);
-
-    rtems_fatal_error_occurred( (unsigned32) "STACK BLOWN" );
-}
-
-/*PAGE
- *
- *  Stack_check_Switch_extension
- */
-
-void Stack_check_Switch_extension(
-  Thread_Control *running,
-  Thread_Control *heir
-)
-{
-  if ( running->Object.id == 0 )        /* skip system tasks */
-    return;
-
-  if (0 != memcmp( (void *) Stack_check_Get_pattern_area( &running->Start.Initial_stack)->pattern,
-                  (void *) Stack_check_Pattern.pattern,
-                  PATTERN_SIZE_BYTES))
-  {
-      Stack_check_Blown_task = running;
-      Stack_check_report_blown_task();
-  }
-}
-
-void *Stack_check_find_high_water_mark(
-  const void *s,
-  size_t n
-)
-{
-  const unsigned32 *base, *ebase;
-  unsigned32 length;
-
-  base = s;
-  length = n/4;
-
-#if ( CPU_STACK_GROWS_UP == TRUE )
-  /*
-   * start at higher memory and find first word that does not
-   * match pattern
-   */
-
-  base += length - 1;
-  for (ebase = s; base > ebase; base--)
-      if (*base != U32_PATTERN)
-          return (void *) base;
-#else
-  /*
-   * start at lower memory and find first word that does not
-   * match pattern
-   */
-
-  base += PATTERN_SIZE_WORDS;
-  for (ebase = base + length; base < ebase; base++)
-      if (*base != U32_PATTERN)
-          return (void *) base;
-#endif
-
-  return (void *)0;
-}
-
-/*PAGE
- *
- *  Stack_check_Dump_threads_usage
- *  Try to print out how much stack was actually used by the task.
- *
- */
-
-void Stack_check_Dump_threads_usage(
-  Thread_Control *the_thread
-)
-{
-  unsigned32      size, used;
-  void           *low;
-  void           *high_water_mark;
-  Stack_Control  *stack;
-  unsigned32      u32_name;
-  char            name[5];
-
-
-  if ( !the_thread )
-    return;
-
-  /*
-   * XXX HACK to get to interrupt stack
-   */
-
-  if (the_thread == (Thread_Control *) -1)
-  {
-      if (stack_check_interrupt_stack.area)
-      {
-          stack = &stack_check_interrupt_stack;
-          the_thread = 0;
-      }
-      else
-          return;
-  }
-  else
-      stack = &the_thread->Start.Initial_stack;
-
-  low  = Stack_check_usable_stack_start(stack);
-  size = Stack_check_usable_stack_size(stack);
-
-  high_water_mark = Stack_check_find_high_water_mark(low, size);
-
-  if ( high_water_mark )
-    used = Stack_check_Calculate_used( low, size, high_water_mark );
-  else
-    used = 0;
-
-  if ( the_thread )
-    u32_name = *(unsigned32 *)the_thread->Object.name;
-  else
-    u32_name = rtems_build_name('I', 'N', 'T', 'R');
-
-  name[ 0 ] = (u32_name >> 24) & 0xff;
-  name[ 1 ] = (u32_name >> 16) & 0xff;
-  name[ 2 ] = (u32_name >>  8) & 0xff;
-  name[ 3 ] = (u32_name >>  0) & 0xff;
-  name[ 4 ] = '\0';
-
-  printf( "0x%08x  %4s  0x%08x  0x%08x   %8d   %8d\n",
-          the_thread ? the_thread->Object.id : ~0,
-          name,
-          (unsigned32) stack->area,
-          (unsigned32) stack->area + (unsigned32) stack->size - 1,
-          size,
-          used
-  );
-}
-
-/*PAGE
- *
- *  Stack_check_Fatal_extension
- */
-
-void Stack_check_Fatal_extension(
-    Internal_errors_Source  source,
-    boolean                 is_internal,
-    unsigned32              status
-)
-{
-#ifndef DONT_USE_FATAL_EXTENSION
-    if (status == 0)
-        Stack_check_Dump_usage();
-#endif
-}
-
-
-/*PAGE
- *
- *  Stack_check_Dump_usage
- */
-
-void Stack_check_Dump_usage( void )
-{
-  unsigned32           i;
-  unsigned32           class_index;
-  Thread_Control      *the_thread;
-  unsigned32           hit_running = 0;
-  Objects_Information *information;
-
-  if (stack_check_initialized == 0)
-      return;
-
-  printf("Stack usage by thread\n");
-  printf(
-    "    ID      NAME       LOW        HIGH     AVAILABLE      USED\n"
-  );
-
-  for ( class_index = OBJECTS_CLASSES_FIRST ; 
-        class_index <= OBJECTS_CLASSES_LAST ; 
-        class_index++ ) {
-    information = _Objects_Information_table[ class_index ];
-    if ( information && information->is_thread ) {
-      for ( i=1 ; i <= information->maximum ; i++ ) {
-        the_thread = (Thread_Control *)information->local_table[ i ];
-        Stack_check_Dump_threads_usage( the_thread );
-        if ( the_thread == _Thread_Executing )
-          hit_running = 1;
-      }
-    }
-  }
-
-  if ( !hit_running )
-    Stack_check_Dump_threads_usage( _Thread_Executing );
-
-  /* dump interrupt stack info if any */
-  Stack_check_Dump_threads_usage((Thread_Control *) -1);
-}
-
diff --git a/cpukit/libmisc/stackchk/internal.h b/cpukit/libmisc/stackchk/internal.h
deleted file mode 100644
index 96d0c3f10a..0000000000
--- a/cpukit/libmisc/stackchk/internal.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/*  internal.h
- *
- *  This include file contains internal information
- *  for the RTEMS stack checker.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __INTERNAL_STACK_CHECK_h
-#define __INTERNAL_STACK_CHECK_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- *  This structure is used to fill in and compare the "end of stack"
- *  marker pattern.
- *  pattern area must be a multiple of 4 words.
- */
-
-#ifdef CPU_STACK_CHECK_SIZE
-#define PATTERN_SIZE_WORDS      (((CPU_STACK_CHECK_SIZE / 4) + 3) & ~0x3)
-#else
-#define PATTERN_SIZE_WORDS      4
-#endif
-
-#define PATTERN_SIZE_BYTES      (PATTERN_SIZE_WORDS * 4)
-
-typedef struct {
-   unsigned32  pattern[ PATTERN_SIZE_WORDS ];
-} Stack_check_Control;
-
-/*
- *  The pattern used to fill the entire stack.
- */
-
-#define BYTE_PATTERN 0xA5
-#define U32_PATTERN 0xA5A5A5A5
-
-/*
- *  Stack_check_Create_extension
- */
-
-boolean Stack_check_Create_extension(
-  Thread_Control *running,
-  Thread_Control *the_thread
-);
-
-/*
- *  Stack_check_Begin_extension
- */
-
-void Stack_check_Begin_extension(
-  Thread_Control *the_thread
-);
-
-/*
- *  Stack_check_Switch_extension
- */
-
-void Stack_check_Switch_extension(
-  Thread_Control *running,
-  Thread_Control *heir
-);
-
-/*
- *  Stack_check_Fatal_extension
- */
-
-void Stack_check_Fatal_extension(
-    Internal_errors_Source  source,
-    boolean                 is_internal,
-    unsigned32              status
-);
-
-/*
- *  Stack_check_Dump_usage
- */
-
-void Stack_check_Dump_usage( void );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/cpukit/libmisc/stackchk/stackchk.h b/cpukit/libmisc/stackchk/stackchk.h
deleted file mode 100644
index 1b40da5e0c..0000000000
--- a/cpukit/libmisc/stackchk/stackchk.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*  stackchk.h
- *
- *  This include file contains information necessary to utilize
- *  and install the stack checker mechanism.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __STACK_CHECK_h
-#define __STACK_CHECK_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- *  Stack_check_Initialize
- */
-
-void Stack_check_Initialize( void );
-
-/*
- *  Stack_check_Dump_usage
- */
-
-void Stack_check_Dump_usage( void );
-
-/*
- *  Stack_check_Create_extension
- */
-
-boolean Stack_check_Create_extension(
-  Thread_Control *running,
-  Thread_Control *the_thread
-);
-
-/*
- *  Stack_check_Begin_extension
- */
-
-void Stack_check_Begin_extension(
-  Thread_Control *the_thread
-);
-
-/*
- *  Stack_check_Switch_extension
- */
-
-void Stack_check_Switch_extension(
-  Thread_Control *running,
-  Thread_Control *heir
-);
-
-/*
- *  Extension set definition
- */
-
-#define STACK_CHECKER_EXTENSION \
-{ \
-  Stack_check_Create_extension,        /* rtems_task_create  */ \
-  0,                                   /* rtems_task_start   */ \
-  0,                                   /* rtems_task_restart */ \
-  0,                                   /* rtems_task_delete  */ \
-  Stack_check_Switch_extension,        /* task_switch  */ \
-  Stack_check_Begin_extension,         /* task_begin   */ \
-  0,                                   /* task_exitted */ \
-  0 /* Stack_check_Fatal_extension */, /* fatal        */ \
-}
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/cpukit/libnetworking/README b/cpukit/libnetworking/README
deleted file mode 100644
index d0c22ec688..0000000000
--- a/cpukit/libnetworking/README
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-#  $Id$
-#
-
-This is a snapshot of my attempt to fit the FreeBSD networking code into
-RTEMS.  Things seem to be working!
-
-Things that need to be done:
-	1) More documentation!
-	2) Figure out what's still not working :-)
-	3) Rationalize the include files.  Right now I have a special
-	   hack in the Makefile to ensure that I pick up the FreeBSD versions
-	   of the include files that are duplicated between RTEMS
-	   and FreeBSD.
-	   The network device driver source should move to the BSP source tree.
-	4) Have a look at all the FIXME comments.
-	5) Go through and make sure that all the source files are
-	   free of undesired copyright restrictions.
diff --git a/cpukit/libnetworking/arpa/ftp.h b/cpukit/libnetworking/arpa/ftp.h
deleted file mode 100644
index 584d290bc9..0000000000
--- a/cpukit/libnetworking/arpa/ftp.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright (c) 1983, 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)ftp.h	8.1 (Berkeley) 6/2/93
- *
- *  $Id$
- */
-
-#ifndef _ARPA_FTP_H_
-#define	_ARPA_FTP_H_
-
-/* Definitions for FTP; see RFC-765. */
-
-/*
- * Reply codes.
- */
-#define PRELIM		1	/* positive preliminary */
-#define COMPLETE	2	/* positive completion */
-#define CONTINUE	3	/* positive intermediate */
-#define TRANSIENT	4	/* transient negative completion */
-#define ERROR		5	/* permanent negative completion */
-
-/*
- * Type codes
- */
-#define	TYPE_A		1	/* ASCII */
-#define	TYPE_E		2	/* EBCDIC */
-#define	TYPE_I		3	/* image */
-#define	TYPE_L		4	/* local byte size */
-
-#ifdef FTP_NAMES
-char *typenames[] =  {"0", "ASCII", "EBCDIC", "Image", "Local" };
-#endif
-
-/*
- * Form codes
- */
-#define	FORM_N		1	/* non-print */
-#define	FORM_T		2	/* telnet format effectors */
-#define	FORM_C		3	/* carriage control (ASA) */
-#ifdef FTP_NAMES
-char *formnames[] =  {"0", "Nonprint", "Telnet", "Carriage-control" };
-#endif
-
-/*
- * Structure codes
- */
-#define	STRU_F		1	/* file (no record structure) */
-#define	STRU_R		2	/* record structure */
-#define	STRU_P		3	/* page structure */
-#ifdef FTP_NAMES
-char *strunames[] =  {"0", "File", "Record", "Page" };
-#endif
-
-/*
- * Mode types
- */
-#define	MODE_S		1	/* stream */
-#define	MODE_B		2	/* block */
-#define	MODE_C		3	/* compressed */
-#ifdef FTP_NAMES
-char *modenames[] =  {"0", "Stream", "Block", "Compressed" };
-#endif
-
-/*
- * Record Tokens
- */
-#define	REC_ESC		'\377'	/* Record-mode Escape */
-#define	REC_EOR		'\001'	/* Record-mode End-of-Record */
-#define REC_EOF		'\002'	/* Record-mode End-of-File */
-
-/*
- * Block Header
- */
-#define	BLK_EOR		0x80	/* Block is End-of-Record */
-#define	BLK_EOF		0x40	/* Block is End-of-File */
-#define BLK_ERRORS	0x20	/* Block is suspected of containing errors */
-#define	BLK_RESTART	0x10	/* Block is Restart Marker */
-
-#define	BLK_BYTECOUNT	2	/* Bytes in this block */
-
-#endif /* !_FTP_H_ */
diff --git a/cpukit/libnetworking/arpa/inet.h b/cpukit/libnetworking/arpa/inet.h
deleted file mode 100644
index ad5332e7ab..0000000000
--- a/cpukit/libnetworking/arpa/inet.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * -
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-/*
- *	@(#)inet.h	8.1 (Berkeley) 6/2/93
- *	From: Id: inet.h,v 8.5 1997/01/29 08:48:09 vixie Exp $
- *	$Id$
- */
-
-#ifndef _ARPA_INET_H_
-#define	_ARPA_INET_H_
-
-/* External definitions for functions in inet(3), addr2ascii(3) */
-
-#include <sys/types.h>
-#include <sys/cdefs.h>
-
-struct in_addr;
-
-#if 0	/* RTEMS -- Why rename these? */
-/* XXX all new diversions!! argh!! */
-#define	inet_addr	__inet_addr
-#define	inet_aton	__inet_aton
-#define	inet_lnaof	__inet_lnaof
-#define	inet_makeaddr	__inet_makeaddr
-#define	inet_neta	__inet_neta
-#define	inet_netof	__inet_netof
-#define	inet_network	__inet_network
-#define	inet_net_ntop	__inet_net_ntop
-#define	inet_net_pton	__inet_net_pton
-#define	inet_ntoa	__inet_ntoa
-#define	inet_pton	__inet_pton
-#define	inet_ntop	__inet_ntop
-#define	inet_nsap_addr	__inet_nsap_addr
-#define	inet_nsap_ntoa	__inet_nsap_ntoa
-#endif
-
-__BEGIN_DECLS
-int		 ascii2addr __P((int, const char *, void *));
-char		*addr2ascii __P((int, const void *, int, char *));
-unsigned long	 inet_addr __P((const char *));
-int		 inet_aton __P((const char *, struct in_addr *));
-unsigned long	 inet_lnaof __P((struct in_addr));
-struct in_addr	 inet_makeaddr __P((u_long , u_long));
-char *		 inet_neta __P((u_long, char *, size_t));
-unsigned long	 inet_netof __P((struct in_addr));
-unsigned long	 inet_network __P((const char *));
-char		*inet_net_ntop __P((int, const void *, int, char *, size_t));
-int		 inet_net_pton __P((int, const char *, void *, size_t));
-char		*inet_ntoa __P((struct in_addr));
-int              inet_pton __P((int, const char *, void *));
-const char	*inet_ntop __P((int, const void *, char *, size_t));
-u_int		 inet_nsap_addr __P((const char *, u_char *, int));
-char		*inet_nsap_ntoa __P((int, const u_char *, char *));
-__END_DECLS
-
-#endif /* !_INET_H_ */
diff --git a/cpukit/libnetworking/arpa/nameser.h b/cpukit/libnetworking/arpa/nameser.h
deleted file mode 100644
index 634dece37b..0000000000
--- a/cpukit/libnetworking/arpa/nameser.h
+++ /dev/null
@@ -1,448 +0,0 @@
-/*
- * Copyright (c) 1983, 1989, 1993
- *    The Regents of the University of California.  All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- * 	This product includes software developed by the University of
- * 	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-/*
- *	From: Id: nameser.h,v 8.16 1998/02/06 00:35:58 halley Exp
- *	$Id$
- */
-
-#ifndef _ARPA_NAMESER_H_
-#define _ARPA_NAMESER_H_
-
-#define BIND_4_COMPAT
-
-#include <sys/types.h>
-#include <sys/cdefs.h>
-
-/*
- * revision information.  this is the release date in YYYYMMDD format.
- * it can change every day so the right thing to do with it is use it
- * in preprocessor commands such as "#if (__NAMESER > 19931104)".  do not
- * compare for equality; rather, use it to determine whether your libnameser.a
- * is new enough to contain a certain feature.
- */
-
-/* XXXRTH I made this bigger than __BIND in 4.9.5 T6B */
-#define __NAMESER	19961001	/* New interface version stamp. */
-
-/*
- * Define constants based on RFC 883, RFC 1034, RFC 1035
- */
-#define NS_PACKETSZ	512	/* maximum packet size */
-#define NS_MAXDNAME	1025	/* maximum domain name */
-#define NS_MAXCDNAME	255	/* maximum compressed domain name */
-#define NS_MAXLABEL	63	/* maximum length of domain label */
-#define NS_HFIXEDSZ	12	/* #/bytes of fixed data in header */
-#define NS_QFIXEDSZ	4	/* #/bytes of fixed data in query */
-#define NS_RRFIXEDSZ	10	/* #/bytes of fixed data in r record */
-#define NS_INT32SZ	4	/* #/bytes of data in a u_int32_t */
-#define NS_INT16SZ	2	/* #/bytes of data in a u_int16_t */
-#define NS_INT8SZ	1	/* #/bytes of data in a u_int8_t */
-#define NS_INADDRSZ	4	/* IPv4 T_A */
-#define NS_IN6ADDRSZ	16	/* IPv6 T_AAAA */
-#define NS_CMPRSFLGS	0xc0	/* Flag bits indicating name compression. */
-#define NS_DEFAULTPORT	53	/* For both TCP and UDP. */
-
-/*
- * These can be expanded with synonyms, just keep ns_parse.c:ns_parserecord()
- * in synch with it.
- */
-typedef enum __ns_sect {
-	ns_s_qd = 0,		/* Query: Question. */
-	ns_s_zn = 0,		/* Update: Zone. */
-	ns_s_an = 1,		/* Query: Answer. */
-	ns_s_pr = 1,		/* Update: Prerequisites. */
-	ns_s_ns = 2,		/* Query: Name servers. */
-	ns_s_ud = 2,		/* Update: Update. */
-	ns_s_ar = 3,		/* Query|Update: Additional records. */
-	ns_s_max = 4
-} ns_sect;
-
-/*
- * This is a message handle.  It is caller allocated and has no dynamic data.
- * This structure is intended to be opaque to all but ns_parse.c, thus the
- * leading _'s on the member names.  Use the accessor functions, not the _'s.
- */
-typedef struct __ns_msg {
-	const u_char	*_msg, *_eom;
-	u_int16_t	_id, _flags, _counts[ns_s_max];
-	const u_char	*_sections[ns_s_max];
-	ns_sect		_sect;
-	int		_rrnum;
-	const u_char	*_ptr;
-} ns_msg;
-
-/* Private data structure - do not use from outside library. */
-struct _ns_flagdata {  int mask, shift;  };
-extern struct _ns_flagdata _ns_flagdata[];
-
-/* Accessor macros - this is part of the public interface. */
-#define ns_msg_getflag(handle, flag) ( \
-			((handle)._flags & _ns_flagdata[flag].mask) \
-			 >> _ns_flagdata[flag].shift \
-			)
-#define ns_msg_id(handle) ((handle)._id + 0)
-#define ns_msg_base(handle) ((handle)._msg + 0)
-#define ns_msg_end(handle) ((handle)._eom + 0)
-#define ns_msg_size(handle) ((handle)._eom - (handle)._msg)
-#define ns_msg_count(handle, section) ((handle)._counts[section] + 0)
-
-/*
- * This is a parsed record.  It is caller allocated and has no dynamic data.
- */
-typedef	struct __ns_rr {
-	char		name[NS_MAXDNAME];	/* XXX need to malloc */
-	u_int16_t	type;
-	u_int16_t	class;
-	u_int32_t	ttl;
-	u_int16_t	rdlength;
-	const u_char	*rdata;
-} ns_rr;
-
-/* Accessor macros - this is part of the public interface. */
-#define ns_rr_name(rr)	(((rr).name[0] != '\0') ? (rr).name : ".")
-#define ns_rr_type(rr)	((rr).type + 0)
-#define ns_rr_class(rr)	((rr).class + 0)
-#define ns_rr_ttl(rr)	((rr).ttl + 0)
-#define ns_rr_rdlen(rr)	((rr).rdlength + 0)
-#define ns_rr_rdata(rr)	((rr).rdata + 0)
-
-/*
- * These don't have to be in the same order as in the packet flags word,
- * and they can even overlap in some cases, but they will need to be kept
- * in synch with ns_parse.c:ns_flagdata[].
- */
-typedef enum __ns_flag {
-	ns_f_qr,		/* Question/Response. */
-	ns_f_opcode,		/* Operation code. */
-	ns_f_aa,		/* Authoritative Answer. */
-	ns_f_tc,		/* Truncation occurred. */
-	ns_f_rd,		/* Recursion Desired. */
-	ns_f_ra,		/* Recursion Available. */
-	ns_f_z,			/* MBZ. */
-	ns_f_ad,		/* Authentic Data (DNSSEC). */
-	ns_f_cd,		/* Checking Disabled (DNSSEC). */
-	ns_f_rcode,		/* Response code. */
-	ns_f_max
-} ns_flag;
-
-/*
- * Currently defined opcodes.
- */
-typedef enum __ns_opcode {
-	ns_o_query = 0,		/* Standard query. */
-	ns_o_iquery = 1,	/* Inverse query (deprecated/unsupported). */
-	ns_o_status = 2,	/* Name server status query (unsupported). */
-				/* Opcode 3 is undefined/reserved. */
-	ns_o_notify = 4,	/* Zone change notification. */
-	ns_o_update = 5,	/* Zone update message. */
-	ns_o_max = 6
-} ns_opcode;
-
-/*
- * Currently defined response codes.
- */
-typedef	enum __ns_rcode {
-	ns_r_noerror = 0,	/* No error occurred. */
-	ns_r_formerr = 1,	/* Format error. */
-	ns_r_servfail = 2,	/* Server failure. */
-	ns_r_nxdomain = 3,	/* Name error. */
-	ns_r_notimpl = 4,	/* Unimplemented. */
-	ns_r_refused = 5,	/* Operation refused. */
-	/* these are for BIND_UPDATE */
-	ns_r_yxdomain = 6,	/* Name exists */
-	ns_r_yxrrset = 7,	/* RRset exists */
-	ns_r_nxrrset = 8,	/* RRset does not exist */
-	ns_r_notauth = 9,	/* Not authoritative for zone */
-	ns_r_notzone = 10,	/* Zone of record different from zone section */
-	ns_r_max = 11
-} ns_rcode;
-
-/* BIND_UPDATE */
-typedef enum __ns_update_operation {
-	ns_uop_delete = 0,
-	ns_uop_add = 1,
-	ns_uop_max = 2
-} ns_update_operation;
-
-/*
- * This RR-like structure is particular to UPDATE.
- */
-struct ns_updrec {
-	struct ns_updrec *r_prev;	/* prev record */
-	struct ns_updrec *r_next;	/* next record */
-	u_int8_t	r_section;	/* ZONE/PREREQUISITE/UPDATE */
-	char *		r_dname;	/* owner of the RR */
-	u_int16_t	r_class;	/* class number */
-	u_int16_t	r_type;		/* type number */
-	u_int32_t	r_ttl;		/* time to live */
-	u_char *	r_data;		/* rdata fields as text string */
-	u_int16_t	r_size;		/* size of r_data field */
-	int		r_opcode;	/* type of operation */
-	/* following fields for private use by the resolver/server routines */
-	struct ns_updrec *r_grpnext;	/* next record when grouped */
-	struct databuf *r_dp;		/* databuf to process */
-	struct databuf *r_deldp;	/* databuf's deleted/overwritten */
-	u_int16_t	r_zone;		/* zone number on server */
-};
-typedef struct ns_updrec ns_updrec;
-
-/*
- * Currently defined type values for resources and queries.
- */
-typedef enum __ns_type {
-	ns_t_a = 1,		/* Host address. */
-	ns_t_ns = 2,		/* Authoritative server. */
-	ns_t_md = 3,		/* Mail destination. */
-	ns_t_mf = 4,		/* Mail forwarder. */
-	ns_t_cname = 5,		/* Canonical name. */
-	ns_t_soa = 6,		/* Start of authority zone. */
-	ns_t_mb = 7,		/* Mailbox domain name. */
-	ns_t_mg = 8,		/* Mail group member. */
-	ns_t_mr = 9,		/* Mail rename name. */
-	ns_t_null = 10,		/* Null resource record. */
-	ns_t_wks = 11,		/* Well known service. */
-	ns_t_ptr = 12,		/* Domain name pointer. */
-	ns_t_hinfo = 13,	/* Host information. */
-	ns_t_minfo = 14,	/* Mailbox information. */
-	ns_t_mx = 15,		/* Mail routing information. */
-	ns_t_txt = 16,		/* Text strings. */
-	ns_t_rp = 17,		/* Responsible person. */
-	ns_t_afsdb = 18,	/* AFS cell database. */
-	ns_t_x25 = 19,		/* X_25 calling address. */
-	ns_t_isdn = 20,		/* ISDN calling address. */
-	ns_t_rt = 21,		/* Router. */
-	ns_t_nsap = 22,		/* NSAP address. */
-	ns_t_nsap_ptr = 23,	/* Reverse NSAP lookup (deprecated). */
-	ns_t_sig = 24,		/* Security signature. */
-	ns_t_key = 25,		/* Security key. */
-	ns_t_px = 26,		/* X.400 mail mapping. */
-	ns_t_gpos = 27,		/* Geographical position (withdrawn). */
-	ns_t_aaaa = 28,		/* Ip6 Address. */
-	ns_t_loc = 29,		/* Location Information. */
-	ns_t_nxt = 30,		/* Next domain (security). */
-	ns_t_eid = 31,		/* Endpoint identifier. */
-	ns_t_nimloc = 32,	/* Nimrod Locator. */
-	ns_t_srv = 33,		/* Server Selection. */
-	ns_t_atma = 34,		/* ATM Address */
-	ns_t_naptr = 35,	/* Naming Authority PoinTeR */
-	/* Query type values which do not appear in resource records. */
-	ns_t_ixfr = 251,	/* Incremental zone transfer. */
-	ns_t_axfr = 252,	/* Transfer zone of authority. */
-	ns_t_mailb = 253,	/* Transfer mailbox records. */
-	ns_t_maila = 254,	/* Transfer mail agent records. */
-	ns_t_any = 255,		/* Wildcard match. */
-	ns_t_max = 65536
-} ns_type;
-
-/*
- * Values for class field
- */
-typedef enum __ns_class {
-	ns_c_in = 1,		/* Internet. */
-				/* Class 2 unallocated/unsupported. */
-	ns_c_chaos = 3,		/* MIT Chaos-net. */
-	ns_c_hs = 4,		/* MIT Hesiod. */
-	/* Query class values which do not appear in resource records */
-	ns_c_none = 254,	/* for prereq. sections in update requests */
-	ns_c_any = 255,		/* Wildcard match. */
-	ns_c_max = 65536
-} ns_class;
-
-/*
- * Flags field of the KEY RR rdata
- */
-#define	NS_KEY_TYPEMASK		0xC000	/* Mask for "type" bits */
-#define	NS_KEY_TYPE_AUTH_CONF	0x0000	/* Key usable for both */
-#define	NS_KEY_TYPE_CONF_ONLY	0x8000	/* Key usable for confidentiality */
-#define	NS_KEY_TYPE_AUTH_ONLY	0x4000	/* Key usable for authentication */
-#define	NS_KEY_TYPE_NO_KEY	0xC000	/* No key usable for either; no key */
-/* The type bits can also be interpreted independently, as single bits: */
-#define	NS_KEY_NO_AUTH		0x8000	/* Key unusable for authentication */
-#define	NS_KEY_NO_CONF		0x4000	/* Key unusable for confidentiality */
-#define	NS_KEY_EXPERIMENTAL	0x2000	/* Security is *mandatory* if bit=0 */
-#define	NS_KEY_RESERVED3	0x1000  /* reserved - must be zero */
-#define	NS_KEY_RESERVED4	0x0800  /* reserved - must be zero */
-#define	NS_KEY_USERACCOUNT	0x0400	/* key is assoc. with a user acct */
-#define	NS_KEY_ENTITY		0x0200	/* key is assoc. with entity eg host */
-#define	NS_KEY_ZONEKEY		0x0100	/* key is zone key */
-#define	NS_KEY_IPSEC		0x0080  /* key is for IPSEC (host or user)*/
-#define	NS_KEY_EMAIL		0x0040  /* key is for email (MIME security) */
-#define	NS_KEY_RESERVED10	0x0020  /* reserved - must be zero */
-#define	NS_KEY_RESERVED11	0x0010  /* reserved - must be zero */
-#define	NS_KEY_SIGNATORYMASK	0x000F	/* key can sign RR's of same name */
-
-#define	NS_KEY_RESERVED_BITMASK ( NS_KEY_RESERVED3 | \
-				  NS_KEY_RESERVED4 | \
-				  NS_KEY_RESERVED10 | \
-				  NS_KEY_RESERVED11 )
-
-/* The Algorithm field of the KEY and SIG RR's is an integer, {1..254} */
-#define	NS_ALG_MD5RSA		1	/* MD5 with RSA */
-#define	NS_ALG_EXPIRE_ONLY	253	/* No alg, no security */
-#define	NS_ALG_PRIVATE_OID	254	/* Key begins with OID giving alg */
-
-/* Signatures */
-#define	NS_MD5RSA_MIN_BITS	 512	/* Size of a mod or exp in bits */
-#define	NS_MD5RSA_MAX_BITS	2552
-	/* Total of binary mod and exp */
-#define	NS_MD5RSA_MAX_BYTES	((NS_MD5RSA_MAX_BITS+7/8)*2+3)
-	/* Max length of text sig block */
-#define	NS_MD5RSA_MAX_BASE64	(((NS_MD5RSA_MAX_BYTES+2)/3)*4)
-
-/* Offsets into SIG record rdata to find various values */
-#define	NS_SIG_TYPE	0	/* Type flags */
-#define	NS_SIG_ALG	2	/* Algorithm */
-#define	NS_SIG_LABELS	3	/* How many labels in name */
-#define	NS_SIG_OTTL	4	/* Original TTL */
-#define	NS_SIG_EXPIR	8	/* Expiration time */
-#define	NS_SIG_SIGNED	12	/* Signature time */
-#define	NS_SIG_FOOT	16	/* Key footprint */
-#define	NS_SIG_SIGNER	18	/* Domain name of who signed it */
-
-/* How RR types are represented as bit-flags in NXT records */
-#define	NS_NXT_BITS 8
-#define	NS_NXT_BIT_SET(  n,p) (p[(n)/NS_NXT_BITS] |=  (0x80>>((n)%NS_NXT_BITS)))
-#define	NS_NXT_BIT_CLEAR(n,p) (p[(n)/NS_NXT_BITS] &= ~(0x80>>((n)%NS_NXT_BITS)))
-#define	NS_NXT_BIT_ISSET(n,p) (p[(n)/NS_NXT_BITS] &   (0x80>>((n)%NS_NXT_BITS)))
-
-
-/*
- * Inline versions of get/put short/long.  Pointer is advanced.
- */
-#define NS_GET16(s, cp) { \
-	register u_char *t_cp = (u_char *)(cp); \
-	(s) = ((u_int16_t)t_cp[0] << 8) \
-	    | ((u_int16_t)t_cp[1]) \
-	    ; \
-	(cp) += NS_INT16SZ; \
-}
-
-#define NS_GET32(l, cp) { \
-	register u_char *t_cp = (u_char *)(cp); \
-	(l) = ((u_int32_t)t_cp[0] << 24) \
-	    | ((u_int32_t)t_cp[1] << 16) \
-	    | ((u_int32_t)t_cp[2] << 8) \
-	    | ((u_int32_t)t_cp[3]) \
-	    ; \
-	(cp) += NS_INT32SZ; \
-}
-
-#define NS_PUT16(s, cp) { \
-	register u_int16_t t_s = (u_int16_t)(s); \
-	register u_char *t_cp = (u_char *)(cp); \
-	*t_cp++ = t_s >> 8; \
-	*t_cp   = t_s; \
-	(cp) += NS_INT16SZ; \
-}
-
-#define NS_PUT32(l, cp) { \
-	register u_int32_t t_l = (u_int32_t)(l); \
-	register u_char *t_cp = (u_char *)(cp); \
-	*t_cp++ = t_l >> 24; \
-	*t_cp++ = t_l >> 16; \
-	*t_cp++ = t_l >> 8; \
-	*t_cp   = t_l; \
-	(cp) += NS_INT32SZ; \
-}
-
-/*
- * ANSI C identifier hiding.
- */
-#define ns_get16		__ns_get16
-#define ns_get32		__ns_get32
-#define ns_put16		__ns_put16
-#define ns_put32		__ns_put32
-#define ns_initparse		__ns_initparse
-#define ns_parserr		__ns_parserr
-#define	ns_sprintrr		__ns_sprintrr
-#define	ns_sprintrrf		__ns_sprintrrf
-#define	ns_format_ttl		__ns_format_ttl
-#define	ns_parse_ttl		__ns_parse_ttl
-#define	ns_name_ntop		__ns_name_ntop
-#define	ns_name_pton		__ns_name_pton
-#define	ns_name_unpack		__ns_name_unpack
-#define	ns_name_pack		__ns_name_pack
-#define	ns_name_compress	__ns_name_compress
-#define	ns_name_uncompress	__ns_name_uncompress
-
-__BEGIN_DECLS
-u_int		ns_get16 __P((const u_char *));
-u_long		ns_get32 __P((const u_char *));
-void		ns_put16 __P((u_int, u_char *));
-void		ns_put32 __P((u_long, u_char *));
-int		ns_initparse __P((const u_char *, int, ns_msg *));
-int		ns_parserr __P((ns_msg *, ns_sect, int, ns_rr *));
-int		ns_sprintrr __P((const ns_msg *, const ns_rr *,
-				 const char *, const char *, char *, size_t));
-int		ns_sprintrrf __P((const u_char *, size_t, const char *,
-				  ns_class, ns_type, u_long, const u_char *,
-				  size_t, const char *, const char *,
-				  char *, size_t));
-int		ns_format_ttl __P((u_long, char *, size_t));
-int		ns_parse_ttl __P((const char *, u_long *));
-int		ns_name_ntop __P((const u_char *, char *, size_t));
-int		ns_name_pton __P((const char *, u_char *, size_t));
-int		ns_name_unpack __P((const u_char *, const u_char *,
-				    const u_char *, u_char *, size_t));
-int		ns_name_pack __P((const u_char *, u_char *, int,
-				  const u_char **, const u_char **));
-int		ns_name_uncompress __P((const u_char *, const u_char *,
-					const u_char *, char *, size_t));
-int		ns_name_compress __P((const char *, u_char *, size_t,
-				      const u_char **, const u_char **));
-int		ns_name_skip __P((const u_char **, const u_char *));
-__END_DECLS
-
-#ifdef BIND_4_COMPAT
-#include <arpa/nameser_compat.h>
-#endif
-
-#endif /* !_ARPA_NAMESER_H_ */
diff --git a/cpukit/libnetworking/arpa/nameser_compat.h b/cpukit/libnetworking/arpa/nameser_compat.h
deleted file mode 100644
index 2ab5b47386..0000000000
--- a/cpukit/libnetworking/arpa/nameser_compat.h
+++ /dev/null
@@ -1,194 +0,0 @@
-/* Copyright (c) 1983, 1989
- *    The Regents of the University of California.  All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- * 	This product includes software developed by the University of
- * 	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- *      from nameser.h	8.1 (Berkeley) 6/2/93
- *	From: Id: nameser_compat.h,v 8.9 1998/03/20 23:25:10 halley Exp
- *	$Id$
- */
-
-#ifndef _ARPA_NAMESER_COMPAT_
-#define	_ARPA_NAMESER_COMPAT_
-
-#define	__BIND		19950621	/* (DEAD) interface version stamp. */
-
-#include <machine/endian.h>
-
-#if !defined(BYTE_ORDER) || \
-    (BYTE_ORDER != BIG_ENDIAN && BYTE_ORDER != LITTLE_ENDIAN && \
-    BYTE_ORDER != PDP_ENDIAN)
-	/* you must determine what the correct bit order is for
-	 * your compiler - the next line is an intentional error
-	 * which will force your compiles to bomb until you fix
-	 * the above macros.
-	 */
-  error "Undefined or invalid BYTE_ORDER";
-#endif
-
-/*
- * Structure for query header.  The order of the fields is machine- and
- * compiler-dependent, depending on the byte/bit order and the layout
- * of bit fields.  We use bit fields only in int variables, as this
- * is all ANSI requires.  This requires a somewhat confusing rearrangement.
- */
-
-typedef struct {
-	unsigned	id :16;		/* query identification number */
-#if BYTE_ORDER == BIG_ENDIAN
-			/* fields in third byte */
-	unsigned	qr: 1;		/* response flag */
-	unsigned	opcode: 4;	/* purpose of message */
-	unsigned	aa: 1;		/* authoritive answer */
-	unsigned	tc: 1;		/* truncated message */
-	unsigned	rd: 1;		/* recursion desired */
-			/* fields in fourth byte */
-	unsigned	ra: 1;		/* recursion available */
-	unsigned	unused :1;	/* unused bits (MBZ as of 4.9.3a3) */
-	unsigned	ad: 1;		/* authentic data from named */
-	unsigned	cd: 1;		/* checking disabled by resolver */
-	unsigned	rcode :4;	/* response code */
-#endif
-#if BYTE_ORDER == LITTLE_ENDIAN || BYTE_ORDER == PDP_ENDIAN
-			/* fields in third byte */
-	unsigned	rd :1;		/* recursion desired */
-	unsigned	tc :1;		/* truncated message */
-	unsigned	aa :1;		/* authoritive answer */
-	unsigned	opcode :4;	/* purpose of message */
-	unsigned	qr :1;		/* response flag */
-			/* fields in fourth byte */
-	unsigned	rcode :4;	/* response code */
-	unsigned	cd: 1;		/* checking disabled by resolver */
-	unsigned	ad: 1;		/* authentic data from named */
-	unsigned	unused :1;	/* unused bits (MBZ as of 4.9.3a3) */
-	unsigned	ra :1;		/* recursion available */
-#endif
-			/* remaining bytes */
-	unsigned	qdcount :16;	/* number of question entries */
-	unsigned	ancount :16;	/* number of answer entries */
-	unsigned	nscount :16;	/* number of authority entries */
-	unsigned	arcount :16;	/* number of resource entries */
-} HEADER;
-
-#define PACKETSZ	NS_PACKETSZ
-#define MAXDNAME	NS_MAXDNAME
-#define MAXCDNAME	NS_MAXCDNAME
-#define MAXLABEL	NS_MAXLABEL
-#define	HFIXEDSZ	NS_HFIXEDSZ
-#define QFIXEDSZ	NS_QFIXEDSZ
-#define RRFIXEDSZ	NS_RRFIXEDSZ
-#define	INT32SZ		NS_INT32SZ
-#define	INT16SZ		NS_INT16SZ
-#define	INADDRSZ	NS_INADDRSZ
-#define	IN6ADDRSZ	NS_IN6ADDRSZ
-#define	INDIR_MASK	NS_CMPRSFLGS
-#define NAMESERVER_PORT	NS_DEFAULTPORT
-
-#define S_ZONE		ns_s_zn
-#define S_PREREQ	ns_s_pr
-#define S_UPDATE	ns_s_ud
-#define S_ADDT		ns_s_ar
-
-#define QUERY		ns_o_query
-#define IQUERY		ns_o_iquery
-#define STATUS		ns_o_status
-#define	NS_NOTIFY_OP	ns_o_notify
-#define	NS_UPDATE_OP	ns_o_update
-
-#define NOERROR		ns_r_noerror
-#define FORMERR		ns_r_formerr
-#define SERVFAIL	ns_r_servfail
-#define NXDOMAIN	ns_r_nxdomain
-#define NOTIMP		ns_r_notimpl
-#define REFUSED		ns_r_refused
-#define YXDOMAIN	ns_r_yxdomain
-#define YXRRSET		ns_r_yxrrset
-#define NXRRSET		ns_r_nxrrset
-#define NOTAUTH		ns_r_notauth
-#define NOTZONE		ns_r_notzone
-
-#define DELETE		ns_uop_delete
-#define ADD		ns_uop_add
-
-#define T_A		ns_t_a
-#define T_NS		ns_t_ns
-#define T_MD		ns_t_md
-#define T_MF		ns_t_mf
-#define T_CNAME		ns_t_cname
-#define T_SOA		ns_t_soa
-#define T_MB		ns_t_mb
-#define T_MG		ns_t_mg
-#define T_MR		ns_t_mr
-#define T_NULL		ns_t_null
-#define T_WKS		ns_t_wks
-#define T_PTR		ns_t_ptr
-#define T_HINFO		ns_t_hinfo
-#define T_MINFO		ns_t_minfo
-#define T_MX		ns_t_mx
-#define T_TXT		ns_t_txt
-#define	T_RP		ns_t_rp
-#define T_AFSDB		ns_t_afsdb
-#define T_X25		ns_t_x25
-#define T_ISDN		ns_t_isdn
-#define T_RT		ns_t_rt
-#define T_NSAP		ns_t_nsap
-#define T_NSAP_PTR	ns_t_nsap_ptr
-#define	T_SIG		ns_t_sig
-#define	T_KEY		ns_t_key
-#define	T_PX		ns_t_px
-#define	T_GPOS		ns_t_gpos
-#define	T_AAAA		ns_t_aaaa
-#define	T_LOC		ns_t_loc
-#define	T_NXT		ns_t_nxt
-#define	T_EID		ns_t_eid
-#define	T_NIMLOC	ns_t_nimloc
-#define	T_SRV		ns_t_srv
-#define T_ATMA		ns_t_atma
-#define T_NAPTR		ns_t_naptr
-#define	T_IXFR		ns_t_ixfr
-#define T_AXFR		ns_t_axfr
-#define T_MAILB		ns_t_mailb
-#define T_MAILA		ns_t_maila
-#define T_ANY		ns_t_any
-
-#define C_IN		ns_c_in
-#define C_CHAOS		ns_c_chaos
-#define C_HS		ns_c_hs
-/* BIND_UPDATE */
-#define C_NONE		ns_c_none
-#define C_ANY		ns_c_any
-
-#define	GETSHORT		NS_GET16
-#define	GETLONG			NS_GET32
-#define	PUTSHORT		NS_PUT16
-#define	PUTLONG			NS_PUT32
-
-#endif /* _ARPA_NAMESER_COMPAT_ */
diff --git a/cpukit/libnetworking/arpa/telnet.h b/cpukit/libnetworking/arpa/telnet.h
deleted file mode 100644
index 09b85692da..0000000000
--- a/cpukit/libnetworking/arpa/telnet.h
+++ /dev/null
@@ -1,342 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)telnet.h	8.2 (Berkeley) 12/15/93
- *
- *  $Id$
- */
-
-#ifndef _ARPA_TELNET_H_
-#define	_ARPA_TELNET_H_
-
-/*
- * Definitions for the TELNET protocol.
- */
-#define	IAC	255		/* interpret as command: */
-#define	DONT	254		/* you are not to use option */
-#define	DO	253		/* please, you use option */
-#define	WONT	252		/* I won't use option */
-#define	WILL	251		/* I will use option */
-#define	SB	250		/* interpret as subnegotiation */
-#define	GA	249		/* you may reverse the line */
-#define	EL	248		/* erase the current line */
-#define	EC	247		/* erase the current character */
-#define	AYT	246		/* are you there */
-#define	AO	245		/* abort output--but let prog finish */
-#define	IP	244		/* interrupt process--permanently */
-#define	BREAK	243		/* break */
-#define	DM	242		/* data mark--for connect. cleaning */
-#define	NOP	241		/* nop */
-#define	SE	240		/* end sub negotiation */
-#define EOR     239             /* end of record (transparent mode) */
-#define	ABORT	238		/* Abort process */
-#define	SUSP	237		/* Suspend process */
-#define	xEOF	236		/* End of file: EOF is already used... */
-
-#define SYNCH	242		/* for telfunc calls */
-
-#ifdef TELCMDS
-char *telcmds[] = {
-	"EOF", "SUSP", "ABORT", "EOR",
-	"SE", "NOP", "DMARK", "BRK", "IP", "AO", "AYT", "EC",
-	"EL", "GA", "SB", "WILL", "WONT", "DO", "DONT", "IAC",
-	0
-};
-#else
-extern char *telcmds[];
-#endif
-
-#define	TELCMD_FIRST	xEOF
-#define	TELCMD_LAST	IAC
-#define	TELCMD_OK(x)	((unsigned int)(x) <= TELCMD_LAST && \
-			 (unsigned int)(x) >= TELCMD_FIRST)
-#define	TELCMD(x)	telcmds[(x)-TELCMD_FIRST]
-
-/* telnet options */
-#define TELOPT_BINARY	0	/* 8-bit data path */
-#define TELOPT_ECHO	1	/* echo */
-#define	TELOPT_RCP	2	/* prepare to reconnect */
-#define	TELOPT_SGA	3	/* suppress go ahead */
-#define	TELOPT_NAMS	4	/* approximate message size */
-#define	TELOPT_STATUS	5	/* give status */
-#define	TELOPT_TM	6	/* timing mark */
-#define	TELOPT_RCTE	7	/* remote controlled transmission and echo */
-#define TELOPT_NAOL 	8	/* negotiate about output line width */
-#define TELOPT_NAOP 	9	/* negotiate about output page size */
-#define TELOPT_NAOCRD	10	/* negotiate about CR disposition */
-#define TELOPT_NAOHTS	11	/* negotiate about horizontal tabstops */
-#define TELOPT_NAOHTD	12	/* negotiate about horizontal tab disposition */
-#define TELOPT_NAOFFD	13	/* negotiate about formfeed disposition */
-#define TELOPT_NAOVTS	14	/* negotiate about vertical tab stops */
-#define TELOPT_NAOVTD	15	/* negotiate about vertical tab disposition */
-#define TELOPT_NAOLFD	16	/* negotiate about output LF disposition */
-#define TELOPT_XASCII	17	/* extended ascic character set */
-#define	TELOPT_LOGOUT	18	/* force logout */
-#define	TELOPT_BM	19	/* byte macro */
-#define	TELOPT_DET	20	/* data entry terminal */
-#define	TELOPT_SUPDUP	21	/* supdup protocol */
-#define	TELOPT_SUPDUPOUTPUT 22	/* supdup output */
-#define	TELOPT_SNDLOC	23	/* send location */
-#define	TELOPT_TTYPE	24	/* terminal type */
-#define	TELOPT_EOR	25	/* end or record */
-#define	TELOPT_TUID	26	/* TACACS user identification */
-#define	TELOPT_OUTMRK	27	/* output marking */
-#define	TELOPT_TTYLOC	28	/* terminal location number */
-#define	TELOPT_3270REGIME 29	/* 3270 regime */
-#define	TELOPT_X3PAD	30	/* X.3 PAD */
-#define	TELOPT_NAWS	31	/* window size */
-#define	TELOPT_TSPEED	32	/* terminal speed */
-#define	TELOPT_LFLOW	33	/* remote flow control */
-#define TELOPT_LINEMODE	34	/* Linemode option */
-#define TELOPT_XDISPLOC	35	/* X Display Location */
-#define TELOPT_OLD_ENVIRON 36	/* Old - Environment variables */
-#define	TELOPT_AUTHENTICATION 37/* Authenticate */
-#define	TELOPT_ENCRYPT	38	/* Encryption option */
-#define TELOPT_NEW_ENVIRON 39	/* New - Environment variables */
-#define	TELOPT_EXOPL	255	/* extended-options-list */
-
-
-#define	NTELOPTS	(1+TELOPT_NEW_ENVIRON)
-#ifdef TELOPTS
-char *telopts[NTELOPTS+1] = {
-	"BINARY", "ECHO", "RCP", "SUPPRESS GO AHEAD", "NAME",
-	"STATUS", "TIMING MARK", "RCTE", "NAOL", "NAOP",
-	"NAOCRD", "NAOHTS", "NAOHTD", "NAOFFD", "NAOVTS",
-	"NAOVTD", "NAOLFD", "EXTEND ASCII", "LOGOUT", "BYTE MACRO",
-	"DATA ENTRY TERMINAL", "SUPDUP", "SUPDUP OUTPUT",
-	"SEND LOCATION", "TERMINAL TYPE", "END OF RECORD",
-	"TACACS UID", "OUTPUT MARKING", "TTYLOC",
-	"3270 REGIME", "X.3 PAD", "NAWS", "TSPEED", "LFLOW",
-	"LINEMODE", "XDISPLOC", "OLD-ENVIRON", "AUTHENTICATION",
-	"ENCRYPT", "NEW-ENVIRON",
-	0
-};
-#define	TELOPT_FIRST	TELOPT_BINARY
-#define	TELOPT_LAST	TELOPT_NEW_ENVIRON
-#define	TELOPT_OK(x)	((unsigned int)(x) <= TELOPT_LAST)
-#define	TELOPT(x)	telopts[(x)-TELOPT_FIRST]
-#endif
-
-/* sub-option qualifiers */
-#define	TELQUAL_IS	0	/* option is... */
-#define	TELQUAL_SEND	1	/* send option */
-#define	TELQUAL_INFO	2	/* ENVIRON: informational version of IS */
-#define	TELQUAL_REPLY	2	/* AUTHENTICATION: client version of IS */
-#define	TELQUAL_NAME	3	/* AUTHENTICATION: client version of IS */
-
-#define	LFLOW_OFF		0	/* Disable remote flow control */
-#define	LFLOW_ON		1	/* Enable remote flow control */
-#define	LFLOW_RESTART_ANY	2	/* Restart output on any char */
-#define	LFLOW_RESTART_XON	3	/* Restart output only on XON */
-
-/*
- * LINEMODE suboptions
- */
-
-#define	LM_MODE		1
-#define	LM_FORWARDMASK	2
-#define	LM_SLC		3
-
-#define	MODE_EDIT	0x01
-#define	MODE_TRAPSIG	0x02
-#define	MODE_ACK	0x04
-#define MODE_SOFT_TAB	0x08
-#define MODE_LIT_ECHO	0x10
-
-#define	MODE_MASK	0x1f
-
-/* Not part of protocol, but needed to simplify things... */
-#define MODE_FLOW		0x0100
-#define MODE_ECHO		0x0200
-#define MODE_INBIN		0x0400
-#define MODE_OUTBIN		0x0800
-#define MODE_FORCE		0x1000
-
-#define	SLC_SYNCH	1
-#define	SLC_BRK		2
-#define	SLC_IP		3
-#define	SLC_AO		4
-#define	SLC_AYT		5
-#define	SLC_EOR		6
-#define	SLC_ABORT	7
-#define	SLC_EOF		8
-#define	SLC_SUSP	9
-#define	SLC_EC		10
-#define	SLC_EL		11
-#define	SLC_EW		12
-#define	SLC_RP		13
-#define	SLC_LNEXT	14
-#define	SLC_XON		15
-#define	SLC_XOFF	16
-#define	SLC_FORW1	17
-#define	SLC_FORW2	18
-#define SLC_MCL         19
-#define SLC_MCR         20
-#define SLC_MCWL        21
-#define SLC_MCWR        22
-#define SLC_MCBOL       23
-#define SLC_MCEOL       24
-#define SLC_INSRT       25
-#define SLC_OVER        26
-#define SLC_ECR         27
-#define SLC_EWR         28
-#define SLC_EBOL        29
-#define SLC_EEOL        30
-
-#define	NSLC		30
-
-/*
- * For backwards compatability, we define SLC_NAMES to be the
- * list of names if SLC_NAMES is not defined.
- */
-#define	SLC_NAMELIST	"0", "SYNCH", "BRK", "IP", "AO", "AYT", "EOR",	\
-			"ABORT", "EOF", "SUSP", "EC", "EL", "EW", "RP",	\
-			"LNEXT", "XON", "XOFF", "FORW1", "FORW2",	\
-			"MCL", "MCR", "MCWL", "MCWR", "MCBOL",		\
-			"MCEOL", "INSRT", "OVER", "ECR", "EWR",		\
-			"EBOL", "EEOL",					\
-			0
-
-#ifdef	SLC_NAMES
-char *slc_names[] = {
-	SLC_NAMELIST
-};
-#else
-extern char *slc_names[];
-#define	SLC_NAMES SLC_NAMELIST
-#endif
-
-#define	SLC_NAME_OK(x)	((unsigned int)(x) <= NSLC)
-#define SLC_NAME(x)	slc_names[x]
-
-#define	SLC_NOSUPPORT	0
-#define	SLC_CANTCHANGE	1
-#define	SLC_VARIABLE	2
-#define	SLC_DEFAULT	3
-#define	SLC_LEVELBITS	0x03
-
-#define	SLC_FUNC	0
-#define	SLC_FLAGS	1
-#define	SLC_VALUE	2
-
-#define	SLC_ACK		0x80
-#define	SLC_FLUSHIN	0x40
-#define	SLC_FLUSHOUT	0x20
-
-#define	OLD_ENV_VAR	1
-#define	OLD_ENV_VALUE	0
-#define	NEW_ENV_VAR	0
-#define	NEW_ENV_VALUE	1
-#define	ENV_ESC		2
-#define ENV_USERVAR	3
-
-/*
- * AUTHENTICATION suboptions
- */
-
-/*
- * Who is authenticating who ...
- */
-#define	AUTH_WHO_CLIENT		0	/* Client authenticating server */
-#define	AUTH_WHO_SERVER		1	/* Server authenticating client */
-#define	AUTH_WHO_MASK		1
-
-/*
- * amount of authentication done
- */
-#define	AUTH_HOW_ONE_WAY	0
-#define	AUTH_HOW_MUTUAL		2
-#define	AUTH_HOW_MASK		2
-
-#define	AUTHTYPE_NULL		0
-#define	AUTHTYPE_KERBEROS_V4	1
-#define	AUTHTYPE_KERBEROS_V5	2
-#define	AUTHTYPE_SPX		3
-#define	AUTHTYPE_MINK		4
-#define	AUTHTYPE_CNT		5
-
-#define	AUTHTYPE_TEST		99
-
-#ifdef	AUTH_NAMES
-char *authtype_names[] = {
-	"NULL", "KERBEROS_V4", "KERBEROS_V5", "SPX", "MINK",
-	0
-};
-#else
-extern char *authtype_names[];
-#endif
-
-#define	AUTHTYPE_NAME_OK(x)	((unsigned int)(x) < AUTHTYPE_CNT)
-#define	AUTHTYPE_NAME(x)	authtype_names[x]
-
-/*
- * ENCRYPTion suboptions
- */
-#define	ENCRYPT_IS		0	/* I pick encryption type ... */
-#define	ENCRYPT_SUPPORT		1	/* I support encryption types ... */
-#define	ENCRYPT_REPLY		2	/* Initial setup response */
-#define	ENCRYPT_START		3	/* Am starting to send encrypted */
-#define	ENCRYPT_END		4	/* Am ending encrypted */
-#define	ENCRYPT_REQSTART	5	/* Request you start encrypting */
-#define	ENCRYPT_REQEND		6	/* Request you end encrypting */
-#define	ENCRYPT_ENC_KEYID	7
-#define	ENCRYPT_DEC_KEYID	8
-#define	ENCRYPT_CNT		9
-
-#define	ENCTYPE_ANY		0
-#define	ENCTYPE_DES_CFB64	1
-#define	ENCTYPE_DES_OFB64	2
-#define	ENCTYPE_CNT		3
-
-#ifdef	ENCRYPT_NAMES
-char *encrypt_names[] = {
-	"IS", "SUPPORT", "REPLY", "START", "END",
-	"REQUEST-START", "REQUEST-END", "ENC-KEYID", "DEC-KEYID",
-	0
-};
-char *enctype_names[] = {
-	"ANY", "DES_CFB64",  "DES_OFB64",
-	0
-};
-#else
-extern char *encrypt_names[];
-extern char *enctype_names[];
-#endif
-
-
-#define	ENCRYPT_NAME_OK(x)	((unsigned int)(x) < ENCRYPT_CNT)
-#define	ENCRYPT_NAME(x)		encrypt_names[x]
-
-#define	ENCTYPE_NAME_OK(x)	((unsigned int)(x) < ENCTYPE_CNT)
-#define	ENCTYPE_NAME(x)		enctype_names[x]
-
-#endif /* !_TELNET_H_ */
diff --git a/cpukit/libnetworking/bpfilter.h b/cpukit/libnetworking/bpfilter.h
deleted file mode 100644
index 5a6ee0337b..0000000000
--- a/cpukit/libnetworking/bpfilter.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/*
- *  $Id$
- */
-
-/* intentionally empty file */
-
diff --git a/cpukit/libnetworking/kern/kern_subr.c b/cpukit/libnetworking/kern/kern_subr.c
deleted file mode 100644
index 71e51fc442..0000000000
--- a/cpukit/libnetworking/kern/kern_subr.c
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)kern_subr.c	8.3 (Berkeley) 1/21/94
- * $Id$
- */
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/proc.h>
-#include <sys/malloc.h>
-#include <sys/queue.h>
-
-int
-uiomove(cp, n, uio)
-	register caddr_t cp;
-	register int n;
-	register struct uio *uio;
-{
-	register struct iovec *iov;
-	u_int cnt;
-	int error;
-
-#ifdef DIAGNOSTIC
-	if (uio->uio_rw != UIO_READ && uio->uio_rw != UIO_WRITE)
-		panic("uiomove: mode");
-#endif
-	while (n > 0 && uio->uio_resid) {
-		iov = uio->uio_iov;
-		cnt = iov->iov_len;
-		if (cnt == 0) {
-			uio->uio_iov++;
-			uio->uio_iovcnt--;
-			continue;
-		}
-		if (cnt > n)
-			cnt = n;
-
-		switch (uio->uio_segflg) {
-
-		case UIO_USERSPACE:
-		case UIO_USERISPACE:
-			if (uio->uio_rw == UIO_READ)
-				error = copyout(cp, iov->iov_base, cnt);
-			else
-				error = copyin(iov->iov_base, cp, cnt);
-			if (error)
-				return (error);
-			break;
-
-		case UIO_SYSSPACE:
-			if (uio->uio_rw == UIO_READ)
-				bcopy((caddr_t)cp, iov->iov_base, cnt);
-			else
-				bcopy(iov->iov_base, (caddr_t)cp, cnt);
-			break;
-		case UIO_NOCOPY:
-			break;
-		}
-		iov->iov_base += cnt;
-		iov->iov_len -= cnt;
-		uio->uio_resid -= cnt;
-		uio->uio_offset += cnt;
-		cp += cnt;
-		n -= cnt;
-	}
-	return (0);
-}
-
-#ifdef vax	/* unused except by ct.c, other oddities XXX */
-/*
- * Get next character written in by user from uio.
- */
-int
-uwritec(uio)
-	struct uio *uio;
-{
-	register struct iovec *iov;
-	register int c;
-
-	if (uio->uio_resid <= 0)
-		return (-1);
-again:
-	if (uio->uio_iovcnt <= 0)
-		panic("uwritec");
-	iov = uio->uio_iov;
-	if (iov->iov_len == 0) {
-		uio->uio_iov++;
-		if (--uio->uio_iovcnt == 0)
-			return (-1);
-		goto again;
-	}
-	switch (uio->uio_segflg) {
-
-	case UIO_USERSPACE:
-		c = fubyte(iov->iov_base);
-		break;
-
-	case UIO_SYSSPACE:
-		c = *(u_char *) iov->iov_base;
-		break;
-
-	case UIO_USERISPACE:
-		c = fuibyte(iov->iov_base);
-		break;
-	}
-	if (c < 0)
-		return (-1);
-	iov->iov_base++;
-	iov->iov_len--;
-	uio->uio_resid--;
-	uio->uio_offset++;
-	return (c);
-}
-#endif /* vax */
-
-/*
- * General routine to allocate a hash table.
- */
-void *
-hashinit(elements, type, hashmask)
-	int elements, type;
-	u_long *hashmask;
-{
-	long hashsize;
-	LIST_HEAD(generic, generic) *hashtbl;
-	int i;
-
-	if (elements <= 0)
-		panic("hashinit: bad elements");
-	for (hashsize = 1; hashsize <= elements; hashsize <<= 1)
-		continue;
-	hashsize >>= 1;
-	hashtbl = malloc((u_long)hashsize * sizeof(*hashtbl), type, M_WAITOK);
-	for (i = 0; i < hashsize; i++)
-		LIST_INIT(&hashtbl[i]);
-	*hashmask = hashsize - 1;
-	return (hashtbl);
-}
-
-#define NPRIMES 27
-static int primes[] = { 1, 13, 31, 61, 127, 251, 509, 761, 1021, 1531, 2039,
-			2557, 3067, 3583, 4093, 4603, 5119, 5623, 6143, 6653,
-			7159, 7673, 8191, 12281, 16381, 24571, 32749 };
-
-/*
- * General routine to allocate a prime number sized hash table.
- */
-void *
-phashinit(elements, type, nentries)
-	int elements, type;
-	u_long *nentries;
-{
-	long hashsize;
-	LIST_HEAD(generic, generic) *hashtbl;
-	int i;
-
-	if (elements <= 0)
-		panic("phashinit: bad elements");
-	for (i = 1, hashsize = primes[1]; hashsize <= elements;) {
-		i++;
-		if (i == NPRIMES)
-			break;
-		hashsize = primes[i];
-	}
-	hashsize = primes[i - 1];
-	hashtbl = malloc((u_long)hashsize * sizeof(*hashtbl), type, M_WAITOK);
-	for (i = 0; i < hashsize; i++)
-		LIST_INIT(&hashtbl[i]);
-	*nentries = hashsize;
-	return (hashtbl);
-}
diff --git a/cpukit/libnetworking/kern/uipc_domain.c b/cpukit/libnetworking/kern/uipc_domain.c
deleted file mode 100644
index 910007395c..0000000000
--- a/cpukit/libnetworking/kern/uipc_domain.c
+++ /dev/null
@@ -1,228 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)uipc_domain.c	8.2 (Berkeley) 10/18/93
- * $Id$
- */
-
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <sys/protosw.h>
-#include <sys/domain.h>
-#include <sys/mbuf.h>
-#include <sys/kernel.h>
-#include <sys/systm.h>
-
-/*
- * System initialization
- *
- * Note: domain initialization wants to take place on a per domain basis
- * as a result of traversing a linker set.  Most likely, each domain
- * want to call a registration function rather than being handled here
- * in domaininit().  Probably this will look like:
- *
- * SYSINIT(unique, SI_SUB_PROTO_DOMAI, SI_ORDER_ANY, domain_add, xxx)
- *
- * Where 'xxx' is replaced by the address of a parameter struct to be
- * passed to the doamin_add() function.
- */
-
-#if !defined(__rtems__)
-static int	x_save_spl;			/* used by kludge*/
-static void kludge_splimp __P((void *));
-static void kludge_splx __P((void *));
-       void domaininit __P((void *));
-SYSINIT(splimp, SI_SUB_PROTO_BEGIN, SI_ORDER_FIRST, kludge_splimp, &x_save_spl)
-SYSINIT(domain, SI_SUB_PROTO_DOMAIN, SI_ORDER_FIRST, domaininit, NULL)
-SYSINIT(splx, SI_SUB_PROTO_END, SI_ORDER_FIRST, kludge_splx, &x_save_spl)
-#endif
-
-static void	pffasttimo __P((void *));
-static void	pfslowtimo __P((void *));
-
-struct domain *domains;
-
-#define	ADDDOMAIN(x)	{ \
-	__CONCAT(x,domain.dom_next) = domains; \
-	domains = &__CONCAT(x,domain); \
-}
-
-extern struct linker_set domain_set;
-
-/* ARGSUSED*/
-void
-domaininit(dummy)
-	void *dummy;
-{
-	register struct domain *dp;
-	register struct protosw *pr;
-
-/* - not in our sources
-#ifdef ISDN
-	ADDDOMAIN(isdn);
-#endif
-*/
-
-	for (dp = domains; dp; dp = dp->dom_next) {
-		if (dp->dom_init)
-			(*dp->dom_init)();
-		for (pr = dp->dom_protosw; pr < dp->dom_protoswNPROTOSW; pr++){
-#ifdef PRU_OLDSTYLE
-			/* See comments in uipc_socket2.c. */
-			if (pr->pr_usrreqs == 0 && pr->pr_ousrreq)
-				pr->pr_usrreqs = &pru_oldstyle;
-#endif
-			if (pr->pr_init)
-				(*pr->pr_init)();
-		}
-	}
-
-	if (max_linkhdr < 16)		/* XXX */
-		max_linkhdr = 16;
-	max_hdr = max_linkhdr + max_protohdr;
-	max_datalen = MHLEN - max_hdr;
-	timeout(pffasttimo, (void *)0, 1);
-	timeout(pfslowtimo, (void *)0, 1);
-}
-
-
-/*
- * The following two operations are kludge code.  Most likely, they should
- * be done as a "domainpreinit()" for the first function and then rolled
- * in as the last act of "domaininit()" for the second.
- *
- * In point of fact, it is questionable why other initialization prior
- * to this does not also take place at splimp by default.
- */
-static void
-kludge_splimp(udata)
-	void *udata;
-{
-	int	*savesplp = udata;
-
-	*savesplp = splimp();
-}
-
-static void
-kludge_splx(udata)
-	void *udata;
-{
-	int	*savesplp = udata;
-
-	splx( *savesplp);
-}
-
-
-
-struct protosw *
-pffindtype(int family, int type)
-{
-	register struct domain *dp;
-	register struct protosw *pr;
-
-	for (dp = domains; dp; dp = dp->dom_next)
-		if (dp->dom_family == family)
-			goto found;
-	return (0);
-found:
-	for (pr = dp->dom_protosw; pr < dp->dom_protoswNPROTOSW; pr++)
-		if (pr->pr_type && pr->pr_type == type)
-			return (pr);
-	return (0);
-}
-
-struct protosw *
-pffindproto(int family, int protocol, int type)
-{
-	register struct domain *dp;
-	register struct protosw *pr;
-	struct protosw *maybe = 0;
-
-	if (family == 0)
-		return (0);
-	for (dp = domains; dp; dp = dp->dom_next)
-		if (dp->dom_family == family)
-			goto found;
-	return (0);
-found:
-	for (pr = dp->dom_protosw; pr < dp->dom_protoswNPROTOSW; pr++) {
-		if ((pr->pr_protocol == protocol) && (pr->pr_type == type))
-			return (pr);
-
-		if (type == SOCK_RAW && pr->pr_type == SOCK_RAW &&
-		    pr->pr_protocol == 0 && maybe == (struct protosw *)0)
-			maybe = pr;
-	}
-	return (maybe);
-}
-
-void
-pfctlinput(cmd, sa)
-	int cmd;
-	struct sockaddr *sa;
-{
-	register struct domain *dp;
-	register struct protosw *pr;
-
-	for (dp = domains; dp; dp = dp->dom_next)
-		for (pr = dp->dom_protosw; pr < dp->dom_protoswNPROTOSW; pr++)
-			if (pr->pr_ctlinput)
-				(*pr->pr_ctlinput)(cmd, sa, (void *)0);
-}
-
-static void
-pfslowtimo(arg)
-	void *arg;
-{
-	register struct domain *dp;
-	register struct protosw *pr;
-
-	for (dp = domains; dp; dp = dp->dom_next)
-		for (pr = dp->dom_protosw; pr < dp->dom_protoswNPROTOSW; pr++)
-			if (pr->pr_slowtimo)
-				(*pr->pr_slowtimo)();
-	timeout(pfslowtimo, (void *)0, hz/2);
-}
-
-static void
-pffasttimo(arg)
-	void *arg;
-{
-	register struct domain *dp;
-	register struct protosw *pr;
-
-	for (dp = domains; dp; dp = dp->dom_next)
-		for (pr = dp->dom_protosw; pr < dp->dom_protoswNPROTOSW; pr++)
-			if (pr->pr_fasttimo)
-				(*pr->pr_fasttimo)();
-	timeout(pffasttimo, (void *)0, hz/5);
-}
diff --git a/cpukit/libnetworking/kern/uipc_mbuf.c b/cpukit/libnetworking/kern/uipc_mbuf.c
deleted file mode 100644
index f682be94a7..0000000000
--- a/cpukit/libnetworking/kern/uipc_mbuf.c
+++ /dev/null
@@ -1,851 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1988, 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)uipc_mbuf.c	8.2 (Berkeley) 1/4/94
- * $Id$
- */
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/proc.h>
-#include <sys/malloc.h>
-#define MBTYPES
-#include <sys/mbuf.h>
-#include <sys/kernel.h>
-#include <sys/syslog.h>
-#include <sys/domain.h>
-#include <sys/protosw.h>
-
-#include <vm/vm.h>
-#include <vm/vm_param.h>
-#include <vm/vm_kern.h>
-#include <vm/vm_extern.h>
-
-static void mbinit __P((void *));
-SYSINIT(mbuf, SI_SUB_MBUF, SI_ORDER_FIRST, mbinit, NULL)
-
-struct mbuf *mbutl;
-char	*mclrefcnt;
-struct mbstat mbstat;
-struct mbuf *mmbfree;
-union mcluster *mclfree;
-int	max_linkhdr;
-int	max_protohdr;
-int	max_hdr;
-int	max_datalen;
-
-static void	m_reclaim __P((void));
-
-/* "number of clusters of pages" */
-#define NCL_INIT	1
-
-#define NMB_INIT	16
-
-/* ARGSUSED*/
-static void
-mbinit(dummy)
-	void *dummy;
-{
-	int s;
-
-	mmbfree = NULL; mclfree = NULL;
-	s = splimp();
-	if (m_mballoc(NMB_INIT, M_DONTWAIT) == 0)
-		goto bad;
-	if (m_clalloc(NCL_INIT, M_DONTWAIT) == 0)
-		goto bad;
-	splx(s);
-	return;
-bad:
-	panic("mbinit");
-}
-
-/*
- * Allocate at least nmb mbufs and place on mbuf free list.
- * Must be called at splimp.
- */
-/* ARGSUSED */
-int
-m_mballoc(nmb, nowait)
-	register int nmb;
-	int nowait;
-{
-	register caddr_t p;
-	register int i;
-	int nbytes;
-
-	/* Once we run out of map space, it will be impossible to get
-	 * any more (nothing is ever freed back to the map) (XXX which
-	 * is dumb). (however you are not dead as m_reclaim might
-	 * still be able to free a substantial amount of space).
-	 */
-	if (mb_map_full)
-		return (0);
-
-	nbytes = round_page(nmb * MSIZE);
-	p = (caddr_t)kmem_malloc(mb_map, nbytes, nowait ? M_NOWAIT : M_WAITOK);
-	/*
-	 * Either the map is now full, or this is nowait and there
-	 * are no pages left.
-	 */
-	if (p == NULL)
-		return (0);
-
-	nmb = nbytes / MSIZE;
-	for (i = 0; i < nmb; i++) {
-		((struct mbuf *)p)->m_next = mmbfree;
-		mmbfree = (struct mbuf *)p;
-		p += MSIZE;
-	}
-	mbstat.m_mbufs += nmb;
-	return (1);
-}
-
-/*
- * Allocate some number of mbuf clusters
- * and place on cluster free list.
- * Must be called at splimp.
- */
-/* ARGSUSED */
-int
-m_clalloc(ncl, nowait)
-	register int ncl;
-	int nowait;
-{
-	register caddr_t p;
-	register int i;
-
-	/*
-	 * Once we run out of map space, it will be impossible
-	 * to get any more (nothing is ever freed back to the
-	 * map).
-	 */
-	if (mb_map_full)
-		return (0);
-
-	p = (caddr_t)kmem_malloc(mb_map, ncl*MCLBYTES,
-				 nowait ? M_NOWAIT : M_WAITOK);
-	/*
-	 * Either the map is now full, or this is nowait and there
-	 * are no pages left.
-	 */
-	if (p == NULL)
-		return (0);
-
-	for (i = 0; i < ncl; i++) {
-		((union mcluster *)p)->mcl_next = mclfree;
-		mclfree = (union mcluster *)p;
-		p += MCLBYTES;
-		mbstat.m_clfree++;
-	}
-	mbstat.m_clusters += ncl;
-	return (1);
-}
-
-/*
- * When MGET failes, ask protocols to free space when short of memory,
- * then re-attempt to allocate an mbuf.
- */
-struct mbuf *
-m_retry(i, t)
-	int i, t;
-{
-	register struct mbuf *m;
-
-	m_reclaim();
-#define m_retry(i, t)	(struct mbuf *)0
-	MGET(m, i, t);
-#undef m_retry
-	if (m != NULL)
-		mbstat.m_wait++;
-	else
-		mbstat.m_drops++;
-	return (m);
-}
-
-/*
- * As above; retry an MGETHDR.
- */
-struct mbuf *
-m_retryhdr(i, t)
-	int i, t;
-{
-	register struct mbuf *m;
-
-	m_reclaim();
-#define m_retryhdr(i, t) (struct mbuf *)0
-	MGETHDR(m, i, t);
-#undef m_retryhdr
-	if (m != NULL)
-		mbstat.m_wait++;
-	else
-		mbstat.m_drops++;
-	return (m);
-}
-
-static void
-m_reclaim()
-{
-	register struct domain *dp;
-	register struct protosw *pr;
-	int s = splimp();
-
-	for (dp = domains; dp; dp = dp->dom_next)
-		for (pr = dp->dom_protosw; pr < dp->dom_protoswNPROTOSW; pr++)
-			if (pr->pr_drain)
-				(*pr->pr_drain)();
-	splx(s);
-	mbstat.m_drain++;
-}
-
-/*
- * Space allocation routines.
- * These are also available as macros
- * for critical paths.
- */
-struct mbuf *
-m_get(nowait, type)
-	int nowait, type;
-{
-	register struct mbuf *m;
-
-	MGET(m, nowait, type);
-	return (m);
-}
-
-struct mbuf *
-m_gethdr(nowait, type)
-	int nowait, type;
-{
-	register struct mbuf *m;
-
-	MGETHDR(m, nowait, type);
-	return (m);
-}
-
-struct mbuf *
-m_getclr(nowait, type)
-	int nowait, type;
-{
-	register struct mbuf *m;
-
-	MGET(m, nowait, type);
-	if (m == 0)
-		return (0);
-	bzero(mtod(m, caddr_t), MLEN);
-	return (m);
-}
-
-struct mbuf *
-m_free(m)
-	struct mbuf *m;
-{
-	register struct mbuf *n;
-
-	MFREE(m, n);
-	return (n);
-}
-
-void
-m_freem(m)
-	register struct mbuf *m;
-{
-	register struct mbuf *n;
-
-	if (m == NULL)
-		return;
-	do {
-		MFREE(m, n);
-		m = n;
-	} while (m);
-}
-
-/*
- * Mbuffer utility routines.
- */
-
-/*
- * Lesser-used path for M_PREPEND:
- * allocate new mbuf to prepend to chain,
- * copy junk along.
- */
-struct mbuf *
-m_prepend(m, len, how)
-	register struct mbuf *m;
-	int len, how;
-{
-	struct mbuf *mn;
-
-	MGET(mn, how, m->m_type);
-	if (mn == (struct mbuf *)NULL) {
-		m_freem(m);
-		return ((struct mbuf *)NULL);
-	}
-	if (m->m_flags & M_PKTHDR) {
-		M_COPY_PKTHDR(mn, m);
-		m->m_flags &= ~M_PKTHDR;
-	}
-	mn->m_next = m;
-	m = mn;
-	if (len < MHLEN)
-		MH_ALIGN(m, len);
-	m->m_len = len;
-	return (m);
-}
-
-/*
- * Make a copy of an mbuf chain starting "off0" bytes from the beginning,
- * continuing for "len" bytes.  If len is M_COPYALL, copy to end of mbuf.
- * The wait parameter is a choice of M_WAIT/M_DONTWAIT from caller.
- */
-static int MCFail;
-
-struct mbuf *
-m_copym(m, off0, len, wait)
-	register struct mbuf *m;
-	int off0, wait;
-	register int len;
-{
-	register struct mbuf *n, **np;
-	register int off = off0;
-	struct mbuf *top;
-	int copyhdr = 0;
-
-	if (off < 0 || len < 0)
-		panic("m_copym");
-	if (off == 0 && m->m_flags & M_PKTHDR)
-		copyhdr = 1;
-	while (off > 0) {
-		if (m == 0)
-			panic("m_copym");
-		if (off < m->m_len)
-			break;
-		off -= m->m_len;
-		m = m->m_next;
-	}
-	np = &top;
-	top = 0;
-	while (len > 0) {
-		if (m == 0) {
-			if (len != M_COPYALL)
-				panic("m_copym");
-			break;
-		}
-		MGET(n, wait, m->m_type);
-		*np = n;
-		if (n == 0)
-			goto nospace;
-		if (copyhdr) {
-			M_COPY_PKTHDR(n, m);
-			if (len == M_COPYALL)
-				n->m_pkthdr.len -= off0;
-			else
-				n->m_pkthdr.len = len;
-			copyhdr = 0;
-		}
-		n->m_len = min(len, m->m_len - off);
-		if (m->m_flags & M_EXT) {
-			n->m_data = m->m_data + off;
-			if(!m->m_ext.ext_ref)
-				mclrefcnt[mtocl(m->m_ext.ext_buf)]++;
-			else
-				(*(m->m_ext.ext_ref))(m->m_ext.ext_buf,
-							m->m_ext.ext_size);
-			n->m_ext = m->m_ext;
-			n->m_flags |= M_EXT;
-		} else
-			bcopy(mtod(m, caddr_t)+off, mtod(n, caddr_t),
-			    (unsigned)n->m_len);
-		if (len != M_COPYALL)
-			len -= n->m_len;
-		off = 0;
-		m = m->m_next;
-		np = &n->m_next;
-	}
-	if (top == 0)
-		MCFail++;
-	return (top);
-nospace:
-	m_freem(top);
-	MCFail++;
-	return (0);
-}
-
-/*
- * Copy an entire packet, including header (which must be present).
- * An optimization of the common case `m_copym(m, 0, M_COPYALL, how)'.
- */
-struct mbuf *
-m_copypacket(m, how)
-	struct mbuf *m;
-	int how;
-{
-	struct mbuf *top, *n, *o;
-
-	MGET(n, how, m->m_type);
-	top = n;
-	if (!n)
-		goto nospace;
-
-	M_COPY_PKTHDR(n, m);
-	n->m_len = m->m_len;
-	if (m->m_flags & M_EXT) {
-		n->m_data = m->m_data;
-		mclrefcnt[mtocl(m->m_ext.ext_buf)]++;
-		n->m_ext = m->m_ext;
-		n->m_flags |= M_EXT;
-	} else {
-		bcopy(mtod(m, char *), mtod(n, char *), n->m_len);
-	}
-
-	m = m->m_next;
-	while (m) {
-		MGET(o, how, m->m_type);
-		if (!o)
-			goto nospace;
-
-		n->m_next = o;
-		n = n->m_next;
-
-		n->m_len = m->m_len;
-		if (m->m_flags & M_EXT) {
-			n->m_data = m->m_data;
-			mclrefcnt[mtocl(m->m_ext.ext_buf)]++;
-			n->m_ext = m->m_ext;
-			n->m_flags |= M_EXT;
-		} else {
-			bcopy(mtod(m, char *), mtod(n, char *), n->m_len);
-		}
-
-		m = m->m_next;
-	}
-	return top;
-nospace:
-	m_freem(top);
-	MCFail++;
-	return 0;
-}
-
-/*
- * Copy data from an mbuf chain starting "off" bytes from the beginning,
- * continuing for "len" bytes, into the indicated buffer.
- */
-void
-m_copydata(m, off, len, cp)
-	register struct mbuf *m;
-	register int off;
-	register int len;
-	caddr_t cp;
-{
-	register unsigned count;
-
-	if (off < 0 || len < 0)
-		panic("m_copydata");
-	while (off > 0) {
-		if (m == 0)
-			panic("m_copydata");
-		if (off < m->m_len)
-			break;
-		off -= m->m_len;
-		m = m->m_next;
-	}
-	while (len > 0) {
-		if (m == 0)
-			panic("m_copydata");
-		count = min(m->m_len - off, len);
-		bcopy(mtod(m, caddr_t) + off, cp, count);
-		len -= count;
-		cp += count;
-		off = 0;
-		m = m->m_next;
-	}
-}
-
-/*
- * Concatenate mbuf chain n to m.
- * Both chains must be of the same type (e.g. MT_DATA).
- * Any m_pkthdr is not updated.
- */
-void
-m_cat(m, n)
-	register struct mbuf *m, *n;
-{
-	while (m->m_next)
-		m = m->m_next;
-	while (n) {
-		if (m->m_flags & M_EXT ||
-		    m->m_data + m->m_len + n->m_len >= &m->m_dat[MLEN]) {
-			/* just join the two chains */
-			m->m_next = n;
-			return;
-		}
-		/* splat the data from one into the other */
-		bcopy(mtod(n, caddr_t), mtod(m, caddr_t) + m->m_len,
-		    (u_int)n->m_len);
-		m->m_len += n->m_len;
-		n = m_free(n);
-	}
-}
-
-void
-m_adj(mp, req_len)
-	struct mbuf *mp;
-	int req_len;
-{
-	register int len = req_len;
-	register struct mbuf *m;
-	register int count;
-
-	if ((m = mp) == NULL)
-		return;
-	if (len >= 0) {
-		/*
-		 * Trim from head.
-		 */
-		while (m != NULL && len > 0) {
-			if (m->m_len <= len) {
-				len -= m->m_len;
-				m->m_len = 0;
-				m = m->m_next;
-			} else {
-				m->m_len -= len;
-				m->m_data += len;
-				len = 0;
-			}
-		}
-		m = mp;
-		if (mp->m_flags & M_PKTHDR)
-			m->m_pkthdr.len -= (req_len - len);
-	} else {
-		/*
-		 * Trim from tail.  Scan the mbuf chain,
-		 * calculating its length and finding the last mbuf.
-		 * If the adjustment only affects this mbuf, then just
-		 * adjust and return.  Otherwise, rescan and truncate
-		 * after the remaining size.
-		 */
-		len = -len;
-		count = 0;
-		for (;;) {
-			count += m->m_len;
-			if (m->m_next == (struct mbuf *)0)
-				break;
-			m = m->m_next;
-		}
-		if (m->m_len >= len) {
-			m->m_len -= len;
-			if (mp->m_flags & M_PKTHDR)
-				mp->m_pkthdr.len -= len;
-			return;
-		}
-		count -= len;
-		if (count < 0)
-			count = 0;
-		/*
-		 * Correct length for chain is "count".
-		 * Find the mbuf with last data, adjust its length,
-		 * and toss data from remaining mbufs on chain.
-		 */
-		m = mp;
-		if (m->m_flags & M_PKTHDR)
-			m->m_pkthdr.len = count;
-		for (; m; m = m->m_next) {
-			if (m->m_len >= count) {
-				m->m_len = count;
-				break;
-			}
-			count -= m->m_len;
-		}
-		while (m->m_next)
-			(m = m->m_next) ->m_len = 0;
-	}
-}
-
-/*
- * Rearange an mbuf chain so that len bytes are contiguous
- * and in the data area of an mbuf (so that mtod and dtom
- * will work for a structure of size len).  Returns the resulting
- * mbuf chain on success, frees it and returns null on failure.
- * If there is room, it will add up to max_protohdr-len extra bytes to the
- * contiguous region in an attempt to avoid being called next time.
- */
-static int MPFail;
-
-struct mbuf *
-m_pullup(n, len)
-	register struct mbuf *n;
-	int len;
-{
-	register struct mbuf *m;
-	register int count;
-	int space;
-
-	/*
-	 * If first mbuf has no cluster, and has room for len bytes
-	 * without shifting current data, pullup into it,
-	 * otherwise allocate a new mbuf to prepend to the chain.
-	 */
-	if ((n->m_flags & M_EXT) == 0 &&
-	    n->m_data + len < &n->m_dat[MLEN] && n->m_next) {
-		if (n->m_len >= len)
-			return (n);
-		m = n;
-		n = n->m_next;
-		len -= m->m_len;
-	} else {
-		if (len > MHLEN)
-			goto bad;
-		MGET(m, M_DONTWAIT, n->m_type);
-		if (m == 0)
-			goto bad;
-		m->m_len = 0;
-		if (n->m_flags & M_PKTHDR) {
-			M_COPY_PKTHDR(m, n);
-			n->m_flags &= ~M_PKTHDR;
-		}
-	}
-	space = &m->m_dat[MLEN] - (m->m_data + m->m_len);
-	do {
-		count = min(min(max(len, max_protohdr), space), n->m_len);
-		bcopy(mtod(n, caddr_t), mtod(m, caddr_t) + m->m_len,
-		  (unsigned)count);
-		len -= count;
-		m->m_len += count;
-		n->m_len -= count;
-		space -= count;
-		if (n->m_len)
-			n->m_data += count;
-		else
-			n = m_free(n);
-	} while (len > 0 && n);
-	if (len > 0) {
-		(void) m_free(m);
-		goto bad;
-	}
-	m->m_next = n;
-	return (m);
-bad:
-	m_freem(n);
-	MPFail++;
-	return (0);
-}
-
-/*
- * Partition an mbuf chain in two pieces, returning the tail --
- * all but the first len0 bytes.  In case of failure, it returns NULL and
- * attempts to restore the chain to its original state.
- */
-struct mbuf *
-m_split(m0, len0, wait)
-	register struct mbuf *m0;
-	int len0, wait;
-{
-	register struct mbuf *m, *n;
-	unsigned len = len0, remain;
-
-	for (m = m0; m && len > m->m_len; m = m->m_next)
-		len -= m->m_len;
-	if (m == 0)
-		return (0);
-	remain = m->m_len - len;
-	if (m0->m_flags & M_PKTHDR) {
-		MGETHDR(n, wait, m0->m_type);
-		if (n == 0)
-			return (0);
-		n->m_pkthdr.rcvif = m0->m_pkthdr.rcvif;
-		n->m_pkthdr.len = m0->m_pkthdr.len - len0;
-		m0->m_pkthdr.len = len0;
-		if (m->m_flags & M_EXT)
-			goto extpacket;
-		if (remain > MHLEN) {
-			/* m can't be the lead packet */
-			MH_ALIGN(n, 0);
-			n->m_next = m_split(m, len, wait);
-			if (n->m_next == 0) {
-				(void) m_free(n);
-				return (0);
-			} else
-				return (n);
-		} else
-			MH_ALIGN(n, remain);
-	} else if (remain == 0) {
-		n = m->m_next;
-		m->m_next = 0;
-		return (n);
-	} else {
-		MGET(n, wait, m->m_type);
-		if (n == 0)
-			return (0);
-		M_ALIGN(n, remain);
-	}
-extpacket:
-	if (m->m_flags & M_EXT) {
-		n->m_flags |= M_EXT;
-		n->m_ext = m->m_ext;
-		if(!m->m_ext.ext_ref)
-			mclrefcnt[mtocl(m->m_ext.ext_buf)]++;
-		else
-			(*(m->m_ext.ext_ref))(m->m_ext.ext_buf,
-						m->m_ext.ext_size);
-		m->m_ext.ext_size = 0; /* For Accounting XXXXXX danger */
-		n->m_data = m->m_data + len;
-	} else {
-		bcopy(mtod(m, caddr_t) + len, mtod(n, caddr_t), remain);
-	}
-	n->m_len = remain;
-	m->m_len = len;
-	n->m_next = m->m_next;
-	m->m_next = 0;
-	return (n);
-}
-/*
- * Routine to copy from device local memory into mbufs.
- */
-struct mbuf *
-m_devget(buf, totlen, off0, ifp, copy)
-	char *buf;
-	int totlen, off0;
-	struct ifnet *ifp;
-	void (*copy) __P((char *from, caddr_t to, u_int len));
-{
-	register struct mbuf *m;
-	struct mbuf *top = 0, **mp = &top;
-	register int off = off0, len;
-	register char *cp;
-	char *epkt;
-
-	cp = buf;
-	epkt = cp + totlen;
-	if (off) {
-		cp += off + 2 * sizeof(u_short);
-		totlen -= 2 * sizeof(u_short);
-	}
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
-	if (m == 0)
-		return (0);
-	m->m_pkthdr.rcvif = ifp;
-	m->m_pkthdr.len = totlen;
-	m->m_len = MHLEN;
-
-	while (totlen > 0) {
-		if (top) {
-			MGET(m, M_DONTWAIT, MT_DATA);
-			if (m == 0) {
-				m_freem(top);
-				return (0);
-			}
-			m->m_len = MLEN;
-		}
-		len = min(totlen, epkt - cp);
-		if (len >= MINCLSIZE) {
-			MCLGET(m, M_DONTWAIT);
-			if (m->m_flags & M_EXT)
-				m->m_len = len = min(len, MCLBYTES);
-			else
-				len = m->m_len;
-		} else {
-			/*
-			 * Place initial small packet/header at end of mbuf.
-			 */
-			if (len < m->m_len) {
-				if (top == 0 && len + max_linkhdr <= m->m_len)
-					m->m_data += max_linkhdr;
-				m->m_len = len;
-			} else
-				len = m->m_len;
-		}
-		if (copy)
-			copy(cp, mtod(m, caddr_t), (unsigned)len);
-		else
-			bcopy(cp, mtod(m, caddr_t), (unsigned)len);
-		cp += len;
-		*mp = m;
-		mp = &m->m_next;
-		totlen -= len;
-		if (cp == epkt)
-			cp = buf;
-	}
-	return (top);
-}
-
-/*
- * Copy data from a buffer back into the indicated mbuf chain,
- * starting "off" bytes from the beginning, extending the mbuf
- * chain if necessary.
- */
-void
-m_copyback(m0, off, len, cp)
-	struct	mbuf *m0;
-	register int off;
-	register int len;
-	caddr_t cp;
-{
-	register int mlen;
-	register struct mbuf *m = m0, *n;
-	int totlen = 0;
-
-	if (m0 == 0)
-		return;
-	while (off > (mlen = m->m_len)) {
-		off -= mlen;
-		totlen += mlen;
-		if (m->m_next == 0) {
-			n = m_getclr(M_DONTWAIT, m->m_type);
-			if (n == 0)
-				goto out;
-			n->m_len = min(MLEN, len + off);
-			m->m_next = n;
-		}
-		m = m->m_next;
-	}
-	while (len > 0) {
-		mlen = min (m->m_len - off, len);
-		bcopy(cp, off + mtod(m, caddr_t), (unsigned)mlen);
-		cp += mlen;
-		len -= mlen;
-		mlen += off;
-		off = 0;
-		totlen += mlen;
-		if (len == 0)
-			break;
-		if (m->m_next == 0) {
-			n = m_get(M_DONTWAIT, m->m_type);
-			if (n == 0)
-				break;
-			n->m_len = min(MLEN, len);
-			m->m_next = n;
-		}
-		m = m->m_next;
-	}
-out:	if (((m = m0)->m_flags & M_PKTHDR) && (m->m_pkthdr.len < totlen))
-		m->m_pkthdr.len = totlen;
-}
diff --git a/cpukit/libnetworking/kern/uipc_socket.c b/cpukit/libnetworking/kern/uipc_socket.c
deleted file mode 100644
index 895d1c7d45..0000000000
--- a/cpukit/libnetworking/kern/uipc_socket.c
+++ /dev/null
@@ -1,1100 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1988, 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)uipc_socket.c	8.3 (Berkeley) 4/15/94
- * $Id$
- */
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/systm.h>
-#include <sys/proc.h>
-#include <sys/file.h>
-#include <sys/malloc.h>
-#include <sys/mbuf.h>
-#include <sys/domain.h>
-#include <sys/kernel.h>
-#include <sys/protosw.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/resourcevar.h>
-#include <sys/signalvar.h>
-#include <sys/sysctl.h>
-
-static int somaxconn = SOMAXCONN;
-SYSCTL_INT(_kern, KERN_SOMAXCONN, somaxconn, CTLFLAG_RW, &somaxconn, 0, "");
-
-/*
- * Socket operation routines.
- * These routines are called by the routines in
- * sys_socket.c or from a system process, and
- * implement the semantics of socket operations by
- * switching out to the protocol specific routines.
- */
-/*ARGSUSED*/
-int
-socreate(dom, aso, type, proto, p)
-	int dom;
-	struct socket **aso;
-	register int type;
-	int proto;
-	struct proc *p;
-{
-	register struct protosw *prp;
-	register struct socket *so;
-	register int error;
-
-	if (proto)
-		prp = pffindproto(dom, proto, type);
-	else
-		prp = pffindtype(dom, type);
-	if (prp == 0 || prp->pr_usrreqs == 0)
-		return (EPROTONOSUPPORT);
-	if (prp->pr_type != type)
-		return (EPROTOTYPE);
-	MALLOC(so, struct socket *, sizeof(*so), M_SOCKET, M_WAIT);
-	bzero((caddr_t)so, sizeof(*so));
-	TAILQ_INIT(&so->so_incomp);
-	TAILQ_INIT(&so->so_comp);
-	so->so_type = type;
-	so->so_state = SS_PRIV;
-	so->so_uid = 0;
-	so->so_proto = prp;
-	error = (*prp->pr_usrreqs->pru_attach)(so, proto);
-	if (error) {
-		so->so_state |= SS_NOFDREF;
-		sofree(so);
-		return (error);
-	}
-	*aso = so;
-	return (0);
-}
-
-int
-sobind(so, nam)
-	struct socket *so;
-	struct mbuf *nam;
-{
-	int s = splnet();
-	int error;
-
-	error = (*so->so_proto->pr_usrreqs->pru_bind)(so, nam);
-	splx(s);
-	return (error);
-}
-
-int
-solisten(so, backlog)
-	register struct socket *so;
-	int backlog;
-{
-	int s = splnet(), error;
-
-	error = (*so->so_proto->pr_usrreqs->pru_listen)(so);
-	if (error) {
-		splx(s);
-		return (error);
-	}
-	if (so->so_comp.tqh_first == NULL)
-		so->so_options |= SO_ACCEPTCONN;
-	if (backlog < 0 || backlog > somaxconn)
-		backlog = somaxconn;
-	so->so_qlimit = backlog;
-	splx(s);
-	return (0);
-}
-
-void
-sofree(so)
-	register struct socket *so;
-{
-	struct socket *head = so->so_head;
-
-	if (so->so_pcb || (so->so_state & SS_NOFDREF) == 0)
-		return;
-	if (head != NULL) {
-		if (so->so_state & SS_INCOMP) {
-			TAILQ_REMOVE(&head->so_incomp, so, so_list);
-			head->so_incqlen--;
-		} else if (so->so_state & SS_COMP) {
-			TAILQ_REMOVE(&head->so_comp, so, so_list);
-		} else {
-			panic("sofree: not queued");
-		}
-		head->so_qlen--;
-		so->so_state &= ~(SS_INCOMP|SS_COMP);
-		so->so_head = NULL;
-	}
-	sbrelease(&so->so_snd);
-	sorflush(so);
-	FREE(so, M_SOCKET);
-}
-
-/*
- * Close a socket on last file table reference removal.
- * Initiate disconnect if connected.
- * Free socket when disconnect complete.
- */
-int
-soclose(so)
-	register struct socket *so;
-{
-	int s = splnet();		/* conservative */
-	int error = 0;
-
-	if (so->so_options & SO_ACCEPTCONN) {
-		struct socket *sp, *sonext;
-
-		for (sp = so->so_incomp.tqh_first; sp != NULL; sp = sonext) {
-			sonext = sp->so_list.tqe_next;
-			(void) soabort(sp);
-		}
-		for (sp = so->so_comp.tqh_first; sp != NULL; sp = sonext) {
-			sonext = sp->so_list.tqe_next;
-			(void) soabort(sp);
-		}
-	}
-	if (so->so_pcb == 0)
-		goto discard;
-	if (so->so_state & SS_ISCONNECTED) {
-		if ((so->so_state & SS_ISDISCONNECTING) == 0) {
-			error = sodisconnect(so);
-			if (error)
-				goto drop;
-		}
-		if (so->so_options & SO_LINGER) {
-			if ((so->so_state & SS_ISDISCONNECTING) &&
-			    (so->so_state & SS_NBIO))
-				goto drop;
-			while (so->so_state & SS_ISCONNECTED) {
-				soconnsleep (so);
-			}
-		}
-	}
-drop:
-	if (so->so_pcb) {
-		int error2 = (*so->so_proto->pr_usrreqs->pru_detach)(so);
-		if (error == 0)
-			error = error2;
-	}
-discard:
-	if (so->so_state & SS_NOFDREF)
-		panic("soclose: NOFDREF");
-	so->so_state |= SS_NOFDREF;
-	sofree(so);
-	splx(s);
-	return (error);
-}
-
-/*
- * Must be called at splnet...
- */
-int
-soabort(so)
-	struct socket *so;
-{
-
-	return (*so->so_proto->pr_usrreqs->pru_abort)(so);
-}
-
-int
-soaccept(so, nam)
-	register struct socket *so;
-	struct mbuf *nam;
-{
-	int s = splnet();
-	int error;
-
-	if ((so->so_state & SS_NOFDREF) == 0)
-		panic("soaccept: !NOFDREF");
-	so->so_state &= ~SS_NOFDREF;
-	error = (*so->so_proto->pr_usrreqs->pru_accept)(so, nam);
-	splx(s);
-	return (error);
-}
-
-int
-soconnect(so, nam)
-	register struct socket *so;
-	struct mbuf *nam;
-{
-	int s;
-	int error;
-
-	if (so->so_options & SO_ACCEPTCONN)
-		return (EOPNOTSUPP);
-	s = splnet();
-	/*
-	 * If protocol is connection-based, can only connect once.
-	 * Otherwise, if connected, try to disconnect first.
-	 * This allows user to disconnect by connecting to, e.g.,
-	 * a null address.
-	 */
-	if (so->so_state & (SS_ISCONNECTED|SS_ISCONNECTING) &&
-	    ((so->so_proto->pr_flags & PR_CONNREQUIRED) ||
-	    (error = sodisconnect(so))))
-		error = EISCONN;
-	else
-		error = (*so->so_proto->pr_usrreqs->pru_connect)(so, nam);
-	splx(s);
-	return (error);
-}
-
-int
-soconnect2(so1, so2)
-	register struct socket *so1;
-	struct socket *so2;
-{
-	int s = splnet();
-	int error;
-
-	error = (*so1->so_proto->pr_usrreqs->pru_connect2)(so1, so2);
-	splx(s);
-	return (error);
-}
-
-int
-sodisconnect(so)
-	register struct socket *so;
-{
-	int s = splnet();
-	int error;
-
-	if ((so->so_state & SS_ISCONNECTED) == 0) {
-		error = ENOTCONN;
-		goto bad;
-	}
-	if (so->so_state & SS_ISDISCONNECTING) {
-		error = EALREADY;
-		goto bad;
-	}
-	error = (*so->so_proto->pr_usrreqs->pru_disconnect)(so);
-bad:
-	splx(s);
-	return (error);
-}
-
-#define	SBLOCKWAIT(f)	(((f) & MSG_DONTWAIT) ? M_NOWAIT : M_WAITOK)
-/*
- * Send on a socket.
- * If send must go all at once and message is larger than
- * send buffering, then hard error.
- * Lock against other senders.
- * If must go all at once and not enough room now, then
- * inform user that this would block and do nothing.
- * Otherwise, if nonblocking, send as much as possible.
- * The data to be sent is described by "uio" if nonzero,
- * otherwise by the mbuf chain "top" (which must be null
- * if uio is not).  Data provided in mbuf chain must be small
- * enough to send all at once.
- *
- * Returns nonzero on error, timeout or signal; callers
- * must check for short counts if EINTR/ERESTART are returned.
- * Data and control buffers are freed on return.
- */
-int
-sosend(so, addr, uio, top, control, flags)
-	register struct socket *so;
-	struct mbuf *addr;
-	struct uio *uio;
-	struct mbuf *top;
-	struct mbuf *control;
-	int flags;
-{
-	struct mbuf **mp;
-	register struct mbuf *m;
-	register long space, len, resid;
-	int clen = 0, error, s, dontroute, mlen;
-	int atomic = sosendallatonce(so) || top;
-
-	if (uio)
-		resid = uio->uio_resid;
-	else
-		resid = top->m_pkthdr.len;
-	/*
-	 * In theory resid should be unsigned.
-	 * However, space must be signed, as it might be less than 0
-	 * if we over-committed, and we must use a signed comparison
-	 * of space and resid.  On the other hand, a negative resid
-	 * causes us to loop sending 0-length segments to the protocol.
-	 *
-	 * Also check to make sure that MSG_EOR isn't used on SOCK_STREAM
-	 * type sockets since that's an error.
-	 */
-	if ((resid < 0) || (so->so_type == SOCK_STREAM && (flags & MSG_EOR))) {
-		error = EINVAL;
-		goto out;
-	}
-
-	dontroute =
-	    (flags & MSG_DONTROUTE) && (so->so_options & SO_DONTROUTE) == 0 &&
-	    (so->so_proto->pr_flags & PR_ATOMIC);
-	if (control)
-		clen = control->m_len;
-#define	snderr(errno)	{ error = errno; splx(s); goto release; }
-
-restart:
-	error = sblock(&so->so_snd, SBLOCKWAIT(flags));
-	if (error)
-		goto out;
-	do {
-		s = splnet();
-		if (so->so_state & SS_CANTSENDMORE)
-			snderr(EPIPE);
-		if (so->so_error) {
-			error = so->so_error;
-			so->so_error = 0;
-			splx(s);
-			goto release;
-		}
-		if ((so->so_state & SS_ISCONNECTED) == 0) {
-			/*
-			 * `sendto' and `sendmsg' is allowed on a connection-
-			 * based socket if it supports implied connect.
-			 * Return ENOTCONN if not connected and no address is
-			 * supplied.
-			 */
-			if ((so->so_proto->pr_flags & PR_CONNREQUIRED) &&
-			    (so->so_proto->pr_flags & PR_IMPLOPCL) == 0) {
-				if ((so->so_state & SS_ISCONFIRMING) == 0 &&
-				    !(resid == 0 && clen != 0))
-					snderr(ENOTCONN);
-			} else if (addr == 0)
-			    snderr(so->so_proto->pr_flags & PR_CONNREQUIRED ?
-				   ENOTCONN : EDESTADDRREQ);
-		}
-		space = sbspace(&so->so_snd);
-		if (flags & MSG_OOB)
-			space += 1024;
-		if ((atomic && resid > so->so_snd.sb_hiwat) ||
-		    clen > so->so_snd.sb_hiwat)
-			snderr(EMSGSIZE);
-		if (space < resid + clen && uio &&
-		    (atomic || space < so->so_snd.sb_lowat || space < clen)) {
-			if (so->so_state & SS_NBIO)
-				snderr(EWOULDBLOCK);
-			sbunlock(&so->so_snd);
-			error = sbwait(&so->so_snd);
-			splx(s);
-			if (error)
-				goto out;
-			goto restart;
-		}
-		splx(s);
-		mp = &top;
-		space -= clen;
-		do {
-		    if (uio == NULL) {
-			/*
-			 * Data is prepackaged in "top".
-			 */
-			resid = 0;
-			if (flags & MSG_EOR)
-				top->m_flags |= M_EOR;
-		    } else do {
-			if (top == 0) {
-				MGETHDR(m, M_WAIT, MT_DATA);
-				mlen = MHLEN;
-				m->m_pkthdr.len = 0;
-				m->m_pkthdr.rcvif = (struct ifnet *)0;
-			} else {
-				MGET(m, M_WAIT, MT_DATA);
-				mlen = MLEN;
-			}
-			if (resid >= MINCLSIZE) {
-				MCLGET(m, M_WAIT);
-				if ((m->m_flags & M_EXT) == 0)
-					goto nopages;
-				mlen = MCLBYTES;
-				len = min(min(mlen, resid), space);
-			} else {
-nopages:
-				len = min(min(mlen, resid), space);
-				/*
-				 * For datagram protocols, leave room
-				 * for protocol headers in first mbuf.
-				 */
-				if (atomic && top == 0 && len < mlen)
-					MH_ALIGN(m, len);
-			}
-			space -= len;
-			error = uiomove(mtod(m, caddr_t), (int)len, uio);
-			resid = uio->uio_resid;
-			m->m_len = len;
-			*mp = m;
-			top->m_pkthdr.len += len;
-			if (error)
-				goto release;
-			mp = &m->m_next;
-			if (resid <= 0) {
-				if (flags & MSG_EOR)
-					top->m_flags |= M_EOR;
-				break;
-			}
-		    } while (space > 0 && atomic);
-		    if (dontroute)
-			    so->so_options |= SO_DONTROUTE;
-		    s = splnet();				/* XXX */
-		    error = (*so->so_proto->pr_usrreqs->pru_send)(so,
-			(flags & MSG_OOB) ? PRUS_OOB :
-			/*
-			 * If the user set MSG_EOF, the protocol
-			 * understands this flag and nothing left to
-			 * send then use PRU_SEND_EOF instead of PRU_SEND.
-			 */
-			((flags & MSG_EOF) &&
-			 (so->so_proto->pr_flags & PR_IMPLOPCL) &&
-			 (resid <= 0)) ?
-				PRUS_EOF : 0,
-			top, addr, control);
-		    splx(s);
-		    if (dontroute)
-			    so->so_options &= ~SO_DONTROUTE;
-		    clen = 0;
-		    control = 0;
-		    top = 0;
-		    mp = &top;
-		    if (error)
-			goto release;
-		} while (resid && space > 0);
-	} while (resid);
-
-release:
-	sbunlock(&so->so_snd);
-out:
-	if (top)
-		m_freem(top);
-	if (control)
-		m_freem(control);
-	return (error);
-}
-
-/*
- * Implement receive operations on a socket.
- * We depend on the way that records are added to the sockbuf
- * by sbappend*.  In particular, each record (mbufs linked through m_next)
- * must begin with an address if the protocol so specifies,
- * followed by an optional mbuf or mbufs containing ancillary data,
- * and then zero or more mbufs of data.
- * In order to avoid blocking network interrupts for the entire time here,
- * we splx() while doing the actual copy to user space.
- * Although the sockbuf is locked, new data may still be appended,
- * and thus we must maintain consistency of the sockbuf during that time.
- *
- * The caller may receive the data as a single mbuf chain by supplying
- * an mbuf **mp0 for use in returning the chain.  The uio is then used
- * only for the count in uio_resid.
- */
-int
-soreceive(so, paddr, uio, mp0, controlp, flagsp)
-	register struct socket *so;
-	struct mbuf **paddr;
-	struct uio *uio;
-	struct mbuf **mp0;
-	struct mbuf **controlp;
-	int *flagsp;
-{
-	register struct mbuf *m, **mp;
-	register int flags, len, error, s, offset;
-	struct protosw *pr = so->so_proto;
-	struct mbuf *nextrecord;
-	int moff, type = 0;
-	int orig_resid = uio->uio_resid;
-
-	mp = mp0;
-	if (paddr)
-		*paddr = 0;
-	if (controlp)
-		*controlp = 0;
-	if (flagsp)
-		flags = *flagsp &~ MSG_EOR;
-	else
-		flags = 0;
-	if (flags & MSG_OOB) {
-		m = m_get(M_WAIT, MT_DATA);
-		error = (*pr->pr_usrreqs->pru_rcvoob)(so, m, flags & MSG_PEEK);
-		if (error)
-			goto bad;
-		do {
-			error = uiomove(mtod(m, caddr_t),
-			    (int) min(uio->uio_resid, m->m_len), uio);
-			m = m_free(m);
-		} while (uio->uio_resid && error == 0 && m);
-bad:
-		if (m)
-			m_freem(m);
-		return (error);
-	}
-	if (mp)
-		*mp = (struct mbuf *)0;
-	if (so->so_state & SS_ISCONFIRMING && uio->uio_resid)
-		(*pr->pr_usrreqs->pru_rcvd)(so, 0);
-
-restart:
-	error = sblock(&so->so_rcv, SBLOCKWAIT(flags));
-	if (error)
-		return (error);
-	s = splnet();
-
-	m = so->so_rcv.sb_mb;
-	/*
-	 * If we have less data than requested, block awaiting more
-	 * (subject to any timeout) if:
-	 *   1. the current count is less than the low water mark, or
-	 *   2. MSG_WAITALL is set, and it is possible to do the entire
-	 *	receive operation at once if we block (resid <= hiwat).
-	 *   3. MSG_DONTWAIT is not set
-	 * If MSG_WAITALL is set but resid is larger than the receive buffer,
-	 * we have to do the receive in sections, and thus risk returning
-	 * a short count if a timeout or signal occurs after we start.
-	 */
-	if (m == 0 || (((flags & MSG_DONTWAIT) == 0 &&
-	    so->so_rcv.sb_cc < uio->uio_resid) &&
-	    (so->so_rcv.sb_cc < so->so_rcv.sb_lowat ||
-	    ((flags & MSG_WAITALL) && uio->uio_resid <= so->so_rcv.sb_hiwat)) &&
-	    m->m_nextpkt == 0 && (pr->pr_flags & PR_ATOMIC) == 0)) {
-#ifdef DIAGNOSTIC
-		if (m == 0 && so->so_rcv.sb_cc)
-			panic("receive 1");
-#endif
-		if (so->so_error) {
-			if (m)
-				goto dontblock;
-			error = so->so_error;
-			if ((flags & MSG_PEEK) == 0)
-				so->so_error = 0;
-			goto release;
-		}
-		if (so->so_state & SS_CANTRCVMORE) {
-			if (m)
-				goto dontblock;
-			else
-				goto release;
-		}
-		for (; m; m = m->m_next)
-			if (m->m_type == MT_OOBDATA  || (m->m_flags & M_EOR)) {
-				m = so->so_rcv.sb_mb;
-				goto dontblock;
-			}
-		if ((so->so_state & (SS_ISCONNECTED|SS_ISCONNECTING)) == 0 &&
-		    (so->so_proto->pr_flags & PR_CONNREQUIRED)) {
-			error = ENOTCONN;
-			goto release;
-		}
-		if (uio->uio_resid == 0)
-			goto release;
-		if ((so->so_state & SS_NBIO) || (flags & MSG_DONTWAIT)) {
-			error = EWOULDBLOCK;
-			goto release;
-		}
-		sbunlock(&so->so_rcv);
-		error = sbwait(&so->so_rcv);
-		splx(s);
-		if (error)
-			return (error);
-		goto restart;
-	}
-dontblock:
-	nextrecord = m->m_nextpkt;
-	if (pr->pr_flags & PR_ADDR) {
-#ifdef DIAGNOSTIC
-		if (m->m_type != MT_SONAME)
-			panic("receive 1a");
-#endif
-		orig_resid = 0;
-		if (flags & MSG_PEEK) {
-			if (paddr)
-				*paddr = m_copy(m, 0, m->m_len);
-			m = m->m_next;
-		} else {
-			sbfree(&so->so_rcv, m);
-			if (paddr) {
-				*paddr = m;
-				so->so_rcv.sb_mb = m->m_next;
-				m->m_next = 0;
-				m = so->so_rcv.sb_mb;
-			} else {
-				MFREE(m, so->so_rcv.sb_mb);
-				m = so->so_rcv.sb_mb;
-			}
-		}
-	}
-	while (m && m->m_type == MT_CONTROL && error == 0) {
-		if (flags & MSG_PEEK) {
-			if (controlp)
-				*controlp = m_copy(m, 0, m->m_len);
-			m = m->m_next;
-		} else {
-			sbfree(&so->so_rcv, m);
-			if (controlp) {
-				if (pr->pr_domain->dom_externalize &&
-				    mtod(m, struct cmsghdr *)->cmsg_type ==
-				    SCM_RIGHTS)
-				   error = (*pr->pr_domain->dom_externalize)(m);
-				*controlp = m;
-				so->so_rcv.sb_mb = m->m_next;
-				m->m_next = 0;
-				m = so->so_rcv.sb_mb;
-			} else {
-				MFREE(m, so->so_rcv.sb_mb);
-				m = so->so_rcv.sb_mb;
-			}
-		}
-		if (controlp) {
-			orig_resid = 0;
-			controlp = &(*controlp)->m_next;
-		}
-	}
-	if (m) {
-		if ((flags & MSG_PEEK) == 0)
-			m->m_nextpkt = nextrecord;
-		type = m->m_type;
-		if (type == MT_OOBDATA)
-			flags |= MSG_OOB;
-	}
-	moff = 0;
-	offset = 0;
-	while (m && uio->uio_resid > 0 && error == 0) {
-		if (m->m_type == MT_OOBDATA) {
-			if (type != MT_OOBDATA)
-				break;
-		} else if (type == MT_OOBDATA)
-			break;
-#ifdef DIAGNOSTIC
-		else if (m->m_type != MT_DATA && m->m_type != MT_HEADER)
-			panic("receive 3");
-#endif
-		so->so_state &= ~SS_RCVATMARK;
-		len = uio->uio_resid;
-		if (so->so_oobmark && len > so->so_oobmark - offset)
-			len = so->so_oobmark - offset;
-		if (len > m->m_len - moff)
-			len = m->m_len - moff;
-		/*
-		 * If mp is set, just pass back the mbufs.
-		 * Otherwise copy them out via the uio, then free.
-		 * Sockbuf must be consistent here (points to current mbuf,
-		 * it points to next record) when we drop priority;
-		 * we must note any additions to the sockbuf when we
-		 * block interrupts again.
-		 */
-		if (mp == 0) {
-			splx(s);
-			error = uiomove(mtod(m, caddr_t) + moff, (int)len, uio);
-			s = splnet();
-			if (error)
-				goto release;
-		} else
-			uio->uio_resid -= len;
-		if (len == m->m_len - moff) {
-			if (m->m_flags & M_EOR)
-				flags |= MSG_EOR;
-			if (flags & MSG_PEEK) {
-				m = m->m_next;
-				moff = 0;
-			} else {
-				nextrecord = m->m_nextpkt;
-				sbfree(&so->so_rcv, m);
-				if (mp) {
-					*mp = m;
-					mp = &m->m_next;
-					so->so_rcv.sb_mb = m = m->m_next;
-					*mp = (struct mbuf *)0;
-				} else {
-					MFREE(m, so->so_rcv.sb_mb);
-					m = so->so_rcv.sb_mb;
-				}
-				if (m)
-					m->m_nextpkt = nextrecord;
-			}
-		} else {
-			if (flags & MSG_PEEK)
-				moff += len;
-			else {
-				if (mp)
-					*mp = m_copym(m, 0, len, M_WAIT);
-				m->m_data += len;
-				m->m_len -= len;
-				so->so_rcv.sb_cc -= len;
-			}
-		}
-		if (so->so_oobmark) {
-			if ((flags & MSG_PEEK) == 0) {
-				so->so_oobmark -= len;
-				if (so->so_oobmark == 0) {
-					so->so_state |= SS_RCVATMARK;
-					break;
-				}
-			} else {
-				offset += len;
-				if (offset == so->so_oobmark)
-					break;
-			}
-		}
-		if (flags & MSG_EOR)
-			break;
-		/*
-		 * If the MSG_WAITALL flag is set (for non-atomic socket),
-		 * we must not quit until "uio->uio_resid == 0" or an error
-		 * termination.  If a signal/timeout occurs, return
-		 * with a short count but without error.
-		 * Keep sockbuf locked against other readers.
-		 */
-		while (flags & MSG_WAITALL && m == 0 && uio->uio_resid > 0 &&
-		    !sosendallatonce(so) && !nextrecord) {
-			if (so->so_error || so->so_state & SS_CANTRCVMORE)
-				break;
-			error = sbwait(&so->so_rcv);
-			if (error) {
-				sbunlock(&so->so_rcv);
-				splx(s);
-				return (0);
-			}
-			m = so->so_rcv.sb_mb;
-			if (m)
-				nextrecord = m->m_nextpkt;
-		}
-	}
-
-	if (m && pr->pr_flags & PR_ATOMIC) {
-		flags |= MSG_TRUNC;
-		if ((flags & MSG_PEEK) == 0)
-			(void) sbdroprecord(&so->so_rcv);
-	}
-	if ((flags & MSG_PEEK) == 0) {
-		if (m == 0)
-			so->so_rcv.sb_mb = nextrecord;
-		if (pr->pr_flags & PR_WANTRCVD && so->so_pcb)
-			(*pr->pr_usrreqs->pru_rcvd)(so, flags);
-	}
-	if (orig_resid == uio->uio_resid && orig_resid &&
-	    (flags & MSG_EOR) == 0 && (so->so_state & SS_CANTRCVMORE) == 0) {
-		sbunlock(&so->so_rcv);
-		splx(s);
-		goto restart;
-	}
-
-	if (flagsp)
-		*flagsp |= flags;
-release:
-	sbunlock(&so->so_rcv);
-	splx(s);
-	return (error);
-}
-
-int
-soshutdown(so, how)
-	register struct socket *so;
-	register int how;
-{
-	register struct protosw *pr = so->so_proto;
-
-	how++;
-	if (how & FREAD)
-		sorflush(so);
-	if (how & FWRITE)
-		return ((*pr->pr_usrreqs->pru_shutdown)(so));
-	return (0);
-}
-
-void
-sorflush(so)
-	register struct socket *so;
-{
-	register struct sockbuf *sb = &so->so_rcv;
-	register struct protosw *pr = so->so_proto;
-	register int s;
-	struct sockbuf asb;
-
-	sb->sb_flags |= SB_NOINTR;
-	(void) sblock(sb, M_WAITOK);
-	s = splimp();
-	socantrcvmore(so);
-	sbunlock(sb);
-	asb = *sb;
-	bzero((caddr_t)sb, sizeof (*sb));
-	splx(s);
-	if (pr->pr_flags & PR_RIGHTS && pr->pr_domain->dom_dispose)
-		(*pr->pr_domain->dom_dispose)(asb.sb_mb);
-	sbrelease(&asb);
-}
-
-int
-sosetopt(so, level, optname, m0)
-	register struct socket *so;
-	int level, optname;
-	struct mbuf *m0;
-{
-	int error = 0;
-	register struct mbuf *m = m0;
-
-	if (level != SOL_SOCKET) {
-		if (so->so_proto && so->so_proto->pr_ctloutput)
-			return ((*so->so_proto->pr_ctloutput)
-				  (PRCO_SETOPT, so, level, optname, &m0));
-		error = ENOPROTOOPT;
-	} else {
-		switch (optname) {
-
-		case SO_LINGER:
-			if (m == NULL || m->m_len != sizeof (struct linger)) {
-				error = EINVAL;
-				goto bad;
-			}
-			so->so_linger = mtod(m, struct linger *)->l_linger;
-			/* fall thru... */
-
-		case SO_DEBUG:
-		case SO_KEEPALIVE:
-		case SO_DONTROUTE:
-		case SO_USELOOPBACK:
-		case SO_BROADCAST:
-		case SO_REUSEADDR:
-		case SO_REUSEPORT:
-		case SO_OOBINLINE:
-		case SO_TIMESTAMP:
-			if (m == NULL || m->m_len < sizeof (int)) {
-				error = EINVAL;
-				goto bad;
-			}
-			if (*mtod(m, int *))
-				so->so_options |= optname;
-			else
-				so->so_options &= ~optname;
-			break;
-
-		case SO_SNDBUF:
-		case SO_RCVBUF:
-		case SO_SNDLOWAT:
-		case SO_RCVLOWAT:
-		    {
-			int optval;
-
-			if (m == NULL || m->m_len < sizeof (int)) {
-				error = EINVAL;
-				goto bad;
-			}
-
-			/*
-			 * Values < 1 make no sense for any of these
-			 * options, so disallow them.
-			 */
-			optval = *mtod(m, int *);
-			if (optval < 1) {
-				error = EINVAL;
-				goto bad;
-			}
-
-			switch (optname) {
-
-			case SO_SNDBUF:
-			case SO_RCVBUF:
-				if (sbreserve(optname == SO_SNDBUF ?
-				    &so->so_snd : &so->so_rcv,
-				    (u_long) optval) == 0) {
-					error = ENOBUFS;
-					goto bad;
-				}
-				break;
-
-			/*
-			 * Make sure the low-water is never greater than
-			 * the high-water.
-			 */
-			case SO_SNDLOWAT:
-				so->so_snd.sb_lowat =
-				    (optval > so->so_snd.sb_hiwat) ?
-				    so->so_snd.sb_hiwat : optval;
-				break;
-			case SO_RCVLOWAT:
-				so->so_rcv.sb_lowat =
-				    (optval > so->so_rcv.sb_hiwat) ?
-				    so->so_rcv.sb_hiwat : optval;
-				break;
-			}
-			break;
-		    }
-
-		case SO_SNDTIMEO:
-		case SO_RCVTIMEO:
-		    {
-			struct timeval *tv;
-			short val;
-
-			if (m == NULL || m->m_len < sizeof (*tv)) {
-				error = EINVAL;
-				goto bad;
-			}
-			tv = mtod(m, struct timeval *);
-			if (tv->tv_sec > SHRT_MAX / hz - hz) {
-				error = EDOM;
-				goto bad;
-			}
-			val = tv->tv_sec * hz + tv->tv_usec / tick;
-
-			switch (optname) {
-
-			case SO_SNDTIMEO:
-				so->so_snd.sb_timeo = val;
-				break;
-			case SO_RCVTIMEO:
-				so->so_rcv.sb_timeo = val;
-				break;
-			}
-			break;
-		    }
-
-		case SO_PRIVSTATE:
-			/* we don't care what the parameter is... */
-			so->so_state &= ~SS_PRIV;
-			break;
-
-		default:
-			error = ENOPROTOOPT;
-			break;
-		}
-		if (error == 0 && so->so_proto && so->so_proto->pr_ctloutput) {
-			(void) ((*so->so_proto->pr_ctloutput)
-				  (PRCO_SETOPT, so, level, optname, &m0));
-			m = NULL;	/* freed by protocol */
-		}
-	}
-bad:
-	if (m)
-		(void) m_free(m);
-	return (error);
-}
-
-int
-sogetopt(so, level, optname, mp)
-	register struct socket *so;
-	int level, optname;
-	struct mbuf **mp;
-{
-	register struct mbuf *m;
-
-	if (level != SOL_SOCKET) {
-		if (so->so_proto && so->so_proto->pr_ctloutput) {
-			return ((*so->so_proto->pr_ctloutput)
-				  (PRCO_GETOPT, so, level, optname, mp));
-		} else
-			return (ENOPROTOOPT);
-	} else {
-		m = m_get(M_WAIT, MT_SOOPTS);
-		m->m_len = sizeof (int);
-
-		switch (optname) {
-
-		case SO_LINGER:
-			m->m_len = sizeof (struct linger);
-			mtod(m, struct linger *)->l_onoff =
-				so->so_options & SO_LINGER;
-			mtod(m, struct linger *)->l_linger = so->so_linger;
-			break;
-
-		case SO_USELOOPBACK:
-		case SO_DONTROUTE:
-		case SO_DEBUG:
-		case SO_KEEPALIVE:
-		case SO_REUSEADDR:
-		case SO_REUSEPORT:
-		case SO_BROADCAST:
-		case SO_OOBINLINE:
-		case SO_TIMESTAMP:
-			*mtod(m, int *) = so->so_options & optname;
-			break;
-
-		case SO_PRIVSTATE:
-			*mtod(m, int *) = so->so_state & SS_PRIV;
-			break;
-
-		case SO_TYPE:
-			*mtod(m, int *) = so->so_type;
-			break;
-
-		case SO_ERROR:
-			*mtod(m, int *) = so->so_error;
-			so->so_error = 0;
-			break;
-
-		case SO_SNDBUF:
-			*mtod(m, int *) = so->so_snd.sb_hiwat;
-			break;
-
-		case SO_RCVBUF:
-			*mtod(m, int *) = so->so_rcv.sb_hiwat;
-			break;
-
-		case SO_SNDLOWAT:
-			*mtod(m, int *) = so->so_snd.sb_lowat;
-			break;
-
-		case SO_RCVLOWAT:
-			*mtod(m, int *) = so->so_rcv.sb_lowat;
-			break;
-
-		case SO_SNDTIMEO:
-		case SO_RCVTIMEO:
-		    {
-			int val = (optname == SO_SNDTIMEO ?
-			     so->so_snd.sb_timeo : so->so_rcv.sb_timeo);
-
-			m->m_len = sizeof(struct timeval);
-			mtod(m, struct timeval *)->tv_sec = val / hz;
-			mtod(m, struct timeval *)->tv_usec =
-			    (val % hz) * tick;
-			break;
-		    }
-
-		default:
-			(void)m_free(m);
-			return (ENOPROTOOPT);
-		}
-		*mp = m;
-		return (0);
-	}
-}
-
-void
-sohasoutofband(so)
-	register struct socket *so;
-{
-#if 0	/* FIXME: For now we just ignore out of band data */
-	struct proc *p;
-
-	if (so->so_pgid < 0)
-		gsignal(-so->so_pgid, SIGURG);
-	else if (so->so_pgid > 0 && (p = pfind(so->so_pgid)) != 0)
-		psignal(p, SIGURG);
-	selwakeup(&so->so_rcv.sb_sel);
-#endif
-}
diff --git a/cpukit/libnetworking/kern/uipc_socket2.c b/cpukit/libnetworking/kern/uipc_socket2.c
deleted file mode 100644
index 0539d2c5f3..0000000000
--- a/cpukit/libnetworking/kern/uipc_socket2.c
+++ /dev/null
@@ -1,965 +0,0 @@
-/*
- * This file has undergone several changes to reflect the
- * differences between the RTEMS and FreeBSD kernels.
- */
-
-/*
- * Copyright (c) 1982, 1986, 1988, 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)uipc_socket2.c	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/proc.h>
-#include <sys/file.h>
-#include <sys/buf.h>
-#include <sys/malloc.h>
-#include <sys/mbuf.h>
-#include <sys/protosw.h>
-#include <sys/stat.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/signalvar.h>
-#include <sys/sysctl.h>
-
-/*
- * Primitive routines for operating on sockets and socket buffers
- */
-
-u_long	sb_max = SB_MAX;		/* XXX should be static */
-SYSCTL_INT(_kern, KERN_MAXSOCKBUF, maxsockbuf, CTLFLAG_RW, &sb_max, 0, "")
-
-static	u_long sb_efficiency = 8;	/* parameter for sbreserve() */
-SYSCTL_INT(_kern, OID_AUTO, sockbuf_waste_factor, CTLFLAG_RW, &sb_efficiency,
-	   0, "");
-
-/*
- * Procedures to manipulate state flags of socket
- * and do appropriate wakeups.  Normal sequence from the
- * active (originating) side is that soisconnecting() is
- * called during processing of connect() call,
- * resulting in an eventual call to soisconnected() if/when the
- * connection is established.  When the connection is torn down
- * soisdisconnecting() is called during processing of disconnect() call,
- * and soisdisconnected() is called when the connection to the peer
- * is totally severed.  The semantics of these routines are such that
- * connectionless protocols can call soisconnected() and soisdisconnected()
- * only, bypassing the in-progress calls when setting up a ``connection''
- * takes no time.
- *
- * From the passive side, a socket is created with
- * two queues of sockets: so_q0 for connections in progress
- * and so_q for connections already made and awaiting user acceptance.
- * As a protocol is preparing incoming connections, it creates a socket
- * structure queued on so_q0 by calling sonewconn().  When the connection
- * is established, soisconnected() is called, and transfers the
- * socket structure to so_q, making it available to accept().
- *
- * If a socket is closed with sockets on either
- * so_q0 or so_q, these sockets are dropped.
- *
- * If higher level protocols are implemented in
- * the kernel, the wakeups done here will sometimes
- * cause software-interrupt process scheduling.
- */
-
-void
-soisconnecting(so)
-	register struct socket *so;
-{
-
-	so->so_state &= ~(SS_ISCONNECTED|SS_ISDISCONNECTING);
-	so->so_state |= SS_ISCONNECTING;
-}
-
-void
-soisconnected(so)
-	register struct socket *so;
-{
-	register struct socket *head = so->so_head;
-
-	so->so_state &= ~(SS_ISCONNECTING|SS_ISDISCONNECTING|SS_ISCONFIRMING);
-	so->so_state |= SS_ISCONNECTED;
-	if (head && (so->so_state & SS_INCOMP)) {
-		TAILQ_REMOVE(&head->so_incomp, so, so_list);
-		head->so_incqlen--;
-		so->so_state &= ~SS_INCOMP;
-		TAILQ_INSERT_TAIL(&head->so_comp, so, so_list);
-		so->so_state |= SS_COMP;
-		sorwakeup(head);
-		soconnwakeup(head);
-	} else {
-		soconnwakeup(so);
-		sorwakeup(so);
-		sowwakeup(so);
-	}
-}
-
-void
-soisdisconnecting(so)
-	register struct socket *so;
-{
-
-	so->so_state &= ~SS_ISCONNECTING;
-	so->so_state |= (SS_ISDISCONNECTING|SS_CANTRCVMORE|SS_CANTSENDMORE);
-	soconnwakeup(so);
-	sowwakeup(so);
-	sorwakeup(so);
-}
-
-void
-soisdisconnected(so)
-	register struct socket *so;
-{
-
-	so->so_state &= ~(SS_ISCONNECTING|SS_ISCONNECTED|SS_ISDISCONNECTING);
-	so->so_state |= (SS_CANTRCVMORE|SS_CANTSENDMORE);
-	soconnwakeup(so);
-	sowwakeup(so);
-	sorwakeup(so);
-}
-
-/*
- * Return a random connection that hasn't been serviced yet and
- * is eligible for discard.  There is a one in qlen chance that
- * we will return a null, saying that there are no dropable
- * requests.  In this case, the protocol specific code should drop
- * the new request.  This insures fairness.
- *
- * This may be used in conjunction with protocol specific queue
- * congestion routines.
- */
-struct socket *
-sodropablereq(head)
-	register struct socket *head;
-{
-	register struct socket *so;
-	unsigned int i, j, qlen, m;
-
-	static int rnd;
-	static long old_mono_secs;
-	static unsigned int cur_cnt, old_cnt;
-
-	if ((i = (m = rtems_bsdnet_seconds_since_boot()) - old_mono_secs) != 0) {
-		old_mono_secs = m;
-		old_cnt = cur_cnt / i;
-		cur_cnt = 0;
-	}
-
-	so = TAILQ_FIRST(&head->so_incomp);
-	if (!so)
-		return (so);
-
-	qlen = head->so_incqlen;
-	if (++cur_cnt > qlen || old_cnt > qlen) {
-		rnd = (314159 * rnd + 66329) & 0xffff;
-		j = ((qlen + 1) * rnd) >> 16;
-
-		while (j-- && so)
-		    so = TAILQ_NEXT(so, so_list);
-	}
-
-	return (so);
-}
-
-/*
- * When an attempt at a new connection is noted on a socket
- * which accepts connections, sonewconn is called.  If the
- * connection is possible (subject to space constraints, etc.)
- * then we allocate a new structure, propoerly linked into the
- * data structure of the original socket, and return this.
- * Connstatus may be 0, or SO_ISCONFIRMING, or SO_ISCONNECTED.
- *
- * Currently, sonewconn() is defined as sonewconn1() in socketvar.h
- * to catch calls that are missing the (new) second parameter.
- */
-struct socket *
-sonewconn1(head, connstatus)
-	register struct socket *head;
-	int connstatus;
-{
-	register struct socket *so;
-
-	if (head->so_qlen > 3 * head->so_qlimit / 2)
-		return ((struct socket *)0);
-	MALLOC(so, struct socket *, sizeof(*so), M_SOCKET, M_DONTWAIT);
-	if (so == NULL)
-		return ((struct socket *)0);
-	bzero((caddr_t)so, sizeof(*so));
-	so->so_head = head;
-	so->so_type = head->so_type;
-	so->so_options = head->so_options &~ SO_ACCEPTCONN;
-	so->so_linger = head->so_linger;
-	so->so_state = head->so_state | SS_NOFDREF;
-	so->so_proto = head->so_proto;
-	so->so_timeo = head->so_timeo;
-	so->so_pgid = head->so_pgid;
-	so->so_uid = head->so_uid;
-	(void) soreserve(so, head->so_snd.sb_hiwat, head->so_rcv.sb_hiwat);
-	if (connstatus) {
-		TAILQ_INSERT_TAIL(&head->so_comp, so, so_list);
-		so->so_state |= SS_COMP;
-	} else {
-		TAILQ_INSERT_TAIL(&head->so_incomp, so, so_list);
-		so->so_state |= SS_INCOMP;
-		head->so_incqlen++;
-	}
-	head->so_qlen++;
-	if ((*so->so_proto->pr_usrreqs->pru_attach)(so, 0)) {
-		if (so->so_state & SS_COMP) {
-			TAILQ_REMOVE(&head->so_comp, so, so_list);
-		} else {
-			TAILQ_REMOVE(&head->so_incomp, so, so_list);
-			head->so_incqlen--;
-		}
-		head->so_qlen--;
-		(void) free((caddr_t)so, M_SOCKET);
-		return ((struct socket *)0);
-	}
-	if (connstatus) {
-		sorwakeup(head);
-		soconnwakeup(head);
-		so->so_state |= connstatus;
-	}
-	return (so);
-}
-
-/*
- * Socantsendmore indicates that no more data will be sent on the
- * socket; it would normally be applied to a socket when the user
- * informs the system that no more data is to be sent, by the protocol
- * code (in case PRU_SHUTDOWN).  Socantrcvmore indicates that no more data
- * will be received, and will normally be applied to the socket by a
- * protocol when it detects that the peer will send no more data.
- * Data queued for reading in the socket may yet be read.
- */
-
-void
-socantsendmore(so)
-	struct socket *so;
-{
-
-	so->so_state |= SS_CANTSENDMORE;
-	sowwakeup(so);
-}
-
-void
-socantrcvmore(so)
-	struct socket *so;
-{
-
-	so->so_state |= SS_CANTRCVMORE;
-	sorwakeup(so);
-}
-
-/*
- * Socket buffer (struct sockbuf) utility routines.
- *
- * Each socket contains two socket buffers: one for sending data and
- * one for receiving data.  Each buffer contains a queue of mbufs,
- * information about the number of mbufs and amount of data in the
- * queue, and other fields allowing select() statements and notification
- * on data availability to be implemented.
- *
- * Data stored in a socket buffer is maintained as a list of records.
- * Each record is a list of mbufs chained together with the m_next
- * field.  Records are chained together with the m_nextpkt field. The upper
- * level routine soreceive() expects the following conventions to be
- * observed when placing information in the receive buffer:
- *
- * 1. If the protocol requires each message be preceded by the sender's
- *    name, then a record containing that name must be present before
- *    any associated data (mbuf's must be of type MT_SONAME).
- * 2. If the protocol supports the exchange of ``access rights'' (really
- *    just additional data associated with the message), and there are
- *    ``rights'' to be received, then a record containing this data
- *    should be present (mbuf's must be of type MT_RIGHTS).
- * 3. If a name or rights record exists, then it must be followed by
- *    a data record, perhaps of zero length.
- *
- * Before using a new socket structure it is first necessary to reserve
- * buffer space to the socket, by calling sbreserve().  This should commit
- * some of the available buffer space in the system buffer pool for the
- * socket (currently, it does nothing but enforce limits).  The space
- * should be released by calling sbrelease() when the socket is destroyed.
- */
-
-int
-soreserve(so, sndcc, rcvcc)
-	register struct socket *so;
-	u_long sndcc, rcvcc;
-{
-
-	if (sbreserve(&so->so_snd, sndcc) == 0)
-		goto bad;
-	if (sbreserve(&so->so_rcv, rcvcc) == 0)
-		goto bad2;
-	if (so->so_rcv.sb_lowat == 0)
-		so->so_rcv.sb_lowat = 1;
-	if (so->so_snd.sb_lowat == 0)
-		so->so_snd.sb_lowat = MCLBYTES;
-	if (so->so_snd.sb_lowat > so->so_snd.sb_hiwat)
-		so->so_snd.sb_lowat = so->so_snd.sb_hiwat;
-	return (0);
-bad2:
-	sbrelease(&so->so_snd);
-bad:
-	return (ENOBUFS);
-}
-
-/*
- * Allot mbufs to a sockbuf.
- * Attempt to scale mbmax so that mbcnt doesn't become limiting
- * if buffering efficiency is near the normal case.
- */
-int
-sbreserve(sb, cc)
-	struct sockbuf *sb;
-	u_long cc;
-{
-
-	if (cc > sb_max * MCLBYTES / (MSIZE + MCLBYTES))
-		return (0);
-	sb->sb_hiwat = cc;
-	sb->sb_mbmax = min(cc * sb_efficiency, sb_max);
-	if (sb->sb_lowat > sb->sb_hiwat)
-		sb->sb_lowat = sb->sb_hiwat;
-	return (1);
-}
-
-/*
- * Free mbufs held by a socket, and reserved mbuf space.
- */
-void
-sbrelease(sb)
-	struct sockbuf *sb;
-{
-
-	sbflush(sb);
-	sb->sb_hiwat = sb->sb_mbmax = 0;
-}
-
-/*
- * Routines to add and remove
- * data from an mbuf queue.
- *
- * The routines sbappend() or sbappendrecord() are normally called to
- * append new mbufs to a socket buffer, after checking that adequate
- * space is available, comparing the function sbspace() with the amount
- * of data to be added.  sbappendrecord() differs from sbappend() in
- * that data supplied is treated as the beginning of a new record.
- * To place a sender's address, optional access rights, and data in a
- * socket receive buffer, sbappendaddr() should be used.  To place
- * access rights and data in a socket receive buffer, sbappendrights()
- * should be used.  In either case, the new data begins a new record.
- * Note that unlike sbappend() and sbappendrecord(), these routines check
- * for the caller that there will be enough space to store the data.
- * Each fails if there is not enough space, or if it cannot find mbufs
- * to store additional information in.
- *
- * Reliable protocols may use the socket send buffer to hold data
- * awaiting acknowledgement.  Data is normally copied from a socket
- * send buffer in a protocol with m_copy for output to a peer,
- * and then removing the data from the socket buffer with sbdrop()
- * or sbdroprecord() when the data is acknowledged by the peer.
- */
-
-/*
- * Append mbuf chain m to the last record in the
- * socket buffer sb.  The additional space associated
- * the mbuf chain is recorded in sb.  Empty mbufs are
- * discarded and mbufs are compacted where possible.
- */
-void
-sbappend(sb, m)
-	struct sockbuf *sb;
-	struct mbuf *m;
-{
-	register struct mbuf *n;
-
-	if (m == 0)
-		return;
-	n = sb->sb_mb;
-	if (n) {
-		while (n->m_nextpkt)
-			n = n->m_nextpkt;
-		do {
-			if (n->m_flags & M_EOR) {
-				sbappendrecord(sb, m); /* XXXXXX!!!! */
-				return;
-			}
-		} while (n->m_next && (n = n->m_next));
-	}
-	sbcompress(sb, m, n);
-}
-
-#ifdef SOCKBUF_DEBUG
-void
-sbcheck(sb)
-	register struct sockbuf *sb;
-{
-	register struct mbuf *m;
-	register int len = 0, mbcnt = 0;
-
-	for (m = sb->sb_mb; m; m = m->m_next) {
-		len += m->m_len;
-		mbcnt += MSIZE;
-		if (m->m_flags & M_EXT) /*XXX*/ /* pretty sure this is bogus */
-			mbcnt += m->m_ext.ext_size;
-		if (m->m_nextpkt)
-			panic("sbcheck nextpkt");
-	}
-	if (len != sb->sb_cc || mbcnt != sb->sb_mbcnt) {
-		printf("cc %d != %d || mbcnt %d != %d\n", len, sb->sb_cc,
-		    mbcnt, sb->sb_mbcnt);
-		panic("sbcheck");
-	}
-}
-#endif
-
-/*
- * As above, except the mbuf chain
- * begins a new record.
- */
-void
-sbappendrecord(sb, m0)
-	register struct sockbuf *sb;
-	register struct mbuf *m0;
-{
-	register struct mbuf *m;
-
-	if (m0 == 0)
-		return;
-	m = sb->sb_mb;
-	if (m)
-		while (m->m_nextpkt)
-			m = m->m_nextpkt;
-	/*
-	 * Put the first mbuf on the queue.
-	 * Note this permits zero length records.
-	 */
-	sballoc(sb, m0);
-	if (m)
-		m->m_nextpkt = m0;
-	else
-		sb->sb_mb = m0;
-	m = m0->m_next;
-	m0->m_next = 0;
-	if (m && (m0->m_flags & M_EOR)) {
-		m0->m_flags &= ~M_EOR;
-		m->m_flags |= M_EOR;
-	}
-	sbcompress(sb, m, m0);
-}
-
-/*
- * As above except that OOB data
- * is inserted at the beginning of the sockbuf,
- * but after any other OOB data.
- */
-void
-sbinsertoob(sb, m0)
-	register struct sockbuf *sb;
-	register struct mbuf *m0;
-{
-	register struct mbuf *m;
-	register struct mbuf **mp;
-
-	if (m0 == 0)
-		return;
-	for (mp = &sb->sb_mb; *mp ; mp = &((*mp)->m_nextpkt)) {
-	    m = *mp;
-	    again:
-		switch (m->m_type) {
-
-		case MT_OOBDATA:
-			continue;		/* WANT next train */
-
-		case MT_CONTROL:
-			m = m->m_next;
-			if (m)
-				goto again;	/* inspect THIS train further */
-		}
-		break;
-	}
-	/*
-	 * Put the first mbuf on the queue.
-	 * Note this permits zero length records.
-	 */
-	sballoc(sb, m0);
-	m0->m_nextpkt = *mp;
-	*mp = m0;
-	m = m0->m_next;
-	m0->m_next = 0;
-	if (m && (m0->m_flags & M_EOR)) {
-		m0->m_flags &= ~M_EOR;
-		m->m_flags |= M_EOR;
-	}
-	sbcompress(sb, m, m0);
-}
-
-/*
- * Append address and data, and optionally, control (ancillary) data
- * to the receive queue of a socket.  If present,
- * m0 must include a packet header with total length.
- * Returns 0 if no space in sockbuf or insufficient mbufs.
- */
-int
-sbappendaddr(sb, asa, m0, control)
-	register struct sockbuf *sb;
-	struct sockaddr *asa;
-	struct mbuf *m0, *control;
-{
-	register struct mbuf *m, *n;
-	int space = asa->sa_len;
-
-if (m0 && (m0->m_flags & M_PKTHDR) == 0)
-panic("sbappendaddr");
-	if (m0)
-		space += m0->m_pkthdr.len;
-	for (n = control; n; n = n->m_next) {
-		space += n->m_len;
-		if (n->m_next == 0)	/* keep pointer to last control buf */
-			break;
-	}
-	if (space > sbspace(sb))
-		return (0);
-	if (asa->sa_len > MLEN)
-		return (0);
-	MGET(m, M_DONTWAIT, MT_SONAME);
-	if (m == 0)
-		return (0);
-	m->m_len = asa->sa_len;
-	bcopy((caddr_t)asa, mtod(m, caddr_t), asa->sa_len);
-	if (n)
-		n->m_next = m0;		/* concatenate data to control */
-	else
-		control = m0;
-	m->m_next = control;
-	for (n = m; n; n = n->m_next)
-		sballoc(sb, n);
-	n = sb->sb_mb;
-	if (n) {
-		while (n->m_nextpkt)
-			n = n->m_nextpkt;
-		n->m_nextpkt = m;
-	} else
-		sb->sb_mb = m;
-	return (1);
-}
-
-int
-sbappendcontrol(sb, m0, control)
-	struct sockbuf *sb;
-	struct mbuf *control, *m0;
-{
-	register struct mbuf *m, *n;
-	int space = 0;
-
-	if (control == 0)
-		panic("sbappendcontrol");
-	for (m = control; ; m = m->m_next) {
-		space += m->m_len;
-		if (m->m_next == 0)
-			break;
-	}
-	n = m;			/* save pointer to last control buffer */
-	for (m = m0; m; m = m->m_next)
-		space += m->m_len;
-	if (space > sbspace(sb))
-		return (0);
-	n->m_next = m0;			/* concatenate data to control */
-	for (m = control; m; m = m->m_next)
-		sballoc(sb, m);
-	n = sb->sb_mb;
-	if (n) {
-		while (n->m_nextpkt)
-			n = n->m_nextpkt;
-		n->m_nextpkt = control;
-	} else
-		sb->sb_mb = control;
-	return (1);
-}
-
-/*
- * Compress mbuf chain m into the socket
- * buffer sb following mbuf n.  If n
- * is null, the buffer is presumed empty.
- */
-void
-sbcompress(sb, m, n)
-	register struct sockbuf *sb;
-	register struct mbuf *m, *n;
-{
-	register int eor = 0;
-	register struct mbuf *o;
-
-	while (m) {
-		eor |= m->m_flags & M_EOR;
-		if (m->m_len == 0 &&
-		    (eor == 0 ||
-		     (((o = m->m_next) || (o = n)) &&
-		      o->m_type == m->m_type))) {
-			m = m_free(m);
-			continue;
-		}
-		if (n && (n->m_flags & (M_EXT | M_EOR)) == 0 &&
-		    (n->m_data + n->m_len + m->m_len) < &n->m_dat[MLEN] &&
-		    n->m_type == m->m_type) {
-			bcopy(mtod(m, caddr_t), mtod(n, caddr_t) + n->m_len,
-			    (unsigned)m->m_len);
-			n->m_len += m->m_len;
-			sb->sb_cc += m->m_len;
-			m = m_free(m);
-			continue;
-		}
-		if (n)
-			n->m_next = m;
-		else
-			sb->sb_mb = m;
-		sballoc(sb, m);
-		n = m;
-		m->m_flags &= ~M_EOR;
-		m = m->m_next;
-		n->m_next = 0;
-	}
-	if (eor) {
-		if (n)
-			n->m_flags |= eor;
-		else
-			printf("semi-panic: sbcompress\n");
-	}
-}
-
-/*
- * Free all mbufs in a sockbuf.
- * Check that all resources are reclaimed.
- */
-void
-sbflush(sb)
-	register struct sockbuf *sb;
-{
-
-	if (sb->sb_flags & SB_LOCK)
-		panic("sbflush");
-	while (sb->sb_mbcnt)
-		sbdrop(sb, (int)sb->sb_cc);
-	if (sb->sb_cc || sb->sb_mb)
-		panic("sbflush 2");
-}
-
-/*
- * Drop data from (the front of) a sockbuf.
- */
-void
-sbdrop(sb, len)
-	register struct sockbuf *sb;
-	register int len;
-{
-	register struct mbuf *m, *mn;
-	struct mbuf *next;
-
-	next = (m = sb->sb_mb) ? m->m_nextpkt : 0;
-	while (len > 0) {
-		if (m == 0) {
-			if (next == 0)
-				panic("sbdrop");
-			m = next;
-			next = m->m_nextpkt;
-			continue;
-		}
-		if (m->m_len > len) {
-			m->m_len -= len;
-			m->m_data += len;
-			sb->sb_cc -= len;
-			break;
-		}
-		len -= m->m_len;
-		sbfree(sb, m);
-		MFREE(m, mn);
-		m = mn;
-	}
-	while (m && m->m_len == 0) {
-		sbfree(sb, m);
-		MFREE(m, mn);
-		m = mn;
-	}
-	if (m) {
-		sb->sb_mb = m;
-		m->m_nextpkt = next;
-	} else
-		sb->sb_mb = next;
-}
-
-/*
- * Drop a record off the front of a sockbuf
- * and move the next record to the front.
- */
-void
-sbdroprecord(sb)
-	register struct sockbuf *sb;
-{
-	register struct mbuf *m, *mn;
-
-	m = sb->sb_mb;
-	if (m) {
-		sb->sb_mb = m->m_nextpkt;
-		do {
-			sbfree(sb, m);
-			MFREE(m, mn);
-			m = mn;
-		} while (m);
-	}
-}
-
-/*
- * Create a "control" mbuf containing the specified data
- * with the specified type for presentation on a socket buffer.
- */
-struct mbuf *
-sbcreatecontrol(p, size, type, level)
-	caddr_t p;
-	register int size;
-	int type, level;
-{
-	register struct cmsghdr *cp;
-	struct mbuf *m;
-
-	if ((m = m_get(M_DONTWAIT, MT_CONTROL)) == NULL)
-		return ((struct mbuf *) NULL);
-	cp = mtod(m, struct cmsghdr *);
-	/* XXX check size? */
-	(void)memcpy(CMSG_DATA(cp), p, size);
-	size += sizeof(*cp);
-	m->m_len = size;
-	cp->cmsg_len = size;
-	cp->cmsg_level = level;
-	cp->cmsg_type = type;
-	return (m);
-}
-
-#ifdef PRU_OLDSTYLE
-/*
- * The following routines mediate between the old-style `pr_usrreq'
- * protocol implementations and the new-style `struct pr_usrreqs'
- * calling convention.
- */
-
-/* syntactic sugar */
-#define	nomb	(struct mbuf *)0
-
-static int
-old_abort(struct socket *so)
-{
-	return so->so_proto->pr_ousrreq(so, PRU_ABORT, nomb, nomb, nomb);
-}
-
-static int
-old_accept(struct socket *so, struct mbuf *nam)
-{
-	return so->so_proto->pr_ousrreq(so, PRU_ACCEPT, nomb,  nam, nomb);
-}
-
-static int
-old_attach(struct socket *so, int proto)
-{
-	return so->so_proto->pr_ousrreq(so, PRU_ATTACH, nomb,
-				       (struct mbuf *)proto, /* XXX */
-				       nomb);
-}
-
-static int
-old_bind(struct socket *so, struct mbuf *nam)
-{
-	return so->so_proto->pr_ousrreq(so, PRU_BIND, nomb, nam, nomb);
-}
-
-static int
-old_connect(struct socket *so, struct mbuf *nam)
-{
-	return so->so_proto->pr_ousrreq(so, PRU_CONNECT, nomb, nam, nomb);
-}
-
-static int
-old_connect2(struct socket *so1, struct socket *so2)
-{
-	return so1->so_proto->pr_ousrreq(so1, PRU_CONNECT2, nomb, 
-				       (struct mbuf *)so2, nomb);
-}
-
-static int
-old_control(struct socket *so, int cmd, caddr_t data, struct ifnet *ifp)
-{
-	return so->so_proto->pr_ousrreq(so, PRU_CONTROL, (struct mbuf *)cmd, 
-				       (struct mbuf *)data, 
-				       (struct mbuf *)ifp);
-}
-
-static int
-old_detach(struct socket *so)
-{
-	return so->so_proto->pr_ousrreq(so, PRU_DETACH, nomb, nomb, nomb);
-}
-
-static int
-old_disconnect(struct socket *so)
-{
-	return so->so_proto->pr_ousrreq(so, PRU_DISCONNECT, nomb, nomb, nomb);
-}
-
-static int
-old_listen(struct socket *so)
-{
-	return so->so_proto->pr_ousrreq(so, PRU_LISTEN, nomb, nomb, nomb);
-}
-
-static int
-old_peeraddr(struct socket *so, struct mbuf *nam)
-{
-	return so->so_proto->pr_ousrreq(so, PRU_PEERADDR, nomb, nam, nomb);
-}
-
-static int
-old_rcvd(struct socket *so, int flags)
-{
-	return so->so_proto->pr_ousrreq(so, PRU_RCVD, nomb,
-				       (struct mbuf *)flags, /* XXX */
-				       nomb);
-}
-
-static int
-old_rcvoob(struct socket *so, struct mbuf *m, int flags)
-{
-	return so->so_proto->pr_ousrreq(so, PRU_RCVOOB, m,
-				       (struct mbuf *)flags, /* XXX */
-				       nomb);
-}
-
-static int
-old_send(struct socket *so, int flags, struct mbuf *m, struct mbuf *addr,
-	 struct mbuf *control)
-{
-	int req;
-
-	if (flags & PRUS_OOB) {
-		req = PRU_SENDOOB;
-	} else if(flags & PRUS_EOF) {
-		req = PRU_SEND_EOF;
-	} else {
-		req = PRU_SEND;
-	}
-	return so->so_proto->pr_ousrreq(so, req, m, addr, control);
-}
-
-static int
-old_sense(struct socket *so, struct stat *sb)
-{
-	return so->so_proto->pr_ousrreq(so, PRU_SENSE, (struct mbuf *)sb,
-				       nomb, nomb);
-}
-
-static int
-old_shutdown(struct socket *so)
-{
-	return so->so_proto->pr_ousrreq(so, PRU_SHUTDOWN, nomb, nomb, nomb);
-}
-
-static int
-old_sockaddr(struct socket *so, struct mbuf *nam)
-{
-	return so->so_proto->pr_ousrreq(so, PRU_SOCKADDR, nomb, nam, nomb);
-}
-
-struct pr_usrreqs pru_oldstyle = {
-	old_abort, old_accept, old_attach, old_bind, old_connect,
-	old_connect2, old_control, old_detach, old_disconnect,
-	old_listen, old_peeraddr, old_rcvd, old_rcvoob, old_send,
-	old_sense, old_shutdown, old_sockaddr
-};
-
-#endif /* PRU_OLDSTYLE */
-
-/*
- * Some routines that return EOPNOTSUPP for entry points that are not
- * supported by a protocol.  Fill in as needed.
- */
-int
-pru_accept_notsupp(struct socket *so, struct mbuf *nam)
-{
-	return EOPNOTSUPP;
-}
-
-int
-pru_connect2_notsupp(struct socket *so1, struct socket *so2)
-{
-	return EOPNOTSUPP;
-}
-
-int
-pru_control_notsupp(struct socket *so, int cmd, caddr_t data,
-		    struct ifnet *ifp)
-{
-	return EOPNOTSUPP;
-}
-
-int
-pru_listen_notsupp(struct socket *so)
-{
-	return EOPNOTSUPP;
-}
-
-int
-pru_rcvd_notsupp(struct socket *so, int flags)
-{
-	return EOPNOTSUPP;
-}
-
-int
-pru_rcvoob_notsupp(struct socket *so, struct mbuf *m, int flags)
-{
-	return EOPNOTSUPP;
-}
-
-/*
- * This isn't really a ``null'' operation, but it's the default one
- * and doesn't do anything destructive.
- */
-int
-pru_sense_null(struct socket *so, struct stat *sb)
-{
-	sb->st_blksize = so->so_snd.sb_hiwat;
-	return 0;
-}
-
diff --git a/cpukit/libnetworking/lib/README b/cpukit/libnetworking/lib/README
deleted file mode 100644
index 998bd5e708..0000000000
--- a/cpukit/libnetworking/lib/README
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-#  $Id$
-#
-
-Sources from application-level (as opposed to kernel-level) libraries.
diff --git a/cpukit/libnetworking/lib/getprotoby.c b/cpukit/libnetworking/lib/getprotoby.c
deleted file mode 100644
index fc8de6e402..0000000000
--- a/cpukit/libnetworking/lib/getprotoby.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- *  $Id$
- */
-
-#include <netdb.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-
-static const struct protoent prototab[] = {
-					{ "ip",    NULL, IPPROTO_IP },
-					{ "icmp",  NULL, IPPROTO_ICMP },
-					{ "tcp",   NULL, IPPROTO_TCP },
-					{ "udp",   NULL, IPPROTO_UDP },
-					};
-
-/*
- * Dummy version of BSD getprotobyname()
- */
-struct protoent *
-getprotobyname (const char *name)
-{
-	int i;
-
-	for (i = 0 ; i < (sizeof prototab / sizeof prototab[0]) ; i++) {
-		if (strcmp (name, prototab[i].p_name) == 0)
-			return (struct protoent *) &prototab[i];
-	}
-	return NULL;
-}
-
-/*
- * Dummy version of BSD getprotobynumber()
- */
-struct protoent *
-getprotobynumber (int proto)
-{
-	int i;
-
-	for (i = 0 ; i < (sizeof prototab / sizeof prototab[0]) ; i++) {
-		if (proto == prototab[i].p_proto)
-			return (struct protoent *) &prototab[i];
-	}
-	return NULL;
-}
diff --git a/cpukit/libnetworking/lib/syslog.c b/cpukit/libnetworking/lib/syslog.c
deleted file mode 100644
index 0bb15bc78e..0000000000
--- a/cpukit/libnetworking/lib/syslog.c
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * RTEMS version of syslog and associated routines
- *
- * $Id$
- */
-
-#include <rtems.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <errno.h>
-#include <syslog.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-
-#include <unistd.h>
-
-static int LogStatus = LOG_CONS;
-static const char *LogTag = "syslog";
-static int LogFacility = LOG_USER;
-static int LogMask = 0xff;
-
-static int LogFd = -1;
-static rtems_id LogSemaphore;
-extern struct in_addr rtems_bsdnet_log_host_address;
-
-#define SYSLOG_PORT	514
-
-void
-syslog (int pri, const char *fmt, ...)
-{
-	va_list ap;
-
-	va_start (ap, fmt);
-	vsyslog (pri, fmt, ap);
-	va_end (ap);
-}
-
-/*
- * FIXME: Should cbuf be static?  It could be if we put the mutex
- *        around the entire body of this routine.  Then we wouldn't
- *        have to worry about blowing stacks with a local variable
- *        that large.  Could make cbuf bigger, too.
- */
-void
-vsyslog (int pri, const char *fmt, va_list ap)
-{
-	int cnt;
-	char *cp;
-	char *msgp, cbuf[200];
-	int sent;
-
-	if (pri & ~(LOG_PRIMASK|LOG_FACMASK)) {
-		syslog (LOG_ERR|LOG_CONS|LOG_PERROR|LOG_PID,
-								"syslog: unknown facility/priority: %#x", pri);
-		pri &= LOG_PRIMASK|LOG_FACMASK;
-	}
-
-	if (!LOG_MASK(LOG_PRI(pri)) & LogMask)
-		return;
-
-	if ((pri & LOG_FACMASK) == 0)
-		pri |= LogFacility;
-
-	cnt = sprintf (cbuf, "<%d>", pri);
-	cp = msgp = cbuf + cnt;
-	if (LogTag) {
-		const char *lp = LogTag;
-		while ((*cp = *lp++) != '\0')
-			cp++;
-	}
-	if (LogStatus & LOG_PID) {
-		rtems_id tid;
-		rtems_task_ident (RTEMS_SELF, 0, &tid);
-		cnt = sprintf (cp, "[%#lx]", (unsigned long)tid);
-		cp += cnt;
-	}
-	if (LogTag) {
-		*cp++ = ':';
-		*cp++ = ' ';
-	}
-	cnt = vsprintf (cp, fmt, ap);
-	cnt += cp - cbuf;
-	if (cbuf[cnt-1] == '\n')
-		cbuf[--cnt] = '\0';
-
-	if (LogStatus & LOG_PERROR)
-		printf ("%s\n", cbuf);
-
-	/*
-	 * Grab the mutex
-	 */
-	sent = 0;
-	if ((rtems_bsdnet_log_host_address.s_addr != INADDR_ANY)
-	 && (LogFd >= 0)
-	 && (rtems_semaphore_obtain (LogSemaphore, RTEMS_WAIT, RTEMS_NO_TIMEOUT) == RTEMS_SUCCESSFUL)) {
-		/*
-		 * Set the destination address/port
-		 */
-		struct sockaddr_in farAddress;
-		farAddress.sin_family = AF_INET;
-		farAddress.sin_port = htons (SYSLOG_PORT);
-		farAddress.sin_addr = rtems_bsdnet_log_host_address;
-		memset (farAddress.sin_zero, '\0', sizeof farAddress.sin_zero);
-
-		/*
-		 * Send the message
-		 */
-		if (sendto (LogFd, cbuf, cnt, 0, (struct sockaddr *)&farAddress, sizeof farAddress) >= 0)
-			sent = 1;
-		rtems_semaphore_release (LogSemaphore);
-	}
-	if (!sent && (LogStatus & LOG_CONS) && !(LogStatus & LOG_PERROR))
-		printf ("%s\n", msgp);
-}
-
-void
-openlog (const char *ident, int logstat, int logfac)
-{
-	rtems_status_code sc;
-	struct sockaddr_in myAddress;
-
-	if (ident != NULL)
-		LogTag = ident;
-	LogStatus = logstat;
-	if (logfac != 0 && (logfac & ~LOG_FACMASK) == 0)
-		LogFacility = logfac;
-
-	/*
-	 * Create the socket
-	 */
-	if ((LogFd = socket (AF_INET, SOCK_DGRAM, 0)) < 0) {
-		printf ("Can't create syslog socket: %d\n", errno);
-		return;
-	}
-
-	/*
-	 * Bind socket to name
-	 */
-	myAddress.sin_family = AF_INET;
-	myAddress.sin_addr.s_addr = INADDR_ANY;
-	myAddress.sin_port = 0;
-	memset (myAddress.sin_zero, '\0', sizeof myAddress.sin_zero);
-	if (bind (LogFd, (struct sockaddr *)&myAddress, sizeof (myAddress)) < 0) {
-		close (LogFd);
-		LogFd = -1;
-		printf ("Can't bind syslog socket: %d\n", errno);
-		return;
-	}
-
-	/*
-	 * Create the mutex
-	 */
-	sc = rtems_semaphore_create (rtems_build_name('s', 'L', 'o', 'g'),
-					1,
-					RTEMS_PRIORITY |
-						RTEMS_BINARY_SEMAPHORE |
-						RTEMS_INHERIT_PRIORITY |
-						RTEMS_NO_PRIORITY_CEILING |
-						RTEMS_LOCAL,
-					0,
-					&LogSemaphore);
-	if (sc != RTEMS_SUCCESSFUL) {
-		printf ("Can't create syslog seamphore: %d\n", sc);
-		close (LogFd);
-		LogFd = -1;
-	}
-}
-
-void
-closelog(void)
-{
-	if (LogFd >= 0) {
-		close (LogFd);
-		LogFd = -1;
-		rtems_semaphore_delete (LogSemaphore);
-	}
-}
-
-int
-setlogmask (int pmask)
-{
-	int omask;
-
-	omask = LogMask;
-	if (pmask != 0)
-		LogMask = pmask;
-	return (omask);
-}
diff --git a/cpukit/libnetworking/lib/tftpDriver.c b/cpukit/libnetworking/lib/tftpDriver.c
deleted file mode 100644
index cf75623580..0000000000
--- a/cpukit/libnetworking/lib/tftpDriver.c
+++ /dev/null
@@ -1,609 +0,0 @@
-/*
- * Trivial File Transfer Protocol (RFC 1350)
- *
- * Transfer file to/from remote host
- *
- * W. Eric Norum
- * Saskatchewan Accelerator Laboratory
- * University of Saskatchewan
- * Saskatoon, Saskatchewan, CANADA
- * eric@skatter.usask.ca
- *
- *  $Id$
- */
-
-#include <stdio.h>
-#include <errno.h>
-#include <malloc.h>
-#include <string.h>
-#include <unistd.h>
-#include <rtems.h>
-#include <rtems/libio.h>
-#include <rtems/rtems_bsdnet.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-/*
- * Range of UDP ports to try
- */
-#define UDP_PORT_BASE	3180
-
-/*
- * Pathname prefix
- */
-#define TFTP_PATHNAME_PREFIX	"/TFTP/"
-
-/*
- * Default limits
- */
-#define PACKET_REPLY_MILLISECONDS	6000
-#define OPEN_RETRY_LIMIT	10
-#define IO_RETRY_LIMIT		10
-
-/*
- * TFTP opcodes
- */
-#define TFTP_OPCODE_RRQ		1
-#define TFTP_OPCODE_WRQ		2
-#define TFTP_OPCODE_DATA	3
-#define TFTP_OPCODE_ACK		4
-#define TFTP_OPCODE_ERROR	5
-
-/*
- * Largest data transfer
- */
-#define TFTP_BUFSIZE	512
-
-/*
- * Packets transferred between machines
- */
-union tftpPacket {
-	/*
-	 * RRQ/WRQ packet
-	 */
-	struct tftpRWRQ {
-		rtems_unsigned16	opcode;
-		char			filename_mode[TFTP_BUFSIZE];
-	} tftpRWRQ;
-
-	/*
-	 * DATA packet
-	 */
-	struct tftpDATA {
-		rtems_unsigned16	opcode;
-		rtems_unsigned16	blocknum;
-		rtems_unsigned8		data[TFTP_BUFSIZE];
-	} tftpDATA;
-
-	/*
-	 * ACK packet
-	 */
-	struct tftpACK {
-		rtems_unsigned16	opcode;
-		rtems_unsigned16	blocknum;
-	} tftpACK;
-
-	/*
-	 * ERROR packet
-	 */
-	struct tftpERROR {
-		rtems_unsigned16	opcode;
-		rtems_unsigned16	errorCode;
-		char			errorMessage[TFTP_BUFSIZE];
-	} tftpERROR;
-};
-
-/*
- * State of each TFTP stream
- */
-struct tftpStream {
-	/*
-	 * Buffer for storing most recently-received packet
-	 */
-	union tftpPacket	pkbuf;
-
-	/*
-	 * Last block number received
-	 */
-	rtems_unsigned16	blocknum;
-
-	/*
-	 * Data transfer socket
-	 */
-	int			socket;
-	struct sockaddr_in	myAddress;
-	struct sockaddr_in	farAddress;
-
-	/*
-	 * Indices into buffer
-	 */
-	int	nleft;
-	int	nused;
-
-	/*
-	 * Flags
-	 */
-	int	firstReply;
-	int	eof;
-};
-
-/*
- * Number of streams open at the same time
- */
-static rtems_id tftp_mutex;
-static int nStreams;
-static struct tftpStream ** volatile tftpStreams;
-
-/*
- * Initialize the TFTP driver
- */
-rtems_device_driver rtems_tftp_initialize(
-  rtems_device_major_number major,
-  rtems_device_minor_number minor,
-  void *pargp
-)
-{
-	rtems_status_code sc;
-
-	sc = rtems_semaphore_create (rtems_build_name('T', 'F', 'T', 'P'),
-					1,
-					RTEMS_FIFO |
-						RTEMS_BINARY_SEMAPHORE |
-						RTEMS_NO_INHERIT_PRIORITY |
-						RTEMS_NO_PRIORITY_CEILING |
-						RTEMS_LOCAL,
-					0,
-					&tftp_mutex);
-	if (sc != RTEMS_SUCCESSFUL)
-		return sc;
-	rtems_io_register_name (TFTP_PATHNAME_PREFIX, major, minor);
-	return RTEMS_SUCCESSFUL;
-}
-
-/*
- * Set error message
- * This RTEMS/UNIX error mapping needs to be fixed!
- */
-static void
-tftpSetErrno (struct tftpStream *tp)
-{
-	unsigned int tftpError;
-	static const int errorMap[] = {
-		0,
-		ENOENT,
-		EPERM,
-		ENOSPC,
-		EINVAL,
-		ENXIO,
-		EEXIST,
-		ESRCH,
-		0,
-	};
-
-	tftpError = ntohs (tp->pkbuf.tftpERROR.errorCode);
-	if (tftpError < (sizeof errorMap / sizeof errorMap[0]))
-		errno = errorMap[tftpError];
-	else
-		errno = 1000 + tftpError;
-}
-
-/*
- * Send a message to make the other end shut up
- */
-static void
-sendStifle (struct tftpStream *tp, struct sockaddr_in *to)
-{
-	int len;
-
-	/*
-	 * Create the error packet (Unknown transfer ID).
-	 */
-	tp->pkbuf.tftpERROR.opcode = htons (TFTP_OPCODE_ERROR);
-	tp->pkbuf.tftpERROR.errorCode = htons (5);
-	len = sizeof tp->pkbuf.tftpERROR.opcode +
-				sizeof tp->pkbuf.tftpERROR.errorCode + 1;
-	len += sprintf (tp->pkbuf.tftpERROR.errorMessage, "GO AWAY"); 
-
-	/*
-	 * Send it
-	 */
-	sendto (tp->socket, (char *)&tp->pkbuf, len, 0,
-					(struct sockaddr *)to, sizeof *to);
-}
-
-/*
- * Wait for a data packet
- */
-static int
-getPacket (struct tftpStream *tp)
-{
-	int len;
-	struct timeval tv;
-
-	tv.tv_sec = 6;
-	tv.tv_usec = 0;
-	setsockopt (tp->socket, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof tv);
-	for (;;) {
-		union {
-			struct sockaddr s;
-			struct sockaddr_in i;
-		} from;
-		int fromlen = sizeof from;
-		len = recvfrom (tp->socket, (char *)&tp->pkbuf,
-							sizeof tp->pkbuf, 0,
-							&from.s, &fromlen);
-		if (len < 0)
-			break;
-		if (from.i.sin_addr.s_addr == tp->farAddress.sin_addr.s_addr) {
-			if (tp->firstReply) {
-				tp->firstReply = 0;
-				tp->farAddress.sin_port = from.i.sin_port;
-			}
-			if (tp->farAddress.sin_port == from.i.sin_port) 
-				break;
-		}
-
-		/*
-		 * Packet is from someone with whom we are
-		 * not interested.  Tell them to go away.
-		 */
-		sendStifle (tp, &from.i);
-	}
-	tv.tv_sec = 0;
-	setsockopt (tp->socket, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof tv);
-	return len;
-}
-
-/*
- * Send an acknowledgement
- */
-static int
-sendAck (struct tftpStream *tp)
-{
-	/*
-	 * Create the acknowledgement
-	 */
-	tp->pkbuf.tftpACK.opcode = htons (TFTP_OPCODE_ACK);
-	tp->pkbuf.tftpACK.blocknum = htons (tp->blocknum);
-
-	/*
-	 * Send it
-	 */
-	if (sendto (tp->socket, (char *)&tp->pkbuf, sizeof tp->pkbuf.tftpACK, 0,
-					(struct sockaddr *)&tp->farAddress,
-					sizeof tp->farAddress) < 0)
-		return errno;
-	return 0;
-}
-
-/*
- * Release a stream and clear the pointer to it
- */
-static void
-releaseStream (int s)
-{
-	rtems_semaphore_obtain (tftp_mutex, RTEMS_WAIT, RTEMS_NO_TIMEOUT);
-	free (tftpStreams[s]);
-	tftpStreams[s] = NULL;
-	rtems_semaphore_release (tftp_mutex);
-}
-
-/*
- * Open a TFTP stream
- */
-rtems_device_driver rtems_tftp_open(
-  rtems_device_major_number major,
-  rtems_device_minor_number minor,
-  void *pargp
-)
-{
-	rtems_libio_open_close_args_t *ap = pargp;
-	struct tftpStream *tp;
-	int retryCount;
-	rtems_unsigned32 farAddress;
-	int s;
-	int len;
-	char *cp1, *cp2;
-	char *remoteFilename;
-	rtems_interval now;
-	rtems_status_code sc;
-
-	/*
-	 * Read-only for now
-	 */
-	if (ap->flags & LIBIO_FLAGS_WRITE)
-		return RTEMS_NOT_IMPLEMENTED;
-
-	/*
-	 * Pick apart the name into a host:pathname pair
-	 */
-	if (strlen (ap->iop->pathname) <= strlen (TFTP_PATHNAME_PREFIX))
-		return RTEMS_INVALID_NAME;
-	cp2 = ap->iop->pathname + strlen (TFTP_PATHNAME_PREFIX);
-	if (*cp2 == '/') {
-		farAddress = rtems_bsdnet_bootp_server_address.s_addr;
-	}
-	else {
-		char *hostname;
-
-		cp1 = cp2;
-		while (*cp2 != '/') {
-			if (*cp2 == '\0')
-				return RTEMS_INVALID_NAME;
-			cp2++;
-		}
-		len = cp2 - cp1;
-		hostname = malloc (len + 1);
-		if (hostname == NULL)
-			return RTEMS_NO_MEMORY;
-		strncpy (hostname, cp1, len);
-		hostname[len] = '\0';
-		farAddress = inet_addr (hostname);
-		free (hostname);
-	}
-	if ((farAddress == 0) || (farAddress == ~0))
-		return RTEMS_INVALID_NAME;
-	if (*++cp2 == '\0')
-		return RTEMS_INVALID_NAME;
-	remoteFilename = cp2;
-	if (strlen (remoteFilename) > (TFTP_BUFSIZE - 10))
-		return RTEMS_INVALID_NAME;
-
-	/*
-	 * Find a free stream
-	 */
-	sc = rtems_semaphore_obtain (tftp_mutex, RTEMS_WAIT, RTEMS_NO_TIMEOUT);
-	if (sc != RTEMS_SUCCESSFUL)
-		return sc;
-	for (s = 0 ; s < nStreams ; s++) {
-		if (tftpStreams[s] == NULL)
-			break;
-	}
-	if (s == nStreams) {
-		/*
-		 * Reallocate stream pointers
-		 * Guard against the case where realloc() returns NULL.
-		 */
-		struct tftpStream **np;
-
-		np = realloc (tftpStreams, ++nStreams * sizeof *tftpStreams);
-		if (np == NULL) {
-			rtems_semaphore_release (tftp_mutex);
-			return RTEMS_NO_MEMORY;
-		}
-		tftpStreams = np;
-	}
-	tp = tftpStreams[s] = malloc (sizeof (struct tftpStream));
-	rtems_semaphore_release (tftp_mutex);
-	if (tp == NULL)
-		return RTEMS_NO_MEMORY;
-	ap->iop->data0 = s;
-	ap->iop->data1 = tp;
-
-	/*
-	 * Create the socket
-	 */
-	if ((tp->socket = socket (AF_INET, SOCK_DGRAM, 0)) < 0) {
-		releaseStream (s);
-		return RTEMS_TOO_MANY;
-	}
-
-	/*
-	 * Bind the socket to a local address
-	 */
-	retryCount = 0;
-	rtems_clock_get (RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &now);
-	for (;;) {
-		int try = (now + retryCount) % 10;
-
-		tp->myAddress.sin_family = AF_INET;
-		tp->myAddress.sin_port = htons (UDP_PORT_BASE + nStreams * try + minor);
-		tp->myAddress.sin_addr.s_addr = htonl (INADDR_ANY);
-		if (bind (tp->socket, (struct sockaddr *)&tp->myAddress, sizeof tp->myAddress) >= 0)
-			break;
-		if (++retryCount == 10) {
-			close (tp->socket);
-			releaseStream (minor);
-			return RTEMS_RESOURCE_IN_USE;
-		}
-	}
-
-	/*
-	 * Set the UDP destination to the TFTP server
-	 * port on the remote machine.
-	 */
-	tp->farAddress.sin_family = AF_INET;
-	tp->farAddress.sin_addr.s_addr = farAddress;
-	tp->farAddress.sin_port = htons (69);
-
-	/*
-	 * Start the transfer
-	 */
-	tp->firstReply = 1;
-	for (;;) {
-		/*
-		 * Create the request
-		 */
-		tp->pkbuf.tftpRWRQ.opcode = htons (TFTP_OPCODE_RRQ);
-		cp1 = tp->pkbuf.tftpRWRQ.filename_mode;
-		cp2 = remoteFilename;
-		while ((*cp1++ = *cp2++) != '\0')
-			continue;
-		cp2 = "octet";
-		while ((*cp1++ = *cp2++) != '\0')
-			continue;
-		len = cp1 - (char *)&tp->pkbuf.tftpRWRQ;
-
-		/*
-		 * Send the request
-		 */
-		if (sendto (tp->socket, (char *)&tp->pkbuf, len, 0, 
-					(struct sockaddr *)&tp->farAddress,
-					sizeof tp->farAddress) < 0) {
-			close (tp->socket);
-			releaseStream (minor);
-			return RTEMS_UNSATISFIED;
-		}
-
-		/*
-		 * Get reply
-		 */
-		len = getPacket (tp);
-		if (len >= (int) sizeof tp->pkbuf.tftpACK) {
-			int opcode = ntohs (tp->pkbuf.tftpDATA.opcode);
-			if ((opcode == TFTP_OPCODE_DATA)
-			 && (ntohs (tp->pkbuf.tftpDATA.blocknum) == 1)) {
-				tp->nused = 0;
-				tp->blocknum = 1;
-				tp->nleft = len - 2 * sizeof (rtems_unsigned16);
-				tp->eof = (tp->nleft < TFTP_BUFSIZE);
-				if (sendAck (tp) != 0) {
-					close (tp->socket);
-					releaseStream (minor);
-					return RTEMS_UNSATISFIED;
-				}
-				break;
-			}
-			if (opcode == TFTP_OPCODE_ERROR) {
-				tftpSetErrno (tp);
-				close (tp->socket);
-				releaseStream (ap->iop->data0);
-				return RTEMS_INTERNAL_ERROR;
-			}
-		}
-
-		/*
-		 * Keep trying
-		 */
-		if (++retryCount >= OPEN_RETRY_LIMIT) {
-			close (tp->socket);
-			releaseStream (minor);
-			return RTEMS_UNSATISFIED;
-		}
-	}
-	return RTEMS_SUCCESSFUL;
-}
-
-/*
- * Read from a TFTP stream
- */
-rtems_device_driver rtems_tftp_read(
-  rtems_device_major_number major,
-  rtems_device_minor_number minor,
-  void *pargp
-)
-{
-	rtems_libio_rw_args_t *ap = pargp;
-	char *bp;
-	struct tftpStream *tp;
-	int retryCount;
-	int nwant;
-
-	tp = ap->iop->data1;
-
-	/*
-	 * Read till user request is satisfied or EOF is reached
-	 */
-	bp = ap->buffer;
-	nwant = ap->count;
-	while (nwant) {
-		if (tp->nleft) {
-			int count;
-			if (nwant < tp->nleft)
-				count = nwant;
-			else
-				count = tp->nleft;
-			memcpy (bp, &tp->pkbuf.tftpDATA.data[tp->nused], count);
-			tp->nused += count;
-			tp->nleft -= count;
-			bp += count;
-			nwant -= count;
-			if (nwant == 0)
-				break;
-		}
-		if (tp->eof)
-			break;
-
-		/*
-		 * Wait for the next packet
-		 */
-		retryCount = 0;
-		for (;;) {
-			int len = getPacket (tp);
-			if (len >= (int)sizeof tp->pkbuf.tftpACK) {
-				int opcode = ntohs (tp->pkbuf.tftpDATA.opcode);
-				rtems_unsigned16 nextBlock = tp->blocknum + 1;
-				if ((opcode == TFTP_OPCODE_DATA)
-				 && (ntohs (tp->pkbuf.tftpDATA.blocknum) == nextBlock)) {
-					tp->nused = 0;
-					tp->nleft = len - 2 * sizeof (rtems_unsigned16);
-					tp->eof = (tp->nleft < TFTP_BUFSIZE);
-					tp->blocknum++;
-					if (sendAck (tp) != 0)
-						return RTEMS_IO_ERROR;
-					break;
-				}
-				if (opcode == TFTP_OPCODE_ERROR) {
-					tftpSetErrno (tp);
-					return RTEMS_INTERNAL_ERROR;
-				}
-			}
-
-			/*
-			 * Keep trying?
-			 */
-			if (++retryCount == IO_RETRY_LIMIT)
-				return RTEMS_IO_ERROR;
-			if (sendAck (tp) != 0)
-				return RTEMS_IO_ERROR;
-		}
-	}
-	ap->bytes_moved = ap->count - nwant;
-	return RTEMS_SUCCESSFUL;
-}
-
-/*
- * Close a TFTP stream
- */
-rtems_device_driver rtems_tftp_close(
-  rtems_device_major_number major,
-  rtems_device_minor_number minor,
-  void *pargp
-)
-{
-	rtems_libio_open_close_args_t *ap = pargp;
-	struct tftpStream *tp = ap->iop->data1;;
-
-	if (!tp->eof && !tp->firstReply) {
-		/*
-		 * Tell the other end to stop
-		 */
-		rtems_interval ticksPerSecond;
-		sendStifle (tp, &tp->farAddress);
-		rtems_clock_get (RTEMS_CLOCK_GET_TICKS_PER_SECOND, &ticksPerSecond);
-		rtems_task_wake_after (1 + ticksPerSecond / 10);
-	}
-	close (tp->socket);
-	releaseStream (ap->iop->data0);
-	return RTEMS_SUCCESSFUL;
-}
-
-rtems_device_driver rtems_tftp_write(
-  rtems_device_major_number major,
-  rtems_device_minor_number minor,
-  void *pargp
-)
-{
-	return RTEMS_NOT_CONFIGURED;
-}
-
-rtems_device_driver rtems_tftp_control(
-  rtems_device_major_number major,
-  rtems_device_minor_number minor,
-  void *pargp
-)
-{
-	return RTEMS_NOT_CONFIGURED;
-}
diff --git a/cpukit/libnetworking/libc/addr2ascii.3 b/cpukit/libnetworking/libc/addr2ascii.3
deleted file mode 100644
index 10c839ea74..0000000000
--- a/cpukit/libnetworking/libc/addr2ascii.3
+++ /dev/null
@@ -1,217 +0,0 @@
-.\"
-.\" Copyright 1996 Massachusetts Institute of Technology
-.\"
-.\" Permission to use, copy, modify, and distribute this software and
-.\" its documentation for any purpose and without fee is hereby
-.\" granted, provided that both the above copyright notice and this
-.\" permission notice appear in all copies, that both the above
-.\" copyright notice and this permission notice appear in all
-.\" supporting documentation, and that the name of M.I.T. not be used
-.\" in advertising or publicity pertaining to distribution of the
-.\" software without specific, written prior permission.  M.I.T. makes
-.\" no representations about the suitability of this software for any
-.\" purpose.  It is provided "as is" without express or implied
-.\" warranty.
-.\" 
-.\" THIS SOFTWARE IS PROVIDED BY M.I.T. ``AS IS''.  M.I.T. DISCLAIMS
-.\" ALL EXPRESS OR IMPLIED WARRANTIES WITH REGARD TO THIS SOFTWARE,
-.\" INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-.\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT
-.\" SHALL M.I.T. BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-.\" SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-.\" LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-.\" USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-.\" ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-.\" OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-.\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"	$ANA: addr2ascii.3,v 1.1 1996/06/13 18:41:46 wollman Exp $
-.\"     $Id$
-.\"
-.Dd June 13, 1996
-.Dt ADDR2ASCII 3
-.Os
-.Sh NAME
-.Nm addr2ascii ,
-.Nm ascii2addr
-.Nd Generic address formatting routines
-.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <netinet/in.h>
-.Fd #include <arpa/inet.h>
-.Ft "char *"
-.Fn addr2ascii "int af" "const void *addrp" "int len" "char *buf"
-.Ft int
-.Fn ascii2addr "int af" "const char *ascii" "void *result"
-.Sh DESCRIPTION
-The routines
-.Fn addr2ascii
-and
-.Fn ascii2addr
-are used to convert network addresses between binary form and a
-printable form appropriate to the address family.  Both functions take
-an
-.Fa af
-argument, specifying the address family to be used in the conversion
-process.
-(Currently, only the
-.Dv AF_INET
-and
-.Dv AF_LINK
-address families are supported.)
-.Pp
-The
-.Fn addr2ascii
-function
-is used to convert binary, network-format addresses into printable
-form.  In addition to
-.Fa af ,
-there are three other arguments.  The
-.Fa addrp
-argument is a pointer to the network address to be converted.
-The
-.Fa len
-argument is the length of the address.  The
-.Fa buf
-argument is an optional pointer to a caller-allocated buffer to hold
-the result; if a null pointer is passed,
-.Fn addr2ascii
-uses a statically-allocated buffer.
-.Pp
-The
-.Fn ascii2addr
-function performs the inverse operation to
-.Fn addr2ascii .
-In addition to
-.Fa af ,
-it takes two parameters,
-.Fa ascii
-and
-.Fa result .
-The
-.Fa ascii
-parameter is a pointer to the string which is to be converted into
-binary.  The
-.Fa result
-parameter is a pointer to an appropriate network address structure for
-the specified family.
-.Pp
-The following gives the appropriate structure to use for binary
-addresses in the specified family:
-.Pp
-.Bl -tag -width AF_INETxxxx -compact
-.It Dv AF_INET
-.Li struct in_addr
-.Pq in Aq Pa netinet/in.h
-.It Dv AF_LINK
-.Li struct sockaddr_dl
-.Pq in Aq Pa net/if_dl.h
-.\" .It Dv AF_INET6
-.\" .Li struct in6_addr
-.\" .Pq in Aq Pa netinet6/in6.h
-.El
-.Sh RETURN VALUES
-The
-.Fn addr2ascii
-function returns the address of the buffer it was passed, or a static
-buffer if the a null pointer was passed; on failure, it returns a null
-pointer.
-The
-.Fn ascii2addr
-function returns the length of the binary address in bytes, or -1 on
-failure.
-.Sh EXAMPLES
-The
-.Xr inet 3
-functions
-.Fn inet_ntoa
-and
-.Fn inet_aton
-could be implemented thusly:
-.Bd -literal -offset indent
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-char *
-inet_ntoa(struct in_addr addr)
-{
-	return addr2ascii(AF_INET, &addr, sizeof addr, 0);
-}
-
-int
-inet_aton(const char *ascii, struct in_addr *addr)
-{
-	return (ascii2addr(AF_INET, ascii, addr) 
-	    == sizeof(*addr));
-}
-.Ed
-.Pp
-In actuality, this cannot be done because
-.Fn addr2ascii
-and
-.Fn ascii2addr
-are implemented in terms of the
-.Xr inet 3
-functions, rather than the other way around.
-.Sh ERRORS
-When a failure is returned,
-.Li errno
-is set to one of the following values:
-.Bl -tag -width [EPROTONOSUPPORT]
-.It Bq Er ENAMETOOLONG
-The
-.Fn addr2ascii
-routine was passed a
-.Fa len
-parameter which was inappropriate for the address family given by
-.Fa af .
-.It Bq Er EPROTONOSUPPORT
-Either routine was passed an
-.Fa af
-parameter other than
-.Dv AF_INET
-or
-.Dv AF_LINK .
-.It Bq Er EINVAL
-The string passed to
-.Fn ascii2addr
-was improperly formatted for address family
-.Fa af .
-.El
-.Sh SEE ALSO
-.Xr inet 3 ,
-.Xr linkaddr 3 ,
-.Xr inet 4
-.Sh HISTORY
-An interface close to this one was originally suggested by Craig
-Partridge.  This particular interface originally appeared in the
-.Tn INRIA
-.Tn IPv6
-implementation.
-.Sh AUTHORS
-Code and documentation by
-.An Garrett A. Wollman ,
-MIT Laboratory for Computer Science.
-.Sh BUGS
-The original implementations supported IPv6.  This support should
-eventually be resurrected.  The
-.Tn NRL
-implementation also included support for the
-.Dv AF_ISO
-and
-.Dv AF_NS
-address families.
-.Pp
-The genericity of this interface is somewhat questionable.  A truly
-generic interface would provide a means for determining the length of
-the buffer to be used so that it could be dynamically allocated, and
-would always require a
-.Dq Li "struct sockaddr"
-to hold the binary address.  Unfortunately, this is incompatible with existing
-practice.  This limitation means that a routine for printing network
-addresses from arbitrary address families must still have internal
-knowledge of the maximum buffer length needed and the appropriate part
-of the address to use as the binary address.
diff --git a/cpukit/libnetworking/libc/addr2ascii.c b/cpukit/libnetworking/libc/addr2ascii.c
deleted file mode 100644
index dc651743b6..0000000000
--- a/cpukit/libnetworking/libc/addr2ascii.c
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright 1996 Massachusetts Institute of Technology
- *
- * Permission to use, copy, modify, and distribute this software and
- * its documentation for any purpose and without fee is hereby
- * granted, provided that both the above copyright notice and this
- * permission notice appear in all copies, that both the above
- * copyright notice and this permission notice appear in all
- * supporting documentation, and that the name of M.I.T. not be used
- * in advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission.  M.I.T. makes
- * no representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied
- * warranty.
- * 
- * THIS SOFTWARE IS PROVIDED BY M.I.T. ``AS IS''.  M.I.T. DISCLAIMS
- * ALL EXPRESS OR IMPLIED WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT
- * SHALL M.I.T. BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	$ANA: addr2ascii.c,v 1.1 1996/06/13 18:41:46 wollman Exp $
- *
- *  $Id$
- */
-
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <errno.h>
-#include <string.h>
-
-#include <net/if_dl.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-/*-
- * Convert a network address from binary to printable numeric format.
- * This API is copied from INRIA's IPv6 implementation, but it is a
- * bit bogus in two ways:
- *
- *	1) There is no value in passing both an address family and
- *	   an address length; either one should imply the other,
- *	   or we should be passing sockaddrs instead.
- *	2) There should by contrast be /added/ a length for the buffer
- *	   that we pass in, so that programmers are spared the need to
- *	   manually calculate (read: ``guess'') the maximum length.
- *
- * Flash: the API is also the same in the NRL implementation, and seems to
- * be some sort of standard, so we appear to be stuck with both the bad
- * naming and the poor choice of arguments.
- */
-char *
-addr2ascii(af, addrp, len, buf)
-	int af;
-	const void *addrp;
-	int len;		/* should be size_t XXX */
-	char *buf;		/* XXX should pass length of buffer */
-{
-	static char staticbuf[64]; /* 64 for AF_LINK > 16 for AF_INET */
-
-	if (!buf)
-		buf = staticbuf;
-
-	switch(af) {
-	case AF_INET:
-		if (len != sizeof(struct in_addr)) {
-			errno = ENAMETOOLONG;
-			return 0;
-		}
-		strcpy(buf, inet_ntoa(*(const struct in_addr *)addrp));
-		break;
-
-	case AF_LINK:
-		if (len != sizeof(struct sockaddr_dl)) {
-			errno = ENAMETOOLONG;
-			return 0;
-		}
-		strcpy(buf, link_ntoa((const struct sockaddr_dl *)addrp));
-		break;
-			
-	default:
-		errno = EPROTONOSUPPORT;
-		return 0;
-	}
-	return buf;
-}
diff --git a/cpukit/libnetworking/libc/ascii2addr.c b/cpukit/libnetworking/libc/ascii2addr.c
deleted file mode 100644
index e140244737..0000000000
--- a/cpukit/libnetworking/libc/ascii2addr.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright 1996 Massachusetts Institute of Technology
- *
- * Permission to use, copy, modify, and distribute this software and
- * its documentation for any purpose and without fee is hereby
- * granted, provided that both the above copyright notice and this
- * permission notice appear in all copies, that both the above
- * copyright notice and this permission notice appear in all
- * supporting documentation, and that the name of M.I.T. not be used
- * in advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission.  M.I.T. makes
- * no representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied
- * warranty.
- * 
- * THIS SOFTWARE IS PROVIDED BY M.I.T. ``AS IS''.  M.I.T. DISCLAIMS
- * ALL EXPRESS OR IMPLIED WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT
- * SHALL M.I.T. BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	$ANA: ascii2addr.c,v 1.2 1996/06/13 18:46:02 wollman Exp $
- *
- *  $Id$
- */
-
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <errno.h>
-#include <string.h>
-
-#include <net/if_dl.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-int
-ascii2addr(af, ascii, result)
-	int af;
-	const char *ascii;
-	void *result;
-{
-	struct in_addr *ina;
-	char strbuf[4*sizeof("123")]; /* long enough for V4 only */
-
-	switch(af) {
-	case AF_INET:
-		ina = result;
-		strbuf[0] = '\0';
-		strncat(strbuf, ascii, (sizeof strbuf)-1);
-		if (inet_aton(strbuf, ina))
-			return sizeof(struct in_addr);
-		errno = EINVAL;
-		break;
-
-	case AF_LINK:
-		link_addr(ascii, result);
-		/* oops... no way to detect failure */
-		return sizeof(struct sockaddr_dl);
-
-	default:
-		errno = EPROTONOSUPPORT;
-		break;
-	}
-
-	return -1;
-}
diff --git a/cpukit/libnetworking/libc/base64.c b/cpukit/libnetworking/libc/base64.c
deleted file mode 100644
index 3017ccc01c..0000000000
--- a/cpukit/libnetworking/libc/base64.c
+++ /dev/null
@@ -1,318 +0,0 @@
-/*
- * Copyright (c) 1996, 1998 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-/*
- * Portions Copyright (c) 1995 by International Business Machines, Inc.
- *
- * International Business Machines, Inc. (hereinafter called IBM) grants
- * permission under its copyrights to use, copy, modify, and distribute this
- * Software with or without fee, provided that the above copyright notice and
- * all paragraphs of this notice appear in all copies, and that the name of IBM
- * not be used in connection with the marketing of any product incorporating
- * the Software or modifications thereof, without specific, written prior
- * permission.
- *
- * To the extent it has a right to do so, IBM grants an immunity from suit
- * under its patents, if any, for the use, sale or manufacture of products to
- * the extent that such products are used for performing Domain Name System
- * dynamic updates in TCP/IP networks by means of the Software.  No immunity is
- * granted for any product per se or for any other function of any product.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", AND IBM DISCLAIMS ALL WARRANTIES,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL IBM BE LIABLE FOR ANY SPECIAL,
- * DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE, EVEN
- * IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES.
- */
-
-#if !defined(__rtems__)
-#if !defined(LINT) && !defined(CODECENTER)
-static char rcsid[] = "$Id$";
-#endif /* not lint */
-#endif /* not rtems */
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-
-#include <ctype.h>
-#include <resolv.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#define Assert(Cond) if (!(Cond)) abort()
-
-static const char Base64[] =
-	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-static const char Pad64 = '=';
-
-/* (From RFC1521 and draft-ietf-dnssec-secext-03.txt)
-   The following encoding technique is taken from RFC 1521 by Borenstein
-   and Freed.  It is reproduced here in a slightly edited form for
-   convenience.
-
-   A 65-character subset of US-ASCII is used, enabling 6 bits to be
-   represented per printable character. (The extra 65th character, "=",
-   is used to signify a special processing function.)
-
-   The encoding process represents 24-bit groups of input bits as output
-   strings of 4 encoded characters. Proceeding from left to right, a
-   24-bit input group is formed by concatenating 3 8-bit input groups.
-   These 24 bits are then treated as 4 concatenated 6-bit groups, each
-   of which is translated into a single digit in the base64 alphabet.
-
-   Each 6-bit group is used as an index into an array of 64 printable
-   characters. The character referenced by the index is placed in the
-   output string.
-
-                         Table 1: The Base64 Alphabet
-
-      Value Encoding  Value Encoding  Value Encoding  Value Encoding
-          0 A            17 R            34 i            51 z
-          1 B            18 S            35 j            52 0
-          2 C            19 T            36 k            53 1
-          3 D            20 U            37 l            54 2
-          4 E            21 V            38 m            55 3
-          5 F            22 W            39 n            56 4
-          6 G            23 X            40 o            57 5
-          7 H            24 Y            41 p            58 6
-          8 I            25 Z            42 q            59 7
-          9 J            26 a            43 r            60 8
-         10 K            27 b            44 s            61 9
-         11 L            28 c            45 t            62 +
-         12 M            29 d            46 u            63 /
-         13 N            30 e            47 v
-         14 O            31 f            48 w         (pad) =
-         15 P            32 g            49 x
-         16 Q            33 h            50 y
-
-   Special processing is performed if fewer than 24 bits are available
-   at the end of the data being encoded.  A full encoding quantum is
-   always completed at the end of a quantity.  When fewer than 24 input
-   bits are available in an input group, zero bits are added (on the
-   right) to form an integral number of 6-bit groups.  Padding at the
-   end of the data is performed using the '=' character.
-
-   Since all base64 input is an integral number of octets, only the
-         -------------------------------------------------                       
-   following cases can arise:
-   
-       (1) the final quantum of encoding input is an integral
-           multiple of 24 bits; here, the final unit of encoded
-	   output will be an integral multiple of 4 characters
-	   with no "=" padding,
-       (2) the final quantum of encoding input is exactly 8 bits;
-           here, the final unit of encoded output will be two
-	   characters followed by two "=" padding characters, or
-       (3) the final quantum of encoding input is exactly 16 bits;
-           here, the final unit of encoded output will be three
-	   characters followed by one "=" padding character.
-   */
-
-int
-b64_ntop(u_char const *src, size_t srclength, char *target, size_t targsize) {
-	size_t datalength = 0;
-	u_char input[3];
-	u_char output[4];
-	size_t i;
-
-	while (2 < srclength) {
-		input[0] = *src++;
-		input[1] = *src++;
-		input[2] = *src++;
-		srclength -= 3;
-
-		output[0] = input[0] >> 2;
-		output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4);
-		output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6);
-		output[3] = input[2] & 0x3f;
-		Assert(output[0] < 64);
-		Assert(output[1] < 64);
-		Assert(output[2] < 64);
-		Assert(output[3] < 64);
-
-		if (datalength + 4 > targsize)
-			return (-1);
-		target[datalength++] = Base64[output[0]];
-		target[datalength++] = Base64[output[1]];
-		target[datalength++] = Base64[output[2]];
-		target[datalength++] = Base64[output[3]];
-	}
-    
-	/* Now we worry about padding. */
-	if (0 != srclength) {
-		/* Get what's left. */
-		input[0] = input[1] = input[2] = '\0';
-		for (i = 0; i < srclength; i++)
-			input[i] = *src++;
-	
-		output[0] = input[0] >> 2;
-		output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4);
-		output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6);
-		Assert(output[0] < 64);
-		Assert(output[1] < 64);
-		Assert(output[2] < 64);
-
-		if (datalength + 4 > targsize)
-			return (-1);
-		target[datalength++] = Base64[output[0]];
-		target[datalength++] = Base64[output[1]];
-		if (srclength == 1)
-			target[datalength++] = Pad64;
-		else
-			target[datalength++] = Base64[output[2]];
-		target[datalength++] = Pad64;
-	}
-	if (datalength >= targsize)
-		return (-1);
-	target[datalength] = '\0';	/* Returned value doesn't count \0. */
-	return (datalength);
-}
-
-/* skips all whitespace anywhere.
-   converts characters, four at a time, starting at (or after)
-   src from base - 64 numbers into three 8 bit bytes in the target area.
-   it returns the number of data bytes stored at the target, or -1 on error.
- */
-
-int
-b64_pton(src, target, targsize)
-	char const *src;
-	u_char *target;
-	size_t targsize;
-{
-	int tarindex, state, ch;
-	char *pos;
-
-	state = 0;
-	tarindex = 0;
-
-	while ((ch = *src++) != '\0') {
-		if (isspace(ch))	/* Skip whitespace anywhere. */
-			continue;
-
-		if (ch == Pad64)
-			break;
-
-		pos = strchr(Base64, ch);
-		if (pos == 0) 		/* A non-base64 character. */
-			return (-1);
-
-		switch (state) {
-		case 0:
-			if (target) {
-				if ((size_t)tarindex >= targsize)
-					return (-1);
-				target[tarindex] = (pos - Base64) << 2;
-			}
-			state = 1;
-			break;
-		case 1:
-			if (target) {
-				if ((size_t)tarindex + 1 >= targsize)
-					return (-1);
-				target[tarindex]   |=  (pos - Base64) >> 4;
-				target[tarindex+1]  = ((pos - Base64) & 0x0f)
-							<< 4 ;
-			}
-			tarindex++;
-			state = 2;
-			break;
-		case 2:
-			if (target) {
-				if ((size_t)tarindex + 1 >= targsize)
-					return (-1);
-				target[tarindex]   |=  (pos - Base64) >> 2;
-				target[tarindex+1]  = ((pos - Base64) & 0x03)
-							<< 6;
-			}
-			tarindex++;
-			state = 3;
-			break;
-		case 3:
-			if (target) {
-				if ((size_t)tarindex >= targsize)
-					return (-1);
-				target[tarindex] |= (pos - Base64);
-			}
-			tarindex++;
-			state = 0;
-			break;
-		default:
-			abort();
-		}
-	}
-
-	/*
-	 * We are done decoding Base-64 chars.  Let's see if we ended
-	 * on a byte boundary, and/or with erroneous trailing characters.
-	 */
-
-	if (ch == Pad64) {		/* We got a pad char. */
-		ch = *src++;		/* Skip it, get next. */
-		switch (state) {
-		case 0:		/* Invalid = in first position */
-		case 1:		/* Invalid = in second position */
-			return (-1);
-
-		case 2:		/* Valid, means one byte of info */
-			/* Skip any number of spaces. */
-			for ((void)NULL; ch != '\0'; ch = *src++)
-				if (!isspace(ch))
-					break;
-			/* Make sure there is another trailing = sign. */
-			if (ch != Pad64)
-				return (-1);
-			ch = *src++;		/* Skip the = */
-			/* Fall through to "single trailing =" case. */
-			/* FALLTHROUGH */
-
-		case 3:		/* Valid, means two bytes of info */
-			/*
-			 * We know this char is an =.  Is there anything but
-			 * whitespace after it?
-			 */
-			for ((void)NULL; ch != '\0'; ch = *src++)
-				if (!isspace(ch))
-					return (-1);
-
-			/*
-			 * Now make sure for cases 2 and 3 that the "extra"
-			 * bits that slopped past the last full byte were
-			 * zeros.  If we don't check them, they become a
-			 * subliminal channel.
-			 */
-			if (target && target[tarindex] != 0)
-				return (-1);
-		}
-	} else {
-		/*
-		 * We ended by seeing the end of the string.  Make sure we
-		 * have no partial bytes lying around.
-		 */
-		if (state != 0)
-			return (-1);
-	}
-
-	return (tarindex);
-}
diff --git a/cpukit/libnetworking/libc/byteorder.3 b/cpukit/libnetworking/libc/byteorder.3
deleted file mode 100644
index 81bf604867..0000000000
--- a/cpukit/libnetworking/libc/byteorder.3
+++ /dev/null
@@ -1,77 +0,0 @@
-.\" Copyright (c) 1983, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"     @(#)byteorder.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
-.\"
-.Dd June 4, 1993
-.Dt BYTEORDER 3
-.Os BSD 4.2
-.Sh NAME
-.Nm htonl ,
-.Nm htons ,
-.Nm ntohl ,
-.Nm ntohs
-.Nd convert values between host and network byte order
-.Sh SYNOPSIS
-.Fd #include <sys/param.h>
-.Ft u_long
-.Fn htonl "u_long hostlong"
-.Ft u_short
-.Fn htons "u_short hostshort"
-.Ft u_long
-.Fn ntohl "u_long netlong"
-.Ft u_short
-.Fn ntohs "u_short netshort"
-.Sh DESCRIPTION
-These routines convert 16 and 32 bit quantities between network
-byte order and host byte order.
-On machines which have a byte order which is the same as the network
-order, routines are defined as null macros.
-.Pp
-These routines are most often used in conjunction with Internet
-addresses and ports as returned by
-.Xr gethostbyname 3
-and
-.Xr getservent 3 .
-.Sh SEE ALSO
-.Xr gethostbyname 3 ,
-.Xr getservent 3
-.Sh HISTORY
-The
-.Nm byteorder
-functions appeared in 
-.Bx 4.2 .
-.Sh BUGS
-On the
-.Tn VAX
-bytes are handled backwards from most everyone else in
-the world.  This is not expected to be fixed in the near future.
diff --git a/cpukit/libnetworking/libc/ether_addr.c b/cpukit/libnetworking/libc/ether_addr.c
deleted file mode 100644
index 9b7a9abf44..0000000000
--- a/cpukit/libnetworking/libc/ether_addr.c
+++ /dev/null
@@ -1,226 +0,0 @@
-/*
- * Copyright (c) 1995
- *	Bill Paul <wpaul@ctr.columbia.edu>.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by Bill Paul.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY Bill Paul AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * ethernet address conversion and lookup routines
- *
- * Written by Bill Paul <wpaul@ctr.columbia.edu>
- * Center for Telecommunications Research
- * Columbia University, New York City
- *
- *	$Id$
- */
-
-
-#include <stdio.h>
-#include <paths.h>
-#include <sys/types.h>
-#include <string.h>
-#include <stdlib.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <net/ethernet.h>
-#ifdef YP
-#include <rpc/rpc.h>
-#include <rpcsvc/yp_prot.h>
-#include <rpcsvc/ypclnt.h>
-#endif
-
-#ifndef _PATH_ETHERS
-#define _PATH_ETHERS "/etc/ethers"
-#endif
-
-/*
- * Parse a string of text containing an ethernet address and hostname
- * and separate it into its component parts.
- */
-int ether_line(l, e, hostname)
-        char *l;
-	struct ether_addr *e;
-	char *hostname;
-{
-        int i, o[6];
-
-        i = sscanf(l, "%x:%x:%x:%x:%x:%x %s", &o[0], &o[1], &o[2],
-                                              &o[3], &o[4], &o[5],
-					      hostname);
-	if (i != 7)
-                return (i);
-
-        for (i=0; i<6; i++)
-                e->octet[i] = o[i];
-        return (0);
-}
-
-/*
- * Convert an ASCII representation of an ethernet address to
- * binary form.
- */
-struct ether_addr *ether_aton(a)
-        char *a;
-{
-        int i;
-	static struct ether_addr o;
-	unsigned int o0, o1, o2, o3, o4, o5;
-
-        i = sscanf(a, "%x:%x:%x:%x:%x:%x", &o0, &o1, &o2, &o3, &o4, &o5);
-
-        if (i != 6)
-                return (NULL);
-
-        o.octet[0]=o0;
-	o.octet[1]=o1;
-	o.octet[2]=o2;
-	o.octet[3]=o3;
-	o.octet[4]=o4;
-	o.octet[5]=o5;
-
-        return ((struct ether_addr *)&o);
-}
-
-/*
- * Convert a binary representation of an ethernet address to
- * an ASCII string.
- */
-char *ether_ntoa(n)
-        struct ether_addr *n;
-{
-        int i;
-	static char a[18];
-
-        i = sprintf(a,"%x:%x:%x:%x:%x:%x",n->octet[0],n->octet[1],n->octet[2],
-                                          n->octet[3],n->octet[4],n->octet[5]);
-        if (i < 11)
-                return (NULL);
-        return ((char *)&a);
-}
-
-/*
- * Map an ethernet address to a hostname. Use either /etc/ethers or
- * NIS/YP.
- */
-
-int ether_ntohost(hostname, e)
-	char *hostname;
-	struct ether_addr *e;
-{
-	FILE *fp;
-	char buf[BUFSIZ + 2];
-	struct ether_addr local_ether;
-	char local_host[MAXHOSTNAMELEN];
-#ifdef YP
-	char *result;
-	int resultlen;
-	char *ether_a;
-	char *yp_domain;
-#endif
-	if ((fp = fopen(_PATH_ETHERS, "r")) == NULL)
-		return (1);
-
-	while (fgets(buf,BUFSIZ,fp)) {
-		if (buf[0] == '#')
-			continue;
-#ifdef YP
-		if (buf[0] == '+') {
-			if (yp_get_default_domain(&yp_domain))
-				continue;
-			ether_a = ether_ntoa(e);
-			if (yp_match(yp_domain, "ethers.byaddr", ether_a,
-				strlen(ether_a), &result, &resultlen)) {
-				continue;
-			}
-			strncpy(buf, result, resultlen);
-			buf[resultlen] = '\0';
-			free(result);
-		}
-#endif
-		if (!ether_line(buf, &local_ether, local_host)) {
-			if (!bcmp((char *)&local_ether.octet[0],
-				(char *)&e->octet[0], 6)) {
-			/* We have a match */
-				strcpy(hostname, local_host);
-				fclose(fp);
-				return(0);
-			}
-		}
-	}
-	fclose(fp);
-	return (1);
-}
-
-/*
- * Map a hostname to an ethernet address using /etc/ethers or
- * NIS/YP.
- */
-int ether_hostton(hostname, e)
-	char *hostname;
-	struct ether_addr *e;
-{
-	FILE *fp;
-	char buf[BUFSIZ + 2];
-	struct ether_addr local_ether;
-	char local_host[MAXHOSTNAMELEN];
-#ifdef YP
-	char *result;
-	int resultlen;
-	char *yp_domain;
-#endif
-	if ((fp = fopen(_PATH_ETHERS, "r")) == NULL)
-		return (1);
-
-	while (fgets(buf,BUFSIZ,fp)) {
-		if (buf[0] == '#')
-			continue;
-#ifdef YP
-		if (buf[0] == '+') {
-			if (yp_get_default_domain(&yp_domain))
-				continue;
-			if (yp_match(yp_domain, "ethers.byname", hostname,
-				strlen(hostname), &result, &resultlen)) {
-				continue;
-			}
-			strncpy(buf, result, resultlen);
-			buf[resultlen] = '\0';
-			free(result);
-		}
-#endif
-		if (!ether_line(buf, &local_ether, local_host)) {
-			if (!strcmp(hostname, local_host)) {
-				/* We have a match */
-				bcopy((char *)&local_ether.octet[0],
-					(char *)&e->octet[0], 6);
-				fclose(fp);
-				return(0);
-			}
-		}
-	}
-	fclose(fp);
-	return (1);
-}
diff --git a/cpukit/libnetworking/libc/ethers.3 b/cpukit/libnetworking/libc/ethers.3
deleted file mode 100644
index afea48320a..0000000000
--- a/cpukit/libnetworking/libc/ethers.3
+++ /dev/null
@@ -1,193 +0,0 @@
-.\" Copyright (c) 1995
-.\"	Bill Paul <wpaul@ctr.columbia.edu>.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by Bill Paul.
-.\" 4. Neither the name of the author nor the names of any co-contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY Bill Paul AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"     $Id$
-.\"
-.Dd April 12, 1995
-.Dt ETHERS 3
-.Os FreeBSD 2.1
-.Sh NAME
-.Nm ethers ,
-.Nm ether_line ,
-.Nm ether_aton ,
-.Nm ether_ntoa ,
-.Nm ether_ntohost ,
-.Nm ether_hostton
-.Nd Ethernet address conversion and lookup routines
-.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/socket.h>
-.Fd #include <net/ethernet.h>
-.Ft int
-.Fn ether_line "char *l" "struct ether_addr *e" "char *hostname"
-.Ft struct ether_addr *
-.Fn ether_aton "char *a"
-.Ft char *
-.Fn ether_ntoa "struct ether_addr *n"
-.Ft int
-.Fn ether_ntohost "char *hostname" "struct ether_addr *e"
-.Ft int
-.Fn ether_hostton "char *hostname" "struct ether_addr *e"
-.Sh DESCRIPTION
-These functions operate on ethernet addresses using an
-.Ar ether_addr
-structure, which is defined in the header file
-.Aq Pa netinet/if_ether.h :
-.Bd -literal -offset indent
-/*
- * The number of bytes in an ethernet (MAC) address.
- */
-#define ETHER_ADDR_LEN		6
-
-/*
- * Structure of a 48-bit Ethernet address.
- */
-struct  ether_addr {
-        u_char octet[ETHER_ADDR_LEN];
-};
-.Ed
-.Pp
-The function
-.Fn ether_line
-scans
-.Ar l ,
-an
-.Tn ASCII
-string in
-.Xr ethers 5
-format and sets
-.Ar e
-to the ethernet address specified in the string and
-.Ar h
-to the hostname. This function is used to parse lines from
-.Pa /etc/ethers
-into their component parts.
-.Pp
-The
-.Fn ether_aton
-function converts an
-.Tn ASCII
-representation of an ethernet address into an
-.Ar ether_addr
-structure. Likewise,
-.Fn ether_ntoa
-converts an ethernet address specified as an
-.Ar ether_addr
-structure into an
-.Tn ASCII
-string.
-.Pp
-The
-.Fn ether_ntohost
-and
-.Fn ether_hostton
-functions map ethernet addresses to their corresponding hostnames
-as specified in the
-.Pa /etc/ethers
-database. 
-.Fn ether_ntohost
-converts from ethernet address to hostname, and
-.Fn ether_hostton
-converts from hostname to ethernet address.
-.Sh RETURN VALUES
-.Fn ether_line
-returns zero on success and non-zero if it was unable to parse
-any part of the supplied line
-.Ar l .
-It returns the extracted ethernet address in the supplied
-.Ar ether_addr
-structure
-.Ar e
-and the hostname in the supplied string
-.Ar h .
-.Pp
-On success, 
-.Fn ether_ntoa
-returns a pointer to a string containing an
-.Tn ASCII
-representation of an ethernet address. If it is unable to convert
-the supplied
-.Ar ether_addr
-structure, it returns a
-.Dv NULL
-pointer. Likewise,
-.Fn ether_aton
-returns a pointer to an
-.Ar ether_addr
-structure on success and a
-.Dv NULL
-pointer on failure.
-.Pp
-The
-.Fn ether_ntohost
-and
-.Fn ether_hostton
-functions both return zero on success or non-zero if they were
-unable to find a match in the
-.Pa /etc/ethers
-database.
-.Sh NOTES
-The user must insure that the hostname strings passed to the
-the
-.Fn ether_line ,
-.Fn ether_ntohost
-and
-.Fn ether_hostton
-functions are large enough to contain the returned hostnames.
-.Sh NIS INTERACTION
-If the
-.Pa /etc/ethers
-contains a line with a single + in it, the
-.Fn ether_ntohost
-and
-.Fn ether_hostton
-functions will attempt to consult the NIS
-.Pa ethers.byname
-and
-.Pa ethers.byaddr
-maps in addition to the data in the
-.Pa /etc/ethers
-file.
-.Sh SEE ALSO
-.Xr yp 4 ,
-.Xr ethers 5
-.Sh BUGS
-.Pp
-The
-.Fn ether_aton
-and
-.Fn ether_ntoa
-functions returns values that are stored in static memory areas
-which may be overwritten the next time they are called.
-.Sh HISTORY
-This particular implementation of the
-.Nm ethers
-library functions were written for and first appeared in
-.Fx 2.1 .
diff --git a/cpukit/libnetworking/libc/gethostbydns.c b/cpukit/libnetworking/libc/gethostbydns.c
deleted file mode 100644
index 3d80ffde7a..0000000000
--- a/cpukit/libnetworking/libc/gethostbydns.c
+++ /dev/null
@@ -1,773 +0,0 @@
-/*
- * ++Copyright++ 1985, 1988, 1993
- * -
- * Copyright (c) 1985, 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * -
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- * -
- * --Copyright--
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)gethostnamadr.c	8.1 (Berkeley) 6/4/93";
-static char fromrcsid[] = "From: Id: gethnamaddr.c,v 8.23 1998/04/07 04:59:46 vixie Exp $";
-static char rcsid[] = "$Id$";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-
-#include <stdio.h>
-#include <unistd.h>
-#include <string.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <ctype.h>
-#include <errno.h>
-#include <syslog.h>
-
-#include "res_config.h"
-
-#define SPRINTF(x) ((size_t)sprintf x)
-
-#define	MAXALIASES	35
-#define	MAXADDRS	35
-
-static const char AskedForGot[] =
-		"gethostby*.gethostanswer: asked for \"%s\", got \"%s\"";
-
-static char *h_addr_ptrs[MAXADDRS + 1];
-
-static struct hostent host;
-static char *host_aliases[MAXALIASES];
-static char hostbuf[8*1024];
-static u_char host_addr[16];	/* IPv4 or IPv6 */
-
-#ifdef RESOLVSORT
-static void addrsort __P((char **, int));
-#endif
-
-#if PACKETSZ > 1024
-#define	MAXPACKET	PACKETSZ
-#else
-#define	MAXPACKET	1024
-#endif
-
-typedef union {
-    HEADER hdr;
-    u_char buf[MAXPACKET];
-} querybuf;
-
-typedef union {
-    int32_t al;
-    char ac;
-} align;
-
-extern int h_errno;
-int _dns_ttl_;
-
-#ifdef DEBUG
-static void
-dprintf(msg, num)
-	char *msg;
-	int num;
-{
-	if (_res.options & RES_DEBUG) {
-		int save = errno;
-
-		printf(msg, num);
-		errno = save;
-	}
-}
-#else
-# define dprintf(msg, num) /*nada*/
-#endif
-
-#define BOUNDED_INCR(x) \
-	do { \
-		cp += x; \
-		if (cp > eom) { \
-			h_errno = NO_RECOVERY; \
-			return (NULL); \
-		} \
-	} while (0)
-
-#define BOUNDS_CHECK(ptr, count) \
-	do { \
-		if ((ptr) + (count) > eom) { \
-			h_errno = NO_RECOVERY; \
-			return (NULL); \
-		} \
-	} while (0)
-
-static struct hostent *
-gethostanswer(answer, anslen, qname, qtype)
-	const querybuf *answer;
-	int anslen;
-	const char *qname;
-	int qtype;
-{
-	register const HEADER *hp;
-	register const u_char *cp;
-	register int n;
-	const u_char *eom, *erdata;
-	char *bp, **ap, **hap;
-	int type, class, buflen, ancount, qdcount;
-	int haveanswer, had_error;
-	int toobig = 0;
-	char tbuf[MAXDNAME];
-	const char *tname;
-	int (*name_ok) __P((const char *));
-
-	tname = qname;
-	host.h_name = NULL;
-	eom = answer->buf + anslen;
-	switch (qtype) {
-	case T_A:
-	case T_AAAA:
-		name_ok = res_hnok;
-		break;
-	case T_PTR:
-		name_ok = res_dnok;
-		break;
-	default:
-		h_errno = NO_RECOVERY;
-		return (NULL);	/* XXX should be abort(); */
-	}
-	/*
-	 * find first satisfactory answer
-	 */
-	hp = &answer->hdr;
-	ancount = ntohs(hp->ancount);
-	qdcount = ntohs(hp->qdcount);
-	bp = hostbuf;
-	buflen = sizeof hostbuf;
-	cp = answer->buf;
-	BOUNDED_INCR(HFIXEDSZ);
-	if (qdcount != 1) {
-		h_errno = NO_RECOVERY;
-		return (NULL);
-	}
-	n = dn_expand(answer->buf, eom, cp, bp, buflen);
-	if ((n < 0) || !(*name_ok)(bp)) {
-		h_errno = NO_RECOVERY;
-		return (NULL);
-	}
-	BOUNDED_INCR(n + QFIXEDSZ);
-	if (qtype == T_A || qtype == T_AAAA) {
-		/* res_send() has already verified that the query name is the
-		 * same as the one we sent; this just gets the expanded name
-		 * (i.e., with the succeeding search-domain tacked on).
-		 */
-		n = strlen(bp) + 1;		/* for the \0 */
-		if (n >= MAXHOSTNAMELEN) {
-			h_errno = NO_RECOVERY;
-			return (NULL);
-		}
-		host.h_name = bp;
-		bp += n;
-		buflen -= n;
-		/* The qname can be abbreviated, but h_name is now absolute. */
-		qname = host.h_name;
-	}
-	ap = host_aliases;
-	*ap = NULL;
-	host.h_aliases = host_aliases;
-	hap = h_addr_ptrs;
-	*hap = NULL;
-	host.h_addr_list = h_addr_ptrs;
-	haveanswer = 0;
-	had_error = 0;
-	_dns_ttl_ = -1;
-	while (ancount-- > 0 && cp < eom && !had_error) {
-		n = dn_expand(answer->buf, eom, cp, bp, buflen);
-		if ((n < 0) || !(*name_ok)(bp)) {
-			had_error++;
-			continue;
-		}
-		cp += n;			/* name */
-		BOUNDS_CHECK(cp, 3 * INT16SZ + INT32SZ);
-		type = _getshort(cp);
- 		cp += INT16SZ;			/* type */
-		class = _getshort(cp);
- 		cp += INT16SZ;			/* class */
-		if (qtype == T_A  && type == T_A)
-			_dns_ttl_ = _getlong(cp);
-		cp += INT32SZ;			/* TTL */
-		n = _getshort(cp);
-		cp += INT16SZ;			/* len */
-		BOUNDS_CHECK(cp, n);
-		erdata = cp + n;
-		if (class != C_IN) {
-			/* XXX - debug? syslog? */
-			cp += n;
-			continue;		/* XXX - had_error++ ? */
-		}
-		if ((qtype == T_A || qtype == T_AAAA) && type == T_CNAME) {
-			if (ap >= &host_aliases[MAXALIASES-1])
-				continue;
-			n = dn_expand(answer->buf, eom, cp, tbuf, sizeof tbuf);
-			if ((n < 0) || !(*name_ok)(tbuf)) {
-				had_error++;
-				continue;
-			}
-			cp += n;
-			if (cp != erdata) {
-				h_errno = NO_RECOVERY;
-				return (NULL);
-			}
-			/* Store alias. */
-			*ap++ = bp;
-			n = strlen(bp) + 1;	/* for the \0 */
-			if (n >= MAXHOSTNAMELEN) {
-				had_error++;
-				continue;
-			}
-			bp += n;
-			buflen -= n;
-			/* Get canonical name. */
-			n = strlen(tbuf) + 1;	/* for the \0 */
-			if (n > buflen || n >= MAXHOSTNAMELEN) {
-				had_error++;
-				continue;
-			}
-			strcpy(bp, tbuf);
-			host.h_name = bp;
-			bp += n;
-			buflen -= n;
-			continue;
-		}
-		if (qtype == T_PTR && type == T_CNAME) {
-			n = dn_expand(answer->buf, eom, cp, tbuf, sizeof tbuf);
-			if (n < 0 || !res_dnok(tbuf)) {
-				had_error++;
-				continue;
-			}
-			cp += n;
-			if (cp != erdata) {
-				h_errno = NO_RECOVERY;
-				return (NULL);
-			}
-			/* Get canonical name. */
-			n = strlen(tbuf) + 1;	/* for the \0 */
-			if (n > buflen || n >= MAXHOSTNAMELEN) {
-				had_error++;
-				continue;
-			}
-			strcpy(bp, tbuf);
-			tname = bp;
-			bp += n;
-			buflen -= n;
-			continue;
-		}
-		if (type != qtype) {
-			syslog(LOG_NOTICE|LOG_AUTH,
-	"gethostby*.gethostanswer: asked for \"%s %s %s\", got type \"%s\"",
-			       qname, p_class(C_IN), p_type(qtype),
-			       p_type(type));
-			cp += n;
-			continue;		/* XXX - had_error++ ? */
-		}
-		switch (type) {
-		case T_PTR:
-			if (strcasecmp(tname, bp) != 0) {
-				syslog(LOG_NOTICE|LOG_AUTH,
-				       AskedForGot, qname, bp);
-				cp += n;
-				continue;	/* XXX - had_error++ ? */
-			}
-			n = dn_expand(answer->buf, eom, cp, bp, buflen);
-			if ((n < 0) || !res_hnok(bp)) {
-				had_error++;
-				break;
-			}
-#if MULTI_PTRS_ARE_ALIASES
-			cp += n;
-			if (cp != erdata) {
-				h_errno = NO_RECOVERY;
-				return (NULL);
-			}
-			if (!haveanswer)
-				host.h_name = bp;
-			else if (ap < &host_aliases[MAXALIASES-1])
-				*ap++ = bp;
-			else
-				n = -1;
-			if (n != -1) {
-				n = strlen(bp) + 1;	/* for the \0 */
-				if (n >= MAXHOSTNAMELEN) {
-					had_error++;
-					break;
-				}
-				bp += n;
-				buflen -= n;
-			}
-			break;
-#else
-			host.h_name = bp;
-			if (_res.options & RES_USE_INET6) {
-				n = strlen(bp) + 1;	/* for the \0 */
-				if (n >= MAXHOSTNAMELEN) {
-					had_error++;
-					break;
-				}
-				bp += n;
-				buflen -= n;
-				_map_v4v6_hostent(&host, &bp, &buflen);
-			}
-			h_errno = NETDB_SUCCESS;
-			return (&host);
-#endif
-		case T_A:
-		case T_AAAA:
-			if (strcasecmp(host.h_name, bp) != 0) {
-				syslog(LOG_NOTICE|LOG_AUTH,
-				       AskedForGot, host.h_name, bp);
-				cp += n;
-				continue;	/* XXX - had_error++ ? */
-			}
-			if (n != host.h_length) {
-				cp += n;
-				continue;
-			}
-			if (!haveanswer) {
-				register int nn;
-
-				host.h_name = bp;
-				nn = strlen(bp) + 1;	/* for the \0 */
-				bp += nn;
-				buflen -= nn;
-			}
-
-			bp += sizeof(align) - ((u_long)bp % sizeof(align));
-
-			if (bp + n >= &hostbuf[sizeof hostbuf]) {
-				dprintf("size (%d) too big\n", n);
-				had_error++;
-				continue;
-			}
-			if (hap >= &h_addr_ptrs[MAXADDRS-1]) {
-				if (!toobig++)
-					dprintf("Too many addresses (%d)\n",
-						MAXADDRS);
-				cp += n;
-				continue;
-			}
-			bcopy(cp, *hap++ = bp, n);
-			bp += n;
-			buflen -= n;
-			cp += n;
-			if (cp != erdata) {
-				h_errno = NO_RECOVERY;
-				return (NULL);
-			}
-			break;
-		default:
-			dprintf("Impossible condition (type=%d)\n", type);
-			h_errno = NO_RECOVERY;
-			return (NULL);
-			/* BIND has abort() here, too risky on bad data */
-		}
-		if (!had_error)
-			haveanswer++;
-	}
-	if (haveanswer) {
-		*ap = NULL;
-		*hap = NULL;
-# if defined(RESOLVSORT)
-		/*
-		 * Note: we sort even if host can take only one address
-		 * in its return structures - should give it the "best"
-		 * address in that case, not some random one
-		 */
-		if (_res.nsort && haveanswer > 1 && qtype == T_A)
-			addrsort(h_addr_ptrs, haveanswer);
-# endif /*RESOLVSORT*/
-		if (!host.h_name) {
-			n = strlen(qname) + 1;	/* for the \0 */
-			if (n > buflen || n >= MAXHOSTNAMELEN)
-				goto no_recovery;
-			strcpy(bp, qname);
-			host.h_name = bp;
-			bp += n;
-			buflen -= n;
-		}
-		if (_res.options & RES_USE_INET6)
-			_map_v4v6_hostent(&host, &bp, &buflen);
-		h_errno = NETDB_SUCCESS;
-		return (&host);
-	}
- no_recovery:
-	h_errno = NO_RECOVERY;
-	return (NULL);
-}
-
-struct hostent *
-__dns_getanswer(answer, anslen, qname, qtype)
-	const char *answer;
-	int anslen;
-	const char *qname;
-	int qtype;
-{
-	switch(qtype) {
-	case T_AAAA:
-		host.h_addrtype = AF_INET6;
-		host.h_length = IN6ADDRSZ;
-		break;
-	case T_A:
-	default:
-		host.h_addrtype = AF_INET;
-		host.h_length = INADDRSZ;
-		break;
-	}
-
-	return(gethostanswer((const querybuf *)answer, anslen, qname, qtype));
-}
-
-struct hostent *
-_gethostbydnsname(name, af)
-	const char *name;
-	int af;
-{
-	querybuf buf;
-	register const char *cp;
-	char *bp;
-	int n, size, type, len;
-
-	if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
-		h_errno = NETDB_INTERNAL;
-		return (NULL);
-	}
-
-	switch (af) {
-	case AF_INET:
-		size = INADDRSZ;
-		type = T_A;
-		break;
-	case AF_INET6:
-		size = IN6ADDRSZ;
-		type = T_AAAA;
-		break;
-	default:
-		h_errno = NETDB_INTERNAL;
-		errno = EAFNOSUPPORT;
-		return (NULL);
-	}
-
-	host.h_addrtype = af;
-	host.h_length = size;
-
-	/*
-	 * if there aren't any dots, it could be a user-level alias.
-	 * this is also done in res_query() since we are not the only
-	 * function that looks up host names.
-	 */
-	if (!strchr(name, '.') && (cp = __hostalias(name)))
-		name = cp;
-
-	/*
-	 * disallow names consisting only of digits/dots, unless
-	 * they end in a dot.
-	 */
-	if (isdigit((int)name[0]))
-		for (cp = name;; ++cp) {
-			if (!*cp) {
-				if (*--cp == '.')
-					break;
-				/*
-				 * All-numeric, no dot at the end.
-				 * Fake up a hostent as if we'd actually
-				 * done a lookup.
-				 */
-				if (inet_pton(af, name, host_addr) <= 0) {
-					h_errno = HOST_NOT_FOUND;
-					return (NULL);
-				}
-				strncpy(hostbuf, name, MAXDNAME);
-				hostbuf[MAXDNAME] = '\0';
-				bp = hostbuf + MAXDNAME;
-				len = sizeof hostbuf - MAXDNAME;
-				host.h_name = hostbuf;
-				host.h_aliases = host_aliases;
-				host_aliases[0] = NULL;
-				h_addr_ptrs[0] = (char *)host_addr;
-				h_addr_ptrs[1] = NULL;
-				host.h_addr_list = h_addr_ptrs;
-				if (_res.options & RES_USE_INET6)
-					_map_v4v6_hostent(&host, &bp, &len);
-				h_errno = NETDB_SUCCESS;
-				return (&host);
-			}
-			if (!isdigit((int)*cp) && *cp != '.') 
-				break;
-		}
-	if ((isxdigit((int)name[0]) && strchr(name, ':') != NULL) ||
-	    name[0] == ':')
-		for (cp = name;; ++cp) {
-			if (!*cp) {
-				if (*--cp == '.')
-					break;
-				/*
-				 * All-IPv6-legal, no dot at the end.
-				 * Fake up a hostent as if we'd actually
-				 * done a lookup.
-				 */
-				if (inet_pton(af, name, host_addr) <= 0) {
-					h_errno = HOST_NOT_FOUND;
-					return (NULL);
-				}
-				strncpy(hostbuf, name, MAXDNAME);
-				hostbuf[MAXDNAME] = '\0';
-				bp = hostbuf + MAXDNAME;
-				len = sizeof hostbuf - MAXDNAME;
-				host.h_name = hostbuf;
-				host.h_aliases = host_aliases;
-				host_aliases[0] = NULL;
-				h_addr_ptrs[0] = (char *)host_addr;
-				h_addr_ptrs[1] = NULL;
-				host.h_addr_list = h_addr_ptrs;
-				h_errno = NETDB_SUCCESS;
-				return (&host);
-			}
-			if (!isxdigit((int)*cp) && *cp != ':' && *cp != '.') 
-				break;
-		}
-
-	if ((n = res_search(name, C_IN, type, buf.buf, sizeof(buf))) < 0) {
-		dprintf("res_search failed (%d)\n", n);
-		return (NULL);
-	}
-	return (gethostanswer(&buf, n, name, type));
-}
-
-struct hostent *
-_gethostbydnsaddr(addr, len, af)
-	const char *addr;	/* XXX should have been def'd as u_char! */
-	int len, af;
-{
-	const u_char *uaddr = (const u_char *)addr;
-	static const u_char mapped[] = { 0,0, 0,0, 0,0, 0,0, 0,0, 0xff,0xff };
-	static const u_char tunnelled[] = { 0,0, 0,0, 0,0, 0,0, 0,0, 0,0 };
-	int n, size;
-	querybuf buf;
-	register struct hostent *hp;
-	char qbuf[MAXDNAME+1], *qp;
-#ifdef SUNSECURITY
-	register struct hostent *rhp;
-	char **haddr;
-	u_long old_options;
-	char hname2[MAXDNAME+1];
-#endif /*SUNSECURITY*/
-	
-	if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
-		h_errno = NETDB_INTERNAL;
-		return (NULL);
-	}
-	if (af == AF_INET6 && len == IN6ADDRSZ &&
-	    (!bcmp(uaddr, mapped, sizeof mapped) ||
-	     !bcmp(uaddr, tunnelled, sizeof tunnelled))) {
-		/* Unmap. */
-		addr += sizeof mapped;
-		uaddr += sizeof mapped;
-		af = AF_INET;
-		len = INADDRSZ;
-	}
-	switch (af) {
-	case AF_INET:
-		size = INADDRSZ;
-		break;
-	case AF_INET6:
-		size = IN6ADDRSZ;
-		break;
-	default:
-		errno = EAFNOSUPPORT;
-		h_errno = NETDB_INTERNAL;
-		return (NULL);
-	}
-	if (size != len) {
-		errno = EINVAL;
-		h_errno = NETDB_INTERNAL;
-		return (NULL);
-	}
-	switch (af) {
-	case AF_INET:
-		(void) sprintf(qbuf, "%u.%u.%u.%u.in-addr.arpa",
-			       (uaddr[3] & 0xff),
-			       (uaddr[2] & 0xff),
-			       (uaddr[1] & 0xff),
-			       (uaddr[0] & 0xff));
-		break;
-	case AF_INET6:
-		qp = qbuf;
-		for (n = IN6ADDRSZ - 1; n >= 0; n--) {
-			qp += SPRINTF((qp, "%x.%x.",
-				       uaddr[n] & 0xf,
-				       (uaddr[n] >> 4) & 0xf));
-		}
-		strcpy(qp, "ip6.int");
-		break;
-	default:
-		abort();
-	}
-	n = res_query(qbuf, C_IN, T_PTR, (u_char *)buf.buf, sizeof buf.buf);
-	if (n < 0) {
-		dprintf("res_query failed (%d)\n", n);
-		return (NULL);
-	}
-	if (!(hp = gethostanswer(&buf, n, qbuf, T_PTR)))
-		return (NULL);	/* h_errno was set by gethostanswer() */
-#ifdef SUNSECURITY
-	if (af == AF_INET) {
-	    /*
-	     * turn off search as the name should be absolute,
-	     * 'localhost' should be matched by defnames
-	     */
-	    strncpy(hname2, hp->h_name, MAXDNAME);
-	    hname2[MAXDNAME] = '\0';
-	    old_options = _res.options;
-	    _res.options &= ~RES_DNSRCH;
-	    _res.options |= RES_DEFNAMES;
-	    if (!(rhp = gethostbyname(hname2))) {
-		syslog(LOG_NOTICE|LOG_AUTH,
-		       "gethostbyaddr: No A record for %s (verifying [%s])",
-		       hname2, inet_ntoa(*((struct in_addr *)addr)));
-		_res.options = old_options;
-		h_errno = HOST_NOT_FOUND;
-		return (NULL);
-	    }
-	    _res.options = old_options;
-	    for (haddr = rhp->h_addr_list; *haddr; haddr++)
-		if (!memcmp(*haddr, addr, INADDRSZ))
-			break;
-	    if (!*haddr) {
-		syslog(LOG_NOTICE|LOG_AUTH,
-		       "gethostbyaddr: A record of %s != PTR record [%s]",
-		       hname2, inet_ntoa(*((struct in_addr *)addr)));
-		h_errno = HOST_NOT_FOUND;
-		return (NULL);
-	    }
-	}
-#endif /*SUNSECURITY*/
-	hp->h_addrtype = af;
-	hp->h_length = len;
-	bcopy(addr, host_addr, len);
-	h_addr_ptrs[0] = (char *)host_addr;
-	h_addr_ptrs[1] = NULL;
-	if (af == AF_INET && (_res.options & RES_USE_INET6)) {
-		_map_v4v6_address((char*)host_addr, (char*)host_addr);
-		hp->h_addrtype = AF_INET6;
-		hp->h_length = IN6ADDRSZ;
-	}
-	h_errno = NETDB_SUCCESS;
-	return (hp);
-}
-
-#ifdef RESOLVSORT
-static void
-addrsort(ap, num)
-	char **ap;
-	int num;
-{
-	int i, j;
-	char **p;
-	short aval[MAXADDRS];
-	int needsort = 0;
-
-	p = ap;
-	for (i = 0; i < num; i++, p++) {
-	    for (j = 0 ; (unsigned)j < _res.nsort; j++)
-		if (_res.sort_list[j].addr.s_addr == 
-		    (((struct in_addr *)(*p))->s_addr & _res.sort_list[j].mask))
-			break;
-	    aval[i] = j;
-	    if (needsort == 0 && i > 0 && j < aval[i-1])
-		needsort = i;
-	}
-	if (!needsort)
-	    return;
-
-	while (needsort < num) {
-	    for (j = needsort - 1; j >= 0; j--) {
-		if (aval[j] > aval[j+1]) {
-		    char *hp;
-
-		    i = aval[j];
-		    aval[j] = aval[j+1];
-		    aval[j+1] = i;
-
-		    hp = ap[j];
-		    ap[j] = ap[j+1];
-		    ap[j+1] = hp;
-
-		} else
-		    break;
-	    }
-	    needsort++;
-	}
-}
-#endif
-void
-_sethostdnsent(stayopen)
-	int stayopen;
-{
-	if ((_res.options & RES_INIT) == 0 && res_init() == -1)
-		return;
-	if (stayopen)
-		_res.options |= RES_STAYOPEN | RES_USEVC;
-}
-
-void
-_endhostdnsent()
-{
-	_res.options &= ~(RES_STAYOPEN | RES_USEVC);
-	res_close();
-}
diff --git a/cpukit/libnetworking/libc/gethostbyht.c b/cpukit/libnetworking/libc/gethostbyht.c
deleted file mode 100644
index 29f2805367..0000000000
--- a/cpukit/libnetworking/libc/gethostbyht.c
+++ /dev/null
@@ -1,202 +0,0 @@
-/*-
- * Copyright (c) 1985, 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * -
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- * -
- * --Copyright--
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)gethostnamadr.c	8.1 (Berkeley) 6/4/93";
-static char rcsid[] = "$Id$";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <errno.h>
-#include <string.h>
-#include <arpa/nameser.h>	/* XXX */
-#include <resolv.h>		/* XXX */
-
-#define	MAXALIASES	35
-
-static struct hostent host;
-static char *host_aliases[MAXALIASES];
-static char hostbuf[BUFSIZ+1];
-static FILE *hostf = NULL;
-static u_char host_addr[16];	/* IPv4 or IPv6 */
-static char *h_addr_ptrs[2];
-static int stayopen = 0;
-
-void
-_sethosthtent(f)
-	int f;
-{
-	if (!hostf)
-		hostf = fopen(_PATH_HOSTS, "r" );
-	else
-		rewind(hostf);
-	stayopen = f;
-}
-
-void
-_endhosthtent()
-{
-	if (hostf && !stayopen) {
-		(void) fclose(hostf);
-		hostf = NULL;
-	}
-}
-
-struct hostent *
-gethostent()
-{
-	char *p;
-	register char *cp, **q;
-	int af, len;
-
-	if (!hostf && !(hostf = fopen(_PATH_HOSTS, "r" ))) {
-		h_errno = NETDB_INTERNAL;
-		return (NULL);
-	}
- again:
-	if (!(p = fgets(hostbuf, sizeof hostbuf, hostf))) {
-		h_errno = HOST_NOT_FOUND;
-		return (NULL);
-	}
-	if (*p == '#')
-		goto again;
-	if (!(cp = strpbrk(p, "#\n")))
-		goto again;
-	*cp = '\0';
-	if (!(cp = strpbrk(p, " \t")))
-		goto again;
-	*cp++ = '\0';
-	if (inet_pton(AF_INET6, p, host_addr) > 0) {
-		af = AF_INET6;
-		len = IN6ADDRSZ;
-	} else if (inet_pton(AF_INET, p, host_addr) > 0) {
-		if (_res.options & RES_USE_INET6) {
-			_map_v4v6_address((char*)host_addr, (char*)host_addr);
-			af = AF_INET6;
-			len = IN6ADDRSZ;
-		} else {
-			af = AF_INET;
-			len = INADDRSZ;
-		}
-	} else {
-		goto again;
-	}
-	h_addr_ptrs[0] = (char *)host_addr;
-	h_addr_ptrs[1] = NULL;
-	host.h_addr_list = h_addr_ptrs;
-	host.h_length = len;
-	host.h_addrtype = af;
-	while (*cp == ' ' || *cp == '\t')
-		cp++;
-	host.h_name = cp;
-	q = host.h_aliases = host_aliases;
-	if ((cp = strpbrk(cp, " \t")) != NULL)
-		*cp++ = '\0';
-	while (cp && *cp) {
-		if (*cp == ' ' || *cp == '\t') {
-			cp++;
-			continue;
-		}
-		if (q < &host_aliases[MAXALIASES - 1])
-			*q++ = cp;
-		if ((cp = strpbrk(cp, " \t")) != NULL)
-			*cp++ = '\0';
-	}
-	*q = NULL;
-	h_errno = NETDB_SUCCESS;
-	return (&host);
-}
-
-struct hostent *
-_gethostbyhtname(name, af)
-	const char *name;
-	int af;
-{
-	register struct hostent *p;
-	register char **cp;
-	
-	sethostent(0);
-	while ((p = gethostent()) != NULL) {
-		if (p->h_addrtype != af)
-			continue;
-		if (strcasecmp(p->h_name, name) == 0)
-			break;
-		for (cp = p->h_aliases; *cp != 0; cp++)
-			if (strcasecmp(*cp, name) == 0)
-				goto found;
-	}
-found:
-	endhostent();
-	return (p);
-}
-
-struct hostent *
-_gethostbyhtaddr(addr, len, af)
-	const char *addr;
-	int len, af;
-{
-	register struct hostent *p;
-
-	sethostent(0);
-	while ((p = gethostent()) != NULL)
-		if (p->h_addrtype == af && !bcmp(p->h_addr, addr, len))
-			break;
-	endhostent();
-	return (p);
-}
diff --git a/cpukit/libnetworking/libc/gethostbyname.3 b/cpukit/libnetworking/libc/gethostbyname.3
deleted file mode 100644
index e21dc79f1d..0000000000
--- a/cpukit/libnetworking/libc/gethostbyname.3
+++ /dev/null
@@ -1,305 +0,0 @@
-.\" Copyright (c) 1983, 1987, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"     From: @(#)gethostbyname.3	8.4 (Berkeley) 5/25/95
-.\"     $Id$
-.\"
-.Dd May 25, 1995
-.Dt GETHOSTBYNAME 3
-.Os BSD 4.2
-.Sh NAME
-.Nm gethostbyname ,
-.Nm gethostbyname2 ,
-.Nm gethostbyaddr ,
-.Nm gethostent ,
-.Nm sethostent ,
-.Nm endhostent ,
-.Nm herror ,
-.Nm hstrerror
-.Nd get network host entry
-.Sh SYNOPSIS
-.Fd #include <netdb.h>
-.Vt extern int h_errno;
-.Ft struct hostent *
-.Fn gethostbyname "const char *name"
-.Ft struct hostent *
-.Fn gethostbyname2 "const char *name" "int af"
-.Ft struct hostent *
-.Fn gethostbyaddr "const char *addr" "int len" "int type"
-.Ft struct hostent *
-.Fn gethostent void
-.Ft void
-.Fn sethostent "int stayopen"
-.Ft void
-.Fn endhostent void
-.Ft void
-.Fn herror "const char *string"
-.Ft const char *
-.Fn hstrerror "int err"
-.Sh DESCRIPTION
-The
-.Fn gethostbyname ,
-.Fn gethostbyname2
-and
-.Fn gethostbyaddr
-functions
-each return a pointer to an object with the
-following structure describing an internet host
-referenced by name or by address, respectively.
-This structure contains either the information obtained from the name server,
-.Xr named 8 ,
-or broken-out fields from a line in 
-.Pa /etc/hosts .
-If the local name server is not running these routines do a lookup in
-.Pa /etc/hosts .
-.Bd -literal
-struct	hostent {
-	char	*h_name;	/* official name of host */
-	char	**h_aliases;	/* alias list */
-	int	h_addrtype;	/* host address type */
-	int	h_length;	/* length of address */
-	char	**h_addr_list;	/* list of addresses from name server */
-};
-#define	h_addr  h_addr_list[0]	/* address, for backward compatibility */
-.Ed
-.Pp
-The members of this structure are:
-.Bl -tag -width h_addr_list
-.It Fa h_name
-Official name of the host.
-.It Fa h_aliases
-A NULL-terminated array of alternate names for the host.
-.It Fa h_addrtype
-The type of address being returned; usually
-.Dv AF_INET .
-.It Fa h_length
-The length, in bytes, of the address.
-.It Fa h_addr_list
-A NULL-terminated array of network addresses for the host.
-Host addresses are returned in network byte order.
-.It Fa h_addr
-The first address in
-.Fa h_addr_list ;
-this is for backward compatibility.
-.El
-.Pp
-When using the nameserver,
-.Fn gethostbyname
-and
-.Fn gethostbyname
-will search for the named host in the current domain and its parents
-unless the name ends in a dot.
-If the name contains no dot, and if the environment variable
-.Dq Ev HOSTALIASES
-contains the name of an alias file, the alias file will first be searched
-for an alias matching the input name.
-See
-.Xr hostname 7
-for the domain search procedure and the alias file format.
-.Pp
-The
-.Fn gethostbyname2
-function is an evolution of
-.Fn gethostbyname
-which is intended to allow lookups in address families other than
-.Dv AF_INET ,
-for example
-.Dv AF_INET6 .
-Currently the
-.Fa af
-argument must be specified as
-.Dv AF_INET
-else the function will return
-.Dv NULL
-after having set
-.Va h_errno
-to
-.Dv NETDB_INTERNAL
-.Pp
-The
-.Fn sethostent
-function
-may be used to request the use of a connected
-.Tn TCP
-socket for queries.
-If the
-.Fa stayopen
-flag is non-zero,
-this sets the option to send all queries to the name server using
-.Tn TCP
-and to retain the connection after each call to 
-.Fn gethostbyname ,
-.Fn gethostbyname2
-or
-.Fn gethostbyaddr .
-Otherwise, queries are performed using
-.Tn UDP
-datagrams.
-.Pp
-The
-.Fn endhostent
-function
-closes the
-.Tn TCP
-connection.
-.Pp
-The
-.Fn herror
-function writes a message to the diagnostic output consisting of the
-string parameter
-.Fa s ,
-the constant string ": ", and a message corresponding to the value of
-.Va h_errno .
-.Pp
-The
-.Fn hstrerror
-function returns a string which is the message text corresponding to the
-value of the
-.Fa err
-parameter.
-.Sh FILES
-.Bl -tag -width /etc/resolv.conf -compact
-.It Pa /etc/hosts
-.It Pa /etc/host.conf
-.It Pa /etc/resolv.conf
-.El
-.Sh DIAGNOSTICS
-Error return status from 
-.Fn gethostbyname ,
-.Fn gethostbyname2
-and
-.Fn gethostbyaddr
-is indicated by return of a null pointer.
-The external integer
-.Va h_errno
-may then be checked to see whether this is a temporary failure
-or an invalid or unknown host.
-The routine
-.Fn herror
-can be used to print an error message describing the failure.
-If its argument
-.Fa string
-is
-.Pf non Dv -NULL ,
-it is printed, followed by a colon and a space.
-The error message is printed with a trailing newline.
-.Pp
-The variable
-.Va h_errno
-can have the following values:
-.Bl -tag -width HOST_NOT_FOUND
-.It Dv HOST_NOT_FOUND
-No such host is known.
-.It Dv TRY_AGAIN
-This is usually a temporary error
-and means that the local server did not receive
-a response from an authoritative server.
-A retry at some later time may succeed.
-.It Dv NO_RECOVERY
-Some unexpected server failure was encountered.
-This is a non-recoverable error.
-.It Dv NO_DATA
-The requested name is valid but does not have an IP address; 
-this is not a temporary error.  
-This means that the name is known to the name server but there is no address
-associated with this name.
-Another type of request to the name server using this domain name
-will result in an answer;
-for example, a mail-forwarder may be registered for this domain.
-.El
-.Sh SEE ALSO
-.Xr resolver 3 ,
-.Xr hosts 5 ,
-.Xr hostname 7 ,
-.Xr named 8
-.Sh CAVEAT
-The
-.Fn gethostent
-function
-is defined, and
-.Fn sethostent
-and
-.Fn endhostent
-are redefined,
-when
-.Xr libc 3
-is built to use only the routines to lookup in
-.Pa /etc/hosts
-and not the name server.
-.Pp
-The
-.Fn gethostent
-function
-reads the next line of
-.Pa /etc/hosts ,
-opening the file if necessary.
-.Pp
-The
-.Fn sethostent
-function
-opens and/or rewinds the file
-.Pa /etc/hosts .
-If the
-.Fa stayopen
-argument is non-zero,
-the file will not be closed after each call to
-.Fn gethostbyname ,
-.Fn gethostbyname2
-or
-.Fn gethostbyaddr .
-.Pp
-The
-.Fn endhostent
-function
-closes the file.
-.Sh HISTORY
-The
-.Fn herror
-function appeared in 
-.Bx 4.3 .
-The
-.Fn endhostent ,
-.Fn gethostbyaddr ,
-.Fn gethostbyname ,
-.Fn gethostent ,
-and
-.Fn sethostent
-functions appeared in
-.Bx 4.2 .
-The
-.Fn gethostbyname2
-function first appeared in bind-4.9.4.
-.Sh BUGS
-These functions use static data storage;
-if the data is needed for future use, it should be
-copied before any subsequent calls overwrite it.
-Only the Internet
-address format is currently understood.
diff --git a/cpukit/libnetworking/libc/gethostbynis.c b/cpukit/libnetworking/libc/gethostbynis.c
deleted file mode 100644
index 45dbe5a85d..0000000000
--- a/cpukit/libnetworking/libc/gethostbynis.c
+++ /dev/null
@@ -1,142 +0,0 @@
-/*-
- * Copyright (c) 1994, Garrett Wollman
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)$Id$";
-static char rcsid[] = "$Id$";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <errno.h>
-#include <string.h>
-#ifdef YP
-#include <rpc/rpc.h>
-#include <rpcsvc/yp_prot.h>
-#include <rpcsvc/ypclnt.h>
-#endif
-
-#define	MAXALIASES	35
-#define	MAXADDRS	35
-
-#ifdef YP
-static char *host_aliases[MAXALIASES];
-static char hostaddr[MAXADDRS];
-static char *host_addrs[2];
-#endif /* YP */
-
-static struct hostent *
-_gethostbynis(name, map, af)
-	const char *name;
-	char *map;
-	int af;
-{
-#ifdef YP
-	register char *cp, **q;
-	char *result;
-	int resultlen;
-	static struct hostent h;
-	static char *domain = (char *)NULL;
-	static char ypbuf[YPMAXRECORD + 2];
-
-	switch(af) {
-	case AF_INET:
-		break;
-	default:
-	case AF_INET6:
-		errno = EAFNOSUPPORT;
-		return NULL;
-	}
-
-	if (domain == (char *)NULL)
-		if (yp_get_default_domain (&domain))
-			return ((struct hostent *)NULL);
-
-	if (yp_match(domain, map, name, strlen(name), &result, &resultlen))
-		return ((struct hostent *)NULL);
-
-	/* avoid potential memory leak */
-	bcopy((char *)result, (char *)&ypbuf, resultlen);
-	ypbuf[resultlen] = '\0';
-	free(result);
-	result = (char *)&ypbuf;
-
-	if ((cp = index(result, '\n')))
-		*cp = '\0';
-
-	cp = strpbrk(result, " \t");
-	*cp++ = '\0';
-	h.h_addr_list = host_addrs;
-	h.h_addr = hostaddr;
-	*((u_long *)h.h_addr) = inet_addr(result);
-	h.h_length = sizeof(u_long);
-	h.h_addrtype = AF_INET;
-	while (*cp == ' ' || *cp == '\t')
-		cp++;
-	h.h_name = cp;
-	q = h.h_aliases = host_aliases;
-	cp = strpbrk(cp, " \t");
-	if (cp != NULL)
-		*cp++ = '\0';
-	while (cp && *cp) {
-		if (*cp == ' ' || *cp == '\t') {
-			cp++;
-			continue;
-		}
-		if (q < &host_aliases[MAXALIASES - 1])
-			*q++ = cp;
-		cp = strpbrk(cp, " \t");
-		if (cp != NULL)
-			*cp++ = '\0';
-	}
-	*q = NULL;
-	return (&h);
-#else
-	return (NULL);
-#endif /* YP */
-}
-
-struct hostent *
-_gethostbynisname(name, af)
-	const char *name;
-	int af;
-{
-	return _gethostbynis(name, "hosts.byname", af);
-}
-
-struct hostent *
-_gethostbynisaddr(addr, len, af)
-	const char *addr;
-	int len;
-	int af;
-{
-	return _gethostbynis(inet_ntoa(*(struct in_addr *)addr),"hosts.byaddr", af);
-}
diff --git a/cpukit/libnetworking/libc/gethostnamadr.c b/cpukit/libnetworking/libc/gethostnamadr.c
deleted file mode 100644
index 92f7a21014..0000000000
--- a/cpukit/libnetworking/libc/gethostnamadr.c
+++ /dev/null
@@ -1,224 +0,0 @@
-/*-
- * Copyright (c) 1994, Garrett Wollman
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)$Id$";
-static char rcsid[] = "$Id$";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <errno.h>
-#include <string.h>
-#include <arpa/nameser.h>		/* XXX hack for _res */
-#include <resolv.h>			/* XXX hack for _res */
-
-#define _PATH_HOSTCONF	"/etc/host.conf"
-
-enum service_type {
-  SERVICE_NONE = 0,
-  SERVICE_BIND,
-  SERVICE_HOSTS,
-  SERVICE_NIS };
-#define SERVICE_MAX	SERVICE_NIS
-
-static struct {
-  const char *name;
-  enum service_type type;
-} service_names[] = {
-  { "hosts", SERVICE_HOSTS },
-  { "/etc/hosts", SERVICE_HOSTS },
-  { "hosttable", SERVICE_HOSTS },
-  { "htable", SERVICE_HOSTS },
-  { "bind", SERVICE_BIND },
-  { "dns", SERVICE_BIND },
-  { "domain", SERVICE_BIND },
-  { "yp", SERVICE_NIS },
-  { "yellowpages", SERVICE_NIS },
-  { "nis", SERVICE_NIS },
-  { 0, SERVICE_NONE }
-};
-
-static enum service_type service_order[SERVICE_MAX + 1];
-static int service_done = 0;
-
-static enum service_type
-get_service_name(const char *name) {
-	int i;
-	for(i = 0; service_names[i].type != SERVICE_NONE; i++) {
-		if(!strcasecmp(name, service_names[i].name)) {
-			return service_names[i].type;
-		}
-	}
-	return SERVICE_NONE;
-}
-
-static void
-init_services()
-{
-	char *cp, *p, buf[BUFSIZ];
-	register int cc = 0;
-	FILE *fd;
-
-	if ((fd = (FILE *)fopen(_PATH_HOSTCONF, "r")) == NULL) {
-				/* make some assumptions */
-		service_order[0] = SERVICE_BIND;
-		service_order[1] = SERVICE_HOSTS;
-		service_order[2] = SERVICE_NONE;
-	} else {
-		while (fgets(buf, BUFSIZ, fd) != NULL && cc < SERVICE_MAX) {
-			if(buf[0] == '#')
-				continue;
-
-			p = buf;
-			while ((cp = strsep(&p, "\n \t,:;")) != NULL && *cp == '\0')
-				;
-			if (cp == NULL)
-				continue;
-			do {
-				if (isalpha((int)cp[0])) {
-					service_order[cc] = get_service_name(cp);
-					if(service_order[cc] != SERVICE_NONE)
-						cc++;
-				}
-				while ((cp = strsep(&p, "\n \t,:;")) != NULL && *cp == '\0')
-					;
-			} while(cp != NULL && cc < SERVICE_MAX);
-		}
-		service_order[cc] = SERVICE_NONE;
-		fclose(fd);
-	}
-	service_done = 1;
-}
-
-struct hostent *
-gethostbyname(const char *name)
-{
-	struct hostent *hp;
-
-	if (_res.options & RES_USE_INET6) {		/* XXX */
-		hp = gethostbyname2(name, AF_INET6);	/* XXX */
-		if (hp)					/* XXX */
-			return (hp);			/* XXX */
-	}						/* XXX */
-	return (gethostbyname2(name, AF_INET));
-}
-
-struct hostent *
-gethostbyname2(const char *name, int type)
-{
-	struct hostent *hp = 0;
-	int nserv = 0;
-
-	if (!service_done)
-		init_services();
-
-	while (!hp) {
-		switch (service_order[nserv]) {
-		      case SERVICE_NONE:
-			return NULL;
-		      case SERVICE_HOSTS:
-			hp = _gethostbyhtname(name, type);
-			break;
-		      case SERVICE_BIND:
-			hp = _gethostbydnsname(name, type);
-			break;
-		      case SERVICE_NIS:
-			hp = _gethostbynisname(name, type);
-			break;
-		}
-		nserv++;
-	}
-	return hp;
-}
-
-struct hostent *
-gethostbyaddr(const char *addr, int len, int type)
-{
-	struct hostent *hp = 0;
-	int nserv = 0;
-
-	if (!service_done)
-		init_services();
-
-	while (!hp) {
-		switch (service_order[nserv]) {
-		      case SERVICE_NONE:
-			return 0;
-		      case SERVICE_HOSTS:
-			hp = _gethostbyhtaddr(addr, len, type);
-			break;
-		      case SERVICE_BIND:
-			hp = _gethostbydnsaddr(addr, len, type);
-			break;
-		      case SERVICE_NIS:
-			hp = _gethostbynisaddr(addr, len, type);
-			break;
-		}
-		nserv++;
-	}
-	return hp;
-}
-
-#ifdef _THREAD_SAFE
-struct hostent_data;
-
-/*
- * Temporary function (not thread safe)
- */
-int gethostbyaddr_r(const char *addr, int len, int type,
-	struct hostent *result, struct hostent_data *buffer)
-{
-	struct hostent *hp;
-	int ret;
-	if ((hp = gethostbyaddr(addr, len, type)) == NULL) {
-		ret = -1;
-	} else {
-		memcpy(result, hp, sizeof(struct hostent));
-		ret = 0;
-	}
-	return(ret);
-}
-#endif
-
-void
-sethostent(stayopen)
-	int stayopen;
-{
-	_sethosthtent(stayopen);
-	_sethostdnsent(stayopen);
-}
-
-void
-endhostent()
-{
-	_endhosthtent();
-	_endhostdnsent();
-}
diff --git a/cpukit/libnetworking/libc/gethostname.c b/cpukit/libnetworking/libc/gethostname.c
deleted file mode 100644
index 81dc2267c2..0000000000
--- a/cpukit/libnetworking/libc/gethostname.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- *  $Id$
- */
-
-#include "config.h"
-
-/*
- * Solaris doesn't include the gethostname call by default.
- */
-#include <sys/utsname.h>
-#include <sys/systeminfo.h>
-
-#include <netdb.h>
-
-/*
- * PUBLIC: #ifndef HAVE_GETHOSTNAME
- * PUBLIC: int gethostname __P((char *, int));
- * PUBLIC: #endif
- */
-int
-gethostname(host, len)
-	char *host;
-	int len;
-{
-	return (sysinfo(SI_HOSTNAME, host, len) == -1 ? -1 : 0);
-}
diff --git a/cpukit/libnetworking/libc/getnetbydns.c b/cpukit/libnetworking/libc/getnetbydns.c
deleted file mode 100644
index 8f8c576332..0000000000
--- a/cpukit/libnetworking/libc/getnetbydns.c
+++ /dev/null
@@ -1,313 +0,0 @@
-/*-
- * Copyright (c) 1985, 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * -
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- * -
- * --Copyright--
- */
-/* Portions Copyright (c) 1993 Carlos Leandro and Rui Salgueiro
- *	Dep. Matematica Universidade de Coimbra, Portugal, Europe
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)gethostnamadr.c	8.1 (Berkeley) 6/4/93";
-static char rcsid[] = "$Id$";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-
-#include <stdio.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <ctype.h>
-#include <errno.h>
-#include <string.h>
-#include <unistd.h>
-#include <syslog.h>
-
-#include "res_config.h"
-
-extern int h_errno;
-
-#define BYADDR 0
-#define BYNAME 1
-#define	MAXALIASES	35
-
-#if PACKETSZ > 1024
-#define	MAXPACKET	PACKETSZ
-#else
-#define	MAXPACKET	1024
-#endif
-
-typedef union {
-	HEADER	hdr;
-	u_char	buf[MAXPACKET];
-} querybuf;
-
-typedef union {
-	long	al;
-	char	ac;
-} align;
-
-static struct netent *
-getnetanswer(answer, anslen, net_i)
-	querybuf *answer;
-	int anslen;
-	int net_i;
-{
-
-	register HEADER *hp;
-	register u_char *cp;
-	register int n;
-	u_char *eom;
-	int type, class, buflen, ancount, qdcount, haveanswer, i, nchar;
-	char aux1[MAXHOSTNAMELEN], aux2[MAXHOSTNAMELEN], ans[MAXHOSTNAMELEN];
-	char *in, *st, *pauxt, *bp, **ap;
-	char *paux1 = &aux1[0], *paux2 = &aux2[0], flag = 0;
-static	struct netent net_entry;
-static	char *net_aliases[MAXALIASES], netbuf[PACKETSZ];
-
-	/*
-	 * find first satisfactory answer
-	 *
-	 *      answer --> +------------+  ( MESSAGE )
-	 *		   |   Header   |
-	 *		   +------------+
-	 *		   |  Question  | the question for the name server
-	 *		   +------------+
-	 *		   |   Answer   | RRs answering the question
-	 *		   +------------+
-	 *		   | Authority  | RRs pointing toward an authority
-	 *		   | Additional | RRs holding additional information
-	 *		   +------------+
-	 */
-	eom = answer->buf + anslen;
-	hp = &answer->hdr;
-	ancount = ntohs(hp->ancount); /* #/records in the answer section */
-	qdcount = ntohs(hp->qdcount); /* #/entries in the question section */
-	bp = netbuf;
-	buflen = sizeof(netbuf);
-	cp = answer->buf + HFIXEDSZ;
-	if (!qdcount) {
-		if (hp->aa)
-			h_errno = HOST_NOT_FOUND;
-		else
-			h_errno = TRY_AGAIN;
-		return (NULL);
-	}
-	while (qdcount-- > 0)
-		cp += __dn_skipname(cp, eom) + QFIXEDSZ;
-	ap = net_aliases;
-	*ap = NULL;
-	net_entry.n_aliases = net_aliases;
-	haveanswer = 0;
-	while (--ancount >= 0 && cp < eom) {
-		n = dn_expand(answer->buf, eom, cp, bp, buflen);
-		if ((n < 0) || !res_dnok(bp))
-			break;
-		cp += n;
-		ans[0] = '\0';
-		(void)strncpy(&ans[0], bp, sizeof(ans) - 1);
-		ans[sizeof(ans) - 1] = '\0';
-		GETSHORT(type, cp);
-		GETSHORT(class, cp);
-		cp += INT32SZ;		/* TTL */
-		GETSHORT(n, cp);
-		if (class == C_IN && type == T_PTR) {
-			n = dn_expand(answer->buf, eom, cp, bp, buflen);
-			if ((n < 0) || !res_hnok(bp)) {
-				cp += n;
-				return (NULL);
-			}
-			cp += n; 
-			*ap++ = bp;
-			bp += strlen(bp) + 1;
-			net_entry.n_addrtype =
-				(class == C_IN) ? AF_INET : AF_UNSPEC;
-			haveanswer++;
-		}
-	}
-	if (haveanswer) {
-		*ap = NULL;
-		switch (net_i) {
-		case BYADDR:
-			net_entry.n_name = *net_entry.n_aliases;
-			net_entry.n_net = 0L;
-			break;
-		case BYNAME:
-			in = *net_entry.n_aliases;
-			net_entry.n_name = &ans[0];
-			aux2[0] = '\0';
-			for (i = 0; i < 4; i++) {
-				for (st = in, nchar = 0;
-				     *st != '.';
-				     st++, nchar++)
-					;
-				if (nchar != 1 || *in != '0' || flag) {
-					flag = 1;
-					(void)strncpy(paux1,
-						      (i==0) ? in : in-1,
-						      (i==0) ?nchar : nchar+1);
-					paux1[(i==0) ? nchar : nchar+1] = '\0';
-					pauxt = paux2;
-					paux2 = strcat(paux1, paux2);
-					paux1 = pauxt;
-				}
-				in = ++st;
-			}		  
-			net_entry.n_net = inet_network(paux2);
-			break;
-		}
-		net_entry.n_aliases++;
-		return (&net_entry);
-	}
-	h_errno = TRY_AGAIN;
-	return (NULL);
-}
-
-struct netent *
-_getnetbydnsaddr(net, net_type)
-	register unsigned long net;
-	register int net_type;
-{
-	unsigned int netbr[4];
-	int nn, anslen;
-	querybuf buf;
-	char qbuf[MAXDNAME];
-	unsigned long net2;
-	struct netent *net_entry;
-
-	if (net_type != AF_INET)
-		return (NULL);
-
-	for (nn = 4, net2 = net; net2; net2 >>= 8)
-		netbr[--nn] = net2 & 0xff;
-	switch (nn) {
-	case 3: 	/* Class A */
-		sprintf(qbuf, "0.0.0.%u.in-addr.arpa", netbr[3]);
-		break;
-	case 2: 	/* Class B */
-		sprintf(qbuf, "0.0.%u.%u.in-addr.arpa", netbr[3], netbr[2]);
-		break;
-	case 1: 	/* Class C */
-		sprintf(qbuf, "0.%u.%u.%u.in-addr.arpa", netbr[3], netbr[2],
-		    netbr[1]);
-		break;
-	case 0: 	/* Class D - E */
-		sprintf(qbuf, "%u.%u.%u.%u.in-addr.arpa", netbr[3], netbr[2],
-		    netbr[1], netbr[0]);
-		break;
-	}
-	anslen = res_query(qbuf, C_IN, T_PTR, (u_char *)&buf, sizeof(buf));
-	if (anslen < 0) {
-#ifdef DEBUG
-		if (_res.options & RES_DEBUG)
-			printf("res_query failed\n");
-#endif
-		return (NULL);
-	}
-	net_entry = getnetanswer(&buf, anslen, BYADDR);
-	if (net_entry) {
-		unsigned u_net = net;	/* maybe net should be unsigned ? */
-
-		/* Strip trailing zeros */
-		while ((u_net & 0xff) == 0 && u_net != 0)
-			u_net >>= 8;
-		net_entry->n_net = u_net;
-		return (net_entry);
-	}
-	return (NULL);
-}
-
-struct netent *
-_getnetbydnsname(net)
-	register const char *net;
-{
-	int anslen;
-	querybuf buf;
-	char qbuf[MAXDNAME];
-
-	if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
-		h_errno = NETDB_INTERNAL;
-		return (NULL);
-	}
-	strncpy(qbuf, net, sizeof(qbuf) - 1);
-	qbuf[sizeof(qbuf) - 1] = '\0';
-	anslen = res_search(qbuf, C_IN, T_PTR, (u_char *)&buf, sizeof(buf));
-	if (anslen < 0) {
-#ifdef DEBUG
-		if (_res.options & RES_DEBUG)
-			printf("res_query failed\n");
-#endif
-		return (NULL);
-	}
-	return getnetanswer(&buf, anslen, BYNAME);
-}
-
-void
-_setnetdnsent(stayopen)
-	int stayopen;
-{
-	if (stayopen)
-		_res.options |= RES_STAYOPEN | RES_USEVC;
-}
-
-void
-_endnetdnsent()
-{
-	_res.options &= ~(RES_STAYOPEN | RES_USEVC);
-	res_close();
-}
diff --git a/cpukit/libnetworking/libc/getnetbyht.c b/cpukit/libnetworking/libc/getnetbyht.c
deleted file mode 100644
index f7b7b1091d..0000000000
--- a/cpukit/libnetworking/libc/getnetbyht.c
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/* Portions Copyright (c) 1993 Carlos Leandro and Rui Salgueiro
- *	Dep. Matematica Universidade de Coimbra, Portugal, Europe
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * from getnetent.c	1.1 (Coimbra) 93/06/02
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getnetent.c	8.1 (Berkeley) 6/4/93";
-static char orig_rcsid[] = "From: Id: getnetent.c,v 8.4 1997/06/01 20:34:37 vixie Exp";
-static chat rcsid[] = "$Id$";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <string.h>
-
-#define	MAXALIASES	35
-
-static FILE *netf;
-static char line[BUFSIZ+1];
-static struct netent net;
-static char *net_aliases[MAXALIASES];
-static int _net_stayopen;
-
-void
-_setnethtent(f)
-	int f;
-{
-
-	if (netf == NULL)
-		netf = fopen(_PATH_NETWORKS, "r" );
-	else
-		rewind(netf);
-	_net_stayopen |= f;
-}
-
-void
-_endnethtent()
-{
-
-	if (netf) {
-		fclose(netf);
-		netf = NULL;
-	}
-	_net_stayopen = 0;
-}
-
-struct netent *
-getnetent()
-{
-	char *p;
-	register char *cp, **q;
-
-	if (netf == NULL && (netf = fopen(_PATH_NETWORKS, "r" )) == NULL)
-		return (NULL);
-again:
-	p = fgets(line, sizeof line, netf);
-	if (p == NULL)
-		return (NULL);
-	if (*p == '#')
-		goto again;
-	cp = strpbrk(p, "#\n");
-	if (cp == NULL)
-		goto again;
-	*cp = '\0';
-	net.n_name = p;
-	cp = strpbrk(p, " \t");
-	if (cp == NULL)
-		goto again;
-	*cp++ = '\0';
-	while (*cp == ' ' || *cp == '\t')
-		cp++;
-	p = strpbrk(cp, " \t");
-	if (p != NULL)
-		*p++ = '\0';
-	net.n_net = inet_network(cp);
-	net.n_addrtype = AF_INET;
-	q = net.n_aliases = net_aliases;
-	if (p != NULL) 
-		cp = p;
-	while (cp && *cp) {
-		if (*cp == ' ' || *cp == '\t') {
-			cp++;
-			continue;
-		}
-		if (q < &net_aliases[MAXALIASES - 1])
-			*q++ = cp;
-		cp = strpbrk(cp, " \t");
-		if (cp != NULL)
-			*cp++ = '\0';
-	}
-	*q = NULL;
-	return (&net);
-}
-
-struct netent *
-_getnetbyhtname(name)
-	register const char *name;
-{
-	register struct netent *p;
-	register char **cp;
-
-	setnetent(_net_stayopen);
-	while ( (p = getnetent()) ) {
-		if (strcasecmp(p->n_name, name) == 0)
-			break;
-		for (cp = p->n_aliases; *cp != 0; cp++)
-			if (strcasecmp(*cp, name) == 0)
-				goto found;
-	}
-found:
-	if (!_net_stayopen)
-		endnetent();
-	return (p);
-}
-
-struct netent *
-_getnetbyhtaddr(net, type)
-	register unsigned long net;
-	register int type;
-{
-	register struct netent *p;
-
-	setnetent(_net_stayopen);
-	while ( (p = getnetent()) )
-		if (p->n_addrtype == type && p->n_net == net)
-			break;
-	if (!_net_stayopen)
-		endnetent();
-	return (p);
-}
diff --git a/cpukit/libnetworking/libc/getnetbynis.c b/cpukit/libnetworking/libc/getnetbynis.c
deleted file mode 100644
index 0549016ba2..0000000000
--- a/cpukit/libnetworking/libc/getnetbynis.c
+++ /dev/null
@@ -1,177 +0,0 @@
-/*-
- * Copyright (c) 1994, Garrett Wollman
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)$Id$";
-static char rcsid[] = "$Id$";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <errno.h>
-#include <string.h>
-#include <arpa/nameser.h>
-#ifdef YP
-#include <rpc/rpc.h>
-#include <rpcsvc/yp_prot.h>
-#include <rpcsvc/ypclnt.h>
-#endif
-
-#define	MAXALIASES	35
-#define	MAXADDRS	35
-
-#ifdef YP
-static char *host_aliases[MAXALIASES];
-#endif /* YP */
-
-static struct netent *
-_getnetbynis(name, map, af)
-	const char *name;
-	char *map;
-	int af;
-{
-#ifdef YP
-	register char *cp, **q;
-	static char *result;
-	int resultlen;
-	static struct netent h;
-	static char *domain = (char *)NULL;
-	static char ypbuf[YPMAXRECORD + 2];
-
-	switch(af) {
-	case AF_INET:
-		break;
-	default:
-	case AF_INET6:
-		errno = EAFNOSUPPORT;
-		return NULL;
-	}
-
-	if (domain == (char *)NULL)
-		if (yp_get_default_domain (&domain))
-			return (NULL);
-
-	if (yp_match(domain, map, name, strlen(name), &result, &resultlen))
-		return (NULL);
-
-	bcopy((char *)result, (char *)&ypbuf, resultlen);
-	ypbuf[resultlen] = '\0';
-	free(result);
-	result = (char *)&ypbuf;
-
-	if ((cp = index(result, '\n')))
-		*cp = '\0';
-
-	cp = strpbrk(result, " \t");
-	*cp++ = '\0';
-	h.n_name = result;
-
-	while (*cp == ' ' || *cp == '\t')
-		cp++;
-
-	h.n_net = inet_network(cp);
-	h.n_addrtype = AF_INET;
-
-	q = h.n_aliases = host_aliases;
-	cp = strpbrk(cp, " \t");
-	if (cp != NULL)
-		*cp++ = '\0';
-	while (cp && *cp) {
-		if (*cp == ' ' || *cp == '\t') {
-			cp++;
-			continue;
-		}
-		if (q < &host_aliases[MAXALIASES - 1])
-			*q++ = cp;
-		cp = strpbrk(cp, " \t");
-		if (cp != NULL)
-			*cp++ = '\0';
-	}
-	*q = NULL;
-	return (&h);
-#else
-	return (NULL);
-#endif
-}
-
-struct netent *
-_getnetbynisname(name)
-	const char *name;
-{
-	return _getnetbynis(name, "networks.byname", AF_INET);
-}
-
-struct netent *
-_getnetbynisaddr(addr, af)
-	unsigned long addr;
-	int af;
-{
-	char *str, *cp;
-	unsigned long net2;
-	int nn;
-	unsigned int netbr[4];
-	char buf[MAXDNAME];
-
-	if (af != AF_INET) {
-		errno = EAFNOSUPPORT;
-		return (NULL);
-	}
-
-        for (nn = 4, net2 = addr; net2; net2 >>= 8) {
-                netbr[--nn] = net2 & 0xff;
-	}
-
-	switch (nn) {
-	case 3:		/* Class A */
-		sprintf(buf, "%u", netbr[3]);
-		break;
-        case 2:		/* Class B */
-		sprintf(buf, "%u.%u", netbr[2], netbr[3]);
-		break;
-        case 1:		/* Class C */
-		sprintf(buf, "%u.%u.%u", netbr[1], netbr[2], netbr[3]);
-                break;
-        case 0:		/* Class D - E */
-		sprintf(buf, "%u.%u.%u.%u", netbr[0], netbr[1],
-			netbr[2], netbr[3]);
-		break;
-	}
-
-	str = (char *)&buf;
-	cp = str + (strlen(str) - 2);
-
-	while(!strcmp(cp, ".0")) {
-		*cp = '\0';
-		cp = str + (strlen(str) - 2);
-	}
-
-	return _getnetbynis(str, "networks.byaddr", af);
-}
diff --git a/cpukit/libnetworking/libc/getnetent.3 b/cpukit/libnetworking/libc/getnetent.3
deleted file mode 100644
index aec93b5876..0000000000
--- a/cpukit/libnetworking/libc/getnetent.3
+++ /dev/null
@@ -1,159 +0,0 @@
-.\" Copyright (c) 1983, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"     @(#)getnetent.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
-.\"
-.Dd June 4, 1993
-.Dt GETNETENT 3
-.Os BSD 4.2
-.Sh NAME
-.Nm getnetent ,
-.Nm getnetbyaddr ,
-.Nm getnetbyname ,
-.Nm setnetent ,
-.Nm endnetent
-.Nd get network entry
-.Sh SYNOPSIS
-.Fd #include <netdb.h>
-.Ft struct netent *
-.Fn getnetent void
-.Ft struct netent *
-.Fn getnetbyname "const char *name"
-.Ft struct netent *
-.Fn getnetbyaddr "unsigned long net" "int type"
-.Ft void
-.Fn setnetent "int stayopen"
-.Ft void
-.Fn endnetent void
-.Sh DESCRIPTION
-The
-.Fn getnetent ,
-.Fn getnetbyname ,
-and
-.Fn getnetbyaddr
-functions
-each return a pointer to an object with the
-following structure
-containing the broken-out
-fields of a line in the network data base,
-.Pa /etc/networks .
-.Bd -literal -offset indent
-struct	netent {
-	char		*n_name;	/* official name of net */
-	char		**n_aliases;	/* alias list */
-	int		n_addrtype;	/* net number type */
-	unsigned long	n_net;		/* net number */
-};
-.Ed
-.Pp
-The members of this structure are:
-.Bl -tag -width n_addrtype
-.It Fa n_name
-The official name of the network.
-.It Fa n_aliases
-A zero terminated list of alternate names for the network.
-.It Fa n_addrtype
-The type of the network number returned; currently only AF_INET.
-.It Fa n_net
-The network number.  Network numbers are returned in machine byte
-order.
-.El
-.Pp
-The
-.Fn getnetent
-function
-reads the next line of the file, opening the file if necessary.
-.Pp
-The
-.Fn setnetent
-function
-opens and rewinds the file.  If the
-.Fa stayopen
-flag is non-zero,
-the net data base will not be closed after each call to 
-.Fn getnetbyname
-or
-.Fn getnetbyaddr .
-.Pp
-The
-.Fn endnetent
-function
-closes the file.
-.Pp
-The
-.Fn getnetbyname
-function
-and
-.Fn getnetbyaddr
-sequentially search from the beginning
-of the file until a matching
-net name or
-net address and type is found,
-or until
-.Dv EOF
-is encountered. The
-.Fa type
-must be
-.Dv AF_INET .
-Network numbers are supplied in host order.
-.Sh FILES
-.Bl -tag -width /etc/networks -compact
-.It Pa /etc/networks
-.El
-.Sh DIAGNOSTICS
-Null pointer
-(0) returned on
-.Dv EOF
-or error.
-.Sh SEE ALSO
-.Xr networks 5
-.Pp
-.%T RFC 1101
-.Sh HISTORY
-The
-.Fn getnetent ,
-.Fn getnetbyaddr ,
-.Fn getnetbyname ,
-.Fn setnetent ,
-and
-.Fn endnetent
-functions appeared in 
-.Bx 4.2 .
-.Sh BUGS
-The data space used by
-these functions is static; if future use requires the data, it should be
-copied before any subsequent calls to these functions overwrite it.
-Only Internet network
-numbers are currently understood.
-Expecting network numbers to fit
-in no more than 32 bits is probably
-naive.
diff --git a/cpukit/libnetworking/libc/getnetnamadr.c b/cpukit/libnetworking/libc/getnetnamadr.c
deleted file mode 100644
index 4d6597f98c..0000000000
--- a/cpukit/libnetworking/libc/getnetnamadr.c
+++ /dev/null
@@ -1,190 +0,0 @@
-/*-
- * Copyright (c) 1994, Garrett Wollman
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$Id$";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <errno.h>
-#include <string.h>
-
-#ifndef _PATH_NETCONF
-#define _PATH_NETCONF	"/etc/host.conf"
-#endif
-
-enum service_type {
-  SERVICE_NONE = 0,
-  SERVICE_BIND,
-  SERVICE_TABLE,
-  SERVICE_NIS };
-#define SERVICE_MAX	SERVICE_NIS
-
-static struct {
-  const char *name;
-  enum service_type type;
-} service_names[] = {
-  { "hosts", SERVICE_TABLE },
-  { "/etc/hosts", SERVICE_TABLE },
-  { "hosttable", SERVICE_TABLE },
-  { "htable", SERVICE_TABLE },
-  { "bind", SERVICE_BIND },
-  { "dns", SERVICE_BIND },
-  { "domain", SERVICE_BIND },
-  { "yp", SERVICE_NIS },
-  { "yellowpages", SERVICE_NIS },
-  { "nis", SERVICE_NIS },
-  { 0, SERVICE_NONE }
-};
-
-static enum service_type service_order[SERVICE_MAX + 1];
-static int service_done = 0;
-
-static enum service_type
-get_service_name(const char *name) {
-	int i;
-	for(i = 0; service_names[i].type != SERVICE_NONE; i++) {
-		if(!strcasecmp(name, service_names[i].name)) {
-			return service_names[i].type;
-		}
-	}
-	return SERVICE_NONE;
-}
-
-static void
-init_services()
-{
-	char *cp, *p, buf[BUFSIZ];
-	register int cc = 0;
-	FILE *fd;
-
-	if ((fd = (FILE *)fopen(_PATH_NETCONF, "r")) == NULL) {
-				/* make some assumptions */
-		service_order[0] = SERVICE_TABLE;
-		service_order[1] = SERVICE_NONE;
-	} else {
-		while (fgets(buf, BUFSIZ, fd) != NULL && cc < SERVICE_MAX) {
-			if(buf[0] == '#')
-				continue;
-
-			p = buf;
-			while ((cp = strsep(&p, "\n \t,:;")) != NULL && *cp == '\0')
-				;
-			if (cp == NULL)
-				continue;
-			do {
-				if (isalpha(cp[0])) {
-					service_order[cc] = get_service_name(cp);
-					if(service_order[cc] != SERVICE_NONE)
-						cc++;
-				}
-				while ((cp = strsep(&p, "\n \t,:;")) != NULL && *cp == '\0')
-					;
-			} while(cp != NULL && cc < SERVICE_MAX);
-		}
-		service_order[cc] = SERVICE_NONE;
-		fclose(fd);
-	}
-	service_done = 1;
-}
-
-struct netent *
-getnetbyname(const char *name)
-{
-	struct netent *hp = 0;
-	int nserv = 0;
-
-	if (!service_done)
-		init_services();
-
-	while (!hp) {
-		switch (service_order[nserv]) {
-		      case SERVICE_NONE:
-			return NULL;
-		      case SERVICE_TABLE:
-			hp = _getnetbyhtname(name);
-			break;
-		      case SERVICE_BIND:
-			hp = _getnetbydnsname(name);
-			break;
-		      case SERVICE_NIS:
-			hp = _getnetbynisname(name);
-			break;
-		}
-		nserv++;
-	}
-	return hp;
-}
-
-struct netent *
-getnetbyaddr(addr, af)
-	u_long addr;
-	int af;
-{
-	struct netent *hp = 0;
-	int nserv = 0;
-
-	if (!service_done)
-		init_services();
-
-	while (!hp) {
-		switch (service_order[nserv]) {
-		      case SERVICE_NONE:
-			return 0;
-		      case SERVICE_TABLE:
-			hp = _getnetbyhtaddr(addr, af);
-			break;
-		      case SERVICE_BIND:
-			hp = _getnetbydnsaddr(addr, af);
-			break;
-		      case SERVICE_NIS:
-			hp = _getnetbynisaddr(addr, af);
-			break;
-		}
-		nserv++;
-	}
-	return hp;
-}
-
-void
-setnetent(stayopen)
-	int stayopen;
-{
-	_setnethtent(stayopen);
-	_setnetdnsent(stayopen);
-}
-
-void
-endnetent()
-{
-	_endnethtent();
-	_endnetdnsent();
-}
diff --git a/cpukit/libnetworking/libc/getproto.c b/cpukit/libnetworking/libc/getproto.c
deleted file mode 100644
index c2a653f4b4..0000000000
--- a/cpukit/libnetworking/libc/getproto.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *  $Id$
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getproto.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
-#include <netdb.h>
-
-extern int _proto_stayopen;
-
-struct protoent *
-getprotobynumber(proto)
-	register int proto;
-{
-	register struct protoent *p;
-
-	setprotoent(_proto_stayopen);
-	while ( (p = getprotoent()) )
-		if (p->p_proto == proto)
-			break;
-	if (!_proto_stayopen)
-		endprotoent();
-	return (p);
-}
diff --git a/cpukit/libnetworking/libc/getprotoent.3 b/cpukit/libnetworking/libc/getprotoent.3
deleted file mode 100644
index 784461d7e3..0000000000
--- a/cpukit/libnetworking/libc/getprotoent.3
+++ /dev/null
@@ -1,147 +0,0 @@
-.\" Copyright (c) 1983, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"     @(#)getprotoent.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
-.\"
-.Dd June 4, 1993
-.Dt GETPROTOENT 3
-.Os BSD 4.2
-.Sh NAME
-.Nm getprotoent ,
-.Nm getprotobynumber ,
-.Nm getprotobyname ,
-.Nm setprotoent ,
-.Nm endprotoent
-.Nd get protocol entry
-.Sh SYNOPSIS
-.Fd #include <netdb.h>
-.Ft struct protoent *
-.Fn getprotoent void
-.Ft struct protoent *
-.Fn getprotobyname "const char *name"
-.Ft struct protoent *
-.Fn getprotobynumber "int proto"
-.Ft void
-.Fn setprotoent "int stayopen"
-.Ft void
-.Fn endprotoent void
-.Sh DESCRIPTION
-The
-.Fn getprotoent ,
-.Fn getprotobyname ,
-and
-.Fn getprotobynumber
-functions
-each return a pointer to an object with the
-following structure
-containing the broken-out
-fields of a line in the network protocol data base,
-.Pa /etc/protocols .
-.Bd -literal -offset indent
-.Pp
-struct	protoent {
-	char	*p_name;	/* official name of protocol */
-	char	**p_aliases;	/* alias list */
-	int	p_proto;	/* protocol number */
-};
-.Ed
-.Pp
-The members of this structure are:
-.Bl -tag -width p_aliases
-.It Fa p_name
-The official name of the protocol.
-.It Fa p_aliases
-A zero terminated list of alternate names for the protocol.
-.It Fa p_proto
-The protocol number.
-.El
-.Pp
-The
-.Fn getprotoent
-function
-reads the next line of the file, opening the file if necessary.
-.Pp
-The
-.Fn setprotoent
-function
-opens and rewinds the file.  If the
-.Fa stayopen
-flag is non-zero,
-the net data base will not be closed after each call to 
-.Fn getprotobyname
-or
-.Fn getprotobynumber .
-.Pp
-The
-.Fn endprotoent
-function
-closes the file.
-.Pp
-The
-.Fn getprotobyname
-function
-and
-.Fn getprotobynumber
-sequentially search from the beginning
-of the file until a matching
-protocol name or
-protocol number is found,
-or until
-.Dv EOF
-is encountered.
-.Sh RETURN VALUES
-Null pointer
-(0) returned on
-.Dv EOF
-or error.
-.Sh FILES
-.Bl -tag -width /etc/protocols -compact
-.It Pa /etc/protocols
-.El
-.Sh SEE ALSO
-.Xr protocols 5
-.Sh HISTORY
-The
-.Fn getprotoent ,
-.Fn getprotobynumber ,
-.Fn getprotobyname ,
-.Fn setprotoent ,
-and
-.Fn endprotoent
-functions appeared in 
-.Bx 4.2 .
-.Sh BUGS
-These functions use a static data space;
-if the data is needed for future use, it should be
-copied before any subsequent calls overwrite it.
-Only the Internet
-protocols are currently understood.
diff --git a/cpukit/libnetworking/libc/getprotoent.c b/cpukit/libnetworking/libc/getprotoent.c
deleted file mode 100644
index 0b9cefec68..0000000000
--- a/cpukit/libnetworking/libc/getprotoent.c
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *  $Id$
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getprotoent.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#define	MAXALIASES	35
-
-static FILE *protof = NULL;
-static char line[BUFSIZ+1];
-static struct protoent proto;
-static char *proto_aliases[MAXALIASES];
-int _proto_stayopen;
-
-void
-setprotoent(f)
-	int f;
-{
-	if (protof == NULL)
-		protof = fopen(_PATH_PROTOCOLS, "r" );
-	else
-		rewind(protof);
-	_proto_stayopen |= f;
-}
-
-void
-endprotoent()
-{
-	if (protof) {
-		fclose(protof);
-		protof = NULL;
-	}
-	_proto_stayopen = 0;
-}
-
-struct protoent *
-getprotoent()
-{
-	char *p;
-	register char *cp, **q;
-
-	if (protof == NULL && (protof = fopen(_PATH_PROTOCOLS, "r" )) == NULL)
-		return (NULL);
-again:
-	if ((p = fgets(line, BUFSIZ, protof)) == NULL)
-		return (NULL);
-	if (*p == '#')
-		goto again;
-	cp = strpbrk(p, "#\n");
-	if (cp == NULL)
-		goto again;
-	*cp = '\0';
-	proto.p_name = p;
-	cp = strpbrk(p, " \t");
-	if (cp == NULL)
-		goto again;
-	*cp++ = '\0';
-	while (*cp == ' ' || *cp == '\t')
-		cp++;
-	p = strpbrk(cp, " \t");
-	if (p != NULL)
-		*p++ = '\0';
-	proto.p_proto = atoi(cp);
-	q = proto.p_aliases = proto_aliases;
-	if (p != NULL) {
-		cp = p;
-		while (cp && *cp) {
-			if (*cp == ' ' || *cp == '\t') {
-				cp++;
-				continue;
-			}
-			if (q < &proto_aliases[MAXALIASES - 1])
-				*q++ = cp;
-			cp = strpbrk(cp, " \t");
-			if (cp != NULL)
-				*cp++ = '\0';
-		}
-	}
-	*q = NULL;
-	return (&proto);
-}
diff --git a/cpukit/libnetworking/libc/getprotoname.c b/cpukit/libnetworking/libc/getprotoname.c
deleted file mode 100644
index 46880eb005..0000000000
--- a/cpukit/libnetworking/libc/getprotoname.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *  $Id$
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getprotoname.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
-#include <netdb.h>
-#include <string.h>
-
-extern int _proto_stayopen;
-
-struct protoent *
-getprotobyname(name)
-	register const char *name;
-{
-	register struct protoent *p;
-	register char **cp;
-
-	setprotoent(_proto_stayopen);
-	while ( (p = getprotoent()) ) {
-		if (strcmp(p->p_name, name) == 0)
-			break;
-		for (cp = p->p_aliases; *cp != 0; cp++)
-			if (strcmp(*cp, name) == 0)
-				goto found;
-	}
-found:
-	if (!_proto_stayopen)
-		endprotoent();
-	return (p);
-}
diff --git a/cpukit/libnetworking/libc/getservbyname.c b/cpukit/libnetworking/libc/getservbyname.c
deleted file mode 100644
index 19936907d3..0000000000
--- a/cpukit/libnetworking/libc/getservbyname.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *  $Id$
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getservbyname.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
-#include <netdb.h>
-#include <string.h>
-
-extern int _serv_stayopen;
-
-struct servent *
-getservbyname(name, proto)
-	const char *name, *proto;
-{
-	register struct servent *p;
-	register char **cp;
-
-#ifdef YP
-	extern char *___getservbyname_yp;
-	extern char *___getservbyproto_yp;
-
-	___getservbyname_yp = (char *)name;
-	___getservbyproto_yp = (char *)proto;
-#endif
-
-	setservent(_serv_stayopen);
-	while ( (p = getservent()) ) {
-		if (strcmp(name, p->s_name) == 0)
-			goto gotname;
-		for (cp = p->s_aliases; *cp; cp++)
-			if (strcmp(name, *cp) == 0)
-				goto gotname;
-		continue;
-gotname:
-		if (proto == 0 || strcmp(p->s_proto, proto) == 0)
-			break;
-	}
-	if (!_serv_stayopen)
-		endservent();
-
-#ifdef YP
-	___getservbyname_yp = NULL;
-	___getservbyproto_yp = NULL;
-#endif
-
-	return (p);
-}
diff --git a/cpukit/libnetworking/libc/getservbyport.c b/cpukit/libnetworking/libc/getservbyport.c
deleted file mode 100644
index c8433954e1..0000000000
--- a/cpukit/libnetworking/libc/getservbyport.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *  $Id$
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getservbyport.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
-#include <netdb.h>
-#include <string.h>
-
-extern int _serv_stayopen;
-
-struct servent *
-getservbyport(port, proto)
-	int port;
-	const char *proto;
-{
-	register struct servent *p;
-
-#ifdef YP
-	extern int ___getservbyport_yp;
-	extern char *___getservbyproto_yp;
-
-	___getservbyport_yp = port;
-	___getservbyproto_yp = (char *)proto;
-#endif
-
-	setservent(_serv_stayopen);
-	while ( (p = getservent()) ) {
-		if (p->s_port != port)
-			continue;
-		if (proto == 0 || strcmp(p->s_proto, proto) == 0)
-			break;
-	}
-	if (!_serv_stayopen)
-		endservent();
-
-#ifdef YP
-	___getservbyport_yp = 0;
-	___getservbyproto_yp = NULL;
-#endif
-
-	return (p);
-}
diff --git a/cpukit/libnetworking/libc/getservent.3 b/cpukit/libnetworking/libc/getservent.3
deleted file mode 100644
index 79c18a3beb..0000000000
--- a/cpukit/libnetworking/libc/getservent.3
+++ /dev/null
@@ -1,156 +0,0 @@
-.\" Copyright (c) 1983, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"     From: @(#)getservent.3	8.3 (Berkeley) 1/12/94
-.\"	$Id$
-.\"
-.Dd July 9, 1995
-.Dt GETSERVENT 3
-.Os BSD 4.2
-.Sh NAME
-.Nm getservent ,
-.Nm getservbyport ,
-.Nm getservbyname ,
-.Nm setservent ,
-.Nm endservent
-.Nd get service entry
-.Sh SYNOPSIS
-.Fd #include <netdb.h>
-.Ft struct servent *
-.Fn getservent 
-.Ft struct servent *
-.Fn getservbyname "const char *name" "const char *proto"
-.Ft struct servent *
-.Fn getservbyport "int port" "const char *proto"
-.Ft void
-.Fn setservent "int stayopen"
-.Ft void
-.Fn endservent void
-.Sh DESCRIPTION
-The
-.Fn getservent ,
-.Fn getservbyname ,
-and
-.Fn getservbyport
-functions
-each return a pointer to an object with the
-following structure
-containing the broken-out
-fields of a line in the network services data base,
-.Pa /etc/services .
-.Bd -literal -offset indent
-struct	servent {
-	char	*s_name;	/* official name of service */
-	char	**s_aliases;	/* alias list */
-	int	s_port;		/* port service resides at */
-	char	*s_proto;	/* protocol to use */
-};
-.Ed
-.Pp
-The members of this structure are:
-.Bl -tag -width s_aliases
-.It Fa s_name
-The official name of the service.
-.It Fa s_aliases
-A zero terminated list of alternate names for the service.
-.It Fa s_port
-The port number at which the service resides.
-Port numbers are returned in network byte order.
-.It Fa s_proto
-The name of the protocol to use when contacting the
-service.
-.El
-.Pp
-The
-.Fn getservent
-function
-reads the next line of the file, opening the file if necessary.
-.Pp
-The
-.Fn setservent
-function
-opens and rewinds the file.  If the
-.Fa stayopen
-flag is non-zero,
-the net data base will not be closed after each call to 
-.Fn getservbyname
-or
-.Fn getservbyport .
-.Pp
-The
-.Fn endservent
-function
-closes the file.
-.Pp
-The
-.Fn getservbyname
-and
-.Fn getservbyport
-functions
-sequentially search from the beginning
-of the file until a matching
-protocol name or
-port number is found,
-or until
-.Dv EOF
-is encountered.
-If a protocol name is also supplied (non-
-.Dv NULL ) , 
-searches must also match the protocol.
-.ne 1i
-.Sh FILES
-.Bl -tag -width /etc/services -compact
-.It Pa /etc/services
-.El
-.Sh DIAGNOSTICS
-Null pointer
-(0) returned on
-.Dv EOF
-or error.
-.Sh SEE ALSO
-.Xr getprotoent 3 ,
-.Xr services 5
-.Sh HISTORY
-The
-.Fn getservent ,
-.Fn getservbyport ,
-.Fn getservbyname ,
-.Fn setservent ,
-and
-.Fn endservent
-functions appeared in 
-.Bx 4.2 .
-.Sh BUGS
-These functions use static data storage;
-if the data is needed for future use, it should be
-copied before any subsequent calls overwrite it.
-Expecting port numbers to fit in a 32 bit
-quantity is probably naive.
diff --git a/cpukit/libnetworking/libc/getservent.c b/cpukit/libnetworking/libc/getservent.c
deleted file mode 100644
index 08a05c0975..0000000000
--- a/cpukit/libnetworking/libc/getservent.c
+++ /dev/null
@@ -1,280 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *  $Id$
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getservent.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#ifdef YP
-#include <rpc/rpc.h>
-#include <rpcsvc/yp_prot.h>
-#include <rpcsvc/ypclnt.h>
-static int serv_stepping_yp = 0;
-extern int _yp_check __P(( char ** ));
-#endif
-
-
-#define	MAXALIASES	35
-
-static FILE *servf = NULL;
-static char line[BUFSIZ+1];
-static struct servent serv;
-static char *serv_aliases[MAXALIASES];
-int _serv_stayopen;
-
-#ifdef YP
-char *___getservbyname_yp = NULL;
-char *___getservbyproto_yp = NULL;
-int ___getservbyport_yp = 0;
-static char *yp_domain = NULL;
-
-static int
-_getservbyport_yp(line)
-	char *line;
-{
-	char *result;
-	int resultlen;
-	char buf[YPMAXRECORD + 2];
-	int rv;
-
-	snprintf(buf, sizeof(buf), "%d/%s", ntohs(___getservbyport_yp),
-						___getservbyproto_yp);
-
-	___getservbyport_yp = 0;
-	___getservbyproto_yp = NULL;
-
-	if(!yp_domain) {
-		if(yp_get_default_domain(&yp_domain))
-			return (0);
-	}
-
-	/*
-	 * We have to be a little flexible here. Ideally you're supposed
-	 * to have both a services.byname and a services.byport map, but
-	 * some systems have only services.byname. FreeBSD cheats a little
-	 * by putting the services.byport information in the same map as
-	 * services.byname so that either case will work. We allow for both
-	 * possibilities here: if there is no services.byport map, we try
-	 * services.byname instead.
-	 */
-	if ((rv = yp_match(yp_domain, "services.byport", buf, strlen(buf),
-						&result, &resultlen))) {
-		if (rv == YPERR_MAP) {
-			if (yp_match(yp_domain, "services.byname", buf,
-					strlen(buf), &result, &resultlen))
-			return(0);
-		} else
-			return(0);
-	}
-		
-	/* getservent() expects lines terminated with \n -- make it happy */
-	snprintf(line, BUFSIZ, "%.*s\n", resultlen, result);
-
-	free(result);
-	return(1);
-}
-
-static int
-_getservbyname_yp(line)
-	char *line;
-{
-	char *result;
-	int resultlen;
-	char buf[YPMAXRECORD + 2];
-
-	if(!yp_domain) {
-		if(yp_get_default_domain(&yp_domain))
-			return (0);
-	}
-
-	snprintf(buf, sizeof(buf), "%s/%s", ___getservbyname_yp,
-						___getservbyproto_yp);
-
-	___getservbyname_yp = 0;
-	___getservbyproto_yp = NULL;
-
-	if (yp_match(yp_domain, "services.byname", buf, strlen(buf),
-						&result, &resultlen)) {
-		return(0);
-	}
-		
-	/* getservent() expects lines terminated with \n -- make it happy */
-	snprintf(line, BUFSIZ, "%.*s\n", resultlen, result);
-
-	free(result);
-	return(1);
-}
-
-static int
-_getservent_yp(line)
-	char *line;
-{
-	static char *key = NULL;
-	static int keylen;
-	char *lastkey, *result;
-	int resultlen;
-	int rv;
-
-	if(!yp_domain) {
-		if(yp_get_default_domain(&yp_domain))
-			return (0);
-	}
-
-	if (!serv_stepping_yp) {
-		if (key)
-			free(key);
-		if ((rv = yp_first(yp_domain, "services.byname", &key, &keylen,
-			     &result, &resultlen))) {
-			serv_stepping_yp = 0;
-			return(0);
-		}
-		serv_stepping_yp = 1;
-	} else {
-		lastkey = key;
-		rv = yp_next(yp_domain, "services.byname", key, keylen, &key,
-			     &keylen, &result, &resultlen);
-		free(lastkey);
-		if (rv) {
-			serv_stepping_yp = 0;
-			return (0);
-		}
-	}
-
-	/* getservent() expects lines terminated with \n -- make it happy */
-	snprintf(line, BUFSIZ, "%.*s\n", resultlen, result);
-
-	free(result);
-
-	return(1);
-}
-#endif
-
-void
-setservent(f)
-	int f;
-{
-	if (servf == NULL)
-		servf = fopen(_PATH_SERVICES, "r" );
-	else
-		rewind(servf);
-	_serv_stayopen |= f;
-}
-
-void
-endservent()
-{
-	if (servf) {
-		fclose(servf);
-		servf = NULL;
-	}
-	_serv_stayopen = 0;
-}
-
-struct servent *
-getservent()
-{
-	char *p;
-	register char *cp, **q;
-
-#ifdef YP
-	if (serv_stepping_yp && _getservent_yp(line)) {
-		p = (char *)&line;
-		goto unpack;
-	}
-tryagain:
-#endif
-	if (servf == NULL && (servf = fopen(_PATH_SERVICES, "r" )) == NULL)
-		return (NULL);
-again:
-	if ((p = fgets(line, BUFSIZ, servf)) == NULL)
-		return (NULL);
-#ifdef YP
-	if (*p == '+' && _yp_check(NULL)) {
-		if (___getservbyname_yp != NULL) {
-			if (!_getservbyname_yp(line))
-				goto tryagain;
-		} 
-		else if (___getservbyport_yp != 0) {
-			if (!_getservbyport_yp(line))
-				goto tryagain;
-		}
-		else if (!_getservent_yp(line))
-			goto tryagain;
-	}
-unpack:
-#endif
-	if (*p == '#')
-		goto again;
-	cp = strpbrk(p, "#\n");
-	if (cp == NULL)
-		goto again;
-	*cp = '\0';
-	serv.s_name = p;
-	p = strpbrk(p, " \t");
-	if (p == NULL)
-		goto again;
-	*p++ = '\0';
-	while (*p == ' ' || *p == '\t')
-		p++;
-	cp = strpbrk(p, ",/");
-	if (cp == NULL)
-		goto again;
-	*cp++ = '\0';
-	serv.s_port = htons((u_short)atoi(p));
-	serv.s_proto = cp;
-	q = serv.s_aliases = serv_aliases;
-	cp = strpbrk(cp, " \t");
-	if (cp != NULL)
-		*cp++ = '\0';
-	while (cp && *cp) {
-		if (*cp == ' ' || *cp == '\t') {
-			cp++;
-			continue;
-		}
-		if (q < &serv_aliases[MAXALIASES - 1])
-			*q++ = cp;
-		cp = strpbrk(cp, " \t");
-		if (cp != NULL)
-			*cp++ = '\0';
-	}
-	*q = NULL;
-	return (&serv);
-}
diff --git a/cpukit/libnetworking/libc/herror.c b/cpukit/libnetworking/libc/herror.c
deleted file mode 100644
index ba1dae934d..0000000000
--- a/cpukit/libnetworking/libc/herror.c
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright (c) 1987, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * Portions Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)herror.c	8.1 (Berkeley) 6/4/93";
-static char rcsid[] = "$Id$";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <sys/uio.h>
-#include <netdb.h>
-#include <string.h>
-#include <unistd.h>
-
-const char *h_errlist[] = {
-	"Resolver Error 0 (no error)",
-	"Unknown host",				/* 1 HOST_NOT_FOUND */
-	"Host name lookup failure",		/* 2 TRY_AGAIN */
-	"Unknown server error",			/* 3 NO_RECOVERY */
-	"No address associated with name",	/* 4 NO_ADDRESS */
-};
-int	h_nerr = { sizeof h_errlist / sizeof h_errlist[0] };
-
-int	h_errno;
-
-/*
- * herror --
- *	print the error indicated by the h_errno value.
- */
-void
-herror(s)
-	const char *s;
-{
-#if 0
-	struct iovec iov[4];
-	register struct iovec *v = iov;
-
-	if (s && *s) {
-		v->iov_base = (char *)s;
-		v->iov_len = strlen(s);
-		v++;
-		v->iov_base = ": ";
-		v->iov_len = 2;
-		v++;
-	}
-	v->iov_base = (char *)hstrerror(h_errno);
-	v->iov_len = strlen(v->iov_base);
-	v++;
-	v->iov_base = "\n";
-	v->iov_len = 1;
-	writev(STDERR_FILENO, iov, (v - iov) + 1);
-#else
-	/*
-	 * RTEMS: no writev yet
-	 */
-	if (s && *s) {
-		write (2, s, strlen (s));
-		write (2, ": ", 2);
-	}
-	s = (char *)hstrerror(h_errno);
-	write (2, s, strlen (s));
-	write (2, "\n", 1);
-#endif
-}
-
-const char *
-hstrerror(err)
-	int err;
-{
-	if (err < 0)
-		return ("Resolver internal error");
-	else if (err < h_nerr)
-		return (h_errlist[err]);
-	return ("Unknown resolver error");
-}
diff --git a/cpukit/libnetworking/libc/inet.3 b/cpukit/libnetworking/libc/inet.3
deleted file mode 100644
index 1052f538f2..0000000000
--- a/cpukit/libnetworking/libc/inet.3
+++ /dev/null
@@ -1,210 +0,0 @@
-.\" Copyright (c) 1983, 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"     From: @(#)inet.3	8.1 (Berkeley) 6/4/93
-.\"	$Id$
-.\"
-.Dd June 17, 1996
-.Dt INET 3
-.Os BSD 4.2
-.Sh NAME
-.Nm inet_aton ,
-.Nm inet_addr ,
-.Nm inet_network ,
-.Nm inet_ntoa ,
-.Nm inet_makeaddr ,
-.Nm inet_lnaof ,
-.Nm inet_netof
-.Nd Internet address manipulation routines
-.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/socket.h>
-.Fd #include <netinet/in.h>
-.Fd #include <arpa/inet.h>
-.Ft int 
-.Fn inet_aton "const char *cp" "struct in_addr *pin"
-.Ft unsigned long 
-.Fn inet_addr "const char *cp"
-.Ft unsigned long 
-.Fn inet_network "const char *cp"
-.Ft char *
-.Fn inet_ntoa "struct in_addr in"
-.Ft struct in_addr 
-.Fn inet_makeaddr "unsigned long net" "unsigned long lna"
-.Ft unsigned long 
-.Fn inet_lnaof "struct in_addr in"
-.Ft unsigned long 
-.Fn inet_netof "struct in_addr in"
-.Sh DESCRIPTION
-The routines
-.Fn inet_aton ,
-.Fn inet_addr
-and
-.Fn inet_network
-interpret character strings representing
-numbers expressed in the Internet standard
-.Ql \&.
-notation.
-The
-.Fn inet_aton
-routine interprets the specified character string as an Internet address,
-placing the address into the structure provided.
-It returns 1 if the string was successfully interpreted,
-or 0 if the string is invalid.
-The
-.Fn inet_addr
-and
-.Fn inet_network
-functions return numbers suitable for use
-as Internet addresses and Internet network
-numbers, respectively.
-The routine
-.Fn inet_ntoa
-takes an Internet address and returns an
-.Tn ASCII
-string representing the address in
-.Ql \&.
-notation.  The routine
-.Fn inet_makeaddr
-takes an Internet network number and a local
-network address and constructs an Internet address
-from it.  The routines
-.Fn inet_netof
-and
-.Fn inet_lnaof
-break apart Internet host addresses, returning
-the network number and local network address part,
-respectively.
-.Pp
-All Internet addresses are returned in network
-order (bytes ordered from left to right).
-All network numbers and local address parts are
-returned as machine format integer values.
-.Sh INTERNET ADDRESSES
-Values specified using the
-.Ql \&.
-notation take one
-of the following forms:
-.Bd -literal -offset indent
-a.b.c.d
-a.b.c
-a.b
-a
-.Ed
-.Pp
-When four parts are specified, each is interpreted
-as a byte of data and assigned, from left to right,
-to the four bytes of an Internet address.  Note
-that when an Internet address is viewed as a 32-bit
-integer quantity on the
-.Tn VAX
-the bytes referred to
-above appear as
-.Dq Li d.c.b.a .
-That is,
-.Tn VAX
-bytes are
-ordered from right to left.
-.Pp
-When a three part address is specified, the last
-part is interpreted as a 16-bit quantity and placed
-in the right-most two bytes of the network address.
-This makes the three part address format convenient
-for specifying Class B network addresses as
-.Dq Li 128.net.host .
-.Pp
-When a two part address is supplied, the last part
-is interpreted as a 24-bit quantity and placed in
-the right most three bytes of the network address.
-This makes the two part address format convenient
-for specifying Class A network addresses as
-.Dq Li net.host .
-.Pp
-When only one part is given, the value is stored
-directly in the network address without any byte
-rearrangement.
-.Pp
-All numbers supplied as
-.Dq parts
-in a
-.Ql  \&.
-notation
-may be decimal, octal, or hexadecimal, as specified
-in the C language (i.e., a leading 0x or 0X implies
-hexadecimal; otherwise, a leading 0 implies octal;
-otherwise, the number is interpreted as decimal).
-.Pp
-The
-.Fn inet_aton
-and
-.Fn inet_ntoa
-functions are semi-deprecated in favor of the
-.Xr addr2ascii 3
-family.  However, since those functions are not yet widely implemented,
-portable programs cannot rely on their presence and will continue
-to use the
-.Xr inet 3
-functions for some time.
-.Sh DIAGNOSTICS
-The constant
-.Dv INADDR_NONE
-is returned by
-.Fn inet_addr
-and
-.Fn inet_network
-for malformed requests.
-.Sh SEE ALSO
-.Xr addr2ascii 3 ,
-.Xr gethostbyname 3 ,
-.Xr getnetent 3 ,
-.Xr hosts 5 ,
-.Xr networks 5
-.Sh HISTORY
-These
-functions appeared in 
-.Bx 4.2 .
-.Sh BUGS
-The value
-.Dv INADDR_NONE
-(0xffffffff) is a valid broadcast address, but
-.Fn inet_addr
-cannot return that value without indicating failure.
-The newer
-.Fn inet_aton
-function does not share this problem.
-The problem of host byte ordering versus network byte ordering is
-confusing.
-The string returned by
-.Fn inet_ntoa
-resides in a static memory area.
-.Pp
-Inet_addr should return a
-.Fa struct in_addr .
diff --git a/cpukit/libnetworking/libc/inet_addr.c b/cpukit/libnetworking/libc/inet_addr.c
deleted file mode 100644
index 225ccc1269..0000000000
--- a/cpukit/libnetworking/libc/inet_addr.c
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- * ++Copyright++ 1983, 1990, 1993
- * -
- * Copyright (c) 1983, 1990, 1993
- *    The Regents of the University of California.  All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- * 	This product includes software developed by the University of
- * 	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * -
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- * -
- * --Copyright--
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)inet_addr.c	8.1 (Berkeley) 6/17/93";
-static char rcsid[] = "$Id$";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/param.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <ctype.h>
-
-/*
- * Ascii internet address interpretation routine.
- * The value returned is in network order.
- */
-u_long
-inet_addr(cp)
-	register const char *cp;
-{
-	struct in_addr val;
-
-	if (inet_aton(cp, &val))
-		return (val.s_addr);
-	return (INADDR_NONE);
-}
-
-/* 
- * Check whether "cp" is a valid ascii representation
- * of an Internet address and convert to a binary address.
- * Returns 1 if the address is valid, 0 if not.
- * This replaces inet_addr, the return value from which
- * cannot distinguish between failure and a local broadcast address.
- */
-int
-inet_aton(cp, addr)
-	register const char *cp;
-	struct in_addr *addr;
-{
-	register u_long val;
-	register int base, n;
-	register char c;
-	u_int parts[4];
-	register u_int *pp = parts;
-
-	c = *cp;
-	for (;;) {
-		/*
-		 * Collect number up to ``.''.
-		 * Values are specified as for C:
-		 * 0x=hex, 0=octal, isdigit=decimal.
-		 */
-		if (!isdigit((int)c))
-			return (0);
-		val = 0; base = 10;
-		if (c == '0') {
-			c = *++cp;
-			if (c == 'x' || c == 'X')
-				base = 16, c = *++cp;
-			else
-				base = 8;
-		}
-		for (;;) {
-			if (isascii((int)c) && isdigit((int)c)) {
-				val = (val * base) + (c - '0');
-				c = *++cp;
-			} else if (base == 16 && isascii((int)c) && isxdigit((int)c)) {
-				val = (val << 4) |
-					(c + 10 - (islower((int)c) ? 'a' : 'A'));
-				c = *++cp;
-			} else
-				break;
-		}
-		if (c == '.') {
-			/*
-			 * Internet format:
-			 *	a.b.c.d
-			 *	a.b.c	(with c treated as 16 bits)
-			 *	a.b	(with b treated as 24 bits)
-			 */
-			if (pp >= parts + 3)
-				return (0);
-			*pp++ = val;
-			c = *++cp;
-		} else
-			break;
-	}
-	/*
-	 * Check for trailing characters.
-	 */
-	if (c != '\0' && (!isascii((int)c) || !isspace((int)c)))
-		return (0);
-	/*
-	 * Concoct the address according to
-	 * the number of parts specified.
-	 */
-	n = pp - parts + 1;
-	switch (n) {
-
-	case 0:
-		return (0);		/* initial nondigit */
-
-	case 1:				/* a -- 32 bits */
-		break;
-
-	case 2:				/* a.b -- 8.24 bits */
-		if (val > 0xffffff)
-			return (0);
-		val |= parts[0] << 24;
-		break;
-
-	case 3:				/* a.b.c -- 8.8.16 bits */
-		if (val > 0xffff)
-			return (0);
-		val |= (parts[0] << 24) | (parts[1] << 16);
-		break;
-
-	case 4:				/* a.b.c.d -- 8.8.8.8 bits */
-		if (val > 0xff)
-			return (0);
-		val |= (parts[0] << 24) | (parts[1] << 16) | (parts[2] << 8);
-		break;
-	}
-	if (addr)
-		addr->s_addr = htonl(val);
-	return (1);
-}
diff --git a/cpukit/libnetworking/libc/inet_lnaof.c b/cpukit/libnetworking/libc/inet_lnaof.c
deleted file mode 100644
index 6ec6a9aef1..0000000000
--- a/cpukit/libnetworking/libc/inet_lnaof.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *  $Id$
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)inet_lnaof.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/param.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-/*
- * Return the local network address portion of an
- * internet address; handles class a/b/c network
- * number formats.
- */
-u_long
-inet_lnaof(in)
-	struct in_addr in;
-{
-	register u_long i = ntohl(in.s_addr);
-
-	if (IN_CLASSA(i))
-		return ((i)&IN_CLASSA_HOST);
-	else if (IN_CLASSB(i))
-		return ((i)&IN_CLASSB_HOST);
-	else
-		return ((i)&IN_CLASSC_HOST);
-}
diff --git a/cpukit/libnetworking/libc/inet_makeaddr.c b/cpukit/libnetworking/libc/inet_makeaddr.c
deleted file mode 100644
index ce84170ed9..0000000000
--- a/cpukit/libnetworking/libc/inet_makeaddr.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *  $Id$
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)inet_makeaddr.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/param.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-/*
- * Formulate an Internet address from network + host.  Used in
- * building addresses stored in the ifnet structure.
- */
-struct in_addr
-inet_makeaddr(net, host)
-	u_long net, host;
-{
-	u_long addr;
-
-	if (net < 128)
-		addr = (net << IN_CLASSA_NSHIFT) | (host & IN_CLASSA_HOST);
-	else if (net < 65536)
-		addr = (net << IN_CLASSB_NSHIFT) | (host & IN_CLASSB_HOST);
-	else if (net < 16777216L)
-		addr = (net << IN_CLASSC_NSHIFT) | (host & IN_CLASSC_HOST);
-	else
-		addr = net | host;
-	addr = htonl(addr);
-	return (*(struct in_addr *)&addr);
-}
diff --git a/cpukit/libnetworking/libc/inet_net_ntop.c b/cpukit/libnetworking/libc/inet_net_ntop.c
deleted file mode 100644
index 4c7893d417..0000000000
--- a/cpukit/libnetworking/libc/inet_net_ntop.c
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char orig_rcsid[] = "From Id: inet_net_ntop.c,v 8.2 1996/08/08 06:54:44 vixie Exp";
-static const char rcsid[] = "$Id$";
-#endif
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#ifdef SPRINTF_CHAR
-# define SPRINTF(x) strlen(sprintf/**/x)
-#else
-# define SPRINTF(x) ((size_t)sprintf x)
-#endif
-
-static char *	inet_net_ntop_ipv4 __P((const u_char *src, int bits,
-					char *dst, size_t size));
-
-/*
- * char *
- * inet_net_ntop(af, src, bits, dst, size)
- *	convert network number from network to presentation format.
- *	generates CIDR style result always.
- * return:
- *	pointer to dst, or NULL if an error occurred (check errno).
- * author:
- *	Paul Vixie (ISC), July 1996
- */
-char *
-inet_net_ntop(af, src, bits, dst, size)
-	int af;
-	const void *src;
-	int bits;
-	char *dst;
-	size_t size;
-{
-	switch (af) {
-	case AF_INET:
-		return (inet_net_ntop_ipv4(src, bits, dst, size));
-	default:
-		errno = EAFNOSUPPORT;
-		return (NULL);
-	}
-}
-
-/*
- * static char *
- * inet_net_ntop_ipv4(src, bits, dst, size)
- *	convert IPv4 network number from network to presentation format.
- *	generates CIDR style result always.
- * return:
- *	pointer to dst, or NULL if an error occurred (check errno).
- * note:
- *	network byte order assumed.  this means 192.5.5.240/28 has
- *	0x11110000 in its fourth octet.
- * author:
- *	Paul Vixie (ISC), July 1996
- */
-static char *
-inet_net_ntop_ipv4(src, bits, dst, size)
-	const u_char *src;
-	int bits;
-	char *dst;
-	size_t size;
-{
-	char *odst = dst;
-	char *t;
-	u_int m;
-	int b;
-
-	if (bits < 0 || bits > 32) {
-		errno = EINVAL;
-		return (NULL);
-	}
-	if (bits == 0) {
-		if (size < sizeof "0")
-			goto emsgsize;
-		*dst++ = '0';
-		*dst = '\0';
-	}
-
-	/* Format whole octets. */
-	for (b = bits / 8; b > 0; b--) {
-		if (size < sizeof "255.")
-			goto emsgsize;
-		t = dst;
-		dst += SPRINTF((dst, "%u", *src++));
-		if (b > 1) {
-			*dst++ = '.';
-			*dst = '\0';
-		}
-		size -= (size_t)(dst - t);
-	}
-
-	/* Format partial octet. */
-	b = bits % 8;
-	if (b > 0) {
-		if (size < sizeof ".255")
-			goto emsgsize;
-		t = dst;
-		if (dst != odst)
-			*dst++ = '.';
-		m = ((1 << b) - 1) << (8 - b);
-		dst += SPRINTF((dst, "%u", *src & m));
-		size -= (size_t)(dst - t);
-	}
-
-	/* Format CIDR /width. */
-	if (size < sizeof "/32")
-		goto emsgsize;
-	dst += SPRINTF((dst, "/%u", bits));
-	return (odst);
-
- emsgsize:
-	errno = EMSGSIZE;
-	return (NULL);
-}
diff --git a/cpukit/libnetworking/libc/inet_net_pton.c b/cpukit/libnetworking/libc/inet_net_pton.c
deleted file mode 100644
index 8915c2a5be..0000000000
--- a/cpukit/libnetworking/libc/inet_net_pton.c
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- * Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char orig_rcsid[] = "From Id: inet_net_pton.c,v 1.8 1996/11/21 10:28:12 vixie Exp $";
-static const char rcsid[] = "$Id$";
-#endif
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include <assert.h>
-#include <ctype.h>
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#ifdef SPRINTF_CHAR
-# define SPRINTF(x) strlen(sprintf/**/x)
-#else
-# define SPRINTF(x) ((size_t)sprintf x)
-#endif
-
-static int	inet_net_pton_ipv4 __P((const char *src, u_char *dst,
-					size_t size));
-
-/*
- * static int
- * inet_net_pton(af, src, dst, size)
- *	convert network number from presentation to network format.
- *	accepts hex octets, hex strings, decimal octets, and /CIDR.
- *	"size" is in bytes and describes "dst".
- * return:
- *	number of bits, either imputed classfully or specified with /CIDR,
- *	or -1 if some failure occurred (check errno).  ENOENT means it was
- *	not a valid network specification.
- * author:
- *	Paul Vixie (ISC), June 1996
- */
-int
-inet_net_pton(af, src, dst, size)
-	int af;
-	const char *src;
-	void *dst;
-	size_t size;
-{
-	switch (af) {
-	case AF_INET:
-		return (inet_net_pton_ipv4(src, dst, size));
-	default:
-		errno = EAFNOSUPPORT;
-		return (-1);
-	}
-}
-
-/*
- * static int
- * inet_net_pton_ipv4(src, dst, size)
- *	convert IPv4 network number from presentation to network format.
- *	accepts hex octets, hex strings, decimal octets, and /CIDR.
- *	"size" is in bytes and describes "dst".
- * return:
- *	number of bits, either imputed classfully or specified with /CIDR,
- *	or -1 if some failure occurred (check errno).  ENOENT means it was
- *	not an IPv4 network specification.
- * note:
- *	network byte order assumed.  this means 192.5.5.240/28 has
- *	0x11110000 in its fourth octet.
- * author:
- *	Paul Vixie (ISC), June 1996
- */
-static int
-inet_net_pton_ipv4(src, dst, size)
-	const char *src;
-	u_char *dst;
-	size_t size;
-{
-	static const char
-		xdigits[] = "0123456789abcdef",
-		digits[] = "0123456789";
-	int n, ch, tmp, dirty, bits;
-	const u_char *odst = dst;
-
-	ch = *src++;
-	if (ch == '0' && (src[0] == 'x' || src[0] == 'X')
-	    && isascii(src[1]) && isxdigit(src[1])) {
-		/* Hexadecimal: Eat nybble string. */
-		if (size <= 0)
-			goto emsgsize;
-		*dst = 0, dirty = 0;
-		src++;	/* skip x or X. */
-		while ((ch = *src++) != '\0' &&
-		       isascii(ch) && isxdigit(ch)) {
-			if (isupper(ch))
-				ch = tolower(ch);
-			n = strchr(xdigits, ch) - xdigits;
-			assert(n >= 0 && n <= 15);
-			*dst |= n;
-			if (!dirty++)
-				*dst <<= 4;
-			else if (size-- > 0)
-				*++dst = 0, dirty = 0;
-			else
-				goto emsgsize;
-		}
-		if (dirty)
-			size--;
-	} else if (isascii(ch) && isdigit(ch)) {
-		/* Decimal: eat dotted digit string. */
-		for (;;) {
-			tmp = 0;
-			do {
-				n = strchr(digits, ch) - digits;
-				assert(n >= 0 && n <= 9);
-				tmp *= 10;
-				tmp += n;
-				if (tmp > 255)
-					goto enoent;
-			} while ((ch = *src++) != '\0' &&
-				 isascii(ch) && isdigit(ch));
-			if (size-- <= 0)
-				goto emsgsize;
-			*dst++ = (u_char) tmp;
-			if (ch == '\0' || ch == '/')
-				break;
-			if (ch != '.')
-				goto enoent;
-			ch = *src++;
-			if (!isascii(ch) || !isdigit(ch))
-				goto enoent;
-		}
-	} else
-		goto enoent;
-
-	bits = -1;
-	if (ch == '/' && isascii(src[0]) && isdigit(src[0]) && dst > odst) {
-		/* CIDR width specifier.  Nothing can follow it. */
-		ch = *src++;	/* Skip over the /. */
-		bits = 0;
-		do {
-			n = strchr(digits, ch) - digits;
-			assert(n >= 0 && n <= 9);
-			bits *= 10;
-			bits += n;
-		} while ((ch = *src++) != '\0' && isascii(ch) && isdigit(ch));
-		if (ch != '\0')
-			goto enoent;
-		if (bits > 32)
-			goto emsgsize;
-	}
-
-	/* Firey death and destruction unless we prefetched EOS. */
-	if (ch != '\0')
-		goto enoent;
-
-	/* If nothing was written to the destination, we found no address. */
-	if (dst == odst)
-		goto enoent;
-	/* If no CIDR spec was given, infer width from net class. */
-	if (bits == -1) {
-		if (*odst >= 240)	/* Class E */
-			bits = 32;
-		else if (*odst >= 224)	/* Class D */
-			bits = 4;
-		else if (*odst >= 192)	/* Class C */
-			bits = 24;
-		else if (*odst >= 128)	/* Class B */
-			bits = 16;
-		else			/* Class A */
-			bits = 8;
-		/* If imputed mask is narrower than specified octets, widen. */
-		if (bits >= 8 && bits < ((dst - odst) * 8))
-			bits = (dst - odst) * 8;
-	}
-	/* Extend network to cover the actual mask. */
-	while (bits > ((dst - odst) * 8)) {
-		if (size-- <= 0)
-			goto emsgsize;
-		*dst++ = '\0';
-	}
-	return (bits);
-
- enoent:
-	errno = ENOENT;
-	return (-1);
-
- emsgsize:
-	errno = EMSGSIZE;
-	return (-1);
-}
diff --git a/cpukit/libnetworking/libc/inet_neta.c b/cpukit/libnetworking/libc/inet_neta.c
deleted file mode 100644
index 59b156f7f6..0000000000
--- a/cpukit/libnetworking/libc/inet_neta.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char orig_rcsid[] = "From Id: inet_neta.c,v 8.2 1996/08/08 06:54:44 vixie Exp";
-static const char rcsid[] = "$Id$";
-#endif
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-
-#ifdef SPRINTF_CHAR
-# define SPRINTF(x) strlen(sprintf/**/x)
-#else
-# define SPRINTF(x) ((size_t)sprintf x)
-#endif
-
-/*
- * char *
- * inet_neta(src, dst, size)
- *	format a u_long network number into presentation format.
- * return:
- *	pointer to dst, or NULL if an error occurred (check errno).
- * note:
- *	format of ``src'' is as for inet_network().
- * author:
- *	Paul Vixie (ISC), July 1996
- */
-char *
-inet_neta(src, dst, size)
-	u_long src;
-	char *dst;
-	size_t size;
-{
-	char *odst = dst;
-	char *tp;
-
-	while (src & 0xffffffff) {
-		u_char b = (src & 0xff000000) >> 24;
-
-		src <<= 8;
-		if (b) {
-			if (size < sizeof "255.")
-				goto emsgsize;
-			tp = dst;
-			dst += SPRINTF((dst, "%u", b));
-			if (src != 0L) {
-				*dst++ = '.';
-				*dst = '\0';
-			}
-			size -= (size_t)(dst - tp);
-		}
-	}
-	if (dst == odst) {
-		if (size < sizeof "0.0.0.0")
-			goto emsgsize;
-		strcpy(dst, "0.0.0.0");
-	}
-	return (odst);
-
- emsgsize:
-	errno = EMSGSIZE;
-	return (NULL);
-}
diff --git a/cpukit/libnetworking/libc/inet_netof.c b/cpukit/libnetworking/libc/inet_netof.c
deleted file mode 100644
index 179731efc3..0000000000
--- a/cpukit/libnetworking/libc/inet_netof.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *  $Id$
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)inet_netof.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/param.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-/*
- * Return the network number from an internet
- * address; handles class a/b/c network #'s.
- */
-u_long
-inet_netof(in)
-	struct in_addr in;
-{
-	register u_long i = ntohl(in.s_addr);
-
-	if (IN_CLASSA(i))
-		return (((i)&IN_CLASSA_NET) >> IN_CLASSA_NSHIFT);
-	else if (IN_CLASSB(i))
-		return (((i)&IN_CLASSB_NET) >> IN_CLASSB_NSHIFT);
-	else
-		return (((i)&IN_CLASSC_NET) >> IN_CLASSC_NSHIFT);
-}
diff --git a/cpukit/libnetworking/libc/inet_network.c b/cpukit/libnetworking/libc/inet_network.c
deleted file mode 100644
index ac0073bf0a..0000000000
--- a/cpukit/libnetworking/libc/inet_network.c
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *  $Id$
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)inet_network.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <ctype.h>
-
-/*
- * Internet network address interpretation routine.
- * The library routines call this routine to interpret
- * network numbers.
- */
-u_long
-inet_network(cp)
-	register const char *cp;
-{
-	register u_long val, base, n, i;
-	register char c;
-	u_long parts[4], *pp = parts;
-
-again:
-	val = 0; base = 10;
-	if (*cp == '0')
-		base = 8, cp++;
-	if (*cp == 'x' || *cp == 'X')
-		base = 16, cp++;
-	while ((c = *cp) != 0) {
-		if (isdigit(c)) {
-			val = (val * base) + (c - '0');
-			cp++;
-			continue;
-		}
-		if (base == 16 && isxdigit(c)) {
-			val = (val << 4) + (c + 10 - (islower(c) ? 'a' : 'A'));
-			cp++;
-			continue;
-		}
-		break;
-	}
-	if (*cp == '.') {
-		if (pp >= parts + 3)
-			return (INADDR_NONE);
-		*pp++ = val, cp++;
-		goto again;
-	}
-	if (*cp && !isspace(*cp))
-		return (INADDR_NONE);
-	*pp++ = val;
-	n = pp - parts;
-	for (val = 0, i = 0; i < n; i++) {
-		val <<= 8;
-		val |= parts[i] & 0xff;
-	}
-	return (val);
-}
diff --git a/cpukit/libnetworking/libc/inet_ntoa.c b/cpukit/libnetworking/libc/inet_ntoa.c
deleted file mode 100644
index 44b686f0b3..0000000000
--- a/cpukit/libnetworking/libc/inet_ntoa.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *  $Id$
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)inet_ntoa.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <stdio.h>
-
-/*
- * Convert network-format internet address
- * to base 256 d.d.d.d representation.
- */
-char *
-inet_ntoa(in)
-	struct in_addr in;
-{
-	static char ret[18];
-
-	strcpy(ret, "[inet_ntoa error]");
-	(void) inet_ntop(AF_INET, &in, ret, sizeof ret);
-	return (ret);
-}
diff --git a/cpukit/libnetworking/libc/inet_ntop.c b/cpukit/libnetworking/libc/inet_ntop.c
deleted file mode 100644
index 76a538755a..0000000000
--- a/cpukit/libnetworking/libc/inet_ntop.c
+++ /dev/null
@@ -1,191 +0,0 @@
-/* Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$Id$";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-
-#define SPRINTF(x) ((size_t)sprintf x)
-
-/*
- * WARNING: Don't even consider trying to compile this on a system where
- * sizeof(int) < 4.  sizeof(int) > 4 is fine; all the world's not a VAX.
- */
-
-static const char *inet_ntop4 __P((const u_char *src, char *dst, size_t size));
-static const char *inet_ntop6 __P((const u_char *src, char *dst, size_t size));
-
-/* char *
- * inet_ntop(af, src, dst, size)
- *	convert a network format address to presentation format.
- * return:
- *	pointer to presentation format address (`dst'), or NULL (see errno).
- * author:
- *	Paul Vixie, 1996.
- */
-const char *
-inet_ntop(af, src, dst, size)
-	int af;
-	const void *src;
-	char *dst;
-	size_t size;
-{
-	switch (af) {
-	case AF_INET:
-		return (inet_ntop4(src, dst, size));
-	case AF_INET6:
-		return (inet_ntop6(src, dst, size));
-	default:
-		errno = EAFNOSUPPORT;
-		return (NULL);
-	}
-	/* NOTREACHED */
-}
-
-/* const char *
- * inet_ntop4(src, dst, size)
- *	format an IPv4 address, more or less like inet_ntoa()
- * return:
- *	`dst' (as a const)
- * notes:
- *	(1) uses no statics
- *	(2) takes a u_char* not an in_addr as input
- * author:
- *	Paul Vixie, 1996.
- */
-static const char *
-inet_ntop4(src, dst, size)
-	const u_char *src;
-	char *dst;
-	size_t size;
-{
-	static const char fmt[] = "%u.%u.%u.%u";
-	char tmp[sizeof "255.255.255.255"];
-
-	if (SPRINTF((tmp, fmt, src[0], src[1], src[2], src[3])) > size) {
-		errno = ENOSPC;
-		return (NULL);
-	}
-	strcpy(dst, tmp);
-	return (dst);
-}
-
-/* const char *
- * inet_ntop6(src, dst, size)
- *	convert IPv6 binary address into presentation (printable) format
- * author:
- *	Paul Vixie, 1996.
- */
-static const char *
-inet_ntop6(src, dst, size)
-	const u_char *src;
-	char *dst;
-	size_t size;
-{
-	/*
-	 * Note that int32_t and int16_t need only be "at least" large enough
-	 * to contain a value of the specified size.  On some systems, like
-	 * Crays, there is no such thing as an integer variable with 16 bits.
-	 * Keep this in mind if you think this function should have been coded
-	 * to use pointer overlays.  All the world's not a VAX.
-	 */
-	char tmp[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255"], *tp;
-	struct { int base, len; } best, cur;
-	u_int words[NS_IN6ADDRSZ / NS_INT16SZ];
-	int i;
-
-	/*
-	 * Preprocess:
-	 *	Copy the input (bytewise) array into a wordwise array.
-	 *	Find the longest run of 0x00's in src[] for :: shorthanding.
-	 */
-	memset(words, '\0', sizeof words);
-	for (i = 0; i < NS_IN6ADDRSZ; i++)
-		words[i / 2] |= (src[i] << ((1 - (i % 2)) << 3));
-	best.base = -1;
-	cur.base = -1;
-	for (i = 0; i < (NS_IN6ADDRSZ / NS_INT16SZ); i++) {
-		if (words[i] == 0) {
-			if (cur.base == -1)
-				cur.base = i, cur.len = 1;
-			else
-				cur.len++;
-		} else {
-			if (cur.base != -1) {
-				if (best.base == -1 || cur.len > best.len)
-					best = cur;
-				cur.base = -1;
-			}
-		}
-	}
-	if (cur.base != -1) {
-		if (best.base == -1 || cur.len > best.len)
-			best = cur;
-	}
-	if (best.base != -1 && best.len < 2)
-		best.base = -1;
-
-	/*
-	 * Format the result.
-	 */
-	tp = tmp;
-	for (i = 0; i < (NS_IN6ADDRSZ / NS_INT16SZ); i++) {
-		/* Are we inside the best run of 0x00's? */
-		if (best.base != -1 && i >= best.base &&
-		    i < (best.base + best.len)) {
-			if (i == best.base)
-				*tp++ = ':';
-			continue;
-		}
-		/* Are we following an initial run of 0x00s or any real hex? */
-		if (i != 0)
-			*tp++ = ':';
-		/* Is this address an encapsulated IPv4? */
-		if (i == 6 && best.base == 0 &&
-		    (best.len == 6 || (best.len == 5 && words[5] == 0xffff))) {
-			if (!inet_ntop4(src+12, tp, sizeof tmp - (tp - tmp)))
-				return (NULL);
-			tp += strlen(tp);
-			break;
-		}
-		tp += SPRINTF((tp, "%x", words[i]));
-	}
-	/* Was it a trailing run of 0x00's? */
-	if (best.base != -1 && (best.base + best.len) ==
-	    (NS_IN6ADDRSZ / NS_INT16SZ))
-		*tp++ = ':';
-	*tp++ = '\0';
-
-	/*
-	 * Check for overflow, copy, and we're done.
-	 */
-	if ((size_t)(tp - tmp) > size) {
-		errno = ENOSPC;
-		return (NULL);
-	}
-	strcpy(dst, tmp);
-	return (dst);
-}
diff --git a/cpukit/libnetworking/libc/inet_pton.c b/cpukit/libnetworking/libc/inet_pton.c
deleted file mode 100644
index 8d21111cfa..0000000000
--- a/cpukit/libnetworking/libc/inet_pton.c
+++ /dev/null
@@ -1,214 +0,0 @@
-/* Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$Id$";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-#include <string.h>
-#include <errno.h>
-
-/*
- * WARNING: Don't even consider trying to compile this on a system where
- * sizeof(int) < 4.  sizeof(int) > 4 is fine; all the world's not a VAX.
- */
-
-static int	inet_pton4 __P((const char *src, u_char *dst));
-static int	inet_pton6 __P((const char *src, u_char *dst));
-
-/* int
- * inet_pton(af, src, dst)
- *	convert from presentation format (which usually means ASCII printable)
- *	to network format (which is usually some kind of binary format).
- * return:
- *	1 if the address was valid for the specified address family
- *	0 if the address wasn't valid (`dst' is untouched in this case)
- *	-1 if some other error occurred (`dst' is untouched in this case, too)
- * author:
- *	Paul Vixie, 1996.
- */
-int
-inet_pton(af, src, dst)
-	int af;
-	const char *src;
-	void *dst;
-{
-	switch (af) {
-	case AF_INET:
-		return (inet_pton4(src, dst));
-	case AF_INET6:
-		return (inet_pton6(src, dst));
-	default:
-		errno = EAFNOSUPPORT;
-		return (-1);
-	}
-	/* NOTREACHED */
-}
-
-/* int
- * inet_pton4(src, dst)
- *	like inet_aton() but without all the hexadecimal and shorthand.
- * return:
- *	1 if `src' is a valid dotted quad, else 0.
- * notice:
- *	does not touch `dst' unless it's returning 1.
- * author:
- *	Paul Vixie, 1996.
- */
-static int
-inet_pton4(src, dst)
-	const char *src;
-	u_char *dst;
-{
-	static const char digits[] = "0123456789";
-	int saw_digit, octets, ch;
-	u_char tmp[NS_INADDRSZ], *tp;
-
-	saw_digit = 0;
-	octets = 0;
-	*(tp = tmp) = 0;
-	while ((ch = *src++) != '\0') {
-		const char *pch;
-
-		if ((pch = strchr(digits, ch)) != NULL) {
-			u_int new = *tp * 10 + (pch - digits);
-
-			if (new > 255)
-				return (0);
-			*tp = new;
-			if (! saw_digit) {
-				if (++octets > 4)
-					return (0);
-				saw_digit = 1;
-			}
-		} else if (ch == '.' && saw_digit) {
-			if (octets == 4)
-				return (0);
-			*++tp = 0;
-			saw_digit = 0;
-		} else
-			return (0);
-	}
-	if (octets < 4)
-		return (0);
-
-	memcpy(dst, tmp, NS_INADDRSZ);
-	return (1);
-}
-
-/* int
- * inet_pton6(src, dst)
- *	convert presentation level address to network order binary form.
- * return:
- *	1 if `src' is a valid [RFC1884 2.2] address, else 0.
- * notice:
- *	(1) does not touch `dst' unless it's returning 1.
- *	(2) :: in a full address is silently ignored.
- * credit:
- *	inspired by Mark Andrews.
- * author:
- *	Paul Vixie, 1996.
- */
-static int
-inet_pton6(src, dst)
-	const char *src;
-	u_char *dst;
-{
-	static const char xdigits_l[] = "0123456789abcdef",
-			  xdigits_u[] = "0123456789ABCDEF";
-	u_char tmp[NS_IN6ADDRSZ], *tp, *endp, *colonp;
-	const char *xdigits, *curtok;
-	int ch, saw_xdigit;
-	u_int val;
-
-	memset((tp = tmp), '\0', NS_IN6ADDRSZ);
-	endp = tp + NS_IN6ADDRSZ;
-	colonp = NULL;
-	/* Leading :: requires some special handling. */
-	if (*src == ':')
-		if (*++src != ':')
-			return (0);
-	curtok = src;
-	saw_xdigit = 0;
-	val = 0;
-	while ((ch = *src++) != '\0') {
-		const char *pch;
-
-		if ((pch = strchr((xdigits = xdigits_l), ch)) == NULL)
-			pch = strchr((xdigits = xdigits_u), ch);
-		if (pch != NULL) {
-			val <<= 4;
-			val |= (pch - xdigits);
-			if (val > 0xffff)
-				return (0);
-			saw_xdigit = 1;
-			continue;
-		}
-		if (ch == ':') {
-			curtok = src;
-			if (!saw_xdigit) {
-				if (colonp)
-					return (0);
-				colonp = tp;
-				continue;
-			}
-			if (tp + NS_INT16SZ > endp)
-				return (0);
-			*tp++ = (u_char) (val >> 8) & 0xff;
-			*tp++ = (u_char) val & 0xff;
-			saw_xdigit = 0;
-			val = 0;
-			continue;
-		}
-		if (ch == '.' && ((tp + NS_INADDRSZ) <= endp) &&
-		    inet_pton4(curtok, tp) > 0) {
-			tp += NS_INADDRSZ;
-			saw_xdigit = 0;
-			break;	/* '\0' was seen by inet_pton4(). */
-		}
-		return (0);
-	}
-	if (saw_xdigit) {
-		if (tp + NS_INT16SZ > endp)
-			return (0);
-		*tp++ = (u_char) (val >> 8) & 0xff;
-		*tp++ = (u_char) val & 0xff;
-	}
-	if (colonp != NULL) {
-		/*
-		 * Since some memmove()'s erroneously fail to handle
-		 * overlapping regions, we'll do the shift by hand.
-		 */
-		const int n = tp - colonp;
-		int i;
-
-		for (i = 1; i <= n; i++) {
-			endp[- i] = colonp[n - i];
-			colonp[n - i] = 0;
-		}
-		tp = endp;
-	}
-	if (tp != endp)
-		return (0);
-	memcpy(dst, tmp, NS_IN6ADDRSZ);
-	return (1);
-}
diff --git a/cpukit/libnetworking/libc/iso_addr.3 b/cpukit/libnetworking/libc/iso_addr.3
deleted file mode 100644
index 0c9973bef4..0000000000
--- a/cpukit/libnetworking/libc/iso_addr.3
+++ /dev/null
@@ -1,111 +0,0 @@
-.\" Copyright (c) 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"     @(#)iso_addr.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
-.\"
-.Dd June 4, 1993
-.Dt ISO_ADDR 3
-.Os
-.Sh NAME
-.Nm iso_addr ,
-.Nm iso_ntoa
-.Nd "elementary network address conversion routines for Open System Interconnection
-.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <netiso/iso.h>
-.Ft struct iso_addr *
-.Fn iso_addr "char *cp"
-.Ft char *
-.Fn iso_ntoa "struct iso_addr *isoa"
-.Sh DESCRIPTION
-The routine
-.Fn iso_addr
-interprets character strings representing
-.Tn OSI
-addresses, returning binary information suitable
-for use in system calls.
-The routine
-.Fn iso_ntoa
-takes
-.Tn OSI
-addresses and returns
-.Tn ASCII
-strings representing NSAPs (network service
-access points) in a
-notation inverse to that accepted by 
-.Fn iso_addr .
-.Pp
-Unfortunately, no universal standard exists for representing
-.Tn OSI
-network addresses.
-.Pp
-The format employed by
-.Fn iso_addr
-is a sequence of hexadecimal
-.Dq digits
-(optionally separated by periods),
-of the form:
-.Bd -filled -offset indent
-<hex digits>.<hex digits>.<hex digits>
-.Ed
-.Pp
-Each pair of hexadecimal digits represents a byte
-with the leading digit indicating the higher-ordered bits.
-A period following an even number of bytes has no
-effect (but may be used to increase legibility).
-A period following an odd number of bytes has the
-effect of causing the byte of address being translated
-to have its higher order bits filled with zeros.
-.Sh RETURN VALUES
-.Fn iso_ntoa
-always returns a null terminated string.
-.Fn iso_addr
-always returns a pointer to a struct iso_addr.
-(See
-.Sx BUGS . )
-.Sh SEE ALSO
-.Xr iso 4
-.Sh HISTORY
-The
-.Fn iso_addr
-and
-.Fn iso_ntoa
-functions appeared in 
-.Bx 4.3 Reno .
-.Sh BUGS
-The returned values
-reside in a static memory area.
-.Pp
-The function
-.Fn iso_addr
-should diagnose improperly formed input, and there should be an unambiguous
-way to recognize this.
diff --git a/cpukit/libnetworking/libc/iso_addr.c b/cpukit/libnetworking/libc/iso_addr.c
deleted file mode 100644
index eb14e8a72b..0000000000
--- a/cpukit/libnetworking/libc/iso_addr.c
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *  $Id$
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)iso_addr.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <netiso/iso.h>
-#include <string.h>
-
-/* States*/
-#define VIRGIN	0
-#define GOTONE	1
-#define GOTTWO	2
-/* Inputs */
-#define	DIGIT	(4*0)
-#define	END	(4*1)
-#define DELIM	(4*2)
-
-struct iso_addr *
-iso_addr(addr)
-	register const char *addr;
-{
-	static struct iso_addr out_addr;
-	register char *cp = out_addr.isoa_genaddr;
-	char *cplim = cp + sizeof(out_addr.isoa_genaddr);
-	register int byte = 0, state = VIRGIN, new;
-
-	bzero((char *)&out_addr, sizeof(out_addr));
-	do {
-		if ((*addr >= '0') && (*addr <= '9')) {
-			new = *addr - '0';
-		} else if ((*addr >= 'a') && (*addr <= 'f')) {
-			new = *addr - 'a' + 10;
-		} else if ((*addr >= 'A') && (*addr <= 'F')) {
-			new = *addr - 'A' + 10;
-		} else if (*addr == 0)
-			state |= END;
-		else
-			state |= DELIM;
-		addr++;
-		switch (state /* | INPUT */) {
-		case GOTTWO | DIGIT:
-			*cp++ = byte; /*FALLTHROUGH*/
-		case VIRGIN | DIGIT:
-			state = GOTONE; byte = new; continue;
-		case GOTONE | DIGIT:
-			state = GOTTWO; byte = new + (byte << 4); continue;
-		default: /* | DELIM */
-			state = VIRGIN; *cp++ = byte; byte = 0; continue;
-		case GOTONE | END:
-		case GOTTWO | END:
-			*cp++ = byte; /* FALLTHROUGH */
-		case VIRGIN | END:
-			break;
-		}
-		break;
-	} while (cp < cplim);
-	out_addr.isoa_len = cp - out_addr.isoa_genaddr;
-	return (&out_addr);
-}
-
-static char hexlist[] = "0123456789abcdef";
-
-char *
-iso_ntoa(isoa)
-	const struct iso_addr *isoa;
-{
-	static char tmpbuf[sizeof(isoa->isoa_genaddr)*3];
-	const u_char *binary;
-	char *cp;
-	int i;
-
-	binary = isoa->isoa_genaddr;
-	cp = tmpbuf;
-
-	for (i = 0; i < isoa->isoa_len; i++) {
-		*cp++ = hexlist[*binary >> 4];
-		*cp++ = hexlist[*binary++ & 0xf];
-
-		if ((((i % 2) == 0) && ((i + 1) < isoa->isoa_len)))
-			*cp++ = '.';
-	}
-	*cp = '\0';
-	return tmpbuf;
-}
diff --git a/cpukit/libnetworking/libc/linkaddr.3 b/cpukit/libnetworking/libc/linkaddr.3
deleted file mode 100644
index 6999add0e8..0000000000
--- a/cpukit/libnetworking/libc/linkaddr.3
+++ /dev/null
@@ -1,138 +0,0 @@
-.\" Copyright (c) 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Donn Seeley at BSDI.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"     From: @(#)linkaddr.3	8.1 (Berkeley) 7/28/93
-.\"	$Id$
-.\"
-.Dd June 17, 1996
-.Dt LINK_ADDR 3
-.Os BSD 4.4
-.Sh NAME
-.Nm link_addr ,
-.Nm link_ntoa
-.Nd elementary address specification routines for link level access
-.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/socket.h>
-.Fd #include <net/if_dl.h>
-.Ft void
-.Fn link_addr "const char *addr" "struct sockaddr_dl *sdl"
-.Ft char *
-.Fn link_ntoa "const struct sockaddr_dl *sdl"
-.Sh DESCRIPTION
-The routine
-.Fn link_addr
-interprets character strings representing
-link-level addresses, returning binary information suitable
-for use in system calls.
-The routine
-.Fn link_ntoa
-takes
-a link-level
-address and returns an
-.Tn ASCII
-string representing some of the information present,
-including the link level address itself, and the interface name
-or number, if present.
-This facility is experimental and is
-still subject to change.
-.Pp
-For
-.Fn link_addr ,
-the string
-.Fa addr
-may contain
-an optional network interface identifier of the form
-.Dq "name unit-number" ,
-suitable for the first argument to
-.Xr ifconfig 8 ,
-followed in all cases by a colon and
-an interface address in the form of
-groups of hexadecimal digits
-separated by periods.
-Each group represents a byte of address;
-address bytes are filled left to right from
-low order bytes through high order bytes.
-.Pp
-.\" A regular expression may make this format clearer:
-.\" .Bd -literal -offset indent
-.\" ([a-z]+[0-9]+:)?[0-9a-f]+(\e.[0-9a-f]+)*
-.\" .Ed
-.\" .Pp
-Thus
-.Li le0:8.0.9.13.d.30
-represents an ethernet address
-to be transmitted on the first Lance ethernet interface.
-.Pp
-The direct use of these functions is deprecated in favor of the
-.Xr addr2ascii 3
-interface; however, portable programs cannot rely on the latter as it is
-not yet widely implemented.
-.Sh RETURN VALUES
-.Fn link_ntoa
-always returns a null terminated string.
-.Fn link_addr
-has no return value.
-(See
-.Sx BUGS . )
-.Sh SEE ALSO
-.Xr addr2ascii 3
-.\" .Xr iso 4
-.Sh HISTORY
-The
-.Fn link_addr
-and
-.Fn link_ntoa
-functions appeared in 
-.Bx 4.3 Reno  .
-.Sh BUGS
-The returned values for link_ntoa
-reside in a static memory area.
-.Pp
-The function
-.Fn link_addr
-should diagnose improperly formed input, and there should be an unambiguous
-way to recognize this.
-.Pp
-If the
-.Va sdl_len
-field of the link socket address
-.Fa sdl
-is 0,
-.Fn link_ntoa
-will not insert a colon before the interface address bytes.
-If this translated address is given to
-.Fn link_addr
-without inserting an initial colon,
-the latter will not interpret it correctly.
diff --git a/cpukit/libnetworking/libc/linkaddr.c b/cpukit/libnetworking/libc/linkaddr.c
deleted file mode 100644
index 28c16cff05..0000000000
--- a/cpukit/libnetworking/libc/linkaddr.c
+++ /dev/null
@@ -1,160 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *  $Id$
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)linkaddr.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <net/if_dl.h>
-#include <string.h>
-
-/* States*/
-#define NAMING	0
-#define GOTONE	1
-#define GOTTWO	2
-#define RESET	3
-/* Inputs */
-#define	DIGIT	(4*0)
-#define	END	(4*1)
-#define DELIM	(4*2)
-#define LETTER	(4*3)
-
-void
-link_addr(addr, sdl)
-	register const char *addr;
-	register struct sockaddr_dl *sdl;
-{
-	register char *cp = sdl->sdl_data;
-	char *cplim = sdl->sdl_len + (char *)sdl;
-	register int byte = 0, state = NAMING, new;
-
-	bzero((char *)&sdl->sdl_family, sdl->sdl_len - 1);
-	sdl->sdl_family = AF_LINK;
-	do {
-		state &= ~LETTER;
-		if ((*addr >= '0') && (*addr <= '9')) {
-			new = *addr - '0';
-		} else if ((*addr >= 'a') && (*addr <= 'f')) {
-			new = *addr - 'a' + 10;
-		} else if ((*addr >= 'A') && (*addr <= 'F')) {
-			new = *addr - 'A' + 10;
-		} else if (*addr == 0) {
-			state |= END;
-		} else if (state == NAMING &&
-			   (((*addr >= 'A') && (*addr <= 'Z')) ||
-			   ((*addr >= 'a') && (*addr <= 'z'))))
-			state |= LETTER;
-		else
-			state |= DELIM;
-		addr++;
-		switch (state /* | INPUT */) {
-		case NAMING | DIGIT:
-		case NAMING | LETTER:
-			*cp++ = addr[-1];
-			continue;
-		case NAMING | DELIM:
-			state = RESET;
-			sdl->sdl_nlen = cp - sdl->sdl_data;
-			continue;
-		case GOTTWO | DIGIT:
-			*cp++ = byte;
-			/* FALLTHROUGH */
-		case RESET | DIGIT:
-			state = GOTONE;
-			byte = new;
-			continue;
-		case GOTONE | DIGIT:
-			state = GOTTWO;
-			byte = new + (byte << 4);
-			continue;
-		default: /* | DELIM */
-			state = RESET;
-			*cp++ = byte;
-			byte = 0;
-			continue;
-		case GOTONE | END:
-		case GOTTWO | END:
-			*cp++ = byte;
-			/* FALLTHROUGH */
-		case RESET | END:
-			break;
-		}
-		break;
-	} while (cp < cplim);
-	sdl->sdl_alen = cp - LLADDR(sdl);
-	new = cp - (char *)sdl;
-	if (new > sizeof(*sdl))
-		sdl->sdl_len = new;
-	return;
-}
-
-static char hexlist[] = "0123456789abcdef";
-
-char *
-link_ntoa(sdl)
-	register const struct sockaddr_dl *sdl;
-{
-	static char obuf[64];
-	register char *out = obuf;
-	register int i;
-	register u_char *in = (u_char *)LLADDR(sdl);
-	u_char *inlim = in + sdl->sdl_alen;
-	int firsttime = 1;
-
-	if (sdl->sdl_nlen) {
-		bcopy(sdl->sdl_data, obuf, sdl->sdl_nlen);
-		out += sdl->sdl_nlen;
-		if (sdl->sdl_alen)
-			*out++ = ':';
-	}
-	while (in < inlim) {
-		if (firsttime)
-			firsttime = 0;
-		else
-			*out++ = '.';
-		i = *in++;
-		if (i > 0xf) {
-			out[1] = hexlist[i & 0xf];
-			i >>= 4;
-			out[0] = hexlist[i];
-			out += 2;
-		} else
-			*out++ = hexlist[i];
-	}
-	*out = 0;
-	return (obuf);
-}
diff --git a/cpukit/libnetworking/libc/map_v4v6.c b/cpukit/libnetworking/libc/map_v4v6.c
deleted file mode 100644
index 0f8658e117..0000000000
--- a/cpukit/libnetworking/libc/map_v4v6.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * ++Copyright++ 1985, 1988, 1993
- * -
- * Copyright (c) 1985, 1988, 1993
- *    The Regents of the University of California.  All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- * 	This product includes software developed by the University of
- * 	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * -
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- * -
- * --Copyright--
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)gethostnamadr.c	8.1 (Berkeley) 6/4/93";
-static char rcsid[] = "$Id$";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-
-#include <stdio.h>
-#include <string.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <ctype.h>
-#include <errno.h>
-#include <syslog.h>
-
-typedef union {
-	int32_t al;
-	char ac;
-} align;
-
-void
-_map_v4v6_address(src, dst)
-	const char *src;
-	char *dst;
-{
-	u_char *p = (u_char *)dst;
-	char tmp[INADDRSZ];
-	int i;
-
-	/* Stash a temporary copy so our caller can update in place. */
-	bcopy(src, tmp, INADDRSZ);
-	/* Mark this ipv6 addr as a mapped ipv4. */
-	for (i = 0; i < 10; i++)
-		*p++ = 0x00;
-	*p++ = 0xff;
-	*p++ = 0xff;
-	/* Retrieve the saved copy and we're done. */
-	bcopy(tmp, (void*)p, INADDRSZ);
-}
-
-void
-_map_v4v6_hostent(hp, bpp, lenp)
-	struct hostent *hp;
-	char **bpp;
-	int *lenp;
-{
-	char **ap;
-
-	if (hp->h_addrtype != AF_INET || hp->h_length != INADDRSZ)
-		return;
-	hp->h_addrtype = AF_INET6;
-	hp->h_length = IN6ADDRSZ;
-	for (ap = hp->h_addr_list; *ap; ap++) {
-		int i = sizeof(align) - ((u_long)*bpp % sizeof(align));
-
-		if (*lenp < (i + IN6ADDRSZ)) {
-			/* Out of memory.  Truncate address list here.  XXX */
-			*ap = NULL;
-			return;
-		}
-		*bpp += i;
-		*lenp -= i;
-		_map_v4v6_address(*ap, *bpp);
-		*ap = *bpp;
-		*bpp += IN6ADDRSZ;
-		*lenp -= IN6ADDRSZ;
-	}
-}
diff --git a/cpukit/libnetworking/libc/ns.3 b/cpukit/libnetworking/libc/ns.3
deleted file mode 100644
index e621ad2d90..0000000000
--- a/cpukit/libnetworking/libc/ns.3
+++ /dev/null
@@ -1,131 +0,0 @@
-.\" Copyright (c) 1986, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"     @(#)ns.3	8.1 (Berkeley) 6/4/93
-.\"	$Id$
-.\"
-.Dd June 4, 1993
-.Dt NS 3
-.Os BSD 4.3
-.Sh NAME
-.Nm ns_addr ,
-.Nm ns_ntoa
-.Nd Xerox
-.Tn NS Ns (tm)
-address conversion routines
-.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <netns/ns.h>
-.Ft struct ns_addr 
-.Fn ns_addr "char *cp"
-.Ft char *
-.Fn ns_ntoa "struct ns_addr ns"
-.Sh DESCRIPTION
-The routine
-.Fn ns_addr
-interprets character strings representing
-.Tn XNS
-addresses, returning binary information suitable
-for use in system calls.
-The routine
-.Fn ns_ntoa
-takes
-.Tn XNS
-addresses and returns
-.Tn ASCII
-strings representing the address in a
-notation in common use in the Xerox Development Environment:
-.Bd -filled -offset indent
-<network number>.<host number>.<port number>
-.Ed
-.Pp
-Trailing zero fields are suppressed, and each number is printed in hexadecimal,
-in a format suitable for input to 
-.Fn ns_addr .
-Any fields lacking super-decimal digits will have a
-trailing
-.Ql H
-appended.
-.Pp
-Unfortunately, no universal standard exists for representing
-.Tn XNS
-addresses.
-An effort has been made to insure that
-.Fn ns_addr
-be compatible with most formats in common use.
-It will first separate an address into 1 to 3 fields using a single delimiter
-chosen from
-period
-.Ql \&. ,
-colon
-.Ql \&:
-or pound-sign
-.Ql \&# .
-Each field is then examined for byte separators (colon or period).
-If there are byte separators, each subfield separated is taken to be
-a small hexadecimal number, and the entirety is taken as a network-byte-ordered
-quantity to be zero extended in the high-network-order bytes.
-Next, the field is inspected for hyphens, in which case
-the field is assumed to be a number in decimal notation
-with hyphens separating the millenia.
-Next, the field is assumed to be a number:
-It is interpreted
-as hexadecimal if there is a leading
-.Ql 0x
-(as in C),
-a trailing
-.Ql H
-(as in Mesa), or there are any super-decimal digits present.
-It is interpreted as octal is there is a leading
-.Ql 0
-and there are no super-octal digits.
-Otherwise, it is converted as a decimal number.
-.Sh RETURN VALUES
-None. (See
-.Sx BUGS . )
-.Sh SEE ALSO
-.Xr hosts 5 ,
-.Xr networks 5
-.Sh HISTORY
-The
-.Fn ns_addr
-and
-.Fn ns_toa
-functions appeared in 
-.Bx 4.3 .
-.Sh BUGS
-The string returned by
-.Fn ns_ntoa
-resides in a static memory area.
-The function
-.Fn ns_addr
-should diagnose improperly formed input, and there should be an unambiguous
-way to recognize this.
diff --git a/cpukit/libnetworking/libc/ns_addr.c b/cpukit/libnetworking/libc/ns_addr.c
deleted file mode 100644
index 18fabe91f1..0000000000
--- a/cpukit/libnetworking/libc/ns_addr.c
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
- * Copyright (c) 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * J.Q. Johnson.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *  $Id$
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)ns_addr.c	8.1 (Berkeley) 6/7/93";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/param.h>
-#include <netns/ns.h>
-#include <stdio.h>
-#include <string.h>
-
-static struct ns_addr addr, zero_addr;
-
-static void Field(), cvtbase();
-
-struct ns_addr
-ns_addr(name)
-	const char *name;
-{
-	char separator;
-	char *hostname, *socketname, *cp;
-	char buf[50];
-
-	(void)strncpy(buf, name, sizeof(buf) - 1);
-	buf[sizeof(buf) - 1] = '\0';
-
-	/*
-	 * First, figure out what he intends as a field separtor.
-	 * Despite the way this routine is written, the prefered
-	 * form  2-272.AA001234H.01777, i.e. XDE standard.
-	 * Great efforts are made to insure backward compatability.
-	 */
-	if ((hostname = strchr(buf, '#')) != NULL)
-		separator = '#';
-	else {
-		hostname = strchr(buf, '.');
-		if ((cp = strchr(buf, ':')) &&
-		    ((hostname && cp < hostname) || (hostname == 0))) {
-			hostname = cp;
-			separator = ':';
-		} else
-			separator = '.';
-	}
-	if (hostname)
-		*hostname++ = 0;
-
-	addr = zero_addr;
-	Field(buf, addr.x_net.c_net, 4);
-	if (hostname == 0)
-		return (addr);  /* No separator means net only */
-
-	socketname = strchr(hostname, separator);
-	if (socketname) {
-		*socketname++ = 0;
-		Field(socketname, (u_char *)&addr.x_port, 2);
-	}
-
-	Field(hostname, addr.x_host.c_host, 6);
-
-	return (addr);
-}
-
-static void
-Field(buf, out, len)
-	char *buf;
-	u_char *out;
-	int len;
-{
-	register char *bp = buf;
-	int i, ibase, base16 = 0, base10 = 0, clen = 0;
-	int hb[6], *hp;
-	char *fmt;
-
-	/*
-	 * first try 2-273#2-852-151-014#socket
-	 */
-	if ((*buf != '-') &&
-	    (1 < (i = sscanf(buf, "%d-%d-%d-%d-%d",
-			&hb[0], &hb[1], &hb[2], &hb[3], &hb[4])))) {
-		cvtbase(1000L, 256, hb, i, out, len);
-		return;
-	}
-	/*
-	 * try form 8E1#0.0.AA.0.5E.E6#socket
-	 */
-	if (1 < (i = sscanf(buf,"%x.%x.%x.%x.%x.%x",
-			&hb[0], &hb[1], &hb[2], &hb[3], &hb[4], &hb[5]))) {
-		cvtbase(256L, 256, hb, i, out, len);
-		return;
-	}
-	/*
-	 * try form 8E1#0:0:AA:0:5E:E6#socket
-	 */
-	if (1 < (i = sscanf(buf,"%x:%x:%x:%x:%x:%x",
-			&hb[0], &hb[1], &hb[2], &hb[3], &hb[4], &hb[5]))) {
-		cvtbase(256L, 256, hb, i, out, len);
-		return;
-	}
-	/*
-	 * This is REALLY stretching it but there was a
-	 * comma notation separting shorts -- definitely non standard
-	 */
-	if (1 < (i = sscanf(buf,"%x,%x,%x",
-			&hb[0], &hb[1], &hb[2]))) {
-		hb[0] = htons(hb[0]); hb[1] = htons(hb[1]);
-		hb[2] = htons(hb[2]);
-		cvtbase(65536L, 256, hb, i, out, len);
-		return;
-	}
-
-	/* Need to decide if base 10, 16 or 8 */
-	while (*bp) switch (*bp++) {
-
-	case '0': case '1': case '2': case '3': case '4': case '5':
-	case '6': case '7': case '-':
-		break;
-
-	case '8': case '9':
-		base10 = 1;
-		break;
-
-	case 'a': case 'b': case 'c': case 'd': case 'e': case 'f':
-	case 'A': case 'B': case 'C': case 'D': case 'E': case 'F':
-		base16 = 1;
-		break;
-
-	case 'x': case 'X':
-		*--bp = '0';
-		base16 = 1;
-		break;
-
-	case 'h': case 'H':
-		base16 = 1;
-		/* fall into */
-
-	default:
-		*--bp = 0; /* Ends Loop */
-	}
-	if (base16) {
-		fmt = "%3x";
-		ibase = 4096;
-	} else if (base10 == 0 && *buf == '0') {
-		fmt = "%3o";
-		ibase = 512;
-	} else {
-		fmt = "%3d";
-		ibase = 1000;
-	}
-
-	for (bp = buf; *bp++; ) clen++;
-	if (clen == 0) clen++;
-	if (clen > 18) clen = 18;
-	i = ((clen - 1) / 3) + 1;
-	bp = clen + buf - 3;
-	hp = hb + i - 1;
-
-	while (hp > hb) {
-		(void)sscanf(bp, fmt, hp);
-		bp[0] = 0;
-		hp--;
-		bp -= 3;
-	}
-	(void)sscanf(buf, fmt, hp);
-	cvtbase((long)ibase, 256, hb, i, out, len);
-}
-
-static void
-cvtbase(oldbase,newbase,input,inlen,result,reslen)
-	long oldbase;
-	int newbase;
-	int input[];
-	int inlen;
-	unsigned char result[];
-	int reslen;
-{
-	int d, e;
-	long sum;
-
-	e = 1;
-	while (e > 0 && reslen > 0) {
-		d = 0; e = 0; sum = 0;
-		/* long division: input=input/newbase */
-		while (d < inlen) {
-			sum = sum*oldbase + (long) input[d];
-			e += (sum > 0);
-			input[d++] = sum / newbase;
-			sum %= newbase;
-		}
-		result[--reslen] = sum;	/* accumulate remainder */
-	}
-	for (d=0; d < reslen; d++)
-		result[d] = 0;
-}
diff --git a/cpukit/libnetworking/libc/ns_name.c b/cpukit/libnetworking/libc/ns_name.c
deleted file mode 100644
index af10d2f062..0000000000
--- a/cpukit/libnetworking/libc/ns_name.c
+++ /dev/null
@@ -1,595 +0,0 @@
-/*
- * Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#if !defined(__rtems__)
-#if !defined(LINT) && !defined(CODECENTER)
-static char rcsid[] = "$Id$";
-#endif /* not lint */
-#endif /* not rtems */
-
-#include <sys/types.h>
-
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-
-#include <errno.h>
-#include <resolv.h>
-#include <string.h>
-
-/* Data. */
-
-static char		digits[] = "0123456789";
-
-/* Forward. */
-
-static int		special(int);
-static int		printable(int);
-static int		dn_find(const u_char *, const u_char *,
-				const u_char * const *,
-				const u_char * const *);
-
-/* Public. */
-
-/*
- * ns_name_ntop(src, dst, dstsiz)
- *	Convert an encoded domain name to printable ascii as per RFC1035.
- * return:
- *	Number of bytes written to buffer, or -1 (with errno set)
- * notes:
- *	The root is returned as "."
- *	All other domains are returned in non absolute form
- */
-int
-ns_name_ntop(const u_char *src, char *dst, size_t dstsiz) {
-	const u_char *cp;
-	char *dn, *eom;
-	u_char c;
-	u_int n;
-
-	cp = src;
-	dn = dst;
-	eom = dst + dstsiz;
-
-	while ((n = *cp++) != 0) {
-		if ((n & NS_CMPRSFLGS) != 0) {
-			/* Some kind of compression pointer. */
-			errno = EMSGSIZE;
-			return (-1);
-		}
-		if (dn != dst) {
-			if (dn >= eom) {
-				errno = EMSGSIZE;
-				return (-1);
-			}
-			*dn++ = '.';
-		}
-		if (dn + n >= eom) {
-			errno = EMSGSIZE;
-			return (-1);
-		}
-		for ((void)NULL; n > 0; n--) {
-			c = *cp++;
-			if (special(c)) {
-				if (dn + 1 >= eom) {
-					errno = EMSGSIZE;
-					return (-1);
-				}
-				*dn++ = '\\';
-				*dn++ = (char)c;
-			} else if (!printable(c)) {
-				if (dn + 3 >= eom) {
-					errno = EMSGSIZE;
-					return (-1);
-				}
-				*dn++ = '\\';
-				*dn++ = digits[c / 100];
-				*dn++ = digits[(c % 100) / 10];
-				*dn++ = digits[c % 10];
-			} else {
-				if (dn >= eom) {
-					errno = EMSGSIZE;
-					return (-1);
-				}
-				*dn++ = (char)c;
-			}
-		}
-	}
-	if (dn == dst) {
-		if (dn >= eom) {
-			errno = EMSGSIZE;
-			return (-1);
-		}
-		*dn++ = '.';
-	}
-	if (dn >= eom) {
-		errno = EMSGSIZE;
-		return (-1);
-	}
-	*dn++ = '\0';
-	return (dn - dst);
-}
-
-/*
- * ns_name_pton(src, dst, dstsiz)
- *	Convert a ascii string into an encoded domain name as per RFC1035.
- * return:
- *	-1 if it fails
- *	1 if string was fully qualified
- *	0 is string was not fully qualified
- * notes:
- *	Enforces label and domain length limits.
- */
-
-int
-ns_name_pton(const char *src, u_char *dst, size_t dstsiz) {
-	u_char *label, *bp, *eom;
-	int c, n, escaped;
-	char *cp;
-
-	escaped = 0;
-	bp = dst;
-	eom = dst + dstsiz;
-	label = bp++;
-
-	while ((c = *src++) != 0) {
-		if (escaped) {
-			if ((cp = strchr(digits, c)) != NULL) {
-				n = (cp - digits) * 100;
-				if ((c = *src++) == 0 ||
-				    (cp = strchr(digits, c)) == NULL) {
-					errno = EMSGSIZE;
-					return (-1);
-				}
-				n += (cp - digits) * 10;
-				if ((c = *src++) == 0 ||
-				    (cp = strchr(digits, c)) == NULL) {
-					errno = EMSGSIZE;
-					return (-1);
-				}
-				n += (cp - digits);
-				if (n > 255) {
-					errno = EMSGSIZE;
-					return (-1);
-				}
-				c = n;
-			}
-			escaped = 0;
-		} else if (c == '\\') {
-			escaped = 1;
-			continue;
-		} else if (c == '.') {
-			c = (bp - label - 1);
-			if ((c & NS_CMPRSFLGS) != 0) {	/* Label too big. */
-				errno = EMSGSIZE;
-				return (-1);
-			}
-			if (label >= eom) {
-				errno = EMSGSIZE;
-				return (-1);
-			}
-			*label = c;
-			/* Fully qualified ? */
-			if (*src == '\0') {
-				if (c != 0) {
-					if (bp >= eom) {
-						errno = EMSGSIZE;
-						return (-1);
-					}
-					*bp++ = '\0';
-				}
-				if ((bp - dst) > MAXCDNAME) {
-					errno = EMSGSIZE;
-					return (-1);
-				}
-				return (1);
-			}
-			if (c == 0) {
-				errno = EMSGSIZE;
-				return (-1);
-			}
-			label = bp++;
-			continue;
-		}
-		if (bp >= eom) {
-			errno = EMSGSIZE;
-			return (-1);
-		}
-		*bp++ = (u_char)c;
-	}
-	c = (bp - label - 1);
-	if ((c & NS_CMPRSFLGS) != 0) {		/* Label too big. */
-		errno = EMSGSIZE;
-		return (-1);
-	}
-	if (label >= eom) {
-		errno = EMSGSIZE;
-		return (-1);
-	}
-	*label = c;
-	if (c != 0) {
-		if (bp >= eom) {
-			errno = EMSGSIZE;
-			return (-1);
-		}
-		*bp++ = 0;
-	}
-	if ((bp - dst) > MAXCDNAME) {	/* src too big */
-		errno = EMSGSIZE;
-		return (-1);
-	}
-	return (0);
-}
-
-/*
- * ns_name_unpack(msg, eom, src, dst, dstsiz)
- *	Unpack a domain name from a message, source may be compressed.
- * return:
- *	-1 if it fails, or consumed octets if it succeeds.
- */
-int
-ns_name_unpack(const u_char *msg, const u_char *eom, const u_char *src,
-	       u_char *dst, size_t dstsiz)
-{
-	const u_char *srcp, *dstlim;
-	u_char *dstp;
-	int n, len, checked;
-
-	len = -1;
-	checked = 0;
-	dstp = dst;
-	srcp = src;
-	dstlim = dst + dstsiz;
-	if (srcp < msg || srcp >= eom) {
-		errno = EMSGSIZE;
-		return (-1);
-	}
-	/* Fetch next label in domain name. */
-	while ((n = *srcp++) != 0) {
-		/* Check for indirection. */
-		switch (n & NS_CMPRSFLGS) {
-		case 0:
-			/* Limit checks. */
-			if (dstp + n + 1 >= dstlim || srcp + n >= eom) {
-				errno = EMSGSIZE;
-				return (-1);
-			}
-			checked += n + 1;
-			*dstp++ = n;
-			memcpy(dstp, srcp, n);
-			dstp += n;
-			srcp += n;
-			break;
-
-		case NS_CMPRSFLGS:
-			if (srcp >= eom) {
-				errno = EMSGSIZE;
-				return (-1);
-			}
-			if (len < 0)
-				len = srcp - src + 1;
-			srcp = msg + (((n & 0x3f) << 8) | (*srcp & 0xff));
-			if (srcp < msg || srcp >= eom) {  /* Out of range. */
-				errno = EMSGSIZE;
-				return (-1);
-			}
-			checked += 2;
-			/*
-			 * Check for loops in the compressed name;
-			 * if we've looked at the whole message,
-			 * there must be a loop.
-			 */
-			if (checked >= eom - msg) {
-				errno = EMSGSIZE;
-				return (-1);
-			}
-			break;
-
-		default:
-			errno = EMSGSIZE;
-			return (-1);			/* flag error */
-		}
-	}
-	*dstp = '\0';
-	if (len < 0)
-		len = srcp - src;
-	return (len);
-}
-
-/*
- * ns_name_pack(src, dst, dstsiz, dnptrs, lastdnptr)
- *	Pack domain name 'domain' into 'comp_dn'.
- * return:
- *	Size of the compressed name, or -1.
- * notes:
- *	'dnptrs' is an array of pointers to previous compressed names.
- *	dnptrs[0] is a pointer to the beginning of the message. The array
- *	ends with NULL.
- *	'lastdnptr' is a pointer to the end of the array pointed to
- *	by 'dnptrs'.
- * Side effects:
- *	The list of pointers in dnptrs is updated for labels inserted into
- *	the message as we compress the name.  If 'dnptr' is NULL, we don't
- *	try to compress names. If 'lastdnptr' is NULL, we don't update the
- *	list.
- */
-int
-ns_name_pack(const u_char *src, u_char *dst, int dstsiz,
-	     const u_char **dnptrs, const u_char **lastdnptr)
-{
-	u_char *dstp;
-	const u_char **cpp, **lpp, *eob, *msg;
-	const u_char *srcp;
-	int n, l;
-
-	srcp = src;
-	dstp = dst;
-	eob = dstp + dstsiz;
-	lpp = cpp = NULL;
-	if (dnptrs != NULL) {
-		if ((msg = *dnptrs++) != NULL) {
-			for (cpp = dnptrs; *cpp != NULL; cpp++)
-				(void)NULL;
-			lpp = cpp;	/* end of list to search */
-		}
-	} else
-		msg = NULL;
-
-	/* make sure the domain we are about to add is legal */
-	l = 0;
-	do {
-		n = *srcp;
-		if ((n & NS_CMPRSFLGS) != 0) {
-			errno = EMSGSIZE;
-			return (-1);
-		}
-		l += n + 1;
-		if (l > MAXCDNAME) {
-			errno = EMSGSIZE;
-			return (-1);
-		}
-		srcp += n + 1;
-	} while (n != 0);
-
-	srcp = src;
-	do {
-		/* Look to see if we can use pointers. */
-		n = *srcp;
-		if (n != 0 && msg != NULL) {
-			l = dn_find(srcp, msg, (const u_char * const *)dnptrs,
-				    (const u_char * const *)lpp);
-			if (l >= 0) {
-				if (dstp + 1 >= eob) {
-					errno = EMSGSIZE;
-					return (-1);
-				}
-				*dstp++ = (l >> 8) | NS_CMPRSFLGS;
-				*dstp++ = l % 256;
-				return (dstp - dst);
-			}
-			/* Not found, save it. */
-			if (lastdnptr != NULL && cpp < lastdnptr - 1 &&
-			    (dstp - msg) < 0x4000) {
-				*cpp++ = dstp;
-				*cpp = NULL;
-			}
-		}
-		/* copy label to buffer */
-		if (n & NS_CMPRSFLGS) {		/* Should not happen. */
-			errno = EMSGSIZE;
-			return (-1);
-		}
-		if (dstp + 1 + n >= eob) {
-			errno = EMSGSIZE;
-			return (-1);
-		}
-		memcpy(dstp, srcp, n + 1);
-		srcp += n + 1;
-		dstp += n + 1;
-	} while (n != 0);
-
-	if (dstp > eob) {
-		if (msg != NULL)
-			*lpp = NULL;
-		errno = EMSGSIZE;
-		return (-1);
-	} 
-	return (dstp - dst);
-}
-
-/*
- * ns_name_uncompress(msg, eom, src, dst, dstsiz)
- *	Expand compressed domain name to presentation format.
- * return:
- *	Number of bytes read out of `src', or -1 (with errno set).
- * note:
- *	Root domain returns as "." not "".
- */
-int
-ns_name_uncompress(const u_char *msg, const u_char *eom, const u_char *src,
-		   char *dst, size_t dstsiz)
-{
-	u_char tmp[NS_MAXCDNAME];
-	int n;
-	
-	if ((n = ns_name_unpack(msg, eom, src, tmp, sizeof tmp)) == -1)
-		return (-1);
-	if (ns_name_ntop(tmp, dst, dstsiz) == -1)
-		return (-1);
-	return (n);
-}
-
-/*
- * ns_name_compress(src, dst, dstsiz, dnptrs, lastdnptr)
- *	Compress a domain name into wire format, using compression pointers.
- * return:
- *	Number of bytes consumed in `dst' or -1 (with errno set).
- * notes:
- *	'dnptrs' is an array of pointers to previous compressed names.
- *	dnptrs[0] is a pointer to the beginning of the message.
- *	The list ends with NULL.  'lastdnptr' is a pointer to the end of the
- *	array pointed to by 'dnptrs'. Side effect is to update the list of
- *	pointers for labels inserted into the message as we compress the name.
- *	If 'dnptr' is NULL, we don't try to compress names. If 'lastdnptr'
- *	is NULL, we don't update the list.
- */
-int
-ns_name_compress(const char *src, u_char *dst, size_t dstsiz,
-		 const u_char **dnptrs, const u_char **lastdnptr)
-{
-	u_char tmp[NS_MAXCDNAME];
-
-	if (ns_name_pton(src, tmp, sizeof tmp) == -1)
-		return (-1);
-	return (ns_name_pack(tmp, dst, dstsiz, dnptrs, lastdnptr));
-}
-
-/*
- * ns_name_skip(ptrptr, eom)
- *	Advance *ptrptr to skip over the compressed name it points at.
- * return:
- *	0 on success, -1 (with errno set) on failure.
- */
-int
-ns_name_skip(const u_char **ptrptr, const u_char *eom) {
-	const u_char *cp;
-	u_int n;
-
-	cp = *ptrptr;
-	while (cp < eom && (n = *cp++) != 0) {
-		/* Check for indirection. */
-		switch (n & NS_CMPRSFLGS) {
-		case 0:			/* normal case, n == len */
-			cp += n;
-			continue;
-		case NS_CMPRSFLGS:	/* indirection */
-			cp++;
-			break;
-		default:		/* illegal type */
-			errno = EMSGSIZE;
-			return (-1);
-		}
-		break;
-	}
-	if (cp > eom) {
-		errno = EMSGSIZE;
-		return (-1);
-	}
-	*ptrptr = cp;
-	return (0);
-}
-
-/* Private. */
-
-/*
- * special(ch)
- *	Thinking in noninternationalized USASCII (per the DNS spec),
- *	is this characted special ("in need of quoting") ?
- * return:
- *	boolean.
- */
-static int
-special(int ch) {
-	switch (ch) {
-	case 0x22: /* '"' */
-	case 0x2E: /* '.' */
-	case 0x3B: /* ';' */
-	case 0x5C: /* '\\' */
-	/* Special modifiers in zone files. */
-	case 0x40: /* '@' */
-	case 0x24: /* '$' */
-		return (1);
-	default:
-		return (0);
-	}
-}
-
-/*
- * printable(ch)
- *	Thinking in noninternationalized USASCII (per the DNS spec),
- *	is this character visible and not a space when printed ?
- * return:
- *	boolean.
- */
-static int
-printable(int ch) {
-	return (ch > 0x20 && ch < 0x7f);
-}
-
-/*
- *	Thinking in noninternationalized USASCII (per the DNS spec),
- *	convert this character to lower case if it's upper case.
- */
-static int
-mklower(int ch) {
-	if (ch >= 0x41 && ch <= 0x5A)
-		return (ch + 0x20);
-	return (ch);
-}
-
-/*
- * dn_find(domain, msg, dnptrs, lastdnptr)
- *	Search for the counted-label name in an array of compressed names.
- * return:
- *	offset from msg if found, or -1.
- * notes:
- *	dnptrs is the pointer to the first name on the list,
- *	not the pointer to the start of the message.
- */
-static int
-dn_find(const u_char *domain, const u_char *msg,
-	const u_char * const *dnptrs,
-	const u_char * const *lastdnptr)
-{
-	const u_char *dn, *cp, *sp;
-	const u_char * const *cpp;
-	u_int n;
-
-	for (cpp = dnptrs; cpp < lastdnptr; cpp++) {
-		dn = domain;
-		sp = cp = *cpp;
-		while ((n = *cp++) != 0) {
-			/*
-			 * check for indirection
-			 */
-			switch (n & NS_CMPRSFLGS) {
-			case 0:			/* normal case, n == len */
-				if (n != *dn++)
-					goto next;
-				for ((void)NULL; n > 0; n--)
-					if (mklower(*dn++) != mklower(*cp++))
-						goto next;
-				/* Is next root for both ? */
-				if (*dn == '\0' && *cp == '\0')
-					return (sp - msg);
-				if (*dn)
-					continue;
-				goto next;
-
-			case NS_CMPRSFLGS:	/* indirection */
-				cp = msg + (((n & 0x3f) << 8) | *cp);
-				break;
-
-			default:	/* illegal type */
-				errno = EMSGSIZE;
-				return (-1);
-			}
-		}
- next: ;
-	}
-	errno = ENOENT;
-	return (-1);
-}
diff --git a/cpukit/libnetworking/libc/ns_netint.c b/cpukit/libnetworking/libc/ns_netint.c
deleted file mode 100644
index 3c09da8f8c..0000000000
--- a/cpukit/libnetworking/libc/ns_netint.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#if !defined(__rtems__)
-#if !defined(LINT) && !defined(CODECENTER)
-static char rcsid[] = "$Id$";
-#endif /* not lint */
-#endif /* not rtems */
-
-/* Import. */
-
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-
-u_int
-ns_get16(const u_char *src) {
-	u_int dst;
-
-	NS_GET16(dst, src);
-	return (dst);
-}
-
-u_long
-ns_get32(const u_char *src) {
-	u_long dst;
-
-	NS_GET32(dst, src);
-	return (dst);
-}
-
-void
-ns_put16(u_int src, u_char *dst) {
-	NS_PUT16(src, dst);
-}
-
-void
-ns_put32(u_long src, u_char *dst) {
-	NS_PUT32(src, dst);
-}
diff --git a/cpukit/libnetworking/libc/ns_ntoa.c b/cpukit/libnetworking/libc/ns_ntoa.c
deleted file mode 100644
index 9d0be2e1dc..0000000000
--- a/cpukit/libnetworking/libc/ns_ntoa.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright (c) 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *  $Id$
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)ns_ntoa.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/param.h>
-#include <netns/ns.h>
-#include <stdio.h>
-
-char *
-ns_ntoa(addr)
-	struct ns_addr addr;
-{
-	static char obuf[40];
-	union { union ns_net net_e; u_long long_e; } net;
-	u_short port = htons(addr.x_port);
-	register char *cp;
-	char *cp2;
-	register u_char *up = addr.x_host.c_host;
-	u_char *uplim = up + 6;
-	static char *spectHex();
-
-	net.net_e = addr.x_net;
-	sprintf(obuf, "%lx", (u_long)ntohl(net.long_e));
-	cp = spectHex(obuf);
-	cp2 = cp + 1;
-	while (*up==0 && up < uplim) up++;
-	if (up == uplim) {
-		if (port) {
-			sprintf(cp, ".0");
-			cp += 2;
-		}
-	} else {
-		sprintf(cp, ".%x", *up++);
-		while (up < uplim) {
-			while (*cp) cp++;
-			sprintf(cp, "%02x", *up++);
-		}
-		cp = spectHex(cp2);
-	}
-	if (port) {
-		sprintf(cp, ".%x", port);
-		spectHex(cp + 1);
-	}
-	return (obuf);
-}
-
-static char *
-spectHex(p0)
-	char *p0;
-{
-	int ok = 0;
-	int nonzero = 0;
-	register char *p = p0;
-	for (; *p; p++) switch (*p) {
-
-	case 'a': case 'b': case 'c': case 'd': case 'e': case 'f':
-		*p += ('A' - 'a');
-		/* fall into . . . */
-	case 'A': case 'B': case 'C': case 'D': case 'E': case 'F':
-		ok = 1;
-	case '1': case '2': case '3': case '4': case '5':
-	case '6': case '7': case '8': case '9':
-		nonzero = 1;
-	}
-	if (nonzero && !ok) { *p++ = 'H'; *p = 0; }
-	return (p);
-}
diff --git a/cpukit/libnetworking/libc/ns_parse.c b/cpukit/libnetworking/libc/ns_parse.c
deleted file mode 100644
index cc1f070156..0000000000
--- a/cpukit/libnetworking/libc/ns_parse.c
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- * Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#if !defined(__rtems__)
-#if !defined(LINT) && !defined(CODECENTER)
-static char rcsid[] = "$Id$";
-#endif /* not lint */
-#endif /* not rtems */
-
-#include <sys/types.h>
-
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-
-#include <errno.h>
-#include <resolv.h>
-#include <string.h>
-
-/* These need to be in the same order as the nres.h:ns_flag enum. */
-struct _ns_flagdata _ns_flagdata[16] = {
-	{ 0x8000, 15 },		/* qr. */
-	{ 0x7800, 11 },		/* opcode. */
-	{ 0x0400, 10 },		/* aa. */
-	{ 0x0200, 9 },		/* tc. */
-	{ 0x0100, 8 },		/* rd. */
-	{ 0x0080, 7 },		/* ra. */
-	{ 0x0040, 6 },		/* z. */
-	{ 0x0020, 5 },		/* ad. */
-	{ 0x0010, 4 },		/* cd. */
-	{ 0x000f, 0 },		/* rcode. */
-	{ 0x0000, 0 },		/* expansion (1/6). */
-	{ 0x0000, 0 },		/* expansion (2/6). */
-	{ 0x0000, 0 },		/* expansion (3/6). */
-	{ 0x0000, 0 },		/* expansion (4/6). */
-	{ 0x0000, 0 },		/* expansion (5/6). */
-	{ 0x0000, 0 },		/* expansion (6/6). */
-};
-
-static int
-skiprr(const u_char *ptr, const u_char *eom, ns_sect section, int count) {
-	const u_char *optr = ptr;
-
-	for ((void)NULL; count > 0; count--) {
-		int b, rdlength;
-
-		b = dn_skipname(ptr, eom);
-		if (b < 0)
-			goto emsgsize;
-		ptr += b/*Name*/ + NS_INT16SZ/*Type*/ + NS_INT16SZ/*Class*/;
-		if (section != ns_s_qd) {
-			if (ptr + NS_INT32SZ > eom)
-				goto emsgsize;
-			ptr += NS_INT32SZ/*TTL*/;
-			if (ptr + NS_INT16SZ > eom)
-				goto emsgsize;
-			NS_GET16(rdlength, ptr);
-			ptr += rdlength/*RData*/;
-		}
-	}
-	if (ptr > eom)
-		goto emsgsize;
-	return (ptr - optr);
- emsgsize:
-	errno = EMSGSIZE;
-	return (-1);
-}
-
-int
-ns_initparse(const u_char *msg, int msglen, ns_msg *handle) {
-	const u_char *eom = msg + msglen;
-	int i;
-
-	memset(handle, 0x5e, sizeof *handle);
-	handle->_msg = msg;
-	handle->_eom = eom;
-	if (msg + NS_INT16SZ > eom)
-		goto emsgsize;
-	NS_GET16(handle->_id, msg);
-	if (msg + NS_INT16SZ > eom)
-		goto emsgsize;
-	NS_GET16(handle->_flags, msg);
-	for (i = 0; i < ns_s_max; i++) {
-		if (msg + NS_INT16SZ > eom)
-			goto emsgsize;
-		NS_GET16(handle->_counts[i], msg);
-	}
-	for (i = 0; i < ns_s_max; i++)
-		if (handle->_counts[i] == 0)
-			handle->_sections[i] = NULL;
-		else {
-			int b = skiprr(msg, eom, (ns_sect)i,
-				       handle->_counts[i]);
-
-			if (b < 0)
-				return (-1);
-			handle->_sections[i] = msg;
-			msg += b;
-		}
-	if (msg != eom)
-		goto emsgsize;
-	handle->_sect = ns_s_max;
-	handle->_rrnum = -1;
-	handle->_ptr = NULL;
-	return (0);
- emsgsize:
-	errno = EMSGSIZE;
-	return (-1);
-}
-
-int
-ns_parserr(ns_msg *handle, ns_sect section, int rrnum, ns_rr *rr) {
-	int b;
-
-	/* Make section right. */
-	if (section < 0 || section >= ns_s_max)
-		goto enodev;
-	if ((int)section != (int)handle->_sect) {
-		handle->_sect = section;
-		handle->_rrnum = 0;
-		handle->_ptr = handle->_sections[(int)section];
-	}
-
-	/* Make rrnum right. */
-	if (rrnum == -1)
-		rrnum = handle->_rrnum;
-	if (rrnum < 0 || rrnum >= handle->_counts[(int)section])
-		goto enodev;
-	if (rrnum < handle->_rrnum) {
-		handle->_rrnum = 0;
-		handle->_ptr = handle->_sections[(int)section];
-	}
-	
-	b = skiprr(handle->_msg, handle->_eom, section,
-		   rrnum - handle->_rrnum);
-	if (b < 0)
-		return (-1);
-	handle->_ptr += b;
-	handle->_rrnum = rrnum;
-
-	/* Do the parse. */
-	b = dn_expand(handle->_msg, handle->_eom,
-		      handle->_ptr, rr->name, NS_MAXDNAME);
-	if (b < 0)
-		return (-1);
-	handle->_ptr += b;
-	if (handle->_ptr + NS_INT16SZ > handle->_eom)
-		goto emsgsize;
-	NS_GET16(rr->type, handle->_ptr);
-	if (handle->_ptr + NS_INT16SZ > handle->_eom)
-		goto emsgsize;
-	NS_GET16(rr->class, handle->_ptr);
-	if (section == ns_s_qd) {
-		rr->ttl = 0;
-		rr->rdlength = 0;
-		rr->rdata = NULL;
-	} else {
-		if (handle->_ptr + NS_INT32SZ > handle->_eom)
-			goto emsgsize;
-		NS_GET32(rr->ttl, handle->_ptr);
-		if (handle->_ptr + NS_INT16SZ > handle->_eom)
-			goto emsgsize;
-		NS_GET16(rr->rdlength, handle->_ptr);
-		if (handle->_ptr + rr->rdlength > handle->_eom)
-			goto emsgsize;
-		rr->rdata = handle->_ptr;
-		handle->_ptr += rr->rdlength;
-	}
-	handle->_rrnum++;
-
-	/* All done. */
-	return (0);
- enodev:
-	errno = ENODEV;
-	return (-1);
- emsgsize:
-	errno = EMSGSIZE;
-	return (-1);
-}
diff --git a/cpukit/libnetworking/libc/ns_print.c b/cpukit/libnetworking/libc/ns_print.c
deleted file mode 100644
index f7d7d16c64..0000000000
--- a/cpukit/libnetworking/libc/ns_print.c
+++ /dev/null
@@ -1,745 +0,0 @@
-/*
- * Copyright (c) 1996, 1998 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#if !defined(__rtems__)
-#if !defined(LINT) && !defined(CODECENTER)
-static char rcsid[] = "$Id$";
-#endif /* not lint */
-#endif /* not rtems */
-
-/* Import. */
-
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <arpa/inet.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <resolv.h>
-#include <string.h>
-#include <ctype.h>
-
-#define SPRINTF(x) ((size_t)sprintf x)
-
-/* Forward. */
-
-static size_t	prune_origin(const char *name, const char *origin);
-static int	charstr(const u_char *rdata, const u_char *edata,
-			char **buf, size_t *buflen);
-static int	addname(const u_char *msg, size_t msglen,
-			const u_char **p, const char *origin,
-			char **buf, size_t *buflen);
-static void	addlen(size_t len, char **buf, size_t *buflen);
-static int	addstr(const char *src, size_t len,
-		       char **buf, size_t *buflen);
-static int	addtab(size_t len, size_t target, int spaced,
-		       char **buf, size_t *buflen);
-
-/* Macros. */
-
-#define	T(x) \
-	do { \
-		if ((x) < 0) \
-			return (-1); \
-	} while (0)
-
-/* Public. */
-
-/*
- * int
- * ns_sprintrr(handle, rr, name_ctx, origin, buf, buflen)
- *	Convert an RR to presentation format.
- * return:
- *	Number of characters written to buf, or -1 (check errno).
- */
-int
-ns_sprintrr(const ns_msg *handle, const ns_rr *rr,
-	    const char *name_ctx, const char *origin,
-	    char *buf, size_t buflen)
-{
-	int n;
-
-	n = ns_sprintrrf(ns_msg_base(*handle), ns_msg_size(*handle),
-			 ns_rr_name(*rr), ns_rr_class(*rr), ns_rr_type(*rr),
-			 ns_rr_ttl(*rr), ns_rr_rdata(*rr), ns_rr_rdlen(*rr),
-			 name_ctx, origin, buf, buflen);
-	return (n);
-}
-
-/*
- * int
- * ns_sprintrrf(msg, msglen, name, class, type, ttl, rdata, rdlen,
- *	       name_ctx, origin, buf, buflen)
- *	Convert the fields of an RR into presentation format.
- * return:
- *	Number of characters written to buf, or -1 (check errno).
- */
-int
-ns_sprintrrf(const u_char *msg, size_t msglen,
-	    const char *name, ns_class class, ns_type type,
-	    u_long ttl, const u_char *rdata, size_t rdlen,
-	    const char *name_ctx, const char *origin,
-	    char *buf, size_t buflen)
-{
-	const char *obuf = buf;
-	const u_char *edata = rdata + rdlen;
-	int spaced = 0;
-
-	const char *comment;
-	char tmp[100];
-	int len, x;
-
-	/*
-	 * Owner.
-	 */
-	if (name_ctx != NULL && strcasecmp(name_ctx, name) == 0) {
-		T(addstr("\t\t\t", 3, &buf, &buflen));
-	} else {
-		len = prune_origin(name, origin);
-		if (len == 0) {
-			T(addstr("@\t\t\t", 4, &buf, &buflen));
-		} else {
-			T(addstr(name, len, &buf, &buflen));
-			/* Origin not used and no trailing dot? */
-			if ((!origin || !origin[0] || name[len] == '\0') &&
-			    name[len - 1] != '.') {
-				T(addstr(".", 1, &buf, &buflen));
-				len++;
-			}
-			T(spaced = addtab(len, 24, spaced, &buf, &buflen));
-		}
-	}
-
-	/*
-	 * TTL, Class, Type.
-	 */
-	T(x = ns_format_ttl(ttl, buf, buflen));
-	addlen(x, &buf, &buflen);
-	len = SPRINTF((tmp, " %s %s", p_class(class), p_type(type)));
-	T(addstr(tmp, len, &buf, &buflen));
-	T(spaced = addtab(x + len, 16, spaced, &buf, &buflen));
-
-	/*
-	 * RData.
-	 */
-	switch (type) {
-	case ns_t_a:
-		if (rdlen != NS_INADDRSZ)
-			goto formerr;
-		(void) inet_ntop(AF_INET, rdata, buf, buflen);
-		addlen(strlen(buf), &buf, &buflen);
-		break;
-
-	case ns_t_cname:
-	case ns_t_mb:
-	case ns_t_mg:
-	case ns_t_mr:
-	case ns_t_ns:
-	case ns_t_ptr:
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-		break;
-
-	case ns_t_hinfo:
-	case ns_t_isdn:
-		/* First word. */
-		T(len = charstr(rdata, edata, &buf, &buflen));
-		if (len == 0)
-			goto formerr;
-		rdata += len;
-		T(addstr(" ", 1, &buf, &buflen));
-
-		/* Second word. */
-		T(len = charstr(rdata, edata, &buf, &buflen));
-		if (len == 0)
-			goto formerr;
-		rdata += len;
-		break;
-
-	case ns_t_soa: {
-		u_long t;
-
-		/* Server name. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-		T(addstr(" ", 1, &buf, &buflen));
-
-		/* Administrator name. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-		T(addstr(" (\n", 3, &buf, &buflen));
-		spaced = 0;
-
-		if ((edata - rdata) != 5*NS_INT32SZ)
-			goto formerr;
-
-		/* Serial number. */
-		t = ns_get32(rdata);  rdata += NS_INT32SZ;
-		T(addstr("\t\t\t\t\t", 5, &buf, &buflen));
-		len = SPRINTF((tmp, "%lu", t));
-		T(addstr(tmp, len, &buf, &buflen));
-		T(spaced = addtab(len, 16, spaced, &buf, &buflen));
-		T(addstr("; serial\n", 9, &buf, &buflen));
-		spaced = 0;
-
-		/* Refresh interval. */
-		t = ns_get32(rdata);  rdata += NS_INT32SZ;
-		T(addstr("\t\t\t\t\t", 5, &buf, &buflen));
-		T(len = ns_format_ttl(t, buf, buflen));
-		addlen(len, &buf, &buflen);
-		T(spaced = addtab(len, 16, spaced, &buf, &buflen));
-		T(addstr("; refresh\n", 10, &buf, &buflen));
-		spaced = 0;
-
-		/* Retry interval. */
-		t = ns_get32(rdata);  rdata += NS_INT32SZ;
-		T(addstr("\t\t\t\t\t", 5, &buf, &buflen));
-		T(len = ns_format_ttl(t, buf, buflen));
-		addlen(len, &buf, &buflen);
-		T(spaced = addtab(len, 16, spaced, &buf, &buflen));
-		T(addstr("; retry\n", 8, &buf, &buflen));
-		spaced = 0;
-
-		/* Expiry. */
-		t = ns_get32(rdata);  rdata += NS_INT32SZ;
-		T(addstr("\t\t\t\t\t", 5, &buf, &buflen));
-		T(len = ns_format_ttl(t, buf, buflen));
-		addlen(len, &buf, &buflen);
-		T(spaced = addtab(len, 16, spaced, &buf, &buflen));
-		T(addstr("; expiry\n", 9, &buf, &buflen));
-		spaced = 0;
-
-		/* Minimum TTL. */
-		t = ns_get32(rdata);  rdata += NS_INT32SZ;
-		T(addstr("\t\t\t\t\t", 5, &buf, &buflen));
-		T(len = ns_format_ttl(t, buf, buflen));
-		addlen(len, &buf, &buflen);
-		T(addstr(" )", 2, &buf, &buflen));
-		T(spaced = addtab(len, 16, spaced, &buf, &buflen));
-		T(addstr("; minimum\n", 10, &buf, &buflen));
-
-		break;
-	    }
-
-	case ns_t_mx:
-	case ns_t_afsdb:
-	case ns_t_rt: {
-		u_int t;
-
-		if (rdlen < NS_INT16SZ)
-			goto formerr;
-
-		/* Priority. */
-		t = ns_get16(rdata);
-		rdata += NS_INT16SZ;
-		len = SPRINTF((tmp, "%u ", t));
-		T(addstr(tmp, len, &buf, &buflen));
-
-		/* Target. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-
-		break;
-	    }
-
-	case ns_t_px: {
-		u_int t;
-
-		if (rdlen < NS_INT16SZ)
-			goto formerr;
-
-		/* Priority. */
-		t = ns_get16(rdata);
-		rdata += NS_INT16SZ;
-		len = SPRINTF((tmp, "%u ", t));
-		T(addstr(tmp, len, &buf, &buflen));
-
-		/* Name1. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-		T(addstr(" ", 1, &buf, &buflen));
-
-		/* Name2. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-
-		break;
-	    }
-
-	case ns_t_x25:
-		T(len = charstr(rdata, edata, &buf, &buflen));
-		if (len == 0)
-			goto formerr;
-		rdata += len;
-		break;
-
-	case ns_t_txt:
-		while (rdata < edata) {
-			T(len = charstr(rdata, edata, &buf, &buflen));
-			if (len == 0)
-				goto formerr;
-			rdata += len;
-			if (rdata < edata)
-				T(addstr(" ", 1, &buf, &buflen));
-		}
-		break;
-
-	case ns_t_nsap: {
-		char t[255*3];
-
-		(void) inet_nsap_ntoa(rdlen, rdata, t);
-		T(addstr(t, strlen(t), &buf, &buflen));
-		break;
-	    }
-
-	case ns_t_aaaa:
-		if (rdlen != NS_IN6ADDRSZ)
-			goto formerr;
-		(void) inet_ntop(AF_INET6, rdata, buf, buflen);
-		addlen(strlen(buf), &buf, &buflen);
-		break;
-
-	case ns_t_loc: {
-		char t[255];
-
-		/* XXX protocol format checking? */
-		(void) loc_ntoa(rdata, t);
-		T(addstr(t, strlen(t), &buf, &buflen));
-		break;
-	    }
-
-	case ns_t_naptr: {
-		u_int order, preference;
-		char t[50];
-
-		if (rdlen < 2*NS_INT16SZ)
-			goto formerr;
-
-		/* Order, Precedence. */
-		order = ns_get16(rdata);	rdata += NS_INT16SZ;
-		preference = ns_get16(rdata);	rdata += NS_INT16SZ;
-		len = SPRINTF((t, "%u %u ", order, preference));
-		T(addstr(t, len, &buf, &buflen));
-
-		/* Flags. */
-		T(len = charstr(rdata, edata, &buf, &buflen));
-		if (len == 0)
-			goto formerr;
-		rdata += len;
-		T(addstr(" ", 1, &buf, &buflen));
-
-		/* Service. */
-		T(len = charstr(rdata, edata, &buf, &buflen));
-		if (len == 0)
-			goto formerr;
-		rdata += len;
-		T(addstr(" ", 1, &buf, &buflen));
-
-		/* Regexp. */
-		T(len = charstr(rdata, edata, &buf, &buflen));
-		if (len < 0)
-			return (-1);
-		if (len == 0)
-			goto formerr;
-		rdata += len;
-		T(addstr(" ", 1, &buf, &buflen));
-
-		/* Server. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-		break;
-	    }
-
-	case ns_t_srv: {
-		u_int priority, weight, port;
-		char t[50];
-
-		if (rdlen < NS_INT16SZ*3)
-			goto formerr;
-
-		/* Priority, Weight, Port. */
-		priority = ns_get16(rdata);  rdata += NS_INT16SZ;
-		weight   = ns_get16(rdata);  rdata += NS_INT16SZ;
-		port     = ns_get16(rdata);  rdata += NS_INT16SZ;
-		len = SPRINTF((t, "%u %u %u ", priority, weight, port));
-		T(addstr(t, len, &buf, &buflen));
-
-		/* Server. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-		break;
-	    }
-
-	case ns_t_minfo:
-	case ns_t_rp:
-		/* Name1. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-		T(addstr(" ", 1, &buf, &buflen));
-
-		/* Name2. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-
-		break;
-
-	case ns_t_wks: {
-		int n, lcnt;
-
-		if (rdlen < NS_INT32SZ + 1)
-			goto formerr;
-
-		/* Address. */
-		(void) inet_ntop(AF_INET, rdata, buf, buflen);
-		addlen(strlen(buf), &buf, &buflen);
-		rdata += NS_INADDRSZ;
-
-		/* Protocol. */
-		len = SPRINTF((tmp, " %u ( ", *rdata));
-		T(addstr(tmp, len, &buf, &buflen));
-		rdata += NS_INT8SZ;
-
-		/* Bit map. */
-		n = 0;
-		lcnt = 0;
-		while (rdata < edata) {
-			u_int c = *rdata++;
-			do {
-				if (c & 0200) {
-					if (lcnt == 0) {
-						T(addstr("\n\t\t\t\t", 5,
-							 &buf, &buflen));
-						lcnt = 10;
-						spaced = 0;
-					}
-					len = SPRINTF((tmp, "%d ", n));
-					T(addstr(tmp, len, &buf, &buflen));
-					lcnt--;
-				}
-				c <<= 1;
-			} while (++n & 07);
-		}
-		T(addstr(")", 1, &buf, &buflen));
-
-		break;
-	    }
-
-	case ns_t_key: {
-		char base64_key[NS_MD5RSA_MAX_BASE64];
-		u_int keyflags, protocol, algorithm;
-		const char *leader;
-		int n;
-
-		if (rdlen < NS_INT16SZ + NS_INT8SZ + NS_INT8SZ)
-			goto formerr;
-
-		/* Key flags, Protocol, Algorithm. */
-		keyflags = ns_get16(rdata);  rdata += NS_INT16SZ;
-		protocol = *rdata++;
-		algorithm = *rdata++;
-		len = SPRINTF((tmp, "0x%04x %u %u",
-			       keyflags, protocol, algorithm));
-		T(addstr(tmp, len, &buf, &buflen));
-
-		/* Public key data. */
-		len = b64_ntop(rdata, edata - rdata,
-			       base64_key, sizeof base64_key);
-		if (len < 0)
-			goto formerr;
-		if (len > 15) {
-			T(addstr(" (", 2, &buf, &buflen));
-			leader = "\n\t\t";
-			spaced = 0;
-		} else
-			leader = " ";
-		for (n = 0; n < len; n += 48) {
-			T(addstr(leader, strlen(leader), &buf, &buflen));
-			T(addstr(base64_key + n, MIN(len - n, 48),
-				 &buf, &buflen));
-		}
-		if (len > 15)
-			T(addstr(" )", 2, &buf, &buflen));
-
-		break;
-	    }
-
-	case ns_t_sig: {
-		char base64_key[NS_MD5RSA_MAX_BASE64];
-		u_int type, algorithm, labels, footprint;
-		const char *leader;
-		u_long t;
-		int n;
-
-		if (rdlen < 22)
-			goto formerr;
-
-		/* Type covered, Algorithm, Label count, Original TTL. */
-	        type = ns_get16(rdata);  rdata += NS_INT16SZ;
-		algorithm = *rdata++;
-		labels = *rdata++;
-		t = ns_get32(rdata);  rdata += NS_INT32SZ;
-		len = SPRINTF((tmp, " %s %d %lu ",
-			       p_type(type), algorithm, t));
-		T(addstr(tmp, len, &buf, &buflen));
-		if (labels != (u_int)dn_count_labels(name))
-			goto formerr;
-
-		/* Signature expiry. */
-		t = ns_get32(rdata);  rdata += NS_INT32SZ;
-		len = SPRINTF((tmp, "%s ", p_secstodate(t)));
-		T(addstr(tmp, len, &buf, &buflen));
-
-		/* Time signed. */
-		t = ns_get32(rdata);  rdata += NS_INT32SZ;
-		len = SPRINTF((tmp, "%s ", p_secstodate(t)));
-		T(addstr(tmp, len, &buf, &buflen));
-
-		/* Signature Footprint. */
-		footprint = ns_get16(rdata);  rdata += NS_INT16SZ;
-		len = SPRINTF((tmp, "%u ", footprint));
-		T(addstr(tmp, len, &buf, &buflen));
-
-		/* Signer's name. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-
-		/* Signature. */
-		len = b64_ntop(rdata, edata - rdata,
-			       base64_key, sizeof base64_key);
-		if (len > 15) {
-			T(addstr(" (", 2, &buf, &buflen));
-			leader = "\n\t\t";
-			spaced = 0;
-		} else
-			leader = " ";
-		if (len < 0)
-			goto formerr;
-		for (n = 0; n < len; n += 48) {
-			T(addstr(leader, strlen(leader), &buf, &buflen));
-			T(addstr(base64_key + n, MIN(len - n, 48),
-				 &buf, &buflen));
-		}
-		if (len > 15)
-			T(addstr(" )", 2, &buf, &buflen));
-
-		break;
-	    }
-
-	case ns_t_nxt: {
-		int n, c;
-
-		/* Next domain name. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-
-		/* Type bit map. */
-		n = edata - rdata;
-		for (c = 0; c < n*8; c++)
-			if (NS_NXT_BIT_ISSET(c, rdata)) {
-				len = SPRINTF((tmp, " %s", p_type(c)));
-				T(addstr(tmp, len, &buf, &buflen));
-			}
-		break;
-	    }
-
-	default:
-		comment = "unknown RR type";
-		goto hexify;
-	}
-	return (buf - obuf);
- formerr:
-	comment = "RR format error";
- hexify: {
-	int n, m;
-	char *p;
-
-	len = SPRINTF((tmp, "\\#(\t\t; %s", comment));
-	T(addstr(tmp, len, &buf, &buflen));
-	while (rdata < edata) {
-		p = tmp;
-		p += SPRINTF((p, "\n\t"));
-		spaced = 0;
-		n = MIN(16, edata - rdata);
-		for (m = 0; m < n; m++)
-			p += SPRINTF((p, "%02x ", rdata[m]));
-		T(addstr(tmp, p - tmp, &buf, &buflen));
-		if (n < 16) {
-			T(addstr(")", 1, &buf, &buflen));
-			T(addtab(p - tmp + 1, 48, spaced, &buf, &buflen));
-		}
-		p = tmp;
-		p += SPRINTF((p, "; "));
-		for (m = 0; m < n; m++)
-			*p++ = (isascii(rdata[m]) && isprint(rdata[m]))
-				? rdata[m]
-				: '.';
-		T(addstr(tmp, p - tmp, &buf, &buflen));
-		rdata += n;
-	}
-	return (buf - obuf);
-    }
-}
-
-/* Private. */
-
-/*
- * size_t
- * prune_origin(name, origin)
- *	Find out if the name is at or under the current origin.
- * return:
- *	Number of characters in name before start of origin,
- *	or length of name if origin does not match.
- * notes:
- *	This function should share code with samedomain().
- */
-static size_t
-prune_origin(const char *name, const char *origin) {
-	const char *oname = name;
-
-	while (*name != '\0') {
-		if (origin != NULL && strcasecmp(name, origin) == 0)
-			return (name - oname - (name > oname));
-		while (*name != '\0') {
-			if (*name == '\\') {
-				name++;
-				/* XXX need to handle \nnn form. */
-				if (*name == '\0')
-					break;
-			} else if (*name == '.') {
-				name++;
-				break;
-			}
-			name++;
-		}
-	}
-	return (name - oname);
-}
-
-/*
- * int
- * charstr(rdata, edata, buf, buflen)
- *	Format a <character-string> into the presentation buffer.
- * return:
- *	Number of rdata octets consumed
- *	0 for protocol format error
- *	-1 for output buffer error
- * side effects:
- *	buffer is advanced on success.
- */
-static int
-charstr(const u_char *rdata, const u_char *edata, char **buf, size_t *buflen) {
-	const u_char *odata = rdata;
-	size_t save_buflen = *buflen;
-	char *save_buf = *buf;
-
-	if (addstr("\"", 1, buf, buflen) < 0)
-		goto enospc;
-	if (rdata < edata) {
-		int n = *rdata;
-
-		if (rdata + 1 + n <= edata) {
-			rdata++;
-			while (n-- > 0) {
-				if (strchr("\n\"\\", *rdata) != NULL)
-					if (addstr("\\", 1, buf, buflen) < 0)
-						goto enospc;
-				if (addstr((const char *)rdata, 1,
-					   buf, buflen) < 0)
-					goto enospc;
-				rdata++;
-			}
-		}
-	}
-	if (addstr("\"", 1, buf, buflen) < 0)
-		goto enospc;
-	return (rdata - odata);
- enospc:
-	errno = ENOSPC;
-	*buf = save_buf;
-	*buflen = save_buflen;
-	return (-1);
-}
-
-static int
-addname(const u_char *msg, size_t msglen,
-	const u_char **pp, const char *origin,
-	char **buf, size_t *buflen)
-{
-	size_t newlen, save_buflen = *buflen;
-	char *save_buf = *buf;
-	int n;
-
-	n = dn_expand(msg, msg + msglen, *pp, *buf, *buflen);
-	if (n < 0)
-		goto enospc;	/* Guess. */
-	newlen = prune_origin(*buf, origin);
-	if ((origin == NULL || origin[0] == '\0' || (*buf)[newlen] == '\0') &&
-	    (newlen == 0 || (*buf)[newlen - 1] != '.')) {
-		/* No trailing dot. */
-		if (newlen + 2 > *buflen)
-			goto enospc;	/* No room for ".\0". */
-		(*buf)[newlen++] = '.';
-		(*buf)[newlen] = '\0';
-	}
-	if (newlen == 0) {
-		/* Use "@" instead of name. */
-		if (newlen + 2 > *buflen)
-			goto enospc;        /* No room for "@\0". */
-		(*buf)[newlen++] = '@';
-		(*buf)[newlen] = '\0';
-	}
-	*pp += n;
-	addlen(newlen, buf, buflen);
-	**buf = '\0';
-	return (newlen);
- enospc:
-	errno = ENOSPC;
-	*buf = save_buf;
-	*buflen = save_buflen;
-	return (-1);
-}
-
-static void
-addlen(size_t len, char **buf, size_t *buflen) {
-	assert(len <= *buflen);
-	*buf += len;
-	*buflen -= len;
-}
-
-static int
-addstr(const char *src, size_t len, char **buf, size_t *buflen) {
-	if (len > *buflen) {
-		errno = ENOSPC;
-		return (-1);
-	}
-	memcpy(*buf, src, len);
-	addlen(len, buf, buflen);
-	**buf = '\0';
-	return (0);
-}
-
-static int
-addtab(size_t len, size_t target, int spaced, char **buf, size_t *buflen) {
-	size_t save_buflen = *buflen;
-	char *save_buf = *buf;
-	int t;
-
-	if (spaced || len >= target - 1) {
-		T(addstr("  ", 2, buf, buflen));
-		spaced = 1;
-	} else {
-		for (t = (target - len - 1) / 8; t >= 0; t--)
-			if (addstr("\t", 1, buf, buflen) < 0) {
-				*buflen = save_buflen;
-				*buf = save_buf;
-				return (-1);
-			}
-		spaced = 0;
-	}
-	return (spaced);
-}
diff --git a/cpukit/libnetworking/libc/ns_ttl.c b/cpukit/libnetworking/libc/ns_ttl.c
deleted file mode 100644
index 75093c1dbc..0000000000
--- a/cpukit/libnetworking/libc/ns_ttl.c
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#if !defined(__rtems__)
-#if !defined(LINT) && !defined(CODECENTER)
-static char rcsid[] = "$Id$";
-#endif /* not lint */
-#endif /* not rtems */
-
-/* Import. */
-
-#include <arpa/nameser.h>
-
-#include <ctype.h>
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-
-#define SPRINTF(x) ((size_t)sprintf x)
-
-/* Forward. */
-
-static int	fmt1(int t, char s, char **buf, size_t *buflen);
-
-/* Macros. */
-
-#define T(x) if ((x) < 0) return (-1); else (void)NULL
-
-/* Public. */
-
-int
-ns_format_ttl(u_long src, char *dst, size_t dstlen) {
-	char *odst = dst;
-	int secs, mins, hours, days, weeks, x;
-	char *p;
-
-	secs = src % 60;   src /= 60;
-	mins = src % 60;   src /= 60;
-	hours = src % 24;  src /= 24;
-	days = src % 7;    src /= 7;
-	weeks = src;       src = 0;
-
-	x = 0;
-	if (weeks) {
-		T(fmt1(weeks, 'W', &dst, &dstlen));
-		x++;
-	}
-	if (days) {
-		T(fmt1(days, 'D', &dst, &dstlen));
-		x++;
-	}
-	if (hours) {
-		T(fmt1(hours, 'H', &dst, &dstlen));
-		x++;
-	}
-	if (mins) {
-		T(fmt1(mins, 'M', &dst, &dstlen));
-		x++;
-	}
-	if (secs || !(weeks || days || hours || mins)) {
-		T(fmt1(secs, 'S', &dst, &dstlen));
-		x++;
-	}
-
-	if (x > 1) {
-		int ch;
-
-		for (p = odst; (ch = *p) != '\0'; p++)
-			if (isascii(ch) && isupper(ch))
-				*p = tolower(ch);
-	}
-
-	return (dst - odst);
-}
-
-int
-ns_parse_ttl(const char *src, u_long *dst) {
-	u_long ttl, tmp;
-	int ch, digits, dirty;
-
-	ttl = 0;
-	tmp = 0;
-	digits = 0;
-	dirty = 0;
-	while ((ch = *src++) != '\0') {
-		if (!isascii(ch) || !isprint(ch))
-			goto einval;
-		if (isdigit(ch)) {
-			tmp *= 10;
-			tmp += (ch - '0');
-			digits++;
-			continue;
-		}
-		if (digits == 0)
-			goto einval;
-		if (islower(ch))
-			ch = toupper(ch);
-		switch (ch) {
-		case 'W':  tmp *= 7;
-		case 'D':  tmp *= 24;
-		case 'H':  tmp *= 60;
-		case 'M':  tmp *= 60;
-		case 'S':  break;
-		default:   goto einval;
-		}
-		ttl += tmp;
-		tmp = 0;
-		digits = 0;
-		dirty = 1;
-	}
-	if (digits > 0) {
-		if (dirty)
-			goto einval;
-		else
-			ttl += tmp;
-	}
-	*dst = ttl;
-	return (0);
-
- einval:
-	errno = EINVAL;
-	return (-1);
-}
-
-/* Private. */
-
-static int
-fmt1(int t, char s, char **buf, size_t *buflen) {
-	char tmp[50];
-	size_t len;
-
-	len = SPRINTF((tmp, "%d%c", t, s));
-	if (len + 1 > *buflen)
-		return (-1);
-	strcpy(*buf, tmp);
-	*buf += len;
-	*buflen -= len;
-	return (0);
-}
diff --git a/cpukit/libnetworking/libc/nsap_addr.c b/cpukit/libnetworking/libc/nsap_addr.c
deleted file mode 100644
index a7af57a266..0000000000
--- a/cpukit/libnetworking/libc/nsap_addr.c
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (c) 1996, 1998 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$Id$";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-#include <ctype.h>
-#include <resolv.h>
-
-static char
-xtob(c)
-	register int c;
-{
-	return (c - (((c >= '0') && (c <= '9')) ? '0' : '7'));
-}
-
-u_int
-inet_nsap_addr(ascii, binary, maxlen)
-	const char *ascii;
-	u_char *binary;
-	int maxlen;
-{
-	u_char c, nib;
-	u_int len = 0;
-
-	while ((c = *ascii++) != '\0' && len < (u_int)maxlen) {
-		if (c == '.' || c == '+' || c == '/')
-			continue;
-		if (!isascii(c))
-			return (0);
-		if (islower(c))
-			c = toupper(c);
-		if (isxdigit(c)) {
-			nib = xtob(c);
-			c = *ascii++;
-			if (c != '\0') {
-				c = toupper(c);
-				if (isxdigit(c)) {
-					*binary++ = (nib << 4) | xtob(c);
-					len++;
-				} else
-					return (0);
-			}
-			else
-				return (0);
-		}
-		else
-			return (0);
-	}
-	return (len);
-}
-
-char *
-inet_nsap_ntoa(binlen, binary, ascii)
-	int binlen;
-	register const u_char *binary;
-	register char *ascii;
-{
-	register int nib;
-	int i;
-	static char tmpbuf[255*3];
-	char *start;
-
-	if (ascii)
-		start = ascii;
-	else {
-		ascii = tmpbuf;
-		start = tmpbuf;
-	}
-
-	if (binlen > 255)
-		binlen = 255;
-
-	for (i = 0; i < binlen; i++) {
-		nib = *binary >> 4;
-		*ascii++ = nib + (nib < 10 ? '0' : '7');
-		nib = *binary++ & 0x0f;
-		*ascii++ = nib + (nib < 10 ? '0' : '7');
-		if (((i % 2) == 0 && (i + 1) < binlen))
-			*ascii++ = '.';
-	}
-	*ascii = '\0';
-	return (start);
-}
diff --git a/cpukit/libnetworking/libc/rcmd.3 b/cpukit/libnetworking/libc/rcmd.3
deleted file mode 100644
index e25057fa4e..0000000000
--- a/cpukit/libnetworking/libc/rcmd.3
+++ /dev/null
@@ -1,204 +0,0 @@
-.\" Copyright (c) 1983, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"     From: @(#)rcmd.3	8.1 (Berkeley) 6/4/93
-.\"	$Id$
-.\"
-.Dd February 15, 1996
-.Dt RCMD 3
-.Os BSD 4.2
-.Sh NAME
-.Nm rcmd ,
-.Nm rresvport ,
-.Nm iruserok ,
-.Nm ruserok
-.Nd routines for returning a stream to a remote command
-.Sh SYNOPSIS
-.Fd #include <unistd.h>
-.Ft int
-.Fn rcmd "char **ahost" "int inport" "const char *locuser" "const char *remuser" "const char *cmd" "int *fd2p"
-.Ft int
-.Fn rresvport "int *port"
-.Ft int
-.Fn iruserok "u_long raddr" "int superuser" "const char *ruser" "const char *luser"
-.Ft int
-.Fn ruserok "const char *rhost" "int superuser" "const char *ruser" "const char *luser"
-.Sh DESCRIPTION
-The
-.Fn rcmd
-function
-is used by the super-user to execute a command on
-a remote machine using an authentication scheme based
-on reserved port numbers.
-The
-.Fn rresvport
-function
-returns a descriptor to a socket
-with an address in the privileged port space.
-The
-.Fn ruserok
-function
-is used by servers
-to authenticate clients requesting service with
-.Fn rcmd .
-All three functions are present in the same file and are used
-by the
-.Xr rshd 8
-server (among others).
-.Pp
-The
-.Fn rcmd
-function
-looks up the host
-.Fa *ahost
-using
-.Xr gethostbyname 3 ,
-returning \-1 if the host does not exist.
-Otherwise
-.Fa *ahost
-is set to the standard name of the host
-and a connection is established to a server
-residing at the well-known Internet port
-.Fa inport .
-.Pp
-If the connection succeeds,
-a socket in the Internet domain of type
-.Dv SOCK_STREAM
-is returned to the caller, and given to the remote
-command as 
-.Em stdin
-and
-.Em stdout .
-If
-.Fa fd2p
-is non-zero, then an auxiliary channel to a control
-process will be set up, and a descriptor for it will be placed
-in
-.Fa *fd2p .
-The control process will return diagnostic
-output from the command (unit 2) on this channel, and will also
-accept bytes on this channel as being
-.Tn UNIX
-signal numbers, to be
-forwarded to the process group of the command.
-If
-.Fa fd2p
-is 0, then the 
-.Em stderr
-(unit 2 of the remote
-command) will be made the same as the 
-.Em stdout
-and no
-provision is made for sending arbitrary signals to the remote process,
-although you may be able to get its attention by using out-of-band data.
-.Pp
-The protocol is described in detail in
-.Xr rshd 8 .
-.Pp
-The
-.Fn rresvport
-function is used to obtain a socket with a privileged
-address bound to it.  This socket is suitable for use
-by 
-.Fn rcmd
-and several other functions.  Privileged Internet ports are those
-in the range 0 to 1023.  Only the super-user
-is allowed to bind an address of this sort to a socket.
-.Pp
-The
-.Fn iruserok
-and
-.Fn ruserok
-functions take a remote host's IP address or name, as returned by the
-.Xr gethostbyname 3
-routines, two user names and a flag indicating whether the local user's
-name is that of the super-user.
-Then, if the user is
-.Em NOT
-the super-user, it checks the
-.Pa /etc/hosts.equiv
-file.
-If that lookup is not done, or is unsuccessful, the
-.Pa .rhosts
-in the local user's home directory is checked to see if the request for
-service is allowed.
-.Pp
-If this file does not exist, is not a regular file, is owned by anyone
-other than the user or the super-user, or is writable by anyone other
-than the owner, the check automatically fails.
-Zero is returned if the machine name is listed in the
-.Dq Pa hosts.equiv
-file, or the host and remote user name are found in the
-.Dq Pa .rhosts
-file; otherwise
-.Fn iruserok
-and
-.Fn ruserok
-return \-1.
-If the local domain (as obtained from
-.Xr gethostname 3 )
-is the same as the remote domain, only the machine name need be specified.
-.Pp
-The
-.Fn iruserok
-function is strongly preferred for security reasons.
-It requires trusting the local DNS at most, while the
-.Fn ruserok
-function requires trusting the entire DNS, which can be spoofed.
-.Sh DIAGNOSTICS
-The
-.Fn rcmd
-function
-returns a valid socket descriptor on success.
-It returns \-1 on error and prints a diagnostic message on the standard error.
-.Pp
-The
-.Fn rresvport
-function
-returns a valid, bound socket descriptor on success.
-It returns \-1 on error with the global value
-.Va errno
-set according to the reason for failure.
-The error code
-.Dv EAGAIN
-is overloaded to mean ``All network ports in use.''
-.Sh SEE ALSO
-.Xr rlogin 1 ,
-.Xr rsh 1 ,
-.Xr intro 2 ,
-.Xr rexec 3 ,
-.Xr rexecd 8 ,
-.Xr rlogind 8 ,
-.Xr rshd 8
-.Sh HISTORY
-These
-functions appeared in 
-.Bx 4.2 .
diff --git a/cpukit/libnetworking/libc/rcmd.c b/cpukit/libnetworking/libc/rcmd.c
deleted file mode 100644
index 32e4953e9b..0000000000
--- a/cpukit/libnetworking/libc/rcmd.c
+++ /dev/null
@@ -1,520 +0,0 @@
-/*
- * Copyright (c) 1983, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *  $Id$
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)rcmd.c	8.3 (Berkeley) 3/26/94";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include <signal.h>
-#include <fcntl.h>
-#include <netdb.h>
-#include <unistd.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <string.h>
-#ifdef YP
-#include <rpc/rpc.h>
-#include <rpcsvc/yp_prot.h>
-#include <rpcsvc/ypclnt.h>
-#endif
-
-extern int innetgr __P(( const char *, const char *, const char *, const char * ));
-
-#define max(a, b)	((a > b) ? a : b)
-
-int	__ivaliduser __P((FILE *, u_long, const char *, const char *));
-static int __icheckhost __P((u_long, char *));
-
-int
-rcmd(ahost, rport, locuser, remuser, cmd, fd2p)
-	char **ahost;
-	u_short rport;
-	const char *locuser, *remuser, *cmd;
-	int *fd2p;
-{
-	struct hostent *hp;
-	struct sockaddr_in sin, from;
-	fd_set reads;
-	long oldmask;
-	pid_t pid;
-	int s, lport, timo;
-	char c;
-
-	pid = getpid();
-	hp = gethostbyname(*ahost);
-	if (hp == NULL) {
-		herror(*ahost);
-		return (-1);
-	}
-	*ahost = hp->h_name;
-	oldmask = sigblock(sigmask(SIGURG));
-	for (timo = 1, lport = IPPORT_RESERVED - 1;;) {
-		s = rresvport(&lport);
-		if (s < 0) {
-			if (errno == EAGAIN)
-				(void)fprintf(stderr,
-				    "rcmd: socket: All ports in use\n");
-			else
-				(void)fprintf(stderr, "rcmd: socket: %s\n",
-				    strerror(errno));
-			sigsetmask(oldmask);
-			return (-1);
-		}
-		fcntl(s, F_SETOWN, pid);
-		bzero(&sin, sizeof sin);
-		sin.sin_len = sizeof(struct sockaddr_in);
-		sin.sin_family = hp->h_addrtype;
-		sin.sin_port = rport;
-		bcopy(hp->h_addr_list[0], &sin.sin_addr, MIN(hp->h_length, sizeof sin.sin_addr));
-		if (connect(s, (struct sockaddr *)&sin, sizeof(sin)) >= 0)
-			break;
-		(void)close(s);
-		if (errno == EADDRINUSE) {
-			lport--;
-			continue;
-		}
-		if (errno == ECONNREFUSED && timo <= 16) {
-			(void)sleep(timo);
-			timo *= 2;
-			continue;
-		}
-		if (hp->h_addr_list[1] != NULL) {
-			int oerrno = errno;
-
-			(void)fprintf(stderr, "connect to address %s: ",
-			    inet_ntoa(sin.sin_addr));
-			errno = oerrno;
-			perror(0);
-			hp->h_addr_list++;
-			bcopy(hp->h_addr_list[0], &sin.sin_addr, MIN(hp->h_length, sizeof sin.sin_addr));
-			(void)fprintf(stderr, "Trying %s...\n",
-			    inet_ntoa(sin.sin_addr));
-			continue;
-		}
-		(void)fprintf(stderr, "%s: %s\n", hp->h_name, strerror(errno));
-		sigsetmask(oldmask);
-		return (-1);
-	}
-	lport--;
-	if (fd2p == 0) {
-		write(s, "", 1);
-		lport = 0;
-	} else {
-		char num[8];
-		int s2 = rresvport(&lport), s3;
-		int len = sizeof(from);
-		int nfds;
-
-		if (s2 < 0)
-			goto bad;
-		listen(s2, 1);
-		(void)snprintf(num, sizeof(num), "%d", lport);
-		if (write(s, num, strlen(num)+1) != strlen(num)+1) {
-			(void)fprintf(stderr,
-			    "rcmd: write (setting up stderr): %s\n",
-			    strerror(errno));
-			(void)close(s2);
-			goto bad;
-		}
-		nfds = max(s, s2)+1;
-		if(nfds > FD_SETSIZE) {
-			fprintf(stderr, "rcmd: too many files\n");
-			(void)close(s2);
-			goto bad;
-		}
-again:
-		FD_ZERO(&reads);
-		FD_SET(s, &reads);
-		FD_SET(s2, &reads);
-		errno = 0;
-		if (select(nfds, &reads, 0, 0, 0) < 1 || !FD_ISSET(s2, &reads)){
-			if (errno != 0)
-				(void)fprintf(stderr,
-				    "rcmd: select (setting up stderr): %s\n",
-				    strerror(errno));
-			else
-				(void)fprintf(stderr,
-				"select: protocol failure in circuit setup\n");
-			(void)close(s2);
-			goto bad;
-		}
-		s3 = accept(s2, (struct sockaddr *)&from, &len);
-		/*
-		 * XXX careful for ftp bounce attacks. If discovered, shut them
-		 * down and check for the real auxiliary channel to connect.
-		 */
-		if (from.sin_family == AF_INET && from.sin_port == htons(20)) {
-			close(s3);
-			goto again;
-		}
-		(void)close(s2);
-		if (s3 < 0) {
-			(void)fprintf(stderr,
-			    "rcmd: accept: %s\n", strerror(errno));
-			lport = 0;
-			goto bad;
-		}
-		*fd2p = s3;
-		from.sin_port = ntohs((u_short)from.sin_port);
-		if (from.sin_family != AF_INET ||
-		    from.sin_port >= IPPORT_RESERVED ||
-		    from.sin_port < IPPORT_RESERVED / 2) {
-			(void)fprintf(stderr,
-			    "socket: protocol failure in circuit setup.\n");
-			goto bad2;
-		}
-	}
-	(void)write(s, locuser, strlen(locuser)+1);
-	(void)write(s, remuser, strlen(remuser)+1);
-	(void)write(s, cmd, strlen(cmd)+1);
-	if (read(s, &c, 1) != 1) {
-		(void)fprintf(stderr,
-		    "rcmd: %s: %s\n", *ahost, strerror(errno));
-		goto bad2;
-	}
-	if (c != 0) {
-		while (read(s, &c, 1) == 1) {
-			(void)write(STDERR_FILENO, &c, 1);
-			if (c == '\n')
-				break;
-		}
-		goto bad2;
-	}
-	sigsetmask(oldmask);
-	return (s);
-bad2:
-	if (lport)
-		(void)close(*fd2p);
-bad:
-	(void)close(s);
-	sigsetmask(oldmask);
-	return (-1);
-}
-
-int
-rresvport(alport)
-	int *alport;
-{
-	struct sockaddr_in sin;
-	int s;
-
-	bzero(&sin, sizeof sin);
-	sin.sin_len = sizeof(struct sockaddr_in);
-	sin.sin_family = AF_INET;
-	sin.sin_addr.s_addr = INADDR_ANY;
-	s = socket(AF_INET, SOCK_STREAM, 0);
-	if (s < 0)
-		return (-1);
-#if 0 /* compat_exact_traditional_rresvport_semantics */
-	sin.sin_port = htons((u_short)*alport);
-	if (bind(s, (struct sockaddr *)&sin, sizeof(sin)) >= 0)
-		return (s);
-	if (errno != EADDRINUSE) {
-		(void)close(s);
-		return (-1);
-	}
-#endif
-	sin.sin_port = 0;
-	if (bindresvport(s, &sin) == -1) {
-		(void)close(s);
-		return (-1);
-	}
-	*alport = (int)ntohs(sin.sin_port);
-	return (s);
-}
-
-int	__check_rhosts_file = 1;
-char	*__rcmd_errstr;
-
-int
-ruserok(rhost, superuser, ruser, luser)
-	const char *rhost, *ruser, *luser;
-	int superuser;
-{
-	struct hostent *hp;
-	u_long addr;
-	char **ap;
-
-	if ((hp = gethostbyname(rhost)) == NULL)
-		return (-1);
-	for (ap = hp->h_addr_list; *ap; ++ap) {
-		bcopy(*ap, &addr, sizeof(addr));
-		if (iruserok(addr, superuser, ruser, luser) == 0)
-			return (0);
-	}
-	return (-1);
-}
-
-/*
- * New .rhosts strategy: We are passed an ip address. We spin through
- * hosts.equiv and .rhosts looking for a match. When the .rhosts only
- * has ip addresses, we don't have to trust a nameserver.  When it
- * contains hostnames, we spin through the list of addresses the nameserver
- * gives us and look for a match.
- *
- * Returns 0 if ok, -1 if not ok.
- */
-int
-iruserok(raddr, superuser, ruser, luser)
-	u_long raddr;
-	int superuser;
-	const char *ruser, *luser;
-{
-	register char *cp;
-	struct stat sbuf;
-	struct passwd *pwd;
-	FILE *hostf;
-	uid_t uid;
-	int first;
-	char pbuf[MAXPATHLEN];
-
-	first = 1;
-	hostf = superuser ? NULL : fopen(_PATH_HEQUIV, "r");
-again:
-	if (hostf) {
-		if (__ivaliduser(hostf, raddr, luser, ruser) == 0) {
-			(void)fclose(hostf);
-			return (0);
-		}
-		(void)fclose(hostf);
-	}
-	if (first == 1 && (__check_rhosts_file || superuser)) {
-		first = 0;
-		if ((pwd = getpwnam(luser)) == NULL)
-			return (-1);
-		(void)strcpy(pbuf, pwd->pw_dir);
-		(void)strcat(pbuf, "/.rhosts");
-
-		/*
-		 * Change effective uid while opening .rhosts.  If root and
-		 * reading an NFS mounted file system, can't read files that
-		 * are protected read/write owner only.
-		 */
-		uid = geteuid();
-		(void)seteuid(pwd->pw_uid);
-		hostf = fopen(pbuf, "r");
-		(void)seteuid(uid);
-
-		if (hostf == NULL)
-			return (-1);
-		/*
-		 * If not a regular file, or is owned by someone other than
-		 * user or root or if writeable by anyone but the owner, quit.
-		 */
-		cp = NULL;
-		if (lstat(pbuf, &sbuf) < 0)
-			cp = ".rhosts lstat failed";
-		else if (!S_ISREG(sbuf.st_mode))
-			cp = ".rhosts not regular file";
-		else if (fstat(fileno(hostf), &sbuf) < 0)
-			cp = ".rhosts fstat failed";
-		else if (sbuf.st_uid && sbuf.st_uid != pwd->pw_uid)
-			cp = "bad .rhosts owner";
-		else if (sbuf.st_mode & (S_IWGRP|S_IWOTH))
-			cp = ".rhosts writeable by other than owner";
-		/* If there were any problems, quit. */
-		if (cp) {
-			__rcmd_errstr = cp;
-			(void)fclose(hostf);
-			return (-1);
-		}
-		goto again;
-	}
-	return (-1);
-}
-
-/*
- * XXX
- * Don't make static, used by lpd(8).
- *
- * Returns 0 if ok, -1 if not ok.
- */
-int
-__ivaliduser(hostf, raddr, luser, ruser)
-	FILE *hostf;
-	u_long raddr;
-	const char *luser, *ruser;
-{
-	register char *user, *p;
-	int ch;
-	char buf[MAXHOSTNAMELEN + 128];		/* host + login */
-	char hname[MAXHOSTNAMELEN];
-	struct hostent *hp;
-	/* Presumed guilty until proven innocent. */
-	int userok = 0, hostok = 0;
-#ifdef YP
-	char *ypdomain;
-
-	if (yp_get_default_domain(&ypdomain))
-		ypdomain = NULL;
-#else
-#define	ypdomain NULL
-#endif
-	/* We need to get the damn hostname back for netgroup matching. */
-	if ((hp = gethostbyaddr((char *)&raddr, sizeof(u_long),
-							AF_INET)) == NULL)
-		return (-1);
-	strncpy(hname, hp->h_name, sizeof(hname));
-	hname[sizeof(hname) - 1] = '\0';
-
-	while (fgets(buf, sizeof(buf), hostf)) {
-		p = buf;
-		/* Skip lines that are too long. */
-		if (strchr(p, '\n') == NULL) {
-			while ((ch = getc(hostf)) != '\n' && ch != EOF);
-			continue;
-		}
-		if (*p == '\n' || *p == '#') {
-			/* comment... */
-			continue;
-		}
-		while (*p != '\n' && *p != ' ' && *p != '\t' && *p != '\0') {
-			*p = isupper(*p) ? tolower(*p) : *p;
-			p++;
-		}
-		if (*p == ' ' || *p == '\t') {
-			*p++ = '\0';
-			while (*p == ' ' || *p == '\t')
-				p++;
-			user = p;
-			while (*p != '\n' && *p != ' ' &&
-			    *p != '\t' && *p != '\0')
-				p++;
-		} else
-			user = p;
-		*p = '\0';
-		/*
-		 * Do +/- and +@/-@ checking. This looks really nasty,
-		 * but it matches SunOS's behavior so far as I can tell.
-		 */
-		switch(buf[0]) {
-		case '+':
-			if (!buf[1]) {     /* '+' matches all hosts */
-				hostok = 1;
-				break;
-			}
-			if (buf[1] == '@')  /* match a host by netgroup */
-				hostok = innetgr((char *)&buf[2],
-					(char *)&hname, NULL, ypdomain);
-			else		/* match a host by addr */
-				hostok = __icheckhost(raddr,(char *)&buf[1]);
-			break;
-		case '-':     /* reject '-' hosts and all their users */
-			if (buf[1] == '@') {
-				if (innetgr((char *)&buf[2],
-					      (char *)&hname, NULL, ypdomain))
-					return(-1);
-			} else {
-				if (__icheckhost(raddr,(char *)&buf[1]))
-					return(-1);
-			}
-			break;
-		default:  /* if no '+' or '-', do a simple match */
-			hostok = __icheckhost(raddr, buf);
-			break;
-		}
-		switch(*user) {
-		case '+':
-			if (!*(user+1)) {      /* '+' matches all users */
-				userok = 1;
-				break;
-			}
-			if (*(user+1) == '@')  /* match a user by netgroup */
-				userok = innetgr(user+2, NULL, ruser, ypdomain);
-			else	   /* match a user by direct specification */
-				userok = !(strcmp(ruser, user+1));
-			break;
-		case '-': 		/* if we matched a hostname, */
-			if (hostok) {   /* check for user field rejections */
-				if (!*(user+1))
-					return(-1);
-				if (*(user+1) == '@') {
-					if (innetgr(user+2, NULL,
-							ruser, ypdomain))
-						return(-1);
-				} else {
-					if (!strcmp(ruser, user+1))
-						return(-1);
-				}
-			}
-			break;
-		default:	/* no rejections: try to match the user */
-			if (hostok)
-				userok = !(strcmp(ruser,*user ? user : luser));
-			break;
-		}
-		if (hostok && userok)
-			return(0);
-	}
-	return (-1);
-}
-
-/*
- * Returns "true" if match, 0 if no match.
- */
-static int
-__icheckhost(raddr, lhost)
-	u_long raddr;
-	register char *lhost;
-{
-	register struct hostent *hp;
-	register u_long laddr;
-	register char **pp;
-
-	/* Try for raw ip address first. */
-	if (isdigit(*lhost) && (long)(laddr = inet_addr(lhost)) != -1)
-		return (raddr == laddr);
-
-	/* Better be a hostname. */
-	if ((hp = gethostbyname(lhost)) == NULL)
-		return (0);
-
-	/* Spin through ip addresses. */
-	for (pp = hp->h_addr_list; *pp; ++pp)
-		if (!bcmp(&raddr, *pp, sizeof(u_long)))
-			return (1);
-
-	/* No match. */
-	return (0);
-}
diff --git a/cpukit/libnetworking/libc/recv.c b/cpukit/libnetworking/libc/recv.c
deleted file mode 100644
index a842244caf..0000000000
--- a/cpukit/libnetworking/libc/recv.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *  $Id$
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)recv.c	8.2 (Berkeley) 2/21/94";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <stddef.h>
-
-ssize_t
-recv(s, buf, len, flags)
-	int s, flags;
-	size_t len;
-	void *buf;
-{
-	return (recvfrom(s, buf, len, flags, NULL, 0));
-}
diff --git a/cpukit/libnetworking/libc/res_comp.c b/cpukit/libnetworking/libc/res_comp.c
deleted file mode 100644
index 93043276f2..0000000000
--- a/cpukit/libnetworking/libc/res_comp.c
+++ /dev/null
@@ -1,258 +0,0 @@
-/*
- * Copyright (c) 1985, 1993
- *    The Regents of the University of California.  All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- * 	This product includes software developed by the University of
- * 	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-/*
- * Portions Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)res_comp.c	8.1 (Berkeley) 6/4/93";
-static char orig_rcsid[] = "From: Id: res_comp.c,v 8.11 1997/05/21 19:31:04 halley Exp $";
-static char rcsid[] = "$Id$";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <ctype.h>
-#include <resolv.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-
-#define BIND_4_COMPAT
-
-/*
- * Expand compressed domain name 'comp_dn' to full domain name.
- * 'msg' is a pointer to the begining of the message,
- * 'eomorig' points to the first location after the message,
- * 'exp_dn' is a pointer to a buffer of size 'length' for the result.
- * Return size of compressed name or -1 if there was an error.
- */
-int
-dn_expand(const u_char *msg, const u_char *eom, const u_char *src,
-	  char *dst, int dstsiz)
-{
-	int n = ns_name_uncompress(msg, eom, src, dst, (size_t)dstsiz);
-
-	if (n > 0 && dst[0] == '.')
-		dst[0] = '\0';
-	return (n);
-}
-
-/*
- * Pack domain name 'exp_dn' in presentation form into 'comp_dn'.
- * Return the size of the compressed name or -1.
- * 'length' is the size of the array pointed to by 'comp_dn'.
- */
-int
-dn_comp(const char *src, u_char *dst, int dstsiz,
-	u_char **dnptrs, u_char **lastdnptr)
-{
-	return (ns_name_compress(src, dst, (size_t)dstsiz,
-				 (const u_char **)dnptrs,
-				 (const u_char **)lastdnptr));
-}
-
-/*
- * Skip over a compressed domain name. Return the size or -1.
- */
-int
-dn_skipname(const u_char *ptr, const u_char *eom) {
-	const u_char *saveptr = ptr;
-
-	if (ns_name_skip(&ptr, eom) == -1)
-		return (-1);
-	return (ptr - saveptr);
-}
-
-/*
- * Verify that a domain name uses an acceptable character set.
- */
-
-/*
- * Note the conspicuous absence of ctype macros in these definitions.  On
- * non-ASCII hosts, we can't depend on string literals or ctype macros to
- * tell us anything about network-format data.  The rest of the BIND system
- * is not careful about this, but for some reason, we're doing it right here.
- */
-#define PERIOD 0x2e
-#define	hyphenchar(c) ((c) == 0x2d)
-#define bslashchar(c) ((c) == 0x5c)
-#define periodchar(c) ((c) == PERIOD)
-#define asterchar(c) ((c) == 0x2a)
-#define alphachar(c) (((c) >= 0x41 && (c) <= 0x5a) \
-		   || ((c) >= 0x61 && (c) <= 0x7a))
-#define digitchar(c) ((c) >= 0x30 && (c) <= 0x39)
-
-#define borderchar(c) (alphachar(c) || digitchar(c))
-#define middlechar(c) (borderchar(c) || hyphenchar(c))
-#define	domainchar(c) ((c) > 0x20 && (c) < 0x7f)
-
-int
-res_hnok(dn)
-	const char *dn;
-{
-	int ppch = '\0', pch = PERIOD, ch = *dn++;
-
-	while (ch != '\0') {
-		int nch = *dn++;
-
-		if (periodchar(ch)) {
-			(void)NULL;
-		} else if (periodchar(pch)) {
-			if (!borderchar(ch))
-				return (0);
-		} else if (periodchar(nch) || nch == '\0') {
-			if (!borderchar(ch))
-				return (0);
-		} else {
-			if (!middlechar(ch))
-				return (0);
-		}
-		ppch = pch, pch = ch, ch = nch;
-	}
-	return (1);
-}
-
-/*
- * hostname-like (A, MX, WKS) owners can have "*" as their first label
- * but must otherwise be as a host name.
- */
-int
-res_ownok(dn)
-	const char *dn;
-{
-	if (asterchar(dn[0])) {
-		if (periodchar(dn[1]))
-			return (res_hnok(dn+2));
-		if (dn[1] == '\0')
-			return (1);
-	}
-	return (res_hnok(dn));
-}
-
-/*
- * SOA RNAMEs and RP RNAMEs can have any printable character in their first
- * label, but the rest of the name has to look like a host name.
- */
-int
-res_mailok(dn)
-	const char *dn;
-{
-	int ch, escaped = 0;
-
-	/* "." is a valid missing representation */
-	if (*dn == '\0')
-		return (1);
-
-	/* otherwise <label>.<hostname> */
-	while ((ch = *dn++) != '\0') {
-		if (!domainchar(ch))
-			return (0);
-		if (!escaped && periodchar(ch))
-			break;
-		if (escaped)
-			escaped = 0;
-		else if (bslashchar(ch))
-			escaped = 1;
-	}
-	if (periodchar(ch))
-		return (res_hnok(dn));
-	return (0);
-}
-
-/*
- * This function is quite liberal, since RFC 1034's character sets are only
- * recommendations.
- */
-int
-res_dnok(dn)
-	const char *dn;
-{
-	int ch;
-
-	while ((ch = *dn++) != '\0')
-		if (!domainchar(ch))
-			return (0);
-	return (1);
-}
-
-#ifdef BIND_4_COMPAT
-/*
- * This module must export the following externally-visible symbols:
- *    ___putlong
- *    ___putshort
- *    __getlong
- *    __getshort
- * Note that one _ comes from C and the others come from us.
- */
-void __putlong(u_int32_t src, u_char *dst) { ns_put32(src, dst); }
-void __putshort(u_int16_t src, u_char *dst) { ns_put16(src, dst); }
-u_int32_t _getlong(const u_char *src) { return (ns_get32(src)); }
-u_int16_t _getshort(const u_char *src) { return (ns_get16(src)); }
-#endif /*BIND_4_COMPAT*/
diff --git a/cpukit/libnetworking/libc/res_config.h b/cpukit/libnetworking/libc/res_config.h
deleted file mode 100644
index 57ec414226..0000000000
--- a/cpukit/libnetworking/libc/res_config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- *  $Id$
- */
-
-#define	DEBUG	1	/* enable debugging code (needed for dig) */
-#define	RESOLVSORT	/* allow sorting of addresses in gethostbyname */
-#define	RFC1535		/* comply with RFC1535 (STRONGLY reccomended by vixie)*/
-#undef	USELOOPBACK	/* res_init() bind to localhost */
-#undef	SUNSECURITY	/* verify gethostbyaddr() calls - WE DONT NEED IT  */
-#define MULTI_PTRS_ARE_ALIASES 1 /* fold multiple PTR records into aliases */
-#define	CHECK_SRVR_ADDR 1 /* confirm that the server requested sent the reply */
-#define BIND_UPDATE 1	/* update support */
-
-#if defined(__rtems__)
-u_int16_t _getshort(const u_char *src);
-u_int32_t _getlong(const u_char *src);
-int gethostname (char *name, int namelen);
-int sethostname (char *name, int namelen);
-int issetugid (void);
-#endif
diff --git a/cpukit/libnetworking/libc/res_data.c b/cpukit/libnetworking/libc/res_data.c
deleted file mode 100644
index fb7d2c66eb..0000000000
--- a/cpukit/libnetworking/libc/res_data.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (c) 1995,1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$Id$";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-#include <ctype.h>
-#include <resolv.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "res_config.h"
-
-const char *_res_opcodes[] = {
-	"QUERY",
-	"IQUERY",
-	"CQUERYM",
-	"CQUERYU",	/* experimental */
-	"NOTIFY",	/* experimental */
-	"UPDATE",
-	"6",
-	"7",
-	"8",
-	"9",
-	"10",
-	"11",
-	"12",
-	"13",
-	"ZONEINIT",
-	"ZONEREF",
-};
-
-const char *_res_resultcodes[] = {
-	"NOERROR",
-	"FORMERR",
-	"SERVFAIL",
-	"NXDOMAIN",
-	"NOTIMP",
-	"REFUSED",
-	"YXDOMAIN",
-	"YXRRSET",
-	"NXRRSET",
-	"NOTAUTH",
-	"ZONEERR",
-	"11",
-	"12",
-	"13",
-	"14",
-	"NOCHANGE",
-};
-
-#ifdef BIND_UPDATE
-const char *_res_sectioncodes[] = {
-	"ZONE",
-	"PREREQUISITES",
-	"UPDATE",
-	"ADDITIONAL",
-};
-#endif
diff --git a/cpukit/libnetworking/libc/res_debug.c b/cpukit/libnetworking/libc/res_debug.c
deleted file mode 100644
index b747b6e6d2..0000000000
--- a/cpukit/libnetworking/libc/res_debug.c
+++ /dev/null
@@ -1,966 +0,0 @@
-/*
- * Copyright (c) 1985
- *    The Regents of the University of California.  All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- * 	This product includes software developed by the University of
- * 	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-/*
- * Portions Copyright (c) 1995 by International Business Machines, Inc.
- *
- * International Business Machines, Inc. (hereinafter called IBM) grants
- * permission under its copyrights to use, copy, modify, and distribute this
- * Software with or without fee, provided that the above copyright notice and
- * all paragraphs of this notice appear in all copies, and that the name of IBM
- * not be used in connection with the marketing of any product incorporating
- * the Software or modifications thereof, without specific, written prior
- * permission.
- *
- * To the extent it has a right to do so, IBM grants an immunity from suit
- * under its patents, if any, for the use, sale or manufacture of products to
- * the extent that such products are used for performing Domain Name System
- * dynamic updates in TCP/IP networks by means of the Software.  No immunity is
- * granted for any product per se or for any other function of any product.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", AND IBM DISCLAIMS ALL WARRANTIES,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL IBM BE LIABLE FOR ANY SPECIAL,
- * DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE, EVEN
- * IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES.
- */
-
-/*
- * Portions Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)res_debug.c	8.1 (Berkeley) 6/4/93";
-static char rcsid[] = "$Id$";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-
-#include <ctype.h>
-#include <errno.h>
-#include <math.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-
-#define SPRINTF(x) sprintf x
-
-extern const char *_res_opcodes[];
-extern const char *_res_resultcodes[];
-extern const char *_res_sectioncodes[];
-
-/*
- * Print the current options.
- */
-void
-fp_resstat(struct __res_state *statp, FILE *file) {
-	u_long mask;
-
-	fprintf(file, ";; res options:");
-	if (!statp)
-		statp = &_res;
-	for (mask = 1;  mask != 0;  mask <<= 1)
-		if (statp->options & mask)
-			fprintf(file, " %s", p_option(mask));
-	putc('\n', file);
-}
-
-static void
-do_section(ns_msg *handle, ns_sect section, int pflag, FILE *file) {
-	int n, sflag, rrnum;
-	char buf[2048];	/* XXX need to malloc */
-	ns_opcode opcode;
-	ns_rr rr;
-
-	/*
-	 * Print answer records.
-	 */
-	sflag = (_res.pfcode & pflag);
-	if (_res.pfcode && !sflag)
-		return;
-
-	opcode = ns_msg_getflag(*handle, ns_f_opcode);
-	rrnum = 0;
-	for (;;) {
-		if (ns_parserr(handle, section, rrnum, &rr)) {
-			if (errno != ENODEV)
-				fprintf(file, ";; ns_parserr: %s\n",
-					strerror(errno));
-			else if (rrnum > 0 && sflag != 0 &&
-				 (_res.pfcode & RES_PRF_HEAD1))
-				putc('\n', file);
-			return;
-		}
-		if (rrnum == 0 && sflag != 0 && (_res.pfcode & RES_PRF_HEAD1))
-			fprintf(file, ";; %s SECTION:\n",
-				p_section(section, opcode));
-		if (section == ns_s_qd)
-			fprintf(file, ";;\t%s, type = %s, class = %s\n",
-				ns_rr_name(rr),
-				p_type(ns_rr_type(rr)),
-				p_class(ns_rr_class(rr)));
-		else {
-			n = ns_sprintrr(handle, &rr, NULL, NULL,
-					buf, sizeof buf);
-			if (n < 0) {
-				fprintf(file, ";; ns_sprintrr: %s\n",
-					strerror(errno));
-				return;
-			}
-			fputs(buf, file);
-			fputc('\n', file);
-		}
-		rrnum++;
-	}
-}
-
-void
-p_query(const u_char *msg) {
-	fp_query(msg, stdout);
-}
-
-void
-fp_query(const u_char *msg, FILE *file) {
-	fp_nquery(msg, PACKETSZ, file);
-}
-
-/*
- * Print the contents of a query.
- * This is intended to be primarily a debugging routine.
- */
-void
-fp_nquery(const u_char *msg, int len, FILE *file) {
-	ns_msg handle;
-	int qdcount, ancount, nscount, arcount;
-	u_int opcode, rcode, id;
-
-	if ((_res.options & RES_INIT) == 0 && res_init() == -1)
-		return;
-
-	if (ns_initparse(msg, len, &handle) < 0) {
-		fprintf(file, ";; ns_initparse: %s\n", strerror(errno));
-		return;
-	}
-	opcode = ns_msg_getflag(handle, ns_f_opcode);
-	rcode = ns_msg_getflag(handle, ns_f_rcode);
-	id = ns_msg_id(handle);
-	qdcount = ns_msg_count(handle, ns_s_qd);
-	ancount = ns_msg_count(handle, ns_s_an);
-	nscount = ns_msg_count(handle, ns_s_ns);
-	arcount = ns_msg_count(handle, ns_s_ar);
-
-	/*
-	 * Print header fields.
-	 */
-	if ((!_res.pfcode) || (_res.pfcode & RES_PRF_HEADX) || rcode)
-		fprintf(file,
-			";; ->>HEADER<<- opcode: %s, status: %s, id: %d\n",
-			_res_opcodes[opcode], _res_resultcodes[rcode], id);
-	if ((!_res.pfcode) || (_res.pfcode & RES_PRF_HEADX))
-		putc(';', file);
-	if ((!_res.pfcode) || (_res.pfcode & RES_PRF_HEAD2)) {
-		fprintf(file, "; flags:");
-		if (ns_msg_getflag(handle, ns_f_qr))
-			fprintf(file, " qr");
-		if (ns_msg_getflag(handle, ns_f_aa))
-			fprintf(file, " aa");
-		if (ns_msg_getflag(handle, ns_f_tc))
-			fprintf(file, " tc");
-		if (ns_msg_getflag(handle, ns_f_rd))
-			fprintf(file, " rd");
-		if (ns_msg_getflag(handle, ns_f_ra))
-			fprintf(file, " ra");
-		if (ns_msg_getflag(handle, ns_f_z))
-			fprintf(file, " ??");
-		if (ns_msg_getflag(handle, ns_f_ad))
-			fprintf(file, " ad");
-		if (ns_msg_getflag(handle, ns_f_cd))
-			fprintf(file, " cd");
-	}
-	if ((!_res.pfcode) || (_res.pfcode & RES_PRF_HEAD1)) {
-		fprintf(file, "; %s: %d",
-			p_section(ns_s_qd, opcode), qdcount);
-		fprintf(file, ", %s: %d",
-			p_section(ns_s_an, opcode), ancount);
-		fprintf(file, ", %s: %d",
-			p_section(ns_s_ns, opcode), nscount);
-		fprintf(file, ", %s: %d",
-			p_section(ns_s_ar, opcode), arcount);
-	}
-	if ((!_res.pfcode) || (_res.pfcode & 
-		(RES_PRF_HEADX | RES_PRF_HEAD2 | RES_PRF_HEAD1))) {
-		putc('\n',file);
-	}
-	/*
-	 * Print the various sections.
-	 */
-	do_section(&handle, ns_s_qd, RES_PRF_QUES, file);
-	do_section(&handle, ns_s_an, RES_PRF_ANS, file);
-	do_section(&handle, ns_s_ns, RES_PRF_AUTH, file);
-	do_section(&handle, ns_s_ar, RES_PRF_ADD, file);
-	if (qdcount == 0 && ancount == 0 &&
-	    nscount == 0 && arcount == 0)
-		putc('\n', file);
-}
-
-const u_char *
-p_cdnname(const u_char *cp, const u_char *msg, int len, FILE *file) {
-	char name[MAXDNAME];
-	int n;
-
-	if ((n = dn_expand(msg, msg + len, cp, name, sizeof name)) < 0)
-		return (NULL);
-	if (name[0] == '\0')
-		putc('.', file);
-	else
-		fputs(name, file);
-	return (cp + n);
-}
-
-const u_char *
-p_cdname(const u_char *cp, const u_char *msg, FILE *file) {
-	return (p_cdnname(cp, msg, PACKETSZ, file));
-}
-
-/* Return a fully-qualified domain name from a compressed name (with
-   length supplied).  */
-
-const u_char *
-p_fqnname(cp, msg, msglen, name, namelen)
-	const u_char *cp, *msg;
-	int msglen;
-	char *name;
-	int namelen;
-{
-	int n, newlen;
-
-	if ((n = dn_expand(msg, cp + msglen, cp, name, namelen)) < 0)
-		return (NULL);
-	newlen = strlen(name);
-	if (newlen == 0 || name[newlen - 1] != '.') {
-		if (newlen + 1 >= namelen)	/* Lack space for final dot */
-			return (NULL);
-		else
-			strcpy(name + newlen, ".");
-	}
-	return (cp + n);
-}
-
-/* XXX:	the rest of these functions need to become length-limited, too. */
-
-const u_char *
-p_fqname(const u_char *cp, const u_char *msg, FILE *file) {
-	char name[MAXDNAME];
-	const u_char *n;
-
-	n = p_fqnname(cp, msg, MAXCDNAME, name, sizeof name);
-	if (n == NULL)
-		return (NULL);
-	fputs(name, file);
-	return (n);
-}
-
-/*
- * Names of RR classes and qclasses.  Classes and qclasses are the same, except
- * that C_ANY is a qclass but not a class.  (You can ask for records of class
- * C_ANY, but you can't have any records of that class in the database.)
- */
-const struct res_sym __p_class_syms[] = {
-	{C_IN,		"IN"},
-	{C_CHAOS,	"CHAOS"},
-	{C_HS,		"HS"},
-	{C_HS,		"HESIOD"},
-	{C_ANY,		"ANY"},
-	{C_NONE,	"NONE"},
-	{C_IN, 		(char *)0}
-};
-
-/*
- * Names of message sections.
- */
-const struct res_sym __p_default_section_syms[] = {
-	{ns_s_qd,	"QUERY"},
-	{ns_s_an,	"ANSWER"},
-	{ns_s_ns,	"AUTHORITY"},
-	{ns_s_ar,	"ADDITIONAL"},
-	{0,             (char *)0}
-};
-
-const struct res_sym __p_update_section_syms[] = {
-	{S_ZONE,	"ZONE"},
-	{S_PREREQ,	"PREREQUISITE"},
-	{S_UPDATE,	"UPDATE"},
-	{S_ADDT,	"ADDITIONAL"},
-	{0,             (char *)0}
-};
-
-/*
- * Names of RR types and qtypes.  Types and qtypes are the same, except
- * that T_ANY is a qtype but not a type.  (You can ask for records of type
- * T_ANY, but you can't have any records of that type in the database.)
- */
-const struct res_sym __p_type_syms[] = {
-	{T_A,		"A",		"address"},
-	{T_NS,		"NS",		"name server"},
-	{T_MD,		"MD",		"mail destination (deprecated)"},
-	{T_MF,		"MF",		"mail forwarder (deprecated)"},
-	{T_CNAME,	"CNAME",	"canonical name"},
-	{T_SOA,		"SOA",		"start of authority"},
-	{T_MB,		"MB",		"mailbox"},
-	{T_MG,		"MG",		"mail group member"},
-	{T_MR,		"MR",		"mail rename"},
-	{T_NULL,	"NULL",		"null"},
-	{T_WKS,		"WKS",		"well-known service (deprecated)"},
-	{T_PTR,		"PTR",		"domain name pointer"},
-	{T_HINFO,	"HINFO",	"host information"},
-	{T_MINFO,	"MINFO",	"mailbox information"},
-	{T_MX,		"MX",		"mail exchanger"},
-	{T_TXT,		"TXT",		"text"},
-	{T_RP,		"RP",		"responsible person"},
-	{T_AFSDB,	"AFSDB",	"DCE or AFS server"},
-	{T_X25,		"X25",		"X25 address"},
-	{T_ISDN,	"ISDN",		"ISDN address"},
-	{T_RT,		"RT",		"router"},
-	{T_NSAP,	"NSAP",		"nsap address"},
-	{T_NSAP_PTR,	"NSAP_PTR",	"domain name pointer"},
-	{T_SIG,		"SIG",		"signature"},
-	{T_KEY,		"KEY",		"key"},
-	{T_PX,		"PX",		"mapping information"},
-	{T_GPOS,	"GPOS",		"geographical position (withdrawn)"},
-	{T_AAAA,	"AAAA",		"IPv6 address"},
-	{T_LOC,		"LOC",		"location"},
-	{T_NXT,		"NXT",		"next valid name (unimplemented)"},
-	{T_EID,		"EID",		"endpoint identifier (unimplemented)"},
-	{T_NIMLOC,	"NIMLOC",	"NIMROD locator (unimplemented)"},
-	{T_SRV,		"SRV",		"server selection"},
-	{T_ATMA,	"ATMA",		"ATM address (unimplemented)"},
-	{T_IXFR,	"IXFR",		"incremental zone transfer"},
-	{T_AXFR,	"AXFR",		"zone transfer"},
-	{T_MAILB,	"MAILB",	"mailbox-related data (deprecated)"},
-	{T_MAILA,	"MAILA",	"mail agent (deprecated)"},
-	{T_NAPTR,	"NAPTR",	"URN Naming Authority"},
-	{T_ANY,		"ANY",		"\"any\""},
-	{0, 		NULL,		NULL}
-};
-
-int
-sym_ston(const struct res_sym *syms, const char *name, int *success) {
-	for ((void)NULL; syms->name != 0; syms++) {
-		if (strcasecmp (name, syms->name) == 0) {
-			if (success)
-				*success = 1;
-			return (syms->number);
-		}
-	}
-	if (success)
-		*success = 0;
-	return (syms->number);		/* The default value. */
-}
-
-const char *
-sym_ntos(const struct res_sym *syms, int number, int *success) {
-	static char unname[20];
-
-	for ((void)NULL; syms->name != 0; syms++) {
-		if (number == syms->number) {
-			if (success)
-				*success = 1;
-			return (syms->name);
-		}
-	}
-
-	sprintf(unname, "%d", number);
-	if (success)
-		*success = 0;
-	return (unname);
-}
-
-const char *
-sym_ntop(const struct res_sym *syms, int number, int *success) {
-	static char unname[20];
-
-	for ((void)NULL; syms->name != 0; syms++) {
-		if (number == syms->number) {
-			if (success)
-				*success = 1;
-			return (syms->humanname);
-		}
-	}
-	sprintf(unname, "%d", number);
-	if (success)
-		*success = 0;
-	return (unname);
-}
-
-/*
- * Return a string for the type.
- */
-const char *
-p_type(int type) {
-	return (sym_ntos(__p_type_syms, type, (int *)0));
-}
-
-/*
- * Return a string for the type.
- */
-const char *
-p_section(int section, int opcode) {
-	const struct res_sym *symbols;
-
-	switch (opcode) {
-	case ns_o_update:
-		symbols = __p_update_section_syms;
-		break;
-	default:
-		symbols = __p_default_section_syms;
-		break;
-	}
-	return (sym_ntos(symbols, section, (int *)0));
-}
-
-/*
- * Return a mnemonic for class.
- */
-const char *
-p_class(int class) {
-	return (sym_ntos(__p_class_syms, class, (int *)0));
-}
-
-/*
- * Return a mnemonic for an option
- */
-const char *
-p_option(u_long option) {
-	static char nbuf[40];
-
-	switch (option) {
-	case RES_INIT:		return "init";
-	case RES_DEBUG:		return "debug";
-	case RES_AAONLY:	return "aaonly(unimpl)";
-	case RES_USEVC:		return "usevc";
-	case RES_PRIMARY:	return "primry(unimpl)";
-	case RES_IGNTC:		return "igntc";
-	case RES_RECURSE:	return "recurs";
-	case RES_DEFNAMES:	return "defnam";
-	case RES_STAYOPEN:	return "styopn";
-	case RES_DNSRCH:	return "dnsrch";
-	case RES_INSECURE1:	return "insecure1";
-	case RES_INSECURE2:	return "insecure2";
-	default:		sprintf(nbuf, "?0x%lx?", (u_long)option);
-				return (nbuf);
-	}
-}
-
-/*
- * Return a mnemonic for a time to live.
- */
-const char *
-p_time(u_int32_t value) {
-	static char nbuf[40];
-
-	if (ns_format_ttl(value, nbuf, sizeof nbuf) < 0)
-		sprintf(nbuf, "%u", value);
-	return (nbuf);
-}
-
-
-/*
- * routines to convert between on-the-wire RR format and zone file format.
- * Does not contain conversion to/from decimal degrees; divide or multiply
- * by 60*60*1000 for that.
- */
-
-static unsigned int poweroften[10] = {1, 10, 100, 1000, 10000, 100000,
-				      1000000,10000000,100000000,1000000000};
-
-/* takes an XeY precision/size value, returns a string representation. */
-static const char *
-precsize_ntoa(prec)
-	u_int8_t prec;
-{
-	static char retbuf[sizeof "90000000.00"];
-	unsigned long val;
-	int mantissa, exponent;
-
-	mantissa = (int)((prec >> 4) & 0x0f) % 10;
-	exponent = (int)((prec >> 0) & 0x0f) % 10;
-
-	val = mantissa * poweroften[exponent];
-
-	(void) sprintf(retbuf, "%ld.%.2ld", val/100, val%100);
-	return (retbuf);
-}
-
-/* converts ascii size/precision X * 10**Y(cm) to 0xXY.  moves pointer. */
-static u_int8_t
-precsize_aton(strptr)
-	char **strptr;
-{
-	unsigned int mval = 0, cmval = 0;
-	u_int8_t retval = 0;
-	char *cp;
-	int exponent;
-	int mantissa;
-
-	cp = *strptr;
-
-	while (isdigit((int)*cp))
-		mval = mval * 10 + (*cp++ - '0');
-
-	if (*cp == '.') {		/* centimeters */
-		cp++;
-		if (isdigit((int)*cp)) {
-			cmval = (*cp++ - '0') * 10;
-			if (isdigit((int)*cp)) {
-				cmval += (*cp++ - '0');
-			}
-		}
-	}
-	cmval = (mval * 100) + cmval;
-
-	for (exponent = 0; exponent < 9; exponent++)
-		if (cmval < poweroften[exponent+1])
-			break;
-
-	mantissa = cmval / poweroften[exponent];
-	if (mantissa > 9)
-		mantissa = 9;
-
-	retval = (mantissa << 4) | exponent;
-
-	*strptr = cp;
-
-	return (retval);
-}
-
-/* converts ascii lat/lon to unsigned encoded 32-bit number.  moves pointer. */
-static u_int32_t
-latlon2ul(latlonstrptr,which)
-	char **latlonstrptr;
-	int *which;
-{
-	char *cp;
-	u_int32_t retval;
-	int deg = 0, min = 0, secs = 0, secsfrac = 0;
-
-	cp = *latlonstrptr;
-
-	while (isdigit((int)*cp))
-		deg = deg * 10 + (*cp++ - '0');
-
-	while (isspace((int)*cp))
-		cp++;
-
-	if (!(isdigit((int)*cp)))
-		goto fndhemi;
-
-	while (isdigit((int)*cp))
-		min = min * 10 + (*cp++ - '0');
-
-	while (isspace((int)*cp))
-		cp++;
-
-	if (!(isdigit((int)*cp)))
-		goto fndhemi;
-
-	while (isdigit((int)*cp))
-		secs = secs * 10 + (*cp++ - '0');
-
-	if (*cp == '.') {		/* decimal seconds */
-		cp++;
-		if (isdigit((int)*cp)) {
-			secsfrac = (*cp++ - '0') * 100;
-			if (isdigit((int)*cp)) {
-				secsfrac += (*cp++ - '0') * 10;
-				if (isdigit((int)*cp)) {
-					secsfrac += (*cp++ - '0');
-				}
-			}
-		}
-	}
-
-	while (!isspace((int)*cp))	/* if any trailing garbage */
-		cp++;
-
-	while (isspace((int)*cp))
-		cp++;
-
- fndhemi:
-	switch (*cp) {
-	case 'N': case 'n':
-	case 'E': case 'e':
-		retval = ((unsigned)1<<31)
-			+ (((((deg * 60) + min) * 60) + secs) * 1000)
-			+ secsfrac;
-		break;
-	case 'S': case 's':
-	case 'W': case 'w':
-		retval = ((unsigned)1<<31)
-			- (((((deg * 60) + min) * 60) + secs) * 1000)
-			- secsfrac;
-		break;
-	default:
-		retval = 0;	/* invalid value -- indicates error */
-		break;
-	}
-
-	switch (*cp) {
-	case 'N': case 'n':
-	case 'S': case 's':
-		*which = 1;	/* latitude */
-		break;
-	case 'E': case 'e':
-	case 'W': case 'w':
-		*which = 2;	/* longitude */
-		break;
-	default:
-		*which = 0;	/* error */
-		break;
-	}
-
-	cp++;			/* skip the hemisphere */
-
-	while (!isspace((int)*cp))	/* if any trailing garbage */
-		cp++;
-
-	while (isspace((int)*cp))	/* move to next field */
-		cp++;
-
-	*latlonstrptr = cp;
-
-	return (retval);
-}
-
-/* converts a zone file representation in a string to an RDATA on-the-wire
- * representation. */
-int
-loc_aton(ascii, binary)
-	const char *ascii;
-	u_char *binary;
-{
-	const char *cp, *maxcp;
-	u_char *bcp;
-
-	u_int32_t latit = 0, longit = 0, alt = 0;
-	u_int32_t lltemp1 = 0, lltemp2 = 0;
-	int altmeters = 0, altfrac = 0, altsign = 1;
-	u_int8_t hp = 0x16;	/* default = 1e6 cm = 10000.00m = 10km */
-	u_int8_t vp = 0x13;	/* default = 1e3 cm = 10.00m */
-	u_int8_t siz = 0x12;	/* default = 1e2 cm = 1.00m */
-	int which1 = 0, which2 = 0;
-
-	cp = ascii;
-	maxcp = cp + strlen(ascii);
-
-	lltemp1 = latlon2ul(&cp, &which1);
-
-	lltemp2 = latlon2ul(&cp, &which2);
-
-	switch (which1 + which2) {
-	case 3:			/* 1 + 2, the only valid combination */
-		if ((which1 == 1) && (which2 == 2)) { /* normal case */
-			latit = lltemp1;
-			longit = lltemp2;
-		} else if ((which1 == 2) && (which2 == 1)) { /* reversed */
-			longit = lltemp1;
-			latit = lltemp2;
-		} else {	/* some kind of brokenness */
-			return (0);
-		}
-		break;
-	default:		/* we didn't get one of each */
-		return (0);
-	}
-
-	/* altitude */
-	if (*cp == '-') {
-		altsign = -1;
-		cp++;
-	}
-    
-	if (*cp == '+')
-		cp++;
-
-	while (isdigit((int)*cp))
-		altmeters = altmeters * 10 + (*cp++ - '0');
-
-	if (*cp == '.') {		/* decimal meters */
-		cp++;
-		if (isdigit((int)*cp)) {
-			altfrac = (*cp++ - '0') * 10;
-			if (isdigit((int)*cp)) {
-				altfrac += (*cp++ - '0');
-			}
-		}
-	}
-
-	alt = (10000000 + (altsign * (altmeters * 100 + altfrac)));
-
-	while (!isspace((int)*cp) && (cp < maxcp)) /* if trailing garbage or m */
-		cp++;
-
-	while (isspace((int)*cp) && (cp < maxcp))
-		cp++;
-
-	if (cp >= maxcp)
-		goto defaults;
-
-	siz = precsize_aton(&cp);
-	
-	while (!isspace((int)*cp) && (cp < maxcp))	/* if trailing garbage or m */
-		cp++;
-
-	while (isspace((int)*cp) && (cp < maxcp))
-		cp++;
-
-	if (cp >= maxcp)
-		goto defaults;
-
-	hp = precsize_aton(&cp);
-
-	while (!isspace((int)*cp) && (cp < maxcp))	/* if trailing garbage or m */
-		cp++;
-
-	while (isspace((int)*cp) && (cp < maxcp))
-		cp++;
-
-	if (cp >= maxcp)
-		goto defaults;
-
-	vp = precsize_aton(&cp);
-
- defaults:
-
-	bcp = binary;
-	*bcp++ = (u_int8_t) 0;	/* version byte */
-	*bcp++ = siz;
-	*bcp++ = hp;
-	*bcp++ = vp;
-	PUTLONG(latit,bcp);
-	PUTLONG(longit,bcp);
-	PUTLONG(alt,bcp);
-    
-	return (16);		/* size of RR in octets */
-}
-
-/* takes an on-the-wire LOC RR and formats it in a human readable format. */
-const char *
-loc_ntoa(binary, ascii)
-	const u_char *binary;
-	char *ascii;
-{
-	static char *error = "?";
-	const u_char *cp = binary;
-
-	int latdeg, latmin, latsec, latsecfrac;
-	int longdeg, longmin, longsec, longsecfrac;
-	char northsouth, eastwest;
-	int altmeters, altfrac, altsign;
-
-	const u_int32_t referencealt = 100000 * 100;
-
-	int32_t latval, longval, altval;
-	u_int32_t templ;
-	u_int8_t sizeval, hpval, vpval, versionval;
-    
-	char *sizestr, *hpstr, *vpstr;
-
-	versionval = *cp++;
-
-	if (versionval) {
-		(void) sprintf(ascii, "; error: unknown LOC RR version");
-		return (ascii);
-	}
-
-	sizeval = *cp++;
-
-	hpval = *cp++;
-	vpval = *cp++;
-
-	GETLONG(templ, cp);
-	latval = (templ - ((unsigned)1<<31));
-
-	GETLONG(templ, cp);
-	longval = (templ - ((unsigned)1<<31));
-
-	GETLONG(templ, cp);
-	if (templ < referencealt) { /* below WGS 84 spheroid */
-		altval = referencealt - templ;
-		altsign = -1;
-	} else {
-		altval = templ - referencealt;
-		altsign = 1;
-	}
-
-	if (latval < 0) {
-		northsouth = 'S';
-		latval = -latval;
-	} else
-		northsouth = 'N';
-
-	latsecfrac = latval % 1000;
-	latval = latval / 1000;
-	latsec = latval % 60;
-	latval = latval / 60;
-	latmin = latval % 60;
-	latval = latval / 60;
-	latdeg = latval;
-
-	if (longval < 0) {
-		eastwest = 'W';
-		longval = -longval;
-	} else
-		eastwest = 'E';
-
-	longsecfrac = longval % 1000;
-	longval = longval / 1000;
-	longsec = longval % 60;
-	longval = longval / 60;
-	longmin = longval % 60;
-	longval = longval / 60;
-	longdeg = longval;
-
-	altfrac = altval % 100;
-	altmeters = (altval / 100) * altsign;
-
-	if ((sizestr = strdup(precsize_ntoa(sizeval))) == NULL)
-		sizestr = error;
-	if ((hpstr = strdup(precsize_ntoa(hpval))) == NULL)
-		hpstr = error;
-	if ((vpstr = strdup(precsize_ntoa(vpval))) == NULL)
-		vpstr = error;
-
-	sprintf(ascii,
-	      "%d %.2d %.2d.%.3d %c %d %.2d %.2d.%.3d %c %d.%.2dm %sm %sm %sm",
-		latdeg, latmin, latsec, latsecfrac, northsouth,
-		longdeg, longmin, longsec, longsecfrac, eastwest,
-		altmeters, altfrac, sizestr, hpstr, vpstr);
-
-	if (sizestr != error)
-		free(sizestr);
-	if (hpstr != error)
-		free(hpstr);
-	if (vpstr != error)
-		free(vpstr);
-
-	return (ascii);
-}
-
-
-/* Return the number of DNS hierarchy levels in the name. */
-int
-dn_count_labels(const char *name) {
-	int i, len, count;
-
-	len = strlen(name);
-	for (i = 0, count = 0; i < len; i++) {
-		/* XXX need to check for \. or use named's nlabels(). */
-		if (name[i] == '.')
-			count++;
-	}
-
-	/* don't count initial wildcard */
-	if (name[0] == '*')
-		if (count)
-			count--;
-
-	/* don't count the null label for root. */
-	/* if terminating '.' not found, must adjust */
-	/* count to include last label */
-	if (len > 0 && name[len-1] != '.')
-		count++;
-	return (count);
-}
-
-
-/* 
- * Make dates expressed in seconds-since-Jan-1-1970 easy to read.  
- * SIG records are required to be printed like this, by the Secure DNS RFC.
- */
-char *
-p_secstodate (u_long secs) {
-	static char output[15];		/* YYYYMMDDHHMMSS and null */
-	time_t clock = secs;
-	struct tm *time;
-	
-	time = gmtime(&clock);
-	time->tm_year += 1900;
-	time->tm_mon += 1;
-	sprintf(output, "%04d%02d%02d%02d%02d%02d",
-		time->tm_year, time->tm_mon, time->tm_mday,
-		time->tm_hour, time->tm_min, time->tm_sec);
-	return (output);
-}
diff --git a/cpukit/libnetworking/libc/res_init.c b/cpukit/libnetworking/libc/res_init.c
deleted file mode 100644
index 9371e9fa82..0000000000
--- a/cpukit/libnetworking/libc/res_init.c
+++ /dev/null
@@ -1,497 +0,0 @@
-/*
- * Copyright (c) 1985, 1989, 1993
- *    The Regents of the University of California.  All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- * 	This product includes software developed by the University of
- * 	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-/*
- * Portions Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)res_init.c	8.1 (Berkeley) 6/7/93";
-static char orig_rcsid[] = "From: Id: res_init.c,v 8.7 1996/11/18 09:10:04 vixie Exp $";
-static char rcsid[] = "$Id$";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-#include <ctype.h>
-#include <resolv.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "res_config.h"
-
-static void res_setoptions __P((char *, char *));
-
-#ifdef RESOLVSORT
-static const char sort_mask[] = "/&";
-#define ISSORTMASK(ch) (strchr(sort_mask, ch) != NULL)
-static u_int32_t net_mask __P((struct in_addr));
-#endif
-
-#if !defined(isascii) /* XXX - could be a function */
-# define isascii(c) (!(c & 0200))
-#endif
-
-/*
- * Resolver state default settings.
- */
-
-struct __res_state _res
-# if defined(__BIND_RES_TEXT)
-	= { RES_TIMEOUT, }	/* Motorola, et al. */
-# endif
-	;
-
-
-/*
- * Set up default settings.  If the configuration file exist, the values
- * there will have precedence.  Otherwise, the server address is set to
- * INADDR_ANY and the default domain name comes from the gethostname().
- *
- * An interrim version of this code (BIND 4.9, pre-4.4BSD) used 127.0.0.1
- * rather than INADDR_ANY ("0.0.0.0") as the default name server address
- * since it was noted that INADDR_ANY actually meant ``the first interface
- * you "ifconfig"'d at boot time'' and if this was a SLIP or PPP interface,
- * it had to be "up" in order for you to reach your own name server.  It
- * was later decided that since the recommended practice is to always 
- * install local static routes through 127.0.0.1 for all your network
- * interfaces, that we could solve this problem without a code change.
- *
- * The configuration file should always be used, since it is the only way
- * to specify a default domain.  If you are running a server on your local
- * machine, you should say "nameserver 0.0.0.0" or "nameserver 127.0.0.1"
- * in the configuration file.
- *
- * Return 0 if completes successfully, -1 on error
- */
-int
-res_init()
-{
-	register FILE *fp;
-	register char *cp, **pp;
-	register int n;
-	char buf[MAXDNAME];
-	int nserv = 0;    /* number of nameserver records read from file */
-	int haveenv = 0;
-	int havesearch = 0;
-#ifdef RESOLVSORT
-	int nsort = 0;
-	char *net;
-#endif
-#ifndef RFC1535
-	int dots;
-#endif
-
-	/*
-	 * These three fields used to be statically initialized.  This made
-	 * it hard to use this code in a shared library.  It is necessary,
-	 * now that we're doing dynamic initialization here, that we preserve
-	 * the old semantics: if an application modifies one of these three
-	 * fields of _res before res_init() is called, res_init() will not
-	 * alter them.  Of course, if an application is setting them to
-	 * _zero_ before calling res_init(), hoping to override what used
-	 * to be the static default, we can't detect it and unexpected results
-	 * will follow.  Zero for any of these fields would make no sense,
-	 * so one can safely assume that the applications were already getting
-	 * unexpected results.
-	 *
-	 * _res.options is tricky since some apps were known to diddle the bits
-	 * before res_init() was first called. We can't replicate that semantic
-	 * with dynamic initialization (they may have turned bits off that are
-	 * set in RES_DEFAULT).  Our solution is to declare such applications
-	 * "broken".  They could fool us by setting RES_INIT but none do (yet).
-	 */
-	if (!_res.retrans)
-		_res.retrans = RES_TIMEOUT;
-	if (!_res.retry)
-		_res.retry = 4;
-	if (!(_res.options & RES_INIT))
-		_res.options = RES_DEFAULT;
-
-	/*
-	 * This one used to initialize implicitly to zero, so unless the app
-	 * has set it to something in particular, we can randomize it now.
-	 */
-	if (!_res.id)
-		_res.id = res_randomid();
-
-#ifdef USELOOPBACK
-	_res.nsaddr.sin_addr = inet_makeaddr(IN_LOOPBACKNET, 1);
-#else
-	_res.nsaddr.sin_addr.s_addr = INADDR_ANY;
-#endif
-	_res.nsaddr.sin_family = AF_INET;
-	_res.nsaddr.sin_port = htons(NAMESERVER_PORT);
-	_res.nscount = 1;
-	_res.ndots = 1;
-	_res.pfcode = 0;
-
-	/*
-	 * RTEMS -- Set up name servers
-	 */
-	{
-#include <rtems/rtems_bsdnet_internal.h>
-	int n = 0;
-	while ((n < rtems_bsdnet_nameserver_count) && (nserv < MAXNS)) {
-		_res.nsaddr_list[nserv].sin_addr = rtems_bsdnet_nameserver[n];
-		_res.nsaddr_list[nserv].sin_family = AF_INET;
-		_res.nsaddr_list[nserv].sin_port = htons(NAMESERVER_PORT);
-		nserv++;
-		n++;
-	}
-	if (rtems_bsdnet_domain_name)
-		(void)strncpy(_res.defdname, rtems_bsdnet_domain_name, sizeof(_res.defdname) - 1);
-	}
-
-	/* Allow user to override the local domain definition */
-	if ((cp = getenv("LOCALDOMAIN")) != NULL) {
-		(void)strncpy(_res.defdname, cp, sizeof(_res.defdname) - 1);
-		haveenv++;
-
-		/*
-		 * Set search list to be blank-separated strings
-		 * from rest of env value.  Permits users of LOCALDOMAIN
-		 * to still have a search list, and anyone to set the
-		 * one that they want to use as an individual (even more
-		 * important now that the rfc1535 stuff restricts searches)
-		 */
-		cp = _res.defdname;
-		pp = _res.dnsrch;
-		*pp++ = cp;
-		for (n = 0; *cp && pp < _res.dnsrch + MAXDNSRCH; cp++) {
-			if (*cp == '\n')	/* silly backwards compat */
-				break;
-			else if (*cp == ' ' || *cp == '\t') {
-				*cp = 0;
-				n = 1;
-			} else if (n) {
-				*pp++ = cp;
-				n = 0;
-				havesearch = 1;
-			}
-		}
-		/* null terminate last domain if there are excess */
-		while (*cp != '\0' && *cp != ' ' && *cp != '\t' && *cp != '\n')
-			cp++;
-		*cp = '\0';
-		*pp++ = 0;
-	}
-
-#define	MATCH(line, name) \
-	(!strncmp(line, name, sizeof(name) - 1) && \
-	(line[sizeof(name) - 1] == ' ' || \
-	 line[sizeof(name) - 1] == '\t'))
-
-	if ((fp = fopen(_PATH_RESCONF, "r")) != NULL) {
-	    /* read the config file */
-	    while (fgets(buf, sizeof(buf), fp) != NULL) {
-		/* skip comments */
-		if (*buf == ';' || *buf == '#')
-			continue;
-		/* read default domain name */
-		if (MATCH(buf, "domain")) {
-		    if (haveenv)	/* skip if have from environ */
-			    continue;
-		    cp = buf + sizeof("domain") - 1;
-		    while (*cp == ' ' || *cp == '\t')
-			    cp++;
-		    if ((*cp == '\0') || (*cp == '\n'))
-			    continue;
-		    strncpy(_res.defdname, cp, sizeof(_res.defdname) - 1);
-		    if ((cp = strpbrk(_res.defdname, " \t\n")) != NULL)
-			    *cp = '\0';
-		    havesearch = 0;
-		    continue;
-		}
-		/* set search list */
-		if (MATCH(buf, "search")) {
-		    if (haveenv)	/* skip if have from environ */
-			    continue;
-		    cp = buf + sizeof("search") - 1;
-		    while (*cp == ' ' || *cp == '\t')
-			    cp++;
-		    if ((*cp == '\0') || (*cp == '\n'))
-			    continue;
-		    strncpy(_res.defdname, cp, sizeof(_res.defdname) - 1);
-		    if ((cp = strchr(_res.defdname, '\n')) != NULL)
-			    *cp = '\0';
-		    /*
-		     * Set search list to be blank-separated strings
-		     * on rest of line.
-		     */
-		    cp = _res.defdname;
-		    pp = _res.dnsrch;
-		    *pp++ = cp;
-		    for (n = 0; *cp && pp < _res.dnsrch + MAXDNSRCH; cp++) {
-			    if (*cp == ' ' || *cp == '\t') {
-				    *cp = 0;
-				    n = 1;
-			    } else if (n) {
-				    *pp++ = cp;
-				    n = 0;
-			    }
-		    }
-		    /* null terminate last domain if there are excess */
-		    while (*cp != '\0' && *cp != ' ' && *cp != '\t')
-			    cp++;
-		    *cp = '\0';
-		    *pp++ = 0;
-		    havesearch = 1;
-		    continue;
-		}
-		/* read nameservers to query */
-		if (MATCH(buf, "nameserver") && nserv < MAXNS) {
-		    struct in_addr a;
-
-		    cp = buf + sizeof("nameserver") - 1;
-		    while (*cp == ' ' || *cp == '\t')
-			cp++;
-		    if ((*cp != '\0') && (*cp != '\n') && inet_aton(cp, &a)) {
-			_res.nsaddr_list[nserv].sin_addr = a;
-			_res.nsaddr_list[nserv].sin_family = AF_INET;
-			_res.nsaddr_list[nserv].sin_port =
-				htons(NAMESERVER_PORT);
-			nserv++;
-		    }
-		    continue;
-		}
-#ifdef RESOLVSORT
-		if (MATCH(buf, "sortlist")) {
-		    struct in_addr a;
-
-		    cp = buf + sizeof("sortlist") - 1;
-		    while (nsort < MAXRESOLVSORT) {
-			while (*cp == ' ' || *cp == '\t')
-			    cp++;
-			if (*cp == '\0' || *cp == '\n' || *cp == ';')
-			    break;
-			net = cp;
-			while (*cp && !ISSORTMASK(*cp) && *cp != ';' &&
-			       isascii((int)*cp) && !isspace((int)*cp))
-				cp++;
-			n = *cp;
-			*cp = 0;
-			if (inet_aton(net, &a)) {
-			    _res.sort_list[nsort].addr = a;
-			    if (ISSORTMASK(n)) {
-				*cp++ = n;
-				net = cp;
-				while (*cp && *cp != ';' &&
-					isascii((int)*cp) && !isspace((int)*cp))
-				    cp++;
-				n = *cp;
-				*cp = 0;
-				if (inet_aton(net, &a)) {
-				    _res.sort_list[nsort].mask = a.s_addr;
-				} else {
-				    _res.sort_list[nsort].mask = 
-					net_mask(_res.sort_list[nsort].addr);
-				}
-			    } else {
-				_res.sort_list[nsort].mask = 
-				    net_mask(_res.sort_list[nsort].addr);
-			    }
-			    nsort++;
-			}
-			*cp = n;
-		    }
-		    continue;
-		}
-#endif
-		if (MATCH(buf, "options")) {
-		    res_setoptions(buf + sizeof("options") - 1, "conf");
-		    continue;
-		}
-	    }
-	    if (nserv > 1) 
-		_res.nscount = nserv;
-#ifdef RESOLVSORT
-	    _res.nsort = nsort;
-#endif
-	    (void) fclose(fp);
-	}
-	if (_res.defdname[0] == 0 &&
-	    gethostname(buf, sizeof(_res.defdname) - 1) == 0 &&
-	    (cp = strchr(buf, '.')) != NULL)
-		strcpy(_res.defdname, cp + 1);
-
-	/* find components of local domain that might be searched */
-	if (havesearch == 0) {
-		pp = _res.dnsrch;
-		*pp++ = _res.defdname;
-		*pp = NULL;
-
-#ifndef RFC1535
-		dots = 0;
-		for (cp = _res.defdname; *cp; cp++)
-			dots += (*cp == '.');
-
-		cp = _res.defdname;
-		while (pp < _res.dnsrch + MAXDFLSRCH) {
-			if (dots < LOCALDOMAINPARTS)
-				break;
-			cp = strchr(cp, '.') + 1;    /* we know there is one */
-			*pp++ = cp;
-			dots--;
-		}
-		*pp = NULL;
-#ifdef DEBUG
-		if (_res.options & RES_DEBUG) {
-			printf(";; res_init()... default dnsrch list:\n");
-			for (pp = _res.dnsrch; *pp; pp++)
-				printf(";;\t%s\n", *pp);
-			printf(";;\t..END..\n");
-		}
-#endif
-#endif /* !RFC1535 */
-	}
-
-	if ((cp = getenv("RES_OPTIONS")) != NULL)
-		res_setoptions(cp, "env");
-	_res.options |= RES_INIT;
-	return (0);
-}
-
-static void
-res_setoptions(options, source)
-	char *options, *source;
-{
-	char *cp = options;
-	int i;
-
-#ifdef DEBUG
-	if (_res.options & RES_DEBUG)
-		printf(";; res_setoptions(\"%s\", \"%s\")...\n",
-		       options, source);
-#endif
-	while (*cp) {
-		/* skip leading and inner runs of spaces */
-		while (*cp == ' ' || *cp == '\t')
-			cp++;
-		/* search for and process individual options */
-		if (!strncmp(cp, "ndots:", sizeof("ndots:") - 1)) {
-			i = atoi(cp + sizeof("ndots:") - 1);
-			if (i <= RES_MAXNDOTS)
-				_res.ndots = i;
-			else
-				_res.ndots = RES_MAXNDOTS;
-#ifdef DEBUG
-			if (_res.options & RES_DEBUG)
-				printf(";;\tndots=%d\n", _res.ndots);
-#endif
-		} else if (!strncmp(cp, "debug", sizeof("debug") - 1)) {
-#ifdef DEBUG
-			if (!(_res.options & RES_DEBUG)) {
-				printf(";; res_setoptions(\"%s\", \"%s\")..\n",
-				       options, source);
-				_res.options |= RES_DEBUG;
-			}
-			printf(";;\tdebug\n");
-#endif
-		} else if (!strncmp(cp, "inet6", sizeof("inet6") - 1)) {
-			_res.options |= RES_USE_INET6;
-		} else if (!strncmp(cp, "no_tld_query", sizeof("no_tld_query") - 1)) {
-			_res.options |= RES_NOTLDQUERY;
-		} else {
-			/* XXX - print a warning here? */
-		}
-		/* skip to next run of spaces */
-		while (*cp && *cp != ' ' && *cp != '\t')
-			cp++;
-	}
-}
-
-#ifdef RESOLVSORT
-/* XXX - should really support CIDR which means explicit masks always. */
-static u_int32_t
-net_mask(in)		/* XXX - should really use system's version of this */
-	struct in_addr in;
-{
-	register u_int32_t i = ntohl(in.s_addr);
-
-	if (IN_CLASSA(i))
-		return (htonl(IN_CLASSA_NET));
-	else if (IN_CLASSB(i))
-		return (htonl(IN_CLASSB_NET));
-	return (htonl(IN_CLASSC_NET));
-}
-#endif
-
-u_int
-res_randomid()
-{
-	struct timeval now;
-
-	gettimeofday(&now, NULL);
-	return (0xffff & (now.tv_sec ^ now.tv_usec ^ getpid()));
-}
diff --git a/cpukit/libnetworking/libc/res_mkquery.c b/cpukit/libnetworking/libc/res_mkquery.c
deleted file mode 100644
index d3fabfa5ab..0000000000
--- a/cpukit/libnetworking/libc/res_mkquery.c
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * Copyright (c) 1985, 1993
- *    The Regents of the University of California.  All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- * 	This product includes software developed by the University of
- * 	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-/*
- * Portions Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)res_mkquery.c	8.1 (Berkeley) 6/4/93";
-static char orig_rcsid[] = "From: Id: res_mkquery.c,v 8.9 1997/04/24 22:22:36 vixie Exp $";
-static char rcsid[] = "$Id$";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "res_config.h"
-
-/*
- * Form all types of queries.
- * Returns the size of the result or -1.
- */
-int
-res_mkquery(op, dname, class, type, data, datalen, newrr_in, buf, buflen)
-	int op;			/* opcode of query */
-	const char *dname;	/* domain name */
-	int class, type;	/* class and type of query */
-	const u_char *data;	/* resource record data */
-	int datalen;		/* length of data */
-	const u_char *newrr_in;	/* new rr for modify or append */
-	u_char *buf;		/* buffer to put query */
-	int buflen;		/* size of buffer */
-{
-	register HEADER *hp;
-	register u_char *cp;
-	register int n;
-	u_char *dnptrs[20], **dpp, **lastdnptr;
-
-	if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
-		h_errno = NETDB_INTERNAL;
-		return (-1);
-	}
-#ifdef DEBUG
-	if (_res.options & RES_DEBUG)
-		printf(";; res_mkquery(%d, %s, %d, %d)\n",
-		       op, dname, class, type);
-#endif
-	/*
-	 * Initialize header fields.
-	 */
-	if ((buf == NULL) || (buflen < HFIXEDSZ))
-		return (-1);
-	memset(buf, 0, HFIXEDSZ);
-	hp = (HEADER *) buf;
-	hp->id = htons(++_res.id);
-	hp->opcode = op;
-	hp->rd = (_res.options & RES_RECURSE) != 0;
-	hp->rcode = NOERROR;
-	cp = buf + HFIXEDSZ;
-	buflen -= HFIXEDSZ;
-	dpp = dnptrs;
-	*dpp++ = buf;
-	*dpp++ = NULL;
-	lastdnptr = dnptrs + sizeof dnptrs / sizeof dnptrs[0];
-	/*
-	 * perform opcode specific processing
-	 */
-	switch (op) {
-	case QUERY:	/*FALLTHROUGH*/
-	case NS_NOTIFY_OP:
-		if ((buflen -= QFIXEDSZ) < 0)
-			return (-1);
-		if ((n = dn_comp(dname, cp, buflen, dnptrs, lastdnptr)) < 0)
-			return (-1);
-		cp += n;
-		buflen -= n;
-		__putshort(type, cp);
-		cp += INT16SZ;
-		__putshort(class, cp);
-		cp += INT16SZ;
-		hp->qdcount = htons(1);
-		if (op == QUERY || data == NULL)
-			break;
-		/*
-		 * Make an additional record for completion domain.
-		 */
-		buflen -= RRFIXEDSZ;
-		n = dn_comp((char *)data, cp, buflen, dnptrs, lastdnptr);
-		if (n < 0)
-			return (-1);
-		cp += n;
-		buflen -= n;
-		__putshort(T_NULL, cp);
-		cp += INT16SZ;
-		__putshort(class, cp);
-		cp += INT16SZ;
-		__putlong(0, cp);
-		cp += INT32SZ;
-		__putshort(0, cp);
-		cp += INT16SZ;
-		hp->arcount = htons(1);
-		break;
-
-	case IQUERY:
-		/*
-		 * Initialize answer section
-		 */
-		if (buflen < 1 + RRFIXEDSZ + datalen)
-			return (-1);
-		*cp++ = '\0';	/* no domain name */
-		__putshort(type, cp);
-		cp += INT16SZ;
-		__putshort(class, cp);
-		cp += INT16SZ;
-		__putlong(0, cp);
-		cp += INT32SZ;
-		__putshort(datalen, cp);
-		cp += INT16SZ;
-		if (datalen) {
-			memcpy(cp, data, datalen);
-			cp += datalen;
-		}
-		hp->ancount = htons(1);
-		break;
-
-	default:
-		return (-1);
-	}
-	return (cp - buf);
-}
diff --git a/cpukit/libnetworking/libc/res_mkupdate.c b/cpukit/libnetworking/libc/res_mkupdate.c
deleted file mode 100644
index 56362f650b..0000000000
--- a/cpukit/libnetworking/libc/res_mkupdate.c
+++ /dev/null
@@ -1,415 +0,0 @@
-/*
- * Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-/*
- * Based on the Dynamic DNS reference implementation by Viraj Bais
- * <viraj_bais@ccm.fm.intel.com>
- */
-
-#if !defined(__rtems__)
-#if !defined(lint) && !defined(SABER)
-static char rcsid[] = "$Id$";
-#endif /* not lint */
-#endif /* not rtems */
-
-#include <sys/types.h>
-#include <sys/param.h>
-
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <arpa/inet.h>
-
-#include <errno.h>
-#include <limits.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <ctype.h>
-
-#include "res_config.h"
-
-static int getnum_str(u_char **, u_char *);
-static int getword_str(char *, int, u_char **, u_char *);
-
-#define ShrinkBuffer(x)  if ((buflen -= x) < 0) return (-2);
-
-/*
- * Form update packets.
- * Returns the size of the resulting packet if no error
- * On error,
- *	returns -1 if error in reading a word/number in rdata
- *		   portion for update packets
- *		-2 if length of buffer passed is insufficient
- *		-3 if zone section is not the first section in
- *		   the linked list, or section order has a problem
- *		-4 on a number overflow
- *		-5 unknown operation or no records
- */
-int
-res_mkupdate(ns_updrec *rrecp_in, u_char *buf, int buflen) {
-	ns_updrec *rrecp_start = rrecp_in;
-	HEADER *hp;
-	u_char *cp, *sp1, *sp2, *startp, *endp;
-	int n, i, soanum, multiline;
-	ns_updrec *rrecp;
-	struct in_addr ina;
-        char buf2[MAXDNAME];
-	int section, numrrs = 0, counts[ns_s_max];
-	u_int16_t rtype, rclass;
-	u_int32_t n1, rttl;
-	u_char *dnptrs[20], **dpp, **lastdnptr;
-
-	if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
-		h_errno = NETDB_INTERNAL;
-		return (-1);
-	}
-
-	/*
-	 * Initialize header fields.
-	 */
-	if ((buf == NULL) || (buflen < HFIXEDSZ))
-		return (-1);
-	memset(buf, 0, HFIXEDSZ);
-	hp = (HEADER *) buf;
-	hp->id = htons(++_res.id);
-	hp->opcode = ns_o_update;
-	hp->rcode = NOERROR;
-	sp1 = buf + 2*INT16SZ;  /* save pointer to zocount */
-	cp = buf + HFIXEDSZ;
-	buflen -= HFIXEDSZ;
-	dpp = dnptrs;
-	*dpp++ = buf;
-	*dpp++ = NULL;
-	lastdnptr = dnptrs + sizeof dnptrs / sizeof dnptrs[0];
-
-	if (rrecp_start == NULL)
-		return (-5);
-	else if (rrecp_start->r_section != S_ZONE)
-		return (-3);
-
-	memset(counts, 0, sizeof counts);
-	for (rrecp = rrecp_start; rrecp; rrecp = rrecp->r_grpnext) {
-		numrrs++;
-                section = rrecp->r_section;
-		if (section < 0 || section >= ns_s_max)
-			return (-1);
-		counts[section]++;
-		for (i = section + 1; i < ns_s_max; i++)
-			if (counts[i])
-				return (-3);
-		rtype = rrecp->r_type;
-		rclass = rrecp->r_class;
-		rttl = rrecp->r_ttl;
-		/* overload class and type */
-		if (section == S_PREREQ) {
-			rttl = 0;
-			switch (rrecp->r_opcode) {
-			case YXDOMAIN:
-				rclass = C_ANY;
-				rtype = T_ANY;
-				rrecp->r_size = 0;
-				break;
-			case NXDOMAIN:
-				rclass = C_NONE;
-				rtype = T_ANY;
-				rrecp->r_size = 0;
-				break;
-			case NXRRSET:
-				rclass = C_NONE;
-				rrecp->r_size = 0;
-				break;
-			case YXRRSET:
-				if (rrecp->r_size == 0)
-					rclass = C_ANY;
-				break;
-			default:
-				fprintf(stderr,
-					"res_mkupdate: incorrect opcode: %d\n",
-					rrecp->r_opcode);
-				fflush(stderr);
-				return (-1);
-			}
-		} else if (section == S_UPDATE) {
-			switch (rrecp->r_opcode) {
-			case DELETE:
-				rclass = rrecp->r_size == 0 ? C_ANY : C_NONE;
-				break;
-			case ADD:
-				break;
-			default:
-				fprintf(stderr,
-					"res_mkupdate: incorrect opcode: %d\n",
-					rrecp->r_opcode);
-				fflush(stderr);
-				return (-1);
-			}
-		}
-
-		/*
-		 * XXX	appending default domain to owner name is omitted,
-		 *	fqdn must be provided
-		 */
-		if ((n = dn_comp(rrecp->r_dname, cp, buflen, dnptrs,
-				 lastdnptr)) < 0)
-			return (-1);
-		cp += n;
-		ShrinkBuffer(n + 2*INT16SZ);
-		PUTSHORT(rtype, cp);
-		PUTSHORT(rclass, cp);
-		if (section == S_ZONE) {
-			if (numrrs != 1 || rrecp->r_type != T_SOA)
-				return (-3);
-			continue;
-		}
-		ShrinkBuffer(INT32SZ + INT16SZ);
-		PUTLONG(rttl, cp);
-		sp2 = cp;  /* save pointer to length byte */
-		cp += INT16SZ;
-		if (rrecp->r_size == 0) {
-			if (section == S_UPDATE && rclass != C_ANY)
-				return (-1);
-			else {
-				PUTSHORT(0, sp2);
-				continue;
-			}
-		}
-		startp = rrecp->r_data;
-		endp = startp + rrecp->r_size - 1;
-		/* XXX this should be done centrally. */
-		switch (rrecp->r_type) {
-		case T_A:
-			if (!getword_str(buf2, sizeof buf2, &startp, endp))
-				return (-1);
-			if (!inet_aton(buf2, &ina))
-				return (-1);
-			n1 = ntohl(ina.s_addr);
-			ShrinkBuffer(INT32SZ);
-			PUTLONG(n1, cp);
-			break;
-		case T_CNAME:
-		case T_MB:
-		case T_MG:
-		case T_MR:
-		case T_NS:
-		case T_PTR:
-			if (!getword_str(buf2, sizeof buf2, &startp, endp))
-				return (-1);
-			n = dn_comp(buf2, cp, buflen, dnptrs, lastdnptr);
-			if (n < 0)
-				return (-1);
-			cp += n;
-			ShrinkBuffer(n);
-			break;
-		case T_MINFO:
-		case T_SOA:
-		case T_RP:
-			for (i = 0; i < 2; i++) {
-				if (!getword_str(buf2, sizeof buf2, &startp,
-						 endp))
-				return (-1);
-				n = dn_comp(buf2, cp, buflen,
-					    dnptrs, lastdnptr);
-				if (n < 0)
-					return (-1);
-				cp += n;
-				ShrinkBuffer(n);
-			}
-			if (rrecp->r_type == T_SOA) {
-				ShrinkBuffer(5 * INT32SZ);
-				while (isspace(*startp) || !*startp)
-					startp++;
-				if (*startp == '(') {
-					multiline = 1;
-					startp++;
-				} else
-					multiline = 0;
-				/* serial, refresh, retry, expire, minimum */
-				for (i = 0; i < 5; i++) {
-					soanum = getnum_str(&startp, endp);
-					if (soanum < 0)
-						return (-1);
-					PUTLONG(soanum, cp);
-				}
-				if (multiline) {
-					while (isspace(*startp) || !*startp)
-						startp++;
-					if (*startp != ')')
-						return (-1);
-				}
-			}
-			break;
-		case T_MX:
-		case T_AFSDB:
-		case T_RT:
-			n = getnum_str(&startp, endp);
-			if (n < 0)
-				return (-1);
-			PUTSHORT(n, cp);
-			ShrinkBuffer(INT16SZ);
-			if (!getword_str(buf2, sizeof buf2, &startp, endp))
-				return (-1);
-			n = dn_comp(buf2, cp, buflen, dnptrs, lastdnptr);
-			if (n < 0)
-				return (-1);
-			cp += n;
-			ShrinkBuffer(n);
-			break;
-		case T_PX:
-			n = getnum_str(&startp, endp);
-			if (n < 0)
-				return (-1);
-			PUTSHORT(n, cp);
-			ShrinkBuffer(INT16SZ);
-			for (i = 0; i < 2; i++) {
-				if (!getword_str(buf2, sizeof buf2, &startp,
-						 endp))
-					return (-1);
-				n = dn_comp(buf2, cp, buflen, dnptrs,
-					    lastdnptr);
-				if (n < 0)
-					return (-1);
-				cp += n;
-				ShrinkBuffer(n);
-			}
-			break;
-		case T_WKS:
-		case T_HINFO:
-		case T_TXT:
-		case T_X25:
-		case T_ISDN:
-		case T_NSAP:
-		case T_LOC:
-			/* XXX - more fine tuning needed here */
-			ShrinkBuffer(rrecp->r_size);
-			memcpy(cp, rrecp->r_data, rrecp->r_size);
-			cp += rrecp->r_size;
-			break;
-		default:
-			return (-1);
-		} /*switch*/
-		n = (u_int16_t)((cp - sp2) - INT16SZ);
-		PUTSHORT(n, sp2);
-	} /*for*/
-		
-	hp->qdcount = htons(counts[0]);
-	hp->ancount = htons(counts[1]);
-	hp->nscount = htons(counts[2]);
-	hp->arcount = htons(counts[3]);
-	return (cp - buf);
-}
-
-/*
- * Get a whitespace delimited word from a string (not file)
- * into buf. modify the start pointer to point after the
- * word in the string.
- */
-static int
-getword_str(char *buf, int size, u_char **startpp, u_char *endp) {
-        char *cp;
-        int c;
- 
-        for (cp = buf; *startpp <= endp; ) {
-                c = **startpp;
-                if (isspace(c) || c == '\0') {
-                        if (cp != buf) /* trailing whitespace */
-                                break;
-                        else { /* leading whitespace */
-                                (*startpp)++;
-                                continue;
-                        }
-                }
-                (*startpp)++;
-                if (cp >= buf+size-1)
-                        break;
-                *cp++ = (u_char)c;
-        }
-        *cp = '\0';
-        return (cp != buf);
-}
-
-/*
- * Get a whitespace delimited number from a string (not file) into buf
- * update the start pointer to point after the number in the string.
- */
-static int
-getnum_str(u_char **startpp, u_char *endp) {
-        int c, n;
-        int seendigit = 0;
-        int m = 0;
-
-        for (n = 0; *startpp <= endp; ) {
-                c = **startpp;
-                if (isspace(c) || c == '\0') {
-                        if (seendigit) /* trailing whitespace */
-                                break;
-                        else { /* leading whitespace */
-                                (*startpp)++;
-                                continue;
-                        }
-                }
-                if (c == ';') {
-                        while ((*startpp <= endp) &&
-			       ((c = **startpp) != '\n'))
-					(*startpp)++;
-                        if (seendigit)
-                                break;
-                        continue;
-                }
-                if (!isdigit(c)) {
-                        if (c == ')' && seendigit) {
-                                (*startpp)--;
-                                break;
-                        }
-			return (-1);
-                }        
-                (*startpp)++;
-                n = n * 10 + (c - '0');
-                seendigit = 1;
-        }
-        return (n + m);
-}
-
-/*
- * Allocate a resource record buffer & save rr info.
- */
-ns_updrec *
-res_mkupdrec(int section, const char *dname,
-	     u_int class, u_int type, u_long ttl) {
-	ns_updrec *rrecp = (ns_updrec *)calloc(1, sizeof(ns_updrec));
-
-	if (!rrecp || !(rrecp->r_dname = strdup(dname)))
-		return (NULL);
- 	rrecp->r_class = class;
-	rrecp->r_type = type;
-	rrecp->r_ttl = ttl;
-	rrecp->r_section = section;
-	return (rrecp);
-}
-
-/*
- * Free a resource record buffer created by res_mkupdrec.
- */
-void
-res_freeupdrec(ns_updrec *rrecp) {
-	/* Note: freeing r_dp is the caller's responsibility. */
-	if (rrecp->r_dname != NULL)
-		free(rrecp->r_dname);
-	free(rrecp);
-}
diff --git a/cpukit/libnetworking/libc/res_query.c b/cpukit/libnetworking/libc/res_query.c
deleted file mode 100644
index 784fa433bc..0000000000
--- a/cpukit/libnetworking/libc/res_query.c
+++ /dev/null
@@ -1,410 +0,0 @@
-/*
- * Copyright (c) 1988, 1993
- *    The Regents of the University of California.  All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- * 	This product includes software developed by the University of
- * 	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-/*
- * Portions Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)res_query.c	8.1 (Berkeley) 6/4/93";
-static char orig_rcsid = "From: Id: res_query.c,v 8.14 1997/06/09 17:47:05 halley Exp $";
-static char rcsid[] = "$Id$";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-#include <ctype.h>
-#include <errno.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "res_config.h"
-
-#if PACKETSZ > 1024
-#define MAXPACKET	PACKETSZ
-#else
-#define MAXPACKET	1024
-#endif
-
-/*
- * Formulate a normal query, send, and await answer.
- * Returned answer is placed in supplied buffer "answer".
- * Perform preliminary check of answer, returning success only
- * if no error is indicated and the answer count is nonzero.
- * Return the size of the response on success, -1 on error.
- * Error number is left in h_errno.
- *
- * Caller must parse answer and determine whether it answers the question.
- */
-int
-res_query(name, class, type, answer, anslen)
-	const char *name;	/* domain name */
-	int class, type;	/* class and type of query */
-	u_char *answer;		/* buffer to put answer */
-	int anslen;		/* size of answer buffer */
-{
-	u_char buf[MAXPACKET];
-	HEADER *hp = (HEADER *) answer;
-	int n;
-
-	hp->rcode = NOERROR;	/* default */
-
-	if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
-		h_errno = NETDB_INTERNAL;
-		return (-1);
-	}
-#ifdef DEBUG
-	if (_res.options & RES_DEBUG)
-		printf(";; res_query(%s, %d, %d)\n", name, class, type);
-#endif
-
-	n = res_mkquery(QUERY, name, class, type, NULL, 0, NULL,
-			buf, sizeof(buf));
-	if (n <= 0) {
-#ifdef DEBUG
-		if (_res.options & RES_DEBUG)
-			printf(";; res_query: mkquery failed\n");
-#endif
-		h_errno = NO_RECOVERY;
-		return (n);
-	}
-	n = res_send(buf, n, answer, anslen);
-	if (n < 0) {
-#ifdef DEBUG
-		if (_res.options & RES_DEBUG)
-			printf(";; res_query: send error\n");
-#endif
-		h_errno = TRY_AGAIN;
-		return (n);
-	}
-
-	if (hp->rcode != NOERROR || ntohs(hp->ancount) == 0) {
-#ifdef DEBUG
-		if (_res.options & RES_DEBUG)
-			printf(";; rcode = %d, ancount=%d\n", hp->rcode,
-			    ntohs(hp->ancount));
-#endif
-		switch (hp->rcode) {
-		case NXDOMAIN:
-			h_errno = HOST_NOT_FOUND;
-			break;
-		case SERVFAIL:
-			h_errno = TRY_AGAIN;
-			break;
-		case NOERROR:
-			h_errno = NO_DATA;
-			break;
-		case FORMERR:
-		case NOTIMP:
-		case REFUSED:
-		default:
-			h_errno = NO_RECOVERY;
-			break;
-		}
-		return (-1);
-	}
-	return (n);
-}
-
-/*
- * Formulate a normal query, send, and retrieve answer in supplied buffer.
- * Return the size of the response on success, -1 on error.
- * If enabled, implement search rules until answer or unrecoverable failure
- * is detected.  Error code, if any, is left in h_errno.
- */
-int
-res_search(name, class, type, answer, anslen)
-	const char *name;	/* domain name */
-	int class, type;	/* class and type of query */
-	u_char *answer;		/* buffer to put answer */
-	int anslen;		/* size of answer */
-{
-	const char *cp, * const *domain;
-	HEADER *hp = (HEADER *) answer;
-	u_int dots;
-	int trailing_dot, ret, saved_herrno;
-	int got_nodata = 0, got_servfail = 0, tried_as_is = 0;
-
-	if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
-		h_errno = NETDB_INTERNAL;
-		return (-1);
-	}
-	errno = 0;
-	h_errno = HOST_NOT_FOUND;	/* default, if we never query */
-	dots = 0;
-	for (cp = name; *cp; cp++)
-		dots += (*cp == '.');
-	trailing_dot = 0;
-	if (cp > name && *--cp == '.')
-		trailing_dot++;
-
-	/* If there aren't any dots, it could be a user-level alias */
-	if (!dots && (cp = hostalias(name)) != NULL)
-		return (res_query(cp, class, type, answer, anslen));
-
-	/*
-	 * If there are dots in the name already, let's just give it a try
-	 * 'as is'.  The threshold can be set with the "ndots" option.
-	 */
-	saved_herrno = -1;
-	if (dots >= _res.ndots) {
-		ret = res_querydomain(name, NULL, class, type, answer, anslen);
-		if (ret > 0)
-			return (ret);
-		saved_herrno = h_errno;
-		tried_as_is++;
-	}
-
-	/*
-	 * We do at least one level of search if
-	 *	- there is no dot and RES_DEFNAME is set, or
-	 *	- there is at least one dot, there is no trailing dot,
-	 *	  and RES_DNSRCH is set.
-	 */
-	if ((!dots && (_res.options & RES_DEFNAMES)) ||
-	    (dots && !trailing_dot && (_res.options & RES_DNSRCH))) {
-		int done = 0;
-
-		for (domain = (const char * const *)_res.dnsrch;
-		     *domain && !done;
-		     domain++) {
-
-			ret = res_querydomain(name, *domain, class, type,
-					      answer, anslen);
-			if (ret > 0)
-				return (ret);
-
-			/*
-			 * If no server present, give up.
-			 * If name isn't found in this domain,
-			 * keep trying higher domains in the search list
-			 * (if that's enabled).
-			 * On a NO_DATA error, keep trying, otherwise
-			 * a wildcard entry of another type could keep us
-			 * from finding this entry higher in the domain.
-			 * If we get some other error (negative answer or
-			 * server failure), then stop searching up,
-			 * but try the input name below in case it's
-			 * fully-qualified.
-			 */
-			if (errno == ECONNREFUSED) {
-				h_errno = TRY_AGAIN;
-				return (-1);
-			}
-
-			switch (h_errno) {
-			case NO_DATA:
-				got_nodata++;
-				/* FALLTHROUGH */
-			case HOST_NOT_FOUND:
-				/* keep trying */
-				break;
-			case TRY_AGAIN:
-				if (hp->rcode == SERVFAIL) {
-					/* try next search element, if any */
-					got_servfail++;
-					break;
-				}
-				/* FALLTHROUGH */
-			default:
-				/* anything else implies that we're done */
-				done++;
-			}
-
-			/* if we got here for some reason other than DNSRCH,
-			 * we only wanted one iteration of the loop, so stop.
-			 */
-			if (!(_res.options & RES_DNSRCH))
-				done++;
-		}
-	}
-
-	/*
-	 * If we have not already tried the name "as is", do that now.
-	 * note that we do this regardless of how many dots were in the
-	 * name or whether it ends with a dot unless NOTLDQUERY is set.
-	 */
-	if (!tried_as_is && (dots || !(_res.options & RES_NOTLDQUERY))) {
-		ret = res_querydomain(name, NULL, class, type, answer, anslen);
-		if (ret > 0)
-			return (ret);
-	}
-
-	/* if we got here, we didn't satisfy the search.
-	 * if we did an initial full query, return that query's h_errno
-	 * (note that we wouldn't be here if that query had succeeded).
-	 * else if we ever got a nodata, send that back as the reason.
-	 * else send back meaningless h_errno, that being the one from
-	 * the last DNSRCH we did.
-	 */
-	if (saved_herrno != -1)
-		h_errno = saved_herrno;
-	else if (got_nodata)
-		h_errno = NO_DATA;
-	else if (got_servfail)
-		h_errno = TRY_AGAIN;
-	return (-1);
-}
-
-/*
- * Perform a call on res_query on the concatenation of name and domain,
- * removing a trailing dot from name if domain is NULL.
- */
-int
-res_querydomain(name, domain, class, type, answer, anslen)
-	const char *name, *domain;
-	int class, type;	/* class and type of query */
-	u_char *answer;		/* buffer to put answer */
-	int anslen;		/* size of answer */
-{
-	char nbuf[MAXDNAME];
-	const char *longname = nbuf;
-	int n, d;
-
-	if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
-		h_errno = NETDB_INTERNAL;
-		return (-1);
-	}
-#ifdef DEBUG
-	if (_res.options & RES_DEBUG)
-		printf(";; res_querydomain(%s, %s, %d, %d)\n",
-		       name, domain?domain:"<Nil>", class, type);
-#endif
-	if (domain == NULL) {
-		/*
-		 * Check for trailing '.';
-		 * copy without '.' if present.
-		 */
-		n = strlen(name);
-		if (n >= MAXDNAME) {
-			h_errno = NO_RECOVERY;
-			return (-1);
-		}
-		n--;
-		if (n >= 0 && name[n] == '.') {
-			strncpy(nbuf, name, n);
-			nbuf[n] = '\0';
-		} else
-			longname = name;
-	} else {
-		n = strlen(name);
-		d = strlen(domain);
-		if (n + d + 1 >= MAXDNAME) {
-			h_errno = NO_RECOVERY;
-			return (-1);
-		}
-		sprintf(nbuf, "%s.%s", name, domain);
-	}
-	return (res_query(longname, class, type, answer, anslen));
-}
-
-const char *
-hostalias(name)
-	const char *name;
-{
-	register char *cp1, *cp2;
-	FILE *fp;
-	char *file;
-	char buf[BUFSIZ];
-	static char abuf[MAXDNAME];
-
-	if (_res.options & RES_NOALIASES)
-		return (NULL);
-	if (issetugid())
-		return (NULL);
-	file = getenv("HOSTALIASES");
-	if (file == NULL || (fp = fopen(file, "r")) == NULL)
-		return (NULL);
-	setbuf(fp, NULL);
-	buf[sizeof(buf) - 1] = '\0';
-	while (fgets(buf, sizeof(buf), fp)) {
-		for (cp1 = buf; *cp1 && !isspace((int)*cp1); ++cp1)
-			;
-		if (!*cp1)
-			break;
-		*cp1 = '\0';
-		if (!strcasecmp(buf, name)) {
-			while (isspace((int)*++cp1))
-				;
-			if (!*cp1)
-				break;
-			for (cp2 = cp1 + 1; *cp2 && !isspace((int)*cp2); ++cp2)
-				;
-			abuf[sizeof(abuf) - 1] = *cp2 = '\0';
-			strncpy(abuf, cp1, sizeof(abuf) - 1);
-			fclose(fp);
-			return (abuf);
-		}
-	}
-	fclose(fp);
-	return (NULL);
-}
diff --git a/cpukit/libnetworking/libc/res_send.c b/cpukit/libnetworking/libc/res_send.c
deleted file mode 100644
index 08cb78490f..0000000000
--- a/cpukit/libnetworking/libc/res_send.c
+++ /dev/null
@@ -1,929 +0,0 @@
-/*
- * Copyright (c) 1985, 1989, 1993
- *    The Regents of the University of California.  All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- * 	This product includes software developed by the University of
- * 	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-/*
- * Portions Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)res_send.c	8.1 (Berkeley) 6/4/93";
-static char orig_rcsid[] = "From: Id: res_send.c,v 8.20 1998/04/06 23:27:51 halley Exp $";
-static char rcsid[] = "$Id$";
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * Send query to name server and wait for reply.
- */
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/socket.h>
-#include <sys/uio.h>
-
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <arpa/inet.h>
-
-#include <errno.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <poll.h>
-
-#include "res_config.h"
-
-#if !defined(__rtems__)
-#ifdef NOPOLL			/* libc_r doesn't wrap poll yet() */
-static int use_poll = 0;
-#else
-static int use_poll = 1;	/* adapt to poll() syscall availability */
-				/* 0 = not present, 1 = try it, 2 = exists */
-#endif
-#endif
-
-static int s = -1;		/* socket used for communications */
-static int connected = 0;	/* is the socket connected */
-static int vc = 0;		/* is the socket a virtual circuit? */
-static res_send_qhook Qhook = NULL;
-static res_send_rhook Rhook = NULL;
-
-
-#define CAN_RECONNECT 1
-
-#ifndef DEBUG
-#   define Dprint(cond, args) /*empty*/
-#   define DprintQ(cond, args, query, size) /*empty*/
-#   define Aerror(file, string, error, address) /*empty*/
-#   define Perror(file, string, error) /*empty*/
-#else
-#   define Dprint(cond, args) if (cond) {fprintf args;} else {}
-#   define DprintQ(cond, args, query, size) if (cond) {\
-			fprintf args;\
-			__fp_nquery(query, size, stdout);\
-		} else {}
-    static void
-    Aerror(file, string, error, address)
-	FILE *file;
-	char *string;
-	int error;
-	struct sockaddr_in address;
-    {
-	int save = errno;
-
-	if (_res.options & RES_DEBUG) {
-		fprintf(file, "res_send: %s ([%s].%u): %s\n",
-			string,
-			inet_ntoa(address.sin_addr),
-			ntohs(address.sin_port),
-			strerror(error));
-	}
-	errno = save;
-    }
-    static void
-    Perror(file, string, error)
-	FILE *file;
-	char *string;
-	int error;
-    {
-	int save = errno;
-
-	if (_res.options & RES_DEBUG) {
-		fprintf(file, "res_send: %s: %s\n",
-			string, strerror(error));
-	}
-	errno = save;
-    }
-#endif
-
-void
-res_send_setqhook(hook)
-	res_send_qhook hook;
-{
-
-	Qhook = hook;
-}
-
-void
-res_send_setrhook(hook)
-	res_send_rhook hook;
-{
-
-	Rhook = hook;
-}
-
-/* int
- * res_isourserver(ina)
- *	looks up "ina" in _res.ns_addr_list[]
- * returns:
- *	0  : not found
- *	>0 : found
- * author:
- *	paul vixie, 29may94
- */
-int
-res_isourserver(inp)
-	const struct sockaddr_in *inp;
-{
-	struct sockaddr_in ina;
-	int ns, ret;
-
-	ina = *inp;
-	ret = 0;
-	for (ns = 0;  ns < _res.nscount;  ns++) {
-		const struct sockaddr_in *srv = &_res.nsaddr_list[ns];
-
-		if (srv->sin_family == ina.sin_family &&
-		    srv->sin_port == ina.sin_port &&
-		    (srv->sin_addr.s_addr == INADDR_ANY ||
-		     srv->sin_addr.s_addr == ina.sin_addr.s_addr)) {
-			ret++;
-			break;
-		}
-	}
-	return (ret);
-}
-
-/* int
- * res_nameinquery(name, type, class, buf, eom)
- *	look for (name,type,class) in the query section of packet (buf,eom)
- * requires:
- *	buf + HFIXEDSZ <= eom
- * returns:
- *	-1 : format error
- *	0  : not found
- *	>0 : found
- * author:
- *	paul vixie, 29may94
- */
-int
-res_nameinquery(name, type, class, buf, eom)
-	const char *name;
-	int type, class;
-	const u_char *buf, *eom;
-{
-	const u_char *cp = buf + HFIXEDSZ;
-	int qdcount = ntohs(((HEADER*)buf)->qdcount);
-
-	while (qdcount-- > 0) {
-		char tname[MAXDNAME+1];
-		int n, ttype, tclass;
-
-		n = dn_expand(buf, eom, cp, tname, sizeof tname);
-		if (n < 0)
-			return (-1);
-		cp += n;
-		if (cp + 2 * INT16SZ > eom)
-			return (-1);
-		ttype = ns_get16(cp); cp += INT16SZ;
-		tclass = ns_get16(cp); cp += INT16SZ;
-		if (ttype == type &&
-		    tclass == class &&
-		    strcasecmp(tname, name) == 0)
-			return (1);
-	}
-	return (0);
-}
-
-/* int
- * res_queriesmatch(buf1, eom1, buf2, eom2)
- *	is there a 1:1 mapping of (name,type,class)
- *	in (buf1,eom1) and (buf2,eom2)?
- * returns:
- *	-1 : format error
- *	0  : not a 1:1 mapping
- *	>0 : is a 1:1 mapping
- * author:
- *	paul vixie, 29may94
- */
-int
-res_queriesmatch(buf1, eom1, buf2, eom2)
-	const u_char *buf1, *eom1;
-	const u_char *buf2, *eom2;
-{
-	const u_char *cp = buf1 + HFIXEDSZ;
-	int qdcount = ntohs(((HEADER*)buf1)->qdcount);
-
-	if (buf1 + HFIXEDSZ > eom1 || buf2 + HFIXEDSZ > eom2)
-		return (-1);
-
-	/*
-	 * Only header section present in replies to
-	 * dynamic update packets.
-	 */
-	if ( (((HEADER *)buf1)->opcode == ns_o_update) &&
-	     (((HEADER *)buf2)->opcode == ns_o_update) )
-		return (1);
-
-	if (qdcount != ntohs(((HEADER*)buf2)->qdcount))
-		return (0);
-	while (qdcount-- > 0) {
-		char tname[MAXDNAME+1];
-		int n, ttype, tclass;
-
-		n = dn_expand(buf1, eom1, cp, tname, sizeof tname);
-		if (n < 0)
-			return (-1);
-		cp += n;
-		if (cp + 2 * INT16SZ > eom1)
-			return (-1);
-		ttype = ns_get16(cp);	cp += INT16SZ;
-		tclass = ns_get16(cp); cp += INT16SZ;
-		if (!res_nameinquery(tname, ttype, tclass, buf2, eom2))
-			return (0);
-	}
-	return (1);
-}
-
-int
-res_send(buf, buflen, ans, anssiz)
-	const u_char *buf;
-	int buflen;
-	u_char *ans;
-	int anssiz;
-{
-	HEADER *hp = (HEADER *) buf;
-	HEADER *anhp = (HEADER *) ans;
-	int gotsomewhere, connreset, terrno, try, v_circuit, resplen, ns, n;
-	u_int badns;	/* XXX NSMAX can't exceed #/bits in this variable */
-
-	if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
-		/* errno should have been set by res_init() in this case. */
-		return (-1);
-	}
-	if (anssiz < HFIXEDSZ) {
-		errno = EINVAL;
-		return (-1);
-	}
-	DprintQ((_res.options & RES_DEBUG) || (_res.pfcode & RES_PRF_QUERY),
-		(stdout, ";; res_send()\n"), buf, buflen);
-	v_circuit = (_res.options & RES_USEVC) || buflen > PACKETSZ;
-	gotsomewhere = 0;
-	connreset = 0;
-	terrno = ETIMEDOUT;
-	badns = 0;
-
-	/*
-	 * Send request, RETRY times, or until successful
-	 */
-	for (try = 0; try < _res.retry; try++) {
-	    for (ns = 0; ns < _res.nscount; ns++) {
-		struct sockaddr_in *nsap = &_res.nsaddr_list[ns];
-    same_ns:
-		if (badns & (1 << ns)) {
-			res_close();
-			goto next_ns;
-		}
-
-		if (Qhook) {
-			int done = 0, loops = 0;
-
-			do {
-				res_sendhookact act;
-
-				act = (*Qhook)(&nsap, &buf, &buflen,
-					       ans, anssiz, &resplen);
-				switch (act) {
-				case res_goahead:
-					done = 1;
-					break;
-				case res_nextns:
-					res_close();
-					goto next_ns;
-				case res_done:
-					return (resplen);
-				case res_modified:
-					/* give the hook another try */
-					if (++loops < 42) /*doug adams*/
-						break;
-					/*FALLTHROUGH*/
-				case res_error:
-					/*FALLTHROUGH*/
-				default:
-					return (-1);
-				}
-			} while (!done);
-		}
-
-		Dprint(_res.options & RES_DEBUG,
-		       (stdout, ";; Querying server (# %d) address = %s\n",
-			ns + 1, inet_ntoa(nsap->sin_addr)));
-
-		if (v_circuit) {
-			int truncated;
-#if !defined(__rtems__)
-			struct iovec iov[2];
-#endif
-			u_short len;
-			u_char *cp;
-
-			/*
-			 * Use virtual circuit;
-			 * at most one attempt per server.
-			 */
-			try = _res.retry;
-			truncated = 0;
-			if (s < 0 || !vc || hp->opcode == ns_o_update) {
-				if (s >= 0)
-					res_close();
-
-				s = socket(PF_INET, SOCK_STREAM, 0);
-				if (s < 0) {
-					terrno = errno;
-					Perror(stderr, "socket(vc)", errno);
-					return (-1);
-				}
-				errno = 0;
-				if (connect(s, (struct sockaddr *)nsap,
-					    sizeof *nsap) < 0) {
-					terrno = errno;
-					Aerror(stderr, "connect/vc",
-					       errno, *nsap);
-					badns |= (1 << ns);
-					res_close();
-					goto next_ns;
-				}
-				vc = 1;
-			}
-			/*
-			 * Send length & message
-			 */
-			putshort((u_short)buflen, (u_char*)&len);
-#if !defined(__rtems__)
-			iov[0].iov_base = (caddr_t)&len;
-			iov[0].iov_len = INT16SZ;
-			iov[1].iov_base = (caddr_t)buf;
-			iov[1].iov_len = buflen;
-			if (writev(s, iov, 2) != (INT16SZ + buflen)) {
-#else
-			/*
-			 * RTEMS doesn't have writev (yet)
-			 */
-			if ((write (s, &len, INT16SZ) != INT16SZ)
-			 || (write (s, buf, buflen) != buflen)) {
-#endif
-				terrno = errno;
-				Perror(stderr, "write failed", errno);
-				badns |= (1 << ns);
-				res_close();
-				goto next_ns;
-			}
-			/*
-			 * Receive length & response
-			 */
-read_len:
-			cp = ans;
-			len = INT16SZ;
-			while ((n = read(s, (char *)cp, (int)len)) > 0) {
-				cp += n;
-				if ((len -= n) <= 0)
-					break;
-			}
-			if (n <= 0) {
-				terrno = errno;
-				Perror(stderr, "read failed", errno);
-				res_close();
-				/*
-				 * A long running process might get its TCP
-				 * connection reset if the remote server was
-				 * restarted.  Requery the server instead of
-				 * trying a new one.  When there is only one
-				 * server, this means that a query might work
-				 * instead of failing.  We only allow one reset
-				 * per query to prevent looping.
-				 */
-				if (terrno == ECONNRESET && !connreset) {
-					connreset = 1;
-					res_close();
-					goto same_ns;
-				}
-				res_close();
-				goto next_ns;
-			}
-			resplen = ns_get16(ans);
-			if (resplen > anssiz) {
-				Dprint(_res.options & RES_DEBUG,
-				       (stdout, ";; response truncated\n")
-				       );
-				truncated = 1;
-				len = anssiz;
-			} else
-				len = resplen;
-			if (len < HFIXEDSZ) {
-				/*
-				 * Undersized message.
-				 */
-				Dprint(_res.options & RES_DEBUG,
-				       (stdout, ";; undersized: %d\n", len));
-				terrno = EMSGSIZE;
-				badns |= (1 << ns);
-				res_close();
-				goto next_ns;
-			}
-			cp = ans;
-			while (len != 0 &&
-			       (n = read(s, (char *)cp, (int)len)) > 0) {
-				cp += n;
-				len -= n;
-			}
-			if (n <= 0) {
-				terrno = errno;
-				Perror(stderr, "read(vc)", errno);
-				res_close();
-				goto next_ns;
-			}
-			if (truncated) {
-				/*
-				 * Flush rest of answer
-				 * so connection stays in synch.
-				 */
-				anhp->tc = 1;
-				len = resplen - anssiz;
-				while (len != 0) {
-					char junk[PACKETSZ];
-
-					n = (len > sizeof(junk)
-					     ? sizeof(junk)
-					     : len);
-					if ((n = read(s, junk, n)) > 0)
-						len -= n;
-					else
-						break;
-				}
-			}
-			/*
-			 * The calling applicating has bailed out of
-			 * a previous call and failed to arrange to have
-			 * the circuit closed or the server has got
-			 * itself confused. Anyway drop the packet and
-			 * wait for the correct one.
-			 */
-			if (hp->id != anhp->id) {
-				DprintQ((_res.options & RES_DEBUG) ||
-					(_res.pfcode & RES_PRF_REPLY),
-					(stdout, ";; old answer (unexpected):\n"),
-					ans, (resplen>anssiz)?anssiz:resplen);
-				goto read_len;
-			}
-		} else {
-			/*
-			 * Use datagrams.
-			 */
-#ifndef NOPOLL
-			struct pollfd pfd;
-			int msec;
-#endif
-			struct timeval timeout;
-#ifndef NOSELECT
-			fd_set dsmask, *dsmaskp;
-			int dsmasklen;
-#endif
-			struct sockaddr_in from;
-			int fromlen;
-
-			if ((s < 0) || vc) {
-				if (vc)
-					res_close();
-				s = socket(PF_INET, SOCK_DGRAM, 0);
-				if (s < 0) {
-#ifndef CAN_RECONNECT
- bad_dg_sock:
-#endif
-					terrno = errno;
-					Perror(stderr, "socket(dg)", errno);
-					return (-1);
-				}
-				connected = 0;
-			}
-#ifndef CANNOT_CONNECT_DGRAM
-			/*
-			 * On a 4.3BSD+ machine (client and server,
-			 * actually), sending to a nameserver datagram
-			 * port with no nameserver will cause an
-			 * ICMP port unreachable message to be returned.
-			 * If our datagram socket is "connected" to the
-			 * server, we get an ECONNREFUSED error on the next
-			 * socket operation, and select returns if the
-			 * error message is received.  We can thus detect
-			 * the absence of a nameserver without timing out.
-			 * If we have sent queries to at least two servers,
-			 * however, we don't want to remain connected,
-			 * as we wish to receive answers from the first
-			 * server to respond.
-			 */
-			if (_res.nscount == 1 || (try == 0 && ns == 0)) {
-				/*
-				 * Connect only if we are sure we won't
-				 * receive a response from another server.
-				 */
-				if (!connected) {
-					if (connect(s, (struct sockaddr *)nsap,
-						    sizeof *nsap
-						    ) < 0) {
-						Aerror(stderr,
-						       "connect(dg)",
-						       errno, *nsap);
-						badns |= (1 << ns);
-						res_close();
-						goto next_ns;
-					}
-					connected = 1;
-				}
-				if (send(s, (char*)buf, buflen, 0) != buflen) {
-					Perror(stderr, "send", errno);
-					badns |= (1 << ns);
-					res_close();
-					goto next_ns;
-				}
-			} else {
-				/*
-				 * Disconnect if we want to listen
-				 * for responses from more than one server.
-				 */
-				if (connected) {
-#ifdef CAN_RECONNECT
-					struct sockaddr_in no_addr;
-
-					no_addr.sin_family = AF_INET;
-					no_addr.sin_addr.s_addr = INADDR_ANY;
-					no_addr.sin_port = 0;
-					(void) connect(s,
-						       (struct sockaddr *)
-						        &no_addr,
-						       sizeof no_addr);
-#else
-					int s1 = socket(PF_INET, SOCK_DGRAM,0);
-					if (s1 < 0)
-						goto bad_dg_sock;
-					(void) dup2(s1, s);
-					(void) close(s1);
-					Dprint(_res.options & RES_DEBUG,
-						(stdout, ";; new DG socket\n"))
-#endif /* CAN_RECONNECT */
-					connected = 0;
-					errno = 0;
-				}
-#endif /* !CANNOT_CONNECT_DGRAM */
-				if (sendto(s, (char*)buf, buflen, 0,
-					   (struct sockaddr *)nsap,
-					   sizeof *nsap)
-				    != buflen) {
-					Aerror(stderr, "sendto", errno, *nsap);
-					badns |= (1 << ns);
-					res_close();
-					goto next_ns;
-				}
-#ifndef CANNOT_CONNECT_DGRAM
-			}
-#endif /* !CANNOT_CONNECT_DGRAM */
-
-			/*
-			 * Wait for reply
-			 */
-#ifndef NOPOLL
-    othersyscall:
-			if (use_poll) {
-				msec = (_res.retrans << try) * 1000;
-				if (try > 0)
-					msec /= _res.nscount;
-				if (msec <= 0)
-					msec = 1000;
-			} else {
-#endif
-				timeout.tv_sec = (_res.retrans << try);
-				if (try > 0)
-					timeout.tv_sec /= _res.nscount;
-				if ((long) timeout.tv_sec <= 0)
-					timeout.tv_sec = 1;
-				timeout.tv_usec = 0;
-#ifndef NOPOLL
-			}
-#endif
-    wait:
-			if (s < 0) {
-				Perror(stderr, "s out-of-bounds", EMFILE);
-				res_close();
-				goto next_ns;
-			}
-#ifndef NOPOLL
-			if (use_poll) {
-				struct sigaction sa, osa;
-				int sigsys_installed = 0;
-
-				pfd.fd = s;
-				pfd.events = POLLIN;
-				if (use_poll == 1) {
-					bzero(&sa, sizeof(sa));
-					sa.sa_handler = SIG_IGN;
-					if (sigaction(SIGSYS, &sa, &osa) >= 0)
-						sigsys_installed = 1;
-				}
-				n = poll(&pfd, 1, msec);
-				if (sigsys_installed == 1) {
-					int oerrno = errno;
-					sigaction(SIGSYS, &osa, NULL);
-					errno = oerrno;
-				}
-				/* XXX why does nosys() return EINVAL? */
-				if (n < 0 && (errno == ENOSYS ||
-				    errno == EINVAL)) {
-					use_poll = 0;
-					goto othersyscall;
-				} else if (use_poll == 1)
-					use_poll = 2;
-				if (n < 0) {
-					if (errno == EINTR)
-						goto wait;
-					Perror(stderr, "poll", errno);
-					res_close();
-					goto next_ns;
-				}
-			} else {
-#endif
-#ifndef NOSELECT
-				dsmasklen = howmany(s + 1, NFDBITS) *
-					    sizeof(fd_mask);
-				if (dsmasklen > sizeof(fd_set)) {
-					dsmaskp = (fd_set *)malloc(dsmasklen);
-					if (dsmaskp == NULL) {
-						res_close();
-						goto next_ns;
-					}
-				} else
-					dsmaskp = &dsmask;
-				/* only zero what we need */
-				bzero((char *)dsmaskp, dsmasklen);
-				FD_SET(s, dsmaskp);
-				n = select(s + 1, dsmaskp, (fd_set *)NULL,
-					   (fd_set *)NULL, &timeout);
-				if (dsmaskp != &dsmask)
-					free(dsmaskp);
-				if (n < 0) {
-					if (errno == EINTR)
-						goto wait;
-					Perror(stderr, "select", errno);
-					res_close();
-					goto next_ns;
-				}
-#endif
-#ifndef NOPOLL
-			}
-#endif
-
-#ifdef NOSELECT
-			setsockopt (s, SOL_SOCKET, SO_RCVTIMEO, &timeout, sizeof timeout);
-#else
-			if (n == 0) {
-				/*
-				 * timeout
-				 */
-				Dprint(_res.options & RES_DEBUG,
-				       (stdout, ";; timeout\n"));
-				gotsomewhere = 1;
-				res_close();
-				goto next_ns;
-			}
-#endif
-			errno = 0;
-			fromlen = sizeof(struct sockaddr_in);
-			resplen = recvfrom(s, (char*)ans, anssiz, 0,
-					   (struct sockaddr *)&from, &fromlen);
-			if (resplen <= 0) {
-#ifdef NOSELECT
-				if (errno == ETIMEDOUT) {
-					Dprint(_res.options & RES_DEBUG,
-					       (stdout, ";; timeout\n"));
-					gotsomewhere = 1;
-					res_close();
-					goto next_ns;
-				}
-#endif
-				Perror(stderr, "recvfrom", errno);
-				res_close();
-				goto next_ns;
-			}
-			gotsomewhere = 1;
-			if (resplen < HFIXEDSZ) {
-				/*
-				 * Undersized message.
-				 */
-				Dprint(_res.options & RES_DEBUG,
-				       (stdout, ";; undersized: %d\n",
-					resplen));
-				terrno = EMSGSIZE;
-				badns |= (1 << ns);
-				res_close();
-				goto next_ns;
-			}
-			if (hp->id != anhp->id) {
-				/*
-				 * response from old query, ignore it.
-				 * XXX - potential security hazard could
-				 *	 be detected here.
-				 */
-				DprintQ((_res.options & RES_DEBUG) ||
-					(_res.pfcode & RES_PRF_REPLY),
-					(stdout, ";; old answer:\n"),
-					ans, (resplen>anssiz)?anssiz:resplen);
-				goto wait;
-			}
-#ifdef CHECK_SRVR_ADDR
-			if (!(_res.options & RES_INSECURE1) &&
-			    !res_isourserver(&from)) {
-				/*
-				 * response from wrong server? ignore it.
-				 * XXX - potential security hazard could
-				 *	 be detected here.
-				 */
-				DprintQ((_res.options & RES_DEBUG) ||
-					(_res.pfcode & RES_PRF_REPLY),
-					(stdout, ";; not our server:\n"),
-					ans, (resplen>anssiz)?anssiz:resplen);
-				goto wait;
-			}
-#endif
-			if (!(_res.options & RES_INSECURE2) &&
-			    !res_queriesmatch(buf, buf + buflen,
-					      ans, ans + anssiz)) {
-				/*
-				 * response contains wrong query? ignore it.
-				 * XXX - potential security hazard could
-				 *	 be detected here.
-				 */
-				DprintQ((_res.options & RES_DEBUG) ||
-					(_res.pfcode & RES_PRF_REPLY),
-					(stdout, ";; wrong query name:\n"),
-					ans, (resplen>anssiz)?anssiz:resplen);
-				goto wait;
-			}
-			if (anhp->rcode == SERVFAIL ||
-			    anhp->rcode == NOTIMP ||
-			    anhp->rcode == REFUSED) {
-				DprintQ(_res.options & RES_DEBUG,
-					(stdout, "server rejected query:\n"),
-					ans, (resplen>anssiz)?anssiz:resplen);
-				badns |= (1 << ns);
-				res_close();
-				/* don't retry if called from dig */
-				if (!_res.pfcode)
-					goto next_ns;
-			}
-			if (!(_res.options & RES_IGNTC) && anhp->tc) {
-				/*
-				 * get rest of answer;
-				 * use TCP with same server.
-				 */
-				Dprint(_res.options & RES_DEBUG,
-				       (stdout, ";; truncated answer\n"));
-				v_circuit = 1;
-				res_close();
-				goto same_ns;
-			}
-		} /*if vc/dg*/
-		Dprint((_res.options & RES_DEBUG) ||
-		       ((_res.pfcode & RES_PRF_REPLY) &&
-			(_res.pfcode & RES_PRF_HEAD1)),
-		       (stdout, ";; got answer:\n"));
-		DprintQ((_res.options & RES_DEBUG) ||
-			(_res.pfcode & RES_PRF_REPLY),
-			(stdout, "%s", ""),
-			ans, (resplen>anssiz)?anssiz:resplen);
-		/*
-		 * If using virtual circuits, we assume that the first server
-		 * is preferred over the rest (i.e. it is on the local
-		 * machine) and only keep that one open.
-		 * If we have temporarily opened a virtual circuit,
-		 * or if we haven't been asked to keep a socket open,
-		 * close the socket.
-		 */
-		if ((v_circuit && (!(_res.options & RES_USEVC) || ns != 0)) ||
-		    !(_res.options & RES_STAYOPEN)) {
-			res_close();
-		}
-		if (Rhook) {
-			int done = 0, loops = 0;
-
-			do {
-				res_sendhookact act;
-
-				act = (*Rhook)(nsap, buf, buflen,
-					       ans, anssiz, &resplen);
-				switch (act) {
-				case res_goahead:
-				case res_done:
-					done = 1;
-					break;
-				case res_nextns:
-					res_close();
-					goto next_ns;
-				case res_modified:
-					/* give the hook another try */
-					if (++loops < 42) /*doug adams*/
-						break;
-					/*FALLTHROUGH*/
-				case res_error:
-					/*FALLTHROUGH*/
-				default:
-					return (-1);
-				}
-			} while (!done);
-
-		}
-		return (resplen);
-    next_ns: ;
-	   } /*foreach ns*/
-	} /*foreach retry*/
-	res_close();
-	if (!v_circuit) {
-		if (!gotsomewhere)
-			errno = ECONNREFUSED;	/* no nameservers found */
-		else
-			errno = ETIMEDOUT;	/* no answer obtained */
-	} else
-		errno = terrno;
-	return (-1);
-}
-
-/*
- * This routine is for closing the socket if a virtual circuit is used and
- * the program wants to close it.  This provides support for endhostent()
- * which expects to close the socket.
- *
- * This routine is not expected to be user visible.
- */
-void
-res_close()
-{
-	if (s >= 0) {
-		(void) close(s);
-		s = -1;
-		connected = 0;
-		vc = 0;
-	}
-}
diff --git a/cpukit/libnetworking/libc/res_stubs.c b/cpukit/libnetworking/libc/res_stubs.c
deleted file mode 100644
index 92cf0fac54..0000000000
--- a/cpukit/libnetworking/libc/res_stubs.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (C) 1996 Peter Wemm <peter@freebsd.org>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $Id$
- */
-
-/*
- * This file is for FreeBSD-3.0 that has a bind-4.9.5-P1 derived
- * resolver in the libc.  It provides aliases for functions that
- * have moved since 4.9.4-P1.
- *
- * I'll save everybody the trouble and say it now:  *THIS IS A HACK*!
- *
- * Yes, many of these are private functions to the resolver, but some are
- * needed as there is no other way to provide the functionality and they've
- * turned up all over the place. :-(
- */
-
-#include <sys/types.h>
-#include <sys/cdefs.h>
-
-__weak_reference(__inet_addr, inet_addr);
-__weak_reference(__inet_aton, inet_aton);
-__weak_reference(__inet_lnaof, inet_lnaof);
-__weak_reference(__inet_makeaddr, inet_makeaddr);
-__weak_reference(__inet_neta, inet_neta);
-__weak_reference(__inet_netof, inet_netof);
-__weak_reference(__inet_network, inet_network);
-__weak_reference(__inet_net_ntop, inet_net_ntop);
-__weak_reference(__inet_net_pton, inet_net_pton);
-__weak_reference(__inet_ntoa, inet_ntoa);
-__weak_reference(__inet_pton, inet_pton);
-__weak_reference(__inet_ntop, inet_ntop);
-__weak_reference(__inet_nsap_addr, inet_nsap_addr);
-__weak_reference(__inet_nsap_ntoa, inet_nsap_ntoa);
-
-__weak_reference(__sym_ston, sym_ston);
-__weak_reference(__sym_ntos, sym_ntos);
-__weak_reference(__sym_ntop, sym_ntop);
-__weak_reference(__fp_resstat, fp_resstat);
-__weak_reference(__p_query, p_query);
-__weak_reference(__p_fqnname, p_fqnname);
-__weak_reference(__p_secstodate, p_secstodate);
-__weak_reference(__dn_count_labels, dn_count_labels);
-__weak_reference(__dn_comp, dn_comp);
-__weak_reference(__res_close, _res_close);
-__weak_reference(__dn_expand, dn_expand);
-__weak_reference(__res_init, res_init);
-__weak_reference(__res_query, res_query);
-__weak_reference(__res_search, res_search);
-__weak_reference(__res_querydomain, res_querydomain);
-__weak_reference(__res_mkquery, res_mkquery);
-__weak_reference(__res_send, res_send);
diff --git a/cpukit/libnetworking/libc/res_update.c b/cpukit/libnetworking/libc/res_update.c
deleted file mode 100644
index ef591e0674..0000000000
--- a/cpukit/libnetworking/libc/res_update.c
+++ /dev/null
@@ -1,518 +0,0 @@
-#if !defined(__rtems__)
-#if !defined(lint) && !defined(SABER)
-static char rcsid[] = "$Id$";
-#endif /* not lint */
-#endif /* not rtems */
-
-/*
- * Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-/*
- * Based on the Dynamic DNS reference implementation by Viraj Bais
- * <viraj_bais@ccm.fm.intel.com>
- */
-
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-#include <errno.h>
-#include <limits.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-/*
- * Separate a linked list of records into groups so that all records
- * in a group will belong to a single zone on the nameserver.
- * Create a dynamic update packet for each zone and send it to the
- * nameservers for that zone, and await answer.
- * Abort if error occurs in updating any zone.
- * Return the number of zones updated on success, < 0 on error.
- *
- * On error, caller must deal with the unsynchronized zones
- * eg. an A record might have been successfully added to the forward
- * zone but the corresponding PTR record would be missing if error
- * was encountered while updating the reverse zone.
- */
-
-#define NSMAX 16
-
-struct ns1 {
-	char nsname[MAXDNAME];
-	struct in_addr nsaddr1;
-};
-
-struct zonegrp {
-	char 		z_origin[MAXDNAME];
-	int16_t		z_class;
-	char		z_soardata[MAXDNAME + 5 * INT32SZ];
-	struct ns1 	z_ns[NSMAX];
-	int		z_nscount;
-	ns_updrec *	z_rr;
-	struct zonegrp *z_next;
-};
-
-
-int
-res_update(ns_updrec *rrecp_in) {
-	ns_updrec *rrecp, *tmprrecp;
-	u_char buf[PACKETSZ], answer[PACKETSZ], packet[2*PACKETSZ];
-	char name[MAXDNAME], zname[MAXDNAME], primary[MAXDNAME],
-	     mailaddr[MAXDNAME];
-	u_char soardata[2*MAXCDNAME+5*INT32SZ];
-	char *dname, *svdname, *cp1, *target;
-	u_char *cp, *eom;
-	HEADER *hp = (HEADER *) answer;
-	struct zonegrp *zptr = NULL, *tmpzptr, *prevzptr, *zgrp_start = NULL;
-	int i, j, k = 0, n, ancount, nscount, arcount, rcode, rdatasize,
-	    newgroup, done, myzone, seen_before, numzones = 0;
-	u_int16_t dlen, class, qclass, type, qtype;
-	u_int32_t ttl;
-
-	if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
-		h_errno = NETDB_INTERNAL;
-		return (-1);
-	}
-
-	for (rrecp = rrecp_in; rrecp; rrecp = rrecp->r_next) {
-		dname = rrecp->r_dname;
-		n = strlen(dname);
-		if (dname[n-1] == '.')
-			dname[n-1] = '\0';
-		qtype = T_SOA;
-		qclass = rrecp->r_class;
-		done = 0;
-		seen_before = 0;
-
-		while (!done && dname) {
-		    if (qtype == T_SOA) {
-			for (tmpzptr = zgrp_start;
-			     tmpzptr && !seen_before;
-			     tmpzptr = tmpzptr->z_next) {
-				if (strcasecmp(dname,
-					       tmpzptr->z_origin) == 0 &&
-				    tmpzptr->z_class == qclass)
-					seen_before++;
-				for (tmprrecp = tmpzptr->z_rr;
-				     tmprrecp && !seen_before;
-				     tmprrecp = tmprrecp->r_grpnext)
-				if (strcasecmp(dname, tmprrecp->r_dname) == 0
-				    && tmprrecp->r_class == qclass) {
-					seen_before++;
-					break;
-				}
-				if (seen_before) {
-					/*
-					 * Append to the end of
-					 * current group.
-					 */
-					for (tmprrecp = tmpzptr->z_rr;
-					     tmprrecp->r_grpnext;
-					     tmprrecp = tmprrecp->r_grpnext)
-						(void)NULL;
-					tmprrecp->r_grpnext = rrecp;
-					rrecp->r_grpnext = NULL;
-					done = 1;
-					break;
-				}
-			}
-		} else if (qtype == T_A) {
-		    for (tmpzptr = zgrp_start;
-			 tmpzptr && !done;
-			 tmpzptr = tmpzptr->z_next)
-			    for (i = 0; i < tmpzptr->z_nscount; i++)
-				if (tmpzptr->z_class == qclass &&
-				    strcasecmp(tmpzptr->z_ns[i].nsname,
-					       dname) == 0 &&
-				    tmpzptr->z_ns[i].nsaddr1.s_addr != 0) {
-					zptr->z_ns[k].nsaddr1.s_addr =
-					 tmpzptr->z_ns[i].nsaddr1.s_addr;
-					done = 1;
-					break;
-				}
-		}
-		if (done)
-		    break;
-		n = res_mkquery(QUERY, dname, qclass, qtype, NULL,
-				0, NULL, buf, sizeof buf);
-		if (n <= 0) {
-		    fprintf(stderr, "res_update: mkquery failed\n");
-		    return (n);
-		}
-		n = res_send(buf, n, answer, sizeof answer);
-		if (n < 0) {
-		    fprintf(stderr, "res_update: send error for %s\n",
-			    rrecp->r_dname);
-		    return (n);
-		}
-		if (n < HFIXEDSZ)
-			return (-1);
-		ancount = ntohs(hp->ancount);
-		nscount = ntohs(hp->nscount);
-		arcount = ntohs(hp->arcount);
-		rcode = hp->rcode;
-		cp = answer + HFIXEDSZ;
-		eom = answer + n;
-		/* skip the question section */
-		n = dn_skipname(cp, eom);
-		if (n < 0 || cp + n + 2 * INT16SZ > eom)
-			return (-1);
-		cp += n + 2 * INT16SZ;
-
-		if (qtype == T_SOA) {
-		    if (ancount == 0 && nscount == 0 && arcount == 0) {
-			/*
-			 * if (rcode == NOERROR) then the dname exists but
-			 * has no soa record associated with it.
-			 * if (rcode == NXDOMAIN) then the dname does not
-			 * exist and the server is replying out of NCACHE.
-			 * in either case, proceed with the next try
-			 */
-			dname = strchr(dname, '.');
-			if (dname != NULL)
-				dname++;
-			continue;
-		    } else if ((rcode == NOERROR || rcode == NXDOMAIN) &&
-			       ancount == 0 &&
-			       nscount == 1 && arcount == 0) {
-			/*
-			 * name/data does not exist, soa record supplied in the
-			 * authority section
-			 */
-			/* authority section must contain the soa record */
-			if ((n = dn_expand(answer, eom, cp, zname,
-					sizeof zname)) < 0)
-			    return (n);
-			cp += n;
-			if (cp + 2 * INT16SZ > eom)
-				return (-1);
-			GETSHORT(type, cp);
-			GETSHORT(class, cp);
-			if (type != T_SOA || class != qclass) {
-			    fprintf(stderr, "unknown answer\n");
-			    return (-1);
-			}
-			myzone = 0;
-			svdname = dname;
-			while (dname)
-			    if (strcasecmp(dname, zname) == 0) {
-				myzone = 1;
-				break;
-			    } else if ((dname = strchr(dname, '.')) != NULL)
-				dname++;
-			if (!myzone) {
-			    dname = strchr(svdname, '.');
-			    if (dname != NULL)
-				dname++;
-			    continue;
-			}
-			nscount = 0;
-			/* fallthrough */
-		    } else if (rcode == NOERROR && ancount == 1) {
-			/*
-			 * found the zone name
-			 * new servers will supply NS records for the zone
-			 * in authority section and A records for those 
-			 * nameservers in the additional section
-			 * older servers have to be explicitly queried for
-			 * NS records for the zone
-			 */
-			/* answer section must contain the soa record */
-			if ((n = dn_expand(answer, eom, cp, zname,
-			 	       	   sizeof zname)) < 0)
-				return (n);
-			else
-				cp += n;
-			if (cp + 2 * INT16SZ > eom)
-				return (-1);
-			GETSHORT(type, cp);
-			GETSHORT(class, cp);
-			if (type == T_CNAME) {
-				dname = strchr(dname, '.');
-				if (dname != NULL)
-					dname++;
-				continue;
-			}
-			if (strcasecmp(dname, zname) != 0 ||
-			    type != T_SOA ||
-			    class != rrecp->r_class) {
-				fprintf(stderr, "unknown answer\n");
-				return (-1);
-			}
-			/* FALLTHROUGH */
-		    } else {
-			fprintf(stderr,
-		"unknown response: ans=%d, auth=%d, add=%d, rcode=%d\n",
-				ancount, nscount, arcount, hp->rcode);
-			return (-1);
-		    }
-		    if (cp + INT32SZ + INT16SZ > eom)
-			    return (-1);
-		    /* continue processing the soa record */
-		    GETLONG(ttl, cp);
-		    GETSHORT(dlen, cp);
-		    if (cp + dlen > eom)
-			    return (-1);
-		    newgroup = 1;
-		    zptr = zgrp_start;
-		    prevzptr = NULL;
-		    while (zptr) {
-			if (strcasecmp(zname, zptr->z_origin) == 0 &&
-			    type == T_SOA && class == qclass) {
-				newgroup = 0;
-				break;
-			}
-			prevzptr = zptr;
-			zptr = zptr->z_next;
-		    }
-		    if (!newgroup) {
-			for (tmprrecp = zptr->z_rr;
-			     tmprrecp->r_grpnext;
-			     tmprrecp = tmprrecp->r_grpnext)
-				    ;
-			tmprrecp->r_grpnext = rrecp;
-			rrecp->r_grpnext = NULL;
-			done = 1;
-			cp += dlen;
-			break;
-		    } else {
-			if ((n = dn_expand(answer, eom, cp, primary,
-				       	   sizeof primary)) < 0)
-			    return (n);
-			cp += n;
-			/* 
-			 * We don't have to bounds check here because the
-			 * next use of 'cp' is in dn_expand().
-			 */
-			cp1 = (char *)soardata;
-			strcpy(cp1, primary);
-			cp1 += strlen(cp1) + 1;
-			if ((n = dn_expand(answer, eom, cp, mailaddr,
-				       	   sizeof mailaddr)) < 0)
-			    return (n);
-			cp += n;
-			strcpy(cp1, mailaddr);
-			cp1 += strlen(cp1) + 1;
-			if (cp + 5*INT32SZ > eom)
-				return (-1);
-			memcpy(cp1, cp, 5*INT32SZ);
-			cp += 5*INT32SZ;
-			cp1 += 5*INT32SZ;
-			rdatasize = (u_char *)cp1 - soardata;
-			zptr = calloc(1, sizeof(struct zonegrp));
-			if (zptr == NULL)
-                	    return (-1);
-			if (zgrp_start == NULL)
-			    zgrp_start = zptr;
-			else
-			    prevzptr->z_next = zptr;
-			zptr->z_rr = rrecp;
-			rrecp->r_grpnext = NULL;
-			strcpy(zptr->z_origin, zname);
-			zptr->z_class = class;
-			memcpy(zptr->z_soardata, soardata, rdatasize);
-			/* fallthrough to process NS and A records */
-		    }
-		} else if (qtype == T_NS) {
-		    if (rcode == NOERROR && ancount > 0) {
-			strcpy(zname, dname);
-			for (zptr = zgrp_start; zptr; zptr = zptr->z_next) {
-			    if (strcasecmp(zname, zptr->z_origin) == 0)
-				break;
-			}
-			if (zptr == NULL)
-			    /* should not happen */
-			    return (-1);
-			if (nscount > 0) {
-			    /*
-			     * answer and authority sections contain
-			     * the same information, skip answer section
-			     */
-			    for (j = 0; j < ancount; j++) {
-				n = dn_skipname(cp, eom);
-				if (n < 0)
-					return (-1);
-				n += 2*INT16SZ + INT32SZ;
-				if (cp + n + INT16SZ > eom)
-					return (-1);
-				cp += n;
-				GETSHORT(dlen, cp);
-				cp += dlen;
-			    }
-			} else
-			    nscount = ancount;
-			/* fallthrough to process NS and A records */
-		    } else {
-			fprintf(stderr, "cannot determine nameservers for %s:\
-ans=%d, auth=%d, add=%d, rcode=%d\n",
-				dname, ancount, nscount, arcount, hp->rcode);
-			return (-1);
-		    }
-		} else if (qtype == T_A) {
-		    if (rcode == NOERROR && ancount > 0) {
-			arcount = ancount;
-			ancount = nscount = 0;
-			/* fallthrough to process A records */
-		    } else {
-			fprintf(stderr, "cannot determine address for %s:\
-ans=%d, auth=%d, add=%d, rcode=%d\n",
-				dname, ancount, nscount, arcount, hp->rcode);
-			return (-1);
-		    }
-		}
-		/* process NS records for the zone */
-		j = 0;
-		for (i = 0; i < nscount; i++) {
-		    if ((n = dn_expand(answer, eom, cp, name,
-					sizeof name)) < 0)
-			return (n);
-		    cp += n;
-		    if (cp + 3 * INT16SZ + INT32SZ > eom)
-			    return (-1);
-		    GETSHORT(type, cp);
-		    GETSHORT(class, cp);
-		    GETLONG(ttl, cp);
-		    GETSHORT(dlen, cp);
-		    if (cp + dlen > eom)
-			return (-1);
-		    if (strcasecmp(name, zname) == 0 &&
-			type == T_NS && class == qclass) {
-				if ((n = dn_expand(answer, eom, cp,
-						   name, sizeof name)) < 0)
-					return (n);
-			    target = zptr->z_ns[j++].nsname;
-			    strcpy(target, name);
-		    }
-		    cp += dlen;
-		}
-		if (zptr->z_nscount == 0)
-		    zptr->z_nscount = j;
-		/* get addresses for the nameservers */
-		for (i = 0; i < arcount; i++) {
-		    if ((n = dn_expand(answer, eom, cp, name,
-					sizeof name)) < 0)
-			return (n);
-		    cp += n;
-		    if (cp + 3 * INT16SZ + INT32SZ > eom)
-			return (-1);
-		    GETSHORT(type, cp);
-		    GETSHORT(class, cp);
-		    GETLONG(ttl, cp);
-		    GETSHORT(dlen, cp);
-		    if (cp + dlen > eom)
-			    return (-1);
-		    if (type == T_A && dlen == INT32SZ && class == qclass) {
-			for (j = 0; j < zptr->z_nscount; j++)
-			    if (strcasecmp(name, zptr->z_ns[j].nsname) == 0) {
-				memcpy(&zptr->z_ns[j].nsaddr1.s_addr, cp,
-				       INT32SZ);
-				break;
-			    }
-		    }
-		    cp += dlen;
-		}
-		if (zptr->z_nscount == 0) {
-		    dname = zname;
-		    qtype = T_NS;
-		    continue;
-		}
-		done = 1;
-		for (k = 0; k < zptr->z_nscount; k++)
-		    if (zptr->z_ns[k].nsaddr1.s_addr == 0) {
-			done = 0;
-			dname = zptr->z_ns[k].nsname;
-			qtype = T_A;
-		    }
-
- 	    } /* while */
-	}
-
-	_res.options |= RES_DEBUG;
-	for (zptr = zgrp_start; zptr; zptr = zptr->z_next) {
-
-		/* append zone section */
-		rrecp = res_mkupdrec(ns_s_zn, zptr->z_origin,
-				     zptr->z_class, ns_t_soa, 0);
-		if (rrecp == NULL) {
-			fprintf(stderr, "saverrec error\n");
-			fflush(stderr);
-			return (-1);
-		}
-		rrecp->r_grpnext = zptr->z_rr;
-		zptr->z_rr = rrecp;
-
-		n = res_mkupdate(zptr->z_rr, packet, sizeof packet);
-		if (n < 0) {
-			fprintf(stderr, "res_mkupdate error\n");
-			fflush(stderr);
-			return (-1);
-		} else
-			fprintf(stdout, "res_mkupdate: packet size = %d\n", n);
-
-		/*
-		 * Override the list of NS records from res_init() with
-		 * the authoritative nameservers for the zone being updated.
-		 * Sort primary to be the first in the list of nameservers.
-		 */
-		for (i = 0; i < zptr->z_nscount; i++) {
-			if (strcasecmp(zptr->z_ns[i].nsname,
-				       zptr->z_soardata) == 0) {
-				struct in_addr tmpaddr;
-
-				if (i != 0) {
-					strcpy(zptr->z_ns[i].nsname,
-					       zptr->z_ns[0].nsname);
-					strcpy(zptr->z_ns[0].nsname,
-					       zptr->z_soardata);
-					tmpaddr = zptr->z_ns[i].nsaddr1;
-					zptr->z_ns[i].nsaddr1 =
-						zptr->z_ns[0].nsaddr1;
-					zptr->z_ns[0].nsaddr1 = tmpaddr;
-				}
-				break;
-			}
-		}
-		for (i = 0; i < MAXNS; i++) {
-			_res.nsaddr_list[i].sin_addr = zptr->z_ns[i].nsaddr1;
-			_res.nsaddr_list[i].sin_family = AF_INET;
-			_res.nsaddr_list[i].sin_port = htons(NAMESERVER_PORT);
-		}
-		_res.nscount = (zptr->z_nscount < MAXNS) ? 
-					zptr->z_nscount : MAXNS;
-		n = res_send(packet, n, answer, sizeof(answer));
-		if (n < 0) {
-			fprintf(stderr, "res_send: send error, n=%d\n", n);
-			break;
-		} else
-			numzones++;
-	}
-
-	/* free malloc'ed memory */
-	while(zgrp_start) {
-		zptr = zgrp_start;
-		zgrp_start = zgrp_start->z_next;
-		res_freeupdrec(zptr->z_rr);  /* Zone section we allocated. */
-		free((char *)zptr);
-	}
-
-	return (numzones);
-}
diff --git a/cpukit/libnetworking/libc/resolver.3 b/cpukit/libnetworking/libc/resolver.3
deleted file mode 100644
index 8c6f18334f..0000000000
--- a/cpukit/libnetworking/libc/resolver.3
+++ /dev/null
@@ -1,352 +0,0 @@
-.\" Copyright (c) 1985, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"     @(#)resolver.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
-.\"
-.Dd June 4, 1993
-.Dt RESOLVER 3
-.Os BSD 4.3
-.Sh NAME
-.Nm res_query ,
-.Nm res_search ,
-.Nm res_mkquery ,
-.Nm res_send ,
-.Nm res_init ,
-.Nm dn_comp ,
-.Nm dn_expand
-.Nd resolver routines
-.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <netinet/in.h>
-.Fd #include <arpa/nameser.h>
-.Fd #include <resolv.h>
-.Ft int
-.Fo res_query
-.Fa "const char *dname"
-.Fa "int class"
-.Fa "int type"
-.Fa "u_char *answer"
-.Fa "int anslen"
-.Fc
-.Ft int
-.Fo res_search
-.Fa "const char *dname"
-.Fa "int class"
-.Fa "int type"
-.Fa "u_char *answer"
-.Fa "int anslen"
-.Fc
-.Ft int
-.Fo res_mkquery
-.Fa "int op"
-.Fa "const char *dname"
-.Fa "int class"
-.Fa "int type"
-.Fa "const u_char *data"
-.Fa "int datalen"
-.Fa "const u_char *newrr_in"
-.Fa "u_char *buf"
-.Fa "int buflen"
-.Fc
-.Ft int
-.Fo res_send
-.Fa "const u_char *msg"
-.Fa "int msglen"
-.Fa "u_char *answer"
-.Fa "int anslen"
-.Fc
-.Ft int
-.Fn res_init 
-.Fo dn_comp
-.Fa "const char *exp_dn"
-.Fa "u_char *comp_dn"
-.Fa "int length"
-.Fa "u_char **dnptrs"
-.Fa "u_char **lastdnptr"
-.Fc
-.Ft int
-.Fo dn_expand
-.Fa "const u_char *msg"
-.Fa "const u_char *eomorig"
-.Fa "const u_char *comp_dn"
-.Fa "char *exp_dn"
-.Fa "int length"
-.Fc
-.Sh DESCRIPTION
-These routines are used for making, sending and interpreting
-query and reply messages with Internet domain name servers.
-.Pp
-Global configuration and state information that is used by the
-resolver routines is kept in the structure
-.Em _res .
-Most of the values have reasonable defaults and can be ignored.
-Options
-stored in
-.Em _res.options
-are defined in
-.Pa resolv.h
-and are as follows.
-Options are stored as a simple bit mask containing the bitwise ``or''
-of the options enabled.
-.Bl -tag -width RES_DEFNAMES
-.It Dv RES_INIT
-True if the initial name server address and default domain name are
-initialized (i.e.,
-.Fn res_init
-has been called).
-.It Dv RES_DEBUG
-Print debugging messages.
-.It Dv RES_AAONLY
-Accept authoritative answers only.
-With this option,
-.Fn res_send
-should continue until it finds an authoritative answer or finds an error.
-Currently this is not implemented.
-.It Dv RES_USEVC
-Use
-.Tn TCP
-connections for queries instead of
-.Tn UDP
-datagrams.
-.It Dv RES_STAYOPEN
-Used with
-.Dv RES_USEVC
-to keep the
-.Tn TCP
-connection open between
-queries.
-This is useful only in programs that regularly do many queries.
-.Tn UDP
-should be the normal mode used.
-.It Dv RES_IGNTC
-Unused currently (ignore truncation errors, i.e., don't retry with
-.Tn TCP ) .
-.It Dv RES_RECURSE
-Set the recursion-desired bit in queries.
-This is the default.
-.Pf ( Fn res_send
-does not do iterative queries and expects the name server
-to handle recursion.)
-.It Dv RES_DEFNAMES
-If set,
-.Fn res_search
-will append the default domain name to single-component names
-(those that do not contain a dot).
-This option is enabled by default.
-.It Dv RES_DNSRCH
-If this option is set,
-.Fn res_search
-will search for host names in the current domain and in parent domains; see
-.Xr hostname 7 .
-This is used by the standard host lookup routine
-.Xr gethostbyname 3 .
-This option is enabled by default.
-.It Dv RES_NOALIASES
-This option turns off the user level aliasing feature controlled by the
-.Dq Ev HOSTALIASES
-environment variable.  Network daemons should set this option.
-.El
-.Pp
-The
-.Fn res_init
-routine
-reads the configuration file (if any; see
-.Xr resolver 5 )
-to get the default domain name,
-search list and
-the Internet address of the local name server(s).
-If no server is configured, the host running
-the resolver is tried.
-The current domain name is defined by the hostname
-if not specified in the configuration file;
-it can be overridden by the environment variable
-.Ev LOCALDOMAIN .
-This environment variable may contain several blank-separated
-tokens if you wish to override the
-.Em "search list"
-on a per-process basis.  This is similar to the
-.Em search
-command in the configuration file.
-Another environment variable (
-.Dq Ev RES_OPTIONS
-can be set to
-override certain internal resolver options which are otherwise
-set by changing fields in the
-.Em _res
-structure or are inherited from the configuration file's
-.Em options
-command.  The syntax of the
-.Dq Ev RES_OPTIONS
-environment variable is explained in
-.Xr resolver 5 .
-Initialization normally occurs on the first call
-to one of the following routines.
-.Pp
-The
-.Fn res_query
-function provides an interface to the server query mechanism.
-It constructs a query, sends it to the local server,
-awaits a response, and makes preliminary checks on the reply.
-The query requests information of the specified
-.Fa type
-and
-.Fa class
-for the specified fully-qualified domain name
-.Fa dname .
-The reply message is left in the
-.Fa answer
-buffer with length
-.Fa anslen
-supplied by the caller.
-.Pp
-The
-.Fn res_search
-routine makes a query and awaits a response like
-.Fn res_query ,
-but in addition, it implements the default and search rules
-controlled by the
-.Dv RES_DEFNAMES
-and
-.Dv RES_DNSRCH
-options.
-It returns the first successful reply.
-.Pp
-The remaining routines are lower-level routines used by
-.Fn res_query .
-The
-.Fn res_mkquery
-function
-constructs a standard query message and places it in
-.Fa buf .
-It returns the size of the query, or \-1 if the query is
-larger than
-.Fa buflen .
-The query type
-.Fa op
-is usually
-.Dv QUERY ,
-but can be any of the query types defined in
-.Aq Pa arpa/nameser.h .
-The domain name for the query is given by
-.Fa dname .
-.Fa Newrr
-is currently unused but is intended for making update messages.
-.Pp
-The
-.Fn res_send
-routine
-sends a pre-formatted query and returns an answer.
-It will call
-.Fn res_init
-if
-.Dv RES_INIT
-is not set, send the query to the local name server, and
-handle timeouts and retries.
-The length of the reply message is returned, or
-\-1 if there were errors.
-.Pp
-The
-.Fn dn_comp
-function
-compresses the domain name
-.Fa exp_dn
-and stores it in
-.Fa comp_dn .
-The size of the compressed name is returned or \-1 if there were errors.
-The size of the array pointed to by
-.Fa comp_dn
-is given by
-.Fa length .
-The compression uses
-an array of pointers
-.Fa dnptrs
-to previously-compressed names in the current message.
-The first pointer points to
-to the beginning of the message and the list ends with
-.Dv NULL .
-The limit to the array is specified by
-.Fa lastdnptr .
-A side effect of
-.Fn dn_comp
-is to update the list of pointers for
-labels inserted into the message
-as the name is compressed.
-If
-.Em dnptr
-is
-.Dv NULL, names are not compressed.
-If
-.Fa lastdnptr
-is
-.Dv NULL ,
-the list of labels is not updated.
-.Pp
-The
-.Fn dn_expand
-entry
-expands the compressed domain name
-.Fa comp_dn
-to a full domain name
-The compressed name is contained in a query or reply message;
-.Fa msg
-is a pointer to the beginning of the message.
-The uncompressed name is placed in the buffer indicated by
-.Fa exp_dn
-which is of size
-.Fa length .
-The size of compressed name is returned or \-1 if there was an error.
-.Sh FILES
-.Bl -tag -width Pa
-/etc/resolv.conf
-The configuration file
-see
-.Xr resolver 5 .
-.El
-.Sh SEE ALSO
-.Xr gethostbyname 3 ,
-.Xr resolver 5 ,
-.Xr hostname 7 ,
-.Xr named 8
-.Pp
-.%T RFC1032 ,
-.%T RFC1033 ,
-.%T RFC1034 ,
-.%T RFC1035 ,
-.%T RFC974
-.Rs
-.%T "Name Server Operations Guide for BIND"
-.Re
-.Sh HISTORY
-The
-.Nm
-function appeared in 
-.Bx 4.3 .
diff --git a/cpukit/libnetworking/libc/send.c b/cpukit/libnetworking/libc/send.c
deleted file mode 100644
index ad14bd3cd2..0000000000
--- a/cpukit/libnetworking/libc/send.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *  $Id$
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)send.c	8.2 (Berkeley) 2/21/94";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <stddef.h>
-
-ssize_t
-send(s, msg, len, flags)
-	int s, flags;
-	size_t len;
-	const void *msg;
-{
-	return (sendto(s, msg, len, flags, NULL, 0));
-}
diff --git a/cpukit/libnetworking/libc/strsep.c b/cpukit/libnetworking/libc/strsep.c
deleted file mode 100644
index 182319493d..0000000000
--- a/cpukit/libnetworking/libc/strsep.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *  $Id$
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char sccsid[] = "@(#)strsep.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
-#include <string.h>
-#include <stdio.h>
-
-/*
- * Get next token from string *stringp, where tokens are possibly-empty
- * strings separated by characters from delim.  
- *
- * Writes NULs into the string at *stringp to end tokens.
- * delim need not remain constant from call to call.
- * On return, *stringp points past the last NUL written (if there might
- * be further tokens), or is NULL (if there are definitely no more tokens).
- *
- * If *stringp is NULL, strsep returns NULL.
- *
- * PUBLIC: #ifndef HAVE_STRSEP
- * PUBLIC: char *strsep __P((char **, const char *));
- * PUBLIC: #endif
- */
-char *
-strsep(stringp, delim)
-	register char **stringp;
-	register const char *delim;
-{
-	register char *s;
-	register const char *spanp;
-	register int c, sc;
-	char *tok;
-
-	if ((s = *stringp) == NULL)
-		return (NULL);
-	for (tok = s;;) {
-		c = *s++;
-		spanp = delim;
-		do {
-			if ((sc = *spanp++) == c) {
-				if (c == 0)
-					s = NULL;
-				else
-					s[-1] = 0;
-				*stringp = s;
-				return (tok);
-			}
-		} while (sc != 0);
-	}
-	/* NOTREACHED */
-}
diff --git a/cpukit/libnetworking/loop.h b/cpukit/libnetworking/loop.h
deleted file mode 100644
index 34e0b828e4..0000000000
--- a/cpukit/libnetworking/loop.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
- *  $Id$
- */
-
-#define NLOOP 1
diff --git a/cpukit/libnetworking/machine/conf.h b/cpukit/libnetworking/machine/conf.h
deleted file mode 100644
index 5a6ee0337b..0000000000
--- a/cpukit/libnetworking/machine/conf.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/*
- *  $Id$
- */
-
-/* intentionally empty file */
-
diff --git a/cpukit/libnetworking/machine/cpu.h b/cpukit/libnetworking/machine/cpu.h
deleted file mode 100644
index 5a6ee0337b..0000000000
--- a/cpukit/libnetworking/machine/cpu.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/*
- *  $Id$
- */
-
-/* intentionally empty file */
-
diff --git a/cpukit/libnetworking/machine/cpufunc.h b/cpukit/libnetworking/machine/cpufunc.h
deleted file mode 100644
index 2b4c47e48f..0000000000
--- a/cpukit/libnetworking/machine/cpufunc.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
- *  $Id$
- */
-
-/* intentionally empty file */
diff --git a/cpukit/libnetworking/machine/endian.h b/cpukit/libnetworking/machine/endian.h
deleted file mode 100644
index 6b17da58d3..0000000000
--- a/cpukit/libnetworking/machine/endian.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- *  $Id$
- */
-
-#ifndef _MACHINE_ENDIAN_H_
-#define _MACHINE_ENDIAN_H_
-
-#include <rtems/score/cpu.h>
-
-/*
- * BSD-style endian declaration
- */
-#define BIG_ENDIAN	4321
-#define LITTLE_ENDIAN	1234
-
-#if CPU_BIG_ENDIAN
-# define BYTE_ORDER BIG_ENDIAN
-#elif CPU_LITTLE_ENDIAN
-# define BYTE_ORDER LITTLE_ENDIAN
-#else
-# error "Can't decide which end is which!"
-#endif
-
-#if ( CPU_HAS_OWN_HOST_TO_NETWORK_ROUTINES == FALSE )
-
-#if ( CPU_BIG_ENDIAN == TRUE )
-
-/*
- *  Very simply on big endian CPUs
- */
-
-#define       ntohl(_x)        (_x)
-#define       ntohs(_x)        (_x)
-#define       htonl(_x)        (_x)
-#define       htons(_x)        (_x)
-
-#define NTOHS(x)
-#define HTONS(x)
-#define NTOHL(x)
-#define HTONL(x)
-
-#elif ( CPU_LITTLE_ENDIAN == TRUE )
-
-/*
- *  A little more complicated on little endian CPUs
- */
-
-#define       ntohl(_x)        ((long)  CPU_swap_u32((unsigned32)_x))
-#define       ntohs(_x)        ((short) CPU_swap_u16((unsigned16)_x))
-#define       htonl(_x)        ((long)  CPU_swap_u32((unsigned32)_x))
-#define       htons(_x)        ((short) CPU_swap_u16((unsigned16)_x))
-
-#define NTOHS(x) (x) = ntohs(x)
-#define HTONS(x) (x) = htons(x)
-#define NTOHL(x) (x) = ntohl(x)
-#define HTONL(x) (x) = htonl(x)
-
-#else
-#error "Unknown endian-ness for this cpu"
-#endif
-
-#endif  /* CPU_HAS_OWN_HOST_TO_NETWORK_ROUTINES */
-
-#endif /* _MACHINE_ENDIAN_H_ */
diff --git a/cpukit/libnetworking/machine/in_cksum.h b/cpukit/libnetworking/machine/in_cksum.h
deleted file mode 100644
index 15509b3888..0000000000
--- a/cpukit/libnetworking/machine/in_cksum.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	from tahoe:	in_cksum.c	1.2	86/01/05
- *	from:		@(#)in_cksum.c	1.3 (Berkeley) 1/19/91
- *	from: Id: in_cksum.c,v 1.8 1995/12/03 18:35:19 bde Exp
- *	$Id$
- */
-
-#ifndef _MACHINE_IN_CKSUM_H_
-#define	_MACHINE_IN_CKSUM_H_	1
-
-#include <sys/cdefs.h>
-
-/*
- * It it useful to have an Internet checksum routine which is inlineable
- * and optimized specifically for the task of computing IP header checksums
- * in the normal case (where there are no options and the header length is
- * therefore always exactly five 32-bit words.
- */
-#if (defined(__GNUC__) && defined(__i386__))
-static __inline u_int
-in_cksum_hdr(const struct ip *ip)
-{
-	register u_int sum = 0;
-		    
-#define ADD(n)	__asm("addl " #n "(%2), %0" : "=r" (sum) : "0" (sum), "r" (ip))
-#define ADDC(n)	__asm("adcl " #n "(%2), %0" : "=r" (sum) : "0" (sum), "r" (ip))
-#define MOP	__asm("adcl         $0, %0" : "=r" (sum) : "0" (sum))
-
-	ADD(0);
-	ADDC(4);
-	ADDC(8);
-	ADDC(12);
-	ADDC(16);
-	MOP;
-	sum = (sum & 0xffff) + (sum >> 16);
-	if (sum > 0xffff)
-		sum -= 0xffff;
-
-	return ~sum & 0xffff;
-}
-
-static __inline void
-in_cksum_update(struct ip *ip)
-{
-	int __tmpsum;
-	__tmpsum = (int)ntohs(ip->ip_sum) + 256;
-	ip->ip_sum = htons(__tmpsum + (__tmpsum >> 16));
-}
-
-#elif (defined(__GNUC__) && (defined(__mc68000__) || defined(__m68k__)))
-
-static __inline__ u_int
-in_cksum_hdr(const struct ip *ip)
-{
-	register u_int *ap = (u_int *)ip;
-	register u_int sum = *ap++;
-	register u_int tmp;
-		    
-	__asm__("addl  %2@+,%0\n\t"
-	        "movel %2@+,%1\n\t"
-	        "addxl %1,%0\n\t"
-	        "movel %2@+,%1\n\t"
-	        "addxl %1,%0\n\t"
-	        "movel %2@,%1\n\t"
-	        "addxl %1,%0\n\t"
-	        "moveq #0,%1\n\t"
-	        "addxl %1,%0\n" :
-		"=d" (sum), "=d" (tmp), "=a" (ap) :
-		"0" (sum), "2" (ap));
-	sum = (sum & 0xffff) + (sum >> 16);
-	if (sum > 0xffff)
-		sum -= 0xffff;
-	return ~sum & 0xffff;
-}
-
-#else
-u_int in_cksum_hdr __P((const struct ip *));
-#define	in_cksum_update(ip) \
-	do { \
-		int __tmpsum; \
-		__tmpsum = (int)ntohs(ip->ip_sum) + 256; \
-		ip->ip_sum = htons(__tmpsum + (__tmpsum >> 16)); \
-	} while(0)
-
-#endif
-
-#endif /* _MACHINE_IN_CKSUM_H_ */
diff --git a/cpukit/libnetworking/machine/limits.h b/cpukit/libnetworking/machine/limits.h
deleted file mode 100644
index 5a6ee0337b..0000000000
--- a/cpukit/libnetworking/machine/limits.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/*
- *  $Id$
- */
-
-/* intentionally empty file */
-
diff --git a/cpukit/libnetworking/machine/param.h b/cpukit/libnetworking/machine/param.h
deleted file mode 100644
index 4168f1f6cf..0000000000
--- a/cpukit/libnetworking/machine/param.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- *  $Id$
- */
-
-#ifndef _MACHINE_PARAM_H_
-#define	_MACHINE_PARAM_H_
-
-/*
- * These aren't really machine-dependent for RTEMS.....
- */
-
-/*
-#define MACHINE		"i386"
-#define MID_MACHINE	MID_I386
-*/
-
-/*
- * Round p (pointer or byte index) up to a correctly-aligned value
- * for all data types (int, long, ...).   The result is unsigned int
- * and must be cast to any desired pointer type.
- */
-#define ALIGNBYTES	(sizeof(int) - 1)
-#define ALIGN(p)	(((unsigned)(p) + ALIGNBYTES) & ~ALIGNBYTES)
-
-#define PAGE_SHIFT	12		/* LOG2(PAGE_SIZE) */
-#define PAGE_SIZE	(1<<PAGE_SHIFT)	/* bytes/page */
-#define PAGE_MASK	(PAGE_SIZE-1)
-#define NPTEPG		(PAGE_SIZE/(sizeof (pt_entry_t)))
-
-#define NPDEPG		(PAGE_SIZE/(sizeof (pd_entry_t)))
-#define PDRSHIFT	22		/* LOG2(NBPDR) */
-#define NBPDR		(1<<PDRSHIFT)	/* bytes/page dir */
-
-#define DEV_BSHIFT	9		/* log2(DEV_BSIZE) */
-#define DEV_BSIZE	(1<<DEV_BSHIFT)
-
-#define BLKDEV_IOSIZE	2048
-#define MAXPHYS		(64 * 1024)	/* max raw I/O transfer size */
-
-#define UPAGES	2		/* pages of u-area */
-
-/*
- * Constants related to network buffer management.
- * MCLBYTES must be no larger than CLBYTES (the software page size), and,
- * on machines that exchange pages of input or output buffers with mbuf
- * clusters (MAPPED_MBUFS), MCLBYTES must also be an integral multiple
- * of the hardware page size.
- */
-#ifndef	MSIZE
-#define MSIZE		128		/* size of an mbuf */
-#endif	/* MSIZE */
-
-#ifndef	MCLSHIFT
-#define MCLSHIFT	11		/* convert bytes to m_buf clusters */
-#endif	/* MCLSHIFT */
-#define MCLBYTES	(1 << MCLSHIFT)	/* size of an m_buf cluster */
-#define MCLOFSET	(MCLBYTES - 1)	/* offset within an m_buf cluster */
-
-/*
- * Some macros for units conversion
- */
-
-/* clicks to bytes */
-#define ctob(x)	((x)<<PAGE_SHIFT)
-
-/* bytes to clicks */
-#define btoc(x)	(((unsigned)(x)+PAGE_MASK)>>PAGE_SHIFT)
-
-/*
- * btodb() is messy and perhaps slow because `bytes' may be an off_t.  We
- * want to shift an unsigned type to avoid sign extension and we don't
- * want to widen `bytes' unnecessarily.  Assume that the result fits in
- * a daddr_t.
- */
-#define btodb(bytes)	 		/* calculates (bytes / DEV_BSIZE) */ \
-	(sizeof (bytes) > sizeof(long) \
-	 ? (daddr_t)((unsigned long long)(bytes) >> DEV_BSHIFT) \
-	 : (daddr_t)((unsigned long)(bytes) >> DEV_BSHIFT))
-
-#define dbtob(db)			/* calculates (db * DEV_BSIZE) */ \
-	((off_t)(db) << DEV_BSHIFT)
-
-/*
- * Mach derived conversion macros
- */
-#define trunc_page(x)		((unsigned)(x) & ~PAGE_MASK)
-#define round_page(x)		((((unsigned)(x)) + PAGE_MASK) & ~PAGE_MASK)
-
-#define atop(x)			((unsigned)(x) >> PAGE_SHIFT)
-#define ptoa(x)			((unsigned)(x) << PAGE_SHIFT)
-
-#endif /* !_MACHINE_PARAM_H_ */
diff --git a/cpukit/libnetworking/machine/types.h b/cpukit/libnetworking/machine/types.h
deleted file mode 100644
index 730a6dec1d..0000000000
--- a/cpukit/libnetworking/machine/types.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * This file will have to be incorparated into the RTEMS source
- * tree (probably in the existing <machine/types.h> so that these
- * contents are included when an application source file includes
- * <sys/types.h>.
- *
- *  $Id$
- */
-
-#ifndef _MACHINE_TYPES_H_
-#define _MACHINE_TYPES_H_
-
-#include <rtems.h>
-#include <machine/endian.h>
-
-typedef rtems_signed64		int64_t;
-typedef rtems_signed32		int32_t;
-typedef rtems_signed16		int16_t;
-typedef rtems_signed8		int8_t;
-
-typedef rtems_unsigned64	u_int64_t;
-typedef rtems_unsigned32	u_int32_t;
-typedef rtems_unsigned16	u_int16_t;
-typedef rtems_unsigned8		u_int8_t;
-
-#define	_CLOCK_T_	unsigned long
-#define	_TIME_T_	long
-
-#ifdef _COMPILING_BSD_KERNEL_
-#include <rtems/rtems_bsdnet_internal.h>
-#include <rtems/rtems_bsdnet.h>
-#endif
-
-#endif /* _MACHINE_TYPES_H_ */
diff --git a/cpukit/libnetworking/machine/vmparam.h b/cpukit/libnetworking/machine/vmparam.h
deleted file mode 100644
index 5a6ee0337b..0000000000
--- a/cpukit/libnetworking/machine/vmparam.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/*
- *  $Id$
- */
-
-/* intentionally empty file */
-
diff --git a/cpukit/libnetworking/net/bpf.h b/cpukit/libnetworking/net/bpf.h
deleted file mode 100644
index 7847d72470..0000000000
--- a/cpukit/libnetworking/net/bpf.h
+++ /dev/null
@@ -1,236 +0,0 @@
-/*
- * Copyright (c) 1990, 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from the Stanford/CMU enet packet filter,
- * (net/enet.c) distributed as part of 4.3BSD, and code contributed
- * to Berkeley by Steven McCanne and Van Jacobson both of Lawrence
- * Berkeley Laboratory.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *      @(#)bpf.h	8.1 (Berkeley) 6/10/93
- *	@(#)bpf.h	1.34 (LBL)     6/16/96
- *
- * $Id$
- */
-
-#ifndef _NET_BPF_H_
-#define _NET_BPF_H_
-
-/* BSD style release date */
-#define	BPF_RELEASE 199606
-
-typedef	int32_t	  bpf_int32;
-typedef	u_int32_t bpf_u_int32;
-
-/*
- * Alignment macros.  BPF_WORDALIGN rounds up to the next
- * even multiple of BPF_ALIGNMENT.
- */
-#define BPF_ALIGNMENT sizeof(bpf_int32)
-#define BPF_WORDALIGN(x) (((x)+(BPF_ALIGNMENT-1))&~(BPF_ALIGNMENT-1))
-
-#define BPF_MAXINSNS 512
-#define BPF_MAXBUFSIZE 0x8000
-#define BPF_MINBUFSIZE 32
-
-/*
- *  Structure for BIOCSETF.
- */
-struct bpf_program {
-	u_int bf_len;
-	struct bpf_insn *bf_insns;
-};
-
-/*
- * Struct returned by BIOCGSTATS.
- */
-struct bpf_stat {
-	u_int bs_recv;		/* number of packets received */
-	u_int bs_drop;		/* number of packets dropped */
-};
-
-/*
- * Struct return by BIOCVERSION.  This represents the version number of
- * the filter language described by the instruction encodings below.
- * bpf understands a program iff kernel_major == filter_major &&
- * kernel_minor >= filter_minor, that is, if the value returned by the
- * running kernel has the same major number and a minor number equal
- * equal to or less than the filter being downloaded.  Otherwise, the
- * results are undefined, meaning an error may be returned or packets
- * may be accepted haphazardly.
- * It has nothing to do with the source code version.
- */
-struct bpf_version {
-	u_short bv_major;
-	u_short bv_minor;
-};
-/* Current version number of filter architecture. */
-#define BPF_MAJOR_VERSION 1
-#define BPF_MINOR_VERSION 1
-
-#define	BIOCGBLEN	_IOR('B',102, u_int)
-#define	BIOCSBLEN	_IOWR('B',102, u_int)
-#define	BIOCSETF	_IOW('B',103, struct bpf_program)
-#define	BIOCFLUSH	_IO('B',104)
-#define BIOCPROMISC	_IO('B',105)
-#define	BIOCGDLT	_IOR('B',106, u_int)
-#define BIOCGETIF	_IOR('B',107, struct ifreq)
-#define BIOCSETIF	_IOW('B',108, struct ifreq)
-#define BIOCSRTIMEOUT	_IOW('B',109, struct timeval)
-#define BIOCGRTIMEOUT	_IOR('B',110, struct timeval)
-#define BIOCGSTATS	_IOR('B',111, struct bpf_stat)
-#define BIOCIMMEDIATE	_IOW('B',112, u_int)
-#define BIOCVERSION	_IOR('B',113, struct bpf_version)
-#define BIOCGRSIG	_IOR('B',114, u_int)
-#define BIOCSRSIG	_IOW('B',115, u_int)
-
-/*
- * Structure prepended to each packet.
- */
-struct bpf_hdr {
-	struct timeval	bh_tstamp;	/* time stamp */
-	bpf_u_int32	bh_caplen;	/* length of captured portion */
-	bpf_u_int32	bh_datalen;	/* original length of packet */
-	u_short		bh_hdrlen;	/* length of bpf header (this struct
-					   plus alignment padding) */
-};
-/*
- * Because the structure above is not a multiple of 4 bytes, some compilers
- * will insist on inserting padding; hence, sizeof(struct bpf_hdr) won't work.
- * Only the kernel needs to know about it; applications use bh_hdrlen.
- */
-#ifdef KERNEL
-#define SIZEOF_BPF_HDR 18
-#endif
-
-/*
- * Data-link level type codes.
- */
-#define DLT_NULL	0	/* no link-layer encapsulation */
-#define DLT_EN10MB	1	/* Ethernet (10Mb) */
-#define DLT_EN3MB	2	/* Experimental Ethernet (3Mb) */
-#define DLT_AX25	3	/* Amateur Radio AX.25 */
-#define DLT_PRONET	4	/* Proteon ProNET Token Ring */
-#define DLT_CHAOS	5	/* Chaos */
-#define DLT_IEEE802	6	/* IEEE 802 Networks */
-#define DLT_ARCNET	7	/* ARCNET */
-#define DLT_SLIP	8	/* Serial Line IP */
-#define DLT_PPP		9	/* Point-to-point Protocol */
-#define DLT_FDDI	10	/* FDDI */
-#define DLT_ATM_RFC1483	11	/* LLC/SNAP encapsulated atm */
-
-/*
- * The instruction encodings.
- */
-/* instruction classes */
-#define BPF_CLASS(code) ((code) & 0x07)
-#define		BPF_LD		0x00
-#define		BPF_LDX		0x01
-#define		BPF_ST		0x02
-#define		BPF_STX		0x03
-#define		BPF_ALU		0x04
-#define		BPF_JMP		0x05
-#define		BPF_RET		0x06
-#define		BPF_MISC	0x07
-
-/* ld/ldx fields */
-#define BPF_SIZE(code)	((code) & 0x18)
-#define		BPF_W		0x00
-#define		BPF_H		0x08
-#define		BPF_B		0x10
-#define BPF_MODE(code)	((code) & 0xe0)
-#define		BPF_IMM 	0x00
-#define		BPF_ABS		0x20
-#define		BPF_IND		0x40
-#define		BPF_MEM		0x60
-#define		BPF_LEN		0x80
-#define		BPF_MSH		0xa0
-
-/* alu/jmp fields */
-#define BPF_OP(code)	((code) & 0xf0)
-#define		BPF_ADD		0x00
-#define		BPF_SUB		0x10
-#define		BPF_MUL		0x20
-#define		BPF_DIV		0x30
-#define		BPF_OR		0x40
-#define		BPF_AND		0x50
-#define		BPF_LSH		0x60
-#define		BPF_RSH		0x70
-#define		BPF_NEG		0x80
-#define		BPF_JA		0x00
-#define		BPF_JEQ		0x10
-#define		BPF_JGT		0x20
-#define		BPF_JGE		0x30
-#define		BPF_JSET	0x40
-#define BPF_SRC(code)	((code) & 0x08)
-#define		BPF_K		0x00
-#define		BPF_X		0x08
-
-/* ret - BPF_K and BPF_X also apply */
-#define BPF_RVAL(code)	((code) & 0x18)
-#define		BPF_A		0x10
-
-/* misc */
-#define BPF_MISCOP(code) ((code) & 0xf8)
-#define		BPF_TAX		0x00
-#define		BPF_TXA		0x80
-
-/*
- * The instruction data structure.
- */
-struct bpf_insn {
-	u_short		code;
-	u_char		jt;
-	u_char		jf;
-	bpf_u_int32	k;
-};
-
-/*
- * Macros for insn array initializers.
- */
-#define BPF_STMT(code, k) { (u_short)(code), 0, 0, k }
-#define BPF_JUMP(code, k, jt, jf) { (u_short)(code), jt, jf, k }
-
-#ifdef KERNEL
-int	 bpf_validate __P((struct bpf_insn *, int));
-void	 bpf_tap __P((struct ifnet *, u_char *, u_int));
-void	 bpf_mtap __P((struct ifnet *, struct mbuf *));
-void	 bpfattach __P((struct ifnet *, u_int, u_int));
-void	 bpfilterattach __P((int));
-u_int	 bpf_filter __P((struct bpf_insn *, u_char *, u_int, u_int));
-#endif
-
-/*
- * Number of scratch memory words (for BPF_LD|BPF_MEM and BPF_ST).
- */
-#define BPF_MEMWORDS 16
-
-#endif
diff --git a/cpukit/libnetworking/net/ethernet.h b/cpukit/libnetworking/net/ethernet.h
deleted file mode 100644
index c6c07189ec..0000000000
--- a/cpukit/libnetworking/net/ethernet.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Fundamental constants relating to ethernet.
- *
- * $Id$
- *
- */
-
-#ifndef _NET_ETHERNET_H_
-#define _NET_ETHERNET_H_
-
-/*
- * The number of bytes in an ethernet (MAC) address.
- */
-#define	ETHER_ADDR_LEN		6
-
-/*
- * The number of bytes in the type field.
- */
-#define	ETHER_TYPE_LEN		2
-
-/*
- * The number of bytes in the trailing CRC field.
- */
-#define	ETHER_CRC_LEN		4
-
-/*
- * The length of the combined header.
- */
-#define	ETHER_HDR_LEN		(ETHER_ADDR_LEN*2+ETHER_TYPE_LEN)
-
-/*
- * The minimum packet length.
- */
-#define	ETHER_MIN_LEN		64
-
-/*
- * The maximum packet length.
- */
-#define	ETHER_MAX_LEN		1518
-
-/*
- * A macro to validate a length with
- */
-#define	ETHER_IS_VALID_LEN(foo)	\
-	((foo) >= ETHER_MIN_LEN && (foo) <= ETHER_MAX_LEN)
-
-/*
- * Structure of a 10Mb/s Ethernet header.
- */
-struct	ether_header {
-	u_char	ether_dhost[ETHER_ADDR_LEN];
-	u_char	ether_shost[ETHER_ADDR_LEN];
-	u_short	ether_type;
-};
-
-/*
- * Structure of a 48-bit Ethernet address.
- */
-struct	ether_addr {
-	u_char octet[ETHER_ADDR_LEN];
-};
-
-#endif
diff --git a/cpukit/libnetworking/net/if.c b/cpukit/libnetworking/net/if.c
deleted file mode 100644
index af6f003de3..0000000000
--- a/cpukit/libnetworking/net/if.c
+++ /dev/null
@@ -1,783 +0,0 @@
-/*
- * Copyright (c) 1980, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)if.c	8.3 (Berkeley) 1/4/94
- * $Id$
- */
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/mbuf.h>
-#include <sys/systm.h>
-#include <sys/proc.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/protosw.h>
-#include <sys/kernel.h>
-#include <sys/ioctl.h>
-#include <sys/errno.h>
-#include <sys/syslog.h>
-#include <sys/sysctl.h>
-
-#include <net/if.h>
-#include <net/if_dl.h>
-#include <net/if_types.h>
-#include <net/radix.h>
-
-/*
- * System initialization
- */
-
-static int ifconf __P((int, caddr_t));
-       void ifinit __P((void *));
-static void if_qflush __P((struct ifqueue *));
-static void if_slowtimo __P((void *));
-static void link_rtrequest __P((int, struct rtentry *, struct sockaddr *));
-
-SYSINIT(interfaces, SI_SUB_PROTO_IF, SI_ORDER_FIRST, ifinit, NULL)
-
-
-int	ifqmaxlen = IFQ_MAXLEN;
-struct	ifnet *ifnet;
-
-/*
- * Network interface utility routines.
- *
- * Routines with ifa_ifwith* names take sockaddr *'s as
- * parameters.
- *
- * This routine assumes that it will be called at splimp() or higher.
- */
-/* ARGSUSED*/
-void
-ifinit(dummy)
-	void *dummy;
-{
-	register struct ifnet *ifp;
-
-	for (ifp = ifnet; ifp; ifp = ifp->if_next)
-		if (ifp->if_snd.ifq_maxlen == 0)
-			ifp->if_snd.ifq_maxlen = ifqmaxlen;
-	if_slowtimo(0);
-}
-
-int if_index = 0;
-struct ifaddr **ifnet_addrs;
-
-
-/*
- * Attach an interface to the
- * list of "active" interfaces.
- */
-void
-if_attach(ifp)
-	struct ifnet *ifp;
-{
-	unsigned socksize, ifasize;
-	int namelen, masklen;
-	char workbuf[64];
-	register struct ifnet **p = &ifnet;
-	register struct sockaddr_dl *sdl;
-	register struct ifaddr *ifa;
-	static int if_indexlim = 8;
-
-
-	while (*p)
-		p = &((*p)->if_next);
-	*p = ifp;
-	ifp->if_index = ++if_index;
-	microtime(&ifp->if_lastchange);
-	if (ifnet_addrs == 0 || if_index >= if_indexlim) {
-		unsigned n = (if_indexlim <<= 1) * sizeof(ifa);
-		struct ifaddr **q = (struct ifaddr **)
-					malloc(n, M_IFADDR, M_WAITOK);
-		bzero((caddr_t)q, n);
-		if (ifnet_addrs) {
-			bcopy((caddr_t)ifnet_addrs, (caddr_t)q, n/2);
-			free((caddr_t)ifnet_addrs, M_IFADDR);
-		}
-		ifnet_addrs = q;
-	}
-	/*
-	 * create a Link Level name for this device
-	 */
-	namelen = sprintf(workbuf, "%s%d", ifp->if_name, ifp->if_unit);
-#define _offsetof(t, m) ((int)((caddr_t)&((t *)0)->m))
-	masklen = _offsetof(struct sockaddr_dl, sdl_data[0]) + namelen;
-	socksize = masklen + ifp->if_addrlen;
-#define ROUNDUP(a) (1 + (((a) - 1) | (sizeof(long) - 1)))
-	socksize = ROUNDUP(socksize);
-	if (socksize < sizeof(*sdl))
-		socksize = sizeof(*sdl);
-	ifasize = sizeof(*ifa) + 2 * socksize;
-	ifa = (struct ifaddr *)malloc(ifasize, M_IFADDR, M_WAITOK);
-	if (ifa) {
-		bzero((caddr_t)ifa, ifasize);
-		sdl = (struct sockaddr_dl *)(ifa + 1);
-		sdl->sdl_len = socksize;
-		sdl->sdl_family = AF_LINK;
-		bcopy(workbuf, sdl->sdl_data, namelen);
-		sdl->sdl_nlen = namelen;
-		sdl->sdl_index = ifp->if_index;
-		sdl->sdl_type = ifp->if_type;
-		ifnet_addrs[if_index - 1] = ifa;
-		ifa->ifa_ifp = ifp;
-		ifa->ifa_next = ifp->if_addrlist;
-		ifa->ifa_rtrequest = link_rtrequest;
-		ifp->if_addrlist = ifa;
-		ifa->ifa_addr = (struct sockaddr *)sdl;
-
-		sdl = (struct sockaddr_dl *)(socksize + (caddr_t)sdl);
-		ifa->ifa_netmask = (struct sockaddr *)sdl;
-		sdl->sdl_len = masklen;
-		while (namelen != 0)
-			sdl->sdl_data[--namelen] = 0xff;
-	}
-}
-/*
- * Locate an interface based on a complete address.
- */
-/*ARGSUSED*/
-struct ifaddr *
-ifa_ifwithaddr(addr)
-	register struct sockaddr *addr;
-{
-	register struct ifnet *ifp;
-	register struct ifaddr *ifa;
-
-#define	equal(a1, a2) \
-  (bcmp((caddr_t)(a1), (caddr_t)(a2), ((struct sockaddr *)(a1))->sa_len) == 0)
-	for (ifp = ifnet; ifp; ifp = ifp->if_next)
-	    for (ifa = ifp->if_addrlist; ifa; ifa = ifa->ifa_next) {
-		if (ifa->ifa_addr->sa_family != addr->sa_family)
-			continue;
-		if (equal(addr, ifa->ifa_addr))
-			return (ifa);
-		if ((ifp->if_flags & IFF_BROADCAST) && ifa->ifa_broadaddr &&
-		    equal(ifa->ifa_broadaddr, addr))
-			return (ifa);
-	}
-	return ((struct ifaddr *)0);
-}
-/*
- * Locate the point to point interface with a given destination address.
- */
-/*ARGSUSED*/
-struct ifaddr *
-ifa_ifwithdstaddr(addr)
-	register struct sockaddr *addr;
-{
-	register struct ifnet *ifp;
-	register struct ifaddr *ifa;
-
-	for (ifp = ifnet; ifp; ifp = ifp->if_next)
-	    if (ifp->if_flags & IFF_POINTOPOINT)
-		for (ifa = ifp->if_addrlist; ifa; ifa = ifa->ifa_next) {
-			if (ifa->ifa_addr->sa_family != addr->sa_family)
-				continue;
-			if (ifa->ifa_dstaddr && equal(addr, ifa->ifa_dstaddr))
-				return (ifa);
-	}
-	return ((struct ifaddr *)0);
-}
-
-/*
- * Find an interface on a specific network.  If many, choice
- * is most specific found.
- */
-struct ifaddr *
-ifa_ifwithnet(addr)
-	struct sockaddr *addr;
-{
-	register struct ifnet *ifp;
-	register struct ifaddr *ifa;
-	struct ifaddr *ifa_maybe = (struct ifaddr *) 0;
-	u_int af = addr->sa_family;
-	char *addr_data = addr->sa_data, *cplim;
-
-	if (af == AF_LINK) {
-	    register struct sockaddr_dl *sdl = (struct sockaddr_dl *)addr;
-	    if (sdl->sdl_index && sdl->sdl_index <= if_index)
-		return (ifnet_addrs[sdl->sdl_index - 1]);
-	}
-	for (ifp = ifnet; ifp; ifp = ifp->if_next) {
-		for (ifa = ifp->if_addrlist; ifa; ifa = ifa->ifa_next) {
-			register char *cp, *cp2, *cp3;
-
-			if (ifa->ifa_addr->sa_family != af)
-				next: continue;
-			if (ifp->if_flags & IFF_POINTOPOINT) {
-				if (ifa->ifa_dstaddr != 0
-				    && equal(addr, ifa->ifa_dstaddr))
- 					return (ifa);
-			} else {
-				/*
-				 * if we have a special address handler,
-				 * then use it instead of the generic one.
-				 */
-	          		if (ifa->ifa_claim_addr) {
-					if ((*ifa->ifa_claim_addr)(ifa, addr)) {
-						return (ifa);
-					} else {
-						continue;
-					}
-				}
-
-				/*
-				 * Scan all the bits in the ifa's address.
-				 * If a bit dissagrees with what we are
-				 * looking for, mask it with the netmask
-				 * to see if it really matters.
-				 * (A byte at a time)
-				 */
-				if (ifa->ifa_netmask == 0)
-					continue;
-				cp = addr_data;
-				cp2 = ifa->ifa_addr->sa_data;
-				cp3 = ifa->ifa_netmask->sa_data;
-				cplim = ifa->ifa_netmask->sa_len + (char *)ifa->ifa_netmask;
-				while (cp3 < cplim)
-					if ((*cp++ ^ *cp2++) & *cp3++)
-						goto next;
-				if (ifa_maybe == 0 ||
-				    rn_refines((caddr_t)ifa->ifa_netmask,
-				    (caddr_t)ifa_maybe->ifa_netmask))
-					ifa_maybe = ifa;
-			}
-		}
-	}
-	return (ifa_maybe);
-}
-
-/*
- * Find an interface address specific to an interface best matching
- * a given address.
- */
-struct ifaddr *
-ifaof_ifpforaddr(addr, ifp)
-	struct sockaddr *addr;
-	register struct ifnet *ifp;
-{
-	register struct ifaddr *ifa;
-	register char *cp, *cp2, *cp3;
-	register char *cplim;
-	struct ifaddr *ifa_maybe = 0;
-	u_int af = addr->sa_family;
-
-	if (af >= AF_MAX)
-		return (0);
-	for (ifa = ifp->if_addrlist; ifa; ifa = ifa->ifa_next) {
-		if (ifa->ifa_addr->sa_family != af)
-			continue;
-		if (ifa_maybe == 0)
-			ifa_maybe = ifa;
-		if (ifa->ifa_netmask == 0) {
-			if (equal(addr, ifa->ifa_addr) ||
-			    (ifa->ifa_dstaddr && equal(addr, ifa->ifa_dstaddr)))
-				return (ifa);
-			continue;
-		}
-		if (ifp->if_flags & IFF_POINTOPOINT) {
-			if (equal(addr, ifa->ifa_dstaddr))
-				return (ifa);
-		} else {
-			cp = addr->sa_data;
-			cp2 = ifa->ifa_addr->sa_data;
-			cp3 = ifa->ifa_netmask->sa_data;
-			cplim = ifa->ifa_netmask->sa_len + (char *)ifa->ifa_netmask;
-			for (; cp3 < cplim; cp3++)
-				if ((*cp++ ^ *cp2++) & *cp3)
-					break;
-			if (cp3 == cplim)
-				return (ifa);
-		}
-	}
-	return (ifa_maybe);
-}
-
-#include <net/route.h>
-
-/*
- * Default action when installing a route with a Link Level gateway.
- * Lookup an appropriate real ifa to point to.
- * This should be moved to /sys/net/link.c eventually.
- */
-static void
-link_rtrequest(cmd, rt, sa)
-	int cmd;
-	register struct rtentry *rt;
-	struct sockaddr *sa;
-{
-	register struct ifaddr *ifa;
-	struct sockaddr *dst;
-	struct ifnet *ifp;
-
-	if (cmd != RTM_ADD || ((ifa = rt->rt_ifa) == 0) ||
-	    ((ifp = ifa->ifa_ifp) == 0) || ((dst = rt_key(rt)) == 0))
-		return;
-	ifa = ifaof_ifpforaddr(dst, ifp);
-	if (ifa) {
-		IFAFREE(rt->rt_ifa);
-		rt->rt_ifa = ifa;
-		ifa->ifa_refcnt++;
-		if (ifa->ifa_rtrequest && ifa->ifa_rtrequest != link_rtrequest)
-			ifa->ifa_rtrequest(cmd, rt, sa);
-	}
-}
-
-/*
- * Mark an interface down and notify protocols of
- * the transition.
- * NOTE: must be called at splnet or eqivalent.
- */
-void
-if_down(ifp)
-	register struct ifnet *ifp;
-{
-	register struct ifaddr *ifa;
-
-	ifp->if_flags &= ~IFF_UP;
-	microtime(&ifp->if_lastchange);
-	for (ifa = ifp->if_addrlist; ifa; ifa = ifa->ifa_next)
-		pfctlinput(PRC_IFDOWN, ifa->ifa_addr);
-	if_qflush(&ifp->if_snd);
-	rt_ifmsg(ifp);
-}
-
-/*
- * Mark an interface up and notify protocols of
- * the transition.
- * NOTE: must be called at splnet or eqivalent.
- */
-void
-if_up(ifp)
-	register struct ifnet *ifp;
-{
-
-	ifp->if_flags |= IFF_UP;
-	microtime(&ifp->if_lastchange);
-#ifdef notyet
-	register struct ifaddr *ifa;
-	/* this has no effect on IP, and will kill all iso connections XXX */
-	for (ifa = ifp->if_addrlist; ifa; ifa = ifa->ifa_next)
-		pfctlinput(PRC_IFUP, ifa->ifa_addr);
-#endif
-	rt_ifmsg(ifp);
-}
-
-/*
- * Flush an interface queue.
- */
-static void
-if_qflush(ifq)
-	register struct ifqueue *ifq;
-{
-	register struct mbuf *m, *n;
-
-	n = ifq->ifq_head;
-	while ((m = n) != 0) {
-		n = m->m_act;
-		m_freem(m);
-	}
-	ifq->ifq_head = 0;
-	ifq->ifq_tail = 0;
-	ifq->ifq_len = 0;
-}
-
-/*
- * Handle interface watchdog timer routines.  Called
- * from softclock, we decrement timers (if set) and
- * call the appropriate interface routine on expiration.
- */
-static void
-if_slowtimo(arg)
-	void *arg;
-{
-	register struct ifnet *ifp;
-	int s = splimp();
-
-	for (ifp = ifnet; ifp; ifp = ifp->if_next) {
-		if (ifp->if_timer == 0 || --ifp->if_timer)
-			continue;
-		if (ifp->if_watchdog)
-			(*ifp->if_watchdog)(ifp);
-	}
-	splx(s);
-	timeout(if_slowtimo, (void *)0, hz / IFNET_SLOWHZ);
-}
-
-/*
- * Map interface name to
- * interface structure pointer.
- */
-struct ifnet *
-ifunit(name)
-	register char *name;
-{
-	register char *cp;
-	register struct ifnet *ifp;
-	int unit;
-	unsigned len;
-	char *ep, c;
-
-	for (cp = name; cp < name + IFNAMSIZ && *cp; cp++)
-		if (*cp >= '0' && *cp <= '9')
-			break;
-	if (*cp == '\0' || cp == name + IFNAMSIZ)
-		return ((struct ifnet *)0);
-	/*
-	 * Save first char of unit, and pointer to it,
-	 * so we can put a null there to avoid matching
-	 * initial substrings of interface names.
-	 */
-	len = cp - name + 1;
-	c = *cp;
-	ep = cp;
-	for (unit = 0; *cp >= '0' && *cp <= '9'; )
-		unit = unit * 10 + *cp++ - '0';
-	if (*cp != '\0')
-		return 0;	/* no trailing garbage allowed */
-	*ep = 0;
-	for (ifp = ifnet; ifp; ifp = ifp->if_next) {
-		if (bcmp(ifp->if_name, name, len))
-			continue;
-		if (unit == ifp->if_unit)
-			break;
-	}
-	*ep = c;
-	return (ifp);
-}
-
-/*
- * Interface ioctls.
- */
-int
-ifioctl(so, cmd, data, p)
-	struct socket *so;
-	int cmd;
-	caddr_t data;
-	struct proc *p;
-{
-	register struct ifnet *ifp;
-	register struct ifreq *ifr;
-	int error;
-
-	switch (cmd) {
-
-	case SIOCGIFCONF:
-	case OSIOCGIFCONF:
-		return (ifconf(cmd, data));
-	}
-	ifr = (struct ifreq *)data;
-	ifp = ifunit(ifr->ifr_name);
-	if (ifp == 0)
-		return (ENXIO);
-	switch (cmd) {
-
-	case SIOCGIFFLAGS:
-		ifr->ifr_flags = ifp->if_flags;
-		break;
-
-	case SIOCGIFMETRIC:
-		ifr->ifr_metric = ifp->if_metric;
-		break;
-
-	case SIOCGIFMTU:
-		ifr->ifr_mtu = ifp->if_mtu;
-		break;
-
-	case SIOCGIFPHYS:
-		ifr->ifr_phys = ifp->if_physical;
-		break;
-
-	case SIOCSIFFLAGS:
-		error = suser(p->p_ucred, &p->p_acflag);
-		if (error)
-			return (error);
-		if (ifp->if_flags & IFF_UP && (ifr->ifr_flags & IFF_UP) == 0) {
-			int s = splimp();
-			if_down(ifp);
-			splx(s);
-		}
-		if (ifr->ifr_flags & IFF_UP && (ifp->if_flags & IFF_UP) == 0) {
-			int s = splimp();
-			if_up(ifp);
-			splx(s);
-		}
-		ifp->if_flags = (ifp->if_flags & IFF_CANTCHANGE) |
-			(ifr->ifr_flags &~ IFF_CANTCHANGE);
-		if (ifp->if_ioctl)
-			(void) (*ifp->if_ioctl)(ifp, cmd, data);
-		microtime(&ifp->if_lastchange);
-		break;
-
-	case SIOCSIFMETRIC:
-		error = suser(p->p_ucred, &p->p_acflag);
-		if (error)
-			return (error);
-		ifp->if_metric = ifr->ifr_metric;
-		microtime(&ifp->if_lastchange);
-		break;
-
-	case SIOCSIFPHYS:
-		error = suser(p->p_ucred, &p->p_acflag);
-		if (error)
-			return error;
-		if (!ifp->if_ioctl)
-		        return EOPNOTSUPP;
-		error = (*ifp->if_ioctl)(ifp, cmd, data);
-		if (error == 0)
-			microtime(&ifp->if_lastchange);
-		return(error);
-
-	case SIOCSIFMTU:
-		error = suser(p->p_ucred, &p->p_acflag);
-		if (error)
-			return (error);
-		if (ifp->if_ioctl == NULL)
-			return (EOPNOTSUPP);
-		/*
-		 * 72 was chosen below because it is the size of a TCP/IP
-		 * header (40) + the minimum mss (32).
-		 */
-		if (ifr->ifr_mtu < 72 || ifr->ifr_mtu > 65535)
-			return (EINVAL);
-		error = (*ifp->if_ioctl)(ifp, cmd, data);
-		if (error == 0)
-			microtime(&ifp->if_lastchange);
-		return(error);
-
-	case SIOCADDMULTI:
-	case SIOCDELMULTI:
-		error = suser(p->p_ucred, &p->p_acflag);
-		if (error)
-			return (error);
-		if (ifp->if_ioctl == NULL)
-			return (EOPNOTSUPP);
-		error = (*ifp->if_ioctl)(ifp, cmd, data);
-		if (error == 0 )
-		    	microtime(&ifp->if_lastchange);
-		return(error);
-
-        case SIOCSIFMEDIA:
-		error = suser(p->p_ucred, &p->p_acflag);
-		if (error)
-			return (error);
-		if (ifp->if_ioctl == 0)
-			return (EOPNOTSUPP);
-		error = (*ifp->if_ioctl)(ifp, cmd, data);
-		if (error == 0)
-			microtime(&ifp->if_lastchange);
-		return error;
-
-	case SIOCGIFMEDIA:
-		if (ifp->if_ioctl == 0)
-			return (EOPNOTSUPP);
-		return ((*ifp->if_ioctl)(ifp, cmd, data));
-
-	default:
-		if (so->so_proto == 0)
-			return (EOPNOTSUPP);
-#ifndef COMPAT_43
-		return ((*so->so_proto->pr_usrreqs->pru_control)(so, cmd,
-								 data,
-								 ifp));
-#else
-	    {
-		int ocmd = cmd;
-
-		switch (cmd) {
-
-		case SIOCSIFDSTADDR:
-		case SIOCSIFADDR:
-		case SIOCSIFBRDADDR:
-		case SIOCSIFNETMASK:
-#if BYTE_ORDER != BIG_ENDIAN
-			if (ifr->ifr_addr.sa_family == 0 &&
-			    ifr->ifr_addr.sa_len < 16) {
-				ifr->ifr_addr.sa_family = ifr->ifr_addr.sa_len;
-				ifr->ifr_addr.sa_len = 16;
-			}
-#else
-			if (ifr->ifr_addr.sa_len == 0)
-				ifr->ifr_addr.sa_len = 16;
-#endif
-			break;
-
-		case OSIOCGIFADDR:
-			cmd = SIOCGIFADDR;
-			break;
-
-		case OSIOCGIFDSTADDR:
-			cmd = SIOCGIFDSTADDR;
-			break;
-
-		case OSIOCGIFBRDADDR:
-			cmd = SIOCGIFBRDADDR;
-			break;
-
-		case OSIOCGIFNETMASK:
-			cmd = SIOCGIFNETMASK;
-		}
-		error =  ((*so->so_proto->pr_usrreqs->pru_control)(so,
-								   cmd,
-								   data,
-								   ifp));
-		switch (ocmd) {
-
-		case OSIOCGIFADDR:
-		case OSIOCGIFDSTADDR:
-		case OSIOCGIFBRDADDR:
-		case OSIOCGIFNETMASK:
-			*(u_short *)&ifr->ifr_addr = ifr->ifr_addr.sa_family;
-		}
-		return (error);
-
-	    }
-#endif
-	}
-	return (0);
-}
-
-/*
- * Set/clear promiscuous mode on interface ifp based on the truth value
- * of pswitch.  The calls are reference counted so that only the first
- * "on" request actually has an effect, as does the final "off" request.
- * Results are undefined if the "off" and "on" requests are not matched.
- */
-int
-ifpromisc(ifp, pswitch)
-	struct ifnet *ifp;
-	int pswitch;
-{
-	struct ifreq ifr;
-
-	if (pswitch) {
-		/*
-		 * If the device is not configured up, we cannot put it in
-		 * promiscuous mode.
-		 */
-		if ((ifp->if_flags & IFF_UP) == 0)
-			return (ENETDOWN);
-		if (ifp->if_pcount++ != 0)
-			return (0);
-		ifp->if_flags |= IFF_PROMISC;
-		log(LOG_INFO, "%s%d: promiscuous mode enabled\n",
-		    ifp->if_name, ifp->if_unit);
-	} else {
-		if (--ifp->if_pcount > 0)
-			return (0);
-		ifp->if_flags &= ~IFF_PROMISC;
-	}
-	ifr.ifr_flags = ifp->if_flags;
-	return ((*ifp->if_ioctl)(ifp, SIOCSIFFLAGS, (caddr_t)&ifr));
-}
-
-/*
- * Return interface configuration
- * of system.  List may be used
- * in later ioctl's (above) to get
- * other information.
- */
-/*ARGSUSED*/
-static int
-ifconf(cmd, data)
-	int cmd;
-	caddr_t data;
-{
-	register struct ifconf *ifc = (struct ifconf *)data;
-	register struct ifnet *ifp = ifnet;
-	register struct ifaddr *ifa;
-	struct ifreq ifr, *ifrp;
-	int space = ifc->ifc_len, error = 0;
-
-	ifrp = ifc->ifc_req;
-	for (; space > sizeof (ifr) && ifp; ifp = ifp->if_next) {
-		char workbuf[64];
-		int ifnlen;
-
-		ifnlen = sprintf(workbuf, "%s%d", ifp->if_name, ifp->if_unit);
-		if(ifnlen + 1 > sizeof ifr.ifr_name) {
-			error = ENAMETOOLONG;
-		} else {
-			strcpy(ifr.ifr_name, workbuf);
-		}
-
-		if ((ifa = ifp->if_addrlist) == 0) {
-			bzero((caddr_t)&ifr.ifr_addr, sizeof(ifr.ifr_addr));
-			error = copyout((caddr_t)&ifr, (caddr_t)ifrp,
-			    sizeof (ifr));
-			if (error)
-				break;
-			space -= sizeof (ifr), ifrp++;
-		} else
-		    for ( ; space > sizeof (ifr) && ifa; ifa = ifa->ifa_next) {
-			register struct sockaddr *sa = ifa->ifa_addr;
-#ifdef COMPAT_43
-			if (cmd == OSIOCGIFCONF) {
-				struct osockaddr *osa =
-					 (struct osockaddr *)&ifr.ifr_addr;
-				ifr.ifr_addr = *sa;
-				osa->sa_family = sa->sa_family;
-				error = copyout((caddr_t)&ifr, (caddr_t)ifrp,
-						sizeof (ifr));
-				ifrp++;
-			} else
-#endif
-			if (sa->sa_len <= sizeof(*sa)) {
-				ifr.ifr_addr = *sa;
-				error = copyout((caddr_t)&ifr, (caddr_t)ifrp,
-						sizeof (ifr));
-				ifrp++;
-			} else {
-				space -= sa->sa_len - sizeof(*sa);
-				if (space < sizeof (ifr))
-					break;
-				error = copyout((caddr_t)&ifr, (caddr_t)ifrp,
-						sizeof (ifr.ifr_name));
-				if (error == 0)
-				    error = copyout((caddr_t)sa,
-				      (caddr_t)&ifrp->ifr_addr, sa->sa_len);
-				ifrp = (struct ifreq *)
-					(sa->sa_len + (caddr_t)&ifrp->ifr_addr);
-			}
-			if (error)
-				break;
-			space -= sizeof (ifr);
-		}
-	}
-	ifc->ifc_len -= space;
-	return (error);
-}
-
-SYSCTL_NODE(_net, PF_LINK, link, CTLFLAG_RW, 0, "Link layers");
-SYSCTL_NODE(_net_link, 0, generic, CTLFLAG_RW, 0, "Generic link-management");
diff --git a/cpukit/libnetworking/net/if.h b/cpukit/libnetworking/net/if.h
deleted file mode 100644
index acddd4f095..0000000000
--- a/cpukit/libnetworking/net/if.h
+++ /dev/null
@@ -1,467 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)if.h	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#ifndef _NET_IF_H_
-#define	_NET_IF_H_
-
-/*
- * Structures defining a network interface, providing a packet
- * transport mechanism (ala level 0 of the PUP protocols).
- *
- * Each interface accepts output datagrams of a specified maximum
- * length, and provides higher level routines with input datagrams
- * received from its medium.
- *
- * Output occurs when the routine if_output is called, with three parameters:
- *	(*ifp->if_output)(ifp, m, dst, rt)
- * Here m is the mbuf chain to be sent and dst is the destination address.
- * The output routine encapsulates the supplied datagram if necessary,
- * and then transmits it on its medium.
- *
- * On input, each interface unwraps the data received by it, and either
- * places it on the input queue of a internetwork datagram routine
- * and posts the associated software interrupt, or passes the datagram to a raw
- * packet input routine.
- *
- * Routines exist for locating interfaces by their addresses
- * or for locating a interface on a certain network, as well as more general
- * routing and gateway routines maintaining information used to locate
- * interfaces.  These routines live in the files if.c and route.c
- */
-
-#ifndef _TIME_ /*  XXX fast fix for SNMP, going away soon */
-#include <sys/time.h>
-#endif
-
-#ifdef __STDC__
-/*
- * Forward structure declarations for function prototypes [sic].
- */
-struct	mbuf;
-struct	proc;
-struct	rtentry;
-struct	socket;
-struct	ether_header;
-#endif
-
-/*
- * Structure describing information about an interface
- * which may be of interest to management entities.
- */
-struct if_data {
-	/* generic interface information */
-	u_char	ifi_type;		/* ethernet, tokenring, etc */
-	u_char	ifi_physical;		/* e.g., AUI, Thinnet, 10base-T, etc */
-	u_char	ifi_addrlen;		/* media address length */
-	u_char	ifi_hdrlen;		/* media header length */
-	u_char	ifi_recvquota;		/* polling quota for receive intrs */
-	u_char	ifi_xmitquota;		/* polling quota for xmit intrs */
-	u_long	ifi_mtu;		/* maximum transmission unit */
-	u_long	ifi_metric;		/* routing metric (external only) */
-	u_long	ifi_baudrate;		/* linespeed */
-	/* volatile statistics */
-	u_long	ifi_ipackets;		/* packets received on interface */
-	u_long	ifi_ierrors;		/* input errors on interface */
-	u_long	ifi_opackets;		/* packets sent on interface */
-	u_long	ifi_oerrors;		/* output errors on interface */
-	u_long	ifi_collisions;		/* collisions on csma interfaces */
-	u_long	ifi_ibytes;		/* total number of octets received */
-	u_long	ifi_obytes;		/* total number of octets sent */
-	u_long	ifi_imcasts;		/* packets received via multicast */
-	u_long	ifi_omcasts;		/* packets sent via multicast */
-	u_long	ifi_iqdrops;		/* dropped on input, this interface */
-	u_long	ifi_noproto;		/* destined for unsupported protocol */
-	u_long	ifi_recvtiming;		/* usec spent receiving when timing */
-	u_long	ifi_xmittiming;		/* usec spent xmitting when timing */
-	struct	timeval ifi_lastchange;	/* time of last administrative change */
-};
-
-/*
- * Structure defining a queue for a network interface.
- */
-struct	ifqueue {
-	struct	mbuf *ifq_head;
-	struct	mbuf *ifq_tail;
-	int	ifq_len;
-	int	ifq_maxlen;
-	int	ifq_drops;
-};
-
-/*
- * Structure defining a network interface.
- *
- * (Would like to call this struct ``if'', but C isn't PL/1.)
- */
-struct ifnet {
-	void	*if_softc;		/* pointer to driver state */
-	char	*if_name;		/* name, e.g. ``en'' or ``lo'' */
-	struct	ifnet *if_next;		/* all struct ifnets are chained */
-	struct	ifaddr *if_addrlist;	/* linked list of addresses per if */
-        int	if_pcount;		/* number of promiscuous listeners */
-	struct	bpf_if *if_bpf;		/* packet filter structure */
-	u_short	if_index;		/* numeric abbreviation for this if  */
-	short	if_unit;		/* sub-unit for lower level driver */
-	short	if_timer;		/* time 'til if_watchdog called */
-	short	if_flags;		/* up/down, broadcast, etc. */
-	int	if_ipending;		/* interrupts pending */
-	void	*if_linkmib;		/* link-type-specific MIB data */
-	size_t	if_linkmiblen;		/* length of above data */
-	struct	if_data if_data;
-/* procedure handles */
-	int	(*if_output)		/* output routine (enqueue) */
-		__P((struct ifnet *, struct mbuf *, struct sockaddr *,
-		     struct rtentry *));
-	void	(*if_start)		/* initiate output routine */
-		__P((struct ifnet *));
-	int	(*if_done)		/* output complete routine */
-		__P((struct ifnet *));	/* (XXX not used; fake prototype) */
-	int	(*if_ioctl)		/* ioctl routine */
-		__P((struct ifnet *, int, caddr_t));
-	void	(*if_watchdog)		/* timer routine */
-		__P((struct ifnet *));
-	int	(*if_poll_recv)		/* polled receive routine */
-		__P((struct ifnet *, int *));
-	int	(*if_poll_xmit)		/* polled transmit routine */
-		__P((struct ifnet *, int *));
-	void	(*if_poll_intren)	/* polled interrupt reenable routine */
-		__P((struct ifnet *));
-	void	(*if_poll_slowinput)	/* input routine for slow devices */
-		__P((struct ifnet *, struct mbuf *));
-	void	(*if_init)		/* Init routine */
-		__P((void *));
-	struct	ifqueue if_snd;		/* output queue */
-	struct	ifqueue *if_poll_slowq;	/* input queue for slow devices */
-};
-typedef void if_init_f_t __P((void *));       
-
-#define	if_mtu		if_data.ifi_mtu
-#define	if_type		if_data.ifi_type
-#define if_physical	if_data.ifi_physical
-#define	if_addrlen	if_data.ifi_addrlen
-#define	if_hdrlen	if_data.ifi_hdrlen
-#define	if_metric	if_data.ifi_metric
-#define	if_baudrate	if_data.ifi_baudrate
-#define	if_ipackets	if_data.ifi_ipackets
-#define	if_ierrors	if_data.ifi_ierrors
-#define	if_opackets	if_data.ifi_opackets
-#define	if_oerrors	if_data.ifi_oerrors
-#define	if_collisions	if_data.ifi_collisions
-#define	if_ibytes	if_data.ifi_ibytes
-#define	if_obytes	if_data.ifi_obytes
-#define	if_imcasts	if_data.ifi_imcasts
-#define	if_omcasts	if_data.ifi_omcasts
-#define	if_iqdrops	if_data.ifi_iqdrops
-#define	if_noproto	if_data.ifi_noproto
-#define	if_lastchange	if_data.ifi_lastchange
-#define if_recvquota	if_data.ifi_recvquota
-#define	if_xmitquota	if_data.ifi_xmitquota
-#define if_rawoutput(if, m, sa) if_output(if, m, sa, (struct rtentry *)0)
-
-#define	IFF_UP		0x1		/* interface is up */
-#define	IFF_BROADCAST	0x2		/* broadcast address valid */
-#define	IFF_DEBUG	0x4		/* turn on debugging */
-#define	IFF_LOOPBACK	0x8		/* is a loopback net */
-#define	IFF_POINTOPOINT	0x10		/* interface is point-to-point link */
-/*#define IFF_NOTRAILERS 0x20		 * obsolete: avoid use of trailers */
-#define	IFF_RUNNING	0x40		/* resources allocated */
-#define	IFF_NOARP	0x80		/* no address resolution protocol */
-#define	IFF_PROMISC	0x100		/* receive all packets */
-#define	IFF_ALLMULTI	0x200		/* receive all multicast packets */
-#define	IFF_OACTIVE	0x400		/* transmission in progress */
-#define	IFF_SIMPLEX	0x800		/* can't hear own transmissions */
-#define	IFF_LINK0	0x1000		/* per link layer defined bit */
-#define	IFF_LINK1	0x2000		/* per link layer defined bit */
-#define	IFF_LINK2	0x4000		/* per link layer defined bit */
-#define	IFF_ALTPHYS	IFF_LINK2	/* use alternate physical connection */
-#define	IFF_MULTICAST	0x8000		/* supports multicast */
-
-/* flags set internally only: */
-#define	IFF_CANTCHANGE \
-	(IFF_BROADCAST|IFF_POINTOPOINT|IFF_RUNNING|IFF_OACTIVE|\
-	    IFF_SIMPLEX|IFF_MULTICAST|IFF_ALLMULTI)
-
-
-/*
- * These really don't belong here, but there's no other obviously appropriate
- * location.
- */
-#define IFP_AUI		0
-#define IFP_10BASE2	1
-#define IFP_10BASET	2
-/* etc. */
-
-/*
- * Bit values in if_ipending
- */
-#define	IFI_RECV	1	/* I want to receive */
-#define	IFI_XMIT	2	/* I want to transmit */
-
-/*
- * Output queues (ifp->if_snd) and slow device input queues (*ifp->if_slowq)
- * are queues of messages stored on ifqueue structures
- * (defined above).  Entries are added to and deleted from these structures
- * by these macros, which should be called with ipl raised to splimp().
- */
-#define	IF_QFULL(ifq)		((ifq)->ifq_len >= (ifq)->ifq_maxlen)
-#define	IF_DROP(ifq)		((ifq)->ifq_drops++)
-#define	IF_ENQUEUE(ifq, m) { \
-	(m)->m_nextpkt = 0; \
-	if ((ifq)->ifq_tail == 0) \
-		(ifq)->ifq_head = m; \
-	else \
-		(ifq)->ifq_tail->m_nextpkt = m; \
-	(ifq)->ifq_tail = m; \
-	(ifq)->ifq_len++; \
-}
-#define	IF_PREPEND(ifq, m) { \
-	(m)->m_nextpkt = (ifq)->ifq_head; \
-	if ((ifq)->ifq_tail == 0) \
-		(ifq)->ifq_tail = (m); \
-	(ifq)->ifq_head = (m); \
-	(ifq)->ifq_len++; \
-}
-#define	IF_DEQUEUE(ifq, m) { \
-	(m) = (ifq)->ifq_head; \
-	if (m) { \
-		if (((ifq)->ifq_head = (m)->m_nextpkt) == 0) \
-			(ifq)->ifq_tail = 0; \
-		(m)->m_nextpkt = 0; \
-		(ifq)->ifq_len--; \
-	} \
-}
-
-#ifdef KERNEL
-#define	IF_ENQ_DROP(ifq, m)	if_enq_drop(ifq, m)
-
-#if defined(__GNUC__) && defined(MT_HEADER)
-static inline int
-if_queue_drop(struct ifqueue *ifq, struct mbuf *m)
-{
-	IF_DROP(ifq);
-	return 0;
-}
-
-static inline int
-if_enq_drop(struct ifqueue *ifq, struct mbuf *m)
-{
-	if (IF_QFULL(ifq) &&
-	    !if_queue_drop(ifq, m))
-		return 0;
-	IF_ENQUEUE(ifq, m);
-	return 1;
-}
-#else
-
-#ifdef MT_HEADER
-int	if_enq_drop __P((struct ifqueue *, struct mbuf *));
-#endif
-
-#endif
-#endif /* KERNEL */
-
-#define	IFQ_MAXLEN	50
-#define	IFNET_SLOWHZ	1		/* granularity is 1 second */
-
-/*
- * The ifaddr structure contains information about one address
- * of an interface.  They are maintained by the different address families,
- * are allocated and attached when an address is set, and are linked
- * together so all addresses for an interface can be located.
- */
-struct ifaddr {
-	struct	sockaddr *ifa_addr;	/* address of interface */
-	struct	sockaddr *ifa_dstaddr;	/* other end of p-to-p link */
-#define	ifa_broadaddr	ifa_dstaddr	/* broadcast address interface */
-	struct	sockaddr *ifa_netmask;	/* used to determine subnet */
-	struct	ifnet *ifa_ifp;		/* back-pointer to interface */
-	struct	ifaddr *ifa_next;	/* next address for interface */
-	void	(*ifa_rtrequest)	/* check or clean routes (+ or -)'d */
-		__P((int, struct rtentry *, struct sockaddr *));
-	u_short	ifa_flags;		/* mostly rt_flags for cloning */
-	short	ifa_refcnt;		/* references to this structure */
-	int	ifa_metric;		/* cost of going out this interface */
-#ifdef notdef
-	struct	rtentry *ifa_rt;	/* XXXX for ROUTETOIF ????? */
-#endif
-	int (*ifa_claim_addr)		/* check if an addr goes to this if */
-		__P((struct ifaddr *, struct sockaddr *));
-
-};
-#define	IFA_ROUTE	RTF_UP		/* route installed */
-
-/*
- * Message format for use in obtaining information about interfaces
- * from getkerninfo and the routing socket
- */
-struct if_msghdr {
-	u_short	ifm_msglen;	/* to skip over non-understood messages */
-	u_char	ifm_version;	/* future binary compatability */
-	u_char	ifm_type;	/* message type */
-	int	ifm_addrs;	/* like rtm_addrs */
-	int	ifm_flags;	/* value of if_flags */
-	u_short	ifm_index;	/* index for associated ifp */
-	struct	if_data ifm_data;/* statistics and other data about if */
-};
-
-/*
- * Message format for use in obtaining information about interface addresses
- * from getkerninfo and the routing socket
- */
-struct ifa_msghdr {
-	u_short	ifam_msglen;	/* to skip over non-understood messages */
-	u_char	ifam_version;	/* future binary compatability */
-	u_char	ifam_type;	/* message type */
-	int	ifam_addrs;	/* like rtm_addrs */
-	int	ifam_flags;	/* value of ifa_flags */
-	u_short	ifam_index;	/* index for associated ifp */
-	int	ifam_metric;	/* value of ifa_metric */
-};
-
-/*
- * Interface request structure used for socket
- * ioctl's.  All interface ioctl's must have parameter
- * definitions which begin with ifr_name.  The
- * remainder may be interface specific.
- */
-struct	ifreq {
-#define	IFNAMSIZ	16
-	char	ifr_name[IFNAMSIZ];		/* if name, e.g. "en0" */
-	union {
-		struct	sockaddr ifru_addr;
-		struct	sockaddr ifru_dstaddr;
-		struct	sockaddr ifru_broadaddr;
-		short	ifru_flags;
-		int	ifru_metric;
-		int	ifru_mtu;
-		int	ifru_phys;
-		int	ifru_media;
-		caddr_t	ifru_data;
-	} ifr_ifru;
-#define	ifr_addr	ifr_ifru.ifru_addr	/* address */
-#define	ifr_dstaddr	ifr_ifru.ifru_dstaddr	/* other end of p-to-p link */
-#define	ifr_broadaddr	ifr_ifru.ifru_broadaddr	/* broadcast address */
-#define	ifr_flags	ifr_ifru.ifru_flags	/* flags */
-#define	ifr_metric	ifr_ifru.ifru_metric	/* metric */
-#define	ifr_mtu		ifr_ifru.ifru_mtu	/* mtu */
-#define ifr_phys	ifr_ifru.ifru_phys	/* physical wire */
-#define ifr_media	ifr_ifru.ifru_media	/* physical media */
-#define	ifr_data	ifr_ifru.ifru_data	/* for use by interface */
-};
-
-struct ifaliasreq {
-	char	ifra_name[IFNAMSIZ];		/* if name, e.g. "en0" */
-	struct	sockaddr ifra_addr;
-	struct	sockaddr ifra_broadaddr;
-	struct	sockaddr ifra_mask;
-};
-
-struct ifmediareq {
-	char	ifm_name[IFNAMSIZ];	/* if name, e.g. "en0" */
-	int	ifm_current;		/* current media options */
-	int	ifm_mask;		/* don't care mask */
-	int	ifm_status;		/* media status */
-	int	ifm_active;		/* active options */
-	int	ifm_count;		/* # entries in ifm_ulist array */
-	int	*ifm_ulist;		/* media words */
-};
-/*
- * Structure used in SIOCGIFCONF request.
- * Used to retrieve interface configuration
- * for machine (useful for programs which
- * must know all networks accessible).
- */
-struct	ifconf {
-	int	ifc_len;		/* size of associated buffer */
-	union {
-		caddr_t	ifcu_buf;
-		struct	ifreq *ifcu_req;
-	} ifc_ifcu;
-#define	ifc_buf	ifc_ifcu.ifcu_buf	/* buffer address */
-#define	ifc_req	ifc_ifcu.ifcu_req	/* array of structures returned */
-};
-
-#include <net/if_arp.h>
-
-#ifdef KERNEL
-#define	IFAFREE(ifa) \
-	if ((ifa)->ifa_refcnt <= 0) \
-		ifafree(ifa); \
-	else \
-		(ifa)->ifa_refcnt--;
-
-extern struct	ifnet	*ifnet;
-extern int	ifqmaxlen;
-extern struct	ifnet	loif[];
-extern int	if_index;
-extern struct	ifaddr	**ifnet_addrs;
-
-void	ether_ifattach __P((struct ifnet *));
-void	ether_input __P((struct ifnet *, struct ether_header *, struct mbuf *));
-int	ether_output __P((struct ifnet *,
-	   struct mbuf *, struct sockaddr *, struct rtentry *));
-int	ether_ioctl __P((struct ifnet *, int , caddr_t ));
-
-void	if_attach __P((struct ifnet *));
-void	if_down __P((struct ifnet *));
-void	if_up __P((struct ifnet *));
-#ifdef vax
-void	ifubareset __P((int));
-#endif
-/*void	ifinit __P((void));*/ /* declared in systm.h for main() */
-int	ifioctl __P((struct socket *, int, caddr_t, struct proc *));
-int	ifpromisc __P((struct ifnet *, int));
-struct	ifnet *ifunit __P((char *));
-
-int	if_poll_recv_slow __P((struct ifnet *ifp, int *quotap));
-void	if_poll_xmit_slow __P((struct ifnet *ifp, int *quotap));
-void	if_poll_throttle __P((void));
-void	if_poll_unthrottle __P((void *));
-void	if_poll_init __P((void));
-void	if_poll __P((void));
-
-struct	ifaddr *ifa_ifwithaddr __P((struct sockaddr *));
-struct	ifaddr *ifa_ifwithdstaddr __P((struct sockaddr *));
-struct	ifaddr *ifa_ifwithnet __P((struct sockaddr *));
-struct	ifaddr *ifa_ifwithroute __P((int, struct sockaddr *,
-					struct sockaddr *));
-struct	ifaddr *ifaof_ifpforaddr __P((struct sockaddr *, struct ifnet *));
-void	ifafree __P((struct ifaddr *));
-
-int	looutput __P((struct ifnet *,
-	   struct mbuf *, struct sockaddr *, struct rtentry *));
-#endif /* KERNEL */
-
-#endif /* !_NET_IF_H_ */
diff --git a/cpukit/libnetworking/net/if_arp.h b/cpukit/libnetworking/net/if_arp.h
deleted file mode 100644
index dd726bf856..0000000000
--- a/cpukit/libnetworking/net/if_arp.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright (c) 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)if_arp.h	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#ifndef _NET_IF_ARP_H_
-#define	_NET_IF_ARP_H_
-
-/*
- * Address Resolution Protocol.
- *
- * See RFC 826 for protocol description.  ARP packets are variable
- * in size; the arphdr structure defines the fixed-length portion.
- * Protocol type values are the same as those for 10 Mb/s Ethernet.
- * It is followed by the variable-sized fields ar_sha, arp_spa,
- * arp_tha and arp_tpa in that order, according to the lengths
- * specified.  Field names used correspond to RFC 826.
- */
-struct	arphdr {
-	u_short	ar_hrd;		/* format of hardware address */
-#define ARPHRD_ETHER 	1	/* ethernet hardware format */
-#define ARPHRD_FRELAY 	15	/* frame relay hardware format */
-	u_short	ar_pro;		/* format of protocol address */
-	u_char	ar_hln;		/* length of hardware address */
-	u_char	ar_pln;		/* length of protocol address */
-	u_short	ar_op;		/* one of: */
-#define	ARPOP_REQUEST	1	/* request to resolve address */
-#define	ARPOP_REPLY	2	/* response to previous request */
-#define	ARPOP_REVREQUEST 3	/* request protocol address given hardware */
-#define	ARPOP_REVREPLY	4	/* response giving protocol address */
-#define ARPOP_INVREQUEST 8 	/* request to identify peer */
-#define ARPOP_INVREPLY	9	/* response identifying peer */
-/*
- * The remaining fields are variable in size,
- * according to the sizes above.
- */
-#ifdef COMMENT_ONLY
-	u_char	ar_sha[];	/* sender hardware address */
-	u_char	ar_spa[];	/* sender protocol address */
-	u_char	ar_tha[];	/* target hardware address */
-	u_char	ar_tpa[];	/* target protocol address */
-#endif
-};
-
-/*
- * ARP ioctl request
- */
-struct arpreq {
-	struct	sockaddr arp_pa;		/* protocol address */
-	struct	sockaddr arp_ha;		/* hardware address */
-	int	arp_flags;			/* flags */
-};
-/*  arp_flags and at_flags field values */
-#define	ATF_INUSE	0x01	/* entry in use */
-#define ATF_COM		0x02	/* completed entry (enaddr valid) */
-#define	ATF_PERM	0x04	/* permanent entry */
-#define	ATF_PUBL	0x08	/* publish entry (respond for other host) */
-#define	ATF_USETRAILERS	0x10	/* has requested trailers */
-
-#endif /* !_NET_IF_ARP_H_ */
diff --git a/cpukit/libnetworking/net/if_dl.h b/cpukit/libnetworking/net/if_dl.h
deleted file mode 100644
index 053ae3e92f..0000000000
--- a/cpukit/libnetworking/net/if_dl.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)if_dl.h	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#ifndef _NET_IF_DL_H_
-#define _NET_IF_DL_H_
-
-/*
- * A Link-Level Sockaddr may specify the interface in one of two
- * ways: either by means of a system-provided index number (computed
- * anew and possibly differently on every reboot), or by a human-readable
- * string such as "il0" (for managerial convenience).
- *
- * Census taking actions, such as something akin to SIOCGCONF would return
- * both the index and the human name.
- *
- * High volume transactions (such as giving a link-level ``from'' address
- * in a recvfrom or recvmsg call) may be likely only to provide the indexed
- * form, (which requires fewer copy operations and less space).
- *
- * The form and interpretation  of the link-level address is purely a matter
- * of convention between the device driver and its consumers; however, it is
- * expected that all drivers for an interface of a given if_type will agree.
- */
-
-/*
- * Structure of a Link-Level sockaddr:
- */
-struct sockaddr_dl {
-	u_char	sdl_len;	/* Total length of sockaddr */
-	u_char	sdl_family;	/* AF_DLI */
-	u_short	sdl_index;	/* if != 0, system given index for interface */
-	u_char	sdl_type;	/* interface type */
-	u_char	sdl_nlen;	/* interface name length, no trailing 0 reqd. */
-	u_char	sdl_alen;	/* link level address length */
-	u_char	sdl_slen;	/* link layer selector length */
-	char	sdl_data[12];	/* minimum work area, can be larger;
-				   contains both if name and ll address */
-};
-
-#define LLADDR(s) ((caddr_t)((s)->sdl_data + (s)->sdl_nlen))
-
-#ifndef KERNEL
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-void	link_addr __P((const char *, struct sockaddr_dl *));
-char	*link_ntoa __P((const struct sockaddr_dl *));
-__END_DECLS
-
-#endif /* !KERNEL */
-
-#endif
diff --git a/cpukit/libnetworking/net/if_ethersubr.c b/cpukit/libnetworking/net/if_ethersubr.c
deleted file mode 100644
index 4d1675ca3c..0000000000
--- a/cpukit/libnetworking/net/if_ethersubr.c
+++ /dev/null
@@ -1,988 +0,0 @@
-/*
- * Copyright (c) 1982, 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)if_ethersubr.c	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/malloc.h>
-#include <sys/mbuf.h>
-#include <sys/protosw.h>
-#include <sys/socket.h>
-#include <sys/ioctl.h>
-#include <sys/errno.h>
-#include <sys/syslog.h>
-#include <sys/sysctl.h>
-
-#include <net/if.h>
-#include <net/netisr.h>
-#include <net/route.h>
-#include <net/if_llc.h>
-#include <net/if_dl.h>
-#include <net/if_types.h>
-#include <net/ethernet.h>
-
-#ifdef INET
-#include <netinet/in.h>
-#include <netinet/in_var.h>
-#endif
-#include <netinet/if_ether.h>
-
-#ifdef IPX
-#include <netipx/ipx.h>
-#include <netipx/ipx_if.h>
-#endif
-
-#ifdef NS
-#include <netns/ns.h>
-#include <netns/ns_if.h>
-ushort ns_nettype;
-int ether_outputdebug = 0;
-int ether_inputdebug = 0;
-#endif
-
-#ifdef ISO
-#include <netiso/argo_debug.h>
-#include <netiso/iso.h>
-#include <netiso/iso_var.h>
-#include <netiso/iso_snpac.h>
-#endif
-
-/*#ifdef LLC
-#include <netccitt/dll.h>
-#include <netccitt/llc_var.h>
-#endif*/
-
-#if defined(LLC) && defined(CCITT)
-extern struct ifqueue pkintrq;
-#endif
-
-#ifdef NETATALK
-#include <netatalk/at.h>
-#include <netatalk/at_var.h>
-#include <netatalk/at_extern.h>
-
-#define llc_snap_org_code llc_un.type_snap.org_code
-#define llc_snap_ether_type llc_un.type_snap.ether_type
-
-extern u_char	at_org_code[ 3 ];
-extern u_char	aarp_org_code[ 3 ];
-#endif NETATALK
-
-u_char	etherbroadcastaddr[6] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
-#define senderr(e) { error = (e); goto bad;}
-
-/*
- * Ethernet output routine.
- * Encapsulate a packet of type family for the local net.
- * Use trailer local net encapsulation if enough data in first
- * packet leaves a multiple of 512 bytes of data in remainder.
- * Assumes that ifp is actually pointer to arpcom structure.
- */
-int
-ether_output(ifp, m0, dst, rt0)
-	register struct ifnet *ifp;
-	struct mbuf *m0;
-	struct sockaddr *dst;
-	struct rtentry *rt0;
-{
-	short type;
-	int s, error = 0;
-#ifdef NS
- 	u_char *cp
-	register struct ifqueue *inq;
-	register struct mbuf *m2;
-#endif
-	u_char  edst[6];
-	register struct mbuf *m = m0;
-	register struct rtentry *rt;
-	struct mbuf *mcopy = (struct mbuf *)0;
-	register struct ether_header *eh;
-	int off, len = m->m_pkthdr.len;
-	struct arpcom *ac = (struct arpcom *)ifp;
-#ifdef NETATALK
-	struct at_ifaddr *aa;
-#endif NETATALK
-
-	if ((ifp->if_flags & (IFF_UP|IFF_RUNNING)) != (IFF_UP|IFF_RUNNING))
-		senderr(ENETDOWN);
-	rt = rt0;
-	if (rt) {
-		if ((rt->rt_flags & RTF_UP) == 0) {
-			rt0 = rt = rtalloc1(dst, 1, 0UL);
-			if (rt0)
-				rt->rt_refcnt--;
-			else
-				senderr(EHOSTUNREACH);
-		}
-		if (rt->rt_flags & RTF_GATEWAY) {
-			if (rt->rt_gwroute == 0)
-				goto lookup;
-			if (((rt = rt->rt_gwroute)->rt_flags & RTF_UP) == 0) {
-				rtfree(rt); rt = rt0;
-			lookup: rt->rt_gwroute = rtalloc1(rt->rt_gateway, 1,
-							  0UL);
-				if ((rt = rt->rt_gwroute) == 0)
-					senderr(EHOSTUNREACH);
-			}
-		}
-		if (rt->rt_flags & RTF_REJECT)
-			if (rt->rt_rmx.rmx_expire == 0 ||
-			    rtems_bsdnet_seconds_since_boot() < rt->rt_rmx.rmx_expire)
-				senderr(rt == rt0 ? EHOSTDOWN : EHOSTUNREACH);
-	}
-	switch (dst->sa_family) {
-
-#ifdef INET
-	case AF_INET:
-		if (!arpresolve(ac, rt, m, dst, edst, rt0))
-			return (0);	/* if not yet resolved */
-		/* If broadcasting on a simplex interface, loopback a copy */
-		if ((m->m_flags & M_BCAST) && (ifp->if_flags & IFF_SIMPLEX))
-			mcopy = m_copy(m, 0, (int)M_COPYALL);
-		off = m->m_pkthdr.len - m->m_len;
-		type = htons(ETHERTYPE_IP);
-		break;
-#endif
-#ifdef IPX
-	case AF_IPX:
-		{
-		struct ifaddr *ia;
-
-		type = htons(ETHERTYPE_IPX);
- 		bcopy((caddr_t)&(((struct sockaddr_ipx *)dst)->sipx_addr.x_host),
-		    (caddr_t)edst, sizeof (edst));
-		for (ia = ifp->if_addrlist; ia != NULL; ia = ia->ifa_next)
-			if(ia->ifa_addr->sa_family == AF_IPX &&
-			   !bcmp((caddr_t)edst,
-				 (caddr_t)&((struct ipx_ifaddr *)ia)->ia_addr.sipx_addr.x_host,
-				 sizeof(edst)))
-				return (looutput(ifp, m, dst, rt));
-		/* If broadcasting on a simplex interface, loopback a copy */
-		if ((m->m_flags & M_BCAST) && (ifp->if_flags & IFF_SIMPLEX))
-			mcopy = m_copy(m, 0, (int)M_COPYALL);
-		break;
-		}
-#endif
-#ifdef NETATALK
-	case AF_APPLETALK:
-	    {
-		struct sockaddr_at *sat = (struct sockaddr_at *)dst;
-
-		/*
-		 * super hack..
-		 * Most of this loopback code should move into the appletalk
-		 * code, but it's here for now.. remember to move it! [JRE]
-		 * This may not get the same interface we started with
-		 * fix asap. XXX
-		 */
-		aa = at_ifawithnet( sat );
-		if (aa == NULL) {
-			goto bad;
-		}
-		if( aa->aa_ifa.ifa_ifp != ifp ) {
-			(*aa->aa_ifa.ifa_ifp->if_output)(aa->aa_ifa.ifa_ifp,
-							m,dst,rt);
-		}
-		if (((sat->sat_addr.s_net == ATADDR_ANYNET)
-		  && (sat->sat_addr.s_node == ATADDR_ANYNODE))
-		|| ((sat->sat_addr.s_net == aa->aa_addr.sat_addr.s_net )
-		  && (sat->sat_addr.s_node == aa->aa_addr.sat_addr.s_node))) {
-			(void) looutput(ifp, m, dst, rt);
-			return(0);
-		}
-
-        	if (!aarpresolve(ac, m, (struct sockaddr_at *)dst, edst)) {
-#ifdef NETATALKDEBUG
-                	extern char *prsockaddr(struct sockaddr *);
-                	printf("aarpresolv: failed for %s\n", prsockaddr(dst));
-#endif NETATALKDEBUG
-                	return (0);
-        	}
-
-		/*
-		 * If broadcasting on a simplex interface, loopback a copy
-		 */
-		if ((m->m_flags & M_BCAST) && (ifp->if_flags & IFF_SIMPLEX))
-			mcopy = m_copy(m, 0, (int)M_COPYALL);
-	    }
-	    /*
-	     * In the phase 2 case, we need to prepend an mbuf for the llc header.
-	     * Since we must preserve the value of m, which is passed to us by
-	     * value, we m_copy() the first mbuf, and use it for our llc header.
-	     */
-	    if ( aa->aa_flags & AFA_PHASE2 ) {
-		struct llc llc;
-
-		M_PREPEND(m, sizeof(struct llc), M_WAIT);
-		len += sizeof(struct llc);
-		llc.llc_dsap = llc.llc_ssap = LLC_SNAP_LSAP;
-		llc.llc_control = LLC_UI;
-		bcopy(at_org_code, llc.llc_snap_org_code, sizeof(at_org_code));
-		llc.llc_snap_ether_type = htons( ETHERTYPE_AT );
-		bcopy(&llc, mtod(m, caddr_t), sizeof(struct llc));
-		type = htons(m->m_pkthdr.len);
-	    } else {
-		type = htons(ETHERTYPE_AT);
-	    }
-	    break;
-#endif NETATALK
-#ifdef NS
-	case AF_NS:
-		switch(ns_nettype){
-		default:
-		case 0x8137: /* Novell Ethernet_II Ethernet TYPE II */
-			type = 0x8137;
-			break;
-		case 0x0: /* Novell 802.3 */
-			type = htons( m->m_pkthdr.len);
-			break;
-		case 0xe0e0: /* Novell 802.2 and Token-Ring */
-			M_PREPEND(m, 3, M_WAIT);
-			type = htons( m->m_pkthdr.len);
-			cp = mtod(m, u_char *);
-			*cp++ = 0xE0;
-			*cp++ = 0xE0;
-			*cp++ = 0x03;
-			break;
-		}
- 		bcopy((caddr_t)&(((struct sockaddr_ns *)dst)->sns_addr.x_host),
-		    (caddr_t)edst, sizeof (edst));
-		if (!bcmp((caddr_t)edst, (caddr_t)&ns_thishost, sizeof(edst))){
-			m->m_pkthdr.rcvif = ifp;
-			schednetisr(NETISR_NS);
-			inq = &nsintrq;
-			s = splimp();
-			if (IF_QFULL(inq)) {
-				IF_DROP(inq);
-				m_freem(m);
-			} else
-				IF_ENQUEUE(inq, m);
-			splx(s);
-			return (error);
-		}
-		if (!bcmp((caddr_t)edst, (caddr_t)&ns_broadhost, sizeof(edst))){
-			m2 = m_copy(m, 0, (int)M_COPYALL);
-			m2->m_pkthdr.rcvif = ifp;
-			schednetisr(NETISR_NS);
-			inq = &nsintrq;
-			s = splimp();
-			if (IF_QFULL(inq)) {
-				IF_DROP(inq);
-				m_freem(m2);
-			} else
-				IF_ENQUEUE(inq, m2);
-			splx(s);
-		}
-		/* If broadcasting on a simplex interface, loopback a copy */
-		if ((m->m_flags & M_BCAST) && (ifp->if_flags & IFF_SIMPLEX)){
-			mcopy = m_copy(m, 0, (int)M_COPYALL);
-		}
-		break;
-#endif /* NS */
-#ifdef	ISO
-	case AF_ISO: {
-		int	snpalen;
-		struct	llc *l;
-		register struct sockaddr_dl *sdl;
-
-		if (rt && (sdl = (struct sockaddr_dl *)rt->rt_gateway) &&
-		    sdl->sdl_family == AF_LINK && sdl->sdl_alen > 0) {
-			bcopy(LLADDR(sdl), (caddr_t)edst, sizeof(edst));
-		} else if (error =
-			    iso_snparesolve(ifp, (struct sockaddr_iso *)dst,
-					    (char *)edst, &snpalen))
-			goto bad; /* Not Resolved */
-		/* If broadcasting on a simplex interface, loopback a copy */
-		if (*edst & 1)
-			m->m_flags |= (M_BCAST|M_MCAST);
-		if ((m->m_flags & M_BCAST) && (ifp->if_flags & IFF_SIMPLEX) &&
-		    (mcopy = m_copy(m, 0, (int)M_COPYALL))) {
-			M_PREPEND(mcopy, sizeof (*eh), M_DONTWAIT);
-			if (mcopy) {
-				eh = mtod(mcopy, struct ether_header *);
-				bcopy((caddr_t)edst,
-				      (caddr_t)eh->ether_dhost, sizeof (edst));
-				bcopy((caddr_t)ac->ac_enaddr,
-				      (caddr_t)eh->ether_shost, sizeof (edst));
-			}
-		}
-		M_PREPEND(m, 3, M_DONTWAIT);
-		if (m == NULL)
-			return (0);
-		type = htons(m->m_pkthdr.len);
-		l = mtod(m, struct llc *);
-		l->llc_dsap = l->llc_ssap = LLC_ISO_LSAP;
-		l->llc_control = LLC_UI;
-		len += 3;
-		IFDEBUG(D_ETHER)
-			int i;
-			printf("unoutput: sending pkt to: ");
-			for (i=0; i<6; i++)
-				printf("%x ", edst[i] & 0xff);
-			printf("\n");
-		ENDDEBUG
-		} break;
-#endif /* ISO */
-#ifdef	LLC
-/*	case AF_NSAP: */
-	case AF_CCITT: {
-		register struct sockaddr_dl *sdl =
-			(struct sockaddr_dl *) rt -> rt_gateway;
-
-		if (sdl && sdl->sdl_family == AF_LINK
-		    && sdl->sdl_alen > 0) {
-			bcopy(LLADDR(sdl), (char *)edst,
-				sizeof(edst));
-		} else goto bad; /* Not a link interface ? Funny ... */
-		if ((ifp->if_flags & IFF_SIMPLEX) && (*edst & 1) &&
-		    (mcopy = m_copy(m, 0, (int)M_COPYALL))) {
-			M_PREPEND(mcopy, sizeof (*eh), M_DONTWAIT);
-			if (mcopy) {
-				eh = mtod(mcopy, struct ether_header *);
-				bcopy((caddr_t)edst,
-				      (caddr_t)eh->ether_dhost, sizeof (edst));
-				bcopy((caddr_t)ac->ac_enaddr,
-				      (caddr_t)eh->ether_shost, sizeof (edst));
-			}
-		}
-		type = htons(m->m_pkthdr.len);
-#ifdef LLC_DEBUG
-		{
-			int i;
-			register struct llc *l = mtod(m, struct llc *);
-
-			printf("ether_output: sending LLC2 pkt to: ");
-			for (i=0; i<6; i++)
-				printf("%x ", edst[i] & 0xff);
-			printf(" len 0x%x dsap 0x%x ssap 0x%x control 0x%x\n",
-			       type & 0xff, l->llc_dsap & 0xff, l->llc_ssap &0xff,
-			       l->llc_control & 0xff);
-
-		}
-#endif /* LLC_DEBUG */
-		} break;
-#endif /* LLC */
-
-	case AF_UNSPEC:
-		eh = (struct ether_header *)dst->sa_data;
- 		(void)memcpy(edst, eh->ether_dhost, sizeof (edst));
-		type = eh->ether_type;
-		break;
-
-	default:
-		printf("%s%d: can't handle af%d\n", ifp->if_name, ifp->if_unit,
-			dst->sa_family);
-		senderr(EAFNOSUPPORT);
-	}
-
-
-	if (mcopy)
-		(void) looutput(ifp, mcopy, dst, rt);
-	/*
-	 * Add local net header.  If no space in first mbuf,
-	 * allocate another.
-	 */
-	M_PREPEND(m, sizeof (struct ether_header), M_DONTWAIT);
-	if (m == 0)
-		senderr(ENOBUFS);
-	eh = mtod(m, struct ether_header *);
-	(void)memcpy(&eh->ether_type, &type,
-		sizeof(eh->ether_type));
- 	(void)memcpy(eh->ether_dhost, edst, sizeof (edst));
- 	(void)memcpy(eh->ether_shost, ac->ac_enaddr,
-	    sizeof(eh->ether_shost));
-	s = splimp();
-	/*
-	 * Queue message on interface, and start output if interface
-	 * not yet active.
-	 */
-	if (IF_QFULL(&ifp->if_snd)) {
-		IF_DROP(&ifp->if_snd);
-		splx(s);
-		senderr(ENOBUFS);
-	}
-	IF_ENQUEUE(&ifp->if_snd, m);
-	if ((ifp->if_flags & IFF_OACTIVE) == 0)
-		(*ifp->if_start)(ifp);
-	splx(s);
-	ifp->if_obytes += len + sizeof (struct ether_header);
-	if (m->m_flags & M_MCAST)
-		ifp->if_omcasts++;
-	return (error);
-
-bad:
-	if (m)
-		m_freem(m);
-	return (error);
-}
-
-/*
- * Process a received Ethernet packet;
- * the packet is in the mbuf chain m without
- * the ether header, which is provided separately.
- */
-void
-ether_input(ifp, eh, m)
-	struct ifnet *ifp;
-	register struct ether_header *eh;
-	struct mbuf *m;
-{
-	register struct ifqueue *inq;
-	u_short ether_type;
-#ifdef NS
-	u_short *checksum;
-#endif
-	int s;
-#if defined (ISO) || defined (LLC) || defined(NETATALK)
-	register struct llc *l;
-#endif
-
-	if ((ifp->if_flags & IFF_UP) == 0) {
-		m_freem(m);
-		return;
-	}
-	ifp->if_ibytes += m->m_pkthdr.len + sizeof (*eh);
-	if (bcmp((caddr_t)etherbroadcastaddr, (caddr_t)eh->ether_dhost,
-	    sizeof(etherbroadcastaddr)) == 0)
-		m->m_flags |= M_BCAST;
-	else if (eh->ether_dhost[0] & 1)
-		m->m_flags |= M_MCAST;
-	if (m->m_flags & (M_BCAST|M_MCAST))
-		ifp->if_imcasts++;
-
-	ether_type = ntohs(eh->ether_type);
-
-	switch (ether_type) {
-#ifdef INET
-	case ETHERTYPE_IP:
-		schednetisr(NETISR_IP);
-		inq = &ipintrq;
-		break;
-
-	case ETHERTYPE_ARP:
-		schednetisr(NETISR_ARP);
-		inq = &arpintrq;
-		break;
-#endif
-#ifdef IPX
-	case ETHERTYPE_IPX:
-		schednetisr(NETISR_IPX);
-		inq = &ipxintrq;
-		break;
-#endif
-#ifdef NS
-	case 0x8137: /* Novell Ethernet_II Ethernet TYPE II */
-		schednetisr(NETISR_NS);
-		inq = &nsintrq;
-		break;
-
-#endif /* NS */
-#ifdef NETATALK
-        case ETHERTYPE_AT:
-                schednetisr(NETISR_ATALK);
-                inq = &atintrq1;
-                break;
-        case ETHERTYPE_AARP:
-		/* probably this should be done with a NETISR as well */
-                aarpinput((struct arpcom *)ifp, m); /* XXX */
-                return;
-#endif NETATALK
-	default:
-#ifdef NS
-		checksum = mtod(m, ushort *);
-		/* Novell 802.3 */
-		if ((ether_type <= ETHERMTU) &&
-			((*checksum == 0xffff) || (*checksum == 0xE0E0))){
-			if(*checksum == 0xE0E0) {
-				m->m_pkthdr.len -= 3;
-				m->m_len -= 3;
-				m->m_data += 3;
-			}
-				schednetisr(NETISR_NS);
-				inq = &nsintrq;
-				break;
-		}
-#endif /* NS */
-#if defined (ISO) || defined (LLC) || defined(NETATALK)
-		if (ether_type > ETHERMTU)
-			goto dropanyway;
-		l = mtod(m, struct llc *);
-		switch (l->llc_dsap) {
-#ifdef NETATALK
-		case LLC_SNAP_LSAP:
-		    switch (l->llc_control) {
-		    case LLC_UI:
-			if (l->llc_ssap != LLC_SNAP_LSAP)
-			    goto dropanyway;
-	
-			if (Bcmp(&(l->llc_snap_org_code)[0], at_org_code,
-				   sizeof(at_org_code)) == 0 &&
-			     ntohs(l->llc_snap_ether_type) == ETHERTYPE_AT) {
-			    inq = &atintrq2;
-			    m_adj( m, sizeof( struct llc ));
-			    schednetisr(NETISR_ATALK);
-			    break;
-			}
-
-			if (Bcmp(&(l->llc_snap_org_code)[0], aarp_org_code,
-				   sizeof(aarp_org_code)) == 0 &&
-			     ntohs(l->llc_snap_ether_type) == ETHERTYPE_AARP) {
-			    m_adj( m, sizeof( struct llc ));
-			    aarpinput((struct arpcom *)ifp, m); /* XXX */
-			    return;
-			}
-		
-		    default:
-			goto dropanyway;
-		    }
-		    break;
-#endif NETATALK	
-#ifdef	ISO
-		case LLC_ISO_LSAP:
-			switch (l->llc_control) {
-			case LLC_UI:
-				/* LLC_UI_P forbidden in class 1 service */
-				if ((l->llc_dsap == LLC_ISO_LSAP) &&
-				    (l->llc_ssap == LLC_ISO_LSAP)) {
-					/* LSAP for ISO */
-					if (m->m_pkthdr.len > ether_type)
-						m_adj(m, ether_type - m->m_pkthdr.len);
-					m->m_data += 3;		/* XXX */
-					m->m_len -= 3;		/* XXX */
-					m->m_pkthdr.len -= 3;	/* XXX */
-					M_PREPEND(m, sizeof *eh, M_DONTWAIT);
-					if (m == 0)
-						return;
-					*mtod(m, struct ether_header *) = *eh;
-					IFDEBUG(D_ETHER)
-						printf("clnp packet");
-					ENDDEBUG
-					schednetisr(NETISR_ISO);
-					inq = &clnlintrq;
-					break;
-				}
-				goto dropanyway;
-
-			case LLC_XID:
-			case LLC_XID_P:
-				if(m->m_len < 6)
-					goto dropanyway;
-				l->llc_window = 0;
-				l->llc_fid = 9;
-				l->llc_class = 1;
-				l->llc_dsap = l->llc_ssap = 0;
-				/* Fall through to */
-			case LLC_TEST:
-			case LLC_TEST_P:
-			{
-				struct sockaddr sa;
-				register struct ether_header *eh2;
-				int i;
-				u_char c = l->llc_dsap;
-
-				l->llc_dsap = l->llc_ssap;
-				l->llc_ssap = c;
-				if (m->m_flags & (M_BCAST | M_MCAST))
-					bcopy((caddr_t)ac->ac_enaddr,
-					      (caddr_t)eh->ether_dhost, 6);
-				sa.sa_family = AF_UNSPEC;
-				sa.sa_len = sizeof(sa);
-				eh2 = (struct ether_header *)sa.sa_data;
-				for (i = 0; i < 6; i++) {
-					eh2->ether_shost[i] = c = eh->ether_dhost[i];
-					eh2->ether_dhost[i] =
-						eh->ether_dhost[i] = eh->ether_shost[i];
-					eh->ether_shost[i] = c;
-				}
-				ifp->if_output(ifp, m, &sa, NULL);
-				return;
-			}
-			default:
-				m_freem(m);
-				return;
-			}
-			break;
-#endif /* ISO */
-#ifdef LLC
-		case LLC_X25_LSAP:
-		{
-			if (m->m_pkthdr.len > ether_type)
-				m_adj(m, ether_type - m->m_pkthdr.len);
-			M_PREPEND(m, sizeof(struct sdl_hdr) , M_DONTWAIT);
-			if (m == 0)
-				return;
-			if ( !sdl_sethdrif(ifp, eh->ether_shost, LLC_X25_LSAP,
-					    eh->ether_dhost, LLC_X25_LSAP, 6,
-					    mtod(m, struct sdl_hdr *)))
-				panic("ETHER cons addr failure");
-			mtod(m, struct sdl_hdr *)->sdlhdr_len = ether_type;
-#ifdef LLC_DEBUG
-				printf("llc packet\n");
-#endif /* LLC_DEBUG */
-			schednetisr(NETISR_CCITT);
-			inq = &llcintrq;
-			break;
-		}
-#endif /* LLC */
-		dropanyway:
-		default:
-			m_freem(m);
-			return;
-		}
-#else /* ISO || LLC || NETATALK */
-	    m_freem(m);
-	    return;
-#endif /* ISO || LLC || NETATALK */
-	}
-
-	s = splimp();
-	if (IF_QFULL(inq)) {
-		IF_DROP(inq);
-		m_freem(m);
-	} else
-		IF_ENQUEUE(inq, m);
-	splx(s);
-}
-
-/*
- * Perform common duties while attaching to interface list
- */
-void
-ether_ifattach(ifp)
-	register struct ifnet *ifp;
-{
-	register struct ifaddr *ifa;
-	register struct sockaddr_dl *sdl;
-
-	ifp->if_type = IFT_ETHER;
-	ifp->if_addrlen = 6;
-	ifp->if_hdrlen = 14;
-	ifp->if_mtu = ETHERMTU;
-	if (ifp->if_baudrate == 0)
-	    ifp->if_baudrate = 10000000;
-	for (ifa = ifp->if_addrlist; ifa; ifa = ifa->ifa_next)
-		if ((sdl = (struct sockaddr_dl *)ifa->ifa_addr) &&
-		    sdl->sdl_family == AF_LINK) {
-			sdl->sdl_type = IFT_ETHER;
-			sdl->sdl_alen = ifp->if_addrlen;
-			bcopy((caddr_t)((struct arpcom *)ifp)->ac_enaddr,
-			      LLADDR(sdl), ifp->if_addrlen);
-			break;
-		}
-}
-
-static u_char ether_ipmulticast_min[6] = 
-	{ 0x01, 0x00, 0x5e, 0x00, 0x00, 0x00 };
-static u_char ether_ipmulticast_max[6] =
-	{ 0x01, 0x00, 0x5e, 0x7f, 0xff, 0xff };
-/*
- * Add an Ethernet multicast address or range of addresses to the list for a
- * given interface.
- */
-int
-ether_addmulti(ifr, ac)
-	struct ifreq *ifr;
-	register struct arpcom *ac;
-{
-	register struct ether_multi *enm;
-	struct sockaddr_in *sin;
-	u_char addrlo[6];
-	u_char addrhi[6];
-        int set_allmulti = 0;
-	int s = splimp();
-
-	switch (ifr->ifr_addr.sa_family) {
-
-	case AF_UNSPEC:
-		bcopy(ifr->ifr_addr.sa_data, addrlo, 6);
-		bcopy(addrlo, addrhi, 6);
-		break;
-
-#ifdef INET
-	case AF_INET:
-		sin = (struct sockaddr_in *)&(ifr->ifr_addr);
-		if (sin->sin_addr.s_addr == INADDR_ANY) {
-			/*
-			 * An IP address of INADDR_ANY means listen to all
-			 * of the Ethernet multicast addresses used for IP.
-			 * (This is for the sake of IP multicast routers.)
-			 */
-			bcopy(ether_ipmulticast_min, addrlo, 6);
-			bcopy(ether_ipmulticast_max, addrhi, 6);
-                      set_allmulti = 1;
-		}
-		else {
-			ETHER_MAP_IP_MULTICAST(&sin->sin_addr, addrlo);
-			bcopy(addrlo, addrhi, 6);
-		}
-		break;
-#endif
-
-	default:
-		splx(s);
-		return (EAFNOSUPPORT);
-	}
-
-	/*
-	 * Verify that we have valid Ethernet multicast addresses.
-	 */
-	if ((addrlo[0] & 0x01) != 1 || (addrhi[0] & 0x01) != 1) {
-		splx(s);
-		return (EINVAL);
-	}
-	/*
-	 * See if the address range is already in the list.
-	 */
-	ETHER_LOOKUP_MULTI(addrlo, addrhi, ac, enm);
-	if (enm != NULL) {
-		/*
-		 * Found it; just increment the reference count.
-		 */
-		++enm->enm_refcount;
-		splx(s);
-		return (0);
-	}
-	/*
-	 * New address or range; malloc a new multicast record
-	 * and link it into the interface's multicast list.
-	 */
-	enm = (struct ether_multi *)malloc(sizeof(*enm), M_IFMADDR, M_NOWAIT);
-	if (enm == NULL) {
-		splx(s);
-		return (ENOBUFS);
-	}
-	bcopy(addrlo, enm->enm_addrlo, 6);
-	bcopy(addrhi, enm->enm_addrhi, 6);
-	enm->enm_ac = ac;
-	enm->enm_refcount = 1;
-	enm->enm_next = ac->ac_multiaddrs;
-	ac->ac_multiaddrs = enm;
-	ac->ac_multicnt++;
-	splx(s);
-        if (set_allmulti)
-        	ac->ac_if.if_flags |= IFF_ALLMULTI;
-
-	/*
-	 * Return ENETRESET to inform the driver that the list has changed
-	 * and its reception filter should be adjusted accordingly.
-	 */
-	return (ENETRESET);
-}
-
-/*
- * Delete a multicast address record.
- */
-int
-ether_delmulti(ifr, ac)
-	struct ifreq *ifr;
-	register struct arpcom *ac;
-{
-	register struct ether_multi *enm;
-	register struct ether_multi **p;
-	struct sockaddr_in *sin;
-	u_char addrlo[6];
-	u_char addrhi[6];
-      int unset_allmulti = 0;
-	int s = splimp();
-
-	switch (ifr->ifr_addr.sa_family) {
-
-	case AF_UNSPEC:
-		bcopy(ifr->ifr_addr.sa_data, addrlo, 6);
-		bcopy(addrlo, addrhi, 6);
-		break;
-
-#ifdef INET
-	case AF_INET:
-		sin = (struct sockaddr_in *)&(ifr->ifr_addr);
-		if (sin->sin_addr.s_addr == INADDR_ANY) {
-			/*
-			 * An IP address of INADDR_ANY means stop listening
-			 * to the range of Ethernet multicast addresses used
-			 * for IP.
-			 */
-			bcopy(ether_ipmulticast_min, addrlo, 6);
-			bcopy(ether_ipmulticast_max, addrhi, 6);
-                      unset_allmulti = 1;
-		}
-		else {
-			ETHER_MAP_IP_MULTICAST(&sin->sin_addr, addrlo);
-			bcopy(addrlo, addrhi, 6);
-		}
-		break;
-#endif
-
-	default:
-		splx(s);
-		return (EAFNOSUPPORT);
-	}
-
-	/*
-	 * Look up the address in our list.
-	 */
-	ETHER_LOOKUP_MULTI(addrlo, addrhi, ac, enm);
-	if (enm == NULL) {
-		splx(s);
-		return (ENXIO);
-	}
-	if (--enm->enm_refcount != 0) {
-		/*
-		 * Still some claims to this record.
-		 */
-		splx(s);
-		return (0);
-	}
-	/*
-	 * No remaining claims to this record; unlink and free it.
-	 */
-	for (p = &enm->enm_ac->ac_multiaddrs;
-	     *p != enm;
-	     p = &(*p)->enm_next)
-		continue;
-	*p = (*p)->enm_next;
-	free(enm, M_IFMADDR);
-	ac->ac_multicnt--;
-	splx(s);
-      if (unset_allmulti)
-              ac->ac_if.if_flags &= ~IFF_ALLMULTI;
-
-	/*
-	 * Return ENETRESET to inform the driver that the list has changed
-	 * and its reception filter should be adjusted accordingly.
-	 */
-	return (ENETRESET);
-}
-
-SYSCTL_NODE(_net_link, IFT_ETHER, ether, CTLFLAG_RW, 0, "Ethernet");
-
-int
-ether_ioctl(struct ifnet *ifp, int command, caddr_t data)
-{
-	struct ifaddr *ifa = (struct ifaddr *) data;
-	struct ifreq *ifr = (struct ifreq *) data;
-	int error = 0;
-
-	switch (command) {
-	case SIOCSIFADDR:
-		ifp->if_flags |= IFF_UP;
-
-		switch (ifa->ifa_addr->sa_family) {
-#ifdef INET
-		case AF_INET:
-			ifp->if_init(ifp->if_softc);	/* before arpwhohas */
-			arp_ifinit((struct arpcom *)ifp, ifa);
-			break;
-#endif
-#ifdef IPX
-		/*
-		 * XXX - This code is probably wrong
-		 */
-		case AF_IPX:
-			{
-			register struct ipx_addr *ina = &(IA_SIPX(ifa)->sipx_addr);
-			struct arpcom *ac = (struct arpcom *) (ifp->if_softc);
-
-			if (ipx_nullhost(*ina))
-				ina->x_host =
-				    *(union ipx_host *) 
-			            ac->ac_enaddr;
-			else {
-				bcopy((caddr_t) ina->x_host.c_host,
-				      (caddr_t) ac->ac_enaddr,
-				      sizeof(ac->ac_enaddr));
-			}
-
-			/*
-			 * Set new address
-			 */
-			ifp->if_init(ifp->if_softc);
-			break;
-			}
-#endif
-#ifdef NS
-		/*
-		 * XXX - This code is probably wrong
-		 */
-		case AF_NS:
-		{
-			register struct ns_addr *ina = &(IA_SNS(ifa)->sns_addr);
-			struct arpcom *ac = (struct arpcom *) (ifp->if_softc);
-
-			if (ns_nullhost(*ina))
-				ina->x_host =
-				    *(union ns_host *) (ac->ac_enaddr);
-			else {
-				bcopy((caddr_t) ina->x_host.c_host,
-				      (caddr_t) ac->ac_enaddr,
-				      sizeof(ac->ac_enaddr));
-			}
-
-			/*
-			 * Set new address
-			 */
-			ifp->if_init(ifp->if_softc);
-			break;
-		}
-#endif
-		default:
-			ifp->if_init(ifp->if_softc);
-			break;
-		}
-		break;
-
-	case SIOCGIFADDR:
-		{
-			struct sockaddr *sa;
-
-			sa = (struct sockaddr *) & ifr->ifr_data;
-			bcopy(((struct arpcom *)ifp->if_softc)->ac_enaddr,
-			      (caddr_t) sa->sa_data, ETHER_ADDR_LEN);
-		}
-		break;
-
-	case SIOCSIFMTU:
-		/*
-		 * Set the interface MTU.
-		 */
-		if (ifr->ifr_mtu > ETHERMTU) {
-			error = EINVAL;
-		} else {
-			ifp->if_mtu = ifr->ifr_mtu;
-		}
-		break;
-	}
-	return (error);
-}
diff --git a/cpukit/libnetworking/net/if_llc.h b/cpukit/libnetworking/net/if_llc.h
deleted file mode 100644
index 3cdf652167..0000000000
--- a/cpukit/libnetworking/net/if_llc.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Copyright (c) 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *      @(#)if_llc.h	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#ifndef _NET_IF_LLC_H_
-#define _NET_IF_LLC_H_
-
-/*
- * IEEE 802.2 Link Level Control headers, for use in conjunction with
- * 802.{3,4,5} media access control methods.
- *
- * Headers here do not use bit fields due to shortcomings in many
- * compilers.
- */
-
-struct llc {
-	u_char	llc_dsap;
-	u_char	llc_ssap;
-	union {
-	    struct {
-		u_char control;
-		u_char format_id;
-		u_char class;
-		u_char window_x2;
-	    } type_u;
-	    struct {
-		u_char num_snd_x2;
-		u_char num_rcv_x2;
-	    } type_i;
-	    struct {
-		u_char control;
-		u_char num_rcv_x2;
-	    } type_s;
-	    struct {
-	        u_char control;
-		struct frmrinfo {
-			u_char rej_pdu_0;
-			u_char rej_pdu_1;
-			u_char frmr_control;
-			u_char frmr_control_ext;
-			u_char frmr_cause;
-		} frmrinfo;
-	    } type_frmr;
-	    struct {
-		u_char control;
-		u_char org_code[3];
-		u_short ether_type;
-	    } type_snap;
-	    struct {
-		u_char control;
-		u_char control_ext;
-	    } type_raw;
-	} llc_un;
-};
-#define llc_control            llc_un.type_u.control
-#define	llc_control_ext        llc_un.type_raw.control_ext
-#define llc_fid                llc_un.type_u.format_id
-#define llc_class              llc_un.type_u.class
-#define llc_window             llc_un.type_u.window_x2
-#define llc_frmrinfo           llc_un.type_frmr.frmrinfo
-#define llc_frmr_pdu0          llc_un.type_frmr.frmrinfo.rej_pdu0
-#define llc_frmr_pdu1          llc_un.type_frmr.frmrinfo.rej_pdu1
-#define llc_frmr_control       llc_un.type_frmr.frmrinfo.frmr_control
-#define llc_frmr_control_ext   llc_un.type_frmr.frmrinfo.frmr_control_ext
-#define llc_frmr_cause         llc_un.type_frmr.frmrinfo.frmr_control_ext
-
-/*
- * Don't use sizeof(struct llc_un) for LLC header sizes
- */
-#define LLC_ISFRAMELEN 4
-#define LLC_UFRAMELEN  3
-#define LLC_FRMRLEN    7
-
-/*
- * Unnumbered LLC format commands
- */
-#define LLC_UI		0x3
-#define LLC_UI_P	0x13
-#define LLC_DISC	0x43
-#define	LLC_DISC_P	0x53
-#define LLC_UA		0x63
-#define LLC_UA_P	0x73
-#define LLC_TEST	0xe3
-#define LLC_TEST_P	0xf3
-#define LLC_FRMR	0x87
-#define	LLC_FRMR_P	0x97
-#define LLC_DM		0x0f
-#define	LLC_DM_P	0x1f
-#define LLC_XID		0xaf
-#define LLC_XID_P	0xbf
-#define LLC_SABME	0x6f
-#define LLC_SABME_P	0x7f
-
-/*
- * Supervisory LLC commands
- */
-#define	LLC_RR		0x01
-#define	LLC_RNR		0x05
-#define	LLC_REJ		0x09
-
-/*
- * Info format - dummy only
- */
-#define	LLC_INFO	0x00
-
-/*
- * ISO PDTR 10178 contains among others
- */
-#define LLC_X25_LSAP	0x7e
-#define LLC_SNAP_LSAP	0xaa
-#define LLC_ISO_LSAP	0xfe
-
-#endif
diff --git a/cpukit/libnetworking/net/if_loop.c b/cpukit/libnetworking/net/if_loop.c
deleted file mode 100644
index 3823c28744..0000000000
--- a/cpukit/libnetworking/net/if_loop.c
+++ /dev/null
@@ -1,301 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)if_loop.c	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-/*
- * Loopback interface driver for protocol testing and timing.
- */
-#include "loop.h"
-#if NLOOP > 0
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/mbuf.h>
-#include <sys/socket.h>
-#include <sys/errno.h>
-#include <sys/ioctl.h>
-#include <sys/time.h>
-
-#include <net/if.h>
-#include <net/if_types.h>
-#include <net/netisr.h>
-#include <net/route.h>
-#include <net/bpf.h>
-
-#ifdef	INET
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/in_var.h>
-#include <netinet/ip.h>
-#endif
-
-#ifdef IPX
-#include <netipx/ipx.h>
-#include <netipx/ipx_if.h>
-#endif
-
-#ifdef NS
-#include <netns/ns.h>
-#include <netns/ns_if.h>
-#endif
-
-#ifdef ISO
-#include <netiso/iso.h>
-#include <netiso/iso_var.h>
-#endif
-
-#ifdef NETATALK
-#include <netinet/if_ether.h>
-#include <netatalk/at.h>
-#include <netatalk/at_var.h>
-#endif NETATALK
-
-#include "bpfilter.h"
-
-static int loioctl __P((struct ifnet *, int, caddr_t));
-static void lortrequest __P((int, struct rtentry *, struct sockaddr *));
-
-       void rtems_bsdnet_loopattach __P((void *));
-PSEUDO_SET(loopattach, if_loop);
-
-#ifdef TINY_LOMTU
-#define	LOMTU	(1024+512)
-#else
-#define LOMTU	16384
-#endif
-
-struct	ifnet loif[NLOOP];
-
-/* ARGSUSED */
-void
-rtems_bsdnet_loopattach(dummy)
-	void *dummy;
-{
-	register struct ifnet *ifp;
-	register int i = 0;
-
-	for (ifp = loif; i < NLOOP; ifp++) {
-	    ifp->if_name = "lo";
-	    ifp->if_next = NULL;
-	    ifp->if_unit = i++;
-	    ifp->if_mtu = LOMTU;
-	    ifp->if_flags = IFF_LOOPBACK | IFF_MULTICAST;
-	    ifp->if_ioctl = loioctl;
-	    ifp->if_output = looutput;
-	    ifp->if_type = IFT_LOOP;
-	    ifp->if_hdrlen = 0;
-	    ifp->if_addrlen = 0;
-	    if_attach(ifp);
-#if NBPFILTER > 0
-	    bpfattach(ifp, DLT_NULL, sizeof(u_int));
-#endif
-	}
-}
-
-int
-looutput(ifp, m, dst, rt)
-	struct ifnet *ifp;
-	register struct mbuf *m;
-	struct sockaddr *dst;
-	register struct rtentry *rt;
-{
-	int s, isr;
-	register struct ifqueue *ifq = 0;
-
-	if ((m->m_flags & M_PKTHDR) == 0)
-		panic("looutput no HDR");
-#if NBPFILTER > 0
-	/* BPF write needs to be handled specially */
-	if (dst->sa_family == AF_UNSPEC) {
-		dst->sa_family = *(mtod(m, int *));
-		m->m_len -= sizeof(int);
-		m->m_pkthdr.len -= sizeof(int);
-		m->m_data += sizeof(int);
-	}
-
-	if (ifp->if_bpf) {
-		/*
-		 * We need to prepend the address family as
-		 * a four byte field.  Cons up a dummy header
-		 * to pacify bpf.  This is safe because bpf
-		 * will only read from the mbuf (i.e., it won't
-		 * try to free it or keep a pointer a to it).
-		 */
-		struct mbuf m0;
-		u_int af = dst->sa_family;
-
-		m0.m_next = m;
-		m0.m_len = 4;
-		m0.m_data = (char *)&af;
-
-		bpf_mtap(ifp, &m0);
-	}
-#endif
-	m->m_pkthdr.rcvif = ifp;
-
-	if (rt && rt->rt_flags & (RTF_REJECT|RTF_BLACKHOLE)) {
-		m_freem(m);
-		return (rt->rt_flags & RTF_BLACKHOLE ? 0 :
-		        rt->rt_flags & RTF_HOST ? EHOSTUNREACH : ENETUNREACH);
-	}
-	ifp->if_opackets++;
-	ifp->if_obytes += m->m_pkthdr.len;
-	switch (dst->sa_family) {
-
-#ifdef INET
-	case AF_INET:
-		ifq = &ipintrq;
-		isr = NETISR_IP;
-		break;
-#endif
-#ifdef IPX
-	case AF_IPX:
-		ifq = &ipxintrq;
-		isr = NETISR_IPX;
-		break;
-#endif
-#ifdef NS
-	case AF_NS:
-		ifq = &nsintrq;
-		isr = NETISR_NS;
-		break;
-#endif
-#ifdef ISO
-	case AF_ISO:
-		ifq = &clnlintrq;
-		isr = NETISR_ISO;
-		break;
-#endif
-#ifdef NETATALK
-	case AF_APPLETALK:
-	        ifq = &atintrq2;
-		isr = NETISR_ATALK;
-		break;
-#endif NETATALK
-	default:
-		printf("lo%d: can't handle af%d\n", ifp->if_unit,
-			dst->sa_family);
-		m_freem(m);
-		return (EAFNOSUPPORT);
-	}
-	s = splimp();
-	if (IF_QFULL(ifq)) {
-		IF_DROP(ifq);
-		m_freem(m);
-		splx(s);
-		return (ENOBUFS);
-	}
-	IF_ENQUEUE(ifq, m);
-	schednetisr(isr);
-	ifp->if_ipackets++;
-	ifp->if_ibytes += m->m_pkthdr.len;
-	splx(s);
-	return (0);
-}
-
-/* ARGSUSED */
-static void
-lortrequest(cmd, rt, sa)
-	int cmd;
-	struct rtentry *rt;
-	struct sockaddr *sa;
-{
-	if (rt) {
-		rt->rt_rmx.rmx_mtu = rt->rt_ifp->if_mtu; /* for ISO */
-		/*
-		 * For optimal performance, the send and receive buffers
-		 * should be at least twice the MTU plus a little more for
-		 * overhead.
-		 */
-		rt->rt_rmx.rmx_recvpipe = 
-			rt->rt_rmx.rmx_sendpipe = 3 * LOMTU;
-	}
-}
-
-/*
- * Process an ioctl request.
- */
-/* ARGSUSED */
-static int
-loioctl(ifp, cmd, data)
-	register struct ifnet *ifp;
-	int cmd;
-	caddr_t data;
-{
-	register struct ifaddr *ifa;
-	register struct ifreq *ifr = (struct ifreq *)data;
-	register int error = 0;
-
-	switch (cmd) {
-
-	case SIOCSIFADDR:
-		ifp->if_flags |= IFF_UP | IFF_RUNNING;
-		ifa = (struct ifaddr *)data;
-		ifa->ifa_rtrequest = lortrequest;
-		/*
-		 * Everything else is done at a higher level.
-		 */
-		break;
-
-	case SIOCADDMULTI:
-	case SIOCDELMULTI:
-		if (ifr == 0) {
-			error = EAFNOSUPPORT;		/* XXX */
-			break;
-		}
-		switch (ifr->ifr_addr.sa_family) {
-
-#ifdef INET
-		case AF_INET:
-			break;
-#endif
-
-		default:
-			error = EAFNOSUPPORT;
-			break;
-		}
-		break;
-
-	case SIOCSIFMTU:
-		ifp->if_mtu = ifr->ifr_mtu;
-		break;
-
-	default:
-		error = EINVAL;
-	}
-	return (error);
-}
-#endif /* NLOOP > 0 */
diff --git a/cpukit/libnetworking/net/if_types.h b/cpukit/libnetworking/net/if_types.h
deleted file mode 100644
index 833ba471c3..0000000000
--- a/cpukit/libnetworking/net/if_types.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright (c) 1989, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)if_types.h	8.2 (Berkeley) 4/20/94
- * $Id$
- */
-
-#ifndef _NET_IF_TYPES_H_
-#define _NET_IF_TYPES_H_
-
-/*
- * Interface types for benefit of parsing media address headers.
- * This list is derived from the SNMP list of ifTypes, currently
- * documented in RFC1573.
- */
-
-#define	IFT_OTHER	0x1		/* none of the following */
-#define	IFT_1822	0x2		/* old-style arpanet imp */
-#define	IFT_HDH1822	0x3		/* HDH arpanet imp */
-#define	IFT_X25DDN	0x4		/* x25 to imp */
-#define	IFT_X25		0x5		/* PDN X25 interface (RFC877) */
-#define	IFT_ETHER	0x6		/* Ethernet CSMACD */
-#define	IFT_ISO88023	0x7		/* CMSA CD */
-#define	IFT_ISO88024	0x8		/* Token Bus */
-#define	IFT_ISO88025	0x9		/* Token Ring */
-#define	IFT_ISO88026	0xa		/* MAN */
-#define	IFT_STARLAN	0xb
-#define	IFT_P10		0xc		/* Proteon 10MBit ring */
-#define	IFT_P80		0xd		/* Proteon 80MBit ring */
-#define	IFT_HY		0xe		/* Hyperchannel */
-#define	IFT_FDDI	0xf
-#define	IFT_LAPB	0x10
-#define	IFT_SDLC	0x11
-#define	IFT_T1		0x12
-#define	IFT_CEPT	0x13		/* E1 - european T1 */
-#define	IFT_ISDNBASIC	0x14
-#define	IFT_ISDNPRIMARY	0x15
-#define	IFT_PTPSERIAL	0x16		/* Proprietary PTP serial */
-#define	IFT_PPP		0x17		/* RFC 1331 */
-#define	IFT_LOOP	0x18		/* loopback */
-#define	IFT_EON		0x19		/* ISO over IP */
-#define	IFT_XETHER	0x1a		/* obsolete 3MB experimental ethernet */
-#define	IFT_NSIP	0x1b		/* XNS over IP */
-#define	IFT_SLIP	0x1c		/* IP over generic TTY */
-#define	IFT_ULTRA	0x1d		/* Ultra Technologies */
-#define	IFT_DS3		0x1e		/* Generic T3 */
-#define	IFT_SIP		0x1f		/* SMDS */
-#define	IFT_FRELAY	0x20		/* Frame Relay DTE only */
-#define	IFT_RS232	0x21
-#define	IFT_PARA	0x22		/* parallel-port */
-#define	IFT_ARCNET	0x23
-#define	IFT_ARCNETPLUS	0x24
-#define	IFT_ATM		0x25		/* ATM cells */
-#define	IFT_MIOX25	0x26
-#define	IFT_SONET	0x27		/* SONET or SDH */
-#define	IFT_X25PLE	0x28
-#define	IFT_ISO88022LLC	0x29
-#define	IFT_LOCALTALK	0x2a
-#define	IFT_SMDSDXI	0x2b
-#define	IFT_FRELAYDCE	0x2c		/* Frame Relay DCE */
-#define	IFT_V35		0x2d
-#define	IFT_HSSI	0x2e
-#define	IFT_HIPPI	0x2f
-#define	IFT_MODEM	0x30		/* Generic Modem */
-#define	IFT_AAL5	0x31		/* AAL5 over ATM */
-#define	IFT_SONETPATH	0x32
-#define	IFT_SONETVT	0x33
-#define	IFT_SMDSICIP	0x34		/* SMDS InterCarrier Interface */
-#define	IFT_PROPVIRTUAL	0x35		/* Proprietary Virtual/internal */
-#define	IFT_PROPMUX	0x36		/* Proprietary Multiplexing */
-
-#endif
diff --git a/cpukit/libnetworking/net/netisr.h b/cpukit/libnetworking/net/netisr.h
deleted file mode 100644
index 73269a4442..0000000000
--- a/cpukit/libnetworking/net/netisr.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (c) 1980, 1986, 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)netisr.h	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#ifndef _NET_NETISR_H_
-#define _NET_NETISR_H_
-
-/*
- * The networking code runs off software interrupts.
- *
- * You can switch into the network by doing splnet() and return by splx().
- * The software interrupt level for the network is higher than the software
- * level for the clock (so you can enter the network in routines called
- * at timeout time).
- */
-#if defined(vax) || defined(tahoe)
-#define	setsoftnet()	mtpr(SIRR, 12)
-#endif
-
-/*
- * Each ``pup-level-1'' input queue has a bit in a ``netisr'' status
- * word which is used to de-multiplex a single software
- * interrupt used for scheduling the network code to calls
- * on the lowest level routine of each protocol.
- */
-#define	NETISR_RAW	0		/* same as AF_UNSPEC */
-#define	NETISR_IP	2		/* same as AF_INET */
-#define	NETISR_IMP	3		/* same as AF_IMPLINK */
-#define	NETISR_NS	6		/* same as AF_NS */
-#define	NETISR_ISO	7		/* same as AF_ISO */
-#define	NETISR_CCITT	10		/* same as AF_CCITT */
-#define NETISR_ATALK    16              /* same as AF_APPLETALK */
-#define	NETISR_ARP	18		/* same as AF_LINK */
-#define NETISR_IPX	23		/* same as AF_IPX */
-#define	NETISR_ISDN	26		/* same as AF_E164 */
-#define	NETISR_PPP	27		/* PPP soft interrupt */
-
-#define	schednetisr(anisr)	rtems_bsdnet_schednetisr(anisr)
-
-#ifndef LOCORE
-#ifdef KERNEL
-extern volatile unsigned int	netisr;	/* scheduling bits for network */
-
-typedef void netisr_t(void);
-
-struct netisrtab {
-	int nit_num;
-	netisr_t *nit_isr;
-};
-
-#define NETISR_SET(num, isr)
-
-int register_netisr __P((int, netisr_t *));
-
-#endif
-#endif
-
-#endif
diff --git a/cpukit/libnetworking/net/radix.c b/cpukit/libnetworking/net/radix.c
deleted file mode 100644
index bc1b7ee1d1..0000000000
--- a/cpukit/libnetworking/net/radix.c
+++ /dev/null
@@ -1,1028 +0,0 @@
-/*
- * Copyright (c) 1988, 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)radix.c	8.4 (Berkeley) 11/2/94
- *	$Id$
- */
-
-/*
- * Routines to build and maintain radix trees for routing lookups.
- */
-#ifndef _RADIX_H_
-#include <sys/param.h>
-#ifdef	KERNEL
-#include <sys/systm.h>
-#include <sys/malloc.h>
-#define	M_DONTWAIT M_NOWAIT
-#include <sys/domain.h>
-#else
-#include <stdlib.h>
-#endif
-#include <sys/syslog.h>
-#include <net/radix.h>
-#endif
-
-static struct radix_node *
-		rn_lookup __P((void *v_arg, void *m_arg,
-			       struct radix_node_head *head));
-static int	rn_walktree_from __P((struct radix_node_head *h, void *a,
-				      void *m, walktree_f_t *f, void *w));
-static int rn_walktree __P((struct radix_node_head *, walktree_f_t *, void *));
-static struct radix_node
-	 *rn_delete __P((void *, void *, struct radix_node_head *)),
-	 *rn_insert __P((void *, struct radix_node_head *, int *,
-			struct radix_node [2])),
-	 *rn_newpair __P((void *, int, struct radix_node[2])),
-	 *rn_search __P((void *, struct radix_node *)),
-	 *rn_search_m __P((void *, struct radix_node *, void *));
-
-static int	max_keylen;
-static struct radix_mask *rn_mkfreelist;
-static struct radix_node_head *mask_rnhead;
-static char *addmask_key;
-static char normal_chars[] = {0, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfe, -1};
-static char *rn_zeros, *rn_ones;
-
-#define rn_masktop (mask_rnhead->rnh_treetop)
-#undef Bcmp
-#define Bcmp(a, b, l) (l == 0 ? 0 : bcmp((caddr_t)(a), (caddr_t)(b), (u_long)l))
-
-static int	rn_lexobetter __P((void *m_arg, void *n_arg));
-static struct radix_mask *
-		rn_new_radix_mask __P((struct radix_node *tt,
-				       struct radix_mask *next));
-static int	rn_satsifies_leaf __P((char *trial, struct radix_node *leaf,
-				       int skip));
-
-/*
- * The data structure for the keys is a radix tree with one way
- * branching removed.  The index rn_b at an internal node n represents a bit
- * position to be tested.  The tree is arranged so that all descendants
- * of a node n have keys whose bits all agree up to position rn_b - 1.
- * (We say the index of n is rn_b.)
- *
- * There is at least one descendant which has a one bit at position rn_b,
- * and at least one with a zero there.
- *
- * A route is determined by a pair of key and mask.  We require that the
- * bit-wise logical and of the key and mask to be the key.
- * We define the index of a route to associated with the mask to be
- * the first bit number in the mask where 0 occurs (with bit number 0
- * representing the highest order bit).
- *
- * We say a mask is normal if every bit is 0, past the index of the mask.
- * If a node n has a descendant (k, m) with index(m) == index(n) == rn_b,
- * and m is a normal mask, then the route applies to every descendant of n.
- * If the index(m) < rn_b, this implies the trailing last few bits of k
- * before bit b are all 0, (and hence consequently true of every descendant
- * of n), so the route applies to all descendants of the node as well.
- *
- * Similar logic shows that a non-normal mask m such that
- * index(m) <= index(n) could potentially apply to many children of n.
- * Thus, for each non-host route, we attach its mask to a list at an internal
- * node as high in the tree as we can go.
- *
- * The present version of the code makes use of normal routes in short-
- * circuiting an explict mask and compare operation when testing whether
- * a key satisfies a normal route, and also in remembering the unique leaf
- * that governs a subtree.
- */
-
-static struct radix_node *
-rn_search(v_arg, head)
-	void *v_arg;
-	struct radix_node *head;
-{
-	register struct radix_node *x;
-	register caddr_t v;
-
-	for (x = head, v = v_arg; x->rn_b >= 0;) {
-		if (x->rn_bmask & v[x->rn_off])
-			x = x->rn_r;
-		else
-			x = x->rn_l;
-	}
-	return (x);
-};
-
-static struct radix_node *
-rn_search_m(v_arg, head, m_arg)
-	struct radix_node *head;
-	void *v_arg, *m_arg;
-{
-	register struct radix_node *x;
-	register caddr_t v = v_arg, m = m_arg;
-
-	for (x = head; x->rn_b >= 0;) {
-		if ((x->rn_bmask & m[x->rn_off]) &&
-		    (x->rn_bmask & v[x->rn_off]))
-			x = x->rn_r;
-		else
-			x = x->rn_l;
-	}
-	return x;
-};
-
-int
-rn_refines(m_arg, n_arg)
-	void *m_arg, *n_arg;
-{
-	register caddr_t m = m_arg, n = n_arg;
-	register caddr_t lim, lim2 = lim = n + *(u_char *)n;
-	int longer = (*(u_char *)n++) - (int)(*(u_char *)m++);
-	int masks_are_equal = 1;
-
-	if (longer > 0)
-		lim -= longer;
-	while (n < lim) {
-		if (*n & ~(*m))
-			return 0;
-		if (*n++ != *m++)
-			masks_are_equal = 0;
-	}
-	while (n < lim2)
-		if (*n++)
-			return 0;
-	if (masks_are_equal && (longer < 0))
-		for (lim2 = m - longer; m < lim2; )
-			if (*m++)
-				return 1;
-	return (!masks_are_equal);
-}
-
-struct radix_node *
-rn_lookup(v_arg, m_arg, head)
-	void *v_arg, *m_arg;
-	struct radix_node_head *head;
-{
-	register struct radix_node *x;
-	caddr_t netmask = 0;
-
-	if (m_arg) {
-		if ((x = rn_addmask(m_arg, 1, head->rnh_treetop->rn_off)) == 0)
-			return (0);
-		netmask = x->rn_key;
-	}
-	x = rn_match(v_arg, head);
-	if (x && netmask) {
-		while (x && x->rn_mask != netmask)
-			x = x->rn_dupedkey;
-	}
-	return x;
-}
-
-static int
-rn_satsifies_leaf(trial, leaf, skip)
-	char *trial;
-	register struct radix_node *leaf;
-	int skip;
-{
-	register char *cp = trial, *cp2 = leaf->rn_key, *cp3 = leaf->rn_mask;
-	char *cplim;
-	int length = min(*(u_char *)cp, *(u_char *)cp2);
-
-	if (cp3 == 0)
-		cp3 = rn_ones;
-	else
-		length = min(length, *(u_char *)cp3);
-	cplim = cp + length; cp3 += skip; cp2 += skip;
-	for (cp += skip; cp < cplim; cp++, cp2++, cp3++)
-		if ((*cp ^ *cp2) & *cp3)
-			return 0;
-	return 1;
-}
-
-struct radix_node *
-rn_match(v_arg, head)
-	void *v_arg;
-	struct radix_node_head *head;
-{
-	caddr_t v = v_arg;
-	register struct radix_node *t = head->rnh_treetop, *x;
-	register caddr_t cp = v, cp2;
-	caddr_t cplim;
-	struct radix_node *saved_t, *top = t;
-	int off = t->rn_off, vlen = *(u_char *)cp, matched_off;
-	register int test, b, rn_b;
-
-	/*
-	 * Open code rn_search(v, top) to avoid overhead of extra
-	 * subroutine call.
-	 */
-	for (; t->rn_b >= 0; ) {
-		if (t->rn_bmask & cp[t->rn_off])
-			t = t->rn_r;
-		else
-			t = t->rn_l;
-	}
-	/*
-	 * See if we match exactly as a host destination
-	 * or at least learn how many bits match, for normal mask finesse.
-	 *
-	 * It doesn't hurt us to limit how many bytes to check
-	 * to the length of the mask, since if it matches we had a genuine
-	 * match and the leaf we have is the most specific one anyway;
-	 * if it didn't match with a shorter length it would fail
-	 * with a long one.  This wins big for class B&C netmasks which
-	 * are probably the most common case...
-	 */
-	if (t->rn_mask)
-		vlen = *(u_char *)t->rn_mask;
-	cp += off; cp2 = t->rn_key + off; cplim = v + vlen;
-	for (; cp < cplim; cp++, cp2++)
-		if (*cp != *cp2)
-			goto on1;
-	/*
-	 * This extra grot is in case we are explicitly asked
-	 * to look up the default.  Ugh!
-	 */
-	if ((t->rn_flags & RNF_ROOT) && t->rn_dupedkey)
-		t = t->rn_dupedkey;
-	return t;
-on1:
-	test = (*cp ^ *cp2) & 0xff; /* find first bit that differs */
-	for (b = 7; (test >>= 1) > 0;)
-		b--;
-	matched_off = cp - v;
-	b += matched_off << 3;
-	rn_b = -1 - b;
-	/*
-	 * If there is a host route in a duped-key chain, it will be first.
-	 */
-	if ((saved_t = t)->rn_mask == 0)
-		t = t->rn_dupedkey;
-	for (; t; t = t->rn_dupedkey)
-		/*
-		 * Even if we don't match exactly as a host,
-		 * we may match if the leaf we wound up at is
-		 * a route to a net.
-		 */
-		if (t->rn_flags & RNF_NORMAL) {
-			if (rn_b <= t->rn_b)
-				return t;
-		} else if (rn_satsifies_leaf(v, t, matched_off))
-				return t;
-	t = saved_t;
-	/* start searching up the tree */
-	do {
-		register struct radix_mask *m;
-		t = t->rn_p;
-		m = t->rn_mklist;
-		if (m) {
-			/*
-			 * If non-contiguous masks ever become important
-			 * we can restore the masking and open coding of
-			 * the search and satisfaction test and put the
-			 * calculation of "off" back before the "do".
-			 */
-			do {
-				if (m->rm_flags & RNF_NORMAL) {
-					if (rn_b <= m->rm_b)
-						return (m->rm_leaf);
-				} else {
-					off = min(t->rn_off, matched_off);
-					x = rn_search_m(v, t, m->rm_mask);
-					while (x && x->rn_mask != m->rm_mask)
-						x = x->rn_dupedkey;
-					if (x && rn_satsifies_leaf(v, x, off))
-						    return x;
-				}
-				m = m->rm_mklist;
-			} while (m);
-		}
-	} while (t != top);
-	return 0;
-};
-
-#ifdef RN_DEBUG
-int	rn_nodenum;
-struct	radix_node *rn_clist;
-int	rn_saveinfo;
-int	rn_debug =  1;
-#endif
-
-static struct radix_node *
-rn_newpair(v, b, nodes)
-	void *v;
-	int b;
-	struct radix_node nodes[2];
-{
-	register struct radix_node *tt = nodes, *t = tt + 1;
-	t->rn_b = b; t->rn_bmask = 0x80 >> (b & 7);
-	t->rn_l = tt; t->rn_off = b >> 3;
-	tt->rn_b = -1; tt->rn_key = (caddr_t)v; tt->rn_p = t;
-	tt->rn_flags = t->rn_flags = RNF_ACTIVE;
-#ifdef RN_DEBUG
-	tt->rn_info = rn_nodenum++; t->rn_info = rn_nodenum++;
-	tt->rn_twin = t; tt->rn_ybro = rn_clist; rn_clist = tt;
-#endif
-	return t;
-}
-
-static struct radix_node *
-rn_insert(v_arg, head, dupentry, nodes)
-	void *v_arg;
-	struct radix_node_head *head;
-	int *dupentry;
-	struct radix_node nodes[2];
-{
-	caddr_t v = v_arg;
-	struct radix_node *top = head->rnh_treetop;
-	int head_off = top->rn_off, vlen = (int)*((u_char *)v);
-	register struct radix_node *t = rn_search(v_arg, top);
-	register caddr_t cp = v + head_off;
-	register int b;
-	struct radix_node *tt;
-    	/*
-	 * Find first bit at which v and t->rn_key differ
-	 */
-    {
-	register caddr_t cp2 = t->rn_key + head_off;
-	register int cmp_res;
-	caddr_t cplim = v + vlen;
-
-	while (cp < cplim)
-		if (*cp2++ != *cp++)
-			goto on1;
-	*dupentry = 1;
-	return t;
-on1:
-	*dupentry = 0;
-	cmp_res = (cp[-1] ^ cp2[-1]) & 0xff;
-	for (b = (cp - v) << 3; cmp_res; b--)
-		cmp_res >>= 1;
-    }
-    {
-	register struct radix_node *p, *x = top;
-	cp = v;
-	do {
-		p = x;
-		if (cp[x->rn_off] & x->rn_bmask)
-			x = x->rn_r;
-		else x = x->rn_l;
-	} while (b > (unsigned) x->rn_b); /* x->rn_b < b && x->rn_b >= 0 */
-#ifdef RN_DEBUG
-	if (rn_debug)
-		log(LOG_DEBUG, "rn_insert: Going In:\n"), traverse(p);
-#endif
-	t = rn_newpair(v_arg, b, nodes); tt = t->rn_l;
-	if ((cp[p->rn_off] & p->rn_bmask) == 0)
-		p->rn_l = t;
-	else
-		p->rn_r = t;
-	x->rn_p = t; t->rn_p = p; /* frees x, p as temp vars below */
-	if ((cp[t->rn_off] & t->rn_bmask) == 0) {
-		t->rn_r = x;
-	} else {
-		t->rn_r = tt; t->rn_l = x;
-	}
-#ifdef RN_DEBUG
-	if (rn_debug)
-		log(LOG_DEBUG, "rn_insert: Coming Out:\n"), traverse(p);
-#endif
-    }
-	return (tt);
-}
-
-struct radix_node *
-rn_addmask(n_arg, search, skip)
-	int search, skip;
-	void *n_arg;
-{
-	caddr_t netmask = (caddr_t)n_arg;
-	register struct radix_node *x;
-	register caddr_t cp, cplim;
-	register int b = 0, mlen, j;
-	int maskduplicated, m0, isnormal;
-	struct radix_node *saved_x;
-	static int last_zeroed = 0;
-
-	if ((mlen = *(u_char *)netmask) > max_keylen)
-		mlen = max_keylen;
-	if (skip == 0)
-		skip = 1;
-	if (mlen <= skip)
-		return (mask_rnhead->rnh_nodes);
-	if (skip > 1)
-		Bcopy(rn_ones + 1, addmask_key + 1, skip - 1);
-	if ((m0 = mlen) > skip)
-		Bcopy(netmask + skip, addmask_key + skip, mlen - skip);
-	/*
-	 * Trim trailing zeroes.
-	 */
-	for (cp = addmask_key + mlen; (cp > addmask_key) && cp[-1] == 0;)
-		cp--;
-	mlen = cp - addmask_key;
-	if (mlen <= skip) {
-		if (m0 >= last_zeroed)
-			last_zeroed = mlen;
-		return (mask_rnhead->rnh_nodes);
-	}
-	if (m0 < last_zeroed)
-		Bzero(addmask_key + m0, last_zeroed - m0);
-	*addmask_key = last_zeroed = mlen;
-	x = rn_search(addmask_key, rn_masktop);
-	if (Bcmp(addmask_key, x->rn_key, mlen) != 0)
-		x = 0;
-	if (x || search)
-		return (x);
-	R_Malloc(x, struct radix_node *, max_keylen + 2 * sizeof (*x));
-	if ((saved_x = x) == 0)
-		return (0);
-	Bzero(x, max_keylen + 2 * sizeof (*x));
-	netmask = cp = (caddr_t)(x + 2);
-	Bcopy(addmask_key, cp, mlen);
-	x = rn_insert(cp, mask_rnhead, &maskduplicated, x);
-	if (maskduplicated) {
-		log(LOG_ERR, "rn_addmask: mask impossibly already in tree");
-		Free(saved_x);
-		return (x);
-	}
-	/*
-	 * Calculate index of mask, and check for normalcy.
-	 */
-	cplim = netmask + mlen; isnormal = 1;
-	for (cp = netmask + skip; (cp < cplim) && *(u_char *)cp == 0xff;)
-		cp++;
-	if (cp != cplim) {
-		for (j = 0x80; (j & *cp) != 0; j >>= 1)
-			b++;
-		if (*cp != normal_chars[b] || cp != (cplim - 1))
-			isnormal = 0;
-	}
-	b += (cp - netmask) << 3;
-	x->rn_b = -1 - b;
-	if (isnormal)
-		x->rn_flags |= RNF_NORMAL;
-	return (x);
-}
-
-static int	/* XXX: arbitrary ordering for non-contiguous masks */
-rn_lexobetter(m_arg, n_arg)
-	void *m_arg, *n_arg;
-{
-	register u_char *mp = m_arg, *np = n_arg, *lim;
-
-	if (*mp > *np)
-		return 1;  /* not really, but need to check longer one first */
-	if (*mp == *np)
-		for (lim = mp + *mp; mp < lim;)
-			if (*mp++ > *np++)
-				return 1;
-	return 0;
-}
-
-static struct radix_mask *
-rn_new_radix_mask(tt, next)
-	register struct radix_node *tt;
-	register struct radix_mask *next;
-{
-	register struct radix_mask *m;
-
-	MKGet(m);
-	if (m == 0) {
-		log(LOG_ERR, "Mask for route not entered\n");
-		return (0);
-	}
-	Bzero(m, sizeof *m);
-	m->rm_b = tt->rn_b;
-	m->rm_flags = tt->rn_flags;
-	if (tt->rn_flags & RNF_NORMAL)
-		m->rm_leaf = tt;
-	else
-		m->rm_mask = tt->rn_mask;
-	m->rm_mklist = next;
-	tt->rn_mklist = m;
-	return m;
-}
-
-struct radix_node *
-rn_addroute(v_arg, n_arg, head, treenodes)
-	void *v_arg, *n_arg;
-	struct radix_node_head *head;
-	struct radix_node treenodes[2];
-{
-	caddr_t v = (caddr_t)v_arg, netmask = (caddr_t)n_arg;
-	register struct radix_node *t, *x = 0, *tt;
-	struct radix_node *saved_tt, *top = head->rnh_treetop;
-	short b = 0, b_leaf = 0;
-	int keyduplicated;
-	caddr_t mmask;
-	struct radix_mask *m, **mp;
-
-	/*
-	 * In dealing with non-contiguous masks, there may be
-	 * many different routes which have the same mask.
-	 * We will find it useful to have a unique pointer to
-	 * the mask to speed avoiding duplicate references at
-	 * nodes and possibly save time in calculating indices.
-	 */
-	if (netmask)  {
-		if ((x = rn_addmask(netmask, 0, top->rn_off)) == 0)
-			return (0);
-		b_leaf = x->rn_b;
-		b = -1 - x->rn_b;
-		netmask = x->rn_key;
-	}
-	/*
-	 * Deal with duplicated keys: attach node to previous instance
-	 */
-	saved_tt = tt = rn_insert(v, head, &keyduplicated, treenodes);
-	if (keyduplicated) {
-		for (t = tt; tt; t = tt, tt = tt->rn_dupedkey) {
-			if (tt->rn_mask == netmask)
-				return (0);
-			if (netmask == 0 ||
-			    (tt->rn_mask &&
-			     ((b_leaf < tt->rn_b) || /* index(netmask) > node */
-			       rn_refines(netmask, tt->rn_mask) ||
-			       rn_lexobetter(netmask, tt->rn_mask))))
-				break;
-		}
-		/*
-		 * If the mask is not duplicated, we wouldn't
-		 * find it among possible duplicate key entries
-		 * anyway, so the above test doesn't hurt.
-		 *
-		 * We sort the masks for a duplicated key the same way as
-		 * in a masklist -- most specific to least specific.
-		 * This may require the unfortunate nuisance of relocating
-		 * the head of the list.
-		 */
-		if (tt == saved_tt) {
-			struct	radix_node *xx = x;
-			/* link in at head of list */
-			(tt = treenodes)->rn_dupedkey = t;
-			tt->rn_flags = t->rn_flags;
-			tt->rn_p = x = t->rn_p;
-			t->rn_p = tt;				/* parent */
-			if (x->rn_l == t) x->rn_l = tt; else x->rn_r = tt;
-			saved_tt = tt; x = xx;
-		} else {
-			(tt = treenodes)->rn_dupedkey = t->rn_dupedkey;
-			t->rn_dupedkey = tt;
-			tt->rn_p = t;				/* parent */
-			if (tt->rn_dupedkey)			/* parent */
-				tt->rn_dupedkey->rn_p = tt;	/* parent */
-		}
-#ifdef RN_DEBUG
-		t=tt+1; tt->rn_info = rn_nodenum++; t->rn_info = rn_nodenum++;
-		tt->rn_twin = t; tt->rn_ybro = rn_clist; rn_clist = tt;
-#endif
-		tt->rn_key = (caddr_t) v;
-		tt->rn_b = -1;
-		tt->rn_flags = RNF_ACTIVE;
-	}
-	/*
-	 * Put mask in tree.
-	 */
-	if (netmask) {
-		tt->rn_mask = netmask;
-		tt->rn_b = x->rn_b;
-		tt->rn_flags |= x->rn_flags & RNF_NORMAL;
-	}
-	t = saved_tt->rn_p;
-	if (keyduplicated)
-		goto on2;
-	b_leaf = -1 - t->rn_b;
-	if (t->rn_r == saved_tt) x = t->rn_l; else x = t->rn_r;
-	/* Promote general routes from below */
-	if (x->rn_b < 0) {
-	    for (mp = &t->rn_mklist; x; x = x->rn_dupedkey)
-		if (x->rn_mask && (x->rn_b >= b_leaf) && x->rn_mklist == 0) {
-			*mp = m = rn_new_radix_mask(x, 0);
-			if (m)
-				mp = &m->rm_mklist;
-		}
-	} else if (x->rn_mklist) {
-		/*
-		 * Skip over masks whose index is > that of new node
-		 */
-		for (mp = &x->rn_mklist; (m = *mp); mp = &m->rm_mklist)
-			if (m->rm_b >= b_leaf)
-				break;
-		t->rn_mklist = m; *mp = 0;
-	}
-on2:
-	/* Add new route to highest possible ancestor's list */
-	if ((netmask == 0) || (b > t->rn_b ))
-		return tt; /* can't lift at all */
-	b_leaf = tt->rn_b;
-	do {
-		x = t;
-		t = t->rn_p;
-	} while (b <= t->rn_b && x != top);
-	/*
-	 * Search through routes associated with node to
-	 * insert new route according to index.
-	 * Need same criteria as when sorting dupedkeys to avoid
-	 * double loop on deletion.
-	 */
-	for (mp = &x->rn_mklist; (m = *mp); mp = &m->rm_mklist) {
-		if (m->rm_b < b_leaf)
-			continue;
-		if (m->rm_b > b_leaf)
-			break;
-		if (m->rm_flags & RNF_NORMAL) {
-			mmask = m->rm_leaf->rn_mask;
-			if (tt->rn_flags & RNF_NORMAL) {
-				log(LOG_ERR,
-				   "Non-unique normal route, mask not entered");
-				return tt;
-			}
-		} else
-			mmask = m->rm_mask;
-		if (mmask == netmask) {
-			m->rm_refs++;
-			tt->rn_mklist = m;
-			return tt;
-		}
-		if (rn_refines(netmask, mmask) || rn_lexobetter(netmask, mmask))
-			break;
-	}
-	*mp = rn_new_radix_mask(tt, *mp);
-	return tt;
-}
-
-static struct radix_node *
-rn_delete(v_arg, netmask_arg, head)
-	void *v_arg, *netmask_arg;
-	struct radix_node_head *head;
-{
-	register struct radix_node *t, *p, *x, *tt;
-	struct radix_mask *m, *saved_m, **mp;
-	struct radix_node *dupedkey, *saved_tt, *top;
-	caddr_t v, netmask;
-	int b, head_off, vlen;
-
-	v = v_arg;
-	netmask = netmask_arg;
-	x = head->rnh_treetop;
-	tt = rn_search(v, x);
-	head_off = x->rn_off;
-	vlen =  *(u_char *)v;
-	saved_tt = tt;
-	top = x;
-	if (tt == 0 ||
-	    Bcmp(v + head_off, tt->rn_key + head_off, vlen - head_off))
-		return (0);
-	/*
-	 * Delete our route from mask lists.
-	 */
-	if (netmask) {
-		if ((x = rn_addmask(netmask, 1, head_off)) == 0)
-			return (0);
-		netmask = x->rn_key;
-		while (tt->rn_mask != netmask)
-			if ((tt = tt->rn_dupedkey) == 0)
-				return (0);
-	}
-	if (tt->rn_mask == 0 || (saved_m = m = tt->rn_mklist) == 0)
-		goto on1;
-	if (tt->rn_flags & RNF_NORMAL) {
-		if (m->rm_leaf != tt || m->rm_refs > 0) {
-			log(LOG_ERR, "rn_delete: inconsistent annotation\n");
-			return 0;  /* dangling ref could cause disaster */
-		}
-	} else {
-		if (m->rm_mask != tt->rn_mask) {
-			log(LOG_ERR, "rn_delete: inconsistent annotation\n");
-			goto on1;
-		}
-		if (--m->rm_refs >= 0)
-			goto on1;
-	}
-	b = -1 - tt->rn_b;
-	t = saved_tt->rn_p;
-	if (b > t->rn_b)
-		goto on1; /* Wasn't lifted at all */
-	do {
-		x = t;
-		t = t->rn_p;
-	} while (b <= t->rn_b && x != top);
-	for (mp = &x->rn_mklist; (m = *mp); mp = &m->rm_mklist)
-		if (m == saved_m) {
-			*mp = m->rm_mklist;
-			MKFree(m);
-			break;
-		}
-	if (m == 0) {
-		log(LOG_ERR, "rn_delete: couldn't find our annotation\n");
-		if (tt->rn_flags & RNF_NORMAL)
-			return (0); /* Dangling ref to us */
-	}
-on1:
-	/*
-	 * Eliminate us from tree
-	 */
-	if (tt->rn_flags & RNF_ROOT)
-		return (0);
-#ifdef RN_DEBUG
-	/* Get us out of the creation list */
-	for (t = rn_clist; t && t->rn_ybro != tt; t = t->rn_ybro) {}
-	if (t) t->rn_ybro = tt->rn_ybro;
-#endif
-	t = tt->rn_p;
-	dupedkey = saved_tt->rn_dupedkey;
-	if (dupedkey) {
-		/*
-		 * at this point, tt is the deletion target and saved_tt
-		 * is the head of the dupekey chain
-		 */
-		if (tt == saved_tt) {
-			/* remove from head of chain */
-			x = dupedkey; x->rn_p = t;
-			if (t->rn_l == tt) t->rn_l = x; else t->rn_r = x;
-		} else {
-			/* find node in front of tt on the chain */
-			for (x = p = saved_tt; p && p->rn_dupedkey != tt;)
-				p = p->rn_dupedkey;
-			if (p) {
-				p->rn_dupedkey = tt->rn_dupedkey;
-				if (tt->rn_dupedkey)		   /* parent */
-					tt->rn_dupedkey->rn_p = p; /* parent */
-			} else log(LOG_ERR, "rn_delete: couldn't find us\n");
-		}
-		t = tt + 1;
-		if  (t->rn_flags & RNF_ACTIVE) {
-#ifndef RN_DEBUG
-			*++x = *t; p = t->rn_p;
-#else
-			b = t->rn_info; *++x = *t; t->rn_info = b; p = t->rn_p;
-#endif
-			if (p->rn_l == t) p->rn_l = x; else p->rn_r = x;
-			x->rn_l->rn_p = x; x->rn_r->rn_p = x;
-		}
-		goto out;
-	}
-	if (t->rn_l == tt) x = t->rn_r; else x = t->rn_l;
-	p = t->rn_p;
-	if (p->rn_r == t) p->rn_r = x; else p->rn_l = x;
-	x->rn_p = p;
-	/*
-	 * Demote routes attached to us.
-	 */
-	if (t->rn_mklist) {
-		if (x->rn_b >= 0) {
-			for (mp = &x->rn_mklist; (m = *mp);)
-				mp = &m->rm_mklist;
-			*mp = t->rn_mklist;
-		} else {
-			/* If there are any key,mask pairs in a sibling
-			   duped-key chain, some subset will appear sorted
-			   in the same order attached to our mklist */
-			for (m = t->rn_mklist; m && x; x = x->rn_dupedkey)
-				if (m == x->rn_mklist) {
-					struct radix_mask *mm = m->rm_mklist;
-					x->rn_mklist = 0;
-					if (--(m->rm_refs) < 0)
-						MKFree(m);
-					m = mm;
-				}
-			if (m)
-				log(LOG_ERR, "%s %p at %x\n",
-					    "rn_delete: Orphaned Mask", m, x);
-		}
-	}
-	/*
-	 * We may be holding an active internal node in the tree.
-	 */
-	x = tt + 1;
-	if (t != x) {
-#ifndef RN_DEBUG
-		*t = *x;
-#else
-		b = t->rn_info; *t = *x; t->rn_info = b;
-#endif
-		t->rn_l->rn_p = t; t->rn_r->rn_p = t;
-		p = x->rn_p;
-		if (p->rn_l == x) p->rn_l = t; else p->rn_r = t;
-	}
-out:
-	tt->rn_flags &= ~RNF_ACTIVE;
-	tt[1].rn_flags &= ~RNF_ACTIVE;
-	return (tt);
-}
-
-/*
- * This is the same as rn_walktree() except for the parameters and the
- * exit.
- */
-static int
-rn_walktree_from(h, a, m, f, w)
-	struct radix_node_head *h;
-	void *a, *m;
-	walktree_f_t *f;
-	void *w;
-{
-	int error;
-	struct radix_node *base, *next;
-	u_char *xa = (u_char *)a;
-	u_char *xm = (u_char *)m;
-	register struct radix_node *rn, *last = 0 /* shut up gcc */;
-	int stopping = 0;
-	int lastb;
-
-	/*
-	 * rn_search_m is sort-of-open-coded here.
-	 */
-	/* printf("about to search\n"); */
-	for (rn = h->rnh_treetop; rn->rn_b >= 0; ) {
-		last = rn;
-		/* printf("rn_b %d, rn_bmask %x, xm[rn_off] %x\n",
-		       rn->rn_b, rn->rn_bmask, xm[rn->rn_off]); */
-		if (!(rn->rn_bmask & xm[rn->rn_off])) {
-			break;
-		}
-		if (rn->rn_bmask & xa[rn->rn_off]) {
-			rn = rn->rn_r;
-		} else {
-			rn = rn->rn_l;
-		}
-	}
-	/* printf("done searching\n"); */
-
-	/*
-	 * Two cases: either we stepped off the end of our mask,
-	 * in which case last == rn, or we reached a leaf, in which
-	 * case we want to start from the last node we looked at.
-	 * Either way, last is the node we want to start from.
-	 */
-	rn = last;
-	lastb = rn->rn_b;
-
-	/* printf("rn %p, lastb %d\n", rn, lastb);*/
-
-	/*
-	 * This gets complicated because we may delete the node
-	 * while applying the function f to it, so we need to calculate
-	 * the successor node in advance.
-	 */
-	while (rn->rn_b >= 0)
-		rn = rn->rn_l;
-
-	while (!stopping) {
-		/* printf("node %p (%d)\n", rn, rn->rn_b); */
-		base = rn;
-		/* If at right child go back up, otherwise, go right */
-		while (rn->rn_p->rn_r == rn && !(rn->rn_flags & RNF_ROOT)) {
-			rn = rn->rn_p;
-
-			/* if went up beyond last, stop */
-			if (rn->rn_b < lastb) {
-				stopping = 1;
-				/* printf("up too far\n"); */
-			}
-		}
-
-		/* Find the next *leaf* since next node might vanish, too */
-		for (rn = rn->rn_p->rn_r; rn->rn_b >= 0;)
-			rn = rn->rn_l;
-		next = rn;
-		/* Process leaves */
-		while ((rn = base) != 0) {
-			base = rn->rn_dupedkey;
-			/* printf("leaf %p\n", rn); */
-			if (!(rn->rn_flags & RNF_ROOT)
-			    && (error = (*f)(rn, w)))
-				return (error);
-		}
-		rn = next;
-
-		if (rn->rn_flags & RNF_ROOT) {
-			/* printf("root, stopping"); */
-			stopping = 1;
-		}
-
-	}
-	return 0;
-}
-
-static int
-rn_walktree(h, f, w)
-	struct radix_node_head *h;
-	walktree_f_t *f;
-	void *w;
-{
-	int error;
-	struct radix_node *base, *next;
-	register struct radix_node *rn = h->rnh_treetop;
-	/*
-	 * This gets complicated because we may delete the node
-	 * while applying the function f to it, so we need to calculate
-	 * the successor node in advance.
-	 */
-	/* First time through node, go left */
-	while (rn->rn_b >= 0)
-		rn = rn->rn_l;
-	for (;;) {
-		base = rn;
-		/* If at right child go back up, otherwise, go right */
-		while (rn->rn_p->rn_r == rn && (rn->rn_flags & RNF_ROOT) == 0)
-			rn = rn->rn_p;
-		/* Find the next *leaf* since next node might vanish, too */
-		for (rn = rn->rn_p->rn_r; rn->rn_b >= 0;)
-			rn = rn->rn_l;
-		next = rn;
-		/* Process leaves */
-		while ((rn = base)) {
-			base = rn->rn_dupedkey;
-			if (!(rn->rn_flags & RNF_ROOT) && (error = (*f)(rn, w)))
-				return (error);
-		}
-		rn = next;
-		if (rn->rn_flags & RNF_ROOT)
-			return (0);
-	}
-	/* NOTREACHED */
-}
-
-int
-rn_inithead(head, off)
-	void **head;
-	int off;
-{
-	register struct radix_node_head *rnh;
-	register struct radix_node *t, *tt, *ttt;
-	if (*head)
-		return (1);
-	R_Malloc(rnh, struct radix_node_head *, sizeof (*rnh));
-	if (rnh == 0)
-		return (0);
-	Bzero(rnh, sizeof (*rnh));
-	*head = rnh;
-	t = rn_newpair(rn_zeros, off, rnh->rnh_nodes);
-	ttt = rnh->rnh_nodes + 2;
-	t->rn_r = ttt;
-	t->rn_p = t;
-	tt = t->rn_l;
-	tt->rn_flags = t->rn_flags = RNF_ROOT | RNF_ACTIVE;
-	tt->rn_b = -1 - off;
-	*ttt = *tt;
-	ttt->rn_key = rn_ones;
-	rnh->rnh_addaddr = rn_addroute;
-	rnh->rnh_deladdr = rn_delete;
-	rnh->rnh_matchaddr = rn_match;
-	rnh->rnh_lookup = rn_lookup;
-	rnh->rnh_walktree = rn_walktree;
-	rnh->rnh_walktree_from = rn_walktree_from;
-	rnh->rnh_treetop = t;
-	return (1);
-}
-
-void
-rn_init()
-{
-	char *cp, *cplim;
-#ifdef KERNEL
-	struct domain *dom;
-
-	for (dom = domains; dom; dom = dom->dom_next)
-		if (dom->dom_maxrtkey > max_keylen)
-			max_keylen = dom->dom_maxrtkey;
-#endif
-	if (max_keylen == 0) {
-		log(LOG_ERR,
-		    "rn_init: radix functions require max_keylen be set\n");
-		return;
-	}
-	R_Malloc(rn_zeros, char *, 3 * max_keylen);
-	if (rn_zeros == NULL)
-		panic("rn_init");
-	Bzero(rn_zeros, 3 * max_keylen);
-	rn_ones = cp = rn_zeros + max_keylen;
-	addmask_key = cplim = rn_ones + max_keylen;
-	while (cp < cplim)
-		*cp++ = -1;
-	if (rn_inithead((void **)&mask_rnhead, 0) == 0)
-		panic("rn_init 2");
-}
diff --git a/cpukit/libnetworking/net/radix.h b/cpukit/libnetworking/net/radix.h
deleted file mode 100644
index 6ef9aafbac..0000000000
--- a/cpukit/libnetworking/net/radix.h
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * Copyright (c) 1988, 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)radix.h	8.2 (Berkeley) 10/31/94
- *	$Id$
- */
-
-#ifndef _RADIX_H_
-#define	_RADIX_H_
-
-/*
- * Radix search tree node layout.
- */
-
-struct radix_node {
-	struct	radix_mask *rn_mklist;	/* list of masks contained in subtree */
-	struct	radix_node *rn_p;	/* parent */
-	short	rn_b;			/* bit offset; -1-index(netmask) */
-	char	rn_bmask;		/* node: mask for bit test*/
-	u_char	rn_flags;		/* enumerated next */
-#define RNF_NORMAL	1		/* leaf contains normal route */
-#define RNF_ROOT	2		/* leaf is root leaf for tree */
-#define RNF_ACTIVE	4		/* This node is alive (for rtfree) */
-	union {
-		struct {			/* leaf only data: */
-			caddr_t	rn_Key;		/* object of search */
-			caddr_t	rn_Mask;	/* netmask, if present */
-			struct	radix_node *rn_Dupedkey;
-		} rn_leaf;
-		struct {			/* node only data: */
-			int	rn_Off;		/* where to start compare */
-			struct	radix_node *rn_L;/* progeny */
-			struct	radix_node *rn_R;/* progeny */
-		} rn_node;
-	}		rn_u;
-#ifdef RN_DEBUG
-	int rn_info;
-	struct radix_node *rn_twin;
-	struct radix_node *rn_ybro;
-#endif
-};
-
-#define rn_dupedkey rn_u.rn_leaf.rn_Dupedkey
-#define rn_key rn_u.rn_leaf.rn_Key
-#define rn_mask rn_u.rn_leaf.rn_Mask
-#define rn_off rn_u.rn_node.rn_Off
-#define rn_l rn_u.rn_node.rn_L
-#define rn_r rn_u.rn_node.rn_R
-
-/*
- * Annotations to tree concerning potential routes applying to subtrees.
- */
-
-extern struct radix_mask {
-	short	rm_b;			/* bit offset; -1-index(netmask) */
-	char	rm_unused;		/* cf. rn_bmask */
-	u_char	rm_flags;		/* cf. rn_flags */
-	struct	radix_mask *rm_mklist;	/* more masks to try */
-	union	{
-		caddr_t	rmu_mask;		/* the mask */
-		struct	radix_node *rmu_leaf;	/* for normal routes */
-	}	rm_rmu;
-	int	rm_refs;		/* # of references to this struct */
-} *rn_mkfreelist;
-
-#define rm_mask rm_rmu.rmu_mask
-#define rm_leaf rm_rmu.rmu_leaf		/* extra field would make 32 bytes */
-
-#define MKGet(m) {\
-	if (rn_mkfreelist) {\
-		m = rn_mkfreelist; \
-		rn_mkfreelist = (m)->rm_mklist; \
-	} else \
-		R_Malloc(m, struct radix_mask *, sizeof (*(m))); }\
-
-#define MKFree(m) { (m)->rm_mklist = rn_mkfreelist; rn_mkfreelist = (m);}
-
-typedef int walktree_f_t __P((struct radix_node *, void *));
-
-struct radix_node_head {
-	struct	radix_node *rnh_treetop;
-	int	rnh_addrsize;		/* permit, but not require fixed keys */
-	int	rnh_pktsize;		/* permit, but not require fixed keys */
-	struct	radix_node *(*rnh_addaddr)	/* add based on sockaddr */
-		__P((void *v, void *mask,
-		     struct radix_node_head *head, struct radix_node nodes[]));
-	struct	radix_node *(*rnh_addpkt)	/* add based on packet hdr */
-		__P((void *v, void *mask,
-		     struct radix_node_head *head, struct radix_node nodes[]));
-	struct	radix_node *(*rnh_deladdr)	/* remove based on sockaddr */
-		__P((void *v, void *mask, struct radix_node_head *head));
-	struct	radix_node *(*rnh_delpkt)	/* remove based on packet hdr */
-		__P((void *v, void *mask, struct radix_node_head *head));
-	struct	radix_node *(*rnh_matchaddr)	/* locate based on sockaddr */
-		__P((void *v, struct radix_node_head *head));
-	struct	radix_node *(*rnh_lookup)	/* locate based on sockaddr */
-		__P((void *v, void *mask, struct radix_node_head *head));
-	struct	radix_node *(*rnh_matchpkt)	/* locate based on packet hdr */
-		__P((void *v, struct radix_node_head *head));
-	int	(*rnh_walktree)			/* traverse tree */
-		__P((struct radix_node_head *head, walktree_f_t *f, void *w));
-	int	(*rnh_walktree_from)		/* traverse tree below a */
-		__P((struct radix_node_head *head, void *a, void *m,
-		     walktree_f_t *f, void *w));
-	void	(*rnh_close)	/* do something when the last ref drops */
-		__P((struct radix_node *rn, struct radix_node_head *head));
-	struct	radix_node rnh_nodes[3];	/* empty tree for common case */
-};
-
-#ifndef KERNEL
-#define Bcmp(a, b, n) bcmp(((char *)(a)), ((char *)(b)), (n))
-#define Bcopy(a, b, n) bcopy(((char *)(a)), ((char *)(b)), (unsigned)(n))
-#define Bzero(p, n) bzero((char *)(p), (int)(n));
-#define R_Malloc(p, t, n) (p = (t) malloc((unsigned int)(n)))
-#define Free(p) free((char *)p);
-#else
-#define Bcmp(a, b, n) bcmp(((caddr_t)(a)), ((caddr_t)(b)), (unsigned)(n))
-#define Bcopy(a, b, n) bcopy(((caddr_t)(a)), ((caddr_t)(b)), (unsigned)(n))
-#define Bzero(p, n) bzero((caddr_t)(p), (unsigned)(n));
-#define R_Malloc(p, t, n) (p = (t) malloc((unsigned long)(n), M_RTABLE, M_DONTWAIT))
-#define Free(p) free((caddr_t)p, M_RTABLE);
-#endif /*KERNEL*/
-
-extern struct radix_node_head *mask_rnhead;
-
-void	 rn_init __P((void));
-int	 rn_inithead __P((void **, int));
-int	 rn_refines __P((void *, void *));
-struct radix_node
-	 *rn_addmask __P((void *, int, int)),
-	 *rn_addroute __P((void *, void *, struct radix_node_head *,
-			struct radix_node [2])),
-	 *rn_match __P((void *, struct radix_node_head *));
-
-
-#endif /* _RADIX_H_ */
diff --git a/cpukit/libnetworking/net/raw_cb.c b/cpukit/libnetworking/net/raw_cb.c
deleted file mode 100644
index 0676931cdc..0000000000
--- a/cpukit/libnetworking/net/raw_cb.c
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * Copyright (c) 1980, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)raw_cb.c	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/systm.h>
-#include <sys/mbuf.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/domain.h>
-#include <sys/protosw.h>
-#include <sys/errno.h>
-
-#include <net/if.h>
-#include <net/route.h>
-#include <net/raw_cb.h>
-#include <netinet/in.h>
-
-/*
- * Routines to manage the raw protocol control blocks.
- *
- * TODO:
- *	hash lookups by protocol family/protocol + address family
- *	take care of unique address problems per AF?
- *	redo address binding to allow wildcards
- */
-
-struct rawcb rawcb;
-static u_long	raw_sendspace = RAWSNDQ;
-static u_long	raw_recvspace = RAWRCVQ;
-
-/*
- * Allocate a control block and a nominal amount
- * of buffer space for the socket.
- */
-int
-raw_attach(so, proto)
-	register struct socket *so;
-	int proto;
-{
-	register struct rawcb *rp = sotorawcb(so);
-	int error;
-
-	/*
-	 * It is assumed that raw_attach is called
-	 * after space has been allocated for the
-	 * rawcb.
-	 */
-	if (rp == 0)
-		return (ENOBUFS);
-	error = soreserve(so, raw_sendspace, raw_recvspace);
-	if (error)
-		return (error);
-	rp->rcb_socket = so;
-	rp->rcb_proto.sp_family = so->so_proto->pr_domain->dom_family;
-	rp->rcb_proto.sp_protocol = proto;
-	insque(rp, &rawcb);
-	return (0);
-}
-
-/*
- * Detach the raw connection block and discard
- * socket resources.
- */
-void
-raw_detach(rp)
-	register struct rawcb *rp;
-{
-	struct socket *so = rp->rcb_socket;
-
-	so->so_pcb = 0;
-	sofree(so);
-	remque(rp);
-#ifdef notdef
-	if (rp->rcb_laddr)
-		m_freem(dtom(rp->rcb_laddr));
-	rp->rcb_laddr = 0;
-#endif
-	free((caddr_t)(rp), M_PCB);
-}
-
-/*
- * Disconnect and possibly release resources.
- */
-void
-raw_disconnect(rp)
-	struct rawcb *rp;
-{
-
-#ifdef notdef
-	if (rp->rcb_faddr)
-		m_freem(dtom(rp->rcb_faddr));
-	rp->rcb_faddr = 0;
-#endif
-	if (rp->rcb_socket->so_state & SS_NOFDREF)
-		raw_detach(rp);
-}
-
-#ifdef notdef
-int
-raw_bind(so, nam)
-	register struct socket *so;
-	struct mbuf *nam;
-{
-	struct sockaddr *addr = mtod(nam, struct sockaddr *);
-	register struct rawcb *rp;
-
-	if (ifnet == 0)
-		return (EADDRNOTAVAIL);
-	rp = sotorawcb(so);
-	nam = m_copym(nam, 0, M_COPYALL, M_WAITOK);
-	rp->rcb_laddr = mtod(nam, struct sockaddr *);
-	return (0);
-}
-#endif
diff --git a/cpukit/libnetworking/net/raw_cb.h b/cpukit/libnetworking/net/raw_cb.h
deleted file mode 100644
index c1ed5e5e0a..0000000000
--- a/cpukit/libnetworking/net/raw_cb.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 1980, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)raw_cb.h	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#ifndef _NET_RAW_CB_H_
-#define _NET_RAW_CB_H_
-
-/*
- * Raw protocol interface control block.  Used
- * to tie a socket to the generic raw interface.
- */
-struct rawcb {
-	struct	rawcb *rcb_next;	/* doubly linked list */
-	struct	rawcb *rcb_prev;
-	struct	socket *rcb_socket;	/* back pointer to socket */
-	struct	sockaddr *rcb_faddr;	/* destination address */
-	struct	sockaddr *rcb_laddr;	/* socket's address */
-	struct	sockproto rcb_proto;	/* protocol family, protocol */
-};
-
-#define	sotorawcb(so)		((struct rawcb *)(so)->so_pcb)
-
-/*
- * Nominal space allocated to a raw socket.
- */
-#define	RAWSNDQ		8192
-#define	RAWRCVQ		8192
-
-#ifdef KERNEL
-extern struct rawcb rawcb;		/* head of list */
-
-int	 raw_attach __P((struct socket *, int));
-void	 raw_ctlinput __P((int, struct sockaddr *, void *));
-void	 raw_detach __P((struct rawcb *));
-void	 raw_disconnect __P((struct rawcb *));
-void	 raw_init __P((void));
-void	 raw_input __P((struct mbuf *,
-	    struct sockproto *, struct sockaddr *, struct sockaddr *));
-int	 raw_usrreq __P((struct socket *,
-	    int, struct mbuf *, struct mbuf *, struct mbuf *));
-#endif
-
-#endif
diff --git a/cpukit/libnetworking/net/raw_usrreq.c b/cpukit/libnetworking/net/raw_usrreq.c
deleted file mode 100644
index fb4faf4d6d..0000000000
--- a/cpukit/libnetworking/net/raw_usrreq.c
+++ /dev/null
@@ -1,315 +0,0 @@
-/*
- * Copyright (c) 1980, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)raw_usrreq.c	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/systm.h>
-#include <sys/mbuf.h>
-#include <sys/domain.h>
-#include <sys/protosw.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/errno.h>
-
-#include <net/if.h>
-#include <net/route.h>
-#include <net/netisr.h>
-#include <net/raw_cb.h>
-
-/*
- * Initialize raw connection block q.
- */
-void
-raw_init()
-{
-
-	rawcb.rcb_next = rawcb.rcb_prev = &rawcb;
-}
-
-
-/*
- * Raw protocol input routine.  Find the socket
- * associated with the packet(s) and move them over.  If
- * nothing exists for this packet, drop it.
- */
-/*
- * Raw protocol interface.
- */
-void
-raw_input(m0, proto, src, dst)
-	struct mbuf *m0;
-	register struct sockproto *proto;
-	struct sockaddr *src, *dst;
-{
-	register struct rawcb *rp;
-	register struct mbuf *m = m0;
-	register int sockets = 0;
-	struct socket *last;
-
-	last = 0;
-	for (rp = rawcb.rcb_next; rp != &rawcb; rp = rp->rcb_next) {
-		if (rp->rcb_proto.sp_family != proto->sp_family)
-			continue;
-		if (rp->rcb_proto.sp_protocol  &&
-		    rp->rcb_proto.sp_protocol != proto->sp_protocol)
-			continue;
-		/*
-		 * We assume the lower level routines have
-		 * placed the address in a canonical format
-		 * suitable for a structure comparison.
-		 *
-		 * Note that if the lengths are not the same
-		 * the comparison will fail at the first byte.
-		 */
-#define	equal(a1, a2) \
-  (bcmp((caddr_t)(a1), (caddr_t)(a2), a1->sa_len) == 0)
-		if (rp->rcb_laddr && !equal(rp->rcb_laddr, dst))
-			continue;
-		if (rp->rcb_faddr && !equal(rp->rcb_faddr, src))
-			continue;
-		if (last) {
-			struct mbuf *n;
-			n = m_copy(m, 0, (int)M_COPYALL);
-			if (n) {
-				if (sbappendaddr(&last->so_rcv, src,
-				    n, (struct mbuf *)0) == 0)
-					/* should notify about lost packet */
-					m_freem(n);
-				else {
-					sorwakeup(last);
-					sockets++;
-				}
-			}
-		}
-		last = rp->rcb_socket;
-	}
-	if (last) {
-		if (sbappendaddr(&last->so_rcv, src,
-		    m, (struct mbuf *)0) == 0)
-			m_freem(m);
-		else {
-			sorwakeup(last);
-			sockets++;
-		}
-	} else
-		m_freem(m);
-}
-
-/*ARGSUSED*/
-void
-raw_ctlinput(cmd, arg, dummy)
-	int cmd;
-	struct sockaddr *arg;
-	void *dummy;
-{
-
-	if (cmd < 0 || cmd > PRC_NCMDS)
-		return;
-	/* INCOMPLETE */
-}
-
-/*ARGSUSED*/
-int
-raw_usrreq(so, req, m, nam, control)
-	struct socket *so;
-	int req;
-	struct mbuf *m, *nam, *control;
-{
-	register struct rawcb *rp = sotorawcb(so);
-	register int error = 0;
-	int len;
-
-	if (req == PRU_CONTROL)
-		return (EOPNOTSUPP);
-	if (control && control->m_len) {
-		error = EOPNOTSUPP;
-		goto release;
-	}
-	if (rp == 0) {
-		error = EINVAL;
-		goto release;
-	}
-	switch (req) {
-
-	/*
-	 * Allocate a raw control block and fill in the
-	 * necessary info to allow packets to be routed to
-	 * the appropriate raw interface routine.
-	 */
-	case PRU_ATTACH:
-		if ((so->so_state & SS_PRIV) == 0) {
-			error = EACCES;
-			break;
-		}
-		error = raw_attach(so, (int)nam);
-		break;
-
-	/*
-	 * Destroy state just before socket deallocation.
-	 * Flush data or not depending on the options.
-	 */
-	case PRU_DETACH:
-		if (rp == 0) {
-			error = ENOTCONN;
-			break;
-		}
-		raw_detach(rp);
-		break;
-
-	/*
-	 * If a socket isn't bound to a single address,
-	 * the raw input routine will hand it anything
-	 * within that protocol family (assuming there's
-	 * nothing else around it should go to).
-	 */
-	case PRU_CONNECT:
-		error = EINVAL;
-#if 0
-		if (rp->rcb_faddr) {
-			error = EISCONN;
-			break;
-		}
-		nam = m_copym(nam, 0, M_COPYALL, M_WAIT);
-		rp->rcb_faddr = mtod(nam, struct sockaddr *);
-		soisconnected(so);
-#endif
-		break;
-
-	case PRU_BIND:
-		error = EINVAL;
-#if 0
-		if (rp->rcb_laddr) {
-			error = EINVAL;			/* XXX */
-			break;
-		}
-		error = raw_bind(so, nam);
-#endif
-		break;
-
-	case PRU_CONNECT2:
-		error = EOPNOTSUPP;
-		goto release;
-
-	case PRU_DISCONNECT:
-		if (rp->rcb_faddr == 0) {
-			error = ENOTCONN;
-			break;
-		}
-		raw_disconnect(rp);
-		soisdisconnected(so);
-		break;
-
-	/*
-	 * Mark the connection as being incapable of further input.
-	 */
-	case PRU_SHUTDOWN:
-		socantsendmore(so);
-		break;
-
-	/*
-	 * Ship a packet out.  The appropriate raw output
-	 * routine handles any massaging necessary.
-	 */
-	case PRU_SEND:
-		if (nam) {
-			if (rp->rcb_faddr) {
-				error = EISCONN;
-				break;
-			}
-			rp->rcb_faddr = mtod(nam, struct sockaddr *);
-		} else if (rp->rcb_faddr == 0) {
-			error = ENOTCONN;
-			break;
-		}
-		error = (*so->so_proto->pr_output)(m, so);
-		m = NULL;
-		if (nam)
-			rp->rcb_faddr = 0;
-		break;
-
-	case PRU_ABORT:
-		raw_disconnect(rp);
-		sofree(so);
-		soisdisconnected(so);
-		break;
-
-	case PRU_SENSE:
-		/*
-		 * stat: don't bother with a blocksize.
-		 */
-		return (0);
-
-	/*
-	 * Not supported.
-	 */
-	case PRU_RCVOOB:
-	case PRU_RCVD:
-		return(EOPNOTSUPP);
-
-	case PRU_LISTEN:
-	case PRU_ACCEPT:
-	case PRU_SENDOOB:
-		error = EOPNOTSUPP;
-		break;
-
-	case PRU_SOCKADDR:
-		if (rp->rcb_laddr == 0) {
-			error = EINVAL;
-			break;
-		}
-		len = rp->rcb_laddr->sa_len;
-		bcopy((caddr_t)rp->rcb_laddr, mtod(nam, caddr_t), (unsigned)len);
-		nam->m_len = len;
-		break;
-
-	case PRU_PEERADDR:
-		if (rp->rcb_faddr == 0) {
-			error = ENOTCONN;
-			break;
-		}
-		len = rp->rcb_faddr->sa_len;
-		bcopy((caddr_t)rp->rcb_faddr, mtod(nam, caddr_t), (unsigned)len);
-		nam->m_len = len;
-		break;
-
-	default:
-		panic("raw_usrreq");
-	}
-release:
-	if (m != NULL)
-		m_freem(m);
-	return (error);
-}
diff --git a/cpukit/libnetworking/net/route.c b/cpukit/libnetworking/net/route.c
deleted file mode 100644
index 683ddafee9..0000000000
--- a/cpukit/libnetworking/net/route.c
+++ /dev/null
@@ -1,959 +0,0 @@
-/*
- * Copyright (c) 1980, 1986, 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)route.c	8.2 (Berkeley) 11/15/93
- *	$Id$
- */
-
-#include "opt_mrouting.h"
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/proc.h>
-#include <sys/mbuf.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/domain.h>
-#include <sys/protosw.h>
-#include <sys/ioctl.h>
-
-#include <net/if.h>
-#include <net/route.h>
-#include <net/raw_cb.h>
-
-#include <netinet/in.h>
-#include <netinet/in_var.h>
-#include <netinet/ip_mroute.h>
-
-#define	SA(p) ((struct sockaddr *)(p))
-
-struct route_cb route_cb;
-static struct rtstat rtstat;
-struct radix_node_head *rt_tables[AF_MAX+1];
-
-static int	rttrash;		/* routes not in table but not freed */
-
-static void rt_maskedcopy __P((struct sockaddr *,
-	    struct sockaddr *, struct sockaddr *));
-static void rtable_init __P((void **));
-
-static void
-rtable_init(table)
-	void **table;
-{
-	struct domain *dom;
-	for (dom = domains; dom; dom = dom->dom_next)
-		if (dom->dom_rtattach)
-			dom->dom_rtattach(&table[dom->dom_family],
-			    dom->dom_rtoffset);
-}
-
-void
-route_init()
-{
-	rn_init();	/* initialize all zeroes, all ones, mask table */
-	rtable_init((void **)rt_tables);
-}
-
-/*
- * Packet routing routines.
- */
-void
-rtalloc(ro)
-	register struct route *ro;
-{
-	if (ro->ro_rt && ro->ro_rt->rt_ifp && (ro->ro_rt->rt_flags & RTF_UP))
-		return;				 /* XXX */
-	ro->ro_rt = rtalloc1(&ro->ro_dst, 1, 0UL);
-}
-
-void
-rtalloc_ign(ro, ignore)
-	register struct route *ro;
-	u_long ignore;
-{
-	if (ro->ro_rt && ro->ro_rt->rt_ifp && (ro->ro_rt->rt_flags & RTF_UP))
-		return;				 /* XXX */
-	ro->ro_rt = rtalloc1(&ro->ro_dst, 1, ignore);
-}
-
-/*
- * Look up the route that matches the address given
- * Or, at least try.. Create a cloned route if needed.
- */
-struct rtentry *
-rtalloc1(dst, report, ignflags)
-	register struct sockaddr *dst;
-	int report;
-	u_long ignflags;
-{
-	register struct radix_node_head *rnh = rt_tables[dst->sa_family];
-	register struct rtentry *rt;
-	register struct radix_node *rn;
-	struct rtentry *newrt = 0;
-	struct rt_addrinfo info;
-	u_long nflags;
-	int  s = splnet(), err = 0, msgtype = RTM_MISS;
-
-	/* 
-	 * Look up the address in the table for that Address Family
-	 */
-	if (rnh && (rn = rnh->rnh_matchaddr((caddr_t)dst, rnh)) &&
-	    ((rn->rn_flags & RNF_ROOT) == 0)) {
-		/*
-		 * If we find it and it's not the root node, then
-		 * get a refernce on the rtentry associated.
-		 */
-		newrt = rt = (struct rtentry *)rn;
-		nflags = rt->rt_flags & ~ignflags;
-		if (report && (nflags & (RTF_CLONING | RTF_PRCLONING))) {
-			/*
-			 * We are apparently adding (report = 0 in delete).
-			 * If it requires that it be cloned, do so.
-			 * (This implies it wasn't a HOST route.)
-			 */
-			err = rtrequest(RTM_RESOLVE, dst, SA(0),
-					      SA(0), 0, &newrt);
-			if (err) {
-				/*
-				 * If the cloning didn't succeed, maybe
-				 * what we have will do. Return that.
-				 */
-				newrt = rt;
-				rt->rt_refcnt++;
-				goto miss;
-			}
-			if ((rt = newrt) && (rt->rt_flags & RTF_XRESOLVE)) {
-				/*
-				 * If the new route specifies it be 
-				 * externally resolved, then go do that.
-				 */
-				msgtype = RTM_RESOLVE;
-				goto miss;
-			}
-		} else
-			rt->rt_refcnt++;
-	} else {
-		/*
-		 * Either we hit the root or couldn't find any match,
-		 * Which basically means
-		 * "caint get there frm here"
-		 */
-		rtstat.rts_unreach++;
-	miss:	if (report) {
-			/*
-			 * If required, report the failure to the supervising
-			 * Authorities.
-			 * For a delete, this is not an error. (report == 0)
-			 */
-			bzero((caddr_t)&info, sizeof(info));
-			info.rti_info[RTAX_DST] = dst;
-			rt_missmsg(msgtype, &info, 0, err);
-		}
-	}
-	splx(s);
-	return (newrt);
-}
-
-void
-rtfree(rt)
-	register struct rtentry *rt;
-{
-	register struct radix_node_head *rnh =
-		rt_tables[rt_key(rt)->sa_family];
-	register struct ifaddr *ifa;
-
-	if (rt == 0 || rnh == 0)
-		panic("rtfree");
-	rt->rt_refcnt--;
-	if(rnh->rnh_close && rt->rt_refcnt == 0) {
-		rnh->rnh_close((struct radix_node *)rt, rnh);
-	}
-	if (rt->rt_refcnt <= 0 && (rt->rt_flags & RTF_UP) == 0) {
-		if (rt->rt_nodes->rn_flags & (RNF_ACTIVE | RNF_ROOT))
-			panic ("rtfree 2");
-		rttrash--;
-		if (rt->rt_refcnt < 0) {
-			printf("rtfree: %p not freed (neg refs)\n", rt);
-			return;
-		}
-		ifa = rt->rt_ifa;
-		IFAFREE(ifa);
-		if (rt->rt_parent) {
-			RTFREE(rt->rt_parent);
-		}
-		Free(rt_key(rt));
-		Free(rt);
-	}
-}
-
-void
-ifafree(ifa)
-	register struct ifaddr *ifa;
-{
-	if (ifa == NULL)
-		panic("ifafree");
-	if (ifa->ifa_refcnt == 0)
-		free(ifa, M_IFADDR);
-	else
-		ifa->ifa_refcnt--;
-}
-
-/*
- * Force a routing table entry to the specified
- * destination to go through the given gateway.
- * Normally called as a result of a routing redirect
- * message from the network layer.
- *
- * N.B.: must be called at splnet
- *
- */
-void
-rtredirect(dst, gateway, netmask, flags, src, rtp)
-	struct sockaddr *dst, *gateway, *netmask, *src;
-	int flags;
-	struct rtentry **rtp;
-{
-	register struct rtentry *rt;
-	int error = 0;
-	short *stat = 0;
-	struct rt_addrinfo info;
-	struct ifaddr *ifa;
-
-	/* verify the gateway is directly reachable */
-	if ((ifa = ifa_ifwithnet(gateway)) == 0) {
-		error = ENETUNREACH;
-		goto out;
-	}
-	rt = rtalloc1(dst, 0, 0UL);
-	/*
-	 * If the redirect isn't from our current router for this dst,
-	 * it's either old or wrong.  If it redirects us to ourselves,
-	 * we have a routing loop, perhaps as a result of an interface
-	 * going down recently.
-	 */
-#define	equal(a1, a2) (bcmp((caddr_t)(a1), (caddr_t)(a2), (a1)->sa_len) == 0)
-	if (!(flags & RTF_DONE) && rt &&
-	     (!equal(src, rt->rt_gateway) || rt->rt_ifa != ifa))
-		error = EINVAL;
-	else if (ifa_ifwithaddr(gateway))
-		error = EHOSTUNREACH;
-	if (error)
-		goto done;
-	/*
-	 * Create a new entry if we just got back a wildcard entry
-	 * or the the lookup failed.  This is necessary for hosts
-	 * which use routing redirects generated by smart gateways
-	 * to dynamically build the routing tables.
-	 */
-	if ((rt == 0) || (rt_mask(rt) && rt_mask(rt)->sa_len < 2))
-		goto create;
-	/*
-	 * Don't listen to the redirect if it's
-	 * for a route to an interface.
-	 */
-	if (rt->rt_flags & RTF_GATEWAY) {
-		if (((rt->rt_flags & RTF_HOST) == 0) && (flags & RTF_HOST)) {
-			/*
-			 * Changing from route to net => route to host.
-			 * Create new route, rather than smashing route to net.
-			 */
-		create:
-			flags |=  RTF_GATEWAY | RTF_DYNAMIC;
-			error = rtrequest((int)RTM_ADD, dst, gateway,
-				    netmask, flags,
-				    (struct rtentry **)0);
-			stat = &rtstat.rts_dynamic;
-		} else {
-			/*
-			 * Smash the current notion of the gateway to
-			 * this destination.  Should check about netmask!!!
-			 */
-			rt->rt_flags |= RTF_MODIFIED;
-			flags |= RTF_MODIFIED;
-			stat = &rtstat.rts_newgateway;
-			rt_setgate(rt, rt_key(rt), gateway);
-		}
-	} else
-		error = EHOSTUNREACH;
-done:
-	if (rt) {
-		if (rtp && !error)
-			*rtp = rt;
-		else
-			rtfree(rt);
-	}
-out:
-	if (error)
-		rtstat.rts_badredirect++;
-	else if (stat != NULL)
-		(*stat)++;
-	bzero((caddr_t)&info, sizeof(info));
-	info.rti_info[RTAX_DST] = dst;
-	info.rti_info[RTAX_GATEWAY] = gateway;
-	info.rti_info[RTAX_NETMASK] = netmask;
-	info.rti_info[RTAX_AUTHOR] = src;
-	rt_missmsg(RTM_REDIRECT, &info, flags, error);
-}
-
-/*
-* Routing table ioctl interface.
-*/
-int
-rtioctl(req, data, p)
-	int req;
-	caddr_t data;
-	struct proc *p;
-{
-#ifdef INET
-	/* Multicast goop, grrr... */
-#ifdef MROUTING
-	return mrt_ioctl(req, data);
-#else
-	return mrt_ioctl(req, data, p);
-#endif
-#else /* INET */
-	return ENXIO;
-#endif /* INET */
-}
-
-struct ifaddr *
-ifa_ifwithroute(flags, dst, gateway)
-	int flags;
-	struct sockaddr	*dst, *gateway;
-{
-	register struct ifaddr *ifa;
-	if ((flags & RTF_GATEWAY) == 0) {
-		/*
-		 * If we are adding a route to an interface,
-		 * and the interface is a pt to pt link
-		 * we should search for the destination
-		 * as our clue to the interface.  Otherwise
-		 * we can use the local address.
-		 */
-		ifa = 0;
-		if (flags & RTF_HOST) {
-			ifa = ifa_ifwithdstaddr(dst);
-		}
-		if (ifa == 0)
-			ifa = ifa_ifwithaddr(gateway);
-	} else {
-		/*
-		 * If we are adding a route to a remote net
-		 * or host, the gateway may still be on the
-		 * other end of a pt to pt link.
-		 */
-		ifa = ifa_ifwithdstaddr(gateway);
-	}
-	if (ifa == 0)
-		ifa = ifa_ifwithnet(gateway);
-	if (ifa == 0) {
-		struct rtentry *rt = rtalloc1(dst, 0, 0UL);
-		if (rt == 0)
-			return (0);
-		rt->rt_refcnt--;
-		if ((ifa = rt->rt_ifa) == 0)
-			return (0);
-	}
-	if (ifa->ifa_addr->sa_family != dst->sa_family) {
-		struct ifaddr *oifa = ifa;
-		ifa = ifaof_ifpforaddr(dst, ifa->ifa_ifp);
-		if (ifa == 0)
-			ifa = oifa;
-	}
-	return (ifa);
-}
-
-#define ROUNDUP(a) (a>0 ? (1 + (((a) - 1) | (sizeof(long) - 1))) : sizeof(long))
-
-static int rt_fixdelete(struct radix_node *, void *);
-static int rt_fixchange(struct radix_node *, void *);
-
-struct rtfc_arg {
-	struct rtentry *rt0;
-	struct radix_node_head *rnh;
-};
-
-/*
- * Do appropriate manipulations of a routing tree given
- * all the bits of info needed
- */
-int
-rtrequest(req, dst, gateway, netmask, flags, ret_nrt)
-	int req, flags;
-	struct sockaddr *dst, *gateway, *netmask;
-	struct rtentry **ret_nrt;
-{
-	int s = splnet(); int error = 0;
-	register struct rtentry *rt;
-	register struct radix_node *rn;
-	register struct radix_node_head *rnh;
-	struct ifaddr *ifa;
-	struct sockaddr *ndst;
-#define senderr(x) { error = x ; goto bad; }
-
-	/*
-	 * Find the correct routing tree to use for this Address Family
-	 */
-	if ((rnh = rt_tables[dst->sa_family]) == 0)
-		senderr(ESRCH);
-	/*
-	 * If we are adding a host route then we don't want to put
-	 * a netmask in the tree
-	 */
-	if (flags & RTF_HOST)
-		netmask = 0;
-	switch (req) {
-	case RTM_DELETE:
-		/*
-		 * Remove the item from the tree and return it.
-		 * Complain if it is not there and do no more processing.
-		 */
-		if ((rn = rnh->rnh_deladdr(dst, netmask, rnh)) == 0)
-			senderr(ESRCH);
-		if (rn->rn_flags & (RNF_ACTIVE | RNF_ROOT))
-			panic ("rtrequest delete");
-		rt = (struct rtentry *)rn;
-
-		/*
-		 * Now search what's left of the subtree for any cloned
-		 * routes which might have been formed from this node.
-		 */
-		if ((rt->rt_flags & RTF_PRCLONING) && netmask) {
-			rnh->rnh_walktree_from(rnh, dst, netmask,
-					       rt_fixdelete, rt);
-		}
-
-		/*
-		 * Remove any external references we may have.
-		 * This might result in another rtentry being freed if
-		 * we held it's last reference.
-		 */
-		if (rt->rt_gwroute) {
-			rt = rt->rt_gwroute;
-			RTFREE(rt);
-			(rt = (struct rtentry *)rn)->rt_gwroute = 0;
-		}
-
-		/*
-		 * NB: RTF_UP must be set during the search above,
-		 * because we might delete the last ref, causing
-		 * rt to get freed prematurely.
-		 */
-		rt->rt_flags &= ~RTF_UP;
-
-		/* 
-		 * If there is llinfo or similar associated with the 
-		 * route, give the interface a chance to deal with it..
-		 */
-		if ((ifa = rt->rt_ifa) && ifa->ifa_rtrequest)
-			ifa->ifa_rtrequest(RTM_DELETE, rt, SA(0));
-		rttrash++;
-		/*
-		 * If the caller wants it, then it can have it, but it's up to it
-		 * to free the rtentry as we won't be doing it.
-		 */
-		if (ret_nrt)
-			*ret_nrt = rt;
-		else if (rt->rt_refcnt <= 0) {
-			rt->rt_refcnt++; /* make a 1->0 transition */
-			rtfree(rt);
-		}
-		break;
-
-	case RTM_RESOLVE:
-		if (ret_nrt == 0 || (rt = *ret_nrt) == 0)
-			senderr(EINVAL);
-		ifa = rt->rt_ifa;
-		flags = rt->rt_flags &
-		    ~(RTF_CLONING | RTF_PRCLONING | RTF_STATIC);
-		flags |= RTF_WASCLONED;
-		gateway = rt->rt_gateway;
-		if ((netmask = rt->rt_genmask) == 0)
-			flags |= RTF_HOST;
-		goto makeroute;
-
-	case RTM_ADD:
-		if ((flags & RTF_GATEWAY) && !gateway)
-			panic("rtrequest: GATEWAY but no gateway");
-
-		if ((ifa = ifa_ifwithroute(flags, dst, gateway)) == 0)
-			senderr(ENETUNREACH);
-
-	makeroute:
-		R_Malloc(rt, struct rtentry *, sizeof(*rt));
-		if (rt == 0)
-			senderr(ENOBUFS);
-		Bzero(rt, sizeof(*rt));
-		rt->rt_flags = RTF_UP | flags;
-		if ((error = rt_setgate(rt, dst, gateway))) {
-			Free(rt);
-			senderr(error);
-		}
-		ndst = rt_key(rt);
-		if (netmask) {
-			rt_maskedcopy(dst, ndst, netmask);
-		} else
-			Bcopy(dst, ndst, dst->sa_len);
-
-		/*
-		 * This moved from below so that rnh->rnh_addaddr() can
-		 * examine the ifa and ifp if it so desires.
-		 */
-		ifa->ifa_refcnt++;
-		rt->rt_ifa = ifa;
-		rt->rt_ifp = ifa->ifa_ifp;
-
-		rn = rnh->rnh_addaddr((caddr_t)ndst, (caddr_t)netmask,
-					rnh, rt->rt_nodes);
-		if (rn == 0) {
-			struct rtentry *rt2;
-			/*
-			 * Uh-oh, we already have one of these in the tree.
-			 * We do a special hack: if the route that's already
-			 * there was generated by the protocol-cloning
-			 * mechanism, then we just blow it away and retry
-			 * the insertion of the new one.
-			 */
-			rt2 = rtalloc1(dst, 0, RTF_PRCLONING);
-			if (rt2 && rt2->rt_parent) {
-				rtrequest(RTM_DELETE, 
-					  (struct sockaddr *)rt_key(rt2),
-					  rt2->rt_gateway,
-					  rt_mask(rt2), rt2->rt_flags, 0);
-				RTFREE(rt2);
-				rn = rnh->rnh_addaddr((caddr_t)ndst,
-						      (caddr_t)netmask,
-						      rnh, rt->rt_nodes);
-			} else if (rt2) {
-				RTFREE(rt2);
-			}
-		}
-
-		if (rn == 0) {
-			if (rt->rt_gwroute)
-				rtfree(rt->rt_gwroute);
-			if (rt->rt_ifa) {
-				IFAFREE(rt->rt_ifa);
-			}
-			Free(rt_key(rt));
-			Free(rt);
-			senderr(EEXIST);
-		}
-		rt->rt_parent = 0;
-
-		if (req == RTM_RESOLVE) {
-			rt->rt_rmx = (*ret_nrt)->rt_rmx; /* copy metrics */
-			if ((*ret_nrt)->rt_flags & RTF_PRCLONING) {
-				rt->rt_parent = (*ret_nrt);
-				(*ret_nrt)->rt_refcnt++;
-			}
-		}
-		if (ifa->ifa_rtrequest)
-			ifa->ifa_rtrequest(req, rt, SA(ret_nrt ? *ret_nrt : 0));
-		/*
-		 * We repeat the same procedure from rt_setgate() here because
-		 * it doesn't fire when we call it there because the node
-		 * hasn't been added to the tree yet.
-		 */
-		if (!(rt->rt_flags & RTF_HOST) && rt_mask(rt) != 0) {
-			struct rtfc_arg arg;
-			arg.rnh = rnh;
-			arg.rt0 = rt;
-			rnh->rnh_walktree_from(rnh, rt_key(rt), rt_mask(rt),
-					       rt_fixchange, &arg);
-		}
-
-		if (ret_nrt) {
-			*ret_nrt = rt;
-			rt->rt_refcnt++;
-		}
-		break;
-	}
-bad:
-	splx(s);
-	return (error);
-}
-
-/*
- * Called from rtrequest(RTM_DELETE, ...) to fix up the route's ``family''
- * (i.e., the routes related to it by the operation of cloning).  This
- * routine is iterated over all potential former-child-routes by way of
- * rnh->rnh_walktree_from() above, and those that actually are children of
- * the late parent (passed in as VP here) are themselves deleted.
- */
-static int
-rt_fixdelete(struct radix_node *rn, void *vp)
-{
-	struct rtentry *rt = (struct rtentry *)rn;
-	struct rtentry *rt0 = vp;
-
-	if (rt->rt_parent == rt0 && !(rt->rt_flags & RTF_PINNED)) {
-		return rtrequest(RTM_DELETE, rt_key(rt),
-				 (struct sockaddr *)0, rt_mask(rt),
-				 rt->rt_flags, (struct rtentry **)0);
-	}
-	return 0;
-}
-
-/*
- * This routine is called from rt_setgate() to do the analogous thing for
- * adds and changes.  There is the added complication in this case of a
- * middle insert; i.e., insertion of a new network route between an older
- * network route and (cloned) host routes.  For this reason, a simple check
- * of rt->rt_parent is insufficient; each candidate route must be tested
- * against the (mask, value) of the new route (passed as before in vp)
- * to see if the new route matches it.  Unfortunately, this has the obnoxious
- * property of also triggering for insertion /above/ a pre-existing network
- * route and clones.  Sigh.  This may be fixed some day.
- *
- * XXX - it may be possible to do fixdelete() for changes and reserve this
- * routine just for adds.  I'm not sure why I thought it was necessary to do
- * changes this way.
- */
-#ifdef DEBUG
-int rtfcdebug = 0;
-#endif
-
-static int
-rt_fixchange(struct radix_node *rn, void *vp)
-{
-	struct rtentry *rt = (struct rtentry *)rn;
-	struct rtfc_arg *ap = vp;
-	struct rtentry *rt0 = ap->rt0;
-	struct radix_node_head *rnh = ap->rnh;
-	u_char *xk1, *xm1, *xk2;
-	int i, len;
-
-#ifdef DEBUG
-	if (rtfcdebug)
-		printf("rt_fixchange: rt %p, rt0 %p\n", rt, rt0);
-#endif
-
-	if (!rt->rt_parent || (rt->rt_flags & RTF_PINNED)) {
-#ifdef DEBUG
-		if(rtfcdebug) printf("no parent or pinned\n");
-#endif
-		return 0;
-	}
-
-	if (rt->rt_parent == rt0) {
-#ifdef DEBUG
-		if(rtfcdebug) printf("parent match\n");
-#endif
-		return rtrequest(RTM_DELETE, rt_key(rt),
-				 (struct sockaddr *)0, rt_mask(rt),
-				 rt->rt_flags, (struct rtentry **)0);
-	}
-
-	/*
-	 * There probably is a function somewhere which does this...
-	 * if not, there should be.
-	 */
-	len = imin(((struct sockaddr *)rt_key(rt0))->sa_len,
-		   ((struct sockaddr *)rt_key(rt))->sa_len);
-
-	xk1 = (u_char *)rt_key(rt0);
-	xm1 = (u_char *)rt_mask(rt0);
-	xk2 = (u_char *)rt_key(rt);
-
-	for (i = rnh->rnh_treetop->rn_off; i < len; i++) {
-		if ((xk2[i] & xm1[i]) != xk1[i]) {
-#ifdef DEBUG
-			if(rtfcdebug) printf("no match\n");
-#endif
-			return 0;
-		}
-	}
-
-	/*
-	 * OK, this node is a clone, and matches the node currently being
-	 * changed/added under the node's mask.  So, get rid of it.
-	 */
-#ifdef DEBUG
-	if(rtfcdebug) printf("deleting\n");
-#endif
-	return rtrequest(RTM_DELETE, rt_key(rt), (struct sockaddr *)0,
-			 rt_mask(rt), rt->rt_flags, (struct rtentry **)0);
-}
-
-int
-rt_setgate(rt0, dst, gate)
-	struct rtentry *rt0;
-	struct sockaddr *dst, *gate;
-{
-	caddr_t new, old;
-	int dlen = ROUNDUP(dst->sa_len), glen = ROUNDUP(gate->sa_len);
-	register struct rtentry *rt = rt0;
-	struct radix_node_head *rnh = rt_tables[dst->sa_family];
-
-	/*
-	 * A host route with the destination equal to the gateway
-	 * will interfere with keeping LLINFO in the routing
-	 * table, so disallow it.
-	 */
-	if (((rt0->rt_flags & (RTF_HOST|RTF_GATEWAY|RTF_LLINFO)) ==
-					(RTF_HOST|RTF_GATEWAY)) &&
-	    (dst->sa_len == gate->sa_len) &&
-	    (bcmp(dst, gate, dst->sa_len) == 0)) {
-		/*
-		 * The route might already exist if this is an RTM_CHANGE
-		 * or a routing redirect, so try to delete it.
-		 */
-		if (rt_key(rt0))
-			rtrequest(RTM_DELETE, (struct sockaddr *)rt_key(rt0),
-			    rt0->rt_gateway, rt_mask(rt0), rt0->rt_flags, 0);
-		return EADDRNOTAVAIL;
-	}
-
-	if (rt->rt_gateway == 0 || glen > ROUNDUP(rt->rt_gateway->sa_len)) {
-		old = (caddr_t)rt_key(rt);
-		R_Malloc(new, caddr_t, dlen + glen);
-		if (new == 0)
-			return ENOBUFS;
-		rt->rt_nodes->rn_key = new;
-	} else {
-		new = rt->rt_nodes->rn_key;
-		old = 0;
-	}
-	Bcopy(gate, (rt->rt_gateway = (struct sockaddr *)(new + dlen)), glen);
-	if (old) {
-		Bcopy(dst, new, dlen);
-		Free(old);
-	}
-	if (rt->rt_gwroute) {
-		rt = rt->rt_gwroute; RTFREE(rt);
-		rt = rt0; rt->rt_gwroute = 0;
-	}
-	/*
-	 * Cloning loop avoidance:
-	 * In the presence of protocol-cloning and bad configuration,
-	 * it is possible to get stuck in bottomless mutual recursion
-	 * (rtrequest rt_setgate rtalloc1).  We avoid this by not allowing
-	 * protocol-cloning to operate for gateways (which is probably the
-	 * correct choice anyway), and avoid the resulting reference loops
-	 * by disallowing any route to run through itself as a gateway.
-	 * This is obviuosly mandatory when we get rt->rt_output().
-	 */
-	if (rt->rt_flags & RTF_GATEWAY) {
-		rt->rt_gwroute = rtalloc1(gate, 1, RTF_PRCLONING);
-		if (rt->rt_gwroute == rt) {
-			RTFREE(rt->rt_gwroute);
-			rt->rt_gwroute = 0;
-			return EDQUOT; /* failure */
-		}
-	}
-
-	/*
-	 * This isn't going to do anything useful for host routes, so
-	 * don't bother.  Also make sure we have a reasonable mask
-	 * (we don't yet have one during adds).
-	 */
-	if (!(rt->rt_flags & RTF_HOST) && rt_mask(rt) != 0) {
-		struct rtfc_arg arg;
-		arg.rnh = rnh;
-		arg.rt0 = rt;
-		rnh->rnh_walktree_from(rnh, rt_key(rt), rt_mask(rt),
-				       rt_fixchange, &arg);
-	}
-
-	return 0;
-}
-
-static void
-rt_maskedcopy(src, dst, netmask)
-	struct sockaddr *src, *dst, *netmask;
-{
-	register u_char *cp1 = (u_char *)src;
-	register u_char *cp2 = (u_char *)dst;
-	register u_char *cp3 = (u_char *)netmask;
-	u_char *cplim = cp2 + *cp3;
-	u_char *cplim2 = cp2 + *cp1;
-
-	*cp2++ = *cp1++; *cp2++ = *cp1++; /* copies sa_len & sa_family */
-	cp3 += 2;
-	if (cplim > cplim2)
-		cplim = cplim2;
-	while (cp2 < cplim)
-		*cp2++ = *cp1++ & *cp3++;
-	if (cp2 < cplim2)
-		bzero((caddr_t)cp2, (unsigned)(cplim2 - cp2));
-}
-
-/*
- * Set up a routing table entry, normally
- * for an interface.
- */
-int
-rtinit(ifa, cmd, flags)
-	register struct ifaddr *ifa;
-	int cmd, flags;
-{
-	register struct rtentry *rt;
-	register struct sockaddr *dst;
-	register struct sockaddr *deldst;
-	struct mbuf *m = 0;
-	struct rtentry *nrt = 0;
-	int error;
-
-	dst = flags & RTF_HOST ? ifa->ifa_dstaddr : ifa->ifa_addr;
-	/*
-	 * If it's a delete, check that if it exists, it's on the correct
-	 * interface or we might scrub a route to another ifa which would
-	 * be confusing at best and possibly worse.
-	 */
-	if (cmd == RTM_DELETE) {
-		/* 
-		 * It's a delete, so it should already exist..
-		 * If it's a net, mask off the host bits
-		 * (Assuming we have a mask)
-		 */
-		if ((flags & RTF_HOST) == 0 && ifa->ifa_netmask) {
-			m = m_get(M_WAIT, MT_SONAME);
-			deldst = mtod(m, struct sockaddr *);
-			rt_maskedcopy(dst, deldst, ifa->ifa_netmask);
-			dst = deldst;
-		}
-		/*
-		 * Get an rtentry that is in the routing tree and
-		 * contains the correct info. (if this fails we can't get there).
-		 * We set "report" to FALSE so that if it doesn't exist,
-		 * it doesn't report an error or clone a route, etc. etc.
-		 */
-		rt = rtalloc1(dst, 0, 0UL);
-		if (rt) {
-			/*
-			 * Ok so we found the rtentry. it has an extra reference
-			 * for us at this stage. we won't need that so
-			 * lop that off now.
-			 */
-			rt->rt_refcnt--;
-			if (rt->rt_ifa != ifa) {
-				/*
-				 * If the interface in the rtentry doesn't match
-				 * the interface we are using, then we don't
-				 * want to delete it, so return an error.
-				 * This seems to be the only point of 
-				 * this whole RTM_DELETE clause.
-				 */
-				if (m)
-					(void) m_free(m);
-				return (flags & RTF_HOST ? EHOSTUNREACH
-							: ENETUNREACH);
-			}
-		}
-		/* XXX */
-#if 0
-		else {
-			/* 
-			 * One would think that as we are deleting, and we know
-			 * it doesn't exist, we could just return at this point
-			 * with an "ELSE" clause, but apparently not..
-			 */
-			return (flags & RTF_HOST ? EHOSTUNREACH
-							: ENETUNREACH);
-		}
-#endif
-	}
-	/*
-	 * Do the actual request
-	 */
-	error = rtrequest(cmd, dst, ifa->ifa_addr, ifa->ifa_netmask,
-			flags | ifa->ifa_flags, &nrt);
-	if (m)
-		(void) m_free(m);
-	/*
-	 * If we are deleting, and we found an entry, then
-	 * it's been removed from the tree.. now throw it away.
-	 */
-	if (cmd == RTM_DELETE && error == 0 && (rt = nrt)) {
-		/*
-		 * notify any listenning routing agents of the change
-		 */
-		rt_newaddrmsg(cmd, ifa, error, nrt);
-		if (rt->rt_refcnt <= 0) {
-			rt->rt_refcnt++; /* need a 1->0 transition to free */
-			rtfree(rt);
-		}
-	}
-
-	/*
-	 * We are adding, and we have a returned routing entry.
-	 * We need to sanity check the result.
-	 */
-	if (cmd == RTM_ADD && error == 0 && (rt = nrt)) {
-		/*
-		 * We just wanted to add it.. we don't actually need a reference
-		 */
-		rt->rt_refcnt--;
-		/*
-		 * If it came back with an unexpected interface, then it must 
-		 * have already existed or something. (XXX)
-		 */
-		if (rt->rt_ifa != ifa) {
-			printf("rtinit: wrong ifa (%p) was (%p)\n", ifa,
-				rt->rt_ifa);
-			/*
-			 * Ask that the route we got back be removed
-			 * from the routing tables as we are trying
-			 * to supersede it.
-			 */
-			if (rt->rt_ifa->ifa_rtrequest)
-			    rt->rt_ifa->ifa_rtrequest(RTM_DELETE, rt, SA(0));
-			/* 
-			 * Remove the referenve to the it's ifaddr.
-			 */
-			IFAFREE(rt->rt_ifa);
-			/*
-			 * And substitute in references to the ifaddr
-			 * we are adding.
-			 */
-			rt->rt_ifa = ifa;
-			rt->rt_ifp = ifa->ifa_ifp;
-			ifa->ifa_refcnt++;
-			/*
-			 * Now add it to the routing table
-			 * XXX could we have just left it?
-			 * as it might have been in the right place..
-			 */
-			if (ifa->ifa_rtrequest)
-			    ifa->ifa_rtrequest(RTM_ADD, rt, SA(0));
-		}
-		/*
-		 * notify any listenning routing agents of the change
-		 */
-		rt_newaddrmsg(cmd, ifa, error, nrt);
-	}
-	return (error);
-}
diff --git a/cpukit/libnetworking/net/route.h b/cpukit/libnetworking/net/route.h
deleted file mode 100644
index 69d76909fc..0000000000
--- a/cpukit/libnetworking/net/route.h
+++ /dev/null
@@ -1,284 +0,0 @@
-/*
- * Copyright (c) 1980, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)route.h	8.3 (Berkeley) 4/19/94
- * $Id$
- */
-
-#ifndef _NET_ROUTE_H_
-#define _NET_ROUTE_H_
-
-/*
- * Kernel resident routing tables.
- *
- * The routing tables are initialized when interface addresses
- * are set by making entries for all directly connected interfaces.
- */
-
-/*
- * A route consists of a destination address and a reference
- * to a routing entry.  These are often held by protocols
- * in their control blocks, e.g. inpcb.
- */
-struct route {
-	struct	rtentry *ro_rt;
-	struct	sockaddr ro_dst;
-};
-
-/*
- * These numbers are used by reliable protocols for determining
- * retransmission behavior and are included in the routing structure.
- */
-struct rt_metrics {
-	u_long	rmx_locks;	/* Kernel must leave these values alone */
-	u_long	rmx_mtu;	/* MTU for this path */
-	u_long	rmx_hopcount;	/* max hops expected */
-	u_long	rmx_expire;	/* lifetime for route, e.g. redirect */
-	u_long	rmx_recvpipe;	/* inbound delay-bandwidth product */
-	u_long	rmx_sendpipe;	/* outbound delay-bandwidth product */
-	u_long	rmx_ssthresh;	/* outbound gateway buffer limit */
-	u_long	rmx_rtt;	/* estimated round trip time */
-	u_long	rmx_rttvar;	/* estimated rtt variance */
-	u_long	rmx_pksent;	/* packets sent using this route */
-	u_long	rmx_filler[4];	/* will be used for T/TCP later */
-};
-
-/*
- * rmx_rtt and rmx_rttvar are stored as microseconds;
- * RTTTOPRHZ(rtt) converts to a value suitable for use
- * by a protocol slowtimo counter.
- */
-#define	RTM_RTTUNIT	1000000	/* units for rtt, rttvar, as units per sec */
-#define	RTTTOPRHZ(r)	((r) / (RTM_RTTUNIT / PR_SLOWHZ))
-
-/*
- * XXX kernel function pointer `rt_output' is visible to applications.
- */
-struct mbuf;
-
-/*
- * We distinguish between routes to hosts and routes to networks,
- * preferring the former if available.  For each route we infer
- * the interface to use from the gateway address supplied when
- * the route was entered.  Routes that forward packets through
- * gateways are marked so that the output routines know to address the
- * gateway rather than the ultimate destination.
- */
-#ifndef RNF_NORMAL
-#include <net/radix.h>
-#endif
-struct rtentry {
-	struct	radix_node rt_nodes[2];	/* tree glue, and other values */
-#define	rt_key(r)	((struct sockaddr *)((r)->rt_nodes->rn_key))
-#define	rt_mask(r)	((struct sockaddr *)((r)->rt_nodes->rn_mask))
-	struct	sockaddr *rt_gateway;	/* value */
-	short	rt_filler;		/* was short flags field */
-	short	rt_refcnt;		/* # held references */
-	u_long	rt_flags;		/* up/down?, host/net */
-	struct	ifnet *rt_ifp;		/* the answer: interface to use */
-	struct	ifaddr *rt_ifa;		/* the answer: interface to use */
-	struct	sockaddr *rt_genmask;	/* for generation of cloned routes */
-	caddr_t	rt_llinfo;		/* pointer to link level info cache */
-	struct	rt_metrics rt_rmx;	/* metrics used by rx'ing protocols */
-	struct	rtentry *rt_gwroute;	/* implied entry for gatewayed routes */
-	int	(*rt_output) __P((struct ifnet *, struct mbuf *,
-				  struct sockaddr *, struct rtentry *));
-					/* output routine for this (rt,if) */
-	struct	rtentry *rt_parent; 	/* cloning parent of this route */
-	void	*rt_filler2;		/* more filler */
-};
-
-/*
- * Following structure necessary for 4.3 compatibility;
- * We should eventually move it to a compat file.
- */
-struct ortentry {
-	u_long	rt_hash;		/* to speed lookups */
-	struct	sockaddr rt_dst;	/* key */
-	struct	sockaddr rt_gateway;	/* value */
-	short	rt_flags;		/* up/down?, host/net */
-	short	rt_refcnt;		/* # held references */
-	u_long	rt_use;			/* raw # packets forwarded */
-	struct	ifnet *rt_ifp;		/* the answer: interface to use */
-};
-
-#define rt_use rt_rmx.rmx_pksent
-
-#define	RTF_UP		0x1		/* route usable */
-#define	RTF_GATEWAY	0x2		/* destination is a gateway */
-#define	RTF_HOST	0x4		/* host entry (net otherwise) */
-#define	RTF_REJECT	0x8		/* host or net unreachable */
-#define	RTF_DYNAMIC	0x10		/* created dynamically (by redirect) */
-#define	RTF_MODIFIED	0x20		/* modified dynamically (by redirect) */
-#define RTF_DONE	0x40		/* message confirmed */
-/*			0x80		   unused */
-#define RTF_CLONING	0x100		/* generate new routes on use */
-#define RTF_XRESOLVE	0x200		/* external daemon resolves name */
-#define RTF_LLINFO	0x400		/* generated by link layer (e.g. ARP) */
-#define RTF_STATIC	0x800		/* manually added */
-#define RTF_BLACKHOLE	0x1000		/* just discard pkts (during updates) */
-#define RTF_PROTO2	0x4000		/* protocol specific routing flag */
-#define RTF_PROTO1	0x8000		/* protocol specific routing flag */
-
-#define RTF_PRCLONING	0x10000		/* protocol requires cloning */
-#define RTF_WASCLONED	0x20000		/* route generated through cloning */
-#define RTF_PROTO3	0x40000		/* protocol specific routing flag */
-/*			0x80000		   unused */
-#define RTF_PINNED	0x100000	/* future use */
-#define	RTF_LOCAL	0x200000 	/* route represents a local address */
-#define	RTF_BROADCAST	0x400000	/* route represents a bcast address */
-#define	RTF_MULTICAST	0x800000	/* route represents a mcast address */
-					/* 0x1000000 and up unassigned */
-
-/*
- * Routing statistics.
- */
-struct	rtstat {
-	short	rts_badredirect;	/* bogus redirect calls */
-	short	rts_dynamic;		/* routes created by redirects */
-	short	rts_newgateway;		/* routes modified by redirects */
-	short	rts_unreach;		/* lookups which failed */
-	short	rts_wildcard;		/* lookups satisfied by a wildcard */
-};
-/*
- * Structures for routing messages.
- */
-struct rt_msghdr {
-	u_short	rtm_msglen;	/* to skip over non-understood messages */
-	u_char	rtm_version;	/* future binary compatibility */
-	u_char	rtm_type;	/* message type */
-	u_short	rtm_index;	/* index for associated ifp */
-	int	rtm_flags;	/* flags, incl. kern & message, e.g. DONE */
-	int	rtm_addrs;	/* bitmask identifying sockaddrs in msg */
-	pid_t	rtm_pid;	/* identify sender */
-	int	rtm_seq;	/* for sender to identify action */
-	int	rtm_errno;	/* why failed */
-	int	rtm_use;	/* from rtentry */
-	u_long	rtm_inits;	/* which metrics we are initializing */
-	struct	rt_metrics rtm_rmx; /* metrics themselves */
-};
-
-#define RTM_VERSION	5	/* Up the ante and ignore older versions */
-
-#define RTM_ADD		0x1	/* Add Route */
-#define RTM_DELETE	0x2	/* Delete Route */
-#define RTM_CHANGE	0x3	/* Change Metrics or flags */
-#define RTM_GET		0x4	/* Report Metrics */
-#define RTM_LOSING	0x5	/* Kernel Suspects Partitioning */
-#define RTM_REDIRECT	0x6	/* Told to use different route */
-#define RTM_MISS	0x7	/* Lookup failed on this address */
-#define RTM_LOCK	0x8	/* fix specified metrics */
-#define RTM_OLDADD	0x9	/* caused by SIOCADDRT */
-#define RTM_OLDDEL	0xa	/* caused by SIOCDELRT */
-#define RTM_RESOLVE	0xb	/* req to resolve dst to LL addr */
-#define RTM_NEWADDR	0xc	/* address being added to iface */
-#define RTM_DELADDR	0xd	/* address being removed from iface */
-#define RTM_IFINFO	0xe	/* iface going up/down etc. */
-
-#define RTV_MTU		0x1	/* init or lock _mtu */
-#define RTV_HOPCOUNT	0x2	/* init or lock _hopcount */
-#define RTV_EXPIRE	0x4	/* init or lock _hopcount */
-#define RTV_RPIPE	0x8	/* init or lock _recvpipe */
-#define RTV_SPIPE	0x10	/* init or lock _sendpipe */
-#define RTV_SSTHRESH	0x20	/* init or lock _ssthresh */
-#define RTV_RTT		0x40	/* init or lock _rtt */
-#define RTV_RTTVAR	0x80	/* init or lock _rttvar */
-
-/*
- * Bitmask values for rtm_addr.
- */
-#define RTA_DST		0x1	/* destination sockaddr present */
-#define RTA_GATEWAY	0x2	/* gateway sockaddr present */
-#define RTA_NETMASK	0x4	/* netmask sockaddr present */
-#define RTA_GENMASK	0x8	/* cloning mask sockaddr present */
-#define RTA_IFP		0x10	/* interface name sockaddr present */
-#define RTA_IFA		0x20	/* interface addr sockaddr present */
-#define RTA_AUTHOR	0x40	/* sockaddr for author of redirect */
-#define RTA_BRD		0x80	/* for NEWADDR, broadcast or p-p dest addr */
-
-/*
- * Index offsets for sockaddr array for alternate internal encoding.
- */
-#define RTAX_DST	0	/* destination sockaddr present */
-#define RTAX_GATEWAY	1	/* gateway sockaddr present */
-#define RTAX_NETMASK	2	/* netmask sockaddr present */
-#define RTAX_GENMASK	3	/* cloning mask sockaddr present */
-#define RTAX_IFP	4	/* interface name sockaddr present */
-#define RTAX_IFA	5	/* interface addr sockaddr present */
-#define RTAX_AUTHOR	6	/* sockaddr for author of redirect */
-#define RTAX_BRD	7	/* for NEWADDR, broadcast or p-p dest addr */
-#define RTAX_MAX	8	/* size of array to allocate */
-
-struct rt_addrinfo {
-	int	rti_addrs;
-	struct	sockaddr *rti_info[RTAX_MAX];
-};
-
-struct route_cb {
-	int	ip_count;
-	int	ipx_count;
-	int	ns_count;
-	int	iso_count;
-	int	any_count;
-};
-
-#ifdef KERNEL
-#define	RTFREE(rt) \
-	if ((rt)->rt_refcnt <= 1) \
-		rtfree(rt); \
-	else \
-		(rt)->rt_refcnt--;
-
-extern struct route_cb route_cb;
-extern struct rtstat rtstat;
-extern struct radix_node_head *rt_tables[AF_MAX+1];
-
-void	 route_init __P((void));
-void	 rt_ifmsg __P((struct ifnet *));
-void	 rt_missmsg __P((int, struct rt_addrinfo *, int, int));
-void	 rt_newaddrmsg __P((int, struct ifaddr *, int, struct rtentry *));
-int	 rt_setgate __P((struct rtentry *,
-	    struct sockaddr *, struct sockaddr *));
-void	 rtalloc __P((struct route *));
-void	 rtalloc_ign __P((struct route *, unsigned long));
-struct rtentry *
-	 rtalloc1 __P((struct sockaddr *, int, unsigned long));
-void	 rtfree __P((struct rtentry *));
-int	 rtinit __P((struct ifaddr *, int, int));
-int	 rtioctl __P((int, caddr_t, struct proc *));
-void	 rtredirect __P((struct sockaddr *, struct sockaddr *,
-	    struct sockaddr *, int, struct sockaddr *, struct rtentry **));
-int	 rtrequest __P((int, struct sockaddr *,
-	    struct sockaddr *, struct sockaddr *, int, struct rtentry **));
-#endif
-
-#endif
diff --git a/cpukit/libnetworking/net/rtsock.c b/cpukit/libnetworking/net/rtsock.c
deleted file mode 100644
index 57e777906a..0000000000
--- a/cpukit/libnetworking/net/rtsock.c
+++ /dev/null
@@ -1,829 +0,0 @@
-/*
- * Copyright (c) 1988, 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)rtsock.c	8.5 (Berkeley) 11/2/94
- *	$Id$
- */
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/sysctl.h>
-#include <sys/proc.h>
-#include <sys/mbuf.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/domain.h>
-#include <sys/protosw.h>
-
-#include <net/if.h>
-#include <net/route.h>
-#include <net/raw_cb.h>
-
-static struct	sockaddr route_dst = { 2, PF_ROUTE, };
-static struct	sockaddr route_src = { 2, PF_ROUTE, };
-static struct	sockaddr sa_zero   = { sizeof(sa_zero), AF_INET, };
-static struct	sockproto route_proto = { PF_ROUTE, };
-
-struct walkarg {
-	int	w_tmemsize;
-	int	w_op, w_arg;
-	caddr_t	w_tmem;
-	struct sysctl_req *w_req;
-};
-
-static struct mbuf *
-		rt_msg1 __P((int, struct rt_addrinfo *));
-static int	rt_msg2 __P((int,
-		    struct rt_addrinfo *, caddr_t, struct walkarg *));
-static int	rt_xaddrs __P((caddr_t, caddr_t, struct rt_addrinfo *));
-static int	sysctl_dumpentry __P((struct radix_node *rn, void *vw));
-static int	sysctl_iflist __P((int af, struct walkarg *w));
-static int	 route_output __P((struct mbuf *, struct socket *));
-static int	 route_usrreq __P((struct socket *,
-	    int, struct mbuf *, struct mbuf *, struct mbuf *));
-static void	 rt_setmetrics __P((u_long, struct rt_metrics *, struct rt_metrics *));
-
-/* Sleazy use of local variables throughout file, warning!!!! */
-#define dst	info.rti_info[RTAX_DST]
-#define gate	info.rti_info[RTAX_GATEWAY]
-#define netmask	info.rti_info[RTAX_NETMASK]
-#define genmask	info.rti_info[RTAX_GENMASK]
-#define ifpaddr	info.rti_info[RTAX_IFP]
-#define ifaaddr	info.rti_info[RTAX_IFA]
-#define brdaddr	info.rti_info[RTAX_BRD]
-
-/*ARGSUSED*/
-static int
-route_usrreq(so, req, m, nam, control)
-	register struct socket *so;
-	int req;
-	struct mbuf *m, *nam, *control;
-{
-	register int error = 0;
-	register struct rawcb *rp = sotorawcb(so);
-	int s;
-
-	if (req == PRU_ATTACH) {
-		MALLOC(rp, struct rawcb *, sizeof(*rp), M_PCB, M_WAITOK);
-		so->so_pcb = (caddr_t)rp;
-		if (so->so_pcb)
-			bzero(so->so_pcb, sizeof(*rp));
-	}
-	if (req == PRU_DETACH && rp) {
-		int af = rp->rcb_proto.sp_protocol;
-		if (af == AF_INET)
-			route_cb.ip_count--;
-		else if (af == AF_IPX)
-			route_cb.ipx_count--;
-		else if (af == AF_NS)
-			route_cb.ns_count--;
-		else if (af == AF_ISO)
-			route_cb.iso_count--;
-		route_cb.any_count--;
-	}
-	s = splnet();
-	error = raw_usrreq(so, req, m, nam, control);
-	rp = sotorawcb(so);
-	if (req == PRU_ATTACH && rp) {
-		int af = rp->rcb_proto.sp_protocol;
-		if (error) {
-			free((caddr_t)rp, M_PCB);
-			splx(s);
-			return (error);
-		}
-		if (af == AF_INET)
-			route_cb.ip_count++;
-		else if (af == AF_IPX)
-			route_cb.ipx_count++;
-		else if (af == AF_NS)
-			route_cb.ns_count++;
-		else if (af == AF_ISO)
-			route_cb.iso_count++;
-		rp->rcb_faddr = &route_src;
-		route_cb.any_count++;
-		soisconnected(so);
-		so->so_options |= SO_USELOOPBACK;
-	}
-	splx(s);
-	return (error);
-}
-
-/*ARGSUSED*/
-static int
-route_output(m, so)
-	register struct mbuf *m;
-	struct socket *so;
-{
-	register struct rt_msghdr *rtm = 0;
-	register struct rtentry *rt = 0;
-	struct rtentry *saved_nrt = 0;
-	struct radix_node_head *rnh;
-	struct rt_addrinfo info;
-	int len, error = 0;
-	struct ifnet *ifp = 0;
-	struct ifaddr *ifa = 0;
-
-#define senderr(e) { error = e; goto flush;}
-	if (m == 0 || ((m->m_len < sizeof(long)) &&
-		       (m = m_pullup(m, sizeof(long))) == 0))
-		return (ENOBUFS);
-	if ((m->m_flags & M_PKTHDR) == 0)
-		panic("route_output");
-	len = m->m_pkthdr.len;
-	if (len < sizeof(*rtm) ||
-	    len != mtod(m, struct rt_msghdr *)->rtm_msglen) {
-		dst = 0;
-		senderr(EINVAL);
-	}
-	R_Malloc(rtm, struct rt_msghdr *, len);
-	if (rtm == 0) {
-		dst = 0;
-		senderr(ENOBUFS);
-	}
-	m_copydata(m, 0, len, (caddr_t)rtm);
-	if (rtm->rtm_version != RTM_VERSION) {
-		dst = 0;
-		senderr(EPROTONOSUPPORT);
-	}
-	info.rti_addrs = rtm->rtm_addrs;
-	if (rt_xaddrs((caddr_t)(rtm + 1), len + (caddr_t)rtm, &info)) {
-		dst = 0;
-		senderr(EINVAL);
-	}
-	if (dst == 0 || (dst->sa_family >= AF_MAX)
-	    || (gate != 0 && (gate->sa_family >= AF_MAX)))
-		senderr(EINVAL);
-	if (genmask) {
-		struct radix_node *t;
-		t = rn_addmask((caddr_t)genmask, 0, 1);
-		if (t && Bcmp(genmask, t->rn_key, *(u_char *)genmask) == 0)
-			genmask = (struct sockaddr *)(t->rn_key);
-		else
-			senderr(ENOBUFS);
-	}
-	switch (rtm->rtm_type) {
-
-	case RTM_ADD:
-		if (gate == 0)
-			senderr(EINVAL);
-		error = rtrequest(RTM_ADD, dst, gate, netmask,
-					rtm->rtm_flags, &saved_nrt);
-		if (error == 0 && saved_nrt) {
-			rt_setmetrics(rtm->rtm_inits,
-				&rtm->rtm_rmx, &saved_nrt->rt_rmx);
-			saved_nrt->rt_rmx.rmx_locks &= ~(rtm->rtm_inits);
-			saved_nrt->rt_rmx.rmx_locks |=
-				(rtm->rtm_inits & rtm->rtm_rmx.rmx_locks);
-			saved_nrt->rt_refcnt--;
-			saved_nrt->rt_genmask = genmask;
-		}
-		break;
-
-	case RTM_DELETE:
-		error = rtrequest(RTM_DELETE, dst, gate, netmask,
-				rtm->rtm_flags, &saved_nrt);
-		if (error == 0) {
-			if ((rt = saved_nrt))
-				rt->rt_refcnt++;
-			goto report;
-		}
-		break;
-
-	case RTM_GET:
-	case RTM_CHANGE:
-	case RTM_LOCK:
-		if ((rnh = rt_tables[dst->sa_family]) == 0) {
-			senderr(EAFNOSUPPORT);
-		} else if ((rt = (struct rtentry *)
-				rnh->rnh_lookup(dst, netmask, rnh)))
-			rt->rt_refcnt++;
-		else
-			senderr(ESRCH);
-		switch(rtm->rtm_type) {
-
-		case RTM_GET:
-		report:
-			dst = rt_key(rt);
-			gate = rt->rt_gateway;
-			netmask = rt_mask(rt);
-			genmask = rt->rt_genmask;
-			if (rtm->rtm_addrs & (RTA_IFP | RTA_IFA)) {
-				ifp = rt->rt_ifp;
-				if (ifp) {
-					ifpaddr = ifp->if_addrlist->ifa_addr;
-					ifaaddr = rt->rt_ifa->ifa_addr;
-					rtm->rtm_index = ifp->if_index;
-				} else {
-					ifpaddr = 0;
-					ifaaddr = 0;
-			    }
-			}
-			len = rt_msg2(rtm->rtm_type, &info, (caddr_t)0,
-				(struct walkarg *)0);
-			if (len > rtm->rtm_msglen) {
-				struct rt_msghdr *new_rtm;
-				R_Malloc(new_rtm, struct rt_msghdr *, len);
-				if (new_rtm == 0)
-					senderr(ENOBUFS);
-				Bcopy(rtm, new_rtm, rtm->rtm_msglen);
-				Free(rtm); rtm = new_rtm;
-			}
-			(void)rt_msg2(rtm->rtm_type, &info, (caddr_t)rtm,
-				(struct walkarg *)0);
-			rtm->rtm_flags = rt->rt_flags;
-			rtm->rtm_rmx = rt->rt_rmx;
-			rtm->rtm_addrs = info.rti_addrs;
-			break;
-
-		case RTM_CHANGE:
-			if (gate && (error = rt_setgate(rt, rt_key(rt), gate)))
-				senderr(error);
-
-			/*
-			 * If they tried to change things but didn't specify
-			 * the required gateway, then just use the old one.
-			 * This can happen if the user tries to change the
-			 * flags on the default route without changing the
-			 * default gateway.  Changing flags still doesn't work.
-			 */
-			if ((rt->rt_flags & RTF_GATEWAY) && !gate)
-				gate = rt->rt_gateway;
-
-			/* new gateway could require new ifaddr, ifp;
-			   flags may also be different; ifp may be specified
-			   by ll sockaddr when protocol address is ambiguous */
-			if (ifpaddr && (ifa = ifa_ifwithnet(ifpaddr)) &&
-			    (ifp = ifa->ifa_ifp) && (ifaaddr || gate))
-				ifa = ifaof_ifpforaddr(ifaaddr ? ifaaddr : gate,
-							ifp);
-			else if ((ifaaddr && (ifa = ifa_ifwithaddr(ifaaddr))) ||
-				 (gate && (ifa = ifa_ifwithroute(rt->rt_flags,
-							rt_key(rt), gate))))
-				ifp = ifa->ifa_ifp;
-			if (ifa) {
-				register struct ifaddr *oifa = rt->rt_ifa;
-				if (oifa != ifa) {
-				    if (oifa && oifa->ifa_rtrequest)
-					oifa->ifa_rtrequest(RTM_DELETE,
-								rt, gate);
-				    IFAFREE(rt->rt_ifa);
-				    rt->rt_ifa = ifa;
-				    ifa->ifa_refcnt++;
-				    rt->rt_ifp = ifp;
-				}
-			}
-			rt_setmetrics(rtm->rtm_inits, &rtm->rtm_rmx,
-					&rt->rt_rmx);
-			if (rt->rt_ifa && rt->rt_ifa->ifa_rtrequest)
-			       rt->rt_ifa->ifa_rtrequest(RTM_ADD, rt, gate);
-			if (genmask)
-				rt->rt_genmask = genmask;
-			/*
-			 * Fall into
-			 */
-		case RTM_LOCK:
-			rt->rt_rmx.rmx_locks &= ~(rtm->rtm_inits);
-			rt->rt_rmx.rmx_locks |=
-				(rtm->rtm_inits & rtm->rtm_rmx.rmx_locks);
-			break;
-		}
-		break;
-
-	default:
-		senderr(EOPNOTSUPP);
-	}
-
-flush:
-	if (rtm) {
-		if (error)
-			rtm->rtm_errno = error;
-		else
-			rtm->rtm_flags |= RTF_DONE;
-	}
-	if (rt)
-		rtfree(rt);
-    {
-	register struct rawcb *rp = 0;
-	/*
-	 * Check to see if we don't want our own messages.
-	 */
-	if ((so->so_options & SO_USELOOPBACK) == 0) {
-		if (route_cb.any_count <= 1) {
-			if (rtm)
-				Free(rtm);
-			m_freem(m);
-			return (error);
-		}
-		/* There is another listener, so construct message */
-		rp = sotorawcb(so);
-	}
-	if (rtm) {
-		m_copyback(m, 0, rtm->rtm_msglen, (caddr_t)rtm);
-		Free(rtm);
-	}
-	if (rp)
-		rp->rcb_proto.sp_family = 0; /* Avoid us */
-	if (dst)
-		route_proto.sp_protocol = dst->sa_family;
-	raw_input(m, &route_proto, &route_src, &route_dst);
-	if (rp)
-		rp->rcb_proto.sp_family = PF_ROUTE;
-    }
-	return (error);
-}
-
-static void
-rt_setmetrics(which, in, out)
-	u_long which;
-	register struct rt_metrics *in, *out;
-{
-#define metric(f, e) if (which & (f)) out->e = in->e;
-	metric(RTV_RPIPE, rmx_recvpipe);
-	metric(RTV_SPIPE, rmx_sendpipe);
-	metric(RTV_SSTHRESH, rmx_ssthresh);
-	metric(RTV_RTT, rmx_rtt);
-	metric(RTV_RTTVAR, rmx_rttvar);
-	metric(RTV_HOPCOUNT, rmx_hopcount);
-	metric(RTV_MTU, rmx_mtu);
-	metric(RTV_EXPIRE, rmx_expire);
-#undef metric
-}
-
-#define ROUNDUP(a) \
-	((a) > 0 ? (1 + (((a) - 1) | (sizeof(long) - 1))) : sizeof(long))
-#define ADVANCE(x, n) (x += ROUNDUP((n)->sa_len))
-
-
-/*
- * Extract the addresses of the passed sockaddrs.
- * Do a little sanity checking so as to avoid bad memory references.
- * This data is derived straight from userland.
- */
-static int
-rt_xaddrs(cp, cplim, rtinfo)
-	register caddr_t cp, cplim;
-	register struct rt_addrinfo *rtinfo;
-{
-	register struct sockaddr *sa;
-	register int i;
-
-	bzero(rtinfo->rti_info, sizeof(rtinfo->rti_info));
-	for (i = 0; (i < RTAX_MAX) && (cp < cplim); i++) {
-		if ((rtinfo->rti_addrs & (1 << i)) == 0)
-			continue;
-		sa = (struct sockaddr *)cp;
-		/*
-		 * It won't fit.
-		 */
-		if ( (cp + sa->sa_len) > cplim ) {
-			return (EINVAL);
-		}
-
-		/*
-		 * there are no more.. quit now
-		 * If there are more bits, they are in error.
-		 * I've seen this. route(1) can evidently generate these. 
-		 * This causes kernel to core dump.
-		 * for compatibility, If we see this, point to a safe address.
-		 */
-		if (sa->sa_len == 0) {
-			rtinfo->rti_info[i] = &sa_zero;
-			return (0); /* should be EINVAL but for compat */
-		}
-
-		/* accept it */
-		rtinfo->rti_info[i] = sa;
-		ADVANCE(cp, sa);
-	}
-	return (0);
-}
-
-static struct mbuf *
-rt_msg1(type, rtinfo)
-	int type;
-	register struct rt_addrinfo *rtinfo;
-{
-	register struct rt_msghdr *rtm;
-	register struct mbuf *m;
-	register int i;
-	register struct sockaddr *sa;
-	int len, dlen;
-
-	m = m_gethdr(M_DONTWAIT, MT_DATA);
-	if (m == 0)
-		return (m);
-	switch (type) {
-
-	case RTM_DELADDR:
-	case RTM_NEWADDR:
-		len = sizeof(struct ifa_msghdr);
-		break;
-
-	case RTM_IFINFO:
-		len = sizeof(struct if_msghdr);
-		break;
-
-	default:
-		len = sizeof(struct rt_msghdr);
-	}
-	if (len > MHLEN)
-		panic("rt_msg1");
-	m->m_pkthdr.len = m->m_len = len;
-	m->m_pkthdr.rcvif = 0;
-	rtm = mtod(m, struct rt_msghdr *);
-	bzero((caddr_t)rtm, len);
-	for (i = 0; i < RTAX_MAX; i++) {
-		if ((sa = rtinfo->rti_info[i]) == NULL)
-			continue;
-		rtinfo->rti_addrs |= (1 << i);
-		dlen = ROUNDUP(sa->sa_len);
-		m_copyback(m, len, dlen, (caddr_t)sa);
-		len += dlen;
-	}
-	if (m->m_pkthdr.len != len) {
-		m_freem(m);
-		return (NULL);
-	}
-	rtm->rtm_msglen = len;
-	rtm->rtm_version = RTM_VERSION;
-	rtm->rtm_type = type;
-	return (m);
-}
-
-static int
-rt_msg2(type, rtinfo, cp, w)
-	int type;
-	register struct rt_addrinfo *rtinfo;
-	caddr_t cp;
-	struct walkarg *w;
-{
-	register int i;
-	int len, dlen, second_time = 0;
-	caddr_t cp0;
-
-	rtinfo->rti_addrs = 0;
-again:
-	switch (type) {
-
-	case RTM_DELADDR:
-	case RTM_NEWADDR:
-		len = sizeof(struct ifa_msghdr);
-		break;
-
-	case RTM_IFINFO:
-		len = sizeof(struct if_msghdr);
-		break;
-
-	default:
-		len = sizeof(struct rt_msghdr);
-	}
-	cp0 = cp;
-	if (cp0)
-		cp += len;
-	for (i = 0; i < RTAX_MAX; i++) {
-		register struct sockaddr *sa;
-
-		if ((sa = rtinfo->rti_info[i]) == 0)
-			continue;
-		rtinfo->rti_addrs |= (1 << i);
-		dlen = ROUNDUP(sa->sa_len);
-		if (cp) {
-			bcopy((caddr_t)sa, cp, (unsigned)dlen);
-			cp += dlen;
-		}
-		len += dlen;
-	}
-	if (cp == 0 && w != NULL && !second_time) {
-		register struct walkarg *rw = w;
-
-		if (rw->w_req) {
-			if (rw->w_tmemsize < len) {
-				if (rw->w_tmem)
-					free(rw->w_tmem, M_RTABLE);
-				rw->w_tmem = (caddr_t)
-					malloc(len, M_RTABLE, M_NOWAIT);
-				if (rw->w_tmem)
-					rw->w_tmemsize = len;
-			}
-			if (rw->w_tmem) {
-				cp = rw->w_tmem;
-				second_time = 1;
-				goto again;
-			}
-		}
-	}
-	if (cp) {
-		register struct rt_msghdr *rtm = (struct rt_msghdr *)cp0;
-
-		rtm->rtm_version = RTM_VERSION;
-		rtm->rtm_type = type;
-		rtm->rtm_msglen = len;
-	}
-	return (len);
-}
-
-/*
- * This routine is called to generate a message from the routing
- * socket indicating that a redirect has occured, a routing lookup
- * has failed, or that a protocol has detected timeouts to a particular
- * destination.
- */
-void
-rt_missmsg(type, rtinfo, flags, error)
-	int type, flags, error;
-	register struct rt_addrinfo *rtinfo;
-{
-	register struct rt_msghdr *rtm;
-	register struct mbuf *m;
-	struct sockaddr *sa = rtinfo->rti_info[RTAX_DST];
-
-	if (route_cb.any_count == 0)
-		return;
-	m = rt_msg1(type, rtinfo);
-	if (m == 0)
-		return;
-	rtm = mtod(m, struct rt_msghdr *);
-	rtm->rtm_flags = RTF_DONE | flags;
-	rtm->rtm_errno = error;
-	rtm->rtm_addrs = rtinfo->rti_addrs;
-	route_proto.sp_protocol = sa ? sa->sa_family : 0;
-	raw_input(m, &route_proto, &route_src, &route_dst);
-}
-
-/*
- * This routine is called to generate a message from the routing
- * socket indicating that the status of a network interface has changed.
- */
-void
-rt_ifmsg(ifp)
-	register struct ifnet *ifp;
-{
-	register struct if_msghdr *ifm;
-	struct mbuf *m;
-	struct rt_addrinfo info;
-
-	if (route_cb.any_count == 0)
-		return;
-	bzero((caddr_t)&info, sizeof(info));
-	m = rt_msg1(RTM_IFINFO, &info);
-	if (m == 0)
-		return;
-	ifm = mtod(m, struct if_msghdr *);
-	ifm->ifm_index = ifp->if_index;
-	ifm->ifm_flags = (u_short)ifp->if_flags;
-	ifm->ifm_data = ifp->if_data;
-	ifm->ifm_addrs = 0;
-	route_proto.sp_protocol = 0;
-	raw_input(m, &route_proto, &route_src, &route_dst);
-}
-
-/*
- * This is called to generate messages from the routing socket
- * indicating a network interface has had addresses associated with it.
- * if we ever reverse the logic and replace messages TO the routing
- * socket indicate a request to configure interfaces, then it will
- * be unnecessary as the routing socket will automatically generate
- * copies of it.
- */
-void
-rt_newaddrmsg(cmd, ifa, error, rt)
-	int cmd, error;
-	register struct ifaddr *ifa;
-	register struct rtentry *rt;
-{
-	struct rt_addrinfo info;
-	struct sockaddr *sa = 0;
-	int pass;
-	struct mbuf *m = 0;
-	struct ifnet *ifp = ifa->ifa_ifp;
-
-	if (route_cb.any_count == 0)
-		return;
-	for (pass = 1; pass < 3; pass++) {
-		bzero((caddr_t)&info, sizeof(info));
-		if ((cmd == RTM_ADD && pass == 1) ||
-		    (cmd == RTM_DELETE && pass == 2)) {
-			register struct ifa_msghdr *ifam;
-			int ncmd = cmd == RTM_ADD ? RTM_NEWADDR : RTM_DELADDR;
-
-			ifaaddr = sa = ifa->ifa_addr;
-			ifpaddr = ifp->if_addrlist->ifa_addr;
-			netmask = ifa->ifa_netmask;
-			brdaddr = ifa->ifa_dstaddr;
-			if ((m = rt_msg1(ncmd, &info)) == NULL)
-				continue;
-			ifam = mtod(m, struct ifa_msghdr *);
-			ifam->ifam_index = ifp->if_index;
-			ifam->ifam_metric = ifa->ifa_metric;
-			ifam->ifam_flags = ifa->ifa_flags;
-			ifam->ifam_addrs = info.rti_addrs;
-		}
-		if ((cmd == RTM_ADD && pass == 2) ||
-		    (cmd == RTM_DELETE && pass == 1)) {
-			register struct rt_msghdr *rtm;
-
-			if (rt == 0)
-				continue;
-			netmask = rt_mask(rt);
-			dst = sa = rt_key(rt);
-			gate = rt->rt_gateway;
-			if ((m = rt_msg1(cmd, &info)) == NULL)
-				continue;
-			rtm = mtod(m, struct rt_msghdr *);
-			rtm->rtm_index = ifp->if_index;
-			rtm->rtm_flags |= rt->rt_flags;
-			rtm->rtm_errno = error;
-			rtm->rtm_addrs = info.rti_addrs;
-		}
-		route_proto.sp_protocol = sa ? sa->sa_family : 0;
-		raw_input(m, &route_proto, &route_src, &route_dst);
-	}
-}
-
-
-/*
- * This is used in dumping the kernel table via sysctl().
- */
-int
-sysctl_dumpentry(rn, vw)
-	struct radix_node *rn;
-	void *vw;
-{
-	register struct walkarg *w = vw;
-	register struct rtentry *rt = (struct rtentry *)rn;
-	int error = 0, size;
-	struct rt_addrinfo info;
-
-	if (w->w_op == NET_RT_FLAGS && !(rt->rt_flags & w->w_arg))
-		return 0;
-	bzero((caddr_t)&info, sizeof(info));
-	dst = rt_key(rt);
-	gate = rt->rt_gateway;
-	netmask = rt_mask(rt);
-	genmask = rt->rt_genmask;
-	size = rt_msg2(RTM_GET, &info, 0, w);
-	if (w->w_req && w->w_tmem) {
-		register struct rt_msghdr *rtm = (struct rt_msghdr *)w->w_tmem;
-
-		rtm->rtm_flags = rt->rt_flags;
-		rtm->rtm_use = rt->rt_use;
-		rtm->rtm_rmx = rt->rt_rmx;
-		rtm->rtm_index = rt->rt_ifp->if_index;
-		rtm->rtm_errno = rtm->rtm_pid = rtm->rtm_seq = 0;
-		rtm->rtm_addrs = info.rti_addrs;
-		error = 0;
-		return (error);
-	}
-	return (error);
-}
-
-int
-sysctl_iflist(af, w)
-	int	af;
-	register struct	walkarg *w;
-{
-	register struct ifnet *ifp;
-	register struct ifaddr *ifa;
-	struct	rt_addrinfo info;
-	int	len, error = 0;
-
-	bzero((caddr_t)&info, sizeof(info));
-	for (ifp = ifnet; ifp; ifp = ifp->if_next) {
-		if (w->w_arg && w->w_arg != ifp->if_index)
-			continue;
-		ifa = ifp->if_addrlist;
-		ifpaddr = ifa->ifa_addr;
-		len = rt_msg2(RTM_IFINFO, &info, (caddr_t)0, w);
-		ifpaddr = 0;
-		if (w->w_req && w->w_tmem) {
-			register struct if_msghdr *ifm;
-
-			ifm = (struct if_msghdr *)w->w_tmem;
-			ifm->ifm_index = ifp->if_index;
-			ifm->ifm_flags = (u_short)ifp->if_flags;
-			ifm->ifm_data = ifp->if_data;
-			ifm->ifm_addrs = info.rti_addrs;
-			error =0;
-			if (error)
-				return (error);
-		}
-		while ((ifa = ifa->ifa_next) != 0) {
-			if (af && af != ifa->ifa_addr->sa_family)
-				continue;
-			ifaaddr = ifa->ifa_addr;
-			netmask = ifa->ifa_netmask;
-			brdaddr = ifa->ifa_dstaddr;
-			len = rt_msg2(RTM_NEWADDR, &info, 0, w);
-			if (w->w_req && w->w_tmem) {
-				register struct ifa_msghdr *ifam;
-
-				ifam = (struct ifa_msghdr *)w->w_tmem;
-				ifam->ifam_index = ifa->ifa_ifp->if_index;
-				ifam->ifam_flags = ifa->ifa_flags;
-				ifam->ifam_metric = ifa->ifa_metric;
-				ifam->ifam_addrs = info.rti_addrs;
-				error = 0;
-				if (error)
-					return (error);
-			}
-		}
-		ifaaddr = netmask = brdaddr = 0;
-	}
-	return (0);
-}
-
-static int
-sysctl_rtsock SYSCTL_HANDLER_ARGS
-{
-	int	*name = (int *)arg1;
-	u_int	namelen = arg2;
-	register struct radix_node_head *rnh;
-	int	i, s, error = EINVAL;
-	u_char  af;
-	struct	walkarg w;
-
-	name ++;
-	namelen--;
-	if (req->newptr)
-		return (EPERM);
-	if (namelen != 3)
-		return (EINVAL);
-	af = name[0];
-	Bzero(&w, sizeof(w));
-	w.w_op = name[1];
-	w.w_arg = name[2];
-	w.w_req = req;
-
-	s = splnet();
-	switch (w.w_op) {
-
-	case NET_RT_DUMP:
-	case NET_RT_FLAGS:
-		for (i = 1; i <= AF_MAX; i++)
-			if ((rnh = rt_tables[i]) && (af == 0 || af == i) &&
-			    (error = rnh->rnh_walktree(rnh,
-							sysctl_dumpentry, &w)))
-				break;
-		break;
-
-	case NET_RT_IFLIST:
-		error = sysctl_iflist(af, &w);
-	}
-	splx(s);
-	if (w.w_tmem)
-		free(w.w_tmem, M_RTABLE);
-	return (error);
-}
-
-SYSCTL_NODE(_net, PF_ROUTE, routetable, CTLFLAG_RD, sysctl_rtsock,"");
-
-/*
- * Definitions of protocols supported in the ROUTE domain.
- */
-
-extern struct domain routedomain;		/* or at least forward */
-
-static struct protosw routesw[] = {
-{ SOCK_RAW,	&routedomain,	0,		PR_ATOMIC|PR_ADDR,
-  0,		route_output,	raw_ctlinput,	0,
-  route_usrreq,
-  raw_init
-}
-};
-
-struct domain routedomain =
-    { PF_ROUTE, "route", route_init, 0, 0,
-      routesw, &routesw[sizeof(routesw)/sizeof(routesw[0])] };
-
-DOMAIN_SET(route);
diff --git a/cpukit/libnetworking/netdb.h b/cpukit/libnetworking/netdb.h
deleted file mode 100644
index ec274f851f..0000000000
--- a/cpukit/libnetworking/netdb.h
+++ /dev/null
@@ -1,182 +0,0 @@
-/*-
- * Copyright (c) 1980, 1983, 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * -
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- * -
- * --Copyright--
- */
-
-/*
- *      @(#)netdb.h	8.1 (Berkeley) 6/2/93
- *      From: Id: netdb.h,v 8.9 1996/11/19 08:39:29 vixie Exp $
- *	$Id$
- */
-
-#ifndef _NETDB_H_
-#define _NETDB_H_
-
-#include <sys/cdefs.h>
-
-#ifndef _PATH_HEQUIV
-# define	_PATH_HEQUIV	"/etc/hosts.equiv"
-#endif
-#define	_PATH_HOSTS	"/etc/hosts"
-#define	_PATH_NETWORKS	"/etc/networks"
-#define	_PATH_PROTOCOLS	"/etc/protocols"
-#define	_PATH_SERVICES	"/etc/services"
-
-extern int h_errno;
-
-/*
- * Structures returned by network data base library.  All addresses are
- * supplied in host order, and returned in network order (suitable for
- * use in system calls).
- */
-struct	hostent {
-	char	*h_name;	/* official name of host */
-	char	**h_aliases;	/* alias list */
-	int	h_addrtype;	/* host address type */
-	int	h_length;	/* length of address */
-	char	**h_addr_list;	/* list of addresses from name server */
-#define	h_addr	h_addr_list[0]	/* address, for backward compatibility */
-};
-
-/*
- * Assumption here is that a network number
- * fits in an unsigned long -- probably a poor one.
- */
-struct	netent {
-	char		*n_name;	/* official name of net */
-	char		**n_aliases;	/* alias list */
-	int		n_addrtype;	/* net address type */
-	unsigned long	n_net;		/* network # */
-};
-
-struct	servent {
-	char	*s_name;	/* official service name */
-	char	**s_aliases;	/* alias list */
-	int	s_port;		/* port # */
-	char	*s_proto;	/* protocol to use */
-};
-
-struct	protoent {
-	char	*p_name;	/* official protocol name */
-	char	**p_aliases;	/* alias list */
-	int	p_proto;	/* protocol # */
-};
-
-/*
- * Error return codes from gethostbyname() and gethostbyaddr()
- * (left in extern int h_errno).
- */
-
-#define	NETDB_INTERNAL	-1	/* see errno */
-#define	NETDB_SUCCESS	0	/* no problem */
-#define	HOST_NOT_FOUND	1 /* Authoritative Answer Host not found */
-#define	TRY_AGAIN	2 /* Non-Authoritative Host not found, or SERVERFAIL */
-#define	NO_RECOVERY	3 /* Non recoverable errors, FORMERR, REFUSED, NOTIMP */
-#define	NO_DATA		4 /* Valid name, no data record of requested type */
-#define	NO_ADDRESS	NO_DATA		/* no address, look for MX record */
-
-__BEGIN_DECLS
-void		endhostent __P((void));
-void		endnetent __P((void));
-void		endprotoent __P((void));
-void		endservent __P((void));
-struct hostent	*gethostbyaddr __P((const char *, int, int));
-struct hostent	*gethostbyname __P((const char *));
-struct hostent	*gethostbyname2 __P((const char *, int));
-struct hostent	*gethostent __P((void));
-struct netent	*getnetbyaddr __P((unsigned long, int));
-struct netent	*getnetbyname __P((const char *));
-struct netent	*getnetent __P((void));
-struct protoent	*getprotobyname __P((const char *));
-struct protoent	*getprotobynumber __P((int));
-struct protoent	*getprotoent __P((void));
-struct servent	*getservbyname __P((const char *, const char *));
-struct servent	*getservbyport __P((int, const char *));
-struct servent	*getservent __P((void));
-void		herror __P((const char *));
-__const char	*hstrerror __P((int));
-void		sethostent __P((int));
-/* void		sethostfile __P((const char *)); */
-void		setnetent __P((int));
-void		setprotoent __P((int));
-void		setservent __P((int));
-
-/*
- * PRIVATE functions specific to the FreeBSD implementation
- */
-
-/* DO NOT USE THESE, THEY ARE SUBJECT TO CHANGE AND ARE NOT PORTABLE!!! */
-void	_sethosthtent __P((int));
-void	_endhosthtent __P((void));
-void	_sethostdnsent __P((int));
-void	_endhostdnsent __P((void));
-void	_setnethtent __P((int));
-void	_endnethtent __P((void));
-void	_setnetdnsent __P((int));
-void	_endnetdnsent __P((void));
-struct hostent * _gethostbyhtname  __P((const char *, int));
-struct hostent * _gethostbydnsname __P((const char *, int));
-struct hostent * _gethostbynisname __P((const char *, int));
-struct hostent * _gethostbyhtaddr  __P((const char *, int, int));
-struct hostent * _gethostbydnsaddr __P((const char *, int, int));
-struct hostent * _gethostbynisaddr __P((const char *, int, int));
-struct netent *  _getnetbyhtname  __P((const char *));
-struct netent *  _getnetbydnsname __P((const char *));
-struct netent *  _getnetbynisname __P((const char *));
-struct netent *  _getnetbyhtaddr  __P((unsigned long, int));
-struct netent *  _getnetbydnsaddr __P((unsigned long, int));
-struct netent *  _getnetbynisaddr __P((unsigned long, int));
-void _map_v4v6_address __P((const char *src, char *dst));
-void _map_v4v6_hostent __P((struct hostent *hp, char **bp, int *len));
-__END_DECLS
-
-#endif /* !_NETDB_H_ */
diff --git a/cpukit/libnetworking/netinet/icmp_var.h b/cpukit/libnetworking/netinet/icmp_var.h
deleted file mode 100644
index 7657f31acf..0000000000
--- a/cpukit/libnetworking/netinet/icmp_var.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)icmp_var.h	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#ifndef _NETINET_ICMP_VAR_H_
-#define _NETINET_ICMP_VAR_H_
-
-/*
- * Variables related to this implementation
- * of the internet control message protocol.
- */
-struct	icmpstat {
-/* statistics related to icmp packets generated */
-	u_long	icps_error;		/* # of calls to icmp_error */
-	u_long	icps_oldshort;		/* no error 'cuz old ip too short */
-	u_long	icps_oldicmp;		/* no error 'cuz old was icmp */
-	u_long	icps_outhist[ICMP_MAXTYPE + 1];
-/* statistics related to input messages processed */
- 	u_long	icps_badcode;		/* icmp_code out of range */
-	u_long	icps_tooshort;		/* packet < ICMP_MINLEN */
-	u_long	icps_checksum;		/* bad checksum */
-	u_long	icps_badlen;		/* calculated bound mismatch */
-	u_long	icps_reflect;		/* number of responses */
-	u_long	icps_inhist[ICMP_MAXTYPE + 1];
-	u_long	icps_bmcastecho; 	/* b/mcast echo requests dropped */
-	u_long	icps_bmcasttstamp; 	/* b/mcast tstamp requests dropped */
-};
-
-/*
- * Names for ICMP sysctl objects
- */
-#define	ICMPCTL_MASKREPL	1	/* allow replies to netmask requests */
-#define	ICMPCTL_STATS		2	/* statistics (read-only) */
-#define ICMPCTL_MAXID		3
-
-#define ICMPCTL_NAMES { \
-	{ 0, 0 }, \
-	{ "maskrepl", CTLTYPE_INT }, \
-	{ "stats", CTLTYPE_STRUCT }, \
-}
-
-#ifdef KERNEL
-extern struct	icmpstat icmpstat;
-#endif
-
-#endif
diff --git a/cpukit/libnetworking/netinet/if_ether.c b/cpukit/libnetworking/netinet/if_ether.c
deleted file mode 100644
index 985ce6e7d9..0000000000
--- a/cpukit/libnetworking/netinet/if_ether.c
+++ /dev/null
@@ -1,638 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)if_ether.c	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-/*
- * Ethernet address resolution protocol.
- * TODO:
- *	add "inuse/lock" bit (or ref. count) along with valid bit
- */
-
-#include <sys/param.h>
-#include <sys/kernel.h>
-#include <sys/sysctl.h>
-#include <sys/queue.h>
-#include <sys/systm.h>
-#include <sys/mbuf.h>
-#include <sys/malloc.h>
-#include <sys/socket.h>
-#include <sys/syslog.h>
-
-#include <net/if.h>
-#include <net/if_dl.h>
-#include <net/route.h>
-#include <net/netisr.h>
-
-#include <netinet/in.h>
-#include <netinet/in_var.h>
-#include <netinet/if_ether.h>
-
-#define SIN(s) ((struct sockaddr_in *)s)
-#define SDL(s) ((struct sockaddr_dl *)s)
-
-SYSCTL_NODE(_net_link_ether, PF_INET, inet, CTLFLAG_RW, 0, "");
-
-/* timer values */
-static int arpt_prune = (5*60*1); /* walk list every 5 minutes */
-static int arpt_keep = (20*60); /* once resolved, good for 20 more minutes */
-static int arpt_down = 20;	/* once declared down, don't send for 20 sec */
-
-SYSCTL_INT(_net_link_ether_inet, OID_AUTO, prune_intvl, CTLFLAG_RW,
-	   &arpt_prune, 0, "");
-SYSCTL_INT(_net_link_ether_inet, OID_AUTO, max_age, CTLFLAG_RW, 
-	   &arpt_keep, 0, "");
-SYSCTL_INT(_net_link_ether_inet, OID_AUTO, host_down_time, CTLFLAG_RW,
-	   &arpt_down, 0, "");
-
-#define	rt_expire rt_rmx.rmx_expire
-
-struct llinfo_arp {
-	LIST_ENTRY(llinfo_arp) la_le;
-	struct	rtentry *la_rt;
-	struct	mbuf *la_hold;		/* last packet until resolved/timeout */
-	long	la_asked;		/* last time we QUERIED for this addr */
-#define la_timer la_rt->rt_rmx.rmx_expire /* deletion time in seconds */
-};
-
-static	LIST_HEAD(, llinfo_arp) llinfo_arp;
-
-struct	ifqueue arpintrq = {0, 0, 0, 50};
-static int	arp_inuse, arp_allocated;
-
-static int	arp_maxtries = 5;
-static int	useloopback = 1; /* use loopback interface for local traffic */
-static int	arp_proxyall = 0;
-
-SYSCTL_INT(_net_link_ether_inet, OID_AUTO, maxtries, CTLFLAG_RW,
-	   &arp_maxtries, 0, "");
-SYSCTL_INT(_net_link_ether_inet, OID_AUTO, useloopback, CTLFLAG_RW,
-	   &useloopback, 0, "");
-SYSCTL_INT(_net_link_ether_inet, OID_AUTO, proxyall, CTLFLAG_RW,
-	   &arp_proxyall, 0, "");
-
-static void	arp_rtrequest __P((int, struct rtentry *, struct sockaddr *));
-static void	arprequest __P((struct arpcom *, u_long *, u_long *, u_char *));
-void	arpintr __P((void));
-static void	arptfree __P((struct llinfo_arp *));
-static void	arptimer __P((void *));
-static struct llinfo_arp
-		*arplookup __P((u_long, int, int));
-static void	in_arpinput __P((struct mbuf *));
-
-/*
- * Timeout routine.  Age arp_tab entries periodically.
- */
-/* ARGSUSED */
-static void
-arptimer(ignored_arg)
-	void *ignored_arg;
-{
-	int s = splnet();
-	register struct llinfo_arp *la = llinfo_arp.lh_first;
-	struct llinfo_arp *ola;
-
-	timeout(arptimer, (caddr_t)0, arpt_prune * hz);
-	while ((ola = la) != 0) {
-		register struct rtentry *rt = la->la_rt;
-		la = la->la_le.le_next;
-		if (rt->rt_expire && rt->rt_expire <= rtems_bsdnet_seconds_since_boot())
-			arptfree(ola); /* timer has expired, clear */
-	}
-	splx(s);
-}
-
-/*
- * Parallel to llc_rtrequest.
- */
-static void
-arp_rtrequest(req, rt, sa)
-	int req;
-	register struct rtentry *rt;
-	struct sockaddr *sa;
-{
-	register struct sockaddr *gate = rt->rt_gateway;
-	register struct llinfo_arp *la = (struct llinfo_arp *)rt->rt_llinfo;
-	static struct sockaddr_dl null_sdl = {sizeof(null_sdl), AF_LINK};
-	static int arpinit_done;
-
-	if (!arpinit_done) {
-		arpinit_done = 1;
-		LIST_INIT(&llinfo_arp);
-		timeout(arptimer, (caddr_t)0, hz);
-	}
-	if (rt->rt_flags & RTF_GATEWAY)
-		return;
-	switch (req) {
-
-	case RTM_ADD:
-		/*
-		 * XXX: If this is a manually added route to interface
-		 * such as older version of routed or gated might provide,
-		 * restore cloning bit.
-		 */
-		if ((rt->rt_flags & RTF_HOST) == 0 &&
-		    SIN(rt_mask(rt))->sin_addr.s_addr != 0xffffffff)
-			rt->rt_flags |= RTF_CLONING;
-		if (rt->rt_flags & RTF_CLONING) {
-			/*
-			 * Case 1: This route should come from a route to iface.
-			 */
-			rt_setgate(rt, rt_key(rt),
-					(struct sockaddr *)&null_sdl);
-			gate = rt->rt_gateway;
-			SDL(gate)->sdl_type = rt->rt_ifp->if_type;
-			SDL(gate)->sdl_index = rt->rt_ifp->if_index;
-			rt->rt_expire = rtems_bsdnet_seconds_since_boot();
-			break;
-		}
-		/* Announce a new entry if requested. */
-		if (rt->rt_flags & RTF_ANNOUNCE)
-			arprequest((struct arpcom *)rt->rt_ifp,
-			    &SIN(rt_key(rt))->sin_addr.s_addr,
-			    &SIN(rt_key(rt))->sin_addr.s_addr,
-			    (u_char *)LLADDR(SDL(gate)));
-		/*FALLTHROUGH*/
-	case RTM_RESOLVE:
-		if (gate->sa_family != AF_LINK ||
-		    gate->sa_len < sizeof(null_sdl)) {
-			log(LOG_DEBUG, "arp_rtrequest: bad gateway value\n");
-			break;
-		}
-		SDL(gate)->sdl_type = rt->rt_ifp->if_type;
-		SDL(gate)->sdl_index = rt->rt_ifp->if_index;
-		if (la != 0)
-			break; /* This happens on a route change */
-		/*
-		 * Case 2:  This route may come from cloning, or a manual route
-		 * add with a LL address.
-		 */
-		R_Malloc(la, struct llinfo_arp *, sizeof(*la));
-		rt->rt_llinfo = (caddr_t)la;
-		if (la == 0) {
-			log(LOG_DEBUG, "arp_rtrequest: malloc failed\n");
-			break;
-		}
-		arp_inuse++, arp_allocated++;
-		Bzero(la, sizeof(*la));
-		la->la_rt = rt;
-		rt->rt_flags |= RTF_LLINFO;
-		LIST_INSERT_HEAD(&llinfo_arp, la, la_le);
-
-		/*
-		 * This keeps the multicast addresses from showing up
-		 * in `arp -a' listings as unresolved.  It's not actually
-		 * functional.  Then the same for broadcast.
-		 */
-		if (IN_MULTICAST(ntohl(SIN(rt_key(rt))->sin_addr.s_addr))) {
-			ETHER_MAP_IP_MULTICAST(&SIN(rt_key(rt))->sin_addr,
-					       LLADDR(SDL(gate)));
-			SDL(gate)->sdl_alen = 6;
-			rt->rt_expire = 0;
-		}
-		if (in_broadcast(SIN(rt_key(rt))->sin_addr, rt->rt_ifp)) {
-			memcpy(LLADDR(SDL(gate)), etherbroadcastaddr, 6);
-			SDL(gate)->sdl_alen = 6;
-			rt->rt_expire = 0;
-		}
-
-		if (SIN(rt_key(rt))->sin_addr.s_addr ==
-		    (IA_SIN(rt->rt_ifa))->sin_addr.s_addr) {
-		    /*
-		     * This test used to be
-		     *	if (loif.if_flags & IFF_UP)
-		     * It allowed local traffic to be forced
-		     * through the hardware by configuring the loopback down.
-		     * However, it causes problems during network configuration
-		     * for boards that can't receive packets they send.
-		     * It is now necessary to clear "useloopback" and remove
-		     * the route to force traffic out to the hardware.
-		     */
-			rt->rt_expire = 0;
-			Bcopy(((struct arpcom *)rt->rt_ifp)->ac_enaddr,
-				LLADDR(SDL(gate)), SDL(gate)->sdl_alen = 6);
-			if (useloopback)
-				rt->rt_ifp = loif;
-
-		}
-		break;
-
-	case RTM_DELETE:
-		if (la == 0)
-			break;
-		arp_inuse--;
-		LIST_REMOVE(la, la_le);
-		rt->rt_llinfo = 0;
-		rt->rt_flags &= ~RTF_LLINFO;
-		if (la->la_hold)
-			m_freem(la->la_hold);
-		Free((caddr_t)la);
-	}
-}
-
-/*
- * Broadcast an ARP request. Caller specifies:
- *	- arp header source ip address
- *	- arp header target ip address
- *	- arp header source ethernet address
- */
-static void
-arprequest(ac, sip, tip, enaddr)
-	register struct arpcom *ac;
-	register u_long *sip, *tip;
-	register u_char *enaddr;
-{
-	register struct mbuf *m;
-	register struct ether_header *eh;
-	register struct ether_arp *ea;
-	struct sockaddr sa;
-
-	if ((m = m_gethdr(M_DONTWAIT, MT_DATA)) == NULL)
-		return;
-	m->m_len = sizeof(*ea);
-	m->m_pkthdr.len = sizeof(*ea);
-	MH_ALIGN(m, sizeof(*ea));
-	ea = mtod(m, struct ether_arp *);
-	eh = (struct ether_header *)sa.sa_data;
-	bzero((caddr_t)ea, sizeof (*ea));
-	(void)memcpy(eh->ether_dhost, etherbroadcastaddr, sizeof(eh->ether_dhost));
-	eh->ether_type = htons(ETHERTYPE_ARP);	/* if_output will not swap */
-	ea->arp_hrd = htons(ARPHRD_ETHER);
-	ea->arp_pro = htons(ETHERTYPE_IP);
-	ea->arp_hln = sizeof(ea->arp_sha);	/* hardware address length */
-	ea->arp_pln = sizeof(ea->arp_spa);	/* protocol address length */
-	ea->arp_op = htons(ARPOP_REQUEST);
-	(void)memcpy(ea->arp_sha, enaddr, sizeof(ea->arp_sha));
-	(void)memcpy(ea->arp_spa, sip, sizeof(ea->arp_spa));
-	(void)memcpy(ea->arp_tpa, tip, sizeof(ea->arp_tpa));
-	sa.sa_family = AF_UNSPEC;
-	sa.sa_len = sizeof(sa);
-	(*ac->ac_if.if_output)(&ac->ac_if, m, &sa, (struct rtentry *)0);
-}
-
-/*
- * Resolve an IP address into an ethernet address.  If success,
- * desten is filled in.  If there is no entry in arptab,
- * set one up and broadcast a request for the IP address.
- * Hold onto this mbuf and resend it once the address
- * is finally resolved.  A return value of 1 indicates
- * that desten has been filled in and the packet should be sent
- * normally; a 0 return indicates that the packet has been
- * taken over here, either now or for later transmission.
- */
-int
-arpresolve(ac, rt, m, dst, desten, rt0)
-	register struct arpcom *ac;
-	register struct rtentry *rt;
-	struct mbuf *m;
-	register struct sockaddr *dst;
-	register u_char *desten;
-	struct rtentry *rt0;
-{
-	register struct llinfo_arp *la;
-	struct sockaddr_dl *sdl;
-
-	if (m->m_flags & M_BCAST) {	/* broadcast */
-		(void)memcpy(desten, etherbroadcastaddr, sizeof(etherbroadcastaddr));
-		return (1);
-	}
-	if (m->m_flags & M_MCAST) {	/* multicast */
-		ETHER_MAP_IP_MULTICAST(&SIN(dst)->sin_addr, desten);
-		return(1);
-	}
-	if (rt)
-		la = (struct llinfo_arp *)rt->rt_llinfo;
-	else {
-		la = arplookup(SIN(dst)->sin_addr.s_addr, 1, 0);
-		if (la)
-			rt = la->la_rt;
-	}
-	if (la == 0 || rt == 0) {
-		log(LOG_DEBUG, "arpresolve: can't allocate llinfo for %s\n",
-			inet_ntoa(SIN(dst)->sin_addr));
-		m_freem(m);
-		return (0);
-	}
-	sdl = SDL(rt->rt_gateway);
-	/*
-	 * Check the address family and length is valid, the address
-	 * is resolved; otherwise, try to resolve.
-	 */
-	if ((rt->rt_expire == 0 || rt->rt_expire > rtems_bsdnet_seconds_since_boot()) &&
-	    sdl->sdl_family == AF_LINK && sdl->sdl_alen != 0) {
-		bcopy(LLADDR(sdl), desten, sdl->sdl_alen);
-		return 1;
-	}
-	/*
-	 * There is an arptab entry, but no ethernet address
-	 * response yet.  Replace the held mbuf with this
-	 * latest one.
-	 */
-	if (la->la_hold)
-		m_freem(la->la_hold);
-	la->la_hold = m;
-	if (rt->rt_expire) {
-		rt->rt_flags &= ~RTF_REJECT;
-		if (la->la_asked == 0 || rt->rt_expire != rtems_bsdnet_seconds_since_boot()) {
-			rt->rt_expire = rtems_bsdnet_seconds_since_boot();
-			if (la->la_asked++ < arp_maxtries)
-			    arprequest(ac,
-			        &(SIN(rt->rt_ifa->ifa_addr)->sin_addr.s_addr),
-				&(SIN(dst)->sin_addr.s_addr),
-				ac->ac_enaddr);
-			else {
-				rt->rt_flags |= RTF_REJECT;
-				rt->rt_expire += arpt_down;
-				la->la_asked = 0;
-			}
-
-		}
-	}
-	return (0);
-}
-
-/*
- * Common length and type checks are done here,
- * then the protocol-specific routine is called.
- */
-void
-arpintr(void)
-{
-	register struct mbuf *m;
-	register struct arphdr *ar;
-	int s;
-
-	while (arpintrq.ifq_head) {
-		s = splimp();
-		IF_DEQUEUE(&arpintrq, m);
-		splx(s);
-		if (m == 0 || (m->m_flags & M_PKTHDR) == 0)
-			panic("arpintr");
-		if (m->m_len >= sizeof(struct arphdr) &&
-		    (ar = mtod(m, struct arphdr *)) &&
-		    ntohs(ar->ar_hrd) == ARPHRD_ETHER &&
-		    m->m_len >=
-		      sizeof(struct arphdr) + 2 * ar->ar_hln + 2 * ar->ar_pln)
-
-			    switch (ntohs(ar->ar_pro)) {
-
-			    case ETHERTYPE_IP:
-				    in_arpinput(m);
-				    continue;
-			    }
-		m_freem(m);
-	}
-}
-
-NETISR_SET(NETISR_ARP, arpintr);
-
-/*
- * ARP for Internet protocols on 10 Mb/s Ethernet.
- * Algorithm is that given in RFC 826.
- * In addition, a sanity check is performed on the sender
- * protocol address, to catch impersonators.
- * We no longer handle negotiations for use of trailer protocol:
- * Formerly, ARP replied for protocol type ETHERTYPE_TRAIL sent
- * along with IP replies if we wanted trailers sent to us,
- * and also sent them in response to IP replies.
- * This allowed either end to announce the desire to receive
- * trailer packets.
- * We no longer reply to requests for ETHERTYPE_TRAIL protocol either,
- * but formerly didn't normally send requests.
- */
-static void
-in_arpinput(m)
-	struct mbuf *m;
-{
-	register struct ether_arp *ea;
-	register struct arpcom *ac = (struct arpcom *)m->m_pkthdr.rcvif;
-	struct ether_header *eh;
-	register struct llinfo_arp *la = 0;
-	register struct rtentry *rt;
-	struct in_ifaddr *ia, *maybe_ia = 0;
-	struct sockaddr_dl *sdl;
-	struct sockaddr sa;
-	struct in_addr isaddr, itaddr, myaddr;
-	int op;
-
-	ea = mtod(m, struct ether_arp *);
-	op = ntohs(ea->arp_op);
-	(void)memcpy(&isaddr, ea->arp_spa, sizeof (isaddr));
-	(void)memcpy(&itaddr, ea->arp_tpa, sizeof (itaddr));
-	for (ia = in_ifaddr; ia; ia = ia->ia_next)
-		if (ia->ia_ifp == &ac->ac_if) {
-			maybe_ia = ia;
-			if ((itaddr.s_addr == ia->ia_addr.sin_addr.s_addr) ||
-			     (isaddr.s_addr == ia->ia_addr.sin_addr.s_addr))
-				break;
-		}
-	if (maybe_ia == 0) {
-		m_freem(m);
-		return;
-	}
-	myaddr = ia ? ia->ia_addr.sin_addr : maybe_ia->ia_addr.sin_addr;
-	if (!bcmp((caddr_t)ea->arp_sha, (caddr_t)ac->ac_enaddr,
-	    sizeof (ea->arp_sha))) {
-		m_freem(m);	/* it's from me, ignore it. */
-		return;
-	}
-	if (!bcmp((caddr_t)ea->arp_sha, (caddr_t)etherbroadcastaddr,
-	    sizeof (ea->arp_sha))) {
-		log(LOG_ERR,
-		    "arp: ether address is broadcast for IP address %s!\n",
-		    inet_ntoa(isaddr));
-		m_freem(m);
-		return;
-	}
-	if (isaddr.s_addr == myaddr.s_addr) {
-		log(LOG_ERR,
-		   "arp: %6D is using my IP address %s!\n",
-		   ea->arp_sha, ":", inet_ntoa(isaddr));
-		itaddr = myaddr;
-		goto reply;
-	}
-	la = arplookup(isaddr.s_addr, itaddr.s_addr == myaddr.s_addr, 0);
-	if (la && (rt = la->la_rt) && (sdl = SDL(rt->rt_gateway))) {
-		if (sdl->sdl_alen &&
-		    bcmp((caddr_t)ea->arp_sha, LLADDR(sdl), sdl->sdl_alen))
-			log(LOG_INFO, "arp: %s moved from %6D to %6D\n",
-			    inet_ntoa(isaddr), (u_char *)LLADDR(sdl), ":",
-			    ea->arp_sha, ":");
-		(void)memcpy(LLADDR(sdl), ea->arp_sha, sizeof(ea->arp_sha));
-		sdl->sdl_alen = sizeof(ea->arp_sha);
-		if (rt->rt_expire)
-			rt->rt_expire = rtems_bsdnet_seconds_since_boot() + arpt_keep;
-		rt->rt_flags &= ~RTF_REJECT;
-		la->la_asked = 0;
-		if (la->la_hold) {
-			(*ac->ac_if.if_output)(&ac->ac_if, la->la_hold,
-				rt_key(rt), rt);
-			la->la_hold = 0;
-		}
-	}
-reply:
-	if (op != ARPOP_REQUEST) {
-		m_freem(m);
-		return;
-	}
-	if (itaddr.s_addr == myaddr.s_addr) {
-		/* I am the target */
-		(void)memcpy(ea->arp_tha, ea->arp_sha, sizeof(ea->arp_sha));
-		(void)memcpy(ea->arp_sha, ac->ac_enaddr, sizeof(ea->arp_sha));
-	} else {
-		la = arplookup(itaddr.s_addr, 0, SIN_PROXY);
-		if (la == NULL) {
-			struct sockaddr_in sin;
-
-			if (!arp_proxyall) {
-				m_freem(m);
-				return;
-			}
-
-			bzero(&sin, sizeof sin);
-			sin.sin_family = AF_INET;
-			sin.sin_len = sizeof sin;
-			sin.sin_addr = itaddr;
-
-			rt = rtalloc1((struct sockaddr *)&sin, 0, 0UL);
-			if (!rt) {
-				m_freem(m);
-				return;
-			}
-			/*
-			 * Don't send proxies for nodes on the same interface
-			 * as this one came out of, or we'll get into a fight
-			 * over who claims what Ether address.
-			 */
-			if (rt->rt_ifp == &ac->ac_if) {
-				rtfree(rt);
-				m_freem(m);
-				return;
-			}
-			(void)memcpy(ea->arp_tha, ea->arp_sha, sizeof(ea->arp_sha));
-			(void)memcpy(ea->arp_sha, ac->ac_enaddr, sizeof(ea->arp_sha));
-			rtfree(rt);
-#ifdef DEBUG_PROXY
-			printf("arp: proxying for %s\n",
-			       inet_ntoa(itaddr));
-#endif
-		} else {
-			rt = la->la_rt;
-			(void)memcpy(ea->arp_tha, ea->arp_sha, sizeof(ea->arp_sha));
-			sdl = SDL(rt->rt_gateway);
-			(void)memcpy(ea->arp_sha, LLADDR(sdl), sizeof(ea->arp_sha));
-		}
-	}
-
-	(void)memcpy(ea->arp_tpa, ea->arp_spa, sizeof(ea->arp_spa));
-	(void)memcpy(ea->arp_spa, &itaddr, sizeof(ea->arp_spa));
-	ea->arp_op = htons(ARPOP_REPLY);
-	ea->arp_pro = htons(ETHERTYPE_IP); /* let's be sure! */
-	eh = (struct ether_header *)sa.sa_data;
-	(void)memcpy(eh->ether_dhost, ea->arp_tha, sizeof(eh->ether_dhost));
-	eh->ether_type = htons(ETHERTYPE_ARP);
-	sa.sa_family = AF_UNSPEC;
-	sa.sa_len = sizeof(sa);
-	(*ac->ac_if.if_output)(&ac->ac_if, m, &sa, (struct rtentry *)0);
-	return;
-}
-
-/*
- * Free an arp entry.
- */
-static void
-arptfree(la)
-	register struct llinfo_arp *la;
-{
-	register struct rtentry *rt = la->la_rt;
-	register struct sockaddr_dl *sdl;
-	if (rt == 0)
-		panic("arptfree");
-	if (rt->rt_refcnt > 0 && (sdl = SDL(rt->rt_gateway)) &&
-	    sdl->sdl_family == AF_LINK) {
-		sdl->sdl_alen = 0;
-		la->la_asked = 0;
-		rt->rt_flags &= ~RTF_REJECT;
-		return;
-	}
-	rtrequest(RTM_DELETE, rt_key(rt), (struct sockaddr *)0, rt_mask(rt),
-			0, (struct rtentry **)0);
-}
-/*
- * Lookup or enter a new address in arptab.
- */
-static struct llinfo_arp *
-arplookup(addr, create, proxy)
-	u_long addr;
-	int create, proxy;
-{
-	register struct rtentry *rt;
-	static struct sockaddr_inarp sin = {sizeof(sin), AF_INET };
-	const char *why = 0;
-
-	sin.sin_addr.s_addr = addr;
-	sin.sin_other = proxy ? SIN_PROXY : 0;
-	rt = rtalloc1((struct sockaddr *)&sin, create, 0UL);
-	if (rt == 0)
-		return (0);
-	rt->rt_refcnt--;
-
-	if (rt->rt_flags & RTF_GATEWAY)
-		why = "host is not on local network";
-	else if ((rt->rt_flags & RTF_LLINFO) == 0)
-		why = "could not allocate llinfo";
-	else if (rt->rt_gateway->sa_family != AF_LINK)
-		why = "gateway route is not ours";
-
-	if (why && create) {
-		log(LOG_DEBUG, "arplookup %s failed: %s\n",
-		    inet_ntoa(sin.sin_addr), why);
-		return 0;
-	} else if (why) {
-		return 0;
-	}
-	return ((struct llinfo_arp *)rt->rt_llinfo);
-}
-
-void
-arp_ifinit(ac, ifa)
-	struct arpcom *ac;
-	struct ifaddr *ifa;
-{
-	if (ntohl(IA_SIN(ifa)->sin_addr.s_addr) != INADDR_ANY)
-		arprequest(ac, &(IA_SIN(ifa)->sin_addr.s_addr),
-			       &(IA_SIN(ifa)->sin_addr.s_addr), ac->ac_enaddr);
-	ifa->ifa_rtrequest = arp_rtrequest;
-	ifa->ifa_flags |= RTF_CLONING;
-}
diff --git a/cpukit/libnetworking/netinet/if_ether.h b/cpukit/libnetworking/netinet/if_ether.h
deleted file mode 100644
index 22c8e97187..0000000000
--- a/cpukit/libnetworking/netinet/if_ether.h
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)if_ether.h	8.3 (Berkeley) 5/2/95
- *	$Id$
- */
-
-#ifndef _NETINET_IF_ETHER_H_
-#define _NETINET_IF_ETHER_H_
-
-#include <net/ethernet.h>
-
-#define	ETHERTYPE_PUP		0x0200	/* PUP protocol */
-#define	ETHERTYPE_IP		0x0800	/* IP protocol */
-#define ETHERTYPE_ARP		0x0806	/* Addr. resolution protocol */
-#define ETHERTYPE_REVARP	0x8035	/* reverse Addr. resolution protocol */
-
-/*
- * The ETHERTYPE_NTRAILER packet types starting at ETHERTYPE_TRAIL have
- * (type-ETHERTYPE_TRAIL)*512 bytes of data followed
- * by an ETHER type (as given above) and then the (variable-length) header.
- */
-#define	ETHERTYPE_TRAIL		0x1000		/* Trailer packet */
-#define	ETHERTYPE_NTRAILER	16
-
-#define	ETHERMTU	(ETHER_MAX_LEN-ETHER_HDR_LEN-ETHER_CRC_LEN)
-#define	ETHERMIN	(ETHER_MIN_LEN-ETHER_HDR_LEN-ETHER_CRC_LEN)
-
-#ifdef KERNEL
-/*
- * Macro to map an IP multicast address to an Ethernet multicast address.
- * The high-order 25 bits of the Ethernet address are statically assigned,
- * and the low-order 23 bits are taken from the low end of the IP address.
- */
-#define ETHER_MAP_IP_MULTICAST(ipaddr, enaddr) \
-	/* struct in_addr *ipaddr; */ \
-	/* u_char enaddr[ETHER_ADDR_LEN];	   */ \
-{ \
-	(enaddr)[0] = 0x01; \
-	(enaddr)[1] = 0x00; \
-	(enaddr)[2] = 0x5e; \
-	(enaddr)[3] = ((u_char *)ipaddr)[1] & 0x7f; \
-	(enaddr)[4] = ((u_char *)ipaddr)[2]; \
-	(enaddr)[5] = ((u_char *)ipaddr)[3]; \
-}
-#endif
-
-/*
- * Ethernet Address Resolution Protocol.
- *
- * See RFC 826 for protocol description.  Structure below is adapted
- * to resolving internet addresses.  Field names used correspond to
- * RFC 826.
- */
-struct	ether_arp {
-	struct	arphdr ea_hdr;	/* fixed-size header */
-	u_char	arp_sha[ETHER_ADDR_LEN];	/* sender hardware address */
-	u_char	arp_spa[4];	/* sender protocol address */
-	u_char	arp_tha[ETHER_ADDR_LEN];	/* target hardware address */
-	u_char	arp_tpa[4];	/* target protocol address */
-};
-#define	arp_hrd	ea_hdr.ar_hrd
-#define	arp_pro	ea_hdr.ar_pro
-#define	arp_hln	ea_hdr.ar_hln
-#define	arp_pln	ea_hdr.ar_pln
-#define	arp_op	ea_hdr.ar_op
-
-
-/*
- * Structure shared between the ethernet driver modules and
- * the address resolution code.  For example, each ec_softc or il_softc
- * begins with this structure.
- */
-struct	arpcom {
-	/*
-	 * The ifnet struct _must_ be at the head of this structure.
-	 */
-	struct 	ifnet ac_if;		/* network-visible interface */
-	u_char	ac_enaddr[ETHER_ADDR_LEN];		/* ethernet hardware address */
-	struct	ether_multi *ac_multiaddrs; /* list of ether multicast addrs */
-	int	ac_multicnt;		/* length of ac_multiaddrs list */
-};
-
-struct sockaddr_inarp {
-	u_char	sin_len;
-	u_char	sin_family;
-	u_short sin_port;
-	struct	in_addr sin_addr;
-	struct	in_addr sin_srcaddr;
-	u_short	sin_tos;
-	u_short	sin_other;
-#define SIN_PROXY 1
-};
-/*
- * IP and ethernet specific routing flags
- */
-#define	RTF_USETRAILERS	RTF_PROTO1	/* use trailers */
-#define RTF_ANNOUNCE	RTF_PROTO2	/* announce new arp entry */
-
-#ifdef	KERNEL
-extern u_char	etherbroadcastaddr[ETHER_ADDR_LEN];
-extern u_char	ether_ipmulticast_min[ETHER_ADDR_LEN];
-extern u_char	ether_ipmulticast_max[ETHER_ADDR_LEN];
-extern struct	ifqueue arpintrq;
-
-int	arpresolve __P((struct arpcom *, struct rtentry *, struct mbuf *,
-			struct sockaddr *, u_char *, struct rtentry *));
-void	arp_ifinit __P((struct arpcom *, struct ifaddr *));
-int	ether_addmulti __P((struct ifreq *, struct arpcom *));
-int	ether_delmulti __P((struct ifreq *, struct arpcom *));
-
-/*
- * Ethernet multicast address structure.  There is one of these for each
- * multicast address or range of multicast addresses that we are supposed
- * to listen to on a particular interface.  They are kept in a linked list,
- * rooted in the interface's arpcom structure.  (This really has nothing to
- * do with ARP, or with the Internet address family, but this appears to be
- * the minimally-disrupting place to put it.)
- */
-struct ether_multi {
-	u_char	enm_addrlo[ETHER_ADDR_LEN];		/* low  or only address of range */
-	u_char	enm_addrhi[ETHER_ADDR_LEN];		/* high or only address of range */
-	struct	arpcom *enm_ac;		/* back pointer to arpcom */
-	u_int	enm_refcount;		/* no. claims to this addr/range */
-	struct	ether_multi *enm_next;	/* ptr to next ether_multi */
-};
-
-/*
- * Structure used by macros below to remember position when stepping through
- * all of the ether_multi records.
- */
-struct ether_multistep {
-	struct ether_multi  *e_enm;
-};
-
-/*
- * Macro for looking up the ether_multi record for a given range of Ethernet
- * multicast addresses connected to a given arpcom structure.  If no matching
- * record is found, "enm" returns NULL.
- */
-#define ETHER_LOOKUP_MULTI(addrlo, addrhi, ac, enm) \
-	/* u_char addrlo[ETHER_ADDR_LEN]; */ \
-	/* u_char addrhi[ETHER_ADDR_LEN]; */ \
-	/* struct arpcom *ac; */ \
-	/* struct ether_multi *enm; */ \
-{ \
-	for ((enm) = (ac)->ac_multiaddrs; \
-	    (enm) != NULL && \
-	    (bcmp((enm)->enm_addrlo, (addrlo), ETHER_ADDR_LEN) != 0 || \
-	     bcmp((enm)->enm_addrhi, (addrhi), ETHER_ADDR_LEN) != 0); \
-		(enm) = (enm)->enm_next); \
-}
-
-/*
- * Macro to step through all of the ether_multi records, one at a time.
- * The current position is remembered in "step", which the caller must
- * provide.  ETHER_FIRST_MULTI(), below, must be called to initialize "step"
- * and get the first record.  Both macros return a NULL "enm" when there
- * are no remaining records.
- */
-#define ETHER_NEXT_MULTI(step, enm) \
-	/* struct ether_multistep step; */  \
-	/* struct ether_multi *enm; */  \
-{ \
-	if (((enm) = (step).e_enm) != NULL) \
-		(step).e_enm = (enm)->enm_next; \
-}
-
-#define ETHER_FIRST_MULTI(step, ac, enm) \
-	/* struct ether_multistep step; */ \
-	/* struct arpcom *ac; */ \
-	/* struct ether_multi *enm; */ \
-{ \
-	(step).e_enm = (ac)->ac_multiaddrs; \
-	ETHER_NEXT_MULTI((step), (enm)); \
-}
-
-#endif
-
-#endif
diff --git a/cpukit/libnetworking/netinet/igmp.c b/cpukit/libnetworking/netinet/igmp.c
deleted file mode 100644
index 2af8b7038e..0000000000
--- a/cpukit/libnetworking/netinet/igmp.c
+++ /dev/null
@@ -1,479 +0,0 @@
-/*
- * Copyright (c) 1988 Stephen Deering.
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Stephen Deering of Stanford University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)igmp.c	8.1 (Berkeley) 7/19/93
- * $Id$
- */
-
-/*
- * Internet Group Management Protocol (IGMP) routines.
- *
- * Written by Steve Deering, Stanford, May 1988.
- * Modified by Rosen Sharma, Stanford, Aug 1994.
- * Modified by Bill Fenner, Xerox PARC, Feb 1995.
- * Modified to fully comply to IGMPv2 by Bill Fenner, Oct 1995.
- *
- * MULTICAST Revision: 3.5.1.4
- */
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/mbuf.h>
-#include <sys/socket.h>
-#include <sys/protosw.h>
-#include <sys/kernel.h>
-#include <sys/sysctl.h>
-
-#include <net/if.h>
-#include <net/route.h>
-
-#include <netinet/in.h>
-#include <netinet/in_var.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/ip_var.h>
-#include <netinet/igmp.h>
-#include <netinet/igmp_var.h>
-
-static struct router_info *
-		find_rti __P((struct ifnet *ifp));
-
-static struct igmpstat igmpstat;
-
-SYSCTL_STRUCT(_net_inet_igmp, IGMPCTL_STATS, stats, CTLFLAG_RD,
-	&igmpstat, igmpstat, "");
-
-static int igmp_timers_are_running;
-static u_long igmp_all_hosts_group;
-static u_long igmp_all_rtrs_group;
-static struct mbuf *router_alert;
-static struct router_info *Head;
-
-static void igmp_sendpkt(struct in_multi *, int, unsigned long);
-
-void
-igmp_init()
-{
-	struct ipoption *ra;
-
-	/*
-	 * To avoid byte-swapping the same value over and over again.
-	 */
-	igmp_all_hosts_group = htonl(INADDR_ALLHOSTS_GROUP);
-	igmp_all_rtrs_group = htonl(INADDR_ALLRTRS_GROUP);
-
-	igmp_timers_are_running = 0;
-
-	/*
-	 * Construct a Router Alert option to use in outgoing packets
-	 */
-	MGET(router_alert, M_DONTWAIT, MT_DATA);
-	ra = mtod(router_alert, struct ipoption *);
-	ra->ipopt_dst.s_addr = 0;
-	ra->ipopt_list[0] = IPOPT_RA;	/* Router Alert Option */
-	ra->ipopt_list[1] = 0x04;	/* 4 bytes long */
-	ra->ipopt_list[2] = 0x00;
-	ra->ipopt_list[3] = 0x00;
-	router_alert->m_len = sizeof(ra->ipopt_dst) + ra->ipopt_list[1];
-
-	Head = (struct router_info *) 0;
-}
-
-static struct router_info *
-find_rti(ifp)
-	struct ifnet *ifp;
-{
-        register struct router_info *rti = Head;
-
-#ifdef IGMP_DEBUG
-	printf("[igmp.c, _find_rti] --> entering \n");
-#endif
-        while (rti) {
-                if (rti->rti_ifp == ifp) {
-#ifdef IGMP_DEBUG
-			printf("[igmp.c, _find_rti] --> found old entry \n");
-#endif
-                        return rti;
-                }
-                rti = rti->rti_next;
-        }
-	MALLOC(rti, struct router_info *, sizeof *rti, M_MRTABLE, M_NOWAIT);
-        rti->rti_ifp = ifp;
-        rti->rti_type = IGMP_V2_ROUTER;
-        rti->rti_time = 0;
-        rti->rti_next = Head;
-        Head = rti;
-#ifdef IGMP_DEBUG
-	printf("[igmp.c, _find_rti] --> created an entry \n");
-#endif
-        return rti;
-}
-
-void
-igmp_input(m, iphlen)
-	register struct mbuf *m;
-	register int iphlen;
-{
-	register struct igmp *igmp;
-	register struct ip *ip;
-	register int igmplen;
-	register struct ifnet *ifp = m->m_pkthdr.rcvif;
-	register int minlen;
-	register struct in_multi *inm;
-	register struct in_ifaddr *ia;
-	struct in_multistep step;
-	struct router_info *rti;
-	
-	int timer; /** timer value in the igmp query header **/
-
-	++igmpstat.igps_rcv_total;
-
-	ip = mtod(m, struct ip *);
-	igmplen = ip->ip_len;
-
-	/*
-	 * Validate lengths
-	 */
-	if (igmplen < IGMP_MINLEN) {
-		++igmpstat.igps_rcv_tooshort;
-		m_freem(m);
-		return;
-	}
-	minlen = iphlen + IGMP_MINLEN;
-	if ((m->m_flags & M_EXT || m->m_len < minlen) &&
-	    (m = m_pullup(m, minlen)) == 0) {
-		++igmpstat.igps_rcv_tooshort;
-		return;
-	}
-
-	/*
-	 * Validate checksum
-	 */
-	m->m_data += iphlen;
-	m->m_len -= iphlen;
-	igmp = mtod(m, struct igmp *);
-	if (in_cksum(m, igmplen)) {
-		++igmpstat.igps_rcv_badsum;
-		m_freem(m);
-		return;
-	}
-	m->m_data -= iphlen;
-	m->m_len += iphlen;
-
-	ip = mtod(m, struct ip *);
-	timer = igmp->igmp_code * PR_FASTHZ / IGMP_TIMER_SCALE;
-	rti = find_rti(ifp);
-
-	/*
-	 * In the IGMPv2 specification, there are 3 states and a flag.
-	 *
-	 * In Non-Member state, we simply don't have a membership record.
-	 * In Delaying Member state, our timer is running (inm->inm_timer)
-	 * In Idle Member state, our timer is not running (inm->inm_timer==0)
-	 *
-	 * The flag is inm->inm_state, it is set to IGMP_OTHERMEMBER if
-	 * we have heard a report from another member, or IGMP_IREPORTEDLAST
-	 * if I sent the last report.
-	 */
-	switch (igmp->igmp_type) {
-
-	case IGMP_MEMBERSHIP_QUERY:
-		++igmpstat.igps_rcv_queries;
-
-		if (ifp->if_flags & IFF_LOOPBACK)
-			break;
-
-		if (igmp->igmp_code == 0) {
-			/*
-			 * Old router.  Remember that the querier on this
-			 * interface is old, and set the timer to the
-			 * value in RFC 1112.
-			 */
-
-			rti->rti_type = IGMP_V1_ROUTER;
-			rti->rti_time = 0;
-
-			timer = IGMP_MAX_HOST_REPORT_DELAY * PR_FASTHZ;
-
-			if (ip->ip_dst.s_addr != igmp_all_hosts_group ||
-			    igmp->igmp_group.s_addr != 0) {
-				++igmpstat.igps_rcv_badqueries;
-				m_freem(m);
-				return;
-			}
-		} else {
-			/*
-			 * New router.  Simply do the new validity check.
-			 */
-			
-			if (igmp->igmp_group.s_addr != 0 &&
-			    !IN_MULTICAST(ntohl(igmp->igmp_group.s_addr))) {
-				++igmpstat.igps_rcv_badqueries;
-				m_freem(m);
-				return;
-			}
-		}
-
-		/*
-		 * - Start the timers in all of our membership records
-		 *   that the query applies to for the interface on
-		 *   which the query arrived excl. those that belong
-		 *   to the "all-hosts" group (224.0.0.1).
-		 * - Restart any timer that is already running but has
-		 *   a value longer than the requested timeout.
-		 * - Use the value specified in the query message as
-		 *   the maximum timeout.
-		 */
-		IN_FIRST_MULTI(step, inm);
-		while (inm != NULL) {
-			if (inm->inm_ifp == ifp &&
-			    inm->inm_addr.s_addr != igmp_all_hosts_group &&
-			    (igmp->igmp_group.s_addr == 0 ||
-			     igmp->igmp_group.s_addr == inm->inm_addr.s_addr)) {
-				if (inm->inm_timer == 0 ||
-				    inm->inm_timer > timer) {
-					inm->inm_timer =
-						IGMP_RANDOM_DELAY(timer);
-					igmp_timers_are_running = 1;
-				}
-			}
-			IN_NEXT_MULTI(step, inm);
-		}
-
-		break;
-
-	case IGMP_V1_MEMBERSHIP_REPORT:
-	case IGMP_V2_MEMBERSHIP_REPORT:
-		/*
-		 * For fast leave to work, we have to know that we are the
-		 * last person to send a report for this group.  Reports
-		 * can potentially get looped back if we are a multicast
-		 * router, so discard reports sourced by me.
-		 */
-		IFP_TO_IA(ifp, ia);
-		if (ia && ip->ip_src.s_addr == IA_SIN(ia)->sin_addr.s_addr)
-			break;
-
-		++igmpstat.igps_rcv_reports;
-
-		if (ifp->if_flags & IFF_LOOPBACK)
-			break;
-
-		if (!IN_MULTICAST(ntohl(igmp->igmp_group.s_addr))) {
-			++igmpstat.igps_rcv_badreports;
-			m_freem(m);
-			return;
-		}
-
-		/*
-		 * KLUDGE: if the IP source address of the report has an
-		 * unspecified (i.e., zero) subnet number, as is allowed for
-		 * a booting host, replace it with the correct subnet number
-		 * so that a process-level multicast routing demon can
-		 * determine which subnet it arrived from.  This is necessary
-		 * to compensate for the lack of any way for a process to
-		 * determine the arrival interface of an incoming packet.
-		 */
-		if ((ntohl(ip->ip_src.s_addr) & IN_CLASSA_NET) == 0)
-			if (ia) ip->ip_src.s_addr = htonl(ia->ia_subnet);
-
-		/*
-		 * If we belong to the group being reported, stop
-		 * our timer for that group.
-		 */
-		IN_LOOKUP_MULTI(igmp->igmp_group, ifp, inm);
-
-		if (inm != NULL) {
-			inm->inm_timer = 0;
-			++igmpstat.igps_rcv_ourreports;
-
-			inm->inm_state = IGMP_OTHERMEMBER;
-		}
-
-		break;
-	}
-
-	/*
-	 * Pass all valid IGMP packets up to any process(es) listening
-	 * on a raw IGMP socket.
-	 */
-	rip_input(m, iphlen);
-}
-
-void
-igmp_joingroup(inm)
-	struct in_multi *inm;
-{
-	int s = splnet();
-
-	if (inm->inm_addr.s_addr == igmp_all_hosts_group
-	    || inm->inm_ifp->if_flags & IFF_LOOPBACK) {
-		inm->inm_timer = 0;
-		inm->inm_state = IGMP_OTHERMEMBER;
-	} else {
-		inm->inm_rti = find_rti(inm->inm_ifp);
-		igmp_sendpkt(inm, inm->inm_rti->rti_type, 0);
-		inm->inm_timer = IGMP_RANDOM_DELAY(
-					IGMP_MAX_HOST_REPORT_DELAY*PR_FASTHZ);
-		inm->inm_state = IGMP_IREPORTEDLAST;
-		igmp_timers_are_running = 1;
-	}
-	splx(s);
-}
-
-void
-igmp_leavegroup(inm)
-	struct in_multi *inm;
-{
-	if (inm->inm_state == IGMP_IREPORTEDLAST &&
-	    inm->inm_addr.s_addr != igmp_all_hosts_group &&
-	    !(inm->inm_ifp->if_flags & IFF_LOOPBACK) &&
-	    inm->inm_rti->rti_type != IGMP_V1_ROUTER)
-		igmp_sendpkt(inm, IGMP_V2_LEAVE_GROUP, igmp_all_rtrs_group);
-}
-
-void
-igmp_fasttimo()
-{
-	register struct in_multi *inm;
-	struct in_multistep step;
-	int s;
-
-	/*
-	 * Quick check to see if any work needs to be done, in order
-	 * to minimize the overhead of fasttimo processing.
-	 */
-
-	if (!igmp_timers_are_running)
-		return;
-
-	s = splnet();
-	igmp_timers_are_running = 0;
-	IN_FIRST_MULTI(step, inm);
-	while (inm != NULL) {
-		if (inm->inm_timer == 0) {
-			/* do nothing */
-		} else if (--inm->inm_timer == 0) {
-			igmp_sendpkt(inm, inm->inm_rti->rti_type, 0);
-			inm->inm_state = IGMP_IREPORTEDLAST;
-		} else {
-			igmp_timers_are_running = 1;
-		}
-		IN_NEXT_MULTI(step, inm);
-	}
-	splx(s);
-}
-
-void
-igmp_slowtimo()
-{
-	int s = splnet();
-	register struct router_info *rti =  Head;
-
-#ifdef IGMP_DEBUG
-	printf("[igmp.c,_slowtimo] -- > entering \n");
-#endif
-	while (rti) {
-	    if (rti->rti_type == IGMP_V1_ROUTER) {
-		rti->rti_time++;
-		if (rti->rti_time >= IGMP_AGE_THRESHOLD) {
-			rti->rti_type = IGMP_V2_ROUTER;
-		}
-	    }
-	    rti = rti->rti_next;
-	}
-#ifdef IGMP_DEBUG	
-	printf("[igmp.c,_slowtimo] -- > exiting \n");
-#endif
-	splx(s);
-}
-
-static struct route igmprt;
-
-static void
-igmp_sendpkt(inm, type, addr)
-	struct in_multi *inm;
-	int type;
-	unsigned long addr;
-{
-        struct mbuf *m;
-        struct igmp *igmp;
-        struct ip *ip;
-        struct ip_moptions imo;
-
-        MGETHDR(m, M_DONTWAIT, MT_HEADER);
-        if (m == NULL)
-                return;
-
-	m->m_pkthdr.rcvif = loif;
-	m->m_pkthdr.len = sizeof(struct ip) + IGMP_MINLEN;
-	MH_ALIGN(m, IGMP_MINLEN + sizeof(struct ip));
-	m->m_data += sizeof(struct ip);
-        m->m_len = IGMP_MINLEN;
-        igmp = mtod(m, struct igmp *);
-        igmp->igmp_type   = type;
-        igmp->igmp_code   = 0;
-        igmp->igmp_group  = inm->inm_addr;
-        igmp->igmp_cksum  = 0;
-        igmp->igmp_cksum  = in_cksum(m, IGMP_MINLEN);
-
-        m->m_data -= sizeof(struct ip);
-        m->m_len += sizeof(struct ip);
-        ip = mtod(m, struct ip *);
-        ip->ip_tos        = 0;
-        ip->ip_len        = sizeof(struct ip) + IGMP_MINLEN;
-        ip->ip_off        = 0;
-        ip->ip_p          = IPPROTO_IGMP;
-        ip->ip_src.s_addr = INADDR_ANY;
-        ip->ip_dst.s_addr = addr ? addr : igmp->igmp_group.s_addr;
-
-        imo.imo_multicast_ifp  = inm->inm_ifp;
-        imo.imo_multicast_ttl  = 1;
-	imo.imo_multicast_vif  = -1;
-        /*
-         * Request loopback of the report if we are acting as a multicast
-         * router, so that the process-level routing demon can hear it.
-         */
-        imo.imo_multicast_loop = (ip_mrouter != NULL);
-
-	/*
-	 * XXX
-	 * Do we have to worry about reentrancy here?  Don't think so.
-	 */
-        ip_output(m, router_alert, &igmprt, 0, &imo);
-
-        ++igmpstat.igps_snd_reports;
-}
diff --git a/cpukit/libnetworking/netinet/igmp.h b/cpukit/libnetworking/netinet/igmp.h
deleted file mode 100644
index 01d6d09179..0000000000
--- a/cpukit/libnetworking/netinet/igmp.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (c) 1988 Stephen Deering.
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Stephen Deering of Stanford University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)igmp.h	8.1 (Berkeley) 6/10/93
- *	$Id$
- */
-
-#ifndef _NETINET_IGMP_H_
-#define _NETINET_IGMP_H_
-
-/*
- * Internet Group Management Protocol (IGMP) definitions.
- *
- * Written by Steve Deering, Stanford, May 1988.
- *
- * MULTICAST Revision: 3.5.1.2
- */
-
-/*
- * IGMP packet format.
- */
-struct igmp {
-	u_char		igmp_type;	/* version & type of IGMP message  */
-	u_char		igmp_code;	/* subtype for routing msgs        */
-	u_short		igmp_cksum;	/* IP-style checksum               */
-	struct in_addr	igmp_group;	/* group address being reported    */
-};					/*  (zero for queries)             */
-
-#define IGMP_MINLEN		     8
-
-/*
- * Message types, including version number.
- */
-#define IGMP_MEMBERSHIP_QUERY   	0x11	/* membership query         */
-#define IGMP_V1_MEMBERSHIP_REPORT	0x12	/* Ver. 1 membership report */
-#define IGMP_V2_MEMBERSHIP_REPORT	0x16	/* Ver. 2 membership report */
-#define IGMP_V2_LEAVE_GROUP		0x17	/* Leave-group message	    */
-
-#define IGMP_DVMRP			0x13	/* DVMRP routing message    */
-#define IGMP_PIM			0x14	/* PIM routing message	    */
-
-#define IGMP_MTRACE_RESP		0x1e  /* traceroute resp.(to sender)*/
-#define IGMP_MTRACE			0x1f  /* mcast traceroute messages  */
-
-#define IGMP_MAX_HOST_REPORT_DELAY   10    /* max delay for response to     */
-					   /*  query (in seconds) according */
-					   /*  to RFC1112                   */
-
-
-#define IGMP_TIMER_SCALE     10		/* denotes that the igmp code field */
-					/* specifies time in 10th of seconds*/
-
-/*
- * The following four defininitions are for backwards compatibility.
- * They should be removed as soon as all applications are updated to
- * use the new constant names.
- */
-#define IGMP_HOST_MEMBERSHIP_QUERY	IGMP_MEMBERSHIP_QUERY
-#define IGMP_HOST_MEMBERSHIP_REPORT	IGMP_V1_MEMBERSHIP_REPORT
-#define IGMP_HOST_NEW_MEMBERSHIP_REPORT	IGMP_V2_MEMBERSHIP_REPORT
-#define IGMP_HOST_LEAVE_MESSAGE		IGMP_V2_LEAVE_GROUP
-
-#endif /* _NETINET_IGMP_H_ */
diff --git a/cpukit/libnetworking/netinet/igmp_var.h b/cpukit/libnetworking/netinet/igmp_var.h
deleted file mode 100644
index f408bf2bc1..0000000000
--- a/cpukit/libnetworking/netinet/igmp_var.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright (c) 1988 Stephen Deering.
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Stephen Deering of Stanford University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)igmp_var.h	8.1 (Berkeley) 7/19/93
- * $Id$
- */
-
-#ifndef _NETINET_IGMP_VAR_H_
-#define _NETINET_IGMP_VAR_H_
-
-/*
- * Internet Group Management Protocol (IGMP),
- * implementation-specific definitions.
- *
- * Written by Steve Deering, Stanford, May 1988.
- *
- * MULTICAST Revision: 3.5.1.3
- */
-
-struct igmpstat {
-	u_int	igps_rcv_total;		/* total IGMP messages received */
-	u_int	igps_rcv_tooshort;	/* received with too few bytes */
-	u_int	igps_rcv_badsum;	/* received with bad checksum */
-	u_int	igps_rcv_queries;	/* received membership queries */
-	u_int	igps_rcv_badqueries;	/* received invalid queries */
-	u_int	igps_rcv_reports;	/* received membership reports */
-	u_int	igps_rcv_badreports;	/* received invalid reports */
-	u_int	igps_rcv_ourreports;	/* received reports for our groups */
-	u_int	igps_snd_reports;	/* sent membership reports */
-};
-
-#ifdef KERNEL
-extern struct igmpstat igmpstat;
-
-#define IGMP_RANDOM_DELAY(X) (random() % (X) + 1)
-
-/*
- * States for IGMPv2's leave processing
- */
-#define IGMP_OTHERMEMBER			0
-#define IGMP_IREPORTEDLAST			1
-
-/*
- * We must remember what version the subnet's querier is.
- * We conveniently use the IGMP message type for the proper
- * membership report to keep this state.
- */
-#define IGMP_V1_ROUTER				IGMP_V1_MEMBERSHIP_REPORT
-#define IGMP_V2_ROUTER				IGMP_V2_MEMBERSHIP_REPORT
-
-/*
- * Revert to new router if we haven't heard from an old router in
- * this amount of time.
- */
-#define IGMP_AGE_THRESHOLD			540
-
-void	igmp_init __P((void));
-void	igmp_input __P((struct mbuf *, int));
-void	igmp_joingroup __P((struct in_multi *));
-void	igmp_leavegroup __P((struct in_multi *));
-void	igmp_fasttimo __P((void));
-void	igmp_slowtimo __P((void));
-#endif
-
-/*
- * Names for IGMP sysctl objects
- */
-#define IGMPCTL_STATS		1	/* statistics (read-only) */
-#define IGMPCTL_MAXID		2
-
-#define IGMPCTL_NAMES { \
-	{ 0, 0 }, \
-	{ "stats", CTLTYPE_STRUCT }, \
-}
-
-#endif
-
-
diff --git a/cpukit/libnetworking/netinet/in.c b/cpukit/libnetworking/netinet/in.c
deleted file mode 100644
index 701406f207..0000000000
--- a/cpukit/libnetworking/netinet/in.c
+++ /dev/null
@@ -1,728 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)in.c	8.4 (Berkeley) 1/9/95
- *	$Id$
- */
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/systm.h>
-#include <sys/ioctl.h>
-#include <sys/errno.h>
-#include <sys/malloc.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/kernel.h>
-#include <sys/sysctl.h>
-
-#include <net/if.h>
-#include <net/route.h>
-
-#include <netinet/in_systm.h>
-#include <netinet/in.h>
-#include <netinet/in_var.h>
-#include <netinet/if_ether.h>
-
-#include <netinet/igmp_var.h>
-
-/*
- * This structure is used to keep track of in_multi chains which belong to
- * deleted interface addresses.
- */
-static LIST_HEAD(, multi_kludge) in_mk; /* XXX BSS initialization */
-
-struct multi_kludge {
-	LIST_ENTRY(multi_kludge) mk_entry;
-	struct ifnet *mk_ifp;
-	struct in_multihead mk_head;
-};
-
-static void	in_socktrim __P((struct sockaddr_in *));
-static int	in_ifinit __P((struct ifnet *,
-	    struct in_ifaddr *, struct sockaddr_in *, int));
-static void	in_ifscrub __P((struct ifnet *, struct in_ifaddr *));
-
-static int subnetsarelocal = 0;
-SYSCTL_INT(_net_inet_ip, OID_AUTO, subnets_are_local, CTLFLAG_RW, 
-	&subnetsarelocal, 0, "");
-/*
- * Return 1 if an internet address is for a ``local'' host
- * (one to which we have a connection).  If subnetsarelocal
- * is true, this includes other subnets of the local net.
- * Otherwise, it includes only the directly-connected (sub)nets.
- */
-int
-in_localaddr(in)
-	struct in_addr in;
-{
-	register u_long i = ntohl(in.s_addr);
-	register struct in_ifaddr *ia;
-
-	if (subnetsarelocal) {
-		for (ia = in_ifaddr; ia; ia = ia->ia_next)
-			if ((i & ia->ia_netmask) == ia->ia_net)
-				return (1);
-	} else {
-		for (ia = in_ifaddr; ia; ia = ia->ia_next)
-			if ((i & ia->ia_subnetmask) == ia->ia_subnet)
-				return (1);
-	}
-	return (0);
-}
-
-/*
- * Determine whether an IP address is in a reserved set of addresses
- * that may not be forwarded, or whether datagrams to that destination
- * may be forwarded.
- */
-int
-in_canforward(in)
-	struct in_addr in;
-{
-	register u_long i = ntohl(in.s_addr);
-	register u_long net;
-
-	if (IN_EXPERIMENTAL(i) || IN_MULTICAST(i))
-		return (0);
-	if (IN_CLASSA(i)) {
-		net = i & IN_CLASSA_NET;
-		if (net == 0 || net == (IN_LOOPBACKNET << IN_CLASSA_NSHIFT))
-			return (0);
-	}
-	return (1);
-}
-
-/*
- * Trim a mask in a sockaddr
- */
-static void
-in_socktrim(ap)
-struct sockaddr_in *ap;
-{
-    register char *cplim = (char *) &ap->sin_addr;
-    register char *cp = (char *) (&ap->sin_addr + 1);
-
-    ap->sin_len = 0;
-    while (--cp >= cplim)
-        if (*cp) {
-	    (ap)->sin_len = cp - (char *) (ap) + 1;
-	    break;
-	}
-}
-
-static int in_interfaces;	/* number of external internet interfaces */
-
-/*
- * Generic internet control operations (ioctl's).
- * Ifp is 0 if not an interface-specific ioctl.
- */
-/* ARGSUSED */
-int
-in_control(so, cmd, data, ifp)
-	struct socket *so;
-	u_long cmd;
-	caddr_t data;
-	register struct ifnet *ifp;
-{
-	register struct ifreq *ifr = (struct ifreq *)data;
-	register struct in_ifaddr *ia = 0, *iap;
-	register struct ifaddr *ifa;
-	struct in_ifaddr *oia;
-	struct in_aliasreq *ifra = (struct in_aliasreq *)data;
-	struct sockaddr_in oldaddr;
-	int error, hostIsNew, maskIsNew, s;
-	u_long i;
-	struct multi_kludge *mk;
-
-	/*
-	 * Find address for this interface, if it exists.
-	 *
-	 * If an alias address was specified, find that one instead of
-	 * the first one on the interface.
-	 */
-	if (ifp)
-		for (iap = in_ifaddr; iap; iap = iap->ia_next)
-			if (iap->ia_ifp == ifp) {
-				if (((struct sockaddr_in *)&ifr->ifr_addr)->sin_addr.s_addr ==
-				    iap->ia_addr.sin_addr.s_addr) {
-					ia = iap;
-					break;
-				} else if (ia == NULL) {
-					ia = iap;
-					if (ifr->ifr_addr.sa_family != AF_INET)
-						break;
-				}
-			}
-
-	switch (cmd) {
-
-	case SIOCAIFADDR:
-	case SIOCDIFADDR:
-		if (ifra->ifra_addr.sin_family == AF_INET) {
-			for (oia = ia; ia; ia = ia->ia_next) {
-				if (ia->ia_ifp == ifp  &&
-				    ia->ia_addr.sin_addr.s_addr ==
-				    ifra->ifra_addr.sin_addr.s_addr)
-					break;
-			}
-			if ((ifp->if_flags & IFF_POINTOPOINT)
-			    && (cmd == SIOCAIFADDR)
-			    && (ifra->ifra_dstaddr.sin_addr.s_addr
-				== INADDR_ANY)) {
-				return EDESTADDRREQ;
-			}
-		}
-		if (cmd == SIOCDIFADDR && ia == 0)
-			return (EADDRNOTAVAIL);
-		/* FALLTHROUGH */
-	case SIOCSIFADDR:
-	case SIOCSIFNETMASK:
-	case SIOCSIFDSTADDR:
-		if ((so->so_state & SS_PRIV) == 0)
-			return (EPERM);
-
-		if (ifp == 0)
-			panic("in_control");
-		if (ia == (struct in_ifaddr *)0) {
-			oia = (struct in_ifaddr *)
-				malloc(sizeof *oia, M_IFADDR, M_WAITOK);
-			if (oia == (struct in_ifaddr *)NULL)
-				return (ENOBUFS);
-			bzero((caddr_t)oia, sizeof *oia);
-			ia = in_ifaddr;
-			/*
-			 * Protect from ipintr() traversing address list
-			 * while we're modifying it.
-			 */
-			s = splnet();
-
-			if (ia) {
-				for ( ; ia->ia_next; ia = ia->ia_next)
-					continue;
-				ia->ia_next = oia;
-			} else
-				in_ifaddr = oia;
-			ia = oia;
-			ifa = ifp->if_addrlist;
-			if (ifa) {
-				for ( ; ifa->ifa_next; ifa = ifa->ifa_next)
-					continue;
-				ifa->ifa_next = (struct ifaddr *) ia;
-			} else
-				ifp->if_addrlist = (struct ifaddr *) ia;
-			ia->ia_ifa.ifa_addr = (struct sockaddr *)&ia->ia_addr;
-			ia->ia_ifa.ifa_dstaddr
-					= (struct sockaddr *)&ia->ia_dstaddr;
-			ia->ia_ifa.ifa_netmask
-					= (struct sockaddr *)&ia->ia_sockmask;
-			ia->ia_sockmask.sin_len = 8;
-			if (ifp->if_flags & IFF_BROADCAST) {
-				ia->ia_broadaddr.sin_len = sizeof(ia->ia_addr);
-				ia->ia_broadaddr.sin_family = AF_INET;
-			}
-			ia->ia_ifp = ifp;
-			if (!(ifp->if_flags & IFF_LOOPBACK))
-				in_interfaces++;
-			splx(s);
-		}
-		break;
-
-	case SIOCSIFBRDADDR:
-		if ((so->so_state & SS_PRIV) == 0)
-			return (EPERM);
-		/* FALLTHROUGH */
-
-	case SIOCGIFADDR:
-	case SIOCGIFNETMASK:
-	case SIOCGIFDSTADDR:
-	case SIOCGIFBRDADDR:
-		if (ia == (struct in_ifaddr *)0)
-			return (EADDRNOTAVAIL);
-		break;
-	}
-	switch (cmd) {
-
-	case SIOCGIFADDR:
-		*((struct sockaddr_in *)&ifr->ifr_addr) = ia->ia_addr;
-		break;
-
-	case SIOCGIFBRDADDR:
-		if ((ifp->if_flags & IFF_BROADCAST) == 0)
-			return (EINVAL);
-		*((struct sockaddr_in *)&ifr->ifr_dstaddr) = ia->ia_broadaddr;
-		break;
-
-	case SIOCGIFDSTADDR:
-		if ((ifp->if_flags & IFF_POINTOPOINT) == 0)
-			return (EINVAL);
-		*((struct sockaddr_in *)&ifr->ifr_dstaddr) = ia->ia_dstaddr;
-		break;
-
-	case SIOCGIFNETMASK:
-		*((struct sockaddr_in *)&ifr->ifr_addr) = ia->ia_sockmask;
-		break;
-
-	case SIOCSIFDSTADDR:
-		if ((ifp->if_flags & IFF_POINTOPOINT) == 0)
-			return (EINVAL);
-		oldaddr = ia->ia_dstaddr;
-		ia->ia_dstaddr = *(struct sockaddr_in *)&ifr->ifr_dstaddr;
-		if (ifp->if_ioctl && (error = (*ifp->if_ioctl)
-					(ifp, SIOCSIFDSTADDR, (caddr_t)ia))) {
-			ia->ia_dstaddr = oldaddr;
-			return (error);
-		}
-		if (ia->ia_flags & IFA_ROUTE) {
-			ia->ia_ifa.ifa_dstaddr = (struct sockaddr *)&oldaddr;
-			rtinit(&(ia->ia_ifa), (int)RTM_DELETE, RTF_HOST);
-			ia->ia_ifa.ifa_dstaddr =
-					(struct sockaddr *)&ia->ia_dstaddr;
-			rtinit(&(ia->ia_ifa), (int)RTM_ADD, RTF_HOST|RTF_UP);
-		}
-		break;
-
-	case SIOCSIFBRDADDR:
-		if ((ifp->if_flags & IFF_BROADCAST) == 0)
-			return (EINVAL);
-		ia->ia_broadaddr = *(struct sockaddr_in *)&ifr->ifr_broadaddr;
-		break;
-
-	case SIOCSIFADDR:
-		return (in_ifinit(ifp, ia,
-		    (struct sockaddr_in *) &ifr->ifr_addr, 1));
-
-	case SIOCSIFNETMASK:
-		i = ifra->ifra_addr.sin_addr.s_addr;
-		ia->ia_subnetmask = ntohl(ia->ia_sockmask.sin_addr.s_addr = i);
-		break;
-
-	case SIOCAIFADDR:
-		maskIsNew = 0;
-		hostIsNew = 1;
-		error = 0;
-		if (ia->ia_addr.sin_family == AF_INET) {
-			if (ifra->ifra_addr.sin_len == 0) {
-				ifra->ifra_addr = ia->ia_addr;
-				hostIsNew = 0;
-			} else if (ifra->ifra_addr.sin_addr.s_addr ==
-					       ia->ia_addr.sin_addr.s_addr)
-				hostIsNew = 0;
-		}
-		if (ifra->ifra_mask.sin_len) {
-			in_ifscrub(ifp, ia);
-			ia->ia_sockmask = ifra->ifra_mask;
-			ia->ia_subnetmask =
-			     ntohl(ia->ia_sockmask.sin_addr.s_addr);
-			maskIsNew = 1;
-		}
-		if ((ifp->if_flags & IFF_POINTOPOINT) &&
-		    (ifra->ifra_dstaddr.sin_family == AF_INET)) {
-			in_ifscrub(ifp, ia);
-			ia->ia_dstaddr = ifra->ifra_dstaddr;
-			maskIsNew  = 1; /* We lie; but the effect's the same */
-		}
-		if (ifra->ifra_addr.sin_family == AF_INET &&
-		    (hostIsNew || maskIsNew))
-			error = in_ifinit(ifp, ia, &ifra->ifra_addr, 0);
-		if ((ifp->if_flags & IFF_BROADCAST) &&
-		    (ifra->ifra_broadaddr.sin_family == AF_INET))
-			ia->ia_broadaddr = ifra->ifra_broadaddr;
-		return (error);
-
-	case SIOCDIFADDR:
-		mk = malloc(sizeof *mk, M_IPMADDR, M_WAITOK);
-		if (!mk)
-			return ENOBUFS;
-
-		in_ifscrub(ifp, ia);
-		/*
-		 * Protect from ipintr() traversing address list
-		 * while we're modifying it.
-		 */
-		s = splnet();
-
-		if ((ifa = ifp->if_addrlist) == (struct ifaddr *)ia)
-			ifp->if_addrlist = ifa->ifa_next;
-		else {
-			while (ifa->ifa_next &&
-			       (ifa->ifa_next != (struct ifaddr *)ia))
-				    ifa = ifa->ifa_next;
-			if (ifa->ifa_next)
-				ifa->ifa_next = ((struct ifaddr *)ia)->ifa_next;
-			else
-				printf("Couldn't unlink inifaddr from ifp\n");
-		}
-		oia = ia;
-		if (oia == (ia = in_ifaddr))
-			in_ifaddr = ia->ia_next;
-		else {
-			while (ia->ia_next && (ia->ia_next != oia))
-				ia = ia->ia_next;
-			if (ia->ia_next)
-				ia->ia_next = oia->ia_next;
-			else
-				printf("Didn't unlink inifadr from list\n");
-		}
-
-		if (!oia->ia_multiaddrs.lh_first) {
-			IFAFREE(&oia->ia_ifa);
-			FREE(mk, M_IPMADDR);
-			splx(s);
-			break;
-		}
-
-		/*
-		 * Multicast address kludge:
-		 * If there were any multicast addresses attached to this
-		 * interface address, either move them to another address
-		 * on this interface, or save them until such time as this
-		 * interface is reconfigured for IP.
-		 */
-		IFP_TO_IA(oia->ia_ifp, ia);
-		if (ia) {	/* there is another address */
-			struct in_multi *inm;
-			for(inm = oia->ia_multiaddrs.lh_first; inm;
-			    inm = inm->inm_entry.le_next) {
-				IFAFREE(&inm->inm_ia->ia_ifa);
-				ia->ia_ifa.ifa_refcnt++;
-				inm->inm_ia = ia;
-				LIST_INSERT_HEAD(&ia->ia_multiaddrs, inm,
-						 inm_entry);
-			}
-			FREE(mk, M_IPMADDR);
-		} else {	/* last address on this if deleted, save */
-			struct in_multi *inm;
-
-			LIST_INIT(&mk->mk_head);
-			mk->mk_ifp = ifp;
-
-			for(inm = oia->ia_multiaddrs.lh_first; inm;
-			    inm = inm->inm_entry.le_next) {
-				LIST_INSERT_HEAD(&mk->mk_head, inm, inm_entry);
-			}
-
-			if (mk->mk_head.lh_first) {
-				LIST_INSERT_HEAD(&in_mk, mk, mk_entry);
-			} else {
-				FREE(mk, M_IPMADDR);
-			}
-		}
-
-		IFAFREE((&oia->ia_ifa));
-		splx(s);
-		break;
-
-	default:
-		if (ifp == 0 || ifp->if_ioctl == 0)
-			return (EOPNOTSUPP);
-		return ((*ifp->if_ioctl)(ifp, cmd, data));
-	}
-	return (0);
-}
-
-/*
- * Delete any existing route for an interface.
- */
-static void
-in_ifscrub(ifp, ia)
-	register struct ifnet *ifp;
-	register struct in_ifaddr *ia;
-{
-
-	if ((ia->ia_flags & IFA_ROUTE) == 0)
-		return;
-	if (ifp->if_flags & (IFF_LOOPBACK|IFF_POINTOPOINT))
-		rtinit(&(ia->ia_ifa), (int)RTM_DELETE, RTF_HOST);
-	else
-		rtinit(&(ia->ia_ifa), (int)RTM_DELETE, 0);
-	ia->ia_flags &= ~IFA_ROUTE;
-}
-
-/*
- * Initialize an interface's internet address
- * and routing table entry.
- */
-static int
-in_ifinit(ifp, ia, sin, scrub)
-	register struct ifnet *ifp;
-	register struct in_ifaddr *ia;
-	struct sockaddr_in *sin;
-	int scrub;
-{
-	register u_long i = ntohl(sin->sin_addr.s_addr);
-	struct sockaddr_in oldaddr;
-	int s = splimp(), flags = RTF_UP, error;
-	struct multi_kludge *mk;
-
-	oldaddr = ia->ia_addr;
-	ia->ia_addr = *sin;
-	/*
-	 * Give the interface a chance to initialize
-	 * if this is its first address,
-	 * and to validate the address if necessary.
-	 */
-	if (ifp->if_ioctl &&
-	    (error = (*ifp->if_ioctl)(ifp, SIOCSIFADDR, (caddr_t)ia))) {
-		splx(s);
-		ia->ia_addr = oldaddr;
-		return (error);
-	}
-	splx(s);
-	if (scrub) {
-		ia->ia_ifa.ifa_addr = (struct sockaddr *)&oldaddr;
-		in_ifscrub(ifp, ia);
-		ia->ia_ifa.ifa_addr = (struct sockaddr *)&ia->ia_addr;
-	}
-	if (IN_CLASSA(i))
-		ia->ia_netmask = IN_CLASSA_NET;
-	else if (IN_CLASSB(i))
-		ia->ia_netmask = IN_CLASSB_NET;
-	else
-		ia->ia_netmask = IN_CLASSC_NET;
-	/*
-	 * The subnet mask usually includes at least the standard network part,
-	 * but may may be smaller in the case of supernetting.
-	 * If it is set, we believe it.
-	 */
-	if (ia->ia_subnetmask == 0) {
-		ia->ia_subnetmask = ia->ia_netmask;
-		ia->ia_sockmask.sin_addr.s_addr = htonl(ia->ia_subnetmask);
-	} else
-		ia->ia_netmask &= ia->ia_subnetmask;
-	ia->ia_net = i & ia->ia_netmask;
-	ia->ia_subnet = i & ia->ia_subnetmask;
-	in_socktrim(&ia->ia_sockmask);
-	/*
-	 * Add route for the network.
-	 */
-	ia->ia_ifa.ifa_metric = ifp->if_metric;
-	if (ifp->if_flags & IFF_BROADCAST) {
-		ia->ia_broadaddr.sin_addr.s_addr =
-			htonl(ia->ia_subnet | ~ia->ia_subnetmask);
-		ia->ia_netbroadcast.s_addr =
-			htonl(ia->ia_net | ~ ia->ia_netmask);
-	} else if (ifp->if_flags & IFF_LOOPBACK) {
-		ia->ia_ifa.ifa_dstaddr = ia->ia_ifa.ifa_addr;
-		flags |= RTF_HOST;
-	} else if (ifp->if_flags & IFF_POINTOPOINT) {
-		if (ia->ia_dstaddr.sin_family != AF_INET)
-			return (0);
-		flags |= RTF_HOST;
-	}
-	if ((error = rtinit(&(ia->ia_ifa), (int)RTM_ADD, flags)) == 0)
-		ia->ia_flags |= IFA_ROUTE;
-
-	LIST_INIT(&ia->ia_multiaddrs);
-	/*
-	 * If the interface supports multicast, join the "all hosts"
-	 * multicast group on that interface.
-	 */
-	if (ifp->if_flags & IFF_MULTICAST) {
-		struct in_addr addr;
-
-		/*
-		 * Continuation of multicast address hack:
-		 * If there was a multicast group list previously saved
-		 * for this interface, then we re-attach it to the first
-		 * address configured on the i/f.
-		 */
-		for(mk = in_mk.lh_first; mk; mk = mk->mk_entry.le_next) {
-			if(mk->mk_ifp == ifp) {
-				struct in_multi *inm;
-
-				for(inm = mk->mk_head.lh_first; inm;
-				    inm = inm->inm_entry.le_next) {
-					IFAFREE(&inm->inm_ia->ia_ifa);
-					ia->ia_ifa.ifa_refcnt++;
-					inm->inm_ia = ia;
-					LIST_INSERT_HEAD(&ia->ia_multiaddrs,
-							 inm, inm_entry);
-				}
-				LIST_REMOVE(mk, mk_entry);
-				free(mk, M_IPMADDR);
-				break;
-			}
-		}
-
-		addr.s_addr = htonl(INADDR_ALLHOSTS_GROUP);
-		in_addmulti(&addr, ifp);
-	}
-	return (error);
-}
-
-
-/*
- * Return 1 if the address might be a local broadcast address.
- */
-int
-in_broadcast(in, ifp)
-	struct in_addr in;
-        struct ifnet *ifp;
-{
-	register struct ifaddr *ifa;
-	u_long t;
-
-	if (in.s_addr == INADDR_BROADCAST ||
-	    in.s_addr == INADDR_ANY)
-		return 1;
-	if ((ifp->if_flags & IFF_BROADCAST) == 0)
-		return 0;
-	t = ntohl(in.s_addr);
-	/*
-	 * Look through the list of addresses for a match
-	 * with a broadcast address.
-	 */
-#define ia ((struct in_ifaddr *)ifa)
-	for (ifa = ifp->if_addrlist; ifa; ifa = ifa->ifa_next)
-		if (ifa->ifa_addr->sa_family == AF_INET &&
-		    (in.s_addr == ia->ia_broadaddr.sin_addr.s_addr ||
-		     in.s_addr == ia->ia_netbroadcast.s_addr ||
-		     /*
-		      * Check for old-style (host 0) broadcast.
-		      */
-		     t == ia->ia_subnet || t == ia->ia_net) &&
-		     /*
-		      * Check for an all one subnetmask. These
-		      * only exist when an interface gets a secondary
-		      * address.
-		      */
-		     ia->ia_subnetmask != (u_long)0xffffffff)
-			    return 1;
-	return (0);
-#undef ia
-}
-/*
- * Add an address to the list of IP multicast addresses for a given interface.
- */
-struct in_multi *
-in_addmulti(ap, ifp)
-	register struct in_addr *ap;
-	register struct ifnet *ifp;
-{
-	register struct in_multi *inm;
-	struct ifreq ifr;
-	struct in_ifaddr *ia;
-	int s = splnet();
-
-	/*
-	 * See if address already in list.
-	 */
-	IN_LOOKUP_MULTI(*ap, ifp, inm);
-	if (inm != NULL) {
-		/*
-		 * Found it; just increment the reference count.
-		 */
-		++inm->inm_refcount;
-	}
-	else {
-		/*
-		 * New address; allocate a new multicast record
-		 * and link it into the interface's multicast list.
-		 */
-		inm = (struct in_multi *)malloc(sizeof(*inm),
-		    M_IPMADDR, M_NOWAIT);
-		if (inm == NULL) {
-			splx(s);
-			return (NULL);
-		}
-		inm->inm_addr = *ap;
-		inm->inm_ifp = ifp;
-		inm->inm_refcount = 1;
-		IFP_TO_IA(ifp, ia);
-		if (ia == NULL) {
-			free(inm, M_IPMADDR);
-			splx(s);
-			return (NULL);
-		}
-		inm->inm_ia = ia;
-		ia->ia_ifa.ifa_refcnt++; /* gain a reference */
-		LIST_INSERT_HEAD(&ia->ia_multiaddrs, inm, inm_entry);
-
-		/*
-		 * Ask the network driver to update its multicast reception
-		 * filter appropriately for the new address.
-		 */
-		((struct sockaddr_in *)&ifr.ifr_addr)->sin_family = AF_INET;
-		((struct sockaddr_in *)&ifr.ifr_addr)->sin_addr = *ap;
-		if ((ifp->if_ioctl == NULL) ||
-		    (*ifp->if_ioctl)(ifp, SIOCADDMULTI,(caddr_t)&ifr) != 0) {
-			LIST_REMOVE(inm, inm_entry);
-			IFAFREE(&ia->ia_ifa); /* release reference */
-			free(inm, M_IPMADDR);
-			splx(s);
-			return (NULL);
-		}
-		/*
-		 * Let IGMP know that we have joined a new IP multicast group.
-		 */
-		igmp_joingroup(inm);
-	}
-	splx(s);
-	return (inm);
-}
-
-/*
- * Delete a multicast address record.
- */
-void
-in_delmulti(inm)
-	register struct in_multi *inm;
-{
-	struct ifreq ifr;
-	int s = splnet();
-
-	if (--inm->inm_refcount == 0) {
-		/*
-		 * No remaining claims to this record; let IGMP know that
-		 * we are leaving the multicast group.
-		 */
-		igmp_leavegroup(inm);
-		/*
-		 * Unlink from list.
-		 */
-		LIST_REMOVE(inm, inm_entry);
-		IFAFREE(&inm->inm_ia->ia_ifa); /* release reference */
-
-		/*
-		 * Notify the network driver to update its multicast reception
-		 * filter.
-		 */
-		((struct sockaddr_in *)&(ifr.ifr_addr))->sin_family = AF_INET;
-		((struct sockaddr_in *)&(ifr.ifr_addr))->sin_addr =
-								inm->inm_addr;
-		(*inm->inm_ifp->if_ioctl)(inm->inm_ifp, SIOCDELMULTI,
-							     (caddr_t)&ifr);
-		free(inm, M_IPMADDR);
-	}
-	splx(s);
-}
diff --git a/cpukit/libnetworking/netinet/in.h b/cpukit/libnetworking/netinet/in.h
deleted file mode 100644
index ba3cbb21cc..0000000000
--- a/cpukit/libnetworking/netinet/in.h
+++ /dev/null
@@ -1,433 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)in.h	8.3 (Berkeley) 1/3/94
- * $Id$
- */
-
-#ifndef _NETINET_IN_H_
-#define _NETINET_IN_H_
-
-/*
- * Constants and structures defined by the internet system,
- * Per RFC 790, September 1981, and numerous additions.
- */
-
-/*
- * Protocols (RFC 1700)
- */
-#define	IPPROTO_IP		0		/* dummy for IP */
-#define	IPPROTO_ICMP		1		/* control message protocol */
-#define	IPPROTO_IGMP		2		/* group mgmt protocol */
-#define	IPPROTO_GGP		3		/* gateway^2 (deprecated) */
-#define IPPROTO_IPIP		4 		/* IP encapsulation in IP */
-#define	IPPROTO_TCP		6		/* tcp */
-#define	IPPROTO_ST		7		/* Stream protocol II */
-#define	IPPROTO_EGP		8		/* exterior gateway protocol */
-#define	IPPROTO_PIGP		9		/* private interior gateway */
-#define	IPPROTO_RCCMON		10		/* BBN RCC Monitoring */
-#define	IPPROTO_NVPII		11		/* network voice protocol*/
-#define	IPPROTO_PUP		12		/* pup */
-#define	IPPROTO_ARGUS		13		/* Argus */
-#define	IPPROTO_EMCON		14		/* EMCON */
-#define	IPPROTO_XNET		15		/* Cross Net Debugger */
-#define	IPPROTO_CHAOS		16		/* Chaos*/
-#define	IPPROTO_UDP		17		/* user datagram protocol */
-#define	IPPROTO_MUX		18		/* Multiplexing */
-#define	IPPROTO_MEAS		19		/* DCN Measurement Subsystems */
-#define	IPPROTO_HMP		20		/* Host Monitoring */
-#define	IPPROTO_PRM		21		/* Packet Radio Measurement */
-#define	IPPROTO_IDP		22		/* xns idp */
-#define	IPPROTO_TRUNK1		23		/* Trunk-1 */
-#define	IPPROTO_TRUNK2		24		/* Trunk-2 */
-#define	IPPROTO_LEAF1		25		/* Leaf-1 */
-#define	IPPROTO_LEAF2		26		/* Leaf-2 */
-#define	IPPROTO_RDP		27		/* Reliable Data */
-#define	IPPROTO_IRTP		28		/* Reliable Transaction */
-#define	IPPROTO_TP		29 		/* tp-4 w/ class negotiation */
-#define	IPPROTO_BLT		30		/* Bulk Data Transfer */
-#define	IPPROTO_NSP		31		/* Network Services */
-#define	IPPROTO_INP		32		/* Merit Internodal */
-#define	IPPROTO_SEP		33		/* Sequential Exchange */
-#define	IPPROTO_3PC		34		/* Third Party Connect */
-#define	IPPROTO_IDPR		35		/* InterDomain Policy Routing */
-#define	IPPROTO_XTP		36		/* XTP */
-#define	IPPROTO_DDP		37		/* Datagram Delivery */
-#define	IPPROTO_CMTP		38		/* Control Message Transport */
-#define	IPPROTO_TPXX		39		/* TP++ Transport */
-#define	IPPROTO_IL		40		/* IL transport protocol */
-#define	IPPROTO_SIP		41		/* Simple Internet Protocol */
-#define	IPPROTO_SDRP		42		/* Source Demand Routing */
-#define	IPPROTO_SIPSR		43		/* SIP Source Route */
-#define	IPPROTO_SIPFRAG		44		/* SIP Fragment */
-#define	IPPROTO_IDRP		45		/* InterDomain Routing*/
-#define IPPROTO_RSVP		46 		/* resource reservation */
-#define	IPPROTO_GRE		47		/* General Routing Encap. */
-#define	IPPROTO_MHRP		48		/* Mobile Host Routing */
-#define	IPPROTO_BHA		49		/* BHA */
-#define	IPPROTO_ESP		50		/* SIPP Encap Sec. Payload */
-#define	IPPROTO_AH		51		/* SIPP Auth Header */
-#define	IPPROTO_INLSP		52		/* Integ. Net Layer Security */
-#define	IPPROTO_SWIPE		53		/* IP with encryption */
-#define	IPPROTO_NHRP		54		/* Next Hop Resolution */
-/* 55-60: Unassigned */
-#define	IPPROTO_AHIP		61		/* any host internal protocol */
-#define	IPPROTO_CFTP		62		/* CFTP */
-#define	IPPROTO_HELLO		63		/* "hello" routing protocol */
-#define	IPPROTO_SATEXPAK	64		/* SATNET/Backroom EXPAK */
-#define	IPPROTO_KRYPTOLAN	65		/* Kryptolan */
-#define	IPPROTO_RVD		66		/* Remote Virtual Disk */
-#define	IPPROTO_IPPC		67		/* Pluribus Packet Core */
-#define	IPPROTO_ADFS		68		/* Any distributed FS */
-#define	IPPROTO_SATMON		69		/* Satnet Monitoring */
-#define	IPPROTO_VISA		70		/* VISA Protocol */
-#define	IPPROTO_IPCV		71		/* Packet Core Utility */
-#define	IPPROTO_CPNX		72		/* Comp. Prot. Net. Executive */
-#define	IPPROTO_CPHB		73		/* Comp. Prot. HeartBeat */
-#define	IPPROTO_WSN		74		/* Wang Span Network */
-#define	IPPROTO_PVP		75		/* Packet Video Protocol */
-#define	IPPROTO_BRSATMON	76		/* BackRoom SATNET Monitoring */
-#define	IPPROTO_ND		77		/* Sun net disk proto (temp.) */
-#define	IPPROTO_WBMON		78		/* WIDEBAND Monitoring */
-#define	IPPROTO_WBEXPAK		79		/* WIDEBAND EXPAK */
-#define	IPPROTO_EON		80		/* ISO cnlp */
-#define	IPPROTO_VMTP		81		/* VMTP */
-#define	IPPROTO_SVMTP		82		/* Secure VMTP */
-#define	IPPROTO_VINES		83		/* Banyon VINES */
-#define	IPPROTO_TTP		84		/* TTP */
-#define	IPPROTO_IGP		85		/* NSFNET-IGP */
-#define	IPPROTO_DGP		86		/* dissimilar gateway prot. */
-#define	IPPROTO_TCF		87		/* TCF */
-#define	IPPROTO_IGRP		88		/* Cisco/GXS IGRP */
-#define	IPPROTO_OSPFIGP		89		/* OSPFIGP */
-#define	IPPROTO_SRPC		90		/* Strite RPC protocol */
-#define	IPPROTO_LARP		91		/* Locus Address Resoloution */
-#define	IPPROTO_MTP		92		/* Multicast Transport */
-#define	IPPROTO_AX25		93		/* AX.25 Frames */
-#define	IPPROTO_IPEIP		94		/* IP encapsulated in IP */
-#define	IPPROTO_MICP		95		/* Mobile Int.ing control */
-#define	IPPROTO_SCCSP		96		/* Semaphore Comm. security */
-#define	IPPROTO_ETHERIP		97		/* Ethernet IP encapsulation */
-#define	IPPROTO_ENCAP		98		/* encapsulation header */
-#define	IPPROTO_APES		99		/* any private encr. scheme */
-#define	IPPROTO_GMTP		100		/* GMTP*/
-/* 101-254: Unassigned */
-/* 255: Reserved */
-/* BSD Private, local use, namespace incursion */
-#define	IPPROTO_DIVERT		254		/* divert pseudo-protocol */
-#define	IPPROTO_RAW		255		/* raw IP packet */
-#define	IPPROTO_MAX		256
-
-
-/*
- * Local port number conventions:
- *
- * When a user does a bind(2) or connect(2) with a port number of zero,
- * a non-conflicting local port address is chosen.
- * The default range is IPPORT_RESERVED through
- * IPPORT_USERRESERVED, although that is settable by sysctl.
- *
- * A user may set the IPPROTO_IP option IP_PORTRANGE to change this
- * default assignment range.
- *
- * The value IP_PORTRANGE_DEFAULT causes the default behavior.
- *
- * The value IP_PORTRANGE_HIGH changes the range of candidate port numbers
- * into the "high" range.  These are reserved for client outbound connections
- * which do not want to be filtered by any firewalls.
- *
- * The value IP_PORTRANGE_LOW changes the range to the "low" are
- * that is (by convention) restricted to privileged processes.  This
- * convention is based on "vouchsafe" principles only.  It is only secure
- * if you trust the remote host to restrict these ports.
- *
- * The default range of ports and the high range can be changed by
- * sysctl(3).  (net.inet.ip.port{hi,low}{first,last}_auto)
- *
- * Changing those values has bad security implications if you are
- * using a a stateless firewall that is allowing packets outside of that
- * range in order to allow transparent outgoing connections.
- *
- * Such a firewall configuration will generally depend on the use of these
- * default values.  If you change them, you may find your Security
- * Administrator looking for you with a heavy object.
- */
-
-/*
- * Ports < IPPORT_RESERVED are reserved for
- * privileged processes (e.g. root).         (IP_PORTRANGE_LOW)
- * Ports > IPPORT_USERRESERVED are reserved
- * for servers, not necessarily privileged.  (IP_PORTRANGE_DEFAULT)
- */
-#define	IPPORT_RESERVED		1024
-#define	IPPORT_USERRESERVED	5000
-
-/*
- * Default local port range to use by setting IP_PORTRANGE_HIGH
- */
-#define	IPPORT_HIFIRSTAUTO	40000
-#define	IPPORT_HILASTAUTO	44999
-
-/*
- * Scanning for a free reserved port return a value below IPPORT_RESERVED,
- * but higher than IPPORT_RESERVEDSTART.  Traditionally the start value was
- * 512, but that conflicts with some well-known-services that firewalls may
- * have a fit if we use.
- */
-#define IPPORT_RESERVEDSTART	600
-
-/*
- * Internet address (a structure for historical reasons)
- */
-struct in_addr {
-	u_long s_addr;
-};
-
-/*
- * Definitions of bits in internet address integers.
- * On subnets, the decomposition of addresses to host and net parts
- * is done according to subnet mask, not the masks here.
- */
-#define	IN_CLASSA(i)		(((long)(i) & 0x80000000) == 0)
-#define	IN_CLASSA_NET		0xff000000
-#define	IN_CLASSA_NSHIFT	24
-#define	IN_CLASSA_HOST		0x00ffffff
-#define	IN_CLASSA_MAX		128
-
-#define	IN_CLASSB(i)		(((long)(i) & 0xc0000000) == 0x80000000)
-#define	IN_CLASSB_NET		0xffff0000
-#define	IN_CLASSB_NSHIFT	16
-#define	IN_CLASSB_HOST		0x0000ffff
-#define	IN_CLASSB_MAX		65536
-
-#define	IN_CLASSC(i)		(((long)(i) & 0xe0000000) == 0xc0000000)
-#define	IN_CLASSC_NET		0xffffff00
-#define	IN_CLASSC_NSHIFT	8
-#define	IN_CLASSC_HOST		0x000000ff
-
-#define	IN_CLASSD(i)		(((long)(i) & 0xf0000000) == 0xe0000000)
-#define	IN_CLASSD_NET		0xf0000000	/* These ones aren't really */
-#define	IN_CLASSD_NSHIFT	28		/* net and host fields, but */
-#define	IN_CLASSD_HOST		0x0fffffff	/* routing needn't know.    */
-#define	IN_MULTICAST(i)		IN_CLASSD(i)
-
-#define	IN_EXPERIMENTAL(i)	(((long)(i) & 0xf0000000) == 0xf0000000)
-#define	IN_BADCLASS(i)		(((long)(i) & 0xf0000000) == 0xf0000000)
-
-#define	INADDR_ANY		(u_long)0x00000000
-#define	INADDR_BROADCAST	(u_long)0xffffffff	/* must be masked */
-#ifndef KERNEL
-#define	INADDR_NONE		0xffffffff		/* -1 return */
-#endif
-
-#define	INADDR_UNSPEC_GROUP	(u_long)0xe0000000	/* 224.0.0.0 */
-#define	INADDR_ALLHOSTS_GROUP	(u_long)0xe0000001	/* 224.0.0.1 */
-#define	INADDR_ALLRTRS_GROUP	(u_long)0xe0000002	/* 224.0.0.2 */
-#define	INADDR_MAX_LOCAL_GROUP	(u_long)0xe00000ff	/* 224.0.0.255 */
-
-#define	IN_LOOPBACKNET		127			/* official! */
-
-/*
- * Socket address, internet style.
- */
-struct sockaddr_in {
-	u_char	sin_len;
-	u_char	sin_family;
-	u_short	sin_port;
-	struct	in_addr sin_addr;
-	char	sin_zero[8];
-};
-
-/*
- * Structure used to describe IP options.
- * Used to store options internally, to pass them to a process,
- * or to restore options retrieved earlier.
- * The ip_dst is used for the first-hop gateway when using a source route
- * (this gets put into the header proper).
- */
-struct ip_opts {
-	struct	in_addr ip_dst;		/* first hop, 0 w/o src rt */
-	char	ip_opts[40];		/* actually variable in size */
-};
-
-/*
- * Options for use with [gs]etsockopt at the IP level.
- * First word of comment is data type; bool is stored in int.
- */
-#define	IP_OPTIONS		1    /* buf/ip_opts; set/get IP options */
-#define	IP_HDRINCL		2    /* int; header is included with data */
-#define	IP_TOS			3    /* int; IP type of service and preced. */
-#define	IP_TTL			4    /* int; IP time to live */
-#define	IP_RECVOPTS		5    /* bool; receive all IP opts w/dgram */
-#define	IP_RECVRETOPTS		6    /* bool; receive IP opts for response */
-#define	IP_RECVDSTADDR		7    /* bool; receive IP dst addr w/dgram */
-#define	IP_RETOPTS		8    /* ip_opts; set/get IP options */
-#define	IP_MULTICAST_IF		9    /* u_char; set/get IP multicast i/f  */
-#define	IP_MULTICAST_TTL	10   /* u_char; set/get IP multicast ttl */
-#define	IP_MULTICAST_LOOP	11   /* u_char; set/get IP multicast loopback */
-#define	IP_ADD_MEMBERSHIP	12   /* ip_mreq; add an IP group membership */
-#define	IP_DROP_MEMBERSHIP	13   /* ip_mreq; drop an IP group membership */
-#define IP_MULTICAST_VIF	14   /* set/get IP mcast virt. iface */
-#define IP_RSVP_ON		15   /* enable RSVP in kernel */
-#define IP_RSVP_OFF		16   /* disable RSVP in kernel */
-#define IP_RSVP_VIF_ON		17   /* set RSVP per-vif socket */
-#define IP_RSVP_VIF_OFF		18   /* unset RSVP per-vif socket */
-#define IP_PORTRANGE		19   /* int; range to choose for unspec port */
-#define	IP_RECVIF		20   /* bool; receive reception if w/dgram */
-
-#define IP_FW_ADD     		50   /* add a firewall rule to chain */
-#define IP_FW_DEL    		51   /* delete a firewall rule from chain */
-#define IP_FW_FLUSH   		52   /* flush firewall rule chain */
-#define IP_FW_ZERO    		53   /* clear single/all firewall counter(s) */
-#define IP_FW_GET     		54   /* get entire firewall rule chain */
-#define IP_NAT			55   /* set/get NAT opts */
-
-/*
- * Defaults and limits for options
- */
-#define	IP_DEFAULT_MULTICAST_TTL  1	/* normally limit m'casts to 1 hop  */
-#define	IP_DEFAULT_MULTICAST_LOOP 1	/* normally hear sends if a member  */
-#define	IP_MAX_MEMBERSHIPS	20	/* per socket */
-
-/*
- * Argument structure for IP_ADD_MEMBERSHIP and IP_DROP_MEMBERSHIP.
- */
-struct ip_mreq {
-	struct	in_addr imr_multiaddr;	/* IP multicast address of group */
-	struct	in_addr imr_interface;	/* local IP address of interface */
-};
-
-/*
- * Argument for IP_PORTRANGE:
- * - which range to search when port is unspecified at bind() or connect()
- */
-#define	IP_PORTRANGE_DEFAULT	0	/* default range */
-#define	IP_PORTRANGE_HIGH	1	/* "high" - request firewall bypass */
-#define	IP_PORTRANGE_LOW	2	/* "low" - vouchsafe security */
-
-/*
- * Definitions for inet sysctl operations.
- *
- * Third level is protocol number.
- * Fourth level is desired variable within that protocol.
- */
-#define	IPPROTO_MAXID	(IPPROTO_IDP + 1)	/* don't list to IPPROTO_MAX */
-
-#define	CTL_IPPROTO_NAMES { \
-	{ "ip", CTLTYPE_NODE }, \
-	{ "icmp", CTLTYPE_NODE }, \
-	{ "igmp", CTLTYPE_NODE }, \
-	{ "ggp", CTLTYPE_NODE }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ "tcp", CTLTYPE_NODE }, \
-	{ 0, 0 }, \
-	{ "egp", CTLTYPE_NODE }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ "pup", CTLTYPE_NODE }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ "udp", CTLTYPE_NODE }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ "idp", CTLTYPE_NODE }, \
-}
-
-/*
- * Names for IP sysctl objects
- */
-#define	IPCTL_FORWARDING	1	/* act as router */
-#define	IPCTL_SENDREDIRECTS	2	/* may send redirects when forwarding */
-#define	IPCTL_DEFTTL		3	/* default TTL */
-#ifdef notyet
-#define	IPCTL_DEFMTU		4	/* default MTU */
-#endif
-#define IPCTL_RTEXPIRE		5	/* cloned route expiration time */
-#define IPCTL_RTMINEXPIRE	6	/* min value for expiration time */
-#define IPCTL_RTMAXCACHE	7	/* trigger level for dynamic expire */
-#define	IPCTL_SOURCEROUTE	8	/* may perform source routes */
-#define	IPCTL_DIRECTEDBROADCAST	9	/* may re-broadcast received packets */
-#define IPCTL_INTRQMAXLEN	10	/* max length of netisr queue */
-#define IPCTL_INTRQDROPS	11	/* number of netisr q drops */
-#define	IPCTL_ACCEPTSOURCEROUTE	13	/* may accept source routed packets */
-#define	IPCTL_MAXID		13
-
-#define	IPCTL_NAMES { \
-	{ 0, 0 }, \
-	{ "forwarding", CTLTYPE_INT }, \
-	{ "redirect", CTLTYPE_INT }, \
-	{ "ttl", CTLTYPE_INT }, \
-	{ "mtu", CTLTYPE_INT }, \
-	{ "rtexpire", CTLTYPE_INT }, \
-	{ "rtminexpire", CTLTYPE_INT }, \
-	{ "rtmaxcache", CTLTYPE_INT }, \
-	{ "sourceroute", CTLTYPE_INT }, \
- 	{ "directed-broadcast", CTLTYPE_INT }, \
-	{ "intr-queue-maxlen", CTLTYPE_INT }, \
-	{ "intr-queue-drops", CTLTYPE_INT }, \
-	{ "accept_sourceroute", CTLTYPE_INT }, \
-}
-
-
-#ifdef KERNEL
-struct ifnet; struct mbuf;	/* forward declarations for Standard C */
-
-int	 in_broadcast __P((struct in_addr, struct ifnet *));
-int	 in_canforward __P((struct in_addr));
-int	 in_cksum __P((struct mbuf *, int));
-int	 in_localaddr __P((struct in_addr));
-char 	*inet_ntoa __P((struct in_addr)); /* in libkern */
-
-/* Firewall hooks */
-struct ip;
-typedef	int ip_fw_chk_t __P((struct ip**, int, struct ifnet*, int, struct mbuf**));
-typedef	int ip_fw_ctl_t __P((int, struct mbuf**));
-extern	ip_fw_chk_t *ip_fw_chk_ptr;
-extern	ip_fw_ctl_t *ip_fw_ctl_ptr;
-
-/* IP NAT hooks */
-typedef	int ip_nat_t __P((struct ip**, struct mbuf**, struct ifnet*, int));
-typedef	int ip_nat_ctl_t __P((int, struct mbuf**));
-extern	ip_nat_t *ip_nat_ptr;
-extern	ip_nat_ctl_t *ip_nat_ctl_ptr;
-#define	IP_NAT_IN	0x00000001
-#define	IP_NAT_OUT	0x00000002
-
-#endif /* KERNEL */
-
-#endif
diff --git a/cpukit/libnetworking/netinet/in_cksum.c b/cpukit/libnetworking/netinet/in_cksum.c
deleted file mode 100644
index 9cffad3221..0000000000
--- a/cpukit/libnetworking/netinet/in_cksum.c
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * Copyright (c) 1988, 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)in_cksum.c	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#include <sys/param.h>
-#include <sys/mbuf.h>
-
-/*
- *  Try to use a CPU specific version, then punt to the portable C one.
- */
-
-#if (defined(__GNUC__) && (defined(__mc68000__) || defined(__m68k__)))
-
-#include "in_cksum_m68k.c"
-
-#elif (defined(__GNUC__) && defined(__i386__))
-
-#include "in_cksum_i386.c"
-
-#else
-
-/*
- * Checksum routine for Internet Protocol family headers (Portable Version).
- *
- * This routine is very heavily used in the network
- * code and should be modified for each CPU to be as fast as possible.
- */
-
-#define ADDCARRY(x)  (x > 65535 ? x -= 65535 : x)
-#define REDUCE \
-  {l_util.l = sum; sum = l_util.s[0] + l_util.s[1];  ADDCARRY(sum);}
-
-int
-in_cksum(m, len)
-	register struct mbuf *m;
-	register int len;
-{
-	register u_short *w;
-	register int sum = 0;
-	register int mlen = 0;
-	int byte_swapped = 0;
-
-	union {
-		char	c[2];
-		u_short	s;
-	} s_util;
-	union {
-		u_short s[2];
-		long	l;
-	} l_util;
-
-	for (;m && len; m = m->m_next) {
-		if (m->m_len == 0)
-			continue;
-		w = mtod(m, u_short *);
-		if (mlen == -1) {
-			/*
-			 * The first byte of this mbuf is the continuation
-			 * of a word spanning between this mbuf and the
-			 * last mbuf.
-			 *
-			 * s_util.c[0] is already saved when scanning previous
-			 * mbuf.
-			 */
-			s_util.c[1] = *(char *)w;
-			sum += s_util.s;
-			w = (u_short *)((char *)w + 1);
-			mlen = m->m_len - 1;
-			len--;
-		} else
-			mlen = m->m_len;
-		if (len < mlen)
-			mlen = len;
-		len -= mlen;
-		/*
-		 * Force to even boundary.
-		 */
-		if ((1 & (int) w) && (mlen > 0)) {
-			REDUCE;
-			sum <<= 8;
-			s_util.c[0] = *(u_char *)w;
-			w = (u_short *)((char *)w + 1);
-			mlen--;
-			byte_swapped = 1;
-		}
-		/*
-		 * Unroll the loop to make overhead from
-		 * branches &c small.
-		 */
-		while ((mlen -= 32) >= 0) {
-			sum += w[0]; sum += w[1]; sum += w[2]; sum += w[3];
-			sum += w[4]; sum += w[5]; sum += w[6]; sum += w[7];
-			sum += w[8]; sum += w[9]; sum += w[10]; sum += w[11];
-			sum += w[12]; sum += w[13]; sum += w[14]; sum += w[15];
-			w += 16;
-		}
-		mlen += 32;
-		while ((mlen -= 8) >= 0) {
-			sum += w[0]; sum += w[1]; sum += w[2]; sum += w[3];
-			w += 4;
-		}
-		mlen += 8;
-		if (mlen == 0 && byte_swapped == 0)
-			continue;
-		REDUCE;
-		while ((mlen -= 2) >= 0) {
-			sum += *w++;
-		}
-		if (byte_swapped) {
-			REDUCE;
-			sum <<= 8;
-			byte_swapped = 0;
-			if (mlen == -1) {
-				s_util.c[1] = *(char *)w;
-				sum += s_util.s;
-				mlen = 0;
-			} else
-				mlen = -1;
-		} else if (mlen == -1)
-			s_util.c[0] = *(char *)w;
-	}
-	if (len)
-		printf("cksum: out of data\n");
-	if (mlen == -1) {
-		/* The last mbuf has odd # of bytes. Follow the
-		   standard (the odd byte may be shifted left by 8 bits
-		   or not as determined by endian-ness of the machine) */
-		s_util.c[1] = 0;
-		sum += s_util.s;
-	}
-	REDUCE;
-	return (~sum & 0xffff);
-}
-#endif
diff --git a/cpukit/libnetworking/netinet/in_cksum_i386.c b/cpukit/libnetworking/netinet/in_cksum_i386.c
deleted file mode 100644
index 2057ab3fd6..0000000000
--- a/cpukit/libnetworking/netinet/in_cksum_i386.c
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * Checksum routine for Internet Protocol family headers.
- *
- * This routine is very heavily used in the network
- * code and should be modified for each CPU to be as fast as possible.
- *
- * This implementation is 386 version.
- *
- *  $Id$
- */
-
-#undef	ADDCARRY
-#define ADDCARRY(x)     if ((x) > 0xffff) (x) -= 0xffff
-#define REDUCE          {sum = (sum & 0xffff) + (sum >> 16); ADDCARRY(sum);}
-
-/*
- * Thanks to gcc we don't have to guess
- * which registers contain sum & w.
- */
-#define ADD(n)	asm("addl " #n "(%2), %0" : "=r" (sum) : "0" (sum), "r" (w))
-#define ADDC(n)	asm("adcl " #n "(%2), %0" : "=r" (sum) : "0" (sum), "r" (w))
-#define LOAD(n)	asm volatile("movb " #n "(%1), %0" : "=r" (junk) : "r" (w))
-#define MOP	asm("adcl         $0, %0" : "=r" (sum) : "0" (sum))
-
-int
-in_cksum(m, len)
-	register struct mbuf *m;
-	register int len;
-{
-	register u_short *w;
-	register unsigned sum = 0;
-	register int mlen = 0;
-	int byte_swapped = 0;
-	union { char	c[2]; u_short	s; } su;
-
-	for (;m && len; m = m->m_next) {
-		if (m->m_len == 0)
-			continue;
-		w = mtod(m, u_short *);
-		if (mlen == -1) {
-			/*
-			 * The first byte of this mbuf is the continuation
-			 * of a word spanning between this mbuf and the
-			 * last mbuf.
-			 */
-
-			/* su.c[0] is already saved when scanning previous
-			 * mbuf.  sum was REDUCEd when we found mlen == -1
-			 */
-			su.c[1] = *(u_char *)w;
-			sum += su.s;
-			w = (u_short *)((char *)w + 1);
-			mlen = m->m_len - 1;
-			len--;
-		} else
-			mlen = m->m_len;
-		if (len < mlen)
-			mlen = len;
-		len -= mlen;
-		/*
-		 * Force to long boundary so we do longword aligned
-		 * memory operations
-		 */
-		if (3 & (int) w) {
-			REDUCE;
-			if ((1 & (int) w) && (mlen > 0)) {
-				sum <<= 8;
-				su.c[0] = *(char *)w;
-				w = (u_short *)((char *)w + 1);
-				mlen--;
-				byte_swapped = 1;
-			}
-			if ((2 & (int) w) && (mlen >= 2)) {
-				sum += *w++;
-				mlen -= 2;
-			}
-		}
-		/*
-		 * Advance to a 486 cache line boundary.
-		 */
-		if (4 & (int) w && mlen >= 4) {
-			ADD(0);
-			MOP;
-			w += 2;
-			mlen -= 4;
-		}
-		if (8 & (int) w && mlen >= 8) {
-			ADD(0);
-			ADDC(4);
-			MOP;
-			w += 4;
-			mlen -= 8;
-		}
-		/*
-		 * Do as much of the checksum as possible 32 bits at at time.
-		 * In fact, this loop is unrolled to make overhead from
-		 * branches &c small.
-		 */
-		mlen -= 1;
-		while ((mlen -= 32) >= 0) {
-			u_char junk;
-			/*
-			 * Add with carry 16 words and fold in the last
-			 * carry by adding a 0 with carry.
-			 *
-			 * The early ADD(16) and the LOAD(32) are to load
-			 * the next 2 cache lines in advance on 486's.  The
-			 * 486 has a penalty of 2 clock cycles for loading
-			 * a cache line, plus whatever time the external
-			 * memory takes to load the first word(s) addressed.
-			 * These penalties are unavoidable.  Subsequent
-			 * accesses to a cache line being loaded (and to
-			 * other external memory?) are delayed until the
-			 * whole load finishes.  These penalties are mostly
-			 * avoided by not accessing external memory for
-			 * 8 cycles after the ADD(16) and 12 cycles after
-			 * the LOAD(32).  The loop terminates when mlen
-			 * is initially 33 (not 32) to guaranteed that
-			 * the LOAD(32) is within bounds.
-			 */
-			ADD(16);
-			ADDC(0);
-			ADDC(4);
-			ADDC(8);
-			ADDC(12);
-			LOAD(32);
-			ADDC(20);
-			ADDC(24);
-			ADDC(28);
-			MOP;
-			w += 16;
-		}
-		mlen += 32 + 1;
-		if (mlen >= 32) {
-			ADD(16);
-			ADDC(0);
-			ADDC(4);
-			ADDC(8);
-			ADDC(12);
-			ADDC(20);
-			ADDC(24);
-			ADDC(28);
-			MOP;
-			w += 16;
-			mlen -= 32;
-		}
-		if (mlen >= 16) {
-			ADD(0);
-			ADDC(4);
-			ADDC(8);
-			ADDC(12);
-			MOP;
-			w += 8;
-			mlen -= 16;
-		}
-		if (mlen >= 8) {
-			ADD(0);
-			ADDC(4);
-			MOP;
-			w += 4;
-			mlen -= 8;
-		}
-		if (mlen == 0 && byte_swapped == 0)
-			continue;       /* worth 1% maybe ?? */
-		REDUCE;
-		while ((mlen -= 2) >= 0) {
-			sum += *w++;
-		}
-		if (byte_swapped) {
-			sum <<= 8;
-			byte_swapped = 0;
-			if (mlen == -1) {
-				su.c[1] = *(char *)w;
-				sum += su.s;
-				mlen = 0;
-			} else
-				mlen = -1;
-		} else if (mlen == -1)
-			/*
-			 * This mbuf has odd number of bytes.
-			 * There could be a word split betwen
-			 * this mbuf and the next mbuf.
-			 * Save the last byte (to prepend to next mbuf).
-			 */
-			su.c[0] = *(char *)w;
-	}
-
-	if (len)
-		printf("cksum: out of data\n");
-	if (mlen == -1) {
-		/* The last mbuf has odd # of bytes. Follow the
-		   standard (the odd byte is shifted left by 8 bits) */
-		su.c[1] = 0;
-		sum += su.s;
-	}
-	REDUCE;
-	return (~sum & 0xffff);
-}
diff --git a/cpukit/libnetworking/netinet/in_cksum_i386.h b/cpukit/libnetworking/netinet/in_cksum_i386.h
deleted file mode 100644
index 2057ab3fd6..0000000000
--- a/cpukit/libnetworking/netinet/in_cksum_i386.h
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * Checksum routine for Internet Protocol family headers.
- *
- * This routine is very heavily used in the network
- * code and should be modified for each CPU to be as fast as possible.
- *
- * This implementation is 386 version.
- *
- *  $Id$
- */
-
-#undef	ADDCARRY
-#define ADDCARRY(x)     if ((x) > 0xffff) (x) -= 0xffff
-#define REDUCE          {sum = (sum & 0xffff) + (sum >> 16); ADDCARRY(sum);}
-
-/*
- * Thanks to gcc we don't have to guess
- * which registers contain sum & w.
- */
-#define ADD(n)	asm("addl " #n "(%2), %0" : "=r" (sum) : "0" (sum), "r" (w))
-#define ADDC(n)	asm("adcl " #n "(%2), %0" : "=r" (sum) : "0" (sum), "r" (w))
-#define LOAD(n)	asm volatile("movb " #n "(%1), %0" : "=r" (junk) : "r" (w))
-#define MOP	asm("adcl         $0, %0" : "=r" (sum) : "0" (sum))
-
-int
-in_cksum(m, len)
-	register struct mbuf *m;
-	register int len;
-{
-	register u_short *w;
-	register unsigned sum = 0;
-	register int mlen = 0;
-	int byte_swapped = 0;
-	union { char	c[2]; u_short	s; } su;
-
-	for (;m && len; m = m->m_next) {
-		if (m->m_len == 0)
-			continue;
-		w = mtod(m, u_short *);
-		if (mlen == -1) {
-			/*
-			 * The first byte of this mbuf is the continuation
-			 * of a word spanning between this mbuf and the
-			 * last mbuf.
-			 */
-
-			/* su.c[0] is already saved when scanning previous
-			 * mbuf.  sum was REDUCEd when we found mlen == -1
-			 */
-			su.c[1] = *(u_char *)w;
-			sum += su.s;
-			w = (u_short *)((char *)w + 1);
-			mlen = m->m_len - 1;
-			len--;
-		} else
-			mlen = m->m_len;
-		if (len < mlen)
-			mlen = len;
-		len -= mlen;
-		/*
-		 * Force to long boundary so we do longword aligned
-		 * memory operations
-		 */
-		if (3 & (int) w) {
-			REDUCE;
-			if ((1 & (int) w) && (mlen > 0)) {
-				sum <<= 8;
-				su.c[0] = *(char *)w;
-				w = (u_short *)((char *)w + 1);
-				mlen--;
-				byte_swapped = 1;
-			}
-			if ((2 & (int) w) && (mlen >= 2)) {
-				sum += *w++;
-				mlen -= 2;
-			}
-		}
-		/*
-		 * Advance to a 486 cache line boundary.
-		 */
-		if (4 & (int) w && mlen >= 4) {
-			ADD(0);
-			MOP;
-			w += 2;
-			mlen -= 4;
-		}
-		if (8 & (int) w && mlen >= 8) {
-			ADD(0);
-			ADDC(4);
-			MOP;
-			w += 4;
-			mlen -= 8;
-		}
-		/*
-		 * Do as much of the checksum as possible 32 bits at at time.
-		 * In fact, this loop is unrolled to make overhead from
-		 * branches &c small.
-		 */
-		mlen -= 1;
-		while ((mlen -= 32) >= 0) {
-			u_char junk;
-			/*
-			 * Add with carry 16 words and fold in the last
-			 * carry by adding a 0 with carry.
-			 *
-			 * The early ADD(16) and the LOAD(32) are to load
-			 * the next 2 cache lines in advance on 486's.  The
-			 * 486 has a penalty of 2 clock cycles for loading
-			 * a cache line, plus whatever time the external
-			 * memory takes to load the first word(s) addressed.
-			 * These penalties are unavoidable.  Subsequent
-			 * accesses to a cache line being loaded (and to
-			 * other external memory?) are delayed until the
-			 * whole load finishes.  These penalties are mostly
-			 * avoided by not accessing external memory for
-			 * 8 cycles after the ADD(16) and 12 cycles after
-			 * the LOAD(32).  The loop terminates when mlen
-			 * is initially 33 (not 32) to guaranteed that
-			 * the LOAD(32) is within bounds.
-			 */
-			ADD(16);
-			ADDC(0);
-			ADDC(4);
-			ADDC(8);
-			ADDC(12);
-			LOAD(32);
-			ADDC(20);
-			ADDC(24);
-			ADDC(28);
-			MOP;
-			w += 16;
-		}
-		mlen += 32 + 1;
-		if (mlen >= 32) {
-			ADD(16);
-			ADDC(0);
-			ADDC(4);
-			ADDC(8);
-			ADDC(12);
-			ADDC(20);
-			ADDC(24);
-			ADDC(28);
-			MOP;
-			w += 16;
-			mlen -= 32;
-		}
-		if (mlen >= 16) {
-			ADD(0);
-			ADDC(4);
-			ADDC(8);
-			ADDC(12);
-			MOP;
-			w += 8;
-			mlen -= 16;
-		}
-		if (mlen >= 8) {
-			ADD(0);
-			ADDC(4);
-			MOP;
-			w += 4;
-			mlen -= 8;
-		}
-		if (mlen == 0 && byte_swapped == 0)
-			continue;       /* worth 1% maybe ?? */
-		REDUCE;
-		while ((mlen -= 2) >= 0) {
-			sum += *w++;
-		}
-		if (byte_swapped) {
-			sum <<= 8;
-			byte_swapped = 0;
-			if (mlen == -1) {
-				su.c[1] = *(char *)w;
-				sum += su.s;
-				mlen = 0;
-			} else
-				mlen = -1;
-		} else if (mlen == -1)
-			/*
-			 * This mbuf has odd number of bytes.
-			 * There could be a word split betwen
-			 * this mbuf and the next mbuf.
-			 * Save the last byte (to prepend to next mbuf).
-			 */
-			su.c[0] = *(char *)w;
-	}
-
-	if (len)
-		printf("cksum: out of data\n");
-	if (mlen == -1) {
-		/* The last mbuf has odd # of bytes. Follow the
-		   standard (the odd byte is shifted left by 8 bits) */
-		su.c[1] = 0;
-		sum += su.s;
-	}
-	REDUCE;
-	return (~sum & 0xffff);
-}
diff --git a/cpukit/libnetworking/netinet/in_cksum_m68k.c b/cpukit/libnetworking/netinet/in_cksum_m68k.c
deleted file mode 100644
index 58199c3adf..0000000000
--- a/cpukit/libnetworking/netinet/in_cksum_m68k.c
+++ /dev/null
@@ -1,223 +0,0 @@
-/*
- * Copyright (c) 1988, 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)in_cksum.c	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#include <sys/param.h>
-#include <sys/mbuf.h>
-
-#if (defined (__mcf5200__))
-# define IS_COLDFIRE 1
-#else
-# define IS_COLDFIRE 0
-#endif
-
-#define REDUCE { sum = (sum & 0xFFFF) + (sum >> 16); if (sum > 0xFFFF) sum -= 0xFFFF; }
-
-/*
- * Motorola 68k version of Internet Protocol Checksum routine
- * W. Eric Norum
- * Saskatchewan Accelerator Laboratory
- * August, 1998
- */
-int
-in_cksum(m, len)
-	struct mbuf *m;
-	int len;
-{
-	unsigned short *w;
-	unsigned long sum = 0;
-	int mlen = 0;
-	int byte_swapped = 0;
-	union {
-		char	c[2];
-		u_short	s;
-	} s_util;
-
-	for ( ; m && len ; m = m->m_next) {
-		if (m->m_len == 0)
-			continue;
-		w = mtod(m, u_short *);
-		if (mlen == -1) {
-			/*
-			 * The first byte of this mbuf is the continuation
-			 * of a word spanning between this mbuf and the
-			 * last mbuf.
-			 *
-			 * s_util.c[0] is already saved when scanning previous
-			 * mbuf.
-			 */
-			s_util.c[1] = *(char *)w;
-			sum += s_util.s;
-			w = (u_short *)((char *)w + 1);
-			mlen = m->m_len - 1;
-			len--;
-		} else
-			mlen = m->m_len;
-		if (len < mlen)
-			mlen = len;
-		len -= mlen;
-
-		/*
-		 * Force to longword boundary.
-		 */
-		if (3 & (int)w) {
-			REDUCE;
-			if ((1 & (int) w) && (mlen > 0)) {
-				sum <<= 8;
-				s_util.c[0] = *(u_char *)w;
-				w = (u_short *)((char *)w + 1);
-				mlen--;
-				byte_swapped = 1;
-			}
-			if ((2 & (int) w) && (mlen >= 2)) {
-				sum += *w++;
-				mlen -= 2;
-			}
-		}
-
-		/*
-		 * Sum all the longwords in the buffer.
-		 * See RFC 1071 -- Computing the Internet Checksum.
-		 * It should work for all 68k family members.
-		 */
-		{
-		unsigned long tcnt = mlen, t1;
-		__asm__ volatile (
-		"movel   %2,%3\n\t"
-		"lsrl    #6,%2       | count/64 = # loop traversals\n\t"
-		"andl    #0x3c,%3    | Then find fractions of a chunk\n\t"
-		"negl    %3\n\t      | Each long uses 4 instruction bytes\n\t"
-#if IS_COLDFIRE
-		"addql   #1,%2       | Clear X (extended carry flag)\n\t"
-		"subql   #1,%2       | \n\t"
-#else
-		"andi    #0xf,%%cc   | Clear X (extended carry flag)\n\t"
-#endif
-		"jmp     %%pc@(lcsum2_lbl-.-2:b,%3)  | Jump into loop\n"
-		"lcsum1_lbl:         | Begin inner loop...\n\t"
-		"movel   %1@+,%3     |  0: Fetch 32-bit word\n\t"
-		"addxl   %3,%0       |    Add word + previous carry\n\t"
-		"movel   %1@+,%3     |  1: Fetch 32-bit word\n\t"
-		"addxl   %3,%0       |    Add word + previous carry\n\t"
-		"movel   %1@+,%3     |  2: Fetch 32-bit word\n\t"
-		"addxl   %3,%0       |    Add word + previous carry\n\t"
-		"movel   %1@+,%3     |  3: Fetch 32-bit word\n\t"
-		"addxl   %3,%0       |    Add word + previous carry\n\t"
-		"movel   %1@+,%3     |  4: Fetch 32-bit word\n\t"
-		"addxl   %3,%0       |    Add word + previous carry\n\t"
-		"movel   %1@+,%3     |  5: Fetch 32-bit word\n\t"
-		"addxl   %3,%0       |    Add word + previous carry\n\t"
-		"movel   %1@+,%3     |  6: Fetch 32-bit word\n\t"
-		"addxl   %3,%0       |    Add word + previous carry\n\t"
-		"movel   %1@+,%3     |  7: Fetch 32-bit word\n\t"
-		"addxl   %3,%0       |    Add word + previous carry\n\t"
-		"movel   %1@+,%3     |  8: Fetch 32-bit word\n\t"
-		"addxl   %3,%0       |    Add word + previous carry\n\t"
-		"movel   %1@+,%3     |  9: Fetch 32-bit word\n\t"
-		"addxl   %3,%0       |    Add word + previous carry\n\t"
-		"movel   %1@+,%3     |  A: Fetch 32-bit word\n\t"
-		"addxl   %3,%0       |    Add word + previous carry\n\t"
-		"movel   %1@+,%3     |  B: Fetch 32-bit word\n\t"
-		"addxl   %3,%0       |    Add word + previous carry\n\t"
-		"movel   %1@+,%3     |  C: Fetch 32-bit word\n\t"
-		"addxl   %3,%0       |    Add word + previous carry\n\t"
-		"movel   %1@+,%3     |  D: Fetch 32-bit word\n\t"
-		"addxl   %3,%0       |    Add word + previous carry\n\t"
-		"movel   %1@+,%3     |  E: Fetch 32-bit word\n\t"
-		"addxl   %3,%0       |    Add word + previous carry\n\t"
-		"movel   %1@+,%3     |  F: Fetch 32-bit word\n\t"
-		"addxl   %3,%0       |    Add word + previous carry\n"
-		"lcsum2_lbl:         |  End of unrolled loop\n\t"
-#if IS_COLDFIRE
-		"moveq   #0,%3       | Add in last carry\n\t"
-		"addxl   %3,%0       |\n\t"
-		"subql 	 #1,%2       | Update loop count\n\t"
-		"bplb    lcsum1_lbl  | Loop (with X clear) if not done\n\t"
-		"movel   #0xffff,%2  | Get word mask\n\t"
-		"movel   %0,%3       | Fold 32 bit sum to 16 bits\n\t"
-		"swap    %3          |\n\t"
-		"andl    %2,%0       | Mask to 16-bit sum\n\t"
-		"andl    %2,%3       | Mask to 16-bit sum\n\t"
-		"addl    %3,%0       |\n\t"
-		"movel   %0,%3       | Add in last carry\n\t"
-		"swap    %3          |\n\t"
-		"addl    %3,%0       |\n\t"
-		"andl    %2,%0       | Mask to 16-bit sum\n\t"
-#else
-		"dbf     %2,lcsum1_lbl | (NB- dbf doesn't affect X)\n\t"
-		"movel   %0,%3       | Fold 32 bit sum to 16 bits\n\t"
-		"swap    %3          | (NB- swap doesn't affect X)\n\t"
-		"addxw   %3,%0       |\n\t"
-		"moveq   #0,%3       | Add in last carry\n\t"
-		"addxw   %3,%0       |\n\t"
-		"andl    #0xffff,%0  | Mask to 16-bit sum\n"
-#endif
-			:
-			"=d" (sum), "=a" (w), "=d" (tcnt) , "=d" (t1) :
-			"0" (sum), "1" (w), "2" (tcnt) :
-			"cc", "memory");
-		}
-		mlen &= 3;
-
-		/*
-		 * Soak up the last 1, 2 or 3 bytes
-		 */
-		while ((mlen -= 2) >= 0)
-			sum += *w++;
-		if (byte_swapped) {
-			REDUCE;
-			sum <<= 8;
-			byte_swapped = 0;
-			if (mlen == -1) {
-				s_util.c[1] = *(char *)w;
-				sum += s_util.s;
-				mlen = 0;
-			} else
-				mlen = -1;
-		} else if (mlen == -1)
-			s_util.c[0] = *(char *)w;
-	}
-	if (len)
-		sum = 0xDEAD;
-	if (mlen == -1) {
-		/* The last mbuf has odd # of bytes. Follow the
-		   standard (the odd byte may be shifted left by 8 bits
-		   or not as determined by endian-ness of the machine) */
-		s_util.c[1] = 0;
-		sum += s_util.s;
-	}
-	REDUCE;
-	return (~sum & 0xffff);
-}
diff --git a/cpukit/libnetworking/netinet/in_cksum_m68k.h b/cpukit/libnetworking/netinet/in_cksum_m68k.h
deleted file mode 100644
index 58199c3adf..0000000000
--- a/cpukit/libnetworking/netinet/in_cksum_m68k.h
+++ /dev/null
@@ -1,223 +0,0 @@
-/*
- * Copyright (c) 1988, 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)in_cksum.c	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#include <sys/param.h>
-#include <sys/mbuf.h>
-
-#if (defined (__mcf5200__))
-# define IS_COLDFIRE 1
-#else
-# define IS_COLDFIRE 0
-#endif
-
-#define REDUCE { sum = (sum & 0xFFFF) + (sum >> 16); if (sum > 0xFFFF) sum -= 0xFFFF; }
-
-/*
- * Motorola 68k version of Internet Protocol Checksum routine
- * W. Eric Norum
- * Saskatchewan Accelerator Laboratory
- * August, 1998
- */
-int
-in_cksum(m, len)
-	struct mbuf *m;
-	int len;
-{
-	unsigned short *w;
-	unsigned long sum = 0;
-	int mlen = 0;
-	int byte_swapped = 0;
-	union {
-		char	c[2];
-		u_short	s;
-	} s_util;
-
-	for ( ; m && len ; m = m->m_next) {
-		if (m->m_len == 0)
-			continue;
-		w = mtod(m, u_short *);
-		if (mlen == -1) {
-			/*
-			 * The first byte of this mbuf is the continuation
-			 * of a word spanning between this mbuf and the
-			 * last mbuf.
-			 *
-			 * s_util.c[0] is already saved when scanning previous
-			 * mbuf.
-			 */
-			s_util.c[1] = *(char *)w;
-			sum += s_util.s;
-			w = (u_short *)((char *)w + 1);
-			mlen = m->m_len - 1;
-			len--;
-		} else
-			mlen = m->m_len;
-		if (len < mlen)
-			mlen = len;
-		len -= mlen;
-
-		/*
-		 * Force to longword boundary.
-		 */
-		if (3 & (int)w) {
-			REDUCE;
-			if ((1 & (int) w) && (mlen > 0)) {
-				sum <<= 8;
-				s_util.c[0] = *(u_char *)w;
-				w = (u_short *)((char *)w + 1);
-				mlen--;
-				byte_swapped = 1;
-			}
-			if ((2 & (int) w) && (mlen >= 2)) {
-				sum += *w++;
-				mlen -= 2;
-			}
-		}
-
-		/*
-		 * Sum all the longwords in the buffer.
-		 * See RFC 1071 -- Computing the Internet Checksum.
-		 * It should work for all 68k family members.
-		 */
-		{
-		unsigned long tcnt = mlen, t1;
-		__asm__ volatile (
-		"movel   %2,%3\n\t"
-		"lsrl    #6,%2       | count/64 = # loop traversals\n\t"
-		"andl    #0x3c,%3    | Then find fractions of a chunk\n\t"
-		"negl    %3\n\t      | Each long uses 4 instruction bytes\n\t"
-#if IS_COLDFIRE
-		"addql   #1,%2       | Clear X (extended carry flag)\n\t"
-		"subql   #1,%2       | \n\t"
-#else
-		"andi    #0xf,%%cc   | Clear X (extended carry flag)\n\t"
-#endif
-		"jmp     %%pc@(lcsum2_lbl-.-2:b,%3)  | Jump into loop\n"
-		"lcsum1_lbl:         | Begin inner loop...\n\t"
-		"movel   %1@+,%3     |  0: Fetch 32-bit word\n\t"
-		"addxl   %3,%0       |    Add word + previous carry\n\t"
-		"movel   %1@+,%3     |  1: Fetch 32-bit word\n\t"
-		"addxl   %3,%0       |    Add word + previous carry\n\t"
-		"movel   %1@+,%3     |  2: Fetch 32-bit word\n\t"
-		"addxl   %3,%0       |    Add word + previous carry\n\t"
-		"movel   %1@+,%3     |  3: Fetch 32-bit word\n\t"
-		"addxl   %3,%0       |    Add word + previous carry\n\t"
-		"movel   %1@+,%3     |  4: Fetch 32-bit word\n\t"
-		"addxl   %3,%0       |    Add word + previous carry\n\t"
-		"movel   %1@+,%3     |  5: Fetch 32-bit word\n\t"
-		"addxl   %3,%0       |    Add word + previous carry\n\t"
-		"movel   %1@+,%3     |  6: Fetch 32-bit word\n\t"
-		"addxl   %3,%0       |    Add word + previous carry\n\t"
-		"movel   %1@+,%3     |  7: Fetch 32-bit word\n\t"
-		"addxl   %3,%0       |    Add word + previous carry\n\t"
-		"movel   %1@+,%3     |  8: Fetch 32-bit word\n\t"
-		"addxl   %3,%0       |    Add word + previous carry\n\t"
-		"movel   %1@+,%3     |  9: Fetch 32-bit word\n\t"
-		"addxl   %3,%0       |    Add word + previous carry\n\t"
-		"movel   %1@+,%3     |  A: Fetch 32-bit word\n\t"
-		"addxl   %3,%0       |    Add word + previous carry\n\t"
-		"movel   %1@+,%3     |  B: Fetch 32-bit word\n\t"
-		"addxl   %3,%0       |    Add word + previous carry\n\t"
-		"movel   %1@+,%3     |  C: Fetch 32-bit word\n\t"
-		"addxl   %3,%0       |    Add word + previous carry\n\t"
-		"movel   %1@+,%3     |  D: Fetch 32-bit word\n\t"
-		"addxl   %3,%0       |    Add word + previous carry\n\t"
-		"movel   %1@+,%3     |  E: Fetch 32-bit word\n\t"
-		"addxl   %3,%0       |    Add word + previous carry\n\t"
-		"movel   %1@+,%3     |  F: Fetch 32-bit word\n\t"
-		"addxl   %3,%0       |    Add word + previous carry\n"
-		"lcsum2_lbl:         |  End of unrolled loop\n\t"
-#if IS_COLDFIRE
-		"moveq   #0,%3       | Add in last carry\n\t"
-		"addxl   %3,%0       |\n\t"
-		"subql 	 #1,%2       | Update loop count\n\t"
-		"bplb    lcsum1_lbl  | Loop (with X clear) if not done\n\t"
-		"movel   #0xffff,%2  | Get word mask\n\t"
-		"movel   %0,%3       | Fold 32 bit sum to 16 bits\n\t"
-		"swap    %3          |\n\t"
-		"andl    %2,%0       | Mask to 16-bit sum\n\t"
-		"andl    %2,%3       | Mask to 16-bit sum\n\t"
-		"addl    %3,%0       |\n\t"
-		"movel   %0,%3       | Add in last carry\n\t"
-		"swap    %3          |\n\t"
-		"addl    %3,%0       |\n\t"
-		"andl    %2,%0       | Mask to 16-bit sum\n\t"
-#else
-		"dbf     %2,lcsum1_lbl | (NB- dbf doesn't affect X)\n\t"
-		"movel   %0,%3       | Fold 32 bit sum to 16 bits\n\t"
-		"swap    %3          | (NB- swap doesn't affect X)\n\t"
-		"addxw   %3,%0       |\n\t"
-		"moveq   #0,%3       | Add in last carry\n\t"
-		"addxw   %3,%0       |\n\t"
-		"andl    #0xffff,%0  | Mask to 16-bit sum\n"
-#endif
-			:
-			"=d" (sum), "=a" (w), "=d" (tcnt) , "=d" (t1) :
-			"0" (sum), "1" (w), "2" (tcnt) :
-			"cc", "memory");
-		}
-		mlen &= 3;
-
-		/*
-		 * Soak up the last 1, 2 or 3 bytes
-		 */
-		while ((mlen -= 2) >= 0)
-			sum += *w++;
-		if (byte_swapped) {
-			REDUCE;
-			sum <<= 8;
-			byte_swapped = 0;
-			if (mlen == -1) {
-				s_util.c[1] = *(char *)w;
-				sum += s_util.s;
-				mlen = 0;
-			} else
-				mlen = -1;
-		} else if (mlen == -1)
-			s_util.c[0] = *(char *)w;
-	}
-	if (len)
-		sum = 0xDEAD;
-	if (mlen == -1) {
-		/* The last mbuf has odd # of bytes. Follow the
-		   standard (the odd byte may be shifted left by 8 bits
-		   or not as determined by endian-ness of the machine) */
-		s_util.c[1] = 0;
-		sum += s_util.s;
-	}
-	REDUCE;
-	return (~sum & 0xffff);
-}
diff --git a/cpukit/libnetworking/netinet/in_pcb.c b/cpukit/libnetworking/netinet/in_pcb.c
deleted file mode 100644
index 116f70eebf..0000000000
--- a/cpukit/libnetworking/netinet/in_pcb.c
+++ /dev/null
@@ -1,757 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1991, 1993, 1995
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)in_pcb.c	8.4 (Berkeley) 5/24/95
- *	$Id$
- */
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/systm.h>
-#include <sys/malloc.h>
-#include <sys/mbuf.h>
-#include <sys/protosw.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/ioctl.h>
-#include <sys/errno.h>
-#include <sys/time.h>
-#include <sys/proc.h>
-#include <sys/kernel.h>
-#include <sys/sysctl.h>
-
-#include <net/if.h>
-#include <net/route.h>
-
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/in_pcb.h>
-#include <netinet/in_var.h>
-#include <netinet/ip_var.h>
-
-struct	in_addr zeroin_addr;
-
-static void	 in_pcbinshash __P((struct inpcb *));
-static void	 in_rtchange __P((struct inpcb *, int));
-
-/*
- * These configure the range of local port addresses assigned to
- * "unspecified" outgoing connections/packets/whatever.
- */
-static int ipport_lowfirstauto  = IPPORT_RESERVED - 1;	/* 1023 */
-static int ipport_lowlastauto = IPPORT_RESERVEDSTART;	/* 600 */
-static int ipport_firstauto = IPPORT_RESERVED;		/* 1024 */
-static int ipport_lastauto  = IPPORT_USERRESERVED;	/* 5000 */
-static int ipport_hifirstauto = IPPORT_HIFIRSTAUTO;	/* 40000 */
-static int ipport_hilastauto  = IPPORT_HILASTAUTO;	/* 44999 */
-
-#define RANGECHK(var, min, max) \
-	if ((var) < (min)) { (var) = (min); } \
-	else if ((var) > (max)) { (var) = (max); }
-
-#if 0
-static int
-sysctl_net_ipport_check SYSCTL_HANDLER_ARGS
-{
-	int error = sysctl_handle_int(oidp,
-		oidp->oid_arg1, oidp->oid_arg2, req);
-	if (!error) {
-		RANGECHK(ipport_lowfirstauto, 1, IPPORT_RESERVED - 1);
-		RANGECHK(ipport_lowlastauto, 1, IPPORT_RESERVED - 1);
-		RANGECHK(ipport_firstauto, IPPORT_RESERVED, USHRT_MAX);
-		RANGECHK(ipport_lastauto, IPPORT_RESERVED, USHRT_MAX);
-		RANGECHK(ipport_hifirstauto, IPPORT_RESERVED, USHRT_MAX);
-		RANGECHK(ipport_hilastauto, IPPORT_RESERVED, USHRT_MAX);
-	}
-	return error;
-}
-#endif
-
-#undef RANGECHK
-
-SYSCTL_NODE(_net_inet_ip, IPPROTO_IP, portrange, CTLFLAG_RW, 0, "IP Ports");
-
-SYSCTL_PROC(_net_inet_ip_portrange, OID_AUTO, lowfirst, CTLTYPE_INT|CTLFLAG_RW,
-	   &ipport_lowfirstauto, 0, &sysctl_net_ipport_check, "I", "");
-SYSCTL_PROC(_net_inet_ip_portrange, OID_AUTO, lowlast, CTLTYPE_INT|CTLFLAG_RW,
-	   &ipport_lowlastauto, 0, &sysctl_net_ipport_check, "I", "");
-SYSCTL_PROC(_net_inet_ip_portrange, OID_AUTO, first, CTLTYPE_INT|CTLFLAG_RW,
-	   &ipport_firstauto, 0, &sysctl_net_ipport_check, "I", "");
-SYSCTL_PROC(_net_inet_ip_portrange, OID_AUTO, last, CTLTYPE_INT|CTLFLAG_RW,
-	   &ipport_lastauto, 0, &sysctl_net_ipport_check, "I", "");
-SYSCTL_PROC(_net_inet_ip_portrange, OID_AUTO, hifirst, CTLTYPE_INT|CTLFLAG_RW,
-	   &ipport_hifirstauto, 0, &sysctl_net_ipport_check, "I", "");
-SYSCTL_PROC(_net_inet_ip_portrange, OID_AUTO, hilast, CTLTYPE_INT|CTLFLAG_RW,
-	   &ipport_hilastauto, 0, &sysctl_net_ipport_check, "I", "");
-
-int
-in_pcballoc(so, pcbinfo)
-	struct socket *so;
-	struct inpcbinfo *pcbinfo;
-{
-	register struct inpcb *inp;
-	int s;
-
-	MALLOC(inp, struct inpcb *, sizeof(*inp), M_PCB, M_NOWAIT);
-	if (inp == NULL)
-		return (ENOBUFS);
-	bzero((caddr_t)inp, sizeof(*inp));
-	inp->inp_pcbinfo = pcbinfo;
-	inp->inp_socket = so;
-	s = splnet();
-	LIST_INSERT_HEAD(pcbinfo->listhead, inp, inp_list);
-	in_pcbinshash(inp);
-	splx(s);
-	so->so_pcb = (caddr_t)inp;
-	return (0);
-}
-
-int
-in_pcbbind(inp, nam)
-	register struct inpcb *inp;
-	struct mbuf *nam;
-{
-	register struct socket *so = inp->inp_socket;
-	unsigned short *lastport;
-	struct sockaddr_in *sin;
-	u_short lport = 0;
-	int wild = 0, reuseport = (so->so_options & SO_REUSEPORT);
-	int error;
-
-	if (in_ifaddr == 0)
-		return (EADDRNOTAVAIL);
-	if (inp->inp_lport || inp->inp_laddr.s_addr != INADDR_ANY)
-		return (EINVAL);
-	if ((so->so_options & (SO_REUSEADDR|SO_REUSEPORT)) == 0 &&
-	    ((so->so_proto->pr_flags & PR_CONNREQUIRED) == 0 ||
-	     (so->so_options & SO_ACCEPTCONN) == 0))
-		wild = 1;
-	if (nam) {
-		sin = mtod(nam, struct sockaddr_in *);
-		if (nam->m_len != sizeof (*sin))
-			return (EINVAL);
-#ifdef notdef
-		/*
-		 * We should check the family, but old programs
-		 * incorrectly fail to initialize it.
-		 */
-		if (sin->sin_family != AF_INET)
-			return (EAFNOSUPPORT);
-#endif
-		lport = sin->sin_port;
-		if (IN_MULTICAST(ntohl(sin->sin_addr.s_addr))) {
-			/*
-			 * Treat SO_REUSEADDR as SO_REUSEPORT for multicast;
-			 * allow complete duplication of binding if
-			 * SO_REUSEPORT is set, or if SO_REUSEADDR is set
-			 * and a multicast address is bound on both
-			 * new and duplicated sockets.
-			 */
-			if (so->so_options & SO_REUSEADDR)
-				reuseport = SO_REUSEADDR|SO_REUSEPORT;
-		} else if (sin->sin_addr.s_addr != INADDR_ANY) {
-			sin->sin_port = 0;		/* yech... */
-			if (ifa_ifwithaddr((struct sockaddr *)sin) == 0)
-				return (EADDRNOTAVAIL);
-		}
-		if (lport) {
-			struct inpcb *t;
-
-			/* GROSS */
-			if (ntohs(lport) < IPPORT_RESERVED &&
-			    (error = suser(p->p_ucred, &p->p_acflag)))
-				return (EACCES);
-			if (so->so_uid) {
-				t = in_pcblookup(inp->inp_pcbinfo, zeroin_addr,
-				    0, sin->sin_addr, lport,
-				    INPLOOKUP_WILDCARD);
-				if (t && (so->so_uid != t->inp_socket->so_uid))
-					return (EADDRINUSE);
-			}
-			t = in_pcblookup(inp->inp_pcbinfo, zeroin_addr, 0,
-			    sin->sin_addr, lport, wild);
-			if (t && (reuseport & t->inp_socket->so_options) == 0)
-				return (EADDRINUSE);
-		}
-		inp->inp_laddr = sin->sin_addr;
-	}
-	if (lport == 0) {
-		ushort first, last;
-		int count;
-
-		inp->inp_flags |= INP_ANONPORT;
-
-		if (inp->inp_flags & INP_HIGHPORT) {
-			first = ipport_hifirstauto;	/* sysctl */
-			last  = ipport_hilastauto;
-			lastport = &inp->inp_pcbinfo->lasthi;
-		} else if (inp->inp_flags & INP_LOWPORT) {
-			if ((error = suser(p->p_ucred, &p->p_acflag)))
-				return (EACCES);
-			first = ipport_lowfirstauto;	/* 1023 */
-			last  = ipport_lowlastauto;	/* 600 */
-			lastport = &inp->inp_pcbinfo->lastlow;
-		} else {
-			first = ipport_firstauto;	/* sysctl */
-			last  = ipport_lastauto;
-			lastport = &inp->inp_pcbinfo->lastport;
-		}
-		/*
-		 * Simple check to ensure all ports are not used up causing
-		 * a deadlock here.
-		 *
-		 * We split the two cases (up and down) so that the direction
-		 * is not being tested on each round of the loop.
-		 */
-		if (first > last) {
-			/*
-			 * counting down
-			 */
-			count = first - last;
-
-			do {
-				if (count-- <= 0)	/* completely used? */
-					return (EADDRNOTAVAIL);
-				--*lastport;
-				if (*lastport > first || *lastport < last)
-					*lastport = first;
-				lport = htons(*lastport);
-			} while (in_pcblookup(inp->inp_pcbinfo,
-				 zeroin_addr, 0, inp->inp_laddr, lport, wild));
-		} else {
-			/*
-			 * counting up
-			 */
-			count = last - first;
-
-			do {
-				if (count-- <= 0)	/* completely used? */
-					return (EADDRNOTAVAIL);
-				++*lastport;
-				if (*lastport < first || *lastport > last)
-					*lastport = first;
-				lport = htons(*lastport);
-			} while (in_pcblookup(inp->inp_pcbinfo,
-				 zeroin_addr, 0, inp->inp_laddr, lport, wild));
-		}
-	}
-	inp->inp_lport = lport;
-	in_pcbrehash(inp);
-	return (0);
-}
-
-/*
- *   Transform old in_pcbconnect() into an inner subroutine for new
- *   in_pcbconnect(): Do some validity-checking on the remote
- *   address (in mbuf 'nam') and then determine local host address
- *   (i.e., which interface) to use to access that remote host.
- *
- *   This preserves definition of in_pcbconnect(), while supporting a
- *   slightly different version for T/TCP.  (This is more than
- *   a bit of a kludge, but cleaning up the internal interfaces would
- *   have forced minor changes in every protocol).
- */
-
-int
-in_pcbladdr(inp, nam, plocal_sin)
-	register struct inpcb *inp;
-	struct mbuf *nam;
-	struct sockaddr_in **plocal_sin;
-{
-	struct in_ifaddr *ia;
-	register struct sockaddr_in *sin = mtod(nam, struct sockaddr_in *);
-
-	if (nam->m_len != sizeof (*sin))
-		return (EINVAL);
-	if (sin->sin_family != AF_INET)
-		return (EAFNOSUPPORT);
-	if (sin->sin_port == 0)
-		return (EADDRNOTAVAIL);
-	if (in_ifaddr) {
-		/*
-		 * If the destination address is INADDR_ANY,
-		 * use the primary local address.
-		 * If the supplied address is INADDR_BROADCAST,
-		 * and the primary interface supports broadcast,
-		 * choose the broadcast address for that interface.
-		 */
-#define	satosin(sa)	((struct sockaddr_in *)(sa))
-#define sintosa(sin)	((struct sockaddr *)(sin))
-#define ifatoia(ifa)	((struct in_ifaddr *)(ifa))
-		if (sin->sin_addr.s_addr == INADDR_ANY)
-		    sin->sin_addr = IA_SIN(in_ifaddr)->sin_addr;
-		else if (sin->sin_addr.s_addr == (u_long)INADDR_BROADCAST &&
-		  (in_ifaddr->ia_ifp->if_flags & IFF_BROADCAST))
-		    sin->sin_addr = satosin(&in_ifaddr->ia_broadaddr)->sin_addr;
-	}
-	if (inp->inp_laddr.s_addr == INADDR_ANY) {
-		register struct route *ro;
-
-		ia = (struct in_ifaddr *)0;
-		/*
-		 * If route is known or can be allocated now,
-		 * our src addr is taken from the i/f, else punt.
-		 */
-		ro = &inp->inp_route;
-		if (ro->ro_rt &&
-		    (satosin(&ro->ro_dst)->sin_addr.s_addr !=
-			sin->sin_addr.s_addr ||
-		    inp->inp_socket->so_options & SO_DONTROUTE)) {
-			RTFREE(ro->ro_rt);
-			ro->ro_rt = (struct rtentry *)0;
-		}
-		if ((inp->inp_socket->so_options & SO_DONTROUTE) == 0 && /*XXX*/
-		    (ro->ro_rt == (struct rtentry *)0 ||
-		    ro->ro_rt->rt_ifp == (struct ifnet *)0)) {
-			/* No route yet, so try to acquire one */
-			ro->ro_dst.sa_family = AF_INET;
-			ro->ro_dst.sa_len = sizeof(struct sockaddr_in);
-			((struct sockaddr_in *) &ro->ro_dst)->sin_addr =
-				sin->sin_addr;
-			rtalloc(ro);
-		}
-		/*
-		 * If we found a route, use the address
-		 * corresponding to the outgoing interface
-		 * unless it is the loopback (in case a route
-		 * to our address on another net goes to loopback).
-		 */
-		if (ro->ro_rt && !(ro->ro_rt->rt_ifp->if_flags & IFF_LOOPBACK))
-			ia = ifatoia(ro->ro_rt->rt_ifa);
-		if (ia == 0) {
-			u_short fport = sin->sin_port;
-
-			sin->sin_port = 0;
-			ia = ifatoia(ifa_ifwithdstaddr(sintosa(sin)));
-			if (ia == 0)
-				ia = ifatoia(ifa_ifwithnet(sintosa(sin)));
-			sin->sin_port = fport;
-			if (ia == 0)
-				ia = in_ifaddr;
-			if (ia == 0)
-				return (EADDRNOTAVAIL);
-		}
-		/*
-		 * If the destination address is multicast and an outgoing
-		 * interface has been set as a multicast option, use the
-		 * address of that interface as our source address.
-		 */
-		if (IN_MULTICAST(ntohl(sin->sin_addr.s_addr)) &&
-		    inp->inp_moptions != NULL) {
-			struct ip_moptions *imo;
-			struct ifnet *ifp;
-
-			imo = inp->inp_moptions;
-			if (imo->imo_multicast_ifp != NULL) {
-				ifp = imo->imo_multicast_ifp;
-				for (ia = in_ifaddr; ia; ia = ia->ia_next)
-					if (ia->ia_ifp == ifp)
-						break;
-				if (ia == 0)
-					return (EADDRNOTAVAIL);
-			}
-		}
-	/*
-	 * Don't do pcblookup call here; return interface in plocal_sin
-	 * and exit to caller, that will do the lookup.
-	 */
-		*plocal_sin = &ia->ia_addr;
-
-	}
-	return(0);
-}
-
-/*
- * Outer subroutine:
- * Connect from a socket to a specified address.
- * Both address and port must be specified in argument sin.
- * If don't have a local address for this socket yet,
- * then pick one.
- */
-int
-in_pcbconnect(inp, nam)
-	register struct inpcb *inp;
-	struct mbuf *nam;
-{
-	struct sockaddr_in *ifaddr;
-	register struct sockaddr_in *sin = mtod(nam, struct sockaddr_in *);
-	int error;
-
-	/*
-	 *   Call inner routine, to assign local interface address.
-	 */
-	if ((error = in_pcbladdr(inp, nam, &ifaddr)))
-		return(error);
-
-	if (in_pcblookuphash(inp->inp_pcbinfo, sin->sin_addr, sin->sin_port,
-	    inp->inp_laddr.s_addr ? inp->inp_laddr : ifaddr->sin_addr,
-	    inp->inp_lport, 0) != NULL)
-		return (EADDRINUSE);
-	if (inp->inp_laddr.s_addr == INADDR_ANY) {
-		if (inp->inp_lport == 0)
-			(void)in_pcbbind(inp, (struct mbuf *)0);
-		inp->inp_laddr = ifaddr->sin_addr;
-	}
-	inp->inp_faddr = sin->sin_addr;
-	inp->inp_fport = sin->sin_port;
-	in_pcbrehash(inp);
-	return (0);
-}
-
-void
-in_pcbdisconnect(inp)
-	struct inpcb *inp;
-{
-
-	inp->inp_faddr.s_addr = INADDR_ANY;
-	inp->inp_fport = 0;
-	in_pcbrehash(inp);
-	if (inp->inp_socket->so_state & SS_NOFDREF)
-		in_pcbdetach(inp);
-}
-
-void
-in_pcbdetach(inp)
-	struct inpcb *inp;
-{
-	struct socket *so = inp->inp_socket;
-	int s;
-
-	so->so_pcb = 0;
-	sofree(so);
-	if (inp->inp_options)
-		(void)m_free(inp->inp_options);
-	if (inp->inp_route.ro_rt)
-		rtfree(inp->inp_route.ro_rt);
-	ip_freemoptions(inp->inp_moptions);
-	s = splnet();
-	LIST_REMOVE(inp, inp_hash);
-	LIST_REMOVE(inp, inp_list);
-	splx(s);
-	FREE(inp, M_PCB);
-}
-
-void
-in_setsockaddr(inp, nam)
-	register struct inpcb *inp;
-	struct mbuf *nam;
-{
-	register struct sockaddr_in *sin;
-
-	nam->m_len = sizeof (*sin);
-	sin = mtod(nam, struct sockaddr_in *);
-	bzero((caddr_t)sin, sizeof (*sin));
-	sin->sin_family = AF_INET;
-	sin->sin_len = sizeof(*sin);
-	sin->sin_port = inp->inp_lport;
-	sin->sin_addr = inp->inp_laddr;
-}
-
-void
-in_setpeeraddr(inp, nam)
-	struct inpcb *inp;
-	struct mbuf *nam;
-{
-	register struct sockaddr_in *sin;
-
-	nam->m_len = sizeof (*sin);
-	sin = mtod(nam, struct sockaddr_in *);
-	bzero((caddr_t)sin, sizeof (*sin));
-	sin->sin_family = AF_INET;
-	sin->sin_len = sizeof(*sin);
-	sin->sin_port = inp->inp_fport;
-	sin->sin_addr = inp->inp_faddr;
-}
-
-/*
- * Pass some notification to all connections of a protocol
- * associated with address dst.  The local address and/or port numbers
- * may be specified to limit the search.  The "usual action" will be
- * taken, depending on the ctlinput cmd.  The caller must filter any
- * cmds that are uninteresting (e.g., no error in the map).
- * Call the protocol specific routine (if any) to report
- * any errors for each matching socket.
- *
- * Must be called at splnet.
- */
-void
-in_pcbnotify(head, dst, fport_arg, laddr, lport_arg, cmd, notify)
-	struct inpcbhead *head;
-	struct sockaddr *dst;
-	u_int fport_arg, lport_arg;
-	struct in_addr laddr;
-	int cmd;
-	void (*notify) __P((struct inpcb *, int));
-{
-	register struct inpcb *inp, *oinp;
-	struct in_addr faddr;
-	u_short fport = fport_arg, lport = lport_arg;
-	int errnum, s;
-
-	if ((unsigned)cmd > PRC_NCMDS || dst->sa_family != AF_INET)
-		return;
-	faddr = ((struct sockaddr_in *)dst)->sin_addr;
-	if (faddr.s_addr == INADDR_ANY)
-		return;
-
-	/*
-	 * Redirects go to all references to the destination,
-	 * and use in_rtchange to invalidate the route cache.
-	 * Dead host indications: notify all references to the destination.
-	 * Otherwise, if we have knowledge of the local port and address,
-	 * deliver only to that socket.
-	 */
-	if (PRC_IS_REDIRECT(cmd) || cmd == PRC_HOSTDEAD) {
-		fport = 0;
-		lport = 0;
-		laddr.s_addr = 0;
-		if (cmd != PRC_HOSTDEAD)
-			notify = in_rtchange;
-	}
-	errnum = inetctlerrmap[cmd];
-	s = splnet();
-	for (inp = head->lh_first; inp != NULL;) {
-		if (inp->inp_faddr.s_addr != faddr.s_addr ||
-		    inp->inp_socket == 0 ||
-		    (lport && inp->inp_lport != lport) ||
-		    (laddr.s_addr && inp->inp_laddr.s_addr != laddr.s_addr) ||
-		    (fport && inp->inp_fport != fport)) {
-			inp = inp->inp_list.le_next;
-			continue;
-		}
-		oinp = inp;
-		inp = inp->inp_list.le_next;
-		if (notify)
-			(*notify)(oinp, errnum);
-	}
-	splx(s);
-}
-
-/*
- * Check for alternatives when higher level complains
- * about service problems.  For now, invalidate cached
- * routing information.  If the route was created dynamically
- * (by a redirect), time to try a default gateway again.
- */
-void
-in_losing(inp)
-	struct inpcb *inp;
-{
-	register struct rtentry *rt;
-	struct rt_addrinfo info;
-
-	if ((rt = inp->inp_route.ro_rt)) {
-		inp->inp_route.ro_rt = 0;
-		bzero((caddr_t)&info, sizeof(info));
-		info.rti_info[RTAX_DST] =
-			(struct sockaddr *)&inp->inp_route.ro_dst;
-		info.rti_info[RTAX_GATEWAY] = rt->rt_gateway;
-		info.rti_info[RTAX_NETMASK] = rt_mask(rt);
-		rt_missmsg(RTM_LOSING, &info, rt->rt_flags, 0);
-		if (rt->rt_flags & RTF_DYNAMIC)
-			(void) rtrequest(RTM_DELETE, rt_key(rt),
-				rt->rt_gateway, rt_mask(rt), rt->rt_flags,
-				(struct rtentry **)0);
-		else
-		/*
-		 * A new route can be allocated
-		 * the next time output is attempted.
-		 */
-			rtfree(rt);
-	}
-}
-
-/*
- * After a routing change, flush old routing
- * and allocate a (hopefully) better one.
- */
-static void
-in_rtchange(inp, errnum)
-	register struct inpcb *inp;
-	int errnum;
-{
-	if (inp->inp_route.ro_rt) {
-		rtfree(inp->inp_route.ro_rt);
-		inp->inp_route.ro_rt = 0;
-		/*
-		 * A new route can be allocated the next time
-		 * output is attempted.
-		 */
-	}
-}
-
-struct inpcb *
-in_pcblookup(pcbinfo, faddr, fport_arg, laddr, lport_arg, wild_okay)
-	struct inpcbinfo *pcbinfo;
-	struct in_addr faddr, laddr;
-	u_int fport_arg, lport_arg;
-	int wild_okay;
-{
-	register struct inpcb *inp, *match = NULL;
-	int matchwild = 3, wildcard;
-	u_short fport = fport_arg, lport = lport_arg;
-	int s;
-
-	s = splnet();
-
-	for (inp = pcbinfo->listhead->lh_first; inp != NULL; inp = inp->inp_list.le_next) {
-		if (inp->inp_lport != lport)
-			continue;
-		wildcard = 0;
-		if (inp->inp_faddr.s_addr != INADDR_ANY) {
-			if (faddr.s_addr == INADDR_ANY)
-				wildcard++;
-			else if (inp->inp_faddr.s_addr != faddr.s_addr ||
-			    inp->inp_fport != fport)
-				continue;
-		} else {
-			if (faddr.s_addr != INADDR_ANY)
-				wildcard++;
-		}
-		if (inp->inp_laddr.s_addr != INADDR_ANY) {
-			if (laddr.s_addr == INADDR_ANY)
-				wildcard++;
-			else if (inp->inp_laddr.s_addr != laddr.s_addr)
-				continue;
-		} else {
-			if (laddr.s_addr != INADDR_ANY)
-				wildcard++;
-		}
-		if (wildcard && wild_okay == 0)
-			continue;
-		if (wildcard < matchwild) {
-			match = inp;
-			matchwild = wildcard;
-			if (matchwild == 0) {
-				break;
-			}
-		}
-	}
-	splx(s);
-	return (match);
-}
-
-/*
- * Lookup PCB in hash list.
- */
-struct inpcb *
-in_pcblookuphash(pcbinfo, faddr, fport_arg, laddr, lport_arg, wildcard)
-	struct inpcbinfo *pcbinfo;
-	struct in_addr faddr, laddr;
-	u_int fport_arg, lport_arg;
-	int wildcard;
-{
-	struct inpcbhead *head;
-	register struct inpcb *inp;
-	u_short fport = fport_arg, lport = lport_arg;
-	int s;
-
-	s = splnet();
-	/*
-	 * First look for an exact match.
-	 */
-	head = &pcbinfo->hashbase[INP_PCBHASH(faddr.s_addr, lport, fport, pcbinfo->hashmask)];
-	for (inp = head->lh_first; inp != NULL; inp = inp->inp_hash.le_next) {
-		if (inp->inp_faddr.s_addr == faddr.s_addr &&
-		    inp->inp_laddr.s_addr == laddr.s_addr &&
-		    inp->inp_fport == fport &&
-		    inp->inp_lport == lport)
-			goto found;
-	}
-	if (wildcard) {
-		struct inpcb *local_wild = NULL;
-
-		head = &pcbinfo->hashbase[INP_PCBHASH(INADDR_ANY, lport, 0, pcbinfo->hashmask)];
-		for (inp = head->lh_first; inp != NULL; inp = inp->inp_hash.le_next) {
-			if (inp->inp_faddr.s_addr == INADDR_ANY &&
-			    inp->inp_fport == 0 && inp->inp_lport == lport) {
-				if (inp->inp_laddr.s_addr == laddr.s_addr)
-					goto found;
-				else if (inp->inp_laddr.s_addr == INADDR_ANY)
-					local_wild = inp;
-			}
-		}
-		if (local_wild != NULL) {
-			inp = local_wild;
-			goto found;
-		}
-	}
-	splx(s);
-	return (NULL);
-
-found:
-	/*
-	 * Move PCB to head of this hash chain so that it can be
-	 * found more quickly in the future.
-	 * XXX - this is a pessimization on machines with few
-	 * concurrent connections.
-	 */
-	if (inp != head->lh_first) {
-		LIST_REMOVE(inp, inp_hash);
-		LIST_INSERT_HEAD(head, inp, inp_hash);
-	}
-	splx(s);
-	return (inp);
-}
-
-/*
- * Insert PCB into hash chain. Must be called at splnet.
- */
-static void
-in_pcbinshash(inp)
-	struct inpcb *inp;
-{
-	struct inpcbhead *head;
-
-	head = &inp->inp_pcbinfo->hashbase[INP_PCBHASH(inp->inp_faddr.s_addr,
-		 inp->inp_lport, inp->inp_fport, inp->inp_pcbinfo->hashmask)];
-
-	LIST_INSERT_HEAD(head, inp, inp_hash);
-}
-
-void
-in_pcbrehash(inp)
-	struct inpcb *inp;
-{
-	struct inpcbhead *head;
-	int s;
-
-	s = splnet();
-	LIST_REMOVE(inp, inp_hash);
-
-	head = &inp->inp_pcbinfo->hashbase[INP_PCBHASH(inp->inp_faddr.s_addr,
-		inp->inp_lport, inp->inp_fport, inp->inp_pcbinfo->hashmask)];
-
-	LIST_INSERT_HEAD(head, inp, inp_hash);
-	splx(s);
-}
diff --git a/cpukit/libnetworking/netinet/in_pcb.h b/cpukit/libnetworking/netinet/in_pcb.h
deleted file mode 100644
index 9390cfda6c..0000000000
--- a/cpukit/libnetworking/netinet/in_pcb.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)in_pcb.h	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#ifndef _NETINET_IN_PCB_H_
-#define _NETINET_IN_PCB_H_
-
-#include <sys/queue.h>
-
-/*
- * Common structure pcb for internet protocol implementation.
- * Here are stored pointers to local and foreign host table
- * entries, local and foreign socket numbers, and pointers
- * up (to a socket structure) and down (to a protocol-specific)
- * control block.
- */
-LIST_HEAD(inpcbhead, inpcb);
-
-struct inpcb {
-	LIST_ENTRY(inpcb) inp_list;		/* list for all PCBs of this proto */
-	LIST_ENTRY(inpcb) inp_hash;		/* hash list */
-	struct	inpcbinfo *inp_pcbinfo;	/* PCB list info */
-	struct	in_addr inp_faddr;	/* foreign host table entry */
-	struct	in_addr inp_laddr;	/* local host table entry */
-	u_short	inp_fport;		/* foreign port */
-	u_short	inp_lport;		/* local port */
-	caddr_t	inp_ppcb;		/* pointer to per-protocol pcb */
-	struct	socket *inp_socket;	/* back pointer to socket */
-	struct	mbuf *inp_options;	/* IP options */
-	struct	route inp_route;	/* placeholder for routing entry */
-	int	inp_flags;		/* generic IP/datagram flags */
-	u_char	inp_ip_tos;		/* type of service proto */
-	u_char	inp_ip_ttl;		/* time to live proto */
-	u_char	inp_ip_p;		/* protocol proto */
-	u_char	pad[1];			/* alignment */
-	struct	ip_moptions *inp_moptions; /* IP multicast options */
-#if 0 /* Someday, perhaps... */
-	struct	ip inp_ip;		/* header prototype; should have more */
-#endif
-};
-
-struct inpcbinfo {
-	struct inpcbhead *listhead;
-	struct inpcbhead *hashbase;
-	unsigned long hashmask;
-	unsigned short lastport;
-	unsigned short lastlow;
-	unsigned short lasthi;
-};
-
-#define INP_PCBHASH(faddr, lport, fport, mask) \
-	(((faddr) ^ ((faddr) >> 16) ^ (lport) ^ (fport)) & (mask))
-
-/* flags in inp_flags: */
-#define	INP_RECVOPTS		0x01	/* receive incoming IP options */
-#define	INP_RECVRETOPTS		0x02	/* receive IP options for reply */
-#define	INP_RECVDSTADDR		0x04	/* receive IP dst address */
-#define	INP_HDRINCL		0x08	/* user supplies entire IP header */
-#define	INP_HIGHPORT		0x10	/* user wants "high" port binding */
-#define	INP_LOWPORT		0x20	/* user wants "low" port binding */
-#define	INP_ANONPORT		0x40	/* port chosen for user */
-#define	INP_RECVIF		0x80	/* receive incoming interface */
-#define	INP_CONTROLOPTS		(INP_RECVOPTS|INP_RECVRETOPTS|INP_RECVDSTADDR|\
-					INP_RECVIF)
-
-#define	INPLOOKUP_WILDCARD	1
-
-#define	sotoinpcb(so)	((struct inpcb *)(so)->so_pcb)
-
-#ifdef KERNEL
-void	 in_losing __P((struct inpcb *));
-int	 in_pcballoc __P((struct socket *, struct inpcbinfo *));
-int	 in_pcbbind __P((struct inpcb *, struct mbuf *));
-int	 in_pcbconnect __P((struct inpcb *, struct mbuf *));
-void	 in_pcbdetach __P((struct inpcb *));
-void	 in_pcbdisconnect __P((struct inpcb *));
-int	 in_pcbladdr __P((struct inpcb *, struct mbuf *,
-	    struct sockaddr_in **));
-struct inpcb *
-	 in_pcblookup __P((struct inpcbinfo *,
-	    struct in_addr, u_int, struct in_addr, u_int, int));
-struct inpcb *
-	 in_pcblookuphash __P((struct inpcbinfo *,
-	    struct in_addr, u_int, struct in_addr, u_int, int));
-void	 in_pcbnotify __P((struct inpcbhead *, struct sockaddr *,
-	    u_int, struct in_addr, u_int, int, void (*)(struct inpcb *, int)));
-void	 in_pcbrehash __P((struct inpcb *));
-void	 in_setpeeraddr __P((struct inpcb *, struct mbuf *));
-void	 in_setsockaddr __P((struct inpcb *, struct mbuf *));
-#endif
-
-#endif
diff --git a/cpukit/libnetworking/netinet/in_proto.c b/cpukit/libnetworking/netinet/in_proto.c
deleted file mode 100644
index 3fa845955e..0000000000
--- a/cpukit/libnetworking/netinet/in_proto.c
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)in_proto.c	8.2 (Berkeley) 2/9/95
- *	$Id$
- */
-
-#include "opt_tcpdebug.h"
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/kernel.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/domain.h>
-#include <sys/mbuf.h>
-#include <sys/protosw.h>
-#include <sys/sysctl.h>
-
-#include <net/if.h>
-#include <net/radix.h>
-#include <net/route.h>
-
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/ip_var.h>
-#include <netinet/ip_icmp.h>
-#include <netinet/in_pcb.h>
-#include <netinet/igmp_var.h>
-#include <netinet/tcp.h>
-#include <netinet/tcp_fsm.h>
-#include <netinet/tcp_seq.h>
-#include <netinet/tcp_timer.h>
-#include <netinet/tcp_var.h>
-#include <netinet/tcpip.h>
-#ifdef TCPDEBUG
-#include <netinet/tcp_debug.h>
-#endif
-#include <netinet/udp.h>
-#include <netinet/udp_var.h>
-/*
- * TCP/IP protocol family: IP, ICMP, UDP, TCP.
- */
-
-#ifdef IPXIP
-#include <netipx/ipx.h>
-#include <netipx/ipx_ip.h>
-#endif
-
-#ifdef NSIP
-#include <netns/ns.h>
-#include <netns/ns_if.h>
-#endif
-
-#ifdef TPIP
-void	tpip_input(), tpip_ctlinput(), tp_init(), tp_slowtimo(), tp_drain();
-int	tp_ctloutput(), tp_usrreq();
-#endif
-
-#ifdef EON
-void	eoninput(), eonctlinput(), eonprotoinit();
-#endif /* EON */
-
-extern	struct domain inetdomain;
-
-struct protosw inetsw[] = {
-{ 0,		&inetdomain,	0,		0,
-  0,		0,		0,		0,
-  0,
-  ip_init,	0,		ip_slowtimo,	ip_drain
-},
-{ SOCK_DGRAM,	&inetdomain,	IPPROTO_UDP,	PR_ATOMIC|PR_ADDR,
-  udp_input,	0,		udp_ctlinput,	ip_ctloutput,
-  udp_usrreq,
-  udp_init
-},
-{ SOCK_STREAM,	&inetdomain,	IPPROTO_TCP,
-	PR_CONNREQUIRED|PR_IMPLOPCL|PR_WANTRCVD,
-  tcp_input,	0,		tcp_ctlinput,	tcp_ctloutput,
-  0,
-  tcp_init,	tcp_fasttimo,	tcp_slowtimo,	tcp_drain,
-  &tcp_usrreqs
-},
-{ SOCK_RAW,	&inetdomain,	IPPROTO_RAW,	PR_ATOMIC|PR_ADDR,
-  rip_input,	0,		0,		rip_ctloutput,
-  rip_usrreq,
-  0,		0,		0,		0,
-},
-{ SOCK_RAW,	&inetdomain,	IPPROTO_ICMP,	PR_ATOMIC|PR_ADDR,
-  icmp_input,	0,		0,		rip_ctloutput,
-  rip_usrreq
-},
-{ SOCK_RAW,	&inetdomain,	IPPROTO_IGMP,	PR_ATOMIC|PR_ADDR,
-  igmp_input,	0,		0,		rip_ctloutput,
-  rip_usrreq,
-  igmp_init,	igmp_fasttimo,	igmp_slowtimo
-},
-{ SOCK_RAW,	&inetdomain,	IPPROTO_RSVP,	PR_ATOMIC|PR_ADDR,
-  rsvp_input,	0,		0,		rip_ctloutput,
-  rip_usrreq,
-  0,		0,		0,		0,
-},
-{ SOCK_RAW,	&inetdomain,	IPPROTO_IPIP,	PR_ATOMIC|PR_ADDR,
-  ipip_input,	0,	 	0,		rip_ctloutput,
-  rip_usrreq,
-  0,		0,		0,		0,
-},
-#ifdef IPDIVERT
-{ SOCK_RAW,	&inetdomain,	IPPROTO_DIVERT,	PR_ATOMIC|PR_ADDR,
-  div_input,	0,	 	0,		ip_ctloutput,
-  div_usrreq,
-  div_init,	0,		0,		0,
-},
-#endif
-#ifdef TPIP
-{ SOCK_SEQPACKET,&inetdomain,	IPPROTO_TP,	PR_CONNREQUIRED|PR_WANTRCVD,
-  tpip_input,	0,		tpip_ctlinput,	tp_ctloutput,
-  tp_usrreq,
-  tp_init,	0,		tp_slowtimo,	tp_drain,
-},
-#endif
-/* EON (ISO CLNL over IP) */
-#ifdef EON
-{ SOCK_RAW,	&inetdomain,	IPPROTO_EON,	0,
-  eoninput,	0,		eonctlinput,		0,
-  0,
-  eonprotoinit,	0,		0,		0,
-},
-#endif
-#ifdef IPXIP
-{ SOCK_RAW,	&inetdomain,	IPPROTO_IDP,	PR_ATOMIC|PR_ADDR,
-  ipxip_input,	0,		ipxip_ctlinput,	0,
-  rip_usrreq,
-  0,		0,		0,		0,
-},
-#endif
-#ifdef NSIP
-{ SOCK_RAW,	&inetdomain,	IPPROTO_IDP,	PR_ATOMIC|PR_ADDR,
-  idpip_input,	0,		nsip_ctlinput,	0,
-  rip_usrreq,
-  0,		0,		0,		0,
-},
-#endif
-	/* raw wildcard */
-{ SOCK_RAW,	&inetdomain,	0,		PR_ATOMIC|PR_ADDR,
-  rip_input,	0,		0,		rip_ctloutput,
-  rip_usrreq,
-  rip_init,	0,		0,		0,
-},
-};
-
-extern int in_inithead(void **, int);
-
-struct domain inetdomain =
-    { AF_INET, "internet", 0, 0, 0, 
-      inetsw, &inetsw[sizeof(inetsw)/sizeof(inetsw[0])], 0,
-      in_inithead, 32, sizeof(struct sockaddr_in)
-    };
-
-DOMAIN_SET(inet);
-
-SYSCTL_NODE(_net,      PF_INET,		inet,	CTLFLAG_RW, 0,
-	"Internet Family");
-
-SYSCTL_NODE(_net_inet, IPPROTO_IP,	ip,	CTLFLAG_RW, 0,	"IP");
-SYSCTL_NODE(_net_inet, IPPROTO_ICMP,	icmp,	CTLFLAG_RW, 0,	"ICMP");
-SYSCTL_NODE(_net_inet, IPPROTO_UDP,	udp,	CTLFLAG_RW, 0,	"UDP");
-SYSCTL_NODE(_net_inet, IPPROTO_TCP,	tcp,	CTLFLAG_RW, 0,	"TCP");
-SYSCTL_NODE(_net_inet, IPPROTO_IGMP,	igmp,	CTLFLAG_RW, 0,	"IGMP");
-#ifdef IPDIVERT
-SYSCTL_NODE(_net_inet, IPPROTO_DIVERT,	div,	CTLFLAG_RW, 0,	"DIVERT");
-#endif
-
diff --git a/cpukit/libnetworking/netinet/in_rmx.c b/cpukit/libnetworking/netinet/in_rmx.c
deleted file mode 100644
index ba1793b3b4..0000000000
--- a/cpukit/libnetworking/netinet/in_rmx.c
+++ /dev/null
@@ -1,384 +0,0 @@
-/*
- * Copyright 1994, 1995 Massachusetts Institute of Technology
- *
- * Permission to use, copy, modify, and distribute this software and
- * its documentation for any purpose and without fee is hereby
- * granted, provided that both the above copyright notice and this
- * permission notice appear in all copies, that both the above
- * copyright notice and this permission notice appear in all
- * supporting documentation, and that the name of M.I.T. not be used
- * in advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission.  M.I.T. makes
- * no representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied
- * warranty.
- *
- * THIS SOFTWARE IS PROVIDED BY M.I.T. ``AS IS''.  M.I.T. DISCLAIMS
- * ALL EXPRESS OR IMPLIED WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT
- * SHALL M.I.T. BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $Id$
- */
-
-/*
- * This code does two things necessary for the enhanced TCP metrics to
- * function in a useful manner:
- *  1) It marks all non-host routes as `cloning', thus ensuring that
- *     every actual reference to such a route actually gets turned
- *     into a reference to a host route to the specific destination
- *     requested.
- *  2) When such routes lose all their references, it arranges for them
- *     to be deleted in some random collection of circumstances, so that
- *     a large quantity of stale routing data is not kept in kernel memory
- *     indefinitely.  See in_rtqtimo() below for the exact mechanism.
- */
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/sysctl.h>
-#include <sys/queue.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/mbuf.h>
-#include <sys/syslog.h>
-
-#include <net/if.h>
-#include <net/route.h>
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/in_var.h>
-
-#include <netinet/ip.h>
-#include <netinet/ip_var.h>
-
-#include <netinet/tcp.h>
-#include <netinet/tcp_seq.h>
-#include <netinet/tcp_timer.h>
-#include <netinet/tcp_var.h>
-
-extern int	in_inithead __P((void **head, int off));
-
-#define RTPRF_OURS		RTF_PROTO3	/* set on routes we manage */
-
-/*
- * Do what we need to do when inserting a route.
- */
-static struct radix_node *
-in_addroute(void *v_arg, void *n_arg, struct radix_node_head *head,
-	    struct radix_node *treenodes)
-{
-	struct rtentry *rt = (struct rtentry *)treenodes;
-	struct sockaddr_in *sin = (struct sockaddr_in *)rt_key(rt);
-	struct radix_node *ret;
-
-	/*
-	 * For IP, all unicast non-host routes are automatically cloning.
-	 */
-	if(IN_MULTICAST(ntohl(sin->sin_addr.s_addr)))
-		rt->rt_flags |= RTF_MULTICAST;
-
-	if(!(rt->rt_flags & (RTF_HOST | RTF_CLONING | RTF_MULTICAST))) {
-		rt->rt_flags |= RTF_PRCLONING;
-	}
-
-	/*
-	 * A little bit of help for both IP output and input:
-	 *   For host routes, we make sure that RTF_BROADCAST
-	 *   is set for anything that looks like a broadcast address.
-	 *   This way, we can avoid an expensive call to in_broadcast()
-	 *   in ip_output() most of the time (because the route passed
-	 *   to ip_output() is almost always a host route).
-	 *
-	 *   We also do the same for local addresses, with the thought
-	 *   that this might one day be used to speed up ip_input().
-	 *
-	 * We also mark routes to multicast addresses as such, because
-	 * it's easy to do and might be useful (but this is much more
-	 * dubious since it's so easy to inspect the address).  (This
-	 * is done above.)
-	 */
-	if (rt->rt_flags & RTF_HOST) {
-		if (in_broadcast(sin->sin_addr, rt->rt_ifp)) {
-			rt->rt_flags |= RTF_BROADCAST;
-		} else {
-#define satosin(sa) ((struct sockaddr_in *)sa)
-			if (satosin(rt->rt_ifa->ifa_addr)->sin_addr.s_addr
-			    == sin->sin_addr.s_addr)
-				rt->rt_flags |= RTF_LOCAL;
-#undef satosin
-		}
-	}
-
-	/*
-	 * We also specify a send and receive pipe size for every
-	 * route added, to help TCP a bit.  TCP doesn't actually
-	 * want a true pipe size, which would be prohibitive in memory
-	 * costs and is hard to compute anyway; it simply uses these
-	 * values to size its buffers.  So, we fill them in with the
-	 * same values that TCP would have used anyway, and allow the
-	 * installing program or the link layer to override these values
-	 * as it sees fit.  This will hopefully allow TCP more
-	 * opportunities to save its ssthresh value.
-	 */
-	if (!rt->rt_rmx.rmx_sendpipe && !(rt->rt_rmx.rmx_locks & RTV_SPIPE))
-		rt->rt_rmx.rmx_sendpipe = tcp_sendspace;
-
-	if (!rt->rt_rmx.rmx_recvpipe && !(rt->rt_rmx.rmx_locks & RTV_RPIPE))
-		rt->rt_rmx.rmx_recvpipe = tcp_recvspace;
-
-	if (!rt->rt_rmx.rmx_mtu && !(rt->rt_rmx.rmx_locks & RTV_MTU) 
-	    && rt->rt_ifp)
-		rt->rt_rmx.rmx_mtu = rt->rt_ifp->if_mtu;
-
-	ret = rn_addroute(v_arg, n_arg, head, treenodes);
-	if (ret == NULL && rt->rt_flags & RTF_HOST) {
-		struct rtentry *rt2;
-		/*
-		 * We are trying to add a host route, but can't.
-		 * Find out if it is because of an
-		 * ARP entry and delete it if so.
-		 */
-		rt2 = rtalloc1((struct sockaddr *)sin, 0,
-				RTF_CLONING | RTF_PRCLONING);
-		if (rt2) {
-			if (rt2->rt_flags & RTF_LLINFO &&
-				rt2->rt_flags & RTF_HOST &&
-				rt2->rt_gateway &&
-				rt2->rt_gateway->sa_family == AF_LINK) {
-				rtrequest(RTM_DELETE,
-					  (struct sockaddr *)rt_key(rt2),
-					  rt2->rt_gateway,
-					  rt_mask(rt2), rt2->rt_flags, 0);
-				ret = rn_addroute(v_arg, n_arg, head,
-					treenodes);
-			}
-			RTFREE(rt2);
-		}
-	}
-	return ret;
-}
-
-/*
- * This code is the inverse of in_clsroute: on first reference, if we
- * were managing the route, stop doing so and set the expiration timer
- * back off again.
- */
-static struct radix_node *
-in_matroute(void *v_arg, struct radix_node_head *head)
-{
-	struct radix_node *rn = rn_match(v_arg, head);
-	struct rtentry *rt = (struct rtentry *)rn;
-
-	if(rt && rt->rt_refcnt == 0) { /* this is first reference */
-		if(rt->rt_flags & RTPRF_OURS) {
-			rt->rt_flags &= ~RTPRF_OURS;
-			rt->rt_rmx.rmx_expire = 0;
-		}
-	}
-	return rn;
-}
-
-static int rtq_reallyold = 60*60;
-	/* one hour is ``really old'' */
-SYSCTL_INT(_net_inet_ip, IPCTL_RTEXPIRE, rtexpire,
-	CTLFLAG_RW, &rtq_reallyold , 0, "");
-				   
-static int rtq_minreallyold = 10;
-	/* never automatically crank down to less */
-SYSCTL_INT(_net_inet_ip, IPCTL_RTMINEXPIRE, rtminexpire,
-	CTLFLAG_RW, &rtq_minreallyold , 0, "");
-				   
-static int rtq_toomany = 128;
-	/* 128 cached routes is ``too many'' */
-SYSCTL_INT(_net_inet_ip, IPCTL_RTMAXCACHE, rtmaxcache,
-	CTLFLAG_RW, &rtq_toomany , 0, "");
-				   
-
-/*
- * On last reference drop, mark the route as belong to us so that it can be
- * timed out.
- */
-static void
-in_clsroute(struct radix_node *rn, struct radix_node_head *head)
-{
-	struct rtentry *rt = (struct rtentry *)rn;
-
-	if(!(rt->rt_flags & RTF_UP))
-		return;		/* prophylactic measures */
-
-	if((rt->rt_flags & (RTF_LLINFO | RTF_HOST)) != RTF_HOST)
-		return;
-
-	if((rt->rt_flags & (RTF_WASCLONED | RTPRF_OURS))
-	   != RTF_WASCLONED)
-		return;
-
-	/*
-	 * As requested by David Greenman:
-	 * If rtq_reallyold is 0, just delete the route without
-	 * waiting for a timeout cycle to kill it.
-	 */
-	if(rtq_reallyold != 0) {
-		rt->rt_flags |= RTPRF_OURS;
-		rt->rt_rmx.rmx_expire = rtems_bsdnet_seconds_since_boot() + rtq_reallyold;
-	} else {
-		rtrequest(RTM_DELETE,
-			  (struct sockaddr *)rt_key(rt),
-			  rt->rt_gateway, rt_mask(rt),
-			  rt->rt_flags, 0);
-	}
-}
-
-struct rtqk_arg {
-	struct radix_node_head *rnh;
-	int draining;
-	int killed;
-	int found;
-	int updating;
-	time_t nextstop;
-};
-
-/*
- * Get rid of old routes.  When draining, this deletes everything, even when
- * the timeout is not expired yet.  When updating, this makes sure that
- * nothing has a timeout longer than the current value of rtq_reallyold.
- */
-static int
-in_rtqkill(struct radix_node *rn, void *rock)
-{
-	struct rtqk_arg *ap = rock;
-	struct rtentry *rt = (struct rtentry *)rn;
-	int err;
-
-	if(rt->rt_flags & RTPRF_OURS) {
-		ap->found++;
-
-		if(ap->draining || rt->rt_rmx.rmx_expire <= rtems_bsdnet_seconds_since_boot()) {
-			if(rt->rt_refcnt > 0)
-				panic("rtqkill route really not free");
-
-			err = rtrequest(RTM_DELETE,
-					(struct sockaddr *)rt_key(rt),
-					rt->rt_gateway, rt_mask(rt),
-					rt->rt_flags, 0);
-			if(err) {
-				log(LOG_WARNING, "in_rtqkill: error %d\n", err);
-			} else {
-				ap->killed++;
-			}
-		} else {
-			if(ap->updating
-			   && (rt->rt_rmx.rmx_expire - rtems_bsdnet_seconds_since_boot()
-			       > rtq_reallyold)) {
-				rt->rt_rmx.rmx_expire = rtems_bsdnet_seconds_since_boot()
-					+ rtq_reallyold;
-			}
-			ap->nextstop = lmin(ap->nextstop,
-					    rt->rt_rmx.rmx_expire);
-		}
-	}
-
-	return 0;
-}
-
-#define RTQ_TIMEOUT	60*10	/* run no less than once every ten minutes */
-static int rtq_timeout = RTQ_TIMEOUT;
-
-static void
-in_rtqtimo(void *rock)
-{
-	struct radix_node_head *rnh = rock;
-	struct rtqk_arg arg;
-	struct timeval atv;
-	static time_t last_adjusted_timeout = 0;
-	int s;
-
-	arg.found = arg.killed = 0;
-	arg.rnh = rnh;
-	arg.nextstop = rtems_bsdnet_seconds_since_boot() + rtq_timeout;
-	arg.draining = arg.updating = 0;
-	s = splnet();
-	rnh->rnh_walktree(rnh, in_rtqkill, &arg);
-	splx(s);
-
-	/*
-	 * Attempt to be somewhat dynamic about this:
-	 * If there are ``too many'' routes sitting around taking up space,
-	 * then crank down the timeout, and see if we can't make some more
-	 * go away.  However, we make sure that we will never adjust more
-	 * than once in rtq_timeout seconds, to keep from cranking down too
-	 * hard.
-	 */
-	if((arg.found - arg.killed > rtq_toomany)
-	   && (rtems_bsdnet_seconds_since_boot() - last_adjusted_timeout >= rtq_timeout)
-	   && rtq_reallyold > rtq_minreallyold) {
-		rtq_reallyold = 2*rtq_reallyold / 3;
-		if(rtq_reallyold < rtq_minreallyold) {
-			rtq_reallyold = rtq_minreallyold;
-		}
-
-		last_adjusted_timeout = rtems_bsdnet_seconds_since_boot();
-#ifdef DIAGNOSTIC
-		log(LOG_DEBUG, "in_rtqtimo: adjusted rtq_reallyold to %d\n",
-		    rtq_reallyold);
-#endif
-		arg.found = arg.killed = 0;
-		arg.updating = 1;
-		s = splnet();
-		rnh->rnh_walktree(rnh, in_rtqkill, &arg);
-		splx(s);
-	}
-
-	atv.tv_usec = 0;
-	atv.tv_sec = arg.nextstop;
-	timeout(in_rtqtimo, rock, hzto(&atv));
-}
-
-void
-in_rtqdrain(void)
-{
-	struct radix_node_head *rnh = rt_tables[AF_INET];
-	struct rtqk_arg arg;
-	int s;
-	arg.found = arg.killed = 0;
-	arg.rnh = rnh;
-	arg.nextstop = 0;
-	arg.draining = 1;
-	arg.updating = 0;
-	s = splnet();
-	rnh->rnh_walktree(rnh, in_rtqkill, &arg);
-	splx(s);
-}
-
-/*
- * Initialize our routing tree.
- */
-int
-in_inithead(void **head, int off)
-{
-	struct radix_node_head *rnh;
-
-	if(!rn_inithead(head, off))
-		return 0;
-
-	if(head != (void **)&rt_tables[AF_INET]) /* BOGUS! */
-		return 1;	/* only do this for the real routing table */
-
-	rnh = *head;
-	rnh->rnh_addaddr = in_addroute;
-	rnh->rnh_matchaddr = in_matroute;
-	rnh->rnh_close = in_clsroute;
-	in_rtqtimo(rnh);	/* kick off timeout first time */
-	return 1;
-}
-
diff --git a/cpukit/libnetworking/netinet/in_systm.h b/cpukit/libnetworking/netinet/in_systm.h
deleted file mode 100644
index d72e9b4665..0000000000
--- a/cpukit/libnetworking/netinet/in_systm.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)in_systm.h	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#ifndef _NETINET_IN_SYSTM_H_
-#define _NETINET_IN_SYSTM_H_
-
-/*
- * Miscellaneous internetwork
- * definitions for kernel.
- */
-
-/*
- * Network types.
- *
- * Internally the system keeps counters in the headers with the bytes
- * swapped so that VAX instructions will work on them.  It reverses
- * the bytes before transmission at each protocol level.  The n_ types
- * represent the types with the bytes in ``high-ender'' order.
- */
-typedef u_short n_short;		/* short as received from the net */
-typedef u_long	n_long;			/* long as received from the net */
-
-typedef	u_long	n_time;			/* ms since 00:00 GMT, byte rev */
-
-#ifdef KERNEL
-n_time	 iptime __P((void));
-#endif
-
-#endif
diff --git a/cpukit/libnetworking/netinet/in_var.h b/cpukit/libnetworking/netinet/in_var.h
deleted file mode 100644
index e7a54d5e85..0000000000
--- a/cpukit/libnetworking/netinet/in_var.h
+++ /dev/null
@@ -1,235 +0,0 @@
-/*
- * Copyright (c) 1985, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)in_var.h	8.2 (Berkeley) 1/9/95
- *	$Id$
- */
-
-#ifndef _NETINET_IN_VAR_H_
-#define _NETINET_IN_VAR_H_
-
-#include <sys/queue.h>
-
-/*
- * Interface address, Internet version.  One of these structures
- * is allocated for each interface with an Internet address.
- * The ifaddr structure contains the protocol-independent part
- * of the structure and is assumed to be first.
- */
-struct in_ifaddr {
-	struct	ifaddr ia_ifa;		/* protocol-independent info */
-#define	ia_ifp		ia_ifa.ifa_ifp
-#define ia_flags	ia_ifa.ifa_flags
-					/* ia_{,sub}net{,mask} in host order */
-	u_long	ia_net;			/* network number of interface */
-	u_long	ia_netmask;		/* mask of net part */
-	u_long	ia_subnet;		/* subnet number, including net */
-	u_long	ia_subnetmask;		/* mask of subnet part */
-	struct	in_addr ia_netbroadcast; /* to recognize net broadcasts */
-	struct	in_ifaddr *ia_next;	/* next in list of internet addresses */
-	struct	sockaddr_in ia_addr;	/* reserve space for interface name */
-	struct	sockaddr_in ia_dstaddr; /* reserve space for broadcast addr */
-#define	ia_broadaddr	ia_dstaddr
-	struct	sockaddr_in ia_sockmask; /* reserve space for general netmask */
-	LIST_HEAD(in_multihead, in_multi) ia_multiaddrs;
-					/* list of multicast addresses */
-};
-
-struct	in_aliasreq {
-	char	ifra_name[IFNAMSIZ];		/* if name, e.g. "en0" */
-	struct	sockaddr_in ifra_addr;
-	struct	sockaddr_in ifra_broadaddr;
-#define ifra_dstaddr ifra_broadaddr
-	struct	sockaddr_in ifra_mask;
-};
-/*
- * Given a pointer to an in_ifaddr (ifaddr),
- * return a pointer to the addr as a sockaddr_in.
- */
-#define IA_SIN(ia)    (&(((struct in_ifaddr *)(ia))->ia_addr))
-#define IA_DSTSIN(ia) (&(((struct in_ifaddr *)(ia))->ia_dstaddr))
-
-#define IN_LNAOF(in, ifa) \
-	((ntohl((in).s_addr) & ~((struct in_ifaddr *)(ifa)->ia_subnetmask))
-
-
-#ifdef	KERNEL
-extern	struct	in_ifaddr *in_ifaddr;
-extern	struct	ifqueue	ipintrq;		/* ip packet input queue */
-extern	struct	in_addr zeroin_addr;
-extern	u_char	inetctlerrmap[];
-extern	int rtq_reallyold;	/* XXX */
-extern	int rtq_minreallyold;	/* XXX */
-extern	int rtq_toomany;	/* XXX */
-
-/*
- * Macro for finding the interface (ifnet structure) corresponding to one
- * of our IP addresses.
- */
-#define INADDR_TO_IFP(addr, ifp) \
-	/* struct in_addr addr; */ \
-	/* struct ifnet *ifp; */ \
-{ \
-	register struct in_ifaddr *ia; \
-\
-	for (ia = in_ifaddr; \
-	    ia != NULL && ((ia->ia_ifp->if_flags & IFF_POINTOPOINT)? \
-		IA_DSTSIN(ia):IA_SIN(ia))->sin_addr.s_addr != (addr).s_addr; \
-	    ia = ia->ia_next) \
-		 continue; \
-	if (ia == NULL) \
-	    for (ia = in_ifaddr; \
-		ia != NULL; \
-		ia = ia->ia_next) \
-		    if (ia->ia_ifp->if_flags & IFF_POINTOPOINT && \
-			IA_SIN(ia)->sin_addr.s_addr == (addr).s_addr) \
-			    break; \
-	(ifp) = (ia == NULL) ? NULL : ia->ia_ifp; \
-}
-
-/*
- * Macro for finding the internet address structure (in_ifaddr) corresponding
- * to a given interface (ifnet structure).
- */
-#define IFP_TO_IA(ifp, ia) \
-	/* struct ifnet *ifp; */ \
-	/* struct in_ifaddr *ia; */ \
-{ \
-	for ((ia) = in_ifaddr; \
-	    (ia) != NULL && (ia)->ia_ifp != (ifp); \
-	    (ia) = (ia)->ia_next) \
-		continue; \
-}
-#endif
-
-/*
- * This information should be part of the ifnet structure but we don't wish
- * to change that - as it might break a number of things
- */
-
-struct router_info {
-	struct ifnet *rti_ifp;
-	int    rti_type; /* type of router which is querier on this interface */
-	int    rti_time; /* # of slow timeouts since last old query */
-	struct router_info *rti_next;
-};
-
-/*
- * Internet multicast address structure.  There is one of these for each IP
- * multicast group to which this host belongs on a given network interface.
- * They are kept in a linked list, rooted in the interface's in_ifaddr
- * structure.
- */
-struct in_multi {
-	LIST_ENTRY(in_multi) inm_entry; /* list glue */
-	struct	in_addr inm_addr;	/* IP multicast address */
-	struct	ifnet *inm_ifp;		/* back pointer to ifnet */
-	struct	in_ifaddr *inm_ia;	/* back pointer to in_ifaddr */
-	u_int	inm_refcount;		/* no. membership claims by sockets */
-	u_int	inm_timer;		/* IGMP membership report timer */
-	u_int	inm_state;		/*  state of the membership */
-	struct	router_info *inm_rti;	/* router info*/
-};
-
-#ifdef KERNEL
-/*
- * Structure used by macros below to remember position when stepping through
- * all of the in_multi records.
- */
-struct in_multistep {
-	struct in_ifaddr *i_ia;
-	struct in_multi *i_inm;
-};
-
-/*
- * Macro for looking up the in_multi record for a given IP multicast address
- * on a given interface.  If no matching record is found, "inm" returns NULL.
- */
-#define IN_LOOKUP_MULTI(addr, ifp, inm) \
-	/* struct in_addr addr; */ \
-	/* struct ifnet *ifp; */ \
-	/* struct in_multi *inm; */ \
-{ \
-	register struct in_ifaddr *ia; \
-\
-	IFP_TO_IA((ifp), ia); \
-	if (ia == NULL) \
-		(inm) = NULL; \
-	else \
-		for ((inm) = ia->ia_multiaddrs.lh_first; \
-		    (inm) != NULL && (inm)->inm_addr.s_addr != (addr).s_addr; \
-		     (inm) = inm->inm_entry.le_next) \
-			 continue; \
-}
-
-/*
- * Macro to step through all of the in_multi records, one at a time.
- * The current position is remembered in "step", which the caller must
- * provide.  IN_FIRST_MULTI(), below, must be called to initialize "step"
- * and get the first record.  Both macros return a NULL "inm" when there
- * are no remaining records.
- */
-#define IN_NEXT_MULTI(step, inm) \
-	/* struct in_multistep  step; */ \
-	/* struct in_multi *inm; */ \
-{ \
-	if (((inm) = (step).i_inm) != NULL) \
-		(step).i_inm = (inm)->inm_entry.le_next; \
-	else \
-		while ((step).i_ia != NULL) { \
-			(inm) = (step).i_ia->ia_multiaddrs.lh_first; \
-			(step).i_ia = (step).i_ia->ia_next; \
-			if ((inm) != NULL) { \
-				(step).i_inm = (inm)->inm_entry.le_next; \
-				break; \
-			} \
-		} \
-}
-
-#define IN_FIRST_MULTI(step, inm) \
-	/* struct in_multistep step; */ \
-	/* struct in_multi *inm; */ \
-{ \
-	(step).i_ia = in_ifaddr; \
-	(step).i_inm = NULL; \
-	IN_NEXT_MULTI((step), (inm)); \
-}
-
-struct	in_multi *in_addmulti __P((struct in_addr *, struct ifnet *));
-void	in_delmulti __P((struct in_multi *));
-int	in_control __P((struct socket *, u_long, caddr_t, struct ifnet *));
-void	in_rtqdrain __P((void));
-void	ip_input __P((struct mbuf *));
-
-#endif /* KERNEL */
-
-#endif /* _NETINET_IN_VAR_H_ */
diff --git a/cpukit/libnetworking/netinet/ip.h b/cpukit/libnetworking/netinet/ip.h
deleted file mode 100644
index e7f824ca6f..0000000000
--- a/cpukit/libnetworking/netinet/ip.h
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)ip.h	8.2 (Berkeley) 6/1/94
- *	$Id$
- */
-
-#ifndef _NETINET_IP_H_
-#define _NETINET_IP_H_
-
-/*
- * Definitions for internet protocol version 4.
- * Per RFC 791, September 1981.
- */
-#define	IPVERSION	4
-
-/*
- * Structure of an internet header, naked of options.
- *
- * We declare ip_len and ip_off to be short, rather than u_short
- * pragmatically since otherwise unsigned comparisons can result
- * against negative integers quite easily, and fail in subtle ways.
- */
-struct ip {
-#ifdef _IP_VHL
-	u_char	ip_vhl;			/* version << 4 | header length >> 2 */
-#else
-#if BYTE_ORDER == LITTLE_ENDIAN
-	u_char	ip_hl:4,		/* header length */
-		ip_v:4;			/* version */
-#endif
-#if BYTE_ORDER == BIG_ENDIAN
-	u_char	ip_v:4,			/* version */
-		ip_hl:4;		/* header length */
-#endif
-#endif /* not _IP_VHL */
-	u_char	ip_tos;			/* type of service */
-	u_short	ip_len;			/* total length */
-	u_short	ip_id;			/* identification */
-	u_short	ip_off;			/* fragment offset field */
-#define	IP_RF 0x8000			/* reserved fragment flag */
-#define	IP_DF 0x4000			/* dont fragment flag */
-#define	IP_MF 0x2000			/* more fragments flag */
-#define	IP_OFFMASK 0x1fff		/* mask for fragmenting bits */
-	u_char	ip_ttl;			/* time to live */
-	u_char	ip_p;			/* protocol */
-	u_short	ip_sum;			/* checksum */
-	struct	in_addr ip_src,ip_dst;	/* source and dest address */
-};
-
-#ifdef _IP_VHL
-#define	IP_MAKE_VHL(v, hl)	((v) << 4 | (hl))
-#define	IP_VHL_HL(vhl)		((vhl) & 0x0f)
-#define	IP_VHL_V(vhl)		((vhl) >> 4)
-#define	IP_VHL_BORING		0x45
-#endif
-
-#define	IP_MAXPACKET	65535		/* maximum packet size */
-
-/*
- * Definitions for IP type of service (ip_tos)
- */
-#define	IPTOS_LOWDELAY		0x10
-#define	IPTOS_THROUGHPUT	0x08
-#define	IPTOS_RELIABILITY	0x04
-#define	IPTOS_MINCOST		0x02
-
-/*
- * Definitions for IP precedence (also in ip_tos) (hopefully unused)
- */
-#define	IPTOS_PREC_NETCONTROL		0xe0
-#define	IPTOS_PREC_INTERNETCONTROL	0xc0
-#define	IPTOS_PREC_CRITIC_ECP		0xa0
-#define	IPTOS_PREC_FLASHOVERRIDE	0x80
-#define	IPTOS_PREC_FLASH		0x60
-#define	IPTOS_PREC_IMMEDIATE		0x40
-#define	IPTOS_PREC_PRIORITY		0x20
-#define	IPTOS_PREC_ROUTINE		0x00
-
-/*
- * Definitions for options.
- */
-#define	IPOPT_COPIED(o)		((o)&0x80)
-#define	IPOPT_CLASS(o)		((o)&0x60)
-#define	IPOPT_NUMBER(o)		((o)&0x1f)
-
-#define	IPOPT_CONTROL		0x00
-#define	IPOPT_RESERVED1		0x20
-#define	IPOPT_DEBMEAS		0x40
-#define	IPOPT_RESERVED2		0x60
-
-#define	IPOPT_EOL		0		/* end of option list */
-#define	IPOPT_NOP		1		/* no operation */
-
-#define	IPOPT_RR		7		/* record packet route */
-#define	IPOPT_TS		68		/* timestamp */
-#define	IPOPT_SECURITY		130		/* provide s,c,h,tcc */
-#define	IPOPT_LSRR		131		/* loose source route */
-#define	IPOPT_SATID		136		/* satnet id */
-#define	IPOPT_SSRR		137		/* strict source route */
-#define	IPOPT_RA		148		/* router alert */
-
-/*
- * Offsets to fields in options other than EOL and NOP.
- */
-#define	IPOPT_OPTVAL		0		/* option ID */
-#define	IPOPT_OLEN		1		/* option length */
-#define IPOPT_OFFSET		2		/* offset within option */
-#define	IPOPT_MINOFF		4		/* min value of above */
-
-/*
- * Time stamp option structure.
- */
-struct	ip_timestamp {
-	u_char	ipt_code;		/* IPOPT_TS */
-	u_char	ipt_len;		/* size of structure (variable) */
-	u_char	ipt_ptr;		/* index of current entry */
-#if BYTE_ORDER == LITTLE_ENDIAN
-	u_char	ipt_flg:4,		/* flags, see below */
-		ipt_oflw:4;		/* overflow counter */
-#endif
-#if BYTE_ORDER == BIG_ENDIAN
-	u_char	ipt_oflw:4,		/* overflow counter */
-		ipt_flg:4;		/* flags, see below */
-#endif
-	union ipt_timestamp {
-		n_long	ipt_time[1];
-		struct	ipt_ta {
-			struct in_addr ipt_addr;
-			n_long ipt_time;
-		} ipt_ta[1];
-	} ipt_timestamp;
-};
-
-#include <machine/in_cksum.h>
-
-/* flag bits for ipt_flg */
-#define	IPOPT_TS_TSONLY		0		/* timestamps only */
-#define	IPOPT_TS_TSANDADDR	1		/* timestamps and addresses */
-#define	IPOPT_TS_PRESPEC	3		/* specified modules only */
-
-/* bits for security (not byte swapped) */
-#define	IPOPT_SECUR_UNCLASS	0x0000
-#define	IPOPT_SECUR_CONFID	0xf135
-#define	IPOPT_SECUR_EFTO	0x789a
-#define	IPOPT_SECUR_MMMM	0xbc4d
-#define	IPOPT_SECUR_RESTR	0xaf13
-#define	IPOPT_SECUR_SECRET	0xd788
-#define	IPOPT_SECUR_TOPSECRET	0x6bc5
-
-/*
- * Internet implementation parameters.
- */
-#define	MAXTTL		255		/* maximum time to live (seconds) */
-#define	IPDEFTTL	64		/* default ttl, from RFC 1340 */
-#define	IPFRAGTTL	60		/* time to live for frags, slowhz */
-#define	IPTTLDEC	1		/* subtracted when forwarding */
-
-#define	IP_MSS		576		/* default maximum segment size */
-
-#endif
diff --git a/cpukit/libnetworking/netinet/ip_divert.c b/cpukit/libnetworking/netinet/ip_divert.c
deleted file mode 100644
index 2955e811ad..0000000000
--- a/cpukit/libnetworking/netinet/ip_divert.c
+++ /dev/null
@@ -1,382 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	$Id$
- */
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/malloc.h>
-#include <sys/mbuf.h>
-#include <sys/socket.h>
-#include <sys/protosw.h>
-#include <sys/socketvar.h>
-#include <sys/errno.h>
-#include <sys/systm.h>
-
-#include <net/if.h>
-#include <net/route.h>
-
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/in_pcb.h>
-#include <netinet/in_var.h>
-#include <netinet/ip_var.h>
-
-/*
- * Divert sockets
- */
-
-/*
- * Allocate enough space to hold a full IP packet
- */
-#define	DIVSNDQ		(65536 + 100)
-#define	DIVRCVQ		(65536 + 100)
-
-/* Global variables */
-
-/*
- * ip_input() and ip_output() set this secret value before calling us to
- * let us know which divert port to divert a packet to; this is done so
- * we can use the existing prototype for struct protosw's pr_input().
- * This is stored in host order.
- */
-u_short ip_divert_port;
-
-/*
- * We set this value to a non-zero port number when we want the call to
- * ip_fw_chk() in ip_input() or ip_output() to ignore ``divert <port>''
- * chain entries. This is stored in host order.
- */
-u_short ip_divert_ignore;
-
-/* Internal variables */
-
-static struct inpcbhead divcb;
-static struct inpcbinfo divcbinfo;
-
-static u_long	div_sendspace = DIVSNDQ;	/* XXX sysctl ? */
-static u_long	div_recvspace = DIVRCVQ;	/* XXX sysctl ? */
-
-/* Optimization: have this preinitialized */
-static struct sockaddr_in divsrc = { sizeof(divsrc), AF_INET };
-
-/* Internal functions */
-
-static int div_output(struct socket *so,
-		struct mbuf *m, struct mbuf *addr, struct mbuf *control);
-
-/*
- * Initialize divert connection block queue.
- */
-void
-div_init(void)
-{
-	LIST_INIT(&divcb);
-	divcbinfo.listhead = &divcb;
-	/*
-	 * XXX We don't use the hash list for divert IP, but it's easier
-	 * to allocate a one entry hash list than it is to check all
-	 * over the place for hashbase == NULL.
-	 */
-	divcbinfo.hashbase = hashinit(1, M_PCB, &divcbinfo.hashmask);
-}
-
-/*
- * Setup generic address and protocol structures
- * for div_input routine, then pass them along with
- * mbuf chain. ip->ip_len is assumed to have had
- * the header length (hlen) subtracted out already.
- * We tell whether the packet was incoming or outgoing
- * by seeing if hlen == 0, which is a hack.
- */
-void
-div_input(struct mbuf *m, int hlen)
-{
-	struct ip *ip;
-	struct inpcb *inp;
-	struct socket *sa;
-
-	/* Sanity check */
-	if (ip_divert_port == 0)
-		panic("div_input: port is 0");
-
-	/* Assure header */
-	if (m->m_len < sizeof(struct ip) &&
-	    (m = m_pullup(m, sizeof(struct ip))) == 0) {
-		return;
-	}
-	ip = mtod(m, struct ip *);
-
-	/* Record divert port */
-	divsrc.sin_port = htons(ip_divert_port);
-
-	/* Restore packet header fields */
-	ip->ip_len += hlen;
-	HTONS(ip->ip_len);
-	HTONS(ip->ip_off);
-
-	/* Record receive interface address, if any */
-	divsrc.sin_addr.s_addr = 0;
-	if (hlen) {
-		struct ifaddr *ifa;
-
-#ifdef DIAGNOSTIC
-		/* Sanity check */
-		if (!(m->m_flags & M_PKTHDR))
-			panic("div_input: no pkt hdr");
-#endif
-
-		/* More fields affected by ip_input() */
-		HTONS(ip->ip_id);
-
-		/* Find IP address for recieve interface */
-		for (ifa = m->m_pkthdr.rcvif->if_addrlist;
-		    ifa != NULL; ifa = ifa->ifa_next) {
-			if (ifa->ifa_addr == NULL)
-				continue;
-			if (ifa->ifa_addr->sa_family != AF_INET)
-				continue;
-			divsrc.sin_addr =
-			    ((struct sockaddr_in *) ifa->ifa_addr)->sin_addr;
-			break;
-		}
-	}
-
-	/* Put packet on socket queue, if any */
-	sa = NULL;
-	for (inp = divcb.lh_first; inp != NULL; inp = inp->inp_list.le_next) {
-		if (inp->inp_lport == htons(ip_divert_port))
-			sa = inp->inp_socket;
-	}
-	if (sa) {
-		if (sbappendaddr(&sa->so_rcv, (struct sockaddr *)&divsrc,
-				m, (struct mbuf *)0) == 0)
-			m_freem(m);
-		else
-			sorwakeup(sa);
-	} else {
-		m_freem(m);
-		ipstat.ips_noproto++;
-		ipstat.ips_delivered--;
-        }
-}
-
-/*
- * Deliver packet back into the IP processing machinery.
- *
- * If no address specified, or address is 0.0.0.0, send to ip_output();
- * otherwise, send to ip_input() and mark as having been received on
- * the interface with that address.
- *
- * If no address specified, or dest port is 0, allow packet to divert
- * back to this socket; otherwise, don't.
- */
-static int
-div_output(so, m, addr, control)
-	struct socket *so;
-	register struct mbuf *m;
-	struct mbuf *addr, *control;
-{
-	register struct inpcb *const inp = sotoinpcb(so);
-	register struct ip *const ip = mtod(m, struct ip *);
-	struct sockaddr_in *sin = NULL;
-	int error = 0;
-
-	if (control)
-		m_freem(control);		/* XXX */
-	if (addr)
-		sin = mtod(addr, struct sockaddr_in *);
-
-	/* Loopback avoidance option */
-	ip_divert_ignore = ntohs(inp->inp_lport);
-
-	/* Reinject packet into the system as incoming or outgoing */
-	if (!sin || sin->sin_addr.s_addr == 0) {
-		/* Don't allow both user specified and setsockopt options,
-		   and don't allow packet length sizes that will crash */
-		if (((ip->ip_hl != (sizeof (*ip) >> 2)) && inp->inp_options) ||
-		     ((u_short)ntohs(ip->ip_len) > m->m_pkthdr.len)) {
-			error = EINVAL;
-			goto cantsend;
-		}
-
-		/* Convert fields to host order for ip_output() */
-		NTOHS(ip->ip_len);
-		NTOHS(ip->ip_off);
-
-		/* Send packet to output processing */
-		ipstat.ips_rawout++;			/* XXX */
-		error = ip_output(m, inp->inp_options, &inp->inp_route,
-			(so->so_options & SO_DONTROUTE) |
-			IP_ALLOWBROADCAST | IP_RAWOUTPUT, inp->inp_moptions);
-	} else {
-		struct ifaddr *ifa;
-
-		/* Find receive interface with the given IP address */
-		sin->sin_port = 0;
-		if ((ifa = ifa_ifwithaddr((struct sockaddr *) sin)) == 0) {
-			error = EADDRNOTAVAIL;
-			goto cantsend;
-		}
-		m->m_pkthdr.rcvif = ifa->ifa_ifp;
-
-		/* Send packet to input processing */
-		ip_input(m);
-	}
-
-	/* Reset for next time (and other packets) */
-	ip_divert_ignore = 0;
-	return error;
-
-cantsend:
-	ip_divert_ignore = 0;
-	m_freem(m);
-	return error;
-}
-
-/*ARGSUSED*/
-int
-div_usrreq(so, req, m, nam, control)
-	register struct socket *so;
-	int req;
-	struct mbuf *m, *nam, *control;
-{
-	register int error = 0;
-	register struct inpcb *inp = sotoinpcb(so);
-	int s;
-
-	if (inp == NULL && req != PRU_ATTACH) {
-		error = EINVAL;
-		goto release;
-	}
-	switch (req) {
-
-	case PRU_ATTACH:
-		if (inp)
-			panic("div_attach");
-		if ((so->so_state & SS_PRIV) == 0) {
-			error = EACCES;
-			break;
-		}
-		s = splnet();
-		error = in_pcballoc(so, &divcbinfo);
-		splx(s);
-		if (error)
-			break;
-		error = soreserve(so, div_sendspace, div_recvspace);
-		if (error)
-			break;
-		inp = (struct inpcb *)so->so_pcb;
-		inp->inp_ip_p = (int)nam;	/* XXX */
-		inp->inp_flags |= INP_HDRINCL;
-		/* The socket is always "connected" because
-		   we always know "where" to send the packet */
-		so->so_state |= SS_ISCONNECTED;
-		break;
-
-	case PRU_DISCONNECT:
-		if ((so->so_state & SS_ISCONNECTED) == 0) {
-			error = ENOTCONN;
-			break;
-		}
-		/* FALLTHROUGH */
-	case PRU_ABORT:
-		soisdisconnected(so);
-		/* FALLTHROUGH */
-	case PRU_DETACH:
-		if (inp == 0)
-			panic("div_detach");
-		in_pcbdetach(inp);
-		break;
-
-	case PRU_BIND:
-		s = splnet();
-		error = in_pcbbind(inp, nam);
-		splx(s);
-		break;
-
-	/*
-	 * Mark the connection as being incapable of further input.
-	 */
-	case PRU_SHUTDOWN:
-		socantsendmore(so);
-		break;
-
-	case PRU_SEND:
-		/* Packet must have a header (but that's about it) */
-		if (m->m_len < sizeof (struct ip) ||
-		    (m = m_pullup(m, sizeof (struct ip))) == 0) {
-			ipstat.ips_toosmall++;
-			error = EINVAL;
-			break;
-		}
-
-		/* Send packet */
-		error = div_output(so, m, nam, control); 
-		m = NULL;
-		break;
-
-	case PRU_SOCKADDR:
-		in_setsockaddr(inp, nam);
-		break;
-
-	case PRU_SENSE:
-		/*
-		 * stat: don't bother with a blocksize.
-		 */
-		return (0);
-
-	/*
-	 * Not supported.
-	 */
-	case PRU_CONNECT:
-	case PRU_CONNECT2:
-	case PRU_CONTROL:
-	case PRU_RCVOOB:
-	case PRU_RCVD:
-	case PRU_LISTEN:
-	case PRU_ACCEPT:
-	case PRU_SENDOOB:
-	case PRU_PEERADDR:
-		error = EOPNOTSUPP;
-		break;
-
-	default:
-		panic("div_usrreq");
-	}
-release:
-	if (m)
-		m_freem(m);
-	return (error);
-}
diff --git a/cpukit/libnetworking/netinet/ip_fw.c b/cpukit/libnetworking/netinet/ip_fw.c
deleted file mode 100644
index aeb09b0bbe..0000000000
--- a/cpukit/libnetworking/netinet/ip_fw.c
+++ /dev/null
@@ -1,1069 +0,0 @@
-/*
- * Copyright (c) 1996 Alex Nash
- * Copyright (c) 1993 Daniel Boulet
- * Copyright (c) 1994 Ugen J.S.Antsilevich
- *
- * Redistribution and use in source forms, with and without modification,
- * are permitted provided that this entire comment appears intact.
- *
- * Redistribution in binary form may occur without any restrictions.
- * Obviously, it would be nice if you gave credit where credit is due
- * but requiring it would be too onerous.
- *
- * This software is provided ``AS IS'' without any warranties of any kind.
- *
- *	$Id$
- */
-
-/*
- * Implement IP packet firewall
- */
-
-#ifndef IPFIREWALL_MODULE
-#include "opt_ipfw.h"
-#endif
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/malloc.h>
-#include <sys/mbuf.h>
-#include <sys/queue.h>
-#include <sys/kernel.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <sys/sysctl.h>
-#include <net/if.h>
-#include <net/route.h>
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/ip_var.h>
-#include <netinet/ip_icmp.h>
-#include <netinet/ip_fw.h>
-#include <netinet/tcp.h>
-#include <netinet/tcp_timer.h>
-#include <netinet/tcp_var.h>
-#include <netinet/tcpip.h>
-#include <netinet/udp.h>
-
-static int fw_debug = 1;
-#ifdef IPFIREWALL_VERBOSE
-static int fw_verbose = 1;
-#else
-static int fw_verbose = 0;
-#endif
-#ifdef IPFIREWALL_VERBOSE_LIMIT
-static int fw_verbose_limit = IPFIREWALL_VERBOSE_LIMIT;
-#else
-static int fw_verbose_limit = 0;
-#endif
-
-LIST_HEAD (ip_fw_head, ip_fw_chain) ip_fw_chain;
-
-#ifdef SYSCTL_NODE
-SYSCTL_NODE(_net_inet_ip, OID_AUTO, fw, CTLFLAG_RW, 0, "Firewall");
-SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, debug, CTLFLAG_RW, &fw_debug, 0, "");
-SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, verbose, CTLFLAG_RW, &fw_verbose, 0, "");
-SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, verbose_limit, CTLFLAG_RW, &fw_verbose_limit, 0, "");
-#endif
-
-#define dprintf(a)	if (!fw_debug); else printf a
-
-#define print_ip(a)	 printf("%ld.%ld.%ld.%ld",(ntohl(a.s_addr)>>24)&0xFF,\
-				 		  (ntohl(a.s_addr)>>16)&0xFF,\
-						  (ntohl(a.s_addr)>>8)&0xFF,\
-						  (ntohl(a.s_addr))&0xFF);
-
-#define dprint_ip(a)	if (!fw_debug); else print_ip(a)
-
-static int	add_entry __P((struct ip_fw_head *chainptr, struct ip_fw *frwl));
-static int	del_entry __P((struct ip_fw_head *chainptr, u_short number));
-static int	zero_entry __P((struct mbuf *m));
-static struct ip_fw *check_ipfw_struct __P((struct ip_fw *m));
-static struct ip_fw *check_ipfw_mbuf __P((struct mbuf *fw));
-static int	ipopts_match __P((struct ip *ip, struct ip_fw *f));
-static int	port_match __P((u_short *portptr, int nports, u_short port,
-				int range_flag));
-static int	tcpflg_match __P((struct tcphdr *tcp, struct ip_fw *f));
-static int	icmptype_match __P((struct icmp *  icmp, struct ip_fw * f));
-static void	ipfw_report __P((struct ip_fw *f, struct ip *ip,
-				struct ifnet *rif, struct ifnet *oif));
-
-#ifdef IPFIREWALL_MODULE
-static ip_fw_chk_t *old_chk_ptr;
-static ip_fw_ctl_t *old_ctl_ptr;
-#endif
-
-static int	ip_fw_chk __P((struct ip **pip, int hlen,
-			struct ifnet *oif, int ignport, struct mbuf **m));
-static int	ip_fw_ctl __P((int stage, struct mbuf **mm));
-
-static char err_prefix[] = "ip_fw_ctl:";
-
-/*
- * Returns 1 if the port is matched by the vector, 0 otherwise
- */
-static inline int 
-port_match(u_short *portptr, int nports, u_short port, int range_flag)
-{
-	if (!nports)
-		return 1;
-	if (range_flag) {
-		if (portptr[0] <= port && port <= portptr[1]) {
-			return 1;
-		}
-		nports -= 2;
-		portptr += 2;
-	}
-	while (nports-- > 0) {
-		if (*portptr++ == port) {
-			return 1;
-		}
-	}
-	return 0;
-}
-
-static int
-tcpflg_match(struct tcphdr *tcp, struct ip_fw *f)
-{
-	u_char		flg_set, flg_clr;
-	
-	if ((f->fw_tcpf & IP_FW_TCPF_ESTAB) &&
-	    (tcp->th_flags & (IP_FW_TCPF_RST | IP_FW_TCPF_ACK)))
-		return 1;
-
-	flg_set = tcp->th_flags & f->fw_tcpf;
-	flg_clr = tcp->th_flags & f->fw_tcpnf;
-
-	if (flg_set != f->fw_tcpf)
-		return 0;
-	if (flg_clr)
-		return 0;
-
-	return 1;
-}
-
-static int
-icmptype_match(struct icmp *icmp, struct ip_fw *f)
-{
-	int type;
-
-	if (!(f->fw_flg & IP_FW_F_ICMPBIT))
-		return(1);
-
-	type = icmp->icmp_type;
-
-	/* check for matching type in the bitmap */
-	if (type < IP_FW_ICMPTYPES_DIM * sizeof(unsigned) * 8 &&
-		(f->fw_icmptypes[type / (sizeof(unsigned) * 8)] & 
-		(1U << (type % (8 * sizeof(unsigned))))))
-		return(1);
-
-	return(0); /* no match */
-}
-
-static int
-ipopts_match(struct ip *ip, struct ip_fw *f)
-{
-	register u_char *cp;
-	int opt, optlen, cnt;
-	u_char	opts, nopts, nopts_sve;
-
-	cp = (u_char *)(ip + 1);
-	cnt = (ip->ip_hl << 2) - sizeof (struct ip);
-	opts = f->fw_ipopt;
-	nopts = nopts_sve = f->fw_ipnopt;
-
-	for (; cnt > 0; cnt -= optlen, cp += optlen) {
-		opt = cp[IPOPT_OPTVAL];
-		if (opt == IPOPT_EOL)
-			break;
-		if (opt == IPOPT_NOP)
-			optlen = 1;
-		else {
-			optlen = cp[IPOPT_OLEN];
-			if (optlen <= 0 || optlen > cnt) {
-				return 0; /*XXX*/
-			}
-		}
-		switch (opt) {
-
-		default:
-			break;
-
-		case IPOPT_LSRR:
-			opts &= ~IP_FW_IPOPT_LSRR;
-			nopts &= ~IP_FW_IPOPT_LSRR;
-			break;
-
-		case IPOPT_SSRR:
-			opts &= ~IP_FW_IPOPT_SSRR;
-			nopts &= ~IP_FW_IPOPT_SSRR;
-			break;
-
-		case IPOPT_RR:
-			opts &= ~IP_FW_IPOPT_RR;
-			nopts &= ~IP_FW_IPOPT_RR;
-			break;
-		case IPOPT_TS:
-			opts &= ~IP_FW_IPOPT_TS;
-			nopts &= ~IP_FW_IPOPT_TS;
-			break;
-		}
-		if (opts == nopts)
-			break;
-	}
-	if (opts == 0 && nopts == nopts_sve)
-		return 1;
-	else
-		return 0;
-}
-
-static inline int
-iface_match(struct ifnet *ifp, union ip_fw_if *ifu, int byname)
-{
-	/* Check by name or by IP address */
-	if (byname) {
-		/* Check unit number (-1 is wildcard) */
-		if (ifu->fu_via_if.unit != -1
-		    && ifp->if_unit != ifu->fu_via_if.unit)
-			return(0);
-		/* Check name */
-		if (strncmp(ifp->if_name, ifu->fu_via_if.name, FW_IFNLEN))
-			return(0);
-		return(1);
-	} else if (ifu->fu_via_ip.s_addr != 0) {	/* Zero == wildcard */
-		struct ifaddr *ia;
-
-		for (ia = ifp->if_addrlist; ia; ia = ia->ifa_next) {
-			if (ia->ifa_addr == NULL)
-				continue;
-			if (ia->ifa_addr->sa_family != AF_INET)
-				continue;
-			if (ifu->fu_via_ip.s_addr != ((struct sockaddr_in *)
-			    (ia->ifa_addr))->sin_addr.s_addr)
-				continue;
-			return(1);
-		}
-		return(0);
-	}
-	return(1);
-}
-
-static void
-ipfw_report(struct ip_fw *f, struct ip *ip,
-	struct ifnet *rif, struct ifnet *oif)
-{
-	static int counter;
-	struct tcphdr *const tcp = (struct tcphdr *) ((u_long *) ip+ ip->ip_hl);
-	struct udphdr *const udp = (struct udphdr *) ((u_long *) ip+ ip->ip_hl);
-	struct icmp *const icmp = (struct icmp *) ((u_long *) ip + ip->ip_hl);
-	int count;
-
-	count = f ? f->fw_pcnt : ++counter;
-	if (fw_verbose_limit != 0 && count > fw_verbose_limit)
-		return;
-
-	/* Print command name */
-	printf("ipfw: %d ", f ? f->fw_number : -1);
-	if (!f)
-		printf("Refuse");
-	else
-		switch (f->fw_flg & IP_FW_F_COMMAND) {
-		case IP_FW_F_DENY:
-			printf("Deny");
-			break;
-		case IP_FW_F_REJECT:
-			if (f->fw_reject_code == IP_FW_REJECT_RST)
-				printf("Reset");
-			else
-				printf("Unreach");
-			break;
-		case IP_FW_F_ACCEPT:
-			printf("Accept");
-			break;
-		case IP_FW_F_COUNT:
-			printf("Count");
-			break;
-		case IP_FW_F_DIVERT:
-			printf("Divert %d", f->fw_divert_port);
-			break;
-		case IP_FW_F_TEE:
-			printf("Tee %d", f->fw_divert_port);
-			break;
-		case IP_FW_F_SKIPTO:
-			printf("SkipTo %d", f->fw_skipto_rule);
-			break;
-		default:	
-			printf("UNKNOWN");
-			break;
-		}
-	printf(" ");
-
-	switch (ip->ip_p) {
-	case IPPROTO_TCP:
-		printf("TCP ");
-		print_ip(ip->ip_src);
-		if ((ip->ip_off & IP_OFFMASK) == 0)
-			printf(":%d ", ntohs(tcp->th_sport));
-		else
-			printf(" ");
-		print_ip(ip->ip_dst);
-		if ((ip->ip_off & IP_OFFMASK) == 0)
-			printf(":%d", ntohs(tcp->th_dport));
-		break;
-	case IPPROTO_UDP:
-		printf("UDP ");
-		print_ip(ip->ip_src);
-		if ((ip->ip_off & IP_OFFMASK) == 0)
-			printf(":%d ", ntohs(udp->uh_sport));
-		else
-			printf(" ");
-		print_ip(ip->ip_dst);
-		if ((ip->ip_off & IP_OFFMASK) == 0)
-			printf(":%d", ntohs(udp->uh_dport));
-		break;
-	case IPPROTO_ICMP:
-		printf("ICMP:%u.%u ", icmp->icmp_type, icmp->icmp_code);
-		print_ip(ip->ip_src);
-		printf(" ");
-		print_ip(ip->ip_dst);
-		break;
-	default:
-		printf("P:%d ", ip->ip_p);
-		print_ip(ip->ip_src);
-		printf(" ");
-		print_ip(ip->ip_dst);
-		break;
-	}
-	if (oif)
-		printf(" out via %s%d", oif->if_name, oif->if_unit);
-	else if (rif)
-		printf(" in via %s%d", rif->if_name, rif->if_unit);
-	if ((ip->ip_off & IP_OFFMASK)) 
-		printf(" Fragment = %d",ip->ip_off & IP_OFFMASK);
-	printf("\n");
-	if (fw_verbose_limit != 0 && count == fw_verbose_limit)
-		printf("ipfw: limit reached on rule #%d\n",
-		f ? f->fw_number : -1);
-}
-
-/*
- * Parameters:
- *
- *	ip	Pointer to packet header (struct ip *)
- *	hlen	Packet header length
- *	oif	Outgoing interface, or NULL if packet is incoming
- *	ignport	Ignore all divert/tee rules to this port (if non-zero)
- *	*m	The packet; we set to NULL when/if we nuke it.
- *
- * Return value:
- *
- *	0	The packet is to be accepted and routed normally OR
- *      	the packet was denied/rejected and has been dropped;
- *		in the latter case, *m is equal to NULL upon return.
- *	port	Divert the packet to port.
- */
-
-static int 
-ip_fw_chk(struct ip **pip, int hlen,
-	struct ifnet *oif, int ignport, struct mbuf **m)
-{
-	struct ip_fw_chain *chain;
-	struct ip_fw *rule = NULL;
-	struct ip *ip = *pip;
-	struct ifnet *const rif = (*m)->m_pkthdr.rcvif;
-	u_short offset = (ip->ip_off & IP_OFFMASK);
-	u_short src_port, dst_port;
-
-	/*
-	 * Go down the chain, looking for enlightment
-	 */
-	for (chain=ip_fw_chain.lh_first; chain; chain = chain->chain.le_next) {
-		register struct ip_fw *const f = chain->rule;
-
-		/* Check direction inbound */
-		if (!oif && !(f->fw_flg & IP_FW_F_IN))
-			continue;
-
-		/* Check direction outbound */
-		if (oif && !(f->fw_flg & IP_FW_F_OUT))
-			continue;
-
-		/* Fragments */
-		if ((f->fw_flg & IP_FW_F_FRAG) && !(ip->ip_off & IP_OFFMASK))
-			continue;
-
-		/* If src-addr doesn't match, not this rule. */
-		if (((f->fw_flg & IP_FW_F_INVSRC) != 0) ^ ((ip->ip_src.s_addr
-		    & f->fw_smsk.s_addr) != f->fw_src.s_addr))
-			continue;
-
-		/* If dest-addr doesn't match, not this rule. */
-		if (((f->fw_flg & IP_FW_F_INVDST) != 0) ^ ((ip->ip_dst.s_addr
-		    & f->fw_dmsk.s_addr) != f->fw_dst.s_addr))
-			continue;
-
-		/* Interface check */
-		if ((f->fw_flg & IF_FW_F_VIAHACK) == IF_FW_F_VIAHACK) {
-			struct ifnet *const iface = oif ? oif : rif;
-
-			/* Backwards compatibility hack for "via" */
-			if (!iface || !iface_match(iface,
-			    &f->fw_in_if, f->fw_flg & IP_FW_F_OIFNAME))
-				continue;
-		} else {
-			/* Check receive interface */
-			if ((f->fw_flg & IP_FW_F_IIFACE)
-			    && (!rif || !iface_match(rif,
-			      &f->fw_in_if, f->fw_flg & IP_FW_F_IIFNAME)))
-				continue;
-			/* Check outgoing interface */
-			if ((f->fw_flg & IP_FW_F_OIFACE)
-			    && (!oif || !iface_match(oif,
-			      &f->fw_out_if, f->fw_flg & IP_FW_F_OIFNAME)))
-				continue;
-		}
-
-		/* Check IP options */
-		if (f->fw_ipopt != f->fw_ipnopt && !ipopts_match(ip, f))
-			continue;
-
-		/* Check protocol; if wildcard, match */
-		if (f->fw_prot == IPPROTO_IP)
-			goto got_match;
-
-		/* If different, don't match */
-		if (ip->ip_p != f->fw_prot) 
-			continue;
-
-#define PULLUP_TO(len)	do {						\
-			    if ((*m)->m_len < (len)			\
-				&& (*m = m_pullup(*m, (len))) == 0) {	\
-				    goto bogusfrag;			\
-			    }						\
-			    *pip = ip = mtod(*m, struct ip *);		\
-			    offset = (ip->ip_off & IP_OFFMASK);		\
-			} while (0)
-
-		/* Protocol specific checks */
-		switch (ip->ip_p) {
-		case IPPROTO_TCP:
-		    {
-			struct tcphdr *tcp;
-
-			if (offset == 1)	/* cf. RFC 1858 */
-				goto bogusfrag;
-			if (offset != 0) {
-				/*
-				 * TCP flags and ports aren't available in this
-				 * packet -- if this rule specified either one,
-				 * we consider the rule a non-match.
-				 */
-				if (f->fw_nports != 0 ||
-				    f->fw_tcpf != f->fw_tcpnf)
-					continue;
-
-				break;
-			}
-			PULLUP_TO(hlen + 14);
-			tcp = (struct tcphdr *) ((u_long *)ip + ip->ip_hl);
-			if (f->fw_tcpf != f->fw_tcpnf && !tcpflg_match(tcp, f))
-				continue;
-			src_port = ntohs(tcp->th_sport);
-			dst_port = ntohs(tcp->th_dport);
-			goto check_ports;
-		    }
-
-		case IPPROTO_UDP:
-		    {
-			struct udphdr *udp;
-
-			if (offset != 0) {
-				/*
-				 * Port specification is unavailable -- if this
-				 * rule specifies a port, we consider the rule
-				 * a non-match.
-				 */
-				if (f->fw_nports != 0)
-					continue;
-
-				break;
-			}
-			PULLUP_TO(hlen + 4);
-			udp = (struct udphdr *) ((u_long *)ip + ip->ip_hl);
-			src_port = ntohs(udp->uh_sport);
-			dst_port = ntohs(udp->uh_dport);
-check_ports:
-			if (!port_match(&f->fw_pts[0],
-			    IP_FW_GETNSRCP(f), src_port,
-			    f->fw_flg & IP_FW_F_SRNG))
-				continue;
-			if (!port_match(&f->fw_pts[IP_FW_GETNSRCP(f)],
-			    IP_FW_GETNDSTP(f), dst_port,
-			    f->fw_flg & IP_FW_F_DRNG)) 
-				continue;
-			break;
-		    }
-
-		case IPPROTO_ICMP:
-		    {
-			struct icmp *icmp;
-
-			if (offset != 0)	/* Type isn't valid */
-				break;
-			PULLUP_TO(hlen + 2);
-			icmp = (struct icmp *) ((u_long *)ip + ip->ip_hl);
-			if (!icmptype_match(icmp, f))
-				continue;
-			break;
-		    }
-#undef PULLUP_TO
-
-bogusfrag:
-			if (fw_verbose)
-				ipfw_report(NULL, ip, rif, oif);
-			goto dropit;
-		}
-
-got_match:
-		/* Ignore divert/tee rule if socket port is "ignport" */
-		switch (f->fw_flg & IP_FW_F_COMMAND) {
-		case IP_FW_F_DIVERT:
-		case IP_FW_F_TEE:
-			if (f->fw_divert_port == ignport)
-				continue;       /* ignore this rule */
-			break;
-		}
-
-		/* Update statistics */
-		f->fw_pcnt += 1;
-		f->fw_bcnt += ip->ip_len;
-		f->timestamp = rtems_bsdnet_seconds_since_boot();
-
-		/* Log to console if desired */
-		if ((f->fw_flg & IP_FW_F_PRN) && fw_verbose)
-			ipfw_report(f, ip, rif, oif);
-
-		/* Take appropriate action */
-		switch (f->fw_flg & IP_FW_F_COMMAND) {
-		case IP_FW_F_ACCEPT:
-			return(0);
-		case IP_FW_F_COUNT:
-			continue;
-		case IP_FW_F_DIVERT:
-			return(f->fw_divert_port);
-		case IP_FW_F_TEE:
-			/*
-			 * XXX someday tee packet here, but beware that you
-			 * can't use m_copym() or m_copypacket() because
-			 * the divert input routine modifies the mbuf
-			 * (and these routines only increment reference
-			 * counts in the case of mbuf clusters), so need
-			 * to write custom routine.
-			 */
-			continue;
-		case IP_FW_F_SKIPTO:
-#ifdef DIAGNOSTIC
-			while (chain->chain.le_next
-			    && chain->chain.le_next->rule->fw_number
-				< f->fw_skipto_rule)
-#else
-			while (chain->chain.le_next->rule->fw_number
-			    < f->fw_skipto_rule)
-#endif
-				chain = chain->chain.le_next;
-			continue;
-		}
-
-		/* Deny/reject this packet using this rule */
-		rule = f;
-		break;
-	}
-
-#ifdef DIAGNOSTIC
-	/* Rule 65535 should always be there and should always match */
-	if (!chain)
-		panic("ip_fw: chain");
-#endif
-
-	/*
-	 * At this point, we're going to drop the packet.
-	 * Send a reject notice if all of the following are true:
-	 *
-	 * - The packet matched a reject rule
-	 * - The packet is not an ICMP packet
-	 * - The packet is not a multicast or broadcast packet
-	 */
-	if ((rule->fw_flg & IP_FW_F_COMMAND) == IP_FW_F_REJECT
-	    && ip->ip_p != IPPROTO_ICMP
-	    && !((*m)->m_flags & (M_BCAST|M_MCAST))
-	    && !IN_MULTICAST(ntohl(ip->ip_dst.s_addr))) {
-		switch (rule->fw_reject_code) {
-		case IP_FW_REJECT_RST:
-		  {
-			struct tcphdr *const tcp =
-				(struct tcphdr *) ((u_long *)ip + ip->ip_hl);
-			struct tcpiphdr ti, *const tip = (struct tcpiphdr *) ip;
-
-			if (offset != 0 || (tcp->th_flags & TH_RST))
-				break;
-			ti.ti_i = *((struct ipovly *) ip);
-			ti.ti_t = *tcp;
-			bcopy(&ti, ip, sizeof(ti));
-			NTOHL(tip->ti_seq);
-			NTOHL(tip->ti_ack);
-			tip->ti_len = ip->ip_len - hlen - (tip->ti_off << 2);
-			if (tcp->th_flags & TH_ACK) {
-				tcp_respond(NULL, tip, *m,
-				    (tcp_seq)0, ntohl(tcp->th_ack), TH_RST);
-			} else {
-				if (tcp->th_flags & TH_SYN)
-					tip->ti_len++;
-				tcp_respond(NULL, tip, *m, tip->ti_seq
-				    + tip->ti_len, (tcp_seq)0, TH_RST|TH_ACK);
-			}
-			*m = NULL;
-			break;
-		  }
-		default:	/* Send an ICMP unreachable using code */
-			icmp_error(*m, ICMP_UNREACH,
-			    rule->fw_reject_code, 0L, 0);
-			*m = NULL;
-			break;
-		}
-	}
-
-dropit:
-	/*
-	 * Finally, drop the packet.
-	 */
-	if (*m) {
-		m_freem(*m);
-		*m = NULL;
-	}
-	return(0);
-}
-
-static int
-add_entry(struct ip_fw_head *chainptr, struct ip_fw *frwl)
-{
-	struct ip_fw *ftmp = 0;
-	struct ip_fw_chain *fwc = 0, *fcp, *fcpl = 0;
-	u_short nbr = 0;
-	int s;
-
-	fwc = malloc(sizeof *fwc, M_IPFW, M_DONTWAIT);
-	ftmp = malloc(sizeof *ftmp, M_IPFW, M_DONTWAIT);
-	if (!fwc || !ftmp) {
-		dprintf(("%s malloc said no\n", err_prefix));
-		if (fwc)  free(fwc, M_IPFW);
-		if (ftmp) free(ftmp, M_IPFW);
-		return (ENOSPC);
-	}
-
-	bcopy(frwl, ftmp, sizeof(struct ip_fw));
-	ftmp->fw_in_if.fu_via_if.name[FW_IFNLEN - 1] = '\0';
-	ftmp->fw_pcnt = 0L;
-	ftmp->fw_bcnt = 0L;
-	fwc->rule = ftmp;
-	
-	s = splnet();
-
-	if (!chainptr->lh_first) {
-		LIST_INSERT_HEAD(chainptr, fwc, chain);
-		splx(s);
-		return(0);
-        } else if (ftmp->fw_number == (u_short)-1) {
-		if (fwc)  free(fwc, M_IPFW);
-		if (ftmp) free(ftmp, M_IPFW);
-		splx(s);
-		dprintf(("%s bad rule number\n", err_prefix));
-		return (EINVAL);
-        }
-
-	/* If entry number is 0, find highest numbered rule and add 100 */
-	if (ftmp->fw_number == 0) {
-		for (fcp = chainptr->lh_first; fcp; fcp = fcp->chain.le_next) {
-			if (fcp->rule->fw_number != (u_short)-1)
-				nbr = fcp->rule->fw_number;
-			else
-				break;
-		}
-		if (nbr < (u_short)-1 - 100)
-			nbr += 100;
-		ftmp->fw_number = nbr;
-	}
-
-	/* Got a valid number; now insert it, keeping the list ordered */
-	for (fcp = chainptr->lh_first; fcp; fcp = fcp->chain.le_next) {
-		if (fcp->rule->fw_number > ftmp->fw_number) {
-			if (fcpl) {
-				LIST_INSERT_AFTER(fcpl, fwc, chain);
-			} else {
-				LIST_INSERT_HEAD(chainptr, fwc, chain);
-			}
-			break;
-		} else {
-			fcpl = fcp;
-		}
-	}
-
-	splx(s);
-	return (0);
-}
-
-static int
-del_entry(struct ip_fw_head *chainptr, u_short number)
-{
-	struct ip_fw_chain *fcp;
-	int s;
-
-	s = splnet();
-
-	fcp = chainptr->lh_first; 
-	if (number != (u_short)-1) {
-		for (; fcp; fcp = fcp->chain.le_next) {
-			if (fcp->rule->fw_number == number) {
-				LIST_REMOVE(fcp, chain);
-				splx(s);
-				free(fcp->rule, M_IPFW);
-				free(fcp, M_IPFW);
-				return 0;
-			}
-		}
-	}
-
-	splx(s);
-	return (EINVAL);
-}
-
-static int
-zero_entry(struct mbuf *m)
-{
-	struct ip_fw *frwl;
-	struct ip_fw_chain *fcp;
-	int s;
-
-	if (m) {
-		if (m->m_len != sizeof(struct ip_fw))
-			return(EINVAL);
-		frwl = mtod(m, struct ip_fw *);
-	}
-	else
-		frwl = NULL;
-
-	/*
-	 *	It's possible to insert multiple chain entries with the
-	 *	same number, so we don't stop after finding the first
-	 *	match if zeroing a specific entry.
-	 */
-	s = splnet();
-	for (fcp = ip_fw_chain.lh_first; fcp; fcp = fcp->chain.le_next)
-		if (!frwl || frwl->fw_number == fcp->rule->fw_number) {
-			fcp->rule->fw_bcnt = fcp->rule->fw_pcnt = 0;
-			fcp->rule->timestamp = 0;
-		}
-	splx(s);
-
-	if (fw_verbose) {
-		if (frwl)
-			printf("ipfw: Entry %d cleared.\n", frwl->fw_number);
-		else
-			printf("ipfw: Accounting cleared.\n");
-	}
-
-	return(0);
-}
-
-static struct ip_fw *
-check_ipfw_mbuf(struct mbuf *m)
-{
-	/* Check length */
-	if (m->m_len != sizeof(struct ip_fw)) {
-		dprintf(("%s len=%d, want %d\n", err_prefix, m->m_len,
-		    (int)sizeof(struct ip_fw)));
-		return (NULL);
-	}
-	return(check_ipfw_struct(mtod(m, struct ip_fw *)));
-}
-
-static struct ip_fw *
-check_ipfw_struct(struct ip_fw *frwl)
-{
-	/* Check for invalid flag bits */
-	if ((frwl->fw_flg & ~IP_FW_F_MASK) != 0) {
-		dprintf(("%s undefined flag bits set (flags=%x)\n",
-		    err_prefix, frwl->fw_flg));
-		return (NULL);
-	}
-	/* Must apply to incoming or outgoing (or both) */
-	if (!(frwl->fw_flg & (IP_FW_F_IN | IP_FW_F_OUT))) {
-		dprintf(("%s neither in nor out\n", err_prefix));
-		return (NULL);
-	}
-	/* Empty interface name is no good */
-	if (((frwl->fw_flg & IP_FW_F_IIFNAME)
-	      && !*frwl->fw_in_if.fu_via_if.name)
-	    || ((frwl->fw_flg & IP_FW_F_OIFNAME)
-	      && !*frwl->fw_out_if.fu_via_if.name)) {
-		dprintf(("%s empty interface name\n", err_prefix));
-		return (NULL);
-	}
-	/* Sanity check interface matching */
-	if ((frwl->fw_flg & IF_FW_F_VIAHACK) == IF_FW_F_VIAHACK) {
-		;		/* allow "via" backwards compatibility */
-	} else if ((frwl->fw_flg & IP_FW_F_IN)
-	    && (frwl->fw_flg & IP_FW_F_OIFACE)) {
-		dprintf(("%s outgoing interface check on incoming\n",
-		    err_prefix));
-		return (NULL);
-	}
-	/* Sanity check port ranges */
-	if ((frwl->fw_flg & IP_FW_F_SRNG) && IP_FW_GETNSRCP(frwl) < 2) {
-		dprintf(("%s src range set but n_src_p=%d\n",
-		    err_prefix, IP_FW_GETNSRCP(frwl)));
-		return (NULL);
-	}
-	if ((frwl->fw_flg & IP_FW_F_DRNG) && IP_FW_GETNDSTP(frwl) < 2) {
-		dprintf(("%s dst range set but n_dst_p=%d\n",
-		    err_prefix, IP_FW_GETNDSTP(frwl)));
-		return (NULL);
-	}
-	if (IP_FW_GETNSRCP(frwl) + IP_FW_GETNDSTP(frwl) > IP_FW_MAX_PORTS) {
-		dprintf(("%s too many ports (%d+%d)\n",
-		    err_prefix, IP_FW_GETNSRCP(frwl), IP_FW_GETNDSTP(frwl)));
-		return (NULL);
-	}
-	/*
-	 *	Protocols other than TCP/UDP don't use port range
-	 */
-	if ((frwl->fw_prot != IPPROTO_TCP) &&
-	    (frwl->fw_prot != IPPROTO_UDP) &&
-	    (IP_FW_GETNSRCP(frwl) || IP_FW_GETNDSTP(frwl))) {
-		dprintf(("%s port(s) specified for non TCP/UDP rule\n",
-		    err_prefix));
-		return(NULL);
-	}
-
-	/*
-	 *	Rather than modify the entry to make such entries work, 
-	 *	we reject this rule and require user level utilities
-	 *	to enforce whatever policy they deem appropriate.
-	 */
-	if ((frwl->fw_src.s_addr & (~frwl->fw_smsk.s_addr)) || 
-		(frwl->fw_dst.s_addr & (~frwl->fw_dmsk.s_addr))) {
-		dprintf(("%s rule never matches\n", err_prefix));
-		return(NULL);
-	}
-
-	if ((frwl->fw_flg & IP_FW_F_FRAG) &&
-		(frwl->fw_prot == IPPROTO_UDP || frwl->fw_prot == IPPROTO_TCP)) {
-		if (frwl->fw_nports) {
-			dprintf(("%s cannot mix 'frag' and ports\n", err_prefix));
-			return(NULL);
-		}
-		if (frwl->fw_prot == IPPROTO_TCP &&
-			frwl->fw_tcpf != frwl->fw_tcpnf) {
-			dprintf(("%s cannot mix 'frag' with TCP flags\n", err_prefix));
-			return(NULL);
-		}
-	}
-
-	/* Check command specific stuff */
-	switch (frwl->fw_flg & IP_FW_F_COMMAND)
-	{
-	case IP_FW_F_REJECT:
-		if (frwl->fw_reject_code >= 0x100
-		    && !(frwl->fw_prot == IPPROTO_TCP
-		      && frwl->fw_reject_code == IP_FW_REJECT_RST)) {
-			dprintf(("%s unknown reject code\n", err_prefix));
-			return(NULL);
-		}
-		break;
-	case IP_FW_F_DIVERT:		/* Diverting to port zero is invalid */
-	case IP_FW_F_TEE:
-		if (frwl->fw_divert_port == 0) {
-			dprintf(("%s can't divert to port 0\n", err_prefix));
-			return (NULL);
-		}
-		break;
-	case IP_FW_F_DENY:
-	case IP_FW_F_ACCEPT:
-	case IP_FW_F_COUNT:
-	case IP_FW_F_SKIPTO:
-		break;
-	default:
-		dprintf(("%s invalid command\n", err_prefix));
-		return(NULL);
-	}
-
-	return frwl;
-}
-
-static int
-ip_fw_ctl(int stage, struct mbuf **mm)
-{
-	int error;
-	struct mbuf *m;
-
-	if (stage == IP_FW_GET) {
-		struct ip_fw_chain *fcp = ip_fw_chain.lh_first;
-		*mm = m = m_get(M_WAIT, MT_SOOPTS);
-		for (; fcp; fcp = fcp->chain.le_next) {
-			memcpy(m->m_data, fcp->rule, sizeof *(fcp->rule));
-			m->m_len = sizeof *(fcp->rule);
-			m->m_next = m_get(M_WAIT, MT_SOOPTS);
-			m = m->m_next;
-			m->m_len = 0;
-		}
-		return (0);
-	}
-	m = *mm;
-	/* only allow get calls if secure mode > 2 */
-	if (securelevel > 2) {
-		if (m) (void)m_free(m);
-		return(EPERM);
-	}
-	if (stage == IP_FW_FLUSH) {
-		while (ip_fw_chain.lh_first != NULL && 
-		    ip_fw_chain.lh_first->rule->fw_number != (u_short)-1) {
-			struct ip_fw_chain *fcp = ip_fw_chain.lh_first;
-			int s = splnet();
-			LIST_REMOVE(ip_fw_chain.lh_first, chain);
-			splx(s);
-			free(fcp->rule, M_IPFW);
-			free(fcp, M_IPFW);
-		}
-		if (m) (void)m_free(m);
-		return (0);
-	}
-	if (stage == IP_FW_ZERO) {
-		error = zero_entry(m);
-		if (m) (void)m_free(m);
-		return (error);
-	}
-	if (m == NULL) {
-		printf("%s NULL mbuf ptr\n", err_prefix);
-		return (EINVAL);
-	}
-
-	if (stage == IP_FW_ADD) {
-		struct ip_fw *frwl = check_ipfw_mbuf(m);
-
-		if (!frwl)
-			error = EINVAL;
-		else
-			error = add_entry(&ip_fw_chain, frwl);
-		if (m) (void)m_free(m);
-		return error;
-	}
-	if (stage == IP_FW_DEL) {
-		if (m->m_len != sizeof(struct ip_fw)) {
-			dprintf(("%s len=%d, want %d\n", err_prefix, m->m_len,
-			    (int)sizeof(struct ip_fw)));
-			error = EINVAL;
-		} else if (mtod(m, struct ip_fw *)->fw_number == (u_short)-1) {
-			dprintf(("%s can't delete rule 65535\n", err_prefix));
-			error = EINVAL;
-		} else
-			error = del_entry(&ip_fw_chain,
-			    mtod(m, struct ip_fw *)->fw_number);
-		if (m) (void)m_free(m);
-		return error;
-	}
-
-	dprintf(("%s unknown request %d\n", err_prefix, stage));
-	if (m) (void)m_free(m);
-	return (EINVAL);
-}
-
-void
-ip_fw_init(void)
-{
-	struct ip_fw default_rule;
-
-	ip_fw_chk_ptr = ip_fw_chk;
-	ip_fw_ctl_ptr = ip_fw_ctl;
-	LIST_INIT(&ip_fw_chain);
-
-	bzero(&default_rule, sizeof default_rule);
-	default_rule.fw_prot = IPPROTO_IP;
-	default_rule.fw_number = (u_short)-1;
-#ifdef IPFIREWALL_DEFAULT_TO_ACCEPT
-	default_rule.fw_flg |= IP_FW_F_ACCEPT;
-#else
-	default_rule.fw_flg |= IP_FW_F_DENY;
-#endif
-	default_rule.fw_flg |= IP_FW_F_IN | IP_FW_F_OUT;
-	if (check_ipfw_struct(&default_rule) == NULL ||
-		add_entry(&ip_fw_chain, &default_rule))
-		panic(__FUNCTION__);
-
-	printf("IP packet filtering initialized, "
-#ifdef IPDIVERT
-		"divert enabled, ");
-#else
-		"divert disabled, ");
-#endif
-#ifdef IPFIREWALL_DEFAULT_TO_ACCEPT
-	printf("default to accept, ");
-#endif
-#ifndef IPFIREWALL_VERBOSE
-	printf("logging disabled\n");
-#else
-	if (fw_verbose_limit == 0)
-		printf("unlimited logging\n");
-	else
-		printf("logging limited to %d packets/entry\n",
-		    fw_verbose_limit);
-#endif
-}
-
-#ifdef IPFIREWALL_MODULE
-
-#include <sys/exec.h>
-#include <sys/sysent.h>
-#include <sys/lkm.h>
-
-MOD_MISC(ipfw);
-
-static int
-ipfw_load(struct lkm_table *lkmtp, int cmd)
-{
-	int s=splnet();
-
-	old_chk_ptr = ip_fw_chk_ptr;
-	old_ctl_ptr = ip_fw_ctl_ptr;
-
-	ip_fw_init();
-	splx(s);
-	return 0;
-}
-
-static int
-ipfw_unload(struct lkm_table *lkmtp, int cmd)
-{
-	int s=splnet();
-
-	ip_fw_chk_ptr =  old_chk_ptr;
-	ip_fw_ctl_ptr =  old_ctl_ptr;
-
-	while (ip_fw_chain.lh_first != NULL) {
-		struct ip_fw_chain *fcp = ip_fw_chain.lh_first;
-		LIST_REMOVE(ip_fw_chain.lh_first, chain);
-		free(fcp->rule, M_IPFW);
-		free(fcp, M_IPFW);
-	}
-	
-	splx(s);
-	printf("IP firewall unloaded\n");
-	return 0;
-}
-
-int
-ipfw_mod(struct lkm_table *lkmtp, int cmd, int ver)
-{
-	DISPATCH(lkmtp, cmd, ver, ipfw_load, ipfw_unload, lkm_nullcmd);
-}
-#endif
diff --git a/cpukit/libnetworking/netinet/ip_fw.h b/cpukit/libnetworking/netinet/ip_fw.h
deleted file mode 100644
index cab7f4ac93..0000000000
--- a/cpukit/libnetworking/netinet/ip_fw.h
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * Copyright (c) 1993 Daniel Boulet
- * Copyright (c) 1994 Ugen J.S.Antsilevich
- *
- * Redistribution and use in source forms, with and without modification,
- * are permitted provided that this entire comment appears intact.
- *
- * Redistribution in binary form may occur without any restrictions.
- * Obviously, it would be nice if you gave credit where credit is due
- * but requiring it would be too onerous.
- *
- * This software is provided ``AS IS'' without any warranties of any kind.
- *
- *	$Id$
- */
-
-#ifndef _IP_FW_H
-#define _IP_FW_H
-
-#include <net/if.h>
-
-/*
- * This union structure identifies an interface, either explicitly
- * by name or implicitly by IP address. The flags IP_FW_F_IIFNAME
- * and IP_FW_F_OIFNAME say how to interpret this structure. An
- * interface unit number of -1 matches any unit number, while an
- * IP address of 0.0.0.0 indicates matches any interface.
- *
- * The receive and transmit interfaces are only compared against the
- * the packet if the corresponding bit (IP_FW_F_IIFACE or IP_FW_F_OIFACE)
- * is set. Note some packets lack a receive or transmit interface
- * (in which case the missing "interface" never matches).
- */
-
-union ip_fw_if {
-    struct in_addr fu_via_ip;	/* Specified by IP address */
-    struct {			/* Specified by interface name */
-#define FW_IFNLEN     IFNAMSIZ
-	    char  name[FW_IFNLEN];
-	    short unit;		/* -1 means match any unit */
-    } fu_via_if;
-};
-
-/*
- * Format of an IP firewall descriptor
- *
- * fw_src, fw_dst, fw_smsk, fw_dmsk are always stored in network byte order.
- * fw_flg and fw_n*p are stored in host byte order (of course).
- * Port numbers are stored in HOST byte order.
- * Warning: setsockopt() will fail if sizeof(struct ip_fw) > MLEN (108)
- */
-
-struct ip_fw {
-    u_long fw_pcnt,fw_bcnt;		/* Packet and byte counters */
-    struct in_addr fw_src, fw_dst;	/* Source and destination IP addr */
-    struct in_addr fw_smsk, fw_dmsk;	/* Mask for src and dest IP addr */
-    u_short fw_number;			/* Rule number */
-    u_short fw_flg;			/* Flags word */
-#define IP_FW_MAX_PORTS	10		/* A reasonable maximum */
-    u_short fw_pts[IP_FW_MAX_PORTS];	/* Array of port numbers to match */
-    u_char fw_ipopt,fw_ipnopt;		/* IP options set/unset */
-    u_char fw_tcpf,fw_tcpnf;		/* TCP flags set/unset */
-#define IP_FW_ICMPTYPES_DIM (32 / (sizeof(unsigned) * 8))
-    unsigned fw_icmptypes[IP_FW_ICMPTYPES_DIM]; /* ICMP types bitmap */
-    long timestamp;			/* timestamp (tv_sec) of last match */
-    union ip_fw_if fw_in_if, fw_out_if;	/* Incoming and outgoing interfaces */
-    union {
-	u_short fu_divert_port;		/* Divert/tee port (options IPDIVERT) */
-	u_short fu_skipto_rule;		/* SKIPTO command rule number */
-	u_short fu_reject_code;		/* REJECT response code */
-    } fw_un;
-    u_char fw_prot;			/* IP protocol */
-    u_char fw_nports;			/* N'of src ports and # of dst ports */
-					/* in ports array (dst ports follow */
-					/* src ports; max of 10 ports in all; */
-					/* count of 0 means match all ports) */
-};
-
-#define IP_FW_GETNSRCP(rule)		((rule)->fw_nports & 0x0f)
-#define IP_FW_SETNSRCP(rule, n)		do {				\
-					  (rule)->fw_nports &= ~0x0f;	\
-					  (rule)->fw_nports |= (n);	\
-					} while (0)
-#define IP_FW_GETNDSTP(rule)		((rule)->fw_nports >> 4)
-#define IP_FW_SETNDSTP(rule, n)		do {				\
-					  (rule)->fw_nports &= ~0xf0;	\
-					  (rule)->fw_nports |= (n) << 4;\
-					} while (0)
-
-#define fw_divert_port	fw_un.fu_divert_port
-#define fw_skipto_rule	fw_un.fu_skipto_rule
-#define fw_reject_code	fw_un.fu_reject_code
-
-struct ip_fw_chain {
-        LIST_ENTRY(ip_fw_chain) chain;
-        struct ip_fw    *rule;
-};
-
-/*
- * Values for "flags" field .
- */
-#define IP_FW_F_IN	0x0001	/* Check inbound packets		*/
-#define IP_FW_F_OUT	0x0002	/* Check outbound packets		*/
-#define IP_FW_F_IIFACE	0x0004	/* Apply inbound interface test		*/
-#define IP_FW_F_OIFACE	0x0008	/* Apply outbound interface test	*/
-
-#define IP_FW_F_COMMAND 0x0070	/* Mask for type of chain entry:	*/
-#define IP_FW_F_DENY	0x0000	/* This is a deny rule			*/
-#define IP_FW_F_REJECT	0x0010	/* Deny and send a response packet	*/
-#define IP_FW_F_ACCEPT	0x0020	/* This is an accept rule		*/
-#define IP_FW_F_COUNT	0x0030	/* This is a count rule			*/
-#define IP_FW_F_DIVERT	0x0040	/* This is a divert rule		*/
-#define IP_FW_F_TEE	0x0050	/* This is a tee rule			*/
-#define IP_FW_F_SKIPTO	0x0060	/* This is a skipto rule		*/
-
-#define IP_FW_F_PRN	0x0080	/* Print if this rule matches		*/
-
-#define IP_FW_F_SRNG	0x0100	/* The first two src ports are a min	*
-				 * and max range (stored in host byte	*
-				 * order).				*/
-
-#define IP_FW_F_DRNG	0x0200	/* The first two dst ports are a min	*
-				 * and max range (stored in host byte	*
-				 * order).				*/
-
-#define IP_FW_F_IIFNAME	0x0400	/* In interface by name/unit (not IP)	*/
-#define IP_FW_F_OIFNAME	0x0800	/* Out interface by name/unit (not IP)	*/
-
-#define IP_FW_F_INVSRC	0x1000	/* Invert sense of src check		*/
-#define IP_FW_F_INVDST	0x2000	/* Invert sense of dst check		*/
-
-#define IP_FW_F_FRAG	0x4000	/* Fragment				*/
-
-#define IP_FW_F_ICMPBIT 0x8000	/* ICMP type bitmap is valid		*/
-
-#define IP_FW_F_MASK	0xFFFF	/* All possible flag bits mask		*/
-
-/*
- * For backwards compatibility with rules specifying "via iface" but
- * not restricted to only "in" or "out" packets, we define this combination
- * of bits to represent this configuration.
- */
-
-#define IF_FW_F_VIAHACK	(IP_FW_F_IN|IP_FW_F_OUT|IP_FW_F_IIFACE|IP_FW_F_OIFACE)
-
-/*
- * Definitions for REJECT response codes.
- * Values less than 256 correspond to ICMP unreachable codes.
- */
-#define IP_FW_REJECT_RST	0x0100		/* TCP packets: send RST */
-
-/*
- * Definitions for IP option names.
- */
-#define IP_FW_IPOPT_LSRR	0x01
-#define IP_FW_IPOPT_SSRR	0x02
-#define IP_FW_IPOPT_RR		0x04
-#define IP_FW_IPOPT_TS		0x08
-
-/*
- * Definitions for TCP flags.
- */
-#define IP_FW_TCPF_FIN		TH_FIN
-#define IP_FW_TCPF_SYN		TH_SYN
-#define IP_FW_TCPF_RST		TH_RST
-#define IP_FW_TCPF_PSH		TH_PUSH
-#define IP_FW_TCPF_ACK		TH_ACK
-#define IP_FW_TCPF_URG		TH_URG
-#define IP_FW_TCPF_ESTAB	0x40
-
-/*
- * Main firewall chains definitions and global var's definitions.
- */
-#ifdef KERNEL
-
-/*
- * Function definitions.
- */
-void ip_fw_init(void);
-
-#endif /* KERNEL */
-
-#endif /* _IP_FW_H */
diff --git a/cpukit/libnetworking/netinet/ip_icmp.c b/cpukit/libnetworking/netinet/ip_icmp.c
deleted file mode 100644
index a18dacca99..0000000000
--- a/cpukit/libnetworking/netinet/ip_icmp.c
+++ /dev/null
@@ -1,710 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)ip_icmp.c	8.2 (Berkeley) 1/4/94
- *	$Id$
- */
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/malloc.h>
-#include <sys/mbuf.h>
-#include <sys/protosw.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <sys/kernel.h>
-#include <sys/socket.h>
-#include <sys/sysctl.h>
-
-#include <net/if.h>
-#include <net/route.h>
-
-#define _IP_VHL
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/in_var.h>
-#include <netinet/ip.h>
-#include <netinet/ip_icmp.h>
-#include <netinet/ip_var.h>
-#include <netinet/icmp_var.h>
-
-/*
- * ICMP routines: error generation, receive packet processing, and
- * routines to turnaround packets back to the originator, and
- * host table maintenance routines.
- */
-
-       struct	icmpstat icmpstat;
-SYSCTL_STRUCT(_net_inet_icmp, ICMPCTL_STATS, stats, CTLFLAG_RD,
-	&icmpstat, icmpstat, "");
-
-static int	icmpmaskrepl = 0;
-SYSCTL_INT(_net_inet_icmp, ICMPCTL_MASKREPL, maskrepl, CTLFLAG_RW,
-	&icmpmaskrepl, 0, "");
-
-static int	icmpbmcastecho = 1;
-SYSCTL_INT(_net_inet_icmp, OID_AUTO, bmcastecho, CTLFLAG_RW, &icmpbmcastecho,
-	   0, "");
-
-#ifdef ICMPPRINTFS
-int	icmpprintfs = 0;
-#endif
-
-static void	icmp_reflect __P((struct mbuf *));
-static void	icmp_send __P((struct mbuf *, struct mbuf *));
-static int	ip_next_mtu __P((int, int));
-
-extern	struct protosw inetsw[];
-
-/*
- * Generate an error packet of type error
- * in response to bad packet ip.
- */
-void
-icmp_error(n, type, code, dest, destifp)
-	struct mbuf *n;
-	int type, code;
-	n_long dest;
-	struct ifnet *destifp;
-{
-	register struct ip *oip = mtod(n, struct ip *), *nip;
-	register unsigned oiplen = IP_VHL_HL(oip->ip_vhl) << 2;
-	register struct icmp *icp;
-	register struct mbuf *m;
-	unsigned icmplen;
-
-#ifdef ICMPPRINTFS
-	if (icmpprintfs)
-		printf("icmp_error(%p, %x, %d)\n", oip, type, code);
-#endif
-	if (type != ICMP_REDIRECT)
-		icmpstat.icps_error++;
-	/*
-	 * Don't send error if not the first fragment of message.
-	 * Don't error if the old packet protocol was ICMP
-	 * error message, only known informational types.
-	 */
-	if (oip->ip_off &~ (IP_MF|IP_DF))
-		goto freeit;
-	if (oip->ip_p == IPPROTO_ICMP && type != ICMP_REDIRECT &&
-	  n->m_len >= oiplen + ICMP_MINLEN &&
-	  !ICMP_INFOTYPE(((struct icmp *)((caddr_t)oip + oiplen))->icmp_type)) {
-		icmpstat.icps_oldicmp++;
-		goto freeit;
-	}
-	/* Don't send error in response to a multicast or broadcast packet */
-	if (n->m_flags & (M_BCAST|M_MCAST))
-		goto freeit;
-	/*
-	 * First, formulate icmp message
-	 */
-	m = m_gethdr(M_DONTWAIT, MT_HEADER);
-	if (m == NULL)
-		goto freeit;
-	icmplen = oiplen + min(8, oip->ip_len);
-	m->m_len = icmplen + ICMP_MINLEN;
-	MH_ALIGN(m, m->m_len);
-	icp = mtod(m, struct icmp *);
-	if ((u_int)type > ICMP_MAXTYPE)
-		panic("icmp_error");
-	icmpstat.icps_outhist[type]++;
-	icp->icmp_type = type;
-	if (type == ICMP_REDIRECT)
-		icp->icmp_gwaddr.s_addr = dest;
-	else {
-		icp->icmp_void = 0;
-		/*
-		 * The following assignments assume an overlay with the
-		 * zeroed icmp_void field.
-		 */
-		if (type == ICMP_PARAMPROB) {
-			icp->icmp_pptr = code;
-			code = 0;
-		} else if (type == ICMP_UNREACH &&
-			code == ICMP_UNREACH_NEEDFRAG && destifp) {
-			icp->icmp_nextmtu = htons(destifp->if_mtu);
-		}
-	}
-
-	icp->icmp_code = code;
-	bcopy((caddr_t)oip, (caddr_t)&icp->icmp_ip, icmplen);
-	nip = &icp->icmp_ip;
-	nip->ip_len = htons((u_short)(nip->ip_len + oiplen));
-
-	/*
-	 * Now, copy old ip header (without options)
-	 * in front of icmp message.
-	 */
-	if (m->m_data - sizeof(struct ip) < m->m_pktdat)
-		panic("icmp len");
-	m->m_data -= sizeof(struct ip);
-	m->m_len += sizeof(struct ip);
-	m->m_pkthdr.len = m->m_len;
-	m->m_pkthdr.rcvif = n->m_pkthdr.rcvif;
-	nip = mtod(m, struct ip *);
-	bcopy((caddr_t)oip, (caddr_t)nip, sizeof(struct ip));
-	nip->ip_len = m->m_len;
-	nip->ip_vhl = IP_VHL_BORING;
-	nip->ip_p = IPPROTO_ICMP;
-	nip->ip_tos = 0;
-	icmp_reflect(m);
-
-freeit:
-	m_freem(n);
-}
-
-static struct sockaddr_in icmpsrc = { sizeof (struct sockaddr_in), AF_INET };
-static struct sockaddr_in icmpdst = { sizeof (struct sockaddr_in), AF_INET };
-static struct sockaddr_in icmpgw = { sizeof (struct sockaddr_in), AF_INET };
-
-/*
- * Process a received ICMP message.
- */
-void
-icmp_input(m, hlen)
-	register struct mbuf *m;
-	int hlen;
-{
-	register struct icmp *icp;
-	register struct ip *ip = mtod(m, struct ip *);
-	int icmplen = ip->ip_len;
-	register int i;
-	struct in_ifaddr *ia;
-	void (*ctlfunc) __P((int, struct sockaddr *, void *));
-	int code;
-
-	/*
-	 * Locate icmp structure in mbuf, and check
-	 * that not corrupted and of at least minimum length.
-	 */
-#ifdef ICMPPRINTFS
-	if (icmpprintfs) {
-		char buf[4 * sizeof "123"];
-		strcpy(buf, inet_ntoa(ip->ip_src));
-		printf("icmp_input from %s to %s, len %d\n",
-		       buf, inet_ntoa(ip->ip_dst), icmplen);
-	}
-#endif
-	if (icmplen < ICMP_MINLEN) {
-		icmpstat.icps_tooshort++;
-		goto freeit;
-	}
-	i = hlen + min(icmplen, ICMP_ADVLENMIN);
-	if (m->m_len < i && (m = m_pullup(m, i)) == 0)  {
-		icmpstat.icps_tooshort++;
-		return;
-	}
-	ip = mtod(m, struct ip *);
-	m->m_len -= hlen;
-	m->m_data += hlen;
-	icp = mtod(m, struct icmp *);
-	if (in_cksum(m, icmplen)) {
-		icmpstat.icps_checksum++;
-		goto freeit;
-	}
-	m->m_len += hlen;
-	m->m_data -= hlen;
-
-#ifdef ICMPPRINTFS
-	if (icmpprintfs)
-		printf("icmp_input, type %d code %d\n", icp->icmp_type,
-		    icp->icmp_code);
-#endif
-
-	/*
-	 * Message type specific processing.
-	 */
-	if (icp->icmp_type > ICMP_MAXTYPE)
-		goto raw;
-	icmpstat.icps_inhist[icp->icmp_type]++;
-	code = icp->icmp_code;
-	switch (icp->icmp_type) {
-
-	case ICMP_UNREACH:
-		switch (code) {
-			case ICMP_UNREACH_NET:
-			case ICMP_UNREACH_HOST:
-			case ICMP_UNREACH_PROTOCOL:
-			case ICMP_UNREACH_PORT:
-			case ICMP_UNREACH_SRCFAIL:
-				code += PRC_UNREACH_NET;
-				break;
-
-			case ICMP_UNREACH_NEEDFRAG:
-				code = PRC_MSGSIZE;
-				break;
-
-			case ICMP_UNREACH_NET_UNKNOWN:
-			case ICMP_UNREACH_NET_PROHIB:
-			case ICMP_UNREACH_TOSNET:
-				code = PRC_UNREACH_NET;
-				break;
-
-			case ICMP_UNREACH_HOST_UNKNOWN:
-			case ICMP_UNREACH_ISOLATED:
-			case ICMP_UNREACH_HOST_PROHIB:
-			case ICMP_UNREACH_TOSHOST:
-				code = PRC_UNREACH_HOST;
-				break;
-
-			case ICMP_UNREACH_FILTER_PROHIB:
-			case ICMP_UNREACH_HOST_PRECEDENCE:
-			case ICMP_UNREACH_PRECEDENCE_CUTOFF:
-				code = PRC_UNREACH_PORT;
-				break;
-
-			default:
-				goto badcode;
-		}
-		goto deliver;
-
-	case ICMP_TIMXCEED:
-		if (code > 1)
-			goto badcode;
-		code += PRC_TIMXCEED_INTRANS;
-		goto deliver;
-
-	case ICMP_PARAMPROB:
-		if (code > 1)
-			goto badcode;
-		code = PRC_PARAMPROB;
-		goto deliver;
-
-	case ICMP_SOURCEQUENCH:
-		if (code)
-			goto badcode;
-		code = PRC_QUENCH;
-	deliver:
-		/*
-		 * Problem with datagram; advise higher level routines.
-		 */
-		if (icmplen < ICMP_ADVLENMIN || icmplen < ICMP_ADVLEN(icp) ||
-		    IP_VHL_HL(icp->icmp_ip.ip_vhl) < (sizeof(struct ip) >> 2)) {
-			icmpstat.icps_badlen++;
-			goto freeit;
-		}
-		NTOHS(icp->icmp_ip.ip_len);
-		/* Discard ICMP's in response to multicast packets */
-		if (IN_MULTICAST(ntohl(icp->icmp_ip.ip_dst.s_addr)))
-			goto badcode;
-#ifdef ICMPPRINTFS
-		if (icmpprintfs)
-			printf("deliver to protocol %d\n", icp->icmp_ip.ip_p);
-#endif
-		icmpsrc.sin_addr = icp->icmp_ip.ip_dst;
-#if 1
-		/*
-		 * MTU discovery:
-		 * If we got a needfrag and there is a host route to the
-		 * original destination, and the MTU is not locked, then
-		 * set the MTU in the route to the suggested new value
-		 * (if given) and then notify as usual.  The ULPs will
-		 * notice that the MTU has changed and adapt accordingly.
-		 * If no new MTU was suggested, then we guess a new one
-		 * less than the current value.  If the new MTU is 
-		 * unreasonably small (arbitrarily set at 296), then
-		 * we reset the MTU to the interface value and enable the
-		 * lock bit, indicating that we are no longer doing MTU
-		 * discovery.
-		 */
-		if (code == PRC_MSGSIZE) {
-			struct rtentry *rt;
-			int mtu;
-
-			rt = rtalloc1((struct sockaddr *)&icmpsrc, 0,
-				      RTF_CLONING | RTF_PRCLONING);
-			if (rt && (rt->rt_flags & RTF_HOST)
-			    && !(rt->rt_rmx.rmx_locks & RTV_MTU)) {
-				mtu = ntohs(icp->icmp_nextmtu);
-				if (!mtu)
-					mtu = ip_next_mtu(rt->rt_rmx.rmx_mtu,
-							  1);
-#ifdef DEBUG_MTUDISC
-				printf("MTU for %s reduced to %d\n",
-					inet_ntoa(icmpsrc.sin_addr), mtu);
-#endif
-				if (mtu < 296) {
-					/* rt->rt_rmx.rmx_mtu =
-						rt->rt_ifp->if_mtu; */
-					rt->rt_rmx.rmx_locks |= RTV_MTU;
-				} else if (rt->rt_rmx.rmx_mtu > mtu) {
-					rt->rt_rmx.rmx_mtu = mtu;
-				}
-			}
-			if (rt)
-				RTFREE(rt);
-		}
-
-#endif
-		ctlfunc = inetsw[ip_protox[icp->icmp_ip.ip_p]].pr_ctlinput;
-		if (ctlfunc)
-			(*ctlfunc)(code, (struct sockaddr *)&icmpsrc,
-				   (void *)&icp->icmp_ip);
-		break;
-
-	badcode:
-		icmpstat.icps_badcode++;
-		break;
-
-	case ICMP_ECHO:
-		if (!icmpbmcastecho
-		    && (m->m_flags & (M_MCAST | M_BCAST)) != 0
-		    && IN_MULTICAST(ntohl(ip->ip_dst.s_addr))) {
-			icmpstat.icps_bmcastecho++;
-			break;
-		}
-		icp->icmp_type = ICMP_ECHOREPLY;
-		goto reflect;
-
-	case ICMP_TSTAMP:
-		if (!icmpbmcastecho
-		    && (m->m_flags & (M_MCAST | M_BCAST)) != 0
-		    && IN_MULTICAST(ntohl(ip->ip_dst.s_addr))) {
-			icmpstat.icps_bmcasttstamp++;
-			break;
-		}
-		if (icmplen < ICMP_TSLEN) {
-			icmpstat.icps_badlen++;
-			break;
-		}
-		icp->icmp_type = ICMP_TSTAMPREPLY;
-		icp->icmp_rtime = iptime();
-		icp->icmp_ttime = icp->icmp_rtime;	/* bogus, do later! */
-		goto reflect;
-
-	case ICMP_MASKREQ:
-#define	satosin(sa)	((struct sockaddr_in *)(sa))
-		if (icmpmaskrepl == 0)
-			break;
-		/*
-		 * We are not able to respond with all ones broadcast
-		 * unless we receive it over a point-to-point interface.
-		 */
-		if (icmplen < ICMP_MASKLEN)
-			break;
-		switch (ip->ip_dst.s_addr) {
-
-		case INADDR_BROADCAST:
-		case INADDR_ANY:
-			icmpdst.sin_addr = ip->ip_src;
-			break;
-
-		default:
-			icmpdst.sin_addr = ip->ip_dst;
-		}
-		ia = (struct in_ifaddr *)ifaof_ifpforaddr(
-			    (struct sockaddr *)&icmpdst, m->m_pkthdr.rcvif);
-		if (ia == 0)
-			break;
-		if (ia->ia_ifp == 0)
-			break;
-		icp->icmp_type = ICMP_MASKREPLY;
-		icp->icmp_mask = ia->ia_sockmask.sin_addr.s_addr;
-		if (ip->ip_src.s_addr == 0) {
-			if (ia->ia_ifp->if_flags & IFF_BROADCAST)
-			    ip->ip_src = satosin(&ia->ia_broadaddr)->sin_addr;
-			else if (ia->ia_ifp->if_flags & IFF_POINTOPOINT)
-			    ip->ip_src = satosin(&ia->ia_dstaddr)->sin_addr;
-		}
-reflect:
-		ip->ip_len += hlen;	/* since ip_input deducts this */
-		icmpstat.icps_reflect++;
-		icmpstat.icps_outhist[icp->icmp_type]++;
-		icmp_reflect(m);
-		return;
-
-	case ICMP_REDIRECT:
-		if (code > 3)
-			goto badcode;
-		if (icmplen < ICMP_ADVLENMIN || icmplen < ICMP_ADVLEN(icp) ||
-		    IP_VHL_HL(icp->icmp_ip.ip_vhl) < (sizeof(struct ip) >> 2)) {
-			icmpstat.icps_badlen++;
-			break;
-		}
-		/*
-		 * Short circuit routing redirects to force
-		 * immediate change in the kernel's routing
-		 * tables.  The message is also handed to anyone
-		 * listening on a raw socket (e.g. the routing
-		 * daemon for use in updating its tables).
-		 */
-		icmpgw.sin_addr = ip->ip_src;
-		icmpdst.sin_addr = icp->icmp_gwaddr;
-#ifdef	ICMPPRINTFS
-		if (icmpprintfs) {
-			char buf[4 * sizeof "123"];
-			strcpy(buf, inet_ntoa(icp->icmp_ip.ip_dst));
-
-			printf("redirect dst %s to %s\n",
-			       buf, inet_ntoa(icp->icmp_gwaddr));
-		}
-#endif
-		icmpsrc.sin_addr = icp->icmp_ip.ip_dst;
-		rtredirect((struct sockaddr *)&icmpsrc,
-		  (struct sockaddr *)&icmpdst,
-		  (struct sockaddr *)0, RTF_GATEWAY | RTF_HOST,
-		  (struct sockaddr *)&icmpgw, (struct rtentry **)0);
-		pfctlinput(PRC_REDIRECT_HOST, (struct sockaddr *)&icmpsrc);
-		break;
-
-	/*
-	 * No kernel processing for the following;
-	 * just fall through to send to raw listener.
-	 */
-	case ICMP_ECHOREPLY:
-	case ICMP_ROUTERADVERT:
-	case ICMP_ROUTERSOLICIT:
-	case ICMP_TSTAMPREPLY:
-	case ICMP_IREQREPLY:
-	case ICMP_MASKREPLY:
-	default:
-		break;
-	}
-
-raw:
-	rip_input(m, hlen);
-	return;
-
-freeit:
-	m_freem(m);
-}
-
-/*
- * Reflect the ip packet back to the source
- */
-static void
-icmp_reflect(m)
-	struct mbuf *m;
-{
-	register struct ip *ip = mtod(m, struct ip *);
-	register struct in_ifaddr *ia;
-	struct in_addr t;
-	struct mbuf *opts = 0;
-	int optlen = (IP_VHL_HL(ip->ip_vhl) << 2) - sizeof(struct ip);
-
-	if (!in_canforward(ip->ip_src) &&
-	    ((ntohl(ip->ip_src.s_addr) & IN_CLASSA_NET) !=
-	     (IN_LOOPBACKNET << IN_CLASSA_NSHIFT))) {
-		m_freem(m);	/* Bad return address */
-		goto done;	/* Ip_output() will check for broadcast */
-	}
-	t = ip->ip_dst;
-	ip->ip_dst = ip->ip_src;
-	/*
-	 * If the incoming packet was addressed directly to us,
-	 * use dst as the src for the reply.  Otherwise (broadcast
-	 * or anonymous), use the address which corresponds
-	 * to the incoming interface.
-	 */
-	for (ia = in_ifaddr; ia; ia = ia->ia_next) {
-		if (t.s_addr == IA_SIN(ia)->sin_addr.s_addr)
-			break;
-		if (ia->ia_ifp && (ia->ia_ifp->if_flags & IFF_BROADCAST) &&
-		    t.s_addr == satosin(&ia->ia_broadaddr)->sin_addr.s_addr)
-			break;
-	}
-	icmpdst.sin_addr = t;
-	if ((ia == (struct in_ifaddr *)0) && m->m_pkthdr.rcvif)
-		ia = (struct in_ifaddr *)ifaof_ifpforaddr(
-			(struct sockaddr *)&icmpdst, m->m_pkthdr.rcvif);
-	/*
-	 * The following happens if the packet was not addressed to us,
-	 * and was received on an interface with no IP address.
-	 */
-	if (ia == (struct in_ifaddr *)0)
-		ia = in_ifaddr;
-	t = IA_SIN(ia)->sin_addr;
-	ip->ip_src = t;
-	ip->ip_ttl = MAXTTL;
-
-	if (optlen > 0) {
-		register u_char *cp;
-		int opt, cnt;
-		u_int len;
-
-		/*
-		 * Retrieve any source routing from the incoming packet;
-		 * add on any record-route or timestamp options.
-		 */
-		cp = (u_char *) (ip + 1);
-		if ((opts = ip_srcroute()) == 0 &&
-		    (opts = m_gethdr(M_DONTWAIT, MT_HEADER))) {
-			opts->m_len = sizeof(struct in_addr);
-			mtod(opts, struct in_addr *)->s_addr = 0;
-		}
-		if (opts) {
-#ifdef ICMPPRINTFS
-		    if (icmpprintfs)
-			    printf("icmp_reflect optlen %d rt %d => ",
-				optlen, opts->m_len);
-#endif
-		    for (cnt = optlen; cnt > 0; cnt -= len, cp += len) {
-			    opt = cp[IPOPT_OPTVAL];
-			    if (opt == IPOPT_EOL)
-				    break;
-			    if (opt == IPOPT_NOP)
-				    len = 1;
-			    else {
-				    len = cp[IPOPT_OLEN];
-				    if (len <= 0 || len > cnt)
-					    break;
-			    }
-			    /*
-			     * Should check for overflow, but it "can't happen"
-			     */
-			    if (opt == IPOPT_RR || opt == IPOPT_TS ||
-				opt == IPOPT_SECURITY) {
-				    bcopy((caddr_t)cp,
-					mtod(opts, caddr_t) + opts->m_len, len);
-				    opts->m_len += len;
-			    }
-		    }
-		    /* Terminate & pad, if necessary */
-		    cnt = opts->m_len % 4;
-		    if (cnt) {
-			    for (; cnt < 4; cnt++) {
-				    *(mtod(opts, caddr_t) + opts->m_len) =
-					IPOPT_EOL;
-				    opts->m_len++;
-			    }
-		    }
-#ifdef ICMPPRINTFS
-		    if (icmpprintfs)
-			    printf("%d\n", opts->m_len);
-#endif
-		}
-		/*
-		 * Now strip out original options by copying rest of first
-		 * mbuf's data back, and adjust the IP length.
-		 */
-		ip->ip_len -= optlen;
-		ip->ip_vhl = IP_VHL_BORING;
-		m->m_len -= optlen;
-		if (m->m_flags & M_PKTHDR)
-			m->m_pkthdr.len -= optlen;
-		optlen += sizeof(struct ip);
-		bcopy((caddr_t)ip + optlen, (caddr_t)(ip + 1),
-			 (unsigned)(m->m_len - sizeof(struct ip)));
-	}
-	m->m_flags &= ~(M_BCAST|M_MCAST);
-	icmp_send(m, opts);
-done:
-	if (opts)
-		(void)m_free(opts);
-}
-
-/*
- * Send an icmp packet back to the ip level,
- * after supplying a checksum.
- */
-static void
-icmp_send(m, opts)
-	register struct mbuf *m;
-	struct mbuf *opts;
-{
-	register struct ip *ip = mtod(m, struct ip *);
-	register int hlen;
-	register struct icmp *icp;
-	struct route ro;
-
-	hlen = IP_VHL_HL(ip->ip_vhl) << 2;
-	m->m_data += hlen;
-	m->m_len -= hlen;
-	icp = mtod(m, struct icmp *);
-	icp->icmp_cksum = 0;
-	icp->icmp_cksum = in_cksum(m, ip->ip_len - hlen);
-	m->m_data -= hlen;
-	m->m_len += hlen;
-#ifdef ICMPPRINTFS
-	if (icmpprintfs) {
-		char buf[4 * sizeof "123"];
-		strcpy(buf, inet_ntoa(ip->ip_dst));
-		printf("icmp_send dst %s src %s\n",
-		       buf, inet_ntoa(ip->ip_src));
-	}
-#endif
-	bzero(&ro, sizeof ro);
-	(void) ip_output(m, opts, &ro, 0, NULL);
-	if (ro.ro_rt)
-		RTFREE(ro.ro_rt);
-}
-
-n_time
-iptime()
-{
-	struct timeval atv;
-	u_long t;
-
-	microtime(&atv);
-	t = (atv.tv_sec % (24*60*60)) * 1000 + atv.tv_usec / 1000;
-	return (htonl(t));
-}
-
-#if 1
-/*
- * Return the next larger or smaller MTU plateau (table from RFC 1191)
- * given current value MTU.  If DIR is less than zero, a larger plateau
- * is returned; otherwise, a smaller value is returned.
- */
-static int
-ip_next_mtu(mtu, dir)
-	int mtu;
-	int dir;
-{
-	static int mtutab[] = {
-		65535, 32000, 17914, 8166, 4352, 2002, 1492, 1006, 508, 296,
-		68, 0
-	};
-	int i;
-
-	for (i = 0; i < (sizeof mtutab) / (sizeof mtutab[0]); i++) {
-		if (mtu >= mtutab[i])
-			break;
-	}
-
-	if (dir < 0) {
-		if (i == 0) {
-			return 0;
-		} else {
-			return mtutab[i - 1];
-		}
-	} else {
-		if (mtutab[i] == 0) {
-			return 0;
-		} else if(mtu > mtutab[i]) {
-			return mtutab[i];
-		} else {
-			return mtutab[i + 1];
-		}
-	}
-}
-#endif
diff --git a/cpukit/libnetworking/netinet/ip_icmp.h b/cpukit/libnetworking/netinet/ip_icmp.h
deleted file mode 100644
index 9d07a682de..0000000000
--- a/cpukit/libnetworking/netinet/ip_icmp.h
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)ip_icmp.h	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#ifndef _NETINET_IP_ICMP_H_
-#define _NETINET_IP_ICMP_H_
-
-/*
- * Interface Control Message Protocol Definitions.
- * Per RFC 792, September 1981.
- */
-
-/*
- * Internal of an ICMP Router Advertisement
- */
-struct icmp_ra_addr {
-	u_int32_t ira_addr;
-	u_int32_t ira_preference;
-};
-
-/*
- * Structure of an icmp header.
- */
-struct icmp {
-	u_char	icmp_type;		/* type of message, see below */
-	u_char	icmp_code;		/* type sub code */
-	u_short	icmp_cksum;		/* ones complement cksum of struct */
-	union {
-		u_char ih_pptr;			/* ICMP_PARAMPROB */
-		struct in_addr ih_gwaddr;	/* ICMP_REDIRECT */
-		struct ih_idseq {
-			n_short	icd_id;
-			n_short	icd_seq;
-		} ih_idseq;
-		int ih_void;
-
-		/* ICMP_UNREACH_NEEDFRAG -- Path MTU Discovery (RFC1191) */
-		struct ih_pmtu {
-			n_short ipm_void;
-			n_short ipm_nextmtu;
-		} ih_pmtu;
-
-		struct ih_rtradv {
-			u_char irt_num_addrs;
-			u_char irt_wpa;
-			u_int16_t irt_lifetime;
-		} ih_rtradv;
-	} icmp_hun;
-#define	icmp_pptr	icmp_hun.ih_pptr
-#define	icmp_gwaddr	icmp_hun.ih_gwaddr
-#define	icmp_id		icmp_hun.ih_idseq.icd_id
-#define	icmp_seq	icmp_hun.ih_idseq.icd_seq
-#define	icmp_void	icmp_hun.ih_void
-#define	icmp_pmvoid	icmp_hun.ih_pmtu.ipm_void
-#define	icmp_nextmtu	icmp_hun.ih_pmtu.ipm_nextmtu
-#define	icmp_num_addrs	icmp_hun.ih_rtradv.irt_num_addrs
-#define	icmp_wpa	icmp_hun.ih_rtradv.irt_wpa
-#define	icmp_lifetime	icmp_hun.ih_rtradv.irt_lifetime
-	union {
-		struct id_ts {
-			n_time its_otime;
-			n_time its_rtime;
-			n_time its_ttime;
-		} id_ts;
-		struct id_ip  {
-			struct ip idi_ip;
-			/* options and then 64 bits of data */
-		} id_ip;
-		struct icmp_ra_addr id_radv;
-		u_long	id_mask;
-		char	id_data[1];
-	} icmp_dun;
-#define	icmp_otime	icmp_dun.id_ts.its_otime
-#define	icmp_rtime	icmp_dun.id_ts.its_rtime
-#define	icmp_ttime	icmp_dun.id_ts.its_ttime
-#define	icmp_ip		icmp_dun.id_ip.idi_ip
-#define	icmp_radv	icmp_dun.id_radv
-#define	icmp_mask	icmp_dun.id_mask
-#define	icmp_data	icmp_dun.id_data
-};
-
-/*
- * Lower bounds on packet lengths for various types.
- * For the error advice packets must first insure that the
- * packet is large enough to contain the returned ip header.
- * Only then can we do the check to see if 64 bits of packet
- * data have been returned, since we need to check the returned
- * ip header length.
- */
-#define	ICMP_MINLEN	8				/* abs minimum */
-#define	ICMP_TSLEN	(8 + 3 * sizeof (n_time))	/* timestamp */
-#define	ICMP_MASKLEN	12				/* address mask */
-#define	ICMP_ADVLENMIN	(8 + sizeof (struct ip) + 8)	/* min */
-#ifndef _IP_VHL
-#define	ICMP_ADVLEN(p)	(8 + ((p)->icmp_ip.ip_hl << 2) + 8)
-	/* N.B.: must separately check that ip_hl >= 5 */
-#else
-#define	ICMP_ADVLEN(p)	(8 + (IP_VHL_HL((p)->icmp_ip.ip_vhl) << 2) + 8)
-	/* N.B.: must separately check that header length >= 5 */
-#endif
-
-/*
- * Definition of type and code field values.
- */
-#define	ICMP_ECHOREPLY		0		/* echo reply */
-#define	ICMP_UNREACH		3		/* dest unreachable, codes: */
-#define		ICMP_UNREACH_NET	0		/* bad net */
-#define		ICMP_UNREACH_HOST	1		/* bad host */
-#define		ICMP_UNREACH_PROTOCOL	2		/* bad protocol */
-#define		ICMP_UNREACH_PORT	3		/* bad port */
-#define		ICMP_UNREACH_NEEDFRAG	4		/* IP_DF caused drop */
-#define		ICMP_UNREACH_SRCFAIL	5		/* src route failed */
-#define		ICMP_UNREACH_NET_UNKNOWN 6		/* unknown net */
-#define		ICMP_UNREACH_HOST_UNKNOWN 7		/* unknown host */
-#define		ICMP_UNREACH_ISOLATED	8		/* src host isolated */
-#define		ICMP_UNREACH_NET_PROHIB	9		/* prohibited access */
-#define		ICMP_UNREACH_HOST_PROHIB 10		/* ditto */
-#define		ICMP_UNREACH_TOSNET	11		/* bad tos for net */
-#define		ICMP_UNREACH_TOSHOST	12		/* bad tos for host */
-#define		ICMP_UNREACH_FILTER_PROHIB 13		/* admin prohib */
-#define		ICMP_UNREACH_HOST_PRECEDENCE 14		/* host prec vio. */
-#define		ICMP_UNREACH_PRECEDENCE_CUTOFF 15	/* prec cutoff */
-#define	ICMP_SOURCEQUENCH	4		/* packet lost, slow down */
-#define	ICMP_REDIRECT		5		/* shorter route, codes: */
-#define		ICMP_REDIRECT_NET	0		/* for network */
-#define		ICMP_REDIRECT_HOST	1		/* for host */
-#define		ICMP_REDIRECT_TOSNET	2		/* for tos and net */
-#define		ICMP_REDIRECT_TOSHOST	3		/* for tos and host */
-#define	ICMP_ECHO		8		/* echo service */
-#define	ICMP_ROUTERADVERT	9		/* router advertisement */
-#define	ICMP_ROUTERSOLICIT	10		/* router solicitation */
-#define	ICMP_TIMXCEED		11		/* time exceeded, code: */
-#define		ICMP_TIMXCEED_INTRANS	0		/* ttl==0 in transit */
-#define		ICMP_TIMXCEED_REASS	1		/* ttl==0 in reass */
-#define	ICMP_PARAMPROB		12		/* ip header bad */
-#define		ICMP_PARAMPROB_OPTABSENT 1		/* req. opt. absent */
-#define	ICMP_TSTAMP		13		/* timestamp request */
-#define	ICMP_TSTAMPREPLY	14		/* timestamp reply */
-#define	ICMP_IREQ		15		/* information request */
-#define	ICMP_IREQREPLY		16		/* information reply */
-#define	ICMP_MASKREQ		17		/* address mask request */
-#define	ICMP_MASKREPLY		18		/* address mask reply */
-
-#define	ICMP_MAXTYPE		18
-
-#define	ICMP_INFOTYPE(type) \
-	((type) == ICMP_ECHOREPLY || (type) == ICMP_ECHO || \
-	(type) == ICMP_ROUTERADVERT || (type) == ICMP_ROUTERSOLICIT || \
-	(type) == ICMP_TSTAMP || (type) == ICMP_TSTAMPREPLY || \
-	(type) == ICMP_IREQ || (type) == ICMP_IREQREPLY || \
-	(type) == ICMP_MASKREQ || (type) == ICMP_MASKREPLY)
-
-#ifdef KERNEL
-void	icmp_error __P((struct mbuf *, int, int, n_long, struct ifnet *));
-void	icmp_input __P((struct mbuf *, int));
-#endif
-
-#endif
diff --git a/cpukit/libnetworking/netinet/ip_input.c b/cpukit/libnetworking/netinet/ip_input.c
deleted file mode 100644
index 4cc141933f..0000000000
--- a/cpukit/libnetworking/netinet/ip_input.c
+++ /dev/null
@@ -1,1488 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)ip_input.c	8.2 (Berkeley) 1/4/94
- * $Id$
- *	$ANA: ip_input.c,v 1.5 1996/09/18 14:34:59 wollman Exp $
- */
-
-#define	_IP_VHL
-
-#include "opt_ipfw.h"
-
-#include <stddef.h>
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/malloc.h>
-#include <sys/mbuf.h>
-#include <sys/domain.h>
-#include <sys/protosw.h>
-#include <sys/socket.h>
-#include <sys/errno.h>
-#include <sys/time.h>
-#include <sys/kernel.h>
-#include <sys/syslog.h>
-#include <sys/sysctl.h>
-
-#include <net/if.h>
-#include <net/if_dl.h>
-#include <net/route.h>
-#include <net/netisr.h>
-
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/in_var.h>
-#include <netinet/ip.h>
-#include <netinet/in_pcb.h>
-#include <netinet/in_var.h>
-#include <netinet/ip_var.h>
-#include <netinet/ip_icmp.h>
-#include <machine/in_cksum.h>
-
-#include <sys/socketvar.h>
-
-#ifdef IPFIREWALL
-#include <netinet/ip_fw.h>
-#endif
-
-int rsvp_on = 0;
-static int ip_rsvp_on;
-struct socket *ip_rsvpd;
-
-static int	ipforwarding = 0;
-SYSCTL_INT(_net_inet_ip, IPCTL_FORWARDING, forwarding, CTLFLAG_RW,
-	&ipforwarding, 0, "");
-
-static int	ipsendredirects = 1; /* XXX */
-SYSCTL_INT(_net_inet_ip, IPCTL_SENDREDIRECTS, redirect, CTLFLAG_RW,
-	&ipsendredirects, 0, "");
-
-int	ip_defttl = IPDEFTTL;
-SYSCTL_INT(_net_inet_ip, IPCTL_DEFTTL, ttl, CTLFLAG_RW,
-	&ip_defttl, 0, "");
-
-static int	ip_dosourceroute = 0;
-SYSCTL_INT(_net_inet_ip, IPCTL_SOURCEROUTE, sourceroute, CTLFLAG_RW,
-	&ip_dosourceroute, 0, "");
-
-static int	ip_acceptsourceroute = 0;
-SYSCTL_INT(_net_inet_ip, IPCTL_ACCEPTSOURCEROUTE, accept_sourceroute,
-	CTLFLAG_RW, &ip_acceptsourceroute, 0, "");
-#ifdef DIAGNOSTIC
-static int	ipprintfs = 0;
-#endif
-
-extern	struct domain inetdomain;
-extern	struct protosw inetsw[];
-u_char	ip_protox[IPPROTO_MAX];
-static int	ipqmaxlen = IFQ_MAXLEN;
-struct	in_ifaddr *in_ifaddr;			/* first inet address */
-struct	ifqueue ipintrq;
-SYSCTL_INT(_net_inet_ip, IPCTL_INTRQMAXLEN, intr_queue_maxlen, CTLFLAG_RD,
-	&ipintrq.ifq_maxlen, 0, "");
-SYSCTL_INT(_net_inet_ip, IPCTL_INTRQDROPS, intr_queue_drops, CTLFLAG_RD,
-	&ipintrq.ifq_drops, 0, "");
-
-struct ipstat ipstat;
-
-/* Packet reassembly stuff */
-#define IPREASS_NHASH_LOG2      6
-#define IPREASS_NHASH           (1 << IPREASS_NHASH_LOG2)
-#define IPREASS_HMASK           (IPREASS_NHASH - 1)
-#define IPREASS_HASH(x,y) \
-	(((((x) & 0xF) | ((((x) >> 8) & 0xF) << 4)) ^ (y)) & IPREASS_HMASK)
-
-static struct ipq ipq[IPREASS_NHASH];
-static int    nipq = 0;         /* total # of reass queues */
-static int    maxnipq;
-
-#ifdef IPCTL_DEFMTU
-SYSCTL_INT(_net_inet_ip, IPCTL_DEFMTU, mtu, CTLFLAG_RW,
-	&ip_mtu, 0, "");
-#endif
-
-#if !defined(COMPAT_IPFW) || COMPAT_IPFW == 1
-#undef COMPAT_IPFW
-#define COMPAT_IPFW 1
-#else
-#undef COMPAT_IPFW
-#endif
-
-#ifdef COMPAT_IPFW
-/* Firewall hooks */
-ip_fw_chk_t *ip_fw_chk_ptr;
-ip_fw_ctl_t *ip_fw_ctl_ptr;
-
-/* IP Network Address Translation (NAT) hooks */ 
-ip_nat_t *ip_nat_ptr;
-ip_nat_ctl_t *ip_nat_ctl_ptr;
-#endif
-
-/*
- * We need to save the IP options in case a protocol wants to respond
- * to an incoming packet over the same route if the packet got here
- * using IP source routing.  This allows connection establishment and
- * maintenance when the remote end is on a network that is not known
- * to us.
- */
-static int	ip_nhops = 0;
-static	struct ip_srcrt {
-	struct	in_addr dst;			/* final destination */
-	char	nop;				/* one NOP to align */
-	char	srcopt[IPOPT_OFFSET + 1];	/* OPTVAL, OLEN and OFFSET */
-	struct	in_addr route[MAX_IPOPTLEN/sizeof(struct in_addr)];
-} ip_srcrt;
-
-#ifdef IPDIVERT
-/*
- * Shared variable between ip_input() and ip_reass() to communicate
- * about which packets, once assembled from fragments, get diverted,
- * and to which port.
- */
-static u_short	frag_divert_port;
-#endif
-
-static void save_rte __P((u_char *, struct in_addr));
-static void	 ip_deq __P((struct ipasfrag *));
-static int	 ip_dooptions __P((struct mbuf *));
-static void	 ip_enq __P((struct ipasfrag *, struct ipasfrag *));
-static void	 ip_forward __P((struct mbuf *, int));
-static void	 ip_freef __P((struct ipq *));
-static struct ip *
-	 ip_reass __P((struct ipasfrag *, struct ipq *, struct ipq *));
-static struct in_ifaddr *
-	 ip_rtaddr __P((struct in_addr));
-void	ipintr __P((void));
-/*
- * IP initialization: fill in IP protocol switch table.
- * All protocols not implemented in kernel go to raw IP protocol handler.
- */
-void
-ip_init()
-{
-	register struct protosw *pr;
-	register int i;
-
-	pr = pffindproto(PF_INET, IPPROTO_RAW, SOCK_RAW);
-	if (pr == 0)
-		panic("ip_init");
-	for (i = 0; i < IPPROTO_MAX; i++)
-		ip_protox[i] = pr - inetsw;
-	for (pr = inetdomain.dom_protosw;
-	    pr < inetdomain.dom_protoswNPROTOSW; pr++)
-		if (pr->pr_domain->dom_family == PF_INET &&
-		    pr->pr_protocol && pr->pr_protocol != IPPROTO_RAW)
-			ip_protox[pr->pr_protocol] = pr - inetsw;
-
-	for (i = 0; i < IPREASS_NHASH; i++)
-	    ipq[i].next = ipq[i].prev = &ipq[i];
-
-	maxnipq = nmbclusters/4;
-
-	ip_id = rtems_bsdnet_seconds_since_boot() & 0xffff;
-	ipintrq.ifq_maxlen = ipqmaxlen;
-#ifdef IPFIREWALL
-	ip_fw_init();
-#endif
-#ifdef IPNAT
-        ip_nat_init(); 
-#endif
-
-}
-
-static struct	sockaddr_in ipaddr = { sizeof(ipaddr), AF_INET };
-static struct	route ipforward_rt;
-
-/*
- * Ip input routine.  Checksum and byte swap header.  If fragmented
- * try to reassemble.  Process options.  Pass to next level.
- */
-void
-ip_input(struct mbuf *m)
-{
-	struct ip *ip;
-	struct ipq *fp;
-	struct in_ifaddr *ia;
-	int    i, hlen;
-	u_short sum;
-
-#ifdef	DIAGNOSTIC
-	if ((m->m_flags & M_PKTHDR) == 0)
-		panic("ip_input no HDR");
-#endif
-	/*
-	 * If no IP addresses have been set yet but the interfaces
-	 * are receiving, can't do anything with incoming packets yet.
-	 */
-	if (in_ifaddr == NULL)
-		goto bad;
-	ipstat.ips_total++;
-
-	if (m->m_pkthdr.len < sizeof(struct ip))
-		goto tooshort;
-
-#ifdef	DIAGNOSTIC
-	if (m->m_len < sizeof(struct ip))
-		panic("ipintr mbuf too short");
-#endif
-
-	if (m->m_len < sizeof (struct ip) &&
-	    (m = m_pullup(m, sizeof (struct ip))) == 0) {
-		ipstat.ips_toosmall++;
-		return;
-	}
-	ip = mtod(m, struct ip *);
-
-	if (IP_VHL_V(ip->ip_vhl) != IPVERSION) {
-		ipstat.ips_badvers++;
-		goto bad;
-	}
-
-	hlen = IP_VHL_HL(ip->ip_vhl) << 2;
-	if (hlen < sizeof(struct ip)) {	/* minimum header length */
-		ipstat.ips_badhlen++;
-		goto bad;
-	}
-	if (hlen > m->m_len) {
-		if ((m = m_pullup(m, hlen)) == 0) {
-			ipstat.ips_badhlen++;
-			return;
-		}
-		ip = mtod(m, struct ip *);
-	}
-	if (hlen == sizeof(struct ip)) {
-		sum = in_cksum_hdr(ip);
-	} else {
-		sum = in_cksum(m, hlen);
-	}
-	if (sum) {
-		ipstat.ips_badsum++;
-		goto bad;
-	}
-
-	/*
-	 * Convert fields to host representation.
-	 */
-	NTOHS(ip->ip_len);
-	if (ip->ip_len < hlen) {
-		ipstat.ips_badlen++;
-		goto bad;
-	}
-	NTOHS(ip->ip_id);
-	NTOHS(ip->ip_off);
-
-	/*
-	 * Check that the amount of data in the buffers
-	 * is as at least much as the IP header would have us expect.
-	 * Trim mbufs if longer than we expect.
-	 * Drop packet if shorter than we expect.
-	 */
-	if (m->m_pkthdr.len < ip->ip_len) {
-tooshort:
-		ipstat.ips_tooshort++;
-		goto bad;
-	}
-	if (m->m_pkthdr.len > ip->ip_len) {
-		if (m->m_len == m->m_pkthdr.len) {
-			m->m_len = ip->ip_len;
-			m->m_pkthdr.len = ip->ip_len;
-		} else
-			m_adj(m, ip->ip_len - m->m_pkthdr.len);
-	}
-	/*
-	 * IpHack's section.
-	 * Right now when no processing on packet has done
-	 * and it is still fresh out of network we do our black
-	 * deals with it.
-	 * - Firewall: deny/allow/divert
-	 * - Xlate: translate packet's addr/port (NAT).
-	 * - Wrap: fake packet's addr/port <unimpl.>
-	 * - Encapsulate: put it in another IP and send out. <unimp.>
- 	 */
-
-#ifdef COMPAT_IPFW
-	if (ip_fw_chk_ptr) {
-#ifdef IPDIVERT
-		u_short port;
-
-		port = (*ip_fw_chk_ptr)(&ip, hlen, NULL, ip_divert_ignore, &m);
-		ip_divert_ignore = 0;
-		if (port) {			/* Divert packet */
-			frag_divert_port = port;
-			goto ours;
-		}
-#else
-		/* If ipfw says divert, we have to just drop packet */
-		if ((*ip_fw_chk_ptr)(&ip, hlen, NULL, 0, &m)) {
-			m_freem(m);
-			m = NULL;
-		}
-#endif
-		if (!m)
-			return;
-	}
-
-        if (ip_nat_ptr && !(*ip_nat_ptr)(&ip, &m, m->m_pkthdr.rcvif, IP_NAT_IN))
-		return;
-#endif
-
-	/*
-	 * Process options and, if not destined for us,
-	 * ship it on.  ip_dooptions returns 1 when an
-	 * error was detected (causing an icmp message
-	 * to be sent and the original packet to be freed).
-	 */
-	ip_nhops = 0;		/* for source routed packets */
-	if (hlen > sizeof (struct ip) && ip_dooptions(m))
-		return;
-
-        /* greedy RSVP, snatches any PATH packet of the RSVP protocol and no
-         * matter if it is destined to another node, or whether it is 
-         * a multicast one, RSVP wants it! and prevents it from being forwarded
-         * anywhere else. Also checks if the rsvp daemon is running before
-	 * grabbing the packet.
-         */
-	if (rsvp_on && ip->ip_p==IPPROTO_RSVP) 
-		goto ours;
-
-	/*
-	 * Check our list of addresses, to see if the packet is for us.
-	 */
-	for (ia = in_ifaddr; ia; ia = ia->ia_next) {
-#define	satosin(sa)	((struct sockaddr_in *)(sa))
-
-		if (IA_SIN(ia)->sin_addr.s_addr == ip->ip_dst.s_addr)
-			goto ours;
-#ifdef BOOTP_COMPAT
-		if (IA_SIN(ia)->sin_addr.s_addr == INADDR_ANY)
-			goto ours;
-#endif
-		if (ia->ia_ifp && ia->ia_ifp->if_flags & IFF_BROADCAST) {
-			if (satosin(&ia->ia_broadaddr)->sin_addr.s_addr ==
-			    ip->ip_dst.s_addr)
-				goto ours;
-			if (ip->ip_dst.s_addr == ia->ia_netbroadcast.s_addr)
-				goto ours;
-		}
-	}
-	if (IN_MULTICAST(ntohl(ip->ip_dst.s_addr))) {
-		struct in_multi *inm;
-		if (ip_mrouter) {
-			/*
-			 * If we are acting as a multicast router, all
-			 * incoming multicast packets are passed to the
-			 * kernel-level multicast forwarding function.
-			 * The packet is returned (relatively) intact; if
-			 * ip_mforward() returns a non-zero value, the packet
-			 * must be discarded, else it may be accepted below.
-			 *
-			 * (The IP ident field is put in the same byte order
-			 * as expected when ip_mforward() is called from
-			 * ip_output().)
-			 */
-			ip->ip_id = htons(ip->ip_id);
-			if (ip_mforward(ip, m->m_pkthdr.rcvif, m, 0) != 0) {
-				ipstat.ips_cantforward++;
-				m_freem(m);
-				return;
-			}
-			ip->ip_id = ntohs(ip->ip_id);
-
-			/*
-			 * The process-level routing demon needs to receive
-			 * all multicast IGMP packets, whether or not this
-			 * host belongs to their destination groups.
-			 */
-			if (ip->ip_p == IPPROTO_IGMP)
-				goto ours;
-			ipstat.ips_forward++;
-		}
-		/*
-		 * See if we belong to the destination multicast group on the
-		 * arrival interface.
-		 */
-		IN_LOOKUP_MULTI(ip->ip_dst, m->m_pkthdr.rcvif, inm);
-		if (inm == NULL) {
-			ipstat.ips_cantforward++;
-			m_freem(m);
-			return;
-		}
-		goto ours;
-	}
-	if (ip->ip_dst.s_addr == (u_long)INADDR_BROADCAST)
-		goto ours;
-	if (ip->ip_dst.s_addr == INADDR_ANY)
-		goto ours;
-
-	/*
-	 * Not for us; forward if possible and desirable.
-	 */
-	if (ipforwarding == 0) {
-		ipstat.ips_cantforward++;
-		m_freem(m);
-	} else
-		ip_forward(m, 0);
-	return;
-
-ours:
-
-	/*
-	 * If offset or IP_MF are set, must reassemble.
-	 * Otherwise, nothing need be done.
-	 * (We could look in the reassembly queue to see
-	 * if the packet was previously fragmented,
-	 * but it's not worth the time; just let them time out.)
-	 */
-	if (ip->ip_off &~ (IP_DF | IP_RF)) {
-		if (m->m_flags & M_EXT) {		/* XXX */
-			if ((m = m_pullup(m, sizeof (struct ip))) == 0) {
-				ipstat.ips_toosmall++;
-#ifdef IPDIVERT
-				frag_divert_port = 0;
-#endif
-				return;
-			}
-			ip = mtod(m, struct ip *);
-		}
-		sum = IPREASS_HASH(ip->ip_src.s_addr, ip->ip_id);
-		/*
-		 * Look for queue of fragments
-		 * of this datagram.
-		 */
-		for (fp = ipq[sum].next; fp != &ipq[sum]; fp = fp->next)
-			if (ip->ip_id == fp->ipq_id &&
-			    ip->ip_src.s_addr == fp->ipq_src.s_addr &&
-			    ip->ip_dst.s_addr == fp->ipq_dst.s_addr &&
-			    ip->ip_p == fp->ipq_p)
-				goto found;
-
-		fp = 0;
-
-		/* check if there's a place for the new queue */
-		if (nipq > maxnipq) {
-		    /*
-		     * drop something from the tail of the current queue
-		     * before proceeding further
-		     */
-		    if (ipq[sum].prev == &ipq[sum]) {   /* gak */
-			for (i = 0; i < IPREASS_NHASH; i++) {
-			    if (ipq[i].prev != &ipq[i]) {
-				ip_freef(ipq[i].prev);
-				break;
-			    }
-			}
-		    } else
-			ip_freef(ipq[sum].prev);
-		}
-found:
-		/*
-		 * Adjust ip_len to not reflect header,
-		 * set ip_mff if more fragments are expected,
-		 * convert offset of this to bytes.
-		 */
-		ip->ip_len -= hlen;
-		((struct ipasfrag *)ip)->ipf_mff &= ~1;
-		if (ip->ip_off & IP_MF)
-			((struct ipasfrag *)ip)->ipf_mff |= 1;
-		ip->ip_off <<= 3;
-
-		/*
-		 * If datagram marked as having more fragments
-		 * or if this is not the first fragment,
-		 * attempt reassembly; if it succeeds, proceed.
-		 */
-		if (((struct ipasfrag *)ip)->ipf_mff & 1 || ip->ip_off) {
-			ipstat.ips_fragments++;
-			ip = ip_reass((struct ipasfrag *)ip, fp, &ipq[sum]);
-			if (ip == 0)
-				return;
-			ipstat.ips_reassembled++;
-			m = dtom(ip);
-#ifdef IPDIVERT
-			if (frag_divert_port) {
-				ip->ip_len += hlen;
-				HTONS(ip->ip_len);
-				HTONS(ip->ip_off);
-				HTONS(ip->ip_id);
-				ip->ip_sum = 0;
-				ip->ip_sum = in_cksum_hdr(ip);
-				NTOHS(ip->ip_id);
-				NTOHS(ip->ip_off);
-				NTOHS(ip->ip_len);
-				ip->ip_len -= hlen;
-			}
-#endif
-		} else
-			if (fp)
-				ip_freef(fp);
-	} else
-		ip->ip_len -= hlen;
-
-#ifdef IPDIVERT
-	/*
-	 * Divert reassembled packets to the divert protocol if required
-	 */
-	if (frag_divert_port) {
-		ipstat.ips_delivered++;
-		ip_divert_port = frag_divert_port;
-		frag_divert_port = 0;
-		(*inetsw[ip_protox[IPPROTO_DIVERT]].pr_input)(m, hlen);
-		return;
-	}
-
-	/* Don't let packets divert themselves */
-	if (ip->ip_p == IPPROTO_DIVERT) {
-		ipstat.ips_noproto++;
-		goto bad;
-	}
-#endif
-
-	/*
-	 * Switch out to protocol's input routine.
-	 */
-	ipstat.ips_delivered++;
-	(*inetsw[ip_protox[ip->ip_p]].pr_input)(m, hlen);
-	return;
-bad:
-	m_freem(m);
-}
-
-/*
- * IP software interrupt routine - to go away sometime soon
- */
-void
-ipintr(void)
-{
-	int s;
-	struct mbuf *m;
-
-	while(1) {
-		s = splimp();
-		IF_DEQUEUE(&ipintrq, m);
-		splx(s);
-		if (m == 0)
-			return;
-		ip_input(m);
-	}
-}
-
-NETISR_SET(NETISR_IP, ipintr);
-  
-/*
- * Take incoming datagram fragment and try to
- * reassemble it into whole datagram.  If a chain for
- * reassembly of this datagram already exists, then it
- * is given as fp; otherwise have to make a chain.
- */
-static struct ip *
-ip_reass(ip, fp, where)
-	register struct ipasfrag *ip;
-	register struct ipq *fp;
-	struct   ipq    *where;
-{
-	register struct mbuf *m = dtom(ip);
-	register struct ipasfrag *q;
-	struct mbuf *t;
-	int hlen = ip->ip_hl << 2;
-	int i, next;
-
-	/*
-	 * Presence of header sizes in mbufs
-	 * would confuse code below.
-	 */
-	m->m_data += hlen;
-	m->m_len -= hlen;
-
-	/*
-	 * If first fragment to arrive, create a reassembly queue.
-	 */
-	if (fp == 0) {
-		if ((t = m_get(M_DONTWAIT, MT_FTABLE)) == NULL)
-			goto dropfrag;
-		fp = mtod(t, struct ipq *);
-		insque(fp, where);
-		nipq++;
-		fp->ipq_ttl = IPFRAGTTL;
-		fp->ipq_p = ip->ip_p;
-		fp->ipq_id = ip->ip_id;
-		fp->ipq_next = fp->ipq_prev = (struct ipasfrag *)fp;
-		fp->ipq_src = ((struct ip *)ip)->ip_src;
-		fp->ipq_dst = ((struct ip *)ip)->ip_dst;
-#ifdef IPDIVERT
-		fp->ipq_divert = 0;
-#endif
-		q = (struct ipasfrag *)fp;
-		goto insert;
-	}
-
-	/*
-	 * Find a segment which begins after this one does.
-	 */
-	for (q = fp->ipq_next; q != (struct ipasfrag *)fp; q = q->ipf_next)
-		if (q->ip_off > ip->ip_off)
-			break;
-
-	/*
-	 * If there is a preceding segment, it may provide some of
-	 * our data already.  If so, drop the data from the incoming
-	 * segment.  If it provides all of our data, drop us.
-	 */
-	if (q->ipf_prev != (struct ipasfrag *)fp) {
-		i = q->ipf_prev->ip_off + q->ipf_prev->ip_len - ip->ip_off;
-		if (i > 0) {
-			if (i >= ip->ip_len)
-				goto dropfrag;
-			m_adj(dtom(ip), i);
-			ip->ip_off += i;
-			ip->ip_len -= i;
-		}
-	}
-
-	/*
-	 * While we overlap succeeding segments trim them or,
-	 * if they are completely covered, dequeue them.
-	 */
-	while (q != (struct ipasfrag *)fp && ip->ip_off + ip->ip_len > q->ip_off) {
-		struct mbuf *m0;
-
-		i = (ip->ip_off + ip->ip_len) - q->ip_off;
-		if (i < q->ip_len) {
-			q->ip_len -= i;
-			q->ip_off += i;
-			m_adj(dtom(q), i);
-			break;
-		}
-		m0 = dtom(q);
-		q = q->ipf_next;
-		ip_deq(q->ipf_prev);
-		m_freem(m0);
-	}
-
-insert:
-
-#ifdef IPDIVERT
-	/*
-	 * Any fragment diverting causes the whole packet to divert
-	 */
-	if (frag_divert_port != 0)
-		fp->ipq_divert = frag_divert_port;
-	frag_divert_port = 0;
-#endif
-
-	/*
-	 * Stick new segment in its place;
-	 * check for complete reassembly.
-	 */
-	ip_enq(ip, q->ipf_prev);
-	next = 0;
-	for (q = fp->ipq_next; q != (struct ipasfrag *)fp; q = q->ipf_next) {
-		if (q->ip_off != next)
-			return (0);
-		next += q->ip_len;
-	}
-	if (q->ipf_prev->ipf_mff & 1)
-		return (0);
-
-	/*
-	 * Reassembly is complete.  Make sure the packet is a sane size.
-	 */
-	if (next + (IP_VHL_HL(((struct ip *)fp->ipq_next)->ip_vhl) << 2)
-							> IP_MAXPACKET) {
-		ipstat.ips_toolong++;
-		ip_freef(fp);
-		return (0);
-	}
-
-	/*
-	 * Concatenate fragments.
-	 */
-	q = fp->ipq_next;
-	m = dtom(q);
-	t = m->m_next;
-	m->m_next = 0;
-	m_cat(m, t);
-	q = q->ipf_next;
-	while (q != (struct ipasfrag *)fp) {
-		t = dtom(q);
-		q = q->ipf_next;
-		m_cat(m, t);
-	}
-
-#ifdef IPDIVERT
-	/*
-	 * Record divert port for packet, if any
-	 */
-	frag_divert_port = fp->ipq_divert;
-#endif
-
-	/*
-	 * Create header for new ip packet by
-	 * modifying header of first packet;
-	 * dequeue and discard fragment reassembly header.
-	 * Make header visible.
-	 */
-	ip = fp->ipq_next;
-	ip->ip_len = next;
-	ip->ipf_mff &= ~1;
-	((struct ip *)ip)->ip_src = fp->ipq_src;
-	((struct ip *)ip)->ip_dst = fp->ipq_dst;
-	remque(fp);
-	nipq--;
-	(void) m_free(dtom(fp));
-	m = dtom(ip);
-	m->m_len += (ip->ip_hl << 2);
-	m->m_data -= (ip->ip_hl << 2);
-	/* some debugging cruft by sklower, below, will go away soon */
-	if (m->m_flags & M_PKTHDR) { /* XXX this should be done elsewhere */
-		register int plen = 0;
-		for (t = m; m; m = m->m_next)
-			plen += m->m_len;
-		t->m_pkthdr.len = plen;
-	}
-	return ((struct ip *)ip);
-
-dropfrag:
-	ipstat.ips_fragdropped++;
-	m_freem(m);
-	return (0);
-}
-
-/*
- * Free a fragment reassembly header and all
- * associated datagrams.
- */
-static void
-ip_freef(fp)
-	struct ipq *fp;
-{
-	register struct ipasfrag *q, *p;
-
-	for (q = fp->ipq_next; q != (struct ipasfrag *)fp; q = p) {
-		p = q->ipf_next;
-		ip_deq(q);
-		m_freem(dtom(q));
-	}
-	remque(fp);
-	(void) m_free(dtom(fp));
-	nipq--;
-}
-
-/*
- * Put an ip fragment on a reassembly chain.
- * Like insque, but pointers in middle of structure.
- */
-static void
-ip_enq(p, prev)
-	register struct ipasfrag *p, *prev;
-{
-
-	p->ipf_prev = prev;
-	p->ipf_next = prev->ipf_next;
-	prev->ipf_next->ipf_prev = p;
-	prev->ipf_next = p;
-}
-
-/*
- * To ip_enq as remque is to insque.
- */
-static void
-ip_deq(p)
-	register struct ipasfrag *p;
-{
-
-	p->ipf_prev->ipf_next = p->ipf_next;
-	p->ipf_next->ipf_prev = p->ipf_prev;
-}
-
-/*
- * IP timer processing;
- * if a timer expires on a reassembly
- * queue, discard it.
- */
-void
-ip_slowtimo()
-{
-	register struct ipq *fp;
-	int s = splnet();
-	int i;
-
-	for (i = 0; i < IPREASS_NHASH; i++) {
-		fp = ipq[i].next;
-		if (fp == 0)
-			continue;
-		while (fp != &ipq[i]) {
-			--fp->ipq_ttl;
-			fp = fp->next;
-			if (fp->prev->ipq_ttl == 0) {
-				ipstat.ips_fragtimeout++;
-				ip_freef(fp->prev);
-			}
-		}
-	}
-	splx(s);
-}
-
-/*
- * Drain off all datagram fragments.
- */
-void
-ip_drain()
-{
-	int     i;
-
-	for (i = 0; i < IPREASS_NHASH; i++) {
-		while (ipq[i].next != &ipq[i]) {
-			ipstat.ips_fragdropped++;
-			ip_freef(ipq[i].next);
-		}
-	}
-	in_rtqdrain();
-}
-
-/*
- * Do option processing on a datagram,
- * possibly discarding it if bad options are encountered,
- * or forwarding it if source-routed.
- * Returns 1 if packet has been forwarded/freed,
- * 0 if the packet should be processed further.
- */
-static int
-ip_dooptions(m)
-	struct mbuf *m;
-{
-	register struct ip *ip = mtod(m, struct ip *);
-	register u_char *cp;
-	register struct ip_timestamp *ipt;
-	register struct in_ifaddr *ia;
-	int opt, optlen, cnt, off, code, type = ICMP_PARAMPROB, forward = 0;
-	struct in_addr *sin, dst;
-	n_time ntime;
-
-	dst = ip->ip_dst;
-	cp = (u_char *)(ip + 1);
-	cnt = (IP_VHL_HL(ip->ip_vhl) << 2) - sizeof (struct ip);
-	for (; cnt > 0; cnt -= optlen, cp += optlen) {
-		opt = cp[IPOPT_OPTVAL];
-		if (opt == IPOPT_EOL)
-			break;
-		if (opt == IPOPT_NOP)
-			optlen = 1;
-		else {
-			optlen = cp[IPOPT_OLEN];
-			if (optlen <= 0 || optlen > cnt) {
-				code = &cp[IPOPT_OLEN] - (u_char *)ip;
-				goto bad;
-			}
-		}
-		switch (opt) {
-
-		default:
-			break;
-
-		/*
-		 * Source routing with record.
-		 * Find interface with current destination address.
-		 * If none on this machine then drop if strictly routed,
-		 * or do nothing if loosely routed.
-		 * Record interface address and bring up next address
-		 * component.  If strictly routed make sure next
-		 * address is on directly accessible net.
-		 */
-		case IPOPT_LSRR:
-		case IPOPT_SSRR:
-			if ((off = cp[IPOPT_OFFSET]) < IPOPT_MINOFF) {
-				code = &cp[IPOPT_OFFSET] - (u_char *)ip;
-				goto bad;
-			}
-			ipaddr.sin_addr = ip->ip_dst;
-			ia = (struct in_ifaddr *)
-				ifa_ifwithaddr((struct sockaddr *)&ipaddr);
-			if (ia == 0) {
-				if (opt == IPOPT_SSRR) {
-					type = ICMP_UNREACH;
-					code = ICMP_UNREACH_SRCFAIL;
-					goto bad;
-				}
-				if (!ip_dosourceroute)
-					goto nosourcerouting;
-				/*
-				 * Loose routing, and not at next destination
-				 * yet; nothing to do except forward.
-				 */
-				break;
-			}
-			off--;			/* 0 origin */
-			if (off > optlen - sizeof(struct in_addr)) {
-				/*
-				 * End of source route.  Should be for us.
-				 */
-				if (!ip_acceptsourceroute)
-					goto nosourcerouting;
-				save_rte(cp, ip->ip_src);
-				break;
-			}
-
-			if (!ip_dosourceroute) {
-				char buf[4*sizeof "123"];
-
-nosourcerouting:
-				strcpy(buf, inet_ntoa(ip->ip_dst));
-				log(LOG_WARNING, 
-				    "attempted source route from %s to %s\n",
-				    inet_ntoa(ip->ip_src), buf);
-				type = ICMP_UNREACH;
-				code = ICMP_UNREACH_SRCFAIL;
-				goto bad;
-			}
-
-			/*
-			 * locate outgoing interface
-			 */
-			(void)memcpy(&ipaddr.sin_addr, cp + off,
-			    sizeof(ipaddr.sin_addr));
-
-			if (opt == IPOPT_SSRR) {
-#define	INA	struct in_ifaddr *
-#define	SA	struct sockaddr *
-			    if ((ia = (INA)ifa_ifwithdstaddr((SA)&ipaddr)) == 0)
-				ia = (INA)ifa_ifwithnet((SA)&ipaddr);
-			} else
-				ia = ip_rtaddr(ipaddr.sin_addr);
-			if (ia == 0) {
-				type = ICMP_UNREACH;
-				code = ICMP_UNREACH_SRCFAIL;
-				goto bad;
-			}
-			ip->ip_dst = ipaddr.sin_addr;
-			(void)memcpy(cp + off, &(IA_SIN(ia)->sin_addr),
-			    sizeof(struct in_addr));
-			cp[IPOPT_OFFSET] += sizeof(struct in_addr);
-			/*
-			 * Let ip_intr's mcast routing check handle mcast pkts
-			 */
-			forward = !IN_MULTICAST(ntohl(ip->ip_dst.s_addr));
-			break;
-
-		case IPOPT_RR:
-			if ((off = cp[IPOPT_OFFSET]) < IPOPT_MINOFF) {
-				code = &cp[IPOPT_OFFSET] - (u_char *)ip;
-				goto bad;
-			}
-			/*
-			 * If no space remains, ignore.
-			 */
-			off--;			/* 0 origin */
-			if (off > optlen - sizeof(struct in_addr))
-				break;
-			(void)memcpy(&ipaddr.sin_addr, &ip->ip_dst,
-			    sizeof(ipaddr.sin_addr));
-			/*
-			 * locate outgoing interface; if we're the destination,
-			 * use the incoming interface (should be same).
-			 */
-			if ((ia = (INA)ifa_ifwithaddr((SA)&ipaddr)) == 0 &&
-			    (ia = ip_rtaddr(ipaddr.sin_addr)) == 0) {
-				type = ICMP_UNREACH;
-				code = ICMP_UNREACH_HOST;
-				goto bad;
-			}
-			(void)memcpy(cp + off, &(IA_SIN(ia)->sin_addr),
-			    sizeof(struct in_addr));
-			cp[IPOPT_OFFSET] += sizeof(struct in_addr);
-			break;
-
-		case IPOPT_TS:
-			code = cp - (u_char *)ip;
-			ipt = (struct ip_timestamp *)cp;
-			if (ipt->ipt_len < 5)
-				goto bad;
-			if (ipt->ipt_ptr > ipt->ipt_len - sizeof (long)) {
-				if (++ipt->ipt_oflw == 0)
-					goto bad;
-				break;
-			}
-			sin = (struct in_addr *)(cp + ipt->ipt_ptr - 1);
-			switch (ipt->ipt_flg) {
-
-			case IPOPT_TS_TSONLY:
-				break;
-
-			case IPOPT_TS_TSANDADDR:
-				if (ipt->ipt_ptr + sizeof(n_time) +
-				    sizeof(struct in_addr) > ipt->ipt_len)
-					goto bad;
-				ipaddr.sin_addr = dst;
-				ia = (INA)ifaof_ifpforaddr((SA)&ipaddr,
-							    m->m_pkthdr.rcvif);
-				if (ia == 0)
-					continue;
-				(void)memcpy(sin, &IA_SIN(ia)->sin_addr,
-				    sizeof(struct in_addr));
-				ipt->ipt_ptr += sizeof(struct in_addr);
-				break;
-
-			case IPOPT_TS_PRESPEC:
-				if (ipt->ipt_ptr + sizeof(n_time) +
-				    sizeof(struct in_addr) > ipt->ipt_len)
-					goto bad;
-				(void)memcpy(&ipaddr.sin_addr, sin,
-				    sizeof(struct in_addr));
-				if (ifa_ifwithaddr((SA)&ipaddr) == 0)
-					continue;
-				ipt->ipt_ptr += sizeof(struct in_addr);
-				break;
-
-			default:
-				goto bad;
-			}
-			ntime = iptime();
-			(void)memcpy(cp + ipt->ipt_ptr - 1, &ntime,
-			    sizeof(n_time));
-			ipt->ipt_ptr += sizeof(n_time);
-		}
-	}
-	if (forward && ipforwarding) {
-		ip_forward(m, 1);
-		return (1);
-	}
-	return (0);
-bad:
-	ip->ip_len -= IP_VHL_HL(ip->ip_vhl) << 2;   /* XXX icmp_error adds in hdr length */
-	icmp_error(m, type, code, 0, 0);
-	ipstat.ips_badoptions++;
-	return (1);
-}
-
-/*
- * Given address of next destination (final or next hop),
- * return internet address info of interface to be used to get there.
- */
-static struct in_ifaddr *
-ip_rtaddr(dst)
-	 struct in_addr dst;
-{
-	register struct sockaddr_in *sin;
-
-	sin = (struct sockaddr_in *) &ipforward_rt.ro_dst;
-
-	if (ipforward_rt.ro_rt == 0 || dst.s_addr != sin->sin_addr.s_addr) {
-		if (ipforward_rt.ro_rt) {
-			RTFREE(ipforward_rt.ro_rt);
-			ipforward_rt.ro_rt = 0;
-		}
-		sin->sin_family = AF_INET;
-		sin->sin_len = sizeof(*sin);
-		sin->sin_addr = dst;
-
-		rtalloc_ign(&ipforward_rt, RTF_PRCLONING);
-	}
-	if (ipforward_rt.ro_rt == 0)
-		return ((struct in_ifaddr *)0);
-	return ((struct in_ifaddr *) ipforward_rt.ro_rt->rt_ifa);
-}
-
-/*
- * Save incoming source route for use in replies,
- * to be picked up later by ip_srcroute if the receiver is interested.
- */
-void
-save_rte(option, dst)
-	u_char *option;
-	struct in_addr dst;
-{
-	unsigned olen;
-
-	olen = option[IPOPT_OLEN];
-#ifdef DIAGNOSTIC
-	if (ipprintfs)
-		printf("save_rte: olen %d\n", olen);
-#endif
-	if (olen > sizeof(ip_srcrt) - (1 + sizeof(dst)))
-		return;
-	bcopy(option, ip_srcrt.srcopt, olen);
-	ip_nhops = (olen - IPOPT_OFFSET - 1) / sizeof(struct in_addr);
-	ip_srcrt.dst = dst;
-}
-
-/*
- * Retrieve incoming source route for use in replies,
- * in the same form used by setsockopt.
- * The first hop is placed before the options, will be removed later.
- */
-struct mbuf *
-ip_srcroute()
-{
-	register struct in_addr *p, *q;
-	register struct mbuf *m;
-
-	if (ip_nhops == 0)
-		return ((struct mbuf *)0);
-	m = m_get(M_DONTWAIT, MT_SOOPTS);
-	if (m == 0)
-		return ((struct mbuf *)0);
-
-#define OPTSIZ	(sizeof(ip_srcrt.nop) + sizeof(ip_srcrt.srcopt))
-
-	/* length is (nhops+1)*sizeof(addr) + sizeof(nop + srcrt header) */
-	m->m_len = ip_nhops * sizeof(struct in_addr) + sizeof(struct in_addr) +
-	    OPTSIZ;
-#ifdef DIAGNOSTIC
-	if (ipprintfs)
-		printf("ip_srcroute: nhops %d mlen %d", ip_nhops, m->m_len);
-#endif
-
-	/*
-	 * First save first hop for return route
-	 */
-	p = &ip_srcrt.route[ip_nhops - 1];
-	*(mtod(m, struct in_addr *)) = *p--;
-#ifdef DIAGNOSTIC
-	if (ipprintfs)
-		printf(" hops %lx", ntohl(mtod(m, struct in_addr *)->s_addr));
-#endif
-
-	/*
-	 * Copy option fields and padding (nop) to mbuf.
-	 */
-	ip_srcrt.nop = IPOPT_NOP;
-	ip_srcrt.srcopt[IPOPT_OFFSET] = IPOPT_MINOFF;
-	(void)memcpy(mtod(m, caddr_t) + sizeof(struct in_addr),
-	    &ip_srcrt.nop, OPTSIZ);
-	q = (struct in_addr *)(mtod(m, caddr_t) +
-	    sizeof(struct in_addr) + OPTSIZ);
-#undef OPTSIZ
-	/*
-	 * Record return path as an IP source route,
-	 * reversing the path (pointers are now aligned).
-	 */
-	while (p >= ip_srcrt.route) {
-#ifdef DIAGNOSTIC
-		if (ipprintfs)
-			printf(" %lx", ntohl(q->s_addr));
-#endif
-		*q++ = *p--;
-	}
-	/*
-	 * Last hop goes to final destination.
-	 */
-	*q = ip_srcrt.dst;
-#ifdef DIAGNOSTIC
-	if (ipprintfs)
-		printf(" %lx\n", ntohl(q->s_addr));
-#endif
-	return (m);
-}
-
-/*
- * Strip out IP options, at higher
- * level protocol in the kernel.
- * Second argument is buffer to which options
- * will be moved, and return value is their length.
- * XXX should be deleted; last arg currently ignored.
- */
-void
-ip_stripoptions(m, mopt)
-	register struct mbuf *m;
-	struct mbuf *mopt;
-{
-	register int i;
-	struct ip *ip = mtod(m, struct ip *);
-	register caddr_t opts;
-	int olen;
-
-	olen = (IP_VHL_HL(ip->ip_vhl) << 2) - sizeof (struct ip);
-	opts = (caddr_t)(ip + 1);
-	i = m->m_len - (sizeof (struct ip) + olen);
-	bcopy(opts + olen, opts, (unsigned)i);
-	m->m_len -= olen;
-	if (m->m_flags & M_PKTHDR)
-		m->m_pkthdr.len -= olen;
-	ip->ip_vhl = IP_MAKE_VHL(IPVERSION, sizeof(struct ip) >> 2);
-}
-
-u_char inetctlerrmap[PRC_NCMDS] = {
-	0,		0,		0,		0,
-	0,		EMSGSIZE,	EHOSTDOWN,	EHOSTUNREACH,
-	EHOSTUNREACH,	EHOSTUNREACH,	ECONNREFUSED,	ECONNREFUSED,
-	EMSGSIZE,	EHOSTUNREACH,	0,		0,
-	0,		0,		0,		0,
-	ENOPROTOOPT
-};
-
-/*
- * Forward a packet.  If some error occurs return the sender
- * an icmp packet.  Note we can't always generate a meaningful
- * icmp message because icmp doesn't have a large enough repertoire
- * of codes and types.
- *
- * If not forwarding, just drop the packet.  This could be confusing
- * if ipforwarding was zero but some routing protocol was advancing
- * us as a gateway to somewhere.  However, we must let the routing
- * protocol deal with that.
- *
- * The srcrt parameter indicates whether the packet is being forwarded
- * via a source route.
- */
-static void
-ip_forward(m, srcrt)
-	struct mbuf *m;
-	int srcrt;
-{
-	register struct ip *ip = mtod(m, struct ip *);
-	register struct sockaddr_in *sin;
-	register struct rtentry *rt;
-	int error, type = 0, code = 0;
-	struct mbuf *mcopy;
-	n_long dest;
-	struct ifnet *destifp;
-
-	dest = 0;
-#ifdef DIAGNOSTIC
-	if (ipprintfs)
-		printf("forward: src %lx dst %lx ttl %x\n",
-			ip->ip_src.s_addr, ip->ip_dst.s_addr, ip->ip_ttl);
-#endif
-
-
-	if (m->m_flags & M_BCAST || in_canforward(ip->ip_dst) == 0) {
-		ipstat.ips_cantforward++;
-		m_freem(m);
-		return;
-	}
-	HTONS(ip->ip_id);
-	if (ip->ip_ttl <= IPTTLDEC) {
-		icmp_error(m, ICMP_TIMXCEED, ICMP_TIMXCEED_INTRANS, dest, 0);
-		return;
-	}
-	ip->ip_ttl -= IPTTLDEC;
-
-	sin = (struct sockaddr_in *)&ipforward_rt.ro_dst;
-	if ((rt = ipforward_rt.ro_rt) == 0 ||
-	    ip->ip_dst.s_addr != sin->sin_addr.s_addr) {
-		if (ipforward_rt.ro_rt) {
-			RTFREE(ipforward_rt.ro_rt);
-			ipforward_rt.ro_rt = 0;
-		}
-		sin->sin_family = AF_INET;
-		sin->sin_len = sizeof(*sin);
-		sin->sin_addr = ip->ip_dst;
-
-		rtalloc_ign(&ipforward_rt, RTF_PRCLONING);
-		if (ipforward_rt.ro_rt == 0) {
-			icmp_error(m, ICMP_UNREACH, ICMP_UNREACH_HOST, dest, 0);
-			return;
-		}
-		rt = ipforward_rt.ro_rt;
-	}
-
-	/*
-	 * Save at most 64 bytes of the packet in case
-	 * we need to generate an ICMP message to the src.
-	 */
-	mcopy = m_copy(m, 0, imin((int)ip->ip_len, 64));
-
-	/*
-	 * If forwarding packet using same interface that it came in on,
-	 * perhaps should send a redirect to sender to shortcut a hop.
-	 * Only send redirect if source is sending directly to us,
-	 * and if packet was not source routed (or has any options).
-	 * Also, don't send redirect if forwarding using a default route
-	 * or a route modified by a redirect.
-	 */
-#define	satosin(sa)	((struct sockaddr_in *)(sa))
-	if (rt->rt_ifp == m->m_pkthdr.rcvif &&
-	    (rt->rt_flags & (RTF_DYNAMIC|RTF_MODIFIED)) == 0 &&
-	    satosin(rt_key(rt))->sin_addr.s_addr != 0 &&
-	    ipsendredirects && !srcrt) {
-#define	RTA(rt)	((struct in_ifaddr *)(rt->rt_ifa))
-		u_long src = ntohl(ip->ip_src.s_addr);
-
-		if (RTA(rt) &&
-		    (src & RTA(rt)->ia_subnetmask) == RTA(rt)->ia_subnet) {
-		    if (rt->rt_flags & RTF_GATEWAY)
-			dest = satosin(rt->rt_gateway)->sin_addr.s_addr;
-		    else
-			dest = ip->ip_dst.s_addr;
-		    /* Router requirements says to only send host redirects */
-		    type = ICMP_REDIRECT;
-		    code = ICMP_REDIRECT_HOST;
-#ifdef DIAGNOSTIC
-		    if (ipprintfs)
-		        printf("redirect (%d) to %lx\n", code, (u_long)dest);
-#endif
-		}
-	}
-
-	error = ip_output(m, (struct mbuf *)0, &ipforward_rt, 
-			  IP_FORWARDING, 0);
-	if (error)
-		ipstat.ips_cantforward++;
-	else {
-		ipstat.ips_forward++;
-		if (type)
-			ipstat.ips_redirectsent++;
-		else {
-			if (mcopy)
-				m_freem(mcopy);
-			return;
-		}
-	}
-	if (mcopy == NULL)
-		return;
-	destifp = NULL;
-
-	switch (error) {
-
-	case 0:				/* forwarded, but need redirect */
-		/* type, code set above */
-		break;
-
-	case ENETUNREACH:		/* shouldn't happen, checked above */
-	case EHOSTUNREACH:
-	case ENETDOWN:
-	case EHOSTDOWN:
-	default:
-		type = ICMP_UNREACH;
-		code = ICMP_UNREACH_HOST;
-		break;
-
-	case EMSGSIZE:
-		type = ICMP_UNREACH;
-		code = ICMP_UNREACH_NEEDFRAG;
-		if (ipforward_rt.ro_rt)
-			destifp = ipforward_rt.ro_rt->rt_ifp;
-		ipstat.ips_cantfrag++;
-		break;
-
-	case ENOBUFS:
-		type = ICMP_SOURCEQUENCH;
-		code = 0;
-		break;
-	}
-	icmp_error(mcopy, type, code, dest, destifp);
-}
-
-void
-ip_savecontrol(inp, mp, ip, m)
-	register struct inpcb *inp;
-	register struct mbuf **mp;
-	register struct ip *ip;
-	register struct mbuf *m;
-{
-	if (inp->inp_socket->so_options & SO_TIMESTAMP) {
-		struct timeval tv;
-
-		microtime(&tv);
-		*mp = sbcreatecontrol((caddr_t) &tv, sizeof(tv),
-			SCM_TIMESTAMP, SOL_SOCKET);
-		if (*mp)
-			mp = &(*mp)->m_next;
-	}
-	if (inp->inp_flags & INP_RECVDSTADDR) {
-		*mp = sbcreatecontrol((caddr_t) &ip->ip_dst,
-		    sizeof(struct in_addr), IP_RECVDSTADDR, IPPROTO_IP);
-		if (*mp)
-			mp = &(*mp)->m_next;
-	}
-#ifdef notyet
-	/* XXX
-	 * Moving these out of udp_input() made them even more broken
-	 * than they already were.
-	 */
-	/* options were tossed already */
-	if (inp->inp_flags & INP_RECVOPTS) {
-		*mp = sbcreatecontrol((caddr_t) opts_deleted_above,
-		    sizeof(struct in_addr), IP_RECVOPTS, IPPROTO_IP);
-		if (*mp)
-			mp = &(*mp)->m_next;
-	}
-	/* ip_srcroute doesn't do what we want here, need to fix */
-	if (inp->inp_flags & INP_RECVRETOPTS) {
-		*mp = sbcreatecontrol((caddr_t) ip_srcroute(),
-		    sizeof(struct in_addr), IP_RECVRETOPTS, IPPROTO_IP);
-		if (*mp)
-			mp = &(*mp)->m_next;
-	}
-#endif
-	if (inp->inp_flags & INP_RECVIF) {
-		struct sockaddr_dl sdl;
-
-		sdl.sdl_len = offsetof(struct sockaddr_dl, sdl_data[0]);
-		sdl.sdl_family = AF_LINK;
-		sdl.sdl_index = m->m_pkthdr.rcvif ?
-			m->m_pkthdr.rcvif->if_index : 0;
-		sdl.sdl_nlen = sdl.sdl_alen = sdl.sdl_slen = 0;
-		*mp = sbcreatecontrol((caddr_t) &sdl, sdl.sdl_len,
-			IP_RECVIF, IPPROTO_IP);
-		if (*mp)
-			mp = &(*mp)->m_next;
-	}
-}
-
-int
-ip_rsvp_init(struct socket *so)
-{
-	if (so->so_type != SOCK_RAW ||
-	    so->so_proto->pr_protocol != IPPROTO_RSVP)
-	  return EOPNOTSUPP;
-
-	if (ip_rsvpd != NULL)
-	  return EADDRINUSE;
-
-	ip_rsvpd = so;
-	/*
-	 * This may seem silly, but we need to be sure we don't over-increment
-	 * the RSVP counter, in case something slips up.
-	 */
-	if (!ip_rsvp_on) {
-		ip_rsvp_on = 1;
-		rsvp_on++;
-	}
-
-	return 0;
-}
-
-int
-ip_rsvp_done(void)
-{
-	ip_rsvpd = NULL;
-	/*
-	 * This may seem silly, but we need to be sure we don't over-decrement
-	 * the RSVP counter, in case something slips up.
-	 */
-	if (ip_rsvp_on) {
-		ip_rsvp_on = 0;
-		rsvp_on--;
-	}
-	return 0;
-}
diff --git a/cpukit/libnetworking/netinet/ip_mroute.c b/cpukit/libnetworking/netinet/ip_mroute.c
deleted file mode 100644
index 662d695dfe..0000000000
--- a/cpukit/libnetworking/netinet/ip_mroute.c
+++ /dev/null
@@ -1,2302 +0,0 @@
-/*
- * IP multicast forwarding procedures
- *
- * Written by David Waitzman, BBN Labs, August 1988.
- * Modified by Steve Deering, Stanford, February 1989.
- * Modified by Mark J. Steiglitz, Stanford, May, 1991
- * Modified by Van Jacobson, LBL, January 1993
- * Modified by Ajit Thyagarajan, PARC, August 1993
- * Modified by Bill Fenner, PARC, April 1995
- *
- * MROUTING Revision: 3.5
- * $Id$
- */
-
-#include "opt_mrouting.h"
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/systm.h>
-#include <sys/mbuf.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/protosw.h>
-#include <sys/errno.h>
-#include <sys/time.h>
-#include <sys/kernel.h>
-#include <sys/ioctl.h>
-#include <sys/syslog.h>
-#include <net/if.h>
-#include <net/route.h>
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/ip_var.h>
-#include <netinet/in_pcb.h>
-#include <netinet/in_var.h>
-#include <netinet/igmp.h>
-#include <netinet/igmp_var.h>
-#include <netinet/ip_mroute.h>
-#include <netinet/udp.h>
-
-#ifndef NTOHL
-#if BYTE_ORDER != BIG_ENDIAN
-#define NTOHL(d) ((d) = ntohl((d)))
-#define NTOHS(d) ((d) = ntohs((u_short)(d)))
-#define HTONL(d) ((d) = htonl((d)))
-#define HTONS(d) ((d) = htons((u_short)(d)))
-#else
-#define NTOHL(d)
-#define NTOHS(d)
-#define HTONL(d)
-#define HTONS(d)
-#endif
-#endif
-
-#ifndef MROUTING
-extern u_long	_ip_mcast_src __P((int vifi));
-extern int	_ip_mforward __P((struct ip *ip, struct ifnet *ifp,
-				  struct mbuf *m, struct ip_moptions *imo));
-extern int	_ip_mrouter_done __P((void));
-extern int	_ip_mrouter_get __P((int cmd, struct socket *so,
-				     struct mbuf **m));
-extern int	_ip_mrouter_set __P((int cmd, struct socket *so,
-				     struct mbuf *m));
-extern int	_mrt_ioctl __P((int req, caddr_t data, struct proc *p));
-
-/*
- * Dummy routines and globals used when multicast routing is not compiled in.
- */
-
-struct socket  *ip_mrouter  = NULL;
-/* static u_int		ip_mrtproto = 0; */
-/* static struct mrtstat	mrtstat; */
-u_int		rsvpdebug = 0;
-
-int
-_ip_mrouter_set(cmd, so, m)
-	int cmd;
-	struct socket *so;
-	struct mbuf *m;
-{
-	return(EOPNOTSUPP);
-}
-
-int (*ip_mrouter_set)(int, struct socket *, struct mbuf *) = _ip_mrouter_set;
-
-
-int
-_ip_mrouter_get(cmd, so, m)
-	int cmd;
-	struct socket *so;
-	struct mbuf **m;
-{
-	return(EOPNOTSUPP);
-}
-
-int (*ip_mrouter_get)(int, struct socket *, struct mbuf **) = _ip_mrouter_get;
-
-int
-_ip_mrouter_done()
-{
-	return(0);
-}
-
-int (*ip_mrouter_done)(void) = _ip_mrouter_done;
-
-int
-_ip_mforward(ip, ifp, m, imo)
-	struct ip *ip;
-	struct ifnet *ifp;
-	struct mbuf *m;
-	struct ip_moptions *imo;
-{
-	return(0);
-}
-
-int (*ip_mforward)(struct ip *, struct ifnet *, struct mbuf *,
-		   struct ip_moptions *) = _ip_mforward;
-
-int
-_mrt_ioctl(int req, caddr_t data, struct proc *p)
-{
-	return EOPNOTSUPP;
-}
-
-int (*mrt_ioctl)(int, caddr_t, struct proc *) = _mrt_ioctl;
-
-void
-rsvp_input(m, iphlen)		/* XXX must fixup manually */
-	struct mbuf *m;
-	int iphlen;
-{
-    /* Can still get packets with rsvp_on = 0 if there is a local member
-     * of the group to which the RSVP packet is addressed.  But in this
-     * case we want to throw the packet away.
-     */
-    if (!rsvp_on) {
-	m_freem(m);
-	return;
-    }
- 
-    if (ip_rsvpd != NULL) {
-	if (rsvpdebug)
-	    printf("rsvp_input: Sending packet up old-style socket\n");
-	rip_input(m, iphlen);
-	return;
-    }
-    /* Drop the packet */
-    m_freem(m);
-}
-
-void ipip_input(struct mbuf *m, int iphlen) { /* XXX must fixup manually */
-	rip_input(m, iphlen);
-}
-
-int (*legal_vif_num)(int) = 0;
-
-/*
- * This should never be called, since IP_MULTICAST_VIF should fail, but
- * just in case it does get called, the code a little lower in ip_output
- * will assign the packet a local address.
- */
-u_long
-_ip_mcast_src(int vifi) { return INADDR_ANY; }
-u_long (*ip_mcast_src)(int) = _ip_mcast_src;
-
-int
-ip_rsvp_vif_init(so, m)
-    struct socket *so;
-    struct mbuf *m;
-{
-    return(EINVAL);
-}
-
-int
-ip_rsvp_vif_done(so, m)
-    struct socket *so;
-    struct mbuf *m;
-{
-    return(EINVAL);
-}
-
-void
-ip_rsvp_force_done(so)
-    struct socket *so;
-{
-    return;
-}
-
-#else /* MROUTING */
-
-#define M_HASCL(m)	((m)->m_flags & M_EXT)
-
-#define INSIZ		sizeof(struct in_addr)
-#define	same(a1, a2) \
-	(bcmp((caddr_t)(a1), (caddr_t)(a2), INSIZ) == 0)
-
-#define MT_MRTABLE MT_RTABLE	/* since nothing else uses it */
-
-/*
- * Globals.  All but ip_mrouter and ip_mrtproto could be static,
- * except for netstat or debugging purposes.
- */
-#ifndef MROUTE_LKM
-struct socket  *ip_mrouter  = NULL;
-struct mrtstat	mrtstat;
-
-int		ip_mrtproto = IGMP_DVMRP;    /* for netstat only */
-#else /* MROUTE_LKM */
-extern void	X_ipip_input __P((struct mbuf *m, int iphlen));
-extern struct mrtstat mrtstat;
-static int ip_mrtproto;
-#endif
-
-#define NO_RTE_FOUND 	0x1
-#define RTE_FOUND	0x2
-
-static struct mbuf    *mfctable[MFCTBLSIZ];
-static u_char		nexpire[MFCTBLSIZ];
-static struct vif	viftable[MAXVIFS];
-static u_int	mrtdebug = 0;	  /* debug level 	*/
-#define		DEBUG_MFC	0x02
-#define		DEBUG_FORWARD	0x04
-#define		DEBUG_EXPIRE	0x08
-#define		DEBUG_XMIT	0x10
-static u_int  	tbfdebug = 0;     /* tbf debug level 	*/
-static u_int	rsvpdebug = 0;	  /* rsvp debug level   */
-
-#define		EXPIRE_TIMEOUT	(hz / 4)	/* 4x / second		*/
-#define		UPCALL_EXPIRE	6		/* number of timeouts	*/
-
-/*
- * Define the token bucket filter structures
- * tbftable -> each vif has one of these for storing info 
- */
-
-static struct tbf tbftable[MAXVIFS];
-#define		TBF_REPROCESS	(hz / 100)	/* 100x / second */
-
-/*
- * 'Interfaces' associated with decapsulator (so we can tell
- * packets that went through it from ones that get reflected
- * by a broken gateway).  These interfaces are never linked into
- * the system ifnet list & no routes point to them.  I.e., packets
- * can't be sent this way.  They only exist as a placeholder for
- * multicast source verification.
- */
-static struct ifnet multicast_decap_if[MAXVIFS];
-
-#define ENCAP_TTL 64
-#define ENCAP_PROTO IPPROTO_IPIP	/* 4 */
-
-/* prototype IP hdr for encapsulated packets */
-static struct ip multicast_encap_iphdr = {
-#if BYTE_ORDER == LITTLE_ENDIAN
-	sizeof(struct ip) >> 2, IPVERSION,
-#else
-	IPVERSION, sizeof(struct ip) >> 2,
-#endif
-	0,				/* tos */
-	sizeof(struct ip),		/* total length */
-	0,				/* id */
-	0,				/* frag offset */
-	ENCAP_TTL, ENCAP_PROTO,	
-	0,				/* checksum */
-};
-
-/*
- * Private variables.
- */
-static vifi_t	   numvifs = 0;
-static int have_encap_tunnel = 0;
-
-/*
- * one-back cache used by ipip_input to locate a tunnel's vif
- * given a datagram's src ip address.
- */
-static u_long last_encap_src;
-static struct vif *last_encap_vif;
-
-static u_long	X_ip_mcast_src __P((int vifi));
-static int	X_ip_mforward __P((struct ip *ip, struct ifnet *ifp, struct mbuf *m, struct ip_moptions *imo));
-static int	X_ip_mrouter_done __P((void));
-static int	X_ip_mrouter_get __P((int cmd, struct socket *so, struct mbuf **m));
-static int	X_ip_mrouter_set __P((int cmd, struct socket *so, struct mbuf *m));
-static int	X_legal_vif_num __P((int vif));
-static int	X_mrt_ioctl __P((int cmd, caddr_t data));
-
-static int get_sg_cnt(struct sioc_sg_req *);
-static int get_vif_cnt(struct sioc_vif_req *);
-static int ip_mrouter_init(struct socket *, struct mbuf *);
-static int add_vif(struct vifctl *);
-static int del_vif(vifi_t *);
-static int add_mfc(struct mfcctl *);
-static int del_mfc(struct mfcctl *);
-static int socket_send(struct socket *, struct mbuf *, struct sockaddr_in *);
-static int get_version(struct mbuf *);
-static int get_assert(struct mbuf *);
-static int set_assert(int *);
-static void expire_upcalls(void *);
-static int ip_mdq(struct mbuf *, struct ifnet *, struct mfc *,
-		  vifi_t);
-static void phyint_send(struct ip *, struct vif *, struct mbuf *);
-static void encap_send(struct ip *, struct vif *, struct mbuf *);
-static void tbf_control(struct vif *, struct mbuf *, struct ip *, u_long);
-static void tbf_queue(struct vif *, struct mbuf *);
-static void tbf_process_q(struct vif *);
-static void tbf_reprocess_q(void *);
-static int tbf_dq_sel(struct vif *, struct ip *);
-static void tbf_send_packet(struct vif *, struct mbuf *);
-static void tbf_update_tokens(struct vif *);
-static int priority(struct vif *, struct ip *);
-void multiencap_decap(struct mbuf *);
-
-/*
- * whether or not special PIM assert processing is enabled.
- */
-static int pim_assert;
-/*
- * Rate limit for assert notification messages, in usec
- */
-#define ASSERT_MSG_TIME		3000000
-
-/*
- * Hash function for a source, group entry
- */
-#define MFCHASH(a, g) MFCHASHMOD(((a) >> 20) ^ ((a) >> 10) ^ (a) ^ \
-			((g) >> 20) ^ ((g) >> 10) ^ (g))
-
-/*
- * Find a route for a given origin IP address and Multicast group address
- * Type of service parameter to be added in the future!!!
- */
-
-#define MFCFIND(o, g, rt) { \
-	register struct mbuf *_mb_rt = mfctable[MFCHASH(o,g)]; \
-	register struct mfc *_rt = NULL; \
-	rt = NULL; \
-	++mrtstat.mrts_mfc_lookups; \
-	while (_mb_rt) { \
-		_rt = mtod(_mb_rt, struct mfc *); \
-		if ((_rt->mfc_origin.s_addr == o) && \
-		    (_rt->mfc_mcastgrp.s_addr == g) && \
-		    (_mb_rt->m_act == NULL)) { \
-			rt = _rt; \
-			break; \
-		} \
-		_mb_rt = _mb_rt->m_next; \
-	} \
-	if (rt == NULL) { \
-		++mrtstat.mrts_mfc_misses; \
-	} \
-}
-
-
-/*
- * Macros to compute elapsed time efficiently
- * Borrowed from Van Jacobson's scheduling code
- */
-#define TV_DELTA(a, b, delta) { \
-	    register int xxs; \
-		\
-	    delta = (a).tv_usec - (b).tv_usec; \
-	    if ((xxs = (a).tv_sec - (b).tv_sec)) { \
-	       switch (xxs) { \
-		      case 2: \
-			  delta += 1000000; \
-			      /* fall through */ \
-		      case 1: \
-			  delta += 1000000; \
-			  break; \
-		      default: \
-			  delta += (1000000 * xxs); \
-	       } \
-	    } \
-}
-
-#define TV_LT(a, b) (((a).tv_usec < (b).tv_usec && \
-	      (a).tv_sec <= (b).tv_sec) || (a).tv_sec < (b).tv_sec)
-
-#ifdef UPCALL_TIMING
-u_long upcall_data[51];
-static void collate(struct timeval *);
-#endif /* UPCALL_TIMING */
-
-
-/*
- * Handle MRT setsockopt commands to modify the multicast routing tables.
- */
-static int
-X_ip_mrouter_set(cmd, so, m)
-    int cmd;
-    struct socket *so;
-    struct mbuf *m;
-{
-   if (cmd != MRT_INIT && so != ip_mrouter) return EACCES;
-
-    switch (cmd) {
-	case MRT_INIT:     return ip_mrouter_init(so, m);
-	case MRT_DONE:     return ip_mrouter_done();
-	case MRT_ADD_VIF:  return add_vif (mtod(m, struct vifctl *));
-	case MRT_DEL_VIF:  return del_vif (mtod(m, vifi_t *));
-	case MRT_ADD_MFC:  return add_mfc (mtod(m, struct mfcctl *));
-	case MRT_DEL_MFC:  return del_mfc (mtod(m, struct mfcctl *));
-	case MRT_ASSERT:   return set_assert(mtod(m, int *));
-	default:             return EOPNOTSUPP;
-    }
-}
-
-#ifndef MROUTE_LKM
-int (*ip_mrouter_set)(int, struct socket *, struct mbuf *) = X_ip_mrouter_set;
-#endif
-
-/*
- * Handle MRT getsockopt commands
- */
-static int
-X_ip_mrouter_get(cmd, so, m)
-    int cmd;
-    struct socket *so;
-    struct mbuf **m;
-{
-    struct mbuf *mb;
-
-    if (so != ip_mrouter) return EACCES;
-
-    *m = mb = m_get(M_WAIT, MT_SOOPTS);
-  
-    switch (cmd) {
-	case MRT_VERSION:   return get_version(mb);
-	case MRT_ASSERT:    return get_assert(mb);
-	default:            return EOPNOTSUPP;
-    }
-}
-
-#ifndef MROUTE_LKM
-int (*ip_mrouter_get)(int, struct socket *, struct mbuf **) = X_ip_mrouter_get;
-#endif
-
-/*
- * Handle ioctl commands to obtain information from the cache
- */
-static int
-X_mrt_ioctl(cmd, data)
-    int cmd;
-    caddr_t data;
-{
-    int error = 0;
-
-    switch (cmd) {
-	case (SIOCGETVIFCNT):
-	    return (get_vif_cnt((struct sioc_vif_req *)data));
-	    break;
-	case (SIOCGETSGCNT):
-	    return (get_sg_cnt((struct sioc_sg_req *)data));
-	    break;
-	default:
-	    return (EINVAL);
-	    break;
-    }
-    return error;
-}
-
-#ifndef MROUTE_LKM
-int (*mrt_ioctl)(int, caddr_t) = X_mrt_ioctl;
-#endif
-
-/*
- * returns the packet, byte, rpf-failure count for the source group provided
- */
-static int
-get_sg_cnt(req)
-    register struct sioc_sg_req *req;
-{
-    register struct mfc *rt;
-    int s;
-
-    s = splnet();
-    MFCFIND(req->src.s_addr, req->grp.s_addr, rt);
-    splx(s);
-    if (rt != NULL) {
-	req->pktcnt = rt->mfc_pkt_cnt;
-	req->bytecnt = rt->mfc_byte_cnt;
-	req->wrong_if = rt->mfc_wrong_if;
-    } else
-	req->pktcnt = req->bytecnt = req->wrong_if = 0xffffffff;
-
-    return 0;
-}
-
-/*
- * returns the input and output packet and byte counts on the vif provided
- */
-static int
-get_vif_cnt(req)
-    register struct sioc_vif_req *req;
-{
-    register vifi_t vifi = req->vifi;
-
-    if (vifi >= numvifs) return EINVAL;
-
-    req->icount = viftable[vifi].v_pkt_in;
-    req->ocount = viftable[vifi].v_pkt_out;
-    req->ibytes = viftable[vifi].v_bytes_in;
-    req->obytes = viftable[vifi].v_bytes_out;
-
-    return 0;
-}
-
-/*
- * Enable multicast routing
- */
-static int
-ip_mrouter_init(so, m)
-	struct socket *so;
-	struct mbuf *m;
-{
-    int *v;
-
-    if (mrtdebug)
-	log(LOG_DEBUG,"ip_mrouter_init: so_type = %d, pr_protocol = %d\n",
-		so->so_type, so->so_proto->pr_protocol);
-
-    if (so->so_type != SOCK_RAW ||
-	so->so_proto->pr_protocol != IPPROTO_IGMP) return EOPNOTSUPP;
-
-    if (!m || (m->m_len != sizeof(int *)))
-	return ENOPROTOOPT;
-
-    v = mtod(m, int *);
-    if (*v != 1)
-	return ENOPROTOOPT;
-
-    if (ip_mrouter != NULL) return EADDRINUSE;
-
-    ip_mrouter = so;
-
-    bzero((caddr_t)mfctable, sizeof(mfctable));
-    bzero((caddr_t)nexpire, sizeof(nexpire));
-
-    pim_assert = 0;
-
-    timeout(expire_upcalls, (caddr_t)NULL, EXPIRE_TIMEOUT);
-
-    if (mrtdebug)
-	log(LOG_DEBUG, "ip_mrouter_init\n");
-
-    return 0;
-}
-
-/*
- * Disable multicast routing
- */
-static int
-X_ip_mrouter_done()
-{
-    vifi_t vifi;
-    int i;
-    struct ifnet *ifp;
-    struct ifreq ifr;
-    struct mbuf *mb_rt;
-    struct mbuf *m;
-    struct rtdetq *rte;
-    int s;
-
-    s = splnet();
-
-    /*
-     * For each phyint in use, disable promiscuous reception of all IP
-     * multicasts.
-     */
-    for (vifi = 0; vifi < numvifs; vifi++) {
-	if (viftable[vifi].v_lcl_addr.s_addr != 0 &&
-	    !(viftable[vifi].v_flags & VIFF_TUNNEL)) {
-	    ((struct sockaddr_in *)&(ifr.ifr_addr))->sin_family = AF_INET;
-	    ((struct sockaddr_in *)&(ifr.ifr_addr))->sin_addr.s_addr
-								= INADDR_ANY;
-	    ifp = viftable[vifi].v_ifp;
-	    (*ifp->if_ioctl)(ifp, SIOCDELMULTI, (caddr_t)&ifr);
-	}
-    }
-    bzero((caddr_t)tbftable, sizeof(tbftable));
-    bzero((caddr_t)viftable, sizeof(viftable));
-    numvifs = 0;
-    pim_assert = 0;
-
-    untimeout(expire_upcalls, (caddr_t)NULL);
-
-    /*
-     * Free all multicast forwarding cache entries.
-     */
-    for (i = 0; i < MFCTBLSIZ; i++) {
-	mb_rt = mfctable[i];
-	while (mb_rt) {
-	    if (mb_rt->m_act != NULL) {
-		while (mb_rt->m_act) {
-		    m = mb_rt->m_act;
-		    mb_rt->m_act = m->m_act;
-		    rte = mtod(m, struct rtdetq *);
-		    m_freem(rte->m);
-		    m_free(m);
-		}
-	    }
-	    mb_rt = m_free(mb_rt);
-	}
-    }
-
-    bzero((caddr_t)mfctable, sizeof(mfctable));
-
-    /*
-     * Reset de-encapsulation cache
-     */
-    last_encap_src = 0;
-    last_encap_vif = NULL;
-    have_encap_tunnel = 0;
- 
-    ip_mrouter = NULL;
-
-    splx(s);
-
-    if (mrtdebug)
-	log(LOG_DEBUG, "ip_mrouter_done\n");
-
-    return 0;
-}
-
-#ifndef MROUTE_LKM
-int (*ip_mrouter_done)(void) = X_ip_mrouter_done;
-#endif
-
-static int
-get_version(mb)
-    struct mbuf *mb;
-{
-    int *v;
-
-    v = mtod(mb, int *);
-
-    *v = 0x0305;	/* XXX !!!! */
-    mb->m_len = sizeof(int);
-
-    return 0;
-}
-
-/*
- * Set PIM assert processing global
- */
-static int
-set_assert(i)
-    int *i;
-{
-    if ((*i != 1) && (*i != 0))
-	return EINVAL;
-
-    pim_assert = *i;
-
-    return 0;
-}
-
-/*
- * Get PIM assert processing global
- */
-static int
-get_assert(m)
-    struct mbuf *m;
-{
-    int *i;
-
-    i = mtod(m, int *);
-
-    *i = pim_assert;
-
-    return 0;
-}
-
-/*
- * Add a vif to the vif table
- */
-static int
-add_vif(vifcp)
-    register struct vifctl *vifcp;
-{
-    register struct vif *vifp = viftable + vifcp->vifc_vifi;
-    static struct sockaddr_in sin = {sizeof sin, AF_INET};
-    struct ifaddr *ifa;
-    struct ifnet *ifp;
-    struct ifreq ifr;
-    int error, s;
-    struct tbf *v_tbf = tbftable + vifcp->vifc_vifi;
-
-    if (vifcp->vifc_vifi >= MAXVIFS)  return EINVAL;
-    if (vifp->v_lcl_addr.s_addr != 0) return EADDRINUSE;
-
-    /* Find the interface with an address in AF_INET family */
-    sin.sin_addr = vifcp->vifc_lcl_addr;
-    ifa = ifa_ifwithaddr((struct sockaddr *)&sin);
-    if (ifa == 0) return EADDRNOTAVAIL;
-    ifp = ifa->ifa_ifp;
-
-    if (vifcp->vifc_flags & VIFF_TUNNEL) {
-	if ((vifcp->vifc_flags & VIFF_SRCRT) == 0) {
-		/*
-		 * An encapsulating tunnel is wanted.  Tell ipip_input() to
-		 * start paying attention to encapsulated packets.
-		 */
-		if (have_encap_tunnel == 0) {
-			have_encap_tunnel = 1;
-			for (s = 0; s < MAXVIFS; ++s) {
-				multicast_decap_if[s].if_name = "mdecap";
-				multicast_decap_if[s].if_unit = s;
-			}
-		}
-		/*
-		 * Set interface to fake encapsulator interface
-		 */
-		ifp = &multicast_decap_if[vifcp->vifc_vifi];
-		/*
-		 * Prepare cached route entry
-		 */
-		bzero(&vifp->v_route, sizeof(vifp->v_route));
-	} else {
-	    log(LOG_ERR, "source routed tunnels not supported\n");
-	    return EOPNOTSUPP;
-	}
-    } else {
-	/* Make sure the interface supports multicast */
-	if ((ifp->if_flags & IFF_MULTICAST) == 0)
-	    return EOPNOTSUPP;
-
-	/* Enable promiscuous reception of all IP multicasts from the if */
-	((struct sockaddr_in *)&(ifr.ifr_addr))->sin_family = AF_INET;
-	((struct sockaddr_in *)&(ifr.ifr_addr))->sin_addr.s_addr = INADDR_ANY;
-	s = splnet();
-	error = (*ifp->if_ioctl)(ifp, SIOCADDMULTI, (caddr_t)&ifr);
-	splx(s);
-	if (error)
-	    return error;
-    }
-
-    s = splnet();
-    /* define parameters for the tbf structure */
-    vifp->v_tbf = v_tbf;
-    GET_TIME(vifp->v_tbf->tbf_last_pkt_t);
-    vifp->v_tbf->tbf_n_tok = 0;
-    vifp->v_tbf->tbf_q_len = 0;
-    vifp->v_tbf->tbf_max_q_len = MAXQSIZE;
-    vifp->v_tbf->tbf_q = vifp->v_tbf->tbf_t = NULL;
-
-    vifp->v_flags     = vifcp->vifc_flags;
-    vifp->v_threshold = vifcp->vifc_threshold;
-    vifp->v_lcl_addr  = vifcp->vifc_lcl_addr;
-    vifp->v_rmt_addr  = vifcp->vifc_rmt_addr;
-    vifp->v_ifp       = ifp;
-    /* scaling up here allows division by 1024 in critical code */
-    vifp->v_rate_limit= vifcp->vifc_rate_limit * 1024 / 1000;
-    vifp->v_rsvp_on   = 0;
-    vifp->v_rsvpd     = NULL;
-    /* initialize per vif pkt counters */
-    vifp->v_pkt_in    = 0;
-    vifp->v_pkt_out   = 0;
-    vifp->v_bytes_in  = 0;
-    vifp->v_bytes_out = 0;
-    splx(s);
-
-    /* Adjust numvifs up if the vifi is higher than numvifs */
-    if (numvifs <= vifcp->vifc_vifi) numvifs = vifcp->vifc_vifi + 1;
-
-    if (mrtdebug)
-	log(LOG_DEBUG, "add_vif #%d, lcladdr %x, %s %x, thresh %x, rate %d\n",
-	    vifcp->vifc_vifi, 
-	    ntohl(vifcp->vifc_lcl_addr.s_addr),
-	    (vifcp->vifc_flags & VIFF_TUNNEL) ? "rmtaddr" : "mask",
-	    ntohl(vifcp->vifc_rmt_addr.s_addr),
-	    vifcp->vifc_threshold,
-	    vifcp->vifc_rate_limit);    
-
-    return 0;
-}
-
-/*
- * Delete a vif from the vif table
- */
-static int
-del_vif(vifip)
-    vifi_t *vifip;
-{
-    register struct vif *vifp = viftable + *vifip;
-    register vifi_t vifi;
-    register struct mbuf *m;
-    struct ifnet *ifp;
-    struct ifreq ifr;
-    int s;
-
-    if (*vifip >= numvifs) return EINVAL;
-    if (vifp->v_lcl_addr.s_addr == 0) return EADDRNOTAVAIL;
-
-    s = splnet();
-
-    if (!(vifp->v_flags & VIFF_TUNNEL)) {
-	((struct sockaddr_in *)&(ifr.ifr_addr))->sin_family = AF_INET;
-	((struct sockaddr_in *)&(ifr.ifr_addr))->sin_addr.s_addr = INADDR_ANY;
-	ifp = vifp->v_ifp;
-	(*ifp->if_ioctl)(ifp, SIOCDELMULTI, (caddr_t)&ifr);
-    }
-
-    if (vifp == last_encap_vif) {
-	last_encap_vif = 0;
-	last_encap_src = 0;
-    }
-
-    /*
-     * Free packets queued at the interface
-     */
-    while (vifp->v_tbf->tbf_q) {
-	m = vifp->v_tbf->tbf_q;
-	vifp->v_tbf->tbf_q = m->m_act;
-	m_freem(m);
-    }
-
-    bzero((caddr_t)vifp->v_tbf, sizeof(*(vifp->v_tbf)));
-    bzero((caddr_t)vifp, sizeof (*vifp));
-
-    /* Adjust numvifs down */
-    for (vifi = numvifs; vifi > 0; vifi--)
-	if (viftable[vifi-1].v_lcl_addr.s_addr != 0) break;
-    numvifs = vifi;
-
-    splx(s);
-
-    if (mrtdebug)
-      log(LOG_DEBUG, "del_vif %d, numvifs %d\n", *vifip, numvifs);
-
-    return 0;
-}
-
-/*
- * Add an mfc entry
- */
-static int
-add_mfc(mfccp)
-    struct mfcctl *mfccp;
-{
-    struct mfc *rt;
-    register struct mbuf *mb_rt;
-    u_long hash;
-    struct mbuf *mb_ntry;
-    struct rtdetq *rte;
-    register u_short nstl;
-    int s;
-    int i;
-
-    MFCFIND(mfccp->mfcc_origin.s_addr, mfccp->mfcc_mcastgrp.s_addr, rt);
-
-    /* If an entry already exists, just update the fields */
-    if (rt) {
-	if (mrtdebug & DEBUG_MFC)
-	    log(LOG_DEBUG,"add_mfc update o %x g %x p %x\n",
-		ntohl(mfccp->mfcc_origin.s_addr),
-		ntohl(mfccp->mfcc_mcastgrp.s_addr),
-		mfccp->mfcc_parent);
-
-	s = splnet();
-	rt->mfc_parent = mfccp->mfcc_parent;
-	for (i = 0; i < numvifs; i++)
-	    rt->mfc_ttls[i] = mfccp->mfcc_ttls[i];
-	splx(s);
-	return 0;
-    }
-
-    /* 
-     * Find the entry for which the upcall was made and update
-     */
-    s = splnet();
-    hash = MFCHASH(mfccp->mfcc_origin.s_addr, mfccp->mfcc_mcastgrp.s_addr);
-    for (mb_rt = mfctable[hash], nstl = 0; mb_rt; mb_rt = mb_rt->m_next) {
-
-	rt = mtod(mb_rt, struct mfc *);
-	if ((rt->mfc_origin.s_addr == mfccp->mfcc_origin.s_addr) &&
-	    (rt->mfc_mcastgrp.s_addr == mfccp->mfcc_mcastgrp.s_addr) &&
-	    (mb_rt->m_act != NULL)) {
-  
-	    if (nstl++)
-		log(LOG_ERR, "add_mfc %s o %x g %x p %x dbx %x\n",
-		    "multiple kernel entries",
-		    ntohl(mfccp->mfcc_origin.s_addr),
-		    ntohl(mfccp->mfcc_mcastgrp.s_addr),
-		    mfccp->mfcc_parent, mb_rt->m_act);
-
-	    if (mrtdebug & DEBUG_MFC)
-		log(LOG_DEBUG,"add_mfc o %x g %x p %x dbg %x\n",
-		    ntohl(mfccp->mfcc_origin.s_addr),
-		    ntohl(mfccp->mfcc_mcastgrp.s_addr),
-		    mfccp->mfcc_parent, mb_rt->m_act);
-
-	    rt->mfc_origin     = mfccp->mfcc_origin;
-	    rt->mfc_mcastgrp   = mfccp->mfcc_mcastgrp;
-	    rt->mfc_parent     = mfccp->mfcc_parent;
-	    for (i = 0; i < numvifs; i++)
-		rt->mfc_ttls[i] = mfccp->mfcc_ttls[i];
-	    /* initialize pkt counters per src-grp */
-	    rt->mfc_pkt_cnt    = 0;
-	    rt->mfc_byte_cnt   = 0;
-	    rt->mfc_wrong_if   = 0;
-	    rt->mfc_last_assert.tv_sec = rt->mfc_last_assert.tv_usec = 0;
-
-	    rt->mfc_expire = 0;	/* Don't clean this guy up */
-	    nexpire[hash]--;
-
-	    /* free packets Qed at the end of this entry */
-	    while (mb_rt->m_act) {
-		mb_ntry = mb_rt->m_act;
-		rte = mtod(mb_ntry, struct rtdetq *);
-/* #ifdef RSVP_ISI */
-		ip_mdq(rte->m, rte->ifp, rt, -1);
-/* #endif */
-		mb_rt->m_act = mb_ntry->m_act;
-		m_freem(rte->m);
-#ifdef UPCALL_TIMING
-		collate(&(rte->t));
-#endif /* UPCALL_TIMING */
-		m_free(mb_ntry);
-	    }
-	}
-    }
-
-    /*
-     * It is possible that an entry is being inserted without an upcall
-     */
-    if (nstl == 0) {
-	if (mrtdebug & DEBUG_MFC)
-	    log(LOG_DEBUG,"add_mfc no upcall h %d o %x g %x p %x\n",
-		hash, ntohl(mfccp->mfcc_origin.s_addr),
-		ntohl(mfccp->mfcc_mcastgrp.s_addr),
-		mfccp->mfcc_parent);
-	
-	for (mb_rt = mfctable[hash]; mb_rt; mb_rt = mb_rt->m_next) {
-	    
-	    rt = mtod(mb_rt, struct mfc *);
-	    if ((rt->mfc_origin.s_addr == mfccp->mfcc_origin.s_addr) &&
-		(rt->mfc_mcastgrp.s_addr == mfccp->mfcc_mcastgrp.s_addr)) {
-
-		rt->mfc_origin     = mfccp->mfcc_origin;
-		rt->mfc_mcastgrp   = mfccp->mfcc_mcastgrp;
-		rt->mfc_parent     = mfccp->mfcc_parent;
-		for (i = 0; i < numvifs; i++)
-		    rt->mfc_ttls[i] = mfccp->mfcc_ttls[i];
-		/* initialize pkt counters per src-grp */
-		rt->mfc_pkt_cnt    = 0;
-		rt->mfc_byte_cnt   = 0;
-		rt->mfc_wrong_if   = 0;
-		rt->mfc_last_assert.tv_sec = rt->mfc_last_assert.tv_usec = 0;
-		if (rt->mfc_expire)
-		    nexpire[hash]--;
-		rt->mfc_expire	   = 0;
-	    }
-	}
-	if (mb_rt == NULL) {
-	    /* no upcall, so make a new entry */
-	    MGET(mb_rt, M_DONTWAIT, MT_MRTABLE);
-	    if (mb_rt == NULL) {
-		splx(s);
-		return ENOBUFS;
-	    }
-	    
-	    rt = mtod(mb_rt, struct mfc *);
-	    
-	    /* insert new entry at head of hash chain */
-	    rt->mfc_origin     = mfccp->mfcc_origin;
-	    rt->mfc_mcastgrp   = mfccp->mfcc_mcastgrp;
-	    rt->mfc_parent     = mfccp->mfcc_parent;
-	    for (i = 0; i < numvifs; i++)
-		    rt->mfc_ttls[i] = mfccp->mfcc_ttls[i];
-	    /* initialize pkt counters per src-grp */
-	    rt->mfc_pkt_cnt    = 0;
-	    rt->mfc_byte_cnt   = 0;
-	    rt->mfc_wrong_if   = 0;
-	    rt->mfc_last_assert.tv_sec = rt->mfc_last_assert.tv_usec = 0;
-	    rt->mfc_expire     = 0;
-	    
-	    /* link into table */
-	    mb_rt->m_next  = mfctable[hash];
-	    mfctable[hash] = mb_rt;
-	    mb_rt->m_act = NULL;
-	}
-    }
-    splx(s);
-    return 0;
-}
-
-#ifdef UPCALL_TIMING
-/*
- * collect delay statistics on the upcalls 
- */
-static void collate(t)
-register struct timeval *t;
-{
-    register u_long d;
-    register struct timeval tp;
-    register u_long delta;
-    
-    GET_TIME(tp);
-    
-    if (TV_LT(*t, tp))
-    {
-	TV_DELTA(tp, *t, delta);
-	
-	d = delta >> 10;
-	if (d > 50)
-	    d = 50;
-	
-	++upcall_data[d];
-    }
-}
-#endif /* UPCALL_TIMING */
-
-/*
- * Delete an mfc entry
- */
-static int
-del_mfc(mfccp)
-    struct mfcctl *mfccp;
-{
-    struct in_addr 	origin;
-    struct in_addr 	mcastgrp;
-    struct mfc 		*rt;
-    struct mbuf 	*mb_rt;
-    struct mbuf 	**nptr;
-    u_long 		hash;
-    int s;
-
-    origin = mfccp->mfcc_origin;
-    mcastgrp = mfccp->mfcc_mcastgrp;
-    hash = MFCHASH(origin.s_addr, mcastgrp.s_addr);
-
-    if (mrtdebug & DEBUG_MFC)
-	log(LOG_DEBUG,"del_mfc orig %x mcastgrp %x\n",
-	    ntohl(origin.s_addr), ntohl(mcastgrp.s_addr));
-
-    s = splnet();
-
-    nptr = &mfctable[hash];
-    while ((mb_rt = *nptr) != NULL) {
-        rt = mtod(mb_rt, struct mfc *);
-	if (origin.s_addr == rt->mfc_origin.s_addr &&
-	    mcastgrp.s_addr == rt->mfc_mcastgrp.s_addr &&
-	    mb_rt->m_act == NULL)
-	    break;
-
-	nptr = &mb_rt->m_next;
-    }
-    if (mb_rt == NULL) {
-	splx(s);
-	return EADDRNOTAVAIL;
-    }
-
-    MFREE(mb_rt, *nptr);
-
-    splx(s);
-
-    return 0;
-}
-
-/*
- * Send a message to mrouted on the multicast routing socket
- */
-static int
-socket_send(s, mm, src)
-	struct socket *s;
-	struct mbuf *mm;
-	struct sockaddr_in *src;
-{
-	if (s) {
-		if (sbappendaddr(&s->so_rcv,
-				 (struct sockaddr *)src,
-				 mm, (struct mbuf *)0) != 0) {
-			sorwakeup(s);
-			return 0;
-		}
-	}
-	m_freem(mm);
-	return -1;
-}
-
-/*
- * IP multicast forwarding function. This function assumes that the packet
- * pointed to by "ip" has arrived on (or is about to be sent to) the interface
- * pointed to by "ifp", and the packet is to be relayed to other networks
- * that have members of the packet's destination IP multicast group.
- *
- * The packet is returned unscathed to the caller, unless it is
- * erroneous, in which case a non-zero return value tells the caller to
- * discard it.
- */
-
-#define IP_HDR_LEN  20	/* # bytes of fixed IP header (excluding options) */
-#define TUNNEL_LEN  12  /* # bytes of IP option for tunnel encapsulation  */
-
-static int
-X_ip_mforward(ip, ifp, m, imo)
-    register struct ip *ip;
-    struct ifnet *ifp;
-    struct mbuf *m;
-    struct ip_moptions *imo;
-{
-    register struct mfc *rt;
-    register u_char *ipoptions;
-    static struct sockaddr_in 	k_igmpsrc	= { sizeof k_igmpsrc, AF_INET };
-    static int srctun = 0;
-    register struct mbuf *mm;
-    int s;
-    vifi_t vifi;
-    struct vif *vifp;
-
-    if (mrtdebug & DEBUG_FORWARD)
-	log(LOG_DEBUG, "ip_mforward: src %x, dst %x, ifp %x\n",
-	    ntohl(ip->ip_src.s_addr), ntohl(ip->ip_dst.s_addr), ifp);
-
-    if (ip->ip_hl < (IP_HDR_LEN + TUNNEL_LEN) >> 2 ||
-	(ipoptions = (u_char *)(ip + 1))[1] != IPOPT_LSRR ) {
-	/*
-	 * Packet arrived via a physical interface or
-	 * an encapsulated tunnel.
-	 */
-    } else {
-	/*
-	 * Packet arrived through a source-route tunnel.
-	 * Source-route tunnels are no longer supported.
-	 */
-	if ((srctun++ % 1000) == 0)
-	    log(LOG_ERR, "ip_mforward: received source-routed packet from %x\n",
-		ntohl(ip->ip_src.s_addr));
-
-	return 1;
-    }
-
-    if ((imo) && ((vifi = imo->imo_multicast_vif) < numvifs)) {
-	if (ip->ip_ttl < 255)
-		ip->ip_ttl++;	/* compensate for -1 in *_send routines */
-	if (rsvpdebug && ip->ip_p == IPPROTO_RSVP) {
-	    vifp = viftable + vifi;
-	    printf("Sending IPPROTO_RSVP from %lx to %lx on vif %d (%s%s%d)\n",
-		ntohl(ip->ip_src.s_addr), ntohl(ip->ip_dst.s_addr), vifi,
-		(vifp->v_flags & VIFF_TUNNEL) ? "tunnel on " : "",
-		vifp->v_ifp->if_name, vifp->v_ifp->if_unit);
-	}
-	return (ip_mdq(m, ifp, NULL, vifi));
-    }
-    if (rsvpdebug && ip->ip_p == IPPROTO_RSVP) {
-	printf("Warning: IPPROTO_RSVP from %lx to %lx without vif option\n",
-	    ntohl(ip->ip_src.s_addr), ntohl(ip->ip_dst.s_addr));
-	if(!imo)
-		printf("In fact, no options were specified at all\n");
-    }
-
-    /*
-     * Don't forward a packet with time-to-live of zero or one,
-     * or a packet destined to a local-only group.
-     */
-    if (ip->ip_ttl <= 1 ||
-	ntohl(ip->ip_dst.s_addr) <= INADDR_MAX_LOCAL_GROUP)
-	return 0;
-
-    /*
-     * Determine forwarding vifs from the forwarding cache table
-     */
-    s = splnet();
-    MFCFIND(ip->ip_src.s_addr, ip->ip_dst.s_addr, rt);
-
-    /* Entry exists, so forward if necessary */
-    if (rt != NULL) {
-	splx(s);
-	return (ip_mdq(m, ifp, rt, -1));
-    } else {
-	/*
-	 * If we don't have a route for packet's origin,
-	 * Make a copy of the packet &
-	 * send message to routing daemon
-	 */
-
-	register struct mbuf *mb_rt;
-	register struct mbuf *mb_ntry;
-	register struct mbuf *mb0;
-	register struct rtdetq *rte;
-	register struct mbuf *rte_m;
-	register u_long hash;
-	register int npkts;
-	int hlen = ip->ip_hl << 2;
-#ifdef UPCALL_TIMING
-	struct timeval tp;
-
-	GET_TIME(tp);
-#endif
-
-	mrtstat.mrts_no_route++;
-	if (mrtdebug & (DEBUG_FORWARD | DEBUG_MFC))
-	    log(LOG_DEBUG, "ip_mforward: no rte s %x g %x\n",
-		ntohl(ip->ip_src.s_addr),
-		ntohl(ip->ip_dst.s_addr));
-
-	/*
-	 * Allocate mbufs early so that we don't do extra work if we are
-	 * just going to fail anyway.  Make sure to pullup the header so
-	 * that other people can't step on it.
-	 */
-	MGET(mb_ntry, M_DONTWAIT, MT_DATA);
-	if (mb_ntry == NULL) {
-	    splx(s);
-	    return ENOBUFS;
-	}
-	mb0 = m_copy(m, 0, M_COPYALL);
-	if (mb0 && (M_HASCL(mb0) || mb0->m_len < hlen))
-	    mb0 = m_pullup(mb0, hlen);
-	if (mb0 == NULL) {
-	    m_free(mb_ntry);
-	    splx(s);
-	    return ENOBUFS;
-	}
-
-	/* is there an upcall waiting for this packet? */
-	hash = MFCHASH(ip->ip_src.s_addr, ip->ip_dst.s_addr);
-	for (mb_rt = mfctable[hash]; mb_rt; mb_rt = mb_rt->m_next) {
-	    rt = mtod(mb_rt, struct mfc *);
-	    if ((ip->ip_src.s_addr == rt->mfc_origin.s_addr) &&
-		(ip->ip_dst.s_addr == rt->mfc_mcastgrp.s_addr) &&
-		(mb_rt->m_act != NULL))
-		break;
-	}
-
-	if (mb_rt == NULL) {
-	    int i;
-	    struct igmpmsg *im;
-
-	    /* no upcall, so make a new entry */
-	    MGET(mb_rt, M_DONTWAIT, MT_MRTABLE);
-	    if (mb_rt == NULL) {
-		m_free(mb_ntry);
-		m_freem(mb0);
-		splx(s);
-		return ENOBUFS;
-	    }
-	    /* Make a copy of the header to send to the user level process */
-	    mm = m_copy(mb0, 0, hlen);
-	    if (mm == NULL) {
-		m_free(mb_ntry);
-		m_freem(mb0);
-		m_free(mb_rt);
-		splx(s);
-		return ENOBUFS;
-	    }
-
-	    /* 
-	     * Send message to routing daemon to install 
-	     * a route into the kernel table
-	     */
-	    k_igmpsrc.sin_addr = ip->ip_src;
-	    
-	    im = mtod(mm, struct igmpmsg *);
-	    im->im_msgtype	= IGMPMSG_NOCACHE;
-	    im->im_mbz		= 0;
-
-	    mrtstat.mrts_upcalls++;
-
-	    if (socket_send(ip_mrouter, mm, &k_igmpsrc) < 0) {
-		log(LOG_WARNING, "ip_mforward: ip_mrouter socket queue full\n");
-		++mrtstat.mrts_upq_sockfull;
-		m_free(mb_ntry);
-		m_freem(mb0);
-		m_free(mb_rt);
-		splx(s);
-		return ENOBUFS;
-	    }
-
-	    rt = mtod(mb_rt, struct mfc *);
-
-	    /* insert new entry at head of hash chain */
-	    rt->mfc_origin.s_addr     = ip->ip_src.s_addr;
-	    rt->mfc_mcastgrp.s_addr   = ip->ip_dst.s_addr;
-	    rt->mfc_expire	      = UPCALL_EXPIRE;
-	    nexpire[hash]++;
-	    for (i = 0; i < numvifs; i++)
-		rt->mfc_ttls[i] = 0;
-	    rt->mfc_parent = -1;
-
-	    /* link into table */
-	    mb_rt->m_next  = mfctable[hash];
-	    mfctable[hash] = mb_rt;
-	    mb_rt->m_act = NULL;
-
-	    rte_m = mb_rt;
-	} else {
-	    /* determine if q has overflowed */
-	    for (rte_m = mb_rt, npkts = 0; rte_m->m_act; rte_m = rte_m->m_act)
-		npkts++;
-
-	    if (npkts > MAX_UPQ) {
-		mrtstat.mrts_upq_ovflw++;
-		m_free(mb_ntry);
-		m_freem(mb0);
-		splx(s);
-		return 0;
-	    }
-	}
-
-	mb_ntry->m_act = NULL;
-	rte = mtod(mb_ntry, struct rtdetq *);
-
-	rte->m 			= mb0;
-	rte->ifp 		= ifp;
-#ifdef UPCALL_TIMING
-	rte->t			= tp;
-#endif
-
-	/* Add this entry to the end of the queue */
-	rte_m->m_act		= mb_ntry;
-
-	splx(s);
-
-	return 0;
-    }		
-}
-
-#ifndef MROUTE_LKM
-int (*ip_mforward)(struct ip *, struct ifnet *, struct mbuf *,
-		   struct ip_moptions *) = X_ip_mforward;
-#endif
-
-/*
- * Clean up the cache entry if upcall is not serviced
- */
-static void
-expire_upcalls(void *unused)
-{
-    struct mbuf *mb_rt, *m, **nptr;
-    struct rtdetq *rte;
-    struct mfc *mfc;
-    int i;
-    int s;
-
-    s = splnet();
-    for (i = 0; i < MFCTBLSIZ; i++) {
-	if (nexpire[i] == 0)
-	    continue;
-	nptr = &mfctable[i];
-	for (mb_rt = *nptr; mb_rt != NULL; mb_rt = *nptr) {
-	    mfc = mtod(mb_rt, struct mfc *);
-
-	    /*
-	     * Skip real cache entries
-	     * Make sure it wasn't marked to not expire (shouldn't happen)
-	     * If it expires now
-	     */
-	    if (mb_rt->m_act != NULL &&
-	        mfc->mfc_expire != 0 &&
-		--mfc->mfc_expire == 0) {
-		if (mrtdebug & DEBUG_EXPIRE)
-		    log(LOG_DEBUG, "expire_upcalls: expiring (%x %x)\n",
-			ntohl(mfc->mfc_origin.s_addr),
-			ntohl(mfc->mfc_mcastgrp.s_addr));
-		/*
-		 * drop all the packets
-		 * free the mbuf with the pkt, if, timing info
-		 */
-		while (mb_rt->m_act) {
-		    m = mb_rt->m_act;
-		    mb_rt->m_act = m->m_act;
-	     
-		    rte = mtod(m, struct rtdetq *);
-		    m_freem(rte->m);
-		    m_free(m);
-		}
-		++mrtstat.mrts_cache_cleanups;
-		nexpire[i]--;
-
-		MFREE(mb_rt, *nptr);
-	    } else {
-		nptr = &mb_rt->m_next;
-	    }
-	}
-    }
-    splx(s);
-    timeout(expire_upcalls, (caddr_t)NULL, EXPIRE_TIMEOUT);
-}
-
-/*
- * Packet forwarding routine once entry in the cache is made
- */
-static int
-ip_mdq(m, ifp, rt, xmt_vif)
-    register struct mbuf *m;
-    register struct ifnet *ifp;
-    register struct mfc *rt;
-    register vifi_t xmt_vif;
-{
-    register struct ip  *ip = mtod(m, struct ip *);
-    register vifi_t vifi;
-    register struct vif *vifp;
-    register int plen = ntohs(ip->ip_len);
-
-/*
- * Macro to send packet on vif.  Since RSVP packets don't get counted on
- * input, they shouldn't get counted on output, so statistics keeping is
- * seperate.
- */
-#define MC_SEND(ip,vifp,m) {                             \
-                if ((vifp)->v_flags & VIFF_TUNNEL)  	 \
-                    encap_send((ip), (vifp), (m));       \
-                else                                     \
-                    phyint_send((ip), (vifp), (m));      \
-}
-
-    /*
-     * If xmt_vif is not -1, send on only the requested vif.
-     *
-     * (since vifi_t is u_short, -1 becomes MAXUSHORT, which > numvifs.)
-     */
-    if (xmt_vif < numvifs) {
-	MC_SEND(ip, viftable + xmt_vif, m);
-	return 1;
-    }
-
-    /*
-     * Don't forward if it didn't arrive from the parent vif for its origin.
-     */
-    vifi = rt->mfc_parent;
-    if ((vifi >= numvifs) || (viftable[vifi].v_ifp != ifp)) {
-	/* came in the wrong interface */
-	if (mrtdebug & DEBUG_FORWARD)
-	    log(LOG_DEBUG, "wrong if: ifp %x vifi %d vififp %x\n",
-		ifp, vifi, viftable[vifi].v_ifp); 
-	++mrtstat.mrts_wrong_if;
-	++rt->mfc_wrong_if;
-	/*
-	 * If we are doing PIM assert processing, and we are forwarding
-	 * packets on this interface, and it is a broadcast medium
-	 * interface (and not a tunnel), send a message to the routing daemon.
-	 */
-	if (pim_assert && rt->mfc_ttls[vifi] &&
-		(ifp->if_flags & IFF_BROADCAST) &&
-		!(viftable[vifi].v_flags & VIFF_TUNNEL)) {
-	    struct sockaddr_in k_igmpsrc;
-	    struct mbuf *mm;
-	    struct igmpmsg *im;
-	    int hlen = ip->ip_hl << 2;
-	    struct timeval now;
-	    register u_long delta;
-
-	    GET_TIME(now);
-
-	    TV_DELTA(rt->mfc_last_assert, now, delta);
-
-	    if (delta > ASSERT_MSG_TIME) {
-		mm = m_copy(m, 0, hlen);
-		if (mm && (M_HASCL(mm) || mm->m_len < hlen))
-		    mm = m_pullup(mm, hlen);
-		if (mm == NULL) {
-		    return ENOBUFS;
-		}
-
-		rt->mfc_last_assert = now;
-
-		im = mtod(mm, struct igmpmsg *);
-		im->im_msgtype	= IGMPMSG_WRONGVIF;
-		im->im_mbz		= 0;
-		im->im_vif		= vifi;
-
-		k_igmpsrc.sin_addr = im->im_src;
-
-		socket_send(ip_mrouter, mm, &k_igmpsrc);
-	    }
-	}
-	return 0;
-    }
-
-    /* If I sourced this packet, it counts as output, else it was input. */
-    if (ip->ip_src.s_addr == viftable[vifi].v_lcl_addr.s_addr) {
-	viftable[vifi].v_pkt_out++;
-	viftable[vifi].v_bytes_out += plen;
-    } else {
-	viftable[vifi].v_pkt_in++;
-	viftable[vifi].v_bytes_in += plen;
-    }
-    rt->mfc_pkt_cnt++;
-    rt->mfc_byte_cnt += plen;
-
-    /*
-     * For each vif, decide if a copy of the packet should be forwarded.
-     * Forward if:
-     *		- the ttl exceeds the vif's threshold
-     *		- there are group members downstream on interface
-     */
-    for (vifp = viftable, vifi = 0; vifi < numvifs; vifp++, vifi++)
-	if ((rt->mfc_ttls[vifi] > 0) &&
-	    (ip->ip_ttl > rt->mfc_ttls[vifi])) {
-	    vifp->v_pkt_out++;
-	    vifp->v_bytes_out += plen;
-	    MC_SEND(ip, vifp, m);
-	}
-
-    return 0;
-}
-
-/*
- * check if a vif number is legal/ok. This is used by ip_output, to export
- * numvifs there, 
- */
-static int
-X_legal_vif_num(vif)
-    int vif;
-{
-    if (vif >= 0 && vif < numvifs)
-       return(1);
-    else
-       return(0);
-}
-
-#ifndef MROUTE_LKM
-int (*legal_vif_num)(int) = X_legal_vif_num;
-#endif
-
-/*
- * Return the local address used by this vif
- */
-static u_long
-X_ip_mcast_src(vifi)
-    int vifi;
-{
-    if (vifi >= 0 && vifi < numvifs)
-	return viftable[vifi].v_lcl_addr.s_addr;
-    else
-	return INADDR_ANY;
-}
-
-#ifndef MROUTE_LKM
-u_long (*ip_mcast_src)(int) = X_ip_mcast_src;
-#endif
-
-static void
-phyint_send(ip, vifp, m)
-    struct ip *ip;
-    struct vif *vifp;
-    struct mbuf *m;
-{
-    register struct mbuf *mb_copy;
-    register int hlen = ip->ip_hl << 2;
-
-    /*
-     * Make a new reference to the packet; make sure that
-     * the IP header is actually copied, not just referenced,
-     * so that ip_output() only scribbles on the copy.
-     */
-    mb_copy = m_copy(m, 0, M_COPYALL);
-    if (mb_copy && (M_HASCL(mb_copy) || mb_copy->m_len < hlen))
-	mb_copy = m_pullup(mb_copy, hlen);
-    if (mb_copy == NULL)
-	return;
-
-    if (vifp->v_rate_limit <= 0)
-	tbf_send_packet(vifp, mb_copy);
-    else
-	tbf_control(vifp, mb_copy, mtod(mb_copy, struct ip *), ip->ip_len);
-}
-
-static void
-encap_send(ip, vifp, m)
-    register struct ip *ip;
-    register struct vif *vifp;
-    register struct mbuf *m;
-{
-    register struct mbuf *mb_copy;
-    register struct ip *ip_copy;
-    register int i, len = ip->ip_len;
-
-    /*
-     * copy the old packet & pullup it's IP header into the
-     * new mbuf so we can modify it.  Try to fill the new
-     * mbuf since if we don't the ethernet driver will.
-     */
-    MGETHDR(mb_copy, M_DONTWAIT, MT_HEADER);
-    if (mb_copy == NULL)
-	return;
-    mb_copy->m_data += max_linkhdr;
-    mb_copy->m_len = sizeof(multicast_encap_iphdr);
-
-    if ((mb_copy->m_next = m_copy(m, 0, M_COPYALL)) == NULL) {
-	m_freem(mb_copy);
-	return;
-    }
-    i = MHLEN - M_LEADINGSPACE(mb_copy);
-    if (i > len)
-	i = len;
-    mb_copy = m_pullup(mb_copy, i);
-    if (mb_copy == NULL)
-	return;
-    mb_copy->m_pkthdr.len = len + sizeof(multicast_encap_iphdr);
-
-    /*
-     * fill in the encapsulating IP header.
-     */
-    ip_copy = mtod(mb_copy, struct ip *);
-    *ip_copy = multicast_encap_iphdr;
-    ip_copy->ip_id = htons(ip_id++);
-    ip_copy->ip_len += len;
-    ip_copy->ip_src = vifp->v_lcl_addr;
-    ip_copy->ip_dst = vifp->v_rmt_addr;
-
-    /*
-     * turn the encapsulated IP header back into a valid one.
-     */
-    ip = (struct ip *)((caddr_t)ip_copy + sizeof(multicast_encap_iphdr));
-    --ip->ip_ttl;
-    HTONS(ip->ip_len);
-    HTONS(ip->ip_off);
-    ip->ip_sum = 0;
-    mb_copy->m_data += sizeof(multicast_encap_iphdr);
-    ip->ip_sum = in_cksum(mb_copy, ip->ip_hl << 2);
-    mb_copy->m_data -= sizeof(multicast_encap_iphdr);
-
-    if (vifp->v_rate_limit <= 0)
-	tbf_send_packet(vifp, mb_copy);
-    else
-	tbf_control(vifp, mb_copy, ip, ip_copy->ip_len);
-}
-
-/*
- * De-encapsulate a packet and feed it back through ip input (this
- * routine is called whenever IP gets a packet with proto type
- * ENCAP_PROTO and a local destination address).
- */
-void
-#ifdef MROUTE_LKM
-X_ipip_input(m, iphlen)
-#else
-ipip_input(m, iphlen)
-#endif
-	register struct mbuf *m;
-	int iphlen;
-{
-    struct ifnet *ifp = m->m_pkthdr.rcvif;
-    register struct ip *ip = mtod(m, struct ip *);
-    register int hlen = ip->ip_hl << 2;
-    register int s;
-    register struct ifqueue *ifq;
-    register struct vif *vifp;
-
-    if (!have_encap_tunnel) {
-	    rip_input(m, iphlen);
-	    return;
-    }
-    /*
-     * dump the packet if it's not to a multicast destination or if
-     * we don't have an encapsulating tunnel with the source.
-     * Note:  This code assumes that the remote site IP address
-     * uniquely identifies the tunnel (i.e., that this site has
-     * at most one tunnel with the remote site).
-     */
-    if (! IN_MULTICAST(ntohl(((struct ip *)((char *)ip + hlen))->ip_dst.s_addr))) {
-	++mrtstat.mrts_bad_tunnel;
-	m_freem(m);
-	return;
-    }
-    if (ip->ip_src.s_addr != last_encap_src) {
-	register struct vif *vife;
-	
-	vifp = viftable;
-	vife = vifp + numvifs;
-	last_encap_src = ip->ip_src.s_addr;
-	last_encap_vif = 0;
-	for ( ; vifp < vife; ++vifp)
-	    if (vifp->v_rmt_addr.s_addr == ip->ip_src.s_addr) {
-		if ((vifp->v_flags & (VIFF_TUNNEL|VIFF_SRCRT))
-		    == VIFF_TUNNEL)
-		    last_encap_vif = vifp;
-		break;
-	    }
-    }
-    if ((vifp = last_encap_vif) == 0) {
-	last_encap_src = 0;
-	mrtstat.mrts_cant_tunnel++; /*XXX*/
-	m_freem(m);
-	if (mrtdebug)
-          log(LOG_DEBUG, "ip_mforward: no tunnel with %x\n",
-		ntohl(ip->ip_src.s_addr));
-	return;
-    }
-    ifp = vifp->v_ifp;
-
-    if (hlen > IP_HDR_LEN)
-      ip_stripoptions(m, (struct mbuf *) 0);
-    m->m_data += IP_HDR_LEN;
-    m->m_len -= IP_HDR_LEN;
-    m->m_pkthdr.len -= IP_HDR_LEN;
-    m->m_pkthdr.rcvif = ifp;
-
-    ifq = &ipintrq;
-    s = splimp();
-    if (IF_QFULL(ifq)) {
-	IF_DROP(ifq);
-	m_freem(m);
-    } else {
-	IF_ENQUEUE(ifq, m);
-	/*
-	 * normally we would need a "schednetisr(NETISR_IP)"
-	 * here but we were called by ip_input and it is going
-	 * to loop back & try to dequeue the packet we just
-	 * queued as soon as we return so we avoid the
-	 * unnecessary software interrrupt.
-	 */
-    }
-    splx(s);
-}
-
-/*
- * Token bucket filter module
- */
-
-static void
-tbf_control(vifp, m, ip, p_len)
-	register struct vif *vifp;
-	register struct mbuf *m;
-	register struct ip *ip;
-	register u_long p_len;
-{
-    register struct tbf *t = vifp->v_tbf;
-
-    if (p_len > MAX_BKT_SIZE) {
-	/* drop if packet is too large */
-	mrtstat.mrts_pkt2large++;
-	m_freem(m);
-	return;
-    }
-
-    tbf_update_tokens(vifp);
-
-    /* if there are enough tokens, 
-     * and the queue is empty,
-     * send this packet out
-     */
-
-    if (t->tbf_q_len == 0) {
-	/* queue empty, send packet if enough tokens */
-	if (p_len <= t->tbf_n_tok) {
-	    t->tbf_n_tok -= p_len;
-	    tbf_send_packet(vifp, m);
-	} else {
-	    /* queue packet and timeout till later */
-	    tbf_queue(vifp, m);
-	    timeout(tbf_reprocess_q, (caddr_t)vifp, TBF_REPROCESS);
-	}
-    } else if (t->tbf_q_len < t->tbf_max_q_len) {
-	/* finite queue length, so queue pkts and process queue */
-	tbf_queue(vifp, m);
-	tbf_process_q(vifp);
-    } else {
-	/* queue length too much, try to dq and queue and process */
-	if (!tbf_dq_sel(vifp, ip)) {
-	    mrtstat.mrts_q_overflow++;
-	    m_freem(m);
-	    return;
-	} else {
-	    tbf_queue(vifp, m);
-	    tbf_process_q(vifp);
-	}
-    }
-    return;
-}
-
-/* 
- * adds a packet to the queue at the interface
- */
-static void
-tbf_queue(vifp, m) 
-	register struct vif *vifp;
-	register struct mbuf *m;
-{
-    register int s = splnet();
-    register struct tbf *t = vifp->v_tbf;
-
-    if (t->tbf_t == NULL) {
-	/* Queue was empty */
-	t->tbf_q = m;
-    } else {
-	/* Insert at tail */
-	t->tbf_t->m_act = m;
-    }
-
-    /* Set new tail pointer */
-    t->tbf_t = m;
-
-#ifdef DIAGNOSTIC
-    /* Make sure we didn't get fed a bogus mbuf */
-    if (m->m_act)
-	panic("tbf_queue: m_act");
-#endif
-    m->m_act = NULL;
-
-    t->tbf_q_len++;
-
-    splx(s);
-}
-
-
-/* 
- * processes the queue at the interface
- */
-static void
-tbf_process_q(vifp)
-    register struct vif *vifp;
-{
-    register struct mbuf *m;
-    register int len;
-    register int s = splnet();
-    register struct tbf *t = vifp->v_tbf;
-
-    /* loop through the queue at the interface and send as many packets
-     * as possible
-     */
-    while (t->tbf_q_len > 0) {
-	m = t->tbf_q;
-
-	len = mtod(m, struct ip *)->ip_len;
-
-	/* determine if the packet can be sent */
-	if (len <= t->tbf_n_tok) {
-	    /* if so,
-	     * reduce no of tokens, dequeue the packet,
-	     * send the packet.
-	     */
-	    t->tbf_n_tok -= len;
-
-	    t->tbf_q = m->m_act;
-	    if (--t->tbf_q_len == 0)
-		t->tbf_t = NULL;
-
-	    m->m_act = NULL;
-	    tbf_send_packet(vifp, m);
-
-	} else break;
-    }
-    splx(s);
-}
-
-static void
-tbf_reprocess_q(xvifp)
-	void *xvifp;
-{
-    register struct vif *vifp = xvifp;
-    if (ip_mrouter == NULL) 
-	return;
-
-    tbf_update_tokens(vifp);
-
-    tbf_process_q(vifp);
-
-    if (vifp->v_tbf->tbf_q_len)
-	timeout(tbf_reprocess_q, (caddr_t)vifp, TBF_REPROCESS);
-}
-
-/* function that will selectively discard a member of the queue
- * based on the precedence value and the priority
- */
-static int
-tbf_dq_sel(vifp, ip)
-    register struct vif *vifp;
-    register struct ip *ip;
-{
-    register int s = splnet();
-    register u_int p;
-    register struct mbuf *m, *last;
-    register struct mbuf **np;
-    register struct tbf *t = vifp->v_tbf;
-
-    p = priority(vifp, ip);
-
-    np = &t->tbf_q;
-    last = NULL;
-    while ((m = *np) != NULL) {
-	if (p > priority(vifp, mtod(m, struct ip *))) {
-	    *np = m->m_act;
-	    /* If we're removing the last packet, fix the tail pointer */
-	    if (m == t->tbf_t)
-		t->tbf_t = last;
-	    m_freem(m);
-	    /* it's impossible for the queue to be empty, but
-	     * we check anyway. */
-	    if (--t->tbf_q_len == 0)
-		t->tbf_t = NULL;
-	    splx(s);
-	    mrtstat.mrts_drop_sel++;
-	    return(1);
-	}
-	np = &m->m_act;
-	last = m;
-    }
-    splx(s);
-    return(0);
-}
-
-static void
-tbf_send_packet(vifp, m)
-    register struct vif *vifp;
-    register struct mbuf *m;
-{
-    struct ip_moptions imo;
-    int error;
-    static struct route ro;
-    int s = splnet();
-
-    if (vifp->v_flags & VIFF_TUNNEL) {
-	/* If tunnel options */
-	ip_output(m, (struct mbuf *)0, &vifp->v_route,
-		  IP_FORWARDING, (struct ip_moptions *)0);
-    } else {
-	imo.imo_multicast_ifp  = vifp->v_ifp;
-	imo.imo_multicast_ttl  = mtod(m, struct ip *)->ip_ttl - 1;
-	imo.imo_multicast_loop = 1;
-	imo.imo_multicast_vif  = -1;
-
-	/*
-	 * Re-entrancy should not be a problem here, because
-	 * the packets that we send out and are looped back at us
-	 * should get rejected because they appear to come from
-	 * the loopback interface, thus preventing looping.
-	 */
-	error = ip_output(m, (struct mbuf *)0, &ro,
-			  IP_FORWARDING, &imo);
-
-	if (mrtdebug & DEBUG_XMIT)
-	    log(LOG_DEBUG, "phyint_send on vif %d err %d\n", 
-		vifp - viftable, error);
-    }
-    splx(s);
-}
-
-/* determine the current time and then
- * the elapsed time (between the last time and time now)
- * in milliseconds & update the no. of tokens in the bucket
- */
-static void
-tbf_update_tokens(vifp)
-    register struct vif *vifp;
-{
-    struct timeval tp;
-    register u_long tm;
-    register int s = splnet();
-    register struct tbf *t = vifp->v_tbf;
-
-    GET_TIME(tp);
-
-    TV_DELTA(tp, t->tbf_last_pkt_t, tm);
-
-    /*
-     * This formula is actually
-     * "time in seconds" * "bytes/second".
-     *
-     * (tm / 1000000) * (v_rate_limit * 1000 * (1000/1024) / 8)
-     *
-     * The (1000/1024) was introduced in add_vif to optimize
-     * this divide into a shift.
-     */
-    t->tbf_n_tok += tm * vifp->v_rate_limit / 1024 / 8;
-    t->tbf_last_pkt_t = tp;
-
-    if (t->tbf_n_tok > MAX_BKT_SIZE)
-	t->tbf_n_tok = MAX_BKT_SIZE;
-
-    splx(s);
-}
-
-static int
-priority(vifp, ip)
-    register struct vif *vifp;
-    register struct ip *ip;
-{
-    register int prio;
-
-    /* temporary hack; may add general packet classifier some day */
-
-    /*
-     * The UDP port space is divided up into four priority ranges:
-     * [0, 16384)     : unclassified - lowest priority
-     * [16384, 32768) : audio - highest priority
-     * [32768, 49152) : whiteboard - medium priority
-     * [49152, 65536) : video - low priority
-     */
-    if (ip->ip_p == IPPROTO_UDP) {
-	struct udphdr *udp = (struct udphdr *)(((char *)ip) + (ip->ip_hl << 2));
-	switch (ntohs(udp->uh_dport) & 0xc000) {
-	    case 0x4000:
-		prio = 70;
-		break;
-	    case 0x8000:
-		prio = 60;
-		break;
-	    case 0xc000:
-		prio = 55;
-		break;
-	    default:
-		prio = 50;
-		break;
-	}
-	if (tbfdebug > 1)
-		log(LOG_DEBUG, "port %x prio%d\n", ntohs(udp->uh_dport), prio);
-    } else {
-	    prio = 50;
-    }
-    return prio;
-}
-
-/*
- * End of token bucket filter modifications 
- */
-
-int
-ip_rsvp_vif_init(so, m)
-    struct socket *so;
-    struct mbuf *m;
-{
-    int i;
-    register int s;
-
-    if (rsvpdebug)
-	printf("ip_rsvp_vif_init: so_type = %d, pr_protocol = %d\n",
-	       so->so_type, so->so_proto->pr_protocol);
-
-    if (so->so_type != SOCK_RAW || so->so_proto->pr_protocol != IPPROTO_RSVP)
-	return EOPNOTSUPP;
-
-    /* Check mbuf. */
-    if (m == NULL || m->m_len != sizeof(int)) {
-	return EINVAL;
-    }
-    i = *(mtod(m, int *));
- 
-    if (rsvpdebug)
-	printf("ip_rsvp_vif_init: vif = %d rsvp_on = %d\n",i,rsvp_on);
- 
-    s = splnet();
-
-    /* Check vif. */
-    if (!legal_vif_num(i)) {
-	splx(s);
-	return EADDRNOTAVAIL;
-    }
-
-    /* Check if socket is available. */
-    if (viftable[i].v_rsvpd != NULL) {
-	splx(s);
-	return EADDRINUSE;
-    }
-
-    viftable[i].v_rsvpd = so;
-    /* This may seem silly, but we need to be sure we don't over-increment
-     * the RSVP counter, in case something slips up.
-     */
-    if (!viftable[i].v_rsvp_on) {
-	viftable[i].v_rsvp_on = 1;
-	rsvp_on++;
-    }
-
-    splx(s);
-    return 0;
-}
-
-int
-ip_rsvp_vif_done(so, m)
-    struct socket *so;
-    struct mbuf *m;
-{
-	int i;
-	register int s;
- 
-    if (rsvpdebug)
-	printf("ip_rsvp_vif_done: so_type = %d, pr_protocol = %d\n",
-	       so->so_type, so->so_proto->pr_protocol);
- 
-    if (so->so_type != SOCK_RAW || so->so_proto->pr_protocol != IPPROTO_RSVP)
-	return EOPNOTSUPP;
- 
-    /* Check mbuf. */
-    if (m == NULL || m->m_len != sizeof(int)) {
-	    return EINVAL;
-    }
-    i = *(mtod(m, int *));
- 
-    s = splnet();
- 
-    /* Check vif. */
-    if (!legal_vif_num(i)) {
-	splx(s);
-        return EADDRNOTAVAIL;
-    }
-
-    if (rsvpdebug)
-	printf("ip_rsvp_vif_done: v_rsvpd = %p so = %p\n",
-	       viftable[i].v_rsvpd, so);
-
-    viftable[i].v_rsvpd = NULL;
-    /* This may seem silly, but we need to be sure we don't over-decrement
-     * the RSVP counter, in case something slips up.
-     */
-    if (viftable[i].v_rsvp_on) {
-	viftable[i].v_rsvp_on = 0;
-	rsvp_on--;
-    }
-
-    splx(s);
-    return 0;
-}
-
-void
-ip_rsvp_force_done(so)
-    struct socket *so;
-{
-    int vifi;
-    register int s;
-
-    /* Don't bother if it is not the right type of socket. */
-    if (so->so_type != SOCK_RAW || so->so_proto->pr_protocol != IPPROTO_RSVP)
-	return;
-
-    s = splnet();
-
-    /* The socket may be attached to more than one vif...this
-     * is perfectly legal.
-     */
-    for (vifi = 0; vifi < numvifs; vifi++) {
-	if (viftable[vifi].v_rsvpd == so) {
-	    viftable[vifi].v_rsvpd = NULL;
-	    /* This may seem silly, but we need to be sure we don't
-	     * over-decrement the RSVP counter, in case something slips up.
-	     */
-	    if (viftable[vifi].v_rsvp_on) {
-		viftable[vifi].v_rsvp_on = 0;
-		rsvp_on--;
-	    }
-	}
-    }
-
-    splx(s);
-    return;
-}
-
-void
-rsvp_input(m, iphlen)
-	struct mbuf *m;
-	int iphlen;
-{
-    int vifi;
-    register struct ip *ip = mtod(m, struct ip *);
-    static struct sockaddr_in rsvp_src = { sizeof rsvp_src, AF_INET };
-    register int s;
-    struct ifnet *ifp;
-
-    if (rsvpdebug)
-	printf("rsvp_input: rsvp_on %d\n",rsvp_on);
-
-    /* Can still get packets with rsvp_on = 0 if there is a local member
-     * of the group to which the RSVP packet is addressed.  But in this
-     * case we want to throw the packet away.
-     */
-    if (!rsvp_on) {
-	m_freem(m);
-	return;
-    }
-
-    /* If the old-style non-vif-associated socket is set, then use
-     * it and ignore the new ones.
-     */
-    if (ip_rsvpd != NULL) {
-	if (rsvpdebug)
-	    printf("rsvp_input: Sending packet up old-style socket\n");
-	rip_input(m, iphlen);
-	return;
-    }
-
-    s = splnet();
-
-    if (rsvpdebug)
-	printf("rsvp_input: check vifs\n");
-
-#ifdef DIAGNOSTIC
-    if (!(m->m_flags & M_PKTHDR))
-	    panic("rsvp_input no hdr");
-#endif
-
-    ifp = m->m_pkthdr.rcvif;
-    /* Find which vif the packet arrived on. */
-    for (vifi = 0; vifi < numvifs; vifi++) {
-	if (viftable[vifi].v_ifp == ifp)
- 		break;
- 	}
- 
-    if (vifi == numvifs) {
-	/* Can't find vif packet arrived on. Drop packet. */
-	if (rsvpdebug)
-	    printf("rsvp_input: Can't find vif for packet...dropping it.\n");
-	m_freem(m);
-	splx(s);
-	return;
-    }
-
-    if (rsvpdebug)
-	printf("rsvp_input: check socket\n");
-
-    if (viftable[vifi].v_rsvpd == NULL) {
-	/* drop packet, since there is no specific socket for this
-	 * interface */
-	    if (rsvpdebug)
-		    printf("rsvp_input: No socket defined for vif %d\n",vifi);
-	    m_freem(m);
-	    splx(s);
-	    return;
-    }
-    rsvp_src.sin_addr = ip->ip_src;
-
-    if (rsvpdebug && m)
-	printf("rsvp_input: m->m_len = %d, sbspace() = %ld\n",
-	       m->m_len,sbspace(&(viftable[vifi].v_rsvpd->so_rcv)));
-
-    if (socket_send(viftable[vifi].v_rsvpd, m, &rsvp_src) < 0)
-	if (rsvpdebug)
-	    printf("rsvp_input: Failed to append to socket\n");
-    else
-	if (rsvpdebug)
-	    printf("rsvp_input: send packet up\n");
-    
-    splx(s);
-}
-
-#ifdef MROUTE_LKM
-#include <sys/conf.h>
-#include <sys/exec.h>
-#include <sys/sysent.h>
-#include <sys/lkm.h>
-
-MOD_MISC("ip_mroute_mod")
-
-static int
-ip_mroute_mod_handle(struct lkm_table *lkmtp, int cmd)
-{
-	int i;
-	struct lkm_misc	*args = lkmtp->private.lkm_misc;
-	int err = 0;
-
-	switch(cmd) {
-		static int (*old_ip_mrouter_cmd)();
-		static int (*old_ip_mrouter_done)();
-		static int (*old_ip_mforward)();
-		static int (*old_mrt_ioctl)();
-		static void (*old_proto4_input)();
-		static int (*old_legal_vif_num)();
-		extern struct protosw inetsw[];
-
-	case LKM_E_LOAD:
-		if(lkmexists(lkmtp) || ip_mrtproto)
-		  return(EEXIST);
-		old_ip_mrouter_cmd = ip_mrouter_cmd;
-		ip_mrouter_cmd = X_ip_mrouter_cmd;
-		old_ip_mrouter_done = ip_mrouter_done;
-		ip_mrouter_done = X_ip_mrouter_done;
-		old_ip_mforward = ip_mforward;
-		ip_mforward = X_ip_mforward;
-		old_mrt_ioctl = mrt_ioctl;
-		mrt_ioctl = X_mrt_ioctl;
-              old_proto4_input = inetsw[ip_protox[ENCAP_PROTO]].pr_input;
-              inetsw[ip_protox[ENCAP_PROTO]].pr_input = X_ipip_input;
-		old_legal_vif_num = legal_vif_num;
-		legal_vif_num = X_legal_vif_num;
-		ip_mrtproto = IGMP_DVMRP;
-
-		printf("\nIP multicast routing loaded\n");
-		break;
-
-	case LKM_E_UNLOAD:
-		if (ip_mrouter)
-		  return EINVAL;
-
-		ip_mrouter_cmd = old_ip_mrouter_cmd;
-		ip_mrouter_done = old_ip_mrouter_done;
-		ip_mforward = old_ip_mforward;
-		mrt_ioctl = old_mrt_ioctl;
-              inetsw[ip_protox[ENCAP_PROTO]].pr_input = old_proto4_input;
-		legal_vif_num = old_legal_vif_num;
-		ip_mrtproto = 0;
-		break;
-
-	default:
-		err = EINVAL;
-		break;
-	}
-
-	return(err);
-}
-
-int
-ip_mroute_mod(struct lkm_table *lkmtp, int cmd, int ver) {
-	DISPATCH(lkmtp, cmd, ver, ip_mroute_mod_handle, ip_mroute_mod_handle,
-		 nosys);
-}
-
-#endif /* MROUTE_LKM */
-#endif /* MROUTING */
diff --git a/cpukit/libnetworking/netinet/ip_mroute.h b/cpukit/libnetworking/netinet/ip_mroute.h
deleted file mode 100644
index 5ddd6799d2..0000000000
--- a/cpukit/libnetworking/netinet/ip_mroute.h
+++ /dev/null
@@ -1,262 +0,0 @@
-/*
- * Copyright (c) 1989 Stephen Deering.
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Stephen Deering of Stanford University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)ip_mroute.h	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#ifndef _NETINET_IP_MROUTE_H_
-#define _NETINET_IP_MROUTE_H_
-
-/*
- * Definitions for IP multicast forwarding.
- *
- * Written by David Waitzman, BBN Labs, August 1988.
- * Modified by Steve Deering, Stanford, February 1989.
- * Modified by Ajit Thyagarajan, PARC, August 1993.
- * Modified by Ajit Thyagarajan, PARC, August 1994.
- *
- * MROUTING Revision: 3.3.1.3
- */
-
-
-/*
- * Multicast Routing set/getsockopt commands.
- */
-#define	MRT_INIT	100	/* initialize forwarder */
-#define	MRT_DONE	101	/* shut down forwarder */
-#define	MRT_ADD_VIF	102	/* create virtual interface */
-#define	MRT_DEL_VIF	103	/* delete virtual interface */
-#define MRT_ADD_MFC	104	/* insert forwarding cache entry */
-#define MRT_DEL_MFC	105	/* delete forwarding cache entry */
-#define MRT_VERSION	106	/* get kernel version number */
-#define MRT_ASSERT      107     /* enable PIM assert processing */
-
-
-#define GET_TIME(t)	microtime(&t)
-
-/*
- * Types and macros for handling bitmaps with one bit per virtual interface.
- */
-#define	MAXVIFS 32
-typedef u_long vifbitmap_t;
-typedef u_short vifi_t;		/* type of a vif index */
-#define ALL_VIFS (vifi_t)-1
-
-#define	VIFM_SET(n, m)		((m) |= (1 << (n)))
-#define	VIFM_CLR(n, m)		((m) &= ~(1 << (n)))
-#define	VIFM_ISSET(n, m)	((m) & (1 << (n)))
-#define	VIFM_CLRALL(m)		((m) = 0x00000000)
-#define	VIFM_COPY(mfrom, mto)	((mto) = (mfrom))
-#define	VIFM_SAME(m1, m2)	((m1) == (m2))
-
-
-/*
- * Argument structure for MRT_ADD_VIF.
- * (MRT_DEL_VIF takes a single vifi_t argument.)
- */
-struct vifctl {
-	vifi_t	vifc_vifi;	    	/* the index of the vif to be added */
-	u_char	vifc_flags;     	/* VIFF_ flags defined below */
-	u_char	vifc_threshold; 	/* min ttl required to forward on vif */
-	u_int	vifc_rate_limit;	/* max rate */
-	struct	in_addr vifc_lcl_addr;	/* local interface address */
-	struct	in_addr vifc_rmt_addr;	/* remote address (tunnels only) */
-};
-
-#define	VIFF_TUNNEL	0x1		/* vif represents a tunnel end-point */
-#define VIFF_SRCRT	0x2		/* tunnel uses IP source routing */
-
-/*
- * Argument structure for MRT_ADD_MFC and MRT_DEL_MFC
- * (mfcc_tos to be added at a future point)
- */
-struct mfcctl {
-    struct in_addr  mfcc_origin;		/* ip origin of mcasts       */
-    struct in_addr  mfcc_mcastgrp; 		/* multicast group associated*/
-    vifi_t	    mfcc_parent;   		/* incoming vif              */
-    u_char	    mfcc_ttls[MAXVIFS]; 	/* forwarding ttls on vifs   */
-};
-
-/*
- * The kernel's multicast routing statistics.
- */
-struct mrtstat {
-    u_long	mrts_mfc_lookups;	/* # forw. cache hash table hits   */
-    u_long	mrts_mfc_misses;	/* # forw. cache hash table misses */
-    u_long	mrts_upcalls;		/* # calls to mrouted              */
-    u_long	mrts_no_route;		/* no route for packet's origin    */
-    u_long	mrts_bad_tunnel;	/* malformed tunnel options        */
-    u_long	mrts_cant_tunnel;	/* no room for tunnel options      */
-    u_long	mrts_wrong_if;		/* arrived on wrong interface	   */
-    u_long	mrts_upq_ovflw;		/* upcall Q overflow		   */
-    u_long	mrts_cache_cleanups;	/* # entries with no upcalls 	   */
-    u_long  	mrts_drop_sel;     	/* pkts dropped selectively        */
-    u_long  	mrts_q_overflow;    	/* pkts dropped - Q overflow       */
-    u_long  	mrts_pkt2large;     	/* pkts dropped - size > BKT SIZE  */
-    u_long	mrts_upq_sockfull;	/* upcalls dropped - socket full */
-};
-
-/*
- * Argument structure used by mrouted to get src-grp pkt counts
- */
-struct sioc_sg_req {
-    struct in_addr src;
-    struct in_addr grp;
-    u_long pktcnt;
-    u_long bytecnt;
-    u_long wrong_if;
-};
-
-/*
- * Argument structure used by mrouted to get vif pkt counts
- */
-struct sioc_vif_req {
-    vifi_t vifi;		/* vif number				*/
-    u_long icount;		/* Input packet count on vif		*/
-    u_long ocount;		/* Output packet count on vif		*/
-    u_long ibytes;		/* Input byte count on vif		*/
-    u_long obytes;		/* Output byte count on vif		*/
-};
-    
-
-/*
- * The kernel's virtual-interface structure.
- */
-struct vif {
-    u_char   		v_flags;     	/* VIFF_ flags defined above         */
-    u_char   		v_threshold;	/* min ttl required to forward on vif*/
-    u_int      		v_rate_limit; 	/* max rate			     */
-    struct tbf 	       *v_tbf;       	/* token bucket structure at intf.   */
-    struct in_addr 	v_lcl_addr;   	/* local interface address           */
-    struct in_addr 	v_rmt_addr;   	/* remote address (tunnels only)     */
-    struct ifnet       *v_ifp;	     	/* pointer to interface              */
-    u_long		v_pkt_in;	/* # pkts in on interface            */
-    u_long		v_pkt_out;	/* # pkts out on interface           */
-    u_long		v_bytes_in;	/* # bytes in on interface	     */
-    u_long		v_bytes_out;	/* # bytes out on interface	     */
-    struct route	v_route;	/* cached route if this is a tunnel */
-    u_int		v_rsvp_on;	/* RSVP listening on this vif */
-    struct socket      *v_rsvpd;	/* RSVP daemon socket */
-};
-
-/*
- * The kernel's multicast forwarding cache entry structure 
- * (A field for the type of service (mfc_tos) is to be added 
- * at a future point)
- */
-struct mfc {
-    struct in_addr  mfc_origin;	 		/* IP origin of mcasts   */
-    struct in_addr  mfc_mcastgrp;  		/* multicast group associated*/
-    vifi_t	    mfc_parent; 		/* incoming vif              */
-    u_char	    mfc_ttls[MAXVIFS]; 		/* forwarding ttls on vifs   */
-    u_long	    mfc_pkt_cnt;		/* pkt count for src-grp     */
-    u_long	    mfc_byte_cnt;		/* byte count for src-grp    */
-    u_long	    mfc_wrong_if;		/* wrong if for src-grp	     */
-    int		    mfc_expire;			/* time to clean entry up    */
-    struct timeval  mfc_last_assert;		/* last time I sent an assert*/
-};
-
-/*
- * Struct used to communicate from kernel to multicast router
- * note the convenient similarity to an IP packet
- */
-struct igmpmsg {
-    u_long	    unused1;
-    u_long	    unused2;
-    u_char	    im_msgtype;			/* what type of message	    */
-#define IGMPMSG_NOCACHE		1
-#define IGMPMSG_WRONGVIF	2
-    u_char	    im_mbz;			/* must be zero		    */
-    u_char	    im_vif;			/* vif rec'd on		    */
-    u_char	    unused3;
-    struct in_addr  im_src, im_dst;
-};
-
-/*
- * Argument structure used for pkt info. while upcall is made
- */
-struct rtdetq {
-    struct mbuf 	*m;		/* A copy of the packet		    */
-    struct ifnet	*ifp;		/* Interface pkt came in on	    */
-    vifi_t		xmt_vif;	/* Saved copy of imo_multicast_vif  */
-#ifdef UPCALL_TIMING
-    struct timeval	t;		/* Timestamp */
-#endif /* UPCALL_TIMING */
-};
-
-#define MFCTBLSIZ	256
-#if (MFCTBLSIZ & (MFCTBLSIZ - 1)) == 0	  /* from sys:route.h */
-#define MFCHASHMOD(h)	((h) & (MFCTBLSIZ - 1))
-#else
-#define MFCHASHMOD(h)	((h) % MFCTBLSIZ)
-#endif
-
-#define MAX_UPQ	4		/* max. no of pkts in upcall Q */
-
-/*
- * Token Bucket filter code 
- */
-#define MAX_BKT_SIZE    10000             /* 10K bytes size 		*/
-#define MAXQSIZE        10                /* max # of pkts in queue 	*/
-
-/*
- * the token bucket filter at each vif
- */
-struct tbf
-{
-    struct timeval tbf_last_pkt_t; /* arr. time of last pkt 	*/
-    u_long tbf_n_tok;      	/* no of tokens in bucket 	*/
-    u_long tbf_q_len;    	/* length of queue at this vif	*/
-    u_long tbf_max_q_len;	/* max. queue length		*/
-    struct mbuf *tbf_q;		/* Packet queue			*/
-    struct mbuf *tbf_t;		/* tail-insertion pointer	*/
-};
-
-#ifdef KERNEL
-
-extern int	(*ip_mrouter_set) __P((int, struct socket *, struct mbuf *));
-extern int	(*ip_mrouter_get) __P((int, struct socket *, struct mbuf **));
-extern int	(*ip_mrouter_done) __P((void));
-#ifdef MROUTING
-extern int	(*mrt_ioctl) __P((int, caddr_t));
-#else
-extern int	(*mrt_ioctl) __P((int, caddr_t, struct proc *));
-#endif
-
-#endif /* KERNEL */
-
-#endif /* _NETINET_IP_MROUTE_H_ */
diff --git a/cpukit/libnetworking/netinet/ip_output.c b/cpukit/libnetworking/netinet/ip_output.c
deleted file mode 100644
index 810f6c7479..0000000000
--- a/cpukit/libnetworking/netinet/ip_output.c
+++ /dev/null
@@ -1,1307 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1988, 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)ip_output.c	8.3 (Berkeley) 1/21/94
- *	$Id$
- */
-
-#define _IP_VHL
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/systm.h>
-#include <sys/malloc.h>
-#include <sys/mbuf.h>
-#include <sys/errno.h>
-#include <sys/protosw.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-
-#include <net/if.h>
-#include <net/route.h>
-
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/in_pcb.h>
-#include <netinet/in_var.h>
-#include <netinet/ip_var.h>
-
-#ifdef vax
-#include <machine/mtpr.h>
-#endif
-#include <machine/in_cksum.h>
-
-#if !defined(COMPAT_IPFW) || COMPAT_IPFW == 1
-#undef COMPAT_IPFW
-#define COMPAT_IPFW 1
-#else
-#undef COMPAT_IPFW
-#endif
-
-u_short ip_id;
-
-static struct mbuf *ip_insertoptions __P((struct mbuf *, struct mbuf *, int *));
-static void	ip_mloopback
-	__P((struct ifnet *, struct mbuf *, struct sockaddr_in *, int));
-static int	ip_getmoptions
-	__P((int, struct ip_moptions *, struct mbuf **));
-static int	ip_optcopy __P((struct ip *, struct ip *));
-static int	ip_pcbopts __P((struct mbuf **, struct mbuf *));
-static int	ip_setmoptions
-	__P((int, struct ip_moptions **, struct mbuf *));
-
-extern	struct protosw inetsw[];
-
-/*
- * IP output.  The packet in mbuf chain m contains a skeletal IP
- * header (with len, off, ttl, proto, tos, src, dst).
- * The mbuf chain containing the packet will be freed.
- * The mbuf opt, if present, will not be freed.
- */
-int
-ip_output(m0, opt, ro, flags, imo)
-	struct mbuf *m0;
-	struct mbuf *opt;
-	struct route *ro;
-	int flags;
-	struct ip_moptions *imo;
-{
-	struct ip *ip, *mhip;
-	struct ifnet *ifp;
-	struct mbuf *m = m0;
-	int hlen = sizeof (struct ip);
-	int len, off, error = 0;
-	struct sockaddr_in *dst;
-	struct in_ifaddr *ia;
-	int isbroadcast;
-
-#ifdef	DIAGNOSTIC
-	if ((m->m_flags & M_PKTHDR) == 0)
-		panic("ip_output no HDR");
-	if (!ro)
-		panic("ip_output no route, proto = %d",
-		      mtod(m, struct ip *)->ip_p);
-#endif
-	if (opt) {
-		m = ip_insertoptions(m, opt, &len);
-		hlen = len;
-	}
-	ip = mtod(m, struct ip *);
-	/*
-	 * Fill in IP header.
-	 */
-	if ((flags & (IP_FORWARDING|IP_RAWOUTPUT)) == 0) {
-		ip->ip_vhl = IP_MAKE_VHL(IPVERSION, hlen >> 2);
-		ip->ip_off &= IP_DF;
-		ip->ip_id = htons(ip_id++);
-		ipstat.ips_localout++;
-	} else {
-		hlen = IP_VHL_HL(ip->ip_vhl) << 2;
-	}
-
-	dst = (struct sockaddr_in *)&ro->ro_dst;
-	/*
-	 * If there is a cached route,
-	 * check that it is to the same destination
-	 * and is still up.  If not, free it and try again.
-	 */
-	if (ro->ro_rt && ((ro->ro_rt->rt_flags & RTF_UP) == 0 ||
-	   dst->sin_addr.s_addr != ip->ip_dst.s_addr)) {
-		RTFREE(ro->ro_rt);
-		ro->ro_rt = (struct rtentry *)0;
-	}
-	if (ro->ro_rt == 0) {
-		dst->sin_family = AF_INET;
-		dst->sin_len = sizeof(*dst);
-		dst->sin_addr = ip->ip_dst;
-	}
-	/*
-	 * If routing to interface only,
-	 * short circuit routing lookup.
-	 */
-#define ifatoia(ifa)	((struct in_ifaddr *)(ifa))
-#define sintosa(sin)	((struct sockaddr *)(sin))
-	if (flags & IP_ROUTETOIF) {
-		if ((ia = ifatoia(ifa_ifwithdstaddr(sintosa(dst)))) == 0 &&
-		    (ia = ifatoia(ifa_ifwithnet(sintosa(dst)))) == 0) {
-			ipstat.ips_noroute++;
-			error = ENETUNREACH;
-			goto bad;
-		}
-		ifp = ia->ia_ifp;
-		ip->ip_ttl = 1;
-		isbroadcast = in_broadcast(dst->sin_addr, ifp);
-	} else {
-		/*
-		 * If this is the case, we probably don't want to allocate
-		 * a protocol-cloned route since we didn't get one from the
-		 * ULP.  This lets TCP do its thing, while not burdening
-		 * forwarding or ICMP with the overhead of cloning a route.
-		 * Of course, we still want to do any cloning requested by
-		 * the link layer, as this is probably required in all cases
-		 * for correct operation (as it is for ARP).
-		 */
-		if (ro->ro_rt == 0)
-			rtalloc_ign(ro, RTF_PRCLONING);
-		if (ro->ro_rt == 0) {
-			ipstat.ips_noroute++;
-			error = EHOSTUNREACH;
-			goto bad;
-		}
-		ia = ifatoia(ro->ro_rt->rt_ifa);
-		ifp = ro->ro_rt->rt_ifp;
-		ro->ro_rt->rt_use++;
-		if (ro->ro_rt->rt_flags & RTF_GATEWAY)
-			dst = (struct sockaddr_in *)ro->ro_rt->rt_gateway;
-		if (ro->ro_rt->rt_flags & RTF_HOST)
-			isbroadcast = (ro->ro_rt->rt_flags & RTF_BROADCAST);
-		else
-			isbroadcast = in_broadcast(dst->sin_addr, ifp);
-	}
-	if (IN_MULTICAST(ntohl(ip->ip_dst.s_addr))) {
-		struct in_multi *inm;
-
-		m->m_flags |= M_MCAST;
-		/*
-		 * IP destination address is multicast.  Make sure "dst"
-		 * still points to the address in "ro".  (It may have been
-		 * changed to point to a gateway address, above.)
-		 */
-		dst = (struct sockaddr_in *)&ro->ro_dst;
-		/*
-		 * See if the caller provided any multicast options
-		 */
-		if (imo != NULL) {
-			ip->ip_ttl = imo->imo_multicast_ttl;
-			if (imo->imo_multicast_ifp != NULL)
-				ifp = imo->imo_multicast_ifp;
-			if (imo->imo_multicast_vif != -1)
-				ip->ip_src.s_addr =
-				    ip_mcast_src(imo->imo_multicast_vif);
-		} else
-			ip->ip_ttl = IP_DEFAULT_MULTICAST_TTL;
-		/*
-		 * Confirm that the outgoing interface supports multicast.
-		 */
-		if ((imo == NULL) || (imo->imo_multicast_vif == -1)) {
-			if ((ifp->if_flags & IFF_MULTICAST) == 0) {
-				ipstat.ips_noroute++;
-				error = ENETUNREACH;
-				goto bad;
-			}
-		}
-		/*
-		 * If source address not specified yet, use address
-		 * of outgoing interface.
-		 */
-		if (ip->ip_src.s_addr == INADDR_ANY) {
-			register struct in_ifaddr *ia;
-
-			for (ia = in_ifaddr; ia; ia = ia->ia_next)
-				if (ia->ia_ifp == ifp) {
-					ip->ip_src = IA_SIN(ia)->sin_addr;
-					break;
-				}
-		}
-
-		IN_LOOKUP_MULTI(ip->ip_dst, ifp, inm);
-		if (inm != NULL &&
-		   (imo == NULL || imo->imo_multicast_loop)) {
-			/*
-			 * If we belong to the destination multicast group
-			 * on the outgoing interface, and the caller did not
-			 * forbid loopback, loop back a copy.
-			 */
-			ip_mloopback(ifp, m, dst, hlen);
-		}
-		else {
-			/*
-			 * If we are acting as a multicast router, perform
-			 * multicast forwarding as if the packet had just
-			 * arrived on the interface to which we are about
-			 * to send.  The multicast forwarding function
-			 * recursively calls this function, using the
-			 * IP_FORWARDING flag to prevent infinite recursion.
-			 *
-			 * Multicasts that are looped back by ip_mloopback(),
-			 * above, will be forwarded by the ip_input() routine,
-			 * if necessary.
-			 */
-			if (ip_mrouter && (flags & IP_FORWARDING) == 0) {
-				/*
-				 * Check if rsvp daemon is running. If not, don't
-				 * set ip_moptions. This ensures that the packet
-				 * is multicast and not just sent down one link
-				 * as prescribed by rsvpd.
-				 */
-				if (!rsvp_on)
-				  imo = NULL;
-				if (ip_mforward(ip, ifp, m, imo) != 0) {
-					m_freem(m);
-					goto done;
-				}
-			}
-		}
-
-		/*
-		 * Multicasts with a time-to-live of zero may be looped-
-		 * back, above, but must not be transmitted on a network.
-		 * Also, multicasts addressed to the loopback interface
-		 * are not sent -- the above call to ip_mloopback() will
-		 * loop back a copy if this host actually belongs to the
-		 * destination group on the loopback interface.
-		 */
-		if (ip->ip_ttl == 0 || ifp->if_flags & IFF_LOOPBACK) {
-			m_freem(m);
-			goto done;
-		}
-
-		goto sendit;
-	}
-#ifndef notdef
-	/*
-	 * If source address not specified yet, use address
-	 * of outgoing interface.
-	 */
-	if (ip->ip_src.s_addr == INADDR_ANY)
-		ip->ip_src = IA_SIN(ia)->sin_addr;
-#endif
-	/*
-	 * Verify that we have any chance at all of being able to queue
-	 *      the packet or packet fragments
-	 */
-	if ((ifp->if_snd.ifq_len + ip->ip_len / ifp->if_mtu + 1) >=
-		ifp->if_snd.ifq_maxlen) {
-			error = ENOBUFS;
-			goto bad;
-	}
-
-	/*
-	 * Look for broadcast address and
-	 * and verify user is allowed to send
-	 * such a packet.
-	 */
-	if (isbroadcast) {
-		if ((ifp->if_flags & IFF_BROADCAST) == 0) {
-			error = EADDRNOTAVAIL;
-			goto bad;
-		}
-		if ((flags & IP_ALLOWBROADCAST) == 0) {
-			error = EACCES;
-			goto bad;
-		}
-		/* don't allow broadcast messages to be fragmented */
-		if ((u_short)ip->ip_len > ifp->if_mtu) {
-			error = EMSGSIZE;
-			goto bad;
-		}
-		m->m_flags |= M_BCAST;
-	} else {
-		m->m_flags &= ~M_BCAST;
-	}
-
-sendit:
-        /*
-	 * IpHack's section.
-	 * - Xlate: translate packet's addr/port (NAT).
-	 * - Firewall: deny/allow/etc.
-	 * - Wrap: fake packet's addr/port <unimpl.>
-	 * - Encapsulate: put it in another IP and send out. <unimp.>
-	 */ 
-
-#ifdef COMPAT_IPFW
-        if (ip_nat_ptr && !(*ip_nat_ptr)(&ip, &m, ifp, IP_NAT_OUT)) {
-		error = EACCES; 
-		goto done;
-	}
-
-	/*
-	 * Check with the firewall...
-	 */
-	if (ip_fw_chk_ptr) {
-#ifdef IPDIVERT
-		ip_divert_port = (*ip_fw_chk_ptr)(&ip,
-		    hlen, ifp, ip_divert_ignore, &m);
-		ip_divert_ignore = 0;
-		if (ip_divert_port) {		/* Divert packet */
-			(*inetsw[ip_protox[IPPROTO_DIVERT]].pr_input)(m, 0);
-			goto done;
-		}
-#else
-		/* If ipfw says divert, we have to just drop packet */
-		if ((*ip_fw_chk_ptr)(&ip, hlen, ifp, 0, &m)) {
-			m_freem(m);
-			goto done;
-		}
-#endif
-		if (!m) {
-			error = EACCES;
-			goto done;
-		}
-	}
-#endif /* COMPAT_IPFW */
-
-	/*
-	 * If small enough for interface, can just send directly.
-	 */
-	if ((u_short)ip->ip_len <= ifp->if_mtu) {
-		ip->ip_len = htons((u_short)ip->ip_len);
-		ip->ip_off = htons((u_short)ip->ip_off);
-		ip->ip_sum = 0;
-		if (ip->ip_vhl == IP_VHL_BORING) {
-			ip->ip_sum = in_cksum_hdr(ip);
-		} else {
-			ip->ip_sum = in_cksum(m, hlen);
-		}
-		error = (*ifp->if_output)(ifp, m,
-				(struct sockaddr *)dst, ro->ro_rt);
-		goto done;
-	}
-	/*
-	 * Too large for interface; fragment if possible.
-	 * Must be able to put at least 8 bytes per fragment.
-	 */
-	if (ip->ip_off & IP_DF) {
-		error = EMSGSIZE;
-		/*
-		 * This case can happen if the user changed the MTU
-		 * of an interface after enabling IP on it.  Because
-		 * most netifs don't keep track of routes pointing to
-		 * them, there is no way for one to update all its
-		 * routes when the MTU is changed.
-		 */
-		if ((ro->ro_rt->rt_flags & (RTF_UP | RTF_HOST))
-		    && !(ro->ro_rt->rt_rmx.rmx_locks & RTV_MTU)
-		    && (ro->ro_rt->rt_rmx.rmx_mtu > ifp->if_mtu)) {
-			ro->ro_rt->rt_rmx.rmx_mtu = ifp->if_mtu;
-		}
-		ipstat.ips_cantfrag++;
-		goto bad;
-	}
-	len = (ifp->if_mtu - hlen) &~ 7;
-	if (len < 8) {
-		error = EMSGSIZE;
-		goto bad;
-	}
-
-    {
-	int mhlen, firstlen = len;
-	struct mbuf **mnext = &m->m_nextpkt;
-
-	/*
-	 * Loop through length of segment after first fragment,
-	 * make new header and copy data of each part and link onto chain.
-	 */
-	m0 = m;
-	mhlen = sizeof (struct ip);
-	for (off = hlen + len; off < (u_short)ip->ip_len; off += len) {
-		MGETHDR(m, M_DONTWAIT, MT_HEADER);
-		if (m == 0) {
-			error = ENOBUFS;
-			ipstat.ips_odropped++;
-			goto sendorfree;
-		}
-		m->m_data += max_linkhdr;
-		mhip = mtod(m, struct ip *);
-		*mhip = *ip;
-		if (hlen > sizeof (struct ip)) {
-			mhlen = ip_optcopy(ip, mhip) + sizeof (struct ip);
-			mhip->ip_vhl = IP_MAKE_VHL(IPVERSION, mhlen >> 2);
-		}
-		m->m_len = mhlen;
-		mhip->ip_off = ((off - hlen) >> 3) + (ip->ip_off & ~IP_MF);
-		if (ip->ip_off & IP_MF)
-			mhip->ip_off |= IP_MF;
-		if (off + len >= (u_short)ip->ip_len)
-			len = (u_short)ip->ip_len - off;
-		else
-			mhip->ip_off |= IP_MF;
-		mhip->ip_len = htons((u_short)(len + mhlen));
-		m->m_next = m_copy(m0, off, len);
-		if (m->m_next == 0) {
-			(void) m_free(m);
-			error = ENOBUFS;	/* ??? */
-			ipstat.ips_odropped++;
-			goto sendorfree;
-		}
-		m->m_pkthdr.len = mhlen + len;
-		m->m_pkthdr.rcvif = (struct ifnet *)0;
-		mhip->ip_off = htons((u_short)mhip->ip_off);
-		mhip->ip_sum = 0;
-		if (mhip->ip_vhl == IP_VHL_BORING) {
-			mhip->ip_sum = in_cksum_hdr(mhip);
-		} else {
-			mhip->ip_sum = in_cksum(m, mhlen);
-		}
-		*mnext = m;
-		mnext = &m->m_nextpkt;
-		ipstat.ips_ofragments++;
-	}
-	/*
-	 * Update first fragment by trimming what's been copied out
-	 * and updating header, then send each fragment (in order).
-	 */
-	m = m0;
-	m_adj(m, hlen + firstlen - (u_short)ip->ip_len);
-	m->m_pkthdr.len = hlen + firstlen;
-	ip->ip_len = htons((u_short)m->m_pkthdr.len);
-	ip->ip_off = htons((u_short)(ip->ip_off | IP_MF));
-	ip->ip_sum = 0;
-	if (ip->ip_vhl == IP_VHL_BORING) {
-		ip->ip_sum = in_cksum_hdr(ip);
-	} else {
-		ip->ip_sum = in_cksum(m, hlen);
-	}
-sendorfree:
-	for (m = m0; m; m = m0) {
-		m0 = m->m_nextpkt;
-		m->m_nextpkt = 0;
-		if (error == 0)
-			error = (*ifp->if_output)(ifp, m,
-			    (struct sockaddr *)dst, ro->ro_rt);
-		else
-			m_freem(m);
-	}
-
-	if (error == 0)
-		ipstat.ips_fragmented++;
-    }
-done:
-	return (error);
-bad:
-	m_freem(m0);
-	goto done;
-}
-
-/*
- * Insert IP options into preformed packet.
- * Adjust IP destination as required for IP source routing,
- * as indicated by a non-zero in_addr at the start of the options.
- *
- * XXX This routine assumes that the packet has no options in place.
- */
-static struct mbuf *
-ip_insertoptions(m, opt, phlen)
-	register struct mbuf *m;
-	struct mbuf *opt;
-	int *phlen;
-{
-	register struct ipoption *p = mtod(opt, struct ipoption *);
-	struct mbuf *n;
-	register struct ip *ip = mtod(m, struct ip *);
-	unsigned optlen;
-
-	optlen = opt->m_len - sizeof(p->ipopt_dst);
-	if (optlen + (u_short)ip->ip_len > IP_MAXPACKET)
-		return (m);		/* XXX should fail */
-	if (p->ipopt_dst.s_addr)
-		ip->ip_dst = p->ipopt_dst;
-	if (m->m_flags & M_EXT || m->m_data - optlen < m->m_pktdat) {
-		MGETHDR(n, M_DONTWAIT, MT_HEADER);
-		if (n == 0)
-			return (m);
-		n->m_pkthdr.len = m->m_pkthdr.len + optlen;
-		m->m_len -= sizeof(struct ip);
-		m->m_data += sizeof(struct ip);
-		n->m_next = m;
-		m = n;
-		m->m_len = optlen + sizeof(struct ip);
-		m->m_data += max_linkhdr;
-		(void)memcpy(mtod(m, void *), ip, sizeof(struct ip));
-	} else {
-		m->m_data -= optlen;
-		m->m_len += optlen;
-		m->m_pkthdr.len += optlen;
-		ovbcopy((caddr_t)ip, mtod(m, caddr_t), sizeof(struct ip));
-	}
-	ip = mtod(m, struct ip *);
-	bcopy(p->ipopt_list, ip + 1, optlen);
-	*phlen = sizeof(struct ip) + optlen;
-	ip->ip_vhl = IP_MAKE_VHL(IPVERSION, *phlen >> 2);
-	ip->ip_len += optlen;
-	return (m);
-}
-
-/*
- * Copy options from ip to jp,
- * omitting those not copied during fragmentation.
- */
-static int
-ip_optcopy(ip, jp)
-	struct ip *ip, *jp;
-{
-	register u_char *cp, *dp;
-	int opt, optlen, cnt;
-
-	cp = (u_char *)(ip + 1);
-	dp = (u_char *)(jp + 1);
-	cnt = (IP_VHL_HL(ip->ip_vhl) << 2) - sizeof (struct ip);
-	for (; cnt > 0; cnt -= optlen, cp += optlen) {
-		opt = cp[0];
-		if (opt == IPOPT_EOL)
-			break;
-		if (opt == IPOPT_NOP) {
-			/* Preserve for IP mcast tunnel's LSRR alignment. */
-			*dp++ = IPOPT_NOP;
-			optlen = 1;
-			continue;
-		} else
-			optlen = cp[IPOPT_OLEN];
-		/* bogus lengths should have been caught by ip_dooptions */
-		if (optlen > cnt)
-			optlen = cnt;
-		if (IPOPT_COPIED(opt)) {
-			bcopy(cp, dp, optlen);
-			dp += optlen;
-		}
-	}
-	for (optlen = dp - (u_char *)(jp+1); optlen & 0x3; optlen++)
-		*dp++ = IPOPT_EOL;
-	return (optlen);
-}
-
-/*
- * IP socket option processing.
- */
-int
-ip_ctloutput(op, so, level, optname, mp)
-	int op;
-	struct socket *so;
-	int level, optname;
-	struct mbuf **mp;
-{
-	register struct inpcb *inp = sotoinpcb(so);
-	register struct mbuf *m = *mp;
-	register int optval = 0;
-	int error = 0;
-
-	if (level != IPPROTO_IP) {
-		error = EINVAL;
-		if (op == PRCO_SETOPT && *mp)
-			(void) m_free(*mp);
-	} else switch (op) {
-
-	case PRCO_SETOPT:
-		switch (optname) {
-		case IP_OPTIONS:
-#ifdef notyet
-		case IP_RETOPTS:
-			return (ip_pcbopts(optname, &inp->inp_options, m));
-#else
-			return (ip_pcbopts(&inp->inp_options, m));
-#endif
-
-		case IP_TOS:
-		case IP_TTL:
-		case IP_RECVOPTS:
-		case IP_RECVRETOPTS:
-		case IP_RECVDSTADDR:
-		case IP_RECVIF:
-			if (m == 0 || m->m_len != sizeof(int))
-				error = EINVAL;
-			else {
-				optval = *mtod(m, int *);
-				switch (optname) {
-
-				case IP_TOS:
-					inp->inp_ip_tos = optval;
-					break;
-
-				case IP_TTL:
-					inp->inp_ip_ttl = optval;
-					break;
-#define	OPTSET(bit) \
-	if (optval) \
-		inp->inp_flags |= bit; \
-	else \
-		inp->inp_flags &= ~bit;
-
-				case IP_RECVOPTS:
-					OPTSET(INP_RECVOPTS);
-					break;
-
-				case IP_RECVRETOPTS:
-					OPTSET(INP_RECVRETOPTS);
-					break;
-
-				case IP_RECVDSTADDR:
-					OPTSET(INP_RECVDSTADDR);
-					break;
-
-				case IP_RECVIF:
-					OPTSET(INP_RECVIF);
-					break;
-				}
-			}
-			break;
-#undef OPTSET
-
-		case IP_MULTICAST_IF:
-		case IP_MULTICAST_VIF:
-		case IP_MULTICAST_TTL:
-		case IP_MULTICAST_LOOP:
-		case IP_ADD_MEMBERSHIP:
-		case IP_DROP_MEMBERSHIP:
-			error = ip_setmoptions(optname, &inp->inp_moptions, m);
-			break;
-
-		case IP_PORTRANGE:
-			if (m == 0 || m->m_len != sizeof(int))
-				error = EINVAL;
-			else {
-				optval = *mtod(m, int *);
-
-				switch (optval) {
-
-				case IP_PORTRANGE_DEFAULT:
-					inp->inp_flags &= ~(INP_LOWPORT);
-					inp->inp_flags &= ~(INP_HIGHPORT);
-					break;
-
-				case IP_PORTRANGE_HIGH:
-					inp->inp_flags &= ~(INP_LOWPORT);
-					inp->inp_flags |= INP_HIGHPORT;
-					break;
-
-				case IP_PORTRANGE_LOW:
-					inp->inp_flags &= ~(INP_HIGHPORT);
-					inp->inp_flags |= INP_LOWPORT;
-					break;
-
-				default:
-					error = EINVAL;
-					break;
-				}
-			}
-			break;
-
-		default:
-			error = ENOPROTOOPT;
-			break;
-		}
-		if (m)
-			(void)m_free(m);
-		break;
-
-	case PRCO_GETOPT:
-		switch (optname) {
-		case IP_OPTIONS:
-		case IP_RETOPTS:
-			*mp = m = m_get(M_WAIT, MT_SOOPTS);
-			if (inp->inp_options) {
-				m->m_len = inp->inp_options->m_len;
-				bcopy(mtod(inp->inp_options, void *),
-				    mtod(m, void *), m->m_len);
-			} else
-				m->m_len = 0;
-			break;
-
-		case IP_TOS:
-		case IP_TTL:
-		case IP_RECVOPTS:
-		case IP_RECVRETOPTS:
-		case IP_RECVDSTADDR:
-		case IP_RECVIF:
-			*mp = m = m_get(M_WAIT, MT_SOOPTS);
-			m->m_len = sizeof(int);
-			switch (optname) {
-
-			case IP_TOS:
-				optval = inp->inp_ip_tos;
-				break;
-
-			case IP_TTL:
-				optval = inp->inp_ip_ttl;
-				break;
-
-#define	OPTBIT(bit)	(inp->inp_flags & bit ? 1 : 0)
-
-			case IP_RECVOPTS:
-				optval = OPTBIT(INP_RECVOPTS);
-				break;
-
-			case IP_RECVRETOPTS:
-				optval = OPTBIT(INP_RECVRETOPTS);
-				break;
-
-			case IP_RECVDSTADDR:
-				optval = OPTBIT(INP_RECVDSTADDR);
-				break;
-
-			case IP_RECVIF:
-				optval = OPTBIT(INP_RECVIF);
-				break;
-			}
-			*mtod(m, int *) = optval;
-			break;
-
-		case IP_MULTICAST_IF:
-		case IP_MULTICAST_VIF:
-		case IP_MULTICAST_TTL:
-		case IP_MULTICAST_LOOP:
-		case IP_ADD_MEMBERSHIP:
-		case IP_DROP_MEMBERSHIP:
-			error = ip_getmoptions(optname, inp->inp_moptions, mp);
-			break;
-
-		case IP_PORTRANGE:
-			*mp = m = m_get(M_WAIT, MT_SOOPTS);
-			m->m_len = sizeof(int);
-
-			if (inp->inp_flags & INP_HIGHPORT)
-				optval = IP_PORTRANGE_HIGH;
-			else if (inp->inp_flags & INP_LOWPORT)
-				optval = IP_PORTRANGE_LOW;
-			else
-				optval = 0;
-
-			*mtod(m, int *) = optval;
-			break;
-
-		default:
-			error = ENOPROTOOPT;
-			break;
-		}
-		break;
-	}
-	return (error);
-}
-
-/*
- * Set up IP options in pcb for insertion in output packets.
- * Store in mbuf with pointer in pcbopt, adding pseudo-option
- * with destination address if source routed.
- */
-static int
-#ifdef notyet
-ip_pcbopts(optname, pcbopt, m)
-	int optname;
-#else
-ip_pcbopts(pcbopt, m)
-#endif
-	struct mbuf **pcbopt;
-	register struct mbuf *m;
-{
-	register int cnt, optlen;
-	register u_char *cp;
-	u_char opt;
-
-	/* turn off any old options */
-	if (*pcbopt)
-		(void)m_free(*pcbopt);
-	*pcbopt = 0;
-	if (m == (struct mbuf *)0 || m->m_len == 0) {
-		/*
-		 * Only turning off any previous options.
-		 */
-		if (m)
-			(void)m_free(m);
-		return (0);
-	}
-
-#ifndef	vax
-	if (m->m_len % sizeof(long))
-		goto bad;
-#endif
-	/*
-	 * IP first-hop destination address will be stored before
-	 * actual options; move other options back
-	 * and clear it when none present.
-	 */
-	if (m->m_data + m->m_len + sizeof(struct in_addr) >= &m->m_dat[MLEN])
-		goto bad;
-	cnt = m->m_len;
-	m->m_len += sizeof(struct in_addr);
-	cp = mtod(m, u_char *) + sizeof(struct in_addr);
-	ovbcopy(mtod(m, caddr_t), (caddr_t)cp, (unsigned)cnt);
-	bzero(mtod(m, caddr_t), sizeof(struct in_addr));
-
-	for (; cnt > 0; cnt -= optlen, cp += optlen) {
-		opt = cp[IPOPT_OPTVAL];
-		if (opt == IPOPT_EOL)
-			break;
-		if (opt == IPOPT_NOP)
-			optlen = 1;
-		else {
-			optlen = cp[IPOPT_OLEN];
-			if (optlen <= IPOPT_OLEN || optlen > cnt)
-				goto bad;
-		}
-		switch (opt) {
-
-		default:
-			break;
-
-		case IPOPT_LSRR:
-		case IPOPT_SSRR:
-			/*
-			 * user process specifies route as:
-			 *	->A->B->C->D
-			 * D must be our final destination (but we can't
-			 * check that since we may not have connected yet).
-			 * A is first hop destination, which doesn't appear in
-			 * actual IP option, but is stored before the options.
-			 */
-			if (optlen < IPOPT_MINOFF - 1 + sizeof(struct in_addr))
-				goto bad;
-			m->m_len -= sizeof(struct in_addr);
-			cnt -= sizeof(struct in_addr);
-			optlen -= sizeof(struct in_addr);
-			cp[IPOPT_OLEN] = optlen;
-			/*
-			 * Move first hop before start of options.
-			 */
-			bcopy((caddr_t)&cp[IPOPT_OFFSET+1], mtod(m, caddr_t),
-			    sizeof(struct in_addr));
-			/*
-			 * Then copy rest of options back
-			 * to close up the deleted entry.
-			 */
-			ovbcopy((caddr_t)(&cp[IPOPT_OFFSET+1] +
-			    sizeof(struct in_addr)),
-			    (caddr_t)&cp[IPOPT_OFFSET+1],
-			    (unsigned)cnt + sizeof(struct in_addr));
-			break;
-		}
-	}
-	if (m->m_len > MAX_IPOPTLEN + sizeof(struct in_addr))
-		goto bad;
-	*pcbopt = m;
-	return (0);
-
-bad:
-	(void)m_free(m);
-	return (EINVAL);
-}
-
-/*
- * Set the IP multicast options in response to user setsockopt().
- */
-static int
-ip_setmoptions(optname, imop, m)
-	int optname;
-	struct ip_moptions **imop;
-	struct mbuf *m;
-{
-	register int error = 0;
-	u_char loop;
-	register int i;
-	struct in_addr addr;
-	register struct ip_mreq *mreq;
-	register struct ifnet *ifp;
-	register struct ip_moptions *imo = *imop;
-	struct route ro;
-	register struct sockaddr_in *dst;
-	int s;
-
-	if (imo == NULL) {
-		/*
-		 * No multicast option buffer attached to the pcb;
-		 * allocate one and initialize to default values.
-		 */
-		imo = (struct ip_moptions*)malloc(sizeof(*imo), M_IPMOPTS,
-		    M_WAITOK);
-
-		if (imo == NULL)
-			return (ENOBUFS);
-		*imop = imo;
-		imo->imo_multicast_ifp = NULL;
-		imo->imo_multicast_vif = -1;
-		imo->imo_multicast_ttl = IP_DEFAULT_MULTICAST_TTL;
-		imo->imo_multicast_loop = IP_DEFAULT_MULTICAST_LOOP;
-		imo->imo_num_memberships = 0;
-	}
-
-	switch (optname) {
-	/* store an index number for the vif you wanna use in the send */
-	case IP_MULTICAST_VIF:
-		if (!legal_vif_num) {
-			error = EOPNOTSUPP;
-			break;
-		}
-		if (m == NULL || m->m_len != sizeof(int)) {
-			error = EINVAL;
-			break;
-		}
-		i = *(mtod(m, int *));
-		if (!legal_vif_num(i) && (i != -1)) {
-			error = EINVAL;
-			break;
-		}
-		imo->imo_multicast_vif = i;
-		break;
-
-	case IP_MULTICAST_IF:
-		/*
-		 * Select the interface for outgoing multicast packets.
-		 */
-		if (m == NULL || m->m_len != sizeof(struct in_addr)) {
-			error = EINVAL;
-			break;
-		}
-		addr = *(mtod(m, struct in_addr *));
-		/*
-		 * INADDR_ANY is used to remove a previous selection.
-		 * When no interface is selected, a default one is
-		 * chosen every time a multicast packet is sent.
-		 */
-		if (addr.s_addr == INADDR_ANY) {
-			imo->imo_multicast_ifp = NULL;
-			break;
-		}
-		/*
-		 * The selected interface is identified by its local
-		 * IP address.  Find the interface and confirm that
-		 * it supports multicasting.
-		 */
-		s = splimp();
-		INADDR_TO_IFP(addr, ifp);
-		if (ifp == NULL || (ifp->if_flags & IFF_MULTICAST) == 0) {
-			splx(s);
-			error = EADDRNOTAVAIL;
-			break;
-		}
-		imo->imo_multicast_ifp = ifp;
-		splx(s);
-		break;
-
-	case IP_MULTICAST_TTL:
-		/*
-		 * Set the IP time-to-live for outgoing multicast packets.
-		 */
-		if (m == NULL || m->m_len != 1) {
-			error = EINVAL;
-			break;
-		}
-		imo->imo_multicast_ttl = *(mtod(m, u_char *));
-		break;
-
-	case IP_MULTICAST_LOOP:
-		/*
-		 * Set the loopback flag for outgoing multicast packets.
-		 * Must be zero or one.
-		 */
-		if (m == NULL || m->m_len != 1 ||
-		   (loop = *(mtod(m, u_char *))) > 1) {
-			error = EINVAL;
-			break;
-		}
-		imo->imo_multicast_loop = loop;
-		break;
-
-	case IP_ADD_MEMBERSHIP:
-		/*
-		 * Add a multicast group membership.
-		 * Group must be a valid IP multicast address.
-		 */
-		if (m == NULL || m->m_len != sizeof(struct ip_mreq)) {
-			error = EINVAL;
-			break;
-		}
-		mreq = mtod(m, struct ip_mreq *);
-		if (!IN_MULTICAST(ntohl(mreq->imr_multiaddr.s_addr))) {
-			error = EINVAL;
-			break;
-		}
-		s = splimp();
-		/*
-		 * If no interface address was provided, use the interface of
-		 * the route to the given multicast address.
-		 */
-		if (mreq->imr_interface.s_addr == INADDR_ANY) {
-			bzero((caddr_t)&ro, sizeof(ro));
-			dst = (struct sockaddr_in *)&ro.ro_dst;
-			dst->sin_len = sizeof(*dst);
-			dst->sin_family = AF_INET;
-			dst->sin_addr = mreq->imr_multiaddr;
-			rtalloc(&ro);
-			if (ro.ro_rt == NULL) {
-				error = EADDRNOTAVAIL;
-				splx(s);
-				break;
-			}
-			ifp = ro.ro_rt->rt_ifp;
-			rtfree(ro.ro_rt);
-		}
-		else {
-			INADDR_TO_IFP(mreq->imr_interface, ifp);
-		}
-
-		/*
-		 * See if we found an interface, and confirm that it
-		 * supports multicast.
-		 */
-		if (ifp == NULL || (ifp->if_flags & IFF_MULTICAST) == 0) {
-			error = EADDRNOTAVAIL;
-			splx(s);
-			break;
-		}
-		/*
-		 * See if the membership already exists or if all the
-		 * membership slots are full.
-		 */
-		for (i = 0; i < imo->imo_num_memberships; ++i) {
-			if (imo->imo_membership[i]->inm_ifp == ifp &&
-			    imo->imo_membership[i]->inm_addr.s_addr
-						== mreq->imr_multiaddr.s_addr)
-				break;
-		}
-		if (i < imo->imo_num_memberships) {
-			error = EADDRINUSE;
-			splx(s);
-			break;
-		}
-		if (i == IP_MAX_MEMBERSHIPS) {
-			error = ETOOMANYREFS;
-			splx(s);
-			break;
-		}
-		/*
-		 * Everything looks good; add a new record to the multicast
-		 * address list for the given interface.
-		 */
-		if ((imo->imo_membership[i] =
-		    in_addmulti(&mreq->imr_multiaddr, ifp)) == NULL) {
-			error = ENOBUFS;
-			splx(s);
-			break;
-		}
-		++imo->imo_num_memberships;
-		splx(s);
-		break;
-
-	case IP_DROP_MEMBERSHIP:
-		/*
-		 * Drop a multicast group membership.
-		 * Group must be a valid IP multicast address.
-		 */
-		if (m == NULL || m->m_len != sizeof(struct ip_mreq)) {
-			error = EINVAL;
-			break;
-		}
-		mreq = mtod(m, struct ip_mreq *);
-		if (!IN_MULTICAST(ntohl(mreq->imr_multiaddr.s_addr))) {
-			error = EINVAL;
-			break;
-		}
-
-		s = splimp();
-		/*
-		 * If an interface address was specified, get a pointer
-		 * to its ifnet structure.
-		 */
-		if (mreq->imr_interface.s_addr == INADDR_ANY)
-			ifp = NULL;
-		else {
-			INADDR_TO_IFP(mreq->imr_interface, ifp);
-			if (ifp == NULL) {
-				error = EADDRNOTAVAIL;
-				splx(s);
-				break;
-			}
-		}
-		/*
-		 * Find the membership in the membership array.
-		 */
-		for (i = 0; i < imo->imo_num_memberships; ++i) {
-			if ((ifp == NULL ||
-			     imo->imo_membership[i]->inm_ifp == ifp) &&
-			     imo->imo_membership[i]->inm_addr.s_addr ==
-			     mreq->imr_multiaddr.s_addr)
-				break;
-		}
-		if (i == imo->imo_num_memberships) {
-			error = EADDRNOTAVAIL;
-			splx(s);
-			break;
-		}
-		/*
-		 * Give up the multicast address record to which the
-		 * membership points.
-		 */
-		in_delmulti(imo->imo_membership[i]);
-		/*
-		 * Remove the gap in the membership array.
-		 */
-		for (++i; i < imo->imo_num_memberships; ++i)
-			imo->imo_membership[i-1] = imo->imo_membership[i];
-		--imo->imo_num_memberships;
-		splx(s);
-		break;
-
-	default:
-		error = EOPNOTSUPP;
-		break;
-	}
-
-	/*
-	 * If all options have default values, no need to keep the mbuf.
-	 */
-	if (imo->imo_multicast_ifp == NULL &&
-	    imo->imo_multicast_vif == -1 &&
-	    imo->imo_multicast_ttl == IP_DEFAULT_MULTICAST_TTL &&
-	    imo->imo_multicast_loop == IP_DEFAULT_MULTICAST_LOOP &&
-	    imo->imo_num_memberships == 0) {
-		free(*imop, M_IPMOPTS);
-		*imop = NULL;
-	}
-
-	return (error);
-}
-
-/*
- * Return the IP multicast options in response to user getsockopt().
- */
-static int
-ip_getmoptions(optname, imo, mp)
-	int optname;
-	register struct ip_moptions *imo;
-	register struct mbuf **mp;
-{
-	u_char *ttl;
-	u_char *loop;
-	struct in_addr *addr;
-	struct in_ifaddr *ia;
-
-	*mp = m_get(M_WAIT, MT_SOOPTS);
-
-	switch (optname) {
-
-	case IP_MULTICAST_VIF: 
-		if (imo != NULL)
-			*(mtod(*mp, int *)) = imo->imo_multicast_vif;
-		else
-			*(mtod(*mp, int *)) = -1;
-		(*mp)->m_len = sizeof(int);
-		return(0);
-
-	case IP_MULTICAST_IF:
-		addr = mtod(*mp, struct in_addr *);
-		(*mp)->m_len = sizeof(struct in_addr);
-		if (imo == NULL || imo->imo_multicast_ifp == NULL)
-			addr->s_addr = INADDR_ANY;
-		else {
-			IFP_TO_IA(imo->imo_multicast_ifp, ia);
-			addr->s_addr = (ia == NULL) ? INADDR_ANY
-					: IA_SIN(ia)->sin_addr.s_addr;
-		}
-		return (0);
-
-	case IP_MULTICAST_TTL:
-		ttl = mtod(*mp, u_char *);
-		(*mp)->m_len = 1;
-		*ttl = (imo == NULL) ? IP_DEFAULT_MULTICAST_TTL
-				     : imo->imo_multicast_ttl;
-		return (0);
-
-	case IP_MULTICAST_LOOP:
-		loop = mtod(*mp, u_char *);
-		(*mp)->m_len = 1;
-		*loop = (imo == NULL) ? IP_DEFAULT_MULTICAST_LOOP
-				      : imo->imo_multicast_loop;
-		return (0);
-
-	default:
-		return (EOPNOTSUPP);
-	}
-}
-
-/*
- * Discard the IP multicast options.
- */
-void
-ip_freemoptions(imo)
-	register struct ip_moptions *imo;
-{
-	register int i;
-
-	if (imo != NULL) {
-		for (i = 0; i < imo->imo_num_memberships; ++i)
-			in_delmulti(imo->imo_membership[i]);
-		free(imo, M_IPMOPTS);
-	}
-}
-
-/*
- * Routine called from ip_output() to loop back a copy of an IP multicast
- * packet to the input queue of a specified interface.  Note that this
- * calls the output routine of the loopback "driver", but with an interface
- * pointer that might NOT be a loopback interface -- evil, but easier than
- * replicating that code here.
- */
-static void
-ip_mloopback(ifp, m, dst, hlen)
-	struct ifnet *ifp;
-	register struct mbuf *m;
-	register struct sockaddr_in *dst;
-	int hlen;
-{
-	register struct ip *ip;
-	struct mbuf *copym;
-
-	copym = m_copy(m, 0, M_COPYALL);
-	if (copym != NULL && (copym->m_flags & M_EXT || copym->m_len < hlen))
-		copym = m_pullup(copym, hlen);
-	if (copym != NULL) {
-		/*
-		 * We don't bother to fragment if the IP length is greater
-		 * than the interface's MTU.  Can this possibly matter?
-		 */
-		ip = mtod(copym, struct ip *);
-		ip->ip_len = htons((u_short)ip->ip_len);
-		ip->ip_off = htons((u_short)ip->ip_off);
-		ip->ip_sum = 0;
-		if (ip->ip_vhl == IP_VHL_BORING) {
-			ip->ip_sum = in_cksum_hdr(ip);
-		} else {
-			ip->ip_sum = in_cksum(copym, hlen);
-		}
-		/*
-		 * NB:
-		 * It's not clear whether there are any lingering
-		 * reentrancy problems in other areas which might
-		 * be exposed by using ip_input directly (in
-		 * particular, everything which modifies the packet
-		 * in-place).  Yet another option is using the
-		 * protosw directly to deliver the looped back
-		 * packet.  For the moment, we'll err on the side
-		 * of safety by continuing to abuse looutput().
-		 */
-#ifdef notdef
-		copym->m_pkthdr.rcvif = ifp;
-		ip_input(copym)
-#else
-		(void) looutput(ifp, copym, (struct sockaddr *)dst, NULL);
-#endif
-	}
-}
diff --git a/cpukit/libnetworking/netinet/ip_var.h b/cpukit/libnetworking/netinet/ip_var.h
deleted file mode 100644
index cc7908e9a3..0000000000
--- a/cpukit/libnetworking/netinet/ip_var.h
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)ip_var.h	8.2 (Berkeley) 1/9/95
- *	$Id$
- */
-
-#ifndef _NETINET_IP_VAR_H_
-#define	_NETINET_IP_VAR_H_
-
-/*
- * Overlay for ip header used by other protocols (tcp, udp).
- */
-struct ipovly {
-	caddr_t	ih_next, ih_prev;	/* for protocol sequence q's */
-	u_char	ih_x1;			/* (unused) */
-	u_char	ih_pr;			/* protocol */
-	u_short	ih_len;			/* protocol length */
-	struct	in_addr ih_src;		/* source internet address */
-	struct	in_addr ih_dst;		/* destination internet address */
-};
-
-/*
- * Ip reassembly queue structure.  Each fragment
- * being reassembled is attached to one of these structures.
- * They are timed out after ipq_ttl drops to 0, and may also
- * be reclaimed if memory becomes tight.
- */
-struct ipq {
-	struct	ipq *next,*prev;	/* to other reass headers */
-	u_char	ipq_ttl;		/* time for reass q to live */
-	u_char	ipq_p;			/* protocol of this fragment */
-	u_short	ipq_id;			/* sequence id for reassembly */
-	struct	ipasfrag *ipq_next,*ipq_prev;
-					/* to ip headers of fragments */
-	struct	in_addr ipq_src,ipq_dst;
-#ifdef IPDIVERT
-	u_short ipq_divert;		/* divert protocol port */
-#endif
-};
-
-/*
- * Ip header, when holding a fragment.
- *
- * Note: ipf_next must be at same offset as ipq_next above
- */
-struct	ipasfrag {
-#if BYTE_ORDER == LITTLE_ENDIAN 
-	u_char	ip_hl:4,
-		ip_v:4;
-#endif
-#if BYTE_ORDER == BIG_ENDIAN 
-	u_char	ip_v:4,
-		ip_hl:4;
-#endif
-	u_char	ipf_mff;		/* XXX overlays ip_tos: use low bit
-					 * to avoid destroying tos;
-					 * copied from (ip_off&IP_MF) */
-	u_short	ip_len;
-	u_short	ip_id;
-	u_short	ip_off;
-	u_char	ip_ttl;
-	u_char	ip_p;
-	u_short	ip_sum;
-	struct	ipasfrag *ipf_next;	/* next fragment */
-	struct	ipasfrag *ipf_prev;	/* previous fragment */
-};
-
-/*
- * Structure stored in mbuf in inpcb.ip_options
- * and passed to ip_output when ip options are in use.
- * The actual length of the options (including ipopt_dst)
- * is in m_len.
- */
-#define MAX_IPOPTLEN	40
-
-struct ipoption {
-	struct	in_addr ipopt_dst;	/* first-hop dst if source routed */
-	char	ipopt_list[MAX_IPOPTLEN];	/* options proper */
-};
-
-/*
- * Structure attached to inpcb.ip_moptions and
- * passed to ip_output when IP multicast options are in use.
- */
-struct ip_moptions {
-	struct	ifnet *imo_multicast_ifp; /* ifp for outgoing multicasts */
-	u_char	imo_multicast_ttl;	/* TTL for outgoing multicasts */
-	u_char	imo_multicast_loop;	/* 1 => hear sends if a member */
-	u_short	imo_num_memberships;	/* no. memberships this socket */
-	struct	in_multi *imo_membership[IP_MAX_MEMBERSHIPS];
-	u_long	imo_multicast_vif;	/* vif num outgoing multicasts */
-};
-
-struct	ipstat {
-	u_long	ips_total;		/* total packets received */
-	u_long	ips_badsum;		/* checksum bad */
-	u_long	ips_tooshort;		/* packet too short */
-	u_long	ips_toosmall;		/* not enough data */
-	u_long	ips_badhlen;		/* ip header length < data size */
-	u_long	ips_badlen;		/* ip length < ip header length */
-	u_long	ips_fragments;		/* fragments received */
-	u_long	ips_fragdropped;	/* frags dropped (dups, out of space) */
-	u_long	ips_fragtimeout;	/* fragments timed out */
-	u_long	ips_forward;		/* packets forwarded */
-	u_long	ips_cantforward;	/* packets rcvd for unreachable dest */
-	u_long	ips_redirectsent;	/* packets forwarded on same net */
-	u_long	ips_noproto;		/* unknown or unsupported protocol */
-	u_long	ips_delivered;		/* datagrams delivered to upper level*/
-	u_long	ips_localout;		/* total ip packets generated here */
-	u_long	ips_odropped;		/* lost packets due to nobufs, etc. */
-	u_long	ips_reassembled;	/* total packets reassembled ok */
-	u_long	ips_fragmented;		/* datagrams successfully fragmented */
-	u_long	ips_ofragments;		/* output fragments created */
-	u_long	ips_cantfrag;		/* don't fragment flag was set, etc. */
-	u_long	ips_badoptions;		/* error in option processing */
-	u_long	ips_noroute;		/* packets discarded due to no route */
-	u_long	ips_badvers;		/* ip version != 4 */
-	u_long	ips_rawout;		/* total raw ip packets generated */
-	u_long	ips_toolong;		/* ip length > max ip packet size */
-};
-
-#ifdef KERNEL
-/* flags passed to ip_output as last parameter */
-#define	IP_FORWARDING		0x1		/* most of ip header exists */
-#define	IP_RAWOUTPUT		0x2		/* raw ip header exists */
-#define	IP_ROUTETOIF		SO_DONTROUTE	/* bypass routing tables */
-#define	IP_ALLOWBROADCAST	SO_BROADCAST	/* can send broadcast packets */
-
-struct inpcb;
-struct route;
-
-extern struct	ipstat	ipstat;
-extern u_short	ip_id;				/* ip packet ctr, for ids */
-extern int	ip_defttl;			/* default IP ttl */
-extern u_char	ip_protox[];
-extern struct socket *ip_rsvpd;	/* reservation protocol daemon */
-extern struct socket *ip_mrouter; /* multicast routing daemon */
-extern int	(*legal_vif_num) __P((int));
-extern u_long	(*ip_mcast_src) __P((int));
-extern int rsvp_on;
-
-int	 ip_ctloutput __P((int, struct socket *, int, int, struct mbuf **));
-void	 ip_drain __P((void));
-void	 ip_freemoptions __P((struct ip_moptions *));
-void	 ip_init __P((void));
-extern int	 (*ip_mforward) __P((struct ip *, struct ifnet *, struct mbuf *,
-			  struct ip_moptions *));
-int	 ip_output __P((struct mbuf *,
-	    struct mbuf *, struct route *, int, struct ip_moptions *));
-void	 ip_savecontrol __P((struct inpcb *, struct mbuf **, struct ip *,
-		struct mbuf *));
-void	 ip_slowtimo __P((void));
-struct mbuf *
-	 ip_srcroute __P((void));
-void	 ip_stripoptions __P((struct mbuf *, struct mbuf *));
-int	 rip_ctloutput __P((int, struct socket *, int, int, struct mbuf **));
-void	 rip_init __P((void));
-void	 rip_input __P((struct mbuf *, int));
-int	 rip_output __P((struct mbuf *, struct socket *, u_long));
-int	 rip_usrreq __P((struct socket *,
-	    int, struct mbuf *, struct mbuf *, struct mbuf *));
-void	ipip_input __P((struct mbuf *, int));
-void	rsvp_input __P((struct mbuf *, int));
-int	ip_rsvp_init __P((struct socket *));
-int	ip_rsvp_done __P((void));
-int	ip_rsvp_vif_init __P((struct socket *, struct mbuf *));
-int	ip_rsvp_vif_done __P((struct socket *, struct mbuf *));
-void	ip_rsvp_force_done __P((struct socket *));
-
-#ifdef IPDIVERT
-void	div_init __P((void));
-void	div_input __P((struct mbuf *, int));
-int	div_usrreq __P((struct socket *,
-		int, struct mbuf *, struct mbuf *, struct mbuf *));
-extern u_short ip_divert_port;
-extern u_short ip_divert_ignore;
-#endif /* IPDIVERT */
-
-#endif /* KERNEL */
-
-#endif /* _NETINET_IP_VAR_H_ */
diff --git a/cpukit/libnetworking/netinet/raw_ip.c b/cpukit/libnetworking/netinet/raw_ip.c
deleted file mode 100644
index 44d58f1844..0000000000
--- a/cpukit/libnetworking/netinet/raw_ip.c
+++ /dev/null
@@ -1,486 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)raw_ip.c	8.7 (Berkeley) 5/15/95
- *	$Id$
- */
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/malloc.h>
-#include <sys/mbuf.h>
-#include <sys/socket.h>
-#include <sys/protosw.h>
-#include <sys/socketvar.h>
-#include <sys/errno.h>
-#include <sys/systm.h>
-
-#include <net/if.h>
-#include <net/route.h>
-
-#define _IP_VHL
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/in_pcb.h>
-#include <netinet/in_var.h>
-#include <netinet/ip_var.h>
-#include <netinet/ip_mroute.h>
-
-#include <netinet/ip_fw.h>
-
-#if !defined(COMPAT_IPFW) || COMPAT_IPFW == 1
-#undef COMPAT_IPFW
-#define COMPAT_IPFW 1
-#else
-#undef COMPAT_IPFW
-#endif
-
-static struct inpcbhead ripcb;
-static struct inpcbinfo ripcbinfo;
-
-/*
- * Nominal space allocated to a raw ip socket.
- */
-#define	RIPSNDQ		8192
-#define	RIPRCVQ		8192
-
-/*
- * Raw interface to IP protocol.
- */
-
-/*
- * Initialize raw connection block q.
- */
-void
-rip_init()
-{
-	LIST_INIT(&ripcb);
-	ripcbinfo.listhead = &ripcb;
-	/*
-	 * XXX We don't use the hash list for raw IP, but it's easier
-	 * to allocate a one entry hash list than it is to check all
-	 * over the place for hashbase == NULL.
-	 */
-	ripcbinfo.hashbase = hashinit(1, M_PCB, &ripcbinfo.hashmask);
-}
-
-static struct	sockaddr_in ripsrc = { sizeof(ripsrc), AF_INET };
-/*
- * Setup generic address and protocol structures
- * for raw_input routine, then pass them along with
- * mbuf chain.
- */
-void
-rip_input(m, iphlen)
-	struct mbuf *m;
-	int iphlen;
-{
-	register struct ip *ip = mtod(m, struct ip *);
-	register struct inpcb *inp;
-	struct inpcb *last = 0;
-	struct mbuf *opts = 0;
-
-	ripsrc.sin_addr = ip->ip_src;
-	for (inp = ripcb.lh_first; inp != NULL; inp = inp->inp_list.le_next) {
-		if (inp->inp_ip_p && inp->inp_ip_p != ip->ip_p)
-			continue;
-		if (inp->inp_laddr.s_addr &&
-                  inp->inp_laddr.s_addr != ip->ip_dst.s_addr)
-			continue;
-		if (inp->inp_faddr.s_addr &&
-                  inp->inp_faddr.s_addr != ip->ip_src.s_addr)
-			continue;
-		if (last) {
-			struct mbuf *n = m_copy(m, 0, (int)M_COPYALL);
-			if (n) {
-				if (last->inp_flags & INP_CONTROLOPTS ||
-				    last->inp_socket->so_options & SO_TIMESTAMP)
-				    ip_savecontrol(last, &opts, ip, n);
-				if (sbappendaddr(&last->inp_socket->so_rcv,
-				    (struct sockaddr *)&ripsrc, n,
-				    opts) == 0) {
-					/* should notify about lost packet */
-					m_freem(n);
-					if (opts)
-					    m_freem(opts);
-				} else
-					sorwakeup(last->inp_socket);
-				opts = 0;
-			}
-		}
-		last = inp;
-	}
-	if (last) {
-		if (last->inp_flags & INP_CONTROLOPTS ||
-		    last->inp_socket->so_options & SO_TIMESTAMP)
-			ip_savecontrol(last, &opts, ip, m);
-		if (sbappendaddr(&last->inp_socket->so_rcv,
-		    (struct sockaddr *)&ripsrc, m, opts) == 0) {
-			m_freem(m);
-			if (opts)
-			    m_freem(opts);
-		} else
-			sorwakeup(last->inp_socket);
-	} else {
-		m_freem(m);
-              ipstat.ips_noproto++;
-              ipstat.ips_delivered--;
-      }
-}
-
-/*
- * Generate IP header and pass packet to ip_output.
- * Tack on options user may have setup with control call.
- */
-int
-rip_output(m, so, dst)
-	register struct mbuf *m;
-	struct socket *so;
-	u_long dst;
-{
-	register struct ip *ip;
-	register struct inpcb *inp = sotoinpcb(so);
-	int flags = (so->so_options & SO_DONTROUTE) | IP_ALLOWBROADCAST;
-
-	/*
-	 * If the user handed us a complete IP packet, use it.
-	 * Otherwise, allocate an mbuf for a header and fill it in.
-	 */
-	if ((inp->inp_flags & INP_HDRINCL) == 0) {
-		if (m->m_pkthdr.len + sizeof(struct ip) > IP_MAXPACKET) {
-			m_freem(m);
-			return(EMSGSIZE);
-		}
-		M_PREPEND(m, sizeof(struct ip), M_WAIT);
-		ip = mtod(m, struct ip *);
-		ip->ip_tos = 0;
-		ip->ip_off = 0;
-		ip->ip_p = inp->inp_ip_p;
-		ip->ip_len = m->m_pkthdr.len;
-		ip->ip_src = inp->inp_laddr;
-		ip->ip_dst.s_addr = dst;
-		ip->ip_ttl = MAXTTL;
-	} else {
-		if (m->m_pkthdr.len > IP_MAXPACKET) {
-			m_freem(m);
-			return(EMSGSIZE);
-		}
-		ip = mtod(m, struct ip *);
-		/* don't allow both user specified and setsockopt options,
-		   and don't allow packet length sizes that will crash */
-		if (((IP_VHL_HL(ip->ip_vhl) != (sizeof (*ip) >> 2)) 
-		     && inp->inp_options)
-		    || (ip->ip_len > m->m_pkthdr.len)
-		    || (ip->ip_len < (IP_VHL_HL(ip->ip_vhl) << 2))) {
-			m_freem(m);
-			return EINVAL;
-		}
-		if (ip->ip_id == 0)
-			ip->ip_id = htons(ip_id++);
-		/* XXX prevent ip_output from overwriting header fields */
-		flags |= IP_RAWOUTPUT;
-		ipstat.ips_rawout++;
-	}
-	return (ip_output(m, inp->inp_options, &inp->inp_route, flags,
-			  inp->inp_moptions));
-}
-
-/*
- * Raw IP socket option processing.
- */
-int
-rip_ctloutput(op, so, level, optname, m)
-	int op;
-	struct socket *so;
-	int level, optname;
-	struct mbuf **m;
-{
-	register struct inpcb *inp = sotoinpcb(so);
-	register int error;
-
-	if (level != IPPROTO_IP) {
-		if (op == PRCO_SETOPT && *m)
-			(void)m_free(*m);
-		return (EINVAL);
-	}
-
-	switch (optname) {
-
-	case IP_HDRINCL:
-		error = 0;
-		if (op == PRCO_SETOPT) {
-			if (m == 0 || *m == 0 || (*m)->m_len < sizeof (int))
-				error = EINVAL;
-			else if (*mtod(*m, int *))
-				inp->inp_flags |= INP_HDRINCL;
-			else
-				inp->inp_flags &= ~INP_HDRINCL;
-			if (*m)
-				(void)m_free(*m);
-		} else {
-			*m = m_get(M_WAIT, MT_SOOPTS);
-			(*m)->m_len = sizeof (int);
-			*mtod(*m, int *) = inp->inp_flags & INP_HDRINCL;
-		}
-		return (error);
-
-#ifdef COMPAT_IPFW
-	case IP_FW_GET:
-		if (ip_fw_ctl_ptr == NULL || op == PRCO_SETOPT) {
-			if (*m) (void)m_free(*m);
-			return(EINVAL);
-		}
-		return (*ip_fw_ctl_ptr)(optname, m); 
-
-	case IP_FW_ADD:
-	case IP_FW_DEL:
-	case IP_FW_FLUSH:
-	case IP_FW_ZERO:
-		if (ip_fw_ctl_ptr == NULL || op != PRCO_SETOPT) {
-			if (*m) (void)m_free(*m);
-			return(EINVAL);
-		}
-		return (*ip_fw_ctl_ptr)(optname, m); 
-
-	case IP_NAT:
-		if (ip_nat_ctl_ptr == NULL) {
-			if (*m) (void)m_free(*m);
-			return(EINVAL);
-		}
-		return (*ip_nat_ctl_ptr)(op, m); 
-
-#endif
-	case IP_RSVP_ON:
-		return ip_rsvp_init(so);
-		break;
-
-	case IP_RSVP_OFF:
-		return ip_rsvp_done();
-		break;
-
-	case IP_RSVP_VIF_ON:
-		return ip_rsvp_vif_init(so, *m);
-
-	case IP_RSVP_VIF_OFF:
-		return ip_rsvp_vif_done(so, *m);
-
-	case MRT_INIT:
-	case MRT_DONE:
-	case MRT_ADD_VIF:
-	case MRT_DEL_VIF:
-	case MRT_ADD_MFC:
-	case MRT_DEL_MFC:
-	case MRT_VERSION:
-	case MRT_ASSERT:
-		if (op == PRCO_SETOPT) {
-			error = ip_mrouter_set(optname, so, *m);
-			if (*m)
-				(void)m_free(*m);
-		} else if (op == PRCO_GETOPT) {
-			error = ip_mrouter_get(optname, so, m);
-		} else
-			error = EINVAL;
-		return (error);
-	}
-	return (ip_ctloutput(op, so, level, optname, m));
-}
-
-static u_long	rip_sendspace = RIPSNDQ; /* XXX sysctl ? */
-static u_long	rip_recvspace = RIPRCVQ; /* XXX sysctl ? */
-
-/*ARGSUSED*/
-int
-rip_usrreq(so, req, m, nam, control)
-	register struct socket *so;
-	int req;
-	struct mbuf *m, *nam, *control;
-{
-	register int error = 0;
-	register struct inpcb *inp = sotoinpcb(so);
-	int s;
-
-	if (req == PRU_CONTROL)
-		return (in_control(so, (u_long)m, (caddr_t)nam,
-			(struct ifnet *)control));
-
-	switch (req) {
-
-	case PRU_ATTACH:
-		if (inp)
-			panic("rip_attach");
-		if ((so->so_state & SS_PRIV) == 0) {
-			error = EACCES;
-			break;
-		}
-		s = splnet();
-		error = in_pcballoc(so, &ripcbinfo);
-		splx(s);
-		if (error)
-			break;
-		error = soreserve(so, rip_sendspace, rip_recvspace);
-		if (error)
-			break;
-		inp = (struct inpcb *)so->so_pcb;
-		inp->inp_ip_p = (int)nam;
-		break;
-
-	case PRU_DISCONNECT:
-		if ((so->so_state & SS_ISCONNECTED) == 0) {
-			error = ENOTCONN;
-			break;
-		}
-		/* FALLTHROUGH */
-	case PRU_ABORT:
-		soisdisconnected(so);
-		/* FALLTHROUGH */
-	case PRU_DETACH:
-		if (inp == 0)
-			panic("rip_detach");
-		if (so == ip_mrouter)
-			ip_mrouter_done();
-		ip_rsvp_force_done(so);
-		if (so == ip_rsvpd)
-			ip_rsvp_done();
-		in_pcbdetach(inp);
-		break;
-
-	case PRU_BIND:
-	    {
-		struct sockaddr_in *addr = mtod(nam, struct sockaddr_in *);
-
-		if (nam->m_len != sizeof(*addr)) {
-			error = EINVAL;
-			break;
-		}
-		if ((ifnet == 0) ||
-		    ((addr->sin_family != AF_INET) &&
-		     (addr->sin_family != AF_IMPLINK)) ||
-		    (addr->sin_addr.s_addr &&
-		     ifa_ifwithaddr((struct sockaddr *)addr) == 0)) {
-			error = EADDRNOTAVAIL;
-			break;
-		}
-		inp->inp_laddr = addr->sin_addr;
-		break;
-	    }
-	case PRU_CONNECT:
-	    {
-		struct sockaddr_in *addr = mtod(nam, struct sockaddr_in *);
-
-		if (nam->m_len != sizeof(*addr)) {
-			error = EINVAL;
-			break;
-		}
-		if (ifnet == 0) {
-			error = EADDRNOTAVAIL;
-			break;
-		}
-		if ((addr->sin_family != AF_INET) &&
-		     (addr->sin_family != AF_IMPLINK)) {
-			error = EAFNOSUPPORT;
-			break;
-		}
-		inp->inp_faddr = addr->sin_addr;
-		soisconnected(so);
-		break;
-	    }
-
-	case PRU_CONNECT2:
-		error = EOPNOTSUPP;
-		break;
-
-	/*
-	 * Mark the connection as being incapable of further input.
-	 */
-	case PRU_SHUTDOWN:
-		socantsendmore(so);
-		break;
-
-	/*
-	 * Ship a packet out.  The appropriate raw output
-	 * routine handles any massaging necessary.
-	 */
-	case PRU_SEND:
-	    {
-		register u_long dst;
-
-		if (so->so_state & SS_ISCONNECTED) {
-			if (nam) {
-				error = EISCONN;
-				break;
-			}
-			dst = inp->inp_faddr.s_addr;
-		} else {
-			if (nam == NULL) {
-				error = ENOTCONN;
-				break;
-			}
-			dst = mtod(nam, struct sockaddr_in *)->sin_addr.s_addr;
-		}
-		error = rip_output(m, so, dst);
-		m = NULL;
-		break;
-	    }
-
-	case PRU_SENSE:
-		/*
-		 * stat: don't bother with a blocksize.
-		 */
-		return (0);
-
-	/*
-	 * Not supported.
-	 */
-	case PRU_RCVOOB:
-	case PRU_RCVD:
-	case PRU_LISTEN:
-	case PRU_ACCEPT:
-	case PRU_SENDOOB:
-		error = EOPNOTSUPP;
-		break;
-
-	case PRU_SOCKADDR:
-		in_setsockaddr(inp, nam);
-		break;
-
-	case PRU_PEERADDR:
-		in_setpeeraddr(inp, nam);
-		break;
-
-	default:
-		panic("rip_usrreq");
-	}
-	if (m != NULL)
-		m_freem(m);
-	return (error);
-}
diff --git a/cpukit/libnetworking/netinet/tcp.h b/cpukit/libnetworking/netinet/tcp.h
deleted file mode 100644
index 3585917aa3..0000000000
--- a/cpukit/libnetworking/netinet/tcp.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)tcp.h	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#ifndef _NETINET_TCP_H_
-#define _NETINET_TCP_H_
-
-typedef	u_long	tcp_seq;
-typedef u_long	tcp_cc;			/* connection count per rfc1644 */
-
-/*
- * TCP header.
- * Per RFC 793, September, 1981.
- */
-struct tcphdr {
-	u_short	th_sport;		/* source port */
-	u_short	th_dport;		/* destination port */
-	tcp_seq	th_seq;			/* sequence number */
-	tcp_seq	th_ack;			/* acknowledgement number */
-#if BYTE_ORDER == LITTLE_ENDIAN
-	u_char	th_x2:4,		/* (unused) */
-		th_off:4;		/* data offset */
-#endif
-#if BYTE_ORDER == BIG_ENDIAN
-	u_char	th_off:4,		/* data offset */
-		th_x2:4;		/* (unused) */
-#endif
-	u_char	th_flags;
-#define	TH_FIN	0x01
-#define	TH_SYN	0x02
-#define	TH_RST	0x04
-#define	TH_PUSH	0x08
-#define	TH_ACK	0x10
-#define	TH_URG	0x20
-#define TH_FLAGS (TH_FIN|TH_SYN|TH_RST|TH_ACK|TH_URG)
-
-	u_short	th_win;			/* window */
-	u_short	th_sum;			/* checksum */
-	u_short	th_urp;			/* urgent pointer */
-};
-
-#define	TCPOPT_EOL		0
-#define	TCPOPT_NOP		1
-#define	TCPOPT_MAXSEG		2
-#define    TCPOLEN_MAXSEG		4
-#define TCPOPT_WINDOW		3
-#define    TCPOLEN_WINDOW		3
-#define TCPOPT_SACK_PERMITTED	4		/* Experimental */
-#define    TCPOLEN_SACK_PERMITTED	2
-#define TCPOPT_SACK		5		/* Experimental */
-#define TCPOPT_TIMESTAMP	8
-#define    TCPOLEN_TIMESTAMP		10
-#define    TCPOLEN_TSTAMP_APPA		(TCPOLEN_TIMESTAMP+2) /* appendix A */
-#define    TCPOPT_TSTAMP_HDR		\
-    (TCPOPT_NOP<<24|TCPOPT_NOP<<16|TCPOPT_TIMESTAMP<<8|TCPOLEN_TIMESTAMP)
-
-#define	TCPOPT_CC		11		/* CC options: RFC-1644 */
-#define TCPOPT_CCNEW		12
-#define TCPOPT_CCECHO		13
-#define	   TCPOLEN_CC			6
-#define	   TCPOLEN_CC_APPA		(TCPOLEN_CC+2)
-#define	   TCPOPT_CC_HDR(ccopt)		\
-    (TCPOPT_NOP<<24|TCPOPT_NOP<<16|(ccopt)<<8|TCPOLEN_CC)
-
-/*
- * Default maximum segment size for TCP.
- * With an IP MSS of 576, this is 536,
- * but 512 is probably more convenient.
- * This should be defined as MIN(512, IP_MSS - sizeof (struct tcpiphdr)).
- */
-#define	TCP_MSS	512
-
-#define	TCP_MAXWIN	65535	/* largest value for (unscaled) window */
-#define	TTCP_CLIENT_SND_WND	4096	/* dflt send window for T/TCP client */
-
-#define TCP_MAX_WINSHIFT	14	/* maximum window shift */
-
-#define TCP_MAXHLEN	(0xf<<2)	/* max length of header in bytes */
-#define TCP_MAXOLEN	(TCP_MAXHLEN - sizeof(struct tcphdr))
-					/* max space left for options */
-
-/*
- * User-settable options (used with setsockopt).
- */
-#define	TCP_NODELAY	0x01	/* don't delay send to coalesce packets */
-#define	TCP_MAXSEG	0x02	/* set maximum segment size */
-#define TCP_NOPUSH	0x04	/* don't push last block of write */
-#define TCP_NOOPT	0x08	/* don't use TCP options */
-
-#endif
diff --git a/cpukit/libnetworking/netinet/tcp_debug.c b/cpukit/libnetworking/netinet/tcp_debug.c
deleted file mode 100644
index 864a01cb1a..0000000000
--- a/cpukit/libnetworking/netinet/tcp_debug.c
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)tcp_debug.c	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#include "opt_tcpdebug.h"
-
-#ifdef TCPDEBUG
-/* load symbolic names */
-#define PRUREQUESTS
-#define TCPSTATES
-#define	TCPTIMERS
-#define	TANAMES
-#endif
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/systm.h>
-#include <sys/mbuf.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/protosw.h>
-#include <sys/errno.h>
-
-#include <net/route.h>
-#include <net/if.h>
-
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/in_pcb.h>
-#include <netinet/ip_var.h>
-#include <netinet/tcp.h>
-#include <netinet/tcp_fsm.h>
-#include <netinet/tcp_seq.h>
-#include <netinet/tcp_timer.h>
-#include <netinet/tcp_var.h>
-#include <netinet/tcpip.h>
-#include <netinet/tcp_debug.h>
-
-#ifdef TCPDEBUG
-static int	tcpconsdebug = 0;
-#endif
-
-static struct tcp_debug tcp_debug[TCP_NDEBUG];
-static int	tcp_debx;
-
-/*
- * Tcp debug routines
- */
-void
-tcp_trace(act, ostate, tp, ti, req)
-	short act, ostate;
-	struct tcpcb *tp;
-	struct tcpiphdr *ti;
-	int req;
-{
-#ifdef TCPDEBUG
-	tcp_seq seq, ack;
-	int len, flags;
-#endif
-	struct tcp_debug *td = &tcp_debug[tcp_debx++];
-
-	if (tcp_debx == TCP_NDEBUG)
-		tcp_debx = 0;
-	td->td_time = iptime();
-	td->td_act = act;
-	td->td_ostate = ostate;
-	td->td_tcb = (caddr_t)tp;
-	if (tp)
-		td->td_cb = *tp;
-	else
-		bzero((caddr_t)&td->td_cb, sizeof (*tp));
-	if (ti)
-		td->td_ti = *ti;
-	else
-		bzero((caddr_t)&td->td_ti, sizeof (*ti));
-	td->td_req = req;
-#ifdef TCPDEBUG
-	if (tcpconsdebug == 0)
-		return;
-	if (tp)
-		printf("%p %s:", tp, tcpstates[ostate]);
-	else
-		printf("???????? ");
-	printf("%s ", tanames[act]);
-	switch (act) {
-
-	case TA_INPUT:
-	case TA_OUTPUT:
-	case TA_DROP:
-		if (ti == 0)
-			break;
-		seq = ti->ti_seq;
-		ack = ti->ti_ack;
-		len = ti->ti_len;
-		if (act == TA_OUTPUT) {
-			seq = ntohl(seq);
-			ack = ntohl(ack);
-			len = ntohs((u_short)len);
-		}
-		if (act == TA_OUTPUT)
-			len -= sizeof (struct tcphdr);
-		if (len)
-			printf("[%x..%x)", seq, seq+len);
-		else
-			printf("%x", seq);
-		printf("@%x, urp=%x", ack, ti->ti_urp);
-		flags = ti->ti_flags;
-		if (flags) {
-			char *cp = "<";
-#define pf(f) {					\
-	if (ti->ti_flags & TH_##f) {		\
-		printf("%s%s", cp, #f);		\
-		cp = ",";			\
-	}					\
-}
-			pf(SYN); pf(ACK); pf(FIN); pf(RST); pf(PUSH); pf(URG);
-			printf(">");
-		}
-		break;
-
-	case TA_USER:
-		printf("%s", prurequests[req&0xff]);
-		if ((req & 0xff) == PRU_SLOWTIMO)
-			printf("<%s>", tcptimers[req>>8]);
-		break;
-	}
-	if (tp)
-		printf(" -> %s", tcpstates[tp->t_state]);
-	/* print out internal state of tp !?! */
-	printf("\n");
-	if (tp == 0)
-		return;
-	printf("\trcv_(nxt,wnd,up) (%x,%x,%x) snd_(una,nxt,max) (%x,%x,%x)\n",
-	    tp->rcv_nxt, tp->rcv_wnd, tp->rcv_up, tp->snd_una, tp->snd_nxt,
-	    tp->snd_max);
-	printf("\tsnd_(wl1,wl2,wnd) (%x,%x,%x)\n",
-	    tp->snd_wl1, tp->snd_wl2, tp->snd_wnd);
-#endif /* TCPDEBUG */
-}
diff --git a/cpukit/libnetworking/netinet/tcp_debug.h b/cpukit/libnetworking/netinet/tcp_debug.h
deleted file mode 100644
index a33743b077..0000000000
--- a/cpukit/libnetworking/netinet/tcp_debug.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)tcp_debug.h	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#ifndef _NETINET_TCP_DEBUG_H_
-#define	_NETINET_TCP_DEBUG_H_
-
-struct	tcp_debug {
-	n_time	td_time;
-	short	td_act;
-	short	td_ostate;
-	caddr_t	td_tcb;
-	struct	tcpiphdr td_ti;
-	short	td_req;
-	struct	tcpcb td_cb;
-};
-
-#define	TA_INPUT 	0
-#define	TA_OUTPUT	1
-#define	TA_USER		2
-#define	TA_RESPOND	3
-#define	TA_DROP		4
-
-#ifdef TANAMES
-static char	*tanames[] =
-    { "input", "output", "user", "respond", "drop" };
-#endif
-
-#define	TCP_NDEBUG 100
-
-#ifndef KERNEL
-/* XXX common variables for broken applications. */
-struct	tcp_debug tcp_debug[TCP_NDEBUG];
-int	tcp_debx;
-#endif
-
-#endif /* !_NETINET_TCP_DEBUG_H_ */
diff --git a/cpukit/libnetworking/netinet/tcp_fsm.h b/cpukit/libnetworking/netinet/tcp_fsm.h
deleted file mode 100644
index 3f2c12f54f..0000000000
--- a/cpukit/libnetworking/netinet/tcp_fsm.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)tcp_fsm.h	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#ifndef _NETINET_TCP_FSM_H_
-#define _NETINET_TCP_FSM_H_
-
-/*
- * TCP FSM state definitions.
- * Per RFC793, September, 1981.
- */
-
-#define	TCP_NSTATES	11
-
-#define	TCPS_CLOSED		0	/* closed */
-#define	TCPS_LISTEN		1	/* listening for connection */
-#define	TCPS_SYN_SENT		2	/* active, have sent syn */
-#define	TCPS_SYN_RECEIVED	3	/* have send and received syn */
-/* states < TCPS_ESTABLISHED are those where connections not established */
-#define	TCPS_ESTABLISHED	4	/* established */
-#define	TCPS_CLOSE_WAIT		5	/* rcvd fin, waiting for close */
-/* states > TCPS_CLOSE_WAIT are those where user has closed */
-#define	TCPS_FIN_WAIT_1		6	/* have closed, sent fin */
-#define	TCPS_CLOSING		7	/* closed xchd FIN; await FIN ACK */
-#define	TCPS_LAST_ACK		8	/* had fin and close; await FIN ACK */
-/* states > TCPS_CLOSE_WAIT && < TCPS_FIN_WAIT_2 await ACK of FIN */
-#define	TCPS_FIN_WAIT_2		9	/* have closed, fin is acked */
-#define	TCPS_TIME_WAIT		10	/* in 2*msl quiet wait after close */
-
-#define	TCPS_HAVERCVDSYN(s)	((s) >= TCPS_SYN_RECEIVED)
-#define TCPS_HAVEESTABLISHED(s)	((s) >= TCPS_ESTABLISHED)
-#define	TCPS_HAVERCVDFIN(s)	((s) >= TCPS_TIME_WAIT)
-
-#ifdef	TCPOUTFLAGS
-/*
- * Flags used when sending segments in tcp_output.
- * Basic flags (TH_RST,TH_ACK,TH_SYN,TH_FIN) are totally
- * determined by state, with the proviso that TH_FIN is sent only
- * if all data queued for output is included in the segment.
- */
-static u_char	tcp_outflags[TCP_NSTATES] = {
-    TH_RST|TH_ACK, 0, TH_SYN, TH_SYN|TH_ACK,
-    TH_ACK, TH_ACK,
-    TH_FIN|TH_ACK, TH_FIN|TH_ACK, TH_FIN|TH_ACK, TH_ACK, TH_ACK,
-};
-#endif
-
-#ifdef KPROF
-int	tcp_acounts[TCP_NSTATES][PRU_NREQ];
-#endif
-
-#ifdef	TCPSTATES
-char *tcpstates[] = {
-	"CLOSED",	"LISTEN",	"SYN_SENT",	"SYN_RCVD",
-	"ESTABLISHED",	"CLOSE_WAIT",	"FIN_WAIT_1",	"CLOSING",
-	"LAST_ACK",	"FIN_WAIT_2",	"TIME_WAIT",
-};
-#endif
-
-#endif
diff --git a/cpukit/libnetworking/netinet/tcp_input.c b/cpukit/libnetworking/netinet/tcp_input.c
deleted file mode 100644
index bc55a79ae2..0000000000
--- a/cpukit/libnetworking/netinet/tcp_input.c
+++ /dev/null
@@ -1,2149 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1988, 1990, 1993, 1994, 1995
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)tcp_input.c	8.12 (Berkeley) 5/24/95
- *	$Id$
- */
-
-#include "opt_tcpdebug.h"
-
-#ifndef TUBA_INCLUDE
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/sysctl.h>
-#include <sys/malloc.h>
-#include <sys/mbuf.h>
-#include <sys/protosw.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/errno.h>
-#include <sys/syslog.h>
-
-#include <machine/cpu.h>	/* before tcp_seq.h, for tcp_random18() */
-
-#include <net/if.h>
-#include <net/route.h>
-
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/in_pcb.h>
-#include <netinet/ip_var.h>
-#include <netinet/tcp.h>
-#include <netinet/tcp_fsm.h>
-#include <netinet/tcp_seq.h>
-#include <netinet/tcp_timer.h>
-#include <netinet/tcp_var.h>
-#include <netinet/tcpip.h>
-#ifdef TCPDEBUG
-#include <netinet/tcp_debug.h>
-static struct	tcpiphdr tcp_saveti;
-#endif
-
-static int	tcprexmtthresh = 3;
-tcp_seq	tcp_iss;
-tcp_cc	tcp_ccgen;
-
-struct	tcpstat tcpstat;
-SYSCTL_STRUCT(_net_inet_tcp, TCPCTL_STATS, stats,
-	CTLFLAG_RD, &tcpstat , tcpstat, "");
-
-static int log_in_vain = 0;
-SYSCTL_INT(_net_inet_tcp, OID_AUTO, log_in_vain, CTLFLAG_RW, 
-	&log_in_vain, 0, "");
-
-u_long	tcp_now;
-struct inpcbhead tcb;
-struct inpcbinfo tcbinfo;
-
-static void	 tcp_dooptions __P((struct tcpcb *,
-	    u_char *, int, struct tcpiphdr *, struct tcpopt *));
-static void	 tcp_pulloutofband __P((struct socket *,
-	    struct tcpiphdr *, struct mbuf *));
-static int	 tcp_reass __P((struct tcpcb *, struct tcpiphdr *, struct mbuf *));
-static void	 tcp_xmit_timer __P((struct tcpcb *, int));
-
-#endif /* TUBA_INCLUDE */
-
-/*
- * Insert segment ti into reassembly queue of tcp with
- * control block tp.  Return TH_FIN if reassembly now includes
- * a segment with FIN.  The macro form does the common case inline
- * (segment is the next to be received on an established connection,
- * and the queue is empty), avoiding linkage into and removal
- * from the queue and repetition of various conversions.
- * Set DELACK for segments received in order, but ack immediately
- * when segments are out of order (so fast retransmit can work).
- */
-#ifdef TCP_ACK_HACK
-#define	TCP_REASS(tp, ti, m, so, flags) { \
-	if ((ti)->ti_seq == (tp)->rcv_nxt && \
-	    (tp)->seg_next == (struct tcpiphdr *)(tp) && \
-	    (tp)->t_state == TCPS_ESTABLISHED) { \
-		if (ti->ti_flags & TH_PUSH) \
-			tp->t_flags |= TF_ACKNOW; \
-		else \
-			tp->t_flags |= TF_DELACK; \
-		(tp)->rcv_nxt += (ti)->ti_len; \
-		flags = (ti)->ti_flags & TH_FIN; \
-		tcpstat.tcps_rcvpack++;\
-		tcpstat.tcps_rcvbyte += (ti)->ti_len;\
-		sbappend(&(so)->so_rcv, (m)); \
-		sorwakeup(so); \
-	} else { \
-		(flags) = tcp_reass((tp), (ti), (m)); \
-		tp->t_flags |= TF_ACKNOW; \
-	} \
-}
-#else
-#define	TCP_REASS(tp, ti, m, so, flags) { \
-	if ((ti)->ti_seq == (tp)->rcv_nxt && \
-	    (tp)->seg_next == (struct tcpiphdr *)(tp) && \
-	    (tp)->t_state == TCPS_ESTABLISHED) { \
-		tp->t_flags |= TF_DELACK; \
-		(tp)->rcv_nxt += (ti)->ti_len; \
-		flags = (ti)->ti_flags & TH_FIN; \
-		tcpstat.tcps_rcvpack++;\
-		tcpstat.tcps_rcvbyte += (ti)->ti_len;\
-		sbappend(&(so)->so_rcv, (m)); \
-		sorwakeup(so); \
-	} else { \
-		(flags) = tcp_reass((tp), (ti), (m)); \
-		tp->t_flags |= TF_ACKNOW; \
-	} \
-}
-#endif
-#ifndef TUBA_INCLUDE
-
-static int
-tcp_reass(tp, ti, m)
-	register struct tcpcb *tp;
-	register struct tcpiphdr *ti;
-	struct mbuf *m;
-{
-	register struct tcpiphdr *q;
-	struct socket *so = tp->t_inpcb->inp_socket;
-	int flags;
-
-	/*
-	 * Call with ti==0 after become established to
-	 * force pre-ESTABLISHED data up to user socket.
-	 */
-	if (ti == 0)
-		goto present;
-
-	/*
-	 * Find a segment which begins after this one does.
-	 */
-	for (q = tp->seg_next; q != (struct tcpiphdr *)tp;
-	    q = (struct tcpiphdr *)q->ti_next)
-		if (SEQ_GT(q->ti_seq, ti->ti_seq))
-			break;
-
-	/*
-	 * If there is a preceding segment, it may provide some of
-	 * our data already.  If so, drop the data from the incoming
-	 * segment.  If it provides all of our data, drop us.
-	 */
-	if ((struct tcpiphdr *)q->ti_prev != (struct tcpiphdr *)tp) {
-		register int i;
-		q = (struct tcpiphdr *)q->ti_prev;
-		/* conversion to int (in i) handles seq wraparound */
-		i = q->ti_seq + q->ti_len - ti->ti_seq;
-		if (i > 0) {
-			if (i >= ti->ti_len) {
-				tcpstat.tcps_rcvduppack++;
-				tcpstat.tcps_rcvdupbyte += ti->ti_len;
-				m_freem(m);
-				/*
-				 * Try to present any queued data
-				 * at the left window edge to the user.
-				 * This is needed after the 3-WHS
-				 * completes.
-				 */
-				goto present;	/* ??? */
-			}
-			m_adj(m, i);
-			ti->ti_len -= i;
-			ti->ti_seq += i;
-		}
-		q = (struct tcpiphdr *)(q->ti_next);
-	}
-	tcpstat.tcps_rcvoopack++;
-	tcpstat.tcps_rcvoobyte += ti->ti_len;
-	REASS_MBUF(ti) = m;		/* XXX */
-
-	/*
-	 * While we overlap succeeding segments trim them or,
-	 * if they are completely covered, dequeue them.
-	 */
-	while (q != (struct tcpiphdr *)tp) {
-		register int i = (ti->ti_seq + ti->ti_len) - q->ti_seq;
-		if (i <= 0)
-			break;
-		if (i < q->ti_len) {
-			q->ti_seq += i;
-			q->ti_len -= i;
-			m_adj(REASS_MBUF(q), i);
-			break;
-		}
-		q = (struct tcpiphdr *)q->ti_next;
-		m = REASS_MBUF((struct tcpiphdr *)q->ti_prev);
-		remque(q->ti_prev);
-		m_freem(m);
-	}
-
-	/*
-	 * Stick new segment in its place.
-	 */
-	insque(ti, q->ti_prev);
-
-present:
-	/*
-	 * Present data to user, advancing rcv_nxt through
-	 * completed sequence space.
-	 */
-	if (!TCPS_HAVEESTABLISHED(tp->t_state))
-		return (0);
-	ti = tp->seg_next;
-	if (ti == (struct tcpiphdr *)tp || ti->ti_seq != tp->rcv_nxt)
-		return (0);
-	do {
-		tp->rcv_nxt += ti->ti_len;
-		flags = ti->ti_flags & TH_FIN;
-		remque(ti);
-		m = REASS_MBUF(ti);
-		ti = (struct tcpiphdr *)ti->ti_next;
-		if (so->so_state & SS_CANTRCVMORE)
-			m_freem(m);
-		else
-			sbappend(&so->so_rcv, m);
-	} while (ti != (struct tcpiphdr *)tp && ti->ti_seq == tp->rcv_nxt);
-	sorwakeup(so);
-	return (flags);
-}
-
-/*
- * TCP input routine, follows pages 65-76 of the
- * protocol specification dated September, 1981 very closely.
- */
-void
-tcp_input(m, iphlen)
-	register struct mbuf *m;
-	int iphlen;
-{
-	register struct tcpiphdr *ti;
-	register struct inpcb *inp;
-	u_char *optp = NULL;
-	int optlen = 0;
-	int len, tlen, off;
-	register struct tcpcb *tp = 0;
-	register int tiflags;
-	struct socket *so = 0;
-	int todrop, acked, ourfinisacked, needoutput = 0;
-	struct in_addr laddr;
-	int dropsocket = 0;
-	int iss = 0;
-	u_long tiwin;
-	struct tcpopt to;		/* options in this segment */
-	struct rmxp_tao *taop;		/* pointer to our TAO cache entry */
-	struct rmxp_tao	tao_noncached;	/* in case there's no cached entry */
-#ifdef TCPDEBUG
-	short ostate = 0;
-#endif
-
-	bzero((char *)&to, sizeof(to));
-
-	tcpstat.tcps_rcvtotal++;
-	/*
-	 * Get IP and TCP header together in first mbuf.
-	 * Note: IP leaves IP header in first mbuf.
-	 */
-	ti = mtod(m, struct tcpiphdr *);
-	if (iphlen > sizeof (struct ip))
-		ip_stripoptions(m, (struct mbuf *)0);
-	if (m->m_len < sizeof (struct tcpiphdr)) {
-		if ((m = m_pullup(m, sizeof (struct tcpiphdr))) == 0) {
-			tcpstat.tcps_rcvshort++;
-			return;
-		}
-		ti = mtod(m, struct tcpiphdr *);
-	}
-
-	/*
-	 * Checksum extended TCP header and data.
-	 */
-	tlen = ((struct ip *)ti)->ip_len;
-	len = sizeof (struct ip) + tlen;
-	ti->ti_next = ti->ti_prev = 0;
-	ti->ti_x1 = 0;
-	ti->ti_len = (u_short)tlen;
-	HTONS(ti->ti_len);
-	ti->ti_sum = in_cksum(m, len);
-	if (ti->ti_sum) {
-		tcpstat.tcps_rcvbadsum++;
-		goto drop;
-	}
-#endif /* TUBA_INCLUDE */
-
-	/*
-	 * Check that TCP offset makes sense,
-	 * pull out TCP options and adjust length.		XXX
-	 */
-	off = ti->ti_off << 2;
-	if (off < sizeof (struct tcphdr) || off > tlen) {
-		tcpstat.tcps_rcvbadoff++;
-		goto drop;
-	}
-	tlen -= off;
-	ti->ti_len = tlen;
-	if (off > sizeof (struct tcphdr)) {
-		if (m->m_len < sizeof(struct ip) + off) {
-			if ((m = m_pullup(m, sizeof (struct ip) + off)) == 0) {
-				tcpstat.tcps_rcvshort++;
-				return;
-			}
-			ti = mtod(m, struct tcpiphdr *);
-		}
-		optlen = off - sizeof (struct tcphdr);
-		optp = mtod(m, u_char *) + sizeof (struct tcpiphdr);
-	}
-	tiflags = ti->ti_flags;
-
-	/*
-	 * Convert TCP protocol specific fields to host format.
-	 */
-	NTOHL(ti->ti_seq);
-	NTOHL(ti->ti_ack);
-	NTOHS(ti->ti_win);
-	NTOHS(ti->ti_urp);
-
-	/*
-	 * Drop TCP, IP headers and TCP options.
-	 */
-	m->m_data += sizeof(struct tcpiphdr)+off-sizeof(struct tcphdr);
-	m->m_len  -= sizeof(struct tcpiphdr)+off-sizeof(struct tcphdr);
-
-	/*
-	 * Locate pcb for segment.
-	 */
-findpcb:
-	inp = in_pcblookuphash(&tcbinfo, ti->ti_src, ti->ti_sport,
-	    ti->ti_dst, ti->ti_dport, 1);
-
-	/*
-	 * If the state is CLOSED (i.e., TCB does not exist) then
-	 * all data in the incoming segment is discarded.
-	 * If the TCB exists but is in CLOSED state, it is embryonic,
-	 * but should either do a listen or a connect soon.
-	 */
-	if (inp == NULL) {
-		if (log_in_vain && tiflags & TH_SYN) {
-			char buf[4*sizeof "123"];
-
-			strcpy(buf, inet_ntoa(ti->ti_dst));
-			log(LOG_INFO, "Connection attempt to TCP %s:%d"
-			    " from %s:%d\n",
-			    buf, ntohs(ti->ti_dport),
-			    inet_ntoa(ti->ti_src), ntohs(ti->ti_sport));
-		}
-		goto dropwithreset;
-	}
-	tp = intotcpcb(inp);
-	if (tp == 0)
-		goto dropwithreset;
-	if (tp->t_state == TCPS_CLOSED)
-		goto drop;
-
-	/* Unscale the window into a 32-bit value. */
-	if ((tiflags & TH_SYN) == 0)
-		tiwin = ti->ti_win << tp->snd_scale;
-	else
-		tiwin = ti->ti_win;
-
-	so = inp->inp_socket;
-	if (so->so_options & (SO_DEBUG|SO_ACCEPTCONN)) {
-#ifdef TCPDEBUG
-		if (so->so_options & SO_DEBUG) {
-			ostate = tp->t_state;
-			tcp_saveti = *ti;
-		}
-#endif
-		if (so->so_options & SO_ACCEPTCONN) {
-			register struct tcpcb *tp0 = tp;
-			struct socket *so2;
-			if ((tiflags & (TH_RST|TH_ACK|TH_SYN)) != TH_SYN) {
-				/*
-				 * Note: dropwithreset makes sure we don't
-				 * send a RST in response to a RST.
-				 */
-				if (tiflags & TH_ACK) {
-					tcpstat.tcps_badsyn++;
-					goto dropwithreset;
-				}
-				goto drop;
-			}
-			so2 = sonewconn(so, 0);
-			if (so2 == 0) {
-				tcpstat.tcps_listendrop++;
-				so2 = sodropablereq(so);
-				if (so2) {
-					tcp_drop(sototcpcb(so2), ETIMEDOUT);
-					so2 = sonewconn(so, 0);
-				}
-				if (!so2)
-					goto drop;
-			}
-			so = so2;
-			/*
-			 * This is ugly, but ....
-			 *
-			 * Mark socket as temporary until we're
-			 * committed to keeping it.  The code at
-			 * ``drop'' and ``dropwithreset'' check the
-			 * flag dropsocket to see if the temporary
-			 * socket created here should be discarded.
-			 * We mark the socket as discardable until
-			 * we're committed to it below in TCPS_LISTEN.
-			 */
-			dropsocket++;
-			inp = (struct inpcb *)so->so_pcb;
-			inp->inp_laddr = ti->ti_dst;
-			inp->inp_lport = ti->ti_dport;
-			in_pcbrehash(inp);
-#if BSD>=43
-			inp->inp_options = ip_srcroute();
-#endif
-			tp = intotcpcb(inp);
-			tp->t_state = TCPS_LISTEN;
-			tp->t_flags |= tp0->t_flags & (TF_NOPUSH|TF_NOOPT);
-
-			/* Compute proper scaling value from buffer space */
-			while (tp->request_r_scale < TCP_MAX_WINSHIFT &&
-			   TCP_MAXWIN << tp->request_r_scale < so->so_rcv.sb_hiwat)
-				tp->request_r_scale++;
-		}
-	}
-
-	/*
-	 * Segment received on connection.
-	 * Reset idle time and keep-alive timer.
-	 */
-	tp->t_idle = 0;
-	if (TCPS_HAVEESTABLISHED(tp->t_state))
-		tp->t_timer[TCPT_KEEP] = tcp_keepidle;
-
-	/*
-	 * Process options if not in LISTEN state,
-	 * else do it below (after getting remote address).
-	 */
-	if (tp->t_state != TCPS_LISTEN)
-		tcp_dooptions(tp, optp, optlen, ti, &to);
-
-	/*
-	 * Header prediction: check for the two common cases
-	 * of a uni-directional data xfer.  If the packet has
-	 * no control flags, is in-sequence, the window didn't
-	 * change and we're not retransmitting, it's a
-	 * candidate.  If the length is zero and the ack moved
-	 * forward, we're the sender side of the xfer.  Just
-	 * free the data acked & wake any higher level process
-	 * that was blocked waiting for space.  If the length
-	 * is non-zero and the ack didn't move, we're the
-	 * receiver side.  If we're getting packets in-order
-	 * (the reassembly queue is empty), add the data to
-	 * the socket buffer and note that we need a delayed ack.
-	 * Make sure that the hidden state-flags are also off.
-	 * Since we check for TCPS_ESTABLISHED above, it can only
-	 * be TH_NEEDSYN.
-	 */
-	if (tp->t_state == TCPS_ESTABLISHED &&
-	    (tiflags & (TH_SYN|TH_FIN|TH_RST|TH_URG|TH_ACK)) == TH_ACK &&
-	    ((tp->t_flags & (TF_NEEDSYN|TF_NEEDFIN)) == 0) &&
-	    ((to.to_flag & TOF_TS) == 0 ||
-	     TSTMP_GEQ(to.to_tsval, tp->ts_recent)) &&
-	    /*
-	     * Using the CC option is compulsory if once started:
-	     *   the segment is OK if no T/TCP was negotiated or
-	     *   if the segment has a CC option equal to CCrecv
-	     */
-	    ((tp->t_flags & (TF_REQ_CC|TF_RCVD_CC)) != (TF_REQ_CC|TF_RCVD_CC) ||
-	     ((to.to_flag & TOF_CC) != 0 && to.to_cc == tp->cc_recv)) &&
-	    ti->ti_seq == tp->rcv_nxt &&
-	    tiwin && tiwin == tp->snd_wnd &&
-	    tp->snd_nxt == tp->snd_max) {
-
-		/*
-		 * If last ACK falls within this segment's sequence numbers,
-		 * record the timestamp.
-		 * NOTE that the test is modified according to the latest
-		 * proposal of the tcplw@cray.com list (Braden 1993/04/26).
-		 */
-		if ((to.to_flag & TOF_TS) != 0 &&
-		   SEQ_LEQ(ti->ti_seq, tp->last_ack_sent)) {
-			tp->ts_recent_age = tcp_now;
-			tp->ts_recent = to.to_tsval;
-		}
-
-		if (ti->ti_len == 0) {
-			if (SEQ_GT(ti->ti_ack, tp->snd_una) &&
-			    SEQ_LEQ(ti->ti_ack, tp->snd_max) &&
-			    tp->snd_cwnd >= tp->snd_wnd &&
-			    tp->t_dupacks < tcprexmtthresh) {
-				/*
-				 * this is a pure ack for outstanding data.
-				 */
-				++tcpstat.tcps_predack;
-				if ((to.to_flag & TOF_TS) != 0)
-					tcp_xmit_timer(tp,
-					    tcp_now - to.to_tsecr + 1);
-				else if (tp->t_rtt &&
-					    SEQ_GT(ti->ti_ack, tp->t_rtseq))
-					tcp_xmit_timer(tp, tp->t_rtt);
-				acked = ti->ti_ack - tp->snd_una;
-				tcpstat.tcps_rcvackpack++;
-				tcpstat.tcps_rcvackbyte += acked;
-				sbdrop(&so->so_snd, acked);
-				tp->snd_una = ti->ti_ack;
-				m_freem(m);
-
-				/*
-				 * If all outstanding data are acked, stop
-				 * retransmit timer, otherwise restart timer
-				 * using current (possibly backed-off) value.
-				 * If process is waiting for space,
-				 * wakeup/selwakeup/signal.  If data
-				 * are ready to send, let tcp_output
-				 * decide between more output or persist.
-				 */
-				if (tp->snd_una == tp->snd_max)
-					tp->t_timer[TCPT_REXMT] = 0;
-				else if (tp->t_timer[TCPT_PERSIST] == 0)
-					tp->t_timer[TCPT_REXMT] = tp->t_rxtcur;
-
-				if (so->so_snd.sb_flags & SB_NOTIFY)
-					sowwakeup(so);
-				if (so->so_snd.sb_cc)
-					(void) tcp_output(tp);
-				return;
-			}
-		} else if (ti->ti_ack == tp->snd_una &&
-		    tp->seg_next == (struct tcpiphdr *)tp &&
-		    ti->ti_len <= sbspace(&so->so_rcv)) {
-			/*
-			 * this is a pure, in-sequence data packet
-			 * with nothing on the reassembly queue and
-			 * we have enough buffer space to take it.
-			 */
-			++tcpstat.tcps_preddat;
-			tp->rcv_nxt += ti->ti_len;
-			tcpstat.tcps_rcvpack++;
-			tcpstat.tcps_rcvbyte += ti->ti_len;
-			/*
-			 * Add data to socket buffer.
-			 */
-			sbappend(&so->so_rcv, m);
-			sorwakeup(so);
-#ifdef TCP_ACK_HACK
-			/*
-			 * If this is a short packet, then ACK now - with Nagel
-			 *	congestion avoidance sender won't send more until
-			 *	he gets an ACK.
-			 */
-			if (tiflags & TH_PUSH) {
-				tp->t_flags |= TF_ACKNOW;
-				tcp_output(tp);
-			} else {
-				tp->t_flags |= TF_DELACK;
-			}
-#else
-			tp->t_flags |= TF_DELACK;
-#endif
-			return;
-		}
-	}
-
-	/*
-	 * Calculate amount of space in receive window,
-	 * and then do TCP input processing.
-	 * Receive window is amount of space in rcv queue,
-	 * but not less than advertised window.
-	 */
-	{ int win;
-
-	win = sbspace(&so->so_rcv);
-	if (win < 0)
-		win = 0;
-	tp->rcv_wnd = imax(win, (int)(tp->rcv_adv - tp->rcv_nxt));
-	}
-
-	switch (tp->t_state) {
-
-	/*
-	 * If the state is LISTEN then ignore segment if it contains an RST.
-	 * If the segment contains an ACK then it is bad and send a RST.
-	 * If it does not contain a SYN then it is not interesting; drop it.
-	 * If it is from this socket, drop it, it must be forged.
-	 * Don't bother responding if the destination was a broadcast.
-	 * Otherwise initialize tp->rcv_nxt, and tp->irs, select an initial
-	 * tp->iss, and send a segment:
-	 *     <SEQ=ISS><ACK=RCV_NXT><CTL=SYN,ACK>
-	 * Also initialize tp->snd_nxt to tp->iss+1 and tp->snd_una to tp->iss.
-	 * Fill in remote peer address fields if not previously specified.
-	 * Enter SYN_RECEIVED state, and process any other fields of this
-	 * segment in this state.
-	 */
-	case TCPS_LISTEN: {
-		struct mbuf *am;
-		register struct sockaddr_in *sin;
-
-		if (tiflags & TH_RST)
-			goto drop;
-		if (tiflags & TH_ACK)
-			goto dropwithreset;
-		if ((tiflags & TH_SYN) == 0)
-			goto drop;
-		if ((ti->ti_dport == ti->ti_sport) &&
-		    (ti->ti_dst.s_addr == ti->ti_src.s_addr))
-			goto drop;
-		/*
-		 * RFC1122 4.2.3.10, p. 104: discard bcast/mcast SYN
-		 * in_broadcast() should never return true on a received
-		 * packet with M_BCAST not set.
-		 */
-		if (m->m_flags & (M_BCAST|M_MCAST) ||
-		    IN_MULTICAST(ntohl(ti->ti_dst.s_addr)))
-			goto drop;
-		am = m_get(M_DONTWAIT, MT_SONAME);	/* XXX */
-		if (am == NULL)
-			goto drop;
-		am->m_len = sizeof (struct sockaddr_in);
-		sin = mtod(am, struct sockaddr_in *);
-		sin->sin_family = AF_INET;
-		sin->sin_len = sizeof(*sin);
-		sin->sin_addr = ti->ti_src;
-		sin->sin_port = ti->ti_sport;
-		bzero((caddr_t)sin->sin_zero, sizeof(sin->sin_zero));
-		laddr = inp->inp_laddr;
-		if (inp->inp_laddr.s_addr == INADDR_ANY)
-			inp->inp_laddr = ti->ti_dst;
-		if (in_pcbconnect(inp, am)) {
-			inp->inp_laddr = laddr;
-			(void) m_free(am);
-			goto drop;
-		}
-		(void) m_free(am);
-		tp->t_template = tcp_template(tp);
-		if (tp->t_template == 0) {
-			tp = tcp_drop(tp, ENOBUFS);
-			dropsocket = 0;		/* socket is already gone */
-			goto drop;
-		}
-		if ((taop = tcp_gettaocache(inp)) == NULL) {
-			taop = &tao_noncached;
-			bzero(taop, sizeof(*taop));
-		}
-		tcp_dooptions(tp, optp, optlen, ti, &to);
-		if (iss)
-			tp->iss = iss;
-		else
-			tp->iss = tcp_iss;
-		tcp_iss += TCP_ISSINCR/4;
-		tp->irs = ti->ti_seq;
-		tcp_sendseqinit(tp);
-		tcp_rcvseqinit(tp);
-		/*
-		 * Initialization of the tcpcb for transaction;
-		 *   set SND.WND = SEG.WND,
-		 *   initialize CCsend and CCrecv.
-		 */
-		tp->snd_wnd = tiwin;	/* initial send-window */
-		tp->cc_send = CC_INC(tcp_ccgen);
-		tp->cc_recv = to.to_cc;
-		/*
-		 * Perform TAO test on incoming CC (SEG.CC) option, if any.
-		 * - compare SEG.CC against cached CC from the same host,
-		 *	if any.
-		 * - if SEG.CC > chached value, SYN must be new and is accepted
-		 *	immediately: save new CC in the cache, mark the socket
-		 *	connected, enter ESTABLISHED state, turn on flag to
-		 *	send a SYN in the next segment.
-		 *	A virtual advertised window is set in rcv_adv to
-		 *	initialize SWS prevention.  Then enter normal segment
-		 *	processing: drop SYN, process data and FIN.
-		 * - otherwise do a normal 3-way handshake.
-		 */
-		if ((to.to_flag & TOF_CC) != 0) {
-		    if (taop->tao_cc != 0 && CC_GT(to.to_cc, taop->tao_cc)) {
-			taop->tao_cc = to.to_cc;
-			tp->t_state = TCPS_ESTABLISHED;
-
-			/*
-			 * If there is a FIN, or if there is data and the
-			 * connection is local, then delay SYN,ACK(SYN) in
-			 * the hope of piggy-backing it on a response
-			 * segment.  Otherwise must send ACK now in case
-			 * the other side is slow starting.
-			 */
-			if ((tiflags & TH_FIN) || (ti->ti_len != 0 &&
-			    in_localaddr(inp->inp_faddr)))
-				tp->t_flags |= (TF_DELACK | TF_NEEDSYN);
-			else
-				tp->t_flags |= (TF_ACKNOW | TF_NEEDSYN);
-
-			/*
-			 * Limit the `virtual advertised window' to TCP_MAXWIN
-			 * here.  Even if we requested window scaling, it will
-			 * become effective only later when our SYN is acked.
-			 */
-			tp->rcv_adv += min(tp->rcv_wnd, TCP_MAXWIN);
-			tcpstat.tcps_connects++;
-			soisconnected(so);
-			tp->t_timer[TCPT_KEEP] = tcp_keepinit;
-			dropsocket = 0;		/* committed to socket */
-			tcpstat.tcps_accepts++;
-			goto trimthenstep6;
-		    }
-		/* else do standard 3-way handshake */
-		} else {
-		    /*
-		     * No CC option, but maybe CC.NEW:
-		     *   invalidate cached value.
-		     */
-		     taop->tao_cc = 0;
-		}
-		/*
-		 * TAO test failed or there was no CC option,
-		 *    do a standard 3-way handshake.
-		 */
-		tp->t_flags |= TF_ACKNOW;
-		tp->t_state = TCPS_SYN_RECEIVED;
-		tp->t_timer[TCPT_KEEP] = tcp_keepinit;
-		dropsocket = 0;		/* committed to socket */
-		tcpstat.tcps_accepts++;
-		goto trimthenstep6;
-		}
-
-	/*
-	 * If the state is SYN_RECEIVED:
-	 *	if seg contains SYN/ACK, send a RST.
-	 *	if seg contains an ACK, but not for our SYN/ACK, send a RST.
-	 */
-	case TCPS_SYN_RECEIVED:
-		if (tiflags & TH_ACK) {
-			if (tiflags & TH_SYN) {
-				tcpstat.tcps_badsyn++;
-				goto dropwithreset;
-			}
-			if (SEQ_LEQ(ti->ti_ack, tp->snd_una) ||
-			    SEQ_GT(ti->ti_ack, tp->snd_max))
-				goto dropwithreset;
-		}
-		break;
-
-	/*
-	 * If the state is SYN_SENT:
-	 *	if seg contains an ACK, but not for our SYN, drop the input.
-	 *	if seg contains a RST, then drop the connection.
-	 *	if seg does not contain SYN, then drop it.
-	 * Otherwise this is an acceptable SYN segment
-	 *	initialize tp->rcv_nxt and tp->irs
-	 *	if seg contains ack then advance tp->snd_una
-	 *	if SYN has been acked change to ESTABLISHED else SYN_RCVD state
-	 *	arrange for segment to be acked (eventually)
-	 *	continue processing rest of data/controls, beginning with URG
-	 */
-	case TCPS_SYN_SENT:
-		if ((taop = tcp_gettaocache(inp)) == NULL) {
-			taop = &tao_noncached;
-			bzero(taop, sizeof(*taop));
-		}
-
-		if ((tiflags & TH_ACK) &&
-		    (SEQ_LEQ(ti->ti_ack, tp->iss) ||
-		     SEQ_GT(ti->ti_ack, tp->snd_max))) {
-			/*
-			 * If we have a cached CCsent for the remote host,
-			 * hence we haven't just crashed and restarted,
-			 * do not send a RST.  This may be a retransmission
-			 * from the other side after our earlier ACK was lost.
-			 * Our new SYN, when it arrives, will serve as the
-			 * needed ACK.
-			 */
-			if (taop->tao_ccsent != 0)
-				goto drop;
-			else
-				goto dropwithreset;
-		}
-		if (tiflags & TH_RST) {
-			if (tiflags & TH_ACK)
-				tp = tcp_drop(tp, ECONNREFUSED);
-			goto drop;
-		}
-		if ((tiflags & TH_SYN) == 0)
-			goto drop;
-		tp->snd_wnd = ti->ti_win;	/* initial send window */
-		tp->cc_recv = to.to_cc;		/* foreign CC */
-
-		tp->irs = ti->ti_seq;
-		tcp_rcvseqinit(tp);
-		if (tiflags & TH_ACK) {
-			/*
-			 * Our SYN was acked.  If segment contains CC.ECHO
-			 * option, check it to make sure this segment really
-			 * matches our SYN.  If not, just drop it as old
-			 * duplicate, but send an RST if we're still playing
-			 * by the old rules.  If no CC.ECHO option, make sure
-			 * we don't get fooled into using T/TCP.
-			 */
-			if (to.to_flag & TOF_CCECHO) {
-				if (tp->cc_send != to.to_ccecho)
-					if (taop->tao_ccsent != 0)
-						goto drop;
-					else
-						goto dropwithreset;
-			} else
-				tp->t_flags &= ~TF_RCVD_CC;
-			tcpstat.tcps_connects++;
-			soisconnected(so);
-			/* Do window scaling on this connection? */
-			if ((tp->t_flags & (TF_RCVD_SCALE|TF_REQ_SCALE)) ==
-				(TF_RCVD_SCALE|TF_REQ_SCALE)) {
-				tp->snd_scale = tp->requested_s_scale;
-				tp->rcv_scale = tp->request_r_scale;
-			}
-			/* Segment is acceptable, update cache if undefined. */
-			if (taop->tao_ccsent == 0)
-				taop->tao_ccsent = to.to_ccecho;
-
-			tp->rcv_adv += tp->rcv_wnd;
-			tp->snd_una++;		/* SYN is acked */
-			/*
-			 * If there's data, delay ACK; if there's also a FIN
-			 * ACKNOW will be turned on later.
-			 */
-			if (ti->ti_len != 0)
-				tp->t_flags |= TF_DELACK;
-			else
-				tp->t_flags |= TF_ACKNOW;
-			/*
-			 * Received <SYN,ACK> in SYN_SENT[*] state.
-			 * Transitions:
-			 *	SYN_SENT  --> ESTABLISHED
-			 *	SYN_SENT* --> FIN_WAIT_1
-			 */
-			if (tp->t_flags & TF_NEEDFIN) {
-				tp->t_state = TCPS_FIN_WAIT_1;
-				tp->t_flags &= ~TF_NEEDFIN;
-				tiflags &= ~TH_SYN;
-			} else {
-				tp->t_state = TCPS_ESTABLISHED;
-				tp->t_timer[TCPT_KEEP] = tcp_keepidle;
-			}
-		} else {
-		/*
-		 *  Received initial SYN in SYN-SENT[*] state => simul-
-		 *  taneous open.  If segment contains CC option and there is
-		 *  a cached CC, apply TAO test; if it succeeds, connection is
-		 *  half-synchronized.  Otherwise, do 3-way handshake:
-		 *        SYN-SENT -> SYN-RECEIVED
-		 *        SYN-SENT* -> SYN-RECEIVED*
-		 *  If there was no CC option, clear cached CC value.
-		 */
-			tp->t_flags |= TF_ACKNOW;
-			tp->t_timer[TCPT_REXMT] = 0;
-			if (to.to_flag & TOF_CC) {
-				if (taop->tao_cc != 0 &&
-				    CC_GT(to.to_cc, taop->tao_cc)) {
-					/*
-					 * update cache and make transition:
-					 *        SYN-SENT -> ESTABLISHED*
-					 *        SYN-SENT* -> FIN-WAIT-1*
-					 */
-					taop->tao_cc = to.to_cc;
-					if (tp->t_flags & TF_NEEDFIN) {
-						tp->t_state = TCPS_FIN_WAIT_1;
-						tp->t_flags &= ~TF_NEEDFIN;
-					} else {
-						tp->t_state = TCPS_ESTABLISHED;
-						tp->t_timer[TCPT_KEEP] = tcp_keepidle;
-					}
-					tp->t_flags |= TF_NEEDSYN;
-				} else
-					tp->t_state = TCPS_SYN_RECEIVED;
-			} else {
-				/* CC.NEW or no option => invalidate cache */
-				taop->tao_cc = 0;
-				tp->t_state = TCPS_SYN_RECEIVED;
-			}
-		}
-
-trimthenstep6:
-		/*
-		 * Advance ti->ti_seq to correspond to first data byte.
-		 * If data, trim to stay within window,
-		 * dropping FIN if necessary.
-		 */
-		ti->ti_seq++;
-		if (ti->ti_len > tp->rcv_wnd) {
-			todrop = ti->ti_len - tp->rcv_wnd;
-			m_adj(m, -todrop);
-			ti->ti_len = tp->rcv_wnd;
-			tiflags &= ~TH_FIN;
-			tcpstat.tcps_rcvpackafterwin++;
-			tcpstat.tcps_rcvbyteafterwin += todrop;
-		}
-		tp->snd_wl1 = ti->ti_seq - 1;
-		tp->rcv_up = ti->ti_seq;
-		/*
-		 *  Client side of transaction: already sent SYN and data.
-		 *  If the remote host used T/TCP to validate the SYN,
-		 *  our data will be ACK'd; if so, enter normal data segment
-		 *  processing in the middle of step 5, ack processing.
-		 *  Otherwise, goto step 6.
-		 */
- 		if (tiflags & TH_ACK)
-			goto process_ACK;
-		goto step6;
-	/*
-	 * If the state is LAST_ACK or CLOSING or TIME_WAIT:
-	 *	if segment contains a SYN and CC [not CC.NEW] option:
-	 *              if state == TIME_WAIT and connection duration > MSL,
-	 *                  drop packet and send RST;
-	 *
-	 *		if SEG.CC > CCrecv then is new SYN, and can implicitly
-	 *		    ack the FIN (and data) in retransmission queue.
-	 *                  Complete close and delete TCPCB.  Then reprocess
-	 *                  segment, hoping to find new TCPCB in LISTEN state;
-	 *
-	 *		else must be old SYN; drop it.
-	 *      else do normal processing.
-	 */
-	case TCPS_LAST_ACK:
-	case TCPS_CLOSING:
-	case TCPS_TIME_WAIT:
-		if ((tiflags & TH_SYN) &&
-		    (to.to_flag & TOF_CC) && tp->cc_recv != 0) {
-			if (tp->t_state == TCPS_TIME_WAIT &&
-					tp->t_duration > TCPTV_MSL)
-				goto dropwithreset;
-			if (CC_GT(to.to_cc, tp->cc_recv)) {
-				tp = tcp_close(tp);
-				goto findpcb;
-			}
-			else
-				goto drop;
-		}
- 		break;  /* continue normal processing */
-	}
-
-	/*
-	 * States other than LISTEN or SYN_SENT.
-	 * First check timestamp, if present.
-	 * Then check the connection count, if present.
-	 * Then check that at least some bytes of segment are within
-	 * receive window.  If segment begins before rcv_nxt,
-	 * drop leading data (and SYN); if nothing left, just ack.
-	 *
-	 * RFC 1323 PAWS: If we have a timestamp reply on this segment
-	 * and it's less than ts_recent, drop it.
-	 */
-	if ((to.to_flag & TOF_TS) != 0 && (tiflags & TH_RST) == 0 &&
-	    tp->ts_recent && TSTMP_LT(to.to_tsval, tp->ts_recent)) {
-
-		/* Check to see if ts_recent is over 24 days old.  */
-		if ((int)(tcp_now - tp->ts_recent_age) > TCP_PAWS_IDLE) {
-			/*
-			 * Invalidate ts_recent.  If this segment updates
-			 * ts_recent, the age will be reset later and ts_recent
-			 * will get a valid value.  If it does not, setting
-			 * ts_recent to zero will at least satisfy the
-			 * requirement that zero be placed in the timestamp
-			 * echo reply when ts_recent isn't valid.  The
-			 * age isn't reset until we get a valid ts_recent
-			 * because we don't want out-of-order segments to be
-			 * dropped when ts_recent is old.
-			 */
-			tp->ts_recent = 0;
-		} else {
-			tcpstat.tcps_rcvduppack++;
-			tcpstat.tcps_rcvdupbyte += ti->ti_len;
-			tcpstat.tcps_pawsdrop++;
-			goto dropafterack;
-		}
-	}
-
-	/*
-	 * T/TCP mechanism
-	 *   If T/TCP was negotiated and the segment doesn't have CC,
-	 *   or if it's CC is wrong then drop the segment.
-	 *   RST segments do not have to comply with this.
-	 */
-	if ((tp->t_flags & (TF_REQ_CC|TF_RCVD_CC)) == (TF_REQ_CC|TF_RCVD_CC) &&
-	    ((to.to_flag & TOF_CC) == 0 || tp->cc_recv != to.to_cc) &&
-	    (tiflags & TH_RST) == 0)
- 		goto dropafterack;
-
-	todrop = tp->rcv_nxt - ti->ti_seq;
-	if (todrop > 0) {
-		if (tiflags & TH_SYN) {
-			tiflags &= ~TH_SYN;
-			ti->ti_seq++;
-			if (ti->ti_urp > 1)
-				ti->ti_urp--;
-			else
-				tiflags &= ~TH_URG;
-			todrop--;
-		}
-		/*
-		 * Following if statement from Stevens, vol. 2, p. 960.
-		 */
-		if (todrop > ti->ti_len
-		    || (todrop == ti->ti_len && (tiflags & TH_FIN) == 0)) {
-			/*
-			 * Any valid FIN must be to the left of the window.
-			 * At this point the FIN must be a duplicate or out
-			 * of sequence; drop it.
-			 */
-			tiflags &= ~TH_FIN;
-
-			/*
-			 * Send an ACK to resynchronize and drop any data.
-			 * But keep on processing for RST or ACK.
-			 */
-			tp->t_flags |= TF_ACKNOW;
-			todrop = ti->ti_len;
-			tcpstat.tcps_rcvduppack++;
-			tcpstat.tcps_rcvdupbyte += todrop;
-		} else {
-			tcpstat.tcps_rcvpartduppack++;
-			tcpstat.tcps_rcvpartdupbyte += todrop;
-		}
-		m_adj(m, todrop);
-		ti->ti_seq += todrop;
-		ti->ti_len -= todrop;
-		if (ti->ti_urp > todrop)
-			ti->ti_urp -= todrop;
-		else {
-			tiflags &= ~TH_URG;
-			ti->ti_urp = 0;
-		}
-	}
-
-	/*
-	 * If new data are received on a connection after the
-	 * user processes are gone, then RST the other end.
-	 */
-	if ((so->so_state & SS_NOFDREF) &&
-	    tp->t_state > TCPS_CLOSE_WAIT && ti->ti_len) {
-		tp = tcp_close(tp);
-		tcpstat.tcps_rcvafterclose++;
-		goto dropwithreset;
-	}
-
-	/*
-	 * If segment ends after window, drop trailing data
-	 * (and PUSH and FIN); if nothing left, just ACK.
-	 */
-	todrop = (ti->ti_seq+ti->ti_len) - (tp->rcv_nxt+tp->rcv_wnd);
-	if (todrop > 0) {
-		tcpstat.tcps_rcvpackafterwin++;
-		if (todrop >= ti->ti_len) {
-			tcpstat.tcps_rcvbyteafterwin += ti->ti_len;
-			/*
-			 * If a new connection request is received
-			 * while in TIME_WAIT, drop the old connection
-			 * and start over if the sequence numbers
-			 * are above the previous ones.
-			 */
-			if (tiflags & TH_SYN &&
-			    tp->t_state == TCPS_TIME_WAIT &&
-			    SEQ_GT(ti->ti_seq, tp->rcv_nxt)) {
-				iss = tp->rcv_nxt + TCP_ISSINCR;
-				tp = tcp_close(tp);
-				goto findpcb;
-			}
-			/*
-			 * If window is closed can only take segments at
-			 * window edge, and have to drop data and PUSH from
-			 * incoming segments.  Continue processing, but
-			 * remember to ack.  Otherwise, drop segment
-			 * and ack.
-			 */
-			if (tp->rcv_wnd == 0 && ti->ti_seq == tp->rcv_nxt) {
-				tp->t_flags |= TF_ACKNOW;
-				tcpstat.tcps_rcvwinprobe++;
-			} else
-				goto dropafterack;
-		} else
-			tcpstat.tcps_rcvbyteafterwin += todrop;
-		m_adj(m, -todrop);
-		ti->ti_len -= todrop;
-		tiflags &= ~(TH_PUSH|TH_FIN);
-	}
-
-	/*
-	 * If last ACK falls within this segment's sequence numbers,
-	 * record its timestamp.
-	 * NOTE that the test is modified according to the latest
-	 * proposal of the tcplw@cray.com list (Braden 1993/04/26).
-	 */
-	if ((to.to_flag & TOF_TS) != 0 &&
-	    SEQ_LEQ(ti->ti_seq, tp->last_ack_sent)) {
-		tp->ts_recent_age = tcp_now;
-		tp->ts_recent = to.to_tsval;
-	}
-
-	/*
-	 * If the RST bit is set examine the state:
-	 *    SYN_RECEIVED STATE:
-	 *	If passive open, return to LISTEN state.
-	 *	If active open, inform user that connection was refused.
-	 *    ESTABLISHED, FIN_WAIT_1, FIN_WAIT2, CLOSE_WAIT STATES:
-	 *	Inform user that connection was reset, and close tcb.
-	 *    CLOSING, LAST_ACK, TIME_WAIT STATES
-	 *	Close the tcb.
-	 */
-	if (tiflags&TH_RST) switch (tp->t_state) {
-
-	case TCPS_SYN_RECEIVED:
-		so->so_error = ECONNREFUSED;
-		goto close;
-
-	case TCPS_ESTABLISHED:
-	case TCPS_FIN_WAIT_1:
-	case TCPS_FIN_WAIT_2:
-	case TCPS_CLOSE_WAIT:
-		so->so_error = ECONNRESET;
-	close:
-		tp->t_state = TCPS_CLOSED;
-		tcpstat.tcps_drops++;
-		tp = tcp_close(tp);
-		goto drop;
-
-	case TCPS_CLOSING:
-	case TCPS_LAST_ACK:
-	case TCPS_TIME_WAIT:
-		tp = tcp_close(tp);
-		goto drop;
-	}
-
-	/*
-	 * If a SYN is in the window, then this is an
-	 * error and we send an RST and drop the connection.
-	 */
-	if (tiflags & TH_SYN) {
-		tp = tcp_drop(tp, ECONNRESET);
-		goto dropwithreset;
-	}
-
-	/*
-	 * If the ACK bit is off:  if in SYN-RECEIVED state or SENDSYN
-	 * flag is on (half-synchronized state), then queue data for
-	 * later processing; else drop segment and return.
-	 */
-	if ((tiflags & TH_ACK) == 0) {
-		if (tp->t_state == TCPS_SYN_RECEIVED ||
-		    (tp->t_flags & TF_NEEDSYN))
-			goto step6;
-		else
-			goto drop;
-	}
-
-	/*
-	 * Ack processing.
-	 */
-	switch (tp->t_state) {
-
-	/*
-	 * In SYN_RECEIVED state, the ack ACKs our SYN, so enter
-	 * ESTABLISHED state and continue processing.
-	 * The ACK was checked above.
-	 */
-	case TCPS_SYN_RECEIVED:
-
-		tcpstat.tcps_connects++;
-		soisconnected(so);
-		/* Do window scaling? */
-		if ((tp->t_flags & (TF_RCVD_SCALE|TF_REQ_SCALE)) ==
-			(TF_RCVD_SCALE|TF_REQ_SCALE)) {
-			tp->snd_scale = tp->requested_s_scale;
-			tp->rcv_scale = tp->request_r_scale;
-		}
-		/*
-		 * Upon successful completion of 3-way handshake,
-		 * update cache.CC if it was undefined, pass any queued
-		 * data to the user, and advance state appropriately.
-		 */
-		if ((taop = tcp_gettaocache(inp)) != NULL &&
-		    taop->tao_cc == 0)
-			taop->tao_cc = tp->cc_recv;
-
-		/*
-		 * Make transitions:
-		 *      SYN-RECEIVED  -> ESTABLISHED
-		 *      SYN-RECEIVED* -> FIN-WAIT-1
-		 */
-		if (tp->t_flags & TF_NEEDFIN) {
-			tp->t_state = TCPS_FIN_WAIT_1;
-			tp->t_flags &= ~TF_NEEDFIN;
-		} else {
-			tp->t_state = TCPS_ESTABLISHED;
-			tp->t_timer[TCPT_KEEP] = tcp_keepidle;
-		}
-		/*
-		 * If segment contains data or ACK, will call tcp_reass()
-		 * later; if not, do so now to pass queued data to user.
-		 */
-		if (ti->ti_len == 0 && (tiflags & TH_FIN) == 0)
-			(void) tcp_reass(tp, (struct tcpiphdr *)0,
-			    (struct mbuf *)0);
-		tp->snd_wl1 = ti->ti_seq - 1;
-		/* fall into ... */
-
-	/*
-	 * In ESTABLISHED state: drop duplicate ACKs; ACK out of range
-	 * ACKs.  If the ack is in the range
-	 *	tp->snd_una < ti->ti_ack <= tp->snd_max
-	 * then advance tp->snd_una to ti->ti_ack and drop
-	 * data from the retransmission queue.  If this ACK reflects
-	 * more up to date window information we update our window information.
-	 */
-	case TCPS_ESTABLISHED:
-	case TCPS_FIN_WAIT_1:
-	case TCPS_FIN_WAIT_2:
-	case TCPS_CLOSE_WAIT:
-	case TCPS_CLOSING:
-	case TCPS_LAST_ACK:
-	case TCPS_TIME_WAIT:
-
-		if (SEQ_LEQ(ti->ti_ack, tp->snd_una)) {
-			if (ti->ti_len == 0 && tiwin == tp->snd_wnd) {
-				tcpstat.tcps_rcvdupack++;
-				/*
-				 * If we have outstanding data (other than
-				 * a window probe), this is a completely
-				 * duplicate ack (ie, window info didn't
-				 * change), the ack is the biggest we've
-				 * seen and we've seen exactly our rexmt
-				 * threshhold of them, assume a packet
-				 * has been dropped and retransmit it.
-				 * Kludge snd_nxt & the congestion
-				 * window so we send only this one
-				 * packet.
-				 *
-				 * We know we're losing at the current
-				 * window size so do congestion avoidance
-				 * (set ssthresh to half the current window
-				 * and pull our congestion window back to
-				 * the new ssthresh).
-				 *
-				 * Dup acks mean that packets have left the
-				 * network (they're now cached at the receiver)
-				 * so bump cwnd by the amount in the receiver
-				 * to keep a constant cwnd packets in the
-				 * network.
-				 */
-				if (tp->t_timer[TCPT_REXMT] == 0 ||
-				    ti->ti_ack != tp->snd_una)
-					tp->t_dupacks = 0;
-				else if (++tp->t_dupacks == tcprexmtthresh) {
-					tcp_seq onxt = tp->snd_nxt;
-					u_int win =
-					    min(tp->snd_wnd, tp->snd_cwnd) / 2 /
-						tp->t_maxseg;
-
-					if (win < 2)
-						win = 2;
-					tp->snd_ssthresh = win * tp->t_maxseg;
-					tp->t_timer[TCPT_REXMT] = 0;
-					tp->t_rtt = 0;
-					tp->snd_nxt = ti->ti_ack;
-					tp->snd_cwnd = tp->t_maxseg;
-					(void) tcp_output(tp);
-					tp->snd_cwnd = tp->snd_ssthresh +
-					       tp->t_maxseg * tp->t_dupacks;
-					if (SEQ_GT(onxt, tp->snd_nxt))
-						tp->snd_nxt = onxt;
-					goto drop;
-				} else if (tp->t_dupacks > tcprexmtthresh) {
-					tp->snd_cwnd += tp->t_maxseg;
-					(void) tcp_output(tp);
-					goto drop;
-				}
-			} else
-				tp->t_dupacks = 0;
-			break;
-		}
-		/*
-		 * If the congestion window was inflated to account
-		 * for the other side's cached packets, retract it.
-		 */
-		if (tp->t_dupacks >= tcprexmtthresh &&
-		    tp->snd_cwnd > tp->snd_ssthresh)
-			tp->snd_cwnd = tp->snd_ssthresh;
-		tp->t_dupacks = 0;
-		if (SEQ_GT(ti->ti_ack, tp->snd_max)) {
-			tcpstat.tcps_rcvacktoomuch++;
-			goto dropafterack;
-		}
-		/*
-		 *  If we reach this point, ACK is not a duplicate,
-		 *     i.e., it ACKs something we sent.
-		 */
-		if (tp->t_flags & TF_NEEDSYN) {
-			/*
-			 * T/TCP: Connection was half-synchronized, and our
-			 * SYN has been ACK'd (so connection is now fully
-			 * synchronized).  Go to non-starred state,
-			 * increment snd_una for ACK of SYN, and check if
-			 * we can do window scaling.
-			 */
-			tp->t_flags &= ~TF_NEEDSYN;
-			tp->snd_una++;
-			/* Do window scaling? */
-			if ((tp->t_flags & (TF_RCVD_SCALE|TF_REQ_SCALE)) ==
-				(TF_RCVD_SCALE|TF_REQ_SCALE)) {
-				tp->snd_scale = tp->requested_s_scale;
-				tp->rcv_scale = tp->request_r_scale;
-			}
-		}
-
-process_ACK:
-		acked = ti->ti_ack - tp->snd_una;
-		tcpstat.tcps_rcvackpack++;
-		tcpstat.tcps_rcvackbyte += acked;
-
-		/*
-		 * If we have a timestamp reply, update smoothed
-		 * round trip time.  If no timestamp is present but
-		 * transmit timer is running and timed sequence
-		 * number was acked, update smoothed round trip time.
-		 * Since we now have an rtt measurement, cancel the
-		 * timer backoff (cf., Phil Karn's retransmit alg.).
-		 * Recompute the initial retransmit timer.
-		 */
-		if (to.to_flag & TOF_TS)
-			tcp_xmit_timer(tp, tcp_now - to.to_tsecr + 1);
-		else if (tp->t_rtt && SEQ_GT(ti->ti_ack, tp->t_rtseq))
-			tcp_xmit_timer(tp,tp->t_rtt);
-
-		/*
-		 * If all outstanding data is acked, stop retransmit
-		 * timer and remember to restart (more output or persist).
-		 * If there is more data to be acked, restart retransmit
-		 * timer, using current (possibly backed-off) value.
-		 */
-		if (ti->ti_ack == tp->snd_max) {
-			tp->t_timer[TCPT_REXMT] = 0;
-			needoutput = 1;
-		} else if (tp->t_timer[TCPT_PERSIST] == 0)
-			tp->t_timer[TCPT_REXMT] = tp->t_rxtcur;
-
-		/*
-		 * If no data (only SYN) was ACK'd,
-		 *    skip rest of ACK processing.
-		 */
-		if (acked == 0)
-			goto step6;
-
-		/*
-		 * When new data is acked, open the congestion window.
-		 * If the window gives us less than ssthresh packets
-		 * in flight, open exponentially (maxseg per packet).
-		 * Otherwise open linearly: maxseg per window
-		 * (maxseg^2 / cwnd per packet).
-		 */
-		{
-		register u_int cw = tp->snd_cwnd;
-		register u_int incr = tp->t_maxseg;
-
-		if (cw > tp->snd_ssthresh)
-			incr = incr * incr / cw;
-		tp->snd_cwnd = min(cw + incr, TCP_MAXWIN<<tp->snd_scale);
-		}
-		if (acked > so->so_snd.sb_cc) {
-			tp->snd_wnd -= so->so_snd.sb_cc;
-			sbdrop(&so->so_snd, (int)so->so_snd.sb_cc);
-			ourfinisacked = 1;
-		} else {
-			sbdrop(&so->so_snd, acked);
-			tp->snd_wnd -= acked;
-			ourfinisacked = 0;
-		}
-		if (so->so_snd.sb_flags & SB_NOTIFY)
-			sowwakeup(so);
-		tp->snd_una = ti->ti_ack;
-		if (SEQ_LT(tp->snd_nxt, tp->snd_una))
-			tp->snd_nxt = tp->snd_una;
-
-		switch (tp->t_state) {
-
-		/*
-		 * In FIN_WAIT_1 STATE in addition to the processing
-		 * for the ESTABLISHED state if our FIN is now acknowledged
-		 * then enter FIN_WAIT_2.
-		 */
-		case TCPS_FIN_WAIT_1:
-			if (ourfinisacked) {
-				/*
-				 * If we can't receive any more
-				 * data, then closing user can proceed.
-				 * Starting the timer is contrary to the
-				 * specification, but if we don't get a FIN
-				 * we'll hang forever.
-				 */
-				if (so->so_state & SS_CANTRCVMORE) {
-					soisdisconnected(so);
-					tp->t_timer[TCPT_2MSL] = tcp_maxidle;
-				}
-				tp->t_state = TCPS_FIN_WAIT_2;
-			}
-			break;
-
-	 	/*
-		 * In CLOSING STATE in addition to the processing for
-		 * the ESTABLISHED state if the ACK acknowledges our FIN
-		 * then enter the TIME-WAIT state, otherwise ignore
-		 * the segment.
-		 */
-		case TCPS_CLOSING:
-			if (ourfinisacked) {
-				tp->t_state = TCPS_TIME_WAIT;
-				tcp_canceltimers(tp);
-				/* Shorten TIME_WAIT [RFC-1644, p.28] */
-				if (tp->cc_recv != 0 &&
-				    tp->t_duration < TCPTV_MSL)
-					tp->t_timer[TCPT_2MSL] =
-					    tp->t_rxtcur * TCPTV_TWTRUNC;
-				else
-					tp->t_timer[TCPT_2MSL] = 2 * TCPTV_MSL;
-				soisdisconnected(so);
-			}
-			break;
-
-		/*
-		 * In LAST_ACK, we may still be waiting for data to drain
-		 * and/or to be acked, as well as for the ack of our FIN.
-		 * If our FIN is now acknowledged, delete the TCB,
-		 * enter the closed state and return.
-		 */
-		case TCPS_LAST_ACK:
-			if (ourfinisacked) {
-				tp = tcp_close(tp);
-				goto drop;
-			}
-			break;
-
-		/*
-		 * In TIME_WAIT state the only thing that should arrive
-		 * is a retransmission of the remote FIN.  Acknowledge
-		 * it and restart the finack timer.
-		 */
-		case TCPS_TIME_WAIT:
-			tp->t_timer[TCPT_2MSL] = 2 * TCPTV_MSL;
-			goto dropafterack;
-		}
-	}
-
-step6:
-	/*
-	 * Update window information.
-	 * Don't look at window if no ACK: TAC's send garbage on first SYN.
-	 */
-	if ((tiflags & TH_ACK) &&
-	    (SEQ_LT(tp->snd_wl1, ti->ti_seq) ||
-	    (tp->snd_wl1 == ti->ti_seq && (SEQ_LT(tp->snd_wl2, ti->ti_ack) ||
-	     (tp->snd_wl2 == ti->ti_ack && tiwin > tp->snd_wnd))))) {
-		/* keep track of pure window updates */
-		if (ti->ti_len == 0 &&
-		    tp->snd_wl2 == ti->ti_ack && tiwin > tp->snd_wnd)
-			tcpstat.tcps_rcvwinupd++;
-		tp->snd_wnd = tiwin;
-		tp->snd_wl1 = ti->ti_seq;
-		tp->snd_wl2 = ti->ti_ack;
-		if (tp->snd_wnd > tp->max_sndwnd)
-			tp->max_sndwnd = tp->snd_wnd;
-		needoutput = 1;
-	}
-
-	/*
-	 * Process segments with URG.
-	 */
-	if ((tiflags & TH_URG) && ti->ti_urp &&
-	    TCPS_HAVERCVDFIN(tp->t_state) == 0) {
-		/*
-		 * This is a kludge, but if we receive and accept
-		 * random urgent pointers, we'll crash in
-		 * soreceive.  It's hard to imagine someone
-		 * actually wanting to send this much urgent data.
-		 */
-		if (ti->ti_urp + so->so_rcv.sb_cc > sb_max) {
-			ti->ti_urp = 0;			/* XXX */
-			tiflags &= ~TH_URG;		/* XXX */
-			goto dodata;			/* XXX */
-		}
-		/*
-		 * If this segment advances the known urgent pointer,
-		 * then mark the data stream.  This should not happen
-		 * in CLOSE_WAIT, CLOSING, LAST_ACK or TIME_WAIT STATES since
-		 * a FIN has been received from the remote side.
-		 * In these states we ignore the URG.
-		 *
-		 * According to RFC961 (Assigned Protocols),
-		 * the urgent pointer points to the last octet
-		 * of urgent data.  We continue, however,
-		 * to consider it to indicate the first octet
-		 * of data past the urgent section as the original
-		 * spec states (in one of two places).
-		 */
-		if (SEQ_GT(ti->ti_seq+ti->ti_urp, tp->rcv_up)) {
-			tp->rcv_up = ti->ti_seq + ti->ti_urp;
-			so->so_oobmark = so->so_rcv.sb_cc +
-			    (tp->rcv_up - tp->rcv_nxt) - 1;
-			if (so->so_oobmark == 0)
-				so->so_state |= SS_RCVATMARK;
-			sohasoutofband(so);
-			tp->t_oobflags &= ~(TCPOOB_HAVEDATA | TCPOOB_HADDATA);
-		}
-		/*
-		 * Remove out of band data so doesn't get presented to user.
-		 * This can happen independent of advancing the URG pointer,
-		 * but if two URG's are pending at once, some out-of-band
-		 * data may creep in... ick.
-		 */
-		if (ti->ti_urp <= (u_long)ti->ti_len
-#ifdef SO_OOBINLINE
-		     && (so->so_options & SO_OOBINLINE) == 0
-#endif
-		     )
-			tcp_pulloutofband(so, ti, m);
-	} else
-		/*
-		 * If no out of band data is expected,
-		 * pull receive urgent pointer along
-		 * with the receive window.
-		 */
-		if (SEQ_GT(tp->rcv_nxt, tp->rcv_up))
-			tp->rcv_up = tp->rcv_nxt;
-dodata:							/* XXX */
-
-	/*
-	 * Process the segment text, merging it into the TCP sequencing queue,
-	 * and arranging for acknowledgment of receipt if necessary.
-	 * This process logically involves adjusting tp->rcv_wnd as data
-	 * is presented to the user (this happens in tcp_usrreq.c,
-	 * case PRU_RCVD).  If a FIN has already been received on this
-	 * connection then we just ignore the text.
-	 */
-	if ((ti->ti_len || (tiflags&TH_FIN)) &&
-	    TCPS_HAVERCVDFIN(tp->t_state) == 0) {
-		TCP_REASS(tp, ti, m, so, tiflags);
-		/*
-		 * Note the amount of data that peer has sent into
-		 * our window, in order to estimate the sender's
-		 * buffer size.
-		 */
-		len = so->so_rcv.sb_hiwat - (tp->rcv_adv - tp->rcv_nxt);
-	} else {
-		m_freem(m);
-		tiflags &= ~TH_FIN;
-	}
-
-	/*
-	 * If FIN is received ACK the FIN and let the user know
-	 * that the connection is closing.
-	 */
-	if (tiflags & TH_FIN) {
-		if (TCPS_HAVERCVDFIN(tp->t_state) == 0) {
-			socantrcvmore(so);
-			/*
-			 *  If connection is half-synchronized
-			 *  (ie NEEDSYN flag on) then delay ACK,
-			 *  so it may be piggybacked when SYN is sent.
-			 *  Otherwise, since we received a FIN then no
-			 *  more input can be expected, send ACK now.
-			 */
-			if (tp->t_flags & TF_NEEDSYN)
-				tp->t_flags |= TF_DELACK;
-			else
-				tp->t_flags |= TF_ACKNOW;
-			tp->rcv_nxt++;
-		}
-		switch (tp->t_state) {
-
-	 	/*
-		 * In SYN_RECEIVED and ESTABLISHED STATES
-		 * enter the CLOSE_WAIT state.
-		 */
-		case TCPS_SYN_RECEIVED:
-		case TCPS_ESTABLISHED:
-			tp->t_state = TCPS_CLOSE_WAIT;
-			break;
-
-	 	/*
-		 * If still in FIN_WAIT_1 STATE FIN has not been acked so
-		 * enter the CLOSING state.
-		 */
-		case TCPS_FIN_WAIT_1:
-			tp->t_state = TCPS_CLOSING;
-			break;
-
-	 	/*
-		 * In FIN_WAIT_2 state enter the TIME_WAIT state,
-		 * starting the time-wait timer, turning off the other
-		 * standard timers.
-		 */
-		case TCPS_FIN_WAIT_2:
-			tp->t_state = TCPS_TIME_WAIT;
-			tcp_canceltimers(tp);
-			/* Shorten TIME_WAIT [RFC-1644, p.28] */
-			if (tp->cc_recv != 0 &&
-			    tp->t_duration < TCPTV_MSL) {
-				tp->t_timer[TCPT_2MSL] =
-				    tp->t_rxtcur * TCPTV_TWTRUNC;
-				/* For transaction client, force ACK now. */
-				tp->t_flags |= TF_ACKNOW;
-			}
-			else
-				tp->t_timer[TCPT_2MSL] = 2 * TCPTV_MSL;
-			soisdisconnected(so);
-			break;
-
-		/*
-		 * In TIME_WAIT state restart the 2 MSL time_wait timer.
-		 */
-		case TCPS_TIME_WAIT:
-			tp->t_timer[TCPT_2MSL] = 2 * TCPTV_MSL;
-			break;
-		}
-	}
-#ifdef TCPDEBUG
-	if (so->so_options & SO_DEBUG)
-		tcp_trace(TA_INPUT, ostate, tp, &tcp_saveti, 0);
-#endif
-
-	/*
-	 * Return any desired output.
-	 */
-	if (needoutput || (tp->t_flags & TF_ACKNOW))
-		(void) tcp_output(tp);
-	return;
-
-dropafterack:
-	/*
-	 * Generate an ACK dropping incoming segment if it occupies
-	 * sequence space, where the ACK reflects our state.
-	 */
-	if (tiflags & TH_RST)
-		goto drop;
-#ifdef TCPDEBUG
-	if (so->so_options & SO_DEBUG)
-		tcp_trace(TA_DROP, ostate, tp, &tcp_saveti, 0);
-#endif
-	m_freem(m);
-	tp->t_flags |= TF_ACKNOW;
-	(void) tcp_output(tp);
-	return;
-
-dropwithreset:
-	/*
-	 * Generate a RST, dropping incoming segment.
-	 * Make ACK acceptable to originator of segment.
-	 * Don't bother to respond if destination was broadcast/multicast.
-	 */
-	if ((tiflags & TH_RST) || m->m_flags & (M_BCAST|M_MCAST) ||
-	    IN_MULTICAST(ntohl(ti->ti_dst.s_addr)))
-		goto drop;
-#ifdef TCPDEBUG
-	if (tp == 0 || (tp->t_inpcb->inp_socket->so_options & SO_DEBUG))
-		tcp_trace(TA_DROP, ostate, tp, &tcp_saveti, 0);
-#endif
-	if (tiflags & TH_ACK)
-		tcp_respond(tp, ti, m, (tcp_seq)0, ti->ti_ack, TH_RST);
-	else {
-		if (tiflags & TH_SYN)
-			ti->ti_len++;
-		tcp_respond(tp, ti, m, ti->ti_seq+ti->ti_len, (tcp_seq)0,
-		    TH_RST|TH_ACK);
-	}
-	/* destroy temporarily created socket */
-	if (dropsocket)
-		(void) soabort(so);
-	return;
-
-drop:
-	/*
-	 * Drop space held by incoming segment and return.
-	 */
-#ifdef TCPDEBUG
-	if (tp == 0 || (tp->t_inpcb->inp_socket->so_options & SO_DEBUG))
-		tcp_trace(TA_DROP, ostate, tp, &tcp_saveti, 0);
-#endif
-	m_freem(m);
-	/* destroy temporarily created socket */
-	if (dropsocket)
-		(void) soabort(so);
-	return;
-#ifndef TUBA_INCLUDE
-}
-
-static void
-tcp_dooptions(tp, cp, cnt, ti, to)
-	struct tcpcb *tp;
-	u_char *cp;
-	int cnt;
-	struct tcpiphdr *ti;
-	struct tcpopt *to;
-{
-	u_short mss = 0;
-	int opt, optlen;
-
-	for (; cnt > 0; cnt -= optlen, cp += optlen) {
-		opt = cp[0];
-		if (opt == TCPOPT_EOL)
-			break;
-		if (opt == TCPOPT_NOP)
-			optlen = 1;
-		else {
-			optlen = cp[1];
-			if (optlen <= 0)
-				break;
-		}
-		switch (opt) {
-
-		default:
-			continue;
-
-		case TCPOPT_MAXSEG:
-			if (optlen != TCPOLEN_MAXSEG)
-				continue;
-			if (!(ti->ti_flags & TH_SYN))
-				continue;
-			bcopy((char *) cp + 2, (char *) &mss, sizeof(mss));
-			NTOHS(mss);
-			break;
-
-		case TCPOPT_WINDOW:
-			if (optlen != TCPOLEN_WINDOW)
-				continue;
-			if (!(ti->ti_flags & TH_SYN))
-				continue;
-			tp->t_flags |= TF_RCVD_SCALE;
-			tp->requested_s_scale = min(cp[2], TCP_MAX_WINSHIFT);
-			break;
-
-		case TCPOPT_TIMESTAMP:
-			if (optlen != TCPOLEN_TIMESTAMP)
-				continue;
-			to->to_flag |= TOF_TS;
-			bcopy((char *)cp + 2,
-			    (char *)&to->to_tsval, sizeof(to->to_tsval));
-			NTOHL(to->to_tsval);
-			bcopy((char *)cp + 6,
-			    (char *)&to->to_tsecr, sizeof(to->to_tsecr));
-			NTOHL(to->to_tsecr);
-
-			/*
-			 * A timestamp received in a SYN makes
-			 * it ok to send timestamp requests and replies.
-			 */
-			if (ti->ti_flags & TH_SYN) {
-				tp->t_flags |= TF_RCVD_TSTMP;
-				tp->ts_recent = to->to_tsval;
-				tp->ts_recent_age = tcp_now;
-			}
-			break;
-		case TCPOPT_CC:
-			if (optlen != TCPOLEN_CC)
-				continue;
-			to->to_flag |= TOF_CC;
-			bcopy((char *)cp + 2,
-			    (char *)&to->to_cc, sizeof(to->to_cc));
-			NTOHL(to->to_cc);
-			/*
-			 * A CC or CC.new option received in a SYN makes
-			 * it ok to send CC in subsequent segments.
-			 */
-			if (ti->ti_flags & TH_SYN)
-				tp->t_flags |= TF_RCVD_CC;
-			break;
-		case TCPOPT_CCNEW:
-			if (optlen != TCPOLEN_CC)
-				continue;
-			if (!(ti->ti_flags & TH_SYN))
-				continue;
-			to->to_flag |= TOF_CCNEW;
-			bcopy((char *)cp + 2,
-			    (char *)&to->to_cc, sizeof(to->to_cc));
-			NTOHL(to->to_cc);
-			/*
-			 * A CC or CC.new option received in a SYN makes
-			 * it ok to send CC in subsequent segments.
-			 */
-			tp->t_flags |= TF_RCVD_CC;
-			break;
-		case TCPOPT_CCECHO:
-			if (optlen != TCPOLEN_CC)
-				continue;
-			if (!(ti->ti_flags & TH_SYN))
-				continue;
-			to->to_flag |= TOF_CCECHO;
-			bcopy((char *)cp + 2,
-			    (char *)&to->to_ccecho, sizeof(to->to_ccecho));
-			NTOHL(to->to_ccecho);
-			break;
-		}
-	}
-	if (ti->ti_flags & TH_SYN)
-		tcp_mss(tp, mss);	/* sets t_maxseg */
-}
-
-/*
- * Pull out of band byte out of a segment so
- * it doesn't appear in the user's data queue.
- * It is still reflected in the segment length for
- * sequencing purposes.
- */
-static void
-tcp_pulloutofband(so, ti, m)
-	struct socket *so;
-	struct tcpiphdr *ti;
-	register struct mbuf *m;
-{
-	int cnt = ti->ti_urp - 1;
-
-	while (cnt >= 0) {
-		if (m->m_len > cnt) {
-			char *cp = mtod(m, caddr_t) + cnt;
-			struct tcpcb *tp = sototcpcb(so);
-
-			tp->t_iobc = *cp;
-			tp->t_oobflags |= TCPOOB_HAVEDATA;
-			bcopy(cp+1, cp, (unsigned)(m->m_len - cnt - 1));
-			m->m_len--;
-			return;
-		}
-		cnt -= m->m_len;
-		m = m->m_next;
-		if (m == 0)
-			break;
-	}
-	panic("tcp_pulloutofband");
-}
-
-/*
- * Collect new round-trip time estimate
- * and update averages and current timeout.
- */
-static void
-tcp_xmit_timer(tp, rtt)
-	register struct tcpcb *tp;
-	short rtt;
-{
-	register int delta;
-
-	tcpstat.tcps_rttupdated++;
-	tp->t_rttupdated++;
-	if (tp->t_srtt != 0) {
-		/*
-		 * srtt is stored as fixed point with 5 bits after the
-		 * binary point (i.e., scaled by 8).  The following magic
-		 * is equivalent to the smoothing algorithm in rfc793 with
-		 * an alpha of .875 (srtt = rtt/8 + srtt*7/8 in fixed
-		 * point).  Adjust rtt to origin 0.
-		 */
-		delta = ((rtt - 1) << TCP_DELTA_SHIFT)
-			- (tp->t_srtt >> (TCP_RTT_SHIFT - TCP_DELTA_SHIFT));
-
-		if ((tp->t_srtt += delta) <= 0)
-			tp->t_srtt = 1;
-
-		/*
-		 * We accumulate a smoothed rtt variance (actually, a
-		 * smoothed mean difference), then set the retransmit
-		 * timer to smoothed rtt + 4 times the smoothed variance.
-		 * rttvar is stored as fixed point with 4 bits after the
-		 * binary point (scaled by 16).  The following is
-		 * equivalent to rfc793 smoothing with an alpha of .75
-		 * (rttvar = rttvar*3/4 + |delta| / 4).  This replaces
-		 * rfc793's wired-in beta.
-		 */
-		if (delta < 0)
-			delta = -delta;
-		delta -= tp->t_rttvar >> (TCP_RTTVAR_SHIFT - TCP_DELTA_SHIFT);
-		if ((tp->t_rttvar += delta) <= 0)
-			tp->t_rttvar = 1;
-	} else {
-		/*
-		 * No rtt measurement yet - use the unsmoothed rtt.
-		 * Set the variance to half the rtt (so our first
-		 * retransmit happens at 3*rtt).
-		 */
-		tp->t_srtt = rtt << TCP_RTT_SHIFT;
-		tp->t_rttvar = rtt << (TCP_RTTVAR_SHIFT - 1);
-	}
-	tp->t_rtt = 0;
-	tp->t_rxtshift = 0;
-
-	/*
-	 * the retransmit should happen at rtt + 4 * rttvar.
-	 * Because of the way we do the smoothing, srtt and rttvar
-	 * will each average +1/2 tick of bias.  When we compute
-	 * the retransmit timer, we want 1/2 tick of rounding and
-	 * 1 extra tick because of +-1/2 tick uncertainty in the
-	 * firing of the timer.  The bias will give us exactly the
-	 * 1.5 tick we need.  But, because the bias is
-	 * statistical, we have to test that we don't drop below
-	 * the minimum feasible timer (which is 2 ticks).
-	 */
-	TCPT_RANGESET(tp->t_rxtcur, TCP_REXMTVAL(tp),
-		      max(tp->t_rttmin, rtt + 2), TCPTV_REXMTMAX);
-
-	/*
-	 * We received an ack for a packet that wasn't retransmitted;
-	 * it is probably safe to discard any error indications we've
-	 * received recently.  This isn't quite right, but close enough
-	 * for now (a route might have failed after we sent a segment,
-	 * and the return path might not be symmetrical).
-	 */
-	tp->t_softerror = 0;
-}
-
-/*
- * Determine a reasonable value for maxseg size.
- * If the route is known, check route for mtu.
- * If none, use an mss that can be handled on the outgoing
- * interface without forcing IP to fragment; if bigger than
- * an mbuf cluster (MCLBYTES), round down to nearest multiple of MCLBYTES
- * to utilize large mbufs.  If no route is found, route has no mtu,
- * or the destination isn't local, use a default, hopefully conservative
- * size (usually 512 or the default IP max size, but no more than the mtu
- * of the interface), as we can't discover anything about intervening
- * gateways or networks.  We also initialize the congestion/slow start
- * window to be a single segment if the destination isn't local.
- * While looking at the routing entry, we also initialize other path-dependent
- * parameters from pre-set or cached values in the routing entry.
- *
- * Also take into account the space needed for options that we
- * send regularly.  Make maxseg shorter by that amount to assure
- * that we can send maxseg amount of data even when the options
- * are present.  Store the upper limit of the length of options plus
- * data in maxopd.
- *
- * NOTE that this routine is only called when we process an incoming
- * segment, for outgoing segments only tcp_mssopt is called.
- *
- * In case of T/TCP, we call this routine during implicit connection
- * setup as well (offer = -1), to initialize maxseg from the cached
- * MSS of our peer.
- */
-void
-tcp_mss(tp, offer)
-	struct tcpcb *tp;
-	int offer;
-{
-	register struct rtentry *rt;
-	struct ifnet *ifp;
-	register int rtt, mss;
-	u_long bufsize;
-	struct inpcb *inp;
-	struct socket *so;
-	struct rmxp_tao *taop;
-	int origoffer = offer;
-
-	inp = tp->t_inpcb;
-	if ((rt = tcp_rtlookup(inp)) == NULL) {
-		tp->t_maxopd = tp->t_maxseg = tcp_mssdflt;
-		return;
-	}
-	ifp = rt->rt_ifp;
-	so = inp->inp_socket;
-
-	taop = rmx_taop(rt->rt_rmx);
-	/*
-	 * Offer == -1 means that we didn't receive SYN yet,
-	 * use cached value in that case;
-	 */
-	if (offer == -1)
-		offer = taop->tao_mssopt;
-	/*
-	 * Offer == 0 means that there was no MSS on the SYN segment,
-	 * in this case we use tcp_mssdflt.
-	 */
-	if (offer == 0)
-		offer = tcp_mssdflt;
-	else
-		/*
-		 * Sanity check: make sure that maxopd will be large
-		 * enough to allow some data on segments even is the
-		 * all the option space is used (40bytes).  Otherwise
-		 * funny things may happen in tcp_output.
-		 */
-		offer = max(offer, 64);
-	taop->tao_mssopt = offer;
-
-	/*
-	 * While we're here, check if there's an initial rtt
-	 * or rttvar.  Convert from the route-table units
-	 * to scaled multiples of the slow timeout timer.
-	 */
-	if (tp->t_srtt == 0 && (rtt = rt->rt_rmx.rmx_rtt)) {
-		/*
-		 * XXX the lock bit for RTT indicates that the value
-		 * is also a minimum value; this is subject to time.
-		 */
-		if (rt->rt_rmx.rmx_locks & RTV_RTT)
-			tp->t_rttmin = rtt / (RTM_RTTUNIT / PR_SLOWHZ);
-		tp->t_srtt = rtt / (RTM_RTTUNIT / (PR_SLOWHZ * TCP_RTT_SCALE));
-		tcpstat.tcps_usedrtt++;
-		if (rt->rt_rmx.rmx_rttvar) {
-			tp->t_rttvar = rt->rt_rmx.rmx_rttvar /
-			    (RTM_RTTUNIT / (PR_SLOWHZ * TCP_RTTVAR_SCALE));
-			tcpstat.tcps_usedrttvar++;
-		} else {
-			/* default variation is +- 1 rtt */
-			tp->t_rttvar =
-			    tp->t_srtt * TCP_RTTVAR_SCALE / TCP_RTT_SCALE;
-		}
-		TCPT_RANGESET(tp->t_rxtcur,
-		    ((tp->t_srtt >> 2) + tp->t_rttvar) >> 1,
-		    tp->t_rttmin, TCPTV_REXMTMAX);
-	}
-	/*
-	 * if there's an mtu associated with the route, use it
-	 */
-	if (rt->rt_rmx.rmx_mtu)
-		mss = rt->rt_rmx.rmx_mtu - sizeof(struct tcpiphdr);
-	else
-	{
-		mss = ifp->if_mtu - sizeof(struct tcpiphdr);
-		if (!in_localaddr(inp->inp_faddr))
-			mss = min(mss, tcp_mssdflt);
-	}
-	mss = min(mss, offer);
-	/*
-	 * maxopd stores the maximum length of data AND options
-	 * in a segment; maxseg is the amount of data in a normal
-	 * segment.  We need to store this value (maxopd) apart
-	 * from maxseg, because now every segment carries options
-	 * and thus we normally have somewhat less data in segments.
-	 */
-	tp->t_maxopd = mss;
-
-	/*
-	 * In case of T/TCP, origoffer==-1 indicates, that no segments
-	 * were received yet.  In this case we just guess, otherwise
-	 * we do the same as before T/TCP.
-	 */
- 	if ((tp->t_flags & (TF_REQ_TSTMP|TF_NOOPT)) == TF_REQ_TSTMP &&
-	    (origoffer == -1 ||
-	     (tp->t_flags & TF_RCVD_TSTMP) == TF_RCVD_TSTMP))
-		mss -= TCPOLEN_TSTAMP_APPA;
- 	if ((tp->t_flags & (TF_REQ_CC|TF_NOOPT)) == TF_REQ_CC &&
-	    (origoffer == -1 ||
-	     (tp->t_flags & TF_RCVD_CC) == TF_RCVD_CC))
-		mss -= TCPOLEN_CC_APPA;
-
-#if	(MCLBYTES & (MCLBYTES - 1)) == 0
-		if (mss > MCLBYTES)
-			mss &= ~(MCLBYTES-1);
-#else
-		if (mss > MCLBYTES)
-			mss = mss / MCLBYTES * MCLBYTES;
-#endif
-	/*
-	 * If there's a pipesize, change the socket buffer
-	 * to that size.  Make the socket buffers an integral
-	 * number of mss units; if the mss is larger than
-	 * the socket buffer, decrease the mss.
-	 */
-#ifdef RTV_SPIPE
-	if ((bufsize = rt->rt_rmx.rmx_sendpipe) == 0)
-#endif
-		bufsize = so->so_snd.sb_hiwat;
-	if (bufsize < mss)
-		mss = bufsize;
-	else {
-		bufsize = roundup(bufsize, mss);
-		if (bufsize > sb_max)
-			bufsize = sb_max;
-		(void)sbreserve(&so->so_snd, bufsize);
-	}
-	tp->t_maxseg = mss;
-
-#ifdef RTV_RPIPE
-	if ((bufsize = rt->rt_rmx.rmx_recvpipe) == 0)
-#endif
-		bufsize = so->so_rcv.sb_hiwat;
-	if (bufsize > mss) {
-		bufsize = roundup(bufsize, mss);
-		if (bufsize > sb_max)
-			bufsize = sb_max;
-		(void)sbreserve(&so->so_rcv, bufsize);
-	}
-	/*
-	 * Don't force slow-start on local network.
-	 */
-	if (!in_localaddr(inp->inp_faddr))
-		tp->snd_cwnd = mss;
-
-	if (rt->rt_rmx.rmx_ssthresh) {
-		/*
-		 * There's some sort of gateway or interface
-		 * buffer limit on the path.  Use this to set
-		 * the slow start threshhold, but set the
-		 * threshold to no less than 2*mss.
-		 */
-		tp->snd_ssthresh = max(2 * mss, rt->rt_rmx.rmx_ssthresh);
-		tcpstat.tcps_usedssthresh++;
-	}
-}
-
-/*
- * Determine the MSS option to send on an outgoing SYN.
- */
-int
-tcp_mssopt(tp)
-	struct tcpcb *tp;
-{
-	struct rtentry *rt;
-
-	rt = tcp_rtlookup(tp->t_inpcb);
-	if (rt == NULL)
-		return tcp_mssdflt;
-
-	return rt->rt_ifp->if_mtu - sizeof(struct tcpiphdr);
-}
-#endif /* TUBA_INCLUDE */
diff --git a/cpukit/libnetworking/netinet/tcp_output.c b/cpukit/libnetworking/netinet/tcp_output.c
deleted file mode 100644
index cbb5218dce..0000000000
--- a/cpukit/libnetworking/netinet/tcp_output.c
+++ /dev/null
@@ -1,755 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1988, 1990, 1993, 1995
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)tcp_output.c	8.4 (Berkeley) 5/24/95
- *	$Id$
- */
-
-#include "opt_tcpdebug.h"
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/systm.h>
-#include <sys/malloc.h>
-#include <sys/mbuf.h>
-#include <sys/protosw.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/errno.h>
-
-#include <net/route.h>
-
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/in_pcb.h>
-#include <netinet/ip_var.h>
-#include <netinet/tcp.h>
-#define	TCPOUTFLAGS
-#include <netinet/tcp_fsm.h>
-#include <netinet/tcp_seq.h>
-#include <netinet/tcp_timer.h>
-#include <netinet/tcp_var.h>
-#include <netinet/tcpip.h>
-#ifdef TCPDEBUG
-#include <netinet/tcp_debug.h>
-#endif
-
-#ifdef notyet
-extern struct mbuf *m_copypack();
-#endif
-
-
-/*
- * Tcp output routine: figure out what should be sent and send it.
- */
-int
-tcp_output(tp)
-	register struct tcpcb *tp;
-{
-	register struct socket *so = tp->t_inpcb->inp_socket;
-	register long len, win;
-	int off, flags, error;
-	register struct mbuf *m;
-	register struct tcpiphdr *ti;
-	u_char opt[TCP_MAXOLEN];
-	unsigned optlen, hdrlen;
-	int idle, sendalot;
-	struct rmxp_tao *taop;
-	struct rmxp_tao tao_noncached;
-
-	/*
-	 * Determine length of data that should be transmitted,
-	 * and flags that will be used.
-	 * If there is some data or critical controls (SYN, RST)
-	 * to send, then transmit; otherwise, investigate further.
-	 */
-	idle = (tp->snd_max == tp->snd_una);
-	if (idle && tp->t_idle >= tp->t_rxtcur)
-		/*
-		 * We have been idle for "a while" and no acks are
-		 * expected to clock out any data we send --
-		 * slow start to get ack "clock" running again.
-		 */
-		tp->snd_cwnd = tp->t_maxseg;
-again:
-	sendalot = 0;
-	off = tp->snd_nxt - tp->snd_una;
-	win = min(tp->snd_wnd, tp->snd_cwnd);
-
-	flags = tcp_outflags[tp->t_state];
-	/*
-	 * Get standard flags, and add SYN or FIN if requested by 'hidden'
-	 * state flags.
-	 */
-	if (tp->t_flags & TF_NEEDFIN)
-		flags |= TH_FIN;
-	if (tp->t_flags & TF_NEEDSYN)
-		flags |= TH_SYN;
-
-	/*
-	 * If in persist timeout with window of 0, send 1 byte.
-	 * Otherwise, if window is small but nonzero
-	 * and timer expired, we will send what we can
-	 * and go to transmit state.
-	 */
-	if (tp->t_force) {
-		if (win == 0) {
-			/*
-			 * If we still have some data to send, then
-			 * clear the FIN bit.  Usually this would
-			 * happen below when it realizes that we
-			 * aren't sending all the data.  However,
-			 * if we have exactly 1 byte of unset data,
-			 * then it won't clear the FIN bit below,
-			 * and if we are in persist state, we wind
-			 * up sending the packet without recording
-			 * that we sent the FIN bit.
-			 *
-			 * We can't just blindly clear the FIN bit,
-			 * because if we don't have any more data
-			 * to send then the probe will be the FIN
-			 * itself.
-			 */
-			if (off < so->so_snd.sb_cc)
-				flags &= ~TH_FIN;
-			win = 1;
-		} else {
-			tp->t_timer[TCPT_PERSIST] = 0;
-			tp->t_rxtshift = 0;
-		}
-	}
-
-	len = min(so->so_snd.sb_cc, win) - off;
-
-	if ((taop = tcp_gettaocache(tp->t_inpcb)) == NULL) {
-		taop = &tao_noncached;
-		bzero(taop, sizeof(*taop));
-	}
-
-	/*
-	 * Lop off SYN bit if it has already been sent.  However, if this
-	 * is SYN-SENT state and if segment contains data and if we don't
-	 * know that foreign host supports TAO, suppress sending segment.
-	 */
-	if ((flags & TH_SYN) && SEQ_GT(tp->snd_nxt, tp->snd_una)) {
-		flags &= ~TH_SYN;
-		off--, len++;
-		if (len > 0 && tp->t_state == TCPS_SYN_SENT &&
-		    taop->tao_ccsent == 0)
-			return 0;
-	}
-
-	/*
-	 * Be careful not to send data and/or FIN on SYN segments
-	 * in cases when no CC option will be sent.
-	 * This measure is needed to prevent interoperability problems
-	 * with not fully conformant TCP implementations.
-	 */
-	if ((flags & TH_SYN) &&
-	    ((tp->t_flags & TF_NOOPT) || !(tp->t_flags & TF_REQ_CC) ||
-	     ((flags & TH_ACK) && !(tp->t_flags & TF_RCVD_CC)))) {
-		len = 0;
-		flags &= ~TH_FIN;
-	}
-
-	if (len < 0) {
-		/*
-		 * If FIN has been sent but not acked,
-		 * but we haven't been called to retransmit,
-		 * len will be -1.  Otherwise, window shrank
-		 * after we sent into it.  If window shrank to 0,
-		 * cancel pending retransmit, pull snd_nxt back
-		 * to (closed) window, and set the persist timer
-		 * if it isn't already going.  If the window didn't
-		 * close completely, just wait for an ACK.
-		 */
-		len = 0;
-		if (win == 0) {
-			tp->t_timer[TCPT_REXMT] = 0;
-			tp->t_rxtshift = 0;
-			tp->snd_nxt = tp->snd_una;
-			if (tp->t_timer[TCPT_PERSIST] == 0)
-				tcp_setpersist(tp);
-		}
-	}
-	if (len > tp->t_maxseg) {
-		len = tp->t_maxseg;
-		sendalot = 1;
-	}
-	if (SEQ_LT(tp->snd_nxt + len, tp->snd_una + so->so_snd.sb_cc))
-		flags &= ~TH_FIN;
-
-	win = sbspace(&so->so_rcv);
-
-	/*
-	 * Sender silly window avoidance.  If connection is idle
-	 * and can send all data, a maximum segment,
-	 * at least a maximum default-size segment do it,
-	 * or are forced, do it; otherwise don't bother.
-	 * If peer's buffer is tiny, then send
-	 * when window is at least half open.
-	 * If retransmitting (possibly after persist timer forced us
-	 * to send into a small window), then must resend.
-	 */
-	if (len) {
-		if (len == tp->t_maxseg)
-			goto send;
-		if ((idle || tp->t_flags & TF_NODELAY) &&
-		    (tp->t_flags & TF_NOPUSH) == 0 &&
-		    len + off >= so->so_snd.sb_cc)
-			goto send;
-		if (tp->t_force)
-			goto send;
-		if (len >= tp->max_sndwnd / 2 && tp->max_sndwnd > 0)
-			goto send;
-		if (SEQ_LT(tp->snd_nxt, tp->snd_max))
-			goto send;
-	}
-
-	/*
-	 * Compare available window to amount of window
-	 * known to peer (as advertised window less
-	 * next expected input).  If the difference is at least two
-	 * max size segments, or at least 50% of the maximum possible
-	 * window, then want to send a window update to peer.
-	 */
-	if (win > 0) {
-		/*
-		 * "adv" is the amount we can increase the window,
-		 * taking into account that we are limited by
-		 * TCP_MAXWIN << tp->rcv_scale.
-		 */
-		long adv = min(win, (long)TCP_MAXWIN << tp->rcv_scale) -
-			(tp->rcv_adv - tp->rcv_nxt);
-
-		if (adv >= (long) (2 * tp->t_maxseg))
-			goto send;
-		if (2 * adv >= (long) so->so_rcv.sb_hiwat)
-			goto send;
-	}
-
-	/*
-	 * Send if we owe peer an ACK.
-	 */
-	if (tp->t_flags & TF_ACKNOW)
-		goto send;
-	if ((flags & TH_RST) ||
-	    ((flags & TH_SYN) && (tp->t_flags & TF_NEEDSYN) == 0))
-		goto send;
-	if (SEQ_GT(tp->snd_up, tp->snd_una))
-		goto send;
-	/*
-	 * If our state indicates that FIN should be sent
-	 * and we have not yet done so, or we're retransmitting the FIN,
-	 * then we need to send.
-	 */
-	if (flags & TH_FIN &&
-	    ((tp->t_flags & TF_SENTFIN) == 0 || tp->snd_nxt == tp->snd_una))
-		goto send;
-
-	/*
-	 * TCP window updates are not reliable, rather a polling protocol
-	 * using ``persist'' packets is used to insure receipt of window
-	 * updates.  The three ``states'' for the output side are:
-	 *	idle			not doing retransmits or persists
-	 *	persisting		to move a small or zero window
-	 *	(re)transmitting	and thereby not persisting
-	 *
-	 * tp->t_timer[TCPT_PERSIST]
-	 *	is set when we are in persist state.
-	 * tp->t_force
-	 *	is set when we are called to send a persist packet.
-	 * tp->t_timer[TCPT_REXMT]
-	 *	is set when we are retransmitting
-	 * The output side is idle when both timers are zero.
-	 *
-	 * If send window is too small, there is data to transmit, and no
-	 * retransmit or persist is pending, then go to persist state.
-	 * If nothing happens soon, send when timer expires:
-	 * if window is nonzero, transmit what we can,
-	 * otherwise force out a byte.
-	 */
-	if (so->so_snd.sb_cc && tp->t_timer[TCPT_REXMT] == 0 &&
-	    tp->t_timer[TCPT_PERSIST] == 0) {
-		tp->t_rxtshift = 0;
-		tcp_setpersist(tp);
-	}
-
-	/*
-	 * No reason to send a segment, just return.
-	 */
-	return (0);
-
-send:
-	/*
-	 * Before ESTABLISHED, force sending of initial options
-	 * unless TCP set not to do any options.
-	 * NOTE: we assume that the IP/TCP header plus TCP options
-	 * always fit in a single mbuf, leaving room for a maximum
-	 * link header, i.e.
-	 *	max_linkhdr + sizeof (struct tcpiphdr) + optlen <= MHLEN
-	 */
-	optlen = 0;
-	hdrlen = sizeof (struct tcpiphdr);
-	if (flags & TH_SYN) {
-		tp->snd_nxt = tp->iss;
-		if ((tp->t_flags & TF_NOOPT) == 0) {
-			u_short mss;
-
-			opt[0] = TCPOPT_MAXSEG;
-			opt[1] = TCPOLEN_MAXSEG;
-			mss = htons((u_short) tcp_mssopt(tp));
-			(void)memcpy(opt + 2, &mss, sizeof(mss));
-			optlen = TCPOLEN_MAXSEG;
-
-			if ((tp->t_flags & TF_REQ_SCALE) &&
-			    ((flags & TH_ACK) == 0 ||
-			    (tp->t_flags & TF_RCVD_SCALE))) {
-				*((u_long *) (opt + optlen)) = htonl(
-					TCPOPT_NOP << 24 |
-					TCPOPT_WINDOW << 16 |
-					TCPOLEN_WINDOW << 8 |
-					tp->request_r_scale);
-				optlen += 4;
-			}
-		}
- 	}
-
- 	/*
-	 * Send a timestamp and echo-reply if this is a SYN and our side
-	 * wants to use timestamps (TF_REQ_TSTMP is set) or both our side
-	 * and our peer have sent timestamps in our SYN's.
- 	 */
- 	if ((tp->t_flags & (TF_REQ_TSTMP|TF_NOOPT)) == TF_REQ_TSTMP &&
- 	    (flags & TH_RST) == 0 &&
-	    ((flags & TH_ACK) == 0 ||
-	     (tp->t_flags & TF_RCVD_TSTMP))) {
-		u_long *lp = (u_long *)(opt + optlen);
-
- 		/* Form timestamp option as shown in appendix A of RFC 1323. */
- 		*lp++ = htonl(TCPOPT_TSTAMP_HDR);
- 		*lp++ = htonl(tcp_now);
- 		*lp   = htonl(tp->ts_recent);
- 		optlen += TCPOLEN_TSTAMP_APPA;
- 	}
-
- 	/*
-	 * Send `CC-family' options if our side wants to use them (TF_REQ_CC),
-	 * options are allowed (!TF_NOOPT) and it's not a RST.
- 	 */
- 	if ((tp->t_flags & (TF_REQ_CC|TF_NOOPT)) == TF_REQ_CC &&
- 	     (flags & TH_RST) == 0) {
-		switch (flags & (TH_SYN|TH_ACK)) {
-		/*
-		 * This is a normal ACK, send CC if we received CC before
-		 * from our peer.
-		 */
-		case TH_ACK:
-			if (!(tp->t_flags & TF_RCVD_CC))
-				break;
-			/*FALLTHROUGH*/
-
-		/*
-		 * We can only get here in T/TCP's SYN_SENT* state, when
-		 * we're a sending a non-SYN segment without waiting for
-		 * the ACK of our SYN.  A check above assures that we only
-		 * do this if our peer understands T/TCP.
-		 */
-		case 0:
-			opt[optlen++] = TCPOPT_NOP;
-			opt[optlen++] = TCPOPT_NOP;
-			opt[optlen++] = TCPOPT_CC;
-			opt[optlen++] = TCPOLEN_CC;
-			*(u_int32_t *)&opt[optlen] = htonl(tp->cc_send);
-
-			optlen += 4;
-			break;
-
-		/*
-		 * This is our initial SYN, check whether we have to use
-		 * CC or CC.new.
-		 */
-		case TH_SYN:
-			opt[optlen++] = TCPOPT_NOP;
-			opt[optlen++] = TCPOPT_NOP;
-			opt[optlen++] = tp->t_flags & TF_SENDCCNEW ?
-						TCPOPT_CCNEW : TCPOPT_CC;
-			opt[optlen++] = TCPOLEN_CC;
-			*(u_int32_t *)&opt[optlen] = htonl(tp->cc_send);
- 			optlen += 4;
-			break;
-
-		/*
-		 * This is a SYN,ACK; send CC and CC.echo if we received
-		 * CC from our peer.
-		 */
-		case (TH_SYN|TH_ACK):
-			if (tp->t_flags & TF_RCVD_CC) {
-				opt[optlen++] = TCPOPT_NOP;
-				opt[optlen++] = TCPOPT_NOP;
-				opt[optlen++] = TCPOPT_CC;
-				opt[optlen++] = TCPOLEN_CC;
-				*(u_int32_t *)&opt[optlen] =
-					htonl(tp->cc_send);
-				optlen += 4;
-				opt[optlen++] = TCPOPT_NOP;
-				opt[optlen++] = TCPOPT_NOP;
-				opt[optlen++] = TCPOPT_CCECHO;
-				opt[optlen++] = TCPOLEN_CC;
-				*(u_int32_t *)&opt[optlen] =
-					htonl(tp->cc_recv);
-				optlen += 4;
-			}
-			break;
-		}
- 	}
-
- 	hdrlen += optlen;
-
-	/*
-	 * Adjust data length if insertion of options will
-	 * bump the packet length beyond the t_maxopd length.
-	 * Clear the FIN bit because we cut off the tail of
-	 * the segment.
-	 */
-	 if (len + optlen > tp->t_maxopd) {
-		/*
-		 * If there is still more to send, don't close the connection.
-		 */
-		flags &= ~TH_FIN;
-		len = tp->t_maxopd - optlen;
-		sendalot = 1;
-	}
-
-/*#ifdef DIAGNOSTIC*/
- 	if (max_linkhdr + hdrlen > MHLEN)
-		panic("tcphdr too big");
-/*#endif*/
-
-	/*
-	 * Grab a header mbuf, attaching a copy of data to
-	 * be transmitted, and initialize the header from
-	 * the template for sends on this connection.
-	 */
-	if (len) {
-		if (tp->t_force && len == 1)
-			tcpstat.tcps_sndprobe++;
-		else if (SEQ_LT(tp->snd_nxt, tp->snd_max)) {
-			tcpstat.tcps_sndrexmitpack++;
-			tcpstat.tcps_sndrexmitbyte += len;
-		} else {
-			tcpstat.tcps_sndpack++;
-			tcpstat.tcps_sndbyte += len;
-		}
-#ifdef notyet
-		if ((m = m_copypack(so->so_snd.sb_mb, off,
-		    (int)len, max_linkhdr + hdrlen)) == 0) {
-			error = ENOBUFS;
-			goto out;
-		}
-		/*
-		 * m_copypack left space for our hdr; use it.
-		 */
-		m->m_len += hdrlen;
-		m->m_data -= hdrlen;
-#else
-		MGETHDR(m, M_DONTWAIT, MT_HEADER);
-		if (m == NULL) {
-			error = ENOBUFS;
-			goto out;
-		}
-		m->m_data += max_linkhdr;
-		m->m_len = hdrlen;
-		if (len <= MHLEN - hdrlen - max_linkhdr) {
-			m_copydata(so->so_snd.sb_mb, off, (int) len,
-			    mtod(m, caddr_t) + hdrlen);
-			m->m_len += len;
-		} else {
-			m->m_next = m_copy(so->so_snd.sb_mb, off, (int) len);
-			if (m->m_next == 0) {
-				(void) m_free(m);
-				error = ENOBUFS;
-				goto out;
-			}
-		}
-#endif
-		/*
-		 * If we're sending everything we've got, set PUSH.
-		 * (This will keep happy those implementations which only
-		 * give data to the user when a buffer fills or
-		 * a PUSH comes in.)
-		 */
-		if (off + len == so->so_snd.sb_cc)
-			flags |= TH_PUSH;
-	} else {
-		if (tp->t_flags & TF_ACKNOW)
-			tcpstat.tcps_sndacks++;
-		else if (flags & (TH_SYN|TH_FIN|TH_RST))
-			tcpstat.tcps_sndctrl++;
-		else if (SEQ_GT(tp->snd_up, tp->snd_una))
-			tcpstat.tcps_sndurg++;
-		else
-			tcpstat.tcps_sndwinup++;
-
-		MGETHDR(m, M_DONTWAIT, MT_HEADER);
-		if (m == NULL) {
-			error = ENOBUFS;
-			goto out;
-		}
-		m->m_data += max_linkhdr;
-		m->m_len = hdrlen;
-	}
-	m->m_pkthdr.rcvif = (struct ifnet *)0;
-	ti = mtod(m, struct tcpiphdr *);
-	if (tp->t_template == 0)
-		panic("tcp_output");
-	(void)memcpy(ti, tp->t_template, sizeof (struct tcpiphdr));
-
-	/*
-	 * Fill in fields, remembering maximum advertised
-	 * window for use in delaying messages about window sizes.
-	 * If resending a FIN, be sure not to use a new sequence number.
-	 */
-	if (flags & TH_FIN && tp->t_flags & TF_SENTFIN &&
-	    tp->snd_nxt == tp->snd_max)
-		tp->snd_nxt--;
-	/*
-	 * If we are doing retransmissions, then snd_nxt will
-	 * not reflect the first unsent octet.  For ACK only
-	 * packets, we do not want the sequence number of the
-	 * retransmitted packet, we want the sequence number
-	 * of the next unsent octet.  So, if there is no data
-	 * (and no SYN or FIN), use snd_max instead of snd_nxt
-	 * when filling in ti_seq.  But if we are in persist
-	 * state, snd_max might reflect one byte beyond the
-	 * right edge of the window, so use snd_nxt in that
-	 * case, since we know we aren't doing a retransmission.
-	 * (retransmit and persist are mutually exclusive...)
-	 */
-	if (len || (flags & (TH_SYN|TH_FIN)) || tp->t_timer[TCPT_PERSIST])
-		ti->ti_seq = htonl(tp->snd_nxt);
-	else
-		ti->ti_seq = htonl(tp->snd_max);
-	ti->ti_ack = htonl(tp->rcv_nxt);
-	if (optlen) {
-		bcopy(opt, ti + 1, optlen);
-		ti->ti_off = (sizeof (struct tcphdr) + optlen) >> 2;
-	}
-	ti->ti_flags = flags;
-	/*
-	 * Calculate receive window.  Don't shrink window,
-	 * but avoid silly window syndrome.
-	 */
-	if (win < (long)(so->so_rcv.sb_hiwat / 4) && win < (long)tp->t_maxseg)
-		win = 0;
-	if (win < (long)(tp->rcv_adv - tp->rcv_nxt))
-		win = (long)(tp->rcv_adv - tp->rcv_nxt);
-	if (win > (long)TCP_MAXWIN << tp->rcv_scale)
-		win = (long)TCP_MAXWIN << tp->rcv_scale;
-	ti->ti_win = htons((u_short) (win>>tp->rcv_scale));
-	if (SEQ_GT(tp->snd_up, tp->snd_nxt)) {
-		ti->ti_urp = htons((u_short)(tp->snd_up - tp->snd_nxt));
-		ti->ti_flags |= TH_URG;
-	} else
-		/*
-		 * If no urgent pointer to send, then we pull
-		 * the urgent pointer to the left edge of the send window
-		 * so that it doesn't drift into the send window on sequence
-		 * number wraparound.
-		 */
-		tp->snd_up = tp->snd_una;		/* drag it along */
-
-	/*
-	 * Put TCP length in extended header, and then
-	 * checksum extended header and data.
-	 */
-	if (len + optlen)
-		ti->ti_len = htons((u_short)(sizeof (struct tcphdr) +
-		    optlen + len));
-	ti->ti_sum = in_cksum(m, (int)(hdrlen + len));
-
-	/*
-	 * In transmit state, time the transmission and arrange for
-	 * the retransmit.  In persist state, just set snd_max.
-	 */
-	if (tp->t_force == 0 || tp->t_timer[TCPT_PERSIST] == 0) {
-		tcp_seq startseq = tp->snd_nxt;
-
-		/*
-		 * Advance snd_nxt over sequence space of this segment.
-		 */
-		if (flags & (TH_SYN|TH_FIN)) {
-			if (flags & TH_SYN)
-				tp->snd_nxt++;
-			if (flags & TH_FIN) {
-				tp->snd_nxt++;
-				tp->t_flags |= TF_SENTFIN;
-			}
-		}
-		tp->snd_nxt += len;
-		if (SEQ_GT(tp->snd_nxt, tp->snd_max)) {
-			tp->snd_max = tp->snd_nxt;
-			/*
-			 * Time this transmission if not a retransmission and
-			 * not currently timing anything.
-			 */
-			if (tp->t_rtt == 0) {
-				tp->t_rtt = 1;
-				tp->t_rtseq = startseq;
-				tcpstat.tcps_segstimed++;
-			}
-		}
-
-		/*
-		 * Set retransmit timer if not currently set,
-		 * and not doing an ack or a keep-alive probe.
-		 * Initial value for retransmit timer is smoothed
-		 * round-trip time + 2 * round-trip time variance.
-		 * Initialize shift counter which is used for backoff
-		 * of retransmit time.
-		 */
-		if (tp->t_timer[TCPT_REXMT] == 0 &&
-		    tp->snd_nxt != tp->snd_una) {
-			tp->t_timer[TCPT_REXMT] = tp->t_rxtcur;
-			if (tp->t_timer[TCPT_PERSIST]) {
-				tp->t_timer[TCPT_PERSIST] = 0;
-				tp->t_rxtshift = 0;
-			}
-		}
-	} else
-		if (SEQ_GT(tp->snd_nxt + len, tp->snd_max))
-			tp->snd_max = tp->snd_nxt + len;
-
-#ifdef TCPDEBUG
-	/*
-	 * Trace.
-	 */
-	if (so->so_options & SO_DEBUG)
-		tcp_trace(TA_OUTPUT, tp->t_state, tp, ti, 0);
-#endif
-
-	/*
-	 * Fill in IP length and desired time to live and
-	 * send to IP level.  There should be a better way
-	 * to handle ttl and tos; we could keep them in
-	 * the template, but need a way to checksum without them.
-	 */
-	m->m_pkthdr.len = hdrlen + len;
-#ifdef TUBA
-	if (tp->t_tuba_pcb)
-		error = tuba_output(m, tp);
-	else
-#endif
-    {
-#if 1
-	struct rtentry *rt;
-#endif
-	((struct ip *)ti)->ip_len = m->m_pkthdr.len;
-	((struct ip *)ti)->ip_ttl = tp->t_inpcb->inp_ip_ttl;	/* XXX */
-	((struct ip *)ti)->ip_tos = tp->t_inpcb->inp_ip_tos;	/* XXX */
-#if 1
-	/*
-	 * See if we should do MTU discovery.  We do it only if the following
-	 * are true:
-	 *	1) we have a valid route to the destination
-	 *	2) the MTU is not locked (if it is, then discovery has been
-	 *	   disabled)
-	 */
-	if ((rt = tp->t_inpcb->inp_route.ro_rt)
-	    && rt->rt_flags & RTF_UP
-	    && !(rt->rt_rmx.rmx_locks & RTV_MTU)) {
-		((struct ip *)ti)->ip_off |= IP_DF;
-	}
-#endif
-	error = ip_output(m, tp->t_inpcb->inp_options, &tp->t_inpcb->inp_route,
-	    so->so_options & SO_DONTROUTE, 0);
-    }
-	if (error) {
-out:
-		if (error == ENOBUFS) {
-			tcp_quench(tp->t_inpcb, 0);
-			return (0);
-		}
-#if 1
-		if (error == EMSGSIZE) {
-			/*
-			 * ip_output() will have already fixed the route
-			 * for us.  tcp_mtudisc() will, as its last action,
-			 * initiate retransmission, so it is important to
-			 * not do so here.
-			 */
-			tcp_mtudisc(tp->t_inpcb, 0);
-			return 0;
-		}
-#endif
-		if ((error == EHOSTUNREACH || error == ENETDOWN)
-		    && TCPS_HAVERCVDSYN(tp->t_state)) {
-			tp->t_softerror = error;
-			return (0);
-		}
-		return (error);
-	}
-	tcpstat.tcps_sndtotal++;
-
-	/*
-	 * Data sent (as far as we can tell).
-	 * If this advertises a larger window than any other segment,
-	 * then remember the size of the advertised window.
-	 * Any pending ACK has now been sent.
-	 */
-	if (win > 0 && SEQ_GT(tp->rcv_nxt+win, tp->rcv_adv))
-		tp->rcv_adv = tp->rcv_nxt + win;
-	tp->last_ack_sent = tp->rcv_nxt;
-	tp->t_flags &= ~(TF_ACKNOW|TF_DELACK);
-	if (sendalot)
-		goto again;
-	return (0);
-}
-
-void
-tcp_setpersist(tp)
-	register struct tcpcb *tp;
-{
-	register int t = ((tp->t_srtt >> 2) + tp->t_rttvar) >> 1;
-
-	if (tp->t_timer[TCPT_REXMT])
-		panic("tcp_output REXMT");
-	/*
-	 * Start/restart persistance timer.
-	 */
-	TCPT_RANGESET(tp->t_timer[TCPT_PERSIST],
-	    t * tcp_backoff[tp->t_rxtshift],
-	    TCPTV_PERSMIN, TCPTV_PERSMAX);
-	if (tp->t_rxtshift < TCP_MAXRXTSHIFT)
-		tp->t_rxtshift++;
-}
diff --git a/cpukit/libnetworking/netinet/tcp_seq.h b/cpukit/libnetworking/netinet/tcp_seq.h
deleted file mode 100644
index 8cccf199e1..0000000000
--- a/cpukit/libnetworking/netinet/tcp_seq.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993, 1995
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)tcp_seq.h	8.3 (Berkeley) 6/21/95
- *	$Id$
- */
-
-#ifndef _NETINET_TCP_SEQ_H_
-#define _NETINET_TCP_SEQ_H_
-/*
- * TCP sequence numbers are 32 bit integers operated
- * on with modular arithmetic.  These macros can be
- * used to compare such integers.
- */
-#define	SEQ_LT(a,b)	((int)((a)-(b)) < 0)
-#define	SEQ_LEQ(a,b)	((int)((a)-(b)) <= 0)
-#define	SEQ_GT(a,b)	((int)((a)-(b)) > 0)
-#define	SEQ_GEQ(a,b)	((int)((a)-(b)) >= 0)
-
-/* for modulo comparisons of timestamps */
-#define TSTMP_LT(a,b)	((int)((a)-(b)) < 0)
-#define TSTMP_GEQ(a,b)	((int)((a)-(b)) >= 0)
-
-/*
- * TCP connection counts are 32 bit integers operated
- * on with modular arithmetic.  These macros can be
- * used to compare such integers.
- */
-#define	CC_LT(a,b)	((int)((a)-(b)) < 0)
-#define	CC_LEQ(a,b)	((int)((a)-(b)) <= 0)
-#define	CC_GT(a,b)	((int)((a)-(b)) > 0)
-#define	CC_GEQ(a,b)	((int)((a)-(b)) >= 0)
-
-/* Macro to increment a CC: skip 0 which has a special meaning */
-#define CC_INC(c)	(++(c) == 0 ? ++(c) : (c))
-
-/*
- * Macros to initialize tcp sequence numbers for
- * send and receive from initial send and receive
- * sequence numbers.
- */
-#define	tcp_rcvseqinit(tp) \
-	(tp)->rcv_adv = (tp)->rcv_nxt = (tp)->irs + 1
-
-#define	tcp_sendseqinit(tp) \
-	(tp)->snd_una = (tp)->snd_nxt = (tp)->snd_max = (tp)->snd_up = \
-	    (tp)->iss
-
-#define TCP_PAWS_IDLE	(24 * 24 * 60 * 60 * PR_SLOWHZ)
-					/* timestamp wrap-around time */
-
-#ifdef KERNEL
-extern tcp_cc	tcp_ccgen;		/* global connection count */
-
-/*
- * Increment for tcp_iss each second.
- * This is designed to increment at the standard 250 KB/s,
- * but with a random component averaging 128 KB.
- * We also increment tcp_iss by a quarter of this amount
- * each time we use the value for a new connection.
- * If defined, the tcp_random18() macro should produce a
- * number in the range [0-0x3ffff] that is hard to predict.
- */
-#ifndef tcp_random18
-#define	tcp_random18()	((random() >> 14) & 0x3ffff)
-#endif
-#define	TCP_ISSINCR	(122*1024 + tcp_random18())
-
-extern tcp_seq	tcp_iss;		/* tcp initial send seq # */
-#else
-#define	TCP_ISSINCR	(250*1024)	/* increment for tcp_iss each second */
-#endif /* KERNEL */
-#endif /* _NETINET_TCP_SEQ_H_ */
diff --git a/cpukit/libnetworking/netinet/tcp_subr.c b/cpukit/libnetworking/netinet/tcp_subr.c
deleted file mode 100644
index a9cde3fdf0..0000000000
--- a/cpukit/libnetworking/netinet/tcp_subr.c
+++ /dev/null
@@ -1,634 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1988, 1990, 1993, 1995
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)tcp_subr.c	8.2 (Berkeley) 5/24/95
- *	$Id$
- */
-
-#include "opt_tcpdebug.h"
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/proc.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/sysctl.h>
-#include <sys/malloc.h>
-#include <sys/mbuf.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/protosw.h>
-#include <sys/errno.h>
-
-#include <net/route.h>
-#include <net/if.h>
-
-#define _IP_VHL
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/in_pcb.h>
-#include <netinet/in_var.h>
-#include <netinet/ip_var.h>
-#include <netinet/ip_icmp.h>
-#include <netinet/tcp.h>
-#include <netinet/tcp_fsm.h>
-#include <netinet/tcp_seq.h>
-#include <netinet/tcp_timer.h>
-#include <netinet/tcp_var.h>
-#include <netinet/tcpip.h>
-#ifdef TCPDEBUG
-#include <netinet/tcp_debug.h>
-#endif
-
-int 	tcp_mssdflt = TCP_MSS;
-SYSCTL_INT(_net_inet_tcp, TCPCTL_MSSDFLT, mssdflt,
-	CTLFLAG_RW, &tcp_mssdflt , 0, "");
-
-static int	tcp_do_rfc1323 = 1;
-static int	tcp_do_rfc1644 = 1;
-#if !defined(__rtems__)
-static int 	tcp_rttdflt = TCPTV_SRTTDFLT / PR_SLOWHZ;
-SYSCTL_INT(_net_inet_tcp, TCPCTL_RTTDFLT, rttdflt,
-	CTLFLAG_RW, &tcp_rttdflt , 0, "");
-
-SYSCTL_INT(_net_inet_tcp, TCPCTL_DO_RFC1323, rfc1323,
-	CTLFLAG_RW, &tcp_do_rfc1323 , 0, "");
-
-SYSCTL_INT(_net_inet_tcp, TCPCTL_DO_RFC1644, rfc1644,
-	CTLFLAG_RW, &tcp_do_rfc1644 , 0, "");
-#endif
-
-static void	tcp_cleartaocache(void);
-static void	tcp_notify __P((struct inpcb *, int));
-
-/*
- * Target size of TCP PCB hash table. Will be rounded down to a prime
- * number.
- */
-#ifndef TCBHASHSIZE
-#define TCBHASHSIZE	128
-#endif
-
-/*
- * Tcp initialization
- */
-void
-tcp_init()
-{
-
-	tcp_iss = random();	/* wrong, but better than a constant */
-	tcp_ccgen = 1;
-	tcp_cleartaocache();
-	LIST_INIT(&tcb);
-	tcbinfo.listhead = &tcb;
-	tcbinfo.hashbase = hashinit(TCBHASHSIZE, M_PCB, &tcbinfo.hashmask);
-	if (max_protohdr < sizeof(struct tcpiphdr))
-		max_protohdr = sizeof(struct tcpiphdr);
-	if (max_linkhdr + sizeof(struct tcpiphdr) > MHLEN)
-		panic("tcp_init");
-}
-
-/*
- * Create template to be used to send tcp packets on a connection.
- * Call after host entry created, allocates an mbuf and fills
- * in a skeletal tcp/ip header, minimizing the amount of work
- * necessary when the connection is used.
- */
-struct tcpiphdr *
-tcp_template(tp)
-	struct tcpcb *tp;
-{
-	register struct inpcb *inp = tp->t_inpcb;
-	register struct mbuf *m;
-	register struct tcpiphdr *n;
-
-	if ((n = tp->t_template) == 0) {
-		m = m_get(M_DONTWAIT, MT_HEADER);
-		if (m == NULL)
-			return (0);
-		m->m_len = sizeof (struct tcpiphdr);
-		n = mtod(m, struct tcpiphdr *);
-	}
-	n->ti_next = n->ti_prev = 0;
-	n->ti_x1 = 0;
-	n->ti_pr = IPPROTO_TCP;
-	n->ti_len = htons(sizeof (struct tcpiphdr) - sizeof (struct ip));
-	n->ti_src = inp->inp_laddr;
-	n->ti_dst = inp->inp_faddr;
-	n->ti_sport = inp->inp_lport;
-	n->ti_dport = inp->inp_fport;
-	n->ti_seq = 0;
-	n->ti_ack = 0;
-	n->ti_x2 = 0;
-	n->ti_off = 5;
-	n->ti_flags = 0;
-	n->ti_win = 0;
-	n->ti_sum = 0;
-	n->ti_urp = 0;
-	return (n);
-}
-
-/*
- * Send a single message to the TCP at address specified by
- * the given TCP/IP header.  If m == 0, then we make a copy
- * of the tcpiphdr at ti and send directly to the addressed host.
- * This is used to force keep alive messages out using the TCP
- * template for a connection tp->t_template.  If flags are given
- * then we send a message back to the TCP which originated the
- * segment ti, and discard the mbuf containing it and any other
- * attached mbufs.
- *
- * In any case the ack and sequence number of the transmitted
- * segment are as specified by the parameters.
- *
- * NOTE: If m != NULL, then ti must point to *inside* the mbuf.
- */
-void
-tcp_respond(tp, ti, m, ack, seq, flags)
-	struct tcpcb *tp;
-	register struct tcpiphdr *ti;
-	register struct mbuf *m;
-	tcp_seq ack, seq;
-	int flags;
-{
-	register int tlen;
-	int win = 0;
-	struct route *ro = 0;
-	struct route sro;
-
-	if (tp) {
-		win = sbspace(&tp->t_inpcb->inp_socket->so_rcv);
-		ro = &tp->t_inpcb->inp_route;
-	} else {
-		ro = &sro;
-		bzero(ro, sizeof *ro);
-	}
-	if (m == 0) {
-		m = m_gethdr(M_DONTWAIT, MT_HEADER);
-		if (m == NULL)
-			return;
-#ifdef TCP_COMPAT_42
-		tlen = 1;
-#else
-		tlen = 0;
-#endif
-		m->m_data += max_linkhdr;
-		*mtod(m, struct tcpiphdr *) = *ti;
-		ti = mtod(m, struct tcpiphdr *);
-		flags = TH_ACK;
-	} else {
-		m_freem(m->m_next);
-		m->m_next = 0;
-		m->m_data = (caddr_t)ti;
-		m->m_len = sizeof (struct tcpiphdr);
-		tlen = 0;
-#define xchg(a,b,type) { type t; t=a; a=b; b=t; }
-		xchg(ti->ti_dst.s_addr, ti->ti_src.s_addr, u_long);
-		xchg(ti->ti_dport, ti->ti_sport, u_short);
-#undef xchg
-	}
-	ti->ti_len = htons((u_short)(sizeof (struct tcphdr) + tlen));
-	tlen += sizeof (struct tcpiphdr);
-	m->m_len = tlen;
-	m->m_pkthdr.len = tlen;
-	m->m_pkthdr.rcvif = (struct ifnet *) 0;
-	ti->ti_next = ti->ti_prev = 0;
-	ti->ti_x1 = 0;
-	ti->ti_seq = htonl(seq);
-	ti->ti_ack = htonl(ack);
-	ti->ti_x2 = 0;
-	ti->ti_off = sizeof (struct tcphdr) >> 2;
-	ti->ti_flags = flags;
-	if (tp)
-		ti->ti_win = htons((u_short) (win >> tp->rcv_scale));
-	else
-		ti->ti_win = htons((u_short)win);
-	ti->ti_urp = 0;
-	ti->ti_sum = 0;
-	ti->ti_sum = in_cksum(m, tlen);
-	((struct ip *)ti)->ip_len = tlen;
-	((struct ip *)ti)->ip_ttl = ip_defttl;
-#ifdef TCPDEBUG
-	if (tp == NULL || (tp->t_inpcb->inp_socket->so_options & SO_DEBUG))
-		tcp_trace(TA_OUTPUT, 0, tp, ti, 0);
-#endif
-	(void) ip_output(m, NULL, ro, 0, NULL);
-	if (ro == &sro && ro->ro_rt) {
-		RTFREE(ro->ro_rt);
-	}
-}
-
-/*
- * Create a new TCP control block, making an
- * empty reassembly queue and hooking it to the argument
- * protocol control block.
- */
-struct tcpcb *
-tcp_newtcpcb(inp)
-	struct inpcb *inp;
-{
-	register struct tcpcb *tp;
-
-	tp = malloc(sizeof(*tp), M_PCB, M_NOWAIT);
-	if (tp == NULL)
-		return ((struct tcpcb *)0);
-	bzero((char *) tp, sizeof(struct tcpcb));
-	tp->seg_next = tp->seg_prev = (struct tcpiphdr *)tp;
-	tp->t_maxseg = tp->t_maxopd = tcp_mssdflt;
-
-	if (tcp_do_rfc1323)
-		tp->t_flags = (TF_REQ_SCALE|TF_REQ_TSTMP);
-	if (tcp_do_rfc1644)
-		tp->t_flags |= TF_REQ_CC;
-	tp->t_inpcb = inp;
-	/*
-	 * Init srtt to TCPTV_SRTTBASE (0), so we can tell that we have no
-	 * rtt estimate.  Set rttvar so that srtt + 4 * rttvar gives
-	 * reasonable initial retransmit time.
-	 */
-	tp->t_srtt = TCPTV_SRTTBASE;
-	tp->t_rttvar = ((TCPTV_RTOBASE - TCPTV_SRTTBASE) << TCP_RTTVAR_SHIFT) / 4;
-	tp->t_rttmin = TCPTV_MIN;
-	tp->t_rxtcur = TCPTV_RTOBASE;
-	tp->snd_cwnd = TCP_MAXWIN << TCP_MAX_WINSHIFT;
-	tp->snd_ssthresh = TCP_MAXWIN << TCP_MAX_WINSHIFT;
-	inp->inp_ip_ttl = ip_defttl;
-	inp->inp_ppcb = (caddr_t)tp;
-	return (tp);
-}
-
-/*
- * Drop a TCP connection, reporting
- * the specified error.  If connection is synchronized,
- * then send a RST to peer.
- */
-struct tcpcb *
-tcp_drop(tp, errnum)
-	register struct tcpcb *tp;
-	int errnum;
-{
-	struct socket *so = tp->t_inpcb->inp_socket;
-
-	if (TCPS_HAVERCVDSYN(tp->t_state)) {
-		tp->t_state = TCPS_CLOSED;
-		(void) tcp_output(tp);
-		tcpstat.tcps_drops++;
-	} else
-		tcpstat.tcps_conndrops++;
-	if (errnum == ETIMEDOUT && tp->t_softerror)
-		errnum = tp->t_softerror;
-	so->so_error = errnum;
-	return (tcp_close(tp));
-}
-
-/*
- * Close a TCP control block:
- *	discard all space held by the tcp
- *	discard internet protocol block
- *	wake up any sleepers
- */
-struct tcpcb *
-tcp_close(tp)
-	register struct tcpcb *tp;
-{
-	register struct tcpiphdr *t;
-	struct inpcb *inp = tp->t_inpcb;
-	struct socket *so = inp->inp_socket;
-	register struct mbuf *m;
-	register struct rtentry *rt;
-
-	/*
-	 * If we got enough samples through the srtt filter,
-	 * save the rtt and rttvar in the routing entry.
-	 * 'Enough' is arbitrarily defined as the 16 samples.
-	 * 16 samples is enough for the srtt filter to converge
-	 * to within 5% of the correct value; fewer samples and
-	 * we could save a very bogus rtt.
-	 *
-	 * Don't update the default route's characteristics and don't
-	 * update anything that the user "locked".
-	 */
-	if (tp->t_rttupdated >= 16 &&
-	    (rt = inp->inp_route.ro_rt) &&
-	    ((struct sockaddr_in *)rt_key(rt))->sin_addr.s_addr != INADDR_ANY) {
-		register u_long i = 0;
-
-		if ((rt->rt_rmx.rmx_locks & RTV_RTT) == 0) {
-			i = tp->t_srtt *
-			    (RTM_RTTUNIT / (PR_SLOWHZ * TCP_RTT_SCALE));
-			if (rt->rt_rmx.rmx_rtt && i)
-				/*
-				 * filter this update to half the old & half
-				 * the new values, converting scale.
-				 * See route.h and tcp_var.h for a
-				 * description of the scaling constants.
-				 */
-				rt->rt_rmx.rmx_rtt =
-				    (rt->rt_rmx.rmx_rtt + i) / 2;
-			else
-				rt->rt_rmx.rmx_rtt = i;
-			tcpstat.tcps_cachedrtt++;
-		}
-		if ((rt->rt_rmx.rmx_locks & RTV_RTTVAR) == 0) {
-			i = tp->t_rttvar *
-			    (RTM_RTTUNIT / (PR_SLOWHZ * TCP_RTTVAR_SCALE));
-			if (rt->rt_rmx.rmx_rttvar && i)
-				rt->rt_rmx.rmx_rttvar =
-				    (rt->rt_rmx.rmx_rttvar + i) / 2;
-			else
-				rt->rt_rmx.rmx_rttvar = i;
-			tcpstat.tcps_cachedrttvar++;
-		}
-		/*
-		 * update the pipelimit (ssthresh) if it has been updated
-		 * already or if a pipesize was specified & the threshhold
-		 * got below half the pipesize.  I.e., wait for bad news
-		 * before we start updating, then update on both good
-		 * and bad news.
-		 */
-		if (((rt->rt_rmx.rmx_locks & RTV_SSTHRESH) == 0 &&
-		    ((i = tp->snd_ssthresh) != 0) && rt->rt_rmx.rmx_ssthresh) ||
-		    i < (rt->rt_rmx.rmx_sendpipe / 2)) {
-			/*
-			 * convert the limit from user data bytes to
-			 * packets then to packet data bytes.
-			 */
-			i = (i + tp->t_maxseg / 2) / tp->t_maxseg;
-			if (i < 2)
-				i = 2;
-			i *= (u_long)(tp->t_maxseg + sizeof (struct tcpiphdr));
-			if (rt->rt_rmx.rmx_ssthresh)
-				rt->rt_rmx.rmx_ssthresh =
-				    (rt->rt_rmx.rmx_ssthresh + i) / 2;
-			else
-				rt->rt_rmx.rmx_ssthresh = i;
-			tcpstat.tcps_cachedssthresh++;
-		}
-	}
-	/* free the reassembly queue, if any */
-	t = tp->seg_next;
-	while (t != (struct tcpiphdr *)tp) {
-		t = (struct tcpiphdr *)t->ti_next;
-		m = REASS_MBUF((struct tcpiphdr *)t->ti_prev);
-		remque(t->ti_prev);
-		m_freem(m);
-	}
-	if (tp->t_template)
-		(void) m_free(dtom(tp->t_template));
-	free(tp, M_PCB);
-	inp->inp_ppcb = 0;
-	soisdisconnected(so);
-	in_pcbdetach(inp);
-	tcpstat.tcps_closed++;
-	return ((struct tcpcb *)0);
-}
-
-void
-tcp_drain()
-{
-
-}
-
-/*
- * Notify a tcp user of an asynchronous error;
- * store error as soft error, but wake up user
- * (for now, won't do anything until can select for soft error).
- */
-static void
-tcp_notify(inp, error)
-	struct inpcb *inp;
-	int error;
-{
-	register struct tcpcb *tp = (struct tcpcb *)inp->inp_ppcb;
-	register struct socket *so = inp->inp_socket;
-
-	/*
-	 * Ignore some errors if we are hooked up.
-	 * If connection hasn't completed, has retransmitted several times,
-	 * and receives a second error, give up now.  This is better
-	 * than waiting a long time to establish a connection that
-	 * can never complete.
-	 */
-	if (tp->t_state == TCPS_ESTABLISHED &&
-	     (error == EHOSTUNREACH || error == ENETUNREACH ||
-	      error == EHOSTDOWN)) {
-		return;
-	} else if (tp->t_state < TCPS_ESTABLISHED && tp->t_rxtshift > 3 &&
-	    tp->t_softerror)
-		so->so_error = error;
-	else
-		tp->t_softerror = error;
-	soconnwakeup (so);
-	sorwakeup(so);
-	sowwakeup(so);
-}
-
-void
-tcp_ctlinput(cmd, sa, vip)
-	int cmd;
-	struct sockaddr *sa;
-	void *vip;
-{
-	register struct ip *ip = vip;
-	register struct tcphdr *th;
-	void (*notify) __P((struct inpcb *, int)) = tcp_notify;
-
-	if (cmd == PRC_QUENCH)
-		notify = tcp_quench;
-#if 1
-	else if (cmd == PRC_MSGSIZE)
-		notify = tcp_mtudisc;
-#endif
-	else if (!PRC_IS_REDIRECT(cmd) &&
-		 ((unsigned)cmd > PRC_NCMDS || inetctlerrmap[cmd] == 0))
-		return;
-	if (ip) {
-		th = (struct tcphdr *)((caddr_t)ip 
-				       + (IP_VHL_HL(ip->ip_vhl) << 2));
-		in_pcbnotify(&tcb, sa, th->th_dport, ip->ip_src, th->th_sport,
-			cmd, notify);
-	} else
-		in_pcbnotify(&tcb, sa, 0, zeroin_addr, 0, cmd, notify);
-}
-
-/*
- * When a source quench is received, close congestion window
- * to one segment.  We will gradually open it again as we proceed.
- */
-void
-tcp_quench(inp, errnum)
-	struct inpcb *inp;
-	int errnum;
-{
-	struct tcpcb *tp = intotcpcb(inp);
-
-	if (tp)
-		tp->snd_cwnd = tp->t_maxseg;
-}
-
-#if 1
-/*
- * When `need fragmentation' ICMP is received, update our idea of the MSS
- * based on the new value in the route.  Also nudge TCP to send something,
- * since we know the packet we just sent was dropped.
- * This duplicates some code in the tcp_mss() function in tcp_input.c.
- */
-void
-tcp_mtudisc(inp, errnum)
-	struct inpcb *inp;
-	int errnum;
-{
-	struct tcpcb *tp = intotcpcb(inp);
-	struct rtentry *rt;
-	struct rmxp_tao *taop;
-	struct socket *so = inp->inp_socket;
-	int offered;
-	int mss;
-
-	if (tp) {
-		rt = tcp_rtlookup(inp);
-		if (!rt || !rt->rt_rmx.rmx_mtu) {
-			tp->t_maxopd = tp->t_maxseg = tcp_mssdflt;
-			return;
-		}
-		taop = rmx_taop(rt->rt_rmx);
-		offered = taop->tao_mssopt;
-		mss = rt->rt_rmx.rmx_mtu - sizeof(struct tcpiphdr);
-		if (offered)
-			mss = min(mss, offered);
-		/*
-		 * XXX - The above conditional probably violates the TCP
-		 * spec.  The problem is that, since we don't know the
-		 * other end's MSS, we are supposed to use a conservative
-		 * default.  But, if we do that, then MTU discovery will
-		 * never actually take place, because the conservative
-		 * default is much less than the MTUs typically seen
-		 * on the Internet today.  For the moment, we'll sweep
-		 * this under the carpet.
-		 *
-		 * The conservative default might not actually be a problem
-		 * if the only case this occurs is when sending an initial
-		 * SYN with options and data to a host we've never talked
-		 * to before.  Then, they will reply with an MSS value which
-		 * will get recorded and the new parameters should get
-		 * recomputed.  For Further Study.
-		 */
-		if (tp->t_maxopd <= mss)
-			return;
-		tp->t_maxopd = mss;
-
-		if ((tp->t_flags & (TF_REQ_TSTMP|TF_NOOPT)) == TF_REQ_TSTMP &&
-		    (tp->t_flags & TF_RCVD_TSTMP) == TF_RCVD_TSTMP)
-			mss -= TCPOLEN_TSTAMP_APPA;
-		if ((tp->t_flags & (TF_REQ_CC|TF_NOOPT)) == TF_REQ_CC &&
-		    (tp->t_flags & TF_RCVD_CC) == TF_RCVD_CC)
-			mss -= TCPOLEN_CC_APPA;
-#if	(MCLBYTES & (MCLBYTES - 1)) == 0
-		if (mss > MCLBYTES)
-			mss &= ~(MCLBYTES-1);
-#else
-		if (mss > MCLBYTES)
-			mss = mss / MCLBYTES * MCLBYTES;
-#endif
-		if (so->so_snd.sb_hiwat < mss)
-			mss = so->so_snd.sb_hiwat;
-
-		tp->t_maxseg = mss;
-
-		tcpstat.tcps_mturesent++;
-		tp->t_rtt = 0;
-		tp->snd_nxt = tp->snd_una;
-		tcp_output(tp);
-	}
-}
-#endif
-
-/*
- * Look-up the routing entry to the peer of this inpcb.  If no route
- * is found and it cannot be allocated the return NULL.  This routine
- * is called by TCP routines that access the rmx structure and by tcp_mss
- * to get the interface MTU.
- */
-struct rtentry *
-tcp_rtlookup(inp)
-	struct inpcb *inp;
-{
-	struct route *ro;
-	struct rtentry *rt;
-
-	ro = &inp->inp_route;
-	rt = ro->ro_rt;
-	if (rt == NULL || !(rt->rt_flags & RTF_UP)) {
-		/* No route yet, so try to acquire one */
-		if (inp->inp_faddr.s_addr != INADDR_ANY) {
-			ro->ro_dst.sa_family = AF_INET;
-			ro->ro_dst.sa_len = sizeof(ro->ro_dst);
-			((struct sockaddr_in *) &ro->ro_dst)->sin_addr =
-				inp->inp_faddr;
-			rtalloc(ro);
-			rt = ro->ro_rt;
-		}
-	}
-	return rt;
-}
-
-/*
- * Return a pointer to the cached information about the remote host.
- * The cached information is stored in the protocol specific part of
- * the route metrics.
- */
-struct rmxp_tao *
-tcp_gettaocache(inp)
-	struct inpcb *inp;
-{
-	struct rtentry *rt = tcp_rtlookup(inp);
-
-	/* Make sure this is a host route and is up. */
-	if (rt == NULL ||
-	    (rt->rt_flags & (RTF_UP|RTF_HOST)) != (RTF_UP|RTF_HOST))
-		return NULL;
-
-	return rmx_taop(rt->rt_rmx);
-}
-
-/*
- * Clear all the TAO cache entries, called from tcp_init.
- *
- * XXX
- * This routine is just an empty one, because we assume that the routing
- * routing tables are initialized at the same time when TCP, so there is
- * nothing in the cache left over.
- */
-static void
-tcp_cleartaocache(void)
-{ }
diff --git a/cpukit/libnetworking/netinet/tcp_timer.c b/cpukit/libnetworking/netinet/tcp_timer.c
deleted file mode 100644
index 04d3d604e2..0000000000
--- a/cpukit/libnetworking/netinet/tcp_timer.c
+++ /dev/null
@@ -1,387 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1988, 1990, 1993, 1995
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)tcp_timer.c	8.2 (Berkeley) 5/24/95
- *	$Id$
- */
-
-#include "opt_tcpdebug.h"
-
-#ifndef TUBA_INCLUDE
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/sysctl.h>
-#include <sys/malloc.h>
-#include <sys/mbuf.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/protosw.h>
-#include <sys/errno.h>
-
-#include <machine/cpu.h>	/* before tcp_seq.h, for tcp_random18() */
-
-#include <net/if.h>
-#include <net/route.h>
-
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/in_pcb.h>
-#include <netinet/ip_var.h>
-#include <netinet/tcp.h>
-#include <netinet/tcp_fsm.h>
-#include <netinet/tcp_seq.h>
-#include <netinet/tcp_timer.h>
-#include <netinet/tcp_var.h>
-#include <netinet/tcpip.h>
-#ifdef TCPDEBUG
-#include <netinet/tcp_debug.h>
-#endif
-
-int	tcp_keepinit = TCPTV_KEEP_INIT;
-SYSCTL_INT(_net_inet_tcp, TCPCTL_KEEPINIT, keepinit,
-	CTLFLAG_RW, &tcp_keepinit , 0, "");
-
-int	tcp_keepidle = TCPTV_KEEP_IDLE;
-SYSCTL_INT(_net_inet_tcp, TCPCTL_KEEPIDLE, keepidle,
-	CTLFLAG_RW, &tcp_keepidle , 0, "");
-
-static int	tcp_keepintvl = TCPTV_KEEPINTVL;
-SYSCTL_INT(_net_inet_tcp, TCPCTL_KEEPINTVL, keepintvl,
-	CTLFLAG_RW, &tcp_keepintvl , 0, "");
-
-static int	always_keepalive = 0;
-SYSCTL_INT(_net_inet_tcp, OID_AUTO, always_keepalive,
-	CTLFLAG_RW, &always_keepalive , 0, "");
-
-static int	tcp_keepcnt = TCPTV_KEEPCNT;
-	/* max idle probes */
-static int	tcp_maxpersistidle = TCPTV_KEEP_IDLE;
-	/* max idle time in persist */
-int	tcp_maxidle;
-#else /* TUBA_INCLUDE */
-
-static	int tcp_maxpersistidle;
-#endif /* TUBA_INCLUDE */
-
-/*
- * Fast timeout routine for processing delayed acks
- */
-void
-tcp_fasttimo()
-{
-	register struct inpcb *inp;
-	register struct tcpcb *tp;
-	int s;
-
-	s = splnet();
-
-	for (inp = tcb.lh_first; inp != NULL; inp = inp->inp_list.le_next) {
-		if ((tp = (struct tcpcb *)inp->inp_ppcb) &&
-		    (tp->t_flags & TF_DELACK)) {
-			tp->t_flags &= ~TF_DELACK;
-			tp->t_flags |= TF_ACKNOW;
-			tcpstat.tcps_delack++;
-			(void) tcp_output(tp);
-		}
-	}
-	splx(s);
-}
-
-/*
- * Tcp protocol timeout routine called every 500 ms.
- * Updates the timers in all active tcb's and
- * causes finite state machine actions if timers expire.
- */
-void
-tcp_slowtimo()
-{
-	register struct inpcb *ip, *ipnxt;
-	register struct tcpcb *tp;
-	register int i;
-	int s;
-#ifdef TCPDEBUG
-	int ostate;
-#endif
-
-	s = splnet();
-
-	tcp_maxidle = tcp_keepcnt * tcp_keepintvl;
-
-	ip = tcb.lh_first;
-	if (ip == NULL) {
-		splx(s);
-		return;
-	}
-	/*
-	 * Search through tcb's and update active timers.
-	 */
-	for (; ip != NULL; ip = ipnxt) {
-		ipnxt = ip->inp_list.le_next;
-		tp = intotcpcb(ip);
-		if (tp == 0 || tp->t_state == TCPS_LISTEN)
-			continue;
-		for (i = 0; i < TCPT_NTIMERS; i++) {
-			if (tp->t_timer[i] && --tp->t_timer[i] == 0) {
-#ifdef TCPDEBUG
-				ostate = tp->t_state;
-#endif
-				tp = tcp_timers(tp, i);
-				if (tp == NULL)
-					goto tpgone;
-#ifdef TCPDEBUG
-				if (tp->t_inpcb->inp_socket->so_options
-				    & SO_DEBUG)
-					tcp_trace(TA_USER, ostate, tp,
-						  (struct tcpiphdr *)0,
-						  PRU_SLOWTIMO);
-#endif
-			}
-		}
-		tp->t_idle++;
-		tp->t_duration++;
-		if (tp->t_rtt)
-			tp->t_rtt++;
-tpgone:
-		;
-	}
-	tcp_iss += TCP_ISSINCR/PR_SLOWHZ;		/* increment iss */
-#ifdef TCP_COMPAT_42
-	if ((int)tcp_iss < 0)
-		tcp_iss = TCP_ISSINCR;			/* XXX */
-#endif
-	tcp_now++;					/* for timestamps */
-	splx(s);
-}
-#ifndef TUBA_INCLUDE
-
-/*
- * Cancel all timers for TCP tp.
- */
-void
-tcp_canceltimers(tp)
-	struct tcpcb *tp;
-{
-	register int i;
-
-	for (i = 0; i < TCPT_NTIMERS; i++)
-		tp->t_timer[i] = 0;
-}
-
-int	tcp_backoff[TCP_MAXRXTSHIFT + 1] =
-    { 1, 2, 4, 8, 16, 32, 64, 64, 64, 64, 64, 64, 64 };
-
-static int tcp_totbackoff = 511;	/* sum of tcp_backoff[] */
-
-/*
- * TCP timer processing.
- */
-struct tcpcb *
-tcp_timers(tp, timer)
-	register struct tcpcb *tp;
-	int timer;
-{
-	register int rexmt;
-
-	switch (timer) {
-
-	/*
-	 * 2 MSL timeout in shutdown went off.  If we're closed but
-	 * still waiting for peer to close and connection has been idle
-	 * too long, or if 2MSL time is up from TIME_WAIT, delete connection
-	 * control block.  Otherwise, check again in a bit.
-	 */
-	case TCPT_2MSL:
-		if (tp->t_state != TCPS_TIME_WAIT &&
-		    tp->t_idle <= tcp_maxidle)
-			tp->t_timer[TCPT_2MSL] = tcp_keepintvl;
-		else
-			tp = tcp_close(tp);
-		break;
-
-	/*
-	 * Retransmission timer went off.  Message has not
-	 * been acked within retransmit interval.  Back off
-	 * to a longer retransmit interval and retransmit one segment.
-	 */
-	case TCPT_REXMT:
-		if (++tp->t_rxtshift > TCP_MAXRXTSHIFT) {
-			tp->t_rxtshift = TCP_MAXRXTSHIFT;
-			tcpstat.tcps_timeoutdrop++;
-			tp = tcp_drop(tp, tp->t_softerror ?
-			    tp->t_softerror : ETIMEDOUT);
-			break;
-		}
-		tcpstat.tcps_rexmttimeo++;
-		rexmt = TCP_REXMTVAL(tp) * tcp_backoff[tp->t_rxtshift];
-		TCPT_RANGESET(tp->t_rxtcur, rexmt,
-		    tp->t_rttmin, TCPTV_REXMTMAX);
-		tp->t_timer[TCPT_REXMT] = tp->t_rxtcur;
-		/*
-		 * If losing, let the lower level know and try for
-		 * a better route.  Also, if we backed off this far,
-		 * our srtt estimate is probably bogus.  Clobber it
-		 * so we'll take the next rtt measurement as our srtt;
-		 * move the current srtt into rttvar to keep the current
-		 * retransmit times until then.
-		 */
-		if (tp->t_rxtshift > TCP_MAXRXTSHIFT / 4) {
-			in_losing(tp->t_inpcb);
-			tp->t_rttvar += (tp->t_srtt >> TCP_RTT_SHIFT);
-			tp->t_srtt = 0;
-		}
-		tp->snd_nxt = tp->snd_una;
-		/*
-		 * Force a segment to be sent.
-		 */
-		tp->t_flags |= TF_ACKNOW;
-		/*
-		 * If timing a segment in this window, stop the timer.
-		 */
-		tp->t_rtt = 0;
-		/*
-		 * Close the congestion window down to one segment
-		 * (we'll open it by one segment for each ack we get).
-		 * Since we probably have a window's worth of unacked
-		 * data accumulated, this "slow start" keeps us from
-		 * dumping all that data as back-to-back packets (which
-		 * might overwhelm an intermediate gateway).
-		 *
-		 * There are two phases to the opening: Initially we
-		 * open by one mss on each ack.  This makes the window
-		 * size increase exponentially with time.  If the
-		 * window is larger than the path can handle, this
-		 * exponential growth results in dropped packet(s)
-		 * almost immediately.  To get more time between
-		 * drops but still "push" the network to take advantage
-		 * of improving conditions, we switch from exponential
-		 * to linear window opening at some threshhold size.
-		 * For a threshhold, we use half the current window
-		 * size, truncated to a multiple of the mss.
-		 *
-		 * (the minimum cwnd that will give us exponential
-		 * growth is 2 mss.  We don't allow the threshhold
-		 * to go below this.)
-		 */
-		{
-		u_int win = min(tp->snd_wnd, tp->snd_cwnd) / 2 / tp->t_maxseg;
-		if (win < 2)
-			win = 2;
-		tp->snd_cwnd = tp->t_maxseg;
-		tp->snd_ssthresh = win * tp->t_maxseg;
-		tp->t_dupacks = 0;
-		}
-		(void) tcp_output(tp);
-		break;
-
-	/*
-	 * Persistance timer into zero window.
-	 * Force a byte to be output, if possible.
-	 */
-	case TCPT_PERSIST:
-		tcpstat.tcps_persisttimeo++;
-		/*
-		 * Hack: if the peer is dead/unreachable, we do not
-		 * time out if the window is closed.  After a full
-		 * backoff, drop the connection if the idle time
-		 * (no responses to probes) reaches the maximum
-		 * backoff that we would use if retransmitting.
-		 */
-		if (tp->t_rxtshift == TCP_MAXRXTSHIFT) {
-			u_long maxidle = TCP_REXMTVAL(tp);
-			if (maxidle < tp->t_rttmin)
-				maxidle = tp->t_rttmin;
-			maxidle *= tcp_totbackoff;
-			if (tp->t_idle >= tcp_maxpersistidle ||
-			    tp->t_idle >= maxidle) {
-				tcpstat.tcps_persistdrop++;
-				tp = tcp_drop(tp, ETIMEDOUT);
-				break;
-			}
-		}
-		tcp_setpersist(tp);
-		tp->t_force = 1;
-		(void) tcp_output(tp);
-		tp->t_force = 0;
-		break;
-
-	/*
-	 * Keep-alive timer went off; send something
-	 * or drop connection if idle for too long.
-	 */
-	case TCPT_KEEP:
-		tcpstat.tcps_keeptimeo++;
-		if (tp->t_state < TCPS_ESTABLISHED)
-			goto dropit;
-		if ((always_keepalive ||
-		    tp->t_inpcb->inp_socket->so_options & SO_KEEPALIVE) &&
-		    tp->t_state <= TCPS_CLOSING) {
-		    	if (tp->t_idle >= tcp_keepidle + tcp_maxidle)
-				goto dropit;
-			/*
-			 * Send a packet designed to force a response
-			 * if the peer is up and reachable:
-			 * either an ACK if the connection is still alive,
-			 * or an RST if the peer has closed the connection
-			 * due to timeout or reboot.
-			 * Using sequence number tp->snd_una-1
-			 * causes the transmitted zero-length segment
-			 * to lie outside the receive window;
-			 * by the protocol spec, this requires the
-			 * correspondent TCP to respond.
-			 */
-			tcpstat.tcps_keepprobe++;
-#ifdef TCP_COMPAT_42
-			/*
-			 * The keepalive packet must have nonzero length
-			 * to get a 4.2 host to respond.
-			 */
-			tcp_respond(tp, tp->t_template, (struct mbuf *)NULL,
-			    tp->rcv_nxt - 1, tp->snd_una - 1, 0);
-#else
-			tcp_respond(tp, tp->t_template, (struct mbuf *)NULL,
-			    tp->rcv_nxt, tp->snd_una - 1, 0);
-#endif
-			tp->t_timer[TCPT_KEEP] = tcp_keepintvl;
-		} else
-			tp->t_timer[TCPT_KEEP] = tcp_keepidle;
-		break;
-	dropit:
-		tcpstat.tcps_keepdrops++;
-		tp = tcp_drop(tp, ETIMEDOUT);
-		break;
-	}
-	return (tp);
-}
-#endif /* TUBA_INCLUDE */
diff --git a/cpukit/libnetworking/netinet/tcp_timer.h b/cpukit/libnetworking/netinet/tcp_timer.h
deleted file mode 100644
index 38ffac4ee7..0000000000
--- a/cpukit/libnetworking/netinet/tcp_timer.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)tcp_timer.h	8.1 (Berkeley) 6/10/93
- *	$Id$
- */
-
-#ifndef _NETINET_TCP_TIMER_H_
-#define _NETINET_TCP_TIMER_H_
-
-/*
- * Definitions of the TCP timers.  These timers are counted
- * down PR_SLOWHZ times a second.
- */
-#define	TCPT_NTIMERS	4
-
-#define	TCPT_REXMT	0		/* retransmit */
-#define	TCPT_PERSIST	1		/* retransmit persistence */
-#define	TCPT_KEEP	2		/* keep alive */
-#define	TCPT_2MSL	3		/* 2*msl quiet time timer */
-
-/*
- * The TCPT_REXMT timer is used to force retransmissions.
- * The TCP has the TCPT_REXMT timer set whenever segments
- * have been sent for which ACKs are expected but not yet
- * received.  If an ACK is received which advances tp->snd_una,
- * then the retransmit timer is cleared (if there are no more
- * outstanding segments) or reset to the base value (if there
- * are more ACKs expected).  Whenever the retransmit timer goes off,
- * we retransmit one unacknowledged segment, and do a backoff
- * on the retransmit timer.
- *
- * The TCPT_PERSIST timer is used to keep window size information
- * flowing even if the window goes shut.  If all previous transmissions
- * have been acknowledged (so that there are no retransmissions in progress),
- * and the window is too small to bother sending anything, then we start
- * the TCPT_PERSIST timer.  When it expires, if the window is nonzero,
- * we go to transmit state.  Otherwise, at intervals send a single byte
- * into the peer's window to force him to update our window information.
- * We do this at most as often as TCPT_PERSMIN time intervals,
- * but no more frequently than the current estimate of round-trip
- * packet time.  The TCPT_PERSIST timer is cleared whenever we receive
- * a window update from the peer.
- *
- * The TCPT_KEEP timer is used to keep connections alive.  If an
- * connection is idle (no segments received) for TCPTV_KEEP_INIT amount of time,
- * but not yet established, then we drop the connection.  Once the connection
- * is established, if the connection is idle for TCPTV_KEEP_IDLE time
- * (and keepalives have been enabled on the socket), we begin to probe
- * the connection.  We force the peer to send us a segment by sending:
- *	<SEQ=SND.UNA-1><ACK=RCV.NXT><CTL=ACK>
- * This segment is (deliberately) outside the window, and should elicit
- * an ack segment in response from the peer.  If, despite the TCPT_KEEP
- * initiated segments we cannot elicit a response from a peer in TCPT_MAXIDLE
- * amount of time probing, then we drop the connection.
- */
-
-/*
- * Time constants.
- */
-#define	TCPTV_MSL	( 30*PR_SLOWHZ)		/* max seg lifetime (hah!) */
-#define	TCPTV_SRTTBASE	0			/* base roundtrip time;
-						   if 0, no idea yet */
-#define	TCPTV_RTOBASE	(  3*PR_SLOWHZ)		/* assumed RTO if no info */
-#define	TCPTV_SRTTDFLT	(  3*PR_SLOWHZ)		/* assumed RTT if no info */
-
-#define	TCPTV_PERSMIN	(  5*PR_SLOWHZ)		/* retransmit persistence */
-#define	TCPTV_PERSMAX	( 60*PR_SLOWHZ)		/* maximum persist interval */
-
-#define	TCPTV_KEEP_INIT	( 75*PR_SLOWHZ)		/* initial connect keep alive */
-#define	TCPTV_KEEP_IDLE	(120*60*PR_SLOWHZ)	/* dflt time before probing */
-#define	TCPTV_KEEPINTVL	( 75*PR_SLOWHZ)		/* default probe interval */
-#define	TCPTV_KEEPCNT	8			/* max probes before drop */
-
-#define	TCPTV_MIN	(  1*PR_SLOWHZ)		/* minimum allowable value */
-#define	TCPTV_REXMTMAX	( 64*PR_SLOWHZ)		/* max allowable REXMT value */
-
-#define TCPTV_TWTRUNC	8			/* RTO factor to truncate TW */
-
-#define	TCP_LINGERTIME	120			/* linger at most 2 minutes */
-
-#define	TCP_MAXRXTSHIFT	12			/* maximum retransmits */
-
-#ifdef	TCPTIMERS
-static char *tcptimers[] =
-    { "REXMT", "PERSIST", "KEEP", "2MSL" };
-#endif
-
-/*
- * Force a time value to be in a certain range.
- */
-#define	TCPT_RANGESET(tv, value, tvmin, tvmax) { \
-	(tv) = (value); \
-	if ((u_long)(tv) < (u_long)(tvmin)) \
-		(tv) = (tvmin); \
-	else if ((u_long)(tv) > (u_long)(tvmax)) \
-		(tv) = (tvmax); \
-}
-
-#ifdef KERNEL
-extern int tcp_keepinit;		/* time to establish connection */
-extern int tcp_keepidle;		/* time before keepalive probes begin */
-extern int tcp_keepintvl;		/* time between keepalive probes */
-extern int tcp_maxidle;			/* time to drop after starting probes */
-extern int tcp_ttl;			/* time to live for TCP segs */
-extern int tcp_backoff[];
-#endif
-
-#endif
diff --git a/cpukit/libnetworking/netinet/tcp_usrreq.c b/cpukit/libnetworking/netinet/tcp_usrreq.c
deleted file mode 100644
index ecd9d95636..0000000000
--- a/cpukit/libnetworking/netinet/tcp_usrreq.c
+++ /dev/null
@@ -1,840 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	From: @(#)tcp_usrreq.c	8.2 (Berkeley) 1/3/94
- *	$Id$
- */
-
-#include "opt_tcpdebug.h"
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/sysctl.h>
-#include <sys/malloc.h>
-#include <sys/mbuf.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/protosw.h>
-#include <sys/errno.h>
-#include <sys/stat.h>
-
-#include <net/if.h>
-#include <net/route.h>
-
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/in_pcb.h>
-#include <netinet/in_var.h>
-#include <netinet/ip_var.h>
-#include <netinet/tcp.h>
-#include <netinet/tcp_fsm.h>
-#include <netinet/tcp_seq.h>
-#include <netinet/tcp_timer.h>
-#include <netinet/tcp_var.h>
-#include <netinet/tcpip.h>
-#ifdef TCPDEBUG
-#include <netinet/tcp_debug.h>
-#endif
-
-/*
- * TCP protocol interface to socket abstraction.
- */
-extern	char *tcpstates[];
-
-static int	tcp_attach __P((struct socket *));
-static int	tcp_connect __P((struct tcpcb *, struct mbuf *));
-static struct tcpcb *
-		tcp_disconnect __P((struct tcpcb *));
-static struct tcpcb *
-		tcp_usrclosed __P((struct tcpcb *));
-
-#ifdef TCPDEBUG
-#define	TCPDEBUG0	int ostate
-#define	TCPDEBUG1()	ostate = tp ? tp->t_state : 0
-#define	TCPDEBUG2(req)	if (tp && (so->so_options & SO_DEBUG)) \
-				tcp_trace(TA_USER, ostate, tp, 0, req)
-#else
-#define	TCPDEBUG0
-#define	TCPDEBUG1()
-#define	TCPDEBUG2(req)
-#endif
-
-/*
- * TCP attaches to socket via pru_attach(), reserving space,
- * and an internet control block.
- */
-static int
-tcp_usr_attach(struct socket *so, int proto)
-{
-	int s = splnet();
-	int error;
-	struct inpcb *inp = sotoinpcb(so);
-	struct tcpcb *tp = 0;
-	TCPDEBUG0;
-
-	TCPDEBUG1();
-	if (inp) {
-		error = EISCONN;
-		goto out;
-	}
-
-	error = tcp_attach(so);
-	if (error)
-		goto out;
-
-	if ((so->so_options & SO_LINGER) && so->so_linger == 0)
-		so->so_linger = TCP_LINGERTIME * hz;
-	tp = sototcpcb(so);
-out:
-	TCPDEBUG2(PRU_ATTACH);
-	splx(s);
-	return error;
-}
-
-/*
- * pru_detach() detaches the TCP protocol from the socket.
- * If the protocol state is non-embryonic, then can't
- * do this directly: have to initiate a pru_disconnect(),
- * which may finish later; embryonic TCB's can just
- * be discarded here.
- */
-static int
-tcp_usr_detach(struct socket *so)
-{
-	int s = splnet();
-	int error = 0;
-	struct inpcb *inp = sotoinpcb(so);
-	struct tcpcb *tp;
-	TCPDEBUG0;
-
-	if (inp == 0) {
-		splx(s);
-		return EINVAL;	/* XXX */
-	}
-	tp = intotcpcb(inp);
-	TCPDEBUG1();
-	if (tp->t_state > TCPS_LISTEN)
-		tp = tcp_disconnect(tp);
-	else
-		tp = tcp_close(tp);
-
-	TCPDEBUG2(PRU_DETACH);
-	splx(s);
-	return error;
-}
-
-#define	COMMON_START()	TCPDEBUG0; \
-			do { \
-				     if (inp == 0) { \
-					     splx(s); \
-					     return EINVAL; \
-				     } \
-				     tp = intotcpcb(inp); \
-				     TCPDEBUG1(); \
-		     } while(0)
-			     
-#define COMMON_END(req)	out: TCPDEBUG2(req); splx(s); return error; goto out
-
-
-/*
- * Give the socket an address.
- */
-static int
-tcp_usr_bind(struct socket *so, struct mbuf *nam)
-{
-	int s = splnet();
-	int error = 0;
-	struct inpcb *inp = sotoinpcb(so);
-	struct tcpcb *tp;
-	struct sockaddr_in *sinp;
-
-	COMMON_START();
-
-	/*
-	 * Must check for multicast addresses and disallow binding
-	 * to them.
-	 */
-	sinp = mtod(nam, struct sockaddr_in *);
-	if (sinp->sin_family == AF_INET &&
-	    IN_MULTICAST(ntohl(sinp->sin_addr.s_addr))) {
-		error = EAFNOSUPPORT;
-		goto out;
-	}
-	error = in_pcbbind(inp, nam);
-	if (error)
-		goto out;
-	COMMON_END(PRU_BIND);
-
-}
-
-/*
- * Prepare to accept connections.
- */
-static int
-tcp_usr_listen(struct socket *so)
-{
-	int s = splnet();
-	int error = 0;
-	struct inpcb *inp = sotoinpcb(so);
-	struct tcpcb *tp;
-
-	COMMON_START();
-	if (inp->inp_lport == 0)
-		error = in_pcbbind(inp, NULL);
-	if (error == 0)
-		tp->t_state = TCPS_LISTEN;
-	COMMON_END(PRU_LISTEN);
-}
-
-/*
- * Initiate connection to peer.
- * Create a template for use in transmissions on this connection.
- * Enter SYN_SENT state, and mark socket as connecting.
- * Start keep-alive timer, and seed output sequence space.
- * Send initial segment on connection.
- */
-static int
-tcp_usr_connect(struct socket *so, struct mbuf *nam)
-{
-	int s = splnet();
-	int error = 0;
-	struct inpcb *inp = sotoinpcb(so);
-	struct tcpcb *tp;
-	struct sockaddr_in *sinp;
-
-	COMMON_START();
-
-	/*
-	 * Must disallow TCP ``connections'' to multicast addresses.
-	 */
-	sinp = mtod(nam, struct sockaddr_in *);
-	if (sinp->sin_family == AF_INET
-	    && IN_MULTICAST(ntohl(sinp->sin_addr.s_addr))) {
-		error = EAFNOSUPPORT;
-		goto out;
-	}
-
-	if ((error = tcp_connect(tp, nam)) != 0)
-		goto out;
-	error = tcp_output(tp);
-	COMMON_END(PRU_CONNECT);
-}
-
-/*
- * Initiate disconnect from peer.
- * If connection never passed embryonic stage, just drop;
- * else if don't need to let data drain, then can just drop anyways,
- * else have to begin TCP shutdown process: mark socket disconnecting,
- * drain unread data, state switch to reflect user close, and
- * send segment (e.g. FIN) to peer.  Socket will be really disconnected
- * when peer sends FIN and acks ours.
- *
- * SHOULD IMPLEMENT LATER PRU_CONNECT VIA REALLOC TCPCB.
- */
-static int
-tcp_usr_disconnect(struct socket *so)
-{
-	int s = splnet();
-	int error = 0;
-	struct inpcb *inp = sotoinpcb(so);
-	struct tcpcb *tp;
-
-	COMMON_START();
-	tp = tcp_disconnect(tp);
-	COMMON_END(PRU_DISCONNECT);
-}
-
-/*
- * Accept a connection.  Essentially all the work is
- * done at higher levels; just return the address
- * of the peer, storing through addr.
- */
-static int
-tcp_usr_accept(struct socket *so, struct mbuf *nam)
-{
-	int s = splnet();
-	int error = 0;
-	struct inpcb *inp = sotoinpcb(so);
-	struct tcpcb *tp;
-
-	COMMON_START();
-	in_setpeeraddr(inp, nam);
-	COMMON_END(PRU_ACCEPT);
-}
-
-/*
- * Mark the connection as being incapable of further output.
- */
-static int
-tcp_usr_shutdown(struct socket *so)
-{
-	int s = splnet();
-	int error = 0;
-	struct inpcb *inp = sotoinpcb(so);
-	struct tcpcb *tp;
-
-	COMMON_START();
-	socantsendmore(so);
-	tp = tcp_usrclosed(tp);
-	if (tp)
-		error = tcp_output(tp);
-	COMMON_END(PRU_SHUTDOWN);
-}
-
-/*
- * After a receive, possibly send window update to peer.
- */
-static int
-tcp_usr_rcvd(struct socket *so, int flags)
-{
-	int s = splnet();
-	int error = 0;
-	struct inpcb *inp = sotoinpcb(so);
-	struct tcpcb *tp;
-
-	COMMON_START();
-	tcp_output(tp);
-	COMMON_END(PRU_RCVD);
-}
-
-/*
- * Do a send by putting data in output queue and updating urgent
- * marker if URG set.  Possibly send more data.
- */
-static int
-tcp_usr_send(struct socket *so, int flags, struct mbuf *m, struct mbuf *nam,
-	     struct mbuf *control)
-{
-	int s = splnet();
-	int error = 0;
-	struct inpcb *inp = sotoinpcb(so);
-	struct tcpcb *tp;
-
-	COMMON_START();
-	if (control && control->m_len) {
-		m_freem(control); /* XXX shouldn't caller do this??? */
-		if (m)
-			m_freem(m);
-		error = EINVAL;
-		goto out;
-	}
-
-	if(!(flags & PRUS_OOB)) {
-		sbappend(&so->so_snd, m);
-		if (nam && tp->t_state < TCPS_SYN_SENT) {
-			/*
-			 * Do implied connect if not yet connected,
-			 * initialize window to default value, and
-			 * initialize maxseg/maxopd using peer's cached
-			 * MSS.
-			 */
-			error = tcp_connect(tp, nam);
-			if (error)
-				goto out;
-			tp->snd_wnd = TTCP_CLIENT_SND_WND;
-			tcp_mss(tp, -1);
-		}
-
-		if (flags & PRUS_EOF) {
-			/*
-			 * Close the send side of the connection after
-			 * the data is sent.
-			 */
-			socantsendmore(so);
-			tp = tcp_usrclosed(tp);
-		}
-		if (tp != NULL)
-			error = tcp_output(tp);
-	} else {
-		if (sbspace(&so->so_snd) < -512) {
-			m_freem(m);
-			error = ENOBUFS;
-			goto out;
-		}
-		/*
-		 * According to RFC961 (Assigned Protocols),
-		 * the urgent pointer points to the last octet
-		 * of urgent data.  We continue, however,
-		 * to consider it to indicate the first octet
-		 * of data past the urgent section.
-		 * Otherwise, snd_up should be one lower.
-		 */
-		sbappend(&so->so_snd, m);
-		if (nam && tp->t_state < TCPS_SYN_SENT) {
-			/*
-			 * Do implied connect if not yet connected,
-			 * initialize window to default value, and
-			 * initialize maxseg/maxopd using peer's cached
-			 * MSS.
-			 */
-			error = tcp_connect(tp, nam);
-			if (error)
-				goto out;
-			tp->snd_wnd = TTCP_CLIENT_SND_WND;
-			tcp_mss(tp, -1);
-		}
-		tp->snd_up = tp->snd_una + so->so_snd.sb_cc;
-		tp->t_force = 1;
-		error = tcp_output(tp);
-		tp->t_force = 0;
-	}
-	COMMON_END((flags & PRUS_OOB) ? PRU_SENDOOB : 
-		   ((flags & PRUS_EOF) ? PRU_SEND_EOF : PRU_SEND));
-}
-
-/*
- * Abort the TCP.
- */
-static int
-tcp_usr_abort(struct socket *so)
-{
-	int s = splnet();
-	int error = 0;
-	struct inpcb *inp = sotoinpcb(so);
-	struct tcpcb *tp;
-
-	COMMON_START();
-	tp = tcp_drop(tp, ECONNABORTED);
-	COMMON_END(PRU_ABORT);
-}
-
-/*
- * Fill in st_bklsize for fstat() operations on a socket.
- */
-static int
-tcp_usr_sense(struct socket *so, struct stat *sb)
-{
-	int s = splnet();
-
-	sb->st_blksize = so->so_snd.sb_hiwat;
-	splx(s);
-	return 0;
-}
-
-/*
- * Receive out-of-band data.
- */
-static int
-tcp_usr_rcvoob(struct socket *so, struct mbuf *m, int flags)
-{
-	int s = splnet();
-	int error = 0;
-	struct inpcb *inp = sotoinpcb(so);
-	struct tcpcb *tp;
-
-	COMMON_START();
-	if ((so->so_oobmark == 0 &&
-	     (so->so_state & SS_RCVATMARK) == 0) ||
-	    so->so_options & SO_OOBINLINE ||
-	    tp->t_oobflags & TCPOOB_HADDATA) {
-		error = EINVAL;
-		goto out;
-	}
-	if ((tp->t_oobflags & TCPOOB_HAVEDATA) == 0) {
-		error = EWOULDBLOCK;
-		goto out;
-	}
-	m->m_len = 1;
-	*mtod(m, caddr_t) = tp->t_iobc;
-	if ((flags & MSG_PEEK) == 0)
-		tp->t_oobflags ^= (TCPOOB_HAVEDATA | TCPOOB_HADDATA);
-	COMMON_END(PRU_RCVOOB);
-}
-
-static int
-tcp_usr_sockaddr(struct socket *so, struct mbuf *nam)
-{
-	int s = splnet();
-	int error = 0;
-	struct inpcb *inp = sotoinpcb(so);
-	struct tcpcb *tp;
-
-	COMMON_START();
-	in_setsockaddr(inp, nam);
-	COMMON_END(PRU_SOCKADDR);
-}
-
-static int
-tcp_usr_peeraddr(struct socket *so, struct mbuf *nam)
-{
-	int s = splnet();
-	int error = 0;
-	struct inpcb *inp = sotoinpcb(so);
-	struct tcpcb *tp;
-
-	COMMON_START();
-	in_setpeeraddr(inp, nam);
-	COMMON_END(PRU_PEERADDR);
-}
-
-/*
- * XXX - this should just be a call to in_control, but we need to get
- * the types worked out.
- */
-static int
-tcp_usr_control(struct socket *so, int cmd, caddr_t arg, struct ifnet *ifp)
-{
-	return in_control(so, cmd, arg, ifp);
-}
-
-/* xxx - should be const */
-struct pr_usrreqs tcp_usrreqs = {
-	tcp_usr_abort, tcp_usr_accept, tcp_usr_attach, tcp_usr_bind,
-	tcp_usr_connect, pru_connect2_notsupp, tcp_usr_control, tcp_usr_detach,
-	tcp_usr_disconnect, tcp_usr_listen, tcp_usr_peeraddr, tcp_usr_rcvd,
-	tcp_usr_rcvoob, tcp_usr_send, tcp_usr_sense, tcp_usr_shutdown,
-	tcp_usr_sockaddr
-};
-
-/*
- * Common subroutine to open a TCP connection to remote host specified
- * by struct sockaddr_in in mbuf *nam.  Call in_pcbbind to assign a local
- * port number if needed.  Call in_pcbladdr to do the routing and to choose
- * a local host address (interface).  If there is an existing incarnation
- * of the same connection in TIME-WAIT state and if the remote host was
- * sending CC options and if the connection duration was < MSL, then
- * truncate the previous TIME-WAIT state and proceed.
- * Initialize connection parameters and enter SYN-SENT state.
- */
-static int
-tcp_connect(tp, nam)
-	register struct tcpcb *tp;
-	struct mbuf *nam;
-{
-	struct inpcb *inp = tp->t_inpcb, *oinp;
-	struct socket *so = inp->inp_socket;
-	struct tcpcb *otp;
-	struct sockaddr_in *sin = mtod(nam, struct sockaddr_in *);
-	struct sockaddr_in *ifaddr;
-	int error;
-	struct rmxp_tao *taop;
-	struct rmxp_tao tao_noncached;
-
-	if (inp->inp_lport == 0) {
-		error = in_pcbbind(inp, NULL);
-		if (error)
-			return error;
-	}
-
-	/*
-	 * Cannot simply call in_pcbconnect, because there might be an
-	 * earlier incarnation of this same connection still in
-	 * TIME_WAIT state, creating an ADDRINUSE error.
-	 */
-	error = in_pcbladdr(inp, nam, &ifaddr);
-	if (error)
-		return error;
-	oinp = in_pcblookuphash(inp->inp_pcbinfo,
-	    sin->sin_addr, sin->sin_port,
-	    inp->inp_laddr.s_addr != INADDR_ANY ? inp->inp_laddr
-						: ifaddr->sin_addr,
-	    inp->inp_lport,  0);
-	if (oinp) {
-		if (oinp != inp && (otp = intotcpcb(oinp)) != NULL &&
-		otp->t_state == TCPS_TIME_WAIT &&
-		    otp->t_duration < TCPTV_MSL &&
-		    (otp->t_flags & TF_RCVD_CC))
-			otp = tcp_close(otp);
-		else
-			return EADDRINUSE;
-	}
-	if (inp->inp_laddr.s_addr == INADDR_ANY)
-		inp->inp_laddr = ifaddr->sin_addr;
-	inp->inp_faddr = sin->sin_addr;
-	inp->inp_fport = sin->sin_port;
-	in_pcbrehash(inp);
-
-	tp->t_template = tcp_template(tp);
-	if (tp->t_template == 0) {
-		in_pcbdisconnect(inp);
-		return ENOBUFS;
-	}
-
-	/* Compute window scaling to request.  */
-	while (tp->request_r_scale < TCP_MAX_WINSHIFT &&
-	    (TCP_MAXWIN << tp->request_r_scale) < so->so_rcv.sb_hiwat)
-		tp->request_r_scale++;
-
-	soisconnecting(so);
-	tcpstat.tcps_connattempt++;
-	tp->t_state = TCPS_SYN_SENT;
-	tp->t_timer[TCPT_KEEP] = tcp_keepinit;
-	tp->iss = tcp_iss; tcp_iss += TCP_ISSINCR/2;
-	tcp_sendseqinit(tp);
-
-	/*
-	 * Generate a CC value for this connection and
-	 * check whether CC or CCnew should be used.
-	 */
-	if ((taop = tcp_gettaocache(tp->t_inpcb)) == NULL) {
-		taop = &tao_noncached;
-		bzero(taop, sizeof(*taop));
-	}
-
-	tp->cc_send = CC_INC(tcp_ccgen);
-	if (taop->tao_ccsent != 0 &&
-	    CC_GEQ(tp->cc_send, taop->tao_ccsent)) {
-		taop->tao_ccsent = tp->cc_send;
-	} else {
-		taop->tao_ccsent = 0;
-		tp->t_flags |= TF_SENDCCNEW;
-	}
-
-	return 0;
-}
-
-int
-tcp_ctloutput(op, so, level, optname, mp)
-	int op;
-	struct socket *so;
-	int level, optname;
-	struct mbuf **mp;
-{
-	int error = 0, s;
-	struct inpcb *inp;
-	register struct tcpcb *tp;
-	register struct mbuf *m;
-	register int i;
-
-	s = splnet();
-	inp = sotoinpcb(so);
-	if (inp == NULL) {
-		splx(s);
-		if (op == PRCO_SETOPT && *mp)
-			(void) m_free(*mp);
-		return (ECONNRESET);
-	}
-	if (level != IPPROTO_TCP) {
-		error = ip_ctloutput(op, so, level, optname, mp);
-		splx(s);
-		return (error);
-	}
-	tp = intotcpcb(inp);
-
-	switch (op) {
-
-	case PRCO_SETOPT:
-		m = *mp;
-		switch (optname) {
-
-		case TCP_NODELAY:
-			if (m == NULL || m->m_len < sizeof (int))
-				error = EINVAL;
-			else if (*mtod(m, int *))
-				tp->t_flags |= TF_NODELAY;
-			else
-				tp->t_flags &= ~TF_NODELAY;
-			break;
-
-		case TCP_MAXSEG:
-			if (m && (i = *mtod(m, int *)) > 0 && i <= tp->t_maxseg)
-				tp->t_maxseg = i;
-			else
-				error = EINVAL;
-			break;
-
-		case TCP_NOOPT:
-			if (m == NULL || m->m_len < sizeof (int))
-				error = EINVAL;
-			else if (*mtod(m, int *))
-				tp->t_flags |= TF_NOOPT;
-			else
-				tp->t_flags &= ~TF_NOOPT;
-			break;
-
-		case TCP_NOPUSH:
-			if (m == NULL || m->m_len < sizeof (int))
-				error = EINVAL;
-			else if (*mtod(m, int *))
-				tp->t_flags |= TF_NOPUSH;
-			else
-				tp->t_flags &= ~TF_NOPUSH;
-			break;
-
-		default:
-			error = ENOPROTOOPT;
-			break;
-		}
-		if (m)
-			(void) m_free(m);
-		break;
-
-	case PRCO_GETOPT:
-		*mp = m = m_get(M_WAIT, MT_SOOPTS);
-		m->m_len = sizeof(int);
-
-		switch (optname) {
-		case TCP_NODELAY:
-			*mtod(m, int *) = tp->t_flags & TF_NODELAY;
-			break;
-		case TCP_MAXSEG:
-			*mtod(m, int *) = tp->t_maxseg;
-			break;
-		case TCP_NOOPT:
-			*mtod(m, int *) = tp->t_flags & TF_NOOPT;
-			break;
-		case TCP_NOPUSH:
-			*mtod(m, int *) = tp->t_flags & TF_NOPUSH;
-			break;
-		default:
-			error = ENOPROTOOPT;
-			break;
-		}
-		break;
-	}
-	splx(s);
-	return (error);
-}
-
-/*
- * tcp_sendspace and tcp_recvspace are the default send and receive window
- * sizes, respectively.  These are obsolescent (this information should
- * be set by the route).
- */
-u_long	tcp_sendspace = 1024*16;
-SYSCTL_INT(_net_inet_tcp, TCPCTL_SENDSPACE, sendspace,
-	CTLFLAG_RW, &tcp_sendspace , 0, "");
-u_long	tcp_recvspace = 1024*16;
-SYSCTL_INT(_net_inet_tcp, TCPCTL_RECVSPACE, recvspace,
-	CTLFLAG_RW, &tcp_recvspace , 0, "");
-
-/*
- * Attach TCP protocol to socket, allocating
- * internet protocol control block, tcp control block,
- * bufer space, and entering LISTEN state if to accept connections.
- */
-static int
-tcp_attach(so)
-	struct socket *so;
-{
-	register struct tcpcb *tp;
-	struct inpcb *inp;
-	int error;
-
-	if (so->so_snd.sb_hiwat == 0 || so->so_rcv.sb_hiwat == 0) {
-		error = soreserve(so, tcp_sendspace, tcp_recvspace);
-		if (error)
-			return (error);
-	}
-	error = in_pcballoc(so, &tcbinfo);
-	if (error)
-		return (error);
-	inp = sotoinpcb(so);
-	tp = tcp_newtcpcb(inp);
-	if (tp == 0) {
-		int nofd = so->so_state & SS_NOFDREF;	/* XXX */
-
-		so->so_state &= ~SS_NOFDREF;	/* don't free the socket yet */
-		in_pcbdetach(inp);
-		so->so_state |= nofd;
-		return (ENOBUFS);
-	}
-	tp->t_state = TCPS_CLOSED;
-	return (0);
-}
-
-/*
- * Initiate (or continue) disconnect.
- * If embryonic state, just send reset (once).
- * If in ``let data drain'' option and linger null, just drop.
- * Otherwise (hard), mark socket disconnecting and drop
- * current input data; switch states based on user close, and
- * send segment to peer (with FIN).
- */
-static struct tcpcb *
-tcp_disconnect(tp)
-	register struct tcpcb *tp;
-{
-	struct socket *so = tp->t_inpcb->inp_socket;
-
-	if (tp->t_state < TCPS_ESTABLISHED)
-		tp = tcp_close(tp);
-	else if ((so->so_options & SO_LINGER) && so->so_linger == 0)
-		tp = tcp_drop(tp, 0);
-	else {
-		soisdisconnecting(so);
-		sbflush(&so->so_rcv);
-		tp = tcp_usrclosed(tp);
-		if (tp)
-			(void) tcp_output(tp);
-	}
-	return (tp);
-}
-
-/*
- * User issued close, and wish to trail through shutdown states:
- * if never received SYN, just forget it.  If got a SYN from peer,
- * but haven't sent FIN, then go to FIN_WAIT_1 state to send peer a FIN.
- * If already got a FIN from peer, then almost done; go to LAST_ACK
- * state.  In all other cases, have already sent FIN to peer (e.g.
- * after PRU_SHUTDOWN), and just have to play tedious game waiting
- * for peer to send FIN or not respond to keep-alives, etc.
- * We can let the user exit from the close as soon as the FIN is acked.
- */
-static struct tcpcb *
-tcp_usrclosed(tp)
-	register struct tcpcb *tp;
-{
-
-	switch (tp->t_state) {
-
-	case TCPS_CLOSED:
-	case TCPS_LISTEN:
-		tp->t_state = TCPS_CLOSED;
-		tp = tcp_close(tp);
-		break;
-
-	case TCPS_SYN_SENT:
-	case TCPS_SYN_RECEIVED:
-		tp->t_flags |= TF_NEEDFIN;
-		break;
-
-	case TCPS_ESTABLISHED:
-		tp->t_state = TCPS_FIN_WAIT_1;
-		break;
-
-	case TCPS_CLOSE_WAIT:
-		tp->t_state = TCPS_LAST_ACK;
-		break;
-	}
-	if (tp && tp->t_state >= TCPS_FIN_WAIT_2) {
-		soisdisconnected(tp->t_inpcb->inp_socket);
-		/* To prevent the connection hanging in FIN_WAIT_2 forever. */
-		if (tp->t_state == TCPS_FIN_WAIT_2)
-			tp->t_timer[TCPT_2MSL] = tcp_maxidle;
-	}
-	return (tp);
-}
-
diff --git a/cpukit/libnetworking/netinet/tcp_var.h b/cpukit/libnetworking/netinet/tcp_var.h
deleted file mode 100644
index 8e63a2cafe..0000000000
--- a/cpukit/libnetworking/netinet/tcp_var.h
+++ /dev/null
@@ -1,374 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993, 1994, 1995
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)tcp_var.h	8.4 (Berkeley) 5/24/95
- * 	$Id$
- */
-
-#ifndef _NETINET_TCP_VAR_H_
-#define _NETINET_TCP_VAR_H_
-/*
- * Kernel variables for tcp.
- */
-
-/*
- * Tcp control block, one per tcp; fields:
- */
-struct tcpcb {
-	struct	tcpiphdr *seg_next;	/* sequencing queue */
-	struct	tcpiphdr *seg_prev;
-	int	t_state;		/* state of this connection */
-	int	t_timer[TCPT_NTIMERS];	/* tcp timers */
-	int	t_rxtshift;		/* log(2) of rexmt exp. backoff */
-	int	t_rxtcur;		/* current retransmit value */
-	int	t_dupacks;		/* consecutive dup acks recd */
-	u_int	t_maxseg;		/* maximum segment size */
-	u_int	t_maxopd;		/* mss plus options */
-	int	t_force;		/* 1 if forcing out a byte */
-	u_int	t_flags;
-#define	TF_ACKNOW	0x0001		/* ack peer immediately */
-#define	TF_DELACK	0x0002		/* ack, but try to delay it */
-#define	TF_NODELAY	0x0004		/* don't delay packets to coalesce */
-#define	TF_NOOPT	0x0008		/* don't use tcp options */
-#define	TF_SENTFIN	0x0010		/* have sent FIN */
-#define	TF_REQ_SCALE	0x0020		/* have/will request window scaling */
-#define	TF_RCVD_SCALE	0x0040		/* other side has requested scaling */
-#define	TF_REQ_TSTMP	0x0080		/* have/will request timestamps */
-#define	TF_RCVD_TSTMP	0x0100		/* a timestamp was received in SYN */
-#define	TF_SACK_PERMIT	0x0200		/* other side said I could SACK */
-#define TF_NEEDSYN	0x0400		/* send SYN (implicit state) */
-#define TF_NEEDFIN	0x0800		/* send FIN (implicit state) */
-#define TF_NOPUSH	0x1000		/* don't push */
-#define TF_REQ_CC	0x2000		/* have/will request CC */
-#define	TF_RCVD_CC	0x4000		/* a CC was received in SYN */
-#define TF_SENDCCNEW	0x8000		/* send CCnew instead of CC in SYN */
-
-	struct	tcpiphdr *t_template;	/* skeletal packet for transmit */
-	struct	inpcb *t_inpcb;		/* back pointer to internet pcb */
-/*
- * The following fields are used as in the protocol specification.
- * See RFC783, Dec. 1981, page 21.
- */
-/* send sequence variables */
-	tcp_seq	snd_una;		/* send unacknowledged */
-	tcp_seq	snd_nxt;		/* send next */
-	tcp_seq	snd_up;			/* send urgent pointer */
-	tcp_seq	snd_wl1;		/* window update seg seq number */
-	tcp_seq	snd_wl2;		/* window update seg ack number */
-	tcp_seq	iss;			/* initial send sequence number */
-	u_long	snd_wnd;		/* send window */
-/* receive sequence variables */
-	u_long	rcv_wnd;		/* receive window */
-	tcp_seq	rcv_nxt;		/* receive next */
-	tcp_seq	rcv_up;			/* receive urgent pointer */
-	tcp_seq	irs;			/* initial receive sequence number */
-/*
- * Additional variables for this implementation.
- */
-/* receive variables */
-	tcp_seq	rcv_adv;		/* advertised window */
-/* retransmit variables */
-	tcp_seq	snd_max;		/* highest sequence number sent;
-					 * used to recognize retransmits
-					 */
-/* congestion control (for slow start, source quench, retransmit after loss) */
-	u_long	snd_cwnd;		/* congestion-controlled window */
-	u_long	snd_ssthresh;		/* snd_cwnd size threshold for
-					 * for slow start exponential to
-					 * linear switch
-					 */
-/*
- * transmit timing stuff.  See below for scale of srtt and rttvar.
- * "Variance" is actually smoothed difference.
- */
-	u_int	t_idle;			/* inactivity time */
-	int	t_rtt;			/* round trip time */
-	tcp_seq	t_rtseq;		/* sequence number being timed */
-	int	t_srtt;			/* smoothed round-trip time */
-	int	t_rttvar;		/* variance in round-trip time */
-	u_int	t_rttmin;		/* minimum rtt allowed */
-	u_long	max_sndwnd;		/* largest window peer has offered */
-
-/* out-of-band data */
-	char	t_oobflags;		/* have some */
-	char	t_iobc;			/* input character */
-#define	TCPOOB_HAVEDATA	0x01
-#define	TCPOOB_HADDATA	0x02
-	int	t_softerror;		/* possible error not yet reported */
-
-/* RFC 1323 variables */
-	u_char	snd_scale;		/* window scaling for send window */
-	u_char	rcv_scale;		/* window scaling for recv window */
-	u_char	request_r_scale;	/* pending window scaling */
-	u_char	requested_s_scale;
-	u_long	ts_recent;		/* timestamp echo data */
-	u_long	ts_recent_age;		/* when last updated */
-	tcp_seq	last_ack_sent;
-/* RFC 1644 variables */
-	tcp_cc	cc_send;		/* send connection count */
-	tcp_cc	cc_recv;		/* receive connection count */
-	u_long	t_duration;		/* connection duration */
-
-/* TUBA stuff */
-	caddr_t	t_tuba_pcb;		/* next level down pcb for TCP over z */
-/* More RTT stuff */
-	u_long	t_rttupdated;		/* number of times rtt sampled */
-};
-
-/*
- * Structure to hold TCP options that are only used during segment
- * processing (in tcp_input), but not held in the tcpcb.
- * It's basically used to reduce the number of parameters
- * to tcp_dooptions.
- */
-struct tcpopt {
-	u_long	to_flag;		/* which options are present */
-#define TOF_TS		0x0001		/* timestamp */
-#define TOF_CC		0x0002		/* CC and CCnew are exclusive */
-#define TOF_CCNEW	0x0004
-#define	TOF_CCECHO	0x0008
-	u_long	to_tsval;
-	u_long	to_tsecr;
-	tcp_cc	to_cc;		/* holds CC or CCnew */
-	tcp_cc	to_ccecho;
-};
-
-/*
- * The TAO cache entry which is stored in the protocol family specific
- * portion of the route metrics.
- */
-struct rmxp_tao {
-	tcp_cc	tao_cc;			/* latest CC in valid SYN */
-	tcp_cc	tao_ccsent;		/* latest CC sent to peer */
-	u_short	tao_mssopt;		/* peer's cached MSS */
-#ifdef notyet
-	u_short	tao_flags;		/* cache status flags */
-#define	TAOF_DONT	0x0001		/* peer doesn't understand rfc1644 */
-#define	TAOF_OK		0x0002		/* peer does understand rfc1644 */
-#define	TAOF_UNDEF	0		/* we don't know yet */
-#endif /* notyet */
-};
-#define rmx_taop(r)	((struct rmxp_tao *)(r).rmx_filler)
-
-#define	intotcpcb(ip)	((struct tcpcb *)(ip)->inp_ppcb)
-#define	sototcpcb(so)	(intotcpcb(sotoinpcb(so)))
-
-/*
- * The smoothed round-trip time and estimated variance
- * are stored as fixed point numbers scaled by the values below.
- * For convenience, these scales are also used in smoothing the average
- * (smoothed = (1/scale)sample + ((scale-1)/scale)smoothed).
- * With these scales, srtt has 3 bits to the right of the binary point,
- * and thus an "ALPHA" of 0.875.  rttvar has 2 bits to the right of the
- * binary point, and is smoothed with an ALPHA of 0.75.
- */
-#define	TCP_RTT_SCALE		32	/* multiplier for srtt; 3 bits frac. */
-#define	TCP_RTT_SHIFT		5	/* shift for srtt; 3 bits frac. */
-#define	TCP_RTTVAR_SCALE	16	/* multiplier for rttvar; 2 bits */
-#define	TCP_RTTVAR_SHIFT	4	/* shift for rttvar; 2 bits */
-#define	TCP_DELTA_SHIFT		2	/* see tcp_input.c */
-
-/*
- * The initial retransmission should happen at rtt + 4 * rttvar.
- * Because of the way we do the smoothing, srtt and rttvar
- * will each average +1/2 tick of bias.  When we compute
- * the retransmit timer, we want 1/2 tick of rounding and
- * 1 extra tick because of +-1/2 tick uncertainty in the
- * firing of the timer.  The bias will give us exactly the
- * 1.5 tick we need.  But, because the bias is
- * statistical, we have to test that we don't drop below
- * the minimum feasible timer (which is 2 ticks).
- * This version of the macro adapted from a paper by Lawrence
- * Brakmo and Larry Peterson which outlines a problem caused
- * by insufficient precision in the original implementation,
- * which results in inappropriately large RTO values for very
- * fast networks.
- */
-#define	TCP_REXMTVAL(tp) \
-	((((tp)->t_srtt >> (TCP_RTT_SHIFT - TCP_DELTA_SHIFT))  \
-	  + (tp)->t_rttvar) >> TCP_DELTA_SHIFT)
-
-/* XXX
- * We want to avoid doing m_pullup on incoming packets but that
- * means avoiding dtom on the tcp reassembly code.  That in turn means
- * keeping an mbuf pointer in the reassembly queue (since we might
- * have a cluster).  As a quick hack, the source & destination
- * port numbers (which are no longer needed once we've located the
- * tcpcb) are overlayed with an mbuf pointer.
- */
-#define REASS_MBUF(ti) (*(struct mbuf **)&((ti)->ti_t))
-
-/*
- * TCP statistics.
- * Many of these should be kept per connection,
- * but that's inconvenient at the moment.
- */
-struct	tcpstat {
-	u_long	tcps_connattempt;	/* connections initiated */
-	u_long	tcps_accepts;		/* connections accepted */
-	u_long	tcps_connects;		/* connections established */
-	u_long	tcps_drops;		/* connections dropped */
-	u_long	tcps_conndrops;		/* embryonic connections dropped */
-	u_long	tcps_closed;		/* conn. closed (includes drops) */
-	u_long	tcps_segstimed;		/* segs where we tried to get rtt */
-	u_long	tcps_rttupdated;	/* times we succeeded */
-	u_long	tcps_delack;		/* delayed acks sent */
-	u_long	tcps_timeoutdrop;	/* conn. dropped in rxmt timeout */
-	u_long	tcps_rexmttimeo;	/* retransmit timeouts */
-	u_long	tcps_persisttimeo;	/* persist timeouts */
-	u_long	tcps_keeptimeo;		/* keepalive timeouts */
-	u_long	tcps_keepprobe;		/* keepalive probes sent */
-	u_long	tcps_keepdrops;		/* connections dropped in keepalive */
-
-	u_long	tcps_sndtotal;		/* total packets sent */
-	u_long	tcps_sndpack;		/* data packets sent */
-	u_long	tcps_sndbyte;		/* data bytes sent */
-	u_long	tcps_sndrexmitpack;	/* data packets retransmitted */
-	u_long	tcps_sndrexmitbyte;	/* data bytes retransmitted */
-	u_long	tcps_sndacks;		/* ack-only packets sent */
-	u_long	tcps_sndprobe;		/* window probes sent */
-	u_long	tcps_sndurg;		/* packets sent with URG only */
-	u_long	tcps_sndwinup;		/* window update-only packets sent */
-	u_long	tcps_sndctrl;		/* control (SYN|FIN|RST) packets sent */
-
-	u_long	tcps_rcvtotal;		/* total packets received */
-	u_long	tcps_rcvpack;		/* packets received in sequence */
-	u_long	tcps_rcvbyte;		/* bytes received in sequence */
-	u_long	tcps_rcvbadsum;		/* packets received with ccksum errs */
-	u_long	tcps_rcvbadoff;		/* packets received with bad offset */
-	u_long	tcps_rcvshort;		/* packets received too short */
-	u_long	tcps_rcvduppack;	/* duplicate-only packets received */
-	u_long	tcps_rcvdupbyte;	/* duplicate-only bytes received */
-	u_long	tcps_rcvpartduppack;	/* packets with some duplicate data */
-	u_long	tcps_rcvpartdupbyte;	/* dup. bytes in part-dup. packets */
-	u_long	tcps_rcvoopack;		/* out-of-order packets received */
-	u_long	tcps_rcvoobyte;		/* out-of-order bytes received */
-	u_long	tcps_rcvpackafterwin;	/* packets with data after window */
-	u_long	tcps_rcvbyteafterwin;	/* bytes rcvd after window */
-	u_long	tcps_rcvafterclose;	/* packets rcvd after "close" */
-	u_long	tcps_rcvwinprobe;	/* rcvd window probe packets */
-	u_long	tcps_rcvdupack;		/* rcvd duplicate acks */
-	u_long	tcps_rcvacktoomuch;	/* rcvd acks for unsent data */
-	u_long	tcps_rcvackpack;	/* rcvd ack packets */
-	u_long	tcps_rcvackbyte;	/* bytes acked by rcvd acks */
-	u_long	tcps_rcvwinupd;		/* rcvd window update packets */
-	u_long	tcps_pawsdrop;		/* segments dropped due to PAWS */
-	u_long	tcps_predack;		/* times hdr predict ok for acks */
-	u_long	tcps_preddat;		/* times hdr predict ok for data pkts */
-	u_long	tcps_pcbcachemiss;
-	u_long	tcps_cachedrtt;		/* times cached RTT in route updated */
-	u_long	tcps_cachedrttvar;	/* times cached rttvar updated */
-	u_long	tcps_cachedssthresh;	/* times cached ssthresh updated */
-	u_long	tcps_usedrtt;		/* times RTT initialized from route */
-	u_long	tcps_usedrttvar;	/* times RTTVAR initialized from rt */
-	u_long	tcps_usedssthresh;	/* times ssthresh initialized from rt*/
-	u_long	tcps_persistdrop;	/* timeout in persist state */
-	u_long	tcps_badsyn;		/* bogus SYN, e.g. premature ACK */
-	u_long	tcps_mturesent;		/* resends due to MTU discovery */
-	u_long	tcps_listendrop;	/* listen queue overflows */
-};
-
-/*
- * Names for TCP sysctl objects
- */
-#define	TCPCTL_DO_RFC1323	1	/* use RFC-1323 extensions */
-#define	TCPCTL_DO_RFC1644	2	/* use RFC-1644 extensions */
-#define	TCPCTL_MSSDFLT		3	/* MSS default */
-#define TCPCTL_STATS		4	/* statistics (read-only) */
-#define	TCPCTL_RTTDFLT		5	/* default RTT estimate */
-#define	TCPCTL_KEEPIDLE		6	/* keepalive idle timer */
-#define	TCPCTL_KEEPINTVL	7	/* interval to send keepalives */
-#define	TCPCTL_SENDSPACE	8	/* send buffer space */
-#define	TCPCTL_RECVSPACE	9	/* receive buffer space */
-#define	TCPCTL_KEEPINIT		10	/* receive buffer space */
-#define TCPCTL_MAXID		11
-
-#define TCPCTL_NAMES { \
-	{ 0, 0 }, \
-	{ "rfc1323", CTLTYPE_INT }, \
-	{ "rfc1644", CTLTYPE_INT }, \
-	{ "mssdflt", CTLTYPE_INT }, \
-	{ "stats", CTLTYPE_STRUCT }, \
-	{ "rttdflt", CTLTYPE_INT }, \
-	{ "keepidle", CTLTYPE_INT }, \
-	{ "keepintvl", CTLTYPE_INT }, \
-	{ "sendspace", CTLTYPE_INT }, \
-	{ "recvspace", CTLTYPE_INT }, \
-	{ "keepinit", CTLTYPE_INT }, \
-}
-
-#ifdef KERNEL
-extern	struct inpcbhead tcb;		/* head of queue of active tcpcb's */
-extern	struct inpcbinfo tcbinfo;
-extern	struct tcpstat tcpstat;	/* tcp statistics */
-extern	int tcp_mssdflt;	/* XXX */
-extern	u_long tcp_now;		/* for RFC 1323 timestamps */
-
-void	 tcp_canceltimers __P((struct tcpcb *));
-struct tcpcb *
-	 tcp_close __P((struct tcpcb *));
-void	 tcp_ctlinput __P((int, struct sockaddr *, void *));
-int	 tcp_ctloutput __P((int, struct socket *, int, int, struct mbuf **));
-struct tcpcb *
-	 tcp_drop __P((struct tcpcb *, int));
-void	 tcp_drain __P((void));
-void	 tcp_fasttimo __P((void));
-struct rmxp_tao *
-	 tcp_gettaocache __P((struct inpcb *));
-void	 tcp_init __P((void));
-void	 tcp_input __P((struct mbuf *, int));
-void	 tcp_mss __P((struct tcpcb *, int));
-int	 tcp_mssopt __P((struct tcpcb *));
-void	 tcp_mtudisc __P((struct inpcb *, int));
-struct tcpcb *
-	 tcp_newtcpcb __P((struct inpcb *));
-int	 tcp_output __P((struct tcpcb *));
-void	 tcp_quench __P((struct inpcb *, int));
-void	 tcp_respond __P((struct tcpcb *,
-	    struct tcpiphdr *, struct mbuf *, u_long, u_long, int));
-struct rtentry *
-	 tcp_rtlookup __P((struct inpcb *));
-void	 tcp_setpersist __P((struct tcpcb *));
-void	 tcp_slowtimo __P((void));
-struct tcpiphdr *
-	 tcp_template __P((struct tcpcb *));
-struct tcpcb *
-	 tcp_timers __P((struct tcpcb *, int));
-void	 tcp_trace __P((int, int, struct tcpcb *, struct tcpiphdr *, int));
-
-extern	struct pr_usrreqs tcp_usrreqs;
-extern	u_long tcp_sendspace;
-extern	u_long tcp_recvspace;
-
-#endif /* KERNEL */
-
-#endif /* _NETINET_TCP_VAR_H_ */
diff --git a/cpukit/libnetworking/netinet/tcpip.h b/cpukit/libnetworking/netinet/tcpip.h
deleted file mode 100644
index b8634bfd15..0000000000
--- a/cpukit/libnetworking/netinet/tcpip.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)tcpip.h	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#ifndef _NETINET_TCPIP_H_
-#define _NETINET_TCPIP_H_
-
-/*
- * Tcp+ip header, after ip options removed.
- */
-struct tcpiphdr {
-	struct 	ipovly ti_i;		/* overlaid ip structure */
-	struct	tcphdr ti_t;		/* tcp header */
-};
-#ifdef notyet
-/*
- * Tcp+ip header, after ip options removed but including TCP options.
- */
-struct full_tcpiphdr {
-	struct 	ipovly ti_i;		/* overlaid ip structure */
-	struct	tcphdr ti_t;		/* tcp header */
-	char	ti_o[TCP_MAXOLEN];	/* space for tcp options */
-};
-#endif /* notyet */
-#define	ti_next		ti_i.ih_next
-#define	ti_prev		ti_i.ih_prev
-#define	ti_x1		ti_i.ih_x1
-#define	ti_pr		ti_i.ih_pr
-#define	ti_len		ti_i.ih_len
-#define	ti_src		ti_i.ih_src
-#define	ti_dst		ti_i.ih_dst
-#define	ti_sport	ti_t.th_sport
-#define	ti_dport	ti_t.th_dport
-#define	ti_seq		ti_t.th_seq
-#define	ti_ack		ti_t.th_ack
-#define	ti_x2		ti_t.th_x2
-#define	ti_off		ti_t.th_off
-#define	ti_flags	ti_t.th_flags
-#define	ti_win		ti_t.th_win
-#define	ti_sum		ti_t.th_sum
-#define	ti_urp		ti_t.th_urp
-
-#endif
diff --git a/cpukit/libnetworking/netinet/udp.h b/cpukit/libnetworking/netinet/udp.h
deleted file mode 100644
index e73e1f4ddb..0000000000
--- a/cpukit/libnetworking/netinet/udp.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)udp.h	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#ifndef _NETINET_UDP_H_
-#define _NETINET_UDP_H_
-
-/*
- * Udp protocol header.
- * Per RFC 768, September, 1981.
- */
-struct udphdr {
-	u_short	uh_sport;		/* source port */
-	u_short	uh_dport;		/* destination port */
-	u_short	uh_ulen;		/* udp length */
-	u_short	uh_sum;			/* udp checksum */
-};
-
-#endif
diff --git a/cpukit/libnetworking/netinet/udp_usrreq.c b/cpukit/libnetworking/netinet/udp_usrreq.c
deleted file mode 100644
index 16c5fce2df..0000000000
--- a/cpukit/libnetworking/netinet/udp_usrreq.c
+++ /dev/null
@@ -1,613 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1988, 1990, 1993, 1995
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)udp_usrreq.c	8.6 (Berkeley) 5/23/95
- *	$Id$
- */
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/systm.h>
-#include <sys/malloc.h>
-#include <sys/mbuf.h>
-#include <sys/protosw.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/errno.h>
-#include <sys/stat.h>
-#include <sys/kernel.h>
-#include <sys/sysctl.h>
-#include <sys/syslog.h>
-
-#include <net/if.h>
-#include <net/route.h>
-
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/in_pcb.h>
-#include <netinet/in_var.h>
-#include <netinet/ip_var.h>
-#include <netinet/ip_icmp.h>
-#include <netinet/udp.h>
-#include <netinet/udp_var.h>
-
-/*
- * UDP protocol implementation.
- * Per RFC 768, August, 1980.
- */
-#ifndef	COMPAT_42
-static int	udpcksum = 1;
-#else
-static int	udpcksum = 0;		/* XXX */
-#endif
-SYSCTL_INT(_net_inet_udp, UDPCTL_CHECKSUM, checksum, CTLFLAG_RW,
-		&udpcksum, 0, "");
-
-static int log_in_vain = 0;
-SYSCTL_INT(_net_inet_udp, OID_AUTO, log_in_vain, CTLFLAG_RW, 
-	&log_in_vain, 0, "");
-
-static struct	inpcbhead udb;		/* from udp_var.h */
-static struct	inpcbinfo udbinfo;
-
-#ifndef UDBHASHSIZE
-#define UDBHASHSIZE 64
-#endif
-
-       struct	udpstat udpstat;	/* from udp_var.h */
-SYSCTL_STRUCT(_net_inet_udp, UDPCTL_STATS, stats, CTLFLAG_RD,
-	&udpstat, udpstat, "");
-
-static struct	sockaddr_in udp_in = { sizeof(udp_in), AF_INET };
-
-static	void udp_detach __P((struct inpcb *));
-static	int udp_output __P((struct inpcb *, struct mbuf *, struct mbuf *,
-			    struct mbuf *));
-static	void udp_notify __P((struct inpcb *, int));
-
-void
-udp_init()
-{
-	LIST_INIT(&udb);
-	udbinfo.listhead = &udb;
-	udbinfo.hashbase = hashinit(UDBHASHSIZE, M_PCB, &udbinfo.hashmask);
-}
-
-void
-udp_input(m, iphlen)
-	register struct mbuf *m;
-	int iphlen;
-{
-	register struct ip *ip;
-	register struct udphdr *uh;
-	register struct inpcb *inp;
-	struct mbuf *opts = 0;
-	int len;
-	struct ip save_ip;
-
-	udpstat.udps_ipackets++;
-
-	/*
-	 * Strip IP options, if any; should skip this,
-	 * make available to user, and use on returned packets,
-	 * but we don't yet have a way to check the checksum
-	 * with options still present.
-	 */
-	if (iphlen > sizeof (struct ip)) {
-		ip_stripoptions(m, (struct mbuf *)0);
-		iphlen = sizeof(struct ip);
-	}
-
-	/*
-	 * Get IP and UDP header together in first mbuf.
-	 */
-	ip = mtod(m, struct ip *);
-	if (m->m_len < iphlen + sizeof(struct udphdr)) {
-		if ((m = m_pullup(m, iphlen + sizeof(struct udphdr))) == 0) {
-			udpstat.udps_hdrops++;
-			return;
-		}
-		ip = mtod(m, struct ip *);
-	}
-	uh = (struct udphdr *)((caddr_t)ip + iphlen);
-
-	/*
-	 * Make mbuf data length reflect UDP length.
-	 * If not enough data to reflect UDP length, drop.
-	 */
-	len = ntohs((u_short)uh->uh_ulen);
-	if (ip->ip_len != len) {
-		if (len > ip->ip_len || len < sizeof(struct udphdr)) {
-			udpstat.udps_badlen++;
-			goto bad;
-		}
-		m_adj(m, len - ip->ip_len);
-		/* ip->ip_len = len; */
-	}
-	/*
-	 * Save a copy of the IP header in case we want restore it
-	 * for sending an ICMP error message in response.
-	 */
-	save_ip = *ip;
-
-	/*
-	 * Checksum extended UDP header and data.
-	 */
-	if (uh->uh_sum) {
-		((struct ipovly *)ip)->ih_next = 0;
-		((struct ipovly *)ip)->ih_prev = 0;
-		((struct ipovly *)ip)->ih_x1 = 0;
-		((struct ipovly *)ip)->ih_len = uh->uh_ulen;
-		uh->uh_sum = in_cksum(m, len + sizeof (struct ip));
-		if (uh->uh_sum) {
-			udpstat.udps_badsum++;
-			m_freem(m);
-			return;
-		}
-	}
-
-	if (IN_MULTICAST(ntohl(ip->ip_dst.s_addr)) ||
-	    in_broadcast(ip->ip_dst, m->m_pkthdr.rcvif)) {
-		struct inpcb *last;
-		/*
-		 * Deliver a multicast or broadcast datagram to *all* sockets
-		 * for which the local and remote addresses and ports match
-		 * those of the incoming datagram.  This allows more than
-		 * one process to receive multi/broadcasts on the same port.
-		 * (This really ought to be done for unicast datagrams as
-		 * well, but that would cause problems with existing
-		 * applications that open both address-specific sockets and
-		 * a wildcard socket listening to the same port -- they would
-		 * end up receiving duplicates of every unicast datagram.
-		 * Those applications open the multiple sockets to overcome an
-		 * inadequacy of the UDP socket interface, but for backwards
-		 * compatibility we avoid the problem here rather than
-		 * fixing the interface.  Maybe 4.5BSD will remedy this?)
-		 */
-
-		/*
-		 * Construct sockaddr format source address.
-		 */
-		udp_in.sin_port = uh->uh_sport;
-		udp_in.sin_addr = ip->ip_src;
-		m->m_len -= sizeof (struct udpiphdr);
-		m->m_data += sizeof (struct udpiphdr);
-		/*
-		 * Locate pcb(s) for datagram.
-		 * (Algorithm copied from raw_intr().)
-		 */
-		last = NULL;
-		for (inp = udb.lh_first; inp != NULL; inp = inp->inp_list.le_next) {
-			if (inp->inp_lport != uh->uh_dport)
-				continue;
-			if (inp->inp_laddr.s_addr != INADDR_ANY) {
-				if (inp->inp_laddr.s_addr !=
-				    ip->ip_dst.s_addr)
-					continue;
-			}
-			if (inp->inp_faddr.s_addr != INADDR_ANY) {
-				if (inp->inp_faddr.s_addr !=
-				    ip->ip_src.s_addr ||
-				    inp->inp_fport != uh->uh_sport)
-					continue;
-			}
-
-			if (last != NULL) {
-				struct mbuf *n;
-
-				if ((n = m_copy(m, 0, M_COPYALL)) != NULL) {
-					if (last->inp_flags & INP_CONTROLOPTS
-					    || last->inp_socket->so_options & SO_TIMESTAMP)
-						ip_savecontrol(last, &opts, ip, n);
-					if (sbappendaddr(&last->inp_socket->so_rcv,
-						(struct sockaddr *)&udp_in,
-						n, opts) == 0) {
-						m_freem(n);
-						if (opts)
-						    m_freem(opts);
-						udpstat.udps_fullsock++;
-					} else
-						sorwakeup(last->inp_socket);
-					opts = 0;
-				}
-			}
-			last = inp;
-			/*
-			 * Don't look for additional matches if this one does
-			 * not have either the SO_REUSEPORT or SO_REUSEADDR
-			 * socket options set.  This heuristic avoids searching
-			 * through all pcbs in the common case of a non-shared
-			 * port.  It * assumes that an application will never
-			 * clear these options after setting them.
-			 */
-			if (((last->inp_socket->so_options&(SO_REUSEPORT|SO_REUSEADDR)) == 0))
-				break;
-		}
-
-		if (last == NULL) {
-			/*
-			 * No matching pcb found; discard datagram.
-			 * (No need to send an ICMP Port Unreachable
-			 * for a broadcast or multicast datgram.)
-			 */
-			udpstat.udps_noportbcast++;
-			goto bad;
-		}
-		if (last->inp_flags & INP_CONTROLOPTS
-		    || last->inp_socket->so_options & SO_TIMESTAMP)
-			ip_savecontrol(last, &opts, ip, m);
-		if (sbappendaddr(&last->inp_socket->so_rcv,
-		     (struct sockaddr *)&udp_in,
-		     m, opts) == 0) {
-			udpstat.udps_fullsock++;
-			goto bad;
-		}
-		sorwakeup(last->inp_socket);
-		return;
-	}
-	/*
-	 * Locate pcb for datagram.
-	 */
-	inp = in_pcblookuphash(&udbinfo, ip->ip_src, uh->uh_sport,
-	    ip->ip_dst, uh->uh_dport, 1);
-	if (inp == NULL) {
-		if (log_in_vain) {
-			char buf[4*sizeof "123"];
-
-			strcpy(buf, inet_ntoa(ip->ip_dst));
-			log(LOG_INFO, "Connection attempt to UDP %s:%d"
-			    " from %s:%d\n",
-				buf, ntohs(uh->uh_dport),
-				inet_ntoa(ip->ip_src), ntohs(uh->uh_sport));
-		}
-		udpstat.udps_noport++;
-		if (m->m_flags & (M_BCAST | M_MCAST)) {
-			udpstat.udps_noportbcast++;
-			goto bad;
-		}
-		*ip = save_ip;
-		icmp_error(m, ICMP_UNREACH, ICMP_UNREACH_PORT, 0, 0);
-		return;
-	}
-
-	/*
-	 * Construct sockaddr format source address.
-	 * Stuff source address and datagram in user buffer.
-	 */
-	udp_in.sin_port = uh->uh_sport;
-	udp_in.sin_addr = ip->ip_src;
-	if (inp->inp_flags & INP_CONTROLOPTS
-	    || inp->inp_socket->so_options & SO_TIMESTAMP)
-		ip_savecontrol(inp, &opts, ip, m);
-	iphlen += sizeof(struct udphdr);
-	m->m_len -= iphlen;
-	m->m_pkthdr.len -= iphlen;
-	m->m_data += iphlen;
-	if (sbappendaddr(&inp->inp_socket->so_rcv, (struct sockaddr *)&udp_in,
-	    m, opts) == 0) {
-		udpstat.udps_fullsock++;
-		goto bad;
-	}
-	sorwakeup(inp->inp_socket);
-	return;
-bad:
-	m_freem(m);
-	if (opts)
-		m_freem(opts);
-}
-
-/*
- * Notify a udp user of an asynchronous error;
- * just wake up so that he can collect error status.
- */
-static void
-udp_notify(inp, errnum)
-	register struct inpcb *inp;
-	int errnum;
-{
-	inp->inp_socket->so_error = errnum;
-	sorwakeup(inp->inp_socket);
-	sowwakeup(inp->inp_socket);
-}
-
-void
-udp_ctlinput(cmd, sa, vip)
-	int cmd;
-	struct sockaddr *sa;
-	void *vip;
-{
-	register struct ip *ip = vip;
-	register struct udphdr *uh;
-
-	if (!PRC_IS_REDIRECT(cmd) &&
-	    ((unsigned)cmd >= PRC_NCMDS || inetctlerrmap[cmd] == 0))
-		return;
-	if (ip) {
-		uh = (struct udphdr *)((caddr_t)ip + (ip->ip_hl << 2));
-		in_pcbnotify(&udb, sa, uh->uh_dport, ip->ip_src, uh->uh_sport,
-			cmd, udp_notify);
-	} else
-		in_pcbnotify(&udb, sa, 0, zeroin_addr, 0, cmd, udp_notify);
-}
-
-static int
-udp_output(inp, m, addr, control)
-	register struct inpcb *inp;
-	register struct mbuf *m;
-	struct mbuf *addr, *control;
-{
-	register struct udpiphdr *ui;
-	register int len = m->m_pkthdr.len;
-	struct in_addr laddr;
-	int s = 0, error = 0;
-
-	if (control)
-		m_freem(control);		/* XXX */
-
-	if (len + sizeof(struct udpiphdr) > IP_MAXPACKET) {
-		error = EMSGSIZE;
-		goto release;
-	}
-
-	if (addr) {
-		laddr = inp->inp_laddr;
-		if (inp->inp_faddr.s_addr != INADDR_ANY) {
-			error = EISCONN;
-			goto release;
-		}
-		/*
-		 * Must block input while temporarily connected.
-		 */
-		s = splnet();
-		error = in_pcbconnect(inp, addr);
-		if (error) {
-			splx(s);
-			goto release;
-		}
-	} else {
-		if (inp->inp_faddr.s_addr == INADDR_ANY) {
-			error = ENOTCONN;
-			goto release;
-		}
-	}
-	/*
-	 * Calculate data length and get a mbuf
-	 * for UDP and IP headers.
-	 */
-	M_PREPEND(m, sizeof(struct udpiphdr), M_DONTWAIT);
-	if (m == 0) {
-		error = ENOBUFS;
-		if (addr)
-			splx(s);
-		goto release;
-	}
-
-	/*
-	 * Fill in mbuf with extended UDP header
-	 * and addresses and length put into network format.
-	 */
-	ui = mtod(m, struct udpiphdr *);
-	ui->ui_next = ui->ui_prev = 0;
-	ui->ui_x1 = 0;
-	ui->ui_pr = IPPROTO_UDP;
-	ui->ui_len = htons((u_short)len + sizeof (struct udphdr));
-	ui->ui_src = inp->inp_laddr;
-	ui->ui_dst = inp->inp_faddr;
-	ui->ui_sport = inp->inp_lport;
-	ui->ui_dport = inp->inp_fport;
-	ui->ui_ulen = ui->ui_len;
-
-	/*
-	 * Stuff checksum and output datagram.
-	 */
-	ui->ui_sum = 0;
-	if (udpcksum) {
-	    if ((ui->ui_sum = in_cksum(m, sizeof (struct udpiphdr) + len)) == 0)
-		ui->ui_sum = 0xffff;
-	}
-	((struct ip *)ui)->ip_len = sizeof (struct udpiphdr) + len;
-	((struct ip *)ui)->ip_ttl = inp->inp_ip_ttl;	/* XXX */
-	((struct ip *)ui)->ip_tos = inp->inp_ip_tos;	/* XXX */
-	udpstat.udps_opackets++;
-	error = ip_output(m, inp->inp_options, &inp->inp_route,
-	    inp->inp_socket->so_options & (SO_DONTROUTE | SO_BROADCAST),
-	    inp->inp_moptions);
-
-	if (addr) {
-		in_pcbdisconnect(inp);
-		inp->inp_laddr = laddr;
-		splx(s);
-	}
-	return (error);
-
-release:
-	m_freem(m);
-	return (error);
-}
-
-static u_long	udp_sendspace = 9216;		/* really max datagram size */
-					/* 40 1K datagrams */
-SYSCTL_INT(_net_inet_udp, UDPCTL_MAXDGRAM, maxdgram, CTLFLAG_RW,
-	&udp_sendspace, 0, "");
-
-static u_long	udp_recvspace = 40 * (1024 + sizeof(struct sockaddr_in));
-SYSCTL_INT(_net_inet_udp, UDPCTL_RECVSPACE, recvspace, CTLFLAG_RW,
-	&udp_recvspace, 0, "");
-
-/*ARGSUSED*/
-int
-udp_usrreq(so, req, m, addr, control)
-	struct socket *so;
-	int req;
-	struct mbuf *m, *addr, *control;
-{
-	struct inpcb *inp = sotoinpcb(so);
-	int error = 0;
-	int s;
-
-	if (req == PRU_CONTROL)
-		return (in_control(so, (u_long)m, (caddr_t)addr,
-			(struct ifnet *)control));
-	if (inp == NULL && req != PRU_ATTACH) {
-		error = EINVAL;
-		goto release;
-	}
-	/*
-	 * Note: need to block udp_input while changing
-	 * the udp pcb queue and/or pcb addresses.
-	 */
-	switch (req) {
-
-	case PRU_ATTACH:
-		if (inp != NULL) {
-			error = EINVAL;
-			break;
-		}
-		s = splnet();
-		error = in_pcballoc(so, &udbinfo);
-		splx(s);
-		if (error)
-			break;
-		error = soreserve(so, udp_sendspace, udp_recvspace);
-		if (error)
-			break;
-		((struct inpcb *) so->so_pcb)->inp_ip_ttl = ip_defttl;
-		break;
-
-	case PRU_DETACH:
-		udp_detach(inp);
-		break;
-
-	case PRU_BIND:
-		s = splnet();
-		error = in_pcbbind(inp, addr);
-		splx(s);
-		break;
-
-	case PRU_LISTEN:
-		error = EOPNOTSUPP;
-		break;
-
-	case PRU_CONNECT:
-		if (inp->inp_faddr.s_addr != INADDR_ANY) {
-			error = EISCONN;
-			break;
-		}
-		s = splnet();
-		error = in_pcbconnect(inp, addr);
-		splx(s);
-		if (error == 0)
-			soisconnected(so);
-		break;
-
-	case PRU_CONNECT2:
-		error = EOPNOTSUPP;
-		break;
-
-	case PRU_ACCEPT:
-		error = EOPNOTSUPP;
-		break;
-
-	case PRU_DISCONNECT:
-		if (inp->inp_faddr.s_addr == INADDR_ANY) {
-			error = ENOTCONN;
-			break;
-		}
-		s = splnet();
-		in_pcbdisconnect(inp);
-		inp->inp_laddr.s_addr = INADDR_ANY;
-		splx(s);
-		so->so_state &= ~SS_ISCONNECTED;		/* XXX */
-		break;
-
-	case PRU_SHUTDOWN:
-		socantsendmore(so);
-		break;
-
-	case PRU_SEND:
-		return (udp_output(inp, m, addr, control));
-
-	case PRU_ABORT:
-		soisdisconnected(so);
-		udp_detach(inp);
-		break;
-
-	case PRU_SOCKADDR:
-		in_setsockaddr(inp, addr);
-		break;
-
-	case PRU_PEERADDR:
-		in_setpeeraddr(inp, addr);
-		break;
-
-	case PRU_SENSE:
-		/*
-		 * stat: don't bother with a blocksize.
-		 */
-		return (0);
-
-	case PRU_SENDOOB:
-	case PRU_FASTTIMO:
-	case PRU_SLOWTIMO:
-	case PRU_PROTORCV:
-	case PRU_PROTOSEND:
-		error =  EOPNOTSUPP;
-		break;
-
-	case PRU_RCVD:
-	case PRU_RCVOOB:
-		return (EOPNOTSUPP);	/* do not free mbuf's */
-
-	default:
-		panic("udp_usrreq");
-	}
-
-release:
-	if (control) {
-		printf("udp control data unexpectedly retained\n");
-		m_freem(control);
-	}
-	if (m)
-		m_freem(m);
-	return (error);
-}
-
-static void
-udp_detach(inp)
-	struct inpcb *inp;
-{
-	int s = splnet();
-
-	in_pcbdetach(inp);
-	splx(s);
-}
diff --git a/cpukit/libnetworking/netinet/udp_var.h b/cpukit/libnetworking/netinet/udp_var.h
deleted file mode 100644
index 90785b53de..0000000000
--- a/cpukit/libnetworking/netinet/udp_var.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)udp_var.h	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#ifndef _NETINET_UDP_VAR_H_
-#define _NETINET_UDP_VAR_H_
-
-/*
- * UDP kernel structures and variables.
- */
-struct	udpiphdr {
-	struct 	ipovly ui_i;		/* overlaid ip structure */
-	struct	udphdr ui_u;		/* udp header */
-};
-#define	ui_next		ui_i.ih_next
-#define	ui_prev		ui_i.ih_prev
-#define	ui_x1		ui_i.ih_x1
-#define	ui_pr		ui_i.ih_pr
-#define	ui_len		ui_i.ih_len
-#define	ui_src		ui_i.ih_src
-#define	ui_dst		ui_i.ih_dst
-#define	ui_sport	ui_u.uh_sport
-#define	ui_dport	ui_u.uh_dport
-#define	ui_ulen		ui_u.uh_ulen
-#define	ui_sum		ui_u.uh_sum
-
-struct	udpstat {
-				/* input statistics: */
-	u_long	udps_ipackets;		/* total input packets */
-	u_long	udps_hdrops;		/* packet shorter than header */
-	u_long	udps_badsum;		/* checksum error */
-	u_long	udps_badlen;		/* data length larger than packet */
-	u_long	udps_noport;		/* no socket on port */
-	u_long	udps_noportbcast;	/* of above, arrived as broadcast */
-	u_long	udps_fullsock;		/* not delivered, input socket full */
-	u_long	udpps_pcbcachemiss;	/* input packets missing pcb cache */
-	u_long	udpps_pcbhashmiss;	/* input packets not for hashed pcb */
-				/* output statistics: */
-	u_long	udps_opackets;		/* total output packets */
-};
-
-/*
- * Names for UDP sysctl objects
- */
-#define	UDPCTL_CHECKSUM		1	/* checksum UDP packets */
-#define UDPCTL_STATS		2	/* statistics (read-only) */
-#define	UDPCTL_MAXDGRAM		3	/* max datagram size */
-#define	UDPCTL_RECVSPACE	4	/* default receive buffer space */
-#define UDPCTL_MAXID		5
-
-#define UDPCTL_NAMES { \
-	{ 0, 0 }, \
-	{ "checksum", CTLTYPE_INT }, \
-	{ "stats", CTLTYPE_STRUCT }, \
-	{ "maxdgram", CTLTYPE_INT }, \
-	{ "recvspace", CTLTYPE_INT }, \
-}
-
-#ifdef KERNEL
-extern struct	inpcbhead udb;
-extern struct	inpcbinfo udbinfo;
-extern struct	udpstat udpstat;
-
-void	 udp_ctlinput __P((int, struct sockaddr *, void *));
-void	 udp_init __P((void));
-void	 udp_input __P((struct mbuf *, int));
-int	 udp_usrreq __P((struct socket *,
-	    int, struct mbuf *, struct mbuf *, struct mbuf *));
-#endif
-
-#endif
diff --git a/cpukit/libnetworking/nfs/bootp_subr.c b/cpukit/libnetworking/nfs/bootp_subr.c
deleted file mode 100644
index cb7d3d3407..0000000000
--- a/cpukit/libnetworking/nfs/bootp_subr.c
+++ /dev/null
@@ -1,968 +0,0 @@
-/*	$Id$	*/
-
-/*
- * Copyright (c) 1995 Gordon Ross, Adam Glass
- * Copyright (c) 1992 Regents of the University of California.
- * All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Lawrence Berkeley Laboratory and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * based on:
- *      nfs/krpc_subr.c
- *	$NetBSD: krpc_subr.c,v 1.10 1995/08/08 20:43:43 gwr Exp $
- */
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/conf.h>
-#include <sys/sockio.h>
-#include <sys/proc.h>
-#include <sys/mount.h>
-#include <sys/mbuf.h>
-#include <sys/reboot.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-
-#include <net/if.h>
-#include <net/route.h>
-
-#include <netinet/in.h>
-#include <net/if_types.h>
-#include <net/if_dl.h>
-#include <netinet/if_ether.h>
-
-#include <nfs/rpcv2.h>
-#include <nfs/nfsproto.h>
-#include <nfs/nfs.h>
-#include <nfs/nfsdiskless.h>
-#include <nfs/krpc.h>
-#include <nfs/xdr_subs.h>
-
-#define BOOTP_MIN_LEN		300	/* Minimum size of bootp udp packet */
-
-/*
- * What is the longest we will wait before re-sending a request?
- * Note this is also the frequency of "RPC timeout" messages.
- * The re-send loop count sup linearly to this maximum, so the
- * first complaint will happen after (1+2+3+4+5)=15 seconds.
- */
-#define	MAX_RESEND_DELAY 5	/* seconds */
-
-/* Definitions from RFC951 */
-struct bootp_packet {
-  u_int8_t op;
-  u_int8_t htype;
-  u_int8_t hlen;
-  u_int8_t hops;
-  u_int32_t xid;
-  u_int16_t secs;
-  u_int16_t flags;
-  struct in_addr ciaddr;
-  struct in_addr yiaddr;
-  struct in_addr siaddr;
-  struct in_addr giaddr;
-  unsigned char chaddr[16];
-  char sname[64];
-  char file[128];
-  unsigned char vend[256];
-};
-
-#define IPPORT_BOOTPC 68
-#define IPPORT_BOOTPS 67
-
-extern int nfs_diskless_valid;
-extern struct nfsv3_diskless nfsv3_diskless;
-
-/* mountd RPC */
-#if !defined(__rtems__)
-static int md_mount __P((struct sockaddr_in *mdsin, char *path,
-	u_char *fhp, int *fhsizep, struct nfs_args *args,struct proc *procp));
-static int md_lookup_swap __P((struct sockaddr_in *mdsin,char *path,
-			       u_char *fhp, int *fhsizep, 
-			       struct nfs_args *args,
-			       struct proc *procp));
-static int setfs __P((struct sockaddr_in *addr, char *path, char *p));
-#endif
-static int getdec __P((char **ptr));
-static char *substr __P((char *a,char *b));
-#if !defined(__rtems__)
-static void mountopts __P((struct nfs_args *args, char *p)); 
-static int xdr_opaque_decode __P((struct mbuf **ptr,u_char *buf,
-				  int len));
-static int xdr_int_decode __P((struct mbuf **ptr,int *iptr));
-#endif
-static void printip __P((char *prefix,struct in_addr addr));
-
-#ifdef BOOTP_DEBUG
-void bootpboot_p_sa(struct sockaddr *sa,struct sockaddr *ma);
-void bootpboot_p_ma(struct sockaddr *ma);
-void bootpboot_p_rtentry(struct rtentry *rt);
-void bootpboot_p_tree(struct radix_node *rn);
-void bootpboot_p_rtlist(void);
-void bootpboot_p_iflist(void);
-#endif
-
-int  bootpc_call(struct bootp_packet *call,
-		 struct bootp_packet *reply,
-		 struct proc *procp);
-
-int bootpc_fakeup_interface(struct ifreq *ireq,struct socket *so,
-			struct proc *procp);
-
-int 
-bootpc_adjust_interface(struct ifreq *ireq,struct socket *so,
-			struct sockaddr_in *myaddr,
-			struct sockaddr_in *netmask,
-			struct sockaddr_in *gw,
-			struct proc *procp);
-
-void bootpc_init(void);
-
-#ifdef BOOTP_DEBUG
-void bootpboot_p_sa(sa,ma)
-     struct sockaddr *sa;
-     struct sockaddr *ma;
-{
-  if (!sa) {
-    printf("(sockaddr *) <null>");
-    return;
-  }
-  switch (sa->sa_family) {
-  case AF_INET:
-    {
-      struct sockaddr_in *sin = (struct sockaddr_in *) sa;
-      printf("inet %x",ntohl(sin->sin_addr.s_addr));
-      if (ma) {
-	struct sockaddr_in *sin = (struct sockaddr_in *) ma;
-	printf(" mask %x",ntohl(sin->sin_addr.s_addr));
-      }
-    }
-  break;
-  case AF_LINK:
-    {
-      struct sockaddr_dl *sli = (struct sockaddr_dl *) sa;
-      int i;
-      printf("link %.*s ",sli->sdl_nlen,sli->sdl_data);
-      for (i=0;i<sli->sdl_alen;i++) {
-	if (i>0)
-	  printf(":");
-	printf("%x",(unsigned char) sli->sdl_data[i+sli->sdl_nlen]);
-      }
-    }
-  break;
-  default:
-    printf("af%d",sa->sa_family);
-  }
-}
-
-void bootpboot_p_ma(ma)
-     struct sockaddr *ma;
-{
-  if (!ma) {
-    printf("<null>");
-    return;
-  }
-  printf("%x",*(int*)ma);
-}
-
-void bootpboot_p_rtentry(rt)
-     struct rtentry *rt;
-{
-  bootpboot_p_sa(rt_key(rt),rt_mask(rt));
-  printf(" ");
-  bootpboot_p_ma(rt->rt_genmask);
-  printf(" ");
-  bootpboot_p_sa(rt->rt_gateway,NULL);
-  printf(" ");
-  printf("flags %x",(unsigned short) rt->rt_flags);
-  printf(" %d",rt->rt_rmx.rmx_expire);
-  printf(" %s%d\n",rt->rt_ifp->if_name,rt->rt_ifp->if_unit);
-}
-void  bootpboot_p_tree(rn)
-     struct radix_node *rn;
-{
-  while (rn) {
-    if (rn->rn_b < 0) {
-      if (rn->rn_flags & RNF_ROOT) {
-      } else {
-	bootpboot_p_rtentry((struct rtentry *) rn);
-      }
-      rn = rn->rn_dupedkey;
-    } else {
-      bootpboot_p_tree(rn->rn_l);
-      bootpboot_p_tree(rn->rn_r);
-      return;
-    }
-    
-  }
-}
-
-void bootpboot_p_rtlist(void)
-{
-  printf("Routing table:\n");
-  bootpboot_p_tree(rt_tables[AF_INET]->rnh_treetop);
-}
-
-void bootpboot_p_iflist(void)
-{
-  struct ifnet *ifp;
-  struct ifaddr *ifa;
-  printf("Interface list:\n");
-  for (ifp = TAILQ_FIRST(&ifnet); ifp != 0; ifp = TAILQ_NEXT(ifp,if_link))
-    {
-      for (ifa = TAILQ_FIRST(&ifp->if_addrhead) ;ifa; 
-	   ifa=TAILQ_NEXT(ifa,ifa_link))
-	if (ifa->ifa_addr->sa_family == AF_INET ) {
-	  printf("%s%d flags %x, addr %x, bcast %x, net %x\n",
-		 ifp->if_name,ifp->if_unit,
-		 (unsigned short) ifp->if_flags,
-		 ntohl(((struct sockaddr_in *) ifa->ifa_addr)->sin_addr.s_addr),
-		 ntohl(((struct sockaddr_in *) ifa->ifa_dstaddr)->sin_addr.s_addr),
-		 ntohl(((struct sockaddr_in *) ifa->ifa_netmask)->sin_addr.s_addr)
-		 );
-	}
-    }
-}
-#endif
-
-int
-bootpc_call(call,reply,procp)
-     struct bootp_packet *call;
-     struct bootp_packet *reply;	/* output */
-     struct proc *procp;
-{
-	struct socket *so;
-	struct sockaddr_in *sin;
-	struct mbuf *m, *nam;
-	struct uio auio;
-	struct iovec aio;
-	int error, rcvflg, timo, secs, len;
-
-	/* Free at end if not null. */
-	nam = NULL;
-
-	/*
-	 * Create socket and set its recieve timeout.
-	 */
-	if ((error = socreate(AF_INET, &so, SOCK_DGRAM, 0,procp)))
-		goto out;
-
-	m = m_get(M_WAIT, MT_SOOPTS);
-	if (m == NULL) {
-		error = ENOBUFS;
-		goto out;
-	} else {
-		struct timeval *tv;
-		tv = mtod(m, struct timeval *);
-		m->m_len = sizeof(*tv);
-		tv->tv_sec = 1;
-		tv->tv_usec = 0;
-		if ((error = sosetopt(so, SOL_SOCKET, SO_RCVTIMEO, m)))
-			goto out;
-	}
-
-	/*
-	 * Enable broadcast.
-	 */
-	{
-		int *on;
-		m = m_get(M_WAIT, MT_SOOPTS);
-		if (m == NULL) {
-			error = ENOBUFS;
-			goto out;
-		}
-		on = mtod(m, int *);
-		m->m_len = sizeof(*on);
-		*on = 1;
-		if ((error = sosetopt(so, SOL_SOCKET, SO_BROADCAST, m)))
-			goto out;
-	}
-
-	/*
-	 * Bind the local endpoint to a bootp client port.
-	 */
-	m = m_getclr(M_WAIT, MT_SONAME);
-	sin = mtod(m, struct sockaddr_in *);
-	sin->sin_len = m->m_len = sizeof(*sin);
-	sin->sin_family = AF_INET;
-	sin->sin_addr.s_addr = INADDR_ANY;
-	sin->sin_port = htons(IPPORT_BOOTPC);
-	error = sobind(so, m);
-	m_freem(m);
-	if (error) {
-		printf("bind failed\n");
-		goto out;
-	}
-
-	/*
-	 * Setup socket address for the server.
-	 */
-	nam = m_get(M_WAIT, MT_SONAME);
-	if (nam == NULL) {
-		error = ENOBUFS;
-		goto out;
-	}
-	sin = mtod(nam, struct sockaddr_in *);
-	sin-> sin_len = sizeof(*sin);
-	sin-> sin_family = AF_INET;
-	sin->sin_addr.s_addr = INADDR_BROADCAST;
-	sin->sin_port = htons(IPPORT_BOOTPS);
-
-	nam->m_len = sizeof(*sin);
-
-	/*
-	 * Send it, repeatedly, until a reply is received,
-	 * but delay each re-send by an increasing amount.
-	 * If the delay hits the maximum, start complaining.
-	 */
-	timo = 0;
-	for (;;) {
-		/* Send BOOTP request (or re-send). */
-		
-		aio.iov_base = (caddr_t) call;
-		aio.iov_len = sizeof(*call);
-		
-		auio.uio_iov = &aio;
-		auio.uio_iovcnt = 1;
-		auio.uio_segflg = UIO_SYSSPACE;
-		auio.uio_rw = UIO_WRITE;
-		auio.uio_offset = 0;
-		auio.uio_resid = sizeof(*call);
-		auio.uio_procp = procp;
-
-		error = sosend(so, nam, &auio, NULL, NULL, 0);
-		if (error) {
-			printf("bootpc_call: sosend: %d\n", error);
-			goto out;
-		}
-
-		/* Determine new timeout. */
-		if (timo < MAX_RESEND_DELAY)
-			timo++;
-		else
-			printf("BOOTP timeout for server 0x%x\n",
-			       (int)ntohl(sin->sin_addr.s_addr));
-
-		/*
-		 * Wait for up to timo seconds for a reply.
-		 * The socket receive timeout was set to 1 second.
-		 */
-		secs = timo;
-		while (secs > 0) {
-			aio.iov_base = (caddr_t) reply;
-			aio.iov_len = sizeof(*reply);
-
-			auio.uio_iov = &aio;
-			auio.uio_iovcnt = 1;
-			auio.uio_segflg = UIO_SYSSPACE;
-			auio.uio_rw = UIO_READ;
-			auio.uio_offset = 0;
-			auio.uio_resid = sizeof(*reply);
-			auio.uio_procp = procp;
-			
-			rcvflg = 0;
-			error = soreceive(so, NULL, &auio, NULL, NULL, &rcvflg);
-			if (error == EWOULDBLOCK) {
-				secs--;
-				call->secs=htons(ntohs(call->secs)+1);
-				continue;
-			}
-			if (error)
-				goto out;
-			len = sizeof(*reply) - auio.uio_resid;
-
-			/* Do we have the required number of bytes ? */
-			if (len < BOOTP_MIN_LEN)
-				continue;
-
-			/* Is it the right reply? */
-			if (reply->op != 2)
-			  continue;
-
-			if (reply->xid != call->xid)
-				continue;
-
-			if (reply->hlen != call->hlen)
-			  continue;
-
-			if (bcmp(reply->chaddr,call->chaddr,call->hlen))
-			  continue;
-
-			goto gotreply;	/* break two levels */
-
-		} /* while secs */
-	} /* forever send/receive */
-
-	error = ETIMEDOUT;
-	goto out;
-
- gotreply:
- out:
-	if (nam) m_freem(nam);
-	soclose(so);
-	return error;
-}
-
-int 
-bootpc_fakeup_interface(struct ifreq *ireq,struct socket *so,
-			struct proc *procp)
-{
-  struct sockaddr_in *sin;
-  int error;
-  struct sockaddr_in dst;
-  struct sockaddr_in gw;
-  struct sockaddr_in mask;
-
-  /*
-   * Bring up the interface.
-   *
-   * Get the old interface flags and or IFF_UP into them; if
-   * IFF_UP set blindly, interface selection can be clobbered.
-   */
-  error = ifioctl(so, SIOCGIFFLAGS, (caddr_t)ireq, procp);
-  if (error)
-    panic("bootpc_fakeup_interface: GIFFLAGS, error=%d", error);
-  ireq->ifr_flags |= IFF_UP;
-  error = ifioctl(so, SIOCSIFFLAGS, (caddr_t)ireq, procp);
-  if (error)
-    panic("bootpc_fakeup_interface: SIFFLAGS, error=%d", error);
-
-  /*
-   * Do enough of ifconfig(8) so that the chosen interface
-   * can talk to the servers.  (just set the address)
-   */
-  
-  /* addr is 0.0.0.0 */
-  
-  sin = (struct sockaddr_in *)&ireq->ifr_addr;
-  bzero((caddr_t)sin, sizeof(*sin));
-  sin->sin_len = sizeof(*sin);
-  sin->sin_family = AF_INET;
-  sin->sin_addr.s_addr = INADDR_ANY;
-  error = ifioctl(so, SIOCSIFADDR, (caddr_t)ireq, procp);
-  if (error)
-    panic("bootpc_fakeup_interface: set if addr, error=%d", error);
-  
-  /* netmask is 0.0.0.0 */
-  
-  sin = (struct sockaddr_in *)&ireq->ifr_addr;
-  bzero((caddr_t)sin, sizeof(*sin));
-  sin->sin_len = sizeof(*sin);
-  sin->sin_family = AF_INET;
-  sin->sin_addr.s_addr = INADDR_ANY;
-  error = ifioctl(so, SIOCSIFNETMASK, (caddr_t)ireq, procp);
-  if (error)
-    panic("bootpc_fakeup_interface: set if net addr, error=%d", error);
-  
-  /* Broadcast is 255.255.255.255 */
-  
-  sin = (struct sockaddr_in *)&ireq->ifr_addr;
-  bzero((caddr_t)sin, sizeof(*sin));
-  sin->sin_len = sizeof(*sin);
-  sin->sin_family = AF_INET;
-  sin->sin_addr.s_addr = INADDR_BROADCAST;
-  error = ifioctl(so, SIOCSIFBRDADDR, (caddr_t)ireq, procp);
-  if (error)
-    panic("bootpc_fakeup_interface: set if broadcast addr, error=%d", error);
-  
-  /* Add default route to 0.0.0.0 so we can send data */
-  
-  bzero((caddr_t) &dst, sizeof(dst));
-  dst.sin_len=sizeof(dst);
-  dst.sin_family=AF_INET;
-  dst.sin_addr.s_addr = htonl(0);
-  
-  bzero((caddr_t) &gw, sizeof(gw));
-  gw.sin_len=sizeof(gw);
-  gw.sin_family=AF_INET;
-  gw.sin_addr.s_addr = htonl(0x0);
-  
-  bzero((caddr_t) &mask, sizeof(mask));
-  mask.sin_len=sizeof(mask);
-  mask.sin_family=AF_INET;
-  mask.sin_addr.s_addr = htonl(0);
-  
-  error = rtrequest(RTM_ADD, 
-		    (struct sockaddr *) &dst, 
-		    (struct sockaddr *) &gw,
-		    (struct sockaddr *) &mask, 
-		    RTF_UP | RTF_STATIC
-		    , NULL);
-  if (error)
-    printf("bootpc_fakeup_interface: add default route, error=%d\n", error);
-  return error;
-}
-
-int 
-bootpc_adjust_interface(struct ifreq *ireq,struct socket *so,
-			struct sockaddr_in *myaddr,
-			struct sockaddr_in *netmask,
-			struct sockaddr_in *gw,
-			struct proc *procp)
-{
-  int error;
-  struct sockaddr_in oldgw;
-  struct sockaddr_in olddst;
-  struct sockaddr_in oldmask;
-  struct sockaddr_in *sin;
-
-  /* Remove old default route to 0.0.0.0 */
-  
-  bzero((caddr_t) &olddst, sizeof(olddst));
-  olddst.sin_len=sizeof(olddst);
-  olddst.sin_family=AF_INET;
-  olddst.sin_addr.s_addr = INADDR_ANY;
-  
-  bzero((caddr_t) &oldgw, sizeof(oldgw));
-  oldgw.sin_len=sizeof(oldgw);
-  oldgw.sin_family=AF_INET;
-  oldgw.sin_addr.s_addr = INADDR_ANY;
-  
-  bzero((caddr_t) &oldmask, sizeof(oldmask));
-  oldmask.sin_len=sizeof(oldmask);
-  oldmask.sin_family=AF_INET;
-  oldmask.sin_addr.s_addr = INADDR_ANY;
-  
-  error = rtrequest(RTM_DELETE, 
-		    (struct sockaddr *) &olddst,
-		    (struct sockaddr *) &oldgw,
-		    (struct sockaddr *) &oldmask, 
-		    (RTF_UP | RTF_STATIC), NULL);
-  if (error) {
-    printf("nfs_boot: del default route, error=%d\n", error);
-    return error;
-  }
-
-  /*
-   * Do enough of ifconfig(8) so that the chosen interface
-   * can talk to the servers.  (just set the address)
-   */
-  bcopy(netmask,&ireq->ifr_addr,sizeof(*netmask));
-  error = ifioctl(so, SIOCSIFNETMASK, (caddr_t)ireq, procp);
-  if (error)
-    panic("nfs_boot: set if netmask, error=%d", error);
-
-  /* Broadcast is with host part of IP address all 1's */
-  
-  sin = (struct sockaddr_in *)&ireq->ifr_addr;
-  bzero((caddr_t)sin, sizeof(*sin));
-  sin->sin_len = sizeof(*sin);
-  sin->sin_family = AF_INET;
-  sin->sin_addr.s_addr = myaddr->sin_addr.s_addr | ~ netmask->sin_addr.s_addr;
-  error = ifioctl(so, SIOCSIFBRDADDR, (caddr_t)ireq, procp);
-  if (error)
-    panic("bootpc_call: set if broadcast addr, error=%d", error);
-  
-  bcopy(myaddr,&ireq->ifr_addr,sizeof(*myaddr));
-  error = ifioctl(so, SIOCSIFADDR, (caddr_t)ireq, procp);
-  if (error)
-    panic("nfs_boot: set if addr, error=%d", error);
-
-  /* Add new default route */
-
-  error = rtrequest(RTM_ADD, 
-		    (struct sockaddr *) &olddst,
-		    (struct sockaddr *) gw,
-		    (struct sockaddr *) &oldmask,
-		    (RTF_UP | RTF_GATEWAY | RTF_STATIC), NULL);
-  if (error) {
-    printf("nfs_boot: add net route, error=%d\n", error);
-    return error;
-  }
-
-  return 0;
-}
-
-#if !defined(__rtems__)
-static int setfs(addr, path, p)
-	struct sockaddr_in *addr;
-	char *path;
-	char *p;
-{
-	unsigned ip = 0;
-	int val;
-
-	if (((val = getdec(&p)) < 0) || (val > 255)) return(0);
-	ip = val << 24;
-	if (*p != '.') return(0);
-	p++;
-	if (((val = getdec(&p)) < 0) || (val > 255)) return(0);
-	ip |= (val << 16);
-	if (*p != '.') return(0);
-	p++;
-	if (((val = getdec(&p)) < 0) || (val > 255)) return(0);
-	ip |= (val << 8);
-	if (*p != '.') return(0);
-	p++;
-	if (((val = getdec(&p)) < 0) || (val > 255)) return(0);
-	ip |= val;
-	if (*p != ':') return(0);
-	p++;
-
-	addr->sin_addr.s_addr = htonl(ip);
-	addr->sin_len = sizeof(struct sockaddr_in);
-	addr->sin_family = AF_INET;
-
-	strncpy(path,p,MNAMELEN-1);
-	return(1);
-}
-#endif
-
-static int getdec(ptr)
-	char **ptr;
-{
-	char *p = *ptr;
-	int ret=0;
-	if ((*p < '0') || (*p > '9')) return(-1);
-	while ((*p >= '0') && (*p <= '9')) {
-		ret = ret*10 + (*p - '0');
-		p++;
-	}
-	*ptr = p;
-	return(ret);
-}
-
-static char *substr(a,b)
-	char *a,*b;
-{
-	char *loc1;
-	char *loc2;
-
-        while (*a != '\0') {
-                loc1 = a;
-                loc2 = b;
-                while (*loc1 == *loc2++) {
-                        if (*loc1 == '\0') return (0);
-                        loc1++;
-                        if (*loc2 == '\0') return (loc1);
-                }
-        a++;
-        }
-        return (0);
-}
-
-static void printip(char *prefix,struct in_addr addr)
-{
-  unsigned int ip;
-
-  ip = ntohl(addr.s_addr);
-
-  printf("%s is %d.%d.%d.%d\n",prefix,
-	 ip >> 24, (ip >> 16) & 255 ,(ip >> 8) & 255 ,ip & 255 );
-}
-
-void
-bootpc_init(void)
-{
-  struct bootp_packet call;
-  struct bootp_packet reply;
-  static u_int32_t xid = ~0xFF;
-  
-  struct ifreq ireq;
-  struct ifnet *ifp;
-  struct socket *so;
-  int error;
-  int code,ncode,len;
-  int j;
-  char *p;
-  unsigned int ip;
-
-  struct sockaddr_in myaddr;
-  struct sockaddr_in netmask;
-  struct sockaddr_in gw;
-  int gotgw=0;
-  int gotnetmask=0;
-#if !defined(__rtems__)
-  int gotrootpath=0;
-  int gotswappath=0;
-#endif
-  char lookup_path[24];
-
-#define EALEN 6
-#if !defined(__rtems__)
-  unsigned char ea[EALEN];
-#endif
-  struct ifaddr *ifa;
-  struct sockaddr_dl *sdl = NULL;
-  char *delim;
-  struct proc *procp = NULL;
-
-  /*
-   * If already filled in, don't touch it here 
-   */
-  if (nfs_diskless_valid)
-    return;
-
-  /*
-   * Bump time if 0.
-  if (!time.tv_sec)
-    time.tv_sec++;
-   */
-
-  /*
-   * Find a network interface.
-   */
-  for (ifp = ifnet; ifp != 0; ifp = ifp->if_next)
-    if ((ifp->if_flags &
-      (IFF_LOOPBACK|IFF_POINTOPOINT)) == 0)
-	break;
-  if (ifp == NULL)
-    panic("bootpc_init: no suitable interface");
-  bzero(&ireq,sizeof(ireq));
-  sprintf(ireq.ifr_name, "%s%d", ifp->if_name,ifp->if_unit);
-  printf("bootpc_init: using network interface '%s'\n",
-	 ireq.ifr_name);
-
-  if ((error = socreate(AF_INET, &so, SOCK_DGRAM, 0,procp)) != 0)
-    panic("nfs_boot: socreate, error=%d", error);
-	  
-  bootpc_fakeup_interface(&ireq,so,procp);
-
-  printf("Bootpc testing starting\n");
-  
-  /* Get HW address */
-
-  for (ifa = ifp->if_addrlist;ifa; ifa = ifa->ifa_next)
-    if (ifa->ifa_addr->sa_family == AF_LINK &&
-	(sdl = ((struct sockaddr_dl *) ifa->ifa_addr)) &&
-	sdl->sdl_type == IFT_ETHER)
-      break;
-  
-  if (!sdl)
-    panic("bootpc: Unable to find HW address");
-  if (sdl->sdl_alen != EALEN ) 
-    panic("bootpc: HW address len is %d, expected value is %d",
-	  sdl->sdl_alen,EALEN);
-
-  printf("bootpc hw address is ");
-  delim="";
-  for (j=0;j<sdl->sdl_alen;j++) {
-    printf("%s%x",delim,((unsigned char *)LLADDR(sdl))[j]);
-    delim=":";
-  }
-  printf("\n");
-
-#if 0
-  bootpboot_p_iflist();
-  bootpboot_p_rtlist();
-#endif
-  
-  bzero((caddr_t) &call, sizeof(call));
-
-  /* bootpc part */
-  call.op = 1; 			/* BOOTREQUEST */
-  call.htype= 1;		/* 10mb ethernet */
-  call.hlen=sdl->sdl_alen;	/* Hardware address length */
-  call.hops=0;	
-  xid++;
-  call.xid = txdr_unsigned(xid);
-  bcopy(LLADDR(sdl),&call.chaddr,sdl->sdl_alen);
-  
-  call.vend[0]=99;
-  call.vend[1]=130;
-  call.vend[2]=83;
-  call.vend[3]=99;
-  call.vend[4]=255;
-  
-  call.secs = 0;
-  call.flags = htons(0x8000); /* We need an broadcast answer */
-  
-  error = bootpc_call(&call,&reply,procp);
-  
-  if (error)
-    panic("BOOTP call failed -- error %d", error);
-  
-  bzero(&myaddr,sizeof(myaddr));
-  bzero(&netmask,sizeof(netmask));
-  bzero(&gw,sizeof(gw));
-
-  myaddr.sin_len = sizeof(myaddr);
-  myaddr.sin_family = AF_INET;
-
-  netmask.sin_len = sizeof(netmask);
-  netmask.sin_family = AF_INET;
-
-  gw.sin_len = sizeof(gw);
-  gw.sin_family= AF_INET;
-
-  rtems_bsdnet_bootp_server_address = reply.siaddr;
-  rtems_bsdnet_log_host_address = reply.siaddr;
-
-  myaddr.sin_addr = reply.yiaddr;
-
-  ip = ntohl(myaddr.sin_addr.s_addr);
-  sprintf(lookup_path,"swap.%d.%d.%d.%d",
-	  ip >> 24, (ip >> 16) & 255 ,(ip >> 8) & 255 ,ip & 255 );
-
-  printip("My ip address",myaddr.sin_addr);
-
-  printip("Server ip address",reply.siaddr);
-
-  gw.sin_addr = reply.giaddr;
-  printip("Gateway ip address",reply.giaddr);
-
-  if (reply.sname[0])
-    printf("Server name is %s\n",reply.sname);
-  if (reply.file[0])
-    printf("boot file is %s\n",reply.file);
-  rtems_bsdnet_bootp_boot_file_name = strdup (reply.file);
-  if (reply.vend[0]==99 && reply.vend[1]==130 &&
-      reply.vend[2]==83 && reply.vend[3]==99) {
-    j=4;
-    ncode = reply.vend[j];
-    while (j<sizeof(reply.vend)) {
-      code = reply.vend[j] = ncode;
-      if (code==255)
-	break;
-      if (code==0) {
-	j++;
-	continue;
-      }
-      len = reply.vend[j+1];
-      j+=2;
-      if (len+j>=sizeof(reply.vend)) {
-	printf("Truncated field");
-	break;
-      }
-      ncode = reply.vend[j+len];
-      reply.vend[j+len]='\0';
-      p = &reply.vend[j];
-      switch (code) {
-      case 1:
-	if (len!=4) 
-	  panic("bootpc: subnet mask len is %d",len);
-	bcopy(&reply.vend[j],&netmask.sin_addr,4);
-	gotnetmask=1;
-	printip("Subnet mask",netmask.sin_addr);
-	break;
-      case 6:
-	/* Domain Name servers */
-	if (len % 4) 
-	  panic("bootpc: DNS Len is %d",len);
-	{
-	int dlen = 0;
-	while ((dlen < len) &&
-	  (rtems_bsdnet_nameserver_count < sizeof rtems_bsdnet_config.name_server /
-				  sizeof rtems_bsdnet_config.name_server[0])) {
-	    bcopy(&reply.vend[j+dlen],
-			&rtems_bsdnet_nameserver[rtems_bsdnet_nameserver_count],
-			4);
-	    printip("Domain Name Server",
-			rtems_bsdnet_nameserver[rtems_bsdnet_nameserver_count]);
-	    rtems_bsdnet_nameserver_count++;
-	    dlen += 4;
-	  }
-	}
-	break;
-      case 16:	/* Swap server IP address. unused */
-      case 2:
-	/* Time offset */
-	break;
-      case 3:
-	/* Routers */
-	if (len % 4) 
-	  panic("bootpc: Router Len is %d",len);
-	if (len > 0) {
-	  bcopy(&reply.vend[j],&gw.sin_addr,4);
-	  printip("Router",gw.sin_addr);
-	  gotgw=1;
-	}
-	break;
-      case 7:
-	/* Log servers */
-	if (len % 4) 
-	  panic("bootpc: Log server len is %d",len);
-	if (len > 0) {
-	  bcopy(&reply.vend[j],&rtems_bsdnet_log_host_address,4);
-	  printip("Log server",rtems_bsdnet_log_host_address);
-	}
-	break;
-      case 12:
-	if (len>=MAXHOSTNAMELEN)
-	  panic("bootpc: hostname  >=%d bytes",MAXHOSTNAMELEN);
-	if (sethostname (&reply.vend[j], len) < 0)
-	  panic("Can't set host name");
-	printf("Hostname is %.*s\n",len,&reply.vend[j]);
-	break;
-      case 15:
-	/* Domain name */
-	rtems_bsdnet_domain_name = strdup (&reply.vend[j]);
-	if (rtems_bsdnet_domain_name)
-		printf("Domain name is %s\n", rtems_bsdnet_domain_name);
-	break;
-      default:
-	printf("Ignoring field type %d\n",code);
-      }
-      j+=len;
-    }
-  }
-
-  if (!gotnetmask) {
-    if (IN_CLASSA(ntohl(myaddr.sin_addr.s_addr)))
-      netmask.sin_addr.s_addr = htonl(IN_CLASSA_NET);
-    else if (IN_CLASSB(ntohl(myaddr.sin_addr.s_addr)))
-      netmask.sin_addr.s_addr = htonl(IN_CLASSB_NET);
-    else 
-      netmask.sin_addr.s_addr = htonl(IN_CLASSC_NET);
-  }
-  if (!gotgw) {
-    /* Use proxyarp */
-    gw.sin_addr.s_addr = myaddr.sin_addr.s_addr;
-  }
-  
-#if 0
-  bootpboot_p_iflist();
-  bootpboot_p_rtlist();
-#endif
-  error = bootpc_adjust_interface(&ireq,so,
-				  &myaddr,&netmask,&gw,procp);
-  
-  soclose(so);
-
-#if 0
-  bootpboot_p_iflist();
-  bootpboot_p_rtlist();
-#endif
-
-
-#if 0
-    myaddr.sin_addr.s_addr | ~ netmask.sin_addr.s_addr;
-#endif
-
-#if 0
-  bootpboot_p_iflist();
-  bootpboot_p_rtlist();
-#endif
-  return;
-}
diff --git a/cpukit/libnetworking/nfs/krpc.h b/cpukit/libnetworking/nfs/krpc.h
deleted file mode 100644
index 8a21392657..0000000000
--- a/cpukit/libnetworking/nfs/krpc.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*	$NetBSD: krpc.h,v 1.4 1995/12/19 23:07:11 cgd Exp $	*/
-/*	$Id$	*/
-
-#include <sys/cdefs.h>
-
-int krpc_call __P((struct sockaddr_in *sin,
-	u_int prog, u_int vers, u_int func,
-	struct mbuf **data, struct mbuf **from, struct proc *procp));
-
-int krpc_portmap __P((struct sockaddr_in *sin,
-	u_int prog, u_int vers, u_int16_t *portp, struct proc *procp));
-
-struct mbuf *xdr_string_encode __P((char *str, int len));
-
-/*
- * RPC definitions for the portmapper
- */
-#define	PMAPPORT		111
-#define	PMAPPROG		100000
-#define	PMAPVERS		2
-#define	PMAPPROC_NULL		0
-#define	PMAPPROC_SET		1
-#define	PMAPPROC_UNSET		2
-#define	PMAPPROC_GETPORT	3
-#define	PMAPPROC_DUMP		4
-#define	PMAPPROC_CALLIT		5
diff --git a/cpukit/libnetworking/nfs/nfs.h b/cpukit/libnetworking/nfs/nfs.h
deleted file mode 100644
index 68f206e213..0000000000
--- a/cpukit/libnetworking/nfs/nfs.h
+++ /dev/null
@@ -1,620 +0,0 @@
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Rick Macklem at The University of Guelph.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)nfs.h	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#ifndef _NFS_NFS_H_
-#define _NFS_NFS_H_
-
-#include <nfs/rpcv2.h>
-
-/*
- * Tunable constants for nfs
- */
-
-#define	NFS_MAXIOVEC	34
-#define NFS_TICKINTVL	5		/* Desired time for a tick (msec) */
-#define NFS_HZ		(hz / nfs_ticks) /* Ticks/sec */
-#define	NFS_TIMEO	(1 * NFS_HZ)	/* Default timeout = 1 second */
-#define	NFS_MINTIMEO	(1 * NFS_HZ)	/* Min timeout to use */
-#define	NFS_MAXTIMEO	(60 * NFS_HZ)	/* Max timeout to backoff to */
-#define	NFS_MINIDEMTIMEO (5 * NFS_HZ)	/* Min timeout for non-idempotent ops*/
-#define	NFS_MAXREXMIT	100		/* Stop counting after this many */
-#define	NFS_MAXWINDOW	1024		/* Max number of outstanding requests */
-#define	NFS_RETRANS	10		/* Num of retrans for soft mounts */
-#define	NFS_MAXGRPS	16		/* Max. size of groups list */
-#ifndef NFS_MINATTRTIMO
-#define	NFS_MINATTRTIMO 5		/* Attribute cache timeout in sec */
-#endif
-#ifndef NFS_MAXATTRTIMO
-#define	NFS_MAXATTRTIMO 60
-#endif
-#define	NFS_WSIZE	8192		/* Def. write data size <= 8192 */
-#define	NFS_RSIZE	8192		/* Def. read data size <= 8192 */
-#define NFS_READDIRSIZE	8192		/* Def. readdir size */
-#define	NFS_DEFRAHEAD	1		/* Def. read ahead # blocks */
-#define	NFS_MAXRAHEAD	4		/* Max. read ahead # blocks */
-#define	NFS_MAXUIDHASH	64		/* Max. # of hashed uid entries/mp */
-#define	NFS_MAXASYNCDAEMON 	20	/* Max. number async_daemons runnable */
-#define NFS_MAXGATHERDELAY	100	/* Max. write gather delay (msec) */
-#ifndef NFS_GATHERDELAY
-#define NFS_GATHERDELAY		10	/* Default write gather delay (msec) */
-#endif
-#define	NFS_DIRBLKSIZ	4096		/* Must be a multiple of DIRBLKSIZ */
-
-/*
- * Oddballs
- */
-#define	NMOD(a)		((a) % nfs_asyncdaemons)
-#define NFS_CMPFH(n, f, s) \
-	((n)->n_fhsize == (s) && !bcmp((caddr_t)(n)->n_fhp, (caddr_t)(f), (s)))
-#define NFS_ISV3(v)	(VFSTONFS((v)->v_mount)->nm_flag & NFSMNT_NFSV3)
-#define NFS_SRVMAXDATA(n) \
-		(((n)->nd_flag & ND_NFSV3) ? (((n)->nd_nam2) ? \
-		 NFS_MAXDGRAMDATA : NFS_MAXDATA) : NFS_V2MAXDATA)
-
-/*
- * XXX
- * sys/buf.h should be edited to change B_APPENDWRITE --> B_NEEDCOMMIT, but
- * until then...
- * Same goes for sys/malloc.h, which needs M_NFSDIROFF,
- * M_NFSRVDESC and M_NFSBIGFH added.
- * The VA_EXCLUSIVE flag should be added for va_vaflags and set for an
- * exclusive create.
- * The B_INVAFTERWRITE flag should be set to whatever is required by the
- * buffer cache code to say "Invalidate the block after it is written back".
- */
-#ifndef B_NEEDCOMMIT
-#define B_NEEDCOMMIT	B_APPENDWRITE
-#endif
-#ifndef M_NFSRVDESC
-#define M_NFSRVDESC	M_TEMP
-#endif
-#ifndef M_NFSDIROFF
-#define M_NFSDIROFF	M_TEMP
-#endif
-#ifndef M_NFSBIGFH
-#define M_NFSBIGFH	M_TEMP
-#endif
-#ifndef VA_EXCLUSIVE
-#define VA_EXCLUSIVE	0
-#endif
-#ifdef __FreeBSD__
-#define	B_INVAFTERWRITE	B_NOCACHE
-#else
-#define	B_INVAFTERWRITE	B_INVAL
-#endif
-
-/*
- * These ifdefs try to handle the differences between the various 4.4BSD-Lite
- * based vfs interfaces.
- * btw: NetBSD-current does have a VOP_LEASDE(), but I don't know how to
- * differentiate between NetBSD-1.0 and NetBSD-current, so..
- * I also don't know about BSDi's 2.0 release.
- */
-#if !defined(HAS_VOPLEASE) && !defined(__FreeBSD__) && !defined(__NetBSD__)
-#define	HAS_VOPLEASE	1
-#endif
-#if !defined(HAS_VOPREVOKE) && !defined(__FreeBSD__) && !defined(__NetBSD__)
-#define HAS_VOPREVOKE	1
-#endif
-
-/*
- * The IO_METASYNC flag should be implemented for local file systems.
- * (Until then, it is nothin at all.)
- */
-#ifndef IO_METASYNC
-#define IO_METASYNC	0
-#endif
-
-/*
- * Set the attribute timeout based on how recently the file has been modified.
- */
-#define	NFS_ATTRTIMEO(np) \
-	((((np)->n_flag & NMODIFIED) || \
-	 (time.tv_sec - (np)->n_mtime) / 10 < NFS_MINATTRTIMO) ? NFS_MINATTRTIMO : \
-	 ((time.tv_sec - (np)->n_mtime) / 10 > NFS_MAXATTRTIMO ? NFS_MAXATTRTIMO : \
-	  (time.tv_sec - (np)->n_mtime) / 10))
-
-/*
- * Expected allocation sizes for major data structures. If the actual size
- * of the structure exceeds these sizes, then malloc() will be allocating
- * almost twice the memory required. This is used in nfs_init() to warn
- * the sysadmin that the size of a structure should be reduced.
- * (These sizes are always a power of 2. If the kernel malloc() changes
- *  to one that does not allocate space in powers of 2 size, then this all
- *  becomes bunk!)
- */
-#define NFS_NODEALLOC	256
-#define NFS_MNTALLOC	512
-#define NFS_SVCALLOC	256
-#define NFS_UIDALLOC	128
-
-/*
- * Structures for the nfssvc(2) syscall. Not that anyone but nfsd and mount_nfs
- * should ever try and use it.
- */
-struct nfsd_args {
-	int	sock;		/* Socket to serve */
-	caddr_t	name;		/* Client address for connection based sockets */
-	int	namelen;	/* Length of name */
-};
-
-struct nfsd_srvargs {
-	struct nfsd	*nsd_nfsd;	/* Pointer to in kernel nfsd struct */
-	uid_t		nsd_uid;	/* Effective uid mapped to cred */
-	u_long		nsd_haddr;	/* Ip address of client */
-	struct ucred	nsd_cr;		/* Cred. uid maps to */
-	int		nsd_authlen;	/* Length of auth string (ret) */
-	u_char		*nsd_authstr;	/* Auth string (ret) */
-	int		nsd_verflen;	/* and the verfier */
-	u_char		*nsd_verfstr;
-	struct timeval	nsd_timestamp;	/* timestamp from verifier */
-	u_long		nsd_ttl;	/* credential ttl (sec) */
-	NFSKERBKEY_T	nsd_key;	/* Session key */
-};
-
-struct nfsd_cargs {
-	char		*ncd_dirp;	/* Mount dir path */
-	uid_t		ncd_authuid;	/* Effective uid */
-	int		ncd_authtype;	/* Type of authenticator */
-	int		ncd_authlen;	/* Length of authenticator string */
-	u_char		*ncd_authstr;	/* Authenticator string */
-	int		ncd_verflen;	/* and the verifier */
-	u_char		*ncd_verfstr;
-	NFSKERBKEY_T	ncd_key;	/* Session key */
-};
-
-/*
- * Stats structure
- */
-struct nfsstats {
-	int	attrcache_hits;
-	int	attrcache_misses;
-	int	lookupcache_hits;
-	int	lookupcache_misses;
-	int	direofcache_hits;
-	int	direofcache_misses;
-	int	biocache_reads;
-	int	read_bios;
-	int	read_physios;
-	int	biocache_writes;
-	int	write_bios;
-	int	write_physios;
-	int	biocache_readlinks;
-	int	readlink_bios;
-	int	biocache_readdirs;
-	int	readdir_bios;
-	int	rpccnt[NFS_NPROCS];
-	int	rpcretries;
-	int	srvrpccnt[NFS_NPROCS];
-	int	srvrpc_errs;
-	int	srv_errs;
-	int	rpcrequests;
-	int	rpctimeouts;
-	int	rpcunexpected;
-	int	rpcinvalid;
-	int	srvcache_inproghits;
-	int	srvcache_idemdonehits;
-	int	srvcache_nonidemdonehits;
-	int	srvcache_misses;
-	int	srvnqnfs_leases;
-	int	srvnqnfs_maxleases;
-	int	srvnqnfs_getleases;
-	int	srvvop_writes;
-};
-
-/*
- * Flags for nfssvc() system call.
- */
-#define	NFSSVC_BIOD	0x002
-#define	NFSSVC_NFSD	0x004
-#define	NFSSVC_ADDSOCK	0x008
-#define	NFSSVC_AUTHIN	0x010
-#define	NFSSVC_GOTAUTH	0x040
-#define	NFSSVC_AUTHINFAIL 0x080
-#define	NFSSVC_MNTD	0x100
-
-/*
- * fs.nfs sysctl(3) identifiers
- */
-#define NFS_NFSSTATS	1		/* struct: struct nfsstats */
-#define NFS_NFSPRIVPORT	2		/* int: prohibit nfs to resvports */
-
-#define FS_NFS_NAMES { \
-		       { 0, 0 }, \
-		       { "nfsstats", CTLTYPE_STRUCT }, \
-		       { "nfsprivport", CTLTYPE_INT }, \
-}
-
-/*
- * The set of signals the interrupt an I/O in progress for NFSMNT_INT mounts.
- * What should be in this set is open to debate, but I believe that since
- * I/O system calls on ufs are never interrupted by signals the set should
- * be minimal. My reasoning is that many current programs that use signals
- * such as SIGALRM will not expect file I/O system calls to be interrupted
- * by them and break.
- */
-#if defined(KERNEL) || defined(_KERNEL)
-
-struct uio; struct buf; struct vattr; struct nameidata;	/* XXX */
-
-#define	NFSINT_SIGMASK	(sigmask(SIGINT)|sigmask(SIGTERM)|sigmask(SIGKILL)| \
-			 sigmask(SIGHUP)|sigmask(SIGQUIT))
-
-/*
- * Socket errors ignored for connectionless sockets??
- * For now, ignore them all
- */
-#define	NFSIGNORE_SOERROR(s, e) \
-		((e) != EINTR && (e) != ERESTART && (e) != EWOULDBLOCK && \
-		((s) & PR_CONNREQUIRED) == 0)
-
-/*
- * Nfs outstanding request list element
- */
-struct nfsreq {
-	TAILQ_ENTRY(nfsreq) r_chain;
-	struct mbuf	*r_mreq;
-	struct mbuf	*r_mrep;
-	struct mbuf	*r_md;
-	caddr_t		r_dpos;
-	struct nfsmount *r_nmp;
-	struct vnode	*r_vp;
-	u_long		r_xid;
-	int		r_flags;	/* flags on request, see below */
-	int		r_retry;	/* max retransmission count */
-	int		r_rexmit;	/* current retrans count */
-	int		r_timer;	/* tick counter on reply */
-	int		r_procnum;	/* NFS procedure number */
-	int		r_rtt;		/* RTT for rpc */
-	struct proc	*r_procp;	/* Proc that did I/O system call */
-};
-
-/*
- * Queue head for nfsreq's
- */
-extern TAILQ_HEAD(nfs_reqq, nfsreq) nfs_reqq;
-
-/* Flag values for r_flags */
-#define R_TIMING	0x01		/* timing request (in mntp) */
-#define R_SENT		0x02		/* request has been sent */
-#define	R_SOFTTERM	0x04		/* soft mnt, too many retries */
-#define	R_INTR		0x08		/* intr mnt, signal pending */
-#define	R_SOCKERR	0x10		/* Fatal error on socket */
-#define	R_TPRINTFMSG	0x20		/* Did a tprintf msg. */
-#define	R_MUSTRESEND	0x40		/* Must resend request */
-#define	R_GETONEREP	0x80		/* Probe for one reply only */
-
-/*
- * A list of nfssvc_sock structures is maintained with all the sockets
- * that require service by the nfsd.
- * The nfsuid structs hang off of the nfssvc_sock structs in both lru
- * and uid hash lists.
- */
-#ifndef NFS_UIDHASHSIZ
-#define	NFS_UIDHASHSIZ	29	/* Tune the size of nfssvc_sock with this */
-#endif
-#define	NUIDHASH(sock, uid) \
-	(&(sock)->ns_uidhashtbl[(uid) % NFS_UIDHASHSIZ])
-#ifndef NFS_WDELAYHASHSIZ
-#define	NFS_WDELAYHASHSIZ 16	/* and with this */
-#endif
-#define	NWDELAYHASH(sock, f) \
-	(&(sock)->ns_wdelayhashtbl[(*((u_long *)(f))) % NFS_WDELAYHASHSIZ])
-#ifndef NFS_MUIDHASHSIZ
-#define NFS_MUIDHASHSIZ	63	/* Tune the size of nfsmount with this */
-#endif
-#define	NMUIDHASH(nmp, uid) \
-	(&(nmp)->nm_uidhashtbl[(uid) % NFS_MUIDHASHSIZ])
-#define	NFSNOHASH(fhsum) \
-	(&nfsnodehashtbl[(fhsum) & nfsnodehash])
-
-/*
- * Network address hash list element
- */
-union nethostaddr {
-	u_long had_inetaddr;
-	struct mbuf *had_nam;
-};
-
-struct nfsuid {
-	TAILQ_ENTRY(nfsuid) nu_lru;	/* LRU chain */
-	LIST_ENTRY(nfsuid) nu_hash;	/* Hash list */
-	int		nu_flag;	/* Flags */
-	union nethostaddr nu_haddr;	/* Host addr. for dgram sockets */
-	struct ucred	nu_cr;		/* Cred uid mapped to */
-	int		nu_expire;	/* Expiry time (sec) */
-	struct timeval	nu_timestamp;	/* Kerb. timestamp */
-	u_long		nu_nickname;	/* Nickname on server */
-	NFSKERBKEY_T	nu_key;		/* and session key */
-};
-
-#define	nu_inetaddr	nu_haddr.had_inetaddr
-#define	nu_nam		nu_haddr.had_nam
-/* Bits for nu_flag */
-#define	NU_INETADDR	0x1
-#define NU_NAM		0x2
-#define NU_NETFAM(u)	(((u)->nu_flag & NU_INETADDR) ? AF_INET : AF_ISO)
-
-struct nfssvc_sock {
-	TAILQ_ENTRY(nfssvc_sock) ns_chain;	/* List of all nfssvc_sock's */
-	TAILQ_HEAD(, nfsuid) ns_uidlruhead;
-	struct file	*ns_fp;
-	struct socket	*ns_so;
-	struct mbuf	*ns_nam;
-	struct mbuf	*ns_raw;
-	struct mbuf	*ns_rawend;
-	struct mbuf	*ns_rec;
-	struct mbuf	*ns_recend;
-	struct mbuf	*ns_frag;
-	int		ns_flag;
-	int		ns_solock;
-	int		ns_cc;
-	int		ns_reclen;
-	int		ns_numuids;
-	u_long		ns_sref;
-	LIST_HEAD(, nfsrv_descript) ns_tq;	/* Write gather lists */
-	LIST_HEAD(, nfsuid) ns_uidhashtbl[NFS_UIDHASHSIZ];
-	LIST_HEAD(nfsrvw_delayhash, nfsrv_descript) ns_wdelayhashtbl[NFS_WDELAYHASHSIZ];
-};
-
-/* Bits for "ns_flag" */
-#define	SLP_VALID	0x01
-#define	SLP_DOREC	0x02
-#define	SLP_NEEDQ	0x04
-#define	SLP_DISCONN	0x08
-#define	SLP_GETSTREAM	0x10
-#define	SLP_LASTFRAG	0x20
-#define SLP_ALLFLAGS	0xff
-
-extern TAILQ_HEAD(nfssvc_sockhead, nfssvc_sock) nfssvc_sockhead;
-extern int nfssvc_sockhead_flag;
-#define	SLP_INIT	0x01
-#define	SLP_WANTINIT	0x02
-
-/*
- * One of these structures is allocated for each nfsd.
- */
-struct nfsd {
-	TAILQ_ENTRY(nfsd) nfsd_chain;	/* List of all nfsd's */
-	int		nfsd_flag;	/* NFSD_ flags */
-	struct nfssvc_sock *nfsd_slp;	/* Current socket */
-	int		nfsd_authlen;	/* Authenticator len */
-	u_char		nfsd_authstr[RPCAUTH_MAXSIZ]; /* Authenticator data */
-	int		nfsd_verflen;	/* and the Verifier */
-	u_char		nfsd_verfstr[RPCVERF_MAXSIZ];
-	struct proc	*nfsd_procp;	/* Proc ptr */
-	struct nfsrv_descript *nfsd_nd;	/* Associated nfsrv_descript */
-};
-
-/* Bits for "nfsd_flag" */
-#define	NFSD_WAITING	0x01
-#define	NFSD_REQINPROG	0x02
-#define	NFSD_NEEDAUTH	0x04
-#define	NFSD_AUTHFAIL	0x08
-
-/*
- * This structure is used by the server for describing each request.
- * Some fields are used only when write request gathering is performed.
- */
-struct nfsrv_descript {
-	u_quad_t		nd_time;	/* Write deadline (usec) */
-	off_t			nd_off;		/* Start byte offset */
-	off_t			nd_eoff;	/* and end byte offset */
-	LIST_ENTRY(nfsrv_descript) nd_hash;	/* Hash list */
-	LIST_ENTRY(nfsrv_descript) nd_tq;		/* and timer list */
-	LIST_HEAD(,nfsrv_descript) nd_coalesce;	/* coalesced writes */
-	struct mbuf		*nd_mrep;	/* Request mbuf list */
-	struct mbuf		*nd_md;		/* Current dissect mbuf */
-	struct mbuf		*nd_mreq;	/* Reply mbuf list */
-	struct mbuf		*nd_nam;	/* and socket addr */
-	struct mbuf		*nd_nam2;	/* return socket addr */
-	caddr_t			nd_dpos;	/* Current dissect pos */
-	int			nd_procnum;	/* RPC # */
-	int			nd_stable;	/* storage type */
-	int			nd_flag;	/* nd_flag */
-	int			nd_len;		/* Length of this write */
-	int			nd_repstat;	/* Reply status */
-	u_long			nd_retxid;	/* Reply xid */
-	u_long			nd_duration;	/* Lease duration */
-	struct timeval		nd_starttime;	/* Time RPC initiated */
-	fhandle_t		nd_fh;		/* File handle */
-	struct ucred		nd_cr;		/* Credentials */
-};
-
-/* Bits for "nd_flag" */
-#define	ND_READ		LEASE_READ
-#define ND_WRITE	LEASE_WRITE
-#define ND_CHECK	0x04
-#define ND_LEASE	(ND_READ | ND_WRITE | ND_CHECK)
-#define ND_NFSV3	0x08
-#define ND_NQNFS	0x10
-#define ND_KERBNICK	0x20
-#define ND_KERBFULL	0x40
-#define ND_KERBAUTH	(ND_KERBNICK | ND_KERBFULL)
-
-extern TAILQ_HEAD(nfsd_head, nfsd) nfsd_head;
-extern int nfsd_head_flag;
-#define	NFSD_CHECKSLP	0x01
-
-/*
- * These macros compare nfsrv_descript structures.
- */
-#define NFSW_CONTIG(o, n) \
-		((o)->nd_eoff >= (n)->nd_off && \
-		 !bcmp((caddr_t)&(o)->nd_fh, (caddr_t)&(n)->nd_fh, NFSX_V3FH))
-
-#define NFSW_SAMECRED(o, n) \
-	(((o)->nd_flag & ND_KERBAUTH) == ((n)->nd_flag & ND_KERBAUTH) && \
- 	 !bcmp((caddr_t)&(o)->nd_cr, (caddr_t)&(n)->nd_cr, \
-		sizeof (struct ucred)))
-
-int	nfs_reply __P((struct nfsreq *));
-int	nfs_getreq __P((struct nfsrv_descript *,struct nfsd *,int));
-int	nfs_send __P((struct socket *,struct mbuf *,struct mbuf *,struct nfsreq *));
-int	nfs_rephead __P((int,struct nfsrv_descript *,struct nfssvc_sock *,int,int,u_quad_t *,struct mbuf **,struct mbuf **,caddr_t *));
-int	nfs_sndlock __P((int *,struct nfsreq *));
-void	nfs_sndunlock __P((int *flagp));
-int	nfs_disct __P((struct mbuf **,caddr_t *,int,int,caddr_t *));
-int	nfs_vinvalbuf __P((struct vnode *,int,struct ucred *,struct proc *,int));
-int	nfs_readrpc __P((struct vnode *,struct uio *,struct ucred *));
-int	nfs_writerpc __P((struct vnode *,struct uio *,struct ucred *,int *,int *));
-int	nfs_readdirrpc __P((register struct vnode *,struct uio *,struct ucred *));
-int	nfs_asyncio __P((struct buf *,struct ucred *));
-int	nfs_doio __P((struct buf *,struct ucred *,struct proc *));
-int	nfs_readlinkrpc __P((struct vnode *,struct uio *,struct ucred *));
-int	nfs_sigintr __P((struct nfsmount *,struct nfsreq *r,struct proc *));
-int	nfs_readdirplusrpc __P((struct vnode *,register struct uio *,struct ucred *));
-int	nfsm_disct __P((struct mbuf **,caddr_t *,int,int,caddr_t *));
-void	nfsm_srvfattr __P((struct nfsrv_descript *,struct vattr *,struct nfs_fattr *));
-void	nfsm_srvwcc __P((struct nfsrv_descript *,int,struct vattr *,int,struct vattr *,struct mbuf **,char **));
-void	nfsm_srvpostopattr __P((struct nfsrv_descript *,int,struct vattr *,struct mbuf **,char **));
-int	netaddr_match __P((int,union nethostaddr *,struct mbuf *));
-int	nfs_request __P((struct vnode *,struct mbuf *,int,struct proc *,struct ucred *,struct mbuf **,struct mbuf **,caddr_t *));
-int	nfs_loadattrcache __P((struct vnode **,struct mbuf **,caddr_t *,struct vattr *));
-int	nfs_namei __P((struct nameidata *,fhandle_t *,int,struct nfssvc_sock *,struct mbuf *,struct mbuf **,caddr_t *,struct vnode **,struct proc *,int));
-void	nfsm_adj __P((struct mbuf *,int,int));
-int	nfsm_mbuftouio __P((struct mbuf **,struct uio *,int,caddr_t *));
-void	nfsrv_initcache __P((void));
-int	nfs_getauth __P((struct nfsmount *,struct nfsreq *,struct ucred *,char **,int *,char *,int *,NFSKERBKEY_T));
-int	nfs_getnickauth __P((struct nfsmount *,struct ucred *,char **,int *,char *,int));
-int	nfs_savenickauth __P((struct nfsmount *,struct ucred *,int,NFSKERBKEY_T,struct mbuf **,char **,struct mbuf *));
-int	nfs_adv __P((struct mbuf **,caddr_t *,int,int));
-void	nfs_nhinit __P((void));
-void	nfs_timer __P((void*));
-u_long nfs_hash __P((nfsfh_t *,int));
-void	nfsrv_slpderef __P((struct nfssvc_sock *slp));
-int	nfsrv_dorec __P((struct nfssvc_sock *,struct nfsd *,struct nfsrv_descript **));
-void	nfsrv_cleancache __P((void));
-int	nfsrv_getcache __P((struct nfsrv_descript *,struct nfssvc_sock *,struct mbuf **));
-int	nfs_init __P((void));
-void	nfsrv_updatecache __P((struct nfsrv_descript *,int,struct mbuf *));
-int	nfs_connect __P((struct nfsmount *,struct nfsreq *));
-void	nfs_disconnect __P((struct nfsmount *nmp));
-int	nfs_getattrcache __P((struct vnode *,struct vattr *));
-int	nfsm_strtmbuf __P((struct mbuf **,char **,char *,long));
-int	nfs_bioread __P((struct vnode *,struct uio *,int,struct ucred *, int getpages));
-int	nfsm_uiotombuf __P((struct uio *,struct mbuf **,int,caddr_t *));
-void	nfsrv_init __P((int));
-void	nfs_clearcommit __P((struct mount *));
-int	nfsrv_errmap __P((struct nfsrv_descript *, int));
-void	nfsrv_rcv __P((struct socket *so, caddr_t arg, int waitflag));
-void	nfsrvw_sort __P((gid_t [],int));
-void	nfsrv_setcred __P((struct ucred *,struct ucred *));
-int	nfs_writebp __P((struct buf *,int));
-int	nfsrv_object_create __P(( struct vnode * ));
-void	nfsrv_wakenfsd __P((struct nfssvc_sock *slp));
-int	nfsrv_writegather __P((struct nfsrv_descript **, struct nfssvc_sock *,
-			       struct proc *, struct mbuf **));
-int	nfs_fsinfo __P((struct nfsmount *, struct vnode *, struct ucred *,
-			struct proc *p));
-
-int	nfsrv3_access __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-			   struct proc *procp, struct mbuf **mrq));
-int	nfsrv_commit __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-			  struct proc *procp, struct mbuf **mrq));
-int	nfsrv_create __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-			  struct proc *procp, struct mbuf **mrq));
-int	nfsrv_fhtovp __P((fhandle_t *,int,struct vnode **,
-			struct ucred *,struct nfssvc_sock *,struct mbuf *,
-			int *,int));
-int	nfsrv_fsinfo __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-			  struct proc *procp, struct mbuf **mrq));
-int	nfsrv_getattr __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-			   struct proc *procp, struct mbuf **mrq));
-int	nfsrv_link __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-			struct proc *procp, struct mbuf **mrq));
-int	nfsrv_lookup __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-			  struct proc *procp, struct mbuf **mrq));
-int	nfsrv_mkdir __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-			 struct proc *procp, struct mbuf **mrq));
-int	nfsrv_mknod __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-			 struct proc *procp, struct mbuf **mrq));
-int	nfsrv_noop __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-			struct proc *procp, struct mbuf **mrq));
-int	nfsrv_null __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-			struct proc *procp, struct mbuf **mrq));
-int	nfsrv_pathconf __P((struct nfsrv_descript *nfsd,
-			    struct nfssvc_sock *slp, struct proc *procp,
-			    struct mbuf **mrq));
-int	nfsrv_read __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-			struct proc *procp, struct mbuf **mrq));
-int	nfsrv_readdir __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-			   struct proc *procp, struct mbuf **mrq));
-int	nfsrv_readdirplus __P((struct nfsrv_descript *nfsd,
-			       struct nfssvc_sock *slp, struct proc *procp,
-			       struct mbuf **mrq));
-int	nfsrv_readlink __P((struct nfsrv_descript *nfsd,
-			    struct nfssvc_sock *slp, struct proc *procp,
-			    struct mbuf **mrq));
-int	nfsrv_remove __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-			  struct proc *procp, struct mbuf **mrq));
-int	nfsrv_rename __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-			  struct proc *procp, struct mbuf **mrq));
-int	nfsrv_rmdir __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-			 struct proc *procp, struct mbuf **mrq));
-int	nfsrv_setattr __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-			   struct proc *procp, struct mbuf **mrq));
-int	nfsrv_statfs __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-			  struct proc *procp, struct mbuf **mrq));
-int	nfsrv_symlink __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-			   struct proc *procp, struct mbuf **mrq));
-int	nfsrv_write __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-			 struct proc *procp, struct mbuf **mrq));
-
-#ifdef NFS_DEBUG
-
-extern int nfs_debug;
-#define NFS_DEBUG_ASYNCIO	1 /* asynchronous i/o */
-#define NFS_DEBUG_WG		2 /* server write gathering */
-#define NFS_DEBUG_RC		4 /* server request caching */
-
-#define NFS_DPF(cat, args)					\
-	do {							\
-		if (nfs_debug & NFS_DEBUG_##cat) printf args;	\
-	} while (0)
-
-#else
-
-#define NFS_DPF(cat, args)
-
-#endif
-
-#endif	/* KERNEL */
-
-#endif
diff --git a/cpukit/libnetworking/nfs/nfsdiskless.h b/cpukit/libnetworking/nfs/nfsdiskless.h
deleted file mode 100644
index 0ed5c8f6f7..0000000000
--- a/cpukit/libnetworking/nfs/nfsdiskless.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Rick Macklem at The University of Guelph.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)nfsdiskless.h	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#ifndef _NFS_NFSDISKLESS_H_
-#define _NFS_NFSDISKLESS_H_
-
-/*
- * Structure that must be initialized for a diskless nfs client.
- * This structure is used by nfs_mountroot() to set up the root and swap
- * vnodes plus do a partial ifconfig(8) and route(8) so that the critical net
- * interface can communicate with the server.
- * The primary bootstrap is expected to fill in the appropriate fields before
- * starting the kernel. Whether or not the swap area is nfs mounted is determined
- * by the value in swdevt[0]. (equal to NODEV --> swap over nfs)
- * Currently only works for AF_INET protocols.
- * NB: All fields are stored in net byte order to avoid hassles with
- * client/server byte ordering differences.
- */
-
-/*
- * I have defined a new structure that can handle an NFS Version 3 file handle
- * but the kernel still expects the old Version 2 one to be provided. The
- * changes required in nfs_vfsops.c for using the new are documented there in
- * comments. (I felt that breaking network booting code by changing this
- * structure would not be prudent at this time, since almost all servers are
- * still Version 2 anyhow.)
- */
-struct nfsv3_diskless {
-	struct ifaliasreq myif;			/* Default interface */
-	struct sockaddr_in mygateway;		/* Default gateway */
-	struct nfs_args	swap_args;		/* Mount args for swap file */
-	int		swap_fhsize;		/* Size of file handle */
-	u_char		swap_fh[NFSX_V3FHMAX];	/* Swap file's file handle */
-	struct sockaddr_in swap_saddr;		/* Address of swap server */
-	char		swap_hostnam[MNAMELEN];	/* Host name for mount pt */
-	int		swap_nblks;		/* Size of server swap file */
-	struct ucred	swap_ucred;		/* Swap credentials */
-	struct nfs_args	root_args;		/* Mount args for root fs */
-	int		root_fhsize;		/* Size of root file handle */
-	u_char		root_fh[NFSX_V3FHMAX];	/* File handle of root dir */
-	struct sockaddr_in root_saddr;		/* Address of root server */
-	char		root_hostnam[MNAMELEN];	/* Host name for mount pt */
-	long		root_time;		/* Timestamp of root fs */
-	char		my_hostnam[MAXHOSTNAMELEN]; /* Client host name */
-};
-
-struct nfs_diskless {
-	struct ifaliasreq myif;			/* Default interface */
-	struct sockaddr_in mygateway;		/* Default gateway */
-	struct nfs_args	swap_args;		/* Mount args for swap file */
-	u_char		swap_fh[NFSX_V2FH];	/* Swap file's file handle */
-	struct sockaddr_in swap_saddr;		/* Address of swap server */
-	char		swap_hostnam[MNAMELEN];	/* Host name for mount pt */
-	int		swap_nblks;		/* Size of server swap file */
-	struct ucred	swap_ucred;		/* Swap credentials */
-	struct nfs_args	root_args;		/* Mount args for root fs */
-	u_char		root_fh[NFSX_V2FH];	/* File handle of root dir */
-	struct sockaddr_in root_saddr;		/* Address of root server */
-	char		root_hostnam[MNAMELEN];	/* Host name for mount pt */
-	long		root_time;		/* Timestamp of root fs */
-	char		my_hostnam[MAXHOSTNAMELEN]; /* Client host name */
-};
-
-#endif
diff --git a/cpukit/libnetworking/nfs/nfsproto.h b/cpukit/libnetworking/nfs/nfsproto.h
deleted file mode 100644
index 6ce7c5b960..0000000000
--- a/cpukit/libnetworking/nfs/nfsproto.h
+++ /dev/null
@@ -1,441 +0,0 @@
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Rick Macklem at The University of Guelph.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)nfsproto.h	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#ifndef _NFS_NFSPROTO_H_
-#define _NFS_NFSPROTO_H_
-
-/*
- * nfs definitions as per the Version 2 and 3 specs
- */
-
-/*
- * Constants as defined in the Sun NFS Version 2 and 3 specs.
- * "NFS: Network File System Protocol Specification" RFC1094
- * and in the "NFS: Network File System Version 3 Protocol
- * Specification"
- */
-
-#define NFS_PORT	2049
-#define	NFS_PROG	100003
-#define NFS_VER2	2
-#define	NFS_VER3	3
-#define NFS_V2MAXDATA	8192
-#define	NFS_MAXDGRAMDATA 16384
-#define	NFS_MAXDATA	32768
-#define	NFS_MAXPATHLEN	1024
-#define	NFS_MAXNAMLEN	255
-#define	NFS_MAXPKTHDR	404
-#define NFS_MAXPACKET	(NFS_MAXPKTHDR + NFS_MAXDATA)
-#define	NFS_MINPACKET	20
-#define	NFS_FABLKSIZE	512	/* Size in bytes of a block wrt fa_blocks */
-
-/* Stat numbers for rpc returns (version 2 and 3) */
-#define	NFS_OK			0
-#define	NFSERR_PERM		1
-#define	NFSERR_NOENT		2
-#define	NFSERR_IO		5
-#define	NFSERR_NXIO		6
-#define	NFSERR_ACCES		13
-#define	NFSERR_EXIST		17
-#define	NFSERR_XDEV		18	/* Version 3 only */
-#define	NFSERR_NODEV		19
-#define	NFSERR_NOTDIR		20
-#define	NFSERR_ISDIR		21
-#define	NFSERR_INVAL		22	/* Version 3 only */
-#define	NFSERR_FBIG		27
-#define	NFSERR_NOSPC		28
-#define	NFSERR_ROFS		30
-#define	NFSERR_MLINK		31	/* Version 3 only */
-#define	NFSERR_NAMETOL		63
-#define	NFSERR_NOTEMPTY		66
-#define	NFSERR_DQUOT		69
-#define	NFSERR_STALE		70
-#define	NFSERR_REMOTE		71	/* Version 3 only */
-#define	NFSERR_WFLUSH		99	/* Version 2 only */
-#define	NFSERR_BADHANDLE	10001	/* The rest Version 3 only */
-#define	NFSERR_NOT_SYNC		10002
-#define	NFSERR_BAD_COOKIE	10003
-#define	NFSERR_NOTSUPP		10004
-#define	NFSERR_TOOSMALL		10005
-#define	NFSERR_SERVERFAULT	10006
-#define	NFSERR_BADTYPE		10007
-#define	NFSERR_JUKEBOX		10008
-#define NFSERR_TRYLATER		NFSERR_JUKEBOX
-#define	NFSERR_STALEWRITEVERF	30001	/* Fake return for nfs_commit() */
-
-#define NFSERR_RETVOID		0x20000000 /* Return void, not error */
-#define NFSERR_AUTHERR		0x40000000 /* Mark an authentication error */
-#define NFSERR_RETERR		0x80000000 /* Mark an error return for V3 */
-
-/* Sizes in bytes of various nfs rpc components */
-#define	NFSX_UNSIGNED	4
-
-/* specific to NFS Version 2 */
-#define	NFSX_V2FH	32
-#define	NFSX_V2FATTR	68
-#define	NFSX_V2SATTR	32
-#define	NFSX_V2COOKIE	4
-#define NFSX_V2STATFS	20
-
-/* specific to NFS Version 3 */
-#define NFSX_V3FH		(sizeof (fhandle_t)) /* size this server uses */
-#define	NFSX_V3FHMAX		64	/* max. allowed by protocol */
-#define NFSX_V3FATTR		84
-#define NFSX_V3SATTR		60	/* max. all fields filled in */
-#define NFSX_V3SRVSATTR		(sizeof (struct nfsv3_sattr))
-#define NFSX_V3POSTOPATTR	(NFSX_V3FATTR + NFSX_UNSIGNED)
-#define NFSX_V3WCCDATA		(NFSX_V3POSTOPATTR + 8 * NFSX_UNSIGNED)
-#define NFSX_V3COOKIEVERF 	8
-#define NFSX_V3WRITEVERF 	8
-#define NFSX_V3CREATEVERF	8
-#define NFSX_V3STATFS		52
-#define NFSX_V3FSINFO		48
-#define NFSX_V3PATHCONF		24
-
-/* variants for both versions */
-#define NFSX_FH(v3)		((v3) ? (NFSX_V3FHMAX + NFSX_UNSIGNED) : \
-					NFSX_V2FH)
-#define NFSX_SRVFH(v3)		((v3) ? NFSX_V3FH : NFSX_V2FH)
-#define	NFSX_FATTR(v3)		((v3) ? NFSX_V3FATTR : NFSX_V2FATTR)
-#define NFSX_PREOPATTR(v3)	((v3) ? (7 * NFSX_UNSIGNED) : 0)
-#define NFSX_POSTOPATTR(v3)	((v3) ? (NFSX_V3FATTR + NFSX_UNSIGNED) : 0)
-#define NFSX_POSTOPORFATTR(v3)	((v3) ? (NFSX_V3FATTR + NFSX_UNSIGNED) : \
-					NFSX_V2FATTR)
-#define NFSX_WCCDATA(v3)	((v3) ? NFSX_V3WCCDATA : 0)
-#define NFSX_WCCORFATTR(v3)	((v3) ? NFSX_V3WCCDATA : NFSX_V2FATTR)
-#define	NFSX_SATTR(v3)		((v3) ? NFSX_V3SATTR : NFSX_V2SATTR)
-#define	NFSX_COOKIEVERF(v3)	((v3) ? NFSX_V3COOKIEVERF : 0)
-#define	NFSX_WRITEVERF(v3)	((v3) ? NFSX_V3WRITEVERF : 0)
-#define NFSX_READDIR(v3)	((v3) ? (5 * NFSX_UNSIGNED) : \
-					(2 * NFSX_UNSIGNED))
-#define	NFSX_STATFS(v3)		((v3) ? NFSX_V3STATFS : NFSX_V2STATFS)
-
-/* nfs rpc procedure numbers (before version mapping) */
-#define	NFSPROC_NULL		0
-#define	NFSPROC_GETATTR		1
-#define	NFSPROC_SETATTR		2
-#define	NFSPROC_LOOKUP		3
-#define	NFSPROC_ACCESS		4
-#define	NFSPROC_READLINK	5
-#define	NFSPROC_READ		6
-#define	NFSPROC_WRITE		7
-#define	NFSPROC_CREATE		8
-#define	NFSPROC_MKDIR		9
-#define	NFSPROC_SYMLINK		10
-#define	NFSPROC_MKNOD		11
-#define	NFSPROC_REMOVE		12
-#define	NFSPROC_RMDIR		13
-#define	NFSPROC_RENAME		14
-#define	NFSPROC_LINK		15
-#define	NFSPROC_READDIR		16
-#define	NFSPROC_READDIRPLUS	17
-#define	NFSPROC_FSSTAT		18
-#define	NFSPROC_FSINFO		19
-#define	NFSPROC_PATHCONF	20
-#define	NFSPROC_COMMIT		21
-
-/* And leasing (nqnfs) procedure numbers (must be last) */
-#define	NQNFSPROC_GETLEASE	22
-#define	NQNFSPROC_VACATED	23
-#define	NQNFSPROC_EVICTED	24
-
-#define NFSPROC_NOOP		25
-#define	NFS_NPROCS		26
-
-/* Actual Version 2 procedure numbers */
-#define	NFSV2PROC_NULL		0
-#define	NFSV2PROC_GETATTR	1
-#define	NFSV2PROC_SETATTR	2
-#define	NFSV2PROC_NOOP		3
-#define	NFSV2PROC_ROOT		NFSV2PROC_NOOP	/* Obsolete */
-#define	NFSV2PROC_LOOKUP	4
-#define	NFSV2PROC_READLINK	5
-#define	NFSV2PROC_READ		6
-#define	NFSV2PROC_WRITECACHE	NFSV2PROC_NOOP	/* Obsolete */
-#define	NFSV2PROC_WRITE		8
-#define	NFSV2PROC_CREATE	9
-#define	NFSV2PROC_REMOVE	10
-#define	NFSV2PROC_RENAME	11
-#define	NFSV2PROC_LINK		12
-#define	NFSV2PROC_SYMLINK	13
-#define	NFSV2PROC_MKDIR		14
-#define	NFSV2PROC_RMDIR		15
-#define	NFSV2PROC_READDIR	16
-#define	NFSV2PROC_STATFS	17
-
-/*
- * Constants used by the Version 3 protocol for various RPCs
- */
-#define NFSV3SATTRTIME_DONTCHANGE	0
-#define NFSV3SATTRTIME_TOSERVER		1
-#define NFSV3SATTRTIME_TOCLIENT		2
-
-#define NFSV3ACCESS_READ		0x01
-#define NFSV3ACCESS_LOOKUP		0x02
-#define NFSV3ACCESS_MODIFY		0x04
-#define NFSV3ACCESS_EXTEND		0x08
-#define NFSV3ACCESS_DELETE		0x10
-#define NFSV3ACCESS_EXECUTE		0x20
-
-#define NFSV3WRITE_UNSTABLE		0
-#define NFSV3WRITE_DATASYNC		1
-#define NFSV3WRITE_FILESYNC		2
-
-#define NFSV3CREATE_UNCHECKED		0
-#define NFSV3CREATE_GUARDED		1
-#define NFSV3CREATE_EXCLUSIVE		2
-
-#define NFSV3FSINFO_LINK		0x01
-#define NFSV3FSINFO_SYMLINK		0x02
-#define NFSV3FSINFO_HOMOGENEOUS		0x08
-#define NFSV3FSINFO_CANSETTIME		0x10
-
-/* Conversion macros */
-#define	vtonfsv2_mode(t,m) \
-		txdr_unsigned(((t) == VFIFO) ? MAKEIMODE(VCHR, (m)) : \
-				MAKEIMODE((t), (m)))
-#define vtonfsv3_mode(m)	txdr_unsigned((m) & 07777)
-#define	nfstov_mode(a)		(fxdr_unsigned(u_short, (a))&07777)
-#define	vtonfsv2_type(a)	txdr_unsigned(nfsv2_type[((long)(a))])
-#define	vtonfsv3_type(a)	txdr_unsigned(nfsv3_type[((long)(a))])
-#define	nfsv2tov_type(a)	nv2tov_type[fxdr_unsigned(u_long,(a))&0x7]
-#define	nfsv3tov_type(a)	nv3tov_type[fxdr_unsigned(u_long,(a))&0x7]
-
-/* File types */
-typedef enum { NFNON=0, NFREG=1, NFDIR=2, NFBLK=3, NFCHR=4, NFLNK=5,
-	NFSOCK=6, NFFIFO=7 } nfstype;
-
-/* Structs for common parts of the rpc's */
-/*
- * File Handle (32 bytes for version 2), variable up to 64 for version 3.
- * File Handles of up to NFS_SMALLFH in size are stored directly in the
- * nfs node, whereas larger ones are malloc'd. (This never happens when
- * NFS_SMALLFH is set to 64.)
- * NFS_SMALLFH should be in the range of 32 to 64 and be divisible by 4.
- */
-#ifndef NFS_SMALLFH
-#define NFS_SMALLFH	64
-#endif
-union nfsfh {
-	fhandle_t	fh_generic;
-	u_char		fh_bytes[NFS_SMALLFH];
-};
-typedef union nfsfh nfsfh_t;
-
-struct nfsv2_time {
-	u_long	nfsv2_sec;
-	u_long	nfsv2_usec;
-};
-typedef struct nfsv2_time	nfstime2;
-
-struct nfsv3_time {
-	u_long	nfsv3_sec;
-	u_long	nfsv3_nsec;
-};
-typedef struct nfsv3_time	nfstime3;
-
-/*
- * Quads are defined as arrays of 2 longs to ensure dense packing for the
- * protocol and to facilitate xdr conversion.
- */
-struct nfs_uquad {
-	u_long	nfsuquad[2];
-};
-typedef	struct nfs_uquad	nfsuint64;
-
-/*
- * Used to convert between two u_longs and a u_quad_t.
- */
-union nfs_quadconvert {
-	u_long		lval[2];
-	u_quad_t	qval;
-};
-typedef union nfs_quadconvert	nfsquad_t;
-
-/*
- * NFS Version 3 special file number.
- */
-struct nfsv3_spec {
-	u_long	specdata1;
-	u_long	specdata2;
-};
-typedef	struct nfsv3_spec	nfsv3spec;
-
-/*
- * File attributes and setable attributes. These structures cover both
- * NFS version 2 and the version 3 protocol. Note that the union is only
- * used so that one pointer can refer to both variants. These structures
- * go out on the wire and must be densely packed, so no quad data types
- * are used. (all fields are longs or u_longs or structures of same)
- * NB: You can't do sizeof(struct nfs_fattr), you must use the
- *     NFSX_FATTR(v3) macro.
- */
-struct nfs_fattr {
-	u_long	fa_type;
-	u_long	fa_mode;
-	u_long	fa_nlink;
-	u_long	fa_uid;
-	u_long	fa_gid;
-	union {
-		struct {
-			u_long		nfsv2fa_size;
-			u_long		nfsv2fa_blocksize;
-			u_long		nfsv2fa_rdev;
-			u_long		nfsv2fa_blocks;
-			u_long		nfsv2fa_fsid;
-			u_long		nfsv2fa_fileid;
-			nfstime2	nfsv2fa_atime;
-			nfstime2	nfsv2fa_mtime;
-			nfstime2	nfsv2fa_ctime;
-		} fa_nfsv2;
-		struct {
-			nfsuint64	nfsv3fa_size;
-			nfsuint64	nfsv3fa_used;
-			nfsv3spec	nfsv3fa_rdev;
-			nfsuint64	nfsv3fa_fsid;
-			nfsuint64	nfsv3fa_fileid;
-			nfstime3	nfsv3fa_atime;
-			nfstime3	nfsv3fa_mtime;
-			nfstime3	nfsv3fa_ctime;
-		} fa_nfsv3;
-	} fa_un;
-};
-
-/* and some ugly defines for accessing union components */
-#define	fa2_size		fa_un.fa_nfsv2.nfsv2fa_size
-#define	fa2_blocksize		fa_un.fa_nfsv2.nfsv2fa_blocksize
-#define	fa2_rdev		fa_un.fa_nfsv2.nfsv2fa_rdev
-#define	fa2_blocks		fa_un.fa_nfsv2.nfsv2fa_blocks
-#define	fa2_fsid		fa_un.fa_nfsv2.nfsv2fa_fsid
-#define	fa2_fileid		fa_un.fa_nfsv2.nfsv2fa_fileid
-#define	fa2_atime		fa_un.fa_nfsv2.nfsv2fa_atime
-#define	fa2_mtime		fa_un.fa_nfsv2.nfsv2fa_mtime
-#define	fa2_ctime		fa_un.fa_nfsv2.nfsv2fa_ctime
-#define	fa3_size		fa_un.fa_nfsv3.nfsv3fa_size
-#define	fa3_used		fa_un.fa_nfsv3.nfsv3fa_used
-#define	fa3_rdev		fa_un.fa_nfsv3.nfsv3fa_rdev
-#define	fa3_fsid		fa_un.fa_nfsv3.nfsv3fa_fsid
-#define	fa3_fileid		fa_un.fa_nfsv3.nfsv3fa_fileid
-#define	fa3_atime		fa_un.fa_nfsv3.nfsv3fa_atime
-#define	fa3_mtime		fa_un.fa_nfsv3.nfsv3fa_mtime
-#define	fa3_ctime		fa_un.fa_nfsv3.nfsv3fa_ctime
-
-struct nfsv2_sattr {
-	u_long		sa_mode;
-	u_long		sa_uid;
-	u_long		sa_gid;
-	u_long		sa_size;
-	nfstime2	sa_atime;
-	nfstime2	sa_mtime;
-};
-
-/*
- * NFS Version 3 sattr structure for the new node creation case.
- */
-struct nfsv3_sattr {
-	u_long		sa_modetrue;
-	u_long		sa_mode;
-	u_long		sa_uidtrue;
-	u_long		sa_uid;
-	u_long		sa_gidtrue;
-	u_long		sa_gid;
-	u_long		sa_sizefalse;
-	u_long		sa_atimetype;
-	nfstime3	sa_atime;
-	u_long		sa_mtimetype;
-	nfstime3	sa_mtime;
-};
-
-struct nfs_statfs {
-	union {
-		struct {
-			u_long		nfsv2sf_tsize;
-			u_long		nfsv2sf_bsize;
-			u_long		nfsv2sf_blocks;
-			u_long		nfsv2sf_bfree;
-			u_long		nfsv2sf_bavail;
-		} sf_nfsv2;
-		struct {
-			nfsuint64	nfsv3sf_tbytes;
-			nfsuint64	nfsv3sf_fbytes;
-			nfsuint64	nfsv3sf_abytes;
-			nfsuint64	nfsv3sf_tfiles;
-			nfsuint64	nfsv3sf_ffiles;
-			nfsuint64	nfsv3sf_afiles;
-			u_long		nfsv3sf_invarsec;
-		} sf_nfsv3;
-	} sf_un;
-};
-
-#define sf_tsize	sf_un.sf_nfsv2.nfsv2sf_tsize
-#define sf_bsize	sf_un.sf_nfsv2.nfsv2sf_bsize
-#define sf_blocks	sf_un.sf_nfsv2.nfsv2sf_blocks
-#define sf_bfree	sf_un.sf_nfsv2.nfsv2sf_bfree
-#define sf_bavail	sf_un.sf_nfsv2.nfsv2sf_bavail
-#define sf_tbytes	sf_un.sf_nfsv3.nfsv3sf_tbytes
-#define sf_fbytes	sf_un.sf_nfsv3.nfsv3sf_fbytes
-#define sf_abytes	sf_un.sf_nfsv3.nfsv3sf_abytes
-#define sf_tfiles	sf_un.sf_nfsv3.nfsv3sf_tfiles
-#define sf_ffiles	sf_un.sf_nfsv3.nfsv3sf_ffiles
-#define sf_afiles	sf_un.sf_nfsv3.nfsv3sf_afiles
-#define sf_invarsec	sf_un.sf_nfsv3.nfsv3sf_invarsec
-
-struct nfsv3_fsinfo {
-	u_long		fs_rtmax;
-	u_long		fs_rtpref;
-	u_long		fs_rtmult;
-	u_long		fs_wtmax;
-	u_long		fs_wtpref;
-	u_long		fs_wtmult;
-	u_long		fs_dtpref;
-	nfsuint64	fs_maxfilesize;
-	nfstime3	fs_timedelta;
-	u_long		fs_properties;
-};
-
-struct nfsv3_pathconf {
-	u_long		pc_linkmax;
-	u_long		pc_namemax;
-	u_long		pc_notrunc;
-	u_long		pc_chownrestricted;
-	u_long		pc_caseinsensitive;
-	u_long		pc_casepreserving;
-};
-
-#endif
diff --git a/cpukit/libnetworking/nfs/rpcv2.h b/cpukit/libnetworking/nfs/rpcv2.h
deleted file mode 100644
index 5fd6e7febf..0000000000
--- a/cpukit/libnetworking/nfs/rpcv2.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Rick Macklem at The University of Guelph.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)rpcv2.h	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#ifndef _NFS_RPCV2_H_
-#define _NFS_RPCV2_H_
-
-/*
- * Definitions for Sun RPC Version 2, from
- * "RPC: Remote Procedure Call Protocol Specification" RFC1057
- */
-
-/* Version # */
-#define	RPC_VER2	2
-
-/* Authentication */
-#define	RPCAUTH_NULL	0
-#define	RPCAUTH_UNIX	1
-#define	RPCAUTH_SHORT	2
-#define RPCAUTH_KERB4	4
-#define	RPCAUTH_NQNFS	300000
-#define	RPCAUTH_MAXSIZ	400
-#define	RPCVERF_MAXSIZ	12	/* For Kerb, can actually be 400 */
-#define	RPCAUTH_UNIXGIDS 16
-
-/*
- * Constants associated with authentication flavours.
- */
-#define RPCAKN_FULLNAME	0
-#define RPCAKN_NICKNAME	1
-
-/* Rpc Constants */
-#define	RPC_CALL	0
-#define	RPC_REPLY	1
-#define	RPC_MSGACCEPTED	0
-#define	RPC_MSGDENIED	1
-#define	RPC_PROGUNAVAIL	1
-#define	RPC_PROGMISMATCH	2
-#define	RPC_PROCUNAVAIL	3
-#define	RPC_GARBAGE	4		/* I like this one */
-#define	RPC_MISMATCH	0
-#define	RPC_AUTHERR	1
-
-/* Authentication failures */
-#define	AUTH_BADCRED	1
-#define	AUTH_REJECTCRED	2
-#define	AUTH_BADVERF	3
-#define	AUTH_REJECTVERF	4
-#define	AUTH_TOOWEAK	5		/* Give em wheaties */
-
-/* Sizes of rpc header parts */
-#define	RPC_SIZ		24
-#define	RPC_REPLYSIZ	28
-
-/* RPC Prog definitions */
-#define	RPCPROG_MNT	100005
-#define	RPCMNT_VER1	1
-#define	RPCMNT_VER3	3
-#define	RPCMNT_MOUNT	1
-#define	RPCMNT_DUMP	2
-#define	RPCMNT_UMOUNT	3
-#define	RPCMNT_UMNTALL	4
-#define	RPCMNT_EXPORT	5
-#define	RPCMNT_NAMELEN	255
-#define	RPCMNT_PATHLEN	1024
-#define	RPCPROG_NFS	100003
-
-/*
- * Structures used for RPCAUTH_KERB4.
- */
-struct nfsrpc_fullverf {
-	u_long		t1;
-	u_long		t2;
-	u_long		w2;
-};
-
-struct nfsrpc_fullblock {
-	u_long		t1;
-	u_long		t2;
-	u_long		w1;
-	u_long		w2;
-};
-
-struct nfsrpc_nickverf {
-	u_long			kind;
-	struct nfsrpc_fullverf	verf;
-};
-
-/*
- * and their sizes in bytes.. If sizeof (struct nfsrpc_xx) != these
- * constants, well then things will break in mount_nfs and nfsd.
- */
-#define RPCX_FULLVERF	12
-#define RPCX_FULLBLOCK	16
-#define RPCX_NICKVERF	16
-
-#ifdef NFSKERB
-XXX
-#else
-typedef u_char			NFSKERBKEY_T[2];
-typedef u_char			NFSKERBKEYSCHED_T[2];
-#endif
-#define NFS_KERBSRV	"rcmd"		/* Kerberos Service for NFS */
-#define NFS_KERBTTL	(30 * 60)	/* Credential ttl (sec) */
-#define NFS_KERBCLOCKSKEW (5 * 60)	/* Clock skew (sec) */
-#define NFS_KERBW1(t)	(*((u_long *)(&((t).dat[((t).length + 3) & ~0x3]))))
-#endif
diff --git a/cpukit/libnetworking/nfs/xdr_subs.h b/cpukit/libnetworking/nfs/xdr_subs.h
deleted file mode 100644
index 874730378f..0000000000
--- a/cpukit/libnetworking/nfs/xdr_subs.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Rick Macklem at The University of Guelph.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)xdr_subs.h	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#ifndef _NFS_XDR_SUBS_H_
-#define _NFS_XDR_SUBS_H_
-
-/*
- * Macros used for conversion to/from xdr representation by nfs...
- * These use the MACHINE DEPENDENT routines ntohl, htonl
- * As defined by "XDR: External Data Representation Standard" RFC1014
- *
- * To simplify the implementation, we use ntohl/htonl even on big-endian
- * machines, and count on them being `#define'd away.  Some of these
- * might be slightly more efficient as quad_t copies on a big-endian,
- * but we cannot count on their alignment anyway.
- */
-
-#define	fxdr_unsigned(t, v)	((t)ntohl((long)(v)))
-#define	txdr_unsigned(v)	(htonl((long)(v)))
-
-#define	fxdr_nfsv2time(f, t) { \
-	(t)->tv_sec = ntohl(((struct nfsv2_time *)(f))->nfsv2_sec); \
-	if (((struct nfsv2_time *)(f))->nfsv2_usec != 0xffffffff) \
-		(t)->tv_nsec = 1000 * ntohl(((struct nfsv2_time *)(f))->nfsv2_usec); \
-	else \
-		(t)->tv_nsec = 0; \
-}
-#define	txdr_nfsv2time(f, t) { \
-	((struct nfsv2_time *)(t))->nfsv2_sec = htonl((f)->tv_sec); \
-	if ((f)->tv_nsec != -1) \
-		((struct nfsv2_time *)(t))->nfsv2_usec = htonl((f)->tv_nsec / 1000); \
-	else \
-		((struct nfsv2_time *)(t))->nfsv2_usec = 0xffffffff; \
-}
-
-#define	fxdr_nfsv3time(f, t) { \
-	(t)->tv_sec = ntohl(((struct nfsv3_time *)(f))->nfsv3_sec); \
-	(t)->tv_nsec = ntohl(((struct nfsv3_time *)(f))->nfsv3_nsec); \
-}
-#define	txdr_nfsv3time(f, t) { \
-	((struct nfsv3_time *)(t))->nfsv3_sec = htonl((f)->tv_sec); \
-	((struct nfsv3_time *)(t))->nfsv3_nsec = htonl((f)->tv_nsec); \
-}
-
-#define	fxdr_hyper(f, t) { \
-	((long *)(t))[_QUAD_HIGHWORD] = ntohl(((long *)(f))[0]); \
-	((long *)(t))[_QUAD_LOWWORD] = ntohl(((long *)(f))[1]); \
-}
-#define	txdr_hyper(f, t) { \
-	((long *)(t))[0] = htonl(((long *)(f))[_QUAD_HIGHWORD]); \
-	((long *)(t))[1] = htonl(((long *)(f))[_QUAD_LOWWORD]); \
-}
-
-#endif
diff --git a/cpukit/libnetworking/opt_ipfw.h b/cpukit/libnetworking/opt_ipfw.h
deleted file mode 100644
index 5a6ee0337b..0000000000
--- a/cpukit/libnetworking/opt_ipfw.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/*
- *  $Id$
- */
-
-/* intentionally empty file */
-
diff --git a/cpukit/libnetworking/opt_mrouting.h b/cpukit/libnetworking/opt_mrouting.h
deleted file mode 100644
index 5a6ee0337b..0000000000
--- a/cpukit/libnetworking/opt_mrouting.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/*
- *  $Id$
- */
-
-/* intentionally empty file */
-
diff --git a/cpukit/libnetworking/opt_tcpdebug.h b/cpukit/libnetworking/opt_tcpdebug.h
deleted file mode 100644
index 5a6ee0337b..0000000000
--- a/cpukit/libnetworking/opt_tcpdebug.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/*
- *  $Id$
- */
-
-/* intentionally empty file */
-
diff --git a/cpukit/libnetworking/poll.h b/cpukit/libnetworking/poll.h
deleted file mode 100644
index 74dfca76c1..0000000000
--- a/cpukit/libnetworking/poll.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/*-
- * Copyright (c) 1997 Peter Wemm <peter@freebsd.org>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	$Id$
- */
-
-#ifndef _SYS_POLL_H_
-#define	_SYS_POLL_H_
-
-/*
- * This file is intended to be compatable with the traditional poll.h.
- */
-
-/*
- * This structure is passed as an array to poll(2).
- */
-struct pollfd {
-	int	fd;		/* which file descriptor to poll */
-	short	events;		/* events we are interested in */
-	short	revents;	/* events found on return */
-};
-
-/*
- * Requestable events.  If poll(2) finds any of these set, they are
- * copied to revents on return.
- * XXX Note that FreeBSD doesn't make much distinction between POLLPRI
- * and POLLRDBAND since none of the file types have distinct priority
- * bands - and only some have an urgent "mode".
- * XXX Note POLLIN isn't really supported in true SVSV terms.  Under SYSV
- * POLLIN includes all of normal, band and urgent data.  Most poll handlers
- * on FreeBSD only treat it as "normal" data.
- */
-#define	POLLIN		0x0001		/* any readable data available */
-#define	POLLPRI		0x0002		/* OOB/Urgent readable data */
-#define	POLLOUT		0x0004		/* file descriptor is writeable */
-#define	POLLRDNORM	0x0040		/* non-OOB/URG data available */
-#define	POLLWRNORM	POLLOUT		/* no write type differentiation */
-#define	POLLRDBAND	0x0080		/* OOB/Urgent readable data */
-#define	POLLWRBAND	0x0100		/* OOB/Urgent data can be written */
-
-/*
- * FreeBSD extensions: polling on a regular file might return one
- * of these events (currently only supported on UFS).
- */
-#define	POLLEXTEND	0x0200		/* file may have been extended */
-#define	POLLATTRIB	0x0400		/* file attributes may have changed */
-#define	POLLNLINK	0x0800		/* (un)link/rename may have happened */
-#define	POLLWRITE	0x1000		/* file's contents may have changed */
-
-/*
- * These events are set if they occur regardless of whether they were
- * requested.
- */
-#define	POLLERR		0x0008		/* some poll error occurred */
-#define	POLLHUP		0x0010		/* file descriptor was "hung up" */
-#define	POLLNVAL	0x0020		/* requested events "invalid" */
-
-#define	POLLSTANDARD	(POLLIN|POLLPRI|POLLOUT|POLLRDNORM|POLLRDBAND|\
-			 POLLWRBAND|POLLERR|POLLHUP|POLLNVAL)
-
-/*
- * Request that poll() wait forever.
- * XXX in SYSV, this is defined in stropts.h, which is not included
- * by poll.h.
- */
-#define	INFTIM		(-1)
-
-#ifndef KERNEL
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-/*
- * XXX logically, poll() should be declared in <poll.h>, but SVR4 at
- * least has it here in <sys/poll.h>.
- * XXX poll() has "unsigned long" nfds on SVR4, not unsigned as on the
- * other BSDs.
- */
-int	poll __P((struct pollfd *_pfd, unsigned _nfds, int _timeout));
-__END_DECLS
-
-#endif /* !KERNEL */
-
-#endif /* !_SYS_POLL_H_ */
diff --git a/cpukit/libnetworking/resolv.h b/cpukit/libnetworking/resolv.h
deleted file mode 100644
index 614f204706..0000000000
--- a/cpukit/libnetworking/resolv.h
+++ /dev/null
@@ -1,306 +0,0 @@
-/*-
- * Copyright (c) 1983, 1987, 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * Portions Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-/*
- *	@(#)resolv.h	8.1 (Berkeley) 6/2/93
- *	From Id: resolv.h,v 8.12 1998/04/28 19:36:46 halley Exp $
- *	$Id$
- */
-
-#ifndef _RESOLV_H_
-#define	_RESOLV_H_
-
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/cdefs.h>
-#include <stdio.h>
-
-/*
- * Revision information.  This is the release date in YYYYMMDD format.
- * It can change every day so the right thing to do with it is use it
- * in preprocessor commands such as "#if (__RES > 19931104)".  Do not
- * compare for equality; rather, use it to determine whether your resolver
- * is new enough to contain a certain feature.
- */
-
-#define	__RES	19960801
-
-/*
- * This used to be defined in res_query.c, now it's in herror.c.  It was
- * never extern'd by any *.h file before it was placed here.  herror.c is
- * part of libresolv.a even though it might make more sense in libnetdb.a
- * or even libnet.a.
- */
-
-extern int h_errno;
-
-/*
- * Resolver configuration file.
- * Normally not present, but may contain the address of the
- * inital name server(s) to query and the domain search list.
- */
-
-#ifndef _PATH_RESCONF
-#define	_PATH_RESCONF        "/etc/resolv.conf"
-#endif
-
-/*
- * Global defines and variables for resolver stub.
- */
-#define	MAXNS			3	/* max # name servers we'll track */
-#define	MAXDFLSRCH		3	/* # default domain levels to try */
-#define	MAXDNSRCH		6	/* max # domains in search path */
-#define	LOCALDOMAINPARTS	2	/* min levels in name that is "local" */
-
-#define	RES_TIMEOUT		5	/* min. seconds between retries */
-#define	MAXRESOLVSORT		10	/* number of net to sort on */
-#define	RES_MAXNDOTS		15	/* should reflect bit field size */
-
-struct __res_state {
-	int	retrans;	 	/* retransmition time interval */
-	int	retry;			/* number of times to retransmit */
-	u_long	options;		/* option flags - see below. */
-	int	nscount;		/* number of name servers */
-	struct sockaddr_in
-		nsaddr_list[MAXNS];	/* address of name server */
-#define	nsaddr	nsaddr_list[0]		/* for backward compatibility */
-	u_short	id;			/* current message id */
-	char	*dnsrch[MAXDNSRCH+1];	/* components of domain to search */
-	char	defdname[256];		/* default domain (deprecated) */
-	u_long	pfcode;			/* RES_PRF_ flags - see below. */
-	unsigned ndots:4;		/* threshold for initial abs. query */
-	unsigned nsort:4;		/* number of elements in sort_list[] */
-	char	unused[3];
-	struct {
-		struct in_addr	addr;
-		u_int32_t	mask;
-	} sort_list[MAXRESOLVSORT];
-	char	pad[72];		/* on an i386 this means 512b total */
-};
-
-/*
- * Resolver options (keep these in synch with res_debug.c, please)
- */
-#define RES_INIT	0x00000001	/* address initialized */
-#define RES_DEBUG	0x00000002	/* print debug messages */
-#define RES_AAONLY	0x00000004	/* authoritative answers only (!IMPL)*/
-#define RES_USEVC	0x00000008	/* use virtual circuit */
-#define RES_PRIMARY	0x00000010	/* query primary server only (!IMPL) */
-#define RES_IGNTC	0x00000020	/* ignore truncation errors */
-#define RES_RECURSE	0x00000040	/* recursion desired */
-#define RES_DEFNAMES	0x00000080	/* use default domain name */
-#define RES_STAYOPEN	0x00000100	/* Keep TCP socket open */
-#define RES_DNSRCH	0x00000200	/* search up local domain tree */
-#define	RES_INSECURE1	0x00000400	/* type 1 security disabled */
-#define	RES_INSECURE2	0x00000800	/* type 2 security disabled */
-#define	RES_NOALIASES	0x00001000	/* shuts off HOSTALIASES feature */
-#define	RES_USE_INET6	0x00002000	/* use/map IPv6 in gethostbyname() */
-#define	RES_NOTLDQUERY	0x00004000	/* Don't query TLD names */
-
-#define RES_DEFAULT	(RES_RECURSE | RES_DEFNAMES | RES_DNSRCH)
-
-/*
- * Resolver "pfcode" values.  Used by dig.
- */
-#define	RES_PRF_STATS	0x00000001
-#define	RES_PRF_UPDATE	0x00000002
-#define	RES_PRF_CLASS   0x00000004
-#define	RES_PRF_CMD	0x00000008
-#define	RES_PRF_QUES	0x00000010
-#define	RES_PRF_ANS	0x00000020
-#define	RES_PRF_AUTH	0x00000040
-#define	RES_PRF_ADD	0x00000080
-#define	RES_PRF_HEAD1	0x00000100
-#define	RES_PRF_HEAD2	0x00000200
-#define	RES_PRF_TTLID	0x00000400
-#define	RES_PRF_HEADX	0x00000800
-#define	RES_PRF_QUERY	0x00001000
-#define	RES_PRF_REPLY	0x00002000
-#define	RES_PRF_INIT    0x00004000
-/*			0x00008000	*/
-
-typedef enum { res_goahead, res_nextns, res_modified, res_done, res_error }
-	res_sendhookact;
-
-typedef res_sendhookact (*res_send_qhook)__P((struct sockaddr_in * const *ns,
-					      const u_char **query,
-					      int *querylen,
-					      u_char *ans,
-					      int anssiz,
-					      int *resplen));
-
-typedef res_sendhookact (*res_send_rhook)__P((const struct sockaddr_in *ns,
-					      const u_char *query,
-					      int querylen,
-					      u_char *ans,
-					      int anssiz,
-					      int *resplen));
-
-struct res_sym {
-	int	number;		/* Identifying number, like T_MX */
-	char *	name;		/* Its symbolic name, like "MX" */
-	char *	humanname;	/* Its fun name, like "mail exchanger" */
-};
-
-extern struct __res_state _res;
-extern const struct res_sym __p_class_syms[];
-extern const struct res_sym __p_type_syms[];
-
-/* Private routines shared between libc/net, named, nslookup and others. */
-#define	res_hnok	__res_hnok
-#define	res_ownok	__res_ownok
-#define	res_mailok	__res_mailok
-#define	res_dnok	__res_dnok
-#define	sym_ston	__sym_ston
-#define	sym_ntos	__sym_ntos
-#define	sym_ntop	__sym_ntop
-#define	b64_ntop	__b64_ntop
-#define	b64_pton	__b64_pton
-#define	loc_ntoa	__loc_ntoa
-#define	loc_aton	__loc_aton
-#define	fp_resstat	__fp_resstat
-#define	p_query		__p_query
-#define	dn_skipname	__dn_skipname
-#define	fp_resstat	__fp_resstat
-#define	fp_query	__fp_query
-#define	fp_nquery	__fp_nquery
-#define	hostalias	__hostalias
-#define	putlong		__putlong
-#define	putshort	__putshort
-#define	p_class		__p_class
-#define	p_time		__p_time
-#define	p_type		__p_type
-#define	p_query		__p_query
-#define	p_cdnname	__p_cdnname
-#define	p_section	__p_section
-#define	p_cdname	__p_cdname
-#define	p_fqnname	__p_fqnname
-#define	p_fqname	__p_fqname
-#define	p_option	__p_option
-#define	p_secstodate	__p_secstodate
-#define	dn_count_labels	__dn_count_labels
-#define	dn_comp		__dn_comp
-#define	dn_expand	__dn_expand
-#define	res_init	__res_init
-#define	res_randomid	__res_randomid
-#define	res_query	__res_query
-#define	res_search	__res_search
-#define	res_querydomain	__res_querydomain
-#define	res_mkquery	__res_mkquery
-#define	res_send	__res_send
-#define	res_isourserver	__res_isourserver
-#define	res_nameinquery	__res_nameinquery
-#define	res_queriesmatch __res_queriesmatch
-#define	res_close	__res_close
-#define	res_mkupdate	__res_mkupdate
-#define	res_mkupdrec	__res_mkupdrec
-#define	res_freeupdrec	__res_freeupdrec
-
-__BEGIN_DECLS
-int		res_hnok __P((const char *));
-int		res_ownok __P((const char *));
-int		res_mailok __P((const char *));
-int		res_dnok __P((const char *));
-int		sym_ston __P((const struct res_sym *, const char *, int *));
-const char *	sym_ntos __P((const struct res_sym *, int, int *));
-const char *	sym_ntop __P((const struct res_sym *, int, int *));
-int		b64_ntop __P((u_char const *, size_t, char *, size_t));
-int		b64_pton __P((char const *, u_char *, size_t));
-int		loc_aton __P((const char *, u_char *));
-const char *	loc_ntoa __P((const u_char *, char *));
-int		dn_skipname __P((const u_char *, const u_char *));
-void		fp_resstat __P((struct __res_state *, FILE *));
-void		fp_query __P((const u_char *, FILE *));
-void		fp_nquery __P((const u_char *, int, FILE *));
-const char *	hostalias __P((const char *));
-void		putlong __P((u_int32_t, u_char *));
-void		putshort __P((u_int16_t, u_char *));
-const char *	p_class __P((int));
-const char *	p_time __P((u_int32_t));
-const char *	p_type __P((int));
-void		p_query __P((const u_char *));
-const u_char *	p_cdnname __P((const u_char *, const u_char *, int, FILE *));
-const u_char *	p_cdname __P((const u_char *, const u_char *, FILE *));
-const u_char *	p_fqnname __P((const u_char *, const u_char *,
-			       int, char *, int));
-const u_char *	p_fqname __P((const u_char *, const u_char *, FILE *));
-const char *	p_option __P((u_long));
-char *		p_secstodate __P((u_long));
-int		dn_count_labels __P((const char *));
-int		dn_comp __P((const char *, u_char *, int,
-			     u_char **, u_char **));
-int		dn_expand __P((const u_char *, const u_char *, const u_char *,
-			       char *, int));
-int		res_init __P((void));
-u_int		res_randomid __P((void));
-int		res_query __P((const char *, int, int, u_char *, int));
-int		res_search __P((const char *, int, int, u_char *, int));
-int		res_querydomain __P((const char *, const char *, int, int,
-				     u_char *, int));
-int		res_mkquery __P((int, const char *, int, int, const u_char *,
-				 int, const u_char *, u_char *, int));
-int		res_send __P((const u_char *, int, u_char *, int));
-int		res_isourserver __P((const struct sockaddr_in *));
-int		res_nameinquery __P((const char *, int, int,
-				     const u_char *, const u_char *));
-int		res_queriesmatch __P((const u_char *, const u_char *,
-				      const u_char *, const u_char *));
-void		res_close __P((void));
-const char *	p_section __P((int, int));
-/* XXX The following depend on the ns_updrec typedef in arpa/nameser.h */
-#ifdef _ARPA_NAMESER_H_
-int		res_update __P((ns_updrec *));
-int		res_mkupdate __P((ns_updrec *, u_char *, int));
-ns_updrec *	res_mkupdrec __P((int, const char *, u_int, u_int, u_long));
-void		res_freeupdrec __P((ns_updrec *));
-#endif
-__END_DECLS
-
-#endif /* !_RESOLV_H_ */
diff --git a/cpukit/libnetworking/rtems/issetugid.c b/cpukit/libnetworking/rtems/issetugid.c
deleted file mode 100644
index 3baf0ec88b..0000000000
--- a/cpukit/libnetworking/rtems/issetugid.c
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Dummy version of BSD routine
- *
- *  $Id$
- */
-
-int
-issetugid (void)
-{
-	return 0;
-}
diff --git a/cpukit/libnetworking/rtems/rtems_bootp.c b/cpukit/libnetworking/rtems/rtems_bootp.c
deleted file mode 100644
index 47e3db758f..0000000000
--- a/cpukit/libnetworking/rtems/rtems_bootp.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- *  $Id$
- */
-
-#include <rtems.h>
-#include <rtems/error.h>
-#include <sys/types.h>
-#include <rtems/rtems_bsdnet.h>
-
-/*
- * Perform a BOOTP request
- */
-void
-rtems_bsdnet_do_bootp (void)
-{
-	rtems_bsdnet_semaphore_obtain ();
-	bootpc_init ();
-	rtems_bsdnet_semaphore_release ();
-}
diff --git a/cpukit/libnetworking/rtems/rtems_bsdnet.h b/cpukit/libnetworking/rtems/rtems_bsdnet.h
deleted file mode 100644
index 73ad92fa30..0000000000
--- a/cpukit/libnetworking/rtems/rtems_bsdnet.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- *  $Id$
- */
-
-#ifndef _RTEMS_BSDNET_
-#define _RTEMS_BSDNET_
-
-#include <rtems.h>
-
-/*
- * Values that may be obtained by BOOTP
- */
-extern struct in_addr rtems_bsdnet_bootp_server_address;
-extern char *rtems_bsdnet_bootp_boot_file_name;
-
-/*
- * Manipulate routing tables
- */
-struct sockaddr;
-struct rtentry;
-int rtems_bsdnet_rtrequest (
-    int req,
-    struct sockaddr *dst,
-    struct sockaddr *gateway,
-    struct sockaddr *netmask,
-    int flags,
-    struct rtentry **net_nrt);
-
-/*
- * Diagnostics
- */
-void rtems_bsdnet_show_inet_routes (void);
-void rtems_bsdnet_show_mbuf_stats (void);
-void rtems_bsdnet_show_if_stats (void);
-void rtems_bsdnet_show_ip_stats (void);
-void rtems_bsdnet_show_icmp_stats (void);
-void rtems_bsdnet_show_udp_stats (void);
-void rtems_bsdnet_show_tcp_stats (void);
-
-/*
- * Network configuration
- */
-struct rtems_bsdnet_ifconfig {
-	/*
-	 * These two entries must be supplied for each interface.
-	 */
-	char		*name;
-	int		(*attach)(struct rtems_bsdnet_ifconfig *conf);
-
-	/*
-	 * Link to next interface
-	 */
-	struct rtems_bsdnet_ifconfig *next;
-
-	/*
-	 * The following entries may be obtained
-	 * from BOOTP or explicitily supplied.
-	 */
-	char		*ip_address;
-	char		*ip_netmask;
-	void		*hardware_address;
-
-	/*
-	 * The driver assigns defaults values to the following
-	 * entries if they are not explicitly supplied.
-	 */
-	int		ignore_broadcast;
-	int		mtu;
-	int		rbuf_count;
-	int		xbuf_count;
-
-	/*
-	 * For external ethernet controller board the following
-	 * parameters are needed
-	 */
-	unsigned int	port;   /* port of the board */
-	unsigned int	irno;   /* irq of the board */
-	unsigned int	bpar;   /* memory of the board */
-
-};
-
-struct rtems_bsdnet_config {
-	/*
-	 * This entry points to the head of the ifconfig chain.
-	 */
-	struct rtems_bsdnet_ifconfig *ifconfig;
-
-	/*
-	 * This entry should be rtems_bsdnet_do_bootp if BOOTP
-	 * is being used to configure the network, and NULL
-	 * if BOOTP is not being used.
-	 */
-	void			(*bootp)(void);
-
-	/*
-	 * The remaining items can be initialized to 0, in
-	 * which case the default value will be used.
-	 */
-	rtems_task_priority	network_task_priority;	/* 100		*/
-	unsigned long		mbuf_bytecount;		/* 64 kbytes	*/
-	unsigned long		mbuf_cluster_bytecount;	/* 128 kbytes	*/
-	char			*hostname;		/* BOOTP	*/
-	char			*domainname;		/* BOOTP	*/
-	char			*gateway;		/* BOOTP	*/
-	char			*log_host;		/* BOOTP	*/
-	char			*name_server[3];	/* BOOTP	*/
-};
-extern struct rtems_bsdnet_config rtems_bsdnet_config;
-int rtems_bsdnet_initialize_network (void);
-void rtems_bsdnet_do_bootp (void);
-
-#endif /* _RTEMS_BSDNET_ */
diff --git a/cpukit/libnetworking/rtems/rtems_bsdnet_internal.h b/cpukit/libnetworking/rtems/rtems_bsdnet_internal.h
deleted file mode 100644
index 559bafd4c5..0000000000
--- a/cpukit/libnetworking/rtems/rtems_bsdnet_internal.h
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * Declarations to fit FreeBSD to RTEMS.
- *
- *******************************************************************
- *                            WARNING                              *
- * This file should *never* be included by any application program *
- *******************************************************************
- *
- *  $Id$
- */
-
-#ifndef _RTEMS_BSDNET_INTERNAL_H_
-#define _RTEMS_BSDNET_INTERNAL_H_
-
-typedef	unsigned int		vm_offset_t;
-typedef	long long		vm_ooffset_t;
-typedef	unsigned int		vm_pindex_t;
-typedef	unsigned int		vm_size_t;
-
-#define _BSD_OFF_T_	rtems_signed32
-#define _BSD_PID_T_	rtems_id
-#define _BSD_VA_LIST_	char *
-
-/* make sure we get the network versions of these */
-#include "../machine/types.h"
-#include "../machine/param.h"
-
-#include <sys/time.h>
-struct  itimerval {
-  struct  timeval it_interval;
-  struct  timeval it_value;
-};
-struct mdproc {
-	int	md_flags;
-	int	*md_regs;
-};
-
-#define USHRT_MAX	65535
-
-/*
- * Other RTEMS/BSD glue
- */
-struct socket;
-extern void soconnsleep (struct socket *so);
-extern void soconnwakeup (struct socket *so);
-#define splnet()	0
-#define splimp()	0
-#define splx(_s)	do { (_s) = 0; } while(0)
-
-#define ovbcopy(f,t,n) bcopy(f,t,n)
-#define copyout(f,t,n) (memcpy(t,f,n),0)
-#define copyin(f,t,n) (memcpy(t,f,n),0)
-
-#define random()	rtems_bsdnet_random()
-#define panic	rtems_panic
-#define suser(a,b)	0
-
-void	microtime (struct timeval *tv);
-#define hz rtems_bsdnet_ticks_per_second
-#define tick rtems_bsdnet_microseconds_per_tick
-
-#define SHRT_MAX 65535
-
-#define log	rtems_bsdnet_log
-
-/*
- * Since we can't have two sys/types.h files, we'll hack around
- * and copy the contents of the BSD sys/types.h to here....
- */
-#include <sys/cdefs.h>
-
-typedef	u_int64_t	u_quad_t;	/* quads */
-typedef	int64_t		quad_t;
-typedef	quad_t *	qaddr_t;
-
-typedef void __sighandler_t __P((int));
-typedef	__sighandler_t	*sig_t;	/* type of pointer to a signal function */
-#define NSIG    32
-struct	sigaltstack {
-	char	*ss_sp;			/* signal stack base */
-	int	ss_size;		/* signal stack length */
-	int	ss_flags;		/* SS_DISABLE and/or SS_ONSTACK */
-};
-
-#ifdef KERNEL
-typedef	int		boolean_t;
-typedef	struct vm_page	*vm_page_t;
-#endif
-
-#ifndef _POSIX_SOURCE
-/*
- * minor() gives a cookie instead of an index since we don't want to
- * change the meanings of bits 0-15 or waste time and space shifting
- * bits 16-31 for devices that don't use them.
- */
-#define	major(x)	((int)(((u_int)(x) >> 8)&0xff))	/* major number */
-#define	minor(x)	((int)((x)&0xffff00ff))		/* minor number */
-#define	makedev(x,y)	((dev_t)(((x) << 8) | (y)))	/* create dev_t */
-#endif
-
-#include <machine/endian.h>
-
-typedef quad_t          rlim_t;         /* resource limit */
-typedef	u_int32_t	fixpt_t;	/* fixed point number */
-
-/*
- * Forward structure declarations for function prototypes.  We include the
- * common structures that cross subsystem boundaries here; others are mostly
- * used in the same place that the structure is defined.
- */
-struct	proc;
-struct	pgrp;
-struct	ucred;
-struct	rusage;
-struct	file;
-struct	buf;
-struct	tty;
-struct	uio;
-
-/*
- * Redo kernel memory allocation
- */
-#define malloc rtems_bsdnet_malloc
-#define free rtems_bsdnet_free
-
-#define	M_NOWAIT	0x0001
-void *rtems_bsdnet_malloc (unsigned long size, int type, int flags);
-void rtems_bsdnet_free (void *addr, int type);
-
-void rtems_bsdnet_semaphore_obtain (void);
-void rtems_bsdnet_semaphore_release (void);
-void rtems_bsdnet_schednetisr (int n);
-
-unsigned long rtems_bsdnet_seconds_since_boot (void);
-unsigned long rtems_bsdnet_random (void);
-
-rtems_id rtems_bsdnet_newproc (
-  char  *name,
-  int   stacksize,
-  void  (*entry)(void *),
-  void  *arg
-);
-
-rtems_status_code rtems_bsdnet_event_receive (
-  rtems_event_set  event_in,
-  rtems_option     option_set,
-  rtems_interval   ticks,
-  rtems_event_set *event_out
-);
-
-/*
- * Network configuration
- */
-extern int rtems_bsdnet_ticks_per_second;
-extern int rtems_bsdnet_microseconds_per_tick;
-extern struct in_addr rtems_bsdnet_log_host_address;
-extern char *rtems_bsdnet_domain_name;
-extern struct in_addr rtems_bsdnet_nameserver[];
-extern int rtems_bsdnet_nameserver_count;
-
-/*
- * Internal IOCTL command
- */
-#define SIO_RTEMS_SHOW_STATS	_IO('i', 250)
-
-/*
- * Some extra prototypes
- */
-int sethostname (char *name, int namelen);
-void domaininit (void *);
-void ifinit (void *);
-void ipintr (void);
-void arpintr (void);
-void bootpc_init(void);
-int socket (int, int, int);
-int ioctl (int, unsigned long, ...);
-
-#endif /* _RTEMS_BSDNET_INTERNAL_H_ */
diff --git a/cpukit/libnetworking/rtems/rtems_glue.c b/cpukit/libnetworking/rtems/rtems_glue.c
deleted file mode 100644
index dd80a13d08..0000000000
--- a/cpukit/libnetworking/rtems/rtems_glue.c
+++ /dev/null
@@ -1,905 +0,0 @@
-/*
- *  $Id$
- */
-
-#include <string.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <errno.h>
-
-#include <rtems.h>
-#include <rtems/libio.h>
-#include <rtems/error.h>
-#include <rtems/rtems_bsdnet.h>
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/domain.h>
-#include <sys/mbuf.h>
-#include <sys/socketvar.h>
-#include <sys/socket.h>
-#include <sys/sockio.h>
-#include <sys/callout.h>
-#include <sys/proc.h>
-#include <sys/ioctl.h>
-#include <net/if.h>
-#include <net/route.h>
-#include <netinet/in.h>
-#include <vm/vm.h>
-#include <arpa/inet.h>
-
-#include <net/netisr.h>
-#include <net/route.h>
-
-/*
- * Events used by networking routines.
- * Everything will break if the application
- * tries to use these events or if the `sleep'
- * events are equal to any of the NETISR * events.
- */
-#define SBWAIT_EVENT	RTEMS_EVENT_24
-#define SOSLEEP_EVENT	RTEMS_EVENT_25
-#define NETISR_IP_EVENT		(1 << NETISR_IP)
-#define NETISR_ARP_EVENT	(1 << NETISR_ARP)
-#define NETISR_EVENTS	(NETISR_IP_EVENT|NETISR_ARP_EVENT)
-
-
-/*
- * Memory allocation
- */
-static int nmbuf	= (64 * 1024) / MSIZE;
-       int nmbclusters	= (128 * 1024) / MCLBYTES;
-
-/*
- * Socket buffering parameters
- */
-unsigned long sb_efficiency = 8;
-
-/*
- * Network task synchronization
- */
-static rtems_id networkSemaphore;
-static rtems_id networkDaemonTid;
-static rtems_unsigned32 networkDaemonPriority;
-static void networkDaemon (void *task_argument);
-
-/*
- * Network timing
- */
-int			rtems_bsdnet_ticks_per_second;
-int			rtems_bsdnet_microseconds_per_tick;
-
-/*
- * Callout processing
- */
-static rtems_interval	ticksWhenCalloutsLastChecked;
-static struct callout *callfree, calltodo;
-
-/*
- * FreeBSD variables
- */
-int nfs_diskless_valid;
-
-/*
- * BOOTP values
- */
-struct in_addr rtems_bsdnet_log_host_address;
-struct in_addr rtems_bsdnet_bootp_server_address;
-char *rtems_bsdnet_bootp_boot_file_name;
-char *rtems_bsdnet_domain_name;
-struct in_addr rtems_bsdnet_nameserver[sizeof rtems_bsdnet_config.name_server /
-			sizeof rtems_bsdnet_config.name_server[0]];
-int rtems_bsdnet_nameserver_count;
-
-extern rtems_libio_handler_t rtems_bsdnet_io_handler;
-
-/*
- * Perform FreeBSD memory allocation.
- * FIXME: This should be modified to keep memory allocation statistics.
- */
-#undef malloc
-#undef free
-extern void *malloc (size_t);
-extern void free (void *);
-void *
-rtems_bsdnet_malloc (unsigned long size, int type, int flags)
-{
-	void *p;
-
-	for (;;) {
-		p = malloc (size);
-		if (p)
-			return p;
-		if (flags & M_NOWAIT)
-			return p;
-		/*
-		 * FIXME: This should be redone as:
-		 * static volatile int rtems_bsdnet_need_memory;
-		 *     
-		 *	rtems_bsdnet_need_memory = 1;
-		 *	message_queue_receive
-		 *
-		 * Then in rtems_bsdnet_freee:
-		 *	free (....);
-		 *	if (rtems_bsdnet_need_memory)
-		 *		rtems_bsdnet_need_memory = 0;
-		 *		message_queue_broadcast
-		 */
-		rtems_task_wake_after (rtems_bsdnet_ticks_per_second);
-	}
-}
-
-/*
- * Free FreeBSD memory
- * FIXME: This should be modified to keep memory allocation statistics.
- */
-void
-rtems_bsdnet_free (void *addr, int type)
-{
-	free (addr);
-}
-
-/*
- * Do the initializations required by the BSD code
- * FIXME: Maybe we should use a different memory allocation scheme that
- * would let us share space between mbufs and mbuf clusters.
- * For now, we'll just take the easy way out!
- */
-static void
-bsd_init ()
-{
-	/*
-	 * Set up mbuf data strutures
-	 * Cluster allocation *must* come first -- see comment on kmem_malloc().
-	 */
-	m_clalloc (nmbclusters, M_DONTWAIT);
-	mclrefcnt = malloc (nmbclusters);
-	if (mclrefcnt == NULL)
-		rtems_panic ("No memory for mbuf cluster reference counts.");
-	memset (mclrefcnt, '\0', nmbclusters);
-	m_mballoc (nmbuf, M_DONTWAIT);
-	mbstat.m_mtypes[MT_FREE] = nmbuf;
-
-
-	/*
-	 * Set up domains
-	 */
-	{
-	extern struct domain routedomain;
-	extern struct domain inetdomain;
-
-	routedomain.dom_next = domains;
-	domains = &routedomain;
-	inetdomain.dom_next = domains;
-	domains = &inetdomain;
-	domaininit (NULL);
-	}
-
-	/*
-	 * Set up interfaces
-	 */
-	ifinit (NULL);
-}
-
-/*
- * Initialize and start network operations
- */
-static void
-rtems_bsdnet_initialize (void)
-{
-	rtems_status_code sc;
-
-	/*
-	 * Set the priority of all network tasks
-	 */
-	if (rtems_bsdnet_config.network_task_priority == 0)
-		networkDaemonPriority = 100;
-	else
-		networkDaemonPriority = rtems_bsdnet_config.network_task_priority;
-
-	/*
-	 * Set the memory allocation limits
-	 */
-	if (rtems_bsdnet_config.mbuf_bytecount)
-		nmbuf = rtems_bsdnet_config.mbuf_bytecount / MSIZE;
-	if (rtems_bsdnet_config.mbuf_cluster_bytecount)
-		nmbclusters = rtems_bsdnet_config.mbuf_cluster_bytecount / MCLBYTES;
-
-	/*
-	 * Create the task-synchronization semaphore
-	 */
-	sc = rtems_semaphore_create (rtems_build_name('B', 'S', 'D', 'n'),
-					0,
-					RTEMS_FIFO |
-						RTEMS_BINARY_SEMAPHORE |
-						RTEMS_NO_INHERIT_PRIORITY |
-						RTEMS_NO_PRIORITY_CEILING |
-						RTEMS_LOCAL,
-					0,
-					&networkSemaphore);
-	if (sc != RTEMS_SUCCESSFUL)
-		rtems_panic ("Can't create network seamphore: `%s'\n", rtems_status_text (sc));
-
-	/*
-	 * Compute clock tick conversion factors
-	 */
-	rtems_clock_get (RTEMS_CLOCK_GET_TICKS_PER_SECOND, &rtems_bsdnet_ticks_per_second);
-	if (rtems_bsdnet_ticks_per_second <= 0)
-		rtems_bsdnet_ticks_per_second = 1;
-	rtems_bsdnet_microseconds_per_tick = 1000000 / rtems_bsdnet_ticks_per_second;
-
-	/*
-	 * Ensure that `seconds' is greater than 0
-	 */
-	rtems_task_wake_after (rtems_bsdnet_ticks_per_second);
-
-	/*
-	 * Set up BSD-style sockets
-	 */
-	bsd_init ();
-
-	/*
-	 * Start network daemon
-	 */
-	networkDaemonTid = rtems_bsdnet_newproc ("ntwk", 4096, networkDaemon, NULL);
-
-	/*
-	 * Register as an external I/O handler
-	 */
-	rtems_register_libio_handler (RTEMS_FILE_DESCRIPTOR_TYPE_SOCKET,
-						&rtems_bsdnet_io_handler);
-
-	/*
-	 * Let other network tasks begin
-	 */
-	rtems_bsdnet_semaphore_release ();
-}
-
-rtems_id TaskWithSemaphore;
-/*
- * Obtain network mutex
- */
-void
-rtems_bsdnet_semaphore_obtain (void)
-{
-	rtems_status_code sc;
-
-	sc = rtems_semaphore_obtain (networkSemaphore, RTEMS_WAIT, RTEMS_NO_TIMEOUT);
-rtems_task_ident (RTEMS_SELF, 0, &TaskWithSemaphore);
-	if (sc != RTEMS_SUCCESSFUL)
-		rtems_panic ("Can't obtain network semaphore: `%s'\n", rtems_status_text (sc));
-}
-
-/*
- * Release network mutex
- */
-void
-rtems_bsdnet_semaphore_release (void)
-{
-	rtems_status_code sc;
-
-TaskWithSemaphore = 0;
-	sc = rtems_semaphore_release (networkSemaphore);
-	if (sc != RTEMS_SUCCESSFUL)
-		rtems_panic ("Can't release network semaphore: `%s'\n", rtems_status_text (sc));
-										}
-
-/*
- * Wait for something to happen to a socket buffer
- */
-int
-sbwait(sb)
-	struct sockbuf *sb;
-{
-	rtems_event_set events;
-	rtems_id tid;
-	rtems_status_code sc;
-
-	/*
-	 * Soak up any pending events.
-	 * The sleep/wakeup synchronization in the FreeBSD
-	 * kernel has no memory.
-	 */
-	rtems_event_receive (SBWAIT_EVENT, RTEMS_EVENT_ANY | RTEMS_NO_WAIT, RTEMS_NO_TIMEOUT, &events); 
-
-	/*
-	 * Set this task as the target of the wakeup operation.
-	 */
-	if (sb->sb_sel.si_pid)
-		rtems_panic ("Another task is already sleeping on that socket buffer");
-	rtems_task_ident (RTEMS_SELF, 0, &tid);
-	sb->sb_sel.si_pid = tid;
-
-	/*
-	 * Mark the socket buffer as waiting.
-	 */
-	sb->sb_flags |= SB_WAIT;
-
-	/*
-	 * Release the network semaphore.
-	 */
-	rtems_bsdnet_semaphore_release ();
-
-	/*
-	 * Wait for the wakeup event.
-	 */
-	sc = rtems_event_receive (SBWAIT_EVENT, RTEMS_EVENT_ANY | RTEMS_WAIT, sb->sb_timeo, &events);
-
-	/*
-	 * Reobtain the network semaphore.
-	 */
-	rtems_bsdnet_semaphore_obtain ();
-
-	/*
-	 * Relinquish ownership of the socket buffer
-	 */
-	sb->sb_flags &= ~SB_WAIT;
-	sb->sb_sel.si_pid = 0;
-
-	/*
-	 * Return the status of the wait.
-	 */
-	switch (sc) {
-	case RTEMS_SUCCESSFUL:	return 0;
-	case RTEMS_TIMEOUT:	return EWOULDBLOCK;
-	default:		return ENXIO;
-	}
-}
-
-
-/*
- * Wake up the task waiting on a socket buffer.
- */
-void
-sowakeup(so, sb)
-	register struct socket *so;
-	register struct sockbuf *sb;
-{
-	if (sb->sb_flags & SB_WAIT) {
-		sb->sb_flags &= ~SB_WAIT;
-		rtems_event_send (sb->sb_sel.si_pid, SBWAIT_EVENT);
-	}
-}
-
-/*
- * For now, a socket can be used by only one task at a time.
- */
-int
-sb_lock(sb)
-	register struct sockbuf *sb;
-{
-	rtems_panic ("Socket buffer is already in use.");
-	return 0;
-}
-void
-wakeup (void *p)
-{
-	rtems_panic ("Wakeup called");
-}
-
-/*
- * Wait for a connection/disconnection event.
- */
-void
-soconnsleep (struct socket *so)
-{
-	rtems_event_set events;
-	rtems_id tid;
-
-	/*
-	 * Soak up any pending events.
-	 * The sleep/wakeup synchronization in the FreeBSD
-	 * kernel has no memory.
-	 */
-	rtems_event_receive (SOSLEEP_EVENT, RTEMS_EVENT_ANY | RTEMS_NO_WAIT, RTEMS_NO_TIMEOUT, &events); 
-
-	/*
-	 * Set this task as the target of the wakeup operation.
-	 */
-	if (so->so_pgid)
-		rtems_panic ("Another task is already sleeping on that socket");
-	rtems_task_ident (RTEMS_SELF, 0, &tid);
-	so->so_pgid = tid;
-
-	/*
-	 * Wait for the wakeup event.
-	 */
-	rtems_bsdnet_event_receive (SOSLEEP_EVENT, RTEMS_EVENT_ANY | RTEMS_WAIT, RTEMS_NO_TIMEOUT, &events);
-
-	/*
-	 * Relinquish ownership of the socket.
-	 */
-	so->so_pgid = 0;
-}
-
-/*
- * Wake up a task waiting for a connection/disconnection to complete.
- */
-void
-soconnwakeup (struct socket *so)
-{
-	if (so->so_pgid)
-		rtems_event_send (so->so_pgid, SOSLEEP_EVENT);
-}
-
-/*
- * Send an event to the network daemon.
- * This corresponds to sending a software interrupt in the BSD kernel.
- */
-void
-rtems_bsdnet_schednetisr (int n)
-{
-	rtems_event_send (networkDaemonTid, 1 << n);
-}
-
-/*
- * The network daemon
- * This provides a context to run BSD software interrupts
- */
-static void
-networkDaemon (void *task_argument)
-{
-	rtems_event_set events;
-	rtems_interval now;
-	int ticksPassed;
-	unsigned32 timeout;
-	struct callout *c;
-
-	for (;;) {
-		c = calltodo.c_next;
-		if (c)
-			timeout = c->c_time;
-		else
-			timeout = RTEMS_NO_TIMEOUT;
-		rtems_bsdnet_event_receive (NETISR_EVENTS,
-						RTEMS_EVENT_ANY | RTEMS_WAIT,
-						timeout,
-						&events);
-		if (events & NETISR_IP_EVENT)
-			ipintr ();
-		if (events & NETISR_ARP_EVENT)
-			arpintr ();
-		rtems_clock_get (RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &now);
-		ticksPassed = now - ticksWhenCalloutsLastChecked;
-		if (ticksPassed != 0) {
-			ticksWhenCalloutsLastChecked = now;
-			
-			c = calltodo.c_next;
-			if (c) {
-				c->c_time -= ticksPassed;
-				while ((c = calltodo.c_next) != NULL && c->c_time <= 0) {
-					void *arg;
-					void (*func) (void *);
-
-					func = c->c_func;
-					arg = c->c_arg;
-					calltodo.c_next = c->c_next;
-					c->c_next = callfree;
-					callfree = c;
-					(*func)(arg);
-				}
-			}
-		}
-	}
-}
-
-/*
- * Structure passed to task-start stub
- */
-struct newtask {
-	void (*entry)(void *);
-	void *arg;
-};
-
-/*
- * Task-start stub
- */
-static void
-taskEntry (rtems_task_argument arg)
-{
-	struct newtask t;
-	
-	/*
-	 * Pick up task information and free
-	 * the memory allocated to pass the
-	 * information to this task.
-	 */
-	t = *(struct newtask *)arg;
-	free ((struct newtask *)arg);
-
-	/*
-	 * Enter the competition for the network semaphore
-	 */
-	rtems_bsdnet_semaphore_obtain ();
-
-	/*
-	 * Enter the task
-	 */
-	(*t.entry)(t.arg);
-	rtems_panic ("Network task returned!\n");
-}
-
-/*
- * Start a network task
- */
-rtems_id
-rtems_bsdnet_newproc (char *name, int stacksize, void(*entry)(void *), void *arg)
-{
-	struct newtask *t;
-	char nm[4];
-	rtems_id tid;
-	rtems_status_code sc;
-
-	strncpy (nm, name, 4);
-	sc = rtems_task_create (rtems_build_name(nm[0], nm[1], nm[2], nm[3]),
-		networkDaemonPriority,
-		stacksize,
-		RTEMS_PREEMPT|RTEMS_NO_TIMESLICE|RTEMS_NO_ASR|RTEMS_INTERRUPT_LEVEL(0),
-		RTEMS_NO_FLOATING_POINT|RTEMS_LOCAL,
-		&tid);
-	if (sc != RTEMS_SUCCESSFUL)
-		rtems_panic ("Can't create network daemon `%s': `%s'\n", name, rtems_status_text (sc));
-
-	/*
-	 * Set up task arguments
-	 */
-	t = malloc (sizeof *t);
-	t->entry = entry;
-	t->arg = arg;
-
-	/*
-	 * Start the task
-	 */
-	sc = rtems_task_start (tid, taskEntry, (rtems_task_argument)t);
-	if (sc != RTEMS_SUCCESSFUL)
-		rtems_panic ("Can't start network daemon `%s': `%s'\n", name, rtems_status_text (sc));
-
-	/*
-	 * Let our caller know the i.d. of the new task
-	 */
-	return tid;
-}
-
-rtems_status_code rtems_bsdnet_event_receive (
-  rtems_event_set  event_in,
-  rtems_option     option_set,
-  rtems_interval   ticks,
-  rtems_event_set *event_out)
-{
-	rtems_status_code sc;
-
-	rtems_bsdnet_semaphore_release ();
-	sc = rtems_event_receive (event_in, option_set, ticks, event_out);
-	rtems_bsdnet_semaphore_obtain ();
-	return sc;
-}
-
-/*
- * Return time since startup
- */
-void
-microtime (struct timeval *t)
-{
-	rtems_interval now;
-
-	rtems_clock_get (RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &now);
-	t->tv_sec = now / rtems_bsdnet_ticks_per_second;
-	t->tv_usec = (now % rtems_bsdnet_ticks_per_second) * rtems_bsdnet_microseconds_per_tick;
-}
-
-unsigned long
-rtems_bsdnet_seconds_since_boot (void)
-{
-	rtems_interval now;
-
-	rtems_clock_get (RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &now);
-	return now / rtems_bsdnet_ticks_per_second;
-}
-
-/*
- * Fake random number generator
- */
-unsigned long
-rtems_bsdnet_random (void)
-{
-	rtems_interval now;
-
-	rtems_clock_get (RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &now);
-	return (now * 99991);
-}
-
-/*
- * Callout list processing
- */
-void
-timeout(void (*ftn)(void *), void *arg, int ticks)
-{
-	register struct callout *new, *p, *t;
-
-	if (ticks <= 0)
-		ticks = 1;
-
-	/* Fill in the next free callout structure. */
-	if (callfree == NULL) {
-		callfree = malloc (sizeof *callfree);
-		if (callfree == NULL)
-			rtems_panic ("No memory for timeout table entry");
-		callfree->c_next = NULL;
-	}
-
-	new = callfree;
-	callfree = new->c_next;
-	new->c_arg = arg;
-	new->c_func = ftn;
-
-	/*
-	 * The time for each event is stored as a difference from the time
-	 * of the previous event on the queue.  Walk the queue, correcting
-	 * the ticks argument for queue entries passed.  Correct the ticks
-	 * value for the queue entry immediately after the insertion point
-	 * as well.  Watch out for negative c_time values; these represent
-	 * overdue events.
-	 */
-	for (p = &calltodo;
-	    (t = p->c_next) != NULL && ticks > t->c_time; p = t)
-		if (t->c_time > 0)
-			ticks -= t->c_time;
-	new->c_time = ticks;
-	if (t != NULL)
-		t->c_time -= ticks;
-
-	/* Insert the new entry into the queue. */
-	p->c_next = new;
-	new->c_next = t;
-}
-
-/*
- * Ticks till specified time
- * FIXME: This version worries only about seconds, but that's good
- * enough for the way the network code uses this routine.
- */
-int
-hzto(struct timeval *tv)
-{
-	long diff = tv->tv_sec - rtems_bsdnet_seconds_since_boot();
-
-	if (diff <= 0)
-		return 1;
-	return diff * rtems_bsdnet_ticks_per_second;
-}
-
-/*
- * Kernel debugging
- */
-int rtems_bsdnet_log_priority;
-void
-rtems_bsdnet_log (int priority, const char *fmt, ...)
-{
-	va_list args;
-	
-	if (priority & rtems_bsdnet_log_priority) {
-		va_start (args, fmt);
-		vprintf (fmt, args);
-		va_end (args);
-	}
-}
-
-/*
- * Hack alert: kmem_malloc `knows' that its
- * first invocation is to get mbuf clusters!
- */
-int mb_map_full;
-vm_map_t mb_map;
-vm_offset_t
-kmem_malloc (vm_map_t *map, vm_size_t size, boolean_t waitflag)
-{
-	void *p;
-	
-	/*
-	 * Can't get memory if we're already running.
-	 */
-	if (networkDaemonTid) {
-		if (waitflag == M_WAITOK)
-			rtems_panic (
-"Network mbuf space can not be enlarged after rtems_bsdnet_initialize() has\n"
-"returned.  Enlarge the initial mbuf/cluster size in rtems_bsdnet_config.");
-		return 0;
-	}
-
-#define ROUNDSIZE 2048
-	p = malloc (size+ROUNDSIZE);
-	p = (void *)((unsigned long)p & ~(ROUNDSIZE-1));
-	if ((p == NULL) && (waitflag == M_WAITOK))
-		rtems_panic ("Can't get initial network memory!");
-	if (mbutl == NULL)
-		mbutl = p;
-	return (vm_offset_t)p;
-}
-
-/*
- * IP header checksum routine for processors which don't have an inline version
- */
-u_int
-in_cksum_hdr (const void *ip)
-{
-	rtems_unsigned32 sum;
-	const rtems_unsigned16 *sp;
-	int i;
-
-	sum = 0;
-	sp = (rtems_unsigned16 *)ip;
-	for (i = 0 ; i < 10 ; i++)
-		sum += *sp++;
-	while (sum > 0xFFFF)
-		sum = (sum & 0xffff) + (sum >> 16);
-	return ~sum & 0xFFFF;
-}
-
-/*
- * Manipulate routing tables
- */
-int rtems_bsdnet_rtrequest (
-    int req,
-    struct sockaddr *dst,
-    struct sockaddr *gateway,
-    struct sockaddr *netmask,
-    int flags,
-    struct rtentry **net_nrt)
-{
-	int error;
-
-	rtems_bsdnet_semaphore_obtain ();
-	error = rtrequest (req, dst, gateway, netmask, flags, net_nrt);
-	rtems_bsdnet_semaphore_release ();
-	if (error) {
-		errno = error;
-		return -1;
-	}
-	return 0;
-}
-
-static void
-rtems_bsdnet_setup (void)
-{
-	struct rtems_bsdnet_ifconfig *ifp;
-	int s;
-	struct ifreq ifreq;
-	struct sockaddr_in address;
-	struct sockaddr_in netmask;
-	struct sockaddr_in broadcast;
-	struct sockaddr_in gateway;
-	int i;
-
-	/*
-	 * Set local parameters
-	 */
-	if (rtems_bsdnet_config.hostname)
-		sethostname (rtems_bsdnet_config.hostname,
-					strlen (rtems_bsdnet_config.hostname));
-	if (rtems_bsdnet_config.domainname)
-		rtems_bsdnet_domain_name =
-					strdup (rtems_bsdnet_config.domainname);
-	if (rtems_bsdnet_config.log_host)
-		rtems_bsdnet_log_host_address.s_addr =
-				inet_addr (rtems_bsdnet_config.log_host);
-	for (i = 0 ; i < sizeof rtems_bsdnet_config.name_server /
-			sizeof rtems_bsdnet_config.name_server[0] ; i++) {
-		if (!rtems_bsdnet_config.name_server[i])
-			break;
-		rtems_bsdnet_nameserver[rtems_bsdnet_nameserver_count++].s_addr
-			= inet_addr (rtems_bsdnet_config.name_server[i]);
-	}
-
-	/*
-	 * Configure interfaces
-	 */
-	s = socket (AF_INET, SOCK_DGRAM, 0);
-	if (s < 0)
-		rtems_panic ("Can't create initial socket: %s", strerror (errno));
-	for (ifp = rtems_bsdnet_config.ifconfig ; ifp ; ifp = ifp->next) {
-		if (ifp->ip_address == NULL)
-			continue;
-
-		/*
-		 * Get the interface flags
-		 */
-		strcpy (ifreq.ifr_name, ifp->name);
-		if (ioctl (s, SIOCGIFFLAGS, &ifreq) < 0)
-			rtems_panic ("Can't get %s flags: %s", ifp->name, strerror (errno));
-
-		/*
-		 * Bring interface up
-		 */
-		ifreq.ifr_flags |= IFF_UP;
-		if (ioctl (s, SIOCSIFFLAGS, &ifreq) < 0)
-			rtems_panic ("Can't bring %s up: %s", ifp->name, strerror (errno));
-
-		/*
-		 * Set interface netmask
-		 */
-		memset (&netmask, '\0', sizeof netmask);
-		netmask.sin_len = sizeof netmask;
-		netmask.sin_family = AF_INET;
-		netmask.sin_addr.s_addr = inet_addr (ifp->ip_netmask);
-		memcpy (&ifreq.ifr_addr, &netmask, sizeof netmask);
-		if (ioctl (s, SIOCSIFNETMASK, &ifreq) < 0)
-			rtems_panic ("Can't set %s netmask: %s", ifp->name, strerror (errno));
-
-		/*
-		 * Set interface address
-		 */
-		memset (&address, '\0', sizeof address);
-		address.sin_len = sizeof address;
-		address.sin_family = AF_INET;
-		address.sin_addr.s_addr = inet_addr (ifp->ip_address);
-		memcpy (&ifreq.ifr_addr, &address, sizeof address);
-		if (ioctl (s, SIOCSIFADDR, &ifreq) < 0)
-			rtems_panic ("Can't set %s address: %s", ifp->name, strerror (errno));
-
-		/*
-		 * Set interface broadcast address
-		 */
-		memset (&broadcast, '\0', sizeof broadcast);
-		broadcast.sin_len = sizeof broadcast;
-		broadcast.sin_family = AF_INET;
-		broadcast.sin_addr.s_addr = address.sin_addr.s_addr | ~netmask.sin_addr.s_addr;
-		memcpy (&ifreq.ifr_broadaddr, &broadcast, sizeof broadcast);
-		if (ioctl (s, SIOCSIFBRDADDR, &ifreq) < 0)
-			rtems_panic ("Can't set %s broadcast address: %s", ifp->name, strerror (errno));
-	}
-
-	/*
-	 * We're done with the dummy socket
-	 */
-	close (s);
-
-	/*
-	 * Set default route
-	 */
-	if (rtems_bsdnet_config.gateway) {
-		address.sin_addr.s_addr = INADDR_ANY;
-		netmask.sin_addr.s_addr = INADDR_ANY;
-		memset (&gateway, '\0', sizeof gateway);
-		gateway.sin_len = sizeof gateway;
-		gateway.sin_family = AF_INET;
-		gateway.sin_addr.s_addr = inet_addr (rtems_bsdnet_config.gateway);
-		if (rtems_bsdnet_rtrequest (
-				RTM_ADD, 
-				(struct sockaddr *)&address,
-				(struct sockaddr *)&gateway,
-				(struct sockaddr *)&netmask,
-				(RTF_UP | RTF_GATEWAY | RTF_STATIC), NULL) < 0)
-			rtems_panic ("Can't set default route: %s", strerror (errno));
-	}
-}
-
-/*
- * Initialize the network
- */
-int
-rtems_bsdnet_initialize_network (void)
-{
-	struct rtems_bsdnet_ifconfig *ifp;
-
-	/*
-	 * Start network tasks.
-	 * Initialize BSD network data structures.
-	 */
-	rtems_bsdnet_initialize ();
-
-	/*
-	 * Attach interfaces
-	 */
-	for (ifp = rtems_bsdnet_config.ifconfig ; ifp ; ifp = ifp->next) {
-		rtems_bsdnet_semaphore_obtain ();
-		(ifp->attach)(ifp);
-		rtems_bsdnet_semaphore_release ();
-	}
-
-	/*
-	 * Bring up the network
-	 */
-	rtems_bsdnet_setup ();
-	if (rtems_bsdnet_config.bootp)
-		(*rtems_bsdnet_config.bootp)();
-	return 0;
-}
diff --git a/cpukit/libnetworking/rtems/rtems_showicmpstat.c b/cpukit/libnetworking/rtems/rtems_showicmpstat.c
deleted file mode 100644
index 1faea2512b..0000000000
--- a/cpukit/libnetworking/rtems/rtems_showicmpstat.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- *  $Id$
- */
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/sysctl.h>
-#include <sys/proc.h>
-#include <sys/mbuf.h>
-#include <netinet/in_systm.h>
-#include <netinet/in.h>
-#include <netinet/ip.h>
-#include <netinet/ip_icmp.h>
-#include <netinet/icmp_var.h>
-
-/*
- * Display ICMP statistics
- * Don't lock the rest of the network tasks out while printing.
- * It's no big deal if the values change while being printed.
- */
-static void
-showicmpstat (const char *name, unsigned long n)
-{
-	if (n)
-		printf ("%35s%12lu\n", name, n);
-}
-
-void
-rtems_bsdnet_show_icmp_stats (void)
-{
-	int i;
-	char cbuf[20];
-
-	printf ("************ ICMP Statistics ************\n");
-	showicmpstat ("Calls to icmp_error()", icmpstat.icps_error);
-	showicmpstat ("Errors not sent -- old was icmp", icmpstat.icps_oldicmp);
-	for (i = 0 ; i <= ICMP_MAXTYPE ; i++) {
-		if (icmpstat.icps_outhist[i]) {
-			sprintf (cbuf, "Type %d sent", i);
-			showicmpstat (cbuf, icmpstat.icps_outhist[i]);
-		}
-	}
-	showicmpstat ("icmp_code out of range", icmpstat.icps_badcode);
-	showicmpstat ("packet < ICMP_MINLEN", icmpstat.icps_tooshort);
-	showicmpstat ("bad checksum", icmpstat.icps_checksum);
-	showicmpstat ("calculated bound mismatch", icmpstat.icps_badlen);
-	showicmpstat ("number of responses", icmpstat.icps_reflect);
-	showicmpstat ("b/mcast echo requests dropped", icmpstat.icps_bmcastecho);
-	showicmpstat ("b/mcast tstamp requests dropped", icmpstat.icps_bmcasttstamp);
-	for (i = 0 ; i <= ICMP_MAXTYPE ; i++) {
-		if (icmpstat.icps_inhist[i]) {
-			sprintf (cbuf, "Type %d received", i);
-			showicmpstat (cbuf, icmpstat.icps_inhist[i]);
-		}
-	}
-
-	printf ("\n");
-}
diff --git a/cpukit/libnetworking/rtems/rtems_showifstat.c b/cpukit/libnetworking/rtems/rtems_showifstat.c
deleted file mode 100644
index 9f9efc5ac2..0000000000
--- a/cpukit/libnetworking/rtems/rtems_showifstat.c
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- *  $Id$
- */
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/sysctl.h>
-#include <sys/proc.h>
-#include <sys/socket.h>
-#include <sys/ioctl.h>
-#include <net/if.h>
-#include <netinet/in.h>
-
-/*
- * Display an address
- */
-static int
-showaddress (char *name, struct sockaddr *a)
-{
-	struct sockaddr_in *sa;
-
-	if (!a || (a->sa_family != AF_INET))
-		return 0;
-	printf ("%s:", name);
-	sa = (struct sockaddr_in *)a;
-	printf ("%-16s", inet_ntoa (sa->sin_addr));
-	return 1;
-}
-
-/*
- * Display interface statistics
- */
-void
-rtems_bsdnet_show_if_stats (void)
-{
-	struct ifnet *ifp;
-	struct ifaddr *ifa;
-	unsigned int bit, flags;
-	int printed;
-
-	printf ("************ INTERFACE STATISTICS ************\n");
-	for (ifp = ifnet; ifp; ifp = ifp->if_next) {
-		printf ("***** %s%d *****\n", ifp->if_name, ifp->if_unit);
-		for (ifa = ifp->if_addrlist ; ifa ; ifa = ifa->ifa_next) {
-			printed = showaddress ("Address", ifa->ifa_addr);
-			if (ifp->if_flags & IFF_BROADCAST)
-				printed |= showaddress ("Broadcast Address", ifa->ifa_broadaddr);
-			if (ifp->if_flags & IFF_POINTOPOINT)
-				printed |= showaddress ("Destination Address", ifa->ifa_dstaddr);
-			printed |= showaddress ("Net mask", ifa->ifa_netmask);
-			if (printed)
-				printf ("\n");
-		}
-
-		printf ("Flags:");
-		for (bit = 1, flags = ifp->if_flags ; flags ; bit <<= 1) {
-			char *cp;
-			switch (flags & bit) {
-			default:		cp = NULL;		break;
-			case IFF_UP:		cp = "Up";		break;
-			case IFF_BROADCAST:	cp = "Broadcast";	break;
-			case IFF_DEBUG:		cp = "Debug";		break;
-			case IFF_LOOPBACK:	cp = "Loopback";	break;
-			case IFF_POINTOPOINT:	cp = "Point-to-point";	break;
-			case IFF_RUNNING:	cp = "Running";		break;
-			case IFF_NOARP:		cp = "No-ARP";		break;
-			case IFF_PROMISC:	cp = "Promiscuous";	break;
-			case IFF_ALLMULTI:	cp = "All-multicast";	break;
-			case IFF_OACTIVE:	cp = "Active";		break;
-			case IFF_SIMPLEX:	cp = "Simplex";		break;
-			case IFF_LINK0:		cp = "Link0";		break;
-			case IFF_LINK1:		cp = "Link1";		break;
-			case IFF_LINK2:		cp = "Link2";		break;
-			case IFF_MULTICAST:	cp = "Multicast";	break;
-			}
-			if (cp) {
-				flags &= ~bit;
-				printf (" %s", cp);
-			}
-		}
-		printf ("\n");
-
-		printf ("Send queue limit:%-4d length:%-4d Dropped:%-8d\n",
-							ifp->if_snd.ifq_maxlen,
-							ifp->if_snd.ifq_len,
-							ifp->if_snd.ifq_drops);
-
-		/*
-		 * FIXME: Could print if_data statistics here,
-		 *        but right now the drivers maintain their
-		 *        own statistics.
-		 */
-
-		/*
-		 * Grab the network semaphore.
-		 * In most cases this is not necessary, but it's
-		 * easier to always call the driver ioctl function
-		 * while holding the semaphore than to try
-		 * and explain why some ioctl commands are invoked
-		 * while holding the semaphore and others are
-		 * invoked while not holding the semaphore.
-		 */
-		rtems_bsdnet_semaphore_obtain ();
-		(*ifp->if_ioctl)(ifp, SIO_RTEMS_SHOW_STATS, NULL);
-		rtems_bsdnet_semaphore_release ();
-	}
-	printf ("\n");
-}
diff --git a/cpukit/libnetworking/rtems/rtems_showipstat.c b/cpukit/libnetworking/rtems/rtems_showipstat.c
deleted file mode 100644
index 2dd499a8c0..0000000000
--- a/cpukit/libnetworking/rtems/rtems_showipstat.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- *  $Id$
- */
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/sysctl.h>
-#include <sys/proc.h>
-#include <sys/mbuf.h>
-#include <netinet/in_systm.h>
-#include <netinet/in.h>
-#include <netinet/ip.h>
-#include <netinet/ip_var.h>
-
-/*
- * Display IP statistics
- * Don't lock the rest of the network tasks out while printing.
- * It's no big deal if the values change while being printed.
- */
-static void
-showipstat (const char *name, unsigned long n)
-{
-	if (n)
-		printf ("%35s%12lu\n", name, n);
-}
-
-void
-rtems_bsdnet_show_ip_stats (void)
-{
-	printf ("************ IP Statistics ************\n");
-	showipstat ("total packets received", ipstat.ips_total);
-	showipstat ("checksum bad", ipstat.ips_badsum);
-	showipstat ("packet too short", ipstat.ips_tooshort);
-	showipstat ("not enough data", ipstat.ips_toosmall);
-	showipstat ("ip header length < data size", ipstat.ips_badhlen);
-	showipstat ("ip length < ip header length", ipstat.ips_badlen);
-	showipstat ("fragments received", ipstat.ips_fragments);
-	showipstat ("frags dropped (dups, out of space)", ipstat.ips_fragdropped);
-	showipstat ("fragments timed out", ipstat.ips_fragtimeout);
-	showipstat ("packets forwarded", ipstat.ips_forward);
-	showipstat ("packets rcvd for unreachable dest", ipstat.ips_cantforward);
-	showipstat ("packets forwarded on same net", ipstat.ips_redirectsent);
-	showipstat ("unknown or unsupported protocol", ipstat.ips_noproto);
-	showipstat ("datagrams delivered to upper level", ipstat.ips_delivered);
-	showipstat ("total ip packets generated here", ipstat.ips_localout);
-	showipstat ("lost packets due to nobufs, etc.", ipstat.ips_odropped);
-	showipstat ("total packets reassembled ok", ipstat.ips_reassembled);
-	showipstat ("datagrams successfully fragmented", ipstat.ips_fragmented);
-	showipstat ("output fragments created", ipstat.ips_ofragments);
-	showipstat ("don't fragment flag was set, etc.", ipstat.ips_cantfrag);
-	showipstat ("error in option processing", ipstat.ips_badoptions);
-	showipstat ("packets discarded due to no route", ipstat.ips_noroute);
-	showipstat ("ip version != 4", ipstat.ips_badvers);
-	showipstat ("total raw ip packets generated", ipstat.ips_rawout);
-	showipstat ("ip length > max ip packet size", ipstat.ips_toolong);
-	printf ("\n");
-}
diff --git a/cpukit/libnetworking/rtems/rtems_showmbuf.c b/cpukit/libnetworking/rtems/rtems_showmbuf.c
deleted file mode 100644
index 39523bd00a..0000000000
--- a/cpukit/libnetworking/rtems/rtems_showmbuf.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- *  $Id$
- */
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/sysctl.h>
-#include <sys/proc.h>
-#include <sys/mbuf.h>
-
-/*
- * Display MBUF statistics
- * Don't lock the rest of the network tasks out while printing.
- * It's no big deal if the values change while being printed.
- */
-void
-rtems_bsdnet_show_mbuf_stats (void)
-{
-	int i;
-	int printed = 0;
-	char *cp;
-
-	printf ("************ MBUF STATISTICS ************\n");
-	printf ("mbufs:%4lu    clusters:%4lu    free:%4lu\n",
-			mbstat.m_mbufs, mbstat.m_clusters, mbstat.m_clfree);
-	printf ("drops:%4lu       waits:%4lu  drains:%4lu\n",
-			mbstat.m_drops, mbstat.m_wait, mbstat.m_drain);
-	for (i = 0 ; i < 20 ; i++) {
-		switch (i) {
-		case MT_FREE:		cp = "free";		break;
-		case MT_DATA:		cp = "data";		break;
-		case MT_HEADER:		cp = "header";		break;
-		case MT_SOCKET:		cp = "socket";		break;
-		case MT_PCB:		cp = "pcb";		break;
-		case MT_RTABLE:		cp = "rtable";		break;
-		case MT_HTABLE:		cp = "htable";		break;
-		case MT_ATABLE:		cp = "atable";		break;
-		case MT_SONAME:		cp = "soname";		break;
-		case MT_SOOPTS:		cp = "soopts";		break;
-		case MT_FTABLE:		cp = "ftable";		break;
-		case MT_RIGHTS:		cp = "rights";		break;
-		case MT_IFADDR:		cp = "ifaddr";		break;
-		case MT_CONTROL:	cp = "control";		break;
-		case MT_OOBDATA:	cp = "oobdata";		break;
-		default:		cp = NULL;		break;
-		}
-		if ((cp != NULL) || (mbstat.m_mtypes[i] != 0)) {
-			char cbuf[16];
-			if (cp == NULL) {
-				sprintf (cbuf, "Type %d", i);
-				cp = cbuf;
-			}
-			printf ("%10s:%-8u", cp, mbstat.m_mtypes[i]);
-			if (++printed == 4) {
-				printf ("\n");
-				printed = 0;
-			}
-		}
-	}
-	if (printed)
-		printf ("\n");
-	printf ("\n");
-}
diff --git a/cpukit/libnetworking/rtems/rtems_showroute.c b/cpukit/libnetworking/rtems/rtems_showroute.c
deleted file mode 100644
index b8196de8d3..0000000000
--- a/cpukit/libnetworking/rtems/rtems_showroute.c
+++ /dev/null
@@ -1,237 +0,0 @@
-/*
- *  $Id$
- */
-
-#include <stdlib.h>
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/sysctl.h>
-#include <sys/proc.h>
-#include <sys/mbuf.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/domain.h>
-
-#include <net/if.h>
-#include <net/if_dl.h>
-#include <net/route.h>
-
-#include <netinet/in.h>
-
-#include <arpa/inet.h>
-
-/*
- * We'll use the application versions of malloc and free.
- */
-#undef malloc
-#undef free
-
-/*
- * Information per route
- */
-struct rinfo {
-	struct sockaddr	dst;
-	union {
-		struct sockaddr		sa;
-		struct sockaddr_in	sin;
-		struct sockaddr_dl	sdl;
-	} un;
-	unsigned long	pksent;
-	unsigned long	expire;
-	int		flags;
-	char		ifname[16];
-	short		ifunit;
-	short		refcnt;
-};
-
-/*
- * Information per display
- */
-struct dinfo {
-	int		capacity;
-	int		count;
-	struct rinfo	*routes;
-};
-
-/*
- * Copy address
- */
-static void
-copyAddress (void *to, void *from, int tolen)
-{
-	int ncopy;
-	struct sockaddr dummy;
-
-	if (from == NULL) {
-		/*
-		 * Create a fake address of unspecified type
-		 */
-		from = &dummy;
-		dummy.sa_len = 4;
-		dummy.sa_family = AF_UNSPEC;
-	}
-	ncopy = ((struct sockaddr *)from)->sa_len;
-	if (ncopy > tolen)
-		ncopy = tolen;
-	memcpy (to, from, ncopy);
-}
-
-/*
- * Package everything up before printing it.
- * We don't want to block all network operations till
- * the printing completes!
- */
-static int
-show_inet_route (rn, vw)
-	struct radix_node *rn;
-	void *vw;
-{
-	struct rtentry *rt = (struct rtentry *)rn;
-	struct ifnet *ifp;
-	struct dinfo *dp = (struct dinfo *)vw;
-	struct rinfo *r;
-
-	/*
-	 * Get a pointer to a new route info structure
-	 */
-	if (dp->count >= dp->capacity) {
-		r = realloc (dp->routes, (sizeof *r) * (dp->capacity + 20));
-		if (r == 0)
-			return ENOMEM;
-		dp->capacity += 20;
-		dp->routes = r;
-	}
-	r = dp->routes + dp->count++;
-
-	/*
-	 * Fill in the route info structure
-	 */
-	copyAddress (&r->dst, rt_key(rt), sizeof r->dst);
-	if (rt->rt_flags & (RTF_GATEWAY | RTF_HOST)) {
-		copyAddress (&r->un, rt->rt_gateway, sizeof r->un);
-	}
-	else {
-		/*
-		 * Create a fake address to hold the mask
-		 */
-		struct sockaddr_in dummy;
-
-		dummy.sin_family = AF_INET;
-		dummy.sin_len = sizeof dummy;
-		dummy.sin_addr = ((struct sockaddr_in *)rt_mask(rt))->sin_addr;
-		copyAddress (&r->un, &dummy, sizeof r->un);
-	}
-	r->flags = rt->rt_flags;
-	r->refcnt = rt->rt_refcnt;
-	r->pksent = rt->rt_rmx.rmx_pksent;
-	r->expire = rt->rt_rmx.rmx_expire;
-	ifp = rt->rt_ifp;
-	strncpy (r->ifname, ifp->if_name, sizeof r->ifname);
-	r->ifunit = ifp->if_unit;
-	return 0;
-}
-
-/*
- * Convert link address to ASCII
- */
-static char *
-link_ascii (struct sockaddr_dl *sdl, char *buf, int bufsize)
-{
-	char *cp;
-	int i;
-	int first = 1;
-	int nleft = sdl->sdl_alen;
-	unsigned char *ap = LLADDR (sdl);
-	static const char hextab[16] = "0123456789ABCDEF";
-
-	cp = buf;
-	while (nleft && (bufsize > 4)) {
-		if (first) {
-			first = 0;
-		}
-		else {
-			*cp++ = ':';
-			bufsize--;
-		}
-		i = *ap++;
-		*cp++ = hextab[(i >> 4) & 0xf];
-		*cp++ = hextab[i & 0xf];
-		nleft--;
-		bufsize -= 2;
-	}
-	*cp = '\0';
-	return buf;
-}
-		
-void
-rtems_bsdnet_show_inet_routes (void)
-{
-	struct radix_node_head *rnh;
-	struct dinfo d;
-	struct rinfo *r;
-	int i, error;
-
-	/*
-	 * For now we'll handle only AF_INET
-	 */
-	rnh = rt_tables[AF_INET];
-	if (!rnh)
-		return;
-	d.count = d.capacity = 0;
-	d.routes = NULL;
-	rtems_bsdnet_semaphore_obtain ();
-	error = rnh->rnh_walktree(rnh, show_inet_route, &d);
-	rtems_bsdnet_semaphore_release ();
-	if (error) {
-		printf ("Can't get route info: %s\n", strerror (error));
-		return;
-	}
-	if (d.count == 0) {
-		printf ("No routes!\n");
-		return;
-	}
-	printf ("Destination     Gateway/Mask/Hw    Flags     Refs     Use Expire Interface\n");
-	for (i = 0, r = d.routes ; i < d.count ; i++, r++) {
-		char buf[30];
-		char *cp, *fc, flagbuf[10];
-		const char *addr;
-		unsigned long flagbit;
-		struct sockaddr_in *sin;
-
-		sin = (struct sockaddr_in *)&r->dst;
-		if (sin->sin_addr.s_addr == INADDR_ANY)
-			addr = "default";
-		else
-			addr = inet_ntop (AF_INET, &sin->sin_addr, buf, sizeof buf);
-		printf ("%-16s", addr);
-		switch (r->un.sa.sa_family) {
-		case AF_INET:
-			addr = inet_ntop (AF_INET, &r->un.sin.sin_addr, buf, sizeof buf);
-			break;
-
-		case AF_LINK:
-			addr = link_ascii (&r->un.sdl, buf, sizeof buf);
-			break;
-
-		default:
-			addr = "";
-			break;
-		}
-		printf ("%-19s", addr);
-		fc = "UGHRDM   XLS";
-		for (flagbit = 0x1, cp = flagbuf ; *fc ; flagbit <<= 1, fc++) {
-			if ((r->flags & flagbit) && (*fc != ' '))
-				*cp++ = *fc;
-		}
-		*cp = '\0';
-		printf ("%-10s%3d%9ld%7ld %.*s%d\n", flagbuf,
-					r->refcnt, r->pksent,
-					r->expire,
-					(int)sizeof r->ifname, r->ifname,
-					r->ifunit);
-	}
-	free (d.routes);
-}
diff --git a/cpukit/libnetworking/rtems/rtems_showtcpstat.c b/cpukit/libnetworking/rtems/rtems_showtcpstat.c
deleted file mode 100644
index b9a0366819..0000000000
--- a/cpukit/libnetworking/rtems/rtems_showtcpstat.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- *  $Id$
- */
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/sysctl.h>
-#include <sys/proc.h>
-#include <sys/mbuf.h>
-#include <sys/socket.h>
-#include <net/if.h>
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/ip_var.h>
-#include <netinet/tcp.h>
-#include <netinet/tcp_timer.h>
-#include <netinet/tcp_seq.h>
-#include <netinet/tcp_var.h>
-
-/*
- * Display TCP statistics
- * Don't lock the rest of the network tasks out while printing.
- * It's no big deal if the values change while being printed.
- */
-static void
-showtcpstat (const char *name, unsigned long n)
-{
-	if (n)
-		printf ("%35s%12lu\n", name, n);
-}
-
-void
-rtems_bsdnet_show_tcp_stats (void)
-{
-	printf ("************ TCP Statistics ************\n");
-	showtcpstat ("connections initiated", tcpstat.tcps_connattempt);
-	showtcpstat ("connections accepted", tcpstat.tcps_accepts);
-	showtcpstat ("connections established", tcpstat.tcps_connects);
-	showtcpstat ("connections dropped", tcpstat.tcps_drops);
-	showtcpstat ("embryonic connections dropped", tcpstat.tcps_conndrops);
-	showtcpstat ("conn. closed (includes drops)", tcpstat.tcps_closed);
-	showtcpstat ("segs where we tried to get rtt", tcpstat.tcps_segstimed);
-	showtcpstat ("times we succeeded", tcpstat.tcps_rttupdated);
-	showtcpstat ("delayed acks sent", tcpstat.tcps_delack);
-	showtcpstat ("conn. dropped in rxmt timeout", tcpstat.tcps_timeoutdrop);
-	showtcpstat ("retransmit timeouts", tcpstat.tcps_rexmttimeo);
-	showtcpstat ("persist timeouts", tcpstat.tcps_persisttimeo);
-	showtcpstat ("keepalive timeouts", tcpstat.tcps_keeptimeo);
-	showtcpstat ("keepalive probes sent", tcpstat.tcps_keepprobe);
-	showtcpstat ("connections dropped in keepalive", tcpstat.tcps_keepdrops);
-
-	showtcpstat ("total packets sent", tcpstat.tcps_sndtotal);
-	showtcpstat ("data packets sent", tcpstat.tcps_sndpack);
-	showtcpstat ("data bytes sent", tcpstat.tcps_sndbyte);
-	showtcpstat ("data packets retransmitted", tcpstat.tcps_sndrexmitpack);
-	showtcpstat ("data bytes retransmitted", tcpstat.tcps_sndrexmitbyte);
-	showtcpstat ("ack-only packets sent", tcpstat.tcps_sndacks);
-	showtcpstat ("window probes sent", tcpstat.tcps_sndprobe);
-	showtcpstat ("packets sent with URG only", tcpstat.tcps_sndurg);
-	showtcpstat ("window update-only packets sent", tcpstat.tcps_sndwinup);
-	showtcpstat ("control (SYN|FIN|RST) packets sent", tcpstat.tcps_sndctrl);
-
-	showtcpstat ("total packets received", tcpstat.tcps_rcvtotal);
-	showtcpstat ("packets received in sequence", tcpstat.tcps_rcvpack);
-	showtcpstat ("bytes received in sequence", tcpstat.tcps_rcvbyte);
-	showtcpstat ("packets received with ccksum errs", tcpstat.tcps_rcvbadsum);
-	showtcpstat ("packets received with bad offset", tcpstat.tcps_rcvbadoff);
-	showtcpstat ("packets received too short", tcpstat.tcps_rcvshort);
-	showtcpstat ("duplicate-only packets received", tcpstat.tcps_rcvduppack);
-	showtcpstat ("duplicate-only bytes received", tcpstat.tcps_rcvdupbyte);
-	showtcpstat ("packets with some duplicate data", tcpstat.tcps_rcvpartduppack);
-	showtcpstat ("dup. bytes in part-dup. packets", tcpstat.tcps_rcvpartdupbyte);
-	showtcpstat ("out-of-order packets received", tcpstat.tcps_rcvoopack);
-	showtcpstat ("out-of-order bytes received", tcpstat.tcps_rcvoobyte);
-	showtcpstat ("packets with data after window", tcpstat.tcps_rcvpackafterwin);
-	showtcpstat ("bytes rcvd after window", tcpstat.tcps_rcvbyteafterwin);
-	showtcpstat ("packets rcvd after \"close\"", tcpstat.tcps_rcvafterclose);
-	showtcpstat ("rcvd window probe packets", tcpstat.tcps_rcvwinprobe);
-	showtcpstat ("rcvd duplicate acks", tcpstat.tcps_rcvdupack);
-	showtcpstat ("rcvd acks for unsent data", tcpstat.tcps_rcvacktoomuch);
-	showtcpstat ("rcvd ack packets", tcpstat.tcps_rcvackpack);
-	showtcpstat ("bytes acked by rcvd acks", tcpstat.tcps_rcvackbyte);
-	showtcpstat ("rcvd window update packets", tcpstat.tcps_rcvwinupd);
-	showtcpstat ("segments dropped due to PAWS", tcpstat.tcps_pawsdrop);
-	showtcpstat ("times hdr predict ok for acks", tcpstat.tcps_predack);
-	showtcpstat ("times hdr predict ok for data pkts", tcpstat.tcps_preddat);
-	showtcpstat ("pcb cache misses", tcpstat.tcps_pcbcachemiss);
-	showtcpstat ("times cached RTT in route updated", tcpstat.tcps_cachedrtt);
-	showtcpstat ("times cached rttvar updated", tcpstat.tcps_cachedrttvar);
-	showtcpstat ("times cached ssthresh updated", tcpstat.tcps_cachedssthresh);
-	showtcpstat ("times RTT initialized from route", tcpstat.tcps_usedrtt);
-	showtcpstat ("times RTTVAR initialized from rt", tcpstat.tcps_usedrttvar);
-	showtcpstat ("times ssthresh initialized from rt", tcpstat.tcps_usedssthresh);
-	showtcpstat ("timeout in persist state", tcpstat.tcps_persistdrop);
-	showtcpstat ("bogus SYN, e.g. premature ACK", tcpstat.tcps_badsyn);
-	showtcpstat ("resends due to MTU discovery", tcpstat.tcps_mturesent);
-	showtcpstat ("listen queue overflows", tcpstat.tcps_listendrop);
-	printf ("\n");
-}
diff --git a/cpukit/libnetworking/rtems/rtems_showudpstat.c b/cpukit/libnetworking/rtems/rtems_showudpstat.c
deleted file mode 100644
index 1fc2d15a0b..0000000000
--- a/cpukit/libnetworking/rtems/rtems_showudpstat.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- *  $Id$
- */
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/sysctl.h>
-#include <sys/proc.h>
-#include <sys/mbuf.h>
-#include <sys/socket.h>
-#include <net/if.h>
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/ip_var.h>
-#include <netinet/udp.h>
-#include <netinet/udp_var.h>
-
-/*
- * Display UDP statistics
- * Don't lock the rest of the network tasks out while printing.
- * It's no big deal if the values change while being printed.
- */
-static void
-showudpstat (const char *name, unsigned long n)
-{
-	if (n)
-		printf ("%35s%12lu\n", name, n);
-}
-
-void
-rtems_bsdnet_show_udp_stats (void)
-{
-	printf ("************ UDP Statistics ************\n");
-	showudpstat ("total input packets", udpstat.udps_ipackets);
-	showudpstat ("packet shorter than header", udpstat.udps_hdrops);
-	showudpstat ("checksum error", udpstat.udps_badsum);
-	showudpstat ("data length larger than packet", udpstat.udps_badlen);
-	showudpstat ("no socket on port", udpstat.udps_noport);
-	showudpstat ("of above, arrived as broadcast", udpstat.udps_noportbcast);
-	showudpstat ("not delivered, input socket full", udpstat.udps_fullsock);
-	showudpstat ("input packets missing pcb cache", udpstat.udpps_pcbcachemiss);
-	showudpstat ("input packets not for hashed pcb", udpstat.udpps_pcbhashmiss);
-	showudpstat ("total output packets", udpstat.udps_opackets);
-	printf ("\n");
-}
diff --git a/cpukit/libnetworking/rtems/rtems_syscall.c b/cpukit/libnetworking/rtems/rtems_syscall.c
deleted file mode 100644
index 782a2f907b..0000000000
--- a/cpukit/libnetworking/rtems/rtems_syscall.c
+++ /dev/null
@@ -1,761 +0,0 @@
-/*
- *  $Id$
- */
-
-#include <string.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-#include <rtems.h>
-#include <rtems/libio.h>
-#include <rtems/error.h>
-#include <rtems/rtems_bsdnet.h>
-
-#include <sys/errno.h>
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/mbuf.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/protosw.h>
-#include <sys/proc.h>
-#include <sys/filio.h>
-
-#include <net/if.h>
-#include <net/route.h>
-
-/*
- *********************************************************************
- *              Map RTEMS file descriptor to BSD socket              *
- *********************************************************************
- */
-struct fdsock {
-	int		indexFreeNext;
-	struct socket	*sock;
-};
-static struct fdsock *fdsock;
-static int fdsockCount;
-static int indexFreeHead = -1;
-
-/*
- * Convert an RTEMS file descriptor to a BSD socket pointer.
- */
-static struct socket *
-fdToSocket (int fd)
-{
-	int i;
-	struct socket *s;
-
-	if ((fd < 0)
-	 || (rtems_file_descriptor_type(fd) != RTEMS_FILE_DESCRIPTOR_TYPE_SOCKET)
-	 || ((i = rtems_file_descriptor_base(fd)) >= fdsockCount)
-	 || ((s = fdsock[i].sock) == NULL)) {
-		errno = EBADF;
-		return NULL;
-	}
-	return s;
-}
-
-/*
- * Enlarge the size of the file-descritor/socket pointer map.
- */
-static int
-enlargeFdMap (void)
-{
-	struct fdsock *nfdsock;
-	int i;
-
-	nfdsock = realloc (fdsock, sizeof *fdsock * (fdsockCount + 20));
-	if (nfdsock == NULL) {
-		errno = ENFILE;
-		return 0;
-	}
-	fdsock = nfdsock;
-	for (i = fdsockCount, fdsockCount += 20 ; i < fdsockCount ; i++) {
-		fdsock[i].sock = NULL;
-		fdsock[i].indexFreeNext = indexFreeHead;
-		indexFreeHead = i;
-	}
-	return 1;
-}
-
-/*
- * Create a file descriptor for a new socket
- */
-static int
-makeFd (struct socket *s)
-{
-	int i;
-
-	if ((indexFreeHead < 0) && !enlargeFdMap ())
-		return -1;
-	i = indexFreeHead;
-	indexFreeHead = fdsock[i].indexFreeNext;
-	fdsock[i].sock = s;
-	return rtems_make_file_descriptor(i,RTEMS_FILE_DESCRIPTOR_TYPE_SOCKET);
-}
-
-/*
- * Package system call argument into mbuf.
- */
-static int
-sockargstombuf (struct mbuf **mp, const void *buf, int buflen, int type)
-{
-	struct mbuf *m;
-
-	if ((u_int)buflen > MLEN)
-		return (EINVAL);
-	m = m_get(M_WAIT, type);
-	if (m == NULL)
-		return (ENOBUFS);
-	m->m_len = buflen;
-	memcpy (mtod(m, caddr_t), buf, buflen);
-	*mp = m;
-	if (type == MT_SONAME) {
-		struct sockaddr *sa;
-		sa = mtod(m, struct sockaddr *);
-		sa->sa_len = buflen;
-	}
-	return 0;
-}
-
-/*
- *********************************************************************
- *                       BSD-style entry points                      *
- *********************************************************************
- */
-int
-socket (int domain, int type, int protocol)
-{
-	int fd = -1;
-	int error;
-	struct socket *so;
-
-	rtems_bsdnet_semaphore_obtain ();
-	error = socreate(domain, &so, type, protocol, NULL);
-	if (error == 0) {
-		fd = makeFd (so);
-		if (fd < 0)
-			soclose (so);
-	}
-	else {
-		errno = error;
-		fd = -1;
-	}
-	rtems_bsdnet_semaphore_release ();
-	return fd;
-}
-
-int
-bind (int s, struct sockaddr *name, int namelen)
-{
-	int error;
-	int ret = -1;
-	struct socket *so;
-	struct mbuf *nam;
-
-	rtems_bsdnet_semaphore_obtain ();
-	if ((so = fdToSocket (s)) != NULL) {
-		error = sockargstombuf (&nam, name, namelen, MT_SONAME);
-		if (error == 0) {
-			error = sobind (so, nam);
-			if (error == 0)
-				ret = 0;
-			else
-				errno = error;
-			m_freem (nam);
-		}
-		else {
-			errno = error;
-		}
-	}
-	rtems_bsdnet_semaphore_release ();
-	return ret;
-}
-
-int
-connect (int s, struct sockaddr *name, int namelen)
-{
-	int error;
-	int ret = -1;
-	struct socket *so;
-	struct mbuf *nam;
-
-	rtems_bsdnet_semaphore_obtain ();
-	if ((so = fdToSocket (s)) == NULL) {
-		rtems_bsdnet_semaphore_release ();
-		return -1;
-	}
-	if ((so->so_state & SS_NBIO) && (so->so_state & SS_ISCONNECTING)) {
-		errno = EALREADY;
-		rtems_bsdnet_semaphore_release ();
-		return -1;
-	}
-	error = sockargstombuf (&nam, name, namelen, MT_SONAME);
-	if (error) {
-		errno = error;
-		rtems_bsdnet_semaphore_release ();
-		return -1;
-	}
-	error = soconnect (so, nam);
-	if (error) {
-		errno = error;
-		rtems_bsdnet_semaphore_release ();
-		return -1;
-	}
-	if ((so->so_state & SS_NBIO) && (so->so_state & SS_ISCONNECTING)) {
-		m_freem(nam);
-		errno = EINPROGRESS;
-		rtems_bsdnet_semaphore_release ();
-		return -1;
-	}
-	while ((so->so_state & SS_ISCONNECTING) && so->so_error == 0) {
-		soconnsleep (so);
-	}
-	if (error == 0) {
-		error = so->so_error;
-		so->so_error = 0;
-	}
-	so->so_state &= ~SS_ISCONNECTING;
-	m_freem (nam);
-	if (error == 0)
-		ret = 0;
-	rtems_bsdnet_semaphore_release ();
-	return ret;
-}
-
-int
-listen (int s, int backlog)
-{
-	int error;
-	int ret = -1;
-	struct socket *so;
-
-	rtems_bsdnet_semaphore_obtain ();
-	if ((so = fdToSocket (s)) != NULL) {
-		error = solisten (so, backlog);
-		if (error == 0)
-			ret = 0;
-		else
-			errno = error;
-	}
-	rtems_bsdnet_semaphore_release ();
-	return ret;
-}
-
-int
-accept (int s, struct sockaddr *name, int *namelen)
-{
-	int fd;
-	struct socket *head, *so;
-	struct mbuf *nam;
-
-	rtems_bsdnet_semaphore_obtain ();
-	if ((head = fdToSocket (s)) == NULL) {
-		rtems_bsdnet_semaphore_release ();
-		return -1;
-	}
-	if ((head->so_options & SO_ACCEPTCONN) == 0) {
-		errno = EINVAL;
-		rtems_bsdnet_semaphore_release ();
-		return -1;
-	}
-        if ((head->so_state & SS_NBIO) && head->so_comp.tqh_first == NULL) {
-                errno = EWOULDBLOCK;
-		rtems_bsdnet_semaphore_release ();
-		return -1;
-	}
-        while (head->so_comp.tqh_first == NULL && head->so_error == 0) {
-                if (head->so_state & SS_CANTRCVMORE) {
-                        head->so_error = ECONNABORTED;
-                        break;
-                }
-		soconnsleep (head);
-        }
-	if (head->so_error) {
-		errno = head->so_error;
-		head->so_error = 0;
-		rtems_bsdnet_semaphore_release ();
-		return -1;
-	}
-
-	so = head->so_comp.tqh_first;
-	TAILQ_REMOVE(&head->so_comp, so, so_list);
-	head->so_qlen--;
-
-	fd = makeFd (so);
-	if (fd < 0) {
-		TAILQ_INSERT_HEAD(&head->so_comp, so, so_list);
-		head->so_qlen++;
-		soconnwakeup (head);
-		rtems_bsdnet_semaphore_release ();
-		return -1;
-	}
-	so->so_state &= ~SS_COMP;
-	so->so_head = NULL;
-
-	nam = m_get(M_WAIT, MT_SONAME);
-	(void) soaccept(so, nam);
-	if (name) {
-		 /* check length before it is destroyed */
-		if (*namelen > nam->m_len)
-			*namelen = nam->m_len;
-		memcpy (name, mtod(nam, caddr_t), *namelen);
-	}
-	m_freem(nam);
-	rtems_bsdnet_semaphore_release ();
-	return (fd);
-
-}
-
-/*
- * All `transmit' operations end up calling this routine.
- */
-ssize_t
-sendmsg (int s, const struct msghdr *mp, int flags)
-{
-	int ret = -1;
-	int error;
-	struct uio auio;
-	struct iovec *iov;
-	struct socket *so;
-	struct mbuf *to, *control;
-	int i;
-	int len;
-
-	rtems_bsdnet_semaphore_obtain ();
-	if ((so = fdToSocket (s)) == NULL) {
-		rtems_bsdnet_semaphore_release ();
-		return -1;
-	}
-	auio.uio_iov = mp->msg_iov;
-	auio.uio_iovcnt = mp->msg_iovlen;
-	auio.uio_segflg = UIO_USERSPACE;
-	auio.uio_rw = UIO_WRITE;
-	auio.uio_offset = 0;
-	auio.uio_resid = 0;
-	iov = mp->msg_iov;
-	for (i = 0; i < mp->msg_iovlen; i++, iov++) {
-		if ((auio.uio_resid += iov->iov_len) < 0) {
-			errno = EINVAL;
-			rtems_bsdnet_semaphore_release ();
-			return -1;
-		}
-	}
-	if (mp->msg_name) {
-		error = sockargstombuf (&to, mp->msg_name, mp->msg_namelen, MT_SONAME);
-		if (error) {
-			errno = error;
-			rtems_bsdnet_semaphore_release ();
-			return -1;
-		}
-	}
-	else {
-		to = NULL;
-	}
-	if (mp->msg_control) {
-		if (mp->msg_controllen < sizeof (struct cmsghdr)) {
-			errno = EINVAL;
-			if (to)
-				m_freem(to);
-			rtems_bsdnet_semaphore_release ();
-			return -1;
-		}
-		sockargstombuf (&control, mp->msg_control, mp->msg_controllen, MT_CONTROL);
-	}
-	else {
-		control = NULL;
-	}
-	len = auio.uio_resid;
-	error = sosend (so, to, &auio, (struct mbuf *)0, control, flags);
-	if (error) {
-		if (auio.uio_resid != len && (error == EINTR || error == EWOULDBLOCK))
-			error = 0;
-	}
-	if (error) 
-		errno = error;
-	else
-		ret = len - auio.uio_resid;
-	if (to)
-		m_freem(to);
-	rtems_bsdnet_semaphore_release ();
-	return (ret);
-}
-
-/*
- * Send a message to a host
- */
-ssize_t
-sendto (int s, const void *buf, size_t buflen, int flags, const struct sockaddr *to, int tolen)
-{
-	struct msghdr msg;
-	struct iovec iov;
-
-	iov.iov_base = (void *)buf;
-	iov.iov_len = buflen;
-	msg.msg_name = (caddr_t)to;
-	msg.msg_namelen = tolen;
-	msg.msg_iov = &iov;
-	msg.msg_iovlen = 1;
-	msg.msg_control = NULL;
-	msg.msg_controllen = 0;
-	return sendmsg (s, &msg, flags);
-}
-
-/*
- * Send a message to a connected host
- */
-ssize_t
-send (int s, const void *buf, size_t buflen, int flags)
-{
-	return sendto (s, buf, buflen, flags, NULL, 0);
-}
-
-/*
- * All `receive' operations end up calling this routine.
- */
-ssize_t
-recvmsg (int s, struct msghdr *mp, int flags)
-{
-	int ret = -1;
-	int error;
-	struct uio auio;
-	struct iovec *iov;
-	struct socket *so;
-	struct mbuf *from = NULL, *control = NULL;
-	int i;
-	int len;
-
-	rtems_bsdnet_semaphore_obtain ();
-	if ((so = fdToSocket (s)) == NULL) {
-		rtems_bsdnet_semaphore_release ();
-		return -1;
-	}
-	auio.uio_iov = mp->msg_iov;
-	auio.uio_iovcnt = mp->msg_iovlen;
-	auio.uio_segflg = UIO_USERSPACE;
-	auio.uio_rw = UIO_READ;
-	auio.uio_offset = 0;
-	auio.uio_resid = 0;
-	iov = mp->msg_iov;
-	for (i = 0; i < mp->msg_iovlen; i++, iov++) {
-		if ((auio.uio_resid += iov->iov_len) < 0) {
-			errno = EINVAL;
-			rtems_bsdnet_semaphore_release ();
-			return -1;
-		}
-	}
-	len = auio.uio_resid;
-	mp->msg_flags = flags;
-	error = soreceive (so, &from, &auio, (struct mbuf **)NULL, 
-			mp->msg_control ? &control : (struct mbuf **)NULL,
-			&mp->msg_flags);
-	if (error) {
-		if (auio.uio_resid != len && (error == EINTR || error == EWOULDBLOCK))
-			error = 0;
-	}
-	if (error) {
-		errno = error;
-	}
-	else {
-		ret = len - auio.uio_resid;
-		if (mp->msg_name) {
-			len = mp->msg_namelen;
-			if ((len <= 0) || (from == NULL)) {
-				len = 0;
-			}
-			else {
-				if (len > from->m_len)
-					len = from->m_len;
-				memcpy (mp->msg_name, mtod(from, caddr_t), len);
-			}
-			mp->msg_namelen = len;
-		}
-		if (mp->msg_control) {
-			struct mbuf *m;
-			caddr_t ctlbuf;
-
-			len = mp->msg_controllen;
-			m = control;
-			mp->msg_controllen = 0;
-			ctlbuf = (caddr_t) mp->msg_control;
-
-			while (m && (len > 0)) {
-				unsigned int tocopy;
-
-				if (len >= m->m_len) 
-					tocopy = m->m_len;
-				else {
-					mp->msg_flags |= MSG_CTRUNC;
-					tocopy = len;
-				}
-				memcpy(ctlbuf, mtod(m, caddr_t), tocopy);
-				ctlbuf += tocopy;
-				len -= tocopy;
-				m = m->m_next;
-			}
-			mp->msg_controllen = ctlbuf - mp->msg_control;
-		}
-	}
-	if (from)
-		m_freem (from);
-	if (control)
-		m_freem (control);
-	rtems_bsdnet_semaphore_release ();
-	return (ret);
-}
-
-/*
- * Receive a message from a host
- */
-ssize_t
-recvfrom (int s, void *buf, size_t buflen, int flags, const struct sockaddr *from, int *fromlen)
-{
-	struct msghdr msg;
-	struct iovec iov;
-	int ret;
-
-	iov.iov_base = buf;
-	iov.iov_len = buflen;
-	msg.msg_name = (caddr_t)from;
-	msg.msg_namelen = *fromlen;
-	msg.msg_iov = &iov;
-	msg.msg_iovlen = 1;
-	msg.msg_control = NULL;
-	msg.msg_controllen = 0;
-	ret = recvmsg (s, &msg, flags);
-	if ((from != NULL) && (fromlen != NULL) && (ret >= 0))
-		*fromlen = msg.msg_namelen;
-	return ret;
-}
-
-/*
- * Receive a message from a connected host
- */
-ssize_t
-recv (int s, void *buf, size_t buflen, int flags)
-{
-	return recvfrom (s, buf, buflen, flags, NULL, NULL);
-}
-
-int
-setsockopt (int s, int level, int name, const void *val, int len)
-{
-	struct socket *so;
-	struct mbuf *m = NULL;
-	int error;
-
-	rtems_bsdnet_semaphore_obtain ();
-	if ((so = fdToSocket (s)) == NULL) {
-		rtems_bsdnet_semaphore_release ();
-		return -1;
-	}
-	if (len > MLEN) {
-		errno = EINVAL;
-		rtems_bsdnet_semaphore_release ();
-		return -1;
-	}
-	if (val) {
-		error = sockargstombuf (&m, val, len, MT_SOOPTS);
-		if (error) {
-			errno = error;
-			rtems_bsdnet_semaphore_release ();
-			return -1;
-		}
-	}
-	error = sosetopt(so, level, name, m);
-	if (error) {
-		errno = error;
-		rtems_bsdnet_semaphore_release ();
-		return -1;
-	}
-	rtems_bsdnet_semaphore_release ();
-	return 0;
-}
-
-int
-getsockopt (int s, int level, int name, void *aval, int *avalsize)
-{
-	struct socket *so;
-	struct mbuf *m = NULL, *m0;
-	char *val = aval;
-	int i, op, valsize;
-	int error;
-
-	rtems_bsdnet_semaphore_obtain ();
-	if ((so = fdToSocket (s)) == NULL) {
-		rtems_bsdnet_semaphore_release ();
-		return -1;
-	}
-	if (val)
-		valsize = *avalsize;
-	else
-		valsize = 0;
-	if (((error = sogetopt(so, level, name, &m)) == 0) && val && valsize && m) {
-		op = 0;
-		while (m && op < valsize) {
-			i = valsize - op;
-			if (i > m->m_len)
-				i = m->m_len;
-			memcpy (val, mtod(m, caddr_t), i);
-			op += i;
-			val += i;
-			m0 = m;
-			MFREE (m0, m);
-		}
-		*avalsize = op;
-	}
-	if (m != NULL)
-		(void) m_free(m);
-	if (error) {
-		errno = error;
-		rtems_bsdnet_semaphore_release ();
-		return -1;
-	}
-	rtems_bsdnet_semaphore_release ();
-	return 0;
-}
-
-static int
-getpeersockname (int s, struct sockaddr *name, int *namelen, int pflag)
-{
-	struct socket *so;
-	struct mbuf *m;
-	int len = *namelen;
-	int error;
-
-	rtems_bsdnet_semaphore_obtain ();
-	if ((so = fdToSocket (s)) == NULL) {
-		rtems_bsdnet_semaphore_release ();
-		return -1;
-	}
-	m = m_getclr(M_WAIT, MT_SONAME);
-	if (m == NULL) {
-		errno = ENOBUFS;
-		rtems_bsdnet_semaphore_release ();
-		return -1;
-	}
-	if (pflag)
-		error = (*so->so_proto->pr_usrreqs->pru_peeraddr)(so, m);
-	else
-		error = (*so->so_proto->pr_usrreqs->pru_sockaddr)(so, m);
-	if (error) {
-		errno = error;
-		rtems_bsdnet_semaphore_release ();
-		return -1;
-	}
-	if (len > m->m_len) {
-		len = m->m_len;
-		*namelen = len;
-	}
-	memcpy (name, mtod(m, caddr_t), len);
-	m_freem (m);
-	rtems_bsdnet_semaphore_release ();
-	return 0;
-}
-
-int
-getpeername (int s, struct sockaddr *name, int *namelen)
-{
-	return getpeersockname (s, name, namelen, 1);
-}
-int
-getsockname (int s, struct sockaddr *name, int *namelen)
-{
-	return getpeersockname (s, name, namelen, 0);
-}
-
-/*
- ************************************************************************
- *                 RTEMS EXTERNAL I/O HANDLER ROUTINES                  *
- ************************************************************************
- */
-static int
-rtems_bsdnet_close (int fd)
-{
-	struct socket *so;
-	int error;
-	int i;
-
-	rtems_bsdnet_semaphore_obtain ();
-	if ((so = fdToSocket (fd)) == NULL) {
-		rtems_bsdnet_semaphore_release ();
-		return -1;
-	}
-	i = rtems_file_descriptor_base(fd);
-	fdsock[i].indexFreeNext = indexFreeHead;;
-	indexFreeHead = i;
-	error = soclose (so);
-	rtems_bsdnet_semaphore_release ();
-	if (error) {
-		errno = error;
-		return -1;
-	}
-	return 0;
-}
-
-static int
-rtems_bsdnet_read (int fd, void *buffer, unsigned32 count)
-{
-	return recv (fd, buffer, count, 0);
-}
-
-static int
-rtems_bsdnet_write (int fd, const void *buffer, unsigned32 count)
-{
-	return send (fd, buffer, count, 0);
-}
-
-static int
-so_ioctl (struct socket *so, unsigned32 command, void *buffer)
-{
-	switch (command) {
-	case FIONBIO:
-		if (*(int *)buffer)
-			so->so_state |= SS_NBIO;
-		else
-			so->so_state &= ~SS_NBIO;
-		return 0;
-
-	case FIONREAD:
-		*(int *)buffer = so->so_rcv.sb_cc;
-		return 0;
-	}
-
-	if (IOCGROUP(command) == 'i')
-		return ifioctl (so, command, buffer, NULL);
-	if (IOCGROUP(command) == 'r')
-		return rtioctl (command, buffer, NULL);
-	return (*so->so_proto->pr_usrreqs->pru_control)(so, command, buffer, 0);
-}
-
-static int
-rtems_bsdnet_ioctl (int fd, unsigned32 command, void *buffer)
-{
-	struct socket *so;
-	int error;
-
-	rtems_bsdnet_semaphore_obtain ();
-	if ((so = fdToSocket (fd)) == NULL) {
-		rtems_bsdnet_semaphore_release ();
-		return -1;
-	}
-	error = so_ioctl (so, command, buffer);
-	rtems_bsdnet_semaphore_release ();
-	if (error) {
-		errno = error;
-		return -1;
-	}
-	return 0;
-}
-
-rtems_libio_handler_t rtems_bsdnet_io_handler = {
-	NULL,			/* open */
-	rtems_bsdnet_close,	/* close */
-	rtems_bsdnet_read,	/* read */
-	rtems_bsdnet_write,	/* write */
-	rtems_bsdnet_ioctl,	/* ioctl */
-	NULL,			/* lseek */
-};
-
diff --git a/cpukit/libnetworking/rtems/sghostname.c b/cpukit/libnetworking/rtems/sghostname.c
deleted file mode 100644
index 36894caa86..0000000000
--- a/cpukit/libnetworking/rtems/sghostname.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * RTEMS versions of hostname functions
- * FIXME: Not thread-safe
- *
- *  $Id$
- */
-
-#include <string.h>
-#include <errno.h>
-#include <rtems/rtems_bsdnet.h>
-#include <sys/param.h>
-#include <sys/malloc.h>
-#include <sys/kernel.h>
-
-static char *rtems_hostname;
-
-int
-gethostname (char *name, int namelen)
-{
-	char *cp = rtems_hostname;
-
-	if (cp == NULL)
-		cp = "";
-	strncpy (name, cp, namelen);
-	return 0;
-}
-
-int
-sethostname (char *name, int namelen)
-{
-	char *old, *new;
-
-	if (namelen >= MAXHOSTNAMELEN) {
-		errno = EINVAL;
-		return -1;
-	}
-	new = malloc (namelen + 1, M_HTABLE, M_NOWAIT);
-	if (new == NULL) {
-		errno = ENOMEM;
-		return -1;
-	}
-	strncpy (new, name, namelen);
-	new[namelen] = '\0';
-	old = rtems_hostname;
-	rtems_hostname = new;
-	if (old)
-		free (old, M_HTABLE);
-	return 0;
-}
diff --git a/cpukit/libnetworking/rtems/tftp.h b/cpukit/libnetworking/rtems/tftp.h
deleted file mode 100644
index d09782e22b..0000000000
--- a/cpukit/libnetworking/rtems/tftp.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- *  $Id$
- */
-
-/*
- * Trivial File Transfer Protocol (TFTP)
- *
- * Transfer file to/from remote host
- *
- * W. Eric Norum
- * Saskatchewan Accelerator Laboratory
- * University of Saskatchewan
- * Saskatoon, Saskatchewan, CANADA
- * eric@skatter.usask.ca
- */
-
-/*
- * Usage:
- * 
- * To open `/bootfiles/image' on `hostname' for reading:
- *         fd = open ("/TFTP/hostname/bootfiles/image", O_RDONLY);
- *
- * The `hostname' must be four dot-separated decimal values.
- *
- * To open a file on the host which supplied the BOOTP
- * information just leave the `hostname' part empty:
- *         fd = open ("/TFTP//bootfiles/image", O_RDONLY);
- *
- */
-
-#ifndef _TFTP_DRIVER_h
-#define _TFTP_DRIVER_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * Driver entry points
- */
-#define TFTP_DRIVER_TABLE_ENTRY \
-  { rtems_tftp_initialize, rtems_tftp_open, rtems_tftp_close, \
-    rtems_tftp_read, rtems_tftp_write, rtems_tftp_control }
-
-rtems_device_driver rtems_tftp_initialize(
-  rtems_device_major_number,
-  rtems_device_minor_number,
-  void *
-);
-
-rtems_device_driver rtems_tftp_open(
-  rtems_device_major_number,
-  rtems_device_minor_number,
-  void *
-);
-
-rtems_device_driver rtems_tftp_close(
-  rtems_device_major_number,
-  rtems_device_minor_number,
-  void *
-);
-
-rtems_device_driver rtems_tftp_read(
-  rtems_device_major_number,
-  rtems_device_minor_number,
-  void *
-);
-
-rtems_device_driver rtems_tftp_write(
-  rtems_device_major_number,
-  rtems_device_minor_number,
-  void *
-);
-
-rtems_device_driver rtems_tftp_control(
-  rtems_device_major_number,
-  rtems_device_minor_number,
-  void *
-);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/cpukit/libnetworking/sys/buf.h b/cpukit/libnetworking/sys/buf.h
deleted file mode 100644
index 6cca571141..0000000000
--- a/cpukit/libnetworking/sys/buf.h
+++ /dev/null
@@ -1,248 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)buf.h	8.9 (Berkeley) 3/30/95
- * $Id$
- */
-
-#ifndef _SYS_BUF_H_
-#define	_SYS_BUF_H_
-
-#include <sys/queue.h>
-
-#define NOLIST ((struct buf *)0x87654321)
-
-struct buf;
-
-struct iodone_chain {
-	long	ic_prev_flags;
-	void	(*ic_prev_iodone) __P((struct buf *));
-	void	*ic_prev_iodone_chain;
-	struct {
-		long	ia_long;
-		void	*ia_ptr;
-	}	ic_args[5];
-};
-
-typedef TAILQ_HEAD(buf_queue_head, buf) buf_queue_head, *buf_queue_head_t;
-
-/*
- * The buffer header describes an I/O operation in the kernel.
- */
-struct buf {
-	LIST_ENTRY(buf) b_hash;		/* Hash chain. */
-	LIST_ENTRY(buf) b_vnbufs;	/* Buffer's associated vnode. */
-	TAILQ_ENTRY(buf) b_freelist;	/* Free list position if not active. */
-	TAILQ_ENTRY(buf) b_act;		/* Device driver queue when active. *new* */
-	struct  proc *b_proc;		/* Associated proc; NULL if kernel. */
-	long	b_flags;		/* B_* flags. */
-	unsigned short b_qindex;	/* buffer queue index */
-	unsigned char b_usecount;	/* buffer use count */
-	int	b_error;		/* Errno value. */
-	long	b_bufsize;		/* Allocated buffer size. */
-	long	b_bcount;		/* Valid bytes in buffer. */
-	long	b_resid;		/* Remaining I/O. */
-	dev_t	b_dev;			/* Device associated with buffer. */
-	struct {
-		caddr_t	b_addr;		/* Memory, superblocks, indirect etc. */
-	} b_un;
-	caddr_t	b_kvabase;		/* base kva for buffer */
-	int	b_kvasize;		/* size of kva for buffer */
-	void	*b_saveaddr;		/* Original b_addr for physio. */
-	daddr_t	b_lblkno;		/* Logical block number. */
-	daddr_t	b_blkno;		/* Underlying physical block number. */
-					/* Function to call upon completion. */
-	void	(*b_iodone) __P((struct buf *));
-					/* For nested b_iodone's. */
-	struct	iodone_chain *b_iodone_chain;
-	struct	vnode *b_vp;		/* Device vnode. */
-	int	b_dirtyoff;		/* Offset in buffer of dirty region. */
-	int	b_dirtyend;		/* Offset of end of dirty region. */
-	struct	ucred *b_rcred;		/* Read credentials reference. */
-	struct	ucred *b_wcred;		/* Write credentials reference. */
-	int	b_validoff;		/* Offset in buffer of valid region. */
-	int	b_validend;		/* Offset of end of valid region. */
-	daddr_t	b_pblkno;               /* physical block number */
-	caddr_t	b_savekva;              /* saved kva for transfer while bouncing */
-	void	*b_driver1;		/* for private use by the driver */
-	void	*b_driver2;		/* for private use by the driver */
-	void	*b_spc;
-	union	cluster_info {
-		TAILQ_HEAD(cluster_list_head, buf) cluster_head;
-		TAILQ_ENTRY(buf) cluster_entry;
-	} b_cluster;
-	struct	vm_page *b_pages[btoc(MAXPHYS)];
-	int		b_npages;
-};
-
-/* Device driver compatibility definitions. */
-#define	b_data	 b_un.b_addr		/* b_un.b_addr is not changeable. */
-
-/*
- * These flags are kept in b_flags.
- */
-#define	B_AGE		0x00000001	/* Move to age queue when I/O done. */
-#define	B_NEEDCOMMIT	0x00000002	/* Append-write in progress. */
-#define	B_ASYNC		0x00000004	/* Start I/O, do not wait. */
-#define	B_BAD		0x00000008	/* Bad block revectoring in progress. */
-#define	B_BUSY		0x00000010	/* I/O in progress. */
-#define	B_CACHE		0x00000020	/* Bread found us in the cache. */
-#define	B_CALL		0x00000040	/* Call b_iodone from biodone. */
-#define	B_DELWRI	0x00000080	/* Delay I/O until buffer reused. */
-#define	B_DIRTY		0x00000100	/* Dirty page to be pushed out async. */
-#define	B_DONE		0x00000200	/* I/O completed. */
-#define	B_EINTR		0x00000400	/* I/O was interrupted */
-#define	B_ERROR		0x00000800	/* I/O error occurred. */
-#define	B_GATHERED	0x00001000	/* LFS: already in a segment. */
-#define	B_INVAL		0x00002000	/* Does not contain valid info. */
-#define	B_LOCKED	0x00004000	/* Locked in core (not reusable). */
-#define	B_NOCACHE	0x00008000	/* Do not cache block after use. */
-#define	B_MALLOC	0x00010000	/* malloced b_data */
-#define	B_CLUSTEROK	0x00020000	/* Pagein op, so swap() can count it. */
-#define	B_PHYS		0x00040000	/* I/O to user memory. */
-#define	B_RAW		0x00080000	/* Set by physio for raw transfers. */
-#define	B_READ		0x00100000	/* Read buffer. */
-#define	B_TAPE		0x00200000	/* Magnetic tape I/O. */
-#define	B_RELBUF	0x00400000	/* Release VMIO buffer. */
-#define	B_WANTED	0x00800000	/* Process wants this buffer. */
-#define	B_WRITE		0x00000000	/* Write buffer (pseudo flag). */
-#define	B_WRITEINPROG	0x01000000	/* Write in progress. */
-#define	B_XXX		0x02000000	/* Debugging flag. */
-#define	B_PAGING	0x04000000	/* volatile paging I/O -- bypass VMIO */
-#define	B_ORDERED	0x08000000	/* Must guarantee I/O ordering */
-#define B_VMIO		0x20000000	/* VMIO flag */
-#define B_CLUSTER	0x40000000	/* pagein op, so swap() can count it */
-#define B_BOUNCE	0x80000000	/* bounce buffer flag */
-
-/*
- * number of buffer hash entries
- */
-#define BUFHSZ 512
-
-/*
- * buffer hash table calculation, originally by David Greenman
- */
-#define BUFHASH(vnp, bn)        \
-	(&bufhashtbl[(((unsigned long)(vnp) >> 7)+(int)(bn)) % BUFHSZ])
-
-/*
- * Definitions for the buffer free lists.
- */
-#define BUFFER_QUEUES	6	/* number of free buffer queues */
-
-extern LIST_HEAD(bufhashhdr, buf) bufhashtbl[BUFHSZ], invalhash;
-extern TAILQ_HEAD(bqueues, buf) bufqueues[BUFFER_QUEUES];
-
-#define QUEUE_NONE	0	/* on no queue */
-#define QUEUE_LOCKED	1	/* locked buffers */
-#define QUEUE_LRU	2	/* useful buffers */
-#define QUEUE_VMIO	3	/* VMIO buffers */
-#define QUEUE_AGE	4	/* not-useful buffers */
-#define QUEUE_EMPTY	5	/* empty buffer headers*/
-
-/*
- * Zero out the buffer's data area.
- */
-#define	clrbuf(bp) {							\
-	bzero((bp)->b_data, (u_int)(bp)->b_bcount);			\
-	(bp)->b_resid = 0;						\
-}
-
-/* Flags to low-level allocation routines. */
-#define B_CLRBUF	0x01	/* Request allocated buffer be cleared. */
-#define B_SYNC		0x02	/* Do all allocations synchronously. */
-
-#ifdef KERNEL
-extern int	nbuf;			/* The number of buffer headers */
-extern struct	buf *buf;		/* The buffer headers. */
-extern char	*buffers;		/* The buffer contents. */
-extern int	bufpages;		/* Number of memory pages in the buffer pool. */
-extern struct	buf *swbuf;		/* Swap I/O buffer headers. */
-extern int	nswbuf;			/* Number of swap I/O buffer headers. */
-extern TAILQ_HEAD(swqueue, buf) bswlist;
-
-void	bufinit __P((void));
-void	bremfree __P((struct buf *));
-int	bread __P((struct vnode *, daddr_t, int,
-	    struct ucred *, struct buf **));
-int	breadn __P((struct vnode *, daddr_t, int, daddr_t *, int *, int,
-	    struct ucred *, struct buf **));
-int	bwrite __P((struct buf *));
-void	bdwrite __P((struct buf *));
-void	bawrite __P((struct buf *));
-int	bowrite __P((struct buf *));
-void	brelse __P((struct buf *));
-void	bqrelse __P((struct buf *));
-int	vfs_bio_awrite __P((struct buf *));
-struct buf *     getpbuf __P((void));
-struct buf *incore __P((struct vnode *, daddr_t));
-struct buf *gbincore __P((struct vnode *, daddr_t));
-int	inmem __P((struct vnode *, daddr_t));
-struct buf *getblk __P((struct vnode *, daddr_t, int, int, int));
-struct buf *geteblk __P((int));
-int	allocbuf __P((struct buf *, int));
-int	biowait __P((struct buf *));
-void	biodone __P((struct buf *));
-
-void	cluster_callback __P((struct buf *));
-int	cluster_read __P((struct vnode *, u_quad_t, daddr_t, long,
-	    struct ucred *, struct buf **));
-int	cluster_wbuild __P((struct vnode *, long, daddr_t, int));
-void	cluster_write __P((struct buf *, u_quad_t));
-int	physio __P((void (*)(struct buf *), struct buf *, dev_t, 
-	    int, u_int (*)(struct buf *), struct uio *));
-u_int	minphys __P((struct buf *));
-void	vfs_bio_clrbuf __P((struct buf *));
-void	vfs_busy_pages __P((struct buf *, int clear_modify));
-void	vfs_unbusy_pages(struct buf *);
-void	vwakeup __P((struct buf *));
-void	vmapbuf __P((struct buf *));
-void	vunmapbuf __P((struct buf *));
-void	relpbuf __P((struct buf *));
-void	brelvp __P((struct buf *));
-void	bgetvp __P((struct vnode *, struct buf *));
-void	pbgetvp __P((struct vnode *, struct buf *));
-void	pbrelvp __P((struct buf *));
-void	reassignbuf __P((struct buf *, struct vnode *));
-struct	buf *trypbuf __P((void));
-void	vm_bounce_alloc __P((struct buf *));
-void	vm_bounce_free __P((struct buf *));
-vm_offset_t	vm_bounce_kva_alloc __P((int));
-void	vm_bounce_kva_alloc_free __P((vm_offset_t, int));
-#endif /* KERNEL */
-
-#endif /* !_SYS_BUF_H_ */
diff --git a/cpukit/libnetworking/sys/callout.h b/cpukit/libnetworking/sys/callout.h
deleted file mode 100644
index 5fec98f28b..0000000000
--- a/cpukit/libnetworking/sys/callout.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)callout.h	8.2 (Berkeley) 1/21/94
- * $Id$
- */
-
-#ifndef _SYS_CALLOUT_H_
-#define _SYS_CALLOUT_H_
-
-struct callout {
-	struct	callout *c_next;		/* next callout in queue */
-	void	*c_arg;				/* function argument */
-	void	(*c_func) __P((void *));	/* function to call */
-	int	c_time;				/* ticks to the event */
-};
-
-#ifdef KERNEL
-extern struct	callout *callfree, *callout, calltodo;
-extern int	ncallout;
-#endif
-
-#endif
diff --git a/cpukit/libnetworking/sys/conf.h b/cpukit/libnetworking/sys/conf.h
deleted file mode 100644
index 92d99d9d07..0000000000
--- a/cpukit/libnetworking/sys/conf.h
+++ /dev/null
@@ -1,228 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)conf.h	8.5 (Berkeley) 1/9/95
- * $Id$
- */
-
-#ifndef _SYS_CONF_H_
-#define	_SYS_CONF_H_
-
-/*
- * Definitions of device driver entry switches
- */
-
-struct buf;
-struct proc;
-struct tty;
-struct uio;
-struct vnode;
-
-typedef int d_open_t __P((dev_t dev, int oflags, int devtype, struct proc *p));
-typedef int d_close_t __P((dev_t dev, int fflag, int devtype, struct proc *p));
-typedef void d_strategy_t __P((struct buf *bp));
-typedef int d_ioctl_t __P((dev_t dev, int cmd, caddr_t data,
-			   int fflag, struct proc *p));
-typedef int d_dump_t __P((dev_t dev));
-typedef int d_psize_t __P((dev_t dev));
-
-typedef int d_read_t __P((dev_t dev, struct uio *uio, int ioflag));
-typedef int d_write_t __P((dev_t dev, struct uio *uio, int ioflag));
-typedef void d_stop_t __P((struct tty *tp, int rw));
-typedef int d_reset_t __P((dev_t dev));
-typedef struct tty *d_devtotty_t __P((dev_t dev));
-typedef int d_select_t __P((dev_t dev, int which, struct proc *p));
-typedef int d_mmap_t __P((dev_t dev, int offset, int nprot));
-
-typedef int l_open_t __P((dev_t dev, struct tty *tp));
-typedef int l_close_t __P((struct tty *tp, int flag));
-typedef int l_read_t __P((struct tty *tp, struct uio *uio, int flag));
-typedef int l_write_t __P((struct tty *tp, struct uio *uio, int flag));
-typedef int l_ioctl_t __P((struct tty *tp, int cmd, caddr_t data,
-			   int flag, struct proc *p));
-typedef int l_rint_t __P((int c, struct tty *tp));
-typedef int l_start_t __P((struct tty *tp));
-typedef int l_modem_t __P((struct tty *tp, int flag));
-
-/*
- * Block device switch table
- */
-struct bdevsw {
-	d_open_t	*d_open;
-	d_close_t	*d_close;
-	d_strategy_t	*d_strategy;
-	d_ioctl_t	*d_ioctl;
-	d_dump_t	*d_dump;
-	d_psize_t	*d_psize;
-	int		d_flags;
-	char 		*d_name;	/* name of the driver e.g. audio */
-	struct cdevsw	*d_cdev; 	/* cross pointer to the cdev */
-	int		d_maj;		/* the major number we were assigned */
-};
-
-#ifdef KERNEL
-extern struct bdevsw *bdevsw[];
-#endif
-
-/*
- * Character device switch table
- */
-struct cdevsw {
-	d_open_t	*d_open;
-	d_close_t	*d_close;
-	d_read_t	*d_read;
-	d_write_t	*d_write;
-	d_ioctl_t	*d_ioctl;
-	d_stop_t	*d_stop;
-	d_reset_t	*d_reset;	/* XXX not used */
-	d_devtotty_t	*d_devtotty;
-	d_select_t	*d_select;
-	d_mmap_t	*d_mmap;
-	d_strategy_t	*d_strategy;
-	char		*d_name;	/* see above */
-	struct bdevsw	*d_bdev;
-	int		d_maj;
-};
-
-#ifdef KERNEL
-extern struct cdevsw *cdevsw[];
-#endif
-
-/*
- * Line discipline switch table
- */
-struct linesw {
-	l_open_t	*l_open;
-	l_close_t	*l_close;
-	l_read_t	*l_read;
-	l_write_t	*l_write;
-	l_ioctl_t	*l_ioctl;
-	l_rint_t	*l_rint;
-	l_start_t	*l_start;
-	l_modem_t	*l_modem;
-};
-
-#ifdef KERNEL
-extern struct linesw linesw[];
-extern int nlinesw;
-
-int ldisc_register __P((int , struct linesw *));
-void ldisc_deregister __P((int));
-#define LDISC_LOAD 	-1		/* Loadable line discipline */
-#endif
-
-/*
- * Swap device table
- */
-struct swdevt {
-	dev_t	sw_dev;
-	int	sw_flags;
-	int	sw_nblks;
-	struct	vnode *sw_vp;
-};
-#define	SW_FREED	0x01
-#define	SW_SEQUENTIAL	0x02
-#define	sw_freed	sw_flags	/* XXX compat */
-
-#ifdef KERNEL
-d_open_t	noopen;
-d_close_t	noclose;
-d_read_t	noread;
-d_write_t	nowrite;
-d_ioctl_t	noioctl;
-d_stop_t	nostop;
-d_reset_t	noreset;
-d_devtotty_t	nodevtotty;
-d_select_t	noselect;
-d_mmap_t	nommap;
-
-/* Bogus defines for compatibility. */
-#define	noioc		noioctl
-#define	nostrat		nostrategy
-#define zerosize	nopsize
-/*
- * XXX d_strategy seems to be unused for cdevs that aren't associated with
- * bdevs and called without checking for it being non-NULL for bdevs.
- */
-#define	nostrategy	((d_strategy_t *)NULL)
-
-d_dump_t	nodump;
-
-/*
- * nopsize is little used, so not worth having dummy functions for.
- */
-#define	nopsize	((d_psize_t *)NULL)
-
-d_open_t	nullopen;
-d_close_t	nullclose;
-#define	nullstop nostop		/* one void return is as good as another */
-#define	nullreset noreset	/* one unused function is as good as another */
-
-d_open_t	nxopen;
-d_close_t	nxclose;
-d_read_t	nxread;
-d_write_t	nxwrite;
-d_ioctl_t	nxioctl;
-#define	nxstop	nostop		/* one void return is as good as another */
-#define	nxreset	noreset		/* one unused function is as good as another */
-#define	nxdevtotty nodevtotty	/* one NULL return is as good as another */
-d_select_t	nxselect;
-#define	nxmmap	nommap		/* one -1 return is as good as another */
-#define	nxstrategy nostrategy	/* one NULL value is as good as another */
-d_dump_t	nxdump;
-#define	nxpsize	nopsize		/* one NULL value is as good as another */
-
-d_read_t	rawread;
-d_write_t	rawwrite;
-
-l_read_t	l_noread;
-l_write_t	l_nowrite;
-
-int	bdevsw_add __P((dev_t *descrip,struct bdevsw *new,struct bdevsw **old));
-int	cdevsw_add __P((dev_t *descrip,struct cdevsw *new,struct cdevsw **old));
-void	cdevsw_make __P((struct bdevsw *from));
-void	bdevsw_add_generic __P((int bdev, int cdev, struct bdevsw *bdevsw));
-dev_t	chrtoblk __P((dev_t dev));
-int	isdisk __P((dev_t dev, int type));
-int	iskmemdev __P((dev_t dev));
-int	iszerodev __P((dev_t dev));
-void	setconf __P((void));
-#endif /* KERNEL */
-
-#include <machine/conf.h>
-
-#endif /* !_SYS_CONF_H_ */
diff --git a/cpukit/libnetworking/sys/domain.h b/cpukit/libnetworking/sys/domain.h
deleted file mode 100644
index 2ec8a5fb05..0000000000
--- a/cpukit/libnetworking/sys/domain.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)domain.h	8.1 (Berkeley) 6/2/93
- * $Id$
- */
-
-#ifndef _SYS_DOMAIN_H_
-#define _SYS_DOMAIN_H_
-
-/*
- * Structure per communications domain.
- */
-
-/*
- * Forward structure declarations for function prototypes [sic].
- */
-struct	mbuf;
-
-struct	domain {
-	int	dom_family;		/* AF_xxx */
-	char	*dom_name;
-	void	(*dom_init)		/* initialize domain data structures */
-		__P((void));
-	int	(*dom_externalize)	/* externalize access rights */
-		__P((struct mbuf *));
-	void	(*dom_dispose)		/* dispose of internalized rights */
-		__P((struct mbuf *));
-	struct	protosw *dom_protosw, *dom_protoswNPROTOSW;
-	struct	domain *dom_next;
-	int	(*dom_rtattach)		/* initialize routing table */
-		__P((void **, int));
-	int	dom_rtoffset;		/* an arg to rtattach, in bits */
-	int	dom_maxrtkey;		/* for routing layer */
-};
-
-#ifdef KERNEL
-extern struct	domain *domains;
-extern struct	domain localdomain;
-
-#define DOMAIN_SET(name) \
-	DATA_SET(domain_set, name ## domain);
-
-#endif
-
-#endif
diff --git a/cpukit/libnetworking/sys/kernel.h b/cpukit/libnetworking/sys/kernel.h
deleted file mode 100644
index 35bce70bd6..0000000000
--- a/cpukit/libnetworking/sys/kernel.h
+++ /dev/null
@@ -1,251 +0,0 @@
-/*-
- * Copyright (c) 1995 Terrence R. Lambert
- * All rights reserved.
- *
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)kernel.h	8.3 (Berkeley) 1/21/94
- * $Id$
- */
-
-#ifndef _SYS_KERNEL_H_
-#define _SYS_KERNEL_H_
-
-/* Global variables for the kernel. */
-
-/* 1.1 */
-extern long hostid;
-extern char hostname[MAXHOSTNAMELEN];
-extern int hostnamelen;
-extern char domainname[MAXHOSTNAMELEN];
-extern int domainnamelen;
-extern char kernelname[MAXPATHLEN];
-
-/* 1.2 */
-extern volatile struct timeval mono_time;
-extern struct timeval boottime;
-extern struct timeval runtime;
-/* extern volatile struct timeval time; */
-extern struct timezone tz;			/* XXX */
-
-extern int tick;			/* usec per tick (1000000 / hz) */
-extern int hz;				/* system clock's frequency */
-extern int psratio;			/* ratio: prof / stat */
-extern int stathz;			/* statistics clock's frequency */
-extern int profhz;			/* profiling clock's frequency */
-extern int ticks;
-extern int lbolt;			/* once a second sleep address */
-extern int tickdelta;
-extern long timedelta;
-
-/*
- * The following macros are used to declare global sets of objects, which
- * are collected by the linker into a `struct linker_set' as defined below.
- *
- * NB: the constants defined below must match those defined in
- * ld/ld.h.  Since their calculation requires arithmetic, we
- * can't name them symbolically (e.g., 23 is N_SETT | N_EXT).
- */
-#define MAKE_SET(set, sym, type)
-#define TEXT_SET(set, sym) MAKE_SET(set, sym, 23)
-#define DATA_SET(set, sym) MAKE_SET(set, sym, 25)
-#define BSS_SET(set, sym)  MAKE_SET(set, sym, 27)
-#define ABS_SET(set, sym)  MAKE_SET(set, sym, 21)
-
-
-/*
- * Enumerated types for known system startup interfaces.
- *
- * Startup occurs in ascending numeric order; the list entries are
- * sorted prior to attempting startup to guarantee order.  Items
- * of the same level are arbitrated for order based on the 'order'
- * element.
- *
- * These numbers are arbitrary and are chosen ONLY for ordering; the
- * enumeration values are explicit rather than implicit to provide
- * for binary compatibility with inserted elements.
- *
- * The SI_SUB_RUN_SCHEDULER value must have the highest lexical value.
- *
- * The SI_SUB_CONSOLE and SI_SUB_SWAP values represent values used by
- * the BSD 4.4Lite but not by FreeBSD; they are maintained in dependent
- * order to support porting.
- *
- * The SI_SUB_PROTO_BEGIN and SI_SUB_PROTO_END bracket a range of
- * initializations to take place at splimp().  This is a historical
- * wart that should be removed -- probably running everything at
- * splimp() until the first init that doesn't want it is the correct
- * fix.  They are currently present to ensure historical behavior.
- */
-enum sysinit_sub_id {
-	SI_SUB_DUMMY		= 0x00000000,	/* not executed; for linker*/
-	SI_SUB_CONSOLE		= 0x08000000,	/* console*/
-	SI_SUB_COPYRIGHT	= 0x08000001,	/* first use of console*/
-	SI_SUB_VM		= 0x10000000,	/* virtual memory system init*/
-	SI_SUB_KMEM		= 0x18000000,	/* kernel memory*/
-	SI_SUB_CPU		= 0x20000000,	/* CPU resource(s)*/
-	SI_SUB_DEVFS		= 0x22000000,	/* get DEVFS ready */
-	SI_SUB_DRIVERS		= 0x23000000,	/* Let Drivers initialize */
-	SI_SUB_CONFIGURE	= 0x24000000,	/* Configure devices */
-	SI_SUB_INTRINSIC	= 0x28000000,	/* proc 0*/
-	SI_SUB_RUN_QUEUE	= 0x30000000,	/* the run queue*/
-	SI_SUB_VM_CONF		= 0x38000000,	/* config VM, set limits*/
-	SI_SUB_VFS		= 0x40000000,	/* virtual file system*/
-	SI_SUB_CLOCKS		= 0x48000000,	/* real time and stat clocks*/
-	SI_SUB_MBUF		= 0x50000000,	/* mbufs*/
-	SI_SUB_CLIST		= 0x58000000,	/* clists*/
-	SI_SUB_SYSV_SHM		= 0x64000000,	/* System V shared memory*/
-	SI_SUB_SYSV_SEM		= 0x68000000,	/* System V semaphores*/
-	SI_SUB_SYSV_MSG		= 0x6C000000,	/* System V message queues*/
-	SI_SUB_PSEUDO		= 0x70000000,	/* pseudo devices*/
-	SI_SUB_PROTO_BEGIN	= 0x80000000,	/* XXX: set splimp (kludge)*/
-	SI_SUB_PROTO_IF		= 0x84000000,	/* interfaces*/
-	SI_SUB_PROTO_DOMAIN	= 0x88000000,	/* domains (address families?)*/
-	SI_SUB_PROTO_END	= 0x8fffffff,	/* XXX: set splx (kludge)*/
-	SI_SUB_KPROF		= 0x90000000,	/* kernel profiling*/
-	SI_SUB_KICK_SCHEDULER	= 0xa0000000,	/* start the timeout events*/
-	SI_SUB_ROOT		= 0xb0000000,	/* root mount*/
-	SI_SUB_ROOT_FDTAB	= 0xb8000000,	/* root vnode in fd table...*/
-	SI_SUB_SWAP		= 0xc0000000,	/* swap*/
-	SI_SUB_INTRINSIC_POST	= 0xd0000000,	/* proc 0 cleanup*/
-	SI_SUB_KTHREAD_INIT	= 0xe0000000,	/* init process*/
-	SI_SUB_KTHREAD_PAGE	= 0xe4000000,	/* pageout daemon*/
-	SI_SUB_KTHREAD_VM	= 0xe8000000,	/* vm daemon*/
-	SI_SUB_KTHREAD_UPDATE	= 0xec000000,	/* update daemon*/
-	SI_SUB_RUN_SCHEDULER	= 0xffffffff	/* scheduler: no return*/
-};
-
-
-/*
- * Some enumerated orders; "ANY" sorts last.
- */
-enum sysinit_elem_order {
-	SI_ORDER_FIRST		= 0x00000000,	/* first*/
-	SI_ORDER_SECOND		= 0x00000001,	/* second*/
-	SI_ORDER_THIRD		= 0x00000002,	/* third*/
-	SI_ORDER_MIDDLE		= 0x10000000,	/* somewhere in the middle */
-	SI_ORDER_ANY		= 0xffffffff	/* last*/
-};
-
-
-/*
- * System initialization call types; currently two are supported... one
- * to do a simple function call and one to cause a process to be started
- * by the kernel on the callers behalf.
- */
-typedef enum sysinit_elem_type {
-	SI_TYPE_DEFAULT		= 0x00000000,	/* No special processing*/
-	SI_TYPE_KTHREAD		= 0x00000001	/* start kernel thread*/
-} si_elem_t;
-
-
-/*
- * A system initialization call instance
- *
- * The subsystem
- */
-struct sysinit {
-	unsigned int	subsystem;		/* subsystem identifier*/
-	unsigned int	order;			/* init order within subsystem*/
-	void		(*func) __P((void *));	/* init function*/
-	void		*udata;			/* multiplexer/argument */
-	si_elem_t	type;			/* sysinit_elem_type*/
-};
-
-
-/*
- * Default: no special processing
- */
-#define	SYSINIT(uniquifier, subsystem, order, func, ident)	
-
-/*
- * Call 'fork()' before calling '(*func)(ident)';
- * for making a kernel 'thread' (or builtin process.)
- */
-#define	SYSINIT_KT(uniquifier, subsystem, order, func, ident)
-
-
-/*
- * A kernel process descriptor; used to start "internal" daemons
- *
- * Note: global_procpp may be NULL for no global save area
- */
-struct kproc_desc {
-	char		*arg0;			/* arg 0 (for 'ps' listing)*/
-	void		(*func) __P((void));	/* "main" for kernel process*/
-	struct proc	**global_procpp;	/* ptr to proc ptr save area*/
-};
-
-void	kproc_start __P((void *udata));
-
-#ifdef PSEUDO_LKM
-#include <sys/conf.h>
-#include <sys/exec.h>
-#include <sys/sysent.h>
-#include <sys/lkm.h>
-
-#define PSEUDO_SET(init, name) \
-	extern struct linker_set MODVNOPS; \
-	MOD_MISC(name); \
-	static int \
-	name ## _load(struct lkm_table *lkmtp, int cmd) \
-		{ init((void *)NULL /* XXX unused (?) */); return 0; } \
-	static int \
-	name ## _unload(struct lkm_table *lkmtp, int cmd) \
-		{ return EINVAL; } \
-	int \
-	name ## _mod(struct lkm_table *lkmtp, int cmd, int ver) { \
-		DISPATCH(lkmtp, cmd, ver, name ## _load, name ## _unload, \
-			 lkm_nullcmd); }
-#else /* PSEUDO_LKM */
-
-/*
- * Compatibility.  To be deprecated after LKM is updated.
- */
-#define	PSEUDO_SET(sym, name)	SYSINIT(ps, SI_SUB_PSEUDO, SI_ORDER_ANY, sym, 0)
-
-#endif /* PSEUDO_LKM */
-
-struct linker_set {
-	int		ls_length;
-	const void	*ls_items[1];		/* really ls_length of them,
-						 * trailing NULL */
-};
-
-extern struct linker_set execsw_set;
-
-#endif /* !_SYS_KERNEL_H_*/
diff --git a/cpukit/libnetworking/sys/libkern.h b/cpukit/libnetworking/sys/libkern.h
deleted file mode 100644
index c01e35b273..0000000000
--- a/cpukit/libnetworking/sys/libkern.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)libkern.h	8.1 (Berkeley) 6/10/93
- * $Id$
- */
-
-#ifndef _SYS_LIBKERN_H_
-#define	_SYS_LIBKERN_H_
-
-#include <sys/cdefs.h>
-#include <sys/types.h>
-
-/* BCD conversions. */
-extern u_char const	bcd2bin_data[];
-extern u_char const	bin2bcd_data[];
-extern char const	hex2ascii_data[];
-
-#define	bcd2bin(bcd)	(bcd2bin_data[bcd])
-#define	bin2bcd(bin)	(bin2bcd_data[bin])
-#define	hex2ascii(hex)	(hex2ascii_data[hex])
-
-static __inline int imax(int a, int b) { return (a > b ? a : b); }
-static __inline int imin(int a, int b) { return (a < b ? a : b); }
-static __inline long lmax(long a, long b) { return (a > b ? a : b); }
-static __inline long lmin(long a, long b) { return (a < b ? a : b); }
-static __inline u_int max(u_int a, u_int b) { return (a > b ? a : b); }
-static __inline u_int min(u_int a, u_int b) { return (a < b ? a : b); }
-static __inline quad_t qmax(quad_t a, quad_t b) { return (a > b ? a : b); }
-static __inline quad_t qmin(quad_t a, quad_t b) { return (a < b ? a : b); }
-static __inline u_long ulmax(u_long a, u_long b) { return (a > b ? a : b); }
-static __inline u_long ulmin(u_long a, u_long b) { return (a < b ? a : b); }
-
-/* Prototypes for non-quad routines. */
-int	 bcmp __P((const void *, const void *, size_t));
-#ifndef HAVE_INLINE_FFS
-int	 ffs __P((int));
-#endif
-#ifndef	HAVE_INLINE_FLS
-int	 fls __P((int));
-#endif
-int	 locc __P((int, char *, u_int));
-void	 qsort __P((void *base, size_t nmemb, size_t size,
-		    int (*compar)(const void *, const void *)));
-u_long	 random __P((void));
-char	*index __P((const char *, int));
-char	*rindex __P((const char *, int));
-int	 scanc __P((u_int, const u_char *, const u_char *, int));
-int	 skpc __P((int, int, char *));
-void	 srandom __P((u_long));
-char	*strcat __P((char *, const char *));
-int	 strcmp __P((const char *, const char *));
-char	*strdup __P((const char *s));
-char	*strcpy __P((char *, const char *));
-size_t	 strlen __P((const char *));
-int	 strncmp __P((const char *, const char *, size_t));
-char	*strncpy __P((char *, const char *, size_t));
-char	*strerror __P((int errnum));
-
-#endif /* !_SYS_LIBKERN_H_ */
diff --git a/cpukit/libnetworking/sys/malloc.h b/cpukit/libnetworking/sys/malloc.h
deleted file mode 100644
index ec85c1814d..0000000000
--- a/cpukit/libnetworking/sys/malloc.h
+++ /dev/null
@@ -1,355 +0,0 @@
-/*
- * Copyright (c) 1987, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)malloc.h	8.5 (Berkeley) 5/3/95
- * $Id$
- */
-
-#ifndef _SYS_MALLOC_H_
-#define	_SYS_MALLOC_H_
-
-#include <rtems/rtems_bsdnet_internal.h>  /* Ensure we get RTEMS malloc hooks */
-#define KMEMSTATS
-
-/*
- * flags to malloc
- */
-#define	M_WAITOK	0x0000
-#define	M_NOWAIT	0x0001
-#define M_KERNEL	0x0002
-
-/*
- * Types of memory to be allocated
- */
-#define	M_FREE		0	/* should be on free list */
-#define	M_MBUF		1	/* mbuf */
-#define	M_DEVBUF	2	/* device driver memory */
-#define	M_SOCKET	3	/* socket structure */
-#define	M_PCB		4	/* protocol control block */
-#define	M_RTABLE	5	/* routing tables */
-#define	M_HTABLE	6	/* IMP host tables */
-#define	M_FTABLE	7	/* fragment reassembly header */
-#define	M_ZOMBIE	8	/* zombie proc status */
-#define	M_IFADDR	9	/* interface address */
-#define	M_SOOPTS	10	/* socket options */
-#define	M_SONAME	11	/* socket name */
-#define	M_NAMEI		12	/* namei path name buffer */
-#define	M_GPROF		13	/* kernel profiling buffer */
-#define	M_IOCTLOPS	14	/* ioctl data buffer */
-#define	M_MAPMEM	15	/* mapped memory descriptors */
-#define	M_CRED		16	/* credentials */
-#define	M_PGRP		17	/* process group header */
-#define	M_SESSION	18	/* session header */
-#define	M_IOV		19	/* large iov's */
-#define	M_MOUNT		20	/* vfs mount struct */
-#define	M_FHANDLE	21	/* network file handle */
-#define	M_NFSREQ	22	/* NFS request header */
-#define	M_NFSMNT	23	/* NFS mount structure */
-#define	M_NFSNODE	24	/* NFS vnode private part */
-#define	M_VNODE		25	/* Dynamically allocated vnodes */
-#define	M_CACHE		26	/* Dynamically allocated cache entries */
-#define	M_DQUOT		27	/* UFS quota entries */
-#define	M_UFSMNT	28	/* UFS mount structure */
-#define	M_SHM		29	/* SVID compatible shared memory segments */
-#define	M_VMMAP		30	/* VM map structures */
-#define	M_VMMAPENT	31	/* VM map entry structures */
-#define	M_VMOBJ		32	/* VM object structure */
-#define	M_VMOBJHASH	33	/* VM object hash structure */
-#define	M_VMPMAP	34	/* VM pmap */
-#define	M_VMPVENT	35	/* VM phys-virt mapping entry */
-#define	M_VMPAGER	36	/* XXX: VM pager struct */
-#define	M_VMPGDATA	37	/* XXX: VM pager private data */
-#define	M_FILE		38	/* Open file structure */
-#define	M_FILEDESC	39	/* Open file descriptor table */
-#define	M_LOCKF		40	/* Byte-range locking structures */
-#define	M_PROC		41	/* Proc structures */
-#define	M_SUBPROC	42	/* Proc sub-structures */
-#define	M_SEGMENT	43	/* Segment for LFS */
-#define	M_LFSNODE	44	/* LFS vnode private part */
-#define	M_FFSNODE	45	/* FFS vnode private part */
-#define	M_MFSNODE	46	/* MFS vnode private part */
-#define	M_NQLEASE	47	/* Nqnfs lease */
-#define	M_NQMHOST	48	/* Nqnfs host address table */
-#define	M_NETADDR	49	/* Export host address structure */
-#define	M_NFSSVC	50	/* Nfs server structure */
-#define	M_NFSUID	51	/* Nfs uid mapping structure */
-#define	M_NFSD		52	/* Nfs server daemon structure */
-#define	M_IPMOPTS	53	/* internet multicast options */
-#define	M_IPMADDR	54	/* internet multicast address */
-#define	M_IFMADDR	55	/* link-level multicast address */
-#define	M_MRTABLE	56	/* multicast routing tables */
-#define M_ISOFSMNT	57	/* ISOFS mount structure */
-#define M_ISOFSNODE	58	/* ISOFS vnode private part */
-#define M_NFSRVDESC	59	/* NFS server socket descriptor */
-#define M_NFSDIROFF	60	/* NFS directory offset data */
-#define M_NFSBIGFH	61	/* NFS version 3 file handle */
-#define M_MSDOSFSMNT	67	/* MSDOSFS mount structure */
-#define M_MSDOSFSNODE	68	/* MSDOSFS vnode private part */
-#define M_MSDOSFSFAT	69	/* MSDOSFS file allocation table */
-#define M_DEVFSMNT	70	/* DEVFS mount structure */
-#define M_DEVFSBACK	71	/* DEVFS Back node */
-#define M_DEVFSFRONT	72	/* DEVFS Front node */
-#define M_DEVFSNODE	73	/* DEVFS node */
-#define	M_TEMP		74	/* misc temporary data buffers */
-#define M_TTYS		75	/* tty data structures */
-#define M_GZIP		76	/* Gzip trees */
-#define M_IPFW		77	/* IpFw/IpAcct chain's */
-#define M_DEVL		78	/* isa_device lists in userconfig() */
-#define M_PKTCLASS	79	/* structures used in packet classifier */
-#define	M_SYSCTL	80	/* sysctl internal magic */
-#define	M_SECA		81	/* security associations, key management */
-#define	M_BIOBUF	82	/* BIO buffer */
-#define	M_KTRACE	83	/* KTRACE */
-#define	M_SELECT	84	/* select() buffer */
-#define M_CFS		85	/* Coda */
-#define	M_LAST		86	/* Must be last type + 1 */
-
-#define INITKMEMNAMES { \
-	"free",		/* 0 M_FREE */ \
-	"mbuf",		/* 1 M_MBUF */ \
-	"devbuf",	/* 2 M_DEVBUF */ \
-	"socket",	/* 3 M_SOCKET */ \
-	"pcb",		/* 4 M_PCB */ \
-	"routetbl",	/* 5 M_RTABLE */ \
-	"hosttbl",	/* 6 M_HTABLE */ \
-	"fragtbl",	/* 7 M_FTABLE */ \
-	"zombie",	/* 8 M_ZOMBIE */ \
-	"ifaddr",	/* 9 M_IFADDR */ \
-	"soopts",	/* 10 M_SOOPTS */ \
-	"soname",	/* 11 M_SONAME */ \
-	"namei",	/* 12 M_NAMEI */ \
-	"gprof",	/* 13 M_GPROF */ \
-	"ioctlops",	/* 14 M_IOCTLOPS */ \
-	"mapmem",	/* 15 M_MAPMEM */ \
-	"cred",		/* 16 M_CRED */ \
-	"pgrp",		/* 17 M_PGRP */ \
-	"session",	/* 18 M_SESSION */ \
-	"iov",		/* 19 M_IOV */ \
-	"mount",	/* 20 M_MOUNT */ \
-	"fhandle",	/* 21 M_FHANDLE */ \
-	"NFS req",	/* 22 M_NFSREQ */ \
-	"NFS mount",	/* 23 M_NFSMNT */ \
-	"NFS node",	/* 24 M_NFSNODE */ \
-	"vnodes",	/* 25 M_VNODE */ \
-	"namecache",	/* 26 M_CACHE */ \
-	"UFS quota",	/* 27 M_DQUOT */ \
-	"UFS mount",	/* 28 M_UFSMNT */ \
-	"shm",		/* 29 M_SHM */ \
-	"VM map",	/* 30 M_VMMAP */ \
-	"VM mapent",	/* 31 M_VMMAPENT */ \
-	"VM object",	/* 32 M_VMOBJ */ \
-	"VM objhash",	/* 33 M_VMOBJHASH */ \
-	"VM pmap",	/* 34 M_VMPMAP */ \
-	"VM pvmap",	/* 35 M_VMPVENT */ \
-	"VM pager",	/* 36 M_VMPAGER */ \
-	"VM pgdata",	/* 37 M_VMPGDATA */ \
-	"file",		/* 38 M_FILE */ \
-	"file desc",	/* 39 M_FILEDESC */ \
-	"lockf",	/* 40 M_LOCKF */ \
-	"proc",		/* 41 M_PROC */ \
-	"subproc",	/* 42 M_SUBPROC */ \
-	"LFS segment",	/* 43 M_SEGMENT */ \
-	"LFS node",	/* 44 M_LFSNODE */ \
-	"FFS node",	/* 45 M_FFSNODE */ \
-	"MFS node",	/* 46 M_MFSNODE */ \
-	"NQNFS Lease",	/* 47 M_NQLEASE */ \
-	"NQNFS Host",	/* 48 M_NQMHOST */ \
-	"Export Host",	/* 49 M_NETADDR */ \
-	"NFS srvsock",	/* 50 M_NFSSVC */ \
-	"NFS uid",	/* 51 M_NFSUID */ \
-	"NFS daemon",	/* 52 M_NFSD */ \
-	"ip_moptions",	/* 53 M_IPMOPTS */ \
-	"in_multi",	/* 54 M_IPMADDR */ \
-	"ether_multi",	/* 55 M_IFMADDR */ \
-	"mrt",		/* 56 M_MRTABLE */ \
-	"ISOFS mount",	/* 57 M_ISOFSMNT */ \
-	"ISOFS node",	/* 58 M_ISOFSNODE */ \
-	"NFSV3 srvdesc",/* 59 M_NFSRVDESC */ \
-	"NFSV3 diroff",	/* 60 M_NFSDIROFF */ \
-	"NFSV3 bigfh",	/* 61 M_NFSBIGFH */ \
-	NULL, \
-	NULL, NULL, NULL, NULL, \
-	"MSDOSFS mount",/* 67 M_MSDOSFSMNT */ \
-	"MSDOSFS node",	/* 68 M_MSDOSFSNODE */ \
-	"MSDOSFS FAT",  /* 69 M_MSDOSFSFAR */ \
-	"DEVFS mount",	/* 70 M_DEVFSMNT */ \
-	"DEVFS back",	/* 71 M_DEVFSBACK */ \
-	"DEVFS front",	/* 72 M_DEVFSFRONT */ \
-	"DEVFS node",	/* 73 M_DEVFSNODE */ \
-	"temp",		/* 74 M_TEMP */ \
-	"ttys",		/* 75 M_TTYS */ \
-	"Gzip trees",	/* 76 M_GZIP */ \
-	"IpFw/IpAcct",	/* 77 M_IPFW */ \
-	"isa_devlist",	/* 78 M_DEVL */ \
-	"PktClass",	/* 79 M_PKTCLASS */ \
-	"sysctl",	/* 80 M_SYSCTL */ \
-	"key mgmt",	/* 81 M_SECA */ \
-	"BIO buffer",	/* 82 M_BIOBUF */ \
-	"KTRACE",	/* 83 M_KTRACE */ \
-	"select",	/* 84 M_SELECT */ \
-	"Coda",		/* 85 M_CFS */ \
-}
-
-struct kmemstats {
-	long	ks_inuse;	/* # of packets of this type currently in use */
-	long	ks_calls;	/* total packets of this type ever allocated */
-	long 	ks_memuse;	/* total memory held in bytes */
-	u_short	ks_limblocks;	/* number of times blocked for hitting limit */
-	u_short	ks_mapblocks;	/* number of times blocked for kernel map */
-	long	ks_maxused;	/* maximum number ever used */
-	long	ks_limit;	/* most that are allowed to exist */
-	long	ks_size;	/* sizes of this thing that are allocated */
-	long	ks_spare;
-};
-
-/*
- * Array of descriptors that describe the contents of each page
- */
-struct kmemusage {
-	short ku_indx;		/* bucket index */
-	union {
-		u_short freecnt;/* for small allocations, free pieces in page */
-		u_short pagecnt;/* for large allocations, pages alloced */
-	} ku_un;
-};
-#define ku_freecnt ku_un.freecnt
-#define ku_pagecnt ku_un.pagecnt
-
-/*
- * Set of buckets for each size of memory block that is retained
- */
-struct kmembuckets {
-	caddr_t kb_next;	/* list of free blocks */
-	caddr_t kb_last;	/* last free block */
-	long	kb_calls;	/* total calls to allocate this size */
-	long	kb_total;	/* total number of blocks allocated */
-	long	kb_totalfree;	/* # of free elements in this bucket */
-	long	kb_elmpercl;	/* # of elements in this sized allocation */
-	long	kb_highwat;	/* high water mark */
-	long	kb_couldfree;	/* over high water mark and could free */
-};
-
-#ifdef KERNEL
-#define	MINALLOCSIZE	(1 << MINBUCKET)
-#define BUCKETINDX(size) \
-	((size) <= (MINALLOCSIZE * 128) \
-		? (size) <= (MINALLOCSIZE * 8) \
-			? (size) <= (MINALLOCSIZE * 2) \
-				? (size) <= (MINALLOCSIZE * 1) \
-					? (MINBUCKET + 0) \
-					: (MINBUCKET + 1) \
-				: (size) <= (MINALLOCSIZE * 4) \
-					? (MINBUCKET + 2) \
-					: (MINBUCKET + 3) \
-			: (size) <= (MINALLOCSIZE* 32) \
-				? (size) <= (MINALLOCSIZE * 16) \
-					? (MINBUCKET + 4) \
-					: (MINBUCKET + 5) \
-				: (size) <= (MINALLOCSIZE * 64) \
-					? (MINBUCKET + 6) \
-					: (MINBUCKET + 7) \
-		: (size) <= (MINALLOCSIZE * 2048) \
-			? (size) <= (MINALLOCSIZE * 512) \
-				? (size) <= (MINALLOCSIZE * 256) \
-					? (MINBUCKET + 8) \
-					: (MINBUCKET + 9) \
-				: (size) <= (MINALLOCSIZE * 1024) \
-					? (MINBUCKET + 10) \
-					: (MINBUCKET + 11) \
-			: (size) <= (MINALLOCSIZE * 8192) \
-				? (size) <= (MINALLOCSIZE * 4096) \
-					? (MINBUCKET + 12) \
-					: (MINBUCKET + 13) \
-				: (size) <= (MINALLOCSIZE * 16384) \
-					? (MINBUCKET + 14) \
-					: (MINBUCKET + 15))
-
-/*
- * Turn virtual addresses into kmem map indices
- */
-#define kmemxtob(alloc)	(kmembase + (alloc) * PAGE_SIZE)
-#define btokmemx(addr)	(((caddr_t)(addr) - kmembase) / PAGE_SIZE)
-#define btokup(addr)	(&kmemusage[(caddr_t)(addr) - kmembase >> PAGE_SHIFT])
-
-/*
- * Macro versions for the usual cases of malloc/free
- */
-#if defined(KMEMSTATS) || defined(DIAGNOSTIC)
-#define	MALLOC(space, cast, size, type, flags) \
-	(space) = (cast)malloc((u_long)(size), type, flags)
-#define FREE(addr, type) free((addr), type)
-
-#else /* do not collect statistics */
-#define	MALLOC(space, cast, size, type, flags) { \
-	register struct kmembuckets *kbp = &bucket[BUCKETINDX(size)]; \
-	long s = splimp(); \
-	if (kbp->kb_next == NULL) { \
-		(space) = (cast)malloc((u_long)(size), type, flags); \
-	} else { \
-		(space) = (cast)kbp->kb_next; \
-		kbp->kb_next = *(caddr_t *)(space); \
-	} \
-	splx(s); \
-}
-
-#define FREE(addr, type) { \
-	register struct kmembuckets *kbp; \
-	register struct kmemusage *kup = btokup(addr); \
-	long s = splimp(); \
-	if (1 << kup->ku_indx > MAXALLOCSAVE) { \
-		free((addr), type); \
-	} else { \
-		kbp = &bucket[kup->ku_indx]; \
-		if (kbp->kb_next == NULL) \
-			kbp->kb_next = (caddr_t)(addr); \
-		else \
-			*(caddr_t *)(kbp->kb_last) = (caddr_t)(addr); \
-		*(caddr_t *)(addr) = NULL; \
-		kbp->kb_last = (caddr_t)(addr); \
-	} \
-	splx(s); \
-}
-#endif /* do not collect statistics */
-
-extern struct kmemstats kmemstats[];
-extern struct kmemusage *kmemusage;
-extern char *kmembase;
-extern struct kmembuckets bucket[];
-
-void	*contigmalloc __P((unsigned long size, int type, int flags,
-			   unsigned long low, unsigned long high,
-			   unsigned long alignment, unsigned long boundary));
-void	free __P((void *addr, int type));
-void	*malloc __P((unsigned long size, int type, int flags));
-#endif /* KERNEL */
-
-#endif /* !_SYS_MALLOC_H_ */
diff --git a/cpukit/libnetworking/sys/mbuf.h b/cpukit/libnetworking/sys/mbuf.h
deleted file mode 100644
index b380b3fca3..0000000000
--- a/cpukit/libnetworking/sys/mbuf.h
+++ /dev/null
@@ -1,439 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)mbuf.h	8.5 (Berkeley) 2/19/95
- * $Id$
- */
-
-#ifndef _SYS_MBUF_H_
-#define _SYS_MBUF_H_
-
-#ifndef M_WAITOK
-#include <sys/malloc.h>
-#endif
-
-/*
- * Mbufs are of a single size, MSIZE (machine/machparam.h), which
- * includes overhead.  An mbuf may add a single "mbuf cluster" of size
- * MCLBYTES (also in machine/machparam.h), which has no additional overhead
- * and is used instead of the internal data area; this is done when
- * at least MINCLSIZE of data must be stored.
- */
-
-#define	MLEN		(MSIZE - sizeof(struct m_hdr))	/* normal data len */
-#define	MHLEN		(MLEN - sizeof(struct pkthdr))	/* data len w/pkthdr */
-
-#define	MINCLSIZE	(MHLEN + MLEN)	/* smallest amount to put in cluster */
-#define	M_MAXCOMPRESS	(MHLEN / 2)	/* max amount to copy for compression */
-
-/*
- * Macros for type conversion
- * mtod(m,t) -	convert mbuf pointer to data pointer of correct type
- * dtom(x) -	convert data pointer within mbuf to mbuf pointer (XXX)
- * mtocl(x) -	convert pointer within cluster to cluster index #
- * cltom(x) -	convert cluster # to ptr to beginning of cluster
- */
-#define	mtod(m,t)	((t)((m)->m_data))
-#define	dtom(x)		((struct mbuf *)((long)(x) & ~(MSIZE-1)))
-#define	mtocl(x)	(((u_long)(x) - (u_long)mbutl) >> MCLSHIFT)
-#define	cltom(x)	((caddr_t)((u_long)mbutl + ((u_long)(x) << MCLSHIFT)))
-
-/* header at beginning of each mbuf: */
-struct m_hdr {
-	struct	mbuf *mh_next;		/* next buffer in chain */
-	struct	mbuf *mh_nextpkt;	/* next chain in queue/record */
-	caddr_t	mh_data;		/* location of data */
-	int	mh_len;			/* amount of data in this mbuf */
-	short	mh_type;		/* type of data in this mbuf */
-	short	mh_flags;		/* flags; see below */
-};
-
-/* record/packet header in first mbuf of chain; valid if M_PKTHDR set */
-struct	pkthdr {
-	struct	ifnet *rcvif;		/* rcv interface */
-	int	len;			/* total packet length */
-};
-
-/* description of external storage mapped into mbuf, valid if M_EXT set */
-struct m_ext {
-	caddr_t	ext_buf;		/* start of buffer */
-	void	(*ext_free)		/* free routine if not the usual */
-		__P((caddr_t, u_int));
-	u_int	ext_size;		/* size of buffer, for ext_free */
-	void	(*ext_ref)		/* add a reference to the ext object */
-		__P((caddr_t, u_int));
-};
-
-struct mbuf {
-	struct	m_hdr m_hdr;
-	union {
-		struct {
-			struct	pkthdr MH_pkthdr;	/* M_PKTHDR set */
-			union {
-				struct	m_ext MH_ext;	/* M_EXT set */
-				char	MH_databuf[MHLEN];
-			} MH_dat;
-		} MH;
-		char	M_databuf[MLEN];		/* !M_PKTHDR, !M_EXT */
-	} M_dat;
-};
-#define	m_next		m_hdr.mh_next
-#define	m_len		m_hdr.mh_len
-#define	m_data		m_hdr.mh_data
-#define	m_type		m_hdr.mh_type
-#define	m_flags		m_hdr.mh_flags
-#define	m_nextpkt	m_hdr.mh_nextpkt
-#define	m_act		m_nextpkt
-#define	m_pkthdr	M_dat.MH.MH_pkthdr
-#define	m_ext		M_dat.MH.MH_dat.MH_ext
-#define	m_pktdat	M_dat.MH.MH_dat.MH_databuf
-#define	m_dat		M_dat.M_databuf
-
-/* mbuf flags */
-#define	M_EXT		0x0001	/* has associated external storage */
-#define	M_PKTHDR	0x0002	/* start of record */
-#define	M_EOR		0x0004	/* end of record */
-#define	M_PROTO1	0x0008	/* protocol-specific */
-
-/* mbuf pkthdr flags, also in m_flags */
-#define	M_BCAST		0x0100	/* send/received as link-level broadcast */
-#define	M_MCAST		0x0200	/* send/received as link-level multicast */
-
-/* flags copied when copying m_pkthdr */
-#define	M_COPYFLAGS	(M_PKTHDR|M_EOR|M_PROTO1|M_BCAST|M_MCAST)
-
-/* mbuf types */
-#define	MT_FREE		0	/* should be on free list */
-#define	MT_DATA		1	/* dynamic (data) allocation */
-#define	MT_HEADER	2	/* packet header */
-#define	MT_SOCKET	3	/* socket structure */
-#define	MT_PCB		4	/* protocol control block */
-#define	MT_RTABLE	5	/* routing tables */
-#define	MT_HTABLE	6	/* IMP host tables */
-#define	MT_ATABLE	7	/* address resolution tables */
-#define	MT_SONAME	8	/* socket name */
-#define	MT_SOOPTS	10	/* socket options */
-#define	MT_FTABLE	11	/* fragment reassembly header */
-#define	MT_RIGHTS	12	/* access rights */
-#define	MT_IFADDR	13	/* interface address */
-#define MT_CONTROL	14	/* extra-data protocol message */
-#define MT_OOBDATA	15	/* expedited data  */
-
-/* flags to m_get/MGET */
-#define	M_DONTWAIT	M_NOWAIT
-#define	M_WAIT		M_WAITOK
-
-/* Freelists:
- *
- * Normal mbuf clusters are normally treated as character arrays
- * after allocation, but use the first word of the buffer as a free list
- * pointer while on the free list.
- */
-union mcluster {
-	union	mcluster *mcl_next;
-	char	mcl_buf[MCLBYTES];
-};
-
-/*
- * mbuf utility macros:
- *
- *	MBUFLOCK(code)
- * prevents a section of code from from being interrupted by network
- * drivers.
- */
-#define	MBUFLOCK(code) \
-	{ int ms = splimp(); \
-	  { code } \
-	  splx(ms); \
-	}
-
-/*
- * mbuf allocation/deallocation macros:
- *
- *	MGET(struct mbuf *m, int how, int type)
- * allocates an mbuf and initializes it to contain internal data.
- *
- *	MGETHDR(struct mbuf *m, int how, int type)
- * allocates an mbuf and initializes it to contain a packet header
- * and internal data.
- */
-#define	MGET(m, how, type) { \
-	  int _ms = splimp(); \
-	  if (mmbfree == 0) \
-		(void)m_mballoc(1, (how)); \
-	  if (((m) = mmbfree) != 0) { \
-		mmbfree = (m)->m_next; \
-		mbstat.m_mtypes[MT_FREE]--; \
-		(m)->m_type = (type); \
-		mbstat.m_mtypes[type]++; \
-		(m)->m_next = (struct mbuf *)NULL; \
-		(m)->m_nextpkt = (struct mbuf *)NULL; \
-		(m)->m_data = (m)->m_dat; \
-		(m)->m_flags = 0; \
-		splx(_ms); \
-	} else { \
-		splx(_ms); \
-		(m) = m_retry((how), (type)); \
-	} \
-}
-
-#define	MGETHDR(m, how, type) { \
-	  int _ms = splimp(); \
-	  if (mmbfree == 0) \
-		(void)m_mballoc(1, (how)); \
-	  if (((m) = mmbfree) != 0) { \
-		mmbfree = (m)->m_next; \
-		mbstat.m_mtypes[MT_FREE]--; \
-		(m)->m_type = (type); \
-		mbstat.m_mtypes[type]++; \
-		(m)->m_next = (struct mbuf *)NULL; \
-		(m)->m_nextpkt = (struct mbuf *)NULL; \
-		(m)->m_data = (m)->m_pktdat; \
-		(m)->m_flags = M_PKTHDR; \
-		splx(_ms); \
-	} else { \
-		splx(_ms); \
-		(m) = m_retryhdr((how), (type)); \
-	} \
-}
-
-/*
- * Mbuf cluster macros.
- * MCLALLOC(caddr_t p, int how) allocates an mbuf cluster.
- * MCLGET adds such clusters to a normal mbuf;
- * the flag M_EXT is set upon success.
- * MCLFREE releases a reference to a cluster allocated by MCLALLOC,
- * freeing the cluster if the reference count has reached 0.
- */
-#define	MCLALLOC(p, how) \
-	MBUFLOCK( \
-	  if (mclfree == 0) \
-		(void)m_clalloc(1, (how)); \
-	  if (((p) = (caddr_t)mclfree) != 0) { \
-		++mclrefcnt[mtocl(p)]; \
-		mbstat.m_clfree--; \
-		mclfree = ((union mcluster *)(p))->mcl_next; \
-	  } \
-	)
-
-#define	MCLGET(m, how) \
-	{ MCLALLOC((m)->m_ext.ext_buf, (how)); \
-	  if ((m)->m_ext.ext_buf != NULL) { \
-		(m)->m_data = (m)->m_ext.ext_buf; \
-		(m)->m_flags |= M_EXT; \
-		(m)->m_ext.ext_free = NULL;  \
-		(m)->m_ext.ext_ref = NULL;  \
-		(m)->m_ext.ext_size = MCLBYTES;  \
-	  } \
-	}
-
-#define	MCLFREE(p) \
-	MBUFLOCK ( \
-	  if (--mclrefcnt[mtocl(p)] == 0) { \
-		((union mcluster *)(p))->mcl_next = mclfree; \
-		mclfree = (union mcluster *)(p); \
-		mbstat.m_clfree++; \
-	  } \
-	)
-
-/*
- * MFREE(struct mbuf *m, struct mbuf *n)
- * Free a single mbuf and associated external storage.
- * Place the successor, if any, in n.
- */
-#define	MFREE(m, n) \
-	MBUFLOCK(  \
-	  mbstat.m_mtypes[(m)->m_type]--; \
-	  if ((m)->m_flags & M_EXT) { \
-		if ((m)->m_ext.ext_free) \
-			(*((m)->m_ext.ext_free))((m)->m_ext.ext_buf, \
-			    (m)->m_ext.ext_size); \
-		else { \
-			char *p = (m)->m_ext.ext_buf; \
-			if (--mclrefcnt[mtocl(p)] == 0) { \
-				((union mcluster *)(p))->mcl_next = mclfree; \
-				mclfree = (union mcluster *)(p); \
-				mbstat.m_clfree++; \
-			} \
-		} \
-	  } \
-	  (n) = (m)->m_next; \
-	  (m)->m_type = MT_FREE; \
-	  mbstat.m_mtypes[MT_FREE]++; \
-	  (m)->m_next = mmbfree; \
-	  mmbfree = (m); \
-	)
-
-/*
- * Copy mbuf pkthdr from from to to.
- * from must have M_PKTHDR set, and to must be empty.
- */
-#define	M_COPY_PKTHDR(to, from) { \
-	(to)->m_pkthdr = (from)->m_pkthdr; \
-	(to)->m_flags = (from)->m_flags & M_COPYFLAGS; \
-	(to)->m_data = (to)->m_pktdat; \
-}
-
-/*
- * Set the m_data pointer of a newly-allocated mbuf (m_get/MGET) to place
- * an object of the specified size at the end of the mbuf, longword aligned.
- */
-#define	M_ALIGN(m, len) \
-	{ (m)->m_data += (MLEN - (len)) &~ (sizeof(long) - 1); }
-/*
- * As above, for mbufs allocated with m_gethdr/MGETHDR
- * or initialized by M_COPY_PKTHDR.
- */
-#define	MH_ALIGN(m, len) \
-	{ (m)->m_data += (MHLEN - (len)) &~ (sizeof(long) - 1); }
-
-/*
- * Compute the amount of space available
- * before the current start of data in an mbuf.
- */
-#define	M_LEADINGSPACE(m) \
-	((m)->m_flags & M_EXT ? /* (m)->m_data - (m)->m_ext.ext_buf */ 0 : \
-	    (m)->m_flags & M_PKTHDR ? (m)->m_data - (m)->m_pktdat : \
-	    (m)->m_data - (m)->m_dat)
-
-/*
- * Compute the amount of space available
- * after the end of data in an mbuf.
- */
-#define	M_TRAILINGSPACE(m) \
-	((m)->m_flags & M_EXT ? (m)->m_ext.ext_buf + (m)->m_ext.ext_size - \
-	    ((m)->m_data + (m)->m_len) : \
-	    &(m)->m_dat[MLEN] - ((m)->m_data + (m)->m_len))
-
-/*
- * Arrange to prepend space of size plen to mbuf m.
- * If a new mbuf must be allocated, how specifies whether to wait.
- * If how is M_DONTWAIT and allocation fails, the original mbuf chain
- * is freed and m is set to NULL.
- */
-#define	M_PREPEND(m, plen, how) { \
-	if (M_LEADINGSPACE(m) >= (plen)) { \
-		(m)->m_data -= (plen); \
-		(m)->m_len += (plen); \
-	} else \
-		(m) = m_prepend((m), (plen), (how)); \
-	if ((m) && (m)->m_flags & M_PKTHDR) \
-		(m)->m_pkthdr.len += (plen); \
-}
-
-/* change mbuf to new type */
-#define MCHTYPE(m, t) { \
-	MBUFLOCK(mbstat.m_mtypes[(m)->m_type]--; mbstat.m_mtypes[t]++;) \
-	(m)->m_type = t;\
-}
-
-/* length to m_copy to copy all */
-#define	M_COPYALL	1000000000
-
-/* compatibility with 4.3 */
-#define  m_copy(m, o, l)	m_copym((m), (o), (l), M_DONTWAIT)
-
-/*
- * Mbuf statistics.
- */
-struct mbstat {
-	u_long	m_mbufs;	/* mbufs obtained from page pool */
-	u_long	m_clusters;	/* clusters obtained from page pool */
-	u_long	m_spare;	/* spare field */
-	u_long	m_clfree;	/* free clusters */
-	u_long	m_drops;	/* times failed to find space */
-	u_long	m_wait;		/* times waited for space */
-	u_long	m_drain;	/* times drained protocols for space */
-	u_short	m_mtypes[256];	/* type specific mbuf allocations */
-};
-
-#ifdef	KERNEL
-extern struct mbuf *mbutl;		/* virtual address of mclusters */
-extern char	*mclrefcnt;		/* cluster reference counts */
-extern struct mbstat mbstat;
-extern int	nmbclusters;
-extern int	nmbufs;
-extern struct mbuf *mmbfree;
-extern union mcluster *mclfree;
-extern int	max_linkhdr;		/* largest link-level header */
-extern int	max_protohdr;		/* largest protocol header */
-extern int	max_hdr;		/* largest link+protocol header */
-extern int	max_datalen;		/* MHLEN - max_hdr */
-extern int	mbtypes[];		/* XXX */
-
-struct	mbuf *m_copym __P((struct mbuf *, int, int, int));
-struct	mbuf *m_copypacket __P((struct mbuf *, int));
-struct	mbuf *m_devget __P((char *, int, int, struct ifnet *,
-			    void (*copy)(char *, caddr_t, u_int)));
-struct	mbuf *m_free __P((struct mbuf *));
-struct	mbuf *m_get __P((int, int));
-struct	mbuf *m_getclr __P((int, int));
-struct	mbuf *m_gethdr __P((int, int));
-struct	mbuf *m_prepend __P((struct mbuf *,int,int));
-struct	mbuf *m_pullup __P((struct mbuf *, int));
-struct	mbuf *m_retry __P((int, int));
-struct	mbuf *m_retryhdr __P((int, int));
-struct	mbuf *m_split __P((struct mbuf *,int,int));
-void	m_adj __P((struct mbuf *, int));
-void	m_cat __P((struct mbuf *,struct mbuf *));
-int	m_mballoc __P((int, int));
-int	m_clalloc __P((int, int));
-void	m_copyback __P((struct mbuf *, int, int, caddr_t));
-void	m_copydata __P((struct mbuf *,int,int,caddr_t));
-void	m_freem __P((struct mbuf *));
-
-#ifdef MBTYPES
-int mbtypes[] = {				/* XXX */
-	M_FREE,		/* MT_FREE	0	   should be on free list */
-	M_MBUF,		/* MT_DATA	1	   dynamic (data) allocation */
-	M_MBUF,		/* MT_HEADER	2	   packet header */
-	M_SOCKET,	/* MT_SOCKET	3	   socket structure */
-	M_PCB,		/* MT_PCB	4	   protocol control block */
-	M_RTABLE,	/* MT_RTABLE	5	   routing tables */
-	M_HTABLE,	/* MT_HTABLE	6	   IMP host tables */
-	0,		/* MT_ATABLE	7	   address resolution tables */
-	M_MBUF,		/* MT_SONAME	8	   socket name */
-	0,		/* 		9 */
-	M_SOOPTS,	/* MT_SOOPTS	10	   socket options */
-	M_FTABLE,	/* MT_FTABLE	11	   fragment reassembly header */
-	M_MBUF,		/* MT_RIGHTS	12	   access rights */
-	M_IFADDR,	/* MT_IFADDR	13	   interface address */
-	M_MBUF,		/* MT_CONTROL	14	   extra-data protocol message */
-	M_MBUF,		/* MT_OOBDATA	15	   expedited data  */
-#ifdef DATAKIT
-	25, 26, 27, 28, 29, 30, 31, 32		/* datakit ugliness */
-#endif
-};
-#endif
-#endif
-
-#endif /* !_SYS_MBUF_H_ */
diff --git a/cpukit/libnetworking/sys/mount.h b/cpukit/libnetworking/sys/mount.h
deleted file mode 100644
index a6254e302d..0000000000
--- a/cpukit/libnetworking/sys/mount.h
+++ /dev/null
@@ -1,531 +0,0 @@
-/*
- * Copyright (c) 1989, 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)mount.h	8.13 (Berkeley) 3/27/94
- *	$Id$
- */
-
-#ifndef _SYS_MOUNT_H_
-#define _SYS_MOUNT_H_
-
-#ifndef KERNEL
-#include <sys/ucred.h>
-#endif
-#include <sys/queue.h>
-
-typedef struct fsid { long val[2]; } fsid_t;	/* file system id type */
-
-/*
- * File identifier.
- * These are unique per filesystem on a single machine.
- */
-#define	MAXFIDSZ	16
-
-struct fid {
-	u_short		fid_len;		/* length of data in bytes */
-	u_short		fid_reserved;		/* force longword alignment */
-	char		fid_data[MAXFIDSZ];	/* data (variable length) */
-};
-
-/*
- * file system statistics
- */
-
-#define MNAMELEN 90	/* length of buffer for returned name */
-
-struct statfs {
-	long	f_spare2;		/* placeholder */
-	long	f_bsize;		/* fundamental file system block size */
-	long	f_iosize;		/* optimal transfer block size */
-	long	f_blocks;		/* total data blocks in file system */
-	long	f_bfree;		/* free blocks in fs */
-	long	f_bavail;		/* free blocks avail to non-superuser */
-	long	f_files;		/* total file nodes in file system */
-	long	f_ffree;		/* free file nodes in fs */
-	fsid_t	f_fsid;			/* file system id */
-	uid_t	f_owner;		/* user that mounted the filesystem */
-	int	f_type;			/* type of filesystem (see below) */
-	int	f_flags;		/* copy of mount flags */
-	long	f_spare[6];		/* spare for later */
-	char	f_mntonname[MNAMELEN];	/* directory on which mounted */
-	char	f_mntfromname[MNAMELEN];/* mounted filesystem */
-};
-
-/*
- * File system types.
- */
-#define	MOUNT_NONE	0
-#define	MOUNT_UFS	1	/* Fast Filesystem */
-#define	MOUNT_NFS	2	/* Sun-compatible Network Filesystem */
-#define	MOUNT_MFS	3	/* Memory-based Filesystem */
-#define	MOUNT_MSDOS	4	/* MS/DOS Filesystem */
-#define	MOUNT_LFS	5	/* Log-based Filesystem */
-#define	MOUNT_LOFS	6	/* Loopback Filesystem */
-#define	MOUNT_FDESC	7	/* File Descriptor Filesystem */
-#define	MOUNT_PORTAL	8	/* Portal Filesystem */
-#define MOUNT_NULL	9	/* Minimal Filesystem Layer */
-#define MOUNT_UMAP	10	/* User/Group Identifier Remapping Filesystem */
-#define MOUNT_KERNFS	11	/* Kernel Information Filesystem */
-#define MOUNT_PROCFS	12	/* /proc Filesystem */
-#define MOUNT_AFS	13	/* Andrew Filesystem */
-#define MOUNT_CD9660	14	/* ISO9660 (aka CDROM) Filesystem */
-#define MOUNT_UNION	15	/* Union (translucent) Filesystem */
-#define MOUNT_DEVFS	16	/* existing device Filesystem */
-#define	MOUNT_EXT2FS	17	/* Linux EXT2FS */
-#define MOUNT_TFS	18	/* Netcon Novell filesystem */
-#define	MOUNT_CFS	19	/* Coda filesystem */
-#define	MOUNT_MAXTYPE	19
-
-#define INITMOUNTNAMES { \
-	"none",		/*  0 MOUNT_NONE */ \
-	"ufs",		/*  1 MOUNT_UFS */ \
-	"nfs",		/*  2 MOUNT_NFS */ \
-	"mfs",		/*  3 MOUNT_MFS */ \
-	"msdos",	/*  4 MOUNT_MSDOS */ \
-	"lfs",		/*  5 MOUNT_LFS */ \
-	"lofs",		/*  6 MOUNT_LOFS */ \
-	"fdesc",	/*  7 MOUNT_FDESC */ \
-	"portal",	/*  8 MOUNT_PORTAL */ \
-	"null",		/*  9 MOUNT_NULL */ \
-	"umap",		/* 10 MOUNT_UMAP */ \
-	"kernfs",	/* 11 MOUNT_KERNFS */ \
-	"procfs",	/* 12 MOUNT_PROCFS */ \
-	"afs",		/* 13 MOUNT_AFS */ \
-	"cd9660",	/* 14 MOUNT_CD9660 */ \
-	"union",	/* 15 MOUNT_UNION */ \
-	"devfs",	/* 16 MOUNT_DEVFS */ \
-	"ext2fs",	/* 17 MOUNT_EXT2FS */ \
-	"tfs",		/* 18 MOUNT_TFS */ \
-	"cfs",		/* 19 MOUNT_CFS */ \
-	0,		/* 20 MOUNT_SPARE */ \
-}
-
-/*
- * Structure per mounted file system.  Each mounted file system has an
- * array of operations and an instance record.  The file systems are
- * put on a doubly linked list.
- */
-LIST_HEAD(vnodelst, vnode);
-
-struct mount {
-	CIRCLEQ_ENTRY(mount) mnt_list;		/* mount list */
-	struct vfsops	*mnt_op;		/* operations on fs */
-	struct vfsconf	*mnt_vfc;		/* configuration info */
-	struct vnode	*mnt_vnodecovered;	/* vnode we mounted on */
-	struct vnodelst	mnt_vnodelist;		/* list of vnodes this mount */
-	int		mnt_flag;		/* flags */
-	int		mnt_maxsymlinklen;	/* max size of short symlink */
-	struct statfs	mnt_stat;		/* cache of filesystem stats */
-	qaddr_t		mnt_data;		/* private data */
-/*	struct vfsconf	*mnt_vfc; */		/* configuration info */
-	time_t		mnt_time;		/* last time written*/
-};
-
-/*
- * Mount flags.
- *
- * Unmount uses MNT_FORCE flag.
- */
-#define	MNT_RDONLY	0x00000001	/* read only filesystem */
-#define	MNT_SYNCHRONOUS	0x00000002	/* file system written synchronously */
-#define	MNT_NOEXEC	0x00000004	/* can't exec from filesystem */
-#define	MNT_NOSUID	0x00000008	/* don't honor setuid bits on fs */
-#define	MNT_NODEV	0x00000010	/* don't interpret special files */
-#define	MNT_UNION	0x00000020	/* union with underlying filesystem */
-#define	MNT_ASYNC	0x00000040	/* file system written asynchronously */
-#define	MNT_NOATIME	0x10000000	/* Disable update of file access times */
-
-/*
- * exported mount flags.
- */
-#define	MNT_EXRDONLY	0x00000080	/* exported read only */
-#define	MNT_EXPORTED	0x00000100	/* file system is exported */
-#define	MNT_DEFEXPORTED	0x00000200	/* exported to the world */
-#define	MNT_EXPORTANON	0x00000400	/* use anon uid mapping for everyone */
-#define	MNT_EXKERB	0x00000800	/* exported with Kerberos uid mapping */
-
-/*
- * Flags set by internal operations.
- */
-#define	MNT_LOCAL	0x00001000	/* filesystem is stored locally */
-#define	MNT_QUOTA	0x00002000	/* quotas are enabled on filesystem */
-#define	MNT_ROOTFS	0x00004000	/* identifies the root filesystem */
-#define	MNT_USER	0x00008000	/* mounted by a user */
-
-/*
- * Mask of flags that are visible to statfs()
- */
-#define	MNT_VISFLAGMASK	(MNT_RDONLY|MNT_SYNCHRONOUS|MNT_NOEXEC|MNT_NOSUID| \
-			 MNT_NODEV|MNT_UNION|MNT_ASYNC|MNT_EXRDONLY|MNT_EXPORTED| \
-			 MNT_DEFEXPORTED|MNT_EXPORTANON|MNT_EXKERB|MNT_LOCAL| \
-			 MNT_QUOTA|MNT_ROOTFS|MNT_USER|MNT_NOATIME)
-
-/*
- * filesystem control flags.
- *
- * MNT_MLOCK lock the mount entry so that name lookup cannot proceed
- * past the mount point.  This keeps the subtree stable during mounts
- * and unmounts.
- */
-#define	MNT_UPDATE	0x00010000	/* not a real mount, just an update */
-#define	MNT_DELEXPORT	0x00020000	/* delete export host lists */
-#define	MNT_RELOAD	0x00040000	/* reload filesystem data */
-#define	MNT_FORCE	0x00080000	/* force unmount or readonly change */
-#define	MNT_MLOCK	0x00100000	/* lock so that subtree is stable */
-#define	MNT_MWAIT	0x00200000	/* someone is waiting for lock */
-#define MNT_MPBUSY	0x00400000	/* scan of mount point in progress */
-#define MNT_MPWANT	0x00800000	/* waiting for mount point */
-#define MNT_UNMOUNT	0x01000000	/* unmount in progress */
-#define MNT_WANTRDWR	0x02000000	/* want upgrade to read/write */
-
-/*
- * used to get configured filesystems information
- */
-#define VFS_MAXNAMELEN 32
-struct vfsconf {
-	void *vfc_vfsops;
-	char vfc_name[VFS_MAXNAMELEN];
-	int vfc_index;
-	int vfc_refcount;
-	int vfc_flags;
-};
-
-/*
- * NB: these flags refer to IMPLEMENTATION properties, not properties of
- * any actual mounts; i.e., it does not make sense to change the flags.
- */
-#define	VFCF_STATIC	0x00000001	/* statically compiled into kernel */
-#define	VFCF_NETWORK	0x00000002	/* may get data over the network */
-#define	VFCF_READONLY	0x00000004	/* writes are not implemented */
-#define VFCF_SYNTHETIC	0x00000008	/* data does not represent real files */
-#define	VFCF_LOOPBACK	0x00000010	/* aliases some other mounted FS */
-#define	VFCF_UNICODE	0x00000020	/* stores file names as Unicode*/
-
-/*
- * Operations supported on mounted file system.
- */
-#ifdef KERNEL
-
-extern	int	doforce;	/* Flag to permit forcible unmounting. */
-extern struct vfsconf void_vfsconf;
-extern struct vfsconf *vfsconf[];
-
-#ifdef __STDC__
-struct nameidata;
-struct mbuf;
-#endif
-
-struct vfsops {
-	int	(*vfs_mount)	__P((struct mount *mp, char *path, caddr_t data,
-				    struct nameidata *ndp, struct proc *p));
-	int	(*vfs_start)	__P((struct mount *mp, int flags,
-				    struct proc *p));
-	int	(*vfs_unmount)	__P((struct mount *mp, int mntflags,
-				    struct proc *p));
-	int	(*vfs_root)	__P((struct mount *mp, struct vnode **vpp));
-	int	(*vfs_quotactl)	__P((struct mount *mp, int cmds, uid_t uid,
-				    caddr_t arg, struct proc *p));
-	int	(*vfs_statfs)	__P((struct mount *mp, struct statfs *sbp,
-				    struct proc *p));
-	int	(*vfs_sync)	__P((struct mount *mp, int waitfor,
-				    struct ucred *cred, struct proc *p));
-	int	(*vfs_vget)	__P((struct mount *mp, ino_t ino,
-				    struct vnode **vpp));
-	int	(*vfs_fhtovp)	__P((struct mount *mp, struct fid *fhp,
-				    struct mbuf *nam, struct vnode **vpp,
-				    int *exflagsp, struct ucred **credanonp));
-	int	(*vfs_vptofh)	__P((struct vnode *vp, struct fid *fhp));
-	int	(*vfs_init)	__P((void));
-};
-
-#define VFS_MOUNT(MP, PATH, DATA, NDP, P) \
-	(*(MP)->mnt_op->vfs_mount)(MP, PATH, DATA, NDP, P)
-#define VFS_START(MP, FLAGS, P)	  (*(MP)->mnt_op->vfs_start)(MP, FLAGS, P)
-#define VFS_UNMOUNT(MP, FORCE, P) (*(MP)->mnt_op->vfs_unmount)(MP, FORCE, P)
-#define VFS_ROOT(MP, VPP)	  (*(MP)->mnt_op->vfs_root)(MP, VPP)
-#define VFS_QUOTACTL(MP,C,U,A,P)  (*(MP)->mnt_op->vfs_quotactl)(MP, C, U, A, P)
-#define VFS_STATFS(MP, SBP, P)	  (*(MP)->mnt_op->vfs_statfs)(MP, SBP, P)
-#define VFS_SYNC(MP, WAIT, C, P)  (*(MP)->mnt_op->vfs_sync)(MP, WAIT, C, P)
-#define VFS_VGET(MP, INO, VPP)	  (*(MP)->mnt_op->vfs_vget)(MP, INO, VPP)
-#define VFS_FHTOVP(MP, FIDP, NAM, VPP, EXFLG, CRED) \
-	(*(MP)->mnt_op->vfs_fhtovp)(MP, FIDP, NAM, VPP, EXFLG, CRED)
-#define	VFS_VPTOFH(VP, FIDP)	  (*(VP)->v_mount->mnt_op->vfs_vptofh)(VP, FIDP)
-
-#ifdef VFS_LKM
-#include <sys/conf.h>
-#include <sys/exec.h>
-#include <sys/sysent.h>
-#include <sys/lkm.h>
-
-#define VFS_SET(vfsops, fsname, index, flags) \
-	static struct vfsconf _fs_vfsconf = { \
-		&vfsops, \
-		#fsname, \
-		index, \
-		0, \
-		flags \
-	}; \
-	extern struct linker_set MODVNOPS; \
-	MOD_VFS(#fsname,index,&MODVNOPS,&_fs_vfsconf); \
-	int \
-	fsname ## _mod(struct lkm_table *lkmtp, int cmd, int ver) { \
-		DISPATCH(lkmtp, cmd, ver, lkm_nullcmd, lkm_nullcmd, lkm_nullcmd); }
-#else
-
-#define VFS_SET(vfsops, fsname, index, flags) \
-	static struct vfsconf _fs_vfsconf = { \
-		&vfsops, \
-		#fsname, \
-		index, \
-		0, \
-		flags | VFCF_STATIC \
-	}; \
-	DATA_SET(vfs_set,_fs_vfsconf)
-#endif /* VFS_LKM */
-
-#endif /* KERNEL */
-
-/*
- * Flags for various system call interfaces.
- *
- * waitfor flags to vfs_sync() and getfsstat()
- */
-#define MNT_WAIT	1
-#define MNT_NOWAIT	2
-
-/*
- * Generic file handle
- */
-struct fhandle {
-	fsid_t	fh_fsid;	/* File system id of mount point */
-	struct	fid fh_fid;	/* File sys specific id */
-};
-typedef struct fhandle	fhandle_t;
-
-#ifdef KERNEL
-#include <net/radix.h>
-#include <sys/socket.h>		/* XXX for AF_MAX */
-
-/*
- * Network address lookup element
- */
-struct netcred {
-	struct	radix_node netc_rnodes[2];
-	int	netc_exflags;
-	struct	ucred netc_anon;
-};
-
-/*
- * Network export information
- */
-struct netexport {
-	struct	netcred ne_defexported;		      /* Default export */
-	struct	radix_node_head *ne_rtable[AF_MAX+1]; /* Individual exports */
-};
-#endif /* KERNEL */
-
-/*
- * Export arguments for local filesystem mount calls.
- */
-struct export_args {
-	int	ex_flags;		/* export related flags */
-	uid_t	ex_root;		/* mapping for root uid */
-	struct	ucred ex_anon;		/* mapping for anonymous user */
-	struct	sockaddr *ex_addr;	/* net address to which exported */
-	int	ex_addrlen;		/* and the net address length */
-	struct	sockaddr *ex_mask;	/* mask of valid bits in saddr */
-	int	ex_masklen;		/* and the smask length */
-};
-
-/*
- * Arguments to mount UFS-based filesystems
- */
-struct ufs_args {
-	char	*fspec;			/* block special device to mount */
-	struct	export_args export;	/* network export information */
-};
-
-#ifdef MFS
-/*
- * Arguments to mount MFS
- */
-struct mfs_args {
-	char	*fspec;			/* name to export for statfs */
-	struct	export_args export;	/* if exported MFSes are supported */
-	caddr_t	base;			/* base of file system in memory */
-	u_long size;			/* size of file system */
-};
-#endif /* MFS */
-
-#ifdef MSDOSFS
-/*
- *  Arguments to mount MSDOS filesystems.
- */
-struct msdosfs_args {
-	char	*fspec;		/* blocks special holding the fs to mount */
-	struct	export_args export;	/* network export information */
-	uid_t	uid;		/* uid that owns msdosfs files */
-	gid_t	gid;		/* gid that owns msdosfs files */
-	mode_t	mask;		/* mask to be applied for msdosfs perms */
-};
-#endif
-
-#ifdef CD9660
-/*
- * Arguments to mount ISO 9660 filesystems.
- */
-struct iso_args {
-	char *fspec;			/* block special device to mount */
-	struct	export_args export;	/* network export info */
-	int flags;			/* mounting flags, see below */
-	int ssector;			/* starting sector */
-
-};
-#define ISOFSMNT_NORRIP		0x00000001 /* disable Rock Ridge Ext.*/
-#define ISOFSMNT_GENS		0x00000002 /* enable generation numbers */
-#define ISOFSMNT_EXTATT		0x00000004 /* enable extended attributes */
-#endif /* CD9660 */
-
-#ifdef NFS
-/*
- * Arguments to mount NFS
- */
-struct nfs_args {
-	struct sockaddr	*addr;		/* file server address */
-	int		addrlen;	/* length of address */
-	int		sotype;		/* Socket type */
-	int		proto;		/* and Protocol */
-	u_char		*fh;		/* File handle to be mounted */
-	int		fhsize;		/* Size, in bytes, of fh */
-	int		flags;		/* flags */
-	int		wsize;		/* write size in bytes */
-	int		rsize;		/* read size in bytes */
-	int		readdirsize;	/* readdir size in bytes */
-	int		timeo;		/* initial timeout in .1 secs */
-	int		retrans;	/* times to retry send */
-	int		maxgrouplist;	/* Max. size of group list */
-	int		readahead;	/* # of blocks to readahead */
-	int		leaseterm;	/* Term (sec) of lease */
-	int		deadthresh;	/* Retrans threshold */
-	char		*hostname;	/* server's name */
-};
-
-/*
- * NFS mount option flags
- */
-#define	NFSMNT_SOFT		0x00000001  /* soft mount (hard is default) */
-#define	NFSMNT_WSIZE		0x00000002  /* set write size */
-#define	NFSMNT_RSIZE		0x00000004  /* set read size */
-#define	NFSMNT_TIMEO		0x00000008  /* set initial timeout */
-#define	NFSMNT_RETRANS		0x00000010  /* set number of request retrys */
-#define	NFSMNT_MAXGRPS		0x00000020  /* set maximum grouplist size */
-#define	NFSMNT_INT		0x00000040  /* allow interrupts on hard mount */
-#define	NFSMNT_NOCONN		0x00000080  /* Don't Connect the socket */
-#define	NFSMNT_NQNFS		0x00000100  /* Use Nqnfs protocol */
-#define	NFSMNT_NFSV3		0x00000200  /* Use NFS Version 3 protocol */
-#define	NFSMNT_KERB		0x00000400  /* Use Kerberos authentication */
-#define	NFSMNT_DUMBTIMR		0x00000800  /* Don't estimate rtt dynamically */
-#define	NFSMNT_LEASETERM	0x00001000  /* set lease term (nqnfs) */
-#define	NFSMNT_READAHEAD	0x00002000  /* set read ahead */
-#define	NFSMNT_DEADTHRESH	0x00004000  /* set dead server retry thresh */
-#define	NFSMNT_RESVPORT		0x00008000  /* Allocate a reserved port */
-#define NFSMNT_RDIRPLUS		0x00010000  /* Use Readdirplus for V3 */
-#define NFSMNT_READDIRSIZE	0x00020000  /* Set readdir size */
-#define	NFSMNT_INTERNAL		0xfffc0000  /* Bits set internally */
-#define NFSMNT_HASWRITEVERF	0x00040000  /* Has write verifier for V3 */
-#define NFSMNT_GOTPATHCONF	0x00080000  /* Got the V3 pathconf info */
-#define NFSMNT_GOTFSINFO	0x00100000  /* Got the V3 fsinfo */
-#define	NFSMNT_MNTD		0x00200000  /* Mnt server for mnt point */
-#define	NFSMNT_DISMINPROG	0x00400000  /* Dismount in progress */
-#define	NFSMNT_DISMNT		0x00800000  /* Dismounted */
-#define	NFSMNT_SNDLOCK		0x01000000  /* Send socket lock */
-#define	NFSMNT_WANTSND		0x02000000  /* Want above */
-#define	NFSMNT_RCVLOCK		0x04000000  /* Rcv socket lock */
-#define	NFSMNT_WANTRCV		0x08000000  /* Want above */
-#define	NFSMNT_WAITAUTH		0x10000000  /* Wait for authentication */
-#define	NFSMNT_HASAUTH		0x20000000  /* Has authenticator */
-#define	NFSMNT_WANTAUTH		0x40000000  /* Wants an authenticator */
-#define	NFSMNT_AUTHERR		0x80000000  /* Authentication error */
-#endif /* NFS */
-
-#ifdef KERNEL
-extern	int (*mountroot) __P((void *));
-extern	struct vfsops	*mountrootvfsops;
-
-/*
- * exported vnode operations
- */
-int	dounmount __P((struct mount *, int, struct proc *));
-struct	mount *getvfs __P((fsid_t *));      /* return vfs given fsid */
-void	getnewfsid __P((struct mount *, int));
-int	vflush __P((struct mount *, struct vnode *, int));
-int	vfs_export			    /* process mount export info */
-	  __P((struct mount *, struct netexport *, struct export_args *));
-struct	netcred *vfs_export_lookup	    /* lookup host in fs export list */
-	  __P((struct mount *, struct netexport *, struct mbuf *));
-int	vfs_lock __P((struct mount *));         /* lock a vfs */
-int	vfs_mountedon __P((struct vnode *));    /* is a vfs mounted on vp */
-int	vfs_mountroot __P((void *));		/* XXX goes away? */
-void	vfs_msync __P((struct mount *, int));
-void	vfs_unlock __P((struct mount *));       /* unlock a vfs */
-void	vfs_unmountall __P((void));
-int	vfs_busy __P((struct mount *));         /* mark a vfs  busy */
-void	vfs_unbusy __P((struct mount *));       /* mark a vfs not busy */
-extern	CIRCLEQ_HEAD(mntlist, mount) mountlist;	/* mounted filesystem list */
-extern	struct vfsops *vfssw[];			/* filesystem type table */
-
-#else /* KERNEL */
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-int	fstatfs __P((int, struct statfs *));
-int	getfh __P((const char *, fhandle_t *));
-int	getfsstat __P((struct statfs *, long, int));
-int	getmntinfo __P((struct statfs **, int));
-int	mount __P((int, const char *, int, void *));
-int	statfs __P((const char *, struct statfs *));
-int	unmount __P((const char *, int));
-
-/* C library stuff */
-struct	vfsconf *getvfsbyname __P((const char *));
-struct	vfsconf *getvfsbytype __P((int));
-struct	vfsconf *getvfsent __P((void));
-void	setvfsent __P((int));
-void	endvfsent __P((void));
-int	vfsisloadable __P((const char *));
-int	vfsload __P((const char *));
-__END_DECLS
-
-#endif /* KERNEL */
-
-#endif /* !_SYS_MOUNT_H_ */
diff --git a/cpukit/libnetworking/sys/param.h b/cpukit/libnetworking/sys/param.h
deleted file mode 100644
index 21a9758520..0000000000
--- a/cpukit/libnetworking/sys/param.h
+++ /dev/null
@@ -1,231 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)param.h	8.3 (Berkeley) 4/4/95
- * $Id$
- */
-
-#ifndef _SYS_PARAM_H_
-#define _SYS_PARAM_H_
-
-#include <unistd.h>
-
-#define	BSD	199506		/* System version (year & month). */
-#define BSD4_3	1
-#define BSD4_4	1
-
-#ifndef NULL
-#define	NULL	0
-#endif
-
-#ifndef LOCORE
-#include <sys/types.h>
-#endif
-
-/*
- * Machine-independent constants (some used in following include files).
- * Redefined constants are from POSIX 1003.1 limits file.
- *
- * MAXCOMLEN should be >= sizeof(ac_comm) (see <acct.h>)
- * MAXLOGNAME should be >= UT_NAMESIZE (see <utmp.h>)
- */
-#include <sys/syslimits.h>
-
-#define	MAXCOMLEN	16		/* max command name remembered */
-#define	MAXINTERP	32		/* max interpreter file name length */
-#define	MAXLOGNAME	12		/* max login name length */
-#define	MAXUPRC		CHILD_MAX	/* max simultaneous processes */
-#define	NCARGS		ARG_MAX		/* max bytes for an exec function */
-#define	NGROUPS		NGROUPS_MAX	/* max number groups */
-#define	NOFILE		OPEN_MAX	/* max open files per process */
-#define	NOGROUP		65535		/* marker for empty group set member */
-#define MAXHOSTNAMELEN	256		/* max hostname size */
-
-/* More types and definitions used throughout the kernel. */
-#ifdef KERNEL
-#include <sys/cdefs.h>
-#include <sys/errno.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-#include <sys/ucred.h>
-#include <sys/uio.h>
-#include <sys/rtprio.h>
-
-#ifndef FALSE
-#define	FALSE	0
-#endif
-#ifndef TRUE
-#define	TRUE	1
-#endif
-#endif
-
-/* Signals. */
-#include <sys/signal.h>
-
-/* Machine type dependent parameters. */
-#include <machine/param.h>
-#include <machine/limits.h>
-
-/*
- * Priorities.  Note that with 32 run queues, differences less than 4 are
- * insignificant.
- */
-#define	PSWP	0
-#define	PVM	4
-#define	PINOD	8
-#define	PRIBIO	16
-#define	PVFS	20
-#define	PZERO	22		/* No longer magic, shouldn't be here.  XXX */
-#define	PSOCK	24
-#define	PWAIT	32
-#define	PLOCK	36
-#define	PPAUSE	40
-#define	PUSER	50
-#define	MAXPRI	127		/* Priorities range from 0 through MAXPRI. */
-
-#define	PRIMASK	0x0ff
-#define	PCATCH	0x100		/* OR'd with pri for tsleep to check signals */
-
-#define	NZERO	0		/* default "nice" */
-
-#define	NBPW	sizeof(int)	/* number of bytes per word (integer) */
-
-#define	CMASK	022		/* default file mask: S_IWGRP|S_IWOTH */
-#define	NODEV	(dev_t)(-1)	/* non-existent device */
-
-/*
- * Clustering of hardware pages on machines with ridiculously small
- * page sizes is done here.  The paging subsystem deals with units of
- * CLSIZE pte's describing PAGE_SIZE (from machine/machparam.h) pages each.
- */
-#if 0
-#define	CLBYTES		(CLSIZE*PAGE_SIZE)
-#endif
-
-#define	CBLOCK	128		/* Clist block size, must be a power of 2. */
-#define CBQSIZE	(CBLOCK/NBBY)	/* Quote bytes/cblock - can do better. */
-				/* Data chars/clist. */
-#define	CBSIZE	(CBLOCK - sizeof(struct cblock *) - CBQSIZE)
-#define	CROUND	(CBLOCK - 1)	/* Clist rounding. */
-
-/*
- * File system parameters and macros.
- *
- * The file system is made out of blocks of at most MAXBSIZE units, with
- * smaller units (fragments) only in the last direct block.  MAXBSIZE
- * primarily determines the size of buffers in the buffer pool.  It may be
- * made larger without any effect on existing file systems; however making
- * it smaller make make some file systems unmountable.  Also, MAXBSIZE
- * must be less than MAXPHYS!!!  DFLTBSIZE is the average amount of
- * memory allocated by vfs_bio per nbuf.  BKVASIZE is the average amount
- * of kernel virtual space allocated per nbuf.  BKVASIZE should be >=
- * DFLTBSIZE.  If it is significantly bigger than DFLTBSIZE, then
- * kva fragmentation causes fewer performance problems.
- */
-#define	MAXBSIZE	65536
-#define BKVASIZE	8192
-#define DFLTBSIZE	4096
-#define MAXFRAG 	8
-
-/*
- * MAXPATHLEN defines the longest permissible path length after expanding
- * symbolic links. It is used to allocate a temporary buffer from the buffer
- * pool in which to do the name expansion, hence should be a power of two,
- * and must be less than or equal to MAXBSIZE.  MAXSYMLINKS defines the
- * maximum number of symbolic links that may be expanded in a path name.
- * It should be set high enough to allow all legitimate uses, but halt
- * infinite loops reasonably quickly.
- */
-#if !defined(__rtems__)
-#define	MAXPATHLEN	PATH_MAX
-#endif
-#define MAXSYMLINKS	32
-
-/* Bit map related macros. */
-#define	setbit(a,i)	((a)[(i)/NBBY] |= 1<<((i)%NBBY))
-#define	clrbit(a,i)	((a)[(i)/NBBY] &= ~(1<<((i)%NBBY)))
-#define	isset(a,i)	((a)[(i)/NBBY] & (1<<((i)%NBBY)))
-#define	isclr(a,i)	(((a)[(i)/NBBY] & (1<<((i)%NBBY))) == 0)
-
-/* Macros for counting and rounding. */
-#ifndef howmany
-#define	howmany(x, y)	(((x)+((y)-1))/(y))
-#endif
-#define	rounddown(x, y)	(((x)/(y))*(y))
-#define	roundup(x, y)	((((x)+((y)-1))/(y))*(y))  /* to any y */
-#define	roundup2(x, y)	(((x)+((y)-1))&(~((y)-1))) /* if y is powers of two */
-#define powerof2(x)	((((x)-1)&(x))==0)
-
-/* Macros for min/max. */
-#ifndef KERNEL
-#define	MIN(a,b) (((a)<(b))?(a):(b))
-#define	MAX(a,b) (((a)>(b))?(a):(b))
-#endif
-
-/*
- * Constants for setting the parameters of the kernel memory allocator.
- *
- * 2 ** MINBUCKET is the smallest unit of memory that will be
- * allocated. It must be at least large enough to hold a pointer.
- *
- * Units of memory less or equal to MAXALLOCSAVE will permanently
- * allocate physical memory; requests for these size pieces of
- * memory are quite fast. Allocations greater than MAXALLOCSAVE must
- * always allocate and free physical memory; requests for these
- * size allocations should be done infrequently as they will be slow.
- *
- * Constraints: PAGE_SIZE <= MAXALLOCSAVE <= 2 ** (MINBUCKET + 14), and
- * MAXALLOCSIZE must be a power of two.
- */
-#define MINBUCKET	4		/* 4 => min allocation of 16 bytes */
-#define MAXALLOCSAVE	(2 * PAGE_SIZE)
-
-/*
- * Scale factor for scaled integers used to count %cpu time and load avgs.
- *
- * The number of CPU `tick's that map to a unique `%age' can be expressed
- * by the formula (1 / (2 ^ (FSHIFT - 11))).  The maximum load average that
- * can be calculated (assuming 32 bits) can be closely approximated using
- * the formula (2 ^ (2 * (16 - FSHIFT))) for (FSHIFT < 15).
- *
- * For the scheduler to maintain a 1:1 mapping of CPU `tick' to `%age',
- * FSHIFT must be at least 11; this gives us a maximum load avg of ~1024.
- */
-#define	FSHIFT	11		/* bits to right of fixed binary point */
-#define FSCALE	(1<<FSHIFT)
-
-#endif	/* _SYS_PARAM_H_ */
diff --git a/cpukit/libnetworking/sys/proc.h b/cpukit/libnetworking/sys/proc.h
deleted file mode 100644
index 2189a33b11..0000000000
--- a/cpukit/libnetworking/sys/proc.h
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * Dummy structure
- *
- *  $Id$
- */
-struct proc {
-	int	this_should_never_be_referenced;
-};
diff --git a/cpukit/libnetworking/sys/protosw.h b/cpukit/libnetworking/sys/protosw.h
deleted file mode 100644
index a7aa52feea..0000000000
--- a/cpukit/libnetworking/sys/protosw.h
+++ /dev/null
@@ -1,300 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)protosw.h	8.1 (Berkeley) 6/2/93
- * $Id$
- */
-
-#ifndef _SYS_PROTOSW_H_
-#define _SYS_PROTOSW_H_
-
-struct ifnet;
-struct mbuf;
-struct sockaddr;
-struct socket;
-struct sockproto;
-struct stat;
-
-/*
- * Protocol switch table.
- *
- * Each protocol has a handle initializing one of these structures,
- * which is used for protocol-protocol and system-protocol communication.
- *
- * A protocol is called through the pr_init entry before any other.
- * Thereafter it is called every 200ms through the pr_fasttimo entry and
- * every 500ms through the pr_slowtimo for timer based actions.
- * The system will call the pr_drain entry if it is low on space and
- * this should throw away any non-critical data.
- *
- * Protocols pass data between themselves as chains of mbufs using
- * the pr_input and pr_output hooks.  Pr_input passes data up (towards
- * UNIX) and pr_output passes it down (towards the imps); control
- * information passes up and down on pr_ctlinput and pr_ctloutput.
- * The protocol is responsible for the space occupied by any the
- * arguments to these entries and must dispose it.
- *
- * The userreq routine interfaces protocols to the system and is
- * described below.
- */
-struct protosw {
-	short	pr_type;		/* socket type used for */
-	struct	domain *pr_domain;	/* domain protocol a member of */
-	short	pr_protocol;		/* protocol number */
-	short	pr_flags;		/* see below */
-/* protocol-protocol hooks */
-	void	(*pr_input) __P((struct mbuf *, int len));
-					/* input to protocol (from below) */
-	int	(*pr_output)	__P((struct mbuf *m, struct socket *so));
-					/* output to protocol (from above) */
-	void	(*pr_ctlinput)__P((int, struct sockaddr *, void *));
-					/* control input (from below) */
-	int	(*pr_ctloutput)__P((int, struct socket *, int, int,
-				    struct mbuf **));
-					/* control output (from above) */
-/* user-protocol hook */
-	int	(*pr_ousrreq) __P((struct socket *, int, struct mbuf *,
-				   struct mbuf *, struct mbuf *));
-					/* user request: see list below */
-/* utility hooks */
-	void	(*pr_init) __P((void));	/* initialization hook */
-	void	(*pr_fasttimo) __P((void));
-					/* fast timeout (200ms) */
-	void	(*pr_slowtimo) __P((void));
-					/* slow timeout (500ms) */
-	void	(*pr_drain) __P((void));
-					/* flush any excess space possible */
-	struct	pr_usrreqs *pr_usrreqs;	/* supersedes pr_usrreq() */
-};
-
-#define	PR_SLOWHZ	2		/* 2 slow timeouts per second */
-#define	PR_FASTHZ	5		/* 5 fast timeouts per second */
-
-/*
- * Values for pr_flags.
- * PR_ADDR requires PR_ATOMIC;
- * PR_ADDR and PR_CONNREQUIRED are mutually exclusive.
- * PR_IMPLOPCL means that the protocol allows sendto without prior connect,
- *	and the protocol understands the MSG_EOF flag.  The first property is
- *	is only relevant if PR_CONNREQUIRED is set (otherwise sendto is allowed
- *	anyhow).
- */
-#define	PR_ATOMIC	0x01		/* exchange atomic messages only */
-#define	PR_ADDR		0x02		/* addresses given with messages */
-#define	PR_CONNREQUIRED	0x04		/* connection required by protocol */
-#define	PR_WANTRCVD	0x08		/* want PRU_RCVD calls */
-#define	PR_RIGHTS	0x10		/* passes capabilities */
-#define PR_IMPLOPCL	0x20		/* implied open/close */
-
-/*
- * The arguments to usrreq are:
- *	(*protosw[].pr_usrreq)(up, req, m, nam, opt);
- * where up is a (struct socket *), req is one of these requests,
- * m is a optional mbuf chain containing a message,
- * nam is an optional mbuf chain containing an address,
- * and opt is a pointer to a socketopt structure or nil.
- * The protocol is responsible for disposal of the mbuf chain m,
- * the caller is responsible for any space held by nam and opt.
- * A non-zero return from usrreq gives an
- * UNIX error number which should be passed to higher level software.
- */
-#define	PRU_ATTACH		0	/* attach protocol to up */
-#define	PRU_DETACH		1	/* detach protocol from up */
-#define	PRU_BIND		2	/* bind socket to address */
-#define	PRU_LISTEN		3	/* listen for connection */
-#define	PRU_CONNECT		4	/* establish connection to peer */
-#define	PRU_ACCEPT		5	/* accept connection from peer */
-#define	PRU_DISCONNECT		6	/* disconnect from peer */
-#define	PRU_SHUTDOWN		7	/* won't send any more data */
-#define	PRU_RCVD		8	/* have taken data; more room now */
-#define	PRU_SEND		9	/* send this data */
-#define	PRU_ABORT		10	/* abort (fast DISCONNECT, DETATCH) */
-#define	PRU_CONTROL		11	/* control operations on protocol */
-#define	PRU_SENSE		12	/* return status into m */
-#define	PRU_RCVOOB		13	/* retrieve out of band data */
-#define	PRU_SENDOOB		14	/* send out of band data */
-#define	PRU_SOCKADDR		15	/* fetch socket's address */
-#define	PRU_PEERADDR		16	/* fetch peer's address */
-#define	PRU_CONNECT2		17	/* connect two sockets */
-/* begin for protocols internal use */
-#define	PRU_FASTTIMO		18	/* 200ms timeout */
-#define	PRU_SLOWTIMO		19	/* 500ms timeout */
-#define	PRU_PROTORCV		20	/* receive from below */
-#define	PRU_PROTOSEND		21	/* send to below */
-/* end for protocol's internal use */
-#define PRU_SEND_EOF		22	/* send and close */
-#define PRU_NREQ		22
-
-#ifdef PRUREQUESTS
-char *prurequests[] = {
-	"ATTACH",	"DETACH",	"BIND",		"LISTEN",
-	"CONNECT",	"ACCEPT",	"DISCONNECT",	"SHUTDOWN",
-	"RCVD",		"SEND",		"ABORT",	"CONTROL",
-	"SENSE",	"RCVOOB",	"SENDOOB",	"SOCKADDR",
-	"PEERADDR",	"CONNECT2",	"FASTTIMO",	"SLOWTIMO",
-	"PROTORCV",	"PROTOSEND",
-	"SEND_EOF",
-};
-#endif
-
-#ifdef	KERNEL			/* users shouldn't see this decl */
-struct stat;
-struct ifnet;
-
-/*
- * If the ordering here looks odd, that's because it's alphabetical.
- */
-struct pr_usrreqs {
-	int	(*pru_abort) __P((struct socket *so));
-	int	(*pru_accept) __P((struct socket *so, struct mbuf *nam));
-	int	(*pru_attach) __P((struct socket *so, int proto));
-	int	(*pru_bind) __P((struct socket *so, struct mbuf *nam));
-	int	(*pru_connect) __P((struct socket *so, struct mbuf *nam));
-	int	(*pru_connect2) __P((struct socket *so1, struct socket *so2));
-	int	(*pru_control) __P((struct socket *so, int cmd, caddr_t data,
-				    struct ifnet *ifp));
-	int	(*pru_detach) __P((struct socket *so));
-	int	(*pru_disconnect) __P((struct socket *so));
-	int	(*pru_listen) __P((struct socket *so));
-	int	(*pru_peeraddr) __P((struct socket *so, struct mbuf *nam));
-	int	(*pru_rcvd) __P((struct socket *so, int flags));
-	int	(*pru_rcvoob) __P((struct socket *so, struct mbuf *m,
-				   int flags));
-	/*
-	 * The `m' parameter here is almost certainly going to become a
-	 * `struct uio' at some point in the future.  Similar changes
-	 * will probably happen for the receive entry points.
-	 */
-	int	(*pru_send) __P((struct socket *so, int flags, struct mbuf *m, 
-			      struct mbuf *addr, struct mbuf *control));
-#define	PRUS_OOB	0x1
-#define	PRUS_EOF	0x2
-	int	(*pru_sense) __P((struct socket *so, struct stat *sb));
-	int	(*pru_shutdown) __P((struct socket *so));
-	int	(*pru_sockaddr) __P((struct socket *so, struct mbuf *nam));
-};
-
-int	pru_accept_notsupp __P((struct socket *so, struct mbuf *nam));
-int	pru_connect2_notsupp __P((struct socket *so1, struct socket *so2));
-int	pru_control_notsupp __P((struct socket *so, int cmd, caddr_t data,
-				 struct ifnet *ifp));
-int	pru_listen_notsupp __P((struct socket *so));
-int	pru_rcvd_notsupp __P((struct socket *so, int flags));
-int	pru_rcvoob_notsupp __P((struct socket *so, struct mbuf *m, int flags));
-int	pru_sense_null __P((struct socket *so, struct stat *sb));
-
-#define	PRU_OLDSTYLE
-
-#ifdef PRU_OLDSTYLE
-/*
- * Protocols which don't yet implement pr_usrreqs can point it to this
- * structure, which will call the old pr_usrreq() entry point with the
- * appropriate arguments.
- */
-extern	struct pr_usrreqs pru_oldstyle;
-#endif /* PRU_OLDSTYLE */
-
-#endif /* KERNEL */
-
-/*
- * The arguments to the ctlinput routine are
- *	(*protosw[].pr_ctlinput)(cmd, sa, arg);
- * where cmd is one of the commands below, sa is a pointer to a sockaddr,
- * and arg is a `void *' argument used within a protocol family.
- */
-#define	PRC_IFDOWN		0	/* interface transition */
-#define	PRC_ROUTEDEAD		1	/* select new route if possible ??? */
-#define	PRC_QUENCH2		3	/* DEC congestion bit says slow down */
-#define	PRC_QUENCH		4	/* some one said to slow down */
-#define	PRC_MSGSIZE		5	/* message size forced drop */
-#define	PRC_HOSTDEAD		6	/* host appears to be down */
-#define	PRC_HOSTUNREACH		7	/* deprecated (use PRC_UNREACH_HOST) */
-#define	PRC_UNREACH_NET		8	/* no route to network */
-#define	PRC_UNREACH_HOST	9	/* no route to host */
-#define	PRC_UNREACH_PROTOCOL	10	/* dst says bad protocol */
-#define	PRC_UNREACH_PORT	11	/* bad port # */
-/* was	PRC_UNREACH_NEEDFRAG	12	   (use PRC_MSGSIZE) */
-#define	PRC_UNREACH_SRCFAIL	13	/* source route failed */
-#define	PRC_REDIRECT_NET	14	/* net routing redirect */
-#define	PRC_REDIRECT_HOST	15	/* host routing redirect */
-#define	PRC_REDIRECT_TOSNET	16	/* redirect for type of service & net */
-#define	PRC_REDIRECT_TOSHOST	17	/* redirect for tos & host */
-#define	PRC_TIMXCEED_INTRANS	18	/* packet lifetime expired in transit */
-#define	PRC_TIMXCEED_REASS	19	/* lifetime expired on reass q */
-#define	PRC_PARAMPROB		20	/* header incorrect */
-
-#define	PRC_NCMDS		21
-
-#define	PRC_IS_REDIRECT(cmd)	\
-	((cmd) >= PRC_REDIRECT_NET && (cmd) <= PRC_REDIRECT_TOSHOST)
-
-#ifdef PRCREQUESTS
-char	*prcrequests[] = {
-	"IFDOWN", "ROUTEDEAD", "#2", "DEC-BIT-QUENCH2",
-	"QUENCH", "MSGSIZE", "HOSTDEAD", "#7",
-	"NET-UNREACH", "HOST-UNREACH", "PROTO-UNREACH", "PORT-UNREACH",
-	"#12", "SRCFAIL-UNREACH", "NET-REDIRECT", "HOST-REDIRECT",
-	"TOSNET-REDIRECT", "TOSHOST-REDIRECT", "TX-INTRANS", "TX-REASS",
-	"PARAMPROB"
-};
-#endif
-
-/*
- * The arguments to ctloutput are:
- *	(*protosw[].pr_ctloutput)(req, so, level, optname, optval);
- * req is one of the actions listed below, so is a (struct socket *),
- * level is an indication of which protocol layer the option is intended.
- * optname is a protocol dependent socket option request,
- * optval is a pointer to a mbuf-chain pointer, for value-return results.
- * The protocol is responsible for disposal of the mbuf chain *optval
- * if supplied,
- * the caller is responsible for any space held by *optval, when returned.
- * A non-zero return from usrreq gives an
- * UNIX error number which should be passed to higher level software.
- */
-#define	PRCO_GETOPT	0
-#define	PRCO_SETOPT	1
-
-#define	PRCO_NCMDS	2
-
-#ifdef PRCOREQUESTS
-char	*prcorequests[] = {
-	"GETOPT", "SETOPT",
-};
-#endif
-
-#ifdef KERNEL
-struct protosw *pffindproto __P((int family, int protocol, int type));
-struct protosw *pffindtype __P((int family, int type));
-#endif
-
-#endif
diff --git a/cpukit/libnetworking/sys/queue.h b/cpukit/libnetworking/sys/queue.h
deleted file mode 100644
index e8aa08cf5d..0000000000
--- a/cpukit/libnetworking/sys/queue.h
+++ /dev/null
@@ -1,446 +0,0 @@
-/*
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)queue.h	8.5 (Berkeley) 8/20/94
- * $Id$
- */
-
-#ifndef _SYS_QUEUE_H_
-#define	_SYS_QUEUE_H_
-
-/*
- * This file defines five types of data structures: singly-linked lists,
- * slingly-linked tail queues, lists, tail queues, and circular queues.
- *
- * A singly-linked list is headed by a single forward pointer. The elements
- * are singly linked for minimum space and pointer manipulation overhead at
- * the expense of O(n) removal for arbitrary elements. New elements can be
- * added to the list after an existing element or at the head of the list.
- * Elements being removed from the head of the list should use the explicit
- * macro for this purpose for optimum efficiency. A singly-linked list may
- * only be traversed in the forward direction.  Singly-linked lists are ideal
- * for applications with large datasets and few or no removals or for
- * implementing a LIFO queue.
- *
- * A singly-linked tail queue is headed by a pair of pointers, one to the
- * head of the list and the other to the tail of the list. The elements are
- * singly linked for minimum space and pointer manipulation overhead at the
- * expense of O(n) removal for arbitrary elements. New elements can be added
- * to the list after an existing element, at the head of the list, or at the
- * end of the list. Elements being removed from the head of the tail queue
- * should use the explicit macro for this purpose for optimum efficiency.
- * A singly-linked tail queue may only be traversed in the forward direction.
- * Singly-linked tail queues are ideal for applications with large datasets
- * and few or no removals or for implementing a FIFO queue.
- *
- * A list is headed by a single forward pointer (or an array of forward
- * pointers for a hash table header). The elements are doubly linked
- * so that an arbitrary element can be removed without a need to
- * traverse the list. New elements can be added to the list before
- * or after an existing element or at the head of the list. A list
- * may only be traversed in the forward direction.
- *
- * A tail queue is headed by a pair of pointers, one to the head of the
- * list and the other to the tail of the list. The elements are doubly
- * linked so that an arbitrary element can be removed without a need to
- * traverse the list. New elements can be added to the list before or
- * after an existing element, at the head of the list, or at the end of
- * the list. A tail queue may only be traversed in the forward direction.
- *
- * A circle queue is headed by a pair of pointers, one to the head of the
- * list and the other to the tail of the list. The elements are doubly
- * linked so that an arbitrary element can be removed without a need to
- * traverse the list. New elements can be added to the list before or after
- * an existing element, at the head of the list, or at the end of the list.
- * A circle queue may be traversed in either direction, but has a more
- * complex end of list detection.
- *
- * For details on the use of these macros, see the queue(3) manual page.
- */
-
-/*
- * Singly-linked List definitions.
- */
-#define SLIST_HEAD(name, type)						\
-struct name {								\
-	struct type *slh_first;	/* first element */			\
-}
- 
-#define SLIST_ENTRY(type)						\
-struct {								\
-	struct type *sle_next;	/* next element */			\
-}
- 
-/*
- * Singly-linked List functions.
- */
-#define SLIST_INIT(head) {						\
-	(head)->slh_first = NULL;					\
-}
-
-#define SLIST_INSERT_AFTER(slistelm, elm, field) {			\
-	(elm)->field.sle_next = (slistelm)->field.sle_next;		\
-	(slistelm)->field.sle_next = (elm);				\
-}
-
-#define SLIST_INSERT_HEAD(head, elm, field) {				\
-	(elm)->field.sle_next = (head)->slh_first;			\
-	(head)->slh_first = (elm);					\
-}
-
-#define SLIST_REMOVE_HEAD(head, field) {				\
-	(head)->slh_first = (head)->slh_first->field.sle_next;		\
-}
-
-#define SLIST_REMOVE(head, elm, type, field) {				\
-	if ((head)->slh_first == (elm)) {				\
-		SLIST_REMOVE_HEAD((head), field);			\
-	}								\
-	else {								\
-		struct type *curelm = (head)->slh_first;		\
-		while( curelm->field.sle_next != (elm) )		\
-			curelm = curelm->field.sle_next;		\
-		curelm->field.sle_next =				\
-		    curelm->field.sle_next->field.sle_next;		\
-	}								\
-}
-
-/*
- * Singly-linked Tail queue definitions.
- */
-#define STAILQ_HEAD(name, type)						\
-struct name {								\
-	struct type *stqh_first;/* first element */			\
-	struct type **stqh_last;/* addr of last next element */		\
-}
-
-#define STAILQ_ENTRY(type)						\
-struct {								\
-	struct type *stqe_next;	/* next element */			\
-}
-
-/*
- * Singly-linked Tail queue functions.
- */
-#define	STAILQ_INIT(head) {						\
-	(head)->stqh_first = NULL;					\
-	(head)->stqh_last = &(head)->stqh_first;			\
-}
-
-#define STAILQ_INSERT_HEAD(head, elm, field) {				\
-	if (((elm)->field.stqe_next = (head)->stqh_first) == NULL)	\
-		(head)->stqh_last = &(elm)->field.stqe_next;		\
-	(head)->stqh_first = (elm);					\
-}
-
-#define STAILQ_INSERT_TAIL(head, elm, field) {				\
-	(elm)->field.stqe_next = NULL;					\
-	*(head)->stqh_last = (elm);					\
-	(head)->stqh_last = &(elm)->field.stqe_next;			\
-}
-
-#define STAILQ_INSERT_AFTER(head, tqelm, elm, field) {			\
-	if (((elm)->field.stqe_next = (tqelm)->field.stqe_next) == NULL)\
-		(head)->stqh_last = &(elm)->field.stqe_next;		\
-	(tqelm)->field.stqe_next = (elm);				\
-}
-
-#define STAILQ_REMOVE_HEAD(head, field) {				\
-	if (((head)->stqh_first =					\
-	     (head)->stqh_first->field.stqe_next) == NULL)		\
-		(head)->stqh_last = &(head)->stqh_first;		\
-}
-
-#define STAILQ_REMOVE(head, elm, type, field) {				\
-	if ((head)->stqh_first == (elm)) {				\
-		STAILQ_REMOVE_HEAD(head, field);			\
-	}								\
-	else {								\
-		struct type *curelm = (head)->stqh_first;		\
-		while( curelm->field.stqe_next != (elm) )		\
-			curelm = curelm->field.stqe_next;		\
-		if((curelm->field.stqe_next =				\
-		    curelm->field.stqe_next->field.stqe_next) == NULL)	\
-			(head)->stqh_last = &(curelm)->field.stqe_next;	\
-	}								\
-}
-
-/*
- * List definitions.
- */
-#define LIST_HEAD(name, type)						\
-struct name {								\
-	struct type *lh_first;	/* first element */			\
-}
-
-#define LIST_ENTRY(type)						\
-struct {								\
-	struct type *le_next;	/* next element */			\
-	struct type **le_prev;	/* address of previous next element */	\
-}
-
-/*
- * List functions.
- */
-#define	LIST_INIT(head) {						\
-	(head)->lh_first = NULL;					\
-}
-
-#define LIST_INSERT_AFTER(listelm, elm, field) {			\
-	if (((elm)->field.le_next = (listelm)->field.le_next) != NULL)	\
-		(listelm)->field.le_next->field.le_prev =		\
-		    &(elm)->field.le_next;				\
-	(listelm)->field.le_next = (elm);				\
-	(elm)->field.le_prev = &(listelm)->field.le_next;		\
-}
-
-#define LIST_INSERT_BEFORE(listelm, elm, field) {			\
-	(elm)->field.le_prev = (listelm)->field.le_prev;		\
-	(elm)->field.le_next = (listelm);				\
-	*(listelm)->field.le_prev = (elm);				\
-	(listelm)->field.le_prev = &(elm)->field.le_next;		\
-}
-
-#define LIST_INSERT_HEAD(head, elm, field) {				\
-	if (((elm)->field.le_next = (head)->lh_first) != NULL)		\
-		(head)->lh_first->field.le_prev = &(elm)->field.le_next;\
-	(head)->lh_first = (elm);					\
-	(elm)->field.le_prev = &(head)->lh_first;			\
-}
-
-#define LIST_REMOVE(elm, field) {					\
-	if ((elm)->field.le_next != NULL)				\
-		(elm)->field.le_next->field.le_prev = 			\
-		    (elm)->field.le_prev;				\
-	*(elm)->field.le_prev = (elm)->field.le_next;			\
-}
-
-/*
- * Tail queue definitions.
- */
-#define TAILQ_HEAD(name, type)						\
-struct name {								\
-	struct type *tqh_first;	/* first element */			\
-	struct type **tqh_last;	/* addr of last next element */		\
-}
-
-#define TAILQ_HEAD_INITIALIZER(head)					\
-	{ NULL, &(head).tqh_first }
-
-#define TAILQ_ENTRY(type)						\
-struct {								\
-	struct type *tqe_next;	/* next element */			\
-	struct type **tqe_prev;	/* address of previous next element */	\
-}
-
-/*
- * Tail queue functions.
- */
-#define	TAILQ_EMPTY(head) ((head)->tqh_first == NULL)
-
-#define	TAILQ_FIRST(head) ((head)->tqh_first)
-
-#define	TAILQ_LAST(head) ((head)->tqh_last)
-
-#define	TAILQ_NEXT(elm, field) ((elm)->field.tqe_next)
-
-#define TAILQ_PREV(elm, field) ((elm)->field.tqe_prev)
-
-#define	TAILQ_INIT(head) {						\
-	(head)->tqh_first = NULL;					\
-	(head)->tqh_last = &(head)->tqh_first;				\
-}
-
-#define TAILQ_INSERT_HEAD(head, elm, field) {				\
-	if (((elm)->field.tqe_next = (head)->tqh_first) != NULL)	\
-		(head)->tqh_first->field.tqe_prev =			\
-		    &(elm)->field.tqe_next;				\
-	else								\
-		(head)->tqh_last = &(elm)->field.tqe_next;		\
-	(head)->tqh_first = (elm);					\
-	(elm)->field.tqe_prev = &(head)->tqh_first;			\
-}
-
-#define TAILQ_INSERT_TAIL(head, elm, field) {				\
-	(elm)->field.tqe_next = NULL;					\
-	(elm)->field.tqe_prev = (head)->tqh_last;			\
-	*(head)->tqh_last = (elm);					\
-	(head)->tqh_last = &(elm)->field.tqe_next;			\
-}
-
-#define TAILQ_INSERT_AFTER(head, listelm, elm, field) {			\
-	if (((elm)->field.tqe_next = (listelm)->field.tqe_next) != NULL)\
-		(elm)->field.tqe_next->field.tqe_prev = 		\
-		    &(elm)->field.tqe_next;				\
-	else								\
-		(head)->tqh_last = &(elm)->field.tqe_next;		\
-	(listelm)->field.tqe_next = (elm);				\
-	(elm)->field.tqe_prev = &(listelm)->field.tqe_next;		\
-}
-
-#define TAILQ_INSERT_BEFORE(listelm, elm, field) {			\
-	(elm)->field.tqe_prev = (listelm)->field.tqe_prev;		\
-	(elm)->field.tqe_next = (listelm);				\
-	*(listelm)->field.tqe_prev = (elm);				\
-	(listelm)->field.tqe_prev = &(elm)->field.tqe_next;		\
-}
-
-#define TAILQ_REMOVE(head, elm, field) {				\
-	if (((elm)->field.tqe_next) != NULL)				\
-		(elm)->field.tqe_next->field.tqe_prev = 		\
-		    (elm)->field.tqe_prev;				\
-	else								\
-		(head)->tqh_last = (elm)->field.tqe_prev;		\
-	*(elm)->field.tqe_prev = (elm)->field.tqe_next;			\
-}
-
-/*
- * Circular queue definitions.
- */
-#define CIRCLEQ_HEAD(name, type)					\
-struct name {								\
-	struct type *cqh_first;		/* first element */		\
-	struct type *cqh_last;		/* last element */		\
-}
-
-#define CIRCLEQ_ENTRY(type)						\
-struct {								\
-	struct type *cqe_next;		/* next element */		\
-	struct type *cqe_prev;		/* previous element */		\
-}
-
-/*
- * Circular queue functions.
- */
-#define	CIRCLEQ_INIT(head) {						\
-	(head)->cqh_first = (void *)(head);				\
-	(head)->cqh_last = (void *)(head);				\
-}
-
-#define CIRCLEQ_INSERT_AFTER(head, listelm, elm, field) {		\
-	(elm)->field.cqe_next = (listelm)->field.cqe_next;		\
-	(elm)->field.cqe_prev = (listelm);				\
-	if ((listelm)->field.cqe_next == (void *)(head))		\
-		(head)->cqh_last = (elm);				\
-	else								\
-		(listelm)->field.cqe_next->field.cqe_prev = (elm);	\
-	(listelm)->field.cqe_next = (elm);				\
-}
-
-#define CIRCLEQ_INSERT_BEFORE(head, listelm, elm, field) {		\
-	(elm)->field.cqe_next = (listelm);				\
-	(elm)->field.cqe_prev = (listelm)->field.cqe_prev;		\
-	if ((listelm)->field.cqe_prev == (void *)(head))		\
-		(head)->cqh_first = (elm);				\
-	else								\
-		(listelm)->field.cqe_prev->field.cqe_next = (elm);	\
-	(listelm)->field.cqe_prev = (elm);				\
-}
-
-#define CIRCLEQ_INSERT_HEAD(head, elm, field) {				\
-	(elm)->field.cqe_next = (head)->cqh_first;			\
-	(elm)->field.cqe_prev = (void *)(head);				\
-	if ((head)->cqh_last == (void *)(head))				\
-		(head)->cqh_last = (elm);				\
-	else								\
-		(head)->cqh_first->field.cqe_prev = (elm);		\
-	(head)->cqh_first = (elm);					\
-}
-
-#define CIRCLEQ_INSERT_TAIL(head, elm, field) {				\
-	(elm)->field.cqe_next = (void *)(head);				\
-	(elm)->field.cqe_prev = (head)->cqh_last;			\
-	if ((head)->cqh_first == (void *)(head))			\
-		(head)->cqh_first = (elm);				\
-	else								\
-		(head)->cqh_last->field.cqe_next = (elm);		\
-	(head)->cqh_last = (elm);					\
-}
-
-#define	CIRCLEQ_REMOVE(head, elm, field) {				\
-	if ((elm)->field.cqe_next == (void *)(head))			\
-		(head)->cqh_last = (elm)->field.cqe_prev;		\
-	else								\
-		(elm)->field.cqe_next->field.cqe_prev =			\
-		    (elm)->field.cqe_prev;				\
-	if ((elm)->field.cqe_prev == (void *)(head))			\
-		(head)->cqh_first = (elm)->field.cqe_next;		\
-	else								\
-		(elm)->field.cqe_prev->field.cqe_next =			\
-		    (elm)->field.cqe_next;				\
-}
-
-#ifdef KERNEL
-
-/*
- * XXX insque() and remque() are an old way of handling certain queues.
- * They bogusly assumes that all queue heads look alike.
- */
-
-struct quehead {
-	struct quehead *qh_link;
-	struct quehead *qh_rlink;
-};
-
-#ifdef	__GNUC__
-
-static __inline void
-insque(void *a, void *b)
-{
-	struct quehead *element = a, *head = b;
-
-	element->qh_link = head->qh_link;
-	element->qh_rlink = head;
-	head->qh_link = element;
-	element->qh_link->qh_rlink = element;
-}
-
-static __inline void
-remque(void *a)
-{
-	struct quehead *element = a;
-
-	element->qh_link->qh_rlink = element->qh_rlink;
-	element->qh_rlink->qh_link = element->qh_link;
-	element->qh_rlink = 0;
-}
-
-#else /* !__GNUC__ */
-
-void	insque __P((void *a, void *b));
-void	remque __P((void *a));
-
-#endif /* __GNUC__ */
-
-#endif /* KERNEL */
-
-#endif /* !_SYS_QUEUE_H_ */
diff --git a/cpukit/libnetworking/sys/reboot.h b/cpukit/libnetworking/sys/reboot.h
deleted file mode 100644
index 48a7f0f782..0000000000
--- a/cpukit/libnetworking/sys/reboot.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1988, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)reboot.h	8.3 (Berkeley) 12/13/94
- * $Id$
- */
-
-#ifndef _SYS_REBOOT_H_
-#define _SYS_REBOOT_H_
-
-/*
- * Arguments to reboot system call.  These are passed to
- * the boot program and on to init.
- */
-#define	RB_AUTOBOOT	0	/* flags for system auto-booting itself */
-
-#define	RB_ASKNAME	0x001	/* ask for file name to reboot from */
-#define	RB_SINGLE	0x002	/* reboot to single user only */
-#define	RB_NOSYNC	0x004	/* dont sync before reboot */
-#define	RB_HALT		0x008	/* don't reboot, just halt */
-#define	RB_INITNAME	0x010	/* name given for /etc/init (unused) */
-#define	RB_DFLTROOT	0x020	/* use compiled-in rootdev */
-#define	RB_KDB		0x040	/* give control to kernel debugger */
-#define	RB_RDONLY	0x080	/* mount root fs read-only */
-#define	RB_DUMP		0x100	/* dump kernel memory before reboot */
-#define	RB_MINIROOT	0x200	/* mini-root present in memory at boot time */
-#define RB_CONFIG	0x400	/* invoke user configuration routing */
-#define RB_VERBOSE	0x800	/* print all potentially useful info */
-#define	RB_SERIAL	0x1000	/* user serial port as console */
-#define	RB_CDROM	0x2000	/* use cdrom as root */
-#define	RB_POWEROFF	0x4000	/* if you can, turn the power off */
-#define	RB_GDB		0x8000	/* use GDB remote debugger instead of DDB */
-#define	RB_MUTE		0x10000	/* Come up with the console muted */
-#define	RB_SELFTEST	0x20000	/* don't boot to normal operation, do selftest */
-
-#define	RB_BOOTINFO	0x80000000	/* have `struct bootinfo *' arg */
-
-/*
- * Constants for converting boot-style device number to type,
- * adaptor (uba, mba, etc), unit number and partition number.
- * Type (== major device number) is in the low byte
- * for backward compatibility.  Except for that of the "magic
- * number", each mask applies to the shifted value.
- * Format:
- *	 (4) (4) (4) (4)  (8)     (8)
- *	--------------------------------
- *	|MA | AD| CT| UN| PART  | TYPE |
- *	--------------------------------
- */
-#define	B_ADAPTORSHIFT		24
-#define	B_ADAPTORMASK		0x0f
-#define	B_ADAPTOR(val)		(((val) >> B_ADAPTORSHIFT) & B_ADAPTORMASK)
-#define B_CONTROLLERSHIFT	20
-#define B_CONTROLLERMASK	0xf
-#define	B_CONTROLLER(val)	(((val)>>B_CONTROLLERSHIFT) & B_CONTROLLERMASK)
-#define B_SLICESHIFT		20
-#define B_SLICEMASK		0xff
-#define B_SLICE(val)		(((val)>>B_SLICESHIFT) & B_SLICEMASK)
-#define B_UNITSHIFT		16
-#define B_UNITMASK		0xf
-#define	B_UNIT(val)		(((val) >> B_UNITSHIFT) & B_UNITMASK)
-#define B_PARTITIONSHIFT	8
-#define B_PARTITIONMASK		0xff
-#define	B_PARTITION(val)	(((val) >> B_PARTITIONSHIFT) & B_PARTITIONMASK)
-#define	B_TYPESHIFT		0
-#define	B_TYPEMASK		0xff
-#define	B_TYPE(val)		(((val) >> B_TYPESHIFT) & B_TYPEMASK)
-
-#define	B_MAGICMASK	0xf0000000
-#define	B_DEVMAGIC	0xa0000000
-
-#define MAKEBOOTDEV(type, adaptor, controller, unit, partition) \
-	(((type) << B_TYPESHIFT) | ((adaptor) << B_ADAPTORSHIFT) | \
-	((controller) << B_CONTROLLERSHIFT) | ((unit) << B_UNITSHIFT) | \
-	((partition) << B_PARTITIONSHIFT) | B_DEVMAGIC)
-
-#endif
diff --git a/cpukit/libnetworking/sys/resourcevar.h b/cpukit/libnetworking/sys/resourcevar.h
deleted file mode 100644
index 2b4c47e48f..0000000000
--- a/cpukit/libnetworking/sys/resourcevar.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
- *  $Id$
- */
-
-/* intentionally empty file */
diff --git a/cpukit/libnetworking/sys/rtprio.h b/cpukit/libnetworking/sys/rtprio.h
deleted file mode 100644
index dd9521e7c8..0000000000
--- a/cpukit/libnetworking/sys/rtprio.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) 1994, Henrik Vestergaard Draboel
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by (name).
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	$Id$
- */
-
-#ifndef _SYS_RTPRIO_H_
-#define _SYS_RTPRIO_H_
-
-/*
- * Process realtime-priority specifications to rtprio.
- */
-
-/* priority types */
-#define RTP_PRIO_REALTIME	0
-#define RTP_PRIO_NORMAL		1
-#define RTP_PRIO_IDLE		2
-
-/* priority range */
-#define RTP_PRIO_MIN		0	/* Highest priority */
-#define RTP_PRIO_MAX		31	/* Lowest priority */
-
-/*
- * rtprio() syscall functions
- */
-#define RTP_LOOKUP		0
-#define RTP_SET			1
-
-#ifndef LOCORE
-struct rtprio {
-	u_short type;
-	u_short prio;
-};
-#endif
-
-#ifndef KERNEL
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-int	rtprio __P((int, pid_t, struct rtprio *));
-__END_DECLS
-#endif	/* !KERNEL */
-#endif	/* !_SYS_RTPRIO_H_ */
diff --git a/cpukit/libnetworking/sys/select.h b/cpukit/libnetworking/sys/select.h
deleted file mode 100644
index e69971e3b6..0000000000
--- a/cpukit/libnetworking/sys/select.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)select.h	8.2 (Berkeley) 1/4/94
- * $Id$
- */
-
-#ifndef _SYS_SELECT_H_
-#define	_SYS_SELECT_H_
-
-/*
- * Used to maintain information about processes that wish to be
- * notified when I/O becomes possible.
- */
-struct selinfo {
-	pid_t	si_pid;		/* process to be notified */
-	short	si_flags;	/* see below */
-};
-#define	SI_COLL	0x0001		/* collision occurred */
-
-#ifdef KERNEL
-struct proc;
-
-void	selrecord __P((struct proc *selector, struct selinfo *));
-void	selwakeup __P((struct selinfo *));
-#endif
-
-#endif /* !_SYS_SELECT_H_ */
diff --git a/cpukit/libnetworking/sys/signalvar.h b/cpukit/libnetworking/sys/signalvar.h
deleted file mode 100644
index 8900458fdb..0000000000
--- a/cpukit/libnetworking/sys/signalvar.h
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)signalvar.h	8.6 (Berkeley) 2/19/95
- * $Id$
- */
-
-#ifndef	_SYS_SIGNALVAR_H_		/* tmp for user.h */
-#define	_SYS_SIGNALVAR_H_
-
-/*
- * Kernel signal definitions and data structures,
- * not exported to user programs.
- */
-
-/*
- * Process signal actions and state, needed only within the process
- * (not necessarily resident).
- */
-struct	sigacts {
-	sig_t	ps_sigact[NSIG];	/* disposition of signals */
-	sigset_t ps_catchmask[NSIG];	/* signals to be blocked */
-	sigset_t ps_sigonstack;		/* signals to take on sigstack */
-	sigset_t ps_sigintr;		/* signals that interrupt syscalls */
-	sigset_t ps_sigreset;		/* signals that reset when caught */
-	sigset_t ps_signodefer;		/* signals not masked while handled */
-	sigset_t ps_oldmask;		/* saved mask from before sigpause */
-	int	ps_flags;		/* signal flags, below */
-	struct	sigaltstack ps_sigstk;	/* sp & on stack state variable */
-	int	ps_sig;			/* for core dump/debugger XXX */
-	u_long	ps_code;		/* for core dump/debugger XXX */
-	sigset_t ps_usertramp;		/* SunOS compat; libc sigtramp XXX */
-};
-
-/* signal flags */
-#define	SAS_OLDMASK	0x01		/* need to restore mask before pause */
-#define	SAS_ALTSTACK	0x02		/* have alternate signal stack */
-
-/* additional signal action values, used only temporarily/internally */
-#define	SIG_CATCH	((__sighandler_t *)2)
-#define	SIG_HOLD	((__sighandler_t *)3)
-
-/*
- * get signal action for process and signal; currently only for current process
- */
-#define SIGACTION(p, sig)	(p->p_sigacts->ps_sigact[(sig)])
-
-/*
- * Determine signal that should be delivered to process p, the current
- * process, 0 if none.  If there is a pending stop signal with default
- * action, the process stops in issignal().
- */
-#define	CURSIG(p)							\
-	(((p)->p_siglist == 0 ||					\
-	    (((p)->p_flag & P_TRACED) == 0 &&				\
-	     ((p)->p_siglist & ~(p)->p_sigmask) == 0)) ?		\
-	    0 : issignal(p))
-
-/*
- * Clear a pending signal from a process.
- */
-#define	CLRSIG(p, sig)	{ (p)->p_siglist &= ~sigmask(sig); }
-
-/*
- * Signal properties and actions.
- * The array below categorizes the signals and their default actions
- * according to the following properties:
- */
-#define	SA_KILL		0x01		/* terminates process by default */
-#define	SA_CORE		0x02		/* ditto and coredumps */
-#define	SA_STOP		0x04		/* suspend process */
-#define	SA_TTYSTOP	0x08		/* ditto, from tty */
-#define	SA_IGNORE	0x10		/* ignore by default */
-#define	SA_CONT		0x20		/* continue if suspended */
-#define	SA_CANTMASK	0x40		/* non-maskable, catchable */
-
-#ifdef	SIGPROP
-static int sigprop[NSIG + 1] = {
-	0,			/* unused */
-	SA_KILL,		/* SIGHUP */
-	SA_KILL,		/* SIGINT */
-	SA_KILL|SA_CORE,	/* SIGQUIT */
-	SA_KILL|SA_CORE,	/* SIGILL */
-	SA_KILL|SA_CORE,	/* SIGTRAP */
-	SA_KILL|SA_CORE,	/* SIGABRT */
-	SA_KILL|SA_CORE,	/* SIGEMT */
-	SA_KILL|SA_CORE,	/* SIGFPE */
-	SA_KILL,		/* SIGKILL */
-	SA_KILL|SA_CORE,	/* SIGBUS */
-	SA_KILL|SA_CORE,	/* SIGSEGV */
-	SA_KILL|SA_CORE,	/* SIGSYS */
-	SA_KILL,		/* SIGPIPE */
-	SA_KILL,		/* SIGALRM */
-	SA_KILL,		/* SIGTERM */
-	SA_IGNORE,		/* SIGURG */
-	SA_STOP,		/* SIGSTOP */
-	SA_STOP|SA_TTYSTOP,	/* SIGTSTP */
-	SA_IGNORE|SA_CONT,	/* SIGCONT */
-	SA_IGNORE,		/* SIGCHLD */
-	SA_STOP|SA_TTYSTOP,	/* SIGTTIN */
-	SA_STOP|SA_TTYSTOP,	/* SIGTTOU */
-	SA_IGNORE,		/* SIGIO */
-	SA_KILL,		/* SIGXCPU */
-	SA_KILL,		/* SIGXFSZ */
-	SA_KILL,		/* SIGVTALRM */
-	SA_KILL,		/* SIGPROF */
-	SA_IGNORE,		/* SIGWINCH  */
-	SA_IGNORE,		/* SIGINFO */
-	SA_KILL,		/* SIGUSR1 */
-	SA_KILL,		/* SIGUSR2 */
-};
-
-#define	contsigmask	(sigmask(SIGCONT))
-#define	stopsigmask	(sigmask(SIGSTOP) | sigmask(SIGTSTP) | \
-			    sigmask(SIGTTIN) | sigmask(SIGTTOU))
-
-#endif /* SIGPROP */
-
-#define	sigcantmask	(sigmask(SIGKILL) | sigmask(SIGSTOP))
-
-#ifdef KERNEL
-/*
- * Machine-independent functions:
- */
-void	execsigs __P((struct proc *p));
-void	gsignal __P((int pgid, int sig));
-int	issignal __P((struct proc *p));
-void	killproc __P((struct proc *p, char *why));
-void	pgsignal __P((struct pgrp *pgrp, int sig, int checkctty));
-void	postsig __P((int sig));
-void	psignal __P((struct proc *p, int sig));
-void	setsigvec __P((struct proc *p, int signum, struct sigaction *sa));
-void	sigexit __P((struct proc *p, int signum));
-void	siginit __P((struct proc *p));
-void	trapsignal __P((struct proc *p, int sig, u_long code));
-
-/*
- * Machine-dependent functions:
- */
-void	sendsig __P((sig_t action, int sig, int returnmask, u_long code));
-#endif	/* KERNEL */
-#endif	/* !_SYS_SIGNALVAR_H_ */
diff --git a/cpukit/libnetworking/sys/socket.h b/cpukit/libnetworking/sys/socket.h
deleted file mode 100644
index 7e0f6c7572..0000000000
--- a/cpukit/libnetworking/sys/socket.h
+++ /dev/null
@@ -1,356 +0,0 @@
-/*
- * Copyright (c) 1982, 1985, 1986, 1988, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)socket.h	8.4 (Berkeley) 2/21/94
- * $Id$
- */
-
-#ifndef _SYS_SOCKET_H_
-#define	_SYS_SOCKET_H_
-
-/*
- * Definitions related to sockets: types, address families, options.
- */
-
-/*
- * Types
- */
-#define	SOCK_STREAM	1		/* stream socket */
-#define	SOCK_DGRAM	2		/* datagram socket */
-#define	SOCK_RAW	3		/* raw-protocol interface */
-#define	SOCK_RDM	4		/* reliably-delivered message */
-#define	SOCK_SEQPACKET	5		/* sequenced packet stream */
-
-/*
- * Option flags per-socket.
- */
-#define	SO_DEBUG	0x0001		/* turn on debugging info recording */
-#define	SO_ACCEPTCONN	0x0002		/* socket has had listen() */
-#define	SO_REUSEADDR	0x0004		/* allow local address reuse */
-#define	SO_KEEPALIVE	0x0008		/* keep connections alive */
-#define	SO_DONTROUTE	0x0010		/* just use interface addresses */
-#define	SO_BROADCAST	0x0020		/* permit sending of broadcast msgs */
-#define	SO_USELOOPBACK	0x0040		/* bypass hardware when possible */
-#define	SO_LINGER	0x0080		/* linger on close if data present */
-#define	SO_OOBINLINE	0x0100		/* leave received OOB data in line */
-#define	SO_REUSEPORT	0x0200		/* allow local address & port reuse */
-#define	SO_TIMESTAMP	0x0400		/* timestamp received dgram traffic */
-
-/*
- * Additional options, not kept in so_options.
- */
-#define SO_SNDBUF	0x1001		/* send buffer size */
-#define SO_RCVBUF	0x1002		/* receive buffer size */
-#define SO_SNDLOWAT	0x1003		/* send low-water mark */
-#define SO_RCVLOWAT	0x1004		/* receive low-water mark */
-#define SO_SNDTIMEO	0x1005		/* send timeout */
-#define SO_RCVTIMEO	0x1006		/* receive timeout */
-#define	SO_ERROR	0x1007		/* get error status and clear */
-#define	SO_TYPE		0x1008		/* get socket type */
-#define	SO_PRIVSTATE	0x1009		/* get/deny privileged state */
-
-/*
- * Structure used for manipulating linger option.
- */
-struct	linger {
-	int	l_onoff;		/* option on/off */
-	int	l_linger;		/* linger time */
-};
-
-/*
- * Level number for (get/set)sockopt() to apply to socket itself.
- */
-#define	SOL_SOCKET	0xffff		/* options for socket level */
-
-/*
- * Address families.
- */
-#define	AF_UNSPEC	0		/* unspecified */
-#define	AF_LOCAL	1		/* local to host (pipes, portals) */
-#define	AF_UNIX		AF_LOCAL	/* backward compatibility */
-#define	AF_INET		2		/* internetwork: UDP, TCP, etc. */
-#define	AF_IMPLINK	3		/* arpanet imp addresses */
-#define	AF_PUP		4		/* pup protocols: e.g. BSP */
-#define	AF_CHAOS	5		/* mit CHAOS protocols */
-#define	AF_NS		6		/* XEROX NS protocols */
-#define	AF_ISO		7		/* ISO protocols */
-#define	AF_OSI		AF_ISO
-#define	AF_ECMA		8		/* European computer manufacturers */
-#define	AF_DATAKIT	9		/* datakit protocols */
-#define	AF_CCITT	10		/* CCITT protocols, X.25 etc */
-#define	AF_SNA		11		/* IBM SNA */
-#define AF_DECnet	12		/* DECnet */
-#define AF_DLI		13		/* DEC Direct data link interface */
-#define AF_LAT		14		/* LAT */
-#define	AF_HYLINK	15		/* NSC Hyperchannel */
-#define	AF_APPLETALK	16		/* Apple Talk */
-#define	AF_ROUTE	17		/* Internal Routing Protocol */
-#define	AF_LINK		18		/* Link layer interface */
-#define	pseudo_AF_XTP	19		/* eXpress Transfer Protocol (no AF) */
-#define	AF_COIP		20		/* connection-oriented IP, aka ST II */
-#define	AF_CNT		21		/* Computer Network Technology */
-#define pseudo_AF_RTIP	22		/* Help Identify RTIP packets */
-#define	AF_IPX		23		/* Novell Internet Protocol */
-#define	AF_SIP		24		/* Simple Internet Protocol */
-#define	pseudo_AF_PIP	25		/* Help Identify PIP packets */
-#define	AF_ISDN		26		/* Integrated Services Digital Network*/
-#define	AF_E164		AF_ISDN		/* CCITT E.164 recommendation */
-#define	pseudo_AF_KEY	27		/* Internal key-management function */
-#define	AF_INET6	28		/* IPv6 */
-
-#define	AF_MAX		29
-
-/*
- * Structure used by kernel to store most
- * addresses.
- */
-struct sockaddr {
-	u_char	sa_len;			/* total length */
-	u_char	sa_family;		/* address family */
-	char	sa_data[14];		/* actually longer; address value */
-};
-
-/*
- * Structure used by kernel to pass protocol
- * information in raw sockets.
- */
-struct sockproto {
-	u_short	sp_family;		/* address family */
-	u_short	sp_protocol;		/* protocol */
-};
-
-/*
- * Protocol families, same as address families for now.
- */
-#define	PF_UNSPEC	AF_UNSPEC
-#define	PF_LOCAL	AF_LOCAL
-#define	PF_UNIX		PF_LOCAL	/* backward compatibility */
-#define	PF_INET		AF_INET
-#define	PF_IMPLINK	AF_IMPLINK
-#define	PF_PUP		AF_PUP
-#define	PF_CHAOS	AF_CHAOS
-#define	PF_NS		AF_NS
-#define	PF_ISO		AF_ISO
-#define	PF_OSI		AF_ISO
-#define	PF_ECMA		AF_ECMA
-#define	PF_DATAKIT	AF_DATAKIT
-#define	PF_CCITT	AF_CCITT
-#define	PF_SNA		AF_SNA
-#define PF_DECnet	AF_DECnet
-#define PF_DLI		AF_DLI
-#define PF_LAT		AF_LAT
-#define	PF_HYLINK	AF_HYLINK
-#define	PF_APPLETALK	AF_APPLETALK
-#define	PF_ROUTE	AF_ROUTE
-#define	PF_LINK		AF_LINK
-#define	PF_XTP		pseudo_AF_XTP	/* really just proto family, no AF */
-#define	PF_COIP		AF_COIP
-#define	PF_CNT		AF_CNT
-#define	PF_SIP		AF_SIP
-#define	PF_IPX		AF_IPX		/* same format as AF_NS */
-#define PF_RTIP		pseudo_AF_RTIP	/* same format as AF_INET */
-#define PF_PIP		pseudo_AF_PIP
-#define	PF_ISDN		AF_ISDN
-#define	PF_KEY		pseudo_AF_KEY
-#define	PF_INET6	AF_INET6
-
-#define	PF_MAX		AF_MAX
-
-/*
- * Definitions for network related sysctl, CTL_NET.
- *
- * Second level is protocol family.
- * Third level is protocol number.
- *
- * Further levels are defined by the individual families below.
- */
-#define NET_MAXID	AF_MAX
-
-#define CTL_NET_NAMES { \
-	{ 0, 0 }, \
-	{ "unix", CTLTYPE_NODE }, \
-	{ "inet", CTLTYPE_NODE }, \
-	{ "implink", CTLTYPE_NODE }, \
-	{ "pup", CTLTYPE_NODE }, \
-	{ "chaos", CTLTYPE_NODE }, \
-	{ "xerox_ns", CTLTYPE_NODE }, \
-	{ "iso", CTLTYPE_NODE }, \
-	{ "emca", CTLTYPE_NODE }, \
-	{ "datakit", CTLTYPE_NODE }, \
-	{ "ccitt", CTLTYPE_NODE }, \
-	{ "ibm_sna", CTLTYPE_NODE }, \
-	{ "decnet", CTLTYPE_NODE }, \
-	{ "dec_dli", CTLTYPE_NODE }, \
-	{ "lat", CTLTYPE_NODE }, \
-	{ "hylink", CTLTYPE_NODE }, \
-	{ "appletalk", CTLTYPE_NODE }, \
-	{ "route", CTLTYPE_NODE }, \
-	{ "link_layer", CTLTYPE_NODE }, \
-	{ "xtp", CTLTYPE_NODE }, \
-	{ "coip", CTLTYPE_NODE }, \
-	{ "cnt", CTLTYPE_NODE }, \
-	{ "rtip", CTLTYPE_NODE }, \
-	{ "ipx", CTLTYPE_NODE }, \
-	{ "sip", CTLTYPE_NODE }, \
-	{ "pip", CTLTYPE_NODE }, \
-	{ "isdn", CTLTYPE_NODE }, \
-	{ "key", CTLTYPE_NODE }, \
-}
-
-/*
- * PF_ROUTE - Routing table
- *
- * Three additional levels are defined:
- *	Fourth: address family, 0 is wildcard
- *	Fifth: type of info, defined below
- *	Sixth: flag(s) to mask with for NET_RT_FLAGS
- */
-#define NET_RT_DUMP	1		/* dump; may limit to a.f. */
-#define NET_RT_FLAGS	2		/* by flags, e.g. RESOLVING */
-#define NET_RT_IFLIST	3		/* survey interface list */
-#define	NET_RT_MAXID	4
-
-#define CTL_NET_RT_NAMES { \
-	{ 0, 0 }, \
-	{ "dump", CTLTYPE_STRUCT }, \
-	{ "flags", CTLTYPE_STRUCT }, \
-	{ "iflist", CTLTYPE_STRUCT }, \
-}
-
-/*
- * Maximum queue length specifiable by listen.
- */
-#define	SOMAXCONN	128
-
-/*
- * Message header for recvmsg and sendmsg calls.
- * Used value-result for recvmsg, value only for sendmsg.
- */
-struct msghdr {
-	caddr_t	msg_name;		/* optional address */
-	u_int	msg_namelen;		/* size of address */
-	struct	iovec *msg_iov;		/* scatter/gather array */
-	u_int	msg_iovlen;		/* # elements in msg_iov */
-	caddr_t	msg_control;		/* ancillary data, see below */
-	u_int	msg_controllen;		/* ancillary data buffer len */
-	int	msg_flags;		/* flags on received message */
-};
-
-#define	MSG_OOB		0x1		/* process out-of-band data */
-#define	MSG_PEEK	0x2		/* peek at incoming message */
-#define	MSG_DONTROUTE	0x4		/* send without using routing tables */
-#define	MSG_EOR		0x8		/* data completes record */
-#define	MSG_TRUNC	0x10		/* data discarded before delivery */
-#define	MSG_CTRUNC	0x20		/* control data lost before delivery */
-#define	MSG_WAITALL	0x40		/* wait for full request or error */
-#define	MSG_DONTWAIT	0x80		/* this message should be nonblocking */
-#define	MSG_EOF		0x100		/* data completes connection */
-#define MSG_COMPAT      0x8000		/* used in sendit() */
-
-/*
- * Header for ancillary data objects in msg_control buffer.
- * Used for additional information with/about a datagram
- * not expressible by flags.  The format is a sequence
- * of message elements headed by cmsghdr structures.
- */
-struct cmsghdr {
-	u_int	cmsg_len;		/* data byte count, including hdr */
-	int	cmsg_level;		/* originating protocol */
-	int	cmsg_type;		/* protocol-specific type */
-/* followed by	u_char  cmsg_data[]; */
-};
-
-/* given pointer to struct cmsghdr, return pointer to data */
-#define	CMSG_DATA(cmsg)		((u_char *)((cmsg) + 1))
-
-/* given pointer to struct cmsghdr, return pointer to next cmsghdr */
-#define	CMSG_NXTHDR(mhdr, cmsg)	\
-	(((caddr_t)(cmsg) + (cmsg)->cmsg_len + sizeof(struct cmsghdr) > \
-	    (mhdr)->msg_control + (mhdr)->msg_controllen) ? \
-	    (struct cmsghdr *)NULL : \
-	    (struct cmsghdr *)((caddr_t)(cmsg) + ALIGN((cmsg)->cmsg_len)))
-
-#define	CMSG_FIRSTHDR(mhdr)	((struct cmsghdr *)(mhdr)->msg_control)
-
-/* "Socket"-level control message types: */
-#define	SCM_RIGHTS	0x01		/* access rights (array of int) */
-#define	SCM_TIMESTAMP	0x02		/* timestamp (struct timeval) */
-
-/*
- * 4.3 compat sockaddr, move to compat file later
- */
-struct osockaddr {
-	u_short	sa_family;		/* address family */
-	char	sa_data[14];		/* up to 14 bytes of direct address */
-};
-
-/*
- * 4.3-compat message header (move to compat file later).
- */
-struct omsghdr {
-	caddr_t	msg_name;		/* optional address */
-	int	msg_namelen;		/* size of address */
-	struct	iovec *msg_iov;		/* scatter/gather array */
-	int	msg_iovlen;		/* # elements in msg_iov */
-	caddr_t	msg_accrights;		/* access rights sent/received */
-	int	msg_accrightslen;
-};
-
-#ifndef	KERNEL
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-int	accept __P((int, struct sockaddr *, int *));
-int	bind __P((int, const struct sockaddr *, int));
-int	connect __P((int, const struct sockaddr *, int));
-int	getpeername __P((int, struct sockaddr *, int *));
-int	getsockname __P((int, struct sockaddr *, int *));
-int	getsockopt __P((int, int, int, void *, int *));
-int	listen __P((int, int));
-ssize_t	recv __P((int, void *, size_t, int));
-ssize_t	recvfrom __P((int, void *, size_t, int, struct sockaddr *, int *));
-ssize_t	recvmsg __P((int, struct msghdr *, int));
-ssize_t	send __P((int, const void *, size_t, int));
-ssize_t	sendto __P((int, const void *,
-	    size_t, int, const struct sockaddr *, int));
-ssize_t	sendmsg __P((int, const struct msghdr *, int));
-int	setsockopt __P((int, int, int, const void *, int));
-int	shutdown __P((int, int));
-int	socket __P((int, int, int));
-int	socketpair __P((int, int, int, int *));
-__END_DECLS
-
-#else /* KERNEL */
-void	pfctlinput __P((int, struct sockaddr *));
-#endif /* !KERNEL */
-#endif /* !_SYS_SOCKET_H_ */
diff --git a/cpukit/libnetworking/sys/socketvar.h b/cpukit/libnetworking/sys/socketvar.h
deleted file mode 100644
index 257fee012b..0000000000
--- a/cpukit/libnetworking/sys/socketvar.h
+++ /dev/null
@@ -1,279 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)socketvar.h	8.3 (Berkeley) 2/19/95
- * $Id$
- */
-
-#ifndef _SYS_SOCKETVAR_H_
-#define _SYS_SOCKETVAR_H_
-
-#include <sys/queue.h>			/* for TAILQ macros */
-#include <sys/select.h>			/* for struct selinfo */
-
-/*
- * Kernel structure per socket.
- * Contains send and receive buffer queues,
- * handle on protocol and pointer to protocol
- * private data and error information.
- */
-struct socket {
-	short	so_type;		/* generic type, see socket.h */
-	short	so_options;		/* from socket call, see socket.h */
-	short	so_linger;		/* time to linger while closing */
-	short	so_state;		/* internal state flags SS_*, below */
-	caddr_t	so_pcb;			/* protocol control block */
-	struct	protosw *so_proto;	/* protocol handle */
-/*
- * Variables for connection queuing.
- * Socket where accepts occur is so_head in all subsidiary sockets.
- * If so_head is 0, socket is not related to an accept.
- * For head socket so_q0 queues partially completed connections,
- * while so_q is a queue of connections ready to be accepted.
- * If a connection is aborted and it has so_head set, then
- * it has to be pulled out of either so_q0 or so_q.
- * We allow connections to queue up based on current queue lengths
- * and limit on number of queued connections for this socket.
- */
-	struct	socket *so_head;	/* back pointer to accept socket */
-	TAILQ_HEAD(, socket) so_incomp;	/* queue of partial unaccepted connections */
-	TAILQ_HEAD(, socket) so_comp;	/* queue of complete unaccepted connections */
-	TAILQ_ENTRY(socket) so_list;	/* list of unaccepted connections */
-	short	so_qlen;		/* number of unaccepted connections */
-	short	so_incqlen;		/* number of unaccepted incomplete
-					   connections */
-	short	so_qlimit;		/* max number queued connections */
-	short	so_timeo;		/* connection timeout */
-	u_short	so_error;		/* error affecting connection */
-	pid_t	so_pgid;		/* pgid for signals */
-	u_long	so_oobmark;		/* chars to oob mark */
-/*
- * Variables for socket buffering.
- */
-	struct	sockbuf {
-		u_long	sb_cc;		/* actual chars in buffer */
-		u_long	sb_hiwat;	/* max actual char count */
-		u_long	sb_mbcnt;	/* chars of mbufs used */
-		u_long	sb_mbmax;	/* max chars of mbufs to use */
-		long	sb_lowat;	/* low water mark */
-		struct	mbuf *sb_mb;	/* the mbuf chain */
-		struct	selinfo sb_sel;	/* process selecting read/write */
-		short	sb_flags;	/* flags, see below */
-		short	sb_timeo;	/* timeout for read/write */
-	} so_rcv, so_snd;
-#define	SB_MAX		(256*1024)	/* default for max chars in sockbuf */
-#define	SB_LOCK		0x01		/* lock on data queue */
-#define	SB_WANT		0x02		/* someone is waiting to lock */
-#define	SB_WAIT		0x04		/* someone is waiting for data/space */
-#define	SB_SEL		0x08		/* someone is selecting */
-#define	SB_ASYNC	0x10		/* ASYNC I/O, need signals */
-#define	SB_NOTIFY	(SB_WAIT|SB_SEL|SB_ASYNC)
-#define	SB_NOINTR	0x40		/* operations not interruptible */
-
-	caddr_t	so_tpcb;		/* Wisc. protocol control block XXX */
-	void	(*so_upcall) __P((struct socket *so, caddr_t arg, int waitf));
-	caddr_t	so_upcallarg;		/* Arg for above */
-	uid_t	so_uid;			/* who opened the socket */
-};
-
-/*
- * Socket state bits.
- */
-#define	SS_NOFDREF		0x0001	/* no file table ref any more */
-#define	SS_ISCONNECTED		0x0002	/* socket connected to a peer */
-#define	SS_ISCONNECTING		0x0004	/* in process of connecting to peer */
-#define	SS_ISDISCONNECTING	0x0008	/* in process of disconnecting */
-#define	SS_CANTSENDMORE		0x0010	/* can't send more data to peer */
-#define	SS_CANTRCVMORE		0x0020	/* can't receive more data from peer */
-#define	SS_RCVATMARK		0x0040	/* at mark on input */
-
-#define	SS_PRIV			0x0080	/* privileged for broadcast, raw... */
-#define	SS_NBIO			0x0100	/* non-blocking ops */
-#define	SS_ASYNC		0x0200	/* async i/o notify */
-#define	SS_ISCONFIRMING		0x0400	/* deciding to accept connection req */
-
-#define	SS_INCOMP		0x0800	/* unaccepted, incomplete connection */
-#define	SS_COMP			0x1000	/* unaccepted, complete connection */
-
-
-/*
- * Macros for sockets and socket buffering.
- */
-
-/*
- * How much space is there in a socket buffer (so->so_snd or so->so_rcv)?
- * This is problematical if the fields are unsigned, as the space might
- * still be negative (cc > hiwat or mbcnt > mbmax).  Should detect
- * overflow and return 0.  Should use "lmin" but it doesn't exist now.
- */
-#define	sbspace(sb) \
-    ((long) imin((int)((sb)->sb_hiwat - (sb)->sb_cc), \
-	 (int)((sb)->sb_mbmax - (sb)->sb_mbcnt)))
-
-/* do we have to send all at once on a socket? */
-#define	sosendallatonce(so) \
-    ((so)->so_proto->pr_flags & PR_ATOMIC)
-
-/* can we read something from so? */
-#define	soreadable(so) \
-    ((so)->so_rcv.sb_cc >= (so)->so_rcv.sb_lowat || \
-	((so)->so_state & SS_CANTRCVMORE) || \
-	(so)->so_comp.tqh_first || (so)->so_error)
-
-/* can we write something to so? */
-#define	sowriteable(so) \
-    ((sbspace(&(so)->so_snd) >= (so)->so_snd.sb_lowat && \
-	(((so)->so_state&SS_ISCONNECTED) || \
-	  ((so)->so_proto->pr_flags&PR_CONNREQUIRED)==0)) || \
-     ((so)->so_state & SS_CANTSENDMORE) || \
-     (so)->so_error)
-
-/* adjust counters in sb reflecting allocation of m */
-#define	sballoc(sb, m) { \
-	(sb)->sb_cc += (m)->m_len; \
-	(sb)->sb_mbcnt += MSIZE; \
-	if ((m)->m_flags & M_EXT) \
-		(sb)->sb_mbcnt += (m)->m_ext.ext_size; \
-}
-
-/* adjust counters in sb reflecting freeing of m */
-#define	sbfree(sb, m) { \
-	(sb)->sb_cc -= (m)->m_len; \
-	(sb)->sb_mbcnt -= MSIZE; \
-	if ((m)->m_flags & M_EXT) \
-		(sb)->sb_mbcnt -= (m)->m_ext.ext_size; \
-}
-
-/*
- * Set lock on sockbuf sb; sleep if lock is already held.
- * Unless SB_NOINTR is set on sockbuf, sleep is interruptible.
- * Returns error without lock if sleep is interrupted.
- */
-#define sblock(sb, wf) ((sb)->sb_flags & SB_LOCK ? \
-		(((wf) == M_WAITOK) ? sb_lock(sb) : EWOULDBLOCK) : \
-		((sb)->sb_flags |= SB_LOCK), 0)
-
-/* release lock on sockbuf sb */
-#define	sbunlock(sb) { \
-	(sb)->sb_flags &= ~SB_LOCK; \
-	if ((sb)->sb_flags & SB_WANT) { \
-		(sb)->sb_flags &= ~SB_WANT; \
-		wakeup((caddr_t)&(sb)->sb_flags); \
-	} \
-}
-
-#define	sorwakeup(so)	{ sowakeup((so), &(so)->so_rcv); \
-			  if ((so)->so_upcall) \
-			    (*((so)->so_upcall))((so), (so)->so_upcallarg, M_DONTWAIT); \
-			}
-
-#define	sowwakeup(so)	sowakeup((so), &(so)->so_snd)
-
-#ifdef KERNEL
-extern u_long	sb_max;
-
-/* to catch callers missing new second argument to sonewconn: */
-#define	sonewconn(head, connstatus)	sonewconn1((head), (connstatus))
-
-struct filedesc;
-struct mbuf;
-struct sockaddr;
-struct stat;
-
-/*
- * File operations on sockets.
- */
-int	soo_ioctl __P((struct file *fp, int cmd, caddr_t data,
-	    struct proc *p));
-int	soo_select __P((struct file *fp, int which, struct proc *p));
-int	soo_stat __P((struct socket *so, struct stat *ub));
-
-/*
- * From uipc_socket and friends
- */
-int	getsock __P((struct filedesc *fdp, int fdes, struct file **fpp));
-int	sockargs __P((struct mbuf **mp, caddr_t buf, int buflen, int type));
-void	sbappend __P((struct sockbuf *sb, struct mbuf *m));
-int	sbappendaddr __P((struct sockbuf *sb, struct sockaddr *asa,
-	    struct mbuf *m0, struct mbuf *control));
-int	sbappendcontrol __P((struct sockbuf *sb, struct mbuf *m0,
-	    struct mbuf *control));
-void	sbappendrecord __P((struct sockbuf *sb, struct mbuf *m0));
-void	sbcheck __P((struct sockbuf *sb));
-void	sbcompress __P((struct sockbuf *sb, struct mbuf *m, struct mbuf *n));
-struct mbuf *
-	sbcreatecontrol __P((caddr_t p, int size, int type, int level));
-void	sbdrop __P((struct sockbuf *sb, int len));
-void	sbdroprecord __P((struct sockbuf *sb));
-void	sbflush __P((struct sockbuf *sb));
-void	sbinsertoob __P((struct sockbuf *sb, struct mbuf *m0));
-void	sbrelease __P((struct sockbuf *sb));
-int	sbreserve __P((struct sockbuf *sb, u_long cc));
-int	sbwait __P((struct sockbuf *sb));
-int	sb_lock __P((struct sockbuf *sb));
-int	soabort __P((struct socket *so));
-int	soaccept __P((struct socket *so, struct mbuf *nam));
-int	sobind __P((struct socket *so, struct mbuf *nam));
-void	socantrcvmore __P((struct socket *so));
-void	socantsendmore __P((struct socket *so));
-int	soclose __P((struct socket *so));
-int	soconnect __P((struct socket *so, struct mbuf *nam));
-int	soconnect2 __P((struct socket *so1, struct socket *so2));
-int	socreate __P((int dom, struct socket **aso, int type, int proto,
-	    struct proc *p));
-int	sodisconnect __P((struct socket *so));
-void	sofree __P((struct socket *so));
-int	sogetopt __P((struct socket *so, int level, int optname,
-	    struct mbuf **mp));
-void	sohasoutofband __P((struct socket *so));
-void	soisconnected __P((struct socket *so));
-void	soisconnecting __P((struct socket *so));
-void	soisdisconnected __P((struct socket *so));
-void	soisdisconnecting __P((struct socket *so));
-int	solisten __P((struct socket *so, int backlog));
-struct socket *
-	sodropablereq __P((struct socket *head));
-struct socket *
-	sonewconn1 __P((struct socket *head, int connstatus));
-int	soreceive __P((struct socket *so, struct mbuf **paddr, struct uio *uio,
-	    struct mbuf **mp0, struct mbuf **controlp, int *flagsp));
-int	soreserve __P((struct socket *so, u_long sndcc, u_long rcvcc));
-void	sorflush __P((struct socket *so));
-int	sosend __P((struct socket *so, struct mbuf *addr, struct uio *uio,
-	    struct mbuf *top, struct mbuf *control, int flags));
-int	sosetopt __P((struct socket *so, int level, int optname,
-	    struct mbuf *m0));
-int	soshutdown __P((struct socket *so, int how));
-void	sowakeup __P((struct socket *so, struct sockbuf *sb));
-#endif /* KERNEL */
-
-#endif /* !_SYS_SOCKETVAR_H_ */
diff --git a/cpukit/libnetworking/sys/sysctl.h b/cpukit/libnetworking/sys/sysctl.h
deleted file mode 100644
index b25ba43c4f..0000000000
--- a/cpukit/libnetworking/sys/sysctl.h
+++ /dev/null
@@ -1,379 +0,0 @@
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Mike Karels at Berkeley Software Design, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)sysctl.h	8.1 (Berkeley) 6/2/93
- * $Id$
- */
-
-#ifndef _SYS_SYSCTL_H_
-#define	_SYS_SYSCTL_H_
-
-/*
- * Definitions for sysctl call.  The sysctl call uses a hierarchical name
- * for objects that can be examined or modified.  The name is expressed as
- * a sequence of integers.  Like a file path name, the meaning of each
- * component depends on its place in the hierarchy.  The top-level and kern
- * identifiers are defined here, and other identifiers are defined in the
- * respective subsystem header files.
- */
-
-#define CTL_MAXNAME	12	/* largest number of components supported */
-
-/*
- * Each subsystem defined by sysctl defines a list of variables
- * for that subsystem. Each name is either a node with further
- * levels defined below it, or it is a leaf of some particular
- * type given below. Each sysctl level defines a set of name/type
- * pairs to be used by sysctl(1) in manipulating the subsystem.
- */
-struct ctlname {
-	char	*ctl_name;	/* subsystem name */
-	int	ctl_type;	/* type of name */
-};
-
-#define CTLTYPE		0xf	/* Mask for the type */
-#define	CTLTYPE_NODE	1	/* name is a node */
-#define	CTLTYPE_INT	2	/* name describes an integer */
-#define	CTLTYPE_STRING	3	/* name describes a string */
-#define	CTLTYPE_QUAD	4	/* name describes a 64-bit number */
-#define	CTLTYPE_OPAQUE	5	/* name describes a structure */
-#define	CTLTYPE_STRUCT	CTLTYPE_OPAQUE	/* name describes a structure */
-
-#define CTLFLAG_RD	0x80000000	/* Allow reads of variable */
-#define CTLFLAG_WR	0x40000000	/* Allow writes to the variable */
-#define CTLFLAG_RW	(CTLFLAG_RD|CTLFLAG_WR)
-#define CTLFLAG_NOLOCK	0x20000000	/* XXX Don't Lock */
-#define CTLFLAG_ANYBODY	0x10000000	/* All users can set this var */
-
-/*
- * USE THIS instead of a hardwired number from the categories below
- * to get dynamically assigned sysctl entries using the linker-set
- * technology. This is the way nearly all new sysctl variables should
- * be implimented.
- * e.g. SYSCTL_INT(_parent, OID_AUTO, name, CTLFLAG_RW, &variable, 0, "");
- */ 
-#define OID_AUTO	(-1)
-
-#ifdef KERNEL
-#define SYSCTL_HANDLER_ARGS (struct sysctl_oid *oidp, void *arg1, int arg2, \
-	struct sysctl_req *req)
-
-/*
- * This describes the access space for a sysctl request.  This is needed
- * so that we can use the interface from the kernel or from user-space.
- */
-struct sysctl_req {
-	struct proc	*p;
-	int		lock;
-	void		*oldptr;
-	int		oldlen;
-	int		oldidx;
-	int		(*oldfunc)(struct sysctl_req *, const void *, int);
-	void		*newptr;
-	int		newlen;
-	int		newidx;
-	int		(*newfunc)(struct sysctl_req *, void *, int);
-};
-
-/*
- * This describes one "oid" in the MIB tree.  Potentially more nodes can
- * be hidden behind it, expanded by the handler.
- */
-struct sysctl_oid {
-	int		oid_number;
-	int		oid_kind;
-	void		*oid_arg1;
-	int		oid_arg2;
-	const char	*oid_name;
-	int 		(*oid_handler) SYSCTL_HANDLER_ARGS;
-	const char	*oid_fmt;
-};
-
-#define SYSCTL_IN(r, p, l)
-#define SYSCTL_OUT(r, p, l)
-
-int sysctl_handle_int SYSCTL_HANDLER_ARGS;
-int sysctl_handle_string SYSCTL_HANDLER_ARGS;
-int sysctl_handle_opaque SYSCTL_HANDLER_ARGS;
-
-/* This is the "raw" function for a mib-oid */
-#define SYSCTL_OID(parent, nbr, name, kind, a1, a2, handler, fmt, descr)
-
-/* This makes a node from which other oids can hang */
-#define SYSCTL_NODE(parent, nbr, name, access, handler, descr)
-
-/* This is a string len can be 0 to indicate '\0' termination */
-#define SYSCTL_STRING(parent, nbr, name, access, arg, len, descr) 
-
-/* This is a integer, if ptr is NULL, val is returned */
-#define SYSCTL_INT(parent, nbr, name, access, ptr, val, descr) 
-
-/* This is anything, specified by a pointer and a lenth */
-#define SYSCTL_OPAQUE(parent, nbr, name, access, ptr, len, fmt, descr) 
-
-/* This is a struct, specified by a pointer and type */
-#define SYSCTL_STRUCT(parent, nbr, name, access, ptr, type, descr) 
-
-/* Needs a proc.  Specify by pointer and arg */
-#define SYSCTL_PROC(parent, nbr, name, access, ptr, arg, handler, fmt, descr) 
-#endif /* KERNEL */
-
-/*
- * Top-level identifiers
- */
-#define	CTL_UNSPEC	0		/* unused */
-#define	CTL_KERN	1		/* "high kernel": proc, limits */
-#define	CTL_VM		2		/* virtual memory */
-#define	CTL_VFS		3		/* file system, mount type is next */
-#define	CTL_NET		4		/* network, see socket.h */
-#define	CTL_DEBUG	5		/* debugging parameters */
-#define	CTL_HW		6		/* generic cpu/io */
-#define	CTL_MACHDEP	7		/* machine dependent */
-#define	CTL_USER	8		/* user-level */
-#define	CTL_MAXID	9		/* number of valid top-level ids */
-
-#define CTL_NAMES { \
-	{ 0, 0 }, \
-	{ "kern", CTLTYPE_NODE }, \
-	{ "vm", CTLTYPE_NODE }, \
-	{ "vfs", CTLTYPE_NODE }, \
-	{ "net", CTLTYPE_NODE }, \
-	{ "debug", CTLTYPE_NODE }, \
-	{ "hw", CTLTYPE_NODE }, \
-	{ "machdep", CTLTYPE_NODE }, \
-	{ "user", CTLTYPE_NODE }, \
-}
-
-/*
- * CTL_KERN identifiers
- */
-#define	KERN_OSTYPE	 	 1	/* string: system version */
-#define	KERN_OSRELEASE	 	 2	/* string: system release */
-#define	KERN_OSREV	 	 3	/* int: system revision */
-#define	KERN_VERSION	 	 4	/* string: compile time info */
-#define	KERN_MAXVNODES	 	 5	/* int: max vnodes */
-#define	KERN_MAXPROC	 	 6	/* int: max processes */
-#define	KERN_MAXFILES	 	 7	/* int: max open files */
-#define	KERN_ARGMAX	 	 8	/* int: max arguments to exec */
-#define	KERN_SECURELVL	 	 9	/* int: system security level */
-#define	KERN_HOSTNAME		10	/* string: hostname */
-#define	KERN_HOSTID		11	/* int: host identifier */
-#define	KERN_CLOCKRATE		12	/* struct: struct clockrate */
-#define	KERN_VNODE		13	/* struct: vnode structures */
-#define	KERN_PROC		14	/* struct: process entries */
-#define	KERN_FILE		15	/* struct: file entries */
-#define	KERN_PROF		16	/* node: kernel profiling info */
-#define	KERN_POSIX1		17	/* int: POSIX.1 version */
-#define	KERN_NGROUPS		18	/* int: # of supplemental group ids */
-#define	KERN_JOB_CONTROL	19	/* int: is job control available */
-#define	KERN_SAVED_IDS		20	/* int: saved set-user/group-ID */
-#define	KERN_BOOTTIME		21	/* struct: time kernel was booted */
-#define KERN_NISDOMAINNAME	22	/* string: YP domain name */
-#define KERN_UPDATEINTERVAL	23	/* int: update process sleep time */
-#define KERN_OSRELDATE		24	/* int: OS release date */
-#define KERN_NTP_PLL		25	/* node: NTP PLL control */
-#define	KERN_BOOTFILE		26	/* string: name of booted kernel */
-#define	KERN_MAXFILESPERPROC	27	/* int: max open files per proc */
-#define	KERN_MAXPROCPERUID 	28	/* int: max processes per uid */
-#define KERN_DUMPDEV		29	/* dev_t: device to dump on */
-#define	KERN_SOMAXCONN		30	/* int: max connections in listen q */
-#define	KERN_MAXSOCKBUF		31	/* int: max size of a socket buffer */
-#define	KERN_PS_STRINGS		32	/* int: address of PS_STRINGS */
-#define	KERN_USRSTACK		33	/* int: address of USRSTACK */
-#define KERN_MAXID		34      /* number of valid kern ids */
-
-#define CTL_KERN_NAMES { \
-	{ 0, 0 }, \
-	{ "ostype", CTLTYPE_STRING }, \
-	{ "osrelease", CTLTYPE_STRING }, \
-	{ "osrevision", CTLTYPE_INT }, \
-	{ "version", CTLTYPE_STRING }, \
-	{ "maxvnodes", CTLTYPE_INT }, \
-	{ "maxproc", CTLTYPE_INT }, \
-	{ "maxfiles", CTLTYPE_INT }, \
-	{ "argmax", CTLTYPE_INT }, \
-	{ "securelevel", CTLTYPE_INT }, \
-	{ "hostname", CTLTYPE_STRING }, \
-	{ "hostid", CTLTYPE_INT }, \
-	{ "clockrate", CTLTYPE_STRUCT }, \
-	{ "vnode", CTLTYPE_STRUCT }, \
-	{ "proc", CTLTYPE_STRUCT }, \
-	{ "file", CTLTYPE_STRUCT }, \
-	{ "profiling", CTLTYPE_NODE }, \
-	{ "posix1version", CTLTYPE_INT }, \
-	{ "ngroups", CTLTYPE_INT }, \
-	{ "job_control", CTLTYPE_INT }, \
-	{ "saved_ids", CTLTYPE_INT }, \
-	{ "boottime", CTLTYPE_STRUCT }, \
-	{ "nisdomainname", CTLTYPE_STRING }, \
-	{ "update", CTLTYPE_INT }, \
-	{ "osreldate", CTLTYPE_INT }, \
-        { "ntp_pll", CTLTYPE_NODE }, \
-	{ "bootfile", CTLTYPE_STRING }, \
-	{ "maxfilesperproc", CTLTYPE_INT }, \
-	{ "maxprocperuid", CTLTYPE_INT }, \
-	{ "dumpdev", CTLTYPE_STRUCT }, /* we lie; don't print as int */ \
-	{ "somaxconn", CTLTYPE_INT }, \
-	{ "maxsockbuf", CTLTYPE_INT }, \
-	{ "ps_strings", CTLTYPE_INT }, \
-	{ "usrstack", CTLTYPE_INT }, \
-}
-
-/*
- * CTL_VFS identifiers
- */
-#define VFS_VFSCONF		0	/* get configured filesystems */
-#define VFS_MAXID		1	/* number of items */
-
-#define CTL_VFS_NAMES { \
-	{ "vfsconf", CTLTYPE_STRUCT }, \
-}
-
-/*
- * KERN_PROC subtypes
- */
-#define KERN_PROC_ALL		0	/* everything */
-#define	KERN_PROC_PID		1	/* by process id */
-#define	KERN_PROC_PGRP		2	/* by process group id */
-#define	KERN_PROC_SESSION	3	/* by session of pid */
-#define	KERN_PROC_TTY		4	/* by controlling tty */
-#define	KERN_PROC_UID		5	/* by effective uid */
-#define	KERN_PROC_RUID		6	/* by real uid */
-
-/*
- * CTL_HW identifiers
- */
-#define	HW_MACHINE	 1		/* string: machine class */
-#define	HW_MODEL	 2		/* string: specific machine model */
-#define	HW_NCPU		 3		/* int: number of cpus */
-#define	HW_BYTEORDER	 4		/* int: machine byte order */
-#define	HW_PHYSMEM	 5		/* int: total memory */
-#define	HW_USERMEM	 6		/* int: non-kernel memory */
-#define	HW_PAGESIZE	 7		/* int: software page size */
-#define	HW_DISKNAMES	 8		/* strings: disk drive names */
-#define	HW_DISKSTATS	 9		/* struct: diskstats[] */
-#define HW_FLOATINGPT	10		/* int: has HW floating point? */
-#define HW_MACHINE_ARCH	11		/* string: machine architecture */
-#define	HW_MAXID	12		/* number of valid hw ids */
-
-#define CTL_HW_NAMES { \
-	{ 0, 0 }, \
-	{ "machine", CTLTYPE_STRING }, \
-	{ "model", CTLTYPE_STRING }, \
-	{ "ncpu", CTLTYPE_INT }, \
-	{ "byteorder", CTLTYPE_INT }, \
-	{ "physmem", CTLTYPE_INT }, \
-	{ "usermem", CTLTYPE_INT }, \
-	{ "pagesize", CTLTYPE_INT }, \
-	{ "disknames", CTLTYPE_STRUCT }, \
-	{ "diskstats", CTLTYPE_STRUCT }, \
-	{ "floatingpoint", CTLTYPE_INT }, \
-}
-
-/*
- * CTL_USER definitions
- */
-#define	USER_CS_PATH		 1	/* string: _CS_PATH */
-#define	USER_BC_BASE_MAX	 2	/* int: BC_BASE_MAX */
-#define	USER_BC_DIM_MAX		 3	/* int: BC_DIM_MAX */
-#define	USER_BC_SCALE_MAX	 4	/* int: BC_SCALE_MAX */
-#define	USER_BC_STRING_MAX	 5	/* int: BC_STRING_MAX */
-#define	USER_COLL_WEIGHTS_MAX	 6	/* int: COLL_WEIGHTS_MAX */
-#define	USER_EXPR_NEST_MAX	 7	/* int: EXPR_NEST_MAX */
-#define	USER_LINE_MAX		 8	/* int: LINE_MAX */
-#define	USER_RE_DUP_MAX		 9	/* int: RE_DUP_MAX */
-#define	USER_POSIX2_VERSION	10	/* int: POSIX2_VERSION */
-#define	USER_POSIX2_C_BIND	11	/* int: POSIX2_C_BIND */
-#define	USER_POSIX2_C_DEV	12	/* int: POSIX2_C_DEV */
-#define	USER_POSIX2_CHAR_TERM	13	/* int: POSIX2_CHAR_TERM */
-#define	USER_POSIX2_FORT_DEV	14	/* int: POSIX2_FORT_DEV */
-#define	USER_POSIX2_FORT_RUN	15	/* int: POSIX2_FORT_RUN */
-#define	USER_POSIX2_LOCALEDEF	16	/* int: POSIX2_LOCALEDEF */
-#define	USER_POSIX2_SW_DEV	17	/* int: POSIX2_SW_DEV */
-#define	USER_POSIX2_UPE		18	/* int: POSIX2_UPE */
-#define	USER_STREAM_MAX		19	/* int: POSIX2_STREAM_MAX */
-#define	USER_TZNAME_MAX		20	/* int: POSIX2_TZNAME_MAX */
-#define	USER_MAXID		21	/* number of valid user ids */
-
-#define	CTL_USER_NAMES { \
-	{ 0, 0 }, \
-	{ "cs_path", CTLTYPE_STRING }, \
-	{ "bc_base_max", CTLTYPE_INT }, \
-	{ "bc_dim_max", CTLTYPE_INT }, \
-	{ "bc_scale_max", CTLTYPE_INT }, \
-	{ "bc_string_max", CTLTYPE_INT }, \
-	{ "coll_weights_max", CTLTYPE_INT }, \
-	{ "expr_nest_max", CTLTYPE_INT }, \
-	{ "line_max", CTLTYPE_INT }, \
-	{ "re_dup_max", CTLTYPE_INT }, \
-	{ "posix2_version", CTLTYPE_INT }, \
-	{ "posix2_c_bind", CTLTYPE_INT }, \
-	{ "posix2_c_dev", CTLTYPE_INT }, \
-	{ "posix2_char_term", CTLTYPE_INT }, \
-	{ "posix2_fort_dev", CTLTYPE_INT }, \
-	{ "posix2_fort_run", CTLTYPE_INT }, \
-	{ "posix2_localedef", CTLTYPE_INT }, \
-	{ "posix2_sw_dev", CTLTYPE_INT }, \
-	{ "posix2_upe", CTLTYPE_INT }, \
-	{ "stream_max", CTLTYPE_INT }, \
-	{ "tzname_max", CTLTYPE_INT }, \
-}
-
-#ifdef KERNEL
-
-extern char	cpu_model[];
-extern char	machine[];
-extern char	osrelease[];
-extern char	ostype[];
-
-int kernel_sysctl(struct proc *p, int *name, u_int namelen, void *old, size_t *oldlenp, void *new, size_t newlen, int *retval);
-int userland_sysctl(struct proc *p, int *name, u_int namelen, void *old, size_t *oldlenp, int inkernel, void *new, size_t newlen, int *retval);
-/*
-int	sysctl_clockrate __P((char *, size_t*));
-int	sysctl_file __P((char *, size_t*));
-int	sysctl_doproc __P((int *, u_int, char *, size_t*));
-int	sysctl_doprof __P((int *, u_int, void *, size_t *, void *, size_t));
-*/
-
-#else	/* !KERNEL */
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-int	sysctl __P((int *, u_int, void *, size_t *, void *, size_t));
-int	sysctlbyname __P((const char *, void *, size_t *, void *, size_t));
-__END_DECLS
-#endif	/* KERNEL */
-
-#endif	/* !_SYS_SYSCTL_H_ */
diff --git a/cpukit/libnetworking/sys/syslimits.h b/cpukit/libnetworking/sys/syslimits.h
deleted file mode 100644
index 283a0241e3..0000000000
--- a/cpukit/libnetworking/sys/syslimits.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (c) 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)syslimits.h	8.1 (Berkeley) 6/2/93
- * $Id$
- */
-
-#ifndef _SYS_SYSLIMITS_H_
-#define _SYS_SYSLIMITS_H_
-
-#if !defined(__rtems__)
-#define	ARG_MAX			65536	/* max bytes for an exec function */
-#endif
-
-#if !defined(__rtems__)
-#ifndef CHILD_MAX
-#define	CHILD_MAX		   40	/* max simultaneous processes */
-#endif
-#endif
-
-#if !defined(__rtems__)
-#define	LINK_MAX		32767	/* max file link count */
-#endif
-
-#define	MAX_CANON		  255	/* max bytes in term canon input line */
-
-#define	MAX_INPUT		  255	/* max bytes in terminal input */
-
-#if !defined(__rtems__)
-#define	NAME_MAX		  255	/* max bytes in a file name */
-#endif
-
-#define	NGROUPS_MAX		   16	/* max supplemental group id's */
-
-#if !defined(__rtems__)
-#ifndef OPEN_MAX
-#define	OPEN_MAX		   64	/* max open files per process */
-#endif
-#endif
-
-#if !defined(__rtems__)
-#define	PATH_MAX		 1024	/* max bytes in pathname */
-#endif
-
-#define	PIPE_BUF		  512	/* max bytes for atomic pipe writes */
-
-#define	BC_BASE_MAX		   99	/* max ibase/obase values in bc(1) */
-#define	BC_DIM_MAX		 2048	/* max array elements in bc(1) */
-#define	BC_SCALE_MAX		   99	/* max scale value in bc(1) */
-#define	BC_STRING_MAX		 1000	/* max const string length in bc(1) */
-#define	COLL_WEIGHTS_MAX	    0	/* max weights for order keyword */
-#define	EXPR_NEST_MAX		   32	/* max expressions nested in expr(1) */
-#define	LINE_MAX		 2048	/* max bytes in an input line */
-#define	RE_DUP_MAX		  255	/* max RE's in interval notation */
-
-#endif
diff --git a/cpukit/libnetworking/sys/syslog.h b/cpukit/libnetworking/sys/syslog.h
deleted file mode 100644
index 724bee62c7..0000000000
--- a/cpukit/libnetworking/sys/syslog.h
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)syslog.h	8.1 (Berkeley) 6/2/93
- * $Id$
- */
-
-#ifndef _SYS_SYSLOG_H_
-#define _SYS_SYSLOG_H_
-
-#define	_PATH_LOG	"/var/run/log"
-#define	_PATH_OLDLOG	"/dev/log"	/* backward compatibility */
-
-/*
- * priorities/facilities are encoded into a single 32-bit quantity, where the
- * bottom 3 bits are the priority (0-7) and the top 28 bits are the facility
- * (0-big number).  Both the priorities and the facilities map roughly
- * one-to-one to strings in the syslogd(8) source code.  This mapping is
- * included in this file.
- *
- * priorities (these are ordered)
- */
-#define	LOG_EMERG	0	/* system is unusable */
-#define	LOG_ALERT	1	/* action must be taken immediately */
-#define	LOG_CRIT	2	/* critical conditions */
-#define	LOG_ERR		3	/* error conditions */
-#define	LOG_WARNING	4	/* warning conditions */
-#define	LOG_NOTICE	5	/* normal but significant condition */
-#define	LOG_INFO	6	/* informational */
-#define	LOG_DEBUG	7	/* debug-level messages */
-
-#define	LOG_PRIMASK	0x07	/* mask to extract priority part (internal) */
-				/* extract priority */
-#define	LOG_PRI(p)	((p) & LOG_PRIMASK)
-#define	LOG_MAKEPRI(fac, pri)	((fac) | (pri))
-
-#ifdef SYSLOG_NAMES
-#define	INTERNAL_NOPRI	0x10	/* the "no priority" priority */
-				/* mark "facility" */
-#define	INTERNAL_MARK	LOG_MAKEPRI((LOG_NFACILITIES<<3), 0)
-typedef struct _code {
-	char	*c_name;
-	int	c_val;
-} CODE;
-
-CODE prioritynames[] = {
-	{ "alert",	LOG_ALERT,	},
-	{ "crit",	LOG_CRIT,	},
-	{ "debug",	LOG_DEBUG,	},
-	{ "emerg",	LOG_EMERG,	},
-	{ "err",	LOG_ERR,	},
-	{ "error",	LOG_ERR,	},	/* DEPRECATED */
-	{ "info",	LOG_INFO,	},
-	{ "none",	INTERNAL_NOPRI,	},	/* INTERNAL */
-	{ "notice",	LOG_NOTICE,	},
-	{ "panic", 	LOG_EMERG,	},	/* DEPRECATED */
-	{ "warn",	LOG_WARNING,	},	/* DEPRECATED */
-	{ "warning",	LOG_WARNING,	},
-	{ NULL,		-1,		}
-};
-#endif
-
-/* facility codes */
-#define	LOG_KERN	(0<<3)	/* kernel messages */
-#define	LOG_USER	(1<<3)	/* random user-level messages */
-#define	LOG_MAIL	(2<<3)	/* mail system */
-#define	LOG_DAEMON	(3<<3)	/* system daemons */
-#define	LOG_AUTH	(4<<3)	/* security/authorization messages */
-#define	LOG_SYSLOG	(5<<3)	/* messages generated internally by syslogd */
-#define	LOG_LPR		(6<<3)	/* line printer subsystem */
-#define	LOG_NEWS	(7<<3)	/* network news subsystem */
-#define	LOG_UUCP	(8<<3)	/* UUCP subsystem */
-#define	LOG_CRON	(9<<3)	/* clock daemon */
-#define	LOG_AUTHPRIV	(10<<3)	/* security/authorization messages (private) */
-				/* Facility #10 clashes in DEC UNIX, where */
-				/* it's defined as LOG_MEGASAFE for AdvFS  */
-				/* event logging.                          */
-#define	LOG_FTP		(11<<3)	/* ftp daemon */
-#define	LOG_NTP		(12<<3)	/* NTP subsystem */
-
-	/* other codes through 15 reserved for system use */
-#define	LOG_LOCAL0	(16<<3)	/* reserved for local use */
-#define	LOG_LOCAL1	(17<<3)	/* reserved for local use */
-#define	LOG_LOCAL2	(18<<3)	/* reserved for local use */
-#define	LOG_LOCAL3	(19<<3)	/* reserved for local use */
-#define	LOG_LOCAL4	(20<<3)	/* reserved for local use */
-#define	LOG_LOCAL5	(21<<3)	/* reserved for local use */
-#define	LOG_LOCAL6	(22<<3)	/* reserved for local use */
-#define	LOG_LOCAL7	(23<<3)	/* reserved for local use */
-
-#define	LOG_NFACILITIES	24	/* current number of facilities */
-#define	LOG_FACMASK	0x03f8	/* mask to extract facility part */
-				/* facility of pri */
-#define	LOG_FAC(p)	(((p) & LOG_FACMASK) >> 3)
-
-#ifdef SYSLOG_NAMES
-CODE facilitynames[] = {
-	{ "auth",	LOG_AUTH,	},
-	{ "authpriv",	LOG_AUTHPRIV,	},
-	{ "cron", 	LOG_CRON,	},
-	{ "daemon",	LOG_DAEMON,	},
-	{ "ftp",	LOG_FTP,	},
-	{ "kern",	LOG_KERN,	},
-	{ "lpr",	LOG_LPR,	},
-	{ "mail",	LOG_MAIL,	},
-	{ "mark", 	INTERNAL_MARK,	},	/* INTERNAL */
-	{ "news",	LOG_NEWS,	},
-	{ "ntp",	LOG_NTP,	},
-	{ "security",	LOG_AUTH,	},	/* DEPRECATED */
-	{ "syslog",	LOG_SYSLOG,	},
-	{ "user",	LOG_USER,	},
-	{ "uucp",	LOG_UUCP,	},
-	{ "local0",	LOG_LOCAL0,	},
-	{ "local1",	LOG_LOCAL1,	},
-	{ "local2",	LOG_LOCAL2,	},
-	{ "local3",	LOG_LOCAL3,	},
-	{ "local4",	LOG_LOCAL4,	},
-	{ "local5",	LOG_LOCAL5,	},
-	{ "local6",	LOG_LOCAL6,	},
-	{ "local7",	LOG_LOCAL7,	},
-	{ NULL,		-1,		}
-};
-#endif
-
-#ifdef KERNEL
-#define	LOG_PRINTF	-1	/* pseudo-priority to indicate use of printf */
-#endif
-
-/*
- * arguments to setlogmask.
- */
-#define	LOG_MASK(pri)	(1 << (pri))		/* mask for one priority */
-#define	LOG_UPTO(pri)	((1 << ((pri)+1)) - 1)	/* all priorities through pri */
-
-/*
- * Option flags for openlog.
- *
- * LOG_ODELAY no longer does anything.
- * LOG_NDELAY is the inverse of what it used to be.
- */
-#define	LOG_PID		0x01	/* log the pid with each message */
-#define	LOG_CONS	0x02	/* log on the console if errors in sending */
-#define	LOG_ODELAY	0x04	/* delay open until first syslog() (default) */
-#define	LOG_NDELAY	0x08	/* don't delay open */
-#define	LOG_NOWAIT	0x10	/* don't wait for console forks: DEPRECATED */
-#define	LOG_PERROR	0x20	/* log to stderr as well */
-
-#ifdef KERNEL
-
-#else /* not KERNEL */
-
-#include <sys/cdefs.h>
-#include <stdarg.h>
-
-__BEGIN_DECLS
-void	closelog __P((void));
-void	openlog __P((const char *, int, int));
-int	setlogmask __P((int));
-void	syslog __P((int, const char *, ...));
-void	vsyslog __P((int, const char *, va_list));
-__END_DECLS
-
-#endif /* !KERNEL */
-
-#endif
diff --git a/cpukit/libnetworking/sys/systm.h b/cpukit/libnetworking/sys/systm.h
deleted file mode 100644
index 7e14867e70..0000000000
--- a/cpukit/libnetworking/sys/systm.h
+++ /dev/null
@@ -1,198 +0,0 @@
-/*-
- * Copyright (c) 1982, 1988, 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)systm.h	8.7 (Berkeley) 3/29/95
- * $Id$
- */
-
-#ifndef _SYS_SYSTM_H_
-#define	_SYS_SYSTM_H_
-
-#include <machine/cpufunc.h>
-
-extern int securelevel;		/* system security level (see init(8)) */
-
-extern int cold;		/* nonzero if we are doing a cold boot */
-extern const char *panicstr;	/* panic message */
-extern char version[];		/* system version */
-extern char copyright[];	/* system copyright */
-
-extern int nblkdev;		/* number of entries in bdevsw */
-extern int nchrdev;		/* number of entries in cdevsw */
-extern struct swdevt *swdevt;	/* swap-device information */
-extern int nswdev;		/* number of swap devices */
-extern int nswap;		/* size of swap space */
-
-extern int selwait;		/* select timeout address */
-
-extern u_char curpriority;	/* priority of current process */
-
-extern int physmem;		/* physical memory */
-
-extern dev_t dumpdev;		/* dump device */
-extern long dumplo;		/* offset into dumpdev */
-
-extern dev_t rootdev;		/* root device */
-extern struct vnode *rootvp;	/* vnode equivalent to above */
-
-extern dev_t swapdev;		/* swapping device */
-extern struct vnode *swapdev_vp;/* vnode equivalent to above */
-
-extern int boothowto;		/* reboot flags, from console subsystem */
-extern int bootverbose;		/* nonzero to print verbose messages */
-
-/*
- * General function declarations.
- */
-void	Debugger __P((const char *msg));
-int	nullop __P((void));
-int	eopnotsupp __P((void));
-int	einval __P((void));
-int	seltrue __P((dev_t dev, int which, struct proc *p));
-int	ureadc __P((int, struct uio *));
-void	*hashinit __P((int count, int type, u_long *hashmask));
-void	*phashinit __P((int count, int type, u_long *nentries));
-
-void	panic __P((const char *, ...)) __dead2;
-void	boot __P((int)) __dead2;
-void	cpu_boot __P((int));
-void	tablefull __P((const char *));
-int	addlog __P((const char *, ...));
-int	kvprintf __P((char const *, void (*)(int, void*), void *, int,
-		      _BSD_VA_LIST_));
-void	log __P((int, const char *, ...));
-int	printf __P((const char *, ...));
-int	sprintf __P((char *buf, const char *, ...));
-void	uprintf __P((const char *, ...));
-void	ttyprintf __P((struct tty *, const char *, ...));
-
-#define bcopy(f,t,n) memcpy((t),(f),(n))
-#define bzero(p,n) memset((p),(0),(n))
-
-int	copystr __P((const void *kfaddr, void *kdaddr, size_t len,
-		size_t *lencopied));
-int	copyinstr __P((const void *udaddr, void *kaddr, size_t len,
-		size_t *lencopied));
-int	copyin __P((const void *udaddr, void *kaddr, size_t len));
-int	copyout __P((const void *kaddr, void *udaddr, size_t len));
-
-int	fubyte __P((const void *base));
-int	fuibyte __P((const void *base));
-int	subyte __P((void *base, int byte));
-int	suibyte __P((void *base, int byte));
-int	fuword __P((const void *base));
-int	suword __P((void *base, int word));
-int	susword __P((void *base, int word));
-
-int	hzto __P((struct timeval *tv));
-void	realitexpire __P((void *));
-
-struct clockframe;
-void	hardclock __P((struct clockframe *frame));
-void	softclock __P((void));
-void	statclock __P((struct clockframe *frame));
-
-void	startprofclock __P((struct proc *));
-void	stopprofclock __P((struct proc *));
-void	setstatclockrate __P((int hzrate));
-
-void	hardupdate __P((long));
-void	hardpps __P((struct timeval *tvp, long usec));
-
-#include <sys/libkern.h>
-
-/* Initialize the world */
-extern void consinit(void);
-extern void usrinfoinit(void);
-extern void cpu_initclocks(void);
-extern void vntblinit(void);
-extern void nchinit(void);
-
-/* Finalize the world. */
-void	shutdown_nice __P((void));
-
-/*
- * Kernel to clock driver interface.
- */
-void	inittodr __P((time_t base));
-void	resettodr __P((void));
-void	startrtclock __P((void));
-
-/* Timeouts */
-typedef void (timeout_t)(void *); /* actual timeout function type */
-typedef timeout_t *timeout_func_t; /* a pointer to this type */
-
-void timeout(timeout_func_t, void *, int);
-void untimeout(timeout_func_t, void *);
-void	logwakeup __P((void));
-
-/* Various other callout lists that modules might want to know about */
-/* shutdown callout list definitions */
-typedef void (*bootlist_fn)(int,void *);
-int at_shutdown(bootlist_fn function, void *arg, int);
-int rm_at_shutdown(bootlist_fn function, void *arg);
-#define SHUTDOWN_PRE_SYNC 0
-#define SHUTDOWN_POST_SYNC 1
-
-/* forking */ /* XXX not yet */
-typedef void (*forklist_fn)(struct proc *parent,struct proc *child,int flags);
-int at_fork(forklist_fn function);
-int rm_at_fork(forklist_fn function);
-
-/* exiting */
-typedef void (*exitlist_fn)(struct proc *procp);
-int at_exit(exitlist_fn function);
-int rm_at_exit(exitlist_fn function);
-
-/* Not exactly a callout LIST, but a callout entry.. 			*/
-/* Allow an external module to define a hardware watchdog tickler	*/
-/* Normally a process would do this, but there are times when the	*/
-/* kernel needs to be able to hold off the watchdog, when the process	*/
-/* is not active, e.g. when dumping core. Costs us a whole 4 bytes to	*/
-/* make this generic. the variable is in kern_shutdown.c */
-typedef void (*watchdog_tickle_fn)(void);
-extern watchdog_tickle_fn wdog_tickler;
-
-
-/* 
- * Common `proc' functions are declared here so that proc.h can be included
- * less often.
- */
-int	tsleep __P((void *chan, int pri, char *wmesg, int timo));
-void	wakeup __P((void *chan));
-
-#endif /* !_SYS_SYSTM_H_ */
diff --git a/cpukit/libnetworking/sys/ttydefaults.h b/cpukit/libnetworking/sys/ttydefaults.h
deleted file mode 100644
index 68f0ddbe77..0000000000
--- a/cpukit/libnetworking/sys/ttydefaults.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)ttydefaults.h	8.4 (Berkeley) 1/21/94
- * $Id$
- */
-
-/*
- * System wide defaults for terminal state.
- */
-#ifndef _SYS_TTYDEFAULTS_H_
-#define	_SYS_TTYDEFAULTS_H_
-
-/*
- * Defaults on "first" open.
- */
-#define	TTYDEF_IFLAG	(BRKINT	| ICRNL	| IMAXBEL | IXON | IXANY)
-#define TTYDEF_OFLAG	(OPOST | ONLCR)
-#define TTYDEF_LFLAG	(ECHO | ICANON | ISIG | IEXTEN | ECHOE|ECHOKE|ECHOCTL)
-#define	TTYDEF_CFLAG	(CREAD | CS8 | HUPCL)
-#define TTYDEF_SPEED	(B9600)
-
-/*
- * Control Character Defaults
- */
-#define CTRL(x)	(x&037)
-#define	CEOF		CTRL('d')
-#define	CEOL		0xff		/* XXX avoid _POSIX_VDISABLE */
-#define	CERASE		0177
-#define	CINTR		CTRL('c')
-#define	CSTATUS		CTRL('t')
-#define	CKILL		CTRL('u')
-#define	CMIN		1
-#define	CQUIT		034		/* FS, ^\ */
-#define	CSUSP		CTRL('z')
-#define	CTIME		0
-#define	CDSUSP		CTRL('y')
-#define	CSTART		CTRL('q')
-#define	CSTOP		CTRL('s')
-#define	CLNEXT		CTRL('v')
-#define	CDISCARD 	CTRL('o')
-#define	CWERASE 	CTRL('w')
-#define	CREPRINT 	CTRL('r')
-#define	CEOT		CEOF
-/* compat */
-#define	CBRK		CEOL
-#define CRPRNT		CREPRINT
-#define	CFLUSH		CDISCARD
-
-/* PROTECTED INCLUSION ENDS HERE */
-#endif /* !_SYS_TTYDEFAULTS_H_ */
-
-/*
- * #define TTYDEFCHARS to include an array of default control characters.
- */
-#ifdef TTYDEFCHARS
-static cc_t	ttydefchars[NCCS] = {
-	CEOF,	CEOL,	CEOL,	CERASE, CWERASE, CKILL, CREPRINT,
-	_POSIX_VDISABLE, CINTR,	CQUIT,	CSUSP,	CDSUSP,	CSTART,	CSTOP,	CLNEXT,
-	CDISCARD, CMIN,	CTIME,  CSTATUS, _POSIX_VDISABLE
-};
-#undef TTYDEFCHARS
-#endif
diff --git a/cpukit/libnetworking/sys/ucred.h b/cpukit/libnetworking/sys/ucred.h
deleted file mode 100644
index d3899c3b4c..0000000000
--- a/cpukit/libnetworking/sys/ucred.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)ucred.h	8.4 (Berkeley) 1/9/95
- * $Id$
- */
-
-#ifndef _SYS_UCRED_H_
-#define	_SYS_UCRED_H_
-
-/*
- * Credentials.
- */
-struct ucred {
-	u_short	cr_ref;			/* reference count */
-	uid_t	cr_uid;			/* effective user id */
-	short	cr_ngroups;		/* number of groups */
-	gid_t	cr_groups[NGROUPS];	/* groups */
-};
-#define cr_gid cr_groups[0]
-#define NOCRED ((struct ucred *)0)	/* no credential available */
-#define FSCRED ((struct ucred *)-1)	/* filesystem credential */
-
-#ifdef KERNEL
-#define	crhold(cr)	(cr)->cr_ref++
-
-struct ucred	*crcopy __P((struct ucred *cr));
-struct ucred	*crdup __P((struct ucred *cr));
-void		crfree __P((struct ucred *cr));
-struct ucred	*crget __P((void));
-int		suser __P((struct ucred *cred, u_short *acflag));
-int		groupmember __P((gid_t gid, struct ucred *cred));
-#endif /* KERNEL */
-
-#endif /* !_SYS_UCRED_H_ */
diff --git a/cpukit/libnetworking/sys/uio.h b/cpukit/libnetworking/sys/uio.h
deleted file mode 100644
index 305941500d..0000000000
--- a/cpukit/libnetworking/sys/uio.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)uio.h	8.5 (Berkeley) 2/22/94
- * $Id$
- */
-
-#ifndef _SYS_UIO_H_
-#define	_SYS_UIO_H_
-
-/*
- * XXX
- * iov_base should be a void *.
- */
-struct iovec {
-	char	*iov_base;	/* Base address. */
-	size_t	 iov_len;	/* Length. */
-};
-
-enum	uio_rw { UIO_READ, UIO_WRITE };
-
-/* Segment flag values. */
-enum uio_seg {
-	UIO_USERSPACE,		/* from user data space */
-	UIO_SYSSPACE,		/* from system space */
-	UIO_USERISPACE,		/* from user I space */
-	UIO_NOCOPY		/* don't copy, already in object */
-};
-
-#ifdef KERNEL
-struct uio {
-	struct	iovec *uio_iov;
-	int	uio_iovcnt;
-	off_t	uio_offset;
-	int	uio_resid;
-	enum	uio_seg uio_segflg;
-	enum	uio_rw uio_rw;
-	struct	proc *uio_procp;
-};
-
-/*
- * Limits
- */
-#define UIO_MAXIOV	1024		/* max 1K of iov's */
-#define UIO_SMALLIOV	8		/* 8 on stack, else malloc */
-#endif /* KERNEL */
-
-#ifdef KERNEL
-
-int	uiomove __P((caddr_t, int, struct uio *));
-
-#else /* !KERNEL */
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-ssize_t	readv __P((int, const struct iovec *, int));
-ssize_t	writev __P((int, const struct iovec *, int));
-__END_DECLS
-
-#endif /* KERNEL */
-
-#endif /* !_SYS_UIO_H_ */
diff --git a/cpukit/libnetworking/syslog.h b/cpukit/libnetworking/syslog.h
deleted file mode 100644
index 6d223d00b7..0000000000
--- a/cpukit/libnetworking/syslog.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
- *  $Id$
- */
-
-#include <sys/syslog.h>
diff --git a/cpukit/libnetworking/vm/vm.h b/cpukit/libnetworking/vm/vm.h
deleted file mode 100644
index 19ea10e5eb..0000000000
--- a/cpukit/libnetworking/vm/vm.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)vm.h	8.2 (Berkeley) 12/13/93
- * $Id$
- */
-
-#ifndef VM_H
-#define VM_H
-
-typedef char vm_inherit_t;	/* XXX: inheritance codes */
-typedef u_char vm_prot_t;	/* protection codes */
-
-union vm_map_object;
-typedef union vm_map_object vm_map_object_t;
-
-struct vm_map_entry;
-typedef struct vm_map_entry *vm_map_entry_t;
-
-struct vm_map;
-typedef struct vm_map *vm_map_t;
-
-struct vm_object;
-typedef struct vm_object *vm_object_t;
-
-#ifndef KERNEL
-/*
- * This is defined in <sys/types.h> for the kernel so that non-vm kernel
- * sources (mainly Mach-derived ones such as ddb) don't have to include
- * vm stuff.  Defining it there for applications might break things.
- * Define it here for "applications" that include vm headers (e.g.,
- * genassym).
- */
-typedef int boolean_t;
-
-/*
- * This is defined in <sys/types.h> for the kernel so that vnode_if.h
- * doesn't have to include <vm/vm.h>.
- */
-struct vm_page;
-typedef struct vm_page *vm_page_t;
-#endif
-
-#endif				/* VM_H */
diff --git a/cpukit/libnetworking/vm/vm_extern.h b/cpukit/libnetworking/vm/vm_extern.h
deleted file mode 100644
index 720d42dc28..0000000000
--- a/cpukit/libnetworking/vm/vm_extern.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)vm_extern.h	8.2 (Berkeley) 1/12/94
- * $Id$
- */
-
-#ifndef _VM_EXTERN_H_
-#define	_VM_EXTERN_H_
-
-struct buf;
-struct proc;
-struct vmspace;
-struct vmtotal;
-struct mount;
-struct vnode;
-
-#ifdef KERNEL
-
-#ifdef TYPEDEF_FOR_UAP
-int getpagesize __P((struct proc * p, void *, int *));
-int madvise __P((struct proc *, void *, int *));
-int mincore __P((struct proc *, void *, int *));
-int mprotect __P((struct proc *, void *, int *));
-int msync __P((struct proc *, void *, int *));
-int munmap __P((struct proc *, void *, int *));
-int obreak __P((struct proc *, void *, int *));
-int sbrk __P((struct proc *, void *, int *));
-int smmap __P((struct proc *, void *, int *));
-int sstk __P((struct proc *, void *, int *));
-int swapon __P((struct proc *, void *, int *));
-#endif
-
-void faultin __P((struct proc *p));
-int grow __P((struct proc *, u_int));
-int kernacc __P((caddr_t, int, int));
-vm_offset_t kmem_alloc __P((vm_map_t, vm_size_t));
-vm_offset_t kmem_alloc_pageable __P((vm_map_t, vm_size_t));
-vm_offset_t kmem_alloc_wait __P((vm_map_t, vm_size_t));
-void kmem_free __P((vm_map_t, vm_offset_t, vm_size_t));
-void kmem_free_wakeup __P((vm_map_t, vm_offset_t, vm_size_t));
-void kmem_init __P((vm_offset_t, vm_offset_t));
-vm_offset_t kmem_malloc __P((vm_map_t, vm_size_t, boolean_t));
-vm_map_t kmem_suballoc __P((vm_map_t, vm_offset_t *, vm_offset_t *, vm_size_t, boolean_t));
-void munmapfd __P((struct proc *, int));
-int pager_cache __P((vm_object_t, boolean_t));
-int swaponvp __P((struct proc *, struct vnode *, dev_t , u_long));
-void swapout_procs __P((void));
-int useracc __P((caddr_t, int, int));
-int vm_fault __P((vm_map_t, vm_offset_t, vm_prot_t, boolean_t));
-void vm_fault_copy_entry __P((vm_map_t, vm_map_t, vm_map_entry_t, vm_map_entry_t));
-void vm_fault_unwire __P((vm_map_t, vm_offset_t, vm_offset_t));
-int vm_fault_wire __P((vm_map_t, vm_offset_t, vm_offset_t));
-int vm_fault_user_wire __P((vm_map_t, vm_offset_t, vm_offset_t));
-int vm_fork __P((struct proc *, struct proc *));
-int vm_mmap __P((vm_map_t, vm_offset_t *, vm_size_t, vm_prot_t, vm_prot_t, int, caddr_t, vm_ooffset_t));
-vm_offset_t vm_page_alloc_contig __P((vm_offset_t, vm_offset_t, vm_offset_t, vm_offset_t));
-void vm_set_page_size __P((void));
-void vmmeter __P((void));
-struct vmspace *vmspace_alloc __P((vm_offset_t, vm_offset_t, int));
-struct vmspace *vmspace_fork __P((struct vmspace *));
-void vmspace_free __P((struct vmspace *));
-void vnode_pager_setsize __P((struct vnode *, vm_ooffset_t));
-void vnode_pager_umount __P((struct mount *));
-void vnode_pager_uncache __P((struct vnode *));
-void vslock __P((caddr_t, u_int));
-void vsunlock __P((caddr_t, u_int, int));
-void vm_object_print __P((/* db_expr_t */ int, boolean_t, /* db_expr_t */ int,
-			  char *));
-void vm_fault_quick __P((caddr_t v, int prot));
-
-#endif				/* KERNEL */
-
-#endif				/* !_VM_EXTERN_H_ */
diff --git a/cpukit/libnetworking/vm/vm_kern.h b/cpukit/libnetworking/vm/vm_kern.h
deleted file mode 100644
index b1e073dd3a..0000000000
--- a/cpukit/libnetworking/vm/vm_kern.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * The Mach Operating System project at Carnegie-Mellon University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	from: @(#)vm_kern.h	8.1 (Berkeley) 6/11/93
- *
- *
- * Copyright (c) 1987, 1990 Carnegie-Mellon University.
- * All rights reserved.
- *
- * Authors: Avadis Tevanian, Jr., Michael Wayne Young
- *
- * Permission to use, copy, modify and distribute this software and
- * its documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- *
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- *
- * Carnegie Mellon requests users of this software to return to
- *
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- *
- * any improvements or extensions that they make and grant Carnegie the
- * rights to redistribute these changes.
- *
- * $Id$
- */
-
-#ifndef _VM_VM_KERN_H_
-#define _VM_VM_KERN_H_ 1
-
-/* Kernel memory management definitions. */
-extern vm_map_t buffer_map;
-extern vm_map_t kernel_map;
-extern vm_map_t kmem_map;
-extern vm_map_t mb_map;
-extern int mb_map_full;
-extern vm_map_t io_map;
-extern vm_map_t clean_map;
-extern vm_map_t phys_map;
-extern vm_map_t exec_map;
-extern vm_map_t u_map;
-
-extern vm_offset_t kernel_vm_end;
-
-#endif				/* _VM_VM_KERN_H_ */
diff --git a/cpukit/libnetworking/vm/vm_param.h b/cpukit/libnetworking/vm/vm_param.h
deleted file mode 100644
index f1cfca98ec..0000000000
--- a/cpukit/libnetworking/vm/vm_param.h
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * The Mach Operating System project at Carnegie-Mellon University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	from: @(#)vm_param.h	8.1 (Berkeley) 6/11/93
- *
- *
- * Copyright (c) 1987, 1990 Carnegie-Mellon University.
- * All rights reserved.
- *
- * Authors: Avadis Tevanian, Jr., Michael Wayne Young
- *
- * Permission to use, copy, modify and distribute this software and
- * its documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- *
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- *
- * Carnegie Mellon requests users of this software to return to
- *
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- *
- * any improvements or extensions that they make and grant Carnegie the
- * rights to redistribute these changes.
- *
- * $Id$
- */
-
-/*
- *	Machine independent virtual memory parameters.
- */
-
-#ifndef	_VM_PARAM_
-#define	_VM_PARAM_
-
-#include <machine/vmparam.h>
-
-/*
- *	The machine independent pages are refered to as PAGES.  A page
- *	is some number of hardware pages, depending on the target machine.
- */
-#define DEFAULT_PAGE_SIZE	4096
-
-#if 0
-
-/*
- *	All references to the size of a page should be done with PAGE_SIZE
- *	or PAGE_SHIFT.  The fact they are variables is hidden here so that
- *	we can easily make them constant if we so desire.
- */
-#ifndef PAGE_SIZE
-#define	PAGE_SIZE	cnt.v_page_size	/* size of page */
-#endif
-#ifndef PAGE_MASK
-#define PAGE_MASK	page_mask	/* size of page - 1 */
-#endif
-#ifndef PAGE_SHIFT
-#define PAGE_SHIFT	page_shift	/* bits to shift for pages */
-#endif
-
-#endif
-
-#ifdef KERNEL
-extern vm_size_t page_mask;
-extern int page_shift;
-
-#endif
-
-/*
- * CTL_VM identifiers
- */
-#define	VM_METER		1	/* struct vmmeter */
-#define	VM_LOADAVG	 	2	/* struct loadavg */
-#define VM_V_FREE_MIN		3	/* cnt.v_free_min */
-#define VM_V_FREE_TARGET	4	/* cnt.v_free_target */
-#define VM_V_FREE_RESERVED	5	/* cnt.v_free_reserved */
-#define VM_V_INACTIVE_TARGET	6	/* cnt.v_inactive_target */
-#define VM_V_CACHE_MIN		7	/* cnt.v_cache_max */
-#define VM_V_CACHE_MAX		8	/* cnt.v_cache_min */
-#define VM_V_PAGEOUT_FREE_MIN	9	/* cnt.v_pageout_free_min */
-#define	VM_PAGEOUT_ALGORITHM	10	/* pageout algorithm */
-#define VM_SWAPPING_ENABLED	11	/* swapping enabled */
-#define	VM_MAXID		12	/* number of valid vm ids */
-
-#define CTL_VM_NAMES { \
-	{ 0, 0 }, \
-	{ "vmmeter", CTLTYPE_STRUCT }, \
-	{ "loadavg", CTLTYPE_STRUCT }, \
-	{ "v_free_min", CTLTYPE_INT }, \
-	{ "v_free_target", CTLTYPE_INT }, \
-	{ "v_free_reserved", CTLTYPE_INT }, \
-	{ "v_inactive_target", CTLTYPE_INT }, \
-	{ "v_cache_min", CTLTYPE_INT }, \
-	{ "v_cache_max", CTLTYPE_INT }, \
-	{ "v_pageout_free_min", CTLTYPE_INT}, \
-	{ "pageout_algorithm", CTLTYPE_INT}, \
-	{ "swapping_enabled", CTLTYPE_INT},\
-}
-
-/*
- *	Return values from the VM routines.
- */
-#define	KERN_SUCCESS		0
-#define	KERN_INVALID_ADDRESS	1
-#define	KERN_PROTECTION_FAILURE	2
-#define	KERN_NO_SPACE		3
-#define	KERN_INVALID_ARGUMENT	4
-#define	KERN_FAILURE		5
-#define	KERN_RESOURCE_SHORTAGE	6
-#define	KERN_NOT_RECEIVER	7
-#define	KERN_NO_ACCESS		8
-
-#ifndef ASSEMBLER
-/*
- *	Convert addresses to pages and vice versa.
- *	No rounding is used.
- */
-#ifdef KERNEL
-#define num_pages(x) \
-	((vm_offset_t)((((vm_offset_t)(x)) + PAGE_MASK) >> PAGE_SHIFT))
-
-extern vm_size_t mem_size;	/* size of physical memory (bytes) */
-extern vm_offset_t first_addr;	/* first physical page */
-extern vm_offset_t last_addr;	/* last physical page */
-#endif				/* KERNEL */
-#endif				/* ASSEMBLER */
-#endif				/* _VM_PARAM_ */
diff --git a/cpukit/posix/include/aio.h b/cpukit/posix/include/aio.h
deleted file mode 100644
index 6348da4c15..0000000000
--- a/cpukit/posix/include/aio.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/* aio.h
- *
- *  $Id$
- */
-
-#ifndef __POSIX_ASYNCHRONOUS_IO_h
-#define __POSIX_ASYNCHRONOUS_IO_h
-
-#include <rtems/posix/features.h>
-
-#if defined(_POSIX_ASYNCHRONOUS_IO)
-
-/*
- *  6.7.1 Data Definitions for Asynchronous Input and Output, 
- *        P1003.1b-1993, p. 151
- */
-
-#include <sys/types.h>
-#include <signal.h>
-#include <time.h>
-#include <fcntl.h>
-
-/*
- *  6.7.1.2 Manifest Constants, P1003.1b-1993, p. 153
- */
-
-#define AIO_CANCELED    0 /* all requested operations have been canceled */
-#define AIO_NOTCANCELED 1 /* some of the operations could not be canceled */
-                          /*   since they are in progress */
-#define AIO_ALLDONE     2 /* none of the requested operations could be */
-                          /*   canceled since they are already complete */
-
-/* lio_listio() options */
-
-#define LIO_WAIT        0 /* calling process is to suspend until the */
-                          /*   operation is complete */
-#define LIO_NOWAIT      1 /* calling process is to continue execution while */
-                          /*   the operation is performed and no notification */
-                          /*   shall be given when the operation is completed */
-#define LIO_READ        2 /* request a read() */
-#define LIO_WRITE       3 /* request a write() */
-#define LIO_NOP         4 /* no transfer is requested */
-
-/*
- *  6.7.1.1 Asynchronous I/O Control Block, P1003.1b-1993, p. 151
- */
-
-struct aiocb {
-  int             aio_fildes;     /* File descriptor */
-  off_t           aio_offset;     /* File offset */
-  volatile void  *aio_buf;        /* Location of buffer */
-  size_t          aio_nbytes;     /* Length of transfer */
-  int             aio_reqprio;    /* Request priority offset */
-  struct sigevent aio_sigevent;   /* Signal number and value */
-  int             aoi_lio_opcode; /* Operation to be performed */
-};
-
-/*
- *  6.7.2 Asynchronous Read, P1003.1b-1993, p. 154
- */
-
-int aio_read(
-  struct aiocb  *aiocbp
-);
-
-/*
- *  6.7.3 Asynchronous Write, P1003.1b-1993, p. 155
- */
-
-int aio_write(
-  struct aiocb  *aiocbp
-);
-
-/*
- *  6.7.4 List Directed I/O, P1003.1b-1993, p. 158
- */
-
-int lio_listio(
-  int                    mode,
-  struct aiocb  * const  list[],
-  int                    nent,
-  struct sigevent       *sig
-);
-
-/*
- *  6.7.5 Retrieve Error of Asynchronous I/O Operation, P1003.1b-1993, p. 161
- */
-
-int aio_error(
-  const struct aiocb  *aiocbp
-);
-
-/*
- *  6.7.6 Retrieve Return Status of Asynchronous I/O Operation, 
- *        P1003.1b-1993, p. 162
- */
-
-int aio_return(
-  const struct aiocb  *aiocbp
-);
-
-/*
- *  6.7.7 Cancel Asynchronous I/O Operation, P1003.1b-1993, p. 163
- */
-
-int aio_cancel(
-  int            filedes,
-  struct aiocb  *aiocbp
-);
-
-/*
- *  6.7.7 Wait for Asynchronous I/O Request, P1003.1b-1993, p. 164
- */
-
-int aio_suspend(
-  struct aiocb  * const   list[],
-  int                     nent,
-  const struct timespec  *timeout
-);
-
-#if defined(_POSIX_SYNCHRONIZED_IO)
-
-/*
- *  6.7.9 Asynchronous File Synchronization, P1003.1b-1993, p. 166
- */
-
-int aio_fsync(
-  int            op,
-  struct aiocb  *aiocbp
-);
-
-#endif /* _POSIX_SYNCHRONIZED_IO */
-
-#endif /* _POSIX_ASYNCHRONOUS_IO */
-
-#endif
-/* end of include file */
diff --git a/cpukit/posix/include/devctl.h b/cpukit/posix/include/devctl.h
deleted file mode 100644
index 5073b475ee..0000000000
--- a/cpukit/posix/include/devctl.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* devctl.h
- *
- *  $Id$
- */
-
-#ifndef __POSIX_DEVICE_CONTROL_h
-#define __POSIX_DEVICE_CONTROL_h
-
-#include <rtems/posix/features.h>
-
-#if defined(_POSIX_DEVICE_CONTROL)
-
-#include <sys/types.h>
-#include <unistd.h>
-
-/*
- *  21.2.1 Control a Device, P1003.4b/D8, p. 65
- */
-
-int devctl(
-  int     filedes,
-  void   *dev_data_ptr,
-  size_t  nbyte,
-  int    *dev_info_ptr
-);
-
-#endif
-
-#endif
-/* end of include file */
diff --git a/cpukit/posix/include/intr.h b/cpukit/posix/include/intr.h
deleted file mode 100644
index f07d1f9552..0000000000
--- a/cpukit/posix/include/intr.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/* intr.h
- *
- *  XXX: It is unclear if the type "intr_t" should be defined when
- *       _POSIX_INTERRUPT_CONTROL is not.
- *
- *  $Id$
- */
-
-#ifndef __POSIX_INTERRUPTS_h
-#define __POSIX_INTERRUPTS_h
-
-#include <rtems/posix/features.h>
-#include <sys/types.h>
-#include <sys/time.h>
-
-#if defined(_POSIX_INTERRUPT_CONTROL)
-
-/*
- *  22.2 Concepts, P1003.4b/D8, p. 73
- */
-
-typedef int intr_t;
-
-/*
- *  22.3.1 Associate a User-Written ISR with an Interrupt, P1003.4b/D8, p. 74
- */
-
-/*
- *  Return codes from an interrupt handler
- */
-
-#define INTR_HANDLED_NOTIFY         0 /* ISR handled this interrupt, notify */
-                                      /*   the thread that registered the */
-                                      /*   ISR that the interrupt occurred. */
-#define INTR_HANDLED_DO_NOT_NOTIFY  1 /* ISR handled this interrupt, but */
-                                      /*   do NOT perform notification. */
-#define INTR_NOT_HANDLED            2 /* ISR did not handle this interrupt, */
-                                      /*   let the next handler try. */
-
-int intr_capture(
-  intr_t          intr,
-  int           (*intr_handler)( void *area ),
-  volatile void   *area,
-  size_t           areasize
-);
-
-int intr_release(
-  intr_t    intr,
-  int     (*intr_handler)( void *area )
-);
-
-int intr_lock(
-  intr_t  intr
-);
-  
-int intr_unlock(
-  intr_t  intr
-);
-  
-/*
- *  22.3.2 Await Interrupt Notification, P1003.4b/D8, p. 76
- */
-
-int intr_timed_wait(
-  int                     flags,
-  const struct timespec  *timeout
-);
-
-#endif
-
-#endif
-/* end of include file */
diff --git a/cpukit/posix/include/mqueue.h b/cpukit/posix/include/mqueue.h
deleted file mode 100644
index f1b2250e5c..0000000000
--- a/cpukit/posix/include/mqueue.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/* mqueue.h
- *
- *  $Id$
- */
-
-#ifndef __POSIX_MESSAGE_QUEUE_h
-#define __POSIX_MESSAGE_QUEUE_h
-
-#include <rtems/posix/features.h>
-
-#if defined(_POSIX_MESSAGE_PASSING)
-
-#include <sys/types.h>
-
-#include <rtems/system.h>
-#include <rtems/score/object.h>
-
-/*
- *  15.1.1 Data Structures, P1003.1b-1993, p. 271
- */
-
-typedef Objects_Id  mqd_t;
-
-struct mq_attr {
-  long  mq_flags;     /* Message queue flags */
-  long  mq_maxmsg;    /* Maximum number of messages */
-  long  mq_msgsize;   /* Maximum message size */
-  long  mq_curmsgs;   /* Number of messages currently queued */
-};
-
-/*
- *  15.2.2 Open a Message Queue, P1003.1b-1993, p. 272
- */
-
-mqd_t mq_open(
-  const char *name,
-  int         oflag,
-  ...
-);
-
-/*
- *  15.2.2 Close a Message Queue, P1003.1b-1993, p. 275
- */
-
-int mq_close(
-  mqd_t  mqdes
-);
-
-/*
- *  15.2.2 Remove a Message Queue, P1003.1b-1993, p. 276
- */
-
-int mq_unlink(
-  const char *name
-);
-
-/*
- *  15.2.4 Send a Message to a Message Queue, P1003.1b-1993, p. 277
- *
- *  NOTE: P1003.4b/D8, p. 45 adds mq_timedsend().
- */
-
-int mq_send(
-  mqd_t         mqdes,
-  const char   *msg_ptr,
-  size_t        msg_len,
-  unsigned int  msg_prio 
-);
-
-#if defined(_POSIX_TIMEOUTS)
-
-#include <time.h>
-
-int mq_timedsend(
-  mqd_t                  mqdes,
-  const char            *msg_ptr,
-  size_t                 msg_len,
-  unsigned int           msg_prio,
-  const struct timespec *timeout
-);
-
-#endif /* _POSIX_TIMEOUTS */
-
-/*
- *  15.2.5 Receive a Message From a Message Queue, P1003.1b-1993, p. 279
- *
- *  NOTE: P1003.4b/D8, p. 45 adds mq_timedreceive().
- */
-
-ssize_t mq_receive(
-  mqd_t         mqdes,
-  char         *msg_ptr,
-  size_t        msg_len,
-  unsigned int *msg_prio
-);
-
-#if defined(_POSIX_TIMEOUTS)
-
-int mq_timedreceive(                  /* XXX: should this be ssize_t */
-  mqd_t                  mqdes,
-  char                  *msg_ptr,
-  size_t                 msg_len,
-  unsigned int          *msg_prio,
-  const struct timespec *timeout
-);
-
-#endif /* _POSIX_TIMEOUTS */
-
-#if defined(_POSIX_REALTIME_SIGNALS)
-
-/*
- *  15.2.6 Notify Process that a Message is Available on a Queue, 
- *         P1003.1b-1993, p. 280
- */
-
-int mq_notify(
-  mqd_t                  mqdes,
-  const struct sigevent *notification
-);
-
-#endif /* _POSIX_REALTIME_SIGNALS */
-
-/*
- *  15.2.7 Set Message Queue Attributes, P1003.1b-1993, p. 281
- */
-
-int mq_setattr(
-  mqd_t                 mqdes,
-  const struct mq_attr *mqstat,
-  struct mq_attr       *omqstat
-);
-
-/*
- *  15.2.8 Get Message Queue Attributes, P1003.1b-1993, p. 283
- */
-
-int mq_getattr(
-  mqd_t           mqdes,
-  struct mq_attr *mqstat
-);
-
-#endif /* _POSIX_MESSAGE_PASSING */
-
-#endif
-/* end of include file */
diff --git a/cpukit/posix/include/rtems/posix/cancel.h b/cpukit/posix/include/rtems/posix/cancel.h
deleted file mode 100644
index e6d80275f4..0000000000
--- a/cpukit/posix/include/rtems/posix/cancel.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* rtems/posix/cancel.h
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_POSIX_CANCEL_h
-#define __RTEMS_POSIX_CANCEL_h
-
-typedef struct {
-  Chain_Node  Node;
-  void      (*routine)( void * );
-  void       *arg;
-}  POSIX_Cancel_Handler_control;
-
-#endif
-/* end of include file */
diff --git a/cpukit/posix/include/rtems/posix/cond.h b/cpukit/posix/include/rtems/posix/cond.h
deleted file mode 100644
index 92c2e453ae..0000000000
--- a/cpukit/posix/include/rtems/posix/cond.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/*  rtems/posix/cond.h
- *
- *  This include file contains all the private support information for
- *  POSIX condition variables.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
- 
-#ifndef __RTEMS_POSIX_CONDITION_VARIABLES_h
-#define __RTEMS_POSIX_CONDITION_VARIABLES_h
- 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/object.h>
-#include <rtems/score/threadq.h>
-
-/*
- *  Constant to indicate condition variable does not currently have
- *  a mutex assigned to it.
- */
-
-#define POSIX_CONDITION_VARIABLES_NO_MUTEX 0
-
-/*
- *  Data Structure used to manage a POSIX condition variable
- */
- 
-typedef struct {
-   Objects_Control       Object;
-   int                   process_shared;
-   pthread_mutex_t       Mutex;
-   Thread_queue_Control  Wait_queue;
-}  POSIX_Condition_variables_Control;
-
-/*
- *  The following defines the information control block used to manage
- *  this class of objects.
- */
- 
-POSIX_EXTERN Objects_Information  _POSIX_Condition_variables_Information;
- 
-/*
- *  _POSIX_Condition_variables_Manager_initialization
- *
- *  DESCRIPTION:
- *
- *  This routine performs the initialization necessary for this manager.
- */
- 
-void _POSIX_Condition_variables_Manager_initialization(
-  unsigned32 maximum_condition_variables
-);
- 
-/*
- *  _POSIX_Condition_variables_Allocate
- *
- *  DESCRIPTION:
- *
- *  This function allocates a condition variable control block from
- *  the inactive chain of free condition variable control blocks.
- */
- 
-RTEMS_INLINE_ROUTINE POSIX_Condition_variables_Control * 
-  _POSIX_Condition_variables_Allocate( void );
- 
-/*
- *  _POSIX_Condition_variables_Free
- *
- *  DESCRIPTION:
- *
- *  This routine frees a condition variable control block to the
- *  inactive chain of free condition variable control blocks.
- */
- 
-RTEMS_INLINE_ROUTINE void _POSIX_Condition_variables_Free (
-  POSIX_Condition_variables_Control *the_condition_variable
-);
- 
-/*
- *  _POSIX_Condition_variables_Get
- *
- *  DESCRIPTION:
- *
- *  This function maps condition variable IDs to condition variable control 
- *  blocks.  If ID corresponds to a local condition variable, then it returns
- *  the_condition variable control pointer which maps to ID and location
- *  is set to OBJECTS_LOCAL.  if the condition variable ID is global and
- *  resides on a remote node, then location is set to OBJECTS_REMOTE,
- *  and the_condition variable is undefined.  Otherwise, location is set
- *  to OBJECTS_ERROR and the_condition variable is undefined.
- */
- 
-RTEMS_INLINE_ROUTINE POSIX_Condition_variables_Control *_POSIX_Condition_variables_Get (
-  Objects_Id        *id,
-  Objects_Locations *location
-);
- 
-/*
- *  _POSIX_Condition_variables_Is_null
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the_condition variable is NULL 
- *  and FALSE otherwise.
- */
- 
-RTEMS_INLINE_ROUTINE boolean _POSIX_Condition_variables_Is_null (
-  POSIX_Condition_variables_Control *the_condition_variable
-);
-
-#include <rtems/posix/cond.inl>
-#include <rtems/posix/condmp.h>
-
-#ifdef __cplusplus
-}
-#endif
- 
-#endif
-/*  end of include file */
-
diff --git a/cpukit/posix/include/rtems/posix/condmp.h b/cpukit/posix/include/rtems/posix/condmp.h
deleted file mode 100644
index de9c5ce0d4..0000000000
--- a/cpukit/posix/include/rtems/posix/condmp.h
+++ /dev/null
@@ -1,162 +0,0 @@
-/*  condmp.h
- *
- *  This include file contains all the constants and structures associated
- *  with the Multiprocessing Support in the POSIX Condition Variable Manager.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_POSIX_CONDITION_VARIABLES_MP_h
-#define __RTEMS_POSIX_CONDITION_VARIABLES_MP_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/mppkt.h>
-#include <rtems/score/object.h>
-#include <rtems/score/thread.h>
-#include <rtems/score/watchdog.h>
-
-/*
- *  The following enumerated type defines the list of
- *  remote condition variable operations.
- */
-
-typedef enum {
-  POSIX_CONDITION_VARIABLES_MP_ANNOUNCE_CREATE  =  0,
-  POSIX_CONDITION_VARIABLES_MP_ANNOUNCE_DELETE  =  1,
-  POSIX_CONDITION_VARIABLES_MP_EXTRACT_PROXY    =  2,
-  POSIX_CONDITION_VARIABLES_MP_OBTAIN_REQUEST   =  3,
-  POSIX_CONDITION_VARIABLES_MP_OBTAIN_RESPONSE  =  4,
-  POSIX_CONDITION_VARIABLES_MP_RELEASE_REQUEST  =  5,
-  POSIX_CONDITION_VARIABLES_MP_RELEASE_RESPONSE =  6,
-}   POSIX_Condition_variables_MP_Remote_operations;
-
-/*
- *  The following data structure defines the packet used to perform
- *  remote condition variable operations.
- */
-
-typedef struct {
-  MP_packet_Prefix                                Prefix;
-  POSIX_Condition_variables_MP_Remote_operations  operation;
-  Objects_Name                                    name;
-  boolean                                         wait;  /* XXX options */
-  Objects_Id                                      proxy_id;
-}   POSIX_Condition_variables_MP_Packet;
-
-/*
- *  _POSIX_Condition_variables_MP_Send_process_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs a remote procedure call so that a
- *  process operation can be performed on another node.
- */
-
-void _POSIX_Condition_variables_MP_Send_process_packet (
-  POSIX_Condition_variables_MP_Remote_operations  operation,
-  Objects_Id                        condition_variables_id,
-  Objects_Name                      name,
-  Objects_Id                        proxy_id
-);
-
-/*
- *  _POSIX_Condition_variables_MP_Send_request_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs a remote procedure call so that a
- *  directive operation can be initiated on another node.
- */
-
-int _POSIX_Condition_variables_MP_Send_request_packet (
-  POSIX_Condition_variables_MP_Remote_operations  operation,
-  Objects_Id                                      condition_variables_id,
-  boolean                                         wait,  /* XXX options */
-  Watchdog_Interval                               timeout
-);
-
-/*
- *  _POSIX_Condition_variables_MP_Send_response_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs a remote procedure call so that a
- *  directive can be performed on another node.
- */
-
-void _POSIX_Condition_variables_MP_Send_response_packet (
-  POSIX_Condition_variables_MP_Remote_operations  operation,
-  Objects_Id                        condition_variables_id,
-  Thread_Control                   *the_thread
-);
-
-/*
- *
- *  _POSIX_Condition_variables_MP_Process_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs the actions specific to this package for
- *  the request from another node.
- */
-
-void _POSIX_Condition_variables_MP_Process_packet (
-  MP_packet_Prefix *the_packet_prefix
-);
-
-/*
- *  _POSIX_Condition_variables_MP_Send_object_was_deleted
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked indirectly by the thread queue
- *  when a proxy has been removed from the thread queue and
- *  the remote node must be informed of this.
- */
-
-void _POSIX_Condition_variables_MP_Send_object_was_deleted (
-  Thread_Control *the_proxy
-);
-
-/*
- *  _POSIX_Condition_variables_MP_Send_extract_proxy
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked when a task is deleted and it
- *  has a proxy which must be removed from a thread queue and
- *  the remote node must be informed of this.
- */
-
-void _POSIX_Condition_variables_MP_Send_extract_proxy (
-  Thread_Control *the_thread
-);
-
-/*
- *  _POSIX_Condition_variables_MP_Get_packet
- *
- *  DESCRIPTION:
- *
- *  This function is used to obtain a condition variable mp packet.
- */
-
-POSIX_Condition_variables_MP_Packet
-  *_POSIX_Condition_variables_MP_Get_packet ( void );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of file */
diff --git a/cpukit/posix/include/rtems/posix/config.h b/cpukit/posix/include/rtems/posix/config.h
deleted file mode 100644
index 8753c42382..0000000000
--- a/cpukit/posix/include/rtems/posix/config.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*  config.h
- *
- *  This include file contains the table of user defined configuration
- *  parameters specific for the POSIX API.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_POSIX_CONFIGURATION_h
-#define __RTEMS_POSIX_CONFIGURATION_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- *  XXX
- *
- *  The following records define the Configuration Table.  The
- *  information contained in this table is required in all
- *  RTEMS systems, whether single or multiprocessor.  This
- *  table primarily defines the following:
- *
- *     + required number of each object type
- */
-
-/*
- *  For now, we are only allowing the user to specify the entry point
- *  for posix initialization threads.
- */
-
-typedef struct {
-  void       *(*thread_entry)(void *);
-} posix_initialization_threads_table;
-
-typedef struct {
-  int                                 maximum_threads;
-  int                                 maximum_mutexes;
-  int                                 maximum_condition_variables;
-  int                                 maximum_keys;
-  int                                 maximum_queued_signals;
-  int                                 number_of_initialization_threads;
-  posix_initialization_threads_table *User_initialization_threads_table;
-} posix_api_configuration_table;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/cpukit/posix/include/rtems/posix/intr.h b/cpukit/posix/include/rtems/posix/intr.h
deleted file mode 100644
index 539c66f058..0000000000
--- a/cpukit/posix/include/rtems/posix/intr.h
+++ /dev/null
@@ -1,154 +0,0 @@
-/*  rtems/posix/intr.h
- *
- *  This include file contains all the private support information for
- *  POSIX Interrupt Manager.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
- 
-#ifndef __RTEMS_POSIX_KEY_h
-#define __RTEMS_POSIX_KEY_h
- 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/isr.h>
-#include <rtems/score/object.h>
-
-/*
- *  Data Structure used to manage each POSIX Interrupt Vector
- */
-
-typedef struct {
-  int            number_installed;
-  int            lock_count;
-  int            deferred_count;
-  Chain_Control  Handlers;
-} POSIX_Interrupt_Control;
- 
-/*
- *  Data Structure used to manage a POSIX Interrupt Handler
- */
- 
-typedef struct {
-  Objects_Control         Object;
-  int                     is_active; 
-  intr_t                  vector; 
-  Thread_Control         *server;
-  int                   (*handler)( void *area );
-  volatile void           *user_data_area;
-}  POSIX_Interrupt_Handler_control;
-
-/*
- *  The following defines the information control block used to manage
- *  this class of objects.
- */
- 
-POSIX_EXTERN Objects_Information _POSIX_Interrupt_Handlers_Information;
-
-/*
- *  The following is an array which is used to manage the set of
- *  interrupt handlers installed on each vector.
- */
-
-POSIX_EXTERN POSIX_Interrupt_Control 
-               _POSIX_Interrupt_Information[ ISR_NUMBER_OF_VECTORS ];
- 
-/*
- *  _POSIX_Interrupt_Manager_initialization
- *
- *  DESCRIPTION:
- *
- *  This routine performs the initialization necessary for this manager.
- */
- 
-void _POSIX_Interrupt_Manager_initialization( 
-  unsigned32  maximum_interrupt_handlers
-);
- 
-/*
- *  _POSIX_Interrupt_Allocate
- *
- *  DESCRIPTION:
- *
- *  This function allocates a interrupt handler control block from
- *  the inactive chain of free interrupt handler control blocks.
- */
- 
-RTEMS_INLINE_ROUTINE POSIX_Interrupt_Handler_control *
-  _POSIX_Interrupt_Allocate( void );
- 
-/*
- *  _POSIX_Interrupt_Free
- *
- *  DESCRIPTION:
- *
- *  This routine frees a interrupt handler control block to the
- *  inactive chain of free interrupt handler control blocks.
- */
- 
-RTEMS_INLINE_ROUTINE void _POSIX_Interrupt_Free (
-  POSIX_Interrupt_Handler_control *the_intr
-);
- 
-/*
- *  _POSIX_Interrupt_Get
- *
- *  DESCRIPTION:
- *
- *  This function maps interrupt handler IDs to interrupt handler control 
- *  blocks.  If ID corresponds to a local interrupt handler, then it returns
- *  the_intr control pointer which maps to ID and location
- *  is set to OBJECTS_LOCAL.  if the interrupt handler ID is global and
- *  resides on a remote node, then location is set to OBJECTS_REMOTE,
- *  and the_intr is undefined.  Otherwise, location is set
- *  to OBJECTS_ERROR and the_intr is undefined.
- */
- 
-RTEMS_INLINE_ROUTINE POSIX_Interrupt_Control *_POSIX_Interrupt_Get (
-  Objects_Id         id,
-  Objects_Locations *location
-);
- 
-/*
- *  _POSIX_Interrupt_Is_null
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the_intr is NULL and FALSE otherwise.
- */
- 
-RTEMS_INLINE_ROUTINE boolean _POSIX_Interrupt_Is_null (
-  POSIX_Interrupt_Handler_control *the_intr
-);
- 
-/*
- *  _POSIX_Interrupt_Handler
- *
- *  DESCRIPTION:
- *
- *  This function XXX.
- */
- 
-void _POSIX_Interrupt_Handler(
-  ISR_Vector_number   vector
-);
-
-#include <rtems/posix/intr.inl>
-
-#ifdef __cplusplus
-}
-#endif
- 
-#endif
-/*  end of include file */
-
diff --git a/cpukit/posix/include/rtems/posix/key.h b/cpukit/posix/include/rtems/posix/key.h
deleted file mode 100644
index 22bfafd594..0000000000
--- a/cpukit/posix/include/rtems/posix/key.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/*  rtems/posix/key.h
- *
- *  This include file contains all the private support information for
- *  POSIX key.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
- 
-#ifndef __RTEMS_POSIX_KEY_h
-#define __RTEMS_POSIX_KEY_h
- 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- *  Data Structure used to manage a POSIX key
- *
- *  NOTE:  The Values is a table indexed by the index portion of the
- *         ID of the currently executing thread.
- */
- 
-typedef struct {
-   Objects_Control     Object;
-   boolean             is_active;
-   void              (*destructor)( void * );
-   void              **Values[ OBJECTS_CLASSES_LAST_THREAD_CLASS + 1 ];
-}  POSIX_Keys_Control;
-
-/*
- *  The following defines the information control block used to manage
- *  this class of objects.
- */
- 
-POSIX_EXTERN Objects_Information  _POSIX_Keys_Information;
- 
-/*
- *  _POSIX_Keys_Manager_initialization
- *
- *  DESCRIPTION:
- *
- *  This routine performs the initialization necessary for this manager.
- */
- 
-void _POSIX_Key_Manager_initialization(
-  unsigned32 maximum_keys
-);
- 
-/*
- *  _POSIX_Keys_Run_destructors
- *
- *  DESCRIPTION:
- *
- *  This function executes all the destructors associated with the thread's
- *  keys.  This function will execute until all values have been set to NULL.
- *
- *  NOTE:  This is the routine executed when a thread exits to
- *         run through all the keys and do the destructor action.
- */
- 
-void _POSIX_Keys_Run_destructors(
-  Thread_Control *thread
-);
-
-/*
- *  _POSIX_Keys_Allocate
- *
- *  DESCRIPTION:
- *
- *  This function allocates a keys control block from
- *  the inactive chain of free keys control blocks.
- */
- 
-RTEMS_INLINE_ROUTINE POSIX_Keys_Control *_POSIX_Keys_Allocate( void );
- 
-/*
- *  _POSIX_Keys_Free
- *
- *  DESCRIPTION:
- *
- *  This routine frees a keys control block to the
- *  inactive chain of free keys control blocks.
- */
- 
-RTEMS_INLINE_ROUTINE void _POSIX_Keys_Free (
-  POSIX_Keys_Control *the_key
-);
- 
-/*
- *  _POSIX_Keys_Get
- *
- *  DESCRIPTION:
- *
- *  This function maps key IDs to key control blocks.
- *  If ID corresponds to a local keys, then it returns
- *  the_key control pointer which maps to ID and location
- *  is set to OBJECTS_LOCAL.  if the keys ID is global and
- *  resides on a remote node, then location is set to OBJECTS_REMOTE,
- *  and the_key is undefined.  Otherwise, location is set
- *  to OBJECTS_ERROR and the_key is undefined.
- */
- 
-RTEMS_INLINE_ROUTINE POSIX_Keys_Control *_POSIX_Keys_Get (
-  Objects_Id         id,
-  Objects_Locations *location
-);
- 
-/*
- *  _POSIX_Keys_Is_null
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the_key is NULL and FALSE otherwise.
- */
- 
-RTEMS_INLINE_ROUTINE boolean _POSIX_Keys_Is_null (
-  POSIX_Keys_Control *the_key
-);
-
-#include <rtems/posix/key.inl>
-
-#ifdef __cplusplus
-}
-#endif
- 
-#endif
-/*  end of include file */
-
diff --git a/cpukit/posix/include/rtems/posix/mqueue.h b/cpukit/posix/include/rtems/posix/mqueue.h
deleted file mode 100644
index 8e2851bfb5..0000000000
--- a/cpukit/posix/include/rtems/posix/mqueue.h
+++ /dev/null
@@ -1,186 +0,0 @@
-/*  rtems/posix/mqueue.h
- *
- *  This include file contains all the private support information for
- *  POSIX Message Queues.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
- 
-#ifndef __RTEMS_POSIX_MESSAGE_QUEUE_h
-#define __RTEMS_POSIX_MESSAGE_QUEUE_h
- 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/coremsg.h>
-#include <rtems/score/object.h>
-
-/*
- *  Data Structure used to manage a POSIX message queue
- */
- 
-typedef struct {
-   Objects_Control             Object;
-   int                         process_shared;
-   int                         flags;
-   boolean                     named;
-   boolean                     linked;
-   boolean                     blocking;
-   unsigned32                  open_count;
-   CORE_message_queue_Control  Message_queue;
-   struct sigevent             notification;
-}  POSIX_Message_queue_Control;
-
-/*
- *  The following defines the information control block used to manage
- *  this class of objects.
- */
- 
-POSIX_EXTERN Objects_Information  _POSIX_Message_queue_Information;
- 
-/*
- *  _POSIX_Message_queue_Manager_initialization
- *
- *  DESCRIPTION:
- *
- *  This routine performs the initialization necessary for this manager.
- */
- 
-void _POSIX_Message_queue_Manager_initialization(
-  unsigned32 maximum_message_queues
-);
- 
-/*
- *
- *  _POSIX_Message_queue_Create_support
- *
- *  DESCRIPTION:
- *
- *  This routine performs the creation of a message queue utilizing the
- *  core message queue.
- */
- 
-int _POSIX_Message_queue_Create_support(
-  const char                    *name,
-  int                            pshared,
-  unsigned int                   oflag,
-  struct mq_attr                *attr,
-  POSIX_Message_queue_Control  **message_queue
-);
-
-/*
- *
- *  _POSIX_Message_queue_Send_support
- *
- *  DESCRIPTION:
- *
- *  This routine posts a message to a specified message queue.
- */
-
-int _POSIX_Message_queue_Send_support(
-  mqd_t               mqdes,
-  const char         *msg_ptr,
-  unsigned32          msg_len,
-  Priority_Control    msg_prio,
-  Watchdog_Interval   timeout
-);
-
-/*
- *  _POSIX_Message_queue_Allocate
- *
- *  DESCRIPTION:
- *
- *  This function allocates a message queue control block from
- *  the inactive chain of free message queue control blocks.
- */
- 
-RTEMS_INLINE_ROUTINE POSIX_Message_queue_Control *_POSIX_Message_queue_Allocate( void );
- 
-/*
- *  _POSIX_Message_queue_Free
- *
- *  DESCRIPTION:
- *
- *  This routine frees a message queue control block to the
- *  inactive chain of free message queue control blocks.
- */
- 
-RTEMS_INLINE_ROUTINE void _POSIX_Message_queue_Free (
-  POSIX_Message_queue_Control *the_mq
-);
- 
-/*
- *  _POSIX_Message_queue_Get
- *
- *  DESCRIPTION:
- *
- *  This function maps message queue IDs to message queue control blocks.
- *  If ID corresponds to a local message queue, then it returns
- *  the_mq control pointer which maps to ID and location
- *  is set to OBJECTS_LOCAL.  if the message queue ID is global and
- *  resides on a remote node, then location is set to OBJECTS_REMOTE,
- *  and the_message queue is undefined.  Otherwise, location is set
- *  to OBJECTS_ERROR and the_mq is undefined.
- */
- 
-RTEMS_INLINE_ROUTINE POSIX_Message_queue_Control *_POSIX_Message_queue_Get (
-  Objects_Id         id,
-  Objects_Locations *location
-);
- 
-/*
- *  _POSIX_Message_queue_Is_null
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the_message_queue is NULL and FALSE otherwise.
- */
- 
-RTEMS_INLINE_ROUTINE boolean _POSIX_Message_queue_Is_null (
-  POSIX_Message_queue_Control *the_mq
-);
-
-/*
- *  _POSIX_Message_queue_Name_to_id
- *
- *  DESCRIPTION:
- *
- *  XXX
- */
-
-int _POSIX_Message_queue_Name_to_id(
-  const char          *name,
-  Objects_Id          *id
-);
-
-/*
- *  _POSIX_Message_queue_Priority_to_core
- * 
- *  DESCRIPTION:
- *
- *  XXX
- */
- 
-RTEMS_INLINE_ROUTINE Priority_Control _POSIX_Message_queue_Priority_to_core(
-  unsigned int priority
-);
-
-#include <rtems/posix/mqueue.inl>
-#include <rtems/posix/mqueuemp.h>
-
-#ifdef __cplusplus
-}
-#endif
- 
-#endif
-/*  end of include file */
-
diff --git a/cpukit/posix/include/rtems/posix/mqueuemp.h b/cpukit/posix/include/rtems/posix/mqueuemp.h
deleted file mode 100644
index 27742014ab..0000000000
--- a/cpukit/posix/include/rtems/posix/mqueuemp.h
+++ /dev/null
@@ -1,161 +0,0 @@
-/*  mqueuemp.h
- *
- *  This include file contains all the constants and structures associated
- *  with the Multiprocessing Support in the POSIX Message Queue Manager.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_POSIX_MESSAGE_QUEUE_MP_h
-#define __RTEMS_POSIX_MESSAGE_QUEUE_MP_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/mppkt.h>
-#include <rtems/score/object.h>
-#include <rtems/score/thread.h>
-#include <rtems/score/watchdog.h>
-
-/*
- *  The following enumerated type defines the list of
- *  remote message queue operations.
- */
-
-typedef enum {
-  POSIX_MESSAGE_QUEUE_MP_ANNOUNCE_CREATE  =  0,
-  POSIX_MESSAGE_QUEUE_MP_ANNOUNCE_DELETE  =  1,
-  POSIX_MESSAGE_QUEUE_MP_EXTRACT_PROXY    =  2,
-  POSIX_MESSAGE_QUEUE_MP_OBTAIN_REQUEST   =  3,
-  POSIX_MESSAGE_QUEUE_MP_OBTAIN_RESPONSE  =  4,
-  POSIX_MESSAGE_QUEUE_MP_RELEASE_REQUEST  =  5,
-  POSIX_MESSAGE_QUEUE_MP_RELEASE_RESPONSE =  6,
-}   POSIX_Message_queue_MP_Remote_operations;
-
-/*
- *  The following data structure defines the packet used to perform
- *  remote message queue operations.
- */
-
-typedef struct {
-  MP_packet_Prefix                          Prefix;
-  POSIX_Message_queue_MP_Remote_operations  operation;
-  Objects_Name                              name;
-  boolean                                   wait;  /* XXX options */
-  Objects_Id                                proxy_id;
-}   POSIX_Message_queue_MP_Packet;
-
-/*
- *  _POSIX_Message_queue_MP_Send_process_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs a remote procedure call so that a
- *  process operation can be performed on another node.
- */
-
-void _POSIX_Message_queue_MP_Send_process_packet (
-  POSIX_Message_queue_MP_Remote_operations  operation,
-  Objects_Id                        mq_id,
-  Objects_Name                      name,
-  Objects_Id                        proxy_id
-);
-
-/*
- *  _POSIX_Message_queue_MP_Send_request_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs a remote procedure call so that a
- *  directive operation can be initiated on another node.
- */
-
-int _POSIX_Message_queue_MP_Send_request_packet (
-  POSIX_Message_queue_MP_Remote_operations  operation,
-  Objects_Id                                mq_id,
-  boolean                                   wait,  /* XXX options */
-  Watchdog_Interval                         timeout
-);
-
-/*
- *  _POSIX_Message_queue_MP_Send_response_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs a remote procedure call so that a
- *  directive can be performed on another node.
- */
-
-void _POSIX_Message_queue_MP_Send_response_packet (
-  POSIX_Message_queue_MP_Remote_operations  operation,
-  Objects_Id                        mq_id,
-  Thread_Control                   *the_thread
-);
-
-/*
- *
- *  _POSIX_Message_queue_MP_Process_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs the actions specific to this package for
- *  the request from another node.
- */
-
-void _POSIX_Message_queue_MP_Process_packet (
-  MP_packet_Prefix *the_packet_prefix
-);
-
-/*
- *  _POSIX_Message_queue_MP_Send_object_was_deleted
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked indirectly by the thread queue
- *  when a proxy has been removed from the thread queue and
- *  the remote node must be informed of this.
- */
-
-void _POSIX_Message_queue_MP_Send_object_was_deleted (
-  Thread_Control *the_proxy
-);
-
-/*
- *  _POSIX_Message_queue_MP_Send_extract_proxy
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked when a task is deleted and it
- *  has a proxy which must be removed from a thread queue and
- *  the remote node must be informed of this.
- */
-
-void _POSIX_Message_queue_MP_Send_extract_proxy (
-  Thread_Control *the_thread
-);
-
-/*
- *  _POSIX_Message_queue_MP_Get_packet
- *
- *  DESCRIPTION:
- *
- *  This function is used to obtain a message queue mp packet.
- */
-
-POSIX_Message_queue_MP_Packet *_POSIX_Message_queue_MP_Get_packet ( void );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of file */
diff --git a/cpukit/posix/include/rtems/posix/mutex.h b/cpukit/posix/include/rtems/posix/mutex.h
deleted file mode 100644
index e6c5c44d39..0000000000
--- a/cpukit/posix/include/rtems/posix/mutex.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/*  rtems/posix/mutex.h
- *
- *  This include file contains all the private support information for
- *  POSIX mutex's.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
- 
-#ifndef __RTEMS_POSIX_MUTEX_h
-#define __RTEMS_POSIX_MUTEX_h
- 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/coremutex.h>
-#include <pthread.h>
-
-/*
- *  Data Structure used to manage a POSIX mutex
- */
- 
-typedef struct {
-   Objects_Control     Object;
-   int                 process_shared;
-   CORE_mutex_Control  Mutex;
-}  POSIX_Mutex_Control;
-
-/*
- *  The following defines the information control block used to manage
- *  this class of objects.
- */
- 
-POSIX_EXTERN Objects_Information  _POSIX_Mutex_Information;
- 
-/*
- *  _POSIX_Mutex_Manager_initialization
- *
- *  DESCRIPTION:
- *
- *  This routine performs the initialization necessary for this manager.
- */
- 
-void _POSIX_Mutex_Manager_initialization(
-  unsigned32 maximum_mutexes
-);
- 
-/*
- *  _POSIX_Mutex_Allocate
- *
- *  DESCRIPTION:
- *
- *  This function allocates a mutexes control block from
- *  the inactive chain of free mutexes control blocks.
- */
- 
-RTEMS_INLINE_ROUTINE POSIX_Mutex_Control *_POSIX_Mutex_Allocate( void );
- 
-/*
- *  _POSIX_Mutex_Free
- *
- *  DESCRIPTION:
- *
- *  This routine frees a mutexes control block to the
- *  inactive chain of free mutexes control blocks.
- */
- 
-RTEMS_INLINE_ROUTINE void _POSIX_Mutex_Free (
-  POSIX_Mutex_Control *the_mutex
-);
- 
-/*
- *  _POSIX_Mutex_Get
- *
- *  DESCRIPTION:
- *
- *  This function maps mutexes IDs to mutexes control blocks.
- *  If ID corresponds to a local mutexes, then it returns
- *  the_mutex control pointer which maps to ID and location
- *  is set to OBJECTS_LOCAL.  if the mutexes ID is global and
- *  resides on a remote node, then location is set to OBJECTS_REMOTE,
- *  and the_mutex is undefined.  Otherwise, location is set
- *  to OBJECTS_ERROR and the_mutex is undefined.
- */
- 
-RTEMS_INLINE_ROUTINE POSIX_Mutex_Control *_POSIX_Mutex_Get (
-  Objects_Id        *id,
-  Objects_Locations *location
-);
- 
-/*
- *  _POSIX_Mutex_Is_null
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the_mutex is NULL and FALSE otherwise.
- */
- 
-RTEMS_INLINE_ROUTINE boolean _POSIX_Mutex_Is_null (
-  POSIX_Mutex_Control *the_mutex
-);
-
-#include <rtems/posix/mutex.inl>
-#include <rtems/posix/mutexmp.h>
-
-#ifdef __cplusplus
-}
-#endif
- 
-#endif
-/*  end of include file */
-
diff --git a/cpukit/posix/include/rtems/posix/mutexmp.h b/cpukit/posix/include/rtems/posix/mutexmp.h
deleted file mode 100644
index 71f60677eb..0000000000
--- a/cpukit/posix/include/rtems/posix/mutexmp.h
+++ /dev/null
@@ -1,161 +0,0 @@
-/*  mutexmp.h
- *
- *  This include file contains all the constants and structures associated
- *  with the Multiprocessing Support in the POSIX Mutex Manager.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_POSIX_MUTEX_MP_h
-#define __RTEMS_POSIX_MUTEX_MP_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/mppkt.h>
-#include <rtems/score/object.h>
-#include <rtems/score/thread.h>
-#include <rtems/score/watchdog.h>
-
-/*
- *  The following enumerated type defines the list of
- *  remote mutex operations.
- */
-
-typedef enum {
-  POSIX_MUTEX_MP_ANNOUNCE_CREATE  =  0,
-  POSIX_MUTEX_MP_ANNOUNCE_DELETE  =  1,
-  POSIX_MUTEX_MP_EXTRACT_PROXY    =  2,
-  POSIX_MUTEX_MP_OBTAIN_REQUEST   =  3,
-  POSIX_MUTEX_MP_OBTAIN_RESPONSE  =  4,
-  POSIX_MUTEX_MP_RELEASE_REQUEST  =  5,
-  POSIX_MUTEX_MP_RELEASE_RESPONSE =  6,
-}   POSIX_Mutex_MP_Remote_operations;
-
-/*
- *  The following data structure defines the packet used to perform
- *  remote mutex operations.
- */
-
-typedef struct {
-  MP_packet_Prefix                  Prefix;
-  POSIX_Mutex_MP_Remote_operations  operation;
-  Objects_Name                      name;
-  boolean                           wait;  /* XXX options */
-  Objects_Id                        proxy_id;
-}   POSIX_Mutex_MP_Packet;
-
-/*
- *  _POSIX_Mutex_MP_Send_process_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs a remote procedure call so that a
- *  process operation can be performed on another node.
- */
-
-void _POSIX_Mutex_MP_Send_process_packet (
-  POSIX_Mutex_MP_Remote_operations  operation,
-  Objects_Id                        mutex_id,
-  Objects_Name                      name,
-  Objects_Id                        proxy_id
-);
-
-/*
- *  _POSIX_Mutex_MP_Send_request_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs a remote procedure call so that a
- *  directive operation can be initiated on another node.
- */
-
-int _POSIX_Mutex_MP_Send_request_packet (
-  POSIX_Mutex_MP_Remote_operations  operation,
-  Objects_Id                        mutex_id,
-  boolean                           wait,  /* XXX options */
-  Watchdog_Interval                 timeout
-);
-
-/*
- *  _POSIX_Mutex_MP_Send_response_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs a remote procedure call so that a
- *  directive can be performed on another node.
- */
-
-void _POSIX_Mutex_MP_Send_response_packet (
-  POSIX_Mutex_MP_Remote_operations  operation,
-  Objects_Id                        mutex_id,
-  Thread_Control                   *the_thread
-);
-
-/*
- *
- *  _POSIX_Mutex_MP_Process_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs the actions specific to this package for
- *  the request from another node.
- */
-
-void _POSIX_Mutex_MP_Process_packet (
-  MP_packet_Prefix *the_packet_prefix
-);
-
-/*
- *  _POSIX_Mutex_MP_Send_object_was_deleted
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked indirectly by the thread queue
- *  when a proxy has been removed from the thread queue and
- *  the remote node must be informed of this.
- */
-
-void _POSIX_Mutex_MP_Send_object_was_deleted (
-  Thread_Control *the_proxy
-);
-
-/*
- *  _POSIX_Mutex_MP_Send_extract_proxy
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked when a task is deleted and it
- *  has a proxy which must be removed from a thread queue and
- *  the remote node must be informed of this.
- */
-
-void _POSIX_Mutex_MP_Send_extract_proxy (
-  Thread_Control *the_thread
-);
-
-/*
- *  _POSIX_Mutex_MP_Get_packet
- *
- *  DESCRIPTION:
- *
- *  This function is used to obtain a mutex mp packet.
- */
-
-POSIX_Mutex_MP_Packet *_POSIX_Mutex_MP_Get_packet ( void );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of file */
diff --git a/cpukit/posix/include/rtems/posix/posixapi.h b/cpukit/posix/include/rtems/posix/posixapi.h
deleted file mode 100644
index f7c52985c3..0000000000
--- a/cpukit/posix/include/rtems/posix/posixapi.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- *  POSIX API Support
- *
- *  NOTE:
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
- 
-#ifndef __POSIX_API_h
-#define __POSIX_API_h
- 
-#include <rtems/config.h>
-
-/*PAGE
- *
- *  _POSIX_API_Initialize
- *
- *  XXX
- */
- 
-void _POSIX_API_Initialize(
-  rtems_configuration_table *configuration_table
-);
-
-#endif
-/* end of include file */
diff --git a/cpukit/posix/include/rtems/posix/priority.h b/cpukit/posix/include/rtems/posix/priority.h
deleted file mode 100644
index c0253f3bab..0000000000
--- a/cpukit/posix/include/rtems/posix/priority.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- *
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_POSIX_PRIORITY_h
-#define __RTEMS_POSIX_PRIORITY_h
-
-#include <rtems/score/priority.h>
-
-/*
- *  1003.1b-1993,2.2.2.80 definition of priority, p. 19
- *
- *  "Numericallly higher values represent higher priorities."
- *
- *  Thus, RTEMS Core has priorities run in the opposite sense of the POSIX API.
- *
- *  There are only 254 posix priority levels since a task at priority level
- *  255 would never run because of the RTEMS idle task.  This is necessary
- *  because GNAT maps the lowest Ada task priority to the lowest thread
- *  priority.  The lowest priority Ada task should get to run, so there is
- *  a fundamental conflict with having 255 priorities.
- */
-
-#define POSIX_SCHEDULER_MAXIMUM_PRIORITY (254)
-  
-#define POSIX_SCHEDULER_MINIMUM_PRIORITY (1)
-
-RTEMS_INLINE_ROUTINE boolean _POSIX_Priority_Is_valid(
-  int priority
-);
-
-RTEMS_INLINE_ROUTINE Priority_Control _POSIX_Priority_To_core(
-  int priority
-);
-
-RTEMS_INLINE_ROUTINE int _POSIX_Priority_From_core(
-  Priority_Control priority
-);
-
-#include <rtems/posix/priority.inl>
-
-#endif
diff --git a/cpukit/posix/include/rtems/posix/psignal.h b/cpukit/posix/include/rtems/posix/psignal.h
deleted file mode 100644
index 4ecba1f41c..0000000000
--- a/cpukit/posix/include/rtems/posix/psignal.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- *  $Id$
- */
-
-#ifndef __RTEMS_POSIX_SIGNALS_h
-#define __RTEMS_POSIX_SIGNALS_h
-
-typedef struct {
-  Chain_Node  Node;
-  siginfo_t   Info;
-}  POSIX_signals_Siginfo_node;
-
-void _POSIX_signals_Manager_Initialization(
-  int  maximum_queued_signals
-);
-
-void _POSIX_signals_Post_switch_extension(
-  Thread_Control  *the_thread
-);
-
-#endif
-/* end of file */
diff --git a/cpukit/posix/include/rtems/posix/pthread.h b/cpukit/posix/include/rtems/posix/pthread.h
deleted file mode 100644
index abf5933fc2..0000000000
--- a/cpukit/posix/include/rtems/posix/pthread.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/*  rtems/posix/pthread.h
- *
- *  This include file contains all the private support information for
- *  POSIX threads.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
- 
-#ifndef __RTEMS_POSIX_THREADS_h
-#define __RTEMS_POSIX_THREADS_h
- 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/posix/config.h>
-#include <rtems/posix/threadsup.h>
-
-#define PTHREAD_MINIMUM_STACK_SIZE (STACK_MINIMUM_SIZE * 2)
-
-/*
- *  The following defines the information control block used to manage
- *  this class of objects.
- */
- 
-POSIX_EXTERN Objects_Information  _POSIX_Threads_Information;
-
-/*
- *  These are used to manage the user initialization threads.
- */
- 
-POSIX_EXTERN posix_initialization_threads_table 
-                   *_POSIX_Threads_User_initialization_threads;
-POSIX_EXTERN unsigned32   _POSIX_Threads_Number_of_initialization_threads;
-
- 
-/*
- *  _POSIX_Threads_Manager_initialization
- *
- *  DESCRIPTION:
- *
- *  This routine performs the initialization necessary for this manager.
- */
- 
-void _POSIX_Threads_Manager_initialization(
-  unsigned32                          maximum_pthreads,
-  unsigned32                          number_of_initialization_threads,
-  posix_initialization_threads_table *user_threads
-);
- 
-/*
- *  _POSIX_Threads_Allocate
- *
- *  DESCRIPTION:
- *
- *  This function allocates a pthread control block from
- *  the inactive chain of free pthread control blocks.
- */
- 
-RTEMS_INLINE_ROUTINE Thread_Control *_POSIX_Threads_Allocate( void );
- 
-/*
- *  _POSIX_Threads_Free
- *
- *  DESCRIPTION:
- *
- *  This routine frees a pthread control block to the
- *  inactive chain of free pthread control blocks.
- */
- 
-RTEMS_INLINE_ROUTINE void _POSIX_Threads_Free(
-  Thread_Control *the_pthread
-);
- 
-/*
- *  _POSIX_Threads_Get
- *
- *  DESCRIPTION:
- *
- *  This function maps pthread IDs to pthread control blocks.
- *  If ID corresponds to a local pthread, then it returns
- *  the_pthread control pointer which maps to ID and location
- *  is set to OBJECTS_LOCAL.  if the pthread ID is global and
- *  resides on a remote node, then location is set to OBJECTS_REMOTE,
- *  and the_pthread is undefined.  Otherwise, location is set
- *  to OBJECTS_ERROR and the_pthread is undefined.
- */
- 
-RTEMS_INLINE_ROUTINE Thread_Control *_POSIX_Threads_Get(
-  pthread_t          id,
-  Objects_Locations *location
-);
- 
-/*
- *  _POSIX_Threads_Is_null
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the_pthread is NULL and FALSE otherwise.
- */
- 
-RTEMS_INLINE_ROUTINE boolean _POSIX_Threads_Is_null(
-  Thread_Control *the_pthread
-);
-
-#include <rtems/posix/pthread.inl>
-#include <rtems/posix/pthreadmp.h>
-
-#ifdef __cplusplus
-}
-#endif
- 
-#endif
-/*  end of include file */
-
diff --git a/cpukit/posix/include/rtems/posix/pthreadmp.h b/cpukit/posix/include/rtems/posix/pthreadmp.h
deleted file mode 100644
index af5997ead7..0000000000
--- a/cpukit/posix/include/rtems/posix/pthreadmp.h
+++ /dev/null
@@ -1,161 +0,0 @@
-/*  pthreadmp.h
- *
- *  This include file contains all the constants and structures associated
- *  with the Multiprocessing Support in the POSIX Threads Manager.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_POSIX_THREADS_MP_h
-#define __RTEMS_POSIX_THREADS_MP_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/mppkt.h>
-#include <rtems/score/object.h>
-#include <rtems/score/thread.h>
-#include <rtems/score/watchdog.h>
-
-/*
- *  The following enumerated type defines the list of
- *  remote pthread operations.
- */
-
-typedef enum {
-  POSIX_THREADS_MP_ANNOUNCE_CREATE  =  0,
-  POSIX_THREADS_MP_ANNOUNCE_DELETE  =  1,
-  POSIX_THREADS_MP_EXTRACT_PROXY    =  2,
-  POSIX_THREADS_MP_OBTAIN_REQUEST   =  3,
-  POSIX_THREADS_MP_OBTAIN_RESPONSE  =  4,
-  POSIX_THREADS_MP_RELEASE_REQUEST  =  5,
-  POSIX_THREADS_MP_RELEASE_RESPONSE =  6
-}   POSIX_Threads_MP_Remote_operations;
-
-/*
- *  The following data structure defines the packet used to perform
- *  remote pthread operations.
- */
-
-typedef struct {
-  MP_packet_Prefix                    Prefix;
-  POSIX_Threads_MP_Remote_operations  operation;
-  Objects_Name                        name;
-  boolean                             wait;
-  Objects_Id                          proxy_id;
-}   POSIX_Threads_MP_Packet;
-
-/*
- *  _POSIX_Threads_MP_Send_process_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs a remote procedure call so that a
- *  process operation can be performed on another node.
- */
-
-void _POSIX_Threads_MP_Send_process_packet (
-  POSIX_Threads_MP_Remote_operations  operation,
-  Objects_Id                          pthread_id,
-  Objects_Name                        name,
-  Objects_Id                          proxy_id
-);
-
-/*
- *  _POSIX_Threads_MP_Send_request_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs a remote procedure call so that a
- *  directive operation can be initiated on another node.
- */
-
-int _POSIX_Threads_MP_Send_request_packet (
-  POSIX_Threads_MP_Remote_operations  operation,
-  Objects_Id                          pthread_id,
-  boolean                             wait,
-  Watchdog_Interval                   timeout
-);
-
-/*
- *  _POSIX_Threads_MP_Send_response_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs a remote procedure call so that a
- *  directive can be performed on another node.
- */
-
-void _POSIX_Threads_MP_Send_response_packet (
-  POSIX_Threads_MP_Remote_operations   operation,
-  Objects_Id                           pthread_id,
-  Thread_Control                      *the_thread
-);
-
-/*
- *
- *  _POSIX_Threads_MP_Process_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs the actions specific to this package for
- *  the request from another node.
- */
-
-void _POSIX_Threads_MP_Process_packet (
-  MP_packet_Prefix *the_packet_prefix
-);
-
-/*
- *  _POSIX_Threads_MP_Send_object_was_deleted
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked indirectly by the thread queue
- *  when a proxy has been removed from the thread queue and
- *  the remote node must be informed of this.
- */
-
-void _POSIX_Threads_MP_Send_object_was_deleted (
-  Thread_Control *the_proxy
-);
-
-/*
- *  _POSIX_Threads_MP_Send_extract_proxy
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked when a task is deleted and it
- *  has a proxy which must be removed from a thread queue and
- *  the remote node must be informed of this.
- */
-
-void _POSIX_Threads_MP_Send_extract_proxy (
-  Thread_Control *the_thread
-);
-
-/*
- *  _POSIX_Threads_MP_Get_packet
- *
- *  DESCRIPTION:
- *
- *  This function is used to obtain a pthread mp packet.
- */
-
-POSIX_Threads_MP_Packet *_POSIX_Threads_MP_Get_packet ( void );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of file */
diff --git a/cpukit/posix/include/rtems/posix/semaphore.h b/cpukit/posix/include/rtems/posix/semaphore.h
deleted file mode 100644
index cc658ee32b..0000000000
--- a/cpukit/posix/include/rtems/posix/semaphore.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/*  rtems/posix/semaphore.h
- *
- *  This include file contains all the private support information for
- *  POSIX Semaphores.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
- 
-#ifndef __RTEMS_POSIX_SEMAPHORE_h
-#define __RTEMS_POSIX_SEMAPHORE_h
- 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/coresem.h>
-
-/*
- *  Data Structure used to manage a POSIX semaphore
- */
- 
-typedef struct {
-   Objects_Control         Object;
-   int                     process_shared;
-   boolean                 named;
-   boolean                 linked;
-   unsigned32              open_count;
-   CORE_semaphore_Control  Semaphore;
-}  POSIX_Semaphore_Control;
-
-/*
- *  The following defines the information control block used to manage
- *  this class of objects.
- */
- 
-POSIX_EXTERN Objects_Information  _POSIX_Semaphore_Information;
- 
-/*
- *  _POSIX_Semaphore_Manager_initialization
- *
- *  DESCRIPTION:
- *
- *  This routine performs the initialization necessary for this manager.
- */
- 
-void _POSIX_Semaphore_Manager_initialization(
-  unsigned32 maximum_semaphorees
-);
- 
-/*
- *  _POSIX_Semaphore_Allocate
- *
- *  DESCRIPTION:
- *
- *  This function allocates a semaphore control block from
- *  the inactive chain of free semaphore control blocks.
- */
- 
-RTEMS_INLINE_ROUTINE POSIX_Semaphore_Control *_POSIX_Semaphore_Allocate( void );
- 
-/*
- *  _POSIX_Semaphore_Free
- *
- *  DESCRIPTION:
- *
- *  This routine frees a semaphore control block to the
- *  inactive chain of free semaphore control blocks.
- */
- 
-RTEMS_INLINE_ROUTINE void _POSIX_Semaphore_Free (
-  POSIX_Semaphore_Control *the_semaphore
-);
- 
-/*
- *  _POSIX_Semaphore_Get
- *
- *  DESCRIPTION:
- *
- *  This function maps semaphore IDs to semaphore control blocks.
- *  If ID corresponds to a local semaphore, then it returns
- *  the_semaphore control pointer which maps to ID and location
- *  is set to OBJECTS_LOCAL.  if the semaphore ID is global and
- *  resides on a remote node, then location is set to OBJECTS_REMOTE,
- *  and the_semaphore is undefined.  Otherwise, location is set
- *  to OBJECTS_ERROR and the_semaphore is undefined.
- */
- 
-RTEMS_INLINE_ROUTINE POSIX_Semaphore_Control *_POSIX_Semaphore_Get (
-  Objects_Id        *id,
-  Objects_Locations *location
-);
- 
-/*
- *  _POSIX_Semaphore_Is_null
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the_semaphore is NULL and FALSE otherwise.
- */
- 
-RTEMS_INLINE_ROUTINE boolean _POSIX_Semaphore_Is_null (
-  POSIX_Semaphore_Control *the_semaphore
-);
-
-/*
- *  _POSIX_Semaphore_Name_to_id
- *
- *  DESCRIPTION:
- *
- *  XXX
- */
-
-int _POSIX_Semaphore_Name_to_id(
-  const char          *name,
-  Objects_Id          *id
-);
-
-#include <rtems/posix/semaphore.inl>
-#include <rtems/posix/semaphoremp.h>
-
-#ifdef __cplusplus
-}
-#endif
- 
-#endif
-/*  end of include file */
-
diff --git a/cpukit/posix/include/rtems/posix/semaphoremp.h b/cpukit/posix/include/rtems/posix/semaphoremp.h
deleted file mode 100644
index 14af483f98..0000000000
--- a/cpukit/posix/include/rtems/posix/semaphoremp.h
+++ /dev/null
@@ -1,161 +0,0 @@
-/*  semaphoremp.h
- *
- *  This include file contains all the constants and structures associated
- *  with the Multiprocessing Support in the POSIX Semaphore Manager.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_POSIX_SEMAPHORE_MP_h
-#define __RTEMS_POSIX_SEMAPHORE_MP_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/mppkt.h>
-#include <rtems/score/object.h>
-#include <rtems/score/thread.h>
-#include <rtems/score/watchdog.h>
-
-/*
- *  The following enumerated type defines the list of
- *  remote semaphore operations.
- */
-
-typedef enum {
-  POSIX_SEMAPHORE_MP_ANNOUNCE_CREATE  =  0,
-  POSIX_SEMAPHORE_MP_ANNOUNCE_DELETE  =  1,
-  POSIX_SEMAPHORE_MP_EXTRACT_PROXY    =  2,
-  POSIX_SEMAPHORE_MP_OBTAIN_REQUEST   =  3,
-  POSIX_SEMAPHORE_MP_OBTAIN_RESPONSE  =  4,
-  POSIX_SEMAPHORE_MP_RELEASE_REQUEST  =  5,
-  POSIX_SEMAPHORE_MP_RELEASE_RESPONSE =  6,
-}   POSIX_Semaphore_MP_Remote_operations;
-
-/*
- *  The following data structure defines the packet used to perform
- *  remote semaphore operations.
- */
-
-typedef struct {
-  MP_packet_Prefix                      Prefix;
-  POSIX_Semaphore_MP_Remote_operations  operation;
-  Objects_Name                          name;
-  boolean                               wait;  /* XXX options */
-  Objects_Id                            proxy_id;
-}   POSIX_Semaphore_MP_Packet;
-
-/*
- *  _POSIX_Semaphore_MP_Send_process_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs a remote procedure call so that a
- *  process operation can be performed on another node.
- */
-
-void _POSIX_Semaphore_MP_Send_process_packet (
-  POSIX_Semaphore_MP_Remote_operations  operation,
-  Objects_Id                            semaphore_id,
-  Objects_Name                          name,
-  Objects_Id                            proxy_id
-);
-
-/*
- *  _POSIX_Semaphore_MP_Send_request_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs a remote procedure call so that a
- *  directive operation can be initiated on another node.
- */
-
-int _POSIX_Semaphore_MP_Send_request_packet (
-  POSIX_Semaphore_MP_Remote_operations  operation,
-  Objects_Id                            semaphore_id,
-  boolean                               wait,  /* XXX options */
-  Watchdog_Interval                     timeout
-);
-
-/*
- *  _POSIX_Semaphore_MP_Send_response_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs a remote procedure call so that a
- *  directive can be performed on another node.
- */
-
-void _POSIX_Semaphore_MP_Send_response_packet (
-  POSIX_Semaphore_MP_Remote_operations  operation,
-  Objects_Id                        semaphore_id,
-  Thread_Control                   *the_thread
-);
-
-/*
- *
- *  _POSIX_Semaphore_MP_Process_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs the actions specific to this package for
- *  the request from another node.
- */
-
-void _POSIX_Semaphore_MP_Process_packet (
-  MP_packet_Prefix *the_packet_prefix
-);
-
-/*
- *  _POSIX_Semaphore_MP_Send_object_was_deleted
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked indirectly by the thread queue
- *  when a proxy has been removed from the thread queue and
- *  the remote node must be informed of this.
- */
-
-void _POSIX_Semaphore_MP_Send_object_was_deleted (
-  Thread_Control *the_proxy
-);
-
-/*
- *  _POSIX_Semaphore_MP_Send_extract_proxy
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked when a task is deleted and it
- *  has a proxy which must be removed from a thread queue and
- *  the remote node must be informed of this.
- */
-
-void _POSIX_Semaphore_MP_Send_extract_proxy (
-  Thread_Control *the_thread
-);
-
-/*
- *  _POSIX_Semaphore_MP_Get_packet
- *
- *  DESCRIPTION:
- *
- *  This function is used to obtain a semaphore mp packet.
- */
-
-POSIX_Semaphore_MP_Packet *_POSIX_Semaphore_MP_Get_packet ( void );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of file */
diff --git a/cpukit/posix/include/rtems/posix/threadsup.h b/cpukit/posix/include/rtems/posix/threadsup.h
deleted file mode 100644
index bb800a507f..0000000000
--- a/cpukit/posix/include/rtems/posix/threadsup.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* threadsup.h
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_POSIX_THREAD_SUPPORT_h
-#define __RTEMS_POSIX_THREAD_SUPPORT_h
-
-#include <rtems/score/coresem.h>
-#include <rtems/score/tqdata.h>
-
-typedef struct {
-  pthread_attr_t          Attributes;
-  int                     detachstate;
-  Thread_queue_Control    Join_List;
-  int                     schedpolicy;
-  struct sched_param      schedparam;
-  int                     ss_high_priority;
-  Watchdog_Control        Sporadic_timer;
-
-  sigset_t                signals_blocked;
-  sigset_t                signals_pending;
-
-#if 0
-  /*
-   *  POSIX Interrupts 
-   */
-  unsigned32              interrupts_installed;
-  CORE_semaphore_Control  Interrupt_Semaphore;
-#endif
-
-#if 0
-  /*
-   *  POSIX Cancelability 
-   */
-  int                     cancelability_state;
-  int                     cancelability_type;
-  int                     cancelation_requested;
-  Chain_Control           Cancellation_Handlers;
-#endif
-
-} POSIX_API_Control;
-
-#endif
-/* end of include file */
-
diff --git a/cpukit/posix/include/rtems/posix/time.h b/cpukit/posix/include/rtems/posix/time.h
deleted file mode 100644
index 0e87db388e..0000000000
--- a/cpukit/posix/include/rtems/posix/time.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- *
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_POSIX_TIME_h
-#define __RTEMS_POSIX_TIME_h
-
-#include <rtems/score/tod.h>
-
-/*
- *  Seconds from January 1, 1970 to January 1, 1988.  Used to account for
- *  differences between POSIX API and RTEMS core.
- */
- 
-#define POSIX_TIME_SECONDS_1970_THROUGH_1988 \
-  (((1987 - 1970 + 1)  * TOD_SECONDS_PER_NON_LEAP_YEAR) + \
-  (4 * TOD_SECONDS_PER_DAY))
-
-/*PAGE
- *
- *  _POSIX_Timespec_subtract
- */
- 
-void _POSIX_Timespec_subtract(
-  const struct timespec *the_start,
-  const struct timespec *end,
-  struct timespec *result
-);
-
-/*
- *  _POSIX_Timespec_to_interval
- */
-
-Watchdog_Interval _POSIX_Timespec_to_interval(
-  const struct timespec *time
-);
-
-/*PAGE
- *
- *  _POSIX_Interval_to_timespec
- */
- 
-void _POSIX_Interval_to_timespec(
-  Watchdog_Interval  ticks,
-  struct timespec   *time
-);
-
-#endif
diff --git a/cpukit/posix/include/sched.h b/cpukit/posix/include/sched.h
deleted file mode 100644
index 14a603c0c5..0000000000
--- a/cpukit/posix/include/sched.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*  sched.h
- *
- *  $Id$
- */
-
-
-#ifndef __POSIX_SCHEDULING_h
-#define __POSIX_SCHEDULING_h
-
-#include <sys/features.h>
-
-#if defined(_POSIX_PRIORITY_SCHEDULING)
-
-#include <sys/types.h>
-#include <time.h>
-#include <sys/sched.h>
-#include <pthread.h>
-
-/*
- *  13.3.1 Set Scheduling Parameters, P1003.1b-1993, p. 252
- *
- */
-
-int sched_setparam(
-  pid_t                     pid,
-  const struct sched_param *param
-);
-
-/*
- *  13.3.2 Set Scheduling Parameters, P1003.1b-1993, p. 253
- */
-
-int sched_getparam(
-  pid_t                     pid,
-  const struct sched_param *param
-);
-
-/*
- *  13.3.3 Set Scheduling Policy and Scheduling Parameters, 
- *         P1003.1b-1993, p. 254
- */
-
-int sched_setscheduler(
-  pid_t                     pid,
-  int                       policy,
-  const struct sched_param *param
-);
-
-/*
- *  13.3.4 Get Scheduling Policy, P1003.1b-1993, p. 256
- */
-
-int sched_getscheduler(
-  pid_t                     pid
-);
-
-/*
- *  13.3.6 Get Scheduling Parameter Limits, P1003.1b-1993, p. 258
- */
-
-int sched_get_priority_max(
-  int  policy
-);
-
-int sched_get_priority_min(
-  int  policy
-);
-
-int sched_rr_get_interval(
-  pid_t             pid,
-  struct timespec  *interval
-);
-
-#endif /* _POSIX_PRIORITY_SCHEDULING */
-
-#if defined(_POSIX_THREADS) || defined(_POSIX_PRIORITY_SCHEDULING)
-
-/*
- *  13.3.5 Yield Processor, P1003.1b-1993, p. 257
- */
-
-int sched_yield( void );
-
-#endif /* _POSIX_THREADS or _POSIX_PRIORITY_SCHEDULING */
-
-#endif
-/* end of include file */
-
diff --git a/cpukit/posix/include/semaphore.h b/cpukit/posix/include/semaphore.h
deleted file mode 100644
index 0388f91ad9..0000000000
--- a/cpukit/posix/include/semaphore.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/*  semaphore.h
- *
- *  $Id$
- */
-
-#ifndef __POSIX_SEMAPHORE_h
-#define __POSIX_SEMAPHORE_h
-
-#include <rtems/posix/features.h>
-
-#if defined(_POSIX_SEMAPHORES)
-
-#include <sys/time.h>
-
-/*
- *  11.1 Semaphore Characteristics, P1003.1b-1993, p.219
- */
-
-typedef int sem_t;
-
-/*
- *  11.2.1 Initialize an Unnamed Semaphore, P1003.1b-1993, p.219
- */
-
-int sem_init(
-  sem_t         *sem,
-  int            pshared,
-  unsigned int   value
-);
-
-/*
- *  11.2.2 Destroy an Unnamed Semaphore, P1003.1b-1993, p.220
- */
-
-int sem_destroy(
-  sem_t *sem
-);
-
-/*
- *  11.2.3 Initialize/Open a Named Semaphore, P1003.1b-1993, p.221
- *
- *  NOTE: Follows open() calling conventions.
- */
-
-sem_t *sem_open(
-  const char *name,
-  int         oflag,
-  ...
-);
-
-/*
- *  11.2.4 Close a Named Semaphore, P1003.1b-1993, p.224
- */
-
-int sem_close(
-  sem_t *sem
-);
-
-/*
- *  11.2.5 Remove a Named Semaphore, P1003.1b-1993, p.225
- */
-
-int sem_unlink(
-  const char *name
-);
-
-/*
- *  11.2.6 Lock a Semaphore, P1003.1b-1993, p.226
- *
- *  NOTE: P1003.4b/D8 adds sem_timedwait(), p. 27
- */
-
-int sem_wait(
-  sem_t *sem
-);
-
-int sem_trywait(
-  sem_t *sem
-);
-
-#if defined(_POSIX_TIMEOUTS)
-int sem_timedwait(
-  sem_t                 *sem,
-  const struct timespec *timeout
-);
-#endif
-
-/*
- *  11.2.7 Unlock a Semaphore, P1003.1b-1993, p.227
- */
-
-int sem_post(
-  sem_t  *sem
-);
-
-/*
- *  11.2.8 Get the Value of a Semaphore, P1003.1b-1993, p.229
- */
-
-int sem_getvalue(
-  sem_t  *sem,
-  int    *sval
-);
-
-#endif   /* _POSIX_SEMAPHORES */
-
-#endif
-/* end of include file */
diff --git a/cpukit/posix/inline/rtems/posix/cond.inl b/cpukit/posix/inline/rtems/posix/cond.inl
deleted file mode 100644
index 3a6741b1b8..0000000000
--- a/cpukit/posix/inline/rtems/posix/cond.inl
+++ /dev/null
@@ -1,77 +0,0 @@
-/*  rtems/posix/cond.inl
- *
- *  This include file contains the static inline implementation of the private 
- *  inlined routines for POSIX condition variables.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
- 
-#ifndef __RTEMS_POSIX_CONDITION_VARIABLES_inl
-#define __RTEMS_POSIX_CONDITION_VARIABLES_inl
- 
-/*PAGE
- *
- *  _POSIX_Condition_variables_Allocate
- */
- 
-RTEMS_INLINE_ROUTINE POSIX_Condition_variables_Control
-  *_POSIX_Condition_variables_Allocate( void )
-{
-  return (POSIX_Condition_variables_Control *) 
-    _Objects_Allocate( &_POSIX_Condition_variables_Information );
-}
- 
-/*PAGE
- *
- *  _POSIX_Condition_variables_Free
- */
- 
-RTEMS_INLINE_ROUTINE void _POSIX_Condition_variables_Free (
-  POSIX_Condition_variables_Control *the_condition_variable
-)
-{
-  _Objects_Free(
-    &_POSIX_Condition_variables_Information,
-    &the_condition_variable->Object
-  );
-}
- 
-/*PAGE
- *
- *  _POSIX_Condition_variables_Get
- */
- 
-RTEMS_INLINE_ROUTINE POSIX_Condition_variables_Control *_POSIX_Condition_variables_Get (
-  Objects_Id        *id,
-  Objects_Locations *location
-)
-{
-/* XXX really should validate pointer */
-/* XXX should support COND_INITIALIZER */
-  return (POSIX_Condition_variables_Control *)
-    _Objects_Get( &_POSIX_Condition_variables_Information, *id, location );
-}
- 
-/*PAGE
- *
- *  _POSIX_Condition_variables_Is_null
- */
- 
-RTEMS_INLINE_ROUTINE boolean _POSIX_Condition_variables_Is_null (
-  POSIX_Condition_variables_Control *the_condition_variable
-)
-{
-  return !the_condition_variable;
-}
-
-#endif
-/*  end of include file */
-
diff --git a/cpukit/posix/inline/rtems/posix/intr.inl b/cpukit/posix/inline/rtems/posix/intr.inl
deleted file mode 100644
index d084a1d12a..0000000000
--- a/cpukit/posix/inline/rtems/posix/intr.inl
+++ /dev/null
@@ -1,72 +0,0 @@
-/*  rtems/posix/intr.inl
- *
- *  This include file contains the static inline implementation of the private 
- *  inlined routines for POSIX Interrupt Manager
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
- 
-#ifndef __RTEMS_POSIX_INTERRUPT_inl
-#define __RTEMS_POSIX_INTERRUPT_inl
-
-/*PAGE
- *
- *  _POSIX_Interrupt_Allocate
- */
- 
-RTEMS_INLINE_ROUTINE POSIX_Interrupt_Handler_control *
-  _POSIX_Interrupt_Allocate( void )
-{
-  return (POSIX_Interrupt_Handler_control *) 
-    _Objects_Allocate( &_POSIX_Interrupt_Handlers_Information );
-}
- 
-/*PAGE
- *
- *  _POSIX_Interrupt_Free
- */
- 
-RTEMS_INLINE_ROUTINE void _POSIX_Interrupt_Free (
-  POSIX_Interrupt_Handler_control *the_intr
-)
-{
-  _Objects_Free( &_POSIX_Interrupt_Handlers_Information, &the_intr->Object );
-}
- 
-/*PAGE
- *
- *  _POSIX_Interrupt_Get
- */
- 
-RTEMS_INLINE_ROUTINE POSIX_Interrupt_Control *_POSIX_Interrupt_Get (
-  Objects_Id         id,
-  Objects_Locations *location
-)
-{
-  return (POSIX_Interrupt_Control *)
-    _Objects_Get( &_POSIX_Interrupt_Handlers_Information, id, location );
-}
- 
-/*PAGE
- *
- *  _POSIX_Interrupt_Is_null
- */
- 
-RTEMS_INLINE_ROUTINE boolean _POSIX_Interrupt_Is_null (
-  POSIX_Interrupt_Handler_control *the_intr
-)
-{
-  return !the_intr;
-}
-
-#endif
-/*  end of include file */
-
diff --git a/cpukit/posix/inline/rtems/posix/key.inl b/cpukit/posix/inline/rtems/posix/key.inl
deleted file mode 100644
index fa4d31b11f..0000000000
--- a/cpukit/posix/inline/rtems/posix/key.inl
+++ /dev/null
@@ -1,70 +0,0 @@
-/*  rtems/posix/key.inl
- *
- *  This include file contains the static inline implementation of the private 
- *  inlined routines for POSIX key's.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
- 
-#ifndef __RTEMS_POSIX_KEY_inl
-#define __RTEMS_POSIX_KEY_inl
- 
-/*PAGE
- *
- *  _POSIX_Keys_Allocate
- */
- 
-RTEMS_INLINE_ROUTINE POSIX_Keys_Control *_POSIX_Keys_Allocate( void )
-{
-  return (POSIX_Keys_Control *) _Objects_Allocate( &_POSIX_Keys_Information );
-}
- 
-/*PAGE
- *
- *  _POSIX_Keys_Free
- */
- 
-RTEMS_INLINE_ROUTINE void _POSIX_Keys_Free (
-  POSIX_Keys_Control *the_key
-)
-{
-  _Objects_Free( &_POSIX_Keys_Information, &the_key->Object );
-}
- 
-/*PAGE
- *
- *  _POSIX_Keys_Get
- */
- 
-RTEMS_INLINE_ROUTINE POSIX_Keys_Control *_POSIX_Keys_Get (
-  Objects_Id         id,
-  Objects_Locations *location
-)
-{
-  return (POSIX_Keys_Control *)
-    _Objects_Get( &_POSIX_Keys_Information, id, location );
-}
- 
-/*PAGE
- *
- *  _POSIX_Keys_Is_null
- */
- 
-RTEMS_INLINE_ROUTINE boolean _POSIX_Keys_Is_null (
-  POSIX_Keys_Control *the_key
-)
-{
-  return !the_key;
-}
-
-#endif
-/*  end of include file */
-
diff --git a/cpukit/posix/inline/rtems/posix/mqueue.inl b/cpukit/posix/inline/rtems/posix/mqueue.inl
deleted file mode 100644
index 51326fba7b..0000000000
--- a/cpukit/posix/inline/rtems/posix/mqueue.inl
+++ /dev/null
@@ -1,83 +0,0 @@
-/*  rtems/posix/mqueue.inl
- *
- *  This include file contains the static inline implementation of the private 
- *  inlined routines for POSIX Message Queue.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
- 
-#ifndef __RTEMS_POSIX_MESSAGE_QUEUE_inl
-#define __RTEMS_POSIX_MESSAGE_QUEUE_inl
- 
-/*PAGE
- *
- *  _POSIX_Message_queue_Allocate
- */
- 
-RTEMS_INLINE_ROUTINE POSIX_Message_queue_Control *_POSIX_Message_queue_Allocate( void )
-{
-  return (POSIX_Message_queue_Control *)
-    _Objects_Allocate( &_POSIX_Message_queue_Information );
-}
- 
-/*PAGE
- *
- *  _POSIX_Message_queue_Free
- */
- 
-RTEMS_INLINE_ROUTINE void _POSIX_Message_queue_Free (
-  POSIX_Message_queue_Control *the_mq
-)
-{
-  _Objects_Free( &_POSIX_Message_queue_Information, &the_mq->Object );
-}
- 
-/*PAGE
- *
- *  _POSIX_Message_queue_Get
- */
- 
-RTEMS_INLINE_ROUTINE POSIX_Message_queue_Control *_POSIX_Message_queue_Get (
-  Objects_Id         id,
-  Objects_Locations *location
-)
-{
-  return (POSIX_Message_queue_Control *)
-    _Objects_Get( &_POSIX_Message_queue_Information, id, location );
-}
- 
-/*PAGE
- *
- *  _POSIX_Message_queue_Is_null
- */
- 
-RTEMS_INLINE_ROUTINE boolean _POSIX_Message_queue_Is_null (
-  POSIX_Message_queue_Control *the_mq
-)
-{
-  return !the_mq;
-}
-
-/*PAGE
- *
- *  _POSIX_Message_queue_Priority_to_core
- */
- 
-RTEMS_INLINE_ROUTINE Priority_Control _POSIX_Message_queue_Priority_to_core(
-  unsigned int priority
-)
-{
-  return priority;
-}
-
-#endif
-/*  end of include file */
-
diff --git a/cpukit/posix/inline/rtems/posix/mutex.inl b/cpukit/posix/inline/rtems/posix/mutex.inl
deleted file mode 100644
index 5c1f3b7b73..0000000000
--- a/cpukit/posix/inline/rtems/posix/mutex.inl
+++ /dev/null
@@ -1,93 +0,0 @@
-/*  rtems/posix/mutex.inl
- *
- *  This include file contains the static inline implementation of the private 
- *  inlined routines for POSIX mutex's.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
- 
-#ifndef __RTEMS_POSIX_MUTEX_inl
-#define __RTEMS_POSIX_MUTEX_inl
- 
-/*PAGE
- *
- *  _POSIX_Mutex_Allocate
- */
- 
-RTEMS_INLINE_ROUTINE POSIX_Mutex_Control *_POSIX_Mutex_Allocate( void )
-{
-  return (POSIX_Mutex_Control *) _Objects_Allocate( &_POSIX_Mutex_Information );
-}
- 
-/*PAGE
- *
- *  _POSIX_Mutex_Free
- */
- 
-RTEMS_INLINE_ROUTINE void _POSIX_Mutex_Free (
-  POSIX_Mutex_Control *the_mutex
-)
-{
-  _Objects_Free( &_POSIX_Mutex_Information, &the_mutex->Object );
-}
- 
-/*PAGE
- *
- *  _POSIX_Mutex_Get
- */
- 
-RTEMS_INLINE_ROUTINE POSIX_Mutex_Control *_POSIX_Mutex_Get (
-  Objects_Id        *id,
-  Objects_Locations *location
-)
-{
-  int status;
-
-  if ( !id ) {
-    *location = OBJECTS_ERROR;
-    return (POSIX_Mutex_Control *) 0;
-  }
-
-  if ( *id == PTHREAD_MUTEX_INITIALIZER ) {
-    /*
-     *  Do an "auto-create" here.
-     */
-
-    status = pthread_mutex_init( id, 0 );
-    if ( status ) {
-      *location = OBJECTS_ERROR;
-      return (POSIX_Mutex_Control *) 0;
-    }
-  }
-
-  /*
-   *  Now call Objects_Get()
-   */
-
-  return (POSIX_Mutex_Control *)
-    _Objects_Get( &_POSIX_Mutex_Information, *id, location );
-}
- 
-/*PAGE
- *
- *  _POSIX_Mutex_Is_null
- */
- 
-RTEMS_INLINE_ROUTINE boolean _POSIX_Mutex_Is_null (
-  POSIX_Mutex_Control *the_mutex
-)
-{
-  return !the_mutex;
-}
-
-#endif
-/*  end of include file */
-
diff --git a/cpukit/posix/inline/rtems/posix/priority.inl b/cpukit/posix/inline/rtems/posix/priority.inl
deleted file mode 100644
index dc8187d4ef..0000000000
--- a/cpukit/posix/inline/rtems/posix/priority.inl
+++ /dev/null
@@ -1,37 +0,0 @@
-/*  
- *  $Id$
- */
-
-#ifndef __RTEMS_POSIX_PRIORITY_inl
-#define __RTEMS_POSIX_PRIORITY_inl
-
-/*
- *  1003.1b-1993,2.2.2.80 definition of priority, p. 19
- *
- *  "Numericallly higher values represent higher priorities."
- *
- *  Thus, RTEMS Core has priorities run in the opposite sense of the POSIX API.
- */
-
-RTEMS_INLINE_ROUTINE boolean _POSIX_Priority_Is_valid(
-  int priority
-)
-{
-  return (boolean) (priority >= 1 && priority <= 254);
-}
-
-RTEMS_INLINE_ROUTINE Priority_Control _POSIX_Priority_To_core(
-  int priority
-)
-{
-  return (Priority_Control) (255 - priority);
-}
-
-RTEMS_INLINE_ROUTINE int _POSIX_Priority_From_core(
-  Priority_Control priority
-)
-{
-  return 255 - priority;
-}
-
-#endif
diff --git a/cpukit/posix/inline/rtems/posix/pthread.inl b/cpukit/posix/inline/rtems/posix/pthread.inl
deleted file mode 100644
index 51f7287384..0000000000
--- a/cpukit/posix/inline/rtems/posix/pthread.inl
+++ /dev/null
@@ -1,70 +0,0 @@
-/*  rtems/posix/pthread.inl
- *
- *  This include file contains the static inline implementation of the private 
- *  inlined routines for POSIX threads.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
- 
-#ifndef __RTEMS_POSIX_THREADS_inl
-#define __RTEMS_POSIX_THREADS_inl
- 
-/*PAGE
- *
- *  _POSIX_Threads_Allocate
- */
- 
-RTEMS_INLINE_ROUTINE Thread_Control *_POSIX_Threads_Allocate( void )
-{
-  return (Thread_Control *) _Objects_Allocate( &_POSIX_Threads_Information );
-}
- 
-/*PAGE
- *
- *  _POSIX_Threads_Free
- */
- 
-RTEMS_INLINE_ROUTINE void _POSIX_Threads_Free (
-  Thread_Control *the_pthread
-)
-{
-  _Objects_Free( &_POSIX_Threads_Information, &the_pthread->Object );
-}
- 
-/*PAGE
- *
- *  _POSIX_Threads_Get
- */
- 
-RTEMS_INLINE_ROUTINE Thread_Control *_POSIX_Threads_Get (
-  pthread_t          id,
-  Objects_Locations *location
-)
-{
-  return (Thread_Control *)
-    _Objects_Get( &_POSIX_Threads_Information, (Objects_Id)id, location );
-}
- 
-/*PAGE
- *
- *  _POSIX_Threads_Is_null
- */
- 
-RTEMS_INLINE_ROUTINE boolean _POSIX_Threads_Is_null (
-  Thread_Control *the_pthread
-)
-{
-  return !the_pthread;
-}
-
-#endif
-/*  end of include file */
-
diff --git a/cpukit/posix/inline/rtems/posix/semaphore.inl b/cpukit/posix/inline/rtems/posix/semaphore.inl
deleted file mode 100644
index 8f2189d82a..0000000000
--- a/cpukit/posix/inline/rtems/posix/semaphore.inl
+++ /dev/null
@@ -1,71 +0,0 @@
-/*  rtems/posix/semaphore.inl
- *
- *  This include file contains the static inline implementation of the private 
- *  inlined routines for POSIX Semaphores.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
- 
-#ifndef __RTEMS_POSIX_SEMAPHORE_inl
-#define __RTEMS_POSIX_SEMAPHORE_inl
- 
-/*PAGE
- *
- *  _POSIX_Semaphore_Allocate
- */
- 
-RTEMS_INLINE_ROUTINE POSIX_Semaphore_Control *_POSIX_Semaphore_Allocate( void )
-{
-  return (POSIX_Semaphore_Control *)
-    _Objects_Allocate( &_POSIX_Semaphore_Information );
-}
- 
-/*PAGE
- *
- *  _POSIX_Semaphore_Free
- */
- 
-RTEMS_INLINE_ROUTINE void _POSIX_Semaphore_Free (
-  POSIX_Semaphore_Control *the_semaphore
-)
-{
-  _Objects_Free( &_POSIX_Semaphore_Information, &the_semaphore->Object );
-}
- 
-/*PAGE
- *
- *  _POSIX_Semaphore_Get
- */
- 
-RTEMS_INLINE_ROUTINE POSIX_Semaphore_Control *_POSIX_Semaphore_Get (
-  Objects_Id        *id,
-  Objects_Locations *location
-)
-{
-  return (POSIX_Semaphore_Control *)
-    _Objects_Get( &_POSIX_Semaphore_Information, *id, location );
-}
- 
-/*PAGE
- *
- *  _POSIX_Semaphore_Is_null
- */
- 
-RTEMS_INLINE_ROUTINE boolean _POSIX_Semaphore_Is_null (
-  POSIX_Semaphore_Control *the_semaphore
-)
-{
-  return !the_semaphore;
-}
-
-#endif
-/*  end of include file */
-
diff --git a/cpukit/posix/src/adasupp.c b/cpukit/posix/src/adasupp.c
deleted file mode 100644
index 234b0c2a40..0000000000
--- a/cpukit/posix/src/adasupp.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- *  $Id$
- */
- 
-#include <assert.h>
-#include <errno.h>
-#include <pthread.h>
-
-#include <rtems/system.h>
-#include <rtems/posix/pthread.h>
-
-/*PAGE
- *
- *  _ada_pthread_minimum_stack_size
- *
- *  This routine returns the minimum stack size so the GNAT RTS can
- *  allocate enough stack for Ada tasks.
- */
-
-size_t _ada_pthread_minimum_stack_size( void ) 
-{
-  /*
-   *  Eventually this may need to include a per cpu family calculation
-   *  but for now, this will do.
-   */ 
-
-  return PTHREAD_MINIMUM_STACK_SIZE * 2;
-}
diff --git a/cpukit/posix/src/aio.c b/cpukit/posix/src/aio.c
deleted file mode 100644
index 9fc072f820..0000000000
--- a/cpukit/posix/src/aio.c
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- *  $Id$
- */
-
-#include <aio.h>
-
-#include <rtems/system.h>
-
-/*PAGE
- *
- *  6.7.2 Asynchronous Read, P1003.1b-1993, p. 154
- */
-
-int aio_read(
-  struct aiocb  *aiocbp
-)
-{
-  return POSIX_NOT_IMPLEMENTED();
-}
-
-/*PAGE
- *
- *  6.7.3 Asynchronous Write, P1003.1b-1993, p. 155
- */
-
-int aio_write(
-  struct aiocb  *aiocbp
-)
-{
-  return POSIX_NOT_IMPLEMENTED();
-}
-
-/*PAGE
- *
- *  6.7.4 List Directed I/O, P1003.1b-1993, p. 158
- */
-
-int lio_listio(
-  int                    mode,
-  struct aiocb  * const  list[],
-  int                    nent,
-  struct sigevent       *sig
-)
-{
-  return POSIX_NOT_IMPLEMENTED();
-}
-
-/*PAGE
- *
- *  6.7.5 Retrieve Error of Asynchronous I/O Operation, P1003.1b-1993, p. 161
- */
-
-int aio_error(
-  const struct aiocb  *aiocbp
-)
-{
-  return POSIX_NOT_IMPLEMENTED();
-}
-
-/*PAGE
- *
- *  6.7.6 Retrieve Return Status of Asynchronous I/O Operation, 
- *        P1003.1b-1993, p. 162
- */
-
-int aio_return(
-  const struct aiocb  *aiocbp
-)
-{
-  return POSIX_NOT_IMPLEMENTED();
-}
-
-/*PAGE
- *
- *  6.7.7 Cancel Asynchronous I/O Operation, P1003.1b-1993, p. 163
- */
-
-int aio_cancel(
-  int            filedes,
-  struct aiocb  *aiocbp
-)
-{
-  return POSIX_NOT_IMPLEMENTED();
-}
-
-/*PAGE
- *
- *  6.7.7 Wait for Asynchronous I/O Request, P1003.1b-1993, p. 164
- */
-
-int aio_suspend(
-  struct aiocb  * const   list[],
-  int                     nent,
-  const struct timespec  *timeout
-)
-{
-  return POSIX_NOT_IMPLEMENTED();
-}
-
-/*PAGE
- *
- *  6.7.9 Asynchronous File Synchronization, P1003.1b-1993, p. 166
- */
-
-int aio_fsync(
-  int            op,
-  struct aiocb  *aiocbp
-)
-{
-  return POSIX_NOT_IMPLEMENTED();
-}
diff --git a/cpukit/posix/src/cancel.c b/cpukit/posix/src/cancel.c
deleted file mode 100644
index b6cc073456..0000000000
--- a/cpukit/posix/src/cancel.c
+++ /dev/null
@@ -1,228 +0,0 @@
-/*
- *  $Id$
- */
-
-#include <pthread.h>
-#include <errno.h>
-
-#include <rtems/system.h>
-#include <rtems/score/chain.h>
-#include <rtems/score/isr.h>
-#include <rtems/score/thread.h>
-#include <rtems/score/wkspace.h>
-#include <rtems/posix/cancel.h>
-#include <rtems/posix/pthread.h>
-#include <rtems/posix/threadsup.h>
-
-/*PAGE
- *
- *  POSIX_Thread_cancel_run
- *
- */
-
-void POSIX_Thread_cancel_run( 
-  Thread_Control *the_thread
-)
-{
-  int                                old_cancel_state;
-  POSIX_Cancel_Handler_control      *handler;
-  Chain_Control                     *handler_stack;
-  POSIX_API_Thread_Support_Control  *thread_support;
-  ISR_Level                          level;
- 
-  thread_support = the_thread->API_Extensions[ THREAD_API_POSIX ];
- 
-  handler_stack = &thread_support->Cancellation_Handlers;
- 
-  old_cancel_state = thread_support->cancelability_state;
-
-  thread_support->cancelability_state = PTHREAD_CANCEL_DISABLE;
-
-  while ( !_Chain_Is_empty( handler_stack ) ) {
-    _ISR_Disable( level );
-      handler = (POSIX_Cancel_Handler_control *) _Chain_Tail( handler_stack );
-      _Chain_Extract_unprotected( &handler->Node );
-    _ISR_Enable( level );
- 
-    (*handler->routine)( handler->arg );
-
-    _Workspace_Free( handler );
-  }
-
-  thread_support->cancelation_requested = 0;
-
-  thread_support->cancelability_state = old_cancel_state;
-}
-
-/*PAGE
- *
- *  18.2.1 Canceling Execution of a Thread, P1003.1c/Draft 10, p. 181
- */
-
-int pthread_cancel(
-  pthread_t  thread
-)
-{
-  Thread_Control                    *the_thread;
-  POSIX_API_Thread_Support_Control  *thread_support;
-  Objects_Locations                  location;
-
-  the_thread = _POSIX_Threads_Get( &thread, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-      return EINVAL;
-    case OBJECTS_REMOTE:
-      return POSIX_MP_NOT_IMPLEMENTED();
-    case OBJECTS_LOCAL:
-      thread_support = the_thread->API_Extensions[ THREAD_API_POSIX ];
-
-      thread_support->cancelation_requested = 1;
-
-      _Thread_Enable_dispatch();
-      return 0;
-  }
- 
-  return POSIX_BOTTOM_REACHED();
-}
-
-/*PAGE
- *
- *  18.2.2 Setting Cancelability State, P1003.1c/Draft 10, p. 183
- */
-
-int pthread_setcancelstate( 
-  int  state,
-  int *oldstate
-)
-{
-  POSIX_API_Thread_Support_Control  *thread_support;
-
-  if ( !oldstate )
-    return EINVAL;
-
-  if ( state != PTHREAD_CANCEL_ENABLE && state != PTHREAD_CANCEL_DISABLE )
-    return EINVAL;
-
-  thread_support = _Thread_Executing->API_Extensions[ THREAD_API_POSIX ];
- 
-  *oldstate = thread_support->cancelability_state;
-  thread_support->cancelability_state = state;
- 
-  if ( thread_support->cancelability_state == PTHREAD_CANCEL_ENABLE && 
-       thread_support->cancelability_type == PTHREAD_CANCEL_ASYNCHRONOUS &&
-       thread_support->cancelation_requested )
-    POSIX_Thread_cancel_run( _Thread_Executing );
- 
-  return 0;
-}
-
-/*PAGE
- *
- *  18.2.2 Setting Cancelability State, P1003.1c/Draft 10, p. 183
- */
-
-int pthread_setcanceltype(
-  int  type,
-  int *oldtype
-)
-{
-  POSIX_API_Thread_Support_Control  *thread_support;
- 
-  if ( !oldtype )
-    return EINVAL;
- 
-  if ( type != PTHREAD_CANCEL_DEFERRED && type != PTHREAD_CANCEL_ASYNCHRONOUS )
-    return EINVAL;
- 
-  thread_support = _Thread_Executing->API_Extensions[ THREAD_API_POSIX ];
-
-  *oldtype = thread_support->cancelability_type;
-  thread_support->cancelability_type = type;
-
-  if ( thread_support->cancelability_state == PTHREAD_CANCEL_ENABLE && 
-       thread_support->cancelability_type == PTHREAD_CANCEL_ASYNCHRONOUS &&
-       thread_support->cancelation_requested )
-    POSIX_Thread_cancel_run( _Thread_Executing );
-
-  return 0;
-}
-
-/*PAGE
- *
- *  18.2.2 Setting Cancelability State, P1003.1c/Draft 10, p. 183
- */
-
-void pthread_testcancel( void )
-{
-  POSIX_API_Thread_Support_Control  *thread_support;
-
-  thread_support = _Thread_Executing->API_Extensions[ THREAD_API_POSIX ];
- 
-  if ( thread_support->cancelability_state == PTHREAD_CANCEL_ENABLE &&
-       thread_support->cancelation_requested )
-    POSIX_Thread_cancel_run( _Thread_Executing );
-}
-
-/*PAGE
- *
- *  18.2.3.1 Establishing Cancellation Handlers, P1003.1c/Draft 10, p. 184
- */
-
-void pthread_cleanup_push(
-  void   (*routine)( void * ),
-  void    *arg
-)
-{
-  POSIX_Cancel_Handler_control      *handler;
-  Chain_Control                     *handler_stack;
-  POSIX_API_Thread_Support_Control  *thread_support;
-  
-  if ( !routine )
-    return;          /* XXX what to do really? */ 
-
-  handler = _Workspace_Allocate( sizeof( POSIX_Cancel_Handler_control ) );
-
-  if ( !handler )
-    return;          /* XXX what to do really? */ 
-
-  thread_support = _Thread_Executing->API_Extensions[ THREAD_API_POSIX ];
-
-  handler_stack = &thread_support->Cancellation_Handlers;
-
-  handler->routine = routine;
-  handler->arg = arg;
-
-  _Chain_Append( handler_stack, &handler->Node );
-}
-
-/*PAGE
- *
- *  18.2.3.1 Establishing Cancellation Handlers, P1003.1c/Draft 10, p. 184
- */
-
-void pthread_cleanup_pop(
-  int    execute
-)
-{
-  POSIX_Cancel_Handler_control      *handler;
-  Chain_Control                     *handler_stack;
-  POSIX_API_Thread_Support_Control  *thread_support;
-  ISR_Level                          level;
- 
-  thread_support = _Thread_Executing->API_Extensions[ THREAD_API_POSIX ];
- 
-  handler_stack = &thread_support->Cancellation_Handlers;
-
-  if ( _Chain_Is_empty( handler_stack ) )
-    return;
- 
-  _ISR_Disable( level );
-    handler = (POSIX_Cancel_Handler_control *) _Chain_Tail( handler_stack );
-    _Chain_Extract_unprotected( &handler->Node );
-  _ISR_Enable( level );
-
-  if ( execute )
-    (*handler->routine)( handler->arg );
- 
-  _Workspace_Free( handler );
-}
diff --git a/cpukit/posix/src/cond.c b/cpukit/posix/src/cond.c
deleted file mode 100644
index 248f836b94..0000000000
--- a/cpukit/posix/src/cond.c
+++ /dev/null
@@ -1,502 +0,0 @@
-/*
- *  $Id$
- */
-
-#include <pthread.h>
-#include <errno.h>
-
-#include <rtems/system.h>
-#include <rtems/score/object.h>
-#include <rtems/score/states.h>
-#include <rtems/score/watchdog.h>
-#include <rtems/posix/cond.h>
-#include <rtems/posix/time.h>
-#include <rtems/posix/mutex.h>
-
-/*
- *  TEMPORARY
- */
-
-void _POSIX_Condition_variables_MP_Send_process_packet (
-  POSIX_Condition_variables_MP_Remote_operations  operation,
-  Objects_Id                        condition_variables_id,
-  Objects_Name                      name,
-  Objects_Id                        proxy_id
-)
-{
-  (void) POSIX_MP_NOT_IMPLEMENTED();
-}
-
-void _POSIX_Condition_variables_MP_Send_extract_proxy(
-  Thread_Control *the_thread
-)
-{
-  (void) POSIX_MP_NOT_IMPLEMENTED();
-}
-
-/*
- *  END OF TEMPORARY
- */
-
-/*PAGE
- *
- *  The default condition variable attributes structure.
- */
- 
-const pthread_condattr_t _POSIX_Condition_variables_Default_attributes = {
-  TRUE,                      /* is_initialized */
-  PTHREAD_PROCESS_PRIVATE    /* process_shared */
-};
- 
-/*PAGE
- *
- *  _POSIX_Condition_variables_Manager_initialization
- *
- *  This routine initializes all condition variable manager related data 
- *  structures.
- *
- *  Input parameters:
- *    maximum_condition_variables - maximum configured condition_variables
- *
- *  Output parameters:  NONE
- */
- 
-void _POSIX_Condition_variables_Manager_initialization(
-  unsigned32 maximum_condition_variables
-)
-{
-  _Objects_Initialize_information(
-    &_POSIX_Condition_variables_Information,
-    OBJECTS_POSIX_CONDITION_VARIABLES,
-    TRUE,
-    maximum_condition_variables,
-    sizeof( POSIX_Condition_variables_Control ),
-    FALSE,
-    0,
-    FALSE
-  );
-}
-
-/*PAGE
- *
- *  11.4.1 Condition Variable Initialization Attributes, 
- *            P1003.1c/Draft 10, p. 96
- */
- 
-int pthread_condattr_init(
-  pthread_condattr_t *attr
-)
-{
-  if ( !attr )
-    return EINVAL;
-
-  *attr = _POSIX_Condition_variables_Default_attributes;
-  return 0;
-}
- 
-/*PAGE
- *
- *  11.4.1 Condition Variable Initialization Attributes, 
- *            P1003.1c/Draft 10, p. 96
- */
- 
-int pthread_condattr_destroy(
-  pthread_condattr_t *attr
-)
-{
-  if ( !attr || attr->is_initialized == FALSE )
-    return EINVAL;
-
-  attr->is_initialized = FALSE;
-  return 0;
-}
- 
-/*PAGE
- *
- *  11.4.1 Condition Variable Initialization Attributes, 
- *            P1003.1c/Draft 10, p. 96
- */
- 
-int pthread_condattr_getpshared(
-  const pthread_condattr_t *attr,
-  int                      *pshared
-)
-{
-  if ( !attr )
-    return EINVAL;
-
-  *pshared = attr->process_shared;
-  return 0;
-}
- 
-/*PAGE
- *
- *  11.4.1 Condition Variable Initialization Attributes, 
- *            P1003.1c/Draft 10, p. 96
- */
- 
-int pthread_condattr_setpshared(
-  pthread_condattr_t *attr,
-  int                 pshared
-)
-{
-  if ( !attr )
-    return EINVAL;
-
-  switch ( pshared ) {
-    case PTHREAD_PROCESS_SHARED:
-    case PTHREAD_PROCESS_PRIVATE:
-      attr->process_shared = pshared;
-      return 0;
-
-    default:
-      return EINVAL;
-  }
-}
- 
-/*PAGE
- *
- *  11.4.2 Initializing and Destroying a Condition Variable, 
- *         P1003.1c/Draft 10, p. 87
- */
- 
-int pthread_cond_init(
-  pthread_cond_t           *cond,
-  const pthread_condattr_t *attr
-)
-{
-  POSIX_Condition_variables_Control   *the_cond;
-  const pthread_condattr_t            *the_attr;
- 
-  if ( attr ) the_attr = attr;
-  else        the_attr = &_POSIX_Condition_variables_Default_attributes;
- 
-  /*
-   *  XXX: Be careful about attributes when global!!!
-   */
- 
-  if ( the_attr->process_shared == PTHREAD_PROCESS_SHARED )
-    return POSIX_MP_NOT_IMPLEMENTED();
- 
-  if ( !the_attr->is_initialized )
-    return EINVAL;
- 
-  _Thread_Disable_dispatch();
- 
-  the_cond = _POSIX_Condition_variables_Allocate();
- 
-  if ( !the_cond ) {
-    _Thread_Enable_dispatch();
-    return ENOMEM;
-  }
- 
-  if ( the_attr->process_shared == PTHREAD_PROCESS_SHARED &&
-     !( _Objects_MP_Allocate_and_open( &_POSIX_Condition_variables_Information,
-                0, the_cond->Object.id, FALSE ) ) ) {
-    _POSIX_Condition_variables_Free( the_cond );
-    _Thread_Enable_dispatch();
-    return EAGAIN;
-  }
- 
-  the_cond->process_shared  = the_attr->process_shared;
-
-  the_cond->Mutex = POSIX_CONDITION_VARIABLES_NO_MUTEX;
-
-/* XXX some more initialization might need to go here */
-  _Thread_queue_Initialize(
-    &the_cond->Wait_queue,
-    OBJECTS_POSIX_CONDITION_VARIABLES,
-    THREAD_QUEUE_DISCIPLINE_FIFO,
-    STATES_WAITING_FOR_CONDITION_VARIABLE,
-    _POSIX_Condition_variables_MP_Send_extract_proxy,
-    ETIMEDOUT
-  );
-
-  _Objects_Open(
-    &_POSIX_Condition_variables_Information,
-    &the_cond->Object,
-    0
-  );
- 
-  *cond = the_cond->Object.id;
- 
-  if ( the_attr->process_shared == PTHREAD_PROCESS_SHARED )
-    _POSIX_Condition_variables_MP_Send_process_packet(
-      POSIX_CONDITION_VARIABLES_MP_ANNOUNCE_CREATE,
-      the_cond->Object.id,
-      0,                         /* Name not used */
-      0                          /* Not used */
-    );
- 
-  _Thread_Enable_dispatch();
-
-  return 0;
-}
- 
-/*PAGE
- *
- *  11.4.2 Initializing and Destroying a Condition Variable, 
- *         P1003.1c/Draft 10, p. 87
- */
- 
-int pthread_cond_destroy(
-  pthread_cond_t           *cond
-)
-{
-  register POSIX_Condition_variables_Control *the_cond;
-  Objects_Locations                           location;
- 
-  the_cond = _POSIX_Condition_variables_Get( cond, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-      return EINVAL;
-    case OBJECTS_REMOTE:
-      _Thread_Dispatch();
-      return POSIX_MP_NOT_IMPLEMENTED();
-      return EINVAL;
-    case OBJECTS_LOCAL:
- 
-      if ( _Thread_queue_First( &the_cond->Wait_queue ) ) {
-        _Thread_Enable_dispatch();
-        return EBUSY;
-      }
- 
-      _Objects_Close(
-        &_POSIX_Condition_variables_Information,
-        &the_cond->Object
-      );
- 
-      _POSIX_Condition_variables_Free( the_cond );
- 
-      if ( the_cond->process_shared == PTHREAD_PROCESS_SHARED ) {
- 
-        _Objects_MP_Close(
-          &_POSIX_Condition_variables_Information,
-          the_cond->Object.id
-        );
- 
-        _POSIX_Condition_variables_MP_Send_process_packet(
-          POSIX_CONDITION_VARIABLES_MP_ANNOUNCE_DELETE,
-          the_cond->Object.id,
-          0,                         /* Not used */
-          0                          /* Not used */
-        );
-      }
-      _Thread_Enable_dispatch();
-      return 0;
-  }
-  return POSIX_BOTTOM_REACHED();
-}
- 
-/*PAGE
- *
- *  _POSIX_Condition_variables_Signal_support
- *
- *  A support routine which implements guts of the broadcast and single task
- *  wake up version of the "signal" operation.
- */
- 
-int _POSIX_Condition_variables_Signal_support(
-  pthread_cond_t            *cond,
-  boolean                    is_broadcast
-)
-{
-  register POSIX_Condition_variables_Control *the_cond;
-  Objects_Locations                           location;
-  Thread_Control                             *the_thread;
- 
-  the_cond = _POSIX_Condition_variables_Get( cond, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-      return EINVAL;
-    case OBJECTS_REMOTE:
-      _Thread_Dispatch();
-      return POSIX_MP_NOT_IMPLEMENTED();
-      return EINVAL;
-    case OBJECTS_LOCAL:
- 
-      do { 
-        the_thread = _Thread_queue_Dequeue( &the_cond->Wait_queue );
-        if ( !the_thread )
-          the_cond->Mutex = POSIX_CONDITION_VARIABLES_NO_MUTEX;
-      } while ( is_broadcast && the_thread );
-
-      _Thread_Enable_dispatch();
-
-      return 0;
-  }
-  return POSIX_BOTTOM_REACHED();
-}
-
-/*PAGE
- *
- *  11.4.3 Broadcasting and Signaling a Condition, P1003.1c/Draft 10, p. 101
- */
- 
-int pthread_cond_signal(
-  pthread_cond_t   *cond
-)
-{
-  return _POSIX_Condition_variables_Signal_support( cond, FALSE );
-}
- 
-/*PAGE
- *
- *  11.4.3 Broadcasting and Signaling a Condition, P1003.1c/Draft 10, p. 101
- */
- 
-int pthread_cond_broadcast(
-  pthread_cond_t   *cond
-)
-{
-  return _POSIX_Condition_variables_Signal_support( cond, TRUE );
-}
- 
-/*PAGE
- *
- *  _POSIX_Condition_variables_Wait_support
- *
- *  A support routine which implements guts of the blocking, non-blocking, and
- *  timed wait version of condition variable wait routines.
- */
- 
-int _POSIX_Condition_variables_Wait_support(
-  pthread_cond_t            *cond,
-  pthread_mutex_t           *mutex,
-  Watchdog_Interval          timeout,
-  boolean                    already_timedout
-)
-{
-  register POSIX_Condition_variables_Control *the_cond;
-  Objects_Locations                           location;
-  int                                         status;
-  int                                         mutex_status;
- 
-  if ( !_POSIX_Mutex_Get( mutex, &location ) ) {
-     return EINVAL;
-  }
-
-  _Thread_Unnest_dispatch();
-
-  the_cond = _POSIX_Condition_variables_Get( cond, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-      return EINVAL;
-    case OBJECTS_REMOTE:
-      _Thread_Dispatch();
-      return POSIX_MP_NOT_IMPLEMENTED();
-      return EINVAL;
-    case OBJECTS_LOCAL:
- 
-      if ( the_cond->Mutex && ( the_cond->Mutex != *mutex ) ) {
-        _Thread_Enable_dispatch();
-        return EINVAL;
-      }
- 
-      (void) pthread_mutex_unlock( mutex );
-/* XXX ignore this for now  since behavior is undefined
-      if ( mutex_status ) {
-        _Thread_Enable_dispatch();
-        return EINVAL;
-      }
-*/
-
-      if ( !already_timedout ) {
-        the_cond->Mutex = *mutex;
- 
-        _Thread_queue_Enter_critical_section( &the_cond->Wait_queue );
-        _Thread_Executing->Wait.return_code = 0;
-        _Thread_Executing->Wait.queue       = &the_cond->Wait_queue;
-        _Thread_Executing->Wait.id          = *cond;
-
-        _Thread_queue_Enqueue( &the_cond->Wait_queue, timeout );
-
-        _Thread_Enable_dispatch();
-
-        /*
-         *  Switch ourself out because we blocked as a result of the 
-         *  _Thread_queue_Enqueue.
-         */
-
-        status = _Thread_Executing->Wait.return_code;
-        if ( status && status != ETIMEDOUT )
-          return status;
-
-      } else {
-        _Thread_Enable_dispatch();
-        status = ETIMEDOUT;
-      }
-
-      /*
-       *  When we get here the dispatch disable level is 0.
-       */
-
-      mutex_status = pthread_mutex_lock( mutex );
-      if ( mutex_status )
-        return EINVAL;
-    
-      return status;
-  }
-  return POSIX_BOTTOM_REACHED();
-}
-
-/*PAGE
- *
- *  11.4.4 Waiting on a Condition, P1003.1c/Draft 10, p. 105
- */
- 
-int pthread_cond_wait(
-  pthread_cond_t     *cond,
-  pthread_mutex_t    *mutex
-)
-{
-  return _POSIX_Condition_variables_Wait_support(
-    cond,
-    mutex,
-    THREAD_QUEUE_WAIT_FOREVER,
-    FALSE
-  );
-}
- 
-/*PAGE
- *
- *  11.4.4 Waiting on a Condition, P1003.1c/Draft 10, p. 105
- */
- 
-int pthread_cond_timedwait(
-  pthread_cond_t        *cond,
-  pthread_mutex_t       *mutex,
-  const struct timespec *abstime
-)
-{
-  Watchdog_Interval timeout;
-  struct timespec   current_time;
-  struct timespec   difference;
-  boolean           already_timedout = FALSE;
-
-  if ( !abstime )
-    return EINVAL;
-
-  /*
-   *  The abstime is a walltime.  We turn it into an interval.
-   */
-
-  (void) clock_gettime( CLOCK_REALTIME, &current_time );
-
-  /* XXX probably some error checking should go here */
-
-  _POSIX_Timespec_subtract( &current_time, abstime, &difference );
-
-  if ( ( difference.tv_sec < 0 ) || ( ( difference.tv_sec == 0 ) &&
-       ( difference.tv_nsec < 0 ) ) )
-    already_timedout = TRUE;   
-
-  timeout = _POSIX_Timespec_to_interval( &difference );
-
-  return _POSIX_Condition_variables_Wait_support(
-    cond,
-    mutex,
-    timeout,
-    already_timedout
-  );
-}
diff --git a/cpukit/posix/src/devctl.c b/cpukit/posix/src/devctl.c
deleted file mode 100644
index 699bc2d228..0000000000
--- a/cpukit/posix/src/devctl.c
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- *  $Id$
- */
-
-#include <devctl.h>
-
-#include <rtems/system.h>
-
-/*PAGE
- *
- *  21.2.1 Control a Device, P1003.4b/D8, p. 65
- */
-
-int devctl(
-  int     filedes,
-  void   *dev_data_ptr,
-  size_t  nbyte,
-  int    *dev_info_ptr
-)
-{
-  return POSIX_NOT_IMPLEMENTED();
-}
diff --git a/cpukit/posix/src/execl.c b/cpukit/posix/src/execl.c
deleted file mode 100644
index af26b539d5..0000000000
--- a/cpukit/posix/src/execl.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* 
- *  execl() - POSIX 1003.1b 3.1.2
- *
- *  $Id$
- */
-
-#include <errno.h>
-
-int execl(
-  const char *path,
-  const char *arg,
-  ...
-)
-{
-  errno = ENOSYS;
-  return -1;
-}
diff --git a/cpukit/posix/src/execle.c b/cpukit/posix/src/execle.c
deleted file mode 100644
index 94b0ede939..0000000000
--- a/cpukit/posix/src/execle.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* 
- *  execle() - POSIX 1003.1b 3.1.2
- *
- *  $Id$
- */
-
-#include <errno.h>
-
-int execle(
-  const char *path,
-  char const *arg,
-  ...
-)
-{
-  errno = ENOSYS;
-  return -1;
-}
diff --git a/cpukit/posix/src/execlp.c b/cpukit/posix/src/execlp.c
deleted file mode 100644
index 83b6ceba33..0000000000
--- a/cpukit/posix/src/execlp.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* 
- *  execlp() - POSIX 1003.1b 3.1.2
- *
- *  $Id$
- */
-
-#include <errno.h>
-
-int execlp(
-  const char *file,
-  const char *arg,
-  ...
-)
-{
-  errno = ENOSYS;
-  return -1;
-}
diff --git a/cpukit/posix/src/execv.c b/cpukit/posix/src/execv.c
deleted file mode 100644
index d05f4a2c58..0000000000
--- a/cpukit/posix/src/execv.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* 
- *  execv() - POSIX 1003.1b 3.1.2
- *
- *  $Id$
- */
-
-#include <errno.h>
-
-int execv(
-  const char *file,
-  char *const argv[],
-  ...
-)
-{
-  errno = ENOSYS;
-  return -1;
-}
diff --git a/cpukit/posix/src/execve.c b/cpukit/posix/src/execve.c
deleted file mode 100644
index 478af706ea..0000000000
--- a/cpukit/posix/src/execve.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* 
- *  execve() - POSIX 1003.1b 3.1.2
- *
- *  $Id$
- */
-
-#include <errno.h>
-
-int execve(
-  const char *path,
-  char *const argv[],
-  char *const envp[],
-  ...
-)
-{
-  errno = ENOSYS;
-  return -1;
-}
diff --git a/cpukit/posix/src/execvp.c b/cpukit/posix/src/execvp.c
deleted file mode 100644
index a9d7694fbd..0000000000
--- a/cpukit/posix/src/execvp.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* 
- *  execvp() - POSIX 1003.1b 3.1.2
- *
- *  $Id$
- */
-
-#include <errno.h>
-
-int execvp(
-  const char *path,
-  char const *argv[]
-)
-{
-  errno = ENOSYS;
-  return -1;
-}
diff --git a/cpukit/posix/src/fork.c b/cpukit/posix/src/fork.c
deleted file mode 100644
index 11cac91bdb..0000000000
--- a/cpukit/posix/src/fork.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* 
- *  fork() - POSIX 1003.1b 3.1.1
- *
- *  $Id$
- */
-
-#include <sys/types.h>
-#include <errno.h>
-
-int fork( void )
-{
-  errno = ENOSYS;
-  return -1;
-}
diff --git a/cpukit/posix/src/getpid.c b/cpukit/posix/src/getpid.c
deleted file mode 100644
index b42981398a..0000000000
--- a/cpukit/posix/src/getpid.c
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- *  $Id$
- */
-
-#include <limits.h>
-#include <errno.h>
-#include <string.h>
-#include <sys/types.h>
-
-#include <rtems/system.h>
-#include <rtems/score/object.h>
-#include <rtems/posix/seterr.h>
-
-/*PAGE
- *
- *  4.1.1 Get Process and Parent Process IDs, P1003.1b-1993, p. 83
- */
-
-pid_t getpid( void )
-{
-  return _Objects_Local_node;
-}
diff --git a/cpukit/posix/src/intr.c b/cpukit/posix/src/intr.c
deleted file mode 100644
index 5d41a5fe52..0000000000
--- a/cpukit/posix/src/intr.c
+++ /dev/null
@@ -1,340 +0,0 @@
-/*
- *  NOTE: Each task has an interrupt semaphore associated with it.
- *        No matter which interrupt occurs that it has registered, 
- *        the same semaphore is used.
- *
- *  This whole interrupt scheme may have been eliminated in a later draft.
- *
- *  $Id$
- */
-
-#include <errno.h>
-#include <intr.h>
-#include <pthread.h>
-
-#include <rtems/system.h>
-#include <rtems/score/isr.h>
-#include <rtems/score/coresem.h>
-#include <rtems/score/thread.h>
-#include <rtems/score/watchdog.h>
-#include <rtems/posix/intr.h>
-#include <rtems/posix/time.h>
-#include <rtems/posix/threadsup.h>
-
-/*
- *  _POSIX_Interrupt_Manager_initialization
- *
- *  DESCRIPTION:
- *
- *  This routine performs the initialization necessary for this manager.
- */
- 
-void _POSIX_Interrupt_Manager_initialization( 
-  unsigned32  maximum_interrupt_handlers
-)
-{
-  unsigned32                index;
-  POSIX_Interrupt_Control  *the_vector;
-
-  _Objects_Initialize_information(
-    &_POSIX_Interrupt_Handlers_Information,
-    OBJECTS_POSIX_INTERRUPTS,
-    FALSE,
-    maximum_interrupt_handlers,
-    sizeof( POSIX_Interrupt_Handler_control ),
-    FALSE,
-    0,
-    FALSE
-  );
-
-  for ( index=0 ; index < CPU_INTERRUPT_NUMBER_OF_VECTORS ; index++ ) {
-    the_vector = &_POSIX_Interrupt_Information[ index ];
-    
-    the_vector->number_installed = 0;
-    the_vector->lock_count       = 0;
-    the_vector->deferred_count   = 0;
-    _Chain_Initialize_empty( &the_vector->Handlers );
-  }
-}
-
-/*PAGE
- *
- *  22.3.1 Associate a User-Written ISR with an Interrupt, P1003.4b/D8, p. 74
- */
-
-int intr_capture(
-  intr_t          intr,
-  int           (*intr_handler)( void *area ),
-  volatile void   *area,
-  size_t           areasize
-)
-{
-  POSIX_Interrupt_Handler_control   *the_intr;
-  POSIX_Interrupt_Control           *the_vector;
-  POSIX_API_Thread_Support_Control  *thread_support;
-  proc_ptr                           old_handler;
-
-  if ( !_ISR_Is_vector_number_valid( intr ) || 
-       !_ISR_Is_valid_user_handler( intr_handler ) )
-    return EINVAL;
-
-  _Thread_Disable_dispatch();
-
-  the_intr = _POSIX_Interrupt_Allocate();
- 
-  if ( !the_intr ) {
-    _Thread_Enable_dispatch();
-    return ENOMEM;
-  }
-
-  the_vector = &_POSIX_Interrupt_Information[ intr ];
-
-  the_intr->vector         = intr;
-  the_intr->handler        = intr_handler;
-  the_intr->user_data_area = area;
-  the_intr->server         = _Thread_Executing;
-  the_intr->is_active      = TRUE;
-
-  thread_support = _Thread_Executing->API_Extensions[ THREAD_API_POSIX ];
-  thread_support->interrupts_installed++;
-
-/* XXX should we malloc the semaphore on the fly???  if so we probably need to
-   release it when the thread has released all interrupts and keep
-   a count of how many it has installed.  CURRENTLY NO.. ALLOCATED w/TCB
-*/
-
-  /*
-   *  This is sufficient to have the handlers invoked in the opposite
-   *  order of installation.  The loop invoking them can then go from
-   *  the front of the list to the end.
-   */
-
-  _Chain_Prepend( &the_vector->Handlers, &the_intr->Object.Node );
-
-  if ( !the_vector->number_installed++ )
-    _ISR_Install_vector(
-      intr,
-      (proc_ptr) _POSIX_Interrupt_Handler, 
-      &old_handler
-    );
-
-  _Objects_Open( &_POSIX_Interrupt_Handlers_Information, &the_intr->Object, 0 );
- 
-  /*
-   *  Normally, an Id would be returned here.
-   */
- 
-  _Thread_Enable_dispatch();
- 
-  return 0;
-}
-
-/*PAGE
- *
- *  22.3.1 Associate a User-Written ISR with an Interrupt, P1003.4b/D8, p. 74
- */
-
-int intr_release(
-  intr_t    intr,
-  int     (*intr_handler)( void *area )
-)
-{
-  boolean                            found;
-  POSIX_Interrupt_Handler_control   *the_intr;
-  POSIX_Interrupt_Control           *the_vector;
-  POSIX_API_Thread_Support_Control  *thread_support;
-  Chain_Node                        *the_node;
-
-  if ( !_ISR_Is_valid_user_handler( intr_handler ) )
-    return EINVAL;
-
-  _Thread_Disable_dispatch();
-
-  /*
-   *  Since interrupt handlers do not have a user visible id, there is
-   *  no choice but to search the entire set of active interrupt handlers
-   *  to find this one.
-   */
-
-  found = FALSE;
-
-  the_vector = &_POSIX_Interrupt_Information[ intr ];
-
-  the_node = _Chain_Head( &the_vector->Handlers );
-
-  for ( ; !_Chain_Is_tail( &the_vector->Handlers, the_node ) ; ) {
-    the_intr = (POSIX_Interrupt_Handler_control *) the_node;
-
-    if ( the_intr->handler == intr_handler ) {
-       found = TRUE;
-       break;
-    }
-    the_node = the_node->next;
-  }
-
-  if ( !found ) {
-    _Thread_Enable_dispatch();
-    return EINVAL;
-  }
-
-  if ( !_Thread_Is_executing( the_intr->server ) ) {
-    _Thread_Enable_dispatch();
-    return EINVAL;  /* XXX should be ENOISR; */
-  }
-    
-  /*
-   *  OK now we have found the interrupt handler and can do some work.
-   */
-
-  _Chain_Extract( &the_intr->Object.Node );
-
-  the_intr->is_active = FALSE;
- 
-  the_vector->number_installed -= 1;
-
-  thread_support = _Thread_Executing->API_Extensions[ THREAD_API_POSIX ];
-  thread_support->interrupts_installed--;
-
-  /*
-   *  It is unnecessary to flush the semaphore since the handler can only
-   *  be "removed" by the thread which installed it.  Thus it cannot be
-   *  blocked on the semaphore or it would not be executing this routine.
-   */
-
-  _Objects_Close( &_POSIX_Interrupt_Handlers_Information, &the_intr->Object );
-
-  _POSIX_Interrupt_Free( the_intr );
- 
-  _Thread_Enable_dispatch();
-
-  return 0;
-}
-
-/*PAGE
- *
- *  22.3.1 Associate a User-Written ISR with an Interrupt, P1003.4b/D8, p. 74
- */
-
-int intr_lock(
-  intr_t  intr
-)
-{
-  POSIX_Interrupt_Control           *the_vector;
-
-  _Thread_Disable_dispatch();
-
-  the_vector = &_POSIX_Interrupt_Information[ intr ];
-
-  the_vector->lock_count++;
-
-  _Thread_Enable_dispatch();
-
-  return 0;
-}
-  
-/*PAGE
- *
- *  22.3.1 Associate a User-Written ISR with an Interrupt, P1003.4b/D8, p. 74
- */
-
-int intr_unlock(
-  intr_t  intr
-)
-{
-  POSIX_Interrupt_Control           *the_vector;
- 
-  _Thread_Disable_dispatch();
- 
-  the_vector = &_POSIX_Interrupt_Information[ intr ];
- 
-  if ( !--the_vector->lock_count ) {
-    while ( --the_vector->deferred_count ) {
-      _POSIX_Interrupt_Handler( intr );
-    }
-  }
- 
-  _Thread_Enable_dispatch();
- 
-  return 0;
-}
-  
-/*
- *  22.3.2 Await Interrupt Notification, P1003.4b/D8, p. 76
- */
-
-int intr_timed_wait(
-  int                     flags,
-  const struct timespec  *timeout
-)
-{
-  Watchdog_Interval                  ticks;
-  POSIX_API_Thread_Support_Control  *thread_support;
-
-  ticks = _POSIX_Timespec_to_interval( timeout );
-
-  thread_support = _Thread_Executing->API_Extensions[ THREAD_API_POSIX ];
-
-  _Thread_Disable_dispatch();
-
-    _CORE_semaphore_Seize(
-      &thread_support->Interrupt_Semaphore,
-      0,             /* XXX does id=0 hurt in this case? */
-      TRUE,
-      ticks
-    ); 
-  _Thread_Enable_dispatch();
-
-  return _Thread_Executing->Wait.return_code;  /* XXX should be POSIX */
-}
-
-/*PAGE
- *
- *  _POSIX_Interrupt_Handler 
- *
- */
-
-void _POSIX_Interrupt_Handler(
-  ISR_Vector_number   vector
-)
-{
-  POSIX_Interrupt_Handler_control   *the_intr;
-  POSIX_Interrupt_Control           *the_vector;
-  POSIX_API_Thread_Support_Control  *thread_support;
-  Chain_Node                        *the_node;
-  int                                status;
- 
-  the_vector = &_POSIX_Interrupt_Information[ vector ];
- 
-  the_node = _Chain_Head( &the_vector->Handlers );
- 
-  for ( ; !_Chain_Is_tail( &the_vector->Handlers, the_node ) ; ) {
-    the_intr = (POSIX_Interrupt_Handler_control *) the_node;
- 
-    status = (*the_intr->handler)( (void *) the_intr->user_data_area );
-
-    switch ( status ) {
-      case INTR_HANDLED_NOTIFY:
-        thread_support = _Thread_Executing->API_Extensions[ THREAD_API_POSIX ];
-
-        _CORE_semaphore_Surrender(
-          &thread_support->Interrupt_Semaphore,
-          0,                         /* XXX is id=0 a problem */
-          0                          /* XXX is this a problem (mp support)*/
-        );
-        return;
-
-      case INTR_HANDLED_DO_NOT_NOTIFY:
-        return;
-
-      case INTR_NOT_HANDLED:
-      default:                            /* this should not happen */
-        break;
-    }
-    the_node = the_node->next;
-  }
-
-  /* XXX
-   *
-   *  This is an unhandled interrupt!!!
-   */
-}
diff --git a/cpukit/posix/src/key.c b/cpukit/posix/src/key.c
deleted file mode 100644
index 1203343f66..0000000000
--- a/cpukit/posix/src/key.c
+++ /dev/null
@@ -1,262 +0,0 @@
-/*
- *  $Id$
- */
-
-#include <errno.h>
-#include <limits.h>
-#include <pthread.h>
-#include <string.h>
-
-#include <rtems/system.h>
-#include <rtems/score/thread.h>
-#include <rtems/score/wkspace.h>
-#include <rtems/posix/key.h>
-
-/*
- *  _POSIX_Key_Manager_initialization
- *
- *  DESCRIPTION:
- *
- *  This routine performs the initialization necessary for this manager.
- */
- 
-void _POSIX_Key_Manager_initialization(
-  unsigned32 maximum_keys
-)
-{
-  _Objects_Initialize_information(
-    &_POSIX_Keys_Information,
-    OBJECTS_POSIX_KEYS,
-    FALSE,
-    maximum_keys,
-    sizeof( POSIX_Keys_Control ),
-    FALSE,
-    0,
-    FALSE
-  );
-}
- 
-/*PAGE
- *
- *  17.1.1 Thread-Specific Data Key Create, P1003.1c/Draft 10, p. 163
- */
-
-int pthread_key_create(
-  pthread_key_t  *key,
-  void          (*destructor)( void * )
-)
-{
-  POSIX_Keys_Control  *the_key;
-  void                *table;
-  unsigned32           the_class;
-  unsigned32           bytes_to_allocate;
-
-
-  _Thread_Disable_dispatch();
- 
-  the_key = _POSIX_Keys_Allocate();
- 
-  if ( !the_key ) {
-    _Thread_Enable_dispatch();
-    return EAGAIN;
-  }
-
-  the_key->destructor = destructor;
-
-  for ( the_class = OBJECTS_CLASSES_FIRST_THREAD_CLASS;
-        the_class <= OBJECTS_CLASSES_LAST_THREAD_CLASS;
-        the_class++ ) {
-
-    bytes_to_allocate =
-      (_Objects_Information_table[ the_class ]->maximum + 1) * sizeof( void * );
-
-    table = _Workspace_Allocate( bytes_to_allocate );
-
-    if ( !table ) {
-      for ( --the_class;
-            the_class >= OBJECTS_CLASSES_FIRST_THREAD_CLASS;
-            the_class-- )
-        _Workspace_Free( the_key->Values[ the_class ] );
-
-      _POSIX_Keys_Free( the_key );
-      _Thread_Enable_dispatch();
-      return ENOMEM;
-    }
-
-    the_key->Values[ the_class ] = table;
-    memset( table, '\0', bytes_to_allocate ); 
-  }
-
-  the_key->is_active = TRUE;
-
-  _Objects_Open( &_POSIX_Keys_Information, &the_key->Object, 0 );
- 
-  *key = the_key->Object.id;
-
-  _Thread_Enable_dispatch();
-
-  return 0;
-}
-
-/*PAGE
- *
- *  17.1.2 Thread-Specific Data Management, P1003.1c/Draft 10, p. 165
- */
-
-int pthread_setspecific(
-  pthread_key_t  key,
-  const void    *value
-)
-{
-  register POSIX_Keys_Control *the_key;
-  unsigned32                   index;
-  unsigned32                   class;
-  Objects_Locations            location;
- 
-  the_key = _POSIX_Keys_Get( key, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-    case OBJECTS_REMOTE:   /* should never happen */
-      return EINVAL;
-    case OBJECTS_LOCAL:
-      index = _Objects_Get_index( _Thread_Executing->Object.id );
-      class = _Objects_Get_class( _Thread_Executing->Object.id );
-      the_key->Values[ class ][ index ] = (void *) value;
-      _Thread_Enable_dispatch();
-      return 0;
-  }
-  return POSIX_BOTTOM_REACHED();
-}
-
-/*PAGE
- *
- *  17.1.2 Thread-Specific Data Management, P1003.1c/Draft 10, p. 165
- */
-
-void *pthread_getspecific(
-  pthread_key_t  key
-)
-{
-  register POSIX_Keys_Control *the_key;
-  unsigned32                   index;
-  unsigned32                   class;
-  Objects_Locations            location;
-  void                        *key_data;
- 
-  the_key = _POSIX_Keys_Get( key, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-    case OBJECTS_REMOTE:   /* should never happen */
-      return NULL;
-    case OBJECTS_LOCAL:
-      index = _Objects_Get_index( _Thread_Executing->Object.id );
-      class = _Objects_Get_class( _Thread_Executing->Object.id );
-      key_data = (void *) the_key->Values[ class ][ index ];
-      _Thread_Enable_dispatch();
-      return key_data;
-  }
-  return (void *) POSIX_BOTTOM_REACHED();
-}
-
-/*PAGE
- *
- *  17.1.3 Thread-Specific Data Key Deletion, P1003.1c/Draft 10, p. 167
- */
-
-int pthread_key_delete(
-  pthread_key_t  key
-)
-{
-  register POSIX_Keys_Control *the_key;
-  Objects_Locations            location;
-  unsigned32                   the_class;
- 
-  the_key = _POSIX_Keys_Get( key, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-    case OBJECTS_REMOTE:   /* should never happen */
-      return EINVAL;
-    case OBJECTS_LOCAL:
-      _Objects_Close( &_POSIX_Keys_Information, &the_key->Object );
-
-      the_key->is_active = FALSE;
-
-      for ( the_class = OBJECTS_CLASSES_FIRST_THREAD_CLASS;
-            the_class <= OBJECTS_CLASSES_LAST_THREAD_CLASS;
-            the_class++ )
-        _Workspace_Free( the_key->Values[ the_class ] );
-
-      /*
-       *  NOTE:  The destructor is not called and it is the responsibility
-       *         of the application to free the memory.
-       */
-
-      _POSIX_Keys_Free( the_key );
-      _Thread_Enable_dispatch();
-      return 0;
-  }
-  return POSIX_BOTTOM_REACHED();
-}
-
-/*PAGE
- *
- *  _POSIX_Keys_Run_destructors
- *
- *  17.1.1 Thread-Specific Data Key Create, P1003.1c/Draft 10, p. 163
- *
- *  NOTE:  This is the routine executed when a thread exits to
- *         run through all the keys and do the destructor action.
- */
-
-void _POSIX_Keys_Run_destructors(
-  Thread_Control *thread
-)
-{
-  unsigned32           index;
-  unsigned32           pthread_index;
-  unsigned32           pthread_class;
-  unsigned32           iterations;
-  boolean              are_all_null;
-  POSIX_Keys_Control  *the_key;
-  void                *value;
-
-  pthread_index = _Objects_Get_index( thread->Object.id );
-  pthread_class = _Objects_Get_class( thread->Object.id );
-
-  iterations = 0;
-
-  for ( ; ; ) {
-
-    are_all_null = TRUE;
-
-    for ( index=1 ; index <= _POSIX_Keys_Information.maximum ; index++ ) {
-
-      the_key = (POSIX_Keys_Control *) 
-        _POSIX_Keys_Information.local_table[ index ];
-      
-      if ( the_key && the_key->is_active && the_key->destructor ) {
-        value = the_key->Values[ pthread_class ][ pthread_index ];
-        if ( value ) {
-          (*the_key->destructor)( value );
-          if ( the_key->Values[ pthread_class ][ pthread_index ] )
-            are_all_null = FALSE;
-        }
-      }
-    }
-
-    if ( are_all_null == TRUE ) 
-      return;
-
-    iterations++;
-
-    /*
-     *  The standard allows one to not do this and thus go into an infinite
-     *  loop.  It seems rude to unnecessarily lock up a system.
-     *
-     *  Reference: 17.1.1.2 P1003.1c/Draft 10, p. 163, line 99.
-     */
-
-    if ( iterations >= PTHREAD_DESTRUCTOR_ITERATIONS )
-      return; 
-  }
-}
diff --git a/cpukit/posix/src/mqueue.c b/cpukit/posix/src/mqueue.c
deleted file mode 100644
index 82da4ee706..0000000000
--- a/cpukit/posix/src/mqueue.c
+++ /dev/null
@@ -1,710 +0,0 @@
-/*
- *  NOTE:  The structure of the routines is identical to that of POSIX
- *         Message_queues to leave the option of having unnamed message
- *         queues at a future date.  They are currently not part of the
- *         POSIX standard but unnamed message_queues are.  This is also 
- *         the reason for the apparently unnecessary tracking of 
- *         the process_shared attribute.  [In addition to the fact that
- *         it would be trivial to add pshared to the mq_attr structure
- *         and have process private message queues.]
- *
- *         This code ignores the O_RDONLY/O_WRONLY/O_RDWR flag at open
- *         time.
- *
- *  $Id$
- */
-
-#include <stdarg.h>
-
-#include <pthread.h>
-#include <limits.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <mqueue.h>
-
-#include <rtems/system.h>
-#include <rtems/score/watchdog.h>
-#include <rtems/posix/seterr.h>
-#include <rtems/posix/mqueue.h>
-#include <rtems/posix/time.h>
-
-/*PAGE
- *
- *  _POSIX_Message_queue_Manager_initialization
- *
- *  This routine initializes all message_queue manager related data structures.
- *
- *  Input parameters:
- *    maximum_message_queues - maximum configured message_queues
- *
- *  Output parameters:  NONE
- */
- 
-void _POSIX_Message_queue_Manager_initialization(
-  unsigned32 maximum_message_queues
-)
-{
-  _Objects_Initialize_information(
-    &_POSIX_Message_queue_Information,
-    OBJECTS_POSIX_MESSAGE_QUEUES,
-    TRUE,
-    maximum_message_queues,
-    sizeof( POSIX_Message_queue_Control ),
-    TRUE,
-    _POSIX_PATH_MAX,
-    FALSE
-  );
-}
-
-/*PAGE
- *
- *  _POSIX_Message_queue_Create_support
- */
- 
-int _POSIX_Message_queue_Create_support(
-  const char                    *name,
-  int                            pshared,
-  unsigned int                   oflag,
-  struct mq_attr                *attr,
-  POSIX_Message_queue_Control  **message_queue
-)
-{
-  POSIX_Message_queue_Control   *the_mq;
- 
-  _Thread_Disable_dispatch();
- 
-  the_mq = _POSIX_Message_queue_Allocate();
- 
-  if ( !the_mq ) {
-    _Thread_Enable_dispatch();
-    set_errno_and_return_minus_one( ENFILE );
-  }
- 
-  if ( pshared == PTHREAD_PROCESS_SHARED &&
-       !( _Objects_MP_Allocate_and_open( &_POSIX_Message_queue_Information, 0,
-                            the_mq->Object.id, FALSE ) ) ) {
-    _POSIX_Message_queue_Free( the_mq );
-    _Thread_Enable_dispatch();
-    set_errno_and_return_minus_one( ENFILE );
-  }
- 
-  the_mq->process_shared  = pshared;
- 
-  if ( name ) {
-    the_mq->named = TRUE;
-    the_mq->open_count = 1;
-    the_mq->linked = TRUE;
-  }
-  else
-    the_mq->named = FALSE;
- 
-  if ( oflag & O_NONBLOCK ) 
-    the_mq->blocking = FALSE;
-  else
-    the_mq->blocking = TRUE;
- 
-  /* XXX
-   *
-   *  Note that this should be based on the current scheduling policy.
-   */
-
-  /* XXX
-   *
-   *  Message and waiting disciplines are not distinguished.
-   */
-/*
-  the_mq_attr->message_discipline = CORE_MESSAGE_QUEUE_DISCIPLINES_FIFO;
-  the_mq_attr->waiting_discipline = CORE_MESSAGE_QUEUE_DISCIPLINES_FIFO;
- */
-
-  the_mq->Message_queue.Attributes.discipline =
-                                         CORE_MESSAGE_QUEUE_DISCIPLINES_FIFO;
- 
-  if ( ! _CORE_message_queue_Initialize(
-           &the_mq->Message_queue,
-           OBJECTS_POSIX_MESSAGE_QUEUES,
-           &the_mq->Message_queue.Attributes,
-           attr->mq_maxmsg,
-           attr->mq_msgsize,
-           _POSIX_Message_queue_MP_Send_extract_proxy ) ) {
-
-    if ( pshared == PTHREAD_PROCESS_SHARED )
-      _Objects_MP_Close( &_POSIX_Message_queue_Information, the_mq->Object.id );
- 
-    _POSIX_Message_queue_Free( the_mq );
-    _Thread_Enable_dispatch();
-    set_errno_and_return_minus_one( ENOSPC );
-  }
-
- 
-  /* XXX - need Names to be a string!!! */
-  _Objects_Open(
-    &_POSIX_Message_queue_Information,
-    &the_mq->Object,
-    (char *) name
-  );
- 
-  *message_queue = the_mq;
- 
-  if ( pshared == PTHREAD_PROCESS_SHARED )
-    _POSIX_Message_queue_MP_Send_process_packet(
-      POSIX_MESSAGE_QUEUE_MP_ANNOUNCE_CREATE,
-      the_mq->Object.id,
-      (char *) name,
-      0                          /* Not used */
-    );
- 
-  _Thread_Enable_dispatch();
-  return 0;
-}
-
-/*PAGE
- *
- *  15.2.2 Open a Message Queue, P1003.1b-1993, p. 272
- */
-
-mqd_t mq_open(
-  const char *name,
-  int         oflag,
-  ...
-  /* mode_t mode, */
-  /* struct mq_attr  attr */
-)
-{
-  va_list arg;
-  mode_t mode;
-  struct mq_attr *attr;
-  int                        status;
-  Objects_Id                 the_mq_id;
-  POSIX_Message_queue_Control   *the_mq;
- 
-  if ( oflag & O_CREAT ) {
-    va_start(arg, oflag);
-    mode = (mode_t) va_arg( arg, mode_t * );
-    attr = (struct mq_attr *) va_arg( arg, struct mq_attr ** );
-    va_end(arg);
-  }
- 
-  status = _POSIX_Message_queue_Name_to_id( name, &the_mq_id );
- 
-  /*
-   *  If the name to id translation worked, then the message queue exists
-   *  and we can just return a pointer to the id.  Otherwise we may
-   *  need to check to see if this is a "message queue does not exist"
-   *  or some other miscellaneous error on the name.
-   */
- 
-  if ( status ) {
- 
-    if ( status == EINVAL ) {      /* name -> ID translation failed */
-      if ( !(oflag & O_CREAT) ) {  /* willing to create it? */
-        seterrno( ENOENT );
-        return (mqd_t) -1;
-      }
-      /* we are willing to create it */
-    }
-    seterrno( status );               /* some type of error */
-    return (mqd_t) -1;
- 
-  } else {                /* name -> ID translation succeeded */
- 
-    if ( (oflag & (O_CREAT | O_EXCL)) == (O_CREAT | O_EXCL) ) {
-      seterrno( EEXIST );
-      return (mqd_t) -1;
-    }
- 
-    /*
-     * XXX In this case we need to do an ID->pointer conversion to
-     *     check the mode.   This is probably a good place for a subroutine.
-     */
- 
-    the_mq->open_count += 1;
- 
-    return (mqd_t)&the_mq->Object.id;
- 
-  }
- 
-  /* XXX verify this comment...
-   *
-   *  At this point, the message queue does not exist and everything has been
-   *  checked. We should go ahead and create a message queue.
-   */
- 
-  status = _POSIX_Message_queue_Create_support(
-    name,
-    TRUE,         /* shared across processes */
-    oflag,
-    attr,
-    &the_mq
-  );
- 
-  if ( status == -1 )
-    return (mqd_t) -1;
- 
-  return (mqd_t) &the_mq->Object.id;
-}
-
-/*PAGE
- *
- *  _POSIX_Message_queue_Delete
- */
- 
-void _POSIX_Message_queue_Delete(
-  POSIX_Message_queue_Control *the_mq
-)
-{
-  if ( !the_mq->linked && !the_mq->open_count ) {
-    _POSIX_Message_queue_Free( the_mq );
- 
-    if ( the_mq->process_shared == PTHREAD_PROCESS_SHARED ) {
- 
-      _Objects_MP_Close(
-        &_POSIX_Message_queue_Information,
-        the_mq->Object.id
-      );
- 
-      _POSIX_Message_queue_MP_Send_process_packet(
-        POSIX_MESSAGE_QUEUE_MP_ANNOUNCE_DELETE,
-        the_mq->Object.id,
-        0,                         /* Not used */
-        0                          /* Not used */
-      );
-    }
- 
-  }
-}
-
-/*PAGE
- *
- *  15.2.2 Close a Message Queue, P1003.1b-1993, p. 275
- */
-
-int mq_close(
-  mqd_t  mqdes
-)
-{
-  register POSIX_Message_queue_Control *the_mq;
-  Objects_Locations                     location;
- 
-  the_mq = _POSIX_Message_queue_Get( mqdes, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-      seterrno( EINVAL );
-      return( -1 );
-    case OBJECTS_REMOTE:
-      _Thread_Dispatch();
-      return POSIX_MP_NOT_IMPLEMENTED();
-      seterrno( EINVAL );
-      return( -1 );
-    case OBJECTS_LOCAL:
-      the_mq->open_count -= 1;
-      _POSIX_Message_queue_Delete( the_mq );
-      _Thread_Enable_dispatch();
-      return 0;
-  }
-  return POSIX_BOTTOM_REACHED();
-}
-
-/*PAGE
- *
- *  15.2.2 Remove a Message Queue, P1003.1b-1993, p. 276
- */
-
-int mq_unlink(
-  const char *name
-)
-{
-  int  status;
-  register POSIX_Message_queue_Control *the_mq;
-  Objects_Id                        the_mq_id;
-  Objects_Locations                 location;
- 
-  status = _POSIX_Message_queue_Name_to_id( name, &the_mq_id );
- 
-  if ( !status )
-    set_errno_and_return_minus_one( status );
- 
-  the_mq = _POSIX_Message_queue_Get( the_mq_id, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-      seterrno( EINVAL );
-      return( -1 );
-    case OBJECTS_REMOTE:
-      _Thread_Dispatch();
-      return POSIX_MP_NOT_IMPLEMENTED();
-      seterrno( EINVAL );
-      return( -1 );
-    case OBJECTS_LOCAL:
- 
-      _Objects_MP_Close(
-        &_POSIX_Message_queue_Information,
-        the_mq->Object.id
-      );
- 
-      the_mq->linked = FALSE;
- 
-      _POSIX_Message_queue_Delete( the_mq );
- 
-      _Thread_Enable_dispatch();
-      return 0;
-  }
-  return POSIX_BOTTOM_REACHED();
-}
-
-/*PAGE
- *
- *  _POSIX_Message_queue_Send_support
- */
- 
-int _POSIX_Message_queue_Send_support(
-  mqd_t               mqdes,
-  const char         *msg_ptr,
-  unsigned32          msg_len,
-  Priority_Control    msg_prio,
-  Watchdog_Interval   timeout
-)
-{
-  register POSIX_Message_queue_Control *the_mq;
-  Objects_Locations                     location;
- 
-  the_mq = _POSIX_Message_queue_Get( mqdes, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-      seterrno( EINVAL );
-      return( -1 );
-    case OBJECTS_REMOTE:
-      _Thread_Dispatch();
-      return POSIX_MP_NOT_IMPLEMENTED();
-      seterrno( EINVAL );
-      return( -1 );
-    case OBJECTS_LOCAL:
-      /* XXX must add support for timeout and priority */
-      _CORE_message_queue_Send(
-        &the_mq->Message_queue,
-        (void *) msg_ptr,
-        msg_len,
-        mqdes,
-        NULL       /* XXX _POSIX_Message_queue_Core_message_queue_mp_support*/
-      );
-      _Thread_Enable_dispatch();
-      return _Thread_Executing->Wait.return_code;
-  }
-  return POSIX_BOTTOM_REACHED();
-}
-
-/*PAGE
- *
- *  15.2.4 Send a Message to a Message Queue, P1003.1b-1993, p. 277
- *
- *  NOTE: P1003.4b/D8, p. 45 adds mq_timedsend().
- */
-
-int mq_send(
-  mqd_t         mqdes,
-  const char   *msg_ptr,
-  size_t        msg_len,
-  unsigned int  msg_prio 
-)
-{
-  return _POSIX_Message_queue_Send_support(
-    mqdes,
-    msg_ptr,
-    msg_len,
-    msg_prio,
-    THREAD_QUEUE_WAIT_FOREVER
-  );
-}
-
-/*PAGE
- *
- *  15.2.4 Send a Message to a Message Queue, P1003.1b-1993, p. 277
- *
- *  NOTE: P1003.4b/D8, p. 45 adds mq_timedsend().
- */
-
-int mq_timedsend(
-  mqd_t                  mqdes,
-  const char            *msg_ptr,
-  size_t                 msg_len,
-  unsigned int           msg_prio,
-  const struct timespec *timeout
-)
-{
-  return _POSIX_Message_queue_Send_support(
-    mqdes,
-    msg_ptr,
-    msg_len,
-    msg_prio,
-    _POSIX_Timespec_to_interval( timeout )
-  );
-}
-
-/*PAGE
- *
- *  _POSIX_Message_queue_Receive_support
- */
- 
-/* XXX be careful ... watch the size going through all the layers ... */
-
-ssize_t _POSIX_Message_queue_Receive_support(
-  mqd_t               mqdes,
-  char               *msg_ptr,
-  size_t              msg_len,
-  unsigned int       *msg_prio,
-  Watchdog_Interval   timeout
-)
-{
-  register POSIX_Message_queue_Control *the_mq;
-  Objects_Locations                     location;
-  unsigned32                            status = 0;
-  unsigned32                            length_out;
- 
-  the_mq = _POSIX_Message_queue_Get( mqdes, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-      seterrno( EINVAL );
-      return( -1 );
-    case OBJECTS_REMOTE:
-      _Thread_Dispatch();
-      return POSIX_MP_NOT_IMPLEMENTED();
-      seterrno( EINVAL );
-      return( -1 );
-    case OBJECTS_LOCAL:
-      /* XXX need to define the options argument to this */
-      length_out = msg_len;
-      _CORE_message_queue_Seize(
-        &the_mq->Message_queue,
-        mqdes,
-        msg_ptr,
-        &length_out,
-        /* msg_prio,    XXXX */
-        the_mq->blocking,
-        timeout
-      );
-      _Thread_Enable_dispatch();
-      if ( !status )
-        return length_out;
-      /* XXX --- the return codes gotta be looked at .. fix this */
-      return _Thread_Executing->Wait.return_code;
-  }
-  return POSIX_BOTTOM_REACHED();
-}
-
-/*PAGE
- *
- *  15.2.5 Receive a Message From a Message Queue, P1003.1b-1993, p. 279
- *
- *  NOTE: P1003.4b/D8, p. 45 adds mq_timedreceive().
- */
-
-ssize_t mq_receive(
-  mqd_t         mqdes,
-  char         *msg_ptr,
-  size_t        msg_len,
-  unsigned int *msg_prio
-)
-{
-  return _POSIX_Message_queue_Receive_support(
-    mqdes,
-    msg_ptr,
-    msg_len,
-    msg_prio,
-    THREAD_QUEUE_WAIT_FOREVER
-  );
-}
-
-/*PAGE
- *
- *  15.2.5 Receive a Message From a Message Queue, P1003.1b-1993, p. 279
- *
- *  NOTE: P1003.4b/D8, p. 45 adds mq_timedreceive().
- */
-
-int mq_timedreceive(                  /* XXX: should this be ssize_t */
-  mqd_t                  mqdes,
-  char                  *msg_ptr,
-  size_t                 msg_len,
-  unsigned int          *msg_prio,
-  const struct timespec *timeout
-)
-{
-  return _POSIX_Message_queue_Receive_support(
-    mqdes,
-    msg_ptr,
-    msg_len,
-    msg_prio,
-    _POSIX_Timespec_to_interval( timeout )
-  );
-}
-
-/*PAGE
- *
- *  _POSIX_Message_queue_Notify_handler
- *
- */
-
-void _POSIX_Message_queue_Notify_handler(
-  void    *user_data
-)
-{
-  POSIX_Message_queue_Control *the_mq;
-
-  the_mq = user_data;
-
-  /* XXX do something with signals here!!!! */
-}
-
-/*PAGE
- *
- *  15.2.6 Notify Process that a Message is Available on a Queue, 
- *         P1003.1b-1993, p. 280
- */
-
-int mq_notify(
-  mqd_t                  mqdes,
-  const struct sigevent *notification
-)
-{
-  register POSIX_Message_queue_Control *the_mq;
-  Objects_Locations                     location;
- 
-  the_mq = _POSIX_Message_queue_Get( mqdes, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-      seterrno( EBADF );
-      return( -1 );
-    case OBJECTS_REMOTE:
-      _Thread_Dispatch();
-      return POSIX_MP_NOT_IMPLEMENTED();
-      seterrno( EINVAL );
-      return( -1 );
-    case OBJECTS_LOCAL:
-      if ( notification ) {
-        if ( _CORE_message_queue_Is_notify_enabled( &the_mq->Message_queue ) ) {
-          _Thread_Enable_dispatch();
-          seterrno( EBUSY );
-          return( -1 );
-        }
-
-        _CORE_message_queue_Set_notify( &the_mq->Message_queue, NULL, NULL );
-
-        the_mq->notification = *notification;
-      
-        _CORE_message_queue_Set_notify(
-          &the_mq->Message_queue,
-          _POSIX_Message_queue_Notify_handler,
-          the_mq
-        );
-      } else {
-
-        _CORE_message_queue_Set_notify( &the_mq->Message_queue, NULL, NULL );
-
-      }
-
-      _Thread_Enable_dispatch();
-      return 0;
-  }
-  return POSIX_BOTTOM_REACHED();
-}
-
-/*PAGE
- *
- *  15.2.7 Set Message Queue Attributes, P1003.1b-1993, p. 281
- */
-
-int mq_setattr(
-  mqd_t                 mqdes,
-  const struct mq_attr *mqstat,
-  struct mq_attr       *omqstat
-)
-{
-  register POSIX_Message_queue_Control *the_mq;
-  Objects_Locations                     location;
-  CORE_message_queue_Attributes        *the_mq_attr;
- 
-  the_mq = _POSIX_Message_queue_Get( mqdes, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-      seterrno( EINVAL );
-      return( -1 );
-    case OBJECTS_REMOTE:
-      _Thread_Dispatch();
-      return POSIX_MP_NOT_IMPLEMENTED();
-      seterrno( EINVAL );
-      return( -1 );
-    case OBJECTS_LOCAL:
-      /*
-       *  Return the old values.
-       */
-
-      /* XXX this is the same stuff as is in mq_getattr... and probably */
-      /* XXX should be in an inlined private routine */
-
-      the_mq_attr = &the_mq->Message_queue.Attributes;
-
-      omqstat->mq_flags   = the_mq->flags;
-      omqstat->mq_msgsize = the_mq->Message_queue.maximum_message_size;
-      omqstat->mq_maxmsg  = the_mq->Message_queue.maximum_pending_messages;
-      omqstat->mq_curmsgs = the_mq->Message_queue.number_of_pending_messages;
-  
-      /*
-       *  Ignore everything except the O_NONBLOCK bit. 
-       */
-
-      if (  mqstat->mq_flags & O_NONBLOCK ) 
-        the_mq->blocking = FALSE;
-      else
-        the_mq->blocking = TRUE;
- 
-      the_mq->flags = mqstat->mq_flags;
-
-      _Thread_Enable_dispatch();
-      return 0;
-  }
-  return POSIX_BOTTOM_REACHED();
-}
-
-/*PAGE
- *
- *  15.2.8 Get Message Queue Attributes, P1003.1b-1993, p. 283
- */
-
-int mq_getattr(
-  mqd_t           mqdes,
-  struct mq_attr *mqstat
-)
-{
-  register POSIX_Message_queue_Control *the_mq;
-  Objects_Locations                     location;
-  CORE_message_queue_Attributes        *the_mq_attr;
- 
-  the_mq = _POSIX_Message_queue_Get( mqdes, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-      seterrno( EINVAL );
-      return( -1 );
-    case OBJECTS_REMOTE:
-      _Thread_Dispatch();
-      return POSIX_MP_NOT_IMPLEMENTED();
-      seterrno( EINVAL );
-      return( -1 );
-    case OBJECTS_LOCAL:
-      /*
-       *  Return the old values.
-       */
- 
-      /* XXX this is the same stuff as is in mq_setattr... and probably */
-      /* XXX should be in an inlined private routine */
- 
-      the_mq_attr = &the_mq->Message_queue.Attributes;
- 
-      mqstat->mq_flags   = the_mq->flags;
-      mqstat->mq_msgsize = the_mq->Message_queue.maximum_message_size;
-      mqstat->mq_maxmsg  = the_mq->Message_queue.maximum_pending_messages;
-      mqstat->mq_curmsgs = the_mq->Message_queue.number_of_pending_messages;
- 
-      _Thread_Enable_dispatch();
-      return 0;
-  }
-  return POSIX_BOTTOM_REACHED();
-}
diff --git a/cpukit/posix/src/mutex.c b/cpukit/posix/src/mutex.c
deleted file mode 100644
index fa2ccc9cc5..0000000000
--- a/cpukit/posix/src/mutex.c
+++ /dev/null
@@ -1,688 +0,0 @@
-/*
- *  $Id$
- */
-
-#include <assert.h>
-#include <errno.h>
-#include <pthread.h>
-
-#include <rtems/system.h>
-#include <rtems/score/coremutex.h>
-#include <rtems/score/watchdog.h>
-#include <rtems/score/mpci.h>
-#include <rtems/posix/mutex.h>
-#include <rtems/posix/priority.h>
-#include <rtems/posix/time.h>
-
-/*
- *  TEMPORARY
- */
-
-void _POSIX_Mutex_MP_Send_process_packet (
-  POSIX_Mutex_MP_Remote_operations  operation,
-  Objects_Id                        mutex_id,
-  Objects_Name                      name,
-  Objects_Id                        proxy_id
-)
-{
-  (void) POSIX_MP_NOT_IMPLEMENTED();
-}
-
-void _POSIX_Mutex_MP_Send_object_was_deleted (
-  Thread_Control *the_proxy
-)
-{
-  (void) POSIX_MP_NOT_IMPLEMENTED();
-}
-
-int _POSIX_Mutex_MP_Send_request_packet (
-  POSIX_Mutex_MP_Remote_operations  operation,
-  Objects_Id                        mutex_id,
-  boolean                           wait,  /* XXX options */
-  Watchdog_Interval                 timeout
-)
-{
-  return POSIX_MP_NOT_IMPLEMENTED();
-}
-
-void POSIX_Threads_mutex_MP_support(
-  Thread_Control *the_thread,
-  Objects_Id      id
-)
-{
-  (void) POSIX_MP_NOT_IMPLEMENTED();   /* XXX: should never get here */
-}
-
-/*
- *  END OF TEMPORARY
- */
-
-/*PAGE
- *  
- *  The default mutex attributes structure.
- */
-
-const pthread_mutexattr_t _POSIX_Mutex_Default_attributes = {
-  TRUE,                                    /* is_initialized */
-  PTHREAD_PROCESS_PRIVATE,                 /* process_shared */
-  POSIX_SCHEDULER_MAXIMUM_PRIORITY,        /* prio_ceiling   */
-  PTHREAD_PRIO_NONE,                       /* protocol       */
-  FALSE                                    /* recursive      */
-};
-
-/*PAGE
- *
- *  _POSIX_Mutex_From_core_mutex_status
- */
-
-int _POSIX_Mutex_From_core_mutex_status(
-  CORE_mutex_Status  status
-)
-{
-  switch ( status ) {
-    case CORE_MUTEX_STATUS_SUCCESSFUL:
-      return 0;
-    case CORE_MUTEX_STATUS_UNSATISFIED_NOWAIT:
-      return EBUSY;
-    case CORE_MUTEX_STATUS_NESTING_NOT_ALLOWED:
-      return EDEADLK;
-    case CORE_MUTEX_STATUS_NOT_OWNER_OF_RESOURCE:
-      return EPERM;
-    case CORE_MUTEX_WAS_DELETED:
-      return EINVAL;
-    case CORE_MUTEX_TIMEOUT:
-      return EAGAIN;
-    case CORE_MUTEX_STATUS_CEILING_VIOLATED:
-      return EINVAL;
-    default:
-      break;
-  }
-  assert( 0 );
-  return 0;
-}
-
-/*PAGE
- *
- *  _POSIX_Mutex_Manager_initialization
- *
- *  This routine initializes all mutex manager related data structures.
- *
- *  Input parameters:
- *    maximum_mutexes - maximum configured mutexes
- *
- *  Output parameters:  NONE
- */
- 
-void _POSIX_Mutex_Manager_initialization(
-  unsigned32 maximum_mutexes
-)
-{
-  _Objects_Initialize_information(
-    &_POSIX_Mutex_Information,
-    OBJECTS_POSIX_MUTEXES,
-    TRUE,
-    maximum_mutexes,
-    sizeof( POSIX_Mutex_Control ),
-    FALSE,
-    0,
-    FALSE
-  );
-}
-
-/*PAGE
- *
- *  11.3.1 Mutex Initialization Attributes, P1003.1c/Draft 10, p. 81
- */
-
-int pthread_mutexattr_init(
-  pthread_mutexattr_t *attr
-)
-{
-  if ( !attr )
-    return EINVAL;
-
-  *attr = _POSIX_Mutex_Default_attributes;
-  return 0;
-}
-
-/*PAGE
- *
- *  11.3.1 Mutex Initialization Attributes, P1003.1c/Draft 10, p. 81
- */
-
-int pthread_mutexattr_destroy(
-  pthread_mutexattr_t *attr
-)
-{
-  if ( !attr || !attr->is_initialized )
-    return EINVAL;
-
-  attr->is_initialized = FALSE;
-  return 0;
-}
-
-/*PAGE
- *
- *  11.3.1 Mutex Initialization Attributes, P1003.1c/Draft 10, p. 81
- */
-
-int pthread_mutexattr_getpshared(
-  const pthread_mutexattr_t *attr,
-  int                       *pshared
-)
-{
-  if ( !attr || !attr->is_initialized || !pshared )
-    return EINVAL;
-
-  *pshared = attr->process_shared;
-  return 0;
-}
-
-/*PAGE
- *
- *  11.3.1 Mutex Initialization Attributes, P1003.1c/Draft 10, p. 81
- */
-
-int pthread_mutexattr_setpshared(
-  pthread_mutexattr_t *attr,
-  int                  pshared
-)
-{
-  if ( !attr || !attr->is_initialized )
-    return EINVAL;
-
-  switch ( pshared ) {
-    case PTHREAD_PROCESS_SHARED:
-    case PTHREAD_PROCESS_PRIVATE:
-      attr->process_shared = pshared;
-      return 0;
-
-    default:
-      return EINVAL;
-  }
-}
-
-/*PAGE
- *
- *  11.3.2 Initializing and Destroying a Mutex, P1003.1c/Draft 10, p. 87
- *
- *  NOTE:  XXX Could be optimized so all the attribute error checking
- *             is not performed when attr is NULL.
- */
-
-int pthread_mutex_init(
-  pthread_mutex_t           *mutex,
-  const pthread_mutexattr_t *attr
-)
-{
-  POSIX_Mutex_Control          *the_mutex;
-  CORE_mutex_Attributes        *the_mutex_attr;
-  const pthread_mutexattr_t    *the_attr;
-  CORE_mutex_Disciplines        the_discipline;
-  register POSIX_Mutex_Control *mutex_in_use;
-  Objects_Locations             location;
-
-  if ( attr ) the_attr = attr;
-  else        the_attr = &_POSIX_Mutex_Default_attributes;
-
-  /* Check for NULL mutex */
-
-  if ( !mutex )
-    return EINVAL;
-
-  /* avoid infinite recursion on call to this routine in _POSIX_Mutex_Get */
-
-  if ( *mutex != PTHREAD_MUTEX_INITIALIZER ) {
-
-    /* EBUSY if *mutex is a valid id */
-
-    mutex_in_use = _POSIX_Mutex_Get( mutex, &location );
-    switch ( location ) {
-      case OBJECTS_ERROR:
-        break;
-      case OBJECTS_REMOTE:
-      case OBJECTS_LOCAL:
-        _Thread_Enable_dispatch();
-        return EBUSY;
-    }
-  }
- 
-  if ( !the_attr->is_initialized ) 
-    return EINVAL;
-
-  /*
-   *  XXX: Be careful about attributes when global!!!
-   */
-
-  assert( the_attr->process_shared == PTHREAD_PROCESS_PRIVATE );
-
-  if ( the_attr->process_shared == PTHREAD_PROCESS_SHARED )
-    return POSIX_MP_NOT_IMPLEMENTED();
- 
-  /*
-   *  Determine the discipline of the mutex
-   */
-  
-  switch ( the_attr->protocol ) {
-    case PTHREAD_PRIO_NONE:
-      the_discipline = CORE_MUTEX_DISCIPLINES_FIFO;
-      break;
-    case PTHREAD_PRIO_INHERIT:
-      the_discipline = CORE_MUTEX_DISCIPLINES_PRIORITY_INHERIT;
-      break;
-    case PTHREAD_PRIO_PROTECT:
-      the_discipline = CORE_MUTEX_DISCIPLINES_PRIORITY_CEILING;
-      break;
-    default:
-      return EINVAL;
-  }
-
-  if ( !_POSIX_Priority_Is_valid( the_attr->prio_ceiling ) )
-    return EINVAL;
-
-  _Thread_Disable_dispatch();
-
-  the_mutex = _POSIX_Mutex_Allocate();
- 
-  if ( !the_mutex ) {
-    _Thread_Enable_dispatch();
-    return EAGAIN;
-  }
-
-  if ( the_attr->process_shared == PTHREAD_PROCESS_SHARED && 
-       !( _Objects_MP_Allocate_and_open( &_POSIX_Mutex_Information, 0,
-                            the_mutex->Object.id, FALSE ) ) ) {
-    _POSIX_Mutex_Free( the_mutex );
-    _Thread_Enable_dispatch();
-    return EAGAIN;
-  }
-
-  the_mutex->process_shared = the_attr->process_shared;
-
-  the_mutex_attr = &the_mutex->Mutex.Attributes;
-
-  the_mutex_attr->allow_nesting = the_attr->recursive;
-  the_mutex_attr->priority_ceiling =
-    _POSIX_Priority_To_core( the_attr->prio_ceiling );
-  the_mutex_attr->discipline = the_discipline;
-
-  /*
-   *  Must be initialized to unlocked.
-   */
-
-  _CORE_mutex_Initialize(
-    &the_mutex->Mutex,
-    OBJECTS_POSIX_MUTEXES,
-    the_mutex_attr,
-    CORE_MUTEX_UNLOCKED,
-    NULL                      /* proxy_extract_callout */
-  );
-
-  _Objects_Open( &_POSIX_Mutex_Information, &the_mutex->Object, 0 );
-
-  *mutex = the_mutex->Object.id;
-
-  if ( the_attr->process_shared == PTHREAD_PROCESS_SHARED )
-    _POSIX_Mutex_MP_Send_process_packet(
-      POSIX_MUTEX_MP_ANNOUNCE_CREATE,
-      the_mutex->Object.id,
-      0,                         /* Name not used */
-      0                          /* Not used */
-    );
-
-  _Thread_Enable_dispatch();
-  return 0;
-}
-
-/*PAGE
- *
- *  11.3.2 Initializing and Destroying a Mutex, P1003.1c/Draft 10, p. 87
- */
-
-int pthread_mutex_destroy(
-  pthread_mutex_t           *mutex
-)
-{
-  register POSIX_Mutex_Control *the_mutex;
-  Objects_Locations             location;
- 
-  the_mutex = _POSIX_Mutex_Get( mutex, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-      return EINVAL;
-    case OBJECTS_REMOTE:
-      _Thread_Dispatch();
-      return POSIX_MP_NOT_IMPLEMENTED();
-      return EINVAL;
-    case OBJECTS_LOCAL:
-       /*
-        * XXX: There is an error for the mutex being locked
-        *  or being in use by a condition variable.
-        */
-
-      if ( _CORE_mutex_Is_locked( &the_mutex->Mutex ) ) {
-        _Thread_Enable_dispatch();
-        return EBUSY;
-      }
- 
-      _Objects_Close( &_POSIX_Mutex_Information, &the_mutex->Object );
- 
-      _CORE_mutex_Flush(
-        &the_mutex->Mutex,
-        _POSIX_Mutex_MP_Send_object_was_deleted,
-        EINVAL
-      );
- 
-      _POSIX_Mutex_Free( the_mutex );
- 
-      if ( the_mutex->process_shared == PTHREAD_PROCESS_SHARED ) {
- 
-        _Objects_MP_Close( &_POSIX_Mutex_Information, the_mutex->Object.id );
- 
-        _POSIX_Mutex_MP_Send_process_packet(
-          POSIX_MUTEX_MP_ANNOUNCE_DELETE,
-          the_mutex->Object.id,
-          0,                         /* Not used */
-          0                          /* Not used */
-        );
-      }
-      _Thread_Enable_dispatch();
-      return 0;
-  }
-  return POSIX_BOTTOM_REACHED();
-}
-
-/*PAGE
- *
- *  _POSIX_Mutex_Lock_support
- *
- *  A support routine which implements guts of the blocking, non-blocking, and
- *  timed wait version of mutex lock.
- */
-
-int _POSIX_Mutex_Lock_support(
-  pthread_mutex_t           *mutex,
-  boolean                    blocking,
-  Watchdog_Interval          timeout
-)
-{
-  register POSIX_Mutex_Control *the_mutex;
-  Objects_Locations             location;
- 
-  the_mutex = _POSIX_Mutex_Get( mutex, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-      return EINVAL;
-    case OBJECTS_REMOTE:
-      return _POSIX_Mutex_MP_Send_request_packet(
-          POSIX_MUTEX_MP_OBTAIN_REQUEST,
-          *mutex,
-          0,   /* must define the option set */
-          WATCHDOG_NO_TIMEOUT
-      );
-    case OBJECTS_LOCAL:
-      _CORE_mutex_Seize(
-        &the_mutex->Mutex,
-        the_mutex->Object.id,
-        blocking,
-        timeout
-      );
-      _Thread_Enable_dispatch();
-      return _POSIX_Mutex_From_core_mutex_status(
-        (CORE_mutex_Status) _Thread_Executing->Wait.return_code
-      );
-  }
-  return POSIX_BOTTOM_REACHED();
-}
-
-/*PAGE
- *
- *  11.3.3 Locking and Unlocking a Mutex, P1003.1c/Draft 10, p. 93
- *        
- *  NOTE: P1003.4b/D8 adds pthread_mutex_timedlock(), p. 29
- */
-
-int pthread_mutex_lock(
-  pthread_mutex_t           *mutex
-)
-{
-  return _POSIX_Mutex_Lock_support( mutex, TRUE, THREAD_QUEUE_WAIT_FOREVER );
-}
-
-/*PAGE
- *
- *  11.3.3 Locking and Unlocking a Mutex, P1003.1c/Draft 10, p. 93
- *        
- *  NOTE: P1003.4b/D8 adds pthread_mutex_timedlock(), p. 29
- */
-
-int pthread_mutex_trylock(
-  pthread_mutex_t           *mutex
-)
-{
-  return _POSIX_Mutex_Lock_support( mutex, FALSE, THREAD_QUEUE_WAIT_FOREVER );
-}
-
-/*PAGE
- *
- *  11.3.3 Locking and Unlocking a Mutex, P1003.1c/Draft 10, p. 93
- *        
- *  NOTE: P1003.4b/D8 adds pthread_mutex_timedlock(), p. 29
- */
-
-int pthread_mutex_unlock(
-  pthread_mutex_t           *mutex
-)
-{
-  register POSIX_Mutex_Control *the_mutex;
-  Objects_Locations             location;
-  CORE_mutex_Status             status;
- 
-  the_mutex = _POSIX_Mutex_Get( mutex, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-      return EINVAL;
-    case OBJECTS_REMOTE:
-      return _POSIX_Mutex_MP_Send_request_packet(
-          POSIX_MUTEX_MP_RELEASE_REQUEST,
-          *mutex,
-          0,                    /* Not used */
-          MPCI_DEFAULT_TIMEOUT
-      );
-    case OBJECTS_LOCAL:
-      status = _CORE_mutex_Surrender(
-        &the_mutex->Mutex,
-        the_mutex->Object.id, 
-        POSIX_Threads_mutex_MP_support
-      );
-      _Thread_Enable_dispatch();
-      return _POSIX_Mutex_From_core_mutex_status( status );
-      break;
-  }
-  return POSIX_BOTTOM_REACHED();
-}
-
-/*PAGE
- *
- *  11.3.3 Locking and Unlocking a Mutex, P1003.1c/Draft 10, p. 93
- *        
- *  NOTE: P1003.4b/D8 adds pthread_mutex_timedlock(), p. 29
- */
-
-int pthread_mutex_timedlock(
-  pthread_mutex_t       *mutex,
-  const struct timespec *timeout
-)
-{
-  return _POSIX_Mutex_Lock_support( 
-    mutex,
-    TRUE,
-    _POSIX_Timespec_to_interval( timeout )
-  );
-}
-
-/*PAGE
- *
- *  13.6.1 Mutex Initialization Scheduling Attributes, P1003.1c/Draft 10, p. 128
- */
- 
-int pthread_mutexattr_setprotocol(
-  pthread_mutexattr_t   *attr,
-  int                    protocol
-)
-{
-  if ( !attr || !attr->is_initialized )
-    return EINVAL;
-
-  switch ( protocol ) {
-    case PTHREAD_PRIO_NONE:
-    case PTHREAD_PRIO_INHERIT:
-    case PTHREAD_PRIO_PROTECT:
-      attr->protocol = protocol;
-      return 0;
- 
-    default:
-      return EINVAL;
-  }
-}
-
-/*PAGE
- *
- *  13.6.1 Mutex Initialization Scheduling Attributes, P1003.1c/Draft 10, p. 128
- */
- 
-int pthread_mutexattr_getprotocol(
-  const pthread_mutexattr_t   *attr,
-  int                         *protocol
-)
-{
-  if ( !attr || !attr->is_initialized || !protocol )
-    return EINVAL;
-
-  *protocol = attr->protocol;
-  return 0;
-}
-
-/*PAGE
- *
- *  13.6.1 Mutex Initialization Scheduling Attributes, P1003.1c/Draft 10, p. 128
- */
- 
-int pthread_mutexattr_setprioceiling(
-  pthread_mutexattr_t   *attr,
-  int                    prioceiling
-)
-{
-  if ( !attr || !attr->is_initialized )
-    return EINVAL;
-
-  if ( !_POSIX_Priority_Is_valid( prioceiling ) )
-    return EINVAL;
-
-  attr->prio_ceiling = prioceiling;
-  return 0;
-}
-
-/*PAGE
- *
- *  13.6.1 Mutex Initialization Scheduling Attributes, P1003.1c/Draft 10, p. 128
- */
- 
-int pthread_mutexattr_getprioceiling(
-  const pthread_mutexattr_t   *attr,
-  int                         *prioceiling
-)
-{
-  if ( !attr || !attr->is_initialized || !prioceiling )
-    return EINVAL;
-
-  *prioceiling = attr->prio_ceiling;
-  return 0;
-}
-
-/*PAGE
- *
- *  13.6.2 Change the Priority Ceiling of a Mutex, P1003.1c/Draft 10, p. 131
- */
-
-int pthread_mutex_setprioceiling(
-  pthread_mutex_t   *mutex,
-  int                prioceiling,
-  int               *old_ceiling
-)
-{
-  register POSIX_Mutex_Control *the_mutex;
-  Objects_Locations             location;
-  Priority_Control              the_priority;
-  int                           status;
-
-  if ( !old_ceiling )
-    return EINVAL;
-
-  if ( !_POSIX_Priority_Is_valid( prioceiling ) )
-    return EINVAL;
-
-  the_priority = _POSIX_Priority_To_core( prioceiling );
-
-  /*
-   *  Must acquire the mutex before we can change it's ceiling
-   */
-
-  status = pthread_mutex_lock( mutex );
-  if ( status )
-    return status;
-
-  the_mutex = _POSIX_Mutex_Get( mutex, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-      return EINVAL;        /* impossible to get here */
-    case OBJECTS_REMOTE:
-      /*  XXX It feels questionable to set the ceiling on a remote mutex. */
-      return EINVAL;
-    case OBJECTS_LOCAL:
-      *old_ceiling = _POSIX_Priority_From_core(
-        the_mutex->Mutex.Attributes.priority_ceiling
-      );
-      the_mutex->Mutex.Attributes.priority_ceiling = the_priority;
-      _CORE_mutex_Surrender(
-        &the_mutex->Mutex,
-        the_mutex->Object.id, 
-        POSIX_Threads_mutex_MP_support
-      );
-      _Thread_Enable_dispatch();
-      return 0;
-  }
-  return POSIX_BOTTOM_REACHED();
-}
- 
-/*PAGE
- *
- *  13.6.2 Change the Priority Ceiling of a Mutex, P1003.1c/Draft 10, p. 131
- */
-
-int pthread_mutex_getprioceiling(
-  pthread_mutex_t   *mutex,
-  int               *prioceiling
-)
-{
-  register POSIX_Mutex_Control *the_mutex;
-  Objects_Locations             location;
-
-  if ( !prioceiling )
-    return EINVAL;
-
-  the_mutex = _POSIX_Mutex_Get( mutex, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-      return EINVAL;
-    case OBJECTS_REMOTE:
-      return POSIX_MP_NOT_IMPLEMENTED();   /* XXX feels questionable */
-    case OBJECTS_LOCAL:
-      *prioceiling = _POSIX_Priority_From_core(
-        the_mutex->Mutex.Attributes.priority_ceiling
-      );
-      _Thread_Enable_dispatch();
-      return 0;
-  }
-  return POSIX_BOTTOM_REACHED();
-}
diff --git a/cpukit/posix/src/psignal.c b/cpukit/posix/src/psignal.c
deleted file mode 100644
index 4037209009..0000000000
--- a/cpukit/posix/src/psignal.c
+++ /dev/null
@@ -1,1343 +0,0 @@
-/*
- *  $Id$
- */
-
-#include <assert.h>
-#include <errno.h>
-#include <pthread.h>
-#include <signal.h>
-
-#include <rtems/system.h>
-#include <rtems/score/isr.h>
-#include <rtems/score/thread.h>
-#include <rtems/score/tqdata.h>
-#include <rtems/score/wkspace.h>
-#include <rtems/posix/seterr.h>
-#include <rtems/posix/threadsup.h>
-#include <rtems/posix/psignal.h>
-#include <rtems/posix/pthread.h>
-#include <rtems/posix/time.h>
-
-/*
- *  Currently 32 signals numbered 1-32 are defined
- */
-
-#define SIGNAL_EMPTY_MASK  0x00000000
-#define SIGNAL_ALL_MASK    0xffffffff
-
-#define signo_to_mask( _sig ) (1 << ((_sig) - 1))
-
-#define is_valid_signo( _sig ) \
-  ((_sig) >= 1 && (_sig) <= 32 )
-
-/*** PROCESS WIDE STUFF ****/
-
-sigset_t  _POSIX_signals_Pending;
-
-void _POSIX_signals_Abormal_termination_handler( int signo )
-{
-  exit( 1 );
-}
-
-#define _POSIX_signals_Stop_handler NULL
-#define _POSIX_signals_Continue_handler NULL
-
-#define SIGACTION_TERMINATE \
-  { 0, SIGNAL_ALL_MASK, {_POSIX_signals_Abormal_termination_handler} }
-#define SIGACTION_IGNORE \
-  { 0, SIGNAL_ALL_MASK, {SIG_IGN} }
-#define SIGACTION_STOP \
-  { 0, SIGNAL_ALL_MASK, {_POSIX_signals_Stop_handler} }
-#define SIGACTION_CONTINUE \
-  { 0, SIGNAL_ALL_MASK, {_POSIX_signals_Continue_handler} }
-
-#define SIG_ARRAY_MAX  (SIGRTMAX + 1)
-struct sigaction _POSIX_signals_Default_vectors[ SIG_ARRAY_MAX ] = {
-  /* NO SIGNAL 0 */  SIGACTION_IGNORE,
-  /* SIGHUP    1 */  SIGACTION_TERMINATE,
-  /* SIGINT    2 */  SIGACTION_TERMINATE,
-  /* SIGQUIT   3 */  SIGACTION_TERMINATE,
-  /* SIGILL    4 */  SIGACTION_TERMINATE,
-  /* SIGTRAP   5 */  SIGACTION_TERMINATE,
-  /* SIGIOT    6 */  SIGACTION_TERMINATE,
-  /* SIGABRT   6     SIGACTION_TERMINATE, -- alias for SIGIOT */
-  /* SIGEMT    7 */  SIGACTION_TERMINATE,
-  /* SIGFPE    8 */  SIGACTION_TERMINATE,
-  /* SIGKILL   9 */  SIGACTION_TERMINATE,
-  /* SIGBUS   10 */  SIGACTION_TERMINATE,
-  /* SIGSEGV  11 */  SIGACTION_TERMINATE,
-  /* SIGSYS   12 */  SIGACTION_TERMINATE,
-  /* SIGPIPE  13 */  SIGACTION_TERMINATE,
-  /* SIGALRM  14 */  SIGACTION_TERMINATE,
-  /* SIGTERM  15 */  SIGACTION_TERMINATE,
-  /* SIGUSR1  16 */  SIGACTION_TERMINATE,
-  /* SIGUSR2  17 */  SIGACTION_TERMINATE,
-  /* SIGRTMIN 18 */  SIGACTION_IGNORE,
-  /* SIGRT    19 */  SIGACTION_IGNORE,
-  /* SIGRT    20 */  SIGACTION_IGNORE,
-  /* SIGRT    21 */  SIGACTION_IGNORE,
-  /* SIGRT    22 */  SIGACTION_IGNORE,
-  /* SIGRT    23 */  SIGACTION_IGNORE,
-  /* SIGRT    24 */  SIGACTION_IGNORE,
-  /* SIGRT    25 */  SIGACTION_IGNORE,
-  /* SIGRT    26 */  SIGACTION_IGNORE,
-  /* SIGRT    27 */  SIGACTION_IGNORE,
-  /* SIGRT    28 */  SIGACTION_IGNORE,
-  /* SIGRT    29 */  SIGACTION_IGNORE,
-  /* SIGRT    30 */  SIGACTION_IGNORE,
-  /* SIGRT    31 */  SIGACTION_IGNORE,
-  /* SIGRTMAX 32 */  SIGACTION_IGNORE
-};
-
-struct sigaction _POSIX_signals_Vectors[ SIG_ARRAY_MAX ];
-
-Watchdog_Control _POSIX_signals_Alarm_timer;
-
-Thread_queue_Control _POSIX_signals_Wait_queue;
-
-Chain_Control _POSIX_signals_Inactive_siginfo;
-Chain_Control _POSIX_signals_Siginfo[ SIG_ARRAY_MAX ];
-
-/*PAGE
- *
- *  XXX - move these
- */
-
-#define _States_Is_interruptible_signal( _states ) \
-  ( ((_states) & \
-    (STATES_WAITING_FOR_SIGNAL|STATES_INTERRUPTIBLE_BY_SIGNAL)) == \
-      (STATES_WAITING_FOR_SIGNAL|STATES_INTERRUPTIBLE_BY_SIGNAL))
-
-/*PAGE
- *
- *  _POSIX_signals_Unblock_thread
- */
-
-/* XXX this routine could probably be cleaned up */
-boolean _POSIX_signals_Unblock_thread( 
-  Thread_Control  *the_thread,
-  int              signo,
-  siginfo_t       *info
-)
-{
-  POSIX_API_Control  *api;
-  sigset_t            mask;
-  siginfo_t          *the_info = NULL;
-
-  api = the_thread->API_Extensions[ THREAD_API_POSIX ];
-
-  mask = signo_to_mask( signo );
-
-  /*
-   *  Is the thread is specifically waiting for a signal?
-   */
-
-  if ( _States_Is_interruptible_signal( the_thread->current_state ) ) {
-
-    if ( (the_thread->Wait.option & mask) || (~api->signals_blocked & mask) ) {
-      the_thread->Wait.return_code = EINTR;
-
-      the_info = (siginfo_t *) the_thread->Wait.return_argument;
-
-      if ( !info ) {
-        the_info->si_signo = signo;
-        the_info->si_code = SI_USER;
-        the_info->si_value.sival_int = 0;
-      } else {
-        *the_info = *info;
-      }
-      
-      _Thread_queue_Extract_with_proxy( the_thread );
-      return TRUE;
-    }
-
-    /*
-     *  This should only be reached via pthread_kill().
-     */
-
-    return FALSE;
-  }
-
-  if ( ~api->signals_blocked & mask ) {
-    the_thread->do_post_task_switch_extension = TRUE;
-
-    if ( the_thread->current_state & STATES_INTERRUPTIBLE_BY_SIGNAL ) {
-      the_thread->Wait.return_code = EINTR;
-      if ( _States_Is_waiting_on_thread_queue(the_thread->current_state) )
-        _Thread_queue_Extract_with_proxy( the_thread );
-      else if ( _States_Is_delaying(the_thread->current_state)){
-        if ( _Watchdog_Is_active( &the_thread->Timer ) )
-          (void) _Watchdog_Remove( &the_thread->Timer );
-        _Thread_Unblock( the_thread );
-      }
-    }
-  }
-  return FALSE;
-
-}
-
-/*PAGE
- *
- *  _POSIX_signals_Set_process_signals
- */
- 
-void _POSIX_signals_Set_process_signals(
-  sigset_t   mask
-)
-{
-  ISR_Level  level;
- 
-  _ISR_Disable( level );
-    if ( !_POSIX_signals_Pending )
-      _Thread_Do_post_task_switch_extension++;
-    _POSIX_signals_Pending |= mask;
-  _ISR_Enable( level );
-}
-
-/*PAGE
- *
- *  _POSIX_signals_Clear_process_signals
- */
-
-void _POSIX_signals_Clear_process_signals(
-  sigset_t   mask
-)
-{
-  ISR_Level  level;
-
-  _ISR_Disable( level );
-    _POSIX_signals_Pending &= ~mask;
-    if ( !_POSIX_signals_Pending )
-      _Thread_Do_post_task_switch_extension--;
-  _ISR_Enable( level );
-}
-
-/*PAGE
- *
- *  _POSIX_signals_Clear_signals
- */
- 
-boolean _POSIX_signals_Clear_signals(
-  POSIX_API_Control  *api,
-  int                 signo,
-  siginfo_t          *info,
-  boolean             is_global,
-  boolean             check_blocked
-)
-{
-  sigset_t                    mask;
-  sigset_t                    signals_blocked;
-  ISR_Level                   level;
-  boolean                     do_callout;
-  POSIX_signals_Siginfo_node *psiginfo;
- 
-  mask = signo_to_mask( signo );
- 
-  do_callout = FALSE;
- 
-  /* set blocked signals based on if checking for them, SIGNAL_ALL_MASK
-   * insures that no signals are blocked and all are checked.
-   */
-
-  if ( check_blocked )
-    signals_blocked = ~api->signals_blocked;
-  else
-    signals_blocked = SIGNAL_ALL_MASK;
-
-  /* XXX this is not right for siginfo type signals yet */
-  /* XXX since they can't be cleared the same way */
- 
-  _ISR_Disable( level );
-    if ( is_global ) {
-       if ( mask & (_POSIX_signals_Pending & signals_blocked) ) {
-         if ( _POSIX_signals_Vectors[ signo ].sa_flags == SA_SIGINFO ) {
-           psiginfo = (POSIX_signals_Siginfo_node *)
-             _Chain_Get_unprotected( &_POSIX_signals_Siginfo[ signo ] );
-           if ( _Chain_Is_empty( &_POSIX_signals_Siginfo[ signo ] ) )
-             _POSIX_signals_Clear_process_signals( mask );
-           if ( psiginfo ) {
-             *info = psiginfo->Info;
-             _Chain_Append_unprotected(
-               &_POSIX_signals_Inactive_siginfo,
-               &psiginfo->Node
-             );
-           } else
-             do_callout = FALSE;
-         } else
-           _POSIX_signals_Clear_process_signals( mask );
-         do_callout = TRUE;
-       }
-    } else {
-      if ( mask & (api->signals_pending & signals_blocked) ) {
-        api->signals_pending &= ~mask;
-        do_callout = TRUE;
-      }
-    }
-  _ISR_Enable( level );
-  return do_callout; 
-}
-
-
-/*PAGE
- *
- *  _POSIX_signals_Check_signal
- */
-
-boolean _POSIX_signals_Check_signal(
-  POSIX_API_Control  *api,
-  int                 signo,
-  boolean             is_global
-)
-{
-  siginfo_t                   siginfo_struct;
-  sigset_t                    saved_signals_blocked;
-
-  if ( ! _POSIX_signals_Clear_signals( api, signo, &siginfo_struct,
-                                       is_global, TRUE ) )
-    return FALSE;
-
-  /*
-   *  Since we made a union of these, only one test is necessary but this is
-   *  safer.
-   */ 
-
-  assert( _POSIX_signals_Vectors[ signo ].sa_handler ||
-          _POSIX_signals_Vectors[ signo ].sa_sigaction );
- 
-  /*
-   *  Just to prevent sending a signal which is currently being ignored.
-   */
-
-  if ( _POSIX_signals_Vectors[ signo ].sa_handler == SIG_IGN )
-    return FALSE;
-
-  /*
-   *  Block the signals requested in sa_mask
-   */
-
-  saved_signals_blocked = api->signals_blocked;
-  api->signals_blocked |= _POSIX_signals_Vectors[ signo ].sa_mask;
-
-  switch ( _POSIX_signals_Vectors[ signo ].sa_flags ) {
-    case SA_SIGINFO:
-      assert( is_global );
-
-      (*_POSIX_signals_Vectors[ signo ].sa_sigaction)(
-        signo,
-        &siginfo_struct,
-        NULL        /* context is undefined per 1003.1b-1993, p. 66 */
-      );
-      break;
-    default:
-      (*_POSIX_signals_Vectors[ signo ].sa_handler)( signo );
-      break;
-  }
-
-  /*
-   *  Restore the previous set of blocked signals
-   */
- 
-  api->signals_blocked = saved_signals_blocked;
-
-  return TRUE;
-}
-
-void _POSIX_signals_Post_switch_extension(
-  Thread_Control  *the_thread
-)
-{
-  POSIX_API_Control  *api;
-  int                 signo;
-  ISR_Level           level;
-
-  api = the_thread->API_Extensions[ THREAD_API_POSIX ];
-
-  /*
-   *  If we invoke any user code, there is the possibility that
-   *  a new signal has been posted that we should process so we
-   *  restart the loop if a signal handler was invoked.
-   *
-   *  The first thing done is to check there are any signals to be 
-   *  processed at all.  No point in doing this loop otherwise.
-   */
-
-restart:
-  _ISR_Disable( level );
-    if ( !(~api->signals_blocked & 
-          (api->signals_pending | _POSIX_signals_Pending)) ) {
-     _ISR_Enable( level );
-     return;
-   }
-  _ISR_Enable( level );
-
-  for ( signo = SIGRTMIN ; signo <= SIGRTMAX ; signo++ ) {
-
-    if ( _POSIX_signals_Check_signal( api, signo, FALSE ) )
-      goto restart;
-
-    if ( _POSIX_signals_Check_signal( api, signo, TRUE ) )
-      goto restart;
-
-  }
-
-/* XXX - add __SIGFIRSTNOTRT or something like that to newlib siginfo.h */
-
-  for ( signo = SIGHUP ; signo <= __SIGLASTNOTRT ; signo++ ) {
-
-    if ( _POSIX_signals_Check_signal( api, signo, FALSE ) )
-      goto restart;
- 
-    if ( _POSIX_signals_Check_signal( api, signo, TRUE ) )
-      goto restart;
-
-  }
-
-}
-
-/*PAGE
- *
- *  _POSIX_signals_Alarm_TSR
- */
- 
-void _POSIX_signals_Alarm_TSR(
-  Objects_Id      id,
-  void           *argument
-)
-{
-  int status;
-
-  status = kill( getpid(), SIGALRM );
-  /* XXX can't print from an ISR, should this be fatal? */
-  assert( !status );
-}
-
-/*PAGE
- *
- *  _POSIX_signals_Manager_Initialization
- */
-
-void _POSIX_signals_Manager_Initialization(
-  int  maximum_queued_signals
-)
-{
-  unsigned32 signo;
-
-  /*
-   *  Insure we have the same number of vectors and default vector entries
-   */
-
-  assert(
-   sizeof(_POSIX_signals_Vectors) == sizeof(_POSIX_signals_Default_vectors)
-  );
-
-  memcpy( 
-    _POSIX_signals_Vectors,
-    _POSIX_signals_Default_vectors,
-    sizeof( _POSIX_signals_Vectors )
-  );
-  
-  /*
-   *  Initialize the set of pending signals for the entire process
-   */
-
-  sigemptyset( &_POSIX_signals_Pending );
-
-  /*
-   *  Initialize the timer used to implement alarm().
-   */
-
-  _Watchdog_Initialize(
-    &_POSIX_signals_Alarm_timer,
-    _POSIX_signals_Alarm_TSR,
-    0,
-    NULL
-  );
- 
-  /*
-   *  Initialize the queue we use to block for signals
-   */
- 
-  _Thread_queue_Initialize(
-    &_POSIX_signals_Wait_queue,
-    OBJECTS_NO_CLASS,
-    THREAD_QUEUE_DISCIPLINE_PRIORITY,
-    STATES_WAITING_FOR_SIGNAL | STATES_INTERRUPTIBLE_BY_SIGNAL,
-    NULL,
-    EAGAIN
-  );
-
-  /* XXX status codes */
-
-  /* 
-   *  Allocate the siginfo pools.
-   */
-
-  for ( signo=1 ; signo<= SIGRTMAX ; signo++ )
-    _Chain_Initialize_empty( &_POSIX_signals_Siginfo[ signo ] );
-
-  _Chain_Initialize(
-    &_POSIX_signals_Inactive_siginfo,
-    _Workspace_Allocate_or_fatal_error(
-      maximum_queued_signals * sizeof( POSIX_signals_Siginfo_node )
-    ),
-    maximum_queued_signals,
-    sizeof( POSIX_signals_Siginfo_node )
-  );
-}
-
-/*
- *  3.3.3 Manipulate Signal Sets, P1003.1b-1993, p. 69
- */
-
-int sigemptyset(
-  sigset_t   *set
-)
-{
-  if ( !set )
-    set_errno_and_return_minus_one( EINVAL );
-
-  *set = 0;
-  return 0;
-}
-
-/*
- *  3.3.3 Manipulate Signal Sets, P1003.1b-1993, p. 69
- */
-
-int sigfillset(
-  sigset_t   *set
-)
-{
-  if ( !set )
-    set_errno_and_return_minus_one( EINVAL );
-
-  *set = SIGNAL_ALL_MASK;
-  return 0;
-}
-
-/*
- *  3.3.3 Manipulate Signal Sets, P1003.1b-1993, p. 69
- */
-
-int sigaddset(
-  sigset_t   *set,
-  int         signo
-)
-{
-  if ( !set )
-    set_errno_and_return_minus_one( EINVAL );
-
-  if ( !signo )
-    return 0;
-
-  if ( !is_valid_signo(signo) )
-    set_errno_and_return_minus_one( EINVAL );
-
-  *set |= signo_to_mask(signo);
-  return 0;
-}
-
-/*
- *  3.3.3 Manipulate Signal Sets, P1003.1b-1993, p. 69
- */
-
-int sigdelset(
-  sigset_t   *set,
-  int         signo
-)
-{
-  if ( !set )
-    set_errno_and_return_minus_one( EINVAL );
- 
-  if ( !signo )
-    return 0;
-
-  if ( !is_valid_signo(signo) )
-    set_errno_and_return_minus_one( EINVAL );
- 
-  *set &= ~signo_to_mask(signo);
-  return 0;
-}
-
-/*
- *  3.3.3 Manipulate Signal Sets, P1003.1b-1993, p. 69
- */
-
-int sigismember(
-  const sigset_t   *set,
-  int               signo
-)
-{
-  if ( !set ) 
-    set_errno_and_return_minus_one( EINVAL );
- 
-  if ( !signo )
-    return 0;
-
-  if ( !is_valid_signo(signo) )
-    set_errno_and_return_minus_one( EINVAL );
- 
-  if ( *set & signo_to_mask(signo) )
-    return 1;
-
-  return 0;
-}
-
-/*
- *  3.3.4 Examine and Change Signal Action, P1003.1b-1993, p. 70
- */
-
-int sigaction(
-  int                     sig,
-  const struct sigaction *act,
-  struct sigaction       *oact
-)
-{
-  ISR_Level     level;
-
-  if ( oact )
-    *oact = _POSIX_signals_Vectors[ sig ];
-
-  if ( !sig )
-    return 0;
-
-  if ( !is_valid_signo(sig) )
-    set_errno_and_return_minus_one( EINVAL );
-  
-  /* 
-   *  Some signals cannot be ignored (P1003.1b-1993, pp. 70-72 and references.
-   *
-   *  NOTE: Solaris documentation claims to "silently enforce" this which
-   *        contradicts the POSIX specification.
-   */
-
-  if ( sig == SIGKILL )
-    set_errno_and_return_minus_one( EINVAL );
-  
-  /*
-   *  Evaluate the new action structure and set the global signal vector
-   *  appropriately.
-   */
-
-  if ( act ) {
-
-    /*
-     *  Unless the user is installing the default signal actions, then
-     *  we can just copy the provided sigaction structure into the vectors.
-     */
-
-    _ISR_Disable( level );
-      if ( act->sa_handler == SIG_DFL ) {
-        _POSIX_signals_Vectors[ sig ] = _POSIX_signals_Default_vectors[ sig ];
-      } else {
-         _POSIX_signals_Clear_process_signals( signo_to_mask(sig) );
-         _POSIX_signals_Vectors[ sig ] = *act;
-      }
-    _ISR_Enable( level );
-  }
-
-  /*
-   *  No need to evaluate or dispatch because:
-   *
-   *    + If we were ignoring the signal before, none could be pending 
-   *      now (signals not posted when SIG_IGN).
-   *    + If we are now ignoring a signal that was previously pending,
-   *      we clear the pending signal indicator.
-   */
-
-  return 0;
-}
-
-/*
- *  3.3.5 Examine and Change Blocked Signals, P1003.1b-1993, p. 73
- *
- *  NOTE: P1003.1c/D10, p. 37 adds pthread_sigmask().
- *
- */
-
-int sigprocmask(
-  int               how,
-  const sigset_t   *set,
-  sigset_t         *oset
-)
-{
-  /*
-   *  P1003.1c/Draft 10, p. 38 maps sigprocmask to pthread_sigmask.
-   */
-
-  return pthread_sigmask( how, set, oset );
-}
-
-/*
- *  3.3.5 Examine and Change Blocked Signals, P1003.1b-1993, p. 73
- *
- *  NOTE: P1003.1c/D10, p. 37 adds pthread_sigmask().
- */
-
-int pthread_sigmask(
-  int               how,
-  const sigset_t   *set,
-  sigset_t         *oset
-)
-{
-  POSIX_API_Control  *api;
-
-  if ( !set && !oset )
-    set_errno_and_return_minus_one( EINVAL );
-
-  api = _Thread_Executing->API_Extensions[ THREAD_API_POSIX ];
-
-  if ( oset )
-    *oset = api->signals_blocked;
- 
-  if ( !set )
-    return 0;
-
-  switch ( how ) {
-    case SIG_BLOCK:
-      api->signals_blocked |= *set;
-      break;
-    case SIG_UNBLOCK:
-      api->signals_blocked &= ~*set;
-      break;
-    case SIG_SETMASK:
-      api->signals_blocked = *set;
-      break;
-    default:
-      set_errno_and_return_minus_one( EINVAL );
-  }
-
-  /* XXX are there critical section problems here? */
-
-  /* XXX evaluate the new set */
-
-  if ( ~api->signals_blocked & 
-       (api->signals_pending | _POSIX_signals_Pending) ) {
-    _Thread_Executing->do_post_task_switch_extension = TRUE;
-    _Thread_Dispatch();
-  }
-
-  return 0;
-}
-
-/*
- *  3.3.6 Examine Pending Signals, P1003.1b-1993, p. 75
- */
-
-int sigpending(
-  sigset_t  *set
-)
-{
-  POSIX_API_Control  *api;
- 
-  if ( !set )
-    set_errno_and_return_minus_one( EINVAL );
- 
-  api = _Thread_Executing->API_Extensions[ THREAD_API_POSIX ];
- 
-  *set = api->signals_pending | _POSIX_signals_Pending;
- 
-  return 0;
-}
-
-/*
- *  3.3.7 Wait for a Signal, P1003.1b-1993, p. 75
- */
-
-int sigsuspend(
-  const sigset_t  *sigmask
-)
-{
-  sigset_t            saved_signals_blocked;
-  sigset_t            all_signals;
-  int                 status;
-  POSIX_API_Control  *api;
-
-  api = _Thread_Executing->API_Extensions[ THREAD_API_POSIX ];
-
-  status = sigprocmask( SIG_BLOCK, sigmask, &saved_signals_blocked );
- 
-  (void) sigfillset( &all_signals );
-
-  status = sigtimedwait( &all_signals, NULL, NULL );
-
-  (void) sigprocmask( SIG_SETMASK, &saved_signals_blocked, NULL );
-
-  return status;
-}
-
-/*
- *  3.3.8 Synchronously Accept a Signal, P1003.1b-1993, p. 76
- *
- *  NOTE: P1003.1c/D10, p. 39 adds sigwait().
- */
-
-int sigwaitinfo(
-  const sigset_t  *set,
-  siginfo_t       *info
-)
-{
-  return sigtimedwait( set, info, NULL );
-}
-
-/*
- *  3.3.8 Synchronously Accept a Signal, P1003.1b-1993, p. 76
- *
- *  NOTE: P1003.1c/D10, p. 39 adds sigwait().
- */
-
-int _POSIX_signals_Get_highest( 
-  sigset_t   set
-)
-{
-  int signo;
- 
-  for ( signo = SIGRTMIN ; signo <= SIGRTMAX ; signo++ ) {
-    if ( set & signo_to_mask( signo ) )
-      return signo;
-  }
- 
-/* XXX - add __SIGFIRSTNOTRT or something like that to newlib siginfo.h */
-
-  for ( signo = SIGHUP ; signo <= __SIGLASTNOTRT ; signo++ ) {
-    if ( set & signo_to_mask( signo ) )
-      return signo;
-  }
-
-  return 0;
-}
-
-int sigtimedwait(
-  const sigset_t         *set,
-  siginfo_t              *info,
-  const struct timespec  *timeout
-)
-{
-  Thread_Control    *the_thread;
-  POSIX_API_Control *api;
-  Watchdog_Interval  interval;
-  siginfo_t          signal_information;
-  siginfo_t         *the_info;
-  int                signo;
-  
-  the_info = ( info ) ? info : &signal_information;
-
-  the_thread = _Thread_Executing;
-
-  api = the_thread->API_Extensions[ THREAD_API_POSIX ];
-
-  /*
-   *  What if they are already pending?
-   */
-
-  /* API signals pending? */
-
-  if ( *set & api->signals_pending ) {
-    /* XXX real info later */
-    the_info->si_signo = _POSIX_signals_Get_highest( api->signals_pending );
-    _POSIX_signals_Clear_signals( api, the_info->si_signo, the_info,
-                                  FALSE, FALSE );
-    the_info->si_code = SI_USER;
-    the_info->si_value.sival_int = 0;
-    return the_info->si_signo;
-  }
-
-  /* Process pending signals? */
-
-  if ( *set & _POSIX_signals_Pending) {
-    signo = _POSIX_signals_Get_highest( _POSIX_signals_Pending );
-    _POSIX_signals_Clear_signals( api, signo, the_info, TRUE, FALSE );
-
-    if ( !info ) {
-      the_info->si_signo = signo;
-      the_info->si_code = SI_USER;
-      the_info->si_value.sival_int = 0;
-    }
-  }
-
-  interval = 0;
-  if ( timeout ) {
-
-    if (timeout->tv_nsec < 0 || timeout->tv_nsec >= TOD_NANOSECONDS_PER_SECOND)
-      set_errno_and_return_minus_one( EINVAL );
-
-    interval = _POSIX_Timespec_to_interval( timeout );
-  }
-
-  the_info->si_signo = -1;
-
-  _Thread_Disable_dispatch();
-    the_thread->Wait.queue           = &_POSIX_signals_Wait_queue;
-    the_thread->Wait.return_code     = EINTR;
-    the_thread->Wait.option          = *set;
-    the_thread->Wait.return_argument = (void *) the_info;
-    _Thread_queue_Enter_critical_section( &_POSIX_signals_Wait_queue ); 
-    _Thread_queue_Enqueue( &_POSIX_signals_Wait_queue, interval ); 
-  _Thread_Enable_dispatch();
-
-  errno = _Thread_Executing->Wait.return_code;
-  return the_info->si_signo;
-}
-
-/*
- *  3.3.8 Synchronously Accept a Signal, P1003.1b-1993, p. 76
- *
- *  NOTE: P1003.1c/D10, p. 39 adds sigwait().
- */
-
-int sigwait(
-  const sigset_t  *set,
-  int             *sig
-)
-{
-  int status;
-
-  status = sigtimedwait( set, NULL, NULL );
-
-  if ( status != -1 ) {
-    if ( sig )
-      *sig = status;
-    return 0;
-  }
-
-  return errno;
-}
-
-/*PAGE
- *
- *  3.3.2 Send a Signal to a Process, P1003.1b-1993, p. 68
- *
- *  NOTE: Behavior of kill() depends on _POSIX_SAVED_IDS.
- */
-
-#define _POSIX_signals_Is_interested( _api, _mask ) \
-  ( ~(_api)->signals_blocked & (_mask) )
-          
-int killinfo(
-  pid_t               pid,
-  int                 sig,
-  const union sigval *value
-)
-{
-  sigset_t                     mask;
-  POSIX_API_Control           *api;
-  unsigned32                   the_class;
-  unsigned32                   index;
-  unsigned32                   maximum;
-  Objects_Information         *the_info;
-  Objects_Control            **object_table;
-  Thread_Control              *the_thread;
-  Thread_Control              *interested_thread;
-  Priority_Control             interested_priority;
-  Chain_Control               *the_chain;
-  Chain_Node                  *the_node;
-  siginfo_t                    siginfo_struct;
-  siginfo_t                   *siginfo;
-  POSIX_signals_Siginfo_node  *psiginfo;
- 
-  /*
-   *  Only supported for the "calling process" (i.e. this node).
-   */
- 
-  if( pid != getpid() )
-    set_errno_and_return_minus_one( ESRCH );
-
-  /*
-   *  Validate the signal passed if not 0.
-   */
- 
-  if ( sig && !is_valid_signo(sig) )
-    set_errno_and_return_minus_one( EINVAL );
-
-  /*
-   *  If the signal is being ignored, then we are out of here.
-   */
-
-  if ( !sig || _POSIX_signals_Vectors[ sig ].sa_handler == SIG_IGN )
-    return 0;
-
-  /*
-   *  P1003.1c/Draft 10, p. 33 says that certain signals should always 
-   *  be directed to the executing thread such as those caused by hardware
-   *  faults.
-   */
-
-  switch ( sig ) {
-    case SIGFPE:
-    case SIGILL:
-    case SIGSEGV:
-      return pthread_kill( pthread_self(), sig );
-    default:
-      break;
-  }
-
-  mask = signo_to_mask( sig );
-
-  /*
-   *  Build up a siginfo structure
-   */
-
-  siginfo = &siginfo_struct;
-  siginfo->si_signo = sig;
-  siginfo->si_code = SI_USER;
-  if ( !value ) {
-    siginfo->si_value.sival_int = 0;
-  } else {
-    siginfo->si_value = *value;
-  }
-
-  _Thread_Disable_dispatch();
-
-  /*
-   *  Is the currently executing thread interested?  If so then it will
-   *  get it an execute it as soon as the dispatcher executes.
-   */
-
-  the_thread = _Thread_Executing;
-
-  api = the_thread->API_Extensions[ THREAD_API_POSIX ];
-  if ( _POSIX_signals_Is_interested( api, mask ) ) {
-    goto process_it;
-  }
-
-  /*
-   *  Is an interested thread waiting for this signal (sigwait())?
-   */
-
-  /* XXX violation of visibility -- need to define thread queue support */
-
-  for( index=0 ;
-       index < TASK_QUEUE_DATA_NUMBER_OF_PRIORITY_HEADERS ;
-       index++ ) {
-
-    the_chain = &_POSIX_signals_Wait_queue.Queues.Priority[ index ];
- 
-    for ( the_node = the_chain->first ;
-          !_Chain_Is_tail( the_chain, the_node ) ;
-          the_node = the_node->next ) {
-
-      the_thread = (Thread_Control *)the_node;
-      api = the_thread->API_Extensions[ THREAD_API_POSIX ];
-
-      if ((the_thread->Wait.option & mask) || (~api->signals_blocked & mask)) {
-        goto process_it;
-      }
-
-    }
-  }
-
-  /*
-   *  Is any other thread interested?  The highest priority interested
-   *  thread is selected.  In the event of a tie, then the following
-   *  additional criteria is used:
-   *
-   *    + ready thread over blocked
-   *    + blocked on call interruptible by signal (can return EINTR)
-   *    + blocked on call not interruptible by signal
-   *
-   *  This looks at every thread in the system regardless of the creating API.
-   *
-   *  NOTES:
-   *
-   *    + rtems internal threads do not receive signals.
-   */
-
-  interested_thread = NULL;
-  interested_priority = PRIORITY_MAXIMUM + 1;
-
-  for ( the_class = OBJECTS_CLASSES_FIRST_THREAD_CLASS;
-        the_class <= OBJECTS_CLASSES_LAST_THREAD_CLASS;
-        the_class++ ) {
-
-    if ( the_class == OBJECTS_INTERNAL_THREADS )
-      continue;
-
-    the_info = _Objects_Information_table[ the_class ];
-
-    if ( !the_info )                        /* manager not installed */
-      continue;
-
-    maximum = the_info->maximum;
-    object_table = the_info->local_table;
-
-    assert( object_table );                 /* always at least 1 entry */
-
-    for ( index = 1 ; index <= maximum ; index++ ) {
-      the_thread = (Thread_Control *) object_table[ index ];
-
-      if ( !the_thread )
-        continue;
-
-      /*
-       *  If this thread is of lower priority than the interested thread,
-       *  go on to the next thread.
-       */
-
-      if ( the_thread->current_priority > interested_priority )
-        continue;
-
-      /*
-       *  If this thread is not interested, then go on to the next thread.
-       */
-
-      api = the_thread->API_Extensions[ THREAD_API_POSIX ];
-
-      if ( !api || !_POSIX_signals_Is_interested( api, mask ) )
-        continue;
-
-      /*
-       *  Now we know the thread under connsideration is interested.
-       *  If the thread under consideration is of higher priority, then
-       *  it becomes the interested thread.
-       */
-
-      if ( the_thread->current_priority < interested_priority ) {
-        interested_thread   = the_thread;
-        interested_priority = the_thread->current_priority;
-        continue;
-      }
-
-      /*
-       *  Now the thread and the interested thread have the same priority.
-       *  If the interested thread is ready, then we don't need to send it
-       *  to a blocked thread.
-       */
-
-      if ( _States_Is_ready( interested_thread->current_state ) )
-        continue;
-
-      /*
-       *  Now the interested thread is blocked.
-       *  If the thread we are considering is not, the it becomes the 
-       *  interested thread.
-       */
-
-      if ( _States_Is_ready( the_thread->current_state ) ) {
-        interested_thread   = the_thread;
-        interested_priority = the_thread->current_priority;
-        continue;
-      }
-
-      /*
-       *  Now we know both threads are blocked.
-       *  If the interested thread is interruptible, then just use it.
-       */
-
-      /* XXX need a new states macro */
-      if ( interested_thread->current_state & STATES_INTERRUPTIBLE_BY_SIGNAL )
-        continue;
-
-      /*
-       *  Now both threads are blocked and the interested thread is not 
-       *  interruptible.
-       *  If the thread under consideration is interruptible by a signal,
-       *  then it becomes the interested thread.
-       */
-
-      /* XXX need a new states macro */
-      if ( the_thread->current_state & STATES_INTERRUPTIBLE_BY_SIGNAL ) {
-        interested_thread   = the_thread;
-        interested_priority = the_thread->current_priority;
-      }
-    }
-  }
-
-  if ( interested_thread ) {
-    the_thread = interested_thread;
-    goto process_it;
-  }
-
-  /*
-   *  OK so no threads were interested right now.  It will be left on the
-   *  global pending until a thread receives it.  The global set of threads
-   *  can change interest in this signal in one of the following ways:
-   *
-   *    + a thread is created with the signal unblocked,
-   *    + pthread_sigmask() unblocks the signal,
-   *    + sigprocmask() unblocks the signal, OR
-   *    + sigaction() which changes the handler to SIG_IGN. 
-   */
-
-  the_thread = NULL;
-  goto post_process_signal;
-
-  /*
-   *  We found a thread which was interested, so now we mark that this 
-   *  thread needs to do the post context switch extension so it can 
-   *  evaluate the signals pending.
-   */
-
-process_it:
-  
-  the_thread->do_post_task_switch_extension = TRUE;
-
-  /*
-   *  Returns TRUE if the signal was synchronously given to a thread
-   *  blocked waiting for the signal.
-   */
-
-  if ( _POSIX_signals_Unblock_thread( the_thread, sig, siginfo ) ) {
-    _Thread_Enable_dispatch();
-    return 0;
-  }
-
-post_process_signal:
-
-  /*
-   *  We may have woken up a thread but we definitely need to post the
-   *  signal to the process wide information set.
-   */
-
-  _POSIX_signals_Set_process_signals( mask );
-
-  if ( _POSIX_signals_Vectors[ sig ].sa_flags == SA_SIGINFO ) {
-
-    psiginfo = (POSIX_signals_Siginfo_node *)
-               _Chain_Get( &_POSIX_signals_Inactive_siginfo );
-    if ( !psiginfo )
-      set_errno_and_return_minus_one( EAGAIN );
-
-    psiginfo->Info = *siginfo;
-
-    _Chain_Append( &_POSIX_signals_Siginfo[ sig ], &psiginfo->Node );
-  }
-
-  _Thread_Enable_dispatch();
-  return 0;
-}
-
-/*PAGE
- *
- *  3.3.2 Send a Signal to a Process, P1003.1b-1993, p. 68
- *
- *  NOTE: Behavior of kill() depends on _POSIX_SAVED_IDS.
- */
-
-int kill(
-  pid_t pid,
-  int   sig
-)
-{
-  return killinfo( pid, sig, NULL );
-}
-
-/*
- *  3.3.9 Queue a Signal to a Process, P1003.1b-1993, p. 78
- */
-
-int sigqueue(
-  pid_t               pid,
-  int                 signo,
-  const union sigval  value
-)
-{
-  return killinfo( pid, signo, &value );
-}
-
-/*
- *  3.3.10 Send a Signal to a Thread, P1003.1c/D10, p. 43
- */
-
-int pthread_kill(
-  pthread_t   thread,
-  int         sig
-)
-{
-  POSIX_API_Control  *api;
-  Thread_Control     *the_thread;
-  Objects_Locations  location;
-
-  if ( sig && !is_valid_signo(sig) )
-    set_errno_and_return_minus_one( EINVAL );
-
-  if ( _POSIX_signals_Vectors[ sig ].sa_flags == SA_SIGINFO )
-    set_errno_and_return_minus_one( ENOSYS );
-
-  /*
-   *  RTEMS does not support sending  a siginfo signal to a specific thread.
-   */
-
-  the_thread = _POSIX_Threads_Get( thread, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-    case OBJECTS_REMOTE:
-      set_errno_and_return_minus_one( ESRCH );
-    case OBJECTS_LOCAL:
-      /*
-       *  If sig == 0 then just validate arguments
-       */
-
-      api = the_thread->API_Extensions[ THREAD_API_POSIX ];
-
-      if ( sig ) {
-
-        if ( _POSIX_signals_Vectors[ sig ].sa_handler == SIG_IGN ) {
-          _Thread_Enable_dispatch();
-          return 0;
-        }
-
-        /* XXX critical section */
-
-        api->signals_pending |= signo_to_mask( sig );
-
-        (void) _POSIX_signals_Unblock_thread( the_thread, sig, NULL );
-
-        the_thread->do_post_task_switch_extension = TRUE;
-
-        if ( _ISR_Is_in_progress() && _Thread_Is_executing( the_thread ) )
-          _ISR_Signals_to_thread_executing = TRUE;
-      }
-      _Thread_Enable_dispatch();
-      return 0;
-  }
-
-  return POSIX_BOTTOM_REACHED();
-}
-
-/*
- *  3.4.1 Schedule Alarm, P1003.1b-1993, p. 79
- */
-
-Watchdog_Control _POSIX_signals_Alarm_timer;
-
-unsigned int alarm(
-  unsigned int seconds
-)
-{
-  unsigned int      remaining = 0;
-  Watchdog_Control *the_timer;
-
-  the_timer = &_POSIX_signals_Alarm_timer;
-
-  switch ( _Watchdog_Remove( the_timer ) ) {
-    case WATCHDOG_INACTIVE:
-    case WATCHDOG_BEING_INSERTED:
-      break;
- 
-    case WATCHDOG_ACTIVE:
-    case WATCHDOG_REMOVE_IT:
-      remaining = the_timer->initial - 
-                  (the_timer->stop_time - the_timer->start_time);
-      break;
-  }
-
-  _Watchdog_Insert_seconds( the_timer, seconds );
-
-  return remaining;
-}
-
-/*
- *  3.4.2 Suspend Process Execution, P1003.1b-1993, p. 81
- */
-
-int pause( void )
-{
-  sigset_t  all_signals;
-  int       status;
- 
-  (void) sigfillset( &all_signals );
- 
-  status = sigtimedwait( &all_signals, NULL, NULL );
- 
-  return status;
-}
diff --git a/cpukit/posix/src/pthread.c b/cpukit/posix/src/pthread.c
deleted file mode 100644
index f8c6116dd0..0000000000
--- a/cpukit/posix/src/pthread.c
+++ /dev/null
@@ -1,1313 +0,0 @@
-/*
- *  $Id$
- */
-
-#include <assert.h>
-#include <errno.h>
-#include <pthread.h>
-#include <limits.h>
-
-#include <rtems/system.h>
-#include <rtems/score/apiext.h>
-#include <rtems/score/stack.h>
-#include <rtems/score/thread.h>
-#include <rtems/score/userext.h>
-#include <rtems/score/wkspace.h>
-#include <rtems/posix/pthread.h>
-#include <rtems/posix/priority.h>
-#include <rtems/posix/psignal.h>
-#include <rtems/posix/config.h>
-#include <rtems/posix/key.h>
-#include <rtems/posix/time.h>
-
-/*PAGE
- *
- *  The default pthreads attributes structure.
- *
- *  NOTE: Be careful .. if the default attribute set changes, 
- *        _POSIX_Threads_Initialize_user_threads will need to be examined.
- *
- */
- 
-const pthread_attr_t _POSIX_Threads_Default_attributes = {
-  TRUE,                       /* is_initialized */
-  NULL,                       /* stackaddr */
-  PTHREAD_MINIMUM_STACK_SIZE, /* stacksize */
-  PTHREAD_SCOPE_PROCESS,      /* contentionscope */
-  PTHREAD_INHERIT_SCHED,      /* inheritsched */
-  SCHED_FIFO,                 /* schedpolicy */
-  {                           /* schedparam */
-    2,                        /* sched_priority */
-    0,                        /* ss_low_priority */
-    { 0L, 0 },                /* ss_replenish_period */
-    { 0L, 0 }                 /* ss_initial_budget */
-  },
-  PTHREAD_CREATE_JOINABLE,    /* detachstate */
-  1                           /* cputime_clock_allowed */
-};
-
-/*PAGE
- *
- *  _POSIX_Threads_Sporadic_budget_TSR
- */
-
-void _POSIX_Threads_Sporadic_budget_TSR(
-  Objects_Id      id,
-  void           *argument
-)
-{
-  unsigned32          ticks;
-  unsigned32          new_priority;
-  Thread_Control     *the_thread;
-  POSIX_API_Control  *api;
-
-  the_thread = argument;
-
-  api = the_thread->API_Extensions[ THREAD_API_POSIX ];
-
-  ticks = _POSIX_Timespec_to_interval( &api->schedparam.ss_initial_budget );
-
-  if ( !ticks )
-    ticks = 1;
-
-  the_thread->cpu_time_budget = ticks;
-  
-  new_priority = _POSIX_Priority_To_core( api->ss_high_priority );
-  the_thread->real_priority = new_priority;
-
-  if ( the_thread->resource_count == 0 ||
-       the_thread->current_priority > new_priority )
-    _Thread_Change_priority( the_thread, new_priority, TRUE );
-
-  ticks = _POSIX_Timespec_to_interval( &api->schedparam.ss_replenish_period );
-
-  if ( !ticks )
-    ticks = 1;
-
-  _Watchdog_Insert_ticks( &api->Sporadic_timer, ticks );
-}
-
-/*PAGE
- *
- *  _POSIX_Threads_Sporadic_budget_callout
- */
-
-void _POSIX_Threads_Sporadic_budget_callout(
-  Thread_Control *the_thread
-)
-{
-  POSIX_API_Control *api;
-  unsigned32         new_priority;
-
-  api = the_thread->API_Extensions[ THREAD_API_POSIX ];
-
-  /*
-   *  This will prevent the thread from consuming its entire "budget"
-   *  while at low priority.
-   */
-
-
-  the_thread->cpu_time_budget = 0xFFFFFFFF; /* XXX should be based on MAX_U32 */
-
-  new_priority = _POSIX_Priority_To_core( api->schedparam.ss_low_priority );
-  the_thread->real_priority = new_priority;
-
- if ( the_thread->resource_count == 0 ||
-      the_thread->current_priority > new_priority )
-    _Thread_Change_priority( the_thread, new_priority, TRUE );
-}
-
-/*PAGE
- *
- *  _POSIX_Threads_Create_extension
- *
- *  XXX
- */
- 
-boolean _POSIX_Threads_Create_extension(
-  Thread_Control *executing,
-  Thread_Control *created
-)
-{
-  POSIX_API_Control *api;
-  POSIX_API_Control *executing_api;
- 
-  api = _Workspace_Allocate( sizeof( POSIX_API_Control ) );
- 
-  if ( !api )
-    return FALSE;
- 
-  created->API_Extensions[ THREAD_API_POSIX ] = api;
- 
-  /* XXX check all fields are touched */
-  api->Attributes  = _POSIX_Threads_Default_attributes;
-  api->detachstate = _POSIX_Threads_Default_attributes.detachstate;
-  api->schedpolicy = _POSIX_Threads_Default_attributes.schedpolicy;
-  api->schedparam  = _POSIX_Threads_Default_attributes.schedparam;
-  api->schedparam.sched_priority = 
-     _POSIX_Priority_From_core( created->current_priority );
- 
-  /*
-   *  If the thread is not a posix thread, then all posix signals are blocked
-   *  by default.
-   */
-
-  /* XXX use signal constants */
-  api->signals_pending = 0;
-  if ( _Objects_Get_class( created->Object.id ) == OBJECTS_POSIX_THREADS ) {
-    executing_api = _Thread_Executing->API_Extensions[ THREAD_API_POSIX ];
-    api->signals_blocked = api->signals_blocked;
-  } else
-    api->signals_blocked = 0xffffffff;
-
-/* XXX set signal parameters -- block all signals for non-posix threads */
-
-  _Thread_queue_Initialize(
-    &api->Join_List,
-    OBJECTS_NO_CLASS,                 /* only used for proxy operations */
-    THREAD_QUEUE_DISCIPLINE_FIFO,
-    STATES_WAITING_FOR_JOIN_AT_EXIT,
-    NULL,                             /* no extract proxy handler */
-    0
-  );
- 
-  _Watchdog_Initialize(
-    &api->Sporadic_timer,
-    _POSIX_Threads_Sporadic_budget_TSR,
-    created->Object.id,
-    created
-  );
-
-  return TRUE;
-}
-
-/*PAGE
- *
- *  _POSIX_Threads_Delete_extension
- */
- 
-User_extensions_routine _POSIX_Threads_Delete_extension(
-  Thread_Control *executing,
-  Thread_Control *deleted
-)
-{
-  Thread_Control     *the_thread;
-  POSIX_API_Control  *api;
-  void              **value_ptr;
-
-  api = deleted->API_Extensions[ THREAD_API_POSIX ];
- 
-  /* XXX run cancellation handlers */
-
-  _POSIX_Keys_Run_destructors( deleted );
-
-  /*
-   *  Wakeup all the tasks which joined with this one
-   */
- 
-  value_ptr = (void **) deleted->Wait.return_argument;
-
-  while ( (the_thread = _Thread_queue_Dequeue( &api->Join_List )) )
-      *(void **)the_thread->Wait.return_argument = value_ptr;
- 
-  if ( api->schedpolicy == SCHED_SPORADIC )
-    (void) _Watchdog_Remove( &api->Sporadic_timer );
-
-  deleted->API_Extensions[ THREAD_API_POSIX ] = NULL;
-
-  (void) _Workspace_Free( api );
-}
-
-/*PAGE
- *
- *  _POSIX_Threads_Initialize_user_threads
- *
- *  This routine creates and starts all configured user
- *  initialzation threads.
- *
- *  Input parameters: NONE
- *
- *  Output parameters:  NONE
- */
- 
-void _POSIX_Threads_Initialize_user_threads( void )
-{
-  int                                 status;
-  unsigned32                          index;
-  unsigned32                          maximum;
-  posix_initialization_threads_table *user_threads;
-  pthread_t                           thread_id;
-  pthread_attr_t                      attr;
- 
-  user_threads = _POSIX_Threads_User_initialization_threads;
-  maximum      = _POSIX_Threads_Number_of_initialization_threads;
-
-  if ( !user_threads || maximum == 0 )
-    return;
- 
-  /*
-   *  Be careful .. if the default attribute set changes, this may need to.
-   *
-   *  Setting the attributes explicitly is critical, since we don't want
-   *  to inherit the idle tasks attributes. 
-   */
-
-  for ( index=0 ; index < maximum ; index++ ) {
-    status = pthread_attr_init( &attr );
-    assert( !status );
-      
-    status = pthread_attr_setinheritsched( &attr, PTHREAD_EXPLICIT_SCHED );
-    assert( !status );
-
-    status = pthread_attr_setstacksize( &attr, PTHREAD_MINIMUM_STACK_SIZE * 2 );
-    assert( !status );
-
-    status = pthread_create(
-      &thread_id,
-      &attr,
-      user_threads[ index ].thread_entry,
-      NULL
-    );
-    assert( !status );
-  }
-}
-
-/*PAGE
- *
- *  API Extension control structures
- */
-
-API_extensions_Control _POSIX_Threads_API_extensions = {
-  { NULL, NULL },
-  NULL,                                     /* predriver */
-  _POSIX_Threads_Initialize_user_threads,   /* postdriver */
-  _POSIX_signals_Post_switch_extension,     /* post switch */
-};
- 
-User_extensions_Control _POSIX_Threads_User_extensions = {
-  { NULL, NULL },
-  { _POSIX_Threads_Create_extension,          /* create */
-    NULL,                                     /* start */
-    NULL,                                     /* restart */
-    _POSIX_Threads_Delete_extension,          /* delete */
-    NULL,                                     /* switch */
-    NULL,                                     /* begin */
-    NULL,                                     /* exitted */
-    NULL                                      /* fatal */
-  }
-};
- 
-/*PAGE
- *
- *  _POSIX_Threads_Manager_initialization
- *
- *  This routine initializes all threads manager related data structures.
- *
- *  Input parameters:
- *    maximum_pthreads - maximum configured pthreads
- *
- *  Output parameters:  NONE
- */
- 
-void _POSIX_Threads_Manager_initialization(
-  unsigned32                          maximum_pthreads,
-  unsigned32                          number_of_initialization_threads,
-  posix_initialization_threads_table *user_threads
-  
-)
-{
-  _POSIX_Threads_Number_of_initialization_threads = 
-                                           number_of_initialization_threads;
-  _POSIX_Threads_User_initialization_threads = user_threads;
-
-  /*
-   *  There may not be any POSIX initialization threads configured.
-   */
-
-#if 0
-  if ( user_threads == NULL || number_of_initialization_threads == 0 )
-    _Internal_error_Occurred( INTERNAL_ERROR_POSIX_API, TRUE, EINVAL );
-#endif
-
-  _Objects_Initialize_information(
-    &_POSIX_Threads_Information,
-    OBJECTS_POSIX_THREADS,
-    FALSE,                               /* does not support global */
-    maximum_pthreads,
-    sizeof( Thread_Control ),
-    TRUE,
-    5,                                   /* length is arbitrary for now */
-    TRUE                                 /* this class is threads */
-  );
-
-  /*
-   *  Add all the extensions for this API
-   */
- 
-  _User_extensions_Add_API_set( &_POSIX_Threads_User_extensions );
- 
-  _API_extensions_Add( &_POSIX_Threads_API_extensions );
- 
-  /*
-   *  If we supported MP, then here we would ...
-   *       Register the MP Process Packet routine.
-   */
- 
-}
-
-/*PAGE
- *
- *  3.1.3 Register Fork Handlers, P1003.1c/Draft 10, P1003.1c/Draft 10, p. 27
- *
- *  RTEMS does not support processes, so we fall under this and do not
- *  provide this routine:
- *
- *  "Either the implementation shall support the pthread_atfork() function
- *   as described above or the pthread_atfork() funciton shall not be
- *   provided."
- */
-
-/*PAGE
- *
- *  13.5.1 Thread Creation Scheduling Attributes, P1003.1c/Draft 10, p. 120
- */
-
-int pthread_attr_setscope(
-  pthread_attr_t  *attr,
-  int              contentionscope
-)
-{
-  if ( !attr || !attr->is_initialized )
-    return EINVAL;
-
-  switch ( contentionscope ) {
-    case PTHREAD_SCOPE_PROCESS:
-      attr->contentionscope = contentionscope;
-      return 0;
-
-    case PTHREAD_SCOPE_SYSTEM:
-      return ENOTSUP;
-
-    default:
-      return EINVAL;
-  }
-}
-
-/*PAGE
- *
- *  13.5.1 Thread Creation Scheduling Attributes, P1003.1c/Draft 10, p. 120
- */
-
-int pthread_attr_getscope(
-  const pthread_attr_t  *attr,
-  int                   *contentionscope
-)
-{
-  if ( !attr || !attr->is_initialized || !contentionscope )
-    return EINVAL;
-
-  *contentionscope = attr->contentionscope;
-  return 0;
-}
-
-/*PAGE
- *
- *  13.5.1 Thread Creation Scheduling Attributes, P1003.1c/Draft 10, p. 120
- */
-
-int pthread_attr_setinheritsched(
-  pthread_attr_t  *attr,
-  int              inheritsched
-)
-{
-  if ( !attr || !attr->is_initialized )
-    return EINVAL;
-
-  switch ( inheritsched ) {
-    case PTHREAD_INHERIT_SCHED:
-    case PTHREAD_EXPLICIT_SCHED:
-      attr->inheritsched = inheritsched;
-      return 0;
-
-    default:
-      return ENOTSUP;
-  }
-}
-
-/*PAGE
- *
- *  13.5.1 Thread Creation Scheduling Attributes, P1003.1c/Draft 10, p. 120
- */
-
-int pthread_attr_getinheritsched(
-  const pthread_attr_t  *attr,
-  int                   *inheritsched
-)
-{
-  if ( !attr || !attr->is_initialized || !inheritsched )
-    return EINVAL;
-
-  *inheritsched = attr->inheritsched;
-  return 0;
-}
-
-/*PAGE
- *
- *  13.5.1 Thread Creation Scheduling Attributes, P1003.1c/Draft 10, p. 120
- */
-
-int pthread_attr_setschedpolicy(
-  pthread_attr_t  *attr,
-  int              policy
-)
-{
-  if ( !attr || !attr->is_initialized )
-    return EINVAL;
-
-  switch ( policy ) {
-    case SCHED_OTHER:
-    case SCHED_FIFO:
-    case SCHED_RR:
-    case SCHED_SPORADIC:
-      attr->schedpolicy = policy;
-      return 0;
- 
-    default:
-      return ENOTSUP;
-  }
-}
-
-/*PAGE
- *
- *  13.5.1 Thread Creation Scheduling Parameters, P1003.1c/Draft 10, p. 120
- */
-
-int pthread_attr_getschedpolicy(
-  const pthread_attr_t  *attr,
-  int                   *policy
-)
-{
-  if ( !attr || !attr->is_initialized || !policy )
-    return EINVAL;
-
-  *policy = attr->schedpolicy;
-  return 0;
-}
-
-/*PAGE
- *
- *  13.5.1 Thread Creation Scheduling Parameters, P1003.1c/Draft 10, p. 120
- */
-
-int pthread_attr_setschedparam(
-  pthread_attr_t           *attr,
-  const struct sched_param *param
-)
-{
-  if ( !attr || !attr->is_initialized || !param )
-    return EINVAL;
-
-  attr->schedparam = *param;
-  return 0;
-}
-
-/*PAGE
- *
- *  13.5.1 Thread Creation Scheduling Attributes, P1003.1c/Draft 10, p. 120
- */
-
-int pthread_attr_getschedparam(
-  const pthread_attr_t   *attr,
-  struct sched_param     *param
-)
-{
-  if ( !attr || !attr->is_initialized || !param )
-    return EINVAL;
-
-  *param = attr->schedparam;
-  return 0;
-}
-
-/*PAGE
- *
- *  13.5.2 Dynamic Thread Scheduling Parameters Access, 
- *         P1003.1c/Draft 10, p. 124
- */
-
-int pthread_getschedparam(
-  pthread_t           thread,
-  int                *policy,
-  struct sched_param *param
-)
-{
-  Objects_Locations        location;
-  POSIX_API_Control       *api;
-  register Thread_Control *the_thread;
-
-  if ( !policy || !param  )
-    return EINVAL;
-
-  the_thread = _POSIX_Threads_Get( thread, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-    case OBJECTS_REMOTE:
-      return ESRCH;
-    case OBJECTS_LOCAL:
-      api = the_thread->API_Extensions[ THREAD_API_POSIX ];
-      *policy = api->schedpolicy;
-      *param  = api->schedparam;
-      param->sched_priority =
-        _POSIX_Priority_From_core( the_thread->current_priority );
-      _Thread_Enable_dispatch();
-      return 0;
-  }
- 
-  return POSIX_BOTTOM_REACHED();
-
-}
-
-/*PAGE
- *
- *  13.5.2 Dynamic Thread Scheduling Parameters Access, 
- *         P1003.1c/Draft 10, p. 124
- */
-
-int pthread_setschedparam(
-  pthread_t           thread,
-  int                 policy,
-  struct sched_param *param
-)
-{
-  register Thread_Control             *the_thread;
-  POSIX_API_Control                   *api;
-  Thread_CPU_budget_algorithms         budget_algorithm;
-  Thread_CPU_budget_algorithm_callout  budget_callout;
-  Objects_Locations                    location;
- 
-  /*
-   *  Check all the parameters
-   */
-
-  if ( !param )
-    return EINVAL;
-
-  if ( !_POSIX_Priority_Is_valid( param->sched_priority ) )
-    return EINVAL;
-
-  budget_algorithm = THREAD_CPU_BUDGET_ALGORITHM_NONE;
-  budget_callout = NULL;
-
-  switch ( policy ) {
-    case SCHED_OTHER:
-      budget_algorithm = THREAD_CPU_BUDGET_ALGORITHM_RESET_TIMESLICE;
-      break;
- 
-    case SCHED_FIFO:
-      budget_algorithm = THREAD_CPU_BUDGET_ALGORITHM_NONE;
-      break;
- 
-    case SCHED_RR:
-      budget_algorithm = THREAD_CPU_BUDGET_ALGORITHM_EXHAUST_TIMESLICE;
-      break;
- 
-    case SCHED_SPORADIC:
-      budget_algorithm  = THREAD_CPU_BUDGET_ALGORITHM_CALLOUT;
-      budget_callout = _POSIX_Threads_Sporadic_budget_callout;
- 
-      if ( _POSIX_Timespec_to_interval( &param->ss_replenish_period ) <
-           _POSIX_Timespec_to_interval( &param->ss_initial_budget ) )
-        return EINVAL;
- 
-      if ( !_POSIX_Priority_Is_valid( param->ss_low_priority ) )
-        return EINVAL;
- 
-      break;
- 
-    default:
-      return EINVAL;
-  }
-
-  /*
-   *  Actually change the scheduling policy and parameters
-   */
-
-  the_thread = _POSIX_Threads_Get( thread, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-    case OBJECTS_REMOTE:
-      return ESRCH;
-    case OBJECTS_LOCAL:
-      api = the_thread->API_Extensions[ THREAD_API_POSIX ];
-
-      if ( api->schedpolicy == SCHED_SPORADIC )
-        (void) _Watchdog_Remove( &api->Sporadic_timer );
-
-      api->schedpolicy = policy;
-      api->schedparam  = *param;
-      the_thread->budget_algorithm = budget_algorithm;
-      the_thread->budget_callout   = budget_callout;
-
-      switch ( api->schedpolicy ) {
-        case SCHED_OTHER:
-        case SCHED_FIFO:
-        case SCHED_RR:
-          the_thread->cpu_time_budget = _Thread_Ticks_per_timeslice;
-
-          the_thread->real_priority =
-            _POSIX_Priority_To_core( api->schedparam.sched_priority );
-
-          _Thread_Change_priority(
-             the_thread,
-             the_thread->real_priority,
-             TRUE
-          );
-          break;
- 
-        case SCHED_SPORADIC:
-          api->ss_high_priority = api->schedparam.sched_priority;
-          _POSIX_Threads_Sporadic_budget_TSR( 0, the_thread );
-          break;
-      }
-
-      _Thread_Enable_dispatch();
-      return 0;
-  }
-  return POSIX_BOTTOM_REACHED();
-}
-
-/*PAGE
- *
- *  16.1.1 Thread Creation Attributes, P1003.1c/Draft 10, p, 140
- */
-
-int pthread_attr_init(
-  pthread_attr_t  *attr
-)
-{
-  if ( !attr )
-    return EINVAL;
- 
-  *attr = _POSIX_Threads_Default_attributes;
-  return 0;
-}
-
-/*PAGE
- *
- *  16.1.1 Thread Creation Attributes, P1003.1c/Draft 10, p, 140
- */
-
-int pthread_attr_destroy(
-  pthread_attr_t  *attr
-)
-{
-  if ( !attr || !attr->is_initialized )
-    return EINVAL;
- 
-  attr->is_initialized = FALSE;
-  return 0;
-}
- 
-/*PAGE
- *
- *  16.1.1 Thread Creation Attributes, P1003.1c/Draft 10, p, 140
- */
-
-int pthread_attr_getstacksize(
-  const pthread_attr_t  *attr,
-  size_t                *stacksize
-)
-{
-  if ( !attr || !attr->is_initialized || !stacksize )
-    return EINVAL;
-
-  *stacksize = attr->stacksize;
-  return 0;
-}
- 
-/*PAGE
- *
- *  16.1.1 Thread Creation Attributes, P1003.1c/Draft 10, p, 140
- */
-
-int pthread_attr_setstacksize(
-  pthread_attr_t  *attr,
-  size_t           stacksize
-)
-{
-  if ( !attr || !attr->is_initialized )
-    return EINVAL;
-
-  if (stacksize < PTHREAD_MINIMUM_STACK_SIZE)
-    attr->stacksize = PTHREAD_MINIMUM_STACK_SIZE;
-  else
-    attr->stacksize = stacksize;
-  return 0;
-}
- 
-/*PAGE
- *
- *  16.1.1 Thread Creation Attributes, P1003.1c/Draft 10, p, 140
- */
-
-int pthread_attr_getstackaddr(
-  const pthread_attr_t   *attr,
-  void                  **stackaddr
-)
-{
-  if ( !attr || !attr->is_initialized || !stackaddr )
-    return EINVAL;
-
-  *stackaddr = attr->stackaddr;
-  return 0;
-}
- 
-/*PAGE
- *
- *  16.1.1 Thread Creation Attributes, P1003.1c/Draft 10, p, 140
- */
-
-int pthread_attr_setstackaddr(
-  pthread_attr_t  *attr,
-  void            *stackaddr
-)
-{
-  if ( !attr || !attr->is_initialized )
-    return EINVAL;
-
-  attr->stackaddr = stackaddr;
-  return 0;
-}
- 
-/*PAGE
- *
- *  16.1.1 Thread Creation Attributes, P1003.1c/Draft 10, p, 140
- */
-
-int pthread_attr_getdetachstate(
-  const pthread_attr_t  *attr,
-  int                   *detachstate
-)
-{
-  if ( !attr || !attr->is_initialized || !detachstate )
-    return EINVAL;
-
-  *detachstate = attr->detachstate;
-  return 0;
-}
- 
-/*PAGE
- *
- *  16.1.1 Thread Creation Attributes, P1003.1c/Draft 10, p, 140
- */
-
-int pthread_attr_setdetachstate(
-  pthread_attr_t  *attr,
-  int              detachstate
-)
-{
-  if ( !attr || !attr->is_initialized )
-    return EINVAL;
-
-  switch ( detachstate ) {
-    case PTHREAD_CREATE_DETACHED:
-    case PTHREAD_CREATE_JOINABLE:
-      attr->detachstate = detachstate;
-      return 0;
- 
-    default:
-      return EINVAL;
-  }
-}
-
-/*PAGE
- *
- *  16.1.2 Thread Creation, P1003.1c/Draft 10, p. 144
- */
-
-int pthread_create(
-  pthread_t              *thread,
-  const pthread_attr_t   *attr,
-  void                 *(*start_routine)( void * ),
-  void                   *arg
-)
-{
-  const pthread_attr_t               *the_attr;
-  Priority_Control                    core_priority;
-  Thread_CPU_budget_algorithms        budget_algorithm;
-  Thread_CPU_budget_algorithm_callout budget_callout;
-  boolean                             is_fp;
-  boolean                             status;
-  Thread_Control                     *the_thread;
-  char                               *default_name = "psx";
-  POSIX_API_Control                  *api;
-  int                                 schedpolicy = SCHED_RR;
-  struct sched_param                  schedparam;
-
-  the_attr = (attr) ? attr : &_POSIX_Threads_Default_attributes;
-
-  if ( !the_attr->is_initialized )
-    return EINVAL;
-
-  /*
-   *  Core Thread Initialize insures we get the minimum amount of
-   *  stack space if it is allowed to allocate it itself.
-   */
-
-  if ( the_attr->stackaddr && !_Stack_Is_enough( the_attr->stacksize ) )
-    return EINVAL;
-
-#if 0
-  int  cputime_clock_allowed;  /* see time.h */
-  POSIX_NOT_IMPLEMENTED();
-#endif
-
-  /*
-   *  P1003.1c/Draft 10, p. 121.
-   *
-   *  If inheritsched is set to PTHREAD_INHERIT_SCHED, then this thread
-   *  inherits scheduling attributes from the creating thread.   If it is
-   *  PTHREAD_EXPLICIT_SCHED, then scheduling parameters come from the 
-   *  attributes structure.
-   */
-
-  switch ( the_attr->inheritsched ) {
-    case PTHREAD_INHERIT_SCHED:
-      api = _Thread_Executing->API_Extensions[ THREAD_API_POSIX ];
-      schedpolicy = api->schedpolicy;
-      schedparam  = api->schedparam;
-      break; 
-
-    case PTHREAD_EXPLICIT_SCHED:
-      schedpolicy = the_attr->schedpolicy;
-      schedparam  = the_attr->schedparam;
-      break; 
-
-    default:
-      return EINVAL;
-  }
-
-  /*
-   *  Check the contentionscope since rtems only supports PROCESS wide 
-   *  contention (i.e. no system wide contention).
-   */
-
-  if ( the_attr->contentionscope != PTHREAD_SCOPE_PROCESS )
-    return ENOTSUP;
-
-  /*
-   *  Interpret the scheduling parameters.
-   */
-
-  if ( !_POSIX_Priority_Is_valid( schedparam.sched_priority ) )
-    return EINVAL;
- 
-  core_priority = _POSIX_Priority_To_core( schedparam.sched_priority );
- 
-  /*
-   *  Set the core scheduling policy information.
-   */
-
-  budget_callout = NULL;
-  budget_algorithm = THREAD_CPU_BUDGET_ALGORITHM_NONE;
-
-  switch ( schedpolicy ) {
-    case SCHED_OTHER:
-      budget_algorithm = THREAD_CPU_BUDGET_ALGORITHM_RESET_TIMESLICE;
-      break;
-     
-    case SCHED_FIFO:
-      budget_algorithm = THREAD_CPU_BUDGET_ALGORITHM_NONE;
-      break;
-
-    case SCHED_RR:
-      budget_algorithm = THREAD_CPU_BUDGET_ALGORITHM_EXHAUST_TIMESLICE;
-      break;
-
-    case SCHED_SPORADIC:
-      budget_algorithm  = THREAD_CPU_BUDGET_ALGORITHM_CALLOUT;
-      budget_callout = _POSIX_Threads_Sporadic_budget_callout;
-  
-      if ( _POSIX_Timespec_to_interval( &schedparam.ss_replenish_period ) <
-           _POSIX_Timespec_to_interval( &schedparam.ss_initial_budget ) )
-        return EINVAL;
-
-      if ( !_POSIX_Priority_Is_valid( schedparam.ss_low_priority ) )
-        return EINVAL;
-
-      break;
-
-    default:
-      return EINVAL;
-  }
-
-  /*
-   *  Currently all POSIX threads are floating point if the hardware 
-   *  supports it.
-   */
-
-  is_fp = CPU_HARDWARE_FP;
-
-  /*
-   *  Disable dispatch for protection
-   */
- 
-  _Thread_Disable_dispatch();
- 
-  /*
-   *  Allocate the thread control block.
-   *
-   *  NOTE:  Global threads are not currently supported.
-   */
-
-  the_thread = _POSIX_Threads_Allocate();
-
-  if ( !the_thread ) {
-    _Thread_Enable_dispatch();
-    return EAGAIN;
-  }
-
-  /*
-   *  Initialize the core thread for this task.
-   */
- 
-  status = _Thread_Initialize(
-    &_POSIX_Threads_Information,
-    the_thread,
-    the_attr->stackaddr,
-    the_attr->stacksize,
-    is_fp,
-    core_priority,
-    TRUE,                 /* preemptible */
-    budget_algorithm,
-    budget_callout,
-    0,                    /* isr level */
-    &default_name         /* posix threads don't have a name */
-  );
- 
-  if ( !status ) {
-    _POSIX_Threads_Free( the_thread );
-    _Thread_Enable_dispatch();
-    return EAGAIN;
-  }
-
-  /*
-   *  finish initializing the per API structure
-   */
-
-  
-  api = the_thread->API_Extensions[ THREAD_API_POSIX ];
-
-  api->Attributes  = *the_attr;
-  api->detachstate = the_attr->detachstate;
-  api->schedpolicy = schedpolicy;
-  api->schedparam  = schedparam;
-
-  /*
-   *  This insures we evaluate the process-wide signals pending when we
-   *  first run.
-   *
-   *  NOTE:  Since the thread starts with all unblocked, this is necessary.
-   */
-
-  the_thread->do_post_task_switch_extension = TRUE;
-
-  /*
-   *  POSIX threads are allocated and started in one operation.
-   */
-
-  status = _Thread_Start(
-    the_thread,
-    THREAD_START_POINTER,
-    start_routine,
-    arg,
-    0                     /* unused */
-  );
-
-  if ( schedpolicy == SCHED_SPORADIC ) {
-    _Watchdog_Insert_ticks(
-      &api->Sporadic_timer,
-      _POSIX_Timespec_to_interval( &api->schedparam.ss_replenish_period )
-    );
-  }
-
-  /*
-   *  _Thread_Start only fails if the thread was in the incorrect state
-   */
-
-  if ( !status ) {
-    _POSIX_Threads_Free( the_thread );
-    _Thread_Enable_dispatch();
-    return EINVAL;
-  }
-
-  /*
-   *  Return the id and indicate we successfully created the thread
-   */
-
-  *thread = the_thread->Object.id;
-
- _Thread_Enable_dispatch();
-
- return 0;
-}
-
-/*PAGE
- *
- *  16.1.3 Wait for Thread Termination, P1003.1c/Draft 10, p. 147
- */
-
-int pthread_join(
-  pthread_t   thread,
-  void      **value_ptr
-)
-{
-  register Thread_Control *the_thread;
-  POSIX_API_Control       *api;
-  Objects_Locations        location;
-  void                    *return_pointer;
-
-  the_thread = _POSIX_Threads_Get( thread, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-    case OBJECTS_REMOTE:
-      return ESRCH;
-    case OBJECTS_LOCAL:
-      api = the_thread->API_Extensions[ THREAD_API_POSIX ];
-
-      if ( api->detachstate == PTHREAD_CREATE_DETACHED ) {
-        _Thread_Enable_dispatch();
-        return EINVAL;
-      }
-
-      if ( _Thread_Is_executing( the_thread ) ) {
-        _Thread_Enable_dispatch();
-        return EDEADLK;
-      }
-
-      /*
-       *  Put ourself on the threads join list
-       */
-
-      _Thread_Executing->Wait.return_argument = (unsigned32 *) &return_pointer;
-
-      _Thread_queue_Enter_critical_section( &api->Join_List );
-
-      _Thread_queue_Enqueue( &api->Join_List, WATCHDOG_NO_TIMEOUT );
-
-      _Thread_Enable_dispatch();
-
-      if ( value_ptr )
-        *value_ptr = return_pointer;
-      return 0;
-  }
-
-  return POSIX_BOTTOM_REACHED();
-}
-
-/*PAGE
- *
- *  16.1.4 Detaching a Thread, P1003.1c/Draft 10, p. 149
- */
-
-int pthread_detach(
-  pthread_t   thread
-)
-{
-  register Thread_Control *the_thread;
-  POSIX_API_Control       *api;
-  Objects_Locations        location;
- 
-  the_thread = _POSIX_Threads_Get( thread, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-    case OBJECTS_REMOTE:
-      return ESRCH;
-    case OBJECTS_LOCAL:
-
-      api = the_thread->API_Extensions[ THREAD_API_POSIX ];
-      api->detachstate = PTHREAD_CREATE_DETACHED;
-      _Thread_Enable_dispatch();
-      return 0;
-  }
- 
-  return POSIX_BOTTOM_REACHED();
-}
-
-/*PAGE
- *
- *  16.1.5.1 Thread Termination, p1003.1c/Draft 10, p. 150
- *
- *  NOTE: Key destructors are executed in the POSIX api delete extension.
- */
- 
-void pthread_exit(
-  void  *value_ptr
-)
-{
-  Objects_Information     *the_information;
-
-  the_information = _Objects_Get_information( _Thread_Executing->Object.id );
-  
-  _Thread_Disable_dispatch();
-
-  _Thread_Executing->Wait.return_argument = (unsigned32 *)value_ptr;
-
-  _Thread_Close( the_information, _Thread_Executing );
-
-  _POSIX_Threads_Free( _Thread_Executing );
-
-  _Thread_Enable_dispatch();
-}
-
-/*PAGE
- *
- *  16.1.6 Get Calling Thread's ID, p1003.1c/Draft 10, p. 152
- */
-
-pthread_t pthread_self( void )
-{
-  return _Thread_Executing->Object.id;
-}
-
-/*PAGE
- *
- *  16.1.7 Compare Thread IDs, p1003.1c/Draft 10, p. 153
- *
- *  NOTE:  POSIX does not define the behavior when either thread id is invalid. 
- */
-
-int pthread_equal( 
-  pthread_t  t1,
-  pthread_t  t2
-)
-{
-  /*
-   *  If the system is configured for debug, then we will do everything we
-   *  can to insure that both ids are valid.  Otherwise, we will do the
-   *  cheapest possible thing to determine if they are equal.
-   */
-
-#ifndef RTEMS_DEBUG
-  return _Objects_Are_ids_equal( t1, t2 );
-#else
-  int               status;
-  Objects_Locations location;
-
-  /*
-   *  By default this is not a match.
-   */
-
-  status = 0;
-
-  /*
-   *  Validate the first id and return 0 if it is not valid
-   */
-
-  (void) _POSIX_Threads_Get( t1, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-    case OBJECTS_REMOTE:
-      break;
-
-    case OBJECTS_LOCAL:
-
-      /*
-       *  Validate the second id and return 0 if it is not valid
-       */
-
-      (void) _POSIX_Threads_Get( t2, &location );
-      switch ( location ) {
-        case OBJECTS_ERROR:
-        case OBJECTS_REMOTE:
-          break; 
-        case OBJECTS_LOCAL:
-          status = _Objects_Are_ids_equal( t1, t2 ); 
-          break;
-      }
-      _Thread_Unnest_dispatch();
-      break;
-  }
-
-  _Thread_Enable_dispatch();
-  return status;
-#endif
-}
-
-/*PAGE
- *
- *  16.1.8 Dynamic Package Initialization, P1003.1c/Draft 10, p. 154
- */
-
-int pthread_once(
-  pthread_once_t  *once_control,
-  void           (*init_routine)(void)
-)
-{
-  if ( !once_control || !init_routine )
-    return EINVAL;
-
-  _Thread_Disable_dispatch();
-
-  if ( !once_control->init_executed ) {
-    once_control->is_initialized = TRUE;
-    once_control->init_executed = TRUE;
-    (*init_routine)();
-  }
-  
-  _Thread_Enable_dispatch();
-  return 0;
-}
-
-/*PAGE
- *
- *  20.1.6 Accessing a Thread CPU-time Clock, P1003.4b/Draft 8, p. 58
- */
- 
-int pthread_getcpuclockid(
-  pthread_t    pid,
-  clockid_t   *clock_id
-)
-{
-  return POSIX_NOT_IMPLEMENTED();
-}
-
-/*PAGE
- *
- *  20.1.7 CPU-time Clock Thread Creation Attribute, P1003.4b/Draft 8, p. 59
- */
-
-int pthread_attr_setcputime(
-  pthread_attr_t  *attr,
-  int              clock_allowed
-)
-{
-  if ( !attr || !attr->is_initialized )
-    return EINVAL;
-
-  switch ( clock_allowed ) {
-    case CLOCK_ENABLED:
-    case CLOCK_DISABLED:
-      attr->cputime_clock_allowed = clock_allowed;
-      return 0;
- 
-    default:
-      return EINVAL;
-  }
-}
-
-/*PAGE
- *
- *  20.1.7 CPU-time Clock Thread Creation Attribute, P1003.4b/Draft 8, p. 59
- */
-
-int pthread_attr_getcputime(
-  pthread_attr_t  *attr,
-  int             *clock_allowed
-)
-{
-  if ( !attr || !attr->is_initialized || !clock_allowed )
-    return EINVAL;
-
-  *clock_allowed = attr->cputime_clock_allowed;
-  return 0;
-}
diff --git a/cpukit/posix/src/pthreadatfork.c b/cpukit/posix/src/pthreadatfork.c
deleted file mode 100644
index f70f8d7dc1..0000000000
--- a/cpukit/posix/src/pthreadatfork.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* 
- *  pthread_atfork() - POSIX 1003.1b 3.1.3
- *
- *  $Id$
- */
-
-#include <sys/types.h>
-#include <errno.h>
-
-int pthread_atfork(
-  void (*prepare)(void),
-  void (*parent)(void),
-  void (*child)(void)
-)
-{
-  errno = ENOSYS;
-  return -1;
-}
diff --git a/cpukit/posix/src/ptimer.c b/cpukit/posix/src/ptimer.c
deleted file mode 100644
index 0446a7a683..0000000000
--- a/cpukit/posix/src/ptimer.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- *  $Id$
- */
-
-#include <assert.h>
-#include <time.h>
-#include <errno.h>
-
-#include <rtems/system.h>
-#include <rtems/score/isr.h>
-#include <rtems/score/thread.h>
-#include <rtems/score/tod.h>
-
-#include <rtems/posix/time.h>
-
-/*
- *  14.2.2 Create a Per-Process Timer, P1003.1b-1993, p. 264
- */
-
-int timer_create(
-  clockid_t        clock_id,
-  struct sigevent *evp,
-  timer_t         *timerid
-)
-{
-  return POSIX_NOT_IMPLEMENTED();
-}
-
-/*
- *  14.2.3 Delete a Per_process Timer, P1003.1b-1993, p. 266
- */
-
-int timer_delete(
-  timer_t timerid
-)
-{
-  return POSIX_NOT_IMPLEMENTED();
-}
-
-/*
- *  14.2.4 Per-Process Timers, P1003.1b-1993, p. 267
- */
-
-int timer_settime(
-  timer_t                  timerid,
-  int                      flags,
-  const struct itimerspec *value,
-  struct itimerspec       *ovalue
-)
-{
-  return POSIX_NOT_IMPLEMENTED();
-}
-
-/*
- *  14.2.4 Per-Process Timers, P1003.1b-1993, p. 267
- */
-
-int timer_gettime(
-  timer_t            timerid,
-  struct itimerspec *value
-)
-{
-  return POSIX_NOT_IMPLEMENTED();
-}
-
-/*
- *  14.2.4 Per-Process Timers, P1003.1b-1993, p. 267
- */
-
-int timer_getoverrun(
-  timer_t   timerid
-)
-{
-  return POSIX_NOT_IMPLEMENTED();
-}
diff --git a/cpukit/posix/src/sched.c b/cpukit/posix/src/sched.c
deleted file mode 100644
index e558126926..0000000000
--- a/cpukit/posix/src/sched.c
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- *  $Id$
- */
-
-#include <assert.h>
-#include <sched.h>
-#include <errno.h>
-
-#include <rtems/system.h>
-#include <rtems/score/tod.h>
-#include <rtems/score/thread.h>
-#include <rtems/posix/seterr.h>
-#include <rtems/posix/priority.h>
-#include <rtems/posix/time.h>
-
-/*PAGE
- *
- *  13.3.1 Set Scheduling Parameters, P1003.1b-1993, p. 252
- *
- */
-
-int sched_setparam(
-  pid_t                     pid,
-  const struct sched_param *param
-)
-{
-  set_errno_and_return_minus_one( ENOSYS );
-}
-
-/*PAGE
- *
- *  13.3.2 Set Scheduling Parameters, P1003.1b-1993, p. 253
- */
-
-int sched_getparam(
-  pid_t                     pid,
-  const struct sched_param *param
-)
-{
-  set_errno_and_return_minus_one( ENOSYS );
-}
-
-/*PAGE
- *
- *  13.3.3 Set Scheduling Policy and Scheduling Parameters, 
- *         P1003.1b-1993, p. 254
- */
-
-int sched_setscheduler(
-  pid_t                     pid,
-  int                       policy,
-  const struct sched_param *param
-)
-{
-  set_errno_and_return_minus_one( ENOSYS );
-}
-
-/*PAGE
- *
- *  13.3.4 Get Scheduling Policy, P1003.1b-1993, p. 256
- */
-
-int sched_getscheduler(
-  pid_t                     pid
-)
-{
-  set_errno_and_return_minus_one( ENOSYS );
-}
-
-/*PAGE
- *
- *  13.3.6 Get Scheduling Parameter Limits, P1003.1b-1993, p. 258
- */
-
-int sched_get_priority_max(
-  int  policy
-)
-{
-  switch ( policy ) {
-    case SCHED_OTHER:
-    case SCHED_FIFO:
-    case SCHED_RR:
-    case SCHED_SPORADIC:
-      break;
- 
-    default:
-      set_errno_and_return_minus_one( EINVAL );
-  }
-
-  return POSIX_SCHEDULER_MAXIMUM_PRIORITY;
-}
-
-/*PAGE
- *
- *  13.3.6 Get Scheduling Parameter Limits, P1003.1b-1993, p. 258
- */
-
-int sched_get_priority_min(
-  int  policy
-)
-{
-  switch ( policy ) {
-    case SCHED_OTHER:
-    case SCHED_FIFO:
-    case SCHED_RR:
-    case SCHED_SPORADIC:
-      break;
- 
-    default:
-      set_errno_and_return_minus_one( EINVAL );
-  }
-
-  return POSIX_SCHEDULER_MINIMUM_PRIORITY;
-}
-
-/*PAGE
- *
- *  13.3.6 Get Scheduling Parameter Limits, P1003.1b-1993, p. 258
- */
-
-int sched_rr_get_interval(
-  pid_t             pid,
-  struct timespec  *interval
-)
-{
-  /* XXX do we need to support different time quantums per thread */
-
-  /*
-   *  Only supported for the "calling process" (i.e. this node).
-   */
-
-  if ( pid != getpid() )
-    set_errno_and_return_minus_one( ESRCH );
-
-  if ( !interval )
-    set_errno_and_return_minus_one( EINVAL );
-
-  _POSIX_Interval_to_timespec( _Thread_Ticks_per_timeslice, interval );
-  return 0;
-}
-
-/*PAGE
- *
- *  13.3.5 Yield Processor, P1003.1b-1993, p. 257
- */
-
-int sched_yield( void )
-{
-  _Thread_Disable_dispatch();
-    _Thread_Yield_processor();
-  _Thread_Enable_dispatch();
-  return 0;
-}
diff --git a/cpukit/posix/src/semaphore.c b/cpukit/posix/src/semaphore.c
deleted file mode 100644
index a968abe43b..0000000000
--- a/cpukit/posix/src/semaphore.c
+++ /dev/null
@@ -1,571 +0,0 @@
-/*
- *  $Id$
- */
-
-#include <stdarg.h>
-
-#include <errno.h>
-#include <fcntl.h>
-#include <pthread.h>
-#include <semaphore.h>
-#include <limits.h>
-
-#include <rtems/system.h>
-#include <rtems/score/object.h>
-#include <rtems/posix/semaphore.h>
-#include <rtems/posix/time.h>
-
-/*PAGE
- *
- *  _POSIX_Semaphore_Manager_initialization
- *
- *  This routine initializes all semaphore manager related data structures.
- *
- *  Input parameters:
- *    maximum_semaphores - maximum configured semaphores
- *
- *  Output parameters:  NONE
- */
- 
-void _POSIX_Semaphore_Manager_initialization(
-  unsigned32 maximum_semaphores
-)
-{
-  _Objects_Initialize_information(
-    &_POSIX_Semaphore_Information,
-    OBJECTS_POSIX_SEMAPHORES,
-    TRUE,
-    maximum_semaphores,
-    sizeof( POSIX_Semaphore_Control ),
-    TRUE,
-    _POSIX_PATH_MAX,
-    FALSE
-  );
-}
-
-/*PAGE
- *
- *  _POSIX_Semaphore_Create_support
- */
-
-int _POSIX_Semaphore_Create_support(
-  const char                *name,
-  int                        pshared,
-  unsigned int               value,
-  POSIX_Semaphore_Control  **the_sem
-)
-{
-  POSIX_Semaphore_Control   *the_semaphore;
-  CORE_semaphore_Attributes *the_sem_attr;
-
-  _Thread_Disable_dispatch();
- 
-  the_semaphore = _POSIX_Semaphore_Allocate();
- 
-  if ( !the_semaphore ) {
-    _Thread_Enable_dispatch();
-    set_errno_and_return_minus_one( ENOMEM );
-  }
- 
-  if ( pshared == PTHREAD_PROCESS_SHARED &&
-       !( _Objects_MP_Allocate_and_open( &_POSIX_Semaphore_Information, 0,
-                            the_semaphore->Object.id, FALSE ) ) ) {
-    _POSIX_Semaphore_Free( the_semaphore );
-    _Thread_Enable_dispatch();
-    set_errno_and_return_minus_one( EAGAIN );
-  }
- 
-  the_semaphore->process_shared  = pshared;
-
-  if ( name ) {
-    the_semaphore->named = TRUE;
-    the_semaphore->open_count = 1;
-    the_semaphore->linked = TRUE;
-  }
-  else 
-    the_semaphore->named = FALSE;
-
-  the_sem_attr = &the_semaphore->Semaphore.Attributes;
- 
-  /* XXX
-   *
-   *  Note should this be based on the current scheduling policy?
-   */
-
-  the_sem_attr->discipline = CORE_SEMAPHORE_DISCIPLINES_FIFO;
- 
-  _CORE_semaphore_Initialize(
-    &the_semaphore->Semaphore,
-    OBJECTS_POSIX_SEMAPHORES,
-    the_sem_attr,
-    value,
-    0      /* XXX - proxy_extract_callout is unused */
-  );
- 
-  /* XXX - need Names to be a string!!! */
-  _Objects_Open(
-    &_POSIX_Semaphore_Information,
-    &the_semaphore->Object,
-    (char *) name
-  );
- 
-  *the_sem = the_semaphore;
- 
-  if ( pshared == PTHREAD_PROCESS_SHARED )
-    _POSIX_Semaphore_MP_Send_process_packet(
-      POSIX_SEMAPHORE_MP_ANNOUNCE_CREATE,
-      the_semaphore->Object.id,
-      (char *) name,
-      0                /* proxy id - Not used */
-    );
- 
-  _Thread_Enable_dispatch();
-  return 0;
-}
-
-
-/*PAGE
- *
- *  11.2.1 Initialize an Unnamed Semaphore, P1003.1b-1993, p.219
- */
-
-int sem_init(
-  sem_t         *sem,
-  int            pshared,
-  unsigned int   value
-)
-{
-  int                        status;
-  POSIX_Semaphore_Control   *the_semaphore;
-
-  status = _POSIX_Semaphore_Create_support(
-    NULL,
-    pshared,
-    value,
-    &the_semaphore
-  );
-    
-  if ( status != -1 )
-    *sem = the_semaphore->Object.id;
-
-  return status;
-}
-
-/*PAGE
- *
- *  11.2.2 Destroy an Unnamed Semaphore, P1003.1b-1993, p.220
- */
-
-int sem_destroy(
-  sem_t *sem
-)
-{
-  register POSIX_Semaphore_Control *the_semaphore;
-  Objects_Locations                 location;
- 
-  the_semaphore = _POSIX_Semaphore_Get( sem, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-      seterrno( EINVAL );
-      return( -1 );
-    case OBJECTS_REMOTE:
-      _Thread_Dispatch();
-      return POSIX_MP_NOT_IMPLEMENTED();
-      seterrno( EINVAL );
-      return( -1 );
-    case OBJECTS_LOCAL:
-      /*
-       *  Undefined operation on a named semaphore.
-       */
-
-      if ( the_semaphore->named == TRUE ) {
-        seterrno( EINVAL );
-        return( -1 );
-      }
- 
-      _Objects_Close( &_POSIX_Semaphore_Information, &the_semaphore->Object );
- 
-      _CORE_semaphore_Flush(
-        &the_semaphore->Semaphore,
-        _POSIX_Semaphore_MP_Send_object_was_deleted,
-        -1  /* XXX should also seterrno -> EINVAL */
-      );
- 
-      _POSIX_Semaphore_Free( the_semaphore );
- 
-      if ( the_semaphore->process_shared == PTHREAD_PROCESS_SHARED ) {
- 
-        _Objects_MP_Close(
-          &_POSIX_Semaphore_Information,
-          the_semaphore->Object.id
-        );
- 
-        _POSIX_Semaphore_MP_Send_process_packet(
-          POSIX_SEMAPHORE_MP_ANNOUNCE_DELETE,
-          the_semaphore->Object.id,
-          0,                         /* Not used */
-          0                          /* Not used */
-        );
-      }
-      _Thread_Enable_dispatch();
-      return 0;
-  }
-  return POSIX_BOTTOM_REACHED();
-}
-
-/*PAGE
- *
- *  11.2.3 Initialize/Open a Named Semaphore, P1003.1b-1993, p.221
- *
- *  NOTE: When oflag is O_CREAT, then optional third and fourth 
- *        parameters must be present.
- */
-
-sem_t *sem_open(
-  const char *name,
-  int         oflag,
-  ...
-  /* mode_t mode, */
-  /* unsigned int value */
-)
-{
-  va_list                    arg;
-  mode_t                     mode;
-  unsigned int               value;
-  int                        status;
-  Objects_Id                 the_semaphore_id;
-  POSIX_Semaphore_Control   *the_semaphore;
- 
-
-  if ( oflag & O_CREAT ) {
-    va_start(arg, oflag);
-    mode = (mode_t) va_arg( arg, mode_t * );
-    value = (unsigned int) va_arg( arg, unsigned int * );
-    va_end(arg);
-  }
-
-  status = _POSIX_Semaphore_Name_to_id( name, &the_semaphore_id );
-   
-  /*
-   *  If the name to id translation worked, then the semaphore exists
-   *  and we can just return a pointer to the id.  Otherwise we may
-   *  need to check to see if this is a "semaphore does not exist"
-   *  or some other miscellaneous error on the name.
-   */
-
-  if ( status ) {
-
-    if ( status == EINVAL ) {      /* name -> ID translation failed */
-      if ( !(oflag & O_CREAT) ) {  /* willing to create it? */
-        seterrno( ENOENT );
-        return (sem_t *) -1;
-      }
-      /* we are willing to create it */
-    }
-    seterrno( status );               /* some type of error */
-    return (sem_t *) -1;
-
-  } else {                /* name -> ID translation succeeded */
-
-    if ( (oflag & (O_CREAT | O_EXCL)) == (O_CREAT | O_EXCL) ) {
-      seterrno( EEXIST );
-      return (sem_t *) -1;
-    }
-
-    /* 
-     * XXX In this case we need to do an ID->pointer conversion to
-     *     check the mode.   This is probably a good place for a subroutine.
-     */
-
-    the_semaphore->open_count += 1;
-
-    return (sem_t *)&the_semaphore->Object.id;
-
-  } 
-  
-  /* XXX verify this comment...
-   *
-   *  At this point, the semaphore does not exist and everything has been
-   *  checked. We should go ahead and create a semaphore.
-   */
-
-  status = _POSIX_Semaphore_Create_support(
-    name,
-    TRUE,         /* shared across processes */
-    value,
-    &the_semaphore
-  );
- 
-  if ( status == -1 )
-    return (sem_t *) -1;
-
-  return (sem_t *) &the_semaphore->Object.id;
- 
-}
-
-/*PAGE
- *
- *  _POSIX_Semaphore_Delete
- */
-
-void _POSIX_Semaphore_Delete(
-  POSIX_Semaphore_Control *the_semaphore
-)
-{
-  if ( !the_semaphore->linked && !the_semaphore->open_count ) {
-    _POSIX_Semaphore_Free( the_semaphore );
-
-    if ( the_semaphore->process_shared == PTHREAD_PROCESS_SHARED ) {
-
-      _Objects_MP_Close(
-        &_POSIX_Semaphore_Information,
-        the_semaphore->Object.id
-      );
-
-      _POSIX_Semaphore_MP_Send_process_packet(
-        POSIX_SEMAPHORE_MP_ANNOUNCE_DELETE,
-        the_semaphore->Object.id,
-        0,                         /* Not used */
-        0                          /* Not used */
-      );
-    }
-
-  }
-}
-
-/*PAGE
- *
- *  11.2.4 Close a Named Semaphore, P1003.1b-1993, p.224
- */
-
-int sem_close(
-  sem_t *sem
-)
-{
-  register POSIX_Semaphore_Control *the_semaphore;
-  Objects_Locations                 location;
- 
-  the_semaphore = _POSIX_Semaphore_Get( sem, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-      seterrno( EINVAL );
-      return( -1 );
-    case OBJECTS_REMOTE:
-      _Thread_Dispatch();
-      return POSIX_MP_NOT_IMPLEMENTED();
-      seterrno( EINVAL );
-      return( -1 );
-    case OBJECTS_LOCAL:
-      the_semaphore->open_count -= 1;
-      _POSIX_Semaphore_Delete( the_semaphore );
-      _Thread_Enable_dispatch();
-      return 0;
-  }
-  return POSIX_BOTTOM_REACHED();
-}
-
-/*PAGE
- *
- *  11.2.5 Remove a Named Semaphore, P1003.1b-1993, p.225
- */
-
-int sem_unlink(
-  const char *name
-)
-{
-  int  status;
-  register POSIX_Semaphore_Control *the_semaphore;
-  Objects_Id                        the_semaphore_id;
-  Objects_Locations                 location;
- 
-  status = _POSIX_Semaphore_Name_to_id( name, &the_semaphore_id );
-   
-  if ( !status )
-    set_errno_and_return_minus_one( status );
-
-  the_semaphore = _POSIX_Semaphore_Get( &the_semaphore_id, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-      seterrno( EINVAL );
-      return( -1 );
-    case OBJECTS_REMOTE:
-      _Thread_Dispatch();
-      return POSIX_MP_NOT_IMPLEMENTED();
-      seterrno( EINVAL );
-      return( -1 );
-    case OBJECTS_LOCAL:
-
-      if ( the_semaphore->process_shared == PTHREAD_PROCESS_SHARED ) {
-        _Objects_MP_Close(
-          &_POSIX_Semaphore_Information,
-          the_semaphore->Object.id
-        );
-      }
-
-      the_semaphore->linked = FALSE;
-
-      _POSIX_Semaphore_Delete( the_semaphore );
-
-      _Thread_Enable_dispatch();
-      return 0;
-  }
-  return POSIX_BOTTOM_REACHED();
-}
-
-/*PAGE
- *
- *  _POSIX_Semaphore_Wait_support
- */
-
-int _POSIX_Semaphore_Wait_support(
-  sem_t              *sem,
-  boolean             blocking,
-  Watchdog_Interval   timeout
-)
-{
-  register POSIX_Semaphore_Control *the_semaphore;
-  Objects_Locations                 location;
- 
-  the_semaphore = _POSIX_Semaphore_Get( sem, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-      seterrno( EINVAL );
-      return( -1 );
-    case OBJECTS_REMOTE:
-      _Thread_Dispatch();
-      return POSIX_MP_NOT_IMPLEMENTED();
-      seterrno( EINVAL );
-      return( -1 );
-    case OBJECTS_LOCAL:
-      _CORE_semaphore_Seize(
-        &the_semaphore->Semaphore,
-        the_semaphore->Object.id,
-        blocking,
-        timeout
-      );
-      _Thread_Enable_dispatch();
-      return _Thread_Executing->Wait.return_code;
-  }
-  return POSIX_BOTTOM_REACHED();
-}
-
-/*PAGE
- *
- *  11.2.6 Lock a Semaphore, P1003.1b-1993, p.226
- *
- *  NOTE: P1003.4b/D8 adds sem_timedwait(), p. 27
- */
-
-int sem_wait(
-  sem_t *sem
-)
-{
-  return _POSIX_Semaphore_Wait_support( sem, TRUE, THREAD_QUEUE_WAIT_FOREVER );
-}
-
-/*PAGE
- *
- *  11.2.6 Lock a Semaphore, P1003.1b-1993, p.226
- *
- *  NOTE: P1003.4b/D8 adds sem_timedwait(), p. 27
- */
-
-int sem_trywait(
-  sem_t *sem
-)
-{
-  return _POSIX_Semaphore_Wait_support( sem, FALSE, THREAD_QUEUE_WAIT_FOREVER );
-}
-
-/*PAGE
- *
- *  11.2.6 Lock a Semaphore, P1003.1b-1993, p.226
- *
- *  NOTE: P1003.4b/D8 adds sem_timedwait(), p. 27
- */
-
-int sem_timedwait(
-  sem_t                 *sem,
-  const struct timespec *timeout
-)
-{
-  return _POSIX_Semaphore_Wait_support(
-    sem,
-    TRUE,
-    _POSIX_Timespec_to_interval( timeout )
-  );
-}
-
-/*PAGE
- *
- *  11.2.7 Unlock a Semaphore, P1003.1b-1993, p.227
- */
-
-void POSIX_Semaphore_MP_support(
-  Thread_Control *the_thread,
-  Objects_Id      id
-)
-{
-  (void) POSIX_MP_NOT_IMPLEMENTED();
-}
- 
-
-int sem_post(
-  sem_t  *sem
-)
-{
-  register POSIX_Semaphore_Control *the_semaphore;
-  Objects_Locations                 location;
- 
-  the_semaphore = _POSIX_Semaphore_Get( sem, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-      seterrno( EINVAL );
-      return( -1 );
-    case OBJECTS_REMOTE:
-      _Thread_Dispatch();
-      return POSIX_MP_NOT_IMPLEMENTED();
-      seterrno( EINVAL );
-      return( -1 );
-    case OBJECTS_LOCAL:
-      _CORE_semaphore_Surrender(
-        &the_semaphore->Semaphore,
-        the_semaphore->Object.id,
-        POSIX_Semaphore_MP_support
-      );
-      _Thread_Enable_dispatch();
-      return 0;
-  }
-  return POSIX_BOTTOM_REACHED();
-}
-
-/*PAGE
- *
- *  11.2.8 Get the Value of a Semaphore, P1003.1b-1993, p.229
- */
-
-int sem_getvalue(
-  sem_t  *sem,
-  int    *sval
-)
-{
-  register POSIX_Semaphore_Control *the_semaphore;
-  Objects_Locations                 location;
- 
-  the_semaphore = _POSIX_Semaphore_Get( sem, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-      seterrno( EINVAL );
-      return( -1 );
-    case OBJECTS_REMOTE:
-      _Thread_Dispatch();
-      return POSIX_MP_NOT_IMPLEMENTED();
-      seterrno( EINVAL );
-      return( -1 );
-    case OBJECTS_LOCAL:
-      *sval = _CORE_semaphore_Get_count( &the_semaphore->Semaphore );
-      _Thread_Enable_dispatch();
-      return 0;
-  }
-  return POSIX_BOTTOM_REACHED();
-}
diff --git a/cpukit/posix/src/time.c b/cpukit/posix/src/time.c
deleted file mode 100644
index a14eb71f8e..0000000000
--- a/cpukit/posix/src/time.c
+++ /dev/null
@@ -1,396 +0,0 @@
-/*
- *  $Id$
- */
-
-#include <assert.h>
-#include <time.h>
-#include <errno.h>
-
-#include <rtems/system.h>
-#include <rtems/score/isr.h>
-#include <rtems/score/thread.h>
-#include <rtems/score/tod.h>
-
-#include <rtems/posix/seterr.h>
-#include <rtems/posix/time.h>
-
-/*PAGE
- *
- *  _POSIX_Timespec_subtract
- */
-
-void _POSIX_Timespec_subtract(
-  const struct timespec *the_start,
-  const struct timespec *end,
-  struct timespec *result
-)
-{
-  struct timespec  start_struct = *the_start;
-  struct timespec *start = &start_struct;
-  unsigned int nsecs_per_sec = TOD_NANOSECONDS_PER_SECOND;
- 
-  if (end->tv_nsec < start->tv_nsec) {
-    int seconds = (start->tv_nsec - end->tv_nsec) / nsecs_per_sec + 1;
-    start->tv_nsec -= nsecs_per_sec * seconds;
-    start->tv_sec += seconds;
-  }
- 
-  if (end->tv_nsec - start->tv_nsec > nsecs_per_sec) {
-    int seconds = (start->tv_nsec - end->tv_nsec) / nsecs_per_sec;
-    start->tv_nsec += nsecs_per_sec * seconds;
-    start->tv_sec -= seconds;
-  }
- 
-  result->tv_sec  = end->tv_sec - start->tv_sec;
-  result->tv_nsec = end->tv_nsec - start->tv_nsec;
-}
-
-/*PAGE
- *
- *  _POSIX_Timespec_to_interval
- */
-
-Watchdog_Interval _POSIX_Timespec_to_interval(
-  const struct timespec *time
-)
-{
-  Watchdog_Interval  ticks;
-
-  ticks  = (time->tv_sec * TOD_MICROSECONDS_PER_SECOND) / 
-             _TOD_Microseconds_per_tick;
-
-  ticks += (time->tv_nsec / TOD_NANOSECONDS_PER_MICROSECOND) / 
-             _TOD_Microseconds_per_tick;
-
-  if (ticks)
-    return ticks;
-
-  return 1;
-}
-
-/*PAGE
- *
- *  _POSIX_Interval_to_timespec
- */
- 
-void _POSIX_Interval_to_timespec(
-  Watchdog_Interval  ticks,
-  struct timespec   *time
-)
-{
-  unsigned32  usecs;
-
-  usecs = ticks * _TOD_Microseconds_per_tick;
-
-  time->tv_sec  = usecs / TOD_MICROSECONDS_PER_SECOND;
-  time->tv_nsec = (usecs % TOD_MICROSECONDS_PER_SECOND) * 
-                    TOD_NANOSECONDS_PER_MICROSECOND;
-}
-
-/*PAGE
- *
- *  4.5.1 Get System Time, P1003.1b-1993, p. 91
- */
-
-/* Using the implementation in newlib */
-#if 0
-time_t time(
-  time_t   *tloc
-)
-{
-  time_t  seconds_since_epoch;
-
-  /*
-   *  No error is the time of day is not set.   For RTEMS the system time
-   *  starts out at the rtems epoch.
-   */
-
-  /*
-   *  Internally the RTEMS epoch is 1988.  This must be taken into account.
-   */
-
-  seconds_since_epoch = _TOD_Seconds_since_epoch;
-     
-  seconds_since_epoch += POSIX_TIME_SECONDS_1970_THROUGH_1988;
-
-  if ( tloc )
-    *tloc = seconds_since_epoch;
-
-  return seconds_since_epoch;
-}
-#endif
-
-/*PAGE
- *
- *  14.2.1 Clocks, P1003.1b-1993, p. 263
- */
-
-int clock_settime(
-  clockid_t              clock_id,
-  const struct timespec *tp
-)
-{
-  struct tm         split_time;
-  TOD_Control       tod;
-  Watchdog_Interval seconds;
-
-  assert( tp );
-
-  switch ( clock_id ) {
- 
-    case CLOCK_REALTIME:
-      (void) gmtime_r( &tp->tv_sec, &split_time );
- 
-      /*
-       *  Convert the tm structure format to that used by the TOD Handler
-       *
-       *  NOTE: TOD Handler does not honor leap seconds.
-       */
-
-      tod.year   = split_time.tm_year + 1900;  /* RHS is years since 1900 */
-      tod.month  = split_time.tm_mon + 1;      /* RHS uses 0-11 */
-      tod.day    = split_time.tm_mday;
-      tod.hour   = split_time.tm_hour;
-      tod.minute = split_time.tm_min;
-      tod.second = split_time.tm_sec;  /* RHS allows 0-61 for leap seconds */
-
-      tod.ticks  = (tp->tv_nsec / TOD_NANOSECONDS_PER_MICROSECOND) /
-                      _TOD_Microseconds_per_tick;
-
-      if ( !_TOD_Validate( &tod ) )
-        set_errno_and_return_minus_one( EINVAL );
- 
-      /*
-       *  We can't use the tp->tv_sec field because it is based on 
-       *  a different EPOCH.
-       */
-
-      seconds = _TOD_To_seconds( &tod );
-      _Thread_Disable_dispatch();
-        _TOD_Set( &tod, seconds );
-      _Thread_Enable_dispatch();
-      break;
- 
-#ifdef _POSIX_CPUTIME
-    case CLOCK_PROCESS_CPUTIME:
-      return POSIX_NOT_IMPLEMENTED();
-      break;
-#endif
- 
-#ifdef _POSIX_THREAD_CPUTIME
-    case CLOCK_THREAD_CPUTIME:
-      return POSIX_NOT_IMPLEMENTED();
-      break;
-#endif
-    default:
-      set_errno_and_return_minus_one( EINVAL );
- 
-  }
-  return 0;
-}
-
-/*PAGE
- *
- *  14.2.1 Clocks, P1003.1b-1993, p. 263
- */
-
-int clock_gettime(
-  clockid_t        clock_id,
-  struct timespec *tp
-)
-{
-  ISR_Level      level;
-  time_t         seconds;
-  long           ticks;
-
-  if ( !tp )
-    set_errno_and_return_minus_one( EINVAL );
-
-  switch ( clock_id ) {
-
-    case CLOCK_REALTIME:
- 
-      _ISR_Disable( level );
-        seconds = _TOD_Seconds_since_epoch;
-        ticks   = _TOD_Current.ticks;
-      _ISR_Enable( level );
- 
-      tp->tv_sec  = seconds + POSIX_TIME_SECONDS_1970_THROUGH_1988;
-      tp->tv_nsec = ticks * _TOD_Microseconds_per_tick * 
-                      TOD_NANOSECONDS_PER_MICROSECOND; 
-      break;
-
-#ifdef _POSIX_CPUTIME
-    case CLOCK_PROCESS_CPUTIME:
-      /* don't base this on _Watchdog_Ticks_since_boot--duration is too short*/
-      return POSIX_NOT_IMPLEMENTED();
-      break;
-#endif
-
-#ifdef _POSIX_THREAD_CPUTIME
-    case CLOCK_THREAD_CPUTIME:
-      return POSIX_NOT_IMPLEMENTED();
-      break;
-#endif
-    default:
-      set_errno_and_return_minus_one( EINVAL );
-
-  }
-  return 0;
-}
-
-/*PAGE
- *
- *  14.2.1 Clocks, P1003.1b-1993, p. 263
- */
-
-int clock_getres(
-  clockid_t        clock_id,
-  struct timespec *res
-)
-{
-  if ( !res )
-    set_errno_and_return_minus_one( EINVAL );
- 
-  switch ( clock_id ) {
- 
-    /*
-     *  All time in rtems is based on the same clock tick.
-     */
-
-    case CLOCK_REALTIME:
-    case CLOCK_PROCESS_CPUTIME:
-    case CLOCK_THREAD_CPUTIME:
-      if ( res )
-        _POSIX_Interval_to_timespec( _TOD_Microseconds_per_tick, res ); 
-      break;
- 
-    default:
-      set_errno_and_return_minus_one( EINVAL );
- 
-  }
-  return 0;
-}
-
-/*PAGE
- *
- *  14.2.5 High Resolution Sleep, P1003.1b-1993, p. 269
- */
-
-int nanosleep(
-  const struct timespec  *rqtp,
-  struct timespec        *rmtp
-)
-{
-  Watchdog_Interval  ticks;
-  struct timespec   *the_rqtp;
-
-  if ( !rqtp )
-    set_errno_and_return_minus_one( EINVAL );
-
-  the_rqtp = (struct timespec *)rqtp;
-
-  /*
-   *  Return EAGAIN if the delay interval is negative.  
-   *
-   *  NOTE:  This behavior is beyond the POSIX specification.  
-   *         FSU pthreads shares this behavior.
-   */
-
-  if ( the_rqtp->tv_sec < 0 )
-    the_rqtp->tv_sec = 0;
-
-  if ( /* the_rqtp->tv_sec < 0 || */ the_rqtp->tv_nsec < 0 )
-    set_errno_and_return_minus_one( EAGAIN );
-
-  if ( the_rqtp->tv_nsec >= TOD_NANOSECONDS_PER_SECOND )
-    set_errno_and_return_minus_one( EINVAL );
- 
-  ticks = _POSIX_Timespec_to_interval( the_rqtp );
-
-  /*
-   *  This behavior is also beyond the POSIX specification but is
-   *  consistent with the RTEMS api and yields desirable behavior.
-   */
-
-  if ( !ticks ) {
-    _Thread_Yield_processor();
-    _Thread_Dispatch();
-    if ( rmtp ) {
-       rmtp->tv_sec = 0; 
-       rmtp->tv_nsec = 0; 
-    }
-    return 0;
-  }
-  
-  _Thread_Disable_dispatch();
-    _Thread_Set_state(
-      _Thread_Executing,
-      STATES_DELAYING | STATES_INTERRUPTIBLE_BY_SIGNAL
-    );
-    _Watchdog_Initialize(
-      &_Thread_Executing->Timer,
-      _Thread_Delay_ended,
-      _Thread_Executing->Object.id,
-      NULL
-    );
-    _Watchdog_Insert_ticks( &_Thread_Executing->Timer, ticks );
-  _Thread_Enable_dispatch();
-
-  /* calculate time remaining */
-
-  if ( rmtp ) {
-    ticks -= 
-      _Thread_Executing->Timer.stop_time - _Thread_Executing->Timer.start_time;
-
-    _POSIX_Interval_to_timespec( ticks, rmtp );
-
-    /*
-     *  If there is time remaining, then we were interrupted by a signal.
-     */
-
-    if ( ticks )
-      set_errno_and_return_minus_one( EINTR );
-  }
-
-  return 0;
-}
-
-/*PAGE
- *
- *  20.1.3 Accessing a Process CPU-time CLock, P1003.4b/D8, p. 55
- */
-
-int clock_getcpuclockid(
-  pid_t      pid,
-  clockid_t *clock_id
-)
-{
-  return POSIX_NOT_IMPLEMENTED();
-}
-
-/*PAGE
- *
- *  20.1.5 CPU-time Clock Attribute Access, P1003.4b/D8, p. 58
- */
-
-int clock_setenable_attr(
-  clockid_t    clock_id,
-  int          attr
-)
-{
-  return POSIX_NOT_IMPLEMENTED();
-}
-
-/*PAGE
- *
- *  20.1.5 CPU-time Clock Attribute Access, P1003.4b/D8, p. 58
- */
-
-int clock_getenable_attr(
-  clockid_t    clock_id,
-  int         *attr
-)
-{
-  return POSIX_NOT_IMPLEMENTED();
-}
diff --git a/cpukit/posix/src/types.c b/cpukit/posix/src/types.c
deleted file mode 100644
index 4386ad5292..0000000000
--- a/cpukit/posix/src/types.c
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
- *  $Id$
- */
-
-#include <limits.h>
-#include <errno.h>
-#include <string.h>
-#include <sys/types.h>
-
-#include <rtems/system.h>
-#include <rtems/score/object.h>
-#include <rtems/posix/seterr.h>
-
-pid_t _POSIX_types_Ppid = 0;
-uid_t _POSIX_types_Uid = 0;
-uid_t _POSIX_types_Euid = 0;
-gid_t _POSIX_types_Gid = 0;
-gid_t _POSIX_types_Egid = 0;
-
-/*PAGE
- *
- *  4.1.1 Get Process and Parent Process IDs, P1003.1b-1993, p. 83
- */
-
-pid_t getppid( void )
-{
-  return _POSIX_types_Ppid;
-}
-
-/*PAGE
- *
- *  4.2.1 Get Real User, Effective User, Ral Group, and Effective Group IDs, 
- *        P1003.1b-1993, p. 84
- */
-
-uid_t getuid( void )
-{
-  return _POSIX_types_Uid;
-}
-
-/*PAGE
- *
- *  4.2.1 Get Real User, Effective User, Ral Group, and Effective Group IDs, 
- *        P1003.1b-1993, p. 84
- */
-
-uid_t geteuid( void )
-{
-  return _POSIX_types_Euid;
-}
-
-/*PAGE
- *
- *  4.2.1 Get Real User, Effective User, Ral Group, and Effective Group IDs, 
- *        P1003.1b-1993, p. 84
- */
-
-gid_t getgid( void )
-{
-  return _POSIX_types_Gid;
-}
-
-/*PAGE
- *
- *  4.2.1 Get Real User, Effective User, Ral Group, and Effective Group IDs, 
- *        P1003.1b-1993, p. 84
- */
-
-gid_t getegid( void )
-{
-  return _POSIX_types_Egid;
-}
-
-/*PAGE
- *
- *  4.2.2 Set User and Group IDs, P1003.1b-1993, p. 84
- */
-
-int setuid(
-  uid_t  uid
-)
-{
-  _POSIX_types_Uid = uid;
-  return 0;
-}
-
-/*PAGE
- *
- *  4.2.2 Set User and Group IDs, P1003.1b-1993, p. 84
- */
-
-int setgid(
-  gid_t  gid
-)
-{
-  _POSIX_types_Gid = gid;
-  return 0;
-}
-
-/*PAGE
- *
- *  4.2.3 Get Supplementary IDs, P1003.1b-1993, p. 86
- */
-
-int getgroups(
-  int    gidsetsize,
-  gid_t  grouplist[]
-)
-{
-  return 0;  /* no supplemental group ids */
-}
-
-/*PAGE
- *
- *  4.2.4 Get User Name, P1003.1b-1993, p. 87
- *
- *  NOTE:  P1003.1c/D10, p. 49 adds getlogin_r().
- */
-
-static char _POSIX_types_Getlogin_buffer[ LOGIN_NAME_MAX ];
-
-char *getlogin( void )
-{
-  (void) getlogin_r( _POSIX_types_Getlogin_buffer, LOGIN_NAME_MAX );
-  return _POSIX_types_Getlogin_buffer;
-}
-
-/*PAGE
- *
- *  4.2.4 Get User Name, P1003.1b-1993, p. 87
- *
- *  NOTE:  P1003.1c/D10, p. 49 adds getlogin_r().
- */
-
-int getlogin_r(
-  char   *name,
-  size_t  namesize
-)
-{
-  if ( namesize < LOGIN_NAME_MAX )
-    return ERANGE;
-
-  strcpy( name, "posixapp" );
-  return 0;
-}
-
-/*PAGE
- *
- *  4.3.1 Get Process Group IDs, P1003.1b-1993, p. 89
- */
-
-pid_t getpgrp( void )
-{
-  /*
-   *  This always succeeds and returns the process group id.  For rtems,
-   *  this will always be the local node;
-   */
-
-  return _Objects_Local_node;
-}
-
-/*PAGE
- *
- *  4.3.2 Create Session and Set Process Group ID, P1003.1b-1993, p. 88
- */
-
-pid_t setsid( void )
-{
-  set_errno_and_return_minus_one( ENOSYS );
-}
-
-/*PAGE
- *
- *  4.3.3 Set Process Group ID for Job Control, P1003.1b-1993, p. 89
- */
-
-int setpgid(
-  pid_t  pid,
-  pid_t  pgid
-)
-{
-  set_errno_and_return_minus_one( ENOSYS );
-}
-
-/*
- * TEMPORARY
- */
-
-#include <assert.h>
-
-int POSIX_MP_NOT_IMPLEMENTED()
-{
-  assert( 0 );
-  return 0;
-}
-
-int POSIX_BOTTOM_REACHED()
-{
-  assert( 0 );
-  return 0;
-}
-
-int POSIX_NOT_IMPLEMENTED()
-{
-  assert( 0 );
-  return 0;
-}
-
-/*
- * END OF TEMPORARY
- */
-
diff --git a/cpukit/posix/src/wait.c b/cpukit/posix/src/wait.c
deleted file mode 100644
index bbef04a2eb..0000000000
--- a/cpukit/posix/src/wait.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* 
- *  waitpid() - POSIX 1003.1b 3.2.1
- *
- *  $Id$
- */
-
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <errno.h>
-
-int wait(
-  int   *stat_loc
-)
-{
-  errno = ENOSYS;
-  return -1;
-}
diff --git a/cpukit/posix/src/waitpid.c b/cpukit/posix/src/waitpid.c
deleted file mode 100644
index f20161b5a9..0000000000
--- a/cpukit/posix/src/waitpid.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* 
- *  wait() - POSIX 1003.1b 3.2.1
- *
- *  $Id$
- */
-
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <errno.h>
-
-int wait(
-  int *stat_loc
-)
-{
-  errno = ENOSYS;
-  return -1;
-}
diff --git a/cpukit/rtems/include/rtems.h b/cpukit/rtems/include/rtems.h
deleted file mode 100644
index 9a165c08dd..0000000000
--- a/cpukit/rtems/include/rtems.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/*  rtems.h
- *
- *  This include file contains information about RTEMS executive that
- *  is required by the application and is CPU independent.  It includes
- *  two (2) CPU dependent files to tailor its data structures for a
- *  particular processor.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_RTEMS_GENERIC_h
-#define __RTEMS_RTEMS_GENERIC_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- *  Unless told otherwise, the RTEMS include files will hide some stuff
- *  from normal application code.  Defining this crosses a boundary which
- *  is undesirable since it means your application is using RTEMS features
- *  which are not included in the formally defined and supported API.  
- *  Define this at your own risk. 
- */
-
-#if !defined(__RTEMS_VIOLATE_KERNEL_VISIBILITY__) && !defined(__RTEMS_INSIDE__)
-#define __RTEMS_APPLICATION__
-#endif
-
-#include <rtems/system.h>
-#include <rtems/rtems/status.h>
-#include <rtems/rtems/types.h>
-
-#include <rtems/config.h>
-#include <rtems/init.h>
-#include <rtems/rtems/tasks.h>
-#include <rtems/rtems/intr.h>
-#include <rtems/rtems/clock.h>
-#include <rtems/extension.h>
-#include <rtems/rtems/timer.h>
-#include <rtems/rtems/sem.h>
-#include <rtems/rtems/message.h>
-#include <rtems/rtems/event.h>
-#include <rtems/rtems/signal.h>
-#include <rtems/rtems/event.h>
-#include <rtems/rtems/part.h>
-#include <rtems/rtems/region.h>
-#include <rtems/rtems/dpmem.h>
-#include <rtems/io.h>
-#include <rtems/fatal.h>
-#include <rtems/rtems/ratemon.h>
-#include <rtems/rtems/mp.h>
-
-#include <rtems/rtems/support.h>
-#include <rtems/score/sysstate.h>
-
-#define RTEMS_HAS_HARDWARE_FP CPU_HARDWARE_FP
-
-/*
- *  The following define the constants which may be used in name searches.
- */
- 
-#define RTEMS_SEARCH_ALL_NODES   OBJECTS_SEARCH_ALL_NODES
-#define RTEMS_SEARCH_OTHER_NODES OBJECTS_SEARCH_OTHER_NODES
-#define RTEMS_SEARCH_LOCAL_NODE  OBJECTS_SEARCH_LOCAL_NODE
-#define RTEMS_WHO_AM_I           OBJECTS_WHO_AM_I
- 
-/*
- * Parameters and return id's for _Objects_Get_next
- */
- 
-#define RTEMS_OBJECT_ID_INITIAL_INDEX        OBJECTS_ID_INITIAL_INDEX
-#define RTEMS_OBJECT_ID_FINAL_INDEX          OBJECTS_ID_FINAL_INDEX
- 
-#define RTEMS_OBJECT_ID_INITIAL(class, node) OBJECTS_ID_INITIAL(class, node)
-#define RTEMS_OBJECT_ID_FINAL                OBJECTS_ID_FINAL
- 
-/*
- *  The following constant defines the minimum stack size which every
- *  thread must exceed.
- */
-
-#define RTEMS_MINIMUM_STACK_SIZE  STACK_MINIMUM_SIZE
-
-/*
- *  Constant for indefinite wait.  (actually an illegal interval)
- */
-
-#define RTEMS_NO_TIMEOUT  WATCHDOG_NO_TIMEOUT
-
-/*
- *  An MPCI must support packets of at least this size.
- */
- 
-#define RTEMS_MINIMUM_PACKET_SIZE  MP_PACKET_MINIMUM_PACKET_SIZE
- 
-/*
- *  The following constant defines the number of unsigned32's
- *  in a packet which must be converted to native format in a
- *  heterogeneous system.  In packets longer than
- *  MP_PACKET_MINIMUN_HETERO_CONVERSION unsigned32's, some of the "extra" data
- *  may a user message buffer which is not automatically endian swapped.
- */
- 
-#define RTEMS_MINIMUN_HETERO_CONVERSION  MP_PACKET_MINIMUN_HETERO_CONVERSION
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/cpukit/rtems/include/rtems/rtems/asr.h b/cpukit/rtems/include/rtems/rtems/asr.h
deleted file mode 100644
index 3fac2fa3e3..0000000000
--- a/cpukit/rtems/include/rtems/rtems/asr.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/*  asr.h
- *
- *  This include file contains all the constants and structures associated
- *  with the Asynchronous Signal Handler.  This Handler provides the low-level
- *  support required by the Signal Manager.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_ASR_h
-#define __RTEMS_ASR_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/rtems/modes.h>
-
-/*
- *
- *  The following type defines the control block used to manage
- *  each signal set.
- */
-
-typedef unsigned32 rtems_signal_set;
-
-/*
- *  Return type for ASR Handler
- */
-
-typedef void rtems_asr;
-
-/*
- *  The following type corresponds to the applications asynchronous
- *  signal processing routine.
- */
-
-typedef rtems_asr ( *rtems_asr_entry )(
-                 rtems_signal_set
-             );
-
-/*
- *
- *  The following defines the control structure used to manage
- *  signals.  Each thread has a copy of this record.
- */
-
-typedef struct {
-  boolean           is_enabled;       /* are ASRs enabled currently? */
-  rtems_asr_entry   handler;          /* address of RTEMS_ASR */
-  Modes_Control     mode_set;         /* RTEMS_ASR mode */
-  rtems_signal_set  signals_posted;   /* signal set */
-  rtems_signal_set  signals_pending;  /* pending signal set */
-  unsigned32        nest_level;       /* nest level of RTEMS_ASR */
-}   ASR_Information;
-
-/*
- *  The following constants define the individual signals which may
- *  be used to compose a signal set.
- */
-
-#define RTEMS_SIGNAL_0    0x00000001
-#define RTEMS_SIGNAL_1    0x00000002
-#define RTEMS_SIGNAL_2    0x00000004
-#define RTEMS_SIGNAL_3    0x00000008
-#define RTEMS_SIGNAL_4    0x00000010
-#define RTEMS_SIGNAL_5    0x00000020
-#define RTEMS_SIGNAL_6    0x00000040
-#define RTEMS_SIGNAL_7    0x00000080
-#define RTEMS_SIGNAL_8    0x00000100
-#define RTEMS_SIGNAL_9    0x00000200
-#define RTEMS_SIGNAL_10   0x00000400
-#define RTEMS_SIGNAL_11   0x00000800
-#define RTEMS_SIGNAL_12   0x00001000
-#define RTEMS_SIGNAL_13   0x00002000
-#define RTEMS_SIGNAL_14   0x00004000
-#define RTEMS_SIGNAL_15   0x00008000
-#define RTEMS_SIGNAL_16   0x00010000
-#define RTEMS_SIGNAL_17   0x00020000
-#define RTEMS_SIGNAL_18   0x00040000
-#define RTEMS_SIGNAL_19   0x00080000
-#define RTEMS_SIGNAL_20   0x00100000
-#define RTEMS_SIGNAL_21   0x00200000
-#define RTEMS_SIGNAL_22   0x00400000
-#define RTEMS_SIGNAL_23   0x00800000
-#define RTEMS_SIGNAL_24   0x01000000
-#define RTEMS_SIGNAL_25   0x02000000
-#define RTEMS_SIGNAL_26   0x04000000
-#define RTEMS_SIGNAL_27   0x08000000
-#define RTEMS_SIGNAL_28   0x10000000
-#define RTEMS_SIGNAL_29   0x20000000
-#define RTEMS_SIGNAL_30   0x40000000
-#define RTEMS_SIGNAL_31   0x80000000
-
-#ifndef __RTEMS_APPLICATION__
-#include <rtems/rtems/asr.inl>
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/cpukit/rtems/include/rtems/rtems/attr.h b/cpukit/rtems/include/rtems/rtems/attr.h
deleted file mode 100644
index 215b27f9a0..0000000000
--- a/cpukit/rtems/include/rtems/rtems/attr.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/*  attr.h
- *
- *  This include file contains all information about the Object Attributes
- *  Handler.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_ATTRIBUTES_h
-#define __RTEMS_ATTRIBUTES_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* types */
-
-typedef unsigned32 rtems_attribute;
-
-/* constants */
-
-#define RTEMS_DEFAULT_ATTRIBUTES  0x00000000
-
-#define RTEMS_NO_FLOATING_POINT   0x00000000 /* don't use FP HW */
-#define RTEMS_FLOATING_POINT      0x00000001 /* utilize coprocessor */
-
-#define RTEMS_LOCAL               0x00000000 /* local resource */
-#define RTEMS_GLOBAL              0x00000002 /* global resource */
-
-#define RTEMS_FIFO                0x00000000 /* process RTEMS_FIFO */
-#define RTEMS_PRIORITY            0x00000004 /* process by priority */
-
-#define RTEMS_COUNTING_SEMAPHORE  0x00000000
-#define RTEMS_BINARY_SEMAPHORE    0x00000010
-
-#define RTEMS_NO_INHERIT_PRIORITY 0x00000000
-#define RTEMS_INHERIT_PRIORITY    0x00000020
-
-#define RTEMS_NO_PRIORITY_CEILING 0x00000000
-#define RTEMS_PRIORITY_CEILING    0x00000040
-
-#define RTEMS_APPLICATION_TASK    0x00000000
-#define RTEMS_SYSTEM_TASK         0x00000080
-
-#if ( CPU_HARDWARE_FP == TRUE ) || ( CPU_SOFTWARE_FP == TRUE )
-#define ATTRIBUTES_NOT_SUPPORTED       0
-#else
-#define ATTRIBUTES_NOT_SUPPORTED       RTEMS_FLOATING_POINT
-#endif
-
-#if ( CPU_ALL_TASKS_ARE_FP == TRUE )
-#define ATTRIBUTES_REQUIRED            RTEMS_FLOATING_POINT
-#else
-#define ATTRIBUTES_REQUIRED            0
-#endif
-
-/*
- *  _Attributes_Handler_initialization
- *
- *  DESCRIPTION:
- *
- *  This routine performs initialization for this handler.
- *
- *  NOTE: There is no initialization required in C.  Conditional compilation
- *        takes care of this in C.
- */
-
-#define _Attributes_Handler_initialization()
-
-#ifndef __RTEMS_APPLICATION__
-#include <rtems/rtems/attr.inl>
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/cpukit/rtems/include/rtems/rtems/clock.h b/cpukit/rtems/include/rtems/rtems/clock.h
deleted file mode 100644
index c991d769cf..0000000000
--- a/cpukit/rtems/include/rtems/rtems/clock.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*  clock.h
- *
- *  This include file contains all the constants and structures associated
- *  with the Clock Manager.  This manager provides facilities to set, obtain,
- *  and continually update the current date and time.
- *
- *  This manager provides directives to:
- *
- *     + set the current date and time
- *     + obtain the current date and time
- *     + announce a clock tick
- *
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_CLOCK_h
-#define __RTEMS_CLOCK_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/tod.h>
-#include <rtems/rtems/types.h>
-
-/*
- *  List of things which can be returned by the rtems_clock_get directive.
- */
-
-typedef enum {
-  RTEMS_CLOCK_GET_TOD,
-  RTEMS_CLOCK_GET_SECONDS_SINCE_EPOCH,
-  RTEMS_CLOCK_GET_TICKS_SINCE_BOOT,
-  RTEMS_CLOCK_GET_TICKS_PER_SECOND,
-  RTEMS_CLOCK_GET_TIME_VALUE
-} rtems_clock_get_options;
-
-/*
- *  Standard flavor style to return TOD in for a rtems_clock_get option.
- */
-
-typedef struct {
-  unsigned32  seconds;
-  unsigned32  microseconds;
-} rtems_clock_time_value;
-
-/*
- *  rtems_clock_get
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_clock_get directive.  It returns
- *  one of the following:
- *    + current time of day
- *    + seconds since epoch
- *    + ticks since boot
- *    + ticks per second
- */
-
-rtems_status_code rtems_clock_get(
-  rtems_clock_get_options  option,
-  void              *time_buffer
-);
-
-/*
- *  rtems_clock_set
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_clock_set directive.  It sets
- *  the current time of day to that in the time_buffer record.
- */
-
-rtems_status_code rtems_clock_set(
-  rtems_time_of_day *time_buffer
-);
-
-/*
- *  rtems_clock_tick
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_clock_tick directive.  It is invoked
- *  to inform RTEMS of the occurrence of a clock tick.
- */
-
-rtems_status_code rtems_clock_tick( void );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/cpukit/rtems/include/rtems/rtems/config.h b/cpukit/rtems/include/rtems/rtems/config.h
deleted file mode 100644
index f395710271..0000000000
--- a/cpukit/rtems/include/rtems/rtems/config.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*  config.h
- *
- *  This include file contains the table of user defined configuration
- *  parameters specific for the RTEMS API.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_RTEMS_CONFIGURATION_h
-#define __RTEMS_RTEMS_CONFIGURATION_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/rtems/types.h>
-#include <rtems/rtems/tasks.h>
-
-/*
- *  The following records define the Configuration Table.  The
- *  information contained in this table is required in all
- *  RTEMS systems, whether single or multiprocessor.  This
- *  table primarily defines the following:
- *
- *     + required number of each object type
- */
-
-typedef struct {
-  unsigned32                        maximum_tasks;
-  unsigned32                        maximum_timers;
-  unsigned32                        maximum_semaphores;
-  unsigned32                        maximum_message_queues;
-  unsigned32                        maximum_partitions;
-  unsigned32                        maximum_regions;
-  unsigned32                        maximum_ports;
-  unsigned32                        maximum_periods;
-  unsigned32                        number_of_initialization_tasks;
-  rtems_initialization_tasks_table *User_initialization_tasks_table;
-} rtems_api_configuration_table;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/cpukit/rtems/include/rtems/rtems/dpmem.h b/cpukit/rtems/include/rtems/rtems/dpmem.h
deleted file mode 100644
index a74fc90f2a..0000000000
--- a/cpukit/rtems/include/rtems/rtems/dpmem.h
+++ /dev/null
@@ -1,157 +0,0 @@
-/*  dpmem.h
- *
- *  This include file contains all the constants and structures associated
- *  with the Dual Ported Memory Manager. This manager provides a mechanism
- *  for converting addresses between internal and external representations
- *  for multiple dual-ported memory areas.
- *
- *  Directives provided are:
- *
- *     + create a port
- *     + get ID of a port
- *     + delete a port
- *     + convert external to internal address
- *     + convert internal to external address
- *
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_DUAL_PORTED_MEMORY_h
-#define __RTEMS_DUAL_PORTED_MEMORY_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/object.h>
-
-/*
- *  The following structure defines the port control block.  Each port
- *  has a control block associated with it.  This control block contains
- *  all information required to support the port related operations.
- */
-
-typedef struct {
-  Objects_Control  Object;
-  void            *internal_base; /* base internal address */
-  void            *external_base; /* base external address */
-  unsigned32       length;        /* length of dual-ported area */
-}   Dual_ported_memory_Control;
-
-/*
- *  The following define the internal Dual Ported Memory information.
- */
-
-RTEMS_EXTERN Objects_Information  _Dual_ported_memory_Information;
-
-/*
- *  _Dual_ported_memory_Manager_initialization
- *
- *  DESCRIPTION:
- *
- *  This routine performs the initialization necessary for this manager.
- */
-
-void _Dual_ported_memory_Manager_initialization(
-  unsigned32 maximum_ports
-);
-
-/*
- *  rtems_port_create
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_port_create directive.  The port
- *  will have the name name.  The port maps onto an area of dual ported
- *  memory of length bytes which has internal_start and external_start
- *  as the internal and external starting addresses, respectively.
- *  It returns the id of the created port in ID.
- */
-
-rtems_status_code rtems_port_create(
-  rtems_name    name,
-  void         *internal_start,
-  void         *external_start,
-  unsigned32    length,
-  Objects_Id   *id
-);
-
-/*
- *  rtems_port_ident
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_port_ident directive.  This directive
- *  returns the port ID associated with name.  If more than one port is
- *  named name, then the port to which the ID belongs is arbitrary.
- */
-
-rtems_status_code rtems_port_ident(
-  rtems_name    name,
-  Objects_Id   *id
-);
-
-/*
- *  rtems_port_delete
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_port_delete directive.  It deletes
- *  the port associated with ID.
- */
-
-rtems_status_code rtems_port_delete(
-  Objects_Id id
-);
-
-/*
- *  rtems_port_external_to_internal
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_port_external_to_internal directive.
- *  It returns the internal port address which maps to the provided
- *  external port address for the specified port ID.
- */
-
-rtems_status_code rtems_port_external_to_internal(
-  Objects_Id   id,
-  void        *external,
-  void       **internal
-);
-
-/*
- *  rtems_port_internal_to_external
- *
- *  DESCRIPTION:
- *
- *  This routine implements the Port_internal_to_external directive.
- *  It returns the external port address which maps to the provided
- *  internal port address for the specified port ID.
- */
-
-rtems_status_code rtems_port_internal_to_external(
-  Objects_Id   id,
-  void        *internal,
-  void       **external
-);
-
-#ifndef __RTEMS_APPLICATION__
-#include <rtems/rtems/dpmem.inl>
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/cpukit/rtems/include/rtems/rtems/event.h b/cpukit/rtems/include/rtems/rtems/event.h
deleted file mode 100644
index 48045bdade..0000000000
--- a/cpukit/rtems/include/rtems/rtems/event.h
+++ /dev/null
@@ -1,174 +0,0 @@
-/*  event.h
- *
- *  This include file contains the information pertaining to the Event
- *  Manager.  This manager provides a high performance method of communication
- *  and synchronization.
- *
- *  Directives provided are:
- *
- *     + send an event set to a task
- *     + receive event condition
- *
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_EVENT_h
-#define __RTEMS_EVENT_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/object.h>
-#include <rtems/rtems/types.h>
-#include <rtems/rtems/options.h>
-#include <rtems/score/thread.h>
-#include <rtems/score/watchdog.h>
-#include <rtems/rtems/eventset.h>
-
-/*
- *  This constant is passed as the event_in to the
- *  rtems_event_receive directive to determine which events are pending.
- */
-
-#define EVENT_CURRENT  0
-
-/*
- *  The following enumerated types indicate what happened while the event
- *  manager was in the synchronization window.
- */
-
-typedef enum {
-  EVENT_SYNC_SYNCHRONIZED,
-  EVENT_SYNC_NOTHING_HAPPENED,
-  EVENT_SYNC_TIMEOUT,
-  EVENT_SYNC_SATISFIED
-}  Event_Sync_states;
-
-/*
- *  Event_Manager_initialization
- *
- *  DESCRIPTION:
- *
- *  This routine performs the initialization necessary for this manager.
- */
- 
-void _Event_Manager_initialization( void );
-
-/*
- *  rtems_event_send
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_event_send directive.  It sends
- *  event_in to the task specified by ID.  If the task is blocked
- *  waiting to receive events and the posting of event_in satisfies
- *  the task's event condition, then it is unblocked.
- */
-
-rtems_status_code rtems_event_send (
-  Objects_Id         id,
-  rtems_event_set event_in
-);
-
-/*
- *  rtems_event_receive
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_event_receive directive.  This
- *  directive is invoked when the calling task wishes to receive
- *  the event_in event condition.  One of the fields in the option_set
- *  parameter determines whether the receive request is satisfied if
- *  any or all of the events are pending.   If the event condition
- *  is not satisfied immediately, then the task may block with an
- *  optional timeout of TICKS clock ticks or return immediately.
- *  This determination is based on another field in the option_set
- *  parameter.  This directive returns the events received in the
- *  event_out parameter.
- */
-
-rtems_status_code rtems_event_receive (
-  rtems_event_set  event_in,
-  rtems_option     option_set,
-  rtems_interval   ticks,
-  rtems_event_set *event_out
-);
-
-/*
- *  _Event_Seize
- *
- *  DESCRIPTION:
- *
- *  This routine determines if the event condition event_in is
- *  satisfied.  If so or if the no_wait option is enabled in option_set,
- *  then the procedure returns immediately.  If neither of these
- *  conditions is true, then the calling task is blocked with an
- *  optional timeout of ticks clock ticks.
- */
-
-void _Event_Seize (
-  rtems_event_set  event_in,
-  rtems_option     option_set,
-  rtems_interval   ticks,
-  rtems_event_set *event_out
-);
-
-/*
- *  _Event_Surrender
- *
- *  DESCRIPTION:
- *
- *  This routine determines if the event condition of the_thread
- *  has been satisfied.  If so, it unblocks the_thread.
- */
-
-void _Event_Surrender (
-  Thread_Control *the_thread
-);
-
-/*
- *  _Event_Timeout
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked when a task's event receive request
- *  has not been satisfied after the specified timeout interval.
- *  The task represented by ID will be unblocked and its status
- *  code will be set in it's control block to indicate that a timeout
- *  has occurred.
- */
-
-void _Event_Timeout (
-  Objects_Id  id,
-  void       *ignored
-);
-
-/*
- *  The following defines the synchronization flag used by the
- *  Event Manager to insure that signals sent to the currently
- *  executing thread are received properly.
- */
-
-RTEMS_EXTERN volatile Event_Sync_states _Event_Sync_state;
-
-#include <rtems/rtems/eventmp.h>
-#ifndef __RTEMS_APPLICATION__
-#include <rtems/rtems/event.inl>
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/cpukit/rtems/include/rtems/rtems/eventmp.h b/cpukit/rtems/include/rtems/rtems/eventmp.h
deleted file mode 100644
index 2d609cbb37..0000000000
--- a/cpukit/rtems/include/rtems/rtems/eventmp.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/*  eventmp.h
- *
- *  This include file contains all the constants and structures associated
- *  with the Multiprocessing Support in the Event Manager.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_EVENT_MP_h
-#define __RTEMS_EVENT_MP_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/rtems/event.h>
-#include <rtems/score/mppkt.h>
-#include <rtems/score/object.h>
-#include <rtems/score/thread.h>
-#include <rtems/score/watchdog.h>
-
-/*
- *  The following enumerated type defines the list of
- *  remote event operations.
- */
-
-typedef enum {
-  EVENT_MP_SEND_REQUEST  =  0,
-  EVENT_MP_SEND_RESPONSE =  1
-}   Event_MP_Remote_operations;
-
-/*
- *  The following data structure defines the packet used to perform
- *  remote event operations.
- */
-
-typedef struct {
-  rtems_packet_prefix         Prefix;
-  Event_MP_Remote_operations  operation;
-  rtems_event_set             event_in;
-}   Event_MP_Packet;
-
-/*
- *  _Event_MP_Send_process_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs a remote procedure call so that a
- *  process operation can be performed on another node.
- *
- *  This routine is not needed since there are no process
- *  packets to be sent by this manager.
- */
-
-/*
- *  _Event_MP_Send_request_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs a remote procedure call so that a
- *  directive operation can be initiated on another node.
- */
-
-rtems_status_code _Event_MP_Send_request_packet (
-  Event_MP_Remote_operations operation,
-  Objects_Id                 event_id,
-  rtems_event_set         event_in
-);
-
-/*
- *  _Event_MP_Send_response_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs a remote procedure call so that a
- *  directive can be performed on another node.
- */
-
-void _Event_MP_Send_response_packet (
-  Event_MP_Remote_operations  operation,
-  Thread_Control             *the_thread
-);
-
-/*
- *
- *  _Event_MP_Process_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs the actions specific to this package for
- *  the request from another node.
- */
-
-void _Event_MP_Process_packet (
-  rtems_packet_prefix *the_packet_prefix
-);
-
-/*
- *  _Event_MP_Send_object_was_deleted
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked indirectly by the thread queue
- *  when a proxy has been removed from the thread queue and
- *  the remote node must be informed of this.
- *
- *  This routine is not needed since there are no objects
- *  deleted by this manager.
- */
-
-/*
- *  _Event_MP_Send_extract_proxy
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked when a task is deleted and it
- *  has a proxy which must be removed from a thread queue and
- *  the remote node must be informed of this.
- *
- *  This routine is not needed since there are no objects
- *  deleted by this manager.
- */
-
-/*
- *  _Event_MP_Get_packet
- *
- *  DESCRIPTION:
- *
- *  This function is used to obtain a event mp packet.
- */
-
-Event_MP_Packet *_Event_MP_Get_packet ( void );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of file */
diff --git a/cpukit/rtems/include/rtems/rtems/eventset.h b/cpukit/rtems/include/rtems/rtems/eventset.h
deleted file mode 100644
index fe1f9eb170..0000000000
--- a/cpukit/rtems/include/rtems/rtems/eventset.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*  eventset.h
- *
- *  This include file contains the information pertaining to the
- *  Event Sets Handler.  This handler provides methods for the manipulation
- *  of event sets which will be sent and received by tasks.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_EVENT_SET_h
-#define __RTEMS_EVENT_SET_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- *  The following defines the type used to control event sets.
- */
-
-typedef unsigned32 rtems_event_set;
-
-/*
- *  The following constants define the individual events which may
- *  be used to compose an event set.
- */
-
-#define RTEMS_PENDING_EVENTS      0           /* receive pending events   */
-#define RTEMS_ALL_EVENTS  0xFFFFFFFF
-
-#define RTEMS_EVENT_0     0x00000001
-#define RTEMS_EVENT_1     0x00000002
-#define RTEMS_EVENT_2     0x00000004
-#define RTEMS_EVENT_3     0x00000008
-#define RTEMS_EVENT_4     0x00000010
-#define RTEMS_EVENT_5     0x00000020
-#define RTEMS_EVENT_6     0x00000040
-#define RTEMS_EVENT_7     0x00000080
-#define RTEMS_EVENT_8     0x00000100
-#define RTEMS_EVENT_9     0x00000200
-#define RTEMS_EVENT_10    0x00000400
-#define RTEMS_EVENT_11    0x00000800
-#define RTEMS_EVENT_12    0x00001000
-#define RTEMS_EVENT_13    0x00002000
-#define RTEMS_EVENT_14    0x00004000
-#define RTEMS_EVENT_15    0x00008000
-#define RTEMS_EVENT_16    0x00010000
-#define RTEMS_EVENT_17    0x00020000
-#define RTEMS_EVENT_18    0x00040000
-#define RTEMS_EVENT_19    0x00080000
-#define RTEMS_EVENT_20    0x00100000
-#define RTEMS_EVENT_21    0x00200000
-#define RTEMS_EVENT_22    0x00400000
-#define RTEMS_EVENT_23    0x00800000
-#define RTEMS_EVENT_24    0x01000000
-#define RTEMS_EVENT_25    0x02000000
-#define RTEMS_EVENT_26    0x04000000
-#define RTEMS_EVENT_27    0x08000000
-#define RTEMS_EVENT_28    0x10000000
-#define RTEMS_EVENT_29    0x20000000
-#define RTEMS_EVENT_30    0x40000000
-#define RTEMS_EVENT_31    0x80000000
-
-
-/*
- *  The following constant is the value of an event set which
- *  has no events pending.
- */
-
-#define EVENT_SETS_NONE_PENDING 0
-
-#ifndef __RTEMS_APPLICATION__
-#include <rtems/rtems/eventset.inl>
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/cpukit/rtems/include/rtems/rtems/intr.h b/cpukit/rtems/include/rtems/rtems/intr.h
deleted file mode 100644
index 168806bff2..0000000000
--- a/cpukit/rtems/include/rtems/rtems/intr.h
+++ /dev/null
@@ -1,160 +0,0 @@
-/*  intr.h
- *
- *  This include file contains all the constants and structures associated
- *  with the Interrupt Manager.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_INTERRUPT_h
-#define __RTEMS_INTERRUPT_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/isr.h>
-
-/*
- *  Interrupt level type
- */
-
-typedef ISR_Level rtems_interrupt_level;
-
-/*
- *  The following type defines the control block used to manage
- *  the vectors.
- */
- 
-typedef ISR_Vector_number rtems_vector_number;
-
-/*
- *  Return type for ISR Handler
- */
- 
-typedef void rtems_isr;
-
-/*
- *  Pointer to an ISR Handler
- */
- 
-typedef rtems_isr ( *rtems_isr_entry )(
-                 rtems_vector_number
-             );
-
-/*
- *  _Interrupt_Manager_initialization
- *
- *  DESCRIPTION:
- *
- *  This routine initializes the interrupt manager.
- *
- */
-
-void _Interrupt_Manager_initialization( void );
-
-/*
- *  rtems_interrupt_catch
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_interrupt_catch directive.  This
- *  directive installs new_isr_handler as the RTEMS interrupt service
- *  routine for vector.  The previous RTEMS interrupt service
- *  routine is returned in old_isr_handler.
- */
-
-rtems_status_code rtems_interrupt_catch(
-  rtems_isr_entry      new_isr_handler,
-  rtems_vector_number  vector,
-  rtems_isr_entry     *old_isr_handler
-);
-
-/*
- *  rtems_interrupt_disable
- *
- *  DESCRIPTION:
- *
- *  This routine disables all maskable interrupts and returns the
- *  previous level in _isr_cookie.
- */
-
-#define rtems_interrupt_disable( _isr_cookie ) \
-    _ISR_Disable(_isr_cookie)
-        
-/*
- *  rtems_interrupt_enable
- *
- *  DESCRIPTION:
- *
- *  This routine enables maskable interrupts to the level indicated
- *  _isr_cookie.
- */
-
-#define rtems_interrupt_enable( _isr_cookie ) \
-    _ISR_Enable(_isr_cookie)
-        
-/*
- *  rtems_interrupt_flash
- *
- *  DESCRIPTION:
- *
- *  This routine temporarily enables maskable interrupts to the
- *  level in _isr_cookie before redisabling them.
- */
-
-#define rtems_interrupt_flash( _isr_cookie ) \
-    _ISR_Flash(_isr_cookie)
-
-/*
- *  rtems_interrupt_is_in_progress
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the processor is currently servicing
- *  an interrupt and FALSE otherwise.   A return value of TRUE indicates
- *  that the caller is an interrupt service routine, NOT a thread.  The
- *  directives available to an interrupt service routine are restricted.
- */
- 
-#define rtems_interrupt_is_in_progress() \
-    _ISR_Is_in_progress()
-
-/*
- *  rtems_interrupt_cause
- *
- *  DESCRIPTION:
- *
- *  This routine generates an interrupt.
- *
- *  NOTE:  No implementation.
- */
-
-#define rtems_interrupt_cause( _interrupt_to_cause )
-
-/*
- *  rtems_interrupt_cause
- *
- *  DESCRIPTION:
- *
- *  This routine clears the specified interrupt.
- *
- *  NOTE:  No implementation.
- */
-
-#define rtems_interrupt_clear( _interrupt_to_clear )
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/cpukit/rtems/include/rtems/rtems/message.h b/cpukit/rtems/include/rtems/rtems/message.h
deleted file mode 100644
index 611d46fde8..0000000000
--- a/cpukit/rtems/include/rtems/rtems/message.h
+++ /dev/null
@@ -1,334 +0,0 @@
-/*  message.h
- *
- *  This include file contains all the constants and structures associated
- *  with the Message Queue Manager.  This manager provides a mechanism for
- *  communication and synchronization between tasks using messages.
- *
- *  Directives provided are:
- *
- *     + create a queue
- *     + get ID of a queue
- *     + delete a queue
- *     + put a message at the rear of a queue
- *     + put a message at the front of a queue
- *     + broadcast N messages to a queue
- *     + receive message from a queue
- *     + flush all messages on a queue
- *
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_MESSAGE_QUEUE_h
-#define __RTEMS_MESSAGE_QUEUE_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/rtems/types.h>
-#include <rtems/score/chain.h>
-#include <rtems/score/object.h>
-#include <rtems/rtems/attr.h>
-#include <rtems/score/threadq.h>
-#include <rtems/score/coremsg.h>
-
-/*
- *  The following enumerated type details the modes in which a message
- *  may be submitted to a message queue.  The message may be posted
- *  in a send or urgent fashion.
- */
- 
-typedef enum {
-  MESSAGE_QUEUE_SEND_REQUEST   = 0,
-  MESSAGE_QUEUE_URGENT_REQUEST = 1
-}  Message_queue_Submit_types;
-
-/*
- *  The following records define the control block used to manage
- *  each message queue.
- */
-
-typedef struct {
-  Objects_Control             Object;
-  rtems_attribute             attribute_set;
-  CORE_message_queue_Control  message_queue;
-}   Message_queue_Control;
-
-/*
- *  The following defines the information control block used to
- *  manage this class of objects.
- */
-
-RTEMS_EXTERN Objects_Information  _Message_queue_Information;
-
-/*
- *  _Message_queue_Manager_initialization
- *
- *  DESCRIPTION:
- *
- *  This routine performs the initialization necessary for this manager.
- */
-
-void _Message_queue_Manager_initialization(
-  unsigned32 maximum_message_queues
-);
-
-/*
- *  rtems_message_queue_create
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_message_queue_create directive.  The
- *  message queue will have the name name.  If the attribute_set indicates
- *  that the message queue is to be limited in the number of messages
- *  that can be outstanding, then count indicates the maximum number of
- *  messages that will be held.  It returns the id of the created
- *  message queue in ID.
- */
-
-rtems_status_code rtems_message_queue_create(
-  rtems_name       name,
-  unsigned32       count,
-  unsigned32       max_message_size,
-  rtems_attribute  attribute_set,
-  Objects_Id      *id
-);
-
-/*
- *  rtems_message_queue_ident
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_message_queue_ident directive.
- *  This directive returns the message queue ID associated with NAME.
- *  If more than one message queue is named name, then the message
- *  queue to which the ID belongs is arbitrary.  node indicates the
- *  extent of the search for the ID of the message queue named name.
- *  The search can be limited to a particular node or allowed to
- *  encompass all nodes.
- */
-
-rtems_status_code rtems_message_queue_ident(
-  rtems_name    name,
-  unsigned32    node,
-  Objects_Id   *id
-);
-
-/*
- *  rtems_message_queue_delete
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_message_queue_delete directive.  The
- *  message queue indicated by ID is deleted.
- */
-
-rtems_status_code rtems_message_queue_delete(
-  Objects_Id id
-);
-
-/*
- *  rtems_message_queue_send
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_message_queue_send directive.
- *  This directive sends the message buffer to the message queue
- *  indicated by ID.  If one or more tasks is blocked waiting
- *  to receive a message from this message queue, then one will
- *  receive the message.  The task selected to receive the
- *  message is based on the task queue discipline algorithm in
- *  use by this particular message queue.  If no tasks are waiting,
- *  then the message buffer will be placed at the rear of the
- *  chain of pending messages for this message queue.
- */
-
-rtems_status_code rtems_message_queue_send(
-  Objects_Id            id,
-  void                 *buffer,
-  unsigned32            size
-);
-
-/*
- *  rtems_message_queue_urgent
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_message_queue_send directive.
- *  This directive sends the message buffer to the message queue
- *  indicated by ID.  If one or more tasks is blocked waiting
- *  to receive a message from this message queue, then one will
- *  receive the message.  The task selected to receive the
- *  message is based on the task queue discipline algorithm in
- *  use by this particular message queue.  If no tasks are waiting,
- *  then the message buffer will be placed at the rear of the
- *  chain of pending messages for this message queue.
- */
-
-rtems_status_code rtems_message_queue_urgent(
-  Objects_Id            id,
-  void                 *buffer,
-  unsigned32            size
-);
-
-/*
- *  rtems_message_queue_broadcast
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_message_queue_send directive.
- *  This directive sends the message buffer to the message queue
- *  indicated by ID.  If one or more tasks is blocked waiting
- *  to receive a message from this message queue, then one will
- *  receive the message.  The task selected to receive the
- *  message is based on the task queue discipline algorithm in
- *  use by this particular message queue.  If no tasks are waiting,
- *  then the message buffer will be placed at the rear of the
- *  chain of pending messages for this message queue.
- */
-
-rtems_status_code rtems_message_queue_broadcast(
-  Objects_Id            id,
-  void                 *buffer,
-  unsigned32            size,
-  unsigned32           *count
-);
-
-/*
- *  rtems_message_queue_receive
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_message_queue_receive directive.
- *  This directive is invoked when the calling task wishes to receive
- *  a message from the message queue indicated by ID.  The received
- *  message is to be placed in buffer.  If no messages are outstanding
- *  and the option_set indicates that the task is willing to block,
- *  then the task will be blocked until a message arrives or until,
- *  optionally, timeout clock ticks have passed.
- */
-
-rtems_status_code rtems_message_queue_receive(
-  Objects_Id            id,
-  void                 *buffer,
-  unsigned32           *size,
-  unsigned32            option_set,
-  rtems_interval        timeout
-);
-
-/*
- *  rtems_message_queue_flush
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_message_queue_flush directive.
- *  This directive takes all outstanding messages for the message
- *  queue indicated by ID and returns them to the inactive message
- *  chain.  The number of messages flushed is returned in COUNT.
- */
-
-rtems_status_code rtems_message_queue_flush(
-  Objects_Id  id,
-  unsigned32 *count
-);
-
-/*
- *  rtems_message_queue_get_number_pending
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_message_queue_get_number_pending
- *  directive.  This directive returns the number of pending 
- *  messages for the message queue indicated by ID 
- *  chain.  The number of messages pending is returned in COUNT.
- */
-
-rtems_status_code rtems_message_queue_get_number_pending(
-  Objects_Id  id,
-  unsigned32 *count
-);
-
-
-/*
- *  _Message_queue_Submit
- *
- *  DESCRIPTION:
- *
- *  This routine implements the directives rtems_message_queue_send
- *  and rtems_message_queue_urgent.  It processes a message that is
- *  to be submitted to the designated message queue.  The message will
- *  either be processed as a send send message which it will be inserted
- *  at the rear of the queue or it will be processed as an urgent message
- *  which will be inserted at the front of the queue.
- */
- 
-rtems_status_code _Message_queue_Submit(
-  Objects_Id                  id,
-  void                       *buffer,
-  unsigned32                  size,
-  Message_queue_Submit_types  submit_type
-);
-
-/*
- *  _Message_queue_Allocate
- *
- *  DESCRIPTION:
- *
- *  This function allocates a message queue control block from
- *  the inactive chain of free message queue control blocks.
- */
-
-Message_queue_Control *_Message_queue_Allocate (
-    unsigned32          count,
-    unsigned32          max_message_size
-);
-
-/*
- *  _Message_queue_Translate_core_message_queue_return_code
- *
- *  DESCRIPTION:
- *
- *  This function returns a RTEMS status code based on the core message queue
- *  status code specified.
- */
- 
-rtems_status_code _Message_queue_Translate_core_message_queue_return_code (
-  unsigned32 the_message_queue_status
-);
-
-/*
- *
- *  _Message_queue_Core_message_queue_mp_support
- *
- *  Input parameters:
- *    the_thread - the remote thread the message was submitted to
- *    id         - id of the message queue
- *
- *  Output parameters: NONE
- */
- 
-void  _Message_queue_Core_message_queue_mp_support (
-  Thread_Control *the_thread,
-  Objects_Id      id
-);
-
-#ifndef __RTEMS_APPLICATION__
-#include <rtems/rtems/message.inl>
-#endif
-#include <rtems/rtems/msgmp.h>
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/cpukit/rtems/include/rtems/rtems/modes.h b/cpukit/rtems/include/rtems/rtems/modes.h
deleted file mode 100644
index 05205078c5..0000000000
--- a/cpukit/rtems/include/rtems/rtems/modes.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*  modes.h
- *
- *  This include file contains all constants and structures associated
- *  with the RTEMS thread and RTEMS_ASR modes.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_MODES_h
-#define __RTEMS_MODES_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/isr.h>
-
-/*
- *  The following type defines the control block used to manage
- *  each a mode set.
- */
-
-typedef unsigned32 Modes_Control;
-
-/*
- *  The following constants define the individual modes and masks
- *  which may be used to compose a mode set and to alter modes.
- */
-
-#define RTEMS_ALL_MODE_MASKS     0x0000ffff
-
-#define RTEMS_DEFAULT_MODES     0x00000000
-#define RTEMS_CURRENT_MODE      0
-
-#define RTEMS_PREEMPT_MASK    0x00000100  /* preemption bit           */
-#define RTEMS_TIMESLICE_MASK  0x00000200  /* timeslice bit            */
-#define RTEMS_ASR_MASK        0x00000400  /* RTEMS_ASR enable bit           */
-#define RTEMS_INTERRUPT_MASK  CPU_MODES_INTERRUPT_MASK
-
-#define RTEMS_PREEMPT      0x00000000     /* enable preemption        */
-#define RTEMS_NO_PREEMPT   0x00000100     /* disable preemption       */
-
-#define RTEMS_NO_TIMESLICE 0x00000000     /* disable timeslicing      */
-#define RTEMS_TIMESLICE    0x00000200     /* enable timeslicing       */
-
-#define RTEMS_ASR          0x00000000     /* enable RTEMS_ASR               */
-#define RTEMS_NO_ASR       0x00000400     /* disable RTEMS_ASR              */
-
-/*
- *  The number of bits for interrupt levels is CPU dependent.
- *  RTEMS supports 0 to 256 levels in bits 0-7 of the mode.
- */
-
-/*PAGE
- *
- *  RTEMS_INTERRUPT_LEVEL
- *
- *  DESCRIPTION:
- *
- *  This function returns the processor dependent interrupt
- *  level which corresponds to the requested interrupt level.
- *
- * NOTE: RTEMS supports 256 interrupt levels using the least
- *       significant eight bits of MODES.CONTROL.  On any
- *       particular CPU, fewer than 256 levels may be supported.
- */
-
-#define RTEMS_INTERRUPT_LEVEL( _mode_set ) \
-  ( (_mode_set) & RTEMS_INTERRUPT_MASK )
- 
-
-#ifndef __RTEMS_APPLICATION__
-#include <rtems/rtems/modes.inl>
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/cpukit/rtems/include/rtems/rtems/mp.h b/cpukit/rtems/include/rtems/rtems/mp.h
deleted file mode 100644
index 77dd8a707f..0000000000
--- a/cpukit/rtems/include/rtems/rtems/mp.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*  mp.h
- *
- *  This include file contains all the constants and structures associated
- *  with the Multiprocessing Manager.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_MP_h
-#define __RTEMS_MP_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- *
- *  _Multiprocessing_Manager_initialization
- *
- *  DESCRIPTION:
- *
- *  This routine performs the initialization necessary for this manager.
- */
-
-void _Multiprocessing_Manager_initialization ( void );
-
-/*
- *
- *  rtems_multiprocessing_announce
- *
- *  DESCRIPTION:
- *
- *  This routine implements the MULTIPROCESSING_ANNOUNCE directive.
- *  It is invoked by the MPCI layer to indicate that an MPCI packet
- *  has been received.
- */
-
-void rtems_multiprocessing_announce ( void );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/*  end of include file */
diff --git a/cpukit/rtems/include/rtems/rtems/msgmp.h b/cpukit/rtems/include/rtems/rtems/msgmp.h
deleted file mode 100644
index 64fa8da93b..0000000000
--- a/cpukit/rtems/include/rtems/rtems/msgmp.h
+++ /dev/null
@@ -1,177 +0,0 @@
-/*  msgmp.h
- *
- *  This include file contains all the constants and structures associated
- *  with the Multiprocessing Support in the Message Manager.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_MESSAGE_QUEUE_MP_h
-#define __RTEMS_MESSAGE_QUEUE_MP_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/rtems/message.h>
-#include <rtems/score/mppkt.h>
-#include <rtems/score/object.h>
-#include <rtems/rtems/options.h>
-#include <rtems/score/thread.h>
-#include <rtems/score/watchdog.h>
-
-/*
- *  The following enumerated type defines the list of
- *  remote message queue operations.
- */
-
-typedef enum {
-  MESSAGE_QUEUE_MP_ANNOUNCE_CREATE             =  0,
-  MESSAGE_QUEUE_MP_ANNOUNCE_DELETE             =  1,
-  MESSAGE_QUEUE_MP_EXTRACT_PROXY               =  2,
-  MESSAGE_QUEUE_MP_RECEIVE_REQUEST             =  3,
-  MESSAGE_QUEUE_MP_RECEIVE_RESPONSE            =  4,
-  MESSAGE_QUEUE_MP_SEND_REQUEST                =  5,
-  MESSAGE_QUEUE_MP_SEND_RESPONSE               =  6,
-  MESSAGE_QUEUE_MP_URGENT_REQUEST              =  7,
-  MESSAGE_QUEUE_MP_URGENT_RESPONSE             =  8,
-  MESSAGE_QUEUE_MP_BROADCAST_REQUEST           =  9,
-  MESSAGE_QUEUE_MP_BROADCAST_RESPONSE          = 10,
-  MESSAGE_QUEUE_MP_FLUSH_REQUEST               = 11,
-  MESSAGE_QUEUE_MP_FLUSH_RESPONSE              = 12,
-  MESSAGE_QUEUE_MP_GET_NUMBER_PENDING_REQUEST  = 13,
-  MESSAGE_QUEUE_MP_GET_NUMBER_PENDING_RESPONSE = 14
-}   Message_queue_MP_Remote_operations;
-
-/*
- *  The following data structure defines the packet used to perform
- *  remote message queue operations.
- */
-
-typedef struct {
-  rtems_packet_prefix                Prefix;
-  Message_queue_MP_Remote_operations operation;
-  rtems_name                         name;
-  rtems_option                       option_set;
-  Objects_Id                         proxy_id;
-  unsigned32                         count;
-  unsigned32                         size;
-  unsigned32                         pad0;
-  CORE_message_queue_Buffer          Buffer;
-}   Message_queue_MP_Packet;
-
-/*
- *  _Message_queue_MP_Send_process_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs a remote procedure call so that a
- *  process operation can be performed on another node.
- */
-
-void _Message_queue_MP_Send_process_packet (
-  Message_queue_MP_Remote_operations operation,
-  Objects_Id                         message_queue_id,
-  rtems_name                         name,
-  Objects_Id                         proxy_id
-);
-
-/*
- *  _Message_queue_MP_Send_request_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs a remote procedure call so that a
- *  directive operation can be initiated on another node.
- */
-
-rtems_status_code _Message_queue_MP_Send_request_packet (
-  Message_queue_MP_Remote_operations  operation,
-  Objects_Id                          message_queue_id,
-  void                               *buffer,
-  unsigned32                         *size_p,
-  rtems_option                        option_set,
-  Watchdog_Interval                   timeout
-);
-
-/*
- *  _Message_queue_MP_Send_response_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs a remote procedure call so that a
- *  directive can be performed on another node.
- */
-
-void _Message_queue_MP_Send_response_packet (
-  Message_queue_MP_Remote_operations  operation,
-  Objects_Id                          message_queue_id,
-  Thread_Control                     *the_thread
-);
-
-/*
- *
- *  _Message_queue_MP_Process_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs the actions specific to this package for
- *  the request from another node.
- */
-
-void _Message_queue_MP_Process_packet (
-  rtems_packet_prefix *the_packet_prefix
-);
-
-/*
- *  _Message_queue_MP_Send_object_was_deleted
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked indirectly by the thread queue
- *  when a proxy has been removed from the thread queue and
- *  the remote node must be informed of this.
- */
-
-void _Message_queue_MP_Send_object_was_deleted (
-  Thread_Control *the_proxy
-);
-
-/*
- *  _Message_queue_MP_Send_extract_proxy
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked when a task is deleted and it
- *  has a proxy which must be removed from a thread queue and
- *  the remote node must be informed of this.
- */
-
-void _Message_queue_MP_Send_extract_proxy (
-  Thread_Control *the_thread
-);
-
-/*
- *  _Message_queue_MP_Get_packet
- *
- *  DESCRIPTION:
- *
- *  This function is used to obtain a message queue mp packet.
- */
-
-Message_queue_MP_Packet *_Message_queue_MP_Get_packet ( void );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of file */
diff --git a/cpukit/rtems/include/rtems/rtems/options.h b/cpukit/rtems/include/rtems/rtems/options.h
deleted file mode 100644
index 7746524f98..0000000000
--- a/cpukit/rtems/include/rtems/rtems/options.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*  options.h
- *
- *  This include file contains information which defines the
- *  options available on many directives.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_OPTIONS_h
-#define __RTEMS_OPTIONS_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- *  The following type defines the control block used to manage
- *  option sets.
- */
-
-typedef unsigned32 rtems_option;
-
-/*
- *  The following constants define the individual options which may
- *  be used to compose an option set.
- */
-
-#define RTEMS_DEFAULT_OPTIONS   0x00000000
-
-#define RTEMS_WAIT      0x00000000        /* wait on resource */
-#define RTEMS_NO_WAIT   0x00000001        /* do not wait on resource */
-
-#define RTEMS_EVENT_ALL 0x00000000        /* wait for all events */
-#define RTEMS_EVENT_ANY 0x00000002        /* wait on any event */
-
-#ifndef __RTEMS_APPLICATION__
-#include <rtems/rtems/options.inl>
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/cpukit/rtems/include/rtems/rtems/part.h b/cpukit/rtems/include/rtems/rtems/part.h
deleted file mode 100644
index 1d720db146..0000000000
--- a/cpukit/rtems/include/rtems/rtems/part.h
+++ /dev/null
@@ -1,168 +0,0 @@
-/*  partition.h
- *
- *  This include file contains all the constants and structures associated
- *  with the Partition Manager.  This manager provides facilities to
- *  dynamically allocate memory in fixed-sized units which are returned
- *  as buffers.
- *
- *  Directives provided are:
- *
- *     + create a partition
- *     + get an ID of a partition
- *     + delete a partition
- *     + get a buffer from a partition
- *     + return a buffer to a partition
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_PARTITION_h
-#define __RTEMS_PARTITION_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/address.h>
-#include <rtems/score/object.h>
-#include <rtems/rtems/attr.h>
-#include <rtems/rtems/types.h>
-
-/*
- *  The following defines the control block used to manage each partition.
- */
-
-typedef struct {
-  Objects_Control     Object;
-  void               *starting_address;      /* physical address */
-  unsigned32          length;                /* in bytes */
-  unsigned32          buffer_size;           /* in bytes */
-  rtems_attribute  attribute_set;         /* attributes */
-  unsigned32          number_of_used_blocks; /* or allocated buffers */
-  Chain_Control       Memory;                /* buffer chain */
-}   Partition_Control;
-
-/*
- *  The following defines the information control block used to
- *  manage this class of objects.
- */
-
-RTEMS_EXTERN Objects_Information _Partition_Information;
-
-/*
- *  _Partition_Manager_initialization
- *
- *  DESCRIPTION:
- *
- *  This routine performs the initialization necessary for this manager.
- */
-
-void _Partition_Manager_initialization(
-  unsigned32 maximum_partitions
-);
-
-/*
- *  rtems_partition_create
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_partition_create directive.  The
- *  partition will have the name name.  The memory area managed by
- *  the partition is of length bytes and starts at starting_address.
- *  The memory area will be divided into as many buffers of
- *  buffer_size bytes as possible.   The attribute_set determines if
- *  the partition is global or local.  It returns the id of the
- *  created partition in ID.
- */
-
-rtems_status_code rtems_partition_create(
-  rtems_name          name,
-  void               *starting_address,
-  unsigned32          length,
-  unsigned32          buffer_size,
-  rtems_attribute  attribute_set,
-  Objects_Id         *id
-);
-
-/*
- *  rtems_partition_ident
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_partition_ident directive.
- *  This directive returns the partition ID associated with name.
- *  If more than one partition is named name, then the partition
- *  to which the ID belongs is arbitrary.  node indicates the
- *  extent of the search for the ID of the partition named name.
- *  The search can be limited to a particular node or allowed to
- *  encompass all nodes.
- */
-
-rtems_status_code rtems_partition_ident(
-  rtems_name    name,
-  unsigned32    node,
-  Objects_Id   *id
-);
-
-/*
- *  rtems_partition_delete
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_partition_delete directive.  The
- *  partition indicated by ID is deleted.
- */
-
-rtems_status_code rtems_partition_delete(
-  Objects_Id id
-);
-
-/*
- *  rtems_partition_get_buffer
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_partition_get_buffer directive.  It
- *  attempts to allocate a buffer from the partition associated with ID.
- *  If a buffer is allocated, its address is returned in buffer.
- */
-
-rtems_status_code rtems_partition_get_buffer(
-  Objects_Id  id,
-  void       **buffer
-);
-
-/*
- *  rtems_partition_return_buffer
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_partition_return_buffer directive.  It
- *  frees the buffer to the partition associated with ID.  The buffer must
- *  have been previously allocated from the same partition.
- */
-
-rtems_status_code rtems_partition_return_buffer(
-  Objects_Id  id,
-  void       *buffer
-);
-
-#ifndef __RTEMS_APPLICATION__
-#include <rtems/rtems/part.inl>
-#endif
-#include <rtems/rtems/partmp.h>
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/cpukit/rtems/include/rtems/rtems/partmp.h b/cpukit/rtems/include/rtems/rtems/partmp.h
deleted file mode 100644
index 0bac39258b..0000000000
--- a/cpukit/rtems/include/rtems/rtems/partmp.h
+++ /dev/null
@@ -1,161 +0,0 @@
-/*  partmp.h
- *
- *  This include file contains all the constants and structures associated
- *  with the Multiprocessing Support in the Partition Manager.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_PARTITION_MP_h
-#define __RTEMS_PARTITION_MP_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/mppkt.h>
-#include <rtems/score/object.h>
-#include <rtems/rtems/options.h>
-#include <rtems/score/thread.h>
-
-#include <rtems/rtems/part.h>
-
-/*
- *  The following enumerated type defines the list of
- *  remote partition operations.
- */
-
-typedef enum {
-  PARTITION_MP_ANNOUNCE_CREATE        =  0,
-  PARTITION_MP_ANNOUNCE_DELETE        =  1,
-  PARTITION_MP_EXTRACT_PROXY          =  2,
-  PARTITION_MP_GET_BUFFER_REQUEST     =  3,
-  PARTITION_MP_GET_BUFFER_RESPONSE    =  4,
-  PARTITION_MP_RETURN_BUFFER_REQUEST  =  5,
-  PARTITION_MP_RETURN_BUFFER_RESPONSE =  6
-}   Partition_MP_Remote_operations;
-
-/*
- *  The following data structure defines the packet used to perform
- *  remote partition operations.
- */
-
-typedef struct {
-  rtems_packet_prefix             Prefix;
-  Partition_MP_Remote_operations  operation;
-  rtems_name                      name;
-  void                           *buffer;
-  Objects_Id                      proxy_id;
-}   Partition_MP_Packet;
-
-/*
- *  _Partition_MP_Send_process_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs a remote procedure call so that a
- *  process operation can be performed on another node.
- */
-
-void _Partition_MP_Send_process_packet (
-  Partition_MP_Remote_operations operation,
-  Objects_Id                     partition_id,
-  rtems_name                     name,
-  Objects_Id                     proxy_id
-);
-
-/*
- *  _Partition_MP_Send_request_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs a remote procedure call so that a
- *  directive operation can be initiated on another node.
- */
-
-rtems_status_code _Partition_MP_Send_request_packet (
-  Partition_MP_Remote_operations  operation,
-  Objects_Id                      partition_id,
-  void                           *buffer
-);
-
-/*
- *  _Partition_MP_Send_response_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs a remote procedure call so that a
- *  directive can be performed on another node.
- */
-
-void _Partition_MP_Send_response_packet (
-  Partition_MP_Remote_operations  operation,
-  Objects_Id                      partition_id,
-  Thread_Control                 *the_thread
-);
-
-/*
- *
- *  _Partition_MP_Process_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs the actions specific to this package for
- *  the request from another node.
- */
-
-void _Partition_MP_Process_packet (
-  rtems_packet_prefix *the_packet_prefix
-);
-
-/*
- *  _Partition_MP_Send_object_was_deleted
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked indirectly by the thread queue
- *  when a proxy has been removed from the thread queue and
- *  the remote node must be informed of this.
- *
- *  This routine is not needed by the Partition since a partition
- *  cannot be deleted when buffers are in use.
- */
-
-/*
- *  _Partition_MP_Send_extract_proxy
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked when a task is deleted and it
- *  has a proxy which must be removed from a thread queue and
- *  the remote node must be informed of this.
- */
-
-void _Partition_MP_Send_extract_proxy (
-  Thread_Control *the_thread
-);
-
-/*
- *  _Partition_MP_Get_packet
- *
- *  DESCRIPTION:
- *
- *  This function is used to obtain a partition mp packet.
- */
-
-Partition_MP_Packet *_Partition_MP_Get_packet ( void );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of file */
diff --git a/cpukit/rtems/include/rtems/rtems/ratemon.h b/cpukit/rtems/include/rtems/rtems/ratemon.h
deleted file mode 100644
index 0e1dfbfad3..0000000000
--- a/cpukit/rtems/include/rtems/rtems/ratemon.h
+++ /dev/null
@@ -1,213 +0,0 @@
-/*  ratemon.h
- *
- *  This include file contains all the constants, structures, and
- *  prototypes associated with the Rate Monotonic Manager.  This manager
- *  provides facilities to implement tasks which execute in a periodic fashion.
- *
- *  Directives provided are:
- *
- *     + create a rate monotonic timer
- *     + cancel a period
- *     + delete a rate monotonic timer
- *     + conclude current and start the next period
- *     + obtain status information on a period
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_RATE_MONOTONIC_h
-#define __RTEMS_RATE_MONOTONIC_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/object.h>
-#include <rtems/score/thread.h>
-#include <rtems/score/watchdog.h>
-
-/*
- *  The following enumerated type defines the states in which a
- *  period may be.
- */
-
-typedef enum {
-  RATE_MONOTONIC_INACTIVE,               /* off chain, never initialized */
-  RATE_MONOTONIC_OWNER_IS_BLOCKING,      /* on chain, owner is blocking on it */
-  RATE_MONOTONIC_ACTIVE,                 /* on chain, running continuously */
-  RATE_MONOTONIC_EXPIRED_WHILE_BLOCKING, /* on chain, expired while owner was */
-                                         /*   was blocking on it */
-  RATE_MONOTONIC_EXPIRED                 /* off chain, will be reset by next */
-                                         /*   rtems_rate_monotonic_period */
-}   rtems_rate_monotonic_period_states;
-
-/*
- *  The following constant is the interval passed to the rate_monontonic_period
- *  directive to obtain status information.
- */
-
-#define RTEMS_PERIOD_STATUS       WATCHDOG_NO_TIMEOUT
-
-/* 
- *  The following defines the period status structure.
- */ 
-
-typedef struct {
-  rtems_rate_monotonic_period_states  state;
-  unsigned32                          ticks_since_last_period;
-  unsigned32                          ticks_executed_since_last_period;
-}  rtems_rate_monotonic_period_status;
-
-/*
- *  The following structure defines the control block used to manage
- *  each period.
- */
-
-typedef struct {
-  Objects_Control                     Object;
-  Watchdog_Control                    Timer;
-  rtems_rate_monotonic_period_states  state;
-  unsigned32                          owner_ticks_executed_at_period;
-  unsigned32                          time_at_period;
-  Thread_Control                     *owner;
-}   Rate_monotonic_Control;
-
-RTEMS_EXTERN Objects_Information _Rate_monotonic_Information;
-
-/*
- *  _Rate_monotonic_Manager_initialization
- *
- *  DESCRIPTION:
- *
- *  This routine performs the initialization necessary for this manager.
- */
-
-void _Rate_monotonic_Manager_initialization(
-  unsigned32 maximum_periods
-);
-
-/*
- *  rtems_rate_monotonic_create
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rate_monotonic_create directive.  The
- *  period will have the name name.  It returns the id of the
- *  created period in ID.
- */
-
-rtems_status_code rtems_rate_monotonic_create(
-  rtems_name    name,
-  Objects_Id   *id
-);
-
-/*
- *  rtems_rate_monotonic_ident
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_rate_monotonic_ident directive.
- *  This directive returns the period ID associated with name.
- *  If more than one period is named name, then the period
- *  to which the ID belongs is arbitrary.
- */
-
-rtems_status_code rtems_rate_monotonic_ident(
-  rtems_name    name,
-  Objects_Id   *id
-);
-
-/*
- *  rtems_rate_monotonic_cancel
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_rate_monotonic_cancel directive.  This
- *  directive stops the period associated with ID from continuing to
- *  run.
- */
-
-rtems_status_code rtems_rate_monotonic_cancel(
-  Objects_Id id
-);
-
-/*
- *  rtems_rate_monotonic_delete
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_rate_monotonic_delete directive.  The
- *  period indicated by ID is deleted.
- */
-
-rtems_status_code rtems_rate_monotonic_delete(
-  Objects_Id id
-);
-
-/*
- *  rtems_rate_monotonic_get_status
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_rate_monotonic_get_status directive.
- *  Information about the period indicated by ID is returned.
- *
- */
-
-rtems_status_code rtems_rate_monotonic_get_status(
-  Objects_Id                           id,
-  rtems_rate_monotonic_period_status  *status
-);
-
-/*
- *  rtems_rate_monotonic_period
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_rate_monotonic_period directive.  When
- *  length is non-zero, this directive initiates the period associated with
- *  ID from continuing for a period of length.  If length is zero, then
- *  result is set to indicate the current state of the period.
- */
-
-rtems_status_code rtems_rate_monotonic_period(
-  Objects_Id      id,
-  rtems_interval  length
-);
-
-/*
- *  _Rate_monotonic_Timeout
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked when the period represented
- *  by ID expires.  If the task which owns this period is blocked
- *  waiting for the period to expire, then it is readied and the
- *  period is restarted.  If the owning task is not waiting for the
- *  period to expire, then the period is placed in the EXPIRED
- *  state and not restarted.
- */
-
-void _Rate_monotonic_Timeout (
-  Objects_Id  id,
-  void       *ignored
-);
-
-#ifndef __RTEMS_APPLICATION__
-#include <rtems/rtems/ratemon.inl>
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/cpukit/rtems/include/rtems/rtems/region.h b/cpukit/rtems/include/rtems/rtems/region.h
deleted file mode 100644
index 05418f6a95..0000000000
--- a/cpukit/rtems/include/rtems/rtems/region.h
+++ /dev/null
@@ -1,234 +0,0 @@
-/*  region.h
- *
- *  This include file contains all the constants and structures associated
- *  with the Region Manager.  This manager provides facilities to dynamically
- *  allocate memory in variable sized units which are returned as segments.
- *
- *  Directives provided are:
- *
- *     + create a region
- *     + get an ID of a region
- *     + delete a region
- *     + get a segment from a region
- *     + return a segment to a region
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_REGION_h
-#define __RTEMS_REGION_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/object.h>
-#include <rtems/score/threadq.h>
-#include <rtems/score/heap.h>
-#include <rtems/debug.h>
-#include <rtems/rtems/attr.h>
-#include <rtems/rtems/types.h>
-
-/*
- *  The following records define the control block used to manage
- *  each region.
- */
-
-typedef struct {
-  Objects_Control       Object;
-  Thread_queue_Control  Wait_queue;            /* waiting threads        */
-  void                 *starting_address;      /* physical start addr    */
-  unsigned32            length;                /* physical length(bytes) */
-  unsigned32            page_size;             /* in bytes               */
-  unsigned32            maximum_segment_size;  /* in bytes               */
-  rtems_attribute       attribute_set;
-  unsigned32            number_of_used_blocks; /* blocks allocated       */
-  Heap_Control          Memory;
-}  Region_Control;
-
-/*
- *  The following defines the information control block used to
- *  manage this class of objects.
- */
-
-RTEMS_EXTERN Objects_Information _Region_Information;
-
-/*
- *  _Region_Manager_initialization
- *
- *  DESCRIPTION:
- *
- *  This routine performs the initialization necessary for this manager.
- */
-
-void _Region_Manager_initialization(
-  unsigned32 maximum_regions
-);
-
-/*
- *  rtems_region_create
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_region_create directive.  The
- *  region will have the name name.  The memory area managed by
- *  the region is of length bytes and starts at starting_address.
- *  The memory area will be divided into as many allocatable units of
- *  page_size bytes as possible.   The attribute_set determines which
- *  thread queue discipline is used by the region.  It returns the
- *  id of the created region in ID.
- */
-
-rtems_status_code rtems_region_create(
-  rtems_name          name,
-  void               *starting_address,
-  unsigned32          length,
-  unsigned32          page_size,
-  rtems_attribute  attribute_set,
-  Objects_Id         *id
-);
-
-/*
- *  rtems_region_extend
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_region_extend directive.  The
- *  region will have the name name.  The memory area managed by
- *  the region will be attempted to be grown by length bytes using
- *  the memory starting at starting_address.
- */
-
-rtems_status_code rtems_region_extend(
-  Objects_Id          id,
-  void               *starting_address,
-  unsigned32          length
-);
-
-/*
- *  rtems_region_ident
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_region_ident directive.
- *  This directive returns the region ID associated with name.
- *  If more than one region is named name, then the region
- *  to which the ID belongs is arbitrary.
- */
-
-rtems_status_code rtems_region_ident(
-  rtems_name    name,
-  Objects_Id   *id
-);
-
-/*
- *  rtems_region_delete
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_region_delete directive.  The
- *  region indicated by ID is deleted.
- */
-
-rtems_status_code rtems_region_delete(
-  Objects_Id id
-);
-
-/*
- *  rtems_region_get_segment
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_region_get_segment directive.  It
- *  attempts to allocate a segment from the region associated with ID.
- *  If a segment of the requested size can be allocated, its address
- *  is returned in segment.  If no segment is available, then the task
- *  may return immediately or block waiting for a segment with an optional
- *  timeout of timeout clock ticks.  Whether the task blocks or returns
- *  immediately is based on the no_wait option in the option_set.
- */
-
-rtems_status_code rtems_region_get_segment(
-  Objects_Id         id,
-  unsigned32         size,
-  rtems_option       option_set,
-  rtems_interval     timeout,
-  void              **segment
-);
-
-/*
- *  rtems_region_get_segment_size
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_region_get_segment_size directive.  It
- *  returns the size in bytes of the specified user memory area.
- */
-
-rtems_status_code rtems_region_get_segment_size(
-  Objects_Id         id,
-  void              *segment,
-  unsigned32        *size
-);
-
-/*
- *  rtems_region_return_segment
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_region_return_segment directive.  It
- *  frees the segment to the region associated with ID.  The segment must
- *  have been previously allocated from the same region.  If freeing the
- *  segment results in enough memory being available to satisfy the
- *  rtems_region_get_segment of the first blocked task, then that task and as
- *  many subsequent tasks as possible will be unblocked with their requests
- *  satisfied.
- */
-
-rtems_status_code rtems_region_return_segment(
-  Objects_Id  id,
-  void       *segment
-);
-
-#ifndef __RTEMS_APPLICATION__
-#include <rtems/rtems/region.inl>
-#endif
-#include <rtems/rtems/regionmp.h>
-
-/*
- *  _Region_Debug_Walk
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked to verify the integrity of a heap associated
- *  with the_region.
- */
-
-#ifdef RTEMS_DEBUG
-
-#define _Region_Debug_Walk( _the_region, _source ) \
-  do { \
-    if ( _Debug_Is_enabled( RTEMS_DEBUG_REGION ) ) \
-      _Heap_Walk( &(_the_region)->Memory, _source, FALSE ); \
-  } while ( 0 )
-
-#else
-
-#define _Region_Debug_Walk( _the_region, _source )
-
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/cpukit/rtems/include/rtems/rtems/regionmp.h b/cpukit/rtems/include/rtems/rtems/regionmp.h
deleted file mode 100644
index fcdfa03178..0000000000
--- a/cpukit/rtems/include/rtems/rtems/regionmp.h
+++ /dev/null
@@ -1,166 +0,0 @@
-/*  regionmp.h
- *
- *  This include file contains all the constants and structures associated
- *  with the Multiprocessing Support in the Region Manager.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_REGION_MP_h
-#define __RTEMS_REGION_MP_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/mppkt.h>
-#include <rtems/score/object.h>
-#include <rtems/score/thread.h>
-
-#include <rtems/rtems/options.h>
-#include <rtems/rtems/region.h>
-
-/*
- *  The following enumerated type defines the list of
- *  remote region operations.
- */
-
-typedef enum {
-  REGION_MP_ANNOUNCE_CREATE         =  0,
-  REGION_MP_ANNOUNCE_DELETE         =  1,
-  REGION_MP_EXTRACT_PROXY           =  2,
-  REGION_MP_GET_SEGMENT_REQUEST     =  3,
-  REGION_MP_GET_SEGMENT_RESPONSE    =  4,
-  REGION_MP_RETURN_SEGMENT_REQUEST  =  5,
-  REGION_MP_RETURN_SEGMENT_RESPONSE =  6
-}   Region_MP_Remote_operations;
-
-/*
- *  The following data structure defines the packet used to perform
- *  remote region operations.
- */
-
-typedef struct {
-  rtems_packet_prefix          Prefix;
-  Region_MP_Remote_operations  operation;
-  rtems_name                   name;
-  rtems_option                 option_set;
-  unsigned32                   size;
-  Objects_Id                   proxy_id;
-  void                        *segment;
-}   Region_MP_Packet;
-
-/*
- *  _Region_MP_Send_process_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs a remote procedure call so that a
- *  process operation can be performed on another node.
- */
-
-void _Region_MP_Send_process_packet (
-  Region_MP_Remote_operations operation,
-  Objects_Id                  region_id,
-  rtems_name                  name,
-  Objects_Id                  proxy_id
-);
-
-/*
- *  _Region_MP_Send_request_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs a remote procedure call so that a
- *  directive operation can be initiated on another node.
- */
-
-rtems_status_code _Region_MP_Send_request_packet (
-  Region_MP_Remote_operations  operation,
-  Objects_Id                   region_id,
-  void                        *segment,
-  unsigned32                   size,
-  rtems_option                 option_set,
-  rtems_interval               timeout
-);
-
-/*
- *  _Region_MP_Send_response_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs a remote procedure call so that a
- *  directive can be performed on another node.
- */
-
-void _Region_MP_Send_response_packet (
-  Region_MP_Remote_operations  operation,
-  Objects_Id                   region_id,
-  Thread_Control              *the_thread
-);
-
-/*
- *
- *  _Region_MP_Process_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs the actions specific to this package for
- *  the request from another node.
- */
-
-void _Region_MP_Process_packet (
-  rtems_packet_prefix *the_packet_prefix
-);
-
-/*
- *  _Region_MP_Send_object_was_deleted
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked indirectly by the thread queue
- *  when a proxy has been removed from the thread queue and
- *  the remote node must be informed of this.
- *
- *  This routine is not needed by the Region since a region
- *  cannot be deleted when segments are in use.
- */
-
-/*
- *  _Region_MP_Send_extract_proxy
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked when a task is deleted and it
- *  has a proxy which must be removed from a thread queue and
- *  the remote node must be informed of this.
- */
-
-void _Region_MP_Send_extract_proxy (
-  Thread_Control *the_thread
-);
-
-/*
- *  _Region_MP_Get_packet
- *
- *  DESCRIPTION:
- *
- *  This function is used to obtain a region mp packet.
- */
-
-Region_MP_Packet *_Region_MP_Get_packet ( void );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of file */
diff --git a/cpukit/rtems/include/rtems/rtems/rtemsapi.h b/cpukit/rtems/include/rtems/rtems/rtemsapi.h
deleted file mode 100644
index dcea660f43..0000000000
--- a/cpukit/rtems/include/rtems/rtems/rtemsapi.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- *  RTEMS API Support
- *
- *  NOTE:
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
- 
-#ifndef __RTEMS_API_h
-#define __RTEMS_API_h
- 
-#include <rtems/config.h>
-
-/*PAGE
- *
- *  _RTEMS_API_Initialize
- *
- *  XXX
- */
- 
-void _RTEMS_API_Initialize(
-  rtems_configuration_table *configuration_table
-);
-
-#endif
-/* end of include file */
diff --git a/cpukit/rtems/include/rtems/rtems/sem.h b/cpukit/rtems/include/rtems/rtems/sem.h
deleted file mode 100644
index 191e62b414..0000000000
--- a/cpukit/rtems/include/rtems/rtems/sem.h
+++ /dev/null
@@ -1,248 +0,0 @@
-/*  semaphore.h
- *
- *  This include file contains all the constants and structures associated
- *  with the Semaphore Manager.  This manager utilizes standard Dijkstra
- *  counting semaphores to provide synchronization and mutual exclusion
- *  capabilities.
- *
- *  Directives provided are:
- *
- *     + create a semaphore
- *     + get an ID of a semaphore
- *     + delete a semaphore
- *     + acquire a semaphore
- *     + release a semaphore
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_SEMAPHORE_h
-#define __RTEMS_SEMAPHORE_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/rtems/types.h>
-#include <rtems/rtems/support.h>
-#include <rtems/rtems/tasks.h>
-#include <rtems/rtems/attr.h>
-#include <rtems/score/coremutex.h>
-#include <rtems/score/object.h>
-#include <rtems/score/coresem.h>
-#include <rtems/score/threadq.h>
-
-/*
- *  The following defines the control block used to manage each semaphore.
- */
-
-typedef struct {
-  Objects_Control          Object;
-  rtems_attribute          attribute_set;
-  union {
-    CORE_mutex_Control     mutex;
-    CORE_semaphore_Control semaphore;
-  } Core_control;
-}   Semaphore_Control;
-
-/*
- *  The following defines the information control block used to manage
- *  this class of objects.
- */
-
-RTEMS_EXTERN Objects_Information  _Semaphore_Information;
-
-/*
- *  _Semaphore_Manager_initialization
- *
- *  DESCRIPTION:
- *
- *  This routine performs the initialization necessary for this manager.
- */
-
-void _Semaphore_Manager_initialization(
-  unsigned32 maximum_semaphores
-);
-
-/*
- *  rtems_semaphore_create
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_semaphore_create directive.  The
- *  semaphore will have the name name.  The starting count for
- *  the semaphore is count.  The attribute_set determines if
- *  the semaphore is global or local and the thread queue
- *  discipline.  It returns the id of the created semaphore in ID.
- */
-
-rtems_status_code rtems_semaphore_create(
-  rtems_name           name,
-  unsigned32           count,
-  rtems_attribute      attribute_set,
-  rtems_task_priority  priority_ceiling,
-  rtems_id            *id
-);
-
-/*
- *  rtems_semaphore_ident
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_semaphore_ident directive.
- *  This directive returns the semaphore ID associated with name.
- *  If more than one semaphore is named name, then the semaphore
- *  to which the ID belongs is arbitrary.  node indicates the
- *  extent of the search for the ID of the semaphore named name.
- *  The search can be limited to a particular node or allowed to
- *  encompass all nodes.
- */
-
-rtems_status_code rtems_semaphore_ident(
-  rtems_name    name,
-  unsigned32    node,
-  rtems_id     *id
-);
-
-/*
- *  rtems_semaphore_delete
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_semaphore_delete directive.  The
- *  semaphore indicated by ID is deleted.
- */
-
-rtems_status_code rtems_semaphore_delete(
-  rtems_id   id
-);
-
-/*
- *  rtems_semaphore_obtain
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_semaphore_obtain directive.  It
- *  attempts to obtain a unit from the semaphore associated with ID.
- *  If a unit can be allocated, the calling task will return immediately.
- *  If no unit is available, then the task may return immediately or
- *  block waiting for a unit with an optional timeout of timeout
- *  clock ticks.  Whether the task blocks or returns immediately
- *  is based on the RTEMS_NO_WAIT option in the option_set.
- */
-
-rtems_status_code rtems_semaphore_obtain(
-  rtems_id       id,
-  unsigned32     option_set,
-  rtems_interval timeout
-);
-
-/*
- *  rtems_semaphore_release
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_semaphore_release directive.  It
- *  frees a unit to the semaphore associated with ID.  If a task was
- *  blocked waiting for a unit from this semaphore, then that task will
- *  be readied and the unit given to that task.  Otherwise, the unit
- *  will be returned to the semaphore.
- */
-
-rtems_status_code rtems_semaphore_release(
-  rtems_id   id
-);
-
-/*
- *  _Semaphore_Seize
- *
- *  DESCRIPTION:
- *
- *  This routine attempts to receive a unit from the_semaphore.
- *  If a unit is available or if the RTEMS_NO_WAIT option is enabled in
- *  option_set, then the routine returns.  Otherwise, the calling task
- *  is blocked until a unit becomes available.
- */
-
-boolean _Semaphore_Seize(
-  Semaphore_Control *the_semaphore,
-  unsigned32         option_set
-);
-
-/*
- *  _Semaphore_Translate_core_mutex_return_code
- *
- *  DESCRIPTION:
- *
- *  This function returns a RTEMS status code based on the mutex
- *  status code specified.
- */
- 
-rtems_status_code _Semaphore_Translate_core_mutex_return_code (
-  unsigned32 the_mutex_status
-);
-
-/*
- *  _Semaphore_Translate_core_semaphore_return_code
- *
- *  DESCRIPTION:
- *
- *  This function returns a RTEMS status code based on the semaphore
- *  status code specified.
- */
- 
-rtems_status_code _Semaphore_Translate_core_semaphore_return_code (
-  unsigned32 the_mutex_status
-);
- 
-/*PAGE
- *
- *  _Semaphore_Core_mutex_mp_support
- *
- *  DESCRIPTION:
- *
- *  This function processes the global actions necessary for remote
- *  accesses to a global semaphore based on a core mutex.  This function
- *  is called by the core.
- */
-
-void  _Semaphore_Core_mutex_mp_support (
-  Thread_Control *the_thread,
-  rtems_id        id
-);
-
-/*PAGE
- *
- *  _Semaphore_Core_mp_support
- *
- *  DESCRIPTION:
- *
- *  This function processes the global actions necessary for remote 
- *  accesses to a global semaphore based on a core semaphore.  This function
- *  is called by the core.
- */
- 
-void  _Semaphore_Core_semaphore_mp_support (
-  Thread_Control *the_thread,
-  rtems_id        id
-);
-
-#ifndef __RTEMS_APPLICATION__
-#include <rtems/rtems/sem.inl>
-#endif
-#include <rtems/rtems/semmp.h>
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/*  end of include file */
diff --git a/cpukit/rtems/include/rtems/rtems/semmp.h b/cpukit/rtems/include/rtems/rtems/semmp.h
deleted file mode 100644
index fdea66f6a4..0000000000
--- a/cpukit/rtems/include/rtems/rtems/semmp.h
+++ /dev/null
@@ -1,163 +0,0 @@
-/*  semmp.h
- *
- *  This include file contains all the constants and structures associated
- *  with the Multiprocessing Support in the Semaphore Manager.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_SEMAPHORE_MP_h
-#define __RTEMS_SEMAPHORE_MP_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/mppkt.h>
-#include <rtems/score/object.h>
-#include <rtems/rtems/options.h>
-#include <rtems/rtems/sem.h>
-#include <rtems/score/thread.h>
-#include <rtems/score/watchdog.h>
-
-/*
- *  The following enumerated type defines the list of
- *  remote semaphore operations.
- */
-
-typedef enum {
-  SEMAPHORE_MP_ANNOUNCE_CREATE  =  0,
-  SEMAPHORE_MP_ANNOUNCE_DELETE  =  1,
-  SEMAPHORE_MP_EXTRACT_PROXY    =  2,
-  SEMAPHORE_MP_OBTAIN_REQUEST   =  3,
-  SEMAPHORE_MP_OBTAIN_RESPONSE  =  4,
-  SEMAPHORE_MP_RELEASE_REQUEST  =  5,
-  SEMAPHORE_MP_RELEASE_RESPONSE =  6
-}   Semaphore_MP_Remote_operations;
-
-/*
- *  The following data structure defines the packet used to perform
- *  remote semaphore operations.
- */
-
-typedef struct {
-  rtems_packet_prefix             Prefix;
-  Semaphore_MP_Remote_operations  operation;
-  rtems_name                      name;
-  rtems_option                    option_set;
-  Objects_Id                      proxy_id;
-}   Semaphore_MP_Packet;
-
-/*
- *  _Semaphore_MP_Send_process_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs a remote procedure call so that a
- *  process operation can be performed on another node.
- */
-
-void _Semaphore_MP_Send_process_packet (
-  Semaphore_MP_Remote_operations operation,
-  Objects_Id                     semaphore_id,
-  rtems_name                     name,
-  Objects_Id                     proxy_id
-);
-
-/*
- *  _Semaphore_MP_Send_request_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs a remote procedure call so that a
- *  directive operation can be initiated on another node.
- */
-
-rtems_status_code _Semaphore_MP_Send_request_packet (
-  Semaphore_MP_Remote_operations operation,
-  Objects_Id                     semaphore_id,
-  rtems_option                   option_set,
-  rtems_interval                 timeout
-);
-
-/*
- *  _Semaphore_MP_Send_response_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs a remote procedure call so that a
- *  directive can be performed on another node.
- */
-
-void _Semaphore_MP_Send_response_packet (
-  Semaphore_MP_Remote_operations  operation,
-  Objects_Id                      semaphore_id,
-  Thread_Control                 *the_thread
-);
-
-/*
- *
- *  _Semaphore_MP_Process_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs the actions specific to this package for
- *  the request from another node.
- */
-
-void _Semaphore_MP_Process_packet (
-  rtems_packet_prefix *the_packet_prefix
-);
-
-/*
- *  _Semaphore_MP_Send_object_was_deleted
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked indirectly by the thread queue
- *  when a proxy has been removed from the thread queue and
- *  the remote node must be informed of this.
- */
-
-void _Semaphore_MP_Send_object_was_deleted (
-  Thread_Control *the_proxy
-);
-
-/*
- *  _Semaphore_MP_Send_extract_proxy
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked when a task is deleted and it
- *  has a proxy which must be removed from a thread queue and
- *  the remote node must be informed of this.
- */
-
-void _Semaphore_MP_Send_extract_proxy (
-  Thread_Control *the_thread
-);
-
-/*
- *  _Semaphore_MP_Get_packet
- *
- *  DESCRIPTION:
- *
- *  This function is used to obtain a semaphore mp packet.
- */
-
-Semaphore_MP_Packet *_Semaphore_MP_Get_packet ( void );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of file */
diff --git a/cpukit/rtems/include/rtems/rtems/signal.h b/cpukit/rtems/include/rtems/rtems/signal.h
deleted file mode 100644
index 2b247762e9..0000000000
--- a/cpukit/rtems/include/rtems/rtems/signal.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*  signal.h
- *
- *  This include file contains all the constants and structures associated
- *  with the Signal Manager.   This manager provides capabilities required
- *  for asynchronous communication between tasks via signal sets.
- *
- *  Directives provided are:
- *
- *     + establish an asynchronous signal routine
- *     + send a signal set to a task
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_SIGNAL_h
-#define __RTEMS_SIGNAL_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/rtems/asr.h>
-#include <rtems/rtems/modes.h>
-#include <rtems/score/object.h>
-#include <rtems/rtems/status.h>
-#include <rtems/rtems/types.h>
-
-/*
- *  _Signal_Manager_initialization
- *
- *  DESCRIPTION:
- *
- *  This routine performs the initialization necessary for this manager.
- */
- 
-void _Signal_Manager_initialization( void );
-
-/*
- *  rtems_signal_catch
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_signal_catch directive.  This directive
- *  is used to establish asr_handler as the Asynchronous Signal Routine
- *  (RTEMS_ASR) for the calling task.  The asr_handler will execute with a
- *  mode of mode_set.
- */
-
-rtems_status_code rtems_signal_catch(
-  rtems_asr_entry   asr_handler,
-  rtems_mode        mode_set
-);
-
-/*
- *  rtems_signal_send
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_signal_send directive.  This directive
- *  sends the signal_set to the task specified by ID.
- */
-
-rtems_status_code rtems_signal_send(
-  Objects_Id             id,
-  rtems_signal_set signal_set
-);
-
-#include <rtems/rtems/signalmp.h>
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/cpukit/rtems/include/rtems/rtems/signalmp.h b/cpukit/rtems/include/rtems/rtems/signalmp.h
deleted file mode 100644
index 2b13a0707e..0000000000
--- a/cpukit/rtems/include/rtems/rtems/signalmp.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/*  signalmp.h
- *
- *  This include file contains all the constants and structures associated
- *  with the Multiprocessing Support in the Signal Manager.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_SIGNAL_MP_h
-#define __RTEMS_SIGNAL_MP_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/rtems/asr.h>
-#include <rtems/score/mppkt.h>
-#include <rtems/score/object.h>
-#include <rtems/score/thread.h>
-#include <rtems/score/watchdog.h>
-
-/*
- *  The following enumerated type defines the list of
- *  remote signal operations.
- */
-
-typedef enum {
-  SIGNAL_MP_SEND_REQUEST  = 0,
-  SIGNAL_MP_SEND_RESPONSE = 1
-}   Signal_MP_Remote_operations;
-
-/*
- *  The following data structure defines the packet used to perform
- *  remote signal operations.
- */
-
-typedef struct {
-  rtems_packet_prefix          Prefix;
-  Signal_MP_Remote_operations  operation;
-  rtems_signal_set             signal_in;
-}   Signal_MP_Packet;
-
-/*
- *  _Signal_MP_Send_process_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs a remote procedure call so that a
- *  process operation can be performed on another node.
- *
- *  This routine is not needed since there are no process
- *  packets to be sent by this manager.
- */
-
-/*
- *  _Signal_MP_Send_request_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs a remote procedure call so that a
- *  directive operation can be initiated on another node.
- */
-
-rtems_status_code _Signal_MP_Send_request_packet (
-  Signal_MP_Remote_operations operation,
-  Objects_Id                  task_id,
-  rtems_signal_set      signal_in
-);
-
-/*
- *  _Signal_MP_Send_response_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs a remote procedure call so that a
- *  directive can be performed on another node.
- */
-
-void _Signal_MP_Send_response_packet (
-  Signal_MP_Remote_operations  operation,
-  Thread_Control              *the_thread
-);
-
-/*
- *
- *  _Signal_MP_Process_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs the actions specific to this package for
- *  the request from another node.
- */
-
-void _Signal_MP_Process_packet (
-  rtems_packet_prefix *the_packet_prefix
-);
-
-/*
- *  _Signal_MP_Send_object_was_deleted
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked indirectly by the thread queue
- *  when a proxy has been removed from the thread queue and
- *  the remote node must be informed of this.
- *
- *  This routine is not needed since there are no objects
- *  deleted by this manager.
- */
-
-/*
- *  _Signal_MP_Send_extract_proxy
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked when a task is deleted and it
- *  has a proxy which must be removed from a thread queue and
- *  the remote node must be informed of this.
- *
- *  This routine is not needed since there are no objects
- *  deleted by this manager.
- */
-
-/*
- *  _Signal_MP_Get_packet
- *
- *  DESCRIPTION:
- *
- *  This function is used to obtain a signal mp packet.
- */
-
-Signal_MP_Packet *_Signal_MP_Get_packet ( void );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of file */
diff --git a/cpukit/rtems/include/rtems/rtems/status.h b/cpukit/rtems/include/rtems/rtems/status.h
deleted file mode 100644
index db1cf2049c..0000000000
--- a/cpukit/rtems/include/rtems/rtems/status.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*  status.h
- *
- *  This include file contains the status codes returned from the
- *  executive directives.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_STATUS_h
-#define __RTEMS_STATUS_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* types */
-
-/* enumerated constants */
-
-typedef enum {
-  RTEMS_SUCCESSFUL               =  0, /* successful completion */
-  RTEMS_TASK_EXITTED             =  1, /* returned from a thread */
-  RTEMS_MP_NOT_CONFIGURED        =  2, /* multiprocessing not configured */
-  RTEMS_INVALID_NAME             =  3, /* invalid object name */
-  RTEMS_INVALID_ID               =  4, /* invalid object id */
-  RTEMS_TOO_MANY                 =  5, /* too many */
-  RTEMS_TIMEOUT                  =  6, /* timed out waiting */
-  RTEMS_OBJECT_WAS_DELETED       =  7, /* object deleted while waiting */
-  RTEMS_INVALID_SIZE             =  8, /* specified size was invalid */
-  RTEMS_INVALID_ADDRESS          =  9, /* address specified is invalid */
-  RTEMS_INVALID_NUMBER           = 10, /* number was invalid */
-  RTEMS_NOT_DEFINED              = 11, /* item has not been initialized */
-  RTEMS_RESOURCE_IN_USE          = 12, /* resources still outstanding */
-  RTEMS_UNSATISFIED              = 13, /* request not satisfied */
-  RTEMS_INCORRECT_STATE          = 14, /* thread is in wrong state */
-  RTEMS_ALREADY_SUSPENDED        = 15, /* thread already in state */
-  RTEMS_ILLEGAL_ON_SELF          = 16, /* illegal on calling thread */
-  RTEMS_ILLEGAL_ON_REMOTE_OBJECT = 17, /* illegal for remote object */
-  RTEMS_CALLED_FROM_ISR          = 18, /* called from wrong environment */
-  RTEMS_INVALID_PRIORITY         = 19, /* invalid thread priority */
-  RTEMS_INVALID_CLOCK            = 20, /* invalid date/time */
-  RTEMS_INVALID_NODE             = 21, /* invalid node id */
-  RTEMS_NOT_CONFIGURED           = 22, /* directive not configured */
-  RTEMS_NOT_OWNER_OF_RESOURCE    = 23, /* not owner of resource */
-  RTEMS_NOT_IMPLEMENTED          = 24, /* directive not implemented */
-  RTEMS_INTERNAL_ERROR           = 25, /* RTEMS inconsistency detected */
-  RTEMS_NO_MEMORY                = 26, /* could not get enough memory */
-  RTEMS_IO_ERROR                 = 27, /* driver IO error */
-  RTEMS_PROXY_BLOCKING           = 28  /* internal error only */
-} rtems_status_code;
-
-#define RTEMS_STATUS_CODES_FIRST RTEMS_SUCCESSFUL
-#define RTEMS_STATUS_CODES_LAST  RTEMS_PROXY_BLOCKING
-
-extern rtems_status_code _Status_Object_name_errors_to_status[];
-
-#ifdef RTEMS_API_INIT
-rtems_status_code _Status_Object_name_errors_to_status[] = {
-  RTEMS_SUCCESSFUL,      /* OBJECTS_SUCCESSFUL */
-  RTEMS_INVALID_NAME,    /* OBJECTS_INVALID_NAME */
-  RTEMS_INVALID_NODE     /* OBJECTS_INVALID_NODE */
-};
-#endif
-
-/*
- *  Applications are allowed to use the macros to compare status codes.
- */
-
-#include <rtems/rtems/status.inl>
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/cpukit/rtems/include/rtems/rtems/support.h b/cpukit/rtems/include/rtems/rtems/support.h
deleted file mode 100644
index 643b4295bd..0000000000
--- a/cpukit/rtems/include/rtems/rtems/support.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/*  support.h
- *
- *  This include file contains information about support functions for
- *  the RTEMS API.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_RTEMS_SUPPORT_h
-#define __RTEMS_RTEMS_SUPPORT_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/rtems/types.h>
-
-/*
- *  rtems_build_name
- *
- *  DESCRIPTION:
- *
- *  This function returns an object name composed of the four characters
- *  C1, C2, C3, and C4.
- *
- *  NOTE:
- *
- *  This must be implemented as a macro for use in Configuration Tables.
- *
- */
- 
-#define rtems_build_name( _C1, _C2, _C3, _C4 ) \
-  ( (_C1) << 24 | (_C2) << 16 | (_C3) << 8 | (_C4) )
- 
-/*
- *  rtems_get_class
- *
- *  DESCRIPTION:
- *
- *  This function returns the class portion of the ID.
- *
- */
- 
-#define rtems_get_class( _id ) \
-  _Objects_Get_class( _id )
- 
-/*
- *  rtems_get_node
- *
- *  DESCRIPTION:
- *
- *  This function returns the node portion of the ID.
- *
- */
- 
-#define rtems_get_node( _id ) \
-  _Objects_Get_node( _id )
- 
-/*
- *  rtems_get_index
- *
- *  DESCRIPTION:
- *
- *  This function returns the index portion of the ID.
- *
- */
- 
-#define rtems_get_index( _id ) \
-  _Objects_Get_index( _id )
-
-/*
- *  Time related
- */
-
-#define RTEMS_MILLISECONDS_TO_MICROSECONDS(_ms) \
-        TOD_MILLISECONDS_TO_MICROSECONDS(_ms)
-#define RTEMS_MILLISECONDS_TO_TICKS(_ms) \
-        TOD_MILLISECONDS_TO_TICKS(_ms)
-#define RTEMS_MICROSECONDS_TO_TICKS(_ms) \
-        TOD_MICROSECONDS_TO_TICKS(_ms)
-
-#ifndef __RTEMS_APPLICATION__
-#include <rtems/rtems/support.inl>
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/cpukit/rtems/include/rtems/rtems/taskmp.h b/cpukit/rtems/include/rtems/rtems/taskmp.h
deleted file mode 100644
index a1ff0a3715..0000000000
--- a/cpukit/rtems/include/rtems/rtems/taskmp.h
+++ /dev/null
@@ -1,167 +0,0 @@
-/*  taskmp.h
- *
- *  This include file contains all the constants and structures associated
- *  with the multiprocessing support in the task manager.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_RTEMS_TASKS_MP_h
-#define __RTEMS_RTEMS_TASKS_MP_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/mppkt.h>
-#include <rtems/score/object.h>
-#include <rtems/rtems/options.h>
-#include <rtems/score/priority.h>
-#include <rtems/rtems/tasks.h>
-#include <rtems/score/thread.h>
-
-/*
- *  The following enumerated type defines the list of
- *  remote task operations.
- */
-
-typedef enum {
-  RTEMS_TASKS_MP_ANNOUNCE_CREATE       =  0,
-  RTEMS_TASKS_MP_ANNOUNCE_DELETE       =  1,
-  RTEMS_TASKS_MP_SUSPEND_REQUEST       =  2,
-  RTEMS_TASKS_MP_SUSPEND_RESPONSE      =  3,
-  RTEMS_TASKS_MP_RESUME_REQUEST        =  4,
-  RTEMS_TASKS_MP_RESUME_RESPONSE       =  5,
-  RTEMS_TASKS_MP_SET_PRIORITY_REQUEST  =  6,
-  RTEMS_TASKS_MP_SET_PRIORITY_RESPONSE =  7,
-  RTEMS_TASKS_MP_GET_NOTE_REQUEST      =  8,
-  RTEMS_TASKS_MP_GET_NOTE_RESPONSE     =  9,
-  RTEMS_TASKS_MP_SET_NOTE_REQUEST      = 10,
-  RTEMS_TASKS_MP_SET_NOTE_RESPONSE     = 11
-}   RTEMS_tasks_MP_Remote_operations;
-
-/*
- *  The following data structure defines the packet used to perform
- *  remote task operations.
- */
-
-typedef struct {
-  rtems_packet_prefix               Prefix;
-  RTEMS_tasks_MP_Remote_operations  operation;
-  rtems_name                        name;
-  rtems_task_priority               the_priority;
-  unsigned32                        notepad;
-  unsigned32                        note;
-}   RTEMS_tasks_MP_Packet;
-
-/*
- *  _RTEMS_tasks_MP_Send_process_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs a remote procedure call so that a
- *  process operation can be performed on another node.
- */
-
-void _RTEMS_tasks_MP_Send_process_packet (
-  RTEMS_tasks_MP_Remote_operations operation,
-  Objects_Id                       task_id,
-  rtems_name                       name
-);
-
-/*
- *  _RTEMS_tasks_MP_Send_request_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs a remote procedure call so that a
- *  directive operation can be initiated on another node.
- */
-
-rtems_status_code _RTEMS_tasks_MP_Send_request_packet (
-  RTEMS_tasks_MP_Remote_operations operation,
-  Objects_Id                       task_id,
-  rtems_task_priority                 the_priority,
-  unsigned32                       notepad,
-  unsigned32                       note
-);
-
-/*
- *  _RTEMS_tasks_MP_Send_response_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs a remote procedure call so that a
- *  directive can be performed on another node.
- */
-
-void _RTEMS_tasks_MP_Send_response_packet (
-  RTEMS_tasks_MP_Remote_operations  operation,
-  Thread_Control                   *the_thread
-);
-
-/*
- *
- *  _RTEMS_tasks_MP_Process_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs the actions specific to this package for
- *  the request from another node.
- */
-
-void _RTEMS_tasks_MP_Process_packet (
-  rtems_packet_prefix *the_packet_prefix
-);
-
-/*
- *  _RTEMS_tasks_MP_Send_object_was_deleted
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked indirectly by the thread queue
- *  when a proxy has been removed from the thread queue and
- *  the remote node must be informed of this.
- *
- *  This routine is not needed by RTEMS_tasks since a task
- *  cannot be deleted when segments are in use.
- */
-
-/*
- *  _RTEMS_tasks_MP_Send_extract_proxy
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked when a task is deleted and it
- *  has a proxy which must be removed from a thread queue and
- *  the remote node must be informed of this.
- *
- *  This routine is not needed since there are no objects
- *  deleted by this manager.
- *
- */
-
-/*
- *  _RTEMS_tasks_MP_Get_packet
- *
- *  DESCRIPTION:
- *
- *  This function is used to obtain a task mp packet.
- */
-
-RTEMS_tasks_MP_Packet *_RTEMS_tasks_MP_Get_packet ( void );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of file */
diff --git a/cpukit/rtems/include/rtems/rtems/tasks.h b/cpukit/rtems/include/rtems/rtems/tasks.h
deleted file mode 100644
index 17730cee7f..0000000000
--- a/cpukit/rtems/include/rtems/rtems/tasks.h
+++ /dev/null
@@ -1,421 +0,0 @@
-/*  tasks.h
- *
- *  This include file contains all constants and structures associated
- *  with RTEMS tasks.  This manager provides a comprehensive set of directives
- *  to create, delete, and administer tasks.
- *
- *  Directives provided are:
- *
- *     + create a task
- *     + get an ID of a task
- *     + start a task
- *     + restart a task
- *     + delete a task
- *     + suspend a task
- *     + resume a task
- *     + set a task's priority
- *     + change the current task's mode
- *     + get a task notepad entry
- *     + set a task notepad entry
- *     + wake up after interval
- *     + wake up when specified
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_RTEMS_TASKS_h
-#define __RTEMS_RTEMS_TASKS_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/object.h>
-#include <rtems/score/states.h>
-#include <rtems/score/thread.h>
-#include <rtems/rtems/types.h>
-#include <rtems/rtems/eventset.h>
-#include <rtems/rtems/asr.h>
-#include <rtems/rtems/attr.h>
-#include <rtems/rtems/status.h>
-
-/*
- *  Constant to be used as the ID of current task
- */
-
-#define RTEMS_SELF                OBJECTS_ID_OF_SELF
-
-/*
- *  This constant is passed to the rtems_task_wake_after directive as the
- *  interval when a task wishes to yield the CPU.
- */
-
-#define RTEMS_YIELD_PROCESSOR WATCHDOG_NO_TIMEOUT
-
-/*
- *  Define the type for an RTEMS API task priority.
- */
-
-typedef Priority_Control rtems_task_priority;
-
-#define RTEMS_NO_PRIORITY           RTEMS_CURRENT_PRIORITY
-
-#define RTEMS_MINIMUM_PRIORITY      (PRIORITY_MINIMUM + 1)
-#define RTEMS_MAXIMUM_PRIORITY      PRIORITY_MAXIMUM
-
-/*
- *  The following constant is passed to rtems_task_set_priority when the
- *  caller wants to obtain the current priority.
- */
-
-#define RTEMS_CURRENT_PRIORITY      PRIORITY_MINIMUM   
-
-/*
- *  Notepads constants (indices into notepad array)
- */
- 
-#define RTEMS_NOTEPAD_FIRST 0             /* lowest numbered notepad */
-#define RTEMS_NOTEPAD_0    0              /* notepad location 0  */
-#define RTEMS_NOTEPAD_1    1              /* notepad location 1  */
-#define RTEMS_NOTEPAD_2    2              /* notepad location 2  */
-#define RTEMS_NOTEPAD_3    3              /* notepad location 3  */
-#define RTEMS_NOTEPAD_4    4              /* notepad location 4  */
-#define RTEMS_NOTEPAD_5    5              /* notepad location 5  */
-#define RTEMS_NOTEPAD_6    6              /* notepad location 6  */
-#define RTEMS_NOTEPAD_7    7              /* notepad location 7  */
-#define RTEMS_NOTEPAD_8    8              /* notepad location 8  */
-#define RTEMS_NOTEPAD_9    9              /* notepad location 9  */
-#define RTEMS_NOTEPAD_10   10             /* notepad location 10 */
-#define RTEMS_NOTEPAD_11   11             /* notepad location 11 */
-#define RTEMS_NOTEPAD_12   12             /* notepad location 12 */
-#define RTEMS_NOTEPAD_13   13             /* notepad location 13 */
-#define RTEMS_NOTEPAD_14   14             /* notepad location 14 */
-#define RTEMS_NOTEPAD_15   15             /* notepad location 15 */
-#define RTEMS_NOTEPAD_LAST RTEMS_NOTEPAD_15     /* highest numbered notepad */
- 
-#define RTEMS_NUMBER_NOTEPADS  (RTEMS_NOTEPAD_LAST+1)
-
-/*
- *  External API name for Thread_Control
- */
-
-typedef Thread_Control rtems_tcb;
-
-/*
- *  The following defines the "return type" of an RTEMS task.
- */
- 
-typedef void rtems_task;
-
-/*
- *  The following defines the argument to an RTEMS task.
- */
- 
-typedef unsigned32 rtems_task_argument;
-
-/*
- *  The following defines the type for the entry point of an RTEMS task.
- */
- 
-typedef rtems_task ( *rtems_task_entry )(
-                      rtems_task_argument
-                   );
- 
-/*
- *  The following records define the Initialization Tasks Table.
- *  Each entry contains the information required by RTEMS to
- *  create and start a user task automatically at executive
- *  initialization time.
- */
- 
-typedef struct {
-  rtems_name            name;              /* task name */
-  unsigned32            stack_size;        /* task stack size */
-  rtems_task_priority   initial_priority;  /* task priority */
-  rtems_attribute       attribute_set;     /* task attributes */
-  rtems_task_entry      entry_point;       /* task entry point */
-  rtems_mode            mode_set;          /* task initial mode */
-  unsigned32            argument;          /* task argument */
-} rtems_initialization_tasks_table;
-
-/*
- *  This is the API specific information required by each thread for
- *  the RTEMS API to function correctly.
- */
-
- 
-typedef struct {
-  unsigned32                Notepads[ RTEMS_NUMBER_NOTEPADS ];
-  rtems_event_set           pending_events;
-  rtems_event_set           event_condition;
-  ASR_Information           Signal;
-}  RTEMS_API_Control;
-
-/*
- *  The following defines the information control block used to
- *  manage this class of objects.
- */
-
-RTEMS_EXTERN Objects_Information _RTEMS_tasks_Information;
-
-/*
- *  These are used to manage the user initialization tasks.
- */
-
-RTEMS_EXTERN rtems_initialization_tasks_table 
-               *_RTEMS_tasks_User_initialization_tasks;
-RTEMS_EXTERN unsigned32   _RTEMS_tasks_Number_of_initialization_tasks;
-
-/*
- *  _RTEMS_tasks_Manager_initialization
- *
- *  DESCRIPTION:
- *
- *  This routine initializes all Task Manager related data structures.
- */
- 
-void _RTEMS_tasks_Manager_initialization(
-  unsigned32                        maximum_tasks,
-  unsigned32                        number_of_initialization_tasks,
-  rtems_initialization_tasks_table *user_tasks
-);
-
-/*
- *  rtems_task_create
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_task_create directive.  The task
- *  will have the name name.  The attribute_set can be used to indicate
- *  that the task will be globally accessible or utilize floating point.
- *  The task's stack will be stack_size bytes.   The task will begin
- *  execution with initial_priority and initial_modes.  It returns the
- *  id of the created task in ID.
- */
-
-rtems_status_code rtems_task_create(
-  rtems_name           name,
-  rtems_task_priority  initial_priority,
-  unsigned32           stack_size,
-  rtems_mode           initial_modes,
-  rtems_attribute      attribute_set,
-  Objects_Id          *id
-);
-
-/*
- *  rtems_task_ident
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_task_ident directive.
- *  This directive returns the task ID associated with name.
- *  If more than one task is named name, then the task to
- *  which the ID belongs is arbitrary.  node indicates the
- *  extent of the search for the ID of the task named name.
- *  The search can be limited to a particular node or allowed to
- *  encompass all nodes.
- */
-
-rtems_status_code rtems_task_ident(
-  rtems_name    name,
-  unsigned32    node,
-  Objects_Id   *id
-);
-
-/*
- *  rtems_task_delete
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_task_delete directive.  The
- *  task indicated by ID is deleted.
- */
-
-rtems_status_code rtems_task_delete(
-  Objects_Id id
-);
-
-/*
- *  rtems_task_get_note
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_task_get_note directive.  The
- *  value of the indicated notepad for the task associated with ID
- *  is returned in note.
- */
-
-rtems_status_code rtems_task_get_note(
-  Objects_Id  id,
-  unsigned32  notepad,
-  unsigned32 *note
-);
-
-/*
- *  rtems_task_set_note
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_task_set_note directive.  The
- *  value of the indicated notepad for the task associated with ID
- *  is returned in note.
- */
-
-rtems_status_code rtems_task_set_note(
-  Objects_Id id,
-  unsigned32 notepad,
-  unsigned32 note
-);
-
-/*
- *  rtems_task_mode
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_task_mode directive.  The current
- *  values of the modes indicated by mask of the calling task are changed
- *  to that indicated in mode_set.  The former mode of the task is
- *  returned in mode_set.
- */
-
-rtems_status_code rtems_task_mode(
-  rtems_mode  mode_set,
-  rtems_mode  mask,
-  rtems_mode *previous_mode_set
-);
-
-/*
- *  rtems_task_restart
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_task_restart directive.  The
- *  task associated with ID is restarted at its initial entry
- *  point with the new argument.
- */
-
-rtems_status_code rtems_task_restart(
-  Objects_Id id,
-  unsigned32 arg
-);
-
-/*
- *  rtems_task_suspend
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_task_suspend directive.  The
- *  SUSPENDED state is set for task associated with ID.
- */
-
-rtems_status_code rtems_task_suspend(
-  Objects_Id id
-);
-
-/*
- *  rtems_task_resume
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_task_resume Directive.  The
- *  SUSPENDED state is cleared for task associated with ID.
- */
-
-rtems_status_code rtems_task_resume(
-  Objects_Id id
-);
-
-/*
- *  rtems_task_set_priority
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_task_set_priority directive.  The
- *  current priority of the task associated with ID is set to
- *  new_priority.  The former priority of that task is returned
- *  in old_priority.
- */
-
-rtems_status_code rtems_task_set_priority(
-  Objects_Id           id,
-  rtems_task_priority  new_priority,
-  rtems_task_priority *old_priority
-);
-
-/*
- *  rtems_task_start
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_task_start directive.  The
- *  starting execution point of the task associated with ID is
- *  set to entry_point with the initial argument.
- */
-
-rtems_status_code rtems_task_start(
-  Objects_Id   id,
-  rtems_task_entry entry_point,
-  unsigned32   argument
-);
-
-/*
- *  rtems_task_wake_when
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_task_wake_when directive.  The
- *  calling task is blocked until the current time of day is
- *  equal to that indicated by time_buffer.
- */
-
-rtems_status_code rtems_task_wake_when(
-  rtems_time_of_day *time_buffer
-);
-
-/*
- *  rtems_task_wake_after
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_task_wake_after directive.  The
- *  calling task is blocked until the indicated number of clock
- *  ticks have occurred.
- */
-
-rtems_status_code rtems_task_wake_after(
-  rtems_interval  ticks
-);
-
-/*PAGE
- *
- *  _RTEMS_tasks_Initialize_user_tasks
- *
- *  This routine creates and starts all configured user
- *  initialzation threads.
- *
- *  Input parameters: NONE
- *
- *  Output parameters:  NONE
- */
- 
-void _RTEMS_tasks_Initialize_user_tasks( void );
-
-#ifndef __RTEMS_APPLICATION__
-#include <rtems/rtems/tasks.inl>
-#endif
-#include <rtems/rtems/taskmp.h>
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/cpukit/rtems/include/rtems/rtems/timer.h b/cpukit/rtems/include/rtems/rtems/timer.h
deleted file mode 100644
index 4ef567c9bc..0000000000
--- a/cpukit/rtems/include/rtems/rtems/timer.h
+++ /dev/null
@@ -1,207 +0,0 @@
-/*  timer.h
- *
- *  This include file contains all the constants, structures, and
- *  prototypes associated with the Timer Manager.  This manager provides
- *  facilities to configure, initiate, cancel, and delete timers which will
- *  fire at specified intervals of time.
- *
- *  Directives provided are:
- *
- *     + create a timer
- *     + get an ID of a timer
- *     + delete a timer
- *     + set a timer to fire after a number of ticks have passed
- *     + set a timer to fire when a specified date and time has been reached
- *     + reset a timer
- *     + cancel a time
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_TIMER_h
-#define __RTEMS_TIMER_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/object.h>
-#include <rtems/score/tod.h>
-#include <rtems/score/watchdog.h>
-
-/*
- *  The following enumerated type details the classes to which a timer
- *  may belong.
- */
-
-typedef enum {
-  TIMER_INTERVAL,
-  TIMER_TIME_OF_DAY,
-  TIMER_DORMANT
-} Timer_Classes;
-
-/*
- *  The following types define a pointer to a timer service routine.
- */
- 
-typedef void rtems_timer_service_routine;
- 
-typedef rtems_timer_service_routine ( *rtems_timer_service_routine_entry )(
-                 rtems_id,
-                 void *
-             );
-
-/*
- *  The following defines the information control block used to manage
- *  this class of objects.
- */
-
-RTEMS_EXTERN Objects_Information  _Timer_Information;
-
-/*
- *  The following records define the control block used to manage
- *  each timer.
- */
-
-typedef struct {
-  Objects_Control  Object;
-  Watchdog_Control Ticker;
-  Timer_Classes    the_class;
-}   Timer_Control;
-
-/*
- *  _Timer_Manager_initialization
- *
- *  DESCRIPTION:
- *
- *  This routine performs the initialization necessary for this manager.
- */
-
-void _Timer_Manager_initialization(
-  unsigned32 maximum_timers
-);
-
-/*
- *  rtems_timer_create
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_timer_create directive.  The
- *  timer will have the name name.  It returns the id of the
- *  created timer in ID.
- */
-
-rtems_status_code rtems_timer_create(
-  rtems_name    name,
-  Objects_Id   *id
-);
-
-/*
- *  rtems_timer_ident
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_timer_ident directive.
- *  This directive returns the timer ID associated with name.
- *  If more than one timer is named name, then the timer
- *  to which the ID belongs is arbitrary.
- */
-
-rtems_status_code rtems_timer_ident(
-  rtems_name    name,
-  Objects_Id   *id
-);
-
-/*
- *  rtems_timer_cancel
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_timer_cancel directive.  It is used
- *  to stop the timer associated with ID from firing.
- */
-
-rtems_status_code rtems_timer_cancel(
-  Objects_Id id
-);
-
-/*
- *  rtems_timer_delete
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_timer_delete directive.  The
- *  timer indicated by ID is deleted.
- */
-
-rtems_status_code rtems_timer_delete(
-  Objects_Id id
-);
-
-/*
- *  rtems_timer_fire_after
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_timer_fire_after directive.  It
- *  initiates the timer associated with ID to fire in ticks clock
- *  ticks.  When the timer fires, the routine will be invoked.
- */
-
-rtems_status_code rtems_timer_fire_after(
-  Objects_Id                         id,
-  rtems_interval                     ticks,
-  rtems_timer_service_routine_entry  routine,
-  void                              *user_data
-);
-
-/*
- *  rtems_timer_fire_when
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_timer_fire_when directive.  It
- *  initiates the timer associated with ID to fire at wall_time
- *  When the timer fires, the routine will be invoked.
- */
-
-rtems_status_code rtems_timer_fire_when(
-  Objects_Id                          id,
-  rtems_time_of_day                  *wall_time,
-  rtems_timer_service_routine_entry   routine,
-  void                               *user_data
-);
-
-/*
- *  rtems_timer_reset
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_timer_reset directive.  It is used
- *  to reinitialize the interval timer associated with ID just as if
- *  rtems_timer_fire_after were re-invoked with the same arguments that
- *  were used to initiate this timer.
- */
-
-rtems_status_code rtems_timer_reset(
-  Objects_Id id
-);
-
-#ifndef __RTEMS_APPLICATION__
-#include <rtems/rtems/timer.inl>
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/cpukit/rtems/include/rtems/rtems/types.h b/cpukit/rtems/include/rtems/rtems/types.h
deleted file mode 100644
index 4d2915bafa..0000000000
--- a/cpukit/rtems/include/rtems/rtems/types.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/*  types.h
- *
- *  This include file defines the types used by the RTEMS API.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_RTEMS_TYPES_h
-#define __RTEMS_RTEMS_TYPES_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/object.h>
-#include <rtems/score/priority.h>
-#include <rtems/rtems/modes.h>
-#include <rtems/score/mpci.h>
-#include <rtems/score/mppkt.h>
-
-/*
- *  RTEMS basic type definitions
- */
-
-typedef unsigned8       rtems_unsigned8;  /* unsigned 8-bit value  */
-typedef unsigned16      rtems_unsigned16; /* unsigned 16-bit value */
-typedef unsigned32      rtems_unsigned32; /* unsigned 32-bit value */
-
-typedef signed8         rtems_signed8;    /* signed 8-bit value  */
-typedef signed16        rtems_signed16;   /* signed 16-bit value */
-typedef signed32        rtems_signed32;   /* signed 32-bit value */
-
-/*
- * some C++ compilers (eg: HP's) don't do 'long long'
- */
-#if defined(__GNUC__)
-typedef unsigned64      rtems_unsigned64; /* unsigned 64-bit value */
-typedef signed64        rtems_signed64;   /* signed 64-bit value */
-#endif
-
-typedef single_precision rtems_single;    /* single precision float */
-typedef double_precision rtems_double;    /* double precision float */
-
-typedef boolean          rtems_boolean;
-
-typedef unsigned32       rtems_name;
-typedef Objects_Id       rtems_id;
-
-typedef Context_Control            rtems_context;
-typedef Context_Control_fp         rtems_context_fp;
-typedef CPU_Interrupt_frame        rtems_interrupt_frame;
-
-/*
- *  Time related 
- */
-
-typedef Watchdog_Interval rtems_interval;
-typedef TOD_Control       rtems_time_of_day;
-
-/*
- *  Define the type for an RTEMS API task mode.
- */
- 
-typedef Modes_Control rtems_mode;
-
-/*
- *  MPCI related entries
- */
-
-typedef MP_packet_Classes          rtems_mp_packet_classes;
-typedef MP_packet_Prefix           rtems_packet_prefix;
-
-typedef MPCI_initialization_entry  rtems_mpci_initialization_entry;
-typedef MPCI_get_packet_entry      rtems_mpci_get_packet_entry;
-typedef MPCI_return_packet_entry   rtems_mpci_return_packet_entry;
-typedef MPCI_send_entry            rtems_mpci_send_packet_entry;
-typedef MPCI_receive_entry         rtems_mpci_receive_packet_entry;
-
-typedef MPCI_Entry rtems_mpci_entry;
-
-typedef MPCI_Control rtems_mpci_table;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/cpukit/rtems/inline/rtems/rtems/asr.inl b/cpukit/rtems/inline/rtems/rtems/asr.inl
deleted file mode 100644
index fede9dea9b..0000000000
--- a/cpukit/rtems/inline/rtems/rtems/asr.inl
+++ /dev/null
@@ -1,128 +0,0 @@
-/*  inline/asr.inl
- *
- *  This include file contains the implemenation of all routines
- *  associated with the asynchronous signal handler which are inlined.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __INLINE_ASR_inl
-#define __INLINE_ASR_inl
-
-#include <rtems/score/isr.h>
-
-/*PAGE
- *
- *  _ASR_Initialize
- *
- *  DESCRIPTION:
- *
- *  This routine initializes the given RTEMS_ASR information record.
- */
-
-RTEMS_INLINE_ROUTINE void _ASR_Initialize (
-  ASR_Information *information
-)
-{
-  information->is_enabled      = TRUE;
-  information->handler         = NULL;
-  information->mode_set        = RTEMS_DEFAULT_MODES;
-  information->signals_posted  = 0;
-  information->signals_pending = 0;
-  information->nest_level      = 0;
-}
-
-/*PAGE
- *
- *  _ASR_Swap_signals
- *
- *  DESCRIPTION:
- *
- *  This routine atomically swaps the pending and posted signal
- *  sets.  This is done when the thread alters its mode in such a
- *  way that the RTEMS_ASR disable/enable flag changes.
- */
-
-RTEMS_INLINE_ROUTINE void _ASR_Swap_signals (
-  ASR_Information *information
-)
-{
-  rtems_signal_set _signals;
-  ISR_Level        _level;
-
-  _ISR_Disable( _level );
-    _signals                     = information->signals_pending;
-    information->signals_pending = information->signals_posted;
-    information->signals_posted  = _signals;
-  _ISR_Enable( _level );
-}
-
-/*PAGE
- *
- *  _ASR_Is_null_handler
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the given asr_handler is NULL and
- *  FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _ASR_Is_null_handler (
-  rtems_asr_entry asr_handler
-)
-{
-  return asr_handler == NULL;
-}
-
-/*PAGE
- *
- *  _ASR_Are_signals_pending
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if there are signals pending in the
- *  given RTEMS_ASR information record and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _ASR_Are_signals_pending (
-  ASR_Information *information
-)
-{
-  return information->signals_posted != 0;
-}
-
-/*PAGE
- *
- *  _ASR_Post_signals
- *
- *  DESCRIPTION:
- *
- *  This routine posts the given signals into the signal_set
- *  passed in.  The result is returned to the user in signal_set.
- *
- *  NOTE:  This must be implemented as a macro.
- */
-
-RTEMS_INLINE_ROUTINE void _ASR_Post_signals(
-  rtems_signal_set  signals,
-  rtems_signal_set *signal_set
-)
-{
-  ISR_Level              _level;
-
-  _ISR_Disable( _level );
-    *signal_set |= signals;
-  _ISR_Enable( _level );
-}
-
-
-#endif
-/* end of include file */
diff --git a/cpukit/rtems/inline/rtems/rtems/attr.inl b/cpukit/rtems/inline/rtems/rtems/attr.inl
deleted file mode 100644
index 3cec1edd3b..0000000000
--- a/cpukit/rtems/inline/rtems/rtems/attr.inl
+++ /dev/null
@@ -1,176 +0,0 @@
-/*  inline/attr.inl
- *
- *  This include file contains all of the inlined routines associated
- *  with attributes.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __INLINE_ATTRIBUTES_inl
-#define __INLINE_ATTRIBUTES_inl
-
-/*PAGE
- *
- *  _Attributes_Set
- *
- *  DESCRIPTION:
- *
- *  This function sets the requested new_attributes in the attribute_set
- *  passed in.  The result is returned to the user.
- */
-
-RTEMS_INLINE_ROUTINE rtems_attribute _Attributes_Set (
-   rtems_attribute new_attributes,
-   rtems_attribute attribute_set
-)
-{
-  return attribute_set | new_attributes;
-}
-
-/*PAGE
- *
- *  _Attributes_Clear
- *
- *  DESCRIPTION:
- *
- *  This function clears the requested new_attributes in the attribute_set
- *  passed in.  The result is returned to the user.
- */
-
-RTEMS_INLINE_ROUTINE rtems_attribute _Attributes_Clear (
-   rtems_attribute attribute_set,
-   rtems_attribute mask
-)
-{
-  return attribute_set & ~mask;
-}
-
-/*PAGE
- *
- *  _Attributes_Is_floating_point
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the floating point attribute is
- *  enabled in the attribute_set and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Attributes_Is_floating_point(
-  rtems_attribute attribute_set
-)
-{
-   return ( attribute_set & RTEMS_FLOATING_POINT );
-}
-
-/*PAGE
- *
- *  _Attributes_Is_global
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the global object attribute is
- *  enabled in the attribute_set and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Attributes_Is_global(
-  rtems_attribute attribute_set
-)
-{
-   return ( attribute_set & RTEMS_GLOBAL );
-}
-
-/*PAGE
- *
- *  _Attributes_Is_priority
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the priority attribute is
- *  enabled in the attribute_set and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Attributes_Is_priority(
-  rtems_attribute attribute_set
-)
-{
-   return ( attribute_set & RTEMS_PRIORITY );
-}
-
-/*PAGE
- *
- *  _Attributes_Is_binary_semaphore
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the binary semaphore attribute is
- *  enabled in the attribute_set and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Attributes_Is_binary_semaphore(
-  rtems_attribute attribute_set
-)
-{
-  return ( attribute_set & RTEMS_BINARY_SEMAPHORE );
-}
-
-/*PAGE
- *
- *  _Attributes_Is_inherit_priority
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the priority inheritance attribute
- *  is enabled in the attribute_set and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Attributes_Is_inherit_priority(
-  rtems_attribute attribute_set
-)
-{
-   return ( attribute_set & RTEMS_INHERIT_PRIORITY );
-}
-
-/*PAGE
- *
- *  _Attributes_Is_priority_ceiling
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the priority ceiling attribute
- *  is enabled in the attribute_set and FALSE otherwise.
- */
- 
-RTEMS_INLINE_ROUTINE boolean _Attributes_Is_priority_ceiling(
-  rtems_attribute attribute_set
-)
-{
-   return ( attribute_set & RTEMS_PRIORITY_CEILING );
-}
-
-/*PAGE
- *
- *  _Attributes_Is_system_task
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the system task attribute
- *  is enabled in the attribute_set and FALSE otherwise.
- */
- 
-RTEMS_INLINE_ROUTINE boolean _Attributes_Is_system_task(
-  rtems_attribute attribute_set
-)
-{
-   return ( attribute_set & RTEMS_PRIORITY_CEILING );
-}
-
-#endif
-/* end of include file */
diff --git a/cpukit/rtems/inline/rtems/rtems/dpmem.inl b/cpukit/rtems/inline/rtems/rtems/dpmem.inl
deleted file mode 100644
index 777a886452..0000000000
--- a/cpukit/rtems/inline/rtems/rtems/dpmem.inl
+++ /dev/null
@@ -1,95 +0,0 @@
-/*  inline/dpmem.inl
- *
- *  This include file contains the inline routine used in conjunction
- *  with the Dual Ported Memory Manager
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __INLINE_DPMEM_inl
-#define __INLINE_DPMEM_inl
-
-
-/*PAGE
- *
- *  _Dual_ported_memory_Allocate
- *
- *  DESCRIPTION:
- *
- *  This routine allocates a port control block from the inactive chain
- *  of free port control blocks.
- */
-
-RTEMS_INLINE_ROUTINE Dual_ported_memory_Control
-   *_Dual_ported_memory_Allocate ( void )
-{
-  return (Dual_ported_memory_Control *)
-     _Objects_Allocate( &_Dual_ported_memory_Information );
-}
-
-/*PAGE
- *
- *  _Dual_ported_memory_Free
- *
- *  DESCRIPTION:
- *
- *  This routine frees a port control block to the inactive chain
- *  of free port control blocks.
- */
-
-RTEMS_INLINE_ROUTINE void _Dual_ported_memory_Free (
-   Dual_ported_memory_Control *the_port
-)
-{
-  _Objects_Free( &_Dual_ported_memory_Information, &the_port->Object );
-}
-
-/*PAGE
- *
- *  _Dual_ported_memory_Get
- *
- *  DESCRIPTION:
- *
- *  This function maps port IDs to port control blocks.  If ID
- *  corresponds to a local port, then it returns the_port control
- *  pointer which maps to ID and location is set to OBJECTS_LOCAL.
- *  Global ports are not supported, thus if ID  does not map to a
- *  local port, location is set to OBJECTS_ERROR and the_port is
- *  undefined.
- */
-
-RTEMS_INLINE_ROUTINE Dual_ported_memory_Control *_Dual_ported_memory_Get (
-  Objects_Id         id,
-  Objects_Locations *location
-)
-{
-  return (Dual_ported_memory_Control *)
-     _Objects_Get( &_Dual_ported_memory_Information, id, location );
-}
-
-/*PAGE
- *
- *  _Dual_ported_memory_Is_null
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the_port is NULL and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Dual_ported_memory_Is_null(
-  Dual_ported_memory_Control *the_port
-)
-{
-  return ( the_port == NULL );
-}
-
-#endif
-/* end of include file */
diff --git a/cpukit/rtems/inline/rtems/rtems/event.inl b/cpukit/rtems/inline/rtems/rtems/event.inl
deleted file mode 100644
index a4c6ec7930..0000000000
--- a/cpukit/rtems/inline/rtems/rtems/event.inl
+++ /dev/null
@@ -1,21 +0,0 @@
-/*  inline/event.inl
- *
- *  This include file contains the static inline implementation of
- *  macros for the Event Manager.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __MACROS_EVENT_inl
-#define __MACROS_EVENT_inl
-
-#endif
-/* end of include file */
diff --git a/cpukit/rtems/inline/rtems/rtems/eventset.inl b/cpukit/rtems/inline/rtems/rtems/eventset.inl
deleted file mode 100644
index eed8c33751..0000000000
--- a/cpukit/rtems/inline/rtems/rtems/eventset.inl
+++ /dev/null
@@ -1,95 +0,0 @@
-/*  inline/eventset.inl
- *
- *  This include file contains the information pertaining to event sets.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __INLINE_EVENT_SET_inl
-#define __INLINE_EVENT_SET_inl
-
-/*PAGE
- *
- *  _Event_sets_Is_empty
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if on events are posted in the event_set,
- *  and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Event_sets_Is_empty(
-  rtems_event_set the_event_set
-)
-{
-  return ( the_event_set == 0 );
-}
-
-/*PAGE
- *
- *  _Event_sets_Post
- *
- *  DESCRIPTION:
- *
- *  This routine posts the given new_events into the event_set
- *  passed in.  The result is returned to the user in event_set.
- */
-
-RTEMS_INLINE_ROUTINE void _Event_sets_Post(
-  rtems_event_set  the_new_events,
-  rtems_event_set *the_event_set
-)
-{
-  ISR_Level level;
-
-  _ISR_Disable( level );
-    *the_event_set |= the_new_events;
-  _ISR_Enable( level );
-}
-
-/*PAGE
- *
- *  _Event_sets_Get
- *
- *  DESCRIPTION:
- *
- *  This function returns the events in event_condition which are
- *  set in event_set.
- */
-
-RTEMS_INLINE_ROUTINE rtems_event_set _Event_sets_Get(
-  rtems_event_set the_event_set,
-  rtems_event_set the_event_condition
-)
-{
-   return ( the_event_set & the_event_condition );
-}
-
-/*PAGE
- *
- *  _Event_sets_Clear
- *
- *  DESCRIPTION:
- *
- *  This function removes the events in mask from the event_set
- *  passed in.  The result is returned to the user in event_set.
- */
-
-RTEMS_INLINE_ROUTINE rtems_event_set _Event_sets_Clear(
- rtems_event_set the_event_set,
- rtems_event_set the_mask
-)
-{
-   return ( the_event_set & ~(the_mask) );
-}
-
-#endif
-/* end of include file */
diff --git a/cpukit/rtems/inline/rtems/rtems/message.inl b/cpukit/rtems/inline/rtems/rtems/message.inl
deleted file mode 100644
index f3f763ca2e..0000000000
--- a/cpukit/rtems/inline/rtems/rtems/message.inl
+++ /dev/null
@@ -1,83 +0,0 @@
-/*  message.inl
- *
- *  This include file contains the static inline implementation of all
- *  inlined routines in the Message Manager.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __MESSAGE_QUEUE_inl
-#define __MESSAGE_QUEUE_inl
-
-#include <rtems/score/wkspace.h>
-
-/*PAGE
- *
- *  _Message_queue_Is_null
- *
- *  DESCRIPTION:
- *
- *  This function places the_message at the rear of the outstanding
- *  messages on the_message_queue.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Message_queue_Is_null (
-  Message_queue_Control *the_message_queue
-)
-{
-  return ( the_message_queue == NULL  );
-}
-
-
-/*PAGE
- *
- *  _Message_queue_Free
- *
- *  DESCRIPTION:
- *
- *  This routine deallocates a message queue control block into
- *  the inactive chain of free message queue control blocks.
- */
-
-RTEMS_INLINE_ROUTINE void _Message_queue_Free (
-  Message_queue_Control *the_message_queue
-)
-{
-  _Objects_Free( &_Message_queue_Information, &the_message_queue->Object );
-}
-
-/*PAGE
- *
- *  _Message_queue_Get
- *
- *  DESCRIPTION:
- *
- *  This function maps message queue IDs to message queue control
- *  blocks.  If ID corresponds to a local message queue, then it
- *  returns the_message_queue control pointer which maps to ID
- *  and location is set to OBJECTS_LOCAL.  If the message queue ID is
- *  global and resides on a remote node, then location is set
- *  to OBJECTS_REMOTE, and the_message_queue is undefined.
- *  Otherwise, location is set to OBJECTS_ERROR and
- *  the_message_queue is undefined.
- */
-
-RTEMS_INLINE_ROUTINE Message_queue_Control *_Message_queue_Get (
-  Objects_Id         id,
-  Objects_Locations *location
-)
-{
-  return (Message_queue_Control *)
-     _Objects_Get( &_Message_queue_Information, id, location );
-}
-
-#endif
-/* end of include file */
diff --git a/cpukit/rtems/inline/rtems/rtems/modes.inl b/cpukit/rtems/inline/rtems/rtems/modes.inl
deleted file mode 100644
index f72c2468e3..0000000000
--- a/cpukit/rtems/inline/rtems/rtems/modes.inl
+++ /dev/null
@@ -1,152 +0,0 @@
-/*  modes.inl
- *
- *  This include file contains the static inline implementation of the
- *  inlined routines in the Mode Handler
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __MODES_inl
-#define __MODES_inl
-
-/*PAGE
- *
- *  _Modes_Mask_changed
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if any of the mode flags in mask
- *  are set in mode_set, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Modes_Mask_changed (
-  Modes_Control mode_set,
-  Modes_Control masks
-)
-{
-   return ( mode_set & masks );
-}
-
-/*PAGE
- *
- *  _Modes_Is_asr_disabled
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if mode_set indicates that Asynchronous
- *  Signal Processing is disabled, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Modes_Is_asr_disabled (
-  Modes_Control mode_set
-)
-{
-   return (mode_set & RTEMS_ASR_MASK) == RTEMS_NO_ASR;
-}
-
-/*PAGE
- *
- *  _Modes_Is_preempt
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if mode_set indicates that preemption
- *  is enabled, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Modes_Is_preempt (
-  Modes_Control mode_set
-)
-{
-   return (mode_set & RTEMS_PREEMPT_MASK) == RTEMS_PREEMPT;
-}
-
-/*PAGE
- *
- *  _Modes_Is_timeslice
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if mode_set indicates that timeslicing
- *  is enabled, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Modes_Is_timeslice (
-  Modes_Control mode_set
-)
-{
-  return (mode_set & RTEMS_TIMESLICE_MASK) == RTEMS_TIMESLICE;
-}
-
-/*PAGE
- *
- *  _Modes_Get_interrupt_level
- *
- *  DESCRIPTION:
- *
- *  This function returns the interrupt level portion of the mode_set.
- */
-
-RTEMS_INLINE_ROUTINE ISR_Level _Modes_Get_interrupt_level (
-  Modes_Control mode_set
-)
-{
-  return ( mode_set & RTEMS_INTERRUPT_MASK );
-}
-
-/*PAGE
- *
- *  _Modes_Set_interrupt_level
- *
- *  DESCRIPTION:
- *
- *  This routine sets the current interrupt level to that specified
- *  in the mode_set.
- */
-
-RTEMS_INLINE_ROUTINE void _Modes_Set_interrupt_level (
-  Modes_Control mode_set
-)
-{
-  _ISR_Set_level( _Modes_Get_interrupt_level( mode_set ) );
-}
-
-/*PAGE
- *
- *  _Modes_Change
- *
- *  DESCRIPTION:
- *
- *  This routine changes the modes in old_mode_set indicated by
- *  mask to the requested values in new_mode_set.  The resulting
- *  mode set is returned in out_mode_set and the modes that changed
- *  is returned in changed.
- */
-
-RTEMS_INLINE_ROUTINE void _Modes_Change (
-  Modes_Control  old_mode_set,
-  Modes_Control  new_mode_set,
-  Modes_Control  mask,
-  Modes_Control *out_mode_set,
-  Modes_Control *changed
-)
-{
-  Modes_Control _out_mode;
-
-  _out_mode      =  old_mode_set;
-  _out_mode     &= ~mask;
-  _out_mode     |= new_mode_set & mask;
-  *changed       = _out_mode ^ old_mode_set;
-  *out_mode_set  = _out_mode;
-}
-
-#endif
-/* end of include file */
diff --git a/cpukit/rtems/inline/rtems/rtems/options.inl b/cpukit/rtems/inline/rtems/rtems/options.inl
deleted file mode 100644
index f92acf56c4..0000000000
--- a/cpukit/rtems/inline/rtems/rtems/options.inl
+++ /dev/null
@@ -1,55 +0,0 @@
-/*  options.inl
- *
- *  This file contains the static inline implementation of the inlined
- *  routines from the Options Handler.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __OPTIONS_inl
-#define __OPTIONS_inl
-
-/*PAGE
- *
- *  _Options_Is_no_wait
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the RTEMS_NO_WAIT option is enabled in
- *  option_set, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Options_Is_no_wait (
-  rtems_option option_set
-)
-{
-   return (option_set & RTEMS_NO_WAIT);
-}
-
-/*PAGE
- *
- *  _Options_Is_any
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the RTEMS_EVENT_ANY option is enabled in
- *  OPTION_SET, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Options_Is_any (
-  rtems_option option_set
-)
-{
-   return (option_set & RTEMS_EVENT_ANY);
-}
-
-#endif
-/* end of include file */
diff --git a/cpukit/rtems/inline/rtems/rtems/part.inl b/cpukit/rtems/inline/rtems/rtems/part.inl
deleted file mode 100644
index 18c948d5c4..0000000000
--- a/cpukit/rtems/inline/rtems/rtems/part.inl
+++ /dev/null
@@ -1,199 +0,0 @@
-/*  part.inl
- *
- *  This file contains the macro implementation of all inlined routines
- *  in the Partition Manager.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __PARTITION_inl
-#define __PARTITION_inl
-
-/*PAGE
- *
- *  _Partition_Allocate_buffer
- *
- *  DESCRIPTION:
- *
- *  This function attempts to allocate a buffer from the_partition.
- *  If successful, it returns the address of the allocated buffer.
- *  Otherwise, it returns NULL.
- */
-
-RTEMS_INLINE_ROUTINE void *_Partition_Allocate_buffer (
-   Partition_Control *the_partition
-)
-{
-  return _Chain_Get( &the_partition->Memory );
-}
-
-/*PAGE
- *
- *  _Partition_Free_buffer
- *
- *  DESCRIPTION:
- *
- *  This routine frees the_buffer to the_partition.
- */
-
-RTEMS_INLINE_ROUTINE void _Partition_Free_buffer (
-  Partition_Control *the_partition,
-  Chain_Node        *the_buffer
-)
-{
-  _Chain_Append( &the_partition->Memory, the_buffer );
-}
-
-/*PAGE
- *
- *  _Partition_Is_buffer_on_boundary
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the_buffer is on a valid buffer
- *  boundary for the_partition, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Partition_Is_buffer_on_boundary (
-  void              *the_buffer,
-  Partition_Control *the_partition
-)
-{
-  unsigned32   offset;
-
-  offset = (unsigned32) _Addresses_Subtract(
-    the_buffer,
-    the_partition->starting_address
-  );
-
-  return ((offset % the_partition->buffer_size) == 0);
-}
-
-/*PAGE
- *
- *  _Partition_Is_buffer_valid
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the_buffer is a valid buffer from
- *  the_partition, otherwise FALSE is returned.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Partition_Is_buffer_valid (
-   Chain_Node        *the_buffer,
-   Partition_Control *the_partition
-)
-{
-  void *starting;
-  void *ending;
-
-  starting = the_partition->starting_address;
-  ending   = _Addresses_Add_offset( starting, the_partition->length );
-
-  return (
-    _Addresses_Is_in_range( the_buffer, starting, ending ) &&
-    _Partition_Is_buffer_on_boundary( the_buffer, the_partition )
-  );
-}
-
-/*PAGE
- *
- *  _Partition_Is_buffer_size_aligned
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the use of the specified buffer_size
- *  will result in the allocation of buffers whose first byte is
- *  properly aligned, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Partition_Is_buffer_size_aligned (
-   unsigned32 buffer_size
-)
-{
-  return ((buffer_size % CPU_PARTITION_ALIGNMENT) == 0);
-}
-
-/*PAGE
- *
- *  _Partition_Allocate
- *
- *  DESCRIPTION:
- *
- *  This function allocates a partition control block from
- *  the inactive chain of free partition control blocks.
- */
-
-RTEMS_INLINE_ROUTINE Partition_Control *_Partition_Allocate ( void )
-{
-  return (Partition_Control *) _Objects_Allocate( &_Partition_Information );
-}
-
-/*PAGE
- *
- *  _Partition_Free
- *
- *  DESCRIPTION:
- *
- *  This routine frees a partition control block to the
- *  inactive chain of free partition control blocks.
- */
-
-RTEMS_INLINE_ROUTINE void _Partition_Free (
-   Partition_Control *the_partition
-)
-{
-  _Objects_Free( &_Partition_Information, &the_partition->Object );
-}
-
-/*PAGE
- *
- *  _Partition_Get
- *
- *  DESCRIPTION:
- *
- *  This function maps partition IDs to partition control blocks.
- *  If ID corresponds to a local partition, then it returns
- *  the_partition control pointer which maps to ID and location
- *  is set to OBJECTS_LOCAL.  If the partition ID is global and
- *  resides on a remote node, then location is set to OBJECTS_REMOTE,
- *  and the_partition is undefined.  Otherwise, location is set
- *  to OBJECTS_ERROR and the_partition is undefined.
- */
-
-RTEMS_INLINE_ROUTINE Partition_Control *_Partition_Get (
-  Objects_Id         id,
-  Objects_Locations *location
-)
-{
-  return (Partition_Control *)
-    _Objects_Get( &_Partition_Information, id, location );
-}
-
-/*PAGE
- *
- *  _Partition_Is_null
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the_partition is NULL
- *  and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Partition_Is_null (
-   Partition_Control *the_partition
-)
-{
-   return ( the_partition == NULL  );
-}
-
-#endif
-/* end of include file */
diff --git a/cpukit/rtems/inline/rtems/rtems/ratemon.inl b/cpukit/rtems/inline/rtems/rtems/ratemon.inl
deleted file mode 100644
index f1293ef75a..0000000000
--- a/cpukit/rtems/inline/rtems/rtems/ratemon.inl
+++ /dev/null
@@ -1,143 +0,0 @@
-/*  ratemon.inl
- *
- *  This file contains the static inline  implementation of the inlined
- *  routines in the Rate Monotonic Manager.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RATE_MONOTONIC_inl
-#define __RATE_MONOTONIC_inl
-
-/*PAGE
- *
- *  _Rate_monotonic_Allocate
- *
- *  DESCRIPTION:
- *
- *  This function allocates a period control block from
- *  the inactive chain of free period control blocks.
- */
-
-RTEMS_INLINE_ROUTINE Rate_monotonic_Control *_Rate_monotonic_Allocate( void )
-{
-  return (Rate_monotonic_Control *)
-    _Objects_Allocate( &_Rate_monotonic_Information );
-}
-
-/*PAGE
- *
- *  _Rate_monotonic_Free
- *
- *  DESCRIPTION:
- *
- *  This routine allocates a period control block from
- *  the inactive chain of free period control blocks.
- */
-
-RTEMS_INLINE_ROUTINE void _Rate_monotonic_Free (
-  Rate_monotonic_Control *the_period
-)
-{
-  _Objects_Free( &_Rate_monotonic_Information, &the_period->Object );
-}
-
-/*PAGE
- *
- *  _Rate_monotonic_Get
- *
- *  DESCRIPTION:
- *
- *  This function maps period IDs to period control blocks.
- *  If ID corresponds to a local period, then it returns
- *  the_period control pointer which maps to ID and location
- *  is set to OBJECTS_LOCAL.  Otherwise, location is set
- *  to OBJECTS_ERROR and the_period is undefined.
- */
-
-RTEMS_INLINE_ROUTINE Rate_monotonic_Control *_Rate_monotonic_Get (
-  Objects_Id         id,
-  Objects_Locations *location
-)
-{
-  return (Rate_monotonic_Control *)
-    _Objects_Get( &_Rate_monotonic_Information, id, location );
-}
-
-/*PAGE
- *
- *  _Rate_monotonic_Is_active
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the_period is in the ACTIVE state,
- *  and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Rate_monotonic_Is_active (
-  Rate_monotonic_Control *the_period
-)
-{
-  return (the_period->state == RATE_MONOTONIC_ACTIVE);
-}
-
-/*PAGE
- *
- *  _Rate_monotonic_Is_inactive
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the_period is in the ACTIVE state,
- *  and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Rate_monotonic_Is_inactive (
-  Rate_monotonic_Control *the_period
-)
-{
-  return (the_period->state == RATE_MONOTONIC_INACTIVE);
-}
-
-/*PAGE
- *
- *  _Rate_monotonic_Is_expired
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the_period is in the EXPIRED state,
- *  and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Rate_monotonic_Is_expired (
-  Rate_monotonic_Control *the_period
-)
-{
-  return (the_period->state == RATE_MONOTONIC_EXPIRED);
-}
-
-/*PAGE
- *
- *  _Rate_monotonic_Is_null
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the_period is NULL and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Rate_monotonic_Is_null (
-  Rate_monotonic_Control *the_period
-)
-{
-  return (the_period == NULL);
-}
-
-#endif
-/* end of include file */
diff --git a/cpukit/rtems/inline/rtems/rtems/region.inl b/cpukit/rtems/inline/rtems/rtems/region.inl
deleted file mode 100644
index 37f098ae63..0000000000
--- a/cpukit/rtems/inline/rtems/rtems/region.inl
+++ /dev/null
@@ -1,127 +0,0 @@
-/*  region.inl
- *
- *  This file contains the macro implementation of the inlined
- *  routines from the Region Manager.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __REGION_inl
-#define __REGION_inl
-
-/*PAGE
- *
- *  _Region_Allocate
- *
- *  DESCRIPTION:
- *
- *  This function allocates a region control block from
- *  the inactive chain of free region control blocks.
- */
-
-RTEMS_INLINE_ROUTINE Region_Control *_Region_Allocate( void )
-{
-  return (Region_Control *) _Objects_Allocate( &_Region_Information );
-}
-
-/*PAGE
- *
- *  _Region_Free
- *
- *  DESCRIPTION:
- *
- *  This routine frees a region control block to the
- *  inactive chain of free region control blocks.
- */
-
-RTEMS_INLINE_ROUTINE void _Region_Free (
-  Region_Control *the_region
-)
-{
-  _Objects_Free( &_Region_Information, &the_region->Object );
-}
-
-/*PAGE
- *
- *  _Region_Get
- *
- *  DESCRIPTION:
- *
- *  This function maps region IDs to region control blocks.
- *  If ID corresponds to a local region, then it returns
- *  the_region control pointer which maps to ID and location
- *  is set to OBJECTS_LOCAL.  Otherwise, location is set
- *  to OBJECTS_ERROR and the_region is undefined.
- */
-
-RTEMS_INLINE_ROUTINE Region_Control *_Region_Get (
-  Objects_Id         id,
-  Objects_Locations *location
-)
-{
-  return (Region_Control *)
-    _Objects_Get( &_Region_Information, id, location );
-}
-
-/*PAGE
- *
- *  _Region_Allocate_segment
- *
- *  DESCRIPTION:
- *
- *  This function attempts to allocate a segment from the_region.
- *  If successful, it returns the address of the allocated segment.
- *  Otherwise, it returns NULL.
- */
-
-RTEMS_INLINE_ROUTINE void *_Region_Allocate_segment (
-  Region_Control *the_region,
-  unsigned32      size
-)
-{
-   return _Heap_Allocate( &the_region->Memory, size );
-}
-
-/*PAGE
- *
- *  _Region_Free_segment
- *
- *  DESCRIPTION:
- *
- *  This function frees the_segment to the_region.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Region_Free_segment (
-  Region_Control *the_region,
-  void           *the_segment
-)
-{
-  return _Heap_Free( &the_region->Memory, the_segment );
-}
-
-/*PAGE
- *
- *  _Region_Is_null
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the_region is NULL and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Region_Is_null (
-  Region_Control *the_region
-)
-{
-  return ( the_region == NULL  );
-}
-
-#endif
-/* end of include file */
diff --git a/cpukit/rtems/inline/rtems/rtems/sem.inl b/cpukit/rtems/inline/rtems/rtems/sem.inl
deleted file mode 100644
index 75774b2917..0000000000
--- a/cpukit/rtems/inline/rtems/rtems/sem.inl
+++ /dev/null
@@ -1,93 +0,0 @@
-/*  sem.inl
- *
- *  This file contains the static inlin implementation of the inlined
- *  routines from the Semaphore Manager.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __SEMAPHORE_inl
-#define __SEMAPHORE_inl
-
-/*PAGE
- *
- *  _Semaphore_Allocate
- *
- *  DESCRIPTION:
- *
- *  This function allocates a semaphore control block from
- *  the inactive chain of free semaphore control blocks.
- */
-
-RTEMS_INLINE_ROUTINE Semaphore_Control *_Semaphore_Allocate( void )
-{
-  return (Semaphore_Control *) _Objects_Allocate( &_Semaphore_Information );
-}
-
-/*PAGE
- *
- *  _Semaphore_Free
- *
- *  DESCRIPTION:
- *
- *  This routine frees a semaphore control block to the
- *  inactive chain of free semaphore control blocks.
- */
-
-RTEMS_INLINE_ROUTINE void _Semaphore_Free (
-  Semaphore_Control *the_semaphore
-)
-{
-  _Objects_Free( &_Semaphore_Information, &the_semaphore->Object );
-}
-
-/*PAGE
- *
- *  _Semaphore_Get
- *
- *  DESCRIPTION:
- *
- *  This function maps semaphore IDs to semaphore control blocks.
- *  If ID corresponds to a local semaphore, then it returns
- *  the_semaphore control pointer which maps to ID and location
- *  is set to OBJECTS_LOCAL.  if the semaphore ID is global and
- *  resides on a remote node, then location is set to OBJECTS_REMOTE,
- *  and the_semaphore is undefined.  Otherwise, location is set
- *  to OBJECTS_ERROR and the_semaphore is undefined.
- */
-
-RTEMS_INLINE_ROUTINE Semaphore_Control *_Semaphore_Get (
-  Objects_Id         id,
-  Objects_Locations *location
-)
-{
-  return (Semaphore_Control *)
-    _Objects_Get( &_Semaphore_Information, id, location );
-}
-
-/*PAGE
- *
- *  _Semaphore_Is_null
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the_semaphore is NULL and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Semaphore_Is_null (
-  Semaphore_Control *the_semaphore
-)
-{
-  return ( the_semaphore == NULL );
-}
-
-#endif
-/*  end of include file */
diff --git a/cpukit/rtems/inline/rtems/rtems/status.inl b/cpukit/rtems/inline/rtems/rtems/status.inl
deleted file mode 100644
index b9182c6f63..0000000000
--- a/cpukit/rtems/inline/rtems/rtems/status.inl
+++ /dev/null
@@ -1,56 +0,0 @@
-/*  inline/status.inl
- *
- *  This include file contains the implementations of the inlined
- *  routines for the status package.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __INLINE_STATUS_inl
-#define __INLINE_STATUS_inl
-
-/*PAGE
- *
- *  rtems_is_status_successful
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the status code is equal to RTEMS_SUCCESSFUL,
- *  and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean rtems_is_status_successful(
-  rtems_status_code code
-)
-{
-  return (code == RTEMS_SUCCESSFUL);
-}
-
-/*PAGE
- *
- *  rtems_are_statuses_equal
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the status code1 is equal to code2,
- *  and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean rtems_are_statuses_equal(
-  rtems_status_code code1,
-  rtems_status_code code2
-)
-{
-   return (code1 == code2);
-}
-
-#endif
-/* end of include file */
diff --git a/cpukit/rtems/inline/rtems/rtems/support.inl b/cpukit/rtems/inline/rtems/rtems/support.inl
deleted file mode 100644
index 06de8d1f59..0000000000
--- a/cpukit/rtems/inline/rtems/rtems/support.inl
+++ /dev/null
@@ -1,61 +0,0 @@
-/*  support.inl
- *
- *  This include file contains the static inline implementation of all
- *  of the inlined routines specific to the RTEMS API.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
- 
-#ifndef __RTEMS_SUPPORT_inl
-#define __RTEMS_SUPPORT_inl
-
-/*PAGE
- *
- *  rtems_is_name_valid
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the name is valid, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE rtems_boolean rtems_is_name_valid (
-  rtems_name name
-)
-{
-  return ( name != 0 );
-}
-
-/*PAGE
- *
- *  rtems_name_to_characters
- *
- *  DESCRIPTION:
- *
- *  This function breaks the object name into the four component
- *  characters C1, C2, C3, and C4.
- */
-
-RTEMS_INLINE_ROUTINE void rtems_name_to_characters(
-  rtems_name    name,
-  char         *c1,
-  char         *c2,
-  char         *c3,
-  char         *c4
-)
-{
-  *c1 = (name >> 24) & 0xff;
-  *c2 = (name >> 16) & 0xff;
-  *c3 = (name >> 8) & 0xff;
-  *c4 =  name & 0xff;
-}
-
-#endif
-/* end of include file */
diff --git a/cpukit/rtems/inline/rtems/rtems/tasks.inl b/cpukit/rtems/inline/rtems/rtems/tasks.inl
deleted file mode 100644
index 34c1e055a8..0000000000
--- a/cpukit/rtems/inline/rtems/rtems/tasks.inl
+++ /dev/null
@@ -1,90 +0,0 @@
-/*  tasks.inl
- *
- *  This file contains the static inline implementation of all inlined
- *  routines in the with RTEMS Tasks Manager.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_TASKS_inl
-#define __RTEMS_TASKS_inl
-
-/*PAGE
- *
- *  _RTEMS_tasks_Allocate
- *
- *  DESCRIPTION:
- *
- *  This function allocates a task control block from
- *  the inactive chain of free task control blocks.
- */
-
-RTEMS_INLINE_ROUTINE Thread_Control *_RTEMS_tasks_Allocate( void )
-{
-  return (Thread_Control *) _Objects_Allocate( &_RTEMS_tasks_Information );
-}
-
-/*PAGE
- *
- *  _RTEMS_tasks_Free
- *
- *  DESCRIPTION:
- *
- *  This routine frees a task control block to the
- *  inactive chain of free task control blocks.
- */
-
-RTEMS_INLINE_ROUTINE void _RTEMS_tasks_Free (
-  Thread_Control *the_task
-)
-{
-  _Objects_Free( 
-    _Objects_Get_information( the_task->Object.id ),
-    &the_task->Object
-  );
-}
-
-/*PAGE
- *
- *  _RTEMS_tasks_Priority_to_Core
- *
- *  DESCRIPTION:
- *
- *  This function converts an RTEMS API priority into a core priority.
- */
- 
-RTEMS_INLINE_ROUTINE Priority_Control _RTEMS_tasks_Priority_to_Core(
-  rtems_task_priority   priority
-)
-{
-  return (Priority_Control) priority;
-}
-
-/*PAGE
- *
- *  _RTEMS_tasks_Priority_is_valid
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the_priority is a valid user task priority
- *  and FALSE otherwise.
- */
- 
-RTEMS_INLINE_ROUTINE boolean _RTEMS_tasks_Priority_is_valid (
-  rtems_task_priority the_priority
-)
-{
-  return (  ( the_priority >= RTEMS_MINIMUM_PRIORITY ) &&
-            ( the_priority <= RTEMS_MAXIMUM_PRIORITY ) );
-}
-
-#endif
-/* end of include file */
diff --git a/cpukit/rtems/inline/rtems/rtems/timer.inl b/cpukit/rtems/inline/rtems/rtems/timer.inl
deleted file mode 100644
index b884e02f4d..0000000000
--- a/cpukit/rtems/inline/rtems/rtems/timer.inl
+++ /dev/null
@@ -1,142 +0,0 @@
-/*  timer.inl
- *
- *  This file contains the static inline implementation of the inlined routines
- *  from the Timer Manager.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __TIMER_inl
-#define __TIMER_inl
-
-/*PAGE
- *
- *  _Timer_Allocate
- *
- *  DESCRIPTION:
- *
- *  This function allocates a timer control block from
- *  the inactive chain of free timer control blocks.
- */
-
-RTEMS_INLINE_ROUTINE Timer_Control *_Timer_Allocate( void )
-{
-  return (Timer_Control *) _Objects_Allocate( &_Timer_Information );
-}
-
-/*PAGE
- *
- *  _Timer_Free
- *
- *  DESCRIPTION:
- *
- *  This routine frees a timer control block to the
- *  inactive chain of free timer control blocks.
- */
-
-RTEMS_INLINE_ROUTINE void _Timer_Free (
-  Timer_Control *the_timer
-)
-{
-  _Objects_Free( &_Timer_Information, &the_timer->Object );
-}
-
-/*PAGE
- *
- *  _Timer_Get
- *
- *  DESCRIPTION:
- *
- *  This function maps timer IDs to timer control blocks.
- *  If ID corresponds to a local timer, then it returns
- *  the timer control pointer which maps to ID and location
- *  is set to OBJECTS_LOCAL.  Otherwise, location is set
- *  to OBJECTS_ERROR and the returned value is undefined.
- */
-
-RTEMS_INLINE_ROUTINE Timer_Control *_Timer_Get (
-  Objects_Id         id,
-  Objects_Locations *location
-)
-{
-  return (Timer_Control *)
-    _Objects_Get( &_Timer_Information, id, location );
-}
-
-/*PAGE
- *
- *  _Timer_Is_interval_class
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the class is that of an INTERVAL
- *  timer, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Timer_Is_interval_class (
-  Timer_Classes the_class
-)
-{
-  return ( the_class == TIMER_INTERVAL );
-}
-
-/*PAGE
- *
- *  _Timer_Is_time_of_day_class
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the class is that of an INTERVAL
- *  timer, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Timer_Is_timer_of_day_class (
-  Timer_Classes the_class
-)
-{
-  return ( the_class == TIMER_TIME_OF_DAY );
-}
-
-/*PAGE
- *
- *  _Timer_Is_dormant_class
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the class is that of a DORMANT
- *  timer, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Timer_Is_dormant_class (
-  Timer_Classes the_class
-)
-{
-  return ( the_class == TIMER_DORMANT );
-}
-
-/*PAGE
- *
- *  _Timer_Is_null
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the_timer is NULL and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Timer_Is_null (
-  Timer_Control *the_timer
-)
-{
-  return ( the_timer == NULL );
-}
-
-#endif
-/* end of include file */
diff --git a/cpukit/rtems/macros/rtems/rtems/asr.inl b/cpukit/rtems/macros/rtems/rtems/asr.inl
deleted file mode 100644
index d3ed229ca9..0000000000
--- a/cpukit/rtems/macros/rtems/rtems/asr.inl
+++ /dev/null
@@ -1,90 +0,0 @@
-/*  macros/asr.h
- *
- *  This include file contains the implemenation of all routines
- *  associated with the asynchronous signal handler which are inlined.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __INLINE_ASR_h
-#define __INLINE_ASR_h
-
-#include <rtems/score/isr.h>
-
-/*PAGE
- *
- *  _ASR_Initialize
- *
- */
-
-#define _ASR_Initialize( _information ) \
-{ \
-  (_information)->is_enabled      = TRUE; \
-  (_information)->handler         = NULL; \
-  (_information)->mode_set        = RTEMS_DEFAULT_MODES; \
-  (_information)->signals_posted  = 0; \
-  (_information)->signals_pending = 0; \
-  (_information)->nest_level      = 0; \
-}
-
-/*PAGE
- *
- *  _ASR_Swap_signals
- *
- */
-
-#define _ASR_Swap_signals( _information ) \
-{ \
-  rtems_signal_set _signals; \
-  ISR_Level              _level; \
-   \
-  _ISR_Disable( _level ); \
-    _signals                        = (_information)->signals_pending; \
-    (_information)->signals_pending = (_information)->signals_posted; \
-    (_information)->signals_posted  = _signals; \
-  _ISR_Enable( _level ); \
-}
-
-/*PAGE
- *
- *  _ASR_Is_null_handler
- *
- */
-
-#define _ASR_Is_null_handler( _asr_handler ) \
-  ( (_asr_handler) == NULL )
-
-/*PAGE
- *
- *  _ASR_Are_signals_pending
- *
- */
-
-#define _ASR_Are_signals_pending( _information ) \
- ( (_information)->signals_posted != 0 )
-
-/*PAGE
- *
- *  _ASR_Post_signals
- *
- */
-
-#define _ASR_Post_signals( _signals, _signal_set ) \
-  do { \
-     ISR_Level _level; \
-     \
-     _ISR_Disable( _level ); \
-       *(_signal_set) |= (_signals); \
-     _ISR_Enable( _level ); \
-  } while ( 0 )
-
-#endif
-/* end of include file */
diff --git a/cpukit/rtems/macros/rtems/rtems/attr.inl b/cpukit/rtems/macros/rtems/rtems/attr.inl
deleted file mode 100644
index 290e7f7870..0000000000
--- a/cpukit/rtems/macros/rtems/rtems/attr.inl
+++ /dev/null
@@ -1,100 +0,0 @@
-/*  macros/attr.h
- *
- *  This include file contains all of the inlined routines associated
- *  with attributes.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __MACROS_ATTRIBUTES_h
-#define __MACROS_ATTRIBUTES_h
-
-/*PAGE
- *
- *  _Attributes_Set
- */
-
-#define _Attributes_Set( _new_attributes, _attribute_set ) \
-  ( (_attribute_set) | (_new_attributes) )
-
-/*PAGE
- *
- *  _Attributes_Clear
- */
-
-#define _Attributes_Clear( _attribute_set, _mask ) \
-  ( (_attribute_set) & ~(_mask) )
-
-/*PAGE
- *
- *  _Attributes_Is_floating_point
- *
- */
-
-#define _Attributes_Is_floating_point( _attribute_set ) \
-  ( (_attribute_set) & RTEMS_FLOATING_POINT )
-
-/*PAGE
- *
- *  _Attributes_Is_global
- *
- */
-
-#define _Attributes_Is_global( _attribute_set ) \
-  ( (_attribute_set) & RTEMS_GLOBAL )
-
-/*PAGE
- *
- *  _Attributes_Is_priority
- *
- */
-
-#define _Attributes_Is_priority( _attribute_set ) \
-  ( (_attribute_set) & RTEMS_PRIORITY )
-
-/*PAGE
- *
- *  _Attributes_Is_binary_semaphore
- *
- */
-
-#define _Attributes_Is_binary_semaphore( _attribute_set ) \
-  ( (_attribute_set) & RTEMS_BINARY_SEMAPHORE )
-
-/*PAGE
- *
- *  _Attributes_Is_inherit_priority
- *
- */
-
-#define _Attributes_Is_inherit_priority( _attribute_set ) \
-  ( (_attribute_set) & RTEMS_INHERIT_PRIORITY )
-
-/*PAGE
- *
- *  _Attributes_Is_priority_ceiling
- *
- */
- 
-#define _Attributes_Is_priority_ceiling( _attribute_set ) \
-  ( (_attribute_set) & RTEMS_PRIORITY_CEILING )
-
-/*PAGE
- *
- *  _Attributes_Is_system_task
- *
- */
- 
-#define _Attributes_Is_system_task( _attribute_set ) \
-  ( (_attribute_set) & RTEMS_SYSTEM_TASK )
-
-#endif
-/* end of include file */
diff --git a/cpukit/rtems/macros/rtems/rtems/dpmem.inl b/cpukit/rtems/macros/rtems/rtems/dpmem.inl
deleted file mode 100644
index 171f15d8e9..0000000000
--- a/cpukit/rtems/macros/rtems/rtems/dpmem.inl
+++ /dev/null
@@ -1,59 +0,0 @@
-/*  macros/dpmem.h
- *
- *  This include file contains the inline routine used in conjunction
- *  with the Dual Ported Memory Manager
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __MACROS_DPMEM_h
-#define __MACROS_DPMEM_h
-
-/*PAGE
- *
- *  _Dual_ported_memory_Allocate
- *
- */
-
-#define _Dual_ported_memory_Allocate() \
-  (Dual_ported_memory_Control *) \
-     _Objects_Allocate( &_Dual_ported_memory_Information )
-
-/*PAGE
- *
- *  _Dual_ported_memory_Free
- *
- */
-
-#define _Dual_ported_memory_Free( _the_port ) \
-  _Objects_Free( &_Dual_ported_memory_Information, &(_the_port)->Object )
-
-/*PAGE
- *
- *  _Dual_ported_memory_Get
- *
- */
-
-#define _Dual_ported_memory_Get( _id, _location ) \
-  (Dual_ported_memory_Control *) \
-     _Objects_Get( &_Dual_ported_memory_Information, (_id), (_location) )
-
-
-/*PAGE
- *
- *  _Dual_ported_memory_Is_null
- */
-
-#define _Dual_ported_memory_Is_null( _the_port ) \
-  ( (_the_port) == NULL )
-
-#endif
-/* end of include file */
diff --git a/cpukit/rtems/macros/rtems/rtems/event.inl b/cpukit/rtems/macros/rtems/rtems/event.inl
deleted file mode 100644
index e0d18e7817..0000000000
--- a/cpukit/rtems/macros/rtems/rtems/event.inl
+++ /dev/null
@@ -1,21 +0,0 @@
-/*  macros/event.h
- *
- *  This include file contains the implementation of macros for
- *  the Event Manager.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __MACROS_EVENT_h
-#define __MACROS_EVENT_h
-
-#endif
-/* end of include file */
diff --git a/cpukit/rtems/macros/rtems/rtems/eventset.inl b/cpukit/rtems/macros/rtems/rtems/eventset.inl
deleted file mode 100644
index 3eeb2bea63..0000000000
--- a/cpukit/rtems/macros/rtems/rtems/eventset.inl
+++ /dev/null
@@ -1,59 +0,0 @@
-/*  eventset.inl
- *
- *  This include file contains the macro implementation of inlined
- *  routines in the event set object.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __EVENT_SET_inl
-#define __EVENT_SET_inl
-
-/*PAGE
- *
- *  _Event_sets_Is_empty
- */
-
-#define _Event_sets_Is_empty( _the_event_set )  \
-  ((_the_event_set) == 0 )
-
-/*PAGE
- *
- *  _Event_sets_Is_empty
- */
-
-#define _Event_sets_Post( _the_new_events, _the_event_set ) \
-   do { \
-     ISR_Level level; \
-     \
-     _ISR_Disable( level ); \
-       *(_the_event_set) |= (_the_new_events); \
-     _ISR_Enable( level ); \
-   } while (0);
-
-/*PAGE
- *
- *  _Event_sets_Is_empty
- */
-
-#define _Event_sets_Get( _the_event_set, _the_event_condition ) \
-   ((_the_event_set) & (_the_event_condition))
-
-/*PAGE
- *
- *  _Event_sets_Clear
- */
-
-#define _Event_sets_Clear( _the_event_set, _the_mask ) \
-   ((_the_event_set) & ~(_the_mask))
-
-#endif
-/* end of include file */
diff --git a/cpukit/rtems/macros/rtems/rtems/message.inl b/cpukit/rtems/macros/rtems/rtems/message.inl
deleted file mode 100644
index 537701d41b..0000000000
--- a/cpukit/rtems/macros/rtems/rtems/message.inl
+++ /dev/null
@@ -1,49 +0,0 @@
-/*  message.inl
- *
- *  This include file contains the macro implementation of all
- *  inlined routines in the Message Manager.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __MESSAGE_QUEUE_inl
-#define __MESSAGE_QUEUE_inl
-
-/*PAGE
- *
- *  _Message_queue_Is_null
- *
- */
-
-#define _Message_queue_Is_null( _the_message_queue ) \
-   ( (_the_message_queue) == NULL  )
-
-/*PAGE
- *
- *  _Message_queue_Free
- *
- */
-
-#define _Message_queue_Free( _the_message_queue ) \
-  _Objects_Free( &_Message_queue_Information, &(_the_message_queue)->Object )
-
-/*PAGE
- *
- *  _Message_queue_Get
- *
- */
-
-#define _Message_queue_Get( _id, _location ) \
-  (Message_queue_Control *) \
-     _Objects_Get( &_Message_queue_Information, (_id), (_location) )
-
-#endif
-/* end of include file */
diff --git a/cpukit/rtems/macros/rtems/rtems/modes.inl b/cpukit/rtems/macros/rtems/rtems/modes.inl
deleted file mode 100644
index e84bf25b32..0000000000
--- a/cpukit/rtems/macros/rtems/rtems/modes.inl
+++ /dev/null
@@ -1,92 +0,0 @@
-/*  modes.inl
- *
- *  This include file contains the macro implementation of the
- *  inlined routines in the Mode Handler.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __MODES_inl
-#define __MODES_inl
-
-/*PAGE
- *
- *  _Modes_Mask_changed
- *
- */
-
-#define _Modes_Mask_changed( _mode_set, _masks ) \
-   ( (_mode_set) & (_masks) )
-
-/*PAGE
- *
- *  _Modes_Is_asr_disabled
- *
- */
-
-#define _Modes_Is_asr_disabled( _mode_set ) \
-   (((_mode_set) & RTEMS_ASR_MASK) == RTEMS_NO_ASR)
-
-/*PAGE
- *
- *  _Modes_Is_preempt
- *
- */
-
-#define _Modes_Is_preempt( _mode_set ) \
-   ( ( (_mode_set) & RTEMS_PREEMPT_MASK ) == RTEMS_PREEMPT )
-
-/*PAGE
- *
- *  _Modes_Is_timeslice
- *
- */
-
-#define _Modes_Is_timeslice( _mode_set ) \
-  (((_mode_set) & RTEMS_TIMESLICE_MASK) == RTEMS_TIMESLICE)
-
-/*PAGE
- *
- *  _Modes_Get_interrupt_level
- *
- */
-
-#define _Modes_Get_interrupt_level( _mode_set ) \
-  ( (_mode_set) & RTEMS_INTERRUPT_MASK )
-
-/*PAGE
- *
- *  _Modes_Set_interrupt_level
- *
- */
-
-#define _Modes_Set_interrupt_level( _mode_set ) \
-   _ISR_Set_level( _Modes_Get_interrupt_level( (_mode_set) ) )
-
-/*PAGE
- *
- *  _Modes_Change
- *
- */
-
-#define _Modes_Change( _old_mode_set, _new_mode_set, \
-                       _mask, _out_mode_set, _changed ) \
-  { Modes_Control _out_mode; \
-    \
-    _out_mode         =  (_old_mode_set); \
-    _out_mode        &= ~(_mask); \
-    _out_mode        |= (_new_mode_set) & (_mask); \
-    *(_changed)       = _out_mode ^ (_old_mode_set); \
-    *(_out_mode_set)  = _out_mode; \
-  }
-
-#endif
-/* end of include file */
diff --git a/cpukit/rtems/macros/rtems/rtems/options.inl b/cpukit/rtems/macros/rtems/rtems/options.inl
deleted file mode 100644
index 78068ab17c..0000000000
--- a/cpukit/rtems/macros/rtems/rtems/options.inl
+++ /dev/null
@@ -1,39 +0,0 @@
-/*  options.inl
- *
- *  This file contains the macro implementation of the inlined
- *  routines from the Options Handler.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __OPTIONS_inl
-#define __OPTIONS_inl
-
-/*PAGE
- *
- *  _Options_Is_no_wait
- *
- */
-
-#define _Options_Is_no_wait( _option_set ) \
-   ( (_option_set) & RTEMS_NO_WAIT )
-
-/*PAGE
- *
- *  _Options_Is_any
- *
- */
-
-#define _Options_Is_any( _option_set ) \
-   ( (_option_set) & RTEMS_EVENT_ANY )
-
-#endif
-/* end of include file */
diff --git a/cpukit/rtems/macros/rtems/rtems/part.inl b/cpukit/rtems/macros/rtems/rtems/part.inl
deleted file mode 100644
index 027a7427e5..0000000000
--- a/cpukit/rtems/macros/rtems/rtems/part.inl
+++ /dev/null
@@ -1,117 +0,0 @@
-/*  part.inl
- *
- *  This file contains the macro implementation of all inlined routines
- *  in the Partition Manager.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __PARTITION_inl
-#define __PARTITION_inl
-
-/*PAGE
- *
- *  _Partition_Allocate_buffer
- *
- */
-
-#define _Partition_Allocate_buffer( _the_partition ) \
-  _Chain_Get( &(_the_partition)->Memory )
-
-/*PAGE
- *
- *  _Partition_Free_buffer
- *
- */
-
-#define _Partition_Free_buffer( _the_partition, _the_buffer ) \
-  _Chain_Append( &(_the_partition)->Memory, (_the_buffer) )
-
-/*PAGE
- *
- *  _Partition_Is_buffer_on_boundary
- *
- */
-
-#define _Partition_Is_buffer_on_boundary( _the_buffer, _the_partition ) \
-  ((((unsigned32) _Addresses_Subtract( \
-                    (_the_buffer), \
-                    (_the_partition)->starting_address ) \
-                  ) % \
-                  (_the_partition)->buffer_size) == 0)
-
-/*PAGE
- *
- *  _Partition_Is_buffer_valid
- *
- */
-
-#define _Partition_Is_buffer_valid( _the_buffer, _the_partition ) \
-  ( \
-    _Addresses_Is_in_range( \
-      (_the_buffer), \
-      (_the_partition)->starting_address, \
-      _Addresses_Add_offset( \
-         (_the_partition)->starting_address, \
-         (_the_partition)->length \
-      ) \
-    ) && \
-    _Partition_Is_buffer_on_boundary( (_the_buffer), (_the_partition) ) \
-  )
-
-/*PAGE
- *
- *  _Partition_Is_buffer_size_aligned
- *
- */
-
-#define _Partition_Is_buffer_size_aligned( _buffer_size ) \
-  ((_buffer_size) % CPU_PARTITION_ALIGNMENT == 0)
-
-/*PAGE
- *
- *  _Partition_Allocate
- *
- */
-
-#define _Partition_Allocate() \
-  (Partition_Control *) _Objects_Allocate( &_Partition_Information )
-
-/*PAGE
- *
- *  _Partition_Free
- *
- */
-
-#define _Partition_Free( _the_partition ) \
-  _Objects_Free( &_Partition_Information, &(_the_partition)->Object )
-
-/*PAGE
- *
- *  _Partition_Get
- *
- */
-
-#define _Partition_Get( _id, _location ) \
-  (Partition_Control *) \
-    _Objects_Get( &_Partition_Information, (_id), (_location) )
-
-/*PAGE
- *
- *  _Partition_Is_null
- *
- */
-
-#define _Partition_Is_null( _the_partition ) \
-   ( (_the_partition) == NULL  )
-
-#endif
-/* end of include file */
diff --git a/cpukit/rtems/macros/rtems/rtems/ratemon.inl b/cpukit/rtems/macros/rtems/rtems/ratemon.inl
deleted file mode 100644
index 8a550d91e0..0000000000
--- a/cpukit/rtems/macros/rtems/rtems/ratemon.inl
+++ /dev/null
@@ -1,85 +0,0 @@
-/*  ratemon.inl
- *
- *  This file contains the macro implementation of the inlined
- *  routines in the Rate Monotonic Manager.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RATE_MONOTONIC_inl
-#define __RATE_MONOTONIC_inl
-
-/*PAGE
- *
- *  _Rate_monotonic_Allocate
- *
- */
-
-#define _Rate_monotonic_Allocate() \
-  (Rate_monotonic_Control *) \
-    _Objects_Allocate( &_Rate_monotonic_Information )
-
-/*PAGE
- *
- *  _Rate_monotonic_Free
- *
- */
-
-#define _Rate_monotonic_Free( _the_period ) \
-  _Objects_Free( &_Rate_monotonic_Information, &(_the_period)->Object )
-
-/*PAGE
- *
- *  _Rate_monotonic_Get
- *
- */
-
-#define _Rate_monotonic_Get( _id, _location ) \
-  (Rate_monotonic_Control *) \
-    _Objects_Get( &_Rate_monotonic_Information, (_id), (_location) )
-
-/*PAGE
- *
- *  _Rate_monotonic_Is_active
- *
- */
-
-#define _Rate_monotonic_Is_active( _the_period ) \
-    ((_the_period)->state == RATE_MONOTONIC_ACTIVE)
-
-/*PAGE
- *
- *  _Rate_monotonic_Is_inactive
- *
- */
-
-#define _Rate_monotonic_Is_inactive( _the_period ) \
-    ((_the_period)->state == RATE_MONOTONIC_INACTIVE)
-
-/*PAGE
- *
- *  _Rate_monotonic_Is_expired
- *
- */
-
-#define _Rate_monotonic_Is_expired( _the_period ) \
-    ((_the_period)->state == RATE_MONOTONIC_EXPIRED)
-
-/*PAGE
- *
- *  _Rate_monotonic_Is_null
- *
- */
-
-#define _Rate_monotonic_Is_null( _the_period )   ( (_the_period) == NULL  )
-
-#endif
-/* end of include file */
diff --git a/cpukit/rtems/macros/rtems/rtems/region.inl b/cpukit/rtems/macros/rtems/rtems/region.inl
deleted file mode 100644
index 8c36bdeb34..0000000000
--- a/cpukit/rtems/macros/rtems/rtems/region.inl
+++ /dev/null
@@ -1,75 +0,0 @@
-/*  region.inl
- *
- *  This file contains the macro implementation of the inlined
- *  routines from the Region Manager.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __REGION_inl
-#define __REGION_inl
-
-/*PAGE
- *
- *  _Region_Allocate
- *
- */
-
-#define _Region_Allocate() \
-  (Region_Control *) _Objects_Allocate( &_Region_Information )
-
-/*PAGE
- *
- *  _Region_Free
- *
- */
-
-#define _Region_Free( _the_region ) \
-  _Objects_Free( &_Region_Information, &(_the_region)->Object )
-
-/*PAGE
- *
- *  _Region_Get
- *
- */
-
-#define _Region_Get( _id, _location ) \
-  (Region_Control *) \
-   _Objects_Get( &_Region_Information, (_id), (_location) )
-
-/*PAGE
- *
- *  _Region_Allocate_segment
- *
- */
-
-#define _Region_Allocate_segment( _the_region, _size ) \
-   _Heap_Allocate( &(_the_region)->Memory, (_size) )
-
-/*PAGE
- *
- *  _Region_Free_segment
- *
- */
-
-#define _Region_Free_segment( _the_region, _the_segment ) \
-   _Heap_Free( &(_the_region)->Memory, (_the_segment) )
-
-/*PAGE
- *
- *  _Region_Is_null
- *
- */
-
-#define _Region_Is_null( _the_region )   ( (_the_region) == NULL  )
-
-#endif
-/* end of include file */
diff --git a/cpukit/rtems/macros/rtems/rtems/sem.inl b/cpukit/rtems/macros/rtems/rtems/sem.inl
deleted file mode 100644
index 132422a30b..0000000000
--- a/cpukit/rtems/macros/rtems/rtems/sem.inl
+++ /dev/null
@@ -1,58 +0,0 @@
-/*  sem.inl
- *
- *  This file contains the macro implementation of the inlined
- *  routines from the Semaphore Manager.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __SEMAPHORE_inl
-#define __SEMAPHORE_inl
-
-/*PAGE
- *
- *  _Semaphore_Allocate
- *
- */
-
-#define _Semaphore_Allocate() \
-  (Semaphore_Control *) _Objects_Allocate( &_Semaphore_Information )
-
-/*PAGE
- *
- *  _Semaphore_Free
- *
- */
-
-#define _Semaphore_Free( _the_semaphore ) \
-  _Objects_Free( &_Semaphore_Information, &(_the_semaphore)->Object )
-
-/*PAGE
- *
- *  _Semaphore_Get
- *
- */
-
-#define _Semaphore_Get( _id, _location ) \
-  (Semaphore_Control *) \
-  _Objects_Get( &_Semaphore_Information, (_id), (_location) )
-
-/*PAGE
- *
- *  _Semaphore_Is_null
- *
- */
-
-#define _Semaphore_Is_null( _the_semaphore ) \
-  ( (_the_semaphore) == NULL )
-
-#endif
-/*  end of include file */
diff --git a/cpukit/rtems/macros/rtems/rtems/status.inl b/cpukit/rtems/macros/rtems/rtems/status.inl
deleted file mode 100644
index 6db9086df0..0000000000
--- a/cpukit/rtems/macros/rtems/rtems/status.inl
+++ /dev/null
@@ -1,39 +0,0 @@
-/*  macros/status.h
- *
- *  This include file contains the implementations of the inlined
- *  routines for the status package.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __MACROS_STATUS_h
-#define __MACROS_STATUS_h
-
-/*PAGE
- *
- *  rtems_is_status_successful
- *
- */
-
-#define rtems_is_status_successful( _code ) \
-  ( (_code) == RTEMS_SUCCESSFUL )
-
-/*PAGE
- *
- *  rtems_are_statuses_equal
- *
- */
-
-#define rtems_are_statuses_equal( _code1, _code2 ) \
-   ((_code1) == (_code2))
-
-#endif
-/* end of include file */
diff --git a/cpukit/rtems/macros/rtems/rtems/support.inl b/cpukit/rtems/macros/rtems/rtems/support.inl
deleted file mode 100644
index fc84a2e7ee..0000000000
--- a/cpukit/rtems/macros/rtems/rtems/support.inl
+++ /dev/null
@@ -1,44 +0,0 @@
-/*  support.inl
- *
- *  This include file contains the macros implementation of all
- *  of the inlined routines specific to the RTEMS API.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
- 
-#ifndef __RTEMS_SUPPORT_inl
-#define __RTEMS_SUPPORT_inl
-
-/*PAGE
- *
- *  rtems_is_name_valid
- *
- */
-
-#define rtems_is_name_valid( _name ) \
-  ( (_name) != 0 )
-
-/*PAGE
- *
- *  rtems_name_to_characters
- *
- */
-
-#define rtems_name_to_characters( _name, _c1, _c2, _c3, _c4 ) \
-  { \
-    (*(_c1) = ((_name) >> 24) & 0xff; \
-    (*(_c2) = ((_name) >> 16) & 0xff; \
-    (*(_c3) = ((_name) >> 8) & 0xff; \
-    (*(_c4) = ((_name)) & 0xff; \
-  }
-
-#endif
-/* end of include file */
diff --git a/cpukit/rtems/macros/rtems/rtems/tasks.inl b/cpukit/rtems/macros/rtems/rtems/tasks.inl
deleted file mode 100644
index a60d80d60c..0000000000
--- a/cpukit/rtems/macros/rtems/rtems/tasks.inl
+++ /dev/null
@@ -1,58 +0,0 @@
-/*  tasks.inl
- *
- *  This file contains the macro implementation of all inlined
- *  routines in the with RTEMS Tasks Manager.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_TASKS_inl
-#define __RTEMS_TASKS_inl
-
-/*PAGE
- *
- *  _RTEMS_tasks_Allocate
- *
- */
-
-#define _RTEMS_tasks_Allocate() \
-  (Thread_Control *) _Objects_Allocate( &_RTEMS_tasks_Information )
-
-/*PAGE
- *
- *  _RTEMS_tasks_Free
- *
- */
-
-#define _RTEMS_tasks_Free( _the_task ) \
-  _Objects_Free( &_RTEMS_tasks_Information, &(_the_task)->Object )
-
-/*PAGE
- *
- *  _RTEMS_tasks_Priority_to_Core
- */
- 
-#define _RTEMS_tasks_Priority_to_Core( _priority ) \
-  ((Priority_Control) (_priority))
-
-/*PAGE
- *
- *  _RTEMS_tasks_Priority_is_valid
- *
- */
- 
-#define _RTEMS_tasks_Priority_is_valid( _the_priority ) \
-  ( ((_the_priority) >= RTEMS_MINIMUM_PRIORITY) && \
-    ((_the_priority) <= RTEMS_MAXIMUM_PRIORITY) )
- 
-
-#endif
-/* end of include file */
diff --git a/cpukit/rtems/macros/rtems/rtems/timer.inl b/cpukit/rtems/macros/rtems/rtems/timer.inl
deleted file mode 100644
index 5dc329a203..0000000000
--- a/cpukit/rtems/macros/rtems/rtems/timer.inl
+++ /dev/null
@@ -1,85 +0,0 @@
-/*  timer.inl
- *
- *  This file contains the macro implementation of the inlined routines
- *  from the Timer Manager.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __TIMER_inl
-#define __TIMER_inl
-
-/*PAGE
- *
- *  _Timer_Allocate
- *
- */
-
-#define _Timer_Allocate() \
-  (Timer_Control *) _Objects_Allocate( &_Timer_Information )
-
-/*PAGE
- *
- *  _Timer_Free
- *
- */
-
-#define _Timer_Free( _the_timer ) \
-  _Objects_Free( &_Timer_Information, &(_the_timer)->Object )
-
-/*PAGE
- *
- *  _Timer_Get
- *
- */
-
-#define _Timer_Get( _id, _location ) \
-  (Timer_Control *) \
-    _Objects_Get( &_Timer_Information, (_id), (_location) )
-
-/*PAGE
- *
- *  _Timer_Is_interval_class
- *
- */
-
-#define _Timer_Is_interval_class( _the_class ) \
-  ( (_the_class) == TIMER_INTERVAL )
-
-/*PAGE
- *
- *  _Timer_Is_time_of_day_class
- *
- */
-
-#define _Timer_Is_time_of_day_class( _the_class ) \
-  ( (_the_class) == TIMER_TIME_OF_DAY )
-
-/*PAGE
- *
- *  _Timer_Is_dormant_class
- *
- */
-
-#define _Timer_Is_dormant_class( _the_class ) \
-  ( (_the_class) == TIMER_DORMANT )
-
-/*PAGE
- *
- *  _Timer_Is_null
- *
- */
-
-#define _Timer_Is_null( _the_timer ) \
-  ( (_the_timer) == NULL )
-
-#endif
-/* end of include file */
diff --git a/cpukit/rtems/src/attr.c b/cpukit/rtems/src/attr.c
deleted file mode 100644
index ea0f68be70..0000000000
--- a/cpukit/rtems/src/attr.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- *  Body for Attribute Routines
- *
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems/system.h>
-#include <rtems/rtems/tasks.h>
-#include <rtems/score/stack.h>
-#include <rtems/rtems/modes.h>
-
-rtems_unsigned32 rtems_minimum_stack_size = STACK_MINIMUM_SIZE;
-rtems_unsigned32 rtems_interrupt_mask = RTEMS_INTERRUPT_MASK;
-
-rtems_attribute rtems_interrupt_level_attribute(
-  unsigned32 level
-)
-{
-  return RTEMS_INTERRUPT_LEVEL(level);
-}
-
diff --git a/cpukit/rtems/src/dpmem.c b/cpukit/rtems/src/dpmem.c
deleted file mode 100644
index 9cc778df82..0000000000
--- a/cpukit/rtems/src/dpmem.c
+++ /dev/null
@@ -1,281 +0,0 @@
-/*
- *  Dual Port Memory Manager
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems/system.h>
-#include <rtems/rtems/status.h>
-#include <rtems/rtems/support.h>
-#include <rtems/score/address.h>
-#include <rtems/rtems/dpmem.h>
-#include <rtems/score/object.h>
-#include <rtems/score/thread.h>
-#include <rtems/rtems/dpmem.h>
-
-/*PAGE
- *
- *  _Dual_ported_memory_Manager_initialization
- *
- *  This routine initializes all dual-ported memory manager related
- *  data structures.
- *
- *  Input parameters:
- *    maximum_ports - number of ports to initialize
- *
- *  Output parameters:  NONE
- */
-
-void _Dual_ported_memory_Manager_initialization(
-  unsigned32 maximum_ports
-)
-{
-  _Objects_Initialize_information(
-    &_Dual_ported_memory_Information,
-    OBJECTS_RTEMS_PORTS,
-    FALSE,
-    maximum_ports,
-    sizeof( Dual_ported_memory_Control ),
-    FALSE,
-    RTEMS_MAXIMUM_NAME_LENGTH,
-    FALSE
-  );
-}
-
-/*PAGE
- *
- *  rtems_port_create
- *
- *  This directive creates a port into a dual-ported memory area.
- *
- *  Input parameters:
- *    name           - user defined port name
- *    internal_start - internal start address of port
- *    external_start - external start address of port
- *    length         - physical length in bytes
- *    id             - address of port id to set
- *
- *  Output parameters:
- *    id       - port id
- *    RTEMS_SUCCESSFUL - if successful
- *    error code - if unsuccessful
- */
-
-rtems_status_code rtems_port_create(
-  rtems_name    name,
-  void         *internal_start,
-  void         *external_start,
-  unsigned32    length,
-  Objects_Id   *id
-)
-{
-  register Dual_ported_memory_Control *the_port;
-
-  if ( !rtems_is_name_valid( name) )
-    return RTEMS_INVALID_NAME;
-
-  if ( !_Addresses_Is_aligned( internal_start ) ||
-       !_Addresses_Is_aligned( external_start ) )
-    return RTEMS_INVALID_ADDRESS;
-
-  _Thread_Disable_dispatch();             /* to prevent deletion */
-
-  the_port = _Dual_ported_memory_Allocate();
-
-  if ( !the_port ) {
-    _Thread_Enable_dispatch();
-    return RTEMS_TOO_MANY;
-  }
-
-  the_port->internal_base = internal_start;
-  the_port->external_base = external_start;
-  the_port->length        = length - 1;
-
-  _Objects_Open( 
-    &_Dual_ported_memory_Information,
-    &the_port->Object,
-    &name
-  );
-
-  *id = the_port->Object.id;
-  _Thread_Enable_dispatch();
-  return RTEMS_SUCCESSFUL;
-}
-
-/*PAGE
- *
- *  rtems_port_ident
- *
- *  This directive returns the system ID associated with
- *  the port name.
- *
- *  Input parameters:
- *    name - user defined port name
- *    id   - pointer to port id
- *
- *  Output parameters:
- *    *id      - port id
- *    RTEMS_SUCCESSFUL - if successful
- *    error code - if unsuccessful
- */
-
-rtems_status_code rtems_port_ident(
-  rtems_name    name,
-  Objects_Id   *id
-)
-{
-  Objects_Name_to_id_errors  status;
-
-  status = _Objects_Name_to_id(
-    &_Dual_ported_memory_Information,
-    &name,
-    OBJECTS_SEARCH_ALL_NODES,
-    id
-  );
-
-  return _Status_Object_name_errors_to_status[ status ];
-}
-
-/*PAGE
- *
- *  rtems_port_delete
- *
- *  This directive allows a thread to delete a dual-ported memory area
- *  specified by the dual-ported memory identifier.
- *
- *  Input parameters:
- *    id - dual-ported memory area id
- *
- *  Output parameters:
- *    RTEMS_SUCCESSFUL - if successful
- *    error code        - if unsuccessful
- */
-
-rtems_status_code rtems_port_delete(
-  Objects_Id id
-)
-{
-  register Dual_ported_memory_Control *the_port;
-  Objects_Locations                    location;
-
-  the_port = _Dual_ported_memory_Get( id, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-      return RTEMS_INVALID_ID;
-    case OBJECTS_REMOTE:        /* this error cannot be returned */
-      return RTEMS_INTERNAL_ERROR;
-    case OBJECTS_LOCAL:
-      _Objects_Close( &_Dual_ported_memory_Information, &the_port->Object );
-      _Dual_ported_memory_Free( the_port );
-      _Thread_Enable_dispatch();
-      return RTEMS_SUCCESSFUL;
-  }
-
-  return RTEMS_INTERNAL_ERROR;   /* unreached - only to remove warnings */
-}
-
-/*PAGE
- *
- *  rtems_port_internal_to_external
- *
- *  This directive converts an internal dual-ported memory address to an
- *  external dual-ported memory address.  If the given internal address
- *  is an invalid dual-ported address, then the external address is set
- *  to the given internal address.
- *
- *  Input parameters:
- *    id       - id of dual-ported memory object
- *    internal - internal address to set
- *    external - pointer to external address
- *
- *  Output parameters:
- *    external          - external address
- *    RTEMS_SUCCESSFUL - always succeeds
- */
-
-rtems_status_code rtems_port_internal_to_external(
-  Objects_Id   id,
-  void        *internal,
-  void       **external
-)
-{
-  register Dual_ported_memory_Control *the_port;
-  Objects_Locations                    location;
-  unsigned32                           ending;
-
-  the_port = _Dual_ported_memory_Get( id, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-      return RTEMS_INVALID_ID;
-    case OBJECTS_REMOTE:        /* this error cannot be returned */
-      return RTEMS_INTERNAL_ERROR;
-    case OBJECTS_LOCAL:
-      ending = _Addresses_Subtract( internal, the_port->internal_base );
-      if ( ending > the_port->length )
-        *external = internal;
-      else
-        *external = _Addresses_Add_offset( the_port->external_base,
-                                           ending );
-      _Thread_Enable_dispatch();
-      return RTEMS_SUCCESSFUL;
-  }
-
-  return RTEMS_INTERNAL_ERROR;   /* unreached - only to remove warnings */
-}
-
-/*PAGE
- *
- *  rtems_port_external_to_internal
- *
- *  This directive converts an external dual-ported memory address to an
- *  internal dual-ported memory address.  If the given external address
- *  is an invalid dual-ported address, then the internal address is set
- *  to the given external address.
- *
- *  Input parameters:
- *    id       - id of dp memory object
- *    external - external address
- *    internal - pointer of internal address to set
- *
- *  Output parameters:
- *    internal          - internal address
- *    RTEMS_SUCCESSFUL - always succeeds
- */
-
-rtems_status_code rtems_port_external_to_internal(
-  Objects_Id   id,
-  void        *external,
-  void       **internal
-)
-{
-  register Dual_ported_memory_Control *the_port;
-  Objects_Locations                    location;
-  unsigned32                           ending;
-
-  the_port = _Dual_ported_memory_Get( id, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-      return RTEMS_INVALID_ID;
-    case OBJECTS_REMOTE:        /* this error cannot be returned */
-      return RTEMS_INTERNAL_ERROR;
-    case OBJECTS_LOCAL:
-      ending = _Addresses_Subtract( external, the_port->external_base );
-      if ( ending > the_port->length )
-        *internal = external;
-      else
-        *internal = _Addresses_Add_offset( the_port->internal_base,
-                                           ending );
-      _Thread_Enable_dispatch();
-      return RTEMS_SUCCESSFUL;
-  }
-
-  return RTEMS_INTERNAL_ERROR;   /* unreached - only to remove warnings */
-}
diff --git a/cpukit/rtems/src/event.c b/cpukit/rtems/src/event.c
deleted file mode 100644
index a780ba7cf7..0000000000
--- a/cpukit/rtems/src/event.c
+++ /dev/null
@@ -1,383 +0,0 @@
-/*
- *  Event Manager
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems/system.h>
-#include <rtems/rtems/status.h>
-#include <rtems/rtems/event.h>
-#include <rtems/score/isr.h>
-#include <rtems/score/object.h>
-#include <rtems/rtems/options.h>
-#include <rtems/score/states.h>
-#include <rtems/score/thread.h>
-#include <rtems/rtems/tasks.h>
-
-/*PAGE
- *
- *  _Event_Manager_initialization
- *
- *  DESCRIPTION:
- *
- *  This routine performs the initialization necessary for this manager.
- */
- 
-void _Event_Manager_initialization( void )
-{
-  _Event_Sync_state = EVENT_SYNC_SYNCHRONIZED;
- 
-  /*
-   *  Register the MP Process Packet routine.
-   */
- 
-  _MPCI_Register_packet_processor( MP_PACKET_EVENT, _Event_MP_Process_packet );
-}
-
-/*PAGE
- *
- *  rtems_event_send
- *
- *  This directive allows a thread send an event set to another thread.
- *
- *  Input parameters:
- *    id    - thread id
- *    event - event set
- *
- *  Output parameters:
- *    RTEMS_SUCCESSFUL - if successful
- *    error code - if unsuccessful
- */
-
-rtems_status_code rtems_event_send(
-  Objects_Id         id,
-  rtems_event_set event_in
-)
-{
-  register Thread_Control *the_thread;
-  Objects_Locations        location;
-  RTEMS_API_Control       *api;
-
-  the_thread = _Thread_Get( id, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-      return RTEMS_INVALID_ID;
-    case OBJECTS_REMOTE:
-      return(
-        _Event_MP_Send_request_packet(
-          EVENT_MP_SEND_REQUEST,
-          id,
-          event_in
-        )
-      );
-    case OBJECTS_LOCAL:
-      api = the_thread->API_Extensions[ THREAD_API_RTEMS ];
-      _Event_sets_Post( event_in, &api->pending_events );
-      _Event_Surrender( the_thread );
-      _Thread_Enable_dispatch();
-      return RTEMS_SUCCESSFUL;
-  }
-
-  return RTEMS_INTERNAL_ERROR;   /* unreached - only to remove warnings */
-}
-
-/*PAGE
- *
- *  rtems_event_receive
- *
- *  This directive allows a thread to receive a set of events.
- *
- *  Input parameters:
- *    event_in   - input event condition
- *    option_set - options
- *    ticks      - number of ticks to wait (0 means wait forever)
- *    event_out  - pointer to output event set
- *
- *  Output parameters:
- *    event out         - event set
- *    RTEMS_SUCCESSFUL - if successful
- *    error code        - if unsuccessful
- */
-
-rtems_status_code rtems_event_receive(
-  rtems_event_set  event_in,
-  rtems_option     option_set,
-  rtems_interval   ticks,
-  rtems_event_set *event_out
-)
-{
-  RTEMS_API_Control       *api;
-
-  api = _Thread_Executing->API_Extensions[ THREAD_API_RTEMS ];
-
-  if ( _Event_sets_Is_empty( event_in ) ) {
-    *event_out = api->pending_events;
-    return RTEMS_SUCCESSFUL;
-  }
-
-  _Thread_Disable_dispatch();
-  _Event_Seize( event_in, option_set, ticks, event_out );
-  _Thread_Enable_dispatch();
-  return( _Thread_Executing->Wait.return_code );
-}
-
-
-/*PAGE
- *
- *  _Event_Seize
- *
- *  This routine attempts to satisfy the requested event condition
- *  for the running thread.
- *
- *  Input parameters:
- *    event_in   - the event condition to satisfy
- *    option_set - acquire event options
- *    ticks      - interval to wait
- *    event_out  - pointer to event set output area
- *
- *  Output parameters: NONE
- *    *event_out - event set output area filled in
- *
- *  INTERRUPT LATENCY:
- *    available
- *    wait
- *    check sync
- */
-
-void _Event_Seize(
-  rtems_event_set  event_in,
-  rtems_option     option_set,
-  rtems_interval   ticks,
-  rtems_event_set *event_out
-)
-{
-  Thread_Control    *executing;
-  rtems_event_set    seized_events;
-  rtems_event_set    pending_events;
-  ISR_Level          level;
-  RTEMS_API_Control  *api;
-  Event_Sync_states   sync_state;
-
-  executing = _Thread_Executing;
-  executing->Wait.return_code = RTEMS_SUCCESSFUL;
-
-  api = executing->API_Extensions[ THREAD_API_RTEMS ];
-
-  _ISR_Disable( level );
-  pending_events = api->pending_events;
-  seized_events  = _Event_sets_Get( pending_events, event_in );
-
-  if ( !_Event_sets_Is_empty( seized_events ) &&
-       (seized_events == event_in || _Options_Is_any( option_set )) ) {
-    api->pending_events =
-      _Event_sets_Clear( pending_events, seized_events );
-    _ISR_Enable( level );
-    *event_out = seized_events;
-    return;
-  }
-
-  if ( _Options_Is_no_wait( option_set ) ) {
-    _ISR_Enable( level );
-    executing->Wait.return_code = RTEMS_UNSATISFIED;
-    *event_out = seized_events;
-    return;
-  }
-
-  _Event_Sync_state = EVENT_SYNC_NOTHING_HAPPENED;
-
-  executing->Wait.option            = (unsigned32) option_set;
-  executing->Wait.count             = (unsigned32) event_in;
-  executing->Wait.return_argument   = event_out;
-
-  _ISR_Enable( level );
-
-  if ( ticks ) {
-    _Watchdog_Initialize(
-      &executing->Timer,
-      _Event_Timeout,
-      executing->Object.id,
-      NULL
-    );
-    _Watchdog_Insert_ticks( &executing->Timer, ticks );
-  }
-
-  _Thread_Set_state( executing, STATES_WAITING_FOR_EVENT );
-
-  _ISR_Disable( level );
-
-  sync_state = _Event_Sync_state;
-  _Event_Sync_state = EVENT_SYNC_SYNCHRONIZED;
-
-  switch ( sync_state ) {
-    case EVENT_SYNC_SYNCHRONIZED:
-      /*
-       *  This cannot happen.  It indicates that this routine did not
-       *  enter the synchronization states above.
-       */
-      return;
-
-    case EVENT_SYNC_NOTHING_HAPPENED:
-      _ISR_Enable( level );
-      return;
-
-    case EVENT_SYNC_TIMEOUT:
-      executing->Wait.return_code = RTEMS_TIMEOUT;
-      _ISR_Enable( level );
-      _Thread_Unblock( executing );
-      return;
-
-    case EVENT_SYNC_SATISFIED:
-      if ( _Watchdog_Is_active( &executing->Timer ) ) {
-        _Watchdog_Deactivate( &executing->Timer );
-        _ISR_Enable( level );
-        (void) _Watchdog_Remove( &executing->Timer );
-      } else
-        _ISR_Enable( level );
-      _Thread_Unblock( executing );
-      return;
-  }
-}
-
-/*PAGE
- *
- *  _Event_Surrender
- *
- *  This routines remove a thread from the specified threadq.
- *
- *  Input parameters:
- *    the_thread - pointer to thread to be dequeued
- *
- *  Output parameters: NONE
- *
- *  INTERRUPT LATENCY:
- *    before flash
- *    after flash
- *    check sync
- */
-
-void _Event_Surrender(
-  Thread_Control *the_thread
-)
-{
-  ISR_Level           level;
-  rtems_event_set     pending_events;
-  rtems_event_set     event_condition;
-  rtems_event_set     seized_events;
-  rtems_option        option_set;
-  RTEMS_API_Control  *api;
-
-  api = the_thread->API_Extensions[ THREAD_API_RTEMS ];
-
-  option_set = (rtems_option) the_thread->Wait.option;
-
-  _ISR_Disable( level );
-  pending_events  = api->pending_events;
-  event_condition = (rtems_event_set) the_thread->Wait.count;
-
-  seized_events = _Event_sets_Get( pending_events, event_condition );
-
-  if ( !_Event_sets_Is_empty( seized_events ) ) {
-    if ( _States_Is_waiting_for_event( the_thread->current_state ) ) {
-      if ( seized_events == event_condition || _Options_Is_any( option_set ) ) {
-        api->pending_events =
-           _Event_sets_Clear( pending_events, seized_events );
-        *(rtems_event_set *)the_thread->Wait.return_argument = seized_events;
-
-        _ISR_Flash( level );
-
-        if ( !_Watchdog_Is_active( &the_thread->Timer ) ) {
-          _ISR_Enable( level );
-          _Thread_Unblock( the_thread );
-        }
-        else {
-          _Watchdog_Deactivate( &the_thread->Timer );
-          _ISR_Enable( level );
-          (void) _Watchdog_Remove( &the_thread->Timer );
-          _Thread_Unblock( the_thread );
-        }
-        return;
-      }
-    }
-
-    switch ( _Event_Sync_state ) {
-      case EVENT_SYNC_SYNCHRONIZED:
-      case EVENT_SYNC_SATISFIED:
-        break;
- 
-      case EVENT_SYNC_NOTHING_HAPPENED:
-      case EVENT_SYNC_TIMEOUT:
-        if ( !_Thread_Is_executing( the_thread ) )
-          break;
-
-        if ( seized_events == event_condition || _Options_Is_any(option_set) ) {
-          api->pending_events = 
-               _Event_sets_Clear( pending_events,seized_events );
-          *(rtems_event_set *)the_thread->Wait.return_argument = seized_events;
-          _Event_Sync_state = EVENT_SYNC_SATISFIED;
-        }
-        break;
-    }
-  }
-  _ISR_Enable( level );
-}
-
-/*PAGE
- *
- *  _Event_Timeout
- *
- *  This routine processes a thread which timeouts while waiting to
- *  receive an event_set. It is called by the watchdog handler.
- *
- *  Input parameters:
- *    id - thread id
- *
- *  Output parameters: NONE
- */
-
-void _Event_Timeout(
-  Objects_Id  id,
-  void       *ignored
-)
-{
-  Thread_Control *the_thread;
-  Objects_Locations      location;
-
-  the_thread = _Thread_Get( id, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-    case OBJECTS_REMOTE:  /* impossible */
-      break;
-    case OBJECTS_LOCAL:
- 
-      /*
-       *  If the event manager is not synchronized, then it is either
-       *  "nothing happened", "timeout", or "satisfied".   If the_thread
-       *  is the executing thread, then it is in the process of blocking
-       *  and it is the thread which is responsible for the synchronization 
-       *  process.
-       *
-       *  If it is not satisfied, then it is "nothing happened" and
-       *  this is the "timeout" transition.  After a request is satisfied,
-       *  a timeout is not allowed to occur.
-       */
-
-      if ( _Event_Sync_state != EVENT_SYNC_SYNCHRONIZED && 
-           _Thread_Is_executing( the_thread ) ) {
-        if ( _Event_Sync_state != EVENT_SYNC_SATISFIED )
-          _Event_Sync_state = EVENT_SYNC_TIMEOUT;
-      } else {
-        the_thread->Wait.return_code = RTEMS_TIMEOUT;
-        _Thread_Unblock( the_thread );
-      }
-      _Thread_Unnest_dispatch();
-      break;
-  }
-}
diff --git a/cpukit/rtems/src/eventmp.c b/cpukit/rtems/src/eventmp.c
deleted file mode 100644
index 4a561e69a2..0000000000
--- a/cpukit/rtems/src/eventmp.c
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- *  Multiprocessing Support for the Event Manager
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems/system.h>
-#include <rtems/rtems/status.h>
-#include <rtems/rtems/event.h>
-#include <rtems/score/mpci.h>
-#include <rtems/score/mppkt.h>
-#include <rtems/score/object.h>
-#include <rtems/rtems/options.h>
-#include <rtems/score/states.h>
-#include <rtems/score/thread.h>
-#include <rtems/rtems/support.h>
-
-/*PAGE
- *
- *  _Event_MP_Send_process_packet
- *
- *  This subprogram is not needed since there are no process
- *  packets to be sent by this manager.
- *
- */
-
-/*PAGE
- *
- *  _Event_MP_Send_request_packet
- *
- */
-
-rtems_status_code _Event_MP_Send_request_packet (
-  Event_MP_Remote_operations operation,
-  Objects_Id                 event_id,
-  rtems_event_set         event_in
-)
-{
-  Event_MP_Packet *the_packet;
-
-  switch ( operation ) {
-
-    case EVENT_MP_SEND_REQUEST:
-
-      the_packet                    = _Event_MP_Get_packet();
-      the_packet->Prefix.the_class  = MP_PACKET_EVENT;
-      the_packet->Prefix.length     = sizeof ( Event_MP_Packet );
-      the_packet->Prefix.to_convert = sizeof ( Event_MP_Packet );
-      the_packet->operation         = operation;
-      the_packet->Prefix.id         = event_id;
-      the_packet->event_in          = event_in;
-
-      return (rtems_status_code)
-        _MPCI_Send_request_packet(
-          rtems_get_node( event_id ),
-          &the_packet->Prefix,
-          STATES_READY
-        );
-
-      break;
-
-    case EVENT_MP_SEND_RESPONSE:
-      break;
-
-  }
-  /*
-   *  The following line is included to satisfy compilers which
-   *  produce warnings when a function does not end with a return.
-   */
-  return RTEMS_SUCCESSFUL;
-}
-
-/*PAGE
- *
- *  _Event_MP_Send_response_packet
- *
- */
-
-void _Event_MP_Send_response_packet (
-  Event_MP_Remote_operations  operation,
-  Thread_Control             *the_thread
-)
-{
-  Event_MP_Packet *the_packet;
-
-  switch ( operation ) {
-
-    case EVENT_MP_SEND_RESPONSE:
-
-      the_packet = ( Event_MP_Packet *) the_thread->receive_packet;
-
-/*
- *  The packet being returned already contains the class, length, and
- *  to_convert fields, therefore they are not set in this routine.
- */
-      the_packet->operation = operation;
-      the_packet->Prefix.id = the_packet->Prefix.source_tid;
-
-      _MPCI_Send_response_packet(
-        rtems_get_node( the_packet->Prefix.source_tid ),
-        &the_packet->Prefix
-      );
-      break;
-
-    case EVENT_MP_SEND_REQUEST:
-      break;
-
-  }
-}
-
-/*PAGE
- *
- *
- *  _Event_MP_Process_packet
- *
- */
-
-void _Event_MP_Process_packet (
-  rtems_packet_prefix  *the_packet_prefix
-)
-{
-  Event_MP_Packet *the_packet;
-  Thread_Control  *the_thread;
-
-  the_packet = (Event_MP_Packet *) the_packet_prefix;
-
-  switch ( the_packet->operation ) {
-
-    case EVENT_MP_SEND_REQUEST:
-
-      the_packet->Prefix.return_code = rtems_event_send(
-        the_packet->Prefix.id,
-        the_packet->event_in
-      );
-
-      _Event_MP_Send_response_packet(
-        EVENT_MP_SEND_RESPONSE,
-        _Thread_Executing
-      );
-      break;
-
-    case EVENT_MP_SEND_RESPONSE:
-
-      the_thread = _MPCI_Process_response( the_packet_prefix );
-
-      _MPCI_Return_packet( the_packet_prefix );
-
-      break;
-
-  }
-}
-
-/*PAGE
- *
- *  _Event_MP_Send_object_was_deleted
- *
- *  This subprogram is not needed since there are no objects
- *  deleted by this manager.
- *
- */
-
-/*PAGE
- *
- *  _Event_MP_Send_extract_proxy
- *
- *  This subprogram is not needed since there are no objects
- *  deleted by this manager.
- *
- */
-
-/*PAGE
- *
- *  _Event_MP_Get_packet
- *
- */
-
-Event_MP_Packet *_Event_MP_Get_packet ( void )
-{
-  return ( (Event_MP_Packet *) _MPCI_Get_packet() );
-}
-
-/* end of file */
diff --git a/cpukit/rtems/src/intr.c b/cpukit/rtems/src/intr.c
deleted file mode 100644
index 45dce11bdd..0000000000
--- a/cpukit/rtems/src/intr.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- *  Interrupt Manager
- *
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems/system.h>
-#include <rtems/rtems/status.h>
-#include <rtems/score/isr.h>
-#include <rtems/rtems/intr.h>
-
-/*  _Interrupt_Manager_initialization
- *
- *  This routine initializes the interrupt manager.
- *
- *  Input parameters: NONE
- *
- *  Output parameters: NONE
- */
-
-void _Interrupt_Manager_initialization( void )
-{
-}
-
-/*  rtems_interrupt_catch
- *
- *  This directive allows a thread to specify what action to take when
- *  catching signals.
- *
- *  Input parameters:
- *    new_isr_handler - address of interrupt service routine (isr)
- *    vector          - interrupt vector number
- *    old_isr_handler - address at which to store previous ISR address
- *
- *  Output parameters:
- *    RTEMS_SUCCESSFUL - always succeeds
- *    *old_isr_handler  - previous ISR address
- */
-
-rtems_status_code rtems_interrupt_catch(
-  rtems_isr_entry      new_isr_handler,
-  rtems_vector_number  vector,
-  rtems_isr_entry     *old_isr_handler
-)
-{
-  if ( !_ISR_Is_vector_number_valid( vector ) )
-    return RTEMS_INVALID_NUMBER;
-
-  if ( !_ISR_Is_valid_user_handler( (void *) new_isr_handler ) )
-    return RTEMS_INVALID_ADDRESS;
-
-  if ( !_ISR_Is_valid_user_handler( (void *) old_isr_handler ) )
-    return RTEMS_INVALID_ADDRESS;
-
-  _ISR_Install_vector(
-    vector, (proc_ptr)new_isr_handler, (proc_ptr *)old_isr_handler );
-
-  return RTEMS_SUCCESSFUL;
-}
diff --git a/cpukit/rtems/src/intrbody.c b/cpukit/rtems/src/intrbody.c
deleted file mode 100644
index d72e21281d..0000000000
--- a/cpukit/rtems/src/intrbody.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- *  Bodies for Inlined Interrupt Manager Routines
- *
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems/system.h>
-#include <rtems/rtems/status.h>
-#include <rtems/score/isr.h>
-#include <rtems/rtems/intr.h>
-
-/*
- *  Real body for rtems_interrupt_disable
- */
-
-#undef rtems_interrupt_disable
-
-rtems_interrupt_level rtems_interrupt_disable( void )
-{
-  rtems_interrupt_level previous_level;
-
-  _ISR_Disable( previous_level );
-
-  return previous_level;
-}
-
-/*
- *  Real body for rtems_interrupt_enable
- */
-
-#undef rtems_interrupt_enable
-
-void rtems_interrupt_enable(
-  rtems_interrupt_level previous_level
-)
-{
-  _ISR_Enable( previous_level );
-}
-
-/*
- *  Real body for rtems_interrupt_flash
- */
-
-#undef rtems_interrupt_flash
-
-void rtems_interrupt_flash(
-  rtems_interrupt_level previous_level
-)
-{
-  _ISR_Flash( previous_level );
-}
-
-/*
- *  Real body for rtems_interrupt_is_in_progress
- */
-
-#undef rtems_interrupt_is_in_progress
-
-boolean rtems_interrupt_is_in_progress( void )
-{
-  return _ISR_Is_in_progress();
-}
diff --git a/cpukit/rtems/src/mp.c b/cpukit/rtems/src/mp.c
deleted file mode 100644
index 7d9f93c51c..0000000000
--- a/cpukit/rtems/src/mp.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *  Multiprocessing Manager
- *
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems/system.h>
-#include <rtems/rtems/status.h>
-#include <rtems/rtems/mp.h>
-#include <rtems/score/mpci.h>
-
-/*PAGE
- *
- *  _Multiprocessing_Manager_initialization
- *
- */
-
-void _Multiprocessing_Manager_initialization ( void )
-{
-}
-
-/*PAGE
- *
- *  rtems_multiprocessing_announce
- *
- */
-
-void rtems_multiprocessing_announce ( void )
-{
-  _MPCI_Announce();
-}
-
-/* end of file */
diff --git a/cpukit/rtems/src/msg.c b/cpukit/rtems/src/msg.c
deleted file mode 100644
index f49e1cac21..0000000000
--- a/cpukit/rtems/src/msg.c
+++ /dev/null
@@ -1,764 +0,0 @@
-/*
- *  Message Queue Manager
- *
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems/system.h>
-#include <rtems/score/sysstate.h>
-#include <rtems/score/chain.h>
-#include <rtems/score/isr.h>
-#include <rtems/score/coremsg.h>
-#include <rtems/score/object.h>
-#include <rtems/score/states.h>
-#include <rtems/score/thread.h>
-#include <rtems/score/wkspace.h>
-#include <rtems/score/mpci.h>
-#include <rtems/rtems/status.h>
-#include <rtems/rtems/attr.h>
-#include <rtems/rtems/message.h>
-#include <rtems/rtems/options.h>
-#include <rtems/rtems/support.h>
-
-/*PAGE
- *
- *  _Message_queue_Manager_initialization
- *
- *  This routine initializes all message queue manager related
- *  data structures.
- *
- *  Input parameters:
- *    maximum_message_queues - number of message queues to initialize
- *
- *  Output parameters:  NONE
- */
-
-void _Message_queue_Manager_initialization(
-  unsigned32 maximum_message_queues
-)
-{
-  _Objects_Initialize_information(
-    &_Message_queue_Information,
-    OBJECTS_RTEMS_MESSAGE_QUEUES,
-    TRUE,
-    maximum_message_queues,
-    sizeof( Message_queue_Control ),
-    FALSE,
-    RTEMS_MAXIMUM_NAME_LENGTH,
-    FALSE
-  );
-
-  /*
-   *  Register the MP Process Packet routine.
-   */
-
-  _MPCI_Register_packet_processor(
-    MP_PACKET_MESSAGE_QUEUE,
-    _Message_queue_MP_Process_packet
-  );
-
-}
-
-/*PAGE
- *
- *  _Message_queue_Allocate
- *
- *  Allocate a message queue and the space for its messages
- * 
- *  Input parameters:
- *    the_message_queue - the message queue to allocate message buffers
- *    count             - maximum message and reserved buffer count
- *    max_message_size  - maximum size of each message
- *
- *  Output parameters:
- *    the_message_queue - set if successful, NULL otherwise
- */
-
-Message_queue_Control *_Message_queue_Allocate (
-  unsigned32           count,
-  unsigned32           max_message_size
-)
-{
-  return 
-    (Message_queue_Control *)_Objects_Allocate(&_Message_queue_Information);
-
-}
-
-/*PAGE
- *
- *  rtems_message_queue_create
- *
- *  This directive creates a message queue by allocating and initializing
- *  a message queue data structure.
- *
- *  Input parameters:
- *    name             - user defined queue name
- *    count            - maximum message and reserved buffer count
- *    max_message_size - maximum size of each message
- *    attribute_set    - process method
- *    id               - pointer to queue
- *
- *  Output parameters:
- *    id                - queue id
- *    RTEMS_SUCCESSFUL  - if successful
- *    error code        - if unsuccessful
- */
-
-rtems_status_code rtems_message_queue_create(
-  rtems_name          name,
-  unsigned32          count,
-  unsigned32          max_message_size,
-  rtems_attribute     attribute_set,
-  Objects_Id         *id
-)
-{
-  register Message_queue_Control *the_message_queue;
-  CORE_message_queue_Attributes   the_message_queue_attributes;
-  boolean                         is_global;
-
-  if ( !rtems_is_name_valid( name ) )
-    return RTEMS_INVALID_NAME;
-
-  if ( (is_global = _Attributes_Is_global( attribute_set ) ) && 
-       !_System_state_Is_multiprocessing )
-    return RTEMS_MP_NOT_CONFIGURED;
-
-  if (count == 0)
-      return RTEMS_INVALID_NUMBER;
-
-  if (max_message_size == 0)
-      return RTEMS_INVALID_SIZE;
-
-#if 1
-  /*
-   * I am not 100% sure this should be an error.
-   * It seems reasonable to create a que with a large max size,
-   * and then just send smaller msgs from remote (or all) nodes.
-   */
-  
-  if ( is_global && (_MPCI_table->maximum_packet_size < max_message_size) )
-    return RTEMS_INVALID_SIZE;
-
-#endif
-       
-  _Thread_Disable_dispatch();              /* protects object pointer */
-
-  the_message_queue = _Message_queue_Allocate( count, max_message_size );
-
-  if ( !the_message_queue ) {
-    _Thread_Enable_dispatch();
-    return RTEMS_TOO_MANY;
-  }
-
-  if ( is_global &&
-    !( _Objects_MP_Allocate_and_open( &_Message_queue_Information,
-                              name, the_message_queue->Object.id, FALSE ) ) ) {
-    _Message_queue_Free( the_message_queue );
-    _Thread_Enable_dispatch();
-    return RTEMS_TOO_MANY;
-  }
-
-  the_message_queue->attribute_set = attribute_set;
-
-  if (_Attributes_Is_priority( attribute_set ) )
-    the_message_queue_attributes.discipline = 
-                                      CORE_MESSAGE_QUEUE_DISCIPLINES_PRIORITY;
-  else
-    the_message_queue_attributes.discipline =
-                                      CORE_MESSAGE_QUEUE_DISCIPLINES_FIFO;
-
-  if ( ! _CORE_message_queue_Initialize(
-           &the_message_queue->message_queue,
-           OBJECTS_RTEMS_MESSAGE_QUEUES,
-           &the_message_queue_attributes,
-           count,
-           max_message_size,
-           _Message_queue_MP_Send_extract_proxy ) ) {
-    if ( is_global )
-        _Objects_MP_Close(
-          &_Message_queue_Information, the_message_queue->Object.id);
-
-    _Message_queue_Free( the_message_queue );
-    _Thread_Enable_dispatch();
-    return RTEMS_TOO_MANY;
-  }
-
-  _Objects_Open(
-    &_Message_queue_Information,
-    &the_message_queue->Object,
-    &name
-  );
-
-  *id = the_message_queue->Object.id;
-
-  if ( is_global )
-    _Message_queue_MP_Send_process_packet(
-      MESSAGE_QUEUE_MP_ANNOUNCE_CREATE,
-      the_message_queue->Object.id,
-      name,
-      0
-    );
-
-  _Thread_Enable_dispatch();
-  return RTEMS_SUCCESSFUL;
-}
-
-/*PAGE
- *
- *  rtems_message_queue_ident
- *
- *  This directive returns the system ID associated with
- *  the message queue name.
- *
- *  Input parameters:
- *    name - user defined message queue name
- *    node - node(s) to be searched
- *    id   - pointer to message queue id
- *
- *  Output parameters:
- *    *id               - message queue id
- *    RTEMS_SUCCESSFUL - if successful
- *    error code        - if unsuccessful
- */
-
-rtems_status_code rtems_message_queue_ident(
-  rtems_name    name,
-  unsigned32    node,
-  Objects_Id   *id
-)
-{
-  Objects_Name_to_id_errors  status;
-
-  status = _Objects_Name_to_id(
-    &_Message_queue_Information,
-    &name,
-    node,
-    id 
-  );
-
-  return _Status_Object_name_errors_to_status[ status ];
-}
-
-/*PAGE
- *
- *  rtems_message_queue_delete
- *
- *  This directive allows a thread to delete the message queue specified
- *  by the given queue identifier.
- *
- *  Input parameters:
- *    id - queue id
- *
- *  Output parameters:
- *    RTEMS_SUCCESSFUL - if successful
- *    error code        - if unsuccessful
- */
-
-rtems_status_code rtems_message_queue_delete(
-  Objects_Id id
-)
-{
-  register Message_queue_Control *the_message_queue;
-  Objects_Locations               location;
-
-  the_message_queue = _Message_queue_Get( id, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-      return RTEMS_INVALID_ID;
-    case OBJECTS_REMOTE:
-      _Thread_Dispatch();
-      return RTEMS_ILLEGAL_ON_REMOTE_OBJECT;
-    case OBJECTS_LOCAL:
-      _Objects_Close( &_Message_queue_Information,
-                      &the_message_queue->Object );
-
-      _CORE_message_queue_Close(
-        &the_message_queue->message_queue,
-        _Message_queue_MP_Send_object_was_deleted,
-        CORE_MESSAGE_QUEUE_STATUS_WAS_DELETED
-      );
-
-      _Message_queue_Free( the_message_queue );
-
-      if ( _Attributes_Is_global( the_message_queue->attribute_set ) ) {
-        _Objects_MP_Close(
-          &_Message_queue_Information,
-          the_message_queue->Object.id
-        );
-
-        _Message_queue_MP_Send_process_packet(
-          MESSAGE_QUEUE_MP_ANNOUNCE_DELETE,
-          the_message_queue->Object.id,
-          0,                                 /* Not used */
-          0
-        );
-      }
-
-      _Thread_Enable_dispatch();
-      return RTEMS_SUCCESSFUL;
-  }
-
-  return RTEMS_INTERNAL_ERROR;   /* unreached - only to remove warnings */
-}
-
-/*PAGE
- *
- *  rtems_message_queue_send
- *
- *  This routine implements the directives q_send.  It sends a
- *  message to the specified message queue.
- *
- *  Input parameters:
- *    id     - pointer to message queue
- *    buffer - pointer to message buffer
- *    size   - size of message to sent urgently
- *
- *  Output parameters:
- *    RTEMS_SUCCESSFUL - if successful
- *    error code        - if unsuccessful
- */
-
-rtems_status_code rtems_message_queue_send(
-  Objects_Id            id,
-  void                 *buffer,
-  unsigned32            size
-)
-{
-  return( _Message_queue_Submit(id, buffer, size, MESSAGE_QUEUE_SEND_REQUEST) );
-}
-
-/*PAGE
- *
- *  rtems_message_queue_urgent
- *
- *  This routine implements the directives q_urgent.  It urgents a
- *  message to the specified message queue.
- *
- *  Input parameters:
- *    id     - pointer to message queue
- *    buffer - pointer to message buffer
- *    size   - size of message to sent urgently
- *
- *  Output parameters:
- *    RTEMS_SUCCESSFUL - if successful
- *    error code       - if unsuccessful
- */
-
-rtems_status_code rtems_message_queue_urgent(
-  Objects_Id            id,
-  void                 *buffer,
-  unsigned32            size
-)
-{
-  return(_Message_queue_Submit(id, buffer, size, MESSAGE_QUEUE_URGENT_REQUEST));
-}
-
-/*PAGE
- *
- *  rtems_message_queue_broadcast
- *
- *  This directive sends a message for every thread waiting on the queue
- *  designated by id.
- *
- *  Input parameters:
- *    id     - pointer to message queue
- *    buffer - pointer to message buffer
- *    size   - size of message to broadcast
- *    count  - pointer to area to store number of threads made ready
- *
- *  Output parameters:
- *    count             - number of threads made ready
- *    RTEMS_SUCCESSFUL  - if successful
- *    error code        - if unsuccessful
- */
-
-rtems_status_code rtems_message_queue_broadcast(
-  Objects_Id            id,
-  void                 *buffer,
-  unsigned32            size,
-  unsigned32           *count
-)
-{
-  register Message_queue_Control *the_message_queue;
-  Objects_Locations               location;
-  CORE_message_queue_Status       core_status;
-
-  the_message_queue = _Message_queue_Get( id, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-      return RTEMS_INVALID_ID;
-    case OBJECTS_REMOTE:
-      _Thread_Executing->Wait.return_argument = count;
-
-      return
-        _Message_queue_MP_Send_request_packet(
-          MESSAGE_QUEUE_MP_BROADCAST_REQUEST,
-          id,
-          buffer,
-          &size,
-          0,                               /* option_set not used */
-          MPCI_DEFAULT_TIMEOUT
-        );
-
-    case OBJECTS_LOCAL:
-      core_status = _CORE_message_queue_Broadcast(
-                      &the_message_queue->message_queue,
-                      buffer,
-                      size,
-                      id,
-                      _Message_queue_Core_message_queue_mp_support,
-                      count
-                    );
-                      
-      _Thread_Enable_dispatch();
-      return 
-        _Message_queue_Translate_core_message_queue_return_code( core_status );
-
-  }
-  return RTEMS_INTERNAL_ERROR;   /* unreached - only to remove warnings */
-}
-
-/*PAGE
- *
- *  rtems_message_queue_receive
- *
- *  This directive dequeues a message from the designated message queue
- *  and copies it into the requesting thread's buffer.
- *
- *  Input parameters:
- *    id         - queue id
- *    buffer     - pointer to message buffer
- *    size       - size of message receive
- *    option_set - options on receive
- *    timeout    - number of ticks to wait
- *
- *  Output parameters:
- *    RTEMS_SUCCESSFUL - if successful
- *    error code       - if unsuccessful
- */
-
-rtems_status_code rtems_message_queue_receive(
-  Objects_Id            id,
-  void                 *buffer,
-  unsigned32           *size,
-  unsigned32            option_set,
-  rtems_interval        timeout
-)
-{
-  register Message_queue_Control *the_message_queue;
-  Objects_Locations               location;
-  boolean                         wait;
-
-  the_message_queue = _Message_queue_Get( id, &location );
-  switch ( location ) {
-
-    case OBJECTS_ERROR:
-      return RTEMS_INVALID_ID;
-
-    case OBJECTS_REMOTE:
-      return _Message_queue_MP_Send_request_packet(
-          MESSAGE_QUEUE_MP_RECEIVE_REQUEST,
-          id,
-          buffer,
-          size,
-          option_set,
-          timeout
-        );
-
-    case OBJECTS_LOCAL:
-      if ( _Options_Is_no_wait( option_set ) )
-        wait = FALSE;
-      else
-        wait = TRUE;
- 
-      _CORE_message_queue_Seize(
-        &the_message_queue->message_queue,
-        the_message_queue->Object.id,
-        buffer,
-        size,
-        wait,
-        timeout
-      );
-      _Thread_Enable_dispatch();
-      return( _Message_queue_Translate_core_message_queue_return_code(
-                  _Thread_Executing->Wait.return_code ) );
-
-  }
-
-  return RTEMS_INTERNAL_ERROR;   /* unreached - only to remove warnings */
-}
-
-/*PAGE
- *
- *  rtems_message_queue_flush
- *
- *  This directive removes all pending messages from a queue and returns
- *  the number of messages removed.  If no messages were present then
- *  a count of zero is returned.
- *
- *  Input parameters:
- *    id    - queue id
- *    count - return area for count
- *
- *  Output parameters:
- *    count             - number of messages removed ( 0 = empty queue )
- *    RTEMS_SUCCESSFUL - if successful
- *    error code        - if unsuccessful
- */
-
-rtems_status_code rtems_message_queue_flush(
-  Objects_Id  id,
-  unsigned32 *count
-)
-{
-  register Message_queue_Control *the_message_queue;
-  Objects_Locations               location;
-
-  the_message_queue = _Message_queue_Get( id, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-      return RTEMS_INVALID_ID;
-    case OBJECTS_REMOTE:
-      _Thread_Executing->Wait.return_argument = count;
-
-      return
-        _Message_queue_MP_Send_request_packet(
-          MESSAGE_QUEUE_MP_FLUSH_REQUEST,
-          id,
-          0,                               /* buffer not used */
-          0,                               /* size */
-          0,                               /* option_set not used */
-          MPCI_DEFAULT_TIMEOUT
-        );
-
-    case OBJECTS_LOCAL:
-      *count = _CORE_message_queue_Flush( &the_message_queue->message_queue );
-      _Thread_Enable_dispatch();
-      return RTEMS_SUCCESSFUL;
-  }
-
-  return RTEMS_INTERNAL_ERROR;   /* unreached - only to remove warnings */
-}
-
-/*PAGE
- *
- *  rtems_message_queue_get_number_pending
- *
- *  This directive returns the number of messages pending.
- *
- *  Input parameters:
- *    id    - queue id
- *    count - return area for count
- *
- *  Output parameters:
- *    count             - number of messages removed ( 0 = empty queue )
- *    RTEMS_SUCCESSFUL - if successful
- *    error code        - if unsuccessful
- */
-
-rtems_status_code rtems_message_queue_get_number_pending(
-  Objects_Id  id,
-  unsigned32 *count
-)
-{
-  register Message_queue_Control *the_message_queue;
-  Objects_Locations               location;
-
-  the_message_queue = _Message_queue_Get( id, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-      return RTEMS_INVALID_ID;
-    case OBJECTS_REMOTE:
-      _Thread_Executing->Wait.return_argument = count;
-
-      return
-        _Message_queue_MP_Send_request_packet(
-          MESSAGE_QUEUE_MP_GET_NUMBER_PENDING_REQUEST,
-          id,
-          0,                               /* buffer not used */
-          0,                               /* size */
-          0,                               /* option_set not used */
-          MPCI_DEFAULT_TIMEOUT
-        );
-
-    case OBJECTS_LOCAL:
-      *count = the_message_queue->message_queue.number_of_pending_messages;
-      _Thread_Enable_dispatch();
-      return RTEMS_SUCCESSFUL;
-  }
-
-  return RTEMS_INTERNAL_ERROR;   /* unreached - only to remove warnings */
-}
-
-/*PAGE
- *
- *  _Message_queue_Submit
- *
- *  This routine implements the directives rtems_message_queue_send
- *  and rtems_message_queue_urgent.  It processes a message that is
- *  to be submitted to the designated message queue.  The message will
- *  either be processed as a send send message which it will be inserted
- *  at the rear of the queue or it will be processed as an urgent message
- *  which will be inserted at the front of the queue.
- *
- *  Input parameters:
- *    id          - pointer to message queue
- *    buffer      - pointer to message buffer
- *    size        - size in bytes of message to send
- *    submit_type - send or urgent message
- *
- *  Output parameters:
- *    RTEMS_SUCCESSFUL - if successful
- *    error code       - if unsuccessful
- */
-
-rtems_status_code _Message_queue_Submit(
-  Objects_Id                  id,
-  void                       *buffer,
-  unsigned32                  size,
-  Message_queue_Submit_types  submit_type
-)
-{
-  register Message_queue_Control  *the_message_queue;
-  Objects_Locations                location;
-  CORE_message_queue_Status        core_status;
-
-  the_message_queue = _Message_queue_Get( id, &location );
-  switch ( location )
-  {
-    case OBJECTS_ERROR:
-      return RTEMS_INVALID_ID;
-
-    case OBJECTS_REMOTE:
-      switch ( submit_type ) {
-        case MESSAGE_QUEUE_SEND_REQUEST:
-          return
-            _Message_queue_MP_Send_request_packet(
-              MESSAGE_QUEUE_MP_SEND_REQUEST,
-              id,
-              buffer,
-              &size,
-              0,                               /* option_set */
-              MPCI_DEFAULT_TIMEOUT
-            );
-
-        case MESSAGE_QUEUE_URGENT_REQUEST:
-          return
-            _Message_queue_MP_Send_request_packet(
-              MESSAGE_QUEUE_MP_URGENT_REQUEST,
-              id,
-              buffer,
-              &size,
-              0,                               /* option_set */
-              MPCI_DEFAULT_TIMEOUT
-            );
-      }
-
-    case OBJECTS_LOCAL:
-      switch ( submit_type ) {
-        case MESSAGE_QUEUE_SEND_REQUEST:
-          core_status = _CORE_message_queue_Send(
-                          &the_message_queue->message_queue,
-                          buffer,
-                          size,
-                          id,
-                          _Message_queue_Core_message_queue_mp_support
-                        );
-          break;
-        case MESSAGE_QUEUE_URGENT_REQUEST:
-          core_status = _CORE_message_queue_Urgent(
-                          &the_message_queue->message_queue,
-                          buffer,
-                          size,
-                          id,
-                          _Message_queue_Core_message_queue_mp_support
-                        );
-          break;
-        default:
-          core_status = CORE_MESSAGE_QUEUE_STATUS_SUCCESSFUL;
-          return RTEMS_INTERNAL_ERROR;   /* should never get here */
-      }
-
-      _Thread_Enable_dispatch();
-      return _Message_queue_Translate_core_message_queue_return_code(
-                core_status );
-          
-  }
-  return RTEMS_INTERNAL_ERROR;   /* unreached - only to remove warnings */
-}
-
-/*PAGE
- *
- *  _Message_queue_Translate_core_message_queue_return_code
- *
- *  Input parameters:
- *    the_message_queue_status - message_queue status code to translate
- *
- *  Output parameters:
- *    rtems status code - translated RTEMS status code
- *
- */
- 
-rtems_status_code _Message_queue_Translate_core_message_queue_return_code (
-  unsigned32 the_message_queue_status
-)
-{
-  switch ( the_message_queue_status ) {
-    case  CORE_MESSAGE_QUEUE_STATUS_SUCCESSFUL:
-      return RTEMS_SUCCESSFUL;
-    case  CORE_MESSAGE_QUEUE_STATUS_INVALID_SIZE:
-      return RTEMS_INVALID_SIZE;
-    case  CORE_MESSAGE_QUEUE_STATUS_TOO_MANY:
-      return RTEMS_TOO_MANY;
-    case CORE_MESSAGE_QUEUE_STATUS_UNSATISFIED:
-      return RTEMS_UNSATISFIED;
-    case CORE_MESSAGE_QUEUE_STATUS_UNSATISFIED_NOWAIT:
-      return RTEMS_UNSATISFIED;
-    case CORE_MESSAGE_QUEUE_STATUS_WAS_DELETED:
-      return RTEMS_OBJECT_WAS_DELETED;
-    case CORE_MESSAGE_QUEUE_STATUS_TIMEOUT:
-      return RTEMS_TIMEOUT;
-    case THREAD_STATUS_PROXY_BLOCKING:
-      return RTEMS_PROXY_BLOCKING;
-  }
-  _Internal_error_Occurred(         /* XXX */
-    INTERNAL_ERROR_RTEMS_API,
-    TRUE,
-    the_message_queue_status
-  );
-  return RTEMS_INTERNAL_ERROR;   /* unreached - only to remove warnings */
-}
-
-/*PAGE
- *
- *  _Message_queue_Core_message_queue_mp_support
- *
- *  Input parameters:
- *    the_thread - the remote thread the message was submitted to
- *    id         - id of the message queue
- *
- *  Output parameters: NONE
- */
- 
-void  _Message_queue_Core_message_queue_mp_support (
-  Thread_Control *the_thread,
-  Objects_Id      id
-)
-{
-  the_thread->receive_packet->return_code = RTEMS_SUCCESSFUL;
- 
-  _Message_queue_MP_Send_response_packet(
-    MESSAGE_QUEUE_MP_RECEIVE_RESPONSE,
-    id,
-    the_thread
-  );
-}
diff --git a/cpukit/rtems/src/msgmp.c b/cpukit/rtems/src/msgmp.c
deleted file mode 100644
index 707aa94b44..0000000000
--- a/cpukit/rtems/src/msgmp.c
+++ /dev/null
@@ -1,479 +0,0 @@
-/*
- *  Multiprocessing Support for the Message Queue Manager
- *
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems/system.h>
-#include <rtems/rtems/status.h>
-#include <rtems/rtems/message.h>
-#include <rtems/score/mpci.h>
-#include <rtems/rtems/msgmp.h>
-#include <rtems/score/object.h>
-#include <rtems/rtems/options.h>
-#include <rtems/score/thread.h>
-#include <rtems/score/watchdog.h>
-#include <rtems/rtems/support.h>
-
-/*PAGE
- *
- *  _Message_queue_MP_Send_process_packet
- *
- */
-
-void _Message_queue_MP_Send_process_packet (
-  Message_queue_MP_Remote_operations  operation,
-  Objects_Id                          message_queue_id,
-  rtems_name                          name,
-  Objects_Id                          proxy_id
-)
-{
-  Message_queue_MP_Packet *the_packet;
-  unsigned32               node;
-
-  switch ( operation ) {
-
-    case MESSAGE_QUEUE_MP_ANNOUNCE_CREATE:
-    case MESSAGE_QUEUE_MP_ANNOUNCE_DELETE:
-    case MESSAGE_QUEUE_MP_EXTRACT_PROXY:
-
-      the_packet                    = _Message_queue_MP_Get_packet();
-      the_packet->Prefix.the_class  = MP_PACKET_MESSAGE_QUEUE;
-      the_packet->Prefix.length     = sizeof ( Message_queue_MP_Packet );
-      the_packet->Prefix.to_convert = sizeof ( Message_queue_MP_Packet );
-      the_packet->operation         = operation;
-      the_packet->Prefix.id         = message_queue_id;
-      the_packet->name              = name;
-      the_packet->proxy_id          = proxy_id;
-
-      if ( operation == MESSAGE_QUEUE_MP_EXTRACT_PROXY )
-         node = rtems_get_node( message_queue_id );
-      else
-         node = MPCI_ALL_NODES;
-
-      _MPCI_Send_process_packet( node, &the_packet->Prefix );
-      break;
-
-    case MESSAGE_QUEUE_MP_RECEIVE_REQUEST:
-    case MESSAGE_QUEUE_MP_RECEIVE_RESPONSE:
-    case MESSAGE_QUEUE_MP_SEND_REQUEST:
-    case MESSAGE_QUEUE_MP_SEND_RESPONSE:
-    case MESSAGE_QUEUE_MP_URGENT_REQUEST:
-    case MESSAGE_QUEUE_MP_URGENT_RESPONSE:
-    case MESSAGE_QUEUE_MP_BROADCAST_REQUEST:
-    case MESSAGE_QUEUE_MP_BROADCAST_RESPONSE:
-    case MESSAGE_QUEUE_MP_FLUSH_REQUEST:
-    case MESSAGE_QUEUE_MP_FLUSH_RESPONSE:
-    case MESSAGE_QUEUE_MP_GET_NUMBER_PENDING_REQUEST:
-    case MESSAGE_QUEUE_MP_GET_NUMBER_PENDING_RESPONSE:
-      break;
-
-  }
-}
-
-/*PAGE
- *
- *  _Message_queue_MP_Send_request_packet
- *
- */
-
-rtems_status_code _Message_queue_MP_Send_request_packet (
-  Message_queue_MP_Remote_operations  operation,
-  Objects_Id                          message_queue_id,
-  void                               *buffer,
-  unsigned32                         *size_p,
-  rtems_option                        option_set,
-  rtems_interval                      timeout
-)
-{
-  Message_queue_MP_Packet *the_packet;
-
-  switch ( operation ) {
-
-    case MESSAGE_QUEUE_MP_SEND_REQUEST:
-    case MESSAGE_QUEUE_MP_URGENT_REQUEST:
-    case MESSAGE_QUEUE_MP_BROADCAST_REQUEST:
-    case MESSAGE_QUEUE_MP_FLUSH_REQUEST:
-    case MESSAGE_QUEUE_MP_GET_NUMBER_PENDING_REQUEST:
-
-      the_packet                    = _Message_queue_MP_Get_packet();
-      the_packet->Prefix.the_class  = MP_PACKET_MESSAGE_QUEUE;
-      the_packet->Prefix.length     = sizeof(Message_queue_MP_Packet);
-      if ( size_p )
-        the_packet->Prefix.length     += *size_p;
-      the_packet->Prefix.to_convert = sizeof(Message_queue_MP_Packet);
-
-      /*
-       * make sure message is not too big for our MPCI driver
-       * We have to check it here instead of waiting for MPCI because
-       * we are about to slam in the payload
-       */
-
-      if (the_packet->Prefix.length > _MPCI_table->maximum_packet_size) {
-          _Thread_Enable_dispatch();
-          return RTEMS_INVALID_SIZE;
-      }
-
-      if (! _Options_Is_no_wait(option_set))
-          the_packet->Prefix.timeout = timeout;
-
-      the_packet->operation  = operation;
-      the_packet->Prefix.id  = message_queue_id;
-      the_packet->option_set = option_set;
-
-      /*
-       * Copy the data into place if needed
-       */
-      
-      if (buffer) {
-          the_packet->Buffer.size = *size_p;
-          _CORE_message_queue_Copy_buffer(
-            buffer,
-            the_packet->Buffer.buffer,
-            *size_p
-          );
-      }
-
-      return (rtems_status_code) _MPCI_Send_request_packet(
-        rtems_get_node(message_queue_id),
-        &the_packet->Prefix,
-        STATES_WAITING_FOR_MESSAGE
-      );
-      break;
-
-    case MESSAGE_QUEUE_MP_RECEIVE_REQUEST:
-
-      the_packet                    = _Message_queue_MP_Get_packet();
-      the_packet->Prefix.the_class  = MP_PACKET_MESSAGE_QUEUE;
-      the_packet->Prefix.length     = sizeof(Message_queue_MP_Packet);
-      the_packet->Prefix.to_convert = sizeof(Message_queue_MP_Packet);
-
-      if (! _Options_Is_no_wait(option_set))
-          the_packet->Prefix.timeout = timeout;
-
-      the_packet->operation  = MESSAGE_QUEUE_MP_RECEIVE_REQUEST;
-      the_packet->Prefix.id  = message_queue_id;
-      the_packet->option_set = option_set;
-      the_packet->size       = 0;        /* just in case of an error */
-
-      _Thread_Executing->Wait.return_argument   = (unsigned32 *)buffer;
-      _Thread_Executing->Wait.return_argument_1 = size_p;
-      
-      return (rtems_status_code) _MPCI_Send_request_packet(
-        rtems_get_node(message_queue_id),
-        &the_packet->Prefix,
-        STATES_WAITING_FOR_MESSAGE
-      );
-      break;
-
-    case MESSAGE_QUEUE_MP_ANNOUNCE_CREATE:
-    case MESSAGE_QUEUE_MP_ANNOUNCE_DELETE:
-    case MESSAGE_QUEUE_MP_EXTRACT_PROXY:
-    case MESSAGE_QUEUE_MP_RECEIVE_RESPONSE:
-    case MESSAGE_QUEUE_MP_SEND_RESPONSE:
-    case MESSAGE_QUEUE_MP_URGENT_RESPONSE:
-    case MESSAGE_QUEUE_MP_BROADCAST_RESPONSE:
-    case MESSAGE_QUEUE_MP_FLUSH_RESPONSE:
-    case MESSAGE_QUEUE_MP_GET_NUMBER_PENDING_RESPONSE:
-      break;
-  }
-
-  return RTEMS_SUCCESSFUL;
-}
-
-/*PAGE
- *
- *  _Message_queue_MP_Send_response_packet
- *
- */
-
-void _Message_queue_MP_Send_response_packet (
-  Message_queue_MP_Remote_operations  operation,
-  Objects_Id                          message_queue_id,
-  Thread_Control                     *the_thread
-)
-{
-  Message_queue_MP_Packet *the_packet;
-
-  switch ( operation ) {
-
-    case MESSAGE_QUEUE_MP_RECEIVE_RESPONSE:
-    case MESSAGE_QUEUE_MP_SEND_RESPONSE:
-    case MESSAGE_QUEUE_MP_URGENT_RESPONSE:
-    case MESSAGE_QUEUE_MP_BROADCAST_RESPONSE:
-    case MESSAGE_QUEUE_MP_FLUSH_RESPONSE:
-    case MESSAGE_QUEUE_MP_GET_NUMBER_PENDING_RESPONSE:
-
-      the_packet = ( Message_queue_MP_Packet *) the_thread->receive_packet;
-
-/*
- *  The packet being returned already contains the class, length, and
- *  to_convert fields, therefore they are not set in this routine.
- *
- *  Exception: MESSAGE_QUEUE_MP_RECEIVE_RESPONSE needs payload length
- *             added to 'length'
- */
-      the_packet->operation = operation;
-      the_packet->Prefix.id = the_packet->Prefix.source_tid;
-
-      if (operation == MESSAGE_QUEUE_MP_RECEIVE_RESPONSE)
-          the_packet->Prefix.length += the_packet->size;
-      
-      _MPCI_Send_response_packet(
-        rtems_get_node( the_packet->Prefix.source_tid ),
-        &the_packet->Prefix
-      );
-      break;
-
-    case MESSAGE_QUEUE_MP_ANNOUNCE_CREATE:
-    case MESSAGE_QUEUE_MP_ANNOUNCE_DELETE:
-    case MESSAGE_QUEUE_MP_EXTRACT_PROXY:
-    case MESSAGE_QUEUE_MP_RECEIVE_REQUEST:
-    case MESSAGE_QUEUE_MP_SEND_REQUEST:
-    case MESSAGE_QUEUE_MP_URGENT_REQUEST:
-    case MESSAGE_QUEUE_MP_BROADCAST_REQUEST:
-    case MESSAGE_QUEUE_MP_FLUSH_REQUEST:
-    case MESSAGE_QUEUE_MP_GET_NUMBER_PENDING_REQUEST:
-      break;
-
-  }
-}
-
-/*PAGE
- *
- *
- *  _Message_queue_MP_Process_packet
- *
- */
-
-void _Message_queue_MP_Process_packet (
-  rtems_packet_prefix   *the_packet_prefix
-)
-{
-  Message_queue_MP_Packet *the_packet;
-  Thread_Control          *the_thread;
-  boolean                  ignored;
-
-  the_packet = (Message_queue_MP_Packet *) the_packet_prefix;
-
-  switch ( the_packet->operation ) {
-
-    case MESSAGE_QUEUE_MP_ANNOUNCE_CREATE:
-
-      ignored = _Objects_MP_Allocate_and_open(
-                  &_Message_queue_Information,
-                  the_packet->name,
-                  the_packet->Prefix.id,
-                  TRUE
-                );
-
-      _MPCI_Return_packet( the_packet_prefix );
-      break;
-
-    case MESSAGE_QUEUE_MP_ANNOUNCE_DELETE:
-
-      _Objects_MP_Close( &_Message_queue_Information, the_packet->Prefix.id );
-
-      _MPCI_Return_packet( the_packet_prefix );
-      break;
-
-    case MESSAGE_QUEUE_MP_EXTRACT_PROXY:
-
-      the_thread = _Thread_MP_Find_proxy( the_packet->proxy_id );
-
-      if (! _Thread_Is_null( the_thread ) )
-         _Thread_queue_Extract( the_thread->Wait.queue, the_thread );
-
-      _MPCI_Return_packet( the_packet_prefix );
-      break;
-
-    case MESSAGE_QUEUE_MP_RECEIVE_REQUEST:
-
-      the_packet->Prefix.return_code = rtems_message_queue_receive(
-        the_packet->Prefix.id,
-        the_packet->Buffer.buffer,
-        &the_packet->size,
-        the_packet->option_set,
-        the_packet->Prefix.timeout
-      );
-
-      if (! _Thread_Is_proxy_blocking( the_packet->Prefix.return_code ) )
-        _Message_queue_MP_Send_response_packet(
-          MESSAGE_QUEUE_MP_RECEIVE_RESPONSE,
-          the_packet->Prefix.id,
-          _Thread_Executing
-        );
-      break;
-
-    case MESSAGE_QUEUE_MP_RECEIVE_RESPONSE:
-
-      the_thread = _MPCI_Process_response( the_packet_prefix );
-
-      if (the_packet->Prefix.return_code == RTEMS_SUCCESSFUL) {
-        *(rtems_unsigned32 *)the_thread->Wait.return_argument_1 = 
-           the_packet->size;
-
-        _CORE_message_queue_Copy_buffer(
-          the_packet->Buffer.buffer,
-          the_thread->Wait.return_argument,
-          the_packet->size
-        );
-      }
-
-      _MPCI_Return_packet( the_packet_prefix );
-      break;
-
-    case MESSAGE_QUEUE_MP_SEND_REQUEST:
-
-      the_packet->Prefix.return_code = rtems_message_queue_send(
-        the_packet->Prefix.id,
-        the_packet->Buffer.buffer,
-        the_packet->Buffer.size
-      );
-
-      _Message_queue_MP_Send_response_packet(
-        MESSAGE_QUEUE_MP_SEND_RESPONSE,
-        the_packet->Prefix.id,
-        _Thread_Executing
-      );
-      break;
-
-    case MESSAGE_QUEUE_MP_SEND_RESPONSE:
-    case MESSAGE_QUEUE_MP_URGENT_RESPONSE:
-
-      the_thread = _MPCI_Process_response( the_packet_prefix );
-
-      _MPCI_Return_packet( the_packet_prefix );
-      break;
-
-    case MESSAGE_QUEUE_MP_URGENT_REQUEST:
-
-      the_packet->Prefix.return_code = rtems_message_queue_urgent(
-        the_packet->Prefix.id,
-        the_packet->Buffer.buffer,
-        the_packet->Buffer.size
-      );
-
-      _Message_queue_MP_Send_response_packet(
-        MESSAGE_QUEUE_MP_URGENT_RESPONSE,
-        the_packet->Prefix.id,
-        _Thread_Executing
-      );
-      break;
-
-    case MESSAGE_QUEUE_MP_BROADCAST_REQUEST:
-
-      the_packet->Prefix.return_code = rtems_message_queue_broadcast(
-        the_packet->Prefix.id,
-        the_packet->Buffer.buffer,
-        the_packet->Buffer.size,
-        &the_packet->count
-      );
-
-      _Message_queue_MP_Send_response_packet(
-        MESSAGE_QUEUE_MP_BROADCAST_RESPONSE,
-        the_packet->Prefix.id,
-        _Thread_Executing
-      );
-      break;
-
-    case MESSAGE_QUEUE_MP_BROADCAST_RESPONSE:
-    case MESSAGE_QUEUE_MP_FLUSH_RESPONSE:
-    case MESSAGE_QUEUE_MP_GET_NUMBER_PENDING_RESPONSE:
-
-      the_thread = _MPCI_Process_response( the_packet_prefix );
-
-      *(unsigned32 *)the_thread->Wait.return_argument = the_packet->count;
-
-      _MPCI_Return_packet( the_packet_prefix );
-      break;
-
-    case MESSAGE_QUEUE_MP_FLUSH_REQUEST:
-
-      the_packet->Prefix.return_code = rtems_message_queue_flush(
-        the_packet->Prefix.id,
-        &the_packet->count
-      );
-
-      _Message_queue_MP_Send_response_packet(
-        MESSAGE_QUEUE_MP_FLUSH_RESPONSE,
-        the_packet->Prefix.id,
-        _Thread_Executing
-      );
-      break;
-
-    case MESSAGE_QUEUE_MP_GET_NUMBER_PENDING_REQUEST:
-
-      the_packet->Prefix.return_code = rtems_message_queue_get_number_pending(
-        the_packet->Prefix.id,
-        &the_packet->count
-      );
-
-      _Message_queue_MP_Send_response_packet(
-        MESSAGE_QUEUE_MP_GET_NUMBER_PENDING_RESPONSE,
-        the_packet->Prefix.id,
-        _Thread_Executing
-      );
-      break;
-
-  }
-}
-
-/*PAGE
- *
- *  _Message_queue_MP_Send_object_was_deleted
- *
- */
-
-void _Message_queue_MP_Send_object_was_deleted (
-  Thread_Control  *the_proxy
-)
-{
-  the_proxy->receive_packet->return_code = RTEMS_OBJECT_WAS_DELETED;
-
-  _Message_queue_MP_Send_response_packet(
-    MESSAGE_QUEUE_MP_RECEIVE_RESPONSE,
-    the_proxy->Wait.id,
-    the_proxy
-  );
-}
-
-/*PAGE
- *
- *  _Message_queue_MP_Send_extract_proxy
- *
- */
-
-void _Message_queue_MP_Send_extract_proxy (
-  Thread_Control  *the_thread
-)
-{
-  _Message_queue_MP_Send_process_packet(
-    MESSAGE_QUEUE_MP_EXTRACT_PROXY,
-    the_thread->Wait.id,
-    (rtems_name) 0,
-    the_thread->Object.id
-  );
-}
-
-/*PAGE
- *
- *  _Message_queue_MP_Get_packet
- *
- */
-
-Message_queue_MP_Packet *_Message_queue_MP_Get_packet ( void )
-{
-  return ( (Message_queue_MP_Packet *) _MPCI_Get_packet() );
-}
-
-/* end of file */
diff --git a/cpukit/rtems/src/part.c b/cpukit/rtems/src/part.c
deleted file mode 100644
index 0698f0db71..0000000000
--- a/cpukit/rtems/src/part.c
+++ /dev/null
@@ -1,341 +0,0 @@
-/*
- *  Partition Manager
- *
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems/system.h>
-#include <rtems/rtems/status.h>
-#include <rtems/rtems/support.h>
-#include <rtems/score/address.h>
-#include <rtems/score/object.h>
-#include <rtems/rtems/part.h>
-#include <rtems/score/thread.h>
-#include <rtems/score/sysstate.h>
-
-/*PAGE
- *
- *  _Partition_Manager_initialization
- *
- *  This routine initializes all partition manager related
- *  data structures.
- *
- *  Input parameters:
- *    maximum_partitions - number of partitions to initialize
- *
- *  Output parameters:  NONE
- */
-
-void _Partition_Manager_initialization(
-  unsigned32 maximum_partitions
-)
-{
-  _Objects_Initialize_information(
-    &_Partition_Information,
-    OBJECTS_RTEMS_PARTITIONS,
-    TRUE,
-    maximum_partitions,
-    sizeof( Partition_Control ),
-    FALSE,
-    RTEMS_MAXIMUM_NAME_LENGTH,
-    FALSE
-  );
-
-  /*
-   *  Register the MP Process Packet routine.
-   */
-
-  _MPCI_Register_packet_processor(
-    MP_PACKET_PARTITION,
-    _Partition_MP_Process_packet
-  );
-
-}
-
-/*PAGE
- *
- *  rtems_partition_create
- *
- *  This directive creates a partiton of fixed sized buffers from the
- *  given contiguous memory area.
- *
- *  Input parameters:
- *    name             - user defined partition name
- *    starting_address - physical start address of partition
- *    length           - physical length in bytes
- *    buffer_size      - size of buffers in bytes
- *    attribute_set    - partition attributes
- *    id               - pointer to partition id
- *
- *  Output parameters:
- *    id                - partition id
- *    RTEMS_SUCCESSFUL - if successful
- *    error code        - if unsuccessful
- */
-
-rtems_status_code rtems_partition_create(
-  rtems_name          name,
-  void               *starting_address,
-  unsigned32          length,
-  unsigned32          buffer_size,
-  rtems_attribute  attribute_set,
-  Objects_Id         *id
-)
-{
-  register Partition_Control *the_partition;
-
-  if ( !rtems_is_name_valid( name ) )
-    return RTEMS_INVALID_NAME;
-
-  if ( length == 0 || buffer_size == 0 || length < buffer_size ||
-         !_Partition_Is_buffer_size_aligned( buffer_size ) )
-    return RTEMS_INVALID_SIZE;
-
-  if ( !_Addresses_Is_aligned( starting_address ) )
-     return RTEMS_INVALID_ADDRESS;
-
-  if ( _Attributes_Is_global( attribute_set ) && 
-       !_System_state_Is_multiprocessing )
-    return RTEMS_MP_NOT_CONFIGURED;
-
-  _Thread_Disable_dispatch();               /* prevents deletion */
-
-  the_partition = _Partition_Allocate();
-
-  if ( !the_partition ) {
-    _Thread_Enable_dispatch();
-    return RTEMS_TOO_MANY;
-  }
-
-  if ( _Attributes_Is_global( attribute_set ) &&
-       !( _Objects_MP_Allocate_and_open( &_Partition_Information, name,
-                            the_partition->Object.id, FALSE ) ) ) {
-    _Partition_Free( the_partition );
-    _Thread_Enable_dispatch();
-    return RTEMS_TOO_MANY;
-  }
-  the_partition->starting_address      = starting_address;
-  the_partition->length                = length;
-  the_partition->buffer_size           = buffer_size;
-  the_partition->attribute_set         = attribute_set;
-  the_partition->number_of_used_blocks = 0;
-
-  _Chain_Initialize( &the_partition->Memory, starting_address,
-                        length / buffer_size, buffer_size );
-
-  _Objects_Open( &_Partition_Information, &the_partition->Object, &name );
-
-  *id = the_partition->Object.id;
-  if ( _Attributes_Is_global( attribute_set ) )
-    _Partition_MP_Send_process_packet(
-      PARTITION_MP_ANNOUNCE_CREATE,
-      the_partition->Object.id,
-      name,
-      0                  /* Not used */
-    );
-
-  _Thread_Enable_dispatch();
-  return RTEMS_SUCCESSFUL;
-}
-
-/*PAGE
- *
- *  rtems_partition_ident
- *
- *  This directive returns the system ID associated with
- *  the partition name.
- *
- *  Input parameters:
- *    name - user defined partition name
- *    node - node(s) to be searched
- *    id   - pointer to partition id
- *
- *  Output parameters:
- *    *id               - partition id
- *    RTEMS_SUCCESSFUL - if successful
- *    error code        - if unsuccessful
- */
-
-rtems_status_code rtems_partition_ident(
-  rtems_name    name,
-  unsigned32    node,
-  Objects_Id   *id
-)
-{
-  Objects_Name_to_id_errors  status;
-
-  status = _Objects_Name_to_id( &_Partition_Information, &name, node, id );
-
-  return _Status_Object_name_errors_to_status[ status ];
-}
-
-/*PAGE
- *
- *  rtems_partition_delete
- *
- *  This directive allows a thread to delete a partition specified by
- *  the partition identifier, provided that none of its buffers are
- *  still allocated.
- *
- *  Input parameters:
- *    id - partition id
- *
- *  Output parameters:
- *    RTEMS_SUCCESSFUL - if successful
- *    error code        - if unsuccessful
- */
-
-rtems_status_code rtems_partition_delete(
-  Objects_Id id
-)
-{
-  register Partition_Control *the_partition;
-  Objects_Locations                  location;
-
-  the_partition = _Partition_Get( id, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-      return RTEMS_INVALID_ID;
-    case OBJECTS_REMOTE:
-      _Thread_Dispatch();
-      return RTEMS_ILLEGAL_ON_REMOTE_OBJECT;
-    case OBJECTS_LOCAL:
-      if ( the_partition->number_of_used_blocks == 0 ) {
-        _Objects_Close( &_Partition_Information, &the_partition->Object );
-        _Partition_Free( the_partition );
-        if ( _Attributes_Is_global( the_partition->attribute_set ) ) {
-
-          _Objects_MP_Close(
-            &_Partition_Information,
-            the_partition->Object.id
-          );
-
-          _Partition_MP_Send_process_packet(
-            PARTITION_MP_ANNOUNCE_DELETE,
-            the_partition->Object.id,
-            0,                         /* Not used */
-            0                          /* Not used */
-          );
-        }
-
-        _Thread_Enable_dispatch();
-        return RTEMS_SUCCESSFUL;
-      }
-      _Thread_Enable_dispatch();
-      return RTEMS_RESOURCE_IN_USE;
-  }
-
-  return RTEMS_INTERNAL_ERROR;   /* unreached - only to remove warnings */
-}
-
-/*PAGE
- *
- *  rtems_partition_get_buffer
- *
- *  This directive will obtain a buffer from a buffer partition.
- *
- *  Input parameters:
- *    id     - partition id
- *    buffer - pointer to buffer address
- *
- *  Output parameters:
- *    buffer            - pointer to buffer address filled in
- *    RTEMS_SUCCESSFUL - if successful
- *    error code        - if unsuccessful
- */
-
-rtems_status_code rtems_partition_get_buffer(
-  Objects_Id   id,
-  void       **buffer
-)
-{
-  register Partition_Control *the_partition;
-  Objects_Locations           location;
-  void                       *the_buffer;
-
-  the_partition = _Partition_Get( id, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-      return RTEMS_INVALID_ID;
-    case OBJECTS_REMOTE:
-      _Thread_Executing->Wait.return_argument = buffer;
-      return(
-        _Partition_MP_Send_request_packet(
-          PARTITION_MP_GET_BUFFER_REQUEST,
-          id,
-          0           /* Not used */
-        )
-      );
-    case OBJECTS_LOCAL:
-      the_buffer = _Partition_Allocate_buffer( the_partition );
-      if ( the_buffer ) {
-        the_partition->number_of_used_blocks += 1;
-        _Thread_Enable_dispatch();
-        *buffer = the_buffer;
-        return RTEMS_SUCCESSFUL;
-      }
-      _Thread_Enable_dispatch();
-      return RTEMS_UNSATISFIED;
-  }
-
-  return RTEMS_INTERNAL_ERROR;   /* unreached - only to remove warnings */
-}
-
-/*PAGE
- *
- *  rtems_partition_return_buffer
- *
- *  This directive will return the given buffer to the specified
- *  buffer partition.
- *
- *  Input parameters:
- *    id     - partition id
- *    buffer - pointer to buffer address
- *
- *  Output parameters:
- *    RTEMS_SUCCESSFUL - if successful
- *    error code - if unsuccessful
- */
-
-rtems_status_code rtems_partition_return_buffer(
-  Objects_Id  id,
-  void       *buffer
-)
-{
-  register Partition_Control *the_partition;
-  Objects_Locations           location;
-
-  the_partition = _Partition_Get( id, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-      return RTEMS_INVALID_ID;
-    case OBJECTS_REMOTE:
-      return(
-        _Partition_MP_Send_request_packet(
-          PARTITION_MP_RETURN_BUFFER_REQUEST,
-          id,
-          buffer
-        )
-      );
-    case OBJECTS_LOCAL:
-      if ( _Partition_Is_buffer_valid( buffer, the_partition ) ) {
-        _Partition_Free_buffer( the_partition, buffer );
-        the_partition->number_of_used_blocks -= 1;
-        _Thread_Enable_dispatch();
-        return RTEMS_SUCCESSFUL;
-      }
-      _Thread_Enable_dispatch();
-      return RTEMS_INVALID_ADDRESS;
-  }
-
-  return RTEMS_INTERNAL_ERROR;   /* unreached - only to remove warnings */
-}
diff --git a/cpukit/rtems/src/partmp.c b/cpukit/rtems/src/partmp.c
deleted file mode 100644
index 17234974ef..0000000000
--- a/cpukit/rtems/src/partmp.c
+++ /dev/null
@@ -1,302 +0,0 @@
-/*
- *  Multiprocessing Support for the Partition Manager
- *
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems/system.h>
-#include <rtems/rtems/status.h>
-#include <rtems/score/mpci.h>
-#include <rtems/score/mppkt.h>
-#include <rtems/score/object.h>
-#include <rtems/rtems/options.h>
-#include <rtems/rtems/part.h>
-#include <rtems/score/thread.h>
-#include <rtems/rtems/support.h>
-
-/*PAGE
- *
- *  _Partition_MP_Send_process_packet
- *
- */
-
-void _Partition_MP_Send_process_packet (
-  Partition_MP_Remote_operations  operation,
-  Objects_Id                      partition_id,
-  rtems_name                      name,
-  Objects_Id                      proxy_id
-)
-{
-  Partition_MP_Packet *the_packet;
-  unsigned32           node;
-
-  switch ( operation ) {
-
-    case PARTITION_MP_ANNOUNCE_CREATE:
-    case PARTITION_MP_ANNOUNCE_DELETE:
-    case PARTITION_MP_EXTRACT_PROXY:
-
-      the_packet                    = _Partition_MP_Get_packet();
-      the_packet->Prefix.the_class  = MP_PACKET_PARTITION;
-      the_packet->Prefix.length     = sizeof ( Partition_MP_Packet );
-      the_packet->Prefix.to_convert = sizeof ( Partition_MP_Packet );
-      the_packet->operation         = operation;
-      the_packet->Prefix.id         = partition_id;
-      the_packet->name              = name;
-      the_packet->proxy_id          = proxy_id;
-
-      if ( operation == PARTITION_MP_EXTRACT_PROXY )
-         node = rtems_get_node( partition_id );
-      else
-         node = MPCI_ALL_NODES;
-
-      _MPCI_Send_process_packet( node, &the_packet->Prefix );
-      break;
-
-    case PARTITION_MP_GET_BUFFER_REQUEST:
-    case PARTITION_MP_GET_BUFFER_RESPONSE:
-    case PARTITION_MP_RETURN_BUFFER_REQUEST:
-    case PARTITION_MP_RETURN_BUFFER_RESPONSE:
-      break;
-  }
-}
-
-/*PAGE
- *
- *  _Partition_MP_Send_request_packet
- *
- */
-
-rtems_status_code _Partition_MP_Send_request_packet (
-  Partition_MP_Remote_operations  operation,
-  Objects_Id                      partition_id,
-  void                           *buffer
-)
-{
-  Partition_MP_Packet *the_packet;
-
-  switch ( operation ) {
-
-    case PARTITION_MP_GET_BUFFER_REQUEST:
-    case PARTITION_MP_RETURN_BUFFER_REQUEST:
-
-      the_packet                    = _Partition_MP_Get_packet();
-      the_packet->Prefix.the_class  = MP_PACKET_PARTITION;
-      the_packet->Prefix.length     = sizeof ( Partition_MP_Packet );
-      the_packet->Prefix.to_convert = sizeof ( Partition_MP_Packet );
-      the_packet->operation         = operation;
-      the_packet->Prefix.id         = partition_id;
-      the_packet->buffer            = buffer;
-
-      return
-        _MPCI_Send_request_packet(
-          rtems_get_node( partition_id ),
-          &the_packet->Prefix,
-          STATES_READY      /* Not used */
-        );
-
-      break;
-
-    case PARTITION_MP_ANNOUNCE_CREATE:
-    case PARTITION_MP_ANNOUNCE_DELETE:
-    case PARTITION_MP_EXTRACT_PROXY:
-    case PARTITION_MP_GET_BUFFER_RESPONSE:
-    case PARTITION_MP_RETURN_BUFFER_RESPONSE:
-      break;
-
-  }
-  /*
-   *  The following line is included to satisfy compilers which
-   *  produce warnings when a function does not end with a return.
-   */
-  return RTEMS_SUCCESSFUL;
-}
-
-/*PAGE
- *
- *  _Partition_MP_Send_response_packet
- *
- */
-
-void _Partition_MP_Send_response_packet (
-  Partition_MP_Remote_operations  operation,
-  Objects_Id                      partition_id,
-  Thread_Control                 *the_thread
-)
-{
-  Partition_MP_Packet *the_packet;
-
-  switch ( operation ) {
-
-    case PARTITION_MP_GET_BUFFER_RESPONSE:
-    case PARTITION_MP_RETURN_BUFFER_RESPONSE:
-
-      the_packet = ( Partition_MP_Packet *) the_thread->receive_packet;
-
-/*
- *  The packet being returned already contains the class, length, and
- *  to_convert fields, therefore they are not set in this routine.
- */
-      the_packet->operation = operation;
-      the_packet->Prefix.id = the_packet->Prefix.source_tid;
-
-      _MPCI_Send_response_packet(
-        rtems_get_node( the_packet->Prefix.source_tid ),
-        &the_packet->Prefix
-      );
-      break;
-
-    case PARTITION_MP_ANNOUNCE_CREATE:
-    case PARTITION_MP_ANNOUNCE_DELETE:
-    case PARTITION_MP_EXTRACT_PROXY:
-    case PARTITION_MP_GET_BUFFER_REQUEST:
-    case PARTITION_MP_RETURN_BUFFER_REQUEST:
-      break;
-
-  }
-}
-
-/*PAGE
- *
- *
- *  _Partition_MP_Process_packet
- *
- */
-
-void _Partition_MP_Process_packet (
-  rtems_packet_prefix  *the_packet_prefix
-)
-{
-  Partition_MP_Packet *the_packet;
-  Thread_Control      *the_thread;
-  boolean              ignored;
-
-  the_packet = (Partition_MP_Packet *) the_packet_prefix;
-
-  switch ( the_packet->operation ) {
-
-    case PARTITION_MP_ANNOUNCE_CREATE:
-
-      ignored = _Objects_MP_Allocate_and_open(
-                  &_Partition_Information,
-                  the_packet->name,
-                  the_packet->Prefix.id,
-                  TRUE
-                );
-
-      _MPCI_Return_packet( the_packet_prefix );
-      break;
-
-    case PARTITION_MP_ANNOUNCE_DELETE:
-
-      _Objects_MP_Close( &_Partition_Information, the_packet->Prefix.id );
-
-      _MPCI_Return_packet( the_packet_prefix );
-      break;
-
-    case PARTITION_MP_EXTRACT_PROXY:
-
-      the_thread = _Thread_MP_Find_proxy( the_packet->proxy_id );
-
-      if ( ! _Thread_Is_null( the_thread ) )
-         _Thread_queue_Extract( the_thread->Wait.queue, the_thread );
-
-      _MPCI_Return_packet( the_packet_prefix );
-      break;
-
-    case PARTITION_MP_GET_BUFFER_REQUEST:
-
-      the_packet->Prefix.return_code = rtems_partition_get_buffer(
-        the_packet->Prefix.id,
-        &the_packet->buffer
-      );
-
-      _Partition_MP_Send_response_packet(
-        PARTITION_MP_GET_BUFFER_RESPONSE,
-        the_packet->Prefix.id,
-        _Thread_Executing
-      );
-      break;
-
-    case PARTITION_MP_GET_BUFFER_RESPONSE:
-
-      the_thread = _MPCI_Process_response( the_packet_prefix );
-
-      *(void **)the_thread->Wait.return_argument = the_packet->buffer;
-
-      _MPCI_Return_packet( the_packet_prefix );
-      break;
-
-    case PARTITION_MP_RETURN_BUFFER_REQUEST:
-
-      the_packet->Prefix.return_code = rtems_partition_return_buffer(
-        the_packet->Prefix.id,
-        the_packet->buffer
-      );
-
-      _Partition_MP_Send_response_packet(
-        PARTITION_MP_RETURN_BUFFER_RESPONSE,
-        the_packet->Prefix.id,
-        _Thread_Executing
-      );
-      break;
-
-    case PARTITION_MP_RETURN_BUFFER_RESPONSE:
-
-      the_thread = _MPCI_Process_response( the_packet_prefix );
-
-      _MPCI_Return_packet( the_packet_prefix );
-      break;
-
-  }
-}
-
-/*PAGE
- *
- *  _Partition_MP_Send_object_was_deleted
- *
- *  This routine is not needed by the Partition since a partition
- *  cannot be deleted when buffers are in use.
- *
- */
-
-/*PAGE
- *
- *  _Partition_MP_Send_extract_proxy
- *
- */
-
-void _Partition_MP_Send_extract_proxy (
-  Thread_Control *the_thread
-)
-{
-  _Partition_MP_Send_process_packet(
-    PARTITION_MP_EXTRACT_PROXY,
-    the_thread->Wait.id,
-    (rtems_name) 0,
-    the_thread->Object.id
-  );
-
-}
-
-/*PAGE
- *
- *  _Partition_MP_Get_packet
- *
- */
-
-Partition_MP_Packet *_Partition_MP_Get_packet ( void )
-{
-  return ( (Partition_MP_Packet *) _MPCI_Get_packet() );
-}
-
-/* end of file */
diff --git a/cpukit/rtems/src/ratemon.c b/cpukit/rtems/src/ratemon.c
deleted file mode 100644
index ff9bb5bc21..0000000000
--- a/cpukit/rtems/src/ratemon.c
+++ /dev/null
@@ -1,461 +0,0 @@
-/*
- *  Rate Monotonic Manager
- *
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems/system.h>
-#include <rtems/rtems/status.h>
-#include <rtems/rtems/support.h>
-#include <rtems/score/isr.h>
-#include <rtems/score/object.h>
-#include <rtems/rtems/ratemon.h>
-#include <rtems/score/thread.h>
-
-/*PAGE
- *
- *  _Rate_monotonic_Manager_initialization
- *
- *  This routine initializes all Rate Monotonic Manager related
- *  data structures.
- *
- *  Input parameters:
- *    maximum_periods - number of periods timers to initialize
- *
- *  Output parameters:  NONE
- *
- *  NOTE: The Rate Monotonic Manager is built on top of the Watchdog
- *        Handler.
- */
-
-void _Rate_monotonic_Manager_initialization(
-  unsigned32 maximum_periods
-)
-{
-  _Objects_Initialize_information(
-    &_Rate_monotonic_Information,
-    OBJECTS_RTEMS_PERIODS,
-    FALSE,
-    maximum_periods,
-    sizeof( Rate_monotonic_Control ),
-    FALSE,
-    RTEMS_MAXIMUM_NAME_LENGTH,
-    FALSE
-  );
-}
-
-/*PAGE
- *
- *  rtems_rate_monotonic_create
- *
- *  This directive creates a rate monotonic timer and performs
- *  some initialization.
- *
- *  Input parameters:
- *    name - name of period
- *    id   - pointer to rate monotonic id
- *
- *  Output parameters:
- *    id                - rate monotonic id
- *    RTEMS_SUCCESSFUL - if successful
- *    error code        - if unsuccessful
- */
-
-rtems_status_code rtems_rate_monotonic_create(
-  rtems_name    name,
-  Objects_Id   *id
-)
-{
-  Rate_monotonic_Control *the_period;
-
-  if ( !rtems_is_name_valid( name ) )
-    return RTEMS_INVALID_NAME;
-
-  _Thread_Disable_dispatch();            /* to prevent deletion */
-
-  the_period = _Rate_monotonic_Allocate();
-
-  if ( !the_period ) {
-    _Thread_Enable_dispatch();
-    return RTEMS_TOO_MANY;
-  }
-
-  the_period->owner = _Thread_Executing;
-  the_period->state = RATE_MONOTONIC_INACTIVE;
-
-  _Objects_Open( &_Rate_monotonic_Information, &the_period->Object, &name );
-
-  *id = the_period->Object.id;
-  _Thread_Enable_dispatch();
-  return RTEMS_SUCCESSFUL;
-}
-
-/*PAGE
- *
- *  rtems_rate_monotonic_ident
- *
- *  This directive returns the system ID associated with
- *  the rate monotonic period name.
- *
- *  Input parameters:
- *    name - user defined period name
- *    id   - pointer to period id
- *
- *  Output parameters:
- *    *id               - region id
- *    RTEMS_SUCCESSFUL - if successful
- *    error code        - if unsuccessful
- */
-
-rtems_status_code rtems_rate_monotonic_ident(
-  rtems_name    name,
-  Objects_Id   *id
-)
-{
-  Objects_Name_to_id_errors  status;
-
-  status = _Objects_Name_to_id(
-    &_Rate_monotonic_Information,
-    &name,
-    OBJECTS_SEARCH_LOCAL_NODE,
-    id
-  );
-
-  return _Status_Object_name_errors_to_status[ status ];
-}
-
-/*PAGE
- *
- *  rtems_rate_monotonic_cancel
- *
- *  This directive allows a thread to cancel a rate monotonic timer.
- *
- *  Input parameters:
- *    id - rate monotonic id
- *
- *  Output parameters:
- *    RTEMS_SUCCESSFUL - if successful and caller is not the owning thread
- *    error code        - if unsuccessful
- */
-
-rtems_status_code rtems_rate_monotonic_cancel(
-  Objects_Id id
-)
-{
-  Rate_monotonic_Control *the_period;
-  Objects_Locations              location;
-
-  the_period = _Rate_monotonic_Get( id, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-      return RTEMS_INVALID_ID;
-    case OBJECTS_REMOTE:            
-      return RTEMS_INTERNAL_ERROR;  /* should never return this */ 
-    case OBJECTS_LOCAL:
-      if ( !_Thread_Is_executing( the_period->owner ) ) {
-        _Thread_Enable_dispatch();
-        return RTEMS_NOT_OWNER_OF_RESOURCE;
-      }
-      (void) _Watchdog_Remove( &the_period->Timer );
-      the_period->state = RATE_MONOTONIC_INACTIVE;
-      _Thread_Enable_dispatch();
-      return RTEMS_SUCCESSFUL;
-  }
-
-  return RTEMS_INTERNAL_ERROR;   /* unreached - only to remove warnings */
-}
-
-/*PAGE
- *
- *  rtems_rate_monotonic_delete
- *
- *  This directive allows a thread to delete a rate monotonic timer.
- *
- *  Input parameters:
- *    id - rate monotonic id
- *
- *  Output parameters:
- *    RTEMS_SUCCESSFUL - if successful
- *    error code        - if unsuccessful
- */
-
-rtems_status_code rtems_rate_monotonic_delete(
-  Objects_Id id
-)
-{
-  Rate_monotonic_Control *the_period;
-  Objects_Locations              location;
-
-  the_period = _Rate_monotonic_Get( id, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-      return RTEMS_INVALID_ID;
-    case OBJECTS_REMOTE:            /* should never return this */
-      return RTEMS_INTERNAL_ERROR;
-    case OBJECTS_LOCAL:
-      _Objects_Close( &_Rate_monotonic_Information, &the_period->Object );
-      (void) _Watchdog_Remove( &the_period->Timer );
-      the_period->state = RATE_MONOTONIC_INACTIVE;
-      _Rate_monotonic_Free( the_period );
-      _Thread_Enable_dispatch();
-      return RTEMS_SUCCESSFUL;
-  }
-
-  return RTEMS_INTERNAL_ERROR;   /* unreached - only to remove warnings */
-}
-
-/*PAGE
- *
- *  rtems_rate_monotonic_get_status
- *
- *  This directive allows a thread to obtain status information on a 
- *  period.
- *
- *  Input parameters:
- *    id     - rate monotonic id
- *    status - pointer to status control block
- *
- *  Output parameters:
- *    RTEMS_SUCCESSFUL - if successful
- *    error code        - if unsuccessful
- *
- */
-
-rtems_status_code rtems_rate_monotonic_get_status(
-  Objects_Id                           id,
-  rtems_rate_monotonic_period_status  *status
-)
-{
-  Objects_Locations              location;
-  Rate_monotonic_Control        *the_period;
-
-  if ( status == NULL )
-    return RTEMS_INVALID_ADDRESS;
-
-  the_period = _Rate_monotonic_Get( id, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-      return RTEMS_INVALID_ID;
-    case OBJECTS_REMOTE:            /* should never return this */
-      return RTEMS_INTERNAL_ERROR;
-    case OBJECTS_LOCAL:
-      status->state = the_period->state;
-
-      if ( status->state == RATE_MONOTONIC_INACTIVE ) {
-        status->ticks_since_last_period = 0;
-        status->ticks_executed_since_last_period = 0;
-      } else {
-        status->ticks_since_last_period =
-          _Watchdog_Ticks_since_boot - the_period->time_at_period;
-
-        status->ticks_executed_since_last_period =
-          the_period->owner->ticks_executed -
-            the_period->owner_ticks_executed_at_period;
-      }
-
-      _Thread_Enable_dispatch();
-      return RTEMS_SUCCESSFUL;
-  }
-
-  return RTEMS_INTERNAL_ERROR;   /* unreached - only to remove warnings */
-}
-
-
-/*PAGE
- *
- *  rtems_rate_monotonic_period
- *
- *  This directive allows a thread to manipulate a rate monotonic timer.
- *
- *  Input parameters:
- *    id     - rate monotonic id
- *    length - length of period (in ticks)
- *
- *  Output parameters:
- *    RTEMS_SUCCESSFUL - if successful
- *    error code        - if unsuccessful
- */
-
-rtems_status_code rtems_rate_monotonic_period(
-  Objects_Id        id,
-  rtems_interval    length
-)
-{
-  Rate_monotonic_Control              *the_period;
-  Objects_Locations                    location;
-  rtems_status_code                    return_value;
-  rtems_rate_monotonic_period_states   local_state;
-  ISR_Level                            level;
-
-  the_period = _Rate_monotonic_Get( id, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-      return RTEMS_INVALID_ID;
-    case OBJECTS_REMOTE:            /* should never return this */
-      return RTEMS_INTERNAL_ERROR;
-    case OBJECTS_LOCAL:
-      if ( !_Thread_Is_executing( the_period->owner ) ) {
-        _Thread_Enable_dispatch();
-        return RTEMS_NOT_OWNER_OF_RESOURCE;
-      }
-
-      if ( length == RTEMS_PERIOD_STATUS ) {
-        switch ( the_period->state ) {
-          case RATE_MONOTONIC_INACTIVE:
-            return_value = RTEMS_NOT_DEFINED;
-            break;
-          case RATE_MONOTONIC_ACTIVE:
-            return_value = RTEMS_SUCCESSFUL;
-            break;
-          case RATE_MONOTONIC_EXPIRED:
-            return_value = RTEMS_TIMEOUT;
-            break;
-          default:              /* unreached -- only to remove warnings */
-            return_value = RTEMS_INTERNAL_ERROR;
-            break;
-        }
-        _Thread_Enable_dispatch();
-        return( return_value );
-      }
-
-      _ISR_Disable( level );
-      switch ( the_period->state ) {
-        case RATE_MONOTONIC_INACTIVE:
-          _ISR_Enable( level );
-          the_period->state = RATE_MONOTONIC_ACTIVE;
-          _Watchdog_Initialize(
-            &the_period->Timer,
-            _Rate_monotonic_Timeout,
-            id,
-            NULL
-          );
-
-          the_period->owner_ticks_executed_at_period =
-            _Thread_Executing->ticks_executed;
-
-          the_period->time_at_period = _Watchdog_Ticks_since_boot;
-
-          _Watchdog_Insert_ticks( &the_period->Timer, length );
-          _Thread_Enable_dispatch();
-          return RTEMS_SUCCESSFUL;
-
-        case RATE_MONOTONIC_ACTIVE:
-          /*
-           *  This tells the _Rate_monotonic_Timeout that this task is
-           *  in the process of blocking on the period.
-           */
-
-          the_period->state = RATE_MONOTONIC_OWNER_IS_BLOCKING;
-          _ISR_Enable( level );
-
-          _Thread_Executing->Wait.id = the_period->Object.id;
-          _Thread_Set_state( _Thread_Executing, STATES_WAITING_FOR_PERIOD );
-          
-          /*
-           *  Did the watchdog timer expire while we were actually blocking 
-           *  on it?
-           */
-
-          _ISR_Disable( level );
-            local_state = the_period->state;
-            the_period->state = RATE_MONOTONIC_ACTIVE;
-          _ISR_Enable( level );
-
-          /*
-           *  If it did, then we want to unblock ourself and continue as
-           *  if nothing happen.  The period was reset in the timeout routine.
-           */
-
-          if ( local_state == RATE_MONOTONIC_EXPIRED_WHILE_BLOCKING )
-            _Thread_Clear_state( _Thread_Executing, STATES_WAITING_FOR_PERIOD );
-
-          _Thread_Enable_dispatch();
-          return RTEMS_SUCCESSFUL;
-          break;
-
-        case RATE_MONOTONIC_EXPIRED:
-          _ISR_Enable( level );
-          the_period->state = RATE_MONOTONIC_ACTIVE;
-          the_period->owner_ticks_executed_at_period =
-            _Thread_Executing->ticks_executed;
-          the_period->time_at_period = _Watchdog_Ticks_since_boot;
-
-          _Watchdog_Insert_ticks( &the_period->Timer, length );
-          _Thread_Enable_dispatch();
-          return RTEMS_TIMEOUT;
-
-        case RATE_MONOTONIC_OWNER_IS_BLOCKING:
-        case RATE_MONOTONIC_EXPIRED_WHILE_BLOCKING:
-          /*
-           *  These should never happen.
-           */
-          break;
-      }
-  }
-
-  return RTEMS_INTERNAL_ERROR;   /* unreached - only to remove warnings */
-}
-
-/*PAGE
- *
- *  _Rate_monotonic_Timeout
- *
- *  This routine processes a period ending.  If the owning thread
- *  is waiting for the period, that thread is unblocked and the
- *  period reinitiated.  Otherwise, the period is expired.
- *  This routine is called by the watchdog handler.
- *
- *  Input parameters:
- *    id - period id
- *
- *  Output parameters: NONE
- */
-
-void _Rate_monotonic_Timeout(
-  Objects_Id  id,
-  void       *ignored
-)
-{
-  Rate_monotonic_Control *the_period;
-  Objects_Locations       location;
-  Thread_Control         *the_thread;
-
-  the_period = _Rate_monotonic_Get( id, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-    case OBJECTS_REMOTE:  /* impossible */
-      break;
-    case OBJECTS_LOCAL:
-      the_thread = the_period->owner;
-      if ( _States_Is_waiting_for_period( the_thread->current_state ) &&
-            the_thread->Wait.id == the_period->Object.id ) {
-        _Thread_Unblock( the_thread );
-        the_period->owner_ticks_executed_at_period =
-          the_thread->ticks_executed;
-
-        the_period->time_at_period = _Watchdog_Ticks_since_boot;
-
-        _Watchdog_Reset( &the_period->Timer );
-      } else if ( the_period->state == RATE_MONOTONIC_OWNER_IS_BLOCKING ) {
-        the_period->state = RATE_MONOTONIC_EXPIRED_WHILE_BLOCKING;
-        the_period->owner_ticks_executed_at_period =
-          the_thread->ticks_executed;
-
-        the_period->time_at_period = _Watchdog_Ticks_since_boot;
-        _Watchdog_Reset( &the_period->Timer );
-      } else
-        the_period->state = RATE_MONOTONIC_EXPIRED;
-      _Thread_Unnest_dispatch();
-      break;
-  }
-}
-
diff --git a/cpukit/rtems/src/region.c b/cpukit/rtems/src/region.c
deleted file mode 100644
index c238bf51c5..0000000000
--- a/cpukit/rtems/src/region.c
+++ /dev/null
@@ -1,486 +0,0 @@
-/*
- *  Region Manager
- *
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems/system.h>
-#include <rtems/rtems/status.h>
-#include <rtems/rtems/support.h>
-#include <rtems/score/object.h>
-#include <rtems/rtems/options.h>
-#include <rtems/rtems/region.h>
-#include <rtems/score/states.h>
-#include <rtems/score/thread.h>
-
-/*PAGE
- *
- *  _Region_Manager_initialization
- *
- *  This routine initializes all region manager related data structures.
- *
- *  Input parameters:
- *    maximum_regions - number of regions to initialize
- *
- *  Output parameters:  NONE
- */
-
-void _Region_Manager_initialization(
-  unsigned32 maximum_regions
-)
-{
-  _Objects_Initialize_information(
-    &_Region_Information,
-    OBJECTS_RTEMS_REGIONS,
-    FALSE,
-    maximum_regions,
-    sizeof( Region_Control ),
-    FALSE,
-    RTEMS_MAXIMUM_NAME_LENGTH,
-    FALSE
-  );
-
-  /*
-   *  Register the MP Process Packet routine.
-   */
-
-  _MPCI_Register_packet_processor(
-    MP_PACKET_REGION,
-    0  /* XXX _Region_MP_Process_packet */
-  );
-
-}
-
-/*PAGE
- *
- *  rtems_region_create
- *
- *  This directive creates a region of physical contiguous memory area
- *  from which variable sized segments can be allocated.
- *
- *  Input parameters:
- *    name             - user defined region name
- *    starting_address - physical start address of region
- *    length           - physical length in bytes
- *    page_size        - page size in bytes
- *    attribute_set    - region attributes
- *    id               - address of region id to set
- *
- *  Output parameters:
- *    id       - region id
- *    RTEMS_SUCCESSFUL - if successful
- *    error code - if unsuccessful
- */
-
-rtems_status_code rtems_region_create(
-  rtems_name          name,
-  void               *starting_address,
-  unsigned32          length,
-  unsigned32          page_size,
-  rtems_attribute  attribute_set,
-  Objects_Id         *id
-)
-{
-  Region_Control *the_region;
-
-  if ( !rtems_is_name_valid( name ) )
-    return RTEMS_INVALID_NAME;
-
-  if ( !_Addresses_Is_aligned( starting_address ) )
-    return RTEMS_INVALID_ADDRESS;
-
-  _Thread_Disable_dispatch();             /* to prevent deletion */
-
-  the_region = _Region_Allocate();
-
-  if ( !the_region ) {
-    _Thread_Enable_dispatch();
-    return RTEMS_TOO_MANY;
-  }
-
-  the_region->maximum_segment_size =
-    _Heap_Initialize(&the_region->Memory, starting_address, length, page_size);
-
-  if ( !the_region->maximum_segment_size ) {
-    _Region_Free( the_region );
-    _Thread_Enable_dispatch();
-    return RTEMS_INVALID_SIZE;
-  }
-
-  the_region->starting_address      = starting_address;
-  the_region->length                = length;
-  the_region->page_size             = page_size;
-  the_region->attribute_set         = attribute_set;
-  the_region->number_of_used_blocks = 0;
-
-  _Thread_queue_Initialize(
-    &the_region->Wait_queue,
-    OBJECTS_RTEMS_REGIONS,
-    _Attributes_Is_priority( attribute_set ) ? 
-       THREAD_QUEUE_DISCIPLINE_PRIORITY : THREAD_QUEUE_DISCIPLINE_FIFO,
-    STATES_WAITING_FOR_SEGMENT,
-    _Region_MP_Send_extract_proxy,
-    RTEMS_TIMEOUT
-  );
-
-  _Objects_Open( &_Region_Information, &the_region->Object, &name );
-
-  *id = the_region->Object.id;
-  _Thread_Enable_dispatch();
-  return RTEMS_SUCCESSFUL;
-}
-
-/*PAGE
- *
- *  rtems_region_ident
- *
- *  This directive returns the system ID associated with
- *  the region name.
- *
- *  Input parameters:
- *    name - user defined region name
- *    id   - pointer to region id
- *
- *  Output parameters:
- *    *id      - region id
- *    RTEMS_SUCCESSFUL - if successful
- *    error code - if unsuccessful
- */
-
-rtems_status_code rtems_region_ident(
-  rtems_name    name,
-  Objects_Id   *id
-)
-{
-  Objects_Name_to_id_errors  status;
-
-  status = _Objects_Name_to_id(
-    &_Region_Information,
-    &name,
-    OBJECTS_SEARCH_LOCAL_NODE,
-    id
-  );
-
-  return _Status_Object_name_errors_to_status[ status ];
-}
-
-/*PAGE
- *
- *  rtems_region_delete
- *
- *  This directive allows a thread to delete a region specified by
- *  the region identifier, provided that none of its segments are
- *  still allocated.
- *
- *  Input parameters:
- *    id - region id
- *
- *  Output parameters:
- *    RTEMS_SUCCESSFUL - if successful
- *    error code - if unsuccessful
- */
-
-rtems_status_code rtems_region_delete(
-  Objects_Id id
-)
-{
-  register Region_Control *the_region;
-  Objects_Locations               location;
-
-  the_region = _Region_Get( id, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-      return RTEMS_INVALID_ID;
-    case OBJECTS_REMOTE:        /* this error cannot be returned */
-      return RTEMS_INTERNAL_ERROR;
-    case OBJECTS_LOCAL:
-      _Region_Debug_Walk( the_region, 5 );
-      if ( the_region->number_of_used_blocks == 0 ) {
-        _Objects_Close( &_Region_Information, &the_region->Object );
-        _Region_Free( the_region );
-        _Thread_Enable_dispatch();
-        return RTEMS_SUCCESSFUL;
-      }
-      _Thread_Enable_dispatch();
-      return RTEMS_RESOURCE_IN_USE;
-  }
-
-  return RTEMS_INTERNAL_ERROR;   /* unreached - only to remove warnings */
-}
-
-/*PAGE
- *
- *  rtems_region_extend
- *
- *  This directive attempts to grow a region of physical contiguous memory area
- *  from which variable sized segments can be allocated.
- *
- *  Input parameters:
- *    id         - id of region to grow
- *    start      - starting address of memory area for extension
- *    length     - physical length in bytes to grow the region
- *
- *  Output parameters:
- *    RTEMS_SUCCESSFUL - if successful
- *    error code       - if unsuccessful
- */
-
-rtems_status_code rtems_region_extend(
-  Objects_Id          id,
-  void               *starting_address,
-  unsigned32          length
-)
-{
-  Region_Control     *the_region;
-  Objects_Locations   location;
-  unsigned32          amount_extended;
-  Heap_Extend_status  heap_status;
-  rtems_status_code   status;
-
-  status = RTEMS_SUCCESSFUL;
-
-  the_region = _Region_Get( id, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-      return RTEMS_INVALID_ID;
-    case OBJECTS_REMOTE:        /* this error cannot be returned */
-      return RTEMS_INTERNAL_ERROR;
-    case OBJECTS_LOCAL:
-
-      heap_status = _Heap_Extend(
-        &the_region->Memory,
-        starting_address,
-        length,
-        &amount_extended
-      );
-
-      switch ( heap_status ) {
-        case HEAP_EXTEND_SUCCESSFUL:
-          the_region->length                += amount_extended;
-          the_region->maximum_segment_size  += amount_extended;
-          break;
-        case HEAP_EXTEND_ERROR:
-          status = RTEMS_INVALID_ADDRESS;
-          break;
-        case HEAP_EXTEND_NOT_IMPLEMENTED:
-          status = RTEMS_NOT_IMPLEMENTED;
-          break;
-      }
-      _Thread_Enable_dispatch();
-      return( status );
-  }
-
-  return RTEMS_INTERNAL_ERROR;   /* unreached - only to remove warnings */
-}
-
-/*PAGE
- *
- *  rtems_region_get_segment
- *
- *  This directive will obtain a segment from the given region.
- *
- *  Input parameters:
- *    id         - region id
- *    size       - segment size in bytes
- *    option_set - wait option
- *    timeout    - number of ticks to wait (0 means wait forever)
- *    segment    - pointer to segment address
- *
- *  Output parameters:
- *    segment    - pointer to segment address filled in
- *    RTEMS_SUCCESSFUL - if successful
- *    error code - if unsuccessful
- */
-
-rtems_status_code rtems_region_get_segment(
-  Objects_Id         id,
-  unsigned32         size,
-  rtems_option       option_set,
-  rtems_interval     timeout,
-  void              **segment
-)
-{
-  register Region_Control *the_region;
-  Objects_Locations        location;
-  Thread_Control          *executing;
-  void                    *the_segment;
-
-  *segment = NULL;
-
-  if ( size == 0 )
-    return RTEMS_INVALID_SIZE;
-
-  executing  = _Thread_Executing;
-  the_region = _Region_Get( id, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-      return RTEMS_INVALID_ID;
-    case OBJECTS_REMOTE:        /* this error cannot be returned */
-      return RTEMS_INTERNAL_ERROR;
-    case OBJECTS_LOCAL:
-      if ( size > the_region->maximum_segment_size ) {
-        _Thread_Enable_dispatch();
-        return RTEMS_INVALID_SIZE;
-      }
-
-      _Region_Debug_Walk( the_region, 1 );
-
-      the_segment = _Region_Allocate_segment( the_region, size );
-
-      _Region_Debug_Walk( the_region, 2 );
-
-      if ( the_segment ) {
-        the_region->number_of_used_blocks += 1;
-        _Thread_Enable_dispatch();
-        *segment = the_segment;
-        return RTEMS_SUCCESSFUL;
-      }
-
-      if ( _Options_Is_no_wait( option_set ) ) {
-        _Thread_Enable_dispatch();
-        return RTEMS_UNSATISFIED;
-      }
-
-      executing->Wait.queue           = &the_region->Wait_queue;
-      executing->Wait.id              = id;
-      executing->Wait.count           = size;
-      executing->Wait.return_argument = (unsigned32 *) segment;
-
-      _Thread_queue_Enter_critical_section( &the_region->Wait_queue );
-
-      _Thread_queue_Enqueue( &the_region->Wait_queue, timeout );
-
-      _Thread_Enable_dispatch();
-      return (rtems_status_code) executing->Wait.return_code;
-  }
-
-  return RTEMS_INTERNAL_ERROR;   /* unreached - only to remove warnings */
-}
-/*PAGE
- *
- *  rtems_region_get_segment_size
- *
- *  This directive will return the size of the segment indicated
- *
- *  Input parameters:
- *    id         - region id
- *    segment    - segment address
- *    size       - pointer to segment size in bytes
- *
- *  Output parameters:
- *    size       - segment size in bytes filled in
- *    RTEMS_SUCCESSFUL - if successful
- *    error code - if unsuccessful
- */
-
-rtems_status_code rtems_region_get_segment_size(
-  Objects_Id         id,
-  void              *segment,
-  unsigned32        *size
-)
-{
-  register Region_Control *the_region;
-  Objects_Locations        location;
-  Thread_Control          *executing;
-
-  executing  = _Thread_Executing;
-  the_region = _Region_Get( id, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-      return RTEMS_INVALID_ID;
-    case OBJECTS_REMOTE:        /* this error cannot be returned */
-      return RTEMS_INTERNAL_ERROR;
-    case OBJECTS_LOCAL:
-
-      if ( _Heap_Size_of_user_area( &the_region->Memory, segment, size ) ) {
-        _Thread_Enable_dispatch();
-        return RTEMS_SUCCESSFUL;
-      }
-      _Thread_Enable_dispatch();
-      return RTEMS_INVALID_ADDRESS;
-  }
-
-  return RTEMS_INTERNAL_ERROR;   /* unreached - only to remove warnings */
-}
-
-/*PAGE
- *
- *  rtems_region_return_segment
- *
- *  This directive will return a segment to its region.
- *
- *  Input parameters:
- *    id      - region id
- *    segment - pointer to segment address
- *
- *  Output parameters:
- *    RTEMS_SUCCESSFUL - if successful
- *    error code        - if unsuccessful
- */
-
-rtems_status_code rtems_region_return_segment(
-  Objects_Id  id,
-  void       *segment
-)
-{
-  register Region_Control *the_region;
-  Thread_Control          *the_thread;
-  Objects_Locations        location;
-  void                   **the_segment;
-  int                      status;
-
-  the_region = _Region_Get( id, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-      return RTEMS_INVALID_ID;
-    case OBJECTS_REMOTE:        /* this error cannot be returned */
-      return RTEMS_INTERNAL_ERROR;
-    case OBJECTS_LOCAL:
-
-      _Region_Debug_Walk( the_region, 3 );
-
-      status = _Region_Free_segment( the_region, segment );
-
-      _Region_Debug_Walk( the_region, 4 );
-
-      if ( !status ) {
-        _Thread_Enable_dispatch();
-        return RTEMS_INVALID_ADDRESS;
-      }
-
-      the_region->number_of_used_blocks -= 1;
-      for ( ; ; ) {
-        the_thread = _Thread_queue_First( &the_region->Wait_queue );
-
-        if ( the_thread == NULL )
-           break;
-
-        the_segment = (void **) _Region_Allocate_segment(
-           the_region, 
-           the_thread->Wait.count
-        );
-
-        if ( the_segment == NULL )
-           break;
-
-        *(void **)the_thread->Wait.return_argument = the_segment;
-        the_region->number_of_used_blocks += 1;
-        _Thread_queue_Extract( &the_region->Wait_queue, the_thread );
-        the_thread->Wait.return_code = RTEMS_SUCCESSFUL;
-      }
-
-      _Thread_Enable_dispatch();
-      return RTEMS_SUCCESSFUL;
-  }
-
-  return RTEMS_INTERNAL_ERROR;   /* unreached - only to remove warnings */
-}
diff --git a/cpukit/rtems/src/regionmp.c b/cpukit/rtems/src/regionmp.c
deleted file mode 100644
index 0b833f8671..0000000000
--- a/cpukit/rtems/src/regionmp.c
+++ /dev/null
@@ -1,310 +0,0 @@
-/*
- *  Multiprocessing Support for the Region Manager
- *
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems/system.h>
-#include <rtems/rtems/status.h>
-#include <rtems/score/mpci.h>
-#include <rtems/score/mppkt.h>
-#include <rtems/score/object.h>
-#include <rtems/rtems/options.h>
-#include <rtems/rtems/region.h>
-#include <rtems/score/thread.h>
-#include <rtems/rtems/support.h>
-
-/*PAGE
- *
- *  _Region_MP_Send_process_packet
- *
- */
-
-void _Region_MP_Send_process_packet (
-  Region_MP_Remote_operations  operation,
-  Objects_Id                      region_id,
-  rtems_name                      name,
-  Objects_Id                      proxy_id
-)
-{
-  Region_MP_Packet *the_packet;
-  unsigned32           node;
-
-  switch ( operation ) {
-
-    case REGION_MP_ANNOUNCE_CREATE:
-    case REGION_MP_ANNOUNCE_DELETE:
-    case REGION_MP_EXTRACT_PROXY:
-
-      the_packet                    = _Region_MP_Get_packet();
-      the_packet->Prefix.the_class  = MP_PACKET_REGION;
-      the_packet->Prefix.length     = sizeof ( Region_MP_Packet );
-      the_packet->Prefix.to_convert = sizeof ( Region_MP_Packet );
-      the_packet->operation         = operation;
-      the_packet->Prefix.id         = region_id;
-      the_packet->name              = name;
-      the_packet->proxy_id          = proxy_id;
-
-      if ( operation == REGION_MP_EXTRACT_PROXY )
-         node = rtems_get_node( region_id );
-      else
-         node = MPCI_ALL_NODES;
-
-      _MPCI_Send_process_packet( node, &the_packet->Prefix );
-      break;
-
-    case REGION_MP_GET_SEGMENT_REQUEST:
-    case REGION_MP_GET_SEGMENT_RESPONSE:
-    case REGION_MP_RETURN_SEGMENT_REQUEST:
-    case REGION_MP_RETURN_SEGMENT_RESPONSE:
-      break;
-  }
-}
-
-/*PAGE
- *
- *  _Region_MP_Send_request_packet
- *
- */
-
-rtems_status_code _Region_MP_Send_request_packet (
-  Region_MP_Remote_operations  operation,
-  Objects_Id                   region_id,
-  void                        *segment,
-  unsigned32                   size,
-  rtems_option                 option_set,
-  rtems_interval               timeout
-)
-{
-  Region_MP_Packet *the_packet;
-
-  switch ( operation ) {
-
-    case REGION_MP_GET_SEGMENT_REQUEST:
-    case REGION_MP_RETURN_SEGMENT_REQUEST:
-
-      the_packet                    = _Region_MP_Get_packet();
-      the_packet->Prefix.the_class  = MP_PACKET_REGION;
-      the_packet->Prefix.length     = sizeof ( Region_MP_Packet );
-      the_packet->Prefix.to_convert = sizeof ( Region_MP_Packet );
-      if ( ! _Options_Is_no_wait(option_set))
-          the_packet->Prefix.timeout = timeout;
-
-      the_packet->operation         = operation;
-      the_packet->Prefix.id         = region_id;
-      the_packet->segment           = segment;
-      the_packet->size              = size;
-      the_packet->option_set        = option_set;
-
-      return (rtems_status_code) _MPCI_Send_request_packet(
-          rtems_get_node( region_id ),
-          &the_packet->Prefix,
-          STATES_READY      /* Not used */
-        );
-      break;
-
-    case REGION_MP_ANNOUNCE_CREATE:
-    case REGION_MP_ANNOUNCE_DELETE:
-    case REGION_MP_EXTRACT_PROXY:
-    case REGION_MP_GET_SEGMENT_RESPONSE:
-    case REGION_MP_RETURN_SEGMENT_RESPONSE:
-      break;
-
-  }
-  /*
-   *  The following line is included to satisfy compilers which
-   *  produce warnings when a function does not end with a return.
-   */
-  return RTEMS_INTERNAL_ERROR;
-}
-
-/*PAGE
- *
- *  _Region_MP_Send_response_packet
- *
- */
-
-void _Region_MP_Send_response_packet (
-  Region_MP_Remote_operations  operation,
-  Objects_Id                   region_id,
-  Thread_Control              *the_thread
-)
-{
-  Region_MP_Packet *the_packet;
-
-  switch ( operation ) {
-
-    case REGION_MP_GET_SEGMENT_RESPONSE:
-    case REGION_MP_RETURN_SEGMENT_RESPONSE:
-
-      the_packet = ( Region_MP_Packet *) the_thread->receive_packet;
-
-/*
- *  The packet being returned already contains the class, length, and
- *  to_convert fields, therefore they are not set in this routine.
- */
-      the_packet->operation = operation;
-      the_packet->Prefix.id = the_packet->Prefix.source_tid;
-
-      _MPCI_Send_response_packet(
-        rtems_get_node( the_packet->Prefix.source_tid ),
-        &the_packet->Prefix
-      );
-      break;
-
-    case REGION_MP_ANNOUNCE_CREATE:
-    case REGION_MP_ANNOUNCE_DELETE:
-    case REGION_MP_EXTRACT_PROXY:
-    case REGION_MP_GET_SEGMENT_REQUEST:
-    case REGION_MP_RETURN_SEGMENT_REQUEST:
-      break;
-
-  }
-}
-
-/*PAGE
- *
- *
- *  _Region_MP_Process_packet
- *
- */
-
-void _Region_MP_Process_packet (
-  rtems_packet_prefix  *the_packet_prefix
-)
-{
-  Region_MP_Packet *the_packet;
-  Thread_Control   *the_thread;
-  boolean           ignored;
-
-  the_packet = (Region_MP_Packet *) the_packet_prefix;
-
-  switch ( the_packet->operation ) {
-
-    case REGION_MP_ANNOUNCE_CREATE:
-
-      ignored = _Objects_MP_Allocate_and_open(
-                  &_Region_Information,
-                  the_packet->name,
-                  the_packet->Prefix.id,
-                  TRUE
-                );
-
-      _MPCI_Return_packet( the_packet_prefix );
-      break;
-
-    case REGION_MP_ANNOUNCE_DELETE:
-
-      _Objects_MP_Close( &_Region_Information, the_packet->Prefix.id );
-
-      _MPCI_Return_packet( the_packet_prefix );
-      break;
-
-    case REGION_MP_EXTRACT_PROXY:
-
-      the_thread = _Thread_MP_Find_proxy( the_packet->proxy_id );
-
-      if ( ! _Thread_Is_null( the_thread ) )
-        _Thread_queue_Extract( the_thread->Wait.queue, the_thread );
-
-      _MPCI_Return_packet( the_packet_prefix );
-      break;
-
-    case REGION_MP_GET_SEGMENT_REQUEST:
-
-      the_packet->Prefix.return_code = rtems_region_get_segment(
-        the_packet->Prefix.id,
-        the_packet->size,
-        the_packet->option_set,
-        the_packet->Prefix.timeout,
-        &the_packet->segment
-      );
-
-      _Region_MP_Send_response_packet(
-        REGION_MP_GET_SEGMENT_RESPONSE,
-        the_packet->Prefix.id,
-        _Thread_Executing
-      );
-      break;
-
-    case REGION_MP_GET_SEGMENT_RESPONSE:
-
-      the_thread = _MPCI_Process_response( the_packet_prefix );
-
-      *(void **)the_thread->Wait.return_argument = the_packet->segment;
-
-      _MPCI_Return_packet( the_packet_prefix );
-      break;
-
-    case REGION_MP_RETURN_SEGMENT_REQUEST:
-
-      the_packet->Prefix.return_code = rtems_region_return_segment(
-        the_packet->Prefix.id,
-        the_packet->segment
-      );
-
-      _Region_MP_Send_response_packet(
-        REGION_MP_RETURN_SEGMENT_RESPONSE,
-        the_packet->Prefix.id,
-        _Thread_Executing
-      );
-      break;
-
-    case REGION_MP_RETURN_SEGMENT_RESPONSE:
-
-      the_thread = _MPCI_Process_response( the_packet_prefix );
-
-      _MPCI_Return_packet( the_packet_prefix );
-      break;
-
-  }
-}
-
-/*PAGE
- *
- *  _Region_MP_Send_object_was_deleted
- *
- *  This routine is not needed by the Region since a region
- *  cannot be deleted when segments are in use.
- *
- */
-
-/*PAGE
- *
- *  _Region_MP_Send_extract_proxy
- *
- */
-
-void _Region_MP_Send_extract_proxy (
-  Thread_Control *the_thread
-)
-{
-  _Region_MP_Send_process_packet(
-    REGION_MP_EXTRACT_PROXY,
-    the_thread->Wait.id,
-    (rtems_name) 0,
-    the_thread->Object.id
-  );
-}
-
-/*PAGE
- *
- *  _Region_MP_Get_packet
- *
- */
-
-Region_MP_Packet *_Region_MP_Get_packet ( void )
-{
-  return ( (Region_MP_Packet *) _MPCI_Get_packet() );
-}
-
-/* end of file */
diff --git a/cpukit/rtems/src/rtclock.c b/cpukit/rtems/src/rtclock.c
deleted file mode 100644
index 8a1b6b56af..0000000000
--- a/cpukit/rtems/src/rtclock.c
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- *  Clock Manager
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems/system.h>
-#include <rtems/rtems/status.h>
-#include <rtems/rtems/clock.h>
-#include <rtems/score/isr.h>
-#include <rtems/score/thread.h>
-#include <rtems/score/tod.h>
-#include <rtems/score/watchdog.h>
-
-/*PAGE
- *
- *  rtems_clock_get
- *
- *  This directive returns the current date and time.  If the time has
- *  not been set by a tm_set then an error is returned.
- *
- *  Input parameters:
- *    option      - which value to return
- *    time_buffer - pointer to output buffer (a time and date structure
- *                  or an interval)
- *
- *  Output parameters:
- *    time_buffer      - output filled in
- *    RTEMS_SUCCESSFUL - if successful
- *    error code       - if unsuccessful
- */
-
-rtems_status_code rtems_clock_get(
-  rtems_clock_get_options  option,
-  void                    *time_buffer
-)
-{
-  ISR_Level      level;
-  rtems_interval tmp;
-
-  switch ( option ) {
-    case RTEMS_CLOCK_GET_TOD:
-      if ( !_TOD_Is_set )
-        return RTEMS_NOT_DEFINED;
-
-      *(rtems_time_of_day *)time_buffer = _TOD_Current;
-      return RTEMS_SUCCESSFUL;
-
-    case RTEMS_CLOCK_GET_SECONDS_SINCE_EPOCH:
-      if ( !_TOD_Is_set )
-        return RTEMS_NOT_DEFINED;
-
-      *(rtems_interval *)time_buffer = _TOD_Seconds_since_epoch;
-      return RTEMS_SUCCESSFUL;
-
-    case RTEMS_CLOCK_GET_TICKS_SINCE_BOOT:
-      *(rtems_interval *)time_buffer = _Watchdog_Ticks_since_boot;
-      return RTEMS_SUCCESSFUL;
-
-    case RTEMS_CLOCK_GET_TICKS_PER_SECOND:
-      *(rtems_interval *)time_buffer = _TOD_Ticks_per_second;
-      return RTEMS_SUCCESSFUL;
-
-    case RTEMS_CLOCK_GET_TIME_VALUE:
-      if ( !_TOD_Is_set )
-        return RTEMS_NOT_DEFINED;
-
-      _ISR_Disable( level );
-        ((rtems_clock_time_value *)time_buffer)->seconds =
-          _TOD_Seconds_since_epoch;
-        tmp = _TOD_Current.ticks;
-      _ISR_Enable( level );
-
-      tmp *= _TOD_Microseconds_per_tick;
-      ((rtems_clock_time_value *)time_buffer)->microseconds = tmp;
-
-      return RTEMS_SUCCESSFUL;
-  }
-
-  return RTEMS_INTERNAL_ERROR;   /* should never get here */
-
-}
-
-/*PAGE
- *
- *  rtems_clock_set
- *
- *  This directive sets the date and time for this node.
- *
- *  Input parameters:
- *    time_buffer - pointer to the time and date structure
- *
- *  Output parameters:
- *    RTEMS_SUCCESSFUL - if successful
- *    error code        - if unsuccessful
- */
-
-rtems_status_code rtems_clock_set(
-  rtems_time_of_day *time_buffer
-)
-{
-  rtems_interval     seconds;
-
-  if ( _TOD_Validate( time_buffer ) ) {
-    seconds = _TOD_To_seconds( time_buffer );
-    _Thread_Disable_dispatch();
-      _TOD_Set( time_buffer, seconds );
-    _Thread_Enable_dispatch();
-    return RTEMS_SUCCESSFUL;
-  }
-  return RTEMS_INVALID_CLOCK;
-}
-
-/*PAGE
- *
- *  rtems_clock_tick
- *
- *  This directive notifies the executve that a tick has occurred.
- *  When the tick occurs the time manager updates and maintains
- *  the calendar time, timeslicing, and any timeout delays.
- *
- *  Input parameters:  NONE
- *
- *  Output parameters:
- *    RTEMS_SUCCESSFUL - always succeeds
- *
- *  NOTE: This routine only works for leap-years through 2099.
- */
-
-rtems_status_code rtems_clock_tick( void )
-{
-  _TOD_Tickle_ticks();
-
-  _Watchdog_Tickle_ticks();
-
-  _Thread_Tickle_timeslice();
-
-  if ( _Thread_Is_context_switch_necessary() &&
-       _Thread_Is_dispatching_enabled() )
-    _Thread_Dispatch();
-
-  return RTEMS_SUCCESSFUL;
-}
diff --git a/cpukit/rtems/src/rtemstimer.c b/cpukit/rtems/src/rtemstimer.c
deleted file mode 100644
index 9d04686d40..0000000000
--- a/cpukit/rtems/src/rtemstimer.c
+++ /dev/null
@@ -1,349 +0,0 @@
-/*
- *  Timer Manager
- *
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems/system.h>
-#include <rtems/rtems/status.h>
-#include <rtems/rtems/support.h>
-#include <rtems/score/object.h>
-#include <rtems/score/thread.h>
-#include <rtems/rtems/timer.h>
-#include <rtems/score/tod.h>
-#include <rtems/score/watchdog.h>
-
-/*PAGE
- *
- *  _Timer_Manager_initialization
- *
- *  This routine initializes all timer manager related data structures.
- *
- *  Input parameters:
- *    maximum_timers - number of timers to initialize
- *
- *  Output parameters:  NONE
- */
-
-void _Timer_Manager_initialization(
-  unsigned32 maximum_timers
-)
-{
-  _Objects_Initialize_information(
-    &_Timer_Information,
-    OBJECTS_RTEMS_TIMERS,
-    FALSE,
-    maximum_timers,
-    sizeof( Timer_Control ),
-    FALSE,
-    RTEMS_MAXIMUM_NAME_LENGTH,
-    FALSE
-  );
-}
-
-/*PAGE
- *
- *  rtems_timer_create
- *
- *  This directive creates a timer and performs some initialization.
- *
- *  Input parameters:
- *    name - timer name
- *    id   - pointer to timer id
- *
- *  Output parameters:
- *    id                - timer id
- *    RTEMS_SUCCESSFUL - if successful
- *    error code        - if unsuccessful
- */
-
-rtems_status_code rtems_timer_create(
-  rtems_name    name,
-  Objects_Id   *id
-)
-{
-  Timer_Control *the_timer;
-
-  if ( !rtems_is_name_valid( name ) )
-    return RTEMS_INVALID_NAME;
-
-  _Thread_Disable_dispatch();         /* to prevent deletion */
-
-  the_timer = _Timer_Allocate();
-
-  if ( !the_timer ) {
-    _Thread_Enable_dispatch();
-    return RTEMS_TOO_MANY;
-  }
-
-  the_timer->the_class = TIMER_DORMANT;
-
-  _Objects_Open( &_Timer_Information, &the_timer->Object, &name );
-
-  *id = the_timer->Object.id;
-  _Thread_Enable_dispatch();
-  return RTEMS_SUCCESSFUL;
-}
-
-/*PAGE
- *
- *  rtems_timer_ident
- *
- *  This directive returns the system ID associated with
- *  the timer name.
- *
- *  Input parameters:
- *    name - user defined message queue name
- *    id   - pointer to timer id
- *
- *  Output parameters:
- *    *id               - message queue id
- *    RTEMS_SUCCESSFUL - if successful
- *    error code        - if unsuccessful
- */
-
-rtems_status_code rtems_timer_ident(
-  rtems_name    name,
-  Objects_Id   *id
-)
-{
-  Objects_Name_to_id_errors  status;
-
-  status = _Objects_Name_to_id(
-    &_Timer_Information,
-    &name,
-    OBJECTS_SEARCH_LOCAL_NODE,
-    id
-  );
-
-  return _Status_Object_name_errors_to_status[ status ];
-}
-
-/*PAGE
- *
- *  rtems_timer_cancel
- *
- *  This directive allows a thread to cancel a timer.
- *
- *  Input parameters:
- *    id - timer id
- *
- *  Output parameters:
- *    RTEMS_SUCCESSFUL - if successful
- *    error code - if unsuccessful
- */
-
-rtems_status_code rtems_timer_cancel(
-  Objects_Id id
-)
-{
-  Timer_Control   *the_timer;
-  Objects_Locations       location;
-
-  the_timer = _Timer_Get( id, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-      return RTEMS_INVALID_ID;
-    case OBJECTS_REMOTE:            /* should never return this */
-      return RTEMS_INTERNAL_ERROR;
-    case OBJECTS_LOCAL:
-      if ( !_Timer_Is_dormant_class( the_timer->the_class ) ) 
-        (void) _Watchdog_Remove( &the_timer->Ticker );
-      _Thread_Enable_dispatch();
-      return RTEMS_SUCCESSFUL;
-  }
-
-  return RTEMS_INTERNAL_ERROR;   /* unreached - only to remove warnings */
-}
-
-/*PAGE
- *
- *  rtems_timer_delete
- *
- *  This directive allows a thread to delete a timer.
- *
- *  Input parameters:
- *    id - timer id
- *
- *  Output parameters:
- *    RTEMS_SUCCESSFUL - if successful
- *    error code - if unsuccessful
- */
-
-rtems_status_code rtems_timer_delete(
-  Objects_Id id
-)
-{
-  Timer_Control   *the_timer;
-  Objects_Locations       location;
-
-  the_timer = _Timer_Get( id, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-      return RTEMS_INVALID_ID;
-    case OBJECTS_REMOTE:            /* should never return this */
-      return RTEMS_INTERNAL_ERROR;
-    case OBJECTS_LOCAL:
-      _Objects_Close( &_Timer_Information, &the_timer->Object );
-      (void) _Watchdog_Remove( &the_timer->Ticker );
-      _Timer_Free( the_timer );
-      _Thread_Enable_dispatch();
-      return RTEMS_SUCCESSFUL;
-  }
-
-  return RTEMS_INTERNAL_ERROR;   /* unreached - only to remove warnings */
-}
-
-/*PAGE
- *
- *  rtems_timer_fire_after
- *
- *  This directive allows a thread to start a timer.
- *
- *  Input parameters:
- *    id      - timer id
- *    ticks   - interval until routine is fired
- *    routine - routine to schedule
- *
- *  Output parameters:
- *    RTEMS_SUCCESSFUL - if successful
- *    error code        - if unsuccessful
- */
-
-rtems_status_code rtems_timer_fire_after(
-  Objects_Id                         id,
-  rtems_interval                     ticks,
-  rtems_timer_service_routine_entry  routine,
-  void                              *user_data
-)
-{
-  Timer_Control      *the_timer;
-  Objects_Locations   location;
-
-  if ( ticks == 0 )
-    return RTEMS_INVALID_NUMBER;
-
-  the_timer = _Timer_Get( id, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-      return RTEMS_INVALID_ID;
-    case OBJECTS_REMOTE:            /* should never return this */
-      return RTEMS_INTERNAL_ERROR;
-    case OBJECTS_LOCAL:
-      (void) _Watchdog_Remove( &the_timer->Ticker );
-      the_timer->the_class = TIMER_INTERVAL;
-      _Watchdog_Initialize( &the_timer->Ticker, routine, id, user_data );
-      _Watchdog_Insert_ticks( &the_timer->Ticker, ticks );
-      _Thread_Enable_dispatch();
-      return RTEMS_SUCCESSFUL;
-  }
-
-  return RTEMS_INTERNAL_ERROR;   /* unreached - only to remove warnings */
-}
-
-/*PAGE
- *
- *  rtems_timer_fire_when
- *
- *  This directive allows a thread to start a timer.
- *
- *  Input parameters:
- *    id        - timer id
- *    wall_time - time of day to fire timer
- *    routine   - routine to schedule
- *
- *  Output parameters:
- *    RTEMS_SUCCESSFUL - if successful
- *    error code        - if unsuccessful
- */
-
-rtems_status_code rtems_timer_fire_when(
-  Objects_Id                          id,
-  rtems_time_of_day                  *wall_time,
-  rtems_timer_service_routine_entry   routine,
-  void                               *user_data
-)
-{
-  Timer_Control       *the_timer;
-  Objects_Locations    location;
-  rtems_interval       seconds;
-
-  if ( !_TOD_Is_set )
-    return RTEMS_NOT_DEFINED;
-
-  if ( !_TOD_Validate( wall_time ) )
-    return RTEMS_INVALID_CLOCK;
-
-  seconds = _TOD_To_seconds( wall_time );
-  if ( seconds <= _TOD_Seconds_since_epoch )
-    return RTEMS_INVALID_CLOCK;
-
-  the_timer = _Timer_Get( id, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-      return RTEMS_INVALID_ID;
-    case OBJECTS_REMOTE:            /* should never return this */
-      return RTEMS_INTERNAL_ERROR;
-    case OBJECTS_LOCAL:
-      (void) _Watchdog_Remove( &the_timer->Ticker );
-      the_timer->the_class = TIMER_TIME_OF_DAY;
-      _Watchdog_Initialize( &the_timer->Ticker, routine, id, user_data );
-      _Watchdog_Insert_seconds(
-         &the_timer->Ticker,
-         seconds - _TOD_Seconds_since_epoch
-       );
-      _Thread_Enable_dispatch();
-      return RTEMS_SUCCESSFUL;
-  }
-
-  return RTEMS_INTERNAL_ERROR;   /* unreached - only to remove warnings */
-}
-
-/*PAGE
- *
- *  rtems_timer_reset
- *
- *  This directive allows a thread to reset a timer.
- *
- *  Input parameters:
- *    id - timer id
- *
- *  Output parameters:
- *    RTEMS_SUCCESSFUL - if successful
- *    error code        - if unsuccessful
- */
-
-rtems_status_code rtems_timer_reset(
-  Objects_Id id
-)
-{
-  Timer_Control     *the_timer;
-  Objects_Locations  location;
-
-  the_timer = _Timer_Get( id, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-      return RTEMS_INVALID_ID;
-    case OBJECTS_REMOTE:            /* should never return this */
-      return RTEMS_INTERNAL_ERROR;
-    case OBJECTS_LOCAL:
-      if ( _Timer_Is_interval_class( the_timer->the_class ) ) {
-        _Watchdog_Reset( &the_timer->Ticker );
-        _Thread_Enable_dispatch();
-        return RTEMS_SUCCESSFUL;
-      }
-      _Thread_Enable_dispatch();
-      return RTEMS_NOT_DEFINED;
-  }
-
-  return RTEMS_INTERNAL_ERROR;   /* unreached - only to remove warnings */
-}
diff --git a/cpukit/rtems/src/sem.c b/cpukit/rtems/src/sem.c
deleted file mode 100644
index f1c1f1fbb9..0000000000
--- a/cpukit/rtems/src/sem.c
+++ /dev/null
@@ -1,571 +0,0 @@
-/*
- *  Semaphore Manager
- *
- *  DESCRIPTION:
- *
- *  This package is the implementation of the Semaphore Manager.
- *  This manager utilizes standard Dijkstra counting semaphores to provide
- *  synchronization and mutual exclusion capabilities.
- *
- *  Directives provided are:
- *
- *     + create a semaphore
- *     + get an ID of a semaphore
- *     + delete a semaphore
- *     + acquire a semaphore
- *     + release a semaphore
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems/system.h>
-#include <rtems/rtems/status.h>
-#include <rtems/rtems/support.h>
-#include <rtems/rtems/attr.h>
-#include <rtems/score/isr.h>
-#include <rtems/score/object.h>
-#include <rtems/rtems/options.h>
-#include <rtems/rtems/sem.h>
-#include <rtems/score/coremutex.h>
-#include <rtems/score/coresem.h>
-#include <rtems/score/states.h>
-#include <rtems/score/thread.h>
-#include <rtems/score/threadq.h>
-#include <rtems/score/mpci.h>
-#include <rtems/score/sysstate.h>
-
-#include <rtems/score/interr.h>
-
-/*PAGE
- *
- *  _Semaphore_Manager_initialization
- *
- *  This routine initializes all semaphore manager related data structures.
- *
- *  Input parameters:
- *    maximum_semaphores - maximum configured semaphores
- *
- *  Output parameters:  NONE
- */
-
-void _Semaphore_Manager_initialization(
-  unsigned32 maximum_semaphores
-)
-{
-  _Objects_Initialize_information(
-    &_Semaphore_Information,
-    OBJECTS_RTEMS_SEMAPHORES,
-    TRUE,
-    maximum_semaphores,
-    sizeof( Semaphore_Control ),
-    FALSE,
-    RTEMS_MAXIMUM_NAME_LENGTH,
-    FALSE
-  );
- 
-  /*
-   *  Register the MP Process Packet routine.
-   */
- 
-  _MPCI_Register_packet_processor(
-    MP_PACKET_SEMAPHORE,
-    _Semaphore_MP_Process_packet
-  );
-
-}
-
-/*PAGE
- *
- *  rtems_semaphore_create
- *
- *  This directive creates a semaphore and sets the initial value based
- *  on the given count.  A semaphore id is returned.
- *
- *  Input parameters:
- *    name             - user defined semaphore name
- *    count            - initial count of semaphore
- *    attribute_set    - semaphore attributes
- *    priority_ceiling - semaphore's ceiling priority 
- *    id               - pointer to semaphore id
- *
- *  Output parameters:
- *    id       - semaphore id
- *    RTEMS_SUCCESSFUL - if successful
- *    error code - if unsuccessful
- */
-
-rtems_status_code rtems_semaphore_create(
-  rtems_name           name,
-  unsigned32           count,
-  rtems_attribute      attribute_set,
-  rtems_task_priority  priority_ceiling,
-  Objects_Id          *id
-)
-{
-  register Semaphore_Control *the_semaphore;
-  CORE_mutex_Attributes       the_mutex_attributes;
-  CORE_semaphore_Attributes   the_semaphore_attributes;
-  unsigned32                  lock;
-
-  if ( !rtems_is_name_valid( name ) )
-    return RTEMS_INVALID_NAME;
-
-  if ( _Attributes_Is_global( attribute_set ) ) {
-
-    if ( !_System_state_Is_multiprocessing )
-      return RTEMS_MP_NOT_CONFIGURED;
-
-    if ( _Attributes_Is_inherit_priority( attribute_set ) )
-      return RTEMS_NOT_DEFINED;
-
-  } else if ( _Attributes_Is_inherit_priority( attribute_set ) || 
-              _Attributes_Is_priority_ceiling( attribute_set ) ) {
-
-    if ( ! ( _Attributes_Is_binary_semaphore( attribute_set ) &&
-             _Attributes_Is_priority( attribute_set ) ) )
-      return RTEMS_NOT_DEFINED;
-
-  }
-
-  if ( _Attributes_Is_binary_semaphore( attribute_set ) && ( count > 1 ) )
-    return RTEMS_INVALID_NUMBER;
-
-  _Thread_Disable_dispatch();             /* prevents deletion */
-
-  the_semaphore = _Semaphore_Allocate();
-
-  if ( !the_semaphore ) {
-    _Thread_Enable_dispatch();
-    return RTEMS_TOO_MANY;
-  }
-
-  if ( _Attributes_Is_global( attribute_set ) &&
-       ! ( _Objects_MP_Allocate_and_open( &_Semaphore_Information, name,
-                            the_semaphore->Object.id, FALSE ) ) ) {
-    _Semaphore_Free( the_semaphore );
-    _Thread_Enable_dispatch();
-    return RTEMS_TOO_MANY;
-  }
-
-  the_semaphore->attribute_set = attribute_set;
-
-  if ( _Attributes_Is_binary_semaphore( attribute_set ) ) {
-    if ( _Attributes_Is_inherit_priority( attribute_set ) )
-      the_mutex_attributes.discipline = CORE_MUTEX_DISCIPLINES_PRIORITY_INHERIT;
-    else if (_Attributes_Is_priority_ceiling( attribute_set ) )
-      the_mutex_attributes.discipline = CORE_MUTEX_DISCIPLINES_PRIORITY_CEILING;
-    else if (_Attributes_Is_priority( attribute_set ) )
-      the_mutex_attributes.discipline = CORE_MUTEX_DISCIPLINES_PRIORITY;
-    else
-      the_mutex_attributes.discipline = CORE_MUTEX_DISCIPLINES_FIFO;
-
-    the_mutex_attributes.allow_nesting = TRUE;
-
-    /* Add priority ceiling code here ????? */
-
-    the_mutex_attributes.priority_ceiling = priority_ceiling;
-
-    if ( count == 1 )
-      lock = CORE_MUTEX_UNLOCKED;
-    else
-      lock = CORE_MUTEX_LOCKED;
-
-    _CORE_mutex_Initialize(
-      &the_semaphore->Core_control.mutex,
-      OBJECTS_RTEMS_SEMAPHORES,
-      &the_mutex_attributes,
-      lock,
-      _Semaphore_MP_Send_extract_proxy
-    );
-  }
-  else {
-    if ( _Attributes_Is_priority( attribute_set ) )
-      the_semaphore_attributes.discipline = CORE_SEMAPHORE_DISCIPLINES_PRIORITY;
-    else
-      the_semaphore_attributes.discipline = CORE_SEMAPHORE_DISCIPLINES_FIFO;
-
-    /*
-     *  The following are just to make Purify happy.
-     */
-
-    the_mutex_attributes.allow_nesting = TRUE;
-    the_mutex_attributes.priority_ceiling = PRIORITY_MINIMUM;
-
-    _CORE_semaphore_Initialize(
-      &the_semaphore->Core_control.semaphore,
-      OBJECTS_RTEMS_SEMAPHORES,
-      &the_semaphore_attributes,
-      count,
-      _Semaphore_MP_Send_extract_proxy
-    );
-  }
-
-  _Objects_Open( &_Semaphore_Information, &the_semaphore->Object, &name );
-
-  *id = the_semaphore->Object.id;
-
-  if ( _Attributes_Is_global( attribute_set ) )
-    _Semaphore_MP_Send_process_packet(
-      SEMAPHORE_MP_ANNOUNCE_CREATE,
-      the_semaphore->Object.id,
-      name,
-      0                          /* Not used */
-    );
-  _Thread_Enable_dispatch();
-  return RTEMS_SUCCESSFUL;
-}
-
-/*PAGE
- *
- *  rtems_semaphore_ident
- *
- *  This directive returns the system ID associated with
- *  the semaphore name.
- *
- *  Input parameters:
- *    name - user defined semaphore name
- *    node - node(s) to be searched
- *    id   - pointer to semaphore id
- *
- *  Output parameters:
- *    *id      - semaphore id
- *    RTEMS_SUCCESSFUL - if successful
- *    error code - if unsuccessful
- */
-
-rtems_status_code rtems_semaphore_ident(
-  rtems_name  name,
-  unsigned32  node,
-  Objects_Id *id
-)
-{
-  Objects_Name_to_id_errors  status;
- 
-  status = _Objects_Name_to_id( &_Semaphore_Information, &name, node, id );
- 
-  return _Status_Object_name_errors_to_status[ status ];
-}
-
-/*PAGE
- *
- *  rtems_semaphore_delete
- *
- *  This directive allows a thread to delete a semaphore specified by
- *  the semaphore id.  The semaphore is freed back to the inactive
- *  semaphore chain.
- *
- *  Input parameters:
- *    id - semaphore id
- *
- *  Output parameters:
- *    RTEMS_SUCCESSFUL - if successful
- *    error code        - if unsuccessful
- */
-
-rtems_status_code rtems_semaphore_delete(
-  Objects_Id id
-)
-{
-  register Semaphore_Control *the_semaphore;
-  Objects_Locations           location;
-
-  the_semaphore = _Semaphore_Get( id, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-      return RTEMS_INVALID_ID;
-    case OBJECTS_REMOTE:
-      _Thread_Dispatch();
-      return RTEMS_ILLEGAL_ON_REMOTE_OBJECT;
-    case OBJECTS_LOCAL:
-      if ( _Attributes_Is_binary_semaphore( the_semaphore->attribute_set) ) { 
-        if ( _CORE_mutex_Is_locked( &the_semaphore->Core_control.mutex ) ) {
-          _Thread_Enable_dispatch();
-          return RTEMS_RESOURCE_IN_USE;
-        }
-        else
-          _CORE_mutex_Flush(
-            &the_semaphore->Core_control.mutex, 
-            _Semaphore_MP_Send_object_was_deleted,
-            CORE_MUTEX_WAS_DELETED
-          );
-      }
-      else
-        _CORE_semaphore_Flush(
-          &the_semaphore->Core_control.semaphore, 
-          _Semaphore_MP_Send_object_was_deleted,
-          CORE_SEMAPHORE_WAS_DELETED
-        );
-
-      _Objects_Close( &_Semaphore_Information, &the_semaphore->Object );
-
-      _Semaphore_Free( the_semaphore );
-
-      if ( _Attributes_Is_global( the_semaphore->attribute_set ) ) {
-
-        _Objects_MP_Close( &_Semaphore_Information, the_semaphore->Object.id );
-
-        _Semaphore_MP_Send_process_packet(
-          SEMAPHORE_MP_ANNOUNCE_DELETE,
-          the_semaphore->Object.id,
-          0,                         /* Not used */
-          0                          /* Not used */
-        );
-      }
-      _Thread_Enable_dispatch();
-      return RTEMS_SUCCESSFUL;
-  }
-
-  return RTEMS_INTERNAL_ERROR;   /* unreached - only to remove warnings */
-}
-
-/*PAGE
- *
- *  rtems_semaphore_obtain
- *
- *  This directive allows a thread to acquire a semaphore.
- *
- *  Input parameters:
- *    id         - semaphore id
- *    option_set - wait option
- *    timeout    - number of ticks to wait (0 means wait forever)
- *
- *  Output parameters:
- *    RTEMS_SUCCESSFUL - if successful
- *    error code        - if unsuccessful
- */
-
-rtems_status_code rtems_semaphore_obtain(
-  Objects_Id      id,
-  unsigned32      option_set,
-  rtems_interval  timeout
-)
-{
-  register Semaphore_Control *the_semaphore;
-  Objects_Locations           location;
-  boolean                     wait;
-
-  the_semaphore = _Semaphore_Get( id, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-      return RTEMS_INVALID_ID;
-    case OBJECTS_REMOTE:
-      return _Semaphore_MP_Send_request_packet(
-          SEMAPHORE_MP_OBTAIN_REQUEST,
-          id,
-          option_set,
-          timeout
-      );
-    case OBJECTS_LOCAL:
-      if ( _Options_Is_no_wait( option_set ) )
-        wait = FALSE;
-      else
-        wait = TRUE;
-
-      if ( _Attributes_Is_binary_semaphore( the_semaphore->attribute_set ) ) {
-        _CORE_mutex_Seize(
-          &the_semaphore->Core_control.mutex,
-          id, 
-          wait,
-          timeout
-        );
-        _Thread_Enable_dispatch();
-        return _Semaphore_Translate_core_mutex_return_code( 
-                  _Thread_Executing->Wait.return_code );
-      } else {
-        _CORE_semaphore_Seize(
-          &the_semaphore->Core_control.semaphore,
-          id,
-          wait,
-          timeout
-        );
-        _Thread_Enable_dispatch();
-        return _Semaphore_Translate_core_semaphore_return_code( 
-                  _Thread_Executing->Wait.return_code );
-      }
-  }
-
-  return RTEMS_INTERNAL_ERROR;   /* unreached - only to remove warnings */
-}
-
-/*PAGE
- *
- *  rtems_semaphore_release
- *
- *  This directive allows a thread to release a semaphore.
- *
- *  Input parameters:
- *    id - semaphore id
- *
- *  Output parameters:
- *    RTEMS_SUCCESSFUL - if successful
- *    error code        - if unsuccessful
- */
-
-rtems_status_code rtems_semaphore_release(
-  Objects_Id id
-)
-{
-  register Semaphore_Control *the_semaphore;
-  Objects_Locations           location;
-  CORE_mutex_Status           mutex_status;
-  CORE_semaphore_Status       semaphore_status;
-
-  the_semaphore = _Semaphore_Get( id, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-      return RTEMS_INVALID_ID;
-    case OBJECTS_REMOTE:
-      return _Semaphore_MP_Send_request_packet(
-        SEMAPHORE_MP_RELEASE_REQUEST,
-        id,
-        0,                               /* Not used */
-        MPCI_DEFAULT_TIMEOUT
-      );
-    case OBJECTS_LOCAL:
-      if ( _Attributes_Is_binary_semaphore( the_semaphore->attribute_set ) ) {
-        mutex_status = _CORE_mutex_Surrender(
-                         &the_semaphore->Core_control.mutex,
-                         id,
-                         _Semaphore_Core_mutex_mp_support
-                       );
-        _Thread_Enable_dispatch();
-        return _Semaphore_Translate_core_mutex_return_code( mutex_status );
-      }
-      else
-        semaphore_status = _CORE_semaphore_Surrender(
-                             &the_semaphore->Core_control.semaphore,
-                             id,
-                             _Semaphore_Core_semaphore_mp_support
-                           );
-        _Thread_Enable_dispatch();
-        return
-          _Semaphore_Translate_core_semaphore_return_code( semaphore_status );
-  }
-
-  return RTEMS_INTERNAL_ERROR;   /* unreached - only to remove warnings */
-}
-
-/*PAGE
- *
- *  _Semaphore_Translate_core_mutex_return_code
- *
- *  Input parameters:
- *    the_mutex_status - mutex status code to translate
- *
- *  Output parameters:
- *    rtems status code - translated RTEMS status code
- *
- */
- 
-rtems_status_code _Semaphore_Translate_core_mutex_return_code (
-  unsigned32 the_mutex_status
-)
-{
-  switch ( the_mutex_status ) {
-    case  CORE_MUTEX_STATUS_SUCCESSFUL:
-      return RTEMS_SUCCESSFUL;
-    case CORE_MUTEX_STATUS_UNSATISFIED_NOWAIT:
-      return RTEMS_UNSATISFIED;
-    case CORE_MUTEX_STATUS_NESTING_NOT_ALLOWED:
-      return RTEMS_INTERNAL_ERROR;
-    case CORE_MUTEX_STATUS_NOT_OWNER_OF_RESOURCE:
-      return RTEMS_NOT_OWNER_OF_RESOURCE;
-    case CORE_MUTEX_WAS_DELETED:
-      return RTEMS_OBJECT_WAS_DELETED;
-    case CORE_MUTEX_TIMEOUT:
-      return RTEMS_TIMEOUT;
-    case THREAD_STATUS_PROXY_BLOCKING:
-      return THREAD_STATUS_PROXY_BLOCKING;
-  }
-  return RTEMS_INTERNAL_ERROR;   /* unreached - only to remove warnings */
-}
-
-/*PAGE
- *
- *  _Semaphore_Translate_core_semaphore_return_code
- *
- *  Input parameters:
- *    the_semaphore_status - semaphore status code to translate
- *
- *  Output parameters:
- *    rtems status code - translated RTEMS status code
- *
- */
- 
-rtems_status_code _Semaphore_Translate_core_semaphore_return_code (
-  unsigned32 the_semaphore_status
-)
-{
-  switch ( the_semaphore_status ) {
-    case  CORE_SEMAPHORE_STATUS_SUCCESSFUL:
-      return RTEMS_SUCCESSFUL;
-    case CORE_SEMAPHORE_STATUS_UNSATISFIED_NOWAIT:
-      return RTEMS_UNSATISFIED;
-    case CORE_SEMAPHORE_WAS_DELETED:
-      return RTEMS_OBJECT_WAS_DELETED;
-    case CORE_SEMAPHORE_TIMEOUT:
-      return RTEMS_TIMEOUT;
-    case THREAD_STATUS_PROXY_BLOCKING:
-      return THREAD_STATUS_PROXY_BLOCKING;
-  }
-  return RTEMS_INTERNAL_ERROR;   /* unreached - only to remove warnings */
-}
-
-/*PAGE
- *
- *  _Semaphore_Core_mutex_mp_support
- *
- *  Input parameters:
- *    the_thread - the remote thread the semaphore was surrendered to
- *    id         - id of the surrendered semaphore
- *
- *  Output parameters: NONE
- */
- 
-void  _Semaphore_Core_mutex_mp_support (
-  Thread_Control *the_thread,
-  Objects_Id      id
-)
-{
-  the_thread->receive_packet->return_code = RTEMS_SUCCESSFUL;
- 
-  _Semaphore_MP_Send_response_packet(
-     SEMAPHORE_MP_OBTAIN_RESPONSE,
-     id,
-     the_thread
-   );
-}
-
-
-/*PAGE
- *
- *  _Semaphore_Core_semaphore_mp_support
- *
- *  Input parameters:
- *    the_thread - the remote thread the semaphore was surrendered to
- *    id         - id of the surrendered semaphore
- *
- *  Output parameters: NONE
- */
- 
-void  _Semaphore_Core_semaphore_mp_support (
-  Thread_Control *the_thread,
-  Objects_Id      id
-)
-{
-  the_thread->receive_packet->return_code = RTEMS_SUCCESSFUL;
- 
-  _Semaphore_MP_Send_response_packet(
-     SEMAPHORE_MP_OBTAIN_RESPONSE,
-     id,
-     the_thread
-   );
-}
diff --git a/cpukit/rtems/src/semmp.c b/cpukit/rtems/src/semmp.c
deleted file mode 100644
index 01efdfca4e..0000000000
--- a/cpukit/rtems/src/semmp.c
+++ /dev/null
@@ -1,308 +0,0 @@
-/*
- *  Multiprocessing Support for the Semaphore Manager
- *
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems/system.h>
-#include <rtems/rtems/status.h>
-#include <rtems/score/mpci.h>
-#include <rtems/score/mppkt.h>
-#include <rtems/score/object.h>
-#include <rtems/rtems/options.h>
-#include <rtems/rtems/sem.h>
-#include <rtems/score/thread.h>
-#include <rtems/score/watchdog.h>
-#include <rtems/rtems/support.h>
-
-/*PAGE
- *
- *  _Semaphore_MP_Send_process_packet
- *
- */
-
-void _Semaphore_MP_Send_process_packet (
-  Semaphore_MP_Remote_operations  operation,
-  Objects_Id                      semaphore_id,
-  rtems_name                      name,
-  Objects_Id                      proxy_id
-)
-{
-  Semaphore_MP_Packet *the_packet;
-  unsigned32           node;
-
-  switch ( operation ) {
-
-    case SEMAPHORE_MP_ANNOUNCE_CREATE:
-    case SEMAPHORE_MP_ANNOUNCE_DELETE:
-    case SEMAPHORE_MP_EXTRACT_PROXY:
-
-      the_packet                    = _Semaphore_MP_Get_packet();
-      the_packet->Prefix.the_class  = MP_PACKET_SEMAPHORE;
-      the_packet->Prefix.length     = sizeof ( Semaphore_MP_Packet );
-      the_packet->Prefix.to_convert = sizeof ( Semaphore_MP_Packet );
-      the_packet->operation         = operation;
-      the_packet->Prefix.id         = semaphore_id;
-      the_packet->name              = name;
-      the_packet->proxy_id          = proxy_id;
-
-      if ( operation == SEMAPHORE_MP_EXTRACT_PROXY )
-         node = rtems_get_node( semaphore_id );
-      else
-         node = MPCI_ALL_NODES;
-
-      _MPCI_Send_process_packet( node, &the_packet->Prefix );
-      break;
-
-    case SEMAPHORE_MP_OBTAIN_REQUEST:
-    case SEMAPHORE_MP_OBTAIN_RESPONSE:
-    case SEMAPHORE_MP_RELEASE_REQUEST:
-    case SEMAPHORE_MP_RELEASE_RESPONSE:
-      break;
-  }
-}
-
-/*PAGE
- *
- *  _Semaphore_MP_Send_request_packet
- *
- */
-
-rtems_status_code _Semaphore_MP_Send_request_packet (
-  Semaphore_MP_Remote_operations operation,
-  Objects_Id                     semaphore_id,
-  rtems_option                   option_set,
-  rtems_interval                 timeout
-)
-{
-  Semaphore_MP_Packet *the_packet;
-
-  switch ( operation ) {
-
-    case SEMAPHORE_MP_OBTAIN_REQUEST:
-    case SEMAPHORE_MP_RELEASE_REQUEST:
-
-      the_packet                    = _Semaphore_MP_Get_packet();
-      the_packet->Prefix.the_class  = MP_PACKET_SEMAPHORE;
-      the_packet->Prefix.length     = sizeof ( Semaphore_MP_Packet );
-      the_packet->Prefix.to_convert = sizeof ( Semaphore_MP_Packet );
-      if ( ! _Options_Is_no_wait(option_set))
-          the_packet->Prefix.timeout = timeout;
-
-      the_packet->operation         = operation;
-      the_packet->Prefix.id         = semaphore_id;
-      the_packet->option_set        = option_set;
-
-      return _MPCI_Send_request_packet(
-          rtems_get_node( semaphore_id ),
-          &the_packet->Prefix,
-          STATES_WAITING_FOR_SEMAPHORE
-        );
-      break;
-
-    case SEMAPHORE_MP_ANNOUNCE_CREATE:
-    case SEMAPHORE_MP_ANNOUNCE_DELETE:
-    case SEMAPHORE_MP_EXTRACT_PROXY:
-    case SEMAPHORE_MP_OBTAIN_RESPONSE:
-    case SEMAPHORE_MP_RELEASE_RESPONSE:
-      break;
-
-  }
-  /*
-   *  The following line is included to satisfy compilers which
-   *  produce warnings when a function does not end with a return.
-   */
-  return RTEMS_SUCCESSFUL;
-}
-
-/*PAGE
- *
- *  _Semaphore_MP_Send_response_packet
- *
- */
-
-void _Semaphore_MP_Send_response_packet (
-  Semaphore_MP_Remote_operations  operation,
-  Objects_Id                      semaphore_id,
-  Thread_Control                 *the_thread
-)
-{
-  Semaphore_MP_Packet *the_packet;
-
-  switch ( operation ) {
-
-    case SEMAPHORE_MP_OBTAIN_RESPONSE:
-    case SEMAPHORE_MP_RELEASE_RESPONSE:
-
-      the_packet = ( Semaphore_MP_Packet *) the_thread->receive_packet;
-
-/*
- *  The packet being returned already contains the class, length, and
- *  to_convert fields, therefore they are not set in this routine.
- */
-      the_packet->operation = operation;
-      the_packet->Prefix.id = the_packet->Prefix.source_tid;
-
-      _MPCI_Send_response_packet(
-        rtems_get_node( the_packet->Prefix.source_tid ),
-        &the_packet->Prefix
-      );
-      break;
-
-    case SEMAPHORE_MP_ANNOUNCE_CREATE:
-    case SEMAPHORE_MP_ANNOUNCE_DELETE:
-    case SEMAPHORE_MP_EXTRACT_PROXY:
-    case SEMAPHORE_MP_OBTAIN_REQUEST:
-    case SEMAPHORE_MP_RELEASE_REQUEST:
-      break;
-
-  }
-}
-
-/*PAGE
- *
- *
- *  _Semaphore_MP_Process_packet
- *
- */
-
-void _Semaphore_MP_Process_packet (
-  rtems_packet_prefix  *the_packet_prefix
-)
-{
-  Semaphore_MP_Packet *the_packet;
-  Thread_Control      *the_thread;
-  boolean              ignored;
-
-  the_packet = (Semaphore_MP_Packet *) the_packet_prefix;
-
-  switch ( the_packet->operation ) {
-
-    case SEMAPHORE_MP_ANNOUNCE_CREATE:
-
-      ignored = _Objects_MP_Allocate_and_open(
-                  &_Semaphore_Information,
-                  the_packet->name,
-                  the_packet->Prefix.id,
-                  TRUE
-                );
-
-      _MPCI_Return_packet( the_packet_prefix );
-      break;
-
-    case SEMAPHORE_MP_ANNOUNCE_DELETE:
-
-      _Objects_MP_Close( &_Semaphore_Information, the_packet->Prefix.id );
-
-      _MPCI_Return_packet( the_packet_prefix );
-      break;
-
-    case SEMAPHORE_MP_EXTRACT_PROXY:
-
-      the_thread = _Thread_MP_Find_proxy( the_packet->proxy_id );
-
-      if ( ! _Thread_Is_null( the_thread ) )
-        _Thread_queue_Extract( the_thread->Wait.queue, the_thread );
-
-      _MPCI_Return_packet( the_packet_prefix );
-      break;
-
-    case SEMAPHORE_MP_OBTAIN_REQUEST:
-
-      the_packet->Prefix.return_code = rtems_semaphore_obtain(
-        the_packet->Prefix.id,
-        the_packet->option_set,
-        the_packet->Prefix.timeout
-      );
-
-      if ( ! _Thread_Is_proxy_blocking( the_packet->Prefix.return_code ) )
-        _Semaphore_MP_Send_response_packet(
-           SEMAPHORE_MP_OBTAIN_RESPONSE,
-           the_packet->Prefix.id,
-           _Thread_Executing
-        );
-      break;
-
-    case SEMAPHORE_MP_OBTAIN_RESPONSE:
-    case SEMAPHORE_MP_RELEASE_RESPONSE:
-
-      the_thread = _MPCI_Process_response( the_packet_prefix );
-
-      _MPCI_Return_packet( the_packet_prefix );
-      break;
-
-    case SEMAPHORE_MP_RELEASE_REQUEST:
-
-      the_packet->Prefix.return_code = rtems_semaphore_release(
-        the_packet->Prefix.id
-      );
-
-      _Semaphore_MP_Send_response_packet(
-        SEMAPHORE_MP_RELEASE_RESPONSE,
-        the_packet->Prefix.id,
-        _Thread_Executing
-      );
-      break;
-  }
-}
-
-/*PAGE
- *
- *  _Semaphore_MP_Send_object_was_deleted
- *
- */
-
-void _Semaphore_MP_Send_object_was_deleted (
-  Thread_Control *the_proxy
-)
-{
-  the_proxy->receive_packet->return_code = RTEMS_OBJECT_WAS_DELETED;
-
-  _Semaphore_MP_Send_response_packet(
-    SEMAPHORE_MP_OBTAIN_RESPONSE,
-    the_proxy->Wait.id,
-    the_proxy
-  );
-
-}
-
-/*PAGE
- *
- *  _Semaphore_MP_Send_extract_proxy
- *
- */
-
-void _Semaphore_MP_Send_extract_proxy (
-  Thread_Control *the_thread
-)
-{
-  _Semaphore_MP_Send_process_packet(
-    SEMAPHORE_MP_EXTRACT_PROXY,
-    the_thread->Wait.id,
-    (rtems_name) 0,
-    the_thread->Object.id
-  );
-
-}
-
-/*PAGE
- *
- *  _Semaphore_MP_Get_packet
- *
- */
-
-Semaphore_MP_Packet *_Semaphore_MP_Get_packet ( void )
-{
-  return ( (Semaphore_MP_Packet *) _MPCI_Get_packet() );
-}
-
-/* end of file */
diff --git a/cpukit/rtems/src/signal.c b/cpukit/rtems/src/signal.c
deleted file mode 100644
index efdcf70eea..0000000000
--- a/cpukit/rtems/src/signal.c
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- *  Signal Manager
- *
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems/system.h>
-#include <rtems/rtems/status.h>
-#include <rtems/rtems/asr.h>
-#include <rtems/score/isr.h>
-#include <rtems/rtems/modes.h>
-#include <rtems/rtems/signal.h>
-#include <rtems/score/thread.h>
-#include <rtems/rtems/tasks.h>
-
-/*PAGE
- *
- *  _Signal_Manager_initialization
- *
- *  This routine initializes all signal manager related data structures.
- *
- *  Input parameters:   NONE
- *
- *  Output parameters:  NONE
- */
- 
-void _Signal_Manager_initialization( void )
-{
-  /*
-   *  Register the MP Process Packet routine.
-   */
- 
-  _MPCI_Register_packet_processor(
-    MP_PACKET_SIGNAL,
-    _Signal_MP_Process_packet
-  );
-}
- 
-/*PAGE
- *
- *  rtems_signal_catch
- *
- *  This directive allows a thread to specify what action to take when
- *  catching signals.
- *
- *  Input parameters:
- *    handler  - address of asynchronous signal routine (asr)
- *              ( NULL indicates asr is invalid )
- *    mode_set - mode value for asr
- *
- *  Output parameters:
- *    RTEMS_SUCCESSFUL - always succeeds
- */
-
-rtems_status_code rtems_signal_catch(
-  rtems_asr_entry   asr_handler,
-  rtems_mode        mode_set
-)
-{
-  Thread_Control     *executing;
-  RTEMS_API_Control  *api;
-  ASR_Information    *asr;
-
-/* XXX normalize mode */
-  executing = _Thread_Executing;
-  api = executing->API_Extensions[ THREAD_API_RTEMS ];
-  asr = &api->Signal;
-
-  _Thread_Disable_dispatch(); /* cannot reschedule while */
-                              /*   the thread is inconsistent */
-
-  if ( !_ASR_Is_null_handler( asr_handler ) ) {
-    asr->mode_set = mode_set;
-    asr->handler = asr_handler;
-  }
-  else
-    _ASR_Initialize( asr );
-  _Thread_Enable_dispatch();
-  return RTEMS_SUCCESSFUL;
-}
-
-/*PAGE
- *
- *  rtems_signal_send
- *
- *  This directive allows a thread to send signals to a thread.
- *
- *  Input parameters:
- *    id         - thread id
- *    signal_set - signal set
- *
- *  Output parameters:
- *    RTEMS_SUCCESSFUL - if successful
- *    error code - if unsuccessful
- */
-
-rtems_status_code rtems_signal_send(
-  Objects_Id             id,
-  rtems_signal_set signal_set
-)
-{
-  register Thread_Control *the_thread;
-  Objects_Locations        location;
-  RTEMS_API_Control       *api;
-  ASR_Information         *asr;
-
-  the_thread = _Thread_Get( id, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-      return RTEMS_INVALID_ID;
-    case OBJECTS_REMOTE:
-      return _Signal_MP_Send_request_packet(
-        SIGNAL_MP_SEND_REQUEST,
-        id,
-        signal_set
-      );
-    case OBJECTS_LOCAL:
-      api = the_thread->API_Extensions[ THREAD_API_RTEMS ];
-      asr = &api->Signal;
-
-      if ( ! _ASR_Is_null_handler( asr->handler ) ) {
-        if ( asr->is_enabled ) {
-          _ASR_Post_signals( signal_set, &asr->signals_posted );
-
-          the_thread->do_post_task_switch_extension = TRUE;
-
-          if ( _ISR_Is_in_progress() && _Thread_Is_executing( the_thread ) )
-            _ISR_Signals_to_thread_executing = TRUE;
-        } else {
-          _ASR_Post_signals( signal_set, &asr->signals_pending );
-        }
-        _Thread_Enable_dispatch();
-        return RTEMS_SUCCESSFUL;
-      }
-      _Thread_Enable_dispatch();
-      return RTEMS_NOT_DEFINED;
-  }
-
-  return RTEMS_INTERNAL_ERROR;   /* unreached - only to remove warnings */
-}
diff --git a/cpukit/rtems/src/signalmp.c b/cpukit/rtems/src/signalmp.c
deleted file mode 100644
index f78e94d366..0000000000
--- a/cpukit/rtems/src/signalmp.c
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- *  Multiprocessing Support for the Signal Manager
- *
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems/system.h>
-#include <rtems/rtems/status.h>
-#include <rtems/score/mpci.h>
-#include <rtems/score/mppkt.h>
-#include <rtems/score/object.h>
-#include <rtems/rtems/options.h>
-#include <rtems/rtems/signal.h>
-#include <rtems/score/states.h>
-#include <rtems/score/thread.h>
-#include <rtems/score/watchdog.h>
-#include <rtems/rtems/support.h>
-
-/*PAGE
- *
- *  _Signal_MP_Send_process_packet
- *
- *  This subprogram is not needed since there are no process
- *  packets to be sent by this manager.
- *
- */
-
-/*PAGE
- *
- *  _Signal_MP_Send_request_packet
- *
- */
-
-rtems_status_code _Signal_MP_Send_request_packet (
-  Signal_MP_Remote_operations operation,
-  Objects_Id                  task_id,
-  rtems_signal_set      signal_in
-)
-{
-  Signal_MP_Packet *the_packet;
-
-  switch ( operation ) {
-
-    case SIGNAL_MP_SEND_REQUEST:
-
-      the_packet                    = _Signal_MP_Get_packet();
-      the_packet->Prefix.the_class  = MP_PACKET_SIGNAL;
-      the_packet->Prefix.length     = sizeof ( Signal_MP_Packet );
-      the_packet->Prefix.to_convert = sizeof ( Signal_MP_Packet );
-      the_packet->operation         = operation;
-      the_packet->Prefix.id         = task_id;
-      the_packet->signal_in         = signal_in;
-
-      return _MPCI_Send_request_packet(
-        rtems_get_node( task_id ),
-        &the_packet->Prefix,
-        STATES_READY   /* Not used */
-      );
-      break;
-
-    case SIGNAL_MP_SEND_RESPONSE:
-      break;
-
-  }
-  /*
-   *  The following line is included to satisfy compilers which
-   *  produce warnings when a function does not end with a return.
-   */
-  return RTEMS_INTERNAL_ERROR;
-}
-
-/*PAGE
- *
- *  _Signal_MP_Send_response_packet
- *
- */
-
-void _Signal_MP_Send_response_packet (
-  Signal_MP_Remote_operations  operation,
-  Thread_Control              *the_thread
-)
-{
-  Signal_MP_Packet *the_packet;
-
-  switch ( operation ) {
-
-    case SIGNAL_MP_SEND_RESPONSE:
-
-      the_packet = ( Signal_MP_Packet *) the_thread->receive_packet;
-
-/*
- *  The packet being returned already contains the class, length, and
- *  to_convert fields, therefore they are not set in this routine.
- */
-      the_packet->operation = operation;
-      the_packet->Prefix.id = the_packet->Prefix.source_tid;
-
-      _MPCI_Send_response_packet(
-        rtems_get_node( the_packet->Prefix.source_tid ),
-        &the_packet->Prefix
-      );
-      break;
-
-    case SIGNAL_MP_SEND_REQUEST:
-      break;
-
-  }
-}
-
-/*PAGE
- *
- *
- *  _Signal_MP_Process_packet
- *
- */
-
-void _Signal_MP_Process_packet (
-  rtems_packet_prefix  *the_packet_prefix
-)
-{
-  Signal_MP_Packet *the_packet;
-  Thread_Control   *the_thread;
-
-  the_packet = (Signal_MP_Packet *) the_packet_prefix;
-
-  switch ( the_packet->operation ) {
-
-    case SIGNAL_MP_SEND_REQUEST:
-
-      the_packet->Prefix.return_code = rtems_signal_send(
-        the_packet->Prefix.id,
-        the_packet->signal_in
-      );
-
-      _Signal_MP_Send_response_packet(
-        SIGNAL_MP_SEND_RESPONSE,
-        _Thread_Executing
-      );
-      break;
-
-    case SIGNAL_MP_SEND_RESPONSE:
-
-      the_thread = _MPCI_Process_response( the_packet_prefix );
-
-      _MPCI_Return_packet( the_packet_prefix );
-      break;
-
-  }
-}
-
-/*PAGE
- *
- *  _Signal_MP_Send_object_was_deleted
- *
- *  This subprogram is not needed since there are no objects
- *  deleted by this manager.
- *
- */
-
-/*PAGE
- *
- *  _Signal_MP_Send_extract_proxy
- *
- *  This subprogram is not needed since there are no objects
- *  deleted by this manager.
- *
- */
-
-/*PAGE
- *
- *  _Signal_MP_Get_packet
- *
- */
-
-Signal_MP_Packet *_Signal_MP_Get_packet ( void )
-{
-  return ( (Signal_MP_Packet *) _MPCI_Get_packet() );
-}
-
-/* end of file */
diff --git a/cpukit/rtems/src/taskmp.c b/cpukit/rtems/src/taskmp.c
deleted file mode 100644
index 5d5f3df763..0000000000
--- a/cpukit/rtems/src/taskmp.c
+++ /dev/null
@@ -1,340 +0,0 @@
-/*
- *  Multiprocessing Support for the RTEMS Task Manager
- *
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems/system.h>
-#include <rtems/rtems/status.h>
-#include <rtems/score/mpci.h>
-#include <rtems/score/mppkt.h>
-#include <rtems/score/object.h>
-#include <rtems/rtems/options.h>
-#include <rtems/rtems/tasks.h>
-#include <rtems/score/thread.h>
-#include <rtems/score/watchdog.h>
-#include <rtems/rtems/support.h>
-
-/*PAGE
- *
- *  _RTEMS_tasks_MP_Send_process_packet
- *
- */
-
-void _RTEMS_tasks_MP_Send_process_packet (
-  RTEMS_tasks_MP_Remote_operations operation,
-  Objects_Id                       task_id,
-  rtems_name                       name
-)
-{
-  RTEMS_tasks_MP_Packet *the_packet;
-
-  switch ( operation ) {
-
-    case RTEMS_TASKS_MP_ANNOUNCE_CREATE:
-    case RTEMS_TASKS_MP_ANNOUNCE_DELETE:
-
-      the_packet                    = _RTEMS_tasks_MP_Get_packet();
-      the_packet->Prefix.the_class  = MP_PACKET_TASKS;
-      the_packet->Prefix.length     = sizeof ( RTEMS_tasks_MP_Packet );
-      the_packet->Prefix.to_convert = sizeof ( RTEMS_tasks_MP_Packet );
-      the_packet->operation         = operation;
-      the_packet->Prefix.id         = task_id;
-      the_packet->name              = name;
-
-      _MPCI_Send_process_packet( MPCI_ALL_NODES, &the_packet->Prefix );
-      break;
-
-    case RTEMS_TASKS_MP_SUSPEND_REQUEST:
-    case RTEMS_TASKS_MP_SUSPEND_RESPONSE:
-    case RTEMS_TASKS_MP_RESUME_REQUEST:
-    case RTEMS_TASKS_MP_RESUME_RESPONSE:
-    case RTEMS_TASKS_MP_SET_PRIORITY_REQUEST:
-    case RTEMS_TASKS_MP_SET_PRIORITY_RESPONSE:
-    case RTEMS_TASKS_MP_GET_NOTE_REQUEST:
-    case RTEMS_TASKS_MP_GET_NOTE_RESPONSE:
-    case RTEMS_TASKS_MP_SET_NOTE_REQUEST:
-    case RTEMS_TASKS_MP_SET_NOTE_RESPONSE:
-      break;
-  }
-}
-
-/*PAGE
- *
- *  _RTEMS_tasks_MP_Send_request_packet
- *
- */
-
-rtems_status_code _RTEMS_tasks_MP_Send_request_packet (
-  RTEMS_tasks_MP_Remote_operations operation,
-  Objects_Id                       task_id,
-  rtems_task_priority                 new_priority,
-  unsigned32                       notepad,
-  unsigned32                       note
-)
-{
-  RTEMS_tasks_MP_Packet *the_packet;
-
-  switch ( operation ) {
-
-    case RTEMS_TASKS_MP_SUSPEND_REQUEST:
-    case RTEMS_TASKS_MP_RESUME_REQUEST:
-    case RTEMS_TASKS_MP_SET_PRIORITY_REQUEST:
-    case RTEMS_TASKS_MP_GET_NOTE_REQUEST:
-    case RTEMS_TASKS_MP_SET_NOTE_REQUEST:
-
-      the_packet                    = _RTEMS_tasks_MP_Get_packet();
-      the_packet->Prefix.the_class  = MP_PACKET_TASKS;
-      the_packet->Prefix.length     = sizeof ( RTEMS_tasks_MP_Packet );
-      the_packet->Prefix.to_convert = sizeof ( RTEMS_tasks_MP_Packet );
-      the_packet->operation         = operation;
-      the_packet->Prefix.id         = task_id;
-      the_packet->the_priority      = new_priority;
-      the_packet->notepad           = notepad;
-      the_packet->note              = note;
-
-      return _MPCI_Send_request_packet(
-        rtems_get_node( task_id ),
-        &the_packet->Prefix,
-        STATES_READY     /* Not used */
-      );
-      break;
-
-    case RTEMS_TASKS_MP_ANNOUNCE_CREATE:
-    case RTEMS_TASKS_MP_ANNOUNCE_DELETE:
-    case RTEMS_TASKS_MP_SUSPEND_RESPONSE:
-    case RTEMS_TASKS_MP_RESUME_RESPONSE:
-    case RTEMS_TASKS_MP_SET_PRIORITY_RESPONSE:
-    case RTEMS_TASKS_MP_GET_NOTE_RESPONSE:
-    case RTEMS_TASKS_MP_SET_NOTE_RESPONSE:
-      break;
-
-  }
-  /*
-   *  The following line is included to satisfy compilers which
-   *  produce warnings when a function does not end with a return.
-   */
-  return RTEMS_SUCCESSFUL;
-}
-
-/*PAGE
- *
- *  _RTEMS_tasks_MP_Send_response_packet
- *
- */
-
-void _RTEMS_tasks_MP_Send_response_packet (
-  RTEMS_tasks_MP_Remote_operations  operation,
-  Thread_Control                   *the_thread
-)
-{
-  RTEMS_tasks_MP_Packet *the_packet;
-
-  switch ( operation ) {
-
-    case RTEMS_TASKS_MP_SUSPEND_RESPONSE:
-    case RTEMS_TASKS_MP_RESUME_RESPONSE:
-    case RTEMS_TASKS_MP_SET_PRIORITY_RESPONSE:
-    case RTEMS_TASKS_MP_GET_NOTE_RESPONSE:
-    case RTEMS_TASKS_MP_SET_NOTE_RESPONSE:
-
-      the_packet = (RTEMS_tasks_MP_Packet *) the_thread->receive_packet;
-
-/*
- *  The packet being returned already contains the class, length, and
- *  to_convert fields, therefore they are not set in this routine.
- */
-      the_packet->operation    = operation;
-      the_packet->Prefix.id    = the_packet->Prefix.source_tid;
-
-      _MPCI_Send_response_packet(
-        rtems_get_node( the_packet->Prefix.source_tid ),
-        &the_packet->Prefix
-      );
-      break;
-
-    case RTEMS_TASKS_MP_ANNOUNCE_CREATE:
-    case RTEMS_TASKS_MP_ANNOUNCE_DELETE:
-    case RTEMS_TASKS_MP_SUSPEND_REQUEST:
-    case RTEMS_TASKS_MP_RESUME_REQUEST:
-    case RTEMS_TASKS_MP_SET_PRIORITY_REQUEST:
-    case RTEMS_TASKS_MP_GET_NOTE_REQUEST:
-    case RTEMS_TASKS_MP_SET_NOTE_REQUEST:
-      break;
-
-  }
-}
-
-/*PAGE
- *
- *
- *  _RTEMS_tasks_MP_Process_packet
- *
- */
-
-void _RTEMS_tasks_MP_Process_packet (
-  rtems_packet_prefix  *the_packet_prefix
-)
-{
-  RTEMS_tasks_MP_Packet *the_packet;
-  Thread_Control   *the_thread;
-  boolean           ignored;
-
-  the_packet = (RTEMS_tasks_MP_Packet *) the_packet_prefix;
-
-  switch ( the_packet->operation ) {
-
-    case RTEMS_TASKS_MP_ANNOUNCE_CREATE:
-
-      ignored = _Objects_MP_Allocate_and_open(
-                  &_RTEMS_tasks_Information,
-                  the_packet->name,
-                  the_packet->Prefix.id,
-                  TRUE
-                );
-
-      _MPCI_Return_packet( the_packet_prefix );
-      break;
-
-    case RTEMS_TASKS_MP_ANNOUNCE_DELETE:
-
-      _Objects_MP_Close( &_RTEMS_tasks_Information, the_packet->Prefix.id );
-
-      _MPCI_Return_packet( the_packet_prefix );
-      break;
-
-    case RTEMS_TASKS_MP_SUSPEND_REQUEST:
-
-      the_packet->Prefix.return_code = rtems_task_suspend(
-        the_packet->Prefix.id
-      );
-
-      _RTEMS_tasks_MP_Send_response_packet(
-        RTEMS_TASKS_MP_SUSPEND_RESPONSE,
-        _Thread_Executing
-      );
-      break;
-
-    case RTEMS_TASKS_MP_SUSPEND_RESPONSE:
-    case RTEMS_TASKS_MP_RESUME_RESPONSE:
-    case RTEMS_TASKS_MP_SET_NOTE_RESPONSE:
-
-      the_thread = _MPCI_Process_response( the_packet_prefix );
-
-      _MPCI_Return_packet( the_packet_prefix );
-      break;
-
-    case RTEMS_TASKS_MP_RESUME_REQUEST:
-
-      the_packet->Prefix.return_code = rtems_task_resume(
-        the_packet->Prefix.id
-      );
-
-      _RTEMS_tasks_MP_Send_response_packet(
-        RTEMS_TASKS_MP_RESUME_RESPONSE,
-        _Thread_Executing
-      );
-      break;
-
-    case RTEMS_TASKS_MP_SET_PRIORITY_REQUEST:
-
-      the_packet->Prefix.return_code = rtems_task_set_priority(
-        the_packet->Prefix.id,
-        the_packet->the_priority,
-        &the_packet->the_priority
-      );
-
-      _RTEMS_tasks_MP_Send_response_packet(
-        RTEMS_TASKS_MP_SET_PRIORITY_RESPONSE,
-        _Thread_Executing
-      );
-      break;
-
-    case RTEMS_TASKS_MP_SET_PRIORITY_RESPONSE:
-
-      the_thread = _MPCI_Process_response( the_packet_prefix );
-
-      *(rtems_task_priority *)the_thread->Wait.return_argument =
-                                               the_packet->the_priority;
-
-      _MPCI_Return_packet( the_packet_prefix );
-      break;
-
-    case RTEMS_TASKS_MP_GET_NOTE_REQUEST:
-
-      the_packet->Prefix.return_code = rtems_task_get_note(
-        the_packet->Prefix.id,
-        the_packet->notepad,
-        &the_packet->note
-      );
-
-      _RTEMS_tasks_MP_Send_response_packet(
-        RTEMS_TASKS_MP_GET_NOTE_RESPONSE,
-        _Thread_Executing
-      );
-      break;
-
-    case RTEMS_TASKS_MP_GET_NOTE_RESPONSE:
-
-      the_thread = _MPCI_Process_response( the_packet_prefix );
-
-      *(unsigned32 *)the_thread->Wait.return_argument = the_packet->note;
-
-      _MPCI_Return_packet( the_packet_prefix );
-      break;
-
-    case RTEMS_TASKS_MP_SET_NOTE_REQUEST:
-
-      the_packet->Prefix.return_code = rtems_task_set_note(
-        the_packet->Prefix.id,
-        the_packet->notepad,
-        the_packet->note
-      );
-
-      _RTEMS_tasks_MP_Send_response_packet(
-        RTEMS_TASKS_MP_SET_NOTE_RESPONSE,
-        _Thread_Executing
-      );
-      break;
-  }
-}
-
-/*PAGE
- *
- *  _RTEMS_tasks_MP_Send_object_was_deleted
- *
- *  This routine is not neededby the Tasks since a task
- *  cannot be globally deleted.
- *
- */
-
-/*PAGE
- *
- *  _RTEMS_tasks_MP_Send_extract_proxy
- *
- *  This routine is not neededby the Tasks since a task
- *  cannot be globally deleted.
- *
- */
-
-/*PAGE
- *
- *  _RTEMS_tasks_MP_Get_packet
- *
- */
-
-RTEMS_tasks_MP_Packet *_RTEMS_tasks_MP_Get_packet ( void )
-{
-  return (RTEMS_tasks_MP_Packet *) _MPCI_Get_packet();
-}
-
-/* end of file */
diff --git a/cpukit/rtems/src/tasks.c b/cpukit/rtems/src/tasks.c
deleted file mode 100644
index 723a769836..0000000000
--- a/cpukit/rtems/src/tasks.c
+++ /dev/null
@@ -1,1130 +0,0 @@
-/*
- *  RTEMS Task Manager
- *
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems/system.h>
-#include <rtems/rtems/status.h>
-#include <rtems/rtems/support.h>
-#include <rtems/rtems/modes.h>
-#include <rtems/score/object.h>
-#include <rtems/score/stack.h>
-#include <rtems/score/states.h>
-#include <rtems/rtems/tasks.h>
-#include <rtems/score/thread.h>
-#include <rtems/score/threadq.h>
-#include <rtems/score/tod.h>
-#include <rtems/score/userext.h>
-#include <rtems/score/wkspace.h>
-#include <rtems/score/apiext.h>
-#include <rtems/score/sysstate.h>
-
-/*PAGE
- *
- *  _RTEMS_tasks_Create_extension
- *
- *  XXX
- */
-
-boolean _RTEMS_tasks_Create_extension(
-  Thread_Control *executing, 
-  Thread_Control *created
-)
-{
-  RTEMS_API_Control *api;
-
-  api = _Workspace_Allocate( sizeof( RTEMS_API_Control ) );
-
-  if ( !api )
-    return FALSE;
-
-  created->API_Extensions[ THREAD_API_RTEMS ] = api;
- 
-  api->pending_events = EVENT_SETS_NONE_PENDING;
-  _ASR_Initialize( &api->Signal );
-  return TRUE;
-}
-
-/*PAGE
- *
- *  _RTEMS_tasks_Start_extension
- *
- *  XXX
- */
- 
-User_extensions_routine _RTEMS_tasks_Start_extension(
-  Thread_Control *executing,
-  Thread_Control *started
-)
-{
-  RTEMS_API_Control *api;
-
-  api = started->API_Extensions[ THREAD_API_RTEMS ];
- 
-  api->pending_events = EVENT_SETS_NONE_PENDING;
-
-  _ASR_Initialize( &api->Signal );
-}
-
-/*PAGE
- *
- *  _RTEMS_tasks_Delete_extension
- *
- *  XXX
- */
- 
-User_extensions_routine _RTEMS_tasks_Delete_extension(
-  Thread_Control *executing, 
-  Thread_Control *deleted
-)
-{
-  (void) _Workspace_Free( deleted->API_Extensions[ THREAD_API_RTEMS ] );
- 
-  deleted->API_Extensions[ THREAD_API_RTEMS ] = NULL;
-}
-
-/*PAGE
- *
- *  _RTEMS_tasks_Switch_extension
- *
- *  XXX
- */
- 
-void _RTEMS_tasks_Switch_extension(
-  Thread_Control *executing
-)
-{
-  ISR_Level          level;
-  RTEMS_API_Control *api;
-  ASR_Information   *asr;
-  rtems_signal_set   signal_set;
-  Modes_Control      prev_mode;
-
-  api = executing->API_Extensions[ THREAD_API_RTEMS ];
-  asr = &api->Signal;
- 
-  _ISR_Disable( level );
-    signal_set = asr->signals_posted;
-    asr->signals_posted = 0;
-  _ISR_Enable( level );
- 
- 
-  if ( !signal_set ) /* similar to _ASR_Are_signals_pending( asr ) */
-    return;
- 
-  asr->nest_level += 1;
-  rtems_task_mode( asr->mode_set, RTEMS_ALL_MODE_MASKS, &prev_mode );
- 
-  (*asr->handler)( signal_set );
-
-  asr->nest_level -= 1;
-  rtems_task_mode( prev_mode, RTEMS_ALL_MODE_MASKS, &prev_mode );
-
-}
-
-API_extensions_Control _RTEMS_tasks_API_extensions = {
-  { NULL, NULL },
-  NULL,                                     /* predriver */
-  _RTEMS_tasks_Initialize_user_tasks,       /* postdriver */
-  _RTEMS_tasks_Switch_extension             /* post switch */
-};
-
-User_extensions_Control _RTEMS_tasks_User_extensions = {
-  { NULL, NULL },
-  { _RTEMS_tasks_Create_extension,            /* create */
-    _RTEMS_tasks_Start_extension,             /* start */
-    _RTEMS_tasks_Start_extension,             /* restart */
-    _RTEMS_tasks_Delete_extension,            /* delete */
-    NULL,                                     /* switch */
-    NULL,                                     /* begin */
-    NULL,                                     /* exitted */
-    NULL                                      /* fatal */
-  }
-};
-
-/*PAGE
- *
- *  _RTEMS_tasks_Manager_initialization
- *
- *  This routine initializes all Task Manager related data structures.
- *
- *  Input parameters:
- *    maximum_tasks       - number of tasks to initialize
- *
- *  Output parameters:  NONE
- */
-
-void _RTEMS_tasks_Manager_initialization(
-  unsigned32                        maximum_tasks,
-  unsigned32                        number_of_initialization_tasks,
-  rtems_initialization_tasks_table *user_tasks
-)
-{
-
-  _RTEMS_tasks_Number_of_initialization_tasks = number_of_initialization_tasks;
-  _RTEMS_tasks_User_initialization_tasks = user_tasks;
-
-  /*
-   *  There may not be any RTEMS initialization tasks configured.
-   */
-
-#if 0
-  if ( user_tasks == NULL || number_of_initialization_tasks == 0 )
-    _Internal_error_Occurred( INTERNAL_ERROR_RTEMS_API, TRUE, RTEMS_TOO_MANY );
-#endif
-
-  _Objects_Initialize_information(
-    &_RTEMS_tasks_Information,
-    OBJECTS_RTEMS_TASKS,
-    TRUE,
-    maximum_tasks,
-    sizeof( Thread_Control ),
-    FALSE,
-    RTEMS_MAXIMUM_NAME_LENGTH,
-    TRUE
-  );
-
-  /*
-   *  Add all the extensions for this API
-   */
-
-  _User_extensions_Add_API_set( &_RTEMS_tasks_User_extensions );
-
-  _API_extensions_Add( &_RTEMS_tasks_API_extensions );
-
-  /*
-   *  Register the MP Process Packet routine.
-   */
-
-  _MPCI_Register_packet_processor(
-    MP_PACKET_TASKS,
-    _RTEMS_tasks_MP_Process_packet
-  );
-
-}
-
-/*PAGE
- *
- *  rtems_task_create
- *
- *  This directive creates a thread by allocating and initializing a
- *  thread control block and a stack.  The newly created thread is
- *  placed in the dormant state.
- *
- *  Input parameters:
- *    name             - user defined thread name
- *    initial_priority - thread priority
- *    stack_size       - stack size in bytes
- *    initial_modes    - initial thread mode
- *    attribute_set    - thread attributes
- *    id               - pointer to thread id
- *
- *  Output parameters:
- *    id                - thread id
- *    RTEMS_SUCCESSFUL - if successful
- *    error code        - if unsuccessful
- */
-
-rtems_status_code rtems_task_create(
-  rtems_name           name,
-  rtems_task_priority  initial_priority,
-  unsigned32           stack_size,
-  rtems_mode           initial_modes,
-  rtems_attribute      attribute_set,
-  Objects_Id          *id
-)
-{
-  register Thread_Control *the_thread;
-  Objects_MP_Control      *the_global_object = NULL;
-  boolean                  is_fp;
-  boolean                  is_global;
-  boolean                  status;
-  rtems_attribute          the_attribute_set;
-  Priority_Control         core_priority;
-  RTEMS_API_Control       *api;
-  ASR_Information         *asr;
- 
-
-  if ( !rtems_is_name_valid( name ) )
-    return RTEMS_INVALID_NAME;
-
-  /* 
-   *  Core Thread Initialize insures we get the minimum amount of
-   *  stack space.
-   */
-
-#if 0
-  if ( !_Stack_Is_enough( stack_size ) )
-    return RTEMS_INVALID_SIZE;
-#endif
-
-  /*
-   *  Fix the attribute set to match the attributes which
-   *  this processor (1) requires and (2) is able to support.
-   *  First add in the required flags for attribute_set
-   *  Typically this might include FP if the platform
-   *  or application required all tasks to be fp aware.
-   *  Then turn off the requested bits which are not supported.
-   */
-
-  the_attribute_set = _Attributes_Set( attribute_set, ATTRIBUTES_REQUIRED );
-  the_attribute_set =
-    _Attributes_Clear( the_attribute_set, ATTRIBUTES_NOT_SUPPORTED );
-
-  if ( _Attributes_Is_floating_point( the_attribute_set ) )
-    is_fp = TRUE;
-  else
-    is_fp = FALSE;
-
-  /*
-   *  Validate the RTEMS API priority and convert it to the core priority range.
-   */
-
-  if ( !_Attributes_Is_system_task( the_attribute_set ) ) {
-    if ( !_RTEMS_tasks_Priority_is_valid( initial_priority ) )
-      return RTEMS_INVALID_PRIORITY;
-  }
-
-  core_priority = _RTEMS_tasks_Priority_to_Core( initial_priority );
-
-  if ( _Attributes_Is_global( the_attribute_set ) ) {
-
-    is_global = TRUE;
-
-    if ( !_System_state_Is_multiprocessing )
-      return RTEMS_MP_NOT_CONFIGURED;
-
-  } else
-    is_global = FALSE;
-
-  /*
-   *  Make sure system is MP if this task is global
-   */
-
-  /*
-   *  Disable dispatch for protection
-   */ 
-
-  _Thread_Disable_dispatch();
-
-  /*
-   *  Allocate the thread control block and -- if the task is global --
-   *  allocate a global object control block.
-   *
-   *  NOTE:  This routine does not use the combined allocate and open
-   *         global object routine because this results in a lack of
-   *         control over when memory is allocated and can be freed in
-   *         the event of an error.
-   */
-
-  the_thread = _RTEMS_tasks_Allocate();
-
-  if ( !the_thread ) {
-    _Thread_Enable_dispatch();
-    return RTEMS_TOO_MANY;
-  }
-
-  if ( is_global ) {
-    the_global_object = _Objects_MP_Allocate_global_object();
-
-    if ( _Objects_MP_Is_null_global_object( the_global_object ) ) {
-      _RTEMS_tasks_Free( the_thread );
-      _Thread_Enable_dispatch();
-      return RTEMS_TOO_MANY;
-    }
-  }
-
-  /*
-   *  Initialize the core thread for this task.
-   */
-
-  status = _Thread_Initialize(
-    &_RTEMS_tasks_Information,
-    the_thread, 
-    NULL,
-    stack_size,
-    is_fp,
-    core_priority,
-    _Modes_Is_preempt(initial_modes)   ? TRUE : FALSE,
-    _Modes_Is_timeslice(initial_modes) ?
-      THREAD_CPU_BUDGET_ALGORITHM_RESET_TIMESLICE :
-      THREAD_CPU_BUDGET_ALGORITHM_NONE,
-    NULL,        /* no budget algorithm callout */
-    _Modes_Get_interrupt_level(initial_modes),
-    &name
-  );
-
-  if ( !status ) {
-    if ( is_global )
-      _Objects_MP_Free_global_object( the_global_object );
-    _RTEMS_tasks_Free( the_thread );
-    _Thread_Enable_dispatch();
-    return RTEMS_UNSATISFIED;
-  }
-
-  api = the_thread->API_Extensions[ THREAD_API_RTEMS ];
-  asr = &api->Signal;
- 
-  asr->is_enabled = _Modes_Is_asr_disabled(initial_modes) ? FALSE : TRUE;
-
-  *id = the_thread->Object.id;
-
-  if ( is_global ) {
-
-    the_thread->is_global = TRUE;
-
-    _Objects_MP_Open(
-      &_RTEMS_tasks_Information,
-      the_global_object,
-      name,
-      the_thread->Object.id
-    );
-
-    _RTEMS_tasks_MP_Send_process_packet(
-      RTEMS_TASKS_MP_ANNOUNCE_CREATE,
-      the_thread->Object.id,
-      name
-    );
-
-   }
-
-  _Thread_Enable_dispatch();
-  return RTEMS_SUCCESSFUL;
-}
-
-/*PAGE
- *
- *  rtems_task_ident
- *
- *  This directive returns the system ID associated with
- *  the thread name.
- *
- *  Input parameters:
- *    name - user defined thread name
- *    node - node(s) to be searched
- *    id   - pointer to thread id
- *
- *  Output parameters:
- *    *id               - thread id
- *    RTEMS_SUCCESSFUL - if successful
- *    error code        - if unsuccessful
- */
-
-rtems_status_code rtems_task_ident(
-  rtems_name    name,
-  unsigned32    node,
-  Objects_Id   *id
-)
-{
-  Objects_Name_to_id_errors  status;
-
-  if ( name == OBJECTS_ID_OF_SELF ) {
-    *id = _Thread_Executing->Object.id;
-    return RTEMS_SUCCESSFUL;
-   }
-
-  status = _Objects_Name_to_id( &_RTEMS_tasks_Information, &name, node, id );
-
-  return _Status_Object_name_errors_to_status[ status ];
-}
-
-/*PAGE
- *
- *  rtems_task_start
- *
- *  This directive readies the thread identified by the "id"
- *  based on its current priorty, to await execution.  A thread
- *  can be started only from the dormant state.
- *
- *  Input parameters:
- *    id          - thread id
- *    entry_point - start execution address of thread
- *    argument    - thread argument
- *
- *  Output parameters:
- *    RTEMS_SUCCESSFUL - if successful
- *    error code        - if unsuccessful
- */
-
-rtems_status_code rtems_task_start(
-  rtems_id         id,
-  rtems_task_entry entry_point,
-  unsigned32       argument
-)
-{
-  register Thread_Control *the_thread;
-  Objects_Locations        location;
-
-  if ( entry_point == NULL )
-    return RTEMS_INVALID_ADDRESS;
-
-  the_thread = _Thread_Get( id, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-      return RTEMS_INVALID_ID;
-    case OBJECTS_REMOTE:
-      _Thread_Dispatch();
-      return RTEMS_ILLEGAL_ON_REMOTE_OBJECT;
-    case OBJECTS_LOCAL:
-      if ( _Thread_Start(
-             the_thread, THREAD_START_NUMERIC, entry_point, NULL, argument ) ) {
-        _Thread_Enable_dispatch();
-        return RTEMS_SUCCESSFUL;
-      }
-      _Thread_Enable_dispatch();
-      return RTEMS_INCORRECT_STATE;
-  }
-
-  return RTEMS_INTERNAL_ERROR;   /* unreached - only to remove warnings */
-}
-
-/*PAGE
- *
- *  rtems_task_restart
- *
- *  This directive readies the specified thread.  It restores
- *  the thread environment to the original values established
- *  at thread creation and start time.  A thread can be restarted
- *  from any state except the dormant state.
- *
- *  Input parameters:
- *    id       - thread id
- *    argument - thread argument
- *
- *  Output parameters:
- *    RTEMS_SUCCESSFUL - if successful
- *    error code        - if unsuccessful
- */
-
-rtems_status_code rtems_task_restart(
-  Objects_Id id,
-  unsigned32 argument
-)
-{
-  register Thread_Control *the_thread;
-  Objects_Locations        location;
-
-  the_thread = _Thread_Get( id, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-      return RTEMS_INVALID_ID;
-    case OBJECTS_REMOTE:
-      _Thread_Dispatch();
-      return RTEMS_ILLEGAL_ON_REMOTE_OBJECT;
-    case OBJECTS_LOCAL:
-      if ( _Thread_Restart( the_thread, NULL, argument ) ) {
-        _Thread_Enable_dispatch();
-        return RTEMS_SUCCESSFUL;
-      }
-      _Thread_Enable_dispatch();
-      return RTEMS_INCORRECT_STATE;
-  }
-
-  return RTEMS_INTERNAL_ERROR;   /* unreached - only to remove warnings */
-}
-
-/*PAGE
- *
- *  rtems_task_delete
- *
- *  This directive allows a thread to delete itself or the thread
- *  identified in the id field.  The executive halts execution
- *  of the thread and frees the thread control block.
- *
- *  Input parameters:
- *    id - thread id
- *
- *  Output parameters:
- *    nothing           - if id is the requesting thread (always succeeds)
- *    RTEMS_SUCCESSFUL - if successful and id is
- *                           not the requesting thread
- *    error code        - if unsuccessful
- */
-
-rtems_status_code rtems_task_delete(
-  Objects_Id id
-)
-{
-  register Thread_Control *the_thread;
-  Objects_Locations        location;
-  Objects_Information     *the_information;
-
-  the_thread = _Thread_Get( id, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-      return RTEMS_INVALID_ID;
-    case OBJECTS_REMOTE:
-      _Thread_Dispatch();
-      return RTEMS_ILLEGAL_ON_REMOTE_OBJECT;
-    case OBJECTS_LOCAL:
-      the_information = _Objects_Get_information( the_thread->Object.id );
-
-      if ( !the_information ) {
-        _Thread_Enable_dispatch();
-        return RTEMS_INVALID_ID;
-        /* This should never happen if _Thread_Get() works right */
-      }
-  
-      _Thread_Close( the_information, the_thread );
-
-      _RTEMS_tasks_Free( the_thread );
-
-      if ( the_thread->is_global ) {
-
-        _Objects_MP_Close( &_RTEMS_tasks_Information, the_thread->Object.id );
-
-        _RTEMS_tasks_MP_Send_process_packet(
-          RTEMS_TASKS_MP_ANNOUNCE_DELETE,
-          the_thread->Object.id,
-          0                                /* Not used */
-        );
-      }
-
-      _Thread_Enable_dispatch();
-      return RTEMS_SUCCESSFUL;
-  }
-
-  return RTEMS_INTERNAL_ERROR;   /* unreached - only to remove warnings */
-}
-
-/*PAGE
- *
- *  rtems_task_suspend
- *
- *  This directive will place the specified thread in the "suspended"
- *  state.  Note that the suspended state can be in addition to
- *  other waiting states.
- *
- *  Input parameters:
- *    id - thread id
- *
- *  Output parameters:
- *    RTEMS_SUCCESSFUL - if successful
- *    error code        - if unsuccessful
- */
-
-rtems_status_code rtems_task_suspend(
-  Objects_Id id
-)
-{
-  register Thread_Control *the_thread;
-  Objects_Locations               location;
-
-  the_thread = _Thread_Get( id, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-      return RTEMS_INVALID_ID;
-    case OBJECTS_REMOTE:
-      return _RTEMS_tasks_MP_Send_request_packet(
-        RTEMS_TASKS_MP_SUSPEND_REQUEST,
-        id,
-        0,          /* Not used */
-        0,          /* Not used */
-        0           /* Not used */
-      );
-    case OBJECTS_LOCAL:
-      if ( !_States_Is_suspended( the_thread->current_state ) ) {
-        _Thread_Set_state( the_thread, STATES_SUSPENDED );
-        _Thread_Enable_dispatch();
-        return RTEMS_SUCCESSFUL;
-      }
-      _Thread_Enable_dispatch();
-      return RTEMS_ALREADY_SUSPENDED;
-  }
-
-  return RTEMS_INTERNAL_ERROR;   /* unreached - only to remove warnings */
-}
-
-/*PAGE
- *
- *  rtems_task_resume
- *
- *  This directive will remove the specified thread
- *  from the suspended state.
- *
- *  Input parameters:
- *    id - thread id
- *
- *  Output parameters:
- *    RTEMS_SUCCESSFUL - if successful
- *    error code        - if unsuccessful
- */
-
-rtems_status_code rtems_task_resume(
-  Objects_Id id
-)
-{
-  register Thread_Control *the_thread;
-  Objects_Locations        location;
-
-  the_thread = _Thread_Get( id, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-      return RTEMS_INVALID_ID;
-    case OBJECTS_REMOTE:
-      return(
-        _RTEMS_tasks_MP_Send_request_packet(
-          RTEMS_TASKS_MP_RESUME_REQUEST,
-          id,
-          0,          /* Not used */
-          0,          /* Not used */
-          0           /* Not used */
-        )
-      );
-    case OBJECTS_LOCAL:
-      if ( _States_Is_suspended( the_thread->current_state ) ) {
-        _Thread_Resume( the_thread );
-        _Thread_Enable_dispatch();
-        return RTEMS_SUCCESSFUL;
-      }
-      _Thread_Enable_dispatch();
-      return RTEMS_INCORRECT_STATE;
-  }
-
-  return RTEMS_INTERNAL_ERROR;   /* unreached - only to remove warnings */
-}
-
-/*PAGE
- *
- *  rtems_task_set_priority
- *
- *  This directive changes the priority of the specified thread.
- *  The specified thread can be any thread in the system including
- *  the requesting thread.
- *
- *  Input parameters:
- *    id           - thread id (0 indicates requesting thread)
- *    new_priority - thread priority (0 indicates current priority)
- *    old_priority - pointer to previous priority
- *
- *  Output parameters:
- *    old_priority      - previous priority
- *    RTEMS_SUCCESSFUL - if successful
- *    error code        - if unsuccessful
- */
-
-rtems_status_code rtems_task_set_priority(
-  Objects_Id           id,
-  rtems_task_priority  new_priority,
-  rtems_task_priority *old_priority
-)
-{
-  register Thread_Control *the_thread;
-  Objects_Locations               location;
-
-  if ( new_priority != RTEMS_CURRENT_PRIORITY &&
-       !_RTEMS_tasks_Priority_is_valid( new_priority ) )
-    return RTEMS_INVALID_PRIORITY;
-
-  the_thread = _Thread_Get( id, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-      return RTEMS_INVALID_ID;
-    case OBJECTS_REMOTE:
-      _Thread_Executing->Wait.return_argument = old_priority;
-      return(
-        _RTEMS_tasks_MP_Send_request_packet(
-          RTEMS_TASKS_MP_SET_PRIORITY_REQUEST,
-          id,
-          new_priority,
-          0,          /* Not used */
-          0           /* Not used */
-        )
-      );
-    case OBJECTS_LOCAL:
-      *old_priority = the_thread->current_priority;
-      if ( new_priority != RTEMS_CURRENT_PRIORITY ) {
-        the_thread->real_priority = new_priority;
-        if ( the_thread->resource_count == 0 ||
-             the_thread->current_priority > new_priority )
-          _Thread_Change_priority( the_thread, new_priority, FALSE );
-      }
-      _Thread_Enable_dispatch();
-      return RTEMS_SUCCESSFUL;
-  }
-
-  return RTEMS_INTERNAL_ERROR;   /* unreached - only to remove warnings */
-}
-
-/*PAGE
- *
- *  rtems_task_mode
- *
- *  This directive enables and disables several modes of
- *  execution for the requesting thread.
- *
- *  Input parameters:
- *    mode_set          - new mode
- *    mask              - mask
- *    previous_mode_set - address of previous mode set
- *
- *  Output:
- *    *previous_mode_set - previous mode set
- *     always return RTEMS_SUCCESSFUL;
- */
-
-rtems_status_code rtems_task_mode(
-  rtems_mode  mode_set,
-  rtems_mode  mask,
-  rtems_mode *previous_mode_set
-)
-{
-  Thread_Control     *executing;
-  RTEMS_API_Control  *api;
-  ASR_Information    *asr;
-  boolean             is_asr_enabled = FALSE;
-  boolean             needs_asr_dispatching = FALSE;
-  rtems_mode          old_mode;
-
-  executing     = _Thread_Executing;
-  api = executing->API_Extensions[ THREAD_API_RTEMS ];
-  asr = &api->Signal;
-
-  old_mode  = (executing->is_preemptible) ? RTEMS_PREEMPT : RTEMS_NO_PREEMPT;
-
-  if ( executing->budget_algorithm == THREAD_CPU_BUDGET_ALGORITHM_NONE )
-    old_mode |= RTEMS_NO_TIMESLICE;
-  else
-    old_mode |= RTEMS_TIMESLICE;
-
-  old_mode |= (asr->is_enabled) ? RTEMS_ASR : RTEMS_NO_ASR;
-  old_mode |= _ISR_Get_level();
-
-  *previous_mode_set = old_mode;
-
-  /*
-   *  These are generic thread scheduling characteristics.
-   */
-
-  if ( mask & RTEMS_PREEMPT_MASK )
-    executing->is_preemptible = _Modes_Is_preempt(mode_set) ? TRUE : FALSE;
-
-  if ( mask & RTEMS_TIMESLICE_MASK ) {
-    if ( _Modes_Is_timeslice(mode_set) ) 
-      executing->budget_algorithm = THREAD_CPU_BUDGET_ALGORITHM_RESET_TIMESLICE;
-    else
-      executing->budget_algorithm = THREAD_CPU_BUDGET_ALGORITHM_NONE;
-  }
-
-  /*
-   *  Set the new interrupt level
-   */
-
-  if ( mask & RTEMS_INTERRUPT_MASK )
-    _Modes_Set_interrupt_level( mode_set );
-
-  /*
-   *  This is specific to the RTEMS API
-   */
-
-  is_asr_enabled = FALSE;
-  needs_asr_dispatching = FALSE;
-
-  if ( mask & RTEMS_ASR_MASK ) {
-    is_asr_enabled = _Modes_Is_asr_disabled( mode_set ) ? FALSE : TRUE;
-    if ( is_asr_enabled != asr->is_enabled ) {
-      asr->is_enabled = is_asr_enabled;
-      _ASR_Swap_signals( asr );
-      if ( _ASR_Are_signals_pending( asr ) ) {
-        needs_asr_dispatching = TRUE;
-        executing->do_post_task_switch_extension = TRUE;
-      }
-    }
-  }
-
-  if ( _Thread_Evaluate_mode() || needs_asr_dispatching )
-    _Thread_Dispatch();
-
-  return RTEMS_SUCCESSFUL;
-}
-
-/*PAGE
- *
- *  rtems_task_get_note
- *
- *  This directive obtains the note from the specified notepad
- *  of the specified thread.
- *
- *  Input parameters:
- *    id      - thread id
- *    notepad - notepad number
- *    note    - pointer to note
- *
- *  Output parameters:
- *    note              - filled in if successful
- *    RTEMS_SUCCESSFUL - if successful
- *    error code        - if unsuccessful
- */
-
-rtems_status_code rtems_task_get_note(
-  Objects_Id  id,
-  unsigned32  notepad,
-  unsigned32 *note
-)
-{
-  register Thread_Control *the_thread;
-  Objects_Locations        location;
-  RTEMS_API_Control       *api;
-
-  /*
-   *  NOTE:  There is no check for < RTEMS_NOTEPAD_FIRST because that would
-   *         be checking an unsigned number for being negative.
-   */
-
-  if ( notepad > RTEMS_NOTEPAD_LAST )
-    return RTEMS_INVALID_NUMBER;
-
-  /*
-   *  Optimize the most likely case to avoid the Thread_Dispatch.
-   */
-
-  if ( _Objects_Are_ids_equal( id, OBJECTS_ID_OF_SELF ) ||
-       _Objects_Are_ids_equal( id, _Thread_Executing->Object.id ) ) {
-      api = _Thread_Executing->API_Extensions[ THREAD_API_RTEMS ];
-      *note = api->Notepads[ notepad ];
-      return RTEMS_SUCCESSFUL;
-  }
-
-  the_thread = _Thread_Get( id, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-      return RTEMS_INVALID_ID;
-    case OBJECTS_REMOTE:
-      _Thread_Executing->Wait.return_argument = note;
-
-      return _RTEMS_tasks_MP_Send_request_packet(
-        RTEMS_TASKS_MP_GET_NOTE_REQUEST,
-        id,
-        0,          /* Not used */
-        notepad,
-        0           /* Not used */
-      );
-    case OBJECTS_LOCAL:
-      api = the_thread->API_Extensions[ THREAD_API_RTEMS ];
-      *note = api->Notepads[ notepad ];
-      _Thread_Enable_dispatch();
-      return RTEMS_SUCCESSFUL;
-  }
-
-  return RTEMS_INTERNAL_ERROR;   /* unreached - only to remove warnings */
-}
-
-/*PAGE
- *
- * rtems_task_set_note
- *
- *  This directive sets the specified notepad contents to the given
- *  note.
- *
- *  Input parameters:
- *    id      - thread id
- *    notepad - notepad number
- *    note    - note value
- *
- *  Output parameters:
- *    RTEMS_SUCCESSFUL - if successful
- *    error code        - if unsuccessful
- */
-
-rtems_status_code rtems_task_set_note(
-  Objects_Id id,
-  unsigned32 notepad,
-  unsigned32 note
-)
-{
-  register Thread_Control *the_thread;
-  Objects_Locations        location;
-  RTEMS_API_Control       *api;
-
-  /*
-   *  NOTE:  There is no check for < RTEMS_NOTEPAD_FIRST because that would
-   *         be checking an unsigned number for being negative.
-   */
-
-  if ( notepad > RTEMS_NOTEPAD_LAST )
-    return RTEMS_INVALID_NUMBER;
-
-  /*
-   *  Optimize the most likely case to avoid the Thread_Dispatch.
-   */
-
-  if ( _Objects_Are_ids_equal( id, OBJECTS_ID_OF_SELF ) ||
-       _Objects_Are_ids_equal( id, _Thread_Executing->Object.id ) ) {
-      api = _Thread_Executing->API_Extensions[ THREAD_API_RTEMS ];
-      api->Notepads[ notepad ] = note;
-      return RTEMS_SUCCESSFUL;
-  }
-
-  the_thread = _Thread_Get( id, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-      return RTEMS_INVALID_ID;
-    case OBJECTS_REMOTE:
-      return _RTEMS_tasks_MP_Send_request_packet(
-        RTEMS_TASKS_MP_SET_NOTE_REQUEST,
-        id,
-        0,          /* Not used */
-        notepad,
-        note
-      );
-
-    case OBJECTS_LOCAL:
-      api = the_thread->API_Extensions[ THREAD_API_RTEMS ];
-      api->Notepads[ notepad ] = note;
-      _Thread_Enable_dispatch();
-      return RTEMS_SUCCESSFUL;
-  }
-
-  return RTEMS_INTERNAL_ERROR;   /* unreached - only to remove warnings */
-}
-
-/*PAGE
- *
- *  rtems_task_wake_after
- *
- *  This directive suspends the requesting thread for the given amount
- *  of ticks.
- *
- *  Input parameters:
- *    ticks - number of ticks to wait
- *
- *  Output parameters:
- *    RTEMS_SUCCESSFUL - always successful
- */
-
-rtems_status_code rtems_task_wake_after(
-  rtems_interval ticks
-)
-{
-  if ( ticks == 0 ) {
-    _Thread_Yield_processor();
-    _Thread_Dispatch();
-  } else {
-    _Thread_Disable_dispatch();
-      _Thread_Set_state( _Thread_Executing, STATES_DELAYING );
-      _Watchdog_Initialize(
-        &_Thread_Executing->Timer,
-        _Thread_Delay_ended,
-        _Thread_Executing->Object.id,
-        NULL
-      );
-      _Watchdog_Insert_ticks( &_Thread_Executing->Timer, ticks );
-    _Thread_Enable_dispatch();
-  }
-  return RTEMS_SUCCESSFUL;
-}
-
-/*PAGE
- *
- *  rtems_task_wake_when
- *
- *  This directive blocks the requesting thread until the given date and
- *  time is reached.
- *
- *  Input parameters:
- *    time_buffer - pointer to the time and date structure
- *
- *  Output parameters:
- *    RTEMS_SUCCESSFUL - if successful
- *    error code        - if unsuccessful
- */
-
-rtems_status_code rtems_task_wake_when(
-rtems_time_of_day *time_buffer
-)
-{
-  Watchdog_Interval   seconds;
-
-  if ( !_TOD_Is_set )
-    return RTEMS_NOT_DEFINED;
-
-  time_buffer->ticks = 0;
-
-  if ( !_TOD_Validate( time_buffer ) )
-    return RTEMS_INVALID_CLOCK;
-
-  seconds = _TOD_To_seconds( time_buffer );
-
-  if ( seconds <= _TOD_Seconds_since_epoch )
-    return RTEMS_INVALID_CLOCK;
-
-  _Thread_Disable_dispatch();
-    _Thread_Set_state( _Thread_Executing, STATES_WAITING_FOR_TIME );
-    _Watchdog_Initialize(
-      &_Thread_Executing->Timer,
-      _Thread_Delay_ended,
-      _Thread_Executing->Object.id,
-      NULL
-    );
-    _Watchdog_Insert_seconds(
-      &_Thread_Executing->Timer,
-      seconds - _TOD_Seconds_since_epoch
-    );
-  _Thread_Enable_dispatch();
-  return RTEMS_SUCCESSFUL;
-}
-
-/*PAGE
- *
- *  _RTEMS_tasks_Initialize_user_tasks
- *
- *  This routine creates and starts all configured user
- *  initialzation threads.
- *
- *  Input parameters: NONE
- *
- *  Output parameters:  NONE
- */
-
-void _RTEMS_tasks_Initialize_user_tasks( void )
-{
-  unsigned32                        index;
-  unsigned32                        maximum;
-  rtems_id                          id;
-  rtems_status_code                 return_value;
-  rtems_initialization_tasks_table *user_tasks;
-
-  /*
-   *  NOTE:  This is slightly different from the Ada implementation.
-   */
-
-  user_tasks = _RTEMS_tasks_User_initialization_tasks;
-  maximum    = _RTEMS_tasks_Number_of_initialization_tasks;
-
-  if ( !user_tasks || maximum == 0 )
-    return;
-
-  for ( index=0 ; index < maximum ; index++ ) {
-    return_value = rtems_task_create(
-      user_tasks[ index ].name,
-      user_tasks[ index ].initial_priority,
-      user_tasks[ index ].stack_size,
-      user_tasks[ index ].mode_set,
-      user_tasks[ index ].attribute_set,
-      &id
-    );
-
-    if ( !rtems_is_status_successful( return_value ) )
-      _Internal_error_Occurred( INTERNAL_ERROR_RTEMS_API, TRUE, return_value );
-
-    return_value = rtems_task_start(
-      id,
-      user_tasks[ index ].entry_point,
-      user_tasks[ index ].argument
-    );
-
-    if ( !rtems_is_status_successful( return_value ) )
-      _Internal_error_Occurred( INTERNAL_ERROR_RTEMS_API, TRUE, return_value );
-  }
-}
-
diff --git a/cpukit/sapi/include/confdefs.h b/cpukit/sapi/include/confdefs.h
deleted file mode 100644
index e31218ac0d..0000000000
--- a/cpukit/sapi/include/confdefs.h
+++ /dev/null
@@ -1,656 +0,0 @@
-/*  confdefs.h
- *
- *  This include file contains the configuration table template that will
- *  be used by the single processor tests to define its default configuration
- *  parameters.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __CONFIGURATION_TEMPLATE_h
-#define __CONFIGURATION_TEMPLATE_h
- 
-#ifdef __cplusplus
-extern "C" {
-#endif
- 
-extern rtems_initialization_tasks_table Initialization_tasks[];
-extern rtems_driver_address_table       Device_drivers[];
-extern rtems_configuration_table        Configuration;
-extern rtems_multiprocessing_table      Multiprocessing_configuration;
-#ifdef RTEMS_POSIX_API
-extern posix_api_configuration_table    Configuration_POSIX_API;
-#endif
-
-/*
- *  RTEMS C Library and Newlib support
- *
- *  NOTE:  This ends up defining these even when newlib is not used.
- */
-
-#define CONFIGURE_NEWLIB_EXTENSION 1
-#define CONFIGURE_MALLOC_REGION 1
-
-#ifndef CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS
-#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 20
-#endif
-
-#define CONFIGURE_LIBIO_SEMAPHORES \
-  (CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS + 1)
-
-#ifdef CONFIGURE_INIT
-unsigned32 rtems_libio_number_iops = CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS;
-#endif
-
-/*
- *  Stack Checker Requirements
- */
-
-#ifdef STACK_CHECKER_ON
-#define CONFIGURE_STACK_CHECKER_EXTENSION 1
-#else
-#define CONFIGURE_STACK_CHECKER_EXTENSION 0
-#endif
-
-/*
- *  Interrupt Stack Space
- */
-
-#if (CPU_ALLOCATE_INTERRUPT_STACK == 0)
-#define CONFIGURE_INTERRUPT_STACK_MEMORY 0
-#else
-  #ifndef CONFIGURE_INTERRUPT_STACK_MEMORY
-  #define CONFIGURE_INTERRUPT_STACK_MEMORY RTEMS_MINIMUM_STACK_SIZE
-  #else
-  #define CONFIGURE_INTERRUPT_STACK_MEMORY 0
-  #endif
-#endif
-
-/*
- *  Default User Initialization Task Table.  This table guarantees that
- *  one user initialization table is defined.
- */
-
-#ifdef CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#ifdef CONFIGURE_HAS_OWN_INIT_TASK_TABLE
-
-/*
- *  The user is defining their own table information and setting the 
- *  appropriate variables.
- */
-
-#else
-
-#ifndef CONFIGURE_INIT_TASK_NAME
-#define CONFIGURE_INIT_TASK_NAME          rtems_build_name( 'U', 'I', '1', ' ' )
-#endif
-
-#ifndef CONFIGURE_INIT_TASK_STACK_SIZE
-#define CONFIGURE_INIT_TASK_STACK_SIZE    RTEMS_MINIMUM_STACK_SIZE 
-#endif
-
-#ifndef CONFIGURE_INIT_TASK_PRIORITY
-#define CONFIGURE_INIT_TASK_PRIORITY      1
-#endif
-
-#ifndef CONFIGURE_INIT_TASK_ATTRIBUTES
-#define CONFIGURE_INIT_TASK_ATTRIBUTES    RTEMS_DEFAULT_ATTRIBUTES 
-#endif
-
-#ifndef CONFIGURE_INIT_TASK_ENTRY_POINT
-#define CONFIGURE_INIT_TASK_ENTRY_POINT   Init 
-#endif
-
-#ifndef CONFIGURE_INIT_TASK_INITIAL_MODES
-#define CONFIGURE_INIT_TASK_INITIAL_MODES RTEMS_NO_PREEMPT 
-#endif
-
-#ifndef CONFIGURE_INIT_TASK_ARGUMENTS
-#define CONFIGURE_INIT_TASK_ARGUMENTS     0 
-#endif
-
-#ifdef CONFIGURE_INIT
-rtems_initialization_tasks_table Initialization_tasks[] = {
-  { CONFIGURE_INIT_TASK_NAME,
-    CONFIGURE_INIT_TASK_STACK_SIZE,
-    CONFIGURE_INIT_TASK_PRIORITY,
-    CONFIGURE_INIT_TASK_ATTRIBUTES,
-    CONFIGURE_INIT_TASK_ENTRY_POINT,
-    CONFIGURE_INIT_TASK_INITIAL_MODES,
-    CONFIGURE_INIT_TASK_ARGUMENTS
-  }
-};
-#endif
-
-#define CONFIGURE_INIT_TASK_TABLE Initialization_tasks
-
-#define CONFIGURE_INIT_TASK_TABLE_SIZE \
-  sizeof(CONFIGURE_INIT_TASK_TABLE) / sizeof(rtems_initialization_tasks_table)
-
-#endif    /* CONFIGURE_HAS_OWN_INIT_TASK_TABLE */
-
-#else     /* CONFIGURE_RTEMS_INIT_TASKS_TABLE */
-
-#define CONFIGURE_INIT_TASK_TABLE      NULL
-#define CONFIGURE_INIT_TASK_TABLE_SIZE 0
-
-#endif
-
-/*
- *  Default Device Driver Table.  Each driver needed by the test is explicitly
- *  choosen by that test.  There is always a null driver entry.
- */
-
-#define NULL_DRIVER_TABLE_ENTRY \
- { NULL, NULL, NULL, NULL, NULL, NULL }
-
-#ifdef CONFIGURE_TEST_NEEDS_TIMER_DRIVER
-#include <timerdrv.h>
-#endif
-
-#ifdef CONFIGURE_TEST_NEEDS_STUB_DRIVER
-#include <stubdrv.h>
-#endif
-
-#ifndef CONFIGURE_HAS_OWN_DEVICE_DRIVER_TABLE
-
-#ifdef CONFIGURE_INIT
-rtems_driver_address_table Device_drivers[] = {
-#ifdef CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-  CONSOLE_DRIVER_TABLE_ENTRY,
-#endif
-#ifdef CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-  CLOCK_DRIVER_TABLE_ENTRY,
-#endif
-#ifdef CONFIGURE_TEST_NEEDS_STUB_DRIVER
-  STUB_DRIVER_TABLE_ENTRY,
-#endif
-  NULL_DRIVER_TABLE_ENTRY
-};
-#endif
-
-#endif  /* CONFIGURE_HAS_OWN_DEVICE_DRIVER_TABLE */
-
-/*
- *  Default the number of devices per device driver.  This value may be
- *  overridden by the user.
- */
-
-#ifndef CONFIGURE_HAS_OWN_NUMBER_OF_DEVICES
-
-#ifndef CONFIGURE_MAXIMUM_DEVICES
-#define CONFIGURE_MAXIMUM_DEVICES   20
-#endif
-
-#endif /* CONFIGURE_HAS_OWN_NUMBER_OF_DEVICES */
-
-/*
- *  Default Configuration Table.  This table contains the most values set in
- *  the RTEMS Test Suite.  Each value may be overridden within each test to
- *  customize the environment. 
- */
-
-#ifdef CONFIGURE_MPTEST
-#ifndef CONFIGURE_HAS_OWN_MULTIPROCESING_TABLE
-
-#ifndef CONFIGURE_MP_NODE_NUMBER
-#define CONFIGURE_MP_NODE_NUMBER                NODE_NUMBER
-#endif
-
-#ifndef CONFIGURE_MP_MAXIMUM_NODES
-#define CONFIGURE_MP_MAXIMUM_NODES              2
-#endif
-
-#ifndef CONFIGURE_MP_MAXIMUM_GLOBAL_OBJECTS
-#define CONFIGURE_MP_MAXIMUM_GLOBAL_OBJECTS     32
-#endif
-
-#ifndef CONFIGURE_MP_MAXIMUM_PROXIES
-#define CONFIGURE_MP_MAXIMUM_PROXIES            32
-#endif
-
-#ifndef CONFIGURE_MP_MPCI_TABLE_POINTER
-#include <mpci.h>
-#define CONFIGURE_MP_MPCI_TABLE_POINTER         &MPCI_table
-#endif
-
-#ifdef CONFIGURE_INIT
-rtems_multiprocessing_table Multiprocessing_configuration = {
-  CONFIGURE_MP_NODE_NUMBER,              /* local node number */
-  CONFIGURE_MP_MAXIMUM_NODES,            /* maximum # nodes in system */
-  CONFIGURE_MP_MAXIMUM_GLOBAL_OBJECTS,   /* maximum # global objects */
-  CONFIGURE_MP_MAXIMUM_PROXIES,          /* maximum # proxies */
-  CONFIGURE_MP_MPCI_TABLE_POINTER        /* pointer to MPCI config table */
-};
-#endif
-
-#define CONFIGURE_MULTIPROCESSING_TABLE    &Multiprocessing_configuration
-
-#endif /* CONFIGURE_HAS_OWN_MULTIPROCESING_TABLE */
-
-#else
-
-#define CONFIGURE_MULTIPROCESSING_TABLE    NULL
-
-#endif /* CONFIGURE_MPTEST */
- 
-/*
- *  Default Configuration Table.  This table contains the most values set in
- *  the RTEMS Test Suite.  Each value may be overridden within each test to
- *  customize the environment. 
- */
-
-#ifndef CONFIGURE_HAS_OWN_CONFIGURATION_TABLE
- 
-#ifndef CONFIGURE_EXECUTIVE_RAM_WORK_AREA
-#define CONFIGURE_EXECUTIVE_RAM_WORK_AREA     NULL
-#endif
-
-#ifndef CONFIGURE_MAXIMUM_TASKS
-#define CONFIGURE_MAXIMUM_TASKS               10
-#endif
-
-#ifndef CONFIGURE_MAXIMUM_TIMERS
-#define CONFIGURE_MAXIMUM_TIMERS              0
-#endif
-
-#ifndef CONFIGURE_MAXIMUM_SEMAPHORES
-#define CONFIGURE_MAXIMUM_SEMAPHORES          0
-#endif
-
-#ifndef CONFIGURE_MAXIMUM_MESSAGE_QUEUES
-#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES      0
-#endif
-
-#ifndef CONFIGURE_MAXIMUM_PARTITIONS
-#define CONFIGURE_MAXIMUM_PARTITIONS          0
-#endif
-
-#ifndef CONFIGURE_MAXIMUM_REGIONS
-#define CONFIGURE_MAXIMUM_REGIONS             0
-#endif
-
-#ifndef CONFIGURE_MAXIMUM_PORTS
-#define CONFIGURE_MAXIMUM_PORTS               0
-#endif
-
-#ifndef CONFIGURE_MAXIMUM_PERIODS
-#define CONFIGURE_MAXIMUM_PERIODS             0
-#endif
-
-#ifndef CONFIGURE_MAXIMUM_USER_EXTENSIONS
-#define CONFIGURE_MAXIMUM_USER_EXTENSIONS     0
-#endif
-
-#ifndef CONFIGURE_MICROSECONDS_PER_TICK 
-#define CONFIGURE_MICROSECONDS_PER_TICK RTEMS_MILLISECONDS_TO_MICROSECONDS(10)
-#endif
-
-#ifndef CONFIGURE_TICKS_PER_TIMESLICE
-#define CONFIGURE_TICKS_PER_TIMESLICE        50
-#endif
-
-/*
- *  Initial Extension Set
- */
-
-#ifdef CONFIGURE_INIT
-#ifdef STACK_CHECKER_ON
-#include <stackchk.h>
-#endif
-
-rtems_extensions_table Configuration_Initial_Extensions[] = {
-#ifdef CONFIGURE_INITIAL_EXTENSIONS
-    CONFIGURE_INITIAL_EXTENSIONS,
-#endif
-#ifdef STACK_CHECKER_ON
-    STACK_CHECKER_EXTENSION,
-#endif
-    { NULL, NULL, NULL, NULL, NULL, NULL, NULL }
-};
-
-#define CONFIGURE_NUMBER_OF_INITIAL_EXTENSIONS \
-  ((sizeof(Configuration_Initial_Extensions) / \
-    sizeof(rtems_extensions_table)) - 1)
-
-#endif
-
-/*
- *  POSIX API Configuration Parameters
- */
-
-#ifdef RTEMS_POSIX_API
-
-#include <sys/types.h>
-#include <rtems/posix/cond.h>
-#include <rtems/posix/mutex.h>
-#include <rtems/posix/key.h>
-#include <rtems/posix/psignal.h>
-#include <rtems/posix/threadsup.h>
-
-#ifndef CONFIGURE_MAXIMUM_POSIX_THREADS
-#define CONFIGURE_MAXIMUM_POSIX_THREADS      10
-#endif
-
-#ifndef CONFIGURE_MAXIMUM_POSIX_MUTEXES
-#define CONFIGURE_MAXIMUM_POSIX_MUTEXES      0
-#endif
-
-#ifndef CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES
-#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES  0
-#endif
-
-#ifndef CONFIGURE_MAXIMUM_POSIX_KEYS
-#define CONFIGURE_MAXIMUM_POSIX_KEYS         0
-#endif
-
-#ifndef CONFIGURE_MAXIMUM_POSIX_QUEUED_SIGNALS
-#define CONFIGURE_MAXIMUM_POSIX_QUEUED_SIGNALS 0
-#endif
-
-#ifdef CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#ifdef CONFIGURE_POSIX_HAS_OWN_INIT_THREAD_TABLE
-
-/*
- *  The user is defining their own table information and setting the
- *  appropriate variables.
- */
- 
-#else
-
-#ifndef CONFIGURE_POSIX_INIT_THREAD_ENTRY_POINT
-#define CONFIGURE_POSIX_INIT_THREAD_ENTRY_POINT   POSIX_Init 
-#endif
-
-#ifdef CONFIGURE_INIT
-posix_initialization_threads_table POSIX_Initialization_threads[] = {
-  { CONFIGURE_POSIX_INIT_THREAD_ENTRY_POINT }
-};
-#endif
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE_NAME POSIX_Initialization_threads
- 
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE_SIZE \
-  sizeof(CONFIGURE_POSIX_INIT_THREAD_TABLE_NAME) / \
-      sizeof(posix_initialization_threads_table)
-
-#endif    /* CONFIGURE_POSIX_HAS_OWN_INIT_TASK_TABLE */
-
-#else     /* CONFIGURE_POSIX_INIT_THREAD_TABLE */
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE_NAME NULL
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE_SIZE 0
-
-#endif
-
-#define CONFIGURE_MEMORY_PER_TASK_FOR_POSIX_API \
-  ( \
-    sizeof (POSIX_API_Control) + \
-   (sizeof (void *) * (CONFIGURE_GNAT_KEYS + CONFIGURE_MAXIMUM_POSIX_KEYS)) \
-  )
-
-#define CONFIGURE_MEMORY_FOR_POSIX_MUTEXES(_mutexes) \
-  ((_mutexes) * \
-   ( sizeof(POSIX_Mutex_Control) + CONFIGURE_OBJECT_TABLE_STUFF ) )
-
-#define CONFIGURE_MEMORY_FOR_POSIX_CONDITION_VARIABLES(_condition_variables) \
-  ((_condition_variables) * \
-   ( sizeof(POSIX_Condition_variables_Control) + \
-        CONFIGURE_OBJECT_TABLE_STUFF ) )
-
-#define CONFIGURE_MEMORY_FOR_POSIX_KEYS(_keys) \
-  ((_keys) * \
-   ( sizeof(POSIX_Keys_Control) + CONFIGURE_OBJECT_TABLE_STUFF ) )
-
-#define CONFIGURE_MEMORY_FOR_POSIX_QUEUED_SIGNALS(_queued_signals) \
-  ((_queued_signals) * \
-   ( sizeof(POSIX_signals_Siginfo_node) + CONFIGURE_OBJECT_TABLE_STUFF ) )
-
-  
-
-#define CONFIGURE_MEMORY_FOR_POSIX \
-  ( \
-    CONFIGURE_MEMORY_FOR_POSIX_MUTEXES( CONFIGURE_MAXIMUM_POSIX_MUTEXES ) + \
-    CONFIGURE_MEMORY_FOR_POSIX_CONDITION_VARIABLES( \
-        CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES ) + \
-    CONFIGURE_MEMORY_FOR_POSIX_KEYS( CONFIGURE_MAXIMUM_POSIX_KEYS ) + \
-    CONFIGURE_MEMORY_FOR_POSIX_QUEUED_SIGNALS( \
-        CONFIGURE_MAXIMUM_POSIX_QUEUED_SIGNALS ) \
-   )
-
-
-#else
-
-#define CONFIGURE_MAXIMUM_POSIX_THREADS         0
-#define CONFIGURE_MEMORY_PER_TASK_FOR_POSIX_API 0
-#define CONFIGURE_MEMORY_FOR_POSIX              0
-
-#endif    /* RTEMS_POSIX_API */
-
-/* 
- *  Calculate the RAM size based on the maximum number of objects configured.
- *  The model is to estimate the memory required for each configured item,
- *  sum the memory requirements and insure that there is at least 32K greater 
- *  than that for things not directly addressed such as:
- *
- *    + stacks greater than minimum size
- *    + FP contexts
- *    + API areas (should be optional)
- *    + messages
- *    + object name and local pointer table overhead
- *    + per node memory requirements
- *    + executive fixed requirements (including at least internal threads
- *       and the Ready chains)
- *
- *  NOTE:  Eventually this should take into account some of the above.
- *         Basically, this is a "back of the envelope" estimate for
- *         memory requirements.  It could be more accurate.
- */
-
-#ifndef CONFIGURE_EXECUTIVE_RAM_SIZE
-
-#define CONFIGURE_OBJECT_TABLE_STUFF \
-  ( sizeof(Objects_Control *) + sizeof(rtems_name *) + sizeof(rtems_name) )
-
-#define CONFIGURE_MEMORY_FOR_TASKS(_tasks) \
-  (((_tasks) + 1 ) * \
-   ((sizeof(Thread_Control) + CONTEXT_FP_SIZE + \
-      STACK_MINIMUM_SIZE + sizeof( RTEMS_API_Control ) + \
-      CONFIGURE_MEMORY_PER_TASK_FOR_POSIX_API + \
-      CONFIGURE_OBJECT_TABLE_STUFF)) \
-  )
-
-#define CONFIGURE_MEMORY_FOR_TIMERS(_timers) \
-  ((_timers) * ( sizeof(Timer_Control) + CONFIGURE_OBJECT_TABLE_STUFF ) )
-
-#define CONFIGURE_MEMORY_FOR_SEMAPHORES(_semaphores) \
-  ((_semaphores) * \
-   ( sizeof(Semaphore_Control) + CONFIGURE_OBJECT_TABLE_STUFF ) )
-
-#define CONFIGURE_MEMORY_FOR_MESSAGE_QUEUES(_queues) \
-  ( (_queues) * \
-    ( sizeof(Message_queue_Control) + CONFIGURE_OBJECT_TABLE_STUFF ) )
-
-#define CONFIGURE_MEMORY_FOR_PARTITIONS(_partitions) \
-  ( (_partitions) * \
-    ( sizeof(Partition_Control) + CONFIGURE_OBJECT_TABLE_STUFF ) )
-
-#define CONFIGURE_MEMORY_FOR_REGIONS(_regions) \
-  ( (_regions) * \
-    ( sizeof(Region_Control) + CONFIGURE_OBJECT_TABLE_STUFF ) )
-
-#define CONFIGURE_MEMORY_FOR_PORTS(_ports) \
-  ( (_ports) * \
-    ( sizeof(Dual_ported_memory_Control) + CONFIGURE_OBJECT_TABLE_STUFF ) )
-
-#define CONFIGURE_MEMORY_FOR_PERIODS(_periods) \
-  ( (_periods) * \
-    ( sizeof(Rate_monotonic_Control) + CONFIGURE_OBJECT_TABLE_STUFF ) )
-
-#define CONFIGURE_MEMORY_FOR_USER_EXTENSIONS(_extensions) \
-  ( (_extensions) * \
-    ( sizeof(Extension_Control) + CONFIGURE_OBJECT_TABLE_STUFF ) )
-
-#define CONFIGURE_MEMORY_FOR_DEVICES(_devices) \
-  (((_devices) + 1) * ( sizeof(rtems_driver_name_t) ) )
-
-#ifdef CONFIGURE_MPTEST
-
-#ifndef CONFIGURE_HAS_OWN_MULTIPROCESING_TABLE
-
-#define CONFIGURE_MEMORY_FOR_PROXIES(_proxies) \
-  ( ((_proxies) + 1) * ( sizeof(Thread_Proxy_control) )  )
-
-#define CONFIGURE_MEMORY_FOR_GLOBAL_OBJECTS(_global_objects) \
-  ((_global_objects)  * ( sizeof(Objects_MP_Control) )  )
-
-#define CONFIGURE_MEMORY_FOR_MP \
-  ( CONFIGURE_MEMORY_FOR_PROXIES(CONFIGURE_MP_MAXIMUM_PROXIES) + \
-    CONFIGURE_MEMORY_FOR_GLOBAL_OBJECTS(CONFIGURE_MP_MAXIMUM_GLOBAL_OBJECTS) + \
-    CONFIGURE_MEMORY_FOR_TASKS(1) \
-  )
-
-#endif  /* CONFIGURE_HAS_OWN_MULTIPROCESING_TABLE */
-
-#else
-
-#define CONFIGURE_MEMORY_FOR_MP  0
-
-#endif
-
-#ifndef CONFIGURE_MEMORY_OVERHEAD
-#define CONFIGURE_MEMORY_OVERHEAD 0
-#endif
-
-#ifndef CONFIGURE_EXTRA_TASK_STACKS
-#define CONFIGURE_EXTRA_TASK_STACKS 0
-#endif
-
-#define CONFIGURE_MEMORY_FOR_SYSTEM_OVEREHAD \
-  ( CONFIGURE_MEMORY_FOR_TASKS(1) +    /* IDLE */ \
-    (256 * 12) +                       /* Ready chains */ \
-    256        +                       /* name/ptr table overhead */ \
-    CONFIGURE_INTERRUPT_STACK_MEMORY   /* interrupt stack */ \
-  )
-
-#define CONFIGURE_EXECUTIVE_RAM_SIZE \
-(( CONFIGURE_MEMORY_FOR_POSIX + \
-   CONFIGURE_MEMORY_FOR_TASKS(CONFIGURE_MAXIMUM_TASKS + \
-      CONFIGURE_MAXIMUM_POSIX_THREADS + CONFIGURE_MAXIMUM_ADA_TASKS ) + \
-   CONFIGURE_MEMORY_FOR_TIMERS(CONFIGURE_MAXIMUM_TIMERS) + \
-   CONFIGURE_MEMORY_FOR_SEMAPHORES(CONFIGURE_MAXIMUM_SEMAPHORES + \
-     CONFIGURE_LIBIO_SEMAPHORES) + \
-   CONFIGURE_MEMORY_FOR_MESSAGE_QUEUES(CONFIGURE_MAXIMUM_MESSAGE_QUEUES) + \
-   CONFIGURE_MEMORY_FOR_PARTITIONS(CONFIGURE_MAXIMUM_PARTITIONS) + \
-   CONFIGURE_MEMORY_FOR_REGIONS( \
-      CONFIGURE_MAXIMUM_REGIONS + CONFIGURE_MALLOC_REGION ) + \
-   CONFIGURE_MEMORY_FOR_PORTS(CONFIGURE_MAXIMUM_PORTS) + \
-   CONFIGURE_MEMORY_FOR_PERIODS(CONFIGURE_MAXIMUM_PERIODS) + \
-   CONFIGURE_MEMORY_FOR_USER_EXTENSIONS( \
-      CONFIGURE_MAXIMUM_USER_EXTENSIONS + CONFIGURE_NEWLIB_EXTENSION + \
-      CONFIGURE_STACK_CHECKER_EXTENSION ) + \
-   CONFIGURE_MEMORY_FOR_DEVICES(CONFIGURE_MAXIMUM_DEVICES) + \
-   CONFIGURE_MEMORY_FOR_MP + \
-   CONFIGURE_MEMORY_FOR_SYSTEM_OVEREHAD + \
-   (((CONFIGURE_MEMORY_OVERHEAD)+1) * 1024) + \
-   (CONFIGURE_EXTRA_TASK_STACKS) + (CONFIGURE_ADA_TASKS_STACK) \
-) & 0xfffffc00)
-#endif
-
-#ifdef CONFIGURE_GNAT_RTEMS
-#define CONFIGURE_GNAT_MUTEXES 10
-#define CONFIGURE_GNAT_KEYS    1
-
-/* 20 are required to run all tests in the ACVC */
-#ifndef CONFIGURE_MAXIMUM_ADA_TASKS
-#define CONFIGURE_MAXIMUM_ADA_TASKS  20
-#endif
-
-/* This is the number of non-Ada tasks which invoked Ada code. */
-#ifndef CONFIGURE_MAXIMUM_FAKE_ADA_TASKS
-#define CONFIGURE_MAXIMUM_FAKE_ADA_TASKS 0
-#endif
-
-/* Ada tasks are allocated twice the minimum stack space */
-#define CONFIGURE_ADA_TASKS_STACK \
-  (CONFIGURE_MAXIMUM_ADA_TASKS * (RTEMS_MINIMUM_STACK_SIZE + (6 * 1024)))
-
-#else
-#define CONFIGURE_GNAT_MUTEXES           0
-#define CONFIGURE_GNAT_KEYS              0
-#define CONFIGURE_MAXIMUM_ADA_TASKS      0
-#define CONFIGURE_MAXIMUM_FAKE_ADA_TASKS 0
-#define CONFIGURE_ADA_TASKS_STACK        0
-#endif
-
-
-#ifdef CONFIGURE_INIT
-
-rtems_api_configuration_table Configuration_RTEMS_API = {
-  CONFIGURE_MAXIMUM_TASKS,
-  CONFIGURE_MAXIMUM_TIMERS,
-  CONFIGURE_MAXIMUM_SEMAPHORES + CONFIGURE_LIBIO_SEMAPHORES,
-  CONFIGURE_MAXIMUM_MESSAGE_QUEUES,
-  CONFIGURE_MAXIMUM_PARTITIONS,
-  CONFIGURE_MAXIMUM_REGIONS + CONFIGURE_MALLOC_REGION,
-  CONFIGURE_MAXIMUM_PORTS,
-  CONFIGURE_MAXIMUM_PERIODS,
-  CONFIGURE_INIT_TASK_TABLE_SIZE,
-  CONFIGURE_INIT_TASK_TABLE
-};
-
-#ifdef RTEMS_POSIX_API
-posix_api_configuration_table Configuration_POSIX_API = {
-  CONFIGURE_MAXIMUM_POSIX_THREADS + CONFIGURE_MAXIMUM_ADA_TASKS,
-  CONFIGURE_MAXIMUM_POSIX_MUTEXES + CONFIGURE_GNAT_MUTEXES +
-    CONFIGURE_MAXIMUM_ADA_TASKS + CONFIGURE_MAXIMUM_FAKE_ADA_TASKS,
-  CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES +
-    CONFIGURE_MAXIMUM_ADA_TASKS + CONFIGURE_MAXIMUM_FAKE_ADA_TASKS,
-  CONFIGURE_MAXIMUM_POSIX_KEYS + CONFIGURE_GNAT_KEYS,
-  CONFIGURE_MAXIMUM_POSIX_QUEUED_SIGNALS,
-  CONFIGURE_POSIX_INIT_THREAD_TABLE_SIZE,
-  CONFIGURE_POSIX_INIT_THREAD_TABLE_NAME
-};
-#endif
-
-rtems_configuration_table Configuration = {
-  CONFIGURE_EXECUTIVE_RAM_WORK_AREA,
-  CONFIGURE_EXECUTIVE_RAM_SIZE,
-  CONFIGURE_MAXIMUM_USER_EXTENSIONS + CONFIGURE_NEWLIB_EXTENSION + 
-      CONFIGURE_STACK_CHECKER_EXTENSION,
-  CONFIGURE_MICROSECONDS_PER_TICK,
-  CONFIGURE_TICKS_PER_TIMESLICE,
-  CONFIGURE_MAXIMUM_DEVICES,
-  sizeof (Device_drivers)/
-    sizeof(rtems_driver_address_table),      /* number of device drivers */
-  Device_drivers,                            /* pointer to driver table */
-  CONFIGURE_NUMBER_OF_INITIAL_EXTENSIONS,    /* number of initial extensions */
-  Configuration_Initial_Extensions,          /* pointer to initial extensions */
-  CONFIGURE_MULTIPROCESSING_TABLE,           /* pointer to MP config table */
-  &Configuration_RTEMS_API,                  /* pointer to RTEMS API config */
-#ifdef RTEMS_POSIX_API
-  &Configuration_POSIX_API                   /* pointer to POSIX API config */
-#else
-  NULL                                       /* pointer to POSIX API config */
-#endif
-};
-#endif
-
-#endif /* CONFIGURE_HAS_OWN_CONFIGURATION_TABLE */
-
-#ifdef __cplusplus
-}
-#endif
- 
-#endif
-/* end of include file */
diff --git a/cpukit/sapi/include/rtems/README b/cpukit/sapi/include/rtems/README
deleted file mode 100644
index 5fcc0d14c7..0000000000
--- a/cpukit/sapi/include/rtems/README
+++ /dev/null
@@ -1,135 +0,0 @@
-#
-#  $Id$
-#
-
-Configuring a System Using the Template in confdefs.h
-=====================================================
-
-The file confdefs.h is a Configuration Template file which can be
-used to greatly simplify the creation and maintenance of RTEMS
-Configuration Tables.  The basic concepts are:
-
-   + confdefs.h provides defaults for all configuration parameters
-
-   + applications specify only those values they wish to override
-
-   + confdefs.h can be the only file which knows the precise layout
-     of the RTEMS Configuration Tables.
-
-The Configuration Template setup is used by all RTEMS tests to
-simplify the maintenance of the tests.
-
-Here is the section from the system.h file from test tm21 from 
-the Timing Test Suite:
-
-   /* configuration information */
- 
-   #define CONFIGURE_TMTEST
- 
-   #define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-   #define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
- 
-   #define CONFIGURE_MAXIMUM_TASKS              102
-   #define CONFIGURE_MAXIMUM_TIMERS             100
-   #define CONFIGURE_MAXIMUM_SEMAPHORES         100
-   #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES     100
-   #define CONFIGURE_MAXIMUM_PARTITIONS         100
-   #define CONFIGURE_MAXIMUM_REGIONS            100
-   #define CONFIGURE_MAXIMUM_PORTS              100
-   #define CONFIGURE_MAXIMUM_PERIODS            100
- 
-   #define CONFIGURE_TICKS_PER_TIMESLICE        0
- 
-   #include <confdefs.h>
- 
-
-The above example overrides a number of the configuration parameters.
-It informs the template that it is a member of the Timing Suite, 
-requires a console and timer driver, and that it needs 102 tasks,
-100 timers, 100 semaphores, 100 message queues, 100 partitions, 
-100 regions, 100 ports, and 100 periods.   By default, the test
-would have gotten no drivers, 10 tasks, and no other RTEMS objects.
-
-The following shows the configuration tables generated by the 
-template by default.
-
-
-#include <bsp.h>
-
-#define NULL_DRIVER_TABLE_ENTRY \
- { NULL, NULL, NULL, NULL, NULL, NULL }
- 
-rtems_driver_address_table Device_drivers[] = {
-#ifdef CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-  CONSOLE_DRIVER_TABLE_ENTRY,
-#endif
-#ifdef CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-  CLOCK_DRIVER_TABLE_ENTRY,
-#endif
-#ifdef CONFIGURE_TEST_NEEDS_STUB_DRIVER
-  STUB_DRIVER_TABLE_ENTRY,
-#endif
-  NULL_DRIVER_TABLE_ENTRY,
-};
-
-rtems_initialization_tasks_table Initialization_tasks[] = {
-  { rtems_build_name( 'U', 'I', '1', ' ' ), /* init task name */
-    RTEMS_MINIMUM_STACK_SIZE,               /* init task stack size */
-    1,                                      /* init task priority */
-    RTEMS_DEFAULT_ATTRIBUTES,               /* init task attributes */
-    Init,                                   /* init task entry point */
-    RTEMS_NO_PREEMPT,                       /* init task initial mode */
-    0                                       /* init task argument list */
-  }
-};
-
-#ifdef CONFIGURE_MPTEST
-/*
- *  NODE_NUMBER is assumed to be set on the compile line.
- */
-
-rtems_multiprocessing_table Multiprocessing_configuration = {
-  NODE_NUMBER,                           /* local node number */
-  2,                                     /* maximum # nodes in system */
-  32,                                    /* maximum # global objects */
-  32,                                    /* maximum # proxies */
-  &MPCI_table                            /* pointer to MPCI config table */
-};
-#endif
-
-/*
- *  CONFIGURE_EXECUTIVE_RAM_SIZE is a rough guess based on the number of
- *  tasks in the system plus enough extra to get a whole 64K extra.
- *
- *  The NULL address for the workspace area is assumed to be assigned
- *  at startup time by the BSP.
- */
-   
-rtems_configuration_table Configuration = {
-  NULL,                      /* executive RAM work area */
-  CONFIGURE_EXECUTIVE_RAM_SIZE, /* executive RAM size */
-  10,                        /* maximum # tasks */
-  0,                         /* maximum # timers */
-  0,                         /* maximum # semaphores */
-  0,                         /* maximum # message queues */
-  0,                         /* maximum # messages */
-  0,                         /* maximum # partitions */
-  0,                         /* maximum # regions */
-  0,                         /* maximum # dp memory areas */
-  0,                         /* maximum # periods */
-  0,                         /* maximum # user extensions */
-  RTEMS_MILLISECONDS_TO_MICROSECONDS(10), /* # us in a tick */
-  50,                        /* # ticks in a timeslice */
-  sizeof (Initialization_tasks) / sizeof(rtems_initialization_tasks_table),
-                             /* number of init tasks */
-  Initialization_tasks,      /* init task(s) table */
-  sizeof (Device_drivers) / sizeof(rtems_driver_address_table),
-                             /* number of device drivers */
-  Device_drivers,            /* pointer to driver address table */
-  NULL,                      /* pointer to initial extensions */
-#ifdef CONFIGURE_MPTEST
-  &Multiprocessing_configuration
-#else
-  NULL                       /* ptr to MP config table */
-#endif
-};
diff --git a/cpukit/sapi/include/rtems/config.h b/cpukit/sapi/include/rtems/config.h
deleted file mode 100644
index e3ae50d7d1..0000000000
--- a/cpukit/sapi/include/rtems/config.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/*  config.h
- *
- *  This include file contains the table of user defined configuration
- *  parameters.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_CONFIGURATION_h
-#define __RTEMS_CONFIGURATION_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- *  This is kind of kludgy but it allows targets to totally ignore the
- *  POSIX API safely.
- */
-
-#ifdef RTEMS_POSIX_API
-#include <rtems/posix/config.h>
-#else
-
-typedef void *posix_api_configuration_table;
-#endif
-
-#include <rtems/rtems/config.h>
-
-/*  XXX <rtems/rtems/config.h> should cover these
-#include <rtems/rtems/status.h>
-#include <rtems/rtems/types.h>
-#include <rtems/rtems/tasks.h>
-*/
-
-#include <rtems/extension.h>
-#include <rtems/io.h>
-#include <rtems/score/mpci.h>
-
-/*
- *  The following records define the Multiprocessor Configuration
- *  Table.  This table defines the multiprocessor system
- *  characteristics which must be known by RTEMS in a multiprocessor
- *  system.
- */
-
-typedef struct {
-  unsigned32    node;                   /* local node number */
-  unsigned32    maximum_nodes;          /* maximum # nodes in system */
-  unsigned32    maximum_global_objects; /* maximum # global objects */
-  unsigned32    maximum_proxies;        /* maximum # proxies */
-  MPCI_Control *User_mpci_table;        /* pointer to MPCI table */
-} rtems_multiprocessing_table;
-
-/*
- *  The following records define the Configuration Table.  The
- *  information contained in this table is required in all
- *  RTEMS systems, whether single or multiprocessor.  This
- *  table primarily defines the following:
- *
- *     + location and size of the RTEMS Workspace
- *     + microseconds per clock tick
- *     + clock ticks per task timeslice
- *     + required number of each object type for each API configured
- */
-
-typedef struct {
-  void                             *work_space_start;
-  unsigned32                        work_space_size;
-  unsigned32                        maximum_extensions;
-  unsigned32                        microseconds_per_tick;
-  unsigned32                        ticks_per_timeslice;
-  unsigned32                        maximum_devices;
-  unsigned32                        number_of_device_drivers;
-  rtems_driver_address_table       *Device_driver_table;
-  unsigned32                        number_of_initial_extensions;
-  rtems_extensions_table           *User_extension_table;
-  rtems_multiprocessing_table      *User_multiprocessing_table;
-  rtems_api_configuration_table    *RTEMS_api_configuration;
-  posix_api_configuration_table    *POSIX_api_configuration;
-} rtems_configuration_table;
-
-/*
- *  The following are provided strictly for the convenience of
- *  the user.  They are not used in RTEMS itself.
- */
-
-SAPI_EXTERN rtems_configuration_table    *_Configuration_Table;
-SAPI_EXTERN rtems_multiprocessing_table  *_Configuration_MP_table;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/cpukit/sapi/include/rtems/extension.h b/cpukit/sapi/include/rtems/extension.h
deleted file mode 100644
index 9b6b21c70e..0000000000
--- a/cpukit/sapi/include/rtems/extension.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/*  extension.h
- *
- *  This include file contains all the constants, structures, and
- *  prototypes associated with the User Extension Manager.  This manager
- *  provides a mechanism for manipulating sets of user-defined extensions.
- *
- *  Directives provided are:
- *
- *     + create user extension set
- *     + get ID of user extension set
- *     + delete user extension set
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_EXTENSION_MANAGER_h
-#define __RTEMS_EXTENSION_MANAGER_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/object.h>
-#include <rtems/score/userext.h>
-#include <rtems/rtems/status.h>  /* XXX */
-#include <rtems/rtems/types.h>  /* XXX */
-
-/*
- *  Extension related types
- */
-
-typedef User_extensions_routine                   rtems_extension;
-typedef User_extensions_thread_create_extension   rtems_task_create_extension;
-typedef User_extensions_thread_delete_extension   rtems_task_delete_extension;
-typedef User_extensions_thread_start_extension    rtems_task_start_extension;
-typedef User_extensions_thread_restart_extension  rtems_task_restart_extension;
-typedef User_extensions_thread_switch_extension   rtems_task_switch_extension;
-typedef User_extensions_thread_post_switch_extension
-                                              rtems_task_post_switch_extension;
-typedef User_extensions_thread_begin_extension    rtems_task_begin_extension;
-typedef User_extensions_thread_exitted_extension  rtems_task_exitted_extension;
-typedef User_extensions_fatal_extension           rtems_fatal_extension;
-
-typedef User_extensions_Table                     rtems_extensions_table;
-
-/*
- *  The following defines the information control block used to manage
- *  this class of objects.
- */
-
-SAPI_EXTERN Objects_Information  _Extension_Information;
-
-/*
- *  The following records define the control block used to manage
- *  each extension.
- */
-
-typedef struct {
-  Objects_Control          Object;
-  User_extensions_Control  Extension;
-}   Extension_Control;
-
-/*
- *  _Extension_Manager_initialization
- *
- *  DESCRIPTION:
- *
- *  This routine performs the initialization necessary for this manager.
- */
-
-void _Extension_Manager_initialization(
-  unsigned32 maximum_extensions
-);
-
-/*
- *  rtems_extension_create
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_extension_create directive.  The
- *  extension will have the name name.   The entry points of the
- *  routines which constitute this extension set are in EXTENSION_TABLE.
- *  It returns the id of the created extension in ID.
- */
-
-rtems_status_code rtems_extension_create(
-  rtems_name              name,
-  rtems_extensions_table *extension_table,
-  Objects_Id              *id
-);
-
-/*
- *  rtems_extension_ident
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_extension_ident directive.
- *  This directive returns the extension ID associated with name.
- *  If more than one extension is named name, then the extension
- *  to which the ID belongs is arbitrary.
- */
-
-rtems_status_code rtems_extension_ident(
-  rtems_name    name,
-  Objects_Id   *id
-);
-
-/*
- *  rtems_extension_delete
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_extension_delete directive.  The
- *  extension indicated by ID is deleted.
- */
-
-rtems_status_code rtems_extension_delete(
-  Objects_Id id
-);
-
-#ifndef __RTEMS_APPLICATION__
-#include <rtems/extension.inl>
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/cpukit/sapi/include/rtems/fatal.h b/cpukit/sapi/include/rtems/fatal.h
deleted file mode 100644
index 7f0a7b443a..0000000000
--- a/cpukit/sapi/include/rtems/fatal.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*  fatal.h
- *
- *  This include file contains constants and prototypes related
- *  to the Fatal Error Manager.  This manager processes all fatal or
- *  irrecoverable errors.
- *
- *  This manager provides directives to:
- *
- *     + announce a fatal error has occurred
- *
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_FATAL_h
-#define __RTEMS_FATAL_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- *  rtems_fatal_error_occurred
- *
- *  DESCRIPTION:
- *
- *  This is the routine which implements the rtems_fatal_error_occurred
- *  directive.  It is invoked when the application or RTEMS
- *  determines that a fatal error has occurred.
- */
-
-void volatile rtems_fatal_error_occurred(
-  unsigned32 the_error
-);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/cpukit/sapi/include/rtems/init.h b/cpukit/sapi/include/rtems/init.h
deleted file mode 100644
index a4f24d8010..0000000000
--- a/cpukit/sapi/include/rtems/init.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/*  init.h
- *
- *  This include file contains all the constants and structures associated
- *  with the Initialization Manager.  This manager is responsible for
- *  initializing RTEMS, creating and starting all configured initialization
- *  tasks, invoking the initialization routine for each user-supplied device
- *  driver, and initializing the optional multiprocessor layer.
- *
- *  This manager provides directives to:
- *
- *     + initialize the RTEMS executive
- *     + shutdown the RTEMS executive
- *
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_INIT_h
-#define __RTEMS_INIT_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/rtems/types.h>
-#include <rtems/config.h>
-#include <rtems/rtems/intr.h>
-
-/*
- *  The following defines the default Multiprocessing Configuration
- *  Table.  This table is used in a single processor system.
- */
-
-extern const rtems_multiprocessing_table
-  _Initialization_Default_multiprocessing_table;
-
-/*
- *  rtems_initialize_executive
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_initialize_executive directive.  This
- *  directive is invoked at system startup to initialize the RTEMS
- *  multitasking environment.
- */
-
-void rtems_initialize_executive(
-  rtems_configuration_table *configuration_table,
-  rtems_cpu_table           *cpu_table
-);
-
-/*
- *  rtems_initialize_executive_early
- *
- *  DESCRIPTION:
- *
- *  This routine implements the early portion of rtems_initialize_executive
- *  directive up to the pretasking hook. This directive is invoked at system
- *  startup to initialize the RTEMS multitasking environment.
- */
-
-rtems_interrupt_level rtems_initialize_executive_early(
-  rtems_configuration_table *configuration_table,
-  rtems_cpu_table           *cpu_table
-);
-
-/*
- *  rtems_initialize_executive_late
- *
- *  DESCRIPTION:
- *
- *  This routine implements the early portion of rtems_initialize_executive
- *  directive up to the pretasking hook. This directive is invoked at system
- *  startup to initialize the RTEMS multitasking environment.
- */
-
-void rtems_initialize_executive_late(
-  rtems_interrupt_level bsp_level
-);
-
-/*
- *  rtems_shutdown_executive
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_shutdown_executive directive.  The
- *  invocation of this directive results in the RTEMS environment being
- *  shutdown and multitasking halted.  From the application's perspective,
- *  invocation of this directive results in the rtems_initialize_executive
- *  directive exitting to the startup code which invoked it.
- */
-
-void rtems_shutdown_executive(
-  unsigned32 result
-);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/cpukit/sapi/include/rtems/io.h b/cpukit/sapi/include/rtems/io.h
deleted file mode 100644
index 11b4f812cd..0000000000
--- a/cpukit/sapi/include/rtems/io.h
+++ /dev/null
@@ -1,244 +0,0 @@
-/*  io.h
- *
- *  This include file contains all the constants and structures associated
- *  with the Input/Output Manager.  This manager provides a well defined
- *  mechanism for accessing device drivers and a structured methodology for
- *  organizing device drivers.
- *
- *  Directives provided are:
- *
- *     + initialize a device driver
- *     + open a device driver
- *     + close a device driver
- *     + read from a device driver
- *     + write to a device driver
- *     + special device services
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_IO_h
-#define __RTEMS_IO_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/rtems/status.h>
-
-/*
- *
- *  The following defines the types for:
- *
- *    + major and minor numbers
- *    + the return type of a device driver entry
- *    + a pointer to a device driver entry
- *    + an entry in the the Device Driver Address Table.  Each entry in this
- *      table corresponds to an application provided device driver and
- *      defines the entry points for that device driver.
- */
- 
-typedef unsigned32 rtems_device_major_number;
-typedef unsigned32 rtems_device_minor_number;
- 
-typedef rtems_status_code rtems_device_driver;
- 
-typedef rtems_device_driver ( *rtems_device_driver_entry )(
-                 rtems_device_major_number,
-                 rtems_device_minor_number,
-                 void *
-             );
-
-typedef struct {
-  rtems_device_driver_entry initialization; /* initialization procedure */
-  rtems_device_driver_entry open;           /* open request procedure */
-  rtems_device_driver_entry close;          /* close request procedure */
-  rtems_device_driver_entry read;           /* read request procedure */
-  rtems_device_driver_entry write;          /* write request procedure */
-  rtems_device_driver_entry control;        /* special functions procedure */
-}   rtems_driver_address_table;
- 
-/*
- * Table for the io device names
- */
-
-typedef struct {
-    char                     *device_name;
-    unsigned32                device_name_length;
-    rtems_device_major_number major;
-    rtems_device_minor_number minor;
-} rtems_driver_name_t;
-
-/*
- *  This is the table of device names.
- */
-
-/*
- *  The following declare the data required to manage the Driver
- *  Address Table and Device Name Table.
- */
-
-SAPI_EXTERN unsigned32                  _IO_Number_of_drivers;
-SAPI_EXTERN rtems_driver_address_table *_IO_Driver_address_table;
-SAPI_EXTERN unsigned32                  _IO_Number_of_devices;
-SAPI_EXTERN rtems_driver_name_t        *_IO_Driver_name_table;
-
-/*
- *  _IO_Manager_initialization
- *
- *  DESCRIPTION:
- *
- *  This routine performs the initialization necessary for this manager.
- */
-
-void _IO_Manager_initialization(
-  rtems_driver_address_table *driver_table,
-  unsigned32                  number_of_drivers,
-  unsigned32                  number_of_devices
-);
-
-/*
- *  rtems_io_register_name
- *
- *  DESCRIPTION:
- *
- *  Associate a name with a driver.
- *
- */
-
-rtems_status_code rtems_io_register_name(
-    char                      *device_name,
-    rtems_device_major_number  major,
-    rtems_device_minor_number  minor
-);
-
-
-/*
- *  rtems_io_lookup_name
- *
- *  DESCRIPTION:
- *
- *  Find what driver "owns" this name
- */
-
-rtems_status_code rtems_io_lookup_name(
-    const char           *name,
-    rtems_driver_name_t **device_info
-);
-
-
-/*
- *  rtems_io_initialize
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_io_initialize directive.  It is invoked
- *  to initialize a device driver or an individual device.
- */
-
-rtems_status_code rtems_io_initialize(
-  rtems_device_major_number  major,
-  rtems_device_minor_number  minor,
-  void                      *argument
-);
-
-/*
- *  rtems_io_open
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_io_open directive.  It is invoked
- *  to open a device.
- */
-
-rtems_status_code rtems_io_open(
-  rtems_device_major_number  major,
-  rtems_device_minor_number  minor,
-  void                      *argument
-);
-
-/*
- *  rtems_io_close
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_io_close directive.  It is invoked
- *  to close a device.
- */
-
-rtems_status_code rtems_io_close(
-  rtems_device_major_number  major,
-  rtems_device_minor_number  minor,
-  void                      *argument
-);
-
-/*
- *  rtems_io_read
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_io_read directive.  It is invoked
- *  to read from a device.
- */
-
-rtems_status_code rtems_io_read(
-  rtems_device_major_number  major,
-  rtems_device_minor_number  minor,
-  void                      *argument
-);
-
-/*
- *  rtems_io_write
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_io_write directive.  It is invoked
- *  to write to a device.
- */
-
-rtems_status_code rtems_io_write(
-  rtems_device_major_number  major,
-  rtems_device_minor_number  minor,
-  void                      *argument
-);
-
-/*
- *  rtems_io_control
- *
- *  DESCRIPTION:
- *
- *  This routine implements the rtems_io_control directive.  It is invoked
- *  to perform a device specific operation on a device.
- */
-
-rtems_status_code rtems_io_control(
-  rtems_device_major_number  major,
-  rtems_device_minor_number  minor,
-  void                      *argument
-);
-
-/*
- *  _IO_Initialize_all_drivers
- *
- *  DESCRIPTION:
- *
- *  This routine initializes all of the device drivers configured
- *  in the Device Driver Address Table.
- */
-
-void _IO_Initialize_all_drivers( void );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/cpukit/sapi/include/rtems/mptables.h b/cpukit/sapi/include/rtems/mptables.h
deleted file mode 100644
index 8fdbdfebd2..0000000000
--- a/cpukit/sapi/include/rtems/mptables.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*  mptables.h
- *
- *  This include file contains the executive's pre-initialized tables
- *  used in a multiprocessor configuration.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_MPTABLES_h
-#define __RTEMS_MPTABLES_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/cpukit/sapi/inline/rtems/extension.inl b/cpukit/sapi/inline/rtems/extension.inl
deleted file mode 100644
index 49cd834832..0000000000
--- a/cpukit/sapi/inline/rtems/extension.inl
+++ /dev/null
@@ -1,91 +0,0 @@
-/*  extension.inl
- *
- *  This file contains the static inline implementation of the inlined routines
- *  from the Extension Manager.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __EXTENSION_MANAGER_inl
-#define __EXTENSION_MANAGER_inl
-
-/*PAGE
- *
- *  _Extension_Allocate
- *
- *  DESCRIPTION:
- *
- *  This function allocates a extension control block from
- *  the inactive chain of free extension control blocks.
- */
-
-RTEMS_INLINE_ROUTINE Extension_Control *_Extension_Allocate( void )
-{
-  return (Extension_Control *) _Objects_Allocate( &_Extension_Information );
-}
-
-/*PAGE
- *
- *  _Extension_Free
- *
- *  DESCRIPTION:
- *
- *  This routine frees a extension control block to the
- *  inactive chain of free extension control blocks.
- */
-
-RTEMS_INLINE_ROUTINE void _Extension_Free (
-  Extension_Control *the_extension
-)
-{
-  _Objects_Free( &_Extension_Information, &the_extension->Object );
-}
-
-/*PAGE
- *
- *  _Extension_Get
- *
- *  DESCRIPTION:
- *
- *  This function maps extension IDs to extension control blocks.
- *  If ID corresponds to a local extension, then it returns
- *  the extension control pointer which maps to ID and location
- *  is set to OBJECTS_LOCAL.  Otherwise, location is set
- *  to OBJECTS_ERROR and the returned value is undefined.
- */
-
-RTEMS_INLINE_ROUTINE Extension_Control *_Extension_Get (
-  Objects_Id         id,
-  Objects_Locations *location
-)
-{
-  return (Extension_Control *)
-    _Objects_Get( &_Extension_Information, id, location );
-}
-
-/*PAGE
- *
- *  _Extension_Is_null
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the_extension is NULL and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Extension_Is_null (
-  Extension_Control *the_extension
-)
-{
-  return ( the_extension == NULL );
-}
-
-#endif
-/* end of include file */
diff --git a/cpukit/sapi/macros/rtems/extension.inl b/cpukit/sapi/macros/rtems/extension.inl
deleted file mode 100644
index 225f6b188d..0000000000
--- a/cpukit/sapi/macros/rtems/extension.inl
+++ /dev/null
@@ -1,58 +0,0 @@
-/*  extension.inl
- *
- *  This file contains the macro implementation of the inlined routines
- *  from the Extension Manager.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __EXTENSION_inl
-#define __EXTENSION_inl
-
-/*PAGE
- *
- *  _Extension_Allocate
- *
- */
-
-#define _Extension_Allocate() \
-  (Extension_Control *) _Objects_Allocate( &_Extension_Information )
-
-/*PAGE
- *
- *  _Extension_Free
- *
- */
-
-#define _Extension_Free( _the_extension ) \
-  _Objects_Free( &_Extension_Information, &(_the_extension)->Object )
-
-/*PAGE
- *
- *  _Extension_Get
- *
- */
-
-#define _Extension_Get( _id, _location ) \
-  (Extension_Control *) \
-    _Objects_Get( &_Extension_Information, (_id), (_location) )
-
-/*PAGE
- *
- *  _Extension_Is_null
- *
- */
-
-#define _Extension_Is_null( _the_extension ) \
-  ( (_the_extension) == NULL )
-
-#endif
-/* end of include file */
diff --git a/cpukit/sapi/src/debug.c b/cpukit/sapi/src/debug.c
deleted file mode 100644
index e44e837dc9..0000000000
--- a/cpukit/sapi/src/debug.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- *  Debug Manager
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems/system.h>
-#include <rtems/debug.h>
-
-/*PAGE
- *
- *  _Debug_Manager_initialization
- */
- 
-void _Debug_Manager_initialization( void )
-{
-  rtems_debug_disable( RTEMS_DEBUG_ALL_MASK );
-}
- 
-/*PAGE
- *
- *  rtems_debug_enable
- */
- 
-void rtems_debug_enable (
-  rtems_debug_control  to_be_enabled
-)
-{
-  _Debug_Level |= to_be_enabled;
-}
- 
-/*PAGE
- *
- *  rtems_debug_disable
- */
- 
-void rtems_debug_disable (
-  rtems_debug_control  to_be_disabled
-)
-{
-  _Debug_Level &= ~to_be_disabled;
-}
-
-/*PAGE
- *
- *  _Debug_Is_enabled
- */
-
-boolean _Debug_Is_enabled(
-  rtems_debug_control  level
-)
-{
-  return (_Debug_Level & level);
-}
diff --git a/cpukit/sapi/src/exinit.c b/cpukit/sapi/src/exinit.c
deleted file mode 100644
index dabf21dcc0..0000000000
--- a/cpukit/sapi/src/exinit.c
+++ /dev/null
@@ -1,298 +0,0 @@
-/*
- *  Initialization Manager
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-/*
- *  SCORE_INIT and SAPI_INIT are defined so all of the super core and 
- *  super API data will be included in this object file.
- */
-
-#define SAPI_INIT
-#define SCORE_INIT
-
-#include <rtems/system.h>
-#include <rtems/config.h>
-#include <rtems/debug.h>
-#include <rtems/extension.h>
-#include <rtems/fatal.h>
-#include <rtems/init.h>
-#include <rtems/io.h>
-#include <rtems/score/sysstate.h>
-
-#include <rtems/score/apiext.h>
-#include <rtems/score/copyrt.h>
-#include <rtems/score/heap.h>
-#include <rtems/score/interr.h>
-#include <rtems/score/isr.h>
-#include <rtems/score/mpci.h>
-#include <rtems/score/priority.h>
-#include <rtems/score/thread.h>
-#include <rtems/score/tod.h>
-#include <rtems/score/userext.h>
-#include <rtems/score/watchdog.h>
-#include <rtems/score/wkspace.h>
-
-#include <rtems/directives.h>
-#include <rtems/sptables.h>
-
-
-#include <rtems/rtems/rtemsapi.h>
-#ifdef RTEMS_POSIX_API
-#include <rtems/posix/posixapi.h>
-#endif
-
-/*PAGE
- *
- *  rtems_initialize_executive
- *
- *  This directive initializes all the kernels data structures
- *  to the states necessary for the kernel to begin execution.  All
- *  include files that contain global variable definitions should be
- *  included in this file.  The system threads and initialization threads
- *  are created and started by this routine.  This routine then
- *  initiates multithreading.
- *
- *  Input parameters:
- *    configuration_table - pointer to the user's configuration table
- *    cpu_table           - pointer to the user's CPU configuration table
- *
- *  Output parameters:  NONE
- */
-
-void rtems_initialize_executive(
-  rtems_configuration_table *configuration_table,
-  rtems_cpu_table           *cpu_table
-)
-{
-  rtems_interrupt_level bsp_level;
-
-  bsp_level = rtems_initialize_executive_early(configuration_table, cpu_table);
-  rtems_initialize_executive_late( bsp_level );
-}
-
-rtems_interrupt_level rtems_initialize_executive_early(
-  rtems_configuration_table *configuration_table,
-  rtems_cpu_table           *cpu_table
-)
-{
-  rtems_interrupt_level        bsp_level;
-  rtems_multiprocessing_table *multiprocessing_table;
-
-  /*
-   *  Dispatching and interrupts are disabled until the end of the
-   *  initialization sequence.  This prevents an inadvertent context
-   *  switch before the executive is initialized.
-   */
-
-  _ISR_Disable( bsp_level );
-
-  if ( configuration_table == NULL )
-    _Internal_error_Occurred(
-      INTERNAL_ERROR_CORE,
-      TRUE,
-      INTERNAL_ERROR_NO_CONFIGURATION_TABLE
-    );
-
-  /*
-   *  Initialize the system state based on whether this is an MP system.
-   */
-
-  multiprocessing_table = configuration_table->User_multiprocessing_table;
-
-  _System_state_Handler_initialization(
-    (multiprocessing_table) ? TRUE : FALSE
-  );
-
-  /*
-   *  Provided just for user convenience.
-   */
-
-  _Configuration_Table    = configuration_table;
-  _Configuration_MP_table = multiprocessing_table;
-
-  /*
-   *  Internally we view single processor systems as a very restricted
-   *  multiprocessor system.
-   */
-
-  if ( multiprocessing_table == NULL )
-    multiprocessing_table = 
-      (void *)&_Initialization_Default_multiprocessing_table;
-
-  if ( cpu_table == NULL )
-    _Internal_error_Occurred(
-      INTERNAL_ERROR_CORE,
-      TRUE,
-      INTERNAL_ERROR_NO_CPU_TABLE
-    );
-
-  _CPU_Initialize( cpu_table, _Thread_Dispatch );
-
-  /*
-   *  Do this as early as possible to insure no debugging output
-   *  is even attempted to be printed.
-   */
-
-  _Debug_Manager_initialization();
-
-  _API_extensions_Initialization();
-
-  _Thread_Dispatch_initialization();
-
-  _Workspace_Handler_initialization(
-     (void *)configuration_table->work_space_start,
-     configuration_table->work_space_size
-  );
-
-  _User_extensions_Handler_initialization(
-    configuration_table->number_of_initial_extensions,
-    configuration_table->User_extension_table
-  );
-
-  _ISR_Handler_initialization();
-
-  _Objects_Handler_initialization(
-    multiprocessing_table->node,
-    multiprocessing_table->maximum_nodes,
-    multiprocessing_table->maximum_global_objects
-  );
-
-  _Priority_Handler_initialization();
-
-  _Watchdog_Handler_initialization();
-
-  _TOD_Handler_initialization( configuration_table->microseconds_per_tick );
-
-  _Thread_Handler_initialization(
-    configuration_table->ticks_per_timeslice,
-    configuration_table->maximum_extensions,
-    multiprocessing_table->maximum_proxies
-  );
-
-  _MPCI_Handler_initialization(
-    multiprocessing_table->User_mpci_table,
-    RTEMS_TIMEOUT
-  );
-
-/* MANAGERS */
-
-  _Extension_Manager_initialization( configuration_table->maximum_extensions );
-
-  _IO_Manager_initialization(
-    configuration_table->Device_driver_table,
-    configuration_table->number_of_device_drivers,
-    configuration_table->maximum_devices
-  );
-
-  _RTEMS_API_Initialize( configuration_table );
-
-#ifdef RTEMS_POSIX_API
-  _POSIX_API_Initialize( configuration_table );
-#endif
-
-  _System_state_Set( SYSTEM_STATE_BEFORE_MULTITASKING );
-
-  if ( cpu_table->pretasking_hook )
-    (*cpu_table->pretasking_hook)();
-
-  /*
-   *  No threads should be created before this point!!! 
-   *
-   *  At this point all API extensions are in place.  After the call to
-   *  _Thread_Create_idle() _Thread_Executing will be set.
-   *  and _Thread_Heir are not set yet.
-   */
-
-  _Thread_Create_idle();
-
-  _MPCI_Create_server();
-
-  /*
-   *  Run the API and BSPs predriver hook.
-   */
- 
-  _API_extensions_Run_predriver();
- 
-  if ( _CPU_Table.predriver_hook )
-    (*_CPU_Table.predriver_hook)();
- 
-  /*
-   *  Initialize all the device drivers and initialize the MPCI layer.
-   *
-   *  NOTE:  The MPCI may be build upon a device driver.
-   */
- 
-  _IO_Initialize_all_drivers();
- 
-  if ( _System_state_Is_multiprocessing ) {
-    _MPCI_Initialization();
-    _MPCI_Internal_packets_Send_process_packet(
-      MPCI_PACKETS_SYSTEM_VERIFY
-    );
-  }
- 
-  /*
-   *  Run the APIs and BSPs postdriver hooks.
-   *
-   *  The API extensions are supposed to create user initialization tasks.
-   */
- 
-  _API_extensions_Run_postdriver();
- 
-  if ( _CPU_Table.postdriver_hook )
-    (*_CPU_Table.postdriver_hook)();
-
-  return bsp_level;
-}
-
-void rtems_initialize_executive_late(
-  rtems_interrupt_level bsp_level
-)
-{
-
-  _System_state_Set( SYSTEM_STATE_BEGIN_MULTITASKING );
-
-  _Thread_Start_multitasking();
-
-  /*
-   *  Restore the interrupt level to what the BSP had.  Technically,
-   *  this is unnecessary since the BSP should have all interrupts
-   *  disabled when rtems_initialize_executive is invoked.  But this keeps
-   *  the ISR Disable/Enable calls paired.
-   */
-
-  _ISR_Enable( bsp_level );
-}
-
-/*PAGE
- *
- *  rtems_shutdown_executive
- *
- *  This kernel routine shutdowns the executive.  It halts multitasking
- *  and returns control to the application execution "thread" which
- *  initialially invoked the rtems_initialize_executive directive.
- *
- *  Input parameters:   NONE
- *
- *  Output parameters:  NONE
- */
-
-void rtems_shutdown_executive(
-   unsigned32 result
-)
-{
-  if ( _System_state_Current != SYSTEM_STATE_SHUTDOWN ) {
-    _System_state_Set( SYSTEM_STATE_SHUTDOWN );
-    _Thread_Stop_multitasking();
-  }
-}
diff --git a/cpukit/sapi/src/extension.c b/cpukit/sapi/src/extension.c
deleted file mode 100644
index 09d9e09d33..0000000000
--- a/cpukit/sapi/src/extension.c
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- *  Extension Manager
- *
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems/system.h>
-#include <rtems/rtems/support.h>
-#include <rtems/score/object.h>
-#include <rtems/score/thread.h>
-#include <rtems/extension.h>
-
-/*PAGE
- *
- *  _Extension_Manager_initialization
- *
- *  This routine initializes all extension manager related data structures.
- *
- *  Input parameters:
- *    maximum_extensions - number of extensions to initialize
- *
- *  Output parameters:  NONE
- */
-
-void _Extension_Manager_initialization(
-  unsigned32 maximum_extensions
-)
-{
-  _Objects_Initialize_information(
-    &_Extension_Information,
-    OBJECTS_RTEMS_EXTENSIONS,
-    FALSE,
-    maximum_extensions,
-    sizeof( Extension_Control ),
-    FALSE,
-    RTEMS_MAXIMUM_NAME_LENGTH,
-    FALSE
-  );
-}
-
-/*PAGE
- *
- *  rtems_extension_create
- *
- *  This directive creates a extension and performs some initialization.
- *
- *  Input parameters:
- *    name            - extension name
- *    extension_table - pointer to extension set information
- *    id              - pointer to extension id
- *
- *  Output parameters:
- *    id                - extension id
- *    RTEMS_SUCCESSFUL - if successful
- *    error code        - if unsuccessful
- */
-
-rtems_status_code rtems_extension_create(
-  rtems_name              name,
-  rtems_extensions_table *extension_table,
-  Objects_Id             *id
-)
-{
-  Extension_Control *the_extension;
-
-  if ( !rtems_is_name_valid( name ) )
-    return RTEMS_INVALID_NAME;
-
-  _Thread_Disable_dispatch();         /* to prevent deletion */
-
-  the_extension = _Extension_Allocate();
-
-  if ( !the_extension ) {
-    _Thread_Enable_dispatch();
-    return RTEMS_TOO_MANY;
-  }
-
-  _User_extensions_Add_set( &the_extension->Extension, extension_table );
-
-  _Objects_Open( &_Extension_Information, &the_extension->Object, &name );
-
-  *id = the_extension->Object.id;
-  _Thread_Enable_dispatch();
-  return RTEMS_SUCCESSFUL;
-}
-
-/*PAGE
- *
- *  rtems_extension_ident
- *
- *  This directive returns the system ID associated with
- *  the extension name.
- *
- *  Input parameters:
- *    name - user defined message queue name
- *    id   - pointer to extension id
- *
- *  Output parameters:
- *    *id               - message queue id
- *    RTEMS_SUCCESSFUL - if successful
- *    error code        - if unsuccessful
- */
-
-rtems_status_code rtems_extension_ident(
-  rtems_name    name,
-  Objects_Id   *id
-)
-{
-  Objects_Name_to_id_errors  status;
-
-  status = _Objects_Name_to_id(
-    &_Extension_Information,
-    &name,
-    OBJECTS_SEARCH_LOCAL_NODE,
-    id
-  );
-
-  return _Status_Object_name_errors_to_status[ status ];
-}
-
-/*PAGE
- *
- *  rtems_extension_delete
- *
- *  This directive allows a thread to delete a extension.
- *
- *  Input parameters:
- *    id - extension id
- *
- *  Output parameters:
- *    RTEMS_SUCCESSFUL - if successful
- *    error code - if unsuccessful
- */
-
-rtems_status_code rtems_extension_delete(
-  Objects_Id id
-)
-{
-  Extension_Control   *the_extension;
-  Objects_Locations    location;
-
-  the_extension = _Extension_Get( id, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-    case OBJECTS_REMOTE:            /* should never return this */
-      return RTEMS_INVALID_ID;
-    case OBJECTS_LOCAL:
-      _User_extensions_Remove_set( &the_extension->Extension );
-      _Objects_Close( &_Extension_Information, &the_extension->Object );
-      _Extension_Free( the_extension );
-      _Thread_Enable_dispatch();
-      return RTEMS_SUCCESSFUL;
-  }
-
-  return RTEMS_INTERNAL_ERROR;   /* unreached - only to remove warnings */
-}
diff --git a/cpukit/sapi/src/fatal.c b/cpukit/sapi/src/fatal.c
deleted file mode 100644
index d0fc3ff5c7..0000000000
--- a/cpukit/sapi/src/fatal.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- *  Fatal Error Manager
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems/system.h>
-#include <rtems/fatal.h>
-#include <rtems/score/interr.h>
-
-/*PAGE
- *
- *  rtems_fatal_error_occurred
- *
- *  This directive will invoke the internal fatal error handler.
- *
- *  Input parameters:
- *    the_error - fatal error status code
- *
- *  Output parameters: NONE
- */
-
-void volatile rtems_fatal_error_occurred(
-  unsigned32 the_error
-)
-{
-  _Internal_error_Occurred( INTERNAL_ERROR_RTEMS_API, FALSE, the_error );
-
-/* will not return from this routine */
-}
diff --git a/cpukit/sapi/src/io.c b/cpukit/sapi/src/io.c
deleted file mode 100644
index 92de490885..0000000000
--- a/cpukit/sapi/src/io.c
+++ /dev/null
@@ -1,345 +0,0 @@
-/*
- *  Input/Output Manager
- *
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems/system.h>
-#include <rtems/io.h>
-#include <rtems/score/isr.h>
-#include <rtems/score/thread.h>
-#include <rtems/score/wkspace.h>
-
-#include <string.h>
-
-/*PAGE
- *
- *  _IO_Manager_initialization
- *
- */
- 
-void _IO_Manager_initialization(
-  rtems_driver_address_table *driver_table,
-  unsigned32                  number_of_drivers,
-  unsigned32                  number_of_devices
-)
-{
-  void                *tmp;
-  unsigned32           index;
-  rtems_driver_name_t *np;
- 
-  _IO_Driver_address_table = driver_table;
-  _IO_Number_of_drivers    = number_of_drivers;
-  _IO_Number_of_devices    = number_of_devices;
- 
-  tmp = _Workspace_Allocate_or_fatal_error(
-    sizeof( rtems_driver_name_t ) * ( number_of_devices + 1 )
-  );
- 
-  _IO_Driver_name_table = (rtems_driver_name_t *) tmp;
- 
-  for( index=0, np = _IO_Driver_name_table ;
-       index < _IO_Number_of_devices ;
-       index++, np++ ) {
-    np->device_name = 0;
-    np->device_name_length = 0;
-    np->major = 0;
-    np->minor = 0;
-  }
-}
-
-/*PAGE
- *
- *  _IO_Initialize_all_drivers
- *
- *  This routine initializes all device drivers
- *
- *  Input Paramters:   NONE
- *
- *  Output Parameters: NONE
- */
-
-void _IO_Initialize_all_drivers( void )
-{
-   rtems_device_major_number major;
-
-   for ( major=0 ; major < _IO_Number_of_drivers ; major ++ )
-     (void) rtems_io_initialize( major, 0, NULL);
-}
-
-/*PAGE
- *
- *  rtems_io_register_name
- *
- *  Associate a name with a driver
- *
- *  Input Paramters:
- *    device_name - pointer to name string to associate with device
- *    major       - device major number to receive name
- *    minor       - device minor number to receive name
- *
- *  Output Parameters: 
- *    RTEMS_SUCCESSFUL - if successful
- *    error code       - if unsuccessful
- */
-
-rtems_status_code rtems_io_register_name(
-    char *device_name,
-    rtems_device_major_number major,
-    rtems_device_minor_number minor
-  )
-{
-    rtems_driver_name_t *np;
-    unsigned32 level;
-    unsigned32 index;
-
-    /* find an empty slot */
-    for( index=0, np = _IO_Driver_name_table ;
-         index < _IO_Number_of_devices ; 
-         index++, np++ )
-    {
-
-        _ISR_Disable(level);
-        if (np->device_name == 0)
-        {
-            np->device_name = device_name;
-            np->device_name_length = strlen(device_name);
-            np->major = major;
-            np->minor = minor;
-            _ISR_Enable(level);
-
-            return RTEMS_SUCCESSFUL;
-        }
-        _ISR_Enable(level);
-    }
-
-    return RTEMS_TOO_MANY;
-}
-
-/*PAGE
- *
- *  rtems_io_lookup_name
- *
- *  Find what driver "owns" this name
- *
- *  Input Paramters:
- *    name - name to lookup the associated device
- *
- *  Output Parameters: 
- *    device_info      - device associate with name
- *    RTEMS_SUCCESSFUL - if successful
- *    error code       - if unsuccessful
- */
-
-rtems_status_code rtems_io_lookup_name(
-    const char           *name,
-    rtems_driver_name_t **device_info
-)
-{
-    rtems_driver_name_t *np;
-    unsigned32 index;
-
-    for( index=0, np = _IO_Driver_name_table ;
-         index < _IO_Number_of_devices ; 
-         index++, np++ )
-        if (np->device_name)
-            if (strncmp(np->device_name, name, np->device_name_length) == 0)
-            {                
-                *device_info = np;
-                return RTEMS_SUCCESSFUL;
-            }
-    
-    *device_info = 0;
-    return RTEMS_UNSATISFIED;
-}
-
-
-/*PAGE
- *
- *  rtems_io_initialize
- *
- *  This routine is the initialization directive of the IO manager.
- *
- *  Input Paramters:
- *    major        - device driver number
- *    minor        - device number
- *    argument     - pointer to argument(s)
- *
- *  Output Parameters:
- *    returns       - return code
- */
-
-rtems_status_code rtems_io_initialize(
-  rtems_device_major_number  major,
-  rtems_device_minor_number  minor,
-  void             *argument
-)
-{
-    rtems_device_driver_entry callout;
-    
-    if ( major >= _IO_Number_of_drivers )
-        return RTEMS_INVALID_NUMBER;
-
-    callout = _IO_Driver_address_table[major].initialization;
-    return callout ? callout(major, minor, argument) : RTEMS_SUCCESSFUL;
-}
-
-/*PAGE
- *
- *  rtems_io_open
- *
- *  This routine is the open directive of the IO manager.
- *
- *  Input Paramters:
- *    major        - device driver number
- *    minor        - device number
- *    argument     - pointer to argument(s)
- *
- *  Output Parameters:
- *    returns       - return code
- */
-
-rtems_status_code rtems_io_open(
-  rtems_device_major_number  major,
-  rtems_device_minor_number  minor,
-  void                      *argument
-)
-{
-    rtems_device_driver_entry callout;
-    
-    if ( major >= _IO_Number_of_drivers )
-        return RTEMS_INVALID_NUMBER;
-
-    callout = _IO_Driver_address_table[major].open;
-    return callout ? callout(major, minor, argument) : RTEMS_SUCCESSFUL;
-}
-
-/*PAGE
- *
- *  rtems_io_close
- *
- *  This routine is the close directive of the IO manager.
- *
- *  Input Paramters:
- *    major        - device driver number
- *    minor        - device number
- *    argument     - pointer to argument(s)
- *
- *  Output Parameters:
- *    returns       - return code
- */
-
-rtems_status_code rtems_io_close(
-  rtems_device_major_number  major,
-  rtems_device_minor_number  minor,
-  void                      *argument
-)
-{
-    rtems_device_driver_entry callout;
-    
-    if ( major >= _IO_Number_of_drivers )
-        return RTEMS_INVALID_NUMBER;
-
-    callout = _IO_Driver_address_table[major].close;
-    return callout ? callout(major, minor, argument) : RTEMS_SUCCESSFUL;
-}
-
-/*PAGE
- *
- *  rtems_io_read
- *
- *  This routine is the read directive of the IO manager.
- *
- *  Input Paramters:
- *    major        - device driver number
- *    minor        - device number
- *    argument     - pointer to argument(s)
- *
- *  Output Parameters:
- *    returns       - return code
- */
-
-rtems_status_code rtems_io_read(
-  rtems_device_major_number  major,
-  rtems_device_minor_number  minor,
-  void                      *argument
-)
-{
-    rtems_device_driver_entry callout;
-    
-    if ( major >= _IO_Number_of_drivers )
-        return RTEMS_INVALID_NUMBER;
-
-    callout = _IO_Driver_address_table[major].read;
-    return callout ? callout(major, minor, argument) : RTEMS_SUCCESSFUL;
-}
-
-/*PAGE
- *
- *  rtems_io_write
- *
- *  This routine is the write directive of the IO manager.
- *
- *  Input Paramters:
- *    major        - device driver number
- *    minor        - device number
- *    argument     - pointer to argument(s)
- *
- *  Output Parameters:
- *    returns       - return code
- */
-
-rtems_status_code rtems_io_write(
-  rtems_device_major_number  major,
-  rtems_device_minor_number  minor,
-  void                      *argument
-)
-{
-    rtems_device_driver_entry callout;
-    
-    if ( major >= _IO_Number_of_drivers )
-        return RTEMS_INVALID_NUMBER;
-
-    callout = _IO_Driver_address_table[major].write;
-    return callout ? callout(major, minor, argument) : RTEMS_SUCCESSFUL;
-}
-
-/*PAGE
- *
- *  rtems_io_control
- *
- *  This routine is the control directive of the IO manager.
- *
- *  Input Paramters:
- *    major        - device driver number
- *    minor        - device number
- *    argument     - pointer to argument(s)
- *
- *  Output Parameters:
- *    returns       - return code
- */
-
-rtems_status_code rtems_io_control(
-  rtems_device_major_number  major,
-  rtems_device_minor_number  minor,
-  void                      *argument
-)
-{
-    rtems_device_driver_entry callout;
-    
-    if ( major >= _IO_Number_of_drivers )
-        return RTEMS_INVALID_NUMBER;
-
-    callout = _IO_Driver_address_table[major].control;
-    return callout ? callout(major, minor, argument) : RTEMS_SUCCESSFUL;
-}
-
diff --git a/cpukit/sapi/src/posixapi.c b/cpukit/sapi/src/posixapi.c
deleted file mode 100644
index cc41c30d20..0000000000
--- a/cpukit/sapi/src/posixapi.c
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- *  RTEMS API Initialization Support
- *
- *  NOTE:
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <assert.h>
-
-/*
- *  POSIX_API_INIT is defined so all of the POSIX API
- *  data will be included in this object file.
- */
-
-#define POSIX_API_INIT
-
-#include <rtems/system.h>    /* include this before checking RTEMS_POSIX_API */
-#ifdef RTEMS_POSIX_API
-
-#include <sys/types.h>
-#include <rtems/config.h>
-#include <rtems/score/object.h>
-#include <rtems/posix/cond.h>
-#include <rtems/posix/config.h>
-#include <rtems/posix/key.h>
-#include <rtems/posix/mutex.h>
-#include <rtems/posix/priority.h>
-#include <rtems/posix/psignal.h>
-#include <rtems/posix/pthread.h>
-#include <rtems/posix/time.h>
-
-/*PAGE
- *
- *  _POSIX_API_Initialize
- *
- *  XXX
- */
-
-posix_api_configuration_table _POSIX_Default_configuration = {
-  0,                             /* maximum_threads */
-  0,                             /* maximum_mutexes */
-  0,                             /* maximum_condition_variables */
-  0,                             /* maximum_keys */
-  0,                             /* maximum_queued_signals */
-  0,                             /* number_of_initialization_threads */
-  NULL                           /* User_initialization_threads_table */
-};
-
-
-void _POSIX_API_Initialize(
-  rtems_configuration_table *configuration_table
-)
-{
-  posix_api_configuration_table *api_configuration;
-
-  /* XXX need to assert here based on size assumptions */
-
-  assert( sizeof(pthread_t) == sizeof(Objects_Id) );
-
-  api_configuration = configuration_table->POSIX_api_configuration;
-  if ( !api_configuration ) 
-    api_configuration = &_POSIX_Default_configuration;
-
-  _POSIX_signals_Manager_Initialization(
-    api_configuration->maximum_queued_signals
-  );
-
-  _POSIX_Threads_Manager_initialization(
-    api_configuration->maximum_threads,
-    api_configuration->number_of_initialization_threads,
-    api_configuration->User_initialization_threads_table
-  );
- 
-  _POSIX_Condition_variables_Manager_initialization(
-    api_configuration->maximum_condition_variables
-  );
-
-  _POSIX_Key_Manager_initialization( api_configuration->maximum_keys );
-
-  _POSIX_Mutex_Manager_initialization( 
-    api_configuration->maximum_mutexes
-  );
-
-}
-
-#endif
-/* end of file */
diff --git a/cpukit/sapi/src/rtemsapi.c b/cpukit/sapi/src/rtemsapi.c
deleted file mode 100644
index d860ad7f99..0000000000
--- a/cpukit/sapi/src/rtemsapi.c
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- *  POSIX API Initialization Support
- *
- *  NOTE:
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-/*
- *  RTEMS_API_INIT is defined so all of the RTEMS API
- *  data will be included in this object file.
- */
-
-#define RTEMS_API_INIT
-
-#include <rtems/system.h>
-#include <rtems/rtems/status.h>
-#include <rtems/rtems/rtemsapi.h>
-
-#include <rtems/rtems/intr.h>
-#include <rtems/rtems/clock.h>
-#include <rtems/rtems/tasks.h>
-#include <rtems/rtems/dpmem.h>
-#include <rtems/rtems/event.h>
-#include <rtems/rtems/message.h>
-#include <rtems/rtems/mp.h>
-#include <rtems/rtems/part.h>
-#include <rtems/rtems/ratemon.h>
-#include <rtems/rtems/region.h>
-#include <rtems/rtems/sem.h>
-#include <rtems/rtems/signal.h>
-#include <rtems/rtems/timer.h>
-
-/*PAGE
- *
- *  _RTEMS_API_Initialize
- *
- *  XXX
- */
-
-void _RTEMS_API_Initialize(
-  rtems_configuration_table *configuration_table
-)
-{
-  rtems_api_configuration_table *api_configuration;
-
-  api_configuration = configuration_table->RTEMS_api_configuration;
-
-  _Attributes_Handler_initialization();
- 
-  _Interrupt_Manager_initialization();
- 
-  _Multiprocessing_Manager_initialization();
- 
-  _RTEMS_tasks_Manager_initialization(
-    api_configuration->maximum_tasks,
-    api_configuration->number_of_initialization_tasks,
-    api_configuration->User_initialization_tasks_table
-  );
- 
-  _Timer_Manager_initialization( api_configuration->maximum_timers );
- 
-  _Signal_Manager_initialization();
- 
-  _Event_Manager_initialization();
- 
-  _Message_queue_Manager_initialization(
-    api_configuration->maximum_message_queues
-  );
- 
-  _Semaphore_Manager_initialization( api_configuration->maximum_semaphores );
- 
-  _Partition_Manager_initialization( api_configuration->maximum_partitions );
- 
-  _Region_Manager_initialization( api_configuration->maximum_regions );
- 
-  _Dual_ported_memory_Manager_initialization( api_configuration->maximum_ports);
- 
-  _Rate_monotonic_Manager_initialization( api_configuration->maximum_periods );
-}
-
-/* end of file */
diff --git a/cpukit/score/cpu/a29k/amd.ah b/cpukit/score/cpu/a29k/amd.ah
deleted file mode 100644
index 006e7e15e7..0000000000
--- a/cpukit/score/cpu/a29k/amd.ah
+++ /dev/null
@@ -1,531 +0,0 @@
-; /* @(#)amd.ah	1.1 96/05/23 08:56:58, TEI */
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;		 Initialization values for registers after RESET
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;
-:  /* $Id$ */
-;* File information and includes.
-
-        .file   "amd.ah"
-        .ident  "@(#)amd.ah	1.1 96/05/23 08:56:58, TEI"
-
-
-
-;
-;* AMD PROCESSOR SPECIFIC VALUES...
-;
-
-;
-;* Processor revision levels...
-;
-
-; PRL values: 31-28   27-24
-; Am29000	0	x
-; Am29005	1	x
-; Am29050	2	x
-; Am29035	3	x
-; Am29030	4	x
-; Am29200	5	x
-; Am29205	5	1x
-; Am29240	6	0
-; Manx		7	0
-; Cougar	8	0
-
-
-	.equ	AM29000_PRL, 	0x00
-
-	.equ	AM29005_PRL, 	0x10
-
-	.equ	AM29050_PRL, 	0x20
-
-	.equ	AM29035_PRL, 	0x30
-
-	.equ	AM29030_PRL, 	0x40
-
-	.equ	AM29200_PRL, 	0x50
-
-	.equ	AM29205_PRL, 	0x58
-
-	.equ	AM29240_PRL, 	0x60
-
-	.equ	AM29040_PRL, 	0x70
-
-	.equ	MANX_PRL,  	0x70
-
-	.equ	COUGAR_PRL, 	0x80
-
-;
-;* data structures sizes.
-;
-	.equ	CFGINFO_SIZE,	16*4
-
-	.equ	PGMINFO_SIZE,	16*4
-
-	.equ	VARARGS_SPACE,	16*4
-
-	.equ	WINDOWSIZE,	0x80
-;
-;* Am29027 Mode registers
-;
-
-	.equ	Am29027Mode1, 0x0fc00820
-
-	.equ	Am29027Mode2, 0x00001375
-	
-
-
-;* Processor Based Equates and Defines
-
-	.equ	SIG_SYNC,	-1	
-
-	.equ	ENABLE,		(SM)
-
-	.equ	DISABLE,	(ENABLE | DI | DA)
-
-	.equ	DISABLE_FZ,	(FZ | ENABLE | DI | DA)
-
-	.equ	CLR_TRAP,	(FZ | DA)	
-
-	.equ	InitOPS,	(TD | SM | (3<<IMShift) | DI | DA) 
-	
-	.equ	InitCPS,	(TD | SM | (0<<IMShift) | DI | DA) 
-
-	.equ	InitCPS1,	(TD | SM | (0<<IMShift) | DI ) 
-
-	.equ	CPS_TMR,	(SM | (0<<IMShift) | DI)
-
-	.equ	CPS_INT0,	(TD | SM | (0<<IMShift))
-
-	.equ	CPS_TMRINT0,	(SM | (0<<IMShift))
-
-	.equ	InitCFG,	0x0 
-
-	.equ	InitRBP,	(B0|B1|B2|B3|B4|B5)
-
-	.equ	TMC_VALUE,	0xFFFFFF
-
-	.equ	TMR_VALUE,	(IE | TMC_VALUE)
-
-
-
-
-
-
-;* 29205 specific (internal) peripheral initialization constants.
-
-; Current Processor Status (CPS) Register.
-; Old Processor Status Register (OPS).
-
-	.equ	DA,	0x00001
-	.equ	DI,	0x00002
-	.equ	IMShift,0x2
-	.equ	SM,	0x00010
-	.equ	PI,	0x00020
-	.equ	PD,	0x00040
-	.equ	WM,	0x00080
-	.equ	RE, 	0x00100
-	.equ	LK,	0x00200
-	.equ	FZ, 	0x00400
-	.equ	TU,	0x00800
-	.equ	TP,	0x01000
-	.equ	TE,	0x02000
-	.equ	IP,	0x04000
-	.equ	CA,	0x08000
-	.equ	MM,	0x10000
-	.equ	TD,	0x20000
-
-; Configuration Register (CFG)
-
-	.equ	CD,	0x01
-	.equ	CP,	0x02
-	.equ	BO,	0x04
-	.equ	RV, 	0x08
-	.equ	VF,	0x10
-	.equ	DW,	0x20
-	.equ	CO,	0x40
-	.equ	EE,	0x80
-	.equ	IDShift,	8
-	.equ	CFG_ID,	0x100
-	.equ	ILShift,	9
-	.equ	CFG_ILMask,	0x600
-	.equ	DDShift,	11
-	.equ	CFG_DD,	0x800
-	.equ	DLShift,	12
-	.equ	CFG_DLMask,	0x3000
-	.equ	PCEShift, 	14
-	.equ	CFG_PCE,	0x4000
-	.equ	PMBShift, 	16
-	.equ	D16,	0x8000
-	.equ	TBOShift,	23
-	.equ	PRLShift, 24
-
-; Channel Control Register (CHC)
-
-	.equ	CV, 0x1
-	.equ	NN, 0x2
-	.equ	TRShift, 2
-	.equ	TF, 0x400
-	.equ	PER, 0x800
-	.equ	LA, 0x1000
-	.equ	ST, 0x2000
-	.equ	ML, 0x4000
-	.equ	LS, 0x8000
-	.equ 	CRShift, 16
-	.equ	CNTLShift, 24
-	.equ	CEShift, 31
-	.equ	WBERShift, 31
-
-; Register Bank Protect (RBP)
-	.equ	B0, 0x1
-	.equ	B1, 0x2
-	.equ	B2, 0x4
-	.equ	B3, 0x8
-	.equ	B4, 0x10
-	.equ	B5, 0x20
-	.equ	B6, 0x40
-	.equ	B7, 0x80
-	.equ	B8, 0x100
-	.equ	B9, 0x200
-	.equ	B10, 0x400
-	.equ	B11, 0x800
-	.equ	B12, 0x1000
-	.equ	B13, 0x2000
-	.equ	B14, 0x4000
-	.equ	B15, 0x8000
-
-; Timer Counter
-
-	.equ	TCVMask, 0xffffff
-
-; Timer Reload Register
-
-	.equ	IE, 0x1000000
-	.equ	IN, 0x2000000
-	.equ	OV, 0x4000000
-	.equ	TRVMAsk, 0xffffff
-
-; MMU Configuration
-
-	.equ	PSShift, 8
-	.equ	PS0Shift, 8
-	.equ	PS1Shift, 12
-
-; LRU Recommendation (LRU)
-	.equ	LRUMask, 0xff
-
-; Reason Vector (RSN)
-	.equ 	RSNMask, 0xff
-
-; Region Mapping Address (RMA0 | RMA1)
-	.equ	PBAMask,0xffff
-	.equ	VBAShift, 16
-
-; Region Mapping Control (RMC0 | RMC1)
-	.equ	TIDMask, 0xff
-	.equ	RMC_UE, 0x100
-	.equ	RMC_UW, 0x200
-	.equ	RMC_UR, 0x400
-	.equ	RMC_SE, 0x800
-	.equ	RMC_SW, 0x1000
-	.equ	RMC_SR, 0x2000
-	.equ	RMC_VE, 0x4000
-	.equ	RMC_IO, 0x10000
-	.equ	RGSShift, 17
-	.equ	RMC_PGMShift, 22
-
-; Instruction breakpoint Control (IBC0 | IBC1)
-	.equ	BPIDMask, 0xff
-	.equ	BTE, 0x100
-	.equ	BRM, 0x200
-	.equ	IBC_BSY, 0x400
-	.equ	BEN, 0x800
-	.equ	BHO, 0x1000
-
-; Cache Data Register (CDR)
-	.equ	CDR_US, 0x1
-	.equ	P, 0x2
-	.equ	CDR_V, 0x4
-	.equ	IATAGShift, 20
-
-; Cache Interface Register (CIR)
-	.equ	CPTRShift, 2
-	.equ	CIR_RW, 0x1000000
-	.equ	FSELShift, 28
-
-; Indirect Pointer A, B, C (IPA, IPB, IPC)
-	.equ	IPShift, 2
-
-; ALU Status (ALU)
-	.equ	FCMask, 0x1F
-	.equ	BPShift, 5
-	.equ	C, 0x80
-	.equ	Z, 0x100
-	.equ	N, 0x200
-	.equ	ALU_V, 0x400
-	.equ	DF, 0x800
-
-; Byte Pointer
-	.equ	BPMask, 0x3
-
-; Load/Store Count Remaining (CR)
-	.equ	CRMask, 0xff
-
-; Floating Point Environment (FPE)
-	.equ	NM, 0x1
-	.equ	RM, 0x2
-	.equ	VM, 0x4
-	.equ	UM, 0x8
-	.equ	XM, 0x10
-	.equ	DM, 0x20
-	.equ 	FRMShift, 6
-	.equ	FF, 0x100
-	.equ	ACFShift, 9
-
-; Integer Environment (INTE)
-	.equ	MO, 0x1
-	.equ	DO, 0x2
-
-; Floating Point Status (FPS)
-	.equ	NS, 0x1
-	.equ	RS, 0x2
-	.equ	VS, 0x4
-	.equ	FPS_US, 0x8
-	.equ	XS, 0x10
-	.equ	DS, 0x20
-	.equ	NT, 0x100
-	.equ	RT, 0x200
-	.equ	VT, 0x400
-	.equ	UT, 0x800
-	.equ	XT, 0x1000
-	.equ	DT, 0x2000
-
-; Exception Opcode (EXOP)
-	.equ	IOPMask, 0xff
-
-; TLB Entry Word 0
-;	.equ	TIDMask, 0xff	already defined above
-	.equ	TLB_UE, 0x100
-	.equ	TLB_UW, 0x200
-	.equ	TLB_UR, 0x400
-	.equ	TLB_SE, 0x800
-	.equ	TLB_SW, 0x1000
-	.equ	TLB_SR, 0x2000
-	.equ	TLB_VE, 0x4000
-	.equ	VTAGShift, 15
-
-; TLB Entry Word 1
-	.equ	TLB_IO, 0x1
-	.equ	U, 0x2
-	.equ	TLB_PGMShift, 6
-	.equ	RPNShift, 10
-
-; Am29200 ROM Control bits.
-	.equ	RMCT_DW0Shift, 29
-	.equ	RMCT_DW1Shift, 21
-	.equ	RMCT_DW2Shift, 13
-	.equ	RMCT_DW3Shift, 5
-
-; Am29200 DRAM Control bits.
-	.equ	DW3, (1<<18)
-	.equ	DW2, (1<<22)
-	.equ	DW1, (1<<26)
-	.equ	DW0, (1<<30)
-
-	; Internal peripheral address assignments.
-	.equ	RMCT, 0x80000000
-	.equ	RMCF, 0x80000004
-	.equ	DRCT, 0x80000008
-	.equ	DRCF, 0x8000000C
-	.equ	DRM0, 0x80000010
-	.equ	DRM1, 0x80000014
-	.equ	DRM2, 0x80000018
-	.equ	DRM3, 0x8000001C
-	.equ	PIACT0, 0x80000020
-	.equ	PIACT1, 0x80000020
-	.equ	ICT, 0x80000028
-	.equ	DMCT0, 0x80000030
-	.equ	DMAD0, 0x80000034
-	.ifdef	revA
-	.equ	TAD0, 0x80000036
-	.equ	TCN0, 0x8000003A
-	.else
-	.equ	TAD0, 0x80000070	; default
-	.equ	TCN0, 0x8000003C	; default
-	.endif
-	.equ	DMCN0, 0x80000038
-	.equ	DMCT1, 0x80000040
-	.equ	DMAD1, 0x80000044
-	.equ	DMCN1, 0x80000048
-	.equ	SPCT, 0x80000080
-	.equ	SPST, 0x80000084
-	.equ	SPTH, 0x80000088
-	.equ	SPRB, 0x8000008C
-	.equ	BAUD, 0x80000090
-	.equ	PPCT, 0x800000C0
-	.equ	PPST, 0x800000C1
-	.equ	PPDT, 0x800000C4
-	.equ	POCT, 0x800000D0
-	.equ	PIN, 0x800000D4
-	.equ	POUT, 0x800000D8
-	.equ	POEN, 0x800000DC
-	.equ	VCT, 0x800000E0
-	.equ	TOP, 0x800000E4
-	.equ	SIDE, 0x800000E8
-	.equ	VDT, 0x800000EC
-
-	; Interrupt Controller Register bits.
-	.equ	TXDI,	(1<<5)
-	.equ	RXDI,	(1<<6)
-	.equ	RXSI,	(1<<7)
-	.equ	PPI,	(1<<11)
-	.equ	DMA1I,	(1<<13)
-	.equ	DMA0I,	(1<<14)
-	.equ	IOPIMask,	(0xFF<<16)
-	.equ	VDI,	(1<<27)
-	.equ	ICT200_I,  (TXDI|RXDI|RXSI|PPI|DMA1I|DMA0I|IOPIMask|VDI)
-	.equ	ICT205_I,  (TXDI|RXDI|RXSI|PPI|DMA1I|DMA0I|IOPIMask|VDI)
-
-	; Serial port Initialization bits
-	.equ	NO_PARITY,	0
-	
-
-	; SPST bits
-	.equ	THREShift, 22
-
-;* REGISTER Addresses
-
-	.equ	ROMCntlRegAddr,		0x80000000
-
-	.equ	ROMCfgRegAddr, 		0x80000004
-
-	.equ	DRAMCntlRegAddr,	0x80000008
-
-	.equ	DRAMCfgRegAddr,		0x8000000C
-
-	.equ	DRAMMap0RegAddr,	0x80000010
-
-	.equ	DRAMMap1RegAddr,	0x80000014
-
-	.equ	DRAMMap2RegAddr,	0x80000018
-
-	.equ	DRAMMap3RegAddr,	0x8000001C
-
-	.equ	PIACntl0RegAddr,	0x80000020
-
-	.equ	PIACntl1RegAddr,	0x80000024
-
-	.equ	INTRCntlRegAddr,	0x80000028
-
-	.equ	DMACntl0RegAddr,	0x80000030
-
-	.equ	DMACntl1RegAddr,	0x80000040
-
-	.equ	SERPortCntlRegAddr,	0x80000080
-
-	.equ	SERPortStatRegAddr,	0x80000084
-
-	.equ	SERPortTHLDRegAddr,	0x80000088
-
-	.equ	SERPortRbufRegAddr,	0x8000008C
-
-	.equ	SERPortBaudRegAddr,	0x80000090
-
-	.equ	PARPortCntlRegAddr,	0x800000C0
-
-	.equ	PIOCntlRegAddr,		0x800000D0
-
-	.equ	PIOInpRegAddr,		0x800000D4
-
-	.equ	PIOOutRegAddr,		0x800000D8
-
-	.equ	PIOOutEnaRegAddr,	0x800000DC
-
-	.equ	VCTCntlRegAddr,		0x800000E0
-
-;
-;* Control constants
-;
-
-;* AM29030 Timer related constants.
-
-	.equ	TMR_IE,			0x01000000
-
-	.equ	TMR_IN,			0x02000000
-
-	.equ	TMR_OV,			0x04000000
-
-	.equ	TMC_INITCNT, 		1613
-
-;
-;* System initialization values.
-;
-
-	.equ	__os_version,		0x0001		;
-
-	.equ	STACKSize,		0x8000		;
-
-	.equ	PGMExecMode,		0x0000		;
-
-	.equ	TSTCK_OFST,		28 * 4
-
-	.equ	CSTCK_OFST,		29 * 4
-
-	.equ	TMSTCK_OFST,		30 * 4
-
-	.equ	CMSTCK_OFST,		31 * 4
-
-	.equ	CTXSW_OK, 		0xA55A		; ctx switch ok
-
-	.set	NV_STARTOFST,		0x20		; 32 bytes
-
-	.set	NV_BAUDOFST,		0x00		; 00 bytes
-
-	.set	reg_cir, 		29
-
-	.set	reg_cdr, 		30
-
-	.equ	MSG_BUFSIZE,		0x1000		; serial buffer size 
-
-        .equ    ILLOPTRAP,      	0
-
-        .equ    UATRAP,         	1
-
-        .equ    PVTRAP,         	5
-
-        .equ    UITLBMISSTRAP,  	8
-
-        .equ    UDTLBMISSTRAP,  	9
-
-        .equ    TIMERTRAP,      	14
-
-        .equ    TRACETRAP,      	15
-
-        .equ    XLINXTRAP,      	16
-
-        .equ    SERIALTRAP,     	17
-
-        .equ    SLOWTMRTRAP,    	18
-
-        .equ    PORTTRAP,       	19
-
-        .equ    SVSCTRAP,       	80
-
-        .equ    SVSCTRAP1,       	81
-
-        .equ    V_CACHETRAP,      	66		;
-
-        .equ    V_SETSERVICE,      	67		;
-
-	.equ	INIT_TIMER,		100
-
-	.equ	DISABLE_TIMER,		101
-
-	.equ	GET_TIMER,		102
-
-	.equ	CLEAR_TIMER,		103
-
-	.equ	V_SPILL,		64
-
-	.equ	V_FILL,			65
-
-	.equ	SIGDFL,			105
diff --git a/cpukit/score/cpu/a29k/asm.h b/cpukit/score/cpu/a29k/asm.h
deleted file mode 100644
index 5622b124ce..0000000000
--- a/cpukit/score/cpu/a29k/asm.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*  asm.h
- *
- *  This include file attempts to address the problems
- *  caused by incompatible flavors of assemblers and
- *  toolsets.  It primarily addresses variations in the
- *  use of leading underscores on symbols and the requirement
- *  that register names be preceded by a %.
- *
- *
- *  NOTE: The spacing in the use of these macros
- *        is critical to them working as advertised.
- *
- *  !!! THIS FILE DOES NOT APPEAR TO HAVE BEEN USED IN THE 29K PORT !!!
- *
- *  COPYRIGHT:
- *
- *  This file is based on similar code found in newlib available
- *  from ftp.cygnus.com.  The file which was used had no copyright
- *  notice.  This file is freely distributable as long as the source
- *  of the file is noted.  This file is:
- *
- *  COPYRIGHT (c) 1989-1997
- *  On-Line Applications Research Corporation (OAR).
- *
- *  $Id$
- */
-
-#ifndef __A29K_ASM_h
-#define __A29K_ASM_h
-
-/*
- *  Indicate we are in an assembly file and get the basic CPU definitions.
- */
-
-#ifndef ASM
-#define ASM
-#endif
-#include <rtems/score/targopts.h>
-#include <rtems/score/asm.h>
-
-/*
- *  Recent versions of GNU cpp define variables which indicate the
- *  need for underscores and percents.  If not using GNU cpp or
- *  the version does not support this, then you will obviously
- *  have to define these as appropriate.
- */
-
-#ifndef __USER_LABEL_PREFIX__
-#define __USER_LABEL_PREFIX__ _
-#endif
-
-#ifndef __REGISTER_PREFIX__
-#define __REGISTER_PREFIX__
-#endif
-
-/* ANSI concatenation macros.  */
-
-#define CONCAT1(a, b) CONCAT2(a, b)
-#define CONCAT2(a, b) a ## b
-
-/* Use the right prefix for global labels.  */
-
-#define SYM(x) CONCAT1 (__USER_LABEL_PREFIX__, x)
-
-/* Use the right prefix for registers.  */
-
-#define REG(x) CONCAT1 (__REGISTER_PREFIX__, x)
-
-/*
- *  define macros for all of the registers on this CPU
- *
- *  EXAMPLE:     #define d0 REG (d0)
- */
-
-/*
- *  Define macros to handle section beginning and ends.
- */
-
-
-#define BEGIN_CODE_DCL .text
-#define END_CODE_DCL
-#define BEGIN_DATA_DCL .data
-#define END_DATA_DCL
-#define BEGIN_CODE .text
-#define END_CODE
-#define BEGIN_DATA
-#define END_DATA
-#define BEGIN_BSS
-#define END_BSS
-#define END
-
-/*
- *  Following must be tailor for a particular flavor of the C compiler.
- *  They may need to put underscores in front of the symbols.
- */
-
-#define PUBLIC(sym) .globl SYM (sym)
-#define EXTERN(sym) .globl SYM (sym)
-
-#endif
-/* end of include file */
-
-
diff --git a/cpukit/score/cpu/a29k/cpu.c b/cpukit/score/cpu/a29k/cpu.c
deleted file mode 100644
index 111533a2ae..0000000000
--- a/cpukit/score/cpu/a29k/cpu.c
+++ /dev/null
@@ -1,263 +0,0 @@
-/*
- *  AMD 29K CPU Dependent Source
- *
- *  Author:     Craig Lebakken <craigl@transition.com>
- *
- *  COPYRIGHT (c) 1996 by Transition Networks Inc.
- *
- *  To anyone who acknowledges that this file is provided "AS IS"
- *  without any express or implied warranty:
- *      permission to use, copy, modify, and distribute this file
- *      for any purpose is hereby granted without fee, provided that
- *      the above copyright notice and this notice appears in all
- *      copies, and that the name of Transition Networks not be used in
- *      advertising or publicity pertaining to distribution of the
- *      software without specific, written prior permission.
- *      Transition Networks makes no representations about the suitability
- *      of this software for any purpose.
- *
- *  Derived from c/src/exec/score/cpu/no_cpu/cpu.c:
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-#ifndef lint
-static char _sccsid[] = "@(#)cpu.c 10/21/96     1.8\n";
-#endif
-
-#include <rtems/system.h>
-#include <rtems/score/isr.h>
-#include <rtems/score/wkspace.h>
-#include <rtems/score/thread.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-void a29k_ISR_Handler(unsigned32 vector);
-
-/*  _CPU_Initialize
- *
- *  This routine performs processor dependent initialization.
- *
- *  INPUT PARAMETERS:
- *    cpu_table       - CPU table to initialize
- *    thread_dispatch - address of disptaching routine
- */
-
-
-void _CPU_Initialize(
-  rtems_cpu_table  *cpu_table,
-  void      (*thread_dispatch)()      /* ignored on this CPU */
-)
-{
-  unsigned int i;
-  /*
-   *  The thread_dispatch argument is the address of the entry point
-   *  for the routine called at the end of an ISR once it has been
-   *  decided a context switch is necessary.  On some compilation
-   *  systems it is difficult to call a high-level language routine
-   *  from assembly.  This allows us to trick these systems.
-   *
-   *  If you encounter this problem save the entry point in a CPU
-   *  dependent variable.
-   */
-
-  _CPU_Thread_dispatch_pointer = thread_dispatch;
-
-  /*
-   *  If there is not an easy way to initialize the FP context
-   *  during Context_Initialize, then it is usually easier to
-   *  save an "uninitialized" FP context here and copy it to
-   *  the task's during Context_Initialize.
-   */
-
-  /* FP context initialization support goes here */
-
-  _CPU_Table = *cpu_table;
-
-  for ( i = 0; i < ISR_NUMBER_OF_VECTORS; i++ )
-  {
-     _ISR_Vector_table[i] = (proc_ptr)NULL;
-  }
-}
-
-/*PAGE
- *
- *  _CPU_ISR_Get_level
- */
- 
-unsigned32 _CPU_ISR_Get_level( void )
-{
-  unsigned32	cps;
-
-  /*
-   *  This routine returns the current interrupt level.
-   */
-  cps = a29k_getops();
-  if (cps & (TD|DI))
-    return 1;
-  else
-    return 0;
-}
-
-/*PAGE
- *
- *  _CPU_ISR_install_raw_handler
- */
- 
-extern void intr14( void );
-extern void intr18( void );
-extern void intr19( void );
-
-void _CPU_ISR_install_raw_handler(
-  unsigned32  vector,
-  proc_ptr    new_handler,
-  proc_ptr   *old_handler
-)
-{
-  /*
-   *  This is where we install the interrupt handler into the "raw" interrupt
-   *  table used by the CPU to dispatch interrupt handlers.
-   */
-   switch( vector )
-   {
-      case 14:
-         _settrap( vector, intr14 );
-         break;
-      case 18:
-         _settrap( vector, intr18 );
-         break;
-      case 19:
-         _settrap( vector, intr19 );
-         break;
-
-      default:
-         break;
-   }
-}
-
-
-/*PAGE
- *
- *  _CPU_ISR_install_vector
- *
- *  This kernel routine installs the RTEMS handler for the
- *  specified vector.
- *
- *  Input parameters:
- *    vector      - interrupt vector number
- *    old_handler - former ISR for this vector number
- *    new_handler - replacement ISR for this vector number
- *
- *  Output parameters:  NONE
- *
- */
-
-void _CPU_ISR_install_vector(
-  unsigned32  vector,
-  proc_ptr    new_handler,
-  proc_ptr   *old_handler
-)
-{
-   *old_handler = _ISR_Vector_table[ vector ];
-
-   /*
-    *  If the interrupt vector table is a table of pointer to isr entry
-    *  points, then we need to install the appropriate RTEMS interrupt
-    *  handler for this vector number.
-    */
-
-   _CPU_ISR_install_raw_handler( vector, new_handler, old_handler );
-
-   /*
-    *  We put the actual user ISR address in '_ISR_vector_table'.  This will
-    *  be used by the _ISR_Handler so the user gets control.
-    */
-
-    _ISR_Vector_table[ vector ] = new_handler;
-}
-
-/*PAGE
- *
- *  _CPU_Install_interrupt_stack
- */
-
-void _CPU_Install_interrupt_stack( void )
-{
-}
-
-/*PAGE
- *
- *  _CPU_Internal_threads_Idle_thread_body
- *
- *  NOTES:
- *
- *  1. This is the same as the regular CPU independent algorithm.
- *
- *  2. If you implement this using a "halt", "idle", or "shutdown"
- *     instruction, then don't forget to put it in an infinite loop.
- *
- *  3. Be warned. Some processors with onboard DMA have been known
- *     to stop the DMA if the CPU were put in IDLE mode.  This might
- *     also be a problem with other on-chip peripherals.  So use this
- *     hook with caution.
- */
-
-void _CPU_Internal_threads_Idle_thread_body( void )
-{
-
-  for( ; ; )
-  {
-  }
-    /* insert your "halt" instruction here */ ;
-}
-
-void a29k_fatal_error( unsigned32 error )
-{
-   printf("\n\nfatal error %d, rebooting!!!\n",error );
-   exit(error);
-}
-
-   /*
-    *  This discussion ignores a lot of the ugly details in a real
-    *  implementation such as saving enough registers/state to be
-    *  able to do something real.  Keep in mind that the goal is
-    *  to invoke a user's ISR handler which is written in C and
-    *  uses a certain set of registers.
-    *
-    *  Also note that the exact order is to a large extent flexible.
-    *  Hardware will dictate a sequence for a certain subset of
-    *  _ISR_Handler while requirements for setting
-    */
-
-  /*
-   *  At entry to "common" _ISR_Handler, the vector number must be
-   *  available.  On some CPUs the hardware puts either the vector
-   *  number or the offset into the vector table for this ISR in a
-   *  known place.  If the hardware does not give us this information,
-   *  then the assembly portion of RTEMS for this port will contain
-   *  a set of distinct interrupt entry points which somehow place
-   *  the vector number in a known place (which is safe if another
-   *  interrupt nests this one) and branches to _ISR_Handler.
-   *
-   */
-
-void a29k_ISR_Handler(unsigned32 vector)
-{
-   _ISR_Nest_level++;
-   _Thread_Dispatch_disable_level++;
-   if ( _ISR_Vector_table[ vector ] )
-      (*_ISR_Vector_table[ vector ])( vector );
-   --_Thread_Dispatch_disable_level;
-   --_ISR_Nest_level;
-   if ( !_Thread_Dispatch_disable_level && !_ISR_Nest_level &&
-    (_Context_Switch_necessary || _ISR_Signals_to_thread_executing ))
-      _Thread_Dispatch();
-   return;
-}
diff --git a/cpukit/score/cpu/a29k/pswmacro.ah b/cpukit/score/cpu/a29k/pswmacro.ah
deleted file mode 100644
index c21eee4f35..0000000000
--- a/cpukit/score/cpu/a29k/pswmacro.ah
+++ /dev/null
@@ -1,442 +0,0 @@
-; /* @(#)pswmacro.ah	1.1 96/05/23 08:56:58, TEI */
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;		 macros: Do_install and init_TLB
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; /* $Id$ */
-
-;* File information and includes.
-
-	.file	"macro.ah"
-	.ident	"@(#)pswmacro.ah	1.1 96/05/23 08:56:58, TEI"
-
-
-	.macro	CONST32, RegName, RegValue
-		const	RegName, RegValue
-		consth	RegName, RegValue
-	.endm
-
-	.macro	CONSTX, RegName, RegValue
-		.if (RegValue) <= 0x0000ffff
-			const	RegName, RegValue
-		.else
-			const	RegName, RegValue
-			consth	RegName, RegValue
-		.endif
-	.endm
-
-	.macro	PRODEV, RegName
-		srl	RegName, RegName, 24
-	.endm
-
-;
-;* MACRO TO INSTALL VECTOR TABLE ENTRIES
-;
- 
-;* Assumes vector table address in v0
- 
-        .macro  _setvec, trapnum, trapaddr
-                mfsr    v0, vab                 ;
-                const   v2, trapnum             ;
-                sll     v1, v2, 2               ;
-                add     v1, v1, v0              ; v0 has location of vector tab
- 
-                const   v2, trapaddr            ;
-                consth  v2, trapaddr            ;
-                store   0, 0, v2, v1            ;
-                nop                             ;
-        .endm
- 
-        .macro  syscall, name
-                const     tav, HIF_@name        ;
-                asneq   V_SYSCALL, gr1, gr1     ;
-                nop                             ;
-                nop                             ;
-        .endm
-
-
-
-;* MACRO TO INSTALL VECTOR TABLE ENTRIES 
-
-	.macro	Do_Install, V_Number, V_Address
-		const	lr4, V_Address 
-		consth	lr4, V_Address
-		const	lr3, V_Number * 4
-		consth	lr3, V_Number * 4
-		call	lr0, V_Install
-		nop
-	.endm
-
-	.macro	Do_InstallX, V_Number, V_Address
-		const	lr4, V_Address 
-		consth	lr4, V_Address
-		const	lr3, V_Number * 4
-		consth	lr3, V_Number * 4
-		call	lr0, V_InstallX
-		nop
-	.endm
-
-
-
-; push a register onto the stack
-	.macro	pushreg, reg, sp
-	sub	sp, sp, 4		; adjust stack pointer
-	store	0, 0, reg, sp		; push register
-	.endm
-
-	.macro	push, sp, reg
-		sub	sp, sp, 4
-		store	0, 0, reg, sp
-	.endm
-
-; pop the register from stack
-	.macro	popreg, reg, sp
-	load	0, 0, reg, sp		; pop register
-	add	sp, sp, 4		; adjust stack pointer
-	.endm
-	.macro	pop, reg, sp
-		load	0, 0, reg, sp
-		add	sp, sp, 4
-	.endm
-
-; push a special register onto stack
-	.macro	pushspcl, spcl, tmpreg, sp
-	sub	sp, sp, 4		; adjust stack pointer
-	mfsr	tmpreg, spcl		; get spcl reg
-	store	0, 0, tmpreg, sp	; push onto stack
-	.endm
-
-	.macro	pushsr, sp, reg, sreg
-		mfsr	reg, sreg
-		sub	sp, sp, 4
-		store	0, 0, reg, sp
-	.endm
-
-; pop a special register from stack
-	.macro	popspcl, spcl, tmpreg, sp
-	load	0, 0, tmpreg, sp	; pop from stack
-	add	sp, sp, 4		; adjust stack pointer
-	mtsr	spcl, tmpreg		; set spcl reg
-	.endm
-
-	.macro	popsr, sreg, reg, sp
-		load	0, 0, reg, sp
-		add	sp, sp, 4
-		mtsr	sreg, reg
-	.endm
-
-;
-; save freeze mode registers on memory stack.
-;
-
-	.macro	SaveFZState,	tmp1, tmp2
-
-		; save freeze mode registers.
-
-		pushspcl pc0, tmp1, msp
-		pushspcl pc1, tmp1, msp
-		pushspcl alu, tmp1, msp
-
-		pushspcl cha, tmp1, msp
-		pushspcl chd, tmp1, msp
-		pushspcl chc, tmp1, msp
-
-		pushspcl ops, tmp1, msp
-
-		; turn freeze off
-
-		const	tmp2, FZ
-		mfsr	tmp1, cps
-		andn	tmp1, tmp1, tmp2
-		mtsr	cps, tmp1
-	.endm
-
-; restore freeze mode registers from memory stack.
-
-	.macro	RestoreFZState, tmp1, tmp2
-
-		; turn freeze on
-
-		const	tmp2, (FZ|DI|DA)
-		mfsr	tmp1, cps
-		or	tmp1, tmp1, tmp2
-		mtsr	cps, tmp1
-
-		; restore freeze mode registers.
-
-		popspcl	ops, tmp1, msp
-		popspcl	chc, tmp1, msp
-		popspcl	chd, tmp1, msp
-		popspcl	cha, tmp1, msp
-		popspcl	alu, tmp1, msp
-		popspcl	pc1, tmp1, msp
-		popspcl	pc0, tmp1, msp
-	.endm
-
-;
-;*
-;
-	.equ	WS,	512				; window size
-	.equ	RALLOC,	4 * 4				; stack alloc for C
-	.equ	SIGCTX_UM_SIZE,	40 * 4			; 
-	.equ	SIGCTX_RFB, (38) * 4			; user mode saved
-	.equ	SIGCTX_SM_SIZE, 12 * 4			;
-	.equ	SIGCTX_SIG, (11)*4 + SIGCTX_UM_SIZE	;
-	.equ	SIGCTX_GR1, (10)*4 + SIGCTX_UM_SIZE	;
-	.equ	SIGCTX_RAB, (9)*4 + SIGCTX_UM_SIZE	;
-	.equ	SIGCTX_PC0, (8)*4 + SIGCTX_UM_SIZE	;
-	.equ	SIGCTX_PC1, (7)*4 + SIGCTX_UM_SIZE	;
-	.equ	SIGCTX_PC2, (6)*4 + SIGCTX_UM_SIZE	;
-	.equ	SIGCTX_CHC, (3)*4 + SIGCTX_UM_SIZE	;
-	.equ	SIGCTX_OPS, (1)*4 + SIGCTX_UM_SIZE	;
-	.equ	SIGCTX_TAV, (0)*4 + SIGCTX_UM_SIZE	;
-
-	.macro	sup_sv
-		add	it2, trapreg, 0			; transfer signal #
-		sub	msp, msp, 4			;
-		store	0, 0, it2, msp			; save signal number
-		sub	msp, msp, 4			; push gr1
-
-		store	0, 0, gr1, msp			; 
-		sub	msp, msp, 4			; push rab
-		store	0, 0, rab, msp			; 
-		const	it0, WS				; Window size	
-
-		sub	rab, rfb, it0			; set rab = rfb-512
-		pushsr	msp, it0, PC0			; save program counter0
-		pushsr	msp, it0, PC1			; save program counter1
-		pushsr	msp, it0, PC2			; save program counter2
-
-		pushsr	msp, it0, CHA			; save channel address
-		pushsr	msp, it0, CHD			; save channel data
-		pushsr	msp, it0, CHC			; save channel control
-		pushsr	msp, it0, ALU			; save alu
-
-		pushsr	msp, it0, OPS			; save ops
-		sub	msp, msp, 4			; 
-		store	0, 0, tav, msp			; push tav
-		mtsrim	chc, 0				; no loadm/storem
-
-		mfsr	it0, ops			; get ops value
-		const	it1, (TD | DI)			; disable interrupts
-		consth	it1, (TD | DI)			; disable interrupts
-		or	it0, it0, it1			; set bits
-
-		mtsr	ops, it0			; set new ops
-		const	it0, _sigcode			; signal handler
-		consth	it0, _sigcode			; signal handler
-		mtsr	pc1, it0			; store pc1
-
-		add	it1, it0, 4			; next addr
-		mtsr	pc0, it1			; store pc1 location
-		iret					; return
-		nop					; ALIGN
-	.endm
-
-	.macro	sig_return
-		mfsr	it0, cps			; get processor status
-		const	it1, FZ|DA			; Freeze + traps disable
-		or	it0, it0, it1			; to set FZ+DA
-		mtsr	cps, it0			; in freeze mode
-
-		load	0, 0, tav, msp			; restore tav
-		add	msp, msp, 4			;
-		
-		popsr	OPS,it0, msp			;
-		popsr	ALU,it0, msp			;
-		popsr	CHC,it0, msp			;
-		popsr	CHD,it0, msp			;
-
-		popsr	CHA,it0, msp			;
-		popsr	PC2,it0, msp			;
-		popsr	PC1,it0, msp			;
-		popsr	PC0,it0, msp			;
-
-		load	0, 0, rab, msp			;
-		add	msp, msp, 4			;
-		load	0, 0, it0, msp			;
-		add	gr1, it0, 0			; pop rsp
-
-		add	msp, msp, 8			; discount signal #
-		iret
-	.endm
-
-	.macro	repair_R_stack
-		add	v0, msp, SIGCTX_GR1		; interrupted gr1
-		load 	0, 0, v2, v0			;
-		add	v0, msp, SIGCTX_RFB		;
-		load	0, 0, v3, v0			; interupted rfb
-
-		const	v1, WS				;	
-		sub	v1, v3, v1			; rfb-512
-		cpltu	v0, v2, v1			; test gr1 < rfb-512
-		jmpf	v0, $1				; 
-
-		add	gr1, rab, 0			;
-		add	v2, v1, 0			; set LB = rfb-512
-$1:
-;* if gr1 < rfb-512 yes LB = rfb-512 signalled during spill
-;* if no, LB=gr1 interrupted cache < 126 registers
-		cpleu	v0, v2, rfb			; test LB<=rfb
-		jmpf	v0, $2				;
-		nop					;
-		add	v2, rfb, 0			;
-$2:
-		cpeq	v0, v3, rfb			; fill rfb->'rfb
-		jmpt	v0, $3				; if rfb==rfb'
-		const	tav, (0x80<<2)			; prepare for fill
-		or	tav, tav, v2			; 
-
-		mtsr	IPA, tav			; IPA=LA<<2
-		sub	tav, v3, gr98			; cache fill LA->rfb
-		srl	tav, tav, 2			; convert to words
-		sub	tav, tav, 1			; 
-
-		mtsr	cr, tav				;
-		loadm	0, 0, gr0, v2			; fill from LA->rfb
-$3:
-		add	rfb, v3, 0			; move rfb upto 'rfb
-		sub	rab, v1, 0			; assign rab to rfb-512
-
-		add	v0, msp, SIGCTX_GR1		;
-		load	0, 0, v2, v0			; v0 = interrupted gr1
-		add	gr1, v2, 0			; move gr1 upto 'gr1
-		nop					;
-	.endm	
-		
-	.macro	repair_regs
-		mtsrim	cr, 29 - 1			; to restore locals
-		loadm	0, 0, v0, msp			;
-		add	msp, msp, 29*4			; 
-		popsr	Q, tav, msp			; 
-
-		popsr	IPC, tav, msp			; 
-		popsr	IPB, tav, msp			; 
-		popsr	IPA, tav, msp			; 
-		pop	FPStat3, msp			; floating point regs
-
-		pop	FPStat2, msp			; floating point regs
-		pop	FPStat1, msp			; floating point regs
-		pop	FPStat0, msp			; floating point regs
-
-		add	msp, msp, 3*4			; R-stack repaired
-	.endm
-
-;
-;*HIF related...
-;
-
-
-
-
-; send the message in bufaddr to Montip.
-	.macro	SendMessageToMontip,	bufaddr
-	const	lr2, bufaddr
-$1:
-	call	lr0, _msg_send
-	consth	lr2, bufaddr
-	cpeq	gr96, gr96, 0
-	jmpf	gr96, $1
-	const	lr2, bufaddr
-	.endm
-
-; build a HIF_CALL message in bufaddr to send to montip.
-	.macro	BuildHIFCALLMsg,	bufaddr, tmp1, tmp2
-	const	tmp1, bufaddr
-	consth	tmp1, bufaddr
-	const	tmp2, HIF_CALL_MSGCODE
-	store	0, 0, tmp2, tmp1	; msg code
-	add	tmp1, tmp1, 4
-	const	tmp2, HIF_CALL_MSGLEN	
-	store	0, 0, tmp2, tmp1	; msg len
-	add	tmp1, tmp1, 4
-	store	0, 0, gr121, tmp1	; service number
-	add	tmp1, tmp1, 4
-	store	0, 0, lr2, tmp1		; lr2
-	add	tmp1, tmp1, 4
-	store	0, 0, lr3, tmp1		; lr3
-	add	tmp1, tmp1, 4
-	store	0, 0, lr4, tmp1		; lr4
-	.endm
-
-;
-;* 
-;* All the funky AMD style macros go in here...simply for 
-;* compatility
-;
-;
-  .macro        IMPORT, symbol
-        .extern symbol
-  .endm
-
-  .macro        GLOBAL, symbol
-        .global symbol
-  .endm
-
-  .macro        USESECT, name, type
-        .sect   name, type
-        .use    name
-  .endm
-
-  .macro        SECTION, name, type
-        .sect   name, type
-  .endm
-
- .macro FUNC, fname, lineno
-        .global fname
-fname:
- .endm
-
- .macro ENDFUNC, fname, lineno
- .endm
-
-;*************************************LONG
- .macro LONG, varname
-varname:
-        .block  4
- .endm
-
-;*************************************UNSIGNED LONG
- .macro ULONG, varname
-varname:
-        .block  4
- .endm
-
-;*************************************SHORT
- .macro SHORT, varname
-varname:
-        .block  2
- .endm
-
-;*************************************CHAR
- .macro CHAR, varname
-varname:
-        .block  1
- .endm 
-
-;*************************************LONGARRAY
- .macro LONGARRAY, name, count
-name:
-        .block  count*4
- .endm
-
-;*************************************SHORTARRAY
-
- .macro SHORTARRAY, name, count
-name:
-        .block  count*2
- .endm
-
-;*************************************CHARARRAY
-
- .macro CHARARRAY, name, count
-name:
-        .block  count
- .endm
-
-
-;*************************************VOID_FPTR
-
- .macro VOID_FPTR, name
-name:
-        .block  4
- .endm
diff --git a/cpukit/score/cpu/a29k/register.ah b/cpukit/score/cpu/a29k/register.ah
deleted file mode 100644
index 35142b508f..0000000000
--- a/cpukit/score/cpu/a29k/register.ah
+++ /dev/null
@@ -1,214 +0,0 @@
-; /* @(#)register.ah	1.1 96/05/23 08:56:57, TEI */
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;		 naming of various registers    
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; /* $Id$ */
-
-;* File information and includes.
-
-	.file	"register.ah"
-	.ident	"@(#)register.ah	1.1 96/05/23 08:56:57, TEI\n"
-
-;* Register Stack pointer and frame pointer registers.
-
-	.extern	Rrsp, Rfp
-
-	.reg	regsp, 		%%Rrsp
-	.reg	fp, 		%%Rfp
-
-
-	.extern RTrapReg
-	.extern Rtrapreg
-
-	.reg	TrapReg, 	%%RTrapReg
-	.reg	trapreg, 	%%Rtrapreg
-
-
-;* Operating system Interrupt handler registers (gr64-gr67)
-
-	.extern	ROSint0, ROSint1, ROSint2, ROSint3
-
-	.reg	OSint0, 	%%ROSint0
-	.reg	OSint1, 	%%ROSint1
-	.reg	OSint2, 	%%ROSint2
-	.reg	OSint3, 	%%ROSint3
-
-	.reg	it0, 		%%ROSint0
-	.reg	it1, 		%%ROSint1
-	.reg	it2, 		%%ROSint2
-	.reg	it3, 		%%ROSint3
-
-
-
-;* Operating system temporary (or scratch) registers (gr68-gr79)
-
-	.extern	ROStmp0, ROStmp1, ROStmp2, ROStmp3
-	.extern	ROStmp4, ROStmp5, ROStmp6, ROStmp7
-	.extern	ROStmp8, ROStmp9, ROStmp10, ROStmp11
-
-	.reg	OStmp0, 	%%ROStmp0
-	.reg	OStmp1, 	%%ROStmp1
-	.reg	OStmp2, 	%%ROStmp2
-	.reg	OStmp3, 	%%ROStmp3
-
-	.reg	OStmp4, 	%%ROStmp4
-	.reg	OStmp5, 	%%ROStmp5
-	.reg	OStmp6, 	%%ROStmp6
-	.reg	OStmp7, 	%%ROStmp7
-
-	.reg	OStmp8, 	%%ROStmp8
-	.reg	OStmp9, 	%%ROStmp9
-	.reg	OStmp10, 	%%ROStmp10
-	.reg	OStmp11, 	%%ROStmp11
-
-
-	.reg	kt0, 		%%ROStmp0
-	.reg	kt1, 		%%ROStmp1
-	.reg	kt2, 		%%ROStmp2
-	.reg	kt3, 		%%ROStmp3
-
-	.reg	kt4, 		%%ROStmp4
-	.reg	kt5, 		%%ROStmp5
-	.reg	kt6, 		%%ROStmp6
-	.reg	kt7, 		%%ROStmp7
-
-	.reg	kt8, 		%%ROStmp8
-	.reg	kt9, 		%%ROStmp9
-	.reg	kt10, 		%%ROStmp10
-	.reg	kt11, 		%%ROStmp11
-
-
-	.reg	TempReg0,	%%ROSint0
-	.reg	TempReg1, 	%%ROSint1
-	.reg	TempReg2, 	%%ROSint2
-	.reg	TempReg3, 	%%ROSint3
-
-	.reg	TempReg4, 	%%ROStmp0
-	.reg	TempReg5, 	%%ROStmp1
-	.reg	TempReg6, 	%%ROStmp2
-	.reg	TempReg7, 	%%ROStmp3
-
-	.reg	TempReg8, 	%%ROStmp4
-	.reg	TempReg9, 	%%ROStmp5
-	.reg	TempReg10, 	%%ROStmp6
-	.reg	TempReg11, 	%%ROStmp7
-
-	.reg	TempReg12, 	%%ROStmp8
-	.reg	TempReg13, 	%%ROStmp9
-	.reg	TempReg14, 	%%ROStmp10
-	.reg	TempReg15, 	%%ROStmp11
-
-
-;* Assigned static registers
-
-	.extern	RSpillAddrReg, RFillAddrReg, RSignalAddrReg
-	.extern	Rpcb, Retc
-	.extern	RTimerExt, RTimerUtil, RLEDReg, RERRReg
-	.extern	Ret0, Ret1, Ret2, Ret3, Ret4, Ret5, Ret6, Ret7, Reta, Retb
-	.extern	Retx, Rety, Retz
-
-
-	.reg	SpillAddrReg, 	%%RSpillAddrReg
-	.reg	FillAddrReg, 	%%RFillAddrReg
-	.reg	SignalAddrReg, 	%%RSignalAddrReg
-	.reg	pcb,		%%Rpcb
-
-	.reg	etx,		%%Retx
-	.reg	ety,		%%Rety
-	.reg	etz,		%%Retz
-	.reg	eta,		%%Reta
-
-	.reg	etb,		%%Retb
-	.reg	etc,		%%Retc
-	.reg	TimerExt, 	%%RTimerExt
-	.reg	TimerUtil, 	%%RTimerUtil
-
-	.reg	LEDReg, 	%%RLEDReg
-	.reg	ERRReg, 	%%RERRReg
-
-
-	.reg	et0,		%%Ret0
-	.reg	et1,		%%Ret1
-	.reg	et2,		%%Ret2
-	.reg	et3,		%%Ret3
-
-	.reg	et4,		%%Ret4
-	.reg	et5,		%%Ret5
-	.reg	et6,		%%Ret6
-	.reg	et7,		%%Ret7
-
-;
-	.equ	SCB1REG_NUM,	88	
-	.reg	SCB1REG_PTR,	%%Ret0
-
-; The floating point trap handlers need a few static registers
-
-        .extern RFPStat0, RFPStat1, RFPStat2, RFPStat3
-        .extern Rheapptr, RHeapPtr, RArgvPtr
-
-        .reg    FPStat0, 	%%RFPStat0
-        .reg    FPStat1, 	%%RFPStat1
-        .reg    FPStat2, 	%%RFPStat2
-        .reg    FPStat3, 	%%RFPStat3
-
-        .reg    heapptr, 	%%Rheapptr
-        .reg    HeapPtr, 	%%RHeapPtr
-        .reg    ArgvPtr, 	%%RArgvPtr
-
-        .extern RXLINXReg, RVMBCReg, RUARTReg, RETHERReg
-
-        .reg    XLINXReg,	%%RXLINXReg
-        .reg    VMBCReg,	%%RVMBCReg
-        .reg    UARTReg,	%%RUARTReg
-        .reg    ETHERReg,	%%RXLINXReg
-
-;* Compiler and programmer registers. (gr96-gr127)
-
-	.extern Rv0, Rv1, Rv2, Rv3, Rv4, Rv5, Rv6, Rv7, Rv8, Rv9
-	.extern Rv10, Rv11, Rv12, Rv13, Rv14, Rv15
-
-	.reg	v0, 		%%Rv0
-	.reg	v1, 		%%Rv1
-	.reg	v2, 		%%Rv2
-	.reg	v3, 		%%Rv3
-
-	.reg	v4, 		%%Rv4
-	.reg	v5, 		%%Rv5
-	.reg	v6, 		%%Rv6
-	.reg	v7, 		%%Rv7
-
-	.reg	v8, 		%%Rv8
-	.reg	v9, 		%%Rv9
-	.reg	v10, 		%%Rv10
-	.reg	v11, 		%%Rv11
-
-	.reg	v12, 		%%Rv12
-	.reg	v13, 		%%Rv13
-	.reg	v14, 		%%Rv14
-	.reg	v15, 		%%Rv15
-
-	.extern Rtv0, Rtv1, Rtv2, Rtv3, Rtv4
-
-	.reg	tv0, 		%%Rtv0
-	.reg	tv1, 		%%Rtv1
-	.reg	tv2, 		%%Rtv2
-	.reg	tv3, 		%%Rtv3
-	.reg	tv4, 		%%Rtv4
-
-; ****************************************************************************
-;	For uatrap
-; register definitions -- since this trap handler must allow for
-; nested traps and interrupts such as TLB miss, protection violation,
-; or Data Access Exception, and these trap handlers use the shared
-; Temp registers, we must maintain our own that are safe over user-
-; mode loads and stores.  The following must be assigned global
-; registers which are not used in INTR[0-3], TRAP[0-1], TLB miss,
-; TLB protection violation, or data exception trap handlers.
-
-;	.reg	cha_cpy, 	OStmp4		; copy of CHA
-;	.reg	chd_cpy, 	OStmp5		; copy of CHD
-;	.reg	chc_cpy, 	OStmp6		; copy of CHC
-;	.reg	LTemp0, 	OStmp7		; local temp 0
-;	.reg	LTemp1, 	OStmp8		; local temp 1
-
-; ****************************************************************************
diff --git a/cpukit/score/cpu/hppa1.1/cpu.c b/cpukit/score/cpu/hppa1.1/cpu.c
deleted file mode 100644
index 282e0e53b6..0000000000
--- a/cpukit/score/cpu/hppa1.1/cpu.c
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- *  HP PA-RISC Dependent Source
- *
- *  COPYRIGHT (c) 1994 by Division Incorporated
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems/system.h>
-#include <rtems/score/isr.h>
-void hppa_cpu_halt(unsigned32 the_error);
-
-
-/*PAGE
- *
- *  _CPU_ISR_install_raw_handler
- */
- 
-void _CPU_ISR_install_raw_handler(
-  unsigned32  vector,
-  proc_ptr    new_handler,
-  proc_ptr   *old_handler
-)
-{
-  /*
-   *  This is unsupported.  For HPPA this function is handled by BSP
-   */
-
-  _CPU_Fatal_halt( 0xdeaddead );
-}
-
-
-
-/*
- * This is the default handler which is called if
- * _CPU_ISR_install_vector() has not been called for the
- * specified vector.  It simply forwards onto the spurious
- * handler defined in the cpu-table.
- */
-
-static ISR_Handler
-hppa_interrupt_report_spurious(ISR_Vector_number vector,
-                               void* rtems_isr_frame) /* HPPA extension */
-{
-
-    /*
-     * If the CPU table defines a spurious_handler, then
-     * call it.  If the handler returns halt.
-     */
-    if ( _CPU_Table.spurious_handler )
-        _CPU_Table.spurious_handler(vector, rtems_isr_frame);
-    
-    hppa_cpu_halt(vector);
-}
-
-
-/*PAGE
- *
- *  _CPU_ISR_Get_level
- */
- 
-unsigned32 _CPU_ISR_Get_level(void)
-{
-    int level;
-    HPPA_ASM_SSM(0, level);	/* change no bits; just get copy */
-    if (level & HPPA_PSW_I)
-        return 0;
-    return 1;
-}
-
-/*PAGE
- *
- *  _CPU_ISR_install_vector
- *
- *  This kernel routine installs the RTEMS handler for the
- *  specified vector.  The handler is a C callable routine.
- *
- *  Input parameters:
- *    vector      - interrupt vector number
- *    old_handler - former ISR for this vector number
- *    new_handler - replacement ISR for this vector number
- *
- *  Output parameters:  NONE
- *
- */
-
-void _CPU_ISR_install_vector(
-  unsigned32  vector,
-  proc_ptr    new_handler,
-  proc_ptr   *old_handler
-)
-{
-    *old_handler = _ISR_Vector_table[vector];
-
-    _ISR_Vector_table[vector] = new_handler;
-}
-
-/*  _CPU_Initialize
- *
- *  This routine performs processor dependent initialization.
- *
- *  INPUT PARAMETERS:
- *    cpu_table       - CPU table to initialize
- *    thread_dispatch - address of disptaching routine
- *
- */
-
-void _CPU_Initialize(
-  rtems_cpu_table  *cpu_table,
-  void      (*thread_dispatch)      /* ignored on this CPU */
-)
-{
-    register unsigned8  *fp_context;
-    unsigned32 i;
-    proc_ptr   old_handler;
-
-    /*
-     * This is the default fp context for all tasks
-     * Set it up so that denormalized results go to zero.
-     */
-
-    fp_context = (unsigned8*) &_CPU_Null_fp_context;
-    for (i=0 ; i<sizeof(Context_Control_fp); i++)
-        *fp_context++ = 0;
-    *((unsigned32 *) &_CPU_Null_fp_context) = HPPA_FPSTATUS_D;
-
-    /*
-     *  Save r27 into _CPU_Default_gr27 so it will hopefully be the correct
-     *  global data pointer for the entire system.
-     */
-
-    asm volatile( "stw   %%r27,%0" : "=m" (_CPU_Default_gr27): );
-
-    /*
-     * Init the 2nd level interrupt handlers
-     */
-
-    for (i=0; i < CPU_INTERRUPT_NUMBER_OF_VECTORS; i++)
-        _CPU_ISR_install_vector(i,
-                                hppa_interrupt_report_spurious,
-                                &old_handler);
-
-    _CPU_Table = *cpu_table;
-    
-}
-
-
-/*
- * Halt the system.
- * Called by the _CPU_Fatal_halt macro
- *
- * XXX
- * Later on, this will allow us to return to the prom.
- * For now, we just ignore 'type_of_halt'
- *
- * XXX
- * NOTE: for gcc, this function must be at the bottom
- * of the file, that is because if it is at the top
- * of the file, gcc will inline it's calls.  Since
- * the function uses the HPPA_ASM_LABEL() macro, when
- * gcc inlines it, you get two definitions of the same
- * label name, which is an assembly error.
- */
-
-
-void
-hppa_cpu_halt(unsigned32 the_error)
-{
-    unsigned32 isrlevel;
-
-    _CPU_ISR_Disable(isrlevel);
-
-    /*
-     * XXXXX NOTE: This label is only needed that that when
-     * the simulator stops, it shows the label name specified
-     */
-    HPPA_ASM_LABEL("_hppa_cpu_halt");
-    HPPA_ASM_BREAK(0, 0);
-}
-
diff --git a/cpukit/score/cpu/i386/asm.h b/cpukit/score/cpu/i386/asm.h
deleted file mode 100644
index 9fe867c04c..0000000000
--- a/cpukit/score/cpu/i386/asm.h
+++ /dev/null
@@ -1,151 +0,0 @@
-/*  asm.h
- *
- *  This include file attempts to address the problems
- *  caused by incompatible flavors of assemblers and
- *  toolsets.  It primarily addresses variations in the
- *  use of leading underscores on symbols and the requirement
- *  that register names be preceded by a %.
- *
- *
- *  NOTE: The spacing in the use of these macros
- *        is critical to them working as advertised.
- *
- *  COPYRIGHT:
- *
- *  This file is based on similar code found in newlib available
- *  from ftp.cygnus.com.  The file which was used had no copyright
- *  notice.  This file is freely distributable as long as the source
- *  of the file is noted.  This file is:
- *
- *  COPYRIGHT (c) 1994-1997.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  $Id$
- */
-
-#ifndef __i386_ASM_h
-#define __i386_ASM_h
-
-/*
- *  Indicate we are in an assembly file and get the basic CPU definitions.
- */
-
-#ifndef ASM
-#define ASM
-#endif
-#include <rtems/score/targopts.h>
-#include <rtems/score/i386.h>
-
-/*
- *  Recent versions of GNU cpp define variables which indicate the
- *  need for underscores and percents.  If not using GNU cpp or
- *  the version does not support this, then you will obviously
- *  have to define these as appropriate.
- */
-
-/*
- *  Go32 suffers the same bug as __REGISTER_PREFIX__ 
- */
- 
-#if __GO32__
-#undef  __USER_LABEL_PREFIX__
-#define __USER_LABEL_PREFIX__ _
-#endif
-
-#ifndef __USER_LABEL_PREFIX__
-#define __USER_LABEL_PREFIX__ _
-#endif
-
-/*
- *  Looks like there is a bug in gcc 2.6.2 where this is not
- *  defined correctly when configured as i386-coff and
- *  i386-aout.
- */
-
-#undef __REGISTER_PREFIX__
-#define __REGISTER_PREFIX__ %
-
-/*
-#ifndef __REGISTER_PREFIX__
-#define __REGISTER_PREFIX__
-#endif
-*/
-
-/* ANSI concatenation macros.  */
-
-#define CONCAT1(a, b) CONCAT2(a, b)
-#define CONCAT2(a, b) a ## b
-
-/* Use the right prefix for global labels.  */
-
-#define SYM(x) CONCAT1 (__USER_LABEL_PREFIX__, x)
-
-/* Use the right prefix for registers.  */
-
-#define REG(x) CONCAT1 (__REGISTER_PREFIX__, x)
-
-#define eax REG (eax)
-#define ebx REG (ebx)
-#define ecx REG (ecx)
-#define edx REG (edx)
-#define esi REG (esi)
-#define edi REG (edi)
-#define esp REG (esp)
-#define ebp REG (ebp)
-#define cr0 REG (cr0)
-
-#define ax REG (ax)
-#define bx REG (bx)
-#define cx REG (cx)
-#define dx REG (dx)
-#define si REG (si)
-#define di REG (di)
-#define sp REG (sp)
-#define bp REG (bp)
-
-#define ah REG (ah)
-#define bh REG (bh)
-#define ch REG (ch)
-#define dh REG (dh)
-
-#define al REG (al)
-#define bl REG (bl)
-#define cl REG (cl)
-#define dl REG (dl)
-
-#define cs REG (cs)
-#define ds REG (ds)
-#define es REG (es)
-#define fs REG (fs)
-#define gs REG (gs)
-#define ss REG (ss)
-
-/*
- *  Define macros to handle section beginning and ends.
- */
-
-
-#define BEGIN_CODE_DCL .text
-#define END_CODE_DCL
-#define BEGIN_DATA_DCL .data
-#define END_DATA_DCL
-#define BEGIN_CODE .text
-#define END_CODE
-#define BEGIN_DATA .data
-#define END_DATA
-#define BEGIN_BSS .bss
-#define END_BSS
-#define END
-
-/*
- *  Following must be tailor for a particular flavor of the C compiler.
- *  They may need to put underscores in front of the symbols.
- */
-
-#define PUBLIC(sym) .globl SYM (sym)
-#define EXTERN(sym) .globl SYM (sym)
-
-#endif
-/* end of include file */
-
-
diff --git a/cpukit/score/cpu/i386/cpu.c b/cpukit/score/cpu/i386/cpu.c
deleted file mode 100644
index 90473bdb14..0000000000
--- a/cpukit/score/cpu/i386/cpu.c
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
- *  Intel i386 Dependent Source
- *
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems/system.h>
-#include <rtems/score/isr.h>
-#include <bspIo.h>
-#include <rtems/score/thread.h>
-
-
-/*  _CPU_Initialize
- *
- *  This routine performs processor dependent initialization.
- *
- *  INPUT PARAMETERS:
- *    cpu_table       - CPU table to initialize
- *    thread_dispatch - address of disptaching routine
- */
-
-
-void _CPU_Initialize(
-  rtems_cpu_table  *cpu_table,
-  void      (*thread_dispatch)      /* ignored on this CPU */
-)
-{
-  register unsigned16  fp_status asm ("ax");
-  register void       *fp_context;
-
-  _CPU_Table = *cpu_table;
-
-  /*
-   *  The following code saves a NULL i387 context which is given
-   *  to each task at start and restart time.  The following code
-   *  is based upon that provided in the i386 Programmer's
-   *  Manual and should work on any coprocessor greater than
-   *  the i80287.
-   *
-   *  NOTE: The NO RTEMS_WAIT form of the coprocessor instructions
-   *        MUST be used in case there is not a coprocessor
-   *        to wait for.
-   */
-
-  fp_status = 0xa5a5;
-  asm volatile( "fninit" );
-  asm volatile( "fnstsw %0" : "=a" (fp_status) : "0" (fp_status) );
-
-  if ( fp_status ==  0 ) {
-
-    fp_context = &_CPU_Null_fp_context;
-
-    asm volatile( "fsave (%0)" : "=r" (fp_context)
-                               : "0"  (fp_context)
-                );
-  }
-}
-
-/*PAGE
- *
- *  _CPU_ISR_Get_level
- */
- 
-unsigned32 _CPU_ISR_Get_level( void )
-{
-  unsigned32 level;
- 
-  i386_get_interrupt_level( level );
- 
-  return level;
-}
-
-void _CPU_Thread_Idle_body ()
-{
-  while(1){
-    asm volatile ("hlt");
-  }
-}
-
-void _defaultExcHandler (CPU_Exception_frame *ctx)
-{
-  printk("----------------------------------------------------------\n");
-  printk("Exception %d caught at PC %x by thread %d\n",
-	 ctx->idtIndex,
-	 ctx->eip,
-	 _Thread_Executing->Object.id);
-  printk("----------------------------------------------------------\n");
-  printk("Processor execution context at time of the fault was  :\n");
-  printk("----------------------------------------------------------\n");
-  printk(" EAX = %x	EBX = %x	ECX = %x	EDX = %x\n",
-	 ctx->eax, ctx->ebx, ctx->ecx, ctx->edx);
-  printk(" ESI = %x	EDI = %x	EBP = %x	ESP = %x\n",
-	 ctx->esi, ctx->edi, ctx->ebp, ctx->esp0);
-  printk("----------------------------------------------------------\n");
-  printk("Error code pushed by processor itself (if not 0) = %x\n",
-	 ctx->faultCode);
-  printk("----------------------------------------------------------\n\n");
-  if (_ISR_Nest_level > 0) {
-    /*
-     * In this case we shall not delete the task interrupted as
-     * it has nothing to do with the fault. We cannot return either
-     * because the eip points to the faulty instruction so...
-     */
-    printk("Exception while executing ISR!!!. System locked\n");
-    while(1);
-  }
-  else {
-    /*
-     * OK I could probably use a simplified version but at least this
-     * should work.
-     */
-    printk(" ************ FAULTY THREAD WILL BE DELETED **************\n");
-    rtems_task_delete(_Thread_Executing->Object.id);
-  }
-}
-
-cpuExcHandlerType _currentExcHandler = _defaultExcHandler;
-
-extern void rtems_exception_prologue_0();
-extern void rtems_exception_prologue_1();
-extern void rtems_exception_prologue_2();
-extern void rtems_exception_prologue_3();
-extern void rtems_exception_prologue_4();
-extern void rtems_exception_prologue_5();
-extern void rtems_exception_prologue_6();
-extern void rtems_exception_prologue_7();
-extern void rtems_exception_prologue_8();
-extern void rtems_exception_prologue_9();
-extern void rtems_exception_prologue_10();
-extern void rtems_exception_prologue_11();
-extern void rtems_exception_prologue_12();
-extern void rtems_exception_prologue_13();
-extern void rtems_exception_prologue_14();
-extern void rtems_exception_prologue_16();
-extern void rtems_exception_prologue_17();
-extern void rtems_exception_prologue_18();
-
-static rtems_raw_irq_hdl tbl[] = {
-	 rtems_exception_prologue_0,
-	 rtems_exception_prologue_1,
-	 rtems_exception_prologue_2,
-	 rtems_exception_prologue_3,
-	 rtems_exception_prologue_4,
-	 rtems_exception_prologue_5,
-	 rtems_exception_prologue_6,
-	 rtems_exception_prologue_7,
-	 rtems_exception_prologue_8,
-	 rtems_exception_prologue_9,
-	 rtems_exception_prologue_10,
-	 rtems_exception_prologue_11,
-	 rtems_exception_prologue_12,
-	 rtems_exception_prologue_13,
-	 rtems_exception_prologue_14,
-	 rtems_exception_prologue_16,
-	 rtems_exception_prologue_17,
-	 rtems_exception_prologue_18,
-};
-
-void rtems_exception_init_mngt()
-{
-      unsigned int		 i,j;
-      interrupt_gate_descriptor	 *currentIdtEntry;
-      unsigned			 limit;
-      unsigned			 level;
-      
-      i = sizeof(tbl) / sizeof (rtems_raw_irq_hdl);
-
-      i386_get_info_from_IDTR (&currentIdtEntry, &limit);
-
-      _CPU_ISR_Disable(level);
-      for (j = 0; j < i; j++) {
-	create_interrupt_gate_descriptor (&currentIdtEntry[j], tbl[j]);
-      }
-      _CPU_ISR_Enable(level);
-}
-      
diff --git a/cpukit/score/cpu/i386/rtems/asm.h b/cpukit/score/cpu/i386/rtems/asm.h
deleted file mode 100644
index 9fe867c04c..0000000000
--- a/cpukit/score/cpu/i386/rtems/asm.h
+++ /dev/null
@@ -1,151 +0,0 @@
-/*  asm.h
- *
- *  This include file attempts to address the problems
- *  caused by incompatible flavors of assemblers and
- *  toolsets.  It primarily addresses variations in the
- *  use of leading underscores on symbols and the requirement
- *  that register names be preceded by a %.
- *
- *
- *  NOTE: The spacing in the use of these macros
- *        is critical to them working as advertised.
- *
- *  COPYRIGHT:
- *
- *  This file is based on similar code found in newlib available
- *  from ftp.cygnus.com.  The file which was used had no copyright
- *  notice.  This file is freely distributable as long as the source
- *  of the file is noted.  This file is:
- *
- *  COPYRIGHT (c) 1994-1997.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  $Id$
- */
-
-#ifndef __i386_ASM_h
-#define __i386_ASM_h
-
-/*
- *  Indicate we are in an assembly file and get the basic CPU definitions.
- */
-
-#ifndef ASM
-#define ASM
-#endif
-#include <rtems/score/targopts.h>
-#include <rtems/score/i386.h>
-
-/*
- *  Recent versions of GNU cpp define variables which indicate the
- *  need for underscores and percents.  If not using GNU cpp or
- *  the version does not support this, then you will obviously
- *  have to define these as appropriate.
- */
-
-/*
- *  Go32 suffers the same bug as __REGISTER_PREFIX__ 
- */
- 
-#if __GO32__
-#undef  __USER_LABEL_PREFIX__
-#define __USER_LABEL_PREFIX__ _
-#endif
-
-#ifndef __USER_LABEL_PREFIX__
-#define __USER_LABEL_PREFIX__ _
-#endif
-
-/*
- *  Looks like there is a bug in gcc 2.6.2 where this is not
- *  defined correctly when configured as i386-coff and
- *  i386-aout.
- */
-
-#undef __REGISTER_PREFIX__
-#define __REGISTER_PREFIX__ %
-
-/*
-#ifndef __REGISTER_PREFIX__
-#define __REGISTER_PREFIX__
-#endif
-*/
-
-/* ANSI concatenation macros.  */
-
-#define CONCAT1(a, b) CONCAT2(a, b)
-#define CONCAT2(a, b) a ## b
-
-/* Use the right prefix for global labels.  */
-
-#define SYM(x) CONCAT1 (__USER_LABEL_PREFIX__, x)
-
-/* Use the right prefix for registers.  */
-
-#define REG(x) CONCAT1 (__REGISTER_PREFIX__, x)
-
-#define eax REG (eax)
-#define ebx REG (ebx)
-#define ecx REG (ecx)
-#define edx REG (edx)
-#define esi REG (esi)
-#define edi REG (edi)
-#define esp REG (esp)
-#define ebp REG (ebp)
-#define cr0 REG (cr0)
-
-#define ax REG (ax)
-#define bx REG (bx)
-#define cx REG (cx)
-#define dx REG (dx)
-#define si REG (si)
-#define di REG (di)
-#define sp REG (sp)
-#define bp REG (bp)
-
-#define ah REG (ah)
-#define bh REG (bh)
-#define ch REG (ch)
-#define dh REG (dh)
-
-#define al REG (al)
-#define bl REG (bl)
-#define cl REG (cl)
-#define dl REG (dl)
-
-#define cs REG (cs)
-#define ds REG (ds)
-#define es REG (es)
-#define fs REG (fs)
-#define gs REG (gs)
-#define ss REG (ss)
-
-/*
- *  Define macros to handle section beginning and ends.
- */
-
-
-#define BEGIN_CODE_DCL .text
-#define END_CODE_DCL
-#define BEGIN_DATA_DCL .data
-#define END_DATA_DCL
-#define BEGIN_CODE .text
-#define END_CODE
-#define BEGIN_DATA .data
-#define END_DATA
-#define BEGIN_BSS .bss
-#define END_BSS
-#define END
-
-/*
- *  Following must be tailor for a particular flavor of the C compiler.
- *  They may need to put underscores in front of the symbols.
- */
-
-#define PUBLIC(sym) .globl SYM (sym)
-#define EXTERN(sym) .globl SYM (sym)
-
-#endif
-/* end of include file */
-
-
diff --git a/cpukit/score/cpu/i960/asm.h b/cpukit/score/cpu/i960/asm.h
deleted file mode 100644
index a9a0788925..0000000000
--- a/cpukit/score/cpu/i960/asm.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/*  asm.h
- *
- *  This include file attempts to address the problems
- *  caused by incompatible flavors of assemblers and
- *  toolsets.  It primarily addresses variations in the
- *  use of leading underscores on symbols and the requirement
- *  that register names be preceded by a %.
- *
- *
- *  NOTE: The spacing in the use of these macros
- *        is critical to them working as advertised.
- *
- *  COPYRIGHT:
- *
- *  This file is based on similar code found in newlib available
- *  from ftp.cygnus.com.  The file which was used had no copyright
- *  notice.  This file is freely distributable as long as the source
- *  of the file is noted.  This file is:
- *
- *  COPYRIGHT (c) 1994-1997.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  $Id$
- */
-
-#ifndef __i960_ASM_h
-#define __i960_ASM_h
-
-/*
- *  Indicate we are in an assembly file and get the basic CPU definitions.
- */
-
-#ifndef ASM
-#define ASM
-#endif
-#include <rtems/score/targopts.h>
-#include <rtems/score/i960.h>
-
-/*
- *  Recent versions of GNU cpp define variables which indicate the
- *  need for underscores and percents.  If not using GNU cpp or
- *  the version does not support this, then you will obviously
- *  have to define these as appropriate.
- */
-
-#ifndef __USER_LABEL_PREFIX__
-#define __USER_LABEL_PREFIX__ _
-#endif
-
-#ifndef __REGISTER_PREFIX__
-#define __REGISTER_PREFIX__
-#endif
-
-/* ANSI concatenation macros.  */
-
-#define CONCAT1(a, b) CONCAT2(a, b)
-#define CONCAT2(a, b) a ## b
-
-/* Use the right prefix for global labels.  */
-
-#define SYM(x) CONCAT1 (__USER_LABEL_PREFIX__, x)
-
-/* Use the right prefix for registers.  */
-
-#define REG(x) CONCAT1 (__REGISTER_PREFIX__, x)
-
-#define g0  REG (g0)
-#define g1  REG (g1)
-#define g2  REG (g2)
-#define g3  REG (g3)
-#define g4  REG (g4)
-#define g5  REG (g5)
-#define g6  REG (g6)
-#define g7  REG (g7)
-#define g8  REG (g8)
-#define g9  REG (g9)
-#define g10 REG (g10)
-#define g11 REG (g11)
-#define g12 REG (g12)
-#define g13 REG (g13)
-#define g14 REG (g14)
-#define g15 REG (g15)
-
-/*
- *  Define macros to handle section beginning and ends.
- */
-
-
-#define BEGIN_CODE_DCL .text
-#define END_CODE_DCL
-#define BEGIN_DATA_DCL .data
-#define END_DATA_DCL
-#define BEGIN_CODE .text
-#define END_CODE
-#define BEGIN_DATA
-#define END_DATA
-#define BEGIN_BSS
-#define END_BSS
-#define END
-
-/*
- *  Following must be tailor for a particular flavor of the C compiler.
- *  They may need to put underscores in front of the symbols.
- */
-
-#define PUBLIC(sym) .globl SYM (sym)
-#define EXTERN(sym) .globl SYM (sym)
-
-#endif
-/* end of include file */
diff --git a/cpukit/score/cpu/i960/cpu.c b/cpukit/score/cpu/i960/cpu.c
deleted file mode 100644
index 7dbbb5828f..0000000000
--- a/cpukit/score/cpu/i960/cpu.c
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- *  Intel i960CA Dependent Source
- *
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#if defined(__i960CA__) || defined(__i960_CA__) || defined(__i960CA)
-#else
-#warning "***    ENTIRE FILE IMPLEMENTED & TESTED FOR CA ONLY     ***"
-#warning "*** THIS FILE WILL NOT COMPILE ON ANOTHER FAMILY MEMBER ***"
-#endif
-
-#include <rtems/system.h>
-#include <rtems/score/isr.h>
-
-/*  _CPU_Initialize
- *
- *  This routine performs processor dependent initialization.
- *
- *  INPUT PARAMETERS:
- *    cpu_table       - CPU table to initialize
- *    thread_dispatch - address of disptaching routine
- *
- *  OUTPUT PARAMETERS: NONE
- */
-
-void _CPU_Initialize(
-  rtems_cpu_table  *cpu_table,
-  void      (*thread_dispatch)      /* ignored on this CPU */
-)
-{
-
-  _CPU_Table = *cpu_table;
-
-}
-
-/*PAGE
- *
- *  _CPU_ISR_Get_level
- */
- 
-unsigned32 _CPU_ISR_Get_level( void )
-{
-  unsigned32 level;
- 
-  i960_get_interrupt_level( level );
- 
-  return level;
-}
-
-/*PAGE
- *
- *  _CPU_ISR_install_raw_handler
- */
- 
-#define _Is_vector_caching_enabled( _prcb ) \
-   ((_prcb)->control_tbl->icon & 0x2000)
-
-void _CPU_ISR_install_raw_handler(
-  unsigned32  vector,
-  proc_ptr    new_handler,
-  proc_ptr   *old_handler
-)
-{
-  i960ca_PRCB *prcb = _CPU_Table.Prcb;
-  proc_ptr    *cached_intr_tbl = NULL;
-
-  /*  The i80960CA does not support vectors 0-7.  The first 9 entries
-   *  in the Interrupt Table are used to manage pending interrupts.
-   *  Thus vector 8, the first valid vector number, is actually in
-   *  slot 9 in the table.
-   */
-
-  *old_handler = prcb->intr_tbl[ vector + 1 ];
-
-  prcb->intr_tbl[ vector + 1 ] = new_handler;
-
-  if ( _Is_vector_caching_enabled( prcb ) )
-    if ( (vector & 0xf) == 0x2 )       /* cacheable? */
-      cached_intr_tbl[ vector >> 4 ] = new_handler;
-}
-
-/*PAGE
- *
- *  _CPU__ISR_install_vector
- *
- *  Install the RTEMS vector wrapper in the CPU's interrupt table.
- *
- *  Input parameters:
- *    vector      - interrupt vector number
- *    old_handler - former ISR for this vector number
- *    new_handler - replacement ISR for this vector number
- *
- *  Output parameters:  NONE
- *
- */
-
-void _CPU_ISR_install_vector(
-  unsigned32  vector,
-  proc_ptr    new_handler,
-  proc_ptr   *old_handler
-)
-{
-  proc_ptr ignored;
-
-  *old_handler = _ISR_Vector_table[ vector ];
-
-  _CPU_ISR_install_raw_handler( vector, _ISR_Handler, &ignored );
-
-  _ISR_Vector_table[ vector ] = new_handler;
-}
-
-/*PAGE
- *
- *  _CPU_Install_interrupt_stack
- */
-
-#define soft_reset( prcb ) \
- { register i960ca_PRCB *_prcb = (prcb); \
-   register unsigned32  *_next=0; \
-   register unsigned32   _cmd  = 0x30000; \
-   asm volatile( "lda    next,%1; \
-                  sysctl %0,%1,%2; \
-            next: mov    g0,g0" \
-                  : "=d" (_cmd), "=d" (_next), "=d" (_prcb) \
-                  : "0"  (_cmd), "1"  (_next), "2"  (_prcb) ); \
- }
-
-void _CPU_Install_interrupt_stack( void )
-{
-  i960ca_PRCB *prcb = _CPU_Table.Prcb;
-  unsigned32   level;
-
-  /*
-   *  Set the Interrupt Stack in the PRCB and force a reload of it.
-   *  Interrupts are disabled for safety.
-   */
-
-  _CPU_ISR_Disable( level );
-
-    prcb->intr_stack = _CPU_Interrupt_stack_low;
-
-    soft_reset( prcb );
-
-  _CPU_ISR_Enable( level );
-}
diff --git a/cpukit/score/cpu/m68k/asm.h b/cpukit/score/cpu/m68k/asm.h
deleted file mode 100644
index 456b213cb2..0000000000
--- a/cpukit/score/cpu/m68k/asm.h
+++ /dev/null
@@ -1,144 +0,0 @@
-/*  asm.h
- *
- *  This include file attempts to address the problems
- *  caused by incompatible flavors of assemblers and
- *  toolsets.  It primarily addresses variations in the
- *  use of leading underscores on symbols and the requirement
- *  that register names be preceded by a %.
- *
- *
- *  NOTE: The spacing in the use of these macros
- *        is critical to them working as advertised.
- *
- *  COPYRIGHT:
- *
- *  This file is based on similar code found in newlib available
- *  from ftp.cygnus.com.  The file which was used had no copyright
- *  notice.  This file is freely distributable as long as the source
- *  of the file is noted.  This file is:
- *
- *  COPYRIGHT (c) 1994-1997.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  $Id$
- */
-
-#ifndef __M68k_ASM_h
-#define __M68k_ASM_h
-
-/*
- *  Indicate we are in an assembly file and get the basic CPU definitions.
- */
-
-#ifndef ASM
-#define ASM
-#endif
-#include <rtems/score/targopts.h>
-#include <rtems/score/cpu.h>
-
-/*
- *  Recent versions of GNU cpp define variables which indicate the
- *  need for underscores and percents.  If not using GNU cpp or
- *  the version does not support this, then you will obviously
- *  have to define these as appropriate.
- */
-
-#ifndef __USER_LABEL_PREFIX__
-#define __USER_LABEL_PREFIX__ _
-#endif
-
-#ifndef __REGISTER_PREFIX__
-#define __REGISTER_PREFIX__
-#endif
-
-/* ANSI concatenation macros.  */
-
-#define CONCAT1(a, b) CONCAT2(a, b)
-#define CONCAT2(a, b) a ## b
-
-/* Use the right prefix for global labels.  */
-
-#define SYM(x) CONCAT1 (__USER_LABEL_PREFIX__, x)
-
-/* Use the right prefix for registers.  */
-
-#define REG(x) CONCAT1 (__REGISTER_PREFIX__, x)
-
-#define d0 REG (d0)
-#define d1 REG (d1)
-#define d2 REG (d2)
-#define d3 REG (d3)
-#define d4 REG (d4)
-#define d5 REG (d5)
-#define d6 REG (d6)
-#define d7 REG (d7)
-#define a0 REG (a0)
-#define a1 REG (a1)
-#define a2 REG (a2)
-#define a3 REG (a3)
-#define a4 REG (a4)
-#define a5 REG (a5)
-#define a6 REG (a6)
-#define a7 REG (a7)
-#define sp REG (sp)
-
-#define msp REG (msp)
-#define usp REG (usp)
-#define isp REG (isp)
-#define sr  REG (sr)
-#define vbr REG (vbr)
-#define dfc REG (dfc)
-#define sfc REG (sfc)
-
-/* mcf52xx special regs */
-#define cacr    REG (cacr)
-#define acr0    REG (acr0)
-#define acr1    REG (acr1)
-#define rambar0 REG (rambar0)
-#define mbar    REG (mbar)
-
-
-#define fp0 REG (fp0)
-#define fp1 REG (fp1)
-#define fp2 REG (fp2)
-#define fp3 REG (fp3)
-#define fp4 REG (fp4)
-#define fp5 REG (fp5)
-#define fp6 REG (fp6)
-#define fp7 REG (fp7)
-
-#define fpc REG (fpc)
-#define fpi REG (fpi)
-#define fps REG (fps)
-#define fpsr REG (fpsr)
-
-
-/*
- *  Define macros to handle section beginning and ends.
- */
-
-
-#define BEGIN_CODE_DCL .text
-#define END_CODE_DCL
-#define BEGIN_DATA_DCL .data
-#define END_DATA_DCL
-#define BEGIN_CODE .text
-#define END_CODE
-#define BEGIN_DATA .data
-#define END_DATA
-#define BEGIN_BSS .bss
-#define END_BSS
-#define END
-
-/*
- *  Following must be tailor for a particular flavor of the C compiler.
- *  They may need to put underscores in front of the symbols.
- */
-
-#define PUBLIC(sym) .globl SYM (sym)
-#define EXTERN(sym) .globl SYM (sym)
-
-#endif
-/* end of include file */
-
-
diff --git a/cpukit/score/cpu/m68k/cpu.c b/cpukit/score/cpu/m68k/cpu.c
deleted file mode 100644
index e714933350..0000000000
--- a/cpukit/score/cpu/m68k/cpu.c
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- *  Motorola MC68xxx Dependent Source
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems/system.h>
-#include <rtems/score/isr.h>
-
-/*  _CPU_Initialize
- *
- *  This routine performs processor dependent initialization.
- *
- *  INPUT PARAMETERS:
- *    cpu_table       - CPU table to initialize
- *    thread_dispatch - entry pointer to thread dispatcher
- *
- *  OUTPUT PARAMETERS: NONE
- */
-
-void _CPU_Initialize(
-  rtems_cpu_table  *cpu_table,
-  void      (*thread_dispatch)      /* ignored on this CPU */
-)
-{
-#if ( M68K_HAS_VBR == 0 )
-  /* fill the isr redirect table with the code to place the format/id
-     onto the stack */
-
-  unsigned32 slot;
-
-  for (slot = 0; slot < CPU_INTERRUPT_NUMBER_OF_VECTORS; slot++)
-  {
-    _CPU_ISR_jump_table[slot].move_a7 = M68K_MOVE_A7;
-    _CPU_ISR_jump_table[slot].format_id = slot << 2;
-    _CPU_ISR_jump_table[slot].jmp = M68K_JMP;
-    _CPU_ISR_jump_table[slot].isr_handler = (unsigned32) 0xDEADDEAD;
-  }
-#endif /* M68K_HAS_VBR */
-
-  _CPU_Table = *cpu_table;
-}
-
-/*PAGE
- *
- *  _CPU_ISR_Get_level
- */
- 
-unsigned32 _CPU_ISR_Get_level( void )
-{
-  unsigned32 level;
-
-  m68k_get_interrupt_level( level );
-
-  return level;
-}
-
-/*PAGE
- *
- *  _CPU_ISR_install_raw_handler
- */
- 
-void _CPU_ISR_install_raw_handler(
-  unsigned32  vector,
-  proc_ptr    new_handler,
-  proc_ptr   *old_handler
-)
-{
-  proc_ptr *interrupt_table = NULL;
-
-#if (M68K_HAS_FPSP_PACKAGE == 1)
-  /*
-   *  If this vector being installed is one related to FP, then the
-   *  FPSP will install the handler itself and handle it completely
-   *  with no intervention from RTEMS.
-   */
-
-  if (*_FPSP_install_raw_handler &&
-      (*_FPSP_install_raw_handler)(vector, new_handler, *old_handler))
-        return;
-#endif
-
-
-  /*
-   *  On CPU models without a VBR, it is necessary for there to be some
-   *  header code for each ISR which saves a register, loads the vector
-   *  number, and jumps to _ISR_Handler. 
-   */
-
-  m68k_get_vbr( interrupt_table );
-  *old_handler = interrupt_table[ vector ];
-#if ( M68K_HAS_VBR == 1 )
-  interrupt_table[ vector ] = new_handler;
-#else
-  _CPU_ISR_jump_table[vector].isr_handler = (unsigned32) new_handler;
-  interrupt_table[ vector ] = (proc_ptr) &_CPU_ISR_jump_table[vector];
-#endif /* M68K_HAS_VBR */
-}
-
-/*PAGE
- *
- *  _CPU_ISR_install_vector
- *
- *  This kernel routine installs the RTEMS handler for the
- *  specified vector.
- *
- *  Input parameters:
- *    vector      - interrupt vector number
- *    new_handler - replacement ISR for this vector number
- *    old_handler - former ISR for this vector number
- *
- *  Output parameters:  NONE
- */
-
-void _CPU_ISR_install_vector(
-  unsigned32  vector,
-  proc_ptr    new_handler,
-  proc_ptr   *old_handler
-)
-{
-  proc_ptr ignored;
-
-  *old_handler = _ISR_Vector_table[ vector ];
-
-  _CPU_ISR_install_raw_handler( vector, _ISR_Handler, &ignored );
-
-  _ISR_Vector_table[ vector ] = new_handler;
-}
-
-
-/*PAGE
- *
- *  _CPU_Install_interrupt_stack
- */
-
-void _CPU_Install_interrupt_stack( void )
-{
-#if ( M68K_HAS_SEPARATE_STACKS == 1 )
-  void *isp = _CPU_Interrupt_stack_high;
-
-  asm volatile ( "movec %0,%%isp" : "=r" (isp) : "0" (isp) );
-#endif
-}
-
-#if ( M68K_HAS_BFFFO != 1 )
-/*
- * Returns table for duplication of the BFFFO instruction (16 bits only)
- */
-const unsigned char __BFFFOtable[256] = {
-    8, 7, 6, 6, 5, 5, 5, 5, 4, 4, 4, 4, 4, 4, 4, 4,
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-};
-#endif
-
-/*PAGE
- *
- *  The following code context switches the software FPU emulation
- *  code provided with GCC.
- */
-
-#if (CPU_SOFTWARE_FP == TRUE)
-extern Context_Control_fp _fpCCR;
-
-void CPU_Context_save_fp (void **fp_context_ptr)
-{
-  Context_Control_fp *fp;
-
-  fp = (Context_Control_fp *) *fp_context_ptr;
-
-  *fp = _fpCCR;
-}
-
-void CPU_Context_restore_fp (void **fp_context_ptr)
-{
-  Context_Control_fp *fp;
-
-  fp = (Context_Control_fp *) *fp_context_ptr;
-
-  _fpCCR = *fp;
-}
-#endif
-
diff --git a/cpukit/score/cpu/m68k/m68302.h b/cpukit/score/cpu/m68k/m68302.h
deleted file mode 100644
index 084ceac034..0000000000
--- a/cpukit/score/cpu/m68k/m68302.h
+++ /dev/null
@@ -1,661 +0,0 @@
-/*
- *------------------------------------------------------------------
- *
- *	m68302.h - Definitions for Motorola MC68302 processor.
- *
- * Section references in this file refer to revision 2 of Motorola's
- * "MC68302 Integrated Multiprotocol Processor User's Manual".
- * (Motorola document MC68302UM/AD REV 2.)
- *
- * Based on Don Meyer's cpu68302.h that was posted in comp.sys.m68k
- * on 17 February, 1993.
- *
- * Copyright 1995 David W. Glessner.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the following conditions are met:
- * 1. Redistribution of source code and documentation must retain
- *    the above copyright notice, this list of conditions and the
- *    following disclaimer.
- * 2. The name of the author may not be used to endorse or promote
- *    products derived from this software without specific prior
- *    written permission.
- *
- * This software is provided "AS IS" without warranty of any kind,
- * either expressed or implied, including, but not limited to, the
- * implied warranties of merchantability, title and fitness for a
- * particular purpose.
- *
- *
- *  $Id$
- *
- *------------------------------------------------------------------
- */
-
-#ifndef __MOTOROLA_MC68302_DEFINITIONS_h
-#define __MOTOROLA_MC68302_DEFINITIONS_h
-
-/*
- * BAR - Base Address Register
- * Section 2.7
- */
-#define M302_BAR	(*((volatile rtems_unsigned16 *) 0xf2))
-
-/*
- * SCR - System Control Register
- * Section 3.8.1
- */
-#define M302_SCR	(*((volatile rtems_unsigned32 *) 0xf4))
-/*
- * SCR bits
- */
-#define RBIT_SCR_IPA		0x08000000
-#define RBIT_SCR_HWT		0x04000000
-#define RBIT_SCR_WPV		0x02000000
-#define RBIT_SCR_ADC		0x01000000
-
-#define RBIT_SCR_ERRE		0x00400000
-#define RBIT_SCR_VGE		0x00200000
-#define RBIT_SCR_WPVE		0x00100000
-#define RBIT_SCR_RMCST		0x00080000
-#define RBIT_SCR_EMWS		0x00040000
-#define RBIT_SCR_ADCE		0x00020000
-#define RBIT_SCR_BCLM		0x00010000
-
-#define RBIT_SCR_FRZW		0x00008000
-#define RBIT_SCR_FRZ2		0x00004000
-#define RBIT_SCR_FRZ1		0x00002000
-#define RBIT_SCR_SAM		0x00001000
-#define RBIT_SCR_HWDEN		0x00000800
-#define RBIT_SCR_HWDCN2		0x00000400
-#define RBIT_SCR_HWDCN1		0x00000200  /* 512 clocks */
-#define RBIT_SCR_HWDCN0		0x00000100  /* 128 clocks */
-
-#define RBIT_SCR_LPREC		0x00000080
-#define RBIT_SCR_LPP16		0x00000040
-#define RBIT_SCR_LPEN		0x00000020
-#define RBIT_SCR_LPCLKDIV	0x0000001f
-
-
-/*
- * 68000 interrupt and trap vector numbers
- */
-#define M68K_IVEC_BUS_ERROR		 2
-#define M68K_IVEC_ADDRESS_ERROR		 3
-#define M68K_IVEC_ILLEGAL_OPCODE	 4
-#define M68K_IVEC_ZERO_DIVIDE		 5
-#define M68K_IVEC_CHK			 6
-#define M68K_IVEC_TRAPV			 7
-#define M68K_IVEC_PRIVILEGE		 8
-#define M68K_IVEC_TRACE			 9
-#define M68K_IVEC_LINE_A		10
-#define M68K_IVEC_LINE_F		11
-/*	Unassigned, Reserved		12-14 */
-#define M68K_IVEC_UNINITIALIZED_INT	15
-/*	Unassigned, Reserved		16-23 */
-#define M68K_IVEC_SPURIOUS_INT		24
-
-#define M68K_IVEC_LEVEL1_AUTOVECTOR	25
-#define M68K_IVEC_LEVEL2_AUTOVECTOR	26
-#define M68K_IVEC_LEVEL3_AUTOVECTOR	27
-#define M68K_IVEC_LEVEL4_AUTOVECTOR	28
-#define M68K_IVEC_LEVEL5_AUTOVECTOR	29
-#define M68K_IVEC_LEVEL6_AUTOVECTOR	30
-#define M68K_IVEC_LEVEL7_AUTOVECTOR	31
-
-#define M68K_IVEC_TRAP0			32
-#define M68K_IVEC_TRAP1			33
-#define M68K_IVEC_TRAP2			34
-#define M68K_IVEC_TRAP3			35
-#define M68K_IVEC_TRAP4			36
-#define M68K_IVEC_TRAP5			37
-#define M68K_IVEC_TRAP6			38
-#define M68K_IVEC_TRAP7			39
-#define M68K_IVEC_TRAP8			40
-#define M68K_IVEC_TRAP9			41
-#define M68K_IVEC_TRAP10		42
-#define M68K_IVEC_TRAP11		43
-#define M68K_IVEC_TRAP12		44
-#define M68K_IVEC_TRAP13		45
-#define M68K_IVEC_TRAP14		46
-#define M68K_IVEC_TRAP15		47
-/*
- *	Unassigned, Reserved		48-59
- *
- * Note: Vectors 60-63 are used by the MC68302 (e.g. BAR, SCR).
- */
-
-/*
- * MC68302 Interrupt Vectors
- * Section 3.2
- */
-enum m68302_ivec_e {
-    M302_IVEC_ERR	=0,
-    M302_IVEC_PB8	=1,	/* General-Purpose Interrupt 0 */
-    M302_IVEC_SMC2	=2,
-    M302_IVEC_SMC1	=3,
-    M302_IVEC_TIMER3	=4,
-    M302_IVEC_SCP	=5,
-    M302_IVEC_TIMER2	=6,
-    M302_IVEC_PB9	=7,	/* General-Purpose Interrupt 1 */
-    M302_IVEC_SCC3	=8,
-    M302_IVEC_TIMER1	=9,
-    M302_IVEC_SCC2	=10,
-    M302_IVEC_IDMA	=11,
-    M302_IVEC_SDMA	=12,	/* SDMA Channels Bus Error */
-    M302_IVEC_SCC1	=13,
-    M302_IVEC_PB10	=14,	/* General-Purpose Interrupt 2 */
-    M302_IVEC_PB11	=15,	/* General-Purpose Interrupt 3 */
-    M302_IVEC_IRQ1	=17,	/* External Device */
-    M302_IVEC_IRQ6	=22,	/* External Device */
-    M302_IVEC_IRQ7	=23	/* External Device */
-};
-
-
-/*
- * GIMR - Global Interrupt Mode Register
- * Section 3.2.5.1
- */
-#define RBIT_GIMR_MOD		(1<<15)
-#define RBIT_GIMR_IV7		(1<<14)
-#define RBIT_GIMR_IV6		(1<<13)
-#define RBIT_GIMR_IV1		(1<<12)
-#define RBIT_GIMR_ET7		(1<<10)
-#define RBIT_GIMR_ET6		(1<<9)
-#define RBIT_GIMR_ET1		(1<<8)
-#define RBIT_GIMR_VECTOR	(7<<5)
-
-/*
- * IPR - Interrupt Pending Register    (Section 3.2.5.2)
- * IMR - Interrupt Mask Register       (Section 3.2.5.3)
- * ISR - Interrupt In-Service Register (Section 3.2.5.4)
- */
-#define RBIT_IPR_PB11		(1<<15)
-#define RBIT_IPR_PB10		(1<<14)
-#define RBIT_IPR_SCC1		(1<<13)
-#define RBIT_IPR_SDMA		(1<<12)
-#define RBIT_IPR_IDMA		(1<<11)
-#define RBIT_IPR_SCC2		(1<<10)
-#define RBIT_IPR_TIMER1		(1<<9)
-#define RBIT_IPR_SCC3		(1<<8)
-#define RBIT_IPR_PB9		(1<<7)
-#define RBIT_IPR_TIMER2		(1<<6)
-#define RBIT_IPR_SCP		(1<<5)
-#define RBIT_IPR_TIMER3		(1<<4)
-#define RBIT_IPR_SMC1		(1<<3)
-#define RBIT_IPR_SMC2		(1<<2)
-#define RBIT_IPR_PB8		(1<<1)
-#define RBIT_IPR_ERR		(1<<0)
-
-#define RBIT_ISR_PB11		(1<<15)
-#define RBIT_ISR_PB10		(1<<14)
-#define RBIT_ISR_SCC1		(1<<13)
-#define RBIT_ISR_SDMA		(1<<12)
-#define RBIT_ISR_IDMA		(1<<11)
-#define RBIT_ISR_SCC2		(1<<10)
-#define RBIT_ISR_TIMER1		(1<<9)
-#define RBIT_ISR_SCC3		(1<<8)
-#define RBIT_ISR_PB9		(1<<7)
-#define RBIT_ISR_TIMER2		(1<<6)
-#define RBIT_ISR_SCP		(1<<5)
-#define RBIT_ISR_TIMER3		(1<<4)
-#define RBIT_ISR_SMC1		(1<<3)
-#define RBIT_ISR_SMC2		(1<<2)
-#define RBIT_ISR_PB8		(1<<1)
-
-#define RBIT_IMR_PB11		(1<<15)		/* PB11   Interrupt Mask */
-#define RBIT_IMR_PB10		(1<<14)		/* PB10   Interrupt Mask */
-#define RBIT_IMR_SCC1		(1<<13)		/* SCC1   Interrupt Mask */
-#define RBIT_IMR_SDMA		(1<<12)		/* SDMA   Interrupt Mask */
-#define RBIT_IMR_IDMA		(1<<11)		/* IDMA   Interrupt Mask */
-#define RBIT_IMR_SCC2		(1<<10)		/* SCC2   Interrupt Mask */
-#define RBIT_IMR_TIMER1		(1<<9)		/* TIMER1 Interrupt Mask */
-#define RBIT_IMR_SCC3		(1<<8)		/* SCC3   Interrupt Mask */
-#define RBIT_IMR_PB9		(1<<7)		/* PB9    Interrupt Mask */
-#define RBIT_IMR_TIMER2		(1<<6)		/* TIMER2 Interrupt Mask */
-#define RBIT_IMR_SCP		(1<<5)		/* SCP    Interrupt Mask */
-#define RBIT_IMR_TIMER3		(1<<4)		/* TIMER3 Interrupt Mask */
-#define RBIT_IMR_SMC1		(1<<3)		/* SMC1   Interrupt Mask */
-#define RBIT_IMR_SMC2		(1<<2)		/* SMC2   Interrupt Mask */
-#define RBIT_IMR_PB8		(1<<1)		/* PB8    Interrupt Mask */
-
-
-/*
- * DRAM Refresh
- * Section 3.9
- *
- * The DRAM refresh memory map replaces the SCC2 Tx BD 6 and Tx BD 7
- * structures in the parameter RAM.
- *
- * Access to the DRAM registers can be accomplished by 
- * the following approach:
- *
- *	volatile m302_DRAM_refresh_t *dram;
- *	dram = (volatile m302_DRAM_refresh_t *) &m302.scc2.bd.tx[6];
- *
- * Then simply use pointer references (e.g. dram->count = 3).
- */
-typedef struct {
-    rtems_unsigned16	dram_high;	/* DRAM high address and FC */
-    rtems_unsigned16	dram_low;	/* DRAM low address */
-    rtems_unsigned16	increment;	/* increment step (bytes/row) */
-    rtems_unsigned16	count;		/* RAM refresh cycle count (#rows) */
-    rtems_unsigned16	t_ptr_h;	/* temporary refresh high addr & FC */
-    rtems_unsigned16	t_ptr_l;	/* temporary refresh low address */
-    rtems_unsigned16	t_count;	/* temporary refresh cycles count */
-    rtems_unsigned16	res;		/* reserved */
-} m302_DRAM_refresh_t;
-
-
-/*
- * TMR - Timer Mode Register (for timers 1 and 2)
- * Section 3.5.2.1
- */
-#define RBIT_TMR_ICLK_STOP	(0<<1)
-#define RBIT_TMR_ICLK_MASTER	(1<<1)
-#define RBIT_TMR_ICLK_MASTER16	(2<<1)
-#define RBIT_TMR_ICLK_TIN	(3<<1)
-
-#define RBIT_TMR_OM		(1<<5)
-#define RBIT_TMR_ORI		(1<<4)
-#define RBIT_TMR_FRR		(1<<3)
-#define RBIT_TMR_RST		(1<<0)
-
-
-/*
- * TER - Timer Event Register (for timers 1 and 2)
- * Section 3.5.2.5
- */
-#define RBIT_TER_REF	(1<<1)		/* Output Reference Event */
-#define RBIT_TER_CAP	(1<<0)		/* Capture Event */
-
-
-/*
- * SCC Buffer Descriptors and Buffer Descriptors Table
- * Section 4.5.5
- */
-typedef struct m302_SCC_bd {
-    rtems_unsigned16 status;		/* status and control */
-    rtems_unsigned16 length;		/* data length */
-    rtems_unsigned8  *buffer;		/* data buffer pointer */
-} m302_SCC_bd_t;
-
-typedef struct {
-    m302_SCC_bd_t	rx[8];		/* receive buffer descriptors */
-    m302_SCC_bd_t	tx[8];		/* transmit buffer descriptors */
-} m302_SCC_bd_table_t;
-
-
-/*
- * SCC Parameter RAM (offset 0x080 from an SCC Base)
- * Section 4.5.6
- *
- * Each SCC parameter RAM area begins at offset 0x80 from each SCC base
- * area (0x400, 0x500, or 0x600 from the dual-port RAM base).
- *
- * Offsets 0x9c-0xbf from each SCC base area compose the protocol-specific
- * portion of the SCC parameter RAM.
- */
-typedef struct {
-    rtems_unsigned8	rfcr;		/* Rx Function Code */
-    rtems_unsigned8	tfcr;		/* Tx Function Code */
-    rtems_unsigned16	mrblr;		/* Maximum Rx Buffer Length */
-    rtems_unsigned16	_rstate;	/* Rx Internal State */
-    rtems_unsigned8	res2;
-    rtems_unsigned8	rbd;		/* Rx Internal Buffer Number */
-    rtems_unsigned32	_rdptr;		/* Rx Internal Data Pointer */
-    rtems_unsigned16	_rcount;	/* Rx Internal Byte Count */
-    rtems_unsigned16	_rtmp;		/* Rx Temp */
-    rtems_unsigned16	_tstate;	/* Tx Internal State */
-    rtems_unsigned8	res7;
-    rtems_unsigned8	tbd;		/* Tx Internal Buffer Number */
-    rtems_unsigned32	_tdptr;		/* Tx Internal Data Pointer */
-    rtems_unsigned16	_tcount;	/* Tx Internal Byte Count */
-    rtems_unsigned16	_ttmp;		/* Tx Temp */
-} m302_SCC_parameters_t;
-
-/*
- * UART-Specific SCC Parameter RAM
- * Section 4.5.11.3
- */
-typedef struct {
-    rtems_unsigned16	max_idl;	/* Maximum IDLE Characters (rx) */
-    rtems_unsigned16	idlc;		/* Temporary rx IDLE counter */
-    rtems_unsigned16	brkcr;		/* Break Count Register (tx) */
-    rtems_unsigned16	parec;		/* Receive Parity Error Counter */
-    rtems_unsigned16	frmec;		/* Receive Framing Error Counter */
-    rtems_unsigned16	nosec;		/* Receive Noise Counter */
-    rtems_unsigned16	brkec;		/* Receive Break Condition Counter */
-    rtems_unsigned16	uaddr1;		/* UART ADDRESS Character 1 */
-    rtems_unsigned16	uaddr2;		/* UART ADDRESS Character 2 */
-    rtems_unsigned16	rccr;		/* Receive Control Character Register */
-    rtems_unsigned16	character[8];	/* Control Characters 1 through 8*/
-} m302_SCC_UartSpecific_t;
-/*
- *  This definition allows for the checking of receive buffers
- *  for errors.
- */
-
-#define RCV_ERR    0x003F
-
-/*
- * UART receive buffer descriptor bit definitions.
- * Section 4.5.11.14
- */
-#define RBIT_UART_CTRL   (1<<11)	/* buffer contains a control char */
-#define RBIT_UART_ADDR   (1<<10)	/* first byte contains an address */
-#define RBIT_UART_MATCH  (1<<9)		/* indicates which addr char matched */
-#define RBIT_UART_IDLE   (1<<8)		/* buffer closed due to IDLE sequence */
-#define RBIT_UART_BR     (1<<5)		/* break sequence was received */
-#define RBIT_UART_FR     (1<<4)		/* framing error was received */
-#define RBIT_UART_PR     (1<<3)		/* parity error was received */
-#define RBIT_UART_OV     (1<<1)		/* receiver overrun occurred */
-#define RBIT_UART_CD     (1<<0)		/* carrier detect lost */
-#define RBIT_UART_STATUS 0x003B		/* all status bits */
-
-/*
- * UART transmit buffer descriptor bit definitions.
- * Section 4.5.11.15
- */
-#define RBIT_UART_CR       (1<<11)	/* clear-to-send report
-					 * this results in two idle bits
-					 * between back-to-back frames
-					 */
-#define RBIT_UART_A        (1<<10)	/* buffer contains address characters
-					 * only valid in multidrop mode (UM0=1)
-					 */
-#define RBIT_UART_PREAMBLE (1<<9)	/* send preamble before data */
-#define RBIT_UART_CTS_LOST (1<<0)	/* CTS lost */
-
-/*
- * UART event register
- * Section 4.5.11.16
- */
-#define M302_UART_EV_CTS   (1<<7)	/* CTS status changed */
-#define M302_UART_EV_CD    (1<<6)	/* carrier detect status changed */
-#define M302_UART_EV_IDL   (1<<5)	/* IDLE sequence status changed */
-#define M302_UART_EV_BRK   (1<<4)	/* break character was received */
-#define M302_UART_EV_CCR   (1<<3)	/* control character received */
-#define M302_UART_EV_TX    (1<<1)	/* buffer has been transmitted */
-#define M302_UART_EV_RX    (1<<0)	/* buffer has been received */
-
-
-/*
- * HDLC-Specific SCC Parameter RAM
- * Section 4.5.12.3
- *
- * c_mask_l should be 0xF0B8 for 16-bit CRC, 0xdebb for 32-bit CRC
- * c_mask_h is a don't care  for 16-bit CRC, 0x20E2 for 32-bit CRC
- */
-typedef struct {
-    rtems_unsigned16	rcrc_l;		/* Temp Receive CRC Low */
-    rtems_unsigned16	rcrc_h;		/* Temp Receive CRC High */
-    rtems_unsigned16	c_mask_l;	/* CRC Mask Low */
-    rtems_unsigned16	c_mask_h;	/* CRC Mask High */
-    rtems_unsigned16	tcrc_l;		/* Temp Transmit CRC Low */
-    rtems_unsigned16	tcrc_h;		/* Temp Transmit CRC High */
-
-    rtems_unsigned16	disfc;		/* Discard Frame Counter */
-    rtems_unsigned16	crcec;		/* CRC Error Counter */
-    rtems_unsigned16	abtsc;		/* Abort Sequence Counter */
-    rtems_unsigned16	nmarc;		/* Nonmatching Address Received Cntr */
-    rtems_unsigned16	retrc;		/* Frame Retransmission Counter */
-
-    rtems_unsigned16	mflr;		/* Maximum Frame Length Register */
-    rtems_unsigned16	max_cnt;	/* Maximum_Length Counter */
-
-    rtems_unsigned16	hmask;		/* User Defined Frame Address Mask */
-    rtems_unsigned16	haddr1;		/* User Defined Frame Address */
-    rtems_unsigned16	haddr2;		/* " */
-    rtems_unsigned16	haddr3;		/* " */
-    rtems_unsigned16	haddr4;		/* " */
-} m302_SCC_HdlcSpecific_t;
-/*
- * HDLC receiver buffer descriptor bit definitions
- * Section 4.5.12.10
- */
-#define RBIT_HDLC_EMPTY_BIT  0x8000	/* buffer associated with BD is empty */
-#define RBIT_HDLC_LAST_BIT   0x0800	/* buffer is last in a frame */
-#define RBIT_HDLC_FIRST_BIT  0x0400	/* buffer is first in a frame */
-#define RBIT_HDLC_FRAME_LEN  0x0020	/* receiver frame length violation */
-#define RBIT_HDLC_NONOCT_Rx  0x0010	/* received non-octet aligned frame */
-#define RBIT_HDLC_ABORT_SEQ  0x0008	/* received abort sequence */
-#define RBIT_HDLC_CRC_ERROR  0x0004	/* frame contains a CRC error */
-#define RBIT_HDLC_OVERRUN    0x0002	/* receiver overrun occurred */
-#define RBIT_HDLC_CD_LOST    0x0001	/* carrier detect lost */
-
-/*
- * HDLC transmit buffer descriptor bit definitions
- * Section 4.5.12.11
- */
-#define RBIT_HDLC_READY_BIT  0x8000	/* buffer is ready to transmit */
-#define RBIT_HDLC_EXT_BUFFER 0x4000	/* buffer is in external memory */
-#define RBIT_HDLC_WRAP_BIT   0x2000	/* last buffer in bd table, so wrap */
-#define RBIT_HDLC_WAKE_UP    0x1000	/* interrupt when buffer serviced */
-#define RBIT_HDLC_LAST_BIT   0x0800	/* buffer is last in the frame */
-#define RBIT_HDLC_TxCRC_BIT  0x0400	/* transmit a CRC sequence */
-#define RBIT_HDLC_UNDERRUN   0x0002	/* transmitter underrun */
-#define RBIT_HDLC_CTS_LOST   0x0001	/* CTS lost */
-
-/*
- * HDLC event register bit definitions
- * Section 4.5.12.12
- */
-#define RBIT_HDLC_CTS   0x80		/* CTS status changed */
-#define RBIT_HDLC_CD    0x40		/* carrier detect status changed */
-#define RBIT_HDLC_IDL   0x20		/* IDLE sequence status changed */
-#define RBIT_HDLC_TXE   0x10		/* transmit error */
-#define RBIT_HDLC_RXF   0x08		/* received frame */
-#define RBIT_HDLC_BSY  0x04		/* frame rcvd and discarded due to
-					 * lack of buffers
-					 */
-#define RBIT_HDLC_TXB    0x02		/* buffer has been transmitted */
-#define RBIT_HDLC_RXB    0x01		/* received buffer */
-
-
-
-typedef struct {
-    m302_SCC_bd_table_t          bd;	/* +000 Buffer Descriptor Table */
-    m302_SCC_parameters_t        parm;	/* +080 Common Parameter RAM */
-    union {				/* +09C Protocol-Specific Parm RAM */
-	m302_SCC_UartSpecific_t  uart;
-	m302_SCC_HdlcSpecific_t  hdlc;
-    } prot;
-    rtems_unsigned8	   res[0x040];	/* +0C0 reserved, (not implemented) */
-} m302_SCC_t;
-
-
-/*
- * Common SCC Registers
- */
-typedef struct {
-    rtems_unsigned16	res1;
-    rtems_unsigned16	scon;	/* SCC Configuration Register        4.5.2 */
-    rtems_unsigned16	scm;	/* SCC Mode Register                 4.5.3 */
-    rtems_unsigned16	dsr;	/* SCC Data Synchronization Register 4.5.4 */
-    rtems_unsigned8	scce;	/* SCC Event Register  4.5.8.1 */
-    rtems_unsigned8	res2;
-    rtems_unsigned8	sccm;	/* SCC Mask Register   4.5.8.2 */
-    rtems_unsigned8	res3;
-    rtems_unsigned8	sccs;	/* SCC Status Register 4.5.8.3 */
-    rtems_unsigned8	res4;
-    rtems_unsigned16	res5;
-} m302_SCC_Registers_t;
-
-/*
- * SCON - SCC Configuration Register
- * Section 4.5.2
- */
-#define RBIT_SCON_WOMS	(1<<15)		/* Wired-OR Mode Select (NMSI mode only)
-					 * When set, the TXD driver is an
-					 * open-drain output */
-#define RBIT_SCON_EXTC	(1<<14)		/* External Clock Source */
-#define RBIT_SCON_TCS	(1<<13)		/* Transmit Clock Source */
-#define RBIT_SCON_RCS	(1<<12)		/* Receive Clock Source */
-
-/*
- * SCM - SCC Mode Register bit definitions
- * Section 4.5.3
- * The parameter-specific mode bits occupy bits 15 through 6.
- */
-#define RBIT_SCM_ENR	(1<<3)		/* Enable receiver */
-#define RBIT_SCM_ENT	(1<<2)		/* Enable transmitter */
-
-
-/*
- * Internal MC68302 Registers
- * starts at offset 0x800 from dual-port RAM base
- * Section 2.8
- */
-typedef struct {
-    /* offset +800 */
-    rtems_unsigned16	res0;
-    rtems_unsigned16	cmr;		/* IDMA Channel Mode Register */
-    rtems_unsigned32	sapr;		/* IDMA Source Address Pointer */
-    rtems_unsigned32	dapr;		/* IDMA Destination Address Pointer */
-    rtems_unsigned16	bcr;		/* IDMA Byte Count Register */
-    rtems_unsigned8	csr;		/* IDMA Channel Status Register */
-    rtems_unsigned8	res1;
-    rtems_unsigned8	fcr;		/* IDMA Function Code Register */
-    rtems_unsigned8	res2;
-
-    /* offset +812 */
-    rtems_unsigned16	gimr;		/* Global Interrupt Mode Register */
-    rtems_unsigned16	ipr;		/* Interrupt Pending Register */
-    rtems_unsigned16	imr;		/* Interrupt Mask Register */
-    rtems_unsigned16	isr;		/* Interrupt In-Service Register */
-    rtems_unsigned16	res3;
-    rtems_unsigned16	res4;
-
-    /* offset +81e */
-    rtems_unsigned16	pacnt;		/* Port A Control Register */
-    rtems_unsigned16	paddr;		/* Port A Data Direction Register */
-    rtems_unsigned16	padat;		/* Port A Data Register */
-    rtems_unsigned16	pbcnt;		/* Port B Control Register */
-    rtems_unsigned16	pbddr;		/* Port B Data Direction Register */
-    rtems_unsigned16	pbdat;		/* Port B Data Register */
-    rtems_unsigned16	res5;
-
-    /* offset +82c */
-    rtems_unsigned16	res6;
-    rtems_unsigned16	res7;
-
-    rtems_unsigned16	br0;		/* Base Register   (CS0) */
-    rtems_unsigned16	or0;		/* Option Register (CS0) */
-    rtems_unsigned16	br1;		/* Base Register   (CS1) */
-    rtems_unsigned16	or1;		/* Option Register (CS1) */
-    rtems_unsigned16	br2;		/* Base Register   (CS2) */
-    rtems_unsigned16	or2;		/* Option Register (CS2) */
-    rtems_unsigned16	br3;		/* Base Register   (CS3) */
-    rtems_unsigned16	or3;		/* Option Register (CS3) */
-
-    /* offset +840 */
-    rtems_unsigned16	tmr1;		/* Timer Unit 1 Mode Register */
-    rtems_unsigned16	trr1;		/* Timer Unit 1 Reference Register */
-    rtems_unsigned16	tcr1;		/* Timer Unit 1 Capture Register */
-    rtems_unsigned16	tcn1;		/* Timer Unit 1 Counter */
-    rtems_unsigned8	res8;
-    rtems_unsigned8	ter1;		/* Timer Unit 1 Event Register */
-    rtems_unsigned16	wrr;		/* Watchdog Reference Register */
-    rtems_unsigned16	wcn;		/* Watchdog Counter */
-    rtems_unsigned16	res9;
-    rtems_unsigned16	tmr2;		/* Timer Unit 2 Mode Register */
-    rtems_unsigned16	trr2;		/* Timer Unit 2 Reference Register */
-    rtems_unsigned16	tcr2;		/* Timer Unit 2 Capture Register */
-    rtems_unsigned16	tcn2;		/* Timer Unit 2 Counter */
-    rtems_unsigned8	resa;
-    rtems_unsigned8	ter2;		/* Timer Unit 2 Event Register */
-    rtems_unsigned16	resb;
-    rtems_unsigned16	resc;
-    rtems_unsigned16	resd;
-
-    /* offset +860 */
-    rtems_unsigned8	cr;		/* Command Register */
-    rtems_unsigned8	rese[0x1f];
-
-    /* offset +880, +890, +8a0 */
-    m302_SCC_Registers_t scc[3];	/* SCC1, SCC2, SCC3 Registers */
-
-    /* offset +8b0 */
-    rtems_unsigned16	spmode;		/* SCP,SMC Mode and Clock Cntrl Reg */
-    rtems_unsigned16	simask;		/* Serial Interface Mask Register */
-    rtems_unsigned16	simode;		/* Serial Interface Mode Register */
-} m302_internalReg_t ;
-
-
-/*
- * MC68302 dual-port RAM structure.
- * (Includes System RAM, Parameter RAM, and Internal Registers).
- * Section 2.8
- */
-typedef struct {
-    rtems_unsigned8	mem[0x240];	/* +000 User Data Memory */
-    rtems_unsigned8	res1[0x1c0];	/* +240 reserved, (not implemented) */
-    m302_SCC_t		scc1;		/* +400 SCC1 */
-    m302_SCC_t		scc2;		/* +500 SCC2 */
-    m302_SCC_t		scc3;		/* +600 SCC3 */
-    rtems_unsigned8	res2[0x100];	/* +700 reserved, (not implemented) */
-    m302_internalReg_t	reg;		/* +800 68302 Internal Registers */
-} m302_dualPortRAM_t;
-
-/* some useful defines the some of the registers above */
-  
-
-/* ----
-   MC68302 Chip Select Registers
-      p3-46 2nd Edition
-
- */
-#define BR_ENABLED     1
-#define BR_DISABLED    0
-#define BR_FC_NULL     0
-#define BR_READ_ONLY   0
-#define BR_READ_WRITE  2
-#define OR_DTACK_0     0x0000
-#define OR_DTACK_1     0x2000
-#define OR_DTACK_2     0x4000
-#define OR_DTACK_3     0x6000
-#define OR_DTACK_4     0x8000
-#define OR_DTACK_5     0xA000
-#define OR_DTACK_6     0xC000
-#define OR_DTACK_EXT   0xE000
-#define OR_SIZE_64K    0x1FE0
-#define OR_SIZE_128K   0x1FC0
-#define OR_SIZE_256K   0x1F80
-#define OR_SIZE_512K   0x1F00
-#define OR_SIZE_1M     0x1E00
-#define OR_SIZE_2M     0x1C00
-#define OR_MASK_RW     0x0000
-#define OR_NO_MASK_RW  0x0002
-#define OR_MASK_FC     0x0000
-#define OR_NO_MASK_FC  0x0001
-
-#define MAKE_BR(base_address, enable, rw, fc) \
-    ((base_address >> 11) | fc | rw | enable)
-
-#define MAKE_OR(bsize, DtAck, RW_Mask, FC_Mask) \
-    (DtAck | ((~(bsize - 1) & 0x00FFFFFF) >> 11) | FC_Mask | RW_Mask)
-
-#define __REG_CAT(r, n) r ## n
-#define WRITE_BR(csel, base_address, enable, rw, fc) \
-          __REG_CAT(m302.reg.br, csel) = MAKE_BR(base_address, enable, rw, fc)
-#define WRITE_OR(csel, bsize, DtAck, RW_Mask, FC_Mask) \
-          __REG_CAT(m302.reg.or, csel) = MAKE_OR(bsize, DtAck, RW_Mask, FC_Mask)
-
-/* ----
-   MC68302 Watchdog Timer Enable Bit
-
- */
-#define WATCHDOG_ENABLE    (1)
-#define WATCHDOG_TRIGGER() (m302.reg.wrr = 0x10 | WATCHDOG_ENABLE, m302.reg.wcn = 0)
-#define WATCHDOG_TOGGLE()  (m302.reg.wcn = WATCHDOG_TIMEOUT_PERIOD)
-#define DISABLE_WATCHDOG() (m302.reg.wrr = 0)
-
-/*
- * Declare the variable that's used to reference the variables in
- * the dual-port RAM.
- */
-extern volatile m302_dualPortRAM_t m302;
-
-#endif
-/* end of include file */
diff --git a/cpukit/score/cpu/m68k/m68360.h b/cpukit/score/cpu/m68k/m68360.h
deleted file mode 100644
index 84687c49fa..0000000000
--- a/cpukit/score/cpu/m68k/m68360.h
+++ /dev/null
@@ -1,880 +0,0 @@
-/*
- **************************************************************************
- **************************************************************************
- **                                                                      **
- **  MOTOROLA MC68360 QUAD INTEGRATED COMMUNICATIONS CONTROLLER (QUICC)  **
- **                                                                      **
- **                        HARDWARE DECLARATIONS                         **
- **                                                                      **
- **                                                                      **
- **  Submitted By:                                                       **
- **                                                                      **
- **      W. Eric Norum                                                   **
- **      Saskatchewan Accelerator Laboratory                             **
- **      University of Saskatchewan                                      **
- **      107 North Road                                                  **
- **      Saskatoon, Saskatchewan, CANADA                                 **
- **      S7N 5C6                                                         **
- **                                                                      **
- **      eric@skatter.usask.ca                                           **
- **                                                                      **
- **  $Id$                                                                **
- **                                                                      **
- **************************************************************************
- **************************************************************************
- */
-
-#ifndef __MC68360_h
-#define __MC68360_h
-
-/*
- *************************************************************************
- *                         REGISTER SUBBLOCKS                            *
- *************************************************************************
- */
-
-/*
- * Memory controller registers
- */
-typedef struct m360MEMCRegisters_ {
-	rtems_unsigned32	br;
-	rtems_unsigned32	or;
-	rtems_unsigned32	_pad[2];
-} m360MEMCRegisters_t;
-
-/*
- * Serial Communications Controller registers
- */
-typedef struct m360SCCRegisters_ {
-	rtems_unsigned32	gsmr_l;
-	rtems_unsigned32	gsmr_h;
-	rtems_unsigned16	psmr;
-	rtems_unsigned16	_pad0;
-	rtems_unsigned16	todr;
-	rtems_unsigned16	dsr;
-	rtems_unsigned16	scce;
-	rtems_unsigned16	_pad1;
-	rtems_unsigned16	sccm;
-	rtems_unsigned8		_pad2;
-	rtems_unsigned8		sccs;
-	rtems_unsigned32	_pad3[2];
-} m360SCCRegisters_t;
-
-/*
- * Serial Management Controller registers
- */
-typedef struct m360SMCRegisters_ {
-	rtems_unsigned16	_pad0;
-	rtems_unsigned16	smcmr;
-	rtems_unsigned16	_pad1;
-	rtems_unsigned8		smce;
-	rtems_unsigned8		_pad2;
-	rtems_unsigned16	_pad3;
-	rtems_unsigned8		smcm;
-	rtems_unsigned8		_pad4;
-	rtems_unsigned32	_pad5;
-} m360SMCRegisters_t;
-
-
-/*
- *************************************************************************
- *                         Miscellaneous Parameters                      *
- *************************************************************************
- */
-typedef struct m360MiscParms_ {
-	rtems_unsigned16	rev_num;
-	rtems_unsigned16	_res1;
-	rtems_unsigned32	_res2;
-	rtems_unsigned32	_res3;
-} m360MiscParms_t;
-
-/*
- *************************************************************************
- *                              RISC Timers                              *
- *************************************************************************
- */
-typedef struct m360TimerParms_ {
-	rtems_unsigned16	tm_base;
-	rtems_unsigned16	_tm_ptr;
-	rtems_unsigned16	_r_tmr;
-	rtems_unsigned16	_r_tmv;
-	rtems_unsigned32	tm_cmd;
-	rtems_unsigned32	tm_cnt;
-} m360TimerParms_t;
-
-/*
- * RISC Controller Configuration Register (RCCR)
- * All other bits in this register are either reserved or
- * used only with a Motorola-supplied RAM microcode packge.
- */
-#define M360_RCCR_TIME		(1<<15)	/* Enable timer */
-#define M360_RCCR_TIMEP(x)	((x)<<8)	/* Timer period */
-
-/*
- * Command register
- * Set up this register before issuing a M360_CR_OP_SET_TIMER command.
- */
-#define M360_TM_CMD_V		(1<<31)		/* Set to enable timer */
-#define M360_TM_CMD_R		(1<<30)		/* Set for automatic restart */
-#define M360_TM_CMD_TIMER(x)	((x)<<16)	/* Select timer */
-#define M360_TM_CMD_PERIOD(x)	(x)		/* Timer period (16 bits) */
-
-/*
- *************************************************************************
- *                               DMA Controllers                         *
- *************************************************************************
- */
-typedef struct m360IDMAparms_ {
-	rtems_unsigned16	ibase;
-	rtems_unsigned16	ibptr;
-	rtems_unsigned32	_istate;
-	rtems_unsigned32	_itemp;
-} m360IDMAparms_t;
-
-/*
- *************************************************************************
- *                   Serial Communication Controllers                    *
- *************************************************************************
- */
-typedef struct m360SCCparms_ {
-	rtems_unsigned16	rbase;
-	rtems_unsigned16	tbase;
-	rtems_unsigned8		rfcr;
-	rtems_unsigned8		tfcr;
-	rtems_unsigned16	mrblr;
-	rtems_unsigned32	_rstate;
-	rtems_unsigned32	_pad0;
-	rtems_unsigned16	_rbptr;
-	rtems_unsigned16	_pad1;
-	rtems_unsigned32	_pad2;
-	rtems_unsigned32	_tstate;
-	rtems_unsigned32	_pad3;
-	rtems_unsigned16	_tbptr;
-	rtems_unsigned16	_pad4;
-	rtems_unsigned32	_pad5;
-	rtems_unsigned32	_rcrc;
-	rtems_unsigned32	_tcrc;
-	union {
-		struct {
-			rtems_unsigned32	_res0;
-			rtems_unsigned32	_res1;
-			rtems_unsigned16	max_idl;
-			rtems_unsigned16	_idlc;
-			rtems_unsigned16	brkcr;
-			rtems_unsigned16	parec;
-			rtems_unsigned16	frmec;
-			rtems_unsigned16	nosec;
-			rtems_unsigned16	brkec;
-			rtems_unsigned16	brklen;
-			rtems_unsigned16	uaddr[2];
-			rtems_unsigned16	_rtemp;
-			rtems_unsigned16	toseq;
-			rtems_unsigned16	character[8];
-			rtems_unsigned16	rccm;
-			rtems_unsigned16	rccr;
-			rtems_unsigned16	rlbc;
-		} uart;
-	} un;
-} m360SCCparms_t;
-
-typedef struct m360SCCENparms_ {
-	rtems_unsigned16	rbase;
-	rtems_unsigned16	tbase;
-	rtems_unsigned8		rfcr;
-	rtems_unsigned8		tfcr;
-	rtems_unsigned16	mrblr;
-	rtems_unsigned32	_rstate;
-	rtems_unsigned32	_pad0;
-	rtems_unsigned16	_rbptr;
-	rtems_unsigned16	_pad1;
-	rtems_unsigned32	_pad2;
-	rtems_unsigned32	_tstate;
-	rtems_unsigned32	_pad3;
-	rtems_unsigned16	_tbptr;
-	rtems_unsigned16	_pad4;
-	rtems_unsigned32	_pad5;
-	rtems_unsigned32	_rcrc;
-	rtems_unsigned32	_tcrc;
-	union {
-		struct {
-			rtems_unsigned32	_res0;
-			rtems_unsigned32	_res1;
-			rtems_unsigned16	max_idl;
-			rtems_unsigned16	_idlc;
-			rtems_unsigned16	brkcr;
-			rtems_unsigned16	parec;
-			rtems_unsigned16	frmec;
-			rtems_unsigned16	nosec;
-			rtems_unsigned16	brkec;
-			rtems_unsigned16	brklen;
-			rtems_unsigned16	uaddr[2];
-			rtems_unsigned16	_rtemp;
-			rtems_unsigned16	toseq;
-			rtems_unsigned16	character[8];
-			rtems_unsigned16	rccm;
-			rtems_unsigned16	rccr;
-			rtems_unsigned16	rlbc;
-		} uart;
-		struct {
-			rtems_unsigned32	c_pres;
-			rtems_unsigned32	c_mask;
-			rtems_unsigned32	crcec;
-			rtems_unsigned32	alec;
-			rtems_unsigned32	disfc;
-			rtems_unsigned16	pads;
-			rtems_unsigned16	ret_lim;
-			rtems_unsigned16	_ret_cnt;
-			rtems_unsigned16	mflr;
-			rtems_unsigned16	minflr;
-			rtems_unsigned16	maxd1;
-			rtems_unsigned16	maxd2;
-			rtems_unsigned16	_maxd;
-			rtems_unsigned16	dma_cnt;
-			rtems_unsigned16	_max_b;
-			rtems_unsigned16	gaddr1;
-			rtems_unsigned16	gaddr2;
-			rtems_unsigned16	gaddr3;
-			rtems_unsigned16	gaddr4;
-			rtems_unsigned32	_tbuf0data0;
-			rtems_unsigned32	_tbuf0data1;
-			rtems_unsigned32	_tbuf0rba0;
-			rtems_unsigned32	_tbuf0crc;
-			rtems_unsigned16	_tbuf0bcnt;
-			rtems_unsigned16	paddr_h;
-			rtems_unsigned16	paddr_m;
-			rtems_unsigned16	paddr_l;
-			rtems_unsigned16	p_per;
-			rtems_unsigned16	_rfbd_ptr;
-			rtems_unsigned16	_tfbd_ptr;
-			rtems_unsigned16	_tlbd_ptr;
-			rtems_unsigned32	_tbuf1data0;
-			rtems_unsigned32	_tbuf1data1;
-			rtems_unsigned32	_tbuf1rba0;
-			rtems_unsigned32	_tbuf1crc;
-			rtems_unsigned16	_tbuf1bcnt;
-			rtems_unsigned16	_tx_len;
-			rtems_unsigned16	iaddr1;
-			rtems_unsigned16	iaddr2;
-			rtems_unsigned16	iaddr3;
-			rtems_unsigned16	iaddr4;
-			rtems_unsigned16	_boff_cnt;
-			rtems_unsigned16	taddr_l;
-			rtems_unsigned16	taddr_m;
-			rtems_unsigned16	taddr_h;
-		} ethernet;
-	} un;
-} m360SCCENparms_t;
-
-/*
- * Receive and transmit function code register bits
- * These apply to the function code registers of all devices, not just SCC.
- */
-#define M360_RFCR_MOT		(1<<4)
-#define M360_RFCR_DMA_SPACE	0x8
-#define M360_TFCR_MOT		(1<<4)
-#define M360_TFCR_DMA_SPACE	0x8
-
-/*
- *************************************************************************
- *                     Serial Management Controllers                     *
- *************************************************************************
- */
-typedef struct m360SMCparms_ {
-	rtems_unsigned16	rbase;
-	rtems_unsigned16	tbase;
-	rtems_unsigned8		rfcr;
-	rtems_unsigned8		tfcr;
-	rtems_unsigned16	mrblr;
-	rtems_unsigned32	_rstate;
-	rtems_unsigned32	_pad0;
-	rtems_unsigned16	_rbptr;
-	rtems_unsigned16	_pad1;
-	rtems_unsigned32	_pad2;
-	rtems_unsigned32	_tstate;
-	rtems_unsigned32	_pad3;
-	rtems_unsigned16	_tbptr;
-	rtems_unsigned16	_pad4;
-	rtems_unsigned32	_pad5;
-	union {
-		struct {
-			rtems_unsigned16	max_idl;
-			rtems_unsigned16	_pad0;
-			rtems_unsigned16	brklen;
-			rtems_unsigned16	brkec;
-			rtems_unsigned16	brkcr;
-			rtems_unsigned16	_r_mask;
-		} uart;
-		struct {
-			rtems_unsigned16	_pad0[5];
-		} transparent;
-	} un;
-} m360SMCparms_t;
-
-/*
- * Mode register
- */
-#define M360_SMCMR_CLEN(x)		((x)<<11)	/* Character length */
-#define M360_SMCMR_2STOP		(1<<10)	/* 2 stop bits */
-#define M360_SMCMR_PARITY		(1<<9)	/* Enable parity */
-#define M360_SMCMR_EVEN			(1<<8)	/* Even parity */
-#define M360_SMCMR_SM_GCI		(0<<4)	/* GCI Mode */
-#define M360_SMCMR_SM_UART		(2<<4)	/* UART Mode */
-#define M360_SMCMR_SM_TRANSPARENT	(3<<4)	/* Transparent Mode */
-#define M360_SMCMR_DM_LOOPBACK		(1<<2)	/* Local loopback mode */
-#define M360_SMCMR_DM_ECHO		(2<<2)	/* Echo mode */
-#define M360_SMCMR_TEN			(1<<1)	/* Enable transmitter */
-#define M360_SMCMR_REN			(1<<0)	/* Enable receiver */
-
-/*
- * Event and mask registers (SMCE, SMCM)
- */
-#define M360_SMCE_BRK	(1<<4)
-#define M360_SMCE_BSY	(1<<2)
-#define M360_SMCE_TX	(1<<1)
-#define M360_SMCE_RX	(1<<0)
-
-/*
- *************************************************************************
- *                      Serial Peripheral Interface                      *
- *************************************************************************
- */
-typedef struct m360SPIparms_ {
-	rtems_unsigned16	rbase;
-	rtems_unsigned16	tbase;
-	rtems_unsigned8		rfcr;
-	rtems_unsigned8		tfcr;
-	rtems_unsigned16	mrblr;
-	rtems_unsigned32	_rstate;
-	rtems_unsigned32	_pad0;
-	rtems_unsigned16	_rbptr;
-	rtems_unsigned16	_pad1;
-	rtems_unsigned32	_pad2;
-	rtems_unsigned32	_tstate;
-	rtems_unsigned32	_pad3;
-	rtems_unsigned16	_tbptr;
-	rtems_unsigned16	_pad4;
-	rtems_unsigned32	_pad5;
-} m360SPIparms_t;
-
-/*
- * Mode register (SPMODE)
- */
-#define M360_SPMODE_LOOP		(1<<14)	/* Local loopback mode */
-#define M360_SPMODE_CI			(1<<13)	/* Clock invert */
-#define M360_SPMODE_CP			(1<<12)	/* Clock phase */
-#define M360_SPMODE_DIV16		(1<<11)	/* Divide BRGCLK by 16 */
-#define M360_SPMODE_REV			(1<<10)	/* Reverse data */
-#define M360_SPMODE_MASTER		(1<<9)	/* SPI is master */
-#define M360_SPMODE_EN			(1<<8)	/* Enable SPI */
-#define M360_SPMODE_CLEN(x)		((x)<<4)	/* Character length */
-#define M360_SPMODE_PM(x)		(x)	/* Prescaler modulus */
-
-/*
- * Mode register (SPCOM)
- */
-#define M360_SPCOM_STR			(1<<7)	/* Start transmit */
-
-/*
- * Event and mask registers (SPIE, SPIM)
- */
-#define M360_SPIE_MME	(1<<5)		/* Multi-master error */
-#define M360_SPIE_TXE	(1<<4)		/* Tx error */
-#define M360_SPIE_BSY	(1<<2)		/* Busy condition*/
-#define M360_SPIE_TXB	(1<<1)		/* Tx buffer */
-#define M360_SPIE_RXB	(1<<0)		/* Rx buffer */
-
-/*
- *************************************************************************
- *                 SDMA (SCC, SMC, SPI) Buffer Descriptors               *
- *************************************************************************
- */
-typedef struct m360BufferDescriptor_ {
-	rtems_unsigned16	status;
-	rtems_unsigned16	length;
-	volatile void		*buffer;
-} m360BufferDescriptor_t;
-
-/*
- * Bits in receive buffer descriptor status word
- */
-#define M360_BD_EMPTY		(1<<15)	/* Ethernet, SCC UART, SMC UART, SPI */
-#define M360_BD_WRAP		(1<<13)	/* Ethernet, SCC UART, SMC UART, SPI */
-#define M360_BD_INTERRUPT	(1<<12)	/* Ethernet, SCC UART, SMC UART, SPI */
-#define M360_BD_LAST		(1<<11)	/* Ethernet, SPI */
-#define M360_BD_CONTROL_CHAR	(1<<11)	/* SCC UART */
-#define M360_BD_FIRST_IN_FRAME	(1<<10)	/* Ethernet */
-#define M360_BD_ADDRESS		(1<<10)	/* SCC UART */
-#define M360_BD_CONTINUOUS	(1<<9)	/* SCC UART, SMC UART, SPI */
-#define M360_BD_MISS		(1<<8)	/* Ethernet */
-#define M360_BD_IDLE		(1<<8)	/* SCC UART, SMC UART */
-#define M360_BD_ADDRSS_MATCH	(1<<7)	/* SCC UART */
-#define M360_BD_LONG		(1<<5)	/* Ethernet */
-#define M360_BD_BREAK		(1<<5)	/* SCC UART, SMC UART */
-#define M360_BD_NONALIGNED	(1<<4)	/* Ethernet */
-#define M360_BD_FRAMING_ERROR	(1<<4)	/* SCC UART, SMC UART */
-#define M360_BD_SHORT		(1<<3)	/* Ethernet */
-#define M360_BD_PARITY_ERROR	(1<<3)	/* SCC UART, SMC UART */
-#define M360_BD_CRC_ERROR	(1<<2)	/* Ethernet */
-#define M360_BD_OVERRUN		(1<<1)	/* Ethernet, SCC UART, SMC UART, SPI */
-#define M360_BD_COLLISION	(1<<0)	/* Ethernet */
-#define M360_BD_CARRIER_LOST	(1<<0)	/* SCC UART */
-#define M360_BD_MASTER_ERROR	(1<<0)	/* SPI */
-
-/*
- * Bits in transmit buffer descriptor status word
- * Many bits have the same meaning as those in receiver buffer descriptors.
- */
-#define M360_BD_READY		(1<<15)	/* Ethernet, SCC UART, SMC UART, SPI */
-#define M360_BD_PAD		(1<<14)	/* Ethernet */
-#define M360_BD_CTS_REPORT	(1<<11)	/* SCC UART */
-#define M360_BD_TX_CRC		(1<<10)	/* Ethernet */
-#define M360_BD_DEFER		(1<<9)	/* Ethernet */
-#define M360_BD_HEARTBEAT	(1<<8)	/* Ethernet */
-#define M360_BD_PREAMBLE	(1<<8)	/* SCC UART, SMC UART */
-#define M360_BD_LATE_COLLISION	(1<<7)	/* Ethernet */
-#define M360_BD_NO_STOP_BIT	(1<<7)	/* SCC UART */
-#define M360_BD_RETRY_LIMIT	(1<<6)	/* Ethernet */
-#define M360_BD_RETRY_COUNT(x)	(((x)&0x3C)>>2)	/* Ethernet */
-#define M360_BD_UNDERRUN	(1<<1)	/* Ethernet, SPI */
-#define M360_BD_CARRIER_LOST	(1<<0)	/* Ethernet */
-#define M360_BD_CTS_LOST	(1<<0)	/* SCC UART */
-
-/*
- *************************************************************************
- *                           IDMA Buffer Descriptors                     *
- *************************************************************************
- */
-typedef struct m360IDMABufferDescriptor_ {
-	rtems_unsigned16	status;
-	rtems_unsigned16	_pad;
-	rtems_unsigned32	length;
-	void			*source;
-	void			*destination;
-} m360IDMABufferDescriptor_t;
-
-/*
- *************************************************************************
- *       RISC Communication Processor Module Command Register (CR)       *
- *************************************************************************
- */
-#define M360_CR_RST		(1<<15)	/* Reset communication processor */
-#define M360_CR_OP_INIT_RX_TX	(0<<8)	/* SCC, SMC UART, SMC GCI, SPI */
-#define M360_CR_OP_INIT_RX	(1<<8)	/* SCC, SMC UART, SPI */
-#define M360_CR_OP_INIT_TX	(2<<8)	/* SCC, SMC UART, SPI */
-#define M360_CR_OP_INIT_HUNT	(3<<8)	/* SCC, SMC UART */
-#define M360_CR_OP_STOP_TX	(4<<8)	/* SCC, SMC UART */
-#define M360_CR_OP_GR_STOP_TX	(5<<8)	/* SCC */
-#define M360_CR_OP_INIT_IDMA	(5<<8)	/* IDMA */
-#define M360_CR_OP_RESTART_TX	(6<<8)	/* SCC, SMC UART */
-#define M360_CR_OP_CLOSE_RX_BD	(7<<8)	/* SCC, SMC UART, SPI */
-#define M360_CR_OP_SET_GRP_ADDR	(8<<8)	/* SCC */
-#define M360_CR_OP_SET_TIMER	(8<<8)	/* Timer */
-#define M360_CR_OP_GCI_TIMEOUT	(9<<8)	/* SMC GCI */
-#define M360_CR_OP_RESERT_BCS	(10<<8)	/* SCC */
-#define M360_CR_OP_GCI_ABORT	(10<<8)	/* SMC GCI */
-#define M360_CR_CHAN_SCC1	(0<<4)	/* Channel selection */
-#define M360_CR_CHAN_SCC2	(4<<4)
-#define M360_CR_CHAN_SPI	(5<<4)
-#define M360_CR_CHAN_TIMER	(5<<4)
-#define M360_CR_CHAN_SCC3	(8<<4)
-#define M360_CR_CHAN_SMC1	(9<<4)
-#define M360_CR_CHAN_IDMA1	(9<<4)
-#define M360_CR_CHAN_SCC4	(12<<4)
-#define M360_CR_CHAN_SMC2	(13<<4)
-#define M360_CR_CHAN_IDMA2	(13<<4)
-#define M360_CR_FLG		(1<<0)	/* Command flag */
-
-/*
- *************************************************************************
- *                 System Protection Control Register (SYPCR)            *
- *************************************************************************
- */
-#define M360_SYPCR_SWE		(1<<7)  /* Software watchdog enable */
-#define M360_SYPCR_SWRI		(1<<6)  /* Software watchdog reset select */
-#define M360_SYPCR_SWT1		(1<<5)  /* Software watchdog timing bit 1 */
-#define M360_SYPCR_SWT0		(1<<4)  /* Software watchdog timing bit 0 */
-#define M360_SYPCR_DBFE		(1<<3)  /* Double bus fault monitor enable */
-#define M360_SYPCR_BME		(1<<2)  /* Bus monitor external enable */
-#define M360_SYPCR_BMT1		(1<<1)  /* Bus monitor timing bit 1 */
-#define M360_SYPCR_BMT0		(1<<0)  /* Bus monitor timing bit 0 */
-
-/*
- *************************************************************************
- *                        Memory Control Registers                       *
- *************************************************************************
- */
-#define M360_GMR_RCNT(x)	((x)<<24)	/* Refresh count */
-#define M360_GMR_RFEN		(1<<23)	/* Refresh enable */
-#define M360_GMR_RCYC(x)	((x)<<21)	/* Refresh cycle length */
-#define M360_GMR_PGS(x)		((x)<<18)	/* Page size */
-#define M360_GMR_DPS_32BIT	(0<<16)	/* DRAM port size */
-#define M360_GMR_DPS_16BIT	(1<<16)
-#define M360_GMR_DPS_8BIT	(2<<16)
-#define M360_GMR_DPS_DSACK	(3<<16)
-#define M360_GMR_WBT40		(1<<15)	/* Wait between 040 transfers */
-#define M360_GMR_WBTQ		(1<<14)	/* Wait between 360 transfers */
-#define M360_GMR_SYNC		(1<<13)	/* Synchronous external access */
-#define M360_GMR_EMWS		(1<<12)	/* External master wait state */
-#define M360_GMR_OPAR		(1<<11)	/* Odd parity */
-#define M360_GMR_PBEE		(1<<10)	/* Parity bus error enable */
-#define M360_GMR_TSS40		(1<<9)	/* TS* sample for 040 */
-#define M360_GMR_NCS		(1<<8)	/* No CPU space */
-#define M360_GMR_DWQ		(1<<7)	/* Delay write for 360 */
-#define M360_GMR_DW40		(1<<6)	/* Delay write for 040 */
-#define M360_GMR_GAMX		(1<<5)	/* Global address mux enable */
-
-#define M360_MEMC_BR_FC(x)	((x)<<7)	/* Function code limit */
-#define M360_MEMC_BR_TRLXQ	(1<<6)	/* Relax timing requirements */
-#define M360_MEMC_BR_BACK40	(1<<5)	/* Burst acknowledge to 040 */
-#define M360_MEMC_BR_CSNT40	(1<<4)	/* CS* negate timing for 040 */
-#define M360_MEMC_BR_CSNTQ	(1<<3)	/* CS* negate timing for 360 */
-#define M360_MEMC_BR_PAREN	(1<<2)	/* Enable parity checking */
-#define M360_MEMC_BR_WP		(1<<1)	/* Write Protect */
-#define M360_MEMC_BR_V		(1<<0)	/* Base/Option register are valid */
-
-#define M360_MEMC_OR_TCYC(x)	((x)<<28)	/* Cycle length (clocks) */
-#define M360_MEMC_OR_WAITS(x)	M360_MEMC_OR_TCYC((x)+1)
-#define M360_MEMC_OR_2KB	0x0FFFF800	/* Address range */
-#define M360_MEMC_OR_4KB	0x0FFFF000
-#define M360_MEMC_OR_8KB	0x0FFFE000
-#define M360_MEMC_OR_16KB	0x0FFFC000
-#define M360_MEMC_OR_32KB	0x0FFF8000
-#define M360_MEMC_OR_64KB	0x0FFF0000
-#define M360_MEMC_OR_128KB	0x0FFE0000
-#define M360_MEMC_OR_256KB	0x0FFC0000
-#define M360_MEMC_OR_512KB	0x0FF80000
-#define M360_MEMC_OR_1MB	0x0FF00000
-#define M360_MEMC_OR_2MB	0x0FE00000
-#define M360_MEMC_OR_4MB	0x0FC00000
-#define M360_MEMC_OR_8MB	0x0F800000
-#define M360_MEMC_OR_16MB	0x0F000000
-#define M360_MEMC_OR_32MB	0x0E000000
-#define M360_MEMC_OR_64MB	0x0C000000
-#define M360_MEMC_OR_128MB	0x08000000
-#define M360_MEMC_OR_256MB	0x00000000
-#define M360_MEMC_OR_FCMC(x)	((x)<<7)	/* Function code mask */
-#define M360_MEMC_OR_BCYC(x)	((x)<<5)	/* Burst cycle length (clocks) */
-#define M360_MEMC_OR_PGME	(1<<3)		/* Page mode enable */
-#define M360_MEMC_OR_32BIT	(0<<1)		/* Port size */
-#define M360_MEMC_OR_16BIT	(1<<1)
-#define M360_MEMC_OR_8BIT	(2<<1)
-#define M360_MEMC_OR_DSACK	(3<<1)
-#define M360_MEMC_OR_DRAM	(1<<0)		/* Dynamic RAM select */
-
-/*
- *************************************************************************
- *                         SI Mode Register (SIMODE)                     *
- *************************************************************************
- */
-#define M360_SI_SMC2_BITS	0xFFFF0000	/* All SMC2 bits */
-#define M360_SI_SMC2_TDM	(1<<31)	/* Multiplexed SMC2 */
-#define M360_SI_SMC2_BRG1	(0<<28)	/* SMC2 clock souce */
-#define M360_SI_SMC2_BRG2	(1<<28)
-#define M360_SI_SMC2_BRG3	(2<<28)
-#define M360_SI_SMC2_BRG4	(3<<28)
-#define M360_SI_SMC2_CLK5	(0<<28)
-#define M360_SI_SMC2_CLK6	(1<<28)
-#define M360_SI_SMC2_CLK7	(2<<28)
-#define M360_SI_SMC2_CLK8	(3<<28)
-#define M360_SI_SMC1_BITS	0x0000FFFF	/* All SMC1 bits */
-#define M360_SI_SMC1_TDM	(1<<15)	/* Multiplexed SMC1 */
-#define M360_SI_SMC1_BRG1	(0<<12)	/* SMC1 clock souce */
-#define M360_SI_SMC1_BRG2	(1<<12)
-#define M360_SI_SMC1_BRG3	(2<<12)
-#define M360_SI_SMC1_BRG4	(3<<12)
-#define M360_SI_SMC1_CLK1	(0<<12)
-#define M360_SI_SMC1_CLK2	(1<<12)
-#define M360_SI_SMC1_CLK3	(2<<12)
-#define M360_SI_SMC1_CLK4	(3<<12)
-
-/*
- *************************************************************************
- *                  SDMA Configuration Register (SDMA)                   *
- *************************************************************************
- */
-#define M360_SDMA_FREEZE	(2<<13)	/* Freeze on next bus cycle */
-#define M360_SDMA_SISM_7	(7<<8)	/* Normal interrupt service mask */
-#define M360_SDMA_SAID_4	(4<<4)	/* Normal arbitration ID */
-#define M360_SDMA_INTE		(1<<1)	/* SBER interrupt enable */
-#define M360_SDMA_INTB		(1<<0)	/* SBKP interrupt enable */
-
-/*
- *************************************************************************
- *                      Baud (sic) Rate Generators                       *
- *************************************************************************
- */
-#define M360_BRG_RST		(1<<17)		/* Reset generator */
-#define M360_BRG_EN		(1<<16)		/* Enable generator */
-#define M360_BRG_EXTC_BRGCLK	(0<<14)		/* Source is BRGCLK */
-#define M360_BRG_EXTC_CLK2	(1<<14)		/* Source is CLK2 pin */
-#define M360_BRG_EXTC_CLK6	(2<<14)		/* Source is CLK6 pin */
-#define M360_BRG_ATB		(1<<13)		/* Autobaud */
-#define M360_BRG_115200		(13<<1)		/* Assume 25 MHz clock */
-#define M360_BRG_57600		(26<<1)
-#define M360_BRG_38400		(40<<1)
-#define M360_BRG_19200		(80<<1)
-#define M360_BRG_9600		(162<<1)
-#define M360_BRG_4800		(324<<1)
-#define M360_BRG_2400		(650<<1)
-#define M360_BRG_1200		(1301<<1)
-#define M360_BRG_600		(2603<<1)
-#define M360_BRG_300		((324<<1) | 1)
-#define M360_BRG_150		((650<<1) | 1)
-#define M360_BRG_75		((1301<<1) | 1)
-
-/*
- *************************************************************************
- *                 MC68360 DUAL-PORT RAM AND REGISTERS                   *
- *************************************************************************
- */
-typedef struct m360_ {
-	/*
-	 * Dual-port RAM
-	 */
-	rtems_unsigned8		dpram0[0x400];	/* Microcode program */
-	rtems_unsigned8		dpram1[0x200];
-	rtems_unsigned8		dpram2[0x100];	/* Microcode scratch */
-	rtems_unsigned8		dpram3[0x100];	/* Not on REV A or B masks */
-	rtems_unsigned8		_rsv0[0xC00-0x800];
-	m360SCCENparms_t	scc1p;
-	rtems_unsigned8		_rsv1[0xCB0-0xC00-sizeof(m360SCCENparms_t)];
-	m360MiscParms_t		miscp;
-	rtems_unsigned8		_rsv2[0xD00-0xCB0-sizeof(m360MiscParms_t)];
-	m360SCCparms_t		scc2p;
-	rtems_unsigned8		_rsv3[0xD80-0xD00-sizeof(m360SCCparms_t)];
-	m360SPIparms_t		spip;
-	rtems_unsigned8		_rsv4[0xDB0-0xD80-sizeof(m360SPIparms_t)];
-	m360TimerParms_t	tmp;
-	rtems_unsigned8		_rsv5[0xE00-0xDB0-sizeof(m360TimerParms_t)];
-	m360SCCparms_t		scc3p;
-	rtems_unsigned8		_rsv6[0xE70-0xE00-sizeof(m360SCCparms_t)];
-	m360IDMAparms_t		idma1p;
-	rtems_unsigned8		_rsv7[0xE80-0xE70-sizeof(m360IDMAparms_t)];
-	m360SMCparms_t		smc1p;
-	rtems_unsigned8		_rsv8[0xF00-0xE80-sizeof(m360SMCparms_t)];
-	m360SCCparms_t		scc4p;
-	rtems_unsigned8		_rsv9[0xF70-0xF00-sizeof(m360SCCparms_t)];
-	m360IDMAparms_t		idma2p;
-	rtems_unsigned8		_rsv10[0xF80-0xF70-sizeof(m360IDMAparms_t)];
-	m360SMCparms_t		smc2p;
-	rtems_unsigned8		_rsv11[0x1000-0xF80-sizeof(m360SMCparms_t)];
-
-	/*
-	 * SIM Block
-	 */
-	rtems_unsigned32	mcr;
-	rtems_unsigned32	_pad00;
-	rtems_unsigned8		avr;
-	rtems_unsigned8		rsr;
-	rtems_unsigned16	_pad01;
-	rtems_unsigned8		clkocr;
-	rtems_unsigned8		_pad02;
-	rtems_unsigned16	_pad03;
-	rtems_unsigned16	pllcr;
-	rtems_unsigned16	_pad04;
-	rtems_unsigned16	cdvcr;
-	rtems_unsigned16	pepar;
-	rtems_unsigned32	_pad05[2];
-	rtems_unsigned16	_pad06;
-	rtems_unsigned8		sypcr;
-	rtems_unsigned8		swiv;
-	rtems_unsigned16	_pad07;
-	rtems_unsigned16	picr;
-	rtems_unsigned16	_pad08;
-	rtems_unsigned16	pitr;
-	rtems_unsigned16	_pad09;
-	rtems_unsigned8		_pad10;
-	rtems_unsigned8		swsr;
-	rtems_unsigned32	bkar;
-	rtems_unsigned32	bcar;
-	rtems_unsigned32	_pad11[2];
-
-	/*
-	 * MEMC Block
-	 */
-	rtems_unsigned32	gmr;
-	rtems_unsigned16	mstat;
-	rtems_unsigned16	_pad12;
-	rtems_unsigned32	_pad13[2];
-	m360MEMCRegisters_t	memc[8];
-	rtems_unsigned8		_pad14[0xF0-0xD0];
-	rtems_unsigned8		_pad15[0x100-0xF0];
-	rtems_unsigned8		_pad16[0x500-0x100];
-	
-	/*
-	 * IDMA1 Block
-	 */
-	rtems_unsigned16	iccr;
-	rtems_unsigned16	_pad17;
-	rtems_unsigned16	cmr1;
-	rtems_unsigned16	_pad18;
-	rtems_unsigned32	sapr1;
-	rtems_unsigned32	dapr1;
-	rtems_unsigned32	bcr1;
-	rtems_unsigned8		fcr1;
-	rtems_unsigned8		_pad19;
-	rtems_unsigned8		cmar1;
-	rtems_unsigned8		_pad20;
-	rtems_unsigned8		csr1;
-	rtems_unsigned8		_pad21;
-	rtems_unsigned16	_pad22;
-	
-	/*
-	 * SDMA Block
-	 */
-	rtems_unsigned8		sdsr;
-	rtems_unsigned8		_pad23;
-	rtems_unsigned16	sdcr;
-	rtems_unsigned32	sdar;
-	
-	/*
-	 * IDMA2 Block
-	 */
-	rtems_unsigned16	_pad24;
-	rtems_unsigned16	cmr2;
-	rtems_unsigned32	sapr2;
-	rtems_unsigned32	dapr2;
-	rtems_unsigned32	bcr2;
-	rtems_unsigned8		fcr2;
-	rtems_unsigned8		_pad26;
-	rtems_unsigned8		cmar2;
-	rtems_unsigned8		_pad27;
-	rtems_unsigned8		csr2;
-	rtems_unsigned8		_pad28;
-	rtems_unsigned16	_pad29;
-	rtems_unsigned32	_pad30;
-	
-	/*
-	 * CPIC Block
-	 */
-	rtems_unsigned32	cicr;
-	rtems_unsigned32	cipr;
-	rtems_unsigned32	cimr;
-	rtems_unsigned32	cisr;
-
-	/*
-	 * Parallel I/O Block
-	 */
-	rtems_unsigned16	padir;
-	rtems_unsigned16	papar;
-	rtems_unsigned16	paodr;
-	rtems_unsigned16	padat;
-	rtems_unsigned32	_pad31[2];
-	rtems_unsigned16	pcdir;
-	rtems_unsigned16	pcpar;
-	rtems_unsigned16	pcso;
-	rtems_unsigned16	pcdat;
-	rtems_unsigned16	pcint;
-	rtems_unsigned16	_pad32;
-	rtems_unsigned32	_pad33[5];
-	
-	/*
-	 * TIMER Block
-	 */
-	rtems_unsigned16	tgcr;
-	rtems_unsigned16	_pad34;
-	rtems_unsigned32	_pad35[3];
-	rtems_unsigned16	tmr1;
-	rtems_unsigned16	tmr2;
-	rtems_unsigned16	trr1;
-	rtems_unsigned16	trr2;
-	rtems_unsigned16	tcr1;
-	rtems_unsigned16	tcr2;
-	rtems_unsigned16	tcn1;
-	rtems_unsigned16	tcn2;
-	rtems_unsigned16	tmr3;
-	rtems_unsigned16	tmr4;
-	rtems_unsigned16	trr3;
-	rtems_unsigned16	trr4;
-	rtems_unsigned16	tcr3;
-	rtems_unsigned16	tcr4;
-	rtems_unsigned16	tcn3;
-	rtems_unsigned16	tcn4;
-	rtems_unsigned16	ter1;
-	rtems_unsigned16	ter2;
-	rtems_unsigned16	ter3;
-	rtems_unsigned16	ter4;
-	rtems_unsigned32	_pad36[2];
-	
-	/*
-	 * CP Block
-	 */
-	rtems_unsigned16	cr;
-	rtems_unsigned16	_pad37;
-	rtems_unsigned16	rccr;
-	rtems_unsigned16	_pad38;
-	rtems_unsigned32	_pad39[3];
-	rtems_unsigned16	_pad40;
-	rtems_unsigned16	rter;
-	rtems_unsigned16	_pad41;
-	rtems_unsigned16	rtmr;
-	rtems_unsigned32	_pad42[5];
-
-	/*
-	 * BRG Block
-	 */
-	rtems_unsigned32	brgc1;
-	rtems_unsigned32	brgc2;
-	rtems_unsigned32	brgc3;
-	rtems_unsigned32	brgc4;
-
-	/*
-	 * SCC Block
-	 */
-	m360SCCRegisters_t	scc1;
-	m360SCCRegisters_t	scc2;
-	m360SCCRegisters_t	scc3;
-	m360SCCRegisters_t	scc4;
-
-	/*
-	 * SMC Block
-	 */
-	m360SMCRegisters_t	smc1;
-	m360SMCRegisters_t	smc2;
-
-	/*
-	 * SPI Block
-	 */
-	rtems_unsigned16	spmode;
-	rtems_unsigned16	_pad43[2];
-	rtems_unsigned8		spie;
-	rtems_unsigned8		_pad44;
-	rtems_unsigned16	_pad45;
-	rtems_unsigned8		spim;
-	rtems_unsigned8		_pad46[2];
-	rtems_unsigned8		spcom;
-	rtems_unsigned16	_pad47[2];
-
-	/*
-	 * PIP Block
-	 */
-	rtems_unsigned16	pipc;
-	rtems_unsigned16	_pad48;
-	rtems_unsigned16	ptpr;
-	rtems_unsigned32	pbdir;
-	rtems_unsigned32	pbpar;
-	rtems_unsigned16	_pad49;
-	rtems_unsigned16	pbodr;
-	rtems_unsigned32	pbdat;
-	rtems_unsigned32	_pad50[6];
-
-	/*
-	 * SI Block
-	 */
-	rtems_unsigned32	simode;
-	rtems_unsigned8		sigmr;
-	rtems_unsigned8		_pad51;
-	rtems_unsigned8		sistr;
-	rtems_unsigned8		sicmr;
-	rtems_unsigned32	_pad52;
-	rtems_unsigned32	sicr;
-	rtems_unsigned16	_pad53;
-	rtems_unsigned16	sirp[2];
-	rtems_unsigned16	_pad54;
-	rtems_unsigned32	_pad55[2];
-	rtems_unsigned8		siram[256];
-} m360_t;
-
-extern volatile m360_t m360;
-
-#endif /* __MC68360_h */
diff --git a/cpukit/score/cpu/m68k/memcpy.c b/cpukit/score/cpu/m68k/memcpy.c
deleted file mode 100644
index 3948411f4b..0000000000
--- a/cpukit/score/cpu/m68k/memcpy.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- *  C library memcpy routine
- *
- *  This routine has code to optimize performance on the CPU32+
- *  and another version for other 68k machines.
- *
- *  It could be optimized more for machines with MOVE16 instructions.
- *
- *  The routine is placed in this source directory to ensure that it
- *  is picked up by all applications.
- *
- *  W. Eric Norum
- *  Saskatchewan Accelerator Laboratory
- *  University of Saskatchewan
- *  Saskatoon, Saskatchewan, CANADA
- *  eric@skatter.usask.ca
- */
-
-#include <string.h>
-#include <rtems/score/m68k.h>
-
-#if defined(__mcpu32__)
-#define COPYSETUP(n)	n--
-#define COPY(to,from,n,size) \
-	asm volatile ("1:\n" \
-	     "\tmove." size " (%0)+,(%1)+\n" \
-	     "\tdbf %2,1b\n"  \
-	     "\tsub.l #0x10000,%2\n" \
-	     "\tbpl.b 1b\n" : \
-		"=a" (from), "=a" (to), "=d" (n) :\
-		 "0" (from),  "1" (to), "2" (n) : \
-		 "cc", "memory")
-#else
-#define COPYSETUP(n)
-#define COPY(to,from,n,size) \
-	asm volatile ("1:\n" \
-	     "\tmove." size " (%0)+,(%1)+\n" \
-	     "\tsubq.l #1,%2\n\tbne.b 1b\n" : \
-		"=a" (from), "=a" (to), "=d" (n) :\
-		 "0" (from),  "1" (to), "2" (n) : \
-		 "cc", "memory")
-#endif
-
-void *
-memcpy(void *s1, const void *s2, size_t n)
-{
-	char *p1 = s1;
-	const char *p2 = s2;
-
-	if (n) {
-		if (n < 16) {
-			COPYSETUP (n);
-			COPY (p1, p2, n, "b");
-		}
-		else {
-			int nbyte;
-			int nl;
-			nbyte = (int)p1 & 0x3;
-			if (nbyte) {
-				nbyte = 4 - nbyte;
-				n -= nbyte;
-				COPYSETUP (nbyte);
-				COPY (p1, p2, nbyte, "b");
-			}
-#if (M68K_HAS_MISALIGNED == 0)
-			/*
-			 * Take care of machines that can't
-			 * handle misaligned references.
-			 */
-			if ((int)p2 & 0x1) {
-				COPYSETUP (n);
-				COPY (p1, p2, n, "b");
-				return s1;
-			}
-#endif
-			nl = (unsigned int)n >> 2;
-			COPYSETUP (nl);
-			COPY (p1, p2, nl, "l");
-			nbyte = (int)n & 0x3;
-			if (nbyte) {
-				COPYSETUP (nbyte);
-				COPY (p1, p2, nbyte, "b");
-			}
-		}
-	}
-	return s1;
-}
diff --git a/cpukit/score/cpu/m68k/qsm.h b/cpukit/score/cpu/m68k/qsm.h
deleted file mode 100644
index e1bf33bc12..0000000000
--- a/cpukit/score/cpu/m68k/qsm.h
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- *-------------------------------------------------------------------
- *
- *   QSM -- Queued Serial Module
- *
- * The QSM contains two serial interfaces: (a) the queued serial
- * peripheral interface (QSPI) and the serial communication interface
- * (SCI). The QSPI provides peripheral expansion and/or interprocessor
- * communication through a full-duplex, synchronous, three-wire bus. A
- * self contained RAM queue permits serial data transfers without CPU
- * intervention and automatic continuous sampling. The SCI provides a
- * standard non-return to zero mark/space format with wakeup functions
- * to allow the CPU to run uninterrupted until woken
- *
- * For more information, refer to Motorola's "Modular Microcontroller
- * Family Queued Serial Module Reference Manual" (Motorola document
- * QSMRM/AD). 
- *
- * This file has been created by John S. Gwynne for support of 
- * Motorola's 68332 MCU in the efi332 project.
- * 
- * Redistribution and use in source and binary forms are permitted
- * provided that the following conditions are met:
- * 1. Redistribution of source code and documentation must retain
- *    the above authorship, this list of conditions and the
- *    following disclaimer.
- * 2. The name of the author may not be used to endorse or promote
- *    products derived from this software without specific prior
- *    written permission.
- *
- * This software is provided "AS IS" without warranty of any kind,
- * either expressed or implied, including, but not limited to, the
- * implied warranties of merchantability, title and fitness for a
- * particular purpose.
- *
- *------------------------------------------------------------------
- *
- *  $Id$
- */
-
-#ifndef _QSM_H_
-#define _QSM_H_
-
-
-#include <efi332.h>
-
-
-/* SAM-- shift and mask */
-#undef  SAM
-#define SAM(a,b,c) ((a << b) & c)
-
-
-/* QSM_CRB (QSM Control Register Block) base address of the QSM
-   control registers */
-#if SIM_MM == 0
-#define QSM_CRB 0x7ffc00
-#else
-#undef SIM_MM
-#define SIM_MM 1
-#define QSM_CRB 0xfffc00
-#endif 
-
-
-#define QSMCR (volatile unsigned short int * const)(0x00 + QSM_CRB)
-				/* QSM Configuration Register */
-#define    STOP 0x8000		/*    Stop Enable */
-#define    FRZ  0x6000		/*    Freeze Control */
-#define    SUPV 0x0080		/*    Supervisor/Unrestricted */
-#define	   IARB 0x000f		/*    Inerrupt Arbitration */
-
-
-#define QTEST (volatile unsigned short int * const)(0x02 + QSM_CRB)
-				/* QSM Test Register */
-/* Used only for factor testing */
-
-
-#define QILR (volatile unsigned char * const)(0x04 + QSM_CRB)
-				/* QSM Interrupt Level Register */
-#define    ILQSPI 0x38		/*    Interrupt Level for QSPI */
-#define    ILSCI  0x07		/*    Interrupt Level for SCI */
-
-
-#define QIVR (volatile unsigned char * const)(0x05 + QSM_CRB)
-				/* QSM Interrupt Vector Register */
-#define    INTV   0xff		/*    Interrupt Vector Number */
-
-
-#define SCCR0 (volatile unsigned short int * const)(0x08 + QSM_CRB)
-				/* SCI Control Register 0 */
-#define    SCBR   0x1fff	/*    SCI Baud Rate */
-
-
-#define SCCR1 (volatile unsigned short int * const)(0x0a + QSM_CRB)
-				/* SCI Control Register 1 */
-#define    LOOPS  0x4000	/*    Loop Mode */
-#define    WOMS   0x2000	/*    Wired-OR Mode for SCI Pins */
-#define    ILT    0x1000	/*    Idle-Line Detect Type */
-#define    PT     0x0800	/*    Parity Type */
-#define    PE     0x0400	/*    Parity Enable */
-#define    M      0x0200	/*    Mode Select */
-#define    WAKE   0x0100	/*    Wakeup by Address Mark */
-#define    TIE    0x0080	/*    Transmit Complete Interrupt Enable */
-#define    TCIE   0x0040	/*    Transmit Complete Interrupt Enable */
-#define    RIE    0x0020	/*    Receiver Interrupt Enable */
-#define    ILIE   0x0010	/*    Idle-Line Interrupt Enable */
-#define    TE     0x0008	/*    Transmitter Enable */
-#define    RE     0x0004	/*    Receiver Enable */
-#define    RWU    0x0002	/*    Receiver Wakeup */
-#define    SBK    0x0001	/*    Send Break */
-
-
-#define SCSR (volatile unsigned short int * const)(0x0c + QSM_CRB)
-				/* SCI Status Register */
-#define    TDRE   0x0100	/*    Transmit Data Register Empty */
-#define    TC     0x0080	/*    Transmit Complete */
-#define    RDRF   0x0040	/*    Receive Data Register Full */
-#define    RAF    0x0020	/*    Receiver Active */
-#define    IDLE   0x0010	/*    Idle-Line Detected */
-#define    OR     0x0008	/*    Overrun Error */
-#define    NF     0x0004	/*    Noise Error Flag */
-#define    FE     0x0002	/*    Framing Error */
-#define    PF     0x0001	/*    Parity Error */
-
-
-#define SCDR (volatile unsigned short int * const)(0x0e + QSM_CRB)
-				/* SCI Data Register */
-
-
-#define PORTQS (volatile unsigned char * const)(0x15 + QSM_CRB)
-				/* Port QS Data Register */
-
-#define PQSPAR (volatile unsigned char * const)(0x16 + QSM_CRB)
-				/* PORT QS Pin Assignment Rgister */
-/* Any bit cleared (zero) defines the corresponding pin to be an I/O
-   pin. Any bit set defines the corresponding pin to be a QSPI
-   signal. */
-/* note: PQS2 is a digital I/O pin unless the SPI is enabled in which
-   case it becomes the SPI serial clock SCK. */
-/* note: PQS7 is a digital I/O pin unless the SCI transmitter is
-   enabled in which case it becomes the SCI serial output TxD. */
-#define QSMFun 0x0
-#define QSMDis 0x1
-/*
- * PQSPAR Field     | QSM Function | Discrete I/O pin
- *------------------+--------------+------------------   */
-#define PQSPA0   0  /*   MISO      |      PQS0           */
-#define PQSPA1   1  /*   MOSI      |      PQS1           */
-#define PQSPA2   2  /*   SCK       |      PQS2 (see note)*/
-#define PQSPA3   3  /*   PCSO/!SS  |      PQS3           */
-#define PQSPA4   4  /*   PCS1      |      PQS4           */
-#define PQSPA5   5  /*   PCS2      |      PQS5           */
-#define PQSPA6   6  /*   PCS3      |      PQS6           */
-#define PQSPA7   7  /*   TxD       |      PQS7 (see note)*/
-
-
-#define DDRQS  (volatile unsigned char * const)(0x17 + QSM_CRB)
-				/* PORT QS Data Direction Register */
-/* Clearing a bit makes the corresponding pin an input; setting a bit
-   makes the pin an output. */
-
-
-#define SPCR0 (volatile unsigned short int * const)(0x18 + QSM_CRB)
-				/* QSPI Control Register 0 */
-#define    MSTR   0x8000	/*    Master/Slave Mode Select */
-#define    WOMQ   0x4000	/*    Wired-OR Mode for QSPI Pins */
-#define    BITS   0x3c00	/*    Bits Per Transfer */
-#define    CPOL   0x0200	/*    Clock Polarity */
-#define    CPHA   0x0100	/*    Clock Phase */
-#define    SPBR   0x00ff	/*    Serial Clock Baud Rate */
-
-
-#define SPCR1 (volatile unsigned short int * const)(0x1a + QSM_CRB)
-				/* QSPI Control Register 1 */
-#define    SPE    0x8000	/*    QSPI Enable */
-#define    DSCKL  0x7f00	/*    Delay before SCK */
-#define    DTL    0x00ff	/*    Length of Delay after Transfer */
-
-
-#define SPCR2 (volatile unsigned short int * const)(0x1c + QSM_CRB)
-				/* QSPI Control Register 2 */
-#define    SPIFIE 0x8000	/*    SPI Finished Interrupt Enable */
-#define    WREN   0x4000	/*    Wrap Enable */
-#define    WRTO   0x2000	/*    Wrap To */
-#define    ENDQP  0x0f00	/*    Ending Queue Pointer */
-#define    NEWQP  0x000f	/*    New Queue Pointer Value */
-
-
-#define SPCR3 (volatile unsigned char * const)(0x1e + QSM_CRB)
-				/* QSPI Control Register 3 */
-#define    LOOPQ  0x0400	/*    QSPI Loop Mode */
-#define    HMIE   0x0200	/*    HALTA and MODF Interrupt Enable */
-#define    HALT   0x0100	/*    Halt */
-
-
-#define SPSR (volatile unsigned char * const)(0x1f + QSM_CRB)
-				/* QSPI Status Register */
-#define    SPIF   0x0080	/*    QSPI Finished Flag */
-#define    MODF   0x0040	/*    Mode Fault Flag */
-#define    HALTA  0x0020	/*    Halt Acknowlwdge Flag */
-#define    CPTQP  x0000f	/*    Completed Queue Pointer */
-
-#define QSPIRR (volatile unsigned char * const)(0x100 + QSM_CRB)
-				/* QSPI Receive Data RAM */
-#define QSPITR (volatile unsigned char * const)(0x120 + QSM_CRB)
-				/* QSPI Transmit Data RAM */
-#define QSPIcR (volatile unsigned char * const)(0x140 + QSM_CRB)
-				/* QSPI Command RAM */
-
-#endif /* _QSM_H_ */
diff --git a/cpukit/score/cpu/m68k/rtems/asm.h b/cpukit/score/cpu/m68k/rtems/asm.h
deleted file mode 100644
index 456b213cb2..0000000000
--- a/cpukit/score/cpu/m68k/rtems/asm.h
+++ /dev/null
@@ -1,144 +0,0 @@
-/*  asm.h
- *
- *  This include file attempts to address the problems
- *  caused by incompatible flavors of assemblers and
- *  toolsets.  It primarily addresses variations in the
- *  use of leading underscores on symbols and the requirement
- *  that register names be preceded by a %.
- *
- *
- *  NOTE: The spacing in the use of these macros
- *        is critical to them working as advertised.
- *
- *  COPYRIGHT:
- *
- *  This file is based on similar code found in newlib available
- *  from ftp.cygnus.com.  The file which was used had no copyright
- *  notice.  This file is freely distributable as long as the source
- *  of the file is noted.  This file is:
- *
- *  COPYRIGHT (c) 1994-1997.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  $Id$
- */
-
-#ifndef __M68k_ASM_h
-#define __M68k_ASM_h
-
-/*
- *  Indicate we are in an assembly file and get the basic CPU definitions.
- */
-
-#ifndef ASM
-#define ASM
-#endif
-#include <rtems/score/targopts.h>
-#include <rtems/score/cpu.h>
-
-/*
- *  Recent versions of GNU cpp define variables which indicate the
- *  need for underscores and percents.  If not using GNU cpp or
- *  the version does not support this, then you will obviously
- *  have to define these as appropriate.
- */
-
-#ifndef __USER_LABEL_PREFIX__
-#define __USER_LABEL_PREFIX__ _
-#endif
-
-#ifndef __REGISTER_PREFIX__
-#define __REGISTER_PREFIX__
-#endif
-
-/* ANSI concatenation macros.  */
-
-#define CONCAT1(a, b) CONCAT2(a, b)
-#define CONCAT2(a, b) a ## b
-
-/* Use the right prefix for global labels.  */
-
-#define SYM(x) CONCAT1 (__USER_LABEL_PREFIX__, x)
-
-/* Use the right prefix for registers.  */
-
-#define REG(x) CONCAT1 (__REGISTER_PREFIX__, x)
-
-#define d0 REG (d0)
-#define d1 REG (d1)
-#define d2 REG (d2)
-#define d3 REG (d3)
-#define d4 REG (d4)
-#define d5 REG (d5)
-#define d6 REG (d6)
-#define d7 REG (d7)
-#define a0 REG (a0)
-#define a1 REG (a1)
-#define a2 REG (a2)
-#define a3 REG (a3)
-#define a4 REG (a4)
-#define a5 REG (a5)
-#define a6 REG (a6)
-#define a7 REG (a7)
-#define sp REG (sp)
-
-#define msp REG (msp)
-#define usp REG (usp)
-#define isp REG (isp)
-#define sr  REG (sr)
-#define vbr REG (vbr)
-#define dfc REG (dfc)
-#define sfc REG (sfc)
-
-/* mcf52xx special regs */
-#define cacr    REG (cacr)
-#define acr0    REG (acr0)
-#define acr1    REG (acr1)
-#define rambar0 REG (rambar0)
-#define mbar    REG (mbar)
-
-
-#define fp0 REG (fp0)
-#define fp1 REG (fp1)
-#define fp2 REG (fp2)
-#define fp3 REG (fp3)
-#define fp4 REG (fp4)
-#define fp5 REG (fp5)
-#define fp6 REG (fp6)
-#define fp7 REG (fp7)
-
-#define fpc REG (fpc)
-#define fpi REG (fpi)
-#define fps REG (fps)
-#define fpsr REG (fpsr)
-
-
-/*
- *  Define macros to handle section beginning and ends.
- */
-
-
-#define BEGIN_CODE_DCL .text
-#define END_CODE_DCL
-#define BEGIN_DATA_DCL .data
-#define END_DATA_DCL
-#define BEGIN_CODE .text
-#define END_CODE
-#define BEGIN_DATA .data
-#define END_DATA
-#define BEGIN_BSS .bss
-#define END_BSS
-#define END
-
-/*
- *  Following must be tailor for a particular flavor of the C compiler.
- *  They may need to put underscores in front of the symbols.
- */
-
-#define PUBLIC(sym) .globl SYM (sym)
-#define EXTERN(sym) .globl SYM (sym)
-
-#endif
-/* end of include file */
-
-
diff --git a/cpukit/score/cpu/m68k/rtems/m68k/m68302.h b/cpukit/score/cpu/m68k/rtems/m68k/m68302.h
deleted file mode 100644
index 084ceac034..0000000000
--- a/cpukit/score/cpu/m68k/rtems/m68k/m68302.h
+++ /dev/null
@@ -1,661 +0,0 @@
-/*
- *------------------------------------------------------------------
- *
- *	m68302.h - Definitions for Motorola MC68302 processor.
- *
- * Section references in this file refer to revision 2 of Motorola's
- * "MC68302 Integrated Multiprotocol Processor User's Manual".
- * (Motorola document MC68302UM/AD REV 2.)
- *
- * Based on Don Meyer's cpu68302.h that was posted in comp.sys.m68k
- * on 17 February, 1993.
- *
- * Copyright 1995 David W. Glessner.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the following conditions are met:
- * 1. Redistribution of source code and documentation must retain
- *    the above copyright notice, this list of conditions and the
- *    following disclaimer.
- * 2. The name of the author may not be used to endorse or promote
- *    products derived from this software without specific prior
- *    written permission.
- *
- * This software is provided "AS IS" without warranty of any kind,
- * either expressed or implied, including, but not limited to, the
- * implied warranties of merchantability, title and fitness for a
- * particular purpose.
- *
- *
- *  $Id$
- *
- *------------------------------------------------------------------
- */
-
-#ifndef __MOTOROLA_MC68302_DEFINITIONS_h
-#define __MOTOROLA_MC68302_DEFINITIONS_h
-
-/*
- * BAR - Base Address Register
- * Section 2.7
- */
-#define M302_BAR	(*((volatile rtems_unsigned16 *) 0xf2))
-
-/*
- * SCR - System Control Register
- * Section 3.8.1
- */
-#define M302_SCR	(*((volatile rtems_unsigned32 *) 0xf4))
-/*
- * SCR bits
- */
-#define RBIT_SCR_IPA		0x08000000
-#define RBIT_SCR_HWT		0x04000000
-#define RBIT_SCR_WPV		0x02000000
-#define RBIT_SCR_ADC		0x01000000
-
-#define RBIT_SCR_ERRE		0x00400000
-#define RBIT_SCR_VGE		0x00200000
-#define RBIT_SCR_WPVE		0x00100000
-#define RBIT_SCR_RMCST		0x00080000
-#define RBIT_SCR_EMWS		0x00040000
-#define RBIT_SCR_ADCE		0x00020000
-#define RBIT_SCR_BCLM		0x00010000
-
-#define RBIT_SCR_FRZW		0x00008000
-#define RBIT_SCR_FRZ2		0x00004000
-#define RBIT_SCR_FRZ1		0x00002000
-#define RBIT_SCR_SAM		0x00001000
-#define RBIT_SCR_HWDEN		0x00000800
-#define RBIT_SCR_HWDCN2		0x00000400
-#define RBIT_SCR_HWDCN1		0x00000200  /* 512 clocks */
-#define RBIT_SCR_HWDCN0		0x00000100  /* 128 clocks */
-
-#define RBIT_SCR_LPREC		0x00000080
-#define RBIT_SCR_LPP16		0x00000040
-#define RBIT_SCR_LPEN		0x00000020
-#define RBIT_SCR_LPCLKDIV	0x0000001f
-
-
-/*
- * 68000 interrupt and trap vector numbers
- */
-#define M68K_IVEC_BUS_ERROR		 2
-#define M68K_IVEC_ADDRESS_ERROR		 3
-#define M68K_IVEC_ILLEGAL_OPCODE	 4
-#define M68K_IVEC_ZERO_DIVIDE		 5
-#define M68K_IVEC_CHK			 6
-#define M68K_IVEC_TRAPV			 7
-#define M68K_IVEC_PRIVILEGE		 8
-#define M68K_IVEC_TRACE			 9
-#define M68K_IVEC_LINE_A		10
-#define M68K_IVEC_LINE_F		11
-/*	Unassigned, Reserved		12-14 */
-#define M68K_IVEC_UNINITIALIZED_INT	15
-/*	Unassigned, Reserved		16-23 */
-#define M68K_IVEC_SPURIOUS_INT		24
-
-#define M68K_IVEC_LEVEL1_AUTOVECTOR	25
-#define M68K_IVEC_LEVEL2_AUTOVECTOR	26
-#define M68K_IVEC_LEVEL3_AUTOVECTOR	27
-#define M68K_IVEC_LEVEL4_AUTOVECTOR	28
-#define M68K_IVEC_LEVEL5_AUTOVECTOR	29
-#define M68K_IVEC_LEVEL6_AUTOVECTOR	30
-#define M68K_IVEC_LEVEL7_AUTOVECTOR	31
-
-#define M68K_IVEC_TRAP0			32
-#define M68K_IVEC_TRAP1			33
-#define M68K_IVEC_TRAP2			34
-#define M68K_IVEC_TRAP3			35
-#define M68K_IVEC_TRAP4			36
-#define M68K_IVEC_TRAP5			37
-#define M68K_IVEC_TRAP6			38
-#define M68K_IVEC_TRAP7			39
-#define M68K_IVEC_TRAP8			40
-#define M68K_IVEC_TRAP9			41
-#define M68K_IVEC_TRAP10		42
-#define M68K_IVEC_TRAP11		43
-#define M68K_IVEC_TRAP12		44
-#define M68K_IVEC_TRAP13		45
-#define M68K_IVEC_TRAP14		46
-#define M68K_IVEC_TRAP15		47
-/*
- *	Unassigned, Reserved		48-59
- *
- * Note: Vectors 60-63 are used by the MC68302 (e.g. BAR, SCR).
- */
-
-/*
- * MC68302 Interrupt Vectors
- * Section 3.2
- */
-enum m68302_ivec_e {
-    M302_IVEC_ERR	=0,
-    M302_IVEC_PB8	=1,	/* General-Purpose Interrupt 0 */
-    M302_IVEC_SMC2	=2,
-    M302_IVEC_SMC1	=3,
-    M302_IVEC_TIMER3	=4,
-    M302_IVEC_SCP	=5,
-    M302_IVEC_TIMER2	=6,
-    M302_IVEC_PB9	=7,	/* General-Purpose Interrupt 1 */
-    M302_IVEC_SCC3	=8,
-    M302_IVEC_TIMER1	=9,
-    M302_IVEC_SCC2	=10,
-    M302_IVEC_IDMA	=11,
-    M302_IVEC_SDMA	=12,	/* SDMA Channels Bus Error */
-    M302_IVEC_SCC1	=13,
-    M302_IVEC_PB10	=14,	/* General-Purpose Interrupt 2 */
-    M302_IVEC_PB11	=15,	/* General-Purpose Interrupt 3 */
-    M302_IVEC_IRQ1	=17,	/* External Device */
-    M302_IVEC_IRQ6	=22,	/* External Device */
-    M302_IVEC_IRQ7	=23	/* External Device */
-};
-
-
-/*
- * GIMR - Global Interrupt Mode Register
- * Section 3.2.5.1
- */
-#define RBIT_GIMR_MOD		(1<<15)
-#define RBIT_GIMR_IV7		(1<<14)
-#define RBIT_GIMR_IV6		(1<<13)
-#define RBIT_GIMR_IV1		(1<<12)
-#define RBIT_GIMR_ET7		(1<<10)
-#define RBIT_GIMR_ET6		(1<<9)
-#define RBIT_GIMR_ET1		(1<<8)
-#define RBIT_GIMR_VECTOR	(7<<5)
-
-/*
- * IPR - Interrupt Pending Register    (Section 3.2.5.2)
- * IMR - Interrupt Mask Register       (Section 3.2.5.3)
- * ISR - Interrupt In-Service Register (Section 3.2.5.4)
- */
-#define RBIT_IPR_PB11		(1<<15)
-#define RBIT_IPR_PB10		(1<<14)
-#define RBIT_IPR_SCC1		(1<<13)
-#define RBIT_IPR_SDMA		(1<<12)
-#define RBIT_IPR_IDMA		(1<<11)
-#define RBIT_IPR_SCC2		(1<<10)
-#define RBIT_IPR_TIMER1		(1<<9)
-#define RBIT_IPR_SCC3		(1<<8)
-#define RBIT_IPR_PB9		(1<<7)
-#define RBIT_IPR_TIMER2		(1<<6)
-#define RBIT_IPR_SCP		(1<<5)
-#define RBIT_IPR_TIMER3		(1<<4)
-#define RBIT_IPR_SMC1		(1<<3)
-#define RBIT_IPR_SMC2		(1<<2)
-#define RBIT_IPR_PB8		(1<<1)
-#define RBIT_IPR_ERR		(1<<0)
-
-#define RBIT_ISR_PB11		(1<<15)
-#define RBIT_ISR_PB10		(1<<14)
-#define RBIT_ISR_SCC1		(1<<13)
-#define RBIT_ISR_SDMA		(1<<12)
-#define RBIT_ISR_IDMA		(1<<11)
-#define RBIT_ISR_SCC2		(1<<10)
-#define RBIT_ISR_TIMER1		(1<<9)
-#define RBIT_ISR_SCC3		(1<<8)
-#define RBIT_ISR_PB9		(1<<7)
-#define RBIT_ISR_TIMER2		(1<<6)
-#define RBIT_ISR_SCP		(1<<5)
-#define RBIT_ISR_TIMER3		(1<<4)
-#define RBIT_ISR_SMC1		(1<<3)
-#define RBIT_ISR_SMC2		(1<<2)
-#define RBIT_ISR_PB8		(1<<1)
-
-#define RBIT_IMR_PB11		(1<<15)		/* PB11   Interrupt Mask */
-#define RBIT_IMR_PB10		(1<<14)		/* PB10   Interrupt Mask */
-#define RBIT_IMR_SCC1		(1<<13)		/* SCC1   Interrupt Mask */
-#define RBIT_IMR_SDMA		(1<<12)		/* SDMA   Interrupt Mask */
-#define RBIT_IMR_IDMA		(1<<11)		/* IDMA   Interrupt Mask */
-#define RBIT_IMR_SCC2		(1<<10)		/* SCC2   Interrupt Mask */
-#define RBIT_IMR_TIMER1		(1<<9)		/* TIMER1 Interrupt Mask */
-#define RBIT_IMR_SCC3		(1<<8)		/* SCC3   Interrupt Mask */
-#define RBIT_IMR_PB9		(1<<7)		/* PB9    Interrupt Mask */
-#define RBIT_IMR_TIMER2		(1<<6)		/* TIMER2 Interrupt Mask */
-#define RBIT_IMR_SCP		(1<<5)		/* SCP    Interrupt Mask */
-#define RBIT_IMR_TIMER3		(1<<4)		/* TIMER3 Interrupt Mask */
-#define RBIT_IMR_SMC1		(1<<3)		/* SMC1   Interrupt Mask */
-#define RBIT_IMR_SMC2		(1<<2)		/* SMC2   Interrupt Mask */
-#define RBIT_IMR_PB8		(1<<1)		/* PB8    Interrupt Mask */
-
-
-/*
- * DRAM Refresh
- * Section 3.9
- *
- * The DRAM refresh memory map replaces the SCC2 Tx BD 6 and Tx BD 7
- * structures in the parameter RAM.
- *
- * Access to the DRAM registers can be accomplished by 
- * the following approach:
- *
- *	volatile m302_DRAM_refresh_t *dram;
- *	dram = (volatile m302_DRAM_refresh_t *) &m302.scc2.bd.tx[6];
- *
- * Then simply use pointer references (e.g. dram->count = 3).
- */
-typedef struct {
-    rtems_unsigned16	dram_high;	/* DRAM high address and FC */
-    rtems_unsigned16	dram_low;	/* DRAM low address */
-    rtems_unsigned16	increment;	/* increment step (bytes/row) */
-    rtems_unsigned16	count;		/* RAM refresh cycle count (#rows) */
-    rtems_unsigned16	t_ptr_h;	/* temporary refresh high addr & FC */
-    rtems_unsigned16	t_ptr_l;	/* temporary refresh low address */
-    rtems_unsigned16	t_count;	/* temporary refresh cycles count */
-    rtems_unsigned16	res;		/* reserved */
-} m302_DRAM_refresh_t;
-
-
-/*
- * TMR - Timer Mode Register (for timers 1 and 2)
- * Section 3.5.2.1
- */
-#define RBIT_TMR_ICLK_STOP	(0<<1)
-#define RBIT_TMR_ICLK_MASTER	(1<<1)
-#define RBIT_TMR_ICLK_MASTER16	(2<<1)
-#define RBIT_TMR_ICLK_TIN	(3<<1)
-
-#define RBIT_TMR_OM		(1<<5)
-#define RBIT_TMR_ORI		(1<<4)
-#define RBIT_TMR_FRR		(1<<3)
-#define RBIT_TMR_RST		(1<<0)
-
-
-/*
- * TER - Timer Event Register (for timers 1 and 2)
- * Section 3.5.2.5
- */
-#define RBIT_TER_REF	(1<<1)		/* Output Reference Event */
-#define RBIT_TER_CAP	(1<<0)		/* Capture Event */
-
-
-/*
- * SCC Buffer Descriptors and Buffer Descriptors Table
- * Section 4.5.5
- */
-typedef struct m302_SCC_bd {
-    rtems_unsigned16 status;		/* status and control */
-    rtems_unsigned16 length;		/* data length */
-    rtems_unsigned8  *buffer;		/* data buffer pointer */
-} m302_SCC_bd_t;
-
-typedef struct {
-    m302_SCC_bd_t	rx[8];		/* receive buffer descriptors */
-    m302_SCC_bd_t	tx[8];		/* transmit buffer descriptors */
-} m302_SCC_bd_table_t;
-
-
-/*
- * SCC Parameter RAM (offset 0x080 from an SCC Base)
- * Section 4.5.6
- *
- * Each SCC parameter RAM area begins at offset 0x80 from each SCC base
- * area (0x400, 0x500, or 0x600 from the dual-port RAM base).
- *
- * Offsets 0x9c-0xbf from each SCC base area compose the protocol-specific
- * portion of the SCC parameter RAM.
- */
-typedef struct {
-    rtems_unsigned8	rfcr;		/* Rx Function Code */
-    rtems_unsigned8	tfcr;		/* Tx Function Code */
-    rtems_unsigned16	mrblr;		/* Maximum Rx Buffer Length */
-    rtems_unsigned16	_rstate;	/* Rx Internal State */
-    rtems_unsigned8	res2;
-    rtems_unsigned8	rbd;		/* Rx Internal Buffer Number */
-    rtems_unsigned32	_rdptr;		/* Rx Internal Data Pointer */
-    rtems_unsigned16	_rcount;	/* Rx Internal Byte Count */
-    rtems_unsigned16	_rtmp;		/* Rx Temp */
-    rtems_unsigned16	_tstate;	/* Tx Internal State */
-    rtems_unsigned8	res7;
-    rtems_unsigned8	tbd;		/* Tx Internal Buffer Number */
-    rtems_unsigned32	_tdptr;		/* Tx Internal Data Pointer */
-    rtems_unsigned16	_tcount;	/* Tx Internal Byte Count */
-    rtems_unsigned16	_ttmp;		/* Tx Temp */
-} m302_SCC_parameters_t;
-
-/*
- * UART-Specific SCC Parameter RAM
- * Section 4.5.11.3
- */
-typedef struct {
-    rtems_unsigned16	max_idl;	/* Maximum IDLE Characters (rx) */
-    rtems_unsigned16	idlc;		/* Temporary rx IDLE counter */
-    rtems_unsigned16	brkcr;		/* Break Count Register (tx) */
-    rtems_unsigned16	parec;		/* Receive Parity Error Counter */
-    rtems_unsigned16	frmec;		/* Receive Framing Error Counter */
-    rtems_unsigned16	nosec;		/* Receive Noise Counter */
-    rtems_unsigned16	brkec;		/* Receive Break Condition Counter */
-    rtems_unsigned16	uaddr1;		/* UART ADDRESS Character 1 */
-    rtems_unsigned16	uaddr2;		/* UART ADDRESS Character 2 */
-    rtems_unsigned16	rccr;		/* Receive Control Character Register */
-    rtems_unsigned16	character[8];	/* Control Characters 1 through 8*/
-} m302_SCC_UartSpecific_t;
-/*
- *  This definition allows for the checking of receive buffers
- *  for errors.
- */
-
-#define RCV_ERR    0x003F
-
-/*
- * UART receive buffer descriptor bit definitions.
- * Section 4.5.11.14
- */
-#define RBIT_UART_CTRL   (1<<11)	/* buffer contains a control char */
-#define RBIT_UART_ADDR   (1<<10)	/* first byte contains an address */
-#define RBIT_UART_MATCH  (1<<9)		/* indicates which addr char matched */
-#define RBIT_UART_IDLE   (1<<8)		/* buffer closed due to IDLE sequence */
-#define RBIT_UART_BR     (1<<5)		/* break sequence was received */
-#define RBIT_UART_FR     (1<<4)		/* framing error was received */
-#define RBIT_UART_PR     (1<<3)		/* parity error was received */
-#define RBIT_UART_OV     (1<<1)		/* receiver overrun occurred */
-#define RBIT_UART_CD     (1<<0)		/* carrier detect lost */
-#define RBIT_UART_STATUS 0x003B		/* all status bits */
-
-/*
- * UART transmit buffer descriptor bit definitions.
- * Section 4.5.11.15
- */
-#define RBIT_UART_CR       (1<<11)	/* clear-to-send report
-					 * this results in two idle bits
-					 * between back-to-back frames
-					 */
-#define RBIT_UART_A        (1<<10)	/* buffer contains address characters
-					 * only valid in multidrop mode (UM0=1)
-					 */
-#define RBIT_UART_PREAMBLE (1<<9)	/* send preamble before data */
-#define RBIT_UART_CTS_LOST (1<<0)	/* CTS lost */
-
-/*
- * UART event register
- * Section 4.5.11.16
- */
-#define M302_UART_EV_CTS   (1<<7)	/* CTS status changed */
-#define M302_UART_EV_CD    (1<<6)	/* carrier detect status changed */
-#define M302_UART_EV_IDL   (1<<5)	/* IDLE sequence status changed */
-#define M302_UART_EV_BRK   (1<<4)	/* break character was received */
-#define M302_UART_EV_CCR   (1<<3)	/* control character received */
-#define M302_UART_EV_TX    (1<<1)	/* buffer has been transmitted */
-#define M302_UART_EV_RX    (1<<0)	/* buffer has been received */
-
-
-/*
- * HDLC-Specific SCC Parameter RAM
- * Section 4.5.12.3
- *
- * c_mask_l should be 0xF0B8 for 16-bit CRC, 0xdebb for 32-bit CRC
- * c_mask_h is a don't care  for 16-bit CRC, 0x20E2 for 32-bit CRC
- */
-typedef struct {
-    rtems_unsigned16	rcrc_l;		/* Temp Receive CRC Low */
-    rtems_unsigned16	rcrc_h;		/* Temp Receive CRC High */
-    rtems_unsigned16	c_mask_l;	/* CRC Mask Low */
-    rtems_unsigned16	c_mask_h;	/* CRC Mask High */
-    rtems_unsigned16	tcrc_l;		/* Temp Transmit CRC Low */
-    rtems_unsigned16	tcrc_h;		/* Temp Transmit CRC High */
-
-    rtems_unsigned16	disfc;		/* Discard Frame Counter */
-    rtems_unsigned16	crcec;		/* CRC Error Counter */
-    rtems_unsigned16	abtsc;		/* Abort Sequence Counter */
-    rtems_unsigned16	nmarc;		/* Nonmatching Address Received Cntr */
-    rtems_unsigned16	retrc;		/* Frame Retransmission Counter */
-
-    rtems_unsigned16	mflr;		/* Maximum Frame Length Register */
-    rtems_unsigned16	max_cnt;	/* Maximum_Length Counter */
-
-    rtems_unsigned16	hmask;		/* User Defined Frame Address Mask */
-    rtems_unsigned16	haddr1;		/* User Defined Frame Address */
-    rtems_unsigned16	haddr2;		/* " */
-    rtems_unsigned16	haddr3;		/* " */
-    rtems_unsigned16	haddr4;		/* " */
-} m302_SCC_HdlcSpecific_t;
-/*
- * HDLC receiver buffer descriptor bit definitions
- * Section 4.5.12.10
- */
-#define RBIT_HDLC_EMPTY_BIT  0x8000	/* buffer associated with BD is empty */
-#define RBIT_HDLC_LAST_BIT   0x0800	/* buffer is last in a frame */
-#define RBIT_HDLC_FIRST_BIT  0x0400	/* buffer is first in a frame */
-#define RBIT_HDLC_FRAME_LEN  0x0020	/* receiver frame length violation */
-#define RBIT_HDLC_NONOCT_Rx  0x0010	/* received non-octet aligned frame */
-#define RBIT_HDLC_ABORT_SEQ  0x0008	/* received abort sequence */
-#define RBIT_HDLC_CRC_ERROR  0x0004	/* frame contains a CRC error */
-#define RBIT_HDLC_OVERRUN    0x0002	/* receiver overrun occurred */
-#define RBIT_HDLC_CD_LOST    0x0001	/* carrier detect lost */
-
-/*
- * HDLC transmit buffer descriptor bit definitions
- * Section 4.5.12.11
- */
-#define RBIT_HDLC_READY_BIT  0x8000	/* buffer is ready to transmit */
-#define RBIT_HDLC_EXT_BUFFER 0x4000	/* buffer is in external memory */
-#define RBIT_HDLC_WRAP_BIT   0x2000	/* last buffer in bd table, so wrap */
-#define RBIT_HDLC_WAKE_UP    0x1000	/* interrupt when buffer serviced */
-#define RBIT_HDLC_LAST_BIT   0x0800	/* buffer is last in the frame */
-#define RBIT_HDLC_TxCRC_BIT  0x0400	/* transmit a CRC sequence */
-#define RBIT_HDLC_UNDERRUN   0x0002	/* transmitter underrun */
-#define RBIT_HDLC_CTS_LOST   0x0001	/* CTS lost */
-
-/*
- * HDLC event register bit definitions
- * Section 4.5.12.12
- */
-#define RBIT_HDLC_CTS   0x80		/* CTS status changed */
-#define RBIT_HDLC_CD    0x40		/* carrier detect status changed */
-#define RBIT_HDLC_IDL   0x20		/* IDLE sequence status changed */
-#define RBIT_HDLC_TXE   0x10		/* transmit error */
-#define RBIT_HDLC_RXF   0x08		/* received frame */
-#define RBIT_HDLC_BSY  0x04		/* frame rcvd and discarded due to
-					 * lack of buffers
-					 */
-#define RBIT_HDLC_TXB    0x02		/* buffer has been transmitted */
-#define RBIT_HDLC_RXB    0x01		/* received buffer */
-
-
-
-typedef struct {
-    m302_SCC_bd_table_t          bd;	/* +000 Buffer Descriptor Table */
-    m302_SCC_parameters_t        parm;	/* +080 Common Parameter RAM */
-    union {				/* +09C Protocol-Specific Parm RAM */
-	m302_SCC_UartSpecific_t  uart;
-	m302_SCC_HdlcSpecific_t  hdlc;
-    } prot;
-    rtems_unsigned8	   res[0x040];	/* +0C0 reserved, (not implemented) */
-} m302_SCC_t;
-
-
-/*
- * Common SCC Registers
- */
-typedef struct {
-    rtems_unsigned16	res1;
-    rtems_unsigned16	scon;	/* SCC Configuration Register        4.5.2 */
-    rtems_unsigned16	scm;	/* SCC Mode Register                 4.5.3 */
-    rtems_unsigned16	dsr;	/* SCC Data Synchronization Register 4.5.4 */
-    rtems_unsigned8	scce;	/* SCC Event Register  4.5.8.1 */
-    rtems_unsigned8	res2;
-    rtems_unsigned8	sccm;	/* SCC Mask Register   4.5.8.2 */
-    rtems_unsigned8	res3;
-    rtems_unsigned8	sccs;	/* SCC Status Register 4.5.8.3 */
-    rtems_unsigned8	res4;
-    rtems_unsigned16	res5;
-} m302_SCC_Registers_t;
-
-/*
- * SCON - SCC Configuration Register
- * Section 4.5.2
- */
-#define RBIT_SCON_WOMS	(1<<15)		/* Wired-OR Mode Select (NMSI mode only)
-					 * When set, the TXD driver is an
-					 * open-drain output */
-#define RBIT_SCON_EXTC	(1<<14)		/* External Clock Source */
-#define RBIT_SCON_TCS	(1<<13)		/* Transmit Clock Source */
-#define RBIT_SCON_RCS	(1<<12)		/* Receive Clock Source */
-
-/*
- * SCM - SCC Mode Register bit definitions
- * Section 4.5.3
- * The parameter-specific mode bits occupy bits 15 through 6.
- */
-#define RBIT_SCM_ENR	(1<<3)		/* Enable receiver */
-#define RBIT_SCM_ENT	(1<<2)		/* Enable transmitter */
-
-
-/*
- * Internal MC68302 Registers
- * starts at offset 0x800 from dual-port RAM base
- * Section 2.8
- */
-typedef struct {
-    /* offset +800 */
-    rtems_unsigned16	res0;
-    rtems_unsigned16	cmr;		/* IDMA Channel Mode Register */
-    rtems_unsigned32	sapr;		/* IDMA Source Address Pointer */
-    rtems_unsigned32	dapr;		/* IDMA Destination Address Pointer */
-    rtems_unsigned16	bcr;		/* IDMA Byte Count Register */
-    rtems_unsigned8	csr;		/* IDMA Channel Status Register */
-    rtems_unsigned8	res1;
-    rtems_unsigned8	fcr;		/* IDMA Function Code Register */
-    rtems_unsigned8	res2;
-
-    /* offset +812 */
-    rtems_unsigned16	gimr;		/* Global Interrupt Mode Register */
-    rtems_unsigned16	ipr;		/* Interrupt Pending Register */
-    rtems_unsigned16	imr;		/* Interrupt Mask Register */
-    rtems_unsigned16	isr;		/* Interrupt In-Service Register */
-    rtems_unsigned16	res3;
-    rtems_unsigned16	res4;
-
-    /* offset +81e */
-    rtems_unsigned16	pacnt;		/* Port A Control Register */
-    rtems_unsigned16	paddr;		/* Port A Data Direction Register */
-    rtems_unsigned16	padat;		/* Port A Data Register */
-    rtems_unsigned16	pbcnt;		/* Port B Control Register */
-    rtems_unsigned16	pbddr;		/* Port B Data Direction Register */
-    rtems_unsigned16	pbdat;		/* Port B Data Register */
-    rtems_unsigned16	res5;
-
-    /* offset +82c */
-    rtems_unsigned16	res6;
-    rtems_unsigned16	res7;
-
-    rtems_unsigned16	br0;		/* Base Register   (CS0) */
-    rtems_unsigned16	or0;		/* Option Register (CS0) */
-    rtems_unsigned16	br1;		/* Base Register   (CS1) */
-    rtems_unsigned16	or1;		/* Option Register (CS1) */
-    rtems_unsigned16	br2;		/* Base Register   (CS2) */
-    rtems_unsigned16	or2;		/* Option Register (CS2) */
-    rtems_unsigned16	br3;		/* Base Register   (CS3) */
-    rtems_unsigned16	or3;		/* Option Register (CS3) */
-
-    /* offset +840 */
-    rtems_unsigned16	tmr1;		/* Timer Unit 1 Mode Register */
-    rtems_unsigned16	trr1;		/* Timer Unit 1 Reference Register */
-    rtems_unsigned16	tcr1;		/* Timer Unit 1 Capture Register */
-    rtems_unsigned16	tcn1;		/* Timer Unit 1 Counter */
-    rtems_unsigned8	res8;
-    rtems_unsigned8	ter1;		/* Timer Unit 1 Event Register */
-    rtems_unsigned16	wrr;		/* Watchdog Reference Register */
-    rtems_unsigned16	wcn;		/* Watchdog Counter */
-    rtems_unsigned16	res9;
-    rtems_unsigned16	tmr2;		/* Timer Unit 2 Mode Register */
-    rtems_unsigned16	trr2;		/* Timer Unit 2 Reference Register */
-    rtems_unsigned16	tcr2;		/* Timer Unit 2 Capture Register */
-    rtems_unsigned16	tcn2;		/* Timer Unit 2 Counter */
-    rtems_unsigned8	resa;
-    rtems_unsigned8	ter2;		/* Timer Unit 2 Event Register */
-    rtems_unsigned16	resb;
-    rtems_unsigned16	resc;
-    rtems_unsigned16	resd;
-
-    /* offset +860 */
-    rtems_unsigned8	cr;		/* Command Register */
-    rtems_unsigned8	rese[0x1f];
-
-    /* offset +880, +890, +8a0 */
-    m302_SCC_Registers_t scc[3];	/* SCC1, SCC2, SCC3 Registers */
-
-    /* offset +8b0 */
-    rtems_unsigned16	spmode;		/* SCP,SMC Mode and Clock Cntrl Reg */
-    rtems_unsigned16	simask;		/* Serial Interface Mask Register */
-    rtems_unsigned16	simode;		/* Serial Interface Mode Register */
-} m302_internalReg_t ;
-
-
-/*
- * MC68302 dual-port RAM structure.
- * (Includes System RAM, Parameter RAM, and Internal Registers).
- * Section 2.8
- */
-typedef struct {
-    rtems_unsigned8	mem[0x240];	/* +000 User Data Memory */
-    rtems_unsigned8	res1[0x1c0];	/* +240 reserved, (not implemented) */
-    m302_SCC_t		scc1;		/* +400 SCC1 */
-    m302_SCC_t		scc2;		/* +500 SCC2 */
-    m302_SCC_t		scc3;		/* +600 SCC3 */
-    rtems_unsigned8	res2[0x100];	/* +700 reserved, (not implemented) */
-    m302_internalReg_t	reg;		/* +800 68302 Internal Registers */
-} m302_dualPortRAM_t;
-
-/* some useful defines the some of the registers above */
-  
-
-/* ----
-   MC68302 Chip Select Registers
-      p3-46 2nd Edition
-
- */
-#define BR_ENABLED     1
-#define BR_DISABLED    0
-#define BR_FC_NULL     0
-#define BR_READ_ONLY   0
-#define BR_READ_WRITE  2
-#define OR_DTACK_0     0x0000
-#define OR_DTACK_1     0x2000
-#define OR_DTACK_2     0x4000
-#define OR_DTACK_3     0x6000
-#define OR_DTACK_4     0x8000
-#define OR_DTACK_5     0xA000
-#define OR_DTACK_6     0xC000
-#define OR_DTACK_EXT   0xE000
-#define OR_SIZE_64K    0x1FE0
-#define OR_SIZE_128K   0x1FC0
-#define OR_SIZE_256K   0x1F80
-#define OR_SIZE_512K   0x1F00
-#define OR_SIZE_1M     0x1E00
-#define OR_SIZE_2M     0x1C00
-#define OR_MASK_RW     0x0000
-#define OR_NO_MASK_RW  0x0002
-#define OR_MASK_FC     0x0000
-#define OR_NO_MASK_FC  0x0001
-
-#define MAKE_BR(base_address, enable, rw, fc) \
-    ((base_address >> 11) | fc | rw | enable)
-
-#define MAKE_OR(bsize, DtAck, RW_Mask, FC_Mask) \
-    (DtAck | ((~(bsize - 1) & 0x00FFFFFF) >> 11) | FC_Mask | RW_Mask)
-
-#define __REG_CAT(r, n) r ## n
-#define WRITE_BR(csel, base_address, enable, rw, fc) \
-          __REG_CAT(m302.reg.br, csel) = MAKE_BR(base_address, enable, rw, fc)
-#define WRITE_OR(csel, bsize, DtAck, RW_Mask, FC_Mask) \
-          __REG_CAT(m302.reg.or, csel) = MAKE_OR(bsize, DtAck, RW_Mask, FC_Mask)
-
-/* ----
-   MC68302 Watchdog Timer Enable Bit
-
- */
-#define WATCHDOG_ENABLE    (1)
-#define WATCHDOG_TRIGGER() (m302.reg.wrr = 0x10 | WATCHDOG_ENABLE, m302.reg.wcn = 0)
-#define WATCHDOG_TOGGLE()  (m302.reg.wcn = WATCHDOG_TIMEOUT_PERIOD)
-#define DISABLE_WATCHDOG() (m302.reg.wrr = 0)
-
-/*
- * Declare the variable that's used to reference the variables in
- * the dual-port RAM.
- */
-extern volatile m302_dualPortRAM_t m302;
-
-#endif
-/* end of include file */
diff --git a/cpukit/score/cpu/m68k/rtems/m68k/m68360.h b/cpukit/score/cpu/m68k/rtems/m68k/m68360.h
deleted file mode 100644
index 84687c49fa..0000000000
--- a/cpukit/score/cpu/m68k/rtems/m68k/m68360.h
+++ /dev/null
@@ -1,880 +0,0 @@
-/*
- **************************************************************************
- **************************************************************************
- **                                                                      **
- **  MOTOROLA MC68360 QUAD INTEGRATED COMMUNICATIONS CONTROLLER (QUICC)  **
- **                                                                      **
- **                        HARDWARE DECLARATIONS                         **
- **                                                                      **
- **                                                                      **
- **  Submitted By:                                                       **
- **                                                                      **
- **      W. Eric Norum                                                   **
- **      Saskatchewan Accelerator Laboratory                             **
- **      University of Saskatchewan                                      **
- **      107 North Road                                                  **
- **      Saskatoon, Saskatchewan, CANADA                                 **
- **      S7N 5C6                                                         **
- **                                                                      **
- **      eric@skatter.usask.ca                                           **
- **                                                                      **
- **  $Id$                                                                **
- **                                                                      **
- **************************************************************************
- **************************************************************************
- */
-
-#ifndef __MC68360_h
-#define __MC68360_h
-
-/*
- *************************************************************************
- *                         REGISTER SUBBLOCKS                            *
- *************************************************************************
- */
-
-/*
- * Memory controller registers
- */
-typedef struct m360MEMCRegisters_ {
-	rtems_unsigned32	br;
-	rtems_unsigned32	or;
-	rtems_unsigned32	_pad[2];
-} m360MEMCRegisters_t;
-
-/*
- * Serial Communications Controller registers
- */
-typedef struct m360SCCRegisters_ {
-	rtems_unsigned32	gsmr_l;
-	rtems_unsigned32	gsmr_h;
-	rtems_unsigned16	psmr;
-	rtems_unsigned16	_pad0;
-	rtems_unsigned16	todr;
-	rtems_unsigned16	dsr;
-	rtems_unsigned16	scce;
-	rtems_unsigned16	_pad1;
-	rtems_unsigned16	sccm;
-	rtems_unsigned8		_pad2;
-	rtems_unsigned8		sccs;
-	rtems_unsigned32	_pad3[2];
-} m360SCCRegisters_t;
-
-/*
- * Serial Management Controller registers
- */
-typedef struct m360SMCRegisters_ {
-	rtems_unsigned16	_pad0;
-	rtems_unsigned16	smcmr;
-	rtems_unsigned16	_pad1;
-	rtems_unsigned8		smce;
-	rtems_unsigned8		_pad2;
-	rtems_unsigned16	_pad3;
-	rtems_unsigned8		smcm;
-	rtems_unsigned8		_pad4;
-	rtems_unsigned32	_pad5;
-} m360SMCRegisters_t;
-
-
-/*
- *************************************************************************
- *                         Miscellaneous Parameters                      *
- *************************************************************************
- */
-typedef struct m360MiscParms_ {
-	rtems_unsigned16	rev_num;
-	rtems_unsigned16	_res1;
-	rtems_unsigned32	_res2;
-	rtems_unsigned32	_res3;
-} m360MiscParms_t;
-
-/*
- *************************************************************************
- *                              RISC Timers                              *
- *************************************************************************
- */
-typedef struct m360TimerParms_ {
-	rtems_unsigned16	tm_base;
-	rtems_unsigned16	_tm_ptr;
-	rtems_unsigned16	_r_tmr;
-	rtems_unsigned16	_r_tmv;
-	rtems_unsigned32	tm_cmd;
-	rtems_unsigned32	tm_cnt;
-} m360TimerParms_t;
-
-/*
- * RISC Controller Configuration Register (RCCR)
- * All other bits in this register are either reserved or
- * used only with a Motorola-supplied RAM microcode packge.
- */
-#define M360_RCCR_TIME		(1<<15)	/* Enable timer */
-#define M360_RCCR_TIMEP(x)	((x)<<8)	/* Timer period */
-
-/*
- * Command register
- * Set up this register before issuing a M360_CR_OP_SET_TIMER command.
- */
-#define M360_TM_CMD_V		(1<<31)		/* Set to enable timer */
-#define M360_TM_CMD_R		(1<<30)		/* Set for automatic restart */
-#define M360_TM_CMD_TIMER(x)	((x)<<16)	/* Select timer */
-#define M360_TM_CMD_PERIOD(x)	(x)		/* Timer period (16 bits) */
-
-/*
- *************************************************************************
- *                               DMA Controllers                         *
- *************************************************************************
- */
-typedef struct m360IDMAparms_ {
-	rtems_unsigned16	ibase;
-	rtems_unsigned16	ibptr;
-	rtems_unsigned32	_istate;
-	rtems_unsigned32	_itemp;
-} m360IDMAparms_t;
-
-/*
- *************************************************************************
- *                   Serial Communication Controllers                    *
- *************************************************************************
- */
-typedef struct m360SCCparms_ {
-	rtems_unsigned16	rbase;
-	rtems_unsigned16	tbase;
-	rtems_unsigned8		rfcr;
-	rtems_unsigned8		tfcr;
-	rtems_unsigned16	mrblr;
-	rtems_unsigned32	_rstate;
-	rtems_unsigned32	_pad0;
-	rtems_unsigned16	_rbptr;
-	rtems_unsigned16	_pad1;
-	rtems_unsigned32	_pad2;
-	rtems_unsigned32	_tstate;
-	rtems_unsigned32	_pad3;
-	rtems_unsigned16	_tbptr;
-	rtems_unsigned16	_pad4;
-	rtems_unsigned32	_pad5;
-	rtems_unsigned32	_rcrc;
-	rtems_unsigned32	_tcrc;
-	union {
-		struct {
-			rtems_unsigned32	_res0;
-			rtems_unsigned32	_res1;
-			rtems_unsigned16	max_idl;
-			rtems_unsigned16	_idlc;
-			rtems_unsigned16	brkcr;
-			rtems_unsigned16	parec;
-			rtems_unsigned16	frmec;
-			rtems_unsigned16	nosec;
-			rtems_unsigned16	brkec;
-			rtems_unsigned16	brklen;
-			rtems_unsigned16	uaddr[2];
-			rtems_unsigned16	_rtemp;
-			rtems_unsigned16	toseq;
-			rtems_unsigned16	character[8];
-			rtems_unsigned16	rccm;
-			rtems_unsigned16	rccr;
-			rtems_unsigned16	rlbc;
-		} uart;
-	} un;
-} m360SCCparms_t;
-
-typedef struct m360SCCENparms_ {
-	rtems_unsigned16	rbase;
-	rtems_unsigned16	tbase;
-	rtems_unsigned8		rfcr;
-	rtems_unsigned8		tfcr;
-	rtems_unsigned16	mrblr;
-	rtems_unsigned32	_rstate;
-	rtems_unsigned32	_pad0;
-	rtems_unsigned16	_rbptr;
-	rtems_unsigned16	_pad1;
-	rtems_unsigned32	_pad2;
-	rtems_unsigned32	_tstate;
-	rtems_unsigned32	_pad3;
-	rtems_unsigned16	_tbptr;
-	rtems_unsigned16	_pad4;
-	rtems_unsigned32	_pad5;
-	rtems_unsigned32	_rcrc;
-	rtems_unsigned32	_tcrc;
-	union {
-		struct {
-			rtems_unsigned32	_res0;
-			rtems_unsigned32	_res1;
-			rtems_unsigned16	max_idl;
-			rtems_unsigned16	_idlc;
-			rtems_unsigned16	brkcr;
-			rtems_unsigned16	parec;
-			rtems_unsigned16	frmec;
-			rtems_unsigned16	nosec;
-			rtems_unsigned16	brkec;
-			rtems_unsigned16	brklen;
-			rtems_unsigned16	uaddr[2];
-			rtems_unsigned16	_rtemp;
-			rtems_unsigned16	toseq;
-			rtems_unsigned16	character[8];
-			rtems_unsigned16	rccm;
-			rtems_unsigned16	rccr;
-			rtems_unsigned16	rlbc;
-		} uart;
-		struct {
-			rtems_unsigned32	c_pres;
-			rtems_unsigned32	c_mask;
-			rtems_unsigned32	crcec;
-			rtems_unsigned32	alec;
-			rtems_unsigned32	disfc;
-			rtems_unsigned16	pads;
-			rtems_unsigned16	ret_lim;
-			rtems_unsigned16	_ret_cnt;
-			rtems_unsigned16	mflr;
-			rtems_unsigned16	minflr;
-			rtems_unsigned16	maxd1;
-			rtems_unsigned16	maxd2;
-			rtems_unsigned16	_maxd;
-			rtems_unsigned16	dma_cnt;
-			rtems_unsigned16	_max_b;
-			rtems_unsigned16	gaddr1;
-			rtems_unsigned16	gaddr2;
-			rtems_unsigned16	gaddr3;
-			rtems_unsigned16	gaddr4;
-			rtems_unsigned32	_tbuf0data0;
-			rtems_unsigned32	_tbuf0data1;
-			rtems_unsigned32	_tbuf0rba0;
-			rtems_unsigned32	_tbuf0crc;
-			rtems_unsigned16	_tbuf0bcnt;
-			rtems_unsigned16	paddr_h;
-			rtems_unsigned16	paddr_m;
-			rtems_unsigned16	paddr_l;
-			rtems_unsigned16	p_per;
-			rtems_unsigned16	_rfbd_ptr;
-			rtems_unsigned16	_tfbd_ptr;
-			rtems_unsigned16	_tlbd_ptr;
-			rtems_unsigned32	_tbuf1data0;
-			rtems_unsigned32	_tbuf1data1;
-			rtems_unsigned32	_tbuf1rba0;
-			rtems_unsigned32	_tbuf1crc;
-			rtems_unsigned16	_tbuf1bcnt;
-			rtems_unsigned16	_tx_len;
-			rtems_unsigned16	iaddr1;
-			rtems_unsigned16	iaddr2;
-			rtems_unsigned16	iaddr3;
-			rtems_unsigned16	iaddr4;
-			rtems_unsigned16	_boff_cnt;
-			rtems_unsigned16	taddr_l;
-			rtems_unsigned16	taddr_m;
-			rtems_unsigned16	taddr_h;
-		} ethernet;
-	} un;
-} m360SCCENparms_t;
-
-/*
- * Receive and transmit function code register bits
- * These apply to the function code registers of all devices, not just SCC.
- */
-#define M360_RFCR_MOT		(1<<4)
-#define M360_RFCR_DMA_SPACE	0x8
-#define M360_TFCR_MOT		(1<<4)
-#define M360_TFCR_DMA_SPACE	0x8
-
-/*
- *************************************************************************
- *                     Serial Management Controllers                     *
- *************************************************************************
- */
-typedef struct m360SMCparms_ {
-	rtems_unsigned16	rbase;
-	rtems_unsigned16	tbase;
-	rtems_unsigned8		rfcr;
-	rtems_unsigned8		tfcr;
-	rtems_unsigned16	mrblr;
-	rtems_unsigned32	_rstate;
-	rtems_unsigned32	_pad0;
-	rtems_unsigned16	_rbptr;
-	rtems_unsigned16	_pad1;
-	rtems_unsigned32	_pad2;
-	rtems_unsigned32	_tstate;
-	rtems_unsigned32	_pad3;
-	rtems_unsigned16	_tbptr;
-	rtems_unsigned16	_pad4;
-	rtems_unsigned32	_pad5;
-	union {
-		struct {
-			rtems_unsigned16	max_idl;
-			rtems_unsigned16	_pad0;
-			rtems_unsigned16	brklen;
-			rtems_unsigned16	brkec;
-			rtems_unsigned16	brkcr;
-			rtems_unsigned16	_r_mask;
-		} uart;
-		struct {
-			rtems_unsigned16	_pad0[5];
-		} transparent;
-	} un;
-} m360SMCparms_t;
-
-/*
- * Mode register
- */
-#define M360_SMCMR_CLEN(x)		((x)<<11)	/* Character length */
-#define M360_SMCMR_2STOP		(1<<10)	/* 2 stop bits */
-#define M360_SMCMR_PARITY		(1<<9)	/* Enable parity */
-#define M360_SMCMR_EVEN			(1<<8)	/* Even parity */
-#define M360_SMCMR_SM_GCI		(0<<4)	/* GCI Mode */
-#define M360_SMCMR_SM_UART		(2<<4)	/* UART Mode */
-#define M360_SMCMR_SM_TRANSPARENT	(3<<4)	/* Transparent Mode */
-#define M360_SMCMR_DM_LOOPBACK		(1<<2)	/* Local loopback mode */
-#define M360_SMCMR_DM_ECHO		(2<<2)	/* Echo mode */
-#define M360_SMCMR_TEN			(1<<1)	/* Enable transmitter */
-#define M360_SMCMR_REN			(1<<0)	/* Enable receiver */
-
-/*
- * Event and mask registers (SMCE, SMCM)
- */
-#define M360_SMCE_BRK	(1<<4)
-#define M360_SMCE_BSY	(1<<2)
-#define M360_SMCE_TX	(1<<1)
-#define M360_SMCE_RX	(1<<0)
-
-/*
- *************************************************************************
- *                      Serial Peripheral Interface                      *
- *************************************************************************
- */
-typedef struct m360SPIparms_ {
-	rtems_unsigned16	rbase;
-	rtems_unsigned16	tbase;
-	rtems_unsigned8		rfcr;
-	rtems_unsigned8		tfcr;
-	rtems_unsigned16	mrblr;
-	rtems_unsigned32	_rstate;
-	rtems_unsigned32	_pad0;
-	rtems_unsigned16	_rbptr;
-	rtems_unsigned16	_pad1;
-	rtems_unsigned32	_pad2;
-	rtems_unsigned32	_tstate;
-	rtems_unsigned32	_pad3;
-	rtems_unsigned16	_tbptr;
-	rtems_unsigned16	_pad4;
-	rtems_unsigned32	_pad5;
-} m360SPIparms_t;
-
-/*
- * Mode register (SPMODE)
- */
-#define M360_SPMODE_LOOP		(1<<14)	/* Local loopback mode */
-#define M360_SPMODE_CI			(1<<13)	/* Clock invert */
-#define M360_SPMODE_CP			(1<<12)	/* Clock phase */
-#define M360_SPMODE_DIV16		(1<<11)	/* Divide BRGCLK by 16 */
-#define M360_SPMODE_REV			(1<<10)	/* Reverse data */
-#define M360_SPMODE_MASTER		(1<<9)	/* SPI is master */
-#define M360_SPMODE_EN			(1<<8)	/* Enable SPI */
-#define M360_SPMODE_CLEN(x)		((x)<<4)	/* Character length */
-#define M360_SPMODE_PM(x)		(x)	/* Prescaler modulus */
-
-/*
- * Mode register (SPCOM)
- */
-#define M360_SPCOM_STR			(1<<7)	/* Start transmit */
-
-/*
- * Event and mask registers (SPIE, SPIM)
- */
-#define M360_SPIE_MME	(1<<5)		/* Multi-master error */
-#define M360_SPIE_TXE	(1<<4)		/* Tx error */
-#define M360_SPIE_BSY	(1<<2)		/* Busy condition*/
-#define M360_SPIE_TXB	(1<<1)		/* Tx buffer */
-#define M360_SPIE_RXB	(1<<0)		/* Rx buffer */
-
-/*
- *************************************************************************
- *                 SDMA (SCC, SMC, SPI) Buffer Descriptors               *
- *************************************************************************
- */
-typedef struct m360BufferDescriptor_ {
-	rtems_unsigned16	status;
-	rtems_unsigned16	length;
-	volatile void		*buffer;
-} m360BufferDescriptor_t;
-
-/*
- * Bits in receive buffer descriptor status word
- */
-#define M360_BD_EMPTY		(1<<15)	/* Ethernet, SCC UART, SMC UART, SPI */
-#define M360_BD_WRAP		(1<<13)	/* Ethernet, SCC UART, SMC UART, SPI */
-#define M360_BD_INTERRUPT	(1<<12)	/* Ethernet, SCC UART, SMC UART, SPI */
-#define M360_BD_LAST		(1<<11)	/* Ethernet, SPI */
-#define M360_BD_CONTROL_CHAR	(1<<11)	/* SCC UART */
-#define M360_BD_FIRST_IN_FRAME	(1<<10)	/* Ethernet */
-#define M360_BD_ADDRESS		(1<<10)	/* SCC UART */
-#define M360_BD_CONTINUOUS	(1<<9)	/* SCC UART, SMC UART, SPI */
-#define M360_BD_MISS		(1<<8)	/* Ethernet */
-#define M360_BD_IDLE		(1<<8)	/* SCC UART, SMC UART */
-#define M360_BD_ADDRSS_MATCH	(1<<7)	/* SCC UART */
-#define M360_BD_LONG		(1<<5)	/* Ethernet */
-#define M360_BD_BREAK		(1<<5)	/* SCC UART, SMC UART */
-#define M360_BD_NONALIGNED	(1<<4)	/* Ethernet */
-#define M360_BD_FRAMING_ERROR	(1<<4)	/* SCC UART, SMC UART */
-#define M360_BD_SHORT		(1<<3)	/* Ethernet */
-#define M360_BD_PARITY_ERROR	(1<<3)	/* SCC UART, SMC UART */
-#define M360_BD_CRC_ERROR	(1<<2)	/* Ethernet */
-#define M360_BD_OVERRUN		(1<<1)	/* Ethernet, SCC UART, SMC UART, SPI */
-#define M360_BD_COLLISION	(1<<0)	/* Ethernet */
-#define M360_BD_CARRIER_LOST	(1<<0)	/* SCC UART */
-#define M360_BD_MASTER_ERROR	(1<<0)	/* SPI */
-
-/*
- * Bits in transmit buffer descriptor status word
- * Many bits have the same meaning as those in receiver buffer descriptors.
- */
-#define M360_BD_READY		(1<<15)	/* Ethernet, SCC UART, SMC UART, SPI */
-#define M360_BD_PAD		(1<<14)	/* Ethernet */
-#define M360_BD_CTS_REPORT	(1<<11)	/* SCC UART */
-#define M360_BD_TX_CRC		(1<<10)	/* Ethernet */
-#define M360_BD_DEFER		(1<<9)	/* Ethernet */
-#define M360_BD_HEARTBEAT	(1<<8)	/* Ethernet */
-#define M360_BD_PREAMBLE	(1<<8)	/* SCC UART, SMC UART */
-#define M360_BD_LATE_COLLISION	(1<<7)	/* Ethernet */
-#define M360_BD_NO_STOP_BIT	(1<<7)	/* SCC UART */
-#define M360_BD_RETRY_LIMIT	(1<<6)	/* Ethernet */
-#define M360_BD_RETRY_COUNT(x)	(((x)&0x3C)>>2)	/* Ethernet */
-#define M360_BD_UNDERRUN	(1<<1)	/* Ethernet, SPI */
-#define M360_BD_CARRIER_LOST	(1<<0)	/* Ethernet */
-#define M360_BD_CTS_LOST	(1<<0)	/* SCC UART */
-
-/*
- *************************************************************************
- *                           IDMA Buffer Descriptors                     *
- *************************************************************************
- */
-typedef struct m360IDMABufferDescriptor_ {
-	rtems_unsigned16	status;
-	rtems_unsigned16	_pad;
-	rtems_unsigned32	length;
-	void			*source;
-	void			*destination;
-} m360IDMABufferDescriptor_t;
-
-/*
- *************************************************************************
- *       RISC Communication Processor Module Command Register (CR)       *
- *************************************************************************
- */
-#define M360_CR_RST		(1<<15)	/* Reset communication processor */
-#define M360_CR_OP_INIT_RX_TX	(0<<8)	/* SCC, SMC UART, SMC GCI, SPI */
-#define M360_CR_OP_INIT_RX	(1<<8)	/* SCC, SMC UART, SPI */
-#define M360_CR_OP_INIT_TX	(2<<8)	/* SCC, SMC UART, SPI */
-#define M360_CR_OP_INIT_HUNT	(3<<8)	/* SCC, SMC UART */
-#define M360_CR_OP_STOP_TX	(4<<8)	/* SCC, SMC UART */
-#define M360_CR_OP_GR_STOP_TX	(5<<8)	/* SCC */
-#define M360_CR_OP_INIT_IDMA	(5<<8)	/* IDMA */
-#define M360_CR_OP_RESTART_TX	(6<<8)	/* SCC, SMC UART */
-#define M360_CR_OP_CLOSE_RX_BD	(7<<8)	/* SCC, SMC UART, SPI */
-#define M360_CR_OP_SET_GRP_ADDR	(8<<8)	/* SCC */
-#define M360_CR_OP_SET_TIMER	(8<<8)	/* Timer */
-#define M360_CR_OP_GCI_TIMEOUT	(9<<8)	/* SMC GCI */
-#define M360_CR_OP_RESERT_BCS	(10<<8)	/* SCC */
-#define M360_CR_OP_GCI_ABORT	(10<<8)	/* SMC GCI */
-#define M360_CR_CHAN_SCC1	(0<<4)	/* Channel selection */
-#define M360_CR_CHAN_SCC2	(4<<4)
-#define M360_CR_CHAN_SPI	(5<<4)
-#define M360_CR_CHAN_TIMER	(5<<4)
-#define M360_CR_CHAN_SCC3	(8<<4)
-#define M360_CR_CHAN_SMC1	(9<<4)
-#define M360_CR_CHAN_IDMA1	(9<<4)
-#define M360_CR_CHAN_SCC4	(12<<4)
-#define M360_CR_CHAN_SMC2	(13<<4)
-#define M360_CR_CHAN_IDMA2	(13<<4)
-#define M360_CR_FLG		(1<<0)	/* Command flag */
-
-/*
- *************************************************************************
- *                 System Protection Control Register (SYPCR)            *
- *************************************************************************
- */
-#define M360_SYPCR_SWE		(1<<7)  /* Software watchdog enable */
-#define M360_SYPCR_SWRI		(1<<6)  /* Software watchdog reset select */
-#define M360_SYPCR_SWT1		(1<<5)  /* Software watchdog timing bit 1 */
-#define M360_SYPCR_SWT0		(1<<4)  /* Software watchdog timing bit 0 */
-#define M360_SYPCR_DBFE		(1<<3)  /* Double bus fault monitor enable */
-#define M360_SYPCR_BME		(1<<2)  /* Bus monitor external enable */
-#define M360_SYPCR_BMT1		(1<<1)  /* Bus monitor timing bit 1 */
-#define M360_SYPCR_BMT0		(1<<0)  /* Bus monitor timing bit 0 */
-
-/*
- *************************************************************************
- *                        Memory Control Registers                       *
- *************************************************************************
- */
-#define M360_GMR_RCNT(x)	((x)<<24)	/* Refresh count */
-#define M360_GMR_RFEN		(1<<23)	/* Refresh enable */
-#define M360_GMR_RCYC(x)	((x)<<21)	/* Refresh cycle length */
-#define M360_GMR_PGS(x)		((x)<<18)	/* Page size */
-#define M360_GMR_DPS_32BIT	(0<<16)	/* DRAM port size */
-#define M360_GMR_DPS_16BIT	(1<<16)
-#define M360_GMR_DPS_8BIT	(2<<16)
-#define M360_GMR_DPS_DSACK	(3<<16)
-#define M360_GMR_WBT40		(1<<15)	/* Wait between 040 transfers */
-#define M360_GMR_WBTQ		(1<<14)	/* Wait between 360 transfers */
-#define M360_GMR_SYNC		(1<<13)	/* Synchronous external access */
-#define M360_GMR_EMWS		(1<<12)	/* External master wait state */
-#define M360_GMR_OPAR		(1<<11)	/* Odd parity */
-#define M360_GMR_PBEE		(1<<10)	/* Parity bus error enable */
-#define M360_GMR_TSS40		(1<<9)	/* TS* sample for 040 */
-#define M360_GMR_NCS		(1<<8)	/* No CPU space */
-#define M360_GMR_DWQ		(1<<7)	/* Delay write for 360 */
-#define M360_GMR_DW40		(1<<6)	/* Delay write for 040 */
-#define M360_GMR_GAMX		(1<<5)	/* Global address mux enable */
-
-#define M360_MEMC_BR_FC(x)	((x)<<7)	/* Function code limit */
-#define M360_MEMC_BR_TRLXQ	(1<<6)	/* Relax timing requirements */
-#define M360_MEMC_BR_BACK40	(1<<5)	/* Burst acknowledge to 040 */
-#define M360_MEMC_BR_CSNT40	(1<<4)	/* CS* negate timing for 040 */
-#define M360_MEMC_BR_CSNTQ	(1<<3)	/* CS* negate timing for 360 */
-#define M360_MEMC_BR_PAREN	(1<<2)	/* Enable parity checking */
-#define M360_MEMC_BR_WP		(1<<1)	/* Write Protect */
-#define M360_MEMC_BR_V		(1<<0)	/* Base/Option register are valid */
-
-#define M360_MEMC_OR_TCYC(x)	((x)<<28)	/* Cycle length (clocks) */
-#define M360_MEMC_OR_WAITS(x)	M360_MEMC_OR_TCYC((x)+1)
-#define M360_MEMC_OR_2KB	0x0FFFF800	/* Address range */
-#define M360_MEMC_OR_4KB	0x0FFFF000
-#define M360_MEMC_OR_8KB	0x0FFFE000
-#define M360_MEMC_OR_16KB	0x0FFFC000
-#define M360_MEMC_OR_32KB	0x0FFF8000
-#define M360_MEMC_OR_64KB	0x0FFF0000
-#define M360_MEMC_OR_128KB	0x0FFE0000
-#define M360_MEMC_OR_256KB	0x0FFC0000
-#define M360_MEMC_OR_512KB	0x0FF80000
-#define M360_MEMC_OR_1MB	0x0FF00000
-#define M360_MEMC_OR_2MB	0x0FE00000
-#define M360_MEMC_OR_4MB	0x0FC00000
-#define M360_MEMC_OR_8MB	0x0F800000
-#define M360_MEMC_OR_16MB	0x0F000000
-#define M360_MEMC_OR_32MB	0x0E000000
-#define M360_MEMC_OR_64MB	0x0C000000
-#define M360_MEMC_OR_128MB	0x08000000
-#define M360_MEMC_OR_256MB	0x00000000
-#define M360_MEMC_OR_FCMC(x)	((x)<<7)	/* Function code mask */
-#define M360_MEMC_OR_BCYC(x)	((x)<<5)	/* Burst cycle length (clocks) */
-#define M360_MEMC_OR_PGME	(1<<3)		/* Page mode enable */
-#define M360_MEMC_OR_32BIT	(0<<1)		/* Port size */
-#define M360_MEMC_OR_16BIT	(1<<1)
-#define M360_MEMC_OR_8BIT	(2<<1)
-#define M360_MEMC_OR_DSACK	(3<<1)
-#define M360_MEMC_OR_DRAM	(1<<0)		/* Dynamic RAM select */
-
-/*
- *************************************************************************
- *                         SI Mode Register (SIMODE)                     *
- *************************************************************************
- */
-#define M360_SI_SMC2_BITS	0xFFFF0000	/* All SMC2 bits */
-#define M360_SI_SMC2_TDM	(1<<31)	/* Multiplexed SMC2 */
-#define M360_SI_SMC2_BRG1	(0<<28)	/* SMC2 clock souce */
-#define M360_SI_SMC2_BRG2	(1<<28)
-#define M360_SI_SMC2_BRG3	(2<<28)
-#define M360_SI_SMC2_BRG4	(3<<28)
-#define M360_SI_SMC2_CLK5	(0<<28)
-#define M360_SI_SMC2_CLK6	(1<<28)
-#define M360_SI_SMC2_CLK7	(2<<28)
-#define M360_SI_SMC2_CLK8	(3<<28)
-#define M360_SI_SMC1_BITS	0x0000FFFF	/* All SMC1 bits */
-#define M360_SI_SMC1_TDM	(1<<15)	/* Multiplexed SMC1 */
-#define M360_SI_SMC1_BRG1	(0<<12)	/* SMC1 clock souce */
-#define M360_SI_SMC1_BRG2	(1<<12)
-#define M360_SI_SMC1_BRG3	(2<<12)
-#define M360_SI_SMC1_BRG4	(3<<12)
-#define M360_SI_SMC1_CLK1	(0<<12)
-#define M360_SI_SMC1_CLK2	(1<<12)
-#define M360_SI_SMC1_CLK3	(2<<12)
-#define M360_SI_SMC1_CLK4	(3<<12)
-
-/*
- *************************************************************************
- *                  SDMA Configuration Register (SDMA)                   *
- *************************************************************************
- */
-#define M360_SDMA_FREEZE	(2<<13)	/* Freeze on next bus cycle */
-#define M360_SDMA_SISM_7	(7<<8)	/* Normal interrupt service mask */
-#define M360_SDMA_SAID_4	(4<<4)	/* Normal arbitration ID */
-#define M360_SDMA_INTE		(1<<1)	/* SBER interrupt enable */
-#define M360_SDMA_INTB		(1<<0)	/* SBKP interrupt enable */
-
-/*
- *************************************************************************
- *                      Baud (sic) Rate Generators                       *
- *************************************************************************
- */
-#define M360_BRG_RST		(1<<17)		/* Reset generator */
-#define M360_BRG_EN		(1<<16)		/* Enable generator */
-#define M360_BRG_EXTC_BRGCLK	(0<<14)		/* Source is BRGCLK */
-#define M360_BRG_EXTC_CLK2	(1<<14)		/* Source is CLK2 pin */
-#define M360_BRG_EXTC_CLK6	(2<<14)		/* Source is CLK6 pin */
-#define M360_BRG_ATB		(1<<13)		/* Autobaud */
-#define M360_BRG_115200		(13<<1)		/* Assume 25 MHz clock */
-#define M360_BRG_57600		(26<<1)
-#define M360_BRG_38400		(40<<1)
-#define M360_BRG_19200		(80<<1)
-#define M360_BRG_9600		(162<<1)
-#define M360_BRG_4800		(324<<1)
-#define M360_BRG_2400		(650<<1)
-#define M360_BRG_1200		(1301<<1)
-#define M360_BRG_600		(2603<<1)
-#define M360_BRG_300		((324<<1) | 1)
-#define M360_BRG_150		((650<<1) | 1)
-#define M360_BRG_75		((1301<<1) | 1)
-
-/*
- *************************************************************************
- *                 MC68360 DUAL-PORT RAM AND REGISTERS                   *
- *************************************************************************
- */
-typedef struct m360_ {
-	/*
-	 * Dual-port RAM
-	 */
-	rtems_unsigned8		dpram0[0x400];	/* Microcode program */
-	rtems_unsigned8		dpram1[0x200];
-	rtems_unsigned8		dpram2[0x100];	/* Microcode scratch */
-	rtems_unsigned8		dpram3[0x100];	/* Not on REV A or B masks */
-	rtems_unsigned8		_rsv0[0xC00-0x800];
-	m360SCCENparms_t	scc1p;
-	rtems_unsigned8		_rsv1[0xCB0-0xC00-sizeof(m360SCCENparms_t)];
-	m360MiscParms_t		miscp;
-	rtems_unsigned8		_rsv2[0xD00-0xCB0-sizeof(m360MiscParms_t)];
-	m360SCCparms_t		scc2p;
-	rtems_unsigned8		_rsv3[0xD80-0xD00-sizeof(m360SCCparms_t)];
-	m360SPIparms_t		spip;
-	rtems_unsigned8		_rsv4[0xDB0-0xD80-sizeof(m360SPIparms_t)];
-	m360TimerParms_t	tmp;
-	rtems_unsigned8		_rsv5[0xE00-0xDB0-sizeof(m360TimerParms_t)];
-	m360SCCparms_t		scc3p;
-	rtems_unsigned8		_rsv6[0xE70-0xE00-sizeof(m360SCCparms_t)];
-	m360IDMAparms_t		idma1p;
-	rtems_unsigned8		_rsv7[0xE80-0xE70-sizeof(m360IDMAparms_t)];
-	m360SMCparms_t		smc1p;
-	rtems_unsigned8		_rsv8[0xF00-0xE80-sizeof(m360SMCparms_t)];
-	m360SCCparms_t		scc4p;
-	rtems_unsigned8		_rsv9[0xF70-0xF00-sizeof(m360SCCparms_t)];
-	m360IDMAparms_t		idma2p;
-	rtems_unsigned8		_rsv10[0xF80-0xF70-sizeof(m360IDMAparms_t)];
-	m360SMCparms_t		smc2p;
-	rtems_unsigned8		_rsv11[0x1000-0xF80-sizeof(m360SMCparms_t)];
-
-	/*
-	 * SIM Block
-	 */
-	rtems_unsigned32	mcr;
-	rtems_unsigned32	_pad00;
-	rtems_unsigned8		avr;
-	rtems_unsigned8		rsr;
-	rtems_unsigned16	_pad01;
-	rtems_unsigned8		clkocr;
-	rtems_unsigned8		_pad02;
-	rtems_unsigned16	_pad03;
-	rtems_unsigned16	pllcr;
-	rtems_unsigned16	_pad04;
-	rtems_unsigned16	cdvcr;
-	rtems_unsigned16	pepar;
-	rtems_unsigned32	_pad05[2];
-	rtems_unsigned16	_pad06;
-	rtems_unsigned8		sypcr;
-	rtems_unsigned8		swiv;
-	rtems_unsigned16	_pad07;
-	rtems_unsigned16	picr;
-	rtems_unsigned16	_pad08;
-	rtems_unsigned16	pitr;
-	rtems_unsigned16	_pad09;
-	rtems_unsigned8		_pad10;
-	rtems_unsigned8		swsr;
-	rtems_unsigned32	bkar;
-	rtems_unsigned32	bcar;
-	rtems_unsigned32	_pad11[2];
-
-	/*
-	 * MEMC Block
-	 */
-	rtems_unsigned32	gmr;
-	rtems_unsigned16	mstat;
-	rtems_unsigned16	_pad12;
-	rtems_unsigned32	_pad13[2];
-	m360MEMCRegisters_t	memc[8];
-	rtems_unsigned8		_pad14[0xF0-0xD0];
-	rtems_unsigned8		_pad15[0x100-0xF0];
-	rtems_unsigned8		_pad16[0x500-0x100];
-	
-	/*
-	 * IDMA1 Block
-	 */
-	rtems_unsigned16	iccr;
-	rtems_unsigned16	_pad17;
-	rtems_unsigned16	cmr1;
-	rtems_unsigned16	_pad18;
-	rtems_unsigned32	sapr1;
-	rtems_unsigned32	dapr1;
-	rtems_unsigned32	bcr1;
-	rtems_unsigned8		fcr1;
-	rtems_unsigned8		_pad19;
-	rtems_unsigned8		cmar1;
-	rtems_unsigned8		_pad20;
-	rtems_unsigned8		csr1;
-	rtems_unsigned8		_pad21;
-	rtems_unsigned16	_pad22;
-	
-	/*
-	 * SDMA Block
-	 */
-	rtems_unsigned8		sdsr;
-	rtems_unsigned8		_pad23;
-	rtems_unsigned16	sdcr;
-	rtems_unsigned32	sdar;
-	
-	/*
-	 * IDMA2 Block
-	 */
-	rtems_unsigned16	_pad24;
-	rtems_unsigned16	cmr2;
-	rtems_unsigned32	sapr2;
-	rtems_unsigned32	dapr2;
-	rtems_unsigned32	bcr2;
-	rtems_unsigned8		fcr2;
-	rtems_unsigned8		_pad26;
-	rtems_unsigned8		cmar2;
-	rtems_unsigned8		_pad27;
-	rtems_unsigned8		csr2;
-	rtems_unsigned8		_pad28;
-	rtems_unsigned16	_pad29;
-	rtems_unsigned32	_pad30;
-	
-	/*
-	 * CPIC Block
-	 */
-	rtems_unsigned32	cicr;
-	rtems_unsigned32	cipr;
-	rtems_unsigned32	cimr;
-	rtems_unsigned32	cisr;
-
-	/*
-	 * Parallel I/O Block
-	 */
-	rtems_unsigned16	padir;
-	rtems_unsigned16	papar;
-	rtems_unsigned16	paodr;
-	rtems_unsigned16	padat;
-	rtems_unsigned32	_pad31[2];
-	rtems_unsigned16	pcdir;
-	rtems_unsigned16	pcpar;
-	rtems_unsigned16	pcso;
-	rtems_unsigned16	pcdat;
-	rtems_unsigned16	pcint;
-	rtems_unsigned16	_pad32;
-	rtems_unsigned32	_pad33[5];
-	
-	/*
-	 * TIMER Block
-	 */
-	rtems_unsigned16	tgcr;
-	rtems_unsigned16	_pad34;
-	rtems_unsigned32	_pad35[3];
-	rtems_unsigned16	tmr1;
-	rtems_unsigned16	tmr2;
-	rtems_unsigned16	trr1;
-	rtems_unsigned16	trr2;
-	rtems_unsigned16	tcr1;
-	rtems_unsigned16	tcr2;
-	rtems_unsigned16	tcn1;
-	rtems_unsigned16	tcn2;
-	rtems_unsigned16	tmr3;
-	rtems_unsigned16	tmr4;
-	rtems_unsigned16	trr3;
-	rtems_unsigned16	trr4;
-	rtems_unsigned16	tcr3;
-	rtems_unsigned16	tcr4;
-	rtems_unsigned16	tcn3;
-	rtems_unsigned16	tcn4;
-	rtems_unsigned16	ter1;
-	rtems_unsigned16	ter2;
-	rtems_unsigned16	ter3;
-	rtems_unsigned16	ter4;
-	rtems_unsigned32	_pad36[2];
-	
-	/*
-	 * CP Block
-	 */
-	rtems_unsigned16	cr;
-	rtems_unsigned16	_pad37;
-	rtems_unsigned16	rccr;
-	rtems_unsigned16	_pad38;
-	rtems_unsigned32	_pad39[3];
-	rtems_unsigned16	_pad40;
-	rtems_unsigned16	rter;
-	rtems_unsigned16	_pad41;
-	rtems_unsigned16	rtmr;
-	rtems_unsigned32	_pad42[5];
-
-	/*
-	 * BRG Block
-	 */
-	rtems_unsigned32	brgc1;
-	rtems_unsigned32	brgc2;
-	rtems_unsigned32	brgc3;
-	rtems_unsigned32	brgc4;
-
-	/*
-	 * SCC Block
-	 */
-	m360SCCRegisters_t	scc1;
-	m360SCCRegisters_t	scc2;
-	m360SCCRegisters_t	scc3;
-	m360SCCRegisters_t	scc4;
-
-	/*
-	 * SMC Block
-	 */
-	m360SMCRegisters_t	smc1;
-	m360SMCRegisters_t	smc2;
-
-	/*
-	 * SPI Block
-	 */
-	rtems_unsigned16	spmode;
-	rtems_unsigned16	_pad43[2];
-	rtems_unsigned8		spie;
-	rtems_unsigned8		_pad44;
-	rtems_unsigned16	_pad45;
-	rtems_unsigned8		spim;
-	rtems_unsigned8		_pad46[2];
-	rtems_unsigned8		spcom;
-	rtems_unsigned16	_pad47[2];
-
-	/*
-	 * PIP Block
-	 */
-	rtems_unsigned16	pipc;
-	rtems_unsigned16	_pad48;
-	rtems_unsigned16	ptpr;
-	rtems_unsigned32	pbdir;
-	rtems_unsigned32	pbpar;
-	rtems_unsigned16	_pad49;
-	rtems_unsigned16	pbodr;
-	rtems_unsigned32	pbdat;
-	rtems_unsigned32	_pad50[6];
-
-	/*
-	 * SI Block
-	 */
-	rtems_unsigned32	simode;
-	rtems_unsigned8		sigmr;
-	rtems_unsigned8		_pad51;
-	rtems_unsigned8		sistr;
-	rtems_unsigned8		sicmr;
-	rtems_unsigned32	_pad52;
-	rtems_unsigned32	sicr;
-	rtems_unsigned16	_pad53;
-	rtems_unsigned16	sirp[2];
-	rtems_unsigned16	_pad54;
-	rtems_unsigned32	_pad55[2];
-	rtems_unsigned8		siram[256];
-} m360_t;
-
-extern volatile m360_t m360;
-
-#endif /* __MC68360_h */
diff --git a/cpukit/score/cpu/m68k/rtems/m68k/qsm.h b/cpukit/score/cpu/m68k/rtems/m68k/qsm.h
deleted file mode 100644
index e1bf33bc12..0000000000
--- a/cpukit/score/cpu/m68k/rtems/m68k/qsm.h
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- *-------------------------------------------------------------------
- *
- *   QSM -- Queued Serial Module
- *
- * The QSM contains two serial interfaces: (a) the queued serial
- * peripheral interface (QSPI) and the serial communication interface
- * (SCI). The QSPI provides peripheral expansion and/or interprocessor
- * communication through a full-duplex, synchronous, three-wire bus. A
- * self contained RAM queue permits serial data transfers without CPU
- * intervention and automatic continuous sampling. The SCI provides a
- * standard non-return to zero mark/space format with wakeup functions
- * to allow the CPU to run uninterrupted until woken
- *
- * For more information, refer to Motorola's "Modular Microcontroller
- * Family Queued Serial Module Reference Manual" (Motorola document
- * QSMRM/AD). 
- *
- * This file has been created by John S. Gwynne for support of 
- * Motorola's 68332 MCU in the efi332 project.
- * 
- * Redistribution and use in source and binary forms are permitted
- * provided that the following conditions are met:
- * 1. Redistribution of source code and documentation must retain
- *    the above authorship, this list of conditions and the
- *    following disclaimer.
- * 2. The name of the author may not be used to endorse or promote
- *    products derived from this software without specific prior
- *    written permission.
- *
- * This software is provided "AS IS" without warranty of any kind,
- * either expressed or implied, including, but not limited to, the
- * implied warranties of merchantability, title and fitness for a
- * particular purpose.
- *
- *------------------------------------------------------------------
- *
- *  $Id$
- */
-
-#ifndef _QSM_H_
-#define _QSM_H_
-
-
-#include <efi332.h>
-
-
-/* SAM-- shift and mask */
-#undef  SAM
-#define SAM(a,b,c) ((a << b) & c)
-
-
-/* QSM_CRB (QSM Control Register Block) base address of the QSM
-   control registers */
-#if SIM_MM == 0
-#define QSM_CRB 0x7ffc00
-#else
-#undef SIM_MM
-#define SIM_MM 1
-#define QSM_CRB 0xfffc00
-#endif 
-
-
-#define QSMCR (volatile unsigned short int * const)(0x00 + QSM_CRB)
-				/* QSM Configuration Register */
-#define    STOP 0x8000		/*    Stop Enable */
-#define    FRZ  0x6000		/*    Freeze Control */
-#define    SUPV 0x0080		/*    Supervisor/Unrestricted */
-#define	   IARB 0x000f		/*    Inerrupt Arbitration */
-
-
-#define QTEST (volatile unsigned short int * const)(0x02 + QSM_CRB)
-				/* QSM Test Register */
-/* Used only for factor testing */
-
-
-#define QILR (volatile unsigned char * const)(0x04 + QSM_CRB)
-				/* QSM Interrupt Level Register */
-#define    ILQSPI 0x38		/*    Interrupt Level for QSPI */
-#define    ILSCI  0x07		/*    Interrupt Level for SCI */
-
-
-#define QIVR (volatile unsigned char * const)(0x05 + QSM_CRB)
-				/* QSM Interrupt Vector Register */
-#define    INTV   0xff		/*    Interrupt Vector Number */
-
-
-#define SCCR0 (volatile unsigned short int * const)(0x08 + QSM_CRB)
-				/* SCI Control Register 0 */
-#define    SCBR   0x1fff	/*    SCI Baud Rate */
-
-
-#define SCCR1 (volatile unsigned short int * const)(0x0a + QSM_CRB)
-				/* SCI Control Register 1 */
-#define    LOOPS  0x4000	/*    Loop Mode */
-#define    WOMS   0x2000	/*    Wired-OR Mode for SCI Pins */
-#define    ILT    0x1000	/*    Idle-Line Detect Type */
-#define    PT     0x0800	/*    Parity Type */
-#define    PE     0x0400	/*    Parity Enable */
-#define    M      0x0200	/*    Mode Select */
-#define    WAKE   0x0100	/*    Wakeup by Address Mark */
-#define    TIE    0x0080	/*    Transmit Complete Interrupt Enable */
-#define    TCIE   0x0040	/*    Transmit Complete Interrupt Enable */
-#define    RIE    0x0020	/*    Receiver Interrupt Enable */
-#define    ILIE   0x0010	/*    Idle-Line Interrupt Enable */
-#define    TE     0x0008	/*    Transmitter Enable */
-#define    RE     0x0004	/*    Receiver Enable */
-#define    RWU    0x0002	/*    Receiver Wakeup */
-#define    SBK    0x0001	/*    Send Break */
-
-
-#define SCSR (volatile unsigned short int * const)(0x0c + QSM_CRB)
-				/* SCI Status Register */
-#define    TDRE   0x0100	/*    Transmit Data Register Empty */
-#define    TC     0x0080	/*    Transmit Complete */
-#define    RDRF   0x0040	/*    Receive Data Register Full */
-#define    RAF    0x0020	/*    Receiver Active */
-#define    IDLE   0x0010	/*    Idle-Line Detected */
-#define    OR     0x0008	/*    Overrun Error */
-#define    NF     0x0004	/*    Noise Error Flag */
-#define    FE     0x0002	/*    Framing Error */
-#define    PF     0x0001	/*    Parity Error */
-
-
-#define SCDR (volatile unsigned short int * const)(0x0e + QSM_CRB)
-				/* SCI Data Register */
-
-
-#define PORTQS (volatile unsigned char * const)(0x15 + QSM_CRB)
-				/* Port QS Data Register */
-
-#define PQSPAR (volatile unsigned char * const)(0x16 + QSM_CRB)
-				/* PORT QS Pin Assignment Rgister */
-/* Any bit cleared (zero) defines the corresponding pin to be an I/O
-   pin. Any bit set defines the corresponding pin to be a QSPI
-   signal. */
-/* note: PQS2 is a digital I/O pin unless the SPI is enabled in which
-   case it becomes the SPI serial clock SCK. */
-/* note: PQS7 is a digital I/O pin unless the SCI transmitter is
-   enabled in which case it becomes the SCI serial output TxD. */
-#define QSMFun 0x0
-#define QSMDis 0x1
-/*
- * PQSPAR Field     | QSM Function | Discrete I/O pin
- *------------------+--------------+------------------   */
-#define PQSPA0   0  /*   MISO      |      PQS0           */
-#define PQSPA1   1  /*   MOSI      |      PQS1           */
-#define PQSPA2   2  /*   SCK       |      PQS2 (see note)*/
-#define PQSPA3   3  /*   PCSO/!SS  |      PQS3           */
-#define PQSPA4   4  /*   PCS1      |      PQS4           */
-#define PQSPA5   5  /*   PCS2      |      PQS5           */
-#define PQSPA6   6  /*   PCS3      |      PQS6           */
-#define PQSPA7   7  /*   TxD       |      PQS7 (see note)*/
-
-
-#define DDRQS  (volatile unsigned char * const)(0x17 + QSM_CRB)
-				/* PORT QS Data Direction Register */
-/* Clearing a bit makes the corresponding pin an input; setting a bit
-   makes the pin an output. */
-
-
-#define SPCR0 (volatile unsigned short int * const)(0x18 + QSM_CRB)
-				/* QSPI Control Register 0 */
-#define    MSTR   0x8000	/*    Master/Slave Mode Select */
-#define    WOMQ   0x4000	/*    Wired-OR Mode for QSPI Pins */
-#define    BITS   0x3c00	/*    Bits Per Transfer */
-#define    CPOL   0x0200	/*    Clock Polarity */
-#define    CPHA   0x0100	/*    Clock Phase */
-#define    SPBR   0x00ff	/*    Serial Clock Baud Rate */
-
-
-#define SPCR1 (volatile unsigned short int * const)(0x1a + QSM_CRB)
-				/* QSPI Control Register 1 */
-#define    SPE    0x8000	/*    QSPI Enable */
-#define    DSCKL  0x7f00	/*    Delay before SCK */
-#define    DTL    0x00ff	/*    Length of Delay after Transfer */
-
-
-#define SPCR2 (volatile unsigned short int * const)(0x1c + QSM_CRB)
-				/* QSPI Control Register 2 */
-#define    SPIFIE 0x8000	/*    SPI Finished Interrupt Enable */
-#define    WREN   0x4000	/*    Wrap Enable */
-#define    WRTO   0x2000	/*    Wrap To */
-#define    ENDQP  0x0f00	/*    Ending Queue Pointer */
-#define    NEWQP  0x000f	/*    New Queue Pointer Value */
-
-
-#define SPCR3 (volatile unsigned char * const)(0x1e + QSM_CRB)
-				/* QSPI Control Register 3 */
-#define    LOOPQ  0x0400	/*    QSPI Loop Mode */
-#define    HMIE   0x0200	/*    HALTA and MODF Interrupt Enable */
-#define    HALT   0x0100	/*    Halt */
-
-
-#define SPSR (volatile unsigned char * const)(0x1f + QSM_CRB)
-				/* QSPI Status Register */
-#define    SPIF   0x0080	/*    QSPI Finished Flag */
-#define    MODF   0x0040	/*    Mode Fault Flag */
-#define    HALTA  0x0020	/*    Halt Acknowlwdge Flag */
-#define    CPTQP  x0000f	/*    Completed Queue Pointer */
-
-#define QSPIRR (volatile unsigned char * const)(0x100 + QSM_CRB)
-				/* QSPI Receive Data RAM */
-#define QSPITR (volatile unsigned char * const)(0x120 + QSM_CRB)
-				/* QSPI Transmit Data RAM */
-#define QSPIcR (volatile unsigned char * const)(0x140 + QSM_CRB)
-				/* QSPI Command RAM */
-
-#endif /* _QSM_H_ */
diff --git a/cpukit/score/cpu/m68k/rtems/m68k/sim.h b/cpukit/score/cpu/m68k/rtems/m68k/sim.h
deleted file mode 100644
index d70f56d360..0000000000
--- a/cpukit/score/cpu/m68k/rtems/m68k/sim.h
+++ /dev/null
@@ -1,342 +0,0 @@
-/*
- *-------------------------------------------------------------------
- *
- *   SIM -- System Integration Module
- *
- * The system integration module (SIM) is used on many Motorola 16-
- * and 32-bit MCUs for the following functions:
- *
- *  () System configuration and protection. Bus and software watchdog
- *  monitors are provided in addition to periodic interrupt generators.
- *
- *  () Clock signal generation for other intermodule bus (IMB) members
- *  and external devices.
- *
- *  () The generation of chip-select signals that simplify external 
- *  circuitry interface.
- *
- *  () Data ports that are available for general purpose input and
- *  output.
- *
- *  () A system test block that is intended only for factory tests.
- *
- * For more information, refer to Motorola's "Modular Microcontroller
- * Family System Integration Module Reference Manual" (Motorola document
- * SIMRM/AD). 
- *
- * This file has been created by John S. Gwynne for support of 
- * Motorola's 68332 MCU in the efi332 project.
- * 
- * Redistribution and use in source and binary forms are permitted
- * provided that the following conditions are met:
- * 1. Redistribution of source code and documentation must retain
- *    the above authorship, this list of conditions and the
- *    following disclaimer.
- * 2. The name of the author may not be used to endorse or promote
- *    products derived from this software without specific prior
- *    written permission.
- *
- * This software is provided "AS IS" without warranty of any kind,
- * either expressed or implied, including, but not limited to, the
- * implied warranties of merchantability, title and fitness for a
- * particular purpose.
- *
- *------------------------------------------------------------------
- *
- *  $Id$
- */
-
-#ifndef _SIM_H_
-#define _SIM_H_
-
-
-/*
- *  XXX Why is a generic file like this including a bsp specific file?
-
-#include <efi332.h>
- */
-
-
-/* SAM-- shift and mask */
-#undef  SAM
-#define SAM(a,b,c) ((a << b) & c)
-
-/*
- *  These macros make this file usable from assembly.
- */
-
-#ifdef ASM
-#define SIM_VOLATILE_USHORT_POINTER
-#define SIM_VOLATILE_UCHAR_POINTER
-#else
-#define SIM_VOLATILE_USHORT_POINTER (volatile unsigned short int * const)
-#define SIM_VOLATILE_UCHAR_POINTER  (volatile unsigned char * const)
-#endif
-
-/* SIM_CRB (SIM Control Register Block) base address of the SIM
-   control registers */
-/* not included in ram_init.h */
-#if SIM_MM == 0
-#define SIM_CRB 0x7ffa00
-#else
-#undef SIM_MM
-#define SIM_MM 1
-#define SIM_CRB 0xfffa00
-#endif 
-/* end not included in ram_init.h */
-
-
-
-#define SIMCR SIM_VOLATILE_USHORT_POINTER(0x00 + SIM_CRB)
-				/* Module Configuration Register */
-#define    EXOFF 0x8000		/*    External Clock Off */
-#define    FRZSW 0x4000		/*    Freeze Software Enable */
-#define    FRZBM 0x2000		/*    Freeze Bus Monitor Enable */
-#define    SLVEN 0x0800		/*    Factory Test Model Enabled (ro)*/
-#define    SHEN  0x0300		/*    Show Cycle Enable */
-#define    SUPV  0x0080		/*    Supervisor/Unrestricted Data Space */
-#define    MM    0x0040 	/*    Module Mapping */
-#define    IARB  0x000f		/*    Interrupt Arbitration Field */
-
-
-
-#define SIMTR SIM_VOLATILE_USHORT_POINTER(0x02 + SIM_CRB)
-				/* SIM Test Register */
-/* Used only for factor testing */
-
-
-
-#define SYNCR SIM_VOLATILE_USHORT_POINTER(0x04 + SIM_CRB)
-				/* Clock Synthesizer Control Register */
-#define    W     0x8000		/*    Frequency Control (VCO) */
-#define    X     0x4000		/*    Frequency Control Bit (Prescale) */
-#define    Y     0x3f00		/*    Frequency Control Counter */
-#define    EDIV  0x0080		/*    ECLK Divide Rate */
-#define    SLIMP 0x0010		/*    Limp Mode Status */
-#define	   SLOCK 0x0008		/*    Synthesizer Lock */
-#define    RSTEN 0x0004		/*    Reset Enable */
-#define    STSIM 0x0002		/*    Stop Mode SIM Clock */
-#define    STEXT 0x0001		/*    Stop Mode External Clock */
-
-
-
-#define RSR SIM_VOLATILE_UCHAR_POINTER(0x07 + SIM_CRB)
-				/* Reset Status Register */
-#define    EXT   0x0080		/*    External Reset */
-#define    POW   0x0040		/*    Power-On Reset */
-#define    SW    0x0020		/*    Software Watchdog Reset */
-#define    DBF   0x0010		/*    Double Bus Fault Reset */
-#define    LOC   0x0004		/*    Loss of Clock Reset */
-#define    SYS   0x0002		/*    System Reset */
-#define    TST   0x0001		/*    Test Submodule Reset */
-
-
-
-#define SIMTRE SIM_VOLATILE_USHORT_POINTER(0x08 + SIM_CRB)
-				/* System Integration Test Register */
-/* Used only for factor testing */
-
-
-
-#define PORTE0 SIM_VOLATILE_UCHAR_POINTER(0x11 + SIM_CRB)
-#define PORTE1 SIM_VOLATILE_UCHAR_POINTER(0x13 + SIM_CRB)
-				/* Port E Data Register */
-#define DDRE SIM_VOLATILE_UCHAR_POINTER(0x15 + SIM_CRB)
-				/* Port E Data Direction Register */
-#define PEPAR SIM_VOLATILE_UCHAR_POINTER(0x17 + SIM_CRB)
-				/* Port E Pin Assignment Register */
-/* Any bit cleared (zero) defines the corresponding pin to be an I/O
-   pin. Any bit set defines the corresponding pin to be a bus control
-   signal. */
-
-
-
-#define PORTF0 SIM_VOLATILE_UCHAR_POINTER(0x19 + SIM_CRB)
-#define PORTF1 SIM_VOLATILE_UCHAR_POINTER(0x1b + SIM_CRB)
-				/* Port F Data Register */
-#define DDRF SIM_VOLATILE_UCHAR_POINTER(0x1d + SIM_CRB)
-				/* Port E Data Direction Register */
-#define PFPAR SIM_VOLATILE_UCHAR_POINTER(0x1f + SIM_CRB)
-/* Any bit cleared (zero) defines the corresponding pin to be an I/O
-   pin. Any bit set defines the corresponding pin to be a bus control
-   signal. */
-
-
-
-#define SYPCR SIM_VOLATILE_UCHAR_POINTER(0x21 + SIM_CRB)
-/* !!! can write to only once after reset !!! */
-				/* System Protection Control Register */
-#define    SWE   0x80		/*    Software Watch Enable */
-#define    SWP   0x40		/*    Software Watchdog Prescale */
-#define    SWT   0x30		/*    Software Watchdog Timing */
-#define    HME   0x08		/*    Halt Monitor Enable */
-#define    BME   0x04		/*    Bus Monitor External Enable */
-#define    BMT   0x03		/*    Bus Monitor Timing */
-
-
-
-#define PICR SIM_VOLATILE_USHORT_POINTER(0x22 + SIM_CRB)
-				/* Periodic Interrupt Control Reg. */
-#define    PIRQL 0x0700		/*    Periodic Interrupt Request Level */
-#define    PIV   0x00ff		/*    Periodic Interrupt Level */
-
-
-
-#define PITR SIM_VOLATILE_USHORT_POINTER(0x24 + SIM_CRB)
-				/* Periodic Interrupt Timer Register */
-#define    PTP   0x0100		/*    Periodic Timer Prescaler Control */
-#define    PITM  0x00ff		/*    Periodic Interrupt Timing Modulus */
-
-
-
-#define SWSR SIM_VOLATILE_UCHAR_POINTER(0x27 + SIM_CRB)
-				/* Software Service Register */
-/* write 0x55 then 0xaa to service the software watchdog */
-
-
-
-#define TSTMSRA SIM_VOLATILE_USHORT_POINTER(0x30 + SIM_CRB)
-				/* Test Module Master Shift A */
-#define TSTMSRB SIM_VOLATILE_USHORT_POINTER(0x32 + SIM_CRB)
-				/* Test Module Master Shift A */
-#define TSTSC SIM_VOLATILE_USHORT_POINTER(0x34 + SIM_CRB)
-				/* Test Module Shift Count */
-#define TSTRC SIM_VOLATILE_USHORT_POINTER(0x36 + SIM_CRB)
-				/* Test Module Repetition Counter */
-#define CREG SIM_VOLATILE_USHORT_POINTER(0x38 + SIM_CRB)
-				/* Test Module Control */
-#define DREG SIM_VOLATILE_USHORT_POINTER(0x3a + SIM_CRB)
-				/* Test Module Distributed */
-/* Used only for factor testing */
-
-
-
-#define PORTC SIM_VOLATILE_UCHAR_POINTER(0x41 + SIM_CRB)
-				/* Port C Data */
-
-
-
-#define CSPAR0 SIM_VOLATILE_USHORT_POINTER(0x44 + SIM_CRB)
-				/* Chip Select Pin Assignment
-				   Resgister 0 */
-/* CSPAR0 contains seven two-bit fields that determine the functions
-   of corresponding chip-select pins. CSPAR0[15:14] are not
-   used. These bits always read zero; write have no effect. CSPAR0 bit
-   1 always reads one; writes to CSPAR0 bit 1 have no effect. */
-#define CSPAR1 SIM_VOLATILE_USHORT_POINTER(0x46 + SIM_CRB)
-				/* Chip Select Pin Assignment 
-				   Register 1 */
-/* CSPAR1 contains five two-bit fields that determine the finctions of
-   corresponding chip-select pins. CSPAR1[15:10] are not used. These
-   bits always read zero; writes have no effect. */
-/*
- *
- *                      Bit Field  |  Description
- *                     ------------+---------------
- *                         00      | Discrete Output
- *                         01      | Alternate Function
- *                         10      | Chip Select (8-bit port)
- *                         11      | Chip Select (16-bit port)
- */
-#define DisOut 0x0
-#define AltFun 0x1
-#define CS8bit 0x2
-#define CS16bit 0x3
-/*
- *
- * CSPARx Field    |Chip Select Signal  |  Alternate Signal  |  Discrete Output
- *-----------------+--------------------+--------------------+---------------*/
-#define CS_5    12 /*     !CS5          |         FC2        |       PC2     */
-#define CS_4    10 /*     !CS4          |         FC1        |       PC1     */
-#define CS_3     8 /*     !CS3          |         FC0        |       PC0     */
-#define CS_2     6 /*     !CS2          |       !BGACK       |               */
-#define CS_1     4 /*     !CS1          |         !BG        |               */
-#define CS_0     2 /*     !CS0          |         !BR        |               */
-#define CSBOOT   0 /*     !CSBOOT       |                    |               */
-/*                 |                    |                    |               */
-#define CS_10    8 /*     !CS10         |       ADDR23       |      ECLK     */
-#define CS_9     6 /*     !CS9          |       ADDR22       |       PC6     */
-#define CS_8     4 /*     !CS8          |       ADDR21       |       PC5     */
-#define CS_7     2 /*     !CS7          |       ADDR20       |       PC4     */
-#define CS_6     0 /*     !CS6          |       ADDR19       |       PC3     */
-
-#define BS_2K 0x0
-#define BS_8K 0x1
-#define BS_16K 0x2
-#define BS_64K 0x3
-#define BS_128K 0x4
-#define BS_256K 0x5
-#define BS_512K 0x6
-#define BS_1M 0x7
-
-#define CSBARBT SIM_VOLATILE_USHORT_POINTER(0x48 + SIM_CRB)
-#define CSBAR0 SIM_VOLATILE_USHORT_POINTER(0x4c + SIM_CRB)
-#define CSBAR1 SIM_VOLATILE_USHORT_POINTER(0x50 + SIM_CRB)
-#define CSBAR2 SIM_VOLATILE_USHORT_POINTER(0x54 + SIM_CRB)
-#define CSBAR3 SIM_VOLATILE_USHORT_POINTER(0x58 + SIM_CRB)
-#define CSBAR4 SIM_VOLATILE_USHORT_POINTER(0x5c + SIM_CRB)
-#define CSBAR5 SIM_VOLATILE_USHORT_POINTER(0x60 + SIM_CRB)
-#define CSBAR6 SIM_VOLATILE_USHORT_POINTER(0x64 + SIM_CRB)
-#define CSBAR7 SIM_VOLATILE_USHORT_POINTER(0x68 + SIM_CRB)
-#define CSBAR8 SIM_VOLATILE_USHORT_POINTER(0x6c + SIM_CRB)
-#define CSBAR9 SIM_VOLATILE_USHORT_POINTER(0x70 + SIM_CRB)
-#define CSBAR10 SIM_VOLATILE_USHORT_POINTER(0x74 + SIM_CRB)
-
-#define MODE 0x8000
-#define Disable 0
-#define LowerByte 0x2000
-#define UpperByte 0x4000
-#define BothBytes 0x6000
-#define ReadOnly 0x0800
-#define WriteOnly 0x1000
-#define ReadWrite 0x1800
-#define SyncAS 0x0
-#define SyncDS 0x0400
-
-#define WaitStates_0 (0x0 << 6)
-#define WaitStates_1 (0x1 << 6)
-#define WaitStates_2 (0x2 << 6)
-#define WaitStates_3 (0x3 << 6)
-#define WaitStates_4 (0x4 << 6)
-#define WaitStates_5 (0x5 << 6)
-#define WaitStates_6 (0x6 << 6)
-#define WaitStates_7 (0x7 << 6)
-#define WaitStates_8 (0x8 << 6)
-#define WaitStates_9 (0x9 << 6)
-#define WaitStates_10 (0xa << 6)
-#define WaitStates_11 (0xb << 6)
-#define WaitStates_12 (0xc << 6)
-#define WaitStates_13 (0xd << 6)
-#define FastTerm (0xe << 6)
-#define External (0xf << 6)
-
-#define CPUSpace (0x0 << 4)
-#define UserSpace (0x1 << 4)
-#define SupSpace (0x2 << 4)
-#define UserSupSpace (0x3 << 4)
-
-#define IPLevel_any 0x0
-#define IPLevel_1 0x2
-#define IPLevel_2 0x4
-#define IPLevel_3 0x6
-#define IPLevel_4 0x8
-#define IPLevel_5 0xa
-#define IPLevel_6 0xc
-#define IPLevel_7 0xe
-
-#define AVEC 1
-
-#define CSORBT SIM_VOLATILE_USHORT_POINTER(0x4a + SIM_CRB)
-#define CSOR0 SIM_VOLATILE_USHORT_POINTER(0x4e + SIM_CRB)
-#define CSOR1 SIM_VOLATILE_USHORT_POINTER(0x52 + SIM_CRB)
-#define CSOR2 SIM_VOLATILE_USHORT_POINTER(0x56 + SIM_CRB)
-#define CSOR3 SIM_VOLATILE_USHORT_POINTER(0x5a + SIM_CRB)
-#define CSOR4 SIM_VOLATILE_USHORT_POINTER(0x5e + SIM_CRB)
-#define CSOR5 SIM_VOLATILE_USHORT_POINTER(0x62 + SIM_CRB)
-#define CSOR6 SIM_VOLATILE_USHORT_POINTER(0x66 + SIM_CRB)
-#define CSOR7 SIM_VOLATILE_USHORT_POINTER(0x6a + SIM_CRB)
-#define CSOR8 SIM_VOLATILE_USHORT_POINTER(0x6e + SIM_CRB)
-#define CSOR9 SIM_VOLATILE_USHORT_POINTER(0x72 + SIM_CRB)
-#define CSOR10 SIM_VOLATILE_USHORT_POINTER(0x76 + SIM_CRB)
-
-#endif /* _SIM_h_ */
diff --git a/cpukit/score/cpu/m68k/sim.h b/cpukit/score/cpu/m68k/sim.h
deleted file mode 100644
index d70f56d360..0000000000
--- a/cpukit/score/cpu/m68k/sim.h
+++ /dev/null
@@ -1,342 +0,0 @@
-/*
- *-------------------------------------------------------------------
- *
- *   SIM -- System Integration Module
- *
- * The system integration module (SIM) is used on many Motorola 16-
- * and 32-bit MCUs for the following functions:
- *
- *  () System configuration and protection. Bus and software watchdog
- *  monitors are provided in addition to periodic interrupt generators.
- *
- *  () Clock signal generation for other intermodule bus (IMB) members
- *  and external devices.
- *
- *  () The generation of chip-select signals that simplify external 
- *  circuitry interface.
- *
- *  () Data ports that are available for general purpose input and
- *  output.
- *
- *  () A system test block that is intended only for factory tests.
- *
- * For more information, refer to Motorola's "Modular Microcontroller
- * Family System Integration Module Reference Manual" (Motorola document
- * SIMRM/AD). 
- *
- * This file has been created by John S. Gwynne for support of 
- * Motorola's 68332 MCU in the efi332 project.
- * 
- * Redistribution and use in source and binary forms are permitted
- * provided that the following conditions are met:
- * 1. Redistribution of source code and documentation must retain
- *    the above authorship, this list of conditions and the
- *    following disclaimer.
- * 2. The name of the author may not be used to endorse or promote
- *    products derived from this software without specific prior
- *    written permission.
- *
- * This software is provided "AS IS" without warranty of any kind,
- * either expressed or implied, including, but not limited to, the
- * implied warranties of merchantability, title and fitness for a
- * particular purpose.
- *
- *------------------------------------------------------------------
- *
- *  $Id$
- */
-
-#ifndef _SIM_H_
-#define _SIM_H_
-
-
-/*
- *  XXX Why is a generic file like this including a bsp specific file?
-
-#include <efi332.h>
- */
-
-
-/* SAM-- shift and mask */
-#undef  SAM
-#define SAM(a,b,c) ((a << b) & c)
-
-/*
- *  These macros make this file usable from assembly.
- */
-
-#ifdef ASM
-#define SIM_VOLATILE_USHORT_POINTER
-#define SIM_VOLATILE_UCHAR_POINTER
-#else
-#define SIM_VOLATILE_USHORT_POINTER (volatile unsigned short int * const)
-#define SIM_VOLATILE_UCHAR_POINTER  (volatile unsigned char * const)
-#endif
-
-/* SIM_CRB (SIM Control Register Block) base address of the SIM
-   control registers */
-/* not included in ram_init.h */
-#if SIM_MM == 0
-#define SIM_CRB 0x7ffa00
-#else
-#undef SIM_MM
-#define SIM_MM 1
-#define SIM_CRB 0xfffa00
-#endif 
-/* end not included in ram_init.h */
-
-
-
-#define SIMCR SIM_VOLATILE_USHORT_POINTER(0x00 + SIM_CRB)
-				/* Module Configuration Register */
-#define    EXOFF 0x8000		/*    External Clock Off */
-#define    FRZSW 0x4000		/*    Freeze Software Enable */
-#define    FRZBM 0x2000		/*    Freeze Bus Monitor Enable */
-#define    SLVEN 0x0800		/*    Factory Test Model Enabled (ro)*/
-#define    SHEN  0x0300		/*    Show Cycle Enable */
-#define    SUPV  0x0080		/*    Supervisor/Unrestricted Data Space */
-#define    MM    0x0040 	/*    Module Mapping */
-#define    IARB  0x000f		/*    Interrupt Arbitration Field */
-
-
-
-#define SIMTR SIM_VOLATILE_USHORT_POINTER(0x02 + SIM_CRB)
-				/* SIM Test Register */
-/* Used only for factor testing */
-
-
-
-#define SYNCR SIM_VOLATILE_USHORT_POINTER(0x04 + SIM_CRB)
-				/* Clock Synthesizer Control Register */
-#define    W     0x8000		/*    Frequency Control (VCO) */
-#define    X     0x4000		/*    Frequency Control Bit (Prescale) */
-#define    Y     0x3f00		/*    Frequency Control Counter */
-#define    EDIV  0x0080		/*    ECLK Divide Rate */
-#define    SLIMP 0x0010		/*    Limp Mode Status */
-#define	   SLOCK 0x0008		/*    Synthesizer Lock */
-#define    RSTEN 0x0004		/*    Reset Enable */
-#define    STSIM 0x0002		/*    Stop Mode SIM Clock */
-#define    STEXT 0x0001		/*    Stop Mode External Clock */
-
-
-
-#define RSR SIM_VOLATILE_UCHAR_POINTER(0x07 + SIM_CRB)
-				/* Reset Status Register */
-#define    EXT   0x0080		/*    External Reset */
-#define    POW   0x0040		/*    Power-On Reset */
-#define    SW    0x0020		/*    Software Watchdog Reset */
-#define    DBF   0x0010		/*    Double Bus Fault Reset */
-#define    LOC   0x0004		/*    Loss of Clock Reset */
-#define    SYS   0x0002		/*    System Reset */
-#define    TST   0x0001		/*    Test Submodule Reset */
-
-
-
-#define SIMTRE SIM_VOLATILE_USHORT_POINTER(0x08 + SIM_CRB)
-				/* System Integration Test Register */
-/* Used only for factor testing */
-
-
-
-#define PORTE0 SIM_VOLATILE_UCHAR_POINTER(0x11 + SIM_CRB)
-#define PORTE1 SIM_VOLATILE_UCHAR_POINTER(0x13 + SIM_CRB)
-				/* Port E Data Register */
-#define DDRE SIM_VOLATILE_UCHAR_POINTER(0x15 + SIM_CRB)
-				/* Port E Data Direction Register */
-#define PEPAR SIM_VOLATILE_UCHAR_POINTER(0x17 + SIM_CRB)
-				/* Port E Pin Assignment Register */
-/* Any bit cleared (zero) defines the corresponding pin to be an I/O
-   pin. Any bit set defines the corresponding pin to be a bus control
-   signal. */
-
-
-
-#define PORTF0 SIM_VOLATILE_UCHAR_POINTER(0x19 + SIM_CRB)
-#define PORTF1 SIM_VOLATILE_UCHAR_POINTER(0x1b + SIM_CRB)
-				/* Port F Data Register */
-#define DDRF SIM_VOLATILE_UCHAR_POINTER(0x1d + SIM_CRB)
-				/* Port E Data Direction Register */
-#define PFPAR SIM_VOLATILE_UCHAR_POINTER(0x1f + SIM_CRB)
-/* Any bit cleared (zero) defines the corresponding pin to be an I/O
-   pin. Any bit set defines the corresponding pin to be a bus control
-   signal. */
-
-
-
-#define SYPCR SIM_VOLATILE_UCHAR_POINTER(0x21 + SIM_CRB)
-/* !!! can write to only once after reset !!! */
-				/* System Protection Control Register */
-#define    SWE   0x80		/*    Software Watch Enable */
-#define    SWP   0x40		/*    Software Watchdog Prescale */
-#define    SWT   0x30		/*    Software Watchdog Timing */
-#define    HME   0x08		/*    Halt Monitor Enable */
-#define    BME   0x04		/*    Bus Monitor External Enable */
-#define    BMT   0x03		/*    Bus Monitor Timing */
-
-
-
-#define PICR SIM_VOLATILE_USHORT_POINTER(0x22 + SIM_CRB)
-				/* Periodic Interrupt Control Reg. */
-#define    PIRQL 0x0700		/*    Periodic Interrupt Request Level */
-#define    PIV   0x00ff		/*    Periodic Interrupt Level */
-
-
-
-#define PITR SIM_VOLATILE_USHORT_POINTER(0x24 + SIM_CRB)
-				/* Periodic Interrupt Timer Register */
-#define    PTP   0x0100		/*    Periodic Timer Prescaler Control */
-#define    PITM  0x00ff		/*    Periodic Interrupt Timing Modulus */
-
-
-
-#define SWSR SIM_VOLATILE_UCHAR_POINTER(0x27 + SIM_CRB)
-				/* Software Service Register */
-/* write 0x55 then 0xaa to service the software watchdog */
-
-
-
-#define TSTMSRA SIM_VOLATILE_USHORT_POINTER(0x30 + SIM_CRB)
-				/* Test Module Master Shift A */
-#define TSTMSRB SIM_VOLATILE_USHORT_POINTER(0x32 + SIM_CRB)
-				/* Test Module Master Shift A */
-#define TSTSC SIM_VOLATILE_USHORT_POINTER(0x34 + SIM_CRB)
-				/* Test Module Shift Count */
-#define TSTRC SIM_VOLATILE_USHORT_POINTER(0x36 + SIM_CRB)
-				/* Test Module Repetition Counter */
-#define CREG SIM_VOLATILE_USHORT_POINTER(0x38 + SIM_CRB)
-				/* Test Module Control */
-#define DREG SIM_VOLATILE_USHORT_POINTER(0x3a + SIM_CRB)
-				/* Test Module Distributed */
-/* Used only for factor testing */
-
-
-
-#define PORTC SIM_VOLATILE_UCHAR_POINTER(0x41 + SIM_CRB)
-				/* Port C Data */
-
-
-
-#define CSPAR0 SIM_VOLATILE_USHORT_POINTER(0x44 + SIM_CRB)
-				/* Chip Select Pin Assignment
-				   Resgister 0 */
-/* CSPAR0 contains seven two-bit fields that determine the functions
-   of corresponding chip-select pins. CSPAR0[15:14] are not
-   used. These bits always read zero; write have no effect. CSPAR0 bit
-   1 always reads one; writes to CSPAR0 bit 1 have no effect. */
-#define CSPAR1 SIM_VOLATILE_USHORT_POINTER(0x46 + SIM_CRB)
-				/* Chip Select Pin Assignment 
-				   Register 1 */
-/* CSPAR1 contains five two-bit fields that determine the finctions of
-   corresponding chip-select pins. CSPAR1[15:10] are not used. These
-   bits always read zero; writes have no effect. */
-/*
- *
- *                      Bit Field  |  Description
- *                     ------------+---------------
- *                         00      | Discrete Output
- *                         01      | Alternate Function
- *                         10      | Chip Select (8-bit port)
- *                         11      | Chip Select (16-bit port)
- */
-#define DisOut 0x0
-#define AltFun 0x1
-#define CS8bit 0x2
-#define CS16bit 0x3
-/*
- *
- * CSPARx Field    |Chip Select Signal  |  Alternate Signal  |  Discrete Output
- *-----------------+--------------------+--------------------+---------------*/
-#define CS_5    12 /*     !CS5          |         FC2        |       PC2     */
-#define CS_4    10 /*     !CS4          |         FC1        |       PC1     */
-#define CS_3     8 /*     !CS3          |         FC0        |       PC0     */
-#define CS_2     6 /*     !CS2          |       !BGACK       |               */
-#define CS_1     4 /*     !CS1          |         !BG        |               */
-#define CS_0     2 /*     !CS0          |         !BR        |               */
-#define CSBOOT   0 /*     !CSBOOT       |                    |               */
-/*                 |                    |                    |               */
-#define CS_10    8 /*     !CS10         |       ADDR23       |      ECLK     */
-#define CS_9     6 /*     !CS9          |       ADDR22       |       PC6     */
-#define CS_8     4 /*     !CS8          |       ADDR21       |       PC5     */
-#define CS_7     2 /*     !CS7          |       ADDR20       |       PC4     */
-#define CS_6     0 /*     !CS6          |       ADDR19       |       PC3     */
-
-#define BS_2K 0x0
-#define BS_8K 0x1
-#define BS_16K 0x2
-#define BS_64K 0x3
-#define BS_128K 0x4
-#define BS_256K 0x5
-#define BS_512K 0x6
-#define BS_1M 0x7
-
-#define CSBARBT SIM_VOLATILE_USHORT_POINTER(0x48 + SIM_CRB)
-#define CSBAR0 SIM_VOLATILE_USHORT_POINTER(0x4c + SIM_CRB)
-#define CSBAR1 SIM_VOLATILE_USHORT_POINTER(0x50 + SIM_CRB)
-#define CSBAR2 SIM_VOLATILE_USHORT_POINTER(0x54 + SIM_CRB)
-#define CSBAR3 SIM_VOLATILE_USHORT_POINTER(0x58 + SIM_CRB)
-#define CSBAR4 SIM_VOLATILE_USHORT_POINTER(0x5c + SIM_CRB)
-#define CSBAR5 SIM_VOLATILE_USHORT_POINTER(0x60 + SIM_CRB)
-#define CSBAR6 SIM_VOLATILE_USHORT_POINTER(0x64 + SIM_CRB)
-#define CSBAR7 SIM_VOLATILE_USHORT_POINTER(0x68 + SIM_CRB)
-#define CSBAR8 SIM_VOLATILE_USHORT_POINTER(0x6c + SIM_CRB)
-#define CSBAR9 SIM_VOLATILE_USHORT_POINTER(0x70 + SIM_CRB)
-#define CSBAR10 SIM_VOLATILE_USHORT_POINTER(0x74 + SIM_CRB)
-
-#define MODE 0x8000
-#define Disable 0
-#define LowerByte 0x2000
-#define UpperByte 0x4000
-#define BothBytes 0x6000
-#define ReadOnly 0x0800
-#define WriteOnly 0x1000
-#define ReadWrite 0x1800
-#define SyncAS 0x0
-#define SyncDS 0x0400
-
-#define WaitStates_0 (0x0 << 6)
-#define WaitStates_1 (0x1 << 6)
-#define WaitStates_2 (0x2 << 6)
-#define WaitStates_3 (0x3 << 6)
-#define WaitStates_4 (0x4 << 6)
-#define WaitStates_5 (0x5 << 6)
-#define WaitStates_6 (0x6 << 6)
-#define WaitStates_7 (0x7 << 6)
-#define WaitStates_8 (0x8 << 6)
-#define WaitStates_9 (0x9 << 6)
-#define WaitStates_10 (0xa << 6)
-#define WaitStates_11 (0xb << 6)
-#define WaitStates_12 (0xc << 6)
-#define WaitStates_13 (0xd << 6)
-#define FastTerm (0xe << 6)
-#define External (0xf << 6)
-
-#define CPUSpace (0x0 << 4)
-#define UserSpace (0x1 << 4)
-#define SupSpace (0x2 << 4)
-#define UserSupSpace (0x3 << 4)
-
-#define IPLevel_any 0x0
-#define IPLevel_1 0x2
-#define IPLevel_2 0x4
-#define IPLevel_3 0x6
-#define IPLevel_4 0x8
-#define IPLevel_5 0xa
-#define IPLevel_6 0xc
-#define IPLevel_7 0xe
-
-#define AVEC 1
-
-#define CSORBT SIM_VOLATILE_USHORT_POINTER(0x4a + SIM_CRB)
-#define CSOR0 SIM_VOLATILE_USHORT_POINTER(0x4e + SIM_CRB)
-#define CSOR1 SIM_VOLATILE_USHORT_POINTER(0x52 + SIM_CRB)
-#define CSOR2 SIM_VOLATILE_USHORT_POINTER(0x56 + SIM_CRB)
-#define CSOR3 SIM_VOLATILE_USHORT_POINTER(0x5a + SIM_CRB)
-#define CSOR4 SIM_VOLATILE_USHORT_POINTER(0x5e + SIM_CRB)
-#define CSOR5 SIM_VOLATILE_USHORT_POINTER(0x62 + SIM_CRB)
-#define CSOR6 SIM_VOLATILE_USHORT_POINTER(0x66 + SIM_CRB)
-#define CSOR7 SIM_VOLATILE_USHORT_POINTER(0x6a + SIM_CRB)
-#define CSOR8 SIM_VOLATILE_USHORT_POINTER(0x6e + SIM_CRB)
-#define CSOR9 SIM_VOLATILE_USHORT_POINTER(0x72 + SIM_CRB)
-#define CSOR10 SIM_VOLATILE_USHORT_POINTER(0x76 + SIM_CRB)
-
-#endif /* _SIM_h_ */
diff --git a/cpukit/score/cpu/mips/asm.h b/cpukit/score/cpu/mips/asm.h
deleted file mode 100644
index fccd89069f..0000000000
--- a/cpukit/score/cpu/mips/asm.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/*  asm.h
- *
- *  This include file attempts to address the problems
- *  caused by incompatible flavors of assemblers and
- *  toolsets.  It primarily addresses variations in the
- *  use of leading underscores on symbols and the requirement
- *  that register names be preceded by a %.
- *
- *
- *  NOTE: The spacing in the use of these macros
- *        is critical to them working as advertised.
- *
- *  COPYRIGHT:
- *
- *  This file is based on similar code found in newlib available
- *  from ftp.cygnus.com.  The file which was used had no copyright
- *  notice.  This file is freely distributable as long as the source
- *  of the file is noted.  This file is:
- *
- *  COPYRIGHT (c) 1994-1997.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  $Id$
- */
-/* @(#)asm.h       03/15/96     1.1 */
-
-#ifndef __NO_CPU_ASM_h
-#define __NO_CPU_ASM_h
-
-/*
- *  Indicate we are in an assembly file and get the basic CPU definitions.
- */
-
-#ifndef ASM
-#define ASM
-#endif
-#include <rtems/score/targopts.h>
-#include <rtems/score/no_cpu.h>
-
-/*
- *  Recent versions of GNU cpp define variables which indicate the
- *  need for underscores and percents.  If not using GNU cpp or
- *  the version does not support this, then you will obviously
- *  have to define these as appropriate.
- */
-
-#ifndef __USER_LABEL_PREFIX__
-#define __USER_LABEL_PREFIX__ _
-#endif
-
-#ifndef __REGISTER_PREFIX__
-#define __REGISTER_PREFIX__
-#endif
-
-/* ANSI concatenation macros.  */
-
-#define CONCAT1(a, b) CONCAT2(a, b)
-#define CONCAT2(a, b) a ## b
-
-/* Use the right prefix for global labels.  */
-
-#define SYM(x) CONCAT1 (__USER_LABEL_PREFIX__, x)
-
-/* Use the right prefix for registers.  */
-
-#define REG(x) CONCAT1 (__REGISTER_PREFIX__, x)
-
-/*
- *  define macros for all of the registers on this CPU
- *
- *  EXAMPLE:     #define d0 REG (d0)
- */
-
-/*
- *  Define macros to handle section beginning and ends.
- */
-
-
-#define BEGIN_CODE_DCL .text
-#define END_CODE_DCL
-#define BEGIN_DATA_DCL .data
-#define END_DATA_DCL
-#define BEGIN_CODE .text
-#define END_CODE
-#define BEGIN_DATA
-#define END_DATA
-#define BEGIN_BSS
-#define END_BSS
-#define END
-
-/*
- *  Following must be tailor for a particular flavor of the C compiler.
- *  They may need to put underscores in front of the symbols.
- */
-
-#define PUBLIC(sym) .globl SYM (sym)
-#define EXTERN(sym) .globl SYM (sym)
-
-#endif
-/* end of include file */
-
-
diff --git a/cpukit/score/cpu/mips/cpu.c b/cpukit/score/cpu/mips/cpu.c
deleted file mode 100644
index 4617be460d..0000000000
--- a/cpukit/score/cpu/mips/cpu.c
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- *  Mips CPU Dependent Source
- *
- *  Author:     Craig Lebakken <craigl@transition.com>
- *
- *  COPYRIGHT (c) 1996 by Transition Networks Inc.
- *
- *  To anyone who acknowledges that this file is provided "AS IS"
- *  without any express or implied warranty:
- *      permission to use, copy, modify, and distribute this file
- *      for any purpose is hereby granted without fee, provided that
- *      the above copyright notice and this notice appears in all
- *      copies, and that the name of Transition Networks not be used in
- *      advertising or publicity pertaining to distribution of the
- *      software without specific, written prior permission.
- *      Transition Networks makes no representations about the suitability
- *      of this software for any purpose.
- *
- *  Derived from c/src/exec/score/cpu/no_cpu/cpu.c:
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-/*
- *  Rather than deleting this, it is commented out to (hopefully) help
- *  the submitter send updates.
- *
- * static char _sccsid[] = "@(#)cpu.c 08/20/96     1.5\n";
- */
-
-#include <rtems/system.h>
-#include <rtems/score/isr.h>
-#include <rtems/score/wkspace.h>
-
-
-ISR_Handler_entry _ISR_Vector_table[ ISR_NUMBER_OF_VECTORS ];
-
-/*  _CPU_Initialize
- *
- *  This routine performs processor dependent initialization.
- *
- *  INPUT PARAMETERS:
- *    cpu_table       - CPU table to initialize
- *    thread_dispatch - address of disptaching routine
- */
-
-
-void null_handler( void )
-{
-}
-
-
-void _CPU_Initialize(
-  rtems_cpu_table  *cpu_table,
-  void      (*thread_dispatch)      /* ignored on this CPU */
-)
-{
-   unsigned int i = ISR_NUMBER_OF_VECTORS;
-
-   while ( i-- )
-   {
-      _ISR_Vector_table[i] = (ISR_Handler_entry)null_handler;
-   }
-
-  /*
-   *  The thread_dispatch argument is the address of the entry point
-   *  for the routine called at the end of an ISR once it has been
-   *  decided a context switch is necessary.  On some compilation
-   *  systems it is difficult to call a high-level language routine
-   *  from assembly.  This allows us to trick these systems.
-   *
-   *  If you encounter this problem save the entry point in a CPU
-   *  dependent variable.
-   */
-
-  _CPU_Thread_dispatch_pointer = thread_dispatch;
-
-  /*
-   *  If there is not an easy way to initialize the FP context
-   *  during Context_Initialize, then it is usually easier to
-   *  save an "uninitialized" FP context here and copy it to
-   *  the task's during Context_Initialize.
-   */
-
-  /* FP context initialization support goes here */
-
-  _CPU_Table = *cpu_table;
-
-}
-
-/*PAGE
- *
- *  _CPU_ISR_Get_level
- */
- 
-#if 0 /* located in cpu_asm.S */
-unsigned32 _CPU_ISR_Get_level( void )
-{
-  /*
-   *  This routine returns the current interrupt level.
-   */
-}
-#endif
-
-/*PAGE
- *
- *  _CPU_ISR_install_raw_handler
- */
- 
-void _CPU_ISR_install_raw_handler(
-  unsigned32  vector,
-  proc_ptr    new_handler,
-  proc_ptr   *old_handler
-)
-{
-  /*
-   *  This is where we install the interrupt handler into the "raw" interrupt
-   *  table used by the CPU to dispatch interrupt handlers.
-   */
-
-#if 0 /* not necessary */
-/* use IDT/Sim to set interrupt vector.  Needed to co-exist with debugger. */
-   add_ext_int_func( vector, new_handler );
-#endif
-}
-
-/*PAGE
- *
- *  _CPU_ISR_install_vector
- *
- *  This kernel routine installs the RTEMS handler for the
- *  specified vector.
- *
- *  Input parameters:
- *    vector      - interrupt vector number
- *    old_handler - former ISR for this vector number
- *    new_handler - replacement ISR for this vector number
- *
- *  Output parameters:  NONE
- *
- */
-
-void _CPU_ISR_install_vector(
-  unsigned32  vector,
-  proc_ptr    new_handler,
-  proc_ptr   *old_handler
-)
-{
-   *old_handler = _ISR_Vector_table[ vector ];
-
-   /*
-    *  If the interrupt vector table is a table of pointer to isr entry
-    *  points, then we need to install the appropriate RTEMS interrupt
-    *  handler for this vector number.
-    */
-
-   _CPU_ISR_install_raw_handler( vector, _ISR_Handler, old_handler );
-
-   /*
-    *  We put the actual user ISR address in '_ISR_vector_table'.  This will
-    *  be used by the _ISR_Handler so the user gets control.
-    */
-
-    _ISR_Vector_table[ vector ] = new_handler;
-}
-
-/*PAGE
- *
- *  _CPU_Install_interrupt_stack
- */
-
-void _CPU_Install_interrupt_stack( void )
-{
-/* we don't support this yet */
-}
-
-/*PAGE
- *
- *  _CPU_Internal_threads_Idle_thread_body
- *
- *  NOTES:
- *
- *  1. This is the same as the regular CPU independent algorithm.
- *
- *  2. If you implement this using a "halt", "idle", or "shutdown"
- *     instruction, then don't forget to put it in an infinite loop.
- *
- *  3. Be warned. Some processors with onboard DMA have been known
- *     to stop the DMA if the CPU were put in IDLE mode.  This might
- *     also be a problem with other on-chip peripherals.  So use this
- *     hook with caution.
- */
-
-#if 0 /* located in cpu_asm.S */
-void _CPU_Thread_Idle_body( void )
-{
-
-  for( ; ; )
-    /* insert your "halt" instruction here */ ;
-}
-#endif
-
-extern void mips_break( int error );
-
-#include <stdio.h>
-
-void mips_fatal_error( int error )
-{
-   printf("fatal error 0x%x %d\n",error,error);
-   mips_break( error );
-}
diff --git a/cpukit/score/cpu/mips/cpu_asm.S b/cpukit/score/cpu/mips/cpu_asm.S
deleted file mode 100644
index 7dcb8fbda7..0000000000
--- a/cpukit/score/cpu/mips/cpu_asm.S
+++ /dev/null
@@ -1,972 +0,0 @@
-/*  cpu_asm.S 
- *
- *  This file contains the basic algorithms for all assembly code used
- *  in an specific CPU port of RTEMS.  These algorithms must be implemented
- *  in assembly language
- *
- *  Author:     Craig Lebakken <craigl@transition.com>
- *
- *  COPYRIGHT (c) 1996 by Transition Networks Inc.
- *
- *  To anyone who acknowledges that this file is provided "AS IS"
- *  without any express or implied warranty:
- *      permission to use, copy, modify, and distribute this file
- *      for any purpose is hereby granted without fee, provided that
- *      the above copyright notice and this notice appears in all
- *      copies, and that the name of Transition Networks not be used in
- *      advertising or publicity pertaining to distribution of the
- *      software without specific, written prior permission.
- *      Transition Networks makes no representations about the suitability
- *      of this software for any purpose.
- *
- *  Derived from c/src/exec/score/cpu/no_cpu/cpu_asm.s:
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-/* @(#)cpu_asm.S       08/20/96     1.15 */
-
-#include "cpu_asm.h"
-
-#include "iregdef.h"
-#include "idtcpu.h"
-
-#define FRAME(name,frm_reg,offset,ret_reg)      \
-        .globl  name;                           \
-        .ent    name;                           \
-name:;                                          \
-        .frame  frm_reg,offset,ret_reg
-#define ENDFRAME(name)                          \
-        .end name
-
-
-#define EXCP_STACK_SIZE (NREGS*R_SZ)
-
-#if __ghs__
-#define sd sw
-#define ld lw
-#define dmtc0 mtc0
-#define dsll sll
-#define dmfc0 mfc0
-#endif
-
-#if 1  /* 32 bit unsigned32 types */
-#define sint sw
-#define lint lw
-#define stackadd addiu
-#define intadd addu
-#define SZ_INT 4
-#define SZ_INT_POW2 2
-#else /* 64 bit unsigned32 types */
-#define sint dw
-#define lint dw
-#define stackadd daddiu
-#define intadd daddu
-#define SZ_INT 8
-#define SZ_INT_POW2 3
-#endif
-
-#ifdef __GNUC__
-#define EXTERN(x,size) .extern x,size
-#else
-#define EXTERN(x,size)
-#endif
-
-/* NOTE: these constants must match the Context_Control structure in cpu.h */
-#define S0_OFFSET 0
-#define S1_OFFSET 1
-#define S2_OFFSET 2
-#define S3_OFFSET 3
-#define S4_OFFSET 4
-#define S5_OFFSET 5
-#define S6_OFFSET 6
-#define S7_OFFSET 7
-#define SP_OFFSET 8
-#define FP_OFFSET 9
-#define RA_OFFSET 10
-#define C0_SR_OFFSET 11
-#define C0_EPC_OFFSET 12
-
-/* NOTE: these constants must match the Context_Control_fp structure in cpu.h */
-#define FP0_OFFSET  0 
-#define FP1_OFFSET  1 
-#define FP2_OFFSET  2 
-#define FP3_OFFSET  3 
-#define FP4_OFFSET  4 
-#define FP5_OFFSET  5 
-#define FP6_OFFSET  6 
-#define FP7_OFFSET  7 
-#define FP8_OFFSET  8 
-#define FP9_OFFSET  9 
-#define FP10_OFFSET 10 
-#define FP11_OFFSET 11 
-#define FP12_OFFSET 12 
-#define FP13_OFFSET 13 
-#define FP14_OFFSET 14 
-#define FP15_OFFSET 15 
-#define FP16_OFFSET 16 
-#define FP17_OFFSET 17 
-#define FP18_OFFSET 18 
-#define FP19_OFFSET 19 
-#define FP20_OFFSET 20 
-#define FP21_OFFSET 21 
-#define FP22_OFFSET 22 
-#define FP23_OFFSET 23 
-#define FP24_OFFSET 24 
-#define FP25_OFFSET 25 
-#define FP26_OFFSET 26 
-#define FP27_OFFSET 27 
-#define FP28_OFFSET 28 
-#define FP29_OFFSET 29 
-#define FP30_OFFSET 30 
-#define FP31_OFFSET 31 
-
-
-/*PAGE
- *
- *  _CPU_ISR_Get_level
- */
-
-#if 0
-unsigned32 _CPU_ISR_Get_level( void )
-{
-  /*
-   *  This routine returns the current interrupt level.
-   */
-}
-#endif
-/* return the current exception level for the 4650 */
-FRAME(_CPU_ISR_Get_level,sp,0,ra)
-	mfc0 v0,C0_SR
-	nop
-	andi v0,SR_EXL 
-	srl v0,1
-	j ra
-ENDFRAME(_CPU_ISR_Get_level)
-
-FRAME(_CPU_ISR_Set_level,sp,0,ra)
-	nop
-	mfc0 a0,C0_SR
-	nop
-	andi a0,SR_EXL 
-	beqz a0,_CPU_ISR_Set_1		/* normalize a0 */
-	nop
-	li a0,1         
-_CPU_ISR_Set_1:
-	beq v0,a0,_CPU_ISR_Set_exit	/* if (current_level != new_level ) */
-	nop
-	bnez a0,_CPU_ISR_Set_2
-	nop
-	nop
-	mfc0 t0,C0_SR
-	nop
-	li t1,~SR_EXL
-	and t0,t1
-	nop
-	mtc0 t0,C0_SR                   /* disable exception level */
-	nop
-	j ra 
-	nop
-_CPU_ISR_Set_2:
-	nop
-	mfc0 t0,C0_SR
-	nop
-	li t1,~SR_IE
-	and t0,t1
-	nop
-	mtc0 t0,C0_SR                   /* first disable ie bit (recommended) */
-	nop
-	ori t0,SR_EXL|SR_IE		/* enable exception level  */
-	nop
-	mtc0 t0,C0_SR         
-	nop
-_CPU_ISR_Set_exit:
-	j ra
-	nop
-ENDFRAME(_CPU_ISR_Set_level)
-
-/*
- *  _CPU_Context_save_fp_context
- *
- *  This routine is responsible for saving the FP context
- *  at *fp_context_ptr.  If the point to load the FP context
- *  from is changed then the pointer is modified by this routine.
- *
- *  Sometimes a macro implementation of this is in cpu.h which dereferences
- *  the ** and a similarly named routine in this file is passed something
- *  like a (Context_Control_fp *).  The general rule on making this decision
- *  is to avoid writing assembly language.
- */
-
-/* void _CPU_Context_save_fp(
- * void **fp_context_ptr
- * )
- * {
- * }
- */
-
-FRAME(_CPU_Context_save_fp,sp,0,ra)
-	.set noat
-	ld a1,(a0)
-	swc1 $f0,FP0_OFFSET*4(a1)
-	swc1 $f1,FP1_OFFSET*4(a1)
-	swc1 $f2,FP2_OFFSET*4(a1)
-	swc1 $f3,FP3_OFFSET*4(a1)
-	swc1 $f4,FP4_OFFSET*4(a1)
-	swc1 $f5,FP5_OFFSET*4(a1)
-	swc1 $f6,FP6_OFFSET*4(a1)
-	swc1 $f7,FP7_OFFSET*4(a1)
-	swc1 $f8,FP8_OFFSET*4(a1)
-	swc1 $f9,FP9_OFFSET*4(a1)
-	swc1 $f10,FP10_OFFSET*4(a1)
-	swc1 $f11,FP11_OFFSET*4(a1)
-	swc1 $f12,FP12_OFFSET*4(a1)
-	swc1 $f13,FP13_OFFSET*4(a1)
-	swc1 $f14,FP14_OFFSET*4(a1)
-	swc1 $f15,FP15_OFFSET*4(a1)
-	swc1 $f16,FP16_OFFSET*4(a1)
-	swc1 $f17,FP17_OFFSET*4(a1)
-	swc1 $f18,FP18_OFFSET*4(a1)
-	swc1 $f19,FP19_OFFSET*4(a1)
-	swc1 $f20,FP20_OFFSET*4(a1)
-	swc1 $f21,FP21_OFFSET*4(a1)
-	swc1 $f22,FP22_OFFSET*4(a1)
-	swc1 $f23,FP23_OFFSET*4(a1)
-	swc1 $f24,FP24_OFFSET*4(a1)
-	swc1 $f25,FP25_OFFSET*4(a1)
-	swc1 $f26,FP26_OFFSET*4(a1)
-	swc1 $f27,FP27_OFFSET*4(a1)
-	swc1 $f28,FP28_OFFSET*4(a1)
-	swc1 $f29,FP29_OFFSET*4(a1)
-	swc1 $f30,FP30_OFFSET*4(a1)
-	swc1 $f31,FP31_OFFSET*4(a1)
-	j ra
-	nop
-	.set at
-ENDFRAME(_CPU_Context_save_fp)
-
-/*
- *  _CPU_Context_restore_fp_context
- *
- *  This routine is responsible for restoring the FP context
- *  at *fp_context_ptr.  If the point to load the FP context
- *  from is changed then the pointer is modified by this routine.
- *
- *  Sometimes a macro implementation of this is in cpu.h which dereferences
- *  the ** and a similarly named routine in this file is passed something
- *  like a (Context_Control_fp *).  The general rule on making this decision
- *  is to avoid writing assembly language.
- */
-
-/* void _CPU_Context_restore_fp(
- * void **fp_context_ptr
- * )
- * {
- * }
- */
-
-FRAME(_CPU_Context_restore_fp,sp,0,ra)
-	.set noat
-	ld a1,(a0)
-	lwc1 $f0,FP0_OFFSET*4(a1)
-	lwc1 $f1,FP1_OFFSET*4(a1)
-	lwc1 $f2,FP2_OFFSET*4(a1)
-	lwc1 $f3,FP3_OFFSET*4(a1)
-	lwc1 $f4,FP4_OFFSET*4(a1)
-	lwc1 $f5,FP5_OFFSET*4(a1)
-	lwc1 $f6,FP6_OFFSET*4(a1)
-	lwc1 $f7,FP7_OFFSET*4(a1)
-	lwc1 $f8,FP8_OFFSET*4(a1)
-	lwc1 $f9,FP9_OFFSET*4(a1)
-	lwc1 $f10,FP10_OFFSET*4(a1)
-	lwc1 $f11,FP11_OFFSET*4(a1)
-	lwc1 $f12,FP12_OFFSET*4(a1)
-	lwc1 $f13,FP13_OFFSET*4(a1)
-	lwc1 $f14,FP14_OFFSET*4(a1)
-	lwc1 $f15,FP15_OFFSET*4(a1)
-	lwc1 $f16,FP16_OFFSET*4(a1)
-	lwc1 $f17,FP17_OFFSET*4(a1)
-	lwc1 $f18,FP18_OFFSET*4(a1)
-	lwc1 $f19,FP19_OFFSET*4(a1)
-	lwc1 $f20,FP20_OFFSET*4(a1)
-	lwc1 $f21,FP21_OFFSET*4(a1)
-	lwc1 $f22,FP22_OFFSET*4(a1)
-	lwc1 $f23,FP23_OFFSET*4(a1)
-	lwc1 $f24,FP24_OFFSET*4(a1)
-	lwc1 $f25,FP25_OFFSET*4(a1)
-	lwc1 $f26,FP26_OFFSET*4(a1)
-	lwc1 $f27,FP27_OFFSET*4(a1)
-	lwc1 $f28,FP28_OFFSET*4(a1)
-	lwc1 $f29,FP29_OFFSET*4(a1)
-	lwc1 $f30,FP30_OFFSET*4(a1)
-	lwc1 $f31,FP31_OFFSET*4(a1)
-	j ra
-	nop
-	.set at
-ENDFRAME(_CPU_Context_restore_fp)
-
-/*  _CPU_Context_switch
- *
- *  This routine performs a normal non-FP context switch.
- */
-
-/* void _CPU_Context_switch(
- * Context_Control  *run,
- * Context_Control  *heir
- * )
- * {
- * }
- */
-
-FRAME(_CPU_Context_switch,sp,0,ra)
-
-	mfc0 t0,C0_SR
-	li t1,~SR_IE
-	sd t0,C0_SR_OFFSET*8(a0)	/* save status register */
-	and t0,t1
-	mtc0 t0,C0_SR                   /* first disable ie bit (recommended) */
-	ori t0,SR_EXL|SR_IE		/* enable exception level to disable interrupts */
-	mtc0 t0,C0_SR
-
-	sd ra,RA_OFFSET*8(a0)           /* save current context */
-	sd sp,SP_OFFSET*8(a0)
-	sd fp,FP_OFFSET*8(a0)
-	sd s0,S0_OFFSET*8(a0)
-	sd s1,S1_OFFSET*8(a0)
-	sd s2,S2_OFFSET*8(a0)
-	sd s3,S3_OFFSET*8(a0)
-	sd s4,S4_OFFSET*8(a0)
-	sd s5,S5_OFFSET*8(a0)
-	sd s6,S6_OFFSET*8(a0)
-	sd s7,S7_OFFSET*8(a0)
-	dmfc0 t0,C0_EPC
-	sd t0,C0_EPC_OFFSET*8(a0)
-
-_CPU_Context_switch_restore:
-	ld s0,S0_OFFSET*8(a1)		/* restore context */
-	ld s1,S1_OFFSET*8(a1)
-	ld s2,S2_OFFSET*8(a1)
-	ld s3,S3_OFFSET*8(a1)
-	ld s4,S4_OFFSET*8(a1)
-	ld s5,S5_OFFSET*8(a1)
-	ld s6,S6_OFFSET*8(a1)
-	ld s7,S7_OFFSET*8(a1)
-	ld fp,FP_OFFSET*8(a1) 
-	ld sp,SP_OFFSET*8(a1)
-	ld ra,RA_OFFSET*8(a1)
-	ld t0,C0_EPC_OFFSET*8(a1)
-	dmtc0 t0,C0_EPC
-	ld t0,C0_SR_OFFSET*8(a1)
-	andi t0,SR_EXL
-	bnez t0,_CPU_Context_1		/* set exception level from restore context */
-	li t0,~SR_EXL
-	mfc0 t1,C0_SR
-	nop
-	and t1,t0
-	mtc0 t1,C0_SR
-_CPU_Context_1:
-	j ra
-	nop
-ENDFRAME(_CPU_Context_switch)
-
-/*
- *  _CPU_Context_restore
- *
- *  This routine is generally used only to restart self in an
- *  efficient manner.  It may simply be a label in _CPU_Context_switch.
- *
- *  NOTE: May be unnecessary to reload some registers.
- */
-
-#if 0
-void _CPU_Context_restore(
-  Context_Control *new_context
-)
-{
-}
-#endif
-
-FRAME(_CPU_Context_restore,sp,0,ra)
-	dadd a1,a0,zero
-	j _CPU_Context_switch_restore
-	nop
-ENDFRAME(_CPU_Context_restore)
-
-EXTERN(_ISR_Nest_level, SZ_INT)
-EXTERN(_Thread_Dispatch_disable_level,SZ_INT)
-EXTERN(_Context_Switch_necessary,SZ_INT)
-EXTERN(_ISR_Signals_to_thread_executing,SZ_INT)
-.extern _Thread_Dispatch
-.extern _ISR_Vector_table
-
-/*  void __ISR_Handler()
- *
- *  This routine provides the RTEMS interrupt management.
- *
- */
-
-#if 0
-void _ISR_Handler()
-{
-   /*
-    *  This discussion ignores a lot of the ugly details in a real
-    *  implementation such as saving enough registers/state to be
-    *  able to do something real.  Keep in mind that the goal is
-    *  to invoke a user's ISR handler which is written in C and
-    *  uses a certain set of registers.
-    *
-    *  Also note that the exact order is to a large extent flexible.
-    *  Hardware will dictate a sequence for a certain subset of
-    *  _ISR_Handler while requirements for setting
-    */
-
-  /*
-   *  At entry to "common" _ISR_Handler, the vector number must be
-   *  available.  On some CPUs the hardware puts either the vector
-   *  number or the offset into the vector table for this ISR in a
-   *  known place.  If the hardware does not give us this information,
-   *  then the assembly portion of RTEMS for this port will contain
-   *  a set of distinct interrupt entry points which somehow place
-   *  the vector number in a known place (which is safe if another
-   *  interrupt nests this one) and branches to _ISR_Handler.
-   *
-   */
-#endif
-FRAME(_ISR_Handler,sp,0,ra)
-.set noreorder
-#if USE_IDTKIT
-/* IDT/Kit incorrectly adds 4 to EPC before returning.  This compensates */
-	lreg    k0, R_EPC*R_SZ(sp)
-	daddiu    k0,k0,-4
-	sreg    k0, R_EPC*R_SZ(sp)
-	lreg    k0, R_CAUSE*R_SZ(sp)
-	li	k1, ~CAUSE_BD
-	and     k0, k1 
-	sreg    k0, R_CAUSE*R_SZ(sp)
-#endif
-	
-/* save registers not already saved by IDT/sim */
-	stackadd sp,sp,-EXCP_STACK_SIZE /* store ra on the stack */
-
-	sreg    ra, R_RA*R_SZ(sp)
-	sreg    v0, R_V0*R_SZ(sp)
-	sreg    v1, R_V1*R_SZ(sp)
-	sreg    a0, R_A0*R_SZ(sp)
-	sreg    a1, R_A1*R_SZ(sp)
-	sreg    a2, R_A2*R_SZ(sp)
-	sreg    a3, R_A3*R_SZ(sp)
-	sreg    t0, R_T0*R_SZ(sp)
-	sreg    t1, R_T1*R_SZ(sp)
-	sreg    t2, R_T2*R_SZ(sp)
-	sreg    t3, R_T3*R_SZ(sp)
-	sreg    t4, R_T4*R_SZ(sp)
-	sreg    t5, R_T5*R_SZ(sp)
-	sreg    t6, R_T6*R_SZ(sp)
-	sreg    t7, R_T7*R_SZ(sp)
-	mflo    k0
-	sreg    t8, R_T8*R_SZ(sp)
-	sreg    k0, R_MDLO*R_SZ(sp)
-	sreg    t9, R_T9*R_SZ(sp)
-	mfhi    k0
-	sreg    gp, R_GP*R_SZ(sp)
-	sreg    fp, R_FP*R_SZ(sp)
-	sreg    k0, R_MDHI*R_SZ(sp)
-	.set noat
-	sreg    AT, R_AT*R_SZ(sp)
-	.set at
-
-	stackadd sp,sp,-40		/* store ra on the stack */
-	sd ra,32(sp)
-
-/* determine if an interrupt generated this exception */
-	mfc0 k0,C0_CAUSE
-	and k1,k0,CAUSE_EXCMASK
-	bnez k1,_ISR_Handler_prom_exit /* not an external interrupt, pass exception to Monitor */
-	mfc0 k1,C0_SR
-	and k0,k1
-	and k0,CAUSE_IPMASK
-	beq k0,zero,_ISR_Handler_quick_exit /* external interrupt not enabled, ignore */
-	nop
-
-  /*
-   *  save some or all context on stack
-   *  may need to save some special interrupt information for exit
-   *
-   *  #if ( CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE )
-   *    if ( _ISR_Nest_level == 0 )
-   *      switch to software interrupt stack
-   *  #endif
-   */
-#if ( CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE )
-	lint t0,_ISR_Nest_level
-	beq t0, zero,  _ISR_Handler_1
-	nop
-	/* switch stacks */	
-_ISR_Handler_1:
-#else
-	lint t0,_ISR_Nest_level
-#endif
-  /*
-   *  _ISR_Nest_level++;
-   */
-	addi t0,t0,1
-	sint t0,_ISR_Nest_level
-  /*
-   *  _Thread_Dispatch_disable_level++;
-   */
-	lint t1,_Thread_Dispatch_disable_level
-	addi t1,t1,1
-	sint t1,_Thread_Dispatch_disable_level
-#if 0
-	nop
-	j _ISR_Handler_4
-	nop
-  /*
-   *  while ( interrupts_pending(cause_reg) ) {
-   *     vector = BITFIELD_TO_INDEX(cause_reg);
-   *     (*_ISR_Vector_table[ vector ])( vector );
-   *  }
-   */
-_ISR_Handler_2:
-/* software interrupt priorities can be applied here */
-	li t1,-1
-/* convert bit field into interrupt index */
-_ISR_Handler_3:
-	andi t2,t0,1
-	addi t1,1
-	beql t2,zero,_ISR_Handler_3
-	dsrl t0,1
-	li t1,7
-	dsll t1,3			/* convert index to byte offset (*8) */
-	la t3,_ISR_Vector_table
-	intadd t1,t3
-	lint t1,(t1)
-	jalr t1
-	nop
-	j _ISR_Handler_5
-	nop
-_ISR_Handler_4:
-	mfc0 t0,C0_CAUSE
-	andi t0,CAUSE_IPMASK
-	bne t0,zero,_ISR_Handler_2
-	dsrl t0,t0,8
-_ISR_Handler_5:
-#else
-	nop
-	li t1,7
-	dsll t1,t1,SZ_INT_POW2
-	la t3,_ISR_Vector_table
-	intadd t1,t3
-	lint t1,(t1)
-	jalr t1
-	nop
-#endif
-  /*
-   *  --_ISR_Nest_level;
-   */
-        lint t2,_ISR_Nest_level
-	addi t2,t2,-1
-        sint t2,_ISR_Nest_level
-  /*
-   *  --_Thread_Dispatch_disable_level;
-   */
-	lint t1,_Thread_Dispatch_disable_level
-	addi t1,t1,-1
-	sint t1,_Thread_Dispatch_disable_level
-  /*
-   *  if ( _Thread_Dispatch_disable_level || _ISR_Nest_level )
-   *    goto the label "exit interrupt (simple case)"
-   */
-	or t0,t2,t1
-	bne t0,zero,_ISR_Handler_exit
-	nop
-  /*
-   *  #if ( CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE )
-   *    restore stack
-   *  #endif
-   *  
-   *  if ( !_Context_Switch_necessary && !_ISR_Signals_to_thread_executing )
-   *    goto the label "exit interrupt (simple case)"
-   */
-	lint t0,_Context_Switch_necessary
-	lint t1,_ISR_Signals_to_thread_executing
-	or t0,t0,t1
-	beq t0,zero,_ISR_Handler_exit
-	nop
-
-  /*
-   *  call _Thread_Dispatch() or prepare to return to _ISR_Dispatch
-   */
-	jal _Thread_Dispatch
-	nop
-  /*
-   *  prepare to get out of interrupt
-   *  return from interrupt  (maybe to _ISR_Dispatch)
-   *
-   *  LABEL "exit interrupt (simple case):
-   *  prepare to get out of interrupt
-   *  return from interrupt
-   */
-_ISR_Handler_exit:
-	ld ra,32(sp)
-	stackadd sp,sp,40
-
-/* restore interrupt context from stack */
-	lreg    k0, R_MDLO*R_SZ(sp)
-	mtlo    k0
-	lreg    k0, R_MDHI*R_SZ(sp)
-	lreg    a2, R_A2*R_SZ(sp)
-	mthi    k0
-	lreg    a3, R_A3*R_SZ(sp)
-	lreg    t0, R_T0*R_SZ(sp)
-	lreg    t1, R_T1*R_SZ(sp)
-	lreg    t2, R_T2*R_SZ(sp)
-	lreg    t3, R_T3*R_SZ(sp)
-	lreg    t4, R_T4*R_SZ(sp)
-	lreg    t5, R_T5*R_SZ(sp)
-	lreg    t6, R_T6*R_SZ(sp)
-	lreg    t7, R_T7*R_SZ(sp)
-	lreg    t8, R_T8*R_SZ(sp)
-	lreg    t9, R_T9*R_SZ(sp)
-	lreg    gp, R_GP*R_SZ(sp)
-	lreg    fp, R_FP*R_SZ(sp)
-	lreg    ra, R_RA*R_SZ(sp)
-	lreg    a0, R_A0*R_SZ(sp)
-	lreg    a1, R_A1*R_SZ(sp)
-	lreg    v1, R_V1*R_SZ(sp)
-	lreg    v0, R_V0*R_SZ(sp)
-	.set noat
-	lreg    AT, R_AT*R_SZ(sp)
-	.set at
-
-	stackadd sp,sp,EXCP_STACK_SIZE /* store ra on the stack */
-
-#if USE_IDTKIT
-/* we handled exception, so return non-zero value */
-	li v0,1
-#endif
-
-_ISR_Handler_quick_exit:
-#ifdef USE_IDTKIT
-	j ra
-#else
-	eret
-#endif
-	nop
-
-_ISR_Handler_prom_exit:
-#ifdef CPU_R3000
-	la      k0, (R_VEC+((48)*8))
-#endif
-
-#ifdef CPU_R4000
-	la      k0, (R_VEC+((112)*8)) /* R4000 Sim's location is different */
-#endif
-	j       k0
-	nop
-
-       .set    reorder
-
-ENDFRAME(_ISR_Handler)
-
-
-FRAME(mips_enable_interrupts,sp,0,ra)
-	mfc0 t0,C0_SR		/* get status reg */
-	nop
-	or t0,t0,a0		 
-	mtc0 t0,C0_SR		/* save updated status reg */
-	j ra
-	nop
-ENDFRAME(mips_enable_interrupts)
-
-FRAME(mips_disable_interrupts,sp,0,ra)
-	mfc0 v0,C0_SR		/* get status reg */
-	li t1,SR_IMASK		/* t1 = load interrupt mask word */
-	not t0,t1		/* t0 = ~t1 */
-	and t0,v0		/* clear imask bits */
-	mtc0 t0,C0_SR		/* save status reg */
-	and v0,t1		/* mask return value (only return imask bits) */
-	jr ra
-	nop
-ENDFRAME(mips_disable_interrupts)
-
-FRAME(mips_enable_global_interrupts,sp,0,ra)
-	mfc0 t0,C0_SR		/* get status reg */
-	nop
-	ori t0,SR_IE
-	mtc0 t0,C0_SR		/* save updated status reg */
-	j ra
-	nop
-ENDFRAME(mips_enable_global_interrupts)
-
-FRAME(mips_disable_global_interrupts,sp,0,ra)
-	li t1,SR_IE
-	mfc0 t0,C0_SR		/* get status reg */
-	not t1
-	and t0,t1
-	mtc0 t0,C0_SR		/* save updated status reg */
-	j ra
-	nop
-ENDFRAME(mips_disable_global_interrupts)
-
-/* return the value of the status register in v0.  Used for debugging */
-FRAME(mips_get_sr,sp,0,ra)
-	mfc0 v0,C0_SR
-	j ra
-	nop
-ENDFRAME(mips_get_sr)
-
-FRAME(mips_break,sp,0,ra)
-#if 1
-	break 0x0
-	j mips_break
-#else
-	j ra
-#endif
-	nop
-ENDFRAME(mips_break)
-
-/*PAGE
- *
- *  _CPU_Internal_threads_Idle_thread_body
- *
- *  NOTES:
- *
- *  1. This is the same as the regular CPU independent algorithm.
- *
- *  2. If you implement this using a "halt", "idle", or "shutdown"
- *     instruction, then don't forget to put it in an infinite loop.
- *
- *  3. Be warned. Some processors with onboard DMA have been known
- *     to stop the DMA if the CPU were put in IDLE mode.  This might
- *     also be a problem with other on-chip peripherals.  So use this
- *     hook with caution.
- */
-
-FRAME(_CPU_Thread_Idle_body,sp,0,ra)
-	wait			/* enter low power mode */
-	j _CPU_Thread_Idle_body
-	nop
-ENDFRAME(_CPU_Thread_Idle_body)
-
-#define VEC_CODE_LENGTH 10*4
-
-/**************************************************************************
-**
-**	init_exc_vecs() - moves the exception code into the addresses
-**			  reserved for exception vectors
-**
-**	UTLB Miss exception vector at address 0x80000000
-**
-**	General exception vector at address 0x80000080
-**
-**	RESET exception vector is at address 0xbfc00000
-**
-***************************************************************************/
-
-#define INITEXCFRM ((2*4)+4)		/* ra + 2 arguments */
-FRAME(init_exc_vecs,sp,0,ra)
-/* This code yanked from SIM */
-#if defined(CPU_R3000)
-	.set	noreorder
-	la	t1,exc_utlb_code
-	la	t2,exc_norm_code
-	li	t3,UT_VEC
-	li	t4,E_VEC
-	li	t5,VEC_CODE_LENGTH
-1:
-	lw	t6,0(t1)
-	lw	t7,0(t2)
-	sw	t6,0(t3)
-	sw	t7,0(t4)
-	addiu	t1,4
-	addiu	t3,4
-	addiu	t4,4
-	subu	t5,4
-	bne	t5,zero,1b
-	addiu	t2,4
-	move	t5,ra		# assumes clear_cache doesnt use t5
-	li	a0,UT_VEC
-	jal	clear_cache
-	li	a1,VEC_CODE_LENGTH
-	nop
-	li	a0,E_VEC
-	jal	clear_cache
-	li	a1,VEC_CODE_LENGTH
-	move	ra,t5		# restore ra
-	j	ra
-	nop
-	.set	reorder
-#endif
-#if defined(CPU_R4000)
-	.set reorder
-	move	t5,ra		# assumes clear_cache doesnt use t5
-
-	/* TLB exception vector */
-	la	t1,exc_tlb_code
-	li	t2,T_VEC |K1BASE
-	li	t3,VEC_CODE_LENGTH
-1:
-	lw	t6,0(t1)
-	addiu	t1,4
-	subu	t3,4
-	sw	t6,0(t2)
-	addiu	t2,4
-	bne	t3,zero,1b
-
-	li	a0,T_VEC
-	li	a1,VEC_CODE_LENGTH
-	jal	clear_cache
-
-	la	t1,exc_xtlb_code
-	li	t2,X_VEC |K1BASE
-	li	t3,VEC_CODE_LENGTH
-1:
-	lw	t6,0(t1)
-	addiu	t1,4
-	subu	t3,4
-	sw	t6,0(t2)
-	addiu	t2,4
-	bne	t3,zero,1b
-
-	/* extended TLB exception vector */
-	li	a0,X_VEC
-	li	a1,VEC_CODE_LENGTH
-	jal	clear_cache
-
-	/* cache error exception vector */
-	la	t1,exc_cache_code
-	li	t2,C_VEC |K1BASE
-	li	t3,VEC_CODE_LENGTH
-1:
-	lw	t6,0(t1)
-	addiu	t1,4
-	subu	t3,4
-	sw	t6,0(t2)
-	addiu	t2,4
-	bne	t3,zero,1b
-
-	li	a0,C_VEC
-	li	a1,VEC_CODE_LENGTH
-	jal	clear_cache
-
-	/* normal exception vector */
-	la	t1,exc_norm_code
-	li	t2,E_VEC |K1BASE
-	li	t3,VEC_CODE_LENGTH
-1:
-	lw	t6,0(t1)
-	addiu	t1,4
-	subu	t3,4
-	sw	t6,0(t2)
-	addiu	t2,4
-	bne	t3,zero,1b
-
-	li	a0,E_VEC
-	li	a1,VEC_CODE_LENGTH
-	jal	clear_cache
-
-	move	ra,t5		# restore ra
-	j	ra
-#endif
-ENDFRAME(init_exc_vecs)
-
-
-#if defined(CPU_R4000)
-FRAME(exc_tlb_code,sp,0,ra)
-#ifdef CPU_R3000
-        la      k0, (R_VEC+((48)*8))
-#endif
-
-#ifdef CPU_R4000
-        la      k0, (R_VEC+((112)*8)) /* R4000 Sim's location is different */
-#endif
-        j       k0
-	nop
-
-ENDFRAME(exc_tlb_code)
-
-
-FRAME(exc_xtlb_code,sp,0,ra)
-#ifdef CPU_R3000
-        la      k0, (R_VEC+((48)*8))
-#endif
-
-#ifdef CPU_R4000
-        la      k0, (R_VEC+((112)*8)) /* R4000 Sim's location is different */
-#endif
-        j       k0
-	nop
-
-ENDFRAME(exc_xtlb_code)
-
-
-FRAME(exc_cache_code,sp,0,ra)
-#ifdef CPU_R3000
-        la      k0, (R_VEC+((48)*8))
-#endif
-
-#ifdef CPU_R4000
-        la      k0, (R_VEC+((112)*8)) /* R4000 Sim's location is different */
-#endif
-        j       k0
-	nop
-
-ENDFRAME(exc_cache_code)
-
-
-FRAME(exc_norm_code,sp,0,ra)
-	la	k0, _ISR_Handler /* generic external int hndlr */
-	j	k0
-	nop
-	subu	sp, EXCP_STACK_SIZE		/* set up local stack frame */
-ENDFRAME(exc_norm_code)
-#endif
-
-/**************************************************************************
-**
-** enable_int(mask) - enables interrupts - mask is positioned so it only
-**                      needs to be or'ed into the status reg. This
-**                      also does some other things !!!! caution should
-**                      be used if invoking this while in the middle
-**                      of a debugging session where the client may have
-**                      nested interrupts.
-**
-****************************************************************************/
-FRAME(enable_int,sp,0,ra)
-        .set    noreorder
-        mfc0    t0,C0_SR
-        or      a0,1
-        or      t0,a0
-        mtc0    t0,C0_SR
-        j       ra
-        nop
-        .set    reorder
-ENDFRAME(enable_int)
-
-
-/***************************************************************************
-**
-**      disable_int(mask) - disable the interrupt - mask is the complement
-**                          of the bits to be cleared - i.e. to clear ext int
-**                          5 the mask would be - 0xffff7fff
-**
-****************************************************************************/
-FRAME(disable_int,sp,0,ra)
-        .set    noreorder
-        mfc0    t0,C0_SR
-        nop
-        and     t0,a0
-        mtc0    t0,C0_SR
-        j       ra
-        nop
-ENDFRAME(disable_int)
-
-
diff --git a/cpukit/score/cpu/mips/idtcpu.h b/cpukit/score/cpu/mips/idtcpu.h
deleted file mode 100644
index f921e85ef6..0000000000
--- a/cpukit/score/cpu/mips/idtcpu.h
+++ /dev/null
@@ -1,440 +0,0 @@
-/*
-
-Based upon IDT provided code with the following release:
-
-This source code has been made available to you by IDT on an AS-IS
-basis. Anyone receiving this source is licensed under IDT copyrights
-to use it in any way he or she deems fit, including copying it,
-modifying it, compiling it, and redistributing it either with or
-without modifications.  No license under IDT patents or patent
-applications is to be implied by the copyright license.
-
-Any user of this software should understand that IDT cannot provide
-technical support for this software and will not be responsible for
-any consequences resulting from the use of this software.
-
-Any person who transfers this source code or any derivative work must
-include the IDT copyright notice, this paragraph, and the preceeding
-two paragraphs in the transferred software.
-
-COPYRIGHT IDT CORPORATION 1996
-LICENSED MATERIAL - PROGRAM PROPERTY OF IDT
-
-  $Id$
-*/ 
-
-/*
-** idtcpu.h -- cpu related defines
-*/
-
-#ifndef _IDTCPU_H__
-#define _IDTCPU_H__
-
-/*
- * 950313: Ketan added Register definition for XContext reg.
- *               added define for WAIT instruction.
- * 950421: Ketan added Register definition for Config reg (R3081)
- */
-
-/*
-** memory configuration and mapping
-*/
-#define K0BASE	0x80000000
-#define K0SIZE	0x20000000
-#define K1BASE	0xa0000000
-#define K1SIZE	0x20000000
-#define K2BASE	0xc0000000
-#define K2SIZE	0x20000000
-#if defined(CPU_R4000)
-#define KSBASE	0xe0000000
-#define KSSIZE	0x20000000
-#endif
-
-#define KUBASE	0
-#define KUSIZE	0x80000000
-
-/*
-** Exception Vectors
-*/
-#if defined(CPU_R3000)
-#define	UT_VEC	K0BASE			/* utlbmiss vector */
-#define E_VEC	(K0BASE+0x80)		/* exception vevtor */
-#endif
-#if defined(CPU_R4000)
-#define	T_VEC	(K0BASE+0x000)		/* tlbmiss vector */
-#define X_VEC	(K0BASE+0x080)		/* xtlbmiss vector */
-#define C_VEC	(K0BASE+0x100)		/* cache error vector */
-#define E_VEC	(K0BASE+0x180)		/* exception vector */
-#endif
-#define	R_VEC	(K1BASE+0x1fc00000)	/* reset vector */
-
-/*
-** Address conversion macros
-*/
-#ifdef CLANGUAGE
-#define CAST(as) (as)
-#else
-#define CAST(as)
-#endif
-#define	K0_TO_K1(x)	(CAST(unsigned)(x)|0xA0000000)	/* kseg0 to kseg1 */
-#define	K1_TO_K0(x)	(CAST(unsigned)(x)&0x9FFFFFFF)	/* kseg1 to kseg0 */
-#define	K0_TO_PHYS(x)	(CAST(unsigned)(x)&0x1FFFFFFF)	/* kseg0 to physical */
-#define	K1_TO_PHYS(x)	(CAST(unsigned)(x)&0x1FFFFFFF)	/* kseg1 to physical */
-#define	PHYS_TO_K0(x)	(CAST(unsigned)(x)|0x80000000)	/* physical to kseg0 */
-#define	PHYS_TO_K1(x)	(CAST(unsigned)(x)|0xA0000000)	/* physical to kseg1 */
-
-/*
-**	Cache size constants
-*/
-#define	MINCACHE	0x200		/* 512       For 3041. */
-#define	MAXCACHE	0x40000		/* 256*1024   256k */	
-
-#if defined(CPU_R4000)
-/* R4000 configuration register definitions */
-#define CFG_CM		0x80000000	/* Master-Checker mode */
-#define CFG_ECMASK	0x70000000	/* System Clock Ratio */
-#define CFG_ECBY2	0x00000000 	/* divide by 2 */
-#define CFG_ECBY3	0x10000000 	/* divide by 3 */
-#define CFG_ECBY4	0x20000000 	/* divide by 4 */
-#define CFG_EPMASK	0x0f000000	/* Transmit data pattern */
-#define CFG_EPD		0x00000000	/* D */
-#define CFG_EPDDX	0x01000000	/* DDX */
-#define CFG_EPDDXX	0x02000000	/* DDXX */
-#define CFG_EPDXDX	0x03000000	/* DXDX */
-#define CFG_EPDDXXX	0x04000000	/* DDXXX */
-#define CFG_EPDDXXXX	0x05000000	/* DDXXXX */
-#define CFG_EPDXXDXX	0x06000000	/* DXXDXX */
-#define CFG_EPDDXXXXX	0x07000000	/* DDXXXXX */
-#define CFG_EPDXXXDXXX	0x08000000	/* DXXXDXXX */
-#define CFG_SBMASK	0x00c00000	/* Secondary cache block size */
-#define CFG_SBSHIFT	22
-#define CFG_SB4		0x00000000	/* 4 words */
-#define CFG_SB8		0x00400000	/* 8 words */
-#define CFG_SB16	0x00800000	/* 16 words */
-#define CFG_SB32	0x00c00000	/* 32 words */
-#define CFG_SS		0x00200000	/* Split secondary cache */
-#define CFG_SW		0x00100000	/* Secondary cache port width */
-#define CFG_EWMASK	0x000c0000	/* System port width */
-#define CFG_EWSHIFT	18
-#define CFG_EW64	0x00000000	/* 64 bit */
-#define CFG_EW32	0x00010000	/* 32 bit */
-#define CFG_SC		0x00020000	/* Secondary cache absent */
-#define CFG_SM		0x00010000	/* Dirty Shared mode disabled */
-#define CFG_BE		0x00008000	/* Big Endian */
-#define CFG_EM		0x00004000	/* ECC mode enable */
-#define CFG_EB		0x00002000	/* Block ordering */
-#define CFG_ICMASK	0x00000e00	/* Instruction cache size */
-#define CFG_ICSHIFT	9
-#define CFG_DCMASK	0x000001c0	/* Data cache size */
-#define CFG_DCSHIFT	6
-#define CFG_IB		0x00000020	/* Instruction cache block size */
-#define CFG_DB		0x00000010	/* Data cache block size */
-#define CFG_CU		0x00000008	/* Update on Store Conditional */
-#define CFG_K0MASK	0x00000007	/* KSEG0 coherency algorithm */
-
-/*
- * R4000 primary cache mode
- */
-#define CFG_C_UNCACHED		2
-#define CFG_C_NONCOHERENT	3
-#define CFG_C_COHERENTXCL	4
-#define CFG_C_COHERENTXCLW	5
-#define CFG_C_COHERENTUPD	6
-
-/*
- * R4000 cache operations (should be in assembler...?)
- */
-#define Index_Invalidate_I               0x0         /* 0       0 */
-#define Index_Writeback_Inv_D            0x1         /* 0       1 */
-#define Index_Invalidate_SI              0x2         /* 0       2 */
-#define Index_Writeback_Inv_SD           0x3         /* 0       3 */
-#define Index_Load_Tag_I                 0x4         /* 1       0 */
-#define Index_Load_Tag_D                 0x5         /* 1       1 */
-#define Index_Load_Tag_SI                0x6         /* 1       2 */
-#define Index_Load_Tag_SD                0x7         /* 1       3 */
-#define Index_Store_Tag_I                0x8         /* 2       0 */
-#define Index_Store_Tag_D                0x9         /* 2       1 */
-#define Index_Store_Tag_SI               0xA         /* 2       2 */
-#define Index_Store_Tag_SD               0xB         /* 2       3 */
-#define Create_Dirty_Exc_D               0xD         /* 3       1 */
-#define Create_Dirty_Exc_SD              0xF         /* 3       3 */
-#define Hit_Invalidate_I                 0x10        /* 4       0 */
-#define Hit_Invalidate_D                 0x11        /* 4       1 */
-#define Hit_Invalidate_SI                0x12        /* 4       2 */
-#define Hit_Invalidate_SD                0x13        /* 4       3 */
-#define Hit_Writeback_Inv_D              0x15        /* 5       1 */
-#define Hit_Writeback_Inv_SD             0x17        /* 5       3 */
-#define Fill_I                           0x14        /* 5       0 */
-#define Hit_Writeback_D                  0x19        /* 6       1 */
-#define Hit_Writeback_SD                 0x1B        /* 6       3 */
-#define Hit_Writeback_I                  0x18        /* 6       0 */
-#define Hit_Set_Virtual_SI               0x1E        /* 7       2 */
-#define Hit_Set_Virtual_SD               0x1F        /* 7       3 */
-
-#ifndef WAIT
-#define WAIT .word 0x42000020
-#endif WAIT
-
-#ifndef wait 
-#define wait .word 0x42000020
-#endif wait
-
-#endif
-
-/*
-** TLB resource defines
-*/
-#if defined(CPU_R3000)
-#define	N_TLB_ENTRIES	64
-#define TLB_PGSIZE	0x1000
-#define RANDBASE	8
-#define	TLBLO_PFNMASK	0xfffff000
-#define	TLBLO_PFNSHIFT	12
-#define	TLBLO_N		0x800	/* non-cacheable */
-#define	TLBLO_D		0x400	/* writeable */
-#define	TLBLO_V		0x200	/* valid bit */
-#define	TLBLO_G		0x100	/* global access bit */
-
-#define	TLBHI_VPNMASK	0xfffff000
-#define	TLBHI_VPNSHIFT	12
-#define	TLBHI_PIDMASK	0xfc0
-#define	TLBHI_PIDSHIFT	6
-#define	TLBHI_NPID	64
-
-#define	TLBINX_PROBE	0x80000000
-#define	TLBINX_INXMASK	0x00003f00
-#define	TLBINX_INXSHIFT	8
-
-#define	TLBRAND_RANDMASK	0x00003f00
-#define	TLBRAND_RANDSHIFT	8
-
-#define	TLBCTXT_BASEMASK	0xffe00000
-#define	TLBCTXT_BASESHIFT	21
-
-#define	TLBCTXT_VPNMASK		0x001ffffc
-#define	TLBCTXT_VPNSHIFT	2
-#endif
-#if defined(CPU_R4000)
-#define	N_TLB_ENTRIES	48
-
-#define	TLBHI_VPN2MASK	0xffffe000
-#define	TLBHI_PIDMASK	0x000000ff
-#define	TLBHI_NPID	256
-
-#define	TLBLO_PFNMASK	0x3fffffc0
-#define TLBLO_PFNSHIFT	6
-#define	TLBLO_D		0x00000004	/* writeable */
-#define	TLBLO_V		0x00000002	/* valid bit */
-#define	TLBLO_G		0x00000001	/* global access bit */
-#define TLBLO_CMASK	0x00000038	/* cache algorithm mask */
-#define TLBLO_CSHIFT	3
-
-#define TLBLO_UNCACHED		(CFG_C_UNCACHED<<TLBLO_CSHIFT)
-#define TLBLO_NONCOHERENT	(CFG_C_NONCOHERENT<<TLBLO_CSHIFT)
-#define TLBLO_COHERENTXCL	(CFG_C_COHERENTXCL<<TLBLO_CSHIFT)
-#define TLBLO_COHERENTXCLW	(CFG_C_COHERENTXCLW<<TLBLO_CSHIFT)
-#define TLBLO_COHERENTUPD	(CFG_C_COHERENTUPD<<TLBLO_CSHIFT)
-
-#define	TLBINX_PROBE	0x80000000
-#define	TLBINX_INXMASK	0x0000003f
-
-#define	TLBRAND_RANDMASK	0x0000003f
-
-#define	TLBCTXT_BASEMASK	0xff800000
-#define	TLBCTXT_BASESHIFT	23
-
-#define	TLBCTXT_VPN2MASK	0x007ffff0
-#define	TLBCTXT_VPN2SHIFT	4
-
-#define TLBPGMASK_MASK		0x01ffe000
-#endif
-
-#if defined(CPU_R3000)
-#define	SR_CUMASK	0xf0000000	/* coproc usable bits */
-#define	SR_CU3		0x80000000	/* Coprocessor 3 usable */
-#define	SR_CU2		0x40000000	/* Coprocessor 2 usable */
-#define	SR_CU1		0x20000000	/* Coprocessor 1 usable */
-#define	SR_CU0		0x10000000	/* Coprocessor 0 usable */
-
-#define	SR_BEV		0x00400000	/* use boot exception vectors */
-
-/* Cache control bits */
-#define	SR_TS		0x00200000	/* TLB shutdown */
-#define	SR_PE		0x00100000	/* cache parity error */
-#define	SR_CM		0x00080000	/* cache miss */
-#define	SR_PZ		0x00040000	/* cache parity zero */
-#define	SR_SWC		0x00020000	/* swap cache */
-#define	SR_ISC		0x00010000	/* Isolate data cache */
-
-/*
-**	status register interrupt masks and bits
-*/
-
-#define	SR_IMASK	0x0000ff00	/* Interrupt mask */
-#define	SR_IMASK8	0x00000000	/* mask level 8 */
-#define	SR_IMASK7	0x00008000	/* mask level 7 */
-#define	SR_IMASK6	0x0000c000	/* mask level 6 */
-#define	SR_IMASK5	0x0000e000	/* mask level 5 */
-#define	SR_IMASK4	0x0000f000	/* mask level 4 */
-#define	SR_IMASK3	0x0000f800	/* mask level 3 */
-#define	SR_IMASK2	0x0000fc00	/* mask level 2 */
-#define	SR_IMASK1	0x0000fe00	/* mask level 1 */
-#define	SR_IMASK0	0x0000ff00	/* mask level 0 */
-
-#define	SR_IMASKSHIFT	8
-
-#define	SR_IBIT8	0x00008000	/* bit level 8 */
-#define	SR_IBIT7	0x00004000	/* bit level 7 */
-#define	SR_IBIT6	0x00002000	/* bit level 6 */
-#define	SR_IBIT5	0x00001000	/* bit level 5 */
-#define	SR_IBIT4	0x00000800	/* bit level 4 */
-#define	SR_IBIT3	0x00000400	/* bit level 3 */
-#define	SR_IBIT2	0x00000200	/* bit level 2 */
-#define	SR_IBIT1	0x00000100	/* bit level 1 */
-
-#define	SR_KUO		0x00000020	/* old kernel/user, 0 => k, 1 => u */
-#define	SR_IEO		0x00000010	/* old interrupt enable, 1 => enable */
-#define	SR_KUP		0x00000008	/* prev kernel/user, 0 => k, 1 => u */
-#define	SR_IEP		0x00000004	/* prev interrupt enable, 1 => enable */
-#define	SR_KUC		0x00000002	/* cur kernel/user, 0 => k, 1 => u */
-#define	SR_IEC		0x00000001	/* cur interrupt enable, 1 => enable */
-#endif
-
-#if defined(CPU_R4000)
-#define	SR_CUMASK	0xf0000000	/* coproc usable bits */
-#define	SR_CU3		0x80000000	/* Coprocessor 3 usable */
-#define	SR_CU2		0x40000000	/* Coprocessor 2 usable */
-#define	SR_CU1		0x20000000	/* Coprocessor 1 usable */
-#define	SR_CU0		0x10000000	/* Coprocessor 0 usable */
-
-#define SR_RP		0x08000000      /* Reduced power operation */
-#define SR_FR		0x04000000	/* Additional floating point registers */
-#define SR_RE		0x02000000	/* Reverse endian in user mode */
-
-#define SR_BEV		0x00400000	/* Use boot exception vectors */
-#define SR_TS		0x00200000	/* TLB shutdown */
-#define SR_SR		0x00100000	/* Soft reset */
-#define SR_CH		0x00040000	/* Cache hit */
-#define SR_CE		0x00020000	/* Use cache ECC  */
-#define SR_DE		0x00010000	/* Disable cache exceptions */
-
-/*
-**	status register interrupt masks and bits
-*/
-
-#define	SR_IMASK	0x0000ff00	/* Interrupt mask */
-#define	SR_IMASK8	0x00000000	/* mask level 8 */
-#define	SR_IMASK7	0x00008000	/* mask level 7 */
-#define	SR_IMASK6	0x0000c000	/* mask level 6 */
-#define	SR_IMASK5	0x0000e000	/* mask level 5 */
-#define	SR_IMASK4	0x0000f000	/* mask level 4 */
-#define	SR_IMASK3	0x0000f800	/* mask level 3 */
-#define	SR_IMASK2	0x0000fc00	/* mask level 2 */
-#define	SR_IMASK1	0x0000fe00	/* mask level 1 */
-#define	SR_IMASK0	0x0000ff00	/* mask level 0 */
-
-#define	SR_IMASKSHIFT	8
-
-#define	SR_IBIT8	0x00008000	/* bit level 8 */
-#define	SR_IBIT7	0x00004000	/* bit level 7 */
-#define	SR_IBIT6	0x00002000	/* bit level 6 */
-#define	SR_IBIT5	0x00001000	/* bit level 5 */
-#define	SR_IBIT4	0x00000800	/* bit level 4 */
-#define	SR_IBIT3	0x00000400	/* bit level 3 */
-#define	SR_IBIT2	0x00000200	/* bit level 2 */
-#define	SR_IBIT1	0x00000100	/* bit level 1 */
-
-#define SR_KSMASK	0x00000018	/* Kernel mode mask */
-#define SR_KSUSER	0x00000010	/* User mode */
-#define SR_KSSUPER	0x00000008	/* Supervisor mode */
-#define SR_KSKERNEL	0x00000000	/* Kernel mode */
-#define SR_ERL		0x00000004	/* Error level */
-#define SR_EXL		0x00000002	/* Exception level */
-#define SR_IE		0x00000001	/* Interrupts enabled */
-#endif
-
-
-
-/*
- * Cause Register
- */
-#define	CAUSE_BD	0x80000000	/* Branch delay slot */
-#define	CAUSE_CEMASK	0x30000000	/* coprocessor error */
-#define	CAUSE_CESHIFT	28
-
-
-#define	CAUSE_IPMASK	0x0000FF00	/* Pending interrupt mask */
-#define	CAUSE_IPSHIFT	8
-
-#define	CAUSE_EXCMASK	0x0000003C	/* Cause code bits */
-#define	CAUSE_EXCSHIFT	2
-
-#ifndef XDS
-/*
-**  Coprocessor 0 registers
-*/
-#define	C0_INX		$0		/* tlb index */
-#define	C0_RAND		$1		/* tlb random */
-#if defined(CPU_R3000)
-#define	C0_TLBLO	$2		/* tlb entry low */
-#endif
-#if defined(CPU_R4000)
-#define	C0_TLBLO0	$2		/* tlb entry low 0 */
-#define	C0_TLBLO1	$3		/* tlb entry low 1 */
-#endif
-
-#define	C0_CTXT		$4		/* tlb context */
-
-#if defined(CPU_R4000)
-#define C0_PAGEMASK	$5		/* tlb page mask */
-#define C0_WIRED	$6		/* number of wired tlb entries */
-#endif
-
-#define	C0_BADVADDR	$8		/* bad virtual address */
-
-#if defined(CPU_R4000)
-#define C0_COUNT	$9		/* cycle count */
-#endif
-
-#define	C0_TLBHI	$10		/* tlb entry hi */
-
-#if defined(CPU_R4000)
-#define C0_COMPARE	$11		/* cyccle count comparator  */
-#endif
-
-#define	C0_SR		$12		/* status register */
-#define	C0_CAUSE	$13		/* exception cause */
-#define	C0_EPC		$14		/* exception pc */
-#define	C0_PRID		$15		/* revision identifier */
-
-#if defined(CPU_R3000)
-#define C0_CONFIG   $3     /* configuration register R3081*/
-#endif
-
-#if defined(CPU_R4000)
-#define C0_CONFIG	$16		/* configuration register */
-#define C0_LLADDR	$17		/* linked load address */
-#define C0_WATCHLO	$18		/* watchpoint trap register */
-#define C0_WATCHHI	$19		/* watchpoint trap register */
-#define C0_XCTXT    $20     /* extended tlb context */
-#define C0_ECC		$26		/* secondary cache ECC control */
-#define C0_CACHEERR	$27		/* cache error status */
-#define C0_TAGLO	$28		/* cache tag lo */
-#define C0_TAGHI	$29		/* cache tag hi */
-#define C0_ERRPC	$30		/* cache error pc */
-#endif
-
-#endif XDS
-
-#ifdef R4650
-#define IWATCH $18
-#define DWATCH $19
-#define IBASE  $0
-#define IBOUND $1
-#define DBASE  $2
-#define DBOUND $3
-#define CALG	$17
-#endif
-
-#endif /* _IDTCPU_H__ */
-
diff --git a/cpukit/score/cpu/mips/iregdef.h b/cpukit/score/cpu/mips/iregdef.h
deleted file mode 100644
index f0953da852..0000000000
--- a/cpukit/score/cpu/mips/iregdef.h
+++ /dev/null
@@ -1,325 +0,0 @@
-/*
-
-Based upon IDT provided code with the following release:
-
-This source code has been made available to you by IDT on an AS-IS
-basis. Anyone receiving this source is licensed under IDT copyrights
-to use it in any way he or she deems fit, including copying it,
-modifying it, compiling it, and redistributing it either with or
-without modifications.  No license under IDT patents or patent
-applications is to be implied by the copyright license.
-
-Any user of this software should understand that IDT cannot provide
-technical support for this software and will not be responsible for
-any consequences resulting from the use of this software.
-
-Any person who transfers this source code or any derivative work must
-include the IDT copyright notice, this paragraph, and the preceeding
-two paragraphs in the transferred software.
-
-COPYRIGHT IDT CORPORATION 1996
-LICENSED MATERIAL - PROGRAM PROPERTY OF IDT
-
-  $Id$
-*/ 
-
-/*
-**	iregdef.h - IDT R3000 register structure header file
-**
-**	Copyright 1989 Integrated Device Technology, Inc
-**	All Rights Reserved
-**
-*/
-#ifndef __IREGDEF_H__
-#define __IREGDEF_H__
-
-/*
- * 950313: Ketan added sreg/lreg and R_SZ for 64-bit saves
- *         added Register definition for XContext reg.
- *         Look towards end of this file.
- */
-/*
-** register names 
-*/
-#define r0	$0
-#define r1	$1
-#define r2	$2
-#define r3	$3
-#define r4	$4
-#define r5	$5
-#define r6	$6
-#define r7	$7
-#define r8	$8
-#define r9	$9
-#define r10	$10
-#define r11	$11
-#define r12	$12
-#define r13	$13
-
-#define r14	$14
-#define r15	$15
-#define r16	$16
-#define r17	$17
-#define r18	$18
-#define r19	$19
-#define r20	$20
-#define r21	$21
-#define r22	$22
-#define r23	$23
-#define r24	$24
-#define r25	$25
-#define r26	$26
-#define r27	$27
-#define r28	$28
-#define r29	$29
-#define r30	$30
-#define r31	$31
-
-#define fp0	$f0
-#define fp1	$f1
-#define fp2	$f2
-#define fp3	$f3
-#define fp4	$f4
-#define fp5	$f5
-#define fp6	$f6
-#define fp7	$f7
-#define fp8	$f8
-#define fp9	$f9
-#define fp10	$f10
-#define fp11	$f11
-#define fp12	$f12
-#define fp13	$f13
-#define fp14	$f14
-#define fp15	$f15
-#define fp16	$f16
-#define fp17	$f17
-#define fp18	$f18
-#define fp19	$f19
-#define fp20	$f20
-#define fp21	$f21
-#define fp22	$f22
-#define fp23	$f23
-#define fp24	$f24
-#define fp25	$f25
-#define fp26	$f26
-#define fp27	$f27
-#define fp28	$f28
-#define fp29	$f29
-#define fp30	$f30
-#define fp31	$f31
-
-#define fcr0	$0
-#define fcr30	$30
-#define fcr31	$31
-
-#define zero	$0	/* wired zero */
-#define AT	$at	/* assembler temp */
-#define v0	$2	/* return value */
-#define v1	$3
-#define a0	$4	/* argument registers a0-a3 */
-#define a1	$5
-#define a2	$6
-#define a3	$7
-#define t0	$8	/* caller saved  t0-t9 */
-#define t1	$9
-#define t2	$10
-#define t3	$11
-#define t4	$12
-#define t5	$13
-#define t6	$14
-#define t7	$15
-#define s0	$16	/* callee saved s0-s8 */
-#define s1	$17
-#define s2	$18
-#define s3	$19
-#define s4	$20
-#define s5	$21
-#define s6	$22
-#define s7	$23
-#define t8	$24
-#define t9	$25
-#define k0	$26	/* kernel usage */
-#define k1	$27	/* kernel usage */
-#define gp	$28	/* sdata pointer */
-#define sp	$29	/* stack pointer */
-#define s8	$30	/* yet another saved reg for the callee */
-#define fp	$30	/* frame pointer - this is being phased out by MIPS */
-#define ra	$31	/* return address */
-
-
-/*
-** relative position of registers in save reg area
-*/
-#define	R_R0		0
-#define	R_R1		1
-#define	R_R2		2
-#define	R_R3		3
-#define	R_R4		4
-#define	R_R5		5
-#define	R_R6		6
-#define	R_R7		7
-#define	R_R8		8
-#define	R_R9		9
-#define	R_R10		10
-#define	R_R11		11
-#define	R_R12		12
-#define	R_R13		13
-#define	R_R14		14
-#define	R_R15		15
-#define	R_R16		16
-#define	R_R17		17
-#define	R_R18		18
-#define	R_R19		19
-#define	R_R20		20
-#define	R_R21		21
-#define	R_R22		22
-#define	R_R23		23
-#define	R_R24		24
-#define	R_R25		25
-#define	R_R26		26
-#define	R_R27		27
-#define	R_R28		28
-#define	R_R29		29
-#define	R_R30		30
-#define	R_R31		31
-#define	R_F0		32
-#define	R_F1		33
-#define	R_F2		34
-#define	R_F3		35
-#define	R_F4		36
-#define	R_F5		37
-#define	R_F6		38
-#define	R_F7		39
-#define	R_F8		40
-#define	R_F9		41
-#define	R_F10		42
-#define	R_F11		43
-#define	R_F12		44
-#define	R_F13		45
-#define	R_F14		46
-#define	R_F15		47
-#define	R_F16		48
-#define	R_F17		49
-#define	R_F18		50
-#define	R_F19		51
-#define	R_F20		52
-#define	R_F21		53
-#define	R_F22		54
-#define	R_F23		55
-#define	R_F24		56
-#define	R_F25		57
-#define	R_F26		58
-#define	R_F27		59
-#define	R_F28		60
-#define	R_F29		61
-#define	R_F30		62
-#define	R_F31		63
-#define NCLIENTREGS	64
-#define	R_EPC		64
-#define	R_MDHI		65
-#define	R_MDLO		66
-#define	R_SR		67
-#define	R_CAUSE		68
-#define	R_TLBHI		69
-#if defined(CPU_R3000)
-#define	R_TLBLO		70
-#endif
-#if defined(CPU_R4000)
-#define	R_TLBLO0	70
-#endif
-#define	R_BADVADDR	71
-#define	R_INX		72
-#define	R_RAND		73
-#define	R_CTXT		74
-#define	R_EXCTYPE	75
-#define R_MODE		76
-#define	R_PRID		77
-#define R_FCSR		78
-#define R_FEIR		79
-#if defined(CPU_R3000)
-#define NREGS		80
-#endif
-#if defined(CPU_R4000)
-#define	R_TLBLO1	80
-#define R_PAGEMASK	81
-#define R_WIRED		82
-#define R_COUNT		83
-#define R_COMPARE	84
-#define R_CONFIG	85
-#define R_LLADDR	86
-#define R_WATCHLO	87
-#define R_WATCHHI	88
-#define R_ECC		89
-#define R_CACHEERR	90
-#define R_TAGLO		91
-#define R_TAGHI		92
-#define R_ERRPC		93
-#define R_XCTXT     94  /* Ketan added from SIM64bit */
-
-#define	NREGS		95
-#endif
-
-/*
-** For those who like to think in terms of the compiler names for the regs
-*/
-#define	R_ZERO		R_R0
-#define	R_AT		R_R1
-#define	R_V0		R_R2
-#define	R_V1		R_R3
-#define	R_A0		R_R4
-#define	R_A1		R_R5
-#define	R_A2		R_R6
-#define	R_A3		R_R7
-#define	R_T0		R_R8
-#define	R_T1		R_R9
-#define	R_T2		R_R10
-#define	R_T3		R_R11
-#define	R_T4		R_R12
-#define	R_T5		R_R13
-#define	R_T6		R_R14
-#define	R_T7		R_R15
-#define	R_S0		R_R16
-#define	R_S1		R_R17
-#define	R_S2		R_R18
-#define	R_S3		R_R19
-#define	R_S4		R_R20
-#define	R_S5		R_R21
-#define	R_S6		R_R22
-#define	R_S7		R_R23
-#define	R_T8		R_R24
-#define	R_T9		R_R25
-#define	R_K0		R_R26
-#define	R_K1		R_R27
-#define	R_GP		R_R28
-#define	R_SP		R_R29
-#define	R_FP		R_R30
-#define	R_RA		R_R31
-
-/* Ketan added the following */
-#ifdef CPU_R3000
-#define sreg	sw
-#define lreg	lw
-#define rmfc0	mfc0
-#define rmtc0	mtc0
-#define R_SZ	4
-#endif CPU_R3000
-
-#ifdef CPU_R4000
-#if __mips < 3
-#define sreg	sw
-#define lreg	lw
-#define rmfc0	mfc0
-#define rmtc0	mtc0
-#define R_SZ	4
-#else
-#define sreg	sd
-#define lreg	ld
-#define rmfc0	dmfc0
-#define rmtc0	dmtc0
-#define R_SZ	8
-#endif
-#endif CPU_R4000
-/* Ketan till here */
-
-#endif /* __IREGDEF_H__ */
-
diff --git a/cpukit/score/cpu/mips/rtems/asm.h b/cpukit/score/cpu/mips/rtems/asm.h
deleted file mode 100644
index fccd89069f..0000000000
--- a/cpukit/score/cpu/mips/rtems/asm.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/*  asm.h
- *
- *  This include file attempts to address the problems
- *  caused by incompatible flavors of assemblers and
- *  toolsets.  It primarily addresses variations in the
- *  use of leading underscores on symbols and the requirement
- *  that register names be preceded by a %.
- *
- *
- *  NOTE: The spacing in the use of these macros
- *        is critical to them working as advertised.
- *
- *  COPYRIGHT:
- *
- *  This file is based on similar code found in newlib available
- *  from ftp.cygnus.com.  The file which was used had no copyright
- *  notice.  This file is freely distributable as long as the source
- *  of the file is noted.  This file is:
- *
- *  COPYRIGHT (c) 1994-1997.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  $Id$
- */
-/* @(#)asm.h       03/15/96     1.1 */
-
-#ifndef __NO_CPU_ASM_h
-#define __NO_CPU_ASM_h
-
-/*
- *  Indicate we are in an assembly file and get the basic CPU definitions.
- */
-
-#ifndef ASM
-#define ASM
-#endif
-#include <rtems/score/targopts.h>
-#include <rtems/score/no_cpu.h>
-
-/*
- *  Recent versions of GNU cpp define variables which indicate the
- *  need for underscores and percents.  If not using GNU cpp or
- *  the version does not support this, then you will obviously
- *  have to define these as appropriate.
- */
-
-#ifndef __USER_LABEL_PREFIX__
-#define __USER_LABEL_PREFIX__ _
-#endif
-
-#ifndef __REGISTER_PREFIX__
-#define __REGISTER_PREFIX__
-#endif
-
-/* ANSI concatenation macros.  */
-
-#define CONCAT1(a, b) CONCAT2(a, b)
-#define CONCAT2(a, b) a ## b
-
-/* Use the right prefix for global labels.  */
-
-#define SYM(x) CONCAT1 (__USER_LABEL_PREFIX__, x)
-
-/* Use the right prefix for registers.  */
-
-#define REG(x) CONCAT1 (__REGISTER_PREFIX__, x)
-
-/*
- *  define macros for all of the registers on this CPU
- *
- *  EXAMPLE:     #define d0 REG (d0)
- */
-
-/*
- *  Define macros to handle section beginning and ends.
- */
-
-
-#define BEGIN_CODE_DCL .text
-#define END_CODE_DCL
-#define BEGIN_DATA_DCL .data
-#define END_DATA_DCL
-#define BEGIN_CODE .text
-#define END_CODE
-#define BEGIN_DATA
-#define END_DATA
-#define BEGIN_BSS
-#define END_BSS
-#define END
-
-/*
- *  Following must be tailor for a particular flavor of the C compiler.
- *  They may need to put underscores in front of the symbols.
- */
-
-#define PUBLIC(sym) .globl SYM (sym)
-#define EXTERN(sym) .globl SYM (sym)
-
-#endif
-/* end of include file */
-
-
diff --git a/cpukit/score/cpu/mips/rtems/mips/idtcpu.h b/cpukit/score/cpu/mips/rtems/mips/idtcpu.h
deleted file mode 100644
index f921e85ef6..0000000000
--- a/cpukit/score/cpu/mips/rtems/mips/idtcpu.h
+++ /dev/null
@@ -1,440 +0,0 @@
-/*
-
-Based upon IDT provided code with the following release:
-
-This source code has been made available to you by IDT on an AS-IS
-basis. Anyone receiving this source is licensed under IDT copyrights
-to use it in any way he or she deems fit, including copying it,
-modifying it, compiling it, and redistributing it either with or
-without modifications.  No license under IDT patents or patent
-applications is to be implied by the copyright license.
-
-Any user of this software should understand that IDT cannot provide
-technical support for this software and will not be responsible for
-any consequences resulting from the use of this software.
-
-Any person who transfers this source code or any derivative work must
-include the IDT copyright notice, this paragraph, and the preceeding
-two paragraphs in the transferred software.
-
-COPYRIGHT IDT CORPORATION 1996
-LICENSED MATERIAL - PROGRAM PROPERTY OF IDT
-
-  $Id$
-*/ 
-
-/*
-** idtcpu.h -- cpu related defines
-*/
-
-#ifndef _IDTCPU_H__
-#define _IDTCPU_H__
-
-/*
- * 950313: Ketan added Register definition for XContext reg.
- *               added define for WAIT instruction.
- * 950421: Ketan added Register definition for Config reg (R3081)
- */
-
-/*
-** memory configuration and mapping
-*/
-#define K0BASE	0x80000000
-#define K0SIZE	0x20000000
-#define K1BASE	0xa0000000
-#define K1SIZE	0x20000000
-#define K2BASE	0xc0000000
-#define K2SIZE	0x20000000
-#if defined(CPU_R4000)
-#define KSBASE	0xe0000000
-#define KSSIZE	0x20000000
-#endif
-
-#define KUBASE	0
-#define KUSIZE	0x80000000
-
-/*
-** Exception Vectors
-*/
-#if defined(CPU_R3000)
-#define	UT_VEC	K0BASE			/* utlbmiss vector */
-#define E_VEC	(K0BASE+0x80)		/* exception vevtor */
-#endif
-#if defined(CPU_R4000)
-#define	T_VEC	(K0BASE+0x000)		/* tlbmiss vector */
-#define X_VEC	(K0BASE+0x080)		/* xtlbmiss vector */
-#define C_VEC	(K0BASE+0x100)		/* cache error vector */
-#define E_VEC	(K0BASE+0x180)		/* exception vector */
-#endif
-#define	R_VEC	(K1BASE+0x1fc00000)	/* reset vector */
-
-/*
-** Address conversion macros
-*/
-#ifdef CLANGUAGE
-#define CAST(as) (as)
-#else
-#define CAST(as)
-#endif
-#define	K0_TO_K1(x)	(CAST(unsigned)(x)|0xA0000000)	/* kseg0 to kseg1 */
-#define	K1_TO_K0(x)	(CAST(unsigned)(x)&0x9FFFFFFF)	/* kseg1 to kseg0 */
-#define	K0_TO_PHYS(x)	(CAST(unsigned)(x)&0x1FFFFFFF)	/* kseg0 to physical */
-#define	K1_TO_PHYS(x)	(CAST(unsigned)(x)&0x1FFFFFFF)	/* kseg1 to physical */
-#define	PHYS_TO_K0(x)	(CAST(unsigned)(x)|0x80000000)	/* physical to kseg0 */
-#define	PHYS_TO_K1(x)	(CAST(unsigned)(x)|0xA0000000)	/* physical to kseg1 */
-
-/*
-**	Cache size constants
-*/
-#define	MINCACHE	0x200		/* 512       For 3041. */
-#define	MAXCACHE	0x40000		/* 256*1024   256k */	
-
-#if defined(CPU_R4000)
-/* R4000 configuration register definitions */
-#define CFG_CM		0x80000000	/* Master-Checker mode */
-#define CFG_ECMASK	0x70000000	/* System Clock Ratio */
-#define CFG_ECBY2	0x00000000 	/* divide by 2 */
-#define CFG_ECBY3	0x10000000 	/* divide by 3 */
-#define CFG_ECBY4	0x20000000 	/* divide by 4 */
-#define CFG_EPMASK	0x0f000000	/* Transmit data pattern */
-#define CFG_EPD		0x00000000	/* D */
-#define CFG_EPDDX	0x01000000	/* DDX */
-#define CFG_EPDDXX	0x02000000	/* DDXX */
-#define CFG_EPDXDX	0x03000000	/* DXDX */
-#define CFG_EPDDXXX	0x04000000	/* DDXXX */
-#define CFG_EPDDXXXX	0x05000000	/* DDXXXX */
-#define CFG_EPDXXDXX	0x06000000	/* DXXDXX */
-#define CFG_EPDDXXXXX	0x07000000	/* DDXXXXX */
-#define CFG_EPDXXXDXXX	0x08000000	/* DXXXDXXX */
-#define CFG_SBMASK	0x00c00000	/* Secondary cache block size */
-#define CFG_SBSHIFT	22
-#define CFG_SB4		0x00000000	/* 4 words */
-#define CFG_SB8		0x00400000	/* 8 words */
-#define CFG_SB16	0x00800000	/* 16 words */
-#define CFG_SB32	0x00c00000	/* 32 words */
-#define CFG_SS		0x00200000	/* Split secondary cache */
-#define CFG_SW		0x00100000	/* Secondary cache port width */
-#define CFG_EWMASK	0x000c0000	/* System port width */
-#define CFG_EWSHIFT	18
-#define CFG_EW64	0x00000000	/* 64 bit */
-#define CFG_EW32	0x00010000	/* 32 bit */
-#define CFG_SC		0x00020000	/* Secondary cache absent */
-#define CFG_SM		0x00010000	/* Dirty Shared mode disabled */
-#define CFG_BE		0x00008000	/* Big Endian */
-#define CFG_EM		0x00004000	/* ECC mode enable */
-#define CFG_EB		0x00002000	/* Block ordering */
-#define CFG_ICMASK	0x00000e00	/* Instruction cache size */
-#define CFG_ICSHIFT	9
-#define CFG_DCMASK	0x000001c0	/* Data cache size */
-#define CFG_DCSHIFT	6
-#define CFG_IB		0x00000020	/* Instruction cache block size */
-#define CFG_DB		0x00000010	/* Data cache block size */
-#define CFG_CU		0x00000008	/* Update on Store Conditional */
-#define CFG_K0MASK	0x00000007	/* KSEG0 coherency algorithm */
-
-/*
- * R4000 primary cache mode
- */
-#define CFG_C_UNCACHED		2
-#define CFG_C_NONCOHERENT	3
-#define CFG_C_COHERENTXCL	4
-#define CFG_C_COHERENTXCLW	5
-#define CFG_C_COHERENTUPD	6
-
-/*
- * R4000 cache operations (should be in assembler...?)
- */
-#define Index_Invalidate_I               0x0         /* 0       0 */
-#define Index_Writeback_Inv_D            0x1         /* 0       1 */
-#define Index_Invalidate_SI              0x2         /* 0       2 */
-#define Index_Writeback_Inv_SD           0x3         /* 0       3 */
-#define Index_Load_Tag_I                 0x4         /* 1       0 */
-#define Index_Load_Tag_D                 0x5         /* 1       1 */
-#define Index_Load_Tag_SI                0x6         /* 1       2 */
-#define Index_Load_Tag_SD                0x7         /* 1       3 */
-#define Index_Store_Tag_I                0x8         /* 2       0 */
-#define Index_Store_Tag_D                0x9         /* 2       1 */
-#define Index_Store_Tag_SI               0xA         /* 2       2 */
-#define Index_Store_Tag_SD               0xB         /* 2       3 */
-#define Create_Dirty_Exc_D               0xD         /* 3       1 */
-#define Create_Dirty_Exc_SD              0xF         /* 3       3 */
-#define Hit_Invalidate_I                 0x10        /* 4       0 */
-#define Hit_Invalidate_D                 0x11        /* 4       1 */
-#define Hit_Invalidate_SI                0x12        /* 4       2 */
-#define Hit_Invalidate_SD                0x13        /* 4       3 */
-#define Hit_Writeback_Inv_D              0x15        /* 5       1 */
-#define Hit_Writeback_Inv_SD             0x17        /* 5       3 */
-#define Fill_I                           0x14        /* 5       0 */
-#define Hit_Writeback_D                  0x19        /* 6       1 */
-#define Hit_Writeback_SD                 0x1B        /* 6       3 */
-#define Hit_Writeback_I                  0x18        /* 6       0 */
-#define Hit_Set_Virtual_SI               0x1E        /* 7       2 */
-#define Hit_Set_Virtual_SD               0x1F        /* 7       3 */
-
-#ifndef WAIT
-#define WAIT .word 0x42000020
-#endif WAIT
-
-#ifndef wait 
-#define wait .word 0x42000020
-#endif wait
-
-#endif
-
-/*
-** TLB resource defines
-*/
-#if defined(CPU_R3000)
-#define	N_TLB_ENTRIES	64
-#define TLB_PGSIZE	0x1000
-#define RANDBASE	8
-#define	TLBLO_PFNMASK	0xfffff000
-#define	TLBLO_PFNSHIFT	12
-#define	TLBLO_N		0x800	/* non-cacheable */
-#define	TLBLO_D		0x400	/* writeable */
-#define	TLBLO_V		0x200	/* valid bit */
-#define	TLBLO_G		0x100	/* global access bit */
-
-#define	TLBHI_VPNMASK	0xfffff000
-#define	TLBHI_VPNSHIFT	12
-#define	TLBHI_PIDMASK	0xfc0
-#define	TLBHI_PIDSHIFT	6
-#define	TLBHI_NPID	64
-
-#define	TLBINX_PROBE	0x80000000
-#define	TLBINX_INXMASK	0x00003f00
-#define	TLBINX_INXSHIFT	8
-
-#define	TLBRAND_RANDMASK	0x00003f00
-#define	TLBRAND_RANDSHIFT	8
-
-#define	TLBCTXT_BASEMASK	0xffe00000
-#define	TLBCTXT_BASESHIFT	21
-
-#define	TLBCTXT_VPNMASK		0x001ffffc
-#define	TLBCTXT_VPNSHIFT	2
-#endif
-#if defined(CPU_R4000)
-#define	N_TLB_ENTRIES	48
-
-#define	TLBHI_VPN2MASK	0xffffe000
-#define	TLBHI_PIDMASK	0x000000ff
-#define	TLBHI_NPID	256
-
-#define	TLBLO_PFNMASK	0x3fffffc0
-#define TLBLO_PFNSHIFT	6
-#define	TLBLO_D		0x00000004	/* writeable */
-#define	TLBLO_V		0x00000002	/* valid bit */
-#define	TLBLO_G		0x00000001	/* global access bit */
-#define TLBLO_CMASK	0x00000038	/* cache algorithm mask */
-#define TLBLO_CSHIFT	3
-
-#define TLBLO_UNCACHED		(CFG_C_UNCACHED<<TLBLO_CSHIFT)
-#define TLBLO_NONCOHERENT	(CFG_C_NONCOHERENT<<TLBLO_CSHIFT)
-#define TLBLO_COHERENTXCL	(CFG_C_COHERENTXCL<<TLBLO_CSHIFT)
-#define TLBLO_COHERENTXCLW	(CFG_C_COHERENTXCLW<<TLBLO_CSHIFT)
-#define TLBLO_COHERENTUPD	(CFG_C_COHERENTUPD<<TLBLO_CSHIFT)
-
-#define	TLBINX_PROBE	0x80000000
-#define	TLBINX_INXMASK	0x0000003f
-
-#define	TLBRAND_RANDMASK	0x0000003f
-
-#define	TLBCTXT_BASEMASK	0xff800000
-#define	TLBCTXT_BASESHIFT	23
-
-#define	TLBCTXT_VPN2MASK	0x007ffff0
-#define	TLBCTXT_VPN2SHIFT	4
-
-#define TLBPGMASK_MASK		0x01ffe000
-#endif
-
-#if defined(CPU_R3000)
-#define	SR_CUMASK	0xf0000000	/* coproc usable bits */
-#define	SR_CU3		0x80000000	/* Coprocessor 3 usable */
-#define	SR_CU2		0x40000000	/* Coprocessor 2 usable */
-#define	SR_CU1		0x20000000	/* Coprocessor 1 usable */
-#define	SR_CU0		0x10000000	/* Coprocessor 0 usable */
-
-#define	SR_BEV		0x00400000	/* use boot exception vectors */
-
-/* Cache control bits */
-#define	SR_TS		0x00200000	/* TLB shutdown */
-#define	SR_PE		0x00100000	/* cache parity error */
-#define	SR_CM		0x00080000	/* cache miss */
-#define	SR_PZ		0x00040000	/* cache parity zero */
-#define	SR_SWC		0x00020000	/* swap cache */
-#define	SR_ISC		0x00010000	/* Isolate data cache */
-
-/*
-**	status register interrupt masks and bits
-*/
-
-#define	SR_IMASK	0x0000ff00	/* Interrupt mask */
-#define	SR_IMASK8	0x00000000	/* mask level 8 */
-#define	SR_IMASK7	0x00008000	/* mask level 7 */
-#define	SR_IMASK6	0x0000c000	/* mask level 6 */
-#define	SR_IMASK5	0x0000e000	/* mask level 5 */
-#define	SR_IMASK4	0x0000f000	/* mask level 4 */
-#define	SR_IMASK3	0x0000f800	/* mask level 3 */
-#define	SR_IMASK2	0x0000fc00	/* mask level 2 */
-#define	SR_IMASK1	0x0000fe00	/* mask level 1 */
-#define	SR_IMASK0	0x0000ff00	/* mask level 0 */
-
-#define	SR_IMASKSHIFT	8
-
-#define	SR_IBIT8	0x00008000	/* bit level 8 */
-#define	SR_IBIT7	0x00004000	/* bit level 7 */
-#define	SR_IBIT6	0x00002000	/* bit level 6 */
-#define	SR_IBIT5	0x00001000	/* bit level 5 */
-#define	SR_IBIT4	0x00000800	/* bit level 4 */
-#define	SR_IBIT3	0x00000400	/* bit level 3 */
-#define	SR_IBIT2	0x00000200	/* bit level 2 */
-#define	SR_IBIT1	0x00000100	/* bit level 1 */
-
-#define	SR_KUO		0x00000020	/* old kernel/user, 0 => k, 1 => u */
-#define	SR_IEO		0x00000010	/* old interrupt enable, 1 => enable */
-#define	SR_KUP		0x00000008	/* prev kernel/user, 0 => k, 1 => u */
-#define	SR_IEP		0x00000004	/* prev interrupt enable, 1 => enable */
-#define	SR_KUC		0x00000002	/* cur kernel/user, 0 => k, 1 => u */
-#define	SR_IEC		0x00000001	/* cur interrupt enable, 1 => enable */
-#endif
-
-#if defined(CPU_R4000)
-#define	SR_CUMASK	0xf0000000	/* coproc usable bits */
-#define	SR_CU3		0x80000000	/* Coprocessor 3 usable */
-#define	SR_CU2		0x40000000	/* Coprocessor 2 usable */
-#define	SR_CU1		0x20000000	/* Coprocessor 1 usable */
-#define	SR_CU0		0x10000000	/* Coprocessor 0 usable */
-
-#define SR_RP		0x08000000      /* Reduced power operation */
-#define SR_FR		0x04000000	/* Additional floating point registers */
-#define SR_RE		0x02000000	/* Reverse endian in user mode */
-
-#define SR_BEV		0x00400000	/* Use boot exception vectors */
-#define SR_TS		0x00200000	/* TLB shutdown */
-#define SR_SR		0x00100000	/* Soft reset */
-#define SR_CH		0x00040000	/* Cache hit */
-#define SR_CE		0x00020000	/* Use cache ECC  */
-#define SR_DE		0x00010000	/* Disable cache exceptions */
-
-/*
-**	status register interrupt masks and bits
-*/
-
-#define	SR_IMASK	0x0000ff00	/* Interrupt mask */
-#define	SR_IMASK8	0x00000000	/* mask level 8 */
-#define	SR_IMASK7	0x00008000	/* mask level 7 */
-#define	SR_IMASK6	0x0000c000	/* mask level 6 */
-#define	SR_IMASK5	0x0000e000	/* mask level 5 */
-#define	SR_IMASK4	0x0000f000	/* mask level 4 */
-#define	SR_IMASK3	0x0000f800	/* mask level 3 */
-#define	SR_IMASK2	0x0000fc00	/* mask level 2 */
-#define	SR_IMASK1	0x0000fe00	/* mask level 1 */
-#define	SR_IMASK0	0x0000ff00	/* mask level 0 */
-
-#define	SR_IMASKSHIFT	8
-
-#define	SR_IBIT8	0x00008000	/* bit level 8 */
-#define	SR_IBIT7	0x00004000	/* bit level 7 */
-#define	SR_IBIT6	0x00002000	/* bit level 6 */
-#define	SR_IBIT5	0x00001000	/* bit level 5 */
-#define	SR_IBIT4	0x00000800	/* bit level 4 */
-#define	SR_IBIT3	0x00000400	/* bit level 3 */
-#define	SR_IBIT2	0x00000200	/* bit level 2 */
-#define	SR_IBIT1	0x00000100	/* bit level 1 */
-
-#define SR_KSMASK	0x00000018	/* Kernel mode mask */
-#define SR_KSUSER	0x00000010	/* User mode */
-#define SR_KSSUPER	0x00000008	/* Supervisor mode */
-#define SR_KSKERNEL	0x00000000	/* Kernel mode */
-#define SR_ERL		0x00000004	/* Error level */
-#define SR_EXL		0x00000002	/* Exception level */
-#define SR_IE		0x00000001	/* Interrupts enabled */
-#endif
-
-
-
-/*
- * Cause Register
- */
-#define	CAUSE_BD	0x80000000	/* Branch delay slot */
-#define	CAUSE_CEMASK	0x30000000	/* coprocessor error */
-#define	CAUSE_CESHIFT	28
-
-
-#define	CAUSE_IPMASK	0x0000FF00	/* Pending interrupt mask */
-#define	CAUSE_IPSHIFT	8
-
-#define	CAUSE_EXCMASK	0x0000003C	/* Cause code bits */
-#define	CAUSE_EXCSHIFT	2
-
-#ifndef XDS
-/*
-**  Coprocessor 0 registers
-*/
-#define	C0_INX		$0		/* tlb index */
-#define	C0_RAND		$1		/* tlb random */
-#if defined(CPU_R3000)
-#define	C0_TLBLO	$2		/* tlb entry low */
-#endif
-#if defined(CPU_R4000)
-#define	C0_TLBLO0	$2		/* tlb entry low 0 */
-#define	C0_TLBLO1	$3		/* tlb entry low 1 */
-#endif
-
-#define	C0_CTXT		$4		/* tlb context */
-
-#if defined(CPU_R4000)
-#define C0_PAGEMASK	$5		/* tlb page mask */
-#define C0_WIRED	$6		/* number of wired tlb entries */
-#endif
-
-#define	C0_BADVADDR	$8		/* bad virtual address */
-
-#if defined(CPU_R4000)
-#define C0_COUNT	$9		/* cycle count */
-#endif
-
-#define	C0_TLBHI	$10		/* tlb entry hi */
-
-#if defined(CPU_R4000)
-#define C0_COMPARE	$11		/* cyccle count comparator  */
-#endif
-
-#define	C0_SR		$12		/* status register */
-#define	C0_CAUSE	$13		/* exception cause */
-#define	C0_EPC		$14		/* exception pc */
-#define	C0_PRID		$15		/* revision identifier */
-
-#if defined(CPU_R3000)
-#define C0_CONFIG   $3     /* configuration register R3081*/
-#endif
-
-#if defined(CPU_R4000)
-#define C0_CONFIG	$16		/* configuration register */
-#define C0_LLADDR	$17		/* linked load address */
-#define C0_WATCHLO	$18		/* watchpoint trap register */
-#define C0_WATCHHI	$19		/* watchpoint trap register */
-#define C0_XCTXT    $20     /* extended tlb context */
-#define C0_ECC		$26		/* secondary cache ECC control */
-#define C0_CACHEERR	$27		/* cache error status */
-#define C0_TAGLO	$28		/* cache tag lo */
-#define C0_TAGHI	$29		/* cache tag hi */
-#define C0_ERRPC	$30		/* cache error pc */
-#endif
-
-#endif XDS
-
-#ifdef R4650
-#define IWATCH $18
-#define DWATCH $19
-#define IBASE  $0
-#define IBOUND $1
-#define DBASE  $2
-#define DBOUND $3
-#define CALG	$17
-#endif
-
-#endif /* _IDTCPU_H__ */
-
diff --git a/cpukit/score/cpu/mips/rtems/mips/iregdef.h b/cpukit/score/cpu/mips/rtems/mips/iregdef.h
deleted file mode 100644
index f0953da852..0000000000
--- a/cpukit/score/cpu/mips/rtems/mips/iregdef.h
+++ /dev/null
@@ -1,325 +0,0 @@
-/*
-
-Based upon IDT provided code with the following release:
-
-This source code has been made available to you by IDT on an AS-IS
-basis. Anyone receiving this source is licensed under IDT copyrights
-to use it in any way he or she deems fit, including copying it,
-modifying it, compiling it, and redistributing it either with or
-without modifications.  No license under IDT patents or patent
-applications is to be implied by the copyright license.
-
-Any user of this software should understand that IDT cannot provide
-technical support for this software and will not be responsible for
-any consequences resulting from the use of this software.
-
-Any person who transfers this source code or any derivative work must
-include the IDT copyright notice, this paragraph, and the preceeding
-two paragraphs in the transferred software.
-
-COPYRIGHT IDT CORPORATION 1996
-LICENSED MATERIAL - PROGRAM PROPERTY OF IDT
-
-  $Id$
-*/ 
-
-/*
-**	iregdef.h - IDT R3000 register structure header file
-**
-**	Copyright 1989 Integrated Device Technology, Inc
-**	All Rights Reserved
-**
-*/
-#ifndef __IREGDEF_H__
-#define __IREGDEF_H__
-
-/*
- * 950313: Ketan added sreg/lreg and R_SZ for 64-bit saves
- *         added Register definition for XContext reg.
- *         Look towards end of this file.
- */
-/*
-** register names 
-*/
-#define r0	$0
-#define r1	$1
-#define r2	$2
-#define r3	$3
-#define r4	$4
-#define r5	$5
-#define r6	$6
-#define r7	$7
-#define r8	$8
-#define r9	$9
-#define r10	$10
-#define r11	$11
-#define r12	$12
-#define r13	$13
-
-#define r14	$14
-#define r15	$15
-#define r16	$16
-#define r17	$17
-#define r18	$18
-#define r19	$19
-#define r20	$20
-#define r21	$21
-#define r22	$22
-#define r23	$23
-#define r24	$24
-#define r25	$25
-#define r26	$26
-#define r27	$27
-#define r28	$28
-#define r29	$29
-#define r30	$30
-#define r31	$31
-
-#define fp0	$f0
-#define fp1	$f1
-#define fp2	$f2
-#define fp3	$f3
-#define fp4	$f4
-#define fp5	$f5
-#define fp6	$f6
-#define fp7	$f7
-#define fp8	$f8
-#define fp9	$f9
-#define fp10	$f10
-#define fp11	$f11
-#define fp12	$f12
-#define fp13	$f13
-#define fp14	$f14
-#define fp15	$f15
-#define fp16	$f16
-#define fp17	$f17
-#define fp18	$f18
-#define fp19	$f19
-#define fp20	$f20
-#define fp21	$f21
-#define fp22	$f22
-#define fp23	$f23
-#define fp24	$f24
-#define fp25	$f25
-#define fp26	$f26
-#define fp27	$f27
-#define fp28	$f28
-#define fp29	$f29
-#define fp30	$f30
-#define fp31	$f31
-
-#define fcr0	$0
-#define fcr30	$30
-#define fcr31	$31
-
-#define zero	$0	/* wired zero */
-#define AT	$at	/* assembler temp */
-#define v0	$2	/* return value */
-#define v1	$3
-#define a0	$4	/* argument registers a0-a3 */
-#define a1	$5
-#define a2	$6
-#define a3	$7
-#define t0	$8	/* caller saved  t0-t9 */
-#define t1	$9
-#define t2	$10
-#define t3	$11
-#define t4	$12
-#define t5	$13
-#define t6	$14
-#define t7	$15
-#define s0	$16	/* callee saved s0-s8 */
-#define s1	$17
-#define s2	$18
-#define s3	$19
-#define s4	$20
-#define s5	$21
-#define s6	$22
-#define s7	$23
-#define t8	$24
-#define t9	$25
-#define k0	$26	/* kernel usage */
-#define k1	$27	/* kernel usage */
-#define gp	$28	/* sdata pointer */
-#define sp	$29	/* stack pointer */
-#define s8	$30	/* yet another saved reg for the callee */
-#define fp	$30	/* frame pointer - this is being phased out by MIPS */
-#define ra	$31	/* return address */
-
-
-/*
-** relative position of registers in save reg area
-*/
-#define	R_R0		0
-#define	R_R1		1
-#define	R_R2		2
-#define	R_R3		3
-#define	R_R4		4
-#define	R_R5		5
-#define	R_R6		6
-#define	R_R7		7
-#define	R_R8		8
-#define	R_R9		9
-#define	R_R10		10
-#define	R_R11		11
-#define	R_R12		12
-#define	R_R13		13
-#define	R_R14		14
-#define	R_R15		15
-#define	R_R16		16
-#define	R_R17		17
-#define	R_R18		18
-#define	R_R19		19
-#define	R_R20		20
-#define	R_R21		21
-#define	R_R22		22
-#define	R_R23		23
-#define	R_R24		24
-#define	R_R25		25
-#define	R_R26		26
-#define	R_R27		27
-#define	R_R28		28
-#define	R_R29		29
-#define	R_R30		30
-#define	R_R31		31
-#define	R_F0		32
-#define	R_F1		33
-#define	R_F2		34
-#define	R_F3		35
-#define	R_F4		36
-#define	R_F5		37
-#define	R_F6		38
-#define	R_F7		39
-#define	R_F8		40
-#define	R_F9		41
-#define	R_F10		42
-#define	R_F11		43
-#define	R_F12		44
-#define	R_F13		45
-#define	R_F14		46
-#define	R_F15		47
-#define	R_F16		48
-#define	R_F17		49
-#define	R_F18		50
-#define	R_F19		51
-#define	R_F20		52
-#define	R_F21		53
-#define	R_F22		54
-#define	R_F23		55
-#define	R_F24		56
-#define	R_F25		57
-#define	R_F26		58
-#define	R_F27		59
-#define	R_F28		60
-#define	R_F29		61
-#define	R_F30		62
-#define	R_F31		63
-#define NCLIENTREGS	64
-#define	R_EPC		64
-#define	R_MDHI		65
-#define	R_MDLO		66
-#define	R_SR		67
-#define	R_CAUSE		68
-#define	R_TLBHI		69
-#if defined(CPU_R3000)
-#define	R_TLBLO		70
-#endif
-#if defined(CPU_R4000)
-#define	R_TLBLO0	70
-#endif
-#define	R_BADVADDR	71
-#define	R_INX		72
-#define	R_RAND		73
-#define	R_CTXT		74
-#define	R_EXCTYPE	75
-#define R_MODE		76
-#define	R_PRID		77
-#define R_FCSR		78
-#define R_FEIR		79
-#if defined(CPU_R3000)
-#define NREGS		80
-#endif
-#if defined(CPU_R4000)
-#define	R_TLBLO1	80
-#define R_PAGEMASK	81
-#define R_WIRED		82
-#define R_COUNT		83
-#define R_COMPARE	84
-#define R_CONFIG	85
-#define R_LLADDR	86
-#define R_WATCHLO	87
-#define R_WATCHHI	88
-#define R_ECC		89
-#define R_CACHEERR	90
-#define R_TAGLO		91
-#define R_TAGHI		92
-#define R_ERRPC		93
-#define R_XCTXT     94  /* Ketan added from SIM64bit */
-
-#define	NREGS		95
-#endif
-
-/*
-** For those who like to think in terms of the compiler names for the regs
-*/
-#define	R_ZERO		R_R0
-#define	R_AT		R_R1
-#define	R_V0		R_R2
-#define	R_V1		R_R3
-#define	R_A0		R_R4
-#define	R_A1		R_R5
-#define	R_A2		R_R6
-#define	R_A3		R_R7
-#define	R_T0		R_R8
-#define	R_T1		R_R9
-#define	R_T2		R_R10
-#define	R_T3		R_R11
-#define	R_T4		R_R12
-#define	R_T5		R_R13
-#define	R_T6		R_R14
-#define	R_T7		R_R15
-#define	R_S0		R_R16
-#define	R_S1		R_R17
-#define	R_S2		R_R18
-#define	R_S3		R_R19
-#define	R_S4		R_R20
-#define	R_S5		R_R21
-#define	R_S6		R_R22
-#define	R_S7		R_R23
-#define	R_T8		R_R24
-#define	R_T9		R_R25
-#define	R_K0		R_R26
-#define	R_K1		R_R27
-#define	R_GP		R_R28
-#define	R_SP		R_R29
-#define	R_FP		R_R30
-#define	R_RA		R_R31
-
-/* Ketan added the following */
-#ifdef CPU_R3000
-#define sreg	sw
-#define lreg	lw
-#define rmfc0	mfc0
-#define rmtc0	mtc0
-#define R_SZ	4
-#endif CPU_R3000
-
-#ifdef CPU_R4000
-#if __mips < 3
-#define sreg	sw
-#define lreg	lw
-#define rmfc0	mfc0
-#define rmtc0	mtc0
-#define R_SZ	4
-#else
-#define sreg	sd
-#define lreg	ld
-#define rmfc0	dmfc0
-#define rmtc0	dmtc0
-#define R_SZ	8
-#endif
-#endif CPU_R4000
-/* Ketan till here */
-
-#endif /* __IREGDEF_H__ */
-
diff --git a/cpukit/score/cpu/mips64orion/asm.h b/cpukit/score/cpu/mips64orion/asm.h
deleted file mode 100644
index fccd89069f..0000000000
--- a/cpukit/score/cpu/mips64orion/asm.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/*  asm.h
- *
- *  This include file attempts to address the problems
- *  caused by incompatible flavors of assemblers and
- *  toolsets.  It primarily addresses variations in the
- *  use of leading underscores on symbols and the requirement
- *  that register names be preceded by a %.
- *
- *
- *  NOTE: The spacing in the use of these macros
- *        is critical to them working as advertised.
- *
- *  COPYRIGHT:
- *
- *  This file is based on similar code found in newlib available
- *  from ftp.cygnus.com.  The file which was used had no copyright
- *  notice.  This file is freely distributable as long as the source
- *  of the file is noted.  This file is:
- *
- *  COPYRIGHT (c) 1994-1997.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  $Id$
- */
-/* @(#)asm.h       03/15/96     1.1 */
-
-#ifndef __NO_CPU_ASM_h
-#define __NO_CPU_ASM_h
-
-/*
- *  Indicate we are in an assembly file and get the basic CPU definitions.
- */
-
-#ifndef ASM
-#define ASM
-#endif
-#include <rtems/score/targopts.h>
-#include <rtems/score/no_cpu.h>
-
-/*
- *  Recent versions of GNU cpp define variables which indicate the
- *  need for underscores and percents.  If not using GNU cpp or
- *  the version does not support this, then you will obviously
- *  have to define these as appropriate.
- */
-
-#ifndef __USER_LABEL_PREFIX__
-#define __USER_LABEL_PREFIX__ _
-#endif
-
-#ifndef __REGISTER_PREFIX__
-#define __REGISTER_PREFIX__
-#endif
-
-/* ANSI concatenation macros.  */
-
-#define CONCAT1(a, b) CONCAT2(a, b)
-#define CONCAT2(a, b) a ## b
-
-/* Use the right prefix for global labels.  */
-
-#define SYM(x) CONCAT1 (__USER_LABEL_PREFIX__, x)
-
-/* Use the right prefix for registers.  */
-
-#define REG(x) CONCAT1 (__REGISTER_PREFIX__, x)
-
-/*
- *  define macros for all of the registers on this CPU
- *
- *  EXAMPLE:     #define d0 REG (d0)
- */
-
-/*
- *  Define macros to handle section beginning and ends.
- */
-
-
-#define BEGIN_CODE_DCL .text
-#define END_CODE_DCL
-#define BEGIN_DATA_DCL .data
-#define END_DATA_DCL
-#define BEGIN_CODE .text
-#define END_CODE
-#define BEGIN_DATA
-#define END_DATA
-#define BEGIN_BSS
-#define END_BSS
-#define END
-
-/*
- *  Following must be tailor for a particular flavor of the C compiler.
- *  They may need to put underscores in front of the symbols.
- */
-
-#define PUBLIC(sym) .globl SYM (sym)
-#define EXTERN(sym) .globl SYM (sym)
-
-#endif
-/* end of include file */
-
-
diff --git a/cpukit/score/cpu/mips64orion/cpu.c b/cpukit/score/cpu/mips64orion/cpu.c
deleted file mode 100644
index 4617be460d..0000000000
--- a/cpukit/score/cpu/mips64orion/cpu.c
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- *  Mips CPU Dependent Source
- *
- *  Author:     Craig Lebakken <craigl@transition.com>
- *
- *  COPYRIGHT (c) 1996 by Transition Networks Inc.
- *
- *  To anyone who acknowledges that this file is provided "AS IS"
- *  without any express or implied warranty:
- *      permission to use, copy, modify, and distribute this file
- *      for any purpose is hereby granted without fee, provided that
- *      the above copyright notice and this notice appears in all
- *      copies, and that the name of Transition Networks not be used in
- *      advertising or publicity pertaining to distribution of the
- *      software without specific, written prior permission.
- *      Transition Networks makes no representations about the suitability
- *      of this software for any purpose.
- *
- *  Derived from c/src/exec/score/cpu/no_cpu/cpu.c:
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-/*
- *  Rather than deleting this, it is commented out to (hopefully) help
- *  the submitter send updates.
- *
- * static char _sccsid[] = "@(#)cpu.c 08/20/96     1.5\n";
- */
-
-#include <rtems/system.h>
-#include <rtems/score/isr.h>
-#include <rtems/score/wkspace.h>
-
-
-ISR_Handler_entry _ISR_Vector_table[ ISR_NUMBER_OF_VECTORS ];
-
-/*  _CPU_Initialize
- *
- *  This routine performs processor dependent initialization.
- *
- *  INPUT PARAMETERS:
- *    cpu_table       - CPU table to initialize
- *    thread_dispatch - address of disptaching routine
- */
-
-
-void null_handler( void )
-{
-}
-
-
-void _CPU_Initialize(
-  rtems_cpu_table  *cpu_table,
-  void      (*thread_dispatch)      /* ignored on this CPU */
-)
-{
-   unsigned int i = ISR_NUMBER_OF_VECTORS;
-
-   while ( i-- )
-   {
-      _ISR_Vector_table[i] = (ISR_Handler_entry)null_handler;
-   }
-
-  /*
-   *  The thread_dispatch argument is the address of the entry point
-   *  for the routine called at the end of an ISR once it has been
-   *  decided a context switch is necessary.  On some compilation
-   *  systems it is difficult to call a high-level language routine
-   *  from assembly.  This allows us to trick these systems.
-   *
-   *  If you encounter this problem save the entry point in a CPU
-   *  dependent variable.
-   */
-
-  _CPU_Thread_dispatch_pointer = thread_dispatch;
-
-  /*
-   *  If there is not an easy way to initialize the FP context
-   *  during Context_Initialize, then it is usually easier to
-   *  save an "uninitialized" FP context here and copy it to
-   *  the task's during Context_Initialize.
-   */
-
-  /* FP context initialization support goes here */
-
-  _CPU_Table = *cpu_table;
-
-}
-
-/*PAGE
- *
- *  _CPU_ISR_Get_level
- */
- 
-#if 0 /* located in cpu_asm.S */
-unsigned32 _CPU_ISR_Get_level( void )
-{
-  /*
-   *  This routine returns the current interrupt level.
-   */
-}
-#endif
-
-/*PAGE
- *
- *  _CPU_ISR_install_raw_handler
- */
- 
-void _CPU_ISR_install_raw_handler(
-  unsigned32  vector,
-  proc_ptr    new_handler,
-  proc_ptr   *old_handler
-)
-{
-  /*
-   *  This is where we install the interrupt handler into the "raw" interrupt
-   *  table used by the CPU to dispatch interrupt handlers.
-   */
-
-#if 0 /* not necessary */
-/* use IDT/Sim to set interrupt vector.  Needed to co-exist with debugger. */
-   add_ext_int_func( vector, new_handler );
-#endif
-}
-
-/*PAGE
- *
- *  _CPU_ISR_install_vector
- *
- *  This kernel routine installs the RTEMS handler for the
- *  specified vector.
- *
- *  Input parameters:
- *    vector      - interrupt vector number
- *    old_handler - former ISR for this vector number
- *    new_handler - replacement ISR for this vector number
- *
- *  Output parameters:  NONE
- *
- */
-
-void _CPU_ISR_install_vector(
-  unsigned32  vector,
-  proc_ptr    new_handler,
-  proc_ptr   *old_handler
-)
-{
-   *old_handler = _ISR_Vector_table[ vector ];
-
-   /*
-    *  If the interrupt vector table is a table of pointer to isr entry
-    *  points, then we need to install the appropriate RTEMS interrupt
-    *  handler for this vector number.
-    */
-
-   _CPU_ISR_install_raw_handler( vector, _ISR_Handler, old_handler );
-
-   /*
-    *  We put the actual user ISR address in '_ISR_vector_table'.  This will
-    *  be used by the _ISR_Handler so the user gets control.
-    */
-
-    _ISR_Vector_table[ vector ] = new_handler;
-}
-
-/*PAGE
- *
- *  _CPU_Install_interrupt_stack
- */
-
-void _CPU_Install_interrupt_stack( void )
-{
-/* we don't support this yet */
-}
-
-/*PAGE
- *
- *  _CPU_Internal_threads_Idle_thread_body
- *
- *  NOTES:
- *
- *  1. This is the same as the regular CPU independent algorithm.
- *
- *  2. If you implement this using a "halt", "idle", or "shutdown"
- *     instruction, then don't forget to put it in an infinite loop.
- *
- *  3. Be warned. Some processors with onboard DMA have been known
- *     to stop the DMA if the CPU were put in IDLE mode.  This might
- *     also be a problem with other on-chip peripherals.  So use this
- *     hook with caution.
- */
-
-#if 0 /* located in cpu_asm.S */
-void _CPU_Thread_Idle_body( void )
-{
-
-  for( ; ; )
-    /* insert your "halt" instruction here */ ;
-}
-#endif
-
-extern void mips_break( int error );
-
-#include <stdio.h>
-
-void mips_fatal_error( int error )
-{
-   printf("fatal error 0x%x %d\n",error,error);
-   mips_break( error );
-}
diff --git a/cpukit/score/cpu/mips64orion/cpu_asm.S b/cpukit/score/cpu/mips64orion/cpu_asm.S
deleted file mode 100644
index 7dcb8fbda7..0000000000
--- a/cpukit/score/cpu/mips64orion/cpu_asm.S
+++ /dev/null
@@ -1,972 +0,0 @@
-/*  cpu_asm.S 
- *
- *  This file contains the basic algorithms for all assembly code used
- *  in an specific CPU port of RTEMS.  These algorithms must be implemented
- *  in assembly language
- *
- *  Author:     Craig Lebakken <craigl@transition.com>
- *
- *  COPYRIGHT (c) 1996 by Transition Networks Inc.
- *
- *  To anyone who acknowledges that this file is provided "AS IS"
- *  without any express or implied warranty:
- *      permission to use, copy, modify, and distribute this file
- *      for any purpose is hereby granted without fee, provided that
- *      the above copyright notice and this notice appears in all
- *      copies, and that the name of Transition Networks not be used in
- *      advertising or publicity pertaining to distribution of the
- *      software without specific, written prior permission.
- *      Transition Networks makes no representations about the suitability
- *      of this software for any purpose.
- *
- *  Derived from c/src/exec/score/cpu/no_cpu/cpu_asm.s:
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-/* @(#)cpu_asm.S       08/20/96     1.15 */
-
-#include "cpu_asm.h"
-
-#include "iregdef.h"
-#include "idtcpu.h"
-
-#define FRAME(name,frm_reg,offset,ret_reg)      \
-        .globl  name;                           \
-        .ent    name;                           \
-name:;                                          \
-        .frame  frm_reg,offset,ret_reg
-#define ENDFRAME(name)                          \
-        .end name
-
-
-#define EXCP_STACK_SIZE (NREGS*R_SZ)
-
-#if __ghs__
-#define sd sw
-#define ld lw
-#define dmtc0 mtc0
-#define dsll sll
-#define dmfc0 mfc0
-#endif
-
-#if 1  /* 32 bit unsigned32 types */
-#define sint sw
-#define lint lw
-#define stackadd addiu
-#define intadd addu
-#define SZ_INT 4
-#define SZ_INT_POW2 2
-#else /* 64 bit unsigned32 types */
-#define sint dw
-#define lint dw
-#define stackadd daddiu
-#define intadd daddu
-#define SZ_INT 8
-#define SZ_INT_POW2 3
-#endif
-
-#ifdef __GNUC__
-#define EXTERN(x,size) .extern x,size
-#else
-#define EXTERN(x,size)
-#endif
-
-/* NOTE: these constants must match the Context_Control structure in cpu.h */
-#define S0_OFFSET 0
-#define S1_OFFSET 1
-#define S2_OFFSET 2
-#define S3_OFFSET 3
-#define S4_OFFSET 4
-#define S5_OFFSET 5
-#define S6_OFFSET 6
-#define S7_OFFSET 7
-#define SP_OFFSET 8
-#define FP_OFFSET 9
-#define RA_OFFSET 10
-#define C0_SR_OFFSET 11
-#define C0_EPC_OFFSET 12
-
-/* NOTE: these constants must match the Context_Control_fp structure in cpu.h */
-#define FP0_OFFSET  0 
-#define FP1_OFFSET  1 
-#define FP2_OFFSET  2 
-#define FP3_OFFSET  3 
-#define FP4_OFFSET  4 
-#define FP5_OFFSET  5 
-#define FP6_OFFSET  6 
-#define FP7_OFFSET  7 
-#define FP8_OFFSET  8 
-#define FP9_OFFSET  9 
-#define FP10_OFFSET 10 
-#define FP11_OFFSET 11 
-#define FP12_OFFSET 12 
-#define FP13_OFFSET 13 
-#define FP14_OFFSET 14 
-#define FP15_OFFSET 15 
-#define FP16_OFFSET 16 
-#define FP17_OFFSET 17 
-#define FP18_OFFSET 18 
-#define FP19_OFFSET 19 
-#define FP20_OFFSET 20 
-#define FP21_OFFSET 21 
-#define FP22_OFFSET 22 
-#define FP23_OFFSET 23 
-#define FP24_OFFSET 24 
-#define FP25_OFFSET 25 
-#define FP26_OFFSET 26 
-#define FP27_OFFSET 27 
-#define FP28_OFFSET 28 
-#define FP29_OFFSET 29 
-#define FP30_OFFSET 30 
-#define FP31_OFFSET 31 
-
-
-/*PAGE
- *
- *  _CPU_ISR_Get_level
- */
-
-#if 0
-unsigned32 _CPU_ISR_Get_level( void )
-{
-  /*
-   *  This routine returns the current interrupt level.
-   */
-}
-#endif
-/* return the current exception level for the 4650 */
-FRAME(_CPU_ISR_Get_level,sp,0,ra)
-	mfc0 v0,C0_SR
-	nop
-	andi v0,SR_EXL 
-	srl v0,1
-	j ra
-ENDFRAME(_CPU_ISR_Get_level)
-
-FRAME(_CPU_ISR_Set_level,sp,0,ra)
-	nop
-	mfc0 a0,C0_SR
-	nop
-	andi a0,SR_EXL 
-	beqz a0,_CPU_ISR_Set_1		/* normalize a0 */
-	nop
-	li a0,1         
-_CPU_ISR_Set_1:
-	beq v0,a0,_CPU_ISR_Set_exit	/* if (current_level != new_level ) */
-	nop
-	bnez a0,_CPU_ISR_Set_2
-	nop
-	nop
-	mfc0 t0,C0_SR
-	nop
-	li t1,~SR_EXL
-	and t0,t1
-	nop
-	mtc0 t0,C0_SR                   /* disable exception level */
-	nop
-	j ra 
-	nop
-_CPU_ISR_Set_2:
-	nop
-	mfc0 t0,C0_SR
-	nop
-	li t1,~SR_IE
-	and t0,t1
-	nop
-	mtc0 t0,C0_SR                   /* first disable ie bit (recommended) */
-	nop
-	ori t0,SR_EXL|SR_IE		/* enable exception level  */
-	nop
-	mtc0 t0,C0_SR         
-	nop
-_CPU_ISR_Set_exit:
-	j ra
-	nop
-ENDFRAME(_CPU_ISR_Set_level)
-
-/*
- *  _CPU_Context_save_fp_context
- *
- *  This routine is responsible for saving the FP context
- *  at *fp_context_ptr.  If the point to load the FP context
- *  from is changed then the pointer is modified by this routine.
- *
- *  Sometimes a macro implementation of this is in cpu.h which dereferences
- *  the ** and a similarly named routine in this file is passed something
- *  like a (Context_Control_fp *).  The general rule on making this decision
- *  is to avoid writing assembly language.
- */
-
-/* void _CPU_Context_save_fp(
- * void **fp_context_ptr
- * )
- * {
- * }
- */
-
-FRAME(_CPU_Context_save_fp,sp,0,ra)
-	.set noat
-	ld a1,(a0)
-	swc1 $f0,FP0_OFFSET*4(a1)
-	swc1 $f1,FP1_OFFSET*4(a1)
-	swc1 $f2,FP2_OFFSET*4(a1)
-	swc1 $f3,FP3_OFFSET*4(a1)
-	swc1 $f4,FP4_OFFSET*4(a1)
-	swc1 $f5,FP5_OFFSET*4(a1)
-	swc1 $f6,FP6_OFFSET*4(a1)
-	swc1 $f7,FP7_OFFSET*4(a1)
-	swc1 $f8,FP8_OFFSET*4(a1)
-	swc1 $f9,FP9_OFFSET*4(a1)
-	swc1 $f10,FP10_OFFSET*4(a1)
-	swc1 $f11,FP11_OFFSET*4(a1)
-	swc1 $f12,FP12_OFFSET*4(a1)
-	swc1 $f13,FP13_OFFSET*4(a1)
-	swc1 $f14,FP14_OFFSET*4(a1)
-	swc1 $f15,FP15_OFFSET*4(a1)
-	swc1 $f16,FP16_OFFSET*4(a1)
-	swc1 $f17,FP17_OFFSET*4(a1)
-	swc1 $f18,FP18_OFFSET*4(a1)
-	swc1 $f19,FP19_OFFSET*4(a1)
-	swc1 $f20,FP20_OFFSET*4(a1)
-	swc1 $f21,FP21_OFFSET*4(a1)
-	swc1 $f22,FP22_OFFSET*4(a1)
-	swc1 $f23,FP23_OFFSET*4(a1)
-	swc1 $f24,FP24_OFFSET*4(a1)
-	swc1 $f25,FP25_OFFSET*4(a1)
-	swc1 $f26,FP26_OFFSET*4(a1)
-	swc1 $f27,FP27_OFFSET*4(a1)
-	swc1 $f28,FP28_OFFSET*4(a1)
-	swc1 $f29,FP29_OFFSET*4(a1)
-	swc1 $f30,FP30_OFFSET*4(a1)
-	swc1 $f31,FP31_OFFSET*4(a1)
-	j ra
-	nop
-	.set at
-ENDFRAME(_CPU_Context_save_fp)
-
-/*
- *  _CPU_Context_restore_fp_context
- *
- *  This routine is responsible for restoring the FP context
- *  at *fp_context_ptr.  If the point to load the FP context
- *  from is changed then the pointer is modified by this routine.
- *
- *  Sometimes a macro implementation of this is in cpu.h which dereferences
- *  the ** and a similarly named routine in this file is passed something
- *  like a (Context_Control_fp *).  The general rule on making this decision
- *  is to avoid writing assembly language.
- */
-
-/* void _CPU_Context_restore_fp(
- * void **fp_context_ptr
- * )
- * {
- * }
- */
-
-FRAME(_CPU_Context_restore_fp,sp,0,ra)
-	.set noat
-	ld a1,(a0)
-	lwc1 $f0,FP0_OFFSET*4(a1)
-	lwc1 $f1,FP1_OFFSET*4(a1)
-	lwc1 $f2,FP2_OFFSET*4(a1)
-	lwc1 $f3,FP3_OFFSET*4(a1)
-	lwc1 $f4,FP4_OFFSET*4(a1)
-	lwc1 $f5,FP5_OFFSET*4(a1)
-	lwc1 $f6,FP6_OFFSET*4(a1)
-	lwc1 $f7,FP7_OFFSET*4(a1)
-	lwc1 $f8,FP8_OFFSET*4(a1)
-	lwc1 $f9,FP9_OFFSET*4(a1)
-	lwc1 $f10,FP10_OFFSET*4(a1)
-	lwc1 $f11,FP11_OFFSET*4(a1)
-	lwc1 $f12,FP12_OFFSET*4(a1)
-	lwc1 $f13,FP13_OFFSET*4(a1)
-	lwc1 $f14,FP14_OFFSET*4(a1)
-	lwc1 $f15,FP15_OFFSET*4(a1)
-	lwc1 $f16,FP16_OFFSET*4(a1)
-	lwc1 $f17,FP17_OFFSET*4(a1)
-	lwc1 $f18,FP18_OFFSET*4(a1)
-	lwc1 $f19,FP19_OFFSET*4(a1)
-	lwc1 $f20,FP20_OFFSET*4(a1)
-	lwc1 $f21,FP21_OFFSET*4(a1)
-	lwc1 $f22,FP22_OFFSET*4(a1)
-	lwc1 $f23,FP23_OFFSET*4(a1)
-	lwc1 $f24,FP24_OFFSET*4(a1)
-	lwc1 $f25,FP25_OFFSET*4(a1)
-	lwc1 $f26,FP26_OFFSET*4(a1)
-	lwc1 $f27,FP27_OFFSET*4(a1)
-	lwc1 $f28,FP28_OFFSET*4(a1)
-	lwc1 $f29,FP29_OFFSET*4(a1)
-	lwc1 $f30,FP30_OFFSET*4(a1)
-	lwc1 $f31,FP31_OFFSET*4(a1)
-	j ra
-	nop
-	.set at
-ENDFRAME(_CPU_Context_restore_fp)
-
-/*  _CPU_Context_switch
- *
- *  This routine performs a normal non-FP context switch.
- */
-
-/* void _CPU_Context_switch(
- * Context_Control  *run,
- * Context_Control  *heir
- * )
- * {
- * }
- */
-
-FRAME(_CPU_Context_switch,sp,0,ra)
-
-	mfc0 t0,C0_SR
-	li t1,~SR_IE
-	sd t0,C0_SR_OFFSET*8(a0)	/* save status register */
-	and t0,t1
-	mtc0 t0,C0_SR                   /* first disable ie bit (recommended) */
-	ori t0,SR_EXL|SR_IE		/* enable exception level to disable interrupts */
-	mtc0 t0,C0_SR
-
-	sd ra,RA_OFFSET*8(a0)           /* save current context */
-	sd sp,SP_OFFSET*8(a0)
-	sd fp,FP_OFFSET*8(a0)
-	sd s0,S0_OFFSET*8(a0)
-	sd s1,S1_OFFSET*8(a0)
-	sd s2,S2_OFFSET*8(a0)
-	sd s3,S3_OFFSET*8(a0)
-	sd s4,S4_OFFSET*8(a0)
-	sd s5,S5_OFFSET*8(a0)
-	sd s6,S6_OFFSET*8(a0)
-	sd s7,S7_OFFSET*8(a0)
-	dmfc0 t0,C0_EPC
-	sd t0,C0_EPC_OFFSET*8(a0)
-
-_CPU_Context_switch_restore:
-	ld s0,S0_OFFSET*8(a1)		/* restore context */
-	ld s1,S1_OFFSET*8(a1)
-	ld s2,S2_OFFSET*8(a1)
-	ld s3,S3_OFFSET*8(a1)
-	ld s4,S4_OFFSET*8(a1)
-	ld s5,S5_OFFSET*8(a1)
-	ld s6,S6_OFFSET*8(a1)
-	ld s7,S7_OFFSET*8(a1)
-	ld fp,FP_OFFSET*8(a1) 
-	ld sp,SP_OFFSET*8(a1)
-	ld ra,RA_OFFSET*8(a1)
-	ld t0,C0_EPC_OFFSET*8(a1)
-	dmtc0 t0,C0_EPC
-	ld t0,C0_SR_OFFSET*8(a1)
-	andi t0,SR_EXL
-	bnez t0,_CPU_Context_1		/* set exception level from restore context */
-	li t0,~SR_EXL
-	mfc0 t1,C0_SR
-	nop
-	and t1,t0
-	mtc0 t1,C0_SR
-_CPU_Context_1:
-	j ra
-	nop
-ENDFRAME(_CPU_Context_switch)
-
-/*
- *  _CPU_Context_restore
- *
- *  This routine is generally used only to restart self in an
- *  efficient manner.  It may simply be a label in _CPU_Context_switch.
- *
- *  NOTE: May be unnecessary to reload some registers.
- */
-
-#if 0
-void _CPU_Context_restore(
-  Context_Control *new_context
-)
-{
-}
-#endif
-
-FRAME(_CPU_Context_restore,sp,0,ra)
-	dadd a1,a0,zero
-	j _CPU_Context_switch_restore
-	nop
-ENDFRAME(_CPU_Context_restore)
-
-EXTERN(_ISR_Nest_level, SZ_INT)
-EXTERN(_Thread_Dispatch_disable_level,SZ_INT)
-EXTERN(_Context_Switch_necessary,SZ_INT)
-EXTERN(_ISR_Signals_to_thread_executing,SZ_INT)
-.extern _Thread_Dispatch
-.extern _ISR_Vector_table
-
-/*  void __ISR_Handler()
- *
- *  This routine provides the RTEMS interrupt management.
- *
- */
-
-#if 0
-void _ISR_Handler()
-{
-   /*
-    *  This discussion ignores a lot of the ugly details in a real
-    *  implementation such as saving enough registers/state to be
-    *  able to do something real.  Keep in mind that the goal is
-    *  to invoke a user's ISR handler which is written in C and
-    *  uses a certain set of registers.
-    *
-    *  Also note that the exact order is to a large extent flexible.
-    *  Hardware will dictate a sequence for a certain subset of
-    *  _ISR_Handler while requirements for setting
-    */
-
-  /*
-   *  At entry to "common" _ISR_Handler, the vector number must be
-   *  available.  On some CPUs the hardware puts either the vector
-   *  number or the offset into the vector table for this ISR in a
-   *  known place.  If the hardware does not give us this information,
-   *  then the assembly portion of RTEMS for this port will contain
-   *  a set of distinct interrupt entry points which somehow place
-   *  the vector number in a known place (which is safe if another
-   *  interrupt nests this one) and branches to _ISR_Handler.
-   *
-   */
-#endif
-FRAME(_ISR_Handler,sp,0,ra)
-.set noreorder
-#if USE_IDTKIT
-/* IDT/Kit incorrectly adds 4 to EPC before returning.  This compensates */
-	lreg    k0, R_EPC*R_SZ(sp)
-	daddiu    k0,k0,-4
-	sreg    k0, R_EPC*R_SZ(sp)
-	lreg    k0, R_CAUSE*R_SZ(sp)
-	li	k1, ~CAUSE_BD
-	and     k0, k1 
-	sreg    k0, R_CAUSE*R_SZ(sp)
-#endif
-	
-/* save registers not already saved by IDT/sim */
-	stackadd sp,sp,-EXCP_STACK_SIZE /* store ra on the stack */
-
-	sreg    ra, R_RA*R_SZ(sp)
-	sreg    v0, R_V0*R_SZ(sp)
-	sreg    v1, R_V1*R_SZ(sp)
-	sreg    a0, R_A0*R_SZ(sp)
-	sreg    a1, R_A1*R_SZ(sp)
-	sreg    a2, R_A2*R_SZ(sp)
-	sreg    a3, R_A3*R_SZ(sp)
-	sreg    t0, R_T0*R_SZ(sp)
-	sreg    t1, R_T1*R_SZ(sp)
-	sreg    t2, R_T2*R_SZ(sp)
-	sreg    t3, R_T3*R_SZ(sp)
-	sreg    t4, R_T4*R_SZ(sp)
-	sreg    t5, R_T5*R_SZ(sp)
-	sreg    t6, R_T6*R_SZ(sp)
-	sreg    t7, R_T7*R_SZ(sp)
-	mflo    k0
-	sreg    t8, R_T8*R_SZ(sp)
-	sreg    k0, R_MDLO*R_SZ(sp)
-	sreg    t9, R_T9*R_SZ(sp)
-	mfhi    k0
-	sreg    gp, R_GP*R_SZ(sp)
-	sreg    fp, R_FP*R_SZ(sp)
-	sreg    k0, R_MDHI*R_SZ(sp)
-	.set noat
-	sreg    AT, R_AT*R_SZ(sp)
-	.set at
-
-	stackadd sp,sp,-40		/* store ra on the stack */
-	sd ra,32(sp)
-
-/* determine if an interrupt generated this exception */
-	mfc0 k0,C0_CAUSE
-	and k1,k0,CAUSE_EXCMASK
-	bnez k1,_ISR_Handler_prom_exit /* not an external interrupt, pass exception to Monitor */
-	mfc0 k1,C0_SR
-	and k0,k1
-	and k0,CAUSE_IPMASK
-	beq k0,zero,_ISR_Handler_quick_exit /* external interrupt not enabled, ignore */
-	nop
-
-  /*
-   *  save some or all context on stack
-   *  may need to save some special interrupt information for exit
-   *
-   *  #if ( CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE )
-   *    if ( _ISR_Nest_level == 0 )
-   *      switch to software interrupt stack
-   *  #endif
-   */
-#if ( CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE )
-	lint t0,_ISR_Nest_level
-	beq t0, zero,  _ISR_Handler_1
-	nop
-	/* switch stacks */	
-_ISR_Handler_1:
-#else
-	lint t0,_ISR_Nest_level
-#endif
-  /*
-   *  _ISR_Nest_level++;
-   */
-	addi t0,t0,1
-	sint t0,_ISR_Nest_level
-  /*
-   *  _Thread_Dispatch_disable_level++;
-   */
-	lint t1,_Thread_Dispatch_disable_level
-	addi t1,t1,1
-	sint t1,_Thread_Dispatch_disable_level
-#if 0
-	nop
-	j _ISR_Handler_4
-	nop
-  /*
-   *  while ( interrupts_pending(cause_reg) ) {
-   *     vector = BITFIELD_TO_INDEX(cause_reg);
-   *     (*_ISR_Vector_table[ vector ])( vector );
-   *  }
-   */
-_ISR_Handler_2:
-/* software interrupt priorities can be applied here */
-	li t1,-1
-/* convert bit field into interrupt index */
-_ISR_Handler_3:
-	andi t2,t0,1
-	addi t1,1
-	beql t2,zero,_ISR_Handler_3
-	dsrl t0,1
-	li t1,7
-	dsll t1,3			/* convert index to byte offset (*8) */
-	la t3,_ISR_Vector_table
-	intadd t1,t3
-	lint t1,(t1)
-	jalr t1
-	nop
-	j _ISR_Handler_5
-	nop
-_ISR_Handler_4:
-	mfc0 t0,C0_CAUSE
-	andi t0,CAUSE_IPMASK
-	bne t0,zero,_ISR_Handler_2
-	dsrl t0,t0,8
-_ISR_Handler_5:
-#else
-	nop
-	li t1,7
-	dsll t1,t1,SZ_INT_POW2
-	la t3,_ISR_Vector_table
-	intadd t1,t3
-	lint t1,(t1)
-	jalr t1
-	nop
-#endif
-  /*
-   *  --_ISR_Nest_level;
-   */
-        lint t2,_ISR_Nest_level
-	addi t2,t2,-1
-        sint t2,_ISR_Nest_level
-  /*
-   *  --_Thread_Dispatch_disable_level;
-   */
-	lint t1,_Thread_Dispatch_disable_level
-	addi t1,t1,-1
-	sint t1,_Thread_Dispatch_disable_level
-  /*
-   *  if ( _Thread_Dispatch_disable_level || _ISR_Nest_level )
-   *    goto the label "exit interrupt (simple case)"
-   */
-	or t0,t2,t1
-	bne t0,zero,_ISR_Handler_exit
-	nop
-  /*
-   *  #if ( CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE )
-   *    restore stack
-   *  #endif
-   *  
-   *  if ( !_Context_Switch_necessary && !_ISR_Signals_to_thread_executing )
-   *    goto the label "exit interrupt (simple case)"
-   */
-	lint t0,_Context_Switch_necessary
-	lint t1,_ISR_Signals_to_thread_executing
-	or t0,t0,t1
-	beq t0,zero,_ISR_Handler_exit
-	nop
-
-  /*
-   *  call _Thread_Dispatch() or prepare to return to _ISR_Dispatch
-   */
-	jal _Thread_Dispatch
-	nop
-  /*
-   *  prepare to get out of interrupt
-   *  return from interrupt  (maybe to _ISR_Dispatch)
-   *
-   *  LABEL "exit interrupt (simple case):
-   *  prepare to get out of interrupt
-   *  return from interrupt
-   */
-_ISR_Handler_exit:
-	ld ra,32(sp)
-	stackadd sp,sp,40
-
-/* restore interrupt context from stack */
-	lreg    k0, R_MDLO*R_SZ(sp)
-	mtlo    k0
-	lreg    k0, R_MDHI*R_SZ(sp)
-	lreg    a2, R_A2*R_SZ(sp)
-	mthi    k0
-	lreg    a3, R_A3*R_SZ(sp)
-	lreg    t0, R_T0*R_SZ(sp)
-	lreg    t1, R_T1*R_SZ(sp)
-	lreg    t2, R_T2*R_SZ(sp)
-	lreg    t3, R_T3*R_SZ(sp)
-	lreg    t4, R_T4*R_SZ(sp)
-	lreg    t5, R_T5*R_SZ(sp)
-	lreg    t6, R_T6*R_SZ(sp)
-	lreg    t7, R_T7*R_SZ(sp)
-	lreg    t8, R_T8*R_SZ(sp)
-	lreg    t9, R_T9*R_SZ(sp)
-	lreg    gp, R_GP*R_SZ(sp)
-	lreg    fp, R_FP*R_SZ(sp)
-	lreg    ra, R_RA*R_SZ(sp)
-	lreg    a0, R_A0*R_SZ(sp)
-	lreg    a1, R_A1*R_SZ(sp)
-	lreg    v1, R_V1*R_SZ(sp)
-	lreg    v0, R_V0*R_SZ(sp)
-	.set noat
-	lreg    AT, R_AT*R_SZ(sp)
-	.set at
-
-	stackadd sp,sp,EXCP_STACK_SIZE /* store ra on the stack */
-
-#if USE_IDTKIT
-/* we handled exception, so return non-zero value */
-	li v0,1
-#endif
-
-_ISR_Handler_quick_exit:
-#ifdef USE_IDTKIT
-	j ra
-#else
-	eret
-#endif
-	nop
-
-_ISR_Handler_prom_exit:
-#ifdef CPU_R3000
-	la      k0, (R_VEC+((48)*8))
-#endif
-
-#ifdef CPU_R4000
-	la      k0, (R_VEC+((112)*8)) /* R4000 Sim's location is different */
-#endif
-	j       k0
-	nop
-
-       .set    reorder
-
-ENDFRAME(_ISR_Handler)
-
-
-FRAME(mips_enable_interrupts,sp,0,ra)
-	mfc0 t0,C0_SR		/* get status reg */
-	nop
-	or t0,t0,a0		 
-	mtc0 t0,C0_SR		/* save updated status reg */
-	j ra
-	nop
-ENDFRAME(mips_enable_interrupts)
-
-FRAME(mips_disable_interrupts,sp,0,ra)
-	mfc0 v0,C0_SR		/* get status reg */
-	li t1,SR_IMASK		/* t1 = load interrupt mask word */
-	not t0,t1		/* t0 = ~t1 */
-	and t0,v0		/* clear imask bits */
-	mtc0 t0,C0_SR		/* save status reg */
-	and v0,t1		/* mask return value (only return imask bits) */
-	jr ra
-	nop
-ENDFRAME(mips_disable_interrupts)
-
-FRAME(mips_enable_global_interrupts,sp,0,ra)
-	mfc0 t0,C0_SR		/* get status reg */
-	nop
-	ori t0,SR_IE
-	mtc0 t0,C0_SR		/* save updated status reg */
-	j ra
-	nop
-ENDFRAME(mips_enable_global_interrupts)
-
-FRAME(mips_disable_global_interrupts,sp,0,ra)
-	li t1,SR_IE
-	mfc0 t0,C0_SR		/* get status reg */
-	not t1
-	and t0,t1
-	mtc0 t0,C0_SR		/* save updated status reg */
-	j ra
-	nop
-ENDFRAME(mips_disable_global_interrupts)
-
-/* return the value of the status register in v0.  Used for debugging */
-FRAME(mips_get_sr,sp,0,ra)
-	mfc0 v0,C0_SR
-	j ra
-	nop
-ENDFRAME(mips_get_sr)
-
-FRAME(mips_break,sp,0,ra)
-#if 1
-	break 0x0
-	j mips_break
-#else
-	j ra
-#endif
-	nop
-ENDFRAME(mips_break)
-
-/*PAGE
- *
- *  _CPU_Internal_threads_Idle_thread_body
- *
- *  NOTES:
- *
- *  1. This is the same as the regular CPU independent algorithm.
- *
- *  2. If you implement this using a "halt", "idle", or "shutdown"
- *     instruction, then don't forget to put it in an infinite loop.
- *
- *  3. Be warned. Some processors with onboard DMA have been known
- *     to stop the DMA if the CPU were put in IDLE mode.  This might
- *     also be a problem with other on-chip peripherals.  So use this
- *     hook with caution.
- */
-
-FRAME(_CPU_Thread_Idle_body,sp,0,ra)
-	wait			/* enter low power mode */
-	j _CPU_Thread_Idle_body
-	nop
-ENDFRAME(_CPU_Thread_Idle_body)
-
-#define VEC_CODE_LENGTH 10*4
-
-/**************************************************************************
-**
-**	init_exc_vecs() - moves the exception code into the addresses
-**			  reserved for exception vectors
-**
-**	UTLB Miss exception vector at address 0x80000000
-**
-**	General exception vector at address 0x80000080
-**
-**	RESET exception vector is at address 0xbfc00000
-**
-***************************************************************************/
-
-#define INITEXCFRM ((2*4)+4)		/* ra + 2 arguments */
-FRAME(init_exc_vecs,sp,0,ra)
-/* This code yanked from SIM */
-#if defined(CPU_R3000)
-	.set	noreorder
-	la	t1,exc_utlb_code
-	la	t2,exc_norm_code
-	li	t3,UT_VEC
-	li	t4,E_VEC
-	li	t5,VEC_CODE_LENGTH
-1:
-	lw	t6,0(t1)
-	lw	t7,0(t2)
-	sw	t6,0(t3)
-	sw	t7,0(t4)
-	addiu	t1,4
-	addiu	t3,4
-	addiu	t4,4
-	subu	t5,4
-	bne	t5,zero,1b
-	addiu	t2,4
-	move	t5,ra		# assumes clear_cache doesnt use t5
-	li	a0,UT_VEC
-	jal	clear_cache
-	li	a1,VEC_CODE_LENGTH
-	nop
-	li	a0,E_VEC
-	jal	clear_cache
-	li	a1,VEC_CODE_LENGTH
-	move	ra,t5		# restore ra
-	j	ra
-	nop
-	.set	reorder
-#endif
-#if defined(CPU_R4000)
-	.set reorder
-	move	t5,ra		# assumes clear_cache doesnt use t5
-
-	/* TLB exception vector */
-	la	t1,exc_tlb_code
-	li	t2,T_VEC |K1BASE
-	li	t3,VEC_CODE_LENGTH
-1:
-	lw	t6,0(t1)
-	addiu	t1,4
-	subu	t3,4
-	sw	t6,0(t2)
-	addiu	t2,4
-	bne	t3,zero,1b
-
-	li	a0,T_VEC
-	li	a1,VEC_CODE_LENGTH
-	jal	clear_cache
-
-	la	t1,exc_xtlb_code
-	li	t2,X_VEC |K1BASE
-	li	t3,VEC_CODE_LENGTH
-1:
-	lw	t6,0(t1)
-	addiu	t1,4
-	subu	t3,4
-	sw	t6,0(t2)
-	addiu	t2,4
-	bne	t3,zero,1b
-
-	/* extended TLB exception vector */
-	li	a0,X_VEC
-	li	a1,VEC_CODE_LENGTH
-	jal	clear_cache
-
-	/* cache error exception vector */
-	la	t1,exc_cache_code
-	li	t2,C_VEC |K1BASE
-	li	t3,VEC_CODE_LENGTH
-1:
-	lw	t6,0(t1)
-	addiu	t1,4
-	subu	t3,4
-	sw	t6,0(t2)
-	addiu	t2,4
-	bne	t3,zero,1b
-
-	li	a0,C_VEC
-	li	a1,VEC_CODE_LENGTH
-	jal	clear_cache
-
-	/* normal exception vector */
-	la	t1,exc_norm_code
-	li	t2,E_VEC |K1BASE
-	li	t3,VEC_CODE_LENGTH
-1:
-	lw	t6,0(t1)
-	addiu	t1,4
-	subu	t3,4
-	sw	t6,0(t2)
-	addiu	t2,4
-	bne	t3,zero,1b
-
-	li	a0,E_VEC
-	li	a1,VEC_CODE_LENGTH
-	jal	clear_cache
-
-	move	ra,t5		# restore ra
-	j	ra
-#endif
-ENDFRAME(init_exc_vecs)
-
-
-#if defined(CPU_R4000)
-FRAME(exc_tlb_code,sp,0,ra)
-#ifdef CPU_R3000
-        la      k0, (R_VEC+((48)*8))
-#endif
-
-#ifdef CPU_R4000
-        la      k0, (R_VEC+((112)*8)) /* R4000 Sim's location is different */
-#endif
-        j       k0
-	nop
-
-ENDFRAME(exc_tlb_code)
-
-
-FRAME(exc_xtlb_code,sp,0,ra)
-#ifdef CPU_R3000
-        la      k0, (R_VEC+((48)*8))
-#endif
-
-#ifdef CPU_R4000
-        la      k0, (R_VEC+((112)*8)) /* R4000 Sim's location is different */
-#endif
-        j       k0
-	nop
-
-ENDFRAME(exc_xtlb_code)
-
-
-FRAME(exc_cache_code,sp,0,ra)
-#ifdef CPU_R3000
-        la      k0, (R_VEC+((48)*8))
-#endif
-
-#ifdef CPU_R4000
-        la      k0, (R_VEC+((112)*8)) /* R4000 Sim's location is different */
-#endif
-        j       k0
-	nop
-
-ENDFRAME(exc_cache_code)
-
-
-FRAME(exc_norm_code,sp,0,ra)
-	la	k0, _ISR_Handler /* generic external int hndlr */
-	j	k0
-	nop
-	subu	sp, EXCP_STACK_SIZE		/* set up local stack frame */
-ENDFRAME(exc_norm_code)
-#endif
-
-/**************************************************************************
-**
-** enable_int(mask) - enables interrupts - mask is positioned so it only
-**                      needs to be or'ed into the status reg. This
-**                      also does some other things !!!! caution should
-**                      be used if invoking this while in the middle
-**                      of a debugging session where the client may have
-**                      nested interrupts.
-**
-****************************************************************************/
-FRAME(enable_int,sp,0,ra)
-        .set    noreorder
-        mfc0    t0,C0_SR
-        or      a0,1
-        or      t0,a0
-        mtc0    t0,C0_SR
-        j       ra
-        nop
-        .set    reorder
-ENDFRAME(enable_int)
-
-
-/***************************************************************************
-**
-**      disable_int(mask) - disable the interrupt - mask is the complement
-**                          of the bits to be cleared - i.e. to clear ext int
-**                          5 the mask would be - 0xffff7fff
-**
-****************************************************************************/
-FRAME(disable_int,sp,0,ra)
-        .set    noreorder
-        mfc0    t0,C0_SR
-        nop
-        and     t0,a0
-        mtc0    t0,C0_SR
-        j       ra
-        nop
-ENDFRAME(disable_int)
-
-
diff --git a/cpukit/score/cpu/mips64orion/cpu_asm.h b/cpukit/score/cpu/mips64orion/cpu_asm.h
deleted file mode 100644
index 5d78f39d7c..0000000000
--- a/cpukit/score/cpu/mips64orion/cpu_asm.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- *  cpu_asm.h
- *
- *  Author:     Craig Lebakken <craigl@transition.com>
- *
- *  COPYRIGHT (c) 1996 by Transition Networks Inc.
- *
- *  To anyone who acknowledges that this file is provided "AS IS"
- *  without any express or implied warranty:
- *      permission to use, copy, modify, and distribute this file
- *      for any purpose is hereby granted without fee, provided that
- *      the above copyright notice and this notice appears in all
- *      copies, and that the name of Transition Networks not be used in
- *      advertising or publicity pertaining to distribution of the
- *      software without specific, written prior permission.
- *      Transition Networks makes no representations about the suitability
- *      of this software for any purpose.
- *
- *  Derived from c/src/exec/score/cpu/no_cpu/cpu_asm.h:
- *
- *  COPYRIGHT (c) 1989-1998.
- *  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.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- *
- */
-/* @(#)cpu_asm.h       08/20/96     1.2 */
-
-#ifndef __CPU_ASM_h
-#define __CPU_ASM_h
-
-/* pull in the generated offsets */
-
-/* #include <rtems/score/offsets.h> */
-
-/*
- * Hardware General Registers
- */
-
-/* put something here */
-
-/*
- * Hardware Floating Point Registers
- */
-
-#define R_FP0 	0
-#define R_FP1 	1
-#define R_FP2 	2
-#define R_FP3 	3
-#define R_FP4 	4
-#define R_FP5 	5
-#define R_FP6 	6
-#define R_FP7 	7
-#define R_FP8 	8
-#define R_FP9 	9
-#define R_FP10 	10
-#define R_FP11 	11
-#define R_FP12 	12
-#define R_FP13 	13
-#define R_FP14 	14
-#define R_FP15 	15
-#define R_FP16 	16
-#define R_FP17 	17
-#define R_FP18 	18
-#define R_FP19 	19
-#define R_FP20 	20
-#define R_FP21 	21
-#define R_FP22 	22
-#define R_FP23	23
-#define R_FP24 	24
-#define R_FP25 	25
-#define R_FP26 	26
-#define R_FP27 	27
-#define R_FP28 	28
-#define R_FP29 	29
-#define R_FP30 	30
-#define R_FP31 	31
-
-/*
- * Hardware Control Registers
- */
-
-/* put something here */
-
-/*
- * Calling Convention
- */
-
-/* put something here */
-
-/*
- * Temporary registers
- */
-
-/* put something here */
-
-/*
- * Floating Point Registers - SW Conventions
- */
-
-/* put something here */
-
-/*
- * Temporary floating point registers
- */
-
-/* put something here */
-
-#endif
-
-/* end of file */
diff --git a/cpukit/score/cpu/mips64orion/idtcpu.h b/cpukit/score/cpu/mips64orion/idtcpu.h
deleted file mode 100644
index f921e85ef6..0000000000
--- a/cpukit/score/cpu/mips64orion/idtcpu.h
+++ /dev/null
@@ -1,440 +0,0 @@
-/*
-
-Based upon IDT provided code with the following release:
-
-This source code has been made available to you by IDT on an AS-IS
-basis. Anyone receiving this source is licensed under IDT copyrights
-to use it in any way he or she deems fit, including copying it,
-modifying it, compiling it, and redistributing it either with or
-without modifications.  No license under IDT patents or patent
-applications is to be implied by the copyright license.
-
-Any user of this software should understand that IDT cannot provide
-technical support for this software and will not be responsible for
-any consequences resulting from the use of this software.
-
-Any person who transfers this source code or any derivative work must
-include the IDT copyright notice, this paragraph, and the preceeding
-two paragraphs in the transferred software.
-
-COPYRIGHT IDT CORPORATION 1996
-LICENSED MATERIAL - PROGRAM PROPERTY OF IDT
-
-  $Id$
-*/ 
-
-/*
-** idtcpu.h -- cpu related defines
-*/
-
-#ifndef _IDTCPU_H__
-#define _IDTCPU_H__
-
-/*
- * 950313: Ketan added Register definition for XContext reg.
- *               added define for WAIT instruction.
- * 950421: Ketan added Register definition for Config reg (R3081)
- */
-
-/*
-** memory configuration and mapping
-*/
-#define K0BASE	0x80000000
-#define K0SIZE	0x20000000
-#define K1BASE	0xa0000000
-#define K1SIZE	0x20000000
-#define K2BASE	0xc0000000
-#define K2SIZE	0x20000000
-#if defined(CPU_R4000)
-#define KSBASE	0xe0000000
-#define KSSIZE	0x20000000
-#endif
-
-#define KUBASE	0
-#define KUSIZE	0x80000000
-
-/*
-** Exception Vectors
-*/
-#if defined(CPU_R3000)
-#define	UT_VEC	K0BASE			/* utlbmiss vector */
-#define E_VEC	(K0BASE+0x80)		/* exception vevtor */
-#endif
-#if defined(CPU_R4000)
-#define	T_VEC	(K0BASE+0x000)		/* tlbmiss vector */
-#define X_VEC	(K0BASE+0x080)		/* xtlbmiss vector */
-#define C_VEC	(K0BASE+0x100)		/* cache error vector */
-#define E_VEC	(K0BASE+0x180)		/* exception vector */
-#endif
-#define	R_VEC	(K1BASE+0x1fc00000)	/* reset vector */
-
-/*
-** Address conversion macros
-*/
-#ifdef CLANGUAGE
-#define CAST(as) (as)
-#else
-#define CAST(as)
-#endif
-#define	K0_TO_K1(x)	(CAST(unsigned)(x)|0xA0000000)	/* kseg0 to kseg1 */
-#define	K1_TO_K0(x)	(CAST(unsigned)(x)&0x9FFFFFFF)	/* kseg1 to kseg0 */
-#define	K0_TO_PHYS(x)	(CAST(unsigned)(x)&0x1FFFFFFF)	/* kseg0 to physical */
-#define	K1_TO_PHYS(x)	(CAST(unsigned)(x)&0x1FFFFFFF)	/* kseg1 to physical */
-#define	PHYS_TO_K0(x)	(CAST(unsigned)(x)|0x80000000)	/* physical to kseg0 */
-#define	PHYS_TO_K1(x)	(CAST(unsigned)(x)|0xA0000000)	/* physical to kseg1 */
-
-/*
-**	Cache size constants
-*/
-#define	MINCACHE	0x200		/* 512       For 3041. */
-#define	MAXCACHE	0x40000		/* 256*1024   256k */	
-
-#if defined(CPU_R4000)
-/* R4000 configuration register definitions */
-#define CFG_CM		0x80000000	/* Master-Checker mode */
-#define CFG_ECMASK	0x70000000	/* System Clock Ratio */
-#define CFG_ECBY2	0x00000000 	/* divide by 2 */
-#define CFG_ECBY3	0x10000000 	/* divide by 3 */
-#define CFG_ECBY4	0x20000000 	/* divide by 4 */
-#define CFG_EPMASK	0x0f000000	/* Transmit data pattern */
-#define CFG_EPD		0x00000000	/* D */
-#define CFG_EPDDX	0x01000000	/* DDX */
-#define CFG_EPDDXX	0x02000000	/* DDXX */
-#define CFG_EPDXDX	0x03000000	/* DXDX */
-#define CFG_EPDDXXX	0x04000000	/* DDXXX */
-#define CFG_EPDDXXXX	0x05000000	/* DDXXXX */
-#define CFG_EPDXXDXX	0x06000000	/* DXXDXX */
-#define CFG_EPDDXXXXX	0x07000000	/* DDXXXXX */
-#define CFG_EPDXXXDXXX	0x08000000	/* DXXXDXXX */
-#define CFG_SBMASK	0x00c00000	/* Secondary cache block size */
-#define CFG_SBSHIFT	22
-#define CFG_SB4		0x00000000	/* 4 words */
-#define CFG_SB8		0x00400000	/* 8 words */
-#define CFG_SB16	0x00800000	/* 16 words */
-#define CFG_SB32	0x00c00000	/* 32 words */
-#define CFG_SS		0x00200000	/* Split secondary cache */
-#define CFG_SW		0x00100000	/* Secondary cache port width */
-#define CFG_EWMASK	0x000c0000	/* System port width */
-#define CFG_EWSHIFT	18
-#define CFG_EW64	0x00000000	/* 64 bit */
-#define CFG_EW32	0x00010000	/* 32 bit */
-#define CFG_SC		0x00020000	/* Secondary cache absent */
-#define CFG_SM		0x00010000	/* Dirty Shared mode disabled */
-#define CFG_BE		0x00008000	/* Big Endian */
-#define CFG_EM		0x00004000	/* ECC mode enable */
-#define CFG_EB		0x00002000	/* Block ordering */
-#define CFG_ICMASK	0x00000e00	/* Instruction cache size */
-#define CFG_ICSHIFT	9
-#define CFG_DCMASK	0x000001c0	/* Data cache size */
-#define CFG_DCSHIFT	6
-#define CFG_IB		0x00000020	/* Instruction cache block size */
-#define CFG_DB		0x00000010	/* Data cache block size */
-#define CFG_CU		0x00000008	/* Update on Store Conditional */
-#define CFG_K0MASK	0x00000007	/* KSEG0 coherency algorithm */
-
-/*
- * R4000 primary cache mode
- */
-#define CFG_C_UNCACHED		2
-#define CFG_C_NONCOHERENT	3
-#define CFG_C_COHERENTXCL	4
-#define CFG_C_COHERENTXCLW	5
-#define CFG_C_COHERENTUPD	6
-
-/*
- * R4000 cache operations (should be in assembler...?)
- */
-#define Index_Invalidate_I               0x0         /* 0       0 */
-#define Index_Writeback_Inv_D            0x1         /* 0       1 */
-#define Index_Invalidate_SI              0x2         /* 0       2 */
-#define Index_Writeback_Inv_SD           0x3         /* 0       3 */
-#define Index_Load_Tag_I                 0x4         /* 1       0 */
-#define Index_Load_Tag_D                 0x5         /* 1       1 */
-#define Index_Load_Tag_SI                0x6         /* 1       2 */
-#define Index_Load_Tag_SD                0x7         /* 1       3 */
-#define Index_Store_Tag_I                0x8         /* 2       0 */
-#define Index_Store_Tag_D                0x9         /* 2       1 */
-#define Index_Store_Tag_SI               0xA         /* 2       2 */
-#define Index_Store_Tag_SD               0xB         /* 2       3 */
-#define Create_Dirty_Exc_D               0xD         /* 3       1 */
-#define Create_Dirty_Exc_SD              0xF         /* 3       3 */
-#define Hit_Invalidate_I                 0x10        /* 4       0 */
-#define Hit_Invalidate_D                 0x11        /* 4       1 */
-#define Hit_Invalidate_SI                0x12        /* 4       2 */
-#define Hit_Invalidate_SD                0x13        /* 4       3 */
-#define Hit_Writeback_Inv_D              0x15        /* 5       1 */
-#define Hit_Writeback_Inv_SD             0x17        /* 5       3 */
-#define Fill_I                           0x14        /* 5       0 */
-#define Hit_Writeback_D                  0x19        /* 6       1 */
-#define Hit_Writeback_SD                 0x1B        /* 6       3 */
-#define Hit_Writeback_I                  0x18        /* 6       0 */
-#define Hit_Set_Virtual_SI               0x1E        /* 7       2 */
-#define Hit_Set_Virtual_SD               0x1F        /* 7       3 */
-
-#ifndef WAIT
-#define WAIT .word 0x42000020
-#endif WAIT
-
-#ifndef wait 
-#define wait .word 0x42000020
-#endif wait
-
-#endif
-
-/*
-** TLB resource defines
-*/
-#if defined(CPU_R3000)
-#define	N_TLB_ENTRIES	64
-#define TLB_PGSIZE	0x1000
-#define RANDBASE	8
-#define	TLBLO_PFNMASK	0xfffff000
-#define	TLBLO_PFNSHIFT	12
-#define	TLBLO_N		0x800	/* non-cacheable */
-#define	TLBLO_D		0x400	/* writeable */
-#define	TLBLO_V		0x200	/* valid bit */
-#define	TLBLO_G		0x100	/* global access bit */
-
-#define	TLBHI_VPNMASK	0xfffff000
-#define	TLBHI_VPNSHIFT	12
-#define	TLBHI_PIDMASK	0xfc0
-#define	TLBHI_PIDSHIFT	6
-#define	TLBHI_NPID	64
-
-#define	TLBINX_PROBE	0x80000000
-#define	TLBINX_INXMASK	0x00003f00
-#define	TLBINX_INXSHIFT	8
-
-#define	TLBRAND_RANDMASK	0x00003f00
-#define	TLBRAND_RANDSHIFT	8
-
-#define	TLBCTXT_BASEMASK	0xffe00000
-#define	TLBCTXT_BASESHIFT	21
-
-#define	TLBCTXT_VPNMASK		0x001ffffc
-#define	TLBCTXT_VPNSHIFT	2
-#endif
-#if defined(CPU_R4000)
-#define	N_TLB_ENTRIES	48
-
-#define	TLBHI_VPN2MASK	0xffffe000
-#define	TLBHI_PIDMASK	0x000000ff
-#define	TLBHI_NPID	256
-
-#define	TLBLO_PFNMASK	0x3fffffc0
-#define TLBLO_PFNSHIFT	6
-#define	TLBLO_D		0x00000004	/* writeable */
-#define	TLBLO_V		0x00000002	/* valid bit */
-#define	TLBLO_G		0x00000001	/* global access bit */
-#define TLBLO_CMASK	0x00000038	/* cache algorithm mask */
-#define TLBLO_CSHIFT	3
-
-#define TLBLO_UNCACHED		(CFG_C_UNCACHED<<TLBLO_CSHIFT)
-#define TLBLO_NONCOHERENT	(CFG_C_NONCOHERENT<<TLBLO_CSHIFT)
-#define TLBLO_COHERENTXCL	(CFG_C_COHERENTXCL<<TLBLO_CSHIFT)
-#define TLBLO_COHERENTXCLW	(CFG_C_COHERENTXCLW<<TLBLO_CSHIFT)
-#define TLBLO_COHERENTUPD	(CFG_C_COHERENTUPD<<TLBLO_CSHIFT)
-
-#define	TLBINX_PROBE	0x80000000
-#define	TLBINX_INXMASK	0x0000003f
-
-#define	TLBRAND_RANDMASK	0x0000003f
-
-#define	TLBCTXT_BASEMASK	0xff800000
-#define	TLBCTXT_BASESHIFT	23
-
-#define	TLBCTXT_VPN2MASK	0x007ffff0
-#define	TLBCTXT_VPN2SHIFT	4
-
-#define TLBPGMASK_MASK		0x01ffe000
-#endif
-
-#if defined(CPU_R3000)
-#define	SR_CUMASK	0xf0000000	/* coproc usable bits */
-#define	SR_CU3		0x80000000	/* Coprocessor 3 usable */
-#define	SR_CU2		0x40000000	/* Coprocessor 2 usable */
-#define	SR_CU1		0x20000000	/* Coprocessor 1 usable */
-#define	SR_CU0		0x10000000	/* Coprocessor 0 usable */
-
-#define	SR_BEV		0x00400000	/* use boot exception vectors */
-
-/* Cache control bits */
-#define	SR_TS		0x00200000	/* TLB shutdown */
-#define	SR_PE		0x00100000	/* cache parity error */
-#define	SR_CM		0x00080000	/* cache miss */
-#define	SR_PZ		0x00040000	/* cache parity zero */
-#define	SR_SWC		0x00020000	/* swap cache */
-#define	SR_ISC		0x00010000	/* Isolate data cache */
-
-/*
-**	status register interrupt masks and bits
-*/
-
-#define	SR_IMASK	0x0000ff00	/* Interrupt mask */
-#define	SR_IMASK8	0x00000000	/* mask level 8 */
-#define	SR_IMASK7	0x00008000	/* mask level 7 */
-#define	SR_IMASK6	0x0000c000	/* mask level 6 */
-#define	SR_IMASK5	0x0000e000	/* mask level 5 */
-#define	SR_IMASK4	0x0000f000	/* mask level 4 */
-#define	SR_IMASK3	0x0000f800	/* mask level 3 */
-#define	SR_IMASK2	0x0000fc00	/* mask level 2 */
-#define	SR_IMASK1	0x0000fe00	/* mask level 1 */
-#define	SR_IMASK0	0x0000ff00	/* mask level 0 */
-
-#define	SR_IMASKSHIFT	8
-
-#define	SR_IBIT8	0x00008000	/* bit level 8 */
-#define	SR_IBIT7	0x00004000	/* bit level 7 */
-#define	SR_IBIT6	0x00002000	/* bit level 6 */
-#define	SR_IBIT5	0x00001000	/* bit level 5 */
-#define	SR_IBIT4	0x00000800	/* bit level 4 */
-#define	SR_IBIT3	0x00000400	/* bit level 3 */
-#define	SR_IBIT2	0x00000200	/* bit level 2 */
-#define	SR_IBIT1	0x00000100	/* bit level 1 */
-
-#define	SR_KUO		0x00000020	/* old kernel/user, 0 => k, 1 => u */
-#define	SR_IEO		0x00000010	/* old interrupt enable, 1 => enable */
-#define	SR_KUP		0x00000008	/* prev kernel/user, 0 => k, 1 => u */
-#define	SR_IEP		0x00000004	/* prev interrupt enable, 1 => enable */
-#define	SR_KUC		0x00000002	/* cur kernel/user, 0 => k, 1 => u */
-#define	SR_IEC		0x00000001	/* cur interrupt enable, 1 => enable */
-#endif
-
-#if defined(CPU_R4000)
-#define	SR_CUMASK	0xf0000000	/* coproc usable bits */
-#define	SR_CU3		0x80000000	/* Coprocessor 3 usable */
-#define	SR_CU2		0x40000000	/* Coprocessor 2 usable */
-#define	SR_CU1		0x20000000	/* Coprocessor 1 usable */
-#define	SR_CU0		0x10000000	/* Coprocessor 0 usable */
-
-#define SR_RP		0x08000000      /* Reduced power operation */
-#define SR_FR		0x04000000	/* Additional floating point registers */
-#define SR_RE		0x02000000	/* Reverse endian in user mode */
-
-#define SR_BEV		0x00400000	/* Use boot exception vectors */
-#define SR_TS		0x00200000	/* TLB shutdown */
-#define SR_SR		0x00100000	/* Soft reset */
-#define SR_CH		0x00040000	/* Cache hit */
-#define SR_CE		0x00020000	/* Use cache ECC  */
-#define SR_DE		0x00010000	/* Disable cache exceptions */
-
-/*
-**	status register interrupt masks and bits
-*/
-
-#define	SR_IMASK	0x0000ff00	/* Interrupt mask */
-#define	SR_IMASK8	0x00000000	/* mask level 8 */
-#define	SR_IMASK7	0x00008000	/* mask level 7 */
-#define	SR_IMASK6	0x0000c000	/* mask level 6 */
-#define	SR_IMASK5	0x0000e000	/* mask level 5 */
-#define	SR_IMASK4	0x0000f000	/* mask level 4 */
-#define	SR_IMASK3	0x0000f800	/* mask level 3 */
-#define	SR_IMASK2	0x0000fc00	/* mask level 2 */
-#define	SR_IMASK1	0x0000fe00	/* mask level 1 */
-#define	SR_IMASK0	0x0000ff00	/* mask level 0 */
-
-#define	SR_IMASKSHIFT	8
-
-#define	SR_IBIT8	0x00008000	/* bit level 8 */
-#define	SR_IBIT7	0x00004000	/* bit level 7 */
-#define	SR_IBIT6	0x00002000	/* bit level 6 */
-#define	SR_IBIT5	0x00001000	/* bit level 5 */
-#define	SR_IBIT4	0x00000800	/* bit level 4 */
-#define	SR_IBIT3	0x00000400	/* bit level 3 */
-#define	SR_IBIT2	0x00000200	/* bit level 2 */
-#define	SR_IBIT1	0x00000100	/* bit level 1 */
-
-#define SR_KSMASK	0x00000018	/* Kernel mode mask */
-#define SR_KSUSER	0x00000010	/* User mode */
-#define SR_KSSUPER	0x00000008	/* Supervisor mode */
-#define SR_KSKERNEL	0x00000000	/* Kernel mode */
-#define SR_ERL		0x00000004	/* Error level */
-#define SR_EXL		0x00000002	/* Exception level */
-#define SR_IE		0x00000001	/* Interrupts enabled */
-#endif
-
-
-
-/*
- * Cause Register
- */
-#define	CAUSE_BD	0x80000000	/* Branch delay slot */
-#define	CAUSE_CEMASK	0x30000000	/* coprocessor error */
-#define	CAUSE_CESHIFT	28
-
-
-#define	CAUSE_IPMASK	0x0000FF00	/* Pending interrupt mask */
-#define	CAUSE_IPSHIFT	8
-
-#define	CAUSE_EXCMASK	0x0000003C	/* Cause code bits */
-#define	CAUSE_EXCSHIFT	2
-
-#ifndef XDS
-/*
-**  Coprocessor 0 registers
-*/
-#define	C0_INX		$0		/* tlb index */
-#define	C0_RAND		$1		/* tlb random */
-#if defined(CPU_R3000)
-#define	C0_TLBLO	$2		/* tlb entry low */
-#endif
-#if defined(CPU_R4000)
-#define	C0_TLBLO0	$2		/* tlb entry low 0 */
-#define	C0_TLBLO1	$3		/* tlb entry low 1 */
-#endif
-
-#define	C0_CTXT		$4		/* tlb context */
-
-#if defined(CPU_R4000)
-#define C0_PAGEMASK	$5		/* tlb page mask */
-#define C0_WIRED	$6		/* number of wired tlb entries */
-#endif
-
-#define	C0_BADVADDR	$8		/* bad virtual address */
-
-#if defined(CPU_R4000)
-#define C0_COUNT	$9		/* cycle count */
-#endif
-
-#define	C0_TLBHI	$10		/* tlb entry hi */
-
-#if defined(CPU_R4000)
-#define C0_COMPARE	$11		/* cyccle count comparator  */
-#endif
-
-#define	C0_SR		$12		/* status register */
-#define	C0_CAUSE	$13		/* exception cause */
-#define	C0_EPC		$14		/* exception pc */
-#define	C0_PRID		$15		/* revision identifier */
-
-#if defined(CPU_R3000)
-#define C0_CONFIG   $3     /* configuration register R3081*/
-#endif
-
-#if defined(CPU_R4000)
-#define C0_CONFIG	$16		/* configuration register */
-#define C0_LLADDR	$17		/* linked load address */
-#define C0_WATCHLO	$18		/* watchpoint trap register */
-#define C0_WATCHHI	$19		/* watchpoint trap register */
-#define C0_XCTXT    $20     /* extended tlb context */
-#define C0_ECC		$26		/* secondary cache ECC control */
-#define C0_CACHEERR	$27		/* cache error status */
-#define C0_TAGLO	$28		/* cache tag lo */
-#define C0_TAGHI	$29		/* cache tag hi */
-#define C0_ERRPC	$30		/* cache error pc */
-#endif
-
-#endif XDS
-
-#ifdef R4650
-#define IWATCH $18
-#define DWATCH $19
-#define IBASE  $0
-#define IBOUND $1
-#define DBASE  $2
-#define DBOUND $3
-#define CALG	$17
-#endif
-
-#endif /* _IDTCPU_H__ */
-
diff --git a/cpukit/score/cpu/mips64orion/idtmon.h b/cpukit/score/cpu/mips64orion/idtmon.h
deleted file mode 100644
index b42211ed5c..0000000000
--- a/cpukit/score/cpu/mips64orion/idtmon.h
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
-
-Based upon IDT provided code with the following release:
-
-This source code has been made available to you by IDT on an AS-IS
-basis. Anyone receiving this source is licensed under IDT copyrights
-to use it in any way he or she deems fit, including copying it,
-modifying it, compiling it, and redistributing it either with or
-without modifications.  No license under IDT patents or patent
-applications is to be implied by the copyright license.
-
-Any user of this software should understand that IDT cannot provide
-technical support for this software and will not be responsible for
-any consequences resulting from the use of this software.
-
-Any person who transfers this source code or any derivative work must
-include the IDT copyright notice, this paragraph, and the preceeding
-two paragraphs in the transferred software.
-
-COPYRIGHT IDT CORPORATION 1996
-LICENSED MATERIAL - PROGRAM PROPERTY OF IDT
-
-  $Id$
-*/ 
-
-/*
-**	idtmon.h - General header file for the IDT Prom Monitor
-**
-**	Copyright 1989  Integrated Device Technology, Inc.
-**	All Rights Reserved.
-**
-**	June 1989 - D.Cahoon
-*/
-#ifndef __IDTMON_H__
-#define __IDTMON_H__
-
-/*
-** P_STACKSIZE is the size of the Prom Stack. 
-** the prom stack grows downward 
-*/
-#define	P_STACKSIZE	0x2000   /* sets stack size to 8k */
-
-/*
-** M_BUSWIDTH
-** Memory bus width (including bank interleaving) in bytes
-** used when doing memory sizing to prevent bus capacitance
-** reporting ghost memory locations
-*/
-#if defined(CPU_R3000)
-#define M_BUSWIDTH	8	/* 32bit memory bank interleaved */
-#endif
-#if defined(CPU_R4000)
-#define M_BUSWIDTH	16	/* 64 bit memory bank interleaved */
-#endif
-
-/*
-** this is the default value for the number of bytes to add in calculating
-** the checksums in the checksum command
-*/
-#define CHK_SUM_CNT	0x20000	     /* number of bytes to calc chksum for */
-
-/*
-** Monitor modes
-*/
-#define	MODE_MONITOR	5	/* IDT Prom Monitor is executing */
-#define	MODE_USER	0xa	/* USER is executing */
-
-/*
-** memory reference widths
-*/
-#define	SW_BYTE		1
-#define	SW_HALFWORD	2
-#define	SW_WORD		4
-#define SW_TRIBYTEL	12
-#define SW_TRIBYTER	20
-
-#ifdef CPU_R4000
-/*
-** definitions for select_cache call
-*/
-#define DCACHE		0
-#define ICACHE		1
-#define SCACHE		2
-
-#endif
-
-#if defined (CLANGUAGE) || defined(_LANGUAGE_C)
-typedef struct {
-	unsigned int	mem_size;
-	unsigned int	icache_size;
-	unsigned int	dcache_size;
-#ifdef CPU_R4000
-    unsigned int    scache_size;
-#endif
-
-	} mem_config;
-
-#endif CLANGUAGE || defined(_LANGUAGE_C)
-
-/*
-** general equates for diagnostics and boolean functions
-*/
-#define	PASS			0
-#define	FAIL			1
-
-#ifndef	TRUE
-#define	TRUE			1
-#endif	TRUE
-#ifndef	NULL
-#define	NULL			0
-#endif	NULL
-
-#ifndef	FALSE
-#define	FALSE			0
-#endif	FALSE
-
-
-/*
-**	portablility equates
-*/
-
-#ifndef	BOOL
-#define BOOL	unsigned int
-#endif	BOOL
-
-#ifndef GLOBAL
-#define GLOBAL	/**/
-#endif  GLOBAL
-
-#ifndef MLOCAL
-#define MLOCAL	static
-#endif  MLOCAL
-
-
-#ifdef XDS
-#define CONST const
-#else
-#define CONST
-#endif XDS 
-
-#define u_char	unsigned char
-#define u_short unsigned short
-#define u_int	unsigned int
-/*
-** assembly instructions for compatability between xds and mips
-*/
-#ifndef XDS
-#define sllv sll
-#define srlv srl
-#endif XDS
-/*
-**	debugger macros for assembly language routines. Allows the 
-**	programmer to set up the necessary stack frame info
-**	required by debuggers to do stack traces.
-*/
-
-#ifndef XDS 
-#define	FRAME(name,frm_reg,offset,ret_reg)	\
-	.globl	name;				\
-	.ent	name;				\
-name:;						\
-	.frame	frm_reg,offset,ret_reg
-#define ENDFRAME(name) 				\
-	.end name
-#else
-#define	FRAME(name,frm_reg,offset,ret_reg)	\
-	.globl	_##name;\
-_##name:
-#define ENDFRAME(name)
-#endif  XDS
-#endif /* __IDTMON_H__ */
diff --git a/cpukit/score/cpu/mips64orion/iregdef.h b/cpukit/score/cpu/mips64orion/iregdef.h
deleted file mode 100644
index f0953da852..0000000000
--- a/cpukit/score/cpu/mips64orion/iregdef.h
+++ /dev/null
@@ -1,325 +0,0 @@
-/*
-
-Based upon IDT provided code with the following release:
-
-This source code has been made available to you by IDT on an AS-IS
-basis. Anyone receiving this source is licensed under IDT copyrights
-to use it in any way he or she deems fit, including copying it,
-modifying it, compiling it, and redistributing it either with or
-without modifications.  No license under IDT patents or patent
-applications is to be implied by the copyright license.
-
-Any user of this software should understand that IDT cannot provide
-technical support for this software and will not be responsible for
-any consequences resulting from the use of this software.
-
-Any person who transfers this source code or any derivative work must
-include the IDT copyright notice, this paragraph, and the preceeding
-two paragraphs in the transferred software.
-
-COPYRIGHT IDT CORPORATION 1996
-LICENSED MATERIAL - PROGRAM PROPERTY OF IDT
-
-  $Id$
-*/ 
-
-/*
-**	iregdef.h - IDT R3000 register structure header file
-**
-**	Copyright 1989 Integrated Device Technology, Inc
-**	All Rights Reserved
-**
-*/
-#ifndef __IREGDEF_H__
-#define __IREGDEF_H__
-
-/*
- * 950313: Ketan added sreg/lreg and R_SZ for 64-bit saves
- *         added Register definition for XContext reg.
- *         Look towards end of this file.
- */
-/*
-** register names 
-*/
-#define r0	$0
-#define r1	$1
-#define r2	$2
-#define r3	$3
-#define r4	$4
-#define r5	$5
-#define r6	$6
-#define r7	$7
-#define r8	$8
-#define r9	$9
-#define r10	$10
-#define r11	$11
-#define r12	$12
-#define r13	$13
-
-#define r14	$14
-#define r15	$15
-#define r16	$16
-#define r17	$17
-#define r18	$18
-#define r19	$19
-#define r20	$20
-#define r21	$21
-#define r22	$22
-#define r23	$23
-#define r24	$24
-#define r25	$25
-#define r26	$26
-#define r27	$27
-#define r28	$28
-#define r29	$29
-#define r30	$30
-#define r31	$31
-
-#define fp0	$f0
-#define fp1	$f1
-#define fp2	$f2
-#define fp3	$f3
-#define fp4	$f4
-#define fp5	$f5
-#define fp6	$f6
-#define fp7	$f7
-#define fp8	$f8
-#define fp9	$f9
-#define fp10	$f10
-#define fp11	$f11
-#define fp12	$f12
-#define fp13	$f13
-#define fp14	$f14
-#define fp15	$f15
-#define fp16	$f16
-#define fp17	$f17
-#define fp18	$f18
-#define fp19	$f19
-#define fp20	$f20
-#define fp21	$f21
-#define fp22	$f22
-#define fp23	$f23
-#define fp24	$f24
-#define fp25	$f25
-#define fp26	$f26
-#define fp27	$f27
-#define fp28	$f28
-#define fp29	$f29
-#define fp30	$f30
-#define fp31	$f31
-
-#define fcr0	$0
-#define fcr30	$30
-#define fcr31	$31
-
-#define zero	$0	/* wired zero */
-#define AT	$at	/* assembler temp */
-#define v0	$2	/* return value */
-#define v1	$3
-#define a0	$4	/* argument registers a0-a3 */
-#define a1	$5
-#define a2	$6
-#define a3	$7
-#define t0	$8	/* caller saved  t0-t9 */
-#define t1	$9
-#define t2	$10
-#define t3	$11
-#define t4	$12
-#define t5	$13
-#define t6	$14
-#define t7	$15
-#define s0	$16	/* callee saved s0-s8 */
-#define s1	$17
-#define s2	$18
-#define s3	$19
-#define s4	$20
-#define s5	$21
-#define s6	$22
-#define s7	$23
-#define t8	$24
-#define t9	$25
-#define k0	$26	/* kernel usage */
-#define k1	$27	/* kernel usage */
-#define gp	$28	/* sdata pointer */
-#define sp	$29	/* stack pointer */
-#define s8	$30	/* yet another saved reg for the callee */
-#define fp	$30	/* frame pointer - this is being phased out by MIPS */
-#define ra	$31	/* return address */
-
-
-/*
-** relative position of registers in save reg area
-*/
-#define	R_R0		0
-#define	R_R1		1
-#define	R_R2		2
-#define	R_R3		3
-#define	R_R4		4
-#define	R_R5		5
-#define	R_R6		6
-#define	R_R7		7
-#define	R_R8		8
-#define	R_R9		9
-#define	R_R10		10
-#define	R_R11		11
-#define	R_R12		12
-#define	R_R13		13
-#define	R_R14		14
-#define	R_R15		15
-#define	R_R16		16
-#define	R_R17		17
-#define	R_R18		18
-#define	R_R19		19
-#define	R_R20		20
-#define	R_R21		21
-#define	R_R22		22
-#define	R_R23		23
-#define	R_R24		24
-#define	R_R25		25
-#define	R_R26		26
-#define	R_R27		27
-#define	R_R28		28
-#define	R_R29		29
-#define	R_R30		30
-#define	R_R31		31
-#define	R_F0		32
-#define	R_F1		33
-#define	R_F2		34
-#define	R_F3		35
-#define	R_F4		36
-#define	R_F5		37
-#define	R_F6		38
-#define	R_F7		39
-#define	R_F8		40
-#define	R_F9		41
-#define	R_F10		42
-#define	R_F11		43
-#define	R_F12		44
-#define	R_F13		45
-#define	R_F14		46
-#define	R_F15		47
-#define	R_F16		48
-#define	R_F17		49
-#define	R_F18		50
-#define	R_F19		51
-#define	R_F20		52
-#define	R_F21		53
-#define	R_F22		54
-#define	R_F23		55
-#define	R_F24		56
-#define	R_F25		57
-#define	R_F26		58
-#define	R_F27		59
-#define	R_F28		60
-#define	R_F29		61
-#define	R_F30		62
-#define	R_F31		63
-#define NCLIENTREGS	64
-#define	R_EPC		64
-#define	R_MDHI		65
-#define	R_MDLO		66
-#define	R_SR		67
-#define	R_CAUSE		68
-#define	R_TLBHI		69
-#if defined(CPU_R3000)
-#define	R_TLBLO		70
-#endif
-#if defined(CPU_R4000)
-#define	R_TLBLO0	70
-#endif
-#define	R_BADVADDR	71
-#define	R_INX		72
-#define	R_RAND		73
-#define	R_CTXT		74
-#define	R_EXCTYPE	75
-#define R_MODE		76
-#define	R_PRID		77
-#define R_FCSR		78
-#define R_FEIR		79
-#if defined(CPU_R3000)
-#define NREGS		80
-#endif
-#if defined(CPU_R4000)
-#define	R_TLBLO1	80
-#define R_PAGEMASK	81
-#define R_WIRED		82
-#define R_COUNT		83
-#define R_COMPARE	84
-#define R_CONFIG	85
-#define R_LLADDR	86
-#define R_WATCHLO	87
-#define R_WATCHHI	88
-#define R_ECC		89
-#define R_CACHEERR	90
-#define R_TAGLO		91
-#define R_TAGHI		92
-#define R_ERRPC		93
-#define R_XCTXT     94  /* Ketan added from SIM64bit */
-
-#define	NREGS		95
-#endif
-
-/*
-** For those who like to think in terms of the compiler names for the regs
-*/
-#define	R_ZERO		R_R0
-#define	R_AT		R_R1
-#define	R_V0		R_R2
-#define	R_V1		R_R3
-#define	R_A0		R_R4
-#define	R_A1		R_R5
-#define	R_A2		R_R6
-#define	R_A3		R_R7
-#define	R_T0		R_R8
-#define	R_T1		R_R9
-#define	R_T2		R_R10
-#define	R_T3		R_R11
-#define	R_T4		R_R12
-#define	R_T5		R_R13
-#define	R_T6		R_R14
-#define	R_T7		R_R15
-#define	R_S0		R_R16
-#define	R_S1		R_R17
-#define	R_S2		R_R18
-#define	R_S3		R_R19
-#define	R_S4		R_R20
-#define	R_S5		R_R21
-#define	R_S6		R_R22
-#define	R_S7		R_R23
-#define	R_T8		R_R24
-#define	R_T9		R_R25
-#define	R_K0		R_R26
-#define	R_K1		R_R27
-#define	R_GP		R_R28
-#define	R_SP		R_R29
-#define	R_FP		R_R30
-#define	R_RA		R_R31
-
-/* Ketan added the following */
-#ifdef CPU_R3000
-#define sreg	sw
-#define lreg	lw
-#define rmfc0	mfc0
-#define rmtc0	mtc0
-#define R_SZ	4
-#endif CPU_R3000
-
-#ifdef CPU_R4000
-#if __mips < 3
-#define sreg	sw
-#define lreg	lw
-#define rmfc0	mfc0
-#define rmtc0	mtc0
-#define R_SZ	4
-#else
-#define sreg	sd
-#define lreg	ld
-#define rmfc0	dmfc0
-#define rmtc0	dmtc0
-#define R_SZ	8
-#endif
-#endif CPU_R4000
-/* Ketan till here */
-
-#endif /* __IREGDEF_H__ */
-
diff --git a/cpukit/score/cpu/no_cpu/asm.h b/cpukit/score/cpu/no_cpu/asm.h
deleted file mode 100644
index 1ca7fd435b..0000000000
--- a/cpukit/score/cpu/no_cpu/asm.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/*  asm.h
- *
- *  This include file attempts to address the problems
- *  caused by incompatible flavors of assemblers and
- *  toolsets.  It primarily addresses variations in the
- *  use of leading underscores on symbols and the requirement
- *  that register names be preceded by a %.
- *
- *
- *  NOTE: The spacing in the use of these macros
- *        is critical to them working as advertised.
- *
- *  COPYRIGHT:
- *
- *  This file is based on similar code found in newlib available
- *  from ftp.cygnus.com.  The file which was used had no copyright
- *  notice.  This file is freely distributable as long as the source
- *  of the file is noted.  This file is:
- *
- *  COPYRIGHT (c) 1994-1997.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  $Id$
- */
-
-#ifndef __NO_CPU_ASM_h
-#define __NO_CPU_ASM_h
-
-/*
- *  Indicate we are in an assembly file and get the basic CPU definitions.
- */
-
-#ifndef ASM
-#define ASM
-#endif
-#include <rtems/score/targopts.h>
-#include <rtems/score/no_cpu.h>
-
-/*
- *  Recent versions of GNU cpp define variables which indicate the
- *  need for underscores and percents.  If not using GNU cpp or
- *  the version does not support this, then you will obviously
- *  have to define these as appropriate.
- */
-
-#ifndef __USER_LABEL_PREFIX__
-#define __USER_LABEL_PREFIX__ _
-#endif
-
-#ifndef __REGISTER_PREFIX__
-#define __REGISTER_PREFIX__
-#endif
-
-/* ANSI concatenation macros.  */
-
-#define CONCAT1(a, b) CONCAT2(a, b)
-#define CONCAT2(a, b) a ## b
-
-/* Use the right prefix for global labels.  */
-
-#define SYM(x) CONCAT1 (__USER_LABEL_PREFIX__, x)
-
-/* Use the right prefix for registers.  */
-
-#define REG(x) CONCAT1 (__REGISTER_PREFIX__, x)
-
-/*
- *  define macros for all of the registers on this CPU
- *
- *  EXAMPLE:     #define d0 REG (d0)
- */
-
-/*
- *  Define macros to handle section beginning and ends.
- */
-
-
-#define BEGIN_CODE_DCL .text
-#define END_CODE_DCL
-#define BEGIN_DATA_DCL .data
-#define END_DATA_DCL
-#define BEGIN_CODE .text
-#define END_CODE
-#define BEGIN_DATA
-#define END_DATA
-#define BEGIN_BSS
-#define END_BSS
-#define END
-
-/*
- *  Following must be tailor for a particular flavor of the C compiler.
- *  They may need to put underscores in front of the symbols.
- */
-
-#define PUBLIC(sym) .globl SYM (sym)
-#define EXTERN(sym) .globl SYM (sym)
-
-#endif
-/* end of include file */
-
-
diff --git a/cpukit/score/cpu/no_cpu/cpu.c b/cpukit/score/cpu/no_cpu/cpu.c
deleted file mode 100644
index 58e71f9266..0000000000
--- a/cpukit/score/cpu/no_cpu/cpu.c
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- *  XXX CPU Dependent Source
- *
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems/system.h>
-#include <rtems/score/isr.h>
-#include <rtems/score/wkspace.h>
-
-/*  _CPU_Initialize
- *
- *  This routine performs processor dependent initialization.
- *
- *  INPUT PARAMETERS:
- *    cpu_table       - CPU table to initialize
- *    thread_dispatch - address of disptaching routine
- */
-
-
-void _CPU_Initialize(
-  rtems_cpu_table  *cpu_table,
-  void      (*thread_dispatch)      /* ignored on this CPU */
-)
-{
-  /*
-   *  The thread_dispatch argument is the address of the entry point
-   *  for the routine called at the end of an ISR once it has been
-   *  decided a context switch is necessary.  On some compilation
-   *  systems it is difficult to call a high-level language routine
-   *  from assembly.  This allows us to trick these systems.
-   *
-   *  If you encounter this problem save the entry point in a CPU
-   *  dependent variable.
-   */
-
-  _CPU_Thread_dispatch_pointer = thread_dispatch;
-
-  /*
-   *  If there is not an easy way to initialize the FP context
-   *  during Context_Initialize, then it is usually easier to
-   *  save an "uninitialized" FP context here and copy it to
-   *  the task's during Context_Initialize.
-   */
-
-  /* FP context initialization support goes here */
-
-  _CPU_Table = *cpu_table;
-}
-
-/*PAGE
- *
- *  _CPU_ISR_Get_level
- */
- 
-unsigned32 _CPU_ISR_Get_level( void )
-{
-  /*
-   *  This routine returns the current interrupt level.
-   */
-
-  return 0;
-}
-
-/*PAGE
- *
- *  _CPU_ISR_install_raw_handler
- */
- 
-void _CPU_ISR_install_raw_handler(
-  unsigned32  vector,
-  proc_ptr    new_handler,
-  proc_ptr   *old_handler
-)
-{
-  /*
-   *  This is where we install the interrupt handler into the "raw" interrupt
-   *  table used by the CPU to dispatch interrupt handlers.
-   */
-}
-
-/*PAGE
- *
- *  _CPU_ISR_install_vector
- *
- *  This kernel routine installs the RTEMS handler for the
- *  specified vector.
- *
- *  Input parameters:
- *    vector      - interrupt vector number
- *    old_handler - former ISR for this vector number
- *    new_handler - replacement ISR for this vector number
- *
- *  Output parameters:  NONE
- *
- */
-
-void _CPU_ISR_install_vector(
-  unsigned32  vector,
-  proc_ptr    new_handler,
-  proc_ptr   *old_handler
-)
-{
-   *old_handler = _ISR_Vector_table[ vector ];
-
-   /*
-    *  If the interrupt vector table is a table of pointer to isr entry
-    *  points, then we need to install the appropriate RTEMS interrupt
-    *  handler for this vector number.
-    */
-
-   _CPU_ISR_install_raw_handler( vector, new_handler, old_handler );
-
-   /*
-    *  We put the actual user ISR address in '_ISR_vector_table'.  This will
-    *  be used by the _ISR_Handler so the user gets control.
-    */
-
-    _ISR_Vector_table[ vector ] = new_handler;
-}
-
-/*PAGE
- *
- *  _CPU_Install_interrupt_stack
- */
-
-void _CPU_Install_interrupt_stack( void )
-{
-}
-
-/*PAGE
- *
- *  _CPU_Thread_Idle_body
- *
- *  NOTES:
- *
- *  1. This is the same as the regular CPU independent algorithm.
- *
- *  2. If you implement this using a "halt", "idle", or "shutdown"
- *     instruction, then don't forget to put it in an infinite loop.
- *
- *  3. Be warned. Some processors with onboard DMA have been known
- *     to stop the DMA if the CPU were put in IDLE mode.  This might
- *     also be a problem with other on-chip peripherals.  So use this
- *     hook with caution.
- */
-
-void _CPU_Thread_Idle_body( void )
-{
-
-  for( ; ; )
-    /* insert your "halt" instruction here */ ;
-}
diff --git a/cpukit/score/cpu/no_cpu/cpu_asm.c b/cpukit/score/cpu/no_cpu/cpu_asm.c
deleted file mode 100644
index d6abcab5c2..0000000000
--- a/cpukit/score/cpu/no_cpu/cpu_asm.c
+++ /dev/null
@@ -1,165 +0,0 @@
-/*  cpu_asm.c  ===> cpu_asm.S or cpu_asm.s
- *
- *  This file contains the basic algorithms for all assembly code used
- *  in an specific CPU port of RTEMS.  These algorithms must be implemented
- *  in assembly language
- *
- *  NOTE:  This is supposed to be a .S or .s file NOT a C file.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-/*
- *  This is supposed to be an assembly file.  This means that system.h
- *  and cpu.h should not be included in a "real" cpu_asm file.  An
- *  implementation in assembly should include "cpu_asm.h>
- */
-
-#include <rtems/system.h>
-#include <rtems/score/cpu.h>
-/* #include "cpu_asm.h> */
-
-/*
- *  _CPU_Context_save_fp_context
- *
- *  This routine is responsible for saving the FP context
- *  at *fp_context_ptr.  If the point to load the FP context
- *  from is changed then the pointer is modified by this routine.
- *
- *  Sometimes a macro implementation of this is in cpu.h which dereferences
- *  the ** and a similarly named routine in this file is passed something
- *  like a (Context_Control_fp *).  The general rule on making this decision
- *  is to avoid writing assembly language.
- */
-
-void _CPU_Context_save_fp(
-  void **fp_context_ptr
-)
-{
-}
-
-/*
- *  _CPU_Context_restore_fp_context
- *
- *  This routine is responsible for restoring the FP context
- *  at *fp_context_ptr.  If the point to load the FP context
- *  from is changed then the pointer is modified by this routine.
- *
- *  Sometimes a macro implementation of this is in cpu.h which dereferences
- *  the ** and a similarly named routine in this file is passed something
- *  like a (Context_Control_fp *).  The general rule on making this decision
- *  is to avoid writing assembly language.
- */
-
-void _CPU_Context_restore_fp(
-  void **fp_context_ptr
-)
-{
-}
-
-/*  _CPU_Context_switch
- *
- *  This routine performs a normal non-FP context switch.
- */
-
-void _CPU_Context_switch(
-  Context_Control  *run,
-  Context_Control  *heir
-)
-{
-}
-
-/*
- *  _CPU_Context_restore
- *
- *  This routine is generally used only to restart self in an
- *  efficient manner.  It may simply be a label in _CPU_Context_switch.
- *
- *  NOTE: May be unnecessary to reload some registers.
- */
-
-void _CPU_Context_restore(
-  Context_Control *new_context
-)
-{
-}
-
-/*  void __ISR_Handler()
- *
- *  This routine provides the RTEMS interrupt management.
- *
- */
-
-void _ISR_Handler()
-{
-   /*
-    *  This discussion ignores a lot of the ugly details in a real
-    *  implementation such as saving enough registers/state to be
-    *  able to do something real.  Keep in mind that the goal is
-    *  to invoke a user's ISR handler which is written in C and
-    *  uses a certain set of registers.
-    *
-    *  Also note that the exact order is to a large extent flexible.
-    *  Hardware will dictate a sequence for a certain subset of
-    *  _ISR_Handler while requirements for setting
-    */
-
-  /*
-   *  At entry to "common" _ISR_Handler, the vector number must be
-   *  available.  On some CPUs the hardware puts either the vector
-   *  number or the offset into the vector table for this ISR in a
-   *  known place.  If the hardware does not give us this information,
-   *  then the assembly portion of RTEMS for this port will contain
-   *  a set of distinct interrupt entry points which somehow place
-   *  the vector number in a known place (which is safe if another
-   *  interrupt nests this one) and branches to _ISR_Handler.
-   *
-   *  save some or all context on stack
-   *  may need to save some special interrupt information for exit
-   *
-   *  #if ( CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE )
-   *    if ( _ISR_Nest_level == 0 )
-   *      switch to software interrupt stack
-   *  #endif
-   *
-   *  _ISR_Nest_level++;
-   *
-   *  _Thread_Dispatch_disable_level++;
-   *
-   *  (*_ISR_Vector_table[ vector ])( vector );
-   *
-   *  --_ISR_Nest_level;
-   *
-   *  if ( _ISR_Nest_level )
-   *    goto the label "exit interrupt (simple case)"
-   *
-   *  #if ( CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE )
-   *    restore stack
-   *  #endif
-   *  
-   *  if ( !_Context_Switch_necessary )
-   *    goto the label "exit interrupt (simple case)"
-   *  
-   *  if ( !_ISR_Signals_to_thread_executing )
-   *    _ISR_Signals_to_thread_executing = FALSE;
-   *    goto the label "exit interrupt (simple case)"
-   *
-   *  call _Thread_Dispatch() or prepare to return to _ISR_Dispatch
-   *
-   *  prepare to get out of interrupt
-   *  return from interrupt  (maybe to _ISR_Dispatch)
-   *
-   *  LABEL "exit interrupt (simple case):
-   *  prepare to get out of interrupt
-   *  return from interrupt
-   */
-}
-
diff --git a/cpukit/score/cpu/no_cpu/rtems/asm.h b/cpukit/score/cpu/no_cpu/rtems/asm.h
deleted file mode 100644
index 1ca7fd435b..0000000000
--- a/cpukit/score/cpu/no_cpu/rtems/asm.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/*  asm.h
- *
- *  This include file attempts to address the problems
- *  caused by incompatible flavors of assemblers and
- *  toolsets.  It primarily addresses variations in the
- *  use of leading underscores on symbols and the requirement
- *  that register names be preceded by a %.
- *
- *
- *  NOTE: The spacing in the use of these macros
- *        is critical to them working as advertised.
- *
- *  COPYRIGHT:
- *
- *  This file is based on similar code found in newlib available
- *  from ftp.cygnus.com.  The file which was used had no copyright
- *  notice.  This file is freely distributable as long as the source
- *  of the file is noted.  This file is:
- *
- *  COPYRIGHT (c) 1994-1997.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  $Id$
- */
-
-#ifndef __NO_CPU_ASM_h
-#define __NO_CPU_ASM_h
-
-/*
- *  Indicate we are in an assembly file and get the basic CPU definitions.
- */
-
-#ifndef ASM
-#define ASM
-#endif
-#include <rtems/score/targopts.h>
-#include <rtems/score/no_cpu.h>
-
-/*
- *  Recent versions of GNU cpp define variables which indicate the
- *  need for underscores and percents.  If not using GNU cpp or
- *  the version does not support this, then you will obviously
- *  have to define these as appropriate.
- */
-
-#ifndef __USER_LABEL_PREFIX__
-#define __USER_LABEL_PREFIX__ _
-#endif
-
-#ifndef __REGISTER_PREFIX__
-#define __REGISTER_PREFIX__
-#endif
-
-/* ANSI concatenation macros.  */
-
-#define CONCAT1(a, b) CONCAT2(a, b)
-#define CONCAT2(a, b) a ## b
-
-/* Use the right prefix for global labels.  */
-
-#define SYM(x) CONCAT1 (__USER_LABEL_PREFIX__, x)
-
-/* Use the right prefix for registers.  */
-
-#define REG(x) CONCAT1 (__REGISTER_PREFIX__, x)
-
-/*
- *  define macros for all of the registers on this CPU
- *
- *  EXAMPLE:     #define d0 REG (d0)
- */
-
-/*
- *  Define macros to handle section beginning and ends.
- */
-
-
-#define BEGIN_CODE_DCL .text
-#define END_CODE_DCL
-#define BEGIN_DATA_DCL .data
-#define END_DATA_DCL
-#define BEGIN_CODE .text
-#define END_CODE
-#define BEGIN_DATA
-#define END_DATA
-#define BEGIN_BSS
-#define END_BSS
-#define END
-
-/*
- *  Following must be tailor for a particular flavor of the C compiler.
- *  They may need to put underscores in front of the symbols.
- */
-
-#define PUBLIC(sym) .globl SYM (sym)
-#define EXTERN(sym) .globl SYM (sym)
-
-#endif
-/* end of include file */
-
-
diff --git a/cpukit/score/cpu/sh/asm.h b/cpukit/score/cpu/sh/asm.h
deleted file mode 100644
index f6fff9f40e..0000000000
--- a/cpukit/score/cpu/sh/asm.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/*  asm.h
- *
- *  This include file attempts to address the problems
- *  caused by incompatible flavors of assemblers and
- *  toolsets.  It primarily addresses variations in the
- *  use of leading underscores on symbols and the requirement
- *  that register names be preceded by a %.
- *
- *  Authors: Ralf Corsepius (corsepiu@faw.uni-ulm.de) and
- *           Bernd Becker (becker@faw.uni-ulm.de)
- *
- *  NOTE: The spacing in the use of these macros
- *        is critical to them working as advertised.
- *
- *  COPYRIGHT:
- *
- *  This file is based on similar code found in newlib available
- *  from ftp.cygnus.com.  The file which was used had no copyright
- *  notice.  This file is freely distributable as long as the source
- *  of the file is noted.  This file is:
- *
- *
- *  COPYRIGHT (c) 1997-1998, FAW Ulm, Germany
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- *
- *  COPYRIGHT (c) 1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __CPU_SH_ASM_h
-#define __CPU_SH_ASM_h
-
-/*
- *  Indicate we are in an assembly file and get the basic CPU definitions.
- */
-
-#ifndef ASM
-#define ASM
-#endif
-
-#include <rtems/score/targopts.h>
-#include <rtems/score/sh.h>
-
-/*
- *  Recent versions of GNU cpp define variables which indicate the
- *  need for underscores and percents.  If not using GNU cpp or
- *  the version does not support this, then you will obviously
- *  have to define these as appropriate.
- */
-
-#ifndef __USER_LABEL_PREFIX__
-#define __USER_LABEL_PREFIX__ _
-#endif
-
-#ifndef __REGISTER_PREFIX__
-#define __REGISTER_PREFIX__
-#endif
-
-/* ANSI concatenation macros.  */
-
-#define CONCAT1(a, b) CONCAT2(a, b)
-#define CONCAT2(a, b) a ## b
-
-/* Use the right prefix for global labels.  */
-
-#define SYM(x) CONCAT1 (__USER_LABEL_PREFIX__, x)
-
-/* Use the right prefix for registers.  */
-
-#define REG(x) CONCAT1 (__REGISTER_PREFIX__, x)
-
-/*
- *  define macros for all of the registers on this CPU
- *
- *  EXAMPLE:     #define d0 REG (d0)
- */
-#define r0 REG (r0)
-#define r1 REG (r1)
-#define r2 REG (r2)
-#define r3 REG (r3)
-#define r4 REG (r4)
-#define r5 REG (r5)
-#define r6 REG (r6)
-#define r7 REG (r7)
-#define r8 REG (r8)
-#define r9 REG (r9)
-#define r10 REG (r10)
-#define r11 REG (r11)
-#define r12 REG (r12)
-#define r13 REG (r13)
-#define r14 REG (r14)
-#define r15 REG (r15)
-#define vbr REG (vbr)
-#define gbr REG (gbr)
-#define pr REG (pr)
-#define mach REG (mach)
-#define macl REG (macl)
-#define sr REG (sr)
-#define pc REG (pc)
-
-/*
- *  Define macros to handle section beginning and ends.
- */
-
-
-#define BEGIN_CODE_DCL .text
-#define END_CODE_DCL
-#define BEGIN_DATA_DCL .data
-#define END_DATA_DCL
-#define BEGIN_CODE .text
-#define END_CODE
-#define BEGIN_DATA
-#define END_DATA
-#define BEGIN_BSS
-#define END_BSS
-#define END
-
-/*
- *  Following must be tailor for a particular flavor of the C compiler.
- *  They may need to put underscores in front of the symbols.
- */
-
-#define PUBLIC(sym) .global SYM (sym)
-#define EXTERN(sym) .global SYM (sym)
-
-#endif
diff --git a/cpukit/score/cpu/sh/cpu.c b/cpukit/score/cpu/sh/cpu.c
deleted file mode 100644
index cc07552cf0..0000000000
--- a/cpukit/score/cpu/sh/cpu.c
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
- *  This file contains information pertaining to the Hitachi SH
- *  processor.
- *
- *  Authors: Ralf Corsepius (corsepiu@faw.uni-ulm.de) and
- *           Bernd Becker (becker@faw.uni-ulm.de)
- *
- *  COPYRIGHT (c) 1997-1998, FAW Ulm, Germany
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * 
- *
- *  COPYRIGHT (c) 1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
- 
-#include <rtems/system.h>
-#include <rtems/score/isr.h>
-#include <rtems/score/sh_io.h>
-#include <rtems/score/cpu.h>
-#include <rtems/score/sh.h>
-
-
-/* referenced in start.s */
-extern proc_ptr vectab[] ;
-
-proc_ptr vectab[256] ;
-
-extern proc_ptr _Hardware_isr_Table[];
-
-/*  _CPU_Initialize
- *
- *  This routine performs processor dependent initialization.
- *
- *  INPUT PARAMETERS:
- *    cpu_table       - CPU table to initialize
- *    thread_dispatch - address of disptaching routine
- */
-
-
-void _CPU_Initialize(
-  rtems_cpu_table  *cpu_table,
-  void      (*thread_dispatch)      /* ignored on this CPU */
-)
-{
-  register unsigned32 level = 0;
-
-  /*
-   *  The thread_dispatch argument is the address of the entry point
-   *  for the routine called at the end of an ISR once it has been
-   *  decided a context switch is necessary.  On some compilation
-   *  systems it is difficult to call a high-level language routine
-   *  from assembly.  This allows us to trick these systems.
-   *
-   *  If you encounter this problem save the entry point in a CPU
-   *  dependent variable.
-   */
-
-  _CPU_Thread_dispatch_pointer = thread_dispatch;
-
-  /*
-   *  If there is not an easy way to initialize the FP context
-   *  during Context_Initialize, then it is usually easier to
-   *  save an "uninitialized" FP context here and copy it to
-   *  the task's during Context_Initialize.
-   */
-
-  /* FP context initialization support goes here */
-
-  _CPU_Table = *cpu_table;
-
-  /* enable interrupts */
-  _CPU_ISR_Set_level( level);
-}
-
-/*PAGE
- *
- *  _CPU_ISR_Get_level
- */
- 
-unsigned32 _CPU_ISR_Get_level( void )
-{
-  /*
-   *  This routine returns the current interrupt level.
-   */
-
-  register unsigned32 _mask ;
-  
-  sh_get_interrupt_level( _mask );
-  
-  return ( _mask);
-}
-
-/*PAGE
- *
- *  _CPU_ISR_install_raw_handler
- */
- 
-void _CPU_ISR_install_raw_handler(
-  unsigned32  vector,
-  proc_ptr    new_handler,
-  proc_ptr   *old_handler
-)
-{
-  /*
-   *  This is where we install the interrupt handler into the "raw" interrupt
-   *  table used by the CPU to dispatch interrupt handlers.
-   */
-  volatile proc_ptr	*vbr ;
-
-#if SH_PARANOID_ISR  
-  unsigned32		level ;
-
-  sh_disable_interrupts( level );
-#endif    
-
-  /* get vbr */
-  asm ( "stc vbr,%0" : "=r" (vbr) );
-
-  *old_handler = vbr[vector] ;
-  vbr[vector]  = new_handler ;
-
-#if SH_PARANOID_ISR
-  sh_enable_interrupts( level );
-#endif
-}
-
-
-/*PAGE
- *
- *  _CPU_ISR_install_vector
- *
- *  This kernel routine installs the RTEMS handler for the
- *  specified vector.
- *
- *  Input parameters:
- *    vector      - interrupt vector number
- *    old_handler - former ISR for this vector number
- *    new_handler - replacement ISR for this vector number
- *
- *  Output parameters:  NONE
- *
- */
-
-void _CPU_ISR_install_vector(
-  unsigned32  vector,
-  proc_ptr    new_handler,
-  proc_ptr   *old_handler
-)
-{
-   proc_ptr ignored ;
-
-   if(( vector <= 113) && ( vector >= 11))
-     {
-       *old_handler = _ISR_Vector_table[ vector ];
-
-       /*
-	*  If the interrupt vector table is a table of pointer to isr entry
-	*  points, then we need to install the appropriate RTEMS interrupt
-	*  handler for this vector number.
-	*/
-       _CPU_ISR_install_raw_handler(vector, 
-				    _Hardware_isr_Table[vector],
-				    &ignored );
-
-       /*
-	*  We put the actual user ISR address in '_ISR_Vector_table'.  
-	*  This will be used by __ISR_Handler so the user gets control.
-	*/
-
-       _ISR_Vector_table[ vector ] = new_handler;
-     }
-}
-
-/*PAGE
- *
- *  _CPU_Thread_Idle_body
- *
- *  NOTES:
- *
- *  1. This is the same as the regular CPU independent algorithm.
- *
- *  2. If you implement this using a "halt", "idle", or "shutdown"
- *     instruction, then don't forget to put it in an infinite loop.
- *
- *  3. Be warned. Some processors with onboard DMA have been known
- *     to stop the DMA if the CPU were put in IDLE mode.  This might
- *     also be a problem with other on-chip peripherals.  So use this
- *     hook with caution.
- */
-
-#if (CPU_PROVIDES_IDLE_THREAD_BODY == TRUE)
-void _CPU_Thread_Idle_body( void )
-{
-
-  for( ; ; )
-    {
-      asm volatile("nop");
-    }
-    /* insert your "halt" instruction here */ ;
-}
-#endif
-
-#if (CPU_USE_GENERIC_BITFIELD_CODE == FALSE)
-
-unsigned8 _bit_set_table[16] = 
-  { 4, 4, 4, 4, 4, 4, 4, 4, 3, 3, 3, 3, 2, 2, 1,0};
-
-
-#endif
-
-void _CPU_Context_Initialize(
-  Context_Control	*_the_context,
-  void			*_stack_base,
-  unsigned32		_size,
-  unsigned32		_isr,
-  void 	(*_entry_point)(void),
-  int			_is_fp )
-{
-  _the_context->r15 = (unsigned32*) ((unsigned32) (_stack_base) + (_size) );
-  _the_context->sr  = (_isr << 4) & 0x00f0 ;
-  _the_context->pr  = (unsigned32*) _entry_point ;
-}
diff --git a/cpukit/score/cpu/sh/rtems/asm.h b/cpukit/score/cpu/sh/rtems/asm.h
deleted file mode 100644
index f6fff9f40e..0000000000
--- a/cpukit/score/cpu/sh/rtems/asm.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/*  asm.h
- *
- *  This include file attempts to address the problems
- *  caused by incompatible flavors of assemblers and
- *  toolsets.  It primarily addresses variations in the
- *  use of leading underscores on symbols and the requirement
- *  that register names be preceded by a %.
- *
- *  Authors: Ralf Corsepius (corsepiu@faw.uni-ulm.de) and
- *           Bernd Becker (becker@faw.uni-ulm.de)
- *
- *  NOTE: The spacing in the use of these macros
- *        is critical to them working as advertised.
- *
- *  COPYRIGHT:
- *
- *  This file is based on similar code found in newlib available
- *  from ftp.cygnus.com.  The file which was used had no copyright
- *  notice.  This file is freely distributable as long as the source
- *  of the file is noted.  This file is:
- *
- *
- *  COPYRIGHT (c) 1997-1998, FAW Ulm, Germany
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- *
- *  COPYRIGHT (c) 1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __CPU_SH_ASM_h
-#define __CPU_SH_ASM_h
-
-/*
- *  Indicate we are in an assembly file and get the basic CPU definitions.
- */
-
-#ifndef ASM
-#define ASM
-#endif
-
-#include <rtems/score/targopts.h>
-#include <rtems/score/sh.h>
-
-/*
- *  Recent versions of GNU cpp define variables which indicate the
- *  need for underscores and percents.  If not using GNU cpp or
- *  the version does not support this, then you will obviously
- *  have to define these as appropriate.
- */
-
-#ifndef __USER_LABEL_PREFIX__
-#define __USER_LABEL_PREFIX__ _
-#endif
-
-#ifndef __REGISTER_PREFIX__
-#define __REGISTER_PREFIX__
-#endif
-
-/* ANSI concatenation macros.  */
-
-#define CONCAT1(a, b) CONCAT2(a, b)
-#define CONCAT2(a, b) a ## b
-
-/* Use the right prefix for global labels.  */
-
-#define SYM(x) CONCAT1 (__USER_LABEL_PREFIX__, x)
-
-/* Use the right prefix for registers.  */
-
-#define REG(x) CONCAT1 (__REGISTER_PREFIX__, x)
-
-/*
- *  define macros for all of the registers on this CPU
- *
- *  EXAMPLE:     #define d0 REG (d0)
- */
-#define r0 REG (r0)
-#define r1 REG (r1)
-#define r2 REG (r2)
-#define r3 REG (r3)
-#define r4 REG (r4)
-#define r5 REG (r5)
-#define r6 REG (r6)
-#define r7 REG (r7)
-#define r8 REG (r8)
-#define r9 REG (r9)
-#define r10 REG (r10)
-#define r11 REG (r11)
-#define r12 REG (r12)
-#define r13 REG (r13)
-#define r14 REG (r14)
-#define r15 REG (r15)
-#define vbr REG (vbr)
-#define gbr REG (gbr)
-#define pr REG (pr)
-#define mach REG (mach)
-#define macl REG (macl)
-#define sr REG (sr)
-#define pc REG (pc)
-
-/*
- *  Define macros to handle section beginning and ends.
- */
-
-
-#define BEGIN_CODE_DCL .text
-#define END_CODE_DCL
-#define BEGIN_DATA_DCL .data
-#define END_DATA_DCL
-#define BEGIN_CODE .text
-#define END_CODE
-#define BEGIN_DATA
-#define END_DATA
-#define BEGIN_BSS
-#define END_BSS
-#define END
-
-/*
- *  Following must be tailor for a particular flavor of the C compiler.
- *  They may need to put underscores in front of the symbols.
- */
-
-#define PUBLIC(sym) .global SYM (sym)
-#define EXTERN(sym) .global SYM (sym)
-
-#endif
diff --git a/cpukit/score/cpu/sparc/README b/cpukit/score/cpu/sparc/README
deleted file mode 100644
index c4c2200075..0000000000
--- a/cpukit/score/cpu/sparc/README
+++ /dev/null
@@ -1,110 +0,0 @@
-#
-#  $Id$
-#
-
-This file discusses SPARC specific issues which are important to
-this port.  The primary topics in this file are:
-
-  + Global Register Usage
-  + Stack Frame
-  + EF bit in the PSR
-
-
-Global Register Usage
-=====================
-
-This information on register usage is based heavily on a comment in the
-file gcc-2.7.0/config/sparc/sparc.h in the the gcc 2.7.0 source.
-
-   + g0 is hardwired to 0
-   + On non-v9 systems:
-       - g1 is free to use as temporary.
-       - g2-g4 are reserved for applications.  Gcc normally uses them as
-         temporaries, but this can be disabled via the -mno-app-regs option.
-       - g5 through g7 are reserved for the operating system.
-   + On v9 systems:
-       - g1 and g5 are free to use as temporaries.
-       - g2-g4 are reserved for applications (the compiler will not normally use
-         them, but they can be used as temporaries with -mapp-regs).
-       - g6-g7 are reserved for the operating system.
-
-   NOTE:  As of gcc 2.7.0 register g1 was used in the following scenarios:
-
-       + as a temporary by the 64 bit sethi pattern
-       + when restoring call-preserved registers in large stack frames
-
-RTEMS places no constraints on the usage of the global registers.  Although 
-gcc assumes that either g5-g7 (non-V9) or g6-g7 (V9) are reserved for the
-operating system, RTEMS does not assume any special use for them.
-
-
-
-Stack Frame
-===========
-
-The stack grows downward (i.e. to lower addresses) on the SPARC architecture.
-
-The following is the organization of the stack frame:
-
-
-
-                |        ...............        |
-             fp |                               |
-                +-------------------------------+
-                |                               |
-                | Local registers, temporaries, |
-                |      and saved floats         |      x bytes
-                |                               |
-        sp + x  +-------------------------------+
-                |                               |
-                |   outgoing parameters past    |
-                |       the sixth one           |      x bytes
-                |                               |
-        sp + 92 +-------------------------------+  *
-                |                               |  *
-                |   area for callee to save     |  *
-                |      register arguments       |  *  24 bytes
-                |                               |  *
-        sp + 68 +-------------------------------+  *
-                |                               |  *
-                |   structure return pointer    |  *   4 bytes
-                |                               |  *
-        sp + 64 +-------------------------------+  *
-                |                               |  *
-                |      local register set       |  *  32 bytes
-                |                               |  *
-        sp + 32 +-------------------------------+  *
-                |                               |  *
-                |      input register set       |  *  32 bytes
-                |                               |  *
-            sp  +-------------------------------+  *
-
-
-* = minimal stack frame
-
-x = optional components
-
-EF bit in the PSR
-=================
-
-The EF (enable floating point unit) in the PSR is utilized in this port to
-prevent non-floating point tasks from performing floating point
-operations. This bit is maintained as part of the integer context. 
-However, the floating point context is switched BEFORE the integer
-context.  Thus the EF bit in place at the time of the FP switch may
-indicate that FP operations are disabled.  This occurs on certain task
-switches, when the EF bit will be 0 for the outgoing task and thus a fault
-will be generated on the first FP operation of the FP context save. 
-
-The remedy for this is to enable FP access as the first step in both the
-save and restore of the FP context area.  This bit will be subsequently 
-reloaded by the integer context switch.
-
-Two of the scenarios which demonstrate this problem are outlined below:
-
-1. When the first FP task is switched to.  The system tasks are not FP and
-thus would be unable to restore the FP context of the incoming task. 
-
-2. On a deferred FP context switch. In this case, the system might switch
-from FP Task A to non-FP Task B and then to FP Task C.  In this scenario, 
-the floating point state must technically be saved by a non-FP task. 
diff --git a/cpukit/score/cpu/sparc/asm.h b/cpukit/score/cpu/sparc/asm.h
deleted file mode 100644
index b9a3aabeea..0000000000
--- a/cpukit/score/cpu/sparc/asm.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/*  asm.h
- *
- *  This include file attempts to address the problems
- *  caused by incompatible flavors of assemblers and
- *  toolsets.  It primarily addresses variations in the
- *  use of leading underscores on symbols and the requirement
- *  that register names be preceded by a %.
- *
- *
- *  NOTE: The spacing in the use of these macros
- *        is critical to them working as advertised.
- *
- *  COPYRIGHT:
- *
- *  This file is based on similar code found in newlib available
- *  from ftp.cygnus.com.  The file which was used had no copyright
- *  notice.  This file is freely distributable as long as the source
- *  of the file is noted.
- *
- *  $Id$
- */
-
-#ifndef __SPARC_ASM_h
-#define __SPARC_ASM_h
-
-/*
- *  Indicate we are in an assembly file and get the basic CPU definitions.
- */
-
-#ifndef ASM
-#define ASM
-#endif
-
-#include <rtems/score/targopts.h>
-#include <rtems/score/cpu.h>
-
-/*
- *  Recent versions of GNU cpp define variables which indicate the
- *  need for underscores and percents.  If not using GNU cpp or
- *  the version does not support this, then you will obviously
- *  have to define these as appropriate.
- */
-
-/* XXX __USER_LABEL_PREFIX__ and __REGISTER_PREFIX__ do not work on gcc 2.7.0 */
-/* XXX The following ifdef magic fixes the problem but results in a warning   */
-/* XXX when compiling assembly code.                                          */
-#undef  __USER_LABEL_PREFIX__
-#ifndef __USER_LABEL_PREFIX__
-#define __USER_LABEL_PREFIX__ _
-#endif
-
-#ifndef __REGISTER_PREFIX__
-#define __REGISTER_PREFIX__
-#endif
-
-/* ANSI concatenation macros.  */
-
-#define CONCAT1(a, b) CONCAT2(a, b)
-#define CONCAT2(a, b) a ## b
-
-/* Use the right prefix for global labels.  */
-
-#define SYM(x) CONCAT1 (__USER_LABEL_PREFIX__, x)
-
-/* Use the right prefix for registers.  */
-
-#define REG(x) CONCAT1 (__REGISTER_PREFIX__, x)
-
-/*
- *  define macros for all of the registers on this CPU
- *
- *  EXAMPLE:     #define d0 REG (d0)
- */
-
-/*
- *  Define macros to handle section beginning and ends.
- */
-
-
-#define BEGIN_CODE_DCL .text
-#define END_CODE_DCL
-#define BEGIN_DATA_DCL .data
-#define END_DATA_DCL
-#define BEGIN_CODE .text
-#define END_CODE
-#define BEGIN_DATA
-#define END_DATA
-#define BEGIN_BSS
-#define END_BSS
-#define END
-
-/*
- *  Following must be tailor for a particular flavor of the C compiler.
- *  They may need to put underscores in front of the symbols.
- */
-
-#define PUBLIC(sym) .globl SYM (sym)
-#define EXTERN(sym) .globl SYM (sym)
-
-/*
- *  Entry for traps which jump to a programmer-specified trap handler.
- */
- 
-#define TRAP(_vector, _handler)  \
-  mov   %psr, %l0 ; \
-  sethi %hi(_handler), %l4 ; \
-  jmp   %l4+%lo(_handler); \
-  mov   _vector, %l3
-
-/*
- *  Used for the reset trap for ERC32 to avoid a supervisor instruction
- */
- 
-#define RTRAP(_vector, _handler)  \
-  mov   %g0, %l0 ; \
-  sethi %hi(_handler), %l4 ; \
-  jmp   %l4+%lo(_handler); \
-  mov   _vector, %l3
-
-#endif
-/* end of include file */
-
-
diff --git a/cpukit/score/cpu/sparc/cpu.c b/cpukit/score/cpu/sparc/cpu.c
deleted file mode 100644
index 70b0f8f219..0000000000
--- a/cpukit/score/cpu/sparc/cpu.c
+++ /dev/null
@@ -1,409 +0,0 @@
-/*
- *  SPARC Dependent Source
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  Ported to ERC32 implementation of the SPARC by On-Line Applications
- *  Research Corporation (OAR) under contract to the European Space 
- *  Agency (ESA).
- *
- *  ERC32 modifications of respective RTEMS file: COPYRIGHT (c) 1995. 
- *  European Space Agency.
- *
- *  $Id$
- */
-
-#include <rtems/system.h>
-#include <rtems/score/isr.h>
-
-#if defined(erc32)
-#include <erc32.h>
-#endif
-
-/*
- *  This initializes the set of opcodes placed in each trap 
- *  table entry.  The routine which installs a handler is responsible
- *  for filling in the fields for the _handler address and the _vector
- *  trap type.
- *
- *  The constants following this structure are masks for the fields which
- *  must be filled in when the handler is installed.
- */
-
-const CPU_Trap_table_entry _CPU_Trap_slot_template = {
-  0xa1480000,      /* mov   %psr, %l0           */
-  0x29000000,      /* sethi %hi(_handler), %l4  */
-  0x81c52000,      /* jmp   %l4 + %lo(_handler) */
-  0xa6102000       /* mov   _vector, %l3        */
-};
-
-/*PAGE
- *
- *  _CPU_Initialize
- *
- *  This routine performs processor dependent initialization.
- *
- *  Input Parameters:
- *    cpu_table       - CPU table to initialize
- *    thread_dispatch - address of disptaching routine
- *
- *  Output Parameters: NONE
- * 
- *  NOTE: There is no need to save the pointer to the thread dispatch routine.
- *        The SPARC's assembly code can reference it directly with no problems.
- */
-
-void _CPU_Initialize(
-  rtems_cpu_table  *cpu_table,
-  void            (*thread_dispatch)      /* ignored on this CPU */
-)
-{
-  void                  *pointer;
-
-#ifndef NO_TABLE_MOVE
-  unsigned32             trap_table_start;
-  unsigned32             tbr_value;
-  CPU_Trap_table_entry  *old_tbr;
-  CPU_Trap_table_entry  *trap_table;
-
-  /*
-   *  Install the executive's trap table.  All entries from the original
-   *  trap table are copied into the executive's trap table.  This is essential
-   *  since this preserves critical trap handlers such as the window underflow
-   *  and overflow handlers.  It is the responsibility of the BSP to provide
-   *  install these in the initial trap table.
-   */
-
- 
-  trap_table_start = (unsigned32) &_CPU_Trap_Table_area;
-  if (trap_table_start & (SPARC_TRAP_TABLE_ALIGNMENT-1))
-    trap_table_start = (trap_table_start + SPARC_TRAP_TABLE_ALIGNMENT) & 
-                       ~(SPARC_TRAP_TABLE_ALIGNMENT-1);
-
-  trap_table = (CPU_Trap_table_entry *) trap_table_start;
-
-  sparc_get_tbr( tbr_value );
-
-  old_tbr = (CPU_Trap_table_entry *) (tbr_value & 0xfffff000);
-
-  memcpy( trap_table, (void *) old_tbr, 256 * sizeof( CPU_Trap_table_entry ) );
-
-  sparc_set_tbr( trap_table_start );
-
-#endif
-
-  /*
-   *  This seems to be the most appropriate way to obtain an initial
-   *  FP context on the SPARC.  The NULL fp context is copied it to
-   *  the task's FP context during Context_Initialize.
-   */
-
-  pointer = &_CPU_Null_fp_context;
-  _CPU_Context_save_fp( &pointer );
-
-  /*
-   *  Grab our own copy of the user's CPU table.
-   */
-
-  _CPU_Table = *cpu_table;
-
-#if defined(erc32)
-
-  /*
-   *  ERC32 specific initialization
-   */
-
-  _ERC32_MEC_Timer_Control_Mirror = 0;
-  ERC32_MEC.Timer_Control = 0;
-
-  ERC32_MEC.Control |= ERC32_CONFIGURATION_POWER_DOWN_ALLOWED;
-
-#endif
-
-}
-
-/*PAGE
- *
- *  _CPU_ISR_Get_level
- *
- *  Input Parameters: NONE
- *
- *  Output Parameters:
- *    returns the current interrupt level (PIL field of the PSR)
- */
- 
-unsigned32 _CPU_ISR_Get_level( void )
-{
-  unsigned32 level;
- 
-  sparc_get_interrupt_level( level );
- 
-  return level;
-}
-
-/*PAGE
- *
- *  _CPU_ISR_install_raw_handler
- *
- *  This routine installs the specified handler as a "raw" non-executive
- *  supported trap handler (a.k.a. interrupt service routine).
- *
- *  Input Parameters:
- *    vector      - trap table entry number plus synchronous 
- *                    vs. asynchronous information
- *    new_handler - address of the handler to be installed
- *    old_handler - pointer to an address of the handler previously installed
- *
- *  Output Parameters: NONE
- *    *new_handler - address of the handler previously installed
- * 
- *  NOTE: 
- *
- *  On the SPARC, there are really only 256 vectors.  However, the executive
- *  has no easy, fast, reliable way to determine which traps are synchronous
- *  and which are asynchronous.  By default, synchronous traps return to the
- *  instruction which caused the interrupt.  So if you install a software
- *  trap handler as an executive interrupt handler (which is desirable since
- *  RTEMS takes care of window and register issues), then the executive needs
- *  to know that the return address is to the trap rather than the instruction
- *  following the trap.
- *
- *  So vectors 0 through 255 are treated as regular asynchronous traps which
- *  provide the "correct" return address.  Vectors 256 through 512 are assumed
- *  by the executive to be synchronous and to require that the return address
- *  be fudged.
- *
- *  If you use this mechanism to install a trap handler which must reexecute
- *  the instruction which caused the trap, then it should be installed as
- *  an asynchronous trap.  This will avoid the executive changing the return
- *  address.
- */
- 
-void _CPU_ISR_install_raw_handler(
-  unsigned32  vector,
-  proc_ptr    new_handler,
-  proc_ptr   *old_handler
-)
-{
-  unsigned32             real_vector;
-  CPU_Trap_table_entry  *tbr;
-  CPU_Trap_table_entry  *slot;
-  unsigned32             u32_tbr;
-  unsigned32             u32_handler;
-
-  /*
-   *  Get the "real" trap number for this vector ignoring the synchronous
-   *  versus asynchronous indicator included with our vector numbers.
-   */
-
-  real_vector = SPARC_REAL_TRAP_NUMBER( vector );
-
-  /*
-   *  Get the current base address of the trap table and calculate a pointer
-   *  to the slot we are interested in.
-   */
-
-  sparc_get_tbr( u32_tbr );
-
-  u32_tbr &= 0xfffff000;
-
-  tbr = (CPU_Trap_table_entry *) u32_tbr;
-
-  slot = &tbr[ real_vector ];
-
-  /*
-   *  Get the address of the old_handler from the trap table.
-   *
-   *  NOTE: The old_handler returned will be bogus if it does not follow
-   *        the RTEMS model.
-   */
-
-#define HIGH_BITS_MASK   0xFFFFFC00
-#define HIGH_BITS_SHIFT  10
-#define LOW_BITS_MASK    0x000003FF
-
-  if ( slot->mov_psr_l0 == _CPU_Trap_slot_template.mov_psr_l0 ) {
-    u32_handler = 
-      ((slot->sethi_of_handler_to_l4 & HIGH_BITS_MASK) << HIGH_BITS_SHIFT) |
-      (slot->jmp_to_low_of_handler_plus_l4 & LOW_BITS_MASK);
-    *old_handler = (proc_ptr) u32_handler;
-  } else
-    *old_handler = 0;
-
-  /*
-   *  Copy the template to the slot and then fix it.
-   */
-
-  *slot = _CPU_Trap_slot_template;
-
-  u32_handler = (unsigned32) new_handler;
-
-  slot->mov_vector_l3 |= vector;
-  slot->sethi_of_handler_to_l4 |= 
-    (u32_handler & HIGH_BITS_MASK) >> HIGH_BITS_SHIFT;
-  slot->jmp_to_low_of_handler_plus_l4 |= (u32_handler & LOW_BITS_MASK);
-}
-
-/*PAGE
- *
- *  _CPU_ISR_install_vector
- *
- *  This kernel routine installs the RTEMS handler for the
- *  specified vector.
- *
- *  Input parameters:
- *    vector       - interrupt vector number
- *    new_handler  - replacement ISR for this vector number
- *    old_handler  - pointer to former ISR for this vector number
- *
- *  Output parameters: 
- *    *old_handler - former ISR for this vector number
- *
- */
-
-void _CPU_ISR_install_vector(
-  unsigned32  vector,
-  proc_ptr    new_handler,
-  proc_ptr   *old_handler
-)
-{
-   unsigned32 real_vector;
-   proc_ptr   ignored;
-
-  /*
-   *  Get the "real" trap number for this vector ignoring the synchronous
-   *  versus asynchronous indicator included with our vector numbers.
-   */
-
-   real_vector = SPARC_REAL_TRAP_NUMBER( vector );
-
-   /*
-    *  Return the previous ISR handler.
-    */
-
-   *old_handler = _ISR_Vector_table[ real_vector ];
-
-   /*
-    *  Install the wrapper so this ISR can be invoked properly.
-    */
-
-   _CPU_ISR_install_raw_handler( vector, _ISR_Handler, &ignored );
-
-   /*
-    *  We put the actual user ISR address in '_ISR_vector_table'.  This will
-    *  be used by the _ISR_Handler so the user gets control.
-    */
-
-    _ISR_Vector_table[ real_vector ] = new_handler;
-}
-
-/*PAGE
- *
- *  _CPU_Context_Initialize
- *
- *  This kernel routine initializes the basic non-FP context area associated
- *  with each thread.
- *
- *  Input parameters:
- *    the_context  - pointer to the context area
- *    stack_base   - address of memory for the SPARC
- *    size         - size in bytes of the stack area
- *    new_level    - interrupt level for this context area
- *    entry_point  - the starting execution point for this this context
- *    is_fp        - TRUE if this context is associated with an FP thread
- *
- *  Output parameters: NONE
- */
-
-void _CPU_Context_Initialize(
-  Context_Control  *the_context,
-  unsigned32       *stack_base,
-  unsigned32        size,
-  unsigned32        new_level,
-  void             *entry_point,
-  boolean           is_fp
-)
-{
-    unsigned32   stack_high;  /* highest "stack aligned" address */
-    unsigned32   the_size;
-    unsigned32   tmp_psr;
- 
-    /*
-     *  On CPUs with stacks which grow down (i.e. SPARC), we build the stack
-     *  based on the stack_high address.  
-     */
- 
-    stack_high = ((unsigned32)(stack_base) + size);
-    stack_high &= ~(CPU_STACK_ALIGNMENT - 1);
- 
-    the_size = size & ~(CPU_STACK_ALIGNMENT - 1);
- 
-    /*
-     *  See the README in this directory for a diagram of the stack.
-     */
- 
-    the_context->o7    = ((unsigned32) entry_point) - 8;
-    the_context->o6_sp = stack_high - CPU_MINIMUM_STACK_FRAME_SIZE;
-    the_context->i6_fp = stack_high;
-
-    /*
-     *  Build the PSR for the task.  Most everything can be 0 and the
-     *  CWP is corrected during the context switch.
-     *
-     *  The EF bit determines if the floating point unit is available.
-     *  The FPU is ONLY enabled if the context is associated with an FP task
-     *  and this SPARC model has an FPU.
-     */
-
-    sparc_get_psr( tmp_psr );
-    tmp_psr &= ~SPARC_PSR_PIL_MASK;
-    tmp_psr |= (new_level << 8) & SPARC_PSR_PIL_MASK;
-    tmp_psr &= ~SPARC_PSR_EF_MASK;      /* disabled by default */
-    
-#if (SPARC_HAS_FPU == 1)
-    /*
-     *  If this bit is not set, then a task gets a fault when it accesses
-     *  a floating point register.  This is a nice way to detect floating
-     *  point tasks which are not currently declared as such.
-     */
-
-    if ( is_fp )
-      tmp_psr |= SPARC_PSR_EF_MASK;
-#endif
-    the_context->psr = tmp_psr;
-}
-
-/*PAGE
- *
- *  _CPU_Thread_Idle_body
- *
- *  Some SPARC implementations have low power, sleep, or idle modes.  This
- *  tries to take advantage of those models.  
- */
- 
-#if (CPU_PROVIDES_IDLE_THREAD_BODY == TRUE)
-
-/*
- *  This is the implementation for the erc32.
- *
- *  NOTE: Low power mode was enabled at initialization time.
- */
-
-#if defined(erc32)
-
-void _CPU_Thread_Idle_body( void )
-{
-  while (1) {
-    ERC32_MEC.Power_Down = 0;   /* value is irrelevant */
-  }
-}
-
-#endif
-
-#endif /* CPU_PROVIDES_IDLE_THREAD_BODY */
diff --git a/cpukit/score/cpu/sparc/rtems/asm.h b/cpukit/score/cpu/sparc/rtems/asm.h
deleted file mode 100644
index b9a3aabeea..0000000000
--- a/cpukit/score/cpu/sparc/rtems/asm.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/*  asm.h
- *
- *  This include file attempts to address the problems
- *  caused by incompatible flavors of assemblers and
- *  toolsets.  It primarily addresses variations in the
- *  use of leading underscores on symbols and the requirement
- *  that register names be preceded by a %.
- *
- *
- *  NOTE: The spacing in the use of these macros
- *        is critical to them working as advertised.
- *
- *  COPYRIGHT:
- *
- *  This file is based on similar code found in newlib available
- *  from ftp.cygnus.com.  The file which was used had no copyright
- *  notice.  This file is freely distributable as long as the source
- *  of the file is noted.
- *
- *  $Id$
- */
-
-#ifndef __SPARC_ASM_h
-#define __SPARC_ASM_h
-
-/*
- *  Indicate we are in an assembly file and get the basic CPU definitions.
- */
-
-#ifndef ASM
-#define ASM
-#endif
-
-#include <rtems/score/targopts.h>
-#include <rtems/score/cpu.h>
-
-/*
- *  Recent versions of GNU cpp define variables which indicate the
- *  need for underscores and percents.  If not using GNU cpp or
- *  the version does not support this, then you will obviously
- *  have to define these as appropriate.
- */
-
-/* XXX __USER_LABEL_PREFIX__ and __REGISTER_PREFIX__ do not work on gcc 2.7.0 */
-/* XXX The following ifdef magic fixes the problem but results in a warning   */
-/* XXX when compiling assembly code.                                          */
-#undef  __USER_LABEL_PREFIX__
-#ifndef __USER_LABEL_PREFIX__
-#define __USER_LABEL_PREFIX__ _
-#endif
-
-#ifndef __REGISTER_PREFIX__
-#define __REGISTER_PREFIX__
-#endif
-
-/* ANSI concatenation macros.  */
-
-#define CONCAT1(a, b) CONCAT2(a, b)
-#define CONCAT2(a, b) a ## b
-
-/* Use the right prefix for global labels.  */
-
-#define SYM(x) CONCAT1 (__USER_LABEL_PREFIX__, x)
-
-/* Use the right prefix for registers.  */
-
-#define REG(x) CONCAT1 (__REGISTER_PREFIX__, x)
-
-/*
- *  define macros for all of the registers on this CPU
- *
- *  EXAMPLE:     #define d0 REG (d0)
- */
-
-/*
- *  Define macros to handle section beginning and ends.
- */
-
-
-#define BEGIN_CODE_DCL .text
-#define END_CODE_DCL
-#define BEGIN_DATA_DCL .data
-#define END_DATA_DCL
-#define BEGIN_CODE .text
-#define END_CODE
-#define BEGIN_DATA
-#define END_DATA
-#define BEGIN_BSS
-#define END_BSS
-#define END
-
-/*
- *  Following must be tailor for a particular flavor of the C compiler.
- *  They may need to put underscores in front of the symbols.
- */
-
-#define PUBLIC(sym) .globl SYM (sym)
-#define EXTERN(sym) .globl SYM (sym)
-
-/*
- *  Entry for traps which jump to a programmer-specified trap handler.
- */
- 
-#define TRAP(_vector, _handler)  \
-  mov   %psr, %l0 ; \
-  sethi %hi(_handler), %l4 ; \
-  jmp   %l4+%lo(_handler); \
-  mov   _vector, %l3
-
-/*
- *  Used for the reset trap for ERC32 to avoid a supervisor instruction
- */
- 
-#define RTRAP(_vector, _handler)  \
-  mov   %g0, %l0 ; \
-  sethi %hi(_handler), %l4 ; \
-  jmp   %l4+%lo(_handler); \
-  mov   _vector, %l3
-
-#endif
-/* end of include file */
-
-
diff --git a/cpukit/score/cpu/unix/cpu.c b/cpukit/score/cpu/unix/cpu.c
deleted file mode 100644
index 796d46d267..0000000000
--- a/cpukit/score/cpu/unix/cpu.c
+++ /dev/null
@@ -1,1109 +0,0 @@
-/*
- *  UNIX Simulator Dependent Source
- *
- *  COPYRIGHT (c) 1994,95 by Division Incorporated
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems/system.h>
-#include <rtems/score/isr.h>
-#include <rtems/score/interr.h>
-
-#if defined(__linux__)
-#define _XOPEN_SOURCE
-#define MALLOC_0_RETURNS_NULL
-#endif
-
-#include <sys/types.h>
-#include <sys/times.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <setjmp.h>
-#include <signal.h>
-#include <time.h>
-#include <sys/time.h>
-#include <errno.h>
-#include <unistd.h>
-#include <sys/ipc.h>
-#include <sys/shm.h>
-#include <sys/sem.h>
-#include <string.h>   /* memset */
-
-#ifndef SA_RESTART
-#define SA_RESTART 0
-#endif
-
-typedef struct {
-  jmp_buf   regs;
-  int  isr_level;
-} Context_Control_overlay;
-
-void  _CPU_Signal_initialize(void);
-void  _CPU_Stray_signal(int);
-void  _CPU_ISR_Handler(int);
-
-static sigset_t         _CPU_Signal_mask;
-static Context_Control_overlay
-          _CPU_Context_Default_with_ISRs_enabled CPU_STRUCTURE_ALIGNMENT;
-static Context_Control_overlay
-          _CPU_Context_Default_with_ISRs_disabled CPU_STRUCTURE_ALIGNMENT;
-
-/*
- * Sync IO support, an entry for each fd that can be set
- */
-
-void  _CPU_Sync_io_Init();
-
-static rtems_sync_io_handler _CPU_Sync_io_handlers[FD_SETSIZE];
-static int sync_io_nfds;
-static fd_set sync_io_readfds;
-static fd_set sync_io_writefds;
-static fd_set sync_io_exceptfds;
-
-/*
- * Which cpu are we? Used by libcpu and libbsp.
- */
-
-int cpu_number;
-
-/*PAGE
- *
- *  _CPU_ISR_From_CPU_Init
- */
-
-sigset_t  posix_empty_mask;
-
-void _CPU_ISR_From_CPU_Init()
-{
-  unsigned32        i;
-  proc_ptr          old_handler;
-
-  /*
-   * Generate an empty mask to be used by disable_support
-   */
-
-  sigemptyset(&posix_empty_mask);
-
-  /*
-   * Block all the signals except SIGTRAP for the debugger
-   * and fatal error signals.
-   */
-
-  (void) sigfillset(&_CPU_Signal_mask);
-  (void) sigdelset(&_CPU_Signal_mask, SIGTRAP);
-  (void) sigdelset(&_CPU_Signal_mask, SIGABRT);
-  (void) sigdelset(&_CPU_Signal_mask, SIGIOT);
-  (void) sigdelset(&_CPU_Signal_mask, SIGCONT);
-  (void) sigdelset(&_CPU_Signal_mask, SIGSEGV);
-  (void) sigdelset(&_CPU_Signal_mask, SIGBUS);
-  (void) sigdelset(&_CPU_Signal_mask, SIGFPE);
-
-  _CPU_ISR_Enable(1);
-
-  /*
-   * Set the handler for all signals to be signal_handler
-   * which will then vector out to the correct handler
-   * for whichever signal actually happened. Initially
-   * set the vectors to the stray signal handler.
-   */
-
-  for (i = 0; i < CPU_INTERRUPT_NUMBER_OF_VECTORS; i++)
-      (void)_CPU_ISR_install_vector(i, _CPU_Stray_signal, &old_handler);
-
-  _CPU_Signal_initialize();
-}
-
-void _CPU_Signal_initialize( void )
-{
-  struct sigaction  act;
-  sigset_t          mask;
-
-  /* mark them all active except for TraceTrap  and Abort */
-
-  mask = _CPU_Signal_mask;
-  sigprocmask(SIG_UNBLOCK, &mask, 0);
-
-  act.sa_handler = _CPU_ISR_Handler;
-  act.sa_mask = mask;
-  act.sa_flags = SA_RESTART;
-
-  sigaction(SIGHUP, &act, 0);
-  sigaction(SIGINT, &act, 0);
-  sigaction(SIGQUIT, &act, 0);
-  sigaction(SIGILL, &act, 0);
-#ifdef SIGEMT
-  sigaction(SIGEMT, &act, 0);
-#endif
-  sigaction(SIGFPE, &act, 0);
-  sigaction(SIGKILL, &act, 0);
-  sigaction(SIGBUS, &act, 0);
-  sigaction(SIGSEGV, &act, 0);
-#ifdef SIGSYS
-  sigaction(SIGSYS, &act, 0);
-#endif
-  sigaction(SIGPIPE, &act, 0);
-  sigaction(SIGALRM, &act, 0);
-  sigaction(SIGTERM, &act, 0);
-  sigaction(SIGUSR1, &act, 0);
-  sigaction(SIGUSR2, &act, 0);
-  sigaction(SIGCHLD, &act, 0);
-#ifdef SIGCLD
-  sigaction(SIGCLD, &act, 0);
-#endif
-#ifdef SIGPWR
-  sigaction(SIGPWR, &act, 0);
-#endif
-  sigaction(SIGVTALRM, &act, 0);
-  sigaction(SIGPROF, &act, 0);
-  sigaction(SIGIO, &act, 0);
-  sigaction(SIGWINCH, &act, 0);
-  sigaction(SIGSTOP, &act, 0);
-  sigaction(SIGTTIN, &act, 0);
-  sigaction(SIGTTOU, &act, 0);
-  sigaction(SIGURG, &act, 0);
-#ifdef SIGLOST
-    sigaction(SIGLOST, &act, 0);
-#endif
-}
-
-/*PAGE
- *
- *  _CPU_Context_From_CPU_Init
- */
-
-void _CPU_Context_From_CPU_Init()
-{
-
-#if defined(__hppa__) && defined(RTEMS_UNIXLIB_SETJMP)
-    /*
-     * HACK - set the _SYSTEM_ID to 0x20c so that setjmp/longjmp
-     * will handle the full 32 floating point registers.
-     */
-
-    {
-      extern unsigned32 _SYSTEM_ID;
-
-      _SYSTEM_ID = 0x20c;
-    }
-#endif
-
-  /*
-   *  get default values to use in _CPU_Context_Initialize()
-   */
-
-
-  (void) memset(
-    &_CPU_Context_Default_with_ISRs_enabled,
-    0,
-    sizeof(Context_Control)
-  );
-  (void) memset(
-    &_CPU_Context_Default_with_ISRs_disabled,
-    0,
-    sizeof(Context_Control)
-  );
-
-  _CPU_ISR_Set_level( 0 );
-  _CPU_Context_switch(
-    (Context_Control *) &_CPU_Context_Default_with_ISRs_enabled,
-    (Context_Control *) &_CPU_Context_Default_with_ISRs_enabled
-  );
-
-  _CPU_ISR_Set_level( 1 );
-  _CPU_Context_switch(
-    (Context_Control *) &_CPU_Context_Default_with_ISRs_disabled,
-    (Context_Control *) &_CPU_Context_Default_with_ISRs_disabled
-  );
-}
-
-/*PAGE
- *
- *  _CPU_Sync_io_Init
- */
-
-void _CPU_Sync_io_Init()
-{
-  int fd;
-
-  for (fd = 0; fd < FD_SETSIZE; fd++)
-    _CPU_Sync_io_handlers[fd] = NULL;
-
-  sync_io_nfds = 0;
-  FD_ZERO(&sync_io_readfds);
-  FD_ZERO(&sync_io_writefds);
-  FD_ZERO(&sync_io_exceptfds);
-}
-
-/*PAGE
- *
- *  _CPU_ISR_Get_level
- */
-
-unsigned32 _CPU_ISR_Get_level( void )
-{
-  sigset_t old_mask;
-
-#if defined(__linux__)
-  sigemptyset( &old_mask );
-#endif
-  sigprocmask(SIG_BLOCK, 0, &old_mask);
-
-  if (memcmp((void *)&posix_empty_mask, (void *)&old_mask, sizeof(sigset_t)))
-      return 1;
-
-  return 0;
-}
-
-/*  _CPU_Initialize
- *
- *  This routine performs processor dependent initialization.
- *
- *  INPUT PARAMETERS:
- *    cpu_table       - CPU table to initialize
- *    thread_dispatch - address of disptaching routine
- */
-
-
-void _CPU_Initialize(
-  rtems_cpu_table  *cpu_table,
-  void            (*thread_dispatch)      /* ignored on this CPU */
-)
-{
-  /*
-   *  The thread_dispatch argument is the address of the entry point
-   *  for the routine called at the end of an ISR once it has been
-   *  decided a context switch is necessary.  On some compilation
-   *  systems it is difficult to call a high-level language routine
-   *  from assembly.  This allows us to trick these systems.
-   *
-   *  If you encounter this problem save the entry point in a CPU
-   *  dependent variable.
-   */
-
-  _CPU_Thread_dispatch_pointer = thread_dispatch;
-
-  /*
-   * XXX; If there is not an easy way to initialize the FP context
-   *      during Context_Initialize, then it is usually easier to
-   *      save an "uninitialized" FP context here and copy it to
-   *      the task's during Context_Initialize.
-   */
-
-  /* XXX: FP context initialization support */
-
-  _CPU_Table = *cpu_table;
-
-  _CPU_ISR_From_CPU_Init();
-
-  _CPU_Sync_io_Init();
-
-  _CPU_Context_From_CPU_Init();
-
-}
-
-/*PAGE
- *
- *  _CPU_ISR_install_raw_handler
- */
-
-void _CPU_ISR_install_raw_handler(
-  unsigned32  vector,
-  proc_ptr    new_handler,
-  proc_ptr   *old_handler
-)
-{
-  _CPU_Fatal_halt( 0xdeaddead );
-}
-
-/*PAGE
- *
- *  _CPU_ISR_install_vector
- *
- *  This kernel routine installs the RTEMS handler for the
- *  specified vector.
- *
- *  Input parameters:
- *    vector      - interrupt vector number
- *    old_handler - former ISR for this vector number
- *    new_handler - replacement ISR for this vector number
- *
- *  Output parameters:  NONE
- *
- */
-
-
-void _CPU_ISR_install_vector(
-  unsigned32  vector,
-  proc_ptr    new_handler,
-  proc_ptr   *old_handler
-)
-{
-   *old_handler = _ISR_Vector_table[ vector ];
-
-   /*
-    *  If the interrupt vector table is a table of pointer to isr entry
-    *  points, then we need to install the appropriate RTEMS interrupt
-    *  handler for this vector number.
-    */
-
-   /*
-    *  We put the actual user ISR address in '_ISR_vector_table'.  This will
-    *  be used by the _CPU_ISR_Handler so the user gets control.
-    */
-
-    _ISR_Vector_table[ vector ] = new_handler;
-}
-
-/*PAGE
- *
- *  _CPU_Install_interrupt_stack
- */
-
-void _CPU_Install_interrupt_stack( void )
-{
-}
-
-/*PAGE
- *
- *  _CPU_Thread_Idle_body
- *
- *  Stop until we get a signal which is the logically the same thing
- *  entering low-power or sleep mode on a real processor and waiting for
- *  an interrupt.  This significantly reduces the consumption of host
- *  CPU cycles which is again similar to low power mode.
- */
-
-void _CPU_Thread_Idle_body( void )
-{
-#if CPU_SYNC_IO
-  extern void _Thread_Dispatch(void);
-  int fd;
-#endif
-
-  while (1) {
-#ifdef RTEMS_DEBUG
-    /* interrupts had better be enabled at this point! */
-    if (_CPU_ISR_Get_level() != 0)
-       abort();
-#endif
-
-    /*
-     *  Block on a select statement, the CPU interface added allow the
-     *  user to add new descriptors which are to be blocked on
-     */
-
-#if CPU_SYNC_IO
-    if (sync_io_nfds) {
-      int result;
-
-      result = select(sync_io_nfds,
-                 &sync_io_readfds,
-                 &sync_io_writefds,
-                 &sync_io_exceptfds,
-                 NULL);
-
-      if ((result < 0) && (errno != EINTR))
-        _CPU_Fatal_error(0x200);       /* FIXME : what number should go here !! */
-
-      for (fd = 0; fd < sync_io_nfds; fd++) {
-        boolean read = FD_ISSET(fd, &sync_io_readfds);
-        boolean write = FD_ISSET(fd, &sync_io_writefds);
-        boolean except = FD_ISSET(fd, &sync_io_exceptfds);
-
-        if (_CPU_Sync_io_handlers[fd] && (read || write || except))
-          _CPU_Sync_io_handlers[fd](fd, read, write, except);
-
-        _Thread_Dispatch();
-      }
-    } else
-      pause();
-#else
-    pause();
-#endif
-
-  }
-
-}
-
-/*PAGE
- *
- *  _CPU_Context_Initialize
- */
-
-void _CPU_Context_Initialize(
-  Context_Control  *_the_context,
-  unsigned32       *_stack_base,
-  unsigned32        _size,
-  unsigned32        _new_level,
-  void             *_entry_point,
-  boolean           _is_fp
-)
-{
-  unsigned32  *addr;
-  unsigned32   jmp_addr;
-  unsigned32   _stack_low;   /* lowest "stack aligned" address */
-  unsigned32   _stack_high;  /* highest "stack aligned" address */
-  unsigned32   _the_size;
-
-  jmp_addr = (unsigned32) _entry_point;
-
-  /*
-   *  On CPUs with stacks which grow down, we build the stack
-   *  based on the _stack_high address.  On CPUs with stacks which
-   *  grow up, we build the stack based on the _stack_low address.
-   */
-
-  _stack_low = (unsigned32)(_stack_base) + CPU_STACK_ALIGNMENT - 1;
-  _stack_low &= ~(CPU_STACK_ALIGNMENT - 1);
-
-  _stack_high = (unsigned32)(_stack_base) + _size;
-  _stack_high &= ~(CPU_STACK_ALIGNMENT - 1);
-
-  if (_stack_high > _stack_low)
-    _the_size = _stack_high - _stack_low;
-  else
-    _the_size = _stack_low - _stack_high;
-
-  /*
-   * Slam our jmp_buf template into the context we are creating
-   */
-
-  if ( _new_level == 0 )
-      *_the_context = *(Context_Control *)
-                         &_CPU_Context_Default_with_ISRs_enabled;
-  else
-      *_the_context = *(Context_Control *)
-                         &_CPU_Context_Default_with_ISRs_disabled;
-
-  addr = (unsigned32 *)_the_context;
-
-#if defined(__hppa__)
-  *(addr + RP_OFF) = jmp_addr;
-  *(addr + SP_OFF) = (unsigned32)(_stack_low + CPU_FRAME_SIZE);
-
-  /*
-   * See if we are using shared libraries by checking
-   * bit 30 in 24 off of newp. If bit 30 is set then
-   * we are using shared libraries and the jump address
-   * points to the pointer, so we put that into rp instead.
-   */
-
-  if (jmp_addr & 0x40000000) {
-    jmp_addr &= 0xfffffffc;
-     *(addr + RP_OFF) = *(unsigned32 *)jmp_addr;
-  }
-#elif defined(__sparc__)
-
-  /*
-   *  See /usr/include/sys/stack.h in Solaris 2.3 for a nice
-   *  diagram of the stack.
-   */
-
-  asm ("ta  0x03");            /* flush registers */
-
-  *(addr + RP_OFF) = jmp_addr + ADDR_ADJ_OFFSET;
-  *(addr + SP_OFF) = (unsigned32)(_stack_high - CPU_FRAME_SIZE);
-  *(addr + FP_OFF) = (unsigned32)(_stack_high);
-
-#elif defined(__i386__)
-
-    /*
-     *  This information was gathered by disassembling setjmp().
-     */
-
-    {
-      unsigned32 stack_ptr;
-
-      stack_ptr = _stack_high - CPU_FRAME_SIZE;
-
-      *(addr + EBX_OFF) = 0xFEEDFEED;
-      *(addr + ESI_OFF) = 0xDEADDEAD;
-      *(addr + EDI_OFF) = 0xDEAFDEAF;
-      *(addr + EBP_OFF) = stack_ptr;
-      *(addr + ESP_OFF) = stack_ptr;
-      *(addr + RET_OFF) = jmp_addr;
-
-      addr = (unsigned32 *) stack_ptr;
-
-      addr[ 0 ] = jmp_addr;
-      addr[ 1 ] = (unsigned32) stack_ptr;
-      addr[ 2 ] = (unsigned32) stack_ptr;
-    }
-
-#else
-#error "UNKNOWN CPU!!!"
-#endif
-
-}
-
-/*PAGE
- *
- *  _CPU_Context_restore
- */
-
-void _CPU_Context_restore(
-  Context_Control  *next
-)
-{
-  Context_Control_overlay *nextp = (Context_Control_overlay *)next;
-
-  _CPU_ISR_Enable(nextp->isr_level);
-  longjmp( nextp->regs, 0 );
-}
-
-/*PAGE
- *
- *  _CPU_Context_switch
- */
-
-static void do_jump(
-  Context_Control_overlay *currentp,
-  Context_Control_overlay *nextp
-);
-
-void _CPU_Context_switch(
-  Context_Control  *current,
-  Context_Control  *next
-)
-{
-  Context_Control_overlay *currentp = (Context_Control_overlay *)current;
-  Context_Control_overlay *nextp = (Context_Control_overlay *)next;
-#if 0
-  int status;
-#endif
-
-  currentp->isr_level = _CPU_ISR_Disable_support();
-
-  do_jump( currentp, nextp );
-
-#if 0
-  if (sigsetjmp(currentp->regs, 1) == 0) {    /* Save the current context */
-     siglongjmp(nextp->regs, 0);           /* Switch to the new context */
-     _Internal_error_Occurred(
-         INTERNAL_ERROR_CORE,
-         TRUE,
-         status
-       );
-  }
-#endif
-
-#ifdef RTEMS_DEBUG
-    if (_CPU_ISR_Get_level() == 0)
-       abort();
-#endif
-
-  _CPU_ISR_Enable(currentp->isr_level);
-}
-
-static void do_jump(
-  Context_Control_overlay *currentp,
-  Context_Control_overlay *nextp
-)
-{
-  int status;
-
-  if (setjmp(currentp->regs) == 0) {    /* Save the current context */
-     longjmp(nextp->regs, 0);           /* Switch to the new context */
-     _Internal_error_Occurred(
-         INTERNAL_ERROR_CORE,
-         TRUE,
-         status
-       );
-  }
-}
-
-/*PAGE
- *
- *  _CPU_Save_float_context
- */
-
-void _CPU_Save_float_context(
-  Context_Control_fp *fp_context
-)
-{
-}
-
-/*PAGE
- *
- *  _CPU_Restore_float_context
- */
-
-void _CPU_Restore_float_context(
-  Context_Control_fp *fp_context
-)
-{
-}
-
-/*PAGE
- *
- *  _CPU_ISR_Disable_support
- */
-
-unsigned32 _CPU_ISR_Disable_support(void)
-{
-  int status;
-  sigset_t  old_mask;
-
-  status = sigprocmask(SIG_BLOCK, &_CPU_Signal_mask, &old_mask);
-  if ( status )
-    _Internal_error_Occurred(
-      INTERNAL_ERROR_CORE,
-      TRUE,
-      status
-    );
-
-  if (memcmp((void *)&posix_empty_mask, (void *)&old_mask, sizeof(sigset_t)))
-    return 1;
-
-  return 0;
-}
-
-/*PAGE
- *
- *  _CPU_ISR_Enable
- */
-
-void _CPU_ISR_Enable(
-  unsigned32 level
-)
-{
-  int status;
-
-  if (level == 0)
-    status = sigprocmask(SIG_UNBLOCK, &_CPU_Signal_mask, 0);
-  else
-    status = sigprocmask(SIG_BLOCK, &_CPU_Signal_mask, 0);
-
-  if ( status )
-    _Internal_error_Occurred(
-      INTERNAL_ERROR_CORE,
-      TRUE,
-      status
-    );
-}
-
-/*PAGE
- *
- *  _CPU_ISR_Handler
- *
- *  External interrupt handler.
- *  This is installed as a UNIX signal handler.
- *  It vectors out to specific user interrupt handlers.
- */
-
-void _CPU_ISR_Handler(int vector)
-{
-  extern void        _Thread_Dispatch(void);
-  extern unsigned32  _Thread_Dispatch_disable_level;
-  extern boolean     _Context_Switch_necessary;
-
-  if (_ISR_Nest_level++ == 0) {
-      /* switch to interrupt stack */
-  }
-
-  _Thread_Dispatch_disable_level++;
-
-  if (_ISR_Vector_table[vector]) {
-     _ISR_Vector_table[vector](vector);
-  } else {
-     _CPU_Stray_signal(vector);
-  }
-
-  if (_ISR_Nest_level-- == 0) {
-      /* switch back to original stack */
-  }
-
-  _Thread_Dispatch_disable_level--;
-
-  if (_Thread_Dispatch_disable_level == 0 &&
-      (_Context_Switch_necessary || _ISR_Signals_to_thread_executing)) {
-      _ISR_Signals_to_thread_executing = FALSE;
-      _CPU_ISR_Enable(0);
-      _Thread_Dispatch();
-  }
-}
-
-/*PAGE
- *
- *  _CPU_Stray_signal
- */
-
-void _CPU_Stray_signal(int sig_num)
-{
-  char buffer[ 4 ];
-
-  /*
-   * print "stray" msg about ones which that might mean something
-   * Avoid using the stdio section of the library.
-   * The following is generally safe.
-   */
-
-  switch (sig_num)
-  {
-#ifdef SIGCLD
-      case SIGCLD:
-          break;
-#endif
-      default:
-      {
-        /*
-         *  We avoid using the stdio section of the library.
-         *  The following is generally safe
-         */
-
-        int digit;
-        int number = sig_num;
-        int len = 0;
-
-        digit = number / 100;
-        number %= 100;
-        if (digit) buffer[len++] = '0' + digit;
-
-        digit = number / 10;
-        number %= 10;
-        if (digit || len) buffer[len++] = '0' + digit;
-
-        digit = number;
-        buffer[len++] = '0' + digit;
-
-        buffer[ len++ ] = '\n';
-
-        write( 2, "Stray signal ", 13 );
-        write( 2, buffer, len );
-
-      }
-  }
-
-  /*
-   * If it was a "fatal" signal, then exit here
-   * If app code has installed a hander for one of these, then
-   * we won't call _CPU_Stray_signal, so this is ok.
-   */
-
-  switch (sig_num) {
-      case SIGINT:
-      case SIGHUP:
-      case SIGQUIT:
-      case SIGILL:
-#ifdef SIGEMT
-      case SIGEMT:
-#endif
-      case SIGKILL:
-      case SIGBUS:
-      case SIGSEGV:
-      case SIGTERM:
-      case SIGIOT:
-        _CPU_Fatal_error(0x100 + sig_num);
-  }
-}
-
-/*PAGE
- *
- *  _CPU_Fatal_error
- */
-
-void _CPU_Fatal_error(unsigned32 error)
-{
-  setitimer(ITIMER_REAL, 0, 0);
-
-  if ( error ) {
-#ifdef RTEMS_DEBUG
-    abort();
-#endif
-    if (getenv("RTEMS_DEBUG"))
-      abort();
-  }
-
-  _exit(error);
-}
-
-/*
- *  Special Purpose Routines to hide the use of UNIX system calls.
- */
-
-int _CPU_Set_sync_io_handler(
-  int fd,
-  boolean read,
-  boolean write,
-  boolean except,
-  rtems_sync_io_handler handler
-)
-{
-  if ((fd < FD_SETSIZE) && (_CPU_Sync_io_handlers[fd] == NULL)) {
-    if (read)
-      FD_SET(fd, &sync_io_readfds);
-    else
-      FD_CLR(fd, &sync_io_readfds);
-    if (write)
-      FD_SET(fd, &sync_io_writefds);
-    else
-      FD_CLR(fd, &sync_io_writefds);
-    if (except)
-      FD_SET(fd, &sync_io_exceptfds);
-    else
-      FD_CLR(fd, &sync_io_exceptfds);
-    _CPU_Sync_io_handlers[fd] = handler;
-    if ((fd + 1) > sync_io_nfds)
-      sync_io_nfds = fd + 1;
-    return 0;
-  }
-  return -1;
-}
-
-int _CPU_Clear_sync_io_handler(
-  int fd
-)
-{
-  if ((fd < FD_SETSIZE) && _CPU_Sync_io_handlers[fd]) {
-    FD_CLR(fd, &sync_io_readfds);
-    FD_CLR(fd, &sync_io_writefds);
-    FD_CLR(fd, &sync_io_exceptfds);
-    _CPU_Sync_io_handlers[fd] = NULL;
-    sync_io_nfds = 0;
-    for (fd = 0; fd < FD_SETSIZE; fd++)
-      if (FD_ISSET(fd, &sync_io_readfds) ||
-          FD_ISSET(fd, &sync_io_writefds) ||
-          FD_ISSET(fd, &sync_io_exceptfds))
-        sync_io_nfds = fd;
-    return 0;
-  }
-  return -1;
-}
-
-int _CPU_Get_clock_vector( void )
-{
-  return SIGALRM;
-}
-
-void _CPU_Start_clock(
-  int microseconds
-)
-{
-  struct itimerval  new;
-
-  new.it_value.tv_sec = 0;
-  new.it_value.tv_usec = microseconds;
-  new.it_interval.tv_sec = 0;
-  new.it_interval.tv_usec = microseconds;
-
-  setitimer(ITIMER_REAL, &new, 0);
-}
-
-void _CPU_Stop_clock( void )
-{
-  struct itimerval  new;
-  struct sigaction  act;
-
-  /*
-   * Set the SIGALRM signal to ignore any last
-   * signals that might come in while we are
-   * disarming the timer and removing the interrupt
-   * vector.
-   */
-
-  (void) memset(&act, 0, sizeof(act));
-  act.sa_handler = SIG_IGN;
-
-  sigaction(SIGALRM, &act, 0);
-
-  (void) memset(&new, 0, sizeof(new));
-  setitimer(ITIMER_REAL, &new, 0);
-}
-
-int  _CPU_SHM_Semid;
-extern       void fix_syscall_errno( void );
-
-void _CPU_SHM_Init(
-  unsigned32   maximum_nodes,
-  boolean      is_master_node,
-  void       **shm_address,
-  unsigned32  *shm_length
-)
-{
-  int          i;
-  int          shmid;
-  char        *shm_addr;
-  key_t        shm_key;
-  key_t        sem_key;
-  int          status = 0;  /* to avoid unitialized warnings */
-  int          shm_size;
-
-  if (getenv("RTEMS_SHM_KEY"))
-    shm_key = strtol(getenv("RTEMS_SHM_KEY"), 0, 0);
-  else
-#ifdef RTEMS_SHM_KEY
-    shm_key = RTEMS_SHM_KEY;
-#else
-    shm_key = 0xa000;
-#endif
-
-    if (getenv("RTEMS_SHM_SIZE"))
-      shm_size = strtol(getenv("RTEMS_SHM_SIZE"), 0, 0);
-    else
-#ifdef RTEMS_SHM_SIZE
-      shm_size = RTEMS_SHM_SIZE;
-#else
-      shm_size = 64 * 1024;
-#endif
-
-    if (getenv("RTEMS_SHM_SEMAPHORE_KEY"))
-      sem_key = strtol(getenv("RTEMS_SHM_SEMAPHORE_KEY"), 0, 0);
-    else
-#ifdef RTEMS_SHM_SEMAPHORE_KEY
-      sem_key = RTEMS_SHM_SEMAPHORE_KEY;
-#else
-      sem_key = 0xa001;
-#endif
-
-    shmid = shmget(shm_key, shm_size, IPC_CREAT | 0660);
-    if ( shmid == -1 ) {
-      fix_syscall_errno(); /* in case of newlib */
-      perror( "shmget" );
-      _CPU_Fatal_halt( 0xdead0001 );
-    }
-
-    shm_addr = shmat(shmid, (char *)0, SHM_RND);
-    if ( shm_addr == (void *)-1 ) {
-      fix_syscall_errno(); /* in case of newlib */
-      perror( "shmat" );
-      _CPU_Fatal_halt( 0xdead0002 );
-    }
-
-    _CPU_SHM_Semid = semget(sem_key, maximum_nodes + 1, IPC_CREAT | 0660);
-    if ( _CPU_SHM_Semid == -1 ) {
-      fix_syscall_errno(); /* in case of newlib */
-      perror( "semget" );
-      _CPU_Fatal_halt( 0xdead0003 );
-    }
-
-    if ( is_master_node ) {
-      for ( i=0 ; i <= maximum_nodes ; i++ ) {
-#if defined(solaris2)
-        union semun {
-          int val;
-          struct semid_ds *buf;
-          ushort *array;
-        } help;
-
-        help.val = 1;
-        status = semctl( _CPU_SHM_Semid, i, SETVAL, help );
-#elif defined(__linux__) || defined(__FreeBSD__)
-        union semun help;
-
-        help.val = 1;
-        status = semctl( _CPU_SHM_Semid, i, SETVAL, help );
-#elif defined(hpux)
-        status = semctl( _CPU_SHM_Semid, i, SETVAL, 1 );
-#else
-#error "Not a supported unix variant"
-#endif
-
-        fix_syscall_errno(); /* in case of newlib */
-        if ( status == -1 ) {
-          _CPU_Fatal_halt( 0xdead0004 );
-        }
-      }
-    }
-
-  *shm_address = shm_addr;
-  *shm_length = shm_size;
-
-}
-
-int _CPU_Get_pid( void )
-{
-  return getpid();
-}
-
-/*
- * Define this to use signals for MPCI shared memory driver.
- * If undefined, the shared memory driver will poll from the
- * clock interrupt.
- * Ref: ../shmsupp/getcfg.c
- *
- * BEWARE:: many UN*X kernels and debuggers become severely confused when
- *          debugging programs which use signals.  The problem is *much*
- *          worse when using multiple signals, since ptrace(2) tends to
- *          drop all signals except 1 in the case of multiples.
- *          On hpux9, this problem was so bad, we couldn't use interrupts
- *          with the shared memory driver if we ever hoped to debug
- *          RTEMS programs.
- *          Maybe systems that use /proc don't have this problem...
- */
-
-
-int _CPU_SHM_Get_vector( void )
-{
-#ifdef CPU_USE_SHM_INTERRUPTS
-  return SIGUSR1;
-#else
-  return 0;
-#endif
-}
-
-void _CPU_SHM_Send_interrupt(
-  int pid,
-  int vector
-)
-{
-  kill((pid_t) pid, vector);
-}
-
-void _CPU_SHM_Lock(
-  int semaphore
-)
-{
-  struct sembuf sb;
-
-  sb.sem_num = semaphore;
-  sb.sem_op  = -1;
-  sb.sem_flg = 0;
-
-  while (1) {
-    int status = -1;
-
-    status = semop(_CPU_SHM_Semid, &sb, 1);
-    if ( status >= 0 )
-      break;
-    if ( status == -1 ) {
-       fix_syscall_errno();    /* in case of newlib */
-        if (errno == EINTR)
-            continue;
-        perror("shm lock");
-        _CPU_Fatal_halt( 0xdead0005 );
-    }
-  }
-
-}
-
-void _CPU_SHM_Unlock(
-  int semaphore
-)
-{
-  struct sembuf  sb;
-  int            status;
-
-  sb.sem_num = semaphore;
-  sb.sem_op  = 1;
-  sb.sem_flg = 0;
-
-  while (1) {
-    status = semop(_CPU_SHM_Semid, &sb, 1);
-    if ( status >= 0 )
-      break;
-
-    if ( status == -1 ) {
-      fix_syscall_errno();    /* in case of newlib */
-      if (errno == EINTR)
-          continue;
-      perror("shm unlock");
-      _CPU_Fatal_halt( 0xdead0006 );
-    }
-  }
-
-}
diff --git a/cpukit/score/include/rtems/debug.h b/cpukit/score/include/rtems/debug.h
deleted file mode 100644
index 5c83e67d05..0000000000
--- a/cpukit/score/include/rtems/debug.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/*  debug.h
- *
- *  This include file contains the information pertaining to the debug
- *  support within RTEMS.  It is currently cast in the form of a 
- *  Manager since it is externally accessible.
- *
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_DEBUG_h
-#define __RTEMS_DEBUG_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- *  The following type is used to manage the debug mask.
- */
-
-typedef unsigned32 rtems_debug_control;
-
-/*
- *  These constants represent various classes of debugging.
- */
-
-#define RTEMS_DEBUG_ALL_MASK 0xffffffff
-#define RTEMS_DEBUG_REGION   0x00000001
-
-/*
- *  This variable contains the current debug level.
- */
-
-SCORE_EXTERN rtems_debug_control _Debug_Level;
-
-/*
- *  _Debug_Manager_initialization
- *
- *  DESCRIPTION:
- *
- *  This routine performs the initialization necessary for this manager.
- */
-
-void _Debug_Manager_initialization( void );
-
-/*
- *  rtems_debug_enable
- *
- *  DESCRIPTION:
- *
- *  This routine enables the specified types of debug checks.
- */
-
-void rtems_debug_enable (
-  rtems_debug_control  to_be_enabled
-);
-
-/*
- *  rtems_debug_disable
- *
- *  DESCRIPTION:
- *
- *  This routine disables the specified types of debug checks.
- */
- 
-void rtems_debug_disable (
-  rtems_debug_control  to_be_disabled
-);
- 
-/*
- *
- *  _Debug_Is_enabled
- *
- *  DESCRIPTION:
- *
- *  This routine returns TRUE if the requested debug level is
- *  enabled, and FALSE otherwise.
- */
-
-boolean _Debug_Is_enabled(
-  rtems_debug_control  level
-);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/cpukit/score/include/rtems/score/address.h b/cpukit/score/include/rtems/score/address.h
deleted file mode 100644
index e64cd54931..0000000000
--- a/cpukit/score/include/rtems/score/address.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*  address.h
- *
- *  This include file contains the information required to manipulate
- *  physical addresses.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_ADDRESSES_h
-#define __RTEMS_ADDRESSES_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/address.inl>
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/cpukit/score/include/rtems/score/apiext.h b/cpukit/score/include/rtems/score/apiext.h
deleted file mode 100644
index 804b2dea4c..0000000000
--- a/cpukit/score/include/rtems/score/apiext.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/*  apiext.h
- *
- *  XXX
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-#ifndef __API_EXTENSIONS_h
-#define __API_EXTENSIONS_h
-
-#include <rtems/score/chain.h>
-#include <rtems/score/thread.h>
-
-/*
- *  The control structure which defines the points at which an API
- *  can add an extension to the system initialization thread.
- */
- 
-typedef void (*API_extensions_Predriver_hook)(void);
-typedef void (*API_extensions_Postdriver_hook)(void);
-typedef void (*API_extensions_Postswitch_hook)(
-                 Thread_Control *
-             );
- 
- 
-typedef struct {
-  Chain_Node                      Node;
-  API_extensions_Predriver_hook   predriver_hook;
-  API_extensions_Postdriver_hook  postdriver_hook;
-  API_extensions_Postswitch_hook  postswitch_hook;
-}  API_extensions_Control;
-
-/*
- *  This is the list of API extensions to the system initialization.
- */
- 
-SCORE_EXTERN Chain_Control _API_extensions_List;
-
-/*
- *  _API_extensions_Initialization
- *
- *  DESCRIPTION:
- *
- *  This routine initializes the API extension handler.
- *
- */
- 
-void _API_extensions_Initialization( void );
- 
-/*
- *  _API_extensions_Add
- *
- *  DESCRIPTION:
- *
- *  XXX
- */
- 
-void _API_extensions_Add(
-  API_extensions_Control *the_extension
-);
-
-/*
- *  _API_extensions_Run_predriver
- *
- *  DESCRIPTION:
- *
- *  XXX
- */
- 
-void _API_extensions_Run_predriver( void );
-
-/*
- *  _API_extensions_Run_postdriver
- *
- *  DESCRIPTION:
- *
- *  XXX
- */
-
-void _API_extensions_Run_postdriver( void );
-
-/*
- *  _API_extensions_Run_postswitch
- *
- *  DESCRIPTION:
- *
- *  XXX
- */
-
-void _API_extensions_Run_postswitch( void );
-
-#endif
-/* end of include file */
diff --git a/cpukit/score/include/rtems/score/bitfield.h b/cpukit/score/include/rtems/score/bitfield.h
deleted file mode 100644
index bbced47652..0000000000
--- a/cpukit/score/include/rtems/score/bitfield.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/*  bitfield.h
- *
- *  This include file contains all bit field manipulation routines.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_BITFIELD_h
-#define __RTEMS_BITFIELD_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- *  _Bitfield_Find_first_bit
- *
- *  DESCRIPTION:
- *
- *  This routine returns the bit_number of the first bit set
- *  in the specified value.  The correspondence between bit_number
- *  and actual bit position is processor dependent.  The search for
- *  the first bit set may run from most to least significant bit
- *  or vice-versa.
- *
- *  NOTE:
- *
- *  This routine is used when the executing thread is removed
- *  from the ready state and, as a result, its performance has a
- *  significant impact on the performance of the executive as a whole.
- */
-
-#if ( CPU_USE_GENERIC_BITFIELD_DATA == TRUE )
-
-#ifndef SCORE_INIT
-extern const unsigned char __log2table[256];
-#else
-const unsigned char __log2table[256] = {
-    7, 7, 6, 6, 5, 5, 5, 5, 4, 4, 4, 4, 4, 4, 4, 4,
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-};
-#endif
- 
-#endif
-
-#if ( CPU_USE_GENERIC_BITFIELD_CODE == FALSE )
-
-#define _Bitfield_Find_first_bit( _value, _bit_number ) \
-        _CPU_Bitfield_Find_first_bit( _value, _bit_number )
-
-#else
-
-/*
- *  The following must be a macro because if a CPU specific version
- *  is used it will most likely use inline assembly.
- */
-
-#define _Bitfield_Find_first_bit( _value, _bit_number ) \
-  { \
-    register unsigned32 __value = (unsigned32) (_value); \
-    register const unsigned char *__p = __log2table; \
-    \
-    if ( __value < 0x100 ) \
-      (_bit_number) = __p[ __value ] + 8; \
-    else \
-      (_bit_number) = __p[ __value >> 8 ]; \
-  }
-
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/cpukit/score/include/rtems/score/chain.h b/cpukit/score/include/rtems/score/chain.h
deleted file mode 100644
index 910f5e4414..0000000000
--- a/cpukit/score/include/rtems/score/chain.h
+++ /dev/null
@@ -1,168 +0,0 @@
-/*  chain.h
- *
- *  This include file contains all the constants and structures associated
- *  with the Doubly Linked Chain Handler.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_CHAIN_h
-#define __RTEMS_CHAIN_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/address.h>
-
-/*
- *  This is used to manage each element (node) which is placed
- *  on a chain.
- *
- *  NOTE:  Typically, a more complicated structure will use the
- *         chain package.  The more complicated structure will
- *         include a chain node as the first element in its
- *         control structure.  It will then call the chain package
- *         with a pointer to that node element.  The node pointer
- *         and the higher level structure start at the same address
- *         so the user can cast the pointers back and forth.
- *
- */
-
-typedef struct Chain_Node_struct Chain_Node;
-
-struct Chain_Node_struct {
-  Chain_Node *next;
-  Chain_Node *previous;
-};
-
-/*
- *  This is used to manage a chain.  A chain consists of a doubly
- *  linked list of zero or more nodes.
- *
- *  NOTE:  This implementation does not require special checks for
- *         manipulating the first and last elements on the chain.
- *         To accomplish this the chain control structure is
- *         treated as two overlapping chain nodes.  The permanent
- *         head of the chain overlays a node structure on the
- *         first and permanent_null fields.  The permanent tail
- *         of the chain overlays a node structure on the
- *         permanent_null and last elements of the structure.
- *
- */
-
-typedef struct {
-  Chain_Node *first;
-  Chain_Node *permanent_null;
-  Chain_Node *last;
-} Chain_Control;
-
-/*
- *  _Chain_Initialize
- *
- *  DESCRIPTION:
- *
- *  This routine initializes the_chain structure to manage the
- *  contiguous array of number_nodes nodes which starts at
- *  starting_address.  Each node is of node_size bytes.
- *
- */
-
-void _Chain_Initialize(
-  Chain_Control *the_chain,
-  void          *starting_address,
-  unsigned32     number_nodes,
-  unsigned32     node_size
-);
-
-/*
- *  _Chain_Get_first_unprotected
- */
- 
-#ifndef USE_INLINES
-Chain_Node *_Chain_Get_first_unprotected(
-  Chain_Control *the_chain
-);
-#endif
-
-/*
- *  _Chain_Extract
- *
- *  DESCRIPTION:
- *
- *  This routine extracts the_node from the chain on which it resides.
- *  It disables interrupts to insure the atomicity of the
- *  extract operation.
- *
- */
-
-void _Chain_Extract(
-  Chain_Node *the_node
-);
-
-/*
- *  _Chain_Get
- *
- *  DESCRIPTION:
- *
- *  This function removes the first node from the_chain and returns
- *  a pointer to that node.  If the_chain is empty, then NULL is returned.
- *  It disables interrupts to insure the atomicity of the
- *  get operation.
- *
- */
-
-Chain_Node *_Chain_Get(
-  Chain_Control *the_chain
-);
-
-/*
- *  _Chain_Insert
- *
- *  DESCRIPTION:
- *
- *  This routine inserts the_node on a chain immediately following
- *  after_node.  It disables interrupts to insure the atomicity
- *  of the extract operation.
- *
- */
-
-void _Chain_Insert(
-  Chain_Node *after_node,
-  Chain_Node *the_node
-);
-
-/*
- *  _Chain_Append
- *
- *  DESCRIPTION:
- *
- *  This routine appends the_node onto the end of the_chain.
- *  It disables interrupts to insure the atomicity of the
- *  append operation.
- *
- */
-
-void _Chain_Append(
-  Chain_Control *the_chain,
-  Chain_Node    *the_node
-);
-
-#ifndef __RTEMS_APPLICATION__
-#include <rtems/score/chain.inl>
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/cpukit/score/include/rtems/score/context.h b/cpukit/score/include/rtems/score/context.h
deleted file mode 100644
index 5a22fd4b6d..0000000000
--- a/cpukit/score/include/rtems/score/context.h
+++ /dev/null
@@ -1,134 +0,0 @@
-/*  context.h
- *
- *  This include file contains all information about a context.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_CONTEXT_h
-#define __RTEMS_CONTEXT_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/cpu.h>
-
-/*
- *  The following constant defines the number of bytes required
- *  to store a full floating point context.
- */
-
-#define CONTEXT_FP_SIZE CPU_CONTEXT_FP_SIZE
-
-/*
- *  The following variable is set to TRUE when a reschedule operation
- *  has determined that the processor should be taken away from the
- *  currently executing thread and given to the heir thread.
- */
-
-SCORE_EXTERN volatile boolean _Context_Switch_necessary;
-
-/*
- *  _Context_Initialize
- *
- *  DESCRIPTION:
- *
- *  This routine initializes THE_CONTEXT such that the stack
- *  pointer, interrupt level, and entry point are correct for the
- *  thread's initial state.
- */
-
-#define \
-   _Context_Initialize( _the_context, _stack, _size, _isr, _entry, _is_fp ) \
-   _CPU_Context_Initialize( _the_context, _stack, _size, _isr, _entry, _is_fp )
-
-/*
- *  _Context_Switch
- *
- *  DESCRIPTION:
- *
- *  This routine saves the current context into the EXECUTING
- *  context record and restores the context specified by HEIR.
- */
-
-#define _Context_Switch( _executing, _heir ) \
-   _CPU_Context_switch( _executing, _heir )
-
-/*
- *  _Context_Restart_self
- *
- *  DESCRIPTION:
- *
- *  This routine restarts the calling thread by restoring its initial
- *  stack pointer and returning to the thread's entry point.
- */
-
-#define _Context_Restart_self( _the_context ) \
-   _CPU_Context_Restart_self( _the_context )
-
-/*
- *  _Context_Fp_start
- *
- *  DESCRIPTION:
- *
- *  This function returns the starting address of the floating
- *  point context save area.  It is assumed that the are reserved
- *  for the floating point save area is large enough.
- */
-
-#define _Context_Fp_start( _base, _offset ) \
-   _CPU_Context_Fp_start( (_base), (_offset) )
-
-/*
- *  _Context_Initialize_fp
- *
- *  DESCRIPTION:
- *
- *  This routine initializes the floating point context save
- *  area to contain an initial known state.
- */
-
-#define _Context_Initialize_fp( _fp_area ) \
-   _CPU_Context_Initialize_fp( _fp_area )
-
-/*
- *  _Context_Restore_fp
- *
- *  DESCRIPTION:
- *
- *  This routine restores the floating point context contained
- *  in the FP_CONTEXT area.  It is assumed that the current
- *  floating point context has been saved by a previous invocation
- *  of SAVE_FP.
- */
-
-#define _Context_Restore_fp( _fp ) \
-   _CPU_Context_restore_fp( _fp )
-
-/*
- *  _Context_Save_fp
- *
- *  DESCRIPTION:
- *
- *  This routine saves the current floating point context
- *  in the FP_CONTEXT area.
- */
-
-#define _Context_Save_fp( _fp ) \
-   _CPU_Context_save_fp( _fp )
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/cpukit/score/include/rtems/score/copyrt.h b/cpukit/score/include/rtems/score/copyrt.h
deleted file mode 100644
index 3a9a5a5c60..0000000000
--- a/cpukit/score/include/rtems/score/copyrt.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*  copyrt.h
- *
- *  This include file contains the copyright notice for RTEMS
- *  which is included in every binary copy of the executive.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_COPYRIGHT_h
-#define __RTEMS_COPYRIGHT_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef SCORE_INIT
-
-const char _Copyright_Notice[] =
-"COPYRIGHT (c) 1989-1998.\n\
-On-Line Applications Research Corporation (OAR).\n\
-Copyright assigned to U.S. Government, 1994.\n";
-
-#else
-
-extern const char _Copyright_Notice[];
-
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/cpukit/score/include/rtems/score/coremsg.h b/cpukit/score/include/rtems/score/coremsg.h
deleted file mode 100644
index 03277e12b7..0000000000
--- a/cpukit/score/include/rtems/score/coremsg.h
+++ /dev/null
@@ -1,267 +0,0 @@
-/*  coremsg.h
- *
- *  This include file contains all the constants and structures associated
- *  with the Message queue Handler.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
- 
-#ifndef __RTEMS_CORE_MESSAGE_QUEUE_h
-#define __RTEMS_CORE_MESSAGE_QUEUE_h
- 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/thread.h>
-#include <rtems/score/threadq.h>
-#include <rtems/score/priority.h>
-#include <rtems/score/watchdog.h>
- 
-/*
- *  The following type defines the callout which the API provides
- *  to support global/multiprocessor operations on message_queues.
- */
- 
-typedef void ( *CORE_message_queue_API_mp_support_callout )(
-                 Thread_Control *,
-                 Objects_Id
-             );
-
-/*
- *  The following defines the data types needed to manipulate
- *  the contents of message buffers.
- *
- *  NOTE:  The buffer field is normally longer than a single unsigned32.
- *         but since messages are variable length we just make a ptr to 1.  
- */
- 
-typedef struct {
-    unsigned32  size;
-    unsigned32  buffer[1];
-} CORE_message_queue_Buffer;
- 
-/*
- *  The following records define the organization of a message
- *  buffer.
- */
- 
-typedef struct {
-  Chain_Node                 Node;
-  CORE_message_queue_Buffer  Contents;
-}   CORE_message_queue_Buffer_control;
-
-/*
- *  Blocking disciplines for a message_queue.
- */
-
-typedef enum {
-  CORE_MESSAGE_QUEUE_DISCIPLINES_FIFO,
-  CORE_MESSAGE_QUEUE_DISCIPLINES_PRIORITY
-}   CORE_message_queue_Disciplines;
-
-/*
- *  The following enumerated type details the modes in which a message
- *  may be submitted to a message queue.  The message may be posted
- *  in a send or urgent fashion.
- */
- 
-typedef enum {
-  CORE_MESSAGE_QUEUE_SEND_REQUEST   = 0,
-  CORE_MESSAGE_QUEUE_URGENT_REQUEST = 1
-}  CORE_message_queue_Submit_types;
-
-/*
- *  Core Message queue handler return statuses.
- */
- 
-typedef enum {
-  CORE_MESSAGE_QUEUE_STATUS_SUCCESSFUL,
-  CORE_MESSAGE_QUEUE_STATUS_INVALID_SIZE,
-  CORE_MESSAGE_QUEUE_STATUS_TOO_MANY,
-  CORE_MESSAGE_QUEUE_STATUS_UNSATISFIED,
-  CORE_MESSAGE_QUEUE_STATUS_UNSATISFIED_NOWAIT,
-  CORE_MESSAGE_QUEUE_STATUS_WAS_DELETED,
-  CORE_MESSAGE_QUEUE_STATUS_TIMEOUT
-}   CORE_message_queue_Status;
-
-/*
- *  The following defines the control block used to manage the 
- *  attributes of each message queue.
- */
-
-typedef struct {
-  CORE_message_queue_Disciplines  discipline;
-}   CORE_message_queue_Attributes;
- 
-/*
- *  The following defines the type for a Notification handler.  A notification
- *  handler is invoked when the message queue makes a 0->1 transition on
- *  pending messages.
- */
-
-typedef void (*CORE_message_queue_Notify_Handler)( void * );
-
-/*
- *  The following defines the control block used to manage each 
- *  counting message_queue.
- */
- 
-typedef struct {
-  Thread_queue_Control               Wait_queue;
-  CORE_message_queue_Attributes      Attributes;
-  unsigned32                         maximum_pending_messages;
-  unsigned32                         number_of_pending_messages;
-  unsigned32                         maximum_message_size;
-  Chain_Control                      Pending_messages;
-  CORE_message_queue_Buffer         *message_buffers;
-  CORE_message_queue_Notify_Handler  notify_handler;
-  void                              *notify_argument;
-  Chain_Control                      Inactive_messages;
-}   CORE_message_queue_Control;
-
-/*
- *  _CORE_message_queue_Initialize
- *
- *  DESCRIPTION:
- *
- *  This routine initializes the message_queue based on the parameters passed.
- */
-
-boolean _CORE_message_queue_Initialize(
-  CORE_message_queue_Control    *the_message_queue,
-  Objects_Classes                the_class,
-  CORE_message_queue_Attributes *the_message_queue_attributes,
-  unsigned32                     maximum_pending_messages,
-  unsigned32                     maximum_message_size,
-  Thread_queue_Extract_callout   proxy_extract_callout
-);
- 
-/*
- *  _CORE_message_queue_Close
- *
- *  DESCRIPTION:
- *
- *  This function closes a message by returning all allocated space and
- *  flushing the message_queue's task wait queue.
- */
- 
-void _CORE_message_queue_Close(
-  CORE_message_queue_Control *the_message_queue,
-  Thread_queue_Flush_callout  remote_extract_callout,
-  unsigned32                  status
-);
-
-/*
- *
- *  _CORE_message_queue_Flush
- *
- *  DESCRIPTION:
- *
- *  This function flushes the message_queue's task wait queue.  The number
- *  messages flushed from the queue is returned.
- *
- */
-
-unsigned32 _CORE_message_queue_Flush(
-  CORE_message_queue_Control *the_message_queue
-);
-
-/*
- *  _CORE_message_queue_Flush_support
- *
- *  DESCRIPTION:
- *
- *  This routine flushes all outstanding messages and returns
- *  them to the inactive message chain.
- */
- 
-unsigned32 _CORE_message_queue_Flush_support(
-  CORE_message_queue_Control *the_message_queue
-);
- 
-/*
- *
- *  _CORE_message_queue_Broadcast
- *
- *  DESCRIPTION:
- *
- *  This function sends a message for every thread waiting on the queue and
- *  returns the number of threads made ready by the message.
- *
- */
- 
-CORE_message_queue_Status _CORE_message_queue_Broadcast(
-  CORE_message_queue_Control                *the_message_queue,
-  void                                      *buffer,
-  unsigned32                                 size,
-  Objects_Id                                 id,
-  CORE_message_queue_API_mp_support_callout  api_message_queue_mp_support,
-  unsigned32                                *count
-);
-
-/*
- *
- *  _CORE_message_queue_Submit
- *
- *  DESCRIPTION:
- *
- *  This routine implements the send and urgent message functions. It
- *  processes a message that is to be submitted to the designated
- *  message queue.  The message will either be processed as a
- *  send message which it will be inserted at the rear of the queue
- *  or it will be processed as an urgent message which will be inserted
- *  at the front of the queue.
- *
- */
- 
-CORE_message_queue_Status _CORE_message_queue_Submit(
-  CORE_message_queue_Control                *the_message_queue,
-  void                                      *buffer,
-  unsigned32                                 size,
-  Objects_Id                                 id,
-  CORE_message_queue_API_mp_support_callout  api_message_queue_mp_support,
-  CORE_message_queue_Submit_types            submit_type
-);
-
-/*
- *
- *  _CORE_message_queue_Seize
- *
- *  DESCRIPTION:
- *
- *  This kernel routine dequeues a message, copies the message buffer to
- *  a given destination buffer, and frees the message buffer to the
- *  inactive message pool.  The thread will be blocked if wait is TRUE,
- *  otherwise an error will be given to the thread if no messages are available.
- *
- */
- 
-void _CORE_message_queue_Seize(
-  CORE_message_queue_Control *the_message_queue,
-  Objects_Id                  id,
-  void                       *buffer,
-  unsigned32                 *size,
-  boolean                     wait,
-  Watchdog_Interval           timeout
-);
-
-#ifndef __RTEMS_APPLICATION__
-#include <rtems/score/coremsg.inl>
-#endif
-
-#ifdef __cplusplus
-}
-#endif
- 
-#endif
-/*  end of include file */
-
diff --git a/cpukit/score/include/rtems/score/coremutex.h b/cpukit/score/include/rtems/score/coremutex.h
deleted file mode 100644
index 7145e4f19f..0000000000
--- a/cpukit/score/include/rtems/score/coremutex.h
+++ /dev/null
@@ -1,172 +0,0 @@
-/*  mutex.h
- *
- *  This include file contains all the constants and structures associated
- *  with the Mutex Handler.  A mutex is an enhanced version of the standard
- *  Dijkstra binary semaphore used to provide synchronization and mutual 
- *  exclusion capabilities.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
- 
-#ifndef __RTEMS_CORE_MUTEX_h
-#define __RTEMS_CORE_MUTEX_h
- 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/thread.h>
-#include <rtems/score/threadq.h>
-#include <rtems/score/priority.h>
-#include <rtems/score/watchdog.h>
- 
-/*
- *  The following type defines the callout which the API provides
- *  to support global/multiprocessor operations on mutexes.
- */
- 
-typedef void ( *CORE_mutex_API_mp_support_callout )(
-                 Thread_Control *,
-                 Objects_Id
-             );
-
-/*
- *  Blocking disciplines for a mutex.
- */
-
-typedef enum {
-  CORE_MUTEX_DISCIPLINES_FIFO,
-  CORE_MUTEX_DISCIPLINES_PRIORITY,
-  CORE_MUTEX_DISCIPLINES_PRIORITY_INHERIT,
-  CORE_MUTEX_DISCIPLINES_PRIORITY_CEILING
-}   CORE_mutex_Disciplines;
-
-/*
- *  Mutex handler return statuses.
- */
- 
-typedef enum {
-  CORE_MUTEX_STATUS_SUCCESSFUL,
-  CORE_MUTEX_STATUS_UNSATISFIED_NOWAIT,
-  CORE_MUTEX_STATUS_NESTING_NOT_ALLOWED,
-  CORE_MUTEX_STATUS_NOT_OWNER_OF_RESOURCE,
-  CORE_MUTEX_WAS_DELETED,
-  CORE_MUTEX_TIMEOUT,
-  CORE_MUTEX_STATUS_CEILING_VIOLATED
-}   CORE_mutex_Status;
-
-/*
- *  Locked and unlocked values
- */
-
-#define CORE_MUTEX_UNLOCKED 1
-#define CORE_MUTEX_LOCKED   0
-
-/*
- *  The following defines the control block used to manage the 
- *  attributes of each mutex.
- */
-
-typedef struct {
-  boolean                 allow_nesting;
-  CORE_mutex_Disciplines  discipline;
-  Priority_Control        priority_ceiling;
-}   CORE_mutex_Attributes;
- 
-/*
- *  The following defines the control block used to manage each mutex.
- */
- 
-typedef struct {
-  Thread_queue_Control    Wait_queue;
-  CORE_mutex_Attributes   Attributes;
-  unsigned32              lock;
-  unsigned32              nest_count;
-  Thread_Control         *holder;
-  Objects_Id              holder_id;
-}   CORE_mutex_Control;
-
-/*
- *  _CORE_mutex_Initialize
- *
- *  DESCRIPTION:
- *
- *  This routine initializes the mutex based on the parameters passed.
- */
-
-void _CORE_mutex_Initialize(
-  CORE_mutex_Control           *the_mutex,
-  Objects_Classes               the_class,
-  CORE_mutex_Attributes        *the_mutex_attributes,
-  unsigned32                    initial_lock,
-  Thread_queue_Extract_callout  proxy_extract_callout
-);
- 
-/*
- *  _CORE_mutex_Seize
- *
- *  DESCRIPTION:
- *
- *  This routine attempts to receive a unit from the_mutex.
- *  If a unit is available or if the wait flag is FALSE, then the routine
- *  returns.  Otherwise, the calling task is blocked until a unit becomes
- *  available.
- */
-
-void _CORE_mutex_Seize(
-  CORE_mutex_Control  *the_mutex,
-  Objects_Id           id,
-  boolean              wait,
-  Watchdog_Interval    timeout
-);
- 
-/*
- *  _CORE_mutex_Surrender
- *
- *  DESCRIPTION:
- *
- *  This routine frees a unit to the mutex.  If a task was blocked waiting for
- *  a unit from this mutex, then that task will be readied and the unit
- *  given to that task.  Otherwise, the unit will be returned to the mutex.
- */
-
-CORE_mutex_Status _CORE_mutex_Surrender(
-  CORE_mutex_Control                *the_mutex,
-  Objects_Id                         id,
-  CORE_mutex_API_mp_support_callout  api_mutex_mp_support
-);
- 
-/*
- *  _CORE_mutex_Flush
- *
- *  DESCRIPTION:
- *
- *  This routine assists in the deletion of a mutex by flushing the associated
- *  wait queue.
- */
- 
-void _CORE_mutex_Flush(
-  CORE_mutex_Control         *the_mutex,
-  Thread_queue_Flush_callout  remote_extract_callout,
-  unsigned32                  status
-);
- 
-#ifndef __RTEMS_APPLICATION__
-#include <rtems/score/coremutex.inl>
-#endif
-
-#ifdef __cplusplus
-}
-#endif
- 
-#endif
-/*  end of include file */
-
diff --git a/cpukit/score/include/rtems/score/coresem.h b/cpukit/score/include/rtems/score/coresem.h
deleted file mode 100644
index 2ef1371e8d..0000000000
--- a/cpukit/score/include/rtems/score/coresem.h
+++ /dev/null
@@ -1,156 +0,0 @@
-/*  core_sem.h
- *
- *  This include file contains all the constants and structures associated
- *  with the Counting Semaphore Handler.  A counting semaphore is the
- *  standard Dijkstra binary semaphore used to provide synchronization
- *  and mutual exclusion capabilities.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
- 
-#ifndef __RTEMS_CORE_COUNTING_SEMAPHORE_h
-#define __RTEMS_CORE_COUNTING_SEMAPHORE_h
- 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/thread.h>
-#include <rtems/score/threadq.h>
-#include <rtems/score/priority.h>
-#include <rtems/score/watchdog.h>
- 
-/*
- *  The following type defines the callout which the API provides
- *  to support global/multiprocessor operations on semaphores.
- */
- 
-typedef void ( *CORE_semaphore_API_mp_support_callout )(
-                 Thread_Control *,
-                 Objects_Id
-             );
-
-/*
- *  Blocking disciplines for a semaphore.
- */
-
-typedef enum {
-  CORE_SEMAPHORE_DISCIPLINES_FIFO,
-  CORE_SEMAPHORE_DISCIPLINES_PRIORITY
-}   CORE_semaphore_Disciplines;
-
-/*
- *  Core Semaphore handler return statuses.
- */
- 
-typedef enum {
-  CORE_SEMAPHORE_STATUS_SUCCESSFUL,
-  CORE_SEMAPHORE_STATUS_UNSATISFIED_NOWAIT,
-  CORE_SEMAPHORE_WAS_DELETED,
-  CORE_SEMAPHORE_TIMEOUT
-}   CORE_semaphore_Status;
-
-/*
- *  The following defines the control block used to manage the 
- *  attributes of each semaphore.
- */
-
-typedef struct {
-  CORE_semaphore_Disciplines  discipline;
-}   CORE_semaphore_Attributes;
- 
-/*
- *  The following defines the control block used to manage each 
- *  counting semaphore.
- */
- 
-typedef struct {
-  Thread_queue_Control        Wait_queue;
-  CORE_semaphore_Attributes   Attributes;
-  unsigned32                  count;
-}   CORE_semaphore_Control;
-
-/*
- *  _CORE_semaphore_Initialize
- *
- *  DESCRIPTION:
- *
- *  This routine initializes the semaphore based on the parameters passed.
- */
-
-void _CORE_semaphore_Initialize(
-  CORE_semaphore_Control       *the_semaphore,
-  Objects_Classes               the_class,
-  CORE_semaphore_Attributes    *the_semaphore_attributes,
-  unsigned32                    initial_value,
-  Thread_queue_Extract_callout  proxy_extract_callout
-);
- 
-/*
- *  _CORE_semaphore_Seize
- *
- *  DESCRIPTION:
- *
- *  This routine attempts to receive a unit from the_semaphore.
- *  If a unit is available or if the wait flag is FALSE, then the routine
- *  returns.  Otherwise, the calling task is blocked until a unit becomes
- *  available.
- */
-
-void _CORE_semaphore_Seize(
-  CORE_semaphore_Control  *the_semaphore,
-  Objects_Id               id,
-  boolean                  wait,
-  Watchdog_Interval        timeout
-);
- 
-/*
- *  _CORE_semaphore_Surrender
- *
- *  DESCRIPTION:
- *
- *  This routine frees a unit to the semaphore.  If a task was blocked waiting
- *  for a unit from this semaphore, then that task will be readied and the unit
- *  given to that task.  Otherwise, the unit will be returned to the semaphore.
- */
-
-CORE_semaphore_Status _CORE_semaphore_Surrender(
-  CORE_semaphore_Control                *the_semaphore,
-  Objects_Id                             id,
-  CORE_semaphore_API_mp_support_callout  api_semaphore_mp_support
-);
- 
-/*
- *  _CORE_semaphore_Flush
- *
- *  DESCRIPTION:
- *
- *  This routine assists in the deletion of a semaphore by flushing the
- *  associated wait queue.
- */
-
-void _CORE_semaphore_Flush(
-  CORE_semaphore_Control         *the_semaphore,
-  Thread_queue_Flush_callout      remote_extract_callout,
-  unsigned32                      status
-);
-
-#ifndef __RTEMS_APPLICATION__
-#include <rtems/score/coresem.inl>
-#endif
-
-#ifdef __cplusplus
-}
-#endif
- 
-#endif
-/*  end of include file */
-
diff --git a/cpukit/score/include/rtems/score/heap.h b/cpukit/score/include/rtems/score/heap.h
deleted file mode 100644
index eaee7cde3f..0000000000
--- a/cpukit/score/include/rtems/score/heap.h
+++ /dev/null
@@ -1,226 +0,0 @@
-/*  heap.h
- *
- *  This include file contains the information pertaining to the Heap
- *  Handler.  A heap is a doubly linked list of variable size
- *  blocks which are allocated using the first fit method.  Garbage
- *  collection is performed each time a block is returned to the heap by
- *  coalescing neighbor blocks.  Control information for both allocated
- *  and unallocated blocks is contained in the heap space.  A heap header
- *  contains control information for the heap.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_HEAP_h
-#define __RTEMS_HEAP_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- *  Status codes for heap_extend
- */
-
-typedef enum {
-  HEAP_EXTEND_SUCCESSFUL,
-  HEAP_EXTEND_ERROR,
-  HEAP_EXTEND_NOT_IMPLEMENTED
-}  Heap_Extend_status;
-
-/*
- *  Constants used in the size/used field of each heap block to
- *  indicate when a block is free or in use.
- */
-
-#define HEAP_BLOCK_USED    1           /* indicates block is in use */
-#define HEAP_BLOCK_FREE    0           /* indicates block is free */
-
-/*
- *  The size/used field value for the dummy front and back flags.
- */
-
-#define HEAP_DUMMY_FLAG    (0 + HEAP_BLOCK_USED)
-
-/*
- *  The following constants reflect various requirements of the
- *  heap data structures which impact the management of a heap.
- *
- * NOTE:   Because free block overhead is greater than used block
- *         overhead AND a portion of the allocated space is from
- *         the extra free block overhead, the absolute lower bound
- *         of the minimum fragment size is equal to the size of
- *         the free block overhead.
- */
-
-#define HEAP_OVERHEAD \
-  (sizeof( unsigned32 ) * 2)         /* size dummy first and last blocks */
-#define HEAP_BLOCK_USED_OVERHEAD \
-  (sizeof( void * ) * 2)             /* num bytes overhead in used block */
-#define HEAP_MINIMUM_SIZE \
-  (HEAP_OVERHEAD + sizeof (Heap_Block))
-                                     /* min number of bytes the user may */
-                                     /*   specify for the heap size      */
-
-/*
- *  The following defines the data structure used to manage
- *  individual blocks in a heap.   When the block is allocated, the
- *  next and previous fields are not used by the Heap Handler
- *  and thus the address returned for the block starts at
- *  the address of the next field.
- *
- *  NOTE:  The next and previous pointers are only valid when the
- *         block is free.  Caution must be exercised to insure that
- *         allocated blocks are large enough to contain them and
- *         that they are not accidentally overwritten when the
- *         block is actually allocated.
- */
-
-typedef struct Heap_Block_struct Heap_Block;
-
-struct Heap_Block_struct {
-  unsigned32  back_flag;   /* size and status of prev block */
-  unsigned32  front_flag;  /* size and status of block */
-  Heap_Block *next;        /* pointer to next block */
-  Heap_Block *previous;    /* pointer to previous block */
-};
-
-/*
- *  The following defines the control block used to manage each heap.
- *
- *  NOTE:
- *
- *  This structure is layed out such that it can be used a a dummy
- *  first and last block on the free block chain.  The extra padding
- *  insures the dummy last block is the correct size.
- *
- *  The first Heap_Block starts at first while the second starts at
- *  final.  This is effectively the same trick as is used in the Chain
- *  Handler.
- */
-
-typedef struct {
-  Heap_Block *start;       /* first valid block address in heap */
-  Heap_Block *final;       /* last valid block address in heap */
-
-  Heap_Block *first;       /* pointer to first block in heap */
-  Heap_Block *permanent_null;  /* always NULL pointer */
-  Heap_Block *last;        /* pointer to last block in heap */
-  unsigned32  page_size;   /* allocation unit */
-  unsigned32  reserved;
-}   Heap_Control;
-
-/*
- *  _Heap_Initialize
- *
- *  DESCRIPTION:
- *
- *  This routine initializes the_heap record to manage the
- *  contiguous heap of size bytes which starts at starting_address.
- *  Blocks of memory are allocated from the heap in multiples of
- *  page_size byte units.
- */
-
-unsigned32 _Heap_Initialize(
-  Heap_Control *the_heap,
-  void         *starting_address,
-  unsigned32    size,
-  unsigned32    page_size
-);
-
-/*
- *  _Heap_Extend
- *
- *  DESCRIPTION:
- *
- *  This routine grows the_heap memory area using the size bytes which
- *  begin at starting_address.
- */
-
-Heap_Extend_status _Heap_Extend(
-  Heap_Control *the_heap,
-  void         *starting_address,
-  unsigned32    size,
-  unsigned32   *amount_extended
-);
-
-/*
- *  _Heap_Allocate
- *
- *  DESCRIPTION:
- *
- *  DESCRIPTION:
- *
- *  This function attempts to allocate a block of size bytes from
- *  the_heap.  If insufficient memory is free in the_heap to allocate
- *  a  block of the requested size, then NULL is returned.
- */
-
-void *_Heap_Allocate(
-  Heap_Control *the_heap,
-  unsigned32    size
-);
-
-/*
- *  _Heap_Size_of_user_area
- *
- *  DESCRIPTION:
- *
- *  This kernel routine sets size to the size of the given heap block.
- *  It returns TRUE if the starting_address is in the heap, and FALSE
- *  otherwise.
- */
-
-boolean _Heap_Size_of_user_area(
-  Heap_Control        *the_heap,
-  void                *starting_address,
-  unsigned32          *size
-);
-
-/*
- *  _Heap_Free
- *
- *  DESCRIPTION:
- *
- *  This routine returns the block of memory which begins
- *  at starting_address to the_heap.  Any coalescing which is
- *  possible with the freeing of this routine is performed.
- */
-
-boolean _Heap_Free(
-  Heap_Control *the_heap,
-  void         *start_address
-);
-
-/*
- *  _Heap_Walk
- *
- *  DESCRIPTION:
- *
- *  This routine walks the heap to verify its integrity.
- */
-
-void _Heap_Walk(
-  Heap_Control *the_heap,
-  int           source,
-  boolean       do_dump
-);
-
-#ifndef __RTEMS_APPLICATION__
-#include <rtems/score/heap.inl>
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/cpukit/score/include/rtems/score/interr.h b/cpukit/score/include/rtems/score/interr.h
deleted file mode 100644
index e999ceff7a..0000000000
--- a/cpukit/score/include/rtems/score/interr.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/*  interr.h
- *
- *  This include file contains constants and prototypes related
- *  to the Internal Error Handler. 
- *
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_INTERNAL_ERROR_h
-#define __RTEMS_INTERNAL_ERROR_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- *  This type lists the possible sources from which an error
- *  can be reported.
- */
-
-typedef enum {
-  INTERNAL_ERROR_CORE,
-  INTERNAL_ERROR_RTEMS_API,
-  INTERNAL_ERROR_POSIX_API
-} Internal_errors_Source;
-
-/*
- *  A list of errors which are generated internally by the executive core.
- */
-
-typedef enum {
-  INTERNAL_ERROR_NO_CONFIGURATION_TABLE,
-  INTERNAL_ERROR_NO_CPU_TABLE,
-  INTERNAL_ERROR_INVALID_WORKSPACE_ADDRESS,
-  INTERNAL_ERROR_TOO_LITTLE_WORKSPACE,
-  INTERNAL_ERROR_WORKSPACE_ALLOCATION,
-  INTERNAL_ERROR_INTERRUPT_STACK_TOO_SMALL,
-  INTERNAL_ERROR_THREAD_EXITTED,
-  INTERNAL_ERROR_INCONSISTENT_MP_INFORMATION,
-  INTERNAL_ERROR_INVALID_NODE,
-  INTERNAL_ERROR_NO_MPCI,
-  INTERNAL_ERROR_BAD_PACKET,
-  INTERNAL_ERROR_OUT_OF_PACKETS,
-  INTERNAL_ERROR_OUT_OF_GLOBAL_OBJECTS,
-  INTERNAL_ERROR_OUT_OF_PROXIES,
-  INTERNAL_ERROR_INVALID_GLOBAL_ID,
-  INTERNAL_ERROR_BAD_STACK_HOOK
-} Internal_errors_Core_list;
-
-/*
- *  This type holds the fatal error information.
- */
- 
-typedef struct {
-  Internal_errors_Source  the_source;
-  boolean                 is_internal;
-  unsigned32              the_error;
-} Internal_errors_Information;
-
-/*
- *  When a fatal error occurs, the error information is stored here.
- */
-
-SCORE_EXTERN Internal_errors_Information Internal_errors_What_happened;
-
-/*
- *  _Internal_error_Occurred
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked when the application or the executive itself
- *  determines that a fatal error has occurred.
- */
-
-void volatile _Internal_error_Occurred(
-  Internal_errors_Source  the_source,
-  boolean                 is_internal,
-  unsigned32              the_error
-);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/cpukit/score/include/rtems/score/isr.h b/cpukit/score/include/rtems/score/isr.h
deleted file mode 100644
index 97ffe7f2ec..0000000000
--- a/cpukit/score/include/rtems/score/isr.h
+++ /dev/null
@@ -1,231 +0,0 @@
-/*  isr.h
- *
- *  This include file contains all the constants and structures associated
- *  with the management of processor interrupt levels.  This handler
- *  supports interrupt critical sections, vectoring of user interrupt
- *  handlers, nesting of interrupts, and manipulating interrupt levels.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __ISR_h
-#define __ISR_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- *  The following type defines the control block used to manage
- *  the interrupt level portion of the status register.
- */
-
-typedef unsigned32 ISR_Level;
-
-/*
- *  The following type defines the type used to manage the vectors.
- */
-
-typedef unsigned32 ISR_Vector_number;
-
-/*
- *  Return type for ISR Handler
- */
-
-typedef void ISR_Handler;
-
-/*
- *  Pointer to an ISR Handler
- */
-
-#if (CPU_ISR_PASSES_FRAME_POINTER == 1)
-typedef ISR_Handler ( *ISR_Handler_entry )(
-                 ISR_Vector_number,
-                 CPU_Interrupt_frame *
-             );
-#else
-typedef ISR_Handler ( *ISR_Handler_entry )(
-                 ISR_Vector_number
-             );
-#endif
-/*
- *  This constant promotes out the number of vectors truly supported by
- *  the current CPU being used.  This is usually the number of distinct vectors
- *  the cpu can vector.
- */
- 
-#define ISR_NUMBER_OF_VECTORS                CPU_INTERRUPT_NUMBER_OF_VECTORS
-
-/*
- *  This constant promotes out the highest valid interrupt vector number.
- */
-
-#define ISR_INTERRUPT_MAXIMUM_VECTOR_NUMBER  CPU_INTERRUPT_MAXIMUM_VECTOR_NUMBER
-
-/*
- *  The following is TRUE if signals have been sent to the currently
- *  executing thread by an ISR handler.
- */
-
-SCORE_EXTERN boolean    _ISR_Signals_to_thread_executing;
-
-/*
- *  The following contains the interrupt service routine nest level.
- *  When this variable is zero, a thread is executing.
- */
-
-SCORE_EXTERN unsigned32 _ISR_Nest_level;
-
-/*
- *  The following declares the Vector Table.  Application
- *  interrupt service routines are vectored by the ISR Handler via this table.
- */
-
-SCORE_EXTERN ISR_Handler_entry _ISR_Vector_table[ ISR_NUMBER_OF_VECTORS ];
-
-/*
- *  _ISR_Handler_initialization
- *
- *  DESCRIPTION:
- *
- *  This routine performs the initialization necessary for this handler.
- */
-
-void _ISR_Handler_initialization ( void );
-
-/*
- *  _ISR_Disable
- *
- *  DESCRIPTION:
- *
- *  This routine disables all interrupts so that a critical section
- *  of code can be executing without being interrupted.  Upon return,
- *  the argument _level will contain the previous interrupt mask level.
- */
-
-#define _ISR_Disable( _level ) \
-        _CPU_ISR_Disable( _level )
-
-/*
- *  _ISR_Enable
- *
- *  DESCRIPTION:
- *
- *  This routine enables interrupts to the previous interrupt mask
- *  LEVEL.  It is used at the end of a critical section of code to
- *  enable interrupts so they can be processed again.
- */
-
-#define _ISR_Enable( _level ) \
-        _CPU_ISR_Enable( _level )
-
-/*
- *  _ISR_Flash
- *
- *  DESCRIPTION:
- *
- *  This routine temporarily enables interrupts to the previous
- *  interrupt mask level and then disables all interrupts so that
- *  the caller can continue into the second part of a critical
- *  section.  This routine is used to temporarily enable interrupts
- *  during a long critical section.  It is used in long sections of
- *  critical code when a point is reached at which interrupts can
- *  be temporarily enabled.  Deciding where to flash interrupts
- *  in a long critical section is often difficult and the point
- *  must be selected with care to insure that the critical section
- *  properly protects itself.
- */
-
-#define _ISR_Flash( _level ) \
-        _CPU_ISR_Flash( _level )
-
-/*
- *  _ISR_Install_vector
- *
- *  DESCRIPTION:
- *
- *  This routine installs new_handler as the interrupt service routine
- *  for the specified vector.  The previous interrupt service routine is
- *  returned as old_handler.
- */
-
-#define _ISR_Install_vector( _vector, _new_handler, _old_handler ) \
-  _CPU_ISR_install_vector( _vector, _new_handler, _old_handler )
-
-/*
- *  _ISR_Get_level
- *
- *  DESCRIPTION:
- *
- *  This routine returns the current interrupt level.
- */
- 
-#define _ISR_Get_level() \
-        _CPU_ISR_Get_level()
- 
-/*
- *  _ISR_Set_level
- *
- *  DESCRIPTION:
- *
- *  This routine sets the current interrupt level to that specified
- *  by new_level.  The new interrupt level is effective when the
- *  routine exits.
- */
-
-#define _ISR_Set_level( _new_level ) \
-        _CPU_ISR_Set_level( _new_level )
-
-/*
- *  _ISR_Handler
- *
- *  DESCRIPTION:
- *
- *  This routine is the interrupt dispatcher.  ALL interrupts
- *  are vectored to this routine so that minimal context can be saved
- *  and setup performed before the application's high-level language
- *  interrupt service routine is invoked.   After the application's
- *  interrupt service routine returns control to this routine, it
- *  will determine if a thread dispatch is necessary.  If so, it will
- *  insure that the necessary thread scheduling operations are
- *  performed when the outermost interrupt service routine exits.
- *
- *  NOTE:  Implemented in assembly language.
- */
-
-void _ISR_Handler( void );
-
-/*
- *  _ISR_Dispatch
- *
- *  DESCRIPTION:
- *
- *  This routine provides a wrapper so that the routine
- *  _Thread_Dispatch can be invoked when a reschedule is necessary
- *  at the end of the outermost interrupt service routine.  This
- *  wrapper is necessary to establish the processor context needed
- *  by _Thread_Dispatch and to save the processor context which is
- *  corrupted by _Thread_Dispatch.  This context typically consists
- *  of registers which are not preserved across routine invocations.
- *
- *  NOTE:  Implemented in assembly language.
- */
-
-void _ISR_Dispatch( void );
-
-#include <rtems/score/isr.inl>
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/cpukit/score/include/rtems/score/mpci.h b/cpukit/score/include/rtems/score/mpci.h
deleted file mode 100644
index 4475021eca..0000000000
--- a/cpukit/score/include/rtems/score/mpci.h
+++ /dev/null
@@ -1,412 +0,0 @@
-/*  mpci.h
- *
- *  This include file contains all the constants and structures associated
- *  with the MPCI layer.  It provides mechanisms to utilize packets.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __MPCI_h
-#define __MPCI_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/mppkt.h>
-#include <rtems/score/states.h>
-#include <rtems/score/thread.h>
-#include <rtems/score/threadq.h>
-#include <rtems/score/tqdata.h>
-#include <rtems/score/watchdog.h>
-#include <rtems/score/coresem.h>
-
-/*
- *  The following constants define the stack size requirements for
- *  the system threads.
- */
- 
-#define MPCI_RECEIVE_SERVER_STACK_SIZE \
-  ( STACK_MINIMUM_SIZE + \
-    CPU_MPCI_RECEIVE_SERVER_EXTRA_STACK + \
-    _CPU_Table.extra_mpci_receive_server_stack \
-  )
-
-/*
- *  The following defines the node number used when a broadcast is desired.
- */
-
-#define MPCI_ALL_NODES 0
-
-/*
- *  For packets associated with requests that don't already have a timeout,
- *  use the one specified by this MPCI driver.  The value specified by
- *   the MPCI driver sets an upper limit on how long a remote request
- *   should take to complete.
- */
-
-#define MPCI_DEFAULT_TIMEOUT    0xFFFFFFFF
-
-/*
- *  The following records define the Multiprocessor Communications
- *  Interface (MPCI) Table.  This table defines the user-provided
- *  MPCI which is a required part of a multiprocessor system.
- *
- *  For non-blocking local operations that become remote operations,
- *  we need a timeout.  This is a per-driver timeout: default_timeout
- */
-
-typedef void MPCI_Entry;
-
-typedef MPCI_Entry ( *MPCI_initialization_entry )( void );
-
-typedef MPCI_Entry ( *MPCI_get_packet_entry )(
-                 MP_packet_Prefix **
-             );
-
-typedef MPCI_Entry ( *MPCI_return_packet_entry )(
-                 MP_packet_Prefix *
-             );
-
-typedef MPCI_Entry ( *MPCI_send_entry )(
-                 unsigned32,
-                 MP_packet_Prefix *
-             );
-
-typedef MPCI_Entry ( *MPCI_receive_entry )(
-                 MP_packet_Prefix **
-             );
-
-typedef struct {
-  unsigned32                 default_timeout;        /* in ticks */
-  unsigned32                 maximum_packet_size;
-  MPCI_initialization_entry  initialization;
-  MPCI_get_packet_entry      get_packet;
-  MPCI_return_packet_entry   return_packet;
-  MPCI_send_entry            send_packet;
-  MPCI_receive_entry         receive_packet;
-} MPCI_Control;
-
-/*
- *  The following defines the type for packet processing routines
- *  invoked by the MPCI Receive server.
- */
-
-typedef void (*MPCI_Packet_processor)( MP_packet_Prefix * );
- 
-/*
- *  The following enumerated type defines the list of
- *  internal MP operations.
- */
- 
-typedef enum {
-  MPCI_PACKETS_SYSTEM_VERIFY  =  0
-}   MPCI_Internal_Remote_operations;
- 
-/*
- *  The following data structure defines the packet used to perform
- *  remote event operations.
- */
- 
-typedef struct {
-  MP_packet_Prefix                 Prefix;
-  MPCI_Internal_Remote_operations  operation;
-  unsigned32                       maximum_nodes;
-  unsigned32                       maximum_global_objects;
-}    MPCI_Internal_packet;
-
-/*
- *  This is the core semaphore which the MPCI Receive Server blocks on.
- */
-
-SCORE_EXTERN CORE_semaphore_Control _MPCI_Semaphore;
-/*
- *  The following thread queue is used to maintain a list of tasks
- *  which currently have outstanding remote requests.
- */
-
-SCORE_EXTERN Thread_queue_Control _MPCI_Remote_blocked_threads;
-
-/*
- *  The following define the internal pointers to the user's
- *  configuration information.
- */
- 
-SCORE_EXTERN MPCI_Control *_MPCI_table;
-
-/*
- *  The following points to the MPCI Receive Server.
- */
- 
-SCORE_EXTERN Thread_Control *_MPCI_Receive_server_tcb;
-
-/*
- *  The following table contains the process packet routines provided
- *  by each object that supports MP operations.
- */
-
-SCORE_EXTERN MPCI_Packet_processor 
-               _MPCI_Packet_processors[MP_PACKET_CLASSES_LAST+1];
-
-/*
- *  _MPCI_Handler_initialization
- *
- *  DESCRIPTION:
- *
- *  This routine performs the initialization necessary for this handler.
- */
-
-void _MPCI_Handler_initialization( 
-  MPCI_Control            *users_mpci_table,
-  unsigned32               timeout_status
-);
-
-/*
- *  _MPCI_Create_server
- *
- *  DESCRIPTION:
- *  
- *  This routine creates the packet receive server used in MP systems.
- */
-
-void _MPCI_Create_server( void );
-
-/*
- *  _MPCI_Initialization
- *
- *  DESCRIPTION:
- *
- *  This routine initializes the MPCI driver by
- *  invoking the user provided MPCI initialization callout.
- */
-
-void _MPCI_Initialization ( void );
-
-/*
- *  _MPCI_Register_packet_processor
- *
- *  DESCRIPTION:
- *
- *  This routine registers the MPCI packet processor for the
- *  designated object class.
- */
- 
-void _MPCI_Register_packet_processor( 
-  MP_packet_Classes      the_class,
-  MPCI_Packet_processor  the_packet_processor
-  
-);
- 
-/*
- *  _MPCI_Get_packet
- *
- *  DESCRIPTION:
- *
- *  This function obtains a packet by invoking the user provided
- *  MPCI get packet callout.
- */
-
-MP_packet_Prefix *_MPCI_Get_packet ( void );
-
-/*
- *  _MPCI_Return_packet
- *
- *  DESCRIPTION:
- *
- *  This routine returns a packet by invoking the user provided
- *  MPCI return packet callout.
- */
-
-void _MPCI_Return_packet (
-  MP_packet_Prefix *the_packet
-);
-
-/*
- *  _MPCI_Send_process_packet
- *
- *  DESCRIPTION:
- *
- *  This routine sends a process packet by invoking the user provided
- *  MPCI send callout.
- */
-
-void _MPCI_Send_process_packet (
-  unsigned32        destination,
-  MP_packet_Prefix *the_packet
-);
-
-/*
- *  _MPCI_Send_request_packet
- *
- *  DESCRIPTION:
- *
- *  This routine sends a request packet by invoking the user provided
- *  MPCI send callout.
- */
-
-unsigned32 _MPCI_Send_request_packet (
-  unsigned32         destination,
-  MP_packet_Prefix  *the_packet,
-  States_Control     extra_state
-);
-
-/*
- *  _MPCI_Send_response_packet
- *
- *  DESCRIPTION:
- *
- *  This routine sends a response packet by invoking the user provided
- *  MPCI send callout.
- */
-
-void _MPCI_Send_response_packet (
-  unsigned32        destination,
-  MP_packet_Prefix *the_packet
-);
-
-/*
- *  _MPCI_Receive_packet
- *
- *  DESCRIPTION:
- *
- *  This routine receives a packet by invoking the user provided
- *  MPCI receive callout.
- */
-
-MP_packet_Prefix  *_MPCI_Receive_packet ( void );
-
-/*
- *  _MPCI_Process_response
- *
- *  DESCRIPTION:
- *
- *  This routine obtains a packet by invoking the user provided
- *  MPCI get packet callout.
- */
-
-Thread_Control *_MPCI_Process_response (
-  MP_packet_Prefix *the_packet
-);
-
-/*PAGE
- *
- *  _MPCI_Receive_server
- *
- */
- 
-Thread _MPCI_Receive_server(
-  unsigned32 ignored
-);
-
-/*PAGE
- *
- *  _MPCI_Announce
- *
- *  DESCRIPTION:
- *
- *  XXX
- */
- 
-void _MPCI_Announce ( void );
-
-/*
- *  _MPCI_Internal_packets_Send_process_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs a remote procedure call so that a
- *  process operation can be performed on another node.
- */
- 
-void _MPCI_Internal_packets_Send_process_packet (
-   MPCI_Internal_Remote_operations operation
-);
- 
-/*
- *  _MPCI_Internal_packets_Send_request_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs a remote procedure call so that a
- *  directive operation can be initiated on another node.
- *
- *  This routine is not needed since there are no request
- *  packets to be sent by this manager.
- */
- 
-/*
- *  _MPCI_Internal_packets_Send_response_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs a remote procedure call so that a
- *  directive can be performed on another node.
- *
- *  This routine is not needed since there are no response
- *  packets to be sent by this manager.
- */
- 
-/*
- *
- *  _MPCI_Internal_packets_Process_packet
- *
- *  DESCRIPTION:
- *
- *  This routine performs the actions specific to this package for
- *  the request from another node.
- */
- 
-void _MPCI_Internal_packets_Process_packet (
-  MP_packet_Prefix *the_packet_prefix
-);
- 
-/*
- *  _MPCI_Internal_packets_Send_object_was_deleted
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked indirectly by the thread queue
- *  when a proxy has been removed from the thread queue and
- *  the remote node must be informed of this.
- *
- *  This routine is not needed since there are no objects
- *  deleted by this manager.
- */
- 
-/*
- *  _MPCI_Internal_packets_Send_extract_proxy
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked when a task is deleted and it
- *  has a proxy which must be removed from a thread queue and
- *  the remote node must be informed of this.
- *
- *  This routine is not needed since there are no objects
- *  deleted by this manager.
- */
- 
-/*
- *  _MPCI_Internal_packets_Get_packet
- *
- *  DESCRIPTION:
- *
- *  This routine is used to obtain a internal threads mp packet.
- */
- 
- MPCI_Internal_packet *_MPCI_Internal_packets_Get_packet ( void );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/cpukit/score/include/rtems/score/mppkt.h b/cpukit/score/include/rtems/score/mppkt.h
deleted file mode 100644
index 1838d92336..0000000000
--- a/cpukit/score/include/rtems/score/mppkt.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/*  mppkt.h
- *
- *  This package is the specification for the Packet Handler.
- *  This handler defines the basic packet and provides
- *  mechanisms to utilize packets based on this prefix.
- *  Packets are the fundamental basis for messages passed between
- *  nodes in an MP system.
- *
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __MP_PACKET_h
-#define __MP_PACKET_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/object.h>
-#include <rtems/score/priority.h>
-#include <rtems/score/watchdog.h>
-
-/*
- *  The following enumerated type defines the packet classes.
- *
- *  NOTE:  In general, each class corresponds to a manager
- *         which supports global operations.  Each manager
- *         defines the set of supported operations.
- */
-
-typedef enum {
-  MP_PACKET_MPCI_INTERNAL    = 0,
-  MP_PACKET_TASKS            = 1,
-  MP_PACKET_MESSAGE_QUEUE    = 2,
-  MP_PACKET_SEMAPHORE        = 3,
-  MP_PACKET_PARTITION        = 4,
-  MP_PACKET_REGION           = 5,
-  MP_PACKET_EVENT            = 6,
-  MP_PACKET_SIGNAL           = 7
-}   MP_packet_Classes;
-
-#define MP_PACKET_CLASSES_FIRST  MP_PACKET_MPCI_INTERNAL
-#define MP_PACKET_CLASSES_LAST   MP_PACKET_SIGNAL
-
-/*
- *  The following record contains the prefix for every packet
- *  passed between nodes in an MP system.
- *
- *  NOTE: This structure is padded to insure that anything
- *        following it is on a 16 byte boundary.  This is
- *        the most stringent structure alignment rule
- *        encountered yet (i960CA).
- */
-
-typedef struct {
-  MP_packet_Classes       the_class;
-  Objects_Id              id;
-  Objects_Id              source_tid;
-  Priority_Control        source_priority;
-  unsigned32              return_code;
-  unsigned32              length;
-  unsigned32              to_convert;
-  Watchdog_Interval       timeout;
-}   MP_packet_Prefix;
-
-/*
- *  An MPCI must support packets of at least this size.
- */
-
-#define MP_PACKET_MINIMUM_PACKET_SIZE  64
-
-/*
- *  The following constant defines the number of unsigned32's
- *  in a packet which must be converted to native format in a
- *  heterogeneous system.  In packets longer than
- *  MP_PACKET_MINIMUN_HETERO_CONVERSION unsigned32's, some of the "extra" data
- *  may a user message buffer which is not automatically endian swapped.
- */
-
-#define MP_PACKET_MINIMUN_HETERO_CONVERSION  \
-  ( sizeof( MP_packet_Prefix ) / sizeof( unsigned32 ) )
-
-#ifndef __RTEMS_APPLICATION__
-#include <rtems/score/mppkt.inl>
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/cpukit/score/include/rtems/score/object.h b/cpukit/score/include/rtems/score/object.h
deleted file mode 100644
index 0198731b96..0000000000
--- a/cpukit/score/include/rtems/score/object.h
+++ /dev/null
@@ -1,397 +0,0 @@
-/*  object.h
- *
- *  This include file contains all the constants and structures associated
- *  with the Object Handler.  This Handler provides mechanisms which
- *  can be used to initialize and manipulate all objects which have 
- *  ids.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __OBJECTS_h
-#define __OBJECTS_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/chain.h>
-
-/*
- *  The following type defines the control block used to manage
- *  object names.
- */
-
-typedef void * Objects_Name;
-
-/*
- *  Space for object names is allocated in multiples of this.
- *
- *  NOTE:  Must be a power of 2.  Matches the name manipulation routines.
- */
-
-#define OBJECTS_NAME_ALIGNMENT     sizeof( unsigned32 )
-
-/*
- *  Functions which compare names are prototyped like this.
- */
-
-typedef boolean (*Objects_Name_comparators)(
-  void       * /* name_1 */,
-  void       * /* name_2 */,
-  unsigned32   /* length */
-);
-
-/*
- *  The following type defines the control block used to manage
- *  object IDs.  The format is as follows (0=LSB):
- *
- *     Bits  0 .. 15    = index
- *     Bits 16 .. 25    = node
- *     Bits 26 .. 31    = class
- */
-
-typedef unsigned32 Objects_Id;
-
-#define OBJECTS_INDEX_START_BIT  0
-#define OBJECTS_NODE_START_BIT  16
-#define OBJECTS_CLASS_START_BIT 26
-
-#define OBJECTS_INDEX_MASK      0x0000ffff
-#define OBJECTS_NODE_MASK       0x03ff0000
-#define OBJECTS_CLASS_MASK      0xfc000000
-
-#define OBJECTS_INDEX_VALID_BITS  0x0000ffff
-#define OBJECTS_NODE_VALID_BITS   0x000003ff
-#define OBJECTS_CLASS_VALID_BITS  0x000000cf
-
-/*
- *  This enumerated type is used in the class field of the object ID.
- */
-
-typedef enum {
-  OBJECTS_NO_CLASS                  =  0,
-  OBJECTS_INTERNAL_THREADS          =  1,
-  OBJECTS_RTEMS_TASKS               =  2,
-  OBJECTS_POSIX_THREADS             =  3,
-  OBJECTS_RTEMS_TIMERS              =  4,
-  OBJECTS_RTEMS_SEMAPHORES          =  5,
-  OBJECTS_RTEMS_MESSAGE_QUEUES      =  6,
-  OBJECTS_RTEMS_PARTITIONS          =  7,
-  OBJECTS_RTEMS_REGIONS             =  8,
-  OBJECTS_RTEMS_PORTS               =  9,
-  OBJECTS_RTEMS_PERIODS             = 10,
-  OBJECTS_RTEMS_EXTENSIONS          = 11,
-  OBJECTS_POSIX_KEYS                = 12,
-  OBJECTS_POSIX_INTERRUPTS          = 13,
-  OBJECTS_POSIX_MESSAGE_QUEUES      = 14,
-  OBJECTS_POSIX_MUTEXES             = 15,
-  OBJECTS_POSIX_SEMAPHORES          = 16,
-  OBJECTS_POSIX_CONDITION_VARIABLES = 17
-} Objects_Classes;
- 
-#define OBJECTS_CLASSES_FIRST               OBJECTS_NO_CLASS
-#define OBJECTS_CLASSES_LAST                OBJECTS_POSIX_CONDITION_VARIABLES
-#define OBJECTS_CLASSES_FIRST_THREAD_CLASS  OBJECTS_INTERNAL_THREADS
-#define OBJECTS_CLASSES_LAST_THREAD_CLASS   OBJECTS_POSIX_THREADS
-
-/*
- *  This enumerated type lists the locations which may be returned
- *  by _Objects_Get.  These codes indicate the success of locating
- *  an object with the specified ID.
- */
-
-typedef enum {
-  OBJECTS_LOCAL  = 0,         /* object is local */
-  OBJECTS_REMOTE = 1,         /* object is remote */
-  OBJECTS_ERROR  = 2          /* id was invalid */
-}  Objects_Locations;
-
-/*
- *  The following defines the Object Control Block used to manage
- *  each object local to this node.
- */
-
-typedef struct {
-  Chain_Node    Node;
-  Objects_Id    id;
-  Objects_Name  name;
-}   Objects_Control;
-
-/*
- *  The following defines the structure for the information used to
- *  manage each class of objects.
- */
-
-typedef struct {
-  Objects_Classes   the_class;       /* Class of this object */
-  Objects_Id        minimum_id;      /* minimum valid id of this type */
-  Objects_Id        maximum_id;      /* maximum valid id of this type */
-  unsigned32        maximum;         /* maximum number of objects */
-  Objects_Control **local_table;     /* table of local object pointers */
-  Objects_Name     *name_table;      /* table of local object names */
-  Chain_Control    *global_table;    /* pointer to global table */
-  Chain_Control     Inactive;        /* chain of inactive ctl blocks */
-  boolean           is_string;       /* TRUE if names are strings */
-  unsigned32        name_length;     /* maximum length of names */
-  boolean           is_thread;       /* TRUE if these are threads */
-                                     /*   irregardless of API */
-}   Objects_Information;
-
-/*
- *  The following defines the data storage which contains the
- *  node number of the local node.
- */
-
-SCORE_EXTERN unsigned32  _Objects_Local_node;
-SCORE_EXTERN unsigned32  _Objects_Maximum_nodes;
-
-/*
- *  The following is the list of information blocks for each object
- *  class.  From the ID, we can go to one of these information blocks,
- *  and obtain a pointer to the appropriate object control block.
- */
-
-SCORE_EXTERN Objects_Information 
-    *_Objects_Information_table[OBJECTS_CLASSES_LAST + 1];
-
-/*
- *  The following defines the constant which may be used
- *  with _Objects_Get to manipulate the calling task.
- *
- */
-
-#define OBJECTS_ID_OF_SELF ((Objects_Id) 0)
-
-/*
- *  The following define the constants which may be used in name searches.
- */
-
-#define OBJECTS_SEARCH_ALL_NODES   0
-#define OBJECTS_SEARCH_OTHER_NODES 0x7FFFFFFE
-#define OBJECTS_SEARCH_LOCAL_NODE  0x7FFFFFFF
-#define OBJECTS_WHO_AM_I           0
-
-/*
- * Parameters and return id's for _Objects_Get_next
- */
-
-#define OBJECTS_ID_INITIAL_INDEX   (0)
-#define OBJECTS_ID_FINAL_INDEX     (0xffff)
-
-#define OBJECTS_ID_INITIAL(_class, _node) \
-  _Objects_Build_id( (_class), (_node), OBJECTS_ID_INITIAL_INDEX )
-
-#define OBJECTS_ID_FINAL           ((Objects_Id)~0)
-
-/*
- *  _Objects_Handler_initialization
- *
- *  DESCRIPTION:
- *
- *  This function performs the initialization necessary for this handler.
- *
- */
-
-void _Objects_Handler_initialization(
-  unsigned32 node,
-  unsigned32 maximum_nodes,
-  unsigned32 maximum_global_objects
-);
-
-/*
- *  _Objects_Initialize_information
- *
- *  DESCRIPTION:
- *
- *  This function initializes an object class information record.
- *  SUPPORTS_GLOBAL is TRUE if the object class supports global
- *  objects, and FALSE otherwise.  Maximum indicates the number
- *  of objects required in this class and size indicates the size
- *  in bytes of each control block for this object class.  The
- *  name length and string designator are also set.  In addition,
- *  the class may be a task, therefore this information is also included.
- */
-
-void _Objects_Initialize_information (
-  Objects_Information *information,
-  Objects_Classes      the_class,
-  boolean              supports_global,
-  unsigned32           maximum,
-  unsigned32           size,
-  boolean              is_string,
-  unsigned32           maximum_name_length,
-  boolean              is_task
-);
-
-/*
- *  _Objects_Clear_name
- *
- *  DESCRIPTION:
- *
- *  XXX
- */
- 
-void _Objects_Clear_name(
-  void       *name,
-  unsigned32  length
-);
-
-/*
- *  _Objects_Copy_name_string
- *
- *  DESCRIPTION:
- *
- *  XXX
- */
-
-void _Objects_Copy_name_string(
-  void       *source,
-  void       *destination
-);
-
-/*
- *  _Objects_Copy_name_raw
- *
- *  DESCRIPTION:
- *
- *  XXX
- */
-
-void _Objects_Copy_name_raw(
-  void       *source,
-  void       *destination,
-  unsigned32  length
-);
-
-/*
- *  _Objects_Compare_name_string
- *
- *  DESCRIPTION:
- *
- *  XXX
- */
-
-boolean _Objects_Compare_name_string(
-  void       *name_1,
-  void       *name_2,
-  unsigned32  length
-);
-
-/*
- *  _Objects_Compare_name_raw
- *
- *  DESCRIPTION:
- *
- *  XXX
- */
-
-boolean _Objects_Compare_name_raw(
-  void       *name_1,
-  void       *name_2,
-  unsigned32  length
-);
-/*
- *  _Objects_Name_to_id
- *
- *  DESCRIPTION:
- *
- *  This function implements the common portion of the object
- *  identification directives.  This directive returns the object
- *  id associated with name.  If more than one object of this class
- *  is named name, then the object to which the id belongs is
- *  arbitrary.  Node indicates the extent of the search for the
- *  id of the object named name.  If the object class supports global
- *  objects, then the search can be limited to a particular node
- *  or allowed to encompass all nodes.
- *
- */
-
-typedef enum {
-  OBJECTS_SUCCESSFUL,
-  OBJECTS_INVALID_NAME,
-  OBJECTS_INVALID_NODE
-} Objects_Name_to_id_errors;
-
-#define OBJECTS_NAME_ERRORS_FIRST OBJECTS_SUCCESSFUL
-#define OBJECTS_NAME_ERRORS_LAST  OBJECTS_INVALID_NODE
-
-Objects_Name_to_id_errors _Objects_Name_to_id(
-  Objects_Information *information,
-  Objects_Name         name,
-  unsigned32           node,
-  Objects_Id          *id
-);
-
-/*
- *  _Objects_Get
- *
- *  DESCRIPTION:
- *
- *  This function maps object ids to object control blocks.
- *  If id corresponds to a local object, then it returns
- *  the_object control pointer which maps to id and location
- *  is set to OBJECTS_LOCAL.  If the object class supports global
- *  objects and the object id is global and resides on a remote
- *  node, then location is set to OBJECTS_REMOTE, and the_object
- *  is undefined.  Otherwise, location is set to OBJECTS_ERROR
- *  and the_object is undefined.
- *
- */
-
-Objects_Control *_Objects_Get (
-  Objects_Information *information,
-  Objects_Id           id,
-  Objects_Locations   *location
-);
-
-/*
- *  _Objects_Get_next
- *
- *  DESCRIPTION:
- *
- *  Like _Objects_Get, but is used to find "next" open object.
- *
- */
-
-Objects_Control *_Objects_Get_next(
-    Objects_Information *information,
-    Objects_Id           id,
-    Objects_Locations   *location_p,
-    Objects_Id          *next_id_p
-);
-
-/*
- *  _Objects_Get_information
- *
- *  DESCRIPTION:
- *
- *  Returns the information control block for the class of objects
- *  corresponding to this id.
- */
-
-Objects_Information *_Objects_Get_information(
-  Objects_Id  id
-);
-  
-/*
- *  Pieces of object.inl are promoted out to the user
- */
-
-#include <rtems/score/object.inl>
-#include <rtems/score/objectmp.h>
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/cpukit/score/include/rtems/score/objectmp.h b/cpukit/score/include/rtems/score/objectmp.h
deleted file mode 100644
index e307ca4264..0000000000
--- a/cpukit/score/include/rtems/score/objectmp.h
+++ /dev/null
@@ -1,152 +0,0 @@
-/*  objectmp.h
- *
- *  This include file contains all the constants and structures associated
- *  with the manipulation of Global RTEMS Objects.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_OBJECTS_MP_h
-#define __RTEMS_OBJECTS_MP_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- *  This defines the Global Object Control Block used to manage
- *  objects resident on other nodes.
- */
-
-typedef struct {
-  Objects_Control Object;
-  unsigned32      name;     /* XXX broken but works */
-  /* XXX If any API is MP with variable length names .. BOOM!!!! */
-}   Objects_MP_Control;
-
-/*
- *  _Objects_MP_Handler_initialization
- *
- *  DESCRIPTION:
- *
- *  This routine intializes the inactive global object chain
- *  based on the maximum number of global objects configured.
- */
-
-void _Objects_MP_Handler_initialization (
-  unsigned32 node,
-  unsigned32 maximum_nodes,
-  unsigned32 maximum_global_objects
-);
-
-/*PAGE
- *
- *  _Objects_MP_Open
- *
- *  DESCRIPTION:
- *
- *  This routine place the specified global object in the 
- *  specified information table.  
- */
- 
-void _Objects_MP_Open (
-  Objects_Information *information,
-  Objects_MP_Control  *the_global_object,
-  unsigned32           the_name,      /* XXX -- wrong for variable */
-  Objects_Id           the_id
-);
-
-/*
- *  _Objects_MP_Allocate_and_open
- *
- *  DESCRIPTION:
- *
- *  This routine allocates a global object control block
- *  and places it in the specified information table.  If the
- *  allocation fails, then is_fatal_error determines the
- *  error processing actions taken.
- */
-
-boolean _Objects_MP_Allocate_and_open (
-  Objects_Information *information,
-  unsigned32           the_name,     /* XXX -- wrong for variable length */
-  Objects_Id           the_id,
-  boolean              is_fatal_error
-);
-
-/*
- *  _Objects_MP_Close
- *
- *  DESCRIPTION:
- *
- *  This routine removes a global object from the specified
- *  information table and deallocates the global object control block.
- */
-
-void _Objects_MP_Close (
-  Objects_Information *information,
-  Objects_Id           the_id
-);
-
-/*
- *  _Objects_MP_Global_name_search
- *
- *  DESCRIPTION:
- *
- *  This routine looks for the object with the_name in the global
- *  object tables indicated by information.  It returns the ID of the
- *  object with that name if one is found.
- */
-
-Objects_Name_to_id_errors _Objects_MP_Global_name_search (
-  Objects_Information *information,
-  Objects_Name         the_name,
-  unsigned32           nodes_to_search,
-  Objects_Id          *the_id
-);
-
-/*
- *  _Objects_MP_Is_remote
- *
- *  DESCRIPTION:
- *
- *  This function searches the Global Object Table managed
- *  by information for the object indicated by ID.  If the object
- *  is found, then location is set to objects_remote, otherwise
- *  location is set to objects_error.  In both cases, the_object
- *  is undefined.
- */
-
-void _Objects_MP_Is_remote (
-  Objects_Information  *information,
-  Objects_Id            the_id,
-  Objects_Locations    *location,
-  Objects_Control     **the_object
-);
-
-/*
- *  The following chain header is used to manage the set of
- *  inactive global object control blocks.
- */
-
-SCORE_EXTERN unsigned32     _Objects_MP_Maximum_global_objects;
-SCORE_EXTERN Chain_Control  _Objects_MP_Inactive_global_objects;
-
-#ifndef __RTEMS_APPLICATION__
-#include <rtems/score/objectmp.inl>
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/cpukit/score/include/rtems/score/priority.h b/cpukit/score/include/rtems/score/priority.h
deleted file mode 100644
index 7241888242..0000000000
--- a/cpukit/score/include/rtems/score/priority.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/*  priority.h
- *
- *  This include file contains all thread priority manipulation routines.
- *  This Handler provides mechanisms which can be used to
- *  initialize and manipulate thread priorities.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __PRIORITY_h
-#define __PRIORITY_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- *  The following type defines the control block used to manage
- *  thread priorities.
- *
- *  NOTE: Priority 0 is reserved for internal threads only.
- */
-
-typedef unsigned32 Priority_Control;
-
-#define PRIORITY_MINIMUM      0         /* highest thread priority */
-#define PRIORITY_MAXIMUM      255       /* lowest thread priority */
-
-/*
- *  The following record defines the information associated with
- *  each thread to manage its interaction with the priority bit maps.
- */
-
-typedef struct {
-  Priority_Bit_map_control *minor;        /* addr of minor bit map slot */
-  Priority_Bit_map_control  ready_major;  /* priority bit map ready mask */
-  Priority_Bit_map_control  ready_minor;  /* priority bit map ready mask */
-  Priority_Bit_map_control  block_major;  /* priority bit map block mask */
-  Priority_Bit_map_control  block_minor;  /* priority bit map block mask */
-}   Priority_Information;
-
-/*
- *  The following data items are the priority bit map.
- *  Each of the sixteen bits used in the _Priority_Major_bit_map is
- *  associated with one of the sixteen entries in the _Priority_Bit_map.
- *  Each bit in the _Priority_Bit_map indicates whether or not there are
- *  threads ready at a particular priority.  The mapping of
- *  individual priority levels to particular bits is processor
- *  dependent as is the value of each bit used to indicate that
- *  threads are ready at that priority.
- */
-
-SCORE_EXTERN volatile Priority_Bit_map_control _Priority_Major_bit_map;
-SCORE_EXTERN Priority_Bit_map_control 
-               _Priority_Bit_map[16] CPU_STRUCTURE_ALIGNMENT;
-
-/*
- *  The definition of the Priority_Bit_map_control type is CPU dependent.
- *
- */
-
-/*
- *  Priority Bitfield Manipulation Routines
- *
- *  NOTE:
- *
- *  These may simply be pass throughs to CPU dependent routines.
- */
- 
-#if ( CPU_USE_GENERIC_BITFIELD_CODE == FALSE )
-
-#define _Priority_Mask( _bit_number ) \
-  _CPU_Priority_Mask( _bit_number )
- 
-#define _Priority_Bits_index( _priority ) \
-  _CPU_Priority_bits_index( _priority )
-
-#endif
- 
-#ifndef __RTEMS_APPLICATION__
-#include <rtems/score/priority.inl>
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/cpukit/score/include/rtems/score/stack.h b/cpukit/score/include/rtems/score/stack.h
deleted file mode 100644
index 1fc4a13966..0000000000
--- a/cpukit/score/include/rtems/score/stack.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*  stack.h
- *
- *  This include file contains all information about the thread
- *  Stack Handler.  This Handler provides mechanisms which can be used to
- *  initialize and utilize stacks.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __STACK_h
-#define __STACK_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- *  The following constant defines the minimum stack size which every
- *  thread must exceed.
- */
-
-#define STACK_MINIMUM_SIZE  CPU_STACK_MINIMUM_SIZE
-
-/*
- *  The following defines the control block used to manage each stack.
- */
-
-typedef struct {
-  unsigned32  size;        /* stack size */
-  void       *area;        /* low memory addr of stack */
-}   Stack_Control;
-
-#ifndef __RTEMS_APPLICATION__
-#include <rtems/score/stack.inl>
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/cpukit/score/include/rtems/score/states.h b/cpukit/score/include/rtems/score/states.h
deleted file mode 100644
index a0d7ed8ab8..0000000000
--- a/cpukit/score/include/rtems/score/states.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*  states.h
- *
- *  This include file contains thread execution state information.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_STATES_h
-#define __RTEMS_STATES_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- *  The following type defines the control block used to manage a
- *  thread's state.
- */
-
-typedef unsigned32 States_Control;
-
-/*
- *  The following constants define the individual states which may be
- *  be used to compose and manipulate a thread's state.
- */
-
-#define STATES_ALL_SET                         0xfffff /* all states */
-#define STATES_READY                           0x00000 /* ready to run */
-#define STATES_DORMANT                         0x00001 /* created not started */
-#define STATES_SUSPENDED                       0x00002 /* waiting for resume */
-#define STATES_TRANSIENT                       0x00004 /* in transition */
-#define STATES_DELAYING                        0x00008 /* wait for timeout */
-#define STATES_WAITING_FOR_TIME                0x00010 /* wait for TOD */
-#define STATES_WAITING_FOR_BUFFER              0x00020 
-#define STATES_WAITING_FOR_SEGMENT             0x00040
-#define STATES_WAITING_FOR_MESSAGE             0x00080
-#define STATES_WAITING_FOR_EVENT               0x00100
-#define STATES_WAITING_FOR_SEMAPHORE           0x00200
-#define STATES_WAITING_FOR_MUTEX               0x00400
-#define STATES_WAITING_FOR_CONDITION_VARIABLE  0x00800
-#define STATES_WAITING_FOR_JOIN_AT_EXIT        0x01000
-#define STATES_WAITING_FOR_RPC_REPLY           0x02000
-#define STATES_WAITING_FOR_PERIOD              0x04000
-#define STATES_WAITING_FOR_SIGNAL              0x08000
-#define STATES_INTERRUPTIBLE_BY_SIGNAL         0x10000
-
-#define STATES_LOCALLY_BLOCKED ( STATES_WAITING_FOR_BUFFER             | \
-                                 STATES_WAITING_FOR_SEGMENT            | \
-                                 STATES_WAITING_FOR_MESSAGE            | \
-                                 STATES_WAITING_FOR_SEMAPHORE          | \
-                                 STATES_WAITING_FOR_MUTEX              | \
-                                 STATES_WAITING_FOR_CONDITION_VARIABLE | \
-                                 STATES_WAITING_FOR_JOIN_AT_EXIT       | \
-                                 STATES_WAITING_FOR_SIGNAL             )
-
-#define STATES_WAITING_ON_THREAD_QUEUE \
-                               ( STATES_LOCALLY_BLOCKED         | \
-                                 STATES_WAITING_FOR_RPC_REPLY   )
-
-#define STATES_BLOCKED         ( STATES_DELAYING                | \
-                                 STATES_WAITING_FOR_TIME        | \
-                                 STATES_WAITING_FOR_PERIOD      | \
-                                 STATES_WAITING_FOR_EVENT       | \
-                                 STATES_WAITING_ON_THREAD_QUEUE | \
-                                 STATES_INTERRUPTIBLE_BY_SIGNAL )
-
-#ifndef __RTEMS_APPLICATION__
-#include <rtems/score/states.inl>
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/cpukit/score/include/rtems/score/sysstate.h b/cpukit/score/include/rtems/score/sysstate.h
deleted file mode 100644
index 8451894e97..0000000000
--- a/cpukit/score/include/rtems/score/sysstate.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*  sysstates.h
- *
- *  This include file contains information regarding the system state.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_SYSTEM_STATE_h
-#define __RTEMS_SYSTEM_STATE_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* types */
-
-/* enumerated constants */
-
-/*
- *  The following type defines the possible system states.
- */
-
-typedef enum {
-  SYSTEM_STATE_BEFORE_INITIALIZATION,   /* start -> end of 1st init part */
-  SYSTEM_STATE_BEFORE_MULTITASKING,     /* end of 1st -> beginning of 2nd */
-  SYSTEM_STATE_BEGIN_MULTITASKING,      /* just before multitasking starts */
-  SYSTEM_STATE_UP,                      /* normal operation */
-  SYSTEM_STATE_SHUTDOWN,                /* shutdown */
-  SYSTEM_STATE_FAILED                   /* fatal error occurred */
-} System_state_Codes;
-
-#define SYSTEM_STATE_CODES_FIRST SYSTEM_STATE_BEFORE_INITIALIZATION
-#define SYSTEM_STATE_CODES_LAST  SYSTEM_STATE_FAILED
-
-/*
- *  The following variable indicates whether or not this is 
- *  an multiprocessing system.
- */
- 
-SCORE_EXTERN boolean _System_state_Is_multiprocessing;
-
-/*
- *  The following variable contains the current system state.
- */
-
-SCORE_EXTERN System_state_Codes _System_state_Current;
-
-/*
- *  Make it possible for the application to get the system state information.
- */
-
-#include <rtems/score/sysstate.inl>
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/cpukit/score/include/rtems/score/thread.h b/cpukit/score/include/rtems/score/thread.h
deleted file mode 100644
index da6fa76bd0..0000000000
--- a/cpukit/score/include/rtems/score/thread.h
+++ /dev/null
@@ -1,622 +0,0 @@
-/*  thread.h
- *
- *  This include file contains all constants and structures associated
- *  with the thread control block.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __THREAD_h
-#define __THREAD_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/context.h>
-#include <rtems/score/cpu.h>
-#include <rtems/score/mppkt.h>
-#include <rtems/score/object.h>
-#include <rtems/score/priority.h>
-#include <rtems/score/stack.h>
-#include <rtems/score/states.h>
-#include <rtems/score/tod.h>
-#include <rtems/score/tqdata.h>
-#include <rtems/score/watchdog.h>
-
-/*
- *  The following defines the "return type" of a thread.
- */
-
-typedef void Thread;
-
-/*
- *  The following defines the ways in which the entry point for a
- *  thread can be invoked.  Basically, it can be passed any
- *  combination/permutation of a pointer and an unsigned32 value.
- *
- *  NOTE: For now, we are ignoring the return type.
- */
-
-typedef enum {
-  THREAD_START_NUMERIC,
-  THREAD_START_POINTER,
-  THREAD_START_BOTH_POINTER_FIRST,
-  THREAD_START_BOTH_NUMERIC_FIRST
-} Thread_Start_types;
-
-typedef Thread ( *Thread_Entry )();   /* basic type */
-
-typedef Thread ( *Thread_Entry_numeric )( unsigned32 );
-typedef Thread ( *Thread_Entry_pointer )( void * );
-typedef Thread ( *Thread_Entry_both_pointer_first )( void *, unsigned32 );
-typedef Thread ( *Thread_Entry_both_numeric_first )( unsigned32, void * );
-
-/*
- *  The following lists the algorithms used to manage the thread cpu budget.
- *
- *  Reset Timeslice:   At each context switch, reset the time quantum.
- *  Exhaust Timeslice: Only reset the quantum once it is consumed.
- *  Callout:           Execute routine when budget is consumed.
- */
-
-typedef enum {
-  THREAD_CPU_BUDGET_ALGORITHM_NONE,
-  THREAD_CPU_BUDGET_ALGORITHM_RESET_TIMESLICE,
-  THREAD_CPU_BUDGET_ALGORITHM_EXHAUST_TIMESLICE,
-  THREAD_CPU_BUDGET_ALGORITHM_CALLOUT
-}  Thread_CPU_budget_algorithms;
-
-typedef struct Thread_Control_struct Thread_Control;
-
-typedef void (*Thread_CPU_budget_algorithm_callout )( Thread_Control * );
-
-/*
- *  The following structure contains the information which defines
- *  the starting state of a thread.
- */
-
-typedef struct {
-  Thread_Entry         entry_point;      /* starting thread address         */
-  Thread_Start_types   prototype;        /* how task is invoked             */
-  void                *pointer_argument; /* pointer argument                */
-  unsigned32           numeric_argument; /* numeric argument                */
-                                         /* initial execution modes         */
-  boolean              is_preemptible;
-  Thread_CPU_budget_algorithms          budget_algorithm;
-  Thread_CPU_budget_algorithm_callout   budget_callout;
-  unsigned32           isr_level;
-  Priority_Control     initial_priority; /* initial priority                */
-  boolean              core_allocated_stack;
-  Stack_Control        Initial_stack;    /* stack information               */
-  void                *fp_context;       /* initial FP context area address */
-  void                *stack;            /* initial stack area address      */
-}   Thread_Start_information;
-
-/*
- *  The following structure contains the information necessary to manage
- *  a thread which it is  waiting for a resource.
- */
-
-#define THREAD_STATUS_PROXY_BLOCKING 0x1111111
-
-typedef struct {
-  Objects_Id            id;              /* waiting on this object       */
-  unsigned32            count;           /* "generic" fields to be used */
-  void                 *return_argument; /*   when blocking */
-  void                 *return_argument_1;
-  unsigned32            option;
-
-  /*
-   *  NOTE: The following assumes that all API return codes can be
-   *        treated as an unsigned32.  
-   */
-  unsigned32            return_code;     /* status for thread awakened   */
-
-  Chain_Control         Block2n;         /* 2 - n priority blocked chain */
-  Thread_queue_Control *queue;           /* pointer to thread queue      */
-}   Thread_Wait_information;
-
-/*
- *  The following defines the control block used to manage
- *  each thread proxy.
- *
- *  NOTE: It is critical that proxies and threads have identical
- *        memory images for the shared part.
- */
-
-typedef struct {
-  Objects_Control          Object;
-  States_Control           current_state;
-  Priority_Control         current_priority;
-  Priority_Control         real_priority;
-  unsigned32               resource_count;
-  Thread_Wait_information  Wait;
-  Watchdog_Control         Timer;
-  MP_packet_Prefix        *receive_packet;
-     /****************** end of common block ********************/
-  Chain_Node               Active;
-}   Thread_Proxy_control;
-
-
-/*
- *  The following record defines the control block used
- *  to manage each thread.
- *
- *  NOTE: It is critical that proxies and threads have identical
- *        memory images for the shared part.
- */
-
-typedef enum {
-  THREAD_API_RTEMS,
-  THREAD_API_POSIX
-}  Thread_APIs;
-
-#define THREAD_API_FIRST THREAD_API_RTEMS
-#define THREAD_API_LAST  THREAD_API_POSIX
-
-struct Thread_Control_struct {
-  Objects_Control                       Object;
-  States_Control                        current_state;
-  Priority_Control                      current_priority;
-  Priority_Control                      real_priority;
-  unsigned32                            resource_count;
-  Thread_Wait_information               Wait;
-  Watchdog_Control                      Timer;
-  MP_packet_Prefix                     *receive_packet;
-     /****************** end of common block ********************/
-  boolean                               is_global;
-  boolean                               do_post_task_switch_extension;
-
-  boolean                               is_preemptible;
-  unsigned32                            cpu_time_budget;
-  Thread_CPU_budget_algorithms          budget_algorithm;
-  Thread_CPU_budget_algorithm_callout   budget_callout;
-
-  unsigned32                            ticks_executed;
-  Chain_Control                        *ready;
-  Priority_Information                  Priority_map;
-  Thread_Start_information              Start;
-  Context_Control                       Registers;
-  void                                 *fp_context;
-  void                                 *API_Extensions[ THREAD_API_LAST + 1 ];
-  void                                **extensions;
-};
-
-/*
- *  The following defines the information control block used to
- *  manage this class of objects.
- */
- 
-SCORE_EXTERN Objects_Information _Thread_Internal_information;
- 
-/*
- *  The following define the thread control pointers used to access
- *  and manipulate the idle thread.
- */
- 
-SCORE_EXTERN Thread_Control *_Thread_Idle;
-
-/*
- *  The following context area contains the context of the "thread"
- *  which invoked the start multitasking routine.  This context is 
- *  restored as the last action of the stop multitasking routine.  Thus
- *  control of the processor can be returned to the environment
- *  which initiated the system.
- */
- 
-SCORE_EXTERN Context_Control _Thread_BSP_context;
- 
-/*
- *  The following declares the dispatch critical section nesting
- *  counter which is used to prevent context switches at inopportune
- *  moments.
- */
-
-SCORE_EXTERN unsigned32 _Thread_Dispatch_disable_level;
-
-/*
- *  If this is non-zero, then the post-task switch extension
- *  is run regardless of the state of the per thread flag.
- */
-
-SCORE_EXTERN unsigned32 _Thread_Do_post_task_switch_extension;
-
-/*
- *  The following holds how many user extensions are in the system.  This
- *  is used to determine how many user extension data areas to allocate
- *  per thread.
- */
-
-SCORE_EXTERN unsigned32 _Thread_Maximum_extensions;
-
-/*
- *  The following is used to manage the length of a timeslice quantum.
- */
-
-SCORE_EXTERN unsigned32 _Thread_Ticks_per_timeslice;
-
-/*
- *  The following points to the array of FIFOs used to manage the
- *  set of ready threads.
- */
-
-SCORE_EXTERN Chain_Control *_Thread_Ready_chain;
-
-/*
- *  The following points to the thread which is currently executing.
- *  This thread is implicitly manipulated by numerous directives.
- */
-
-SCORE_EXTERN Thread_Control *_Thread_Executing;
-
-/*
- *  The following points to the highest priority ready thread
- *  in the system.  Unless the current thread is not preemptibl,
- *  then this thread will be context switched to when the next
- *  dispatch occurs.
- */
-
-SCORE_EXTERN Thread_Control *_Thread_Heir;
-
-/*
- *  The following points to the thread whose floating point
- *  context is currently loaded.
- */
-
-SCORE_EXTERN Thread_Control *_Thread_Allocated_fp;
-
-/*
- *  _Thread_Handler_initialization
- *
- *  DESCRIPTION:
- *
- *  This routine performs the initialization necessary for this handler.
- */
-
-void _Thread_Handler_initialization (
-  unsigned32   ticks_per_timeslice,
-  unsigned32   maximum_extensions,
-  unsigned32   maximum_proxies
-);
-
-/*
- *  _Thread_Create_idle
- *
- *  DESCRIPTION:
- *
- *  This routine creates the idle thread.
- *
- *  WARNING!! No thread should be created before this one.
- */
- 
-void _Thread_Create_idle( void );
-
-/*
- *  _Thread_Start_multitasking
- *
- *  DESCRIPTION:
- *
- *  This routine initiates multitasking.  It is invoked only as
- *  part of initialization and its invocation is the last act of
- *  the non-multitasking part of the system initialization.
- */
-
-void _Thread_Start_multitasking( void );
-
-/*
- *  _Thread_Dispatch
- *
- *  DESCRIPTION:
- *
- *  This routine is responsible for transferring control of the
- *  processor from the executing thread to the heir thread.  As part
- *  of this process, it is responsible for the following actions:
- *
- *     + saving the context of the executing thread
- *     + restoring the context of the heir thread
- *     + dispatching any signals for the resulting executing thread
- */
-
-void _Thread_Dispatch( void );
-
-/*
- *  _Thread_Initialize
- *
- *  DESCRIPTION:
- *
- *  XXX
- *
- *  NOTES:
- *
- *  If stack_area is NULL, it is allocated from the workspace.
- *
- *  If the stack is allocated from the workspace, then it is guaranteed to be
- *  of at least minimum size.
- */
-
-boolean _Thread_Initialize(
-  Objects_Information                  *information,
-  Thread_Control                       *the_thread,
-  void                                 *stack_area,
-  unsigned32                            stack_size,
-  boolean                               is_fp,
-  Priority_Control                      priority,
-  boolean                               is_preemptible,
-  Thread_CPU_budget_algorithms          budget_algorithm,
-  Thread_CPU_budget_algorithm_callout   budget_callout,
-  unsigned32                            isr_level,
-  Objects_Name                          name
-);
-
-/*
- *  _Thread_Start
- *
- *  DESCRIPTION:
- *
- *  XXX
- */
- 
-boolean _Thread_Start(
-  Thread_Control           *the_thread,
-  Thread_Start_types        the_prototype,
-  void                     *entry_point,
-  void                     *pointer_argument,
-  unsigned32                numeric_argument
-);
-
-/*
- *  _Thread_Restart
- *
- *  DESCRIPTION:
- *
- *  XXX
- */
- 
-/* XXX multiple task arg profiles */
- 
-boolean _Thread_Restart(
-  Thread_Control           *the_thread,
-  void                     *pointer_argument,
-  unsigned32                numeric_argument
-);
-
-/*
- *  _Thread_Close
- *
- *  DESCRIPTION:
- *
- *  XXX
- */
- 
-void _Thread_Close(
-  Objects_Information  *information,
-  Thread_Control       *the_thread
-);
-
-/*
- *  _Thread_Ready
- *
- *  DESCRIPTION:
- *
- *  This routine removes any set states for the_thread.  It performs
- *  any necessary scheduling operations including the selection of
- *  a new heir thread.
- */
-
-void _Thread_Ready(
-  Thread_Control *the_thread
-);
-
-/*
- *  _Thread_Clear_state
- *
- *  DESCRIPTION:
- *
- *  This routine clears the indicated STATES for the_thread.  It performs
- *  any necessary scheduling operations including the selection of
- *  a new heir thread.
- */
-
-void _Thread_Clear_state(
-  Thread_Control *the_thread,
-  States_Control  state
-);
-
-/*
- *  _Thread_Set_state
- *
- *  DESCRIPTION:
- *
- *  This routine sets the indicated states for the_thread.  It performs
- *  any necessary scheduling operations including the selection of
- *  a new heir thread.
- *
- */
-
-void _Thread_Set_state(
-  Thread_Control *the_thread,
-  States_Control  state
-);
-
-/*
- *  _Thread_Set_transient
- *
- *  DESCRIPTION:
- *
- *  This routine sets the TRANSIENT state for the_thread.  It performs
- *  any necessary scheduling operations including the selection of
- *  a new heir thread.
- */
-
-void _Thread_Set_transient(
-  Thread_Control *the_thread
-);
-
-/*
- *  _Thread_Reset_timeslice
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked upon expiration of the currently
- *  executing thread's timeslice.  If no other thread's are ready
- *  at the priority of the currently executing thread, then the
- *  executing thread's timeslice is reset.  Otherwise, the
- *  currently executing thread is placed at the rear of the
- *  FIFO for this priority and a new heir is selected.
- */
-
-void _Thread_Reset_timeslice( void );
-
-/*
- *  _Thread_Tickle_timeslice
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked as part of processing each clock tick.
- *  It is responsible for determining if the current thread allows
- *  timeslicing and, if so, when its timeslice expires.
- */
-
-void _Thread_Tickle_timeslice( void );
-
-/*
- *  _Thread_Yield_processor
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked when a thread wishes to voluntarily
- *  transfer control of the processor to another thread of equal
- *  or greater priority.
- */
-
-void _Thread_Yield_processor( void );
-
-/*
- *  _Thread_Load_environment
- *
- *  DESCRIPTION:
- *
- *  This routine initializes the context of the_thread to its
- *  appropriate starting state.
- */
-
-void _Thread_Load_environment(
-  Thread_Control *the_thread
-);
-
-/*
- *  _Thread_Handler
- *
- *  DESCRIPTION:
- *
- *  This routine is the wrapper function for all threads.  It is
- *  the starting point for all threads.  The user provided thread
- *  entry point is invoked by this routine.  Operations
- *  which must be performed immediately before and after the user's
- *  thread executes are found here.
- */
-
-void _Thread_Handler( void );
-
-/*
- *  _Thread_Delay_ended
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked when a thread must be unblocked at the
- *  end of a time based delay (i.e. wake after or wake when).
- */
-
-void _Thread_Delay_ended(
-  Objects_Id  id,
-  void       *ignored
-);
-
-/*
- *  _Thread_Change_priority
- *
- *  DESCRIPTION:
- *
- *  This routine changes the current priority of the_thread to
- *  new_priority.  It performs any necessary scheduling operations
- *  including the selection of a new heir thread.
- */
-
-void _Thread_Change_priority (
-  Thread_Control   *the_thread,
-  Priority_Control  new_priority,
-  boolean           prepend_it
-);
-
-/*
- *  _Thread_Set_priority
- *
- *  DESCRIPTION:
- *
- *  This routine updates the priority related fields in the_thread
- *  control block to indicate the current priority is now new_priority.
- */
-
-void _Thread_Set_priority(
-  Thread_Control   *the_thread,
-  Priority_Control  new_priority
-);
-
-/*
- *  _Thread_Evaluate_mode
- *
- *  DESCRIPTION:
- *
- *  This routine XXX
- */
-
-boolean _Thread_Evaluate_mode( void );
-
-/*
- *  _Thread_Get
- *
- *  NOTE:  If we are not using static inlines, this must be a real
- *         subroutine call.
- */
- 
-#ifndef USE_INLINES
-Thread_Control *_Thread_Get (
-  Objects_Id           id,
-  Objects_Locations   *location
-);
-#endif
-
-/*
- *  _Thread_Idle_body
- *
- *  DESCRIPTION:
- *
- *  This routine is the body of the system idle thread.
- */
- 
-#if (CPU_PROVIDES_IDLE_THREAD_BODY == FALSE)
-Thread _Thread_Idle_body(
-  unsigned32 ignored
-);
-#endif
-
-#ifndef __RTEMS_APPLICATION__
-#include <rtems/score/thread.inl>
-#endif
-#include <rtems/score/threadmp.h>
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/cpukit/score/include/rtems/score/threadmp.h b/cpukit/score/include/rtems/score/threadmp.h
deleted file mode 100644
index 497bdc8c5b..0000000000
--- a/cpukit/score/include/rtems/score/threadmp.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*  threadmp.h
- *
- *  This include file contains the specification for all routines
- *  and data specific to the multiprocessing portion of the thread package.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_THREAD_MP_h
-#define __RTEMS_THREAD_MP_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- *  _Thread_MP_Handler_initialization
- *
- *  DESCRIPTION:
- *
- *  This routine initializes the multiprocessing portion of the Thread Handler.
- */
-
-void _Thread_MP_Handler_initialization (
-  unsigned32 maximum_proxies
-);
-
-/*
- *  _Thread_MP_Allocate_proxy
- *
- *  DESCRIPTION:
- *
- *  This  allocates a proxy control block from
- *  the inactive chain of free proxy control blocks.
- *
- *  NOTE: This function returns a thread control pointer
- *        because proxies are substitutes for remote threads.
- */
-
-Thread_Control *_Thread_MP_Allocate_proxy (
-  States_Control the_state
-);
-
-/*
- *  _Thread_MP_Find_proxy
- *
- *  DESCRIPTION:
- *
- *  This function removes the proxy control block for the specified
- *  id from the active chain of proxy control blocks.
- */
-
-Thread_Control *_Thread_MP_Find_proxy (
-  Objects_Id the_id
-);
-
-/*
- *  The following is used to determine when the multiprocessing receive
- *  thread is executing so that a proxy can be allocated instead of
- *  blocking the multiprocessing receive thread.
- */
-
-SCORE_EXTERN Thread_Control *_Thread_MP_Receive;
-
-/*
- * The following chains are used to manage proxies.
- */
-
-SCORE_EXTERN Chain_Control _Thread_MP_Active_proxies;
-SCORE_EXTERN Chain_Control _Thread_MP_Inactive_proxies;
-
-#ifndef __RTEMS_APPLICATION__
-#include <rtems/score/threadmp.inl>
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/cpukit/score/include/rtems/score/threadq.h b/cpukit/score/include/rtems/score/threadq.h
deleted file mode 100644
index d3a0f58ad1..0000000000
--- a/cpukit/score/include/rtems/score/threadq.h
+++ /dev/null
@@ -1,301 +0,0 @@
-/*  threadq.h
- *
- *  This include file contains all the constants and structures associated
- *  with the manipulation of objects.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __THREAD_QUEUE_h
-#define __THREAD_QUEUE_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/tqdata.h>
-
-#include <rtems/score/object.h>
-#include <rtems/score/thread.h>
-#include <rtems/score/watchdog.h>
-
-/*
- *  Constant for indefinite wait.
- */
- 
-#define THREAD_QUEUE_WAIT_FOREVER  WATCHDOG_NO_TIMEOUT
-
-/*
- *  The following type defines the callout used when a remote task
- *  is extracted from a local thread queue.
- */
-
-typedef void ( *Thread_queue_Flush_callout )(
-                 Thread_Control *
-             );
-
-/*
- *  The following type defines the callout used when a local task
- *  is extracted from a remote thread queue (i.e. it's proxy must
- *  extracted from the remote queue).
- */
- 
-typedef void ( *Thread_queue_Extract_callout )(
-                 Thread_Control *
-             );
-
-SCORE_EXTERN Thread_queue_Extract_callout  
-  _Thread_queue_Extract_table[ OBJECTS_CLASSES_LAST + 1 ];
-
-/*
- *  _Thread_queue_Dequeue
- *
- *  DESCRIPTION:
- *
- *  This function returns a pointer to a thread waiting on
- *  the_thread_queue.  The selection of this thread is based on
- *  the discipline of the_thread_queue.  If no threads are waiting
- *  on the_thread_queue, then NULL is returned.
- */
-
-Thread_Control *_Thread_queue_Dequeue(
-  Thread_queue_Control *the_thread_queue
-);
-
-/*
- *  _Thread_queue_Enqueue
- *
- *  DESCRIPTION:
- *
- *  This routine enqueues the currently executing thread on
- *  the_thread_queue with an optional timeout.
- */
-
-void _Thread_queue_Enqueue(
-  Thread_queue_Control *the_thread_queue,
-  Watchdog_Interval     timeout
-);
-
-/*
- *  _Thread_queue_Extract
- *
- *  DESCRIPTION:
- *
- *  This routine removes the_thread from the_thread_queue
- *  and cancels any timeouts associated with this blocking.
- */
-
-void _Thread_queue_Extract(
-  Thread_queue_Control *the_thread_queue,
-  Thread_Control       *the_thread
-);
-
-/*
- *  _Thread_queue_Extract_with_proxy
- *
- *  DESCRIPTION:
- *
- *  This routine extracts the_thread from the_thread_queue
- *  and insures that if there is a proxy for this task on 
- *  another node, it is also dealt with.
- */
- 
-boolean _Thread_queue_Extract_with_proxy(
-  Thread_Control       *the_thread
-);
-
-/*
- *  _Thread_queue_First
- *
- *  DESCRIPTION:
- *
- *  This function returns a pointer to the "first" thread
- *  on the_thread_queue.  The "first" thread is selected
- *  based on the discipline of the_thread_queue.
- */
-
-Thread_Control *_Thread_queue_First(
-  Thread_queue_Control *the_thread_queue
-);
-
-/*
- *  _Thread_queue_Flush
- *
- *  DESCRIPTION:
- *
- *  This routine unblocks all threads blocked on the_thread_queue
- *  and cancels any associated timeouts.
- */
-
-void _Thread_queue_Flush(
-  Thread_queue_Control       *the_thread_queue,
-  Thread_queue_Flush_callout  remote_extract_callout,
-  unsigned32                  status
-);
-
-/*
- *  _Thread_queue_Initialize
- *
- *  DESCRIPTION:
- *
- *  This routine initializes the_thread_queue based on the
- *  discipline indicated in attribute_set.  The state set on
- *  threads which block on the_thread_queue is state.
- */
-
-void _Thread_queue_Initialize(
-  Thread_queue_Control         *the_thread_queue,
-  Objects_Classes               the_class,
-  Thread_queue_Disciplines      the_discipline,
-  States_Control                state,
-  Thread_queue_Extract_callout  proxy_extract_callout,
-  unsigned32                    timeout_status
-);
-
-/*
- *  _Thread_queue_Dequeue_priority
- *
- *  DESCRIPTION:
- *
- *  This function returns a pointer to the highest priority
- *  thread waiting on the_thread_queue.  If no threads are waiting
- *  on the_thread_queue, then NULL is returned.
- */
-
-Thread_Control *_Thread_queue_Dequeue_priority(
-  Thread_queue_Control *the_thread_queue
-);
-
-/*
- *  _Thread_queue_Enqueue_priority
- *
- *  DESCRIPTION:
- *
- *  This routine enqueues the currently executing thread on
- *  the_thread_queue with an optional timeout using the
- *  priority discipline.
- */
-
-void _Thread_queue_Enqueue_priority(
-  Thread_queue_Control *the_thread_queue,
-  Thread_Control       *the_thread,
-  Watchdog_Interval     timeout
-);
-
-/*
- *  _Thread_queue_Extract_priority
- *
- *  DESCRIPTION:
- *
- *  This routine removes the_thread from the_thread_queue
- *  and cancels any timeouts associated with this blocking.
- */
-
-void _Thread_queue_Extract_priority(
-  Thread_queue_Control *the_thread_queue,
-  Thread_Control       *the_thread
-);
-
-/*
- *  _Thread_queue_First_priority
- *
- *  DESCRIPTION:
- *
- *  This function returns a pointer to the "first" thread
- *  on the_thread_queue.  The "first" thread is the highest
- *  priority thread waiting on the_thread_queue.
- */
-
-Thread_Control *_Thread_queue_First_priority(
-  Thread_queue_Control *the_thread_queue
-);
-
-/*
- *  _Thread_queue_Dequeue_FIFO
- *
- *  DESCRIPTION:
- *
- *  This function returns a pointer to the thread which has
- *  been waiting the longest on  the_thread_queue.  If no
- *  threads are waiting on the_thread_queue, then NULL is returned.
- */
-
-Thread_Control *_Thread_queue_Dequeue_fifo(
-  Thread_queue_Control *the_thread_queue
-);
-
-/*
- *  _Thread_queue_Enqueue_FIFO
- *
- *  DESCRIPTION:
- *
- *  This routine enqueues the currently executing thread on
- *  the_thread_queue with an optional timeout using the
- *  FIFO discipline.
- */
-
-void _Thread_queue_Enqueue_fifo(
-  Thread_queue_Control *the_thread_queue,
-  Thread_Control       *the_thread,
-  Watchdog_Interval     timeout
-);
-
-/*
- *  _Thread_queue_Extract_FIFO
- *
- *  DESCRIPTION:
- *
- *  This routine removes the_thread from the_thread_queue
- *  and cancels any timeouts associated with this blocking.
- */
-
-void _Thread_queue_Extract_fifo(
-  Thread_queue_Control *the_thread_queue,
-  Thread_Control       *the_thread
-);
-
-/*
- *  _Thread_queue_First_FIFO
- *
- *  DESCRIPTION:
- *
- *  This function returns a pointer to the "first" thread
- *  on the_thread_queue.  The first thread is the thread
- *  which has been waiting longest on the_thread_queue.
- */
-
-Thread_Control *_Thread_queue_First_fifo(
-  Thread_queue_Control *the_thread_queue
-);
-
-/*
- *  _Thread_queue_timeout
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked when a task's request has not
- *  been satisfied after the timeout interval specified to
- *  enqueue.  The task represented by ID will be unblocked and
- *  its status code will be set in it's control block to indicate
- *  that a timeout has occurred.
- */
-
-void _Thread_queue_Timeout (
-  Objects_Id  id,
-  void       *ignored
-);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/cpukit/score/include/rtems/score/tod.h b/cpukit/score/include/rtems/score/tod.h
deleted file mode 100644
index b87486bda1..0000000000
--- a/cpukit/score/include/rtems/score/tod.h
+++ /dev/null
@@ -1,277 +0,0 @@
-/*  tod.h
- *
- *  This include file contains all the constants and structures associated
- *  with the Time of Day Handler.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __TIME_OF_DAY_h
-#define __TIME_OF_DAY_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/object.h>
-#include <rtems/score/watchdog.h>
-
-/*
- *  The following constants are related to the time of day.
- */
-
-#define TOD_SECONDS_PER_MINUTE 60
-#define TOD_MINUTES_PER_HOUR   60
-#define TOD_MONTHS_PER_YEAR    12
-#define TOD_DAYS_PER_YEAR      365
-#define TOD_HOURS_PER_DAY      24
-#define TOD_SECONDS_PER_DAY    (TOD_SECONDS_PER_MINUTE * \
-                                TOD_MINUTES_PER_HOUR   * \
-                                TOD_HOURS_PER_DAY)
-
-#define TOD_SECONDS_PER_NON_LEAP_YEAR (365 * TOD_SECONDS_PER_DAY)
-
-#define TOD_MILLISECONDS_PER_SECOND     1000
-#define TOD_MICROSECONDS_PER_SECOND     1000000
-#define TOD_NANOSECONDS_PER_SECOND      1000000000
-#define TOD_NANOSECONDS_PER_MICROSECOND 1000
-
-/*
- *  The following constant define the earliest year to which an
- *  time of day can be initialized.  This is considered the
- *  epoch.
- */
-
-#define TOD_BASE_YEAR 1988
-
-/*
- *  The following record defines the time of control block.  This
- *  control block is used to maintain the current time of day.
- */
-
-typedef struct {                   /* RTEID style time/date */
-  unsigned32 year;                 /* year, A.D. */
-  unsigned32 month;                /* month, 1 -> 12 */
-  unsigned32 day;                  /* day, 1 -> 31 */
-  unsigned32 hour;                 /* hour, 0 -> 23 */
-  unsigned32 minute;               /* minute, 0 -> 59 */
-  unsigned32 second;               /* second, 0 -> 59 */
-  unsigned32 ticks;                /* elapsed ticks between secs */
-}   TOD_Control;
-
-/*
- *  The following is TRUE if the application has set the current
- *  time of day, and FALSE otherwise.
- */
-
-SCORE_EXTERN boolean _TOD_Is_set;
-
-/*
- *  The following contains the current time of day.
- */
-
-SCORE_EXTERN TOD_Control _TOD_Current;
-
-/*
- *  The following contains the number of seconds from 00:00:00
- *  January 1, TOD_BASE_YEAR until the current time of day.
- */
-
-SCORE_EXTERN Watchdog_Interval _TOD_Seconds_since_epoch;
-
-/*
- *  The following contains the number of microseconds per tick.
- */
-
-SCORE_EXTERN unsigned32 _TOD_Microseconds_per_tick;
-
-/*
- *  The following contains the number of clock ticks per second.
- *
- *  NOTE:
- *
- *  If one second is NOT evenly divisible by the number of microseconds
- *  per clock tick, this value will contain only the integer portion
- *  of the division.  This means that the interval between clock ticks
- *  can be a source of error in the current time of day.
- */
-
-SCORE_EXTERN unsigned32 _TOD_Ticks_per_second;
-
-/*
- *  This is the control structure for the watchdog timer which
- *  fires to service the seconds chain.
- */
-
-SCORE_EXTERN Watchdog_Control _TOD_Seconds_watchdog;
-
-#ifdef SCORE_INIT
-
-/*
- *  The following array contains the number of days in all months.
- *  The first dimension should be 1 for leap years, and 0 otherwise.
- *  The second dimension should range from 1 to 12 for January to
- *  February, respectively.
- */
-
-const unsigned32 _TOD_Days_per_month[ 2 ][ 13 ] = {
-  { 0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 },
-  { 0, 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }
-};
-
-/*
- *  The following array contains the number of days in all months
- *  up to the month indicated by the index of the second dimension.
- *  The first dimension should be 1 for leap years, and 0 otherwise.
- */
-
-const unsigned16 _TOD_Days_to_date[2][13] = {
-  { 0, 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334 },
-  { 0, 0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335 }
-};
-
-/*
- *  The following array contains the number of days in the years
- *  since the last leap year.  The index should be 0 for leap
- *  years, and the number of years since the beginning of a leap
- *  year otherwise.
- */
-
-const unsigned16 _TOD_Days_since_last_leap_year[4] = { 0, 366, 731, 1096 };
-
-#else
-
-extern const unsigned16 _TOD_Days_to_date[2][13]; /* Julian days */
-extern const unsigned16 _TOD_Days_since_last_leap_year[4];
-extern const unsigned32 _TOD_Days_per_month[2][13];
-
-#endif
-
-/*
- *  _TOD_Handler_initialization
- *
- *  DESCRIPTION:
- *
- *  This routine performs the initialization necessary for this handler.
- */
-
-void _TOD_Handler_initialization(
-  unsigned32 microseconds_per_tick
-);
-
-/*
- *  _TOD_Set
- *
- *  DESCRIPTION:
- *
- *  This routine sets the current time of day to THE_TOD and
- *  the equivalent SECONDS_SINCE_EPOCH.
- */
-
-void _TOD_Set(
-  TOD_Control       *the_tod,
-  Watchdog_Interval  seconds_since_epoch
-);
-
-/*
- *  _TOD_Validate
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if THE_TOD contains
- *  a valid time of day, and FALSE otherwise.
- */
-
-boolean _TOD_Validate(
-  TOD_Control *the_tod
-);
-
-/*
- *  _TOD_To_seconds
- *
- *  DESCRIPTION:
- *
- *  This function returns the number seconds between the epoch and THE_TOD.
- */
-
-Watchdog_Interval _TOD_To_seconds(
-  TOD_Control *the_tod
-);
-
-/*
- *  _TOD_Tickle
- *
- *  DESCRIPTION:
- *
- *  This routine is scheduled as a watchdog function and is invoked at
- *  each second boundary.  It updates the current time of day to indicate
- *  that a second has passed and processes the seconds watchdog chain.
- */
-
-void _TOD_Tickle(
-  Objects_Id  id,
-  void       *ignored
-);
-
-/*
- *  TOD_MILLISECONDS_TO_MICROSECONDS
- *
- *  DESCRIPTION:
- *
- *  This routine converts an interval expressed in milliseconds to microseconds.
- *
- *  NOTE:
- *
- *  This must be a macro so it can be used in "static" tables.
- */
-
-#define TOD_MILLISECONDS_TO_MICROSECONDS(_ms) ((_ms) * 1000)
-
-/*
- *  TOD_MICROSECONDS_TO_TICKS
- *
- *  DESCRIPTION:
- *
- *  This routine converts an interval expressed in microseconds to ticks.
- *
- *  NOTE:
- *
- *  This must be a macro so it can be used in "static" tables.
- */
-
-#define TOD_MICROSECONDS_TO_TICKS(_us) \
-    ((_us) / _TOD_Microseconds_per_tick)
-
-/*
- *  TOD_MILLISECONDS_TO_TICKS
- *
- *  DESCRIPTION:
- *
- *  This routine converts an interval expressed in milliseconds to ticks.
- *
- *  NOTE:
- *
- *  This must be a macro so it can be used in "static" tables.
- */
-
-#define TOD_MILLISECONDS_TO_TICKS(_ms) \
-    (TOD_MILLISECONDS_TO_MICROSECONDS(_ms) / _TOD_Microseconds_per_tick)
-
-#ifndef __RTEMS_APPLICATION__
-#include <rtems/score/tod.inl>
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/cpukit/score/include/rtems/score/tqdata.h b/cpukit/score/include/rtems/score/tqdata.h
deleted file mode 100644
index 6136d35412..0000000000
--- a/cpukit/score/include/rtems/score/tqdata.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*  tqdata.h
- *
- *  This include file contains all the constants and structures
- *  needed to declare a thread queue.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __THREAD_QUEUE_DATA_h
-#define __THREAD_QUEUE_DATA_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/chain.h>
-#include <rtems/score/priority.h>
-#include <rtems/score/states.h>
-
-/*
- *  The following enumerated type details all of the disciplines
- *  supported by the Thread Queue Handler.
- */
-
-typedef enum {
-  THREAD_QUEUE_DISCIPLINE_FIFO,     /* FIFO queue discipline */
-  THREAD_QUEUE_DISCIPLINE_PRIORITY  /* PRIORITY queue discipline */
-}   Thread_queue_Disciplines;
-
-/*
- *  The following enumerated types indicate what happened while the thread
- *  queue was in the synchronization window.
- */
- 
-typedef enum {
-  THREAD_QUEUE_SYNCHRONIZED,
-  THREAD_QUEUE_NOTHING_HAPPENED,
-  THREAD_QUEUE_TIMEOUT,
-  THREAD_QUEUE_SATISFIED
-}  Thread_queue_States;
-
-/*
- *  The following constants are used to manage the priority queues.
- *
- *  There are four chains used to maintain a priority -- each chain
- *  manages a distinct set of task priorities.  The number of chains
- *  is determined by TASK_QUEUE_DATA_NUMBER_OF_PRIORITY_HEADERS.
- *  The following set must be consistent.  
- *
- *  The set below configures 4 headers -- each contains 64 priorities.
- *  Header x manages priority range (x*64) through ((x*64)+63).  If
- *  the priority is more than half way through the priority range it
- *  is in, then the search is performed from the rear of the chain.
- *  This halves the search time to find the insertion point.
- */
-
-#define TASK_QUEUE_DATA_NUMBER_OF_PRIORITY_HEADERS 4   
-#define TASK_QUEUE_DATA_PRIORITIES_PER_HEADER      64
-#define TASK_QUEUE_DATA_REVERSE_SEARCH_MASK        0x20
-
-typedef struct {
-  union {
-    Chain_Control Fifo;                /* FIFO discipline list           */
-    Chain_Control Priority[TASK_QUEUE_DATA_NUMBER_OF_PRIORITY_HEADERS];
-                                       /* priority discipline list       */
-  } Queues;
-  Thread_queue_States      sync_state; /* alloc/dealloc critical section */
-  Thread_queue_Disciplines discipline; /* queue discipline               */
-  States_Control           state;      /* state of threads on Thread_q   */
-  unsigned32               timeout_status;
-}   Thread_queue_Control;
-
-#ifndef __RTEMS_APPLICATION__
-#include <rtems/score/tqdata.inl>
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/cpukit/score/include/rtems/score/userext.h b/cpukit/score/include/rtems/score/userext.h
deleted file mode 100644
index 29b0e9564e..0000000000
--- a/cpukit/score/include/rtems/score/userext.h
+++ /dev/null
@@ -1,211 +0,0 @@
-/*  userext.h
- *
- *  This include file contains all information about user extensions.  This
- *  Handler provides mechanisms which can be used to initialize and manipulate
- *  all user extensions.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __USER_EXTENSIONS_h
-#define __USER_EXTENSIONS_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/interr.h>
-#include <rtems/score/chain.h>
-#include <rtems/score/thread.h>
-
-/*
- *  The following records defines the User Extension Table.
- *  This table defines the application dependent routines which
- *  are invoked at critical points in the life of each thread and
- *  the system as a whole.
- */
- 
-typedef void User_extensions_routine;
- 
-typedef boolean ( *User_extensions_thread_create_extension )(
-                 Thread_Control *,
-                 Thread_Control *
-             );
- 
-typedef User_extensions_routine ( *User_extensions_thread_delete_extension )(
-                 Thread_Control *,
-                 Thread_Control *
-             );
- 
-typedef User_extensions_routine ( *User_extensions_thread_start_extension )(
-                 Thread_Control *,
-                 Thread_Control *
-             );
- 
-typedef User_extensions_routine ( *User_extensions_thread_restart_extension )(
-                 Thread_Control *,
-                 Thread_Control *
-             );
- 
-typedef User_extensions_routine ( *User_extensions_thread_switch_extension )(
-                 Thread_Control *,
-                 Thread_Control *
-             );
- 
-typedef User_extensions_routine (
-                                *User_extensions_thread_post_switch_extension )(
-                 Thread_Control *
-             );
- 
-typedef User_extensions_routine ( *User_extensions_thread_begin_extension )(
-                 Thread_Control *
-             );
- 
-typedef User_extensions_routine ( *User_extensions_thread_exitted_extension )(
-                 Thread_Control *
-             );
- 
-typedef User_extensions_routine ( *User_extensions_fatal_extension )(
-                 Internal_errors_Source  /* the_source  */,
-                 boolean                 /* is_internal */,
-                 unsigned32              /* the_error   */
-             );
-
- 
-typedef struct {
-  User_extensions_thread_create_extension       thread_create;
-  User_extensions_thread_start_extension        thread_start;
-  User_extensions_thread_restart_extension      thread_restart;
-  User_extensions_thread_delete_extension       thread_delete;
-  User_extensions_thread_switch_extension       thread_switch;
-  User_extensions_thread_begin_extension        thread_begin;
-  User_extensions_thread_exitted_extension      thread_exitted;
-  User_extensions_fatal_extension               fatal;
-}   User_extensions_Table;
-
-/*
- *  The following is used to manage each user extension set.
- */
-
-typedef struct {
-  Chain_Node              Node;
-  User_extensions_Table   Callouts;
-}   User_extensions_Control;
-
-/*
- *  The following is used to manage the list of active extensions.
- */
-
-SCORE_EXTERN Chain_Control _User_extensions_List;
-
-/*
- *  _User_extensions_Thread_create
- *
- *  DESCRIPTION:
- *
- *  This routine is used to invoke the user extension for
- *  the thread creation operate.
- */
-
-boolean _User_extensions_Thread_create (
-  Thread_Control *the_thread
-);
-
-/*
- *  _User_extensions_Thread_delete
- *
- *  DESCRIPTION:
- *
- *  This routine is used to invoke the user extension for
- *  the thread deletion operation.
- */
-
-void _User_extensions_Thread_delete (
-  Thread_Control *the_thread
-);
-
-/*
- *  _User_extensions_Thread_start
- *
- *  DESCRIPTION:
- *
- *  This routine is used to invoke the user extension for
- *  the thread start operation.
- */
-
-void _User_extensions_Thread_start (
-  Thread_Control *the_thread
-);
-
-/*
- *  _User_extensions_Thread_restart
- *
- *  DESCRIPTION:
- *
- *  This routine is used to invoke the user extension for
- *  the thread restart operation.
- */
-
-void _User_extensions_Thread_restart (
-  Thread_Control *the_thread
-);
-
-/*
- *  _User_extensions_Thread_begin
- *
- *  DESCRIPTION:
- *
- *  This routine is used to invoke the user extension which
- *  is invoked when a thread begins.
- */
-
-void _User_extensions_Thread_begin (
-  Thread_Control *executing
-);
-
-/*
- *  _User_extensions_Thread_exitted
- *
- *  DESCRIPTION:
- *
- *  This routine is used to invoke the user extension which
- *  is invoked when a thread exits.
- */
-
-void _User_extensions_Thread_exitted (
-  Thread_Control *executing
-);
-
-/*
- *  _User_extensions_Fatal
- *
- *  DESCRIPTION:
- *
- *  This routine is used to invoke the user extension invoked
- *  when a fatal error occurs.
- */
-
-void _User_extensions_Fatal (
-  Internal_errors_Source  the_source,
-  boolean                 is_internal,
-  unsigned32              the_error
-);
-
-#ifndef __RTEMS_APPLICATION__
-#include <rtems/score/userext.inl>
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/cpukit/score/include/rtems/score/watchdog.h b/cpukit/score/include/rtems/score/watchdog.h
deleted file mode 100644
index ceb09793f6..0000000000
--- a/cpukit/score/include/rtems/score/watchdog.h
+++ /dev/null
@@ -1,194 +0,0 @@
-/*  watchdog.h
- *
- *  This include file contains all the constants and structures associated
- *  with watchdog timers.   This Handler provides mechanisms which can be
- *   used to initialize and manipulate watchdog timers.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __WATCHDOG_h
-#define __WATCHDOG_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/object.h>
-
-/*
- *  The following type defines the control block used to manage
- *  intervals.
- */
-
-typedef unsigned32 Watchdog_Interval;
-
-/*
- *  The following types define a pointer to a watchdog service routine.
- */
-
-typedef void Watchdog_Service_routine;
-
-typedef Watchdog_Service_routine ( *Watchdog_Service_routine_entry )(
-                 Objects_Id,
-                 void *
-             );
-
-/*
- *  Constant for indefinite wait.  (actually an illegal interval)
- */
-
-#define WATCHDOG_NO_TIMEOUT  0
-
-/*
- *  The following enumerated type lists the states in which a
- *  watchdog timer may be at any given time.
- */
-
-typedef enum {
-  WATCHDOG_INACTIVE,       /* off all chains */
-  WATCHDOG_BEING_INSERTED, /* off all chains, searching for insertion point */
-  WATCHDOG_ACTIVE,         /* on chain, allowed to fire */
-  WATCHDOG_REMOVE_IT       /* on chain, remove without firing if expires */
-} Watchdog_States;
-
-/*
- *  The following enumerated type details the manner in which
- *  a watchdog chain may be adjusted by the Watchdog_Adjust
- *  routine.  The direction indicates a movement FORWARD
- *  or BACKWARD in time.
- */
-
-typedef enum {
-  WATCHDOG_FORWARD,      /* adjust delta value forward */
-  WATCHDOG_BACKWARD      /* adjust delta value backward */
-} Watchdog_Adjust_directions;
-
-/*
- *  The following record defines the control block used
- *  to manage each watchdog timer.
- */
-
-typedef struct {
-  Chain_Node                      Node;
-  Watchdog_States                 state;
-  Watchdog_Interval               initial;
-  Watchdog_Interval               delta_interval;
-  Watchdog_Interval               start_time;
-  Watchdog_Interval               stop_time;
-  Watchdog_Service_routine_entry  routine;
-  Objects_Id                      id;
-  void                           *user_data;
-}   Watchdog_Control;
-
-/*
- *  The following are used for synchronization purposes
- *  during an insert on a watchdog delta chain.
- */
-
-SCORE_EXTERN volatile unsigned32  _Watchdog_Sync_level;
-SCORE_EXTERN volatile unsigned32  _Watchdog_Sync_count;
-
-/*
- *  The following contains the number of ticks since the
- *  system was booted.
- */
-
-SCORE_EXTERN Watchdog_Interval _Watchdog_Ticks_since_boot;
-
-/*
- *  The following defines the watchdog chains which are managed
- *  on ticks and second boundaries.
- */
-
-SCORE_EXTERN Chain_Control _Watchdog_Ticks_chain;
-SCORE_EXTERN Chain_Control _Watchdog_Seconds_chain;
-
-/*
- *  _Watchdog_Handler_initialization
- *
- *  DESCRIPTION:
- *
- *  This routine initializes the watchdog handler.  The watchdog
- *  synchronization flag is initialized and the watchdog chains are
- *  initialized and emptied.
- */
-
-void _Watchdog_Handler_initialization( void );
-
-/*
- *  _Watchdog_Remove
- *
- *  DESCRIPTION:
- *
- *  This routine removes THE_WATCHDOG from the watchdog chain on which
- *  it resides and returns the state THE_WATCHDOG timer was in.
- */
-
-Watchdog_States _Watchdog_Remove (
-  Watchdog_Control *the_watchdog
-);
-
-/*
- *  _Watchdog_Adjust
- *
- *  DESCRIPTION:
- *
- *  This routine adjusts the HEADER watchdog chain in the forward
- *  or backward DIRECTION for UNITS ticks.
- */
-
-void _Watchdog_Adjust (
-  Chain_Control              *header,
-  Watchdog_Adjust_directions  direction,
-  Watchdog_Interval           units
-);
-
-/*
- *  _Watchdog_Insert
- *
- *  DESCRIPTION:
- *
- *  This routine inserts THE_WATCHDOG into the HEADER watchdog chain
- *  for a time of UNITS.  The INSERT_MODE indicates whether
- *  THE_WATCHDOG is to be activated automatically or later, explicitly
- *  by the caller.
- *
- */
-
-void _Watchdog_Insert (
-  Chain_Control         *header,
-  Watchdog_Control      *the_watchdog
-);
-
-/*
- *  _Watchdog_Tickle
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked at appropriate intervals to update
- *  the HEADER watchdog chain.
- */
-
-void _Watchdog_Tickle (
-  Chain_Control *header
-);
-
-#ifndef __RTEMS_APPLICATION__
-#include <rtems/score/watchdog.inl>
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/cpukit/score/include/rtems/score/wkspace.h b/cpukit/score/include/rtems/score/wkspace.h
deleted file mode 100644
index 3b4b84f95f..0000000000
--- a/cpukit/score/include/rtems/score/wkspace.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*  wkspace.h
- *
- *  This include file contains information related to the 
- *  RAM Workspace.  This Handler provides mechanisms which can be used to
- *  define, initialize and manipulate the workspace.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __WORKSPACE_h
-#define __WORKSPACE_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/heap.h>
-#include <rtems/score/interr.h>
-
-/*
- *  The following is used to manage the Workspace.
- *
- */
-
-SCORE_EXTERN Heap_Control _Workspace_Area;  /* executive heap header */
-
-/*
- *  _Workspace_Handler_initialization
- *
- *  DESCRIPTION:
- *
- *  This routine performs the initialization necessary for this handler.
- */
- 
-void _Workspace_Handler_initialization(
-  void       *starting_address,
-  unsigned32  size
-);
-
-/*
- *  _Workspace_Allocate_or_fatal_error
- *
- *  DESCRIPTION:
- *
- *  This routine returns the address of a block of memory of size
- *  bytes.  If a block of the appropriate size cannot be allocated
- *  from the workspace, then the internal error handler is invoked.
- */
-
-void *_Workspace_Allocate_or_fatal_error(
-  unsigned32   size
-);
-
-#ifndef __RTEMS_APPLICATION__
-#include <rtems/score/wkspace.inl>
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/cpukit/score/include/rtems/system.h b/cpukit/score/include/rtems/system.h
deleted file mode 100644
index 5e1cc80ed5..0000000000
--- a/cpukit/score/include/rtems/system.h
+++ /dev/null
@@ -1,153 +0,0 @@
-/*  system.h
- *
- *  This include file contains information that is included in every
- *  function in the executive.  This must be the first include file
- *  included in all internal RTEMS files.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __RTEMS_SYSTEM_h
-#define __RTEMS_SYSTEM_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- *  The target options include file defines all target dependent 
- *  parameters for this build of RTEMS.  It must be included
- *  first so the basic macro definitions are in place.
- */
-
-#include <rtems/score/targopts.h>
-
-/*
- *  The following insures that all data is declared in the space
- *  of the initialization routine for either the Initialization Manager
- *  or the initialization file for the appropriate API.  It is 
- *  referenced as "external" in every other file.
- */
-
-#ifdef SCORE_INIT
-#undef  SCORE_EXTERN
-#define SCORE_EXTERN
-#else
-#undef  SCORE_EXTERN
-#define SCORE_EXTERN  extern
-#endif
-
-#ifdef SAPI_INIT
-#undef  SAPI_EXTERN
-#define SAPI_EXTERN
-#else
-#undef  SAPI_EXTERN
-#define SAPI_EXTERN  extern
-#endif
-
-#ifdef RTEMS_API_INIT
-#undef  RTEMS_EXTERN
-#define RTEMS_EXTERN
-#else
-#undef  RTEMS_EXTERN
-#define RTEMS_EXTERN  extern
-#endif
-
-#ifdef POSIX_API_INIT
-#undef  POSIX_EXTERN
-#define POSIX_EXTERN
-#else
-#undef  POSIX_EXTERN
-#define POSIX_EXTERN  extern
-#endif
-
-/*
- *  The following (in conjunction with compiler arguments) are used
- *  to choose between the use of static inline functions and macro
- *  functions.   The static inline implementation allows better
- *  type checking with no cost in code size or execution speed.
- */
-
-#ifdef USE_INLINES
-# ifdef __GNUC__
-#  define RTEMS_INLINE_ROUTINE static __inline__
-# else
-#  define RTEMS_INLINE_ROUTINE static inline
-# endif
-#else
-# define RTEMS_INLINE_ROUTINE
-#endif
-
-/*
- *  Include a base set of files.
- */
-
-/*
- * XXX: Eventually proc_ptr needs to disappear!!!
- */
-
-typedef void * proc_ptr;
-
-/*
- *  Define NULL
- */
-
-#ifndef NULL
-#define NULL      0          /* NULL value */
-#endif
-
-/*
- *  Boolean constants
- */
-
-#if !defined( TRUE ) || (TRUE != 1)
-#undef TRUE
-#define TRUE     (1)
-#endif
-
-#if !defined( FALSE ) || (FALSE != 0)
-#undef FALSE
-#define FALSE     (0)
-#endif
-
-#include <rtems/score/cpu.h>        /* processor specific information */
-
-#define stringify( _x ) # _x
-
-#define RTEMS_offsetof(type, field) \
-	((unsigned32) &(((type *) 0)->field))
-
-/*
- *  The following is the extern for the RTEMS version string.
- *  The contents of this string are CPU specific.
- */
-
-extern const char _RTEMS_version[];         /* RTEMS version string */
-extern const char _Copyright_Notice[];      /* RTEMS copyright string */
-
-/*
- *  The following defines the CPU dependent information table.
- */
-
-SCORE_EXTERN rtems_cpu_table _CPU_Table;               /* CPU dependent info */
-
-/*
- *  XXX weird RTEMS stuff
- */
-
-#define RTEMS_MAXIMUM_NAME_LENGTH 4
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/cpukit/score/inline/rtems/score/address.inl b/cpukit/score/inline/rtems/score/address.inl
deleted file mode 100644
index 2e3049d08e..0000000000
--- a/cpukit/score/inline/rtems/score/address.inl
+++ /dev/null
@@ -1,120 +0,0 @@
-/*  inline/address.inl
- *
- *  This include file contains the bodies of the routines
- *  about addresses which are inlined.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __INLINE_ADDRESSES_inl
-#define __INLINE_ADDRESSES_inl
-
-/*PAGE
- *
- *  _Addresses_Add_offset
- *
- *  DESCRIPTION:
- *
- *  This function is used to add an offset to a base address.
- *  It returns the resulting address.  This address is typically
- *  converted to an access type before being used further.
- */
-
-RTEMS_INLINE_ROUTINE void *_Addresses_Add_offset (
-  void       *base,
-  unsigned32  offset
-)
-{
-  return (void *)((char *)base + offset);
-}
-
-/*PAGE
- *
- *  _Addresses_Subtract_offset
- *
- *  DESCRIPTION:
- *
- *  This function is used to subtract an offset from a base
- *  address.  It returns the resulting address.  This address is
- *  typically converted to an access type before being used further.
- */
-
-RTEMS_INLINE_ROUTINE void *_Addresses_Subtract_offset (
-  void       *base,
-  unsigned32  offset
-)
-{
-  return (void *)((char *)base - offset);
-}
-
-/*PAGE
- *
- *  _Addresses_Subtract
- *
- *  DESCRIPTION:
- *
- *  This function is used to subtract two addresses.  It returns the
- *  resulting offset.
- *
- *  NOTE:  The cast of an address to an unsigned32 makes this code
- *         dependent on an addresses being thirty two bits.
- */
-
-RTEMS_INLINE_ROUTINE unsigned32 _Addresses_Subtract (
-  void *left,
-  void *right
-)
-{
-  return ((char *) left - (char *) right);
-}
-
-/*PAGE
- *
- *  _Addresses_Is_aligned
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the given address is correctly
- *  aligned for this processor and FALSE otherwise.  Proper alignment
- *  is based on correctness and efficiency.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Addresses_Is_aligned (
-  void *address
-)
-{
-    return ( ( (unsigned32)address % CPU_ALIGNMENT ) == 0 );
-}
-
-/*PAGE
- *
- *  _Addresses_Is_in_range
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the given address is within the
- *  memory range specified and FALSE otherwise.  base is the address
- *  of the first byte in the memory range and limit is the address
- *  of the last byte in the memory range.  The base address is
- *  assumed to be lower than the limit address.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Addresses_Is_in_range (
-  void *address,
-  void *base,
-  void *limit
-)
-{
-  return ( address >= base && address <= limit );
-}
-
-#endif
-/* end of include file */
diff --git a/cpukit/score/inline/rtems/score/chain.inl b/cpukit/score/inline/rtems/score/chain.inl
deleted file mode 100644
index 4bd80116ae..0000000000
--- a/cpukit/score/inline/rtems/score/chain.inl
+++ /dev/null
@@ -1,390 +0,0 @@
-/*  inline/chain.inl
- *
- *  This include file contains the bodies of the routines which are
- *  associated with doubly linked chains and inlined.
- *
- *  NOTE:  The routines in this file are ordered from simple
- *         to complex.  No other Chain Handler routine is referenced
- *         unless it has already been defined.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __INLINE_CHAIN_inl
-#define __INLINE_CHAIN_inl
-
-/*PAGE
- *
- *  _Chain_Are_nodes_equal
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if LEFT and RIGHT are equal,
- *  and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Chain_Are_nodes_equal(
-  Chain_Node *left,
-  Chain_Node *right
-)
-{
-  return left == right;
-}
-
-/*PAGE
- *
- *  _Chain_Is_null
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the_chain is NULL and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Chain_Is_null(
-  Chain_Control *the_chain
-)
-{
-  return ( the_chain == NULL );
-}
-
-/*PAGE
- *
- *  _Chain_Is_null_node
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the_node is NULL and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Chain_Is_null_node(
-  Chain_Node *the_node
-)
-{
-  return ( the_node == NULL );
-}
-
-/*PAGE
- *
- *  _Chain_Head
- *
- *  DESCRIPTION:
- *
- *  This function returns a pointer to the first node on the chain.
- */
-
-RTEMS_INLINE_ROUTINE Chain_Node *_Chain_Head(
-  Chain_Control *the_chain
-)
-{
-   return (Chain_Node *) the_chain;
-}
-
-/*PAGE
- *
- *  _Chain_Tail
- *
- *  DESCRIPTION:
- *
- *  This function returns a pointer to the last node on the chain.
- */
-
-RTEMS_INLINE_ROUTINE Chain_Node *_Chain_Tail(
-  Chain_Control *the_chain
-)
-{
-   return (Chain_Node *) &the_chain->permanent_null;
-}
-
-/*PAGE
- *
- *  _Chain_Is_empty
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if there a no nodes on the_chain and
- *  FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Chain_Is_empty(
-  Chain_Control *the_chain
-)
-{
-  return ( the_chain->first == _Chain_Tail( the_chain ) );
-}
-
-/*PAGE
- *
- *  _Chain_Is_first
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the_node is the first node on a chain and
- *  FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Chain_Is_first(
-  Chain_Node *the_node
-)
-{
-  return ( the_node->previous == NULL );
-}
-
-/*PAGE
- *
- *  _Chain_Is_last
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the_node is the last node on a chain and
- *  FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Chain_Is_last(
-  Chain_Node *the_node
-)
-{
-  return ( the_node->next == NULL );
-}
-
-/*PAGE
- *
- *  _Chain_Has_only_one_node
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if there is only one node on the_chain and
- *  FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Chain_Has_only_one_node(
-  Chain_Control *the_chain
-)
-{
-  return ( the_chain->first == the_chain->last );
-}
-
-/*PAGE
- *
- *  _Chain_Is_head
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the_node is the head of the_chain and
- *  FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Chain_Is_head(
-  Chain_Control *the_chain,
-  Chain_Node    *the_node
-)
-{
-   return ( the_node == _Chain_Head( the_chain ) );
-}
-
-/*PAGE
- *
- *  _Chain_Is_tail
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the_node is the tail of the_chain and
- *  FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Chain_Is_tail(
-  Chain_Control *the_chain,
-  Chain_Node    *the_node
-)
-{
-   return ( the_node == _Chain_Tail( the_chain ) );
-}
-
-/*PAGE
- *
- *  Chain_Initialize_empty
- *
- *  DESCRIPTION:
- *
- *  This routine initializes the specified chain to contain zero nodes.
- */
-
-RTEMS_INLINE_ROUTINE void _Chain_Initialize_empty(
-  Chain_Control *the_chain
-)
-{
-  the_chain->first          = _Chain_Tail( the_chain );
-  the_chain->permanent_null = NULL;
-  the_chain->last           = _Chain_Head( the_chain );
-}
-
-/*PAGE
- *
- *  _Chain_Extract_unprotected
- *
- *  DESCRIPTION:
- *
- *  This routine extracts the_node from the chain on which it resides.
- *  It does NOT disable interrupts to insure the atomicity of the
- *  extract operation.
- */
-
-RTEMS_INLINE_ROUTINE void _Chain_Extract_unprotected(
-  Chain_Node *the_node
-)
-{
-  Chain_Node *next;
-  Chain_Node *previous;
-
-  next           = the_node->next;
-  previous       = the_node->previous;
-  next->previous = previous;
-  previous->next = next;
-}
-
-/*PAGE
- *
- *  _Chain_Get_first_unprotected
- *
- *  DESCRIPTION:
- *
- *  This function removes the first node from the_chain and returns
- *  a pointer to that node.  It does NOT disable interrupts to insure
- *  the atomicity of the get operation.
- */
-
-RTEMS_INLINE_ROUTINE Chain_Node *_Chain_Get_first_unprotected(
-  Chain_Control *the_chain
-)
-{
-  Chain_Node  *return_node;
-  Chain_Node  *new_first;
-
-  return_node         = the_chain->first;
-  new_first           = return_node->next;
-  the_chain->first    = new_first;
-  new_first->previous = _Chain_Head( the_chain );
-
-  return return_node;
-}
-
-/*PAGE
- *
- *  Chain_Get_unprotected
- *
- *  DESCRIPTION:
- *
- *  This function removes the first node from the_chain and returns
- *  a pointer to that node.  If the_chain is empty, then NULL is returned.
- *  It does NOT disable interrupts to insure the atomicity of the
- *  get operation.
- */
-
-RTEMS_INLINE_ROUTINE Chain_Node *_Chain_Get_unprotected(
-  Chain_Control *the_chain
-)
-{
-  if ( !_Chain_Is_empty( the_chain ) )
-    return _Chain_Get_first_unprotected( the_chain );
-  else
-    return NULL;
-}
-
-/*PAGE
- *
- *  _Chain_Insert_unprotected
- *
- *  DESCRIPTION:
- *
- *  This routine inserts the_node on a chain immediately following
- *  after_node.  It does NOT disable interrupts to insure the atomicity
- *  of the extract operation.
- */
-
-RTEMS_INLINE_ROUTINE void _Chain_Insert_unprotected(
-  Chain_Node *after_node,
-  Chain_Node *the_node
-)
-{
-  Chain_Node *before_node;
-
-  the_node->previous    = after_node;
-  before_node           = after_node->next;
-  after_node->next      = the_node;
-  the_node->next        = before_node;
-  before_node->previous = the_node;
-}
-
-/*PAGE
- *
- *  _Chain_Append_unprotected
- *
- *  DESCRIPTION:
- *
- *  This routine appends the_node onto the end of the_chain.
- *  It does NOT disable interrupts to insure the atomicity of the
- *  append operation.
- */
-
-RTEMS_INLINE_ROUTINE void _Chain_Append_unprotected(
-  Chain_Control *the_chain,
-  Chain_Node    *the_node
-)
-{
-  Chain_Node *old_last_node;
-
-  the_node->next      = _Chain_Tail( the_chain );
-  old_last_node       = the_chain->last;
-  the_chain->last     = the_node;
-  old_last_node->next = the_node;
-  the_node->previous  = old_last_node;
-}
-
-/*PAGE
- *
- *  _Chain_Prepend_unprotected
- *
- *  DESCRIPTION:
- *
- *  This routine prepends the_node onto the front of the_chain.
- *  It does NOT disable interrupts to insure the atomicity of the
- *  prepend operation.
- */
-
-RTEMS_INLINE_ROUTINE void _Chain_Prepend_unprotected(
-  Chain_Control *the_chain,
-  Chain_Node    *the_node
-)
-{
-  _Chain_Insert_unprotected( _Chain_Head( the_chain ), the_node );
-
-}
-
-/*PAGE
- *
- *  _Chain_Prepend
- *
- *  DESCRIPTION:
- *
- *  This routine prepends the_node onto the front of the_chain.
- *  It disables interrupts to insure the atomicity of the
- *  prepend operation.
- */
-
-RTEMS_INLINE_ROUTINE void _Chain_Prepend(
-  Chain_Control *the_chain,
-  Chain_Node    *the_node
-)
-{
-  _Chain_Insert( _Chain_Head( the_chain ), the_node );
-}
-
-#endif
-/* end of include file */
diff --git a/cpukit/score/inline/rtems/score/coremsg.inl b/cpukit/score/inline/rtems/score/coremsg.inl
deleted file mode 100644
index a43b0e7b06..0000000000
--- a/cpukit/score/inline/rtems/score/coremsg.inl
+++ /dev/null
@@ -1,260 +0,0 @@
-/*  coremsg.inl
- *
- *  This include file contains the static inline implementation of all
- *  inlined routines in the Core Message Handler.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __CORE_MESSAGE_QUEUE_inl
-#define __CORE_MESSAGE_QUEUE_inl
-
-#include <string.h>   /* needed for memcpy */
- 
-/*PAGE
- *
- *  _CORE_message_queue_Send
- *
- *  DESCRIPTION:
- *
- *  This routine sends a message to the end of the specified message queue.
- */
- 
-RTEMS_INLINE_ROUTINE CORE_message_queue_Status _CORE_message_queue_Send(
-  CORE_message_queue_Control                *the_message_queue,
-  void                                      *buffer,
-  unsigned32                                 size,
-  Objects_Id                                 id,
-  CORE_message_queue_API_mp_support_callout  api_message_queue_mp_support
-)
-{
-  return _CORE_message_queue_Submit(
-    the_message_queue,
-    buffer,
-    size,
-    id,
-    api_message_queue_mp_support,
-    CORE_MESSAGE_QUEUE_SEND_REQUEST
-  );
-}
- 
-/*PAGE
- *
- *  _CORE_message_queue_Urgent
- *
- *  DESCRIPTION:
- *
- *  This routine sends a message to the front of the specified message queue.
- */
- 
-RTEMS_INLINE_ROUTINE CORE_message_queue_Status _CORE_message_queue_Urgent(
-  CORE_message_queue_Control                *the_message_queue,
-  void                                      *buffer,
-  unsigned32                                 size,
-  Objects_Id                                 id,
-  CORE_message_queue_API_mp_support_callout  api_message_queue_mp_support
-)
-{
-  return _CORE_message_queue_Submit(
-    the_message_queue,
-    buffer,
-    size,
-    id,
-    api_message_queue_mp_support,
-    CORE_MESSAGE_QUEUE_URGENT_REQUEST
- );
-}
-
-/*PAGE
- *
- *  _CORE_message_queue_Copy_buffer
- *
- *  DESCRIPTION:
- *
- *  This routine copies the contents of the source message buffer
- *  to the destination message buffer.
- */
-
-RTEMS_INLINE_ROUTINE void _CORE_message_queue_Copy_buffer (
-  void      *source,
-  void      *destination,
-  unsigned32 size
-)
-{
-  memcpy(destination, source, size);
-}
-
-/*PAGE
- *
- *  _CORE_message_queue_Allocate_message_buffer
- *
- *  DESCRIPTION:
- *
- *  This function allocates a message buffer from the inactive
- *  message buffer chain.
- */
-
-RTEMS_INLINE_ROUTINE CORE_message_queue_Buffer_control *
-_CORE_message_queue_Allocate_message_buffer (
-    CORE_message_queue_Control *the_message_queue
-)
-{
-   return (CORE_message_queue_Buffer_control *)
-     _Chain_Get( &the_message_queue->Inactive_messages );
-}
-
-/*PAGE
- *
- *  _CORE_message_queue_Free_message_buffer
- *
- *  DESCRIPTION:
- *
- *  This routine frees a message buffer to the inactive
- *  message buffer chain.
- */
-
-RTEMS_INLINE_ROUTINE void _CORE_message_queue_Free_message_buffer (
-    CORE_message_queue_Control        *the_message_queue,
-    CORE_message_queue_Buffer_control *the_message
-)
-{
-  _Chain_Append( &the_message_queue->Inactive_messages, &the_message->Node );
-}
-
-/*PAGE
- *
- *  _CORE_message_queue_Get_pending_message
- *
- *  DESCRIPTION:
- *
- *  This function removes the first message from the_message_queue
- *  and returns a pointer to it.
- */
-
-RTEMS_INLINE_ROUTINE
-  CORE_message_queue_Buffer_control *_CORE_message_queue_Get_pending_message (
-  CORE_message_queue_Control *the_message_queue
-)
-{
-  return (CORE_message_queue_Buffer_control *)
-    _Chain_Get_unprotected( &the_message_queue->Pending_messages );
-}
-
-/*PAGE
- *
- *  _CORE_message_queue_Is_priority
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the priority attribute is
- *  enabled in the attribute_set and FALSE otherwise.
- */
- 
-RTEMS_INLINE_ROUTINE boolean _CORE_message_queue_Is_priority(
-  CORE_message_queue_Attributes *the_attribute
-)
-{
-  return (the_attribute->discipline == CORE_MESSAGE_QUEUE_DISCIPLINES_PRIORITY);
-}
-
-/*PAGE
- *
- *  _CORE_message_queue_Append
- *
- *  DESCRIPTION:
- *
- *  This routine places the_message at the rear of the outstanding
- *  messages on the_message_queue.
- */
-
-RTEMS_INLINE_ROUTINE void _CORE_message_queue_Append (
-  CORE_message_queue_Control        *the_message_queue,
-  CORE_message_queue_Buffer_control *the_message
-)
-{
-  _Chain_Append( &the_message_queue->Pending_messages, &the_message->Node );
-}
-
-/*PAGE
- *
- *  _CORE_message_queue_Prepend
- *
- *  DESCRIPTION:
- *
- *  This routine places the_message at the front of the outstanding
- *  messages on the_message_queue.
- */
-
-RTEMS_INLINE_ROUTINE void _CORE_message_queue_Prepend (
-  CORE_message_queue_Control        *the_message_queue,
-  CORE_message_queue_Buffer_control *the_message
-)
-{
-  _Chain_Prepend(
-    &the_message_queue->Pending_messages,
-    &the_message->Node
-  );
-}
-
-/*PAGE
- *
- *  _CORE_message_queue_Is_null
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the_message_queue is TRUE and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _CORE_message_queue_Is_null (
-  CORE_message_queue_Control *the_message_queue
-)
-{
-  return ( the_message_queue == NULL  );
-}
-
-/*PAGE
- *
- *  _CORE_message_queue_Is_notify_enabled
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if notification is enabled on this message
- *  queue and FALSE otherwise.
- */
- 
-RTEMS_INLINE_ROUTINE boolean _CORE_message_queue_Is_notify_enabled (
-  CORE_message_queue_Control *the_message_queue
-)
-{
-  return (the_message_queue->notify_handler != NULL);
-}
- 
-/*PAGE
- *
- *  _CORE_message_queue_Set_notify
- *
- *  DESCRIPTION:
- *
- *  This routine initializes the notification information for the_message_queue.
- */
- 
-RTEMS_INLINE_ROUTINE void _CORE_message_queue_Set_notify (
-  CORE_message_queue_Control        *the_message_queue,
-  CORE_message_queue_Notify_Handler  the_handler,
-  void                              *the_argument
-)
-{
-  the_message_queue->notify_handler  = the_handler;
-  the_message_queue->notify_argument = the_argument;
-}
-
-#endif
-/* end of include file */
diff --git a/cpukit/score/inline/rtems/score/coremutex.inl b/cpukit/score/inline/rtems/score/coremutex.inl
deleted file mode 100644
index 457f7c7d7d..0000000000
--- a/cpukit/score/inline/rtems/score/coremutex.inl
+++ /dev/null
@@ -1,124 +0,0 @@
-/*  inline/coremutex.inl
- *
- *  This include file contains all of the inlined routines associated
- *  with the CORE mutexes.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __INLINE_CORE_MUTEX_inl
-#define __INLINE_CORE_MUTEX_inl
-
-/*PAGE
- *
- *  _CORE_mutex_Is_locked
- *
- *  DESCRIPTION:
- *
- *  This routine returns TRUE if the mutex specified is locked and FALSE
- *  otherwise.
- */
- 
-RTEMS_INLINE_ROUTINE boolean _CORE_mutex_Is_locked(
-  CORE_mutex_Control  *the_mutex
-)
-{
-  return the_mutex->lock == CORE_MUTEX_LOCKED;
-}
- 
-/*PAGE
- *
- *  _CORE_mutex_Is_fifo
- *
- *  DESCRIPTION:
- *
- *  This routine returns TRUE if the mutex's wait discipline is FIFO and FALSE
- *  otherwise.
- */
- 
-RTEMS_INLINE_ROUTINE boolean _CORE_mutex_Is_fifo(
-  CORE_mutex_Attributes *the_attribute
-)
-{
-  return the_attribute->discipline == CORE_MUTEX_DISCIPLINES_FIFO;
-}
- 
-/*PAGE
- *
- *  _CORE_mutex_Is_priority
- *
- *  DESCRIPTION:
- *
- *  This routine returns TRUE if the mutex's wait discipline is PRIORITY and
- *  FALSE otherwise.
- */
- 
-RTEMS_INLINE_ROUTINE boolean _CORE_mutex_Is_priority(
-  CORE_mutex_Attributes *the_attribute
-)
-{
-  return the_attribute->discipline == CORE_MUTEX_DISCIPLINES_PRIORITY;
-}
- 
-/*PAGE
- *
- *  _CORE_mutex_Is_inherit_priority
- *
- *  DESCRIPTION:
- *
- *  This routine returns TRUE if the mutex's wait discipline is
- *  INHERIT_PRIORITY and FALSE otherwise.
- */
- 
-RTEMS_INLINE_ROUTINE boolean _CORE_mutex_Is_inherit_priority(
-  CORE_mutex_Attributes *the_attribute
-)
-{
-  return the_attribute->discipline == CORE_MUTEX_DISCIPLINES_PRIORITY_INHERIT;
-}
- 
-/*PAGE
- *
- *  _CORE_mutex_Is_priority_ceiling
- *
- *  DESCRIPTION:
- *
- *  This routine returns TRUE if the mutex's wait discipline is
- *  PRIORITY_CEILING and FALSE otherwise.
- */
- 
-RTEMS_INLINE_ROUTINE boolean _CORE_mutex_Is_priority_ceiling(
-  CORE_mutex_Attributes *the_attribute
-)
-{
-  return the_attribute->discipline == CORE_MUTEX_DISCIPLINES_PRIORITY_CEILING;
-}
- 
-/*PAGE
- *
- *  _CORE_mutex_Is_nesting_allowed
- *
- *  DESCRIPTION:
- *
- *  This routine returns TRUE if the mutex allows a task to obtain a
- *  semaphore more than once and nest.
- */
- 
-RTEMS_INLINE_ROUTINE boolean _CORE_mutex_Is_nesting_allowed(
-  CORE_mutex_Attributes *the_attribute
-)
-{
-  return the_attribute->allow_nesting == TRUE;
- 
-}
- 
-#endif
-/* end of include file */
diff --git a/cpukit/score/inline/rtems/score/coresem.inl b/cpukit/score/inline/rtems/score/coresem.inl
deleted file mode 100644
index 7ef8c93990..0000000000
--- a/cpukit/score/inline/rtems/score/coresem.inl
+++ /dev/null
@@ -1,54 +0,0 @@
-/*  inline/coresem.inl
- *
- *  This include file contains all of the inlined routines associated
- *  with the CORE semaphore.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __INLINE_CORE_SEMAPHORE_inl
-#define __INLINE_CORE_SEMAPHORE_inl
-
-/*PAGE
- *
- *  _CORE_semaphore_Is_priority
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the priority attribute is
- *  enabled in the attribute_set and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _CORE_semaphore_Is_priority(
-  CORE_semaphore_Attributes *the_attribute
-)
-{
-   return ( the_attribute->discipline == CORE_SEMAPHORE_DISCIPLINES_PRIORITY );
-}
-
-/*PAGE
- *
- *  _CORE_semaphore_Get_count
- *
- *  DESCRIPTION:
- *
- *  This routine returns the current count associated with the semaphore.
- */
- 
-RTEMS_INLINE_ROUTINE unsigned32 _CORE_semaphore_Get_count(
-  CORE_semaphore_Control  *the_semaphore
-)
-{
-  return the_semaphore->count;
-}
-
-#endif
-/* end of include file */
diff --git a/cpukit/score/inline/rtems/score/heap.inl b/cpukit/score/inline/rtems/score/heap.inl
deleted file mode 100644
index 92936f8135..0000000000
--- a/cpukit/score/inline/rtems/score/heap.inl
+++ /dev/null
@@ -1,274 +0,0 @@
-/*  heap.inl
- *
- *  This file contains the static inline implementation of the inlined
- *  routines from the heap handler.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __HEAP_inl
-#define __HEAP_inl
-
-#include <rtems/score/address.h>
-
-/*PAGE
- *
- *  _Heap_Head
- *
- *  DESCRIPTION:
- *
- *  This function returns the head of the specified heap.
- */
-
-RTEMS_INLINE_ROUTINE Heap_Block *_Heap_Head (
-  Heap_Control *the_heap
-)
-{
-  return (Heap_Block *)&the_heap->start;
-}
-
-/*PAGE
- *
- *  _Heap_Tail
- *
- *  DESCRIPTION:
- *
- *  This function returns the tail of the specified heap.
- */
-
-RTEMS_INLINE_ROUTINE Heap_Block *_Heap_Tail (
-  Heap_Control *the_heap
-)
-{
-  return (Heap_Block *)&the_heap->final;
-}
-
-/*PAGE
- *
- *  _Heap_Previous_block
- *
- *  DESCRIPTION:
- *
- *  This function returns the address of the block which physically
- *  precedes the_block in memory.
- */
-
-RTEMS_INLINE_ROUTINE Heap_Block *_Heap_Previous_block (
-  Heap_Block *the_block
-)
-{
-  return (Heap_Block *) _Addresses_Subtract_offset(
-                          (void *)the_block,
-                          the_block->back_flag & ~ HEAP_BLOCK_USED
-                        );
-}
-
-/*PAGE
- *
- *  _Heap_Next_block
- *
- *  DESCRIPTION:
- *
- *  This function returns the address of the block which physically
- *  follows the_block in memory.
- *
- *  NOTE: Next_block assumes that the block is free.
- */
-
-RTEMS_INLINE_ROUTINE Heap_Block *_Heap_Next_block (
-  Heap_Block *the_block
-)
-{
-  return (Heap_Block *) _Addresses_Add_offset(
-                          (void *)the_block,
-                          the_block->front_flag & ~ HEAP_BLOCK_USED
-                        );
-}
-
-/*PAGE
- *
- *  _Heap_Block_at
- *
- *  DESCRIPTION:
- *
- *  This function calculates and returns a block's location (address)
- *  in the heap based upon a base address and an offset.
- */
-
-RTEMS_INLINE_ROUTINE Heap_Block *_Heap_Block_at(
-  void       *base,
-  unsigned32  offset
-)
-{
-  return (Heap_Block *) _Addresses_Add_offset( (void *)base, offset );
-}
-
-/*PAGE
- *
- *  _Heap_User_block_at
- *
- *  DESCRIPTION:
- *
- *  XXX
- */
- 
-RTEMS_INLINE_ROUTINE Heap_Block *_Heap_User_block_at(
-  void       *base
-)
-{
-  unsigned32         offset;
- 
-  offset = *(((unsigned32 *) base) - 1);
-  return _Heap_Block_at( base, -offset + -HEAP_BLOCK_USED_OVERHEAD);
-}
-
-/*PAGE
- *
- *  _Heap_Is_previous_block_free
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the previous block of the_block
- *  is free, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Heap_Is_previous_block_free (
-  Heap_Block *the_block
-)
-{
-  return !(the_block->back_flag & HEAP_BLOCK_USED);
-}
-
-/*PAGE
- *
- *  _Heap_Is_block_free
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the block is free, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Heap_Is_block_free (
-  Heap_Block *the_block
-)
-{
-  return !(the_block->front_flag & HEAP_BLOCK_USED);
-}
-
-/*PAGE
- *
- *  _Heap_Is_block_used
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the block is currently allocated,
- *  and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Heap_Is_block_used (
-  Heap_Block *the_block
-)
-{
-  return (the_block->front_flag & HEAP_BLOCK_USED);
-}
-
-/*PAGE
- *
- *  _Heap_Block_size
- *
- *  DESCRIPTION:
- *
- *  This function returns the size of the_block in bytes.
- */
-
-RTEMS_INLINE_ROUTINE unsigned32 _Heap_Block_size (
-  Heap_Block *the_block
-)
-{
-  return (the_block->front_flag & ~HEAP_BLOCK_USED);
-}
-
-/*PAGE
- *
- *  _Heap_Start_of_user_area
- *
- *  DESCRIPTION:
- *
- *  This function returns the starting address of the portion of the block
- *  which the user may access.
- */
-
-RTEMS_INLINE_ROUTINE void *_Heap_Start_of_user_area (
-  Heap_Block *the_block
-)
-{
-  return (void *) &the_block->next;
-}
-
-/*PAGE
- *
- *  _Heap_Is_block_in
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the_block is within the memory area
- *  managed by the_heap, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Heap_Is_block_in (
-  Heap_Control *the_heap,
-  Heap_Block   *the_block
-)
-{
-  return _Addresses_Is_in_range( the_block, the_heap->start, the_heap->final );
-}
-
-/*PAGE
- *
- *  _Heap_Is_page_size_valid
- *
- *  DESCRIPTION:
- *
- *  This function validates a specified heap page size.  If the page size
- *  is 0 or if lies outside a page size alignment boundary it is invalid
- *  and FALSE is returned.  Otherwise, the page size is valid and TRUE is
- *  returned.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Heap_Is_page_size_valid(
-  unsigned32 page_size
-)
-{
-  return ((page_size != 0) &&
-         ((page_size % CPU_HEAP_ALIGNMENT) == 0));
-}
-
-/*PAGE
- *
- *  _Heap_Build_flag
- *
- *  DESCRIPTION:
- *
- *  This function returns the block flag composed of size and in_use_flag.
- *  The flag returned is suitable for use as a back or front flag in a
- *  heap block.
- */
-
-RTEMS_INLINE_ROUTINE unsigned32 _Heap_Build_flag (
-  unsigned32 size,
-  unsigned32 in_use_flag
-)
-{
-  return  size | in_use_flag;
-}
-
-#endif
-/* end of include file */
diff --git a/cpukit/score/inline/rtems/score/isr.inl b/cpukit/score/inline/rtems/score/isr.inl
deleted file mode 100644
index 6bd6e09d16..0000000000
--- a/cpukit/score/inline/rtems/score/isr.inl
+++ /dev/null
@@ -1,73 +0,0 @@
-/*  isr.inl
- *
- *  This include file contains the static implementation of all
- *  inlined routines in the Interrupt Handler.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __ISR_inl
-#define __ISR_inl
-
-/*PAGE
- *
- *  _ISR_Is_in_progress
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the processor is currently servicing
- *  and interrupt and FALSE otherwise.   A return value of TRUE indicates
- *  that the caller is an interrupt service routine, NOT a thread.  The
- *  directives available to an interrupt service routine are restricted.
- */
-
-RTEMS_INLINE_ROUTINE boolean _ISR_Is_in_progress( void )
-{
-  return (_ISR_Nest_level != 0);
-}
-
-/*PAGE
- *
- *  _ISR_Is_vector_number_valid
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the vector is a valid vector number
- *  for this processor and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _ISR_Is_vector_number_valid (
-  unsigned32 vector
-)
-{
-  return ( vector <= CPU_INTERRUPT_MAXIMUM_VECTOR_NUMBER );
-}
-
-/*PAGE
- *
- *  _ISR_Is_valid_user_handler
- *
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if handler is the entry point of a valid
- *  use interrupt service routine and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _ISR_Is_valid_user_handler (
-  void *handler
-)
-{
-  return ( handler != NULL);
-}
-
-#endif
-/* end of include file */
diff --git a/cpukit/score/inline/rtems/score/mppkt.inl b/cpukit/score/inline/rtems/score/mppkt.inl
deleted file mode 100644
index 4be286b294..0000000000
--- a/cpukit/score/inline/rtems/score/mppkt.inl
+++ /dev/null
@@ -1,58 +0,0 @@
-/*  inline/mppkt.inl
- *
- *  This package is the implementation of the Packet Handler
- *  routines which are inlined.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __INLINE_MP_PACKET_inl
-#define __INLINE_MP_PACKET_inl
-
-/*PAGE
- *
- *  _Mp_packet_Is_valid_packet_class
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the the_packet_class is valid,
- *  and FALSE otherwise.
- *
- *  NOTE: Check for lower bounds (MP_PACKET_CLASSES_FIRST ) is unnecessary
- *        because this enum starts at lower bound of zero.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Mp_packet_Is_valid_packet_class (
-  MP_packet_Classes the_packet_class
-)
-{
-  return ( the_packet_class <= MP_PACKET_CLASSES_LAST );
-}
-
-/*PAGE
- *
- *  _Mp_packet_Is_null
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the the_packet_class is null,
- *  and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Mp_packet_Is_null (
-  MP_packet_Prefix   *the_packet
-)
-{
-  return the_packet == NULL;
-}
-
-#endif
-/* end of include file */
diff --git a/cpukit/score/inline/rtems/score/object.inl b/cpukit/score/inline/rtems/score/object.inl
deleted file mode 100644
index 7e4d12aeec..0000000000
--- a/cpukit/score/inline/rtems/score/object.inl
+++ /dev/null
@@ -1,244 +0,0 @@
-/*  object.inl
- *
- *  This include file contains the static inline implementation of all
- *  of the inlined routines in the Object Handler.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __OBJECTS_inl
-#define __OBJECTS_inl
-
-/*PAGE
- *
- *  _Objects_Build_id
- *
- *  DESCRIPTION:
- *
- *  This function builds an object's id from the processor node and index
- *  values specified.
- */
-
-RTEMS_INLINE_ROUTINE Objects_Id _Objects_Build_id(
-  Objects_Classes  the_class,
-  unsigned32       node,
-  unsigned32       index
-)
-{
-  return ( (the_class << OBJECTS_CLASS_START_BIT) |
-           (node << OBJECTS_NODE_START_BIT)       |
-           (index << OBJECTS_INDEX_START_BIT) );
-}
-
-/*PAGE
- *
- *  _Objects_Get_class
- *
- *  DESCRIPTION:
- *
- *  This function returns the class portion of the ID.
- */
- 
-RTEMS_INLINE_ROUTINE Objects_Classes _Objects_Get_class(
-  Objects_Id id
-)
-{
-  return (Objects_Classes) 
-    ((id >> OBJECTS_CLASS_START_BIT) & OBJECTS_CLASS_VALID_BITS);
-}
- 
-
-/*PAGE
- *
- *  _Objects_Get_node
- *
- *  DESCRIPTION:
- *
- *  This function returns the node portion of the ID.
- */
-
-RTEMS_INLINE_ROUTINE unsigned32 _Objects_Get_node(
-  Objects_Id id
-)
-{
-  return (id >> OBJECTS_NODE_START_BIT) & OBJECTS_NODE_VALID_BITS;
-}
-
-/*PAGE
- *
- *  _Objects_Get_index
- *
- *  DESCRIPTION:
- *
- *  This function returns the index portion of the ID.
- */
-
-RTEMS_INLINE_ROUTINE unsigned32 _Objects_Get_index(
-  Objects_Id id
-)
-{
-  return (id >> OBJECTS_INDEX_START_BIT) & OBJECTS_INDEX_VALID_BITS;
-}
-
-/*PAGE
- *
- *  _Objects_Is_class_valid
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the class is valid.
- */
- 
-RTEMS_INLINE_ROUTINE boolean _Objects_Is_class_valid(
-  Objects_Classes the_class
-)
-{
-  return the_class && the_class <= OBJECTS_CLASSES_LAST;
-}
-
-/*PAGE
- *
- *  _Objects_Is_local_node
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the node is of the local object, and
- *  FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Objects_Is_local_node(
-  unsigned32 node
-)
-{
-  return ( node == _Objects_Local_node );
-}
-
-/*PAGE
- *
- *  _Objects_Is_local_id
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the id is of a local object, and
- *  FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Objects_Is_local_id(
-  Objects_Id id
-)
-{
-  return _Objects_Is_local_node( _Objects_Get_node(id) );
-}
-
-/*PAGE
- *
- *  _Objects_Are_ids_equal
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if left and right are equal,
- *  and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Objects_Are_ids_equal(
-  Objects_Id left,
-  Objects_Id right
-)
-{
-  return ( left == right );
-}
-
-/*PAGE
- *
- *  _Objects_Allocate
- *
- *  DESCRIPTION:
- *
- *  This function allocates a object control block from
- *  the inactive chain of free object control blocks.
- */
-
-RTEMS_INLINE_ROUTINE Objects_Control *_Objects_Allocate(
-  Objects_Information *information
-)
-{
-  return (Objects_Control *) _Chain_Get( &information->Inactive );
-}
-
-/*PAGE
- *
- *  _Objects_Free
- *
- *  DESCRIPTION:
- *
- *  This function frees a object control block to the
- *  inactive chain of free object control blocks.
- */
-
-RTEMS_INLINE_ROUTINE void _Objects_Free(
-  Objects_Information *information,
-  Objects_Control     *the_object
-)
-{
-  _Chain_Append( &information->Inactive, &the_object->Node );
-}
-
-/*PAGE
- *
- *  _Objects_Open
- *
- *  DESCRIPTION:
- *
- *  This function places the_object control pointer and object name
- *  in the Local Pointer and Local Name Tables, respectively.
- */
-
-RTEMS_INLINE_ROUTINE void _Objects_Open(
-  Objects_Information *information,
-  Objects_Control     *the_object,
-  Objects_Name         name
-)
-{
-  unsigned32  index;
-
-  index = _Objects_Get_index( the_object->id );
-  information->local_table[ index ] = the_object;
-
-  if ( information->is_string ) 
-    _Objects_Copy_name_string( name, the_object->name );
-  else
-    _Objects_Copy_name_raw( name, the_object->name, information->name_length );
-}
-
-/*PAGE
- *
- *  _Objects_Close
- *
- *  DESCRIPTION:
- *
- *  This function removes the_object control pointer and object name
- *  in the Local Pointer and Local Name Tables.
- */
-
-RTEMS_INLINE_ROUTINE void _Objects_Close(
-  Objects_Information  *information,
-  Objects_Control      *the_object
-)
-{
-  unsigned32 index;
-
-  index = _Objects_Get_index( the_object->id );
-  information->local_table[ index ] = (Objects_Control *) NULL;
-  _Objects_Clear_name( the_object->name, information->name_length );
-}
-
-#endif
-/* end of include file */
diff --git a/cpukit/score/inline/rtems/score/objectmp.inl b/cpukit/score/inline/rtems/score/objectmp.inl
deleted file mode 100644
index f8fc62e129..0000000000
--- a/cpukit/score/inline/rtems/score/objectmp.inl
+++ /dev/null
@@ -1,73 +0,0 @@
-/*  inline/objectmp.inl
- *
- *  This include file contains the bodies of all inlined routines
- *  which deal with global objects.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __INLINE_MP_OBJECTS_inl
-#define __INLINE_MP_OBJECTS_inl
-
-/*PAGE
- *
- *  _Objects_MP_Allocate_global_object
- *
- *  DESCRIPTION:
- *
- *  This function allocates a Global Object control block.
- */
-
-RTEMS_INLINE_ROUTINE Objects_MP_Control *_Objects_MP_Allocate_global_object (
-  void
-)
-{
-  return (Objects_MP_Control *)
-           _Chain_Get( &_Objects_MP_Inactive_global_objects );
-}
-
-/*PAGE
- *
- *  _Objects_MP_Free_global_object
- *
- *  DESCRIPTION:
- *
- *  This routine deallocates a Global Object control block.
- */
-
-RTEMS_INLINE_ROUTINE void _Objects_MP_Free_global_object (
-  Objects_MP_Control *the_object
-)
-{
-  _Chain_Append(
-    &_Objects_MP_Inactive_global_objects,
-    &the_object->Object.Node
-  );
-}
-
-/*PAGE
- *
- *  _Objects_MP_Is_null_global_object
- *
- *  DESCRIPTION:
- *
- *  This function returns whether the global object is NULL or not.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Objects_MP_Is_null_global_object (
-  Objects_MP_Control *the_object
-)
-{
-  return( the_object == NULL );
-}
-
-#endif
-/* end of include file */
diff --git a/cpukit/score/inline/rtems/score/priority.inl b/cpukit/score/inline/rtems/score/priority.inl
deleted file mode 100644
index b19d157976..0000000000
--- a/cpukit/score/inline/rtems/score/priority.inl
+++ /dev/null
@@ -1,247 +0,0 @@
-/*  priority.inl
- *
- *  This file contains the static inline implementation of all inlined
- *  routines in the Priority Handler.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __PRIORITY_inl
-#define __PRIORITY_inl
-
-#include <rtems/score/bitfield.h>
-
-/*PAGE
- *
- *  _Priority_Handler_initialization
- *
- *  DESCRIPTION:
- *
- *  This routine performs the initialization necessary for this handler.
- */
-
-RTEMS_INLINE_ROUTINE void _Priority_Handler_initialization( void )
-{
-  unsigned32 index;
-
-  _Priority_Major_bit_map = 0;
-  for ( index=0 ; index <16 ; index++ )
-     _Priority_Bit_map[ index ] = 0;
-}
-
-/*PAGE
- *
- *  _Priority_Is_valid
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the_priority if valid for a
- *  user task, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Priority_Is_valid (
-  Priority_Control the_priority
-)
-{
-  /* 
-   *  Since PRIORITY_MINIMUM is 0 and priorities are stored unsigned,
-   *  then checking for less than 0 is unnecessary.
-   */
-
-  return ( the_priority <= PRIORITY_MAXIMUM );
-}
-
-/*PAGE
- *
- *  _Priority_Major
- *
- *  DESCRIPTION:
- *
- *  This function returns the major portion of the_priority.
- */
-
-RTEMS_INLINE_ROUTINE unsigned32 _Priority_Major (
-  Priority_Control the_priority
-)
-{
-  return ( the_priority / 16 );
-}
-
-/*PAGE
- *
- *  _Priority_Minor
- *
- *  DESCRIPTION:
- *
- *  This function returns the minor portion of the_priority.
- */
-
-RTEMS_INLINE_ROUTINE unsigned32 _Priority_Minor (
-  Priority_Control the_priority
-)
-{
-  return ( the_priority % 16 );
-}
-
-#if ( CPU_USE_GENERIC_BITFIELD_CODE == TRUE )
- 
-/*PAGE
- *
- *  _Priority_Mask
- *
- *  DESCRIPTION:
- *
- *  This function returns the mask associated with the major or minor
- *  number passed to it.
- */
- 
-RTEMS_INLINE_ROUTINE unsigned32 _Priority_Mask (
-  unsigned32 bit_number
-)
-{
-  return (0x8000 >> bit_number);
-}
- 
- 
-/*PAGE
- *
- *  _Priority_Bits_index
- *
- *  DESCRIPTION:
- *
- *  This function translates the bit numbers returned by the bit scan
- *  of a priority bit field into something suitable for use as
- *  a major or minor component of a priority.
- */
- 
-RTEMS_INLINE_ROUTINE unsigned32 _Priority_Bits_index (
-  unsigned32 bit_number
-)
-{
-  return bit_number;
-}
-
-#endif
-
-/*PAGE
- *
- *  _Priority_Add_to_bit_map
- *
- *  DESCRIPTION:
- *
- *  This routine uses the_priority_map to update the priority
- *  bit maps to indicate that a thread has been readied.
- */
-
-RTEMS_INLINE_ROUTINE void _Priority_Add_to_bit_map (
-  Priority_Information *the_priority_map
-)
-{
-  *the_priority_map->minor |= the_priority_map->ready_minor;
-  _Priority_Major_bit_map  |= the_priority_map->ready_major;
-}
-
-/*PAGE
- *
- *  _Priority_Remove_from_bit_map
- *
- *  DESCRIPTION:
- *
- *  This routine uses the_priority_map to update the priority
- *  bit maps to indicate that a thread has been removed from the
- *  ready state.
- */
-
-RTEMS_INLINE_ROUTINE void _Priority_Remove_from_bit_map (
-  Priority_Information *the_priority_map
-)
-{
-  *the_priority_map->minor &= the_priority_map->block_minor;
-  if ( *the_priority_map->minor == 0 )
-    _Priority_Major_bit_map &= the_priority_map->block_major;
-}
-
-/*PAGE
- *
- *  _Priority_Get_highest
- *
- *  DESCRIPTION:
- *
- *  This function returns the priority of the highest priority
- *  ready thread.
- */
-
-RTEMS_INLINE_ROUTINE Priority_Control _Priority_Get_highest( void )
-{
-  Priority_Bit_map_control minor;
-  Priority_Bit_map_control major;
-
-  _Bitfield_Find_first_bit( _Priority_Major_bit_map, major );
-  _Bitfield_Find_first_bit( _Priority_Bit_map[major], minor );
-
-  return (_Priority_Bits_index( major ) << 4) +
-          _Priority_Bits_index( minor );
-}
-
-/*PAGE
- *
- *  _Priority_Initialize_information
- *
- *  DESCRIPTION:
- *
- *  This routine initializes the_priority_map so that it
- *  contains the information necessary to manage a thread
- *  at new_priority.
- */
-
-RTEMS_INLINE_ROUTINE void _Priority_Initialize_information(
-  Priority_Information *the_priority_map,
-  Priority_Control      new_priority
-)
-{
-  Priority_Bit_map_control major;
-  Priority_Bit_map_control minor;
-  Priority_Bit_map_control mask;
-
-  major = _Priority_Major( new_priority );
-  minor = _Priority_Minor( new_priority );
-
-  the_priority_map->minor =
-    &_Priority_Bit_map[ _Priority_Bits_index(major) ];
-
-  mask = _Priority_Mask( major );
-  the_priority_map->ready_major = mask;
-  the_priority_map->block_major = ~mask;
-
-  mask = _Priority_Mask( minor );
-  the_priority_map->ready_minor = mask;
-  the_priority_map->block_minor = ~mask;
-}
-
-/*PAGE
- *
- *  _Priority_Is_group_empty
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the priority GROUP is empty, and
- *  FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Priority_Is_group_empty (
-  Priority_Control      the_priority
-)
-{
-  return the_priority == 0;
-}
-
-#endif
-/* end of include file */
diff --git a/cpukit/score/inline/rtems/score/stack.inl b/cpukit/score/inline/rtems/score/stack.inl
deleted file mode 100644
index eedd2f5ba2..0000000000
--- a/cpukit/score/inline/rtems/score/stack.inl
+++ /dev/null
@@ -1,81 +0,0 @@
-/*  stack.inl
- *
- *  This file contains the static inline implementation of the inlined
- *  routines from the Stack Handler.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __STACK_inl
-#define __STACK_inl
-
-/*PAGE
- *
- *  _Stack_Initialize
- *
- *  DESCRIPTION:
- *
- *  This routine initializes the_stack record to indicate that
- *  size bytes of memory starting at starting_address have been
- *  reserved for a stack.
- */
-
-RTEMS_INLINE_ROUTINE void _Stack_Initialize (
-  Stack_Control *the_stack,
-  void          *starting_address,
-  unsigned32     size
-)
-{
-  the_stack->area = starting_address;
-  the_stack->size = size;
-}
-
-/*PAGE
- *
- *  _Stack_Is_enough
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if size bytes is enough memory for
- *  a valid stack area on this processor, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Stack_Is_enough (
-  unsigned32 size
-)
-{
-  return ( size >= STACK_MINIMUM_SIZE );
-}
-
-/*PAGE
- *
- *  _Stack_Adjust_size
- *
- *  DESCRIPTION:
- *
- *  This function increases the stack size to insure that the thread
- *  has the desired amount of stack space after the initial stack
- *  pointer is determined based on alignment restrictions.
- *
- *  NOTE:
- *
- *  The amount of adjustment for alignment is CPU dependent.
- */
-
-RTEMS_INLINE_ROUTINE unsigned32 _Stack_Adjust_size (
-  unsigned32 size
-)
-{
-  return size + CPU_STACK_ALIGNMENT;
-}
-
-#endif
-/* end of include file */
diff --git a/cpukit/score/inline/rtems/score/states.inl b/cpukit/score/inline/rtems/score/states.inl
deleted file mode 100644
index 1e67b14144..0000000000
--- a/cpukit/score/inline/rtems/score/states.inl
+++ /dev/null
@@ -1,384 +0,0 @@
-/*  states.inl
- *
- *  This file contains the macro implementation of the inlined
- *  routines associated with thread state information.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __STATES_inl
-#define __STATES_inl
-
-/*PAGE
- *
- *  _States_Set
- *
- *  DESCRIPTION:
- *
- *  This function sets the given states_to_set into the current_state
- *  passed in.  The result is returned to the user in current_state.
- */
-
-RTEMS_INLINE_ROUTINE States_Control _States_Set (
-  States_Control states_to_set,
-  States_Control current_state
-)
-{
-   return (current_state | states_to_set);
-}
-
-/*PAGE
- *
- *  _States_Clear
- *
- *  DESCRIPTION:
- *
- *  This function clears the given states_to_clear into the current_state
- *  passed in.  The result is returned to the user in current_state.
- */
-
-RTEMS_INLINE_ROUTINE States_Control _States_Clear (
-  States_Control states_to_clear,
-  States_Control current_state
-)
-{
-   return (current_state & ~states_to_clear);
-}
-
-/*PAGE
- *
- *  _States_Is_ready
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the_states indicates that the
- *  state is READY, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _States_Is_ready (
-  States_Control the_states
-)
-{
-   return (the_states == STATES_READY);
-}
-
-/*PAGE
- *
- *  _States_Is_only_dormant
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the DORMANT state is the ONLY state
- *  set in the_states, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _States_Is_only_dormant (
-  States_Control the_states
-)
-{
-   return (the_states == STATES_DORMANT);
-}
-
-/*PAGE
- *
- *  _States_Is_dormant
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the DORMANT state is set in
- *  the_states, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _States_Is_dormant (
-  States_Control the_states
-)
-{
-   return (the_states & STATES_DORMANT);
-}
-
-/*PAGE
- *
- *  _States_Is_suspended
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the SUSPENDED state is set in
- *  the_states, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _States_Is_suspended (
-  States_Control the_states
-)
-{
-   return (the_states & STATES_SUSPENDED);
-}
-
-/*PAGE
- *
- *  _States_Is_Transient
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the TRANSIENT state is set in
- *  the_states, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _States_Is_transient (
-  States_Control the_states
-)
-{
-   return (the_states & STATES_TRANSIENT);
-}
-
-/*PAGE
- *
- *  _States_Is_delaying
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the DELAYING state is set in
- *  the_states, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _States_Is_delaying (
-  States_Control the_states
-)
-{
-   return (the_states & STATES_DELAYING);
-}
-
-/*PAGE
- *
- *  _States_Is_waiting_for_buffer
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the WAITING_FOR_BUFFER state is set in
- *  the_states, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _States_Is_waiting_for_buffer (
-  States_Control the_states
-)
-{
-   return (the_states & STATES_WAITING_FOR_BUFFER);
-}
-
-/*PAGE
- *
- *  _States_Is_waiting_for_segment
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the WAITING_FOR_SEGMENT state is set in
- *  the_states, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _States_Is_waiting_for_segment (
-  States_Control the_states
-)
-{
-   return (the_states & STATES_WAITING_FOR_SEGMENT);
-}
-
-/*PAGE
- *
- *  _States_Is_waiting_for_message
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the WAITING_FOR_MESSAGE state is set in
- *  the_states, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _States_Is_waiting_for_message (
-  States_Control the_states
-)
-{
-   return (the_states & STATES_WAITING_FOR_MESSAGE);
-}
-
-/*PAGE
- *
- *  _States_Is_waiting_for_event
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the WAITING_FOR_EVENT state is set in
- *  the_states, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _States_Is_waiting_for_event (
-  States_Control the_states
-)
-{
-   return (the_states & STATES_WAITING_FOR_EVENT);
-}
-
-/*PAGE
- *
- *  _States_Is_waiting_for_mutex
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the WAITING_FOR_MUTEX state
- *  is set in the_states, and FALSE otherwise.
- */
- 
-RTEMS_INLINE_ROUTINE boolean _States_Is_waiting_for_mutex (
-  States_Control the_states
-)
-{
-   return (the_states & STATES_WAITING_FOR_MUTEX);
-}
-
-/*PAGE
- *
- *  _States_Is_waiting_for_semaphore
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the WAITING_FOR_SEMAPHORE state
- *  is set in the_states, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _States_Is_waiting_for_semaphore (
-  States_Control the_states
-)
-{
-   return (the_states & STATES_WAITING_FOR_SEMAPHORE);
-}
-
-/*PAGE
- *
- *  _States_Is_waiting_for_time
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the WAITING_FOR_TIME state is set in
- *  the_states, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _States_Is_waiting_for_time (
-  States_Control the_states
-)
-{
-   return (the_states & STATES_WAITING_FOR_TIME);
-}
-
-/*PAGE
- *
- *  _States_Is_waiting_for_rpc_reply
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the WAITING_FOR_TIME state is set in
- *  the_states, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _States_Is_waiting_for_rpc_reply (
-  States_Control the_states
-)
-{
-   return (the_states & STATES_WAITING_FOR_RPC_REPLY);
-}
-
-/*PAGE
- *
- *  _States_Is_waiting_for_period
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the WAITING_FOR_PERIOD state is set in
- *  the_states, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _States_Is_waiting_for_period (
-  States_Control the_states
-)
-{
-   return (the_states & STATES_WAITING_FOR_PERIOD);
-}
-
-/*PAGE
- *
- *  _States_Is_locally_blocked
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if one of the states which indicates
- *  that a task is blocked waiting for a local resource is set in
- *  the_states, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _States_Is_locally_blocked (
-  States_Control the_states
-)
-{
-   return (the_states & STATES_LOCALLY_BLOCKED);
-}
-
-/*PAGE
- *
- *  _States_Is_waiting_on_thread_queue
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if one of the states which indicates
- *  that a task is blocked waiting for a local resource is set in
- *  the_states, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _States_Is_waiting_on_thread_queue (
-  States_Control the_states
-)
-{
-   return (the_states & STATES_WAITING_ON_THREAD_QUEUE);
-}
-
-/*PAGE
- *
- *  _States_Is_blocked
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if one of the states which indicates
- *  that a task is blocked is set in the_states, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _States_Is_blocked (
-  States_Control the_states
-)
-{
-   return (the_states & STATES_BLOCKED);
-}
-
-/*PAGE
- *
- *
- *  _States_Are_set
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if any of the states in the mask
- *  are set in the_states, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _States_Are_set (
-  States_Control the_states,
-  States_Control mask
-)
-{
-   return ( (the_states & mask) != STATES_READY);
-}
-
-#endif
-/* end of include file */
diff --git a/cpukit/score/inline/rtems/score/sysstate.inl b/cpukit/score/inline/rtems/score/sysstate.inl
deleted file mode 100644
index dea36d2806..0000000000
--- a/cpukit/score/inline/rtems/score/sysstate.inl
+++ /dev/null
@@ -1,154 +0,0 @@
-/*  sysstates.inl
- *
- *  This file contains the inline implementation of routines regarding the 
- *  system state.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __SYSTEM_STATE_inl
-#define __SYSTEM_STATE_inl
-
-/*PAGE
- *
- *  _System_state_Handler_initialization
- *
- *  DESCRIPTION:
- *
- *  This routine initializes the system state handler.
- */
- 
-RTEMS_INLINE_ROUTINE void _System_state_Handler_initialization (
-  boolean  is_multiprocessing
-)
-{
-  _System_state_Current = SYSTEM_STATE_BEFORE_INITIALIZATION;
-  _System_state_Is_multiprocessing = is_multiprocessing;
-}
- 
-/*PAGE
- *
- *  _System_state_Set
- *
- *  DESCRIPTION:
- *
- *  This routine sets the current system state to that specified by
- *  the called.
- */
-
-RTEMS_INLINE_ROUTINE void _System_state_Set (
-  System_state_Codes state
-)
-{
-  _System_state_Current = state;
-}
-
-/*PAGE
- *
- *  _System_state_Get
- *
- *  DESCRIPTION:
- *
- *  This function returns the current system state.
- */
-
-RTEMS_INLINE_ROUTINE System_state_Codes _System_state_Get ( void )
-{
-  return _System_state_Current;
-}
-
-/*PAGE
- *
- *  _System_state_Is_before_initialization
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the state is equal to the
- *  "before initialization" state, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _System_state_Is_before_initialization (
-  System_state_Codes state
-)
-{
-  return (state == SYSTEM_STATE_BEFORE_INITIALIZATION);
-}
-
-/*PAGE
- *
- *  _System_state_Is_before_multitasking
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the state is equal to the
- *  "before multitasking" state, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _System_state_Is_before_multitasking (
-  System_state_Codes state
-)
-{
-  return (state == SYSTEM_STATE_BEFORE_MULTITASKING);
-}
-
-/*PAGE
- *
- *  _System_state_Is_begin_multitasking
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the state is equal to the
- *  "begin multitasking" state, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _System_state_Is_begin_multitasking (
-  System_state_Codes state
-)
-{
-  return (state == SYSTEM_STATE_BEGIN_MULTITASKING);
-}
-
-/*PAGE
- *
- *  _System_state_Is_up
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the state is equal to the
- *  "up" state, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _System_state_Is_up (
-  System_state_Codes state
-)
-{
-  return (state == SYSTEM_STATE_UP);
-}
-
-/*PAGE
- *
- *  _System_state_Is_failed
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the state is equal to the
- *  "failed" state, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _System_state_Is_failed (
-  System_state_Codes state
-)
-{
-  return (state == SYSTEM_STATE_FAILED);
-}
-
-#endif
-/* end of include file */
diff --git a/cpukit/score/inline/rtems/score/thread.inl b/cpukit/score/inline/rtems/score/thread.inl
deleted file mode 100644
index eef4532c07..0000000000
--- a/cpukit/score/inline/rtems/score/thread.inl
+++ /dev/null
@@ -1,404 +0,0 @@
-/*  thread.inl
- *
- *  This file contains the macro implementation of the inlined
- *  routines from the Thread handler.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __THREAD_inl
-#define __THREAD_inl
-
-/*PAGE
- *
- *  _Thread_Stop_multitasking
- *
- *  DESCRIPTION:
- *
- *  This routine halts multitasking and returns control to
- *  the "thread" (i.e. the BSP) which initially invoked the
- *  routine which initialized the system.
- */
-
-RTEMS_INLINE_ROUTINE void _Thread_Stop_multitasking( void )
-{
-  _Context_Switch( &_Thread_Executing->Registers, &_Thread_BSP_context );
-}
-
-/*PAGE
- *
- *  _Thread_Is_executing
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the_thread is the currently executing
- *  thread, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Thread_Is_executing (
-  Thread_Control *the_thread
-)
-{
-  return ( the_thread == _Thread_Executing );
-}
-
-/*PAGE
- *
- *  _Thread_Is_heir
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the_thread is the heir
- *  thread, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Thread_Is_heir (
-  Thread_Control *the_thread
-)
-{
-  return ( the_thread == _Thread_Heir );
-}
-
-/*PAGE
- *
- *  _Thread_Is_executing_also_the_heir
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the currently executing thread
- *  is also the heir thread, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Thread_Is_executing_also_the_heir( void )
-{
-  return ( _Thread_Executing == _Thread_Heir );
-}
-
-/*PAGE
- *
- *  _Thread_Resume
- *
- *  DESCRIPTION:
- *
- *  This routine clears the SUSPENDED state for the_thread.  It performs
- *  any necessary scheduling operations including the selection of
- *  a new heir thread.
- */
-
-RTEMS_INLINE_ROUTINE void _Thread_Resume (
-  Thread_Control *the_thread
-)
-{
-  _Thread_Clear_state( the_thread, STATES_SUSPENDED );
-}
-
-/*PAGE
- *
- *  _Thread_Unblock
- *
- *  DESCRIPTION:
- *
- *  This routine clears any blocking state for the_thread.  It performs
- *  any necessary scheduling operations including the selection of
- *  a new heir thread.
- */
-
-RTEMS_INLINE_ROUTINE void _Thread_Unblock (
-  Thread_Control *the_thread
-)
-{
-  _Thread_Clear_state( the_thread, STATES_BLOCKED );
-}
-
-/*PAGE
- *
- *  _Thread_Restart_self
- *
- *  DESCRIPTION:
- *
- *  This routine resets the current context of the calling thread
- *  to that of its initial state.
- */
-
-RTEMS_INLINE_ROUTINE void _Thread_Restart_self( void )
-{
-  if ( _Thread_Executing->fp_context != NULL )
-    _Context_Restore_fp( &_Thread_Executing->fp_context );
-
-  _CPU_Context_Restart_self( &_Thread_Executing->Registers );
-}
-
-/*PAGE
- *
- *  _Thread_Calculate_heir
- *
- *  DESCRIPTION:
- *
- *  This function returns a pointer to the highest priority
- *  ready thread.
- */
-
-RTEMS_INLINE_ROUTINE void _Thread_Calculate_heir( void )
-{
-  _Thread_Heir = (Thread_Control *)
-    _Thread_Ready_chain[ _Priority_Get_highest() ].first;
-}
-
-/*PAGE
- *
- *  _Thread_Is_allocated_fp
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the floating point context of
- *  the_thread is currently loaded in the floating point unit, and
- *  FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Thread_Is_allocated_fp (
-  Thread_Control *the_thread
-)
-{
-  return ( the_thread == _Thread_Allocated_fp );
-}
-
-/*PAGE
- *
- *  _Thread_Deallocate_fp
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked when the currently loaded floating
- *  point context is now longer associated with an active thread.
- */
-
-RTEMS_INLINE_ROUTINE void _Thread_Deallocate_fp( void )
-{
-  _Thread_Allocated_fp = NULL;
-}
-
-/*PAGE
- *
- *  _Thread_Disable_dispatch
- *
- *  DESCRIPTION:
- *
- *  This routine prevents dispatching.
- */
-
-RTEMS_INLINE_ROUTINE void _Thread_Disable_dispatch( void )
-{
-  _Thread_Dispatch_disable_level += 1;
-}
-
-/*PAGE
- *
- *  _Thread_Enable_dispatch
- *
- *  DESCRIPTION:
- *
- *  This routine allows dispatching to occur again.  If this is
- *  the outer most dispatching critical section, then a dispatching
- *  operation will be performed and, if necessary, control of the
- *  processor will be transferred to the heir thread.
- */
-
-#if ( CPU_INLINE_ENABLE_DISPATCH == TRUE )
-RTEMS_INLINE_ROUTINE void _Thread_Enable_dispatch()
-{
-  if ( (--_Thread_Dispatch_disable_level) == 0 )
-    _Thread_Dispatch();
-}
-#endif
-
-#if ( CPU_INLINE_ENABLE_DISPATCH == FALSE )
-void _Thread_Enable_dispatch( void );
-#endif
-
-/*PAGE
- *
- *  _Thread_Unnest_dispatch
- *
- *  DESCRIPTION:
- *
- *  This routine allows dispatching to occur again.  However,
- *  no dispatching operation is performed even if this is the outer
- *  most dispatching critical section.
- */
-
-RTEMS_INLINE_ROUTINE void _Thread_Unnest_dispatch( void )
-{
-  _Thread_Dispatch_disable_level -= 1;
-}
-
-/*PAGE
- *
- *  _Thread_Is_dispatching_enabled
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if dispatching is disabled, and FALSE
- *  otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Thread_Is_dispatching_enabled( void )
-{
-  return ( _Thread_Dispatch_disable_level == 0 );
-}
-
-/*PAGE
- *
- *  _Thread_Is_context_switch_necessary
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if dispatching is disabled, and FALSE
- *  otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Thread_Is_context_switch_necessary( void )
-{
-  return ( _Context_Switch_necessary );
-}
-
-/*PAGE
- *
- *  _Thread_Dispatch_initialization
- *
- *  DESCRIPTION:
- *
- *  This routine initializes the thread dispatching subsystem.
- */
-
-RTEMS_INLINE_ROUTINE void _Thread_Dispatch_initialization( void )
-{
-  _Thread_Dispatch_disable_level = 1;
-}
-
-/*PAGE
- *
- *  _Thread_Is_null
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the_thread is NULL and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Thread_Is_null (
-  Thread_Control *the_thread
-)
-{
-  return ( the_thread == NULL );
-}
-
-/*PAGE
- *
- *  _Thread_Get
- *
- *  DESCRIPTION:
- *
- *  This function maps thread IDs to thread control
- *  blocks.  If ID corresponds to a local thread, then it
- *  returns the_thread control pointer which maps to ID
- *  and location is set to OBJECTS_LOCAL.  If the thread ID is
- *  global and resides on a remote node, then location is set
- *  to OBJECTS_REMOTE, and the_thread is undefined.
- *  Otherwise, location is set to OBJECTS_ERROR and
- *  the_thread is undefined.
- *
- *  NOTE:  XXX... This routine may be able to be optimized.
- */
-
-RTEMS_INLINE_ROUTINE Thread_Control *_Thread_Get (
-  Objects_Id         id,
-  Objects_Locations *location
-)
-{
-  Objects_Classes      the_class;
-  Objects_Information *information;
-  Thread_Control      *tp = (Thread_Control *) 0;
- 
-  if ( _Objects_Are_ids_equal( id, OBJECTS_ID_OF_SELF ) ) {
-    _Thread_Disable_dispatch();
-    *location = OBJECTS_LOCAL;
-    tp = _Thread_Executing;
-    goto done;
-  }
- 
-  the_class = _Objects_Get_class( id );
- 
-  if ( the_class > OBJECTS_CLASSES_LAST ) {
-    *location = OBJECTS_ERROR;
-    goto done;
-  }
- 
-  information = _Objects_Information_table[ the_class ];
- 
-  if ( !information || !information->is_thread ) {
-    *location = OBJECTS_ERROR;
-    goto done;
-  }
- 
-  tp = (Thread_Control *) _Objects_Get( information, id, location );
- 
-done:
-  return tp;
-}
-
-
-/*
- *  _Thread_Is_proxy_blocking
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the status code is equal to the
- *  status which indicates that a proxy is blocking, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Thread_Is_proxy_blocking (
-  unsigned32 code
-)
-{
-  return (code == THREAD_STATUS_PROXY_BLOCKING);
-}
-
-/*PAGE
- *
- *  _Thread_Internal_allocate
- *
- *  DESCRIPTION:
- *
- *  This routine allocates an internal thread.
- */
- 
-RTEMS_INLINE_ROUTINE Thread_Control *_Thread_Internal_allocate( void )
-{
-  return (Thread_Control *) _Objects_Allocate( &_Thread_Internal_information );
-}
- 
-/*PAGE
- *
- *  _Thread_Internal_free
- *
- *  DESCRIPTION:
- *
- *  This routine frees an internal thread.
- */
- 
-RTEMS_INLINE_ROUTINE void _Thread_Internal_free (
-  Thread_Control *the_task
-)
-{
-  _Objects_Free( &_Thread_Internal_information, &the_task->Object );
-}
-
-#endif
-/* end of include file */
diff --git a/cpukit/score/inline/rtems/score/threadmp.inl b/cpukit/score/inline/rtems/score/threadmp.inl
deleted file mode 100644
index 7a0391ff73..0000000000
--- a/cpukit/score/inline/rtems/score/threadmp.inl
+++ /dev/null
@@ -1,61 +0,0 @@
-/*  inline/threadmp.inl
- *
- *  This include file contains the bodies of all inlined routines
- *  for the multiprocessing part of thread package.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __INLINE_MP_THREAD_inl
-#define __INLINE_MP_THREAD_inl
-
-/*PAGE
- *
- *  _Thread_MP_Is_receive
- *
- *  DESCRIPTION:
- *
- *  This function returns true if the thread in question is the
- *  multiprocessing receive thread.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Thread_MP_Is_receive (
-  Thread_Control *the_thread
-)
-{
-  return the_thread == _Thread_MP_Receive;
-}
-
-/*PAGE
- *
- *  _Thread_MP_Free_proxy
- *
- *  DESCRIPTION:
- *
- *  This routine frees a proxy control block to the
- *  inactive chain of free proxy control blocks.
- */
-
-RTEMS_INLINE_ROUTINE void _Thread_MP_Free_proxy (
-  Thread_Control *the_thread
-)
-{
-  Thread_Proxy_control *the_proxy;
-
-  the_proxy = (Thread_Proxy_control *) the_thread;
-
-  _Chain_Extract( &the_proxy->Active );
-
-  _Chain_Append( &_Thread_MP_Inactive_proxies, &the_thread->Object.Node );
-}
-
-#endif
-/* end of include file */
diff --git a/cpukit/score/inline/rtems/score/tod.inl b/cpukit/score/inline/rtems/score/tod.inl
deleted file mode 100644
index 326d662e64..0000000000
--- a/cpukit/score/inline/rtems/score/tod.inl
+++ /dev/null
@@ -1,67 +0,0 @@
-/*  tod.inl
- *
- *  This file contains the static inline implementation of the inlined routines
- *  from the Time of Day Handler.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __TIME_OF_DAY_inl
-#define __TIME_OF_DAY_inl
-
-/*PAGE
- *
- *  _TOD_Tickle_ticks
- *
- *  DESCRIPTION:
- *
- *  This routine increments the ticks field of the current time of
- *  day at each clock tick.
- */
-
-RTEMS_INLINE_ROUTINE void _TOD_Tickle_ticks( void )
-{
-  _TOD_Current.ticks += 1;
-  _Watchdog_Ticks_since_boot += 1;
-}
-
-/*PAGE
- *
- *  _TOD_Deactivate
- *
- *  DESCRIPTION:
- *
- *  This routine deactivates updating of the current time of day.
- */
-
-RTEMS_INLINE_ROUTINE void _TOD_Deactivate( void )
-{
-  _Watchdog_Remove( &_TOD_Seconds_watchdog );
-}
-
-/*PAGE
- *
- *  _TOD_Activate
- *
- *  DESCRIPTION:
- *
- *  This routine activates updating of the current time of day.
- */
-
-RTEMS_INLINE_ROUTINE void _TOD_Activate(
-  Watchdog_Interval ticks
-)
-{
-  _Watchdog_Insert_ticks( &_TOD_Seconds_watchdog, ticks );
-}
-
-#endif
-/* end of include file */
diff --git a/cpukit/score/inline/rtems/score/tqdata.inl b/cpukit/score/inline/rtems/score/tqdata.inl
deleted file mode 100644
index d589933cf8..0000000000
--- a/cpukit/score/inline/rtems/score/tqdata.inl
+++ /dev/null
@@ -1,73 +0,0 @@
-/*  tqdata.inl
- *
- *  This file contains the static inline implementation of the inlined
- *  routines needed to support the Thread Queue Data.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __THREAD_QUEUE_DATA_inl
-#define __THREAD_QUEUE_DATA_inl
-
-/*PAGE
- *
- *  _Thread_queue_Header_number
- *
- *  DESCRIPTION:
- *
- *  This function returns the index of the priority chain on which
- *  a thread of the_priority should be placed.
- */
-
-RTEMS_INLINE_ROUTINE unsigned32 _Thread_queue_Header_number (
-  Priority_Control the_priority
-)
-{
-  return (the_priority / TASK_QUEUE_DATA_PRIORITIES_PER_HEADER);
-}
-
-/*PAGE
- *
- *  _Thread_queue_Is_reverse_search
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the_priority indicates that the
- *  enqueue search should start at the front of this priority
- *  group chain, and FALSE if the search should start at the rear.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Thread_queue_Is_reverse_search (
-  Priority_Control the_priority
-)
-{
-  return ( the_priority & TASK_QUEUE_DATA_REVERSE_SEARCH_MASK );
-}
-
-/*PAGE
- *
- *  _Thread_queue_Enter_critical_section
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked to indicate that the specified thread queue is
- *  entering a critical section.
- */
- 
-RTEMS_INLINE_ROUTINE void _Thread_queue_Enter_critical_section (
-  Thread_queue_Control *the_thread_queue
-)
-{
-  the_thread_queue->sync_state = THREAD_QUEUE_NOTHING_HAPPENED;
-}
-
-#endif
-/* end of include file */
diff --git a/cpukit/score/inline/rtems/score/userext.inl b/cpukit/score/inline/rtems/score/userext.inl
deleted file mode 100644
index 29f7975aaa..0000000000
--- a/cpukit/score/inline/rtems/score/userext.inl
+++ /dev/null
@@ -1,132 +0,0 @@
-/*  userext.inl
- *
- *  This file contains the macro implementation of the inlined routines
- *  from the User Extension Handler
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __USER_EXTENSIONS_inl
-#define __USER_EXTENSIONS_inl
-
-#include <rtems/score/wkspace.h>
-
-/*PAGE
- *
- *  _User_extensions_Handler_initialization
- *
- *  DESCRIPTION:
- *
- *  This routine performs the initialization necessary for this handler.
- */
-
-RTEMS_INLINE_ROUTINE void _User_extensions_Handler_initialization (
-    unsigned32              number_of_extensions,
-    User_extensions_Table  *initial_extensions
-)
-{
-  User_extensions_Control *extension;
-  unsigned32               i;
-
-  _Chain_Initialize_empty( &_User_extensions_List );
-
-  if ( initial_extensions ) {
-    for (i=0 ; i<number_of_extensions ; i++ ) {
-      extension =
-         _Workspace_Allocate_or_fatal_error( sizeof(User_extensions_Control) );
-
-      extension->Callouts = initial_extensions[i];
-      _Chain_Append( &_User_extensions_List, &extension->Node );
-    }
-  }
-}
-
-/*PAGE
- *
- *  _User_extensions_Add_set
- *
- *  DESCRIPTION:
- *
- *  This routine is used to add a user extension set to the active list.
- */
-
-RTEMS_INLINE_ROUTINE void _User_extensions_Add_set (
-  User_extensions_Control *the_extension,
-  User_extensions_Table   *extension_table
-)
-{
-  the_extension->Callouts = *extension_table;
-
-  _Chain_Append( &_User_extensions_List, &the_extension->Node );
-}
-
-/*PAGE
- *
- *  _User_extensions_Add_API_set
- *  DESCRIPTION:
- *
- *  This routine is used to add an API extension set to the active list.
- */
- 
-RTEMS_INLINE_ROUTINE void _User_extensions_Add_API_set (
-  User_extensions_Control *the_extension
-)
-{
-  _Chain_Prepend( &_User_extensions_List, &the_extension->Node );
-}
- 
-/*PAGE
- *
- *  _User_extensions_Remove_set
- *
- *  DESCRIPTION:
- *
- *  This routine is used to remove a user extension set from the active list.
- */
-
-RTEMS_INLINE_ROUTINE void _User_extensions_Remove_set (
-  User_extensions_Control  *the_extension
-)
-{
-  _Chain_Extract( &the_extension->Node );
-}
-
-/*PAGE
- *
- *  _User_extensions_Thread_switch
- *
- *  DESCRIPTION:
- *
- *  This routine is used to invoke the user extension which
- *  is invoked when a context switch occurs.
- */
-
-RTEMS_INLINE_ROUTINE void _User_extensions_Thread_switch (
-  Thread_Control *executing,
-  Thread_Control *heir
-)
-{
-  Chain_Node              *the_node;
-  User_extensions_Control *the_extension;
-
-  for ( the_node = _User_extensions_List.first ;
-        !_Chain_Is_tail( &_User_extensions_List, the_node ) ;
-        the_node = the_node->next ) {
-
-    the_extension = (User_extensions_Control *) the_node;
-
-    if ( the_extension->Callouts.thread_switch != NULL )
-      (*the_extension->Callouts.thread_switch)( executing, heir );
-  }
-}
-
-#endif
-/* end of include file */
diff --git a/cpukit/score/inline/rtems/score/watchdog.inl b/cpukit/score/inline/rtems/score/watchdog.inl
deleted file mode 100644
index 9662a9abc6..0000000000
--- a/cpukit/score/inline/rtems/score/watchdog.inl
+++ /dev/null
@@ -1,324 +0,0 @@
-/*  watchdog.inl
- *
- *  This file contains the static inline implementation of all inlined
- *  routines in the Watchdog Handler.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __WATCHDOG_inl
-#define __WATCHDOG_inl
-
-/*PAGE
- *
- *  _Watchdog_Initialize
- *
- *  DESCRIPTION:
- *
- *  This routine initializes the specified watchdog.  The watchdog is
- *  made inactive, the watchdog id and handler routine are set to the
- *  specified values.
- */
-
-RTEMS_INLINE_ROUTINE void _Watchdog_Initialize(
-  Watchdog_Control               *the_watchdog,
-  Watchdog_Service_routine_entry  routine,
-  Objects_Id                      id,
-  void                           *user_data
-)
-{
-  the_watchdog->state     = WATCHDOG_INACTIVE;
-  the_watchdog->routine   = routine;
-  the_watchdog->id        = id;
-  the_watchdog->user_data = user_data;
-}
-
-/*PAGE
- *
- *  _Watchdog_Is_active
- *
- *  DESCRIPTION:
- *
- *  This routine returns TRUE if the watchdog timer is in the ACTIVE
- *  state, and FALSE otherwise.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Watchdog_Is_active(
-  Watchdog_Control *the_watchdog
-)
-{
-
-  return ( the_watchdog->state == WATCHDOG_ACTIVE );
-
-}
-
-/*PAGE
- *
- *  _Watchdog_Activate
- *
- *  DESCRIPTION:
- *
- *  This routine activates THE_WATCHDOG timer which is already
- *  on a watchdog chain.
- */
-
-RTEMS_INLINE_ROUTINE void _Watchdog_Activate(
-  Watchdog_Control *the_watchdog
-)
-{
-
-  the_watchdog->state = WATCHDOG_ACTIVE;
-
-}
-
-/*PAGE
- *
- *  _Watchdog_Deactivate
- *
- *  DESCRIPTION:
- *
- *  This routine deactivates THE_WATCHDOG timer which will remain
- *  on a watchdog chain.
- */
-
-RTEMS_INLINE_ROUTINE void _Watchdog_Deactivate(
-  Watchdog_Control *the_watchdog
-)
-{
-
-  the_watchdog->state = WATCHDOG_REMOVE_IT;
-
-}
-
-/*PAGE
- *
- *  _Watchdog_Tickle_ticks
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked at each clock tick to update the ticks
- *  watchdog chain.
- */
-
-RTEMS_INLINE_ROUTINE void _Watchdog_Tickle_ticks( void )
-{
-
-  _Watchdog_Tickle( &_Watchdog_Ticks_chain );
-
-}
-
-/*PAGE
- *
- *  _Watchdog_Tickle_seconds
- *
- *  DESCRIPTION:
- *
- *  This routine is invoked at each clock tick to update the seconds
- *  watchdog chain.
- */
-
-RTEMS_INLINE_ROUTINE void _Watchdog_Tickle_seconds( void )
-{
-
-  _Watchdog_Tickle( &_Watchdog_Seconds_chain );
-
-}
-
-/*PAGE
- *
- *  _Watchdog_Insert_ticks
- *
- *  DESCRIPTION:
- *
- *  This routine inserts THE_WATCHDOG into the ticks watchdog chain
- *  for a time of UNITS ticks.  The INSERT_MODE indicates whether
- *  THE_WATCHDOG is to be activated automatically or later, explicitly
- *  by the caller.
- */
-
-RTEMS_INLINE_ROUTINE void _Watchdog_Insert_ticks(
-  Watchdog_Control      *the_watchdog,
-  Watchdog_Interval      units
-)
-{
-
-  the_watchdog->initial = units;
-
-  _Watchdog_Insert( &_Watchdog_Ticks_chain, the_watchdog );
-
-}
-
-/*PAGE
- *
- *  _Watchdog_Insert_seconds
- *
- *  DESCRIPTION:
- *
- *  This routine inserts THE_WATCHDOG into the seconds watchdog chain
- *  for a time of UNITS seconds.  The INSERT_MODE indicates whether
- *  THE_WATCHDOG is to be activated automatically or later, explicitly
- *  by the caller.
- */
-
-RTEMS_INLINE_ROUTINE void _Watchdog_Insert_seconds(
-  Watchdog_Control      *the_watchdog,
-  Watchdog_Interval      units
-)
-{
-
-  the_watchdog->initial = units;
-
-  _Watchdog_Insert( &_Watchdog_Seconds_chain, the_watchdog );
-
-}
-
-/*PAGE
- *
- *  _Watchdog_Adjust_seconds
- *
- *  DESCRIPTION:
- *
- *  This routine adjusts the seconds watchdog chain in the forward
- *  or backward DIRECTION for UNITS seconds.  This is invoked when the
- *  current time of day is changed.
- */
-
-RTEMS_INLINE_ROUTINE void _Watchdog_Adjust_seconds(
-  Watchdog_Adjust_directions direction,
-  Watchdog_Interval          units
-)
-{
-
-  _Watchdog_Adjust( &_Watchdog_Seconds_chain, direction, units );
-
-}
-
-/*PAGE
- *
- *  _Watchdog_Adjust_ticks
- *
- *  DESCRIPTION:
- *
- *  This routine adjusts the ticks watchdog chain in the forward
- *  or backward DIRECTION for UNITS ticks.
- */
-
-RTEMS_INLINE_ROUTINE void _Watchdog_Adjust_ticks(
-  Watchdog_Adjust_directions direction,
-  Watchdog_Interval          units
-)
-{
-
-  _Watchdog_Adjust( &_Watchdog_Ticks_chain, direction, units );
-
-}
-
-/*PAGE
- *
- *  _Watchdog_Reset
- *
- *  DESCRIPTION:
- *
- *  This routine resets THE_WATCHDOG timer to its state at INSERT
- *  time.  This routine is valid only on interval watchdog timers
- *  and is used to make an interval watchdog timer fire "every" so
- *  many ticks.
- */
-
-RTEMS_INLINE_ROUTINE void _Watchdog_Reset(
-  Watchdog_Control *the_watchdog
-)
-{
-
-  (void) _Watchdog_Remove( the_watchdog );
-
-  _Watchdog_Insert( &_Watchdog_Ticks_chain, the_watchdog );
-
-}
-
-/*PAGE
- *
- *  _Watchdog_Next
- *
- *  DESCRIPTION:
- *
- *  This routine returns a pointer to the watchdog timer following
- *  THE_WATCHDOG on the watchdog chain.
- */
-
-RTEMS_INLINE_ROUTINE Watchdog_Control *_Watchdog_Next(
-  Watchdog_Control *the_watchdog
-)
-{
-
-  return ( (Watchdog_Control *) the_watchdog->Node.next );
-
-}
-
-/*PAGE
- *
- *  _Watchdog_Previous
- *
- *  DESCRIPTION:
- *
- *  This routine returns a pointer to the watchdog timer preceding
- *  THE_WATCHDOG on the watchdog chain.
- */
-
-RTEMS_INLINE_ROUTINE Watchdog_Control *_Watchdog_Previous(
-  Watchdog_Control *the_watchdog
-)
-{
-
-  return ( (Watchdog_Control *) the_watchdog->Node.previous );
-
-}
-
-/*PAGE
- *
- *  _Watchdog_First
- *
- *  DESCRIPTION:
- *
- *  This routine returns a pointer to the first watchdog timer
- *  on the watchdog chain HEADER.
- */
-
-RTEMS_INLINE_ROUTINE Watchdog_Control *_Watchdog_First(
-  Chain_Control *header
-)
-{
-
-  return ( (Watchdog_Control *) header->first );
-
-}
-
-/*PAGE
- *
- *  _Watchdog_Last
- *
- *  DESCRIPTION:
- *
- *  This routine returns a pointer to the last watchdog timer
- *  on the watchdog chain HEADER.
- */
-
-RTEMS_INLINE_ROUTINE Watchdog_Control *_Watchdog_Last(
-  Chain_Control *header
-)
-{
-
-  return ( (Watchdog_Control *) header->last );
-
-}
-
-#endif
-/* end of include file */
diff --git a/cpukit/score/inline/rtems/score/wkspace.inl b/cpukit/score/inline/rtems/score/wkspace.inl
deleted file mode 100644
index f92bde0f41..0000000000
--- a/cpukit/score/inline/rtems/score/wkspace.inl
+++ /dev/null
@@ -1,57 +0,0 @@
-/*  wkspace.inl
- *
- *  This include file contains the bodies of the routines which contains
- *  information related to the RAM Workspace.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __WORKSPACE_inl
-#define __WORKSPACE_inl
-
-/*PAGE
- *
- *  _Workspace_Allocate
- *
- *  DESCRIPTION:
- *
- *  This routine returns the address of a block of memory of size
- *  bytes.  If a block of the appropriate size cannot be allocated
- *  from the workspace, then NULL is returned.
- */
-
-RTEMS_INLINE_ROUTINE void *_Workspace_Allocate(
-  unsigned32 size
-)
-{
-   return _Heap_Allocate( &_Workspace_Area, size );
-}
-
-/*PAGE
- *
- *  _Workspace_Free
- *
- *  DESCRIPTION:
- *
- *  This function frees the specified block of memory.  If the block
- *  belongs to the Workspace and can be successfully freed, then
- *  TRUE is returned.  Otherwise FALSE is returned.
- */
-
-RTEMS_INLINE_ROUTINE boolean _Workspace_Free(
-  void *block
-)
-{
-   return _Heap_Free( &_Workspace_Area, block );
-}
-
-#endif
-/* end of include file */
diff --git a/cpukit/score/macros/README b/cpukit/score/macros/README
deleted file mode 100644
index b2f0c4d481..0000000000
--- a/cpukit/score/macros/README
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-#  $Id$
-#
-
-The files in this directory are not considered the "primary" source
-of inlined routines for RTEMS.  The "inline" directory contains
-the implementations of the inlined basis which are regularly
-tested.  In general, an effort is made to keep the contents of
-this directory up to date but testing is only performed irregularly
-and even then it is usually with a single target processor and BSP.
-
-The primary purpose of the code in this directory is to insure
-that RTEMS can be compiled using a C compiler which does not support
-static inline routines.
-
-These were last successfully tested on 2/1/95 on a prerelease version
-of 3.2.0.  The testing was done only on the Force CPU386 i386 target board.
-No testing was done on version of the code in the final release.
diff --git a/cpukit/score/macros/rtems/score/README b/cpukit/score/macros/rtems/score/README
deleted file mode 100644
index b2f0c4d481..0000000000
--- a/cpukit/score/macros/rtems/score/README
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-#  $Id$
-#
-
-The files in this directory are not considered the "primary" source
-of inlined routines for RTEMS.  The "inline" directory contains
-the implementations of the inlined basis which are regularly
-tested.  In general, an effort is made to keep the contents of
-this directory up to date but testing is only performed irregularly
-and even then it is usually with a single target processor and BSP.
-
-The primary purpose of the code in this directory is to insure
-that RTEMS can be compiled using a C compiler which does not support
-static inline routines.
-
-These were last successfully tested on 2/1/95 on a prerelease version
-of 3.2.0.  The testing was done only on the Force CPU386 i386 target board.
-No testing was done on version of the code in the final release.
diff --git a/cpukit/score/macros/rtems/score/address.inl b/cpukit/score/macros/rtems/score/address.inl
deleted file mode 100644
index 712809a4e7..0000000000
--- a/cpukit/score/macros/rtems/score/address.inl
+++ /dev/null
@@ -1,68 +0,0 @@
-/*  macros/address.h
- *
- *  This include file contains the bodies of the routines
- *  about addresses which are inlined.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __MACROS_ADDRESSES_h
-#define __MACROS_ADDRESSES_h
-
-/*PAGE
- *
- *  _Addresses_Add_offset
- *
- */
-
-#define _Addresses_Add_offset( _base, _offset ) \
-  ((void *)((char *)(_base) + (_offset)))
-
-/*PAGE
- *
- *  _Addresses_Subtract_offset
- *
- */
-
-#define _Addresses_Subtract_offset( _base, _offset ) \
-  ((void *)((char *)(_base) - (_offset)))
-
-/*PAGE
- *
- *  _Addresses_Subtract
- *
- *  NOTE:  The cast of an address to an unsigned32 makes this code
- *         dependent on an addresses being thirty two bits.
- */
-
-#define _Addresses_Subtract( _left, _right ) \
-  ((void *)(_left) - (void *)(_right))
-
-/*PAGE
- *
- *  _Addresses_Is_aligned
- *
- */
-
-#define _Addresses_Is_aligned( _address ) \
-    ( ( (unsigned32)(_address) % 4 ) == 0 )
-
-/*PAGE
- *
- *  _Addresses_Is_in_range
- *
- */
-
-#define _Addresses_Is_in_range( _address, _base, _limit ) \
-  ( (_address) >= (_base) && (_address) <= (_limit) )
-
-#endif
-/* end of include file */
diff --git a/cpukit/score/macros/rtems/score/chain.inl b/cpukit/score/macros/rtems/score/chain.inl
deleted file mode 100644
index 85ede31c12..0000000000
--- a/cpukit/score/macros/rtems/score/chain.inl
+++ /dev/null
@@ -1,200 +0,0 @@
-/*  macros/chain.h
- *
- *  This include file contains the bodies of the routines which are
- *  associated with doubly linked chains and inlined.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __MACROS_CHAIN_h
-#define __MACROS_CHAIN_h
-
-/*PAGE
- *
- *  _Chain_Are_nodes_equal
- */
-
-#define _Chain_Are_nodes_equal( _left, _right ) \
-  ( (_left) == (_right) )
-
-/*PAGE
- *
- *  _Chain_Is_null
- */
-
-#define _Chain_Is_null( _the_chain ) \
-  ( (_the_chain) == NULL )
-
-/*PAGE
- *
- *  _Chain_Is_null_node
- */
-
-#define _Chain_Is_null_node( _the_node ) \
-  ( (_the_node) == NULL )
-
-/*PAGE
- *
- *  _Chain_Head
- */
-
-#define _Chain_Head( _the_chain ) \
-   ((Chain_Node *) (_the_chain))
-
-/*PAGE
- *
- *  _Chain_Tail
- */
-
-#define _Chain_Tail( _the_chain ) \
-   ((Chain_Node *) &(_the_chain)->permanent_null)
-
-/*PAGE
- *
- *  _Chain_Is_empty
- */
-
-#define _Chain_Is_empty( _the_chain ) \
-  ( (_the_chain)->first == _Chain_Tail( (_the_chain) ) )
-
-/*PAGE
- *
- *  _Chain_Is_first
- */
-
-#define _Chain_Is_first( _the_node ) \
-  ( (the_node)->previous == NULL )
-
-/*PAGE
- *
- *  _Chain_Is_last
- */
-
-#define _Chain_Is_last( _the_node ) \
-  ( (_the_node)->next == NULL )
-
-/*PAGE
- *
- *  _Chain_Has_only_one_node
- */
-
-#define _Chain_Has_only_one_node( _the_chain ) \
-  ( (_the_chain)->first == (_the_chain)->last )
-
-/*PAGE
- *
- *  _Chain_Is_head
- */
-
-#define _Chain_Is_head( _the_chain, _the_node ) \
-   ( (_the_node) == _Chain_Head( (_the_chain) ) )
-
-/*PAGE
- *
- *  _Chain_Is_tail
- */
-
-#define _Chain_Is_tail( _the_chain, _the_node ) \
-   ( (_the_node) == _Chain_Tail( (_the_chain) ) )
-
-/*PAGE
- *
- *  Chain_Initialize_empty
- */
-
-#define _Chain_Initialize_empty( _the_chain ) \
-{ \
-  (_the_chain)->first          = _Chain_Tail( (_the_chain) ); \
-  (_the_chain)->permanent_null = NULL; \
-  (_the_chain)->last           = _Chain_Head( (_the_chain) ); \
-}
-
-/*PAGE
- *
- *  _Chain_Extract_unprotected
- */
-
-#define _Chain_Extract_unprotected( _the_node ) \
-{ \
-  Chain_Node *_next; \
-  Chain_Node *_previous; \
-   \
-  _next           = (_the_node)->next; \
-  _previous       = (_the_node)->previous; \
-  _next->previous = _previous; \
-  _previous->next = _next; \
-}
-
-/*PAGE
- *
- *  _Chain_Get_unprotected
- */
-
-/*PAGE
- *
- *  Chain_Get_unprotected
- */
-
-#define _Chain_Get_unprotected( _the_chain ) \
-  (( !_Chain_Is_empty( (_the_chain) ) ) \
-    ? _Chain_Get_first_unprotected( (_the_chain) ) \
-    : NULL)
-
-/*PAGE
- *
- *  _Chain_Insert_unprotected
- */
-
-#define _Chain_Insert_unprotected( _after_node, _the_node ) \
-do {  \
-  Chain_Node *_before_node; \
-   \
-  (_the_node)->previous  = (_after_node); \
-  _before_node           = (_after_node)->next; \
-  (_after_node)->next    = (_the_node);  \
-  (_the_node)->next      = _before_node;  \
-  _before_node->previous = (_the_node);  \
-} while (0)
-
-/*PAGE
- *
- *  _Chain_Append_unprotected
- */
-
-#define _Chain_Append_unprotected( _the_chain, _the_node ) \
-{ \
-  Chain_Node *_old_last_node; \
-    \
-  (_the_node)->next     = _Chain_Tail( (_the_chain) ); \
-  _old_last_node        = (_the_chain)->last; \
-  (_the_chain)->last    = (_the_node); \
-  _old_last_node->next  = (_the_node); \
-  (_the_node)->previous = _old_last_node; \
-}
-
-/*PAGE
- *
- *  _Chain_Prepend_unprotected
- */
-
-#define _Chain_Prepend_unprotected( _the_chain, _the_node ) \
-  _Chain_Insert_unprotected( _Chain_Head( (_the_chain) ), (_the_node) )
-
-/*PAGE
- *
- *  _Chain_Prepend
- */
-
-#define _Chain_Prepend( _the_chain, _the_node ) \
-  _Chain_Insert( _Chain_Head( (_the_chain) ), (_the_node) )
-
-#endif
-/* end of include file */
diff --git a/cpukit/score/macros/rtems/score/coremsg.inl b/cpukit/score/macros/rtems/score/coremsg.inl
deleted file mode 100644
index 9868c97074..0000000000
--- a/cpukit/score/macros/rtems/score/coremsg.inl
+++ /dev/null
@@ -1,143 +0,0 @@
-/*  coremsg.inl
- *
- *  This include file contains the macro implementation of all
- *  inlined routines in the Core Message Handler.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __CORE_MESSAGE_QUEUE_inl
-#define __CORE_MESSAGE_QUEUE_inl
-
-/*PAGE
- *
- *  _CORE_message_queue_Send
- *
- */
- 
-#define _CORE_message_queue_Send( _the_message_queue, _buffer, _size, \
-_id, _api_message_queue_mp_support ) \
-  _CORE_message_queue_Submit( (_the_message_queue), (_buffer), (_size), \
-     (_id), (_api_message_queue_mp_support), CORE_MESSAGE_QUEUE_SEND_REQUEST )
- 
-/*PAGE
- *
- *  _CORE_message_queue_Urgent
- *
- */
- 
-#define _CORE_message_queue_Urgent( _the_message_queue, _buffer, _size, \
-_id, _api_message_queue_mp_support ) \
-  _CORE_message_queue_Submit( (_the_message_queue), (_buffer), (_size), \
-     (_id), (_api_message_queue_mp_support), CORE_MESSAGE_QUEUE_URGENT_REQUEST )
-
-/*PAGE
- *
- *  _CORE_message_queue_Copy_buffer
- */
-
-#define _CORE_message_queue_Copy_buffer( _source, _destination, _size ) \
-  memcpy( _destination, _source, _size)
-
-/*PAGE
- *
- *  _CORE_message_queue_Allocate_message_buffer
- *
- */
-
-#define _CORE_message_queue_Allocate_message_buffer( _the_message_queue ) \
-  (CORE_message_queue_Buffer_control *) \
-    _Chain_Get( &(_the_message_queue)->Inactive_messages )
-
-/*PAGE
- *
- *  _CORE_message_queue_Free_message_buffer
- *
- */
-
-#define _CORE_message_queue_Free_message_buffer( _the_message_queue, _the_message ) \
-  _Chain_Append( \
-    &(_the_message_queue)->Inactive_messages, \
-    &(_the_message)->Node \
-  )
-
-/*PAGE
- *
- *  _CORE_message_queue_Is_priority
- *
- */
- 
-#define _CORE_message_queue_Is_priority( _the_attribute ) \
-  ((_the_attribute)->discipline == CORE_MESSAGE_QUEUE_DISCIPLINES_PRIORITY)
-
-/*PAGE
- *
- *  _CORE_message_queue_Get_pending_message
- *
- */
-
-#define _CORE_message_queue_Get_pending_message( _the_message_queue ) \
-   (CORE_message_queue_Buffer_control *) \
-     _Chain_Get_unprotected( &(_the_message_queue)->Pending_messages )
-
-/*PAGE
- *
- *  _CORE_message_queue_Append
- *
- */
-
-#define _CORE_message_queue_Append( _the_message_queue, _the_message ) \
-   _Chain_Append( &(_the_message_queue)->Pending_messages, \
-                  &(_the_message)->Node )
-
-/*PAGE
- *
- *  _CORE_message_queue_Prepend
- *
- */
-
-#define _CORE_message_queue_Prepend( _the_message_queue, _the_message ) \
-   _Chain_Prepend( &(_the_message_queue)->Pending_messages, \
-                   &(_the_message)->Node )
-
-/*PAGE
- *
- *  _CORE_message_queue_Is_null
- *
- */
-
-#define _CORE_message_queue_Is_null( _the_message_queue ) \
-   ( (_the_message_queue) == NULL  )
-
-/*PAGE
- *
- *  _CORE_message_queue_Is_notify_enabled
- *
- */
- 
-#define _CORE_message_queue_Is_notify_enabled( _the_message_queue ) \
-  ( (_the_message_queue)->notify_handler != NULL )
- 
-/*PAGE
- *
- *  _CORE_message_queue_Set_notify
- *
- */
- 
-#define _CORE_message_queue_Set_notify( \
-  _the_message_queue, _the_handler, _the_argument ) \
-    do { \
-      (_the_message_queue)->notify_handler  = (_the_handler); \
-      (_the_message_queue)->notify_argument = (_the_argument); \
-    } while ( 0 )
-
-#endif
-/* end of include file */
diff --git a/cpukit/score/macros/rtems/score/coremutex.inl b/cpukit/score/macros/rtems/score/coremutex.inl
deleted file mode 100644
index 19d535dc4e..0000000000
--- a/cpukit/score/macros/rtems/score/coremutex.inl
+++ /dev/null
@@ -1,77 +0,0 @@
-/*  macros/coremutex.h
- *
- *  This include file contains all of the inlined routines associated
- *  with core mutexes.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __MACROS_CORE_MUTEX_h
-#define __MACROS_CORE_MUTEX_h
-
-
-/*PAGE
- *
- *  _CORE_mutex_Is_locked
- *
- */
- 
-#define _CORE_mutex_Is_locked( _the_mutex ) \
-  ( (_the_mutex)->lock == CORE_MUTEX_LOCKED )
- 
-/*PAGE
- *
- *  _CORE_mutex_Is_fifo
- *
- */
- 
-#define _CORE_mutex_Is_fifo( _the_attribute ) \
-  ( (_the_attribute)->discipline == CORE_MUTEX_DISCIPLINES_FIFO )
- 
-/*PAGE
- *
- *  _CORE_mutex_Is_priority
- *
- */
-
-#define _CORE_mutex_Is_priority( _the_attribute ) \
-  ( (_the_attribute)->discipline == CORE_MUTEX_DISCIPLINES_PRIORITY )
-
-/*PAGE
- *
- *  _CORE_mutex_Is_inherit_priority
- *
- */
- 
-#define _CORE_mutex_Is_inherit_priority( _the_attribute ) \
-  ( (_the_attribute)->discipline == \
-                               CORE_MUTEX_DISCIPLINES_PRIORITY_INHERIT )
- 
-/*PAGE
- *
- *  _CORE_mutex_Is_priority_ceiling
- *
- */
- 
-#define _CORE_mutex_Is_priority_ceiling( _the_attribute )\
-  ( (_the_attribute)->discipline == CORE_MUTEX_DISCIPLINES_PRIORITY_CEILING )
- 
-/*PAGE
- *
- *  _CORE_mutex_Is_nesting_allowed
- *
- */
- 
-#define _CORE_mutex_Is_nesting_allowed( _the_attribute ) \
-  ( (_the_attribute)->allow_nesting == TRUE )
-
-#endif
-/* end of include file */
diff --git a/cpukit/score/macros/rtems/score/coresem.inl b/cpukit/score/macros/rtems/score/coresem.inl
deleted file mode 100644
index fed9227c59..0000000000
--- a/cpukit/score/macros/rtems/score/coresem.inl
+++ /dev/null
@@ -1,40 +0,0 @@
-/*  macros/coresem.h
- *
- *  This include file contains all of the inlined routines associated
- *  with core semaphores.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __MACROS_CORE_SEMAPHORE_h
-#define __MACROS_CORE_SEMAPHORE_h
-
-/*PAGE
- *
- *  _CORE_semaphore_Is_priority
- *
- */
-
-#define _CORE_semaphore_Is_priority( _the_attribute ) \
-  ( (_the_attribute)->discipline == CORE_SEMAPHORE_DISCIPLINES_PRIORITY )
-
-/*PAGE
- *
- *  _Core_semaphore_Get_count
- *
- */
- 
-#define _Core_semaphore_Get_count( _the_semaphore ) \
-  ( (_the_semaphore)->count )
-
-
-#endif
-/* end of include file */
diff --git a/cpukit/score/macros/rtems/score/heap.inl b/cpukit/score/macros/rtems/score/heap.inl
deleted file mode 100644
index d4bb8edb97..0000000000
--- a/cpukit/score/macros/rtems/score/heap.inl
+++ /dev/null
@@ -1,150 +0,0 @@
-/*  heap.inl
- *
- *  This file contains the macro implementation of the inlined
- *  routines from the heap handler.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __HEAP_inl
-#define __HEAP_inl
-
-#include <rtems/score/address.h>
-
-/*PAGE
- *
- *  _Heap_Head
- */
-
-#define _Heap_Head( _the_heap ) \
-  ((Heap_Block *)&(_the_heap)->start)
-
-/*PAGE
- *
- *  _Heap_Tail
- */
-
-#define _Heap_Tail( _the_heap ) \
-  ((Heap_Block *)&(_the_heap)->final)
-
-/*PAGE
- *
- *  _Heap_Previous_block
- */
-
-#define _Heap_Previous_block( _the_block ) \
-  ( (Heap_Block *) _Addresses_Subtract_offset( \
-      (void *)(_the_block), \
-      (_the_block)->back_flag & ~ HEAP_BLOCK_USED \
-    ) \
-  )
-
-/*PAGE
- *
- *  _Heap_Next_block
- */
-
-#define _Heap_Next_block( _the_block ) \
-  ( (Heap_Block *) _Addresses_Add_offset( \
-      (void *)(_the_block), \
-      (_the_block)->front_flag & ~ HEAP_BLOCK_USED \
-    ) \
-  )
-
-/*PAGE
- *
- *  _Heap_Block_at
- */
-
-#define _Heap_Block_at( _base, _offset ) \
-  ( (Heap_Block *) \
-     _Addresses_Add_offset( (void *)(_base), (_offset) ) )
-
-/*PAGE
- *
- *  _Heap_User_block_at
- *
- */
- 
-#define _Heap_User_block_at( _base ) \
-  _Heap_Block_at( \
-    (_base), \
-    -*(((unsigned32 *) (_base)) - 1) + -HEAP_BLOCK_USED_OVERHEAD \
-  )
-
-/*PAGE
- *
- *  _Heap_Is_previous_block_free
- */
-
-#define _Heap_Is_previous_block_free( _the_block ) \
-  ( !((_the_block)->back_flag & HEAP_BLOCK_USED) )
-
-/*PAGE
- *
- *  _Heap_Is_block_free
- */
-
-#define _Heap_Is_block_free( _the_block ) \
-  ( !((_the_block)->front_flag & HEAP_BLOCK_USED) )
-
-/*PAGE
- *
- *  _Heap_Is_block_used
- */
-
-#define _Heap_Is_block_used( _the_block ) \
-  ((_the_block)->front_flag & HEAP_BLOCK_USED)
-
-/*PAGE
- *
- *  _Heap_Block_size
- */
-
-#define _Heap_Block_size( _the_block )    \
-  ((_the_block)->front_flag & ~HEAP_BLOCK_USED)
-
-/*PAGE
- *
- *  _Heap_Start_of_user_area
- */
-
-#define _Heap_Start_of_user_area( _the_block ) \
-  ((void *) &(_the_block)->next)
-
-/*PAGE
- *
- *  _Heap_Is_block_in
- */
-
-#define _Heap_Is_block_in( _the_heap, _the_block ) \
-  ( ((_the_block) >= (_the_heap)->start) && \
-    ((_the_block) <= (_the_heap)->final) )
-
-/*PAGE
- *
- *  _Heap_Is_page_size_valid
- */
-
-#define _Heap_Is_page_size_valid( _page_size ) \
-  ( ((_page_size) != 0) && \
-    (((_page_size) % CPU_HEAP_ALIGNMENT) == 0) )
-
-/*PAGE
- *
- *  _Heap_Build_flag
- */
-
-#define _Heap_Build_flag( _size, _in_use_flag ) \
-  ( (_size) | (_in_use_flag))
-
-#endif
-/* end of include file */
diff --git a/cpukit/score/macros/rtems/score/isr.inl b/cpukit/score/macros/rtems/score/isr.inl
deleted file mode 100644
index b642c4fed2..0000000000
--- a/cpukit/score/macros/rtems/score/isr.inl
+++ /dev/null
@@ -1,48 +0,0 @@
-/*  isr.inl
- *
- *  This include file contains the macro implementation of all
- *  inlined routines in the Interrupt Handler.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __ISR_inl
-#define __ISR_inl
-
-/*PAGE
- *
- *  _ISR_Is_in_progress
- *
- */
-
-#define _ISR_Is_in_progress() \
-        (_ISR_Nest_level != 0)
-
-/*PAGE
- *
- *  _ISR_Is_vector_number_valid
- *
- */
-
-#define _ISR_Is_vector_number_valid( _vector ) \
-  ( (_vector) <= CPU_INTERRUPT_MAXIMUM_VECTOR_NUMBER )
-
-/*PAGE
- *
- *  _ISR_Is_valid_user_handler
- *
- */
-
-#define _ISR_Is_valid_user_handler( _handler ) \
-  ((_handler) != NULL)
-
-#endif
-/* end of include file */
diff --git a/cpukit/score/macros/rtems/score/mppkt.inl b/cpukit/score/macros/rtems/score/mppkt.inl
deleted file mode 100644
index b698602626..0000000000
--- a/cpukit/score/macros/rtems/score/mppkt.inl
+++ /dev/null
@@ -1,41 +0,0 @@
-/*  macros/mppkt.h
- *
- *  This package is the implementation of the Packet Handler
- *  routines which are inlined.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __MACROS_MP_PACKET_h
-#define __MACROS_MP_PACKET_h
-
-/*PAGE
- *
- *  _Mp_packet_Is_valid_packet_class
- *
- *  NOTE: Check for lower bounds (MP_PACKET_CLASSES_FIRST ) is unnecessary
- *        because this enum starts at lower bound of zero.
- */
-
-#define _Mp_packet_Is_valid_packet_class( _the_packet_class ) \
-  ( (_the_packet_class) <= MP_PACKET_CLASSES_LAST )
-
-/*PAGE
- *
- *  _Mp_packet_Is_null
- *
- */
-
-#define _Mp_packet_Is_null ( _the_packet ) \
-  ( (_the_packet) == NULL )
-
-#endif
-/* end of include file */
diff --git a/cpukit/score/macros/rtems/score/object.inl b/cpukit/score/macros/rtems/score/object.inl
deleted file mode 100644
index cce2cbde9b..0000000000
--- a/cpukit/score/macros/rtems/score/object.inl
+++ /dev/null
@@ -1,148 +0,0 @@
-/*  object.inl
- *
- *  This include file contains the macro implementation of all
- *  of the inlined routines in the Object Handler.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __OBJECTS_inl
-#define __OBJECTS_inl
-
-/*PAGE
- *
- *  _Objects_Build_id
- *
- */
-
-#define _Objects_Build_id( _the_class, _node, _index ) \
-  ( ((_the_class) << OBJECTS_CLASS_START_BIT) | \
-    ((_node) << OBJECTS_NODE_START_BIT)       | \
-    ((_index) << OBJECTS_INDEX_START_BIT) )
-
-/*PAGE
- *
- *  _Objects_Get_class
- */
- 
-#define _Objects_Get_class( _id ) \
-  (Objects_Classes) \
-    (((_id) >> OBJECTS_CLASS_START_BIT) & OBJECTS_CLASS_VALID_BITS)
-
-/*PAGE
- *
- *  _Objects_Get_node
- *
- */
-
-#define _Objects_Get_node( _id ) \
-  (((_id) >> OBJECTS_NODE_START_BIT) & OBJECTS_NODE_VALID_BITS)
-
-/*PAGE
- *
- *  _Objects_Get_index
- *
- */
-
-#define _Objects_Get_index( _id ) \
-  (((_id) >> OBJECTS_INDEX_START_BIT) & OBJECTS_INDEX_VALID_BITS)
-
-/*PAGE
- *
- *  _Objects_Is_class_valid
- *
- */
- 
-#define _Objects_Is_class_valid( _the_class ) \
-  ( (_the_class) && (_the_class) <= OBJECTS_CLASSES_LAST )
-
-/*PAGE
- *
- *  _Objects_Is_local_node
- *
- */
-
-#define _Objects_Is_local_node( _node ) \
-  ( (_node) == _Objects_Local_node )
-
-/*PAGE
- *
- *  _Objects_Is_local_id
- *
- */
-
-#define _Objects_Is_local_id( _id ) \
-  _Objects_Is_local_node( _Objects_Get_node(_id) )
-
-/*PAGE
- *
- *  _Objects_Are_ids_equal
- *
- */
-
-#define _Objects_Are_ids_equal( _left, _right ) \
-  ( (_left) == (_right) )
-
-/*PAGE
- *
- *  _Objects_Allocate
- *
- */
-
-#define _Objects_Allocate( _information )  \
-  (Objects_Control *) _Chain_Get( &(_information)->Inactive )
-
-/*PAGE
- *
- *  _Objects_Free
- *
- */
-
-#define _Objects_Free( _information, _the_object )  \
-  _Chain_Append( &(_information)->Inactive, &(_the_object)->Node )
-
-/*PAGE
- *
- *  _Objects_Open
- *
- */
-
-#define _Objects_Open( _information, _the_object, _name ) \
-  { \
-    unsigned32 _index; \
-    \
-    _index = _Objects_Get_index( (_the_object)->id ); \
-    (_information)->local_table[ _index ] = (_the_object); \
-    \
-    if ( (_information)->is_string ) \
-      _Objects_Copy_name_string( (_name), (_the_object)->name ); \
-    else \
-      _Objects_Copy_name_raw( \
-        (_name), (_the_object)->name, (_information)->name_length ); \
-  }
-
-/*PAGE
- *
- *  _Objects_Close
- *
- */
-
-#define _Objects_Close( _information, _the_object ) \
-  { \
-    unsigned32 _index; \
-    \
-    _index = _Objects_Get_index( (_the_object)->id ); \
-    (_information)->local_table[ _index ] = (Objects_Control *) NULL; \
-    _Objects_Clear_name( (_the_object)->name, (_information)->name_length ); \
-  }
-
-#endif
-/* end of include file */
diff --git a/cpukit/score/macros/rtems/score/objectmp.inl b/cpukit/score/macros/rtems/score/objectmp.inl
deleted file mode 100644
index 4593857fba..0000000000
--- a/cpukit/score/macros/rtems/score/objectmp.inl
+++ /dev/null
@@ -1,50 +0,0 @@
-/*  macros/objectmp.inl
- *
- *  This include file contains the bodies of all inlined routines
- *  which deal with global objects.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __MACROS_MP_OBJECTS_inl
-#define __MACROS_MP_OBJECTS_inl
-
-/*PAGE
- *
- *  _Objects_MP_Allocate_global_object
- *
- */
-
-#define _Objects_MP_Allocate_global_object() \
-  (Objects_MP_Control *) \
-           _Chain_Get( &_Objects_MP_Inactive_global_objects )
-
-/*PAGE
- *  _Objects_MP_Free_global_object
- *
- */
-
-#define _Objects_MP_Free_global_object( _the_object ) \
-  _Chain_Append( \
-    &_Objects_MP_Inactive_global_objects, \
-    &(_the_object)->Object.Node \
-  )
-
-/*PAGE
- *  _Objects_MP_Is_null_global_object
- *
- */
-
-#define _Objects_MP_Is_null_global_object( _the_object ) \
-  ( (_the_object) == NULL )
-
-#endif
-/* end of include file */
diff --git a/cpukit/score/macros/rtems/score/priority.inl b/cpukit/score/macros/rtems/score/priority.inl
deleted file mode 100644
index c588289163..0000000000
--- a/cpukit/score/macros/rtems/score/priority.inl
+++ /dev/null
@@ -1,170 +0,0 @@
-/*  priority.inl
- *
- *  This file contains the macro implementation of all inlined routines
- *  in the Priority Handler.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __PRIORITY_inl
-#define __PRIORITY_inl
-
-#include <rtems/score/bitfield.h>
-
-/*PAGE
- *
- *  _Priority_Handler_initialization
- *
- */
-
-#define _Priority_Handler_initialization() \
-  { \
-    unsigned32 index; \
-    \
-    _Priority_Major_bit_map = 0; \
-    for ( index=0 ; index <16 ; index++ ) \
-       _Priority_Bit_map[ index ] = 0; \
-  }
-
-/*PAGE
- *
- *  _Priority_Is_valid
- *
- */
-
-  /* 
-   *  Since PRIORITY_MINIMUM is 0 and priorities are stored unsigned,
-   *  then checking for less than 0 is unnecessary.
-   */
-
-#define _Priority_Is_valid( _the_priority ) \
-  (  (_the_priority) <= PRIORITY_MAXIMUM )
-
-/*PAGE
- *
- *  _Priority_Major
- *
- */
-
-#define _Priority_Major( _the_priority ) ( (_the_priority) / 16 )
-
-/*PAGE
- *
- *  _Priority_Minor
- *
- */
-
-#define _Priority_Minor( _the_priority ) ( (_the_priority) % 16 )
-
-#if ( CPU_USE_GENERIC_BITFIELD_CODE == TRUE )
- 
-/*PAGE
- *
- *  _Priority_Mask
- *
- */
- 
-#define _Priority_Mask( _bit_number ) \
-  (0x8000 >> _bit_number)
- 
-/*PAGE
- *
- *  _Priority_Bits_index
- *
- */
- 
-#define _Priority_Bits_index( _bit_number ) \
-  (_bit_number)
- 
-#endif
- 
-/*PAGE
- *
- *  _Priority_Add_to_bit_map
- *
- */
-
-#define _Priority_Add_to_bit_map( _the_priority_map ) \
-   { \
-     *(_the_priority_map)->minor |= (_the_priority_map)->ready_minor; \
-     _Priority_Major_bit_map     |= (_the_priority_map)->ready_major; \
-   }
-
-/*PAGE
- *
- *  _Priority_Remove_from_bit_map
- *
- */
-
-#define _Priority_Remove_from_bit_map( _the_priority_map ) \
-   { \
-     *(_the_priority_map)->minor &= (_the_priority_map)->block_minor; \
-     if ( *(_the_priority_map)->minor == 0 ) \
-       _Priority_Major_bit_map &= (_the_priority_map)->block_major; \
-   }
-
-/*PAGE
- *
- *  _Priority_Get_highest
- *
- */
-
-#define _Priority_Get_highest( _high_priority ) \
-  { \
-    Priority_Bit_map_control minor; \
-    Priority_Bit_map_control major; \
-    \
-    _Bitfield_Find_first_bit( _Priority_Major_bit_map, major ); \
-    _Bitfield_Find_first_bit( _Priority_Bit_map[major], minor ); \
-    \
-    (_high_priority) = (_Priority_Bits_index( major ) * 16) +  \
-                        _Priority_Bits_index( minor ); \
-  }
-
-/*PAGE
- *
- *  _Priority_Initialize_information
- *
- */
-
-#define _Priority_Initialize_information( \
-     _the_priority_map, _new_priority ) \
-  { \
-    Priority_Bit_map_control _major; \
-    Priority_Bit_map_control _minor; \
-    Priority_Bit_map_control _mask;  \
-    \
-    _major = _Priority_Major( (_new_priority) ); \
-    _minor = _Priority_Minor( (_new_priority) ); \
-    \
-    (_the_priority_map)->minor =  \
-      &_Priority_Bit_map[ _Priority_Bits_index(_major) ]; \
-    \
-    _mask = _Priority_Mask( _major ); \
-    (_the_priority_map)->ready_major = _mask; \
-    (_the_priority_map)->block_major = ~_mask; \
-    \
-    _mask = _Priority_Mask( _minor ); \
-    (_the_priority_map)->ready_minor = _mask; \
-    (_the_priority_map)->block_minor = ~_mask; \
-  }
-
-/*PAGE
- *
- *  _Priority_Is_group_empty
- *
- */
-
-#define _Priority_Is_group_empty ( _the_priority ) \
-  ( (_the_priority) == 0 )
-
-#endif
-/* end of include file */
diff --git a/cpukit/score/macros/rtems/score/stack.inl b/cpukit/score/macros/rtems/score/stack.inl
deleted file mode 100644
index 0e976eb0e0..0000000000
--- a/cpukit/score/macros/rtems/score/stack.inl
+++ /dev/null
@@ -1,50 +0,0 @@
-/*  stack.inl
- *
- *  This file contains the macro implementation of the inlined
- *  routines from the Stack Handler.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __STACK_inl
-#define __STACK_inl
-
-/*PAGE
- *
- *  _Stack_Initialize
- *
- */
-
-#define _Stack_Initialize( _the_stack, _starting_address, _size ) \
-  { \
-    (_the_stack)->area = (_starting_address); \
-    (_the_stack)->size = (_size);  \
-  }
-
-/*PAGE
- *
- *  _Stack_Is_enough
- *
- */
-
-#define _Stack_Is_enough( _size ) \
-  ( (_size) >= STACK_MINIMUM_SIZE )
-
-/*PAGE
- *
- *  _Stack_Adjust_size
- */
-
-#define _Stack_Adjust_size( _size ) \
-  ((_size) + CPU_STACK_ALIGNMENT)
-
-#endif
-/* end of include file */
diff --git a/cpukit/score/macros/rtems/score/states.inl b/cpukit/score/macros/rtems/score/states.inl
deleted file mode 100644
index a100da077a..0000000000
--- a/cpukit/score/macros/rtems/score/states.inl
+++ /dev/null
@@ -1,210 +0,0 @@
-/*  states.inl
- *
- *  This file contains the macro implementation of the inlined
- *  routines associated with thread state information.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __STATES_inl
-#define __STATES_inl
-
-/*PAGE
- *
- *  _States_Set
- *
- */
-
-#define _States_Set( _states_to_set, _current_state ) \
-   ((_current_state) | (_states_to_set))
-
-/*PAGE
- *
- *  _States_Clear
- *
- */
-
-#define _States_Clear( _states_to_clear, _current_state ) \
-   ((_current_state) & ~(_states_to_clear))
-
-/*PAGE
- *
- *  _States_Is_ready
- *
- */
-
-#define _States_Is_ready( _the_states ) \
-   ( (_the_states) == STATES_READY )
-
-/*PAGE
- *
- *  _States_Is_only_dormant
- *
- */
-
-#define _States_Is_only_dormant( _the_states ) \
-   ( (_the_states) == STATES_DORMANT )
-
-/*PAGE
- *
- *  _States_Is_dormant
- *
- */
-
-#define _States_Is_dormant( _the_states ) \
-   ( (_the_states) & STATES_DORMANT )
-
-/*PAGE
- *
- *  _States_Is_suspended
- *
- */
-
-#define _States_Is_suspended( _the_states ) \
-   ( (_the_states) & STATES_SUSPENDED )
-
-/*PAGE
- *
- *  _States_Is_Transient
- *
- */
-
-#define _States_Is_transient( _the_states ) \
-   ( (_the_states) & STATES_TRANSIENT )
-
-/*PAGE
- *
- *  _States_Is_delaying
- *
- */
-
-#define _States_Is_delaying( _the_states ) \
-   ( (_the_states) & STATES_DELAYING )
-
-/*PAGE
- *
- *  _States_Is_waiting_for_buffer
- *
- */
-
-#define _States_Is_waiting_for_buffer( _the_states ) \
-   ( (_the_states) & STATES_WAITING_FOR_BUFFER )
-
-/*PAGE
- *
- *  _States_Is_waiting_for_segment
- *
- */
-
-#define _States_Is_waiting_for_segment( _the_states ) \
-   ( (_the_states) & STATES_WAITING_FOR_SEGMENT )
-
-/*PAGE
- *
- *  _States_Is_waiting_for_message
- *
- */
-
-#define _States_Is_waiting_for_message( _the_states ) \
-   ( (_the_states) & STATES_WAITING_FOR_MESSAGE )
-
-/*PAGE
- *
- *  _States_Is_waiting_for_event
- *
- */
-
-#define _States_Is_waiting_for_event( _the_states ) \
-   ( (_the_states) & STATES_WAITING_FOR_EVENT )
-
-/*PAGE
- *
- *  _States_Is_waiting_for_mutex
- *
- */
- 
-#define _States_Is_waiting_for_mutex( _the_states ) \
-   ( (_the_states) & STATES_WAITING_FOR_MUTEX )
-
-/*PAGE
- *
- *  _States_Is_waiting_for_semaphore
- *
- */
-
-#define _States_Is_waiting_for_semaphore( _the_states ) \
-   ( (_the_states) & STATES_WAITING_FOR_SEMAPHORE )
-
-/*PAGE
- *
- *  _States_Is_waiting_for_time
- *
- */
-
-#define _States_Is_waiting_for_time( _the_states ) \
-   ( (_the_states) & STATES_WAITING_FOR_TIME )
-
-/*PAGE
- *
- *  _States_Is_waiting_for_rpc_reply
- *
- */
-
-#define _States_Is_waiting_for_rpc_reply( _the_states ) \
-   ( (_the_states) & STATES_WAITING_FOR_RPC_REPLY )
-
-/*PAGE
- *
- *  _States_Is_waiting_for_period
- *
- */
-
-#define _States_Is_waiting_for_period( _the_states ) \
-   ( (_the_states) & STATES_WAITING_FOR_PERIOD )
-
-/*PAGE
- *
- *  _States_Is_locally_blocked
- *
- */
-
-#define _States_Is_locally_blocked( _the_states ) \
-   ( (_the_states) & STATES_LOCALLY_BLOCKED )
-
-/*PAGE
- *
- *  _States_Is_waiting_on_thread_queue
- *
- */
-
-#define _States_Is_waiting_on_thread_queue( _the_states ) \
-   ( (_the_states) & STATES_WAITING_ON_THREAD_QUEUE )
-
-/*PAGE
- *
- *  _States_Is_blocked
- *
- */
-
-#define _States_Is_blocked( _the_states ) \
-   ( (_the_states) & STATES_BLOCKED )
-
-/*PAGE
- *
- *  _States_Are_set
- *
- */
-
-#define _States_Are_set( _the_states, _mask ) \
-   ( ((_the_states) & (_mask)) != STATES_READY )
-
-#endif
-/* end of include file */
diff --git a/cpukit/score/macros/rtems/score/sysstate.inl b/cpukit/score/macros/rtems/score/sysstate.inl
deleted file mode 100644
index 44957f6faa..0000000000
--- a/cpukit/score/macros/rtems/score/sysstate.inl
+++ /dev/null
@@ -1,90 +0,0 @@
-/*  sysstates.inl
- *
- *  This file contains the macro implementation of routines regarding the 
- *  system state.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __SYSTEM_STATE_inl
-#define __SYSTEM_STATE_inl
-
-/*PAGE
- *
- *  _System_state_Handler_initialization
- */
- 
-#define _System_state_Handler_initialization( _is_multiprocessing ) \
-  do { \
-    _System_state_Current = SYSTEM_STATE_BEFORE_INITIALIZATION; \
-    _System_state_Is_multiprocessing = (_is_multiprocessing); \
-  } while ( 0 )
-
-/*PAGE
- *
- *  _System_state_Set
- */
-
-#define _System_state_Set( _state ) \
-  do { \
-    _System_state_Current = (_state); \
-  } while ( 0 )
-
-/*PAGE
- *
- *  _System_state_Get
- */
-
-#define _System_state_Get() \
-  (_System_state_Current)
-
-/*PAGE
- *
- *  _System_state_Is_before_initialization
- */
-
-#define _System_state_Is_before_initialization( _state ) \
-  ((_state) == SYSTEM_STATE_BEFORE_INITIALIZATION)
-
-/*PAGE
- *
- *  _System_state_Is_before_multitasking
- */
-
-#define _System_state_Is_before_multitasking( _state ) \
-  ((_state) == SYSTEM_STATE_BEFORE_MULTITASKING)
-
-/*PAGE
- *
- *  _System_state_Is_begin_multitasking
- */
-
-#define _System_state_Is_begin_multitasking( _state ) \
-  ((_state) == SYSTEM_STATE_BEGIN_MULTITASKING)
-
-/*PAGE
- *
- *  _System_state_Is_up
- */
-
-#define _System_state_Is_up( _state ) \
-  ((_state) == SYSTEM_STATE_UP)
-
-/*PAGE
- *
- *  _System_state_Is_failed
- */
-
-#define _System_state_Is_failed( _state ) \
-  ((_state) == SYSTEM_STATE_FAILED)
-
-#endif
-/* end of include file */
diff --git a/cpukit/score/macros/rtems/score/thread.inl b/cpukit/score/macros/rtems/score/thread.inl
deleted file mode 100644
index 96761143b8..0000000000
--- a/cpukit/score/macros/rtems/score/thread.inl
+++ /dev/null
@@ -1,217 +0,0 @@
-/*  thread.inl
- *
- *  This file contains the macro implementation of the inlined
- *  routines from the Thread handler.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __THREAD_inl
-#define __THREAD_inl
-
-/*PAGE
- *
- *  _Thread_Stop_multitasking
- *
- */
-
-#define _Thread_Stop_multitasking() \
-  _Context_Switch( &_Thread_Executing->Registers, &_Thread_BSP_context );
-
-/*PAGE
- *
- *  _Thread_Is_executing
- *
- */
-
-#define _Thread_Is_executing( _the_thread ) \
-        ( (_the_thread) == _Thread_Executing )
-
-/*PAGE
- *
- *  _Thread_Is_heir
- *
- */
-
-#define _Thread_Is_heir( _the_thread ) \
-        ( (_the_thread) == _Thread_Heir )
-
-/*PAGE
- *
- *  _Thread_Is_executing_also_the_heir
- *
- */
-
-#define _Thread_Is_executing_also_the_heir() \
-        ( _Thread_Executing == _Thread_Heir )
-
-/*PAGE
- *
- *  _Thread_Resume
- *
- */
-
-#define _Thread_Resume( _the_thread ) \
-        _Thread_Clear_state( (_the_thread), STATES_SUSPENDED )
-
-/*PAGE
- *
- *  _Thread_Unblock
- *
- */
-
-#define _Thread_Unblock( _the_thread ) \
-        _Thread_Clear_state( (_the_thread), STATES_BLOCKED );
-
-/*PAGE
- *
- *  _Thread_Restart_self
- *
- */
-
-#define _Thread_Restart_self()  \
-  {  \
-     if ( _Thread_Executing->fp_context != NULL ) \
-       _Context_Restore_fp( &_Thread_Executing->fp_context ); \
-     \
-    _CPU_Context_Restart_self( &_Thread_Executing->Registers ); \
-  }
-
-/*PAGE
- *
- *  _Thread_Calculate_heir
- *
- */
-
-#define _Thread_Calculate_heir() \
- { \
-   Priority_Control  highest; \
-   \
-   _Priority_Get_highest( highest ); \
-   \
-   _Thread_Heir = (Thread_Control *) _Thread_Ready_chain[ highest ].first; \
-  }
-
-/*PAGE
- *
- *  _Thread_Is_allocated_fp
- *
- */
-
-#define _Thread_Is_allocated_fp( _the_thread ) \
-        ( (_the_thread) == _Thread_Allocated_fp )
-
-/*PAGE
- *
- *  _Thread_Deallocate_fp
- *
- */
-
-#define _Thread_Deallocate_fp() \
-        _Thread_Allocated_fp = NULL
-
-/*PAGE
- *
- *  _Thread_Disable_dispatch
- *
- */
-
-#define _Thread_Disable_dispatch() \
-  _Thread_Dispatch_disable_level += 1
-
-/*PAGE
- *
- *  _Thread_Enable_dispatch
- *
- */
-
-#if ( CPU_INLINE_ENABLE_DISPATCH == TRUE )
-#define _Thread_Enable_dispatch()  \
-      { if ( (--_Thread_Dispatch_disable_level) == 0 ) \
-             _Thread_Dispatch();  \
-      }
-#endif
-
-#if ( CPU_INLINE_ENABLE_DISPATCH == FALSE )
-void _Thread_Enable_dispatch( void );
-#endif
-
-/*PAGE
- *
- *  _Thread_Unnest_dispatch
- *
- */
-
-#define _Thread_Unnest_dispatch()  \
-  _Thread_Dispatch_disable_level -= 1
-
-/*PAGE
- *
- *  _Thread_Is_dispatching_enabled
- *
- */
-
-#define _Thread_Is_dispatching_enabled() \
-  ( _Thread_Dispatch_disable_level == 0 )
-
-/*PAGE
- *
- *  _Thread_Is_context_switch_necessary
- *
- */
-
-#define _Thread_Is_context_switch_necessary() \
-  ( _Context_Switch_necessary == TRUE )
-
-/*PAGE
- *
- *  _Thread_Dispatch_initialization
- *
- */
-
-#define _Thread_Dispatch_initialization() \
-  _Thread_Dispatch_disable_level = 1
-
-/*PAGE
- *
- *  _Thread_Is_null
- *
- */
-
-#define _Thread_Is_null( _the_thread ) \
-  ( (_the_thread) == NULL )
-
-/*
- *  _Thread_Is_proxy_blocking
- *
- */
- 
-#define _Thread_Is_proxy_blocking( _code ) \
-  ( (_code) == THREAD_STATUS_PROXY_BLOCKING )
-
-/*
- *  _Thread_Internal_allocate
- *
- */
- 
-#define _Thread_Internal_allocate() \
-  ((Thread_Control *) _Objects_Allocate( &_Thread_Internal_information ))
- 
-/*
- *  _Thread_Internal_free
- *
- */
- 
-#define _Thread_Internal_free( _the_task ) \
-  _Objects_Free( &_Thread_Internal_information, &(_the_task)->Object )
-
-#endif
-/* end of include file */
diff --git a/cpukit/score/macros/rtems/score/threadmp.inl b/cpukit/score/macros/rtems/score/threadmp.inl
deleted file mode 100644
index c9cc91319f..0000000000
--- a/cpukit/score/macros/rtems/score/threadmp.inl
+++ /dev/null
@@ -1,50 +0,0 @@
-/*  macros/threadmp.h
- *
- *  This include file contains the bodies of all inlined routines
- *  for the multiprocessing part of thread package.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __MACROS_MP_THREAD_h
-#define __MACROS_MP_THREAD_h
-
-/*PAGE
- *
- *  _Thread_MP_Is_receive
- *
- */
-
-#define _Thread_MP_Is_receive( _the_thread ) \
-  ( (_the_thread) == _Thread_MP_Receive)
-
-/*PAGE
- *
- *  _Thread_MP_Free_proxy
- *
- */
-
-#define _Thread_MP_Free_proxy( _the_thread ) \
-{ \
-  Thread_Proxy_control *_the_proxy; \
- \
-  _the_proxy = (Thread_Proxy_control *) (_the_thread); \
- \
-  _Chain_Extract( &_the_proxy->Active ); \
- \
-  _Chain_Append( \
-    &_Thread_MP_Inactive_proxies, \
-    &(_the_thread)->Object.Node \
-  ); \
-}
-
-#endif
-/* end of include file */
diff --git a/cpukit/score/macros/rtems/score/tod.inl b/cpukit/score/macros/rtems/score/tod.inl
deleted file mode 100644
index 85603550ee..0000000000
--- a/cpukit/score/macros/rtems/score/tod.inl
+++ /dev/null
@@ -1,49 +0,0 @@
-/*  tod.inl
- *
- *  This file contains the macro implementation of the inlined routines
- *  from the Time of Day Handler.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __TIME_OF_DAY_inl
-#define __TIME_OF_DAY_inl
-
-/*PAGE
- *
- *  _TOD_Tickle_ticks
- *
- */
-
-#define _TOD_Tickle_ticks() \
-  _TOD_Current.ticks++; \
-  _Watchdog_Ticks_since_boot++
-
-/*PAGE
- *
- *  _TOD_Deactivate
- *
- */
-
-#define _TOD_Deactivate() \
-   _Watchdog_Remove( &_TOD_Seconds_watchdog )
-
-/*PAGE
- *
- *  _TOD_Activate
- *
- */
-
-#define _TOD_Activate( _ticks ) \
-   _Watchdog_Insert_ticks( &_TOD_Seconds_watchdog, (_ticks) )
-
-#endif
-/* end of include file */
diff --git a/cpukit/score/macros/rtems/score/tqdata.inl b/cpukit/score/macros/rtems/score/tqdata.inl
deleted file mode 100644
index 0749e612d6..0000000000
--- a/cpukit/score/macros/rtems/score/tqdata.inl
+++ /dev/null
@@ -1,50 +0,0 @@
-/*  tqdata.inl
- *
- *  This file contains the macro implementation of the inlined
- *  routines needed to support the Thread Queue Data.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __THREAD_QUEUE_DATA_inl
-#define __THREAD_QUEUE_DATA_inl
-
-/*PAGE
- *
- *  _Thread_queue_Header_number
- *
- */
-
-#define _Thread_queue_Header_number( _the_priority ) \
-    ((_the_priority) / TASK_QUEUE_DATA_PRIORITIES_PER_HEADER)
-
-/*PAGE
- *
- *  _Thread_queue_Is_reverse_search
- *
- */
-
-#define _Thread_queue_Is_reverse_search( _the_priority ) \
-     ( (_the_priority) & TASK_QUEUE_DATA_REVERSE_SEARCH_MASK )
-
-/*PAGE
- *
- *  _Thread_queue_Enter_critical_section
- *
- */
- 
-#define _Thread_queue_Enter_critical_section( _the_thread_queue ) \
-  do { \
-    (_the_thread_queue)->sync_state = THREAD_QUEUE_NOTHING_HAPPENED; \
-  } while ( 0 )
-
-#endif
-/* end of include file */
diff --git a/cpukit/score/macros/rtems/score/userext.inl b/cpukit/score/macros/rtems/score/userext.inl
deleted file mode 100644
index 37b0bf8d2a..0000000000
--- a/cpukit/score/macros/rtems/score/userext.inl
+++ /dev/null
@@ -1,126 +0,0 @@
-/*  userext.inl
- *
- *  This file contains the macro implementation of the inlined routines
- *  from the User Extension Handler
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __USER_EXTENSIONS_inl
-#define __USER_EXTENSIONS_inl
-
-/*PAGE
- *
- *  _User_extensions_Handler_initialization
- *
- */
-
-#define _User_extensions_Handler_initialization( _initial_extensions ) \
-  { \
-    _Chain_Initialize_empty( &_User_extensions_List ); \
-    \
-    if ( (_initial_extensions) ) { \
-      _User_extensions_Initial.Callouts = *(_initial_extensions); \
-      _Chain_Append( \
-        &_User_extensions_List, &_User_extensions_Initial.Node ); \
-    } \
-  }
-
-/*PAGE
- *
- *  _User_extensions_Add_set
- */
-
-#define _User_extensions_Add_set( _the_extension, _extension_table ) \
-  do { \
-    (_the_extension)->Callouts = *(_extension_table); \
-    \
-    _Chain_Append( &_User_extensions_List, &(_the_extension)->Node ); \
-  } while ( 0 )
-
-/*PAGE
- *
- *  _User_extensions_Add_API_set
- */
- 
-#define _User_extensions_Add_API_set( _the_extension ) \
-  _Chain_Prepend( &_User_extensions_List, &(_the_extension)->Node )
- 
-
-/*PAGE
- *
- *  _User_extensions_Remove_set
- */
-
-#define _User_extensions_Remove_set( _the_extension ) \
-  _Chain_Extract( &(_the_extension)->Node )
-
-/*PAGE
- *
- *  _User_extensions_Run_list_forward
- *
- *  NOTE:  No parentheses around macro names here to avoid
- *         messing up the name and function call expansion.
- */
-
-#define _User_extensions_Run_list_forward( _name, _arguments ) \
-  do { \
-    Chain_Node              *the_node; \
-    User_extensions_Control *the_extension; \
-    \
-    for ( the_node = _User_extensions_List.first ; \
-          !_Chain_Is_tail( &_User_extensions_List, the_node ) ; \
-          the_node = the_node->next ) { \
-      the_extension = (User_extensions_Control *) the_node; \
-      \
-      if ( the_extension->Callouts.## _name != NULL ) \
-        (*the_extension->Callouts.## _name) _arguments; \
-      \
-    } \
-    \
-  } while ( 0 )
-
-/*PAGE
- *
- *  _User_extensions_Run_list_backward
- *
- *  NOTE:  No parentheses around macro names here to avoid
- *         messing up the name and function call expansion.
- */
-
-#define _User_extensions_Run_list_backward( _name, _arguments ) \
-  do { \
-    Chain_Node              *the_node; \
-    User_extensions_Control *the_extension; \
-    \
-    for ( the_node = _User_extensions_List.last ; \
-          !_Chain_Is_head( &_User_extensions_List, the_node ) ; \
-          the_node = the_node->previous ) { \
-      the_extension = (User_extensions_Control *) the_node; \
-      \
-      if ( the_extension->Callouts.## _name != NULL ) \
-        (*the_extension->Callouts.## _name) _arguments; \
-      \
-    } \
-    \
-  } while ( 0 )
-
-/*PAGE
- *
- *  _User_extensions_Thread_switch
- *
- */
-
-#define _User_extensions_Thread_switch( _executing, _heir ) \
-  _User_extensions_Run_list_forward(thread_switch, (_executing, _heir) )
-
-#endif
-/* end of include file */
diff --git a/cpukit/score/macros/rtems/score/watchdog.inl b/cpukit/score/macros/rtems/score/watchdog.inl
deleted file mode 100644
index fecc20e4f1..0000000000
--- a/cpukit/score/macros/rtems/score/watchdog.inl
+++ /dev/null
@@ -1,172 +0,0 @@
-/*  watchdog.inl
- *
- *  This file contains the macro implementation of all inlined routines
- *  in the Watchdog Handler.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __WATCHDOG_inl
-#define __WATCHDOG_inl
-
-#include <rtems/score/object.h>
-
-/*PAGE
- *
- *  _Watchdog_Initialize
- *
- */
-
-#define _Watchdog_Initialize( _the_watchdog, _routine, _id, _user_data )  \
-  { \
-    (_the_watchdog)->state     = WATCHDOG_INACTIVE; \
-    (_the_watchdog)->routine   = (_routine); \
-    (_the_watchdog)->id        = (_id); \
-    (_the_watchdog)->user_data = (_user_data); \
-  }
-
-/*PAGE
- *
- *  _Watchdog_Is_active
- *
- */
-
-#define _Watchdog_Is_active( _the_watchdog ) \
-  ( (_the_watchdog)->state == WATCHDOG_ACTIVE )
-
-/*PAGE
- *
- *  _Watchdog_Activate
- *
- */
-
-#define _Watchdog_Activate( _the_watchdog ) \
-  (_the_watchdog)->state = WATCHDOG_ACTIVE
-
-/*PAGE
- *
- *  _Watchdog_Deactivate
- *
- */
-
-#define _Watchdog_Deactivate( _the_watchdog ) \
-  (_the_watchdog)->state = WATCHDOG_REMOVE_IT
-
-/*PAGE
- *
- *  _Watchdog_Tickle_ticks
- *
- */
-
-#define _Watchdog_Tickle_ticks() \
-  _Watchdog_Tickle( &_Watchdog_Ticks_chain )
-
-/*PAGE
- *
- *  _Watchdog_Tickle_seconds
- *
- */
-
-#define _Watchdog_Tickle_seconds() \
-  _Watchdog_Tickle( &_Watchdog_Seconds_chain )
-
-/*PAGE
- *
- *  _Watchdog_Insert_ticks
- *
- */
-
-#define _Watchdog_Insert_ticks( _the_watchdog, _units ) \
-  do { \
-    (_the_watchdog)->initial = (_units); \
-    _Watchdog_Insert( &_Watchdog_Ticks_chain, (_the_watchdog) ); \
-  } while ( 0 )
-
-/*PAGE
- *
- *  _Watchdog_Insert_seconds
- *
- */
-
-#define _Watchdog_Insert_seconds( _the_watchdog, _units ) \
-  do { \
-    (_the_watchdog)->initial = (_units); \
-    _Watchdog_Insert( &_Watchdog_Seconds_chain, (_the_watchdog) ); \
-  } while ( 0 )
-
-/*PAGE
- *
- *  _Watchdog_Adjust_seconds
- *
- */
-
-#define _Watchdog_Adjust_seconds( _direction, _units ) \
-  _Watchdog_Adjust( &_Watchdog_Seconds_chain, (_direction), (_units) )
-
-/*PAGE
- *
- *  _Watchdog_Adjust_ticks
- *
- */
-
-#define _Watchdog_Adjust_ticks( _direction, _units ) \
-  _Watchdog_Adjust( &_Watchdog_Ticks_chain, (_direction), (_units) )
-
-/*PAGE
- *
- *  _Watchdog_Reset
- *
- */
-
-#define _Watchdog_Reset( _the_watchdog ) \
-   { \
-     (void) _Watchdog_Remove( (_the_watchdog) ); \
-     _Watchdog_Insert( &_Watchdog_Ticks_chain, (_the_watchdog) ); \
-   }
-
-/*PAGE
- *
- *  _Watchdog_Next
- *
- */
-
-#define _Watchdog_Next( _watchdog ) \
-  ((Watchdog_Control *) (_watchdog)->Node.next)
-
-/*PAGE
- *
- *  _Watchdog_Previous
- *
- */
-
-#define _Watchdog_Previous( _watchdog ) \
-  ((Watchdog_Control *) (_watchdog)->Node.previous)
-
-/*PAGE
- *
- *  _Watchdog_First
- *
- */
-
-#define _Watchdog_First( _header ) \
-  ((Watchdog_Control *) (_header)->first)
-
-/*PAGE
- *
- *  _Watchdog_Last
- *
- */
-
-#define _Watchdog_Last( _header ) \
-  ((Watchdog_Control *) (_header)->last)
-
-#endif
-/* end of include file */
diff --git a/cpukit/score/macros/rtems/score/wkspace.inl b/cpukit/score/macros/rtems/score/wkspace.inl
deleted file mode 100644
index 525756db6b..0000000000
--- a/cpukit/score/macros/rtems/score/wkspace.inl
+++ /dev/null
@@ -1,39 +0,0 @@
-/*  wkspace.inl
- *
- *  This file contains the macro implementation of the inlined routines
- *  from the RAM Workspace Handler.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __WORKSPACE_inl
-#define __WORKSPACE_inl
-
-/*PAGE
- *
- *  _Workspace_Allocate
- *
- */
-
-#define _Workspace_Allocate( _size ) \
-   _Heap_Allocate( &_Workspace_Area, (_size) )
-
-/*PAGE
- *
- *  _Workspace_Free
- *
- */
-
-#define _Workspace_Free( _block ) \
-   _Heap_Free( &_Workspace_Area, (_block) )
-
-#endif
-/* end of include file */
diff --git a/cpukit/score/src/apiext.c b/cpukit/score/src/apiext.c
deleted file mode 100644
index 2fb2155558..0000000000
--- a/cpukit/score/src/apiext.c
+++ /dev/null
@@ -1,105 +0,0 @@
-/*  apiext.c
- *
- *  XXX
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-#include <rtems/system.h>
-#include <rtems/score/apiext.h>
-
-/*PAGE
- *
- *  _API_extensions_Initialization
- */
- 
-void _API_extensions_Initialization( void )
-{
- _Chain_Initialize_empty( &_API_extensions_List );
-}
- 
-/*PAGE
- *
- *  _API_extensions_Add
- */
- 
-void _API_extensions_Add(
-  API_extensions_Control *the_extension
-)
-{
-  _Chain_Append( &_API_extensions_List, &the_extension->Node );
-}
-
-/*PAGE
- *
- *  _API_extensions_Run_predriver
- */
-
-void _API_extensions_Run_predriver( void )
-{
-  Chain_Node             *the_node;
-  API_extensions_Control *the_extension;
- 
-  for ( the_node = _API_extensions_List.first ;
-        !_Chain_Is_tail( &_API_extensions_List, the_node ) ;
-        the_node = the_node->next ) {
- 
-    the_extension = (API_extensions_Control *) the_node;
- 
-    if ( the_extension->predriver_hook )
-      (*the_extension->predriver_hook)();
-  }
-}
-
-/*PAGE
- *
- *  _API_extensions_Run_postdriver
- */
-
-void _API_extensions_Run_postdriver( void )
-{
-  Chain_Node             *the_node;
-  API_extensions_Control *the_extension;
- 
-  for ( the_node = _API_extensions_List.first ;
-        !_Chain_Is_tail( &_API_extensions_List, the_node ) ;
-        the_node = the_node->next ) {
- 
-    the_extension = (API_extensions_Control *) the_node;
- 
-    if ( the_extension->postdriver_hook )
-      (*the_extension->postdriver_hook)();
-  }
-}
-
-/*PAGE
- *
- *  _API_extensions_Run_postswitch
- */
-
-void _API_extensions_Run_postswitch( void )
-{
-  Chain_Node             *the_node;
-  API_extensions_Control *the_extension;
- 
-  for ( the_node = _API_extensions_List.first ;
-        !_Chain_Is_tail( &_API_extensions_List, the_node ) ;
-        the_node = the_node->next ) {
- 
-    the_extension = (API_extensions_Control *) the_node;
- 
-    if ( the_extension->postswitch_hook )
-      (*the_extension->postswitch_hook)( _Thread_Executing );
-  }
-}
-
-/* end of file */
diff --git a/cpukit/score/src/chain.c b/cpukit/score/src/chain.c
deleted file mode 100644
index 690141d3ee..0000000000
--- a/cpukit/score/src/chain.c
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
- *  Chain Handler
- *
- *  NOTE:
- *
- *  The order of this file is to allow proper compilation due to the
- *  order of inlining required by the compiler.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems/system.h>
-#include <rtems/score/address.h>
-#include <rtems/score/chain.h>
-#include <rtems/score/isr.h>
-
-/*PAGE
- *
- *  _Chain_Initialize
- *
- *  This kernel routine initializes a doubly linked chain.
- *
- *  Input parameters:
- *    the_chain        - pointer to chain header
- *    starting_address - starting address of first node
- *    number_nodes     - number of nodes in chain
- *    node_size        - size of node in bytes
- *
- *  Output parameters:  NONE
- */
-
-void _Chain_Initialize(
-  Chain_Control *the_chain,
-  void           *starting_address,
-  unsigned32     number_nodes,
-  unsigned32     node_size
-)
-{
-  unsigned32  count;
-  Chain_Node *current;
-  Chain_Node *next;
-
-  count                     = number_nodes;
-  current                   = _Chain_Head( the_chain );
-  the_chain->permanent_null = NULL;
-  next                      = (Chain_Node *)starting_address;
-  while ( count-- ) {
-    current->next  = next;
-    next->previous = current;
-    current        = next;
-    next           = (Chain_Node *)
-                        _Addresses_Add_offset( (void *) next, node_size );
-  }
-  current->next    = _Chain_Tail( the_chain );
-  the_chain->last  = current;
-}
-
-/*PAGE
- *
- *  _Chain_Get_first_unprotected
- */
-
-#ifndef USE_INLINES
-Chain_Node *_Chain_Get_first_unprotected(
-  Chain_Control *the_chain
-)
-{
-  Chain_Node  *return_node;
-  Chain_Node  *new_first;
-
-  return_node         = the_chain->first;
-  new_first           = return_node->next;
-  the_chain->first    = new_first;
-  new_first->previous = _Chain_Head( the_chain );
-
-  return return_node;
-}
-#endif   /* USE_INLINES */
-
-/*PAGE
- *
- *  _Chain_Get
- *
- *  This kernel routine returns a pointer to a node taken from the
- *  given chain.
- *
- *  Input parameters:
- *    the_chain - pointer to chain header
- *
- *  Output parameters:
- *    return_node - pointer to node in chain allocated
- *    CHAIN_END   - if no nodes available
- *
- *  INTERRUPT LATENCY:
- *    only case
- */
-
-Chain_Node *_Chain_Get(
-  Chain_Control *the_chain
-)
-{
-  ISR_Level          level;
-  Chain_Node *return_node;
-
-  return_node = NULL;
-  _ISR_Disable( level );
-    if ( !_Chain_Is_empty( the_chain ) )
-      return_node = _Chain_Get_first_unprotected( the_chain );
-  _ISR_Enable( level );
-  return return_node;
-}
-
-/*PAGE
- *
- *  _Chain_Append
- *
- *  This kernel routine puts a node on the end of the specified chain.
- *
- *  Input parameters:
- *    the_chain - pointer to chain header
- *    node      - address of node to put at rear of chain
- *
- *  Output parameters:  NONE
- *
- *  INTERRUPT LATENCY:
- *    only case
- */
-
-void _Chain_Append(
-  Chain_Control *the_chain,
-  Chain_Node    *node
-)
-{
-  ISR_Level level;
-
-  _ISR_Disable( level );
-    _Chain_Append_unprotected( the_chain, node );
-  _ISR_Enable( level );
-}
-
-/*PAGE
- *
- *  _Chain_Extract
- *
- *  This kernel routine deletes the given node from a chain.
- *
- *  Input parameters:
- *    node - pointer to node in chain to be deleted
- *
- *  Output parameters:  NONE
- *
- *  INTERRUPT LATENCY:
- *    only case
- */
-
-void _Chain_Extract(
-  Chain_Node *node
-)
-{
-  ISR_Level level;
-
-  _ISR_Disable( level );
-    _Chain_Extract_unprotected( node );
-  _ISR_Enable( level );
-}
-
-/*PAGE
- *
- *  _Chain_Insert
- *
- *  This kernel routine inserts a given node after a specified node
- *  a requested chain.
- *
- *  Input parameters:
- *    after_node - pointer to node in chain to be inserted after
- *    node       - pointer to node to be inserted
- *
- *  Output parameters:  NONE
- *
- *  INTERRUPT LATENCY:
- *    only case
- */
-
-void _Chain_Insert(
-  Chain_Node *after_node,
-  Chain_Node *node
-)
-{
-  ISR_Level level;
-
-  _ISR_Disable( level );
-    _Chain_Insert_unprotected( after_node, node );
-  _ISR_Enable( level );
-}
diff --git a/cpukit/score/src/coremsg.c b/cpukit/score/src/coremsg.c
deleted file mode 100644
index 34778d26cd..0000000000
--- a/cpukit/score/src/coremsg.c
+++ /dev/null
@@ -1,432 +0,0 @@
-/*
- *  CORE Message Queue Handler
- *
- *  DESCRIPTION:
- *
- *  This package is the implementation of the CORE Message Queue Handler.
- *  This core object provides task synchronization and communication functions
- *  via messages passed to queue objects.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems/system.h>
-#include <rtems/score/chain.h>
-#include <rtems/score/isr.h>
-#include <rtems/score/object.h>
-#include <rtems/score/coremsg.h>
-#include <rtems/score/states.h>
-#include <rtems/score/thread.h>
-#include <rtems/score/wkspace.h>
-#include <rtems/score/mpci.h>
-
-/*PAGE
- *
- *  _CORE_message_queue_Initialize
- *
- *  This routine initializes a newly created message queue based on the
- *  specified data.
- *
- *  Input parameters:
- *    the_message_queue            - the message queue to initialize
- *    the_class                    - the API specific object class
- *    the_message_queue_attributes - the message queue's attributes
- *    maximum_pending_messages     - maximum message and reserved buffer count
- *    maximum_message_size         - maximum size of each message
- *    proxy_extract_callout        - remote extract support
- *
- *  Output parameters:
- *    TRUE   - if the message queue is initialized
- *    FALSE  - if the message queue is NOT initialized
- */
-
-boolean _CORE_message_queue_Initialize(
-  CORE_message_queue_Control    *the_message_queue,
-  Objects_Classes                the_class,
-  CORE_message_queue_Attributes *the_message_queue_attributes,
-  unsigned32                     maximum_pending_messages,
-  unsigned32                     maximum_message_size,
-  Thread_queue_Extract_callout   proxy_extract_callout
-)
-{
-  unsigned32 message_buffering_required;
-  unsigned32 allocated_message_size;
-
-  the_message_queue->maximum_pending_messages   = maximum_pending_messages;
-  the_message_queue->number_of_pending_messages = 0;
-  the_message_queue->maximum_message_size       = maximum_message_size;
-  _CORE_message_queue_Set_notify( the_message_queue, NULL, NULL );
- 
-  /*
-   * round size up to multiple of a ptr for chain init
-   */
- 
-  allocated_message_size = maximum_message_size;
-  if (allocated_message_size & (sizeof(unsigned32) - 1)) {
-      allocated_message_size += sizeof(unsigned32);
-      allocated_message_size &= ~(sizeof(unsigned32) - 1);
-  }
-   
-  message_buffering_required = maximum_pending_messages *
-       (allocated_message_size + sizeof(CORE_message_queue_Buffer_control));
- 
-  the_message_queue->message_buffers = (CORE_message_queue_Buffer *) 
-     _Workspace_Allocate( message_buffering_required );
- 
-  if (the_message_queue->message_buffers == 0)
-    return FALSE;
- 
-  _Chain_Initialize (
-    &the_message_queue->Inactive_messages,
-    the_message_queue->message_buffers,
-    maximum_pending_messages,
-    allocated_message_size + sizeof( CORE_message_queue_Buffer_control )
-  );
- 
-  _Chain_Initialize_empty( &the_message_queue->Pending_messages );
- 
-  _Thread_queue_Initialize(
-    &the_message_queue->Wait_queue,
-    the_class,
-    _CORE_message_queue_Is_priority( the_message_queue_attributes ) ?
-       THREAD_QUEUE_DISCIPLINE_PRIORITY : THREAD_QUEUE_DISCIPLINE_FIFO,
-    STATES_WAITING_FOR_MESSAGE,
-    proxy_extract_callout,
-    CORE_MESSAGE_QUEUE_STATUS_TIMEOUT
-  );
-
-  return TRUE;
-}
-
-/*PAGE
- *
- *  _CORE_message_queue_Close
- *
- *  This function closes a message by returning all allocated space and
- *  flushing the message_queue's task wait queue.
- *
- *  Input parameters:
- *    the_message_queue      - the message_queue to be flushed
- *    remote_extract_callout - function to invoke remotely
- *    status                 - status to pass to thread
- *
- *  Output parameters:  NONE
- */
- 
-void _CORE_message_queue_Close(
-  CORE_message_queue_Control *the_message_queue,
-  Thread_queue_Flush_callout  remote_extract_callout,
-  unsigned32                  status
-)
-{
- 
-  if ( the_message_queue->number_of_pending_messages != 0 )
-        (void) _CORE_message_queue_Flush_support( the_message_queue );
-  else
-    _Thread_queue_Flush(
-      &the_message_queue->Wait_queue,
-      remote_extract_callout,
-      status
-    );
-
-  (void) _Workspace_Free( the_message_queue->message_buffers );
-
-}
-
-/*PAGE
- *
- *  _CORE_message_queue_Flush
- *
- *  This function flushes the message_queue's task wait queue.  The number
- *  of messages flushed from the queue is returned.
- *
- *  Input parameters:
- *    the_message_queue - the message_queue to be flushed
- *
- *  Output parameters:
- *    returns - the number of messages flushed from the queue
- */
- 
-unsigned32 _CORE_message_queue_Flush(
-  CORE_message_queue_Control *the_message_queue
-)
-{
-  if ( the_message_queue->number_of_pending_messages != 0 )
-    return _CORE_message_queue_Flush_support( the_message_queue );
-  else
-    return 0;
-}
-
-/*PAGE
- *
- *  _CORE_message_queue_Broadcast
- *
- *  This function sends a message for every thread waiting on the queue and
- *  returns the number of threads made ready by the message.
- *
- *  Input parameters:
- *    the_message_queue            - message is submitted to this message queue
- *    buffer                       - pointer to message buffer
- *    size                         - size in bytes of message to send
- *    id                           - id of message queue
- *    api_message_queue_mp_support - api specific mp support callout
- *    count                        - area to store number of threads made ready
- *
- *  Output parameters:
- *    count                         - number of threads made ready
- *    CORE_MESSAGE_QUEUE_SUCCESSFUL - if successful
- *    error code                    - if unsuccessful
- */
-
-CORE_message_queue_Status _CORE_message_queue_Broadcast(
-  CORE_message_queue_Control                *the_message_queue,
-  void                                      *buffer,
-  unsigned32                                 size,
-  Objects_Id                                 id,
-  CORE_message_queue_API_mp_support_callout  api_message_queue_mp_support,
-  unsigned32                                *count
-)
-{
-  Thread_Control          *the_thread;
-  unsigned32               number_broadcasted;
-  Thread_Wait_information *waitp;
-  unsigned32               constrained_size;
-
-  number_broadcasted = 0;
-  while ((the_thread = _Thread_queue_Dequeue(&the_message_queue->Wait_queue))) {
-    waitp = &the_thread->Wait;
-    number_broadcasted += 1;
-
-    constrained_size = size;
-    if ( size > the_message_queue->maximum_message_size )
-        constrained_size = the_message_queue->maximum_message_size;
-
-    _CORE_message_queue_Copy_buffer(
-      buffer,
-      waitp->return_argument,
-      constrained_size
-    );
-
-    *(unsigned32 *)the_thread->Wait.return_argument_1 = size;
-
-    if ( !_Objects_Is_local_id( the_thread->Object.id ) )
-      (*api_message_queue_mp_support) ( the_thread, id );
-
-  }
-  *count = number_broadcasted;
-  return CORE_MESSAGE_QUEUE_STATUS_SUCCESSFUL;
-}
-
-/*PAGE
- *
- *  _CORE_message_queue_Seize
- *
- *  This kernel routine dequeues a message, copies the message buffer to
- *  a given destination buffer, and frees the message buffer to the
- *  inactive message pool.  The thread will be blocked if wait is TRUE,
- *  otherwise an error will be given to the thread if no messages are available.
- *
- *  Input parameters:
- *    the_message_queue - pointer to message queue
- *    id                - id of object we are waitig on
- *    buffer            - pointer to message buffer to be filled
- *    size              - pointer to the size of buffer to be filled
- *    wait              - TRUE if wait is allowed, FALSE otherwise
- *    timeout           - time to wait for a message
- *
- *  Output parameters:  NONE
- *
- *  NOTE: Dependent on BUFFER_LENGTH
- *
- *  INTERRUPT LATENCY:
- *    available
- *    wait
- */
-
-void _CORE_message_queue_Seize(
-  CORE_message_queue_Control *the_message_queue,
-  Objects_Id                  id,
-  void                       *buffer,
-  unsigned32                 *size,
-  boolean                     wait,
-  Watchdog_Interval           timeout
-)
-{
-  ISR_Level                          level;
-  CORE_message_queue_Buffer_control *the_message;
-  Thread_Control                    *executing;
-
-  executing = _Thread_Executing;
-  executing->Wait.return_code = CORE_MESSAGE_QUEUE_STATUS_SUCCESSFUL;
-  _ISR_Disable( level );
-  if ( the_message_queue->number_of_pending_messages != 0 ) {
-    the_message_queue->number_of_pending_messages -= 1;
-
-    the_message = _CORE_message_queue_Get_pending_message( the_message_queue );
-    _ISR_Enable( level );
-    *size = the_message->Contents.size;
-    _CORE_message_queue_Copy_buffer(the_message->Contents.buffer,buffer,*size );
-    _CORE_message_queue_Free_message_buffer(the_message_queue, the_message );
-    return;
-  }
-
-  if ( !wait ) {
-    _ISR_Enable( level );
-    executing->Wait.return_code = CORE_MESSAGE_QUEUE_STATUS_UNSATISFIED_NOWAIT;
-    return;
-  }
-
-  _Thread_queue_Enter_critical_section( &the_message_queue->Wait_queue );
-  executing->Wait.queue              = &the_message_queue->Wait_queue;
-  executing->Wait.id                 = id;
-  executing->Wait.return_argument    = (void *)buffer;
-  executing->Wait.return_argument_1  = (void *)size;
-  _ISR_Enable( level );
-
-  _Thread_queue_Enqueue( &the_message_queue->Wait_queue, timeout );
-}
-
-/*PAGE
- *
- *  _CORE_message_queue_Flush_support
- *
- *  This message handler routine removes all messages from a message queue
- *  and returns them to the inactive message pool.  The number of messages
- *  flushed from the queue is returned
- *
- *  Input parameters:
- *    the_message_queue - pointer to message queue
- *
- *  Output parameters:
- *    returns - number of messages placed on inactive chain
- *
- *  INTERRUPT LATENCY:
- *    only case
- */
-
-unsigned32 _CORE_message_queue_Flush_support(
-  CORE_message_queue_Control *the_message_queue
-)
-{
-  ISR_Level   level;
-  Chain_Node *inactive_first;
-  Chain_Node *message_queue_first;
-  Chain_Node *message_queue_last;
-  unsigned32  count;
-
-  _ISR_Disable( level );
-    inactive_first      = the_message_queue->Inactive_messages.first;
-    message_queue_first = the_message_queue->Pending_messages.first;
-    message_queue_last  = the_message_queue->Pending_messages.last;
-
-    the_message_queue->Inactive_messages.first = message_queue_first;
-    message_queue_last->next = inactive_first;
-    inactive_first->previous = message_queue_last;
-    message_queue_first->previous          =
-               _Chain_Head( &the_message_queue->Inactive_messages );
-
-    _Chain_Initialize_empty( &the_message_queue->Pending_messages );
-
-    count = the_message_queue->number_of_pending_messages;
-    the_message_queue->number_of_pending_messages = 0;
-  _ISR_Enable( level );
-  return count;
-}
-
-/*PAGE
- *
- *  _CORE_message_queue_Submit
- *
- *  This routine implements the send and urgent message functions. It
- *  processes a message that is to be submitted to the designated
- *  message queue.  The message will either be processed as a
- *  send message which it will be inserted at the rear of the queue
- *  or it will be processed as an urgent message which will be inserted
- *  at the front of the queue.
- *
- *  Input parameters:
- *    the_message_queue            - message is submitted to this message queue
- *    buffer                       - pointer to message buffer
- *    size                         - size in bytes of message to send
- *    id                           - id of message queue
- *    api_message_queue_mp_support - api specific mp support callout
- *    submit_type                  - send or urgent message
- *
- *  Output parameters:
- *    CORE_MESSAGE_QUEUE_SUCCESSFUL - if successful
- *    error code                    - if unsuccessful
- */
-
-CORE_message_queue_Status _CORE_message_queue_Submit(
-  CORE_message_queue_Control                *the_message_queue,
-  void                                      *buffer,
-  unsigned32                                 size,
-  Objects_Id                                 id,
-  CORE_message_queue_API_mp_support_callout  api_message_queue_mp_support,
-  CORE_message_queue_Submit_types            submit_type
-)
-{
-  CORE_message_queue_Buffer_control   *the_message;
-  Thread_Control                      *the_thread;
-
-  if ( size > the_message_queue->maximum_message_size )
-    return CORE_MESSAGE_QUEUE_STATUS_INVALID_SIZE;
-
-  /*
-   * Is there a thread currently waiting on this message queue?
-   */
-      
-  the_thread = _Thread_queue_Dequeue( &the_message_queue->Wait_queue );
-  if ( the_thread )
-  {
-    _CORE_message_queue_Copy_buffer(
-      buffer,
-      the_thread->Wait.return_argument,
-      size
-    );
-    *(unsigned32 *)the_thread->Wait.return_argument_1 = size;
-    
-    if ( !_Objects_Is_local_id( the_thread->Object.id ) )
-      (*api_message_queue_mp_support) ( the_thread, id );
-
-    return CORE_MESSAGE_QUEUE_STATUS_SUCCESSFUL;
-  }
-
-  /*
-   * No one waiting on this one currently.
-   * Allocate a message buffer and store it away
-   */
-
-  if ( the_message_queue->number_of_pending_messages ==
-       the_message_queue->maximum_pending_messages ) {
-    return CORE_MESSAGE_QUEUE_STATUS_TOO_MANY;
-  }
-
-  the_message = _CORE_message_queue_Allocate_message_buffer(the_message_queue);
-  if ( the_message == 0)
-    return CORE_MESSAGE_QUEUE_STATUS_UNSATISFIED;
-
-  _CORE_message_queue_Copy_buffer( buffer, the_message->Contents.buffer, size );
-  the_message->Contents.size = size;
-  
-  the_message_queue->number_of_pending_messages += 1;
-
-  switch ( submit_type ) {
-    case CORE_MESSAGE_QUEUE_SEND_REQUEST:
-      _CORE_message_queue_Append( the_message_queue, the_message );
-      break;
-    case CORE_MESSAGE_QUEUE_URGENT_REQUEST:
-      _CORE_message_queue_Prepend( the_message_queue, the_message );
-      break;
-  }
-
-  return CORE_MESSAGE_QUEUE_STATUS_SUCCESSFUL;
-}
diff --git a/cpukit/score/src/coremutex.c b/cpukit/score/src/coremutex.c
deleted file mode 100644
index dac5a5172b..0000000000
--- a/cpukit/score/src/coremutex.c
+++ /dev/null
@@ -1,348 +0,0 @@
-/*
- *  Mutex Handler
- *
- *  DESCRIPTION:
- *
- *  This package is the implementation of the Mutex Handler.
- *  This handler provides synchronization and mutual exclusion capabilities.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems/system.h>
-#include <rtems/score/isr.h>
-#include <rtems/score/coremutex.h>
-#include <rtems/score/states.h>
-#include <rtems/score/thread.h>
-#include <rtems/score/threadq.h>
-
-/*PAGE
- *
- *  _CORE_mutex_Initialize
- *
- *  This routine initializes a mutex at create time and set the control
- *  structure according to the values passed.
- *
- *  Input parameters: 
- *    the_mutex             - the mutex control block to initialize
- *    the_class             - the API class of the object
- *    the_mutex_attributes  - the mutex attributes specified at create time
- *    initial_lock          - mutex initial lock or unlocked status
- *    proxy_extract_callout - MP specific extract callout
- *
- *  Output parameters:  NONE
- */
-
-void _CORE_mutex_Initialize(
-  CORE_mutex_Control           *the_mutex,
-  Objects_Classes               the_class,
-  CORE_mutex_Attributes        *the_mutex_attributes,
-  unsigned32                    initial_lock,
-  Thread_queue_Extract_callout  proxy_extract_callout
-)
-{
-
-/* Add this to the RTEMS environment later ????????? 
-  rtems_assert( initial_lock == CORE_MUTEX_LOCKED ||
-                initial_lock == CORE_MUTEX_UNLOCKED );
- */
-
-  the_mutex->Attributes = *the_mutex_attributes;
-  the_mutex->lock          = initial_lock;
-
-  if ( initial_lock == CORE_MUTEX_LOCKED ) {
-    the_mutex->nest_count = 1;
-    the_mutex->holder     = _Thread_Executing;
-    the_mutex->holder_id  = _Thread_Executing->Object.id;
-    _Thread_Executing->resource_count++;
-  } else {
-    the_mutex->nest_count = 0;
-    the_mutex->holder     = NULL;
-    the_mutex->holder_id  = 0;
-  }
-
-  _Thread_queue_Initialize(
-    &the_mutex->Wait_queue,
-    the_class,
-    _CORE_mutex_Is_fifo( the_mutex_attributes ) ?
-      THREAD_QUEUE_DISCIPLINE_FIFO : THREAD_QUEUE_DISCIPLINE_PRIORITY,
-    STATES_WAITING_FOR_MUTEX,
-    proxy_extract_callout,
-    CORE_MUTEX_TIMEOUT
-  );
-}
-
-/*PAGE
- *
- *  _CORE_mutex_Seize
- *
- *  This routine attempts to allocate a mutex to the calling thread.
- *
- *  Input parameters:
- *    the_mutex - pointer to mutex control block
- *    id        - id of object to wait on
- *    wait      - TRUE if wait is allowed, FALSE otherwise
- *    timeout   - number of ticks to wait (0 means forever)
- *
- *  Output parameters:  NONE
- *
- *  INTERRUPT LATENCY:
- *    available
- *    wait
- */
-
-void _CORE_mutex_Seize(
-  CORE_mutex_Control  *the_mutex,
-  Objects_Id           id,
-  boolean              wait,
-  Watchdog_Interval    timeout
-)
-{
-  Thread_Control *executing;
-  ISR_Level       level;
-
-  executing = _Thread_Executing;
-  switch ( the_mutex->Attributes.discipline ) {
-    case CORE_MUTEX_DISCIPLINES_FIFO:
-    case CORE_MUTEX_DISCIPLINES_PRIORITY:
-    case CORE_MUTEX_DISCIPLINES_PRIORITY_INHERIT:
-      break;
-    case CORE_MUTEX_DISCIPLINES_PRIORITY_CEILING:
-      if ( executing->current_priority <
-                              the_mutex->Attributes.priority_ceiling) {
-        executing->Wait.return_code = CORE_MUTEX_STATUS_CEILING_VIOLATED;
-        return;
-      }
-  }
-  executing->Wait.return_code = CORE_MUTEX_STATUS_SUCCESSFUL;
-  _ISR_Disable( level );
-  if ( ! _CORE_mutex_Is_locked( the_mutex ) ) {
-    the_mutex->lock       = CORE_MUTEX_LOCKED;
-    the_mutex->holder     = executing;
-    the_mutex->holder_id  = executing->Object.id;
-    the_mutex->nest_count = 1;
-    executing->resource_count++;
-    _ISR_Enable( level );
-    switch ( the_mutex->Attributes.discipline ) {
-      case CORE_MUTEX_DISCIPLINES_FIFO:
-      case CORE_MUTEX_DISCIPLINES_PRIORITY:
-      case CORE_MUTEX_DISCIPLINES_PRIORITY_INHERIT:
-        /* already the highest priority */
-        break;
-      case CORE_MUTEX_DISCIPLINES_PRIORITY_CEILING:
-      if ( the_mutex->Attributes.priority_ceiling <
-                                           executing->current_priority ) {
-        _Thread_Change_priority(
-          the_mutex->holder,
-          the_mutex->Attributes.priority_ceiling,
-          FALSE
-        );
-      }
-    }
-    return;
-  }
-
-  if ( _Objects_Are_ids_equal(
-              _Thread_Executing->Object.id, the_mutex->holder_id ) ) {
-    if ( _CORE_mutex_Is_nesting_allowed( &the_mutex->Attributes ) )
-      the_mutex->nest_count++;
-    else 
-      executing->Wait.return_code = CORE_MUTEX_STATUS_NESTING_NOT_ALLOWED;
-
-    _ISR_Enable( level );
-    return;
-  }
-
-  if ( !wait ) {
-    _ISR_Enable( level );
-    executing->Wait.return_code = CORE_MUTEX_STATUS_UNSATISFIED_NOWAIT;
-    return;
-  }
-
-  _Thread_queue_Enter_critical_section( &the_mutex->Wait_queue );
-  executing->Wait.queue = &the_mutex->Wait_queue;
-  executing->Wait.id    = id;
-  _ISR_Enable( level );
-
-  switch ( the_mutex->Attributes.discipline ) {
-    case CORE_MUTEX_DISCIPLINES_FIFO:
-    case CORE_MUTEX_DISCIPLINES_PRIORITY:
-    case CORE_MUTEX_DISCIPLINES_PRIORITY_CEILING:
-      break;
-    case CORE_MUTEX_DISCIPLINES_PRIORITY_INHERIT:
-      if ( the_mutex->holder->current_priority > executing->current_priority ) {
-        _Thread_Change_priority(
-          the_mutex->holder,
-          executing->current_priority,
-          FALSE
-        );
-      }
-      break;
-  }
-
-  _Thread_queue_Enqueue( &the_mutex->Wait_queue, timeout );
-
-  if ( _Thread_Executing->Wait.return_code == CORE_MUTEX_STATUS_SUCCESSFUL ) {
-    switch ( the_mutex->Attributes.discipline ) {
-      case CORE_MUTEX_DISCIPLINES_FIFO:
-      case CORE_MUTEX_DISCIPLINES_PRIORITY:
-      case CORE_MUTEX_DISCIPLINES_PRIORITY_INHERIT:
-        break;
-      case CORE_MUTEX_DISCIPLINES_PRIORITY_CEILING:
-        if ( the_mutex->Attributes.priority_ceiling <
-                                           executing->current_priority ) {
-          _Thread_Change_priority(
-            executing,
-            the_mutex->Attributes.priority_ceiling,
-            FALSE
-          );
-        };
-        break;
-    }
-  }
-}
-
-/*
- *  _CORE_mutex_Surrender
- *
- *  DESCRIPTION:
- *
- *  This routine frees a unit to the mutex.  If a task was blocked waiting for
- *  a unit from this mutex, then that task will be readied and the unit
- *  given to that task.  Otherwise, the unit will be returned to the mutex.
- *
- *  Input parameters:
- *    the_mutex            - the mutex to be flushed
- *    id                   - id of parent mutex
- *    api_mutex_mp_support - api dependent MP support actions
- *
- *  Output parameters:
- *    CORE_MUTEX_STATUS_SUCCESSFUL - if successful
- *    core error code              - if unsuccessful
- */
-
-CORE_mutex_Status _CORE_mutex_Surrender(
-  CORE_mutex_Control                *the_mutex,
-  Objects_Id                         id,
-  CORE_mutex_API_mp_support_callout  api_mutex_mp_support
-)
-{
-  Thread_Control *the_thread;
-  Thread_Control *executing;
-
-  executing = _Thread_Executing;
-
-  /*
-   *  The following code allows a thread (or ISR) other than the thread
-   *  which acquired the mutex to release that mutex.  This is only
-   *  allowed when the mutex in quetion is FIFO or simple Priority
-   *  discipline.  But Priority Ceiling or Priority Inheritance mutexes
-   *  must be released by the thread which acquired them.
-   */ 
-
-  if ( !_Objects_Are_ids_equal(
-           _Thread_Executing->Object.id, the_mutex->holder_id ) ) {
-
-    switch ( the_mutex->Attributes.discipline ) {
-      case CORE_MUTEX_DISCIPLINES_FIFO:
-      case CORE_MUTEX_DISCIPLINES_PRIORITY:
-        break;
-      case CORE_MUTEX_DISCIPLINES_PRIORITY_CEILING:
-      case CORE_MUTEX_DISCIPLINES_PRIORITY_INHERIT:
-        return( CORE_MUTEX_STATUS_NOT_OWNER_OF_RESOURCE );
-        break;
-    }
-  }
-
-  the_mutex->nest_count--;
-
-  if ( the_mutex->nest_count != 0 )
-    return( CORE_MUTEX_STATUS_SUCCESSFUL );
-
-  _Thread_Executing->resource_count--;
-  the_mutex->holder    = NULL;
-  the_mutex->holder_id = 0;
-
-  /*
-   *  Whether or not someone is waiting for the mutex, an
-   *  inherited priority must be lowered if this is the last
-   *  mutex (i.e. resource) this task has.
-   */
-
-  switch ( the_mutex->Attributes.discipline ) {
-    case CORE_MUTEX_DISCIPLINES_FIFO:
-    case CORE_MUTEX_DISCIPLINES_PRIORITY:
-      break;
-    case CORE_MUTEX_DISCIPLINES_PRIORITY_CEILING:
-    case CORE_MUTEX_DISCIPLINES_PRIORITY_INHERIT:
-      if ( executing->resource_count == 0 && 
-           executing->real_priority != executing->current_priority ) {
-         _Thread_Change_priority( executing, executing->real_priority, TRUE );
-      }
-      break;
-  }
-
-
-  if ( ( the_thread = _Thread_queue_Dequeue( &the_mutex->Wait_queue ) ) ) {
-
-    if ( !_Objects_Is_local_id( the_thread->Object.id ) ) {
-      
-      the_mutex->holder     = NULL;
-      the_mutex->holder_id  = the_thread->Object.id;
-      the_mutex->nest_count = 1;
-
-      ( *api_mutex_mp_support)( the_thread, id );
-
-    } else {
-
-      the_mutex->holder     = the_thread;
-      the_mutex->holder_id  = the_thread->Object.id;
-      the_thread->resource_count++;
-      the_mutex->nest_count = 1;
-
-     /*
-      *  No special action for priority inheritance or priority ceiling
-      *  because the_thread is guaranteed to be the highest priority
-      *  thread waiting for the mutex.
-      */
-    }
-  } else
-    the_mutex->lock = CORE_MUTEX_UNLOCKED;
-
-  return( CORE_MUTEX_STATUS_SUCCESSFUL );
-}
-
-/*PAGE
- *
- *  _CORE_mutex_Flush
- *
- *  This function a flushes the mutex's task wait queue.
- *
- *  Input parameters:
- *    the_mutex              - the mutex to be flushed
- *    remote_extract_callout - function to invoke remotely
- *    status                 - status to pass to thread
- *
- *  Output parameters:  NONE
- */
-
-void _CORE_mutex_Flush(
-  CORE_mutex_Control         *the_mutex,
-  Thread_queue_Flush_callout  remote_extract_callout,
-  unsigned32                  status
-)
-{
-  _Thread_queue_Flush(
-    &the_mutex->Wait_queue,
-    remote_extract_callout,
-    status
-  );
-}
diff --git a/cpukit/score/src/coresem.c b/cpukit/score/src/coresem.c
deleted file mode 100644
index 074ba2cb22..0000000000
--- a/cpukit/score/src/coresem.c
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- *  CORE Semaphore Handler
- *
- *  DESCRIPTION:
- *
- *  This package is the implementation of the CORE Semaphore Handler.
- *  This core object utilizes standard Dijkstra counting semaphores to provide
- *  synchronization and mutual exclusion capabilities.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems/system.h>
-#include <rtems/score/isr.h>
-#include <rtems/score/coresem.h>
-#include <rtems/score/states.h>
-#include <rtems/score/thread.h>
-#include <rtems/score/threadq.h>
-#include <rtems/score/mpci.h>
-
-/*PAGE
- *
- *  CORE_semaphore_Initialize
- *
- *  This function initialize a semaphore and sets the initial value based
- *  on the given count.
- *
- *  Input parameters:
- *    the_semaphore            - the semaphore control block to initialize
- *    the_class                - the API class of the object
- *    the_semaphore_attributes - the attributes specified at create time
- *    initial_value            - semaphore's initial value
- *    proxy_extract_callout    - MP specific extract callout
- *
- *  Output parameters:  NONE
- */
-
-void _CORE_semaphore_Initialize(
-  CORE_semaphore_Control       *the_semaphore,
-  Objects_Classes               the_class,
-  CORE_semaphore_Attributes    *the_semaphore_attributes,
-  unsigned32                    initial_value,
-  Thread_queue_Extract_callout  proxy_extract_callout
-)
-{
-
-  the_semaphore->Attributes = *the_semaphore_attributes;
-  the_semaphore->count      = initial_value;
-
-  _Thread_queue_Initialize(
-    &the_semaphore->Wait_queue,
-    the_class,
-    _CORE_semaphore_Is_priority( the_semaphore_attributes ) ?
-              THREAD_QUEUE_DISCIPLINE_PRIORITY : THREAD_QUEUE_DISCIPLINE_FIFO,
-    STATES_WAITING_FOR_SEMAPHORE,
-    proxy_extract_callout,
-    CORE_SEMAPHORE_TIMEOUT
-  );
-}
-
-/*PAGE
- *
- *  _CORE_semaphore_Surrender
- *
- *  Input parameters:
- *    the_semaphore            - the semaphore to be flushed
- *    id                       - id of parent semaphore
- *    api_semaphore_mp_support - api dependent MP support actions
- *
- *  Output parameters:
- *    CORE_SEMAPHORE_STATUS_SUCCESSFUL - if successful
- *    core error code                  - if unsuccessful
- *
- *  Output parameters:
- */
-
-CORE_semaphore_Status _CORE_semaphore_Surrender(
-  CORE_semaphore_Control                *the_semaphore,
-  Objects_Id                             id,
-  CORE_semaphore_API_mp_support_callout  api_semaphore_mp_support
-)
-{
-  Thread_Control *the_thread;
-
-  if ( (the_thread = _Thread_queue_Dequeue(&the_semaphore->Wait_queue)) ) {
-
-    if ( !_Objects_Is_local_id( the_thread->Object.id ) )
-      (*api_semaphore_mp_support) ( the_thread, id );
-
-  } else
-    the_semaphore->count += 1;
-
-  return( CORE_SEMAPHORE_STATUS_SUCCESSFUL );
-}
-
-/*PAGE
- *
- *  _CORE_semaphore_Seize
- *
- *  This routine attempts to allocate a core semaphore to the calling thread.
- *
- *  Input parameters:
- *    the_semaphore - pointer to semaphore control block
- *    id            - id of object to wait on
- *    wait          - TRUE if wait is allowed, FALSE otherwise
- *    timeout       - number of ticks to wait (0 means forever)
- *
- *  Output parameters:  NONE
- *
- *  INTERRUPT LATENCY:
- *    available
- *    wait
- */
-
-void _CORE_semaphore_Seize(
-  CORE_semaphore_Control  *the_semaphore,
-  Objects_Id               id,
-  boolean                  wait,
-  Watchdog_Interval        timeout
-)
-{
-  Thread_Control *executing;
-  ISR_Level       level;
-
-  executing = _Thread_Executing;
-  executing->Wait.return_code = CORE_SEMAPHORE_STATUS_SUCCESSFUL;
-  _ISR_Disable( level );
-  if ( the_semaphore->count != 0 ) {
-    the_semaphore->count -= 1;
-    _ISR_Enable( level );
-    return;
-  }
-
-  if ( !wait ) {
-    _ISR_Enable( level );
-    executing->Wait.return_code = CORE_SEMAPHORE_STATUS_UNSATISFIED_NOWAIT;
-    return;
-  }
-
-  _Thread_queue_Enter_critical_section( &the_semaphore->Wait_queue );
-  executing->Wait.queue          = &the_semaphore->Wait_queue;
-  executing->Wait.id             = id;
-  _ISR_Enable( level );
-
-  _Thread_queue_Enqueue( &the_semaphore->Wait_queue, timeout );
-}
-
-
-/*PAGE
- *
- *  _CORE_semaphore_Flush
- *
- *  This function a flushes the semaphore's task wait queue.
- *
- *  Input parameters:
- *    the_semaphore          - the semaphore to be flushed
- *    remote_extract_callout - function to invoke remotely
- *    status                 - status to pass to thread
- *
- *  Output parameters:  NONE
- */
- 
-void _CORE_semaphore_Flush(
-  CORE_semaphore_Control     *the_semaphore,
-  Thread_queue_Flush_callout  remote_extract_callout,
-  unsigned32                  status
-)
-{
- 
-  _Thread_queue_Flush(
-    &the_semaphore->Wait_queue,
-    remote_extract_callout,
-    status
-  );
- 
-}
diff --git a/cpukit/score/src/coretod.c b/cpukit/score/src/coretod.c
deleted file mode 100644
index 72742944b4..0000000000
--- a/cpukit/score/src/coretod.c
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
- *  Time of Day (TOD) Handler
- *
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems/system.h>
-#include <rtems/score/object.h>
-#include <rtems/score/thread.h>
-#include <rtems/score/tod.h>
-#include <rtems/score/watchdog.h>
-
-/*PAGE
- *
- *  _TOD_Handler_initialization
- *
- *  This routine initializes the time of day handler.
- *
- *  Input parameters:
- *    microseconds_per_tick - microseconds between clock ticks
- *
- *  Output parameters: NONE
- */
-
-void _TOD_Handler_initialization(
-  unsigned32 microseconds_per_tick
-)
-{
-  _TOD_Microseconds_per_tick = microseconds_per_tick;
-
-  _TOD_Seconds_since_epoch = 0;
-
-  _TOD_Current.year   = TOD_BASE_YEAR;
-  _TOD_Current.month  = 1;
-  _TOD_Current.day    = 1;
-  _TOD_Current.hour   = 0;
-  _TOD_Current.minute = 0;
-  _TOD_Current.second = 0;
-  _TOD_Current.ticks  = 0;
-
-  if ( microseconds_per_tick == 0 )
-    _TOD_Ticks_per_second = 0;
-  else
-    _TOD_Ticks_per_second =
-       TOD_MICROSECONDS_PER_SECOND / microseconds_per_tick;
-
-  _Watchdog_Initialize( &_TOD_Seconds_watchdog, _TOD_Tickle, 0, NULL );
-
-  _TOD_Is_set = FALSE;
-  _TOD_Activate( _TOD_Ticks_per_second );
-}
-
-/*PAGE
- *
- *  _TOD_Set
- *
- *  This rountine sets the current date and time with the specified
- *  new date and time structure.
- *
- *  Input parameters:
- *    the_tod             - pointer to the time and date structure
- *    seconds_since_epoch - seconds since system epoch
- *
- *  Output parameters: NONE
- */
-
-void _TOD_Set(
-  TOD_Control *the_tod,
-  Watchdog_Interval  seconds_since_epoch
-)
-{
-  Watchdog_Interval ticks_until_next_second;
-
-  _Thread_Disable_dispatch();
-  _TOD_Deactivate();
-
-  if ( seconds_since_epoch < _TOD_Seconds_since_epoch )
-    _Watchdog_Adjust_seconds( WATCHDOG_BACKWARD,
-       _TOD_Seconds_since_epoch - seconds_since_epoch );
-  else
-    _Watchdog_Adjust_seconds( WATCHDOG_FORWARD,
-       seconds_since_epoch - _TOD_Seconds_since_epoch );
-
-  ticks_until_next_second = _TOD_Ticks_per_second;
-  if ( ticks_until_next_second > _TOD_Current.ticks )
-    ticks_until_next_second -= _TOD_Current.ticks;
-
-  _TOD_Current             = *the_tod;
-  _TOD_Seconds_since_epoch = seconds_since_epoch;
-  _TOD_Is_set              = TRUE;
-  _TOD_Activate( ticks_until_next_second );
-
-  _Thread_Enable_dispatch();
-}
-
-/*PAGE
- *
- *  _TOD_Validate
- *
- *  This kernel routine checks the validity of a date and time structure.
- *
- *  Input parameters:
- *    the_tod - pointer to a time and date structure
- *
- *  Output parameters:
- *    TRUE  - if the date, time, and tick are valid
- *    FALSE - if the the_tod is invalid
- *
- *  NOTE: This routine only works for leap-years through 2099.
- */
-
-boolean _TOD_Validate(
-  TOD_Control *the_tod
-)
-{
-  unsigned32 days_in_month;
-
-  if ((the_tod->ticks  >= _TOD_Ticks_per_second)  ||
-      (the_tod->second >= TOD_SECONDS_PER_MINUTE) ||
-      (the_tod->minute >= TOD_MINUTES_PER_HOUR)   ||
-      (the_tod->hour   >= TOD_HOURS_PER_DAY)      ||
-      (the_tod->month  == 0)                      ||
-      (the_tod->month  >  TOD_MONTHS_PER_YEAR)    ||
-      (the_tod->year   <  TOD_BASE_YEAR)          ||
-      (the_tod->day    == 0) )
-     return FALSE;
-
-  if ( (the_tod->year % 4) == 0 )
-    days_in_month = _TOD_Days_per_month[ 1 ][ the_tod->month ];
-  else
-    days_in_month = _TOD_Days_per_month[ 0 ][ the_tod->month ];
-
-  if ( the_tod->day > days_in_month )
-    return FALSE;
-
-  return TRUE;
-}
-
-/*PAGE
- *
- *  _TOD_To_seconds
- *
- *  This routine returns the seconds from the epoch until the
- *  current date and time.
- *
- *  Input parameters:
- *    the_tod - pointer to the time and date structure
- *
- *  Output parameters:
- *    returns    - seconds since epoch until the_tod
- */
-
-unsigned32 _TOD_To_seconds(
-  TOD_Control *the_tod
-)
-{
-  unsigned32 time;
-  unsigned32 year_mod_4;
-
-  time = the_tod->day - 1;
-  year_mod_4 = the_tod->year & 3;
-
-  if ( year_mod_4 == 0 )
-    time += _TOD_Days_to_date[ 1 ][ the_tod->month ];
-  else
-    time += _TOD_Days_to_date[ 0 ][ the_tod->month ];
-
-  time += ( (the_tod->year - TOD_BASE_YEAR) / 4 ) *
-            ( (TOD_DAYS_PER_YEAR * 4) + 1);
-
-  time += _TOD_Days_since_last_leap_year[ year_mod_4 ];
-
-  time *= TOD_SECONDS_PER_DAY;
-
-  time += ((the_tod->hour * TOD_MINUTES_PER_HOUR) + the_tod->minute)
-             * TOD_SECONDS_PER_MINUTE;
-
-  time += the_tod->second;
-
-  return( time );
-}
-
-/*PAGE
- *
- *  _TOD_Tickle
- *
- *  This routine updates the calendar time and tickles the
- *  per second watchdog timer chain.
- *
- *  Input parameters:
- *    ignored - this parameter is ignored
- *
- *  Output parameters: NONE
- *
- *  NOTE: This routine only works for leap-years through 2099.
- */
-
-void _TOD_Tickle(
-  Objects_Id  id,
-  void       *ignored
-)
-{
-  unsigned32 leap;
-
-  _TOD_Current.ticks = 0;
-  ++_TOD_Seconds_since_epoch;
-  if ( ++_TOD_Current.second >= TOD_SECONDS_PER_MINUTE ) {
-    _TOD_Current.second = 0;
-    if ( ++_TOD_Current.minute >= TOD_MINUTES_PER_HOUR ) {
-      _TOD_Current.minute = 0;
-      if ( ++_TOD_Current.hour >= TOD_HOURS_PER_DAY ) {
-        _TOD_Current.hour = 0;
-        if ( _TOD_Current.year & 0x3 ) leap = 0;
-        else                           leap = 1;
-        if ( ++_TOD_Current.day >
-               _TOD_Days_per_month[ leap ][ _TOD_Current.month ]) {
-          _TOD_Current.day = 1;
-          if ( ++_TOD_Current.month > TOD_MONTHS_PER_YEAR ) {
-            _TOD_Current.month = 1;
-            _TOD_Current.year++;
-          }
-        }
-      }
-    }
-  }
-
-  _Watchdog_Tickle_seconds();
-  _Watchdog_Insert_ticks( &_TOD_Seconds_watchdog, _TOD_Ticks_per_second );
-}
diff --git a/cpukit/score/src/heap.c b/cpukit/score/src/heap.c
deleted file mode 100644
index d8a1aad8bd..0000000000
--- a/cpukit/score/src/heap.c
+++ /dev/null
@@ -1,538 +0,0 @@
-/*
- *  Heap Handler
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-#include <rtems/system.h>
-#include <rtems/score/sysstate.h>
-#include <rtems/score/heap.h>
-
-/*PAGE
- *
- *  _Heap_Initialize
- *
- *  This kernel routine initializes a heap.
- *
- *  Input parameters:
- *    the_heap         - pointer to heap header
- *    starting_address - starting address of heap
- *    size             - size of heap
- *    page_size        - allocatable unit of memory
- *
- *  Output parameters:
- *    returns - maximum memory available if RTEMS_SUCCESSFUL
- *    0       - otherwise
- *
- *    This is what a heap looks like in memory immediately
- *    after initialization:
- *
- *            +--------------------------------+
- *     0      |  size = 0      | status = used |  a.k.a.  dummy back flag
- *            +--------------------------------+
- *     4      |  size = size-8 | status = free |  a.k.a.  front flag
- *            +--------------------------------+
- *     8      |  next     = PERM HEAP_TAIL     |
- *            +--------------------------------+
- *    12      |  previous = PERM HEAP_HEAD     |
- *            +--------------------------------+
- *            |                                |
- *            |      memory available          |
- *            |       for allocation           |
- *            |                                |
- *            +--------------------------------+
- *  size - 8  |  size = size-8 | status = free |  a.k.a.  back flag
- *            +--------------------------------+
- *  size - 4  |  size = 0      | status = used |  a.k.a.  dummy front flag
- *            +--------------------------------+
- */
-
-unsigned32 _Heap_Initialize(
-  Heap_Control        *the_heap,
-  void                *starting_address,
-  unsigned32           size,
-  unsigned32           page_size
-)
-{
-  Heap_Block        *the_block;
-  unsigned32         the_size;
-
-  if ( !_Heap_Is_page_size_valid( page_size ) ||
-       (size < HEAP_MINIMUM_SIZE) )
-    return 0;
-
-  the_heap->page_size = page_size;
-  the_size = size - HEAP_OVERHEAD;
-
-  the_block             = (Heap_Block *) starting_address;
-  the_block->back_flag  = HEAP_DUMMY_FLAG;
-  the_block->front_flag = the_size;
-  the_block->next       = _Heap_Tail( the_heap );
-  the_block->previous   = _Heap_Head( the_heap );
-
-  the_heap->start          = the_block;
-  the_heap->first          = the_block;
-  the_heap->permanent_null = NULL;
-  the_heap->last           = the_block;
-
-  the_block             = _Heap_Next_block( the_block );
-  the_block->back_flag  = the_size;
-  the_block->front_flag = HEAP_DUMMY_FLAG;
-  the_heap->final       = the_block;
-
-  return ( the_size - HEAP_BLOCK_USED_OVERHEAD );
-}
-
-/*PAGE
- *
- *  _Heap_Extend
- *
- *  This routine grows the_heap memory area using the size bytes which
- *  begin at starting_address.
- *
- *  Input parameters:
- *    the_heap          - pointer to heap header.
- *    starting_address  - pointer to the memory area.
- *    size              - size in bytes of the memory block to allocate.
- *
- *  Output parameters:
- *    *amount_extended  - amount of memory added to the_heap
- */
-
-Heap_Extend_status _Heap_Extend(
-  Heap_Control        *the_heap,
-  void                *starting_address,
-  unsigned32           size,
-  unsigned32          *amount_extended
-)
-{
-  Heap_Block        *the_block;
-  unsigned32        *p;
-  
-  /*
-   *  The overhead was taken from the original heap memory.
-   */
-
-  Heap_Block  *old_final;
-  Heap_Block  *new_final;
-
-  /*
-   *  There are five possibilities for the location of starting
-   *  address:
-   *
-   *    1. non-contiguous lower address     (NOT SUPPORTED)
-   *    2. contiguous lower address         (NOT SUPPORTED)
-   *    3. in the heap                      (ERROR)
-   *    4. contiguous higher address        (SUPPORTED)
-   *    5. non-contiguous higher address    (NOT SUPPORTED)
-   *
-   *  As noted, this code only supports (4).
-   */
-
-  if ( starting_address >= (void *) the_heap->start &&        /* case 3 */
-       starting_address <= (void *) the_heap->final
-     )
-    return HEAP_EXTEND_ERROR;
-
-  if ( starting_address < (void *) the_heap->start ) {  /* cases 1 and 2 */
-
-      return HEAP_EXTEND_NOT_IMPLEMENTED;               /* cases 1 and 2 */
-
-  } else {                                              /* cases 4 and 5 */
-
-    the_block = (Heap_Block *)
-       _Addresses_Subtract_offset( starting_address, HEAP_OVERHEAD );
-    if ( the_block != the_heap->final )
-      return HEAP_EXTEND_NOT_IMPLEMENTED;                   /* case 5 */
-  }
-
-  /*
-   *  Currently only case 4 should make it to this point.
-   *  The basic trick is to make the extend area look like a used
-   *  block and free it.
-   */
-
-  *amount_extended = size;
-
-  old_final = the_heap->final;
-  new_final = _Addresses_Add_offset( old_final, size );
-  /* SAME AS: _Addresses_Add_offset( starting_address, size-HEAP_OVERHEAD ); */
-
-  the_heap->final = new_final;
-
-  old_final->front_flag = 
-  new_final->back_flag  = _Heap_Build_flag( size, HEAP_BLOCK_USED );
-  new_final->front_flag = HEAP_DUMMY_FLAG;
-
-  /*
-   *  Must pass in address of "user" area
-   *  So add in the offset field.
-   */
-
-  p = (unsigned32 *) &old_final->next;
-  *p = sizeof(unsigned32);
-  p++;
-  _Heap_Free( the_heap, p );
-  
-  return HEAP_EXTEND_SUCCESSFUL;
-}
-
-/*PAGE
- *
- *  _Heap_Allocate
- *
- *  This kernel routine allocates the requested size of memory
- *  from the specified heap.
- *
- *  Input parameters:
- *    the_heap  - pointer to heap header.
- *    size      - size in bytes of the memory block to allocate.
- *
- *  Output parameters:
- *    returns - starting address of memory block allocated
- */
-
-void *_Heap_Allocate(
-  Heap_Control        *the_heap,
-  unsigned32           size
-)
-{
-  unsigned32  excess;
-  unsigned32  the_size;
-  Heap_Block *the_block;
-  Heap_Block *next_block;
-  Heap_Block *temporary_block;
-  void       *ptr;
-  unsigned32  offset;
-  
-  excess   = size % the_heap->page_size;
-  the_size = size + the_heap->page_size + HEAP_BLOCK_USED_OVERHEAD;
-  
-  if ( excess )
-    the_size += the_heap->page_size - excess;
-
-  if ( the_size < sizeof( Heap_Block ) )
-    the_size = sizeof( Heap_Block );
-
-  for ( the_block = the_heap->first;
-        ;
-        the_block = the_block->next ) {
-    if ( the_block == _Heap_Tail( the_heap ) )
-      return( NULL );
-    if ( the_block->front_flag >= the_size )
-      break;
-  }
-
-  if ( (the_block->front_flag - the_size) >
-       (the_heap->page_size + HEAP_BLOCK_USED_OVERHEAD) ) {
-    the_block->front_flag -= the_size;
-    next_block             = _Heap_Next_block( the_block );
-    next_block->back_flag  = the_block->front_flag;
-
-    temporary_block            = _Heap_Block_at( next_block, the_size );
-    temporary_block->back_flag =
-    next_block->front_flag     = _Heap_Build_flag( the_size,
-                                    HEAP_BLOCK_USED );
-    ptr = _Heap_Start_of_user_area( next_block );
-  } else {
-    next_block                = _Heap_Next_block( the_block );
-    next_block->back_flag     = _Heap_Build_flag( the_block->front_flag,
-                                   HEAP_BLOCK_USED );
-    the_block->front_flag     = next_block->back_flag;
-    the_block->next->previous = the_block->previous;
-    the_block->previous->next = the_block->next;
-    ptr = _Heap_Start_of_user_area( the_block );
-  }
-  
-  /*
-   * round ptr up to a multiple of page size
-   * Have to save the bump amount in the buffer so that free can figure it out
-   */
-  
-  offset = the_heap->page_size - (((unsigned32) ptr) & (the_heap->page_size - 1));
-  ptr = _Addresses_Add_offset( ptr, offset );
-  *(((unsigned32 *) ptr) - 1) = offset;
-
-#ifdef RTEMS_DEBUG
-  {
-      unsigned32 ptr_u32;
-      ptr_u32 = (unsigned32) ptr;
-      if (ptr_u32 & (the_heap->page_size - 1))
-          abort();
-  }
-#endif
-
-  return ptr;
-}
-
-/*PAGE
- *
- *  _Heap_Size_of_user_area
- *
- *  This kernel routine returns the size of the memory area
- *  given heap block.
- *
- *  Input parameters:
- *    the_heap         - pointer to heap header
- *    starting_address - starting address of the memory block to free.
- *    size             - pointer to size of area
- *
- *  Output parameters:
- *    size  - size of area filled in
- *    TRUE  - if starting_address is valid heap address
- *    FALSE - if starting_address is invalid heap address
- */
-
-boolean _Heap_Size_of_user_area(
-  Heap_Control        *the_heap,
-  void                *starting_address,
-  unsigned32          *size
-)
-{
-  Heap_Block        *the_block;
-  Heap_Block        *next_block;
-  unsigned32         the_size;
-
-  the_block = _Heap_User_block_at( starting_address );
-  
-  if ( !_Heap_Is_block_in( the_heap, the_block ) ||
-        _Heap_Is_block_free( the_block ) )
-    return( FALSE );
-
-  the_size   = _Heap_Block_size( the_block );
-  next_block = _Heap_Block_at( the_block, the_size );
-
-  if ( !_Heap_Is_block_in( the_heap, next_block ) ||
-       (the_block->front_flag != next_block->back_flag) )
-    return( FALSE );
-
-  *size = the_size;
-  return( TRUE );
-}
-
-/*PAGE
- *
- *  _Heap_Free
- *
- *  This kernel routine returns the memory designated by the
- *  given heap and given starting address to the memory pool.
- *
- *  Input parameters:
- *    the_heap         - pointer to heap header
- *    starting_address - starting address of the memory block to free.
- *
- *  Output parameters:
- *    TRUE  - if starting_address is valid heap address
- *    FALSE - if starting_address is invalid heap address
- */
-
-boolean _Heap_Free(
-  Heap_Control        *the_heap,
-  void                *starting_address
-)
-{
-  Heap_Block        *the_block;
-  Heap_Block        *next_block;
-  Heap_Block        *new_next_block;
-  Heap_Block        *previous_block;
-  Heap_Block        *temporary_block;
-  unsigned32         the_size;
-
-  the_block = _Heap_User_block_at( starting_address );
-
-  if ( !_Heap_Is_block_in( the_heap, the_block ) ||
-        _Heap_Is_block_free( the_block ) ) {
-      return( FALSE );
-  }
-
-  the_size   = _Heap_Block_size( the_block );
-  next_block = _Heap_Block_at( the_block, the_size );
-
-  if ( !_Heap_Is_block_in( the_heap, next_block ) ||
-       (the_block->front_flag != next_block->back_flag) ) {
-      return( FALSE );
-  }
-
-  if ( _Heap_Is_previous_block_free( the_block ) ) {
-    previous_block = _Heap_Previous_block( the_block );
-
-    if ( !_Heap_Is_block_in( the_heap, previous_block ) ) {
-        return( FALSE );
-    }
-
-    if ( _Heap_Is_block_free( next_block ) ) {      /* coalesce both */
-      previous_block->front_flag += next_block->front_flag + the_size;
-      temporary_block             = _Heap_Next_block( previous_block );
-      temporary_block->back_flag  = previous_block->front_flag;
-      next_block->next->previous  = next_block->previous;
-      next_block->previous->next  = next_block->next;
-    }
-    else {                     /* coalesce prev */
-      previous_block->front_flag =
-      next_block->back_flag      = previous_block->front_flag + the_size;
-    }
-  }
-  else if ( _Heap_Is_block_free( next_block ) ) { /* coalesce next */
-    the_block->front_flag     = the_size + next_block->front_flag;
-    new_next_block            = _Heap_Next_block( the_block );
-    new_next_block->back_flag = the_block->front_flag;
-    the_block->next           = next_block->next;
-    the_block->previous       = next_block->previous;
-    next_block->previous->next = the_block;
-    next_block->next->previous = the_block;
-
-    if (the_heap->first == next_block)
-        the_heap->first = the_block;
-  }
-  else {                          /* no coalesce */
-    next_block->back_flag     =
-    the_block->front_flag     = the_size;
-    the_block->previous       = _Heap_Head( the_heap );
-    the_block->next           = the_heap->first;
-    the_heap->first           = the_block;
-    the_block->next->previous = the_block;
-  }
-
-  return( TRUE );
-}
-
-/*PAGE
- *
- *  _Heap_Walk
- *
- *  This kernel routine walks the heap and verifies its correctness.
- *
- *  Input parameters:
- *    the_heap  - pointer to heap header
- *    source    - a numeric indicator of the invoker of this routine
- *    do_dump   - when TRUE print the information
- *
- *  Output parameters: NONE
- */
-
-#ifndef RTEMS_DEBUG
-
-void _Heap_Walk(
-  Heap_Control  *the_heap,
-  int            source,
-  boolean        do_dump
-)
-{
-}
-
-#else
-
-#include <stdio.h>
-#include <unistd.h>
-
-void _Heap_Walk(
-  Heap_Control  *the_heap,
-  int            source,
-  boolean        do_dump
-)
-{
-  Heap_Block *the_block  = 0;  /* avoid warnings */
-  Heap_Block *next_block = 0;  /* avoid warnings */
-  int         notdone = 1;
-  int         error = 0;
-  int         passes = 0;
-
-  /*
-   * We don't want to allow walking the heap until we have
-   * transferred control to the user task so we watch the
-   * system state.
-   */
-
-  if ( !_System_state_Is_up( _System_state_Get() ) )
-    return;
-
-  the_block = the_heap->start;
-
-  if (do_dump == TRUE) {
-    printf("\nPASS: %d  start @ 0x%p   final 0x%p,   first 0x%p  last 0x%p\n",
-            source, the_heap->start, the_heap->final,
-                  the_heap->first, the_heap->last
-          );
-  }
-
-  /*
-   * Handle the 1st block
-   */
-
-  if (the_block->back_flag != HEAP_DUMMY_FLAG) {
-    printf("PASS: %d  Back flag of 1st block isn't HEAP_DUMMY_FLAG\n", source);
-    error = 1;
-  }
-
-  while (notdone) {
-    passes++;
-    if (error && (passes > 10))
-        abort();
-    
-    if (do_dump == TRUE) {
-      printf("PASS: %d  Block @ 0x%p   Back %d,   Front %d",
-              source, the_block,
-              the_block->back_flag, the_block->front_flag);
-      if ( _Heap_Is_block_free(the_block) ) {
-        printf( "      Prev 0x%p,   Next 0x%p\n",
-                          the_block->previous, the_block->next);
-      } else {
-        printf("\n");
-      }
-    }
-
-    /*
-     * Handle the last block
-     */
-
-    if ( the_block->front_flag != HEAP_DUMMY_FLAG ) {
-      next_block = _Heap_Next_block(the_block);
-      if ( the_block->front_flag != next_block->back_flag ) {
-        error = 1;
-        printf("PASS: %d  Front and back flags don't match\n", source);
-        printf("         Current Block (%p):  Back - %d,  Front - %d",
-               the_block, the_block->back_flag, the_block->front_flag);
-        if (do_dump == TRUE) {
-          if (_Heap_Is_block_free(the_block)) {
-            printf("      Prev 0x%p,   Next 0x%p\n",
-                   the_block->previous, the_block->next);
-          } else {
-            printf("\n");
-          }
-        } else {
-          printf("\n");
-        }
-        printf("         Next Block (%p):     Back - %d,  Front - %d",
-               next_block, next_block->back_flag, next_block->front_flag);
-        if (do_dump == TRUE) {
-          if (_Heap_Is_block_free(next_block)) {
-            printf("      Prev 0x%p,   Next 0x%p\n",
-                   the_block->previous, the_block->next);
-          } else {
-            printf("\n");
-          }
-        } else {
-          printf("\n");
-        }
-      }
-    }
-
-    if (the_block->front_flag == HEAP_DUMMY_FLAG)
-      notdone = 0;
-    else
-      the_block = next_block;
-  }
-
-  if (error)
-      abort();
-}
-#endif
diff --git a/cpukit/score/src/interr.c b/cpukit/score/src/interr.c
deleted file mode 100644
index c3a6d48514..0000000000
--- a/cpukit/score/src/interr.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- *  Internal Error Handler
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems/system.h>
-#include <rtems/score/interr.h>
-#include <rtems/score/sysstate.h>
-#include <rtems/score/userext.h>
-
-/*PAGE
- *
- *  _Internal_error_Occurred
- *
- *  This routine will invoke the fatal error handler supplied by the user
- *  followed by the the default one provided by the executive.  The default
- *  error handler assumes no hardware is present to help inform the user
- *  of the problem.  Halt stores the error code in a known register,
- *  disables interrupts, and halts the CPU.  If the CPU does not have a
- *  halt instruction, it will loop to itself.
- *
- *  Input parameters:
- *    the_source  - what subsystem the error originated in
- *    is_internal - if the error was internally generated
- *    the_error   - fatal error status code
- *
- *  Output parameters:
- *    As much information as possible is stored in a CPU dependent fashion.
- *    See the CPU dependent code for more information.
- *
- *  NOTE: The the_error is not necessarily a directive status code.
- */
-
-void volatile _Internal_error_Occurred(
-  Internal_errors_Source  the_source,
-  boolean                 is_internal,
-  unsigned32              the_error
-)
-{
-
-  Internal_errors_What_happened.the_source  = the_source;
-  Internal_errors_What_happened.is_internal = is_internal;
-  Internal_errors_What_happened.the_error   = the_error;
-
-  _User_extensions_Fatal( the_source, is_internal, the_error );
-
-  _System_state_Set( SYSTEM_STATE_FAILED );
-
-  _CPU_Fatal_halt( the_error );
-
-  /* will not return from this routine */
-}
diff --git a/cpukit/score/src/isr.c b/cpukit/score/src/isr.c
deleted file mode 100644
index 53baf388c4..0000000000
--- a/cpukit/score/src/isr.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- *  ISR Handler
- *
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems/system.h>
-#include <rtems/score/isr.h>
-#include <rtems/score/stack.h>
-#include <rtems/score/interr.h>
-#include <rtems/score/wkspace.h>
-
-/*  _ISR_Handler_initialization
- *
- *  This routine initializes the ISR handler.
- *
- *  Input parameters: NONE
- *
- *  Output parameters: NONE
- */
-
-void _ISR_Handler_initialization( void )
-{
-  _ISR_Signals_to_thread_executing = FALSE;
-
-  _ISR_Nest_level = 0;
-
-#if ( CPU_ALLOCATE_INTERRUPT_STACK == TRUE )
-
-  if ( _CPU_Table.interrupt_stack_size < STACK_MINIMUM_SIZE )
-    _Internal_error_Occurred(
-      INTERNAL_ERROR_CORE,
-      TRUE,
-      INTERNAL_ERROR_INTERRUPT_STACK_TOO_SMALL
-    );
-
-  _CPU_Interrupt_stack_low =
-    _Workspace_Allocate_or_fatal_error( _CPU_Table.interrupt_stack_size );
-
-  _CPU_Interrupt_stack_high = _Addresses_Add_offset(
-    _CPU_Interrupt_stack_low,
-    _CPU_Table.interrupt_stack_size
-  );
-
-#endif
-
-#if ( CPU_HAS_HARDWARE_INTERRUPT_STACK == TRUE )
-  _CPU_Install_interrupt_stack();
-#endif
-
-}
diff --git a/cpukit/score/src/mpci.c b/cpukit/score/src/mpci.c
deleted file mode 100644
index efe63160f3..0000000000
--- a/cpukit/score/src/mpci.c
+++ /dev/null
@@ -1,525 +0,0 @@
-/*
- *  Multiprocessing Communications Interface (MPCI) Handler
- *
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems/system.h>
-#include <rtems/score/cpu.h>
-#include <rtems/score/interr.h>
-#include <rtems/score/mpci.h>
-#include <rtems/score/mppkt.h>
-#include <rtems/score/states.h>
-#include <rtems/score/thread.h>
-#include <rtems/score/threadq.h>
-#include <rtems/score/tqdata.h>
-#include <rtems/score/watchdog.h>
-#include <rtems/score/sysstate.h>
-
-#include <rtems/score/coresem.h>
-
-/*PAGE
- *
- *  _MPCI_Handler_initialization
- *
- *  This subprogram performs the initialization necessary for this handler.
- */
-
-void _MPCI_Handler_initialization( 
-  MPCI_Control            *users_mpci_table,
-  unsigned32               timeout_status
-)
-{
-  CORE_semaphore_Attributes    attributes;
-
-  if ( _System_state_Is_multiprocessing && !users_mpci_table )
-    _Internal_error_Occurred(
-      INTERNAL_ERROR_CORE,
-      TRUE,
-      INTERNAL_ERROR_NO_MPCI
-    );
-
-  _MPCI_table = users_mpci_table;
-
-  if ( !_System_state_Is_multiprocessing )
-    return;
-
-  /*
-   *  Register the MP Process Packet routine.
-   */
- 
-  _MPCI_Register_packet_processor(
-    MP_PACKET_MPCI_INTERNAL,
-    _MPCI_Internal_packets_Process_packet
-  );
-
-  /*
-   *  Create the counting semaphore used by the MPCI Receive Server.
-   */
-
-  attributes.discipline = CORE_SEMAPHORE_DISCIPLINES_FIFO;
-
-  _CORE_semaphore_Initialize(
-    &_MPCI_Semaphore,
-    OBJECTS_NO_CLASS,         /* free floating semaphore */
-    &attributes,              /* the_semaphore_attributes */
-    0,                        /* initial_value */
-    NULL                      /* proxy_extract_callout */
-  );
-
-  _Thread_queue_Initialize(
-    &_MPCI_Remote_blocked_threads,
-    OBJECTS_NO_CLASS,
-    THREAD_QUEUE_DISCIPLINE_FIFO,
-    STATES_WAITING_FOR_RPC_REPLY,
-    NULL,
-    timeout_status
-  );
-}
-
-/*PAGE
- *
- *  _MPCI_Create_server
- *
- *  This subprogram creates the MPCI receive server.
- */
-
-char *_MPCI_Internal_name = "MPCI";
-
-void _MPCI_Create_server( void )
-{
-
-  if ( !_System_state_Is_multiprocessing )
-    return;
-
-  /*
-   *  Initialize the MPCI Receive Server
-   */
-
-  _MPCI_Receive_server_tcb = _Thread_Internal_allocate();
- 
-  _Thread_Initialize(
-    &_Thread_Internal_information,
-    _MPCI_Receive_server_tcb,
-    NULL,        /* allocate the stack */
-    MPCI_RECEIVE_SERVER_STACK_SIZE,
-    CPU_ALL_TASKS_ARE_FP,
-    PRIORITY_MINIMUM,
-    FALSE,       /* no preempt */
-    THREAD_CPU_BUDGET_ALGORITHM_NONE,
-    NULL,        /* no budget algorithm callout */
-    0,           /* all interrupts enabled */
-    _MPCI_Internal_name
-  );
- 
-  _Thread_Start(
-    _MPCI_Receive_server_tcb,
-    THREAD_START_NUMERIC,
-    (void *) _MPCI_Receive_server,
-    NULL,
-    0
-  );
-}
-
-/*PAGE
- *
- *  _MPCI_Initialization
- *
- *  This subprogram initializes the MPCI driver by
- *  invoking the user provided MPCI initialization callout.
- */
-
-void _MPCI_Initialization ( void )
-{
-  (*_MPCI_table->initialization)();
-}
-
-/*PAGE
- *
- *  _MPCI_Register_packet_processor
- *
- *  This routine registers the MPCI packet processor for the
- *  designated object class.
- */
- 
-void _MPCI_Register_packet_processor(
-  MP_packet_Classes      the_class,
-  MPCI_Packet_processor  the_packet_processor
- 
-)
-{
-  _MPCI_Packet_processors[ the_class ] = the_packet_processor;
-}
-
-/*PAGE
- *
- *  _MPCI_Get_packet
- *
- *  This subprogram obtains a packet by invoking the user provided
- *  MPCI get packet callout.
- */
-
-MP_packet_Prefix *_MPCI_Get_packet ( void )
-{
-  MP_packet_Prefix  *the_packet;
-
-  (*_MPCI_table->get_packet)( &the_packet );
-
-  if ( the_packet == NULL )
-    _Internal_error_Occurred(
-      INTERNAL_ERROR_CORE,
-      TRUE,
-      INTERNAL_ERROR_OUT_OF_PACKETS
-    );
-
-  /*
-   *  Put in a default timeout that will be used for
-   *  all packets that do not otherwise have a timeout.
-   */
-
-  the_packet->timeout = MPCI_DEFAULT_TIMEOUT;
-
-  return the_packet;
-}
-
-/*PAGE
- *
- *  _MPCI_Return_packet
- *
- *  This subprogram returns a packet by invoking the user provided
- *  MPCI return packet callout.
- */
-
-void _MPCI_Return_packet (
-  MP_packet_Prefix   *the_packet
-)
-{
-  (*_MPCI_table->return_packet)( the_packet );
-}
-
-/*PAGE
- *
- *  _MPCI_Send_process_packet
- *
- *  This subprogram sends a process packet by invoking the user provided
- *  MPCI send callout.
- */
-
-void _MPCI_Send_process_packet (
-  unsigned32          destination,
-  MP_packet_Prefix   *the_packet
-)
-{
-  the_packet->source_tid = _Thread_Executing->Object.id;
-  the_packet->to_convert =
-     ( the_packet->to_convert - sizeof(MP_packet_Prefix) ) /
-       sizeof(unsigned32);
-
-  (*_MPCI_table->send_packet)( destination, the_packet );
-}
-
-/*PAGE
- *
- *  _MPCI_Send_request_packet
- *
- *  This subprogram sends a request packet by invoking the user provided
- *  MPCI send callout.
- */
-
-unsigned32 _MPCI_Send_request_packet (
-  unsigned32          destination,
-  MP_packet_Prefix   *the_packet,
-  States_Control      extra_state
-)
-{
-  the_packet->source_tid      = _Thread_Executing->Object.id;
-  the_packet->source_priority = _Thread_Executing->current_priority;
-  the_packet->to_convert =
-     ( the_packet->to_convert - sizeof(MP_packet_Prefix) ) /
-       sizeof(unsigned32);
-
-  _Thread_Executing->Wait.id = the_packet->id;
-
-  _Thread_Executing->Wait.queue = &_MPCI_Remote_blocked_threads;
-
-  _Thread_Disable_dispatch();
-
-    (*_MPCI_table->send_packet)( destination, the_packet );
-
-    _Thread_queue_Enter_critical_section( &_MPCI_Remote_blocked_threads );
-
-    /*
-     *  See if we need a default timeout
-     */
-
-    if (the_packet->timeout == MPCI_DEFAULT_TIMEOUT)
-        the_packet->timeout = _MPCI_table->default_timeout;
-
-    _Thread_queue_Enqueue( &_MPCI_Remote_blocked_threads, the_packet->timeout );
-
-    _Thread_Executing->current_state =
-      _States_Set( extra_state, _Thread_Executing->current_state );
-
-  _Thread_Enable_dispatch();
-
-  return _Thread_Executing->Wait.return_code;
-}
-
-/*PAGE
- *
- *  _MPCI_Send_response_packet
- *
- *  This subprogram sends a response packet by invoking the user provided
- *  MPCI send callout.
- */
-
-void _MPCI_Send_response_packet (
-  unsigned32          destination,
-  MP_packet_Prefix   *the_packet
-)
-{
-  the_packet->source_tid = _Thread_Executing->Object.id;
-
-  (*_MPCI_table->send_packet)( destination, the_packet );
-}
-
-/*PAGE
- *
- *  _MPCI_Receive_packet
- *
- *  This subprogram receives a packet by invoking the user provided
- *  MPCI receive callout.
- */
-
-MP_packet_Prefix  *_MPCI_Receive_packet ( void )
-{
-  MP_packet_Prefix  *the_packet;
-
-  (*_MPCI_table->receive_packet)( &the_packet );
-
-  return the_packet;
-}
-
-/*PAGE
- *
- *  _MPCI_Process_response
- *
- *  This subprogram obtains a packet by invoking the user provided
- *  MPCI get packet callout.
- */
-
-Thread_Control *_MPCI_Process_response (
-  MP_packet_Prefix  *the_packet
-)
-{
-  Thread_Control    *the_thread;
-  Objects_Locations  location;
-
-  the_thread = _Thread_Get( the_packet->id, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-    case OBJECTS_REMOTE:
-      the_thread = NULL;          /* IMPOSSIBLE */
-      break;
-    case OBJECTS_LOCAL:
-      _Thread_queue_Extract( &_MPCI_Remote_blocked_threads, the_thread );
-      the_thread->Wait.return_code = the_packet->return_code;
-      _Thread_Unnest_dispatch();
-    break;
-  }
-
-  return the_thread;
-}
-
-/*PAGE
- *
- *  _MPCI_Receive_server
- *
- */
-
-Thread _MPCI_Receive_server(
-  unsigned32 ignored
-)
-{
- 
-  MP_packet_Prefix         *the_packet;
-  MPCI_Packet_processor     the_function;
-  Thread_Control           *executing;
- 
-  executing = _Thread_Executing;
-
-  for ( ; ; ) {
- 
-    executing->receive_packet = NULL;
-
-    _Thread_Disable_dispatch();
-    _CORE_semaphore_Seize( &_MPCI_Semaphore, 0, TRUE, WATCHDOG_NO_TIMEOUT );
-    _Thread_Enable_dispatch();
- 
-    for ( ; ; ) {
-      the_packet = _MPCI_Receive_packet();
- 
-      if ( !the_packet )
-        break;
- 
-      executing->receive_packet = the_packet;
- 
-      if ( !_Mp_packet_Is_valid_packet_class ( the_packet->the_class ) )
-        break;
- 
-      the_function = _MPCI_Packet_processors[ the_packet->the_class ];
- 
-      if ( !the_function )
-        _Internal_error_Occurred(
-          INTERNAL_ERROR_CORE,
-          TRUE,
-          INTERNAL_ERROR_BAD_PACKET
-        );
- 
-        (*the_function)( the_packet );
-    }
-  }
-}
-
-/*PAGE
- *
- *  _MPCI_Announce
- *
- */
- 
-void _MPCI_Announce ( void )
-{
-  _Thread_Disable_dispatch();
-  (void) _CORE_semaphore_Surrender( &_MPCI_Semaphore, 0, 0 );
-  _Thread_Enable_dispatch();
-}
-
-/*PAGE
- *
- *  _MPCI_Internal_packets_Send_process_packet
- *
- */
- 
-void _MPCI_Internal_packets_Send_process_packet (
-   MPCI_Internal_Remote_operations operation
-)
-{
-  MPCI_Internal_packet *the_packet;
- 
-  switch ( operation ) {
- 
-    case MPCI_PACKETS_SYSTEM_VERIFY:
- 
-      the_packet                    = _MPCI_Internal_packets_Get_packet();
-      the_packet->Prefix.the_class  = MP_PACKET_MPCI_INTERNAL;
-      the_packet->Prefix.length     = sizeof ( MPCI_Internal_packet );
-      the_packet->Prefix.to_convert = sizeof ( MPCI_Internal_packet );
-      the_packet->operation         = operation;
- 
-      the_packet->maximum_nodes = _Objects_Maximum_nodes;
- 
-      the_packet->maximum_global_objects = _Objects_MP_Maximum_global_objects;
- 
-      _MPCI_Send_process_packet( MPCI_ALL_NODES, &the_packet->Prefix );
-      break;
-  }
-}
- 
-/*PAGE
- *
- *  _MPCI_Internal_packets_Send_request_packet
- *
- *  This subprogram is not needed since there are no request
- *  packets to be sent by this manager.
- *
- */
- 
-/*PAGE
- *
- *  _MPCI_Internal_packets_Send_response_packet
- *
- *  This subprogram is not needed since there are no response
- *  packets to be sent by this manager.
- *
- */
- 
-/*PAGE
- *
- *
- *  _MPCI_Internal_packets_Process_packet
- *
- */
- 
-void _MPCI_Internal_packets_Process_packet (
-  MP_packet_Prefix  *the_packet_prefix
-)
-{
-  MPCI_Internal_packet *the_packet;
-  unsigned32                  maximum_nodes;
-  unsigned32                  maximum_global_objects;
- 
-  the_packet = (MPCI_Internal_packet *) the_packet_prefix;
- 
-  switch ( the_packet->operation ) {
- 
-    case MPCI_PACKETS_SYSTEM_VERIFY:
- 
-      maximum_nodes          = the_packet->maximum_nodes;
-      maximum_global_objects = the_packet->maximum_global_objects;
-      if ( maximum_nodes != _Objects_Maximum_nodes ||
-           maximum_global_objects != _Objects_MP_Maximum_global_objects ) {
- 
-        _MPCI_Return_packet( the_packet_prefix );
- 
-        _Internal_error_Occurred(
-          INTERNAL_ERROR_CORE,
-          TRUE,
-          INTERNAL_ERROR_INCONSISTENT_MP_INFORMATION
-        );
-      }
- 
-      _MPCI_Return_packet( the_packet_prefix );
- 
-      break;
-  }
-}
- 
-/*PAGE
- *
- *  _MPCI_Internal_packets_Send_object_was_deleted
- *
- *  This subprogram is not needed since there are no objects
- *  deleted by this manager.
- *
- */
- 
-/*PAGE
- *
- *  _MPCI_Internal_packets_Send_extract_proxy
- *
- *  This subprogram is not needed since there are no objects
- *  deleted by this manager.
- *
- */
- 
-/*PAGE
- *
- *  _MPCI_Internal_packets_Get_packet
- *
- */
- 
-MPCI_Internal_packet *_MPCI_Internal_packets_Get_packet ( void )
-{
-  return ( (MPCI_Internal_packet *) _MPCI_Get_packet() );
-}
-
-/* end of file */
diff --git a/cpukit/score/src/object.c b/cpukit/score/src/object.c
deleted file mode 100644
index 7585235d3b..0000000000
--- a/cpukit/score/src/object.c
+++ /dev/null
@@ -1,516 +0,0 @@
-/*
- *  Object Handler
- *
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems/system.h>
-#include <rtems/score/chain.h>
-#include <rtems/score/object.h>
-#include <rtems/score/objectmp.h>
-#include <rtems/score/thread.h>
-#include <rtems/score/wkspace.h>
-#include <rtems/score/sysstate.h>
-
-/*PAGE
- *
- *  _Objects_Handler_initialization
- *
- *  This routine initializes the object handler.
- *
- *  Input parameters:
- *    node                   - local node
- *    maximum_nodes          - number of nodes in the system
- *    maximum_global_objects - number of configured global objects
- *
- *  Output parameters:  NONE
- */
-
-void _Objects_Handler_initialization(
-  unsigned32 node,
-  unsigned32 maximum_nodes,
-  unsigned32 maximum_global_objects
-)
-{
-  if ( node < 1 || node > maximum_nodes )
-    _Internal_error_Occurred(
-      INTERNAL_ERROR_CORE,
-      TRUE,
-      INTERNAL_ERROR_INVALID_NODE
-    );
-
-  _Objects_Local_node    = node;
-  _Objects_Maximum_nodes = maximum_nodes;
-
-  _Objects_MP_Handler_initialization(
-    node,
-    maximum_nodes,
-    maximum_global_objects
-  );
-}
-
-/*PAGE
- *
- *  _Objects_Initialize_information
- *
- *  This routine initializes all object information related data structures.
- *
- *  Input parameters:
- *    information     - object information table
- *    the_class       - object class
- *    supports_global - TRUE if this is a global object class
- *    maximum         - maximum objects of this class
- *    is_string       - TRUE if names for this object are strings
- *    size            - size of this object's control block
- *    is_thread       - TRUE if this class is threads
- *
- *  Output parameters:  NONE
- */
-
-void _Objects_Initialize_information(
-  Objects_Information *information,
-  Objects_Classes      the_class,
-  boolean              supports_global,
-  unsigned32           maximum,
-  unsigned32           size,
-  boolean              is_string,
-  unsigned32           maximum_name_length,
-  boolean              is_thread
-)
-{
-  unsigned32       minimum_index;
-  unsigned32       index;
-  Objects_Control *the_object;
-  unsigned32       name_length;
-  void            *name_area;
-
-  information->maximum   = maximum;
-  information->the_class = the_class; 
-  information->is_string = is_string; 
-  information->is_thread = is_thread; 
-
-  /*
-   *  Set the entry in the object information table.
-   */
-
-  _Objects_Information_table[ the_class ] = information;
-
-  /*
-   *  Calculate minimum and maximum Id's
-   */
-
-  if ( maximum == 0 ) minimum_index = 0;
-  else                minimum_index = 1;
-
-  information->minimum_id =
-    _Objects_Build_id( the_class, _Objects_Local_node, minimum_index );
-
-  information->maximum_id =
-    _Objects_Build_id( the_class, _Objects_Local_node, maximum );
-
-  /*
-   *  Allocate local pointer table
-   */
-
-  information->local_table =
-    (Objects_Control **) _Workspace_Allocate_or_fatal_error(
-      (maximum + 1) * sizeof(Objects_Control *)
-    );
-
-  /*
-   *  Allocate name table
-   */
-
-  name_length = maximum_name_length;
-
-  if (name_length & (OBJECTS_NAME_ALIGNMENT-1))
-    name_length = (name_length + OBJECTS_NAME_ALIGNMENT) & 
-                  ~(OBJECTS_NAME_ALIGNMENT-1);
-
-  information->name_length = name_length;
-
-  name_area = (Objects_Name *)
-    _Workspace_Allocate_or_fatal_error( (maximum + 1) * name_length );
-  information->name_table = name_area;
-
-  /*
-   *  Initialize local pointer table
-   */
-
-  for ( index=0 ; index <= maximum ; index++ ) {
-     information->local_table[ index ] = NULL;
-  }
-
-  /*
-   *  Initialize objects .. if there are any
-   */
-
-  if ( maximum == 0 ) {
-    _Chain_Initialize_empty( &information->Inactive );
-  } else {
-
-    _Chain_Initialize(
-      &information->Inactive,
-      _Workspace_Allocate_or_fatal_error( maximum * size ),
-      maximum,
-      size
-    );
-
-    the_object = (Objects_Control *) information->Inactive.first;
-    for ( index=1; index <= maximum ; index++ ) {
-      the_object->id = 
-        _Objects_Build_id( the_class, _Objects_Local_node, index );
-      
-      the_object->name = (void *) name_area;
-
-      name_area = _Addresses_Add_offset( name_area, name_length );
-
-      the_object = (Objects_Control *) the_object->Node.next;
-    }
-
-  }
-
-  /*
-   *  Take care of multiprocessing
-   */
-
-  if ( supports_global == TRUE && _System_state_Is_multiprocessing ) {
-
-    information->global_table =
-      (Chain_Control *) _Workspace_Allocate_or_fatal_error(
-        (_Objects_Maximum_nodes + 1) * sizeof(Chain_Control)
-      );
-
-    for ( index=1; index <= _Objects_Maximum_nodes ; index++ )
-      _Chain_Initialize_empty( &information->global_table[ index ] );
-   }
-   else
-     information->global_table = NULL;
-}
-
-/*PAGE
- *
- *  _Objects_Clear_name
- *
- *  XXX
- */
-
-void _Objects_Clear_name(
-  void       *name,
-  unsigned32  length
-)
-{
-  unsigned32  index;
-  unsigned32  maximum = length / OBJECTS_NAME_ALIGNMENT;
-  unsigned32 *name_ptr = (unsigned32 *) name;
-
-  for ( index=0 ; index < maximum ; index++ ) 
-    *name_ptr++ = 0;
-}
- 
-/*PAGE
- *
- *  _Objects_Copy_name_string
- *
- *  XXX
- */
- 
-void _Objects_Copy_name_string(
-  void       *source,
-  void       *destination
-)
-{
-  unsigned8 *source_p = (unsigned8 *) source;
-  unsigned8 *destination_p = (unsigned8 *) destination;
- 
-  do {
-    *destination_p++ = *source_p;
-  } while ( *source_p++ );
-}
-
-/*PAGE
- *
- *  _Objects_Copy_name_raw
- *
- *  XXX
- */
- 
-void _Objects_Copy_name_raw(
-  void       *source,
-  void       *destination,
-  unsigned32  length
-)
-{
-  unsigned32 *source_p = (unsigned32 *) source;
-  unsigned32 *destination_p = (unsigned32 *) destination;
-  unsigned32  tmp_length = length / OBJECTS_NAME_ALIGNMENT;
- 
-  while ( tmp_length-- )
-    *destination_p++ = *source_p++;
-}
-
-/*PAGE
- *
- *  _Objects_Compare_name_string
- *
- *  XXX
- */
- 
-boolean _Objects_Compare_name_string(
-  void       *name_1,
-  void       *name_2,
-  unsigned32  length
-)
-{
-  unsigned8 *name_1_p = (unsigned8 *) name_1;
-  unsigned8 *name_2_p = (unsigned8 *) name_2;
-  unsigned32 tmp_length = length;
- 
-  do {
-    if ( *name_1_p++ != *name_2_p++ )
-      return FALSE;
-    if ( !tmp_length-- )
-      return FALSE;
-  } while ( *name_1_p );
-
-  return TRUE;
-}
- 
-/*PAGE
- *
- *  _Objects_Compare_name_raw
- *
- *  XXX
- */
- 
-boolean _Objects_Compare_name_raw(
-  void       *name_1,
-  void       *name_2,
-  unsigned32  length
-)
-{
-  unsigned32 *name_1_p = (unsigned32 *) name_1;
-  unsigned32 *name_2_p = (unsigned32 *) name_2;
-  unsigned32  tmp_length = length / OBJECTS_NAME_ALIGNMENT;
- 
-  while ( tmp_length-- )
-    if ( *name_1_p++ != *name_2_p++ )
-      return FALSE;
-
-  return TRUE;
-}
-
-
-/*PAGE
- *
- *  _Objects_Name_to_id
- *
- *  These kernel routines search the object table(s) for the given
- *  object name and returns the associated object id.
- *
- *  Input parameters:
- *    information - object information
- *    name        - user defined object name
- *    node        - node indentifier (0 indicates any node)
- *    id          - address of return ID
- *
- *  Output parameters:
- *    id                 - object id
- *    OBJECTS_SUCCESSFUL - if successful
- *    error code         - if unsuccessful
- */
-
-Objects_Name_to_id_errors _Objects_Name_to_id(
-  Objects_Information *information,
-  Objects_Name         name,
-  unsigned32           node,
-  Objects_Id          *id
-)
-{
-  boolean                    search_local_node;
-  Objects_Control          **objects;
-  Objects_Control           *the_object;
-  unsigned32                 index;
-  unsigned32                 name_length;
-  Objects_Name_comparators   compare_them;
-
-  if ( name == 0 )
-    return OBJECTS_INVALID_NAME;
-
-  search_local_node = FALSE;
-
-  if ( information->maximum != 0 &&
-      (node == OBJECTS_SEARCH_ALL_NODES || node == OBJECTS_SEARCH_LOCAL_NODE ||
-      _Objects_Is_local_node( node ) ) )
-   search_local_node = TRUE;
-
-  if ( search_local_node ) {
-    objects = information->local_table;
-
-    name_length = information->name_length;
-
-    if ( information->is_string ) compare_them = _Objects_Compare_name_string;
-    else                          compare_them = _Objects_Compare_name_raw;
-
-    for ( index = 1; index <= information->maximum; index++ ) {
-
-      the_object = objects[ index ];
-
-      if ( !the_object || !the_object->name )
-        continue;
-
-      if ( (*compare_them)( name, the_object->name, name_length ) ) {
-        *id = the_object->id;
-        return OBJECTS_SUCCESSFUL;
-      }
-    }
-  }
-
-  if ( _Objects_Is_local_node( node ) || node == OBJECTS_SEARCH_LOCAL_NODE )
-    return OBJECTS_INVALID_NAME;
-
-  return ( _Objects_MP_Global_name_search( information, name, node, id ) );
-}
-
-/*PAGE
- *
- * _Objects_Get
- *
- * This routine sets the object pointer for the given
- * object id based on the given object information structure.
- *
- * Input parameters:
- *   information - pointer to entry in table for this class
- *   id          - object id to search for
- *   location    - address of where to store the location
- *
- * Output parameters:
- *   returns - address of object if local
- *   location    - one of the following:
- *                  OBJECTS_ERROR  - invalid object ID
- *                  OBJECTS_REMOTE - remote object
- *                  OBJECTS_LOCAL  - local object
- */
-
-Objects_Control *_Objects_Get(
-  Objects_Information *information,
-  Objects_Id           id,
-  Objects_Locations   *location
-)
-{
-  Objects_Control *the_object;
-  unsigned32       index;
-
-  index = id - information->minimum_id;
-
-  if ( information->maximum >= index ) {
-    _Thread_Disable_dispatch();
-    if ( (the_object = information->local_table[index+1]) != NULL ) {
-      *location = OBJECTS_LOCAL;
-      return( the_object );
-    }
-    _Thread_Enable_dispatch();
-    *location = OBJECTS_ERROR;
-    return( NULL );
-  }
-  *location = OBJECTS_ERROR;
-  _Objects_MP_Is_remote( information, id, location, &the_object );
-  return the_object;
-}
-
-
-/*PAGE
- *
- * _Objects_Get_next
- *
- * Like _Objects_Get, but considers the 'id' as a "hint" and
- * finds next valid one after that point.
- * Mostly used for monitor and debug traversal of an object.
- *
- * Input parameters:
- *   information - pointer to entry in table for this class
- *   id          - object id to search for
- *   location    - address of where to store the location
- *   next_id     - address to store next id to try
- *
- * Output parameters:
- *   returns     - address of object if local
- *   location    - one of the following:
- *                  OBJECTS_ERROR  - invalid object ID
- *                  OBJECTS_REMOTE - remote object
- *                  OBJECTS_LOCAL  - local object
- *   next_id     - will contain a reasonable "next" id to continue traversal
- *
- * NOTE:
- *      assumes can add '1' to an id to get to next index.
- */
-
-Objects_Control *
-_Objects_Get_next(
-    Objects_Information *information,
-    Objects_Id           id,
-    Objects_Locations   *location_p,
-    Objects_Id          *next_id_p
-)
-{
-    Objects_Control *object;
-    Objects_Id       next_id;
-    
-    if (_Objects_Get_index(id) == OBJECTS_ID_INITIAL_INDEX)
-        next_id = information->minimum_id;
-    else
-        next_id = id;
-
-    do {
-        /* walked off end of list? */
-        if (_Objects_Get_index(next_id) > information->maximum)
-        {
-            *location_p = OBJECTS_ERROR;
-            goto final;
-        }
-        
-        /* try to grab one */
-        object = _Objects_Get(information, next_id, location_p);
-
-        next_id++;
-
-    } while (*location_p != OBJECTS_LOCAL);
-
-    *next_id_p = next_id;
-    return object;
-
-final:
-    *next_id_p = OBJECTS_ID_FINAL;
-    return 0;
-}
-
-/*PAGE
- *
- *  _Objects_Get_information
- *
- *  XXX
- */
- 
-Objects_Information *_Objects_Get_information(
-  Objects_Id  id
-)
-{
-  Objects_Classes  the_class;
-
-  the_class = _Objects_Get_class( id );
-
-  if ( !_Objects_Is_class_valid( the_class ) )
-    return NULL;
-
-  return _Objects_Information_table[ the_class ];
-}
-
diff --git a/cpukit/score/src/objectmp.c b/cpukit/score/src/objectmp.c
deleted file mode 100644
index 62f7fb5285..0000000000
--- a/cpukit/score/src/objectmp.c
+++ /dev/null
@@ -1,275 +0,0 @@
-/*
- *  Multiprocessing Support for the Object Handler
- *
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems/system.h>
-#include <rtems/score/interr.h>
-#include <rtems/score/object.h>
-#include <rtems/score/wkspace.h>
-#include <rtems/score/thread.h>
-
-/*PAGE
- *
- *  _Objects_MP_Handler_initialization
- *
- */
-
-void _Objects_MP_Handler_initialization (
-  unsigned32 node,
-  unsigned32 maximum_nodes,
-  unsigned32 maximum_global_objects
-)
-{
-  _Objects_MP_Maximum_global_objects = maximum_global_objects;
-
-  if ( maximum_global_objects == 0 ) {
-    _Chain_Initialize_empty( &_Objects_MP_Inactive_global_objects );
-    return;
-  }
-
-  _Chain_Initialize(
-    &_Objects_MP_Inactive_global_objects,
-    _Workspace_Allocate_or_fatal_error(
-      maximum_global_objects * sizeof( Objects_MP_Control )
-    ),
-    maximum_global_objects,
-    sizeof( Objects_MP_Control )
-  );
-
-}
-
-/*PAGE
- *
- *  _Objects_MP_Open
- *
- */
- 
-void _Objects_MP_Open (
-  Objects_Information *information,
-  Objects_MP_Control  *the_global_object,
-  unsigned32           the_name,      /* XXX -- wrong for variable */
-  Objects_Id           the_id
-)
-{
-  the_global_object->Object.id = the_id;
-  the_global_object->name      = the_name;
- 
-  _Chain_Prepend(
-    &information->global_table[ _Objects_Get_node( the_id ) ],
-    &the_global_object->Object.Node
-  );
-
-}
-
-/*PAGE
- *
- *  _Objects_MP_Allocate_and_open
- *
- */
-
-boolean _Objects_MP_Allocate_and_open (
-  Objects_Information *information,
-  unsigned32           the_name,      /* XXX -- wrong for variable */
-  Objects_Id           the_id,
-  boolean              is_fatal_error
-)
-{
-  Objects_MP_Control  *the_global_object;
-
-  the_global_object = _Objects_MP_Allocate_global_object();
-  if ( _Objects_MP_Is_null_global_object( the_global_object ) ) {
-
-    if ( is_fatal_error == FALSE )
-      return FALSE;
-
-    _Internal_error_Occurred(
-      INTERNAL_ERROR_CORE,
-      TRUE,
-      INTERNAL_ERROR_OUT_OF_GLOBAL_OBJECTS
-    );
-
-  }
-
-  _Objects_MP_Open( information, the_global_object, the_name, the_id );
-
-  return TRUE;
-}
-
-/*PAGE
- *
- *  _Objects_MP_Close
- *
- */
-
-void _Objects_MP_Close (
-  Objects_Information *information,
-  Objects_Id           the_id
-)
-{
-  Chain_Control      *the_chain;
-  Chain_Node         *the_node;
-  Objects_MP_Control *the_object;
-
-  the_chain = &information->global_table[ _Objects_Get_node( the_id ) ];
-
-  for ( the_node = the_chain->first ;
-        !_Chain_Is_tail( the_chain, the_node ) ;
-        the_node = the_node->next ) {
-
-    the_object = (Objects_MP_Control *) the_node;
-
-    if ( _Objects_Are_ids_equal( the_object->Object.id, the_id ) ) {
-
-      _Chain_Extract( the_node );
-      _Objects_MP_Free_global_object( the_object );
-      return;
-    }
-
-  }
-
-  _Internal_error_Occurred(
-    INTERNAL_ERROR_CORE,
-    TRUE,
-    INTERNAL_ERROR_INVALID_GLOBAL_ID
-  );
-}
-
-/*PAGE
- *
- *  _Objects_MP_Global_name_search
- *
- */
-
-Objects_Name_to_id_errors _Objects_MP_Global_name_search (
-  Objects_Information *information,
-  Objects_Name         the_name,
-  unsigned32           nodes_to_search,
-  Objects_Id          *the_id
-)
-{
-  unsigned32          low_node;
-  unsigned32          high_node;
-  unsigned32          node_index;
-  Chain_Control      *the_chain;
-  Chain_Node         *the_node;
-  Objects_MP_Control *the_object;
-  unsigned32          name_to_use = *(unsigned32 *)the_name;  /* XXX variable */
-
-  if ( nodes_to_search > _Objects_Maximum_nodes )
-    return OBJECTS_INVALID_NODE;
-
-  if ( information->global_table == NULL )
-    return OBJECTS_INVALID_NAME;
-
-  if ( nodes_to_search == OBJECTS_SEARCH_ALL_NODES ||
-       nodes_to_search == OBJECTS_SEARCH_OTHER_NODES ) {
-    low_node = 1;
-    high_node = _Objects_Maximum_nodes;
-  } else {
-    low_node  =
-    high_node = nodes_to_search;
-  }
-
-  _Thread_Disable_dispatch();
-
-  for ( node_index = low_node ; node_index <= high_node ; node_index++ ) {
-
-    /*
-     *  NOTE: The local node was search (if necessary) by
-     *        _Objects_Name_to_id before this was invoked.
-     */
-
-    if ( !_Objects_Is_local_node( node_index ) ) {
-      the_chain = &information->global_table[ node_index ];
-
-      for ( the_node = the_chain->first ;
-            !_Chain_Is_tail( the_chain, the_node ) ;
-            the_node = the_node->next ) {
-
-        the_object = (Objects_MP_Control *) the_node;
-
-        if ( the_object->name == name_to_use ) {
-          *the_id = the_object->Object.id;
-          _Thread_Enable_dispatch();
-          return OBJECTS_SUCCESSFUL;
-        }
-      }
-    }
-  }
-
-  _Thread_Enable_dispatch();
-  return OBJECTS_INVALID_NAME;
-}
-
-/*PAGE
- *
- *  _Objects_MP_Is_remote
- *
- */
-
-void _Objects_MP_Is_remote (
-  Objects_Information  *information,
-  Objects_Id            the_id,
-  Objects_Locations    *location,
-  Objects_Control     **the_object
-)
-{
-  unsigned32          node;
-  Chain_Control      *the_chain;
-  Chain_Node         *the_node;
-  Objects_MP_Control *the_global_object;
-
-  node = _Objects_Get_node( the_id );
-
-  /*
-   *  NOTE: The local node was search (if necessary) by
-   *        _Objects_Name_to_id before this was invoked.
-   *
-   *        The NODE field of an object id cannot be 0
-   *        because 0 is an invalid node number.
-   */
-
-  if ( node == 0 ||
-       _Objects_Is_local_node( node ) ||
-       node > _Objects_Maximum_nodes ||
-       information->global_table == NULL ) {
-
-    *location   = OBJECTS_ERROR;
-    *the_object = NULL;
-    return;
-  }
-
-  _Thread_Disable_dispatch();
-
-  the_chain = &information->global_table[ node ];
-
-  for ( the_node = the_chain->first ;
-        !_Chain_Is_tail( the_chain, the_node ) ;
-        the_node = the_node->next ) {
-
-    the_global_object = (Objects_MP_Control *) the_node;
-
-    if ( _Objects_Are_ids_equal( the_global_object->Object.id, the_id ) ) {
-      _Thread_Unnest_dispatch();
-      *location   = OBJECTS_REMOTE;
-      *the_object = (Objects_Control *) the_global_object;
-      return;
-    }
-  }
-
-  _Thread_Enable_dispatch();
-  *location   = OBJECTS_ERROR;
-  *the_object = NULL;
-
-}
diff --git a/cpukit/score/src/thread.c b/cpukit/score/src/thread.c
deleted file mode 100644
index 4e44ac6f75..0000000000
--- a/cpukit/score/src/thread.c
+++ /dev/null
@@ -1,1396 +0,0 @@
-/*
- *  Thread Handler
- *
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems/system.h>
-#include <rtems/score/apiext.h>
-#include <rtems/score/context.h>
-#include <rtems/score/interr.h>
-#include <rtems/score/isr.h>
-#include <rtems/score/object.h>
-#include <rtems/score/priority.h>
-#include <rtems/score/states.h>
-#include <rtems/score/sysstate.h>
-#include <rtems/score/thread.h>
-#include <rtems/score/threadq.h>
-#include <rtems/score/userext.h>
-#include <rtems/score/wkspace.h>
-
-/*PAGE
- *
- *  _Thread_Handler_initialization
- *
- *  This routine initializes all thread manager related data structures.
- *
- *  Input parameters:
- *    ticks_per_timeslice - clock ticks per quantum
- *    maximum_proxies     - number of proxies to initialize
- *
- *  Output parameters:  NONE
- */
-
-char *_Thread_Idle_name = "IDLE";
-
-void _Thread_Handler_initialization(
-  unsigned32   ticks_per_timeslice,
-  unsigned32   maximum_extensions,
-  unsigned32   maximum_proxies
-)
-{
-  unsigned32      index;
-
-  /*
-   * BOTH stacks hooks must be set or both must be NULL.
-   * Do not allow mixture.
-   */
-
-  if ( !( ( _CPU_Table.stack_allocate_hook == 0 )
-       == ( _CPU_Table.stack_free_hook == 0 ) ) )
-    _Internal_error_Occurred(
-      INTERNAL_ERROR_CORE,
-      TRUE,
-      INTERNAL_ERROR_BAD_STACK_HOOK
-    );
-
-  _Context_Switch_necessary = FALSE;
-  _Thread_Executing         = NULL;
-  _Thread_Heir              = NULL;
-  _Thread_Allocated_fp      = NULL;
-
-  _Thread_Do_post_task_switch_extension = 0;
-
-  _Thread_Maximum_extensions = maximum_extensions;
-
-  _Thread_Ticks_per_timeslice  = ticks_per_timeslice;
-
-  _Thread_Ready_chain = (Chain_Control *) _Workspace_Allocate_or_fatal_error(
-    (PRIORITY_MAXIMUM + 1) * sizeof(Chain_Control)
-  );
-
-  for ( index=0; index <= PRIORITY_MAXIMUM ; index++ )
-    _Chain_Initialize_empty( &_Thread_Ready_chain[ index ] );
-
-  _Thread_MP_Handler_initialization( maximum_proxies );
-
-  /*
-   *  Initialize this class of objects.
-   */
- 
-  _Objects_Initialize_information(
-    &_Thread_Internal_information,
-    OBJECTS_INTERNAL_THREADS,
-    FALSE,
-    ( _System_state_Is_multiprocessing ) ?  2 : 1,
-    sizeof( Thread_Control ),
-    TRUE,
-    8,
-    TRUE
-  );
-
-}
-
-/*PAGE
- *
- *  _Thread_Create_idle
- */
-
-void _Thread_Create_idle( void )
-{
-  void       *idle;
-  unsigned32  idle_task_stack_size;
-
-  /*
-   *  The entire workspace is zeroed during its initialization.  Thus, all
-   *  fields not explicitly assigned were explicitly zeroed by
-   *  _Workspace_Initialization.
-   */
- 
-  _Thread_Idle = _Thread_Internal_allocate();
- 
-  /*
-   *  Initialize the IDLE task.
-   */
- 
-#if (CPU_PROVIDES_IDLE_THREAD_BODY == TRUE)
-  idle = (void *) _CPU_Thread_Idle_body;
-#else
-  idle = (void *) _Thread_Idle_body;
-#endif
- 
-  if ( _CPU_Table.idle_task )
-    idle = _CPU_Table.idle_task;
- 
-  idle_task_stack_size =  _CPU_Table.idle_task_stack_size;
-  if ( idle_task_stack_size < STACK_MINIMUM_SIZE )
-    idle_task_stack_size = STACK_MINIMUM_SIZE;
- 
-  _Thread_Initialize(
-    &_Thread_Internal_information,
-    _Thread_Idle,
-    NULL,        /* allocate the stack */
-    idle_task_stack_size,
-    CPU_IDLE_TASK_IS_FP,
-    PRIORITY_MAXIMUM,
-    TRUE,        /* preemptable */
-    THREAD_CPU_BUDGET_ALGORITHM_NONE,
-    NULL,        /* no budget algorithm callout */
-    0,           /* all interrupts enabled */
-    _Thread_Idle_name
-  );
- 
-  /*
-   *  WARNING!!! This is necessary to "kick" start the system and
-   *             MUST be done before _Thread_Start is invoked.
-   */
- 
-  _Thread_Heir      =
-  _Thread_Executing = _Thread_Idle;
- 
-  _Thread_Start(
-    _Thread_Idle,
-    THREAD_START_NUMERIC,
-    idle,
-    NULL,
-    0
-  );
- 
-}
-
-/*PAGE
- *
- *  _Thread_Start_multitasking
- *
- *  This kernel routine readies the requested thread, the thread chain
- *  is adjusted.  A new heir thread may be selected.
- *
- *  Input parameters:
- *    system_thread - pointer to system initialization thread control block
- *    idle_thread   - pointer to idle thread control block
- *
- *  Output parameters:  NONE
- *
- *  NOTE:  This routine uses the "blocking" heir selection mechanism.
- *         This insures the correct heir after a thread restart.
- *
- *  INTERRUPT LATENCY:
- *    ready chain
- *    select heir
- */
-
-void _Thread_Start_multitasking( void )
-{
-  /*
-   *  The system is now multitasking and completely initialized.  
-   *  This system thread now either "goes away" in a single processor 
-   *  system or "turns into" the server thread in an MP system.
-   */
-
-  _System_state_Set( SYSTEM_STATE_UP );
-
-  _Context_Switch_necessary = FALSE;
-
-  _Thread_Executing = _Thread_Heir;
-
-   /*
-    * Get the init task(s) running.
-    *
-    * Note: Thread_Dispatch() is normally used to dispatch threads.  As
-    *       part of its work, Thread_Dispatch() restores floating point
-    *       state for the heir task.
-    *
-    *       This code avoids Thread_Dispatch(), and so we have to restore
-    *       (actually initialize) the floating point state "by hand".
-    *
-    *       Ignore the CPU_USE_DEFERRED_FP_SWITCH because we must always
-    *       switch in the first thread if it is FP.
-    */
- 
-
-#if ( CPU_HARDWARE_FP == TRUE ) || ( CPU_SOFTWARE_FP == TRUE )
-   /*
-    *  don't need to worry about saving BSP's floating point state
-    */
-
-   if ( _Thread_Heir->fp_context != NULL )
-     _Context_Restore_fp( &_Thread_Heir->fp_context );
-#endif
-
-  _Context_Switch( &_Thread_BSP_context, &_Thread_Heir->Registers );
-}
-
-/*PAGE
- *
- *  _Thread_Dispatch
- *
- *  This kernel routine determines if a dispatch is needed, and if so
- *  dispatches to the heir thread.  Once the heir is running an attempt
- *  is made to dispatch any ASRs.
- *
- *  ALTERNATE ENTRY POINTS:
- *    void _Thread_Enable_dispatch();
- *
- *  Input parameters:  NONE
- *
- *  Output parameters:  NONE
- *
- *  INTERRUPT LATENCY:
- *    dispatch thread
- *    no dispatch thread
- */
-
-#if ( CPU_INLINE_ENABLE_DISPATCH == FALSE )
-void _Thread_Enable_dispatch( void )
-{
-  if ( --_Thread_Dispatch_disable_level )
-    return;
-  _Thread_Dispatch();
-}
-#endif
-
-void _Thread_Dispatch( void )
-{
-  Thread_Control   *executing;
-  Thread_Control   *heir;
-  ISR_Level         level;
-
-  executing   = _Thread_Executing;
-  _ISR_Disable( level );
-  while ( _Context_Switch_necessary == TRUE ) {
-    heir = _Thread_Heir;
-    _Thread_Dispatch_disable_level = 1;
-    _Context_Switch_necessary = FALSE;
-    _Thread_Executing = heir;
-    _ISR_Enable( level );
-
-    heir->ticks_executed++;
-
-    _User_extensions_Thread_switch( executing, heir );
-
-    if ( heir->budget_algorithm == THREAD_CPU_BUDGET_ALGORITHM_RESET_TIMESLICE )
-      heir->cpu_time_budget = _Thread_Ticks_per_timeslice;
-
-    /*
-     *  If the CPU has hardware floating point, then we must address saving
-     *  and restoring it as part of the context switch.
-     *
-     *  The second conditional compilation section selects the algorithm used
-     *  to context switch between floating point tasks.  The deferred algorithm
-     *  can be significantly better in a system with few floating point tasks
-     *  because it reduces the total number of save and restore FP context
-     *  operations.  However, this algorithm can not be used on all CPUs due
-     *  to unpredictable use of FP registers by some compilers for integer
-     *  operations.
-     */
-
-#if ( CPU_HARDWARE_FP == TRUE )
-#if ( CPU_USE_DEFERRED_FP_SWITCH == TRUE )
-    if ( (heir->fp_context != NULL) && !_Thread_Is_allocated_fp( heir ) ) {
-      if ( _Thread_Allocated_fp != NULL )
-        _Context_Save_fp( &_Thread_Allocated_fp->fp_context );
-      _Context_Restore_fp( &heir->fp_context );
-      _Thread_Allocated_fp = heir;
-    }
-#else
-    if ( executing->fp_context != NULL )
-      _Context_Save_fp( &executing->fp_context );
-
-    if ( heir->fp_context != NULL )
-      _Context_Restore_fp( &heir->fp_context );
-#endif
-#endif
-
-    _Context_Switch( &executing->Registers, &heir->Registers );
-
-    executing = _Thread_Executing;
-
-    _ISR_Disable( level );
-  }
-
-  _Thread_Dispatch_disable_level = 0;
-
-  _ISR_Enable( level );
-
-  if ( _Thread_Do_post_task_switch_extension ||
-       executing->do_post_task_switch_extension ) {
-    executing->do_post_task_switch_extension = FALSE;
-    _API_extensions_Run_postswitch();
-  }
- 
-}
-
-/*PAGE
- *
- *  _Thread_Stack_Allocate
- *
- *  Allocate the requested stack space for the thread.
- *  return the actual size allocated after any adjustment
- *  or return zero if the allocation failed.
- *  Set the Start.stack field to the address of the stack
- */
-
-static unsigned32 _Thread_Stack_Allocate(
-  Thread_Control *the_thread,
-  unsigned32 stack_size)
-{
-  void *stack_addr = 0;
- 
-  if ( !_Stack_Is_enough( stack_size ) )
-    stack_size = STACK_MINIMUM_SIZE;
- 
-  /*
-   * Call ONLY the CPU table stack allocate hook, _or_ the
-   * the RTEMS workspace allocate.  This is so the stack free
-   * routine can call the correct deallocation routine.
-   */
-
-  if ( _CPU_Table.stack_allocate_hook )
-  {
-    stack_addr = (*_CPU_Table.stack_allocate_hook)( stack_size );
-  } else {
-
-    /*
-     *  First pad the requested size so we allocate enough memory
-     *  so the context initialization can align it properly.  The address
-     *  returned the workspace allocate must be directly stored in the
-     *  stack control block because it is later used in the free sequence.
-     *
-     *  Thus it is the responsibility of the CPU dependent code to 
-     *  get and keep the stack adjust factor, the stack alignment, and 
-     *  the context initialization sequence in sync.
-     */
-
-    stack_size = _Stack_Adjust_size( stack_size );
-    stack_addr = _Workspace_Allocate( stack_size );
-  }
- 
-  if ( !stack_addr )
-      stack_size = 0;
- 
-  the_thread->Start.stack = stack_addr;
- 
-  return stack_size;
-}
-
-/*
- *  _Thread_Stack_Free
- *
- *  Deallocate the Thread's stack.
- */
-
-static void _Thread_Stack_Free(
-  Thread_Control *the_thread
-)
-{
-    /*
-     *  If the API provided the stack space, then don't free it.
-     */
-
-    if ( !the_thread->Start.core_allocated_stack )
-      return;
-
-    /*
-     * Call ONLY the CPU table stack free hook, or the
-     * the RTEMS workspace free.  This is so the free
-     * routine properly matches the allocation of the stack.
-     */
-
-    if ( _CPU_Table.stack_free_hook )
-        (*_CPU_Table.stack_free_hook)( the_thread->Start.Initial_stack.area );
-    else
-        _Workspace_Free( the_thread->Start.Initial_stack.area );
-}
-
-/*PAGE
- *
- *  _Thread_Initialize
- *
- *  XXX
- */
-
-boolean _Thread_Initialize(
-  Objects_Information                  *information,
-  Thread_Control                       *the_thread,
-  void                                 *stack_area,
-  unsigned32                            stack_size,
-  boolean                               is_fp,
-  Priority_Control                      priority,
-  boolean                               is_preemptible,
-  Thread_CPU_budget_algorithms          budget_algorithm,
-  Thread_CPU_budget_algorithm_callout   budget_callout,
-  unsigned32                            isr_level,
-  Objects_Name                          name
-)
-{
-  unsigned32           actual_stack_size = 0;
-  void                *stack = NULL;
-  void                *fp_area;
-  void                *extensions_area;
-
-  /*
-   *  Allocate and Initialize the stack for this thread.
-   */
-
-
-  if ( !stack_area ) {
-    if ( !_Stack_Is_enough( stack_size ) )
-      actual_stack_size = STACK_MINIMUM_SIZE;
-    else
-      actual_stack_size = stack_size;
-
-    actual_stack_size = _Thread_Stack_Allocate( the_thread, actual_stack_size );
- 
-    if ( !actual_stack_size ) 
-      return FALSE;                     /* stack allocation failed */
-
-    stack = the_thread->Start.stack;
-    the_thread->Start.core_allocated_stack = TRUE;
-  } else {
-    stack = stack_area;
-    actual_stack_size = stack_size;
-    the_thread->Start.core_allocated_stack = FALSE;
-  }
-
-  _Stack_Initialize(
-     &the_thread->Start.Initial_stack,
-     stack,
-     actual_stack_size
-  );
-
-  /*
-   *  Allocate the floating point area for this thread
-   */
-  
-  if ( is_fp ) {
-
-    fp_area = _Workspace_Allocate( CONTEXT_FP_SIZE );
-    if ( !fp_area ) {
-      _Thread_Stack_Free( the_thread );
-      return FALSE;
-    }
-    fp_area = _Context_Fp_start( fp_area, 0 );
-
-  } else
-    fp_area = NULL;
-
-  the_thread->fp_context       = fp_area;
-  the_thread->Start.fp_context = fp_area;
-
-  /*
-   *  Allocate the extensions area for this thread
-   */
-
-  if ( _Thread_Maximum_extensions ) {
-    extensions_area = _Workspace_Allocate(
-      (_Thread_Maximum_extensions + 1) * sizeof( void * )
-    );
-
-    if ( !extensions_area ) {
-      if ( fp_area )
-        (void) _Workspace_Free( fp_area );
-
-      _Thread_Stack_Free( the_thread );
-
-      return FALSE;
-    }
-  } else 
-    extensions_area = NULL;
-  
-  the_thread->extensions = (void **) extensions_area;
-
-  /*
-   *  General initialization
-   */
-
-  the_thread->Start.is_preemptible   = is_preemptible;
-  the_thread->Start.budget_algorithm = budget_algorithm;
-  the_thread->Start.budget_callout   = budget_callout;
-  the_thread->Start.isr_level        = isr_level;
-
-  the_thread->current_state          = STATES_DORMANT;
-  the_thread->resource_count         = 0;
-  the_thread->real_priority          = priority;
-  the_thread->Start.initial_priority = priority;
-  the_thread->ticks_executed         = 0;
- 
-  _Thread_Set_priority( the_thread, priority );
-
-  /*
-   *  Open the object
-   */
-
-  _Objects_Open( information, &the_thread->Object, name );
-
-  /*
-   *  Invoke create extensions
-   */
-
-  if ( !_User_extensions_Thread_create( the_thread ) ) {
-
-    if ( extensions_area )
-      (void) _Workspace_Free( extensions_area );
-
-    if ( fp_area )
-      (void) _Workspace_Free( fp_area );
-
-    _Thread_Stack_Free( the_thread );
-
-    return FALSE;
-  }
-
-  return TRUE;
-   
-}
-
-/*
- *  _Thread_Start
- *
- *  DESCRIPTION:
- *
- *  XXX
- */
- 
-boolean _Thread_Start(
-  Thread_Control       *the_thread,
-  Thread_Start_types    the_prototype,
-  void                 *entry_point,
-  void                 *pointer_argument,
-  unsigned32            numeric_argument
-)
-{
-  if ( _States_Is_dormant( the_thread->current_state ) ) {
- 
-    the_thread->Start.entry_point      = (Thread_Entry) entry_point;
-   
-    the_thread->Start.prototype        = the_prototype;
-    the_thread->Start.pointer_argument = pointer_argument;
-    the_thread->Start.numeric_argument = numeric_argument;
- 
-    _Thread_Load_environment( the_thread );
- 
-    _Thread_Ready( the_thread );
- 
-    _User_extensions_Thread_start( the_thread );
- 
-    return TRUE;
-  }
- 
-  return FALSE;
- 
-}
-
-/*
- *  _Thread_Restart
- *
- *  DESCRIPTION:
- *
- *  XXX
- */
- 
-boolean _Thread_Restart(
-  Thread_Control      *the_thread,
-  void                *pointer_argument,
-  unsigned32           numeric_argument
-)
-{
-  if ( !_States_Is_dormant( the_thread->current_state ) ) {
- 
-    _Thread_Set_transient( the_thread );
-    the_thread->resource_count = 0;
-    the_thread->is_preemptible   = the_thread->Start.is_preemptible;
-    the_thread->budget_algorithm = the_thread->Start.budget_algorithm;
-    the_thread->budget_callout   = the_thread->Start.budget_callout;
-
-    the_thread->Start.pointer_argument = pointer_argument;
-    the_thread->Start.numeric_argument = numeric_argument;
- 
-    if ( !_Thread_queue_Extract_with_proxy( the_thread ) ) {
- 
-      if ( _Watchdog_Is_active( &the_thread->Timer ) )
-        (void) _Watchdog_Remove( &the_thread->Timer );
-    }
-
-    if ( the_thread->current_priority != the_thread->Start.initial_priority ) {
-      the_thread->real_priority = the_thread->Start.initial_priority;
-      _Thread_Set_priority( the_thread, the_thread->Start.initial_priority );
-    }
- 
-    _Thread_Load_environment( the_thread );
- 
-    _Thread_Ready( the_thread );
- 
-    _User_extensions_Thread_restart( the_thread );
- 
-    if ( _Thread_Is_executing ( the_thread ) )
-      _Thread_Restart_self();
- 
-    return TRUE;
-  }
- 
-  return FALSE;
-}
-
-/*
- *  _Thread_Close
- *
- *  DESCRIPTION:
- *
- *  XXX
- */
- 
-void _Thread_Close(
-  Objects_Information  *information,
-  Thread_Control       *the_thread
-)
-{
-  _Objects_Close( information, &the_thread->Object );
- 
-  _Thread_Set_state( the_thread, STATES_TRANSIENT );
- 
-  if ( !_Thread_queue_Extract_with_proxy( the_thread ) ) {
- 
-    if ( _Watchdog_Is_active( &the_thread->Timer ) )
-      (void) _Watchdog_Remove( &the_thread->Timer );
-  }
-
-  _User_extensions_Thread_delete( the_thread );
- 
-#if ( CPU_USE_DEFERRED_FP_SWITCH == TRUE )
-  if ( _Thread_Is_allocated_fp( the_thread ) )
-    _Thread_Deallocate_fp();
-#endif
-  the_thread->fp_context = NULL;
-
-  if ( the_thread->Start.fp_context )
-  (void) _Workspace_Free( the_thread->Start.fp_context );
-
-  _Thread_Stack_Free( the_thread );
-
-  if ( the_thread->extensions )
-    (void) _Workspace_Free( the_thread->extensions );
-
-  the_thread->Start.stack = NULL;
-  the_thread->extensions = NULL;
-}
-
-/*PAGE
- *
- *  _Thread_Ready
- *
- *  This kernel routine readies the requested thread, the thread chain
- *  is adjusted.  A new heir thread may be selected.
- *
- *  Input parameters:
- *    the_thread - pointer to thread control block
- *
- *  Output parameters:  NONE
- *
- *  NOTE:  This routine uses the "blocking" heir selection mechanism.
- *         This insures the correct heir after a thread restart.
- *
- *  INTERRUPT LATENCY:
- *    ready chain
- *    select heir
- */
-
-void _Thread_Ready(
-  Thread_Control *the_thread
-)
-{
-  ISR_Level              level;
-  Thread_Control *heir;
-
-  _ISR_Disable( level );
-
-  the_thread->current_state = STATES_READY;
-
-  _Priority_Add_to_bit_map( &the_thread->Priority_map );
-
-  _Chain_Append_unprotected( the_thread->ready, &the_thread->Object.Node );
-
-  _ISR_Flash( level );
-
-  _Thread_Calculate_heir();
-
-  heir = _Thread_Heir;
-
-  if ( !_Thread_Is_executing( heir ) && _Thread_Executing->is_preemptible ) 
-    _Context_Switch_necessary = TRUE;
-
-  _ISR_Enable( level );
-}
-
-/*PAGE
- *
- *  _Thread_Clear_state
- *
- *  This kernel routine clears the appropriate states in the
- *  requested thread.  The thread ready chain is adjusted if
- *  necessary and the Heir thread is set accordingly.
- *
- *  Input parameters:
- *    the_thread - pointer to thread control block
- *    state      - state set to clear
- *
- *  Output parameters:  NONE
- *
- *  INTERRUPT LATENCY:
- *    priority map
- *    select heir
- */
-
-
-void _Thread_Clear_state(
-  Thread_Control *the_thread,
-  States_Control  state
-)
-{
-  ISR_Level       level;
-  States_Control  current_state;
-
-  _ISR_Disable( level );
-    current_state = the_thread->current_state;
-    
-    if ( current_state & state ) {
-      current_state = 
-      the_thread->current_state = _States_Clear( state, current_state );
-
-      if ( _States_Is_ready( current_state ) ) {
-
-        _Priority_Add_to_bit_map( &the_thread->Priority_map );
-
-        _Chain_Append_unprotected(the_thread->ready, &the_thread->Object.Node);
-
-        _ISR_Flash( level );
-
-        if ( the_thread->current_priority < _Thread_Heir->current_priority ) {
-          _Thread_Heir = the_thread;
-          if ( _Thread_Executing->is_preemptible ||
-               the_thread->current_priority == 0 )
-            _Context_Switch_necessary = TRUE;
-        }
-      }
-  }
-  _ISR_Enable( level );
-}
-
-/*PAGE
- *
- * _Thread_Set_state
- *
- * This kernel routine sets the requested state in the THREAD.  The
- * THREAD chain is adjusted if necessary.
- *
- * Input parameters:
- *   the_thread   - pointer to thread control block
- *   state - state to be set
- *
- * Output parameters:  NONE
- *
- *  INTERRUPT LATENCY:
- *    ready chain
- *    select map
- */
-
-void _Thread_Set_state(
-  Thread_Control *the_thread,
-  States_Control         state
-)
-{
-  ISR_Level             level;
-  Chain_Control *ready;
-
-  ready = the_thread->ready;
-  _ISR_Disable( level );
-  if ( !_States_Is_ready( the_thread->current_state ) ) {
-    the_thread->current_state =
-       _States_Set( state, the_thread->current_state );
-    _ISR_Enable( level );
-    return;
-  }
-
-  the_thread->current_state = state;
-
-  if ( _Chain_Has_only_one_node( ready ) ) {
-
-    _Chain_Initialize_empty( ready );
-    _Priority_Remove_from_bit_map( &the_thread->Priority_map );
-
-  } else
-    _Chain_Extract_unprotected( &the_thread->Object.Node );
-
-  _ISR_Flash( level );
-
-  if ( _Thread_Is_heir( the_thread ) )
-     _Thread_Calculate_heir();
-
-  if ( _Thread_Is_executing( the_thread ) )
-    _Context_Switch_necessary = TRUE;
-
-  _ISR_Enable( level );
-}
-
-/*PAGE
- *
- *  _Thread_Set_transient
- *
- *  This kernel routine places the requested thread in the transient state
- *  which will remove it from the ready queue, if necessary.  No
- *  rescheduling is necessary because it is assumed that the transient
- *  state will be cleared before dispatching is enabled.
- *
- *  Input parameters:
- *    the_thread - pointer to thread control block
- *
- *  Output parameters:  NONE
- *
- *  INTERRUPT LATENCY:
- *    only case
- */
-
-void _Thread_Set_transient(
-  Thread_Control *the_thread
-)
-{
-  ISR_Level             level;
-  unsigned32            old_state;
-  Chain_Control *ready;
-
-  ready = the_thread->ready;
-  _ISR_Disable( level );
-
-  old_state = the_thread->current_state;
-  the_thread->current_state = _States_Set( STATES_TRANSIENT, old_state );
-
-  if ( _States_Is_ready( old_state ) ) {
-    if ( _Chain_Has_only_one_node( ready ) ) {
-
-      _Chain_Initialize_empty( ready );
-      _Priority_Remove_from_bit_map( &the_thread->Priority_map );
-
-    } else
-      _Chain_Extract_unprotected( &the_thread->Object.Node );
-  }
-
-  _ISR_Enable( level );
-
-}
-
-/*PAGE
- *
- *  _Thread_Reset_timeslice
- *
- *  This routine will remove the running thread from the ready chain
- *  and place it immediately at the rear of this chain and then the
- *  timeslice counter is reset.  The heir THREAD will be updated if
- *  the running is also the currently the heir.
- *
- *  Input parameters:   NONE
- *
- *  Output parameters:  NONE
- *
- *  INTERRUPT LATENCY:
- *    ready chain
- *    select heir
- */
-
-void _Thread_Reset_timeslice( void )
-{
-  ISR_Level       level;
-  Thread_Control *executing;
-  Chain_Control  *ready;
-
-  executing = _Thread_Executing;
-  ready     = executing->ready;
-  _ISR_Disable( level );
-    if ( _Chain_Has_only_one_node( ready ) ) {
-      _ISR_Enable( level );
-      return;
-    }
-    _Chain_Extract_unprotected( &executing->Object.Node );
-    _Chain_Append_unprotected( ready, &executing->Object.Node );
-
-  _ISR_Flash( level );
-
-    if ( _Thread_Is_heir( executing ) )
-      _Thread_Heir = (Thread_Control *) ready->first;
-
-    _Context_Switch_necessary = TRUE;
-
-  _ISR_Enable( level );
-}
-
-/*PAGE
- *
- *  _Thread_Tickle_timeslice
- *
- *  This scheduler routine determines if timeslicing is enabled
- *  for the currently executing thread and, if so, updates the
- *  timeslice count and checks for timeslice expiration.
- *
- *  Input parameters:   NONE
- *
- *  Output parameters:  NONE
- */
-
-void _Thread_Tickle_timeslice( void )
-{
-  Thread_Control *executing;
-
-  executing = _Thread_Executing;
-
-  /*
-   *  Increment the number of ticks this thread has been executing
-   */
-
-  executing->ticks_executed++;
-
-  /*
-   *  If the thread is not preemptible or is not ready, then 
-   *  just return.
-   */
-
-  if ( !executing->is_preemptible )
-    return;
-
-  if ( !_States_Is_ready( executing->current_state ) )
-    return;
-
-  /*
-   *  The cpu budget algorithm determines what happens next.
-   */
-
-  switch ( executing->budget_algorithm ) {
-    case THREAD_CPU_BUDGET_ALGORITHM_NONE:
-      break;
-
-    case THREAD_CPU_BUDGET_ALGORITHM_RESET_TIMESLICE:
-    case THREAD_CPU_BUDGET_ALGORITHM_EXHAUST_TIMESLICE:
-      if ( --executing->cpu_time_budget == 0 ) {
-        _Thread_Reset_timeslice();
-        executing->cpu_time_budget = _Thread_Ticks_per_timeslice;
-      }
-      break;
-
-    case THREAD_CPU_BUDGET_ALGORITHM_CALLOUT:
-      if ( --executing->cpu_time_budget == 0 )
-        (*executing->budget_callout)( executing );
-      break;
-  }
-}
-
-/*PAGE
- *
- *  _Thread_Yield_processor
- *
- *  This kernel routine will remove the running THREAD from the ready chain
- *  and place it immediatly at the rear of this chain.  Reset timeslice
- *  and yield the processor functions both use this routine, therefore if
- *  reset is TRUE and this is the only thread on the chain then the
- *  timeslice counter is reset.  The heir THREAD will be updated if the
- *  running is also the currently the heir.
- *
- *  Input parameters:   NONE
- *
- *  Output parameters:  NONE
- *
- *  INTERRUPT LATENCY:
- *    ready chain
- *    select heir
- */
-
-void _Thread_Yield_processor( void )
-{
-  ISR_Level       level;
-  Thread_Control *executing;
-  Chain_Control  *ready;
-
-  executing = _Thread_Executing;
-  ready     = executing->ready;
-  _ISR_Disable( level );
-    if ( !_Chain_Has_only_one_node( ready ) ) {
-      _Chain_Extract_unprotected( &executing->Object.Node );
-      _Chain_Append_unprotected( ready, &executing->Object.Node );
-
-      _ISR_Flash( level );
-
-      if ( _Thread_Is_heir( executing ) )
-        _Thread_Heir = (Thread_Control *) ready->first;
-      _Context_Switch_necessary = TRUE;
-    }
-    else if ( !_Thread_Is_heir( executing ) )
-      _Context_Switch_necessary = TRUE;
-
-  _ISR_Enable( level );
-}
-
-/*PAGE
- *
- *  _Thread_Load_environment
- *
- *  Load starting environment for another thread from its start area in the
- *  thread.  Only called from t_restart and t_start.
- *
- *  Input parameters:
- *    the_thread - thread control block pointer
- *
- *  Output parameters:  NONE
- */
-
-void _Thread_Load_environment(
-  Thread_Control *the_thread
-)
-{
-  boolean is_fp = FALSE;
-
-  if ( the_thread->Start.fp_context ) {
-    the_thread->fp_context = the_thread->Start.fp_context;
-    _Context_Initialize_fp( &the_thread->fp_context );
-    is_fp = TRUE;
-  }
-
-  the_thread->do_post_task_switch_extension = FALSE;
-  the_thread->is_preemptible   = the_thread->Start.is_preemptible;
-  the_thread->budget_algorithm = the_thread->Start.budget_algorithm;
-  the_thread->budget_callout   = the_thread->Start.budget_callout;
-
-  _Context_Initialize(
-    &the_thread->Registers,
-    the_thread->Start.Initial_stack.area,
-    the_thread->Start.Initial_stack.size,
-    the_thread->Start.isr_level,
-    _Thread_Handler,
-    is_fp
-  );
-
-}
-
-/*PAGE
- *
- *  _Thread_Handler
- *
- *  This routine is the "primal" entry point for all threads.
- *  _Context_Initialize() dummies up the thread's initial context
- *  to cause the first Context_Switch() to jump to _Thread_Handler().
- *
- *  This routine is the default thread exitted error handler.  It is
- *  returned to when a thread exits.  The configured fatal error handler
- *  is invoked to process the exit.
- *
- *  NOTE:
- *
- *  On entry, it is assumed all interrupts are blocked and that this
- *  routine needs to set the initial isr level.  This may or may not 
- *  actually be needed by the context switch routine and as a result
- *  interrupts may already be at there proper level.  Either way,
- *  setting the initial isr level properly here is safe.
- *  
- *  Currently this is only really needed for the posix port,
- *  ref: _Context_Switch in unix/cpu.c
- *
- *  Input parameters:   NONE
- *
- *  Output parameters:  NONE
- */
-
-void _Thread_Handler( void )
-{
-  ISR_Level  level;
-  Thread_Control *executing;
- 
-  executing = _Thread_Executing;
- 
-  /*
-   * have to put level into a register for those cpu's that use
-   * inline asm here
-   */
- 
-  level = executing->Start.isr_level;
-  _ISR_Set_level(level);
-
-  /*
-   * Take care that 'begin' extensions get to complete before
-   * 'switch' extensions can run.  This means must keep dispatch
-   * disabled until all 'begin' extensions complete.
-   */
- 
-  _User_extensions_Thread_begin( executing );
- 
-  /*
-   *  At this point, the dispatch disable level BETTER be 1.
-   */
-
-  _Thread_Enable_dispatch();
- 
-  switch ( executing->Start.prototype ) {
-    case THREAD_START_NUMERIC:
-      (*(Thread_Entry_numeric) executing->Start.entry_point)(
-        executing->Start.numeric_argument
-      );
-      break;
-    case THREAD_START_POINTER:
-      (*(Thread_Entry_pointer) executing->Start.entry_point)(
-        executing->Start.pointer_argument
-      );
-      break;
-    case THREAD_START_BOTH_POINTER_FIRST:
-      (*(Thread_Entry_both_pointer_first) executing->Start.entry_point)( 
-        executing->Start.pointer_argument,
-        executing->Start.numeric_argument
-      );
-      break;
-    case THREAD_START_BOTH_NUMERIC_FIRST:
-      (*(Thread_Entry_both_numeric_first) executing->Start.entry_point)( 
-        executing->Start.numeric_argument,
-        executing->Start.pointer_argument
-      );
-      break;
-  }
-
-  _User_extensions_Thread_exitted( executing );
-
-  _Internal_error_Occurred(
-    INTERNAL_ERROR_CORE,
-    TRUE,
-    INTERNAL_ERROR_THREAD_EXITTED
-  );
-}
-
-/*PAGE
- *
- *  _Thread_Delay_ended
- *
- *  This routine processes a thread whose delay period has ended.
- *  It is called by the watchdog handler.
- *
- *  Input parameters:
- *    id - thread id
- *
- *  Output parameters: NONE
- */
-
-void _Thread_Delay_ended(
-  Objects_Id  id,
-  void       *ignored
-)
-{
-  Thread_Control    *the_thread;
-  Objects_Locations  location;
-
-  the_thread = _Thread_Get( id, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-    case OBJECTS_REMOTE:  /* impossible */
-      break;
-    case OBJECTS_LOCAL:
-      _Thread_Unblock( the_thread );
-      _Thread_Unnest_dispatch();
-      break;
-  }
-}
-
-/*PAGE
- *
- *  _Thread_Change_priority
- *
- *  This kernel routine changes the priority of the thread.  The
- *  thread chain is adjusted if necessary.
- *
- *  Input parameters:
- *    the_thread   - pointer to thread control block
- *    new_priority - ultimate priority
- *    prepend_it   - TRUE if the thread should be prepended to the chain
- *
- *  Output parameters:  NONE
- *
- *  INTERRUPT LATENCY:
- *    ready chain
- *    select heir
- */
-
-void _Thread_Change_priority(
-  Thread_Control   *the_thread,
-  Priority_Control  new_priority,
-  boolean           prepend_it
-)
-{
-  ISR_Level level;
-  /* boolean   do_prepend = FALSE; */
-
-  /*
-   *  If this is a case where prepending the task to its priority is
-   *  potentially desired, then we need to consider whether to do it.
-   *  This usually occurs when a task lowers its priority implcitly as
-   *  the result of losing inherited priority.  Normal explicit priority
-   *  change calls (e.g. rtems_task_set_priority) should always do an
-   *  append not a prepend.
-   */
- 
-  /*
-   *  Techically, the prepend should conditional on the thread lowering
-   *  its priority but that does allow cxd2004 of the acvc 2.0.1 to 
-   *  pass with rtems 4.0.0.  This should change when gnat redoes its
-   *  priority scheme.
-   */
-/*
-  if ( prepend_it &&
-       _Thread_Is_executing( the_thread ) && 
-       new_priority >= the_thread->current_priority )
-    prepend_it = TRUE;
-*/
-                  
-  _Thread_Set_transient( the_thread );
-
-  if ( the_thread->current_priority != new_priority )
-    _Thread_Set_priority( the_thread, new_priority );
-
-  _ISR_Disable( level );
-
-  the_thread->current_state =
-    _States_Clear( STATES_TRANSIENT, the_thread->current_state );
-
-  if ( ! _States_Is_ready( the_thread->current_state ) ) {
-    _ISR_Enable( level );
-    return;
-  }
-
-  _Priority_Add_to_bit_map( &the_thread->Priority_map );
-  if ( prepend_it )
-    _Chain_Prepend_unprotected( the_thread->ready, &the_thread->Object.Node );
-  else
-    _Chain_Append_unprotected( the_thread->ready, &the_thread->Object.Node );
-
-  _ISR_Flash( level );
-
-  _Thread_Calculate_heir();
-
-  if ( !_Thread_Is_executing_also_the_heir() &&
-       _Thread_Executing->is_preemptible )
-    _Context_Switch_necessary = TRUE;
-  _ISR_Enable( level );
-}
-
-/*PAGE
- *
- * _Thread_Set_priority
- *
- * This directive enables and disables several modes of
- * execution for the requesting thread.
- *
- *  Input parameters:
- *    the_thread   - pointer to thread priority
- *    new_priority - new priority
- *
- *  Output: NONE
- */
-
-void _Thread_Set_priority(
-  Thread_Control   *the_thread,
-  Priority_Control  new_priority
-)
-{
-  the_thread->current_priority = new_priority;
-  the_thread->ready            = &_Thread_Ready_chain[ new_priority ];
-
-  _Priority_Initialize_information( &the_thread->Priority_map, new_priority );
-}
-
-/*PAGE
- *
- *  _Thread_Evaluate_mode
- *
- *  XXX
- */
-
-boolean _Thread_Evaluate_mode( void )
-{
-  Thread_Control     *executing;
-
-  executing = _Thread_Executing;
-
-  if ( !_States_Is_ready( executing->current_state ) ||
-       ( !_Thread_Is_heir( executing ) && executing->is_preemptible ) ) {
-    _Context_Switch_necessary = TRUE;
-    return TRUE;
-  }
-
-  return FALSE;
-}
-
-/*PAGE
- *
- *  _Thread_Get
- *
- *  NOTE:  If we are not using static inlines, this must be a real
- *         subroutine call.
- *
- *  NOTE:  XXX... This routine may be able to be optimized.
- */
-
-#ifndef USE_INLINES
-
-Thread_Control *_Thread_Get (
-  Objects_Id           id,
-  Objects_Locations   *location
-)
-{
-  Objects_Classes      the_class;
-  Objects_Information *information;
- 
-  if ( _Objects_Are_ids_equal( id, OBJECTS_ID_OF_SELF ) ) {
-    _Thread_Disable_dispatch();
-    *location = OBJECTS_LOCAL;
-    return( _Thread_Executing );
-  }
- 
-  the_class = _Objects_Get_class( id );
- 
-  if ( the_class > OBJECTS_CLASSES_LAST ) {
-    *location = OBJECTS_ERROR;
-    return (Thread_Control *) 0;
-  } 
- 
-  information = _Objects_Information_table[ the_class ];
- 
-  if ( !information || !information->is_thread ) { 
-    *location = OBJECTS_ERROR;
-    return (Thread_Control *) 0;
-  }
- 
-  return (Thread_Control *) _Objects_Get( information, id, location );
-}
-
-#endif
-
-/*PAGE
- *
- *  _Thread_Idle_body
- *
- *  This kernel routine is the idle thread.  The idle thread runs any time
- *  no other thread is ready to run.  This thread loops forever with
- *  interrupts enabled.
- *
- *  Input parameters:
- *    ignored - this parameter is ignored
- *
- *  Output parameters:  NONE
- */
- 
-#if (CPU_PROVIDES_IDLE_THREAD_BODY == FALSE)
-Thread _Thread_Idle_body(
-  unsigned32 ignored
-)
-{
-  for( ; ; ) ;
-}
-#endif
diff --git a/cpukit/score/src/threadmp.c b/cpukit/score/src/threadmp.c
deleted file mode 100644
index 7f22e626c0..0000000000
--- a/cpukit/score/src/threadmp.c
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- *  Multiprocessing Support for the Thread Handler
- *
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems/system.h>
-#include <rtems/score/priority.h>
-#include <rtems/score/thread.h>
-#include <rtems/score/wkspace.h>
-#include <rtems/score/isr.h>
-
-/*PAGE
- *
- *  _Thread_MP_Handler_initialization
- *
- */
-
-void _Thread_MP_Handler_initialization (
-  unsigned32  maximum_proxies
-)
-{
-
-  _Chain_Initialize_empty( &_Thread_MP_Active_proxies );
-
-  if ( maximum_proxies == 0 ) {
-    _Chain_Initialize_empty( &_Thread_MP_Inactive_proxies );
-    return;
-  }
-
-
-  _Chain_Initialize(
-    &_Thread_MP_Inactive_proxies,
-    _Workspace_Allocate_or_fatal_error(
-      maximum_proxies * sizeof( Thread_Proxy_control )
-    ),
-    maximum_proxies,
-    sizeof( Thread_Proxy_control )
-  );
-
-}
-
-/*PAGE
- *
- *  _Thread_MP_Allocate_proxy
- *
- */
-
-Thread_Control *_Thread_MP_Allocate_proxy (
-  States_Control  the_state
-)
-{
-  Thread_Control       *the_thread;
-  Thread_Proxy_control *the_proxy;
-
-  the_thread = (Thread_Control *)_Chain_Get( &_Thread_MP_Inactive_proxies );
-
-  if ( !_Thread_Is_null( the_thread ) ) {
-
-    the_proxy = (Thread_Proxy_control *) the_thread;
-
-    _Thread_Executing->Wait.return_code = THREAD_STATUS_PROXY_BLOCKING;
-
-    the_proxy->receive_packet = _Thread_MP_Receive->receive_packet;
-
-    the_proxy->Object.id = _Thread_MP_Receive->receive_packet->source_tid;
-
-    the_proxy->current_priority =
-      _Thread_MP_Receive->receive_packet->source_priority;
-
-    the_proxy->current_state = _States_Set( STATES_DORMANT, the_state );
-
-    the_proxy->Wait = _Thread_Executing->Wait;
-
-    _Chain_Append( &_Thread_MP_Active_proxies, &the_proxy->Active );
-
-    return the_thread;
-  }
-
-  _Internal_error_Occurred(
-    INTERNAL_ERROR_CORE,
-    TRUE,
-    INTERNAL_ERROR_OUT_OF_PROXIES
-  );
-
-  /*
-   *  NOTE: The following return insures that the compiler will
-   *        think that all paths return a value.
-   */
-
-  return NULL;
-}
-
-/*PAGE
- *
- *  _Thread_MP_Find_proxy
- *
- */
-
-/*
- *  The following macro provides the offset of the Active element
- *  in the Thread_Proxy_control structure.  This is the logical
- *  equivalent of the POSITION attribute in Ada.
- */
-
-#define _Thread_MP_Proxy_Active_offset \
-     ((unsigned32)&(((Thread_Proxy_control *)0))->Active)
-
-Thread_Control *_Thread_MP_Find_proxy (
-  Objects_Id  the_id
-)
-{
-
-  Chain_Node           *proxy_node;
-  Thread_Control       *the_thread;
-  ISR_Level             level;
-
-restart:
-
-  _ISR_Disable( level );
-
-    for (  proxy_node = _Thread_MP_Active_proxies.first;
-           !_Chain_Is_tail( &_Thread_MP_Active_proxies, proxy_node ) ;
-        ) {
-
-      the_thread = (Thread_Control *) _Addresses_Subtract_offset(
-                     proxy_node,
-                     _Thread_MP_Proxy_Active_offset
-                   );
-
-      if ( _Objects_Are_ids_equal( the_thread->Object.id, the_id ) ) {
-        _ISR_Enable( level );
-        return the_thread;
-      }
-
-      _ISR_Flash( level );
-
-      proxy_node = proxy_node->next;
-
-      /*
-       *  A proxy which is only dormant is not in a blocking state.
-       *  Therefore, we are looking at proxy which has been moved from
-       *  active to inactive chain (by an ISR) and need to restart
-       *  the search.
-       */
-
-      if ( _States_Is_only_dormant( the_thread->current_state ) ) {
-        _ISR_Enable( level );
-        goto restart;
-      }
-    }
-
-  _ISR_Enable( level );
-  return NULL;
-}
diff --git a/cpukit/score/src/threadq.c b/cpukit/score/src/threadq.c
deleted file mode 100644
index 3cdca9701b..0000000000
--- a/cpukit/score/src/threadq.c
+++ /dev/null
@@ -1,967 +0,0 @@
-/*
- *  Thread Queue Handler
- *
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems/system.h>
-#include <rtems/score/chain.h>
-#include <rtems/score/isr.h>
-#include <rtems/score/object.h>
-#include <rtems/score/states.h>
-#include <rtems/score/thread.h>
-#include <rtems/score/threadq.h>
-#include <rtems/score/tqdata.h>
-
-/*PAGE
- *
- *  _Thread_queue_Initialize
- *
- *  This routine initializes the specified threadq.
- *
- *  Input parameters:
- *    the_thread_queue      - pointer to a threadq header
- *    the_class             - class of the object to which this belongs
- *    discipline            - queueing discipline
- *    state                 - state of waiting threads
- *    proxy_extract_callout - MP specific callout
- *    timeout_status        - return on a timeout
- *
- *  Output parameters: NONE
- */
-
-void _Thread_queue_Initialize(
-  Thread_queue_Control         *the_thread_queue,
-  Objects_Classes               the_class,
-  Thread_queue_Disciplines      the_discipline,
-  States_Control                state,
-  Thread_queue_Extract_callout  proxy_extract_callout,
-  unsigned32                    timeout_status
-)
-{
-  unsigned32 index;
-
-  _Thread_queue_Extract_table[ the_class ] = proxy_extract_callout;
-
-  the_thread_queue->state          = state;
-  the_thread_queue->discipline     = the_discipline;
-  the_thread_queue->timeout_status = timeout_status;
-  the_thread_queue->sync_state     = THREAD_QUEUE_SYNCHRONIZED;
-
-  switch ( the_discipline ) {
-    case THREAD_QUEUE_DISCIPLINE_FIFO:
-      _Chain_Initialize_empty( &the_thread_queue->Queues.Fifo );
-      break;
-    case THREAD_QUEUE_DISCIPLINE_PRIORITY:
-      for( index=0 ;
-           index < TASK_QUEUE_DATA_NUMBER_OF_PRIORITY_HEADERS ;
-           index++)
-        _Chain_Initialize_empty( &the_thread_queue->Queues.Priority[index] );
-      break;
-  }
-
-}
-
-/*PAGE
- *
- *  _Thread_queue_Enqueue
- *
- *  This routine blocks a thread, places it on a thread, and optionally
- *  starts a timeout timer.
- *
- *  Input parameters:
- *    the_thread_queue - pointer to threadq
- *    timeout          - interval to wait
- *
- *  Output parameters: NONE
- *
- *  INTERRUPT LATENCY:
- *    only case
- */
-
-void _Thread_queue_Enqueue(
-  Thread_queue_Control *the_thread_queue,
-  Watchdog_Interval     timeout
-)
-{
-  Thread_Control *the_thread;
-
-  the_thread = _Thread_Executing;
-
-  if ( _Thread_MP_Is_receive( the_thread ) && the_thread->receive_packet )
-    the_thread = _Thread_MP_Allocate_proxy( the_thread_queue->state );
-  else
-    _Thread_Set_state( the_thread, the_thread_queue->state );
-
-  if ( timeout ) {
-    _Watchdog_Initialize(
-       &the_thread->Timer,
-       _Thread_queue_Timeout,
-       the_thread->Object.id,
-       NULL
-    );
-
-    _Watchdog_Insert_ticks( &the_thread->Timer, timeout );
-  }
-
-  switch( the_thread_queue->discipline ) {
-    case THREAD_QUEUE_DISCIPLINE_FIFO:
-      _Thread_queue_Enqueue_fifo( the_thread_queue, the_thread, timeout );
-      break;
-    case THREAD_QUEUE_DISCIPLINE_PRIORITY:
-      _Thread_queue_Enqueue_priority( the_thread_queue, the_thread, timeout );
-      break;
-  }
-}
-
-/*PAGE
- *
- *  _Thread_queue_Dequeue
- *
- *  This routine removes a thread from the specified threadq.  If the
- *  threadq discipline is FIFO, it unblocks a thread, and cancels its
- *  timeout timer.  Priority discipline is processed elsewhere.
- *
- *  Input parameters:
- *    the_thread_queue - pointer to threadq
- *
- *  Output parameters:
- *    returns - thread dequeued or NULL
- *
- *  INTERRUPT LATENCY:
- *    check sync
- */
-
-Thread_Control *_Thread_queue_Dequeue(
-  Thread_queue_Control *the_thread_queue
-)
-{
-  Thread_Control *the_thread;
-
-  switch ( the_thread_queue->discipline ) {
-    case THREAD_QUEUE_DISCIPLINE_FIFO:
-      the_thread = _Thread_queue_Dequeue_fifo( the_thread_queue );
-      break;
-    case THREAD_QUEUE_DISCIPLINE_PRIORITY:
-      the_thread = _Thread_queue_Dequeue_priority( the_thread_queue );
-      break;
-    default:              /* this is only to prevent warnings */
-      the_thread = NULL;
-      break;
-  }
-
-  return( the_thread );
-}
-
-/*PAGE
- *
- *  _Thread_queue_Extract_with_proxy
- *
- *  This routine extracts the_thread from the_thread_queue
- *  and insures that if there is a proxy for this task on 
- *  another node, it is also dealt with.
- *
- *  XXX
- */
- 
-boolean _Thread_queue_Extract_with_proxy(
-  Thread_Control       *the_thread
-)
-{
-  States_Control                state;
-  Objects_Classes               the_class;
-  Thread_queue_Extract_callout  proxy_extract_callout;
-
-  state = the_thread->current_state;
-
-  if ( _States_Is_waiting_on_thread_queue( state ) ) {
-    if ( _States_Is_waiting_for_rpc_reply( state ) &&
-         _States_Is_locally_blocked( state ) ) {
-
-      the_class = _Objects_Get_class( the_thread->Wait.id );
-
-      proxy_extract_callout = _Thread_queue_Extract_table[ the_class ];
-
-      if ( proxy_extract_callout )
-        (*proxy_extract_callout)( the_thread );
-    }
-    _Thread_queue_Extract( the_thread->Wait.queue, the_thread );
-
-    return TRUE;
-  }
-  return FALSE;
-}
-
-/*PAGE
- *
- *  _Thread_queue_Extract
- *
- *  This routine removes a specific thread from the specified threadq,
- *  deletes any timeout, and unblocks the thread.
- *
- *  Input parameters:
- *    the_thread_queue - pointer to a threadq header
- *    the_thread       - pointer to a thread control block
- *
- *  Output parameters: NONE
- *
- *  INTERRUPT LATENCY: NONE
- */
-
-void _Thread_queue_Extract(
-  Thread_queue_Control *the_thread_queue,
-  Thread_Control       *the_thread
-)
-{
-  switch ( the_thread_queue->discipline ) {
-    case THREAD_QUEUE_DISCIPLINE_FIFO:
-      _Thread_queue_Extract_fifo( the_thread_queue, the_thread );
-      break;
-    case THREAD_QUEUE_DISCIPLINE_PRIORITY:
-      _Thread_queue_Extract_priority( the_thread_queue, the_thread );
-      break;
-   }
-}
-
-/*PAGE
- *
- *  _Thread_queue_Flush
- *
- *  This kernel routine flushes the given thread queue.
- *
- *  Input parameters:
- *    the_thread_queue       - pointer to threadq to be flushed
- *    remote_extract_callout - pointer to routine which extracts a remote thread
- *    status                 - status to return to the thread
- *
- *  Output parameters:  NONE
- */
-
-void _Thread_queue_Flush(
-  Thread_queue_Control       *the_thread_queue,
-  Thread_queue_Flush_callout  remote_extract_callout,
-  unsigned32                  status
-)
-{
-  Thread_Control *the_thread;
-
-  while ( (the_thread = _Thread_queue_Dequeue( the_thread_queue )) ) {
-    if ( _Objects_Is_local_id( the_thread->Object.id ) )
-      the_thread->Wait.return_code = status;
-    else
-      ( *remote_extract_callout )( the_thread );
-  }
-}
-
-/*PAGE
- *
- *  _Thread_queue_First
- *
- *  This routines returns a pointer to the first thread on the
- *  specified threadq.
- *
- *  Input parameters:
- *    the_thread_queue - pointer to thread queue
- *
- *  Output parameters:
- *    returns - first thread or NULL
- */
-
-Thread_Control *_Thread_queue_First(
-  Thread_queue_Control *the_thread_queue
-)
-{
-  Thread_Control *the_thread;
-
-  switch ( the_thread_queue->discipline ) {
-    case THREAD_QUEUE_DISCIPLINE_FIFO:
-      the_thread = _Thread_queue_First_fifo( the_thread_queue );
-      break;
-    case THREAD_QUEUE_DISCIPLINE_PRIORITY:
-      the_thread = _Thread_queue_First_priority( the_thread_queue );
-      break;
-    default:              /* this is only to prevent warnings */
-      the_thread = NULL;
-      break;
-  }
-
-  return the_thread;
-}
-
-/*PAGE
- *
- *  _Thread_queue_Timeout
- *
- *  This routine processes a thread which timeouts while waiting on
- *  a thread queue. It is called by the watchdog handler.
- *
- *  Input parameters:
- *    id - thread id
- *
- *  Output parameters: NONE
- */
-
-void _Thread_queue_Timeout(
-  Objects_Id  id,
-  void       *ignored
-)
-{
-  Thread_Control       *the_thread;
-  Thread_queue_Control *the_thread_queue;
-  Objects_Locations     location;
-
-  the_thread = _Thread_Get( id, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-    case OBJECTS_REMOTE:  /* impossible */
-      break;
-    case OBJECTS_LOCAL:
-      the_thread_queue = the_thread->Wait.queue;
-
-      /*
-       *  If the_thread_queue is not synchronized, then it is either
-       *  "nothing happened", "timeout", or "satisfied".   If the_thread
-       *  is the executing thread, then it is in the process of blocking
-       *  and it is the thread which is responsible for the synchronization
-       *  process.
-       *
-       *  If it is not satisfied, then it is "nothing happened" and
-       *  this is the "timeout" transition.  After a request is satisfied,
-       *  a timeout is not allowed to occur.
-       */
-
-      if ( the_thread_queue->sync_state != THREAD_QUEUE_SYNCHRONIZED &&
-           _Thread_Is_executing( the_thread ) ) {
-        if ( the_thread_queue->sync_state != THREAD_QUEUE_SATISFIED )
-          the_thread_queue->sync_state = THREAD_QUEUE_TIMEOUT;
-      } else {
-        the_thread->Wait.return_code = the_thread->Wait.queue->timeout_status;
-        _Thread_queue_Extract( the_thread->Wait.queue, the_thread );
-      }
-      _Thread_Unnest_dispatch();
-      break;
-  }
-}
-
-/*PAGE
- *
- *  _Thread_queue_Enqueue_fifo
- *
- *  This routine blocks a thread, places it on a thread, and optionally
- *  starts a timeout timer.
- *
- *  Input parameters:
- *    the_thread_queue - pointer to threadq
- *    the_thread       - pointer to the thread to block
- *    timeout          - interval to wait
- *
- *  Output parameters: NONE
- *
- *  INTERRUPT LATENCY:
- *    only case
- */
-
-void _Thread_queue_Enqueue_fifo (
-  Thread_queue_Control *the_thread_queue,
-  Thread_Control       *the_thread,
-  Watchdog_Interval    timeout
-)
-{
-  ISR_Level            level;
-  Thread_queue_States  sync_state;
-
-  _ISR_Disable( level );
-
-  sync_state = the_thread_queue->sync_state;
-  the_thread_queue->sync_state = THREAD_QUEUE_SYNCHRONIZED;
-
-  switch ( sync_state ) {
-    case THREAD_QUEUE_SYNCHRONIZED: 
-      /*
-       *  This should never happen.  It indicates that someone did not
-       *  enter a thread queue critical section.
-       */
-      break;
-
-    case THREAD_QUEUE_NOTHING_HAPPENED: 
-      _Chain_Append_unprotected(
-        &the_thread_queue->Queues.Fifo,
-        &the_thread->Object.Node
-      );
-      _ISR_Enable( level );
-      return;
-
-    case THREAD_QUEUE_TIMEOUT: 
-      the_thread->Wait.return_code = the_thread->Wait.queue->timeout_status;
-      _ISR_Enable( level );
-      break;
-
-    case THREAD_QUEUE_SATISFIED:
-      if ( _Watchdog_Is_active( &the_thread->Timer ) ) {
-        _Watchdog_Deactivate( &the_thread->Timer );
-        _ISR_Enable( level );
-        (void) _Watchdog_Remove( &the_thread->Timer );
-      } else
-        _ISR_Enable( level );
-      break;
-  }
-
-  /*
-   *  Global objects with thread queue's should not be operated on from an
-   *  ISR.  But the sync code still must allow short timeouts to be processed
-   *  correctly.
-   */
-
-  _Thread_Unblock( the_thread );
-
-  if ( !_Objects_Is_local_id( the_thread->Object.id ) )
-    _Thread_MP_Free_proxy( the_thread );
-
-}
-
-/*PAGE
- *
- *  _Thread_queue_Dequeue_fifo
- *
- *  This routine removes a thread from the specified threadq.
- *
- *  Input parameters:
- *    the_thread_queue - pointer to threadq
- *
- *  Output parameters:
- *    returns - thread dequeued or NULL
- *
- *  INTERRUPT LATENCY:
- *    check sync
- *    FIFO
- */
-
-Thread_Control *_Thread_queue_Dequeue_fifo(
-  Thread_queue_Control *the_thread_queue
-)
-{
-  ISR_Level              level;
-  Thread_Control *the_thread;
-
-  _ISR_Disable( level );
-  if ( !_Chain_Is_empty( &the_thread_queue->Queues.Fifo ) ) {
-
-    the_thread = (Thread_Control *)
-       _Chain_Get_first_unprotected( &the_thread_queue->Queues.Fifo );
-
-    if ( !_Watchdog_Is_active( &the_thread->Timer ) ) {
-      _ISR_Enable( level );
-      _Thread_Unblock( the_thread );
-    } else {
-      _Watchdog_Deactivate( &the_thread->Timer );
-      _ISR_Enable( level );
-      (void) _Watchdog_Remove( &the_thread->Timer );
-      _Thread_Unblock( the_thread );
-    }
-
-    if ( !_Objects_Is_local_id( the_thread->Object.id ) )
-      _Thread_MP_Free_proxy( the_thread );
-
-    return the_thread;
-  } 
-
-  switch ( the_thread_queue->sync_state ) {
-    case THREAD_QUEUE_SYNCHRONIZED:
-    case THREAD_QUEUE_SATISFIED:
-      _ISR_Enable( level );
-      return NULL;
-
-    case THREAD_QUEUE_NOTHING_HAPPENED:
-    case THREAD_QUEUE_TIMEOUT:
-      the_thread_queue->sync_state = THREAD_QUEUE_SATISFIED;
-      _ISR_Enable( level );
-      return _Thread_Executing;
-  }
-  return NULL;                /* this is only to prevent warnings */
-}
-
-/*PAGE
- *
- *  _Thread_queue_Extract_fifo
- *
- *  This routine removes a specific thread from the specified threadq,
- *  deletes any timeout, and unblocks the thread.
- *
- *  Input parameters:
- *    the_thread_queue - pointer to a threadq header
- *    the_thread       - pointer to the thread to block
- *
- *  Output parameters: NONE
- *
- *  INTERRUPT LATENCY:
- *    EXTRACT_FIFO
- */
-
-void _Thread_queue_Extract_fifo(
-  Thread_queue_Control *the_thread_queue,
-  Thread_Control       *the_thread
-)
-{
-  ISR_Level level;
-
-  _ISR_Disable( level );
-
-  if ( !_States_Is_waiting_on_thread_queue( the_thread->current_state ) ) {
-    _ISR_Enable( level );
-    return;
-  }
-
-  _Chain_Extract_unprotected( &the_thread->Object.Node );
-
-  if ( !_Watchdog_Is_active( &the_thread->Timer ) ) {
-    _ISR_Enable( level );
-  } else {
-    _Watchdog_Deactivate( &the_thread->Timer );
-    _ISR_Enable( level );
-    (void) _Watchdog_Remove( &the_thread->Timer );
-  }
-
-  _Thread_Unblock( the_thread );
-
-  if ( !_Objects_Is_local_id( the_thread->Object.id ) )
-    _Thread_MP_Free_proxy( the_thread );
- 
-}
-
-/*PAGE
- *
- *  _Thread_queue_First_fifo
- *
- *  This routines returns a pointer to the first thread on the
- *  specified threadq.
- *
- *  Input parameters:
- *    the_thread_queue - pointer to threadq
- *
- *  Output parameters:
- *    returns - first thread or NULL
- */
-
-Thread_Control *_Thread_queue_First_fifo(
-  Thread_queue_Control *the_thread_queue
-)
-{
-  if ( !_Chain_Is_empty( &the_thread_queue->Queues.Fifo ) )
-    return (Thread_Control *) the_thread_queue->Queues.Fifo.first;
-
-  return NULL;
-}
-
-/*PAGE
- *
- *  _Thread_queue_Enqueue_priority
- *
- *  This routine blocks a thread, places it on a thread, and optionally
- *  starts a timeout timer.
- *
- *  Input parameters:
- *    the_thread_queue - pointer to threadq
- *    thread           - thread to insert
- *    timeout          - timeout interval in ticks
- *
- *  Output parameters: NONE
- *
- *  INTERRUPT LATENCY:
- *    forward less than
- *    forward equal
- */
-
-void _Thread_queue_Enqueue_priority(
-  Thread_queue_Control *the_thread_queue,
-  Thread_Control       *the_thread,
-  Watchdog_Interval     timeout
-)
-{
-  Priority_Control     search_priority;
-  Thread_Control      *search_thread;
-  ISR_Level            level;
-  Chain_Control       *header;
-  unsigned32           header_index;
-  Chain_Node          *the_node;
-  Chain_Node          *next_node;
-  Chain_Node          *previous_node;
-  Chain_Node          *search_node;
-  Priority_Control     priority;
-  States_Control       block_state;
-  Thread_queue_States  sync_state;
-
-  _Chain_Initialize_empty( &the_thread->Wait.Block2n );
-
-  priority     = the_thread->current_priority;
-  header_index = _Thread_queue_Header_number( priority );
-  header       = &the_thread_queue->Queues.Priority[ header_index ];
-  block_state  = the_thread_queue->state;
-
-  if ( _Thread_queue_Is_reverse_search( priority ) )
-    goto restart_reverse_search;
-
-restart_forward_search:
-  search_priority = PRIORITY_MINIMUM - 1;
-  _ISR_Disable( level );
-  search_thread = (Thread_Control *) header->first;
-  while ( !_Chain_Is_tail( header, (Chain_Node *)search_thread ) ) {
-    search_priority = search_thread->current_priority;
-    if ( priority <= search_priority )
-      break;
-
-#if ( CPU_UNROLL_ENQUEUE_PRIORITY == TRUE )
-    search_thread = (Thread_Control *) search_thread->Object.Node.next;
-    if ( _Chain_Is_tail( header, (Chain_Node *)search_thread ) )
-      break;
-    search_priority = search_thread->current_priority;
-    if ( priority <= search_priority )
-      break;
-#endif
-    _ISR_Flash( level );
-    if ( !_States_Are_set( search_thread->current_state, block_state) ) {
-      _ISR_Enable( level );
-      goto restart_forward_search;
-    }
-    search_thread =
-       (Thread_Control *)search_thread->Object.Node.next;
-  }
-
-  if ( the_thread_queue->sync_state != THREAD_QUEUE_NOTHING_HAPPENED )
-    goto synchronize;
-
-  the_thread_queue->sync_state = THREAD_QUEUE_SYNCHRONIZED;
-
-  if ( priority == search_priority )
-    goto equal_priority;
-
-  search_node   = (Chain_Node *) search_thread;
-  previous_node = search_node->previous;
-  the_node      = (Chain_Node *) the_thread;
-
-  the_node->next        = search_node;
-  the_node->previous    = previous_node;
-  previous_node->next   = the_node;
-  search_node->previous = the_node;
-  _ISR_Enable( level );
-  return;
-
-restart_reverse_search:
-  search_priority     = PRIORITY_MAXIMUM + 1;
-
-  _ISR_Disable( level );
-  search_thread = (Thread_Control *) header->last;
-  while ( !_Chain_Is_head( header, (Chain_Node *)search_thread ) ) {
-    search_priority = search_thread->current_priority;
-    if ( priority >= search_priority )
-      break;
-#if ( CPU_UNROLL_ENQUEUE_PRIORITY == TRUE )
-    search_thread = (Thread_Control *) search_thread->Object.Node.previous;
-    if ( _Chain_Is_head( header, (Chain_Node *)search_thread ) )
-      break;
-    search_priority = search_thread->current_priority;
-    if ( priority >= search_priority )
-      break;
-#endif
-    _ISR_Flash( level );
-    if ( !_States_Are_set( search_thread->current_state, block_state) ) {
-      _ISR_Enable( level );
-      goto restart_reverse_search;
-    }
-    search_thread = (Thread_Control *)
-                         search_thread->Object.Node.previous;
-  }
-
-  if ( the_thread_queue->sync_state != THREAD_QUEUE_NOTHING_HAPPENED )
-    goto synchronize;
-
-  the_thread_queue->sync_state = THREAD_QUEUE_SYNCHRONIZED;
-
-  if ( priority == search_priority )
-    goto equal_priority;
-
-  search_node = (Chain_Node *) search_thread;
-  next_node   = search_node->next;
-  the_node    = (Chain_Node *) the_thread;
-
-  the_node->next      = next_node;
-  the_node->previous  = search_node;
-  search_node->next   = the_node;
-  next_node->previous = the_node;
-  _ISR_Enable( level );
-  return;
-
-equal_priority:               /* add at end of priority group */
-  search_node   = _Chain_Tail( &search_thread->Wait.Block2n );
-  previous_node = search_node->previous;
-  the_node      = (Chain_Node *) the_thread;
-
-  the_node->next        = search_node;
-  the_node->previous    = previous_node;
-  previous_node->next   = the_node;
-  search_node->previous = the_node;
-  _ISR_Enable( level );
-  return;
-
-synchronize:
-
-  sync_state = the_thread_queue->sync_state;
-  the_thread_queue->sync_state = THREAD_QUEUE_SYNCHRONIZED;
-
-  switch ( sync_state ) {
-    case THREAD_QUEUE_SYNCHRONIZED:
-      /*
-       *  This should never happen.  It indicates that someone did not
-       *  enter a thread queue critical section.
-       */
-      break;
- 
-    case THREAD_QUEUE_NOTHING_HAPPENED:
-      /*
-       *  This should never happen.  All of this was dealt with above.
-       */
-      break;
- 
-    case THREAD_QUEUE_TIMEOUT:
-      the_thread->Wait.return_code = the_thread->Wait.queue->timeout_status;
-      _ISR_Enable( level );
-      break;
- 
-    case THREAD_QUEUE_SATISFIED:
-      if ( _Watchdog_Is_active( &the_thread->Timer ) ) {
-        _Watchdog_Deactivate( &the_thread->Timer );
-        _ISR_Enable( level );
-        (void) _Watchdog_Remove( &the_thread->Timer );
-      } else
-        _ISR_Enable( level );
-      break;
-  }
- 
-  /*
-   *  Global objects with thread queue's should not be operated on from an
-   *  ISR.  But the sync code still must allow short timeouts to be processed
-   *  correctly.
-   */
- 
-  _Thread_Unblock( the_thread );
- 
-  if ( !_Objects_Is_local_id( the_thread->Object.id ) )
-    _Thread_MP_Free_proxy( the_thread );
-}
-
-/*PAGE
- *
- *  _Thread_queue_Dequeue_priority
- *
- *  This routine removes a thread from the specified PRIORITY based
- *  threadq, unblocks it, and cancels its timeout timer.
- *
- *  Input parameters:
- *    the_thread_queue - pointer to thread queue
- *
- *  Output parameters:
- *    returns - thread dequeued or NULL
- *
- *  INTERRUPT LATENCY:
- *    only case
- */
-
-Thread_Control *_Thread_queue_Dequeue_priority(
-  Thread_queue_Control *the_thread_queue
-)
-{
-  unsigned32      index;
-  ISR_Level       level;
-  Thread_Control *the_thread = NULL;  /* just to remove warnings */
-  Thread_Control *new_first_thread;
-  Chain_Node     *new_first_node;
-  Chain_Node     *new_second_node;
-  Chain_Node     *last_node;
-  Chain_Node     *next_node;
-  Chain_Node     *previous_node;
-
-  _ISR_Disable( level );
-  for( index=0 ;
-       index < TASK_QUEUE_DATA_NUMBER_OF_PRIORITY_HEADERS ;
-       index++ ) {
-    if ( !_Chain_Is_empty( &the_thread_queue->Queues.Priority[ index ] ) ) {
-      the_thread = (Thread_Control *)
-                    the_thread_queue->Queues.Priority[ index ].first;
-      goto dequeue;
-    }
-  }
-
-  switch ( the_thread_queue->sync_state ) {
-    case THREAD_QUEUE_SYNCHRONIZED:
-    case THREAD_QUEUE_SATISFIED:
-      _ISR_Enable( level );
-      return NULL;
-
-    case THREAD_QUEUE_NOTHING_HAPPENED:
-    case THREAD_QUEUE_TIMEOUT:
-      the_thread_queue->sync_state = THREAD_QUEUE_SATISFIED;
-      _ISR_Enable( level );
-      return _Thread_Executing;
-  }
-
-dequeue:
-  new_first_node   = the_thread->Wait.Block2n.first;
-  new_first_thread = (Thread_Control *) new_first_node;
-  next_node        = the_thread->Object.Node.next;
-  previous_node    = the_thread->Object.Node.previous;
-
-  if ( !_Chain_Is_empty( &the_thread->Wait.Block2n ) ) {
-    last_node       = the_thread->Wait.Block2n.last;
-    new_second_node = new_first_node->next;
-
-    previous_node->next      = new_first_node;
-    next_node->previous      = new_first_node;
-    new_first_node->next     = next_node;
-    new_first_node->previous = previous_node;
-
-    if ( !_Chain_Has_only_one_node( &the_thread->Wait.Block2n ) ) {
-                                                /* > two threads on 2-n */
-      new_second_node->previous =
-                _Chain_Head( &new_first_thread->Wait.Block2n );
-
-      new_first_thread->Wait.Block2n.first = new_second_node;
-      new_first_thread->Wait.Block2n.last  = last_node;
-
-      last_node->next = _Chain_Tail( &new_first_thread->Wait.Block2n );
-    }
-  } else {
-    previous_node->next = next_node;
-    next_node->previous = previous_node;
-  }
-
-  if ( !_Watchdog_Is_active( &the_thread->Timer ) ) {
-    _ISR_Enable( level );
-    _Thread_Unblock( the_thread );
-  } else {
-    _Watchdog_Deactivate( &the_thread->Timer );
-    _ISR_Enable( level );
-    (void) _Watchdog_Remove( &the_thread->Timer );
-    _Thread_Unblock( the_thread );
-  }
-
-  if ( !_Objects_Is_local_id( the_thread->Object.id ) )
-    _Thread_MP_Free_proxy( the_thread );
-  return( the_thread );
-}
-
-/*PAGE
- *
- *  _Thread_queue_Extract_priority
- *
- *  This routine removes a specific thread from the specified threadq,
- *  deletes any timeout, and unblocks the thread.
- *
- *  Input parameters:
- *    the_thread_queue - pointer to a threadq header
- *    the_thread       - pointer to a thread control block
- *
- *  Output parameters: NONE
- *
- *  INTERRUPT LATENCY:
- *    EXTRACT_PRIORITY
- */
-
-void _Thread_queue_Extract_priority(
-  Thread_queue_Control *the_thread_queue,
-  Thread_Control       *the_thread
-)
-{
-  ISR_Level              level;
-  Chain_Node     *the_node;
-  Chain_Node     *next_node;
-  Chain_Node     *previous_node;
-  Thread_Control *new_first_thread;
-  Chain_Node     *new_first_node;
-  Chain_Node     *new_second_node;
-  Chain_Node     *last_node;
-
-  the_node = (Chain_Node *) the_thread;
-  _ISR_Disable( level );
-  if ( _States_Is_waiting_on_thread_queue( the_thread->current_state ) ) {
-    next_node     = the_node->next;
-    previous_node = the_node->previous;
-
-    if ( !_Chain_Is_empty( &the_thread->Wait.Block2n ) ) {
-      new_first_node   = the_thread->Wait.Block2n.first;
-      new_first_thread = (Thread_Control *) new_first_node;
-      last_node        = the_thread->Wait.Block2n.last;
-      new_second_node  = new_first_node->next;
-
-      previous_node->next      = new_first_node;
-      next_node->previous      = new_first_node;
-      new_first_node->next     = next_node;
-      new_first_node->previous = previous_node;
-
-      if ( !_Chain_Has_only_one_node( &the_thread->Wait.Block2n ) ) {
-                                          /* > two threads on 2-n */
-        new_second_node->previous =
-                  _Chain_Head( &new_first_thread->Wait.Block2n );
-        new_first_thread->Wait.Block2n.first = new_second_node;
-
-        new_first_thread->Wait.Block2n.last = last_node;
-        last_node->next = _Chain_Tail( &new_first_thread->Wait.Block2n );
-      }
-    } else {
-      previous_node->next = next_node;
-      next_node->previous = previous_node;
-    }
-
-    if ( !_Watchdog_Is_active( &the_thread->Timer ) ) {
-      _ISR_Enable( level );
-      _Thread_Unblock( the_thread );
-    } else {
-      _Watchdog_Deactivate( &the_thread->Timer );
-      _ISR_Enable( level );
-      (void) _Watchdog_Remove( &the_thread->Timer );
-      _Thread_Unblock( the_thread );
-    }
-
-    if ( !_Objects_Is_local_id( the_thread->Object.id ) )
-      _Thread_MP_Free_proxy( the_thread );
-  }
-  else
-    _ISR_Enable( level );
-}
-
-/*PAGE
- *
- *  _Thread_queue_First_priority
- *
- *  This routines returns a pointer to the first thread on the
- *  specified threadq.
- *
- *  Input parameters:
- *    the_thread_queue - pointer to thread queue
- *
- *  Output parameters:
- *    returns - first thread or NULL
- */
-
-Thread_Control *_Thread_queue_First_priority (
-  Thread_queue_Control *the_thread_queue
-)
-{
-  unsigned32 index;
-
-  for( index=0 ;
-       index < TASK_QUEUE_DATA_NUMBER_OF_PRIORITY_HEADERS ;
-       index++ ) {
-    if ( !_Chain_Is_empty( &the_thread_queue->Queues.Priority[ index ] ) )
-      return (Thread_Control *)
-        the_thread_queue->Queues.Priority[ index ].first;
-  }
-  return NULL;
-}
diff --git a/cpukit/score/src/userext.c b/cpukit/score/src/userext.c
deleted file mode 100644
index a57c6e7ee8..0000000000
--- a/cpukit/score/src/userext.c
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- *  User Extension Handler
- *
- *  NOTE: XXX
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems/system.h>
-#include <rtems/score/userext.h>
-
-/*PAGE
- *
- *  _User_extensions_Thread_create
- */
-
-boolean _User_extensions_Thread_create (
-  Thread_Control *the_thread
-)
-{
-  Chain_Node              *the_node;
-  User_extensions_Control *the_extension;
-  boolean                  status;
- 
-  for ( the_node = _User_extensions_List.first ;
-        !_Chain_Is_tail( &_User_extensions_List, the_node ) ;
-        the_node = the_node->next ) {
- 
-    the_extension = (User_extensions_Control *) the_node;
- 
-    if ( the_extension->Callouts.thread_create != NULL ) {
-      status = (*the_extension->Callouts.thread_create)(
-        _Thread_Executing,
-        the_thread
-      );
-      if ( !status )
-        return FALSE;
-    }
-  }
- 
-  return TRUE;
-}
-
-/*PAGE
- *
- *  _User_extensions_Thread_delete
- */
- 
-void _User_extensions_Thread_delete (
-  Thread_Control *the_thread
-)
-{
-  Chain_Node              *the_node;
-  User_extensions_Control *the_extension;
- 
-  for ( the_node = _User_extensions_List.last ;
-        !_Chain_Is_head( &_User_extensions_List, the_node ) ;
-        the_node = the_node->previous ) {
- 
-    the_extension = (User_extensions_Control *) the_node;
- 
-    if ( the_extension->Callouts.thread_delete != NULL )
-      (*the_extension->Callouts.thread_delete)(
-        _Thread_Executing,
-        the_thread
-      );
-  }
-}
- 
-/*PAGE
- *
- *  _User_extensions_Thread_start
- *
- */
- 
-void _User_extensions_Thread_start (
-  Thread_Control *the_thread
-)
-{
-  Chain_Node              *the_node;
-  User_extensions_Control *the_extension;
- 
-  for ( the_node = _User_extensions_List.first ;
-        !_Chain_Is_tail( &_User_extensions_List, the_node ) ;
-        the_node = the_node->next ) {
- 
-    the_extension = (User_extensions_Control *) the_node;
- 
-    if ( the_extension->Callouts.thread_start != NULL )
-      (*the_extension->Callouts.thread_start)(
-        _Thread_Executing,
-        the_thread
-      );
-  }
-}
- 
-/*PAGE
- *
- *  _User_extensions_Thread_restart
- *
- */
- 
-void _User_extensions_Thread_restart (
-  Thread_Control *the_thread
-)
-{
-  Chain_Node              *the_node;
-  User_extensions_Control *the_extension;
- 
-  for ( the_node = _User_extensions_List.first ;
-        !_Chain_Is_tail( &_User_extensions_List, the_node ) ;
-        the_node = the_node->next ) {
- 
-    the_extension = (User_extensions_Control *) the_node;
- 
-    if ( the_extension->Callouts.thread_restart != NULL )
-      (*the_extension->Callouts.thread_restart)(
-        _Thread_Executing,
-        the_thread
-      );
-  }
-}
- 
-/*PAGE
- *
- *  _User_extensions_Thread_begin
- *
- */
- 
-void _User_extensions_Thread_begin (
-  Thread_Control *executing
-)
-{
-  Chain_Node              *the_node;
-  User_extensions_Control *the_extension;
- 
-  for ( the_node = _User_extensions_List.first ;
-        !_Chain_Is_tail( &_User_extensions_List, the_node ) ;
-        the_node = the_node->next ) {
- 
-    the_extension = (User_extensions_Control *) the_node;
- 
-    if ( the_extension->Callouts.thread_begin != NULL )
-      (*the_extension->Callouts.thread_begin)( executing );
-  }
-}
- 
-/*PAGE
- *
- *  _User_extensions_Thread_exitted
- */
- 
-void _User_extensions_Thread_exitted (
-  Thread_Control *executing
-)
-{
-  Chain_Node              *the_node;
-  User_extensions_Control *the_extension;
- 
-  for ( the_node = _User_extensions_List.last ;
-        !_Chain_Is_head( &_User_extensions_List, the_node ) ;
-        the_node = the_node->previous ) {
- 
-    the_extension = (User_extensions_Control *) the_node;
- 
-    if ( the_extension->Callouts.thread_exitted != NULL )
-      (*the_extension->Callouts.thread_exitted)( executing );
-  }
-}
-
-/*PAGE
- *
- *  _User_extensions_Fatal
- */
- 
-void _User_extensions_Fatal (
-  Internal_errors_Source  the_source,
-  boolean                 is_internal,
-  unsigned32              the_error
-)
-{
-  Chain_Node              *the_node;
-  User_extensions_Control *the_extension;
- 
-  for ( the_node = _User_extensions_List.last ;
-        !_Chain_Is_head( &_User_extensions_List, the_node ) ;
-        the_node = the_node->previous ) {
- 
-    the_extension = (User_extensions_Control *) the_node;
- 
-    if ( the_extension->Callouts.fatal != NULL )
-      (*the_extension->Callouts.fatal)( the_source, is_internal, the_error );
-  }
-}
- 
-
diff --git a/cpukit/score/src/watchdog.c b/cpukit/score/src/watchdog.c
deleted file mode 100644
index a3ddf85420..0000000000
--- a/cpukit/score/src/watchdog.c
+++ /dev/null
@@ -1,273 +0,0 @@
-/*
- *  Watchdog Handler
- *
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems/system.h>
-#include <rtems/score/isr.h>
-#include <rtems/score/watchdog.h>
-
-/*PAGE
- *
- *  _Watchdog_Handler_initialization
- *
- *  This routine initializes the watchdog handler.
- *
- *  Input parameters:  NONE
- *
- *  Output parameters: NONE
- */
-
-void _Watchdog_Handler_initialization( void )
-{
-  _Watchdog_Sync_count = 0;
-  _Watchdog_Sync_level = 0;
-  _Watchdog_Ticks_since_boot = 0;
-
-  _Chain_Initialize_empty( &_Watchdog_Ticks_chain );
-  _Chain_Initialize_empty( &_Watchdog_Seconds_chain );
-}
-
-/*PAGE
- *
- *  _Watchdog_Remove
- *
- *  The routine removes a watchdog from a delta chain and updates
- *  the delta counters of the remaining watchdogs.
- */
-
-Watchdog_States _Watchdog_Remove(
-  Watchdog_Control *the_watchdog
-)
-{
-  ISR_Level         level;
-  Watchdog_States   previous_state;
-  Watchdog_Control *next_watchdog;
-
-  _ISR_Disable( level );
-  previous_state = the_watchdog->state;
-  switch ( previous_state ) {
-    case WATCHDOG_INACTIVE:
-      break;
-
-    case WATCHDOG_BEING_INSERTED:  
-   
-      /*
-       *  It is not actually on the chain so just change the state and
-       *  the Insert operation we interrupted will be aborted.
-       */
-      the_watchdog->state = WATCHDOG_INACTIVE;
-      break;
-
-    case WATCHDOG_ACTIVE:
-    case WATCHDOG_REMOVE_IT:
-
-      the_watchdog->state = WATCHDOG_INACTIVE;
-      next_watchdog = _Watchdog_Next( the_watchdog );
-
-      if ( _Watchdog_Next(next_watchdog) )
-        next_watchdog->delta_interval += the_watchdog->delta_interval;
-
-      if ( _Watchdog_Sync_count )
-        _Watchdog_Sync_level = _ISR_Nest_level;
-
-      _Chain_Extract_unprotected( &the_watchdog->Node );
-      break;
-  }
-  the_watchdog->stop_time = _Watchdog_Ticks_since_boot;
-
-  _ISR_Enable( level );
-  return( previous_state );
-}
-
-/*PAGE
- *
- *  _Watchdog_Adjust
- *
- *  This routine adjusts the delta chain backward or forward in response
- *  to a time change.
- *
- *  Input parameters:
- *    header    - pointer to the delta chain to be adjusted
- *    direction - forward or backward adjustment to delta chain
- *    units     - units to adjust
- *
- *  Output parameters:
- */
-
-void _Watchdog_Adjust(
-  Chain_Control               *header,
-  Watchdog_Adjust_directions   direction,
-  Watchdog_Interval            units
-)
-{
-  if ( !_Chain_Is_empty( header ) ) {
-    switch ( direction ) {
-      case WATCHDOG_BACKWARD:
-        _Watchdog_First( header )->delta_interval += units;
-        break;
-      case WATCHDOG_FORWARD:
-        while ( units ) {
-          if ( units < _Watchdog_First( header )->delta_interval ) {
-            _Watchdog_First( header )->delta_interval -= units;
-            break;
-          } else {
-            units -= _Watchdog_First( header )->delta_interval;
-            _Watchdog_First( header )->delta_interval = 1;
-            _Watchdog_Tickle( header );
-            if ( _Chain_Is_empty( header ) )
-              break;
-          }
-        }
-        break;
-    }
-  }
-}
-
-/*PAGE
- *
- *  _Watchdog_Insert
- *
- *  This routine inserts a watchdog timer on to the appropriate delta
- *  chain while updating the delta interval counters.
- */
-
-void _Watchdog_Insert(
-  Chain_Control         *header,
-  Watchdog_Control      *the_watchdog
-)
-{
-  ISR_Level          level;
-  Watchdog_Control  *after;
-  unsigned32         insert_isr_nest_level;
-  Watchdog_Interval  delta_interval;
-  
-
-  insert_isr_nest_level   = _ISR_Nest_level;
-  the_watchdog->state = WATCHDOG_BEING_INSERTED;
-
-  _Watchdog_Sync_count++;
-restart:
-  delta_interval = the_watchdog->initial;
-
-  _ISR_Disable( level );
-
-  for ( after = _Watchdog_First( header ) ;
-        ;
-        after = _Watchdog_Next( after ) ) {
-
-     if ( delta_interval == 0 || !_Watchdog_Next( after ) )
-       break;
-
-     if ( delta_interval < after->delta_interval ) {
-       after->delta_interval -= delta_interval;
-       break;
-     }
-
-     delta_interval -= after->delta_interval;
-
-     /*
-      *  If you experience problems comment out the _ISR_Flash line.  
-      *  3.2.0 was the first release with this critical section redesigned.
-      *  Under certain circumstances, the PREVIOUS critical section algorithm
-      *  used around this flash point allowed interrupts to execute
-      *  which violated the design assumptions.  The critical section 
-      *  mechanism used here WAS redesigned to address this.
-      */
-
-     _ISR_Flash( level );
-
-     if ( the_watchdog->state != WATCHDOG_BEING_INSERTED ) {
-       goto exit_insert;
-     }
-
-     if ( _Watchdog_Sync_level > insert_isr_nest_level ) {
-       _Watchdog_Sync_level = insert_isr_nest_level;
-       _ISR_Enable( level );
-       goto restart;
-     }
-  }
-
-  _Watchdog_Activate( the_watchdog );
-
-  the_watchdog->delta_interval = delta_interval;
-
-  _Chain_Insert_unprotected( after->Node.previous, &the_watchdog->Node );
-
-  the_watchdog->start_time = _Watchdog_Ticks_since_boot;
-
-exit_insert:
-  _Watchdog_Sync_level = insert_isr_nest_level;
-  _Watchdog_Sync_count--;
-  _ISR_Enable( level );
-}
-
-/*PAGE
- *
- *  _Watchdog_Tickle
- *
- *  This routine decrements the delta counter in response to a tick.  The
- *  delta chain is updated accordingly.
- *
- *  Input parameters:
- *    header - pointer to the delta chain to be tickled
- *
- *  Output parameters: NONE
- */
-
-void _Watchdog_Tickle(
-  Chain_Control *header
-)
-{
-  Watchdog_Control *the_watchdog;
-
-  if ( _Chain_Is_empty( header ) )
-    return;
-
-  the_watchdog = _Watchdog_First( header );
-  the_watchdog->delta_interval--;
-  if ( the_watchdog->delta_interval != 0 )
-    return;
-
-  do {
-     switch( _Watchdog_Remove( the_watchdog ) ) {
-       case WATCHDOG_ACTIVE:
-         (*the_watchdog->routine)(
-           the_watchdog->id,
-           the_watchdog->user_data
-         );
-         break;
-
-       case WATCHDOG_INACTIVE:
-         /*
-          *  This state indicates that the watchdog is not on any chain.
-          *  Thus, it is NOT on a chain being tickled.  This case should 
-          *  never occur.
-          */
-         break;
-
-       case WATCHDOG_BEING_INSERTED:
-         /*
-          *  This state indicates that the watchdog is in the process of
-          *  BEING inserted on the chain.  Thus, it can NOT be on a chain
-          *  being tickled.  This case should never occur.
-          */
-         break;
-
-       case WATCHDOG_REMOVE_IT:
-         break;
-     }
-     the_watchdog = _Watchdog_First( header );
-   } while ( !_Chain_Is_empty( header ) &&
-             (the_watchdog->delta_interval == 0) );
-}
diff --git a/cpukit/score/src/wkspace.c b/cpukit/score/src/wkspace.c
deleted file mode 100644
index 5e154f5efa..0000000000
--- a/cpukit/score/src/wkspace.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- *  Workspace Handler
- *
- *  XXX
- *
- *  NOTE:
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems/system.h>
-#include <rtems/score/wkspace.h>
-#include <rtems/score/interr.h>
-
-/*PAGE
- *
- *  _Workspace_Handler_initialization
- */
- 
-void _Workspace_Handler_initialization(
-  void       *starting_address,
-  unsigned32  size
-)
-{
-  unsigned32 *zero_out_array;
-  unsigned32  index;
-  unsigned32  memory_available;
- 
-  if ( !starting_address || !_Addresses_Is_aligned( starting_address ) )
-    _Internal_error_Occurred(
-      INTERNAL_ERROR_CORE,
-      TRUE,
-      INTERNAL_ERROR_INVALID_WORKSPACE_ADDRESS
-    );
- 
-  if ( _CPU_Table.do_zero_of_workspace ) {
-    for( zero_out_array  = (unsigned32 *) starting_address, index = 0 ;
-         index < size / sizeof( unsigned32 ) ;
-         index++ )
-      zero_out_array[ index ] = 0;
-  }
- 
-  memory_available = _Heap_Initialize(
-    &_Workspace_Area,
-    starting_address,
-    size,
-    CPU_HEAP_ALIGNMENT
-  );
- 
-  if ( memory_available == 0 )
-    _Internal_error_Occurred(
-      INTERNAL_ERROR_CORE,
-      TRUE,
-      INTERNAL_ERROR_TOO_LITTLE_WORKSPACE
-    );
-}
-
-/*PAGE
- *
- *  _Workspace_Allocate_or_fatal_error
- *
- */
-
-void *_Workspace_Allocate_or_fatal_error(
-  unsigned32   size
-)
-{
-  void        *memory;
-
-  memory = _Workspace_Allocate( size );
-
-  if ( memory == NULL )
-    _Internal_error_Occurred(
-      INTERNAL_ERROR_CORE,
-      TRUE,
-      INTERNAL_ERROR_WORKSPACE_ALLOCATION
-    );
-
-  return memory;
-}
diff --git a/cpukit/zlib/doc/rfc1950.txt b/cpukit/zlib/doc/rfc1950.txt
deleted file mode 100644
index ce6428a0f2..0000000000
--- a/cpukit/zlib/doc/rfc1950.txt
+++ /dev/null
@@ -1,619 +0,0 @@
-
-
-
-
-
-
-Network Working Group                                         P. Deutsch
-Request for Comments: 1950                           Aladdin Enterprises
-Category: Informational                                      J-L. Gailly
-                                                                Info-ZIP
-                                                                May 1996
-
-
-         ZLIB Compressed Data Format Specification version 3.3
-
-Status of This Memo
-
-   This memo provides information for the Internet community.  This memo
-   does not specify an Internet standard of any kind.  Distribution of
-   this memo is unlimited.
-
-IESG Note:
-
-   The IESG takes no position on the validity of any Intellectual
-   Property Rights statements contained in this document.
-
-Notices
-
-   Copyright (c) 1996 L. Peter Deutsch and Jean-Loup Gailly
-
-   Permission is granted to copy and distribute this document for any
-   purpose and without charge, including translations into other
-   languages and incorporation into compilations, provided that the
-   copyright notice and this notice are preserved, and that any
-   substantive changes or deletions from the original are clearly
-   marked.
-
-   A pointer to the latest version of this and related documentation in
-   HTML format can be found at the URL
-   <ftp://ftp.uu.net/graphics/png/documents/zlib/zdoc-index.html>.
-
-Abstract
-
-   This specification defines a lossless compressed data format.  The
-   data can be produced or consumed, even for an arbitrarily long
-   sequentially presented input data stream, using only an a priori
-   bounded amount of intermediate storage.  The format presently uses
-   the DEFLATE compression method but can be easily extended to use
-   other compression methods.  It can be implemented readily in a manner
-   not covered by patents.  This specification also defines the ADLER-32
-   checksum (an extension and improvement of the Fletcher checksum),
-   used for detection of data corruption, and provides an algorithm for
-   computing it.
-
-
-
-
-Deutsch & Gailly             Informational                      [Page 1]
-
-RFC 1950       ZLIB Compressed Data Format Specification        May 1996
-
-
-Table of Contents
-
-   1. Introduction ................................................... 2
-      1.1. Purpose ................................................... 2
-      1.2. Intended audience ......................................... 3
-      1.3. Scope ..................................................... 3
-      1.4. Compliance ................................................ 3
-      1.5.  Definitions of terms and conventions used ................ 3
-      1.6. Changes from previous versions ............................ 3
-   2. Detailed specification ......................................... 3
-      2.1. Overall conventions ....................................... 3
-      2.2. Data format ............................................... 4
-      2.3. Compliance ................................................ 7
-   3. References ..................................................... 7
-   4. Source code .................................................... 8
-   5. Security Considerations ........................................ 8
-   6. Acknowledgements ............................................... 8
-   7. Authors' Addresses ............................................. 8
-   8. Appendix: Rationale ............................................ 9
-   9. Appendix: Sample code ..........................................10
-
-1. Introduction
-
-   1.1. Purpose
-
-      The purpose of this specification is to define a lossless
-      compressed data format that:
-
-          * Is independent of CPU type, operating system, file system,
-            and character set, and hence can be used for interchange;
-
-          * Can be produced or consumed, even for an arbitrarily long
-            sequentially presented input data stream, using only an a
-            priori bounded amount of intermediate storage, and hence can
-            be used in data communications or similar structures such as
-            Unix filters;
-
-          * Can use a number of different compression methods;
-
-          * Can be implemented readily in a manner not covered by
-            patents, and hence can be practiced freely.
-
-      The data format defined by this specification does not attempt to
-      allow random access to compressed data.
-
-
-
-
-
-
-
-Deutsch & Gailly             Informational                      [Page 2]
-
-RFC 1950       ZLIB Compressed Data Format Specification        May 1996
-
-
-   1.2. Intended audience
-
-      This specification is intended for use by implementors of software
-      to compress data into zlib format and/or decompress data from zlib
-      format.
-
-      The text of the specification assumes a basic background in
-      programming at the level of bits and other primitive data
-      representations.
-
-   1.3. Scope
-
-      The specification specifies a compressed data format that can be
-      used for in-memory compression of a sequence of arbitrary bytes.
-
-   1.4. Compliance
-
-      Unless otherwise indicated below, a compliant decompressor must be
-      able to accept and decompress any data set that conforms to all
-      the specifications presented here; a compliant compressor must
-      produce data sets that conform to all the specifications presented
-      here.
-
-   1.5.  Definitions of terms and conventions used
-
-      byte: 8 bits stored or transmitted as a unit (same as an octet).
-      (For this specification, a byte is exactly 8 bits, even on
-      machines which store a character on a number of bits different
-      from 8.) See below, for the numbering of bits within a byte.
-
-   1.6. Changes from previous versions
-
-      Version 3.1 was the first public release of this specification.
-      In version 3.2, some terminology was changed and the Adler-32
-      sample code was rewritten for clarity.  In version 3.3, the
-      support for a preset dictionary was introduced, and the
-      specification was converted to RFC style.
-
-2. Detailed specification
-
-   2.1. Overall conventions
-
-      In the diagrams below, a box like this:
-
-         +---+
-         |   | <-- the vertical bars might be missing
-         +---+
-
-
-
-
-Deutsch & Gailly             Informational                      [Page 3]
-
-RFC 1950       ZLIB Compressed Data Format Specification        May 1996
-
-
-      represents one byte; a box like this:
-
-         +==============+
-         |              |
-         +==============+
-
-      represents a variable number of bytes.
-
-      Bytes stored within a computer do not have a "bit order", since
-      they are always treated as a unit.  However, a byte considered as
-      an integer between 0 and 255 does have a most- and least-
-      significant bit, and since we write numbers with the most-
-      significant digit on the left, we also write bytes with the most-
-      significant bit on the left.  In the diagrams below, we number the
-      bits of a byte so that bit 0 is the least-significant bit, i.e.,
-      the bits are numbered:
-
-         +--------+
-         |76543210|
-         +--------+
-
-      Within a computer, a number may occupy multiple bytes.  All
-      multi-byte numbers in the format described here are stored with
-      the MOST-significant byte first (at the lower memory address).
-      For example, the decimal number 520 is stored as:
-
-             0     1
-         +--------+--------+
-         |00000010|00001000|
-         +--------+--------+
-          ^        ^
-          |        |
-          |        + less significant byte = 8
-          + more significant byte = 2 x 256
-
-   2.2. Data format
-
-      A zlib stream has the following structure:
-
-           0   1
-         +---+---+
-         |CMF|FLG|   (more-->)
-         +---+---+
-
-
-
-
-
-
-
-
-Deutsch & Gailly             Informational                      [Page 4]
-
-RFC 1950       ZLIB Compressed Data Format Specification        May 1996
-
-
-      (if FLG.FDICT set)
-
-           0   1   2   3
-         +---+---+---+---+
-         |     DICTID    |   (more-->)
-         +---+---+---+---+
-
-         +=====================+---+---+---+---+
-         |...compressed data...|    ADLER32    |
-         +=====================+---+---+---+---+
-
-      Any data which may appear after ADLER32 are not part of the zlib
-      stream.
-
-      CMF (Compression Method and flags)
-         This byte is divided into a 4-bit compression method and a 4-
-         bit information field depending on the compression method.
-
-            bits 0 to 3  CM     Compression method
-            bits 4 to 7  CINFO  Compression info
-
-      CM (Compression method)
-         This identifies the compression method used in the file. CM = 8
-         denotes the "deflate" compression method with a window size up
-         to 32K.  This is the method used by gzip and PNG (see
-         references [1] and [2] in Chapter 3, below, for the reference
-         documents).  CM = 15 is reserved.  It might be used in a future
-         version of this specification to indicate the presence of an
-         extra field before the compressed data.
-
-      CINFO (Compression info)
-         For CM = 8, CINFO is the base-2 logarithm of the LZ77 window
-         size, minus eight (CINFO=7 indicates a 32K window size). Values
-         of CINFO above 7 are not allowed in this version of the
-         specification.  CINFO is not defined in this specification for
-         CM not equal to 8.
-
-      FLG (FLaGs)
-         This flag byte is divided as follows:
-
-            bits 0 to 4  FCHECK  (check bits for CMF and FLG)
-            bit  5       FDICT   (preset dictionary)
-            bits 6 to 7  FLEVEL  (compression level)
-
-         The FCHECK value must be such that CMF and FLG, when viewed as
-         a 16-bit unsigned integer stored in MSB order (CMF*256 + FLG),
-         is a multiple of 31.
-
-
-
-
-Deutsch & Gailly             Informational                      [Page 5]
-
-RFC 1950       ZLIB Compressed Data Format Specification        May 1996
-
-
-      FDICT (Preset dictionary)
-         If FDICT is set, a DICT dictionary identifier is present
-         immediately after the FLG byte. The dictionary is a sequence of
-         bytes which are initially fed to the compressor without
-         producing any compressed output. DICT is the Adler-32 checksum
-         of this sequence of bytes (see the definition of ADLER32
-         below).  The decompressor can use this identifier to determine
-         which dictionary has been used by the compressor.
-
-      FLEVEL (Compression level)
-         These flags are available for use by specific compression
-         methods.  The "deflate" method (CM = 8) sets these flags as
-         follows:
-
-            0 - compressor used fastest algorithm
-            1 - compressor used fast algorithm
-            2 - compressor used default algorithm
-            3 - compressor used maximum compression, slowest algorithm
-
-         The information in FLEVEL is not needed for decompression; it
-         is there to indicate if recompression might be worthwhile.
-
-      compressed data
-         For compression method 8, the compressed data is stored in the
-         deflate compressed data format as described in the document
-         "DEFLATE Compressed Data Format Specification" by L. Peter
-         Deutsch. (See reference [3] in Chapter 3, below)
-
-         Other compressed data formats are not specified in this version
-         of the zlib specification.
-
-      ADLER32 (Adler-32 checksum)
-         This contains a checksum value of the uncompressed data
-         (excluding any dictionary data) computed according to Adler-32
-         algorithm. This algorithm is a 32-bit extension and improvement
-         of the Fletcher algorithm, used in the ITU-T X.224 / ISO 8073
-         standard. See references [4] and [5] in Chapter 3, below)
-
-         Adler-32 is composed of two sums accumulated per byte: s1 is
-         the sum of all bytes, s2 is the sum of all s1 values. Both sums
-         are done modulo 65521. s1 is initialized to 1, s2 to zero.  The
-         Adler-32 checksum is stored as s2*65536 + s1 in most-
-         significant-byte first (network) order.
-
-
-
-
-
-
-
-
-Deutsch & Gailly             Informational                      [Page 6]
-
-RFC 1950       ZLIB Compressed Data Format Specification        May 1996
-
-
-   2.3. Compliance
-
-      A compliant compressor must produce streams with correct CMF, FLG
-      and ADLER32, but need not support preset dictionaries.  When the
-      zlib data format is used as part of another standard data format,
-      the compressor may use only preset dictionaries that are specified
-      by this other data format.  If this other format does not use the
-      preset dictionary feature, the compressor must not set the FDICT
-      flag.
-
-      A compliant decompressor must check CMF, FLG, and ADLER32, and
-      provide an error indication if any of these have incorrect values.
-      A compliant decompressor must give an error indication if CM is
-      not one of the values defined in this specification (only the
-      value 8 is permitted in this version), since another value could
-      indicate the presence of new features that would cause subsequent
-      data to be interpreted incorrectly.  A compliant decompressor must
-      give an error indication if FDICT is set and DICTID is not the
-      identifier of a known preset dictionary.  A decompressor may
-      ignore FLEVEL and still be compliant.  When the zlib data format
-      is being used as a part of another standard format, a compliant
-      decompressor must support all the preset dictionaries specified by
-      the other format. When the other format does not use the preset
-      dictionary feature, a compliant decompressor must reject any
-      stream in which the FDICT flag is set.
-
-3. References
-
-   [1] Deutsch, L.P.,"GZIP Compressed Data Format Specification",
-       available in ftp://ftp.uu.net/pub/archiving/zip/doc/
-
-   [2] Thomas Boutell, "PNG (Portable Network Graphics) specification",
-       available in ftp://ftp.uu.net/graphics/png/documents/
-
-   [3] Deutsch, L.P.,"DEFLATE Compressed Data Format Specification",
-       available in ftp://ftp.uu.net/pub/archiving/zip/doc/
-
-   [4] Fletcher, J. G., "An Arithmetic Checksum for Serial
-       Transmissions," IEEE Transactions on Communications, Vol. COM-30,
-       No. 1, January 1982, pp. 247-252.
-
-   [5] ITU-T Recommendation X.224, Annex D, "Checksum Algorithms,"
-       November, 1993, pp. 144, 145. (Available from
-       gopher://info.itu.ch). ITU-T X.244 is also the same as ISO 8073.
-
-
-
-
-
-
-
-Deutsch & Gailly             Informational                      [Page 7]
-
-RFC 1950       ZLIB Compressed Data Format Specification        May 1996
-
-
-4. Source code
-
-   Source code for a C language implementation of a "zlib" compliant
-   library is available at ftp://ftp.uu.net/pub/archiving/zip/zlib/.
-
-5. Security Considerations
-
-   A decoder that fails to check the ADLER32 checksum value may be
-   subject to undetected data corruption.
-
-6. Acknowledgements
-
-   Trademarks cited in this document are the property of their
-   respective owners.
-
-   Jean-Loup Gailly and Mark Adler designed the zlib format and wrote
-   the related software described in this specification.  Glenn
-   Randers-Pehrson converted this document to RFC and HTML format.
-
-7. Authors' Addresses
-
-   L. Peter Deutsch
-   Aladdin Enterprises
-   203 Santa Margarita Ave.
-   Menlo Park, CA 94025
-
-   Phone: (415) 322-0103 (AM only)
-   FAX:   (415) 322-1734
-   EMail: <ghost@aladdin.com>
-
-
-   Jean-Loup Gailly
-
-   EMail: <gzip@prep.ai.mit.edu>
-
-   Questions about the technical content of this specification can be
-   sent by email to
-
-   Jean-Loup Gailly <gzip@prep.ai.mit.edu> and
-   Mark Adler <madler@alumni.caltech.edu>
-
-   Editorial comments on this specification can be sent by email to
-
-   L. Peter Deutsch <ghost@aladdin.com> and
-   Glenn Randers-Pehrson <randeg@alumni.rpi.edu>
-
-
-
-
-
-
-Deutsch & Gailly             Informational                      [Page 8]
-
-RFC 1950       ZLIB Compressed Data Format Specification        May 1996
-
-
-8. Appendix: Rationale
-
-   8.1. Preset dictionaries
-
-      A preset dictionary is specially useful to compress short input
-      sequences. The compressor can take advantage of the dictionary
-      context to encode the input in a more compact manner. The
-      decompressor can be initialized with the appropriate context by
-      virtually decompressing a compressed version of the dictionary
-      without producing any output. However for certain compression
-      algorithms such as the deflate algorithm this operation can be
-      achieved without actually performing any decompression.
-
-      The compressor and the decompressor must use exactly the same
-      dictionary. The dictionary may be fixed or may be chosen among a
-      certain number of predefined dictionaries, according to the kind
-      of input data. The decompressor can determine which dictionary has
-      been chosen by the compressor by checking the dictionary
-      identifier. This document does not specify the contents of
-      predefined dictionaries, since the optimal dictionaries are
-      application specific. Standard data formats using this feature of
-      the zlib specification must precisely define the allowed
-      dictionaries.
-
-   8.2. The Adler-32 algorithm
-
-      The Adler-32 algorithm is much faster than the CRC32 algorithm yet
-      still provides an extremely low probability of undetected errors.
-
-      The modulo on unsigned long accumulators can be delayed for 5552
-      bytes, so the modulo operation time is negligible.  If the bytes
-      are a, b, c, the second sum is 3a + 2b + c + 3, and so is position
-      and order sensitive, unlike the first sum, which is just a
-      checksum.  That 65521 is prime is important to avoid a possible
-      large class of two-byte errors that leave the check unchanged.
-      (The Fletcher checksum uses 255, which is not prime and which also
-      makes the Fletcher check insensitive to single byte changes 0 <->
-      255.)
-
-      The sum s1 is initialized to 1 instead of zero to make the length
-      of the sequence part of s2, so that the length does not have to be
-      checked separately. (Any sequence of zeroes has a Fletcher
-      checksum of zero.)
-
-
-
-
-
-
-
-
-Deutsch & Gailly             Informational                      [Page 9]
-
-RFC 1950       ZLIB Compressed Data Format Specification        May 1996
-
-
-9. Appendix: Sample code
-
-   The following C code computes the Adler-32 checksum of a data buffer.
-   It is written for clarity, not for speed.  The sample code is in the
-   ANSI C programming language. Non C users may find it easier to read
-   with these hints:
-
-      &      Bitwise AND operator.
-      >>     Bitwise right shift operator. When applied to an
-             unsigned quantity, as here, right shift inserts zero bit(s)
-             at the left.
-      <<     Bitwise left shift operator. Left shift inserts zero
-             bit(s) at the right.
-      ++     "n++" increments the variable n.
-      %      modulo operator: a % b is the remainder of a divided by b.
-
-      #define BASE 65521 /* largest prime smaller than 65536 */
-
-      /*
-         Update a running Adler-32 checksum with the bytes buf[0..len-1]
-       and return the updated checksum. The Adler-32 checksum should be
-       initialized to 1.
-
-       Usage example:
-
-         unsigned long adler = 1L;
-
-         while (read_buffer(buffer, length) != EOF) {
-           adler = update_adler32(adler, buffer, length);
-         }
-         if (adler != original_adler) error();
-      */
-      unsigned long update_adler32(unsigned long adler,
-         unsigned char *buf, int len)
-      {
-        unsigned long s1 = adler & 0xffff;
-        unsigned long s2 = (adler >> 16) & 0xffff;
-        int n;
-
-        for (n = 0; n < len; n++) {
-          s1 = (s1 + buf[n]) % BASE;
-          s2 = (s2 + s1)     % BASE;
-        }
-        return (s2 << 16) + s1;
-      }
-
-      /* Return the adler32 of the bytes buf[0..len-1] */
-
-
-
-
-Deutsch & Gailly             Informational                     [Page 10]
-
-RFC 1950       ZLIB Compressed Data Format Specification        May 1996
-
-
-      unsigned long adler32(unsigned char *buf, int len)
-      {
-        return update_adler32(1L, buf, len);
-      }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Deutsch & Gailly             Informational                     [Page 11]
-
diff --git a/cpukit/zlib/doc/rfc1951.txt b/cpukit/zlib/doc/rfc1951.txt
deleted file mode 100644
index 403c8c722f..0000000000
--- a/cpukit/zlib/doc/rfc1951.txt
+++ /dev/null
@@ -1,955 +0,0 @@
-
-
-
-
-
-
-Network Working Group                                         P. Deutsch
-Request for Comments: 1951                           Aladdin Enterprises
-Category: Informational                                         May 1996
-
-
-        DEFLATE Compressed Data Format Specification version 1.3
-
-Status of This Memo
-
-   This memo provides information for the Internet community.  This memo
-   does not specify an Internet standard of any kind.  Distribution of
-   this memo is unlimited.
-
-IESG Note:
-
-   The IESG takes no position on the validity of any Intellectual
-   Property Rights statements contained in this document.
-
-Notices
-
-   Copyright (c) 1996 L. Peter Deutsch
-
-   Permission is granted to copy and distribute this document for any
-   purpose and without charge, including translations into other
-   languages and incorporation into compilations, provided that the
-   copyright notice and this notice are preserved, and that any
-   substantive changes or deletions from the original are clearly
-   marked.
-
-   A pointer to the latest version of this and related documentation in
-   HTML format can be found at the URL
-   <ftp://ftp.uu.net/graphics/png/documents/zlib/zdoc-index.html>.
-
-Abstract
-
-   This specification defines a lossless compressed data format that
-   compresses data using a combination of the LZ77 algorithm and Huffman
-   coding, with efficiency comparable to the best currently available
-   general-purpose compression methods.  The data can be produced or
-   consumed, even for an arbitrarily long sequentially presented input
-   data stream, using only an a priori bounded amount of intermediate
-   storage.  The format can be implemented readily in a manner not
-   covered by patents.
-
-
-
-
-
-
-
-
-Deutsch                      Informational                      [Page 1]
-
-RFC 1951      DEFLATE Compressed Data Format Specification      May 1996
-
-
-Table of Contents
-
-   1. Introduction ................................................... 2
-      1.1. Purpose ................................................... 2
-      1.2. Intended audience ......................................... 3
-      1.3. Scope ..................................................... 3
-      1.4. Compliance ................................................ 3
-      1.5.  Definitions of terms and conventions used ................ 3
-      1.6. Changes from previous versions ............................ 4
-   2. Compressed representation overview ............................. 4
-   3. Detailed specification ......................................... 5
-      3.1. Overall conventions ....................................... 5
-          3.1.1. Packing into bytes .................................. 5
-      3.2. Compressed block format ................................... 6
-          3.2.1. Synopsis of prefix and Huffman coding ............... 6
-          3.2.2. Use of Huffman coding in the "deflate" format ....... 7
-          3.2.3. Details of block format ............................. 9
-          3.2.4. Non-compressed blocks (BTYPE=00) ................... 11
-          3.2.5. Compressed blocks (length and distance codes) ...... 11
-          3.2.6. Compression with fixed Huffman codes (BTYPE=01) .... 12
-          3.2.7. Compression with dynamic Huffman codes (BTYPE=10) .. 13
-      3.3. Compliance ............................................... 14
-   4. Compression algorithm details ................................. 14
-   5. References .................................................... 16
-   6. Security Considerations ....................................... 16
-   7. Source code ................................................... 16
-   8. Acknowledgements .............................................. 16
-   9. Author's Address .............................................. 17
-
-1. Introduction
-
-   1.1. Purpose
-
-      The purpose of this specification is to define a lossless
-      compressed data format that:
-          * Is independent of CPU type, operating system, file system,
-            and character set, and hence can be used for interchange;
-          * Can be produced or consumed, even for an arbitrarily long
-            sequentially presented input data stream, using only an a
-            priori bounded amount of intermediate storage, and hence
-            can be used in data communications or similar structures
-            such as Unix filters;
-          * Compresses data with efficiency comparable to the best
-            currently available general-purpose compression methods,
-            and in particular considerably better than the "compress"
-            program;
-          * Can be implemented readily in a manner not covered by
-            patents, and hence can be practiced freely;
-
-
-
-Deutsch                      Informational                      [Page 2]
-
-RFC 1951      DEFLATE Compressed Data Format Specification      May 1996
-
-
-          * Is compatible with the file format produced by the current
-            widely used gzip utility, in that conforming decompressors
-            will be able to read data produced by the existing gzip
-            compressor.
-
-      The data format defined by this specification does not attempt to:
-
-          * Allow random access to compressed data;
-          * Compress specialized data (e.g., raster graphics) as well
-            as the best currently available specialized algorithms.
-
-      A simple counting argument shows that no lossless compression
-      algorithm can compress every possible input data set.  For the
-      format defined here, the worst case expansion is 5 bytes per 32K-
-      byte block, i.e., a size increase of 0.015% for large data sets.
-      English text usually compresses by a factor of 2.5 to 3;
-      executable files usually compress somewhat less; graphical data
-      such as raster images may compress much more.
-
-   1.2. Intended audience
-
-      This specification is intended for use by implementors of software
-      to compress data into "deflate" format and/or decompress data from
-      "deflate" format.
-
-      The text of the specification assumes a basic background in
-      programming at the level of bits and other primitive data
-      representations.  Familiarity with the technique of Huffman coding
-      is helpful but not required.
-
-   1.3. Scope
-
-      The specification specifies a method for representing a sequence
-      of bytes as a (usually shorter) sequence of bits, and a method for
-      packing the latter bit sequence into bytes.
-
-   1.4. Compliance
-
-      Unless otherwise indicated below, a compliant decompressor must be
-      able to accept and decompress any data set that conforms to all
-      the specifications presented here; a compliant compressor must
-      produce data sets that conform to all the specifications presented
-      here.
-
-   1.5.  Definitions of terms and conventions used
-
-      Byte: 8 bits stored or transmitted as a unit (same as an octet).
-      For this specification, a byte is exactly 8 bits, even on machines
-
-
-
-Deutsch                      Informational                      [Page 3]
-
-RFC 1951      DEFLATE Compressed Data Format Specification      May 1996
-
-
-      which store a character on a number of bits different from eight.
-      See below, for the numbering of bits within a byte.
-
-      String: a sequence of arbitrary bytes.
-
-   1.6. Changes from previous versions
-
-      There have been no technical changes to the deflate format since
-      version 1.1 of this specification.  In version 1.2, some
-      terminology was changed.  Version 1.3 is a conversion of the
-      specification to RFC style.
-
-2. Compressed representation overview
-
-   A compressed data set consists of a series of blocks, corresponding
-   to successive blocks of input data.  The block sizes are arbitrary,
-   except that non-compressible blocks are limited to 65,535 bytes.
-
-   Each block is compressed using a combination of the LZ77 algorithm
-   and Huffman coding. The Huffman trees for each block are independent
-   of those for previous or subsequent blocks; the LZ77 algorithm may
-   use a reference to a duplicated string occurring in a previous block,
-   up to 32K input bytes before.
-
-   Each block consists of two parts: a pair of Huffman code trees that
-   describe the representation of the compressed data part, and a
-   compressed data part.  (The Huffman trees themselves are compressed
-   using Huffman encoding.)  The compressed data consists of a series of
-   elements of two types: literal bytes (of strings that have not been
-   detected as duplicated within the previous 32K input bytes), and
-   pointers to duplicated strings, where a pointer is represented as a
-   pair <length, backward distance>.  The representation used in the
-   "deflate" format limits distances to 32K bytes and lengths to 258
-   bytes, but does not limit the size of a block, except for
-   uncompressible blocks, which are limited as noted above.
-
-   Each type of value (literals, distances, and lengths) in the
-   compressed data is represented using a Huffman code, using one code
-   tree for literals and lengths and a separate code tree for distances.
-   The code trees for each block appear in a compact form just before
-   the compressed data for that block.
-
-
-
-
-
-
-
-
-
-
-Deutsch                      Informational                      [Page 4]
-
-RFC 1951      DEFLATE Compressed Data Format Specification      May 1996
-
-
-3. Detailed specification
-
-   3.1. Overall conventions In the diagrams below, a box like this:
-
-         +---+
-         |   | <-- the vertical bars might be missing
-         +---+
-
-      represents one byte; a box like this:
-
-         +==============+
-         |              |
-         +==============+
-
-      represents a variable number of bytes.
-
-      Bytes stored within a computer do not have a "bit order", since
-      they are always treated as a unit.  However, a byte considered as
-      an integer between 0 and 255 does have a most- and least-
-      significant bit, and since we write numbers with the most-
-      significant digit on the left, we also write bytes with the most-
-      significant bit on the left.  In the diagrams below, we number the
-      bits of a byte so that bit 0 is the least-significant bit, i.e.,
-      the bits are numbered:
-
-         +--------+
-         |76543210|
-         +--------+
-
-      Within a computer, a number may occupy multiple bytes.  All
-      multi-byte numbers in the format described here are stored with
-      the least-significant byte first (at the lower memory address).
-      For example, the decimal number 520 is stored as:
-
-             0        1
-         +--------+--------+
-         |00001000|00000010|
-         +--------+--------+
-          ^        ^
-          |        |
-          |        + more significant byte = 2 x 256
-          + less significant byte = 8
-
-      3.1.1. Packing into bytes
-
-         This document does not address the issue of the order in which
-         bits of a byte are transmitted on a bit-sequential medium,
-         since the final data format described here is byte- rather than
-
-
-
-Deutsch                      Informational                      [Page 5]
-
-RFC 1951      DEFLATE Compressed Data Format Specification      May 1996
-
-
-         bit-oriented.  However, we describe the compressed block format
-         in below, as a sequence of data elements of various bit
-         lengths, not a sequence of bytes.  We must therefore specify
-         how to pack these data elements into bytes to form the final
-         compressed byte sequence:
-
-             * Data elements are packed into bytes in order of
-               increasing bit number within the byte, i.e., starting
-               with the least-significant bit of the byte.
-             * Data elements other than Huffman codes are packed
-               starting with the least-significant bit of the data
-               element.
-             * Huffman codes are packed starting with the most-
-               significant bit of the code.
-
-         In other words, if one were to print out the compressed data as
-         a sequence of bytes, starting with the first byte at the
-         *right* margin and proceeding to the *left*, with the most-
-         significant bit of each byte on the left as usual, one would be
-         able to parse the result from right to left, with fixed-width
-         elements in the correct MSB-to-LSB order and Huffman codes in
-         bit-reversed order (i.e., with the first bit of the code in the
-         relative LSB position).
-
-   3.2. Compressed block format
-
-      3.2.1. Synopsis of prefix and Huffman coding
-
-         Prefix coding represents symbols from an a priori known
-         alphabet by bit sequences (codes), one code for each symbol, in
-         a manner such that different symbols may be represented by bit
-         sequences of different lengths, but a parser can always parse
-         an encoded string unambiguously symbol-by-symbol.
-
-         We define a prefix code in terms of a binary tree in which the
-         two edges descending from each non-leaf node are labeled 0 and
-         1 and in which the leaf nodes correspond one-for-one with (are
-         labeled with) the symbols of the alphabet; then the code for a
-         symbol is the sequence of 0's and 1's on the edges leading from
-         the root to the leaf labeled with that symbol.  For example:
-
-
-
-
-
-
-
-
-
-
-
-Deutsch                      Informational                      [Page 6]
-
-RFC 1951      DEFLATE Compressed Data Format Specification      May 1996
-
-
-                          /\              Symbol    Code
-                         0  1             ------    ----
-                        /    \                A      00
-                       /\     B               B       1
-                      0  1                    C     011
-                     /    \                   D     010
-                    A     /\
-                         0  1
-                        /    \
-                       D      C
-
-         A parser can decode the next symbol from an encoded input
-         stream by walking down the tree from the root, at each step
-         choosing the edge corresponding to the next input bit.
-
-         Given an alphabet with known symbol frequencies, the Huffman
-         algorithm allows the construction of an optimal prefix code
-         (one which represents strings with those symbol frequencies
-         using the fewest bits of any possible prefix codes for that
-         alphabet).  Such a code is called a Huffman code.  (See
-         reference [1] in Chapter 5, references for additional
-         information on Huffman codes.)
-
-         Note that in the "deflate" format, the Huffman codes for the
-         various alphabets must not exceed certain maximum code lengths.
-         This constraint complicates the algorithm for computing code
-         lengths from symbol frequencies.  Again, see Chapter 5,
-         references for details.
-
-      3.2.2. Use of Huffman coding in the "deflate" format
-
-         The Huffman codes used for each alphabet in the "deflate"
-         format have two additional rules:
-
-             * All codes of a given bit length have lexicographically
-               consecutive values, in the same order as the symbols
-               they represent;
-
-             * Shorter codes lexicographically precede longer codes.
-
-
-
-
-
-
-
-
-
-
-
-
-Deutsch                      Informational                      [Page 7]
-
-RFC 1951      DEFLATE Compressed Data Format Specification      May 1996
-
-
-         We could recode the example above to follow this rule as
-         follows, assuming that the order of the alphabet is ABCD:
-
-            Symbol  Code
-            ------  ----
-            A       10
-            B       0
-            C       110
-            D       111
-
-         I.e., 0 precedes 10 which precedes 11x, and 110 and 111 are
-         lexicographically consecutive.
-
-         Given this rule, we can define the Huffman code for an alphabet
-         just by giving the bit lengths of the codes for each symbol of
-         the alphabet in order; this is sufficient to determine the
-         actual codes.  In our example, the code is completely defined
-         by the sequence of bit lengths (2, 1, 3, 3).  The following
-         algorithm generates the codes as integers, intended to be read
-         from most- to least-significant bit.  The code lengths are
-         initially in tree[I].Len; the codes are produced in
-         tree[I].Code.
-
-         1)  Count the number of codes for each code length.  Let
-             bl_count[N] be the number of codes of length N, N >= 1.
-
-         2)  Find the numerical value of the smallest code for each
-             code length:
-
-                code = 0;
-                bl_count[0] = 0;
-                for (bits = 1; bits <= MAX_BITS; bits++) {
-                    code = (code + bl_count[bits-1]) << 1;
-                    next_code[bits] = code;
-                }
-
-         3)  Assign numerical values to all codes, using consecutive
-             values for all codes of the same length with the base
-             values determined at step 2. Codes that are never used
-             (which have a bit length of zero) must not be assigned a
-             value.
-
-                for (n = 0;  n <= max_code; n++) {
-                    len = tree[n].Len;
-                    if (len != 0) {
-                        tree[n].Code = next_code[len];
-                        next_code[len]++;
-                    }
-
-
-
-Deutsch                      Informational                      [Page 8]
-
-RFC 1951      DEFLATE Compressed Data Format Specification      May 1996
-
-
-                }
-
-         Example:
-
-         Consider the alphabet ABCDEFGH, with bit lengths (3, 3, 3, 3,
-         3, 2, 4, 4).  After step 1, we have:
-
-            N      bl_count[N]
-            -      -----------
-            2      1
-            3      5
-            4      2
-
-         Step 2 computes the following next_code values:
-
-            N      next_code[N]
-            -      ------------
-            1      0
-            2      0
-            3      2
-            4      14
-
-         Step 3 produces the following code values:
-
-            Symbol Length   Code
-            ------ ------   ----
-            A       3        010
-            B       3        011
-            C       3        100
-            D       3        101
-            E       3        110
-            F       2         00
-            G       4       1110
-            H       4       1111
-
-      3.2.3. Details of block format
-
-         Each block of compressed data begins with 3 header bits
-         containing the following data:
-
-            first bit       BFINAL
-            next 2 bits     BTYPE
-
-         Note that the header bits do not necessarily begin on a byte
-         boundary, since a block does not necessarily occupy an integral
-         number of bytes.
-
-
-
-
-
-Deutsch                      Informational                      [Page 9]
-
-RFC 1951      DEFLATE Compressed Data Format Specification      May 1996
-
-
-         BFINAL is set if and only if this is the last block of the data
-         set.
-
-         BTYPE specifies how the data are compressed, as follows:
-
-            00 - no compression
-            01 - compressed with fixed Huffman codes
-            10 - compressed with dynamic Huffman codes
-            11 - reserved (error)
-
-         The only difference between the two compressed cases is how the
-         Huffman codes for the literal/length and distance alphabets are
-         defined.
-
-         In all cases, the decoding algorithm for the actual data is as
-         follows:
-
-            do
-               read block header from input stream.
-               if stored with no compression
-                  skip any remaining bits in current partially
-                     processed byte
-                  read LEN and NLEN (see next section)
-                  copy LEN bytes of data to output
-               otherwise
-                  if compressed with dynamic Huffman codes
-                     read representation of code trees (see
-                        subsection below)
-                  loop (until end of block code recognized)
-                     decode literal/length value from input stream
-                     if value < 256
-                        copy value (literal byte) to output stream
-                     otherwise
-                        if value = end of block (256)
-                           break from loop
-                        otherwise (value = 257..285)
-                           decode distance from input stream
-
-                           move backwards distance bytes in the output
-                           stream, and copy length bytes from this
-                           position to the output stream.
-                  end loop
-            while not last block
-
-         Note that a duplicated string reference may refer to a string
-         in a previous block; i.e., the backward distance may cross one
-         or more block boundaries.  However a distance cannot refer past
-         the beginning of the output stream.  (An application using a
-
-
-
-Deutsch                      Informational                     [Page 10]
-
-RFC 1951      DEFLATE Compressed Data Format Specification      May 1996
-
-
-         preset dictionary might discard part of the output stream; a
-         distance can refer to that part of the output stream anyway)
-         Note also that the referenced string may overlap the current
-         position; for example, if the last 2 bytes decoded have values
-         X and Y, a string reference with <length = 5, distance = 2>
-         adds X,Y,X,Y,X to the output stream.
-
-         We now specify each compression method in turn.
-
-      3.2.4. Non-compressed blocks (BTYPE=00)
-
-         Any bits of input up to the next byte boundary are ignored.
-         The rest of the block consists of the following information:
-
-              0   1   2   3   4...
-            +---+---+---+---+================================+
-            |  LEN  | NLEN  |... LEN bytes of literal data...|
-            +---+---+---+---+================================+
-
-         LEN is the number of data bytes in the block.  NLEN is the
-         one's complement of LEN.
-
-      3.2.5. Compressed blocks (length and distance codes)
-
-         As noted above, encoded data blocks in the "deflate" format
-         consist of sequences of symbols drawn from three conceptually
-         distinct alphabets: either literal bytes, from the alphabet of
-         byte values (0..255), or <length, backward distance> pairs,
-         where the length is drawn from (3..258) and the distance is
-         drawn from (1..32,768).  In fact, the literal and length
-         alphabets are merged into a single alphabet (0..285), where
-         values 0..255 represent literal bytes, the value 256 indicates
-         end-of-block, and values 257..285 represent length codes
-         (possibly in conjunction with extra bits following the symbol
-         code) as follows:
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Deutsch                      Informational                     [Page 11]
-
-RFC 1951      DEFLATE Compressed Data Format Specification      May 1996
-
-
-                 Extra               Extra               Extra
-            Code Bits Length(s) Code Bits Lengths   Code Bits Length(s)
-            ---- ---- ------     ---- ---- -------   ---- ---- -------
-             257   0     3       267   1   15,16     277   4   67-82
-             258   0     4       268   1   17,18     278   4   83-98
-             259   0     5       269   2   19-22     279   4   99-114
-             260   0     6       270   2   23-26     280   4  115-130
-             261   0     7       271   2   27-30     281   5  131-162
-             262   0     8       272   2   31-34     282   5  163-194
-             263   0     9       273   3   35-42     283   5  195-226
-             264   0    10       274   3   43-50     284   5  227-257
-             265   1  11,12      275   3   51-58     285   0    258
-             266   1  13,14      276   3   59-66
-
-         The extra bits should be interpreted as a machine integer
-         stored with the most-significant bit first, e.g., bits 1110
-         represent the value 14.
-
-                  Extra           Extra               Extra
-             Code Bits Dist  Code Bits   Dist     Code Bits Distance
-             ---- ---- ----  ---- ----  ------    ---- ---- --------
-               0   0    1     10   4     33-48    20    9   1025-1536
-               1   0    2     11   4     49-64    21    9   1537-2048
-               2   0    3     12   5     65-96    22   10   2049-3072
-               3   0    4     13   5     97-128   23   10   3073-4096
-               4   1   5,6    14   6    129-192   24   11   4097-6144
-               5   1   7,8    15   6    193-256   25   11   6145-8192
-               6   2   9-12   16   7    257-384   26   12  8193-12288
-               7   2  13-16   17   7    385-512   27   12 12289-16384
-               8   3  17-24   18   8    513-768   28   13 16385-24576
-               9   3  25-32   19   8   769-1024   29   13 24577-32768
-
-      3.2.6. Compression with fixed Huffman codes (BTYPE=01)
-
-         The Huffman codes for the two alphabets are fixed, and are not
-         represented explicitly in the data.  The Huffman code lengths
-         for the literal/length alphabet are:
-
-                   Lit Value    Bits        Codes
-                   ---------    ----        -----
-                     0 - 143     8          00110000 through
-                                            10111111
-                   144 - 255     9          110010000 through
-                                            111111111
-                   256 - 279     7          0000000 through
-                                            0010111
-                   280 - 287     8          11000000 through
-                                            11000111
-
-
-
-Deutsch                      Informational                     [Page 12]
-
-RFC 1951      DEFLATE Compressed Data Format Specification      May 1996
-
-
-         The code lengths are sufficient to generate the actual codes,
-         as described above; we show the codes in the table for added
-         clarity.  Literal/length values 286-287 will never actually
-         occur in the compressed data, but participate in the code
-         construction.
-
-         Distance codes 0-31 are represented by (fixed-length) 5-bit
-         codes, with possible additional bits as shown in the table
-         shown in Paragraph 3.2.5, above.  Note that distance codes 30-
-         31 will never actually occur in the compressed data.
-
-      3.2.7. Compression with dynamic Huffman codes (BTYPE=10)
-
-         The Huffman codes for the two alphabets appear in the block
-         immediately after the header bits and before the actual
-         compressed data, first the literal/length code and then the
-         distance code.  Each code is defined by a sequence of code
-         lengths, as discussed in Paragraph 3.2.2, above.  For even
-         greater compactness, the code length sequences themselves are
-         compressed using a Huffman code.  The alphabet for code lengths
-         is as follows:
-
-               0 - 15: Represent code lengths of 0 - 15
-                   16: Copy the previous code length 3 - 6 times.
-                       The next 2 bits indicate repeat length
-                             (0 = 3, ... , 3 = 6)
-                          Example:  Codes 8, 16 (+2 bits 11),
-                                    16 (+2 bits 10) will expand to
-                                    12 code lengths of 8 (1 + 6 + 5)
-                   17: Repeat a code length of 0 for 3 - 10 times.
-                       (3 bits of length)
-                   18: Repeat a code length of 0 for 11 - 138 times
-                       (7 bits of length)
-
-         A code length of 0 indicates that the corresponding symbol in
-         the literal/length or distance alphabet will not occur in the
-         block, and should not participate in the Huffman code
-         construction algorithm given earlier.  If only one distance
-         code is used, it is encoded using one bit, not zero bits; in
-         this case there is a single code length of one, with one unused
-         code.  One distance code of zero bits means that there are no
-         distance codes used at all (the data is all literals).
-
-         We can now define the format of the block:
-
-               5 Bits: HLIT, # of Literal/Length codes - 257 (257 - 286)
-               5 Bits: HDIST, # of Distance codes - 1        (1 - 32)
-               4 Bits: HCLEN, # of Code Length codes - 4     (4 - 19)
-
-
-
-Deutsch                      Informational                     [Page 13]
-
-RFC 1951      DEFLATE Compressed Data Format Specification      May 1996
-
-
-               (HCLEN + 4) x 3 bits: code lengths for the code length
-                  alphabet given just above, in the order: 16, 17, 18,
-                  0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15
-
-                  These code lengths are interpreted as 3-bit integers
-                  (0-7); as above, a code length of 0 means the
-                  corresponding symbol (literal/length or distance code
-                  length) is not used.
-
-               HLIT + 257 code lengths for the literal/length alphabet,
-                  encoded using the code length Huffman code
-
-               HDIST + 1 code lengths for the distance alphabet,
-                  encoded using the code length Huffman code
-
-               The actual compressed data of the block,
-                  encoded using the literal/length and distance Huffman
-                  codes
-
-               The literal/length symbol 256 (end of data),
-                  encoded using the literal/length Huffman code
-
-         The code length repeat codes can cross from HLIT + 257 to the
-         HDIST + 1 code lengths.  In other words, all code lengths form
-         a single sequence of HLIT + HDIST + 258 values.
-
-   3.3. Compliance
-
-      A compressor may limit further the ranges of values specified in
-      the previous section and still be compliant; for example, it may
-      limit the range of backward pointers to some value smaller than
-      32K.  Similarly, a compressor may limit the size of blocks so that
-      a compressible block fits in memory.
-
-      A compliant decompressor must accept the full range of possible
-      values defined in the previous section, and must accept blocks of
-      arbitrary size.
-
-4. Compression algorithm details
-
-   While it is the intent of this document to define the "deflate"
-   compressed data format without reference to any particular
-   compression algorithm, the format is related to the compressed
-   formats produced by LZ77 (Lempel-Ziv 1977, see reference [2] below);
-   since many variations of LZ77 are patented, it is strongly
-   recommended that the implementor of a compressor follow the general
-   algorithm presented here, which is known not to be patented per se.
-   The material in this section is not part of the definition of the
-
-
-
-Deutsch                      Informational                     [Page 14]
-
-RFC 1951      DEFLATE Compressed Data Format Specification      May 1996
-
-
-   specification per se, and a compressor need not follow it in order to
-   be compliant.
-
-   The compressor terminates a block when it determines that starting a
-   new block with fresh trees would be useful, or when the block size
-   fills up the compressor's block buffer.
-
-   The compressor uses a chained hash table to find duplicated strings,
-   using a hash function that operates on 3-byte sequences.  At any
-   given point during compression, let XYZ be the next 3 input bytes to
-   be examined (not necessarily all different, of course).  First, the
-   compressor examines the hash chain for XYZ.  If the chain is empty,
-   the compressor simply writes out X as a literal byte and advances one
-   byte in the input.  If the hash chain is not empty, indicating that
-   the sequence XYZ (or, if we are unlucky, some other 3 bytes with the
-   same hash function value) has occurred recently, the compressor
-   compares all strings on the XYZ hash chain with the actual input data
-   sequence starting at the current point, and selects the longest
-   match.
-
-   The compressor searches the hash chains starting with the most recent
-   strings, to favor small distances and thus take advantage of the
-   Huffman encoding.  The hash chains are singly linked. There are no
-   deletions from the hash chains; the algorithm simply discards matches
-   that are too old.  To avoid a worst-case situation, very long hash
-   chains are arbitrarily truncated at a certain length, determined by a
-   run-time parameter.
-
-   To improve overall compression, the compressor optionally defers the
-   selection of matches ("lazy matching"): after a match of length N has
-   been found, the compressor searches for a longer match starting at
-   the next input byte.  If it finds a longer match, it truncates the
-   previous match to a length of one (thus producing a single literal
-   byte) and then emits the longer match.  Otherwise, it emits the
-   original match, and, as described above, advances N bytes before
-   continuing.
-
-   Run-time parameters also control this "lazy match" procedure.  If
-   compression ratio is most important, the compressor attempts a
-   complete second search regardless of the length of the first match.
-   In the normal case, if the current match is "long enough", the
-   compressor reduces the search for a longer match, thus speeding up
-   the process.  If speed is most important, the compressor inserts new
-   strings in the hash table only when no match was found, or when the
-   match is not "too long".  This degrades the compression ratio but
-   saves time since there are both fewer insertions and fewer searches.
-
-
-
-
-
-Deutsch                      Informational                     [Page 15]
-
-RFC 1951      DEFLATE Compressed Data Format Specification      May 1996
-
-
-5. References
-
-   [1] Huffman, D. A., "A Method for the Construction of Minimum
-       Redundancy Codes", Proceedings of the Institute of Radio
-       Engineers, September 1952, Volume 40, Number 9, pp. 1098-1101.
-
-   [2] Ziv J., Lempel A., "A Universal Algorithm for Sequential Data
-       Compression", IEEE Transactions on Information Theory, Vol. 23,
-       No. 3, pp. 337-343.
-
-   [3] Gailly, J.-L., and Adler, M., ZLIB documentation and sources,
-       available in ftp://ftp.uu.net/pub/archiving/zip/doc/
-
-   [4] Gailly, J.-L., and Adler, M., GZIP documentation and sources,
-       available as gzip-*.tar in ftp://prep.ai.mit.edu/pub/gnu/
-
-   [5] Schwartz, E. S., and Kallick, B. "Generating a canonical prefix
-       encoding." Comm. ACM, 7,3 (Mar. 1964), pp. 166-169.
-
-   [6] Hirschberg and Lelewer, "Efficient decoding of prefix codes,"
-       Comm. ACM, 33,4, April 1990, pp. 449-459.
-
-6. Security Considerations
-
-   Any data compression method involves the reduction of redundancy in
-   the data.  Consequently, any corruption of the data is likely to have
-   severe effects and be difficult to correct.  Uncompressed text, on
-   the other hand, will probably still be readable despite the presence
-   of some corrupted bytes.
-
-   It is recommended that systems using this data format provide some
-   means of validating the integrity of the compressed data.  See
-   reference [3], for example.
-
-7. Source code
-
-   Source code for a C language implementation of a "deflate" compliant
-   compressor and decompressor is available within the zlib package at
-   ftp://ftp.uu.net/pub/archiving/zip/zlib/.
-
-8. Acknowledgements
-
-   Trademarks cited in this document are the property of their
-   respective owners.
-
-   Phil Katz designed the deflate format.  Jean-Loup Gailly and Mark
-   Adler wrote the related software described in this specification.
-   Glenn Randers-Pehrson converted this document to RFC and HTML format.
-
-
-
-Deutsch                      Informational                     [Page 16]
-
-RFC 1951      DEFLATE Compressed Data Format Specification      May 1996
-
-
-9. Author's Address
-
-   L. Peter Deutsch
-   Aladdin Enterprises
-   203 Santa Margarita Ave.
-   Menlo Park, CA 94025
-
-   Phone: (415) 322-0103 (AM only)
-   FAX:   (415) 322-1734
-   EMail: <ghost@aladdin.com>
-
-   Questions about the technical content of this specification can be
-   sent by email to:
-
-   Jean-Loup Gailly <gzip@prep.ai.mit.edu> and
-   Mark Adler <madler@alumni.caltech.edu>
-
-   Editorial comments on this specification can be sent by email to:
-
-   L. Peter Deutsch <ghost@aladdin.com> and
-   Glenn Randers-Pehrson <randeg@alumni.rpi.edu>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Deutsch                      Informational                     [Page 17]
-
diff --git a/cpukit/zlib/doc/rfc1952.txt b/cpukit/zlib/doc/rfc1952.txt
deleted file mode 100644
index a8e51b4567..0000000000
--- a/cpukit/zlib/doc/rfc1952.txt
+++ /dev/null
@@ -1,675 +0,0 @@
-
-
-
-
-
-
-Network Working Group                                         P. Deutsch
-Request for Comments: 1952                           Aladdin Enterprises
-Category: Informational                                         May 1996
-
-
-               GZIP file format specification version 4.3
-
-Status of This Memo
-
-   This memo provides information for the Internet community.  This memo
-   does not specify an Internet standard of any kind.  Distribution of
-   this memo is unlimited.
-
-IESG Note:
-
-   The IESG takes no position on the validity of any Intellectual
-   Property Rights statements contained in this document.
-
-Notices
-
-   Copyright (c) 1996 L. Peter Deutsch
-
-   Permission is granted to copy and distribute this document for any
-   purpose and without charge, including translations into other
-   languages and incorporation into compilations, provided that the
-   copyright notice and this notice are preserved, and that any
-   substantive changes or deletions from the original are clearly
-   marked.
-
-   A pointer to the latest version of this and related documentation in
-   HTML format can be found at the URL
-   <ftp://ftp.uu.net/graphics/png/documents/zlib/zdoc-index.html>.
-
-Abstract
-
-   This specification defines a lossless compressed data format that is
-   compatible with the widely used GZIP utility.  The format includes a
-   cyclic redundancy check value for detecting data corruption.  The
-   format presently uses the DEFLATE method of compression but can be
-   easily extended to use other compression methods.  The format can be
-   implemented readily in a manner not covered by patents.
-
-
-
-
-
-
-
-
-
-
-Deutsch                      Informational                      [Page 1]
-
-RFC 1952             GZIP File Format Specification             May 1996
-
-
-Table of Contents
-
-   1. Introduction ................................................... 2
-      1.1. Purpose ................................................... 2
-      1.2. Intended audience ......................................... 3
-      1.3. Scope ..................................................... 3
-      1.4. Compliance ................................................ 3
-      1.5. Definitions of terms and conventions used ................. 3
-      1.6. Changes from previous versions ............................ 3
-   2. Detailed specification ......................................... 4
-      2.1. Overall conventions ....................................... 4
-      2.2. File format ............................................... 5
-      2.3. Member format ............................................. 5
-          2.3.1. Member header and trailer ........................... 6
-              2.3.1.1. Extra field ................................... 8
-              2.3.1.2. Compliance .................................... 9
-      3. References .................................................. 9
-      4. Security Considerations .................................... 10
-      5. Acknowledgements ........................................... 10
-      6. Author's Address ........................................... 10
-      7. Appendix: Jean-Loup Gailly's gzip utility .................. 11
-      8. Appendix: Sample CRC Code .................................. 11
-
-1. Introduction
-
-   1.1. Purpose
-
-      The purpose of this specification is to define a lossless
-      compressed data format that:
-
-          * Is independent of CPU type, operating system, file system,
-            and character set, and hence can be used for interchange;
-          * Can compress or decompress a data stream (as opposed to a
-            randomly accessible file) to produce another data stream,
-            using only an a priori bounded amount of intermediate
-            storage, and hence can be used in data communications or
-            similar structures such as Unix filters;
-          * Compresses data with efficiency comparable to the best
-            currently available general-purpose compression methods,
-            and in particular considerably better than the "compress"
-            program;
-          * Can be implemented readily in a manner not covered by
-            patents, and hence can be practiced freely;
-          * Is compatible with the file format produced by the current
-            widely used gzip utility, in that conforming decompressors
-            will be able to read data produced by the existing gzip
-            compressor.
-
-
-
-
-Deutsch                      Informational                      [Page 2]
-
-RFC 1952             GZIP File Format Specification             May 1996
-
-
-      The data format defined by this specification does not attempt to:
-
-          * Provide random access to compressed data;
-          * Compress specialized data (e.g., raster graphics) as well as
-            the best currently available specialized algorithms.
-
-   1.2. Intended audience
-
-      This specification is intended for use by implementors of software
-      to compress data into gzip format and/or decompress data from gzip
-      format.
-
-      The text of the specification assumes a basic background in
-      programming at the level of bits and other primitive data
-      representations.
-
-   1.3. Scope
-
-      The specification specifies a compression method and a file format
-      (the latter assuming only that a file can store a sequence of
-      arbitrary bytes).  It does not specify any particular interface to
-      a file system or anything about character sets or encodings
-      (except for file names and comments, which are optional).
-
-   1.4. Compliance
-
-      Unless otherwise indicated below, a compliant decompressor must be
-      able to accept and decompress any file that conforms to all the
-      specifications presented here; a compliant compressor must produce
-      files that conform to all the specifications presented here.  The
-      material in the appendices is not part of the specification per se
-      and is not relevant to compliance.
-
-   1.5. Definitions of terms and conventions used
-
-      byte: 8 bits stored or transmitted as a unit (same as an octet).
-      (For this specification, a byte is exactly 8 bits, even on
-      machines which store a character on a number of bits different
-      from 8.)  See below for the numbering of bits within a byte.
-
-   1.6. Changes from previous versions
-
-      There have been no technical changes to the gzip format since
-      version 4.1 of this specification.  In version 4.2, some
-      terminology was changed, and the sample CRC code was rewritten for
-      clarity and to eliminate the requirement for the caller to do pre-
-      and post-conditioning.  Version 4.3 is a conversion of the
-      specification to RFC style.
-
-
-
-Deutsch                      Informational                      [Page 3]
-
-RFC 1952             GZIP File Format Specification             May 1996
-
-
-2. Detailed specification
-
-   2.1. Overall conventions
-
-      In the diagrams below, a box like this:
-
-         +---+
-         |   | <-- the vertical bars might be missing
-         +---+
-
-      represents one byte; a box like this:
-
-         +==============+
-         |              |
-         +==============+
-
-      represents a variable number of bytes.
-
-      Bytes stored within a computer do not have a "bit order", since
-      they are always treated as a unit.  However, a byte considered as
-      an integer between 0 and 255 does have a most- and least-
-      significant bit, and since we write numbers with the most-
-      significant digit on the left, we also write bytes with the most-
-      significant bit on the left.  In the diagrams below, we number the
-      bits of a byte so that bit 0 is the least-significant bit, i.e.,
-      the bits are numbered:
-
-         +--------+
-         |76543210|
-         +--------+
-
-      This document does not address the issue of the order in which
-      bits of a byte are transmitted on a bit-sequential medium, since
-      the data format described here is byte- rather than bit-oriented.
-
-      Within a computer, a number may occupy multiple bytes.  All
-      multi-byte numbers in the format described here are stored with
-      the least-significant byte first (at the lower memory address).
-      For example, the decimal number 520 is stored as:
-
-             0        1
-         +--------+--------+
-         |00001000|00000010|
-         +--------+--------+
-          ^        ^
-          |        |
-          |        + more significant byte = 2 x 256
-          + less significant byte = 8
-
-
-
-Deutsch                      Informational                      [Page 4]
-
-RFC 1952             GZIP File Format Specification             May 1996
-
-
-   2.2. File format
-
-      A gzip file consists of a series of "members" (compressed data
-      sets).  The format of each member is specified in the following
-      section.  The members simply appear one after another in the file,
-      with no additional information before, between, or after them.
-
-   2.3. Member format
-
-      Each member has the following structure:
-
-         +---+---+---+---+---+---+---+---+---+---+
-         |ID1|ID2|CM |FLG|     MTIME     |XFL|OS | (more-->)
-         +---+---+---+---+---+---+---+---+---+---+
-
-      (if FLG.FEXTRA set)
-
-         +---+---+=================================+
-         | XLEN  |...XLEN bytes of "extra field"...| (more-->)
-         +---+---+=================================+
-
-      (if FLG.FNAME set)
-
-         +=========================================+
-         |...original file name, zero-terminated...| (more-->)
-         +=========================================+
-
-      (if FLG.FCOMMENT set)
-
-         +===================================+
-         |...file comment, zero-terminated...| (more-->)
-         +===================================+
-
-      (if FLG.FHCRC set)
-
-         +---+---+
-         | CRC16 |
-         +---+---+
-
-         +=======================+
-         |...compressed blocks...| (more-->)
-         +=======================+
-
-           0   1   2   3   4   5   6   7
-         +---+---+---+---+---+---+---+---+
-         |     CRC32     |     ISIZE     |
-         +---+---+---+---+---+---+---+---+
-
-
-
-
-Deutsch                      Informational                      [Page 5]
-
-RFC 1952             GZIP File Format Specification             May 1996
-
-
-      2.3.1. Member header and trailer
-
-         ID1 (IDentification 1)
-         ID2 (IDentification 2)
-            These have the fixed values ID1 = 31 (0x1f, \037), ID2 = 139
-            (0x8b, \213), to identify the file as being in gzip format.
-
-         CM (Compression Method)
-            This identifies the compression method used in the file.  CM
-            = 0-7 are reserved.  CM = 8 denotes the "deflate"
-            compression method, which is the one customarily used by
-            gzip and which is documented elsewhere.
-
-         FLG (FLaGs)
-            This flag byte is divided into individual bits as follows:
-
-               bit 0   FTEXT
-               bit 1   FHCRC
-               bit 2   FEXTRA
-               bit 3   FNAME
-               bit 4   FCOMMENT
-               bit 5   reserved
-               bit 6   reserved
-               bit 7   reserved
-
-            If FTEXT is set, the file is probably ASCII text.  This is
-            an optional indication, which the compressor may set by
-            checking a small amount of the input data to see whether any
-            non-ASCII characters are present.  In case of doubt, FTEXT
-            is cleared, indicating binary data. For systems which have
-            different file formats for ascii text and binary data, the
-            decompressor can use FTEXT to choose the appropriate format.
-            We deliberately do not specify the algorithm used to set
-            this bit, since a compressor always has the option of
-            leaving it cleared and a decompressor always has the option
-            of ignoring it and letting some other program handle issues
-            of data conversion.
-
-            If FHCRC is set, a CRC16 for the gzip header is present,
-            immediately before the compressed data. The CRC16 consists
-            of the two least significant bytes of the CRC32 for all
-            bytes of the gzip header up to and not including the CRC16.
-            [The FHCRC bit was never set by versions of gzip up to
-            1.2.4, even though it was documented with a different
-            meaning in gzip 1.2.4.]
-
-            If FEXTRA is set, optional extra fields are present, as
-            described in a following section.
-
-
-
-Deutsch                      Informational                      [Page 6]
-
-RFC 1952             GZIP File Format Specification             May 1996
-
-
-            If FNAME is set, an original file name is present,
-            terminated by a zero byte.  The name must consist of ISO
-            8859-1 (LATIN-1) characters; on operating systems using
-            EBCDIC or any other character set for file names, the name
-            must be translated to the ISO LATIN-1 character set.  This
-            is the original name of the file being compressed, with any
-            directory components removed, and, if the file being
-            compressed is on a file system with case insensitive names,
-            forced to lower case. There is no original file name if the
-            data was compressed from a source other than a named file;
-            for example, if the source was stdin on a Unix system, there
-            is no file name.
-
-            If FCOMMENT is set, a zero-terminated file comment is
-            present.  This comment is not interpreted; it is only
-            intended for human consumption.  The comment must consist of
-            ISO 8859-1 (LATIN-1) characters.  Line breaks should be
-            denoted by a single line feed character (10 decimal).
-
-            Reserved FLG bits must be zero.
-
-         MTIME (Modification TIME)
-            This gives the most recent modification time of the original
-            file being compressed.  The time is in Unix format, i.e.,
-            seconds since 00:00:00 GMT, Jan.  1, 1970.  (Note that this
-            may cause problems for MS-DOS and other systems that use
-            local rather than Universal time.)  If the compressed data
-            did not come from a file, MTIME is set to the time at which
-            compression started.  MTIME = 0 means no time stamp is
-            available.
-
-         XFL (eXtra FLags)
-            These flags are available for use by specific compression
-            methods.  The "deflate" method (CM = 8) sets these flags as
-            follows:
-
-               XFL = 2 - compressor used maximum compression,
-                         slowest algorithm
-               XFL = 4 - compressor used fastest algorithm
-
-         OS (Operating System)
-            This identifies the type of file system on which compression
-            took place.  This may be useful in determining end-of-line
-            convention for text files.  The currently defined values are
-            as follows:
-
-
-
-
-
-
-Deutsch                      Informational                      [Page 7]
-
-RFC 1952             GZIP File Format Specification             May 1996
-
-
-                 0 - FAT filesystem (MS-DOS, OS/2, NT/Win32)
-                 1 - Amiga
-                 2 - VMS (or OpenVMS)
-                 3 - Unix
-                 4 - VM/CMS
-                 5 - Atari TOS
-                 6 - HPFS filesystem (OS/2, NT)
-                 7 - Macintosh
-                 8 - Z-System
-                 9 - CP/M
-                10 - TOPS-20
-                11 - NTFS filesystem (NT)
-                12 - QDOS
-                13 - Acorn RISCOS
-               255 - unknown
-
-         XLEN (eXtra LENgth)
-            If FLG.FEXTRA is set, this gives the length of the optional
-            extra field.  See below for details.
-
-         CRC32 (CRC-32)
-            This contains a Cyclic Redundancy Check value of the
-            uncompressed data computed according to CRC-32 algorithm
-            used in the ISO 3309 standard and in section 8.1.1.6.2 of
-            ITU-T recommendation V.42.  (See http://www.iso.ch for
-            ordering ISO documents. See gopher://info.itu.ch for an
-            online version of ITU-T V.42.)
-
-         ISIZE (Input SIZE)
-            This contains the size of the original (uncompressed) input
-            data modulo 2^32.
-
-      2.3.1.1. Extra field
-
-         If the FLG.FEXTRA bit is set, an "extra field" is present in
-         the header, with total length XLEN bytes.  It consists of a
-         series of subfields, each of the form:
-
-            +---+---+---+---+==================================+
-            |SI1|SI2|  LEN  |... LEN bytes of subfield data ...|
-            +---+---+---+---+==================================+
-
-         SI1 and SI2 provide a subfield ID, typically two ASCII letters
-         with some mnemonic value.  Jean-Loup Gailly
-         <gzip@prep.ai.mit.edu> is maintaining a registry of subfield
-         IDs; please send him any subfield ID you wish to use.  Subfield
-         IDs with SI2 = 0 are reserved for future use.  The following
-         IDs are currently defined:
-
-
-
-Deutsch                      Informational                      [Page 8]
-
-RFC 1952             GZIP File Format Specification             May 1996
-
-
-            SI1         SI2         Data
-            ----------  ----------  ----
-            0x41 ('A')  0x70 ('P')  Apollo file type information
-
-         LEN gives the length of the subfield data, excluding the 4
-         initial bytes.
-
-      2.3.1.2. Compliance
-
-         A compliant compressor must produce files with correct ID1,
-         ID2, CM, CRC32, and ISIZE, but may set all the other fields in
-         the fixed-length part of the header to default values (255 for
-         OS, 0 for all others).  The compressor must set all reserved
-         bits to zero.
-
-         A compliant decompressor must check ID1, ID2, and CM, and
-         provide an error indication if any of these have incorrect
-         values.  It must examine FEXTRA/XLEN, FNAME, FCOMMENT and FHCRC
-         at least so it can skip over the optional fields if they are
-         present.  It need not examine any other part of the header or
-         trailer; in particular, a decompressor may ignore FTEXT and OS
-         and always produce binary output, and still be compliant.  A
-         compliant decompressor must give an error indication if any
-         reserved bit is non-zero, since such a bit could indicate the
-         presence of a new field that would cause subsequent data to be
-         interpreted incorrectly.
-
-3. References
-
-   [1] "Information Processing - 8-bit single-byte coded graphic
-       character sets - Part 1: Latin alphabet No.1" (ISO 8859-1:1987).
-       The ISO 8859-1 (Latin-1) character set is a superset of 7-bit
-       ASCII. Files defining this character set are available as
-       iso_8859-1.* in ftp://ftp.uu.net/graphics/png/documents/
-
-   [2] ISO 3309
-
-   [3] ITU-T recommendation V.42
-
-   [4] Deutsch, L.P.,"DEFLATE Compressed Data Format Specification",
-       available in ftp://ftp.uu.net/pub/archiving/zip/doc/
-
-   [5] Gailly, J.-L., GZIP documentation, available as gzip-*.tar in
-       ftp://prep.ai.mit.edu/pub/gnu/
-
-   [6] Sarwate, D.V., "Computation of Cyclic Redundancy Checks via Table
-       Look-Up", Communications of the ACM, 31(8), pp.1008-1013.
-
-
-
-
-Deutsch                      Informational                      [Page 9]
-
-RFC 1952             GZIP File Format Specification             May 1996
-
-
-   [7] Schwaderer, W.D., "CRC Calculation", April 85 PC Tech Journal,
-       pp.118-133.
-
-   [8] ftp://ftp.adelaide.edu.au/pub/rocksoft/papers/crc_v3.txt,
-       describing the CRC concept.
-
-4. Security Considerations
-
-   Any data compression method involves the reduction of redundancy in
-   the data.  Consequently, any corruption of the data is likely to have
-   severe effects and be difficult to correct.  Uncompressed text, on
-   the other hand, will probably still be readable despite the presence
-   of some corrupted bytes.
-
-   It is recommended that systems using this data format provide some
-   means of validating the integrity of the compressed data, such as by
-   setting and checking the CRC-32 check value.
-
-5. Acknowledgements
-
-   Trademarks cited in this document are the property of their
-   respective owners.
-
-   Jean-Loup Gailly designed the gzip format and wrote, with Mark Adler,
-   the related software described in this specification.  Glenn
-   Randers-Pehrson converted this document to RFC and HTML format.
-
-6. Author's Address
-
-   L. Peter Deutsch
-   Aladdin Enterprises
-   203 Santa Margarita Ave.
-   Menlo Park, CA 94025
-
-   Phone: (415) 322-0103 (AM only)
-   FAX:   (415) 322-1734
-   EMail: <ghost@aladdin.com>
-
-   Questions about the technical content of this specification can be
-   sent by email to:
-
-   Jean-Loup Gailly <gzip@prep.ai.mit.edu> and
-   Mark Adler <madler@alumni.caltech.edu>
-
-   Editorial comments on this specification can be sent by email to:
-
-   L. Peter Deutsch <ghost@aladdin.com> and
-   Glenn Randers-Pehrson <randeg@alumni.rpi.edu>
-
-
-
-Deutsch                      Informational                     [Page 10]
-
-RFC 1952             GZIP File Format Specification             May 1996
-
-
-7. Appendix: Jean-Loup Gailly's gzip utility
-
-   The most widely used implementation of gzip compression, and the
-   original documentation on which this specification is based, were
-   created by Jean-Loup Gailly <gzip@prep.ai.mit.edu>.  Since this
-   implementation is a de facto standard, we mention some more of its
-   features here.  Again, the material in this section is not part of
-   the specification per se, and implementations need not follow it to
-   be compliant.
-
-   When compressing or decompressing a file, gzip preserves the
-   protection, ownership, and modification time attributes on the local
-   file system, since there is no provision for representing protection
-   attributes in the gzip file format itself.  Since the file format
-   includes a modification time, the gzip decompressor provides a
-   command line switch that assigns the modification time from the file,
-   rather than the local modification time of the compressed input, to
-   the decompressed output.
-
-8. Appendix: Sample CRC Code
-
-   The following sample code represents a practical implementation of
-   the CRC (Cyclic Redundancy Check). (See also ISO 3309 and ITU-T V.42
-   for a formal specification.)
-
-   The sample code is in the ANSI C programming language. Non C users
-   may find it easier to read with these hints:
-
-      &      Bitwise AND operator.
-      ^      Bitwise exclusive-OR operator.
-      >>     Bitwise right shift operator. When applied to an
-             unsigned quantity, as here, right shift inserts zero
-             bit(s) at the left.
-      !      Logical NOT operator.
-      ++     "n++" increments the variable n.
-      0xNNN  0x introduces a hexadecimal (base 16) constant.
-             Suffix L indicates a long value (at least 32 bits).
-
-      /* Table of CRCs of all 8-bit messages. */
-      unsigned long crc_table[256];
-
-      /* Flag: has the table been computed? Initially false. */
-      int crc_table_computed = 0;
-
-      /* Make the table for a fast CRC. */
-      void make_crc_table(void)
-      {
-        unsigned long c;
-
-
-
-Deutsch                      Informational                     [Page 11]
-
-RFC 1952             GZIP File Format Specification             May 1996
-
-
-        int n, k;
-        for (n = 0; n < 256; n++) {
-          c = (unsigned long) n;
-          for (k = 0; k < 8; k++) {
-            if (c & 1) {
-              c = 0xedb88320L ^ (c >> 1);
-            } else {
-              c = c >> 1;
-            }
-          }
-          crc_table[n] = c;
-        }
-        crc_table_computed = 1;
-      }
-
-      /*
-         Update a running crc with the bytes buf[0..len-1] and return
-       the updated crc. The crc should be initialized to zero. Pre- and
-       post-conditioning (one's complement) is performed within this
-       function so it shouldn't be done by the caller. Usage example:
-
-         unsigned long crc = 0L;
-
-         while (read_buffer(buffer, length) != EOF) {
-           crc = update_crc(crc, buffer, length);
-         }
-         if (crc != original_crc) error();
-      */
-      unsigned long update_crc(unsigned long crc,
-                      unsigned char *buf, int len)
-      {
-        unsigned long c = crc ^ 0xffffffffL;
-        int n;
-
-        if (!crc_table_computed)
-          make_crc_table();
-        for (n = 0; n < len; n++) {
-          c = crc_table[(c ^ buf[n]) & 0xff] ^ (c >> 8);
-        }
-        return c ^ 0xffffffffL;
-      }
-
-      /* Return the CRC of the bytes buf[0..len-1]. */
-      unsigned long crc(unsigned char *buf, int len)
-      {
-        return update_crc(0L, buf, len);
-      }
-
-
-
-
-Deutsch                      Informational                     [Page 12]
-
diff --git a/doc/HELP.html b/doc/HELP.html
deleted file mode 100644
index 55ddc054a1..0000000000
--- a/doc/HELP.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<HTML>
-<HEAD><TITLE>RTEMS 4.0.0 On-Line Library</TITLE></HEAD>
-<BODY BGCOLOR="FFFFFF">
-<A HREF="http://www.oarcorp.com" target="Text Frame">
-  <IMG align=right BORDER=0 SRC="oaronly.jpg" ALT="OAR"> </A>
-<H1>RTEMS On-Line Library</H1>
-<HR>
-<BODY>
-The following supplement manuals do not currently exist:
-<MENU>
-	<LI>RTEMS AMD 29K Applications Supplement</LI>
-	<LI>RTEMS MIPS Applications Supplement</LI>
-	<LI>RTEMS Hitachi SH Applications Supplement</LI>
-	<LI>RTEMS UNIX Port Applications Supplement</LI>
-</MENU>
-If you have knowledge of the processors used in the above ports and
-want to contribute to RTEMS, please contact 
-<A HREF="mailto:rtems@OARcorp.com"><I>rtems@OARcorp.com</I></A>
-
-<HR>
-Copyright &copy; 1988-1998 <A HREF="http://www.oarcorp.com" target="Text Frame">OAR Corporation</A>
-</BODY></HTML>
diff --git a/doc/Make.config b/doc/Make.config
deleted file mode 100644
index 2b7cab80b8..0000000000
--- a/doc/Make.config
+++ /dev/null
@@ -1,65 +0,0 @@
-#
-#  Build information which may change
-#
-#  $Id$
-#
-
-RTEMS_VERSION=4.0.0
-DOC_INSTALL_BASE=/usr1/tmp/rtemsdoc-$(RTEMS_VERSION)
-
-SRCDIR=/usr1/rtems/rtemsdoc-work
-
-BMENU=$(SRCDIR)/tools/bmenu/bmenu
-PDL2TEXI=$(SRCDIR)/tools/pdl2texi/pdl2texi
-
-SRC2HTML=$(SRCDIR)/tools/src2html/src2html
-TEXI2DVI=$(SRCDIR)/tools/texi2www/texi2dvi
-TEXI2WWW=$(SRCDIR)/tools/texi2www/texi2www
-MAKEINFO=makeinfo
-INFO=info
-XDVI=xdvi -s 4
-GHOSTVIEW=ghostview -magstep -1
-
-# Account for tree organization which restricts visibility
-ifeq ($(DISTRIBUTION_LEVEL),public)
-RLEVEL=
-WWW_INSTALL=$(DOC_INSTALL_BASE)/html
-INFO_INSTALL=$(DOC_INSTALL_BASE)/info
-PS_INSTALL=$(DOC_INSTALL_BASE)/ps
-INDEX_FILE=../$(RLEVEL)index.html
-else
-RLEVEL=../
-WWW_INSTALL=$(DOC_INSTALL_BASE)/html/$(DISTRIBUTION_LEVEL)
-INFO_INSTALL=$(DOC_INSTALL_BASE)/info/$(DISTRIBUTION_LEVEL)
-PS_INSTALL=$(DOC_INSTALL_BASE)/ps/$(DISTRIBUTION_LEVEL)
-INDEX_FILE=../$(RLEVEL)rtems_full.html
-endif
-
-#TEXI2WWW_ARGS=-dirfile $(WWW_INSTALL)/index.html \
-#          -header $(WWW_INSTALL)/rtems_header.html \
-#          -footer $(WWW_INSTALL)/rtems_footer.html
-TEXI2WWW_ARGS=-dirfile $(INDEX_FILE) \
-          -header $(WWW_INSTALL)/$(RLEVEL)rtems_header.html \
-          -footer $(WWW_INSTALL)/$(RLEVEL)rtems_footer.html \
-          -icons  $(RLEVEL)..
-
-
-define make-dirs
-	@ if [ ! -d $(WWW_INSTALL) ] ; then \
-	    mkdir -p $(WWW_INSTALL); \
-	  fi
-	@ if [ ! -d $(INFO_INSTALL) ] ; then \
-	    mkdir -p $(INFO_INSTALL); \
-	  fi
-	@ if [ ! -d $(PS_INSTALL) ] ; then \
-	    mkdir -p $(PS_INSTALL); \
-	  fi
-	@ - cp $(SRCDIR)/oaronly.jpg $(WWW_INSTALL)
-	@ - sed -e 's/RTEMS_VERSION/$(RTEMS_VERSION)/' \
-	    <$(SRCDIR)/rtems_footer.html >$(DOC_INSTALL_BASE)/html/rtems_footer.html
-	@ - cp $(SRCDIR)/HELP.html $(DOC_INSTALL_BASE)/html
-	@ - cp $(SRCDIR)/common/*.gif $(DOC_INSTALL_BASE)/html
-	@ - cp $(SRCDIR)/tools/texi2www/*.gif $(DOC_INSTALL_BASE)/html
-	@ - cp $(SRCDIR)/common/*.jpg $(DOC_INSTALL_BASE)/html
-endef
-
diff --git a/doc/Makefile b/doc/Makefile
deleted file mode 100644
index 14e6b578b1..0000000000
--- a/doc/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-#  $Id$
-#
-
-include Make.config
-
-BASEDIR=$(shell pwd)
-
-all: env info html ps
-#	find $(WWW_INSTALL) -type f | xargs -e chmod 444
-#	find $(WWW_INSTALL) -type d | xargs -e chmod 555
-
-env: tools dirs headers
-
-dirs:
-	$(make-dirs)
-
-headers:
-	sed -e 's/RTEMS_VERSION/$(RTEMS_VERSION)/' \
-	    <$(SRCDIR)/index.html >$(WWW_INSTALL)/index.html
-	sed -e 's/RTEMS_VERSION/$(RTEMS_VERSION)/' \
-	    <$(SRCDIR)/rtems_support.html >$(WWW_INSTALL)/rtems_support.html
-	sed -e 's/RTEMS_VERSION/$(RTEMS_VERSION)/' \
-	    <$(SRCDIR)/rtems_header.html >$(WWW_INSTALL)/rtems_header.html
-	sed -e 's/RTEMS_VERSION/$(RTEMS_VERSION)/' \
-	    <$(SRCDIR)/rtems_footer.html >$(WWW_INSTALL)/rtems_footer.html
-
-info: env
-	./do_docs $(BASEDIR) info
-
-html: env
-	./do_docs $(BASEDIR) html
-
-ps: dirs env
-	./do_docs $(BASEDIR) ps
-
-clean:
-	./do_docs $(BASEDIR) clean
-	cd tools/bmenu ; gmake clean
-	cd tools/pdl2texi ; gmake clean
-	cd tools/src2html ; gmake clean
-
-
-.PHONY: tools
-
-tools:
-	cd tools/bmenu ; gmake 
-	cd tools/pdl2texi ; gmake 
-	cd tools/src2html ; gmake
diff --git a/doc/README b/doc/README
deleted file mode 100644
index 225dfa23b8..0000000000
--- a/doc/README
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-#  $Id$
-#
-
-Tools Required
-==============
-The following tools are used in the production of this documentation:
-
-TeX
-texinfo 3.7
-texi2www-960103
-
-This was used by the authors to generate the directory tree figure
-in the texinfo printed version:
-
-tree (from the CTAN Archives -- see http://jasper.ora.com/ctan.html)
-
-Installation
-============
-1.  Edit replace-word so it references perl in the correct location.
-
-2.  Edit Make.config and localize it.
-
-3.  Edit do_docs and fix basedir
-
-4.  Create the installation point for the html and info files.
-
-5.  Copy texi2www gif files into the main rtems html install directory.
-
-
-Use do_docs to:
-
-do_docs info
-do_docs html
-do_docs clean
-
diff --git a/doc/TODO b/doc/TODO
deleted file mode 100644
index 0aa41ce461..0000000000
--- a/doc/TODO
+++ /dev/null
@@ -1,77 +0,0 @@
-#
-#  $Id$
-#
-
-This is a collection of things which need to be done to the various 
-manuals.
-
-POSIX User Notes
-================
-
-Add pages for network services.
-
-Add timer() services if we have any.
-
-
-Development Environment Guide
-=============================
-Either rename to "A Tour of the RTEMS Source Tree" or include
-more information on the GNU tools.  
-
-The "C Suites" section is oddly named and the directory
-tree included is wrong in that make is no longer under
-the c directory.  I think the build-tools make have
-moved as well.
-
-All the paths should be provided as relative paths
-from the top of the RTEMS source tree.  It wastes
-valuable screen space to do otherwise.
-
-The last paragraph of "C Suites" is vague and could
-be written better.  It should include the subdirectory
-names as part of the textual description.
-
-
-Should this documentation even use the phrase "C Implementation"
-any longer?
-
-Directory names should be in @code -- not "quoted".
-
-In "Support Library Source Directory", look for "which installed"
-
-In the latter part of the "libbsp" paragraph in "Support
-Library Source Directory", there is reference to the 
-stubdr directory which is no longer there.
-
-Update this section to include discussion of the shared
-subdirectory and its relationship to the BSPs.  Write this
-in such a way that it can be passed on to Geoffroy Montel.
-
-Include a better discussion of the subdirectories
-under each BSP.  This can be a starting point for
-Geoffroy Montel.  The sample tests also deserve mention
-in a BSP development guide.
-
-In the section, "Test Suite Source Directory", there is a
-numeric count of the number of tests in each suite.  This
-should be eliminated for maintenance purposes.
-
-The psxtest directory is not mentioned.  Check that no others
-have been forgotten.
-
-There should probably be no reference to the Ada sample
-applications.  This document used to cover both implementations.
-This now seems inappropriate.
-
-The hello world sample test discussion mentions that it provides
-a rudiementary test of the BSP startup code and the "RTEMS
-C Library".  This should be rewritten to tell mroe about what
-this test shows (actually a lot).  It should mention that this
-test tries to avoid using interrupts.
-
-The ticker test should mention that in contrast to hello, it
-does use interrupts. :)  It can be used to tune the clock
-tick.
-
-The ticker test documentation says it calls "tm_get" -- jeez
-how old is this manual.
diff --git a/doc/ada_user/Makefile b/doc/ada_user/Makefile
deleted file mode 100644
index e2d6d39122..0000000000
--- a/doc/ada_user/Makefile
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-#  COPYRIGHT (c) 1988-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  All rights reserved.
-#
-#  $Id$
-#
-
-PROJECT=ada_user
-DISTRIBUTION_LEVEL=internal
-
-include ../Make.config
-
-all: html info ps
-
-COMMON_FILES=../common/cpright.texi ../user/bsp.texi ../user/clock.texi \
-  ../user/concepts.texi ../user/conf.texi ../user/dirstat.texi \
-  ../user/dpmem.texi ../user/event.texi \
-  ../user/fatal.texi ../user/glossary.texi ../user/init.texi \
-  ../user/intr.texi ../user/io.texi ../user/mp.texi ../user/msg.texi \
-  ../user/overview.texi ../user/part.texi ../user/preface.texi \
-  ../user/region.texi ../user/rtmon.texi ../user/schedule.texi \
-  ../user/sem.texi ../user/signal.texi ../user/task.texi \
-  ../user/timer.texi ../user/userext.texi 
-FILES= ada_user.texi example.texi $(COMMON_FILES)
-
-dirs:
-	$(make-dirs)
-
-INFOFILES=$(wildcard $(PROJECT) $(PROJECT)-*)
-
-info: dirs ada_user
-	cp $(shell ls -1 $(PROJECT) $(PROJECT)-* 2>/dev/null) $(INFO_INSTALL)
-
-ada_user: $(FILES)
-	$(MAKEINFO) $(PROJECT).texi
-
-dvi: $(PROJECT).dvi
-ps: dirs $(PROJECT).ps
-	
-$(PROJECT).ps: dirs $(PROJECT).dvi
-	dvips -o $(PROJECT).ps $(PROJECT).dvi
-	cp $(PROJECT).ps $(PS_INSTALL)
-
-$(PROJECT).dvi: $(FILES)
-	$(TEXI2DVI) $(PROJECT).texi
-
-html: dirs $(FILES)
-	-mkdir -p $(WWW_INSTALL)/ada_user
-	cp ../user/rtemsarc.gif ../user/rtemspie.gif ../user/states.gif \
-           $(WWW_INSTALL)/ada_user
-	$(TEXI2WWW) $(TEXI2WWW_ARGS) -dir $(WWW_INSTALL)/$(PROJECT) \
- 	    $(PROJECT).texi
-
-clean:
-	rm -f *.o $(PROG) *.txt core *.html 
-	rm -f *.dvi *.ps *.log *.aux *.cp *.fn *.ky *.pg *.toc *.tp *.vr $(BASE)
-	rm -f ada_user ada_user-* _*
-
diff --git a/doc/ada_user/ada_user.texi b/doc/ada_user/ada_user.texi
deleted file mode 100644
index 9be98cfbf4..0000000000
--- a/doc/ada_user/ada_user.texi
+++ /dev/null
@@ -1,169 +0,0 @@
-\input ../texinfo/texinfo   @c -*-texinfo-*-
-@c %**start of header
-@setfilename ada_user
-@syncodeindex vr fn
-@synindex ky cp
-@paragraphindent 0
-@c @smallbook
-@c %**end of header
-
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@c
-@c   Master file for the Ada User's Guide
-@c
-
-@c Joel's Questions
-@c
-@c  1.  Why does paragraphindent only impact makeinfo?
-@c  2.  Why does paragraphindent show up in HTML?
-@c
-
-@include ../common/setup.texi
-
-@ignore
-@ifinfo
-@format
-START-INFO-DIR-ENTRY
-* RTEMS Ada User: (ada_user).             The Ada User's Guide
-END-INFO-DIR-ENTRY
-@end format
-@end ifinfo
-@end ignore
-
-@c variable substitution info:
-@c
-@clear is-C
-@set is-Ada
-@set LANGUAGE Ada
-@set STRUCTURE record
-@set ROUTINE subprogram
-@set OR or
-@set RPREFIX RTEMS.
-@set DIRPREFIX rtems.
-@c the language is @value{LANGUAGE}
-@c NOTE:  don't use underscore in the name
-@c
-
-@c
-@c  Title Page Stuff
-@c
-
-@set edition @value{RTEMS-EDITION}
-@set version @value{RTEMS-VERSION}
-@set update-date @value{RTEMS-UPDATE-DATE}
-@set update-month @value{RTEMS-UPDATE-MONTH}
-
-@c
-@c  I don't really like having a short title page.  --joel
-@c
-@c @shorttitlepage RTEMS Applications Ada User's Guide
-
-@setchapternewpage odd
-@settitle RTEMS Ada User's Guide
-@titlepage
-@finalout
-
-@title RTEMS Applications Ada User's Guide
-@subtitle Edition @value{edition}, for RTEMS @value{version}
-@sp 1
-@subtitle @value{update-month}
-@author On-Line Applications Research Corporation
-@page
-@include ../common/cpright.texi
-@end titlepage
-
-@c  This prevents a black box from being printed on "overflow" lines.
-@c  The alternative is to rework a sentence to avoid this problem.
-
-@include ../user/preface.texi
-@include ../user/overview.texi
-@include ../user/concepts.texi
-@include ../user/init.texi
-@include ../user/task.texi
-@include ../user/intr.texi
-@include ../user/clock.texi
-@include ../user/timer.texi
-@include ../user/sem.texi
-@include ../user/msg.texi
-@include ../user/event.texi
-@include ../user/signal.texi
-@include ../user/part.texi
-@include ../user/region.texi
-@include ../user/dpmem.texi
-@include ../user/io.texi
-@include ../user/fatal.texi
-@include ../user/schedule.texi
-@include ../user/rtmon.texi
-@include ../user/bsp.texi
-@include ../user/userext.texi
-@include ../user/conf.texi
-@include ../user/mp.texi
-@include ../user/dirstat.texi
-@include example.texi
-@include ../user/glossary.texi
-@ifinfo
-@node Top, Preface, (dir), (dir)
-@top ada_user
-
-This is the online version of the RTEMS Ada User's Guide.
-
-@menu
-* Preface::
-* Overview::
-* Key Concepts::
-* Initialization Manager::
-* Task Manager::
-* Interrupt Manager::
-* Clock Manager::
-* Timer Manager::
-* Semaphore Manager::
-* Message Manager::
-* Event Manager::
-* Signal Manager::
-* Partition Manager::
-* Region Manager::
-* Dual-Ported Memory Manager::
-* I/O Manager::
-* Fatal Error Manager::
-* Scheduling Concepts::
-* Rate Monotonic Manager::
-* Board Support Packages::
-* User Extensions Manager::
-* Configuring a System::
-* Multiprocessing Manager::
-* Directive Status Codes::
-* Example Application::
-* Glossary::
-* Command and Variable Index::
-* Concept Index::
-@end menu
-
-@end ifinfo
-@c 
-@c 
-@c Need to copy the emacs stuff and "trailer stuff" (index, toc) into here
-@c
-
-@node Command and Variable Index, Concept Index, Glossary, Top
-@unnumbered Command and Variable Index
-
-There are currently no Command and Variable Index entries.
-
-@c @printindex fn
-
-@node Concept Index, , Command and Variable Index, Top
-@unnumbered Concept Index
-
-There are currently no Concept Index entries.
-@c @printindex cp
-
-@contents
-@bye
-
diff --git a/doc/ada_user/example.texi b/doc/ada_user/example.texi
deleted file mode 100644
index 46cc42e693..0000000000
--- a/doc/ada_user/example.texi
+++ /dev/null
@@ -1,21 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@ifinfo
-@node Example Application, Glossary, Directive Status Codes, Top
-@end ifinfo
-@chapter Example Application
-
-@example
-
-Currently there is no example Ada application provided.
-
-@end example
-
-
-
diff --git a/doc/archgrey.gif b/doc/archgrey.gif
deleted file mode 100644
index d315b028f2..0000000000
--- a/doc/archgrey.gif
+++ /dev/null
diff --git a/doc/bsp_howto/Makefile b/doc/bsp_howto/Makefile
deleted file mode 100644
index f61d8b5739..0000000000
--- a/doc/bsp_howto/Makefile
+++ /dev/null
@@ -1,137 +0,0 @@
-#
-#  COPYRIGHT (c) 1988-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  All rights reserved.
-#
-#  $Id$
-#
-
-PROJECT=bsp_howto
-DISTRIBUTION_LEVEL=public
-
-include ../Make.config
-
-all: html info ps
-
-dirs:
-	$(make-dirs)
-
-COMMON_FILES=../common/cpright.texi ../common/setup.texi
-
-GENERATED_FILES= \
-    intro.texi target.texi makefiles.texi linkcmds.texi support.texi \
-    init.texi console.texi clock.texi timer.texi rtc.texi nvmem.texi \
-    network.texi shmsupp.texi analog.texi discrete.texi
-
-FILES=$(PROJECT).texi $(GENERATED_FILES)
-
-INFOFILES=$(wildcard $(PROJECT) $(PROJECT)-*)
-
-info: dirs $(PROJECT)
-	#cp $(wildcard $(PROJECT) $(PROJECT)-*) $(INFO_INSTALL)
-	# cp $(PROJECT) $(INFO_INSTALL)
-
-$(PROJECT): $(FILES)
-	$(MAKEINFO) $(PROJECT).texi
-
-dvi: $(PROJECT).dvi
-ps: dirs $(PROJECT).ps
-	
-$(PROJECT).ps: $(PROJECT).dvi
-	dvips -o $(PROJECT).ps $(PROJECT).dvi
-	# cp $(PROJECT).ps $(PS_INSTALL)
-
-# run texi2dvi twice to generate the xref's properly.
-$(PROJECT).dvi: $(FILES)
-	$(TEXI2DVI) $(PROJECT).texi
-	$(TEXI2DVI) $(PROJECT).texi
-
-html: dirs $(FILES)
-	-mkdir -p $(WWW_INSTALL)/$(PROJECT)
-	$(TEXI2WWW) $(TEXI2WWW_ARGS) -dir $(WWW_INSTALL)/$(PROJECT) \
- 	    $(PROJECT).texi
-
-clean:
-	rm -f *.o $(PROG) *.txt core 
-	rm -f *.dvi *.ps *.log *.aux *.cp *.fn *.ky *.pg *.toc *.tp *.vr $(BASE)
-	rm -f $(PROJECT) $(PROJECT)-* $(GENERATED_FILES)
-	rm -f *.fixed _*
-
-#
-#  Process Automatically Generated Files
-#
-
-intro.texi: intro.t Makefile
-	$(BMENU) -p "Top" \
-	    -u "Top" \
-	    -n "Target Dependent Files" ${*}.t
-
-target.texi: target.t Makefile
-	$(BMENU) -p "Introduction" \
-	    -u "Top" \
-	    -n "Makefiles" ${*}.t
-
-makefiles.texi: makefiles.t Makefile
-	$(BMENU) -p "Target Dependent Files Board Support Package Structure" \
-	    -u "Top" \
-	    -n "Linker Script" ${*}.t
-
-linkcmds.texi: linkcmds.t Makefile
-	$(BMENU) -p "Makefiles Creating a New BSP Make Customization File" \
-	    -u "Top" \
-	    -n "Required Support Routines" ${*}.t
-
-support.texi: support.t Makefile
-	$(BMENU) -p "Linker Script Initialized Data" \
-	    -u "Top" \
-	    -n "" ${*}.t
-
-init.texi: init.t Makefile
-	$(BMENU) -p "" \
-	    -u "Top" \
-	    -n "" ${*}.t
-
-console.texi: console.t Makefile
-	$(BMENU) -p "" \
-	    -u "Top" \
-	    -n "" ${*}.t
-
-clock.texi: clock.t Makefile
-	$(BMENU) -p "" \
-	    -u "Top" \
-	    -n "" ${*}.t
-
-timer.texi: timer.t Makefile
-	$(BMENU) -p "" \
-	    -u "Top" \
-	    -n "" ${*}.t
-
-rtc.texi: rtc.t Makefile
-	$(BMENU) -p "" \
-	    -u "Top" \
-	    -n "" ${*}.t
-
-nvmem.texi: nvmem.t Makefile
-	$(BMENU) -p "" \
-	    -u "Top" \
-	    -n "" ${*}.t
-
-network.texi: network.t Makefile
-	$(BMENU) -p "" \
-	    -u "Top" \
-	    -n "" ${*}.t
-
-shmsupp.texi: shmsupp.t Makefile
-	$(BMENU) -p "" \
-	    -u "Top" \
-	    -n "" ${*}.t
-
-analog.texi: analog.t Makefile
-	$(BMENU) -p "" \
-	    -u "Top" \
-	    -n "" ${*}.t
-
-discrete.texi: discrete.t Makefile
-	$(BMENU) -p "" \
-	    -u "Top" \
-	    -n "" ${*}.t
diff --git a/doc/bsp_howto/analog.t b/doc/bsp_howto/analog.t
deleted file mode 100644
index 8c402ad5c9..0000000000
--- a/doc/bsp_howto/analog.t
+++ /dev/null
@@ -1,12 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Analog Driver
-
-XXX FILL ME IN
-
diff --git a/doc/bsp_howto/bsp_howto.texi b/doc/bsp_howto/bsp_howto.texi
deleted file mode 100644
index bf9dc23960..0000000000
--- a/doc/bsp_howto/bsp_howto.texi
+++ /dev/null
@@ -1,128 +0,0 @@
-\input ../texinfo/texinfo   @c -*-texinfo-*-
-@c %**start of header
-@setfilename bsp_howto
-@syncodeindex vr fn
-@synindex ky cp
-@paragraphindent 0
-@c @smallbook
-@c %**end of header
-
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@c
-@c   Master file for the Getting Started (C) Guide
-@c
-
-@include ../common/setup.texi
-
-@ignore
-@ifinfo
-@format
-START-INFO-DIR-ENTRY
-* BSP and Device Driver Development Guide (bsp_howto):
-END-INFO-DIR-ENTRY
-@end format
-@end ifinfo
-@end ignore
-
-@c
-@c  Title Page Stuff
-@c
-
-@set edition @value{RTEMS-EDITION}
-@set version @value{RTEMS-VERSION}
-@set update-date @value{RTEMS-UPDATE-DATE}
-@set update-month @value{RTEMS-UPDATE-MONTH}
-
-@c
-@c  I don't really like having a short title page.  --joel
-@c
-@c @shorttitlepage BSP and Device Driver Development Guide
-
-@setchapternewpage odd
-@settitle BSP and Device Driver Development Guide
-@titlepage
-@finalout
-
-@title BSP and Device Driver Development Guide
-@subtitle Edition @value{edition}, for @value{version}
-@sp 1
-@subtitle @value{update-month}
-@author On-Line Applications Research Corporation
-@page
-@include ../common/cpright.texi
-@end titlepage
-
-@c  This prevents a black box from being printed on "overflow" lines.
-@c  The alternative is to rework a sentence to avoid this problem.
-
-@include intro.texi
-@include target.texi
-@include makefiles.texi
-@include linkcmds.texi
-@include support.texi
-@include init.texi
-@include console.texi
-@include clock.texi
-@include timer.texi
-@include rtc.texi
-@include nvmem.texi
-@include network.texi
-@include shmsupp.texi
-@include analog.texi
-@include discrete.texi
-
-@ifinfo
-@node Top, Introduction, (dir), (dir)
-@top bsp_howto
-
-This is the online version of the Getting Started with RTEMS for C/C++ Users.
-
-@menu
-* Introduction::
-* Target Dependent Files::
-* Makefiles::
-* Linker Script::
-* Required Support Routines::
-* Initialization Code::
-* Console Driver::
-* Clock Driver::
-* Timer Driver::
-* Real-Time Clock Driver::
-* Networking Driver::
-* Non-Volatile Memory Driver::
-* Shared Memory Support Driver::
-* Analog Driver::
-* Discrete Driver::
-@end menu
-
-@c * Command and Variable Index::
-@c * Concept Index::
-@end ifinfo
-@c 
-@c 
-@c Need to copy the emacs stuff and "trailer stuff" (index, toc) into here
-@c
-
-@c @node Command and Variable Index, Concept Index, Installing EGCS AND NEWLIB, Top
-@c @unnumbered Command and Variable Index
-
-@c There are currently no Command and Variable Index entries.
-
-@c @printindex fn
-
-@c @node Concept Index, , Command and Variable Index, Top
-@c @unnumbered Concept Index
-
-@c There are currently no Concept Index entries.
-@c @printindex cp
-
-@contents
-@bye
-
diff --git a/doc/bsp_howto/clock.t b/doc/bsp_howto/clock.t
deleted file mode 100644
index 918f6331b2..0000000000
--- a/doc/bsp_howto/clock.t
+++ /dev/null
@@ -1,46 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Clock Driver
-
-@section Introduction
-
-The clock driver aims at giving a steady time basis to the kernel, so that
-the RTEMS primitives that need a clock tick work properly. <insert a link
-to the Clock Driver defs>
-
-The clock driver is located in the clock directory of the BSP. 
-
-@section Primitives
-
-@subsection Initialization
-
-The major and minor numbers of the clock driver can be made available to
-the others, such as the Shared Memory Driver. 
-
-Then you have to program your integrated processor periodic interval timer
-so that an interrupt is generated every m microseconds, where m =
-BSP_Configuration.microseconds_per_tick. Sometimes the periodic interval
-timer can use a prescaler so you have to look carefully at your user's
-manual to determine the correct value. 
-
-You must use the RTEMS primitive to put your clock interrupt routine in
-the VBR: 
-
-@example
-rtems_interrupt_catch (InterruptHandler, CONSOLE_VECTOR, &old_handler); 
-@end example
-
-@subsection The Clock Interrupt Subroutine
-
-It only has to inform the kernel that a ticker has elapsed, so call : 
-
-@example
-rtems_clock_tick(); 
-@end example
-
diff --git a/doc/bsp_howto/console.t b/doc/bsp_howto/console.t
deleted file mode 100644
index 09d8b25640..0000000000
--- a/doc/bsp_howto/console.t
+++ /dev/null
@@ -1,269 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Console Driver
-
-@section Introduction
-
-This chapter describes how to do a console driver using RTEMS Termios
-support. 
-
-The serial driver is called as soon as printf/scanf or read/write kind of
-input/output are needed. There are two main functioning modes: 
-
-@itemize @bullet
-
-@item console: formatted input/output, with special characters (end of
-line, tabulations, etc...) recognition and processing,
-
-@item raw: permits raw data processing. 
-
-@end itemize
-
-We may think that one need two serial drivers to deal with those two types
-of data, but Termios permits having only one driver. 
-
-@section Termios
-
-Termios is a standard for terminal management, included in several Unix
-versions. Termios is good because: 
-
-@itemize @bullet
-
-@item from the user's side: primitives to access the terminal and change
-configuration settings are the same under Unix and Rtems. 
-
-@item from the BSP developer's side: it frees you from dealing with buffer
-states and mutual exclusions on them. 
-
-@end itemize
-
-Termios support includes: 
-
-@itemize @bullet
-
-@item raw and console handling,
-
-@item blocking or non-blocking characters receive, with or without
-Timeout. 
-
-@end itemize
-
-For more information on Termios, type man termios in your Unix box or go
-to http://www.freebsd.org/cgi/man.cgi. 
-
-@section Driver Functioning Modes
-
-There are generally two main functioning modes for an UART (Universal
-Asynchronous Receiver-Transmitter, i.e. the serial chip): 
-
-@itemize @bullet
-
-@item polling mode: the processor blocks on sending/receiving characters.
-This mode is not powerful, but is necessary when one wants to print an
-error message when the board hung. This is also the most simple mode to
-program,
-
-@item interrupt mode: the processor doesn't block on sending/receiving
-characters. Two buffers (one for the in-going characters, the others for
-the characters to be sent) are used. An interrupt is raised as soon as a
-character is in the UART. Then the int errupt subroutine insert the
-character at the input buffer queue. When a character is asked for input,
-this at the head of the buffer is returned. When characters have to be
-sent, one have to put the first characters (the number depends on the
-UART) in th e UART. Then an interrupt is raised when all the characters
-have been emitted. The interrupt subroutine has to send the characters
-remaining in the output buffer the same way. 
-
-@end itemize
-
-@section Serial Driver Functioning Overview
-
-Figure 5 is an attempt of showing how a Termios driven serial driver works : 
-
-@itemize @bullet
-
-@item the application programmer uses standard C library call (printf,
-scanf, read, write, etc.),
-
-@item C library (in fact that's Cygnus Newlib) calls RTEMS procedure: glue
-is made in newlib*.c files which can be found under
-$RTEMS_ROOT/c/src/lib/libc directory,
-
-@item Glue code calls your serial driver entry routines. 
-
-@end itemize
-
-@subsection Termios and Polled I/O
-
-You have to point Termios out which functions are used for simple
-character input/output: 
-
-
-Function
-
-Description
-
-@example
-int pollWrite (int minor, const char *buf, int len) 
-
-for (i=0; i<len; i++) @{
-     put buf[i] into the UART channel minor
-     wait for the character to be transmitted
-     on the serial line
-@}
-int pollread(int minor)
-@end example
-
-wait for a character to be available in the UART channel minor, then return it.
-
-@subsection Termios and Interrupt Driven I/O
-
-The UART generally generates interrupts when it is ready to accept or to
-emit a number of characters. In this mode, the interrupt subroutine is the
-core of the driver: 
-
-@example
-rtems_isr InterruptHandler (rtems_vector_number v)
-@end example
-
-check whether there was an error
-
-if some characters were received: 
-   ask Termios to put them on his input buffer
-
-if some characters have been transmitted (i.e. the UART output buffer is empty)
-   tell TERMIOS that the characters have been
-   transmitted. The TERMIOS routine will call
-   the InterruptWrite function with the number
-   of characters not transmitted yet if it is
-   not zero.
-
-@example
-static int InterruptWrite(int minor, const char *buf, int len)
-@end example
-
-you have to put the n first buf characters in the UART channel minor
-buffer (n is the UART channel size, n=1 on the MC68640). Generally, an
-interrupt is raised after these n characters being transmitted. So you may
-have to enable the UART interrupts after having put the characters in the
-UART. 
-
-
-Figure 5: general TERMIOS driven serial driver functioning
-
-@subsection Initialization
-
-The driver initialization is called once during RTEMS initialization
-process. 
-
-The console_initialize function has to : 
-
-@itemize @bullet
-
-@item initialize Termios support: call rtems_termios_initialize(),
-
-@item initialize your integrated processor's UART: the operation is
-normally described in your user's manual and you must follow these
-instructions but it usually consists in: 
-
-@item reinitialize the UART channels,
-
-@item set the channels configuration to Termios default one, i.e.: 9600
-bauds, no parity, 1 stop bit, 8 bits per character,
-
-@item register your console interrupt routine to RTEMS: 
-
-@example
-	rtems_interrupt_catch (InterruptHandler,CONSOLE_VECTOR,&old_handler);
-@end example
-
-@item enable the UART channels,
-
-@item register your device name: in order to use the console (i.e. being
-able to do printf/scanf on stdin, stdout, and stderr), you have to
-register the "/dev/console" device: 
-
-@example
-rtems_io_register_name ("dev/console", major, i);
-@end example
-
-@end itemize
-
-@subsection Opening a serial device
-
-The console device is opened during RTEMS initialization but the
-console_open function is called when a new device is opened. For instance,
-if you register the "/dev/tty1" device for the UART channel 2, the
-console_open will be called with a fopen("/dev/t ty", mode) in your
-application. 
-
-The console_open function has to inform Termios of your low-level function
-for serial line support; the "callbacks". 
-
-The gen68340 BSP defines two kinds of callbacks: 
-
-@itemize @bullet
-
-@item functions to use with polled input/output,
-
-@item functions to use with interrupt input/output. 
-
-@end itemize
-
-@subsubsection Polled I/O
-
-You have to point Termios out which functions are used for simple
-character input/output, i.e. pointers to pollWrite and pollRead functions
-defined in 8.4.1. 
-
-@subsubsection Interrupt Driven I/O
-
-Driver functioning is quite different in this mode. You can see there's no
-read function passed to Termios. Indeed a console_read call returns the
-content of Termios input buffer. This buffer is filled in the driver
-interrupt subroutine (cf. 8.4.2). 
-
-But you actually have to provide a pointer to the InterruptWrite function. 
-
-@subsection Closing a serial device
-
-The driver entry point is: console_close. 
-
-You just have to notify Termios that the serial device was closed, with a
-call to rtems_termios_close. 
-
-@subsection Reading characters from the serial device
-
-The driver entry point is: console_read. 
-
-You just have to return the content of the Termios input buffer. 
-
-Call rtems_termios_read. 
-
-@subsection Writing characters to the serial device
-
-The driver entry point is: console_write. 
-
-You just have to add the characters at the end of the Termios output
-buffer. 
-
-Call rtems_termios_write. 
-
-@subsection Changing serial line parameters
-
-The driver entry point is: console_control. 
-
-The application write is able to control the serial line configuration
-with Termios calls (such as the ioctl command, see Termios man page for
-more details). If you want to support dynamic configuration, you have to
-write the console_control piece of code . Look at the gen68340 BSP for an
-example of how it is done. Basically ioctl commands call console_control
-with the serial line configuration in a Termios structure. You just have
-to reinitialize the UART with the correct settings. 
-
diff --git a/doc/bsp_howto/discrete.t b/doc/bsp_howto/discrete.t
deleted file mode 100644
index c40bf8284a..0000000000
--- a/doc/bsp_howto/discrete.t
+++ /dev/null
@@ -1,12 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Discrete Driver
-
-XXX FILL ME IN
-
diff --git a/doc/bsp_howto/init.t b/doc/bsp_howto/init.t
deleted file mode 100644
index 669d5f9d3b..0000000000
--- a/doc/bsp_howto/init.t
+++ /dev/null
@@ -1,364 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Initialization Code
-
-@section Introduction
-
-The initialization code is the first piece of code executed when there's a
-reset/reboot. Its purpose is to initialize the board for the application.
-This chapter contains a narrative description of the initialization
-process followed by a description of each of the files and routines
-commonly found in the BSP related to initialization.  The remainder of
-this chapter covers special issues which require attention such
-as interrupt vector table and chip select initialization.
-
-Most of the examples in this chapter will be based on the gen68340 BSP
-initialization code.  Like most BSPs, the initialization for this 
-BSP is divided into two subdirectories under the BSP source directory.
-The gen68340 BSP source code in the following directory:
-
-@example
-c/src/lib/libbsp/m68k/gen68340: 
-@end example
-
-@itemize @bullet
-
-@item @code{start340}: assembly language code which contains early
-initialization routines
-
-@item @code{startup}: C code with higher level routines (RTEMS
-initialization related) 
-
-@end itemize
-
-@b{NOTE:} The directory @code{start340} is simply named @code{start} or 
-start followed by a BSP designation.
-
-In the @code{start340} directory are two source files.  The file
-@code{startfor340only.s} is the simpler of these files as it only has 
-initialization code for a MC68340 board.  The file @code{start340.s}
-contains initialization for a 68349 based board as well.
-
-@section Board Initialization
-
-This section describes the steps an application goes through from the
-time the first BSP code is executed until the first application task
-executes.  The routines invoked during this will be discussed and
-their location in the RTEMS source tree pointed out.
-
-@subsection Start Code - Assembly Language Initialization
-
-The assembly language code in the directory @code{start} is
-the first part of the application to execute.  It is 
-responsible for initializing the processor and board enough to execute
-the rest of the BSP.  This includes:
-
-@itemize @bullet
-@item initializing the stack
-@item zeroing out the uninitialized data section @code{.bss}
-@item disabling external interrupts
-@item copy the initialized data from ROM to RAM
-@end itemize
-
-The general rule of thumb is that the
-start code in assembly should do the minimum necessary to allow C code
-to execute to complete the initialization sequence.  
-
-The initial assembly language start code completes its execution by
-invoking the shared routine @code{boot_card()}.
-
-@subsection boot_card() - Boot the Card
-
-The @code{boot_card()} is the first C code invoked.  Most of the BSPs
-use the sams shared version of @code{boot_card()} which is located in
-the following file:
-
-@example
-c/src/lib/libbsp/shared/main.c
-@end example
-
-The @code{boot_card()} routine performs the following functions:
-
-@itemize @bullet
-
-@item initializes the shared fields of the CPU Configuration Table
-(variable name @code{Cpu_table}) to a default state,
-
-@item copies the application's RTEMS Configuration Table
-(variable name @code{Configuration}) to the BSP's Configuration
-Table (variable name @code{BSP_Configuration}) so it can be modified
-as necessary without copying the original table,
-
-@item invokes the BSP specific routine @code{bsp_start()},
-
-@item invokes the RTEMS directive @code{rtems_initialize_executive_early()}
-to initialize the executive, C Library, and all device drivers but
-return without initiating multitasking or enabling interrupts,
-
-@item invokes the shared @code{main()} in the same file as
-@code{boot_card()} which does not return until the
-@code{rtems_shutdown_executive} directive is called, and
-
-@item invokes the BSP specific routine @code{bsp_cleanup()} to perform
-any necessary board specific shutdown actions.
-
-@end itemize
-
-It is important to note that the executive and much of the
-support environment must be initialized before invoking @code{main()}.
-
-@subsection bsp_start() - BSP Specific Initialization
-
-This is the first BSP specific C routine to execute during system
-initialization.  This routine often performs required fundamental
-hardware initialization such as setting bus controller registers
-that do not have a direct impact on whether or not C code can execute.
-The source code for this routine is usually found in the following
-file:
-
-@example
-c/src/lib/libbsp/CPU/BSP/startup/bspstart.c
-@end example
-
-This routine is also responsible for overriding the default settings
-in the CPU Configuration Table and setting port specific entries
-in this table.  This routine will typically install routines
-for one or more of the following initialization hooks:
-
-@itemize @bullet
-@item BSP Pretasking Hook
-@item BSP Predriver Hook
-@item BSP Postdriver Hook
-@end itemize
-
-One of the most important functions performed by this routine
-is determining where the RTEMS Executive Work Space is to be
-located in memory.  All RTEMS objects and task stacks will be
-allocated from this Workspace.  The RTEMS Workspace is distinct
-from the application heap used for @code{malloc()}.
-
-Many BSPs place this area at the end of RAM although this is
-certainly not a requirement.
-
-After completing execution, this routine returns to the
-@code{boot_card()} routine.
-
-@subsection main() - C Main
-
-This routine is the C main entry point.  This is a special routine 
-and the GNU Compiler Suite treats it as such.  The GNU C Compiler
-recognizes @code{main()} and automatically inserts a call to the
-compiler run-time support routine @code{__main()} as the first
-code executed in @code{main()}.
-
-The routine @code{__main()} initializes the compiler's basic run-time
-support library and, most importantly, invokes the C++ global 
-constructors.  
-
-The precise placement of when @code{main()} is invoked in the 
-RTEMS initialization sequence insures that C Library and non-blocking
-calls can be made in global C++ constructors.
-
-The shared implementation of this routine is located in the following file:
-
-@example
-c/src/lib/libbsp/shared/main.c
-@end example
-
-In addition to the implicit invocation of @code{__main}, this 
-routine performs some explitit initialization.  This routine 
-sets the variable @code{rtems_progname} and initiates 
-multitasking via a call to the RTEMS directive
-@code{rtems_initialize_executive_late}.  It is important to note
-that the executive does not return to this routine until the
-RTEMS directive @code{rtems_shutdown_executive} is invoked.
-
-@subsection RTEMS Pretasking Callback
-
-The @code{pretasking_hook} entry in the RTEMS CPU Configuration
-Table may be the address of a user provided routine that is
-invoked once RTEMS initialization is complete but before interrupts
-and tasking are enabled.  No tasks -- not even the IDLE task -- have
-been created when this hook is invoked.  The pretasking hook is optional.
-
-Although optional, most of the RTEMS BSPs provide a pretasking hook
-callback.  This routine is usually called @code{bsp_pretasking_hook}
-and is found in the file:
-
-@example
-c/src/lib/libbsp/CPU/BSP/startup/bspstart.c
-@end example
-
-The @code{bsp_pretasking_hook()} routine is the appropriate place to
-initialize any support components which depend on the RTEMS APIs.
-Most BSPs initialize the RTEMS C Library support in their
-implementation of @code{bsp_pretasking_hook()}.  This initialization
-includes the application heap as well as the reentrancy support
-for the C Library.
-
-@subsection RTEMS Predriver Callback
-
-XXX is the address of the user provided
-routine which is invoked with tasking enabled immediately before
-the MPCI and device drivers are initialized. RTEMS
-initialization is complete, interrupts and tasking are enabled,
-but no device drivers are initialized.  This field may be NULL to
-indicate that the hook is not utilized.
-
-@subsection Device Driver Initialization
-
-At this point in the initialization sequence, the initialization 
-routines for all of the device drivers specified in the Device
-Driver Table are invoked.
-
-@subsection RTEMS Postdriver Callback
-
-XXX is the address of the user provided
-routine which is invoked with tasking enabled immediately after
-the MPCI and device drivers are initialized. RTEMS
-initialization is complete, interrupts and tasking are enabled,
-and the device drivers are initialized.  This field may be NULL
-to indicate that the hook is not utilized.
-
-
-@section The Interrupts Vector Table
-
-
-
-After the entry label starts a code section in which some room is
-allocated for the table of interrupts vectors. They are assigned to the
-address of the __uhoh label. 
-
-At __uhoh label you can find the default interrupt handler routine. This
-routine is only called when an unexpected interrupts is raised. You can
-add your own routine there (in that case there's a call to a routine -
-$BSP_ROOT/startup/dumpanic.c - that pri nts which address caused the
-interrupt and the contents of the registers, stack...), but this should
-not return. 
-
-@section Chip Select Initialization
-
-When the microprocessor accesses a memory area, address decoding is
-handled by an address decoder (!), so that the microprocessor knows which
-memory chip to access. 
-
-Figure 4 : address decoding
-
-You have to program your Chip Select registers in order that they match
-the linkcmds settings. In this BSP ROM and RAM addresses can be found in
-both the linkcmds and initialization code, but this is not a great way to
-do, better use some shared variables . 
-
-@section Integrated processor registers initialization
-
-There are always some specific integrated processor registers
-initialization to do. Integrated processors' user manuals often detail
-them. 
-
-@section Data section recopy
-
-The next initialization part can be found in
-$BSP340_ROOT/start340/init68340.c. First the Interrupt Vector Table is
-copied into RAM, then the data section recopy is initiated
-(_CopyDataClearBSSAndStart in $BSP340_ROOT/start340/startfor340only.s). 
-
-This code performs the following actions:
-
-@itemize @bullet
-
-@item copies the .data section from ROM to its location reserved in RAM
-(see 5.2 for more details about this copy),
-
-@item clear .bss section (all the non-initialized data will take value 0). 
-
-@end itemize
-
-Then control is passed to the RTEMS-specific initialization code. 
-
-@section RTEMS-Specific Initialization
-
-@section The RTEMS configuration table
-
-The RTEMS configuration table contains the maximum number of objects RTEMS
-can handle during the application (e.g. maximum number of tasks,
-semaphores, etc.). It's used to allocate the size for the RTEMS inner data
-structures. 
-
-The RTEMS configuration table is application dependant, which means that
-one has to provide one per application. It's usually an header file
-included in the main module of the application. 
-
-The BSP_Configuration label points on this table. 
-
-For more information on the RTEMS configuration table, refer to C user's
-guide, chapter 23 <insert a link here>. 
-
-@section RTEMS initialization procedure
-
-The RTEMS initialization procedure is described in the 3rd chapter of the
-C user's manual <insert a link here>. Please read it carefully. 
-
-There are a few BSP specific functions called from the initialization
-manager. They can be found in the startup directory of the BSP. 
-
-@table @b
-
-@item bspstart.c
-
-It starts the application.  It includes application, board, and monitor
-specific initialization and configuration. 
-
-@item bspstart.c
-
-@table @b
-@item bsp_pretasking_hook
-
-It starts libc support (needed to allocate some memory using C primitive
-malloc for example). Heap size must be passed in argument, this is the one
-which is defined in the linkcmds (cf. 5.) 
-
-
-@end table
-
-@item bspclean.c
-
-@table @b
-
-@item bsp_cleanup
-
-Return control to the monitor. 
-
-@end table
-
-@end table
-
-@section Drivers initialization
-
-The Driver Address Table is part of the RTEMS configuration table. It
-defines RTEMS drivers entry points (initialization, open, close, read,
-write, and control). For more information about this table, check C User's
-manual chapter 21 section 6 <insert a l ink here>. 
-
-The RTEMS initialization procedure calls the initialization function for
-every driver defined in the RTEMS Configuration Table (this permits to add
-only the drivers needed by the application). 
-
-All these primitives have a major and a minor number as arguments: 
-
-@itemize @bullet
-
-@item the major number refers to the driver type,
-
-@item the minor number is used to control two peripherals with the same
-driver (for instance, we define only one major number for the serial
-driver, but two minor numbers for channel A and B if there are two
-channels in the UART). 
-
-@end itemize
-
diff --git a/doc/bsp_howto/intro.t b/doc/bsp_howto/intro.t
deleted file mode 100644
index a7ab4a0a10..0000000000
--- a/doc/bsp_howto/intro.t
+++ /dev/null
@@ -1,57 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Introduction
-
-Before reading this documentation, it is strongly advised to read the
-RTEMS Development Environment Guide to get acquainted with the RTEMS
-directory structure.  This document describes how to do a RTEMS Board
-Support Package, i.e. how to port RTEMS on a new target board. Discussions
-are provided for the following topics:
-
-@itemize @bullet
-
-@item RTEMS Board Support Package Organization
-
-@item Makefiles and the Linker Command Script
-
-@item Board Initialization Sequence
-
-@item Device Drivers Including:
-
-@itemize @bullet
-
-@item Console Driver
-
-@item Clock Driver
-
-@item Timer Driver
-
-@item Real-Time Clock Driver
-
-@item Non-Volatile Memory Driver
-
-@item Networking Driver
-
-@item Shared Memory Support Driver
-
-@item Analog Driver
-
-@item Discrete Driver
-
-@end itemize
-
-@end itemize
-
-The original version of this manual was written by Geoffroy Montel
-<g_montel@@yahoo.com>.  When he started development of the gen68340
-BSP, this manual did not exist.  He wrote the initial version of
-this manual as the result of his experiences.  At that time, this
-document was viewed internally as the most important "missing manual"
-in the RTEMS documentation set.
-
diff --git a/doc/bsp_howto/linkcmds.t b/doc/bsp_howto/linkcmds.t
deleted file mode 100644
index 3bfb28b4be..0000000000
--- a/doc/bsp_howto/linkcmds.t
+++ /dev/null
@@ -1,422 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Linker Script
-
-@section What is a "linkcmds" file?
-
-The @code{linkcmds} file is a script which is passed to the linker at linking
-time.  This file describes the memory configuration of the board as needed
-to link the program.  Specifically it specifies where the code and data
-for the application will reside in memory.
-
-@section Program Sections
-
-An embedded systems programmer must be much more aware of the
-placement of their executable image in memory than the average
-"normal" programmer.  A program destined to be embedded as well
-as the target system have some specific properties that must be
-taken into account. Embedded machines often mean average performances
-and small memory usage.  It is the memory usage that concerns us
-when examining the linker command file.
-
-Two types of memories have to be distinguished:
-
-@itemize @bullet
-@item RAM - volatile offering read and write access
-@item ROM - non-volatile but read only
-@end itemize
-
-Even though RAM and ROM can be found in every personal computer,
-one generally doesn't care about them.  In a personal computer,
-a program is nearly always stored on disk and executed in RAM.  Things
-are a bit different for embedded targets: the target will execute the
-program each time it is rebooted or switched on.   The application
-program is stored in non-volatile memory such as ROM, PROM, EEPROM,
-or Flash. On the other hand, data processing occurs in RAM. 
-
-This leads us to the structure of an embedded program.  In rough terms,
-an embedded program is made of sections.  It is the responsibility of
-the application programmer to place these sections in the appropriate
-place in target memory.  To make this clearer, if using COFF on the
-Motorola m68k family of microprocessors, the following sections will
-be present:
-
-@itemize @bullet
-
-@item @b{code (@code{.text}) section}: 
-is the program's code and it should not be modified.
-This section may be placed in ROM. 
-
-@item @b{non-initialized data (@code{.bss}) section}: 
-holds uninitialized variables of the program. It can stay in RAM. 
-
-@item @b{initialized data (@code{.data}) section}:
-holds the initialized program data which may be modified during the
-program's life.  This means they have to be in RAM.
-On the other hand, these variables must be set to predefined values, and
-those predefined values have to be stored in ROM.
-
-@end itemize
-
-@b{NOTE:} Many programs and support libraries unknowingly assume that the
-@code{.bss} section and, possibly, the application heap are initialized
-to zero at program start.  This is not required by the ISO/ANSI C Standard
-but is such a common requirement that most BSPs do this.
-
-That brings us up to the notion of the image of an executable: it consists
-of the set of the sections that together constitute the application. 
-
-@section Image of an Executable
-
-As a program executable has many sections (note that the user can define
-their own, and that compilers define theirs without any notice), one has to
-specify the placement of each section as well as the type of memory
-(RAM or ROM) the sections will be placed into.
-For instance, a program compiled for a Personal Computer will see all the
-sections to go to RAM, while a program destined to be embedded will see
-some of his sections going into the ROM. 
-
-The connection between a section and where that section is loaded into
-memory is made at link time.  One has to let the linker know where
-the different sections are to be placed once they are in memory. 
-
-The following example shows a simple layout of program sections.  With
-some object formats, there are many more sections but the basic 
-layout is conceptually similar.
-
-@example
-@group
-          +-----------------+
-          |     .text       |  RAM or ROM
-          +-----------------+
-          |     .data       |  RAM
-          +-----------------+
-          |     .bss        |  RAM
-          +-----------------+
-@end group
-@end example
-
-@section Example Linker Command Script 
-
-The GNU linker has a command language to specify the image format.  This
-command language can be quite complicated but most of what is required
-can be learned by careful examination of a well-documented example.
-The following is a heavily commented version of the linker script 
-used with the the @code{gen68340} BSP  This file can be found at
-$BSP340_ROOT/startup/linkcmds. 
-
-@example
-/*
- *  Specify that the output is to be coff-m68k regardless of what the
- *  native object format is.
- */
-
-OUTPUT_FORMAT(coff-m68k) 
-
-/*
- *  Set the amount of RAM on the target board.
- *
- *  NOTE: The default may be overridden by passing an argument to ld.
- */
-
-RamSize = DEFINED(RamSize) ? RamSize : 4M;
-
-/*
- *  Set the amount of RAM to be used for the application heap.  Objects
- *  allocated using malloc() come from this area.  Having a tight heap size
- *  is somewhat difficult and multiple attempts to squeeze it may be needed
- *  reducing memory usage is important.  If all objects are allocated from
- *  the heap at system initialization time, this eases the sizing of the
- *  application heap.  
- *
- *  NOTE 1: The default may be overridden by passing an argument to ld.
- *
- *  NOTE 2: The TCP/IP stack requires additional memory in the Heap.
- *  
- *  NOTE 3: The GNAT/RTEMS run-time requires additional memory in the Heap.
- */
-
-HeapSize = DEFINED(HeapSize) ? HeapSize : 0x10000;
-
-/*
- *  Set the size of the starting stack used during BSP initialization
- *  until first task switch.  After that point, task stacks allocated
- *  by RTEMS are used.
- *
- *  NOTE: The default may be overridden by passing an argument to ld.
- */
-
-StackSize = DEFINED(StackSize) ? StackSize : 0x1000;
-
-/*
- *  Starting addresses and length of RAM and ROM.
- *
- *  The addresses must be valid addresses on the board.  The Chip Selects
- *  should be initialized such that the code addresses are valid.
- */
-
-MEMORY @{
-    ram : ORIGIN = 0x10000000, LENGTH = 4M
-    rom : ORIGIN = 0x01000000, LENGTH = 4M
-@}
-
-/*
- *  This is for the network driver.  See the Networking documentation
- *  for more details.
- */
-
-ETHERNET_ADDRESS = DEFINED(ETHERNET_ADDRESS) ? ETHERNET_ADDRESS : 0xDEAD12;
-
-/*
- *  The following defines the order in which the sections should go.
- *  It also defines a number of variables which can be used by the
- *  application program.
- *
- *  NOTE: Each variable appears with 1 or 2 leading underscores to insure
- *        that the variable is accessible from C code with a single
- *        underscore.  Some object formats automatically add a leading
- *        underscore to all C global symbols.
- */
-
-SECTIONS @{
-
-  /*
-   *  Make the RomBase variable available to the application.
-   */
-
-  _RamSize = RamSize;
-  __RamSize = RamSize;
-
-  /*
-   *  Boot PROM  - Set the RomBase variable to the start of the ROM.
-   */
-
-  rom : @{
-    _RomBase = .;
-    __RomBase = .;
-  @} >rom
-
-  /*
-   * Dynamic RAM - set the RamBase variable to the start of the RAM.
-   */
-
-  ram : @{
-    _RamBase = .;
-    __RamBase = .;
-  @} >ram
-
-  /*
-   *  Text (code) goes into ROM
-   */
-
-  .text : @{
-    /*
-     *  Create a symbol for each object (.o).
-     */
-
-    CREATE_OBJECT_SYMBOLS
-
-    /*
-     *  Put all the object files code sections here.
-     */
-
-    *(.text)
-
-    . = ALIGN (16);      /*  go to a 16-byte boundary */
-
-    /*
-     *  C++ constructors and destructors
-     *
-     *  NOTE:  See the CROSSGCC mailing-list FAQ for
-     *         more details about the "[......]".
-     */
-
-    __CTOR_LIST__ = .;
-   [......]
-    __DTOR_END__ = .;
-
-    /*
-     *  Declares where the .text section ends.
-     */
-
-    etext = .;
-    _etext = .;
-  @} >rom 
-
-  /*
-   *  Exception Handler Frame section
-   */
-
-  .eh_fram : @{
-    . = ALIGN (16);
-    *(.eh_fram)
-  @} >ram
-
-  /*
-   *  GCC Exception section
-   */
-
-  .gcc_exc : @{
-    . = ALIGN (16);
-    *(.gcc_exc)
-  @} >ram
-
-  /*
-   *  Special variable to let application get to the dual-ported
-   *  memory.
-   */
-
-  dpram : @{
-    m340 = .;
-    _m340 = .;
-    . += (8 * 1024);
-  @} >ram
-
-  /*
-   *  Initialized Data section goes in RAM
-   */
-
-  .data : @{
-    copy_start = .;
-    *(.data)
-
-    . = ALIGN (16);
-    _edata = .;
-    copy_end = .;
-  @} >ram
-
-  /*
-   *  Uninitialized Data section goes in ROM
-   */
-
-  .bss : @{
-    /*
-     *  M68K specific: Reserve some room for the Vector Table 
-     *  (256 vectors of 4 bytes).
-     */
-
-    M68Kvec = .;
-    _M68Kvec = .;
-    . += (256 * 4);
-
-    /*
-     *  Start of memory to zero out at initialization time.
-     */
-
-    clear_start = .;
-
-    /*
-     *  Put all the object files uninitialized data sections
-     *  here.
-     */
-
-    *(.bss)
-
-    *(COMMON)
-
-    . = ALIGN (16);
-    _end = .;
-
-    /*
-     *  Start of the Application Heap
-     */
-
-    _HeapStart = .;
-    __HeapStart = .;
-    . += HeapSize;  
-
-    /*
-     *  The Starting Stack goes after the Application Heap.
-     *  M68K stack grows down so start at high address.
-     */
-
-    . += StackSize;
-    . = ALIGN (16);
-    stack_init = .;
-
-    clear_end = .;
-
-    /*
-     *  The RTEMS Executive Workspace goes here.  RTEMS
-     *  allocates tasks, stacks, semaphores, etc. from this
-     *  memory.
-     */
-
-    _WorkspaceBase = .;
-    __WorkspaceBase = .;
-  @} >ram
-@}
-@end example
-
-@section Initialized Data
-
-Now there's a problem with the initialized data: the @code{.data} section
-has to be in RAM as this data may be modified during the program execution.
-But how will the values be initialized at boot time?
-
-One approach is to place the entire program image in RAM and reload 
-the image in its entirety each time the program is run.  This is fine
-for use in a debug environment where a high-speed connection is available
-between the development host computer and the target.  But even in this
-environment, it is cumbersome.
-
-The solution is to place a copy of the initialized data in a separate 
-area of memory and copy it into the proper location each time the
-program is started.  It is common practice to place a copy of the initialized
-@code{.data} section at the end of the code (@code{.text}) section
-in ROM when building a PROM image. The GNU tool @code{objcopy}
-can be used for this purpose. 
-
-The following figure illustrates the steps a linked program goes through
-to become a downloadable image.
-
-@example
-@group
-+--------------+     +--------------------+
-| .data    RAM |     | .data          RAM |
-+--------------+     +--------------------+
-| .bss     RAM |     | .bss           RAM |
-+--------------+     +--------------------+         +----------------+ 
-| .text    ROM |     | .text          ROM |         |     .text      |
-+--------------+     +--------------------+         +----------------+ 
-                     | copy of .data  ROM |         | copy of .data  |
-                     +--------------------+         +----------------+ 
-
-      Step 1                Step 2                       Step 3
-@end group
-@end example
-
-In Step 1, the program is linked together using the BSP linker script.
-
-In Step 2, a copy is made of the @code{.data} section and placed
-after the @code{.text} section so it can be placed in PROM.  This step
-is done after the linking time.  There is an example
-of doing this in the file $RTEMS_ROOT/make/custom/gen68340.cfg: 
-
-@example
-# make a PROM image using objcopy
-m68k-rtems-objcopy \
---adjust-section-vma .data= \
-
-`m68k-rtems-objdump --section-headers \
-$(basename $@@).exe \
-| awk '[...]` \
-$(basename $@@).exe
-@end example
-
-NOTE: The address of the "copy of @code{.data} section" is
-created by extracting the last address in the @code{.text}
-section with an @code{awk} script.  The details of how
-this is done are not relevant.
-
-Step 3 shows the final executable image as it logically appears in
-the target's non-volatile program memory.  The board initialization
-code will copy the initialized data initial values (which are stored in
-ROM) to their reserved location in RAM. 
-
diff --git a/doc/bsp_howto/makefiles.t b/doc/bsp_howto/makefiles.t
deleted file mode 100644
index cf815f10a1..0000000000
--- a/doc/bsp_howto/makefiles.t
+++ /dev/null
@@ -1,208 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Makefiles
-
-@section Makefiles Used During The BSP Building Process
-
-There is a file named @code{Makefile.in} in each directory of a BSP.
-RTEMS uses the @b{GNU autoconf} automatic configuration package. 
-This tool specializes the @code{Makefile.in} files at the time that RTEMS
-is configured for a specific development host and target.  Makefiles
-are automatically generated from the @code{Makefile.in} files.  It is
-necessary for the BSP developer to provide these files.  Most of the
-time, it is possible to copy the @code{Makefile.in} from another
-similar directory and edit it.
-
-The @code{Makefile} files generated are processed when building
-RTEMS for a given BSP.
-
-The BSP developer is responsible for generating @code{Makefile.in} 
-files which properly build all the files associated with their BSP.
-There are generally three types of Makefiles in a BSP source tree:
-
-
-@itemize @bullet
-@item Directory Makefiles
-@item Source Directory Makefiles
-@item Wrapup Makefile
-@end itemize
-
-@subsection Directory Makefiles
-
-The Directory class of Makefiles directs the build process through
-a set of subdirectories in a particular order.  This order is usually
-chosen to insure that build dependencies are properly processed. 
-Most BSPs only have one Directory class Makefile.  The @code{Makefile.in}
-in the BSP root directory (@code{c/src/lib/libbsp/CPU/BSP}) specifies
-which directories are to be built for this BSP. For example, the
-following Makefile fragment shows how a BSP would only build the
-networking device driver if HAS_NETWORKING was defined:
-
-@example
-NETWORKING_DRIVER_yes_V = network
-NETWORKING_DRIVER = $(NETWORKING_DRIVER_$(HAS_NETWORKING)_V) 
-
-[...]
-
-SUB_DIRS=include start340 startup clock console timer \
-    $(NETWORKING_DRIVER) wrapup
-@end example
-
-This fragment states that all the directories have to be processed,
-except for the @code{network} directory which is included only if the
-user configured networking.
-
-@subsection Source Directory Makefiles
-
-There is a @code{Makefile.in} in most of the directories in a BSP. This
-class of Makefile lists the files to be built as part of the driver.
-When adding new files to an existing directory, Do not forget to add
-the new files to the list of files to be built in the @code{Makefile.in}.
-
-@b{NOTE:} The @code{Makefile.in} files are ONLY processed during the configure
-process of a RTEMS build. Therefore, when developing 
-a BSP and adding a new file to a @code{Makefile.in}, the 
-already generated @code{Makefile} will not include the new references.
-This results in the new file not being be taken into account! 
-The @code{configure} script must be run again or the @code{Makefile}
-(the result of the configure process) modified by hand.  This file will
-be in a directory such as the following:
-
-@example
-MY_BUILD_DIR/c/src/lib/libbsp/CPU/BSP/DRIVER
-@end example
-
-@subsection Wrapup Makefile
-
-This class of Makefiles produces a library.  The BSP wrapup Makefile
-is responsible for producing the library @code{libbsp.a} which is later
-merged into the @code{librtemsall.a} library.  This Makefile specifies
-which BSP components are to be placed into the library as well as which
-components from the CPU dependent support code library.  For example,
-this component may choose to use a default exception handler from the
-CPU dependent support code or provide its own.
-
-This Makefile makes use of a neat construct in @b{GNU make} to pick 
-up the required components:
-
-@example
-BSP_PIECES=startup clock console timer
-CPU_PIECES=
-GENERIC_PIECES=
-
-# bummer; have to use $foreach since % pattern subst rules only replace 1x
-OBJS=$(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/$(piece).rel) \
-   $(foreach piece, $(CPU_PIECES), \
-       ../../../../libcpu/$(RTEMS_CPU)/$(piece)/$(ARCH)/$(piece).rel) \
-   $(wildcard \
-  ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/fpsp/$(ARCH)/fpsp.rel) \
-   $(foreach piece, $(GENERIC_PIECES), ../../../$(piece)/$(ARCH)/$(piece).rel)
-@end example
-
-The variable @code{OBJS} is the list of "pieces" expanded to include
-path information to the appropriate object files.  The @code{wildcard}
-function is used on pieces of @code{libbsp.a} which are optional and
-may not be present based upon the configuration options.
-
-@section Makefiles Used Both During The BSP Design and its Use
-
-When building a BSP or an application using that BSP, it is necessary
-to tailor the compilation arguments to account for compiler flags, use
-custom linker scripts, include the RTEMS libraries, etc..  The BSP
-must be built using this information.  Later, once the BSP is installed
-with the toolset, this same information must be used when building the
-application.  So a BSP must include a build configuration file.  The
-configuration file is @code{make/custom/BSP.cfg}.
-
-The configuration file is taken into account when building one's
-application using the RTEMS template Makefiles (@code{make/templates}). 
-It is strongly advised to use these template Makefiles since they 
-encapsulate a number of build rules along with the compile and link
-time options necessary to execute on the target board.
-
-There is a template Makefile provided for each of class of RTEMS
-Makefiles.  The purpose of each class of RTEMS Makefile is to:
-
-@itemize @bullet
-@item call recursively the makefiles in the directories beneath
-the current one,
-
-@item build a library, or
-
-@item build an executable.
-
-@end itemize
-
-The following is a shortened and heavily commented version of the
-make customization file for the gen68340 BSP.  The original source
-for this file can be found in the @code{make/custom} directory.
-
-@example
-
-# The RTEMS CPU Family and Model
-RTEMS_CPU=m68k
-RTEMS_CPU_MODEL=mcpu32
-
-include $(RTEMS_ROOT)/make/custom/default.cfg
-
-# The name of the BSP directory used for the actual source code.
-# This allows for build variants of the same BSP source.
-RTEMS_BSP_FAMILY=gen68340
-
-# CPU flag to pass to GCC
-CPU_CFLAGS = -mcpu32
-
-# optimization flag to pass to GCC
-CFLAGS_OPTIMIZE_V=-O4 -fomit-frame-pointer
-
-# The name of the start file to be linked with.  This file is the first
-# part of the BSP which executes.
-START_BASE=start340
-
-[...]
-
-# This make-exe macro is used in template makefiles to build the
-# final executable. Any other commands to follow, just as using
-# objcopy to build a PROM image or converting the executable to binary. 
-
-ifeq ($(RTEMS_USE_GCC272),yes)
-# This has rules to link an application if an older version of GCC is 
-# to be used with this BSP.  It is not required for a BSP to support
-# older versions of GCC.  This option is supported in some of the
-# BSPs which already had this support.
-[...]
-else
-# This has rules to link an application using gcc 2.8 or newer or any
-# egcs version.  All BSPs should support this.  This version is required
-# to support GNAT/RTEMS.
-define make-exe
-	$(CC) $(CFLAGS) $(CFLAGS_LD) -o $(basename $@@).exe $(LINK_OBJS)
-	$(NM) -g -n $(basename $@@).exe > $(basename $@@).num
-	$(SIZE) $(basename $@@).exe
-endif
-@end example
-
-@subsection Creating a New BSP Make Customization File
-
-The basic steps for creating a @code{make/custom} file for a new BSP
-are as follows:
-
-@itemize @bullet
-
-@item copy any @code{.cfg} file to @code{BSP.cfg}
-
-@item modify RTEMS_CPU, RTEMS_CPU_MODEL, RTEMS_BSP_FAMILY,
-RTEMS_BSP, CPU_CFLAGS, START_BASE, and make-exe rules.
-
-@end itemize
-
-It is generally easier to copy a @code{make/custom} file from a
-BSP similar to the one being developed.
-
-
diff --git a/doc/bsp_howto/network.t b/doc/bsp_howto/network.t
deleted file mode 100644
index 2721898ab1..0000000000
--- a/doc/bsp_howto/network.t
+++ /dev/null
@@ -1,12 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Networking Driver
-
-XXX FILL ME IN
-
diff --git a/doc/bsp_howto/nvmem.t b/doc/bsp_howto/nvmem.t
deleted file mode 100644
index 070621ddca..0000000000
--- a/doc/bsp_howto/nvmem.t
+++ /dev/null
@@ -1,12 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Non-Volatile Memory Driver
-
-XXX FILL ME IN
-
diff --git a/doc/bsp_howto/rtc.t b/doc/bsp_howto/rtc.t
deleted file mode 100644
index f0e3bccabb..0000000000
--- a/doc/bsp_howto/rtc.t
+++ /dev/null
@@ -1,12 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Real-Time Clock Driver
-
-XXX FILL ME IN
-
diff --git a/doc/bsp_howto/shmsupp.t b/doc/bsp_howto/shmsupp.t
deleted file mode 100644
index 96e0f31ab2..0000000000
--- a/doc/bsp_howto/shmsupp.t
+++ /dev/null
@@ -1,12 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Shared Memory Support Driver
-
-XXX FILL ME IN
-
diff --git a/doc/bsp_howto/support.t b/doc/bsp_howto/support.t
deleted file mode 100644
index 59f0054d7c..0000000000
--- a/doc/bsp_howto/support.t
+++ /dev/null
@@ -1,12 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Required Support Routines
-
-XXX FILL ME IN
-
diff --git a/doc/bsp_howto/target.t b/doc/bsp_howto/target.t
deleted file mode 100644
index a14f7d6a49..0000000000
--- a/doc/bsp_howto/target.t
+++ /dev/null
@@ -1,218 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Target Dependent Files
-
-RTEMS has a multi-layered approach to portability.  This is done to
-maximize the amount of software that can be reused.  Much of the
-RTEMS source code can be reused on all RTEMS platforms.  Other parts
-of the executive are specific to hardware in some sense.
-RTEMS classifies target dependent code based upon its dependencies
-into one of the following categories.
-
-@itemize @bullet
-@item CPU dependent
-@item Board dependent
-@item Peripheral dependent
-@end itemize
-
-@section CPU Dependent
-
-This class of code includes the foundation
-routines for the executive proper such as the context switch and
-the interrupt subroutine implementations.  Sources for the supported
-processor families can be found in @code{c/src/exec/score/cpu}.
-A good starting point for a new family of processors is the
-@code{no_cpu} directory, which holds both prototypes and
-descriptions of each needed CPU dependent function. 
-
-CPU dependent code is further subcategorized if the implementation is
-dependent on a particular CPU model.  For example, the MC68000 and MC68020
-processors are both members of the m68k CPU family but there are significant
-differents between these CPU models which RTEMS must take into account.
-
-@section Board Dependent
-
-This class of code provides the most specific glue between RTEMS and
-a particular board.  This code is represented by the Board Support Packages
-and associated Device Drivers.  Sources for the BSPs included in the
-RTEMS distribution are located in the directory @code{c/src/lib/libbsp}.
-The BSP source directory is further subdivided based on the CPU family
-and BSP.
-
-Some BSPs may support multiple board models within a single board family.
-This is necessary when the board supports multiple variants on a 
-single base board.  For example, the Motorola MVME162 board family has a
-fairly large number of variations based upon the particular CPU model
-and the peripherals actually placed on the board.
-
-@section Peripheral Dependent
-
-This class of code provides a reusable library of peripheral device
-drivers which can be tailored easily to a particular board.  This
-reusable library provides software objects which correspond to standard
-controllers.  Just as the hardware engineer choose a standard controller
-when designing a board, the goal of this library is to let the software
-engineer do the same thing.
-
-The source code for the reusable peripheral driver library may be found
-in the directory @code{c/src/lib/libchip}.  The source code is further
-divided based upon the class of hardware.  Example classes include serial
-communications controllers, real-time clocks, non-volatile memory, and
-network controllers.
-
-@section Questions to Ask
-
-When evaluating what is required to support RTEMS applications on
-a particular target board, the following questions should be asked:
-
-@itemize @bullet
-
-@item Does a BSP for this board exist?
-
-@item Does a BSP for a similar board exists?
-
-@item Is the board's CPU supported?
-
-@end itemize
-
-If there is already a BSP for the board, then things may already be ready
-to start developing application software.  All that remains is to verify
-that the existing BSP provides device drivers for all the peripherals
-on the board that the application will be using.  For example, the application
-in question may require that the board's Ethernet controller be used and
-the existing BSP may not support this.
-
-If the BSP does not exist and the board's CPU model is supported, then
-examine the reusable chip library and existing BSPs for a close match.  
-This will help reduce the development effort required.  It is often
-possible to copy existing components in the reusable chip library or
-device drivers from BSPs from different CPU families as the starting
-point for a new device driver. 
-
-If the board's CPU family is supported but the particular CPU model on
-that board is not, then the RTEMS port to that CPU family will have to
-be augmented.  After this is done, development of the new BSP can proceed.
-
-Otherwise both CPU dependent code and the BSP will have to be written.
-
-Regardless of the amount of development required, OAR Corporation
-offers custom development services to assist RTEMS users.
-For more information on custom development, training courses, and
-support, contact OAR Corporation at
-@ifset use-html
-@href{http://www.oarcorp.com,,,http://www.oarcorp.com}.
-@end ifset
-@ifclear use-html
-http://www.oarcorp.com.
-@end ifclear
-
-
-@section CPU Dependent Executive Files
-
-The CPU dependent files in the RTEMS executive source code are found
-in the following directory:
-
-@example
-c/src/exec/score/cpu/@i{CPU}
-@end example
-
-where @i{CPU} is replaced with the CPU family name.
-
-Within each CPU dependent directory inside the executive proper is a 
-file named @code{@i{CPU}.h} which contains information about each of the
-supported CPU models within that family.
-
-@section CPU Dependent Support Files
-
-The CPU dependent support files contain routines which aid in the development
-of applications using that CPU family.  For example, the support routines
-may contain standard trap handlers for alignment or floating point exceptions
-or device drivers for peripheral controllers found on the CPU itself.
-This class of code may be found in the following directory:
-
-@example
-c/src/lib/libcpu/@i{CPU}
-@end example
-
-CPU model dependent support code is found in the following directory:
-
-@example
-c/src/lib/libcpu/@i{CPU}/@i{CPU_MODEL}
-@end example
-
-@section Board Support Package Structure
-
-The BSPs are all under the c/src/lib/libbsp directory.  Below this
-directory, there is a subdirectory for each CPU family.  Each BSP
-is found under the subdirectory for the appropriate processor
-family (m68k, powerpc, etc.).  In addition, there is source code
-available which may be shared across all BSPs regardless of
-the CPU family or just across BSPs within a single CPU family.  This
-results in a BSP using the following directories:
-
-@example
-c/src/lib/libbsp/shared
-c/src/lib/libbsp/@i{CPU}/shared
-c/src/lib/libbsp/@i{CPU}/@i{BSP}
-@end example
-
-Under each BSP specific directory, there is a collection of
-subdirectories.  For commonly provided functionality, the BSPs
-follow a convention on subdirectory naming.  The following list
-describes the commonly found subdirectories under each BSP.
-
-@itemize @bullet
-
-@item @b{console}:
-is technically the serial driver for the BSP rather
-than just a console driver, it deals with the board
-UARTs (i.e. serial devices).
-
-@item @b{clock}:
-support for the clock tick -- a regular time basis to the kernel.
-
-@item @b{timer}:
-support of timer devices.
-
-@item @b{rtc}:
-support for the hardware real-time clock.
-
-@item @b{nvmem}:
-support for non-volatile memory such as EEPROM or Flash.
-
-@item @b{network}:
-the Ethernet driver.
-
-@item @b{shmsupp}:
-support of shared memory driver MPCI layer in a multiprocessor system,
-
-@item @b{include}:
-include files for this BSP.
-
-@item @b{wrapup}:
-bundles all the components necessary to construct the BSP library.
-
-@end itemize
-
-The build order of the BSP is determined by the Makefile structure.
-This structure is discussed in more detail in the @ref{Makefiles}
-chapter.
-
-@b{NOTE:} This manual refers to the gen68340 BSP for numerous concrete
-examples.  You should have a copy of the gen68340 BSP available while
-reading this piece of documentation.   This BSP is located in the
-following directory:
-
-@example
-c/src/lib/libbsp/m68k/gen68340
-@end example
-
-Later in this document, the $BSP340_ROOT label will be used
-to refer to this directory.
-
diff --git a/doc/bsp_howto/timer.t b/doc/bsp_howto/timer.t
deleted file mode 100644
index d2d5629682..0000000000
--- a/doc/bsp_howto/timer.t
+++ /dev/null
@@ -1,74 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Timer Driver
-
-You can program the timer driver for your own needs, but here are two uses
-of it: 
-
-@section UART'S FIFO Full Mode
-
-The gen68340 BSP is an example of the use of the timer to support the UART
-input FIFO full mode (FIFO means First In First Out and roughly means
-buffer). This mode consists in the UART raising an interrupt when n
-characters have been received (n is the UA RT's FIFO length). It results
-in a lower interrupt processing time, but the problem is that a scanf
-primitive will block on a receipt of less than n characters. The solution
-is to set a timer that will check whether there are some characters
-waiting in th e UART's input FIFO. The delay time has to be set carefully
-otherwise high rates will be broken: 
-
-@itemize @bullet
-
-@item if no character was received last time the interrupt subroutine was
-entered, set a long delay,
-
-@item otherwise set the delay to the delay needed for n characters
-receipt. 
-
-@end itemize
-
-@section Measuring RTEMS Primitives Time
-
-RTEMS Timing Test Suite needs a timer support. You have to provide two
-primitives: 
-
-
-
-Function
-
-Description
-
-@example
-void Timer_initialize (void)
-@end example
-
-Initialize the timer to be a counter to the microsecond.
-
-@example
-int Read_timer (void)
-@end example
-
-Returns the number of microseconds elapsed since the last call to
-Timer_initialize. 
-
-@example
-rtems_status_code Empty_function (void)
-
-return RTEMS_SUCCESSFUL;
-@end example
-
-@example
-void Set_find_average_overhead (rtems_boolean find_flag)
-@end example
-
-DOES NOTHING ??????????
-
-		
-
-
diff --git a/doc/common/cpright.texi b/doc/common/cpright.texi
deleted file mode 100644
index 12b698ee7b..0000000000
--- a/doc/common/cpright.texi
+++ /dev/null
@@ -1,45 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@c
-@c  The following puts a space somewhere on an otherwise empty page so we
-@c  can force the copyright description onto a left hand page.
-@c
-
-@tex
-{\parskip=0pt \hfill On-Line Applications Research Corporation\par \hfill
-\TeX{}info \texinfoversion\par }
-@end tex
-
-@vskip 0pt plus 1filll
-COPYRIGHT @copyright{} 1988 - 1998.@*
-On-Line Applications Research Corporation (OAR).@*
-
-The authors have used their best efforts in preparing
-this material.  These efforts include the development, research,
-and testing of the theories and programs to determine their
-effectiveness.  No warranty of any kind, expressed or implied,
-with regard to the software or the material contained in this
-document is provided.  No liability arising out of the
-application or use of any product described in this document is
-assumed.  The authors reserve the right to revise this material
-and to make changes from time to time in the content hereof
-without obligation to notify anyone of such revision or changes.
-
-Any inquiries concerning RTEMS, its related support
-components, or its documentation should be directed to either:
-
-@example
-On-Line Applications Research Corporation
-4910-L Corporate Drive
-Huntsville, AL 35805
-VOICE: (256) 722-9985
-FAX:   (256) 722-0985
-EMAIL: rtems@@OARcorp.com
-@end example
-
diff --git a/doc/common/oaronly.jpg b/doc/common/oaronly.jpg
deleted file mode 100644
index c87c151404..0000000000
--- a/doc/common/oaronly.jpg
+++ /dev/null
diff --git a/doc/common/setup.texi b/doc/common/setup.texi
deleted file mode 100644
index 8578a86ece..0000000000
--- a/doc/common/setup.texi
+++ /dev/null
@@ -1,75 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@c
-@c  Set Variables
-@c
-
-@set RTEMS-RELEASE 4.0.0
-@set RTEMS-EDITION 4.0.0
-@set RTEMS-VERSION 4.0.0
-@set RTEMS-UPDATE-DATE October 27 1998
-@set RTEMS-UPDATE-MONTH October 1998
-
-@c
-@c  The following determines which set of the tables and figures we will use.
-@c  We default to ASCII but if available TeX or HTML versions will 
-@c  be used instead.
-@c
-
-@set use-ascii
-@clear use-html
-@clear use-tex
- 
-@iftex
-@clear use-ascii
-@clear use-html
-@set use-tex
-@end iftex
- 
-@ifhtml
-@clear use-ascii
-@clear use-tex
-@set use-html
-@end ifhtml
-
-@c
-@c The following variable says to use texinfo or html for the two column
-@c texinfo tables.  For somethings the format does not look good in html.
-@c With our adjustment to the left column in TeX, it nearly always looks
-@c good printed.
-@c
-@ifset use-ascii
-@set use-texinfo-tables
-@end ifset
-@ifset use-tex
-@set use-texinfo-tables
-@end ifset
-@ifset use-html
-@clear use-texinfo-tables
-@end ifset
-
-@c
-@c Custom whitespace adjustments.  We could fiddle a bit more.
-@c
-@tex
-\global\parindent 0in
-\global\chapheadingskip = 15pt plus 4pt minus 2pt
-\global\secheadingskip = 12pt plus 4pt minus 2pt
-\global\subsecheadingskip = 9pt plus 4pt minus 2pt
-\global\hbadness = 10000
-\global\tolerance = 6000
-\global\tableindent = 1.5in
-\global\itemindent = 0.5in
-
-@ifclear smallbook
-\global\parskip 6pt plus 1pt
-@end ifclear
-@end tex
-
-
diff --git a/doc/common/timemac.texi b/doc/common/timemac.texi
deleted file mode 100644
index 25a0b27e9a..0000000000
--- a/doc/common/timemac.texi
+++ /dev/null
@@ -1,36 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-@c
-@c  Macros to help with the tables in this file
-@c
-
-@tex
-\global\advance \smallskipamount by -4pt
- 
-\global\def\rtemstimetable{
-\vrule\strut##&
-\hbox to 3.0in{\enskip##\hfil}&
-\hbox to 0.75in{\enskip##\hfil}&
-\vrule##\cr
-\noalign{\hrule}
-}
-
-\global\def\rtemsendtimetable{}
-\global\def\rtemsonecase#1#2{
-& \bf #1\hfil& #2 & \cr\noalign{\hrule}
-}
-
-\global\def\rtemsdirective#1{
-& \bf #1 \hfil& & \cr\noalign{\hrule}
-}
-
-\global\def\rtemscase#1#2{
-& \hskip 0.3in #1\hfil& #2 & \cr\noalign{\hrule}
-}
-
-@end tex
diff --git a/doc/common/timetbl.t b/doc/common/timetbl.t
deleted file mode 100644
index ce91bb79ff..0000000000
--- a/doc/common/timetbl.t
+++ /dev/null
@@ -1,1330 +0,0 @@
-@c ******   This comment is here to remind you not to edit the timetbl.t
-@c ******   in any directory but common.
-@c 
-@c Time Table Template
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@ifset use-tex
-@sp 1
-@tex
-\centerline{\vbox{\offinterlineskip\halign{
-\span\rtemstimetable
-\rtemsonecase{No Floating Point Contexts}{RTEMS_NO_FP_CONTEXTS}
-\rtemsdirective{Floating Point Contexts}
-\rtemscase{restore first FP task}{RTEMS_RESTORE_1ST_FP_TASK}
-\rtemscase{save initialized, restore initialized}{RTEMS_SAVE_INIT_RESTORE_INIT}
-\rtemscase{save idle, restore initialized}{RTEMS_SAVE_IDLE_RESTORE_INIT}
-\rtemscase{save idle, restore idle}{RTEMS_SAVE_IDLE_RESTORE_IDLE}
-\rtemsendtimetable
-}}\hfil}
-@end tex
-@end ifset
-
-@ifset use-ascii
-@ifinfo
-@itemize @bullet
-@item No Floating Point Contexts
-@itemize -
-@item only case: RTEMS_NO_FP_CONTEXTS
-@end itemize
-@item Floating Point Contexts
-@itemize -
-@item restore first FP task: RTEMS_RESTORE_1ST_FP_TASK
-@item save initialized, restore initialized: RTEMS_SAVE_INIT_RESTORE_INIT
-@item save idle, restore initialized: RTEMS_SAVE_IDLE_RESTORE_INIT
-@item save idle, restore idle: RTEMS_SAVE_IDLE_RESTORE_INIT
-@end itemize
-@end itemize
-@end ifinfo
-@end ifset
-
-@ifset use-html
-@html
-<CENTER>
-  <TABLE COLS=2 WIDTH="80%" BORDER=2>
-<TR><TD ALIGN=left><STRONG>No Floating Point Contexts</STRONG></TD>
-    <TD ALIGN=center>RTEMS_NO_FP_CONTEXTS</TD></TR>
-<TR><TD ALIGN=left COLSPAN=2><STRONG>Floating Point Contexts</TR>
-    <TR><TD ALIGN=left><dd>restore first FP task</TD>
-        <TD ALIGN=center>RTEMS_RESTORE_1ST_FP_TASK</TD>
-    <TR><TD ALIGN=left><dd>save initialized, restore initialized</TD>
-        <TD ALIGN=center>RTEMS_SAVE_INIT_RESTORE_INIT</TD>
-    <TR><TD ALIGN=left><dd>save idle, restore initialized</TD>
-        <TD ALIGN=center>RTEMS_SAVE_IDLE_RESTORE_INIT</TD>
-    <TR><TD ALIGN=left><dd>save idle, restore idle</TD>
-        <TD ALIGN=center>RTEMS_SAVE_IDLE_RESTORE_IDLE</TD>
-  </TABLE>
-</CENTER>
-@end html
-@end ifset
-
-@section Directive Times
-
-This sections is divided into a number of
-subsections, each of which contains a table listing the
-execution times of that manager's directives.
-
-@page
-@section Task Manager
-
-@ifset use-tex
-@tex
-\centerline{\vbox{\offinterlineskip\halign{
-\span\rtemstimetable
-\rtemsonecase{TASK\_CREATE}{RTEMS_TASK_CREATE_ONLY}
-\rtemsonecase{TASK\_IDENT}{RTEMS_TASK_IDENT_ONLY}
-\rtemsonecase{TASK\_START}{RTEMS_TASK_START_ONLY}
-\rtemsdirective{TASK\_RESTART}
-\rtemscase{calling task}{RTEMS_TASK_RESTART_CALLING_TASK}
-\rtemscase{suspended task -- returns to caller}
-              {RTEMS_TASK_RESTART_SUSPENDED_RETURNS_TO_CALLER}
-\rtemscase{blocked task -- returns to caller}
-              {RTEMS_TASK_RESTART_BLOCKED_RETURNS_TO_CALLER}
-\rtemscase{ready task -- returns to caller}
-              {RTEMS_TASK_RESTART_READY_RETURNS_TO_CALLER}
-\rtemscase{suspended task -- preempts caller}
-              {RTEMS_TASK_RESTART_SUSPENDED_PREEMPTS_CALLER}
-\rtemscase{blocked task -- preempts caller}
-              {RTEMS_TASK_RESTART_BLOCKED_PREEMPTS_CALLER}
-\rtemscase{ready task -- preempts caller}
-              {RTEMS_TASK_RESTART_READY_PREEMPTS_CALLER}
-\rtemsdirective{TASK\_DELETE}
-\rtemscase{calling task}{RTEMS_TASK_DELETE_CALLING_TASK}
-\rtemscase{suspended task}{RTEMS_TASK_DELETE_SUSPENDED_TASK}
-\rtemscase{blocked task}{RTEMS_TASK_DELETE_BLOCKED_TASK}
-\rtemscase{ready task}{RTEMS_TASK_DELETE_READY_TASK}
-\rtemsdirective{TASK\_SUSPEND}
-\rtemscase{calling task}{RTEMS_TASK_SUSPEND_CALLING_TASK}
-\rtemscase{returns to caller}{RTEMS_TASK_SUSPEND_RETURNS_TO_CALLER}
-\rtemsdirective{TASK\_RESUME}
-\rtemscase{task readied -- returns to caller}
-              {RTEMS_TASK_RESUME_TASK_READIED_RETURNS_TO_CALLER}
-\rtemscase{task readied -- preempts caller}
-              {RTEMS_TASK_RESUME_TASK_READIED_PREEMPTS_CALLER}
-\rtemsdirective{TASK\_SET\_PRIORITY}
-\rtemscase{obtain current priority}
-              {RTEMS_TASK_SET_PRIORITY_OBTAIN_CURRENT_PRIORITY}
-\rtemscase{returns to caller}{RTEMS_TASK_SET_PRIORITY_RETURNS_TO_CALLER}
-\rtemscase{preempts caller}{RTEMS_TASK_SET_PRIORITY_PREEMPTS_CALLER}
-\rtemsdirective{TASK\_MODE}
-\rtemscase{obtain current mode}{RTEMS_TASK_MODE_OBTAIN_CURRENT_MODE}
-\rtemscase{no reschedule}{RTEMS_TASK_MODE_NO_RESCHEDULE}
-\rtemscase{reschedule -- returns to caller}
-              {RTEMS_TASK_MODE_RESCHEDULE_RETURNS_TO_CALLER}
-\rtemscase{reschedule -- preempts caller}
-              {RTEMS_TASK_MODE_RESCHEDULE_PREEMPTS_CALLER}
-\rtemsonecase{TASK\_GET\_NOTE}{RTEMS_TASK_GET_NOTE_ONLY}
-\rtemsonecase{TASK\_SET\_NOTE}{RTEMS_TASK_SET_NOTE_ONLY}
-\rtemsdirective{TASK\_WAKE\_AFTER}
-\rtemscase{yield -- returns to caller}
-              {RTEMS_TASK_WAKE_AFTER_YIELD_RETURNS_TO_CALLER}
-\rtemscase{yield -- preempts caller}
-              {RTEMS_TASK_WAKE_AFTER_YIELD_PREEMPTS_CALLER}
-\rtemsonecase{TASK\_WAKE\_WHEN}{RTEMS_TASK_WAKE_WHEN_ONLY}
-\rtemsendtimetable
-}}\hfil}
-@end tex
-@end ifset
- 
-@ifset use-ascii
-@ifinfo
-@itemize @bullet
-
-@item TASK_CREATE
-@itemize -
-@item only case: RTEMS_TASK_CREATE_ONLY
-@end itemize
-
-@item TASK_IDENT
-@itemize -
-@item only case: RTEMS_TASK_IDENT_ONLY
-@end itemize
-
-@item TASK_START
-@itemize -
-@item only case: RTEMS_TASK_START_ONLY
-@end itemize
-
-@item TASK_RESTART
-@itemize -
-@item calling task: RTEMS_TASK_RESTART_CALLING_TASK
-@item suspended task -- returns to caller: RTEMS_TASK_RESTART_SUSPENDED_RETURNS_TO_CALLER
-@item blocked task -- returns to caller: RTEMS_TASK_RESTART_BLOCKED_RETURNS_TO_CALLER
-@item ready task -- returns to caller: RTEMS_TASK_RESTART_READY_RETURNS_TO_CALLER
-@item suspended task -- preempts caller: RTEMS_TASK_RESTART_SUSPENDED_PREEMPTS_CALLER
-@item blocked task -- preempts caller: RTEMS_TASK_RESTART_BLOCKED_PREEMPTS_CALLER
-@item ready task -- preempts caller: RTEMS_TASK_RESTART_READY_PREEMPTS_CALLER
-@end itemize
-
-@item TASK_DELETE
-@itemize -
-@item calling task: RTEMS_TASK_DELETE_CALLING_TASK
-@item suspended task: RTEMS_TASK_DELETE_SUSPENDED_TASK
-@item blocked task: RTEMS_TASK_DELETE_BLOCKED_TASK
-@item ready task: RTEMS_TASK_DELETE_READY_TASK
-@end itemize
-
-@item TASK_SUSPEND
-@itemize -
-@item calling task: RTEMS_TASK_SUSPEND_CALLING_TASK
-@item returns to caller: RTEMS_TASK_SUSPEND_RETURNS_TO_CALLER
-@end itemize
-
-@item TASK_RESUME
-@itemize -
-@item task readied -- returns to caller: RTEMS_TASK_RESUME_TASK_READIED_RETURNS_TO_CALLER
-@item task readied -- preempts caller: RTEMS_TASK_RESUME_TASK_READIED_PREEMPTS_CALLER
-@end itemize
-
-@item TASK_SET_PRIORITY
-@itemize -
-@item obtain current priority: RTEMS_TASK_SET_PRIORITY_OBTAIN_CURRENT_PRIORITY
-@item returns to caller: RTEMS_TASK_SET_PRIORITY_RETURNS_TO_CALLER
-@item preempts caller: RTEMS_TASK_SET_PRIORITY_PREEMPTS_CALLER
-@end itemize
-
-@item TASK_MODE
-@itemize -
-@item obtain current mode: RTEMS_TASK_MODE_OBTAIN_CURRENT_MODE
-@item no reschedule: RTEMS_TASK_MODE_NO_RESCHEDULE
-@item reschedule -- returns to caller: RTEMS_TASK_MODE_RESCHEDULE_RETURNS_TO_CALLER
-@item reschedule -- preempts caller: RTEMS_TASK_MODE_RESCHEDULE_PREEMPTS_CALLER
-@end itemize
-
-@item TASK_GET_NOTE
-@itemize -
-@item only case: RTEMS_TASK_GET_NOTE_ONLY
-@end itemize
-
-@item TASK_SET_NOTE
-@itemize -
-@item only case: RTEMS_TASK_SET_NOTE_ONLY
-@end itemize
-
-@item TASK_WAKE_AFTER
-@itemize -
-@item yield -- returns to caller: RTEMS_TASK_WAKE_AFTER_YIELD_RETURNS_TO_CALLER
-@item yield -- preempts caller: RTEMS_TASK_WAKE_AFTER_YIELD_PREEMPTS_CALLER
-@end itemize
-
-@item TASK_WAKE_WHEN
-@itemize -
-@item only case: RTEMS_TASK_WAKE_WHEN_ONLY
-@end itemize
-
-@end itemize
-@end ifinfo
-@end ifset
-
-@ifset use-html
-@html
-<CENTER>
-  <TABLE COLS=2 WIDTH="80%" BORDER=2>
-<TR><TD ALIGN=left><STRONG>TASK_CREATE</STRONG></TD>
-    <TD ALIGN=center>RTEMS_TASK_CREATE_ONLY</TD></TR>
-<TR><TD ALIGN=left><STRONG>TASK_IDENT</STRONG></TD>
-    <TD ALIGN=center>RTEMS_TASK_IDENT_ONLY</TD></TR>
-<TR><TD ALIGN=left><STRONG>TASK_START</STRONG></TD>
-    <TD ALIGN=center>RTEMS_TASK_START_ONLY</TD></TR>
-<TR><TD ALIGN=left COLSPAN=2><STRONG>TASK_RESTART</STRONG></TD></TR>
-    <TR><TD ALIGN=left><dd>calling task</TD>
-        <TD ALIGN=center>RTEMS_TASK_RESTART_CALLING_TASK</TD></TR>
-    <TR><TD ALIGN=left><dd>suspended task -- returns to caller</TD>
-        <TD ALIGN=center>RTEMS_TASK_RESTART_SUSPENDED_RETURNS_TO_CALLER</TD></TR>
-    <TR><TD ALIGN=left><dd>blocked task -- returns to caller</TD>
-        <TD ALIGN=center>RTEMS_TASK_RESTART_BLOCKED_RETURNS_TO_CALLER</TD></TR>
-    <TR><TD ALIGN=left><dd>ready task -- returns to caller</TD>
-        <TD ALIGN=center>RTEMS_TASK_RESTART_READY_RETURNS_TO_CALLER</TD></TR>
-    <TR><TD ALIGN=left><dd>suspended task -- preempts caller</TD>
-        <TD ALIGN=center>RTEMS_TASK_RESTART_SUSPENDED_PREEMPTS_CALLER</TD></TR>
-    <TR><TD ALIGN=left><dd>blocked task -- preempts caller</TD>
-        <TD ALIGN=center>RTEMS_TASK_RESTART_BLOCKED_PREEMPTS_CALLER</TD></TR>
-    <TR><TD ALIGN=left><dd>ready task -- preempts caller</TD>
-        <TD ALIGN=center>RTEMS_TASK_RESTART_READY_PREEMPTS_CALLER</TD></TR>
-<TR><TD ALIGN=left COLSPAN=2><STRONG>TASK_DELETE</STRONG></TD></TR>
-    <TR><TD ALIGN=left><dd>calling task</TD>
-        <TD ALIGN=center>RTEMS_TASK_DELETE_CALLING_TASK</TD></TR>
-    <TR><TD ALIGN=left><dd>suspended task</TD>
-        <TD ALIGN=center>RTEMS_TASK_DELETE_SUSPENDED_TASK</TD></TR>
-    <TR><TD ALIGN=left><dd>blocked task</TD>
-        <TD ALIGN=center>RTEMS_TASK_DELETE_BLOCKED_TASK</TD></TR>
-    <TR><TD ALIGN=left><dd>ready task</TD>
-        <TD ALIGN=center>RTEMS_TASK_DELETE_READY_TASK</TD></TR>
-<TR><TD ALIGN=left COLSPAN=2><STRONG>TASK_SUSPEND</STRONG></TD></TR>
-    <TR><TD ALIGN=left><dd>calling task</TD>
-        <TD ALIGN=center>RTEMS_TASK_SUSPEND_CALLING_TASK</TD></TR>
-    <TR><TD ALIGN=left><dd>returns to caller</TD>
-        <TD ALIGN=center>RTEMS_TASK_SUSPEND_RETURNS_TO_CALLER</TD></TR>
-<TR><TD ALIGN=left COLSPAN=2><STRONG>TASK_RESUME</STRONG></TD></TR>
-    <TR><TD ALIGN=left><dd>task readied -- returns to caller</TD>
-        <TD ALIGN=center>RTEMS_TASK_RESUME_TASK_READIED_RETURNS_TO_CALLER</TD></TR>
-    <TR><TD ALIGN=left><dd>task readied -- preempts caller</TD>
-        <TD ALIGN=center>RTEMS_TASK_RESUME_TASK_READIED_PREEMPTS_CALLER</TD></TR>
-<TR><TD ALIGN=left COLSPAN=2><STRONG>TASK_SET_PRIORITY</STRONG></TD></TR>
-    <TR><TD ALIGN=left><dd>obtain current priority</TD>
-        <TD ALIGN=center>RTEMS_TASK_SET_PRIORITY_OBTAIN_CURRENT_PRIORITY</TD></TR>
-    <TR><TD ALIGN=left><dd>returns to caller</TD>
-        <TD ALIGN=center>RTEMS_TASK_SET_PRIORITY_RETURNS_TO_CALLER</TD></TR>
-    <TR><TD ALIGN=left><dd>preempts caller</TD>
-        <TD ALIGN=center>RTEMS_TASK_SET_PRIORITY_PREEMPTS_CALLER</TD></TR>
-<TR><TD ALIGN=left COLSPAN=2><STRONG>TASK_MODE</STRONG></TD></TR>
-    <TR><TD ALIGN=left><dd>obtain current mode</TD>
-        <TD ALIGN=center>RTEMS_TASK_MODE_OBTAIN_CURRENT_MODE</TD></TR>
-    <TR><TD ALIGN=left><dd>no reschedule</TD>
-        <TD ALIGN=center>RTEMS_TASK_MODE_NO_RESCHEDULE</TD></TR>
-    <TR><TD ALIGN=left><dd>reschedule -- returns to caller</TD>
-        <TD ALIGN=center>RTEMS_TASK_MODE_RESCHEDULE_RETURNS_TO_CALLER</TD></TR>
-    <TR><TD ALIGN=left><dd>reschedule -- preempts caller</TD>
-        <TD ALIGN=center>RTEMS_TASK_MODE_RESCHEDULE_PREEMPTS_CALLER</TD></TR>
-<TR><TD ALIGN=left><STRONG>TASK_GET_NOTE</STRONG></TD>
-    <TD ALIGN=center>RTEMS_TASK_GET_NOTE_ONLY</TD></TR>
-<TR><TD ALIGN=left><STRONG>TASK_SET_NOTE</STRONG></TD>
-    <TD ALIGN=center>RTEMS_TASK_SET_NOTE_ONLY</TD></TR>
-<TR><TD ALIGN=left COLSPAN=2><STRONG>TASK_WAKE_AFTER</STRONG></TD></TR>
-    <TR><TD ALIGN=left><dd>yield -- returns to caller</TD>
-        <TD ALIGN=center>RTEMS_TASK_WAKE_AFTER_YIELD_RETURNS_TO_CALLER</TD></TR>
-    <TR><TD ALIGN=left><dd>yield -- preempts caller</TD>
-        <TD ALIGN=center>RTEMS_TASK_WAKE_AFTER_YIELD_PREEMPTS_CALLER</TD></TR>
-<TR><TD ALIGN=left><STRONG>TASK_WAKE_WHEN</STRONG></TD>
-    <TD ALIGN=center>RTEMS_TASK_WAKE_WHEN_ONLY</TD></TR>
-  </TABLE>
-</CENTER>
-@end html
-@end ifset
-
-@page
-@section Interrupt Manager
-
-It should be noted that the interrupt entry times
-include vectoring the interrupt handler.
-
-@ifset use-tex
-@sp 1
-@tex
-\centerline{\vbox{\offinterlineskip\halign{
-\span\rtemstimetable
-\rtemsdirective{Interrupt Entry Overhead}
-\rtemscase{returns to nested interrupt}{RTEMS_INTR_ENTRY_RETURNS_TO_NESTED}
-\rtemscase{returns to interrupted task}
-              {RTEMS_INTR_ENTRY_RETURNS_TO_INTERRUPTED_TASK}
-\rtemscase{returns to preempting task}
-              {RTEMS_INTR_ENTRY_RETURNS_TO_PREEMPTING_TASK}
-\rtemsdirective{Interrupt Exit Overhead}
-\rtemscase{returns to nested interrupt}{RTEMS_INTR_EXIT_RETURNS_TO_NESTED}
-\rtemscase{returns to interrupted task}
-              {RTEMS_INTR_EXIT_RETURNS_TO_INTERRUPTED_TASK}
-\rtemscase{returns to preempting task}
-              {RTEMS_INTR_EXIT_RETURNS_TO_PREEMPTING_TASK}
-\rtemsendtimetable
-}}\hfil}
-@end tex
-@end ifset
-
-@ifset use-ascii
-@ifinfo
-@itemize @bullet
-
-@item Interrupt Entry Overhead
-@itemize -
-@item returns to nested interrupt: RTEMS_INTR_ENTRY_RETURNS_TO_NESTED
-@item returns to interrupted task: RTEMS_INTR_ENTRY_RETURNS_TO_INTERRUPTED_TASK
-@item returns to preempting task: RTEMS_INTR_ENTRY_RETURNS_TO_PREEMPTING_TASK
-@end itemize
-
-@item Interrupt Exit Overhead
-@itemize -
-@item returns to nested interrupt: RTEMS_INTR_EXIT_RETURNS_TO_NESTED
-@item returns to interrupted task: RTEMS_INTR_EXIT_RETURNS_TO_INTERRUPTED_TASK
-@item returns to preempting task: RTEMS_INTR_EXIT_RETURNS_TO_PREEMPTING_TASK
-@end itemize
-
-@end itemize
-@end ifinfo
-@end ifset
-
-@ifset use-html
-@html
-<CENTER>
-  <TABLE COLS=2 WIDTH="80%" BORDER=2>
-<TR><TD ALIGN=left COLSPAN=2><STRONG>Interrupt Entry Overhead</STRONG></TD></TR>
-    <TR><TD ALIGN=left><dd>returns to nested interrupt</TD>
-        <TD ALIGN=center>RTEMS_INTR_ENTRY_RETURNS_TO_NESTED</TD></TR>
-    <TR><TD ALIGN=left><dd>returns to interrupted task</TD>
-        <TD ALIGN=center>RTEMS_INTR_ENTRY_RETURNS_TO_INTERRUPTED_TASK</TD></TR>
-    <TR><TD ALIGN=left><dd>returns to preempting task</TD>
-        <TD ALIGN=center>RTEMS_INTR_ENTRY_RETURNS_TO_PREEMPTING_TASK</TD></TR>
-<TR><TD ALIGN=left COLSPAN=2><STRONG>Interrupt Exit Overhead</STRONG></TD></TR>
-    <TR><TD ALIGN=left><dd>returns to nested interrupt</TD>
-        <TD ALIGN=center>RTEMS_INTR_EXIT_RETURNS_TO_NESTED</TD></TR>
-    <TR><TD ALIGN=left><dd>returns to interrupted task</TD>
-        <TD ALIGN=center>RTEMS_INTR_EXIT_RETURNS_TO_INTERRUPTED_TASK</TD></TR>
-    <TR><TD ALIGN=left><dd>returns to preempting task</TD>
-        <TD ALIGN=center>RTEMS_INTR_EXIT_RETURNS_TO_PREEMPTING_TASK</TD></TR>
-  </TABLE>
-</CENTER>
-@end html
-@end ifset
-
-
-@section Clock Manager
-
-@ifset use-tex
-@tex
-\centerline{\vbox{\offinterlineskip\halign{
-\span\rtemstimetable
-\rtemsonecase{CLOCK\_SET}{RTEMS_CLOCK_SET_ONLY}
-\rtemsonecase{CLOCK\_GET}{RTEMS_CLOCK_GET_ONLY}
-\rtemsonecase{CLOCK\_TICK}{RTEMS_CLOCK_TICK_ONLY}
-\rtemsendtimetable
-}}\hfil}
-@end tex
-@end ifset
-
-@ifset use-ascii
-@ifinfo
-@itemize @bullet
-
-@item CLOCK_SET
-@itemize -
-@item only case: RTEMS_CLOCK_SET_ONLY
-@end itemize
-
-@item CLOCK_GET
-@itemize -
-@item only case: RTEMS_CLOCK_GET_ONLY
-@end itemize
-
-@item CLOCK_TICK
-@itemize -
-@item only case: RTEMS_CLOCK_TICK_ONLY
-@end itemize
-
-@end itemize
-@end ifinfo
-@end ifset
-
-@ifset use-html
-@html
-<CENTER>
-  <TABLE COLS=2 WIDTH="80%" BORDER=2>
-<TR><TD ALIGN=left><STRONG>CLOCK_SET</STRONG></TD>
-    <TD ALIGN=center>RTEMS_CLOCK_SET_ONLY</TD></TR>
-<TR><TD ALIGN=left><STRONG>CLOCK_GET</STRONG></TD>
-    <TD ALIGN=center>RTEMS_CLOCK_GET_ONLY</TD></TR>
-<TR><TD ALIGN=left><STRONG>CLOCK_TICK</STRONG></TD>
-    <TD ALIGN=center>RTEMS_CLOCK_TICK_ONLY</TD></TR>
-  </TABLE>
-</CENTER>
-@end html
-@end ifset
-
-@section Timer Manager
-
-@ifset use-tex
-@tex
-\centerline{\vbox{\offinterlineskip\halign{
-\span\rtemstimetable
-\rtemsonecase{TIMER\_CREATE}{RTEMS_TIMER_CREATE_ONLY}
-\rtemsonecase{TIMER\_IDENT}{RTEMS_TIMER_IDENT_ONLY}
-\rtemsdirective{TIMER\_DELETE}
-\rtemscase{inactive}{RTEMS_TIMER_DELETE_INACTIVE}
-\rtemscase{active}{RTEMS_TIMER_DELETE_ACTIVE}
-\rtemsdirective{TIMER\_FIRE\_AFTER}
-\rtemscase{inactive}{RTEMS_TIMER_FIRE_AFTER_INACTIVE}
-\rtemscase{active}{RTEMS_TIMER_FIRE_AFTER_ACTIVE}
-\rtemsdirective{TIMER\_FIRE\_WHEN}
-\rtemscase{inactive}{RTEMS_TIMER_FIRE_WHEN_INACTIVE}
-\rtemscase{active}{RTEMS_TIMER_FIRE_WHEN_ACTIVE}
-\rtemsdirective{TIMER\_RESET}
-\rtemscase{inactive}{RTEMS_TIMER_RESET_INACTIVE}
-\rtemscase{active}{RTEMS_TIMER_RESET_ACTIVE}
-\rtemsdirective{TIMER\_CANCEL}
-\rtemscase{inactive}{RTEMS_TIMER_CANCEL_INACTIVE}
-\rtemscase{active}{RTEMS_TIMER_CANCEL_ACTIVE}
-\rtemsendtimetable
-}}\hfil}
-@end tex
-@end ifset
-
-@ifset use-ascii
-@ifinfo
-@itemize @bullet
-
-@item TIMER_CREATE
-@itemize -
-@item only case: RTEMS_TIMER_CREATE_ONLY
-@end itemize
-
-@item TIMER_IDENT
-@itemize -
-@item only case: RTEMS_TIMER_IDENT_ONLY
-@end itemize
-
-@item TIMER_DELETE
-@itemize -
-@item inactive: RTEMS_TIMER_DELETE_INACTIVE
-@item active: RTEMS_TIMER_DELETE_ACTIVE
-@end itemize
-
-@item TIMER_FIRE_AFTER
-@itemize -
-@item inactive: RTEMS_TIMER_FIRE_AFTER_INACTIVE
-@item active: RTEMS_TIMER_FIRE_AFTER_ACTIVE
-@end itemize
-
-@item TIMER_FIRE_WHEN
-@itemize -
-@item inactive: TIMER_FIRE_WHEN_INACTIVE
-@item active: TIMER_FIRE_WHEN_ACTIVE
-@end itemize
-
-@item TIMER_RESET
-@itemize -
-@item inactive: TIMER_RESET_INACTIVE
-@item active: TIMER_RESET_ACTIVE
-@end itemize
-
-@item TIMER_CANCEL
-@itemize -
-@item inactive: TIMER_CANCEL_INACTIVE
-@item active: TIMER_CANCEL_ACTIVE
-@end itemize
-
-@end itemize
-@end ifinfo
-@end ifset
-
-@ifset use-html
-@html
-<CENTER>
-  <TABLE COLS=2 WIDTH="80%" BORDER=2>
-<TR><TD ALIGN=left><STRONG>TIMER_CREATE</STRONG></TD>
-    <TD ALIGN=center>RTEMS_TIMER_CREATE_ONLY</TD></TR>
-<TR><TD ALIGN=left><STRONG>TIMER_IDENT</STRONG></TD>
-    <TD ALIGN=center>RTEMS_TIMER_IDENT_ONLY</TD></TR>
-<TR><TD ALIGN=left COLSPAN=2><STRONG>TIMER_DELETE</STRONG></TD></TR>
-    <TR><TD ALIGN=left><dd>inactive</TD>
-        <TD ALIGN=center>RTEMS_TIMER_DELETE_INACTIVE</TD></TR>
-    <TR><TD ALIGN=left><dd>active</TD>
-        <TD ALIGN=center>RTEMS_TIMER_DELETE_ACTIVE</TD></TR>
-<TR><TD ALIGN=left COLSPAN=2><STRONG>TIMER_FIRE_AFTER</STRONG></TD></TR>
-    <TR><TD ALIGN=left><dd>inactive</TD>
-        <TD ALIGN=center>RTEMS_TIMER_FIRE_AFTER_INACTIVE</TD></TR>
-    <TR><TD ALIGN=left><dd>active</TD>
-        <TD ALIGN=center>RTEMS_TIMER_FIRE_AFTER_ACTIVE</TD></TR>
-<TR><TD ALIGN=left COLSPAN=2><STRONG>TIMER_FIRE_WHEN</STRONG></TD></TR>
-    <TR><TD ALIGN=left><dd>inactive</TD>
-        <TD ALIGN=center>RTEMS_TIMER_FIRE_WHEN_INACTIVE</TD></TR>
-    <TR><TD ALIGN=left><dd>active</TD>
-        <TD ALIGN=center>RTEMS_TIMER_FIRE_WHEN_ACTIVE</TD></TR>
-<TR><TD ALIGN=left COLSPAN=2><STRONG>TIMER_RESET</STRONG></TD></TR>
-    <TR><TD ALIGN=left><dd>inactive</TD>
-        <TD ALIGN=center>RTEMS_TIMER_RESET_INACTIVE</TD></TR>
-    <TR><TD ALIGN=left><dd>active</TD>
-        <TD ALIGN=center>RTEMS_TIMER_RESET_ACTIVE</TD></TR>
-<TR><TD ALIGN=left COLSPAN=2><STRONG>TIMER_CANCEL</STRONG></TD></TR>
-    <TR><TD ALIGN=left><dd>inactive</TD>
-        <TD ALIGN=center>RTEMS_TIMER_CANCEL_INACTIVE</TD></TR>
-    <TR><TD ALIGN=left><dd>active</TD>
-        <TD ALIGN=center>RTEMS_TIMER_CANCEL_ACTIVE</TD></TR>
-  </TABLE>
-</CENTER>
-@end html
-@end ifset
-
-@page
-@section Semaphore Manager
-
-@ifset use-tex
-@tex
-\centerline{\vbox{\offinterlineskip\halign{
-\span\rtemstimetable
-\rtemsonecase{SEMAPHORE\_CREATE}{RTEMS_SEMAPHORE_CREATE_ONLY}
-\rtemsonecase{SEMAPHORE\_IDENT}{RTEMS_SEMAPHORE_IDENT_ONLY}
-\rtemsonecase{SEMAPHORE\_DELETE}{RTEMS_SEMAPHORE_DELETE_ONLY}
-\rtemsdirective{SEMAPHORE\_OBTAIN}
-\rtemscase{available}{RTEMS_SEMAPHORE_OBTAIN_AVAILABLE}
-\rtemscase{not available -- NO\_WAIT}
-              {RTEMS_SEMAPHORE_OBTAIN_NOT_AVAILABLE_NO_WAIT}
-\rtemscase{not available -- caller blocks}
-              {RTEMS_SEMAPHORE_OBTAIN_NOT_AVAILABLE_CALLER_BLOCKS}
-\rtemsdirective{SEMAPHORE\_RELEASE}
-\rtemscase{no waiting tasks}{RTEMS_SEMAPHORE_RELEASE_NO_WAITING_TASKS}
-\rtemscase{task readied -- returns to caller}
-              {RTEMS_SEMAPHORE_RELEASE_TASK_READIED_RETURNS_TO_CALLER}
-\rtemscase{task readied -- preempts caller}
-              {RTEMS_SEMAPHORE_RELEASE_TASK_READIED_PREEMPTS_CALLER}
-\rtemsendtimetable
-}}\hfil}
-@end tex
-@end ifset
-
-@ifset use-ascii
-@ifinfo
-@itemize @bullet
-
-@item SEMAPHORE_CREATE
-@itemize -
-@item only case: RTEMS_SEMAPHORE_CREATE_ONLY
-@end itemize
-
-@item SEMAPHORE_IDENT
-@itemize -
-@item only case: RTEMS_SEMAPHORE_IDENT_ONLY
-@end itemize
-
-@item SEMAPHORE_DELETE
-@itemize -
-@item only case: RTEMS_SEMAPHORE_DELETE_ONLY
-@end itemize
-
-@item SEMAPHORE_OBTAIN
-@itemize -
-@item available: RTEMS_SEMAPHORE_OBTAIN_AVAILABLE
-@item not available -- NO_WAIT: RTEMS_SEMAPHORE_OBTAIN_NOT_AVAILABLE_NO_WAIT
-@item not available -- caller blocks: RTEMS_SEMAPHORE_OBTAIN_NOT_AVAILABLE_CALLER_BLOCKS
-@end itemize
-
-@item SEMAPHORE_RELEASE
-@itemize -
-@item no waiting tasks: RTEMS_SEMAPHORE_RELEASE_NO_WAITING_TASKS
-@item task readied -- returns to caller: RTEMS_SEMAPHORE_RELEASE_TASK_READIED_RETURNS_TO_CALLER
-@item task readied -- preempts caller: RTEMS_SEMAPHORE_RELEASE_TASK_READIED_PREEMPTS_CALLER
-@end itemize
-
-@end itemize
-@end ifinfo
-@end ifset
-
-@ifset use-html
-@html
-<CENTER>
-  <TABLE COLS=2 WIDTH="80%" BORDER=2>
-<TR><TD ALIGN=left><STRONG>SEMAPHORE_CREATE</STRONG></TD>
-    <TD ALIGN=center>RTEMS_SEMAPHORE_CREATE_ONLY</TD></TR>
-<TR><TD ALIGN=left><STRONG>SEMAPHORE_IDENT</STRONG></TD>
-    <TD ALIGN=center>RTEMS_SEMAPHORE_IDENT_ONLY</TD></TR>
-<TR><TD ALIGN=left><STRONG>SEMAPHORE_DELETE</STRONG></TD>
-    <TD ALIGN=center>RTEMS_SEMAPHORE_DELETE_ONLY</TD></TR>
-<TR><TD ALIGN=left COLSPAN=2><STRONG>SEMAPHORE_OBTAIN</STRONG></TD></TR>
-    <TR><TD ALIGN=left><dd>available</TD>
-        <TD ALIGN=center>RTEMS_SEMAPHORE_OBTAIN_AVAILABLE</TD></TR>
-    <TR><TD ALIGN=left><dd>not available -- NO_WAIT</TD>
-        <TD ALIGN=center>RTEMS_SEMAPHORE_OBTAIN_NOT_AVAILABLE_NO_WAIT</TD></TR>
-    <TR><TD ALIGN=left><dd>not available -- caller blocks</TD>
-        <TD ALIGN=center>RTEMS_SEMAPHORE_OBTAIN_NOT_AVAILABLE_CALLER_BLOCKS</TD></TR>
-<TR><TD ALIGN=left COLSPAN=2><STRONG>SEMAPHORE_RELEASE</STRONG></TD></TR>
-    <TR><TD ALIGN=left><dd>no waiting tasks</TD>
-        <TD ALIGN=center>RTEMS_SEMAPHORE_RELEASE_NO_WAITING_TASKS</TD></TR>
-    <TR><TD ALIGN=left><dd>task readied -- returns to caller</TD>
-        <TD ALIGN=center>RTEMS_SEMAPHORE_RELEASE_TASK_READIED_RETURNS_TO_CALLER</TD></TR>
-    <TR><TD ALIGN=left><dd>task readied -- preempts caller</TD>
-        <TD ALIGN=center>RTEMS_SEMAPHORE_RELEASE_TASK_READIED_PREEMPTS_CALLER</TD></TR>
-  </TABLE>
-</CENTER>
-@end html
-@end ifset
-
-@section Message Manager
-
-@ifset use-tex
-@tex
-\centerline{\vbox{\offinterlineskip\halign{
-\span\rtemstimetable
-\rtemsonecase{MESSAGE\_QUEUE\_CREATE}{RTEMS_MESSAGE_QUEUE_CREATE_ONLY}
-\rtemsonecase{MESSAGE\_QUEUE\_IDENT}{RTEMS_MESSAGE_QUEUE_IDENT_ONLY}
-\rtemsonecase{MESSAGE\_QUEUE\_DELETE}{RTEMS_MESSAGE_QUEUE_DELETE_ONLY}
-\rtemsdirective{MESSAGE\_QUEUE\_SEND}
-\rtemscase{no waiting tasks}
-              {RTEMS_MESSAGE_QUEUE_SEND_NO_WAITING_TASKS}
-\rtemscase{task readied -- returns to caller}
-              {RTEMS_MESSAGE_QUEUE_SEND_TASK_READIED_RETURNS_TO_CALLER}
-\rtemscase{task readied -- preempts caller}
-              {RTEMS_MESSAGE_QUEUE_SEND_TASK_READIED_PREEMPTS_CALLER}
-\rtemsdirective{MESSAGE\_QUEUE\_URGENT}
-\rtemscase{no waiting tasks}{RTEMS_MESSAGE_QUEUE_URGENT_NO_WAITING_TASKS}
-\rtemscase{task readied -- returns to caller}
-              {RTEMS_MESSAGE_QUEUE_URGENT_TASK_READIED_RETURNS_TO_CALLER}
-\rtemscase{task readied -- preempts caller}
-              {RTEMS_MESSAGE_QUEUE_URGENT_TASK_READIED_PREEMPTS_CALLER}
-\rtemsdirective{MESSAGE\_QUEUE\_BROADCAST}
-\rtemscase{no waiting tasks}{RTEMS_MESSAGE_QUEUE_BROADCAST_NO_WAITING_TASKS}
-\rtemscase{task readied -- returns to caller}
-              {RTEMS_MESSAGE_QUEUE_BROADCAST_TASK_READIED_RETURNS_TO_CALLER}
-\rtemscase{task readied -- preempts caller}
-              {RTEMS_MESSAGE_QUEUE_BROADCAST_TASK_READIED_PREEMPTS_CALLER}
-\rtemsdirective{MESSAGE\_QUEUE\_RECEIVE}
-\rtemscase{available}{RTEMS_MESSAGE_QUEUE_RECEIVE_AVAILABLE}
-\rtemscase{not available -- NO\_WAIT}
-              {RTEMS_MESSAGE_QUEUE_RECEIVE_NOT_AVAILABLE_NO_WAIT}
-\rtemscase{not available -- caller blocks}
-              {RTEMS_MESSAGE_QUEUE_RECEIVE_NOT_AVAILABLE_CALLER_BLOCKS}
-\rtemsdirective{MESSAGE\_QUEUE\_FLUSH}
-\rtemscase{no messages flushed}{RTEMS_MESSAGE_QUEUE_FLUSH_NO_MESSAGES_FLUSHED}
-\rtemscase{messages flushed}{RTEMS_MESSAGE_QUEUE_FLUSH_MESSAGES_FLUSHED}
-\rtemsendtimetable
-}}\hfil}
-@end tex
-@end ifset
-
-@ifset use-ascii
-@ifinfo
-@itemize @bullet
-
-@item MESSAGE_QUEUE_CREATE
-@itemize -
-@item only case: RTEMS_MESSAGE_QUEUE_CREATE_ONLY
-@end itemize
-
-@item MESSAGE_QUEUE_IDENT
-@itemize -
-@item only case: RTEMS_MESSAGE_QUEUE_IDENT_ONLY
-@end itemize
-
-@item MESSAGE_QUEUE_DELETE
-@itemize -
-@item only case: RTEMS_MESSAGE_QUEUE_DELETE_ONLY
-@end itemize
-
-@item MESSAGE_QUEUE_SEND
-@itemize -
-@item no waiting tasks: RTEMS_MESSAGE_QUEUE_SEND_NO_WAITING_TASKS
-@item task readied -- returns to caller: RTEMS_MESSAGE_QUEUE_SEND_TASK_READIED_RETURNS_TO_CALLER
-@item task readied -- preempts caller: RTEMS_MESSAGE_QUEUE_SEND_TASK_READIED_PREEMPTS_CALLER
-@end itemize
-
-@item MESSAGE_QUEUE_URGENT
-@itemize -
-@item no waiting tasks: RTEMS_MESSAGE_QUEUE_URGENT_NO_WAITING_TASKS
-@item task readied -- returns to caller: RTEMS_MESSAGE_QUEUE_URGENT_TASK_READIED_RETURNS_TO_CALLER
-@item task readied -- preempts caller: RTEMS_MESSAGE_QUEUE_URGENT_TASK_READIED_PREEMPTS_CALLER
-@end itemize
-
-@item MESSAGE_QUEUE_BROADCAST
-@itemize -
-@item no waiting tasks: RTEMS_MESSAGE_QUEUE_BROADCAST_NO_WAITING_TASKS
-@item task readied -- returns to caller: RTEMS_MESSAGE_QUEUE_BROADCAST_TASK_READIED_RETURNS_TO_CALLER
-@item task readied -- preempts caller: RTEMS_MESSAGE_QUEUE_BROADCAST_TASK_READIED_PREEMPTS_CALLER
-@end itemize
-
-@item MESSAGE_QUEUE_RECEIVE
-@itemize -
-@item available: RTEMS_MESSAGE_QUEUE_RECEIVE_AVAILABLE
-@item not available -- NO_WAIT: RTEMS_MESSAGE_QUEUE_RECEIVE_NOT_AVAILABLE_NO_WAIT
-@item not available -- caller blocks: RTEMS_MESSAGE_QUEUE_RECEIVE_NOT_AVAILABLE_CALLER_BLOCKS
-@end itemize
-
-@item MESSAGE_QUEUE_FLUSH
-@itemize -
-@item no messages flushed: RTEMS_MESSAGE_QUEUE_FLUSH_NO_MESSAGES_FLUSHED
-@item messages flushed: RTEMS_MESSAGE_QUEUE_FLUSH_MESSAGES_FLUSHED
-@end itemize
-
-@end itemize
-@end ifinfo
-@end ifset
-
-@ifset use-html
-@html
-<CENTER>
-  <TABLE COLS=2 WIDTH="80%" BORDER=2>
-<TR><TD ALIGN=left><STRONG>MESSAGE_QUEUE_CREATE</STRONG></TD>
-    <TD ALIGN=center>RTEMS_MESSAGE_QUEUE_CREATE_ONLY</TD></TR>
-<TR><TD ALIGN=left><STRONG>MESSAGE_QUEUE_IDENT</STRONG></TD>
-    <TD ALIGN=center>RTEMS_MESSAGE_QUEUE_IDENT_ONLY</TD></TR>
-<TR><TD ALIGN=left><STRONG>MESSAGE_QUEUE_DELETE</STRONG></TD>
-    <TD ALIGN=center>RTEMS_MESSAGE_QUEUE_DELETE_ONLY</TD></TR>
-<TR><TD ALIGN=left COLSPAN=2><STRONG>MESSAGE_QUEUE_SEND</STRONG></TD></TR>
-    <TR><TD ALIGN=left><dd>no waiting tasks</TD>
-        <TD ALIGN=center>RTEMS_MESSAGE_QUEUE_SEND_NO_WAITING_TASKS</TD></TR>
-    <TR><TD ALIGN=left><dd>task readied -- returns to caller</TD>
-        <TD ALIGN=center>RTEMS_MESSAGE_QUEUE_SEND_TASK_READIED_RETURNS_TO_CALLER</TD></TR>
-    <TR><TD ALIGN=left><dd>task readied -- preempts caller</TD>
-        <TD ALIGN=center>RTEMS_MESSAGE_QUEUE_SEND_TASK_READIED_PREEMPTS_CALLER</TD></TR>
-<TR><TD ALIGN=left COLSPAN=2><STRONG>MESSAGE_QUEUE_URGENT</STRONG></TD></TR>
-    <TR><TD ALIGN=left><dd>no waiting tasks</TD>
-        <TD ALIGN=center>RTEMS_MESSAGE_QUEUE_URGENT_NO_WAITING_TASKS</TD></TR>
-    <TR><TD ALIGN=left><dd>task readied -- returns to caller</TD>
-        <TD ALIGN=center>RTEMS_MESSAGE_QUEUE_URGENT_TASK_READIED_RETURNS_TO_CALLER</TD></TR>
-    <TR><TD ALIGN=left><dd>task readied -- preempts caller</TD>
-        <TD ALIGN=center>RTEMS_MESSAGE_QUEUE_URGENT_TASK_READIED_PREEMPTS_CALLER</TD></TR>
-<TR><TD ALIGN=left COLSPAN=2><STRONG>MESSAGE_QUEUE_BROADCAST</STRONG></TD></TR>
-    <TR><TD ALIGN=left><dd>no waiting tasks</TD>
-        <TD ALIGN=center>RTEMS_MESSAGE_QUEUE_BROADCAST_NO_WAITING_TASKS</TD></TR>
-    <TR><TD ALIGN=left><dd>task readied -- returns to caller</TD>
-        <TD ALIGN=center>RTEMS_MESSAGE_QUEUE_BROADCAST_TASK_READIED_RETURNS_TO_CALLER</TD></TR>
-    <TR><TD ALIGN=left><dd>task readied -- preempts caller</TD>
-        <TD ALIGN=center>RTEMS_MESSAGE_QUEUE_BROADCAST_TASK_READIED_PREEMPTS_CALLER</TD></TR>
-<TR><TD ALIGN=left COLSPAN=2><STRONG>MESSAGE_QUEUE_RECEIVE</STRONG></TD></TR>
-    <TR><TD ALIGN=left><dd>available</TD>
-        <TD ALIGN=center>RTEMS_MESSAGE_QUEUE_RECEIVE_AVAILABLE</TD></TR>
-    <TR><TD ALIGN=left><dd>not available -- NO_WAIT</TD>
-        <TD ALIGN=center>RTEMS_MESSAGE_QUEUE_RECEIVE_NOT_AVAILABLE_NO_WAIT</TD></TR>
-    <TR><TD ALIGN=left><dd>not available -- caller blocks</TD>
-        <TD ALIGN=center>RTEMS_MESSAGE_QUEUE_RECEIVE_NOT_AVAILABLE_CALLER_BLOCKS</TD></TR>
-<TR><TD ALIGN=left COLSPAN=2><STRONG>MESSAGE_QUEUE_FLUSH</STRONG></TD></TR>
-    <TR><TD ALIGN=left><dd>no messages flushed</TD>
-        <TD ALIGN=center>RTEMS_MESSAGE_QUEUE_FLUSH_NO_MESSAGES_FLUSHED</TD></TR>
-    <TR><TD ALIGN=left><dd>messages flushed</TD>
-        <TD ALIGN=center>RTEMS_MESSAGE_QUEUE_FLUSH_MESSAGES_FLUSHED</TD></TR>
-
-  </TABLE>
-</CENTER>
-@end html
-@end ifset
-
-@page
-@section Event Manager
-
-@ifset use-tex
-@tex
-\centerline{\vbox{\offinterlineskip\halign{
-\span\rtemstimetable
-\rtemsdirective{EVENT\_SEND}
-\rtemscase{no task readied}{RTEMS_EVENT_SEND_NO_TASK_READIED}
-\rtemscase{task readied -- returns to caller}
-              {RTEMS_EVENT_SEND_TASK_READIED_RETURNS_TO_CALLER}
-\rtemscase{task readied -- preempts caller}
-              {RTEMS_EVENT_SEND_TASK_READIED_PREEMPTS_CALLER}
-\rtemsdirective{EVENT\_RECEIVE}
-\rtemscase{obtain current events}{RTEMS_EVENT_RECEIVE_OBTAIN_CURRENT_EVENTS}
-\rtemscase{available}{RTEMS_EVENT_RECEIVE_AVAILABLE}
-\rtemscase{not available -- NO\_WAIT}{RTEMS_EVENT_RECEIVE_NOT_AVAILABLE_NO_WAIT}
-\rtemscase{not available -- caller blocks}
-              {RTEMS_EVENT_RECEIVE_NOT_AVAILABLE_CALLER_BLOCKS}
-\rtemsendtimetable
-}}\hfil}
-@end tex
-@end ifset
-
-@ifset use-ascii
-@ifinfo
-@itemize @bullet
-
-@item EVENT_SEND
-@itemize -
-@item no task readied: RTEMS_EVENT_SEND_NO_TASK_READIED
-@item task readied -- returns to caller: RTEMS_EVENT_SEND_TASK_READIED_RETURNS_TO_CALLER
-@item task readied -- preempts caller: RTEMS_EVENT_SEND_TASK_READIED_PREEMPTS_CALLER
-@end itemize
-
-@item EVENT_RECEIVE
-@itemize -
-@item obtain current events: RTEMS_EVENT_RECEIVE_OBTAIN_CURRENT_EVENTS
-@item available: RTEMS_EVENT_RECEIVE_AVAILABLE
-@item not available -- NO_WAIT: RTEMS_EVENT_RECEIVE_NOT_AVAILABLE_NO_WAIT
-@item not available -- caller blocks: RTEMS_EVENT_RECEIVE_NOT_AVAILABLE_CALLER_BLOCKS
-@end itemize
-
-@end itemize
-@end ifinfo
-@end ifset
-
-@ifset use-html
-@html
-<CENTER>
-  <TABLE COLS=2 WIDTH="80%" BORDER=2>
-<TR><TD ALIGN=left COLSPAN=2><STRONG>EVENT_SEND</STRONG></TD></TR>
-    <TR><TD ALIGN=left><dd>no task readied</TD>
-        <TD ALIGN=center>RTEMS_EVENT_SEND_NO_TASK_READIED</TD></TR>
-    <TR><TD ALIGN=left><dd>task readied -- returns to caller</TD>
-        <TD ALIGN=center>RTEMS_EVENT_SEND_TASK_READIED_RETURNS_TO_CALLER</TD></TR>
-    <TR><TD ALIGN=left><dd>task readied -- preempts caller</TD>
-        <TD ALIGN=center>RTEMS_EVENT_SEND_TASK_READIED_PREEMPTS_CALLER</TD></TR>
-<TR><TD ALIGN=left COLSPAN=2><STRONG>EVENT_RECEIVE</STRONG></TD></TR>
-    <TR><TD ALIGN=left><dd>obtain current events</TD>
-        <TD ALIGN=center>RTEMS_EVENT_RECEIVE_OBTAIN_CURRENT_EVENTS</TD></TR>
-    <TR><TD ALIGN=left><dd>available</TD>
-        <TD ALIGN=center>RTEMS_EVENT_RECEIVE_AVAILABLE</TD></TR>
-    <TR><TD ALIGN=left><dd>not available -- NO_WAIT</TD>
-        <TD ALIGN=center>RTEMS_EVENT_RECEIVE_NOT_AVAILABLE_NO_WAIT</TD></TR>
-    <TR><TD ALIGN=left><dd>not available -- caller blocks</TD>
-        <TD ALIGN=center>RTEMS_EVENT_RECEIVE_NOT_AVAILABLE_CALLER_BLOCKS</TD></TR>
-
-  </TABLE>
-</CENTER>
-@end html
-@end ifset
-@section Signal Manager
-
-@ifset use-tex
-@tex
-\centerline{\vbox{\offinterlineskip\halign{
-\span\rtemstimetable
-\rtemsonecase{SIGNAL\_CATCH}{RTEMS_SIGNAL_CATCH_ONLY}
-\rtemsdirective{SIGNAL\_SEND}
-\rtemscase{returns to caller}{RTEMS_SIGNAL_SEND_RETURNS_TO_CALLER}
-\rtemscase{signal to self}{RTEMS_SIGNAL_SEND_SIGNAL_TO_SELF}
-\rtemsdirective{EXIT ASR OVERHEAD}
-\rtemscase{returns to calling task}
-              {RTEMS_SIGNAL_EXIT_ASR_OVERHEAD_RETURNS_TO_CALLING_TASK}
-\rtemscase{returns to preempting task}
-              {RTEMS_SIGNAL_EXIT_ASR_OVERHEAD_RETURNS_TO_PREEMPTING_TASK}
-\rtemsendtimetable
-}}\hfil}
-@end tex
-@end ifset
-
-@ifset use-ascii
-@ifinfo
-@itemize @bullet
-@item SIGNAL_CATCH
-@itemize -
-@item only case: RTEMS_SIGNAL_CATCH_ONLY
-@end itemize
-
-@item SIGNAL_SEND
-@itemize -
-@item returns to caller: RTEMS_SIGNAL_SEND_RETURNS_TO_CALLER
-@item signal to self: RTEMS_SIGNAL_SEND_SIGNAL_TO_SELF
-@end itemize
-
-@item EXIT ASR OVERHEAD
-@itemize -
-@item returns to calling task: RTEMS_SIGNAL_EXIT_ASR_OVERHEAD_RETURNS_TO_CALLING_TASK
-@item returns to preempting task: RTEMS_SIGNAL_EXIT_ASR_OVERHEAD_RETURNS_TO_PREEMPTING_TASK
-@end itemize
-
-@end itemize
-@end ifinfo
-@end ifset
-
-@ifset use-html
-@html
-<CENTER>
-  <TABLE COLS=2 WIDTH="80%" BORDER=2>
-<TR><TD ALIGN=left><STRONG>SIGNAL_CATCH</STRONG></TD>
-    <TD ALIGN=center>RTEMS_SIGNAL_CATCH_ONLY</TD></TR>
-<TR><TD ALIGN=left COLSPAN=2><STRONG>SIGNAL_SEND</TD></TR>
-    <TR><TD ALIGN=left><dd>returns to caller</TD>
-        <TD ALIGN=center>RTEMS_SIGNAL_SEND_RETURNS_TO_CALLER</TD></TR>
-    <TR><TD ALIGN=left><dd>signal to self</TD>
-        <TD ALIGN=center>RTEMS_SIGNAL_SEND_SIGNAL_TO_SELF</TD></TR>
-<TR><TD ALIGN=left COLSPAN=2><STRONG>EXIT ASR OVERHEAD</TD></TR>
-    <TR><TD ALIGN=left><dd>returns to calling task</TD>
-        <TD ALIGN=center>
-          RTEMS_SIGNAL_EXIT_ASR_OVERHEAD_RETURNS_TO_CALLING_TASK</TD></TR>
-    <TR><TD ALIGN=left><dd>returns to preempting task</TD>
-        <TD ALIGN=center>
-          RTEMS_SIGNAL_EXIT_ASR_OVERHEAD_RETURNS_TO_PREEMPTING_TASK</TD></TR>
-  </TABLE>
-</CENTER>
-@end html
-@end ifset
-
-@section Partition Manager
-
-@ifset use-tex
-@tex
-\centerline{\vbox{\offinterlineskip\halign{
-\span\rtemstimetable
-\rtemsonecase{PARTITION\_CREATE}{RTEMS_PARTITION_CREATE_ONLY}
-\rtemsonecase{PARTITION\_IDENT}{RTEMS_PARTITION_IDENT_ONLY}
-\rtemsonecase{PARTITION\_DELETE}{RTEMS_PARTITION_DELETE_ONLY}
-\rtemsdirective{PARTITION\_GET\_BUFFER}
-\rtemscase{available}{RTEMS_PARTITION_GET_BUFFER_AVAILABLE}
-\rtemscase{not available}{RTEMS_PARTITION_GET_BUFFER_NOT_AVAILABLE}
-\rtemsonecase{PARTITION\_RETURN\_BUFFER}
-              {RTEMS_PARTITION_GET_BUFFER_NOT_AVAILABLE}
-\rtemsendtimetable
-}}\hfil}
-@end tex
-@end ifset
-
-@ifset use-ascii
-@ifinfo
-@itemize @bullet
-
-@item PARTITION_CREATE
-@itemize -
-@item only case: RTEMS_PARTITION_CREATE_ONLY
-@end itemize
-
-@item PARTITION_IDENT
-@itemize -
-@item only case: RTEMS_PARTITION_IDENT_ONLY
-@end itemize
-
-@item PARTITION_DELETE
-@itemize -
-@item only case: RTEMS_PARTITION_DELETE_ONLY
-@end itemize
-
-@item PARTITION_GET_BUFFER
-@itemize -
-@item available: RTEMS_PARTITION_GET_BUFFER_AVAILABLE
-@item not available: RTEMS_PARTITION_GET_BUFFER_NOT_AVAILABLE
-@end itemize
-
-@item PARTITION_RETURN_BUFFER
-@itemize -
-@item only case: RTEMS_PARTITION_RETURN_BUFFER_ONLY
-@end itemize
-
-@end itemize
-@end ifinfo
-@end ifset
-
-@ifset use-html
-@html
-<CENTER>
-  <TABLE COLS=2 WIDTH="80%" BORDER=2>
-<TR><TD ALIGN=left><STRONG>PARTITION_CREATE</STRONG></TD>
-    <TD ALIGN=center>RTEMS_PARTITION_CREATE_ONLY</TD></TR>
-<TR><TD ALIGN=left><STRONG>PARTITION_IDENT</STRONG></TD>
-    <TD ALIGN=center>RTEMS_PARTITION_IDENT_ONLY</TD></TR>
-<TR><TD ALIGN=left><STRONG>PARTITION_DELETE</STRONG></TD>
-    <TD ALIGN=center>RTEMS_PARTITION_DELETE_ONLY</TD></TR>
-<TR><TD ALIGN=left COLSPAN=2><STRONG>PARTITION_GET_BUFFER</STRONG></TD></TR>
-    <TR><TD ALIGN=left><dd>available</TD>
-        <TD ALIGN=center>RTEMS_PARTITION_GET_BUFFER_AVAILABLE</TD></TR>
-    <TR><TD ALIGN=left><dd>not available</TD>
-        <TD ALIGN=center>RTEMS_PARTITION_GET_BUFFER_NOT_AVAILABLE</TD></TR>
-    <TR><TD ALIGN=left><STRONG>PARTITION_RETURN_BUFFER</STRONG></TD>
-    <TD ALIGN=center>RTEMS_PARTITION_GET_BUFFER_NOT_AVAILABLE</TD></TR>
-  </TABLE>
-</CENTER>
-@end html
-@end ifset
-
-@page
-@section Region Manager
-
-@ifset use-tex
-@tex
-\centerline{\vbox{\offinterlineskip\halign{
-\span\rtemstimetable
-\rtemsonecase{REGION\_CREATE}{RTEMS_REGION_CREATE_ONLY}
-\rtemsonecase{REGION\_IDENT}{RTEMS_REGION_IDENT_ONLY}
-\rtemsonecase{REGION\_DELETE}{RTEMS_REGION_DELETE_ONLY}
-\rtemsdirective{REGION\_GET\_SEGMENT}
-\rtemscase{available}{RTEMS_REGION_GET_SEGMENT_AVAILABLE}
-\rtemscase{not available -- NO\_WAIT}
-              {RTEMS_REGION_GET_SEGMENT_NOT_AVAILABLE_NO_WAIT}
-\rtemscase{not available -- caller blocks}
-              {RTEMS_REGION_GET_SEGMENT_NOT_AVAILABLE_CALLER_BLOCKS}
-\rtemsdirective{REGION\_RETURN\_SEGMENT}
-\rtemscase{no waiting tasks}{RTEMS_REGION_RETURN_SEGMENT_NO_WAITING_TASKS}
-\rtemscase{task readied -- returns to caller}
-              {RTEMS_REGION_RETURN_SEGMENT_TASK_READIED_RETURNS_TO_CALLER}
-\rtemscase{task readied -- preempts caller}
-              {RTEMS_REGION_RETURN_SEGMENT_TASK_READIED_PREEMPTS_CALLER}
-\rtemsendtimetable
-}}\hfil}
-@end tex
-@end ifset
-
-@ifset use-ascii
-@ifinfo
-@itemize @bullet
-
-@item REGION_CREATE
-@itemize -
-@item only case: RTEMS_REGION_CREATE_ONLY
-@end itemize
-
-@item REGION_IDENT
-@itemize -
-@item only case: RTEMS_REGION_IDENT_ONLY
-@end itemize
-
-@item REGION_DELETE
-@itemize -
-@item only case: RTEMS_REGION_DELETE_ONLY
-@end itemize
-
-@item REGION_GET_SEGMENT
-@itemize -
-@item available: RTEMS_REGION_GET_SEGMENT_AVAILABLE
-@item not available -- NO_WAIT: RTEMS_REGION_GET_SEGMENT_NOT_AVAILABLE_NO_WAIT
-@item not available -- caller blocks: RTEMS_REGION_GET_SEGMENT_NOT_AVAILABLE_CALLER_BLOCKS
-@end itemize
-
-@item REGION_RETURN_SEGMENT
-@itemize -
-@item no waiting tasks: RTEMS_REGION_RETURN_SEGMENT_NO_WAITING_TASKS
-@item task readied -- returns to caller: RTEMS_REGION_RETURN_SEGMENT_TASK_READIED_RETURNS_TO_CALLER
-@item task readied -- preempts caller: RTEMS_REGION_RETURN_SEGMENT_TASK_READIED_PREEMPTS_CALLER
-@end itemize
-
-@end itemize
-@end ifinfo
-@end ifset
-
-@ifset use-html
-@html
-<CENTER>
-  <TABLE COLS=2 WIDTH="80%" BORDER=2>
-<TR><TD ALIGN=left><STRONG>REGION_CREATE</STRONG></TD>
-    <TD ALIGN=center>RTEMS_REGION_CREATE_ONLY</TD></TR>
-<TR><TD ALIGN=left><STRONG>REGION_IDENT</STRONG></TD>
-    <TD ALIGN=center>RTEMS_REGION_IDENT_ONLY</TD></TR>
-<TR><TD ALIGN=left><STRONG>REGION_DELETE</STRONG></TD>
-    <TD ALIGN=center>RTEMS_REGION_DELETE_ONLY</TD></TR>
-<TR><TD ALIGN=left COLSPAN=2><STRONG>REGION_GET_SEGMENT</TD></TR>
-    <TR><TD ALIGN=left><dd>available</TD>
-        <TD ALIGN=center>RTEMS_REGION_GET_SEGMENT_AVAILABLE</TD></TR>
-    <TR><TD ALIGN=left><dd>not available -- NO_WAIT</TD>
-        <TD ALIGN=center>
-          RTEMS_REGION_GET_SEGMENT_NOT_AVAILABLE_NO_WAIT</TD></TR>
-    <TR><TD ALIGN=left><dd>not available -- caller blocks</TD>
-        <TD ALIGN=center>
-          RTEMS_REGION_GET_SEGMENT_NOT_AVAILABLE_CALLER_BLOCKS</TD></TR>
-<TR><TD ALIGN=left COLSPAN=2><STRONG>REGION_RETURN_SEGMENT</TD></TR>
-    <TR><TD ALIGN=left><dd>no waiting tasks</TD>
-        <TD ALIGN=center>RTEMS_REGION_RETURN_SEGMENT_NO_WAITING_TASKS</TD></TR>
-    <TR><TD ALIGN=left><dd>task readied -- returns to caller</TD>
-        <TD ALIGN=center>
-          RTEMS_REGION_RETURN_SEGMENT_TASK_READIED_RETURNS_TO_CALLER</TD></TR>
-    <TR><TD ALIGN=left><dd>task readied -- preempts caller</TD>
-        <TD ALIGN=center>
-          RTEMS_REGION_RETURN_SEGMENT_TASK_READIED_PREEMPTS_CALLER</TD></TR>
-  </TABLE>
-</CENTER>
-@end html
-@end ifset
-
-@section Dual-Ported Memory Manager
-
-@ifset use-tex
-@tex
-\centerline{\vbox{\offinterlineskip\halign{
-\span\rtemstimetable
-\rtemsonecase{PORT\_CREATE}{RTEMS_PORT_CREATE_ONLY}
-\rtemsonecase{PORT\_IDENT}{RTEMS_PORT_IDENT_ONLY}
-\rtemsonecase{PORT\_DELETE}{RTEMS_PORT_DELETE_ONLY}
-\rtemsonecase{PORT\_INTERNAL\_TO\_EXTERNAL}
-              {RTEMS_PORT_INTERNAL_TO_EXTERNAL_ONLY}
-\rtemsonecase{PORT\_EXTERNAL\_TO\_INTERNAL}
-              {RTEMS_PORT_EXTERNAL_TO_INTERNAL_ONLY}
-\rtemsendtimetable
-}}\hfil}
-@end tex
-@end ifset
-
-@ifset use-ascii
-@ifinfo
-@itemize @bullet
-
-@item PORT_CREATE
-@itemize -
-@item only case: RTEMS_PORT_CREATE_ONLY
-@end itemize
-
-@item PORT_IDENT
-@itemize -
-@item only case: RTEMS_PORT_IDENT_ONLY
-@end itemize
-
-@item PORT_DELETE
-@itemize -
-@item only case: RTEMS_PORT_DELETE_ONLY
-@end itemize
-
-@item PORT_INTERNAL_TO_EXTERNAL
-@itemize -
-@item only case: RTEMS_PORT_INTERNAL_TO_EXTERNAL_ONLY
-@end itemize
-
-@item PORT_EXTERNAL_TO_INTERNAL
-@itemize -
-@item only case: RTEMS_PORT_EXTERNAL_TO_INTERNAL_ONLY
-@end itemize
-
-@end itemize
-@end ifinfo
-@end ifset
-
-@ifset use-html
-@html
-<CENTER>
-  <TABLE COLS=2 WIDTH="80%" BORDER=2>
-<TR><TD ALIGN=left><STRONG>PORT_CREATE</STRONG></TD>
-    <TD ALIGN=center>RTEMS_PORT_CREATE_ONLY</TD></TR>
-<TR><TD ALIGN=left><STRONG>PORT_IDENT</STRONG></TD>
-    <TD ALIGN=center>RTEMS_PORT_IDENT_ONLY</TD></TR>
-<TR><TD ALIGN=left><STRONG>PORT_DELETE</STRONG></TD>
-    <TD ALIGN=center>RTEMS_PORT_DELETE_ONLY</TD></TR>
-<TR><TD ALIGN=left><STRONG>PORT_INTERNAL_TO_EXTERNAL</STRONG></TD>
-    <TD ALIGN=center>RTEMS_PORT_INTERNAL_TO_EXTERNAL_ONLY</TD></TR>
-<TR><TD ALIGN=left><STRONG>PORT_EXTERNAL_TO_INTERNAL</STRONG></TD>
-    <TD ALIGN=center>RTEMS_PORT_EXTERNAL_TO_INTERNAL_ONLY</TD></TR>
-
-  </TABLE>
-</CENTER>
-@end html
-@end ifset
-
-@section I/O Manager
-
-@ifset use-tex
-@tex
-\centerline{\vbox{\offinterlineskip\halign{
-\span\rtemstimetable
-\rtemsonecase{IO\_INITIALIZE}{RTEMS_IO_INITIALIZE_ONLY}
-\rtemsonecase{IO\_OPEN}{RTEMS_IO_OPEN_ONLY}
-\rtemsonecase{IO\_CLOSE}{RTEMS_IO_CLOSE_ONLY}
-\rtemsonecase{IO\_READ}{RTEMS_IO_READ_ONLY}
-\rtemsonecase{IO\_WRITE}{RTEMS_IO_WRITE_ONLY}
-\rtemsonecase{IO\_CONTROL}{RTEMS_IO_CONTROL_ONLY}
-\rtemsendtimetable
-}}\hfil}
-@end tex
-@end ifset
-
-@ifset use-ascii
-@ifinfo
-@itemize @bullet
-
-@item IO_INITIALIZE
-@itemize -
-@item only case: RTEMS_IO_INITIALIZE_ONLY
-@end itemize
-
-@item IO_OPEN
-@itemize -
-@item only case: RTEMS_IO_OPEN_ONLY
-@end itemize
-
-@item IO_CLOSE
-@itemize -
-@item only case: RTEMS_IO_CLOSE_ONLY
-@end itemize
-
-@item IO_READ
-@itemize -
-@item only case: RTEMS_IO_READ_ONLY
-@end itemize
-
-@item IO_WRITE
-@itemize -
-@item only case: RTEMS_IO_WRITE_ONLY
-@end itemize
-
-@item IO_CONTROL
-@itemize -
-@item only case: RTEMS_IO_CONTROL_ONLY
-@end itemize
-
-@end itemize
-@end ifinfo
-@end ifset
-
-@ifset use-html
-@html
-<CENTER>
-  <TABLE COLS=2 WIDTH="80%" BORDER=2>
-<TR><TD ALIGN=left><STRONG>IO_INITIALIZE</STRONG></TD>
-    <TD ALIGN=center>RTEMS_IO_INITIALIZE_ONLY</TD></TR>
-<TR><TD ALIGN=left><STRONG>IO_OPEN</STRONG></TD>
-    <TD ALIGN=center>RTEMS_IO_OPEN_ONLY</TD></TR>
-<TR><TD ALIGN=left><STRONG>IO_CLOSE</STRONG></TD>
-    <TD ALIGN=center>RTEMS_IO_CLOSE_ONLY</TD></TR>
-<TR><TD ALIGN=left><STRONG>IO_READ</STRONG></TD>
-    <TD ALIGN=center>RTEMS_IO_READ_ONLY</TD></TR>
-<TR><TD ALIGN=left><STRONG>IO_WRITE</STRONG></TD>
-    <TD ALIGN=center>RTEMS_IO_WRITE_ONLY</TD></TR>
-<TR><TD ALIGN=left><STRONG>IO_CONTROL</STRONG></TD>
-    <TD ALIGN=center>RTEMS_IO_CONTROL_ONLY</TD></TR>
-  </TABLE>
-</CENTER>
-@end html
-@end ifset
-
-@section Rate Monotonic Manager
-
-@ifset use-tex
-@tex
-\centerline{\vbox{\offinterlineskip\halign{
-\span\rtemstimetable
-\rtemsonecase{RATE\_MONOTONIC\_CREATE}{RTEMS_RATE_MONOTONIC_CREATE_ONLY}
-\rtemsonecase{RATE\_MONOTONIC\_IDENT}{RTEMS_RATE_MONOTONIC_IDENT_ONLY}
-\rtemsonecase{RATE\_MONOTONIC\_CANCEL}{RTEMS_RATE_MONOTONIC_CANCEL_ONLY}
-\rtemsdirective{RATE\_MONOTONIC\_DELETE}
-\rtemscase{active}{RTEMS_RATE_MONOTONIC_DELETE_ACTIVE}
-\rtemscase{inactive}{RTEMS_RATE_MONOTONIC_DELETE_INACTIVE}
-\rtemsdirective{RATE\_MONOTONIC\_PERIOD}
-\rtemscase{initiate period -- returns to caller}
-              {RTEMS_RATE_MONOTONIC_PERIOD_INITIATE_PERIOD_RETURNS_TO_CALLER}
-\rtemscase{conclude period -- caller blocks}
-              {RTEMS_RATE_MONOTONIC_PERIOD_CONCLUDE_PERIOD_CALLER_BLOCKS}
-\rtemscase{obtain status}{RTEMS_RATE_MONOTONIC_PERIOD_OBTAIN_STATUS}
-\rtemsendtimetable
-}}\hfil}
-@end tex
-@end ifset
-
-@ifset use-ascii
-@ifinfo
-@itemize @bullet
-
-@item RATE_MONOTONIC_CREATE
-@itemize -
-@item only case: RTEMS_RATE_MONOTONIC_CREATE_ONLY
-@end itemize
-
-@item RATE_MONOTONIC_IDENT
-@itemize -
-@item only case: RTEMS_RATE_MONOTONIC_IDENT_ONLY
-@end itemize
-
-@item RATE_MONOTONIC_CANCEL
-@itemize -
-@item only case: RTEMS_RATE_MONOTONIC_CANCEL_ONLY
-@end itemize
-
-@item RATE_MONOTONIC_DELETE
-@itemize -
-@item active: RTEMS_RATE_MONOTONIC_DELETE_ACTIVE
-@item inactive: RTEMS_RATE_MONOTONIC_DELETE_INACTIVE
-@end itemize
-
-@item RATE_MONOTONIC_PERIOD
-@itemize -
-@item initiate period -- returns to caller: RTEMS_RATE_MONOTONIC_PERIOD_INITIATE_PERIOD_RETURNS_TO_CALLER
-@item conclude period -- caller blocks: RTEMS_RATE_MONOTONIC_PERIOD_CONCLUDE_PERIOD_CALLER_BLOCKS
-@item obtain status: RTEMS_RATE_MONOTONIC_PERIOD_OBTAIN_STATUS
-@end itemize
-
-@end itemize
-@end ifinfo
-@end ifset
-
-@ifset use-html
-@html
-<CENTER>
-  <TABLE COLS=2 WIDTH="80%" BORDER=2>
-<TR><TD ALIGN=left><STRONG>RATE_MONOTONIC_CREATE</STRONG></TD>
-    <TD ALIGN=center>RTEMS_RATE_MONOTONIC_CREATE_ONLY</TD></TR>
-<TR><TD ALIGN=left><STRONG>RATE_MONOTONIC_IDENT</STRONG></TD>
-    <TD ALIGN=center>RTEMS_RATE_MONOTONIC_IDENT_ONLY</TD></TR>
-<TR><TD ALIGN=left><STRONG>RATE_MONOTONIC_CANCEL</STRONG></TD>
-    <TD ALIGN=center>RTEMS_RATE_MONOTONIC_CANCEL_ONLY</TD></TR>
-<TR><TD ALIGN=left COLSPAN=2><STRONG>RATE_MONOTONIC_DELETE</TD></TR>
-    <TR><TD ALIGN=left><dd>active</TD>
-        <TD ALIGN=center>RTEMS_RATE_MONOTONIC_DELETE_ACTIVE</TD></TR>
-    <TR><TD ALIGN=left><dd>inactive</TD>
-        <TD ALIGN=center>RTEMS_RATE_MONOTONIC_DELETE_INACTIVE</TD></TR>
-<TR><TD ALIGN=left COLSPAN=2><STRONG>RATE_MONOTONIC_PERIOD</TD></TR>
-    <TR><TD ALIGN=left><dd>initiate period -- returns to caller</TD>
-        <TD ALIGN=center>
-         RTEMS_RATE_MONOTONIC_PERIOD_INITIATE_PERIOD_RETURNS_TO_CALLER</TD></TR>
-    <TR><TD ALIGN=left><dd>conclude period -- caller blocks</TD>
-        <TD ALIGN=center>
-         RTEMS_RATE_MONOTONIC_PERIOD_CONCLUDE_PERIOD_CALLER_BLOCKS</TD></TR>
-    <TR><TD ALIGN=left><dd>obtain status</TD>
-        <TD ALIGN=center>RTEMS_RATE_MONOTONIC_PERIOD_OBTAIN_STATUS</TD></TR>
-  </TABLE>
-</CENTER>
-@end html
-@end ifset
-
-@tex
-\global\advance \smallskipamount by 4pt
-@end tex
diff --git a/doc/common/timing.t b/doc/common/timing.t
deleted file mode 100644
index 60840c5752..0000000000
--- a/doc/common/timing.t
+++ /dev/null
@@ -1,396 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Timing Specification
-
-@section Introduction
-
-This chapter provides information pertaining to the
-measurement of the performance of RTEMS, the methods of
-gathering the timing data, and the usefulness of the data.  Also
-discussed are other time critical aspects of RTEMS that affect
-an applications design and ultimate throughput.  These aspects
-include determinancy, interrupt latency and context switch times.
-
-@section Philosophy
-
-Benchmarks are commonly used to evaluate the
-performance of software and hardware.  Benchmarks can be an
-effective tool when comparing systems.  Unfortunately,
-benchmarks can also be manipulated to justify virtually any
-claim.  Benchmarks of real-time executives are difficult to
-evaluate for a variety of reasons.  Executives vary in the
-robustness of features and options provided.  Even when
-executives compare favorably in functionality, it is quite
-likely that different methodologies were used to obtain the
-timing data.  Another problem is that some executives provide
-times for only a small subset of directives,  This is typically
-justified by claiming that these are the only time-critical
-directives.  The performance of some executives is also very
-sensitive to the number of objects in the system.  To obtain any
-measure of usefulness, the performance information provided for
-an executive should address each of these issues.
-
-When evaluating the performance of a real-time
-executive, one typically considers the following areas:
-determinancy, directive times, worst case interrupt latency, and
-context switch time.  Unfortunately, these areas do not have
-standard measurement methodologies.  This allows vendors to
-manipulate the results such that their product is favorably
-represented.  We have attempted to provide useful and meaningful
-timing information for RTEMS.  To insure the usefulness of our
-data, the methodology and definitions used to obtain and
-describe the data are also documented.
-
-@subsection Determinancy
-
-The correctness of data in a real-time system must
-always be judged by its timeliness.  In many real-time systems,
-obtaining the correct answer does not necessarily solve the
-problem.  For example, in a nuclear reactor it is not enough to
-determine that the core is overheating.  This situation must be
-detected and acknowledged early enough that corrective action
-can be taken and a meltdown avoided.
-
-Consequently, a system designer must be able to
-predict the worst-case behavior of the application running under
-the selected executive.  In this light, it is important that a
-real-time system perform consistently regardless of the number
-of tasks, semaphores, or other resources allocated.  An
-important design goal of a real-time executive is that all
-internal algorithms be fixed-cost.  Unfortunately, this goal is
-difficult to completely meet without sacrificing the robustness
-of the executive's feature set.
-
-Many executives use the term deterministic to mean
-that the execution times of their services can be predicted.
-However, they often provide formulas to modify execution times
-based upon the number of objects in the system.  This usage is
-in sharp contrast to the notion of deterministic meaning fixed
-cost.
-
-Almost all RTEMS directives execute in a fixed amount
-of time regardless of the number of objects present in the
-system.  The primary exception occurs when a task blocks while
-acquiring a resource and specifies a non-zero timeout interval.
-
-Other exceptions are message queue broadcast,
-obtaining a variable length memory block, object name to ID
-translation, and deleting a resource upon which tasks are
-waiting.  In addition, the time required to service a clock tick
-interrupt is based upon the number of timeouts and other
-"events" which must be processed at that tick.  This second
-group is composed primarily of capabilities which are inherently
-non-deterministic but are infrequently used in time critical
-situations.  The major exception is that of servicing a clock
-tick.  However, most applications have a very small number of
-timeouts which expire at exactly the same millisecond (usually
-none, but occasionally two or three).
-
-@subsection Interrupt Latency
-
-Interrupt latency is the delay between the CPU's
-receipt of an interrupt request and the execution of the first
-application-specific instruction in an interrupt service
-routine.  Interrupts are a critical component of most real-time
-applications and it is critical that they be acted upon as
-quickly as possible.
-
-Knowledge of the worst case interrupt latency of an
-executive aids the application designer in determining the
-maximum period of time between the generation of an interrupt
-and an interrupt handler responding to that interrupt.  The
-interrupt latency of an system is the greater of the executive's
-and the applications's interrupt latency.  If the application
-disables interrupts longer than the executive, then the
-application's interrupt latency is the system's worst case
-interrupt disable period.
-
-The worst case interrupt latency for a real-time
-executive is based upon the following components:
-
-@itemize @bullet
-@item the longest period of time interrupts are disabled
-by the executive,
-
-@item the overhead required by the executive at the
-beginning of each ISR,
-
-@item the time required for the CPU to vector the
-interrupt, and
-
-@item for some microprocessors, the length of the longest
-instruction.
-@end itemize
-
-The first component is irrelevant if an interrupt
-occurs when interrupts are enabled, although it must be included
-in a worst case analysis.  The third and fourth components are
-particular to a CPU implementation and are not dependent on the
-executive.  The fourth component is ignored by this document
-because most applications use only a subset of a
-microprocessor's instruction set.  Because of this the longest
-instruction actually executed is application dependent.  The
-worst case interrupt latency of an executive is typically
-defined as the sum of components (1) and (2).  The second
-component includes the time necessry for RTEMS to save registers
-and vector to the user-defined handler.  RTEMS includes the
-third component, the time required for the CPU to vector the
-interrupt, because it is a required part of any interrupt.
-
-Many executives report the maximum interrupt disable
-period as their interrupt latency and ignore the other
-components.  This results in very low worst-case interrupt
-latency times which are not indicative of actual application
-performance.  The definition used by RTEMS results in a higher
-interrupt latency being reported, but accurately reflects the
-longest delay between the CPU's receipt of an interrupt request
-and the execution of the first application-specific instruction
-in an interrupt service routine.
-
-The actual interrupt latency times are reported in
-the Timing Data chapter of this supplement.
-
-@subsection Context Switch Time
-
-An RTEMS context switch is defined as the act of
-taking the CPU from the currently executing task and giving it
-to another task.  This process involves the following components:
-
-@itemize @bullet
-@item Saving the hardware state of the current task.
-
-@item Optionally, invoking the TASK_SWITCH user extension.
-
-@item Restoring the hardware state of the new task.
-@end itemize
-
-RTEMS defines the hardware state of a task to include
-the CPU's data registers, address registers, and, optionally,
-floating point registers.
-
-Context switch time is often touted as a performance
-measure of real-time executives.  However, a context switch is
-performed as part of a directive's actions and should be viewed
-as such when designing an application.  For example, if a task
-is unable to acquire a semaphore and blocks, a context switch is
-required to transfer control from the blocking task to a new
-task.  From the application's perspective, the context switch is
-a direct result of not acquiring the semaphore.  In this light,
-the context switch time is no more relevant than the performance
-of any other of the executive's subroutines which are not
-directly accessible by the application.
-
-In spite of the inappropriateness of using the
-context switch time as a performance metric, RTEMS context
-switch times for floating point and non-floating points tasks
-are provided for comparison purposes.  Of the executives which
-actually support floating point operations, many do not report
-context switch times for floating point context switch time.
-This results in a reported context switch time which is
-meaningless for an application with floating point tasks.
-
-The actual context switch times are reported in the
-Timing Data chapter of this supplement.
-
-@subsection Directive Times
-
-Directives are the application's interface to the
-executive, and as such their execution times are critical in
-determining the performance of the application.  For example, an
-application using a semaphore to protect a critical data
-structure should be aware of the time required to acquire and
-release a semaphore.  In addition, the application designer can
-utilize the directive execution times to evaluate the
-performance of different synchronization and communication
-mechanisms.
-
-The actual directive execution times are reported in
-the Timing Data chapter of this supplement.
-
-@section Methodology
-
-@subsection Software Platform
-
-The RTEMS timing suite is written in C.  The overhead
-of passing arguments to RTEMS by C is not timed.  The times
-reported represent the amount of time from entering to exiting
-RTEMS.
-
-The tests are based upon one of two execution models:
-(1) single invocation times, and (2) average times of repeated
-invocations.  Single invocation times are provided for
-directives which cannot easily be invoked multiple times in the
-same scenario.  For example, the times reported for entering and
-exiting an interrupt service routine are single invocation
-times.  The second model is used for directives which can easily
-be invoked multiple times in the same scenario.  For example,
-the times reported for semaphore obtain and semaphore release
-are averages of multiple invocations.  At least 100 invocations
-are used to obtain the average.
-
-@subsection Hardware Platform
-
-Since RTEMS supports a variety of processors, the
-hardware platform used to gather the benchmark times must also
-vary.  Therefore, for each processor supported the hardware
-platform must be defined.  Each definition will include a brief
-description of the target hardware platform including the clock
-speed, memory wait states encountered, and any other pertinent
-information.  This definition may be found in the processor
-dependent timing data chapter within this supplement.
-
-@subsection What is measured?
-
-An effort was made to provide execution times for a
-large portion of RTEMS.  Times were provided for most directives
-regardless of whether or not they are typically used in time
-critical code.  For example, execution times are provided for
-all object create and delete directives, even though these are
-typically part of application initialization.
-
-The times include all RTEMS actions necessary in a
-particular scenario.  For example, all times for blocking
-directives include the context switch necessary to transfer
-control to a new task.  Under no circumstances is it necessary
-to add context switch time to the reported times.
-
-The following list describes the objects created by
-the timing suite:
-
-@itemize @bullet
-@item All tasks are non-floating point.
-
-@item All tasks are created as local objects.
-
-@item No timeouts are used on blocking directives.
-
-@item All tasks wait for objects in FIFO order.
-
-@end itemize
-
-In addition, no user extensions are configured.
-
-@subsection What is not measured?
-
-The times presented in this document are not intended
-to represent best or worst case times, nor are all directives
-included.  For example, no times are provided for the initialize
-executive and fatal_error_occurred directives.  Other than the
-exceptions detailed in the Determinancy section, all directives
-will execute in the fixed length of time given.
-
-Other than entering and exiting an interrupt service
-routine, all directives were executed from tasks and not from
-interrupt service routines.  Directives invoked from ISRs, when
-allowable, will execute in slightly less time than when invoked
-from a task because rescheduling is delayed until the interrupt
-exits.
-
-@subsection Terminology
-
-The following is a list of phrases which are used to
-distinguish individual execution paths of the directives taken
-during the RTEMS performance analysis:
-
-@table @b
-@item another task
-The directive was performed
-on a task other than the calling task.
-
-@item available
-A task attempted to obtain a resource and
-immediately acquired it.
-
-@item blocked task
-The task operated upon by the
-directive was blocked waiting for a resource.
-
-@item caller blocks
-The requested resoure was not
-immediately available and the calling task chose to wait.
-
-@item calling task
-The task invoking the directive.
-
-@item messages flushed
-One or more messages was flushed
-from the message queue.
-
-@item no messages flushed
-No messages were flushed from
-the message queue.
-
-@item not available
-A task attempted to obtain a resource
-and could not immediately acquire it.
-
-@item no reschedule
-The directive did not require a
-rescheduling operation.
-
-@item NO_WAIT
-A resource was not available and the
-calling task chose to return immediately via the NO_WAIT option
-with an error.
-
-@item obtain current
-The current value of something was
-requested by the calling task.
-
-@item preempts caller
-The release of a resource caused a
-task of higher priority than the calling to be readied and it
-became the executing task.
-
-@item ready task
-The task operated upon by the directive
-was in the ready state.
-
-@item reschedule
-The actions of the directive
-necessitated a rescheduling operation.
-
-@item returns to caller
-The directive succeeded and
-immediately returned to the calling task.
-
-@item returns to interrupted task
-The instructions
-executed immediately following this interrupt will be in the
-interrupted task.
-
-@item returns to nested interrupt
-The instructions
-executed immediately following this interrupt will be in a
-previously interrupted ISR.
-
-@item returns to preempting task
-The instructions
-executed immediately following this interrupt or signal handler
-will be in a task other than the interrupted task.
-
-@item signal to self
-The signal set was sent to the
-calling task and signal processing was enabled.
-
-@item suspended task
-The task operated upon by the
-directive was in the suspended state.
-
-@item task readied 
-The release of a resource caused a
-task of lower or equal priority to be readied and the calling
-task remained the executing task.
-
-@item yield
-The act of attempting to voluntarily release
-the CPU.
-
-@end table
-
diff --git a/doc/common/treedef.tex b/doc/common/treedef.tex
deleted file mode 100644
index 26eda0c28c..0000000000
--- a/doc/common/treedef.tex
+++ /dev/null
@@ -1,317 +0,0 @@
-%               treedef.tex
-%
-%       These definitions for tree macros are taken from "Trees in TeX",
-%       by David Eppstein, as published in TUGboat 6#1, March 1985.
-%       David Eppstein's address (as of 15 June 1988) is
-%               Computer Science Department
-%               Columbia University
-%               New York, NY 10027
-%               Eppstein@cs.Columbia.edu
-%
-%              Tree -- a macro to make aligned (horizontal) trees in TeX
-%
-%    Input is of the form
-%        \tree
-%           item
-%           \subtree
-%              \leaf{item}
-%                 .
-%                 .
-%                 .
-%           \endsubtree
-%           \subtree
-%              .
-%              .
-%              .
-%           \endsubtree
-%        \endsubtree
-%     \endtree
-%
-%    Nesting is to any level.  \leaf is defined as a subtree of one item:
-% \def\leaf#1{\subtree#1\endsubtree}.
-%
-%    A structure:
-%       \subtree
-%          item_part1
-%          item_part2
-%               .
-%               .
-%               .
-%
-% will print item_part2 directly below item_part1 as a single item
-% as if they were in a \box.
-%
-%    The macro is a 3-pass macro.  On the first pass it sets up a data
-% structure from the \subtree ... \endsubtree definitions.  On the second pass
-% it recursively calculates the width of each level of the tree.  On the third
-% pass it sets up the boxes, glue and rules.
-%
-%    By David Eppstein, TUGboat, vol. 6 (1985), no. 1, pp. 31--35.
-%    Transcribed by Margaret Kromer (peg), Feb., 1986.
-%
-%             Pass 1
-% At the end of pass 1, the tree is coded as a nested collection of \hboxes
-% and \vboxes.
-\newbox\treebox\newcount\treeboxcnt
-\def\tree{\message{Begin tree}\treeboxcnt=1\global\setbox\treebox=\boxtree}
-\def\subtree{\ettext \advance\treeboxcnt by 1 \boxtree}
-\def\leaf#1{\subtree#1\endsubtree}
-\def\endsubtree{\ettext \egroup \advance\treeboxcnt-1{}%
-             \ifnum\treeboxcnt=-1 \treeerrora\fi}
-\def\endtree{\endsubtree \ifnum\treeboxcnt>0 \treeerrorb\fi%
-             \settreesizes \typesettree \message{-- end tree}}
-% Error messages for unbalanced tree
-\def\treeerrora{\errhelp=\treeerrorahelp%
-             \errmessage{Unbalanced tree -- too many endsubtrees}}
-\newhelp\treeerrorahelp{There are more subtrees closed than opened}
-\def\treeerrorb{\errhelp=\treeerrorbhelp%
-             \errmessage{Unbalanced tree -- not enough endsubtrees}}
-\newhelp\treeerrorbhelp{Not all the subtrees of the tree are closed.
-If you continue, you'll get some mysterious secondary errors.}
-%        Set up \vbox containing root of tree
-\newif\iftreetext\treetextfalse         % Whether still aligning text
-\def\boxtree{\hbox\bgroup               % Start outer box of tree or subtree
-  \baselineskip 2.5ex                   % Narrow line spacing slightly
-  \tabskip 0pt                          % No spurious glue in alignment
-  \vbox\bgroup                          % Start inner text \vbox
-  \treetexttrue                         % Remember for \ettext
-  \let\par\crcr \obeylines              % New line breaks without explicit \cr
-  \halign\bgroup##\hfil\cr}             % Start alignment with simple template
-\def\ettext{\iftreetext                 % Are we still in inner text \vbox?
-  \crcr\egroup \egroup \fi}             % Yes, end alignment and box
-%             Pass 2
-% Recursively calculate widths of tree with \setsizes; keep results in
-% \treesizes; \treewidth contains total width calculated so far.  \treeworkbox
-% is workspace containing subtree being sized.
-\newbox\treeworkbox
-\def\cons#1#2{\edef#2{\xmark #1#2}}     % Add something to start of list
-\def\car#1{\expandafter\docar#1\docar}  % Take first element of list
-\def\docar\xmark#1\xmark#2\docar{#1}    % ..by ignoring rest in expansion
-\def\cdr#1{\expandafter\docdr#1\docdr#1}% Similarly, drop first element
-\def\docdr\xmark#1\xmark#2\docdr#3{\def#3{\xmark #2}}
-\def\xmark{\noexpand\xmark}             % List separator expands to self
-\def\nil{\xmark}                        % Empty list is just separator
-\def\settreesizes{\setbox\treeworkbox=\copy\treebox%
-              \global\let\treesizes\nil \setsizes}
-\newdimen\treewidth                     % Width of this part of the tree
-\def\setsizes{\setbox\treeworkbox=\hbox\bgroup% Get a horiz list as a workspace
-  \unhbox\treeworkbox\unskip            % Take tree, unpack it into horiz list
-  \inittreewidth                        % Get old width at this level
-  \sizesubtrees                         % Recurse through all subtrees
-  \sizelevel                            % Now set width from remaining \vbox
-  \egroup}                              % All done, finish our \hbox
-\def\inittreewidth{\ifx\treesizes\nil   % If this is the first at this level
-    \treewidth=0pt                      % ..then we have no previous max width
- \else \treewidth=\car\treesizes        % Otherwise take old max level width
-   \global\cdr\treesizes                % ..and advance level width storage
-   \fi}                                 % ..in preparation for next level.
-\def\sizesubtrees{\loop                 % For each box in horiz list (subtree)
-  \setbox\treeworkbox=\lastbox \unskip  % ..pull it off list and flush glue
-  \ifhbox\treeworkbox \setsizes         % If hbox, it's a subtree - recurse
-  \repeat}                              % ..and loop; end loop on tree text
-\def\sizelevel{%
-  \ifdim\treewidth<\wd\treeworkbox      % If greater than previous maximum
-  \treewidth=\wd\treeworkbox \fi        % Then set max to new high
- \global\cons{\the\treewidth}\treesizes}% In either case, put back on list
-%             Pass 3
-% Recursively typeset tree with \maketree by adding an \hbox containing
-% a subtree (in \treebox) to the horizontal list.
-\newdimen\treeheight                    % Height of this part of the tree
-\newif\ifleaf                           % Tree has no subtrees (is a leaf)
-\newif\ifbotsub                         % Bottom subtree of parent
-\newif\iftopsub                         % Top subtree of parent
-\def\typesettree{\medskip\maketree\medskip}  % Make whole tree
-\def\maketree{\hbox{\treewidth=\car\treesizes  % Get width at this level
-  \cdr\treesizes                        % Set up width list for recursion
-  \makesubtreebox\unskip                % Set \treebox to text, make subtrees
-  \ifleaf \makeleaf                     % No subtrees, add glue
-  \else \makeparent \fi}}               % Have subtrees, stick them at right
-{\catcode`@=11                          % Be able to use \voidb@x
-\gdef\makesubtreebox{\unhbox\treebox    % Open up tree or subtree
-  \unskip\global\setbox\treebox\lastbox % Pick up very last box
-  \ifvbox\treebox                       % If we're already at the \vbox
-    \global\leaftrue \let\next\relax    % ..then this is a leaf
-  \else \botsubtrue                     % Otherwise, we have subtrees
-    \setbox\treeworkbox\box\voidb@x     % Init stack of processed subs
-    \botsubtrue \let\next\makesubtree   % ..and call \maketree on them
-  \fi \next}}                           % Finish up for whichever it was
-\def\makesubtree{\setbox1\maketree      % Call \maketree on this subtree
-  \unskip\global\setbox\treebox\lastbox % Pick up box before it
-  \treeheight=\ht1                      % Get height of subtree we made
-  \advance\treeheight 2ex               % Add some room around the edges
-  \ifhbox\treebox \topsubfalse          % If picked up box is a \vbox,
-    \else \topsubtrue \fi               % ..this is the top, otherwise not
-  \addsubtreebox                        % Stack subtree with the rest
-  \iftopsub \global\leaffalse           % If top, remember not a leaf
-    \let\next\relax \else               % ..(after recursion), set return
-    \botsubfalse \let\next\makesubtree  % Otherwise, we have more subtrees
-  \fi \next}                            % Do tail recursion or return
-\def\addsubtreebox{\setbox\treeworkbox=\vbox{\subtreebox\unvbox\treeworkbox}}
-\def\subtreebox{\hbox\bgroup            % Start \hbox of tree and lines
-  \vbox to \treeheight\bgroup           % Start \vbox for vertical rules
-    \ifbotsub \iftopsub \vfil           % If both bottom and top subtree
-        \hrule width 0.4pt              % ..vertical rule is just a dot
-     \else \treehalfrule \fi \vfil      % Bottom gets half-height rule
-    \else \iftopsub \vfil \treehalfrule % Top gets half-height the other way
-     \else \hrule width 0.4pt height \treeheight \fi\fi % Middle, full height
-    \egroup                             % Finish vertical rule \vbox
-  \treectrbox{\hrule width 1em}\hskip 0.2em\treectrbox{\box1}\egroup}
-\def\treectrbox#1{\vbox to \treeheight{\vfil #1\vfil}}
-\def\treehalfrule{\dimen\treeworkbox=\treeheight   % Get total height
-  \divide\dimen\treeworkbox 2%
-  \advance\dimen\treeworkbox 0.2pt      % Divide by two, add half horiz height
-  \hrule width 0.4pt height \dimen\treeworkbox}% Make a vertical rule that high
-\def\makeleaf{\box\treebox}             % Add leaf box to horiz list
-\def\makeparent{\ifdim\ht\treebox>%
-    \ht\treeworkbox                     % If text is higher than subtrees
-    \treeheight=\ht\treebox             % ..use that height
-  \else \treeheight=\ht\treeworkbox \fi % Otherwise use height of subtrees
-  \advance\treewidth-\wd\treebox        % Take remainder of level width
-  \advance\treewidth 1em                % ..after accounting for text and glue
-  \treectrbox{\box\treebox}\hskip 0.2em % Add text, space before connection
-\treectrbox{\hrule width \treewidth}%
-  \treectrbox{\box\treeworkbox}}        % Add \hrule, subs
-
-************************************************
-% Plain TeX driver for tree.tex
-
-\def\uncatcodespecials{\catcode`@=12\def\do##1{\catcode`##1=12}\dospecials}
-\def\setupverbatim{\tt\obeylines\uncatcodespecials\obeyspaces}
-{\obeyspaces\global\let =\ }
-\def\beginshowoff{\par\begingroup\setupverbatim\doverbatim}
-{\catcode`\!=0 \catcode`\\=12
-!obeylines!gdef!doverbatim^^M#1\endshowoff{#1!endgroup!medbreak!filbreak%
-!smallskip}}
-
-% see The TeXbook, exercise 22.14
-%\input tree.tex
-\centerline{\bf TREE TREE}
-\bigskip
-\tree
-  {Tree}
-  Uses
-  \subtree
-    Computer
-    Science
-    \subtree
-      Data
-      Structures
-      \leaf{Search Tree}
-      \leaf{Priority Queue}
-    \endsubtree
-    \subtree
-      Parsing
-      \leaf{Parse Tree}
-      \leaf{Symbol Table}
-    \endsubtree
-    \subtree
-      Structured
-      Programming
-    \endsubtree
-  \endsubtree
-  \subtree
-    Genealogy
-    \leaf{Ancestors}
-    \leaf{Descendants}
-  \endsubtree
-  \subtree
-    Electrical
-    Engineering
-    \subtree
-      Paper
-      \leaf{{\it Vitae}}
-      \leaf{Announcements}
-      \leaf{Proposals}
-      \leaf{\TeX{} Samples}
-    \endsubtree
-  \endsubtree
-  \subtree
-    Construction
-    \leaf{Fences}
-    \subtree
-      Buildings
-      \subtree
-        Houses
-        \leaf{Human}
-        \leaf{Dog}
-        \leaf{Bird}
-        \leaf{Tree}
-      \endsubtree
-      \leaf{Barns}
-      \leaf{Other}
-    \endsubtree
-    \leaf{\dots}
-  \endsubtree
-  \subtree
-    Taxonomies
-    \leaf{Tree Uses}
-  \endsubtree
-\endtree
-
-\vskip.5truein
-\beginshowoff
-% see The TeXbook, exercise 22.14
-\input tree.tex
-\centerline{TREE TREE}
-\bigskip
-\tree
-  Tree
-  Uses
-  \subtree
-    Computer
-    Science
-    \subtree
-      Data
-      Structures
-      \leaf{Search Tree}
-      \leaf{Priority Queue}
-    \endsubtree
-    \subtree
-      Parsing
-      \leaf{Parse Tree}
-      \leaf{Symbol Table}
-    \endsubtree
-    \subtree
-      Structured
-      Programming
-    \endsubtree
-  \endsubtree
-  \subtree
-    Genealogy
-    \leaf{Ancestors}
-    \leaf{Descendants}
-  \endsubtree
-  \subtree
-    Electrical
-    Engineering
-    \subtree
-      Paper
-      \leaf{{\it Vitae}}
-      \leaf{Announcements}
-      \leaf{Proposals}
-      \leaf{\TeX{} Samples}
-    \endsubtree
-  \endsubtree
-  \subtree
-    Construction
-    \leaf{Fences}
-    \subtree
-      Buildings
-      \subtree
-        Houses
-        \leaf{Human}
-        \leaf{Dog}
-        \leaf{Bird}
-        \leaf{Tree}
-      \endsubtree
-      \leaf{Barns}
-      \leaf{Other}
-    \endsubtree
-    \leaf{\dots}
-  \endsubtree
-  \subtree
-    Taxonomies
-    \leaf{Tree Uses}
-  \endsubtree
-\endtree
-\endshowoff
diff --git a/doc/common/up-arrow.gif b/doc/common/up-arrow.gif
deleted file mode 100644
index 82aa8ccc68..0000000000
--- a/doc/common/up-arrow.gif
+++ /dev/null
diff --git a/doc/common/wksheets.t b/doc/common/wksheets.t
deleted file mode 100644
index b3e5c2c94f..0000000000
--- a/doc/common/wksheets.t
+++ /dev/null
@@ -1,409 +0,0 @@
-@c ******   This comment is here to remind you not to edit the wksheets.t
-@c ******   in any directory but common.
-@c
-@c Figures ...
-@c   RTEMS RAM Workspace Worksheet
-@c   RTEMS Code Space Worksheet
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Memory Requirements
-
-@section Introduction
-
-Memory is typically a limited resource in real-time
-embedded systems, therefore, RTEMS can be configured  to utilize
-the minimum amount of memory while meeting all of the
-applications requirements.  Worksheets are provided which allow
-the RTEMS application developer to determine the amount of RTEMS
-code and RAM workspace which is required by the particular
-configuration.  Also provided are the minimum code space,
-maximum code space,  and the constant data space required by
-RTEMS.
-
-@section Data Space Requirements
-
-RTEMS requires a small amount of memory for its
-private variables.  This data area must be in RAM and is
-separate from the RTEMS RAM Workspace.  The following
-illustrates the data space required for all configurations of
-RTEMS:
-
-@itemize @bullet
-@item Data Space: RTEMS_DATA_SPACE
-@end itemize
-
-@section Minimum and Maximum Code Space Requirements
-
-A maximum configuration of RTEMS includes the core
-and all managers, including the multiprocessing manager.
-Conversely, a minimum configuration of RTEMS includes only the
-core and the following managers: initialization, task, interrupt
-and fatal error.  The following illustrates the code space
-required by these configurations of RTEMS:
-
-@itemize @bullet
-@item Minimum Configuration: RTEMS_MINIMUM_CONFIGURATION
-@item Maximum Configuration: RTEMS_MAXIMUM_CONFIGURATION
-@end itemize
-
-@section RTEMS Code Space Worksheet
-
-The RTEMS Code Space Worksheet is a tool provided to
-aid the RTEMS application designer to accurately calculate the
-memory required by the RTEMS run-time environment.  RTEMS allows
-the custom configuration of the executive by optionally
-excluding managers which are not required by a particular
-application.  This worksheet provides the included and excluded
-size of each manager in tabular form allowing for the quick
-calculation of any custom configuration of RTEMS.  The RTEMS
-Code Space Worksheet is below:
-
-@ifset use-ascii
-@page
-@end ifset
-@ifset use-tex
-@page
-@end ifset
-
-@page
-@center @b{RTEMS Code Space Worksheet}
-@sp 1 
-
-@ifset use-ascii
-
-The following is a list of the components of the RTEMS code space.  The first
-number in parentheses is the size when the component is included,
-while the second number indicates its size when not included.  If the second
-number is "NA", then the component must always be included.
-
-@itemize @bullet
-@item Core (RTEMS_CORE_CODE_SIZE, NA)
-@item Initialization (RTEMS_INITIALIZATION_CODE_SIZE, NA)
-@item Task (RTEMS_TASK_CODE_SIZE, NA)
-@item Interrupt (RTEMS_INTERRUPT_CODE_SIZE, NA)
-@item Clock (RTEMS_CLOCK_CODE_SIZE, NA)
-@item Timer (RTEMS_TIMER_CODE_SIZE, RTEMS_TIMER_CODE_OPTSIZE)
-@item Semaphore (RTEMS_SEMAPHORE_CODE_SIZE, RTEMS_SEMAPHORE_CODE_OPTSIZE)
-@item Message (RTEMS_MESSAGE_CODE_SIZE, RTEMS_MESSAGE_CODE_OPTSIZE)
-@item Event (RTEMS_EVENT_CODE_SIZE, RTEMS_EVENT_CODE_OPTSIZE)
-@item Signal (RTEMS_SIGNAL_CODE_SIZE, RTEMS_SIGNAL_CODE_OPTSIZE)
-@item Partition (RTEMS_PARTITION_CODE_SIZE, RTEMS_PARTITION_CODE_OPTSIZE)
-@item Region (RTEMS_REGION_CODE_SIZE, RTEMS_REGION_CODE_OPTSIZE)
-@item Dual Ported Memory (RTEMS_DPMEM_CODE_SIZE, RTEMS_DPMEM_CODE_OPTSIZE)
-@item I/O (RTEMS_IO_CODE_SIZE, RTEMS_IO_CODE_OPTSIZE)
-@item Fatal Error (RTEMS_FATAL_ERROR_CODE_SIZE, NA)
-@item Rate Monotonic (RTEMS_RATE_MONOTONIC_CODE_SIZE, RTEMS_RATE_MONOTONIC_CODE_OPTSIZE)
-@item Multiprocessing (RTEMS_MULTIPROCESSING_CODE_SIZE, RTEMS_MULTIPROCESSING_CODE_OPTSIZE)
-@end itemize
-@end ifset
-
-@ifset use-tex
-
-@tex
-\line{\hskip 0.50in\vbox{\offinterlineskip\halign{
-\vrule\strut#&
-\hbox to 2.25in{\enskip\hfil#\hfil}&
-\vrule#&
-\hbox to 1.00in{\enskip\hfil#\hfil}&
-\vrule#&
-\hbox to 1.00in{\enskip\hfil#\hfil}&
-\vrule#&
-\hbox to 1.25in{\enskip\hfil#\hfil}&
-\vrule#\cr
-\noalign{\hrule}
-&\bf Component && \bf Included && \bf Not Included && \bf Size &\cr\noalign{\hrule}
-&Core && RTEMS_CORE_CODE_SIZE && NA && &\cr\noalign{\hrule}
-&Initialization && RTEMS_INITIALIZATION_CODE_SIZE && NA && &\cr\noalign{\hrule}
-&Task && RTEMS_TASK_CODE_SIZE && NA && &\cr\noalign{\hrule}
-&Interrupt && RTEMS_INTERRUPT_CODE_SIZE && NA && &\cr\noalign{\hrule}
-&Clock && RTEMS_CLOCK_CODE_SIZE && NA && &\cr\noalign{\hrule}
-&Timer && RTEMS_TIMER_CODE_SIZE && RTEMS_TIMER_CODE_OPTSIZE && &\cr\noalign{\hrule}
-&Semaphore && RTEMS_SEMAPHORE_CODE_SIZE && RTEMS_SEMAPHORE_CODE_OPTSIZE && &\cr\noalign{\hrule}
-&Message && RTEMS_MESSAGE_CODE_SIZE && RTEMS_MESSAGE_CODE_OPTSIZE && &\cr\noalign{\hrule}
-&Event && RTEMS_EVENT_CODE_SIZE && RTEMS_EVENT_CODE_OPTSIZE && &\cr\noalign{\hrule}
-&Signal && RTEMS_SIGNAL_CODE_SIZE && RTEMS_SIGNAL_CODE_OPTSIZE && &\cr\noalign{\hrule}
-&Partition && RTEMS_PARTITION_CODE_SIZE && RTEMS_PARTITION_CODE_OPTSIZE && &\cr\noalign{\hrule}
-&Region && RTEMS_REGION_CODE_SIZE && RTEMS_REGION_CODE_OPTSIZE && &\cr\noalign{\hrule}
-&Dual Ported Memory && RTEMS_DPMEM_CODE_SIZE && RTEMS_DPMEM_CODE_OPTSIZE && &\cr\noalign{\hrule}
-&I/O && RTEMS_IO_CODE_SIZE && RTEMS_IO_CODE_OPTSIZE && &\cr\noalign{\hrule}
-&Fatal Error && RTEMS_FATAL_ERROR_CODE_SIZE && NA && &\cr\noalign{\hrule}
-&Rate Monotonic && RTEMS_RATE_MONOTONIC_CODE_SIZE && RTEMS_RATE_MONOTONIC_CODE_OPTSIZE && &\cr\noalign{\hrule}
-&Multiprocessing && RTEMS_MULTIPROCESSING_CODE_SIZE && RTEMS_MULTIPROCESSING_CODE_OPTSIZE && &\cr\noalign{\hrule}
-&\multispan 5 \bf\hfil Total Code Space Requirements\qquad\hfil&&&\cr\noalign{\hrule}
-}}\hfil}
-@end tex
-@end ifset
-
-@ifset use-html
-@html
-<CENTER>
-  <TABLE COLS=4 WIDTH="80%" BORDER=2>
-<TR><TD ALIGN=center><STRONG>Component</STRONG></TD>
-    <TD ALIGN=center><STRONG>Included</STRONG></TD>
-    <TD ALIGN=center><STRONG>Not Included</STRONG></TD>
-    <TD ALIGN=center><STRONG>Size</STRONG></TD></TR>
-<TR><TD ALIGN=center>Core</TD>
-    <TD ALIGN=center>RTEMS_CORE_CODE_SIZE</TD>
-    <TD ALIGN=center>NA</TD>
-     <TD><BR></TD></TR>
-<TR><TD ALIGN=center>Initialization</TD>
-    <TD ALIGN=center>RTEMS_INITIALIZATION_CODE_SIZE</TD>
-    <TD ALIGN=center>NA</TD>
-     <TD><BR></TD></TR>
-<TR><TD ALIGN=center>Task</TD>
-    <TD ALIGN=center>RTEMS_TASK_CODE_SIZE</TD>
-    <TD ALIGN=center>NA</TD>
-     <TD><BR></TD></TR>
-<TR><TD ALIGN=center>Interrupt</TD>
-    <TD ALIGN=center>RTEMS_INTERRUPT_CODE_SIZE</TD>
-    <TD ALIGN=center>NA</TD>
-     <TD><BR></TD></TR>
-<TR><TD ALIGN=center>Clock</TD>
-    <TD ALIGN=center>RTEMS_CLOCK_CODE_SIZE</TD>
-    <TD ALIGN=center>NA</TD>
-     <TD><BR></TD></TR>
-<TR><TD ALIGN=center>Timer</TD>
-    <TD ALIGN=center>RTEMS_TIMER_CODE_SIZE</TD>
-    <TD ALIGN=center>RTEMS_TIMER_CODE_OPTSIZE</TD>
-     <TD><BR></TD></TR>
-<TR><TD ALIGN=center>Semaphore</TD>
-    <TD ALIGN=center>RTEMS_SEMAPHORE_CODE_SIZE</TD>
-    <TD ALIGN=center>RTEMS_SEMAPHORE_CODE_OPTSIZE</TD>
-     <TD><BR></TD></TR>
-<TR><TD ALIGN=center>Message</TD>
-    <TD ALIGN=center>RTEMS_MESSAGE_CODE_SIZE</TD>
-    <TD ALIGN=center>RTEMS_MESSAGE_CODE_OPTSIZE</TD>
-     <TD><BR></TD></TR>
-<TR><TD ALIGN=center>Event</TD>
-    <TD ALIGN=center>RTEMS_EVENT_CODE_SIZE</TD>
-    <TD ALIGN=center>RTEMS_EVENT_CODE_OPTSIZE</TD>
-     <TD><BR></TD></TR>
-<TR><TD ALIGN=center>Signal</TD>
-    <TD ALIGN=center>RTEMS_SIGNAL_CODE_SIZE</TD>
-    <TD ALIGN=center>RTEMS_SIGNAL_CODE_OPTSIZE</TD>
-     <TD><BR></TD></TR>
-<TR><TD ALIGN=center>Partition</TD>
-    <TD ALIGN=center>RTEMS_PARTITION_CODE_SIZE</TD>
-    <TD ALIGN=center>RTEMS_PARTITION_CODE_OPTSIZE</TD>
-     <TD><BR></TD></TR>
-<TR><TD ALIGN=center>Region</TD>
-    <TD ALIGN=center>RTEMS_REGION_CODE_SIZE</TD>
-    <TD ALIGN=center>RTEMS_REGION_CODE_OPTSIZE</TD>
-     <TD><BR></TD></TR>
-<TR><TD ALIGN=center>Dual Ported Memory</TD>
-    <TD ALIGN=center>RTEMS_DPMEM_CODE_SIZE</TD>
-    <TD ALIGN=center>RTEMS_DPMEM_CODE_OPTSIZE</TD>
-     <TD><BR></TD></TR>
-<TR><TD ALIGN=center>I/O</TD>
-    <TD ALIGN=center>RTEMS_IO_CODE_SIZE</TD>
-    <TD ALIGN=center>RTEMS_IO_CODE_OPTSIZE</TD>
-     <TD><BR></TD></TR>
-<TR><TD ALIGN=center>Fatal Error</TD>
-    <TD ALIGN=center>RTEMS_FATAL_ERROR_CODE_SIZE</TD>
-    <TD ALIGN=center>NA</TD>
-     <TD><BR></TD></TR>
-<TR><TD ALIGN=center>Rate Monotonic</TD>
-    <TD ALIGN=center>RTEMS_RATE_MONOTONIC_CODE_SIZE</TD>
-    <TD ALIGN=center>RTEMS_RATE_MONOTONIC_CODE_OPTSIZE</TD>
-     <TD><BR></TD></TR>
-<TR><TD ALIGN=center>Multiprocessing</TD>
-    <TD ALIGN=center>RTEMS_MULTIPROCESSING_CODE_SIZE</TD>
-    <TD ALIGN=center>RTEMS_MULTIPROCESSING_CODE_OPTSIZE</TD>
-     <TD><BR></TD></TR>
-<TR><TD ALIGN=center COLSPAN=3>
-      <STRONG>Total Code Space Requirements</STRONG></TD>
-     <TD><BR></TD></TR>
-  </TABLE>
-</CENTER>
-@end html
-@end ifset
-
-@page
-
-@c ******   Next node is set by a sed script in the document Makefile.
-@c ******   This comment is here to remind you not to edit the wksheets.t
-@c ******   in any directory but common.
-
-@section RTEMS RAM Workspace Worksheet
-
-The RTEMS RAM Workspace Worksheet is a tool provided
-to aid the RTEMS application designer to accurately calculate
-the minimum memory block to be reserved for RTEMS use.  This
-worksheet provides equations for calculating the amount of
-memory required based upon the number of objects configured,
-whether for single or multiple processor versions of the
-executive.  This information is presented in tabular form, along
-with the fixed system requirements, allowing for quick
-calculation of any application defined configuration of RTEMS.
-The RTEMS RAM Workspace Worksheet is provided below:
-
-@ifset use-ascii
-@page
-@end ifset
-@ifset use-tex
-@sp 2 
-@end ifset
-
-@center @b{RTEMS RAM Workspace Worksheet}
-@sp 2 
-
-@ifset use-ascii
-The total RTEMS RAM Workspace required is the sum of the following:
-
-@itemize @bullet
-@item maximum_tasks * RTEMS_BYTES_PER_TASK
-@item maximum_timers * RTEMS_BYTES_PER_TIMER
-@item maximum_semaphores * RTEMS_BYTES_PER_SEMAPHORE
-@item maximum_message_queues * RTEMS_BYTES_PER_MESSAGE_QUEUE
-@item maximum_regions * RTEMS_BYTES_PER_REGION
-@item maximum_partitions * RTEMS_BYTES_PER_PARTITION
-@item maximum_ports * RTEMS_BYTES_PER_PORT
-@item maximum_periods * RTEMS_BYTES_PER_PERIOD
-@item maximum_extensions * RTEMS_BYTES_PER_EXTENSION
-@item Floating Point Tasks * RTEMS_BYTES_PER_FP_TASK
-@item Task Stacks
-@item maximum_nodes * RTEMS_BYTES_PER_NODE
-@item maximum_global_objects * RTEMS_BYTES_PER_GLOBAL_OBJECT
-@item maximum_proxies * RTEMS_BYTES_PER_PROXY
-@item Fixed System Requirements of RTEMS_BYTES_OF_FIXED_SYSTEM_REQUIREMENTS
-@end itemize
-@end ifset
-
-@ifset use-tex
-@tex
-\line{\hskip 0.75in\vbox{\offinterlineskip\halign{
-\vrule\strut#&
-\hbox to 3.0in{\enskip\hfil#\hfil}&
-\vrule#&
-\hbox to 0.75in{\enskip\hfil#\hfil}&
-\vrule#&
-\hbox to 1.25in{\enskip\hfil#\hfil}&
-\vrule#\cr
-\noalign{\hrule}
-& \bf Description && \bf Equation && \bf Bytes Required &\cr\noalign{\hrule}
-& maximum\_tasks &&  * RTEMS_BYTES_PER_TASK = &&&\cr\noalign{\hrule}
-& maximum\_timers &&  * RTEMS_BYTES_PER_TIMER = &&&\cr\noalign{\hrule}
-& maximum\_semaphores &&  * RTEMS_BYTES_PER_SEMAPHORE = &&&\cr\noalign{\hrule}
-& maximum\_message\_queues &&  * RTEMS_BYTES_PER_MESSAGE_QUEUE = &&&\cr\noalign{\hrule}
-& maximum\_regions &&  * RTEMS_BYTES_PER_REGION = &&&\cr\noalign{\hrule}
-& maximum\_partitions &&  * RTEMS_BYTES_PER_PARTITION = &&&\cr\noalign{\hrule}
-& maximum\_ports &&  * RTEMS_BYTES_PER_PORT = &&&\cr\noalign{\hrule}
-& maximum\_periods &&  * RTEMS_BYTES_PER_PERIOD = &&&\cr\noalign{\hrule}
-& maximum\_extensions &&  * RTEMS_BYTES_PER_EXTENSION = &&&\cr\noalign{\hrule}
-& Floating Point Tasks &&  * RTEMS_BYTES_PER_FP_TASK = &&&\cr\noalign{\hrule}
-& Task Stacks &&\hskip 2.3em=&&&\cr\noalign{\hrule}
-& Total Single Processor Requirements &&&&&\cr\noalign{\hrule}
-}}\hfil}
-
-\line{\hskip 0.75in\vbox{\offinterlineskip\halign{
-\vrule\strut#&
-\hbox to 3.0in{\enskip\hfil#\hfil}&
-\vrule#&
-\hbox to 0.75in{\enskip\hfil#\hfil}&
-\vrule#&
-\hbox to 1.25in{\enskip\hfil#\hfil}&
-\vrule#\cr
-\noalign{\hrule}
-& \bf Description && \bf Equation && \bf Bytes Required &\cr\noalign{\hrule}
-& maximum\_nodes &&  * RTEMS_BYTES_PER_NODE = &&&\cr\noalign{\hrule}
-& maximum\_global\_objects &&  * RTEMS_BYTES_PER_GLOBAL_OBJECT = &&&\cr\noalign{\hrule}
-& maximum\_proxies &&  * RTEMS_BYTES_PER_PROXY = &&&\cr\noalign{\hrule}
-}}\hfil}
-
-\line{\hskip 0.75in\vbox{\offinterlineskip\halign{
-\vrule\strut#&
-\hbox to 3.0in{\enskip\hfil#\hfil}&
-\vrule#&
-\hbox to 0.75in{\enskip\hfil#\hfil}&
-\vrule#&
-\hbox to 1.25in{\enskip\hfil#\hfil}&
-\vrule#\cr
-\noalign{\hrule}
-& Total Multiprocessing Requirements &&&&&\cr\noalign{\hrule}
-& Fixed System Requirements && RTEMS_BYTES_OF_FIXED_SYSTEM_REQUIREMENTS &&&\cr\noalign{\hrule}
-& Total Single Processor Requirements &&&&&\cr\noalign{\hrule}
-& Total Multiprocessing Requirements &&&&&\cr\noalign{\hrule}
-& Minimum Bytes for RTEMS Workspace &&&&&\cr\noalign{\hrule}
-}}\hfil}
-@end tex
-@end ifset
-
-@ifset use-html
-@html
-<CENTER>
-  <TABLE COLS=3 WIDTH="80%" BORDER=2>
-<TR><TD ALIGN=center><STRONG>Description</STRONG></TD>
-    <TD ALIGN=center><STRONG>Equation</STRONG></TD>
-    <TD ALIGN=center><STRONG>Bytes Required</STRONG></TD></TR>
-<TR><TD ALIGN=left>maximum_tasks</TD>
-    <TD ALIGN=right>* RTEMS_BYTES_PER_TASK =</TD>
-     <TD><BR></TD></TR>
-<TR><TD ALIGN=left>maximum_timers</TD>
-    <TD ALIGN=right>* RTEMS_BYTES_PER_TIMER =</TD>
-     <TD><BR></TD></TR>
-<TR><TD ALIGN=left>maximum_semaphores</TD>
-    <TD ALIGN=right>* RTEMS_BYTES_PER_SEMAPHORE =</TD>
-     <TD><BR></TD></TR>
-<TR><TD ALIGN=left>maximum_message_queues</TD>
-    <TD ALIGN=right>* RTEMS_BYTES_PER_MESSAGE_QUEUE =</TD>
-     <TD><BR></TD></TR>
-<TR><TD ALIGN=left>maximum_regions</TD>
-    <TD ALIGN=right>* RTEMS_BYTES_PER_REGION =</TD>
-     <TD><BR></TD></TR>
-<TR><TD ALIGN=left>maximum_partitions</TD>
-    <TD ALIGN=right>* RTEMS_BYTES_PER_PARTITION =</TD>
-     <TD><BR></TD></TR>
-<TR><TD ALIGN=left>maximum_ports</TD>
-    <TD ALIGN=right>* RTEMS_BYTES_PER_PORT =</TD>
-     <TD><BR></TD></TR>
-<TR><TD ALIGN=left>maximum_periods</TD>
-    <TD ALIGN=right>* RTEMS_BYTES_PER_PERIOD =</TD>
-     <TD><BR></TD></TR>
-<TR><TD ALIGN=left>maximum_extensions</TD>
-    <TD ALIGN=right>* RTEMS_BYTES_PER_EXTENSION =</TD>
-     <TD><BR></TD></TR>
-<TR><TD ALIGN=left>Floating Point Tasks</TD>
-    <TD ALIGN=right>* RTEMS_BYTES_PER_FP_TASK =</TD>
-     <TD><BR></TD></TR>
-<TR><TD ALIGN=left COLSPAN=2>Task Stacks</TD>
-     <TD><BR></TD></TR>
-<TR><TD ALIGN=left COLSPAN=2>
-      <STRONG>Total Single Processor Requirements</STRONG></TD>
-     <TD><BR></TD></TR>
-<TR></TR>
-<TR><TD ALIGN=center><STRONG>Description</STRONG></TD>
-    <TD ALIGN=center><STRONG>Equation</STRONG></TD>
-    <TD ALIGN=center><STRONG>Bytes Required</STRONG></TD></TR>
-<TR><TD ALIGN=left>maximum_nodes</TD>
-    <TD ALIGN=right>* RTEMS_BYTES_PER_NODE =</TD>
-     <TD><BR></TD></TR>
-<TR><TD ALIGN=left>maximum_global_objects</TD>
-    <TD ALIGN=right>* RTEMS_BYTES_PER_GLOBAL_OBJECT =</TD>
-     <TD><BR></TD></TR>
-<TR><TD ALIGN=left>maximum_proxies</TD>
-    <TD ALIGN=right>* RTEMS_BYTES_PER_PROXY =</TD>
-     <TD><BR></TD></TR>
-<TR><TD ALIGN=left COLSPAN=2>
-      <STRONG>Total Multiprocessing Requirements</STRONG></TD>
-     <TD><BR></TD></TR>
-<TR></TR>
-<TR><TD ALIGN=left COLSPAN=2>Fixed System Requirements</TD>
-    <TD ALIGN=center>RTEMS_BYTES_OF_FIXED_SYSTEM_REQUIREMENTS</TD></TR>
-<TR><TD ALIGN=left COLSPAN=2>Total Single Processor Requirements</TD>
-     <TD><BR></TD></TR>
-<TR><TD ALIGN=left COLSPAN=2>Total Multiprocessing Requirements</TD>
-     <TD><BR></TD></TR>
-<TR><TD ALIGN=left COLSPAN=2>
-      <STRONG>Minimum Bytes for RTEMS Workspace</STRONG></TD>
-     <TD><BR></TD></TR>
-  </TABLE>
-</CENTER>
-@end html
-@end ifset
-
diff --git a/doc/develenv/Makefile b/doc/develenv/Makefile
deleted file mode 100644
index c93c8da2d7..0000000000
--- a/doc/develenv/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-#  COPYRIGHT (c) 1988-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  All rights reserved.
-#
-#  $Id$
-#
-
-PROJECT=develenv
-DISTRIBUTION_LEVEL=public
-
-include ../Make.config
-
-all: html info ps
-
-dirs:
-	$(make-dirs)
-
-COMMON_FILES=../common/cpright.texi
-
-FILES=compile.texi $(PROJECT).texi direct.texi intro.texi sample.texi utils.texi
-
-info: dirs $(PROJECT)
-	cp $(PROJECT) $(INFO_INSTALL)
-
-$(PROJECT): $(FILES)
-	$(MAKEINFO) $(PROJECT).texi
-
-dvi: $(PROJECT).dvi
-ps: dirs $(PROJECT).ps
-	
-$(PROJECT).ps: $(PROJECT).dvi
-	dvips -o $(PROJECT).ps $(PROJECT).dvi
-	cp $(PROJECT).ps $(PS_INSTALL)
-
-$(PROJECT).dvi: $(FILES)
-	$(TEXI2DVI) $(PROJECT).texi
-
-html: dirs
-	-mkdir -p $(WWW_INSTALL)/$(PROJECT)
-	-cd .. ; gmake headers
-	$(TEXI2WWW) $(TEXI2WWW_ARGS) -dir $(WWW_INSTALL)/$(PROJECT) \
- 	    $(PROJECT).texi
-
-clean:
-	rm -f *.o $(PROG) *.txt core *.html 
-	rm -f *.dvi *.ps *.log *.aux *.cp *.fn *.ky *.pg *.toc *.tp *.vr $(BASE)
-	rm -f $(PROJECT) $(PROJECT)-* _*
-
diff --git a/doc/develenv/compile.texi b/doc/develenv/compile.texi
deleted file mode 100644
index 2ac1069a86..0000000000
--- a/doc/develenv/compile.texi
+++ /dev/null
@@ -1,159 +0,0 @@
-@c This chapter is not currently in the Development Environment Guide.
-
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@ifinfo
-@node Compilation and GNU Make Stanzas, Compilation and GNU Make Stanzas Building the Entire Tree, Test Suite Source Directory, Top
-@end ifinfo
-@chapter Compilation and GNU Make Stanzas
-@ifinfo
-@menu
-* Compilation and GNU Make Stanzas Building the Entire Tree::
-* Compilation and GNU Make Stanzas Making a Component::
-* Compilation and GNU Make Stanzas Optional Manager Support::
-@end menu
-@end ifinfo
-
-RTEMS is compiled using the GNU gmake(1G) utilities.
-All examples in this section are with the gmake(1G) command.
-Note that the installation procedure for GNU Make installs it as
-make.  It is referred to as gmake in this document to
-distinguish it from any other make utilities which may also be
-on the development system.
-
-The GNU Make utility uses a file that describes the
-relationships among the files and the operations necessary for
-updating each file. The GNU Make utility uses stanzas to specify
-which set of relationships to update.  Each component and suite
-control directory contains a make control file, Makefile, which
-describes the relationships which must be checked and the
-associated update operations for each stanza. This facility is
-used to perform compilation, to remove intermediate files, to
-install RTEMS, and to maintain release and working set source
-and documentation notebooks. The following is a list of stanzas
-used by RTEMS make control files:
-
-@ifset use-texinfo-tables
-@table @code
-@item all
-perform compilation but do not install
-
-@item install
-perform compilation if directory contains source but do not install
-
-@item clean
-delete most generated files and directories for the current CPU and target
-
-@item clobber
-delete all generated files and directories for the current CPU and target
-@end table
-@end ifset
-
-@ifclear use-texinfo-tables
-@html
-<CENTER>
-  <TABLE COLS=2 WIDTH="80%" BORDER=2>
-<TR><TD ALIGN=center>all</TD>
-    <TD ALIGN=center>perform compilation but do not install</TD></TR>
-<TR><TD ALIGN=center>install</TD>
-    <TD ALIGN=center>perform compilation if directory contains source 
-        but do not install</TD></TR>
-<TR><TD ALIGN=center>clean</TD>
-    <TD ALIGN=center>delete most generated files and directories for 
-        the current CPU and target</TD></TR>
-<TR><TD ALIGN=center>clobber</TD>
-    <TD ALIGN=center>delete all generated files and directories for 
-        the current CPU and target</TD></TR>
-  </TABLE>
-</CENTER>
-@end html
-@end ifclear
-
-@ifinfo
-@node Compilation and GNU Make Stanzas Building the Entire Tree, Compilation and GNU Make Stanzas Making a Component, Compilation and GNU Make Stanzas, Compilation and GNU Make Stanzas
-@end ifinfo
-@section Building the Entire Tree
-
-At the top of the C source tree, execute the command
-gmake all.  This will build and install all components and tests
-into the directory <TARGET> in this directory.
-
-@ifinfo
-@node Compilation and GNU Make Stanzas Making a Component, Compilation and GNU Make Stanzas Optional Manager Support, Compilation and GNU Make Stanzas Building the Entire Tree, Compilation and GNU Make Stanzas
-@end ifinfo
-@section Making a Component
-
-A single component can be compiled by changing to the
-directory which contains that component and performing the
-following command:
-
-@example
-gmake
-@end example
-
-
-This is equivalent to the following command:
-
-@example
-gmake all
-@end example
-
-Both commands will result in the GNU Make utility
-determining which files require compilation or assembly.  If any
-files require compilation or assembly, then these operations
-will be performed followed by the appropriate archive or link
-command. Files installed are placed in subdirectories under the
-install point.  The install point is determined by the setting
-of the variable PROJECT_HOME in the file
-c/make/custom/<TARGET>.cfg.
-
-If the current directory is not a leaf directory,
-then the requested operation will be performed recursively to
-all subdirectories under the current directory.
-
-By specifying one of the other stanzas supported by
-the Makefile, the GNU Make utility can be used to perform such
-operations as removing all automatically generated files in a
-component (clean and clobbers stanza).
-
-NOTE: For many components it is not possible to
-compile them until other components have been installed.
-
-@ifinfo
-@node Compilation and GNU Make Stanzas Optional Manager Support, Sample Applications, Compilation and GNU Make Stanzas Making a Component, Compilation and GNU Make Stanzas
-@end ifinfo
-@section Optional Manager Support
-
-RTEMS allows the C applications developer to build
-images that only contain those components of the executive that
-are needed, leaving out those that will not be utilized.  This
-is accomplished by the RTEMS Makefile system linking in the
-"stub" versions of the optional managers in the place of those
-managers not needed by the specific application.   The
-application Makefile sets the system variable $(MANAGERS) list
-to contain those managers that are required by the application.
-The RTEMS Makefile system then is able to build a list of
-managers that are unwanted, effectively linking in the stubbed
-versions of these managers before the RTEMS library is built.
-
-For more information and implementation details refer
-to the following files:
-
-@itemize @bullet
-@item c/make/leaf.cfg,
-
-@item a Makefile for a test or sample application, and
-
-@item a compiler description file from c/make/compilers
-@end itemize
-
-These files demonstrate the use of $(MANAGERS) and
-how the unwanted managers are handled.
-
-
diff --git a/doc/develenv/develenv.texi b/doc/develenv/develenv.texi
deleted file mode 100644
index ce6d250a2c..0000000000
--- a/doc/develenv/develenv.texi
+++ /dev/null
@@ -1,122 +0,0 @@
-\input ../texinfo/texinfo   @c -*-texinfo-*-
-@c %**start of header
-@setfilename develenv
-@syncodeindex vr fn
-@synindex ky cp
-@paragraphindent 0
-@c @smallbook
-@c %**end of header
-
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@c
-@c   Master file
-@c
-
-@c Joel's Questions
-@c
-@c  1.  Why does paragraphindent only impact makeinfo?
-@c  2.  Why does paragraphindent show up in HTML?
-@c
-
-@include ../common/setup.texi
-
-@ignore
-@ifinfo
-@format
-START-INFO-DIR-ENTRY
-* RTEMS C User: (develenv).             The C User's Guide
-END-INFO-DIR-ENTRY
-@end format
-@end ifinfo
-@end ignore
-
-@c variable substitution info:
-@c
-@c @set LANGUAGE C
-@c the language is @value{LANGUAGE}
-@c NOTE:  don't use underscore in the name
-@c
-
-@c
-@c  Title Page Stuff
-@c
-
-@set edition @value{RTEMS-EDITION}
-@set version @value{RTEMS-VERSION}
-@set update-date @value{RTEMS-UPDATE-DATE}
-@set update-month @value{RTEMS-UPDATE-MONTH}
-
-@c
-@c  I don't really like having a short title page.  --joel
-@c
-@c @shorttitlepage RTEMS Development Environment Guide
-
-@setchapternewpage odd
-@settitle RTEMS Development Environment Guide
-@titlepage
-@finalout
-
-@title RTEMS Development Environment Guide
-@subtitle Edition @value{edition}, for RTEMS @value{version}
-@sp 1
-@subtitle @value{update-month}
-@author On-Line Applications Research Corporation
-@page
-@include ../common/cpright.texi
-@end titlepage
-
-@c  This prevents a black box from being printed on "overflow" lines.
-@c  The alternative is to rework a sentence to avoid this problem.
-
-@include intro.texi
-@include direct.texi
-@c @include compile.texi
-@include sample.texi
-@include utils.texi
-
-@ifinfo
-@node Top, Introduction, (dir), (dir)
-@top develenv
-
-This is the online version of the RTEMS Development Environment Guide.
-
-@c * Compilation and GNU Make Stanzas::
-
-@menu
-* Introduction::
-* Directory Structure::
-* Sample Applications::
-* RTEMS Specific Utilities::
-* Command and Variable Index::
-* Concept Index::
-@end menu
-
-@end ifinfo
-@c 
-@c 
-@c Need to copy the emacs stuff and "trailer stuff" (index, toc) into here
-@c
-
-@node Command and Variable Index, Concept Index, RTEMS Specific Utilities Ada Language Specific Utilities, Top
-@unnumbered Command and Variable Index
-
-There are currently no Command and Variable Index entries.
-
-@c @printindex fn
-
-@node Concept Index, , Command and Variable Index, Top
-@unnumbered Concept Index
-
-There are currently no Concept Index entries.
-@c @printindex cp
-
-@contents
-@bye
-
diff --git a/doc/develenv/direct.texi b/doc/develenv/direct.texi
deleted file mode 100644
index 13f366509f..0000000000
--- a/doc/develenv/direct.texi
+++ /dev/null
@@ -1,730 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@ifinfo
-@node Directory Structure, Directory Structure Suites, Introduction, Top
-@end ifinfo
-@chapter Directory Structure
-@ifinfo
-@menu
-* Directory Structure Suites::
-@end menu
-@end ifinfo
-
-The RTEMS directory structure is designed to meet
-the following requirements:
-
-@itemize @bullet
-@item encourage development of modular components.
-
-@item isolate processor and target dependent code, while
-allowing as much common source code as possible to be shared
-across multiple processors and targets.
-
-@item allow multiple RTEMS users to perform simultaneous
-compilation of RTEMS and its support facilities for different
-processors and targets.
-@end itemize
-
-The resulting directory structure has processor and
-target dependent source files isolated from generic files.  When
-RTEMS is built, object directories and an install point will be
-automatically created based upon the target BSP selected.  The
-placement of object files based upon the selected BSP name
-insures that object files are not mixed across CPUs or targets.
-This in combination with the make files allows the specific
-compilation options to be tailored for a particular target
-board.  For example, the efficiency of the memory subsystem for
-a particular target board may be sensitive to the alignment of
-data structures, while on another target board with the same
-processor memory may be very limited.  For the first target, the
-options could specify very strict alignment requirements, while
-on the second the data structures could be "packed" to conserve
-memory.  It is impossible to achieve this degree of flexibility
-without providing source code.
-@ifinfo
-@node Directory Structure Suites, C Suites, Directory Structure, Directory Structure
-@end ifinfo
-@section Suites
-@ifinfo
-@menu
-* C Suites::
-* Executive Source Directory::
-* Support Library Source Directory::
-* Test Suite Source Directory::
-@end menu
-@end ifinfo
-
-The RTEMS source tree is organized based on the
-following four variables:
-
-@itemize @bullet
-@item language,
-
-@item target processor,
-
-@item target board, and
-
-@item compiler vendor (Ada only).
-@end itemize
-
-The language may be either C or Ada and there is
-currently nothing shared between the source trees for these two
-implementations of RTEMS.  The user generally selects the
-subdirectory for the implementation they are using and ignores
-that for the other implementation.  The only exceptions to this
-normally occurs when comparing the source code for the two
-implementations or when porting both to a new CPU or target
-board.  The following shows the top level RTEMS directory
-structure which includes directories for each language
-implementation and a language independent source documentation
-directory.  The source documentation directory is currently not
-supported.
-
-@c
-@c  Tree 1 - Top Level
-@c
-
-@ifset use-ascii
-@example
-@group
-                      RTEMS
-                        |
-+-----------------------+-----------------------+
-|                                               |
-c                                              doc
-@end group
-@end example
-@end ifset
-
-@ifset use-tex
-@sp 1
-
-@tex
-{\parskip=0pt\offinterlineskip%
-\hskip 15.0em
-\hskip 1.25em\hbox to 3.00em{\hss{RTEMS}\hss}%
-\vrule width0em height1.972ex depth0.812ex\par\penalty10000
-\hskip 15.0em
-\hskip 2.75em\vrule width.04em%
-\vrule width0em height1.500ex depth0.500ex\par\penalty10000
-\hskip 15.0em
-\hskip 0.25em\vrule width2.50em height-0.407ex depth0.500ex%
-\vrule width.04em\vrule width2.50em height-0.407ex depth0.500ex%
-\vrule width0em height1.500ex depth0.500ex\par\penalty10000
-\hskip 15.0em
-\hskip 0.25em\vrule width.04em%
-\hskip 4.92em\vrule width.04em%
-\vrule width0em height1.500ex depth0.500ex\par\penalty10000
-\hskip 15.0em
-\hskip 0.00em\hbox to 0.50em{\hss{c}\hss}%
-\hskip 1.50em\hbox to 1.50em{\hss{   }\hss}%
-\hskip 1.00em\hbox to 1.50em{\hss{doc}\hss}%
-\vrule width0em height1.972ex depth0.812ex\par}
-@end tex
-@end ifset
-
-@c
-@c for now continue to use the ascii
-@c
-@ifset use-html
-@example
-@group
-                      RTEMS
-                        |
-+-----------------------+-----------------------+
-|                                               |
-c                                              doc
-@end group
-@end example
-@html
-@end html
-@end ifset
-
-Each of the following sections will describe the
-contents of the directories in the RTEMS source
-tree.
-
-@ifinfo
-@node C Suites, Executive Source Directory, Directory Structure Suites, Directory Structure Suites
-@end ifinfo
-@subsection C Suites
-
-The following table lists the suites currently included with the
-C implementation of RTEMS and the directory in which they may be located:
-
-@ifset use-texinfo-tables
-@table @code
-@item Support Libraries (BSPs, C library, CPU support)
-$RTEMS_ROOT/c/src/lib
-
-@item Single Processor Tests
-$RTEMS_ROOT/c/src/tests/sptests
-
-@item Timing Tests
-$RTEMS_ROOT/c/src/tests/tmtests
-
-@item Multiprocessor Tests
-$RTEMS_ROOT/c/src/tests/mptests
-
-@item Sample Applications
-$RTEMS_ROOT/c/src/tests/samples
-
-@item RTEMS Build Tools
-$RTEMS_SRC_BASE/c/build_tools
-
-@item Make Support
-$RTEMS_ROOT/c/make
-@end table
-@end ifset
-
-@ifclear use-texinfo-tables
-@html
-<CENTER>
-  <TABLE COLS=2 WIDTH="80%" BORDER=2>
-<TR><TD ALIGN=center>Support Libraries (BSPs, C library, CPU support)</TD>
-    <TD ALIGN=center>$RTEMS_ROOT/c/src/lib</TD></TR>
-<TR><TD ALIGN=center>Single Processor Tests</TD>
-    <TD ALIGN=center>$RTEMS_ROOT/c/src/tests/sptests</TD></TR>
-<TR><TD ALIGN=center>Timing Tests</TD>
-    <TD ALIGN=center>$RTEMS_ROOT/c/src/tests/tmtests</TD></TR>
-<TR><TD ALIGN=center>Multiprocessor Tests</TD>
-    <TD ALIGN=center>$RTEMS_ROOT/c/src/tests/mptests</TD></TR>
-<TR><TD ALIGN=center>Sample Applications</TD>
-    <TD ALIGN=center>$RTEMS_ROOT/c/src/tests/samples</TD></TR>
-<TR><TD ALIGN=center>RTEMS Build Tools</TD>
-    <TD ALIGN=center>$RTEMS_SRC_BASE/c/build_tools</TD></TR>
-<TR><TD ALIGN=center>Make Support</TD>
-    <TD ALIGN=center>$RTEMS_ROOT/c/make</TD></TR>
-  </TABLE>
-</CENTER>
-@end html
-@end ifclear
-
-
-The top level directory structure for the C implementation of RTEMS 
-is as follows:
-
-@c
-@c  Tree 2 - Top C Level
-@c
-
-@ifset use-ascii
-@example
-@group
-                     C
-                     |
-    +----------+-----------+----------+
-    |          |           |          |
-build_tools   make        src   update_tools
-@end group
-@end example
-@end ifset
-
-@ifset use-tex
-@sp 1
-
-@tex
-{\parskip=0pt\offinterlineskip%
-\hskip 08.0em
-\hskip 13.00em\hbox to 0.50em{\hss{C}\hss}%
-\vrule width0em height1.972ex depth0.812ex\par\penalty10000
-\hskip 08.0em
-\hskip 13.25em\vrule width.04em%
-\vrule width0em height1.500ex depth0.500ex\par\penalty10000
-\hskip 08.0em
-\hskip 1.75em\vrule width11.50em height-0.407ex depth0.500ex%
-\vrule width.04em\vrule width11.50em height-0.407ex depth0.500ex%
-\vrule width0em height1.500ex depth0.500ex\par\penalty10000
-\hskip 08.0em
-\hskip 1.75em\vrule width.04em%
-\hskip 5.71em\vrule width.04em%
-\hskip 5.71em\vrule width.04em%
-\hskip 5.71em\vrule width.04em%
-\hskip 5.71em\vrule width.04em%
-\vrule width0em height1.500ex depth0.500ex\par\penalty10000
-\hskip 08.0em
-\hskip 0.00em\hbox to 3.50em{\hss{Modules}\hss}%
-\hskip 1.00em\hbox to 6.00em{\hss{build\_tools}\hss}%
-\hskip 1.75em\hbox to 2.00em{\hss{make}\hss}%
-\hskip 4.00em\hbox to 1.50em{\hss{src}\hss}%
-\hskip 1.75em\hbox to 6.50em{\hss{update\_tools}\hss}%
-\vrule width0em height1.972ex depth0.812ex\par}
-@end tex
-@end ifset
-
-@ifset use-html
-@example
-@group
-                     C
-                     |
-    +----------+-----------+----------+
-    |          |           |          |
-build_tools   make        src   update_tools
-@end group
-@end example
-@html
-@end html
-@end ifset
-
-This directory contains the subdirectories which
-contain the entire C implementation of the RTEMS executive.  
-The "build-tools" directory contains an assortment of support tools
-for the RTEMS development environment.  Two subdirectories exist
-under "build-tools" which contain scripts (executables) and
-source for the support tools.  The "make" directory contains
-configuration files and subdirectories which provide a robust
-host and cross-target makefile system supporting the building of
-the  executive for numerous application environments.  The
-"update_tools" directory contains utilities which aid in the
-updating from a previous version to the current version of the
-RTEMS executive.
-
-The "src" directory structure for the C implementation of RTEMS is as follows:
-
-@c
-@c  Tree 3 - Top C src Level
-@c
-
-@ifset use-ascii
-@example
-@group
-                     C Source
-                         |
- +-----------------------+-----------------------+
- |                       |                       |
-exec                    lib                    tests
-@end group
-@end example
-@end ifset
-
-@ifset use-tex
-@sp 1
-
-@tex
-{\parskip=0pt\offinterlineskip%
-\hskip 15.0em
-\hskip 2.00em\hbox to 4.00em{\hss{C Source}\hss}%
-\vrule width0em height1.972ex depth0.812ex\par\penalty10000
-\hskip 15.0em
-\hskip 4.00em\vrule width.04em%
-\vrule width0em height1.500ex depth0.500ex\par\penalty10000
-\hskip 15.0em
-\hskip 1.00em\vrule width3.00em height-0.407ex depth0.500ex%
-\vrule width.04em\vrule width3.00em height-0.407ex depth0.500ex%
-\vrule width0em height1.500ex depth0.500ex\par\penalty10000
-\hskip 15.0em
-\hskip 1.00em\vrule width.04em%
-\hskip 2.96em\vrule width.04em%
-\hskip 2.96em\vrule width.04em%
-\vrule width0em height1.500ex depth0.500ex\par\penalty10000
-\hskip 15.0em
-\hskip 0.00em\hbox to 2.00em{\hss{exec}\hss}%
-\hskip 1.25em\hbox to 1.50em{\hss{lib}\hss}%
-\hskip 1.00em\hbox to 2.50em{\hss{tests}\hss}%
-\vrule width0em height1.972ex depth0.812ex\par}
-@end tex
-@end ifset
-
-@ifset use-html
-@example
-@group
-                     C Source
-                         |
- +-----------------------+-----------------------+
- |                       |                       |
-exec                    lib                    tests
-@end group
-@end example
-@html
-@end html
-@end ifset
-
-This directory contains all source files that
-comprises the RTEMS executive, supported target board support
-packages, and the RTEMS Test Suite.
-
-@ifinfo
-@node Executive Source Directory, Support Library Source Directory, C Suites, Directory Structure Suites
-@end ifinfo
-@subsection Executive Source Directory
-
-The "exec" directory structure for the C implementation is as follows:
-
-@c
-@c  Tree 4 - C Executive Tree
-@c
-
-@ifset use-ascii
-@example
-@group
-                    C Executive
-                         |
-  +-----------+----------+-----------+----------+
-  |           |          |           |          |
-posix       rtems       sapi       score     wrapup
-@end group
-@end example
-@end ifset
-
-@ifset use-tex
-@sp 1
-
-@tex
-{\parskip=0pt\offinterlineskip%
-\hskip 10.0em
-\hskip 6.00em\hbox to 5.50em{\hss{C Executive}\hss}%
-\vrule width0em height1.972ex depth0.812ex\par\penalty10000
-\hskip 10.0em
-\hskip 8.75em\vrule width.04em%
-\vrule width0em height1.500ex depth0.500ex\par\penalty10000
-\hskip 10.0em
-\hskip 1.25em\vrule width7.50em height-0.407ex depth0.500ex%
-\vrule width.04em\vrule width7.50em height-0.407ex depth0.500ex%
-\vrule width0em height1.500ex depth0.500ex\par\penalty10000
-\hskip 10.0em
-\hskip 1.25em\vrule width.04em%
-\hskip 3.71em\vrule width.04em%
-\hskip 3.71em\vrule width.04em%
-\hskip 3.71em\vrule width.04em%
-\hskip 3.71em\vrule width.04em%
-\vrule width0em height1.500ex depth0.500ex\par\penalty10000
-\hskip 10.0em
-\hskip 0.00em\hbox to 2.50em{\hss{posix}\hss}%
-\hskip 1.25em\hbox to 2.50em{\hss{rtems}\hss}%
-\hskip 1.50em\hbox to 2.00em{\hss{sapi}\hss}%
-\hskip 1.50em\hbox to 2.50em{\hss{score}\hss}%
-\hskip 1.00em\hbox to 3.00em{\hss{wrapup}\hss}%
-\vrule width0em height1.972ex depth0.812ex\par}
-@end tex
-@end ifset
-
-@ifset use-html
-@example
-@group
-                    C Executive
-                         |
-  +-----------+----------+-----------+----------+
-  |           |          |           |          |
-posix       rtems       sapi       score     wrapup
-@end group
-@end example
-@html
-@end html
-@end ifset
-
-This directory contains a set of subdirectories which
-contains the source files comprising the executive portion of
-the RTEMS development environment.  At this point the API
-specific and "supercore" source code files are separated into
-distinct directory trees.  The "rtems" and the "posix"
-subdirectories contain the C language source files for each
-module comprising the respective API.  Also included in this
-directory are the subdirectories "sapi" and "score" which are
-the supercore modules.  Within the "score" directory the CPU
-dependent modules are found.
-
-The "cpu" directory contains a subdirectory for each
-target CPU supported by the @value{RELEASE} release of the RTEMS
-executive.  Each processor directory contains the CPU dependent
-code necessary to host RTEMS.  The "no_cpu" directory provides a
-starting point for developing a new port to an unsupported
-processor.  The files contained within the "no_cpu" directory
-may also be used as a reference for the other ports to specific
-processors.
-
-@ifinfo
-@node Support Library Source Directory, Test Suite Source Directory, Executive Source Directory, Directory Structure Suites
-@end ifinfo
-@subsection Support Library Source Directory
-
-The "lib" directory contains the support libraries and BSPS.  
-Board support packages (BSPs), processor environment start up code,
-C library support, the FreeBSD TCP/IP stack, common BSP header files,
-and miscellaneous support functions are provided in the subdirectories.
-These are combined with the RTEMS executive object to form the single 
-RTEMS library which installed.  
-
-@c
-@c  Tree 6 - Libraries
-@c
-
-
-The "libbsp" directory contains a directory for each CPU family supported
-by RTEMS.  Beneath each CPU directory is a directory for each BSP for that
-processor family.
-
-@c
-@c  Tree 7 - C BSP Library
-@c
-
-The "libbsp" directory provides all the BSPs provided with this
-release of the RTEMS executive.  The subdirectories are
-divided,  as discussed previously, based on specific processor
-family, then further breaking down into specific target board
-environments.  The "shmdr" subdirectory provides the
-implementation of a shared memory driver which supports the
-multiprocessing portion of the executive.  In addition, two
-starting point subdirectories are provided for reference.  The
-"no_cpu" subdirectory provides a template BSP which can be used
-to develop a specific BSP for an unsupported target board.  The
-"stubdr" subdirectory provides stubbed out BSPs.  These files
-may aid in preliminary testing of the RTEMS development
-environment that has been built for no particular target in mind.
-
-Below each CPU dependent directory is a directory for each target BSP
-supported in this release.
-
-Each BSP provides the modules which comprise an RTEMS BSP.  The 
-modules are separated into the subdirectories "clock", "console", 
-"include", "shmsupp", "startup", and "timer" as shown in the following 
-figure:
-
-@c
-@c  Tree 8 - Each BSP
-@c
-
-@ifset use-ascii
-@example
-@group
-                           Each BSP
-                               |
-  +-----------+----------+-----+-----+----------+----------+
-  |           |          |           |          |          |
-clock      console    include     shmsupp    startup     timer
-@end group
-@end example
-@end ifset
-
-@ifset use-tex
-@sp 1
-
-@tex
-{\parskip=0pt\offinterlineskip%
-\hskip 10.0em
-\hskip 10.25em\hbox to 4.50em{\hss{Each BSP}\hss}%
-\vrule width0em height1.972ex depth0.812ex\par\penalty10000
-\hskip 10.0em
-\hskip 12.50em\vrule width.04em%
-\vrule width0em height1.500ex depth0.500ex\par\penalty10000
-\hskip 10.0em
-\hskip 1.25em\vrule width11.25em height-0.407ex depth0.500ex%
-\vrule width.04em\vrule width11.25em height-0.407ex depth0.500ex%
-\vrule width0em height1.500ex depth0.500ex\par\penalty10000
-\hskip 10.0em
-\hskip 1.25em\vrule width.04em%
-\hskip 4.46em\vrule width.04em%
-\hskip 4.46em\vrule width.04em%
-\hskip 4.46em\vrule width.04em%
-\hskip 4.46em\vrule width.04em%
-\hskip 4.46em\vrule width.04em%
-\vrule width0em height1.500ex depth0.500ex\par\penalty10000
-\hskip 10.0em
-\hskip 0.00em\hbox to 2.50em{\hss{clock}\hss}%
-\hskip 1.50em\hbox to 3.50em{\hss{console}\hss}%
-\hskip 1.00em\hbox to 3.50em{\hss{include}\hss}%
-\hskip 1.00em\hbox to 3.50em{\hss{shmsupp}\hss}%
-\hskip 1.00em\hbox to 3.50em{\hss{startup}\hss}%
-\hskip 1.50em\hbox to 2.50em{\hss{timer}\hss}%
-\vrule width0em height1.972ex depth0.812ex\par}
-@end tex
-@end ifset
-
-@ifset use-html
-@example
-@group
-                           Each BSP
-                               |
-  +-----------+----------+-----+-----+----------+----------+
-  |           |          |           |          |          |
-clock      console    include       ...      startup     timer
-@end group
-@end example
-@html
-@end html
-@end ifset
-
-@ifinfo
-@node Test Suite Source Directory, Sample Applications, Support Library Source Directory, Directory Structure Suites
-@end ifinfo
-@subsection Test Suite Source Directory
-
-The "tests" directory structure for the C
-implementation is as follows:
-
-@c
-@c  Tree 9 - C Tests
-@c
-
-@ifset use-ascii
-@example
-@group
-                                C Tests
-                                   |
-   +----------+---------+----------+---------+---------+---------+
-   |          |         |          |         |         |         |
-libtests   sptests   support    tmtests   mptests   psxtest   samples
-@end group
-@end example
-@end ifset
-
-@ifset use-tex
-@sp 1
-
-@tex
-{\parskip=0pt\offinterlineskip%
-\hskip 05.0em
-\hskip 14.50em\hbox to 3.50em{\hss{C Tests}\hss}%
-\vrule width0em height1.972ex depth0.812ex\par\penalty10000
-\hskip 05.0em
-\hskip 16.25em\vrule width.04em%
-\vrule width0em height1.500ex depth0.500ex\par\penalty10000
-\hskip 05.0em
-\hskip 2.00em\vrule width14.25em height-0.407ex depth0.500ex%
-\vrule width.04em\vrule width14.25em height-0.407ex depth0.500ex%
-\vrule width0em height1.500ex depth0.500ex\par\penalty10000
-\hskip 05.0em
-\hskip 2.00em\vrule width.04em%
-\hskip 4.71em\vrule width.04em%
-\hskip 4.71em\vrule width.04em%
-\hskip 4.71em\vrule width.04em%
-\hskip 4.71em\vrule width.04em%
-\hskip 4.71em\vrule width.04em%
-\hskip 4.71em\vrule width.04em%
-\vrule width0em height1.500ex depth0.500ex\par\penalty10000
-\hskip 05.0em
-\hskip 0.00em\hbox to 4.00em{\hss{libtests}\hss}%
-\hskip 1.00em\hbox to 3.50em{\hss{sptests}\hss}%
-\hskip 1.25em\hbox to 3.50em{\hss{support}\hss}%
-\hskip 1.25em\hbox to 3.50em{\hss{tmtests}\hss}%
-\hskip 1.25em\hbox to 3.50em{\hss{mptests}\hss}%
-\hskip 1.75em\hbox to 2.50em{\hss{tools}\hss}%
-\hskip 1.75em\hbox to 3.50em{\hss{samples}\hss}%
-\vrule width0em height1.972ex depth0.812ex\par}
-@end tex
-@end ifset
-
-@ifset use-html
-@example
-@group
-                                C Tests
-                                   |
-   +----------+---------+----------+---------+---------+---------+
-   |          |         |          |         |         |         |
-libtests   sptests   support    tmtests   mptests    tools    samples
-@end group
-@end example
-@html
-@end html
-@end ifset
-
-This directory provides the entire RTEMS Test Suite
-which includes the single processor tests, multiprocessor tests,
-timing tests, library tests, and sample tests.   Additionally,
-subdirectories for support functions and test related header
-files are provided.
-
-The "sptests" subdirectory consists of twenty-four
-tests designed to cover the entire executive code.  The
-"spfatal" test will verify any code associated with the
-occurrence of a fatal error.   Also provided is a test which
-will determine the size of the RTEMS executive.
-
-The multiprocessor test are provided in "mptests".
-Fourteen tests are provided in this subdirectory which address
-two node configurations and cover the multiprocessor code found
-in RTEMS.
-
-Tests that time each directive and a set of critical
-executive functions are provided in the "tmtests" subdirectory.
-Within this subdirectory  thirty-one tests are provided along
-with a subdirectory to contain each targets timing results.
-
-The "samples" directory structure for the C
-implementation is as follows:
-
-@c
-@c  Tree 10 - C Samples
-@c
-
-@ifset use-ascii
-@example
-@group
-                            C Samples
-                                |
-   +-----------+----------+-----+-----+----------+----------+
-   |           |          |           |          |          |
-base_mp     base_sp    cdtest       hello     paranoia    ticker
-@end group
-@end example
-@end ifset
-
-@ifset use-tex
-@sp 1
-
-@tex
-{\parskip=0pt\offinterlineskip%
-\hskip 05.0em
-\hskip 12.25em\hbox to 4.50em{\hss{C Samples}\hss}%
-\vrule width0em height1.972ex depth0.812ex\par\penalty10000
-\hskip 05.0em
-\hskip 14.50em\vrule width.04em%
-\vrule width0em height1.500ex depth0.500ex\par\penalty10000
-\hskip 05.0em
-\hskip 2.00em\vrule width12.50em height-0.407ex depth0.500ex%
-\vrule width.04em\vrule width12.50em height-0.407ex depth0.500ex%
-\vrule width0em height1.500ex depth0.500ex\par\penalty10000
-\hskip 05.0em
-\hskip 2.00em\vrule width.04em%
-\hskip 4.96em\vrule width.04em%
-\hskip 4.96em\vrule width.04em%
-\hskip 4.96em\vrule width.04em%
-\hskip 4.96em\vrule width.04em%
-\hskip 4.96em\vrule width.04em%
-\vrule width0em height1.500ex depth0.500ex\par\penalty10000
-\hskip 05.0em
-\hskip 0.00em\hbox to 4.00em{\hss{base\_mp}\hss}%
-\hskip 1.00em\hbox to 4.00em{\hss{base\_sp}\hss}%
-\hskip 1.50em\hbox to 3.00em{\hss{cdtest}\hss}%
-\hskip 2.25em\hbox to 2.50em{\hss{hello}\hss}%
-\hskip 1.75em\hbox to 4.00em{\hss{paranoia}\hss}%
-\hskip 1.50em\hbox to 3.00em{\hss{ticker}\hss}%
-\vrule width0em height1.972ex depth0.812ex\par}
-@end tex
-@end ifset
-
-@ifset use-html
-@example
-@group
-                            C Samples
-                                |
-   +-----------+----------+-----+-----+----------+----------+
-   |           |          |           |          |          |
-base_mp     base_sp    cdtest       hello     paranoia    ticker
-@end group
-@end example
-@html
-@end html
-@end ifset
-
-This directory provides sample application tests
-which aid in the testing a newly built RTEMS environment, a new
-BSP, or as starting points for the development of an application
-using the RTEMS executive.  A Hello World test is provided in
-the subdirectory "hello".  This test is helpful when testing new
-versions of RTEMS, BSPs, or modifications to any portion of the
-RTEMS development environment.  The "ticker" subdirectory
-provides a test for verification of clock chip device drivers of
-BSPs.  A simple single processor test similar to those in the
-single processor test suite is provided in "base_sp".  A simple
-two node multiprocessor test capable of testing an newly
-developed MPCI layer is provided in "base_mp".  The "cdtest"
-subdirectory provides a simple C++ application using
-constructors and destructors.   The final sample test is a
-public domain floating point and math library toolset test is
-provided in "paranoia".
diff --git a/doc/develenv/intro.texi b/doc/develenv/intro.texi
deleted file mode 100644
index 95ae797978..0000000000
--- a/doc/develenv/intro.texi
+++ /dev/null
@@ -1,58 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@ifinfo
-@node Introduction, Directory Structure, Top, Top
-@end ifinfo
-@chapter Introduction
-
-This document describes the RTEMS development
-environment.  Discussions are provided for the following topics:
-
-@itemize @bullet
-@item the directory structure used by RTEMS,
-
-@item usage of the GNU Make utility within the RTEMS
-development environment,
-
-@item sample applications, and
-
-@item the RTEMS specific utilities.
-@end itemize
-
-RTEMS was designed as a reusable software component.
-Highly reusable software such as RTEMS is typically distributed
-in the form of source code without providing any support tools.
-RTEMS is the foundation for a complex family of facilities
-including board support packages, device drivers, and support
-libraries.  The RTEMS Development Environment is not a CASE
-tool.  It is a collection of tools designed to reduce the
-complexity of using and enhancing the RTEMS family.  Tools are
-provided which aid in the management of the development,
-maintenance, and usage of RTEMS, its run-time support
-facilities, and applications which utilize the executive.
-
-A key component of the RTEMS development environment
-is the GNU family of free tools.  This is  robust set of
-development and POSIX compatible tools for which source code is
-freely available.  The primary compilers, assemblers, linkers,
-and make utility used by the RTEMS development team are the GNU
-tools.  They are highly portable supporting a wide variety of
-host computers and, in the case of the development tools, a wide
-variety of target processors.
-
-It is recommended that the RTEMS developer become
-familiar with the RTEMS Development Environment before
-proceeding with any modifications to the executive source tree.
-The source code for the executive is very modular and source
-code is divided amongst directories based upon functionality as
-well as dependencies on CPU and target board.  This organization
-is aimed at isolating and minimizing non-portable code.  This
-has the immediate result that adding support for a new CPU or
-target board requires very little "wandering" around the source
-tree.
diff --git a/doc/develenv/sample.texi b/doc/develenv/sample.texi
deleted file mode 100644
index e5e094608b..0000000000
--- a/doc/develenv/sample.texi
+++ /dev/null
@@ -1,287 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@ifinfo
-@node Sample Applications, Sample Applications Introduction, Test Suite Source Directory, Top
-@end ifinfo
-@chapter Sample Applications
-@ifinfo
-@menu
-* Sample Applications Introduction::
-* Sample Applications Hello World::
-* Sample Applications Clock Tick::
-* Sample Applications Base Single Processor Application::
-* Sample Applications Base Multiple Processor Application::
-* Sample Applications Constructor/Destructor C++ Application::
-* Sample Applications Paranoia Floating Point Application::
-@end menu
-@end ifinfo
-
-@ifinfo
-@node Sample Applications Introduction, Sample Applications Hello World, Sample Applications, Sample Applications
-@end ifinfo
-@section Introduction
-
-RTEMS is shipped with the following sample applications:
-
-@itemize @bullet
-@item Hello World - C and Ada
-
-@item Clock Tick - C and Ada
-
-@item Base Single Processor - C and Ada
-
-@item Base Multiple Processor - C and Ada
-
-@item Constructor/Destructor C++ Test - C only if C++
-enabled
-
-@item Paranoia Floating Point Test - C only
-@end itemize
-
-These applications are intended to illustrate the
-basic format of RTEMS single and multiple processor
-applications.  In addition, these relatively simple applications
-can be used to test locally developed board support packages and
-device drivers.
-
-The reader should be familiar with the terms used and
-material presented in the RTEMS Applications User's Guide.
-
-@ifinfo
-@node Sample Applications Hello World, Sample Applications Clock Tick, Sample Applications Introduction, Sample Applications
-@end ifinfo
-@section Hello World
-
-This sample application is in the following directory:
-
-@example
-$RTEMS_SRC_BASE/tests/samples/hello
-@end example
-
-It provides a rudimentary test of the BSP start up
-code and the console output routine.  The C version of this
-sample application uses the printf function from the RTEMS
-Standard C Library to output messages.   The Ada version of this
-sample use the TEXT_IO package to output the hello messages.
-The following messages are printed:
-
-@example
-@group
-*** HELLO WORLD TEST ***
-Hello World
-*** END OF HELLO WORLD TEST ***
-@end group
-@end example
-
-These messages are printed from the application's
-single initialization task.  If the above messages are not
-printed correctly, then either the BSP start up code or the
-console output routine is not operating properly.
-
-@ifinfo
-@node Sample Applications Clock Tick, Sample Applications Base Single Processor Application, Sample Applications Hello World, Sample Applications
-@end ifinfo
-@section Clock Tick
-
-This sample application is in the following directory:
-
-@example
-$RTEMS_SRC_BASE/tests/samples/ticker
-@end example
-
-This application is designed as a simple test of the
-clock tick device driver.  In addition, this application also
-tests the printf function from the RTEMS Standard C Library by
-using it to output the following messages:
-
-@example
-@group
-*** CLOCK TICK TEST ***
-TA1 - tm_get - 09:00:00   12/31/1988
-TA2 - tm_get - 09:00:00   12/31/1988
-TA3 - tm_get - 09:00:00   12/31/1988
-TA1 - tm_get - 09:00:05   12/31/1988
-TA1 - tm_get - 09:00:10   12/31/1988
-TA2 - tm_get - 09:00:10   12/31/1988
-TA1 - tm_get - 09:00:15   12/31/1988
-TA3 - tm_get - 09:00:15   12/31/1988
-TA1 - tm_get - 09:00:20   12/31/1988
-TA2 - tm_get - 09:00:20   12/31/1988
-TA1 - tm_get - 09:00:25   12/31/1988
-TA1 - tm_get - 09:00:30   12/31/1988
-TA2 - tm_get - 09:00:30   12/31/1988
-TA3 - tm_get - 09:00:30   12/31/1988
-*** END OF CLOCK TICK TEST ***
-@end group
-@end example
-
-The clock tick sample application utilizes a single
-initialization task and three copies of the single application
-task.  The initialization task prints the test herald, sets the
-time and date, and creates and starts the three application
-tasks before deleting itself.  The three application tasks
-generate the rest of the output.  Every five seconds, one or
-more of the tasks will print the current time obtained via the
-tm_get directive.  The first task, TA1, executes every five
-seconds, the second task, TA2, every ten seconds, and the third
-task, TA3, every fifteen seconds. If the time printed does not
-match the above output, then the clock device driver is not
-operating properly.
-
-@ifinfo
-@node Sample Applications Base Single Processor Application, Sample Applications Base Multiple Processor Application, Sample Applications Clock Tick, Sample Applications
-@end ifinfo
-@section Base Single Processor Application
-
-This sample application is in the following directory:
-
-@example
-$RTEMS_SRC_BASE/tests/samples/base_sp
-@end example
-
-It provides a framework from which a single processor
-RTEMS application can be developed. The use of the task argument
-is illustrated.  This sample application uses the printf
-function from the RTEMS Standard C Library or TEXT_IO functions
-when using the Ada version to output the following messages:
-
-@example
-@group
-*** SAMPLE SINGLE PROCESSOR APPLICATION ***
-Creating and starting an application task
-Application task was invoked with argument (0) and has id of 0x10002
-*** END OF SAMPLE SINGLE PROCESSOR APPLICATION ***
-@end group
-@end example
-
-The first two messages are printed from the
-application's single initialization task.  The final messages
-are printed from the single application task.
-
-@ifinfo
-@node Sample Applications Base Multiple Processor Application, Sample Applications Constructor/Destructor C++ Application, Sample Applications Base Single Processor Application, Sample Applications
-@end ifinfo
-@section Base Multiple Processor Application
-
-This sample application is in the following directory:
-
-@example
-$RTEMS_SRC_BASE/tests/samples/base_mp
-@end example
-
-It provides a framework from which a multiprocessor
-RTEMS application can be developed. This directory has a
-subdirectory for each node in the multiprocessor system.  The
-task argument is used to distinguish the node on which the
-application task is executed.  The first node will print the
-following messages:
-
-@example
-@group
-*** SAMPLE MULTIPROCESSOR APPLICATION ***
-Creating and starting an application task
-This task was invoked with the node argument (1)
-This task has the id of 0x10002
-*** END OF SAMPLE MULTIPROCESSOR APPLICATION ***
-@end group
-@end example
-
-The second node will print the following messages:
-
-@example
-@group
-*** SAMPLE MULTIPROCESSOR APPLICATION ***
-Creating and starting an application task
-This task was invoked with the node argument (2)
-This task has the id of 0x20002
-*** END OF SAMPLE MULTIPROCESSOR APPLICATION ***
-@end group
-@end example
-
-The herald is printed from the application's single
-initialization task on each node.  The final messages are
-printed from the single application task on each node.
-
-In this sample application, all source code is shared
-between the nodes except for the node dependent configuration
-files.  These files contains the definition of the node number
-used in the initialization of the  RTEMS Multiprocessor
-Configuration Table. This file is not shared because the node
-number field in the RTEMS Multiprocessor Configuration Table
-must be unique on each node.
-
-@ifinfo
-@node Sample Applications Constructor/Destructor C++ Application, Sample Applications Paranoia Floating Point Application, Sample Applications Base Multiple Processor Application, Sample Applications
-@end ifinfo
-@section Constructor/Destructor C++ Application
-
-This sample application is in the following directory:
-
-@example
-$RTEMS_SRC_BASE/tests/samples/cdtest
-@end example
-
-This sample application demonstrates that RTEMS is
-compatible with C++ applications.  It uses constructors,
-destructor, and I/O stream output in testing these various
-capabilities.  The board support package responsible for this
-application must support a C++ environment.
-
-This sample application uses the printf function from
-the RTEMS Standard C Library to output the following messages:
-
-@example
-@group
-Hey I'M in base class constructor number 1 for 0x400010cc.
-Hey I'M in base class constructor number 2 for 0x400010d4.
-Hey I'M in derived class constructor number 3 for 0x400010d4.
-*** CONSTRUCTOR/DESTRUCTOR TEST ***
-Hey I'M in base class constructor number 4 for 0x4009ee08.
-Hey I'M in base class constructor number 5 for 0x4009ee10.
-Hey I'M in base class constructor number 6 for 0x4009ee18.
-Hey I'M in base class constructor number 7 for 0x4009ee20.
-Hey I'M in derived class constructor number 8 for 0x4009ee20.
-Testing a C++ I/O stream
-Hey I'M in derived class constructor number 8 for 0x4009ee20.
-Derived class - Instantiation order 8
-Hey I'M in base class constructor number 7 for 0x4009ee20.
-Instantiation order 8
-Hey I'M in base class constructor number 6 for 0x4009ee18.
-Instantiation order 6
-Hey I'M in base class constructor number 5 for 0x4009ee10.
-Instantiation order 5
-Hey I'M in base class constructor number 4 for 0x4009ee08.
-Instantiation order 5
-*** END OF CONSTRUCTOR/DESTRUCTOR TEST ***
-Hey I'M in base class constructor number 3 for 0x400010d4.
-Hey I'M in base class constructor number 2 for 0x400010d4.
-Hey I'M in base class constructor number 1 for 0x400010cc.
-@end group
-@end example
-
-@ifinfo
-@node Sample Applications Paranoia Floating Point Application, RTEMS Specific Utilities, Sample Applications Constructor/Destructor C++ Application, Sample Applications
-@end ifinfo
-@section Paranoia Floating Point Application
-
-This sample application is in the following directory:
-
-@example
-$RTEMS_SRC_BASE/tests/samples/paranoia
-@end example
-
-This sample application uses a public domain floating
-point and math library test to verify these capabilities of the
-RTEMS executive.  Deviations between actual and expected results
-are reported to the screen.  This is a very extensive test which
-tests all mathematical and number conversion functions.
-Paranoia is also very large and requires a long period of time
-to run.   Problems which commonly prevent this test from
-executing to completion include stack overflow and FPU exception
-handlers not installed.
diff --git a/doc/develenv/utils.texi b/doc/develenv/utils.texi
deleted file mode 100644
index d740536dac..0000000000
--- a/doc/develenv/utils.texi
+++ /dev/null
@@ -1,312 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@ifinfo
-@node RTEMS Specific Utilities, RTEMS Specific Utilities C Language Specific Utilities, Sample Applications Paranoia Floating Point Application, Top
-@end ifinfo
-@chapter RTEMS Specific Utilities
-@ifinfo
-@menu
-* RTEMS Specific Utilities C Language Specific Utilities::
-* RTEMS Specific Utilities Ada Language Specific Utilities::
-@end menu
-@end ifinfo
-
-This section describes the additional commands
-available within the RTEMS Development Environment.  Although
-some of these commands are of general use, most are included to
-provide some capability necessary to perform a required function
-in the development of the RTEMS executive, one of its support
-components, or an RTEMS based application.  The commands have
-been classified into the following categories for clarity:
-
-@itemize @bullet
-@item C Language Specific Utilities
-
-@item Ada Language Specific Utilities
-@end itemize
-
-Some of the commands are implemented as C programs.
-However, most commands are implemented as Bourne shell scripts.
-Even if the current user has selected a different shell, the
-scripts will automatically invoke the Bourne shell during their
-execution lifetime.
-
-The commands are presented in UNIX manual page style
-for compatibility and convenience.  A standard set of paragraph
-headers were used for all of the command descriptions.  If a
-section contained no data, the paragraph header was omitted to
-conserve space.  Each of the permissible paragraph headers and
-their contents are described below:
-
-@table @code
-@item SYNOPSIS
-describes the command syntax
-
-@item DESCRIPTION
-a full description of the command
-
-@item OPTIONS
-describes each of the permissible options for the command
-
-@item NOTES
-lists any special noteworthy comments about the command
-
-@item ENVIRONMENT
-describes all environment variables utilized by the command
-
-@item EXAMPLES
-illustrates the use of the command with specific examples
-
-@item FILES
-provides a list of major files that the command references
-
-@item SEE ALSO
-lists any relevant commands which can be consulted
-@end table
-
-Most environment variables referenced by the commands
-are defined for the RTEMS Development Environment during the
-login procedure.  During login, the user selects a default RTEMS
-environment through the use of the Modules package.  This tool
-effectively sets the environment variables to provide a
-consistent development environment for a specific user.
-Additional environment variables within the RTEMS environment
-were set by the system administrator during installation.  When
-specifying paths, a command description makes use of these
-environment variables.
-
-When referencing other commands in the SEE ALSO
-paragraph, the following notation is used:   command(code).
-Where command is the name of a related command, and code is a
-section number.  Valid section numbers are as follows:
-
-@table @code
-@item 1 
-Section 1 of the standard UNIX documentation
-
-@item  1G 
-Section 1 of the GNU documentation
-
-@item  1R 
-a manual page from this document, the RTEMS Development Environment Guide
-@end table
-
-For example, ls(1) means see the standard ls command
-in section 1 of the UNIX documentation.  gcc020(1G) means see
-the description of gcc020 in section 1 of the GNU documentation.
-
-@ifinfo
-@node RTEMS Specific Utilities C Language Specific Utilities, packhex - Compress Hexadecimal File, RTEMS Specific Utilities, RTEMS Specific Utilities
-@end ifinfo
-@section C Language Specific Utilities
-@ifinfo
-@menu
-* packhex - Compress Hexadecimal File::
-* unhex - Convert Hexadecimal File into Binary::
-* size_rtems - report RTEMS size information::
-@end menu
-@end ifinfo
-
-The C language utilities provide a powerful set of
-tools which combine to allow operations within the RTEMS
-Development Environment to be consistent and easy to use.  Much
-effort was devoted to providing as close to the standard UNIX
-and GNU style of operations as possible.  Each of these
-utilities are described in the section below.
-
-@ifinfo
-@node packhex - Compress Hexadecimal File, unhex - Convert Hexadecimal File into Binary, RTEMS Specific Utilities C Language Specific Utilities, RTEMS Specific Utilities C Language Specific Utilities
-@end ifinfo
-@subsection packhex - Compress Hexadecimal File
-
-@subheading SYNOPSIS
-
-@example
-packhex <source >destination
-@end example
-
-@subheading DESCRIPTION
-
-packhex accepts Intel Hexadecimal or Motorola Srecord
-on its standard input and attempts to pack as many contiguous
-bytes as possible into a single hexadecimal record.  Many
-programs output hexadecimal records which are less than 80 bytes
-long (for human viewing).  The overhead required by each
-unnecessary record is significant and packhex can often reduce
-the size of the download image by 20%.  packhex attempts to
-output records which are as long as the hexadecimal format
-allows.
-
-@subheading OPTIONS
-
-This command has no options.
-
-@subheading EXAMPLES
-
-Assume the current directory contains the Motorola
-Srecord file download.sr. Then executing the command:
-
-@example
-packhex <download.sr >packed.sr
-@end example
-
-will generate the file packed.sr which is usually
-smaller than download.sr.
-
-@subheading CREDITS
-
-The source for packhex first appeared in the May 1993
-issue of Embedded Systems magazine.  The code was downloaded
-from their BBS.  Unfortunately, the author's name was not
-provided in the listing.
-
-@ifinfo
-@node unhex - Convert Hexadecimal File into Binary, size_rtems - report RTEMS size information, packhex - Compress Hexadecimal File, RTEMS Specific Utilities C Language Specific Utilities
-@end ifinfo
-@subsection unhex - Convert Hexadecimal File into Binary Equivalent
-
-@subheading SYNOPSIS
-
-@example
-unhex [-valF] [-o file] [file [file ...] ]
-@end example
-
-@subheading DESCRIPTION
-
-unhex accepts Intel Hexadecimal, Motorola Srecord, or
-TI 'B' records and converts them to their binary equivalent.
-The output may sent to standout or may be placed in a specified
-file with the -o option.  The designated output file may not be
-an input file.  Multiple input files may be specified with their
-outputs logically concatenated into the output file.
-
-@subheading OPTIONS
-
-This command has the following options:
-
-@table @code
-@item v
-Verbose
-
-@item a base
-First byte of output corresponds with base
-address
-
-@item l
-Linear Output
-
-@item o file
-Output File
-
-@item F k_bits
-Fill holes in input with 0xFFs up to k_bits * 1024 bits
-@end table
-
-@subheading EXAMPLES
-
-The following command will create a binary equivalent
-file for the two Motorola S record files in the specified output
-file binary.bin:
-
-@example
-unhex -o binary.bin downloadA.sr downloadB.sr
-@end example
-
-@ifinfo
-@node size_rtems - report RTEMS size information, RTEMS Specific Utilities Ada Language Specific Utilities, unhex - Convert Hexadecimal File into Binary, RTEMS Specific Utilities C Language Specific Utilities
-@end ifinfo
-@subsection size_rtems - report RTEMS size information
-
-@subheading SYNOPSIS
-
-@example
-size_rtems
-@end example
-
-@subheading DESCRIPTION
-
-size_rtems analyzes RTEMS and determines all of the
-critical sizing information which is reported in the related
-documentation.
-
-@subheading EXAMPLES
-
-To generate the RTEMS size report for the currently
-configured processor, execute the following command:
-
-@example
-size_rtems
-@end example
-
-Although the actual size information will differ, a
-report of the following format will be output:
-
-@example
-     RTEMS SIZE REPORT
-
-CODE  DATA    BSS
-==================
-MANAGERS: 15988 0       0
-CORE    : 4568  0       0
-CPU     : 364   0       0
-OVERALL : 20556 0       0
-MINIMUM : 8752  0       0
-
-init    : 1592  0       0
-tasks   : 2440  0       0
-intr    : 64    0       0
-clock   : 2252  0       0
-sem     : 876   0       0
-msg     : 1624  0       0
-event   : 604   0       0
-signal  : 212   0       0
-part    : 872   0       0
-region  : 844   0       0
-dpmem   : 532   0       0
-timer   : 424   0       0
-io      : 288   0       0
-fatal   : 40    0       0
-rtmon   : 764   0       0
-mp      : 2984  0       0
-
-sem     : 4     0       0
-msg     : 4     0       0
-event   : 4     0       0
-signal  : 4     0       0
-part    : 4     0       0
-region  : 4     0       0
-timer   : 4     0       0
-dpmem   : 4     0       0
-io      : 4     0       0
-rtmon   : 4     0       0
-mp      : 8     0       0
-@end example
-
-@subheading SEE ALSO
-
-gsize020(1G), gsize386(1G), gsize960(1G)
-
-
-@ifinfo
-@node RTEMS Specific Utilities Ada Language Specific Utilities, Command and Variable Index, size_rtems - report RTEMS size information, RTEMS Specific Utilities
-@end ifinfo
-@section Ada Language Specific Utilities
-
-The Ada language utilities provide a powerful set of
-tools which combine to allow operations within the RTEMS
-Development Environment to be consistent and easy to use.  Much
-effort was devoted to providing as close to the standard UNIX
-and GNU style of operations as possible.  Each of these
-utilities are described in the section below.
-
-NOTE:  The Ada implementation is not included in this
-release.
-
-
-
diff --git a/doc/do_docs b/doc/do_docs
deleted file mode 100755
index e67d07e1dd..0000000000
--- a/doc/do_docs
+++ /dev/null
@@ -1,64 +0,0 @@
-#! /bin/sh
-#
-#  $Id$
-#
-
-basedir=$1
-shift
-
-# classes of documents
-supplements="supplements/hppa1_1 supplements/i386 \
-    supplements/i960 supplements/m68k supplements/sparc supplements/powerpc"
-# gnu_tools="gnu_tools/newlib-1.8.0 gnu_tools/egcs-1.0.2"
-
-# Division by access level
-public_docs="user develenv networking posix_users started started_ada"
-support_docs="${supplements} ${gnu_tools}"
-partners_docs="posix1003.1 posix1003.1h"
-oar_manuals="ada_user hwapi tools/texi2www \
-  browseable_rtems posix_users_new bsp_howto"
-
-# relnotes  is obsolete
-# posix_users manual left out until finished
-# ada_user manual left out until bindings released
-
-if [ x${MANUAL_SET} = x ] ; then
-  MANUAL_SET=public
-fi
-
-case ${MANUAL_SET} in
-  public)
-    manuals="$public_docs"
-    ;;
-  support)
-    manuals="$public_docs $support_docs"
-    ;;
-  partners)
-    manuals="$public_docs $support_docs $partners_docs"
-    ;;
-  internal)
-    manuals="$public_docs $support_docs $partners_docs $oar_manuals"
-    ;;
-  *)
-    echo "ERROR: Unknown manual set ${MANUAL_SET}"
-    exit 1
-    ;;
-esac
-
-for action in $*
-do
-  for manual in $manuals
-  do
-    if [ x${TEST} = xyes ] ; then
-        echo "TEST *** make $action on ${basedir}/${manual} ***"
-    else
-        echo
-        echo "*** make $action on ${basedir}/${manual} ***"
-        echo
-        cd ${basedir}/${manual}
-        gmake $action || exit $?
-    fi
-  done
-done
-
-exit 0
diff --git a/doc/index.html b/doc/index.html
deleted file mode 100644
index 8504a3e5b3..0000000000
--- a/doc/index.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<HTML>
-<HEAD><TITLE>RTEMS RTEMS_VERSION On-Line Library</TITLE></HEAD>
-<BODY BGCOLOR="FFFFFF">
-<A HREF="http://www.oarcorp.com" target="Text Frame">
-  <IMG align=right BORDER=0 SRC="oaronly.jpg" ALT="OAR"> </A>
-<H1>RTEMS RTEMS_VERSION On-Line Library</H1>
-<HR>
-<BODY>
-<MENU>
-    <LI><A HREF="c_user/index.html">
-        RTEMS Applications C User's Guide</A>
-    <LI><A HREF="started/index.html">
-        Getting Started with RTEMS for C/C++ Users</A>
-    <LI><A HREF="started_ada/index.html">
-        Getting Started with GNAT/RTEMS</A>
-    <LI><A HREF="develenv/index.html">
-        RTEMS Development Environment Guide</A>
-    <LI><A HREF="posix_users/index.html">
-        RTEMS POSIX API User's Guide</A>
-    <LI><A HREF="networking/index.html">
-        RTEMS Network Supplement</A>
-</MENU>
-
-<HR>
-Copyright &copy; 1988-1998 <A HREF="http://www.oarcorp.com" target="Text Frame">OAR Corporation</A>
-</BODY></HTML>
diff --git a/doc/networking/Makefile b/doc/networking/Makefile
deleted file mode 100644
index 6f36ead921..0000000000
--- a/doc/networking/Makefile
+++ /dev/null
@@ -1,84 +0,0 @@
-#
-#  COPYRIGHT (c) 1988-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  All rights reserved.
-#
-#  $Id$
-#
-
-PROJECT=networking
-DISTRIBUTION_LEVEL=public
-
-include ../Make.config
-
-REPLACE=../tools/word-replace
-
-BMENU+= -c
-
-all: html info ps
-
-dirs:
-	$(make-dirs)
-
-COMMON_FILES=../common/cpright.texi ../common/setup.texi
-
-GENERATED_FILES=networkapp.texi driver.texi networktasks.texi testing.texi
-
-FILES= $(PROJECT).texi \
-  networktasks.texi preface.texi $(GENERATED_FILES)
-
-INFOFILES=$(wildcard $(PROJECT) $(PROJECT)-*)
-
-info: dirs networking
-	#cp $(wildcard $(PROJECT) $(PROJECT)-*) $(INFO_INSTALL)
-	cp $(PROJECT) $(INFO_INSTALL)
-
-networking: $(FILES)
-	$(MAKEINFO) $(PROJECT).texi
-
-dvi: $(PROJECT).dvi
-ps: dirs $(PROJECT).ps
-	
-$(PROJECT).ps: $(PROJECT).dvi
-	dvips -o $(PROJECT).ps $(PROJECT).dvi
-	cp $(PROJECT).ps $(PS_INSTALL)
-
-$(PROJECT).dvi: $(FILES)
-	$(TEXI2DVI) $(PROJECT).texi
-
-networktasks.texi: networktasks.t Makefile
-	$(BMENU) -p "Preface" \
-	   -u "Top" \
-	   -n "Writing RTEMS Network Device Drivers" ${*}.t
-
-driver.texi: driver.t Makefile
-	$(BMENU) -p "Network Task Structure and Data Flow" \
-	   -u "Top" \
-	   -n "Using Networking in an RTEMS Application" ${*}.t
-
-networkapp.texi: networkapp.t Makefile
-	$(BMENU) -p " Write Your Driver Statistic-Printing Function" \
-	   -u "Top" \
-	   -n "Testing the Driver" ${*}.t
-
-testing.texi: testing.t Makefile
-	$(BMENU) -p "Network Statistics" \
-	   -u "Top" \
-	   -n "Command and Variable Index" ${*}.t
-
-html: dirs $(FILES)
-	-mkdir -p $(WWW_INSTALL)/$(PROJECT)
-	rm -f $(WWW_INSTALL)/$(PROJECT)/networking.gif
-	cp networking.gif $(WWW_INSTALL)/$(PROJECT)/networking.gif
-	$(TEXI2WWW) $(TEXI2WWW_ARGS) -dir $(WWW_INSTALL)/$(PROJECT) \
- 	    $(PROJECT).texi
-
-clean:
-	rm -f *.o $(PROG) *.txt core 
-	rm -f *.dvi *.ps *.log *.aux *.cp *.fn *.ky *.pg *.toc *.tp *.vr $(BASE)
-	rm -f $(PROJECT) $(PROJECT)-* $(GENERATED_FILES)
-	rm -f networking networking-*
-	rm -f timedata.texi timetbl.texi intr.texi wksheets.texi
-	rm -f timetbl.t wksheets.t
-	rm -f *.fixed _*
-
diff --git a/doc/networking/driver.t b/doc/networking/driver.t
deleted file mode 100644
index 5de7b54991..0000000000
--- a/doc/networking/driver.t
+++ /dev/null
@@ -1,284 +0,0 @@
-@c
-@c  Written by Eric Norum
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Writing RTEMS Network Device Drivers
-
-@section Introduction
-
-This chapter is intended to provide an introduction to the
-procedure for writing RTEMS network device drivers.
-The example code is taken from the `Generic 68360' network device
-driver.  The source code for this driver is located in the
-@code{c/src/lib/libbsp/m68k/gen68360/network} directory in the RTEMS
-source code distribution.  You should have a copy of this driver at
-hand when reading the following notes.
-
-@section Learn about the network device 
-
-Before starting to write the network driver you need to be completely
-familiar with the programmer's view of the device.
-The following points list some of the details of the
-device that must be understood before a driver can be written.
-
-@itemize @bullet
-
-@item Does the device use DMA to transfer packets to and from
-memory or does the processor have to
-copy packets to and from memory on the device?
-
-@item If the device uses DMA, is it capable of forming a single
-outtoing packet from multiple fragments scattered in separate
-memory buffers?
-
-@item If the device uses DMA, is it capable of chaining multiple
-outgoing packets, or does each outgoing packet require
-intervention by the driver?
-
-@item Does the device automatically pad short frames to the minimum
-64 bytes or does the driver have to supply the padding?
-
-@item Does the device automatically retry a transmission on detection
-of a collision?
-
-@item If the device uses DMA, is it capable of buffering multiple
-packets to memory, or does the receiver have to be restarted
-after the arrival of each packet?
-
-@item How are packets that are too short, too long, or received with
-CRC errors handled?  Does the device automatically continue
-reception or does the driver have to intervene?
-
-@item How is the device Ethernet address set?  How is the device
-programmed to accept or reject broadcast and multicast packets?
-
-@item What interrupts does the device generate?  Does it generate an
-interrupt for each incoming packet, or only for packets received
-without error?  Does it generate an interrupt for each packet
-transmitted, or only when the transmit queue is empty?  What
-happens when a transmit error is detected?
-
-@end itemize
-
-In addition, some controllers have specific questions regarding 
-board specific configuration.  For example, the SONIC Ethernet
-controller has a very configurable data bus interface.  It can
-even be configured for sixteen and thirty-two bit data buses.  This
-type of information should be obtained from the board vendor.
-
-@section Understand the network scheduling conventions
-
-When writing code for your driver transmit and receive tasks you must
-take care to follow the network scheduling conventions.  All tasks
-which are associated with networking share various
-data structures and resources.  To ensure the consistency
-of these structures the tasks
-execute only when they hold the network semaphore (@code{rtems_bsdnet_semaphore}).
-Your transmit and receive tasks must abide by this protocol which means you must
-be careful to avoid `deadly embraces' with the other network tasks.
-A number of routines are provided to make it easier for your code
-to conform to the network task scheduling conventions.
-
-@itemize @bullet
-
-@item @code{void rtems_bsdnet_semaphore_release(void)}
-
-This function releases the network semaphore.
-Your task must call this function immediately before
-making any blocking RTEMS request.
-
-@item @code{void rtems_bsdnet_semaphore_obtain(void)}
-
-This function obtains the network semaphore.
-If your task has released the network semaphore to allow other
-network-related tasks to run while your task blocks you must call this
-function to reobtain the semaphore immediately after the return from the
-blocking RTEMS request.
-
-@item @code{rtems_bsdnet_event_receive(rtems_event_set, rtems_option, rtems_interval, rtems_event_set *)}
-Your task should call this function when it wishes to wait for an event.
-This function releases the network semaphore,
-calls @code{rtems_event_receive} to wait for the specified event
-or events and reobtains the semaphore.
-The value returned is the value returned by the @code{rtems_event_receive}.
-
-@end itemize
-
-@section Write your driver attach function
-The driver attach function is responsible for configuring the driver
-and making the connection between the network stack
-and the driver.
-
-Driver attach functions take a pointer to an
-@code{rtems_bsdnet_ifconfig} structure as their only argument.
-and set the driver parameters based on the
-values in this structure.  If an entry in the configuration
-structure is zero the attach function chooses an
-appropriate default value for that parameter.
-
-
-The driver should then set up several fields in the ifnet structure
-in the device-dependent data structure supplied and maintained by the driver:
-
-@table @code
-@item ifp->if_softc 
-Pointer to the device-dependent data.  The first entry
-in the device-dependent data structure must be an @code{arpcom}
-structure.
-
-@item ifp->if_name
-The name of the device.  The network stack uses this string
-and the device number for device name lookups.  The name should not
-contain digits as these will be assumed to be part of the unit number
-and not part of the device name.
-
-
-@item ifp->if_unit
-The device number.  The network stack uses this number and the
-device name for device name lookups.  For example, if
-@code{ifp->if_name} is @samp{scc}, and @code{ifp->if_unit} is @samp{1},
-the full device name would be @samp{scc1}.
-
-@item ifp->if_mtu
-The maximum transmission unit for the device.  For Ethernet
-devices this value should almost always be 1500.
-
-@item ifp->if_flags
-The device flags.  Ethernet devices should set the flags
-to @code{IFF_BROADCAST|IFF_SIMPLEX}, indicating that the
-device can broadcast packets to multiple destinations
-and does not receive and transmit at the same time.
-
-@item ifp->if_snd.ifq_maxlen
-The maximum length of the queue of packets waiting to be
-sent to the driver.  This is normally set to @code{ifqmaxlen}.
-
-@item ifp->if_init
-The address of the driver initialization function.
-
-@item ifp->if_start
-The address of the driver start function.
-
-@item ifp->if_ioctl
-The address of the driver ioctl function.
-
-@item ifp->if_output
-The address of the output function.  Ethernet devices
-should set this to @code{ether_output}.
-@end table
-
-Once the attach function  has set up the above entries it must link the
-driver data structure onto the list of devices by
-calling @code{if_attach}.  Ethernet devices should then
-call @code{ether_ifattach}.  Both functions take a pointer to the
-device's @code{ifnet} structure as their only argument.
-
-The attach function should return a non-zero value to indicate that
-the driver has been successfully configured and attached.
-
-
-
-
-@section Write your driver start function.
-This function is called each time the network stack wants to start the
-transmitter.  This occures whenever the network stack adds a packet
-to a device's send queue and the @code{IFF_OACTIVE} bit in the
-device's @code{if_flags} is not set.
-
-For many devices this function need only set the @code{IFF_OACTIVE} bit in the
-@code{if_flags} and send an event to the transmit task
-indicating that a packet is in the driver transmit queue.
-
-
-@section Write your driver initialization function.
-This function should initialize the device, attach to interrupt handler, 
-and start the driver transmit and receive tasks.  The function
-
-@example
-rtems_id
-rtems_bsdnet_newproc (char *name,
-		      int stacksize,
-		      void(*entry)(void *),
-		      void *arg);
-@end example
-
-should be used to start the driver tasks.
-
-Note that the network stack may call the driver initialization function more
-than once.
-Make sure you don't start multiple versions of the receive and transmit tasks.
-
-
-
-@section Write your driver transmit task.
-This task is reponsible for removing packets from the driver send queue and sending them to the device.  The task should block waiting for an event from the
-driver start function indicating that packets are waiting to be transmitted.
-When the transmit task has drained the driver send queue the task should clear
-the @code{IFF_OACTIVE} bit in @code{if_flags} and block until another outgoing
-packet is queued.
-
-
-@section Write your driver receive task.
-This task should block until a packet arrives from the device.  If the
-device is an Ethernet interface the function @code{ether_input} should be called
-to forward the packet to the network stack.   The arguments to @code{ether_input}
-are a pointer to the interface data structure, a pointer to the ethernet
-header and a pointer to an mbuf containing the packet itself.
-
-
-
-
-@section Write your driver interrupt handler.
-A typical interrupt handler will do nothing more than the hardware
-manipulation required to acknowledge the interrupt and send an RTEMS event
-to wake up the driver receive or transmit task waiting for the event.
-Network interface interrupt handlers must not make any calls to other
-network routines.
-
-
-
-@section Write your driver ioctl function.
-This function handles ioctl requests directed at the device.  The ioctl
-commands which must be handled are:
-
-@table @code
-@item SIOCGIFADDR
-@item SIOCSIFADDR
-If the device is an Ethernet interface these
-commands should be passed on to @code{ether_ioctl}.
-
-@item SIOCSIFFLAGS
-This command should be used to start or stop the device,
-depending on the state of the interface @code{IFF_UP} and
-@code{IFF_RUNNING} bits in @code{if_flags}:
-@table @code
-@item IFF_RUNNING
-Stop the device.
-
-@item IFF_UP
-Start the device.
-
-@item IFF_UP|IFF_RUNNING
-Stop then start the device.
-
-@item 0
-Do nothing.
-
-@end table
-@end table
-
-
-
-@section Write Your Driver Statistic-Printing Function
-This function should print the values of any statistic/diagnostic
-counters your driver may use.  The driver ioctl function should call
-the statistic-printing function when the ioctl command is
-@code{SIO_RTEMS_SHOW_STATS}.
-
-
diff --git a/doc/networking/networkapp.t b/doc/networking/networkapp.t
deleted file mode 100644
index 19b3940d4f..0000000000
--- a/doc/networking/networkapp.t
+++ /dev/null
@@ -1,279 +0,0 @@
-@c
-@c  Written by Eric Norum
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Using Networking in an RTEMS Application
-
-@section Makefile changes
-@subsection Including the required managers
-The FreeBSD networking code requires several RTEMS managers
-in the application:
-
-@example
-MANAGERS = io event semaphore
-@end example
-
-@subsection Increasing the size of the heap
-The networking tasks allocate a lot of memory.  For most applications
-the heap should be at least 256 kbytes.
-The amount of memory set aside for the heap can be adjusted by setting
-the @code{CFLAGS_LD} definition as shown below:
-
-@example
-CFLAGS_LD += -Wl,--defsym -Wl,HeapSize=0x80000
-@end example
-
-This sets aside 512 kbytes of memory for the heap.
-
-@section System Configuration
-
-The networking tasks allocate some RTEMS objects.  These
-must be accounted for in the application configuration table.  The following
-lists the requirements.
-
-@table @b
-@item TASKS
-One network task plus a receive and transmit task for each device.
-
-@item SEMAPHORES
-One network semaphore plus one syslog mutex semaphore if the application uses
-openlog/syslog.
-
-@item EVENTS
-The network stack uses @code{RTEMS_EVENT_24} and @code{RTEMS_EVENT_25}.
-This has no effect on the application configuration, but
-application tasks which call the network functions should not
-use these events for other purposes.
-
-@end table
-
-@section Initialization
-@subsection Additional include files
-The source file which declares the network configuration
-structures and calls the network initialization function must include
-
-@example
-#include <rtems/rtems_bsdnet.h>
-@end example
-
-@subsection Network configuration
-The network configuration is specified by declaring
-and initializing the @code{rtems_bsdnet_configuration}
-structure.
-
-The structure entries are described in the following table.
-If your application uses BOOTP to obtain network configuration
-information and if you are happy with the default values described
-below, you need to provide only the first two entries in this structure.
-
-@table @code
-
-@item struct rtems_bsdnet_ifconfig *ifconfig
-A pointer to the first configuration structure of the first network
-device.  This structure is described in the following section.
-You must provide a value for this entry since there is no default value for it.
-
-
-@item void (*bootp)(void)
-This entry should be set to @code{rtems_bsdnet_do_bootp}
-if your application will use BOOTP to obtain network configuration information.
-It should be set to @code{NULL}
-if your application does not use BOOTP.
-
-
-@item int network_task_priority 
-The priority at which the network task and network device
-receive and transmit tasks will run.
-If a value of 0 is specified the tasks will run at priority 100.
-
-@item unsigned long mbuf_bytecount
-The number of bytes to allocate from the heap for use as mbufs.  
-If a value of 0 is specified, 64 kbytes will be allocated.
-
-@item unsigned long mbuf_cluster_bytecount
-The number of bytes to allocate from the heap for use as mbuf clusters.  
-If a value of 0 is specified, 128 kbytes will be allocated.
-
-@item char *hostname
-The host name of the system.
-If this, or any of the following, entries are @code{NULL} the value
-may be obtained from a BOOTP server.
-
-@item char *domainname
-The name of the Internet domain to which the system belongs.
-
-@item char *gateway
-The Internet host number of the network gateway machine,
-specified in `dotted decimal' (@code{129.128.4.1}) form.
-
-@item char *log_host
-The Internet host number of the machine to which @code{syslog} messages
-will be sent.
-
-@item char *name_server[3]
-The Internet host numbers of up to three machines to be used as
-Internet Domain Name Servers.
-
-@item int port
-The I/O port number (ex: 0x240) on which the external Ethernet
-can be accessed.
-
-@item int irno
-The interrupt number of the external Ethernet controller.
-
-@item int bpar
-The address of the shared memory on the external Ethernet controller.
-
-
-@end table
-
-@subsection Network device configuration
-Network devices are specified and configured by declaring and initializing a
-@code{struct rtems_bsdnet_ifcontig} structure for each network device.
-
-The structure entries are described in the following table.  An application
-which uses a single network interface, gets network configuration information
-from a BOOTP server, and uses the default values for all driver
-parameters needs to initialize only the first two entries in the
-structure.
-
-@table @code
-@item char *name
-The full name of the network device.  This name consists of the
-driver name and the unit number (e.g. @code{"scc1"}).
-The @code{bsp.h} include file usually defines RTEMS_BSP_NETWORK_DRIVER_NAME as
-the name of the primary (or only) network driver.
-
-@item int (*attach)(struct rtems_bsdnet_ifconfig *conf)
-The address of the driver @code{attach} function.   The network 
-initialization function calls this function to configure the driver and
-attach it to the network stack.
-The @code{bsp.h} include file usually defines RTEMS_BSP_NETWORK_DRIVER_ATTACH as
-the name of the  attach function of the primary (or only) network driver.
-
-@item struct rtems_bsdnet_ifconfig *next
-A pointer to the network device configuration structure for the next network 
-interface, or @code{NULL} if this is the configuration structure of the
-last network interface.
-
-@item char *ip_address
-The Internet address of the device,
-specified in `dotted decimal' (@code{129.128.4.2}) form, or @code{NULL}
-if the device configuration information is being obtained from a
-BOOTP server.
-
-@item char *ip_netmask
-The Internet inetwork mask of the device,
-specified in `dotted decimal' (@code{255.255.255.0}) form, or @code{NULL}
-if the device configuration information is being obtained from a
-BOOTP server.
-
-
-@item void *hardware_address
-The hardware address of the device, or @code{NULL} if the driver is
-to obtain the hardware address in some other way (usually  by reading
-it from the device or from the bootstrap ROM).
-
-@item int ignore_broadcast
-Zero if the device is to accept broadcast packets, non-zero if the device
-is to ignore broadcast packets.
-
-@item int mtu
-The maximum transmission unit of the device, or zero if the driver
-is to choose a default value (typically 1500 for Ethernet devices).
-
-@item int rbuf_count
-The number of receive buffers to use, or zero if the driver is to
-choose a default value
-
-@item int xbuf_count
-The number of transmit buffers to use, or zero if the driver is to
-choose a default value
-Keep in mind that some network devices may use 4 or more
-transmit descriptors for a single transmit buffer.
-
-@end table
-
-A complete network configuration specification can be as simple as the one
-shown in the following example.
-This configuration uses a single network interface, gets
-network configuration information
-from a BOOTP server, and uses the default values for all driver
-parameters.
-
-@example
-static struct rtems_bsdnet_ifconfig netdriver_config = @{
-	RTEMS_BSP_NETWORK_DRIVER_NAME,
-	RTEMS_BSP_NETWORK_DRIVER_ATTACH
-@};
-struct rtems_bsdnet_config rtems_bsdnet_config = @{
-	&netdriver_config,
-	rtems_bsdnet_do_bootp,
-@};
-@end example
-
-
-@subsection Network initialization
-The networking tasks must be started before any
-network I/O operations can be performed.  This is done by calling:
-@example
-rtems_bsdnet_initialize_network ();
-@end example
-
-This function is declared in @code{rtems/rtems_bsdnet.h}.
-
-
-
-@section Application code
-The RTEMS network package provides almost a complete set of BSD network
-services.  The network functions work like their BSD counterparts
-with the following exceptions:
-
-@itemize @bullet
-@item A given socket can be read or written by only one task at a time.
-@item There is no @code{select} function.
-@item You must call @code{openlog} before calling any of the @code{syslog} functions.
-@item @b{Some of the network functions are not thread-safe.}
-For example the following functions return a pointer to a static
-buffer which remains valid only until the next call:
-
-@table @code
-@item gethostbyaddr
-@item gethostbyname
-@item inet_ntoa
-(@code{inet_ntop} is thread-safe, though).
-@end table
-@end itemize
-
-@subsection Network Statistics
-There are a number of functions to print statistics gathered by the network stack.
-These function are declared in @code{rtems/rtems_bsdnet.h}.
-@table @code
-@item rtems_bsdnet_show_if_stats
-Display statistics gathered by network interfaces.
-
-@item rtems_bsdnet_show_ip_stats
-Display IP packet statistics.
-
-@item rtems_bsdnet_show_icmp_stats
-Display ICMP packet statistics.
-
-@item rtems_bsdnet_show_tcp_stats
-Display TCP packet statistics.
-
-@item rtems_bsdnet_show_udp_stats
-Display UDP packet statistics.
-
-@item rtems_bsdnet_show_mbuf_stats
-Display mbuf statistics.
-
-@item rtems_bsdnet_show_inet_routes
-Display the routing table.
-
-@end table
diff --git a/doc/networking/networking.eps b/doc/networking/networking.eps
deleted file mode 100644
index 8aba78d55f..0000000000
--- a/doc/networking/networking.eps
+++ /dev/null
@@ -1,1343 +0,0 @@
-%!PS-Adobe-2.0 EPSF-2.0
-%%Title: 
-%%Creator: Diagram
-%%CreationDate: Tue Aug 18 16:41:45 1998
-%%For: eric
-%%DocumentFonts: (atend)
-%%Pages: 0 0
-%%BoundingBox: 0 0 487 549
-%%NXNextStepVersion: 3.0
-%%EndComments
-
-%%BeginProcSet: /usr/lib/NextStep/printPackage.ps 3.0
-%!
-% NeXT Printing Package
-% Version: 3.1
-% Copyright: 1988, NeXT, Inc.
-
-/__NXdef{1 index where{pop pop pop}{def}ifelse}bind def
-/__NXbdef{1 index where{pop pop pop}{bind def}ifelse}bind def
-/UserObjects 10 array __NXdef
-/defineuserobject{
-	exch dup 1 add dup UserObjects length gt{
-		array dup 0 UserObjects putinterval
-		/UserObjects exch def
-	}{pop}ifelse UserObjects exch 3 -1 roll put
-}__NXbdef
-/undefineuserobject{UserObjects exch null put}__NXbdef
-/execuserobject{UserObjects exch get exec}__NXbdef
-/__NXRectPath{4 2 roll moveto 1 index 0 rlineto
-0 exch rlineto neg 0 rlineto closepath}__NXbdef
-/__NXProcessRectArgs{
-	1 index type /arraytype eq{
-		exch 0 4 2 index length 1 sub{
-			dup 3 add 1 exch{1 index exch get exch}for
-			5 1 roll 5 index exec
-		}for pop pop
-	}{exec}ifelse
-}__NXbdef
-/rectfill{gsave newpath {__NXRectPath fill} __NXProcessRectArgs grestore}__NXbdef
-/rectclip{newpath {__NXRectPath} __NXProcessRectArgs clip newpath}__NXbdef
-/rectstroke{
-	gsave newpath dup type /arraytype eq{dup length 6 eq}{false}ifelse{
-		{gsave __NXRectPath null concat stroke grestore}
-		dup length array cvx copy dup 2 4 -1 roll put __NXProcessRectArgs
-	}{{__NXRectPath stroke} __NXProcessRectArgs}ifelse grestore
-}__NXbdef
-/_NXLevel2 systemdict /languagelevel known {languagelevel 2 ge}{false}ifelse __NXdef
-/xyshow{
-	0 1 3 index length 1 sub{
-		currentpoint 4 index 3 index 1 getinterval show
-		3 index 3 index 2 mul 1 add get add exch
-		3 index	3 index 2 mul get add exch moveto pop
-	}for pop pop
-}__NXbdef
-/xshow{
-	0 1 3 index length 1 sub{
-		currentpoint 4 index 3 index 1 getinterval show
-		exch 3 index 3 index get add exch moveto pop
-	}for pop pop
-}__NXbdef
-/yshow{
-	0 1 3 index length 1 sub{
-		currentpoint 4 index 3 index 1 getinterval show
-		3 index 3 index get add moveto pop
-	}for pop pop
-}__NXbdef
-/arct{arcto pop pop pop pop}__NXbdef
-/setbbox{pop pop pop pop}__NXbdef
-/ucache{}__NXbdef
-/ucachestatus{mark 0 0 0 0 0}__NXbdef
-/setucacheparams{cleartomark}__NXbdef
-/uappend{systemdict begin cvx exec end}__NXbdef
-/ueofill{gsave newpath uappend eofill grestore}__NXbdef
-/ufill{gsave newpath uappend fill grestore}__NXbdef
-/ustroke{
-	gsave newpath dup length 6 eq
-	{exch uappend concat}{uappend}ifelse
-	stroke grestore
-}__NXbdef
-/__NXustrokepathMatrix dup where {pop pop}{matrix def}ifelse
-/ustrokepath{
-	newpath dup length 6 eq{
-		exch uappend __NXustrokepathMatrix currentmatrix exch concat
-		strokepath setmatrix
-	}{uappend strokepath}ifelse
-} __NXbdef
-/upath{
-	[exch {/ucache cvx}if pathbbox /setbbox cvx
-	 {/moveto cvx}{/lineto cvx}{/curveto cvx}{/closepath cvx}pathforall]cvx
-} __NXbdef
-/setstrokeadjust{pop}__NXbdef
-/currentstrokeadjust{false}__NXbdef
-/selectfont{exch findfont exch
-dup type /arraytype eq {makefont}{scalefont}ifelse setfont}__NXbdef
-/_NXCombineArrays{
-	counttomark dup 2 add index dup length 3 -1 roll {
-		2 index length sub dup 4 1 roll 1 index exch 4 -1 roll putinterval exch
-	}repeat pop pop pop
-}__NXbdef
-/flushgraphics{}def
-/setwindowtype{pop pop}def
-/currentwindowtype{pop 0}def
-/setalpha{pop}def
-/currentalpha{1.0}def
-/hidecursor{}def
-/obscurecursor{}def
-/revealcursor{}def
-/setcursor{4 {pop}repeat}bind def
-/showcursor{}def
-/NextStepEncoding where not{
-/NextStepEncoding StandardEncoding 256 array copy def
-0 [129/Agrave/Aacute/Acircumflex/Atilde/Adieresis/Aring/Ccedilla/Egrave
-/Eacute/Ecircumflex/Edieresis/Igrave/Iacute/Icircumflex/Idieresis
-/Eth/Ntilde/Ograve/Oacute/Ocircumflex/Otilde/Odieresis/Ugrave/Uacute
-/Ucircumflex/Udieresis/Yacute/Thorn/mu/multiply/divide/copyright
-176/registered 181/brokenbar 190/logicalnot 192/onesuperior 201/twosuperior
-204/threesuperior 209/plusminus/onequarter/onehalf/threequarters/agrave
-/aacute/acircumflex/atilde/adieresis/aring/ccedilla/egrave/eacute
-/ecircumflex/edieresis/igrave 226/iacute 228/icircumflex/idieresis/eth
-/ntilde 236/ograve/oacute/ocircumflex/otilde/odieresis 242/ugrave/uacute
-/ucircumflex 246/udieresis/yacute 252/thorn/ydieresis]
-{dup type /nametype eq
- {NextStepEncoding 2 index 2 index put pop 1 add}{exch pop}ifelse
-}forall pop
-/NextStepEncoding NextStepEncoding readonly def
-/_NXfstr 128 string dup 0 (_NX) putinterval def
-/_NXfindfont /findfont load def
-/findfont{
- % Because we can never let NextStepEncoding get into
- % SharedFontDirectory, we cannot reencode a font to NextStepEncoding
- % if we are in shared mode.  So if currentshared is true,
- % we call the normal findfont and return that
- /currentshared where {pop currentshared} {false} ifelse
- {_NXfindfont}
- {dup _NXfstr 3 125 getinterval cvs length 3 add _NXfstr 0 3 -1 roll
-  getinterval cvn exch FontDirectory 2 index known 
-  {pop FontDirectory exch get}
-  {_NXfindfont dup /Encoding get StandardEncoding eq
-   {	dup length dict exch
-	{1 index /FID ne {2 index 3 1 roll put}{pop pop}ifelse}forall
-	 dup /Encoding NextStepEncoding put definefont
-	}{exch pop} ifelse
-   }ifelse
- }ifelse
-}bind def
-}{pop}ifelse
-/_NXImageString {/__NXImageString where{pop}{/__NXImageString 4000 string __NXdef}ifelse __NXImageString}__NXbdef
-/_NXDoImageOp{
-	3 dict begin /parr 5 array def 1 index{dup}{1}ifelse /chans exch def
-	chans 2 add 2 roll parr 0 chans getinterval astore pop
-	5 index 4 index mul 2 index{1 sub 8 idiv 1 add mul}{mul 1 sub 8 idiv 1 add}ifelse
-	4 index mul /totbytes exch def pop exch pop
-	gsave matrix invertmatrix concat 0.5 setgray 0 0 4 2 roll rectfill grestore
-	{0 1 chans 1 sub{parr exch get exec length totbytes exch sub /totbytes exch def}for totbytes 0 le{exit}if}loop end
-}__NXbdef
-/alphaimage{1 add _NXDoImageOp}def
-_NXLevel2{ 
-	/NXCalibratedRGBColorSpace where{pop}{
-		/NXCalibratedRGBColorSpace
-		{mark /NXCalibratedRGB /ColorSpace findresource exch pop}stopped
-		{cleartomark /NXCalibratedRGB[/CIEBasedABC 2 dict dup begin 
-		/MatrixLMN[.4124 .2126 .0193 .3576 .7152 .1192 .1805 .0722 .9505]def
-		/WhitePoint[.9505 1 1.089] def end] /ColorSpace defineresource}if def}ifelse
-	/nxsetrgbcolor{NXCalibratedRGBColorSpace setcolorspace setcolor}__NXbdef
-	/nxsetgray{dup dup nxsetrgbcolor}__NXbdef
-	/_NXCalibratedImage{exch{array astore dup length true}{false}ifelse
-		8 -1 roll{NXCalibratedRGBColorSpace setcolorspace}if
-		8 dict dup 9 1 roll begin /ImageType 1 def /MultipleDataSources exch def
-		currentcolorspace 0 get /Indexed eq{pop /Decode[0 2 6 index exp 1 sub]def}
-		{2 mul dup array /Decode exch def 1 sub 0 1 3 -1 roll{Decode exch dup 2 mod put}for}ifelse
-		/DataSource exch def /ImageMatrix exch def 
-		/BitsPerComponent exch def /Height exch def /Width exch def end image}__NXbdef
-} {
-	/setcmykcolor{
-		1.0 exch sub dup dup 6 -1 roll sub dup 0 lt{pop 0}if 5 1 roll
-		4 -1 roll sub dup 0 lt{pop 0}if 3 1 roll exch sub dup 0 lt{pop 0}if setrgbcolor}__NXbdef
-	/currentcmykcolor{currentrgbcolor 3{1.0 exch sub 3 1 roll}repeat 0}__NXbdef
-	/colorimage{2 copy 3 ne or{_NXDoImageOp}{4 index dup 8 ne exch 4 ne and{_NXDoImageOp}{
-		pop pop save 6 1 roll 12 dict begin/Proc exch def/Res 0 string def
-		/Alloc{2 index length mul 2 add dup 2 index load length gt{1.2 mul round cvi string def}{pop pop}ifelse}def
-		1 index 8 eq{/Unpack{.34 Alloc}def}{
-			/Wid 4 index 3 mul def exch pop 8 exch/Str1 0 string def/Lim Wid def
-			/Unpack{.67 Alloc/Str1 2 Alloc 0 exch Lim exch
-				{dup -4 bitshift 17 mul Str1 exch 4 index exch put 15 and 17 mul Str1 exch 3 index 1 add exch put
-				2 sub dup 0 le{0 lt Wid exch{exch 1 sub exch}if}if exch 2 add exch
-				}forall/Lim exch def Str1 exch 0 exch getinterval
-			}def
-		}ifelse
-		/Ops[{.3 mul add 1}{.59 mul add 2}{.11 mul add round cvi Res exch 2 index exch put 1 add 0.0 0}]def/Val 0.0 def/Phase 0 def
-		{0 Val Phase Proc/Res Unpack{exch Ops exch get exec}forall/Phase exch def/Val exch def Res exch 0 exch getinterval}
-		image end restore}ifelse}ifelse
-	}__NXbdef
-	/nxsetrgbcolor{setrgbcolor}__NXbdef /nxsetgray{setgray}__NXbdef
-	/setpattern{pop .5 setgray}__NXbdef
-	/_NXCalibratedImage{dup 1 eq {pop pop image}{colorimage}ifelse pop}__NXbdef
-} ifelse
-/_NXSetCMYKOrRGB where{pop}{
-	mark{systemdict /currentwindow get exec}stopped
-	{{pop pop pop setcmykcolor}}{{nxsetrgbcolor pop pop pop pop}}ifelse /_NXSetCMYKOrRGB exch def cleartomark
-}ifelse
-%%EndProcSet
-
-gsave
- /__NXbasematrix matrix currentmatrix def
-grestore
-%%EndProlog
-%%BeginSetup
-%%EndSetup
-gsave
-0 0 488 549 rectclip
-[1 0 0 -1 -26.5 567] concat
-26.5 18 487 549 rectclip
-gsave
-36 306 306 261 rectclip
-0 nxsetgray
-1 setlinewidth
-[6] 1 setdash
-36.5 306.5 305 260 rectstroke
-grestore
-0.333338 nxsetgray
-gsave
-0.333338 nxsetgray
-newpath
-systemdict
-begin
-58 418 166 472 setbbox
-68.800003 418 moveto
-155.200012 428.799988 10.8 -90 0 arc
-155.200012 461.199982 10.8 0 90 arc
-68.800003 461.199982 10.8 90 180 arc
-68.800003 428.799988 10.8 180 270 arc
-closepath
-end
-clip
-newpath
-1 setlinewidth
-gsave
-newpath
-systemdict
-begin
-58 418 166 472 setbbox
-69.300003 418.5 moveto
-154.700012 429.299988 10.8 -90 0 arc
-154.700012 460.699982 10.8 0 90 arc
-69.300003 460.699982 10.8 90 180 arc
-69.300003 429.299988 10.8 180 270 arc
-closepath
-end
-stroke
-grestore
-grestore
-gsave
-newpath
-systemdict
-begin
-58 418 166 472 setbbox
-69.300003 419 moveto
-154.700012 429.299988 10.3 -90 0 arc
-154.700012 460.699982 10.3 0 90 arc
-69.300003 460.699982 10.3 90 180 arc
-69.300003 429.299988 10.3 180 270 arc
-closepath
-end
-fill
-grestore
-1 nxsetgray
-gsave
-newpath
-systemdict
-begin
-54 414 162 468 setbbox
-65.300003 415 moveto
-150.700012 425.299988 10.3 -90 0 arc
-150.700012 456.699982 10.3 0 90 arc
-65.300003 456.699982 10.3 90 180 arc
-65.300003 425.299988 10.3 180 270 arc
-closepath
-end
-fill
-grestore
-gsave
-newpath
-systemdict
-begin
-54 414 162 468 setbbox
-64.800003 414 moveto
-151.200012 424.799988 10.8 -90 0 arc
-151.200012 457.199982 10.8 0 90 arc
-64.800003 457.199982 10.8 90 180 arc
-64.800003 424.799988 10.8 180 270 arc
-closepath
-end
-clip
-newpath
-0 nxsetgray
-1 setlinewidth
-gsave
-newpath
-systemdict
-begin
-54 414 162 468 setbbox
-65.300003 414.5 moveto
-150.700012 425.299988 10.8 -90 0 arc
-150.700012 456.699982 10.8 0 90 arc
-65.300003 456.699982 10.8 90 180 arc
-65.300003 425.299988 10.8 180 270 arc
-closepath
-end
-stroke
-grestore
-grestore
-gsave
-/Helvetica findfont 12 scalefont [1 0 0 -1 0 0] makefont
-8
-exch
-defineuserobject
-8 execuserobject setfont
-0 nxsetgray
-8 execuserobject setfont
-0 nxsetgray
-84 430 moveto (Interface) show
-85 445 moveto (Receive) show
-84 460 moveto (Daemon) show
-grestore
-0.333338 nxsetgray
-gsave
-0.333338 nxsetgray
-newpath
-systemdict
-begin
-193 418 301 472 setbbox
-203.800003 418 moveto
-290.200012 428.799988 10.8 -90 0 arc
-290.200012 461.199982 10.8 0 90 arc
-203.800003 461.199982 10.8 90 180 arc
-203.800003 428.799988 10.8 180 270 arc
-closepath
-end
-clip
-newpath
-1 setlinewidth
-gsave
-newpath
-systemdict
-begin
-193 418 301 472 setbbox
-204.300003 418.5 moveto
-289.700012 429.299988 10.8 -90 0 arc
-289.700012 460.699982 10.8 0 90 arc
-204.300003 460.699982 10.8 90 180 arc
-204.300003 429.299988 10.8 180 270 arc
-closepath
-end
-stroke
-grestore
-grestore
-gsave
-newpath
-systemdict
-begin
-193 418 301 472 setbbox
-204.300003 419 moveto
-289.700012 429.299988 10.3 -90 0 arc
-289.700012 460.699982 10.3 0 90 arc
-204.300003 460.699982 10.3 90 180 arc
-204.300003 429.299988 10.3 180 270 arc
-closepath
-end
-fill
-grestore
-1 nxsetgray
-gsave
-newpath
-systemdict
-begin
-189 414 297 468 setbbox
-200.300003 415 moveto
-285.700012 425.299988 10.3 -90 0 arc
-285.700012 456.699982 10.3 0 90 arc
-200.300003 456.699982 10.3 90 180 arc
-200.300003 425.299988 10.3 180 270 arc
-closepath
-end
-fill
-grestore
-gsave
-newpath
-systemdict
-begin
-189 414 297 468 setbbox
-199.800003 414 moveto
-286.200012 424.799988 10.8 -90 0 arc
-286.200012 457.199982 10.8 0 90 arc
-199.800003 457.199982 10.8 90 180 arc
-199.800003 424.799988 10.8 180 270 arc
-closepath
-end
-clip
-newpath
-0 nxsetgray
-1 setlinewidth
-gsave
-newpath
-systemdict
-begin
-189 414 297 468 setbbox
-200.300003 414.5 moveto
-285.700012 425.299988 10.8 -90 0 arc
-285.700012 456.699982 10.8 0 90 arc
-200.300003 456.699982 10.8 90 180 arc
-200.300003 425.299988 10.8 180 270 arc
-closepath
-end
-stroke
-grestore
-grestore
-gsave
-8 execuserobject setfont
-0 nxsetgray
-8 execuserobject setfont
-0 nxsetgray
-219 430 moveto (Interface) show
-219 445 moveto (Transmit) show
-219 460 moveto (Daemon) show
-grestore
-0.333338 nxsetgray
-gsave
-0.333338 nxsetgray
-newpath
-systemdict
-begin
-184 328 310 382 setbbox
-184 328 moveto
-100.800003 0 rlineto
-25.200001 54 rlineto
--100.800003 0 rlineto
-closepath
-end
-clip
-newpath
-1 setlinewidth
-gsave
-newpath
-systemdict
-begin
-184.5 328.5 309.5 381.5 setbbox
-184.5 328.5 moveto
-100 0 rlineto
-25 53 rlineto
--100 0 rlineto
-closepath
-end
-stroke
-grestore
-grestore
-gsave
-newpath
-systemdict
-begin
-185 329 309 381 setbbox
-185 329 moveto
-99.199997 0 rlineto
-24.799999 52 rlineto
--99.199997 0 rlineto
-closepath
-end
-fill
-grestore
-1 nxsetgray
-gsave
-newpath
-systemdict
-begin
-181 325 305 377 setbbox
-181 325 moveto
-99.199997 0 rlineto
-24.799999 52 rlineto
--99.199997 0 rlineto
-closepath
-end
-fill
-grestore
-gsave
-newpath
-systemdict
-begin
-180 324 306 378 setbbox
-180 324 moveto
-100.800003 0 rlineto
-25.200001 54 rlineto
--100.800003 0 rlineto
-closepath
-end
-clip
-newpath
-0 nxsetgray
-1 setlinewidth
-gsave
-newpath
-systemdict
-begin
-180.5 324.5 305.5 377.5 setbbox
-180.5 324.5 moveto
-100 0 rlineto
-25 53 rlineto
--100 0 rlineto
-closepath
-end
-stroke
-grestore
-grestore
-gsave
-8 execuserobject setfont
-0 nxsetgray
-8 execuserobject setfont
-0 nxsetgray
-219 340.5 moveto (Interface) show
-224 355.5 moveto (Output) show
-224 370.5 moveto (Queue) show
-grestore
-0.333338 nxsetgray
-gsave
-0.333338 nxsetgray
-193 184 108 54 rectclip
-1 setlinewidth
-193.5 184.5 107 53 rectstroke
-grestore
-194 185 106 52 rectfill
-1 nxsetgray
-190 181 106 52 rectfill
-gsave
-189 180 108 54 rectclip
-0 nxsetgray
-1 setlinewidth
-189.5 180.5 107 53 rectstroke
-grestore
-gsave
-8 execuserobject setfont
-0 nxsetgray
-8 execuserobject setfont
-0 nxsetgray
-220 204 moveto (Network) show
-228 219 moveto (Code) show
-grestore
-0 nxsetgray
-1 setlinewidth
-2 setlinejoin
-gsave
-newpath
-systemdict
-begin
-242.999969 234 243.000031 316.299988 setbbox
-243.000031 234 moveto
-242.999969 316.299988 lineto
-end
-stroke
-grestore
-0 setlinejoin
-gsave
-[0 1 -1 0 567 81.000031] concat
-gsave
-newpath
-systemdict
-begin
-233.799973 319.5 242.999969 328.5 setbbox
-242.999969 324 moveto
--9.2 4.5 rlineto
-1.5 -4.5 rlineto
--1.5 -4.5 rlineto
-closepath
-end
-fill
-grestore
-grestore
-0 nxsetgray
-1 setlinewidth
-2 setlinejoin
-gsave
-newpath
-systemdict
-begin
-242.999985 378 243.000031 406.299988 setbbox
-243.000031 378 moveto
-242.999985 406.299988 lineto
-end
-stroke
-grestore
-0 setlinejoin
-gsave
-[0 1 -1 0 657 171.000031] concat
-gsave
-newpath
-systemdict
-begin
-233.799973 409.5 242.999969 418.5 setbbox
-242.999969 414 moveto
--9.2 4.5 rlineto
-1.5 -4.5 rlineto
--1.5 -4.5 rlineto
-closepath
-end
-fill
-grestore
-grestore
-0.333338 nxsetgray
-gsave
-0.333338 nxsetgray
-newpath
-systemdict
-begin
-193 22 301 76 setbbox
-203.800003 22 moveto
-290.200012 32.799999 10.8 -90 0 arc
-290.200012 65.199997 10.8 0 90 arc
-203.800003 65.199997 10.8 90 180 arc
-203.800003 32.799999 10.8 180 270 arc
-closepath
-end
-clip
-newpath
-1 setlinewidth
-gsave
-newpath
-systemdict
-begin
-193 22 301 76 setbbox
-204.300003 22.5 moveto
-289.700012 33.299999 10.8 -90 0 arc
-289.700012 64.699997 10.8 0 90 arc
-204.300003 64.699997 10.8 90 180 arc
-204.300003 33.299999 10.8 180 270 arc
-closepath
-end
-stroke
-grestore
-grestore
-gsave
-newpath
-systemdict
-begin
-193 22 301 76 setbbox
-204.300003 23 moveto
-289.700012 33.299999 10.3 -90 0 arc
-289.700012 64.699997 10.3 0 90 arc
-204.300003 64.699997 10.3 90 180 arc
-204.300003 33.299999 10.3 180 270 arc
-closepath
-end
-fill
-grestore
-1 nxsetgray
-gsave
-newpath
-systemdict
-begin
-189 18 297 72 setbbox
-200.300003 19 moveto
-285.700012 29.299999 10.3 -90 0 arc
-285.700012 60.699997 10.3 0 90 arc
-200.300003 60.699997 10.3 90 180 arc
-200.300003 29.299999 10.3 180 270 arc
-closepath
-end
-fill
-grestore
-gsave
-newpath
-systemdict
-begin
-189 18 297 72 setbbox
-199.800003 18 moveto
-286.200012 28.799999 10.8 -90 0 arc
-286.200012 61.200001 10.8 0 90 arc
-199.800003 61.200001 10.8 90 180 arc
-199.800003 28.799999 10.8 180 270 arc
-closepath
-end
-clip
-newpath
-0 nxsetgray
-1 setlinewidth
-gsave
-newpath
-systemdict
-begin
-189 18 297 72 setbbox
-200.300003 18.5 moveto
-285.700012 29.299999 10.8 -90 0 arc
-285.700012 60.699997 10.8 0 90 arc
-200.300003 60.699997 10.8 90 180 arc
-200.300003 29.299999 10.8 180 270 arc
-closepath
-end
-stroke
-grestore
-grestore
-gsave
-8 execuserobject setfont
-0 nxsetgray
-8 execuserobject setfont
-0 nxsetgray
-229 34 moveto (User) show
-213 49 moveto (Application) show
-229 64 moveto (Task) show
-grestore
-0.333338 nxsetgray
-gsave
-0.333338 nxsetgray
-newpath
-systemdict
-begin
-346 121 472 175 setbbox
-346 121 moveto
-100.800003 0 rlineto
-25.200001 54 rlineto
--100.800003 0 rlineto
-closepath
-end
-clip
-newpath
-1 setlinewidth
-gsave
-newpath
-systemdict
-begin
-346.5 121.5 471.5 174.5 setbbox
-346.5 121.5 moveto
-100 0 rlineto
-25 53 rlineto
--100 0 rlineto
-closepath
-end
-stroke
-grestore
-grestore
-gsave
-newpath
-systemdict
-begin
-347 122 471 174 setbbox
-347 122 moveto
-99.199997 0 rlineto
-24.799999 52 rlineto
--99.199997 0 rlineto
-closepath
-end
-fill
-grestore
-1 nxsetgray
-gsave
-newpath
-systemdict
-begin
-343 118 467 170 setbbox
-343 118 moveto
-99.199997 0 rlineto
-24.799999 52 rlineto
--99.199997 0 rlineto
-closepath
-end
-fill
-grestore
-gsave
-newpath
-systemdict
-begin
-342 117 468 171 setbbox
-342 117 moveto
-100.800003 0 rlineto
-25.200001 54 rlineto
--100.800003 0 rlineto
-closepath
-end
-clip
-newpath
-0 nxsetgray
-1 setlinewidth
-gsave
-newpath
-systemdict
-begin
-342.5 117.5 467.5 170.5 setbbox
-342.5 117.5 moveto
-100 0 rlineto
-25 53 rlineto
--100 0 rlineto
-closepath
-end
-stroke
-grestore
-grestore
-gsave
-8 execuserobject setfont
-0 nxsetgray
-8 execuserobject setfont
-0 nxsetgray
-386 133.5 moveto (Socket) show
-382 148.5 moveto (Receive) show
-384 163.5 moveto ( Queue) show
-grestore
-0.333338 nxsetgray
-gsave
-0.333338 nxsetgray
-newpath
-systemdict
-begin
-373 418 481 472 setbbox
-383.799988 418 moveto
-470.199982 428.799988 10.8 -90 0 arc
-470.199982 461.199982 10.8 0 90 arc
-383.799988 461.199982 10.8 90 180 arc
-383.799988 428.799988 10.8 180 270 arc
-closepath
-end
-clip
-newpath
-1 setlinewidth
-gsave
-newpath
-systemdict
-begin
-373 418 481 472 setbbox
-384.299988 418.5 moveto
-469.699982 429.299988 10.8 -90 0 arc
-469.699982 460.699982 10.8 0 90 arc
-384.299988 460.699982 10.8 90 180 arc
-384.299988 429.299988 10.8 180 270 arc
-closepath
-end
-stroke
-grestore
-grestore
-gsave
-newpath
-systemdict
-begin
-373 418 481 472 setbbox
-384.299988 419 moveto
-469.699982 429.299988 10.3 -90 0 arc
-469.699982 460.699982 10.3 0 90 arc
-384.299988 460.699982 10.3 90 180 arc
-384.299988 429.299988 10.3 180 270 arc
-closepath
-end
-fill
-grestore
-1 nxsetgray
-gsave
-newpath
-systemdict
-begin
-369 414 477 468 setbbox
-380.299988 415 moveto
-465.699982 425.299988 10.3 -90 0 arc
-465.699982 456.699982 10.3 0 90 arc
-380.299988 456.699982 10.3 90 180 arc
-380.299988 425.299988 10.3 180 270 arc
-closepath
-end
-fill
-grestore
-gsave
-newpath
-systemdict
-begin
-369 414 477 468 setbbox
-379.799988 414 moveto
-466.199982 424.799988 10.8 -90 0 arc
-466.199982 457.199982 10.8 0 90 arc
-379.799988 457.199982 10.8 90 180 arc
-379.799988 424.799988 10.8 180 270 arc
-closepath
-end
-clip
-newpath
-0 nxsetgray
-1 setlinewidth
-gsave
-newpath
-systemdict
-begin
-369 414 477 468 setbbox
-380.299988 414.5 moveto
-465.699982 425.299988 10.8 -90 0 arc
-465.699982 456.699982 10.8 0 90 arc
-380.299988 456.699982 10.8 90 180 arc
-380.299988 425.299988 10.8 180 270 arc
-closepath
-end
-stroke
-grestore
-grestore
-gsave
-8 execuserobject setfont
-0 nxsetgray
-8 execuserobject setfont
-0 nxsetgray
-400 437.5 moveto (Network) show
-399 452.5 moveto (Daemon) show
-grestore
-0.333338 nxsetgray
-gsave
-0.333338 nxsetgray
-67 499 90 45 rectclip
-1 setlinewidth
-67.5 499.5 89 44 rectstroke
-grestore
-68 500 88 43 rectfill
-1 nxsetgray
-64 496 88 43 rectfill
-gsave
-63 495 90 45 rectclip
-0 nxsetgray
-1 setlinewidth
-63.5 495.5 89 44 rectstroke
-grestore
-gsave
-8 execuserobject setfont
-0 nxsetgray
-8 execuserobject setfont
-0 nxsetgray
-86 508 moveto (Receive) show
-85 523 moveto (Interrupt) show
-gsave
-66 496 84 43 rectclip
-86 538 moveto (Handler) show
-grestore
-grestore
-0.333338 nxsetgray
-gsave
-0.333338 nxsetgray
-202 499 90 45 rectclip
-1 setlinewidth
-202.5 499.5 89 44 rectstroke
-grestore
-203 500 88 43 rectfill
-1 nxsetgray
-199 496 88 43 rectfill
-gsave
-198 495 90 45 rectclip
-0 nxsetgray
-1 setlinewidth
-198.5 495.5 89 44 rectstroke
-grestore
-gsave
-8 execuserobject setfont
-0 nxsetgray
-8 execuserobject setfont
-0 nxsetgray
-219 508 moveto (Transmit) show
-220 523 moveto (Interrupt) show
-gsave
-201 496 84 43 rectclip
-221 538 moveto (Handler) show
-grestore
-grestore
-0 nxsetgray
-1 setlinewidth
-2 setlinejoin
-[1 6] 1 setdash
-gsave
-newpath
-systemdict
-begin
-108.000023 475.700012 108.000031 495 setbbox
-108.000023 495 moveto
-108.000031 475.700012 lineto
-end
-stroke
-grestore
-[] 0 setdash
-0 setlinejoin
-gsave
-[0 -1 1 0 -359.999969 576] concat
-gsave
-newpath
-systemdict
-begin
-98.800034 463.5 108.000031 472.5 setbbox
-108.000031 468 moveto
--9.2 4.5 rlineto
-1.5 -4.5 rlineto
--1.5 -4.5 rlineto
-closepath
-end
-fill
-grestore
-grestore
-0 nxsetgray
-1 setlinewidth
-2 setlinejoin
-[1 6] 1 setdash
-gsave
-newpath
-systemdict
-begin
-243.000015 475.700012 243.000031 495 setbbox
-243.000015 495 moveto
-243.000031 475.700012 lineto
-end
-stroke
-grestore
-[] 0 setdash
-0 setlinejoin
-gsave
-[0 -1 1 0 -224.999969 711] concat
-gsave
-newpath
-systemdict
-begin
-233.800034 463.5 243.000031 472.5 setbbox
-243.000031 468 moveto
--9.2 4.5 rlineto
-1.5 -4.5 rlineto
--1.5 -4.5 rlineto
-closepath
-end
-fill
-grestore
-grestore
-0 nxsetgray
-1 setlinewidth
-2 setlinejoin
-[6] 1 setdash
-gsave
-newpath
-systemdict
-begin
-27 90 513 90 setbbox
-27 90 moveto
-513 90 lineto
-end
-stroke
-grestore
-[] 0 setdash
-0 setlinejoin
-0 nxsetgray
-1 setlinewidth
-2 setlinejoin
-gsave
-newpath
-systemdict
-begin
-304.700012 45 405.000031 117 setbbox
-405.000031 117 moveto
-405 45 lineto
-304.700012 45 lineto
-end
-stroke
-grestore
-0 setlinejoin
-gsave
-[-1 0 0 -1 594 90] concat
-gsave
-newpath
-systemdict
-begin
-287.799988 40.5 297 49.5 setbbox
-297 45 moveto
--9.2 4.5 rlineto
-1.5 -4.5 rlineto
--1.5 -4.5 rlineto
-closepath
-end
-fill
-grestore
-grestore
-0 nxsetgray
-1 setlinewidth
-2 setlinejoin
-gsave
-newpath
-systemdict
-begin
-297 178.699997 405.000031 207 setbbox
-297 207 moveto
-315 207 lineto
-405 207 lineto
-405.000031 178.699997 lineto
-end
-stroke
-grestore
-0 setlinejoin
-gsave
-[0 -1 1 0 234.000031 576] concat
-gsave
-newpath
-systemdict
-begin
-395.800018 166.5 405.000031 175.5 setbbox
-405.000031 171 moveto
--9.2 4.5 rlineto
-1.5 -4.5 rlineto
--1.5 -4.5 rlineto
-closepath
-end
-fill
-grestore
-grestore
-0.333338 nxsetgray
-gsave
-0.333338 nxsetgray
-newpath
-systemdict
-begin
-400 247 472 301 setbbox
-472 295.600006 moveto
-0 -43.200001 rlineto
-472 249.419205 455.872009 247 436 247 curveto
-416.127991 247 400 249.419205 400 252.399994 curveto
-0 43.200001 rlineto
-400 298.580811 416.127991 301 436 301 curveto
-455.872009 301 472 298.580811 472 295.600006 curveto
-closepath
-end
-clip
-newpath
-1 setlinewidth
-gsave
-newpath
-systemdict
-begin
-400.5 247.5 471.5 300.5 setbbox
-471.5 295.200012 moveto
-0 -42.400002 rlineto
-471.5 249.874405 455.596008 247.5 436 247.5 curveto
-416.403992 247.5 400.5 249.874405 400.5 252.800003 curveto
-0 42.400002 rlineto
-400.5 298.12558 416.403992 300.5 436 300.5 curveto
-455.596008 300.5 471.5 298.12558 471.5 295.199982 curveto
-closepath
-end
-stroke
-grestore
-gsave
-newpath
-systemdict
-begin
-400.5 247.5 471.5 300.5 setbbox
-471.5 252.800003 moveto
-471.5 255.725601 455.596008 258.100006 436 258.100006 curveto
-416.403992 258.100006 400.5 255.725601 400.5 252.800003 curveto
-end
-stroke
-grestore
-grestore
-gsave
-newpath
-systemdict
-begin
-401 248 471 300 setbbox
-471 294.799988 moveto
-0 -41.599998 rlineto
-471 250.329605 455.320007 248 436 248 curveto
-416.679993 248 401 250.329605 401 253.199997 curveto
-0 41.599998 rlineto
-401 297.67041 416.679993 300 436 300 curveto
-455.320007 300 471 297.67041 471 294.800018 curveto
-closepath
-end
-fill
-grestore
-1 nxsetgray
-gsave
-newpath
-systemdict
-begin
-397 244 467 296 setbbox
-467 290.799988 moveto
-0 -41.599998 rlineto
-467 246.329605 451.320007 244 432 244 curveto
-412.679993 244 397 246.329605 397 249.199997 curveto
-0 41.599998 rlineto
-397 293.67041 412.679993 296 432 296 curveto
-451.320007 296 467 293.67041 467 290.800018 curveto
-closepath
-end
-fill
-grestore
-gsave
-newpath
-systemdict
-begin
-396 243 468 297 setbbox
-468 291.600006 moveto
-0 -43.200001 rlineto
-468 245.419205 451.872009 243 432 243 curveto
-412.127991 243 396 245.419205 396 248.399994 curveto
-0 43.200001 rlineto
-396 294.580811 412.127991 297 432 297 curveto
-451.872009 297 468 294.580811 468 291.600006 curveto
-closepath
-end
-clip
-newpath
-0 nxsetgray
-1 setlinewidth
-gsave
-newpath
-systemdict
-begin
-396.5 243.5 467.5 296.5 setbbox
-467.5 291.200012 moveto
-0 -42.400002 rlineto
-467.5 245.874405 451.596008 243.5 432 243.5 curveto
-412.403992 243.5 396.5 245.874405 396.5 248.800003 curveto
-0 42.400002 rlineto
-396.5 294.12558 412.403992 296.5 432 296.5 curveto
-451.596008 296.5 467.5 294.12558 467.5 291.199982 curveto
-closepath
-end
-stroke
-grestore
-gsave
-newpath
-systemdict
-begin
-396.5 243.5 467.5 296.5 setbbox
-467.5 248.800003 moveto
-467.5 251.725601 451.596008 254.100006 432 254.100006 curveto
-412.403992 254.100006 396.5 251.725601 396.5 248.800003 curveto
-end
-stroke
-grestore
-grestore
-gsave
-8 execuserobject setfont
-0 nxsetgray
-8 execuserobject setfont
-0 nxsetgray
-411 266 moveto (Routing) show
-416 281 moveto (Table) show
-grestore
-0 nxsetgray
-1 setlinewidth
-2 setlinejoin
-gsave
-newpath
-systemdict
-begin
-304.304871 227.434952 388.695129 255.565048 setbbox
-304.304871 227.434952 moveto
-388.695129 255.565048 lineto
-end
-stroke
-grestore
-0 setlinejoin
-gsave
-[-0.948683 -0.316228 0.316228 -0.948683 507.607697 532.373413] concat
-gsave
-newpath
-systemdict
-begin
-287.799988 220.5 297 229.5 setbbox
-297 225 moveto
--9.2 4.5 rlineto
-1.5 -4.5 rlineto
--1.5 -4.5 rlineto
-closepath
-end
-fill
-grestore
-grestore
-gsave
-[0.948683 0.316228 -0.316228 0.948683 101.908165 -111.986488] concat
-gsave
-newpath
-systemdict
-begin
-386.799988 253.5 396 262.5 setbbox
-396 258 moveto
--9.2 4.5 rlineto
-1.5 -4.5 rlineto
--1.5 -4.5 rlineto
-closepath
-end
-fill
-grestore
-grestore
-0 nxsetgray
-1 setlinewidth
-2 setlinejoin
-gsave
-newpath
-systemdict
-begin
-242.999969 72 243.000031 172.300003 setbbox
-243.000031 72 moveto
-242.999969 172.300003 lineto
-end
-stroke
-grestore
-0 setlinejoin
-gsave
-[0 1 -1 0 422.999969 -62.999969] concat
-gsave
-newpath
-systemdict
-begin
-233.799973 175.5 242.999969 184.5 setbbox
-242.999969 180 moveto
--9.2 4.5 rlineto
-1.5 -4.5 rlineto
--1.5 -4.5 rlineto
-closepath
-end
-fill
-grestore
-grestore
-0 nxsetgray
-1 setlinewidth
-2 setlinejoin
-gsave
-newpath
-systemdict
-begin
-108 207 181.300003 414 setbbox
-108.000031 414 moveto
-108 207 lineto
-181.300003 207 lineto
-end
-stroke
-grestore
-0 setlinejoin
-gsave
-[1 0 0 1 0 0] concat
-gsave
-newpath
-systemdict
-begin
-179.800003 202.5 189 211.5 setbbox
-189 207 moveto
--9.2 4.5 rlineto
-1.5 -4.5 rlineto
--1.5 -4.5 rlineto
-closepath
-end
-fill
-grestore
-grestore
-grestore
-%%Trailer
-%%DocumentFonts: Helvetica
diff --git a/doc/networking/networking.gif b/doc/networking/networking.gif
deleted file mode 100644
index b2ede8048f..0000000000
--- a/doc/networking/networking.gif
+++ /dev/null
diff --git a/doc/networking/networking.texi b/doc/networking/networking.texi
deleted file mode 100644
index cefac1b00d..0000000000
--- a/doc/networking/networking.texi
+++ /dev/null
@@ -1,107 +0,0 @@
-\input ../texinfo/texinfo   @c -*-texinfo-*-
-@c %**start of header
-@setfilename networking
-@syncodeindex vr fn
-@synindex ky cp
-@paragraphindent 0
-@c @smallbook
-@c %**end of header
-
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@c
-@c   Master file for the network Supplement
-@c
-
-@include ../common/setup.texi
-
-@ignore
-@ifinfo
-@format
-START-INFO-DIR-ENTRY
-* RTEMS Network Supplement:
-END-INFO-DIR-ENTRY
-@end format
-@end ifinfo
-@end ignore
-
-@c
-@c  Title Page Stuff
-@c
-
-@set edition @value{RTEMS-EDITION}
-@set version @value{RTEMS-VERSION}
-@set update-date @value{RTEMS-UPDATE-DATE}
-@set update-month @value{RTEMS-UPDATE-MONTH}
-
-@c
-@c  I don't really like having a short title page.  --joel
-@c
-@c @shorttitlepage RTEMS Network Supplement
-
-@setchapternewpage odd
-@settitle RTEMS Network Supplement
-@titlepage
-@finalout
-
-@title RTEMS Network Supplement
-@subtitle Edition @value{edition}, for RTEMS @value{version}
-@sp 1
-@subtitle @value{update-month}
-@author On-Line Applications Research Corporation
-@page
-@include ../common/cpright.texi
-@end titlepage
-
-@c  This prevents a black box from being printed on "overflow" lines.
-@c  The alternative is to rework a sentence to avoid this problem.
-
-@include preface.texi
-@include networktasks.texi
-@include driver.texi
-@include networkapp.texi
-@include testing.texi
-@ifinfo
-@node Top, Preface, (dir), (dir)
-@top networking
-
-This is the online version of the RTEMS Network Supplement.
-
-@menu
-* Preface::
-* Network Task Structure and Data Flow::
-* Writing RTEMS Network Device Drivers::
-* Using Networking in an RTEMS Application::
-* Testing the Driver::
-* Command and Variable Index::
-* Concept Index::
-@end menu
-
-@end ifinfo
-@c 
-@c 
-@c Need to copy the emacs stuff and "trailer stuff" (index, toc) into here
-@c
-
-@node Command and Variable Index, Concept Index, Throughput, Top
-@unnumbered Command and Variable Index
-
-There are currently no Command and Variable Index entries.
-
-@c @printindex fn
-
-@node Concept Index, , Command and Variable Index, Top
-@unnumbered Concept Index
-
-There are currently no Concept Index entries.
-@c @printindex cp
-
-@c @contents
-@bye
-
diff --git a/doc/networking/networktasks.t b/doc/networking/networktasks.t
deleted file mode 100644
index 61b9fa68e1..0000000000
--- a/doc/networking/networktasks.t
+++ /dev/null
@@ -1,62 +0,0 @@
-@c
-@c  Written by Eric Norum
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Network Task Structure and Data Flow
-
-A schematic diagram of the tasks and message @b{mbuf} queues in a
-simple RTEMS networking application is shown in the following
-figure:
-
-@ifset use-ascii
-@example
-@group
-NO ASCII VERSION OF THE TASKING FIGURE IS AVAILABLE
-@end group
-@end example
-@end ifset
-
-@ifset use-tex
-@c for now use the ascii version
-@example
-@group
-@c why does this not work?
-@c @image{networking}
-NO TEX VERSION OF THE TASKING FIGURE IS AVAILABLE
-@end group
-@end example
-@end ifset
-
-@ifset use-html
-@html
-<IMG SRC="networking.gif" ALIGN=CENTER 
-     ALT="Network Task Structure and Data Flow">
-@end html
-@end ifset
-
-
-The transmit task  for each network interface is normally blocked waiting
-for a packet to arrive in the transmit queue.  Once a packet arrives, the
-transmit task may block waiting for an event from the transmit interrupt
-handler.  The transmit interrupt handler sends an RTEMS event to the transmit
-task to indicate that transmit hardware resources have become available.
-
-The receive task for each network interface is normally blocked waiting
-for an event from the receive interrupt handler.  When this event is received
-the receive task reads the packet and forwards it to the network stack
-for subsequent processing by the network task.
-
-The network task processes incoming packets and takes care of
-timed operations such as handling TCP timeouts and
-aging and removing routing table entries.
-
-The `Network code' contains routines which may run in the context of
-the user application tasks, the interface receive task or the network task.
-A network semaphore ensures that
-the data structures manipulated by the network code remain consistent.
diff --git a/doc/networking/preface.texi b/doc/networking/preface.texi
deleted file mode 100644
index 7909bb6868..0000000000
--- a/doc/networking/preface.texi
+++ /dev/null
@@ -1,57 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@ifinfo
-@node Preface, Network Task Structure and Data Flow, Top, Top
-@end ifinfo
-@unnumbered Preface
-
-This document describes the RTEMS specific parts of the FreeBSD TCP/IP
-stack.  Much of this documentation was written by Eric Norum
-@ifset use-html
-(@href{eric@@skatter.usask.ca,,,mailto:eric@@skatter.usask.ca})
-@end ifset
-@ifclear use-html
-(eric@@skatter.usask.ca)
-@end ifclear
-of the Saskatchewan Accelerator Laboratory
-who also ported the FreeBSD TCP/IP stack to RTEMS.
-
-The following is a list of resources which should be useful in trying
-to understand Ethernet:
-
-@itemize @bullet
-
-@item @cite{Charles Spurgeon's Ethernet Web Site}
-
-"This site provides extensive information about Ethernet
-(IEEE 802.3) local area network (LAN) technology. Including
-the original 10 Megabit per second (Mbps) system, the 100 Mbps
-Fast Ethernet system (802.3u), and the Gigabit Ethernet system (802.3z)."
-The URL is:
-@ifset use-html
-(@href{http://wwwhost.ots.utexas.edu/ethernet/index.html,,,http://wwwhost.ots.utexas.edu/ethernet/index.html})
-@end ifset
-@ifclear use-html
-(http://wwwhost.ots.utexas.edu/ethernet/index.html)
-@end ifclear
-
-@item @cite{TCP/IP Illustrated, Volume 1 : The Protocols} by
-by W. Richard Stevens (ISBN: 0201633469)
-
-This book provides detailed introduction to TCP/IP and includes diagnostic
-programs which are publicly available.
-
-@item @cite{TCP/IP Illustrated : The Implementation} by W. Richard
-Stevens and Gary Wright (ISBN: 020163354X)
-
-This book focuses on implementation issues regarding TCP/IP.  The
-treat for RTEMS users is that the implementation covered is the BSD
-stack.
-
-@end itemize
diff --git a/doc/networking/testing.t b/doc/networking/testing.t
deleted file mode 100644
index af1460ad2d..0000000000
--- a/doc/networking/testing.t
+++ /dev/null
@@ -1,175 +0,0 @@
-@c
-@c  Written by Eric Norum
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-
-@chapter Testing the Driver
-
-@section Preliminary Setup
-
-The network used to test the driver should include at least:
-
-@itemize @bullet
-
-@item The hardware on which the driver is to run.
-It makes testing much easier if you can run a debugger to control
-the operation of the target machine.
-
-@item An Ethernet network analyzer or a workstation with an
-`Ethernet snoop' program such as @code{ethersnoop} or
-@code{tcpdump}.
-
-@item A workstation.
-
-@end itemize
-
-During early debug, you should consider putting the target, workstation, 
-and snooper on a small network by themselves.  This offers a few 
-advantages:
-
-@itemize @bullet
-
-@item There is less traffic to look at on the snooper and for the target
-to process while bringing the driver up.
-
-@item Any serious errors will impact only your small network not a building
-or campus network.  You want to avoid causing any unnecessary problems.
-
-@item Test traffic is easier to repeatably generate.
-
-@item Performance measurements are not impacted by other systems on
-the network.
-
-@end itemize
-
-@section Driver basic operation
-
-The network demonstration program @code{netdemo} may be used for these tests.
-
-@itemize @bullet
-
-@item Edit @code{networkconfig.h} to reflect the values for your network.
-
-@item Start with @code{RTEMS_USE_BOOTP} not defined.
-
-@item Edit @code{networkconfig.h} to configure the driver
-with an
-explicit Ethernet and Internet address and with reception of
-broadcast packets disabled:
-
-Verify that the program continues to run once the driver has been attached.
-
-@item Issue a @samp{u} command to send UDP
-packets to the `discard' port.
-Verify that the packets appear on the network.
-
-@item Issue a @samp{s} command to print the network and driver statistics.
-
-@item On a workstation, add a static route to the target system.
-
-@item On that same workstation try to `ping' the target system.
-Verify that the ICMP echo request and reply packets appear on the net.
-
-@item Remove the static route to the target system.
-Modify @code{networkconfig.h} to attach the driver
-with reception of broadcast packets enabled.
-Try to `ping' the target system again.
-Verify that ARP request/reply and ICMP echo request/reply packets appear
-on the net.
-
-@item Issue a @samp{t} command to send TCP
-packets to the `discard' port.
-Verify that the packets appear on the network.
-
-@item Issue a @samp{s} command to print the network and driver statistics.
-
-@item Verify that you can telnet to ports 24742
-and 24743 on the target system from one or more
-workstations on your network.
-
-@end itemize
-
-@section BOOTP operation
-
-Set up a BOOTP server on the network.
-Set define @code{RTEMS USE_BOOT} in @code{networkconfig.h}.
-Run the @code{netdemo} test program.
-Verify that the target system configures itself from the BOOTP server and
-that all the above tests succeed.
-
-@section Stress Tests
-
-Once the driver passes the tests described in the previous section it should
-be subjected to conditions which exercise it more
-thoroughly and which test its error handling routines.
-
-@subsection Giant packets
-
-@itemize @bullet
-@item Recompile the driver with @code{MAXIMUM_FRAME_SIZE} set to
-a smaller value, say 514.
-
-@item `Ping' the driver from another workstation and verify
-that frames larger than 514 bytes are correctly rejected.
-
-@item Recompile the driver with @code{MAXIMUM_FRAME_SIZE} restored  to 1518.
-@end itemize
-
-@subsection Resource Exhaustion
-
-@itemize @bullet
-@item Edit  @code{networkconfig.h}
-so that the driver is configured with just two receive and transmit descriptors.
-
-@item Compile and run the @code{netdemo} program.
-
-@item Verify that the program operates properly and that you can
-still telnet to both the ports.
-
-@item Display the driver statistics (Console `@code{s}' command or telnet
-`control-G' character) and verify that:
-
-@enumerate
-
-@item The number of transmit interrupts is non-zero.
-This indicates that all transmit descriptors have been in use at some time.
-
-@item The number of missed packets is non-zero.
-This indicates that all receive descriptors have been in use at some time.
-
-@end enumerate
-
-@end itemize
-
-@subsection Cable Faults
-
-@itemize @bullet
-@item Run the @code{netdemo} program.
-
-@item Issue a `@code{u}' console command to make the target machine transmit
-a bunch of UDP packets.
-
-@item While the packets are being transmitted, disconnect and reconnect the
-network cable.
-
-@item Display the network statistics and verify that the driver has
-detected the loss of carrier.
-
-@item Verify that you can still telnet to both ports on the target machine.
-
-@end itemize
-
-@subsection Throughput
-
-Run the @code{ttcp} network benchmark program.
-Transfer large amounts of data (100's of megabytes) to and from the target
-system.
-
-
-
diff --git a/doc/new_chapters/Makefile b/doc/new_chapters/Makefile
deleted file mode 100644
index 90d078621d..0000000000
--- a/doc/new_chapters/Makefile
+++ /dev/null
@@ -1,172 +0,0 @@
-#
-#  COPYRIGHT (c) 1988-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  All rights reserved.
-#
-#  $Id$
-#
-
-PROJECT=posix_users_new
-DISTRIBUTION_LEVEL=public
-
-include ../Make.config
-
-all: html info ps
-
-dirs:
-	$(make-dirs)
-
-COMMON_FILES=../common/cpright.texi
-
-GENERATED_FILES= \
-   adminiface.texi cancel.texi clock.texi cond.texi confspace.texi \
-   cspecific.texi device.texi dumpcontrol.texi eventlog.texi files.texi \
-   io.texi key.texi memorymgmt.texi message.texi mutex.texi procenv.texi \
-   process.texi sched.texi semaphores.texi signal.texi systemdb.texi \
-   thread.texi
-
-FILES= posix_users.texi preface.texi \
-  $(COMMON_FILES) $(GENERATED_FILES)
-
-INFOFILES=$(wildcard $(PROJECT) $(PROJECT)-*)
-
-info: dirs $(FILES) $(PROJECT)
-#	cp $(PROJECT) $(PROJECT)-* $(INFO_INSTALL)
-	cp $(PROJECT) $(INFO_INSTALL)
-
-$(PROJECT): $(FILES)
-	$(MAKEINFO) posix_users.texi
-
-dvi: $(PROJECT).dvi
-ps: dirs $(PROJECT).ps
-	
-$(PROJECT).ps: $(PROJECT).dvi
-	dvips -o $(PROJECT).ps $(PROJECT).dvi
-	cp $(PROJECT).ps $(PS_INSTALL)
-
-$(PROJECT).dvi: $(FILES)
-	$(TEXI2DVI) posix_users.texi
-	mv posix_users.dvi $(PROJECT).dvi
-
-html: dirs $(FILES)
-	-mkdir -p $(WWW_INSTALL)/$(PROJECT)
-	-cd .. ; gmake headers
-	$(TEXI2WWW) $(TEXI2WWW_ARGS) -dir $(WWW_INSTALL)/$(PROJECT) \
- 	    posix_users.texi
-
-
-clean:
-	rm -f *.o $(PROG) *.txt core *.html 
-	rm -f *.dvi *.ps *.log *.aux *.cp *.fn *.ky *.pg *.toc *.tp *.vr $(BASE)
-	rm -f $(PROJECT) $(PROJECT)-* _* $(GENERATED_FILES)
-
-process.texi: process.t Makefile
-	 $(BMENU) -p "" \
-	    -u "Top" \
-	    -n "" ${*}.t
-
-procenv.texi: procenv.t Makefile
-	 $(BMENU) -p "" \
-	    -u "Top" \
-	    -n "" ${*}.t
-
-files.texi: files.t Makefile
-	 $(BMENU) -p "" \
-	    -u "Top" \
-	    -n "" ${*}.t
-
-thread.texi: thread.t Makefile
-	 $(BMENU) -p "" \
-	    -u "Top" \
-	    -n "" ${*}.t
-
-signal.texi: signal.t Makefile
-	 $(BMENU) -p "" \
-	    -u "Top" \
-	    -n "" ${*}.t
-
-mutex.texi: mutex.t Makefile
-	 $(BMENU) -p "" \
-	    -u "Top" \
-	    -n "" ${*}.t
-
-cond.texi: cond.t Makefile
-	 $(BMENU) -p "" \
-	    -u "Top" \
-	    -n "" ${*}.t
-
-key.texi: key.t Makefile
-	 $(BMENU) -p "" \
-	    -u "Top" \
-	    -n "" ${*}.t
-
-clock.texi: clock.t Makefile
-	 $(BMENU) -p "" \
-	    -u "Top" \
-	    -n "" ${*}.t
-
-sched.texi: sched.t Makefile
-	 $(BMENU) -p "" \
-	    -u "Top" \
-	    -n "" ${*}.t
-
-io.texi: io.t Makefile
-	 $(BMENU) -p "" \
-	    -u "Top" \
-	    -n "" ${*}.t
-
-device.texi: device.t Makefile
-	 $(BMENU) -p "" \
-	    -u "Top" \
-	    -n "" ${*}.t
-
-cspecific.texi: cspecific.t Makefile
-	 $(BMENU) -p "" \
-	    -u "Top" \
-	    -n "" ${*}.t
-
-semaphores.texi: semaphores.t Makefile
-	 $(BMENU) -p "" \
-	    -u "Top" \
-	    -n "" ${*}.t
-
-memorymgmt.texi: memorymgmt.t Makefile
-	 $(BMENU) -p "" \
-	    -u "Top" \
-	    -n "" ${*}.t
-
-message.texi: message.t Makefile
-	 $(BMENU) -p "" \
-	    -u "Top" \
-	    -n "" ${*}.t
-
-cancel.texi: cancel.t Makefile
-	 $(BMENU) -p "" \
-	    -u "Top" \
-	    -n "" ${*}.t
-
-eventlog.texi: eventlog.t Makefile
-	 $(BMENU) -p "" \
-	    -u "Top" \
-	    -n "" ${*}.t
-
-dumpcontrol.texi: dumpcontrol.t Makefile
-	 $(BMENU) -p "" \
-	    -u "Top" \
-	    -n "" ${*}.t
-
-confspace.texi: confspace.t Makefile
-	 $(BMENU) -p "" \
-	    -u "Top" \
-	    -n "" ${*}.t
-
-adminiface.texi: adminiface.t Makefile
-	 $(BMENU) -p "" \
-	    -u "Top" \
-	    -n "" ${*}.t
-
-systemdb.texi: systemdb.t Makefile
-	 $(BMENU) -p "" \
-	    -u "Top" \
-	    -n "" ${*}.t
-
diff --git a/doc/new_chapters/STATUS b/doc/new_chapters/STATUS
deleted file mode 100644
index f7103dc99e..0000000000
--- a/doc/new_chapters/STATUS
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-#  $Id$
-#
-
-Each of the chapters is individually generated with no attempt to link 
-the chapters together into a long hypertext chain.
-
diff --git a/doc/new_chapters/adminiface.t b/doc/new_chapters/adminiface.t
deleted file mode 100644
index c38b551e96..0000000000
--- a/doc/new_chapters/adminiface.t
+++ /dev/null
@@ -1,129 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved. 
-@c
-@c  $Id$
-@c
-
-@chapter Administration Interface Manager
-
-@section Introduction
-
-The administration interface manager provides a portable
-interface for some system administrative functions.
-The capabilities in this manager are defined in the POSIX
-1003.1h/D3 proposed standard titled @b{Services for Reliable,
-Available, and Serviceable Systems}.
-
-The directives provided by the administration interface manager are:
-
-@itemize @bullet
-@item @code{admin_shutdown} - Shutdown the system
-@end itemize
-
-@section Background
-
-@subsection admin_args Structure
-
-@example
-put structure here
-@end example
-
-@table @b
-@item admin_type
-This field ...
-
-@table @b
-@item ADMIN_AUTOBOOT
-The default, causing the system to reboot in its usual fashion.  The
-@code{admin_data} field points to an implementation defined string
-that specifies the system image to reboot.
-
-@item ADMIN_HALT
-The system is simply halted; no reboot takes place.
-
-@item ADMIN_FAST
-The system does no send SIGTERM to active processes before halting.
-
-@item ADMIN_IMMEDIATE
-The system does not perform any of the normal shutdown procedures.
-
-@item ADMIN_ALTSYSTEM
-The system reboots using the @code{admin_data} string as a specification
-of the system to be booted.
-
-@item ADMIN_ALTCONFIG
-The system reboots using the @code{admin_data} string as a specification
-of the initial implicit configuration space.
-
-@item ADMIN_SYSDUMP
-Dump kernal memory before rebooting.
-
-@item ADMIN_INIT
-An option allowing the specification of an alternate initial program
-to be run when the system reboots.
-
-@end table
-
-@item admin_data
-This field ...
-
-@end table
-
-@section Operations
-
-@subsection Shutting Down the System
-
-@section Directives
-
-This section details the administration interface manager's directives.
-A subsection is dedicated to each of this manager's directives
-and describes the calling sequence, related constants, usage,
-and status codes.
-
-@page
-@subsection admin_shutdown - Shutdown the system
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <admin.h>
-
-int admin_shutdown(
-  struct admin_args   *args[],
-  size_t               nargs
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item EINVAL
-An invalid argument was passed to the function call.
-
-@item EPERM
-The caller does not have appropriate permission for shutting down the 
-system.
-
-@end table
-
-@subheading DESCRIPTION:
-
-The @code{admin_shutdown} function restarts the system.  The
-@code{args} argument specifies alternate or optional behavior
-for the @code{admin_shutdown} function.  The @code{admin_type}
-member of each element of the @code{args} array specifies the
-optional behavior to be performed.  There are some @code{admin_types} 
-values that may provoke unspecified behavior.  The @code{nargs}
-argument specifies the length of the @code{args} array.
-
-@subheading NOTES:
-
-The @code{_POSIX_ADMIN} feature flag is defined to indicate
-this service is available.
diff --git a/doc/new_chapters/base.t b/doc/new_chapters/base.t
deleted file mode 100644
index e258f87f80..0000000000
--- a/doc/new_chapters/base.t
+++ /dev/null
@@ -1,62 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Mutex Manager
-
-@section Introduction
-
-The mutex manager ...
-
-The directives provided by the mutex manager are:
-
-@itemize @bullet
-@item @code{sigaddset} - 
-@item @code{sigdelset} - 
-@item @code{sigfillset} - 
-@item @code{sigismember} - 
-@item @code{sigemptyset} - 
-@item @code{sigaction} - 
-@item @code{pthread_kill} - 
-@item @code{pthread_sigmask} - 
-@item @code{kill} - 
-@item @code{sigwait} - 
-@end itemize
-
-@section Background
-
-There is currently no text in this section.
-
-@section Operations
-
-There is currently no text in this section.
-
-@section Directives
-
-This section details the mutex manager's directives.
-A subsection is dedicated to each of this manager's directives
-and describes the calling sequence, related constants, usage,
-and status codes.
-
-@page
-@subsection sigaddset
-
-@subheading CALLING SEQUENCE:
-
-@example
-int sigaddset(
-  sigset_t   *set,
-  int         signo
-);
-@end example
-
-@subheading STATUS CODES:
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
diff --git a/doc/new_chapters/cancel.t b/doc/new_chapters/cancel.t
deleted file mode 100644
index e71d70c6df..0000000000
--- a/doc/new_chapters/cancel.t
+++ /dev/null
@@ -1,175 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved. 
-@c
-@c  $Id$
-@c
-
-@chapter Thread Cancellation Manager
-
-@section Introduction
-
-The 
-thread cancellation manager is ...
-
-The directives provided by the thread cancellation manager are:
-
-@itemize @bullet
-@item @code{pthread_cancel} - 
-@item @code{pthread_setcancelstate} - 
-@item @code{pthread_setcanceltype} - 
-@item @code{pthread_testcancel} - 
-@item @code{pthread_cleanup_push} - 
-@end itemize
-
-@section Background
-
-There is currently no text in this section.
-
-@section Operations
-
-There is currently no text in this section.
-
-@section Directives
-
-This section details the thread cancellation manager's directives.
-A subsection is dedicated to each of this manager's directives
-and describes the calling sequence, related constants, usage,
-and status codes.
-
-@page
-@subsection pthread_cancel - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int pthread_cancel(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection pthread_setcancelstate - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int pthread_setcancelstate(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection pthread_setcanceltype - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int pthread_setcanceltype(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection pthread_testcancel - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int pthread_testcancel(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection pthread_cleanup_push - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int pthread_cleanup_push(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
diff --git a/doc/new_chapters/clock.t b/doc/new_chapters/clock.t
deleted file mode 100644
index 7c05acd671..0000000000
--- a/doc/new_chapters/clock.t
+++ /dev/null
@@ -1,274 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Clock Manager
-
-@section Introduction
-
-The clock manager ...
-
-The directives provided by the clock manager are:
-
-@itemize @bullet
-@item @code{clock_gettime} - 
-@item @code{clock_settime} -
-@item @code{clock_getres} -
-@item @code{sleep} - Delay Process Execution
-@item @code{nanosleep} -
-@item @code{gettimeofday} - Get the Time of Day
-@item @code{time} - Get time in seconds
-@end itemize
-
-@section Background
-
-There is currently no text in this section.
-
-@section Operations
-
-There is currently no text in this section.
-
-@section Directives
-
-This section details the clock manager's directives.
-A subsection is dedicated to each of this manager's directives
-and describes the calling sequence, related constants, usage,
-and status codes.
-
-@subsection clock_gettime -
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <time.h>
-
-int clock_gettime(
-  clockid_t        clock_id,
-  struct timespec *tp
-);
-@end example
-
-@subheading STATUS CODES:
-
-On error, this routine returns -1 and sets errno to one of the following:
-
-@table @b
-@item EINVAL
-The tp pointer parameter is invalid. 
-
-@item EINVAL
-The clock_id specified is invalid. 
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-NONE
-
-@page
-@subsection clock_settime -
- 
-@subheading CALLING SEQUENCE:
- 
-@example
-#include <time.h>
- 
-int clock_settime(
-  clockid_t              clock_id,
-  const struct timespec *tp
-);
-@end example
- 
-@subheading STATUS CODES:
- 
-On error, this routine returns -1 and sets errno to one of the following:
-
-@table @b
-@item EINVAL
-The tp pointer parameter is invalid. 
-
-@item EINVAL
-The clock_id specified is invalid.
-
-@item EINVAL
-The contents of the tp structure are invalid.
-
-@end table
- 
-@subheading DESCRIPTION:
- 
-@subheading NOTES:
-
-NONE
- 
-@page
-@subsection clock_getres -
- 
-@subheading CALLING SEQUENCE:
- 
-@example
-#include <time.h>
- 
-int clock_getres(
-  clockid_t        clock_id,
-  struct timespec *res
-);
-@end example
- 
-@subheading STATUS CODES:
- 
-On error, this routine returns -1 and sets errno to one of the following:
-
-@table @b
-@item EINVAL
-The res pointer parameter is invalid. 
-
-@item EINVAL
-The clock_id specified is invalid.
-
-@end table
- 
-@subheading DESCRIPTION:
- 
-@subheading NOTES:
- 
-If res is NULL, then the resolution is not returned.
-
-@page
-@subsection sleep - Delay Process Execution
- 
-@subheading CALLING SEQUENCE:
- 
-@example
-#include <time.h>
- 
-unsigned int sleep(
-  unsigned int seconds
-);
-@end example
- 
-@subheading STATUS CODES:
-
-This routine returns the number of unslept seconds.
-
-@subheading DESCRIPTION:
- 
-The @code{sleep()} function delays the calling thread by the specified
-number of @code{seconds}.
-
-@subheading NOTES:
-
-This call is interruptible by a signal.
- 
-@page
-@subsection nanosleep -
- 
-@subheading CALLING SEQUENCE:
- 
-@example
-#include <time.h>
- 
-int nanosleep(
-  const struct timespec *rqtp,
-  struct timespec       *rmtp
-);
-@end example
- 
-@subheading STATUS CODES:
-
-On error, this routine returns -1 and sets errno to one of the following:
-
-@table @b
-@item EINTR
-The routine was interrupted by a signal.
-
-@item EAGAIN
-The requested sleep period specified negative seconds or nanoseconds.
-
-@item EINVAL
-The requested sleep period specified an invalid number for the nanoseconds
-field.
-
-@end table
- 
-@subheading DESCRIPTION:
- 
-@subheading NOTES:
- 
-This call is interruptible by a signal.
-
-@page
-@subsection gettimeofday - Get the Time of Day
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <sys/time.h>
-#include <unistd.h>
-
-int gettimeofday(
-  struct timeval  *tp,
-  struct timezone *tzp
-);
-@end example
-
-@subheading STATUS CODES:
-
-On error, this routine returns -1 and sets @code{errno} as appropriate.
-
-@table @b
-@item EPERM
-@code{settimeofdat} is called by someone other than the superuser.
-
-@item EINVAL
-Timezone (or something else) is invalid.
-
-@item EFAULT
-One of @code{tv} or @code{tz} pointed outside your accessible address 
-space
-
-@end table
-
-@subheading DESCRIPTION:
-
-This routine returns the current time of day in the @code{tp} structure.
-
-@subheading NOTES:
-
-Currently, the timezone information is not supported.  The @code{tzp}
-argument is ignored.
-
-@page
-@subsection time - Get time in seconds
- 
-@subheading CALLING SEQUENCE:
- 
-@example
-#include <time.h>
- 
-int time(
-  time_t  *tloc
-);
-@end example
- 
-@subheading STATUS CODES:
-
-This routine returns the number of seconds since the Epoch.
-
-@subheading DESCRIPTION:
-
-@code{time} returns the time since 00:00:00 GMT, January 1, 1970, 
-measured in seconds
-
-If @code{tloc} in non null, the return value is also stored in the 
-memory pointed to by @code{t}.
- 
-@subheading NOTES:
-
-NONE
- 
diff --git a/doc/new_chapters/cond.t b/doc/new_chapters/cond.t
deleted file mode 100644
index 4c381a6864..0000000000
--- a/doc/new_chapters/cond.t
+++ /dev/null
@@ -1,323 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Condition Variable Manager
-
-@section Introduction
-
-The condition variable manager ...
-
-The directives provided by the condition variable manager are:
-
-@itemize @bullet
-@item @code{pthread_condattr_init} - 
-@item @code{pthread_condattr_destroy} - 
-@item @code{pthread_condattr_setpshared} - 
-@item @code{pthread_condattr_getpshared} - 
-@item @code{pthread_cond_init} - 
-@item @code{pthread_cond_destroy} - 
-@item @code{pthread_cond_signal} - 
-@item @code{pthread_cond_broadcast} - 
-@item @code{pthread_cond_wait} - 
-@item @code{pthread_cond_timedwait} - 
-@end itemize
-
-@section Background
-
-There is currently no text in this section.
-
-@section Operations
-
-There is currently no text in this section.
-
-@section Directives
-
-This section details the condition variable manager's directives.
-A subsection is dedicated to each of this manager's directives
-and describes the calling sequence, related constants, usage,
-and status codes.
-
-@page
-@subsection pthread_condattr_init
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_condattr_init(
-  pthread_condattr_t *attr
-);
-@end example
-
-@subheading STATUS CODES:
-@table @b
-@item ENOMEM
-Insufficient memory is available to initialize the condition variable
-attributes object.
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection pthread_condattr_destroy
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_condattr_destroy(
-  pthread_condattr_t *attr
-);
-@end example
-
-@subheading STATUS CODES:
-@table @b
-@item EINVAL
-The attribute object specified is invalid.
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection pthread_condattr_setpshared
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_condattr_setpshared(
-  pthread_condattr_t   *attr,
-  int                   pshared
-);
-@end example
-
-@subheading STATUS CODES:
- 
-@table @b
-@item EINVAL
-Invalid argument passed.
- 
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection pthread_condattr_getpshared
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_condattr_getpshared(
-  const pthread_condattr_t   *attr,
-  int                        *pshared
-);
-@end example
-
-@subheading STATUS CODES:
- 
-@table @b
-@item EINVAL
-Invalid argument passed.
- 
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-
-@page
-@subsection pthread_cond_init
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_cond_init(
-  pthread_cond_t           *cond,
-  const pthread_condattr_t *attr
-);
-@end example
-
-@subheading STATUS CODES:
-@table @b
-@item EAGAIN
-The system lacked a resource other than memory necessary to create the
-initialize the condition variable object. 
-
-@item ENOMEM
-Insufficient memory is available to initialize the condition variable object.
-
-@item EBUSY
-The specified condition variable has already been initialized.
-
-@item EINVAL
-The specified attribute value is invalid.
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection pthread_cond_destroy
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_cond_destroy(
-  pthread_cond_t           *cond
-);
-@end example
-
-@subheading STATUS CODES:
-@table @b
-@item EINVAL
-The specified condition variable is invalid.
-
-@item EBUSY
-The specified condition variable is currently in use.
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection pthread_cond_signal
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_cond_signal(
-  pthread_cond_t           *cond
-);
-@end example
-
-@subheading STATUS CODES:
-@table @b
-@item EINVAL
-The specified condition variable is not valid.
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-This routine should not be invoked from a handler from an asynchronous signal 
-handler or an interrupt service routine.
-
-@page
-@subsection pthread_cond_broadcast
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_cond_broadcast(
-  pthread_cond_t  *cond
-);
-@end example
-
-@subheading STATUS CODES:
-@table @b
-@item EINVAL
-The specified condition variable is not valid.
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-This routine should not be invoked from a handler from an asynchronous signal 
-handler or an interrupt service routine.
-
-@page
-@subsection pthread_cond_wait
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_cond_wait(
-  pthread_cond_t           *cond,
-  pthread_mutex_t          *mutex
-);
-@end example
-
-@subheading STATUS CODES:
-@table @b
-@item EINVAL
-The specified condition variable or mutex is not initialized OR different 
-mutexes were specified for concurrent pthread_cond_wait() and 
-pthread_cond_timedwait() operations on the same condition variable OR
-the mutex was not owned by the current thread at the time of the call.
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection pthread_cond_timedwait
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_cond_timedwait(
-  pthread_cond_t        *cond,
-  pthread_mutex_t       *mutex,
-  const struct timespec *abstime
-);
-@end example
-
-@subheading STATUS CODES:
-@table @b
-@item EINVAL
-The specified condition variable or mutex is not initialized OR different 
-mutexes were specified for concurrent pthread_cond_wait() and 
-pthread_cond_timedwait() operations on the same condition variable OR
-the mutex was not owned by the current thread at the time of the call.
- 
-@item ETIMEDOUT
-The specified time has elapsed without the condition variable being 
-satisfied.
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
diff --git a/doc/new_chapters/confspace.t b/doc/new_chapters/confspace.t
deleted file mode 100644
index 262d32687c..0000000000
--- a/doc/new_chapters/confspace.t
+++ /dev/null
@@ -1,1351 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved. 
-@c
-@c  $Id$
-@c
-
-@chapter Configuration Space Manager
-
-@section Introduction
-
-The configuration space manager provides a portable
-interface for manipulating configuration data.
-The capabilities in this manager were defined in the POSIX
-1003.1h/D3 proposed standard titled @b{Services for Reliable,
-Available, and Serviceable Systems}.
-
-The directives provided by the configuration space manager are:
-
-@itemize @bullet
-@item @code{cfg_mount} - Mount a Configuration Space
-@item @code{cfg_unmount} - Unmount a Configuration Space
-@item @code{cfg_mknod} - Create a Configuration Node
-@item @code{cfg_get} - Get Configuration Node Value
-@item @code{cfg_set} - Set Configuration Node Value
-@item @code{cfg_link} - Create a Configuration Link
-@item @code{cfg_unlink} - Remove a Configuration Link
-@item @code{cfg_open} - Open a Configuration Space
-@item @code{cfg_read} - Read a Configuration Space
-@item @code{cfg_children} - Get Node Entries
-@item @code{cfg_mark} - Set Configuration Space Option
-@item @code{cfg_readdir} - Reads a directory
-@item @code{cfg_umask} - Sets a file creation mask
-@item @code{cfg_chmod} - Changes file mode
-@item @code{cfg_chown} - Changes the owner and/or group of a file
-@end itemize
-
-@section Background
-
-@subsection Configuration Nodes
-
-@subsection Configuration Space
-
-@subsection Format of a Configuration Space File
-
-@section Operations
-
-@subsection Mount and Unmounting
-
-@subsection Creating a Configuration Node
-
-@subsection Removing a Configuration Node
-
-@subsection Manipulating a Configuration Node
-
-@subsection Traversing a Configuration Space
-
-@section Directives
-
-This section details the configuration space manager's directives.
-A subsection is dedicated to each of this manager's directives
-and describes the calling sequence, related constants, usage,
-and status codes.
-
-@page
-@subsection cfg_mount - Mount a Configuration Space
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <cfg.h>
-
-int cfg_mount(
-  const char     *file,
-  const char     *cfgpath,
-  log_facility_t  notification,
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-A successful call to @code{cfg_mount()} returns a value of zero
-and an unsuccessful call returns the @code{errno}.
-
-@table @b
-@item EPERM
-The caller does not have the appropriate privilege.
-
-@item EACCES
-Search permission is denied for a component of the path prefix.
-
-@item EEXIST
-The file specified by the @code{file} argument does not exist
-
-@item ENAMETOOLONG
-A component of a pathname exceeded @code{NAME_MAX} characters,
-or an entire path name exceed @code{PATH_MAX} characters while
-@code{_POSIX_NO_TRUNC} is in effect.
-
-@item ENOENT
-A component of @code{cfgpath} does not exist.
-
-@item ENOTDIR
-A component of the @code{file} path prefix is not a directory.
-
-@item EBUSY
-The configuration space defined by @code{file} is already mounted.
-
-@item EINVAL
-The notification argument specifies an invalid log facility.
-
-@end table
-
-@subheading DESCRIPTION:
-
-The @code{cfg_mount()} function maps a configuration space defined
-by the file identified by the the @code{file} argument.  The 
-distinguished node of the mapped configuration space is
-mounted in the active space at the point identified by the
-@code{cfgpath} configuration pathname.
-
-The @code{notification} argument specifies how changes to the
-mapped configuration space are communicated to the application.
-If the @code{notification} argument is NULL, no notification will be
-be performed for the mapped configuration space.  If the Event
-Logging option is defined, the notification argument defines the
-facility to which changes in the mapped configuration space are
-logged.  Otherwise, the @code{notification} argument specifies
-an implementation defined method of notifying the application
-of changes to the mapped configuration space.
-
-@subheading NOTES:
-
-The @code{_POSIX_CFG} feature flag is defined to indicate
-this service is available.
-
-@page
-@subsection cfg_unmount - Unmount a Configuration Space
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <cfg.h>
-
-int cfg_unmount(
-  const char     *cfgpath
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-A successful call to @code{cfg_umount()} returns a value of zero
-and an unsuccessful call returns the @code{errno}.
-
-@table @b
-@item EPERM
-The caller does not have the appropriate privileges.
-
-@item EACCES
-Search permission is denied for a component of the path prefix.
-
-@item ENOENT
-A component of @code{cfgpath} does not exist.
-
-@item ENAMETOOLONG
-A component of a pathname exceeded @code{NAME_MAX} characters,
-or an entire path name exceed @code{PATH_MAX} characters while
-@code{_POSIX_NO_TRUNC} is in effect.
-
-@item EINVAL
-The requested node is not the distinguished node of a mounted
-configuration space.
-
-@item EBUSY
-One or more processes has an open configuration traversal
-stream for the configuration space whose distinguished node is
-referenced by the cfgpath argument.
-
-@item ELOOP
-A node appears more than once in the path specified by the 
-@code{cfgpath} argument
-
-@item ELOOP
-More than @code{SYMLOOP_MAX} symbolic links were encountered during
-resolution of the cfgpath argument
-
-@end table
-
-@subheading DESCRIPTION:
-
-The @code{cfg_umount()} function unmaps the configuration space whose 
-distinguished node is mapped in the active space at the location defined
-by @code{cfgpath} configuration pathname.  All system resources 
-allocated for this configuration space should be deallocated.
-
-@subheading NOTES:
-
-The @code{_POSIX_CFG} feature flag is defined to indicate
-this service is available.
-
-@page
-@subsection cfg_mknod - Create a Configuration Node
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <cfg.h>
-
-int cfg_mknod(
-  const char   *cfgpath,
-  mode_t        mode,
-  cfg_type_t    type         
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-A successful call to @code{cfg_mknod()} returns a value of zero
-and an unsuccessful call returns the @code{errno}.
-
-@table @b
-@item ENAMETOOLONG
-A component of a pathname exceeded @code{NAME_MAX} characters,
-or an entire path name exceed @code{PATH_MAX} characters while
-@code{_POSIX_NO_TRUNC} is in effect.
-
-@item ENOENT
-A component of the path prefix does not exist.
-
-@item EACCES
-Search permission is denied for a component of the path prefix.
-
-
-@item EPERM
-The calling process does not have the appropriate privilege.
-
-@item EEXIST
-The named node exists.
-
-@item EINVAL
-The value of @code{mode} is invalid.
-
-@item EINVAL
-The value of @code{type} is invalid.
-
-@item ELOOP
-A node appears more than once in the path specified by the 
-@code{cfg_path} argument
-
-@item ELOOP
-More than @code{SYMLOOP_MAX} symbolic links were encountered during
-resolution of the @code{cfgpath} argument.
-
-@item EROFS
-The named @code{node} resides on a read-only configuration space.
-
-@end table
-
-@subheading DESCRIPTION:
-
-The @code{cfg_mknod()} function creates a new node in the configuration
-space which contains the pathname prefix of @code{cfgpath}.  The node
-name is defined by the pathname suffix of @code{cfgpath}. The node
-permissions are specified by the value of @code{mode}.  The node type
-is specified by the value of @code{type}.
-
-@subheading NOTES:
-
-The @code{_POSIX_CFG} feature flag is defined to indicate
-this service is available.
-
-@page
-@subsection cfg_get - Get Configuration Node Value
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <cfg.h>
-
-int cfg_get(
-  const char  *cfgpath
-  cfg_value_t *value
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-A successful call to @code{cfg_get()} returns a value of zero
-and an unsuccessful call returns the @code{errno}.
-
-@table @b
-@item ENAMETOOLONG
-A component of a pathname exceeded @code{NAME_MAX} characters,
-or an entire path name exceed @code{PATH_MAX} characters while
-@code{_POSIX_NO_TRUNC} is in effect.
-
-@item ENOENT
-A component of @code{cfgpath} does not exist.
-
-@item EACCES
-Search permission is denied for a component of the path prefix.
-
-@item EPERM
-The calling process does not have the appropriate privileges.
-
-@item ELOOP
-A node appears more than once in the path specified by the 
-@code{cfgpath} argument
-
-@item ELOOP
-More than @code{SYMLOOP_MAX} symbolic links were encountered during
-resolution of the @code{cfgpath} argument.
-
-@end table
-
-@subheading DESCRIPTION:
-
-The @code{cfg_get()} function stores the value attribute of the
-configuration node identified by @code{cfgpath}, into the buffer
-described by the @code{value} pointer.
-
-@subheading NOTES:
-
-The @code{_POSIX_CFG} feature flag is defined to indicate
-this service is available.
-
-@page
-@subsection cfg_set - Set Configuration Node Value
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <cfg.h>
-
-int cfg_set(
-  const char  *cfgpath
-  cfg_value_t *value
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-A successful call to @code{cfg_set()} returns a value of zero
-and an unsuccessful call returns the @code{errno}.
-
-@table @b
-@item ENAMETOOLONG
-A component of a pathname exceeded @code{NAME_MAX} characters,
-or an entire path name exceed @code{PATH_MAX} characters while
-@code{_POSIX_NO_TRUNC} is in effect.
-
-@item ENOENT
-A component of @code{cfgpath} does not exist
-
-@item EACCES
-Search permission is denied for a component of the path prefix.
-
-@item EPERM
-The calling process does not have the appropriate privilege.
-
-@item ELOOP
-A node appears more than once in the path specified by the
-@code{cfgpath} argument.
-
-@item ELOOP
-More than @code{SYMLOOP_MAX} symbolic links were encountered during
-resolution of the cfgpath argument.
-
-@end table
-
-@subheading DESCRIPTION:
-
-The @code{cfg_set()} function stores the value specified by the
-@code{value} argument in the configuration node defined by the 
-@code{cfgpath} argument.
-
-@subheading NOTES:
-
-The @code{_POSIX_CFG} feature flag is defined to indicate
-this service is available.
-
-@page
-@subsection cfg_link - Create a Configuration Link
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <cfg.h>
-
-int cfg_link(
-  const char *src
-  const char *dest
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-A successful call to @code{cfg_link()} returns a value of zero
-and an unsuccessful call returns the @code{errno}.
-
-@table @b
-@item ENAMETOOLONG
-A component of a pathname exceeded @code{NAME_MAX} characters,
-or an entire path name exceed @code{PATH_MAX} characters while
-@code{_POSIX_NO_TRUNC} is in effect.
-
-@item ENOENT
-A component of either path prefix does not exist.
-
-@item EACCES
-A component of either path prefix denies search permission.
-
-@item EACCES
-The requested link requires writing in a node with a mode that
-denies write permission.
-
-@item ENOENT
-The node named by @code{src} does not exist.
-
-@item EEXIST
-The node named by @code{dest} does exist.
-
-@item EPERM
-The calling process does not have the appropriate privilege to
-modify the node indicated by the @code{src} argument.
-
-@item EXDEV
-The link named by @code{dest} and the node named by @code{src} are from different
-configuration spaces.
-
-@item ENOSPC
-The node in which the entry for the new link is being placed
-cannot be extended because there is no space left on the 
-configuration space containing the node.
-
-@item EIO
-An I/O error occurred while reading from or writing to the 
-configuration space to make the link entry.
-
-@item EROFS
-The requested link requires writing in a node on a read-only
-configuration space.
-
-@end table
-
-@subheading DESCRIPTION:
-
-The @code{src} and @code{dest} arguments point to pathnames which 
-name existing nodes.  The @code{cfg_link()} function atomically creates
-a link between specified nodes, and increment by one the link count 
-of the node specified by the @code{src} argument. 
-
-If the @code{cfg_link()} function fails, no link is created, and the
-link count of the node remains unchanged by this function call.
-
-
-@subheading NOTES:
-
-The @code{_POSIX_CFG} feature flag is defined to indicate
-this service is available.
-
-@page
-@subsection cfg_unlink - Remove a Configuration Link
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <cfg.h>
-
-int cfg_unlink(
-  const char    *cfgpath
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-A successful call to @code{cfg_unlink()} returns a value of zero
-and an unsuccessful call returns the @code{errno}.
-
-@table @b
-@item ENAMETOOLONG
-A component of a pathname exceeded @code{NAME_MAX} characters,
-or an entire path name exceed @code{PATH_MAX} characters.
-
-@item EACCES
-Search permission is denied on the node containing the link to
-be removed.
-
-@item EACCES
-Write permission is denied on the node containing the link to 
-be removed.
-
-@item ENOENT
-A component of @code{cfgpath} does not exist.
-
-@item EPERM
-The calling process does not have the appropriate privilege to 
-modify the node indicated by the path prefix of the @code{cfgpath}
-argument.
-
-@item EBUSY
-The node to be unlinked is the distinguished node of a mounted
-configuration space.
-
-@item EIO
-An I/O error occurred while deleting the link entry or deallocating
-the node.
-
-@item EROFS
-The named node resides in a read-only configuration space.
-
-@item ELOOP
-A node appears more than once in the path specified by the
-@code{cfgpath} argument.
-
-@item ELOOP
-More than @code{SYMLOOP_MAX} symbolic links were encountered during
-resolution of the cfgpath argument.
-
-@end table
-
-@subheading DESCRIPTION:
-
-The @code{cfg_unlink()} function removes the link between the node
-specified by the @code{cfgpath} path prefix and the parent node 
-specified by @code{cfgpath}, and decrements the link count 
-of the @code{cfgpath} node.
-
-When the link count of the node becomes zero, the space occupied
-by the node is freed and the node is no longer be accessible.
-
-@subheading NOTES:
-
-The @code{_POSIX_CFG} feature flag is defined to indicate
-this service is available.
-
-@page
-@subsection cfg_open - Open a Configuration Space
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <cfg.h>
-
-int cfg_open(
-  const char     *pathnames[],
-  int             options,
-  int           (*compar)(const CFGENT **f1, const CFGENT **f2),
-  CFG           **cfgstream
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-A successful call to @code{cfg_open()} returns a value of zero
-and an unsuccessful call returns the @code{errno}.
-
-@table @b
-@item EACCES
-Search permission is denied for any component of a pathname.
-
-@item ELOOP
-A loop exists in symbolic links encountered during resolution 
-of a pathname.
-
-@item ENAMETOOLONG
-The length of a pathname exceeds @code{PATH_MAX}, or a pathname
-component is longer than @code{NAME_MAX} while @code{_POSIX_NO_TRUNC}
-
-@item ENOENT
-The pathname argument is an empty string or the named node
-does not exist.
-
-@item EINVAL
-Either both or neither of @code{CFG_LOGICAL} and @code{CFG_PHYSICAL} are
-specified by the @code{options} argument
-
-@item ENOMEM
-Not enough memory is available to create the necessary structures.
-
-@item ELOOP
-More than @code{SYMLOOP_MAX} symbolic links were encountered during
-resolution of the @code{pathnames} argument.
-
-@item ENAMETOOLONG
-As a result of encountering a symbolic link in resolution of the
-pathname specified by the @code{pathnames} argument, the length of
-the substituted pathname string exceeded @code{PATH_MAX}.
-
-@end table
-
-@subheading DESCRIPTION:
-
-The @code{cfg_open()} function opens a configuration traversal stream
-rooted in the configuration nodes name by the @code{pathnames} argument.
-It stores a pointer to a CFG object that represents that stream at 
-the location identified the @code{cfgstream} pointer.  The @code{pathnames}
-argument is an array of character pointers to NULL-terminated strings. 
-The last member of this array is a NULL pointer.
-
-The value of @code{options} is the bitwise inclusive OR of values from the 
-following lists.  Applications supply exactly one of the first two values
-below in @code{options}.
-
-@table @b
-
-@item CFG_LOGICAL
-When symbolic links referencing existing nodes are 
-encountered during the traversal, the @code{cfg_info}
-field of the returned CFGENT structure describes the
-target node pointed to by the link instead of the 
-link itself, unless the target node does not exist. 
-If the target node has children, the pre-order return,
-followed by the return of structures referencing all of
-its descendants, followed by a post-order return, is done.
-                    
-@item CFG_PHYSICAL
-When symbolic links are encountered during the traversal,
-the @code{cfg_info} field is used to describe the symbolic 
-link.
-
-@end table
-                    
-
-Any combination of the remaining flags can be specified in the value of 
-@code{options}
-
-@table @b
-
-@item CFG_COMFOLLOW
-When symbolic links referencing existing nodes are
-specified in the @code{pathnames} argument, the 
-@code{cfg_info} field of the returned CFGENT structure
-describes the target node pointed to by the link
-instead of the link itself, unless the target node does
-not exist.  If the target node has children, the 
-pre-order return, followed by the return of structures
-referencing all its descendants, followed by a post-order
-return, is done.
-
-@item CFG_XDEV
-The configuration space functions do not return a
-CFGENT structure for any node in a different configuration
-space than the configuration space of the nodes identified 
-by the CFGENT structures for the @code{pathnames} argument.
-
-@end table
-
-The @code{cfg_open()} argument @code{compar} is either a NULL or point
-to a function that is called with two pointers to pointers to CFGENT 
-structures that returns less than, equal to , or greater than zero if 
-the node referenced by the first argument is considered to be respectively
-less than, equal to, or greater than the node referenced by the second.
-The CFGENT structure fields provided to the comparison routine is as 
-described with the exception that the contents of the @code{cfg_path} and
-@code{cfg_pathlen} fields are unspecified.
-
-This comparison routine is used to determine the order in which nodes in
-directories encountered during the traversal are returned, and the order
-of traversal when more than one node is specified in the @code{pathnames}
-argument to @code{cfg_open()}.  If a comparison routine is specified, the
-order of traversal is from the least to the greatest.  If the @code{compar}
-argument is NULL, the order of traversal shall is listed in the 
-@code{pathnames} argument. 
-
-@subheading NOTES:
-
-The @code{_POSIX_CFG} feature flag is defined to indicate
-this service is available.
-
-@page
-@subsection cfg_read - Read a Configuration Space
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <cfg.h>
-
-int cfg_read(  
-  CFG           *cfgp,
-  CFGENT       **node
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-A successful call to @code{cfg_read()} returns a value of zero
-and an unsuccessful call returns the @code{errno}.
-
-@table @b
-@item EACCES
-Search permission is denied for any component of a pathname.
-
-@item EBADF
-The @code{cfgp} argument does not refer to an open configuration
-space.
-
-@item ELOOP
-A loop exists in symbolic links encountered during resolution
-of a pathname.
-
-@item ENOENT
-A named @code{node} does not exist.
-
-@item ENOMEM
-Not enough memory is available to create the necessary structures.
-
-@item ELOOP
-More than @code{SYMLOOP_MAX} symbolic links were encountered during
-resolution of the cfgpath argument.
-
-@item ENAMETOOLONG
-As a result of encountering a symbolic link in resolution of the
-pathname specified by the pathnames argument, the length of the
-substituted pathname string exceeded @code{PATH_MATH}.
-
-@end table
-
-@subheading DESCRIPTION:
-
-The @code{cfg_read()} function returns a pointer to a CFGENT structure
-representing a node in the configuration space to which @code{cfgp}
-refers.  The returned pointer is stored at the location indicated 
-by the @code{node} argument.
-
-The child nodes of each node in the configuration tree is returned
-by @code{cfg_read()}.  If a comparison routine was specified to the
-@code{cfg_open()} function, the order of return of the child nodes is
-as specified by the @code{compar} routine, from least to greatest.  
-Otherwise, the order of return is unspecified.
-
-Structures referencing nodes with children is returned by the 
-function @code{cfg_read()} at least twice [unless the application
-specifies otherwise with @code{cfg_mark()}]-once immediately before
-the structures representing their descendants, are returned 
-(pre-order), and once immediately after structures representing all
-of their descendants, if any, are returned (post-order).  The 
-CFGENT structure returned in post-order (with the exception of the 
-@code{cfg_info} field) is identical to that returned in pre-order.
-Structures referencing nodes of other types is returned at least
-once.
-
-The fields of the CFGENT structure contains the following 
-information:
-
-@table @b
-
-@item cfg_parent
-A pointer to the structure returned by the 
-@code{cfg_read()} function for the node that contains
-the entry for the current node.  A @code{cfg_parent}
-structure is provided for the node(s) specified by
-the @code{pathnames} argument to the @code{cfg_open()}
-function, but the contents of other than its 
-@code{cfg_number}, @code{cfg_pointer}, @code{cfg_parent},
-and @code{cfg_parent}, and @code{cfg_level} fields are
-unspecified.  Its @code{cfg_link} field is unspecified.
-
-@item cfg_link
-Upon return from the @code{cfg_children()} function, the
-@code{cfg_link} field points to the next CFGENT structure 
-in a NULL-terminated linked list of CFGENT structures.  
-Otherwise, the content of the @code{cfg_link} field is 
-unspecified.
-
-@item cfg_cycle
-If the structure being returned by @code{cfg_read()} 
-represents a node that appears in the @code{cfg_parent}
-linked list tree, the @code{cfg_cycle} field shall point 
-to the structure representing that entry from the 
-@code{cfg_parent} linked list.  Otherwise the content of
-the @code{cfg_cycle} field is unspecified.
-
-@item cfg_number
-The @code{cfg_number} field is provided for use by the 
-application program.  It is initialized to zero for 
-each new node returned by the @code{cfg_read()} function, 
-but is not further modified by the configuration space
-routines.
-
-@item cfg_pointer
-The @code{cfg_pointer} field is provided for use by the
-application program.  It is initialized to NULL for
-each new node returned by the @code{cfg_read()} function, 
-but is not further modified by the configuration 
-space routines.
-
-@item cfg_path
-A pathname for the node including and relative to the 
-argument supplied to the @code{cfg_open()} routine for this
-configuration space.  This pathname may be longer than
-@code{PATH_MAX} bytes.  This pathname is NULL-terminated.
-
-@item cfg_name
-The nodename of the node.
-
-@item cfg_pathlen
-The length of the string pointed at by the @code{cfg_path}
-field when returned by @code{cfg_read()}.
-
-@item cfg_namelen
-The length of the string pointed at by the @code{cfg_name}
-field.
-
-@item cfg_level
-The depth of the current entry in the configuration space.
-The @code{cfg_level} field of the @code{cfg_parent} 
-structure for each of the node(s) specified in the 
-@code{pathnames} argument to the @code{cfg_open()} function
-is set to 0, and this number is incremented for each
-node level descendant.
-
-@item cfg_info
-This field contains one of the values listed below.  If
-an object can have more than one info value, the first 
-appropriate value listed below is returned. 
-
-@table @b
-
-@item CFG_D
-The structure represents a node with children in
-pre-order.
-
-@item CFG_DC
-The structure represents a node that is a parent
-of the node most recently returned by @code{cfg_read()}.
-The @code{cfg_cycle} field references the structure 
-previously returned by @code{cfg_read} that is the
-same as the returned structure.
-
-@item CFG_DEFAULT
-The structure represents a node that is not 
-represented by one of the other node types
-
-@item CFG_DNR
-The structure represents a node, not of type symlink,
-that is unreadable.  The variable @code{cfg_errno}
-is set to the appropriate value.
-
-@item CFG_DP
-The structure represents a node with children in
-post-order.  This value occurs only if CFG_D 
-has previously been returned for this entry.
-
-@item CFG_ERR
-The structure represents a node for which an error has 
-occurred.  The variable @code{cfg_errno} is set to the
-appropriate value.
-
-@item CFG_F
-The structure represents a node without children.
-
-@item CFG_SL
-The structure represents a node of type symbolic link.
-
-@item CFG_SLNONET
-The structure represents a node of type symbolic link
-with a target node for which node characteristic
-information cannot be obtained.
-
-@end table
-
-@end table
-
-Structures returned by @code{cfg_read()} with a @code{cfg_info} field equal
-to CFG_D is accessible until a subsequent call, on the same
-configuration traversal stream, to @code{cfg_close()}, or to @code{cfg_read()}
-after they have been returned by the @code{cfg_read} function in
-post-order.  Structures returned by @code{cfg_read()} with an
-@code{cfg_info} field not equal to CFG_D is accessible until a subsequent
-call, on the same configuration traversal stream, to @code{cfg_close()}
-or @code{cfg_read()}. 
-
-The content of the @code{cfg_path} field is specified only for the
-structure most recently returned by @code{cfg_read()}. 
-
-The specified fields in structures in the list representing nodes for
-which structures have previously been returned by @code{cfg_children()},
-is identical to those returned by @code{cfg_children()}, except that
-the contents of the @code{cfg_path} and @code{cfg_pathlen} fields are
-unspecified. 
-         
-@subheading NOTES: 
-
-The @code{_POSIX_CFG} feature flag is defined to indicate
-this service is available.
-
-@page
-@subsection cfg_children - Get Node Entries
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <cfg.h>
-
-int cfg_children(
-  CFG           *cfgp,
-  int            options,
-  CFGENT       **children
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-A successful call to @code{cfg_children()} returns a value of zero
-and an unsuccessful call returns the @code{errno}.
-
-@table @b
-@item EACCES
-Search permission is denied for any component of a pathname
-
-@item EBADF
-The @code{cfgp} argument does not refer to an open configuration space.
-
-@item ELOOP
-A loop exists in symbolic links encountered during resolution of 
-a pathname.
-
-@item ENAMETOOLONG
-The length of a pathname exceeds @code{PATH_MAX}, or a pathname
-component is longer than @code{NAME_MAX} while @code{_POSIX_NO_TRUNC} is
-in effect.
-
-@item EINVAL
-The specified value of the @code{options} argument is invalid.
-
-@item ENOENT
-The named node does not exist.
-
-@item ENOMEM
-Not enough memory is available to create the necessary structures.
-
-@end table
-
-@subheading DESCRIPTION:
-
-The first @code{cfg_children()} call after a @code{cfg_read()} returns 
-information about the first node without children under the node
-returned by @code{cfg_read()}.  Subsequent calls to @code{cfg_children()}
-without the intervening @code{cfg_read()} shall return information
-about the remaining nodes without children under that same node.
-
-If @code{cfg_read()} has not yet been called for the configuration
-traversal stream represented by @code{cfgp}, @code{cfg_children()}
-returns a pointer to the first entry in a list of the nodes 
-represented by the @code{pathnames} argument to @code{cfg_open()}.
-
-In either case, the list is NULL-terminated, ordered by the 
-user-specified comparison function, if any, and linked through the
-@code{cfg_link} field.
-
-@subheading NOTES:
-
-The @code{_POSIX_CFG} feature flag is defined to indicate
-this service is available.
-
-@page
-@subsection cfg_mark - Set Configuration Space Options
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <cfg.h>
-
-int cfg_mark(
-  CFG           *cfgp,
-  CFGENT        *f,
-  int            options
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-A successful call to @code{cfg_mark()} returns a value of zero
-and an unsuccessful call returns the @code{errno}.
-
-@table @b
-@item EINVAL
-The specified combination of the @code{cfgp} and @code{f} arguments is not 
-supported by the implementation.
-
-@item EINVAL
-The specified value of the @code{options} argument is invalid.
-
-@end table
-
-@subheading DESCRIPTION:
-
-The @code{cfg_mark()} function modifies the subsequent behavior of
-the @code{cfg} functions with regard to the node referenced by the structure
-pointed to by the argument @code{f} or the configuration space referenced 
-by the structure pointed to by the argument @code{cfgp}.
-
-Exactly one of the @code{f} argument and the @code{cfgp} argument is NULL.
-
-The value of the @code{options} argument is exactly one of the flags
-specified in the following list: 
-
-@table @b
-
-@item CFG_AGAIN
-If the @code{cfgp} argument is non-NULL, or the @code{f}
-argument is NULL, or the structure referenced by @code{f}
-is not the one most recently returned by @code{cfg_read()},
-@code{cfg_mark()} returns an error.  Otherwise, the next 
-call to the @code{cfg_read()} function returns the structure
-referenced by @code{f} with the @code{cfg_info} field
-reinitialized.  Subsequent behavior of the @code{cfg}
-functions are based on the reinitialized value of 
-@code{cfg_info}.
-
-@item CFG_SKIP
-If the @code{cfgp} argument is non-NULL, or the @code{f}
-argument is NULL, or the structure referenced by @code{f}
-is not one of those specified as accessible, or the structure
-referenced by @code{f} is not for a node of type pre-order 
-node, @code{cfg_mark()} returns an error.  Otherwise, no 
-more structures for the node referenced by @code{f} or its 
-descendants are returned by the @code{cfg_read()} function.
-
-@item CFG_FOLLOW
-If the @code{cfgp} argument is non-NULL, or the @code{f} 
-argument is NULL, or the structure referenced by @code{f}
-is not one of those specified as accessible, or the structure
-referenced by @code{f} is not for a node of type symbolic link,
-@code{cfg_mark()} returns an error.  Otherwise, the next
-call to the @code{cfg_read()} function returns the structure
-referenced by @code{f} with the @code{cfg_info} field reset
-to reflect the target of the symbolic link instead of the 
-symbolic link itself.  If the target of the link is node with
-children, the pre-order return, followed by the return of 
-structures referencing all of its descendants, followed by a 
-post-order return, shall be done.
-
-@end table
-
-If the target of the symbolic link does not exist, the fields
-of the structure by @code{cfg_read()} shall be unmodified, except
-that the @code{cfg_info} field shall be reset to @code{CFG_SLNONE}.
-
-@subheading NOTES:
-
-The @code{_POSIX_CFG} feature flag is defined to indicate
-this service is available.
-
-@page
-@subsection cfg_close - Close a Configuration Space
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <cfg.h>
-
-int cfg_close(
-  CFG           *cfgp
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-A successful call to @code{cfg_close()} returns a value of zero
-and an unsuccessful call returns the @code{errno}.
-
-@table @b
-@item EBADF
-The @code{cfgp} argument does not refer to an open configuration space
-traversal stream.
-
-@end table
-
-@subheading DESCRIPTION:
-
-The @code{cfg_close()} function closes a configuration space transversal
-stream represented by the CFG structure pointed at by the @code{cfgp}
-argument.  All system resources allocated for this configuration space
-traversal stream should be deallocated.  Upon return, the value of 
-@code{cfgp} need not point to an accessible object of type CFG.
-
-@subheading NOTES:
-
-The @code{_POSIX_CFG} feature flag is defined to indicate
-this service is available.
-
-@page
-@subsection cfg_readdir - Reads a directory
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <sys/types.h>
-#include <dirent.h>
-
-struct dirent *cfg_readdir(
-  DIR   *dirp
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item EBADF
-Invalid file descriptor
-
-@end table
-
-@subheading DESCRIPTION:
-
-The @code{cfg_readdir()} function returns a pointer to a structure @code{dirent}
-representing the next directory entry from the directory stream pointed to
-by @code{dirp}.  On end-of-file, NULL is returned.
-
-The @code{cfg_readdir()} function may (or may not) return entries for . or .. Your
-program should tolerate reading dot and dot-dot but not require them.
-
-The data pointed to be @code{cfg_readdir()} may be overwritten by another call to
-@code{readdir()} for the same directory stream.  It will not be overwritten by 
-a call for another directory.
-
-@subheading NOTES:
-
-If @code{ptr} is not a pointer returned by @code{malloc()}, @code{calloc()}, or 
-@code{realloc()} or has been deallocated with @code{free()} or @code{realloc()}, 
-the results are not portable and are probably disastrous.
-
-This function is not defined in the POSIX specification.  It is an extension 
-provided by this implementation.
-
-@page
-@subsection cfg_umask - Sets a file creation mask.
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <sys/types.h>
-#include <sys/stat.h>
-
-mode_t cfg_umask(
-  mode_t cmask
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@subheading DESCRIPTION:
-
-The @code{cfg_umask()} function sets the process node creation mask to @code{cmask}.
-The file creation mask is used during @code{open()}, @code{creat()}, @code{mkdir()},
-@code{mkfifo()} calls to turn off permission bits in the @code{mode} argument.
-Bit positions that are set in @code{cmask} are cleared in the mode of the
-created file.
-
-The file creation mask is inherited across @code{fork()} and @code{exec()} calls.
-This makes it possible to alter the default permission bits of created files.
-
-@subheading NOTES: None
-
-The @code{cmask} argument should have only permission bits set.  All other 
-bits should be zero.
-
-@page
-@subsection cfg_chmod - Changes file mode.
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <sys/types.h>
-#include <sys/stat.h>
-
-int cfg_chmod(
-  const char *path,
-  mode_t      mode
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-A successful call to @code{cfg_chmod()} returns a value of zero
-and an unsuccessful call returns the @code{errno}.
-
-@table @b
-@item EACCES
-Search permission is denied for a directory in a file's path prefix
-@item ENAMETOOLONG
-Length of a filename string exceeds PATH_MAX and _POSIX_NO_TRUNC is in
-effect.
-@item ENOENT
-A file or directory does not exist.
-@item ENOTDIR
-A component of the specified pathname was not a directory when a directory
-was expected.
-@item EPERM
-Operation is not permitted.  Process does not have the appropriate priviledges
-or permissions to perform the requested operations.
-@item EROFS
-Read-only file system.
-
-@end table
-
-@subheading DESCRIPTION:
-
-Set the file permission bits, the set user ID bit, and the set group ID bit 
-for the file named by @code{path} to @code{mode}.  If the effective user ID 
-does not match the owner of the node and the calling process does not have 
-the appropriate privileges, @code{cfg_chmod()} returns -1 and sets @code{errno} to
-@code{EPERM}.
-
-@subheading NOTES:
-
-@page
-@subsection cfg_chown - Changes the owner and/or group of a file.
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <sys/types.h>
-#include <unistd.h>
-
-int cfg_chown(
-  const char *path,
-  uid_t       owner,
-  gid_t       group
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-A successful call to @code{cfg_chown()} returns a value of zero
-and an unsuccessful call returns the @code{errno}.
-
-@table @b
-@item EACCES
-Search permission is denied for a directory in a file's path prefix
-@item EINVAL
-Invalid argument
-@item ENAMETOOLONG
-Length of a filename string exceeds PATH_MAX and _POSIX_NO_TRUNC is in
-effect.
-@item ENOENT
-A file or directory does not exist.
-@item ENOTDIR
-A component of the specified pathname was not a directory when a directory
-was expected.
-@item EPERM
-Operation is not permitted.  Process does not have the appropriate priviledges
-or permissions to perform the requested operations.
-@item EROFS
-Read-only file system.
-
-@end table
-
-@subheading DESCRIPTION:
-
-The user ID and group ID of the file named by @code{path} are set to 
-@code{owner} and @code{path}, respectively.
-
-For regular files, the set group ID (S_ISGID) and set user ID (S_ISUID)
-bits are cleared.
-
-Some systems consider it a security violation to allow the owner of a file to
-be changed,  If users are billed for disk space usage, loaning a file to 
-another user could result in incorrect billing.  The @code{cfg_chown()} function
-may be restricted to privileged users for some or all files.  The group ID can
-still be changed to one of the supplementary group IDs.
-
-@subheading NOTES:
-
-This function may be restricted for some file.  The @code{pathconf} function
-can be used to test the _PC_CHOWN_RESTRICTED flag.
-
-
diff --git a/doc/new_chapters/cspecific.t b/doc/new_chapters/cspecific.t
deleted file mode 100644
index 5e2de31617..0000000000
--- a/doc/new_chapters/cspecific.t
+++ /dev/null
@@ -1,623 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved. 
-@c
-@c  $Id$
-@c
-
-@chapter Language-Specific Services for the C Programming Language Manager
-
-@section Introduction
-
-The 
-language-specific services for the C programming language manager is ...
-
-The directives provided by the language-specific services for the C programming language manager are:
-
-@itemize @bullet
-@item @code{setlocale} - 
-@item @code{fileno} - 
-@item @code{fdopen} - 
-@item @code{flcokfile} - 
-@item @code{ftrylockfile} - 
-@item @code{funlockfile} - 
-@item @code{getc_unlocked} - 
-@item @code{getchar_unlocked} - 
-@item @code{putc_unlocked} - 
-@item @code{putchar_unlocked} - 
-@item @code{setjmp} - 
-@item @code{longjmp} - 
-@item @code{sigsetjmp} - 
-@item @code{siglongjmp} - 
-@item @code{tzset} - 
-@item @code{strtok_r} - 
-@item @code{asctime_r} - 
-@item @code{ctime_r} - 
-@item @code{gmtime_r} - 
-@item @code{localtime_r} - 
-@item @code{rand_r} - 
-@end itemize
-
-@section Background
-
-There is currently no text in this section.
-
-@section Operations
-
-There is currently no text in this section.
-
-@section Directives
-
-This section details the language-specific services for the C programming language manager's directives.
-A subsection is dedicated to each of this manager's directives
-and describes the calling sequence, related constants, usage,
-and status codes.
-
-@page
-@subsection setlocale - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int setlocale(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection fileno - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int fileno(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection fdopen - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int fdopen(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection flcokfile - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int flcokfile(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection ftrylockfile - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int ftrylockfile(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection funlockfile - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int funlockfile(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection getc_unlocked - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int getc_unlocked(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection getchar_unlocked - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int getchar_unlocked(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection putc_unlocked - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int putc_unlocked(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection putchar_unlocked - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int putchar_unlocked(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection setjmp - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int setjmp(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection longjmp - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int longjmp(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection sigsetjmp - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int sigsetjmp(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection siglongjmp - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int siglongjmp(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection tzset - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int tzset(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection strtok_r - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int strtok_r(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection asctime_r - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int asctime_r(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection ctime_r - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int ctime_r(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection gmtime_r - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int gmtime_r(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection localtime_r - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int localtime_r(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection rand_r - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int rand_r(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
diff --git a/doc/new_chapters/device.t b/doc/new_chapters/device.t
deleted file mode 100644
index 05ef101fec..0000000000
--- a/doc/new_chapters/device.t
+++ /dev/null
@@ -1,465 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved. 
-@c
-@c  $Id$
-@c
-
-@chapter Device- and Class- Specific Functions Manager
-
-@section Introduction
-
-The device- and class- specific functions manager is ...
-
-The directives provided by the device- and class- specific functions
-manager are:
-
-@itemize @bullet
-@item @code{cfgetispeed} - Reads terminal input baud rate
-@item @code{cfgetospeed} - Reads terminal output baud rate
-@item @code{cfsetispeed} - Sets terminal input baud rate
-@item @code{cfsetospeed} - Set terminal output baud rate
-@item @code{tcgetattr} - Gets terminal attributes
-@item @code{tcsetattr} - Set terminal attributes
-@item @code{tcsendbreak} - Sends a break to a terminal
-@item @code{tcdrain} - Waits for all output to be transmitted to the terminal
-@item @code{tcflush} - Discards terminal data
-@item @code{tcflow} - Suspends/restarts terminal output
-@item @code{tcgetpgrp} - Gets foreground process group ID
-@item @code{tcsetpgrp} - Sets foreground process group ID
-@end itemize
-
-@section Background
-
-There is currently no text in this section.
-
-@section Operations
-
-There is currently no text in this section.
-
-@section Directives
-
-This section details the device- and class- specific functions manager's
-directives.  A subsection is dedicated to each of this manager's directives
-and describes the calling sequence, related constants, usage,
-and status codes.
-
-@page
-@subsection cfgetispeed - Reads terminal input baud rate
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <termios.h>
-
-int cfgetispeed(
-  const struct termios *p
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-The @code{cfgetispeed()} function returns a code for baud rate.  
-
-@subheading DESCRIPTION:
-
-The @code{cfsetispeed()} function stores a code for the terminal speed 
-stored in a struct termios.  The codes are defined in @code{<termios.h>} 
-by the macros BO, B50, B75, B110, B134, B150, B200, B300, B600, B1200,
-B1800, B2400, B4800, B9600, B19200, and B38400.
-
-The @code{cfsetispeed()} function does not do anything to the hardware.
-It merely stores a value for use by @code{tcsetattr()}.
-
-@subheading NOTES:
-
-Baud rates are defined by symbols, such as B110, B1200, B2400.  The actual
-number returned for any given speed may change from system to system.
-
-@page
-@subsection cfgetospeed - Reads terminal output baud rate
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <termios.h>
-
-int cfgetospeed( 
-  const struct termios *p
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-The @code{cfgetospeed()} function returns the termios code for the baud rate.
-
-@subheading DESCRIPTION:
-
-The @code{cfgetospeed()} function returns a code for the terminal speed
-stored in a @code{struct termios}.  The codes are defined in @code{<termios.h>}
-by the macros BO, B50, B75, B110, B134, B150, B200, B300, B600, B1200, B1800,
-B2400, B4800, B9600, B19200, and B38400.
-
-The @code{cfgetospeed()} function does not do anything to the hardware.
-It merely returns the value stored by a previous call to @code{tcgetattr()}.
-
-@subheading NOTES:
-
-Baud rates are defined by symbols, such as B110, B1200, B2400.  The actual
-number returned for any given speed may change from system to system.
-
-@page
-@subsection cfsetispeed - Sets terminal input baud rate
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <termios.h>
-
-int cfsetispeed(
-  struct termios *p,
-  speed_t         speed
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-The @code{cfsetispeed()} function returns a zero when successful and 
-returns -1 when an error occurs.  
-
-@subheading DESCRIPTION:
-
-The @code{cfsetispeed()} function stores a code for the terminal speed
-stored in a struct termios.  The codes are defined in @code{<termios.h>}
-by the macros B0, B50, B75, B110, B134, B150, B200, B300, B600, B1200, 
-B1800, B2400, B4800, B9600, B19200, and B38400.
-
-@subheading NOTES:
-
-This function merely stores a value in the @code{termios} structure.  It
-does not change the terminal speed until a @code{tcsetattr()} is done. 
-It does not detect impossible terminal speeds.
-
-@page
-@subsection cfsetospeed - Sets terminal output baud rate 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <termios.h>
-
-int cfsetospeed(
-  struct termios *p,
-  speed_t         speed
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-The @code{cfsetospeed()} function returns a zero when successful and 
-returns -1 when an error occurs.  
-
-
-@subheading DESCRIPTION:
-
-The @code{cfsetospeed()} function stores a code for the terminal speed stored 
-in a struct @code{termios}.  The codes are defiined in @code{<termios.h>} by the
-macros B0, B50, B75, B110, B134, B150, B200, B300, B600, B1200, B1800, B2400,
-B4800, B9600, B19200, and B38400.
-
-The @code{cfsetospeed()} function does not do anything to the hardware.  It
-merely stores a value for use by @code{tcsetattr()}.
-
-@subheading NOTES:
-
-This function merely stores a value in the @code{termios} structure. 
-It does not change the terminal speed until a @code{tcsetattr()} is done.
-It does not detect impossible terminal speeds.
-
-@page
-@subsection tcgetattr - Gets terminal attributes
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <termios.h>
-#include <unistd.h>
-
-int tcgetattr(
-  int fildes,
-  struct termios *p
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item EBADF
-Invalid file descriptor
-
-@item ENOOTY
-Terminal control function attempted for a file that is not a terminal.
-@end table
-
-@subheading DESCRIPTION:
-
-The @code{tcgetattr()} gets the parameters associated with the terminal
-referred to by @code{fildes} and stores them into the @code{termios()}
-structure pointed to by @code{termios_p}.
-
-@subheading NOTES:
-
-NONE
-
-@page
-@subsection tcsetattr - Set terminal attributes
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <termios.h>
-#include <unistd.h>
-
-int tcsetattr(
-  int                   fildes,
-  int                   options,
-  const struct termios *tp
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection tcsendbreak - Sends a break to a terminal 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int tcsendbreak(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-This routine is not currently supported by RTEMS but could be 
-in a future version.
-
-@page
-@subsection tcdrain - Waits for all output to be transmitted to the terminal.
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <termios.h>
-#include <unistd.h>
-
-int tcdrain(
-  int fildes
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item EBADF
-Invalid file descriptor
-
-@item EINTR
-Function was interrupted by a signal
-
-@item ENOTTY
-Terminal control function attempted for a file that is not a terminal.
-
-@end table
-
-@subheading DESCRIPTION:
-
-The @code{tcdrain()} function waits until all output written to 
-@code{fildes} has been transmitted.
-
-@subheading NOTES:
-
-NONE
-
-@page
-@subsection tcflush - Discards terminal data 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int tcflush(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-This routine is not currently supported by RTEMS but could be 
-in a future version.
-
-@page
-@subsection tcflow - Suspends/restarts terminal output.
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int tcflow(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-This routine is not currently supported by RTEMS but could be 
-in a future version.
-
-@page
-@subsection tcgetpgrp - Gets foreground process group ID
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int tcgetpgrp(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-This routine is not currently supported by RTEMS but could be 
-in a future version.
-
-@page
-@subsection tcsetpgrp - Sets foreground process group ID
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int tcsetpgrp(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-This routine is not currently supported by RTEMS but could be 
-in a future version.
-
-
diff --git a/doc/new_chapters/dumpcontrol.t b/doc/new_chapters/dumpcontrol.t
deleted file mode 100644
index 915f33c012..0000000000
--- a/doc/new_chapters/dumpcontrol.t
+++ /dev/null
@@ -1,98 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved. 
-@c
-@c  $Id$
-@c
-
-@chapter Process Dump Control Manager
-
-@section Introduction
-
-The process dump control manager provides a portable
-interface for changing the path to which a process dump
-is written.  The capabilities in this manager were defined in
-the POSIX 1003.1h/D3 proposed standard titled @b{Services for Reliable,
-Available, and Serviceable Systems}.
-
-The directives provided by the process dump control manager are:
-
-@itemize @bullet
-@item @code{dump_setpath} - Dump File Control 
-@end itemize
-
-@section Background
-
-There is currently no text in this section.
-
-@section Operations
-
-There is currently no text in this section.
-
-@section Directives
-
-This section details the process dump control manager's directives.
-A subsection is dedicated to each of this manager's directives
-and describes the calling sequence, related constants, usage,
-and status codes.
-
-@page
-@subsection dump_setpath - Dump File Control
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <dump.h>
-
-int dump_setpath(
-  const char      *path
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item EACESS
-Search permission is denied for a component of the path prefix,
-or write permission is denied on the directory containing the 
-file.
-
-@item ENAMETOOLONG
-The length of the argument exceeds @code{PATH_MAX} or a pathname
-component is longer than @code{NAME_MAX} while @code{_POSIX_NO_TRUNC}
-is in effect.
-
-@item ENOENT
-The path argument points to an empty string.
-
-@item ENOTDIR
-A component of the path prefix is not a directory.
-
-@item EROFS
-The directory entry specified resides on a read-only file system.
-
-@end table
-
-@subheading DESCRIPTION:
-
-The @code{dump_setpath()} function defines the pathname where process
-dumps are written.  The pathname pointed to by @code{path} defines 
-where a process dump file is written if the calling process 
-terminates with a dump file.  The @code{path} argument does not 
-name a directory.
-
-If the @code{path} argument is NULL, the system does not write a
-process dump file if the calling process terminates with a dump 
-file.  If the @code{dump_setpath} function fails, the pathname for
-writing process dumps does not change.
-
-@subheading NOTES:
-
-The @code{_POSIX_DUMP} feature flag is defined to indicate
-this service is available.
diff --git a/doc/new_chapters/eventlog.t b/doc/new_chapters/eventlog.t
deleted file mode 100644
index d50a35bf7c..0000000000
--- a/doc/new_chapters/eventlog.t
+++ /dev/null
@@ -1,1265 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved. 
-@c
-@c  $Id$
-@c
-
-@chapter Event Logging Manager
-
-@section Introduction
-
-The event logging manager provides a portable method for logging
-system and application events and subsequent processing of those
-events.  The capabilities in this manager were defined in the POSIX
-1003.1h/D3 proposed standard titled @b{Services for Reliable,
-Available, and Serviceable Systems}.
-
-The directives provided by the event logging manager are:
-
-@itemize @bullet
-@item @code{log_create} - Create a log file
-@item @code{log_sys_create} - Create a system log file
-@item @code{log_write} - Write to the system Log
-@item @code{log_write_any} - Write to any log file
-@item @code{log_write_entry} - Write entry to any log file
-@item @code{log_open} - Open a log file
-@item @code{log_read} - Read from a log file
-@item @code{log_notify} - Notify Process of writes to the system log
-@item @code{log_close} - Close log descriptor
-@item @code{log_seek} - Reposition log file offset
-@item @code{log_severity_before} - Compare event record severities
-@item @code{log_facilityemptyset} - Manipulate log facility sets
-@item @code{log_facilityfillset} - Manipulate log facility sets
-@item @code{log_facilityaddset} - Manipulate log facility sets
-@item @code{log_facilitydelset} - Manipulate log facility sets
-@item @code{log_facilityismember} - Manipulate log facility sets
-@item @code{log_facilityisvalid} - Manipulate log facility sets
-@end itemize
-
-@section Background
-
-@subsection Log Files and Events
-
-The operating system uses a special log file named @code{syslog}.  
-This log file is called the system log and is automatically created and
-tracked by the operating system.  The system log is written with 
-the @code{log_write()} function.  An alternative log file may be written 
-using the @code{log_write_any()} function.  It is possible to use @code{log_read()}
-to query the system log and and write the records to a non-system log file 
-using @code{log_write_entry()} to produce a filtered version of the
-system log.  For example you could produce a log of all disk controller
-faults that have occurred.  
-
-A non-system log may be a special log file created by an application to 
-describe application faults, or a subset of the system log created 
-by the application.  
-
-
-
-@subsection Facilities
-
-A facility is an identification code for a subsystem, device, or
-other object about which information is being written to 
-a log file.  
-
-A facility set is a collection of facilities.
-
-@subsection Severity
-
-Severity is a rating of the error that is being logged.   
-
-@subsection Queries
-
-
-The facility identifier and the event severity are the basis for
-subsequent log query.  A log query is used as a filter to
-obtain a subset of a given log file.  The log file may be configured 
-to send out an event.
-
-@section Operations
-
-@subsection Creating and Writing a non-System Log
-
-The following code fragment create a non-System log file at /temp/.
-A real filename previously read entry and buffer @code{log_buf} of size 
-@code{readsize} are written into the log.  See the discussion on opening 
-and reading a log for how the entry is created.
-
-@example
-#include <evlog.h>
-   :
-  logd_t           *outlog = NULL;
-  char             *path   = "/temp/";
-
-  log_create( outlog, path );
-   :  
-  log_write_entry( outlog, &entry, log_buf, readsize );
-
-@end example
-
-@subsection Reading a Log
-
-Discuss opening and reading from a log.
-
-@example
-  build a query
-  log_open
-  log_read loop
-@end example
-
-@section Directives
-
-This section details the event logging manager's directives.
-A subsection is dedicated to each of this manager's directives
-and describes the calling sequence, related constants, usage,
-and status codes.
-
-@page
-@subsection log_write - Write to the system Log
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <evlog.h>
-
-int log_write(
-  const log_facility_t  facility,
-  const int             event_id,
-  const log_severity_t  severity,
-  const void           *buf,
-  const size_t          len
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-A successful call to @code{log_write()} returns a value of zero
-and an unsuccessful call returns the @code{errno}.
-
-@table @b
-@item E2BIG
-This error indicates an inconsistency in the implementation.
-Report this as a bug.
-
-@item EINVAL
-The @code{facility} argument is not a valid log facility.
-
-@item EINVAL
-The @code{severity} argument exceeds @code{LOG_SEVERITY_MAX}.
-
-@item EINVAL
-The @code{len} argument exceeds @code{LOG_MAXIUM_BUFFER_SIZE}.
-
-@item EINVAL
-The @code{len} argument was non-zero and @code{buf} is @code{NULL}.
-
-@item ENOSPC
-The device which contains the log file has run out of space.
-
-@item EIO
-An I/O error occurred in writing to the log file.
-
-@end table
-
-@subheading DESCRIPTION:
-
-The @code{log_write} function writes an event record to the 
-system log file.  The event record written consists of the
-event attributes specified by the @code{facility}, @code{event_id},
-and @code{severity} arguments as well as the data identified by the
-@code{buf} and @code{len} arguments.  The fields of the event record
-structure to be written are filled in as follows:
-
-@table @b
-@item log_recid
-This is set to a monotonically increasing log record id
-maintained by the system for this individual log file.
-
-@item log_size
-This is set to the value of the @code{len} argument.
-
-@item log_event_id
-This is set to the value of the @code{event_id} argument.
-
-@item log_facility
-This is set to the value of the @code{facility} argument.
-
-@item log_severity
-This is set to the value of the @code{severity} argument.
-
-@item log_uid
-This is set to the value returned by @code{geteuid()}.
-
-@item log_gid
-This is set to the value returned by @code{getegid()}.
-
-@item log_pid
-This is set to the value returned by @code{getpid()}.
-
-@item log_pgrp
-This is set to the value returned by @code{getpgrp()}.
-
-@item log_time
-This is set to the value returned by @code{clock_gettime()} for the 
-@code{CLOCK_REALTIME clock} source.
-
-@end table
-
-@subheading NOTES:
-
-The @code{_POSIX_LOGGING} feature flag is defined to indicate
-this service is available.
-
-This implementation can not return the @code{EPERM} error.
-
-@page
-@subsection log_write_any - Write to the any log file
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <evlog.h>
-
-int log_write_any(
-  const logd_t          logdes,
-  const log_facility_t  facility,
-  const int             event_id,
-  const log_severity_t  severity,
-  const void           *buf,
-  const size_t          len
-);
-@end example
-@end ifset
- 
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-A successful call to @code{log_write_any()} returns a value of zero
-and an unsuccessful call returns the @code{errno}.
-
-@table @b
-@item E2BIG
-This error indicates an inconsistency in the implementation.
-Report this as a bug.
-
-@item EBADF
-The @code{logdes} argument is not a valid log descriptor.
-
-@item EINVAL
-The @code{facility} argument is not a valid log facility.
-
-@item EINVAL
-The @code{severity} argument exceeds @code{LOG_SEVERITY_MAX}.
-
-@item EINVAL
-The @code{len} argument exceeds @code{LOG_MAXIMUM_BUFFER_SIZE}.
-
-@item EINVAL
-The @code{len} argument was non-zero and @code{buf} is @code{NULL}.
-
-@item ENOSPC
-The device which contains the log file has run out of space.
-
-@item EIO
-An I/O error occurred in writing to the log file.
-
-@end table
-
-@subheading DESCRIPTION:
-
-The @code{log_write_any()} function writes an event record to the log file
-specified by @code{logdes}.  The event record written consists of the
-event attributes specified by the @code{facility}, @code{event_id},
-and @code{severity} arguments as well as the data identified by the
-@code{buf} and @code{len} arguments.  The fields of the event record
-structure to be written are filled in as follows:
-
-@table @b
-@item log_recid
-This is set to a monotonically increasing log record id
-maintained by the system for this individual log file.
-
-@item log_size
-This is set to the value of the @code{len} argument.
-
-@item log_event_id
-This is set to the value of the @code{event_id} argument.
-
-@item log_facility
-This is set to the value of the @code{facility} argument.
-
-@item log_severity
-This is set to the value of the @code{severity} argument.
-
-@item log_uid
-This is set to the value returned by @code{geteuid()}.
-
-@item log_gid
-This is set to the value returned by @code{getegid()}.
-
-@item log_pid
-This is set to the value returned by @code{getpid()}.
-
-@item log_pgrp
-This is set to the value returned by @code{getpgrp()}.
-
-@item log_time
-This is set to the value returned by @code{clock_gettime()} for the 
-@code{CLOCK_REALTIME} clock source.
-
-@end table
-
-@subheading NOTES:
-
-The @code{_POSIX_LOGGING} feature flag is defined to indicate
-this service is available.
-
-This implementation can not return the @code{EPERM} error.
-
-This function is not defined in the POSIX specification.  It is 
-an extension provided by this implementation.
-
-@page
-@subsection log_write_entry - Write entry to any log file
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <evlog.h>
-
-int log_write_entry(
-  const logd_t      logdes,
-  struct log_entry *entry,
-  const void       *buf,
-  const size_t      len
-);
-@end example
-@end ifset
- 
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-A successful call to @code{log_write_entry()} returns a value of zero
-and an unsuccessful call returns the @code{errno}.
-
-@table @b
-@item E2BIG
-This error indicates an inconsistency in the implementation.
-Report this as a bug.
-
-@item EBADF
-The @code{logdes} argument is not a valid log descriptor.
-
-@item EFAULT
-The @code{entry} argument is not a valid pointer to a log entry.
-
-@item EINVAL
-The @code{facility} field in @code{entry} is not a valid log facility.
-
-@item EINVAL
-The @code{severity} field in @code{entry} exceeds @code{LOG_SEVERITY_MAX}.
-
-@item EINVAL
-The @code{len} argument exceeds @code{LOG_MAXIMUM_BUFFER_SIZE}.
-
-@item EINVAL
-The @code{len} argument was non-zero and @code{buf} is NULL.
-
-@item ENOSPC
-The device which contains the log file has run out of space.
-
-@item EIO
-An I/O error occurred in writing to the log file.
-
-@end table
-
-@subheading DESCRIPTION:
-
-The @code{log_write_entry()} function writes an event record 
-specified by the @code{entry}, @code{buf}, and @code{len} arguments.
-Most of the fields of the event record pointed to by @code{entry}
-are left intact.  The following fields are filled in as follows:
-
-@table @b
-@item log_recid
-This is set to a monotonically increasing log record id
-maintained by the system for this individual log file.
-
-@item log_size
-This is set to the value of the @code{len} argument.
-
-@end table
-
-This allows existing log entries from one log file to be written to 
-another log file without destroying the logged information.
-
-@subheading NOTES:
-
-The @code{_POSIX_LOGGING} feature flag is defined to indicate
-this service is available.
-
-This implementation can not return the @code{EPERM} error.
-
-This function is not defined in the POSIX specification.  It is 
-an extension provided by this implementation.
-
-@page
-@subsection log_open - Open a log file
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <evlog.h>
-
-int log_open(
-  logd_t               *logdes,
-  const char           *path,
-  const log_query_t    *query
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-A successful call to @code{log_open()} returns a value of zero
-and an unsuccessful call returns the @code{errno}.
-
-@table @b
-@item EACCES
-Search permission is denied on a component of the @code{path} prefix,
-or the log file exists and read permission is denied.
-
-@item  EINTR
-A signal interrupted the call to @code{log_open()}.
-
-@item EINVAL
-The log_severity field of the query argument exceeds 
-@code{LOG_SEVERITY_MAX}.
-
-@item EINVAL
-The @code{path} argument referred to a file that was not a log file.
-
-@item EMFILE
-Too many log file descriptors are currently in use by this
-process.
-
-@item ENAMETOOLONG
-The length of the path string exceeds @code{PATH_MAX}, or a pathname
-component is longer than @code{NAME_MAX} while @code{_POSIX_NO_TRUNC} is
-in effect.
-
-@item ENFILE
-Too many files are currently open in the system.
-
-@item ENOENT
-The file specified by the @code{path} argument does not exist.
-
-@item ENOTDIR
-A component of the @code{path} prefix is not a directory.
-
-@end table
-
-@subheading DESCRIPTION:
-
-The @code{log_open()} function establishes the connection between a 
-log file and a log file descriptor.  It creates an open log file 
-descriptor that refers to this query stream on the specified log file
-The log file descriptor is used by the other log functions to refer
-to that log query stream.  The @code{path} argument points to a
-pathname for a log file.  A @code{path} argument of @code{NULL} specifies
-the current system log file.  
-
-The @code{query} argument is not @code{NULL}, then it points to a log query
-specification that is used to filter the records in the log file on
-subsequent @code{log_read()} operations.  This restricts the set of
-event records read using the returned log file descriptor to those
-which match the query.  A query match occurs for a given record when
-that record's facility is a member of the query's facility set and
-the record's severity is greater than or equal to the severity specified
-in the query.
-
-If the value of the @code{query} argument is @code{NULL}, no query filter
-shall be applied.
-
-@subheading NOTES:
-
-The @code{_POSIX_LOGGING} feature flag is defined to indicate
-this service is available.
-
-POSIX specifies that @code{EINVAL} will be returned if the 
-@code{log_facilities} field of the @code{query} argument is not
-a valid facility set.  In this implementation, this condition
-can never occur.
-
-Many error codes that POSIX specifies to be returned by @code{log_open()}
-should actually be detected by @code{open()} and passed back by the
-@code{log_open()} implementation.  In this implementation, @code{EACCESS},
-@code{EMFILE}, @code{ENAMETOOLONG}, @code{ENFILE}, @code{ENOENT},
-and @code{ENOTDIR} are detected in this manner.
-
-@page
-@subsection log_read - Read from a log file
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <evlog.h>
-
-int log_read(
-  const logd_t      logdes,
-  struct log_entry *entry,
-  void             *log_buf,
-  const size_t      log_len,
-  const size_t     *log_sizeread
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-A successful call to @code{log_read()} returns a value of zero
-and an unsuccessful call returns the @code{errno}.
-
-@table @b
-@item E2BIG
-This error indicates an inconsistency in the implementation.
-Report this as a bug.
-
-@item EBADF
-The @code{logdes} argument is not a valid log file descriptor.
-
-@item EFAULT
-The @code{entry} argument is not a valid pointer to a log entry structure.
-
-@item EFAULT
-The @code{log_sizeread} argument is not a valid pointer to a size_t.
-
-@item EBUSY
-No data available.  There are no unread event records remaining
-in this log file.
-
-@item EINTR
-A signal interrupted the call to @code{log_read()}.
-
-@item EIO
-An I/O error occurred in reading from the event log.
-
-@item EINVAL
-The matching event record has data associated with it and
-@code{log_buf} was not a valid pointer.
-
-@item EINVAL
-The matching event record has data associated with it which is
-longer than @code{log_len}.
-
-@end table
-
-@subheading DESCRIPTION:
-
-The @code{log_read()} function reads the @code{log_entry}
-structure and up to @code{log_len} bytes of data from the next
-event record of the log file associated with the open log file
-descriptor @code{logdes}.  The event record read is placed
-into the @code{log_entry} structure pointed to by
-@code{entry} and any data into the buffer pointed to by @code{log_buf}.
-The log record ID of the returned event record is be stored in the 
-@code{log_recid} member of the @code{log_entry} structure for the event
-record.
-
-If the query attribute of the open log file description associated with
-the @code{logdes} is set, the event record read will match that query.
-
-If the @code{log_read()} is successful the call stores the actual length
-of the data associated with the event record into the location specified by
-@code{log_sizeread}.  This number will be less than or equal to
-@code{log_len}.
-
-@subheading NOTES:
-
-The @code{_POSIX_LOGGING} feature flag is defined to indicate
-this service is available.
-
-When @code{EINVAL} is returned, then no data is returned although the
-event record is returned.  This is an extension to the POSIX specification.
-
-The POSIX specification specifically allows @code{log_read()} to write
-greater than @code{log_len} bytes into @code{log_buf}.  This is highly
-undesirable and this implementation will NOT do this.
-
-@page
-@subsection log_notify - Notify Process of writes to the system log.
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <evlog.h>
-
-int log_notify(
-  const logd_t           logdes,
-  const struct sigevent *notification
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-A successful call to @code{log_notify()} returns a value of zero
-and an unsuccessful call returns the @code{errno}.
-
-@table @b
-@item EBADF
-The logdes argument is not a valid log file descriptor.
-
-@item EINVAL
-The notification argument specifies an invalid signal.
-
-@item EINVAL
-The process has requested a notify on a log that will not be
-written to.
-
-@item ENOSYS
-The function @code{log_notify()} is not supported by this implementation.
-
-@end table
-
-@subheading DESCRIPTION:
-
-If the argument @code{notification} is not @code{NULL} this function registers 
-the calling process to be notified of event records received by the system 
-log, which match the query parameters associated with the open log descriptor
-specified by @code{logdes}.  The notification specified by the 
-@code{notification} argument shall be sent to the process when an event 
-record received by the system log is matched by the query attribute of the 
-open log file description associated with the @code{logdes} log file 
-descriptor.  If the calling process has already registered a notification
-for the @code{logdes} log file descriptor, the new notification shall 
-replace the existing notification registration.
-
-If the @code{notification} argument is @code{NULL} and the calling process is 
-currently registered to be notified for the @code{logdes} log file
-descriptor, the existing registration shall be removed.
-
-@subheading NOTES:
-
-The @code{_POSIX_LOGGING} feature flag is defined to indicate
-this service is available.
-
-@page
-@subsection log_close - Close log descriptor
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <evlog.h>
-
-int log_close(
-  const logd_t   logdes
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-A successful call to @code{log_close()} returns a value of zero
-and an unsuccessful call returns the @code{errno}.
-
-@table @b
-@item EBADF
-The logdes argument is not a valid log file descriptor.
-
-@end table
-
-@subheading DESCRIPTION:
-
-The @code{log_close()} function deallocates the open log file descriptor 
-indicated by @code{log_des}.
-
-When all log file descriptors associated with an open log file description
-have been closed, the open log file description is freed.
-
-If the link count of the log file is zero, when all log file descriptors
-have been closed, the space occupied by the log file is freed and the
-log file shall no longer be accessible.
-
-If the process has successfully registered a notification request for the 
-log file descriptor, the registration is removed. 
-
-@subheading NOTES:
-
-The @code{_POSIX_LOGGING} feature flag is defined to indicate
-this service is available.
-
-@page
-@subsection log_seek - Reposition log file offset
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <evlog.h>
-
-int log_seek(
-  const logd_t    logdes,
-  log_recid_t     log_recid
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-A successful call to @code{log_seek()} returns a value of zero
-and an unsuccessful call returns the @code{errno}.
-
-@table @b
-@item EBADF
-The @code{logdes} argument is not a valid log file descriptor.
-@item EINVAL
-The @code{log_recid} argument is not a valid record id.
-
-@end table
-
-@subheading DESCRIPTION:
-
-The @code{log_seek()} function sets the log file offset of the open 
-log description associated with the @code{logdes} log file descriptor 
-to the event record in the log file identified by @code{log_recid}.  
-The @code{log_recid} argument is either the record id of a valid event
-record or one of the following values, as defined in the header file
-@code{<evlog.h>:}
-
-@table @b
-@item LOG_SEEK_START
-Set log file position to point at the first event
-record in the log file.
-
-@item LOG_SEEK_END
-Set log file position to point after the last event 
-record in the log file.
-
-@end table
-
-@subheading NOTES:
-
-The @code{_POSIX_LOGGING} feature flag is defined to indicate
-this service is available.
-
-This implementation can not return EINTR.
-
-This implementation can not return EINVAL to indicate that
-the @code{log_recid} argument is not a valid record id.
-
-@page
-@subsection log_severity_before - Compare event record severities
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <evlog.h>
-
-int log_severity_before(
-  log_severity_t  s1,
-  log_severity_t  s2
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item 0
-The severity of @code{s1} is less than that of @code{s2}.
-
-@item 1
-The severity of @code{s1} is greater than or equal that of @code{s2}.
-
-@item EINVAL 
-The value of either s1 or s2 exceeds @code{LOG_SEVERITY_MAX}.
-
-@end table
-
-@subheading DESCRIPTION:
-
-The @code{log_severity_before()} function compares the severity order
-of the @code{s1} and @code{s2} arguments.  If @code{s1} is of 
-severity greater than or equal to that of @code{s2}, then this
-function returns 1.  Otherwise, it returns 0.
-
-If either @code{s1} or @code{s2} specify invalid severity values, the
-return value of @code{log_severity_before()} is unspecified.
-
-@subheading NOTES:
-
-The @code{_POSIX_LOGGING} feature flag is defined to indicate
-this service is available.
-
-The POSIX specification of the return value for this function is ambiguous.
-If EINVAL is equal to 1 in an implementation, then the application
-can not distinguish between greater than and an error condition.
-
-@page
-@subsection log_facilityemptyset - Manipulate log facility sets
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <evlog.h>
-
-int log_facilityemptyset(
-  log_facility_set_t  *set
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-A successful call to @code{log_facilityemptyset()} returns a value of zero
-and a unsuccessful call returns the @code{errno}.
-
-@table @b
-@item EFAULT
-The @code{set} argument is an invalid pointer.
-
-@end table
-
-@subheading DESCRIPTION:
-
-The @code{log_facilityemptyset()} function initializes the facility
-set pointed to by the argument @code{set}, such that all facilities
-are excluded.
-
-@subheading NOTES:
-
-The @code{_POSIX_LOGGING} feature flag is defined to indicate
-this service is available.
-
-Applications shall call either @code{log_facilityemptyset()} or 
-@code{log_facilityfillset()} at least once for each object of type
-@code{log_facilityset_t} prior to any other use of that object.  If
-such an object is not initialized in this way, but is nonetheless 
-supplied as an argument to any of the @code{log_facilityaddset()}, 
-@code{logfacilitydelset()}, @code{log_facilityismember()} or 
-@code{log_open()} functions, the results are undefined.
-
-@page
-@subsection log_facilityfillset - Manipulate log facility sets
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <evlog.h>
-
-int log_facilityfillset(
-  log_facility_set_t  *set
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-A successful call to @code{log_facilityfillset()} returns a value of zero
-and a unsuccessful call returns the @code{errno}.
-
-@table @b
-@item EFAULT
-The @code{set} argument is an invalid pointer.
-
-@end table
-
-@subheading DESCRIPTION:
-
-The @code{log_facilityfillset()} function initializes the facility
-set pointed to by the argument @code{set}, such that all facilities
-are included.
-
-@subheading NOTES:
-
-The @code{_POSIX_LOGGING} feature flag is defined to indicate
-this service is available.
-
-Applications shall call either @code{log_facilityemptyset()} or 
-@code{log_facilityfillset()} at least once for each object of type
-@code{log_facilityset_t} prior to any other use of that object.  If
-such an object is not initialized in this way, but is nonetheless 
-supplied as an argument to any of the @code{log_facilityaddset()}, 
-@code{logfacilitydelset()}, @code{log_facilityismember()} or 
-@code{log_open()} functions, the results are undefined.
-
-@page
-@subsection log_facilityaddset - Manipulate log facility sets
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <evlog.h>
-
-int log_facilityaddset(
-  log_facility_set_t  *set,
-  log_facility_t       facilityno
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-A successful call to @code{log_facilityaddset()} returns a value of zero
-and a unsuccessful call returns the @code{errno}.
-
-@table @b
-@item EFAULT
-The @code{set} argument is an invalid pointer.
-
-@item EINVAL
-The @code{facilityno} argument is not a valid facility.
-
-@end table
-
-@subheading DESCRIPTION:
-
-The @code{log_facilityaddset()} function adds the individual
-facility specified by the value of the argument @code{facilityno}
-to the facility set pointed to by the argument @code{set}.
-
-@subheading NOTES:
-
-The @code{_POSIX_LOGGING} feature flag is defined to indicate
-this service is available.
-
-Applications shall call either @code{log_facilityemptyset()} or 
-@code{log_facilityfillset()} at least once for each object of type
-@code{log_facilityset_t} prior to any other use of that object.  If
-such an object is not initialized in this way, but is nonetheless 
-supplied as an argument to any of the @code{log_facilityaddset()}, 
-@code{logfacilitydelset()}, @code{log_facilityismember()} or 
-@code{log_open()} functions, the results are undefined.
-
-@page
-@subsection log_facilitydelset - Manipulate log facility sets
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <evlog.h>
-
-int log_facilitydelset(
-  log_facility_set_t  *set,
-  log_facility_t       facilityno
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-A successful call to @code{log_facilitydelset()} returns a value of zero
-and a unsuccessful call returns the @code{errno}.
-
-@table @b
-@item EFAULT
-The @code{set} argument is an invalid pointer.
-
-@item EINVAL
-The @code{facilityno} argument is not a valid facility.
-
-@end table
-
-@subheading DESCRIPTION:
-
-The @code{log_facilitydelset()} function deletes the individual
-facility specified by the value of the argument @code{facilityno}
-from the facility set pointed to by the argument @code{set}.
-
-@subheading NOTES:
-
-The @code{_POSIX_LOGGING} feature flag is defined to indicate
-this service is available.
-
-Applications shall call either @code{log_facilityemptyset()} or 
-@code{log_facilityfillset()} at least once for each object of type
-@code{log_facilityset_t} prior to any other use of that object.  If
-such an object is not initialized in this way, but is nonetheless 
-supplied as an argument to any of the @code{log_facilityaddset()}, 
-@code{logfacilitydelset()}, @code{log_facilityismember()} or 
-@code{log_open()} functions, the results are undefined.
-
-@page
-@subsection log_facilityismember - Manipulate log facility sets
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <evlog.h>
-
-int log_facilityismember(
-  const log_facility_set_t *set,
-  log_facility_t            facilityno,
-  const int                *member
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-A successful call to @code{log_facilityismember()} returns a value 
-of zero and a unsuccessful call returns the @code{errno}.
-
-@table @b
-@item EFAULT
-The @code{set} or @code{member} argument is an invalid pointer.
-
-@item EINVAL
-The @code{facilityno} argument is not a valid facility.
-
-@end table
-
-@subheading DESCRIPTION:
-
-The @code{log_facilityismember()} function tests whether the facility
-specified by the value of the argument @code{facilityno} is a member
-of the set pointed to by the argument @code{set}.  Upon successful
-completion, the @code{log_facilityismember()} function either returns
-a value of one to the location specified by @code{member} if the 
-specified facility is a member of the specified set or value of
-zero to the location specified by @code{member} if the specified
-facility is not a member of the specified set.
-
-@subheading NOTES:
-
-The @code{_POSIX_LOGGING} feature flag is defined to indicate
-this service is available.
-
-Applications shall call either @code{log_facilityemptyset()} or 
-@code{log_facilityfillset()} at least once for each object of type
-@code{log_facilityset_t} prior to any other use of that object.  If
-such an object is not initialized in this way, but is nonetheless 
-supplied as an argument to any of the @code{log_facilityaddset()}, 
-@code{logfacilitydelset()}, @code{log_facilityismember()} or 
-@code{log_open()} functions, the results are undefined.
-
-@page
-@subsection log_facilityisvalid - Manipulate log facility sets
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <evlog.h>
-
-int log_facilityisvalid(
-  log_facility_t        facilityno
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-A return value of zero indicates that the @code{facilityno} is valid and 
-a return value other than zero represents an @code{errno}.
-
-@table @b
-@item EFAULT
-The @code{set} or @code{member} argument is an invalid pointer.
-
-@item EINVAL
-The @code{facilityno} argument is not a valid facility.
-
-@end table
-
-@subheading DESCRIPTION:
-
-The @code{log_facilityisvalid()} function tests whether the facility
-specified by the value of the argument @code{facilityno} is a valid
-facility number.  Upon successful completion, the 
-the @code{log_facilityisvalid()} function either returns a value of
-0 if the specified facility is a valid facility or value of EINVAL 
-if the specified facility is not a valid facility.
-
-@subheading NOTES:
-
-The @code{_POSIX_LOGGING} feature flag is defined to indicate
-this service is available.
-
-Applications shall call either @code{log_facilityemptyset()} or 
-@code{log_facilityfillset()} at least once for each object of type
-@code{log_facilityset_t} prior to any other use of that object.  If
-such an object is not initialized in this way, but is nonetheless 
-supplied as an argument to any of the @code{log_facilityaddset()}, 
-@code{logfacilitydelset()}, @code{log_facilityismember()} or 
-@code{log_open()} functions, the results are undefined.
-
-@page
-@subsection log_create - Creates a log file
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <evlog.h>
-
-int log_create(
-  logd_t       *ld,
-  const char   *path,
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-A successful call to @code{log_create()} returns a value 
-of zero and a unsuccessful call returns the @code{errno}.
-
-@table @b
-
-@item EEXIST 
-The @code{path} already exists and O_CREAT and O_EXCL were used.
-
-@item EISDIR 
-The @code{path} refers to a directory and the access requested involved 
-writing.
-
-@item ETXTBSY
-The @code{path} refers to an executable image which is currently being  
-executed and write access was requested.
-
-@item EFAULT 
-The @code{path} points outside your accessible address space.
-
-@item EACCES 
-The requested access to the file is not allowed, or one of the 
-directories in @code{path} did not allow search (execute) permission.
-
-@item ENAMETOOLONG
-The @code{path} was too long.
-
-@item ENOENT 
-A directory component in @code{path} does not exist or is a dangling symbolic 
-link.
-
-@item ENOTDIR
-A component used as a directory in @code{path} is not, in fact, a directory.
-
-@item EMFILE
-The process already has the maximum number of files open.
-
-@item ENFILE
-The limit on the total number of files open on the system has been reached.
-
-@item ENOMEM
-Insufficient kernel memory was available.
-
-@item EROFS
-The @code{path} refers to a file on a read-only filesystem and write access
-was requested.
-
-@item ELOOP
-The @code{path} contains a reference to a circular symbolic link, ie a 
-symbolic link whose expansion contains a reference to itself.
-
-@end table
-
-@subheading DESCRIPTION:
-
-This function attempts to create a file associated with the @code{logdes} 
-argument in the directory provided by the argument @code{path}.
-
-@subheading NOTES:
-
-The @code{_POSIX_LOGGING} feature flag is defined to indicate
-this service is available.
-
-@page
-@subsection log_sys_create - Creates a system log file
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <evlog.h>
-
-int log_sys_create();
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-A successful call to @code{log_sys_create()} returns a value 
-of zero and a unsuccessful call returns the @code{errno}.
-
-@table @b
-@item EEXIST
-The directory path to the system log already exist.
-
-@end table
-
-@subheading DESCRIPTION:
-
-This function will create a predefined system log directory path and
-system log file if they do not already exist.
-
-@subheading NOTES:
-
-The @code{_POSIX_LOGGING} feature flag is defined to indicate
-this service is available.
diff --git a/doc/new_chapters/files.t b/doc/new_chapters/files.t
deleted file mode 100644
index 121c70c6c1..0000000000
--- a/doc/new_chapters/files.t
+++ /dev/null
@@ -1,1959 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved. 
-@c
-@c  $Id$
-@c
-
-@chapter Files and Directories Manager
-
-@section Introduction
-
-The files and directories manager is ...
-
-The directives provided by the files and directories manager are:
-
-@itemize @bullet
-@item @code{opendir} - Open a Directory
-@item @code{readdir} - Reads a directory
-@item @code{rewinddir} - Resets the @code{readdir()} pointer 
-@item @code{scandir} - Scan a directory for matching entries
-@item @code{telldir} - Return current location in directory stream
-@item @code{closedir} - Ends directory read operation
-@item @code{getdents} - Get directory entries
-@item @code{chdir} - Changes the current working directory
-@item @code{getcwd} - Gets current working directory
-@item @code{open} - Opens a file
-@item @code{creat} - Create a new file or rewrite an existing one
-@item @code{umask} - Sets a file creation mask
-@item @code{link} - Creates a link to a file
-@item @code{mkdir} - Makes a directory
-@item @code{mkfifo} - Makes a FIFO special file
-@item @code{unlink} - Removes a directory entry 
-@item @code{rmdir} - Delete a directory
-@item @code{rename} - Renames a file 
-@item @code{stat} - Gets information about a file.
-@item @code{fstat} - Gets file status
-@item @code{access} - Check user's permissions for a file.
-@item @code{chmod} - Changes file mode
-@item @code{fchmod} - Changes permissions of a file
-@item @code{chown} - Changes the owner and/ or group of a file
-@item @code{utime} - Change access and/or modification times of an inode
-@item @code{ftruncate} - Truncate a file to a specified length
-@item @code{truncate} - Truncate a file to a specified length
-@item @code{pathconf} - Gets configuration values for files
-@item @code{fpathconf} - Get configuration values for files
-@item @code{mknod} - Create a directory
-@end itemize
-
-@section Background
-
-There is currently no text in this section.
-
-@section Operations
-
-There is currently no text in this section.
-
-@section Directives
-
-This section details the files and directories manager's directives.
-A subsection is dedicated to each of this manager's directives
-and describes the calling sequence, related constants, usage,
-and status codes.
-
-@page
-@subsection opendir - Open a Directory
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <sys/types.h>
-#include <dirent.h>
-
-int opendir(
-  const char *dirname
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item EACCES
-Search permission was denied on a component of the path
-prefix of @code{dirname}, or read permission is denied
-
-@item EMFILE
-Too many file descriptors in use by process
-
-@item ENFILE
-Too many files are currently open in the system.
-
-@item ENOENT
-Directory does not exist, or @code{name} is an empty string.
-
-@item ENOMEM
-Insufficient memory to complete the operation.
-
-@item ENOTDIR
-@code{name} is not a directory.
-
-@end table
-
-@subheading DESCRIPTION:
-
-This routine opens a directory stream corresponding to the
-directory specified by the @code{dirname} argument.  The 
-directory stream is positioned at the first entry.
-
-@subheading NOTES:
-
-The routine is implemented in Cygnus newlib.
-
-@page
-@subsection readdir - Reads a directory
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <sys/types.h>
-#include <dirent.h>
-
-int readdir(
-  DIR    *dirp
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item EBADF
-Invalid file descriptor
-
-@end table
-
-@subheading DESCRIPTION:
-
-The @code{readdir()} function returns a pointer to a structure @code{dirent}
-representing the next directory entry from the directory stream pointed to
-by @code{dirp}.  On end-of-file, NULL is returned.
-
-The @code{readdir()} function may (or may not) return entries for . or .. Your
-program should tolerate reading dot and dot-dot but not require them.
-
-The data pointed to be @code{readdir()} may be overwritten by another call to
-@code{readdir()} for the same directory stream.  It will not be overwritten by 
-a call for another directory.
-
-@subheading NOTES: 
-
-If @code{ptr} is not a pointer returned by @code{malloc()}, @code{calloc()}, or 
-@code{realloc()} or has been deallocated with @code{free()} or
-@code{realloc()}, the results are not portable and are probably disastrous.
-
-The routine is implemented in Cygnus newlib.
-
-@page
-@subsection rewinddir - Resets the readdir() pointer
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <sys/types.h>
-#include <dirent.h>
-
-void rewinddir(
-  DIR *dirp
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-No value is returned.
-
-@subheading DESCRIPTION:
-
-The @code{rewinddir()} function resets the position associated with
-the directory stream pointed to by @code{dirp}.  It also causes the
-directory stream to refer to the current state of the directory.
-
-@subheading NOTES: 
-
-NONE
-
-If @code{dirp} is not a pointer by @code{opendir()}, the results are
-undefined.
-
-The routine is implemented in Cygnus newlib.
-
-@page
-@subsection scandir - Scan a directory for matching entries
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <dirent.h>
-
-int scandir(
-  const char      *dir,
-  struct direct ***namelist,
-  int (*select)(const struct dirent *),
-  int (*compar)(const struct dirent **, const struct dirent **)
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item ENOMEM
-Insufficient memory to complete the operation.
-
-@end table
-
-@subheading DESCRIPTION:
-
-The @code{scandir()} function scans the directory @code{dir}, calling
-@code{select()} on each directory entry.  Entries for which @code{select()}
-returns non-zero are stored in strings allocated via @code{malloc()}, 
-sorted using @code{qsort()} with the comparison function @code{compar()},
-and collected in array @code{namelist} which is allocated via @code{malloc()}.
-If @code{select} is NULL, all entries are selected.
-
-@subheading NOTES:
-
-The routine is implemented in Cygnus newlib.
-
-@page
-@subsection telldir - Return current location in directory stream
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <dirent.h>
-
-off_t telldir(
-  DIR *dir
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item EBADF
-Invalid directory stream descriptor @code{dir}.
-
-@end table
-
-@subheading DESCRIPTION:
-
-The @code{telldir()} function returns the current location associated with the
-directory stream @code{dir}.
-
-@subheading NOTES: 
-
-The routine is implemented in Cygnus newlib.
-
-@page
-@subsection closedir - Ends directory read operation 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <sys/types.h>
-#include <dirent.h>
-
-int closedir(
-  DIR *dirp
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item EBADF
-Invalid file descriptor
-
-@end table
-
-@subheading DESCRIPTION:
-
-The directory stream associated with @code{dirp} is closed.
-The value in @code{dirp} may not be usable after a call to
-@code{closedir()}.
-
-@subheading NOTES: 
-
-NONE
-
-The argument to @code{closedir()} must be a pointer returned by 
-@code{opendir()}.  If it is not, the results are not portable and
-most likely unpleasant.
-
-The routine is implemented in Cygnus newlib.
-
-@page
-@subsection chdir - Changes the current working directory
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <unistd.h>
-
-int chdir(
-  const char  *path
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item EACCES
-Search permission is denied for a directory in a file's path prefix.
-
-@item ENAMETOOLONG
-Length of a filename string exceeds PATH_MAX and _POSIX_NO_TRUNC is 
-in effect.
-
-@item ENOENT
-A file or directory does not exist.
-
-@item ENOTDIR
-A component of the specified pathname was not a directory when directory
-was expected.
-
-@end table
-
-@subheading DESCRIPTION:
-
-The @code{chdir()} function causes the directory named by @code{path} to
-become the current working directory; that is, the starting point for
-searches of pathnames not beginning with a slash.
-
-If @code{chdir()} detects an error, the current working directory is not 
-changed.
-
-@subheading NOTES:
-
-NONE
-
-@page
-@subsection getcwd - Gets current working directory 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <unistd.h>
-
-int getcwd( void );
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item EINVAL
-Invalid argument
-
-@item ERANGE
-Result is too large
-
-@item EACCES
-Search permission is denied for a directory in a file's path prefix.
-
-@end table
-
-@subheading DESCRIPTION:
-
-The @code{getcwd()} function copies the absolute pathname of the current
-working directory to the character array pointed to by @code{buf}.  The
-@code{size} argument is the number of bytes available in @code{buf}
-
-@subheading NOTES:
-
-There is no way to determine the maximum string length that @code{fetcwd()}
-may need to return.  Applications should tolerate getting @code{ERANGE}
-and allocate a larger buffer.
-
-It is possible for @code{getcwd()} to return EACCES if, say, @code{login}
-puts the process into a directory without read access.
-
-The 1988 standard uses @code{int} instead of @code{size_t} for the second
-parameter.
-
-@page
-@subsection open - Opens a file
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-
-int open(
-   const char *path,
-   int         oflag,
-   mode_t      mode
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-
-@item EACCES
-Search permission is denied for a directory in a file's path prefix.
-
-@item EEXIST
-The named file already exists.
-
-@item EINTR
-Function was interrupted by a signal.
-
-@item EISDIR
-Attempt to open a directory for writing or to rename a file to be a
-directory.
-
-@item EMFILE
-Too many file descriptors are in use by this process.
-
-@item ENAMETOOLONG
-Length of a filename string exceeds PATH_MAX and _POSIX_NO_TRUNC is in
-effect.
-
-@item ENFILE
-Too many files are currently open in the system.
-
-@item ENOENT
-A file or directory does not exist.
-
-@item ENOSPC
-No space left on disk.
-
-@item ENOTDIR
-A component of the specified pathname was not a directory when a directory
-was expected.
-
-@item ENXIO
-No such device.  This error may also occur when a device is not ready, for 
-example, a tape drive is off-line.
-
-@item EROFS
-Read-only file system.
-@end table
-
-@subheading DESCRIPTION:
-
-The @code{open} function establishes a connection between a file and a file 
-descriptor.  The file descriptor is a small integer that is used by I/O 
-functions to reference the file.  The @code{path} argument points to the 
-pathname for the file.
-
-The @code{oflag} argument is the bitwise inclusive OR of the values of 
-symbolic constants.  The programmer must specify exactly one of the following
-three symbols:
-
-@table @b
-@item O_RDONLY
-Open for reading only.
-
-@item O_WRONLY
-Open for writing only.
-
-@item O_RDWR
-Open for reading and writing.
-
-@end table
-
-Any combination of the following symbols may also be used.
-
-@table @b
-@item O_APPEND
-Set the file offset to the end-of-file prior to each write.
-
-@item O_CREAT
-If the file does not exist, allow it to be created.  This flag indicates
-that the @code{mode} argument is present in the call to @code{open}.
-
-@item O_EXCL
-This flag may be used only if O_CREAT is also set.  It causes the call
-to @code{open} to fail if the file already exists.
-
-@item O_NOCTTY
-If @code{path} identifies a terminal, this flag prevents that teminal from
-becoming the controlling terminal for thi9s process.  See Chapter 8 for a
-description of terminal I/O.
-
-@item O_NONBLOCK
-Do no wait for the device or file to be ready or available.  After the file
-is open, the @code{read} and @code{write} calls return immediately.  If the 
-process would be delayed in the read or write opermation, -1 is returned and 
-@code{errno} is set to @code{EAGAIN} instead of blocking the caller.
-
-@item O_TRUNC
-This flag should be used only on ordinary files opened for writing.  It 
-causes the file to be tuncated to zero length..
-
-@end table
-
-Upon successful completion, @code{open} returns a non-negative file 
-descriptor.
-
-@subheading NOTES: 
-
-NONE
-
-@page
-@subsection creat - Create a new file or rewrite an existing one 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-
-int creat(
-  const char *path, 
-  mode_t      mode
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item EEXIST
-@code{path} already exists and O_CREAT and O_EXCL were used.
-
-@item EISDIR
-@code{path} refers to a directory and the access requested involved
-writing
-
-@item ETXTBSY
-@code{path} refers to an executable image which is currently being
-executed and write access was requested
-
-@item EFAULT
-@code{path} points outside your accessible address space
-
-@item EACCES
-The requested access to the file is not allowed, or one of the 
-directories in @code{path} did not allow search (execute) permission.
-
-@item ENAMETOOLONG
-@code{path} was too long.
-
-@item ENOENT
-A directory component in @code{path} does not exist or is a dangling
-symbolic link.
-
-@item ENOTDIR
-A component used as a directory in @code{path} is not, in fact, a 
-directory.
-
-@item EMFILE
-The process alreadyh has the maximum number of files open.
-
-@item ENFILE
-The limit on the total number of files open on the system has been 
-reached.
-
-@item ENOMEM
-Insufficient kernel memory was available.
-
-@item EROFS
-@code{path} refers to a file on a read-only filesystem and write access
-was requested
-
-@end table
-
-@subheading DESCRIPTION:
-
-@code{creat} attempts to create a file and return a file descriptor for
-use in read, write, etc.
-
-@subheading NOTES:
-
-NONE
-
-The routine is implemented in Cygnus newlib.
-
-@page
-@subsection umask - Sets a file creation mask.
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <sys/types.h>
-#include <sys/stat.h>
-
-mode_t umask(
-  mode_t cmask
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@subheading DESCRIPTION:
-
-The @code{umask()} function sets the process file creation mask to @code{cmask}.
-The file creation mask is used during @code{open()}, @code{creat()}, @code{mkdir()},
-@code{mkfifo()} calls to turn off permission bits in the @code{mode} argument.
-Bit positions that are set in @code{cmask} are cleared in the mode of the
-created file.
-
-@subheading NOTES: 
-
-NONE
-
-The @code{cmask} argument should have only permission bits set.  All other 
-bits should be zero.
-
-In a system which supports multiple processes, the file creation mask is inherited
-across @code{fork()} and @code{exec()} calls.  This makes it possible to alter the
-default permission bits of created files.  RTEMS does not support multiple processes
-so this behavior is not possible.
-
-@page
-@subsection link - Creates a link to a file
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <unistd.h>
-
-int link(
-  const char *existing,
-  const char *new
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-
-@item EACCES
-Search permission is denied for a directory in a file's path prefix
-
-@item EEXIST
-The named file already exists.
-
-@item EMLINK
-The number of links would exceed @code{LINK_MAX}.
-
-@item ENAMETOOLONG
-Length of a filename string exceeds PATH_MAX and _POSIX_NO_TRUNC is in
-effect.
-
-@item ENOENT
-A file or directory does not exist.
-@item ENOSPC
-No space left on disk.
-
-@item ENOTDIR
-A component of the specified pathname was not a directory when a directory
-was expected.
-
-@item EPERM
-Operation is not permitted.  Process does not have the appropriate priviledges
-or permissions to perform the requested operations.
-
-@item EROFS
-Read-only file system.
-
-@item EXDEV
-Attempt to link a file to another file system.
-
-@end table
-
-@subheading DESCRIPTION:
-
-The @code{link()} function atomically creates a new link for an existing file
-and increments the link count for the file.
-
-If the @code{link()} function fails, no directories are modified.
-
-The @code{existing} argument should not be a directory.
-
-The caller may (or may not) need permission to access the existing file.
-
-@subheading NOTES:
-
-NONE
-
-@page
-@subsection mkdir - Makes a directory
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <sys/types.h>
-#include <sys/stat.h>
-
-int mkdir(
-  const char *path,
-  mode_t      mode
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item EACCES
-Search permission is denied for a directory in a file's path prefix
-
-@item EEXIST
-The name file already exist.  
-
-@item EMLINK
-The number of links would exceed LINK_MAX
-
-@item ENAMETOOLONG
-Length of a filename string exceeds PATH_MAX and _POSIX_NO_TRUNC is in
-effect.
-
-@item ENOENT
-A file or directory does not exist.
-
-@item ENOSPC
-No space left on disk.
-
-@item ENOTDIR
-A component of the specified pathname was not a directory when a directory
-was expected.
-
-@item EROFS
-Read-only file system.
-
-@end table
-
-@subheading DESCRIPTION:
-
-The @code{mkdir()} function creates a new diectory named @code{path}.  The 
-permission bits (modified by the file creation mask) are set from @code{mode}.
-The owner and group IDs for the directory are set from the effective user ID
-and group ID.
-
-The new directory may (or may not) contain entries for.. and .. but is otherwise
-empty.
-
-@subheading NOTES:
-
-NONE
-
-@page
-@subsection mkfifo - Makes a FIFO special file
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <sys/types.h>
-#include <sys/stat.h>
-
-
-int mkfifo(
-  const char *path,
-  mode_t      mode
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item EACCES
-Search permission is denied for a directory in a file's path prefix
-
-@item EEXIST
-The named file already exists.
-
-@item ENOENT
-A file or directory does not exist.
-
-@item ENOSPC
-No space left on disk.
-
-@item ENOTDIR
-A component of the specified @code{path} was not a directory when a directory
-was expected.
-
-@item EROFS
-Read-only file system.
-
-@end table
-
-@subheading DESCRIPTION:
-
-The @code{mkfifo()} function creates a new FIFO special file named @code{path}.
-The permission bits (modified by the file creation mask) are set from 
-@code{mode}.  The owner and group IDs for the FIFO are set from the efective
-user ID and group ID.
-
-@subheading NOTES:
-
-NONE
-
-@page
-@subsection unlink - Removes a directory entry
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <unistd.h>
-
-int unlink(
-  const char path
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item EACCES
-Search permission is denied for a directory in a file's path prefix
-
-@item EBUSY
-The directory is in use.
-
-@item ENAMETOOLONG
-Length of a filename string exceeds PATH_MAX and _POSIX_NO_TRUNC is in
-effect.
-
-@item ENOENT
-A file or directory does not exist.
-
-@item ENOTDIR
-A component of the specified @code{path} was not a directory when a directory
-was expected.
-
-@item EPERM
-Operation is not permitted.  Process does not have the appropriate priviledges
-or permissions to perform the requested operations.
-
-@item EROFS
-Read-only file system.
-
-@end table
-
-@subheading DESCRIPTION:
-
-The @code{unlink} function removes the link named by @code{path} and decrements the
-link count of the file referenced by the link.  When the link count goes to zero
-and no process has the file open, the space occupied by the file is freed and the
-file is no longer accessible. 
-
-@subheading NOTES:
-
-NONE
-
-@page
-@subsection rmdir - Delete a directory 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <unistd.h>
-
-int rmdir(
-  const char *pathname
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item EPERM
-The filesystem containing @code{pathname} does not support the removal
-of directories.
-
-@item EFAULT
-@code{pathname} points ouside your accessible address space.
-
-@item EACCES
-Write access to the directory containing @code{pathname} was not
-allowed for the process's effective uid, or one of the directories in 
-@code{pathname} did not allow search (execute) permission.
-
-@item EPERM
-The directory containing @code{pathname} has the stickybit (S_ISVTX) 
-set and the process's effective uid is neither the uid of the file to 
-be delected nor that of the director containing it.
-
-@item ENAMETOOLONG
-@code{pathname} was too long.
-
-@item ENOENT
-A dirctory component in @code{pathname} does not exist or is a 
-dangling symbolic link.
-
-@item ENOTDIR
-@code{pathname}, or a component used as a directory in @code{pathname},
-is not, in fact, a directory.
-
-@item ENOTEMPTY
-@code{pathname} contains entries other than . and .. .
-
-@item EBUSY
-@code{pathname} is the current working directory or root directory of 
-some process
-
-@item EBUSY
-@code{pathname} is the current directory or root directory of some 
-process.
-
-@item ENOMEM
-Insufficient kernel memory was available
-
-@item EROGS
-@code{pathname} refers to a file on a read-only filesystem.
-
-@item ELOOP
-@code{pathname} contains a reference to a circular symbolic link
-
-@end table
-
-@subheading DESCRIPTION:
-
-@code{rmdir} deletes a directory, which must be empty
-
-
-@subheading NOTES:
-
-NONE
-
-@page
-@subsection rename - Renames a file 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <unistd.h>
-
-int rename(
-  const char *old, 
-  const char *new
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item EACCES
-Search permission is denied for a directory in a file's path prefix.
-
-@item EBUSY
-The directory is in use.
-
-@item EEXIST
-The named file already exists.
-
-@item EINVAL
-Invalid argument.
-
-@item EISDIR
-Attempt to open a directory for writing or to rename a file to be a 
-directory.
-
-@item EMLINK
-The number of links would exceed LINK_MAX.
-
-@item ENAMETOOLONG
-Length of a filename string exceeds PATH_MAX and _POSIX_NO_TRUNC is
-in effect.
-
-@item ENOENT
-A file or directory does no exist.
-
-@item ENOSPC
-No space left on disk.
-
-@item ENOTDIR
-A component of the specified pathname was not a directory when a 
-directory was expected.
-
-@item ENOTEMPTY
-Attempt to delete or rename a non-empty directory.
-
-@item EROFS
-Read-only file system
-
-@item EXDEV
-Attempt to link a file to another file system.
-@end table
-
-@subheading DESCRIPTION:
-
-The @code{rename()} function causes the file known bo @code{old} to 
-now be known as @code{new}. 
-
-Ordinary files may be renamed to ordinary files, and directories may be
-renamed to directories; however, files cannot be converted using 
-@code{rename()}.  The @code{new} pathname may not contain a path prefix
-of @code{old}.
-
-@subheading NOTES:
-
-If a file already exists by the name @code{new}, it is removed.  The 
-@code{rename()} function is atomic.  If the @code{rename()} detects an
-error, no files are removed.  This guarantees that the
-@code{rename("x", "x")} does not remove @code{x}.
-
-You may not rename dot or dot-dot.
-
-The routine is implemented in Cygnus newlib using @code{link()} and
-@code{unlink()}.
-
-@page
-@subsection stat - Gets information about a file 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <sys/types.h>
-#include <sys/stat.h>
-
-int stat(
-  const char  *path, 
-  struct stat *buf
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item EACCES
-Search permission is denied for a directory in a file's path prefix.
-
-@item EBADF
-Invalid file descriptor.
-
-@item ENAMETOOLONG
-Length of a filename string exceeds PATH_MAX and _POSIX_NO_TRUNC is
-in effect.
-
-@item ENOENT
-A file or directory does not exist.
-
-@item ENOTDIR
-A component of the specified pathname was not a directory when a 
-directory was expected.
-
-@end table
-
-@subheading DESCRIPTION:
-
-The @code{path} argument points to a pathname for a file.  Read, write, or
-execute permission for the file is not required, but all directories listed
-in @code{path} must be searchable.  The @code{stat()} function obtains 
-information about the named file and writes it to the area pointed to by
-@code{buf}.
-
-@subheading NOTES:
-
-NONE
-
-@page
-@subsection fstat - Gets file status 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <sys/types.h>
-#include <sys/stat.h>
-
-int fstat(
-  int fildes,
-  struct stat *buf
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item EBADF
-Invalid file descriptor
-
-@end table
-
-@subheading DESCRIPTION:
-
-The @code{fstat()} function obtains information about the file
-associated with @code{fildes} and writes it to the area pointed
-to by the @code{buf} argument.
-
-@subheading NOTES:
-
-NONE
-
-@page
-@subsection access - Check user's permissions for a file
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <unistd.h>
-
-int access(
-  const char *pathname,
-  int         mode
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item EACCES
-The requested access would be denied, either to the file itself or
-one of the directories in @code{pathname}.
-
-@item EFAULT
-@code{pathname} points outside your accessible address space.
-
-@item EINVAL
-@code{Mode} was incorrectly specified.
-
-@item ENAMETOOLONG
-@code{pathname} is too long.
-
-@item ENOENT
-A directory component in @code{pathname} would have been accessible but
-does not exist or was a dangling symbolic link.
-
-@item ENOTDIR
-A component used as a directory in @code{pathname} is not, in fact, 
-a directory.
-
-@item ENOMEM
-Insufficient kernel memory was available.
-
-@end table
-
-@subheading DESCRIPTION:
-
-@code{Access} checks whether the process would be allowed to read, write or 
-test for existence of the file (or other file system object) whose name is 
-@code{pathname}.  If @code{pathname} is a symbolic link permissions of the 
-file referred by this symbolic link are tested.
-
-@code{Mode} is a mask consisting of one or more of R_OK, W_OK, X_OK and F_OK.
-
-@subheading NOTES:
-
-NONE
-
-@page
-@subsection chmod - Changes file mode.
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <sys/types.h>
-#include <sys/stat.h>
-
-int chmod(
-  const char *path,
-  mode_t      mode
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item EACCES
-Search permission is denied for a directory in a file's path prefix
-
-@item ENAMETOOLONG
-Length of a filename string exceeds PATH_MAX and _POSIX_NO_TRUNC is in
-effect.
-
-@item ENOENT
-A file or directory does not exist.
-
-@item ENOTDIR
-A component of the specified pathname was not a directory when a directory
-was expected.
-
-@item EPERM
-Operation is not permitted.  Process does not have the appropriate priviledges
-or permissions to perform the requested operations.
-
-@item EROFS
-Read-only file system.
-
-@end table
-
-@subheading DESCRIPTION:
-
-Set the file permission bits, the set user ID bit, and the set group ID bit 
-for the file named by @code{path} to @code{mode}.  If the effective user ID 
-does not match the owner of the file and the calling process does not have 
-the appropriate privileges, @code{chmod()} returns -1 and sets @code{errno} to
-@code{EPERM}.
-
-@subheading NOTES:
-
-NONE
-
-@page
-@subsection fchmod - Changes permissions of a file 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <sys/types.h>
-#include <sys/stat.h>
-
-int fchmod(
-  int    fildes, 
-  mode_t mode
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item EACCES
-Search permission is denied for a directory in a file's path prefix.
-
-@item EBADF
-The descriptor is not valid.
-
-@item EFAULT
-@code{path} points outside your accessible address space.
-
-@item EIO
-A low-level I/o error occurred while modifying the inode.
-
-@item ELOOP
-@code{path} contains a circular reference
-
-@item ENAMETOOLONG
-Length of a filename string exceeds PATH_MAX and _POSIX_NO_TRUNC is
-in effect.
-
-@item ENOENT
-A file or directory does no exist.
-
-@item ENOMEM
-Insufficient kernel memory was avaliable.
-
-@item ENOTDIR
-A component of the specified pathname was not a directory when a 
-directory was expected.
-
-@item EPERM
-The effective UID does not match the owner of the file, and is not 
-zero
-
-@item EROFS
-Read-only file system
-@end table
-
-@subheading DESCRIPTION:
-
-The mode of the file given by @code{path} or referenced by 
-@code{filedes} is changed. 
-
-@subheading NOTES:
-
-NONE
-
-@page
-@subsection getdents - Get directory entries
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <unistd.h>
-#include <linux/dirent.h>
-#include <linux/unistd.h>
-
-long getdents(
-  int   dd_fd,
-  char *dd_buf,
-  int   dd_len
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-A successful call to @code{getdents} returns th the number of bytes read.  
-On end of directory, 0 is returned.  When an error occurs, -1 is returned, 
-and @code{errno} is set appropriately.
-
-@table @b
-@item EBADF
-Invalid file descriptor @code{fd}.
-
-@item EFAULT
-Argument points outside the calling process's address space.
-
-@item EINVAL
-Result buffer is too small.
-
-@item ENOENT
-No such directory.
-
-@item ENOTDIR
-File descriptor does not refer to a directory.
-
-@end table
-
-@subheading DESCRIPTION:
-
-@code{getdents} reads several @code{dirent} structures from the directory
-pointed by @code{fd} into the memory area pointed to by @code{dirp}.  The
-parameter @code{count} is the size of the memory area.  
-
-@subheading NOTES:
-
-NONE
-
-@page
-@subsection chown - Changes the owner and/or group of a file.
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <sys/types.h>
-#include <unistd.h>
-
-int chown(
-  const char *path,
-  uid_t       owner,
-  gid_t       group
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item EACCES
-Search permission is denied for a directory in a file's path prefix
-
-@item EINVAL
-Invalid argument
-
-@item ENAMETOOLONG
-Length of a filename string exceeds PATH_MAX and _POSIX_NO_TRUNC is in
-effect.
-
-@item ENOENT
-A file or directory does not exist.
-
-@item ENOTDIR
-A component of the specified pathname was not a directory when a directory
-was expected.
-
-@item EPERM
-Operation is not permitted.  Process does not have the appropriate priviledges
-or permissions to perform the requested operations.
-
-@item EROFS
-Read-only file system.
-
-@end table
-
-@subheading DESCRIPTION:
-
-The user ID and group ID of the file named by @code{path} are set to 
-@code{owner} and @code{path}, respectively.
-
-For regular files, the set group ID (S_ISGID) and set user ID (S_ISUID)
-bits are cleared.
-
-Some systems consider it a security violation to allow the owner of a file to
-be changed,  If users are billed for disk space usage, loaning a file to 
-another user could result in incorrect billing.  The @code{chown()} function
-may be restricted to privileged users for some or all files.  The group ID can
-still be changed to one of the supplementary group IDs.
-
-@subheading NOTES:
-
-This function may be restricted for some file.  The @code{pathconf} function
-can be used to test the @code{_PC_CHOWN_RESTRICTED} flag.
-
-
-
-@page
-@subsection utime - Change access and/or modification times of an inode 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <sys/types.h>
-
-int utime(
-  const char     *filename,
-  struct utimbuf *buf
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item EACCES
-Permission to write the file is denied
-
-@item ENOENT
-@code{Filename} does not exist
-
-@end table
-
-@subheading DESCRIPTION:
-
-@code{Utime} changes the access and modification times of the inode
-specified by @code{filename} to the @code{actime} and @code{modtime}
-fields of @code{buf} respectively.  If @code{buf} is NULL, then the 
-access and modification times of the file are set to the current time.  
-
-@subheading NOTES:
-
-NONE
-
-@page
-@subsection ftruncate - truncate a file to a specified length
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <unistd.h>
-
-int ftrunctate(
-  int     fd,
-  size_t  length
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item ENOTDIR
-A component of the path prefix is not a directory.
-
-@item EINVAL
-The pathname contains a character with the high-order bit set.
-
-@item ENAMETOOLONG
-A component of a pathname exceeded 255 characters, or an entire
-path name exceeded 1023 characters.
-
-@item ENOENT
-The named file does not exist.
-
-@item EACCES
-The named file is not writable by the user.
-
-@item EACCES
-Search permission is denied for a component of the path prefix.
-
-@item ELOOP
-Too many symbolic links were encountered in translating the 
-pathname
-
-@item EISDIR
-The named file is a directory.
-
-@item EROFS
-The named file resides on a read-only file system
-
-@item ETXTBSY
-The file is a pure procedure (shared text) file that is being 
-executed
-
-@item EIO
-An I/O error occurred updating the inode.
-
-@item EFAULT
-@code{Path} points outside the process's allocated address space.
-
-@item EBADF
-The @code{fd} is not a valid descriptor.
-
-@end table
-
-@subheading DESCRIPTION:
-
-@code{truncate()} causes the file named by @code{path} or referenced by 
-@code{fd} to be truncated to at most @code{length} bytes in size.  If the  
-file previously was larger than this size, the extra data is lost.  With 
-@code{ftruncate()}, the file must be open for writing.
-
-@subheading NOTES:
-
-NONE
-
-@page
-@subsection truncate - truncate a file to a specified length
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <unistd.h>
-
-int trunctate(
-  const char *path,
-  size_t      length
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item ENOTDIR
-A component of the path prefix is not a directory.
-
-@item EINVAL
-The pathname contains a character with the high-order bit set.
-
-@item ENAMETOOLONG
-A component of a pathname exceeded 255 characters, or an entire
-path name exceeded 1023 characters.
-
-@item ENOENT
-The named file does not exist.
-
-@item EACCES
-The named file is not writable by the user.
-
-@item EACCES
-Search permission is denied for a component of the path prefix.
-
-@item ELOOP
-Too many symbolic links were encountered in translating the 
-pathname
-
-@item EISDIR
-The named file is a directory.
-
-@item EROFS
-The named file resides on a read-only file system
-
-@item ETXTBSY
-The file is a pure procedure (shared text) file that is being 
-executed
-
-@item EIO
-An I/O error occurred updating the inode.
-
-@item EFAULT
-@code{Path} points outside the process's allocated address space.
-
-@item EBADF
-The @code{fd} is not a valid descriptor.
-
-@end table
-
-@subheading DESCRIPTION:
-
-@code{truncate()} causes the file named by @code{path} or referenced by 
-@code{fd} to be truncated to at most @code{length} bytes in size.  If the  
-file previously was larger than this size, the extra data is lost.  With 
-@code{ftruncate()}, the file must be open for writing.
-
-@subheading NOTES:
-
-NONE
-
-@page
-@subsection pathconf - Gets configuration values for files
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <unistd.h>
-
-int pathconf(
-  const char *path,
-  int         name
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item EINVAL
-Invalid argument
-
-@item EACCES
-Permission to write the file is denied
-
-@item ENAMETOOLONG
-Length of a filename string exceeds PATH_MAX and _POSIX_NO_TRUNC
-is in effect.
-
-@item ENOENT
-A file or directory does not exist
-
-@item ENOTDIR
-A component of the specified @code{path} was not a directory whan a 
-directory was expected.
-
-@end table
-
-@subheading DESCRIPTION:
-
-@code{pathconf()} gets a value for the configuration option @code{name}
-for the open file descriptor @code{filedes}.
-
-The possible values for @code{name} are:
-
-@table @b
-@item _PC_LINK_MAX
-returns the maximum number of links to the file.  If @code{filedes} or 
-@code{path} refer to a directory, then the value applies to the whole
-directory.  The corresponding macro is @code{_POSIX_LINK_MAX}.
-
-@item _PC_MAX_CANON
-returns  the maximum length of a formatted input line, where @code{filedes}
-or @code{path} must refer to a terminal.  The corresponding macro is 
-@code{_POSIX_MAX_CANON}.
-
-@item _PC_MAX_INPUT
-returns the maximum length of an input line, where @code{filedes} or 
-@code{path} must refer to a terminal.  The corresponding macro is 
-@code{_POSIX_MAX_INPUT}.
-
-@item _PC_NAME_MAX
-returns the maximum length of a filename in the directory @code{path} or 
-@code{filedes}.  The process is allowed to create. The corresponding macro 
-is @code{_POSIX_NAME_MAX}.
-
-@item _PC_PATH_MAX
-returns the maximum length of a relative pathname when @code{path} or 
-@code{filedes} is the current working directory.  The corresponding macro 
-is @code{_POSIX_PATH_MAX}.
-
-@item _PC_PIPE_BUF
-returns the size of the pipe buffer, where @code{filedes} must refer to a 
-pipe or FIFO and @code{path} must refer to a FIFO.  The corresponding macro 
-is @code{_POSIX_PIPE_BUF}.
-
-@item _PC_CHOWN_RESTRICTED
-returns nonzero if the chown(2) call may not be used on this file.  If 
-@code{filedes} or @code{path} refer to a directory, then this applies to all 
-files in that directory.  The corresponding macro is
-@code{_POSIX_CHOWN_RESTRICTED}.
-
-@end table
-
-@subheading NOTES:
-
-Files with name lengths longer than the value returned for @code{name} equal 
-@code{_PC_NAME_MAX} may exist in the given directory.
-
-@page
-@subsection fpathconf - Gets configuration values for files
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <unistd.h>
-
-int fpathconf(
-  int filedes, 
-  int name
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item EINVAL
-Invalid argument
-
-@item EACCES
-Permission to write the file is denied
-@item ENAMETOOLONG
-
-Length of a filename string exceeds PATH_MAX and _POSIX_NO_TRUNC
-is in effect.
-
-@item ENOENT
-A file or directory does not exist
-
-@item ENOTDIR
-A component of the specified @code{path} was not a directory whan a 
-directory was expected.
-
-@end table
-
-
-@subheading DESCRIPTION:
-
-@code{pathconf()} gets a value for the configuration option @code{name}
-for the open file descriptor @code{filedes}.
-
-The possible values for name are:
-
-@table @b
-@item _PC_LINK_MAX
-returns the maximum number of links to the file.  If @code{filedes} or 
-@code{path} refer to a directory, then the value applies to the whole
-directory.  The corresponding macro is _POSIX_LINK_MAX.
-
-@item _PC_MAX_CANON
-returns  the maximum length of a formatted input line, where @code{filedes}
-or @code{path} must refer to a terminal.  The corresponding macro is 
-@code{_POSIX_MAX_CANON}.
-
-@item _PC_MAX_INPUT
-returns the maximum length of an input line, where @code{filedes} or 
-@code{path} must refer to a terminal.  The corresponding macro is 
-@code{_POSIX_MAX_INPUT}.
-
-@item _PC_NAME_MAX
-returns the maximum length of a filename in the directory @code{path} or 
-@code{filedes}.  The process is allowed to create. The corresponding macro 
-is @code{_POSIX_NAME_MAX}.
-
-@item _PC_PATH_MAX
-returns the maximum length of a relative pathname when @code{path} or 
-@code{filedes} is the current working directory.  The corresponding macro 
-is @code{_POSIX_PATH_MAX}.
-
-@item _PC_PIPE_BUF
-returns the size of the pipe buffer, where @code{filedes} must refer to a 
-pipe or FIFO and @code{path} must refer to a FIFO.  The corresponding macro 
-is @code{_POSIX_PIPE_BUF}.
-
-@item _PC_CHOWN_RESTRICTED
-returns nonzero if the @code{chown()} call may not be used on this file.  If 
-@code{filedes} or @code{path} refer to a directory, then this applies to all 
-files in that directory.  The corresponding macro is
-@code{_POSIX_CHOWN_RESTRICTED}.
-
-@end table
-
-@subheading NOTES:
-
-NONE
-
-@page
-@subsection mknod - create a directory
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
-long mknod(
-  const char *pathname,
-  mode_t      mode,
-  dev_t       dev
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@code{mknod} returns zero on success, or -1 if an error occurred (in which case, 
-errno is set appropriately).
-
-@table @b
-@item ENAMETOOLONG
-@code{pathname} was too long.
-
-@item ENOENT
-A directory component in @code{pathname} does not exist or is a dangling symbolic
-link.
-
-@item ENOTDIR
-A component used in the directory @code{pathname} is not, in fact, a directory.
-
-@item ENOMEM
-Insufficient kernel memory was available
-
-@item EROFS
-@code{pathname} refers to a file on a read-only filesystem.
-
-@item ELOOP
-@code{pathname} contains a reference to a circular symbolic link, ie a symbolic
-link whose expansion contains a reference to itself.
-
-@item ENOSPC
-The device containing @code{pathname} has no room for the new node.
-
-@end table
-
-@subheading DESCRIPTION:
-
-@code{mknod} attempts to create a filesystem node (file, device special file or
-named pipe) named @code{pathname}, specified by @code{mode} and @code{dev}.
-
-@code{mode} specifies both the permissions to use and the type of node to be created.
-
-It should be a combination (using bitwise OR) of one of the file types listed
-below and the permissions for the new node.
-
-The permissions are modified by the process's @code{umask} in the usual way: the 
-permissions of the created node are @code{(mode & ~umask)}.
-
-The file type should be one of @code{S_IFREG}, @code{S_IFCHR}, @code{S_IFBLK} and 
-@code{S_IFIFO} to specify a normal file (which will be created empty), character 
-special file, block special file or FIFO (named pipe), respectively, or zero, which 
-will create a normal file.
-
-If the file type is @code{S_IFCHR} or @code{S_IFBLK} then @code{dev} specifies the major  
-and minor numbers of the newly created device special file; otherwise it is ignored.
-
-The newly created node will be owned by the effective uid of the process.  If the
-directory containing the node has the set group id bit set, or if the filesystem
-is mounted with BSD group semantics, the new node will inherit the group ownership
-from its parent directory; otherwise it will be owned by the effective gid of the 
-process.
-
-
-@subheading NOTES:
-
-NONE
diff --git a/doc/new_chapters/gen_section b/doc/new_chapters/gen_section
deleted file mode 100644
index d3b8bde58f..0000000000
--- a/doc/new_chapters/gen_section
+++ /dev/null
@@ -1,212 +0,0 @@
-#
-#  This shell script generates the starting template for a manager chapter.
-#
-
-
-# Set this based on which chapter you want to generate a template for.
-chapter=$1
-
-case ${chapter} in 
-  process)
-    CHAPTER_CAPS="Process Creation and Execution"
-    CHAPTER_LOWER="process creation and execution"
-    ROUTINES="fork execl execv execle execve execlp execvp pthread_atfork \
-      wait waitpid _exit"
-    ;;
-  procenv)
-    CHAPTER_CAPS="Process Environment"
-    CHAPTER_LOWER="process environment"
-    ROUTINES="getpid getppid getuid geteuid getgid getegid setuid setgid \
-      getgroups getlogin getlogin_r getpgrp setsid setpgid uname times \
-      getenv ctermid ttyname ttyname_r isatty sysconf "
-    ;;
-  files)
-    CHAPTER_CAPS="Files and Directories"
-    CHAPTER_LOWER="files and directories"
-    ROUTINES="opendir readdir readdir_r rewinddir closedir \
-       chdir getcwd open creat umask link mkdir mkfifo unlink \
-       rmdir rename stat fstat access chmod fchmod chown \
-       utime ftrunctate pathconf fpathconf"
-    ;;
-  io)
-    CHAPTER_CAPS="Input and Output Primitives"
-    CHAPTER_LOWER="input and output primitives"
-    ROUTINES="pipe dup dup2 close read write fcntl lseek fsynch fdatasynch \
-       aio_read aio_write lio_listio aio_error aio_return aio_cancel \
-       aio_suspend aio_fsync"
-    ;;
-  device)
-    CHAPTER_CAPS="Device- and Class- Specific Functions"
-    CHAPTER_LOWER="device- and class- specific functions"
-    ROUTINES="cfgetispeed cfgetospeed cfsetispeed cfsetospeed tcgetattr \
-       tcsetattr tcsendbreak tcdrain tcflush tcflow tcgetpgrp tcsetpgrp"
-    ;;
-  cspecific)
-    CHAPTER_CAPS="Language-Specific Services for the C Programming Language"
-    CHAPTER_LOWER="language-specific services for the C programming language"
-    ROUTINES="setlocale fileno fdopen flcokfile ftrylockfile funlockfile \
-       getc_unlocked getchar_unlocked putc_unlocked putchar_unlocked \
-       setjmp longjmp sigsetjmp siglongjmp tzset strtok_r asctime_r \
-       ctime_r gmtime_r localtime_r rand_r"
-    ;;
-  systemdb)
-    CHAPTER_CAPS="System Databases"
-    CHAPTER_LOWER="system databases"
-    ROUTINES="getgrgid getgrgid_r getgrnam getgrnam_r getpwuid getpwuid_r \
-       getpwnam getpwnam_r"
-    ;;
-  semaphores)
-    CHAPTER_CAPS="Semaphores"
-    CHAPTER_LOWER="semaphore"
-    ROUTINES="sem_init sem_destroy sem_open sem_close sem_unlink sem_wait \
-       sem_trywait sem_post sem_getvalue"
-    ;;
-  memorymgmt)
-    CHAPTER_CAPS="Memory Management"
-    CHAPTER_LOWER="memory management"
-    ROUTINES="mlockall munlockall mlock munlock mmap munmap mprotect \
-       msync shm_open shm_unlink"
-    ;;
-  message)
-    CHAPTER_CAPS="Message Passing"
-    CHAPTER_LOWER="message passing"
-    ROUTINES="mq_open mq_close mq_unlink mq_send mq_receive mq_notify \
-       mq_setattr mq_getattr"
-    ;;
-  cancel)
-    CHAPTER_CAPS="Thread Cancellation"
-    CHAPTER_LOWER="thread cancellation"
-    ROUTINES="pthread_cancel pthread_setcancelstate pthread_setcanceltype \
-       pthread_testcancel pthread_cleanup_push"
-    ;;
-  eventlog)
-    CHAPTER_CAPS="Event Logging"
-    CHAPTER_LOWER="event logging"
-    ROUTINES="log_write log_open log_read log_notify log_close log_seek \
-       log_severity_before log_facilityemptyset log_facilityfillset \
-       log_facilityaddset log_facilitydelset log_facilityismember"
-    ;;
-  dumpcontrol)
-    CHAPTER_CAPS="Process Dump Control"
-    CHAPTER_LOWER="process dump control"
-    ROUTINES="dump_setpath"
-    ;;
-  confspace)
-    CHAPTER_CAPS="Configuration Space"
-    CHAPTER_LOWER="configuration space"
-    ROUTINES="cfg_mount cfg_unmount cfg_mknod cfg_get cfg_set cfg_link \
-       cfg_unlink cfg_open cfg_read cfg_children cfg_mark cfg_close"
-    ;;
-  adminiface)
-    CHAPTER_CAPS="Administration Interface"
-    CHAPTER_LOWER="administration interface"
-    ROUTINES="admin_shutdown"
-    ;;
-  # XXX this is not all of the C Library Stuff
-  libc_ctype)
-    CHAPTER_CAPS="C Library Character Handling"
-    CHAPTER_LOWER="character handling"
-    ROUTINES="isalnum isalpha iscntrl isdigit isgraph islower isprint \
-        ispunct isspace isupper isxdigit tolower toupper"
-    ;;
-  libc_math)
-    CHAPTER_CAPS="C Math Library"
-    CHAPTER_LOWER="math library"
-    ROUTINES="acos asis atan atan2 cos sin tan cosh sinh tanh exp frexp ldexp
-      log log10 modf pow sqrt ceil fabs floor fmod"
-    ;;
-  libc_io)
-    CHAPTER_CAPS="C Library IO"
-    CHAPTER_LOWER="C Library IO"
-    ROUTINES="clearerr fclose feof ferror fflush fgetc fgets fopen fputc \
-        fputs fread freopen fseek ftell fwrite getc getchar gets perror \
-        printf fprintf sprintf putc putchar puts remove rename rewind \
-        scanf fscanf sscanf setbuf tempfile tmpnam ungetc"
-    ;;
-  libc_string)
-    CHAPTER_CAPS="C Library String Handling"
-    CHAPTER_LOWER="string handling"
-    ROUTINES="strcpy strncpy strcat strncat strcmp strncmp strchr strcspn \
-       strpbrk strrchr strspn strstr strtok stlen"
-    ;;
-  *)
-    echo "Unknown chapter name"
-    exit 1
-    ;;
-esac
-
-if [ "x${CHAPTER_CAPS}" = "x" -o "x${CHAPTER_LOWER}" = "x" \
-     -o "x${ROUTINES}" = "x" ] ; then
-  echo "initialization problem"
-  exit 1
-fi
-
-echo "@c"
-echo "@c  COPYRIGHT (c) 1988-1998."
-echo "@c  On-Line Applications Research Corporation (OAR)."
-echo "@c  All rights reserved. "
-echo "@c"
-echo "@c  \$Id\$"
-echo "@c"
-echo ""
-echo "@chapter ${CHAPTER_CAPS}" Manager
-echo ""
-echo "@section Introduction"
-echo ""
-echo "The "
-echo "${CHAPTER_LOWER} manager is ..."
-echo ""
-echo "The directives provided by the ${CHAPTER_LOWER} manager are:"
-echo ""
-echo "@itemize @bullet"
-
-for routine in ${ROUTINES}
-do
-  echo "@item @code{${routine}} - "
-done
-echo "@end itemize"
-
-echo ""
-echo "@section Background"
-echo ""
-echo "@section Operations"
-echo ""
-echo "@section Directives"
-echo ""
-echo "This section details the ${CHAPTER_LOWER} manager's directives."
-echo "A subsection is dedicated to each of this manager's directives"
-echo "and describes the calling sequence, related constants, usage,"
-echo "and status codes."
-echo ""
-
-for routine in ${ROUTINES}
-do
-  echo "@page"
-  echo "@subsection ${routine} - "
-  echo ""
-  echo "@subheading CALLING SEQUENCE:"
-  echo ""
-  echo "@ifset is-C"
-  echo "@example"
-  echo "int ${routine}("
-  echo ");"
-  echo "@end example"
-  echo "@end ifset"
-  echo ""
-  echo "@ifset is-Ada"
-  echo "@end ifset"
-  echo ""
-  echo "@subheading STATUS CODES:"
-  echo ""
-  echo "@table @b"
-  echo "@item E"
-  echo "The"
-  echo ""
-  echo "@end table"
-  echo ""
-  echo "@subheading DESCRIPTION:"
-  echo ""
-  echo "@subheading NOTES:"
-  echo ""
-done
-
diff --git a/doc/new_chapters/io.t b/doc/new_chapters/io.t
deleted file mode 100644
index 17ff64e772..0000000000
--- a/doc/new_chapters/io.t
+++ /dev/null
@@ -1,1085 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved. 
-@c
-@c  $Id$
-@c
-
-@chapter Input and Output Primitives Manager
-
-@section Introduction
-
-The input and output primitives manager is ...
-
-The directives provided by the input and output primitives manager are:
-
-@itemize @bullet
-@item @code{pipe} - YYY
-@item @code{dup} - Duplicates an open file descriptor
-@item @code{dup2} - Duplicates an open file descriptor
-@item @code{close} - Closes a file
-@item @code{read} - Reads from a file
-@item @code{write} - Writes to a file
-@item @code{fcntl} - Manipulates an open file descriptor
-@item @code{lseek} - Reposition read/write file offset
-@item @code{fsync} - Synchronize a file's complete in-core state with that on disk
-@item @code{fdatasync} - synchronize a file's in-core data with that on disk
-@item @code{mount} - Mount a file system
-@item @code{umount} - Unmount file systems
-@item @code{aio_read} - YYY
-@item @code{aio_write} - YYY
-@item @code{lio_listio} - YYY
-@item @code{aio_error} - YYY
-@item @code{aio_return} - YYY
-@item @code{aio_cancel} - YYY
-@item @code{aio_suspend} - YYY
-@item @code{aio_fsync} - YYY
-@end itemize
-
-@section Background
-
-There is currently no text in this section.
-
-@section Operations
-
-There is currently no text in this section.
-
-@section Directives
-
-This section details the input and output primitives manager's directives.
-A subsection is dedicated to each of this manager's directives
-and describes the calling sequence, related constants, usage,
-and status codes.
-
-@page
-@subsection pipe - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int pipe(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-This routine is not currently supported by RTEMS but could be 
-in a future version.
-
-@page
-@subsection dup - Duplicates an open file descriptor
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <unistd.h>
-
-int dup(
-  int fildes
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item EBADF
-Invalid file descriptor.
-
-@item EINTR
-Function was interrupted by a signal.
-
-@item EMFILE
-The process already has the maximum number of file descriptors open 
-and tried to open a new one.
-@end table
-
-@subheading DESCRIPTION:
-
-The @code{dup} function returns the lowest numbered available file 
-descriptor.  This new desciptor refers to the same open file as the
-original descriptor and shares any locks.
-
-@subheading NOTES: 
-
-NONE
-
-@page
-@subsection dup2 - Duplicates an open file descriptor
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <unistd.h>
-
-int dup2(
-  int fildes,
-  int fildes2
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item EBADF
-Invalid file descriptor.
-
-@item EINTR
-Function was interrupted by a signal.
-
-@item EMFILE
-The process already has the maximum number of file descriptors open 
-and tried to open a new one.
-@end table
-
-@subheading DESCRIPTION:
-
-@code{Dup2} creates a copy of the file descriptor @code{oldfd}.
-
-The old and new descriptors may be used interchangeably.  They share locks, file
-position pointers and flags; for example, if the file position is modified by using
-@code{lseek} on one of the descriptors, the position is also changed for the other.
-
-@subheading NOTES: 
-
-NONE
-
-@page
-@subsection close - Closes a file. 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <unistd.h>
-
-int close(
-  int fildes
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item EBADF
-Invalid file descriptor
-
-@item EINTR
-Function was interrupted by a signal.
-@end table
-
-@subheading DESCRIPTION:
-
-The @code{close()} function deallocates the file descriptor named by
-@code{fildes} and makes it available for reuse.  All outstanding 
-record locks owned by this process for the file are unlocked.
-
-@subheading NOTES:
-
-A signal can interrupt the @code{close()} function.  In that case,
-@code{close()} returns -1 with @code{errno} set to EINTR.  The file
-may or may not be closed.
-
-@page
-@subsection read - Reads from a file.
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <unistd.h>
-
-int read(
-  int           fildes,
-  void         *buf,
-  unsigned int  nbyte
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-On error, this routine returns -1 and sets @code{errno} to one of
-the following:
- 
-@table @b
-@item EAGAIN
-The O_NONBLOCK flag is set for a file descriptor and the process
-would be delayed in the I/O operation.
-
-@item EBADF
-Invalid file descriptor
-
-@item EINTR
-Function was interrupted by a signal.
-
-@item EIO
-Input or output error
-
-@end table
-
-@subheading DESCRIPTION:
-
-The @code{read()} function reads @code{nbyte} bytes from the file 
-associated with @code{fildes} into the buffer pointed to by @code{buf}.
-
-The @code{read()} function returns the number of bytes actually read
-and placed in the buffer. This will be less than @code{nbyte} if:
-
-@itemize @bullet
-
-@item The number of bytes left in the file is less than @code{nbyte}.
-
-@item The @code{read()} request was interrupted by a signal.
-
-@item The file is a pipe or FIFO or special file with less than @code{nbytes}
-immediately available for reading.
-
-@end itemize
-
-When attempting to read from any empty pipe or FIFO:
-
-
-@itemize @bullet
-
-@item If no process has the pipe open for writing, zero is returned to 
-indicate end-of-file.
-
-@item If some process has the pipe open for writing and O_NONBLOCK is set,
--1 is returned and @code{errno} is set to EAGAIN.
-
-@item If some process has the pipe open for writing and O_NONBLOCK is clear,
-@code{read()} waits for some data to be written or the pipe to be closed.
-
-@end itemize
-
-
-When attempting to read from a file other than a pipe or FIFO and no data
-is available.
-
-@itemize @bullet
-
-@item If O_NONBLOCK is set, -1 is returned and @code{errno} is set to EAGAIN.
-
-@item If O_NONBLOCK is clear, @code{read()} waits for some data to become 
-available.
-
-@item The O_NONBLOCK flag is ignored if data is available.
-
-@end itemize
-
-@subheading NOTES:
-
-NONE
-
-@page
-@subsection write - Writes to a file
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <unistd.h>
-
-int write(
-  int           fildes,
-  const void   *buf,
-  unsigned int  nbytes
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item EAGAIN
-The O_NONBLOCK flag is set for a file descriptor and the process
-would be delayed in the I/O operation.
-
-@item EBADF
-Invalid file descriptor
-
-@item EFBIG
-An attempt was made to write to a file that exceeds the maximum file 
-size
-
-@item EINTR
-The function was interrupted by a signal.
-
-@item EIO
-Input or output error.
-
-@item ENOSPC
-No space left on disk.
-
-@item EPIPE
-Attempt to write to a pope or FIFO with no reader.
-
-@end table
-
-@subheading DESCRIPTION:
-
-The @code{write()} function writes @code{nbyte} from the array pointed
-to by @code{buf} into the file associated with @code{fildes}.
-
-If @code{nybte} is zero and the file is a regular file, the @code{write()}
-function returns zero and has no other effect.  If @code{nbyte} is zero
-and the file is a special file, te results are not portable.
-
-The @code{write()} function returns the number of bytes written.  This 
-number will be less than @code{nbytes} if there is an error.  It will never
-be greater than @code{nbytes}.
-
-@subheading NOTES: 
-
-NONE
-
-@page
-@subsection fcntl - Manipulates an open file descriptor
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <sys/types.h>
-#include <fcntl.h>
-#include <unistd.h>
-
-int fcntl(
-  int   fildes,
-  int   cmd
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item EACCESS
-Search permission is denied for a direcotry in a file's path
-prefix.
-
-@item EAGAIN
-The O_NONBLOCK flag is set for a file descriptor and the process
-would be delayed in the I/O operation.
-
-@item EBADF
-Invalid file descriptor
-
-@item EDEADLK
-An @code{fcntl} with function F_SETLKW would cause a deadlock.
-
-@item EINTR
-The functioin was interrupted by a signal.
-
-@item EINVAL
-Invalid argument
-
-@item EMFILE
-Too many file descriptor or in use by the process.
-
-@item ENOLCK
-No locks available
-
-@end table
-
-@subheading DESCRIPTION:
-
-@code{fcntl()} performs one of various miscellaneous operations on
-@code{fd}.  The operation in question is determined by @code{cmd}:
-
-@table @b 
-
-@item F_DUPFD  
-Makes @code{arg} be a copy of @code{fd}, closing @code{fd} first if necessary.
-
-The same functionality can be more easily achieved by using @code{dup2()}.
-
-The old and new descriptors may be used interchangeably. They share locks, 
-file position pointers and flags;  for example, if the file position is 
-modified by using @code{lseek()} on one of the descriptors, the position is  
-also changed for the other.
-
-The two descriptors do not share the close-on-exec flag, however.  The 
-close-on-exec flag of the copy is off, meaning that it will be closed on 
-exec.
-
-On success, the new descriptor is returned.
-
-@item F_GETFD  
-Read the close-on-exec flag.  If the low-order bit is 0, the file will 
-remain open across exec, otherwise it will be closed.
-
-@item F_SETFD  
-Set the close-on-exec flag to the value specified by @code{arg} (only the least 
-significant bit is used).
-
-@item F_GETFL  
-Read the descriptor's flags (all flags (as set by open()) are returned).
-
-@item F_SETFL  
-Set the descriptor's flags to the value specified by @code{arg}. Only  
-@code{O_APPEND} and @code{O_NONBLOCK} may be set.
-
-The flags are shared between copies (made with @code{dup()} etc.) of the same 
-file descriptor.
-
-The flags and their semantics are described in @code{open()}.
-
-@item F_GETLK, F_SETLK and F_SETLKW
-Manage discretionary file locks.  The third argument @code{arg} is a pointer to a 
-struct flock (that may be overwritten by this call).
-
-@item F_GETLK
-Return the flock structure that prevents us from obtaining the lock, or set the
-@code{l_type} field of the lock to @code{F_UNLCK} if there is no obstruction.
-
-@item F_SETLK
-The lock is set (when @code{l_type} is @code{F_RDLCK} or @code{F_WRLCK}) or 
-cleared (when it is @code{F_UNLCK}.  If lock is held by someone else, this
-call returns -1 and sets @code{errno} to EACCES or EAGAIN.
-
-@item F_SETLKW 
-Like @code{F_SETLK}, but instead of returning an error we wait for the lock to 
-be released.
-
-@item F_GETOWN 
-Get the process ID (or process group) of the owner of a socket.
-
-Process groups are returned as negative values.
-
-@item F_SETOWN 
-Set the process or process group that owns a socket.
-
-For these commands, ownership means receiving @code{SIGIO} or @code{SIGURG}
-signals.
-
-Process groups are specified using negative  values.
-
-@end table
-
-@subheading NOTES:
-
-The errors returned by @code{dup2} are different from those returned by
-@code{F_DUPFD}.
-
-@page
-@subsection lseek - Reposition read/write file offset
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <sys/types.h>
-#include <unistd.h>
-
-int lseek(
-  int   fildes,
-  off_t offset,
-  int whence
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item EBADF
-@code{Fildes} is not an open file descriptor.
-
-@item ESPIPE
-@code{Fildes} is associated with a pipe, socket or FIFO. 
-
-@item EINVAL
-@code{Whence} is not a proper value. 
-
-@end table
-
-@subheading DESCRIPTION:
-
-The @code{lseek} function repositions the offset of the file descriptor
-@code{fildes} to the argument offset according to the directive whence.   
-The argument @code{fildes} must be an open file descriptor. @code{Lseek}
-repositions the file pointer fildes as follows:
-
-@itemize @bullet
-
-@item 
-If @code{whence} is SEEK_SET, the offset is set to @code{offset} bytes.
-
-@item 
-If @code{whence} is SEEK_CUR, the offset is set to its current location
-plus offset bytes.
-
-@item 
-If @code{whence} is SEEK_END, the offset is set to the size of the
-file plus @code{offset} bytes.
-
-@end itemize
-
-The @code{lseek} function allows the file offset to be set beyond the end
-of the existing end-of-file of the file. If data is later written at this
-point, subsequent reads of the data in the gap return bytes of zeros
-(until data is actually written into the gap).
-
-Some devices are incapable of seeking.  The value of the pointer associated
-with such a device is undefined.
-
-@subheading NOTES: 
-
-NONE
-
-@page
-@subsection fsync - Synchronize a file's complete in-core state with that on disk
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int fsync(
-  int fd
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-On success, zero is returned.  On error, -1 is returned, and @code{errno}
-is set appropriately.
-
-@table @b
-@item EBADF
-@code{fd} is not a valid descriptor open for writing
-
-@item EINVAL
-@code{fd} is bound to a special file which does not support support synchronization
-
-@item EROFS
-@code{fd} is bound to a special file which does not support support synchronization
-
-@item EIO
-An error occurred during synchronization
-
-@end table
-
-@subheading DESCRIPTION:
-
-@code{fsync} copies all in-core parts of a file to disk.
-
-@subheading NOTES:
-
-NONE
-
-@page
-@subsection fdatasync - synchronize a file's in-core data with that on disk. 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int fdatasync(
-  int fd
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-On success, zero is returned.  On error, -1 is returned, and @code{errno} is
-set appropriately.
-
-@table @b
-@item EBADF
-@code{fd} is not a valid file descriptor open for writing.
-
-@item EINVAL
-@code{fd} is bound to a special file which does not support synchronization.
-
-@item EIO
-An error occurred during synchronization.
-
-@item EROFS
-@code{fd} is bound to a special file which dows not support synchronization.
-
-@end table
-
-@subheading DESCRIPTION:
-
-@code{fdatasync} flushes all data buffers of a file to disk (before the system call
-returns).  It resembles @code{fsync} but is not required to update the metadata such  
-as access time.
-
-Applications that access databases or log files often write a tiny data fragment
-(e.g., one line in a log file) and then call @code{fsync} immediately in order to  
-ensure that the written data is physically stored on the harddisk.  Unfortunately, 
-fsync will always initiate two write operations: one for the newly written data and 
-another one in order to update the modification time stored in the inode.  If the 
-modification time is not a part of the transaction concept @code{fdatasync} can be 
-used to avoid unnecessary inode disk write operations.
-
-@subheading NOTES:
-
-NONE
-
-@page
-@subsection mount - Mount a file system
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <sys/mount.h>
-#include <linux/fs.h>
-
-int mount(
-  const char *specialfile,
-  const char * dir,
-  const char * filesystemtype,
-  unsigned long rwflag,
-  const void * data
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item EPERM
-The user is not the super-user.
-
-@item ENODEV
-@code{filesystemtype} not configured in the kernel.
-
-@item ENOTBLK
-@code{specialfile} is not a block device (if a device was required).
-
-@item EBUSY
-@code{specialfile} is already mounted.  Or, it cannot be remounted
-read-only, because it still holds files open for writing.  Or, it 
-cannot be mounted on @code{dir} because @code{dir} is still busy
-(it is the working directory of some task, the mount point of another
-device, has open files, etc.).
-
-@item EINVAL
-@code{specialfile} had an invalid superblock.  Or, a remount was 
-attempted, while @code{specialfile} was not already mounted on @code{dir}.
-Or, an umount was attempted, while @code{dir} was not a mount point.
-
-@item EFAULT
-One of the pointer arguments points outside the user address space.
-
-@item ENOMEM
-The kernel could not allocate a free page to copy filenames or data into.
-
-@item ENAMETOOLONG
-A pathname was longer than MAXPATHLEN.
-
-@item ENOTDIR
-A pathname was empty or had a nonexistent component.
-
-@item EACCES
-A component of a path was not searchable.  Or, mounting a read-only 
-filesystem was attempted without giving the MS_RDONLY flag.  Or, the 
-block device @code{specialfile} is located on a filesystem mounted with
-the MS_NODEV option.
-
-@item ENXIO
-The major number of the block device @code{specialfile} is out of
-range.
-
-@item EMFILE
-(In case no block device is required:) Table of dummy devices is full.
-              
-@end table
-
-@subheading DESCRIPTION:
-
-@code{Mount} attaches the filesystem specified by @code{specialfile}
-(which is often a device name) to the directory specified by @code{dir}.
-
-Only the super-user may mount filesystems.
-
-The @code{filesystemtype} argument may take one of the values listed in
-/proc/filesystems (link "minix", "ext2", "msdos", "proc", "nfs", 
-"iso9660" etc.).
-
-The @code{rwflag} argument has the magic number 0xCOED in the top 16 bits,
-and various mount flags in the low order 16 bits.  If the magic number is
-absent, then the last two arguments are not used.
-
-The @code{data} argument is interpreted by the different file systems.
-
-@subheading NOTES:
-
-NONE
-
-@page
-@subsection umount - Umount file systems
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <sys/mount.h>
-#include <linux/fs.h>
-
-int umount(
-  const char *specialfile
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item EPERM
-The user is not the super-user.
-
-@item ENODEV
-@code{Filesystemtype} not configured in the kernel.
-
-@item ENOTBLK
-@code{Specialfile} is not a block device (if a device was required).
-
-@item EBUSY
-@code{Specialfile} is already mounted.  Or, it cannot be remounted
-read-only, because it still holds files open for writing.  Or, it 
-cannot be mounted on @code{dir} because @code{dir} is still busy
-(it is the working directory of some task, the mount point of another
-device, has open files, etc.).
-
-@item EINVAL
-@code{specialfile} had an invalid superblock.  Or, a remount was 
-attempted, while @code{specialfile} was not already mounted on @code{dir}.
-Or, an umount was attempted, while @code{dir} was not a mount point.
-
-@item EFAULT
-One of the pointer arguments points outside the user address space.
-
-@item ENOMEM
-The kernel could not allocate a free page to copy filenames or data into.
-
-@item ENAMETOOLONG
-A pathname was longer than MAXPATHLEN.
-
-@item ENOTDIR
-A pathname was empty or had a nonexistent component.
-
-@item EACCES
-A component of a path was not searchable.  Or, mounting a read-only 
-filesystem was attempted without giving the MS_RDONLY flag.  Or, the 
-block device @code{specialfile} is located on a filesystem mounted with
-the MS_NODEV option.
-
-@item ENXIO
-The major number of the block device @code{specialfile} is out of
-range.
-
-@item EMFILE
-(In case no block device is required:) Table of dummy devices is full.
-
-@end table
-
-@subheading DESCRIPTION:
-
-@code{Umount} removes the attachment of the filesystem specified
-by @code{specialfile} or @code{dir}.
-
-Only the super-user may umount filesystems.
-
-@subheading NOTES: 
-
-NONE
-
-@page
-@subsection aio_read - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int aio_read(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-This routine is not currently supported by RTEMS but could be 
-in a future version.
-
-@page
-@subsection aio_write - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int aio_write(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-This routine is not currently supported by RTEMS but could be 
-in a future version.
-
-@page
-@subsection lio_listio - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int lio_listio(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-This routine is not currently supported by RTEMS but could be 
-in a future version.
-
-@page
-@subsection aio_error - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int aio_error(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-This routine is not currently supported by RTEMS but could be 
-in a future version.
-
-@page
-@subsection aio_return - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int aio_return(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-This routine is not currently supported by RTEMS but could be 
-in a future version.
-
-@page
-@subsection aio_cancel - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int aio_cancel(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-This routine is not currently supported by RTEMS but could be 
-in a future version.
-
-@page
-@subsection aio_suspend - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int aio_suspend(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-This routine is not currently supported by RTEMS but could be 
-in a future version.
-
-@page
-@subsection aio_fsync - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int aio_fsync(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-This routine is not currently supported by RTEMS but could be 
-in a future version.
diff --git a/doc/new_chapters/key.t b/doc/new_chapters/key.t
deleted file mode 100644
index 58e34bb259..0000000000
--- a/doc/new_chapters/key.t
+++ /dev/null
@@ -1,140 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Key Manager
-
-@section Introduction
-
-The key manager ...
-
-The directives provided by the key manager are:
-
-@itemize @bullet
-@item @code{pthread_key_create} -
-@item @code{pthread_key_delete} -
-@item @code{pthread_setspecific} -
-@item @code{pthread_getspecific} -
-@end itemize
-
-@section Background
-
-There is currently no text in this section.
-
-@section Operations
-
-There is currently no text in this section.
-
-@section Directives
-
-This section details the key manager's directives.
-A subsection is dedicated to each of this manager's directives
-and describes the calling sequence, related constants, usage,
-and status codes.
-
-@page
-@subsection pthread_key_create
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_key_create(
-  pthread_key_t  *key,
-  void          (*destructor)( void * )
-);
-@end example
-
-@subheading STATUS CODES:
-
-@table @b
-@item EAGAIN
-There were not enough resources available to create another key.
-
-@item ENOMEM
-Insufficient memory exists to create the key.
-
-@end table
-
-@page
-@subsection pthread_key_delete
- 
-@subheading CALLING SEQUENCE:
- 
-@example
-#include <pthread.h>
- 
-int pthread_key_delete(
-  pthread_key_t  key,
-);
-@end example
- 
-@subheading STATUS CODES:
- 
-@table @b
-@item EINVAL
-The key was invalid
- 
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection pthread_setspecific
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_setspecific(
-  pthread_key_t  key,
-  const void    *value
-);
-@end example
-
-@subheading STATUS CODES:
-@table @b
-@item EINVAL
-The specified key is invalid.
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection pthread_getspecific
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-void *pthread_getspecific(
-  pthread_key_t  key
-);
-@end example
-
-@subheading STATUS CODES:
-@table @b
-@item NULL
-There is no thread-specific data associated with the specified key.
-
-@item non-NULL
-The data associated with the specified key.
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
diff --git a/doc/new_chapters/memorymgmt.t b/doc/new_chapters/memorymgmt.t
deleted file mode 100644
index 1aeaeb56a6..0000000000
--- a/doc/new_chapters/memorymgmt.t
+++ /dev/null
@@ -1,315 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved. 
-@c
-@c  $Id$
-@c
-
-@chapter Memory Management Manager
-
-@section Introduction
-
-The 
-memory management manager is ...
-
-The directives provided by the memory management manager are:
-
-@itemize @bullet
-@item @code{mlockall} - 
-@item @code{munlockall} - 
-@item @code{mlock} - 
-@item @code{munlock} - 
-@item @code{mmap} - 
-@item @code{munmap} - 
-@item @code{mprotect} - 
-@item @code{msync} - 
-@item @code{shm_open} - 
-@item @code{shm_unlink} - 
-@end itemize
-
-@section Background
-
-There is currently no text in this section.
-
-@section Operations
-
-There is currently no text in this section.
-
-@section Directives
-
-This section details the memory management manager's directives.
-A subsection is dedicated to each of this manager's directives
-and describes the calling sequence, related constants, usage,
-and status codes.
-
-@page
-@subsection mlockall - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int mlockall(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection munlockall - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int munlockall(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection mlock - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int mlock(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection munlock - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int munlock(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection mmap - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int mmap(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection munmap - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int munmap(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection mprotect - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int mprotect(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection msync - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int msync(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection shm_open - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int shm_open(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection shm_unlink - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int shm_unlink(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
diff --git a/doc/new_chapters/message.t b/doc/new_chapters/message.t
deleted file mode 100644
index d4b85ab788..0000000000
--- a/doc/new_chapters/message.t
+++ /dev/null
@@ -1,259 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved. 
-@c
-@c  $Id$
-@c
-
-@chapter Message Passing Manager
-
-@section Introduction
-
-The 
-message passing manager is ...
-
-The directives provided by the message passing manager are:
-
-@itemize @bullet
-@item @code{mq_open} - 
-@item @code{mq_close} - 
-@item @code{mq_unlink} - 
-@item @code{mq_send} - 
-@item @code{mq_receive} - 
-@item @code{mq_notify} - 
-@item @code{mq_setattr} - 
-@item @code{mq_getattr} - 
-@end itemize
-
-@section Background
-
-There is currently no text in this section.
-
-@section Operations
-
-There is currently no text in this section.
-
-@section Directives
-
-This section details the message passing manager's directives.
-A subsection is dedicated to each of this manager's directives
-and describes the calling sequence, related constants, usage,
-and status codes.
-
-@page
-@subsection mq_open - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int mq_open(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection mq_close - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int mq_close(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection mq_unlink - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int mq_unlink(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection mq_send - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int mq_send(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection mq_receive - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int mq_receive(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection mq_notify - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int mq_notify(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection mq_setattr - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int mq_setattr(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection mq_getattr - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int mq_getattr(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
diff --git a/doc/new_chapters/mutex.t b/doc/new_chapters/mutex.t
deleted file mode 100644
index d158e07dc9..0000000000
--- a/doc/new_chapters/mutex.t
+++ /dev/null
@@ -1,555 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Mutex Manager
-
-@section Introduction
-
-The mutex manager ...
-
-The directives provided by the mutex manager are:
-
-@itemize @bullet
-@item @code{pthread_mutexattr_init} - 
-@item @code{pthread_mutexattr_destroy} - 
-@item @code{pthread_mutexattr_setprotocol} - 
-@item @code{pthread_mutexattr_getprotocol} - 
-@item @code{pthread_mutexattr_setprioceiling} - 
-@item @code{pthread_mutexattr_getprioceiling} - 
-@item @code{pthread_mutexattr_setpshared} - 
-@item @code{pthread_mutexattr_getpshared} - 
-@item @code{pthread_mutex_init} - 
-@item @code{pthread_mutex_destroy} - 
-@item @code{pthread_mutex_lock} - 
-@item @code{pthread_mutex_trylock} - 
-@item @code{pthread_mutex_timedlock} - 
-@item @code{pthread_mutex_unlock} - 
-@item @code{pthread_mutex_setprioceiling} - 
-@item @code{pthread_mutex_getprioceiling} - 
-@end itemize
-
-@section Background
-
-There is currently no text in this section.
-
-@section Operations
-
-There is currently no text in this section.
-
-@section Directives
-
-This section details the mutex manager's directives.
-A subsection is dedicated to each of this manager's directives
-and describes the calling sequence, related constants, usage,
-and status codes.
-
-@page
-@subsection pthread_mutexattr_init
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_mutexattr_init(
-  pthread_mutexattr_t *attr
-);
-@end example
-
-@subheading STATUS CODES:
-
-@table @b
-@item EINVAL
-The attribute pointer argument is invalid.
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection pthread_mutexattr_destroy
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_mutexattr_destroy(
-  pthread_mutexattr_t *attr
-);
-@end example
-
-@subheading STATUS CODES:
-
-@table @b
-@item EINVAL
-The attribute pointer argument is invalid.
-
-@item EINVAL
-The attribute set is not initialized.
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection pthread_mutexattr_setprotocol
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_mutexattr_setprotocol(
-  pthread_mutexattr_t   *attr,
-  int                    protocol
-);
-@end example
-
-@subheading STATUS CODES:
-
-@table @b
-@item EINVAL
-The attribute pointer argument is invalid.
-
-@item EINVAL
-The attribute set is not initialized.
- 
-@item EINVAL
-The protocol argument is invalid.
- 
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection pthread_mutexattr_getprotocol
- 
-@subheading CALLING SEQUENCE:
- 
-@example
-#include <pthread.h>
- 
-int pthread_mutexattr_getprotocol(
-  pthread_mutexattr_t   *attr,
-  int                   *protocol
-);
-@end example
- 
-@subheading STATUS CODES:
- 
-@table @b
-@item EINVAL
-The attribute pointer argument is invalid.
-
-@item EINVAL
-The attribute set is not initialized.
- 
-@item EINVAL
-The protocol pointer argument is invalid.
- 
-@end table
- 
-@subheading DESCRIPTION:
- 
-@subheading NOTES:
-
-@page
-@subsection pthread_mutexattr_setprioceiling
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_mutexattr_setprioceiling(
-  pthread_mutexattr_t   *attr,
-  int                    prioceiling
-);
-@end example
-
-@subheading STATUS CODES:
- 
-@table @b
-@item EINVAL
-The attribute pointer argument is invalid.
-
-@item EINVAL
-The attribute set is not initialized.
- 
-@item EINVAL
-The prioceiling argument is invalid.
- 
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection pthread_mutexattr_getprioceiling
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_mutexattr_getprioceiling(
-  const pthread_mutexattr_t   *attr,
-  int                         *prioceiling
-);
-@end example
-
-@subheading STATUS CODES:
- 
-@table @b
-@item EINVAL
-The attribute pointer argument is invalid.
-
-@item EINVAL
-The attribute set is not initialized.
- 
-@item EINVAL
-The prioceiling pointer argument is invalid.
- 
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection pthread_mutexattr_setpshared
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_mutexattr_setpshared(
-  pthread_mutexattr_t   *attr,
-  int                    pshared
-);
-@end example
-
-@subheading STATUS CODES:
- 
-@table @b
-@item EINVAL
-The attribute pointer argument is invalid.
-
-@item EINVAL
-The attribute set is not initialized.
- 
-@item EINVAL
-The pshared argument is invalid.
- 
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection pthread_mutexattr_getpshared
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_mutexattr_getpshared(
-  const pthread_mutexattr_t   *attr,
-  int                         *pshared
-);
-@end example
-
-@subheading STATUS CODES:
- 
-@table @b
-@item EINVAL
-The attribute pointer argument is invalid.
-
-@item EINVAL
-The attribute set is not initialized.
- 
-@item EINVAL
-The pshared pointer argument is invalid.
- 
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection pthread_mutex_init
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_mutex_init(
-  pthread_mutex_t           *mutex,
-  const pthread_mutexattr_t *attr
-);
-@end example
-
-@subheading STATUS CODES:
-
-@table @b
-@item EINVAL
-The attribute set is not initialized.
- 
-@item EINVAL
-The specified protocol is invalid.
-
-@item EAGAIN
-The system lacked the necessary resources to initialize another mutex.
-
-@item ENOMEM
-Insufficient memory exists to initialize the mutex.
-
-@item EBUSY
-Attempted to reinialize the object reference by mutex, a previously
-initialized, but not yet destroyed.
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection pthread_mutex_destroy
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_mutex_destroy(
-  pthread_mutex_t           *mutex
-);
-@end example
-
-@subheading STATUS CODES:
- 
-@table @b
-@item EINVAL
-The specified mutex is invalid.
-
-@item EBUSY
-Attempted to destroy the object reference by mutex, while it is locked or
-referenced by another thread.
- 
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection pthread_mutex_lock
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_mutex_lock(
-  pthread_mutex_t           *mutex
-);
-@end example
-
-@subheading STATUS CODES:
-
-@table @b
-@item EINVAL
-The specified mutex is invalid.
-
-@item EINVAL
-The mutex has the protocol attribute of PTHREAD_PRIO_PROTECT and the 
-priority of the calling thread is higher than the current priority
-ceiling.
-
-@item EDEADLK
-The current thread already owns the mutex.
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection pthread_mutex_trylock
- 
-@subheading CALLING SEQUENCE:
- 
-@example
-#include <pthread.h>
- 
-int pthread_mutex_trylock(
-  pthread_mutex_t           *mutex
-);
-@end example
- 
-@subheading STATUS CODES:
- 
-@table @b
-@item EINVAL
-The specified mutex is invalid.
- 
-@item EINVAL
-The mutex has the protocol attribute of PTHREAD_PRIO_PROTECT and the
-priority of the calling thread is higher than the current priority
-ceiling.
- 
-@item EDEADLK
-The current thread already owns the mutex.
- 
-@end table
- 
-@subheading DESCRIPTION:
- 
-@subheading NOTES:
- 
-@page
-@subsection pthread_mutex_timedlock
- 
-@subheading CALLING SEQUENCE:
- 
-@example
-#include <pthread.h>
-#include <time.h>
- 
-int pthread_mutex_timedlock(
-  pthread_mutex_t           *mutex,
-  const struct timespec     *timeout
-);
-@end example
- 
-@subheading STATUS CODES:
- 
-@table @b
-@item EINVAL
-The specified mutex is invalid.
- 
-@item EINVAL
-The nanoseconds field of timeout is invalid.
-
-@item EINVAL
-The mutex has the protocol attribute of PTHREAD_PRIO_PROTECT and the
-priority of the calling thread is higher than the current priority
-ceiling.
- 
-@item EDEADLK
-The current thread already owns the mutex.
-
-@end table
- 
-@subheading DESCRIPTION:
- 
-@subheading NOTES:
- 
-
-@page
-@subsection pthread_mutex_unlock
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_mutex_unlock(
-  pthread_mutex_t           *mutex
-);
-@end example
-
-@subheading STATUS CODES:
-
-@table @b
-@item EINVAL
-The specified mutex is invalid.
- 
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection pthread_mutex_setprioceiling
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_mutex_setprioceiling(
-  pthread_mutex_t   *mutex,
-  int                prioceiling,
-  int               *oldceiling
-);
-@end example
-
-@subheading STATUS CODES:
- 
-@table @b
-@item EINVAL
-The oldceiling pointer parameter is invalid.
-
-@item EINVAL
-The prioceiling parameter is an invalid priority.
-
-@item EINVAL
-The specified mutex is invalid.
- 
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection pthread_mutex_getprioceiling
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_mutex_getprioceiling(
-  pthread_mutex_t   *mutex,
-  int               *prioceiling
-);
-@end example
-
-@subheading STATUS CODES:
- 
-@table @b
-@item EINVAL
-The prioceiling pointer parameter is invalid.
-
-@item EINVAL
-The specified mutex is invalid.
- 
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
diff --git a/doc/new_chapters/posix_users.texi b/doc/new_chapters/posix_users.texi
deleted file mode 100644
index 3fe66ed75c..0000000000
--- a/doc/new_chapters/posix_users.texi
+++ /dev/null
@@ -1,165 +0,0 @@
-\input ../texinfo/texinfo   @c -*-texinfo-*-
-@c %**start of header
-@setfilename posix_users_new
-@syncodeindex vr fn
-@synindex ky cp
-@paragraphindent 0
-@c @smallbook
-@c %**end of header
-
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@c
-@c   Master file for the C User's Guide
-@c
-
-@c Joel's Questions
-@c
-@c  1.  Why does paragraphindent only impact makeinfo?
-@c  2.  Why does paragraphindent show up in HTML?
-@c
-
-@include ../common/setup.texi
-
-@ignore
-@ifinfo
-@format
-START-INFO-DIR-ENTRY
-* RTEMS Posix API User's Guide: (posix_users).   Posix API User's Guide Plan
-END-INFO-DIR-ENTRY
-@end format
-@end ifinfo
-@end ignore
-
-@c variable substitution info:
-@c
-@c Note: At the moment we do not document the Ada interface but by building
-@c       in the infrastructure Florist support should be simple to add.
-@set is-C
-@clear is-Ada
-@set LANGUAGE C 
-@set STRUCTURE structure
-@set ROUTINE function
-@set OR |
-@set RPREFIX RTEMS_
-@set DIRPREFIX rtems_
-@c the language is @value{LANGUAGE}
-@c NOTE:  don't use underscore in the name
-@c
-
-@c
-@c  Title Page Stuff
-@c
-
-@set edition @value{RTEMS-EDITION}
-@set version @value{RTEMS-VERSION}
-@set update-date @value{RTEMS-UPDATE-DATE}
-@set update-month @value{RTEMS-UPDATE-MONTH}
-
-@c
-@c  I don't really like having a short title page.  --joel
-@c
-@c @shorttitlepage RTEMS POSIX API User's Guide
-
-@setchapternewpage odd
-@settitle RTEMS POSIX API User's Guide 
-@titlepage
-@finalout
-
-@title RTEMS POSIX API User's Guide
-@subtitle Edition @value{edition}, for RTEMS @value{version}
-@sp 1
-@subtitle @value{update-month}
-@author On-Line Applications Research Corporation
-@page
-@include ../common/cpright.texi
-@end titlepage
-
-@c  This prevents a black box from being printed on "overflow" lines.
-@c  The alternative is to rework a sentence to avoid this problem.
-
-@include preface.texi
-@include process.texi
-@include signal.texi
-@include procenv.texi
-@include files.texi
-@include io.texi
-@include device.texi
-@include cspecific.texi
-@include systemdb.texi
-@include semaphores.texi
-@include mutex.texi
-@include cond.texi
-@include memorymgmt.texi
-@include sched.texi
-@include clock.texi
-@include message.texi
-@include thread.texi
-@include key.texi
-@include cancel.texi
-@include eventlog.texi
-@include dumpcontrol.texi
-@include confspace.texi
-@include adminiface.texi
-@ifinfo
-@node Top, Preface, (dir), (dir)
-@top posix_users_new
-
-This is the online version of the RTEMS POSIX API User's Guide
-
-@menu
-* Preface::
-* Process Creation and Execution Manager::
-* Signal Manager::
-* Process Environment Manager::
-* Files and Directories Manager::
-* Input and Output Primitives Manager::
-* Device- and Class- Specific Functions Manager::
-* Language-Specific Services for the C Programming Language Manager::
-* System Databases Manager::
-* Semaphores Manager::
-* Mutex Manager::
-* Condition Variable Manager::
-* Memory Management Manager::
-* Scheduler Manager::
-* Clock Manager::
-* Message Passing Manager::
-* Thread Manager::
-* Key Manager::
-* Thread Cancellation Manager::
-* Event Logging Manager::
-* Process Dump Control Manager::
-* Configuration Space Manager::
-* Administration Interface Manager::
-* Command and Variable Index::
-* Concept Index::
-@end menu
-
-@end ifinfo
-@c 
-@c 
-@c Need to copy the emacs stuff and "trailer stuff" (index, toc) into here
-@c
-
-@node Command and Variable Index, Concept Index, , Top
-@unnumbered Command and Variable Index
-
-There are currently no Command and Variable Index entries.
-
-@c @printindex fn
-
-@node Concept Index, , Command and Variable Index, Top
-@unnumbered Concept Index
-
-There are currently no Concept Index entries.
-@c @printindex cp
-
-@contents
-@bye
-
diff --git a/doc/new_chapters/preface.texi b/doc/new_chapters/preface.texi
deleted file mode 100644
index 83e85dfafa..0000000000
--- a/doc/new_chapters/preface.texi
+++ /dev/null
@@ -1,34 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@ifinfo
-@node Preface, , Top, Top
-@end ifinfo
-@unnumbered Preface
-
-This is the User's Guide for the POSIX API support 
-provided in RTEMS.
-
-The functionality described in this document is based 
-on the following standards:
-
-@itemize @bullet
-
-@item POSIX 1003.1b-1993.
-
-@item POSIX 1003.1h/D3.
-
-@end itemize
-
-Much of the POSIX API standard is actually implemented in the
-Cygnus Newlib ANSI C Library.  Please refer to documentation on
-Newlib for more information on what it supplies.
-
-At this point, this is just beginning to become what it 
-ultimately should be.
-
diff --git a/doc/new_chapters/procenv.t b/doc/new_chapters/procenv.t
deleted file mode 100644
index 9f51ba8cf4..0000000000
--- a/doc/new_chapters/procenv.t
+++ /dev/null
@@ -1,654 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved. 
-@c
-@c  $Id$
-@c
-
-@chapter Process Environment Manager
-
-@section Introduction
-
-The 
-process environment manager is ...
-
-The directives provided by the process environment manager are:
-
-@itemize @bullet
-@item @code{getpid} - 
-@item @code{getppid} - 
-@item @code{getuid} - 
-@item @code{geteuid} - 
-@item @code{getgid} - 
-@item @code{getegid} - 
-@item @code{setuid} - 
-@item @code{setgid} - 
-@item @code{getgroups} - 
-@item @code{getlogin} - 
-@item @code{getlogin_r} - 
-@item @code{getpgrp} - 
-@item @code{setsid} - 
-@item @code{setpgid} - 
-@item @code{uname} - 
-@item @code{times} - Get process times
-@item @code{getenv} - 
-@item @code{ctermid} - 
-@item @code{ttyname} - 
-@item @code{ttyname_r} - 
-@item @code{isatty} - 
-@item @code{sysconf} - 
-@end itemize
-
-@section Background
-
-There is currently no text in this section.
-
-@section Operations
-
-There is currently no text in this section.
-
-@section Directives
-
-This section details the process environment manager's directives.
-A subsection is dedicated to each of this manager's directives
-and describes the calling sequence, related constants, usage,
-and status codes.
-
-@page
-@subsection getpid - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int getpid(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection getppid - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int getppid(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection getuid - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int getuid(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection geteuid - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int geteuid(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection getgid - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int getgid(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection getegid - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int getegid(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection setuid - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int setuid(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection setgid - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int setgid(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection getgroups - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int getgroups(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection getlogin - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int getlogin(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection getlogin_r - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int getlogin_r(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection getpgrp - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int getpgrp(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection setsid - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int setsid(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection setpgid - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int setpgid(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection uname - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int uname(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection times - Get process times
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <sys/time.h>
-
-clock_t times(
-  struct tms *buf
-);
-@end example
-
-@subheading STATUS CODES:
-
-This routine returns the process times
-
-@subheading DESCRIPTION:
-
-@code{times} stores the current process times in @code{buf}.
-
-@code{struct tms} is as defined in @code{/usr/include/sys/times.h}
-
-@code{times} returns the number of clock ticks that have elapsed
-since the systm has been up.
-
-@subheading NOTES:
-
-NONE
-
-@page
-@subsection getenv - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int getenv(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection ctermid - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int ctermid(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection ttyname - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int ttyname(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection ttyname_r - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int ttyname_r(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection isatty - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int isatty(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection sysconf - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int sysconf(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
diff --git a/doc/new_chapters/process.t b/doc/new_chapters/process.t
deleted file mode 100644
index 7b5bece910..0000000000
--- a/doc/new_chapters/process.t
+++ /dev/null
@@ -1,414 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved. 
-@c
-@c  $Id$
-@c
-
-@chapter Process Creation and Execution Manager
-
-@section Introduction
-
-The process creation and execution manager is ...
-
-The directives provided by the process creation and execution manager are:
-
-@itemize @bullet
-@item @code{fork} - Create a Process 
-@item @code{execl} - Execute a File
-@item @code{execv} - Execute a File
-@item @code{execle} - Execute a File
-@item @code{execve} - Execute a File
-@item @code{execlp} - Execute a File
-@item @code{execvp} - Execute a File
-@item @code{pthread_atfork} - Register Fork Handlers
-@item @code{wait} - Wait for Process Termination
-@item @code{waitpid} - Wait for Process Termination
-@item @code{_exit} - Terminate a Process
-@end itemize
-
-@section Background
-
-There is currently no text in this section.
-
-@section Operations
-
-There is currently no text in this section.
-
-@section Directives
-
-This section details the process creation and execution manager's directives.
-A subsection is dedicated to each of this manager's directives
-and describes the calling sequence, related constants, usage,
-and status codes.
-
-@page
-@subsection fork - Create a Process
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <sys/types.h>
-
-int fork( void );
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item ENOSYS
-This routine is not supported by RTEMS.
-
-@end table
-
-@subheading DESCRIPTION:
-
-This routine is not supported by RTEMS.
-
-@subheading NOTES:
-
-NONE
-
-@page
-@subsection execl - Execute a File
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int execl(
-  const char *path,
-  const char *arg,
-  ...
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item ENOSYS
-This routine is not supported by RTEMS.
-
-@end table
-
-@subheading DESCRIPTION:
-
-This routine is not supported by RTEMS.
-
-@subheading NOTES:
-
-NONE
-
-@page
-@subsection execv - Execute a File
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int execv(
-  const char *path,
-  char const *argv[],
-  ...
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item ENOSYS
-This routine is not supported by RTEMS.
-
-@end table
-
-@subheading DESCRIPTION:
-
-This routine is not supported by RTEMS.
-
-@subheading NOTES:
-
-NONE
-
-@page
-@subsection execle - Execute a File
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int execle(
-  const char *path,
-  const char *arg,
-  ...
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item ENOSYS
-This routine is not supported by RTEMS.
-
-@end table
-
-@subheading DESCRIPTION:
-
-This routine is not supported by RTEMS.
-
-@subheading NOTES:
-
-NONE
-
-@page
-@subsection execve - Execute a File
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int execve(
-  const char *path,
-  char *const argv[],
-  char *const envp[]
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item ENOSYS
-This routine is not supported by RTEMS.
-
-@end table
-
-@subheading DESCRIPTION:
-
-This routine is not supported by RTEMS.
-
-@subheading NOTES:
-
-NONE
-
-@page
-@subsection execlp - Execute a File
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int execlp(
-  const char *file,
-  const char *arg,
-  ...
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item ENOSYS
-This routine is not supported by RTEMS.
-
-@end table
-
-@subheading DESCRIPTION:
-
-This routine is not supported by RTEMS.
-
-@subheading NOTES:
-
-NONE
-
-@page
-@subsection execvp - Execute a File
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int execvp(
-  const char *file,
-  char *const argv[]
-  ...
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item ENOSYS
-This routine is not supported by RTEMS.
-
-@end table
-
-@subheading DESCRIPTION:
-
-This routine is not supported by RTEMS.
-
-@subheading NOTES:
-
-NONE
-
-@page
-@subsection pthread_atfork - Register Fork Handlers
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <sys/types.h>
-
-int pthread_atfork(
-  void (*prepare)(void),
-  void (*parent)(void),
-  void (*child)(void)
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item ENOSYS
-This routine is not supported by RTEMS.
-
-@end table
-
-@subheading DESCRIPTION:
-
-This routine is not supported by RTEMS.
-
-@subheading NOTES:
-
-NONE
-
-@page
-@subsection wait - Wait for Process Termination
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-#include <sys/types.h>
-#include <sys/wait.h>
-  
-int wait(
-  int *stat_loc
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item ENOSYS
-This routine is not supported by RTEMS.
-
-@end table
-
-@subheading DESCRIPTION:
-
-This routine is not supported by RTEMS.
-
-@subheading NOTES:
-
-NONE
-
-@page
-@subsection waitpid - Wait for Process Termination
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int wait(
-  pid_t  pid,
-  int   *stat_loc,
-  int    options
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item ENOSYS
-This routine is not supported by RTEMS.
-
-@end table
-
-@subheading DESCRIPTION:
-
-This routine is not supported by RTEMS.
-
-@subheading NOTES:
-
-NONE
-
-@page
-@subsection _exit - Terminate a Process
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-void _exit(
-  int status
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-NONE
-
-@subheading DESCRIPTION:
-
-The @code{_exit()} function terminates the calling process.
-
-@subheading NOTES:
-
-In RTEMS, a process is equivalent to the entire application on a single
-processor.  Invoking this service terminates the application.
diff --git a/doc/new_chapters/sched.t b/doc/new_chapters/sched.t
deleted file mode 100644
index be12a9c264..0000000000
--- a/doc/new_chapters/sched.t
+++ /dev/null
@@ -1,175 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Scheduler Manager
-
-@section Introduction
-
-The scheduler manager ...
-
-The directives provided by the scheduler manager are:
-
-@itemize @bullet
-@item @code{sched_get_priority_min} - 
-@item @code{sched_get_priority_max} - 
-@item @code{sched_rr_get_interval} - 
-@item @code{sched_yield} - 
-@end itemize
-
-@section Background
-
-@subsection Priority
-
-In the RTEMS implementation of the POSIX API, the priorities range from
-the low priority of sched_get_priority_min() to the highest priority of
-sched_get_priority_max().  Numerically higher values represent higher
-priorities.
-
-@subsection Scheduling Policies
-
-The following scheduling policies are available:
-
-@table @b
-@item SCHED_FIFO
-Priority-based, preemptive scheduling with no timeslicing.  This is equivalent
-to what is called "manual round-robin" scheduling.
-
-@item SCHED_RR
-Priority-based, preemptive scheduling with timeslicing.  Time quantums are 
-maintained on a per-thread basis and are not reset at each context switch.
-Thus, a thread which is preempted and subsequently resumes execution will
-attempt to complete the unused portion of its time quantum.
-
-@item SCHED_OTHER
-Priority-based, preemptive scheduling with timeslicing.  Time quantums are 
-maintained on a per-thread basis and are reset at each context switch.
-
-@item SCHED_SPORADIC
-Priority-based, preemptive scheduling utilizing three additional parameters:
-budget, replenishment period, and low priority.  Under this policy, the 
-thread is allowed to execute for "budget" amount of time before its priority
-is lowered to "low priority".  At the end of each replenishment period,
-the thread resumes its initial priority and has its budget replenished.
-
-@end table
-
-@section Operations
-
-There is currently no text in this section.
-
-@section Directives
-
-This section details the scheduler manager's directives.
-A subsection is dedicated to each of this manager's directives
-and describes the calling sequence, related constants, usage,
-and status codes.
-
-@page
-@subsection sched_get_priority_min
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <sched.h>
-
-int sched_get_priority_min(
-  int policy
-);
-@end example
-
-@subheading STATUS CODES:
-
-On error, this routine returns -1 and sets errno to one of the following:
-
-@table @b
-@item EINVAL
-The indicated policy is invalid.
- 
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection sched_get_priority_max
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <sched.h>
-
-int sched_get_priority_max(
-  int policy
-);
-@end example
-
-@subheading STATUS CODES:
-
-On error, this routine returns -1 and sets errno to one of the following:
-
-@table @b
-@item EINVAL
-The indicated policy is invalid.
- 
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection sched_rr_get_interval
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <sched.h>
-
-int sched_rr_get_interval(
-  pid_t            pid,
-  struct timespec *interval
-);
-@end example
-
-@subheading STATUS CODES:
-
-On error, this routine returns -1 and sets errno to one of the following:
-
-@table @b
-@item ESRCH
-The indicated process id is invalid. 
- 
-@item EINVAL
-The specified interval pointer parameter is invalid. 
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection sched_yield
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <sched.h>
-
-int sched_yield( void );
-@end example
-
-@subheading STATUS CODES:
-
-This routine always returns zero to indicate success.
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
diff --git a/doc/new_chapters/semaphores.t b/doc/new_chapters/semaphores.t
deleted file mode 100644
index e3fa6b2cd1..0000000000
--- a/doc/new_chapters/semaphores.t
+++ /dev/null
@@ -1,287 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved. 
-@c
-@c  $Id$
-@c
-
-@chapter Semaphores Manager
-
-@section Introduction
-
-The 
-semaphore manager is ...
-
-The directives provided by the semaphore manager are:
-
-@itemize @bullet
-@item @code{sem_init} - 
-@item @code{sem_destroy} - 
-@item @code{sem_open} - 
-@item @code{sem_close} - 
-@item @code{sem_unlink} - 
-@item @code{sem_wait} - 
-@item @code{sem_trywait} - 
-@item @code{sem_post} - 
-@item @code{sem_getvalue} - 
-@end itemize
-
-@section Background
-
-There is currently no text in this section.
-
-@section Operations
-
-There is currently no text in this section.
-
-@section Directives
-
-This section details the semaphore manager's directives.
-A subsection is dedicated to each of this manager's directives
-and describes the calling sequence, related constants, usage,
-and status codes.
-
-@page
-@subsection sem_init - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int sem_init(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection sem_destroy - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int sem_destroy(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection sem_open - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int sem_open(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection sem_close - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int sem_close(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection sem_unlink - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int sem_unlink(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection sem_wait - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int sem_wait(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection sem_trywait - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int sem_trywait(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection sem_post - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int sem_post(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection sem_getvalue - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int sem_getvalue(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
diff --git a/doc/new_chapters/signal.t b/doc/new_chapters/signal.t
deleted file mode 100644
index 38e096c403..0000000000
--- a/doc/new_chapters/signal.t
+++ /dev/null
@@ -1,726 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Signal Manager
-
-@section Introduction
-
-The signal manager ...
-
-The directives provided by the signal manager are:
-
-@itemize @bullet
-@item @code{sigaddset} - Add a Signal to a Signal Set
-@item @code{sigdelset} - Delete a Signal from a Signal Set
-@item @code{sigfillset} - Fill a Signal Set
-@item @code{sigismember} - Is Signal a Member of a Signal Set
-@item @code{sigemptyset} - Empty a Signal Set
-@item @code{sigaction} - Examine and Change Signal Action
-@item @code{pthread_kill} - Send a Signal to a Thread
-@item @code{sigprocmask} - Examine and Change Process Blocked Signals
-@item @code{pthread_sigmask} - Examine and Change Thread Blocked Signals
-@item @code{kill} - Send a Signal to a Process
-@item @code{sigpending} - Examine Pending Signals
-@item @code{sigsuspend} - Wait for a Signal
-@item @code{pause} - Suspend Process Execution
-@item @code{sigwait} - Synchronously Accept a Signal
-@item @code{sigwaitinfo} - Synchronously Accept a Signal
-@item @code{sigtimedwait} - Synchronously Accept a Signal with Timeout
-@item @code{sigqueue} - Queue a Signal to a Process
-@item @code{alarm} - Schedule Alarm
-@end itemize
-
-@section Background
-
-@subsection Signal Delivery
-
-Signals directed at a thread are delivered to the specified thread.
-
-Signals directed at a process are delivered to a thread which is selected
-based on the following algorithm:
-
-@enumerate
-@item If the action for this signal is currently @code{SIG_IGN},
-then the signal is simply ignored.
-
-@item If the currently executing thread has the signal unblocked, then
-the signal is delivered to it.
-
-@item If any threads are currently blocked waiting for this signal 
-(@code{sigwait()}), then the signal is delivered to the highest priority 
-thread waiting for this signal.
-
-@item If any other threads are willing to accept delivery of the signal, then
-the signal is delivered to the highest priority thread of this set.  In the
-event, multiple threads of the same priority are willing to accept this
-signal, then priority is given first to ready threads, then to threads
-blocked on calls which may be interrupted, and finally to threads blocked
-on non-interruptible calls.
-
-@item In the event the signal still can not be delivered, then it is left
-pending.  The first thread to unblock the signal (@code{sigprocmask()} or
-@code{pthread_sigprocmask()}) or to wait for this signal
-(@code{sigwait()}) will be the recipient of the signal.
-
-@end enumerate
-
-@section Operations
-
-There is currently no text in this section.
-
-@section Directives
-
-This section details the signal manager's directives.
-A subsection is dedicated to each of this manager's directives
-and describes the calling sequence, related constants, usage,
-and status codes.
-
-@page
-@subsection sigaddset - Add a Signal to a Signal Set
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <signal.h>
-
-int sigaddset(
-  sigset_t   *set,
-  int         signo
-);
-@end example
-
-@subheading STATUS CODES:
-
-@table @b
-@item EINVAL
-Invalid argument passed.
-
-@end table
-
-@subheading DESCRIPTION:
-
-This function adds the @code{signo} to the specified signal @code{set}.
-
-@subheading NOTES:
-
-@page
-@subsection sigdelset - Delete a Signal from a Signal Set
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <signal.h>
-
-int sigdelset(
-  sigset_t   *set,
-  int         signo
-);
-@end example
-
-@subheading STATUS CODES:
-
-@table @b
-@item EINVAL
-Invalid argument passed.
-
-@end table
-
-@subheading DESCRIPTION:
-
-This function deletes the @code{signo} to the specified signal @code{set}.
-
-@subheading NOTES:
-
-NONE
-
-@page
-@subsection sigfillset - Fill a Signal Set
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <signal.h>
-
-int sigfillset(
-  sigset_t   *set
-);
-@end example
-
-@subheading STATUS CODES:
-
-@table @b
-
-@item EINVAL
-Invalid argument passed.
-
-@end table
-
-@subheading DESCRIPTION:
-
-This function fills the specified signal @code{set} such that all
-signals are set.
-
-@subheading NOTES:
-
-NONE
-
-@page
-@subsection sigismember - Is Signal a Member of a Signal Set
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <signal.h>
-
-int sigismember(
-  const sigset_t   *set,
-  int               signo
-);
-@end example
-
-@subheading STATUS CODES:
-
-@table @b
-
-@item EINVAL
-Invalid argument passed.
-
-@end table
-
-@subheading DESCRIPTION:
-
-This function returns returns 1 if @code{signo} is a member of @code{set}
-and 0 otherwise.
-
-@subheading NOTES:
-
-NONE
-
-@page
-@subsection sigemptyset - Empty a Signal Set
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <signal.h>
-
-int sigemptyset(
-  sigset_t   *set
-);
-@end example
-
-@subheading STATUS CODES:
-
-@table @b
-
-@item EINVAL
-Invalid argument passed.
-
-@end table
-
-@subheading DESCRIPTION:
-
-This function fills the specified signal @code{set} such that all
-signals are cleared.
-
-@subheading NOTES:
-
-NONE
-
-@page
-@subsection sigaction - Examine and Change Signal Action
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <signal.h>
-
-int sigaction(
-  int                     sig,
-  const struct sigaction *act,
-  struct sigaction       *oact
-);
-@end example
-
-@subheading STATUS CODES:
-
-@table @b
-@item EINVAL
-Invalid argument passed.
-
-@item ENOTSUP
-Realtime Signals Extension option not supported.
-
-@end table
-
-@subheading DESCRIPTION:
-
-This function is used to change the action taken by a process on 
-receipt of the specfic signal @code{sig}.  The new action is 
-specified by @code{act} and the previous action is returned
-via @code{oact}.
-
-@subheading NOTES:
-
-The signal number cannot be SIGKILL.
-
-@page
-@subsection pthread_kill - Send a Signal to a Thread
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <signal.h>
-
-int pthread_kill(
-  pthread_t   thread,
-  int         sig
-);
-@end example
-
-@subheading STATUS CODES:
-
-@table @b
-
-@item ESRCH
-The thread indicated by the parameter thread is invalid.
-
-@item EINVAL
-Invalid argument passed.
-
-@end table
-
-@subheading DESCRIPTION:
-
-This functions sends the specified signal @code{sig} to @code{thread}.
-
-@subheading NOTES:
-
-NONE
-
-@page
-@subsection sigprocmask - Examine and Change Process Blocked Signals
- 
-@subheading CALLING SEQUENCE:
- 
-@example
-#include <signal.h>
- 
-int sigprocmask(
-  int               how,
-  const sigset_t   *set,
-  sigset_t         *oset
-);
-@end example
- 
-@subheading STATUS CODES:
-
-@table @b
-
-@item EINVAL
-Invalid argument passed.
- 
-@end table
- 
-@subheading DESCRIPTION:
- 
-This function is used to alter the set of currently blocked signals
-on a process wide basis.  A blocked signal will not be received by the
-process.  The behavior of this function is dependent on the value of
-@code{how} which may be one of the following:
-
-@table @code
-
-@item SIG_BLOCK
-The set of blocked signals is set to the union of @code{set} and 
-those signals currently blocked.
-
-@item SIG_UNBLOCK
-The signals specific in @code{set} are removed from the currently
-blocked set.
-
-@item SIG_SETMASK
-The set of currently blocked signals is set to @code{set}.
-
-@end table
-
-If @code{oset} is not @code{NULL}, then the set of blocked signals
-prior to this call is returned in @code{oset}.
-
-@subheading NOTES:
-
-It is not an error to unblock a signal which is not blocked.
-
-@page
-@subsection pthread_sigmask - Examine and Change Thread Blocked Signals
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <signal.h>
-
-int pthread_sigmask(
-  int               how,
-  const sigset_t   *set,
-  sigset_t         *oset
-);
-@end example
-
-@subheading STATUS CODES:
-@table @b
-@item EINVAL
-Invalid argument passed.
-
-@end table
-
-@subheading DESCRIPTION:
-
-This function is used to alter the set of currently blocked signals
-for the calling thread.  A blocked signal will not be received by the
-process.  The behavior of this function is dependent on the value of
-@code{how} which may be one of the following:
-
-@table @code
-@item SIG_BLOCK
-The set of blocked signals is set to the union of @code{set} and
-those signals currently blocked.
-
-@item SIG_UNBLOCK
-The signals specific in @code{set} are removed from the currently
-blocked set.
-
-@item SIG_SETMASK
-The set of currently blocked signals is set to @code{set}.
-
-@end table
-
-If @code{oset} is not @code{NULL}, then the set of blocked signals
-prior to this call is returned in @code{oset}.
-
-@subheading NOTES:
-
-It is not an error to unblock a signal which is not blocked.
-
-
-@page
-@subsection kill - Send a Signal to a Process
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <sys/types.h>
-#include <signal.h>
-
-int kill(
-  pid_t pid,
-  int   sig
-);
-@end example
-
-@subheading STATUS CODES:
-@table @b
-@item EINVAL
-Invalid argument passed.
-
-@item EPERM
-Process does not have permission to send the signal to any receiving process.
-
-@item ESRCH
-The process indicated by the parameter pid is invalid.
-
-@end table
-
-@subheading DESCRIPTION:
-
-This function sends the signal @code{sig} to the process @code{pid}.
-
-@subheading NOTES:
-
-NONE
- 
-@page
-@subsection sigpending - Examine Pending Signals
- 
-@subheading CALLING SEQUENCE:
- 
-@example
-#include <signal.h>
- 
-int sigpending(
-  const sigset_t  *set
-);
-@end example
- 
-@subheading STATUS CODES:
-
-On error, this routine returns -1 and sets @code{errno} to one of
-the following:
- 
-@table @b
-
-@item EFAULT
-Invalid address for set.
-
-@end table
-
-@subheading DESCRIPTION:
-
-This function allows the caller to examine the set of currently pending
-signals.  A pending signal is one which has been raised but is currently
-blocked.  The set of pending signals is returned in @code{set}.
- 
-@subheading NOTES:
-
-NONE
-
-@page
-@subsection sigsuspend - Wait for a Signal
- 
-@subheading CALLING SEQUENCE:
- 
-@example
-#include <signal.h>
- 
-int sigsuspend(
-  const sigset_t  *sigmask
-);
-@end example
- 
-@subheading STATUS CODES:
-
-On error, this routine returns -1 and sets @code{errno} to one of
-the following:
-
-@table @b
-
-@item EINTR
-Signal interrupted this function.
- 
-@end table
- 
-@subheading DESCRIPTION:
-
-This function temporarily replaces the signal mask for the process
-with that specified by @code{sigmask} and blocks the calling thread
-until the signal is raised.
- 
-@subheading NOTES:
-
-NONE
-
-@page
-@subsection pause - Suspend Process Execution
- 
-@subheading CALLING SEQUENCE:
- 
-@example
-#include <signal.h>
- 
-int pause( void );
-@end example
- 
-@subheading STATUS CODES:
-
-On error, this routine returns -1 and sets @code{errno} to one of
-the following:
-
-@table @b
- 
-@item EINTR
-Signal interrupted this function.
- 
-@end table
- 
-@subheading DESCRIPTION:
-
-This function causes the calling thread to be blocked until the signal
-is received.
- 
-@subheading NOTES:
-
-NONE
- 
-@page
-@subsection sigwait - Synchronously Accept a Signal
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <signal.h>
-
-int sigwait(
-  const sigset_t  *set,
-  int             *sig
-);
-@end example
-
-@subheading STATUS CODES:
-@table @b
-@item EINVAL
-Invalid argument passed.
-
-@item EINTR
-Signal interrupted this function.
-
-@end table
-
-@subheading DESCRIPTION:
-
-This function selects a pending signal based on the set specified in
-@code{set}, atomically clears it from the set of pending signals, and
-returns the signal number for that signal in @code{sig}.
-
-
-@subheading NOTES:
-
-NONE
-
-@page
-@subsection sigwaitinfo - Synchronously Accept a Signal
- 
-@subheading CALLING SEQUENCE:
- 
-@example
-#include <signal.h>
- 
-int sigwaitinfo(
-  const sigset_t  *set,
-  siginfo_t       *info
-);
-@end example
- 
-@subheading STATUS CODES:
-@table @b
-@item EINTR
-Signal interrupted this function.
- 
-@end table
- 
-@subheading DESCRIPTION:
- 
-This function selects a pending signal based on the set specified in
-@code{set}, atomically clears it from the set of pending signals, and
-returns information about that signal in @code{info}.
-
-@subheading NOTES:
-
-NONE
-
-@page
-@subsection sigtimedwait - Synchronously Accept a Signal with Timeout
- 
-@subheading CALLING SEQUENCE:
- 
-@example
-#include <signal.h>
- 
-int sigtimedwait(
-  const sigset_t         *set,
-  siginfo_t              *info,
-  const struct timespec  *timeout
-);
-@end example
- 
-@subheading STATUS CODES:
-@table @b
-@item EAGAIN
-Timed out while waiting for the specified signal set.
- 
-@item EINVAL
-Nanoseconds field of the timeout argument is invalid.
- 
-@item EINTR
-Signal interrupted this function.
- 
-@end table
- 
-@subheading DESCRIPTION:
- 
-This function selects a pending signal based on the set specified in
-@code{set}, atomically clears it from the set of pending signals, and
-returns information about that signal in @code{info}.  The calling thread
-will block up to @code{timeout} waiting for the signal to arrive.
-
-@subheading NOTES:
-
-If @code{timeout} is NULL, then the calling thread will wait forever for
-the specified signal set.
-
-@page
-@subsection sigqueue - Queue a Signal to a Process
- 
-@subheading CALLING SEQUENCE:
- 
-@example
-#include <signal.h>
- 
-int sigqueue(
-  pid_t               pid,
-  int                 signo,
-  const union sigval  value
-);
-@end example
- 
-@subheading STATUS CODES:
-
-@table @b
-
-@item EAGAIN
-No resources available to queue the signal.  The process has already
-queued SIGQUEUE_MAX signals that are still pending at the receiver
-or the systemwide resource limit has been exceeded.
- 
-@item EINVAL
-The value of the signo argument is an invalid or unsupported signal
-number.
- 
-@item EPERM
-The process does not have the appropriate privilege to send the signal
-to the receiving process.
-
-@item ESRCH
-The process pid does not exist.
- 
-@end table
- 
-@subheading DESCRIPTION:
-
-This function sends the signal specified by @code{signo} to the
-process @code{pid}
- 
-@subheading NOTES:
-
-NONE
-
-@page
-@subsection alarm - Schedule Alarm
- 
-@subheading CALLING SEQUENCE:
- 
-@example
-#include <signal.h>
- 
-unsigned int alarm(
-  unsigned int  seconds
-);
-@end example
- 
-@subheading STATUS CODES:
-
-This call always succeeds.
- 
-@subheading DESCRIPTION:
- 
-If there was a previous @code{alarm()} request with time remaining,
-then this routine returns the number of seconds until that outstanding
-alarm would have fired.  If no previous @code{alarm()} request was
-outstanding, then zero is returned.
-
-@subheading NOTES:
-
-NONE
diff --git a/doc/new_chapters/systemdb.t b/doc/new_chapters/systemdb.t
deleted file mode 100644
index af3a54a09c..0000000000
--- a/doc/new_chapters/systemdb.t
+++ /dev/null
@@ -1,259 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved. 
-@c
-@c  $Id$
-@c
-
-@chapter System Databases Manager
-
-@section Introduction
-
-The 
-system databases manager is ...
-
-The directives provided by the system databases manager are:
-
-@itemize @bullet
-@item @code{getgrgid} - 
-@item @code{getgrgid_r} - 
-@item @code{getgrnam} - 
-@item @code{getgrnam_r} - 
-@item @code{getpwuid} - 
-@item @code{getpwuid_r} - 
-@item @code{getpwnam} - 
-@item @code{getpwnam_r} - 
-@end itemize
-
-@section Background
-
-There is currently no text in this section.
-
-@section Operations
-
-There is currently no text in this section.
-
-@section Directives
-
-This section details the system databases manager's directives.
-A subsection is dedicated to each of this manager's directives
-and describes the calling sequence, related constants, usage,
-and status codes.
-
-@page
-@subsection getgrgid - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int getgrgid(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection getgrgid_r - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int getgrgid_r(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection getgrnam - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int getgrnam(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection getgrnam_r - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int getgrnam_r(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection getpwuid - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int getpwuid(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection getpwuid_r - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int getpwuid_r(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection getpwnam - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int getpwnam(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection getpwnam_r - 
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@example
-int getpwnam_r(
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@end ifset
-
-@subheading STATUS CODES:
-
-@table @b
-@item E
-The
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
diff --git a/doc/new_chapters/thread.t b/doc/new_chapters/thread.t
deleted file mode 100644
index 6ef29eb1bf..0000000000
--- a/doc/new_chapters/thread.t
+++ /dev/null
@@ -1,892 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Thread Manager
-
-@section Introduction
-
-The thread manager ...
-
-The directives provided by the thread manager are:
-
-@itemize @bullet
-@item @code{pthread_attr_init} - 
-@item @code{pthread_attr_destroy} - 
-@item @code{pthread_attr_setdetachstate} - 
-@item @code{pthread_attr_getdetachstate} - 
-@item @code{pthread_attr_setstacksize} - 
-@item @code{pthread_attr_getstacksize} - 
-@item @code{pthread_attr_setstackaddr} - 
-@item @code{pthread_attr_getstackaddr} - 
-@item @code{pthread_attr_setscope} - 
-@item @code{pthread_attr_getscope} - 
-@item @code{pthread_attr_setinheritsched} - 
-@item @code{pthread_attr_getinheritsched} - 
-@item @code{pthread_attr_setschedpolicy} - 
-@item @code{pthread_attr_getschedpolicy} - 
-@item @code{pthread_attr_setschedparam} - 
-@item @code{pthread_attr_getschedparam} - 
-@item @code{pthread_create} - 
-@item @code{pthread_exit} - 
-@item @code{pthread_detach} - 
-@item @code{pthread_join} - 
-@item @code{pthread_self} - 
-@item @code{pthread_equal} - 
-@item @code{pthread_once} - 
-@item @code{pthread_setschedparam} - 
-@item @code{pthread_getschedparam} - 
-@end itemize
-
-@section Background
-
-@subsection Thread Attributes
-
-Thread attributes are utilized only at thread creation time.
-
-@table @b
-@item stack address
-is the address of the optionally user specified stack area for this thread.
-If this value is NULL, then RTEMS allocates the memory for the thread stack 
-from the RTEMS Workspace Area.  Otherwise, this is the user specified
-address for the memory to be used for the thread's stack.  Each thread must
-have a distinct stack area.  Each processor family has different alignment
-rules which should be followed.
-
-@item stack size
-is the minimum desired size for this thread's stack area.
-If the size of this area as specified by the stack size attribute 
-is smaller than the minimum for this processor family and the stack 
-is not user specified, then RTEMS will automatically allocate a 
-stack of the minimum size for this processor family.
-
-@item contention scope
-specifies the scheduling contention scope.  RTEMS only supports the
-PTHREAD_SCOPE_PROCESS scheduling contention scope.
-
-@item scheduling inheritance
-specifies whether a user specified or the scheduling policy and 
-parameters of the currently executing thread are to be used.  When 
-this is PTHREAD_INHERIT_SCHED, then the scheduling policy and 
-parameters of the currently executing thread are inherited by 
-the newly created thread.
-
-@item scheduling policy and parameters
-specify the manner in which the thread will contend for the processor.
-The scheduling parameters are interpreted based on the specified policy.
-All policies utilize the thread priority parameter.
-
-@end table
-
-@section Operations
-
-There is currently no text in this section.
-
-@section Directives
-
-This section details the thread manager's directives.
-A subsection is dedicated to each of this manager's directives
-and describes the calling sequence, related constants, usage,
-and status codes.
-
-@page
-@subsection pthread_attr_init
-
-@subheading CALLING SEQUENCE:
-
-
-@example
-#include <pthread.h>
-
-int pthread_attr_init(
-  pthread_attr_t  *attr
-);
-@end example
-
-@subheading STATUS CODES:
-
-@table @b
-@item EINVAL
-The attribute pointer argument is invalid.
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection pthread_attr_destroy
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
- 
-int pthread_attr_destroy(
-  pthread_attr_t  *attr
-);
-@end example
-
-@subheading STATUS CODES:
- 
-@table @b
-@item EINVAL
-The attribute pointer argument is invalid.
-
-@item EINVAL
-The attribute set is not initialized.
- 
-@end table
- 
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection pthread_attr_setdetachstate
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
- 
-int pthread_attr_setdetachstate(
-  pthread_attr_t  *attr,
-  int              detachstate
-);
-@end example
-
-@subheading STATUS CODES:
- 
-@table @b
-@item EINVAL
-The attribute pointer argument is invalid.
-
-@item EINVAL
-The attribute set is not initialized.
- 
-@item EINVAL
-The detachstate argument is invalid.
- 
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection pthread_attr_getdetachstate
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
- 
-int pthread_attr_getdetachstate(
-  const pthread_attr_t  *attr,
-  int                   *detachstate
-);
-@end example
-
-@subheading STATUS CODES:
- 
-@table @b
-@item EINVAL
-The attribute pointer argument is invalid.
-
-@item EINVAL
-The attribute set is not initialized.
- 
-@item EINVAL
-The detatchstate pointer argument is invalid.
-
-@end table
- 
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection pthread_attr_setstacksize
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
- 
-int pthread_attr_setstacksize(
-  pthread_attr_t  *attr,
-  size_t           stacksize
-);
-@end example
-
-@subheading STATUS CODES:
- 
-@table @b
-@item EINVAL
-The attribute pointer argument is invalid.
-
-@item EINVAL
-The attribute set is not initialized.
- 
-@end table
- 
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-If the specified stacksize is below the minimum required for this CPU, then
-the stacksize will be set to the minimum for this CPU.
-
-@page
-@subsection pthread_attr_getstacksize
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_attr_getstacksize(
-  const pthread_attr_t  *attr,
-  size_t                *stacksize
-);
-@end example
-
-@subheading STATUS CODES:
- 
-@table @b
-@item EINVAL
-The attribute pointer argument is invalid.
-
-@item EINVAL
-The attribute set is not initialized.
- 
-@item EINVAL
-The stacksize pointer argument is invalid.
-
-@end table
- 
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection pthread_attr_setstackaddr
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
- 
-int pthread_attr_setstackaddr(
-  pthread_attr_t  *attr,
-  void            *stackaddr
-);
-@end example
-
-@subheading STATUS CODES:
- 
-@table @b
-@item EINVAL
-The attribute pointer argument is invalid.
-
-@item EINVAL
-The attribute set is not initialized.
-
-@end table
- 
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection pthread_attr_getstackaddr
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_attr_getstackaddr(
-  const pthread_attr_t  *attr,
-  void                 **stackaddr
-);
-@end example
-
-@subheading STATUS CODES:
- 
-@table @b
-@item EINVAL
-The attribute pointer argument is invalid.
-
-@item EINVAL
-The attribute set is not initialized.
- 
-@item EINVAL
-The stackaddr pointer argument is invalid.
-
-@end table
- 
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection pthread_attr_setscope
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_attr_setscope(
-  pthread_attr_t  *attr,
-  int              contentionscope
-);
-@end example
-
-@subheading STATUS CODES:
-
-@table @b
-@item EINVAL
-The attribute pointer argument is invalid.
-
-@item EINVAL
-The attribute set is not initialized.
-
-@item EINVAL
-The contention scope specified is not valid.
-
-@item ENOTSUP
-The contention scope specified (PTHREAD_SCOPE_SYSTEM) is not supported.
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection pthread_attr_getscope
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_attr_getscope(
-  const pthread_attr_t  *attr,
-  int                   *contentionscope
-);
-@end example
-
-@subheading STATUS CODES:
-
-@table @b
-@item EINVAL
-The attribute pointer argument is invalid.
-
-@item EINVAL
-The attribute set is not initialized.
-
-@item EINVAL
-The contentionscope pointer argument is invalid.
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection pthread_attr_setinheritsched
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_attr_setinheritsched(
-  pthread_attr_t  *attr,
-  int              inheritsched
-);
-@end example
-
-@subheading STATUS CODES:
-
-@table @b
-@item EINVAL
-The attribute pointer argument is invalid.
-
-@item EINVAL
-The attribute set is not initialized.
-
-@item EINVAL
-The specified scheduler inheritance argument is invalid.
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection pthread_attr_getinheritsched
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_attr_getinheritsched(
-  const pthread_attr_t  *attr,
-  int                   *inheritsched
-);
-@end example
-
-@subheading STATUS CODES:
-@table @b
-@item EINVAL
-The attribute pointer argument is invalid.
-
-@item EINVAL
-The attribute set is not initialized.
-
-@item EINVAL
-The inheritsched pointer argument is invalid.
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection pthread_attr_setschedpolicy
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_attr_setschedpolicy(
-  pthread_attr_t  *attr,
-  int              policy
-);
-@end example
-
-@subheading STATUS CODES:
-@table @b
-@item EINVAL
-The attribute pointer argument is invalid.
-
-@item EINVAL
-The attribute set is not initialized.
- 
-@item ENOTSUP
-The specified scheduler policy argument is invalid.
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection pthread_attr_getschedpolicy
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_attr_getschedpolicy(
-  const pthread_attr_t  *attr,
-  int                   *policy
-);
-@end example
-
-@subheading STATUS CODES:
-@table @b
-@item EINVAL
-The attribute pointer argument is invalid.
-
-@item EINVAL
-The attribute set is not initialized.
-
-@item EINVAL
-The specified scheduler policy argument pointer is invalid.
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection pthread_attr_setschedparam
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_attr_setschedparam(
-  pthread_attr_t            *attr,
-  const struct sched_param   param
-);
-@end example
-
-@subheading STATUS CODES:
-@table @b
-@item EINVAL
-The attribute pointer argument is invalid.
-
-@item EINVAL
-The attribute set is not initialized.
- 
-@item EINVAL
-The specified scheduler parameter argument is invalid.
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection pthread_attr_getschedparam
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_attr_getschedparam(
-  const pthread_attr_t  *attr,
-  struct sched_param    *param
-);
-@end example
-
-@subheading STATUS CODES:
-@table @b
-@item EINVAL
-The attribute pointer argument is invalid.
-
-@item EINVAL
-The attribute set is not initialized.
-
-@item EINVAL
-The specified scheduler parameter argument pointer is invalid.
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection pthread_create
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_create(
-  pthread_t             *thread,
-  const pthread_attr_t  *attr,
-  void                 (*start_routine)( void * ),
-  void                  *arg
-);
-@end example
-
-@subheading STATUS CODES:
-
-@table @b
-
-@item EINVAL
-The attribute set is not initialized.
-
-@item EINVAL
-The user specified a stack address and the size of the area was not 
-large enough to meet this processor's minimum stack requirements.
-
-@item EINVAL
-The specified scheduler inheritance policy was invalid.
-
-@item ENOTSUP
-The specified contention scope was PTHREAD_SCOPE_PROCESS.
-
-@item EINVAL
-The specified thread priority was invalid.
-
-@item EINVAL
-The specified scheduling policy was invalid.
-
-@item EINVAL
-The scheduling policy was SCHED_SPORADIC and the specified replenishment
-period is less than the initial budget.
-
-@item EINVAL
-The scheduling policy was SCHED_SPORADIC and the specified low priority
-is invalid.
-
-@item EAGAIN
-The system lacked the necessary resources to create another thread, or the
-self imposed limit on the total number of threads in a process
-PTHREAD_THREAD_MAX would be exceeded.
- 
-@item EINVAL
-Invalid argument passed.
-
-@end table
- 
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection pthread_exit
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-void pthread_exit(
-  void   *status
-);
-@end example
-
-@subheading STATUS CODES:
-@table @b
-@item NONE
- 
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection pthread_detach
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_detach(
-  pthread_t   thread
-);
-@end example
-
-@subheading STATUS CODES:
-@table @b
-@item ESRCH
-The thread specified is invalid.
- 
-@item EINVAL
-The thread specified is not a joinable thread.
- 
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-If any threads have previously joined with the specified thread, then they
-will remain joined with that thread.  Any subsequent calls to pthread_join
-on the specified thread will fail.
-
-@page
-@subsection pthread_join
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_join(
-  pthread_t   thread,
-  void      **value_ptr
-);
-@end example
-
-@subheading STATUS CODES:
-@table @b
-@item ESRCH
-The thread specified is invalid.
- 
-@item EINVAL
-The thread specified is not a joinable thread.
- 
-@item EDEADLK
-A deadlock was detected or thread is the calling thread.
- 
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-If any threads have previously joined with the specified thread, then they
-will remain joined with that thread.  Any subsequent calls to pthread_join
-on the specified thread will fail.
-
-If value_ptr is NULL, then no value is returned.
-
-@page
-@subsection pthread_self
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-pthread_t pthread_self( void );
-@end example
-
-@subheading STATUS CODES:
-
-This routine returns the id of the calling thread.
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection pthread_equal
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_equal(
-  pthread_t  t1,
-  pthread_t  t2
-);
-@end example
-
-@subheading STATUS CODES:
-
-@table @b
-@item zero
-The thread ids are not equal.
- 
-@item non-zero
-The thread ids are equal.
- 
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-The behavior is undefined if the thread IDs are not valid.
-
-@page
-@subsection pthread_once
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-pthread_once_t once_control = PTHREAD_ONCE_INIT;
-
-int pthread_once(
-  pthread_once_t  *once_control,
-  void           (*init_routine)(void)
-);
-@end example
-
-@subheading STATUS CODES:
-
-NONE
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection pthread_setschedparam
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_setschedparam(
-  pthread_t           thread,
-  int                 policy,
-  struct sched_param *param
-);
-@end example
-
-@subheading STATUS CODES:
-
-@table @b
-@item EINVAL
-The scheduling parameters indicated by the parameter param is invalid.
-
-@item EINVAL
-The value specified by policy is invalid.
-
-@item EINVAL
-The scheduling policy was SCHED_SPORADIC and the specified replenishment
-period is less than the initial budget.
-
-@item EINVAL
-The scheduling policy was SCHED_SPORADIC and the specified low priority
-is invalid.
-
-@item ESRCH
-The thread indicated was invalid.
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@subsection pthread_getschedparam
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_getschedparam(
-  pthread_t           thread,
-  int                *policy,
-  struct sched_param *param
-);
-@end example
-
-@subheading STATUS CODES:
- 
-@table @b
-@item EINVAL
-The policy pointer argument is invalid.
-
-@item EINVAL
-The scheduling parameters pointer argument is invalid.
-
-@item ESRCH
-The thread indicated by the parameter thread is invalid.
- 
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
diff --git a/doc/oaronly.jpg b/doc/oaronly.jpg
deleted file mode 100644
index c87c151404..0000000000
--- a/doc/oaronly.jpg
+++ /dev/null
diff --git a/doc/posix1003.1/Makefile b/doc/posix1003.1/Makefile
deleted file mode 100644
index 3337910981..0000000000
--- a/doc/posix1003.1/Makefile
+++ /dev/null
@@ -1,160 +0,0 @@
-#
-#  COPYRIGHT (c) 1988-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  All rights reserved.
-#
-#  $Id$
-#
-
-PROJECT=posix1003_1
-DISTRIBUTION_LEVEL=partners
-
-include ../Make.config
-
-all: html info ps
-
-dirs:
-	$(make-dirs)
-
-COMMON_FILES=../common/cpright.texi ../common/setup.texi
-
-GENERATED_FILES=ch01.texi ch02.texi ch03.texi ch04.texi ch05.texi \
-                ch06.texi ch07.texi ch08.texi ch09.texi ch10.texi \
-                ch11.texi ch12.texi ch13.texi ch14.texi ch15.texi \
-                ch16.texi ch17.texi ch18.texi ch19.t ch19.texi
-
-FILES= $(PROJECT).texi \
-  preface.texi $(GENERATED_FILES)
-
-INFOFILES=$(wildcard $(PROJECT) $(PROJECT)-*)
-
-info: dirs $(PROJECT)
-	#cp $(wildcard $(PROJECT) $(PROJECT)-*) $(INFO_INSTALL)
-	cp $(PROJECT) $(INFO_INSTALL)
-
-$(PROJECT): $(FILES)
-	$(MAKEINFO) $(PROJECT).texi
-
-dvi: $(PROJECT).dvi
-ps: dirs $(PROJECT).ps
-	
-$(PROJECT).ps: $(PROJECT).dvi
-	dvips -o $(PROJECT).ps $(PROJECT).dvi
-	cp $(PROJECT).ps $(PS_INSTALL)
-
-# run texi2dvi twice to generate the xref's properly.
-$(PROJECT).dvi: $(FILES)
-	$(TEXI2DVI) -v $(PROJECT).texi
-	texi2dvi $(PROJECT).texi
-
-ch01.texi: ch01.t
-	$(BMENU) -c -p "Preface" \
-	    -u "Top" \
-	    -n "Terminology and General Requirements" ${*}.t
-
-ch02.texi: ch02.t
-	$(BMENU) -c -p "Conformance" \
-	    -u "Top" \
-	    -n "Process Primitives" ${*}.t
-
-ch03.texi: ch03.t
-	$(BMENU) -c -p "Execution-Time Symbolic Constants for Portability Specifications" \
-	    -u "Top" \
-	    -n "Process Environment" ${*}.t
-
-ch04.texi: ch04.t
-	$(BMENU) -c -p "Delay Process Execution" \
-	    -u "Top" \
-	    -n "Files and Directories" ${*}.t
-
-ch05.texi: ch05.t
-	$(BMENU) -c -p "Get Configurable System Variables" \
-	    -u "Top" \
-	    -n "Input and Output Primitives" ${*}.t
-
-ch06.texi: ch06.t
-	$(BMENU) -c -p "Get Configurable Pathname Variables" \
-	    -u "Top" \
-	    -n "Device- and Class-Specific Functions" ${*}.t
-
-ch07.texi: ch07.t
-	$(BMENU) -c -p " Asynchronous File Synchronization" \
-	    -u "Top" \
-	    -n "Language-Specific Services for the C Programming Language" ${*}.t
-
-ch08.texi: ch08.t
-	$(BMENU) -c -p "Set Foreground Process Group ID" \
-	    -u "Top" \
-	    -n "System Databases" ${*}.t
-
-ch09.texi: ch09.t
-	$(BMENU) -c -p "Pseudo-Random Sequence Generation Functions" \
-	    -u "Top" \
-	    -n "Data Interchange Format" ${*}.t
-
-ch10.texi: ch10.t
-	$(BMENU) -c -p "User Database Access" \
-	    -u "Top" \
-	    -n "Synchronization" ${*}.t
-
-ch11.texi: ch11.t
-	$(BMENU) -c -p "Multiple Volumes" \
-	    -u "Top" \
-	    -n "Memory Management" ${*}.t
-
-ch12.texi: ch12.t
-	$(BMENU) -c -p "Waiting on a Condition" \
-	    -u "Top" \
-	    -n "Execution Scheduling" ${*}.t
-
-ch13.texi: ch13.t
-	$(BMENU) -c -p "Remove a Shared Memory Object" \
-	    -u "Top" \
-	    -n "Clocks and Timers" ${*}.t
-
-ch14.texi: ch14.t
-	$(BMENU) -c -p "Change the Priority Ceiling of a Mutex" \
-	    -u "Top" \
-	    -n "Message Passing" ${*}.t
-
-ch15.texi: ch15.t
-	$(BMENU) -c -p "High Resolution Sleep" \
-	    -u "Top" \
-	    -n "Thread Management" ${*}.t
-
-ch16.texi: ch16.t
-	$(BMENU) -c -p "Get Message Queue Attributes" \
-	    -u "Top" \
-	    -n "Thread-Specific Data" ${*}.t
-
-ch17.texi: ch17.t
-	$(BMENU) -c -p "Dynamic Package Initialization" \
-	    -u "Top" \
-	    -n "Thread Cancellation" ${*}.t
-
-ch18.texi: ch18.t
-	$(BMENU) -c -p "Thread-Specific Data Key Deletion" \
-	    -u "Top" \
-	    -n "Compliance Summary" ${*}.t
-
-ch19.t: ch01.t ch02.t ch03.t ch04.t ch05.t ch06.t ch07.t ch08.t ch09.t \
-        ch10.t ch11.t ch12.t ch13.t ch14.t ch15.t ch16.t ch17.t ch18.t \
-	summarize
-	./summarize >ch19.t
-
-ch19.texi: ch19.t
-	$(BMENU) -c -p "List of Cancellation Points" \
-	    -u "Top" \
-	    -n "Command and Variable Index" ${*}.t
-	
-html: dirs $(FILES)
-	-mkdir -p $(WWW_INSTALL)/$(PROJECT)
-	$(TEXI2WWW) $(TEXI2WWW_ARGS) -dir $(WWW_INSTALL)/$(PROJECT) \
- 	    $(PROJECT).texi
-
-clean:
-	rm -f *.o $(PROG) *.txt core 
-	rm -f *.dvi *.ps *.log *.aux *.cp *.fn *.ky *.pg *.toc *.tp *.vr $(BASE)
-	rm -f $(PROJECT) $(PROJECT)-* $(GENERATED_FILES)
-	rm -f *.fixed _*
-
diff --git a/doc/posix1003.1/ch01.t b/doc/posix1003.1/ch01.t
deleted file mode 100644
index c65a3e64f1..0000000000
--- a/doc/posix1003.1/ch01.t
+++ /dev/null
@@ -1,40 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter General
-
-@section Scope
-
-@section Normative References
-
-@section Conformance
-
-@example
-NGROUPS_MAX, Feature Flag, 
-_POSIX_ASYNCHRONOUS_IO, Feature Flag, 
-_POSIX_CHOWN_RESTRICTED, Feature Flag, 
-_POSIX_FSYNC, Feature Flag, 
-_POSIX_JOB_CONTROL, Feature Flag, 
-_POSIX_MAPPED_FILES, Feature Flag, 
-_POSIX_MEMLOCK, Feature Flag, 
-_POSIX_MEMLOCK_RANGE, Feature Flag, 
-_POSIX_MEMORY_PROTECTION, Feature Flag, 
-_POSIX_MESSAGE_PASSING, Feature Flag, 
-_POSIX_PRIORITIZED_IO, Feature Flag, 
-_POSIX_PRIORITY_SCHEDULING, Feature Flag, 
-_POSIX_REALTIME_SIGNALS, Feature Flag, 
-_POSIX_SEMAPHORES, Feature Flag, 
-_POSIX_SHARED_MEMORY_OBJECTS, Feature Flag, 
-_POSIX_SYNCHRONIZED_IO, Feature Flag, 
-_POSIX_TIMERS, Feature Flag, 
-_POSIX_THREAD_PRIO_INHERIT, Feature Flag, 
-_POSIX_THREAD_PRIORITY_SCHEDULING, Feature Flag, 
-_POSIX_THREADS, Feature Flag, 
-_POSIX_THREAD_SAFE_FUNCTIONS, Feature Flag, 
-@end example
-
diff --git a/doc/posix1003.1/ch02.t b/doc/posix1003.1/ch02.t
deleted file mode 100644
index d2b2765c22..0000000000
--- a/doc/posix1003.1/ch02.t
+++ /dev/null
@@ -1,279 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Terminology and General Requirements
-
-@section Conventions
-
-@section Definitions
-
-@section General Concepts
-
-@section Error Numbers
-
-@example
-E2BIG, Constant, Implemented
-EACCES, Constant, Implemented
-EAGAIN, Constant, Implemented
-EBADF, Constant, Implemented
-EBADMSG, Constant, Implemented
-EBUSY, Constant, Implemented
-ECANCELED, Constant, Unimplemented
-ECHILD, Constant, Implemented
-EDEADLK, Constant, Implemented
-EDOM, Constant, Implemented
-EEXIST, Constant, Implemented
-EFAULT, Constant, Implemented
-EFBIG, Constant, Implemented
-EINPROGRESS, Constant, Implemented
-EINTR, Constant, Implemented
-EINVAL, Constant, Implemented
-EIO, Constant, Implemented
-EISDIR, Constant, Implemented
-EMFILE, Constant, Implemented
-EMLINK, Constant, Implemented
-EMSGSIZE, Constant, Implemented
-ENAMETOOLONG, Constant, Implemented
-ENFILE, Constant, Implemented
-ENODEV, Constant, Implemented
-ENOENT, Constant, Implemented
-ENOEXEC, Constant, Implemented
-ENOLCK, Constant, Implemented
-ENOMEM, Constant, Implemented
-ENOSPC, Constant, Implemented
-ENOSYS, Constant, Implemented
-ENOTDIR, Constant, Implemented
-ENOTEMPTY, Constant, Implemented
-ENOTSUP, Constant, Implemented
-ENOTTY, Constant, Implemented
-ENXIO, Constant, Implemented
-EPERM, Constant, Implemented
-EPIPE, Constant, Implemented
-ERANGE, Constant, Implemented
-EROFS, Constant, Implemented
-ESPIPE, Constant, Implemented
-ESRCH, Constant, Implemented
-ETIMEDOUT, Constant, Implemented
-EXDEV, Constant, Implemented
-@end example
-
-@section Primitive System Types
-
-@example
-dev_t, Type, Implemented
-gid_t, Type, Implemented
-ino_t, Type, Implemented
-mode_t, Type, Implemented
-nlink_t, Type, Implemented
-off_t, Type, Implemented
-pid_t, Type, Implemented
-pthread_t, Type, Implemented
-pthread_attr_t, Type, Implemented
-pthread_mutex_t, Type, Implemented
-pthread_mutex_attr_t, Type, Implemented
-pthread_cond_t, Type, Implemented
-pthread_cond_attr_t, Type, Implemented
-pthread_key_t, Type, Implemented
-pthread_once_t, Type, Implemented
-size_t, Type, Implemented
-ssize_t, Type, Implemented
-time_t, Type, Implemented
-uid_t, Type, Implemented
-@end example
-
-NOTE: time_t is not listed in this section but is used by many functions.
-
-@section Environment Description
-
-@section C Language Definitions
-
-@subsection Symbols From the C Standard
-
-@example
-NULL, Constant, Implemented
-@end example
-
-@subsection POSIX.1 Symbols
-
-@example
-_POSIX_C_SOURCE, Feature Flag, 
-@end example
-
-@section Numerical Limits
-
-@section C Language Limits
-
-@example
-CHAR_BIT, Constant, Implemented
-CHAR_MAX, Constant, Implemented
-CHAR_MIN, Constant, Implemented
-INT_MAX, Constant, Implemented
-INT_MIN, Constant, Implemented
-LONG_MAX, Constant, Implemented
-LONG_MIN, Constant, Implemented
-MB_LEN_MAX, Constant, Implemented
-SCHAR_MAX, Constant, Implemented
-SCHAR_MIN, Constant, Implemented
-SHRT_MAX, Constant, Implemented
-SHRT_MIN, Constant, Implemented
-UCHAR_MAX, Constant, Implemented
-UINT_MAX, Constant, Implemented
-ULONG_MAX, Constant, Implemented
-USHRT_MAX, Constant, Implemented
-@end example
-
-NOTE: These are implemented in GCC's limits.h file.
-
-@subsection Minimum Values
-
-@example
-_POSIX_AIO_LISTIO_MAX, Constant, Implemented
-_POSIX_AIO_MAX, Constant, Implemented
-_POSIX_ARG_MAX, Constant, Implemented
-_POSIX_CHILD_MAX, Constant, Implemented
-_POSIX_DELAYTIMER_MAX, Constant, Implemented
-_POSIX_LINK_MAX, Constant, Implemented
-_POSIX_LOGIN_NAME_MAX, Constant, Implemented
-_POSIX_MAX_CANON, Constant, Implemented
-_POSIX_MAX_INPUT, Constant, Implemented
-_POSIX_MQ_OPEN_MAX, Constant, Implemented
-_POSIX_MQ_PRIO_MAX, Constant, Implemented
-_POSIX_NAME_MAX, Constant, Implemented
-_POSIX_NGROUPS_MAX, Constant, Implemented
-_POSIX_OPEN_MAX, Constant, Implemented
-_POSIX_PATH_MAX, Constant, Implemented
-_POSIX_PIPE_BUF, Constant, Implemented
-_POSIX_RTSIG_MAX, Constant, Implemented
-_POSIX_SEM_NSEMS_MAX, Constant, Implemented
-_POSIX_SEM_VALUE_MAX, Constant, Implemented
-_POSIX_SIGQUEUE_MAX, Constant, Implemented
-_POSIX_SSIZE_MAX, Constant, Implemented
-_POSIX_STREAM_MAX, Constant, Implemented
-_POSIX_THREAD_DESTRUCTOR_ITERATIONS, Constant, Implemented
-_POSIX_THREAD_KEYS_MAX, Constant, Implemented
-_POSIX_THREAD_THREADS_MAX, Constant, Implemented
-_POSIX_TTY_NAME_MAX, Constant, Implemented
-_POSIX_TIME_MAX, Constant, Unimplemented
-_POSIX_TZNAME_MAX, Constant, Implemented
-@end example
-
-@subsection Run-Time Increasable Values
-
-@example
-_POSIX_NGROUPS_MAX, Constant, Implemented
-@end example
-
-@subsection Run-Time Invariant Values (Possible Indeterminate)
-
-@example
-AIO_LISTIO_MAX, Constant, Implemented
-AIO_MAX, Constant, Implemented
-AIO_PRIO_DELTA_MAX, Constant, Implemented
-ARG_MAX, Constant, Implemented
-CHILD_MAX, Constant, Implemented
-DELAYTIMER_MAX, Constant, Implemented
-LOGIN_NAME_MAX, Constant, Implemented
-MQ_OPEN_MAX, Constant, Implemented
-OPEN_MAX, Constant, Implemented
-PAGESIZE, Constant, Implemented
-PTHREAD_DESTRUCTOR_ITERATIONS, Constant, Implemented
-PTHREAD_KEYS_MAX, Constant, Implemented
-PTHREAD_STACK_MIN, Constant, Implemented
-PTHJREAD_THREADS_MAX, Constant, Implemented
-RTSIG_MAX, Constant, Implemented
-SEM_NSEMS_MAX, Constant, Implemented
-SEM_VALUE_MAX, Constant, Implemented
-SIGQUEUE_MAX, Constant, Implemented
-STREAM_MAX, Constant, Implemented
-TIMER_MAX, Constant, Implemented
-TTY_NAME_MAX, Constant, Implemented
-TZNAME_MAX, Constant, Implemented
-@end example
-
-@subsection Pathname Variable Values
-
-@example
-LINK_MAX, Constant, Implemented
-MAX_CANON, Constant, Implemented
-MAX_INPUT, Constant, Implemented
-NAME_MAX, Constant, Implemented
-PATH_MAX, Constant, Implemented
-PIPE_BUF, Constant, Implemented
-@end example
-
-@subsection Invariant Values
-
-@example
-SSIZE_MAX, Constant, Implemented
-@end example
-
-@subsection Maximum Values
-
-@example
-_POSIX_CLOCKRES_MIN, Constant, Implemented
-@end example
-
-@section Symbolic Constants
-
-@subsection Symbolic Constants for the access Function
-
-@example
-R_OK, Constant, Implemented
-W_OK, Constant, Implemented
-X_OK, Constant, Implemented
-F_OK, Constant, Implemented
-@end example
-
-@subsection Symbolic Constants for the lseek Function
-
-@example
-SEEK_SET, Constant, Implemented
-SEEK_CUR, Constant, Implemented
-SEEK_END, Constant, Implemented
-@end example
-
-@subsection Compile-Time Symbolic Constants for Portability Specifications
-
-@example
-_POSIX_ASYNCHRONOUS_IO, Feature Flag, 
-_POSIX_FSYNC, Feature Flag, 
-_POSIX_JOB_CONTROL, Feature Flag, 
-_POSIX_MAPPED_FILES, Feature Flag, 
-_POSIX_MEMLOCK, Feature Flag, 
-_POSIX_MEMLOCK_RANGE, Feature Flag, 
-_POSIX_MEMORY_PROTECTION, Feature Flag, 
-_POSIX_MESSAGE_PASSING, Feature Flag, 
-_POSIX_PRIORITIZED_IO, Feature Flag, 
-_POSIX_PRIORITY_SCHEDULING, Feature Flag, 
-_POSIX_REALTIME_SIGNALS, Feature Flag, 
-_POSIX_SAVED_IDS, Feature Flag, 
-_POSIX_SEMAPHORES, Feature Flag, 
-_POSIX_SHARED_MEMORY_OBJECTS, Feature Flag, 
-_POSIX_SYNCHRONIZED_IO, Feature Flag, 
-_POSIX_THREADS, Feature Flag, 
-_POSIX_THREAD_ATTR_STACKADDR, Feature Flag, 
-_POSIX_THREAD_ATTR_STACKSIZE, Feature Flag, 
-_POSIX_THREAD_PRIORITY_SCHEDULING, Feature Flag, 
-_POSIX_THREAD_PRIO_INHERIT, Feature Flag, 
-_POSIX_THREAD_PRIO_CEILING, Feature Flag, 
-_POSIX_THREAD_PROCESS_SHARED, Feature Flag, 
-_POSIX_THREAD_SAFE_FUNCTIONS, Feature Flag, 
-_POSIX_TIMERS, Feature Flag, 
-_POSIX_VERSION, Feature Flag, 
-@end example
-
-@subsection Execution-Time Symbolic Constants for Portability Specifications
-
-@example
-_POSIX_ASYNC_IO, Feature Flag, 
-_POSIX_CHOWN_RESTRICTED, Feature Flag, 
-_POSIX_NO_TRUNC, Feature Flag, 
-_POSIX_PRIO_IO, Feature Flag, 
-_POSIX_SYNC_IO, Feature Flag, 
-_POSIX_VDISABLE, Feature Flag, 
-@end example
diff --git a/doc/posix1003.1/ch03.t b/doc/posix1003.1/ch03.t
deleted file mode 100644
index fc82426dcf..0000000000
--- a/doc/posix1003.1/ch03.t
+++ /dev/null
@@ -1,203 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Process Primitives
-
-@section Process Creation and Execution
-
-@subsection Process Creation
-
-@example
-fork(), Function, Unimplementable
-@end example
-
-
-@subsection Execute a File
-
-@example
-execl(), Function, Unimplementable, Requires Processes
-execv(), Function, Unimplementable, Requires Processes
-execle(), Function, Unimplementable, Requires Processes
-execve(), Function, Unimplementable, Requires Processes
-execlp(), Function, Unimplementable, Requires Processes
-execvp(), Function, Unimplementable, Requires Processes
-@end example
-
-@subsection Register Fork Handlers
-
-@example
-pthread_atfork(), Function, Unimplementable, Requires Processes
-@end example
-
-@section Process Termination
-
-@subsection Wait for Process Termination
-
-@example
-wait(), Function, Unimplementable, Requires Processes
-waitpid(), Function, Unimplementable, Requires Processes
-WNOHANG, Constant, Unimplementable, Requires Processes
-WUNTRACED, Constant, Unimplementable, Requires Processes
-WIFEXITED(), Function, Unimplementable, Requires Processes
-WEXITSTATUS(), Function, Unimplementable, Requires Processes
-WIFSIGNALED(), Function, Unimplementable, Requires Processes
-WTERMSIG(), Function, Unimplementable, Requires Processes
-WIFSTOPPED(), Function, Unimplementable, Requires Processes
-WSTOPSIG(), Function, Unimplementable, Requires Processes
-@end example
-
-@subsection Terminate a Process
-
-@example
-_exit(), Function, Unimplemented
-@end example
-
-@section Signals
-
-@subsection Signal Concepts
-
-@subsubsection Signal Names
-
-@example
-sigset_t, Type, Implemented
-SIG_DFL, Constant, Implemented
-SIG_IGN, Constant, Implemented
-SIG_ERR, Constant, Implemented
-SIGABRT, Constant, Implemented
-SIGALRM, Constant, Implemented
-SIGFPE, Constant, Implemented
-SIGHUP, Constant, Implemented
-SIGILL, Constant, Implemented
-SIGINT, Constant, Implemented
-SIGKILL, Constant, Implemented
-SIGPIPE, Constant, Implemented
-SIGQUIT, Constant, Implemented
-SIGSEGV, Constant, Implemented
-SIGTERM, Constant, Implemented
-SIGUSR1, Constant, Implemented
-SIGUSR2, Constant, Implemented
-SIGCHLD, Constant, Unimplemented
-SIGCONT, Constant, Unimplemented
-SIGSTOP, Constant, Unimplemented
-SIGTSTP, Constant, Unimplemented
-SIGTTIN, Constant, Unimplemented
-SIGTTOU, Constant, Unimplemented
-SIGBUS, Constant, Implemented
-SIGRTMIN, Constant, Implemented
-SIGRTMAX, Constant, Implemented
-@end example
-
-NOTE: SIG_ERR is technically an extension to the C Library which is
-not documented anywhere else according to the index.
-@subsubsection Signal Generation and Delivery
-
-@example
-struct sigevent, Type, Implemented
-union sigval, Type, Implemented
-SIGEV_NONE, Constant, Implemented
-SIGEV_SIGNAL, Constant, Implemented
-SIGEV_THREAD, Constant, Implemented
-@end example
-
-@subsubsection Signal Actions
-
-@example
-siginfo_t, Type, Implemented
-SI_USER, Constant, Implemented
-SI_QUEUE, Constant, Implemented
-SI_TIMER, Constant, Implemented
-SI_ASYNCIO, Constant, Implemented
-SI_MESGQ, Constant, Implemented
-@end example
-
-@subsection Send a Signal to a Process
-
-@example
-kill(), Function, Implemented
-@end example
-
-@subsection Manipulate Signal Sets
-
-@example
-sigemptyset(), Function, Implemented
-sigfillset(), Function, Implemented
-sigaddset(), Function, Implemented
-sigdelset(), Function, Implemented
-sigismember(), Function, Implemented
-@end example
-
-@subsection Examine and Change Signal Action
-
-@example
-sigaction(), Function, Implemented
-sigaction, Type, Implemented
-SA_NOCLDSTOP, Constant, Implemented
-SA_SIGINFO, Constant, Implemented
-@end example
-
-@subsection Examine and Change Blocked Signals
-
-@example
-pthread_sigmask(), Function, Implemented
-sigprocmask(), Function, Implemented
-SIG_BLOCK, Constant, Implemented
-SIG_UNBLOCK, Constant, Implemented
-SIG_SETMASK, Constant, Implemented
-@end example
-
-@subsection Examine Pending Signals
-
-@example
-sigpending(), Function, Implemented
-@end example
-
-@subsection Wait for a Signal
-
-@example
-sigsuspend(), Function, Implemented
-@end example
-
-@subsection Synchronously Accept a Signal
-
-@example
-sigwait(), Function, Implemented
-sigwaitinfo(), Function, Implemented
-sigtimedwait(), Function, Implemented
-@end example
-
-@subsection Queue a Signal to a Process
-
-@example
-sigqueue(), Function, Implemented
-@end example
-
-@subsection Send a Signal to a Thread
-
-@example
-pthread_kill(), Function, Implemented
-@end example
-
-@section Timer Operations
-
-@subsection Schedule Alarm
-
-@example
-alarm(), Function, Implemented
-@end example
-
-@subsection Suspend Process Execution
-
-@example
-pause(), Function, Implemented
-@end example
-
-@subsection Delay Process Execution
-
-@example
-sleep(), Function, Implemented
-@end example
diff --git a/doc/posix1003.1/ch04.t b/doc/posix1003.1/ch04.t
deleted file mode 100644
index bc635551b3..0000000000
--- a/doc/posix1003.1/ch04.t
+++ /dev/null
@@ -1,181 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Process Environment
-
-@section Process Identification
-
-@subsection Get Process and Parent Process IDs
-
-@example
-getpid(), Function, Dummy Implementation
-getppid(), Function, Dummy Implementation
-@end example
-
-@section User Identification
-
-@subsection Get Real User Effective User Real Group and Effective Group IDs
-
-@example
-getuid(), Function, Dummy Implementation
-geteuid(), Function, Dummy Implementation
-getgid(), Function, Dummy Implementation
-getegid(), Function, Dummy Implementation
-@end example
-
-@subsection Set User and Group IDs
-
-@example
-setuid(), Function, Dummy Implementation
-setgid(), Function, Dummy Implementation
-@end example
-
-@subsection Get Supplementary Group IDs
-
-@example
-getgroups(), Function, Dummy Implementation
-@end example
-
-@subsection Get User Name
-
-@example
-getlogin(), Function, Dummy Implementation
-getlogin_r(), Function, Dummy Implementation
-@end example
-
-@section Process Groups
-
-@subsection Get Process Group ID
-
-@example
-getpgrp(), Function, Dummy Implementation
-@end example
-
-@subsection Create Session and Set Process Group ID
-
-@example
-setsid(), Function, Dummy Implementation
-@end example
-
-@subsection Set Process Group ID for Job Control
-
-@example
-setpgid(), Function, Dummy Implementation
-@end example
-
-@section System Identification
-
-@subsection Get System Name
-
-@example
-struct utsname, Type, Untested Implementation
-uname(), Function, Untested Implementation
-@end example
-
-@section Time
-
-@subsection Get System Time
-
-@example
-time(), Function, Implemented
-@end example
-
-@subsection Get Process Times
-
-@example
-struct tms, Type, Implemented
-times(), Function, Implemented
-@end example
-
-NOTE: @code{times} always returns 0 for tms_stime, tms_cutime, and
-tms_cstime fields of the @code{struct tms} returned.
-
-@section Environment Variables
-
-@subsection Environment Access
-
-@example
-getenv(), Function, Implemented
-@end example
-
-@section Terminal Identification
-
-@subsection Generate Terminal Pathname
-
-@example
-ctermid(), Function, Unimplemented
-@end example
-
-@subsection Determine Terminal Device Name
-
-@example
-ttyname(), Function, Untested Implementation, assumes directory services
-ttyname_r(), Function, Unimplemented
-isatty(), Function, Partial Implementation
-@end example
-
-@section Configurable System Variables
-
-@subsection Get Configurable System Variables
-
-@example
-sysconf(), Function, Not Implemented
-_SC_AIO_LISTIO_MAX, Constant, Implemented
-_SC_AIO_MAX, Constant, Implemented
-_SC_AIO_PRIO_DELTA_MAX, Constant, Implemented
-_SC_ARG_MAX, Constant, Implemented
-_SC_CHILD_MAX, Constant, Implemented
-_SC_CLK_TCK, Constant, Implemented
-CLK_TCK, Constant, Implemented
-_SC_DELAYTIMER_MAX, Constant, Implemented
-_SC_GETGR_R_SIZE_MAX, Constant, Implemented
-_SC_GETPW_R_SIZE_MAX, Constant, Implemented
-_SC_LOGIN_NAME_MAX, Constant, Implemented
-_SC_MQ_OPEN_MAX, Constant, Implemented
-_SC_MQ_PRIO_MAX, Constant, Implemented
-_SC_NGROUPS_MAX, Constant, Implemented
-_SC_OPEN_MAX, Constant, Implemented
-_SC_PAGESIZE, Constant, Implemented
-_SC_RTSIG_MAX, Constant, Implemented
-_SC_SEM_NSEMS_MAX, Constant, Implemented
-_SC_SEM_VALUE_MAX, Constant, Implemented
-_SC_SIGQUEUE_MAX, Constant, Implemented
-_SC_STREAM_MAX, Constant, Implemented
-_SC_THREAD_DESTRUCTOR_ITERATIONS, Constant, Implemented
-_SC_THREAD_KEYS_MAX, Constant, Implemented
-_SC_THREAD_STACK_MIN, Constant, Implemented
-_SC_THREAD_THREADS_MAX, Constant, Implemented
-_SC_TIMER_MAX, Constant, Implemented
-_SC_TTY_NAME_MAX, Constant, Implemented
-_SC_TZNAME_MAX, Constant, Implemented
-_SC_ASYNCHRONOUS_IO, Constant, Implemented
-_SC_FSYNC, Constant, Implemented
-_SC_JOB_CONROL, Constant, Implemented
-_SC_MAPPED_FILES, Constant, Implemented
-_SC_MEMLOCK, Constant, Implemented
-_SC_MEMLOCK_RANGE, Constant, Implemented
-_SC_MEMORY_PROTECTION, Constant, Implemented
-_SC_MESSAGE_PASSING, Constant, Implemented
-_SC_PRIORITIZED_IO, Constant, Implemented
-_SC_PRIORITY_SCHEDULING, Constant, Unimplemented
-_SC_REALTIME_SIGNALS, Constant, Implemented
-_SC_SAVED_IDS, Constant, Implemented
-_SC_SEMAPHORES, Constant, Implemented
-_SC_SHARED_MEMORY_OBJECTS, Constant, Implemented
-_SC_SYNCHRONIZED_IO, Constant, Implemented
-_SC_TIMERS, Constant, Implemented
-_SC_THREADS, Constant, Implemented
-_SC_THREAD_ATTR_STACKADDR, Constant, Implemented
-_SC_THREAD_ATTR_STACKSIZE, Constant, Implemented
-_SC_THREAD_PRIORITY_SCHEDULING, Constant, Implemented
-_SC_THREAD_PRIO_INHERIT, Constant, Implemented
-_SC_THREAD_PRIO_PROTECT, Constant, Unimplemented
-_SC_THREAD_PROCESS_SHARED, Constant, Implemented
-_SC_THREAD_SAFE_FUNCTIONS, Constant, Implemented
-_SC_VERSION, Constant, Implemented
-@end example
diff --git a/doc/posix1003.1/ch05.t b/doc/posix1003.1/ch05.t
deleted file mode 100644
index 42996e9744..0000000000
--- a/doc/posix1003.1/ch05.t
+++ /dev/null
@@ -1,220 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Files and Directories
-
-@section Directories
-
-@subsection Format of Directory Entries
-
-@subsection Directory Operations
-
-@example
-struct dirent, Type, Implemented
-opendir(), Function, Implemented
-readdir(), Function, Implemented
-readdir_r(), Function, Implemented
-rewinddir(), Function, Implemented
-closedir(), Function, Implemented
-@end example
-
-@section Working Directory
-
-@subsection Change Current Working Directory
-
-@example
-chdir(), Function, Implemented
-@end example
-
-@subsection Get Working Directory Pathname
-
-@example
-getcwd(), Function, Untested Implementation, assumes directory services
-@end example
-
-@section General File Creation
-
-@subsection Open a File
-
-@example
-open(), Function, Implemented
-O_RDONLY, Constant, Implemented
-O_WRONLY, Constant, Implemented
-O_RDWR, Constant, Implemented
-O_APPEND, Constant, Implemented
-O_CREAT, Constant, Implemented
-O_DSYNC, Constant, Unimplemented
-O_EXCL, Constant, Implemented
-O_NOCTTY, Constant, Implemented
-O_NONBLOCK, Constant, Implemented
-O_RSYNC, Constant, Unimplemented
-O_SYNC, Constant, Implemented
-O_TRUNC, Constant, Implemented
-@end example
-
-NOTE: In the newlib fcntl.h, O_SYNC is defined only if _POSIX_SOURCE is
-not defined.  This seems wrong.
-
-@subsection Create a New File or Rewrite an Existing One
-
-@example
-creat(), Function, Implemented
-@end example
-
-@subsection Set File Creation Mask
-
-@example
-umask(), Function, Implemented
-@end example
-
-@subsection Link to a File
-
-@example
-link(), Function, Implemented
-@end example
-
-@section Special File Creation
-
-@subsection Make a Directory
-
-@example
-mkdir(), Function, Implemented
-@end example
-
-@subsection Make a FIFO Special File
-
-@example
-mkfifo(), Function, Untested Implementation
-@end example
-
-@section File Removal
-
-@subsection Remove Directory Entries
-
-@example
-unlink(), Function, Implemented
-@end example
-
-@subsection Remove a Directory
-
-@example
-rmdir(), Function, Implemented
-@end example
-
-@subsection Rename a File
-
-@example
-rename(), Function, Implemented
-@end example
-
-@section File Characteristics
-
-@subsection File Characteristics Header and Data Structure
-
-@example
-struct stat, Type, Implemented
-@end example
-
-@subsubsection <sys/stat.h> File Types
-
-@example
-S_ISBLK(), Function, Implemented
-S_ISCHR(), Function, Implemented
-S_ISDIR(), Function, Implemented
-S_ISFIFO(), Function, Implemented
-S_ISREG(), Function, Implemented
-S_TYPEISMQ(), Function, Unimplemented
-S_TYPEISSEM(), Function, Unimplemented
-S_TYPEISSHM(), Function, Unimplemented
-@end example
-
-@subsubsection <sys/stat.h> File Modes
-
-@example
-S_IRWXU, Constant, Implemented
-S_IRUSR, Constant, Implemented
-S_IWUSR, Constant, Implemented
-S_IXUSR, Constant, Implemented
-S_IRWXG, Constant, Implemented
-S_IRGRP, Constant, Implemented
-S_IWGRP, Constant, Implemented
-S_IXGRP, Constant, Implemented
-S_IRWXO, Constant, Implemented
-S_IROTH, Constant, Implemented
-S_IWOTH, Constant, Implemented
-S_IXOTH, Constant, Implemented
-S_ISUID, Constant, Implemented
-S_ISGID, Constant, Implemented
-@end example
-
-@subsubsection <sys/stat.h> Time Entries
-
-@subsection Get File Status
-
-@example
-stat(), Function, Implemented
-fstat(), Function, Implemented
-@end example
-
-@subsection Check File Accessibility
-
-@example
-access(), Function, Implemented
-@end example
-
-@subsection Change File Modes
-
-@example
-chmod(), Function, Implemented
-fchmod(), Function, Implemented
-@end example
-
-@subsection Change Owner and Group of a File
-
-@example
-chown(), Function, Implemented
-@end example
-
-@subsection Set File Access and Modification Times
-
-@example
-struct utimbuf, Type, Implemented
-utime(), Function, Dummy Implementation
-@end example
-
-@subsection Truncate a File to a Specified Length
-
-@example
-ftruncate(), Function, Implemented
-@end example
-
-@section Configurable Pathname Variable
-
-@subsection Get Configurable Pathname Variables
-
-@example
-pathconf(), Function, Implemented
-fpathconf(), Function, Implemented
-_PC_LINK_MAX, Constant, Implemented
-_PC_MAX_CANON, Constant, Implemented
-_PC_MAX_INPUT, Constant, Implemented
-_PC_MAX_INPUT, Constant, Implemented
-_PC_NAME_MAX, Constant, Implemented
-_PC_PATH_MAX, Constant, Implemented
-_PC_PIPE_BUF, Constant, Implemented
-_PC_ASYNC_IO, Constant, Implemented
-_PC_CHOWN_RESTRICTED, Constant, Implemented
-_PC_NO_TRUNC, Constant, Implemented
-_PC_PRIO_IO, Constant, Implemented
-_PC_SYNC_IO, Constant, Implemented
-_PC_VDISABLE, Constant, Implemented
-@end example
-
-NOTE: The newlib unistd.h and sys/unistd.h are installed and the
-include search patch is used to get the right one.  There are 
-conflicts between the newlib unistd.h and RTEMS' version.
diff --git a/doc/posix1003.1/ch06.t b/doc/posix1003.1/ch06.t
deleted file mode 100644
index 5861886a8e..0000000000
--- a/doc/posix1003.1/ch06.t
+++ /dev/null
@@ -1,173 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Input and Output Primitives
-
-@section Pipes
-
-@subsection Create an Inter-Process Channel
-
-@example
-pipe(), Function, Dummy Implementation
-@end example
-
-@section File Descriptor Manipulation
-
-@subsection Duplicate an Open File Descriptor
-
-@example
-dup(), Function, Implemented
-dup2(), Function, Untested Iimplementation
-@end example
-
-@section File Descriptor Deassignment
-
-@subsection Close a File
-
-@example
-close(), Function, Implemented
-@end example
-
-@section Input and Output
-
-@subsection Read from a File
-
-@example
-read(), Function, Implemented
-@end example
-
-@subsection Write to a File
-
-@example
-write(), Function, Implemented
-@end example
-
-@section Control Operations on Files
-
-@subsection Data Definitions for File Control Operations
-
-@subsection File Control
-
-@example
-struct flock, Type, Unimplemented
-fcntl(), Function, Implemented
-F_DUPFD, Constant, Implemented
-F_GETFD, Constant, Implemented
-F_GETLK, Constant, Implemented
-F_SETFD, Constant, Implemented
-F_GETFL, Constant, Implemented
-F_SETFL, Constant, Implemented
-F_SETLK, Constant, Implemented
-F_SETLKW, Constant, Implemented
-FD_CLOEXEC, Constant, Implemented
-F_RDLCK, Constant, Implemented
-F_UNLCK, Constant, Implemented
-F_WRLCK, Constant, Implemented
-O_ACCMODE, Constant, Implemented
-@end example
-
-NOTE: A number of constants are used by both @code{open} and @code{fcntl}.
-@code{O_CREAT}, @code{O_EXCL}, @code{O_NOCTTY}, @code{O_TRUNC},
-@code{O_APPEND}, @code{O_DSYNC}, @code{O_NONBLOCK}, @code{O_RSYNC},
-@code{O_SYNC}, @code{O_RDONLY}, @code{O_RDWR}, and @code{O_WRONLY}
-are also included in another section.  @xref{Open a File}.
-
-@subsection Reposition Read/Write File Offset
-
-@example
-lseek(), Function, Partial Implementation
-SEEK_SET, Constant, Implemented
-SEEK_CUR, Constant, Implemented
-SEEK_END, Constant, Implemented
-@end example
-
-@section File Synchronization
-
-@subsection Synchronize the State of a File
-
-@example
-fsync(), Function, Implemented
-@end example
-
-@subsection Synchronize the Data of a File
-
-@example
-fdatasync(), Function, Implemented
-@end example
-
-@section Asynchronous Input and Output
-
-@subsection Data Definitions for Asynchronous Input and Output
-
-@subsubsection Asynchronous I/O Control Block 
-
-@example
-struct aiocb, Type, Untested Implementation
-@end example
-
-@subsubsection Asynchronous I/O Manifest Constants
-
-@example
-AIO_CANCELED, Constant, Implemented
-AIO_NOTCANCELED, Constant, Implemented
-AIO_ALLDONE, Constant, Implemented
-LIO_WAIT, Constant, Implemented
-LIO_NOWAIT, Constant, Implemented
-LIO_READ, Constant, Implemented
-LIO_WRITE, Constant, Implemented
-LIO_NOP, Constant, Implemented
-@end example
-
-@subsection Asynchronous Read
-
-@example
-aio_read(), Function, Dummy Implementation
-@end example
-
-@subsection Asynchronous Write
-
-@example
-aio_write(), Function, Dummy Implementation
-@end example
-
-@subsection List Directed I/O
-
-@example
-lio_listio(), Function, Dummy Implementation
-@end example
-
-@subsection Retrieve Error Status of Asynchronous I/O Operation
-
-@example
-aio_error(), Function, Dummy Implementation
-@end example
-
-@subsection Retrieve Return Status of Asynchronous I/O Operation
-
-@example
-aio_return(), Function, Dummy Implementation
-@end example
-
-@subsection Cancel Asynchronous I/O Request
-
-@example
-aio_cancel(), Function, Dummy Implementation
-@end example
-
-@subsection Wait for Asynchronous I/O Request
-
-@example
-aio_suspend(), Function, Dummy Implementation
-@end example
-
-@subsection Asynchronous File Synchronization
-
-@example
-aio_fsync(), Function, Dummy Implementation
-@end example
-
diff --git a/doc/posix1003.1/ch07.t b/doc/posix1003.1/ch07.t
deleted file mode 100644
index 69bbc50a7d..0000000000
--- a/doc/posix1003.1/ch07.t
+++ /dev/null
@@ -1,207 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Device- and Class-Specific Functions
-
-@section General Terminal Interface
-
-@subsection Interface Characteristics
-
-@subsubsection Opening a Terminal Device File
-
-@subsubsection Process Groups (TTY)
-
-@subsubsection The Controlling Terminal
-
-@subsubsection Terminal Access Control
-
-@subsubsection Input Processing and Reading Data
-
-@subsubsection Canonical Mode Input Processing
-
-@subsubsection Noncanonical Mode Input Processing
-
-@lowersections
-
-@subsubsection Case A - MIN > 0 and TIME > 0
-
-@subsubsection Case B - MIN > 0 and TIME = 0
-
-@subsubsection Case C - MIN = 0 and TIME > 0
-
-@subsubsection Case D - MIN = 0 and TIME = 0
-
-@raisesections
-
-@subsubsection Writing Data and Output Processing
-
-@subsubsection Special Characters
-
-@example
-INTR, Constant, Unimplemented
-QUIT, Constant, Unimplemented
-ERASE, Constant, Implemented
-KILL, Constant, Implemented
-EOF, Constant, Implemented
-NL, Constant, Unimplemented
-EOL, Constant, Unimplemented
-SUSP, Constant, Unimplemented
-STOP, Constant, Unimplemented
-START, Constant, Unimplemented
-CR, Constant, Unimplemented
-@end example
-
-@subsubsection Modem Disconnect
-
-@subsubsection Closing a Terminal Device File
-
-@subsection Parameters That Can Be Set
-
-@subsubsection termios Structure
-
-@example
-tcflag_t, Type, Implemented
-cc_t, Type, Implemented
-struct termios, Type, Partial Implementation
-@end example
-
-@subsubsection Input Modes
-
-@example
-BRKINT, Constant, Implemented
-ICRNL, Constant, Implemented
-IGNBREAK, Constant, Unimplemented
-IGNCR, Constant, Implemented
-IGNPAR, Constant, Implemented
-INLCR, Constant, Implemented
-INPCK, Constant, Implemented
-ISTRIP, Constant, Implemented
-IXOFF, Constant, Implemented
-IXON, Constant, Implemented
-PARMRK, Constant, Implemented
-@end example
-
-@subsubsection Output Modes
-
-@example
-OPOST, Constant, Implemented
-@end example
-
-@subsubsection Control Modes
-
-@example
-CLOCAL, Constant, Implemented
-CREAD, Constant, Implemented
-CSIZE, Constant, Implemented
-CS5, Constant, Implemented
-CS6, Constant, Implemented
-CS7, Constant, Implemented
-CS8, Constant, Implemented
-CSTOPB, Constant, Implemented
-HUPCL, Constant, Implemented
-PARENB, Constant, Implemented
-PARODD, Constant, Implemented
-@end example
-
-@subsubsection Local Modes
-
-@example
-ECHO, Constant, Implemented
-ECHOE, Constant, Implemented
-ECHOK, Constant, Implemented
-ECHONL, Constant, Implemented
-ICANON, Constant, Implemented
-IEXTEN, Constant, Implemented
-ISIG, Constant, Implemented
-NOFLSH, Constant, Implemented
-TOSTOP, Constant, Implemented
-@end example
-
-@subsubsection Special Control Characters
-
-@example
-VEOF, Constant, Implemented
-VEOL, Constant, Implemented
-VERASE, Constant, Implemented
-VINTR, Constant, Implemented
-VKILL, Constant, Implemented
-VQUIT, Constant, Implemented
-VSUSP, Constant, Implemented
-VSTART, Constant, Implemented
-VSTOP, Constant, Implemented
-VMIN, Constant, Implemented
-VTIME, Constant, Implemented
-@end example
-
-@subsection Baud Rate Values
-
-@example
-B0, Constant, Implemented
-B50, Constant, Implemented
-B75, Constant, Implemented
-B110, Constant, Implemented
-B134, Constant, Implemented
-B150, Constant, Implemented
-B200, Constant, Implemented
-B300, Constant, Implemented
-B600, Constant, Implemented
-B1200, Constant, Implemented
-B1800, Constant, Implemented
-B2400, Constant, Implemented
-B4800, Constant, Implemented
-B9600, Constant, Implemented
-B19200, Constant, Implemented
-B38400, Constant, Implemented
-@end example
-
-@subsubsection Baud Rate Functions
-
-@example
-cfgetospeed(), Function, Implemented
-cfsetospeed(), Function, Implemented
-cfgetispeed(), Function, Implemented
-cfsetispeed(), Function, Implemented
-TCIFLUSH, Constant, Implemented
-TCOFLUSH, Constant, Implemented
-TCIOFLUSH, Constant, Implemented
-TCOOFF, Constant, Implemented
-TCOON, Constant, Implemented
-TCIOOFF, Constant, Implemented
-TCIOON, Constant, Implemented
-@end example
-
-@section General Terminal Interface Control Functions
-
-@subsection Get and Set State
-
-@example
-tcgetattr(), Function, Implemented
-tcsetattr(), Function, Implemented
-@end example
-
-@subsection Line Control Functions
-
-@example
-tcsendbreak(), Function, Unimplemented
-tcdrain(), Function, Implemented
-tcflush(), Function, Unimplemented
-tcflow(), Function, Unimplemented
-@end example
-
-@subsection Get Foreground Process Group ID
-
-@example
-tcgetprgrp(), Function, Unimplementable
-@end example
-
-@subsection Set Foreground Process Group ID
-
-@example
-tcsetprgrp(), Function, Unimplementable
-@end example
-
diff --git a/doc/posix1003.1/ch08.t b/doc/posix1003.1/ch08.t
deleted file mode 100644
index 35a81c0161..0000000000
--- a/doc/posix1003.1/ch08.t
+++ /dev/null
@@ -1,288 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Language-Specific Services for the C Programming Language
-
-@section Referenced C Language Routines
-
-ANSI C Section 4.2 --- Diagnostics
-
-@example
-assert(), Function, Implemented
-@end example
-
-ANSI C Section 4.3 --- Character Handling
-
-@example
-isalnum(), Function, Implemented
-isalpha(), Function, Implemented
-iscntrl(), Function, Implemented
-isdigit(), Function, Implemented
-isgraph(), Function, Implemented
-islower(), Function, Implemented
-isprint(), Function, Implemented
-ispunct(), Function, Implemented
-isspace(), Function, Implemented
-isupper(), Function, Implemented
-isxdigit(), Function, Implemented
-tolower(), Function, Implemented
-toupper(), Function, Implemented
-@end example
-
-ANSI C Section 4.4 --- Localization
-
-@example
-setlocale(), Function, Partial Implementation
-@end example
-
-ANSI C Section 4.5 --- Mathematics
-
-@example
-acos(), Function, Implemented
-asin(), Function, Implemented
-atan(), Function, Implemented
-atan2(), Function, Implemented
-cos(), Function, Implemented
-sin(), Function, Implemented
-tan(), Function, Implemented
-cosh(), Function, Implemented
-sinh(), Function, Implemented
-tanh(), Function, Implemented
-exp(), Function, Implemented
-frexp(), Function, Implemented
-ldexp(), Function, Implemented
-log(), Function, Implemented
-log10(), Function, Implemented
-modf(), Function, Implemented
-pow(), Function, Implemented
-sqrt(), Function, Implemented
-ceil(), Function, Implemented
-fabs(), Function, Implemented
-floor(), Function, Implemented
-fmod(), Function, Implemented
-@end example
-
-ANSI C Section 4.6 --- Non-Local Jumps
-
-@example
-setjmp(), Function, Implemented
-longjmp(), Function, Implemented
-@end example
-
-ANSI C Section 4.9 --- Input/Output
-
-@example
-FILE, Type, Implemented
-clearerr(), Function, Implemented
-fclose(), Function, Implemented
-feof(), Function, Implemented
-ferror(), Function, Implemented
-fflush(), Function, Implemented
-fgetc(), Function, Implemented
-fgets(), Function, Implemented
-fopen(), Function, Implemented
-fputc(), Function, Implemented
-fputs(), Function, Implemented
-fread(), Function, Implemented
-freopen(), Function, Implemented
-fseek(), Function, Implemented
-ftell(), Function, Implemented
-fwrite(), Function, Implemented
-getc(), Function, Implemented
-getchar(), Function, Implemented
-gets(), Function, Implemented
-perror(), Function, Implemented
-printf(), Function, Implemented
-fprintf(), Function, Implemented
-sprintf(), Function, Implemented
-putc(), Function, Implemented
-putchar(), Function, Implemented
-puts(), Function, Implemented
-remove(), Function, Implemented
-rewind(), Function, Implemented
-scanf(), Function, Implemented
-fscanf(), Function, Implemented
-sscanf(), Function, Implemented
-setbuf(), Function, Implemented
-tmpfile(), Function, Implemented
-tmpnam(), Function, Implemented
-ungetc(), Function, Implemented
-@end example
-
-NOTE: @code{rename} is also included in another section.  @ref{Rename a File}.
-
-ANSI C Section 4.10 --- General Utilities
-
-@example
-abs(), Function, Implemented
-atof(), Function, Implemented
-atoi(), Function, Implemented
-atol(), Function, Implemented
-rand(), Function, Implemented
-srand(), Function, Implemented
-calloc(), Function, Implemented
-free(), Function, Implemented
-malloc(), Function, Implemented
-realloc(), Function, Implemented
-abort(), Function, Implemented
-exit(), Function, Implemented
-bsearch(), Function, Implemented
-qsort(), Function, Implemented
-@end example
-
-NOTE: @code{getenv} is also included in another section.  
-@ref{Environment Access}.
-
-ANSI C Section 4.11 --- String Handling
-
-@example
-strcpy(), Function, Implemented
-strncpy(), Function, Implemented
-strcat(), Function, Implemented
-strncat(), Function, Implemented
-strcmp(), Function, Implemented
-strncmp(), Function, Implemented
-strchr(), Function, Implemented
-strcspn(), Function, Implemented
-strpbrk(), Function, Implemented
-strrchr(), Function, Implemented
-strspn(), Function, Implemented
-strstr(), Function, Implemented
-strtok(), Function, Implemented
-strlen(), Function, Implemented
-@end example
-
-ANSI C Section 4.12 --- Date and Time Handling
-
-@example
-asctime(), Function, Implemented
-ctime(), Function, Implemented
-gmtime(), Function, Implemented
-localtime(), Function, Implemented
-mktime(), Function, Implemented
-strftime(), Function, Implemented
-@end example
-
-NOTE: RTEMS has no notion of time zones.
-
-NOTE: @code{time} is also included in another section.  
-@ref{Get System Time}.
-
-From Surrounding Text
-
-@example
-EXIT_SUCCESS, Constant, Implemented
-EXIT_FAILURE, Constant, Implemented
-@end example
-
-
-@subsection Extensions to Time Functions
-
-@subsection Extensions to setlocale Function
-
-@example
-LC_CTYPE, Constant, Implemented
-LC_COLLATE, Constant, Implemented
-LC_TIME, Constant, Implemented
-LC_NUMERIC, Constant, Implemented
-LC_MONETARY, Constant, Implemented
-LC_ALL, Constant, Implemented
-@end example
-
-@section C Language Input/Output Functions
-
-@subsection Map a Stream Pointer to a File Descriptor
-
-@example
-fileno(), Function, Implemented
-STDIN_FILENO, Constant, Implemented
-STDOUT_FILENO, Constant, Implemented
-STDERR_FILENO, Constant, Implemented
-@end example
-
-@subsection Open a Stream on a File Descriptor
-
-@example
-fdopen(), Function, Implemented
-@end example
-
-@subsection Interactions of Other FILE-Type C Functions
-
-@subsection Operations on Files - the remove Function
-
-@subsection Temporary File Name - the tmpnam Function
-
-@subsection Stdio Locking Functions
-
-@example
-flockfile(), Function, Unimplemented
-ftrylockfile(), Function, Unimplemented
-funlockfile(), Function, Unimplemented
-@end example
-
-@subsection Stdio With Explicit Client Locking
-
-@example
-getc_unlocked(), Function, Unimplemented
-getchar_unlocked(), Function, Unimplemented
-putc_unlocked(), Function, Unimplemented
-putchar_unlocked(), Function, Unimplemented
-@end example
-
-@section Other C Language Functions
-
-@subsection Nonlocal Jumps
-
-@example
-sigjmp_buf, Type, Unimplemented
-sigsetjmp(), Function, Unimplemented
-siglongjmp(), Function, Unimplemented
-@end example
-
-@subsection Set Time Zone
-
-@example
-tzset(), Function, Unimplemented
-@end example
-
-@subsection Find String Token
-
-@example
-strtok_r(), Function, Implemented
-@end example
-
-@subsection ASCII Time Representation
-
-@example
-asctime_r(), Function, Implemented
-@end example
-
-@subsection Current Time Representation
-
-@example
-ctime_r(), Function, Implemented
-@end example
-
-@subsection Coordinated Universal Time
-
-@example
-gmtime_r(), Function, Implemented
-@end example
-
-@subsection Local Time
-
-@example
-localtime_r(), Function, Implemented
-@end example
-
-@subsection Pseudo-Random Sequence Generation Functions
-
-@example
-rand_r(), Function, Implemented
-@end example
-
diff --git a/doc/posix1003.1/ch09.t b/doc/posix1003.1/ch09.t
deleted file mode 100644
index e299db252b..0000000000
--- a/doc/posix1003.1/ch09.t
+++ /dev/null
@@ -1,34 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter System Databases
-
-@section System Databases Section
-
-@section Database Access
-
-@subsection Group Database Access
-
-@example
-struct group, Type, Untested Implementation
-getgrgid(), Function, Unimplemented
-getgrgid_r(), Function, Unimplemented
-getgrname(), Function, Unimplemented
-getgrnam_r(), Function, Unimplemented
-@end example
-
-@subsection User Database Access
-
-@example
-struct passwd, Type, Untested Implementation
-getpwuid(), Function, Untested Implemented, assumes /etc/passwd exists
-getpwuid_r(), Function, Unimplemented
-getpwnam(), Function, Untested Implemented, assumes /etc/passwd exists
-getpwnam_r(), Function, Unimplemented
-@end example
-
diff --git a/doc/posix1003.1/ch10.t b/doc/posix1003.1/ch10.t
deleted file mode 100644
index ced40c63a2..0000000000
--- a/doc/posix1003.1/ch10.t
+++ /dev/null
@@ -1,68 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Data Interchange Format
-
-@section Archive/Interchange File Format
-
-@subsection Extended tar Format
-
-@example
-tar format, Type, Unimplemented
-TMAGIC, Constant, Unimplemented
-TMAGLEN, Constant, Unimplemented
-TVERSION, Constant, Unimplemented
-TVERSLEN, Constant, Unimplemented
-REGTYPE, Constant, Unimplemented
-AREGTYPE, Constant, Unimplemented
-LNKTYPE, Constant, Unimplemented
-SYMTYPE, Constant, Unimplemented
-CHRTYPE, Constant, Unimplemented
-BLKTYPE, Constant, Unimplemented
-DIRTYPE, Constant, Unimplemented
-FIFOTYPE, Constant, Unimplemented
-CONTTYPE, Constant, Unimplemented
-TSUID, Constant, Unimplemented
-TSGID, Constant, Unimplemented
-TSVTX, Constant, Unimplemented
-TUREAD, Constant, Unimplemented
-TUWRITE, Constant, Unimplemented
-TUEXEC, Constant, Unimplemented
-TGREAD, Constant, Unimplemented
-TGWRITE, Constant, Unimplemented
-TGEXEC, Constant, Unimplemented
-TOREAD, Constant, Unimplemented
-TOWRITE, Constant, Unimplemented
-TOEXEC, Constant, Unimplemented
-@end example
-
-NOTE: Requires <tar.h> which is not in newlib.
-
-@subsection Extended cpio Format
-
-@example
-cpio format, Type, Unimplemented
-C_IRUSER, Constant, Unimplemented
-C_IWUSER, Constant, Unimplemented
-C_IXUSER, Constant, Unimplemented
-C_IRGRP, Constant, Unimplemented
-C_IWGRP, Constant, Unimplemented
-C_IXGRP, Constant, Unimplemented
-C_IROTH, Constant, Unimplemented
-C_IWOTH, Constant, Unimplemented
-C_IXOTH, Constant, Unimplemented
-C_ISUID, Constant, Unimplemented
-C_ISGID, Constant, Unimplemented
-C_ISVTX, Constant, Unimplemented
-@end example
-
-NOTE: POSIX does not require a header file or structure.  RedHat Linux
-5.0 does not have a <cpio.h> although Solaris 2.6 does.
-
-@subsection Multiple Volumes
-
diff --git a/doc/posix1003.1/ch11.t b/doc/posix1003.1/ch11.t
deleted file mode 100644
index 972d063cfe..0000000000
--- a/doc/posix1003.1/ch11.t
+++ /dev/null
@@ -1,130 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Synchronization
-
-@section Semaphore Characteristics
-
-@example
-sem_t, Type, Untested Implementation
-@end example
-
-@section Semaphore Functions
-
-@subsection Initialize an Unnamed Semaphore
-
-@example
-sem_init(), Function, Untested Implementation
-SEM_FAILED, Constant, Unimplemented
-@end example
-
-@subsection Destroy an Unnamed Semaphore
-
-@example
-sem_destroy(), Function, Untested Implementation
-@end example
-
-@subsection Initialize/Open a Named Semaphore
-
-@example
-sem_open(), Function, Untested Implementation
-@end example
-
-@subsection Close a Named Semaphore
-
-@example
-sem_close(), Function, Untested Implementation
-@end example
-
-@subsection Remove a Named Semaphore
-
-@example
-sem_unlink(), Function, Untested Implementation
-@end example
-
-@subsection Lock a Semaphore
-
-@example
-sem_wait(), Function, Untested Implementation
-sem_trywait(), Function, Untested Implementation
-@end example
-
-@subsection Unlock a Semaphore
-
-@example
-sem_post(), Function, Untested Implementation
-@end example
-
-@subsection Get the Value of a Semaphore
-
-@example
-sem_getvalue(), Function, Untested Implementation
-@end example
-
-@section Mutexes
-
-@subsection Mutex Initialization Attributes
-
-@example
-pthread_mutexattr_init(), Function, Implemented
-pthread_mutexattr_destroy(), Function, Implemented
-pthread_mutexattr_getpshared(), Function, Implemented
-pthread_mutexattr_setpshared(), Function, Implemented
-PTHREAD_PROCESS_SHARED, Constant, Implemented
-PTHREAD_PROCESS_PRIVATE, Constant, Implemented
-@end example
-
-@subsection Initializing and Destroying a Mutex
-
-@example
-pthread_mutex_init(), Function, Implemented
-pthread_mutex_destroy(), Function, Implemented
-PTHREAD_MUTEX_INITIALIZER, Constant, Implemented
-@end example
-
-@subsection Locking and Unlocking a Mutex
-
-@example
-pthread_mutex_lock(), Function, Implemented
-pthread_mutex_trylock(), Function, Implemented
-pthread_mutex_unlock(), Function, Implemented
-@end example
-
-@section Condition Variables
-
-@subsection Condition Variable Initialization Attributes
-
-@example
-pthread_condattr_init(), Function, Implemented
-pthread_condattr_destroy(), Function, Implemented
-pthread_condattr_getpshared(), Function, Implemented
-pthread_condattr_setpshared(), Function, Implemented
-@end example
-
-@subsection Initialization and Destroying Condition Variables
-
-@example
-pthread_cond_init(), Function, Implemented
-pthread_cond_destroy(), Function, Implemented
-PTHREAD_COND_INITIALIZER, Constant, Implemented
-@end example
-
-@subsection Broadcasting and Signaling a Condition
-
-@example
-pthread_cond_signal(), Function, Implemented
-pthread_cond_broadcast(), Function, Implemented
-@end example
-
-@subsection Waiting on a Condition
-
-@example
-pthread_cond_wait(), Function, Implemented
-pthread_cond_timedwait(), Function, Implemented
-@end example
-
diff --git a/doc/posix1003.1/ch12.t b/doc/posix1003.1/ch12.t
deleted file mode 100644
index 7e7aded583..0000000000
--- a/doc/posix1003.1/ch12.t
+++ /dev/null
@@ -1,77 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Memory Management
-
-@section Memory Locking Functions
-
-@subsection Lock/Unlock the Address Space of a Process
-
-@example
-mlockall(), Function, Unimplemented
-munlockall(), Function, Unimplemented
-MCL_CURRENT, Constant, Unimplemented 
-MCL_FUTURE, Constant,  Unimplemented
-@end example
-
-@subsection Lock/Unlock a Rand of Process Address Space
-
-@example
-mlock(), Function, Unimplemented
-munlock(), Function, Unimplemented
-@end example
-
-@section Memory Mapping Functions
-
-@subsection Map Process Addresses to a Memory Object
-
-@example
-mmap(), Function, Unimplemented
-PROT_READ, Constant,  Unimplemented
-PROT_WRITE, Constant,  Unimplemented
-PROT_EXEC, Constant,  Unimplemented
-PROT_NONE, Constant,  Unimplemented
-MAP_SHARED, Constant,  Unimplemented
-MAP_PRIVATE, Constant,  Unimplemented
-MAP_FIXED, Constant,  Unimplemented
-@end example
-
-@subsection Unmap Previously Mapped Addresses
-
-@example
-munmap(), Function, Unimplemented
-@end example
-
-@subsection Change Memory Protection
-
-@example
-mprotect(), Function, Unimplemented
-@end example
-
-@subsection Memory Object Synchronization
-
-@example
-msync(), Function, Unimplemented, Unimplemented
-MS_ASYNC, Constant, Unimplemented 
-MS_SYNC, Constant,  Unimplemented
-MS_INVALIDATE, Constant,  Unimplemented
-@end example
-
-@section Shared Memory Functions
-
-@subsection Open a Shared Memory Object
-
-@example
-shm_open(), Function, Unimplemented
-@end example
-
-@subsection Remove a Shared Memory Object
-
-@example
-shm_unlink(), Function, Unimplemented
-@end example
diff --git a/doc/posix1003.1/ch13.t b/doc/posix1003.1/ch13.t
deleted file mode 100644
index 398db8e2f4..0000000000
--- a/doc/posix1003.1/ch13.t
+++ /dev/null
@@ -1,132 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Execution Scheduling
-
-@section Scheduling Parameters
-
-@example
-struct sched_param, Type, Implemented
-@end example
-
-@section Scheduling Policies
-
-@example
-SCHED_FIFO, Constant, Implemented
-SCHED_RR, Constant, Implemented
-SCHED_OTHER, Constant, Implemented
-@end example
-
-NOTE: RTEMS adds SCHED_SPORADIC.
-
-@subsection SCHED_FIFO
-
-@subsection SCHED_RR
-
-@subsection SCHED_OTHER
-
-@section Process Scheduling Functions
-
-@subsection Set Scheduling Parameters
-
-@example
-sched_setparam(), Function, Dummy Implementation
-@end example
-
-@subsection Get Scheduling Parameters
-
-@example
-sched_getparam(), Function, Dummy Implementation
-@end example
-
-@subsection Set Scheduling Policy and Scheduling Parameters
-
-@example
-sched_setscheduler(), Function, Dummy Implementation
-@end example
-
-@subsection Get Scheduling Policy
-
-@example
-sched_getscheduler(), Function, Dummy Implementation
-@end example
-
-@subsection Yield Processor
-
-@example
-sched_yield(), Function, Implemented
-@end example
-
-@subsection Get Scheduling Parameter Limits
-
-@example
-sched_get_priority_max(), Function, Implemented
-sched_get_priority_min(), Function, Implemented
-sched_get_priority_rr_get_interval(), Function, Implemented
-@end example
-
-@section Thread Scheduling
-
-@subsection Thread Scheduling Attributes
-
-@example
-PTHREAD_SCOPE_PROCESS, Constant, Implemented
-PTHREAD_SCOPE_SYSTEM, Constant, Implemented
-@end example
-
-@subsection Scheduling Contention Scope
-
-@subsection Scheduling Allocation Domain
-
-@subsection Scheduling Documentation
-
-@section Thread Scheduling Functions
-
-@subsection Thread Creation Scheduling Attributes
-
-@example
-pthread_attr_setscope(), Function, Implemented
-pthread_attr_getscope(), Function, Implemented
-pthread_attr_setinheritsched(), Function, Implemented
-pthread_attr_getinheritsched(), Function, Implemented
-pthread_attr_setschedpolicy(), Function, Implemented
-pthread_attr_getschedpolicy(), Function, Implemented
-pthread_attr_setschedparam(), Function, Implemented
-pthread_attr_getschedparam(), Function, Implemented
-PTHREAD_INHERIT_SCHED, Constant, Implemented
-PTHREAD_EXPLICIT_SCHED, Constant, Implemented
-@end example
-
-@subsection Dynamic Thread Scheduling Parameters Access
-
-@example
-pthread_setschedparam(), Function, Implemented
-pthread_getschedparam(), Function, Implemented
-@end example
-
-@section Synchronization Scheduling
-
-@subsection Mutex Initialization Scheduling Attributes
-
-@example
-pthread_mutexattr_setprotocol(), Function, Implemented
-pthread_mutexattr_getprotocol(), Function, Implemented
-pthread_mutexattr_setprioceiling(), Function, Implemented
-pthread_mutexattr_getprioceiling(), Function, Implemented
-PTHREAD_PRIO_NONE, Constant, Implemented
-PTHREAD_PRIO_INHERIT, Constant, Implemented
-PTHREAD_PRIO_PROTECT, Constant, Implemented
-@end example
-
-@subsection Change the Priority Ceiling of a Mutex
-
-@example
-pthread_mutex_setprioceiling(), Function, Implemented
-pthread_mutex_getprioceiling(), Function, Implemented
-@end example
-
diff --git a/doc/posix1003.1/ch14.t b/doc/posix1003.1/ch14.t
deleted file mode 100644
index 25de89cbf9..0000000000
--- a/doc/posix1003.1/ch14.t
+++ /dev/null
@@ -1,71 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Clocks and Timers
-
-@section Data Definitions for Clocks and Timers
-
-@subsection Time Value Specification Structures
-
-@example
-struct timespec, Type, Implemented
-struct itimerspec, Type, Implemented
-@end example
-
-@subsection Timer Event Notification Control Block
-
-@subsection Type Definitions
-
-@example
-clockid_t, Type, Implemented
-timerid_t, Type, Implemented
-@end example
-
-@subsection Timer Event Notification Manifest Constants
-
-@example
-CLOCK_REALTIME, Constant, Implemented
-TIMER_ABSTIME, Constant, Implemented
-@end example
-
-@section Clock and Timer Functions
-
-@subsection Clocks
-
-@example
-clock_settime(), Function, Partial Implementation
-clock_gettime(), Function, Partial Implementation
-clock_getres(), Function, Implemented
-@end example
-
-@subsection Create a Per-Process Timer
-
-@example
-timer_create(), Function, Dummy Implementation
-@end example
-
-@subsection Delete a Per-Process Timer
-
-@example
-timer_delete(), Function, Dummy Implementation
-@end example
-
-@subsection Per-Process Timers
-
-@example
-timer_settime(), Function, Dummy Implementation
-timer_gettime(), Function, Dummy Implementation
-timer_getoverrun(), Function, Dummy Implementation
-@end example
-
-@subsection High Resolution Sleep
-
-@example
-nanosleep(), Function, Implemented
-@end example
-
diff --git a/doc/posix1003.1/ch15.t b/doc/posix1003.1/ch15.t
deleted file mode 100644
index 297b4b2cf7..0000000000
--- a/doc/posix1003.1/ch15.t
+++ /dev/null
@@ -1,69 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Message Passing
-
-@section Data Definitions for Message Queues
-
-@subsection Data Structures
-
-@example
-mqd_t, Type, Untested Implementation
-struct mq_attr, Type, Untested Implementation
-@end example
-
-@section Message Passing Functions
-
-@subsection Open a Message Queue
-
-@example
-mq_open(), Function, Untested Implementation
-@end example
-
-@subsection Close a Message Queue
-
-@example
-mq_close(), Function, Untested Implementation
-@end example
-
-@subsection Remove a Message Queue
-
-@example
-mq_unlink(), Function, Untested Implementation
-@end example
-
-@subsection Send a Message to a Message Queue
-
-@example
-mq_send(), Function, Untested Implementation
-@end example
-
-@subsection Receive a Message From a Message Queue
-
-@example
-mq_receive(), Function, Untested Implementation
-@end example
-
-@subsection Notify Process That a Message is Available on a Queue
-
-@example
-mq_notify(), Function, Untested Implementation
-@end example
-
-@subsection Set Message Queue Attributes
-
-@example
-mq_setattr(), Function, Untested Implementation
-@end example
-
-@subsection Get Message Queue Attributes
-
-@example
-mq_getattr(), Function, Untested Implementation
-@end example
-
diff --git a/doc/posix1003.1/ch16.t b/doc/posix1003.1/ch16.t
deleted file mode 100644
index f9ba73599e..0000000000
--- a/doc/posix1003.1/ch16.t
+++ /dev/null
@@ -1,72 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Thread Management
-
-@section Threads
-
-@section Thread Functions
-
-@subsection Thread Creation Attributes
-
-@example
-pthread_attr_init(), Function, Implemented
-pthread_attr_destroy(), Function, Implemented
-pthread_attr_setstacksize(), Function, Implemented
-pthread_attr_getstacksize(), Function, Implemented
-pthread_attr_setstackaddr(), Function, Implemented
-pthread_attr_getstackaddr(), Function, Implemented
-pthread_attr_setdetachstate(), Function, Implemented
-pthread_attr_getdetachstate(), Function, Implemented
-PTHREAD_CREATE_JOINABLE, Constant, Implemented
-PTHREAD_CREATE_DETACHED, Constant, Implemented
-@end example
-
-@subsection Thread Creation
-
-@example
-pthread_create(), Function, Implemented
-@end example
-
-@subsection Wait for Thread Termination
-
-@example
-pthread_join(), Function, Implemented
-@end example
-
-@subsection Detaching a Thread
-
-@example
-pthread_detach(), Function, Implemented
-@end example
-
-@subsection Thread Termination
-
-@example
-pthread_exit(), Function, Implemented
-@end example
-
-@subsection Get Thread ID
-
-@example
-pthread_self(), Function, Implemented
-@end example
-
-@subsection Compare Thread IDs
-
-@example
-pthread_equal(), Function, Implemented
-@end example
-
-@subsection Dynamic Package Initialization
-
-@example
-pthread_once(), Function, Implemented
-PTHREAD_ONCE_INIT, Constant, Implemented
-@end example
-
diff --git a/doc/posix1003.1/ch17.t b/doc/posix1003.1/ch17.t
deleted file mode 100644
index f58ba18520..0000000000
--- a/doc/posix1003.1/ch17.t
+++ /dev/null
@@ -1,31 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Thread-Specific Data
-
-@section Thread-Specific Data Functions
-
-@subsection Thread-Specific Data Key Creation
-
-@example
-pthread_key_create(), Function, Implemented
-@end example
-
-@subsection Thread-Specific Data Management
-
-@example
-pthread_key_setspecific(), Function, Implemented
-pthread_key_getspecific(), Function, Implemented
-@end example
-
-@subsection Thread-Specific Data Key Deletion
-
-@example
-pthread_key_delete(), Function, Implemented
-@end example
-
diff --git a/doc/posix1003.1/ch18.t b/doc/posix1003.1/ch18.t
deleted file mode 100644
index 42e703dbcc..0000000000
--- a/doc/posix1003.1/ch18.t
+++ /dev/null
@@ -1,66 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Thread Cancellation
-
-@section Thread Cancellation Overview
-
-@subsection Cancelability States
-
-@example
-PTHREAD_CANCEL_DISABLE, Constant, Implemented
-PTHREAD_CANCEL_ENABLE, Constant, Implemented
-PTHREAD_CANCEL_ASYNCHRONOUS, Constant, Implemented
-PTHREAD_CANCEL_DEFERRED, Constant, Implemented
-@end example
-
-@subsection Cancellation Points
-
-@subsection Thread Cancellation Cleanup Handlers
-
-@example
-PTHREAD_CANCELED, Constant, Unimplemented
-@end example
-
-@subsection Async-Cancel Safety
-
-@section Thread Cancellation Functions
-
-@subsection Canceling Execution of a Thread
-
-@example
-pthread_cancel(), Function, Implemented
-@end example
-
-@subsection Setting Cancelability State
-
-@example
-pthread_setcancelstate(), Function, Implemented
-pthread_setcanceltype(), Function, Implemented
-pthread_testcancel(), Function, Implemented
-@end example
-
-@subsection Establishing Cancellation Handlers
-
-@example
-pthread_cleanup_push(), Function, Implemented
-pthread_cleanup_pop(), Function, Implemented
-@end example
-
-@section Language-Independent Cancellation Functionality
-
-@subsection Requesting Cancellation
-
-@subsection Associating Cleanup Code With Scopes
-
-@subsection Controlling Cancellation Within Scopes
-
-@subsection Defined Cancellation Sequence
-
-@subsection List of Cancellation Points
-
diff --git a/doc/posix1003.1/posix1003_1.texi b/doc/posix1003.1/posix1003_1.texi
deleted file mode 100644
index 57e07365a4..0000000000
--- a/doc/posix1003.1/posix1003_1.texi
+++ /dev/null
@@ -1,138 +0,0 @@
-\input ../texinfo/texinfo   @c -*-texinfo-*-
-@c %**start of header
-@setfilename posix1003_1
-@syncodeindex vr fn
-@synindex ky cp
-@paragraphindent 0
-@c @smallbook
-@c %**end of header
-
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@c
-@c   Master file for the POSIX 1003.1 Compliance Guide
-@c
-
-@include ../common/setup.texi
-
-@ignore
-@ifinfo
-@format
-START-INFO-DIR-ENTRY
-* RTEMS POSIX 1003.1 Compliance Guide (posix1003_1):
-END-INFO-DIR-ENTRY
-@end format
-@end ifinfo
-@end ignore
-
-@c
-@c  Title Page Stuff
-@c
-
-@set edition @value{RTEMS-EDITION}
-@set version @value{RTEMS-VERSION}
-@set update-date @value{RTEMS-UPDATE-DATE}
-@set update-month @value{RTEMS-UPDATE-MONTH}
-
-@c
-@c  I don't really like having a short title page.  --joel
-@c
-@c @shorttitlepage RTEMS POSIX 1003.1 Compliance Guide
-
-@setchapternewpage odd
-@settitle RTEMS POSIX 1003.1 Compliance Guide
-@titlepage
-@finalout
-
-@title RTEMS POSIX 1003.1 Compliance Guide
-@subtitle Edition @value{edition}, for RTEMS @value{version}
-@sp 1
-@subtitle @value{update-month}
-@author On-Line Applications Research Corporation
-@page
-@include ../common/cpright.texi
-@end titlepage
-
-@c  This prevents a black box from being printed on "overflow" lines.
-@c  The alternative is to rework a sentence to avoid this problem.
-
-@include preface.texi
-@include ch01.texi
-@include ch02.texi
-@include ch03.texi
-@include ch04.texi
-@include ch05.texi
-@include ch06.texi
-@include ch07.texi
-@include ch08.texi
-@include ch09.texi
-@include ch10.texi
-@include ch11.texi
-@include ch12.texi
-@include ch13.texi
-@include ch14.texi
-@include ch15.texi
-@include ch16.texi
-@include ch17.texi
-@include ch18.texi
-@include ch19.texi
-
-@ifinfo
-@node Top, Preface, (dir), (dir)
-@top posix1003_1
-
-This is the online version of the RTEMS POSIX 1003.1 Compliance Guide.
-
-@menu
-* Preface::
-* General::
-* Terminology and General Requirements::
-* Process Primitives::
-* Process Environment::
-* Files and Directories::
-* Input and Output Primitives::
-* Device- and Class-Specific Functions::
-* Language-Specific Services for the C Programming Language::
-* System Databases::
-* Data Interchange Format::
-* Synchronization::
-* Memory Management::
-* Execution Scheduling::
-* Clocks and Timers::
-* Message Passing::
-* Thread Management::
-* Thread-Specific Data::
-* Thread Cancellation::
-* Compliance Summary::
-* Command and Variable Index::
-* Concept Index::
-@end menu
-
-@end ifinfo
-@c 
-@c 
-@c Need to copy the emacs stuff and "trailer stuff" (index, toc) into here
-@c
-
-@node Command and Variable Index, Concept Index, Overall Summary, Top
-@unnumbered Command and Variable Index
-
-There are currently no Command and Variable Index entries.
-
-@c @printindex fn
-
-@node Concept Index, , Command and Variable Index, Top
-@unnumbered Concept Index
-
-There are currently no Concept Index entries.
-@c @printindex cp
-
-@contents
-@bye
-
diff --git a/doc/posix1003.1/preface.texi b/doc/posix1003.1/preface.texi
deleted file mode 100644
index f14a9b58a6..0000000000
--- a/doc/posix1003.1/preface.texi
+++ /dev/null
@@ -1,20 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@ifinfo
-@node Preface, General, Top, Top
-@end ifinfo
-
-@unnumbered Preface
-
-This document lists the functions, constant, macros, feature flags,
-and types defined in the POSIX 1003.1 standard.  Each section in 
-this document corresponds to a section in the 1003.1 standard
-and the implementation status of the items required by the standard
-are listed.
-
diff --git a/doc/posix1003.1/summarize b/doc/posix1003.1/summarize
deleted file mode 100755
index fc8631894a..0000000000
--- a/doc/posix1003.1/summarize
+++ /dev/null
@@ -1,199 +0,0 @@
-#! /bin/sh
-#
-#  Generate the summary chapter
-#
-#  $Id$
-#
-
-echo "@c"
-echo "@c DO NOT EDIT -- AUTOMATICALLY GENERATED!!!"
-echo "@c"
-echo
-echo "@chapter Compliance Summary"
-echo
-
-wc2()
-{
-  pattern=$1
-  shift
-  grep "${pattern}" $* | wc -l
-}
-
-wc3()
-{
-  pattern=$1
-  filter=$2
-  shift ; shift
-  grep "${pattern}" $* | grep "${filter}" | wc -l
-}
-
-# adds the numbers passed on the command line
-addit()
-{
-  sumx=0
-  for x in $*
-  do
-    sumx=`expr $sumx + $x`
-  done
-  echo $sumx
-}
-
-summarize_chapter()
-{
-  echo 
-  if [ $# -eq 1 ] ; then
-    grep "^@chapter" $1 | \
-      sed -e "s/^.chapter/@section/"  \
-          -e "s/$/ Chapter/" 
-  else
-    echo "@section Overall Summary"
-  fi
-
-  echo
-
-  # functions
-
-  functions_total=`wc2 "()" $*`
-  functions_implemented=`   wc3 "()" "Implemented" $*`
-  functions_unimplemented=` wc3 "()" "Unimplemented" $*`
-  functions_unmplementable=`wc3 "()" "Unimplementable" $*`
-  functions_partial=`       wc3 "()" "Partial Implementation" $*`
-  functions_dummy=`         wc3 "()" "Dummy Implementation" $*`
-  functions_untested=`      wc3 "()" "Untested Implementation" $*`
-
-  functions_sum=`addit ${functions_implemented} \
-     ${functions_unimplemented} ${functions_unmplementable} \
-     ${functions_partial}       ${functions_dummy} \
-     ${functions_untested}`
-
-  # data types
-
-  datatypes_total=`wc2 "Type," $*`
-  datatypes_implemented=`   wc3 "Type," "Implemented" $*`
-  datatypes_unimplemented=` wc3 "Type," "Unimplemented" $*`
-  datatypes_unmplementable=`wc3 "Type," "Unimplementable" $*`
-  datatypes_partial=`       wc3 "Type," "Partial Implementation" $*`
-  datatypes_dummy=`         wc3 "Type," "Dummy Implementation" $*`
-  datatypes_untested=`      wc3 "Type," "Untested Implementation" $*`
-
-  datatypes_sum=`addit ${datatypes_implemented} \
-     ${datatypes_unimplemented} ${datatypes_unmplementable} \
-     ${datatypes_partial}       ${datatypes_dummy} \
-     ${datatypes_untested}`
-
-  # feature flags
-
-  features_total=`wc2 "Feature Flag," $*`
-  features_implemented=`   wc3 "Feature Flag," "Implemented" $*`
-  features_unimplemented=` wc3 "Feature Flag," "Unimplemented" $*`
-  features_unmplementable=`wc3 "Feature Flag," "Unimplementable" $*`
-  features_partial=`       wc3 "Feature Flag," "Partial Implementation" $*`
-  features_dummy=`         wc3 "Feature Flag," "Dummy Implementation" $*`
-  features_untested=`      wc3 "Feature Flag," "Untested Implementation" $*`
-
-  features_sum=`addit ${features_implemented} \
-     ${features_unimplemented} ${features_unmplementable} \
-     ${features_partial}       ${features_dummy} \
-     ${features_untested}`
-
-  # constants
-
-  constants_total=`wc2 "Constant," $*`
-  constants_implemented=`   wc3 "Constant," "Implemented" $*`
-  constants_unimplemented=` wc3 "Constant," "Unimplemented" $*`
-  constants_unmplementable=`wc3 "Constant," "Unimplementable" $*`
-  constants_partial=`       wc3 "Constant," "Partial Implementation" $*`
-  constants_dummy=`         wc3 "Constant," "Dummy Implementation" $*`
-  constants_untested=`      wc3 "Constant," "Untested Implementation" $*`
-
-  constants_sum=`addit ${constants_implemented} \
-     ${constants_unimplemented} ${constants_unmplementable} \
-     ${constants_partial}       ${constants_dummy} \
-     ${constants_untested}`
-
-  # Now print the reports
-
-  echo "@example"
-  echo "Functions:"
-  echo "    Total Number    : ${functions_total}"
-  echo "    Implemented     : ${functions_implemented}"
-  echo "    Unimplemented   : ${functions_unimplemented}"
-  echo "    Unimplementable : ${functions_unmplementable}"
-  echo "    Partial         : ${functions_partial}"
-  echo "    Dummy           : ${functions_dummy}"
-  echo "    Untested        : ${functions_untested}"
-  echo "@end example"
-  echo
-  if [ ${functions_sum} -ne ${functions_total} ] ; then
-    echo "@sp 1"
-    echo "@center @b{FUNCTION COUNTS DO NOT ADD UP!!}"
-    echo "@sp 1"
-  fi
-
-  echo "@example"
-  echo "Data Types:"
-  echo "    Total Number    : ${datatypes_total}"
-  echo "    Implemented     : ${datatypes_implemented}"
-  echo "    Unimplemented   : ${datatypes_unimplemented}"
-  echo "    Unimplementable : ${datatypes_unmplementable}"
-  echo "    Partial         : ${datatypes_partial}"
-  echo "    Dummy           : ${datatypes_dummy}"
-  echo "    Untested        : ${datatypes_untested}"
-  echo "@end example"
-  echo
-  if [ ${datatypes_sum} -ne ${datatypes_total} ] ; then
-    echo "@sp 1"
-    echo "@center @b{DATA TYPE COUNTS DO NOT ADD UP!!}"
-    echo "@sp 1"
-  fi
-
-  echo "@example"
-  echo "Feature Flags:"
-  echo "    Total Number    : ${features_total}"
-  echo "    Implemented     : ${features_implemented}"
-  echo "    Unimplemented   : ${features_unimplemented}"
-  echo "    Unimplementable : ${features_unmplementable}"
-  echo "    Partial         : ${features_partial}"
-  echo "    Dummy           : ${features_dummy}"
-  echo "    Untested        : ${features_untested}"
-  echo "@end example"
-  echo
-  if [ ${features_sum} -ne ${features_total} ] ; then
-    echo "@sp 1"
-    echo "@center @b{FEATURE FLAG COUNTS DO NOT ADD UP!!}"
-    echo "@sp 1"
-  fi
-
-  echo "@example"
-  echo "Constants:"
-  echo "    Total Number    : ${constants_total}"
-  echo "    Implemented     : ${constants_implemented}"
-  echo "    Unimplemented   : ${constants_unimplemented}"
-  echo "    Unimplementable : ${constants_unmplementable}"
-  echo "    Partial         : ${constants_partial}"
-  echo "    Dummy           : ${constants_dummy}"
-  echo "    Untested        : ${constants_untested}"
-  echo "@end example"
-  echo
-  if [ ${constants_sum} -ne ${constants_total} ] ; then
-    echo "@sp 1"
-    echo "@center @b{CONSTANT COUNTS DO NOT ADD UP!!}"
-    echo "@sp 1"
-  fi
-}
-
-chapters="ch01.t ch02.t ch03.t ch04.t ch05.t ch06.t ch07.t ch08.t \
-    ch09.t ch10.t ch11.t ch12.t ch13.t ch14.t ch15.t ch16.t ch17.t ch18.t"
-
-# go through the chapters one at a time
-for chapter in ${chapters}
-do
-  summarize_chapter $chapter
-  echo "@page"
-done
-
-# now generate the overall summary
-summarize_chapter ${chapters}
-
-
-
diff --git a/doc/posix_users/Makefile b/doc/posix_users/Makefile
deleted file mode 100644
index fe57b61ea4..0000000000
--- a/doc/posix_users/Makefile
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-#  COPYRIGHT (c) 1988-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  All rights reserved.
-#
-#  $Id$
-#
-
-PROJECT=posix_users
-DISTRIBUTION_LEVEL=public
-
-include ../Make.config
-
-all: html info ps
-
-dirs:
-	$(make-dirs)
-
-COMMON_FILES=../common/cpright.texi
-
-FILES= clock.texi cond.texi key.texi mutex.texi $(PROJECT).texi preface.texi \
-  sched.texi signal.texi thread.texi $(COMMON_FILES)
-
-INFOFILES=$(wildcard $(PROJECT) $(PROJECT)-*)
-
-info: dirs $(PROJECT)
-	cp $(PROJECT) $(PROJECT)-* $(INFO_INSTALL)
-	#cp $(PROJECT) $(INFO_INSTALL)
-
-posix_users: $(FILES)
-	$(MAKEINFO) $(PROJECT).texi
-
-dvi: $(PROJECT).dvi
-ps: dirs $(PROJECT).ps
-	
-$(PROJECT).ps: $(PROJECT).dvi
-	dvips -o $(PROJECT).ps $(PROJECT).dvi
-	cp $(PROJECT).ps $(PS_INSTALL)
-
-$(PROJECT).dvi: $(FILES)
-	$(TEXI2DVI) $(PROJECT).texi
-
-html: dirs
-	-mkdir -p $(WWW_INSTALL)/$(PROJECT)
-	-cd .. ; gmake headers
-	$(TEXI2WWW) $(TEXI2WWW_ARGS) -dir $(WWW_INSTALL)/$(PROJECT) \
- 	    $(PROJECT).texi
-
-
-clean:
-	rm -f *.o $(PROG) *.txt core *.html 
-	rm -f *.dvi *.ps *.log *.aux *.cp *.fn *.ky *.pg *.toc *.tp *.vr $(BASE)
-	rm -f $(PROJECT) $(PROJECT)-* _*
-
diff --git a/doc/posix_users/base.texi b/doc/posix_users/base.texi
deleted file mode 100644
index 34d1e75af2..0000000000
--- a/doc/posix_users/base.texi
+++ /dev/null
@@ -1,98 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@ifinfo
-@node Mutex Manager, Mutex Manager Introduction, Preface, Top
-@end ifinfo
-@chapter Mutex Manager
-@ifinfo
-@menu
-* Mutex Manager Introduction::
-* Mutex Manager Background::
-* Mutex Manager Operations::
-* Mutex Manager Directives::
-@end menu
-@end ifinfo
-
-@ifinfo
-@node Mutex Manager Introduction, Mutex Manager Background, Mutex Manager, Mutex Manager
-@end ifinfo
-@section Introduction
-
-The mutex manager ...
-
-The directives provided by the mutex manager are:
-
-@itemize @bullet
-@item @code{sigaddset} - 
-@item @code{sigdelset} - 
-@item @code{sigfillset} - 
-@item @code{sigismember} - 
-@item @code{sigemptyset} - 
-@item @code{sigaction} - 
-@item @code{pthread_kill} - 
-@item @code{pthread_sigmask} - 
-@item @code{kill} - 
-@item @code{sigwait} - 
-@end itemize
-
-@ifinfo
-@node Mutex Manager Background, Mutex Manager Operations, Mutex Manager Introduction, Mutex Manager
-@end ifinfo
-@section Background
-
-@ifinfo
-@node Mutex Manager Operations, Mutex Manager Directives, Mutex Manager Background, Mutex Manager
-@end ifinfo
-@section Operations
-
-@ifinfo
-@node Mutex Manager Directives, sigaddset, Mutex Manager Operations, Mutex Manager
-@end ifinfo
-@section Directives
-@ifinfo
-@menu
-* sigaddset::
-* sigdelset::
-* sigfillset::
-* sigismember::
-* sigemptyset::
-* sigaction::
-* pthread_kill::
-* pthread_sigmask::
-* kill::
-* sigwait::
-@end menu
-@end ifinfo
-
-This section details the mutex manager's directives.
-A subsection is dedicated to each of this manager's directives
-and describes the calling sequence, related constants, usage,
-and status codes.
-
-@page
-@ifinfo
-@node sigaddset, sigdelset, Mutex Manager Directives, Mutex Manager Directives
-@end ifinfo
-@subsection sigaddset
-
-@subheading CALLING SEQUENCE:
-
-@example
-int sigaddset(
-  sigset_t   *set,
-  int         signo
-);
-@end example
-
-@subheading STATUS CODES:
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
diff --git a/doc/posix_users/clock.texi b/doc/posix_users/clock.texi
deleted file mode 100644
index d2f7e1e492..0000000000
--- a/doc/posix_users/clock.texi
+++ /dev/null
@@ -1,264 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@ifinfo
-@node Clock Manager, Clock Manager Introduction, pthread_getspecific, Top
-@end ifinfo
-@chapter Clock Manager
-@ifinfo
-@menu
-* Clock Manager Introduction::
-* Clock Manager Background::
-* Clock Manager Operations::
-* Clock Manager Directives::
-@end menu
-@end ifinfo
-
-@ifinfo
-@node Clock Manager Introduction, Clock Manager Background, Clock Manager, Clock Manager
-@end ifinfo
-@section Introduction
-
-The clock manager ...
-
-The directives provided by the clock manager are:
-
-@itemize @bullet
-@item @code{clock_gettime} - 
-@item @code{clock_settime} -
-@item @code{clock_getres} -
-@item @code{nanosleep} -
-@item @code{time} -
-@end itemize
-
-@ifinfo
-@node Clock Manager Background, Clock Manager Operations, Clock Manager Introduction, Clock Manager
-@end ifinfo
-@section Background
-
-@ifinfo
-@node Clock Manager Operations, Clock Manager Directives, Clock Manager Background, Clock Manager
-@end ifinfo
-@section Operations
-
-@ifinfo
-@node Clock Manager Directives, clock_gettime, Clock Manager Operations, Clock Manager
-@end ifinfo
-@section Directives
-@ifinfo
-@menu
-* clock_gettime::
-* clock_settime::
-* clock_getres::
-* sleep::
-* nanosleep::
-* time::
-@end menu
-@end ifinfo
-
-This section details the clock manager's directives.
-A subsection is dedicated to each of this manager's directives
-and describes the calling sequence, related constants, usage,
-and status codes.
-
-@page
-@ifinfo
-@node clock_gettime, clock_settime, Clock Manager Directives, Clock Manager Directives
-@end ifinfo
-@subsection clock_gettime
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <time.h>
-
-int clock_gettime(
-  clockid_t        clock_id,
-  struct timespec *tp
-);
-@end example
-
-@subheading STATUS CODES:
-
-On error, this routine returns -1 and sets errno to one of the following:
-
-@table @b
-@item EINVAL
-The tp pointer parameter is invalid. 
-
-@item EINVAL
-The clock_id specified is invalid. 
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@ifinfo
-@node clock_settime, clock_getres, clock_gettime, Clock Manager Directives
-@end ifinfo
-@subsection clock_settime
- 
-@subheading CALLING SEQUENCE:
- 
-@example
-#include <time.h>
- 
-int clock_settime(
-  clockid_t              clock_id,
-  const struct timespec *tp
-);
-@end example
- 
-@subheading STATUS CODES:
- 
-On error, this routine returns -1 and sets errno to one of the following:
-
-@table @b
-@item EINVAL
-The tp pointer parameter is invalid. 
-
-@item EINVAL
-The clock_id specified is invalid.
-
-@item EINVAL
-The contents of the tp structure are invalid.
-
-@end table
- 
-@subheading DESCRIPTION:
- 
-@subheading NOTES:
- 
-@page
-@ifinfo
-@node clock_getres, sleep, clock_settime, Clock Manager Directives
-@end ifinfo
-@subsection clock_getres
- 
-@subheading CALLING SEQUENCE:
- 
-@example
-#include <time.h>
- 
-int clock_getres(
-  clockid_t        clock_id,
-  struct timespec *res
-);
-@end example
- 
-@subheading STATUS CODES:
- 
-On error, this routine returns -1 and sets errno to one of the following:
-
-@table @b
-@item EINVAL
-The res pointer parameter is invalid. 
-
-@item EINVAL
-The clock_id specified is invalid.
-
-@end table
- 
-@subheading DESCRIPTION:
- 
-@subheading NOTES:
- 
-If res is NULL, then the resolution is not returned.
-
-@page
-@ifinfo
-@node sleep, nanosleep, clock_getres, Clock Manager Directives
-@end ifinfo
-@subsection sleep
- 
-@subheading CALLING SEQUENCE:
- 
-@example
-#include <time.h>
- 
-unsigned int sleep(
-  unsigned int seconds
-);
-@end example
- 
-@subheading STATUS CODES:
-
-This routine returns the number of unslept seconds.
-
-@subheading DESCRIPTION:
- 
-@subheading NOTES:
-
-This call is interruptible by a signal.
- 
-@page
-@ifinfo
-@node nanosleep, time, sleep, Clock Manager Directives
-@end ifinfo
-@subsection nanosleep
- 
-@subheading CALLING SEQUENCE:
- 
-@example
-#include <time.h>
- 
-int nanosleep(
-  const struct timespec *rqtp,
-  struct timespec       *rmtp
-);
-@end example
- 
-@subheading STATUS CODES:
-
-On error, this routine returns -1 and sets errno to one of the following:
-
-@table @b
-@item EINTR
-The routine was interrupted by a signal.
-
-@item EAGAIN
-The requested sleep period specified negative seconds or nanoseconds.
-
-@item EINVAL
-The requested sleep period specified an invalid number for the nanoseconds
-field.
-
-@end table
- 
-@subheading DESCRIPTION:
- 
-@subheading NOTES:
- 
-This call is interruptible by a signal.
-
-@page
-@ifinfo
-@node time, Scheduler Manager, nanosleep, Clock Manager Directives
-@end ifinfo
-@subsection nanosleep
- 
-@subheading CALLING SEQUENCE:
- 
-@example
-#include <time.h>
- 
-int time(
-  time_t  *tloc
-);
-@end example
- 
-@subheading STATUS CODES:
-
-This routine returns the number of seconds since the Epoch.
-
-@subheading DESCRIPTION:
- 
-@subheading NOTES:
- 
diff --git a/doc/posix_users/cond.texi b/doc/posix_users/cond.texi
deleted file mode 100644
index e9c8abf460..0000000000
--- a/doc/posix_users/cond.texi
+++ /dev/null
@@ -1,386 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@ifinfo
-@node Condition Variable Manager, Condition Variable Manager Introduction, pthread_mutex_getprioceiling, Top
-@end ifinfo
-@chapter Condition Variable Manager
-@ifinfo
-@menu
-* Condition Variable Manager Introduction::
-* Condition Variable Manager Background::
-* Condition Variable Manager Operations::
-* Condition Variable Manager Directives::
-@end menu
-@end ifinfo
-
-@ifinfo
-@node Condition Variable Manager Introduction, Condition Variable Manager Background, Condition Variable Manager, Condition Variable Manager
-@end ifinfo
-@section Introduction
-
-The condition variable manager ...
-
-The directives provided by the condition variable manager are:
-
-@itemize @bullet
-@item @code{pthread_condattr_init} - 
-@item @code{pthread_condattr_destroy} - 
-@item @code{pthread_condattr_setpshared} - 
-@item @code{pthread_condattr_getpshared} - 
-@item @code{pthread_cond_init} - 
-@item @code{pthread_cond_destroy} - 
-@item @code{pthread_cond_signal} - 
-@item @code{pthread_cond_broadcast} - 
-@item @code{pthread_cond_wait} - 
-@item @code{pthread_cond_timedwait} - 
-@end itemize
-
-@ifinfo
-@node Condition Variable Manager Background, Condition Variable Manager Operations, Condition Variable Manager Introduction, Condition Variable Manager
-@end ifinfo
-@section Background
-
-@ifinfo
-@node Condition Variable Manager Operations, Condition Variable Manager Directives, Condition Variable Manager Background, Condition Variable Manager
-@end ifinfo
-@section Operations
-
-@ifinfo
-@node Condition Variable Manager Directives, pthread_condattr_init, Condition Variable Manager Operations, Condition Variable Manager
-@end ifinfo
-@section Directives
-@ifinfo
-@menu
-* pthread_condattr_init::
-* pthread_condattr_destroy::
-* pthread_condattr_setpshared::
-* pthread_condattr_getpshared::
-* pthread_cond_init::
-* pthread_cond_destroy::
-* pthread_cond_signal::
-* pthread_cond_broadcast::
-* pthread_cond_wait::
-* pthread_cond_timedwait::
-@end menu
-@end ifinfo
-
-This section details the condition variable manager's directives.
-A subsection is dedicated to each of this manager's directives
-and describes the calling sequence, related constants, usage,
-and status codes.
-
-@page
-@ifinfo
-@node pthread_condattr_init, pthread_condattr_destroy, Condition Variable Manager Directives, Condition Variable Manager Directives
-@end ifinfo
-@subsection pthread_condattr_init
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_condattr_init(
-  pthread_condattr_t *attr
-);
-@end example
-
-@subheading STATUS CODES:
-@table @b
-@item ENOMEM
-Insufficient memory is available to initialize the condition variable
-attributes object.
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@ifinfo
-@node pthread_condattr_destroy, pthread_condattr_setpshared, pthread_condattr_init, Condition Variable Manager Directives
-@end ifinfo
-@subsection pthread_condattr_destroy
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_condattr_destroy(
-  pthread_condattr_t *attr
-);
-@end example
-
-@subheading STATUS CODES:
-@table @b
-@item EINVAL
-The attribute object specified is invalid.
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@ifinfo
-@node pthread_condattr_setpshared, pthread_condattr_getpshared, pthread_condattr_destroy, Condition Variable Manager Directives
-@end ifinfo
-@subsection pthread_condattr_setpshared
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_condattr_setpshared(
-  pthread_condattr_t   *attr,
-  int                   pshared
-);
-@end example
-
-@subheading STATUS CODES:
- 
-@table @b
-@item EINVAL
-Invalid argument passed.
- 
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@ifinfo
-@node pthread_condattr_getpshared, pthread_cond_init, pthread_condattr_setpshared, Condition Variable Manager Directives
-@end ifinfo
-@subsection pthread_condattr_getpshared
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_condattr_getpshared(
-  const pthread_condattr_t   *attr,
-  int                        *pshared
-);
-@end example
-
-@subheading STATUS CODES:
- 
-@table @b
-@item EINVAL
-Invalid argument passed.
- 
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-
-@page
-@ifinfo
-@node pthread_cond_init, pthread_cond_destroy, pthread_condattr_getpshared, Condition Variable Manager Directives
-@end ifinfo
-@subsection pthread_cond_init
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_cond_init(
-  pthread_cond_t           *cond,
-  const pthread_condattr_t *attr
-);
-@end example
-
-@subheading STATUS CODES:
-@table @b
-@item EAGAIN
-The system lacked a resource other than memory necessary to create the
-initialize the condition variable object. 
-
-@item ENOMEM
-Insufficient memory is available to initialize the condition variable object.
-
-@item EBUSY
-The specified condition variable has already been initialized.
-
-@item EINVAL
-The specified attribute value is invalid.
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@ifinfo
-@node pthread_cond_destroy, pthread_cond_signal, pthread_cond_init, Condition Variable Manager Directives
-@end ifinfo
-@subsection pthread_cond_destroy
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_cond_destroy(
-  pthread_cond_t           *cond
-);
-@end example
-
-@subheading STATUS CODES:
-@table @b
-@item EINVAL
-The specified condition variable is invalid.
-
-@item EBUSY
-The specified condition variable is currently in use.
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@ifinfo
-@node pthread_cond_signal, pthread_cond_broadcast, pthread_cond_destroy, Condition Variable Manager Directives
-@end ifinfo
-@subsection pthread_cond_signal
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_cond_signal(
-  pthread_cond_t           *cond
-);
-@end example
-
-@subheading STATUS CODES:
-@table @b
-@item EINVAL
-The specified condition variable is not valid.
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-This routine should not be invoked from a handler from an asynchronous signal 
-handler or an interrupt service routine.
-
-@page
-@ifinfo
-@node pthread_cond_broadcast, pthread_cond_wait, pthread_cond_signal, Condition Variable Manager Directives
-@end ifinfo
-@subsection pthread_cond_broadcast
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_cond_broadcast(
-  pthread_cond_t  *cond
-);
-@end example
-
-@subheading STATUS CODES:
-@table @b
-@item EINVAL
-The specified condition variable is not valid.
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-This routine should not be invoked from a handler from an asynchronous signal 
-handler or an interrupt service routine.
-
-@page
-@ifinfo
-@node pthread_cond_wait, pthread_cond_timedwait, pthread_cond_broadcast, Condition Variable Manager Directives
-@end ifinfo
-@subsection pthread_cond_wait
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_cond_wait(
-  pthread_cond_t           *cond,
-  pthread_mutex_t          *mutex
-);
-@end example
-
-@subheading STATUS CODES:
-@table @b
-@item EINVAL
-The specified condition variable or mutex is not initialized OR different 
-mutexes were specified for concurrent pthread_cond_wait() and 
-pthread_cond_timedwait() operations on the same condition variable OR
-the mutex was not owned by the current thread at the time of the call.
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@ifinfo
-@node pthread_cond_timedwait, Key Manager, pthread_cond_wait, Condition Variable Manager Directives
-@end ifinfo
-@subsection pthread_cond_timedwait
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_cond_timedwait(
-  pthread_cond_t        *cond,
-  pthread_mutex_t       *mutex,
-  const struct timespec *abstime
-);
-@end example
-
-@subheading STATUS CODES:
-@table @b
-@item EINVAL
-The specified condition variable or mutex is not initialized OR different 
-mutexes were specified for concurrent pthread_cond_wait() and 
-pthread_cond_timedwait() operations on the same condition variable OR
-the mutex was not owned by the current thread at the time of the call.
- 
-@item ETIMEDOUT
-The specified time has elapsed without the condition variable being 
-satisfied.
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
diff --git a/doc/posix_users/key.texi b/doc/posix_users/key.texi
deleted file mode 100644
index 16196b6116..0000000000
--- a/doc/posix_users/key.texi
+++ /dev/null
@@ -1,179 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@ifinfo
-@node Key Manager, Key Manager Introduction, pthread_cond_timedwait, Top
-@end ifinfo
-@chapter Key Manager
-@ifinfo
-@menu
-* Key Manager Introduction::
-* Key Manager Background::
-* Key Manager Operations::
-* Key Manager Directives::
-@end menu
-@end ifinfo
-
-@ifinfo
-@node Key Manager Introduction, Key Manager Background, Key Manager, Key Manager
-@end ifinfo
-@section Introduction
-
-The key manager ...
-
-The directives provided by the key manager are:
-
-@itemize @bullet
-@item @code{pthread_key_create} -
-@item @code{pthread_key_delete} -
-@item @code{pthread_setspecific} -
-@item @code{pthread_getspecific} -
-@end itemize
-
-@ifinfo
-@node Key Manager Background, Key Manager Operations, Key Manager Introduction, Key Manager
-@end ifinfo
-@section Background
-
-@ifinfo
-@node Key Manager Operations, Key Manager Directives, Key Manager Background, Key Manager
-@end ifinfo
-@section Operations
-
-@ifinfo
-@node Key Manager Directives, pthread_key_create, Key Manager Operations, Key Manager
-@end ifinfo
-@section Directives
-@ifinfo
-@menu
-* pthread_key_create::
-* pthread_key_delete::
-* pthread_setspecific::
-* pthread_getspecific::
-@end menu
-@end ifinfo
-
-This section details the key manager's directives.
-A subsection is dedicated to each of this manager's directives
-and describes the calling sequence, related constants, usage,
-and status codes.
-
-@page
-@ifinfo
-@node pthread_key_create, pthread_key_delete, Key Manager Directives, Key Manager Directives
-@end ifinfo
-@subsection pthread_key_create
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_key_create(
-  pthread_key_t  *key,
-  void          (*destructor)( void * )
-);
-@end example
-
-@subheading STATUS CODES:
-
-@table @b
-@item EAGAIN
-There were not enough resources available to create another key.
-
-@item ENOMEM
-Insufficient memory exists to create the key.
-
-@end table
-
-@page
-@ifinfo
-@node pthread_key_delete, pthread_setspecific, pthread_key_create, Key Manager Directives
-@end ifinfo
-@subsection pthread_key_delete
- 
-@subheading CALLING SEQUENCE:
- 
-@example
-#include <pthread.h>
- 
-int pthread_key_delete(
-  pthread_key_t  key,
-);
-@end example
- 
-@subheading STATUS CODES:
- 
-@table @b
-@item EINVAL
-The key was invalid
- 
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@ifinfo
-@node pthread_setspecific, pthread_getspecific, pthread_key_delete, Key Manager Directives
-@end ifinfo
-@subsection pthread_setspecific
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_setspecific(
-  pthread_key_t  key,
-  const void    *value
-);
-@end example
-
-@subheading STATUS CODES:
-@table @b
-@item EINVAL
-The specified key is invalid.
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@ifinfo
-@node pthread_getspecific, Clock Manager, pthread_setspecific, Key Manager Directives
-@end ifinfo
-@subsection pthread_getspecific
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-void *pthread_getspecific(
-  pthread_key_t  key
-);
-@end example
-
-@subheading STATUS CODES:
-@table @b
-@item NULL
-There is no thread-specific data associated with the specified key.
-
-@item non-NULL
-The data associated with the specified key.
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
diff --git a/doc/posix_users/mutex.texi b/doc/posix_users/mutex.texi
deleted file mode 100644
index 16cbe6467f..0000000000
--- a/doc/posix_users/mutex.texi
+++ /dev/null
@@ -1,642 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@ifinfo
-@node Mutex Manager, Mutex Manager Introduction, alarm, Top
-@end ifinfo
-@chapter Mutex Manager
-@ifinfo
-@menu
-* Mutex Manager Introduction::
-* Mutex Manager Background::
-* Mutex Manager Operations::
-* Mutex Manager Directives::
-@end menu
-@end ifinfo
-
-@ifinfo
-@node Mutex Manager Introduction, Mutex Manager Background, Mutex Manager, Mutex Manager
-@end ifinfo
-@section Introduction
-
-The mutex manager ...
-
-The directives provided by the mutex manager are:
-
-@itemize @bullet
-@item @code{pthread_mutexattr_init} - 
-@item @code{pthread_mutexattr_destroy} - 
-@item @code{pthread_mutexattr_setprotocol} - 
-@item @code{pthread_mutexattr_getprotocol} - 
-@item @code{pthread_mutexattr_setprioceiling} - 
-@item @code{pthread_mutexattr_getprioceiling} - 
-@item @code{pthread_mutexattr_setpshared} - 
-@item @code{pthread_mutexattr_getpshared} - 
-@item @code{pthread_mutex_init} - 
-@item @code{pthread_mutex_destroy} - 
-@item @code{pthread_mutex_lock} - 
-@item @code{pthread_mutex_trylock} - 
-@item @code{pthread_mutex_timedlock} - 
-@item @code{pthread_mutex_unlock} - 
-@item @code{pthread_mutex_setprioceiling} - 
-@item @code{pthread_mutex_getprioceiling} - 
-@end itemize
-
-@ifinfo
-@node Mutex Manager Background, Mutex Manager Operations, Mutex Manager Introduction, Mutex Manager
-@end ifinfo
-@section Background
-
-@ifinfo
-@node Mutex Manager Operations, Mutex Manager Directives, Mutex Manager Background, Mutex Manager
-@end ifinfo
-@section Operations
-
-@ifinfo
-@node Mutex Manager Directives, pthread_mutexattr_init, Mutex Manager Operations, Mutex Manager
-@end ifinfo
-@section Directives
-@ifinfo
-@menu
-* pthread_mutexattr_init::
-* pthread_mutexattr_destroy::
-* pthread_mutexattr_setprotocol::
-* pthread_mutexattr_getprotocol::
-* pthread_mutexattr_setprioceiling::
-* pthread_mutexattr_getprioceiling::
-* pthread_mutexattr_setpshared::
-* pthread_mutexattr_getpshared::
-* pthread_mutex_init::
-* pthread_mutex_destroy::
-* pthread_mutex_lock::
-* pthread_mutex_trylock::
-* pthread_mutex_timedlock::
-* pthread_mutex_unlock::
-* pthread_mutex_setprioceiling::
-* pthread_mutex_getprioceiling::
-@end menu
-@end ifinfo
-
-This section details the mutex manager's directives.
-A subsection is dedicated to each of this manager's directives
-and describes the calling sequence, related constants, usage,
-and status codes.
-
-@page
-@ifinfo
-@node pthread_mutexattr_init, pthread_mutexattr_destroy, Mutex Manager Directives, Mutex Manager Directives
-@end ifinfo
-@subsection pthread_mutexattr_init
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_mutexattr_init(
-  pthread_mutexattr_t *attr
-);
-@end example
-
-@subheading STATUS CODES:
-
-@table @b
-@item EINVAL
-The attribute pointer argument is invalid.
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@ifinfo
-@node pthread_mutexattr_destroy, pthread_mutexattr_setprotocol, pthread_mutexattr_init, Mutex Manager Directives
-@end ifinfo
-@subsection pthread_mutexattr_destroy
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_mutexattr_destroy(
-  pthread_mutexattr_t *attr
-);
-@end example
-
-@subheading STATUS CODES:
-
-@table @b
-@item EINVAL
-The attribute pointer argument is invalid.
-
-@item EINVAL
-The attribute set is not initialized.
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@ifinfo
-@node pthread_mutexattr_setprotocol, pthread_mutexattr_getprotocol, pthread_mutexattr_destroy, Mutex Manager Directives
-@end ifinfo
-@subsection pthread_mutexattr_setprotocol
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_mutexattr_setprotocol(
-  pthread_mutexattr_t   *attr,
-  int                    protocol
-);
-@end example
-
-@subheading STATUS CODES:
-
-@table @b
-@item EINVAL
-The attribute pointer argument is invalid.
-
-@item EINVAL
-The attribute set is not initialized.
- 
-@item EINVAL
-The protocol argument is invalid.
- 
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@ifinfo
-@node pthread_mutexattr_getprotocol, pthread_mutexattr_setprioceiling, pthread_mutexattr_setprotocol, Mutex Manager Directives
-@end ifinfo
-@subsection pthread_mutexattr_getprotocol
- 
-@subheading CALLING SEQUENCE:
- 
-@example
-#include <pthread.h>
- 
-int pthread_mutexattr_getprotocol(
-  pthread_mutexattr_t   *attr,
-  int                   *protocol
-);
-@end example
- 
-@subheading STATUS CODES:
- 
-@table @b
-@item EINVAL
-The attribute pointer argument is invalid.
-
-@item EINVAL
-The attribute set is not initialized.
- 
-@item EINVAL
-The protocol pointer argument is invalid.
- 
-@end table
- 
-@subheading DESCRIPTION:
- 
-@subheading NOTES:
-
-@page
-@ifinfo
-@node pthread_mutexattr_setprioceiling, pthread_mutexattr_getprioceiling, pthread_mutexattr_getprotocol, Mutex Manager Directives
-@end ifinfo
-@subsection pthread_mutexattr_setprioceiling
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_mutexattr_setprioceiling(
-  pthread_mutexattr_t   *attr,
-  int                    prioceiling
-);
-@end example
-
-@subheading STATUS CODES:
- 
-@table @b
-@item EINVAL
-The attribute pointer argument is invalid.
-
-@item EINVAL
-The attribute set is not initialized.
- 
-@item EINVAL
-The prioceiling argument is invalid.
- 
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@ifinfo
-@node pthread_mutexattr_getprioceiling, pthread_mutexattr_setpshared, pthread_mutexattr_setprioceiling, Mutex Manager Directives
-@end ifinfo
-@subsection pthread_mutexattr_getprioceiling
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_mutexattr_getprioceiling(
-  const pthread_mutexattr_t   *attr,
-  int                         *prioceiling
-);
-@end example
-
-@subheading STATUS CODES:
- 
-@table @b
-@item EINVAL
-The attribute pointer argument is invalid.
-
-@item EINVAL
-The attribute set is not initialized.
- 
-@item EINVAL
-The prioceiling pointer argument is invalid.
- 
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@ifinfo
-@node pthread_mutexattr_setpshared, pthread_mutexattr_getpshared, pthread_mutexattr_getprioceiling, Mutex Manager Directives
-@end ifinfo
-@subsection pthread_mutexattr_setpshared
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_mutexattr_setpshared(
-  pthread_mutexattr_t   *attr,
-  int                    pshared
-);
-@end example
-
-@subheading STATUS CODES:
- 
-@table @b
-@item EINVAL
-The attribute pointer argument is invalid.
-
-@item EINVAL
-The attribute set is not initialized.
- 
-@item EINVAL
-The pshared argument is invalid.
- 
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@ifinfo
-@node pthread_mutexattr_getpshared, pthread_mutex_init, pthread_mutexattr_setpshared, Mutex Manager Directives
-@end ifinfo
-@subsection pthread_mutexattr_getpshared
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_mutexattr_getpshared(
-  const pthread_mutexattr_t   *attr,
-  int                         *pshared
-);
-@end example
-
-@subheading STATUS CODES:
- 
-@table @b
-@item EINVAL
-The attribute pointer argument is invalid.
-
-@item EINVAL
-The attribute set is not initialized.
- 
-@item EINVAL
-The pshared pointer argument is invalid.
- 
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@ifinfo
-@node pthread_mutex_init, pthread_mutex_destroy, pthread_mutexattr_getpshared, Mutex Manager Directives
-@end ifinfo
-@subsection pthread_mutex_init
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_mutex_init(
-  pthread_mutex_t           *mutex,
-  const pthread_mutexattr_t *attr
-);
-@end example
-
-@subheading STATUS CODES:
-
-@table @b
-@item EINVAL
-The attribute set is not initialized.
- 
-@item EINVAL
-The specified protocol is invalid.
-
-@item EAGAIN
-The system lacked the necessary resources to initialize another mutex.
-
-@item ENOMEM
-Insufficient memory exists to initialize the mutex.
-
-@item EBUSY
-Attempted to reinialize the object reference by mutex, a previously
-initialized, but not yet destroyed.
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@ifinfo
-@node pthread_mutex_destroy, pthread_mutex_lock, pthread_mutex_init, Mutex Manager Directives
-@end ifinfo
-@subsection pthread_mutex_destroy
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_mutex_destroy(
-  pthread_mutex_t           *mutex
-);
-@end example
-
-@subheading STATUS CODES:
- 
-@table @b
-@item EINVAL
-The specified mutex is invalid.
-
-@item EBUSY
-Attempted to destroy the object reference by mutex, while it is locked or
-referenced by another thread.
- 
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@ifinfo
-@node pthread_mutex_lock, pthread_mutex_trylock, pthread_mutex_destroy, Mutex Manager Directives
-@end ifinfo
-@subsection pthread_mutex_lock
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_mutex_lock(
-  pthread_mutex_t           *mutex
-);
-@end example
-
-@subheading STATUS CODES:
-
-@table @b
-@item EINVAL
-The specified mutex is invalid.
-
-@item EINVAL
-The mutex has the protocol attribute of PTHREAD_PRIO_PROTECT and the 
-priority of the calling thread is higher than the current priority
-ceiling.
-
-@item EDEADLK
-The current thread already owns the mutex.
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@ifinfo
-@node pthread_mutex_trylock, pthread_mutex_timedlock, pthread_mutex_lock, Mutex Manager Directives
-@end ifinfo
-@subsection pthread_mutex_trylock
- 
-@subheading CALLING SEQUENCE:
- 
-@example
-#include <pthread.h>
- 
-int pthread_mutex_trylock(
-  pthread_mutex_t           *mutex
-);
-@end example
- 
-@subheading STATUS CODES:
- 
-@table @b
-@item EINVAL
-The specified mutex is invalid.
- 
-@item EINVAL
-The mutex has the protocol attribute of PTHREAD_PRIO_PROTECT and the
-priority of the calling thread is higher than the current priority
-ceiling.
- 
-@item EDEADLK
-The current thread already owns the mutex.
- 
-@end table
- 
-@subheading DESCRIPTION:
- 
-@subheading NOTES:
- 
-@page
-@ifinfo
-@node pthread_mutex_timedlock, pthread_mutex_unlock, pthread_mutex_trylock, Mutex Manager Directives
-@end ifinfo
-@subsection pthread_mutex_timedlock
- 
-@subheading CALLING SEQUENCE:
- 
-@example
-#include <pthread.h>
-#include <time.h>
- 
-int pthread_mutex_timedlock(
-  pthread_mutex_t           *mutex,
-  const struct timespec     *timeout
-);
-@end example
- 
-@subheading STATUS CODES:
- 
-@table @b
-@item EINVAL
-The specified mutex is invalid.
- 
-@item EINVAL
-The nanoseconds field of timeout is invalid.
-
-@item EINVAL
-The mutex has the protocol attribute of PTHREAD_PRIO_PROTECT and the
-priority of the calling thread is higher than the current priority
-ceiling.
- 
-@item EDEADLK
-The current thread already owns the mutex.
-
-@end table
- 
-@subheading DESCRIPTION:
- 
-@subheading NOTES:
- 
-
-@page
-@ifinfo
-@node pthread_mutex_unlock,  pthread_mutex_setprioceiling, pthread_mutex_timedlock, Mutex Manager Directives
-@end ifinfo
-@subsection pthread_mutex_unlock
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_mutex_unlock(
-  pthread_mutex_t           *mutex
-);
-@end example
-
-@subheading STATUS CODES:
-
-@table @b
-@item EINVAL
-The specified mutex is invalid.
- 
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@ifinfo
-@node pthread_mutex_setprioceiling, pthread_mutex_getprioceiling, pthread_mutex_unlock, Mutex Manager Directives
-@end ifinfo
-@subsection pthread_mutex_setprioceiling
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_mutex_setprioceiling(
-  pthread_mutex_t   *mutex,
-  int                prioceiling,
-  int               *oldceiling
-);
-@end example
-
-@subheading STATUS CODES:
- 
-@table @b
-@item EINVAL
-The oldceiling pointer parameter is invalid.
-
-@item EINVAL
-The prioceiling parameter is an invalid priority.
-
-@item EINVAL
-The specified mutex is invalid.
- 
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@ifinfo
-@node pthread_mutex_getprioceiling, Condition Variable Manager, pthread_mutex_setprioceiling, Mutex Manager Directives
-@end ifinfo
-@subsection pthread_mutex_getprioceiling
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_mutex_getprioceiling(
-  pthread_mutex_t   *mutex,
-  int               *prioceiling
-);
-@end example
-
-@subheading STATUS CODES:
- 
-@table @b
-@item EINVAL
-The prioceiling pointer parameter is invalid.
-
-@item EINVAL
-The specified mutex is invalid.
- 
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
diff --git a/doc/posix_users/posix_users.texi b/doc/posix_users/posix_users.texi
deleted file mode 100644
index 7686b2cb40..0000000000
--- a/doc/posix_users/posix_users.texi
+++ /dev/null
@@ -1,126 +0,0 @@
-\input ../texinfo/texinfo   @c -*-texinfo-*-
-@c %**start of header
-@setfilename posix_users
-@syncodeindex vr fn
-@synindex ky cp
-@paragraphindent 0
-@c @smallbook
-@c %**end of header
-
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@c
-@c   Master file for the C User's Guide
-@c
-
-@c Joel's Questions
-@c
-@c  1.  Why does paragraphindent only impact makeinfo?
-@c  2.  Why does paragraphindent show up in HTML?
-@c
-
-@include ../common/setup.texi
-
-@ignore
-@ifinfo
-@format
-START-INFO-DIR-ENTRY
-* RTEMS Posix API User's Guide: (posix_users).   Posix API User's Guide Plan
-END-INFO-DIR-ENTRY
-@end format
-@end ifinfo
-@end ignore
-
-@c variable substitution info:
-@c
-@c @set LANGUAGE C
-@c the language is @value{LANGUAGE}
-@c NOTE:  don't use underscore in the name
-@c
-
-@c
-@c  Title Page Stuff
-@c
-
-@set edition @value{RTEMS-EDITION}
-@set version @value{RTEMS-VERSION}
-@set update-date @value{RTEMS-UPDATE-DATE}
-@set update-month @value{RTEMS-UPDATE-MONTH}
-
-@c
-@c  I don't really like having a short title page.  --joel
-@c
-@c @shorttitlepage RTEMS POSIX API User's Guide
-
-@setchapternewpage odd
-@settitle RTEMS POSIX API User's Guide 
-@titlepage
-@finalout
-
-@title RTEMS POSIX API User's Guide
-@subtitle Edition @value{edition}, for RTEMS @value{version}
-@sp 1
-@subtitle @value{update-month}
-@author On-Line Applications Research Corporation
-@page
-@include ../common/cpright.texi
-@end titlepage
-
-@c  This prevents a black box from being printed on "overflow" lines.
-@c  The alternative is to rework a sentence to avoid this problem.
-
-@include preface.texi
-@include thread.texi
-@include signal.texi
-@include mutex.texi
-@include cond.texi
-@include key.texi
-@include clock.texi
-@include sched.texi
-@ifinfo
-@node Top, Preface, (dir), (dir)
-@top posix_users
-
-This is the online version of the RTEMS POSIX API User's Guide
-
-@menu
-* Preface::
-* Thread Manager::
-* Signal Manager::
-* Mutex Manager::
-* Condition Variable Manager::
-* Key Manager::
-* Clock Manager::
-* Scheduler Manager::
-* Command and Variable Index::
-* Concept Index::
-@end menu
-
-@end ifinfo
-@c 
-@c 
-@c Need to copy the emacs stuff and "trailer stuff" (index, toc) into here
-@c
-
-@node Command and Variable Index, Concept Index, sched_yield, Top
-@unnumbered Command and Variable Index
-
-There are currently no Command and Variable Index entries.
-
-@c @printindex fn
-
-@node Concept Index, , Command and Variable Index, Top
-@unnumbered Concept Index
-
-There are currently no Concept Index entries.
-@c @printindex cp
-
-@contents
-@bye
-
diff --git a/doc/posix_users/preface.texi b/doc/posix_users/preface.texi
deleted file mode 100644
index bf1653109c..0000000000
--- a/doc/posix_users/preface.texi
+++ /dev/null
@@ -1,24 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@ifinfo
-@node Preface, Thread Manager, Top, Top
-@end ifinfo
-@unnumbered Preface
-
-This is the user's guide for the POSIX API support for RTEMS.
-
-We intend for this manual to only be a listing of the API.  Please
-refer to the ISO/IEC 9945-1 @i{Information Technology -
-Portable Operating System Interface (POSIX) - Part 1: System
-Application Program Interface (API) [C Language]} for the specific
-functionality and behavior of the services.
-
-In addition, much of the POSIX API standard is actually implemented
-in the newlib ANSI C Library.  Please refer to documentation on
-newlib for more information on what it supplies.
diff --git a/doc/posix_users/sched.texi b/doc/posix_users/sched.texi
deleted file mode 100644
index c37c24964d..0000000000
--- a/doc/posix_users/sched.texi
+++ /dev/null
@@ -1,228 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@ifinfo
-@node Scheduler Manager, Scheduler Manager Introduction, time, Top
-@end ifinfo
-@chapter Scheduler Manager
-@ifinfo
-@menu
-* Scheduler Manager Introduction::
-* Scheduler Manager Background::
-* Scheduler Manager Operations::
-* Scheduler Manager Directives::
-@end menu
-@end ifinfo
-
-@ifinfo
-@node Scheduler Manager Introduction, Scheduler Manager Background, Scheduler Manager, Scheduler Manager
-@end ifinfo
-@section Introduction
-
-The scheduler manager ...
-
-The directives provided by the scheduler manager are:
-
-@itemize @bullet
-@item @code{sched_get_priority_min} - 
-@item @code{sched_get_priority_max} - 
-@item @code{sched_rr_get_interval} - 
-@item @code{sched_yield} - 
-@end itemize
-
-@ifinfo
-@node Scheduler Manager Background, Priority, Scheduler Manager Introduction, Scheduler Manager
-@end ifinfo
-@section Background
-@ifinfo
-@menu
-* Priority::
-* Scheduling Policies::
-@end menu
-@end ifinfo
-
-@ifinfo
-@node Priority, Scheduling Policies, Scheduler Manager Background, Scheduler Manager Background
-@end ifinfo
-@subsection Priority
-
-In the RTEMS implementation of the POSIX API, the priorities range from
-the low priority of sched_get_priority_min() to the highest priority of
-sched_get_priority_max().  Numerically higher values represent higher
-priorities.
-
-@ifinfo
-@node Scheduling Policies, Scheduler Manager Operations, Priority, Scheduler Manager Background
-@end ifinfo
-@subsection Scheduling Policies
-
-The following scheduling policies are available:
-
-@table @b
-@item SCHED_FIFO
-Priority-based, preemptive scheduling with no timeslicing.  This is equivalent
-to what is called "manual round-robin" scheduling.
-
-@item SCHED_RR
-Priority-based, preemptive scheduling with timeslicing.  Time quantums are 
-maintained on a per-thread basis and are not reset at each context switch.
-Thus, a thread which is preempted and subsequently resumes execution will
-attempt to complete the unused portion of its time quantum.
-
-@item SCHED_OTHER
-Priority-based, preemptive scheduling with timeslicing.  Time quantums are 
-maintained on a per-thread basis and are reset at each context switch.
-
-@item SCHED_SPORADIC
-Priority-based, preemptive scheduling utilizing three additional parameters:
-budget, replenishment period, and low priority.  Under this policy, the 
-thread is allowed to execute for "budget" amount of time before its priority
-is lowered to "low priority".  At the end of each replenishment period,
-the thread resumes its initial priority and has its budget replenished.
-
-@end table
-
-@ifinfo
-@node Scheduler Manager Operations, Scheduler Manager Directives, Scheduling Policies, Scheduler Manager
-@end ifinfo
-@section Operations
-
-@ifinfo
-@node Scheduler Manager Directives, sched_get_priority_min, Scheduler Manager Operations, Scheduler Manager
-@end ifinfo
-@section Directives
-@ifinfo
-@menu
-* sched_get_priority_min::
-* sched_get_priority_max::
-* sched_rr_get_interval::
-* sched_yield::
-@end menu
-@end ifinfo
-
-This section details the scheduler manager's directives.
-A subsection is dedicated to each of this manager's directives
-and describes the calling sequence, related constants, usage,
-and status codes.
-
-@page
-@ifinfo
-@node sched_get_priority_min, sched_get_priority_max, Scheduler Manager Directives, Scheduler Manager Directives
-@end ifinfo
-@subsection sched_get_priority_min
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <sched.h>
-
-int sched_get_priority_min(
-  int policy
-);
-@end example
-
-@subheading STATUS CODES:
-
-On error, this routine returns -1 and sets errno to one of the following:
-
-@table @b
-@item EINVAL
-The indicated policy is invalid.
- 
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@ifinfo
-@node sched_get_priority_max, sched_rr_get_interval, sched_get_priority_min, Scheduler Manager Directives
-@end ifinfo
-@subsection sched_get_priority_max
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <sched.h>
-
-int sched_get_priority_max(
-  int policy
-);
-@end example
-
-@subheading STATUS CODES:
-
-On error, this routine returns -1 and sets errno to one of the following:
-
-@table @b
-@item EINVAL
-The indicated policy is invalid.
- 
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@ifinfo
-@node sched_rr_get_interval, sched_yield, sched_get_priority_max, Scheduler Manager Directives
-@end ifinfo
-@subsection sched_rr_get_interval
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <sched.h>
-
-int sched_rr_get_interval(
-  pid_t            pid,
-  struct timespec *interval
-);
-@end example
-
-@subheading STATUS CODES:
-
-On error, this routine returns -1 and sets errno to one of the following:
-
-@table @b
-@item ESRCH
-The indicated process id is invalid. 
- 
-@item EINVAL
-The specified interval pointer parameter is invalid. 
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@ifinfo
-@node sched_yield, Command and Variable Index, sched_rr_get_interval, Scheduler Manager Directives
-@end ifinfo
-@subsection sched_yield
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <sched.h>
-
-int sched_yield( void );
-@end example
-
-@subheading STATUS CODES:
-
-This routine always returns zero to indicate success.
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
diff --git a/doc/posix_users/signal.texi b/doc/posix_users/signal.texi
deleted file mode 100644
index 6d90b8cfff..0000000000
--- a/doc/posix_users/signal.texi
+++ /dev/null
@@ -1,691 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@ifinfo
-@node Signal Manager, Signal Manager Introduction, pthread_getschedparam, Top
-@end ifinfo
-@chapter Signal Manager
-@ifinfo
-@menu
-* Signal Manager Introduction::
-* Signal Manager Background::
-* Signal Manager Operations::
-* Signal Manager Directives::
-@end menu
-@end ifinfo
-
-@ifinfo
-@node Signal Manager Introduction, Signal Manager Background, Signal Manager, Signal Manager
-@end ifinfo
-@section Introduction
-
-The signal manager ...
-
-The directives provided by the signal manager are:
-
-@itemize @bullet
-@item @code{sigaddset} - 
-@item @code{sigdelset} - 
-@item @code{sigfillset} - 
-@item @code{sigismember} - 
-@item @code{sigemptyset} - 
-@item @code{sigaction} - 
-@item @code{pthread_kill} - 
-@item @code{sigprocmask} - 
-@item @code{pthread_sigmask} - 
-@item @code{kill} - 
-@item @code{sigpending} - 
-@item @code{sigsuspend} - 
-@item @code{pause} - 
-@item @code{sigwait} - 
-@item @code{sigwaitinfo} - 
-@item @code{sigtimedwait} - 
-@item @code{sigqueue} - 
-@item @code{alarm} - 
-@end itemize
-
-@ifinfo
-@node Signal Manager Background, Signal Delivery, Signal Manager Introduction, Signal Manager
-@end ifinfo
-@section Background
-@ifinfo
-@menu
-* Signal Delivery::
-@end menu
-@end ifinfo
-
-
-@ifinfo
-@node Signal Delivery, Signal Manager Operations, Signal Manager Background, Signal Manager Background
-@end ifinfo
-@subsection Signal Delivery
-
-Signals directed at a thread are delivered to the specified thread.
-
-Signals directed at a process are delivered to a thread which is selected
-based on the following algorithm:
-
-@enumerate
-@item If the action for this signal is currently SIG_IGN, then the signal
-is simply ignored.
-
-@item If the currently executing thread has the signal unblocked, then
-the signal is delivered to it.
-
-@item If any threads are currently blocked waiting for this signal 
-(sigwait()), then the signal is delivered to the highest priority 
-thread waiting for this signal.
-
-@item If any other threads are willing to accept delivery of the signal, then
-the signal is delivered to the highest priority thread of this set.  In the
-event, multiple threads of the same priority are willing to accept this
-signal, then priority is given first to ready threads, then to threads
-blocked on calls which may be interrupted, and finally to threads blocked
-on non-interruptible calls.
-
-@item In the event the signal still can not be delivered, then it is left
-pending.  The first thread to unblock the signal (sigprocmask() or
-pthread_sigprocmask()) or to wait for this signal (sigwait()) will be
-the recipient of the signal.
-
-@end enumerate
-
-@ifinfo
-@node Signal Manager Operations, Signal Manager Directives, Signal Delivery, Signal Manager
-@end ifinfo
-@section Operations
-
-@ifinfo
-@node Signal Manager Directives, sigaddset, Signal Manager Operations, Signal Manager
-@end ifinfo
-@section Directives
-@ifinfo
-@menu
-* sigaddset::
-* sigdelset::
-* sigfillset::
-* sigismember::
-* sigemptyset::
-* sigaction::
-* pthread_kill::
-* sigprocmask::
-* pthread_sigmask::
-* kill::
-* sigpending::
-* sigsuspend::
-* pause::
-* sigwait::
-* sigwaitinfo::
-* sigtimedwait::
-* sigqueue::
-* alarm::
-@end menu
-@end ifinfo
-
-This section details the signal manager's directives.
-A subsection is dedicated to each of this manager's directives
-and describes the calling sequence, related constants, usage,
-and status codes.
-
-@page
-@ifinfo
-@node sigaddset, sigdelset, Signal Manager Directives, Signal Manager Directives
-@end ifinfo
-@subsection sigaddset
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <signal.h>
-
-int sigaddset(
-  sigset_t   *set,
-  int         signo
-);
-@end example
-
-@subheading STATUS CODES:
-
-@table @b
-@item EINVAL
-Invalid argument passed.
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@ifinfo
-@node sigdelset, sigfillset, sigaddset, Signal Manager Directives
-@end ifinfo
-@subsection sigdelset
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <signal.h>
-
-int sigdelset(
-  sigset_t   *set,
-  int         signo
-);
-@end example
-
-@subheading STATUS CODES:
-
-@table @b
-@item EINVAL
-Invalid argument passed.
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@ifinfo
-@node sigfillset, sigismember, sigdelset, Signal Manager Directives
-@end ifinfo
-@subsection sigfillset
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <signal.h>
-
-int sigfillset(
-  sigset_t   *set
-);
-@end example
-
-@subheading STATUS CODES:
-@table @b
-@item EINVAL
-Invalid argument passed.
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@ifinfo
-@node sigismember, sigemptyset, sigfillset, Signal Manager Directives
-@end ifinfo
-@subsection sigismember
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <signal.h>
-
-int sigismember(
-  const sigset_t   *set,
-  int               signo
-);
-@end example
-
-@subheading STATUS CODES:
-@table @b
-@item EINVAL
-Invalid argument passed.
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@ifinfo
-@node sigemptyset, sigaction,  sigismember, Signal Manager Directives
-@end ifinfo
-@subsection sigemptyset
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <signal.h>
-
-int sigemptyset(
-  sigset_t   *set
-);
-@end example
-
-@subheading STATUS CODES:
-
-@table @b
-@item EINVAL
-Invalid argument passed.
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@ifinfo
-@node sigaction, pthread_kill, sigemptyset, Signal Manager Directives
-@end ifinfo
-@subsection sigaction
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <signal.h>
-
-int sigaction(
-  int                     sig,
-  const struct sigaction *act,
-  struct sigaction       *oact
-);
-@end example
-
-@subheading STATUS CODES:
-
-@table @b
-@item EINVAL
-Invalid argument passed.
-
-@item ENOTSUP
-Realtime Signals Extension option not supported.
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-The signal number cannot be SIGKILL.
-@page
-@ifinfo
-@node pthread_kill, sigprocmask, sigaction, Signal Manager Directives
-@end ifinfo
-@subsection pthread_kill
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <signal.h>
-
-int pthread_kill(
-  pthread_t   thread,
-  int         sig
-);
-@end example
-
-@subheading STATUS CODES:
-@table @b
-@item ESRCH
-The thread indicated by the parameter thread is invalid.
-
-@item EINVAL
-Invalid argument passed.
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@ifinfo
-@node sigprocmask, pthread_sigmask, pthread_kill, Signal Manager Directives
-@end ifinfo
-@subsection sigprocmask
- 
-@subheading CALLING SEQUENCE:
- 
-@example
-#include <signal.h>
- 
-int sigprocmask(
-  int               how,
-  const sigset_t   *set,
-  sigset_t         *oset
-);
-@end example
- 
-@subheading STATUS CODES:
-@table @b
-@item EINVAL
-Invalid argument passed.
- 
-@end table
- 
-@subheading DESCRIPTION:
- 
-@subheading NOTES:
- 
-
-@page
-@ifinfo
-@node pthread_sigmask, kill, sigprocmask, Signal Manager Directives
-@end ifinfo
-@subsection pthread_sigmask
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <signal.h>
-
-int pthread_sigmask(
-  int               how,
-  const sigset_t   *set,
-  sigset_t         *oset
-);
-@end example
-
-@subheading STATUS CODES:
-@table @b
-@item EINVAL
-Invalid argument passed.
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-
-@page
-@ifinfo
-@node kill, sigpending, pthread_sigmask, Signal Manager Directives
-@end ifinfo
-@subsection kill
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <sys/types.h>
-#include <signal.h>
-
-int kill(
-  pid_t pid,
-  int   sig
-);
-@end example
-
-@subheading STATUS CODES:
-@table @b
-@item EINVAL
-Invalid argument passed.
-
-@item EPERM
-Process does not have permission to send the signal to any receiving process.
-
-@item ESRCH
-The process indicated by the parameter pid is invalid.
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
- 
-@page
-@ifinfo
-@node sigpending, sigsuspend, kill, Signal Manager Directives
-@end ifinfo
-@subsection sigpending
- 
-@subheading CALLING SEQUENCE:
- 
-@example
-#include <signal.h>
- 
-int sigpending(
-  const sigset_t  *set
-);
-@end example
- 
-@subheading STATUS CODES:
-
-On error, this routine returns -1 and sets errno to one of the following:
- 
-@table @b
-@item EFAULT
-Invalid address for set.
-
-@end table
-
-@subheading DESCRIPTION:
- 
-@subheading NOTES:
-
-@page
-@ifinfo
-@node sigsuspend, pause, sigpending, Signal Manager Directives
-@end ifinfo
-@subsection sigsuspend
- 
-@subheading CALLING SEQUENCE:
- 
-@example
-#include <signal.h>
- 
-int sigsuspend(
-  const sigset_t  *sigmask
-);
-@end example
- 
-@subheading STATUS CODES:
-@table @b
-Returns -1 and sets errno.
-
-@item EINTR
-Signal interrupted this function.
- 
-@end table
- 
-@subheading DESCRIPTION:
- 
-@subheading NOTES:
-
-@page
-@ifinfo
-@node pause, sigwait, sigsuspend, Signal Manager Directives
-@end ifinfo
-@subsection pause
- 
-@subheading CALLING SEQUENCE:
- 
-@example
-#include <signal.h>
- 
-int pause( void );
-@end example
- 
-@subheading STATUS CODES:
-@table @b
-Returns -1 and sets errno.
- 
-@item EINTR
-Signal interrupted this function.
- 
-@end table
- 
-@subheading DESCRIPTION:
- 
-@subheading NOTES:
- 
-@page
-@ifinfo
-@node sigwait, sigwaitinfo, pause, Signal Manager Directives
-@end ifinfo
-@subsection sigwait
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <signal.h>
-
-int sigwait(
-  const sigset_t  *set,
-  int             *sig
-);
-@end example
-
-@subheading STATUS CODES:
-@table @b
-@item EINVAL
-Invalid argument passed.
-
-@item EINTR
-Signal interrupted this function.
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@ifinfo
-@node sigwaitinfo, sigtimedwait, sigwait, Signal Manager Directives
-@end ifinfo
-@subsection sigwaitinfo
- 
-@subheading CALLING SEQUENCE:
- 
-@example
-#include <signal.h>
- 
-int sigwaitinfo(
-  const sigset_t  *set,
-  siginfo_t       *info
-);
-@end example
- 
-@subheading STATUS CODES:
-@table @b
-@item EINTR
-Signal interrupted this function.
- 
-@end table
- 
-@subheading DESCRIPTION:
- 
-@subheading NOTES:
-
-@page
-@ifinfo
-@node sigtimedwait, sigqueue, sigwaitinfo, Signal Manager Directives
-@end ifinfo
-@subsection sigtimedwait
- 
-@subheading CALLING SEQUENCE:
- 
-@example
-#include <signal.h>
- 
-int sigtimedwait(
-  const sigset_t         *set,
-  siginfo_t              *info,
-  const struct timespec  *timeout
-);
-@end example
- 
-@subheading STATUS CODES:
-@table @b
-@item EAGAIN
-Timed out while waiting for the specified signal set.
- 
-@item EINVAL
-Nanoseconds field of the timeout argument is invalid.
- 
-@item EINTR
-Signal interrupted this function.
- 
-@end table
- 
-@subheading DESCRIPTION:
- 
-@subheading NOTES:
-
-If timeout is NULL, then the thread will wait forever for the specified 
-signal set.
-
-@page
-@ifinfo
-@node sigqueue, alarm, sigtimedwait, Signal Manager Directives
-@end ifinfo
-@subsection sigqueue
- 
-@subheading CALLING SEQUENCE:
- 
-@example
-#include <signal.h>
- 
-int sigqueue(
-  pid_t               pid,
-  int                 signo,
-  const union sigval  value
-);
-@end example
- 
-@subheading STATUS CODES:
-
-@table @b
-
-@item EAGAIN
-No resources available to queue the signal.  The process has already
-queued SIGQUEUE_MAX signals that are still pending at the receiver
-or the systemwide resource limit has been exceeded.
- 
-@item EINVAL
-The value of the signo argument is an invalid or unsupported signal
-number.
- 
-@item EPERM
-The process does not have the appropriate privilege to send the signal
-to the receiving process.
-
-@item ESRCH
-The process pid does not exist.
- 
-@end table
- 
-@subheading DESCRIPTION:
- 
-@subheading NOTES:
-
-
-@page
-@ifinfo
-@node alarm, Mutex Manager, sigqueue, Signal Manager Directives
-@end ifinfo
-@subsection alarm
- 
-@subheading CALLING SEQUENCE:
- 
-@example
-#include <signal.h>
- 
-unsigned int alarm(
-  unsigned int  seconds
-);
-@end example
- 
-@subheading STATUS CODES:
-
-If there was a previous alarm() request with time remaining, then this routine
-returns the number of seconds until that outstanding alarm would have fired.
-If no previous alarm() request was outstanding, then zero is returned.
- 
-@subheading DESCRIPTION:
- 
-@subheading NOTES:
-
-
diff --git a/doc/posix_users/thread.texi b/doc/posix_users/thread.texi
deleted file mode 100644
index bb223a37ed..0000000000
--- a/doc/posix_users/thread.texi
+++ /dev/null
@@ -1,1025 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@ifinfo
-@node Thread Manager, Thread Manager Introduction, Preface, Top
-@end ifinfo
-@chapter Thread Manager
-@ifinfo
-@menu
-* Thread Manager Introduction::
-* Thread Manager Background::
-* Thread Manager Operations::
-* Thread Manager Directives::
-@end menu
-@end ifinfo
-
-@ifinfo
-@node Thread Manager Introduction, Thread Manager Background, Thread Manager, Thread Manager
-@end ifinfo
-@section Introduction
-
-The thread manager ...
-
-The directives provided by the thread manager are:
-
-@itemize @bullet
-@item @code{pthread_attr_init} - 
-@item @code{pthread_attr_destroy} - 
-@item @code{pthread_attr_setdetachstate} - 
-@item @code{pthread_attr_getdetachstate} - 
-@item @code{pthread_attr_setstacksize} - 
-@item @code{pthread_attr_getstacksize} - 
-@item @code{pthread_attr_setstackaddr} - 
-@item @code{pthread_attr_getstackaddr} - 
-@item @code{pthread_attr_setscope} - 
-@item @code{pthread_attr_getscope} - 
-@item @code{pthread_attr_setinheritsched} - 
-@item @code{pthread_attr_getinheritsched} - 
-@item @code{pthread_attr_setschedpolicy} - 
-@item @code{pthread_attr_getschedpolicy} - 
-@item @code{pthread_attr_setschedparam} - 
-@item @code{pthread_attr_getschedparam} - 
-@item @code{pthread_create} - 
-@item @code{pthread_exit} - 
-@item @code{pthread_detach} - 
-@item @code{pthread_join} - 
-@item @code{pthread_self} - 
-@item @code{pthread_equal} - 
-@item @code{pthread_once} - 
-@item @code{pthread_setschedparam} - 
-@item @code{pthread_getschedparam} - 
-@end itemize
-
-@ifinfo
-@node Thread Manager Background, Thread Attributes, Thread Manager Introduction, Thread Manager
-@end ifinfo
-@section Background
-@ifinfo
-@menu
-* Thread Attributes::
-@end menu
-@end ifinfo
-
-@ifinfo
-@node Thread Attributes, Thread Manager Operations, Thread Manager Background, Thread Manager Background
-@end ifinfo
-@subsection Thread Attributes
-
-Thread attributes are utilized only at thread creation time.
-
-@table @b
-@item stack address
-is the address of the optionally user specified stack area for this thread.
-If this value is NULL, then RTEMS allocates the memory for the thread stack 
-from the RTEMS Workspace Area.  Otherwise, this is the user specified
-address for the memory to be used for the thread's stack.  Each thread must
-have a distinct stack area.  Each processor family has different alignment
-rules which should be followed.
-
-@item stack size
-is the minimum desired size for this thread's stack area.
-If the size of this area as specified by the stack size attribute 
-is smaller than the minimum for this processor family and the stack 
-is not user specified, then RTEMS will automatically allocate a 
-stack of the minimum size for this processor family.
-
-@item contention scope
-specifies the scheduling contention scope.  RTEMS only supports the
-PTHREAD_SCOPE_PROCESS scheduling contention scope.
-
-@item scheduling inheritance
-specifies whether a user specified or the scheduling policy and 
-parameters of the currently executing thread are to be used.  When 
-this is PTHREAD_INHERIT_SCHED, then the scheduling policy and 
-parameters of the currently executing thread are inherited by 
-the newly created thread.
-
-@item scheduling policy and parameters
-specify the manner in which the thread will contend for the processor.
-The scheduling parameters are interpreted based on the specified policy.
-All policies utilize the thread priority parameter.
-
-@end table
-
-@ifinfo
-@node Thread Manager Operations, Thread Manager Directives, Thread Attributes, Thread Manager
-@end ifinfo
-@section Operations
-
-@ifinfo
-@node Thread Manager Directives, pthread_attr_init, Thread Manager Operations, Thread Manager
-@end ifinfo
-@section Directives
-@ifinfo
-@menu
-* pthread_attr_init::
-* pthread_attr_destroy::
-* pthread_attr_setdetachstate::
-* pthread_attr_getdetachstate::
-* pthread_attr_setstacksize::
-* pthread_attr_getstacksize::
-* pthread_attr_setstackaddr::
-* pthread_attr_getstackaddr::
-* pthread_attr_setscope::
-* pthread_attr_getscope::
-* pthread_attr_setinheritsched::
-* pthread_attr_getinheritsched::
-* pthread_attr_setschedpolicy::
-* pthread_attr_getschedpolicy::
-* pthread_attr_setschedparam::
-* pthread_attr_getschedparam::
-* pthread_create::
-* pthread_exit::
-* pthread_detach::
-* pthread_join::
-* pthread_self::
-* pthread_equal::
-* pthread_once::
-* pthread_setschedparam::
-* pthread_getschedparam::
-@end menu
-@end ifinfo
-
-This section details the thread manager's directives.
-A subsection is dedicated to each of this manager's directives
-and describes the calling sequence, related constants, usage,
-and status codes.
-
-@page
-@ifinfo
-@node pthread_attr_init, pthread_attr_destroy, Thread Manager Directives, Thread Manager Directives
-@end ifinfo
-@subsection pthread_attr_init
-
-@subheading CALLING SEQUENCE:
-
-
-@example
-#include <pthread.h>
-
-int pthread_attr_init(
-  pthread_attr_t  *attr
-);
-@end example
-
-@subheading STATUS CODES:
-
-@table @b
-@item EINVAL
-The attribute pointer argument is invalid.
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@ifinfo
-@node pthread_attr_destroy, pthread_attr_setdetachstate, pthread_attr_init, Thread Manager Directives
-@end ifinfo
-@subsection pthread_attr_destroy
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
- 
-int pthread_attr_destroy(
-  pthread_attr_t  *attr
-);
-@end example
-
-@subheading STATUS CODES:
- 
-@table @b
-@item EINVAL
-The attribute pointer argument is invalid.
-
-@item EINVAL
-The attribute set is not initialized.
- 
-@end table
- 
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@ifinfo
-@node pthread_attr_setdetachstate, pthread_attr_getdetachstate, pthread_attr_destroy, Thread Manager Directives
-@end ifinfo
-@subsection pthread_attr_setdetachstate
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
- 
-int pthread_attr_setdetachstate(
-  pthread_attr_t  *attr,
-  int              detachstate
-);
-@end example
-
-@subheading STATUS CODES:
- 
-@table @b
-@item EINVAL
-The attribute pointer argument is invalid.
-
-@item EINVAL
-The attribute set is not initialized.
- 
-@item EINVAL
-The detachstate argument is invalid.
- 
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@ifinfo
-@node pthread_attr_getdetachstate, pthread_attr_setstacksize, pthread_attr_setdetachstate, Thread Manager Directives
-@end ifinfo
-@subsection pthread_attr_getdetachstate
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
- 
-int pthread_attr_getdetachstate(
-  const pthread_attr_t  *attr,
-  int                   *detachstate
-);
-@end example
-
-@subheading STATUS CODES:
- 
-@table @b
-@item EINVAL
-The attribute pointer argument is invalid.
-
-@item EINVAL
-The attribute set is not initialized.
- 
-@item EINVAL
-The detatchstate pointer argument is invalid.
-
-@end table
- 
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@ifinfo
-@node pthread_attr_setstacksize, pthread_attr_getstacksize, pthread_attr_getdetachstate, Thread Manager Directives
-@end ifinfo
-@subsection pthread_attr_setstacksize
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
- 
-int pthread_attr_setstacksize(
-  pthread_attr_t  *attr,
-  size_t           stacksize
-);
-@end example
-
-@subheading STATUS CODES:
- 
-@table @b
-@item EINVAL
-The attribute pointer argument is invalid.
-
-@item EINVAL
-The attribute set is not initialized.
- 
-@end table
- 
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-If the specified stacksize is below the minimum required for this CPU, then
-the stacksize will be set to the minimum for this CPU.
-
-@page
-@ifinfo
-@node pthread_attr_getstacksize, pthread_attr_setstackaddr, pthread_attr_setstacksize, Thread Manager Directives
-@end ifinfo
-@subsection pthread_attr_getstacksize
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_attr_getstacksize(
-  const pthread_attr_t  *attr,
-  size_t                *stacksize
-);
-@end example
-
-@subheading STATUS CODES:
- 
-@table @b
-@item EINVAL
-The attribute pointer argument is invalid.
-
-@item EINVAL
-The attribute set is not initialized.
- 
-@item EINVAL
-The stacksize pointer argument is invalid.
-
-@end table
- 
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@ifinfo
-@node pthread_attr_setstackaddr, pthread_attr_getstackaddr, pthread_attr_getstacksize, Thread Manager Directives
-@end ifinfo
-@subsection pthread_attr_setstackaddr
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
- 
-int pthread_attr_setstackaddr(
-  pthread_attr_t  *attr,
-  void            *stackaddr
-);
-@end example
-
-@subheading STATUS CODES:
- 
-@table @b
-@item EINVAL
-The attribute pointer argument is invalid.
-
-@item EINVAL
-The attribute set is not initialized.
-
-@end table
- 
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@ifinfo
-@node pthread_attr_getstackaddr, pthread_attr_setscope, pthread_attr_setstackaddr, Thread Manager Directives
-@end ifinfo
-@subsection pthread_attr_getstackaddr
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_attr_getstackaddr(
-  const pthread_attr_t  *attr,
-  void                 **stackaddr
-);
-@end example
-
-@subheading STATUS CODES:
- 
-@table @b
-@item EINVAL
-The attribute pointer argument is invalid.
-
-@item EINVAL
-The attribute set is not initialized.
- 
-@item EINVAL
-The stackaddr pointer argument is invalid.
-
-@end table
- 
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@ifinfo
-@node pthread_attr_setscope, pthread_attr_getscope, pthread_attr_getstackaddr, Thread Manager Directives
-@end ifinfo
-@subsection pthread_attr_setscope
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_attr_setscope(
-  pthread_attr_t  *attr,
-  int              contentionscope
-);
-@end example
-
-@subheading STATUS CODES:
-
-@table @b
-@item EINVAL
-The attribute pointer argument is invalid.
-
-@item EINVAL
-The attribute set is not initialized.
-
-@item EINVAL
-The contention scope specified is not valid.
-
-@item ENOTSUP
-The contention scope specified (PTHREAD_SCOPE_SYSTEM) is not supported.
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@ifinfo
-@node pthread_attr_getscope, pthread_attr_setinheritsched, pthread_attr_setscope, Thread Manager Directives
-@end ifinfo
-@subsection pthread_attr_getscope
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_attr_getscope(
-  const pthread_attr_t  *attr,
-  int                   *contentionscope
-);
-@end example
-
-@subheading STATUS CODES:
-
-@table @b
-@item EINVAL
-The attribute pointer argument is invalid.
-
-@item EINVAL
-The attribute set is not initialized.
-
-@item EINVAL
-The contentionscope pointer argument is invalid.
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@ifinfo
-@node pthread_attr_setinheritsched, pthread_attr_getinheritsched, pthread_attr_getscope, Thread Manager Directives
-@end ifinfo
-@subsection pthread_attr_setinheritsched
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_attr_setinheritsched(
-  pthread_attr_t  *attr,
-  int              inheritsched
-);
-@end example
-
-@subheading STATUS CODES:
-
-@table @b
-@item EINVAL
-The attribute pointer argument is invalid.
-
-@item EINVAL
-The attribute set is not initialized.
-
-@item EINVAL
-The specified scheduler inheritance argument is invalid.
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@ifinfo
-@node pthread_attr_getinheritsched, pthread_attr_setschedpolicy, pthread_attr_setinheritsched, Thread Manager Directives
-@end ifinfo
-@subsection pthread_attr_getinheritsched
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_attr_getinheritsched(
-  const pthread_attr_t  *attr,
-  int                   *inheritsched
-);
-@end example
-
-@subheading STATUS CODES:
-@table @b
-@item EINVAL
-The attribute pointer argument is invalid.
-
-@item EINVAL
-The attribute set is not initialized.
-
-@item EINVAL
-The inheritsched pointer argument is invalid.
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@ifinfo
-@node pthread_attr_setschedpolicy, pthread_attr_getschedpolicy, pthread_attr_getinheritsched, Thread Manager Directives
-@end ifinfo
-@subsection pthread_attr_setschedpolicy
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_attr_setschedpolicy(
-  pthread_attr_t  *attr,
-  int              policy
-);
-@end example
-
-@subheading STATUS CODES:
-@table @b
-@item EINVAL
-The attribute pointer argument is invalid.
-
-@item EINVAL
-The attribute set is not initialized.
- 
-@item ENOTSUP
-The specified scheduler policy argument is invalid.
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@ifinfo
-@node pthread_attr_getschedpolicy, pthread_attr_setschedparam, pthread_attr_setschedpolicy, Thread Manager Directives
-@end ifinfo
-@subsection pthread_attr_getschedpolicy
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_attr_getschedpolicy(
-  const pthread_attr_t  *attr,
-  int                   *policy
-);
-@end example
-
-@subheading STATUS CODES:
-@table @b
-@item EINVAL
-The attribute pointer argument is invalid.
-
-@item EINVAL
-The attribute set is not initialized.
-
-@item EINVAL
-The specified scheduler policy argument pointer is invalid.
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@ifinfo
-@node pthread_attr_setschedparam, pthread_attr_getschedparam, pthread_attr_getschedpolicy, Thread Manager Directives
-@end ifinfo
-@subsection pthread_attr_setschedparam
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_attr_setschedparam(
-  pthread_attr_t            *attr,
-  const struct sched_param   param
-);
-@end example
-
-@subheading STATUS CODES:
-@table @b
-@item EINVAL
-The attribute pointer argument is invalid.
-
-@item EINVAL
-The attribute set is not initialized.
- 
-@item EINVAL
-The specified scheduler parameter argument is invalid.
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@ifinfo
-@node pthread_attr_getschedparam, pthread_create, pthread_attr_setschedparam, Thread Manager Directives
-@end ifinfo
-@subsection pthread_attr_getschedparam
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_attr_getschedparam(
-  const pthread_attr_t  *attr,
-  struct sched_param    *param
-);
-@end example
-
-@subheading STATUS CODES:
-@table @b
-@item EINVAL
-The attribute pointer argument is invalid.
-
-@item EINVAL
-The attribute set is not initialized.
-
-@item EINVAL
-The specified scheduler parameter argument pointer is invalid.
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@ifinfo
-@node pthread_create, pthread_exit, pthread_attr_getschedparam, Thread Manager Directives
-@end ifinfo
-@subsection pthread_create
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_create(
-  pthread_t             *thread,
-  const pthread_attr_t  *attr,
-  void                 (*start_routine)( void * ),
-  void                  *arg
-);
-@end example
-
-@subheading STATUS CODES:
-
-@table @b
-
-@item EINVAL
-The attribute set is not initialized.
-
-@item EINVAL
-The user specified a stack address and the size of the area was not 
-large enough to meet this processor's minimum stack requirements.
-
-@item EINVAL
-The specified scheduler inheritance policy was invalid.
-
-@item ENOTSUP
-The specified contention scope was PTHREAD_SCOPE_PROCESS.
-
-@item EINVAL
-The specified thread priority was invalid.
-
-@item EINVAL
-The specified scheduling policy was invalid.
-
-@item EINVAL
-The scheduling policy was SCHED_SPORADIC and the specified replenishment
-period is less than the initial budget.
-
-@item EINVAL
-The scheduling policy was SCHED_SPORADIC and the specified low priority
-is invalid.
-
-@item EAGAIN
-The system lacked the necessary resources to create another thread, or the
-self imposed limit on the total number of threads in a process
-PTHREAD_THREAD_MAX would be exceeded.
- 
-@item EINVAL
-Invalid argument passed.
-
-@end table
- 
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@ifinfo
-@node pthread_exit, pthread_detach, pthread_create, Thread Manager Directives
-@end ifinfo
-@subsection pthread_exit
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-void pthread_exit(
-  void   *status
-);
-@end example
-
-@subheading STATUS CODES:
-@table @b
-@item NONE
- 
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@ifinfo
-@node pthread_detach, pthread_join, pthread_exit, Thread Manager Directives
-@end ifinfo
-@subsection pthread_detach
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_detach(
-  pthread_t   thread
-);
-@end example
-
-@subheading STATUS CODES:
-@table @b
-@item ESRCH
-The thread specified is invalid.
- 
-@item EINVAL
-The thread specified is not a joinable thread.
- 
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-If any threads have previously joined with the specified thread, then they
-will remain joined with that thread.  Any subsequent calls to pthread_join
-on the specified thread will fail.
-
-@page
-@ifinfo
-@node pthread_join, pthread_self, pthread_detach, Thread Manager Directives
-@end ifinfo
-@subsection pthread_join
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_join(
-  pthread_t   thread,
-  void      **value_ptr
-);
-@end example
-
-@subheading STATUS CODES:
-@table @b
-@item ESRCH
-The thread specified is invalid.
- 
-@item EINVAL
-The thread specified is not a joinable thread.
- 
-@item EDEADLK
-A deadlock was detected or thread is the calling thread.
- 
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-If any threads have previously joined with the specified thread, then they
-will remain joined with that thread.  Any subsequent calls to pthread_join
-on the specified thread will fail.
-
-If value_ptr is NULL, then no value is returned.
-
-@page
-@ifinfo
-@node pthread_self, pthread_equal, pthread_join, Thread Manager Directives
-@end ifinfo
-@subsection pthread_self
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-pthread_t pthread_self( void );
-@end example
-
-@subheading STATUS CODES:
-
-This routine returns the id of the calling thread.
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@ifinfo
-@node pthread_equal, pthread_once, pthread_self, Thread Manager Directives
-@end ifinfo
-@subsection pthread_equal
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_equal(
-  pthread_t  t1,
-  pthread_t  t2
-);
-@end example
-
-@subheading STATUS CODES:
-
-@table @b
-@item zero
-The thread ids are not equal.
- 
-@item non-zero
-The thread ids are equal.
- 
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-The behavior is undefined if the thread IDs are not valid.
-
-@page
-@ifinfo
-@node pthread_once, pthread_setschedparam, pthread_equal, Thread Manager Directives
-@end ifinfo
-@subsection pthread_once
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-pthread_once_t once_control = PTHREAD_ONCE_INIT;
-
-int pthread_once(
-  pthread_once_t  *once_control,
-  void           (*init_routine)(void)
-);
-@end example
-
-@subheading STATUS CODES:
-
-NONE
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@ifinfo
-@node pthread_setschedparam, pthread_getschedparam, pthread_once, Thread Manager Directives
-@end ifinfo
-@subsection pthread_setschedparam
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_setschedparam(
-  pthread_t           thread,
-  int                 policy,
-  struct sched_param *param
-);
-@end example
-
-@subheading STATUS CODES:
-
-@table @b
-@item EINVAL
-The scheduling parameters indicated by the parameter param is invalid.
-
-@item EINVAL
-The value specified by policy is invalid.
-
-@item EINVAL
-The scheduling policy was SCHED_SPORADIC and the specified replenishment
-period is less than the initial budget.
-
-@item EINVAL
-The scheduling policy was SCHED_SPORADIC and the specified low priority
-is invalid.
-
-@item ESRCH
-The thread indicated was invalid.
-
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
-@page
-@ifinfo
-@node pthread_getschedparam, Signal Manager, pthread_setschedparam, Thread Manager Directives
-@end ifinfo
-@subsection pthread_getschedparam
-
-@subheading CALLING SEQUENCE:
-
-@example
-#include <pthread.h>
-
-int pthread_getschedparam(
-  pthread_t           thread,
-  int                *policy,
-  struct sched_param *param
-);
-@end example
-
-@subheading STATUS CODES:
- 
-@table @b
-@item EINVAL
-The policy pointer argument is invalid.
-
-@item EINVAL
-The scheduling parameters pointer argument is invalid.
-
-@item ESRCH
-The thread indicated by the parameter thread is invalid.
- 
-@end table
-
-@subheading DESCRIPTION:
-
-@subheading NOTES:
-
diff --git a/doc/relnotes/Makefile b/doc/relnotes/Makefile
deleted file mode 100644
index ac1d9db641..0000000000
--- a/doc/relnotes/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-#  COPYRIGHT (c) 1988-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  All rights reserved.
-#
-#  $Id$
-#
-
-PROJECT=relnotes
-DISTRIBUTION_LEVEL=internal
-
-include ../Make.config
-
-all: html info ps
-
-dirs:
-	$(make-dirs)
-
-COMMON_FILES=../common/cpright.texi
-
-FILES=install.texi intro.texi probrep.texi relnotes.texi status.texi
-
-info: dirs relnotes
-	cp $(PROJECT) $(wildcard $(PROJECT)-*) $(INFO_INSTALL)
-
-relnotes: $(FILES)
-	$(MAKEINFO) $(PROJECT).texi
-
-dvi: $(PROJECT).dvi
-ps: dirs $(PROJECT).ps
-	
-$(PROJECT).ps: $(PROJECT).dvi
-	dvips -o $(PROJECT).ps $(PROJECT).dvi
-	cp $(PROJECT).ps $(PS_INSTALL)
-
-$(PROJECT).dvi: $(FILES)
-	$(TEXI2DVI) $(PROJECT).texi
-
-html: dirs
-	-mkdir -p $(WWW_INSTALL)/relnotes
-	$(TEXI2WWW) $(TEXI2WWW_ARGS) -dir $(WWW_INSTALL)/$(PROJECT) \
- 	    $(PROJECT).texi
-
-clean:
-	rm -f *.o $(PROG) *.txt core *.html 
-	rm -f *.dvi *.ps *.log *.aux *.cp *.fn *.ky *.pg *.toc *.tp *.vr $(BASE)
-	rm -f relnotes relnotes-* _*
-
diff --git a/doc/relnotes/install.texi b/doc/relnotes/install.texi
deleted file mode 100644
index 7b213e534e..0000000000
--- a/doc/relnotes/install.texi
+++ /dev/null
@@ -1,176 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@ifinfo
-@node Installation Procedure, Installation Procedure Introduction, Introduction Documentation, Top
-@end ifinfo
-@chapter Installation Procedure
-@ifinfo
-@menu
-* Installation Procedure Introduction::
-* Installation Procedure RTEMS FTP Site Organization::
-* Installation Procedure Unarchiving the RTEMS and GNU Components::
-* Installation Procedure Installing a Cross-Development GNU Toolset::
-* Installation Procedure Installing RTEMS::
-@end menu
-@end ifinfo
-
-@ifinfo
-@node Installation Procedure Introduction, Installation Procedure RTEMS FTP Site Organization, Installation Procedure, Installation Procedure
-@end ifinfo
-@section Introduction
-
-This chapter describes the process of installing and
-configuring RTEMS and a cross-development environment based on
-freely available tools and libraries.
-
-@ifinfo
-@node Installation Procedure RTEMS FTP Site Organization, Installation Procedure Unarchiving the RTEMS and GNU Components, Installation Procedure Introduction, Installation Procedure
-@end ifinfo
-@section RTEMS FTP Site Organization
-
-RTEMS is distributed only via anonymous ftp.
-
-This section will discuss how to navigate the RTEMS
-ftp site and unarchive the files in the RTEMS and GNU package
-distributions.  All example commands will be given in a shell
-independent fashion unless otherwise noted.
-
-Throughout the rest of this manual
-<RTEMS_distribution> will be used as the parent of components
-within the RTEMS distribution.  For persons using the ftp
-distribution found on the primary ftp site for RTEMS,
-<RTEMS_distribution> is
-ftp://ftp.OARcorp.com/oarcorp/rtems/@value{RELEASE}.
-
-The archive files for RTEMS Release @value{RELEASE} are found
-under the directory <RTEMS_distribution>.  This directory
-contains the files which comprise this relase as well as any
-patches which may be required for other tools.
-
-The complete source code and documentation set for
-the C language implementation of RTEMS is provided.
-
-Documentation other than this on-line version is available to
-OAR support customers.  Please contact OAR for more information.
-
-@ifinfo
-@node Installation Procedure Unarchiving the RTEMS and GNU Components, Installation Procedure Installing a Cross-Development GNU Toolset, Installation Procedure RTEMS FTP Site Organization, Installation Procedure
-@end ifinfo
-@section Unarchiving the RTEMS and GNU Components
-
-Many of the components of the RTEMS release are
-"tarred, zipped" files and have the .tar.gz or .tgz extension.
-The GNU zip package is required to unarchives these files on the
-RTEMS ftp site.  If this package is not installed, the source
-can be found in the files
-ftp://prep.ai.mit.edu/pub/gnu/gzip-1.2.4.shar or
-ftp://prep.ai.mit.edu/pub/gnu/gzip-1.2.4.tar.  It may be
-restored using a command similar to the following:
-
-@example
-@group
-tar xvf gzip-1.2.4.tar
-
-OR
-
-sh gzip-1.2.4.shar
-@end group
-@end example
-
-This will create a subdirectory gzip-1.2.4 in the
-current directory.  Please examine the files README and INSTALL
-and follow the instructions provided there.
-
-[Note: The GNU tools follow a standard packaging procedure
-They will unarchive into a directory based on the package name and version
-number.  For detailed instructions on compilation and
-installation of the GNU tools, please refer to the instructions for
-each GNU tool.]
-
-Files which have been "tarred, zipped" (i.e.  .tar.gz
-or .tgz extension) may be unarchived with a command similar to
-one of the following:
-
-@example
-@group
-gzcat <file>.tgz | tar xvof -
-
-OR
-
-gunzip -c <file>.tgz | tar xvof -
-
-OR
-
-gtar xzvf <file>.tgz
-@end group
-@end example
-
-NOTE: gunzip -c is equivalent to gzcat, while gtar is GNU tar.
-
-Given that the necessary utility programs are
-installed, any of the above commands will extract the contents
-of <file>.tar.gz into the current directory.  All of the RTEMS
-components will be extracted into the subdirectory rtems-@value{RELEASE}.
-To view the contents of a component without restoring any files,
-use a command similar to the following:
-
-@example
-@group
-gzcat <file>.tgz | tar tvf -
-@end group
-@end example
-
-@ifinfo
-@node Installation Procedure Installing a Cross-Development GNU Toolset, Installation Procedure Installing RTEMS, Installation Procedure Unarchiving the RTEMS and GNU Components, Installation Procedure
-@end ifinfo
-@section Installing a Cross-Development GNU Toolset
-
-This sections describes how to build and install the
-FSF GNU tools for use as a cross-compilation system.  These
-tools are used by the RTEMS developers.  Every effort has been
-made to make these instructions accurate and complete.  However,
-it is recommended that the individual doing the installation
-read the appropriate installation notes for each of the tools in
-the cross toolset.  This will help insure that there are no
-special requirements for a particular host.
-
-If the host and target processors are the same, then
-it may be possible to use the host development tools.  An
-example of this scenario is using a SPARC based workstation
-to develop an RTEMS application for the SPARC processor.  Although
-the native toolset is useable in this scenario, it is ultimately
-more desirable to build a toolset specifically for the embedded environment.
-
-Instructions for building a cross environment using the GNU
-tools is provided in the crossgcc FAQ available from ftp.cygnus.com
-in /pub/embedded/crossgcc.  It is recommended that the user following
-these instructions.
-
-After the cross development toolset has been built
-and installed, it will be necessary to modify the environment of
-each RTEMS application developer to reflect at least the path of
-the newly installed cross development toolset.
-
-The documentation for the FSF GNU and Cygnus tools is
-formatted using TeX.  The RTEMS developers use TeX 3.14t3 to
-format the manuals for their own use.  This document does not
-contain instructions on the acquisition or installation of TeX
-and supporting tools.
-
-NOTE: For "UNIX" processors, the native compiler binary utilities
-should be used.
-
-@ifinfo
-@node Installation Procedure Installing RTEMS, Development Environment Status, Installation Procedure Installing a Cross-Development GNU Toolset, Installation Procedure
-@end ifinfo
-@section Installing RTEMS
-
-For instructions on building and installing RTEMS, please refer to 
-the file README.configure in the source distribution.
-
diff --git a/doc/relnotes/intro.texi b/doc/relnotes/intro.texi
deleted file mode 100644
index f8395d7994..0000000000
--- a/doc/relnotes/intro.texi
+++ /dev/null
@@ -1,217 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@ifinfo
-@node Introduction, Introduction Supporting Tools, Top, Top
-@end ifinfo
-@chapter Introduction
-@ifinfo
-@menu
-* Introduction Supporting Tools::
-* Introduction Documentation::
-@end menu
-@end ifinfo
-
-This document describes the contents, installation
-procedure, and current status of Release @value{RELEASE} of the RTEMS
-executive.  An installation procedure is provided which
-describes the steps necessary to load and configure the RTEMS
-environment, including the GNU Development Environment and the
-Cygnus NEWLIB ANSI C Library, on a host computer.  The status of
-the RTEMS environment is given, which includes supported
-processors and target boards, versions of the GNU utilities
-which were used by the RTEMS developers for this release,
-support libraries status, features which are not implemented,
-and any known existing problems.
-
-This RTEMS release package contains the following general components:
-
-@itemize @bullet
-@item RTEMS C Executive
-
-@item RTEMS C Documentation Set
-
-@item RTEMS NEWLIB ANSI C Library
-
-@item Patches to GNU Development Tools
-
-@end itemize
-
-There is a mailing list dedicated to RTEMS.  This is
-a Majordomo style mailing list and may be subscribed to
-by sending a message to rtems-list-request@@OARcorp.com with
-the following line as the body:
-
-@example
-subscribe rtems_user@@your_email_goes_here.com
-@end example
-
-Please replace rtems_user@@your_email_goes_here.com with your
-email address.
-
-@ifinfo
-@node Introduction Supporting Tools, GNU Development Tools, Introduction, Introduction
-@end ifinfo
-@section Supporting Tools
-@ifinfo
-@menu
-* GNU Development Tools::
-* ANSI C Libraries::
-* GNU C Library::
-* Cygnus NEWLIB C Library::
-@end menu
-@end ifinfo
-
-This section discusses the freely available tools and
-libraries which are part of the RTEMS Development Environment.
-None of the tools discussed in this section were developed by
-the RTEMS project, although many do include submissions from the
-project.  All of the tools and libraries required to build RTEMS
-are freely available.  The home ftp site for most of the non-RTEMS
-specific tools is either prep.ai.mit.edu (18.71.0.38) or
-ftp.cygnus.com (140.174.1.3).
-
-Specifically of interest to embedded systems developers
-using the GNU tools is the crossgcc mailing list.  This is
-a Majordomo style mailing list and may be subscribed to
-by sending a message to crossgcc-request@@cygnus.com with
-the following line as the body:
-
-@example
-subscribe rtems_user@@your_email_goes_here.com
-@end example
-
-Please replace rtems_user@@your_email_goes_here.com with your
-email address.  The FAQ for crossgcc is in the /pub/embedded/crossgcc
-directory on ftp.cygnus.com (205.180.83.42).
-
-@ifinfo
-@node GNU Development Tools, ANSI C Libraries, Introduction Supporting Tools, Introduction Supporting Tools
-@end ifinfo
-@subsection GNU Development Tools
-
-Numerous GNU tools are used in the RTEMS Development
-Environment including C and Ada compilers, the GNU make program,
-GNU m4, the GNU assembler and binary utilities (linker,
-librarian, etc.), GNU tar, GNU zip, and the GNU debugger.  These
-tools are distributed in source form and are all licensed under
-the GNU Public License which allows for unrestricted
-distribution under the condition that source code always be
-available.  The Free Software Foundation is officially the
-originator of most of the GNU tools although many individuals
-have contributed to the GNU projects.  In keeping with the
-spirit of the GPL,  most of the time the GNU tools are
-distributed as source code without executables.  It is the
-responsibility of the local site to install each tool.  Numerous
-organizations and individuals supply executables for the GNU
-tools.  All are required by the terms of the GPL to also make
-the source code available to the end user.
-
-The primary ftp site for the FSF GNU tools is
-prep.ai.mit.edu (18.71.0.38) in the /pub/gnu directory.  These
-tools are mirrored on numerous ftp sites.
-
-Intel maintains a toolset for their i960 processor
-family based on the GNU tools referred to as GNU/960.  The
-source code for this toolset is available from ftp.intel.com
-(143.185.65.2).  [NOTE: The GNU/960 toolset generally includes
-an older version of GCC than that available from the FSF.  When
-the FSF version of GNU C is significantly newer than that in the
-GNU/960 release, the RTEMS developers replace the GCC in the
-GNU/960 toolset with the FSF release.]
-
-Cygnus maintains an ftp site -- ftp.cygnus.com
-(205.180.83.42) -- which contains a source code which appeals to
-embedded developers.  Of especial interest on this site are the
-directories /pub/newlib and /pub/embedded.
-
-@ifinfo
-@node ANSI C Libraries, GNU C Library, GNU Development Tools, Introduction Supporting Tools
-@end ifinfo
-@subsection ANSI C Libraries
-
-This section discusses the following freely
-distributable ANSI C Libraries:
-
-@itemize @bullet
-@item GNU C Library, and
-
-@item Cygnus NEWLIB
-@end itemize
-
-No C Library is included in the standard RTEMS
-distribution.  It is the responsibility of the user to obtain
-and install a C Library separately.
-
-@ifinfo
-@node GNU C Library, Cygnus NEWLIB C Library, ANSI C Libraries, Introduction Supporting Tools
-@end ifinfo
-@subsection GNU C Library
-
-The GNU C Library is a robust and well-documented C
-Library which is distributed under the terms of the Library GNU
-Public License (LGPL).  This library was not designed for use in
-real-time, embedded systems and the resource requirements of
-some of the routines in this library are an obvious indication
-of this.  Additionally, this library does not have support for
-reentrancy in the sense that each task in a multitasking system
-could safely invoke every routine in the library.  Finally, the
-distribution terms of the LGPL are considered undesirable by
-many embedded systems developers.  However, the GNU C Library is
-very complete and is compliant with as many standards as
-possible.  Because of this, it may be the only choice for many
-developers.
-
-There is currently no RTEMS support for the GNU C Library.
-
-The primary ftp site for this library is
-prep.ai.mit.edu (18.71.0.38).
-
-@ifinfo
-@node Cygnus NEWLIB C Library, Introduction Documentation, GNU C Library, Introduction Supporting Tools
-@end ifinfo
-@subsection Cygnus NEWLIB C Library
-
-The Cygnus NEWLIB C Library was specifically designed
-for real-time embedded systems.  It is a small, reasonably
-documented Library with support for reentrancy.  This library is
-a collection of freely distributable and public domain source
-code and is freely distributable with as few restrictions as
-possible placed on the end user.
-
-The primary ftp site for this library is ftp.cygnus.com (205.180.83.42).
-
-@ifinfo
-@node Introduction Documentation, Installation Procedure, Cygnus NEWLIB C Library, Introduction
-@end ifinfo
-@section Documentation
-
-The RTEMS Documentation Set is provided online at http://www.OARcorp.com/
-as reference information for all levels of RTEMS users.  The set includes
-the following documents:
-
-@itemize @bullet
-@item C Applications User's Guide
-
-@item Intel i386 Applications Supplement
-
-@item Intel i960CA Applications Supplement
-
-@item Motorola MC68xxx Applications Supplement
-
-@item Hewlett Packard PA-RISC 1.1 Applications Supplement
-
-@item SPARC Applications Supplement
-
-@item Development Environment Guide
-
-@item Release Notes
-@end itemize
-
-The RTEMS documentation set is available in alternate formats to 
-support customers.
diff --git a/doc/relnotes/probrep.texi b/doc/relnotes/probrep.texi
deleted file mode 100644
index 5315959d47..0000000000
--- a/doc/relnotes/probrep.texi
+++ /dev/null
@@ -1,62 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-
-
-@ifinfo
-@node RTEMS PROBLEM REPORT, Command and Variable Index, RTEMS Problem Reporting, Top
-@end ifinfo
-@chapter RTEMS PROBLEM REPORT
-
-@example
-
-Customer (Company) Name:
-
-Customer Address:
-
-Contact Name:
-
-Telephone Voice:                         Fax:
-
-
-
-Product:                                 Version:
-
-Target Processor:                        Target System:
-
-Host Computer System:
-
-Host Operating System:                   Version:
-
-
-
-Report Type:                    Customer Impact:
-
-
-
-[ ] Problem/Error               [ ] System is inoperable, cannot proceed
-
-[ ] Enhancement                 [ ] Must be corrected in the near future
-
-[ ] Inquiry Suggestion          [ ] Problem may be avoided until fixed
-
-[ ] Other______________         [ ] Problem is not time critical
-
-                                [ ] Minor problem
-
-@end example
-
-
-Please provide a detailed description of the
-problem (Attachments including source code, example code,
-makefiles, possible solutions, and any other information
-describing the problem will be appreciated):
-
-
-
-
diff --git a/doc/relnotes/relnotes.texi b/doc/relnotes/relnotes.texi
deleted file mode 100644
index 9a43977419..0000000000
--- a/doc/relnotes/relnotes.texi
+++ /dev/null
@@ -1,119 +0,0 @@
-\input ../texinfo/texinfo   @c -*-texinfo-*-
-@c %**start of header
-@setfilename relnotes
-@syncodeindex vr fn
-@synindex ky cp
-@paragraphindent 0
-@c @smallbook
-@c %**end of header
-
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@c
-@c   Master file
-@c
-
-@c Joel's Questions
-@c
-@c  1.  Why does paragraphindent only impact makeinfo?
-@c  2.  Why does paragraphindent show up in HTML?
-@c
-
-@include ../common/setup.texi
-
-@ignore
-@ifinfo
-@format
-START-INFO-DIR-ENTRY
-* RTEMS Release Notes: (relnotes).             Release Notes
-END-INFO-DIR-ENTRY
-@end format
-@end ifinfo
-@end ignore
-
-@c variable substitution info:
-@c
-@c @set LANGUAGE C
-@c the language is @value{LANGUAGE}
-@c NOTE:  don't use underscore in the name
-@c
-
-@c
-@c  Title Page Stuff
-@c
-
-@set edition @value{RTEMS-EDITION}
-@set version @value{RTEMS-VERSION}
-@set update-date @value{RTEMS-UPDATE-DATE}
-@set update-month @value{RTEMS-UPDATE-MONTH}
-
-@c
-@c  I don't really like having a short title page.  --joel
-@c
-@c @shorttitlepage RTEMS Release Notes
-
-@setchapternewpage odd
-@settitle RTEMS Release Notes
-@titlepage
-@finalout
-
-@title RTEMS Release Notes
-@subtitle Edition @value{edition}, for RTEMS @value{version}
-@sp 1
-@subtitle @value{update-month}
-@author On-Line Applications Research Corporation
-@page
-@include ../common/cpright.texi
-@end titlepage
-
-@c  This prevents a black box from being printed on "overflow" lines.
-@c  The alternative is to rework a sentence to avoid this problem.
-
-@include intro.texi
-@include install.texi
-@include status.texi
-@include probrep.texi
-
-@ifinfo
-@node Top, Introduction, (dir), (dir)
-@top relnotes
-
-This is the online version of the RTEMS Release Notes.
-
-@menu
-* Introduction::
-* Installation Procedure::
-* Development Environment Status::
-* RTEMS PROBLEM REPORT::
-* Command and Variable Index::
-* Concept Index::
-@end menu
-
-@end ifinfo
-@c 
-@c 
-@c Need to copy the emacs stuff and "trailer stuff" (index, toc) into here
-@c
-
-@node Command and Variable Index, Concept Index, RTEMS PROBLEM REPORT, Top
-@unnumbered Command and Variable Index
-
-There are currently no Command and Variable Index entries.
-
-@c @printindex fn
-
-@node Concept Index, , Command and Variable Index, Top
-@unnumbered Concept Index
-
-There are currently no Concept Index entries.
-@c @printindex cp
-
-@contents
-@bye
-
diff --git a/doc/relnotes/status.texi b/doc/relnotes/status.texi
deleted file mode 100644
index 154dd4a55f..0000000000
--- a/doc/relnotes/status.texi
+++ /dev/null
@@ -1,260 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@ifinfo
-@node Development Environment Status, Development Environment Status RTEMS Executive Status, Installation Procedure Installing RTEMS, Top
-@end ifinfo
-@chapter Development Environment Status
-@ifinfo
-@menu
-* Development Environment Status RTEMS Executive Status::
-* Development Environment Status Development Environment Status::
-* Development Environment Status Known Problems::
-@end menu
-@end ifinfo
-
-This chapter will describe the current status of
-release version @value{RELEASE} of the RTEMS Development Environment.
-
-@ifinfo
-@node Development Environment Status RTEMS Executive Status, Development Environment Status Development Environment Status, Development Environment Status, Development Environment Status
-@end ifinfo
-@section RTEMS Executive Status
-
-Release @value{RELEASE} of the RTEMS Executive contains support
-for both the classic RTEMS API based on the RTEID specification as well
-as support for POSIX threads and real-time extensions.
-
-The classic RTEMS API has the following managers based upon the RTEID
-specification:
-
-@itemize @bullet
-@item Task
-@item Initialization
-@item Clock
-@item Timer
-@item Interrupt
-@item Fatal Error
-@item Message
-@item Semaphore
-@item Event
-@item Signal
-@item Region
-@item Partition
-@item Dual Ported Memory
-@item I/O
-@item Multiprocessing
-@item Rate Monotonic
-@item User Extensions
-@end itemize
-
-RTEMS also has support for the following managers based upon the POSIX threads
-and real-time extensions:
-
-@itemize @bullet
-@item Thread
-@item Clock
-@item Key
-@item Condition Variable
-@item Mutex
-@item Signal 
-@item Scheduler
-@end itemize
-
-This release of the C implementation supports the
-following processors and target boards:
-
-@itemize @bullet
-@item Motorola M68k family
-@itemize -
-@item DY-4 DMV152, SVME153
-@item Motorola IDP
-@item Motorola MVME135, MVME136
-@item Motorola MVME147, MVME147S
-@item Motorola MVME162
-@item EFI 68000 and 68332
-@item Generic 68302
-@item Generic 68360 and 68360 in companion mode with 68040
-@end itemize
-
-@item Intel i386 family
-@itemize -
-@item Force CPU386
-@item Intel i386ex eval board
-@item PC-AT i386 and above (go32)
-@end itemize
-
-@item Intel i960 family
-@itemize -
-@item Cyclone CVME960, CVME961
-@end itemize
-
-@item Hewlett Packard PA-RISC family
-@itemize -
-@item Processor Simulator
-@end itemize
-
-@item PowerPC
-@itemize -
-@item Papyrus (proprietary controller)
-@end itemize
-
-@item SPARC
-@itemize -
-@item ERC32 (space-hardened V7)
-@end itemize
-
-@item MIPS
-@itemize -
-@item P4000 with R4600 or R4650
-@end itemize
-
-@item AMD 29K
-@itemize -
-@item Portsw
-@end itemize
-
-@item UNIX
-@itemize -
-@item Hewlett Packard HPUX (PA-RISC)
-@item Sun Solaris 2.x (SPARC)
-@item Linux (i386)
-@end itemize
-
-@end itemize
-
-Support for the Cygnus NEWLIB Standard C Library is
-provided with this release which may be used on any of the RTEMS
-supported targets.  The BSPs only provide support for console
-I/O only using this library.  Support for the reentrancy
-capabilities of newlib is provided in the RTEMS distribution.
-
-@ifinfo
-@node Development Environment Status Development Environment Status, Development Environment Status Known Problems, Development Environment Status RTEMS Executive Status, Development Environment Status
-@end ifinfo
-@section Development Environment Status
-
-This section details the versions of the tools used
-to develop and maintain RTEMS @value{RELEASE}:
-
-@itemize @bullet
-@item Cross Tools
-@itemize -
-@item gcc - 2.7.2.2 with rtems patch
-@item binutils - 2.7 with rtems patch
-@item zip - 1.2.4
-@item make - 3.74
-@end itemize
-@end itemize
-
-
-@ifinfo
-@node Development Environment Status Known Problems, Executive Problems, Development Environment Status Development Environment Status, Development Environment Status
-@end ifinfo
-@section Known Problems
-@ifinfo
-@menu
-* Executive Problems::
-* Development Environment Problems::
-* RTEMS Problem Reporting::
-@end menu
-@end ifinfo
-
-Problems which are known to exist at the time of
-release are described in the following sections.  These are
-provided as warnings to the user and where possible, workarounds
-are provided until the problem is corrected.
-
-@ifinfo
-@node Executive Problems, Development Environment Problems, Development Environment Status Known Problems, Development Environment Status Known Problems
-@end ifinfo
-@subsection Executive Problems
-
-There are no known bugs in the executive itself.
-
-@ifinfo
-@node Development Environment Problems, RTEMS Problem Reporting, Executive Problems, Development Environment Status Known Problems
-@end ifinfo
-@subsection Development Environment Problems
-
-There are no known major problems with the
-development environment.
-
-@ifinfo
-@node RTEMS Problem Reporting, RTEMS PROBLEM REPORT, Development Environment Problems, Development Environment Status Known Problems
-@end ifinfo
-@subsection RTEMS Problem Reporting
-
-A problem report is provided at the end of this
-document and may be copied by the RTEMS user.  Please fill out
-the form completely to assure a speedy response to the problem.
-In filling out the problem report the following instructions
-apply:
-
-@table @code
-@item User Name and Address:
-The full name
-and mailing address of the customer or company where
-correspondence from RTEMS support personnel may be shipped.
-
-@item Contact Name:
-The name of the person with whom
-RTEMS support personnel will correspond with concerning the
-reported problem.
-
-@item Telephone Voice/FAX:
-The telephone numbers which
-will enable RTEMS support personnel to reach the designated
-contact name.
-
-@item Product/Version:
-The RTEMS product and the version that is currently in use.
-
-@item Target Processor/System:
-The processor and board type that is the target.
-
-@item Host Computer System:
-The manufacturer and model
-number of the system on which RTEMS has been installed.
-
-@item Host Operating System/Version:
-The operating system and version under which RTEMS has been installed.
-
-@c @item Report Type:
-@c Check the most appropriate description of the reported problem.
-
-@item Customer Impact:
-Indicate the severity of the impact of the reported problem.
-
-@item Detailed Description:
-A written description of the
-problem including the area of the RTEMS development environment
-where the problem is located and its behavior.  Please feel free
-to provide source code listings, makefiles, possible solutions,
-and any other information describing the problem.  This
-additional information may be submitted via email or anonymous
-ftp.
-
-Support, training, ports, and custom development are provided
-by On-Line Applications Research Corporation (OAR).  Correspondence
-regarding any aspect of RTEMS should be addressed as follows
-(magnetic tapes should be marked: DO NOT X-RAY):
-@end table
-
-@example
-@group
-RTEMS
-On-Line Applications Research Corporation
-4910-L Corporate Drive
-Huntsville, AL 35805
-Voice: (205) 722-9985
-FAX: (205) 722-0985
-EMAIL: rtems@@OARcorp.com
-@end group
-@end example
-
diff --git a/doc/rtems_footer.html b/doc/rtems_footer.html
deleted file mode 100644
index 0dc1758285..0000000000
--- a/doc/rtems_footer.html
+++ /dev/null
@@ -1 +0,0 @@
-<P>Copyright &copy; 1988-1998 <A HREF="http://www.oarcorp.com" target="Text Frame">OAR Corporation</A>
diff --git a/doc/rtems_header.html b/doc/rtems_header.html
deleted file mode 100644
index f201073ba2..0000000000
--- a/doc/rtems_header.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<BODY BGCOLOR="FFFFFF">
-<A HREF="http://www.oarcorp.com" target="Text Frame">
-  <IMG align=right BORDER=0 SRC="../oaronly.jpg" ALT="OAR"> </A>
-<H1>RTEMS RTEMS_VERSION On-Line Library</H1>
-<HR>
diff --git a/doc/rtems_support.html b/doc/rtems_support.html
deleted file mode 100644
index 48ba6e6075..0000000000
--- a/doc/rtems_support.html
+++ /dev/null
@@ -1,72 +0,0 @@
-<HTML>
-<HEAD><TITLE>RTEMS RTEMS_VERSION On-Line Library</TITLE></HEAD>
-<BODY BGCOLOR="FFFFFF">
-<A HREF="http://www.oarcorp.com" target="Text Frame">
-  <IMG align=right BORDER=0 SRC="oaronly.jpg" ALT="OAR"> </A>
-<H1>RTEMS 4.2.0 On-Line Library</H1>
-<HR>
-<BODY>
-<MENU>
-    <LI><A HREF="c_user/index.html">
-        RTEMS Applications C User's Guide</A>
-    <LI><A HREF="started/index.html">
-        Getting Started with RTEMS for C/C++ Users</A>
-    <LI><A HREF="started_ada/index.html">
-        Getting Started with GNAT/RTEMS</A>
-    <LI><A HREF="develenv/index.html">
-        RTEMS Development Environment Guide</A>
-    <LI><A HREF="posix_users/index.html">
-        RTEMS POSIX API User's Guide</A>
-    <LI><A HREF="networking/index.html">
-        RTEMS Network Supplement</A>
-
-<LI>CPU Supplements
-
-  <MENU>
-      <LI><A HREF="HELP.html">
-             RTEMS AMD 29K Applications Supplement</A>
-      <LI><A HREF="HELP.html">
-             RTEMS Hitachi SH Applications Supplement</A>
-      <LI><A HREF="support/c_i386/index.html">
-             RTEMS Intel i386 Applications Supplement</A>
-      <LI><A HREF="support/c_i960/index.html">
-             RTEMS Intel i960 Applications Supplement</A>
-      <LI><A HREF="HELP.html">
-             RTEMS MIPS Applications Supplement</A>
-      <LI><A HREF="support/c_m68k/index.html">
-             RTEMS Motorola MC68xxx Applications Supplement</A>
-      <LI><A HREF="support/c_powerpc/index.html">
-             RTEMS PowerPC Applications Supplement</A>
-      <LI><A HREF="support/c_sparc/index.html">
-             RTEMS SPARC Applications Supplement</A>
-      <LI><A HREF="support/c_hppa1_1/index.html">
-             RTEMS Hewlett Packard PA-RISC Applications Supplement</A>
-      <LI><A HREF="HELP.html">RTEMS UNIX Port Applications Supplement</A>
-    </MENU>
-</LI>
-
-<LI>GNU Tools Documentation
-  <MENU>
-      <LI>Cygnus Newlib 1.8.0
-          <MENU>
-              <LI><A HREF="support/libc/index.html">
-                 ANSI C Library (libc) Manual</A>
-              <LI><A HREF="support/libm/index.html">
-                 ANSI C Math Library (libm) Manual</A>
-         </MENU>
-      </LI>
-      <LI>EGCS 1.0.2 
-          <MENU>
-              <LI><A HREF="support/cpp/index.html">
-                     CPP Manual</A>
-              <LI><A HREF="support/gcc/index.html">
-                     GCC Manual</A>
-         </MENU>
-      </LI>
-  </MENU>
-</LI>
-
-</MENU>
-<HR>
-Copyright &copy; 1988-1998 <A HREF="http://www.oarcorp.com" target="Text Frame">OAR Corporation</A>
-</BODY></HTML>
diff --git a/doc/src2html/Makefile b/doc/src2html/Makefile
deleted file mode 100644
index 25bb78f07f..0000000000
--- a/doc/src2html/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-#  COPYRIGHT (c) 1988-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  All rights reserved.
-#
-#  $Id$
-#
-
-PROJECT=browseable_rtems
-DISTRIBUTION_LEVEL=internal
-
-include ../Make.config
-
-all: html info ps
-
-dirs:
-	$(make-dirs)
-
-COMMON_FILES=../common/cpright.texi
-
-FILES= clock.texi cond.texi key.texi mutex.texi $(PROJECT).texi preface.texi \
-  sched.texi signal.texi thread.texi $(COMMON_FILES)
-
-INFOFILES=$(wildcard $(PROJECT) $(PROJECT)-*)
-
-info: 
-
-ps:
-
-html: dirs
-	-mkdir -p $(WWW_INSTALL)/$(PROJECT)
-	$(SRC2HTML) -d3 RTEMS.src
-
-RTEMS.src:
-	sed -e 's/WWW_INSTALL/$(WWW_INSTALL)/' \
-	    <RTEMS.test >RTEMS.src
-	
-clean:
-	rm -f RTEMS.src
diff --git a/doc/src2html/RTEMS.test b/doc/src2html/RTEMS.test
deleted file mode 100644
index c99e86cd3b..0000000000
--- a/doc/src2html/RTEMS.test
+++ /dev/null
@@ -1,62 +0,0 @@
-# Comments
-#
-#  Copyright (c) 1998, On-Line Applications Research Corporation (OAR)
-#
-#  This file configures the src2html tool for the RTEMS source tree.
-#
-#  $Id$
-#
-
-## Variables used are:
-## Srctree - The root of the source tree we are processing
-## Htmlroot - The directory where all WWW documents are kept
-## Htmldir -  The directory under Htmlroot for this source tree
-## Htmltree - The root of the destination tree for the Html code
-## Newsrctree - The directory in Htmltree to store the new Htmlised code
-## Headers - The directory where we keep information to prepend in some docs
-## Formdir - The place to put the index searching script
-## Dirinfo{} - The list of dirs and the info about the directory
-## Dotdir{} - The directory name with /'s -> .'s
-
-set Srctree /usr1/rtems/rtems-work/c/src/exec/
-#set Htmltree /tmp/www
-set Htmlroot WWW_INSTALL/internal/browseable_rtems
-set Htmldir .
-set Newsrctree .                   # Comments here too
-#  default is . and that is fine for us right now
-#set Headers
-set Formdir /cgi-bin/rtems
-#
-#
-
-dir rtems/src        Classic API Source
-dir rtems/inline     Classic API Inlines
-dir rtems/headers    Classic API Header Files
-
-dir posix/src        POSIX API Source
-dir posix/inline     POSIX API Inlines
-dir posix/headers    POSIX API Base Header Files
-dir posix/sys        POSIX API System Header Files
-dir posix/headers    POSIX API Internal Header Files
-
-dir sapi/src         Non-Standard API Source
-dir sapi/inline      Non-Standard API Inlines
-dir sapi/headers     Non-Standard API Header Files
-
-dir score/src             Super Core Source
-dir score/inline          Super Core Inlines
-dir score/headers         Super Core Header Files
-dir score/cpu/a29k        AMD A29K Port
-dir score/cpu/hppa1.1     HP PA-RISC Port
-dir score/cpu/i386        Intel i386 Port
-dir score/cpu/i960        Intel i960 Port
-dir score/cpu/m68k        Motorola m68k Port
-dir score/cpu/mips64orion MIPS64 Port
-dir score/cpu/no_cpu      No CPU Example Port
-dir score/cpu/powerpc     PowerPC Port
-dir score/cpu/sh          Hitachi SH
-dir score/cpu/sparc       SPARC Port
-dir score/cpu/unix        UNIX Port
-
-
-
diff --git a/doc/started/Makefile b/doc/started/Makefile
deleted file mode 100644
index f5f2edf4d6..0000000000
--- a/doc/started/Makefile
+++ /dev/null
@@ -1,94 +0,0 @@
-#
-#  COPYRIGHT (c) 1988-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  All rights reserved.
-#
-#  $Id$
-#
-
-PROJECT=started
-DISTRIBUTION_LEVEL=public
-
-include ../Make.config
-
-all: html info ps
-
-dirs:
-	$(make-dirs)
-
-COMMON_FILES=../common/cpright.texi ../common/setup.texi
-
-GENERATED_FILES= buildc.texi buildrt.texi gdb.texi intro.texi \
-    nt.texi require.texi sample.texi
-
-FILES= $(PROJECT).texi versions.texi $(GENERATED_FILES)
-
-INFOFILES=$(wildcard $(PROJECT) $(PROJECT)-*)
-
-info: dirs $(PROJECT)
-	#cp $(wildcard $(PROJECT) $(PROJECT)-*) $(INFO_INSTALL)
-	cp $(PROJECT) $(INFO_INSTALL)
-
-$(PROJECT): $(FILES)
-	$(MAKEINFO) $(PROJECT).texi
-
-dvi: $(PROJECT).dvi
-ps: dirs $(PROJECT).ps
-	
-$(PROJECT).ps: $(PROJECT).dvi
-	dvips -o $(PROJECT).ps $(PROJECT).dvi
-	cp $(PROJECT).ps $(PS_INSTALL)
-
-# run texi2dvi twice to generate the xref's properly.
-$(PROJECT).dvi: $(FILES)
-	$(TEXI2DVI) $(PROJECT).texi
-	texi2dvi $(PROJECT).texi
-
-intro.texi: intro.t versions.texi
-	$(BMENU) -c -p "Top" \
-	    -u "Top" \
-	    -n "Requirements" ${*}.t
-
-require.texi: require.t versions.texi
-	$(BMENU) -c -p "EGCS Mailing List" \
-	    -u "Top" \
-	    -n "Building the GNU C/C++ Cross Compiler Toolset" ${*}.t
-
-buildc.texi: buildc.t versions.texi
-	$(BMENU) -c -p "GNU makeinfo Version Requirements" \
-	    -u "Top" \
-	    -n "Building RTEMS" ${*}.t
-
-buildrt.texi: buildrt.t versions.texi
-	$(BMENU) -c -p "Running the bit Script" \
-	    -u "Top" \
-	    -n "Building the Sample Application" ${*}.t
-
-sample.texi: sample.t versions.texi
-	$(BMENU) -c -p "Using the RTEMS configure Script Directly" \
-	    -u "Top" \
-	    -n "Building the GNU Debugger" ${*}.t
-
-gdb.texi: gdb.t versions.texi
-	$(BMENU) -c -p "Application Executable" \
-	    -u "Top" \
-	    -n "Using MS-Windows as a Development Host" ${*}.t
-
-nt.texi: nt.t versions.texi
-	$(BMENU) -c -p "GDB for DINK32" \
-	    -u "Top" \
-	    -n "" ${*}.t
-
-html: dirs $(FILES)
-	-mkdir -p $(WWW_INSTALL)/$(PROJECT)
-	-cp pictures/sfile12c.jpg $(WWW_INSTALL)/$(PROJECT)
-	-cp pictures/bit_c.jpg $(WWW_INSTALL)/$(PROJECT)
-	$(TEXI2WWW) $(TEXI2WWW_ARGS) -dir $(WWW_INSTALL)/$(PROJECT) \
- 	    $(PROJECT).texi
-
-clean:
-	rm -f *.o $(PROG) *.txt core 
-	rm -f *.dvi *.ps *.log *.aux *.cp *.fn *.ky *.pg *.toc *.tp *.vr $(BASE)
-	rm -f $(PROJECT) $(PROJECT)-* $(GENERATED_FILES)
-	rm -f *.fixed _*
-
diff --git a/doc/started/buildc.t b/doc/started/buildc.t
deleted file mode 100644
index fee12bf660..0000000000
--- a/doc/started/buildc.t
+++ /dev/null
@@ -1,485 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Building the GNU C/C++ Cross Compiler Toolset
-
-This chapter describes the steps required to acquire the
-source code for a GNU cross compiler toolset, apply 
-any required RTEMS specific patches, compile that 
-toolset and install it.
-
-@section Create the Archive and Build Directories
-
-Start by making the @code{archive} directory to contain the downloaded 
-source code and the @code{tools} directory to be used as a build
-directory.  The command sequence to do this is shown
-below:
-
-@example
-mkdir archive
-mkdir tools
-@end example
-
-This will result in an initial directory structure similar to the
-one shown in the following figure:
-
-@example
-@group
-/whatever/prefix/you/choose/
-        archive/
-        tools/
-
-@end group
-@end example
-
-@c @ifset use-html
-@c @html
-@c <IMG SRC="sfile12c.jpg" WIDTH=417 HEIGHT=178 
-@c      ALT="Starting Directory Organization">
-@c @end html
-@c @end ifset
-
-@section Get All the Pieces 
-
-This section lists the components of an RTEMS cross development system.  
-Included are the locations of each component as well as any required RTEMS
-specific patches.
-
-@subheading @value{GCC-VERSION}
-@example
-    FTP Site:    @value{GCC-FTPSITE}
-    Directory:   @value{GCC-FTPDIR}
-    File:        @value{GCC-TAR}
-@ifset use-html
-    URL:         @href{Download @value{GCC-VERSION},,,ftp://@value{GCC-FTPSITE}@value{GCC-HTTPDIR}}
-@end ifset
-@end example
-
-@subheading @value{BINUTILS-VERSION}
-@example
-    FTP Site:    @value{BINUTILS-FTPSITE}
-    Directory:   @value{BINUTILS-FTPDIR}
-    File:        @value{BINUTILS-TAR}
-@ifset use-html
-    URL:         @href{Download @value{BINUTILS-VERSION},,,ftp://@value{BINUTILS-FTPSITE}@value{BINUTILS-FTPDIR}/@value{BINUTILS-TAR}}
-@end ifset
-@end example
-
-@subheading @value{NEWLIB-VERSION}
-@example
-    FTP Site:    @value{NEWLIB-FTPSITE}
-    Directory:   @value{NEWLIB-FTPDIR}
-    File:        @value{NEWLIB-TAR}
-@ifset use-html
-    URL:         @href{Download @value{NEWLIB-VERSION},,,ftp://@value{NEWLIB-FTPSITE}@value{NEWLIB-FTPDIR}/@value{NEWLIB-TAR}}
-@end ifset
-@end example
-
-@subheading @value{RTEMS-VERSION}
-@example
-    FTP Site:    @value{RTEMS-FTPSITE}
-    Directory:   @value{RTEMS-FTPDIR}
-    File:        @value{RTEMS-TAR}
-@ifset use-html
-    URL:         @href{Download RTEMS components,,,ftp://@value{RTEMS-FTPSITE}@value{RTEMS-FTPDIR}}
-@end ifset
-@end example
-
-@subheading RTEMS Hello World
-@example
-    FTP Site:    @value{RTEMS-FTPSITE}
-    Directory:   @value{RTEMS-FTPDIR}
-    File:        hello_world_c.tgz
-@ifset use-html
-    URL:         @href{Download RTEMS Hello World,,,ftp://@value{RTEMS-FTPSITE}@value{RTEMS-FTPDIR}/hello_world_c.tgz}
-@end ifset
-@end example
-
-@subheading RTEMS Specific Tool Patches and Scripts
-@example
-    FTP Site:    @value{RTEMS-FTPSITE}
-    Directory:   @value{RTEMS-FTPDIR}/c_tools
-    File:        @value{BUILDTOOLS-TAR}
-@ifset BINUTILS-RTEMSPATCH
-    File:        @value{BINUTILS-RTEMSPATCH}
-@end ifset
-@ifset NEWLIB-RTEMSPATCH
-    File:        @value{NEWLIB-RTEMSPATCH}
-@end ifset
-@ifset GCC-RTEMSPATCH
-    File:        @value{GCC-RTEMSPATCH}
-@end ifset
-@ifset use-html
-    URL:         @href{Download RTEMS Patches and Scripts,,,ftp://@value{RTEMS-FTPSITE}@value{RTEMS-FTPDIR}/c_tools}
-@end ifset
-@end example
-
-@section Unarchiving the Tools
-
-While in the @code{tools} directory, unpack the compressed
-tar files using the following command sequence: 
-
-@example
-cd tools
-tar xzf ../archive/@value{GCC-TAR}
-tar xzf ../archive/@value{BINUTILS-TAR}
-tar xzf ../archive/@value{NEWLIB-TAR}
-tar xzf ../archive/@value{BUILDTOOLS-TAR}
-@end example
-
-After the compressed tar files have been unpacked, the following
-directories will have been created under tools. 
-
-@itemize @bullet
-@item @value{BINUTILS-UNTAR}
-@item @value{GCC-UNTAR}
-@item @value{NEWLIB-UNTAR}
-@end itemize
-
-There will also be a set of scripts in the current directory 
-which aid in building the tools and RTEMS.  They are:
-
-@itemize @bullet
-@item bit
-@item bit_gdb
-@item bit_rtems
-@item common.sh
-@item user.cfg
-@end itemize
-
-When the @code{bit} script is executed later in this process, 
-it will automatically create two other subdirectories:
-
-@itemize @bullet
-@item src
-@item build-$@{CPU@}-tools
-@end itemize
-
-Similarly, the @code{bit_gdb} script will create the 
-subdirectory @code{build-$@{CPU@}-gdb} and
-the @code{bit_rtems} script will create the
-subdirectory @code{build-$@{CPU@}-rtems}.
-
-The tree should look something like the following figure:
-
-@example
-@group
-/whatever/prefix/you/choose/
-        archive/
-            @value{GCC-TAR}
-            @value{BINUTILS-TAR}
-            @value{NEWLIB-TAR}
-            @value{RTEMS-TAR}
-            @value{BUILDTOOLS-TAR}
-@ifset GCC-RTEMSPATCH
-            @value{GCC-RTEMSPATCH}
-@end ifset
-@ifset BINUTILS-RTEMSPATCH
-            @value{BINUTILS-RTEMSPATCH}
-@end ifset
-@ifset NEWLIB-RTEMSPATCH
-            @value{NEWLIB-RTEMSPATCH}
-@end ifset
-            hello_world_c.tgz
-            bit
-        tools/
-            @value{BINUTILS-UNTAR}/
-            @value{GCC-UNTAR}/
-            @value{NEWLIB-UNTAR}/
-            @value{RTEMS-UNTAR}/
-            bit
-            bit_gdb
-            bit_rtems
-            common.sh
-            user.cfg
-@end group
-@end example
-
-
-@c @ifset use-html
-@c @html
-@c <IMG SRC="bit_c.jpg" WIDTH=816 HEIGHT=267 ALT="Directory Organization">
-@c @end html
-@c @end ifset
-
-@c
-@c  Host Specific Notes
-@c
-
-@section Host Specific Notes
-
-@subsection Solaris 2.x
-
-The build scripts are written in "shell".  The program @code{/bin/sh}
-on Solaris 2.x is not robust enough to execute these scripts.  If you
-are on a Solaris 2.x host, then change the first line of the files
-@code{bit}, @code{bit_gdb}, and @code{bit_rtems} to use the
-@code{/bin/ksh} shell instead.
-
-@subsection Linux
-
-@subsubsection Broken install Program
-
-Certain versions of GNU fileutils include a version of @code{install} which
-does not work properly.  Please perform the following test to see if you
-need to upgrade:
-
-@example
-install -c -d /tmp/foo/bar
-@end example
-
-If this does not create the specified directories your install
-program will not install RTEMS properly.   You will need to upgrade
-to at least GNU fileutile version 3.16 to resolve this problem.
-
-@c
-@c  Reading the Documentation
-@c
-
-@section Reading the Tools Documentation
-
-Each of the tools in the GNU development suite comes with documentation.
-It is in the reader's and tool maintainers' interest that one read the
-documentation before posting a problem to a mailing list or news group.
-
-@c
-@c  EGCS patches
-@c
-
-@section Apply RTEMS Patch to EGCS
-
-@ifclear GCC-RTEMSPATCH
-No RTEMS specific patches are required for @value{GCC-VERSION} to
-support @value{RTEMS-VERSION}.
-@end ifclear
-
-@ifset GCC-RTEMSPATCH
-
-Apply the patch using the following command sequence:
-
-@example
-cd tools/@value{GCC-UNTAR}
-zcat ../../archive/@value{GCC-RTEMSPATCH} | patch -p1
-@end example
-
-Check to see if any of these patches have been rejected using the following
-sequence:
-
-@example
-cd tools/@value{GCC-UNTAR}
-find . -name "*.rej" -print
-@end example
-
-If any files are found with the .rej extension, a patch has been rejected.
-This should not happen with a good patch file which is properly applied.
-
-@end ifset
-
-@c
-@c  BINUTILS patches
-@c
-
-@section Apply RTEMS Patch to binutils
-
-@ifclear BINUTILS-RTEMSPATCH
-No RTEMS specific patches are required for @value{BINUTILS-VERSION} to
-support @value{RTEMS-VERSION}.
-@end ifclear
-
-@ifset BINUTILS-RTEMSPATCH
-Apply the patch using the following command sequence:
-
-@example
-cd tools/@value{BINUTILS-UNTAR}
-zcat ../../archive/@value{BINUTILS-RTEMSPATCH} | patch -p1
-@end example
-
-Check to see if any of these patches have been rejected using the following
-sequence: 
-
-@example
-cd tools/@value{BINUTILS-UNTAR}
-find . -name "*.rej" -print
-@end example
-
-If any files are found with the .rej extension, a patch has been rejected.
-This should not happen with a good patch file which is properly applied. 
-
-@end ifset
-
-@c
-@c  Newlib patches
-@c
-
-@section Apply RTEMS Patch to newlib
-
-@ifclear NEWLIB-RTEMSPATCH
-No RTEMS specific patches are required for @value{NEWLIB-VERSION} to
-support @value{RTEMS-VERSION}.
-@end ifclear
-
-@ifset NEWLIB-RTEMSPATCH
-
-Apply the patch using the following command sequence:
-
-@example
-cd tools/@value{NEWLIB-UNTAR}
-zcat ../../archive/@value{NEWLIB-RTEMSPATCH} | patch -p1
-@end example
-
-Check to see if any of these patches have been rejected using the following
-sequence: 
-
-@example
-cd tools/@value{NEWLIB-UNTAR}
-find . -name "*.rej" -print
-@end example
-
-If any files are found with the .rej extension, a patch has been rejected.
-This should not happen with a good patch file which is properly applied. 
-
-@end ifset
-
-@c
-@c  Localizing the Configuration
-@c
-
-@section Localizing the Configuration
-
-Edit the @code{user.cfg} file to alter the settings of various 
-variables which are used to tailor the build process.
-Each of the variables set in @code{user.cfg} may be modified
-as described below:
-
-@table @code
-@item INSTALL_POINT
-is the location where you wish the GNU C/C++ cross compilation tools for
-RTEMS to be built. It is recommended that the directory chosen to receive
-these tools be named so that it is clear from which egcs distribution it
-was generated and for which target system the tools are to produce code for.
-
-@b{WARNING}: The @code{INSTALL_POINT} should not be a subdirectory 
-under the build directory.  The build directory will be removed
-automatically upon successful completion of the build procedure.
-
-@item BINUTILS
-is the directory under tools that contains @value{BINUTILS-UNTAR}. 
-For example:
-
-@example
-BINUTILS=@value{BINUTILS-UNTAR}
-@end example
-
-@item GCC
-is the directory under tools that contains @value{GCC-UNTAR}.
-For example,
-
-@example
-GCC=@value{GCC-UNTAR}
-@end example
-
-@item NEWLIB
-is the directory under tools that contains @value{NEWLIB-UNTAR}.
-For example:
-
-@example
-NEWLIB=@value{NEWLIB-UNTAR}
-@end example
-
-@item BUILD_DOCS
-is set to "yes" if you want to install documentation.
-For example:
-
-@example
-BUILD_DOCS=yes
-@end example
-
-@item BUILD_OTHER_LANGUAGES
-is set to "yes" if you want to build languages other than C and C++.  At
-the current time, this enables Fortan and Objective-C.
-For example:
-
-@example
-BUILD_OTHER_LANGUAGES=yes
-@end example
-
-@b{NOTE:} Based upon the version of the compiler being used, it may not
-be possible to build languages other than C and C++ cross.  In many cases,
-the language run-time support libraries are not "multilib'ed".  Thus the
-executable code in these libraries will be for the default compiler settings
-and not necessarily be correct for your CPU model.
-
-@item RTEMS
-is the directory under tools that contails @value{RTEMS-UNTAR}.
-
-@item ENABLE_RTEMS_POSIX
-is set to "yes" if you want to enable the RTEMS POSIX API support.
-At this time, this feature is not supported by the UNIX ports of RTEMS
-and is forced to "no" for those targets.  This corresponds to the
-@code{configure} option @code{--enable-posix}.
-
-@item ENABLE_RTEMS_TESTS
-is set to "yes" if you want to build the RTEMS Test Suite.  If this
-is set to "no", then only the Sample Tests will be built.
-This corresponds to the @code{configure} option @code{--enable-tests}.
-
-@item ENABLE_RTEMS_TCPIP
-is set to "yes" if you want to build the RTEMS TCP/IP Stack.  If a
-particular BSP does not support TCP/IP, then this feature is automatically
-disabled.  This corresponds to the @code{configure} option
-@code{--enable-tcpip}.
-
-@item ENABLE_RTEMS_CXX
-is set to "yes" if you want to build the RTEMS C++ support including
-the C++ Wrapper for the Classic API.  This corresponds to the
-@code{configure} option @code{--enable-cxx}.
-@end table
-
-@section Running the bit Script
-
-After the @code{bit} script has been modified to reflect the
-local installation, the modified @code{bit} script is run
-using the following sequence:
-
-@example
-cd tools
-./bit <target configuration>
-@end example
-
-Where <target configuration> is one of the following:
-
-@itemize @bullet
-@item hppa1.1
-@item i386
-@item i386-elf
-@item i386-go32
-@item i960
-@item m68k
-@item mips64orion
-@item powerpc
-@item sh
-@item sparc
-@end itemize
-
-If no errors are encountered, the @code{bit} script will conclude by 
-printing messages similar to the following:
-
-@example
-
-The src and build-i386-tools subdirectory may now be removed.
-
-Started:  Fri Apr 10 10:14:07 CDT 1998
-Finished: Fri Apr 10 12:01:33 CDT 1998
-@end example
-
-If the @code{bit} script successfully completes, then the
-GNU C/C++ cross compilation tools are installed.
-
-If the @code{bit} script does not successfully complete, then investigation
-will be required to determine the source of the error.
-
diff --git a/doc/started/buildrt.t b/doc/started/buildrt.t
deleted file mode 100644
index 1366bca1d4..0000000000
--- a/doc/started/buildrt.t
+++ /dev/null
@@ -1,137 +0,0 @@
-@c
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Building RTEMS
-
-@section Unpack the RTEMS Source
-
-Use the following command sequence to unpack the RTEMS source into the
-tools directory: 
-
-@example
-cd tools
-tar xzf ../archive/@value{RTEMS-TAR}
-@end example
-
-@section Add <INSTALL_POINT>/bin to Executable PATH
-
-In order to compile RTEMS, you must have the cross compilation toolset
-in your search patch.  The following command appends the directory
-where the tools were installed in the previous chapter:
-
-@example
-export PATH=$PATH:<INSTALL_POINT>/bin
-@end example
-
-NOTE:  The above command is in Bourne shell (@code{sh}) syntax and
-should work with the Korn (@code{ksh}) and GNU Bourne Again Shell
-(@code{bash}).  It will not work with the C Shell (@code{csh}) or
-derivatives of the C Shell.
-
-@section Verifying the Operation of the Cross Toolset
-
-In order to insure that the cross-compiler is invoking the correct
-subprograms (like @code{as} and @code{ld}), one can test assemble
-a small program.  When in verbose more, @code{gcc} prints out information 
-showing where it found the subprograms it invokes.  Place the following
-function in a file named @code{f.c}:
-
-@example
-int f( int x )
-@{
-  return x + 1;
-@}
-@end example
-
-Then assemble the file using a command similar to the following:
-
-@example
-m68k-rtems-gcc -v -S f.c
-@end example
-
-Where @code{m68k-rtems-gcc} should be changed to match the installed
-name of your cross compiler.  The result of this command will be
-a sequence of output showing where the cross-compiler searched for
-and found its subcomponents.  Verify that these paths correspond
-to your <INSTALL_POINT>.
-
-@b{NOTE:} One of the most common installation errors is for the
-cross-compiler not to be able to find the cross assembler and default
-to using the native @code{as}.  This can result in very confusing
-error messages.
-
-@section Generate RTEMS for a Specific Target and BSP
-
-@subsection Using the bit_rtems Script
-
-The simplest way to build RTEMS is to use the @code{bit_rtems} script.
-This script interprets the settings in the @code{user.cfg} file to
-enable or disable the various RTEMS options.
-
-This script is invoked as follows:
-
-@example
-./bit_rtems CPU [BSP]
-@end example
-
-Where CPU is one of the RTEMS supported CPU families from the following
-list:
-
-@itemize @bullet
-@item hppa1.1
-@item i386
-@item i386-elf
-@item i386-go32
-@item i960 
-@item m68k
-@item mips64orion
-@item powerpc
-@item sh
-@item sparc
-@end itemize
-
-BSP is a supported BSP for the selected CPU family.  The list of
-supported BSPs may be found in the file
-tools/@value{RTEMS-UNTAR}/README.configure
-in the RTEMS source tree.  If the BSP parameter is not specified,
-then all supported BSPs for the selected CPU family will be built.
-
-@subsection Using the RTEMS configure Script Directly
-
-Make a build directory under tools and build the RTEMS product in this
-directory. The ../@value{RTEMS-UNTAR}/configure
-command has numerous command line
-arguments. These arguments are discussed in detail in documentation that
-comes with the RTEMS distribution. In the installation described in the
-section "Unpack the RTEMS source", these configuration options can be found
-in the file tools/@value{RTEMS-UNTAR}/README.configure.
-
-The following shows the command sequence required to configure,
-compile, and install RTEMS with the POSIX API, FreeBSD TCP/IP,
-and C++ support disabled.  RTEMS will be built to target 
-the @code{BOARD_SUPPORT_PACKAGE} board.
-
-@example
-mkdir build-rtems
-cd build-rtems
-../@value{RTEMS-UNTAR}/configure --target=<TARGET_CONFIGURATION> \
-    --disable-posix --disable-tcpip --disable-cxx \
-    --enable-rtemsbsp=<BOARD_SUPPORT_PACKAGE>\
-    --prefix=<INSTALL_POINT>
-gmake all install
-@end example
-
-Where the list of currently supported of <TARGET_CONFIGURATION>'s and
-<BOARD_SUPPORT_PACKAGE>'s can be found in
-tools/@value{RTEMS-UNTAR}/README.configure.
-
-<INSTALL_POINT> is the installation point from the previous step
-"Modify the bit script" in the build of the tools. 
-
-
diff --git a/doc/started/gdb.t b/doc/started/gdb.t
deleted file mode 100644
index 13716ca635..0000000000
--- a/doc/started/gdb.t
+++ /dev/null
@@ -1,222 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Building the GNU Debugger
-
-GDB is not currently RTEMS aware. The following configurations have been
-successfully used with RTEMS applications:
-
-@itemize @bullet
-@item Sparc Instruction Simulator (SIS)
-@item PowerPC Instruction Simulator (PSIM)
-@item DINK32
-@end itemize
-
-Other configurations of gdb have successfully been used by RTEMS users
-but are not documented here.
-
-@section Unarchive the gdb Distribution
-
-Use the following commands to unarchive the gdb distribution:
-
-@example
-cd tools
-tar xzf ../archive/@value{GDB-TAR}
-@end example
-
-The directory @value{GDB-UNTAR} is created under the tools directory.
-
-@c
-@c  GDB Patch
-@c
-
-@section Apply RTEMS Patch to GDB
-
-@ifclear GDB-RTEMSPATCH
-No RTEMS specific patches are required for @value{GDB-VERSION} to
-support @value{RTEMS-VERSION}.
-@end ifclear
-
-@ifset GDB-RTEMSPATCH
-
-Apply the patch using the following command sequence:
-
-@example
-cd tools/@value{GDB-UNTAR}
-zcat archive/@value{GDB-RTEMSPATCH} | patch -p1
-@end example
-
-Check to see if any of these patches have been rejected using the following
-sequence:
-
-@example
-cd tools/@value{GDB-UNTAR}
-find . -name "*.rej" -print
-@end example
-
-If any files are found with the .rej extension, a patch has been rejected.
-This should not happen with a good patch file.
-
-To see the files that have been modified use the sequence:
-
-@example
-cd tools/@value{GDB-UNTAR}
-find . -name "*.orig" -print
-@end example
-
-The files that are found, have been modified by the patch file.
-
-@end ifset
-
-@section Using the bit_gdb script
-
-The simplest way to build gdb for RTEMS is to use the @code{bit_gdb} script.
-This script interprets the settings in the @code{user.cfg} file to
-produce the gdb configuration most appropriate for the target CPU.
-
-This script is invoked as follows:
-
-@example
-./bit_gdb CPU
-@end example
-
-Where CPU is one of the RTEMS supported CPU families from the following
-list:
-
-@itemize @bullet
-@item hppa1.1
-@item i386
-@item i386-elf
-@item i386-go32
-@item i960
-@item m68k
-@item mips64orion
-@item powerpc
-@item sh
-@item sparc
-@end itemize
-
-If gdb supports a CPU instruction simulator for this configuration, then
-it is included in the build.
-
-@section Using the gdb configure Script Directly
-
-@subsection GDB with Sparc Instruction Simulation (SIS)
-
-@subheading Make the Build Directory
-
-Create a build directory for the SIS Debugger
-
-@example
-cd tools
-mkdir build-sis
-@end example
-
-@subheading Configure for the Build
-
-Configure the GNU Debugger for the
-Sparc Instruction Simulator (SIS):
-
-@example
-cd tools/build-sis
-../@value{GDB-UNTAR}/configure --target-sparc-erc32-aout \
-    --program-prefix=sparc-rtems- \
-    --disable-gdbtk \
-    --enable-targets=all \
-    --prefix=<INSTALL_POINT_FOR_SIS>
-@end example
-
-Where <INSTALL_POINT_FOR_SIS> is a unique location where the gdb
-with SIS will be created. 
-
-@subheading Make the Debugger
-
-From tools/build-sis execute the following command sequence:
-
-@example
-gmake all install
-@end example
-
-
-@subsection GDB with PowerPC Instruction Simulator
-
-@subheading Make the Build Directory
-
-Create a build directory for the SIS Debugger
-
-@example
-cd tools
-mkdir build-ppc
-@end example
-
-@subheading Configure for the Build
-
-Configure the GNU Debugger for the PowerPC
-Instruction Simulator (PSIM):
-
-@example
-cd tools/build-ppc
-../@value{GDB-UNTAR}/configure \
-      --target=powerpc-unknown-eabi \
-      --program-prefix=powerpc-rtems- \
-      --enable-sim-powerpc \
-      --enable-sim-timebase \
-      --enable-sim-inline \
-      --enable-sim-hardware \
-      --enable-targets=all \
-      --prefix=<INSTALL_POINT_FOR_PPC>
-@end example
-
-Where <INSTALL_POINT_FOR_PPC> is a unique location where the gdb
-with PSIM will be created. 
-
-
-@subheading Make the Debugger
-
-From tools/build-ppc execute the following command sequence:
-
-@example
-gmake all install
-@end example
-
-
-@subsection GDB for DINK32
-
-@subheading Make the Build Directory
-
-Create a build directory for the DINK32 Debugger
-
-@example
-cd tools
-mkdir build-dink32
-@end example
-
-@subheading Configure for the Build
-
-Configure the GNU Debugger to communicate with
-the DINK32 ROM monitor:
-
-@example
-cd tools/build-dink32
-../@value{GDB-UNTAR}/configure --target-powerpc-elf \
-    --program-prefix=powerpc-rtems- \
-    --enable-targets=all \
-    --prefix=<INSTALL_POINT_FOR_DINK32>
-@end example
-
-Where <INSTALL_POINT_FOR_DINK32> is a unique location where the
-gdb Dink32 will be created. 
-
-@subheading Make the Debugger
-
-From tools/build-dink32 execute the following command sequence:
-
-@example
-gmake all install
-@end example
-
diff --git a/doc/started/intro.t b/doc/started/intro.t
deleted file mode 100644
index c5100b3292..0000000000
--- a/doc/started/intro.t
+++ /dev/null
@@ -1,162 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Introduction
-
-The purpose of this document is to guide you through the process of 
-installing a GNU cross development environment to use with RTEMS.
-
-If you are already familiar with the concepts behind a cross compiler and
-have a background in Unix, these instructions should provide the bare
-essentials for performing a setup of the following items: 
-
-@itemize @bullet
-@item GNU C/C++ Cross Compilation Tools for RTEMS on your host system
-@item RTEMS OS for the target host
-@item GDB Debugger
-@end itemize
-
-The remainder of this chapter provides background information on real-time
-embedded systems and cross development and an overview of other 
-resources of interest on the Internet.  If you are not familiar with 
-real-time embedded systems or the other areas, please read those sections.  
-These sections will help familiarize you with the
-types of systems RTEMS is designed to be used in and the cross development
-process used when developing RTEMS applications.
-
-@section Real-Time Embedded Systems
-
-Real-time embedded systems are found in practically every facet of our
-everyday lives.  Today's systems range from the common telephone, automobile
-control systems, and kitchen appliances to complex air traffic control
-systems, military weapon systems, an d production line control including
-robotics and automation. However, in the current climate of rapidly changing
-technology, it is difficult to reach a consensus on the definition of a
-real-time embedded system. Hardware costs are continuing to rapidly decline 
-while at the same time the hardware is increasing in power and functionality.
-As a result, embedded systems that were not considered viable two years ago
-are suddenly a cost effective solution. In this domain, it is not uncommon
-for a single hardware configuration to employ a variety of architectures and
-technologies. Therefore, we shall define an embedded system as any computer
-system that is built into a larger system consisting of multiple technologies
-such as digital and analog electronics,  mechanical devices, and sensors.
-
-Even as hardware platforms become more powerful, most embedded systems are
-critically dependent on the real-time software embedded in the systems
-themselves.  Regardless of how efficiently the hardware operates, the
-performance of the embedded real-time software determines the success of the
-system.  As the complexity of the embedded hardware platform grows, so does
-the size and complexity of the embedded software. Software systems must
-routinely perform activities which were only dreamed of a short time ago.
-These large, complex, real-time embedded applications now commonly contain
-one million lines of code or more.
-
-Real-time embedded systems have a complex set of characteristics that
-distinguish them from other software applications.  Real-time embedded
-systems are driven by and must respond to real world events while adhering to
-rigorous requirements imposed by the environment with which they interact. 
-The correctness of the system depends not only on the results of
-computations, but also on the time at which the results are produced.  The
-most important and complex characteristic of real-time application systems is
-that they must receive and respond to a set of external stimuli within rigid
-and critical time constraints. 
-
-A single real-time application can be composed of both soft and hard
-real-time components. A typical example of a hard real-time system is a
-nuclear reactor control system that must not only detect failures, but must
-also respond quickly enough to prevent a meltdown. This application also has
-soft real-time requirements because it may involve a man-machine interface.
-Providing an interactive input to the control system is not as critical as
-setting off an alarm to indicate a failure condition. However, th e
-interactive system component must respond within an acceptable time limit to
-allow the operator to interact efficiently with the control system. 
-
-@section Cross Development
-
-Today almost all real-time embedded software systems are developed in a 
-@b{cross development} environment using cross development tools. In the cross
-development environment, software development activities are typically
-performed on one computer system, the @b{host} system, while the result of the
-development effort (produced by the cross tools) is a software system that
-executes on the @b{target} platform. The requirements for the target platform are
-usually incompatible and quite often in direct conflict with the requirements
-for the host.  Moreover, the target hardware is often custom designed for a
-particular project.  This means that the cross development toolset must allow
-the developer to customize the tools to address target specific run-time
-issues.  The toolset must have provisions for board dependent initialization
-code, device drivers, and error handling code. 
-
-The host computer is optimized to support the code development cycle with
-support for code editors, compilers, and linkers requiring large disk drives,
-user development windows, and multiple developer connections.  Thus the host
-computer is typically a traditional UNIX workstation such as are available
-from SUN or Silicon Graphics, or a PC running either a version of MS-Windows
-or UNIX.  The host system may also be required to execute office productivity
-applications to allow the software developer to write  documentation, make
-presentations, or track the project's progress using a project management
-tool.  This necessitates that the host computer be general purpose with
-resources such as a thirty-two or sixty-four bit processor, large amounts of
-RAM, a  monitor, mouse, keyboard, hard and floppy disk drives, CD-ROM drive,
-and a graphics card.  It is likely that the system will be multimedia capable
-and have some networking capability. 
-
-Conversely, the target platform generally has limited traditional computer
-resources.  The hardware is designed for the particular functionality and
-requirements of the embedded system and optimized to perform those tasks
-effectively.  Instead of hard  driverss and keyboards, it is composed of
-sensors, relays, and stepper motors. The per-unit cost of the target platform
-is typically a critical concern.  No hardware component is included without
-being cost justified.  As a result, the processor of the target system is
-often from a different processor family than that of the host system and
-usually has lower performance.  In addition to the processor families
-targeted only for use in embedded systems, there are versions of nearly every
-general-purpose process or specifically tailored for real-time embedded
-systems.  For example, many of the processors targeting the embedded market
-do not include hardware floating point units, but do include peripherals such
-as timers, serial controllers, or network interfaces. 
-
-@section Resources on the Internet
-
-This section describes various resources on the Internet which are of
-use to RTEMS users.
-
-@subsection RTEMS Mailing List
-
-rtems-list@@OARcorp.com
-
-This mailing list is dedicated to discussion of issues related
-to RTEMS.  If you have questions about RTEMS, wish to make
-suggestions, or just want to pick up hints, this is a good
-list to subscribe to.  Subscribe by sending a message with
-the one line "subscribe" to rtems-list-request@@OARcorp.com.
-
-@subsection CrossGCC Mailing List
-
-crossgcc@@cygnus.com
-
-This mailing list is dedicated to the use of the GNU tools in
-cross development environments.  Most of the discussions
-focus on embedded issues.  Subscribe by sending a message with
-the one line "subscribe" to crossgcc-request@@cygnus.com.
-
-The crossgcc FAQ as well as a number of patches and utiliities
-of interest to cross development system users are available
-at ftp://ftp.cygnus.com/pub/embedded/crossgcc.
-
-@subsection EGCS Mailing List
-
-egcs@@cygnus.com
-
-This mailing list is dedicated to the EGCS Project which was
-formed to speed the development and integration of the various
-GNU languages.  The RTEMS and Linux communities were among those
-initially targetted by the EGCS Project as being important
-for its success.  Numerous RTEMS users have made contributions
-to this project.  Subscribe by sending a message with
-the one line "subscribe" to egcs-request@@cygnus.com.
-
diff --git a/doc/started/nt.t b/doc/started/nt.t
deleted file mode 100644
index 9c5160b726..0000000000
--- a/doc/started/nt.t
+++ /dev/null
@@ -1,365 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@set CYGWIN-VERSION B19
-@set CYGWIN-FTP http://www.cygnus.com/misc/gnu-win32/
-@set CYGWIN-COOLVIEW http://www.lexa.ru/sos/
-@set DOS2UNIX-FTP ftp://ftp.micros.hensa.ac.uk/platforms/ibm-pc/ms-dos/simtelnet/txtutl/dos2unix.zip
-@set PFE-FTP http://www.lancs.ac.uk/people/cpaap/pfe/
-
-@chapter Using MS-Windows as a Development Host
-
-This chapter discusses the installation of the GNU tool chain
-on a computer running the Microsoft Windows NT operating system.
-
-This chapter is based on a draft provided by 
-Geoffroy Montel <g_montel@@yahoo.com>.  Geoffroy's 
-procedure was based on information from 
-David Fiddes <D.J@@fiddes.surfaid.org>.
-Their input and feedback is greatly appreciated.
-
-@b{STATUS:}  This chapter should be considered preliminary.
-Please be careful when following these instructions.
-
-@section Version Information
-
-This installation process works well under Windows NT. 
-Using Windows 95 or 98 is not recommended although it 
-should be possible with version 3.77 of gmake and an updated
-cygwinb19.dll.
-
-This procedure should also work with newer version of 
-the tool versions listed in this chapter, but this has
-not been verified.  If you have success with a particular
-version of the toolset or notice problems in this chapter,
-please let the RTEMS maintainers know so they can be
-addressed in future revisions of this document.
-
-@section MS-Windows Host Specific Requirements
-
-This section details the components required to install
-and build a Windows hosted GNU cross development toolset.
-
-@subsection Unzipping Archives
-
-You will have to uncompress many archives during this
-process.  You must @b{NOT} use @code{WinZip} or
-@code{PKZip}.  Instead the un-archiving process uses
-the GNU @code{zip} and @code{tar} programs as shown below:
-
-@example
-tar -xzvf archive.tgz 
-@end example
-
-@code{tar} is provided with Cygwin32.
-
-@subsection Text Editor
-
-You absolutely have to use a text editor which can 
-save files with Unix format (so don't use Notepad 
-nor Wordpad). If you do not have an appropriate
-text editor, try @b{Programmers File Editor}, it is
-free and very convenient.  This editor may be downloaded
-from:
-
-@ifset use-html
-@href{@value{PFE-FTP},,@value{PFE-FTP}}
-@end ifset
-@ifclear use-html
-@value{PFE-FTP}
-@end ifclear
-
-@subsection Bug in Patch Utility
-
-There is a bug in the @code{patch} utility
-provided in Cygwin32 B19. The files modified end up 
-having MS-DOS style line termination. They must have
-Unix format, so a @code{dos2unix}-like command must
-be used to put them back into Unix format as shown below:
-
-@example
-$ dos2unix XYZ
-Dos2Unix: Cleaning file XYZ ...
-@end example
-
-The dos2unix utility may be downloaded from:
-
-@ifset use-html
-@href{@value{DOS2UNIX-FTP},,,@value{DOS2UNIX-FTP}}
-@end ifset
-@ifclear use-html
-@value{DOS2UNIX-FTP}
-@end ifclear
-
-You @b{must} change the format of every patched file 
-for the toolset build to work correctly.
-
-@subsection Files Needed
-
-This section lists the files required to build and install
-a Windows hosted GNU cross development toolset and their
-home WWW site.  In addition to the sources required 
-for the cross environment listed earlier in @ref{Get All the Pieces}, 
-you will need to  download the following
-files from their respective sites using your favorite
-Web browser or ftp client.
-
-@table @b
-
-@item cdk.exe
-@ifset use-html
-@href{@value{CYGWIN-FTP},,@value{CYGWIN-FTP}}
-@end ifset
-@ifclear use-html
-@value{CYGWIN-FTP}
-@end ifclear
-
-@item coolview.tar.gz
-@ifset use-html
-@href{@value{CYGWIN-COOLVIEW},,@value{CYGWIN-COOLVIEW}}
-@end ifset
-@ifclear use-html
-@value{CYGWIN-COOLVIEW}
-@end ifclear
-
-@end table
-
-@subsection System Requirements
-
-Although the finished cross-compiler is fairly easy on resources,
-building it can take a significant amount of processing power and 
-disk space. The recommended build system spec is:
-
-@enumerate
-
-@item An AMD K6-300, Pentium II-300 or better processor. GNU C and Cygwin32 are
-@b{very} CPU hungry.
-
-@item At least 64MB of RAM.
-
-@item At least 400MB of FAT16 disk space or 250MB if you have an NTFS partition. 
-
-@end enumerate
-
-Even with this spec of machine expect the full suite to take over 2 hours to 
-build with a further half an hour for RTEMS itself.
-
-
-@section Installing Cygwin32 B19
-
-This section describes the process of installing the 
-version @value{CYGWIN-VERSION} of the Cygwin32 environment.  It assumes
-that this toolset is installed in a directory 
-referred to as @code{<RTOS>}.
-
-@enumerate
-
-@item Execute cdk.exe. These instructions assume that you 
-install Cygwin32 under the <RTOS>\cygnus\b19 directory.
-
-@item Execute Cygwin.bat (either on the start menu or 
-under <RTOS>\cygnus\b19).
-
-@item At this point, you are at the command line of @code{bash},
-a Unix-like shell. You have to mount the "/" directory. Type:
-
-@example 
-umount /
-mount -b <RTOS> /
-@end example
-
-For example, the following sequence mounts the @code{E:\unix} as the 
-root directory for the Cygwin32 environment. Note the use of two @code{\}s 
-when specifying DOS paths in bash:
-
-@example
-umount /
-mount -b e:\\unix /
-@end example
-
-@item Create the /bin, /tmp, /source and /build directories.
-
-@example
-mkdir /bin
-mkdir /tmp
-mkdir /source
-mkdir /build
-mkdir /build/binutils
-mkdir /build/egcs
-@end example
-
-@item The light Bourne shell provided with Cygwin B19 is buggy.
-You should copy it to a fake name and copy @code{bash.exe} to @code{sh.exe}:
-
-@example
-cd <RTOS>/cygnus/b19/H-i386-cygwin32/bin
-mv sh.exe old_sh.exe
-cp bash.exe sh.exe
-@end example
-
-The Bourne shell has to be present in /bin directory to run shell scripts properly:
-
-@example
-cp <RTOS>/cygnus/b19/H-i386-cygwin32/bin/sh.exe /bin
-cp <RTOS>/cygnus/b19/H-i386-cygwin32/bin/bash.exe /bin
-@end example
-
-
-@item Open the file 
-@code{/cygnus/b19/H-i386-cygwin32/lib/gcc-lib/i386-cygwin32/2.7-b19/specs},
-and change the following line:
-
-@example
--lcygwin %@{mwindows:-luser32 -lgdi32 -lcomdlg32@} -lkernel32
-@end example
-
-to:
-
-@example
--lcygwin %@{mwindows:-luser32 -lgdi32 -lcomdlg32@} -lkernel32 -ladvapi32
-@end example
-
-@end enumerate
-
-At this point, you have a native installation of Cygwin32 and
-are ready to proceed to building a cross-compiler.
-
-@c
-@c  BINUTILS
-@c
-
-@section Installing binutils
-
-@enumerate
-
-@item Unarchive @value{BINUTILS-TAR} following the 
-instructions in @ref{Unarchiving the Tools} into the /source directory.
-Apply the appropriate RTEMS specific patch as detailed in
-@ref{Apply RTEMS Patch to binutils}.
-
-@item In the @code{/build/binutils} directory, execute the following
-command to configure @value{BINUTILS-VERSION}:
-
-@example
-/source/@value{BINUTILS-UNTAR}/configure --verbose --target=m68k-rtems \
-    --prefix=/gcc-m68k-rtems --with-gnu-as --with-gnu-ld 
-@end example
-
-Replace @code{m68k-rtems} with the target configuration
-of your choice.  See @ref{Running the bit Script} for a
-list of the targets available.
-
-@item Execute the following command to compile the toolset:
-
-@example
-make
-@end example
-
-@item Install the full package with the following command:
-
-@example
-make -k install
-@end example
-
-There is a problem with the gnu info package which will cause an 
-error during installation. Telling make to keep going with -k allows 
-the install to complete.
-
-@item In the @code{cygnus.bat} file, add the directory
-containing the cross-compiler executables to your search path
-by inserting the following line:
-
-@example
-PATH=E:\unix\gcc-m68k-rtems\bin;%PATH%
-@end example
-
-@item You can erase the /build/binutils directory content if 
-disk space is tight.
-
-@item Exit bash and run @code{cygnus.bat} to restart
-the Cygwin32 environment with the new path.
-
-@end enumerate
-
-@c
-@c  EGCS
-@c
-
-@section Installing EGCS AND NEWLIB
-
-@enumerate
-@item Unarchive and patch @value{EGCS-TAR} and @value{NEWLIB-TAR}
-following the instructions in @ref{Unarchiving the Tools}. 
-Apply the appropriate RTEMS specific patches as detailed in
-@ref{Apply RTEMS Patch to EGCS} and @ref{Apply RTEMS Patch to newlib}.
-
-@b{NOTE}: See @ref{Bug in Patch Utility}.
-
-@item Remove the following directories (we cannot use Fortran
-or Objective-C as Cygwin32 cross-compilers):
-
-@example
-/source/@value{GCC-UNTAR}/libf2c
-/source/@value{GCC-UNTAR}/gcc/objc
-/source/@value{GCC-UNTAR}/gcc/f
-@end example
-
-@b{NOTE}: See @ref{Bug in Patch Utility}.
-
-@item Link the following directories from Newlib to the main EGCS directory, 
-/source/@value{GCC-UNTAR}/ :
-
-@itemize @bullet
-@item ln -s ../@value{NEWLIB-UNTAR}/newlib newlib
-@item ln -s ../@value{NEWLIB-UNTAR}/libgloss libgloss
-@end itemize
-
-@item Change to the /build/egcs directory to configure the compiler:
-
-@example
-/source/@value{GCC-UNTAR}/configure --verbose --target=m68k-rtems \
-    --prefix=/gcc-m68k --with-gnu-as --with-gnu-ld \
-    --with-newlib
-@end example
-
-Replace @code{m68k-rtems} with the target configuration
-of your choice.  See @ref{Running the bit Script} for a
-list of the targets available.
-
-@item Compile the toolset as follows:
-
-@example
-make cross
-@end example
-
-You must do a @code{make cross} (not a simple @code{make})
-to insure that the different packages are built in the correct
-order.   Making the compiler can take several hours even on
-fairly fast machines, beware.
-
-@item Install with the following command:
-
-@example
-make -k install
-@end example
-
-@item Just as with binutils package, a problem with the gnu
-info package not building correctly requires that you use -k to 
-keep going.
-
-@example
-make -k install
-@end example
-
-@end enumerate
-
-With any luck, at this point you having a working cross-compiler.  So
-as Geoffroy said:
-
-@center @b{That's it! Celebrate!}
-
diff --git a/doc/started/pictures/bit_ada.jpg b/doc/started/pictures/bit_ada.jpg
deleted file mode 100644
index 774b103711..0000000000
--- a/doc/started/pictures/bit_ada.jpg
+++ /dev/null
diff --git a/doc/started/pictures/bit_ada.vsd b/doc/started/pictures/bit_ada.vsd
deleted file mode 100644
index 51e8e1fe53..0000000000
--- a/doc/started/pictures/bit_ada.vsd
+++ /dev/null
diff --git a/doc/started/pictures/bit_c.jpg b/doc/started/pictures/bit_c.jpg
deleted file mode 100644
index 158beb4bd1..0000000000
--- a/doc/started/pictures/bit_c.jpg
+++ /dev/null
diff --git a/doc/started/pictures/bit_c.vsd b/doc/started/pictures/bit_c.vsd
deleted file mode 100644
index a6db26bd15..0000000000
--- a/doc/started/pictures/bit_c.vsd
+++ /dev/null
diff --git a/doc/started/pictures/scfile10.jpg b/doc/started/pictures/scfile10.jpg
deleted file mode 100644
index 22a83877ce..0000000000
--- a/doc/started/pictures/scfile10.jpg
+++ /dev/null
diff --git a/doc/started/pictures/scfile10.vsd b/doc/started/pictures/scfile10.vsd
deleted file mode 100644
index 07efb1f18b..0000000000
--- a/doc/started/pictures/scfile10.vsd
+++ /dev/null
diff --git a/doc/started/pictures/scfile11.jpg b/doc/started/pictures/scfile11.jpg
deleted file mode 100644
index f70986ef55..0000000000
--- a/doc/started/pictures/scfile11.jpg
+++ /dev/null
diff --git a/doc/started/pictures/scfile11.vsd b/doc/started/pictures/scfile11.vsd
deleted file mode 100644
index 25871be19a..0000000000
--- a/doc/started/pictures/scfile11.vsd
+++ /dev/null
diff --git a/doc/started/pictures/scfile12.jpg b/doc/started/pictures/scfile12.jpg
deleted file mode 100644
index 22a83877ce..0000000000
--- a/doc/started/pictures/scfile12.jpg
+++ /dev/null
diff --git a/doc/started/pictures/scfile12.vsd b/doc/started/pictures/scfile12.vsd
deleted file mode 100644
index 750e7cdf56..0000000000
--- a/doc/started/pictures/scfile12.vsd
+++ /dev/null
diff --git a/doc/started/pictures/scfile13.jpg b/doc/started/pictures/scfile13.jpg
deleted file mode 100644
index 7ea418b7a7..0000000000
--- a/doc/started/pictures/scfile13.jpg
+++ /dev/null
diff --git a/doc/started/pictures/scfile13.vsd b/doc/started/pictures/scfile13.vsd
deleted file mode 100644
index 581eff901c..0000000000
--- a/doc/started/pictures/scfile13.vsd
+++ /dev/null
diff --git a/doc/started/pictures/scsfile1.jpg b/doc/started/pictures/scsfile1.jpg
deleted file mode 100644
index d1d497e955..0000000000
--- a/doc/started/pictures/scsfile1.jpg
+++ /dev/null
diff --git a/doc/started/pictures/scsfile1.vsd b/doc/started/pictures/scsfile1.vsd
deleted file mode 100644
index a7314848fc..0000000000
--- a/doc/started/pictures/scsfile1.vsd
+++ /dev/null
diff --git a/doc/started/pictures/scsfile2.jpg b/doc/started/pictures/scsfile2.jpg
deleted file mode 100644
index afbe1db125..0000000000
--- a/doc/started/pictures/scsfile2.jpg
+++ /dev/null
diff --git a/doc/started/pictures/scsfile2.vsd b/doc/started/pictures/scsfile2.vsd
deleted file mode 100644
index d2bb29a6e8..0000000000
--- a/doc/started/pictures/scsfile2.vsd
+++ /dev/null
diff --git a/doc/started/pictures/scsfile3.jpg b/doc/started/pictures/scsfile3.jpg
deleted file mode 100644
index b0e135994d..0000000000
--- a/doc/started/pictures/scsfile3.jpg
+++ /dev/null
diff --git a/doc/started/pictures/scsfile3.vsd b/doc/started/pictures/scsfile3.vsd
deleted file mode 100644
index da98158c85..0000000000
--- a/doc/started/pictures/scsfile3.vsd
+++ /dev/null
diff --git a/doc/started/pictures/scsfile4.jpg b/doc/started/pictures/scsfile4.jpg
deleted file mode 100644
index 1c01cbb460..0000000000
--- a/doc/started/pictures/scsfile4.jpg
+++ /dev/null
diff --git a/doc/started/pictures/scsfile4.vsd b/doc/started/pictures/scsfile4.vsd
deleted file mode 100644
index 50823fa67e..0000000000
--- a/doc/started/pictures/scsfile4.vsd
+++ /dev/null
diff --git a/doc/started/pictures/scsfile5.jpg b/doc/started/pictures/scsfile5.jpg
deleted file mode 100644
index 8fe8df173c..0000000000
--- a/doc/started/pictures/scsfile5.jpg
+++ /dev/null
diff --git a/doc/started/pictures/scsfile5.vsd b/doc/started/pictures/scsfile5.vsd
deleted file mode 100644
index 614736593a..0000000000
--- a/doc/started/pictures/scsfile5.vsd
+++ /dev/null
diff --git a/doc/started/pictures/scsfile6.jpg b/doc/started/pictures/scsfile6.jpg
deleted file mode 100644
index 58a3489242..0000000000
--- a/doc/started/pictures/scsfile6.jpg
+++ /dev/null
diff --git a/doc/started/pictures/scsfile6.vsd b/doc/started/pictures/scsfile6.vsd
deleted file mode 100644
index a970df509a..0000000000
--- a/doc/started/pictures/scsfile6.vsd
+++ /dev/null
diff --git a/doc/started/pictures/scsfile7.jpg b/doc/started/pictures/scsfile7.jpg
deleted file mode 100644
index 68cff033b8..0000000000
--- a/doc/started/pictures/scsfile7.jpg
+++ /dev/null
diff --git a/doc/started/pictures/scsfile7.vsd b/doc/started/pictures/scsfile7.vsd
deleted file mode 100644
index 0af5ae9f4f..0000000000
--- a/doc/started/pictures/scsfile7.vsd
+++ /dev/null
diff --git a/doc/started/pictures/scsfile8.jpg b/doc/started/pictures/scsfile8.jpg
deleted file mode 100644
index a2ef5954ca..0000000000
--- a/doc/started/pictures/scsfile8.jpg
+++ /dev/null
diff --git a/doc/started/pictures/scsfile8.vsd b/doc/started/pictures/scsfile8.vsd
deleted file mode 100644
index 0ed6dedf6d..0000000000
--- a/doc/started/pictures/scsfile8.vsd
+++ /dev/null
diff --git a/doc/started/pictures/scsfile9.jpg b/doc/started/pictures/scsfile9.jpg
deleted file mode 100644
index 04f623e62d..0000000000
--- a/doc/started/pictures/scsfile9.jpg
+++ /dev/null
diff --git a/doc/started/pictures/scsfile9.vsd b/doc/started/pictures/scsfile9.vsd
deleted file mode 100644
index ca3222b4cf..0000000000
--- a/doc/started/pictures/scsfile9.vsd
+++ /dev/null
diff --git a/doc/started/pictures/sfile12c.jpg b/doc/started/pictures/sfile12c.jpg
deleted file mode 100644
index aba5bf21a2..0000000000
--- a/doc/started/pictures/sfile12c.jpg
+++ /dev/null
diff --git a/doc/started/pictures/sfile12c.vsd b/doc/started/pictures/sfile12c.vsd
deleted file mode 100644
index fc0616cf1e..0000000000
--- a/doc/started/pictures/sfile12c.vsd
+++ /dev/null
diff --git a/doc/started/require.t b/doc/started/require.t
deleted file mode 100644
index 9ac3d2033f..0000000000
--- a/doc/started/require.t
+++ /dev/null
@@ -1,56 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Requirements
-
-A fairly large amount of disk space is required to perform the build of the
-GNU C/C++ Cross Compiler Tools for RTEMS. The following table may help in
-assessing the amount of disk space required for your installation: 
-
-@example
-+----------------------------------------+------------------------------+
-|                Component               |     Disk Space Required      |
-+----------------------------------------+------------------------------+
-|          archive directory             |          30 Mbytes           |
-|          tools src unzipped            |         100 Mbytes           |
-|    each individual build directory     |    300 Mbytes worst case     |
-|       each installation directory      |        20-400 Mbytes         |
-+----------------------------------------+------------------------------+
-@end example
-
-The disk space required for each installation directory depends 
-primarily on the number of RTEMS BSPs which are to be installed.
-If a single BSP is installed, then the size of each install directory 
-will tend to be in the 40-60 Mbyte range.
-
-The instructions in this manual should work on any computer running
-a UNIX variant.  Some native GNU tools are used by this procedure
-including:
-
-@itemize @bullet
-@item GCC
-@item GNU make
-@item GNU makeinfo
-@end itemize
-
-In addition, some native utilities may be deficient for building 
-the GNU tools.
-
-@section GNU makeinfo Version Requirements
-
-In order to build egcs 1.1b or newer, the GNU @code{makeinfo} program
-installed on your system must be at least version 1.68.  The appropriate
-version of @code{makeinfo} is distributed with egcs 1.1b.
-
-The following demonstrates how to determine the version of @code{makeinfo}
-on your machine:
-
-@example
-makeinfo --version
-@end example
-
diff --git a/doc/started/sample.t b/doc/started/sample.t
deleted file mode 100644
index b2910319bc..0000000000
--- a/doc/started/sample.t
+++ /dev/null
@@ -1,57 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Building the Sample Application
-
-@section Unpack the Sample Application 
-
-Use the following command to unarchive the sample application:
-
-@example
-cd tools
-tar xzf ../archive/hello_world_c.tgz
-@end example
-
-@section Set the Environment Variable RTEMS_MAKEFILE_PATH 
-
-It must point to the appropriate directory containing RTEMS build for our
-target and board support package combination. 
-
-@example
-export RTEMS_MAKEFILE_PATH = \
-<INSTALLATION_POINT>/rtems/<BOARD_SUPPORT_PACKAGE>
-@end example
-
-Where <INSTALLATION_POINT> and <BOARD_SUPPORT_PACKAGE> are those used when
-configuring and installing RTEMS.
-
-@section Build the Sample Application
-
-Use the following command to start the build of the sample application: 
-
-@example
-cd tools/hello_world_c
-gmake
-@end example
-
-If no errors are detected during the sample application build, it is
-reasonable to assume that the build of the GNU C/C++ Cross Compiler Tools
-for RTEMS and RTEMS itself for the selected host and target
-combination was done properly. 
-
-@section Application Executable 
-
-If the sample application has successfully been build, then the application
-executable is placed in the following directory: 
-
-@example
-tools/hello_world_c/o-<BOARD_SUPPORT_PACKAGE>/<filename>.exe
-@end example
-
-How this executable is downloaded to the target board is very dependent
-on the BOARD_SUPPORT_PACKAGE selected.
diff --git a/doc/started/started.texi b/doc/started/started.texi
deleted file mode 100644
index 3ed67ec472..0000000000
--- a/doc/started/started.texi
+++ /dev/null
@@ -1,117 +0,0 @@
-\input ../texinfo/texinfo   @c -*-texinfo-*-
-@c %**start of header
-@setfilename started
-@syncodeindex vr fn
-@synindex ky cp
-@paragraphindent 0
-@c @smallbook
-@c %**end of header
-
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@c
-@c   Master file for the Getting Started (C) Guide
-@c
-
-@include ../common/setup.texi
-
-@c
-@c  Now set all the tool version dependent information
-@c
-@include versions.texi
-
-@ignore
-@ifinfo
-@format
-START-INFO-DIR-ENTRY
-* Getting Started with RTEMS for C/C++ Users (started):
-END-INFO-DIR-ENTRY
-@end format
-@end ifinfo
-@end ignore
-
-@c
-@c  Title Page Stuff
-@c
-
-@set edition @value{RTEMS-EDITION}
-@set version @value{RTEMS-VERSION}
-@set update-date @value{RTEMS-UPDATE-DATE}
-@set update-month @value{RTEMS-UPDATE-MONTH}
-
-@c
-@c  I don't really like having a short title page.  --joel
-@c
-@c @shorttitlepage Getting Started with RTEMS
-
-@setchapternewpage odd
-@settitle Getting Started with RTEMS for C/C++ Users
-@titlepage
-@finalout
-
-@title Getting Started with RTEMS for C/C++ Users
-@subtitle Edition @value{edition}, for @value{version}
-@sp 1
-@subtitle @value{update-month}
-@author On-Line Applications Research Corporation
-@page
-@include ../common/cpright.texi
-@end titlepage
-
-@c  This prevents a black box from being printed on "overflow" lines.
-@c  The alternative is to rework a sentence to avoid this problem.
-
-@include intro.texi
-@include require.texi
-@include buildc.texi
-@include buildrt.texi
-@include sample.texi
-@include gdb.texi
-@include nt.texi
-
-@ifinfo
-@node Top, Introduction, (dir), (dir)
-@top started
-
-This is the online version of the Getting Started with RTEMS for C/C++ Users.
-
-@menu
-* Introduction::
-* Requirements::
-* Building the GNU C/C++ Cross Compiler Toolset::
-* Building RTEMS::
-* Building the Sample Application::
-* Building the GNU Debugger::
-* Using MS-Windows as a Development Host::
-@end menu
-
-@c * Command and Variable Index::
-@c * Concept Index::
-@end ifinfo
-@c 
-@c 
-@c Need to copy the emacs stuff and "trailer stuff" (index, toc) into here
-@c
-
-@c @node Command and Variable Index, Concept Index, Installing EGCS AND NEWLIB, Top
-@c @unnumbered Command and Variable Index
-
-@c There are currently no Command and Variable Index entries.
-
-@c @printindex fn
-
-@c @node Concept Index, , Command and Variable Index, Top
-@c @unnumbered Concept Index
-
-@c There are currently no Concept Index entries.
-@c @printindex cp
-
-@contents
-@bye
-
diff --git a/doc/started/versions.texi b/doc/started/versions.texi
deleted file mode 100644
index 63bca0f05b..0000000000
--- a/doc/started/versions.texi
+++ /dev/null
@@ -1,86 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@c
-@c This file contains all toolset version dependent information
-@c
-
-@c 
-@c Comment out setting the "XYZ-RTEMSPATCH" variable if there is no 
-@c patch required.  The documentation will detect this and print 
-@c an appropriate message in a short section.
-@c 
-
-
-@c
-@c  GCC/EGCS Version
-@c
-
-@set GCC-VERSION     egcs 1.1b
-@set GCC-TAR         egcs-1.1b.tar.gz
-@set GCC-UNTAR       egcs-1.1b
-@set GCC-FTPSITE     egcs.cygnus.com
-@set GCC-FTPDIR      /pub/egcs/releases/egcs-1.1b
-@set GCC-HTTPDIR     /pub/egcs/releases/index.html
-@set GCC-RTEMSPATCH  egcs-1.1b-rtems-diff-19981027.gz
-
-@c
-@c  BINUTILS Version
-@c
-
-@c The "official" binutils
-@set BINUTILS-VERSION     binutils 2.9.1
-@set BINUTILS-TAR         binutils-2.9.1.tar.gz
-@set BINUTILS-UNTAR       binutils-2.9.1
-@set BINUTILS-FTPSITE     ftp.gnu.org
-@set BINUTILS-FTPDIR      /pub/gnu
-@set BINUTILS-RTEMSPATCH  binutils-2.9.1-rtems-diff-19981027.gz
-
-@c When forced to use a snapshot
-@c @set BINUTILS-VERSION     gas 980314
-@c @set BINUTILS-TAR         gas-980314.tgz
-@c @set BINUTILS-UNTAR       gas-980314
-@c @set BINUTILS-FTPSITE     ftp.OARcorp.com
-@c @set BINUTILS-FTPDIR      /oarcorp/private/beta3/ada_tools
-@c @set BINUTILS-RTEMSPATCH  binutils-2.8.1-rtems-diff-1998xxxx.gz
-
-@c
-@c  NEWLIB Version
-@c
-
-@set NEWLIB-VERSION     newlib 1.8.0
-@set NEWLIB-TAR         newlib-1.8.0.tar.gz
-@set NEWLIB-UNTAR       newlib-1.8.0
-@set NEWLIB-FTPSITE     ftp.cygnus.com
-@set NEWLIB-FTPDIR      /pub/newlib
-@set NEWLIB-RTEMSPATCH  newlib-1.8.0-rtems-diff-19981027.gz
-
-@c
-@c  GDB Version
-@c
-
-@set GDB-VERSION     gdb 4.17
-@set GDB-TAR         gdb-4.17.tar.gz
-@set GDB-UNTAR       gdb-4.17
-@set GDB-FTPSITE     ftp.gnu.org
-@set GDB-FTPDIR      /pub/gnu
-@set GDB-RTEMSPATCH  gdb-4.17-rtems-diff-19981027.gz
-
-
-@c
-@c  RTEMS Version
-@c
-
-@set RTEMS-VERSION   RTEMS 4.0.0
-@set RTEMS-TAR       rtems-4.0.0.tgz
-@set RTEMS-UNTAR     rtems-4.0.0
-@set RTEMS-FTPSITE   ftp.OARcorp.com
-@set RTEMS-FTPDIR    /pub/rtems/4.0.0
-@set BUILDTOOLS-TAR  c_build_scripts-4.0.0.tgz
-
-
diff --git a/doc/started_ada/Makefile b/doc/started_ada/Makefile
deleted file mode 100644
index 5df0ae5ab8..0000000000
--- a/doc/started_ada/Makefile
+++ /dev/null
@@ -1,88 +0,0 @@
-#
-#  COPYRIGHT (c) 1988-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  All rights reserved.
-#
-#  $Id$
-#
-
-PROJECT=started_ada
-DISTRIBUTION_LEVEL=public
-
-include ../Make.config
-
-all: html info ps
-
-dirs:
-	$(make-dirs)
-
-COMMON_FILES=../common/cpright.texi ../common/setup.texi
-
-GENERATED_FILES= buildada.texi buildrt.texi gdb.texi intro.texi \
-    require.texi sample.texi
-
-FILES= $(PROJECT).texi versions.texi $(GENERATED_FILES)
-
-INFOFILES=$(wildcard $(PROJECT) $(PROJECT)-*)
-
-info: dirs $(PROJECT)
-	#cp $(wildcard $(PROJECT) $(PROJECT)-*) $(INFO_INSTALL)
-	cp $(PROJECT) $(INFO_INSTALL)
-
-$(PROJECT): $(FILES)
-	$(MAKEINFO) $(PROJECT).texi
-
-dvi: $(PROJECT).dvi
-ps: dirs $(PROJECT).ps
-	
-$(PROJECT).ps: $(PROJECT).dvi
-	dvips -o $(PROJECT).ps $(PROJECT).dvi
-	cp $(PROJECT).ps $(PS_INSTALL)
-
-# run texi2dvi twice to generate the xref's properly.
-$(PROJECT).dvi: $(FILES)
-	$(TEXI2DVI) -v $(PROJECT).texi
-
-intro.texi: intro.t versions.texi
-	$(BMENU) -c -p "Top" \
-	    -u "Top" \
-	    -n "Requirements" ${*}.t
-
-require.texi: require.t versions.texi
-	$(BMENU) -c -p "GNAT Chat Mailing List" \
-	    -u "Top" \
-	    -n "Building the GNAT Cross Compiler Toolset" ${*}.t
-
-buildada.texi: buildada.t versions.texi
-	$(BMENU) -c -p "Insure GCC and GNAT Environment Variables Are Not Set" \
-	    -u "Top" \
-	    -n "Building RTEMS" ${*}.t
-
-buildrt.texi: buildrt.t versions.texi
-	$(BMENU) -c -p "Running the bit_ada Script" \
-	    -u "Top" \
-	    -n "Building the Sample Application" ${*}.t
-
-sample.texi: sample.t versions.texi
-	$(BMENU) -c -p "Using the RTEMS configure Script Directly" \
-	    -u "Top" \
-	    -n "Building the GNU Debugger" ${*}.t
-
-gdb.texi: gdb.t versions.texi
-	$(BMENU) -c -p "Application Executable" \
-	    -u "Top" \
-	    -n "" ${*}.t
-
-html: dirs $(FILES)
-	-mkdir -p $(WWW_INSTALL)/$(PROJECT)
-	-cp ../started/pictures/sfile12c.jpg $(WWW_INSTALL)/$(PROJECT)
-	-cp ../started/pictures/bit_ada.jpg $(WWW_INSTALL)/$(PROJECT)
-	$(TEXI2WWW) $(TEXI2WWW_ARGS) -dir $(WWW_INSTALL)/$(PROJECT) \
- 	    $(PROJECT).texi
-
-clean:
-	rm -f *.o $(PROG) *.txt core 
-	rm -f *.dvi *.ps *.log *.aux *.cp *.fn *.ky *.pg *.toc *.tp *.vr $(BASE)
-	rm -f $(PROJECT) $(PROJECT)-* $(GENERATED_FILES)
-	rm -f *.fixed _*
-
diff --git a/doc/started_ada/buildada.t b/doc/started_ada/buildada.t
deleted file mode 100644
index dfd9163ab9..0000000000
--- a/doc/started_ada/buildada.t
+++ /dev/null
@@ -1,541 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Building the GNAT Cross Compiler Toolset
-
-This chapter describes the steps required to acquire the
-source code for a GNU cross compiler toolset, apply 
-any required RTEMS specific patches, compile that 
-toolset and install it.
-
-@section Create the Archive and Build Directories
-
-Start by making the @code{archive} directory to contain the downloaded 
-source code and the @code{tools} directory to be used as a build
-directory.  The command sequence to do this is shown
-below:
-
-@example
-mkdir archive
-mkdir tools
-@end example
-
-This will result in an initial directory structure similar to the
-one shown in the following figure:
-
-@example
-@group
-/whatever/prefix/you/choose/
-        archive/
-        tools/
-
-@end group
-@end example
-
-@c @ifset use-html
-@c @html
-@c <IMG SRC="sfile12c.jpg" WIDTH=417 HEIGHT=178 
-@c     ALT="Starting Directory Organization">
-@c @end html
-@c @end ifset
-
-@section Get All the Pieces 
-
-This section lists the components of an RTEMS cross development system.
-Included are the locations of each component as well as any required RTEMS
-specific patches.
-
-@subheading @value{GCC-VERSION}
-@example
-    FTP Site:    @value{GCC-FTPSITE}
-    Directory:   @value{GCC-FTPDIR}
-    File:        @value{GCC-TAR}
-@ifset use-html
-    URL:         @href{Download @value{GCC-VERSION},,,ftp://@value{GCC-FTPSITE}@value{GCC-FTPDIR}/@value{GCC-TAR}}
-@end ifset
-@end example
-
-@subheading @value{GNAT-VERSION}
-@example
-    FTP Site:    @value{GNAT-FTPSITE}
-    Directory:   @value{GNAT-FTPDIR}
-    File:        @value{GNAT-TAR}
-@ifset use-html
-    URL:         @href{Download @value{GNAT-VERSION},,,ftp://@value{GNAT-FTPSITE}@value{GNAT-FTPDIR}/@value{GNAT-TAR}}
-@end ifset
-@end example
-
-@subheading @value{BINUTILS-VERSION}
-@example
-    FTP Site:    @value{BINUTILS-FTPSITE}
-    Directory:   @value{BINUTILS-FTPDIR}
-    File:        @value{BINUTILS-TAR}
-@ifset use-html
-    URL:         @href{Download @value{BINUTILS-VERSION},,,ftp://@value{BINUTILS-FTPSITE}@value{BINUTILS-FTPDIR}/@value{BINUTILS-TAR}}
-@end ifset
-@end example
-
-@subheading @value{NEWLIB-VERSION}
-@example
-    FTP Site:    @value{NEWLIB-FTPSITE}
-    Directory:   @value{NEWLIB-FTPDIR}
-    File:        @value{NEWLIB-TAR}
-@ifset use-html
-    URL:         @href{Download @value{NEWLIB-VERSION},,,ftp://@value{NEWLIB-FTPSITE}@value{NEWLIB-FTPDIR}/@value{NEWLIB-TAR}}
-@end ifset
-@end example
-
-@subheading @value{RTEMS-VERSION}
-@example
-    FTP Site:    @value{RTEMS-FTPSITE}
-    Directory:   @value{RTEMS-FTPDIR}
-    File:        @value{RTEMS-TAR}
-@ifset use-html
-    URL:         @href{Download RTEMS components,,,ftp://@value{RTEMS-FTPSITE}@value{RTEMS-FTPDIR}}
-@end ifset
-@end example
-
-@subheading RTEMS Hello World
-@example
-    FTP Site:    @value{RTEMS-FTPSITE}
-    Directory:   @value{RTEMS-FTPDIR}
-    File:        hello_world_ada.tgz
-@ifset use-html
-    URL:         @href{Download RTEMS Hello World,,,ftp://@value{RTEMS-FTPSITE}@value{RTEMS-FTPDIR}/ada_tools/hello_world_ada.tgz}
-@end ifset       
-@end example
-
-@subheading RTEMS Specific Tool Patches and Scripts
-@example
-    FTP Site:    @value{RTEMS-FTPSITE}
-    Directory:   @value{RTEMS-FTPDIR}/ada_tools
-    File:        @value{BUILDTOOLS-TAR}
-@ifset BINUTILS-RTEMSPATCH
-    File:        @value{BINUTILS-RTEMSPATCH}
-@end ifset
-@ifset NEWLIB-RTEMSPATCH
-    File:        @value{NEWLIB-RTEMSPATCH}
-@end ifset
-@ifset GCC-RTEMSPATCH
-    File:        @value{GCC-RTEMSPATCH}
-@end ifset
-@ifset GNAT-RTEMSPATCH
-    File:        @value{GNAT-RTEMSPATCH}
-@end ifset
-@ifset use-html
-    URL:         @href{Download RTEMS patches,,,ftp://@value{RTEMS-FTPSITE}@value{RTEMS-FTPDIR}/ada_tools}
-@end ifset
-@end example
-
-@section Unarchiving the Tools
-
-While in the @code{tools} directory, unpack the compressed
-tar files using the following command sequence: 
-
-@example
-cd tools
-tar xzf ../archive/@value{GCC-TAR}
-tar xzf ../archive/@value{GNAT-TAR}
-tar xzf ../archive/@value{BINUTILS-TAR}
-tar xzf ../archive/@value{NEWLIB-TAR}
-tar xzf ../archive/@value{BUILDTOOLS-TAR}
-@end example
-
-After the compressed tar files have been unpacked, the following
-directories will have been created under tools. 
-
-@itemize @bullet
-@item @value{BINUTILS-UNTAR}
-@item @value{GCC-UNTAR}
-@item @value{GNAT-UNTAR}
-@item @value{NEWLIB-UNTAR}
-@end itemize
-
-There will also be a set of scripts in the current directory
-which aid in building the tools and RTEMS.  They are:
-
-@itemize @bullet
-@item bit_ada
-@item bit_gdb
-@item bit_rtems
-@item common.sh
-@item user.cfg
-@end itemize
-
-When the @code{bit_ada} script is executed later in this process,
-it will automatically create two other subdirectories:
-
-@itemize @bullet
-@item src
-@item build-$@{CPU@}-tools
-@end itemize
-
-Similarly, the @code{bit_gdb} script will create the
-subdirectory @code{build-$@{CPU@}-gdb} and
-the @code{bit_rtems} script will create the
-subdirectory @code{build-$@{CPU@}-rtems}.
-
-The directory tree should look something like the following figure:
-
-@example
-@group
-/whatever/prefix/you/choose/
-        archive/
-            @value{GCC-TAR}
-            @value{GNAT-TAR}
-            @value{BINUTILS-TAR}
-            @value{NEWLIB-TAR}
-            @value{RTEMS-TAR}
-            @value{BUILDTOOLS-TAR}
-@ifset GCC-RTEMSPATCH
-            @value{GCC-RTEMSPATCH}
-@end ifset
-@ifset BINUTILS-RTEMSPATCH
-            @value{BINUTILS-RTEMSPATCH}
-@end ifset
-@ifset NEWLIB-RTEMSPATCH
-            @value{NEWLIB-RTEMSPATCH}
-@end ifset
-@ifset GNAT-RTEMSPATCH
-            @value{GNAT-RTEMSPATCH}
-@end ifset
-            hello_world_ada.tgz
-            bit_ada
-        tools/
-            @value{BINUTILS-UNTAR}/
-            @value{GCC-UNTAR}/
-            @value{GNAT-UNTAR}/
-            @value{NEWLIB-UNTAR}/
-            @value{RTEMS-UNTAR}/
-            bit_ada
-            bit_gdb
-            bit_rtems
-            common.sh
-            user.cfg
-@end group
-@end example
-
-@c @ifset use-html
-@c @html
-@c <IMG SRC="bit_ada.jpg" WIDTH=816 HEIGHT=267 ALT="Directory Organization">
-@c @end html
-@c @end ifset
-
-@c
-@c  Host Specific Notes
-@c
-
-@section Host Specific Notes
-
-@subsection Solaris 2.x
-
-The build scripts are written in "shell".  The program @code{/bin/sh}
-on Solaris 2.x is not robust enough to execute these scripts.  If you 
-are on a Solaris 2.x host, then change the first line of the files
-@code{bit_ada}, @code{bit_gdb}, and @code{bit_rtems} to use the
-@code{/bin/ksh} shell instead.
-
-@c
-@c  Reading the Documentation
-@c
-
-@section Reading the Tools Documentation
-
-Each of the tools in the GNU development suite comes with documentation.
-It is in the reader's and tool maintainers' interest that one read the
-documentation before posting a problem to a mailing list or news group.
-
-
-@c
-@c  GCC patches
-@c
-
-@section Apply RTEMS Patch to GCC
-
-@ifclear GCC-RTEMSPATCH
-No RTEMS specific patches are required for @value{GCC-VERSION} to
-support @value{RTEMS-VERSION}.
-@end ifclear
-
-@ifset GCC-RTEMSPATCH
-
-Apply the patch using the following command sequence:
-
-@example
-cd tools/@value{GCC-UNTAR}
-zcat ../../archive/@value{GCC-RTEMSPATCH} | patch -p1
-@end example
-
-Check to see if any of these patches have been rejected using the following
-sequence:
-
-@example
-cd tools/@value{GCC-UNTAR}
-find . -name "*.rej" -print
-@end example
-
-If any files are found with the .rej extension, a patch has been rejected.
-This should not happen with a good patch file which is properly applied.
-
-@end ifset
-
-@c
-@c  BINUTILS patches
-@c
-
-@section Apply RTEMS Patch to binutils
-
-@ifclear BINUTILS-RTEMSPATCH
-No RTEMS specific patches are required for @value{BINUTILS-VERSION} to
-support @value{RTEMS-VERSION}.
-@end ifclear
-
-@ifset BINUTILS-RTEMSPATCH
-Apply the patch using the following command sequence:
-
-@example
-cd tools/@value{BINUTILS-UNTAR}
-zcat ../../archive/@value{BINUTILS-RTEMSPATCH} | patch -p1
-@end example
-
-Check to see if any of these patches have been rejected using the following
-sequence: 
-
-@example
-cd tools/@value{BINUTILS-UNTAR}
-find . -name "*.rej" -print
-@end example
-
-If any files are found with the .rej extension, a patch has been rejected.
-This should not happen with a good patch file which is properly applied. 
-
-@end ifset
-
-@c
-@c  Newlib patches
-@c
-
-@section Apply RTEMS Patch to newlib
-
-@ifclear NEWLIB-RTEMSPATCH
-No RTEMS specific patches are required for @value{NEWLIB-VERSION} to
-support @value{RTEMS-VERSION}.
-@end ifclear
-
-@ifset NEWLIB-RTEMSPATCH
-
-Apply the patch using the following command sequence:
-
-@example
-cd tools/@value{NEWLIB-UNTAR}
-zcat ../../archive/@value{NEWLIB-RTEMSPATCH} | patch -p1
-@end example
-
-Check to see if any of these patches have been rejected using the following
-sequence: 
-
-@example
-cd tools/@value{NEWLIB-UNTAR}
-find . -name "*.rej" -print
-@end example
-
-If any files are found with the .rej extension, a patch has been rejected.
-This should not happen with a good patch file which is properly applied. 
-
-@end ifset
-
-@c  
-@c  GNAT patches
-@c
-
-@section Apply RTEMS Patch to GNAT
-
-@ifclear GNAT-RTEMSPATCH
-No RTEMS specific patches are required for @value{GNAT-VERSION} to
-support @value{RTEMS-VERSION}.
-@end ifclear
-
-@ifset GNAT-RTEMSPATCH
-
-Apply the patch using the following command sequence:
-
-@example
-cd tools/@value{GNAT-UNTAR}
-zcat ../../archive/@value{GNAT-RTEMSPATCH} | patch -p1
-@end example
-
-Check to see if any of these patches have been rejected using the following
-sequence:
-
-@example
-cd tools/@value{GNAT-UNTAR}
-find . -name "*.rej" -print
-@end example
-
-If any files are found with the .rej extension, a patch has been rejected.
-This should not happen with a good patch file which is properly applied.
-
-@end ifset
-
-@c
-@c  Copy the ada directory
-@c 
-
-
-@section Copy the ada Subdirectory to the GCC Source Tree
-
-Copy the ada subtree in the patched subtree of
-tools/@value{GNAT-UNTAR}/src to the
-tools/@value{GCC-UNTAR} directory:
-
-@example
-cd tools/@value{GNAT-UNTAR}/src
-cp -r ada ../../@value{GCC-UNTAR}
-@end example
-
-@c
-@c  Localizing the Configuration
-@c
-
-@section Localizing the Configuration
-
-Edit the @code{user.cfg} file to alter the settings of various
-variables which are used to tailor the build process.
-Each of the variables set in @code{user.cfg} may be modified
-as described below:
-
-@table @code
-@item INSTALL_POINT
-is the location where you wish the GNU C/C++ cross compilation tools for
-RTEMS to be built. It is recommended that the directory chosen to receive
-these tools be named so that it is clear from which egcs distribution it
-was generated and for which target system the tools are to produce code for.
-
-@b{WARNING}: The @code{INSTALL_POINT} should not be a subdirectory
-under the build directory.  The build directory will be removed
-automatically upon successful completion of the build procedure.
-
-@item BINUTILS
-is the directory under tools that contains @value{BINUTILS-UNTAR}.
-For example:
-
-@example
-BINUTILS=@value{BINUTILS-UNTAR}
-@end example
-
-@item GCC
-is the directory under tools that contains @value{GCC-UNTAR}.
-For example,
-
-@example
-GCC=@value{GCC-UNTAR}
-@end example
-
-Note that the gnat version is not needed because the gnat source 
-is built as part of building gcc.
-
-@item NEWLIB
-is the directory under tools that contains @value{NEWLIB-UNTAR}.
-For example:
-
-@example
-NEWLIB=@value{NEWLIB-UNTAR}
-@end example
-
-@item BUILD_DOCS
-is set to "yes" if you want to install documentation.
-For example:
-
-@example
-BUILD_DOCS=yes
-@end example
-
-@item BUILD_OTHER_LANGUAGES
-is set to "yes" if you want to build languages other than C and C++.  At
-the current time, this enables Fortan and Objective-C.
-For example:
-
-@example
-BUILD_OTHER_LANGUAGES=yes
-@end example
-
-@item RTEMS
-is the directory under tools that contails @value{RTEMS-UNTAR}.
-
-@item ENABLE_RTEMS_POSIX
-is set to "yes" if you want to enable the RTEMS POSIX API support.
-At this time, this feature is not supported by the UNIX ports of RTEMS
-and is forced to "no" for those targets.  This corresponds to the
-@code{configure} option @code{--enable-posix}.
-
-This must be enabled to support the GNAT/RTEMS run-time.
-
-@item ENABLE_RTEMS_TESTS
-is set to "yes" if you want to build the RTEMS Test Suite.  If this
-is set to "no", then only the Sample Tests will be built.
-This corresponds to the @code{configure} option @code{--enable-tests}.
-
-@item ENABLE_RTEMS_TCPIP
-is set to "yes" if you want to build the RTEMS TCP/IP Stack.  If a
-particular BSP does not support TCP/IP, then this feature is automatically
-disabled.  This corresponds to the @code{configure} option
-@code{--enable-tcpip}.
-
-@item ENABLE_RTEMS_CXX
-is set to "yes" if you want to build the RTEMS C++ support including
-the C++ Wrapper for the Classic API.  This corresponds to the
-@code{configure} option @code{--enable-cxx}.
-@end table
-
-@section Running the bit_ada Script
-
-After the @code{bit_ada} script has been modified to reflect the
-local installation, the modified @code{bit_ada} script is run
-using the following sequence:
-
-@example
-cd tools
-./bit_ada <target configuration>
-@end example
-
-Where <target configuration> is one of the following:
-
-@itemize @bullet
-@item hppa1.1
-@item i386
-@item i386-elf
-@item i386-go32
-@item i960
-@item m68k
-@item mips64orion
-@item powerpc
-@item sh
-@item sparc
-@end itemize
-
-NOTE:  The above list of target configurations is the list of RTEMS supported
-targets.  Only a subset of these have been tested with GNAT/RTEMS.  For more
-information, contact your GNAT/RTEMS representative.
-
-If no errors are encountered, the @code{bit_ada} script will conclude by 
-printing messages similar to the following:
-
-@example
-
-The src and build-i386-tools subdirectory may now be removed.
-
-Started:  Fri Apr 10 10:14:07 CDT 1998
-Finished: Fri Apr 10 12:01:33 CDT 1998
-@end example
-
-If the @code{bit_ada} script successfully completes, then the
-GNU C/C++ cross compilation tools are installed.
-
-If the @code{bit_ada} script does not successfully complete, then investigation
-will be required to determine the source of the error.
-
diff --git a/doc/started_ada/buildrt.t b/doc/started_ada/buildrt.t
deleted file mode 100644
index bb1186aa5a..0000000000
--- a/doc/started_ada/buildrt.t
+++ /dev/null
@@ -1,141 +0,0 @@
-@c
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Building RTEMS
-
-@section Unpack the RTEMS Source
-
-Use the following command sequence to unpack the RTEMS source into the
-tools directory: 
-
-@example
-cd tools
-tar xzf ../archive/@value{RTEMS-TAR}
-@end example
-
-@section Add <INSTALL_POINT>/bin to Executable PATH
-
-In order to compile RTEMS, you must have the cross compilation toolset
-in your search patch.  The following command appends the directory
-where the tools were installed in the previous chapter:
-
-@example
-export PATH=$PATH:<INSTALL_POINT>/bin
-@end example
-
-@b{NOTE:}  The above command is in Bourne shell (@code{sh}) syntax and should
-work with the Korn (@code{ksh}) and GNU Bourne Again Shell (@code{bash}).  
-It will not work with the C Shell (@code{csh})or derivatives of the C Shell.
-
-@section Verifying the Operation of the Cross Toolset
-
-In order to insure that the cross-compiler is invoking the correct
-subprograms (like @code{as} and @code{ld}), one can test assemble
-a small program.  When in verbose more, @code{gcc} prints out information
-showing where it found the subprograms it invokes.  Place the following
-function in a file named @code{f.c}:
-
-@example
-int f( int x )
-@{
-  return x + 1; 
-@}
-@end example
-
-Then assemble the file using a command similar to the following:
-
-@example 
-m68k-rtems-gcc -v -S f.c
-@end example
-
-Where @code{m68k-rtems-gcc} should be changed to match the installed
-name of your cross compiler.  The result of this command will be
-a sequence of output showing where the cross-compiler searched for
-and found its subcomponents.  Verify that these paths correspond
-to your <INSTALL_POINT>.
-
-@b{NOTE:} One of the most common installation errors is for the
-cross-compiler not to be able to find the cross assembler and default
-to using the native @code{as}.  This can result in very confusing
-error messages.
-
-@section Generate RTEMS for a Specific Target and BSP
-
-@subsection Using the bit_rtems script
-
-The simplest way to build RTEMS is to use the @code{bit_rtems} script.
-This script interprets the settings in the @code{user.cfg} file to
-enable or disable the various RTEMS options.  
-
-This script is invoked as follows: 
-
-@example
-./bit_rtems CPU [BSP]
-@end example
-
-Where CPU is one of the RTEMS supported CPU families from the following
-list:
-
-@itemize @bullet
-@item hppa1.1
-@item i386
-@item i386-elf
-@item i386-go32
-@item i960
-@item m68k
-@item mips64orion
-@item powerpc
-@item sh
-@item sparc
-@end itemize
-
-BSP is a supported BSP for the selected CPU family.  The list of
-supported BSPs may be found in the file 
-tools/@value{RTEMS-UNTAR}/README.configure
-in the RTEMS source tree.  If the BSP parameter is not specified,
-then all supported BSPs for the selected CPU family will be built.
-
-@b{NOTE:}  The POSIX API must be enabled to use GNAT/RTEMS.
-
-@subsection Using the RTEMS configure Script Directly
-
-Make a build directory under tools and build the RTEMS product in this
-directory. The ../@value{RTEMS-UNTAR}/configure
-command has numerous command line
-arguments. These arguments are discussed in detail in documentation that
-comes with the RTEMS distribution. In the installation described in the
-section "Unpack the RTEMS source", these configuration options can be found
-in the file tools/@value{RTEMS-UNTAR}/README.configure.
-
-The GNAT/RTEMS run-time implementation is based on the POSIX API.  Thus
-the RTEMS configuration for a GNAT/RTEMS environment MUST include the
-@code{--enable-posix} flag.
-
-The following shows the command sequence required to configure,
-compile, and install RTEMS with the POSIX API enabled.
-RTEMS will be built to target the @code{BOARD_SUPPORT_PACKAGE} board.
-
-@example
-mkdir build-rtems
-cd build-rtems
-../@value{RTEMS-UNTAR}/configure --target=<TARGET_CONFIGURATION> \
-    --enable-posix \
-    --enable-rtemsbsp=<BOARD_SUPPORT_PACKAGE>\
-    --prefix=<INSTALL_POINT>
-gmake all install
-@end example
-
-Where the list of currently supported of <TARGET_CONFIGURATION>'s and
-<BOARD_SUPPORT_PACKAGE>'s can be found in
-tools/@value{RTEMS-UNTAR}/README.configure.
-
-<INSTALL_POINT> is the installation point from the previous step
-"Modify the bit_ada Script" in the build of the tools. 
-
-
diff --git a/doc/started_ada/gdb.t b/doc/started_ada/gdb.t
deleted file mode 100644
index 6d760ddfc2..0000000000
--- a/doc/started_ada/gdb.t
+++ /dev/null
@@ -1,232 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Building the GNU Debugger
-
-GDB is not currently RTEMS aware. The following configurations have been
-successfully used with RTEMS applications:
-
-@itemize @bullet
-@item Sparc Instruction Simulator (SIS)
-@item PowerPC Instruction Simulator (PSIM)
-@item DINK32
-@end itemize
-
-Other configurations of gdb have successfully been used by RTEMS users
-but are not documented here.
-
-@section Unarchive the gdb Distribution
-
-Use the following commands to unarchive the gdb distribution:
-
-@example
-cd tools
-tar xzf ../archive/@value{GDB-TAR}
-@end example
-
-The directory @value{GDB-UNTAR} is created under the tools directory.
-
-@c 
-@c  GDB GNAT Patch
-@c
-
-@section Apply GNAT Patch to GDB
-
-@ifclear GDB-GNATPATCH 
-No GNAT specific patches are required for @value{GDB-VERSION} to
-support @value{RTEMS-VERSION} and @value{GNAT-VERSION}.
-@end ifclear
-
-@ifset GDB-GNATPATCH
-
-Apply the patch using the following command sequence:
-
-@example
-cd tools/@value{GDB-UNTAR}
-zcat archive/@value{GDB-GNATPATCH} | patch -p1
-@end example
-
-Check to see if any of these patches have been rejected using the following
-sequence:
-
-@example
-cd tools/@value{GDB-UNTAR}
-find . -name "*.rej" -print
-@end example
-
-If any files are found with the .rej extension, a patch has been rejected.
-This should not happen with a good patch file.
-
-To see the files that have been modified use the sequence:
-
-@example
-cd tools/@value{GDB-UNTAR}
-find . -name "*.orig" -print
-@end example
-
-The files that are found, have been modified by the patch file.
-
-@end ifset
-
-@c
-@c  GDB RTEMS Patch
-@c
-
-@section Apply RTEMS Patch to GDB
-
-@ifclear GDB-RTEMSPATCH
-No RTEMS specific patches are required for @value{GDB-VERSION} to
-support @value{RTEMS-VERSION}.
-@end ifclear
-
-@ifset GDB-RTEMSPATCH
-
-Apply the patch using the following command sequence:
-
-@example
-cd tools/@value{GDB-UNTAR}
-zcat archive/@value{GDB-RTEMSPATCH} | patch -p1
-@end example
-
-Check to see if any of these patches have been rejected using the following
-sequence:
-
-@example
-cd tools/@value{GDB-UNTAR}
-find . -name "*.rej" -print
-@end example
-
-If any files are found with the .rej extension, a patch has been rejected.
-This should not happen with a good patch file.
-
-To see the files that have been modified use the sequence:
-
-@example
-cd tools/@value{GDB-UNTAR}
-find . -name "*.orig" -print
-@end example
-
-The files that are found, have been modified by the patch file.
-
-@end ifset
-
-
-@section GDB with Sparc Instruction Simulation (SIS)
-
-@subheading Make the Build Directory
-
-Create a build directory for the SIS Debugger
-
-@example
-cd tools
-mkdir build-sis
-@end example
-
-@subheading Configure for the Build
-
-Configure the GNU Debugger for the
-Sparc Instruction Simulator (SIS):
-
-@example
-cd tools/build-sis
-../@value{GDB-UNTAR}/configure --target-sparc-erc32-aout \
-    --program-prefix=sparc-rtems- \
-    --disable-gdbtk \
-    --enable-targets=all \
-    --prefix=<INSTALL_POINT_FOR_SIS>
-@end example
-
-Where <INSTALL_POINT_FOR_SIS> is a unique location where the gdb
-with SIS will be created. 
-
-@subheading Make the Debugger
-
-From tools/build-sis execute the following command sequence:
-
-@example
-gmake all install
-@end example
-
-
-@section GDB with PowerPC Instruction Simulator
-
-@subheading Make the Build Directory
-
-Create a build directory for the SIS Debugger
-
-@example
-cd tools
-mkdir build-ppc
-@end example
-
-@subheading Configure for the Build
-
-Configure the GNU Debugger for the PowerPC
-Instruction Simulator (PSIM):
-
-@example
-cd tools/build-ppc
-../@value{GDB-UNTAR}/configure \
-      --target=powerpc-unknown-eabi \
-      --program-prefix=powerpc-rtems- \
-      --enable-sim-powerpc \
-      --enable-sim-timebase \
-      --enable-sim-inline \
-      --enable-sim-hardware \
-      --enable-targets=all \
-      --prefix=<INSTALL_POINT_FOR_PPC>
-@end example
-
-Where <INSTALL_POINT_FOR_PPC> is a unique location where the gdb
-with PSIM will be created. 
-
-
-@subheading Make the Debugger
-
-From tools/build-ppc execute the following command sequence:
-
-@example
-gmake all install
-@end example
-
-
-@section GDB for DINK32
-
-@subheading Make the Build Directory
-
-Create a build directory for the DINK32 Debugger
-
-@example
-cd tools
-mkdir build-dink32
-@end example
-
-@subheading Configure for the Build
-
-Configure the GNU Debugger to communicate with
-the DINK32 ROM monitor:
-
-@example
-cd tools/build-dink32
-../@value{GDB-UNTAR}/configure --target-powerpc-elf \
-    --program-prefix=powerpc-rtems- \
-    --enable-targets=all \
-    --prefix=<INSTALL_POINT_FOR_DINK32>
-@end example
-
-Where <INSTALL_POINT_FOR_DINK32> is a unique location where the
-gdb Dink32 will be created. 
-
-@subheading Make the Debugger
-
-From tools/build-dink32 execute the following command sequence:
-
-@example
-gmake all install
-@end example
-
diff --git a/doc/started_ada/intro.t b/doc/started_ada/intro.t
deleted file mode 100644
index 823b83dd06..0000000000
--- a/doc/started_ada/intro.t
+++ /dev/null
@@ -1,161 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Introduction
-
-The purpose of this document is to guide you through the process of 
-installing a GNU cross development environment to use with RTEMS.
-
-If you are already familiar with the concepts behind a cross compiler and
-have a background in Unix, these instructions should provide the bare
-essentials for performing a setup of the following items: 
-
-@itemize @bullet
-@item GNAT/RTEMS Cross Compilation Tools on your host system
-@item RTEMS OS for the target host
-@item GDB Debugger
-@end itemize
-
-The remainder of this chapter provides background information on real-time
-embedded systems and cross development and an overview of other 
-resources of interest on the Internet.  If you are not familiar with 
-real-time embedded systems or the other areas, please read those sections.  
-These sections will help familiarize you with the
-types of systems RTEMS is designed to be used in and the cross development
-process used when developing RTEMS applications.
-
-@section Real-Time Embedded Systems
-
-Real-time embedded systems are found in practically every facet of our
-everyday lives.  Today's systems range from the common telephone, automobile
-control systems, and kitchen appliances to complex air traffic control
-systems, military weapon systems, an d production line control including
-robotics and automation. However, in the current climate of rapidly changing
-technology, it is difficult to reach a consensus on the definition of a
-real-time embedded system. Hardware costs are continuing to rapidly decline 
-while at the same time the hardware is increasing in power and functionality.
-As a result, embedded systems that were not considered viable two years ago
-are suddenly a cost effective solution. In this domain, it is not uncommon
-for a single hardware configuration to employ a variety of architectures and
-technologies. Therefore, we shall define an embedded system as any computer
-system that is built into a larger system consisting of multiple technologies
-such as digital and analog electronics,  mechanical devices, and sensors.
-
-Even as hardware platforms become more powerful, most embedded systems are
-critically dependent on the real-time software embedded in the systems
-themselves.  Regardless of how efficiently the hardware operates, the
-performance of the embedded real-time software determines the success of the
-system.  As the complexity of the embedded hardware platform grows, so does
-the size and complexity of the embedded software. Software systems must
-routinely perform activities which were only dreamed of a short time ago.
-These large, complex, real-time embedded applications now commonly contain
-one million lines of code or more.
-
-Real-time embedded systems have a complex set of characteristics that
-distinguish them from other software applications.  Real-time embedded
-systems are driven by and must respond to real world events while adhering to
-rigorous requirements imposed by the environment with which they interact. 
-The correctness of the system depends not only on the results of
-computations, but also on the time at which the results are produced.  The
-most important and complex characteristic of real-time application systems is
-that they must receive and respond to a set of external stimuli within rigid
-and critical time constraints. 
-
-A single real-time application can be composed of both soft and hard
-real-time components. A typical example of a hard real-time system is a
-nuclear reactor control system that must not only detect failures, but must
-also respond quickly enough to prevent a meltdown. This application also has
-soft real-time requirements because it may involve a man-machine interface.
-Providing an interactive input to the control system is not as critical as
-setting off an alarm to indicate a failure condition. However, th e
-interactive system component must respond within an acceptable time limit to
-allow the operator to interact efficiently with the control system. 
-
-@section Cross Development
-
-Today almost all real-time embedded software systems are developed in a 
-@b{cross development} environment using cross development tools. In the cross
-development environment, software development activities are typically
-performed on one computer system, the @b{host} system, while the result of the
-development effort (produced by the cross tools) is a software system that
-executes on the @b{target} platform. The requirements for the target platform are
-usually incompatible and quite often in direct conflict with the requirements
-for the host.  Moreover, the target hardware is often custom designed for a
-particular project.  This means that the cross development toolset must allow
-the developer to customize the tools to address target specific run-time
-issues.  The toolset must have provisions for board dependent initialization
-code, device drivers, and error handling code. 
-
-The host computer is optimized to support the code development cycle with
-support for code editors, compilers, and linkers requiring large disk drives,
-user development windows, and multiple developer connections.  Thus the host
-computer is typically a traditional UNIX workstation such as are available
-from SUN or Silicon Graphics, or a PC running either a version of MS-Windows
-or UNIX.  The host system may also be required to execute office productivity
-applications to allow the software developer to write  documentation, make
-presentations, or track the project's progress using a project management
-tool.  This necessitates that the host computer be general purpose with
-resources such as a thirty-two or sixty-four bit processor, large amounts of
-RAM, a  monitor, mouse, keyboard, hard and floppy disk drives, CD-ROM drive,
-and a graphics card.  It is likely that the system will be multimedia capable
-and have some networking capability. 
-
-Conversely, the target platform generally has limited traditional computer
-resources.  The hardware is designed for the particular functionality and
-requirements of the embedded system and optimized to perform those tasks
-effectively.  Instead of hard  driverss and keyboards, it is composed of
-sensors, relays, and stepper motors. The per-unit cost of the target platform
-is typically a critical concern.  No hardware component is included without
-being cost justified.  As a result, the processor of the target system is
-often from a different processor family than that of the host system and
-usually has lower performance.  In addition to the processor families
-targeted only for use in embedded systems, there are versions of nearly every
-general-purpose process or specifically tailored for real-time embedded
-systems.  For example, many of the processors targeting the embedded market
-do not include hardware floating point units, but do include peripherals such
-as timers, serial controllers, or network interfaces. 
-
-@section Resources on the Internet
-
-This section describes various resources on the Internet which are of
-use to GNAT/RTEMS users.
-
-@subsection RTEMS Mailing List
-
-rtems-list@@OARcorp.com
-
-This mailing list is dedicated to discussion of issues related
-to RTEMS.  If you have questions about RTEMS, wish to make
-suggestions, or just want to pick up hints, this is a good
-list to subscribe to.  Subscribe by sending a message with
-the one line "subscribe" to rtems-list-request@@OARcorp.com.
-
-@subsection CrossGCC Mailing List
-
-crossgcc@@cygnus.com
-
-This mailing list is dedicated to the use of the GNU tools in
-cross development environments.  Most of the discussions
-focus on embedded issues.  Subscribe by sending a message with
-the one line "subscribe" to crossgcc-request@@cygnus.com.
-
-The crossgcc FAQ as well as a number of patches and utiliities
-of interest to cross development system users are available
-at ftp://ftp.cygnus.com/pub/embedded/crossgcc.
-
-@subsection GNAT Chat Mailing List
-
-chat@@gnat.com
-
-This mailing list is dedicated to the general discussion
-of GNAT specific issues.  The discussions try to avoid
-more general Ada95 language issues which have other
-forums.  Subscribe by sending a message with
-the one line "subscribe" to chat-request@@gnat.com.
-
-
diff --git a/doc/started_ada/require.t b/doc/started_ada/require.t
deleted file mode 100644
index 6a9c02ff2f..0000000000
--- a/doc/started_ada/require.t
+++ /dev/null
@@ -1,102 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Requirements
-
-A fairly large amount of disk space is required to perform the build of the
-GNU C/C++ Cross Compiler Tools for RTEMS. The following table may help in
-assessing the amount of disk space required for your installation: 
-
-@example
-+----------------------------------------+------------------------------+
-|                Component               |     Disk Space Required      |
-+----------------------------------------+------------------------------+
-|          archive directory             |          30 Mbytes           |
-|          tools src unzipped            |         100 Mbytes           |
-|    each individual build directory     |    300 Mbytes worst case     |
-|       each installation directory      |        20-130 Mbytes         |
-+----------------------------------------+------------------------------+
-@end example
-
-The disk space required for each installation directory depends 
-primarily on the number of RTEMS BSPs which are to be installed.
-If a single BSP is installed, then the size of each install directory 
-will tend to be in the 40-60 Mbyte range.
-
-The instructions in this manual should work on any computer running
-a UNIX variant.  Some native GNU tools are used by this procedure
-including:
-
-@itemize @bullet
-@item GCC
-@item GNAT
-@item GNU make
-@end itemize
-
-In addition, some native utilities may be deficient for building 
-the GNU tools.
-
-@section Native GNAT
-
-The native GNAT must be installed in the default location or built
-from source.  No GCC or GNAT environment variables should be set during
-the build or use of the cross GNAT/RTEMS toolset as this could result in
-an unpredictable mix of native and cross toolsets.
-
-Binaries for native GNAT installations are available at the primary
-GNAT ftp site (@value{GNAT-FTP}.   Installation instructions are
-included with the binary GNAT distributions.  The binary installation
-should be installed in the default location or installed in a 
-non-default location and used ONLY to build a native GNAT from source.
-This final native GNAT will be used to build the GNAT/RTEMS cross
-development toolset.
-
-@subsection Verifying Correct Operation of Native GNAT
-
-It is imperative that the native GNAT installation work correctly for 
-the installation of GNAT/RTEMS to succeed.  It is recommended that the
-user verify that the native GNAT is installed correctly by performing
-these tests:
-
-@subsubsection Native Hello World Test
-
-Place the following Ada source code in hello.adb:
-
-@example
-with Text_IO; use Text_IO;
-
-procedure Hello is
-begin
-   Put_Line ( "Hello World");
-end Hello;
-@end example
-
-Use the following command sequence to ompile and execute the above program:
-
-@example
-gnatmake hello
-./hello
-@end example
-
-If the message @code{Hello World} is printed, then the native installation
-of GNAT operates well enough to proceed.
-
-@subsubsection Insure GCC and GNAT Environment Variables Are Not Set
-
-If any of the following commands produce output, then you have
-environment variables overriding the default behavior of the
-native GNAT toolset.  These variables will conflict with the cross
-toolset.  Please resolve this problem before proceeding further.
-
-@example
-echo $GCC_EXEC_PREFIX
-echo $ADA_INCLUDE_PATH
-echo $ADA_OBJECTS_PATH
-echo $LD_RUN_PATH
-echo $C_INCLUDE_PATH
-@end example
diff --git a/doc/started_ada/sample.t b/doc/started_ada/sample.t
deleted file mode 100644
index 2fd72f4343..0000000000
--- a/doc/started_ada/sample.t
+++ /dev/null
@@ -1,54 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Building the Sample Application
-
-@section Unpack the Sample Application 
-
-Use the following command to unarchive the sample application:
-
-@example
-cd tools
-tar xzf ../archive/hello_world_ada.tgz
-@end example
-
-@section Create a BSP Specific Makefile
-
-Provided are example Makefiles for multiple BSPs.  Copy one of these to
-the file Makefile.<BOARD_SUPPORT_PACKAGE> and edit it as appropriate for
-your local configuration.
-
-Use the  <INSTALLATION_POINT> and <BOARD_SUPPORT_PACKAGE> specified when
-configuring and installing RTEMS.
-
-@section Build the Sample Application
-
-Use the following command to start the build of the sample application: 
-
-@example
-cd tools/hello_world_ada
-gmake -f Makefile.<BOARD_SUPPORT_PACKAGE>
-@end example
-
-If the BSP specific modifications to the Makefile were correct and
-no errors are detected during the sample application build, it is
-reasonable to assume that the build of the GNAT/RTEMS Cross Compiler Tools
-for RTEMS and RTEMS itself for the selected host and target
-combination was done properly. 
-
-@section Application Executable 
-
-If the sample application has successfully been build, then the application
-executable is placed in the following directory: 
-
-@example
-tools/hello_world_ada/o-<BOARD_SUPPORT_PACKAGE>/<filename>.exe
-@end example
-
-How this executable is downloaded to the target board is very dependent
-on the BOARD_SUPPORT_PACKAGE selected.
diff --git a/doc/started_ada/started_ada.texi b/doc/started_ada/started_ada.texi
deleted file mode 100644
index a6809734ff..0000000000
--- a/doc/started_ada/started_ada.texi
+++ /dev/null
@@ -1,115 +0,0 @@
-\input ../texinfo/texinfo   @c -*-texinfo-*-
-@c %**start of header
-@setfilename started_ada
-@syncodeindex vr fn
-@synindex ky cp
-@paragraphindent 0
-@c @smallbook
-@c %**end of header
-
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@c
-@c   Master file for the Getting Started (C) Guide
-@c
-
-@include ../common/setup.texi
-
-@c
-@c  Now set all the tool version dependent information
-@c
-@include versions.texi
-
-@ignore
-@ifinfo
-@format
-START-INFO-DIR-ENTRY
-* Getting Started with GNAT/RTEMS (started_ada):
-END-INFO-DIR-ENTRY
-@end format
-@end ifinfo
-@end ignore
-
-@c
-@c  Title Page Stuff
-@c
-
-@set edition @value{RTEMS-EDITION}
-@set version @value{RTEMS-VERSION}
-@set update-date @value{RTEMS-UPDATE-DATE}
-@set update-month @value{RTEMS-UPDATE-MONTH}
-
-@c
-@c  I don't really like having a short title page.  --joel
-@c
-@c @shorttitlepage Getting Started with RTEMS
-
-@setchapternewpage odd
-@settitle Getting Started with GNAT/RTEMS
-@titlepage
-@finalout
-
-@title Getting Started with GNAT/RTEMS
-@subtitle Edition @value{edition}, for @value{version}
-@sp 1
-@subtitle @value{update-month}
-@author On-Line Applications Research Corporation
-@page
-@include ../common/cpright.texi
-@end titlepage
-
-@c  This prevents a black box from being printed on "overflow" lines.
-@c  The alternative is to rework a sentence to avoid this problem.
-
-@include intro.texi
-@include require.texi
-@include buildada.texi
-@include buildrt.texi
-@include sample.texi
-@include gdb.texi
-
-@ifinfo
-@node Top, Introduction, (dir), (dir)
-@top started_ada
-
-This is the online version of the Getting Started with GNAT/RTEMS.
-
-@menu
-* Introduction::
-* Requirements::
-* Building the GNAT Cross Compiler Toolset::
-* Building RTEMS::
-* Building the Sample Application::
-* Building the GNU Debugger::
-@end menu
-
-@c * Command and Variable Index::
-@c * Concept Index::
-@end ifinfo
-@c 
-@c 
-@c Need to copy the emacs stuff and "trailer stuff" (index, toc) into here
-@c
-
-@c @node Command and Variable Index, Concept Index, GDB for DINK32, Top
-@c @unnumbered Command and Variable Index
-
-@c There are currently no Command and Variable Index entries.
-
-@c @printindex fn
-
-@c @node Concept Index, , Command and Variable Index, Top
-@c @unnumbered Concept Index
-
-@c There are currently no Concept Index entries.
-@c @printindex cp
-
-@contents
-@bye
-
diff --git a/doc/started_ada/versions.texi b/doc/started_ada/versions.texi
deleted file mode 100644
index d238b85558..0000000000
--- a/doc/started_ada/versions.texi
+++ /dev/null
@@ -1,96 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@c
-@c This file contains all toolset version dependent information
-@c
-
-@c 
-@c Comment out setting the "XYZ-RTEMSPATCH" variable if there is no 
-@c patch required.  The documentation will detect this and print 
-@c an appropriate message in a short section.
-@c 
-
-
-@c
-@c  GCC/EGCS Version
-@c
-
-@set GCC-VERSION     gcc 2.8.1
-@set GCC-TAR         gcc-2.8.1.tar.gz
-@set GCC-UNTAR       gcc-2.8.1
-@set GCC-FTPSITE     ftp.gnu.org
-@set GCC-FTPDIR      /pub/gnu
-@set GCC-RTEMSPATCH  gcc-2.8.1-rtems-diff-19980527.gz
-
-@c
-@c  GNAT Version
-@c
-
-@set GNAT-VERSION     gnat 3.10p
-@set GNAT-TAR         gnat-3.10p-src.tar.gz
-@set GNAT-UNTAR       gnat-3.10p-src
-@set GNAT-FTPSITE     cs.nyu.edu
-@set GNAT-FTPDIR      /pub/gnat
-@set GNAT-RTEMSPATCH  gnat-3.10p-rtems-diff-19971106.gz
-
-@c
-@c  BINUTILS Version
-@c
-
-@c The "official" binutils
-@set BINUTILS-VERSION     binutils 2.9.1
-@set BINUTILS-TAR         binutils-2.9.1.tar.gz
-@set BINUTILS-UNTAR       binutils-2.9.1
-@set BINUTILS-FTPSITE     ftp.gnu.org
-@set BINUTILS-FTPDIR      /pub/gnu
-@set BINUTILS-RTEMSPATCH  binutils-2.9.1-rtems-diff-19981027.gz
-
-@c When forced to use a snapshot
-@c @set BINUTILS-VERSION     gas 980314
-@c @set BINUTILS-TAR         gas-980314.tgz
-@c @set BINUTILS-UNTAR       gas-980314
-@c @set BINUTILS-FTPSITE     ftp.OARcorp.com
-@c @set BINUTILS-FTPDIR      /oarcorp/private/beta3/ada_tools
-@c @set BINUTILS-RTEMSPATCH  binutils-2.8.1-rtems-diff-980321.gz
-
-@c
-@c  NEWLIB Version
-@c
-
-@set NEWLIB-VERSION     newlib 1.8.0
-@set NEWLIB-TAR         newlib-1.8.0.tar.gz
-@set NEWLIB-UNTAR       newlib-1.8.0
-@set NEWLIB-FTPSITE     ftp.cygnus.com
-@set NEWLIB-FTPDIR      /pub/newlib
-@set NEWLIB-RTEMSPATCH  newlib-1.8.0-rtems-diff-19981027.gz
-
-@c
-@c  GDB Version
-@c
-
-@set GDB-VERSION     gdb 4.17
-@set GDB-TAR         gdb-4.17.tar.gz
-@set GDB-UNTAR       gdb-4.17
-@set GDB-FTPSITE     ftp.gnu.org
-@set GDB-FTPDIR      /pub/gnu
-@set GDB-RTEMSPATCH  gdb-4.17-rtems-diff-19981027.gz
-@c @set GDB-GNATPATCH   gdb-ada-patch-1.17.8.gz
-
-@c
-@c  RTEMS Version
-@c
-
-@set RTEMS-VERSION     RTEMS 4.0.0
-@set RTEMS-TAR         rtems-4.0.0.tgz
-@set RTEMS-UNTAR       rtems-4.0.0
-@set RTEMS-FTPSITE     ftp.OARcorp.com
-@set RTEMS-FTPDIR      /pub/rtems/4.0.0
-@set BUILDTOOLS-TAR    ada_build_scripts-4.0.0.tgz
-
-
diff --git a/doc/supplements/hppa1_1/Makefile b/doc/supplements/hppa1_1/Makefile
deleted file mode 100644
index 8714087ac0..0000000000
--- a/doc/supplements/hppa1_1/Makefile
+++ /dev/null
@@ -1,147 +0,0 @@
-#
-#  COPYRIGHT (c) 1988-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  All rights reserved.
-#
-#  $Id$
-#
-
-PROJECT=hppa1_1
-DISTRIBUTION_LEVEL=support
-
-include ../../Make.config
-
-REPLACE=../../tools/word-replace
-
-all: html info ps
-
-dirs:
-	$(make-dirs)
-
-COMMON_FILES=../../common/cpright.texi ../../common/setup.texi
-
-GENERATED_FILES=\
-  cpumodel.texi callconv.texi memmodel.texi intr.texi fatalerr.texi \
-  bsp.texi cputable.texi wksheets.texi timing.texi timeSIMHPPA.texi
-
-FILES= $(PROJECT).texi \
-  preface.texi \
-  $(GENERATED_FILES)
-
-info: dirs c_hppa1_1
-	cp c_$(PROJECT) $(INFO_INSTALL)
-
-c_hppa1_1: $(FILES)
-	$(MAKEINFO) $(PROJECT).texi
-
-dvi: $(PROJECT).dvi
-ps: dirs $(PROJECT).ps
-	
-$(PROJECT).ps: $(PROJECT).dvi
-	dvips -o $(PROJECT).ps $(PROJECT).dvi
-	cp $(PROJECT).ps $(PS_INSTALL)
-
-$(PROJECT).dvi: $(FILES)
-	$(TEXI2DVI) $(PROJECT).texi
-
-html: dirs $(FILES)
-	-mkdir -p $(WWW_INSTALL)/c_$(PROJECT)
-	$(TEXI2WWW) $(TEXI2WWW_ARGS) -dir $(WWW_INSTALL)/c_$(PROJECT) \
- 	    $(PROJECT).texi
-
-clean:
-	rm -f *.o $(PROG) *.txt core 
-	rm -f *.dvi *.ps *.log *.aux *.cp *.fn *.ky *.pg *.toc *.tp *.vr $(BASE)
-	rm -f $(PROJECT) $(PROJECT)-*
-	rm -f c_hppa1_1 c_hppa1_1-*
-	rm -f intr.t
-	rm -f timing.t timing.texi
-	rm -f wksheets.t wksheets_NOTIMES.t $(GENERATED_FILES)
-	rm -f *.fixed _*
-
-#
-#  Chapters which get automatic processing
-#
-
-cpumodel.texi: cpumodel.t Makefile
-	$(BMENU) -p "Preface" \
-            -u "Top" \
-            -n "Calling Conventions" ${*}.t
-
-callconv.texi: callconv.t Makefile
-	$(BMENU) -p "CPU Model Dependent Features CPU Model Name" \
-	    -u "Top" \
-	    -n "Memory Model" ${*}.t
-
-memmodel.texi: memmodel.t Makefile
-	$(BMENU) -p "Calling Conventions User-Provided Routines" \
-	    -u "Top" \
-	    -n "Interrupt Processing" ${*}.t
-
-# Interrupt Chapter:
-#  1.  Replace Times and Sizes
-#  2.  Build Node Structure
-
-intr.t: intr_NOTIMES.t SIMHPPA_TIMES
-	${REPLACE} -p SIMHPPA_TIMES intr_NOTIMES.t
-	mv intr_NOTIMES.t.fixed intr.t
-
-intr.texi: intr.t Makefile
-	$(BMENU) -p "Memory Model Flat Memory Model" \
-	    -u "Top" \
-	    -n "Default Fatal Error Processing" ${*}.t
-
-
-fatalerr.texi: fatalerr.t Makefile
-	$(BMENU) -p "Interrupt Processing Disabling of Interrupts by RTEMS" \
-	    -u "Top" \
-	    -n "Board Support Packages" ${*}.t
-
-bsp.texi: bsp.t Makefile
-	$(BMENU) -p "Default Fatal Error Processing Default Fatal Error Handler Operations" \
-	    -u "Top" \
-	    -n "Processor Dependent Information Table" ${*}.t
-
-cputable.texi: cputable.t Makefile
-	$(BMENU) -p "Board Support Packages Processor Initialization" \
-	    -u "Top" \
-	    -n "Memory Requirements" ${*}.t
-
-# Worksheets Chapter:
-#  1.  Obtain the Shared File
-#  2.  Replace Times and Sizes
-#  3.  Build Node Structure
-
-wksheets_NOTIMES.t: ../../common/wksheets.t
-	cp ../../common/wksheets.t wksheets_NOTIMES.t
-
-wksheets.t: wksheets_NOTIMES.t SIMHPPA_TIMES
-	${REPLACE} -p SIMHPPA_TIMES wksheets_NOTIMES.t
-	mv wksheets_NOTIMES.t.fixed wksheets.t
-
-wksheets.texi: wksheets.t Makefile
-	$(BMENU) -p "Processor Dependent Information Table CPU Dependent Information Table" \
-	    -u "Top" \
-	    -n "Timing Specification" ${*}.t
-
-# Timing Specification Chapter:
-#  1.  Copy the Shared File
-#  3.  Build Node Structure
-
-timing.t: ../../common/timing.t
-	cp ../../common/timing.t timing.t
-
-timing.texi: timing.t Makefile
-	$(BMENU) -p "Memory Requirements RTEMS RAM Workspace Worksheet" \
-	    -u "Top" \
-	    -n "HP-7100 Timing Data" ${*}.t
-
-# Timing Data for BSP Chapter:
-#  1.  Copy the Shared File
-#  2.  Replace Times and Sizes
-#  3.  Build Node Structure
-
-timeSIMHPPA.texi: timeSIMHPPA.t Makefile
-	$(BMENU) -p "Timing Specification Terminology" \
-	    -u "Top" \
-	    -n "Command and Variable Index" ${*}.t
diff --git a/doc/supplements/hppa1_1/SIMHPPA_TIMES b/doc/supplements/hppa1_1/SIMHPPA_TIMES
deleted file mode 100644
index 311553aa03..0000000000
--- a/doc/supplements/hppa1_1/SIMHPPA_TIMES
+++ /dev/null
@@ -1,247 +0,0 @@
-#
-#  PA-RISC Timing and Size Information
-#
-#  $Id$
-#
-
-#
-#  CPU Model Information
-#
-RTEMS_BSP simhppa
-RTEMS_CPU_MODEL HP-7100
-#
-#  Interrupt Latency
-#
-#  NOTE:  In general, the text says it is hand-calculated to be
-#         RTEMS_MAXIMUM_DISABLE_PERIOD at RTEMS_MAXIMUM_DISABLE_PERIOD_MHZ
-#         Mhz and this was last calculated for Release 
-#         RTEMS_VERSION_FOR_MAXIMUM_DISABLE_PERIOD.
-#
-RTEMS_MAXIMUM_DISABLE_PERIOD TBD
-RTEMS_MAXIMUM_DISABLE_PERIOD_MHZ TBD
-RTEMS_RELEASE_FOR_MAXIMUM_DISABLE_PERIOD TBD
-#
-#  Context Switch Times
-#
-RTEMS_NO_FP_CONTEXTS 1
-RTEMS_RESTORE_1ST_FP_TASK 2
-RTEMS_SAVE_INIT_RESTORE_INIT 3
-RTEMS_SAVE_IDLE_RESTORE_INIT 4
-RTEMS_SAVE_IDLE_RESTORE_IDLE 5
-#
-#  Task Manager Times
-#
-RTEMS_TASK_CREATE_ONLY 6
-RTEMS_TASK_IDENT_ONLY 7
-RTEMS_TASK_START_ONLY 8
-RTEMS_TASK_RESTART_CALLING_TASK 9
-RTEMS_TASK_RESTART_SUSPENDED_RETURNS_TO_CALLER 9
-RTEMS_TASK_RESTART_BLOCKED_RETURNS_TO_CALLER 10
-RTEMS_TASK_RESTART_READY_RETURNS_TO_CALLER 11
-RTEMS_TASK_RESTART_SUSPENDED_PREEMPTS_CALLER 12
-RTEMS_TASK_RESTART_BLOCKED_PREEMPTS_CALLER 13
-RTEMS_TASK_RESTART_READY_PREEMPTS_CALLER 14
-RTEMS_TASK_DELETE_CALLING_TASK 15
-RTEMS_TASK_DELETE_SUSPENDED_TASK 16
-RTEMS_TASK_DELETE_BLOCKED_TASK 17
-RTEMS_TASK_DELETE_READY_TASK 18
-RTEMS_TASK_SUSPEND_CALLING_TASK 19
-RTEMS_TASK_SUSPEND_RETURNS_TO_CALLER 20
-RTEMS_TASK_RESUME_TASK_READIED_RETURNS_TO_CALLER 21
-RTEMS_TASK_RESUME_TASK_READIED_PREEMPTS_CALLER 22
-RTEMS_TASK_SET_PRIORITY_OBTAIN_CURRENT_PRIORITY 23
-RTEMS_TASK_SET_PRIORITY_RETURNS_TO_CALLER 24
-RTEMS_TASK_SET_PRIORITY_PREEMPTS_CALLER 25
-RTEMS_TASK_MODE_OBTAIN_CURRENT_MODE 26
-RTEMS_TASK_MODE_NO_RESCHEDULE 27
-RTEMS_TASK_MODE_RESCHEDULE_RETURNS_TO_CALLER 28
-RTEMS_TASK_MODE_RESCHEDULE_PREEMPTS_CALLER 29
-RTEMS_TASK_GET_NOTE_ONLY 30
-RTEMS_TASK_SET_NOTE_ONLY 31
-RTEMS_TASK_WAKE_AFTER_YIELD_RETURNS_TO_CALLER 32
-RTEMS_TASK_WAKE_AFTER_YIELD_PREEMPTS_CALLER 33
-RTEMS_TASK_WAKE_WHEN_ONLY 34
-#
-#  Interrupt Manager
-#
-RTEMS_INTR_ENTRY_RETURNS_TO_NESTED 35
-RTEMS_INTR_ENTRY_RETURNS_TO_INTERRUPTED_TASK 36
-RTEMS_INTR_ENTRY_RETURNS_TO_PREEMPTING_TASK 37
-RTEMS_INTR_EXIT_RETURNS_TO_NESTED 38
-RTEMS_INTR_EXIT_RETURNS_TO_INTERRUPTED_TASK 39
-RTEMS_INTR_EXIT_RETURNS_TO_PREEMPTING_TASK 40
-#
-#  Clock Manager
-#
-RTEMS_CLOCK_SET_ONLY 41
-RTEMS_CLOCK_GET_ONLY 42
-RTEMS_CLOCK_TICK_ONLY 43
-#
-#  Timer Manager
-#
-RTEMS_TIMER_CREATE_ONLY 44
-RTEMS_TIMER_IDENT_ONLY 45
-RTEMS_TIMER_DELETE_INACTIVE 46
-RTEMS_TIMER_DELETE_ACTIVE 47
-RTEMS_TIMER_FIRE_AFTER_INACTIVE 48
-RTEMS_TIMER_FIRE_AFTER_ACTIVE 49
-RTEMS_TIMER_FIRE_WHEN_INACTIVE 50
-RTEMS_TIMER_FIRE_WHEN_ACTIVE 51
-RTEMS_TIMER_RESET_INACTIVE 52
-RTEMS_TIMER_RESET_ACTIVE 53
-RTEMS_TIMER_CANCEL_INACTIVE 54
-RTEMS_TIMER_CANCEL_ACTIVE 55
-#
-#  Semaphore Manager
-#
-RTEMS_SEMAPHORE_CREATE_ONLY 56
-RTEMS_SEMAPHORE_IDENT_ONLY 57
-RTEMS_SEMAPHORE_DELETE_ONLY 58
-RTEMS_SEMAPHORE_OBTAIN_AVAILABLE 59
-RTEMS_SEMAPHORE_OBTAIN_NOT_AVAILABLE_NO_WAIT 60
-RTEMS_SEMAPHORE_OBTAIN_NOT_AVAILABLE_CALLER_BLOCKS 61
-RTEMS_SEMAPHORE_RELEASE_NO_WAITING_TASKS 62
-RTEMS_SEMAPHORE_RELEASE_TASK_READIED_RETURNS_TO_CALLER 63
-RTEMS_SEMAPHORE_RELEASE_TASK_READIED_PREEMPTS_CALLER 64
-#
-#  Message Manager
-#
-RTEMS_MESSAGE_QUEUE_CREATE_ONLY 65
-RTEMS_MESSAGE_QUEUE_IDENT_ONLY 66
-RTEMS_MESSAGE_QUEUE_DELETE_ONLY 67
-RTEMS_MESSAGE_QUEUE_SEND_NO_WAITING_TASKS 68
-RTEMS_MESSAGE_QUEUE_SEND_TASK_READIED_RETURNS_TO_CALLER 69
-RTEMS_MESSAGE_QUEUE_SEND_TASK_READIED_PREEMPTS_CALLER 70
-RTEMS_MESSAGE_QUEUE_URGENT_NO_WAITING_TASKS 71
-RTEMS_MESSAGE_QUEUE_URGENT_TASK_READIED_RETURNS_TO_CALLER 72
-RTEMS_MESSAGE_QUEUE_URGENT_TASK_READIED_PREEMPTS_CALLER 73
-RTEMS_MESSAGE_QUEUE_BROADCAST_NO_WAITING_TASKS 74
-RTEMS_MESSAGE_QUEUE_BROADCAST_TASK_READIED_RETURNS_TO_CALLER 75
-RTEMS_MESSAGE_QUEUE_BROADCAST_TASK_READIED_PREEMPTS_CALLER 76
-RTEMS_MESSAGE_QUEUE_RECEIVE_AVAILABLE 77
-RTEMS_MESSAGE_QUEUE_RECEIVE_NOT_AVAILABLE_NO_WAIT 78
-RTEMS_MESSAGE_QUEUE_RECEIVE_NOT_AVAILABLE_CALLER_BLOCKS 79
-RTEMS_MESSAGE_QUEUE_FLUSH_NO_MESSAGES_FLUSHED 80
-RTEMS_MESSAGE_QUEUE_FLUSH_MESSAGES_FLUSHED 81
-#
-#  Event Manager
-#
-RTEMS_EVENT_SEND_NO_TASK_READIED 82
-RTEMS_EVENT_SEND_TASK_READIED_RETURNS_TO_CALLER 83
-RTEMS_EVENT_SEND_TASK_READIED_PREEMPTS_CALLER 84
-RTEMS_EVENT_RECEIVE_OBTAIN_CURRENT_EVENTS 85
-RTEMS_EVENT_RECEIVE_AVAILABLE 86
-RTEMS_EVENT_RECEIVE_NOT_AVAILABLE_NO_WAIT 87
-RTEMS_EVENT_RECEIVE_NOT_AVAILABLE_CALLER_BLOCKS 88
-#
-#  Signal Manager
-#
-RTEMS_SIGNAL_CATCH_ONLY 89
-RTEMS_SIGNAL_SEND_RETURNS_TO_CALLER 90
-RTEMS_SIGNAL_SEND_SIGNAL_TO_SELF 91
-RTEMS_SIGNAL_EXIT_ASR_OVERHEAD_RETURNS_TO_CALLING_TASK 92
-RTEMS_SIGNAL_EXIT_ASR_OVERHEAD_RETURNS_TO_PREEMPTING_TASK 93
-#
-#  Partition Manager
-#
-RTEMS_PARTITION_CREATE_ONLY 94
-RTEMS_PARTITION_IDENT_ONLY 95
-RTEMS_PARTITION_DELETE_ONLY 96
-RTEMS_PARTITION_GET_BUFFER_AVAILABLE 97
-RTEMS_PARTITION_GET_BUFFER_NOT_AVAILABLE 98
-RTEMS_PARTITION_RETURN_BUFFER_ONLY 99
-#
-#  Region Manager
-#
-RTEMS_REGION_CREATE_ONLY 100
-RTEMS_REGION_IDENT_ONLY 101
-RTEMS_REGION_DELETE_ONLY 102
-RTEMS_REGION_GET_SEGMENT_AVAILABLE 103
-RTEMS_REGION_GET_SEGMENT_NOT_AVAILABLE_NO_WAIT 104
-RTEMS_REGION_GET_SEGMENT_NOT_AVAILABLE_CALLER_BLOCKS 105
-RTEMS_REGION_RETURN_SEGMENT_NO_WAITING_TASKS 106
-RTEMS_REGION_RETURN_SEGMENT_TASK_READIED_RETURNS_TO_CALLER 107
-RTEMS_REGION_RETURN_SEGMENT_TASK_READIED_PREEMPTS_CALLER 108
-#
-#  Dual-Ported Memory Manager
-#
-RTEMS_PORT_CREATE_ONLY 109
-RTEMS_PORT_IDENT_ONLY 110
-RTEMS_PORT_DELETE_ONLY 111
-RTEMS_PORT_INTERNAL_TO_EXTERNAL_ONLY 112
-RTEMS_PORT_EXTERNAL_TO_INTERNAL_ONLY 113
-#
-#  IO Manager
-#
-RTEMS_IO_INITIALIZE_ONLY 114
-RTEMS_IO_OPEN_ONLY 115
-RTEMS_IO_CLOSE_ONLY 116
-RTEMS_IO_READ_ONLY 117
-RTEMS_IO_WRITE_ONLY 118
-RTEMS_IO_CONTROL_ONLY 119
-#
-#  Rate Monotonic Manager
-#
-RTEMS_RATE_MONOTONIC_CREATE_ONLY 120
-RTEMS_RATE_MONOTONIC_IDENT_ONLY 121
-RTEMS_RATE_MONOTONIC_CANCEL_ONLY 122
-RTEMS_RATE_MONOTONIC_DELETE_ACTIVE 123
-RTEMS_RATE_MONOTONIC_DELETE_INACTIVE 124
-RTEMS_RATE_MONOTONIC_PERIOD_INITIATE_PERIOD_RETURNS_TO_CALLER 125
-RTEMS_RATE_MONOTONIC_PERIOD_CONCLUDE_PERIOD_CALLER_BLOCKS 126
-RTEMS_RATE_MONOTONIC_PERIOD_OBTAIN_STATUS 127
-#
-#  Size Information
-#
-#
-#  xxx alloted for numbers
-#
-RTEMS_DATA_SPACE 128
-RTEMS_MINIMUM_CONFIGURATION xx,129
-RTEMS_MAXIMUM_CONFIGURATION xx,130
-#  x,xxx alloted for numbers
-RTEMS_CORE_CODE_SIZE x,131
-RTEMS_INITIALIZATION_CODE_SIZE x,132
-RTEMS_TASK_CODE_SIZE x,133
-RTEMS_INTERRUPT_CODE_SIZE x,134
-RTEMS_CLOCK_CODE_SIZE x,135
-RTEMS_TIMER_CODE_SIZE x,136
-RTEMS_SEMAPHORE_CODE_SIZE x,137
-RTEMS_MESSAGE_CODE_SIZE x,138
-RTEMS_EVENT_CODE_SIZE x,139
-RTEMS_SIGNAL_CODE_SIZE x,140
-RTEMS_PARTITION_CODE_SIZE x,141
-RTEMS_REGION_CODE_SIZE x,142
-RTEMS_DPMEM_CODE_SIZE x,143
-RTEMS_IO_CODE_SIZE x,144
-RTEMS_FATAL_ERROR_CODE_SIZE x,145
-RTEMS_RATE_MONOTONIC_CODE_SIZE x,146
-RTEMS_MULTIPROCESSING_CODE_SIZE x,147
-#  xxx alloted for numbers
-RTEMS_TIMER_CODE_OPTSIZE 148
-RTEMS_SEMAPHORE_CODE_OPTSIZE 149
-RTEMS_MESSAGE_CODE_OPTSIZE 150
-RTEMS_EVENT_CODE_OPTSIZE 151
-RTEMS_SIGNAL_CODE_OPTSIZE 152
-RTEMS_PARTITION_CODE_OPTSIZE 153
-RTEMS_REGION_CODE_OPTSIZE 154
-RTEMS_DPMEM_CODE_OPTSIZE 155
-RTEMS_IO_CODE_OPTSIZE 156
-RTEMS_RATE_MONOTONIC_CODE_OPTSIZE 157
-RTEMS_MULTIPROCESSING_CODE_OPTSIZE 158
-#  xxx alloted for numbers
-RTEMS_BYTES_PER_TASK 159
-RTEMS_BYTES_PER_TIMER 160
-RTEMS_BYTES_PER_SEMAPHORE 161
-RTEMS_BYTES_PER_MESSAGE_QUEUE 162
-RTEMS_BYTES_PER_REGION 163
-RTEMS_BYTES_PER_PARTITION 164
-RTEMS_BYTES_PER_PORT 165
-RTEMS_BYTES_PER_PERIOD 166
-RTEMS_BYTES_PER_EXTENSION 167
-RTEMS_BYTES_PER_FP_TASK 168
-RTEMS_BYTES_PER_NODE 169
-RTEMS_BYTES_PER_GLOBAL_OBJECT 170
-RTEMS_BYTES_PER_PROXY 171
-#  x,xxx alloted for numbers
-RTEMS_BYTES_OF_FIXED_SYSTEM_REQUIREMENTS x,172
diff --git a/doc/supplements/hppa1_1/bsp.t b/doc/supplements/hppa1_1/bsp.t
deleted file mode 100644
index 1ec4380589..0000000000
--- a/doc/supplements/hppa1_1/bsp.t
+++ /dev/null
@@ -1,53 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Board Support Packages
-
-@section Introduction
-
-An RTEMS Board Support Package (BSP) must be designed
-to support a particular processor and target board combination.
-This chapter presents a discussion of PA-RISC specific BSP
-issues.   For more information on developing a BSP, refer to the
-chapter titled Board Support Packages in the RTEMS
-Applications User's Guide.
-
-@section System Reset
-
-An RTEMS based application is initiated or
-re-initiated when the PA-RISC processor is reset.  The behavior
-of a PA-RISC upon reset is implementation defined and thus is
-beyond the scope of this manual.
-
-@section Processor Initialization
-
-The precise requirements for initialization of a
-particular implementation of the PA-RISC architecture are
-implementation defined.  Thus it is impossible to provide exact
-details of this procedure in this manual.  However, the
-requirements of RTEMS which must be satisfied by this
-initialization code can be discussed.
-
-RTEMS assumes that interrupts are disabled when the
-initialize_executive directive is invoked.  Interrupts are
-enabled automatically by RTEMS as part of the initialize
-executive directive and device driver initialization occurs
-after interrupts are enabled.  Thus all interrupt sources should
-be quiescent until the system's device drivers have been
-initialized and installed their interrupt handlers.
-
-If the processor requires initialization of the
-cache, then it should be be done during the reset application
-initialization code.
-
-Finally, the requirements in the Board Support
-Packages chapter of the Applications User's Manual for the
-reset code which is executed before the call to initialize
-executive must be satisfied.
-
-
diff --git a/doc/supplements/hppa1_1/callconv.t b/doc/supplements/hppa1_1/callconv.t
deleted file mode 100644
index 570120a7e3..0000000000
--- a/doc/supplements/hppa1_1/callconv.t
+++ /dev/null
@@ -1,143 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Calling Conventions
-
-@section Introduction
-
-Each high-level language compiler generates
-subroutine entry and exit code based upon a set of rules known
-as the compiler's calling convention.   These rules address the
-following issues:
-
-@itemize @bullet
-@item register preservation and usage
-
-@item parameter passing
-
-@item call and return mechanism
-@end itemize
-
-A compiler's calling convention is of importance when
-interfacing to subroutines written in another language either
-assembly or high-level.  Even when the high-level language and
-target processor are the same, different compilers may use
-different calling conventions.  As a result, calling conventions
-are both processor and compiler dependent.
-
-This chapter describes the calling conventions used
-by the GNU C and standard HP-UX compilers for the PA-RISC
-architecture.
-
-@section Processor Background
-
-The PA-RISC architecture supports a simple yet
-effective call and return mechanism for subroutine calls where
-the caller and callee are both in the same address space.  The
-compiler will not automatically generate subroutine calls which
-cross address spaces.  A subroutine is invoked via the branch
-and link (bl) or the branch and link register (blr).  These
-instructions save the return address in a caller specified
-register.  By convention, the return address is saved in r2.
-The callee is responsible for maintaining the return address so
-it can return to the correct address.  The branch vectored (bv)
-instruction is used to branch to the return address and thus
-return from the subroutine to the caller.  It is is important to
-note that the PA-RISC subroutine call and return mechanism does
-not automatically save or restore any registers.  It is the
-responsibility of the high-level language compiler to define the
-register preservation and usage convention.
-
-@section Calling Mechanism
-
-All RTEMS directives are invoked as standard
-subroutines via a bl or a blr instruction with the return address
-assumed to be in r2 and return to the user application via the
-bv instruction.
-
-@section Register Usage
-
-As discussed above, the bl and blr instructions do
-not automatically save any registers.  RTEMS uses the registers
-r1, r19 - r26, and r31 as scratch registers.  The PA-RISC
-calling convention specifies that the first four (4) arguments
-to subroutines are passed in registers r23 - r26.  After the
-arguments have been used, the contents of these registers may be
-altered.  Register r31 is the millicode scratch register.
-Millicode is the set of routines which support high-level
-languages on the PA-RISC by providing routines which are either
-too complex or too long for the compiler to generate inline code
-when these operations are needed.  For example, indirect calls
-utilize a millicode routine.  The scratch registers are not
-preserved by RTEMS directives therefore, the contents of these
-registers should not be assumed upon return from any RTEMS
-directive.
-
-Surprisingly, when using the GNU C compiler at least
-integer multiplies are performed using the floating point
-registers.  This is an important optimization because the
-PA-RISC does not have otherwise have hardware for multiplies.
-This has important ramifications in regards to the PA-RISC port
-of RTEMS.  On most processors, the floating point unit is
-ignored if the code only performs integer operations.  This
-makes it easy for the application developer to predict whether
-or not any particular task will require floating point
-operations.  This property is taken advantage of by RTEMS on
-other architectures to minimize the number of times the floating
-point context is saved and restored.  However, on the PA-RISC
-architecture, every task is implicitly a floating point task.
-Additionally the state of the floating point unit must be saved
-and restored as part of the interrupt processing because for all
-practical purposes it is impossible to avoid the use of the
-floating point registers.  It is unknown if the HP-UX C compiler
-shares this property.
-
-@itemize @code{ }
-@item @b{NOTE}: Later versions of the GNU C has a PA-RISC specific
-option to disable use of the floating point registers.  RTEMS
-currently assumes that this option is not turned on.  If the use
-of this option sets a built-in define, then it should be
-possible to modify the PA-RISC specific code such that all tasks
-are considered floating point only when this option is not used.
-@end itemize
-
-@section Parameter Passing
-
-RTEMS assumes that the first four (4) arguments are
-placed in the appropriate registers (r26, r25, r24, and r23)
-and, if needed, additional are placed on the current stack
-before the directive is invoked via the bl or blr instruction.
-The first argument is placed in r26, the second is placed in
-r25, and so forth.  The following pseudo-code illustrates the
-typical sequence used to call a RTEMS directive with three (3)
-arguments:
-
-
-@example
-set r24 to the third argument
-set r25 to the second argument
-set r26 to the first argument
-invoke directive
-@end example
-
-The stack on the PA-RISC grows upward -- i.e.
-"pushing" onto the stack results in the address in the stack
-pointer becoming numerically larger.  By convention, r27 is used
-as the stack pointer.  The standard stack frame consists of a
-minimum of sixty-four (64) bytes and is the responsibility of
-the callee to maintain.
-
-@section User-Provided Routines
-
-All user-provided routines invoked by RTEMS, such as
-user extensions, device drivers, and MPCI routines, must also
-adhere to these calling conventions.
-
-
-
-
diff --git a/doc/supplements/hppa1_1/cpumodel.t b/doc/supplements/hppa1_1/cpumodel.t
deleted file mode 100644
index 834892ee75..0000000000
--- a/doc/supplements/hppa1_1/cpumodel.t
+++ /dev/null
@@ -1,56 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter CPU Model Dependent Features
-
-@section Introduction
-
-Microprocessors are generally classified into
-families with a variety of CPU models or implementations within
-that family.  Within a processor family, there is a high level
-of binary compatibility.  This family may be based on either an
-architectural specification or on maintaining compatibility with
-a popular processor.  Recent microprocessor families such as the
-SPARC or PA-RISC are based on an architectural specification
-which is independent or any particular CPU model or
-implementation.  Older families such as the M68xxx and the iX86
-evolved as the manufacturer strived to produce higher
-performance processor models which maintained binary
-compatibility with older models.
-
-RTEMS takes advantage of the similarity of the
-various models within a CPU family.  Although the models do vary
-in significant ways, the high level of compatibility makes it
-possible to share the bulk of the CPU dependent executive code
-across the entire family.  Each processor family supported by
-RTEMS has a list of features which vary between CPU models
-within a family.  For example, the most common model dependent
-feature regardless of CPU family is the presence or absence of a
-floating point unit or coprocessor.  When defining the list of
-features present on a particular CPU model, one simply notes
-that floating point hardware is or is not present and defines a
-single constant appropriately.  Conditional compilation is
-utilized to include the appropriate source code for this CPU
-model's feature set.  It is important to note that this means
-that RTEMS is thus compiled using the appropriate feature set
-and compilation flags optimal for this CPU model used.  The
-alternative would be to generate a binary which would execute on
-all family members using only the features which were always
-present.
-
-This chapter presents the set of features which vary
-across PA-RISC implementations and are of importance to RTEMS.
-The set of CPU model feature macros are defined in the file
-c/src/exec/score/cpu/hppa1_1/hppa.h based upon the particular CPU
-model defined on the compilation command line.
-
-@section CPU Model Name
-
-The macro CPU_MODEL_NAME is a string which designates
-the name of this CPU model.  For example, for the Hewlett Packard
-PA-7100 CPU model, this macro is set to the string "hppa 7100".
diff --git a/doc/supplements/hppa1_1/cputable.t b/doc/supplements/hppa1_1/cputable.t
deleted file mode 100644
index 940510ce86..0000000000
--- a/doc/supplements/hppa1_1/cputable.t
+++ /dev/null
@@ -1,117 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Processor Dependent Information Table
-
-@section Introduction
-
-Any highly processor dependent information required
-to describe a processor to RTEMS is provided in the CPU
-Dependent Information Table.  This table is not required for all
-processors supported by RTEMS.  This chapter describes the
-contents, if any, for a particular processor type.
-
-@section CPU Dependent Information Table
-
-The PA-RISC version of the RTEMS CPU Dependent
-Information Table contains the information required to interface
-a Board Support Package and RTEMS on the PA-RISC.  This
-information is provided to allow RTEMS to interoperate
-effectively with the BSP.  The C structure definition is given
-here:
-
-@example
-typedef struct @{
-  void       (*pretasking_hook)( void );
-  void       (*predriver_hook)( void );
-  void       (*postdriver_hook)( void );
-  void       (*idle_task)( void );
-  boolean      do_zero_of_workspace;
-  unsigned32   idle_task_stack_size;
-  unsigned32   interrupt_stack_size;
-  unsigned32   extra_mpci_receive_server_stack;
-  void *     (*stack_allocate_hook)( unsigned32 );
-  void       (*stack_free_hook)( void * );
-  /* end of fields required on all CPUs */
- 
-  hppa_rtems_isr_entry spurious_handler;
- 
-  unsigned32   itimer_clicks_per_microsecond; /* for use by Clock driver */
-@}   rtems_cpu_table;
-@end example
-
-@table @code
-@item pretasking_hook
-is the address of the
-user provided routine which is invoked once RTEMS initialization
-is complete but before interrupts and tasking are enabled.  This
-field may be NULL to indicate that the hook is not utilized.
-
-@item predriver_hook
-is the address of the user provided
-routine which is invoked with tasking enabled immediately before
-the MPCI and device drivers are initialized. RTEMS
-initialization is complete, interrupts and tasking are enabled,
-but no device drivers are initialized.  This field may be NULL to
-indicate that the hook is not utilized.
-
-@item postdriver_hook
-is the address of the user provided
-routine which is invoked with tasking enabled immediately after
-the MPCI and device drivers are initialized. RTEMS
-initialization is complete, interrupts and tasking are enabled,
-and the device drivers are initialized.  This field may be NULL
-to indicate that the hook is not utilized.
-
-@item idle_task
-is the address of the optional user
-provided routine which is used as the system's IDLE task.  If
-this field is not NULL, then the RTEMS default IDLE task is not
-used.  This field may be NULL to indicate that the default IDLE
-is to be used.
-
-@item do_zero_of_workspace
-indicates whether RTEMS should
-zero the Workspace as part of its initialization.  If set to
-TRUE, the Workspace is zeroed.  Otherwise, it is not.
-
-@item idle_task_stack_size
-is the size of the RTEMS idle task stack in bytes.  
-If this number is less than MINIMUM_STACK_SIZE, then the 
-idle task's stack will be MINIMUM_STACK_SIZE in byte.
-
-@item interrupt_stack_size
-is the size of the RTEMS allocated interrupt stack in bytes.  
-This value must be at least as large as MINIMUM_STACK_SIZE.
-
-@item extra_mpci_receive_server_stack
-is the extra stack space allocated for the RTEMS MPCI receive server task
-in bytes.  The MPCI receive server may invoke nearly all directives and 
-may require extra stack space on some targets.
-
-@item stack_allocate_hook
-is the address of the optional user provided routine which allocates 
-memory for task stacks.  If this hook is not NULL, then a stack_free_hook
-must be provided as well.
-
-@item stack_free_hook
-is the address of the optional user provided routine which frees 
-memory for task stacks.  If this hook is not NULL, then a stack_allocate_hook
-must be provided as well.
-
-@item spurious_handler
-is the address of the optional user provided routine which is invoked
-when a spurious external interrupt occurs.  A spurious interrupt is one
-for which no handler is installed.
-
-@item itimer_clicks_per_microsecond
-is the number of countdowns in the on-CPU timer which corresponds
-to a microsecond.  This is a function of the clock speed of the CPU
-being used.
-
-@end table
diff --git a/doc/supplements/hppa1_1/fatalerr.t b/doc/supplements/hppa1_1/fatalerr.t
deleted file mode 100644
index d5998d81a5..0000000000
--- a/doc/supplements/hppa1_1/fatalerr.t
+++ /dev/null
@@ -1,32 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Default Fatal Error Processing
-
-@section Introduction
-
-Upon detection of a fatal error by either the
-application or RTEMS the fatal error manager is invoked.  The
-fatal error manager will invoke a user-supplied fatal error
-handler.  If no user-supplied handler is configured,  the RTEMS
-provided default fatal error handler is invoked.  If the
-user-supplied fatal error handler returns to the executive the
-default fatal error handler is then invoked.  This chapter
-describes the precise operations of the default fatal error
-handler.
-
-@section Default Fatal Error Handler Operations
-
-The default fatal error handler which is invoked by
-the fatal_error_occurred directive when there is no user handler
-configured or the user handler returns control to RTEMS.  The
-default fatal error handler disables processor interrupts (i.e.
-sets the I bit in the PSW register to 0), places the error code
-in r1, and executes a break instruction to simulate a halt
-processor instruction.
-
diff --git a/doc/supplements/hppa1_1/hppa1_1.texi b/doc/supplements/hppa1_1/hppa1_1.texi
deleted file mode 100644
index 19d700fe63..0000000000
--- a/doc/supplements/hppa1_1/hppa1_1.texi
+++ /dev/null
@@ -1,121 +0,0 @@
-\input ../../texinfo/texinfo   @c -*-texinfo-*-
-@c %**start of header
-@setfilename c_hppa1_1
-@syncodeindex vr fn
-@synindex ky cp
-@paragraphindent 0
-@c @smallbook
-@c %**end of header
-
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@c
-@c   Master file for the Hewlett Packard PA-RISC Applications Supplement
-@c
-
-@include ../../common/setup.texi
-
-@ignore
-@ifinfo
-@format
-START-INFO-DIR-ENTRY
-* RTEMS Hewlett Packard PA-RISC Applications Supplement (hppa1_1):
-END-INFO-DIR-ENTRY
-@end format
-@end ifinfo
-@end ignore
-
-@c
-@c  Title Page Stuff
-@c
-
-@set edition @value{RTEMS-EDITION}
-@set version @value{RTEMS-VERSION}
-@set update-date @value{RTEMS-UPDATE-DATE}
-@set update-month @value{RTEMS-UPDATE-MONTH}
-
-@c
-@c  I don't really like having a short title page.  --joel
-@c
-@c @shorttitlepage RTEMS Hewlett Packard PA-RISC Applications Supplement 
-
-@setchapternewpage odd
-@settitle RTEMS Hewlett Packard PA-RISC Applications Supplement 
-@titlepage
-@finalout
-
-@title RTEMS Hewlett Packard PA-RISC Applications Supplement 
-@subtitle Edition @value{edition}, for RTEMS @value{version}
-@sp 1
-@subtitle @value{update-month}
-@author On-Line Applications Research Corporation
-@page
-@include ../../common/cpright.texi
-@end titlepage
-
-@c  This prevents a black box from being printed on "overflow" lines.
-@c  The alternative is to rework a sentence to avoid this problem.
-
-@include preface.texi
-@include cpumodel.texi
-@include callconv.texi
-@include memmodel.texi
-@include intr.texi
-@include fatalerr.texi
-@include bsp.texi
-@include cputable.texi
-@include wksheets.texi
-@include timing.texi
-@include timeSIMHPPA.texi
-@ifinfo
-@node Top, Preface, (dir), (dir)
-@top c_hppa1_1
-
-This is the online version of the RTEMS Hewlett Packard PA-RISC
-Applications Supplement.
-
-@menu
-* Preface::
-* CPU Model Dependent Features::
-* Calling Conventions::
-* Memory Model::
-* Interrupt Processing::
-* Default Fatal Error Processing::
-* Board Support Packages::
-* Processor Dependent Information Table::
-* Memory Requirements::
-* Timing Specification::
-* HP-7100 Timing Data::
-* Command and Variable Index::
-* Concept Index::
-@end menu
-
-@end ifinfo
-@c 
-@c 
-@c Need to copy the emacs stuff and "trailer stuff" (index, toc) into here
-@c
-
-@node Command and Variable Index, Concept Index, HP-7100 Timing Data Directive Times, Top
-
-@unnumbered Command and Variable Index
-
-There are currently no Command and Variable Index entries.
-
-@c @printindex fn
-
-@node Concept Index, , Command and Variable Index, Top
-@unnumbered Concept Index
-
-There are currently no Concept Index entries.
-@c @printindex cp
-
-@c @contents
-@bye
-
diff --git a/doc/supplements/hppa1_1/intr_NOTIMES.t b/doc/supplements/hppa1_1/intr_NOTIMES.t
deleted file mode 100644
index 9ec3ae152d..0000000000
--- a/doc/supplements/hppa1_1/intr_NOTIMES.t
+++ /dev/null
@@ -1,191 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Interrupt Processing
-
-@section Introduction
-
-Different types of processors respond to the
-occurence of an interrupt in their own unique fashion. In
-addition, each processor type provides a control mechanism to
-allow for the proper handling of an interrupt.  The processor
-dependent response to the interrupt modifies the current
-execution state and results in a change in the execution stream.
-Most processors require that an interrupt handler utilize some
-special control mechanisms to return to the normal processing
-stream.  Although RTEMS hides many of the processor dependent
-details of interrupt processing, it is important to understand
-how the RTEMS interrupt manager is mapped onto the processor's
-unique architecture. Discussed in this chapter are the PA-RISC's
-interrupt response and control mechanisms as they pertain to
-RTEMS.
-
-@section Vectoring of Interrupt Handler
-
-Upon receipt of an interrupt the PA-RISC
-automatically performs the following actions:
-
-@itemize @bullet
-@item The PSW (Program Status Word) is saved in the IPSW
-(Interrupt Program Status Word).
-
-@item The current privilege level is set to 0.
-
-@item The following defined bits in the PSW are set:
-
-@item E bit is set to the default endian bit
-
-@item M bit is set to 1 if the interrupt is a high-priority
-machine check and 0 otherwise
-
-@item Q bit is set to zero thuse freezing the IIA
-(Instruction Address) queues
-
-@item C and D bits are set to zero thus disabling all
-protection and translation.
-
-@item I bit is set to zero this disabling all external,
-powerfail, and low-priority machine check interrupts.
-
-@item All others bits are set to zero.
-
-@item General purpose registers r1, r8, r9, r16, r17, r24, and
-r25 are copied to the shadow registers.
-
-@item Execution begins at the address given by the formula:
-Interruption Vector Address + (32 * interrupt vector number).
-@end itemize
-
-Once the processor has completed the actions it is is
-required to perform for each interrupt, the  RTEMS interrupt
-management code (the beginning of which is stored in the
-Interruption Vector Table) gains control and performs the
-following actions upon each interrupt:
-
-@itemize @bullet
-@item returns the processor to "virtual mode" thus reenabling
-all code and data address translation.
-
-@item saves all necessary interrupt state information
-
-@item saves all floating point registers
-
-@item saves all integer registers
-
-@item switches the current stack to the interrupt stack
-
-@item dispatches to the appropriate user provided interrupt
-service routine (ISR).  If the ISR was installed with the
-interrupt_catch directive, then it will be executed at this.
-Because, the RTEMS interrupt handler saves all registers which
-are not preserved according to the calling conventions and
-invokes the application's ISR, the ISR can easily be written in
-a high-level language.
-@end itemize
-
-RTEMS refers to the combination of the interrupt
-state information and registers saved when vectoring an
-interrupt as the Interrupt Stack Frame (ISF).  A nested
-interrupt is processed similarly by the PA-RISC and RTEMS with
-the exception that the nested interrupt occurred while executing
-on the interrupt stack and, thus, the current stack need not be
-switched.
-
-@section Interrupt Stack Frame
-
-The PA-RISC architecture does not alter the stack
-while processing interrupts.  However, RTEMS does save
-information on the stack as part of processing an interrupt.
-This following shows the format of the Interrupt Stack Frame for
-the PA-RISC as defined by RTEMS:
-
-@example
-@group
-               +------------------------+
-               |    Interrupt Context   | 0xXXX
-               +------------------------+
-               |     Integer Context    | 0xXXX
-               +------------------------+
-               | Floating Point Context | 0xXXX
-               +------------------------+
-@end group
-@end example
-
-@section External Interrupts and Traps
-
-In addition to the thirty-two unique interrupt
-sources supported by the PA-RISC architecture, RTEMS also
-supports the installation of handlers for each of the thirty-two
-external interrupts supported by the PA-RISC architecture.
-Except for interrupt vector 4, each of the interrupt vectors 0
-through 31 may be associated with a user-provided interrupt
-handler.  Interrupt vector 4 is used for external interrupts.
-When an external interrupt occurs, the RTEMS external interrupt
-handler is invoked and the actual interrupt source is indicated
-by status bits in the EIR (External Interrupt Request) register.
-The RTEMS external interrupt handler (or interrupt vector four)
-examines the EIR to determine which interrupt source requires
-servicing.
-
-RTEMS supports sixty-four interrupt vectors for the
-PA-RISC.  Vectors 0 through 31 map to the normal interrupt
-sources while RTEMS interrupt vectors 32 through 63 are directly
-associated with the external interrupt sources indicated by bits
-0 through 31 in the EIR.
-
-The exact set of interrupt sources which are checked
-for by the RTEMS external interrupt handler and the order in
-which they are checked are configured by the user in the CPU
-Configuration Table.  If an external interrupt occurs which does
-not have a handler configured, then the spurious interrupt
-handler will be invoked.  The spurious interrupt handler may
-also be specifiec by the user in the CPU Configuration Table.
-
-@section Interrupt Levels
-
-Two levels (enabled and disabled) of interrupt
-priorities are supported by the PA-RISC architecture.  Level
-zero (0) indicates that interrupts are fully enabled (i.e. the I
-bit of the PSW is 1).  Level one (1) indicates that interrupts
-are disabled (i.e. the I bit of the PSW is 0).  Thirty-two
-independent sources of external interrupts are supported by the
-PA-RISC architecture.  Each of these interrupts sources may be
-individually enabled or disabled.  When processor interrupts are
-disabled, all sources of external interrupts are ignored.  When
-processor interrupts are enabled, the EIR (External Interrupt
-Request) register is used to determine which sources are
-currently allowed to generate interrupts.
-
-Although RTEMS supports 256 interrupt levels, the
-PA-RISC architecture only supports two.  RTEMS interrupt level 0
-indicates that interrupts are enabled and level 1 indicates that
-interrupts are disabled.  All other RTEMS interrupt levels are
-undefined and their behavior is unpredictable.
-
-@section Disabling of Interrupts by RTEMS
-
-During the execution of directive calls, critical
-sections of code may be executed.  When these sections are
-encountered, RTEMS disables external interrupts by setting the I
-bit in the PSW to 0 before the execution of this section and
-restores them to the previous level upon completion of the
-section.  RTEMS has been optimized to insure that interrupts are
-disabled for less than XXX instructions when compiled with GNU
-CC at optimization level 4.  The exact execution time will vary
-based on the based on the processor implementation, amount of
-cache, the number of wait states for primary memory, and
-processor speed present on the target board.
-
-Non-maskable interrupts (NMI) such as high-priority
-machine checks cannot be disabled, and ISRs which execute at
-this level MUST NEVER issue RTEMS system calls.  If a directive
-is invoked, unpredictable results may occur due to the inability
-of RTEMS to protect its critical sections.  However, ISRs that
-make no system calls may safely execute as non-maskable
-interrupts.
-
diff --git a/doc/supplements/hppa1_1/memmodel.t b/doc/supplements/hppa1_1/memmodel.t
deleted file mode 100644
index b246998e75..0000000000
--- a/doc/supplements/hppa1_1/memmodel.t
+++ /dev/null
@@ -1,67 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Memory Model
-
-@section Introduction
-
-A processor may support any combination of memory
-models ranging from pure physical addressing to complex demand
-paged virtual memory systems.  RTEMS supports a flat memory
-model which ranges contiguously over the processor's allowable
-address space.  RTEMS does not support segmentation or virtual
-memory of any kind.  The appropriate memory model for RTEMS
-provided by the targeted processor and related characteristics
-of that model are described in this chapter.
-
-@section Flat Memory Model
-
-RTEMS supports applications in which the application
-and the executive execute within a single thirty-two bit address
-space.  Thus RTEMS and the application share a common four
-gigabyte address space within a single space.  The PA-RISC
-automatically converts every address from a logical to a
-physical address each time it is used.  The PA-RISC uses
-information provided in the page table to perform this
-translation.  The following protection levels are assumed:
-
-@itemize @bullet
-@item a single code segment at protection level (0) which
-contains all application and executive code.
-
-@item a single data segment at protection level zero (0) which
-contains all application and executive data.
-@end itemize
-
-The PA-RISC space registers and associated stack --
-including the stack pointer r27 -- must be initialized when the
-initialize_executive directive is invoked.  RTEMS treats the
-space registers as system resources shared by all tasks and does
-not modify or context switch them.
-
-This memory model supports a flat 32-bit address
-space with addresses ranging from 0x00000000 to 0xFFFFFFFF (4
-gigabytes).  Each address is represented by a 32-bit value and
-memory is addressable.  The address may be used to reference a
-single byte, half-word (2-bytes), or word (4 bytes).
-
-RTEMS does not require that logical addresses map
-directly to physical addresses, although it is desirable in many
-applications to do so.  RTEMS does not need any additional
-information when physical addresses do not map directly to
-physical addresses.  By not requiring that logical addresses map
-directly to physical addresses, the memory space of an RTEMS
-space can be separated from that of a ROM monitor.  For example,
-a ROM monitor may load application programs into a separate
-logical address space from itself.
-
-RTEMS assumes that the space registers contain the
-selector for the single data segment when a directive is
-invoked.   This assumption is especially important when
-developing interrupt service routines.
-
diff --git a/doc/supplements/hppa1_1/preface.texi b/doc/supplements/hppa1_1/preface.texi
deleted file mode 100644
index 8619b11395..0000000000
--- a/doc/supplements/hppa1_1/preface.texi
+++ /dev/null
@@ -1,36 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@ifinfo
-@node Preface, CPU Model Dependent Features, Top, Top
-@end ifinfo
-@unnumbered Preface
-
-The Real Time Executive for Multiprocessor Systems
-(RTEMS) is designed to be portable across multiple processor
-architectures.  However, the nature of real-time systems makes
-it essential that the application designer understand certain
-processor dependent implementation details.  These processor
-dependencies include calling convention, board support package
-issues, interrupt processing, exact RTEMS memory requirements,
-performance data, header files, and the assembly language
-interface to the executive.
-
-For information on the PA-RISC V1.1 architecture in
-general, refer to the following documents:
-
-@itemize @bullet
-@item @cite{PA-RISC 1.1 Architecture and Instruction Set Reference
-Manual, Third Edition.  HP Part Number 09740-90039}.
-@end itemize
-
-It is highly recommended that the PA-RISC RTEMS
-application developer also obtain and become familiar with the
-Technical Reference Manual for the particular implementation of
-the PA-RISC being used.
-
diff --git a/doc/supplements/hppa1_1/timeSIMHPPA.t b/doc/supplements/hppa1_1/timeSIMHPPA.t
deleted file mode 100644
index 82982ef21d..0000000000
--- a/doc/supplements/hppa1_1/timeSIMHPPA.t
+++ /dev/null
@@ -1,86 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter HP-7100 Timing Data
-
-@section Introduction
-
-The timing data for the PA-RISC version of RTEMS is
-provided along with the target dependent aspects concerning the
-gathering of the timing data.  The hardware platform used to
-gather the times is described to give the reader a better
-understanding of each directive time provided.  Also, provided
-is a description of the  interrupt latency and the context
-switch times as they pertain to the PA-RISC version of RTEMS.
-
-@section Hardware Platform
-
-No directive execution times are reported for the
-HP-7100 because the target platform was proprietary and
-executions times could not be released.
-
-@section Interrupt Latency
-
-The maximum period with traps disabled or the
-processor interrupt level set to it's highest value inside RTEMS
-is less than RTEMS_MAXIMUM_DISABLE_PERIOD
-microseconds including the instructions which
-disable and re-enable interrupts.  The time required for the
-HP-7100 to vector an interrupt and for the RTEMS entry overhead
-before invoking the user's trap handler are a total of
-RTEMS_INTR_ENTRY_RETURNS_TO_PREEMPTING_TASK
-microseconds.  These combine to yield a worst case interrupt
-latency of less than RTEMS_MAXIMUM_DISABLE_PERIOD +
-RTEMS_INTR_ENTRY_RETURNS_TO_PREEMPTING_TASK microseconds at 15 Mhz.
-[NOTE:  The maximum period with interrupts disabled was last
-determined for Release RTEMS_RELEASE_FOR_MAXIMUM_DISABLE_PERIOD.]
-
-It should be noted again that the maximum period with
-interrupts disabled within RTEMS for the HP-7100 is hand calculated.
-
-@section Context Switch
-
-The RTEMS processor context switch time is RTEMS_NO_FP_CONTEXTS
-microsections for the HP-7100 when no floating point context
-switch is saved or restored.  Saving and restoring the floating
-point context adds additional time to the context
-switch procedure.  Additional execution time is required when a
-TASK_SWITCH user extension is configured.  The use of the
-TASK_SWITCH extension is application dependent.  Thus, its
-execution time is not considered part of the raw context switch
-time.
-
-Since RTEMS was designed specifically for embedded
-missile applications which are floating point intensive, the
-executive is optimized to avoid unnecessarily saving and
-restoring the state of the numeric coprocessor.  On many
-processors, the state of the numeric coprocessor is only saved
-when an FLOATING_POINT task is dispatched and that task was not
-the last task to utilize the coprocessor.  In a system with only
-one FLOATING_POINT task, the state of the numeric coprocessor
-will never be saved or restored.  When the first FLOATING_POINT
-task is dispatched, RTEMS does not need to save the current
-state of the numeric coprocessor.  As discussed in the Register
-Usage section, on the HP-7100 the every task is considered to be
-floating point registers and , as a rsule, every context switch
-involves saving and restoring the state of the floating point
-unit.
-
-The following table summarizes the context switch
-times for the HP-7100 processor:
-
-@example
-no times are available for the HP-7100
-@end example
-
-@section Directive Times
-
-No execution times are available for the HP-7100
-because the target platform was proprietary and no timing
-information could be released.
-
diff --git a/doc/supplements/i386/FORCE386_TIMES b/doc/supplements/i386/FORCE386_TIMES
deleted file mode 100644
index b40f8ad50b..0000000000
--- a/doc/supplements/i386/FORCE386_TIMES
+++ /dev/null
@@ -1,247 +0,0 @@
-#
-#  Intel i386/Force CPU-386 Timing and Size Information
-#
-#  $Id$
-#
-
-#
-#  CPU Model Information
-#
-RTEMS_BSP       CPU386
-RTEMS_CPU_MODEL i386
-#
-#  Interrupt Latency
-#
-#  NOTE:  In general, the text says it is hand-calculated to be
-#         RTEMS_MAXIMUM_DISABLE_PERIOD at RTEMS_MAXIMUM_DISABLE_PERIOD_MHZ
-#         Mhz and this was last calculated for Release 
-#         RTEMS_VERSION_FOR_MAXIMUM_DISABLE_PERIOD.
-#
-RTEMS_MAXIMUM_DISABLE_PERIOD 13.0
-RTEMS_MAXIMUM_DISABLE_PERIOD_MHZ 16
-RTEMS_RELEASE_FOR_MAXIMUM_DISABLE_PERIOD 3.1.0
-#
-#  Context Switch Times
-#
-RTEMS_NO_FP_CONTEXTS 34
-RTEMS_RESTORE_1ST_FP_TASK 57
-RTEMS_SAVE_INIT_RESTORE_INIT 59
-RTEMS_SAVE_IDLE_RESTORE_INIT 59
-RTEMS_SAVE_IDLE_RESTORE_IDLE 83
-#
-#  Task Manager Times
-#
-RTEMS_TASK_CREATE_ONLY 157
-RTEMS_TASK_IDENT_ONLY 748
-RTEMS_TASK_START_ONLY 86
-RTEMS_TASK_RESTART_CALLING_TASK 118
-RTEMS_TASK_RESTART_SUSPENDED_RETURNS_TO_CALLER 45
-RTEMS_TASK_RESTART_BLOCKED_RETURNS_TO_CALLER 138
-RTEMS_TASK_RESTART_READY_RETURNS_TO_CALLER 105
-RTEMS_TASK_RESTART_SUSPENDED_PREEMPTS_CALLER 149
-RTEMS_TASK_RESTART_BLOCKED_PREEMPTS_CALLER 162
-RTEMS_TASK_RESTART_READY_PREEMPTS_CALLER 156
-RTEMS_TASK_DELETE_CALLING_TASK 187
-RTEMS_TASK_DELETE_SUSPENDED_TASK 147
-RTEMS_TASK_DELETE_BLOCKED_TASK 153
-RTEMS_TASK_DELETE_READY_TASK 157
-RTEMS_TASK_SUSPEND_CALLING_TASK 81
-RTEMS_TASK_SUSPEND_RETURNS_TO_CALLER 45
-RTEMS_TASK_RESUME_TASK_READIED_RETURNS_TO_CALLER 46
-RTEMS_TASK_RESUME_TASK_READIED_PREEMPTS_CALLER 71
-RTEMS_TASK_SET_PRIORITY_OBTAIN_CURRENT_PRIORITY 30
-RTEMS_TASK_SET_PRIORITY_RETURNS_TO_CALLER 67
-RTEMS_TASK_SET_PRIORITY_PREEMPTS_CALLER 115
-RTEMS_TASK_MODE_OBTAIN_CURRENT_MODE 19
-RTEMS_TASK_MODE_NO_RESCHEDULE 21
-RTEMS_TASK_MODE_RESCHEDULE_RETURNS_TO_CALLER 27
-RTEMS_TASK_MODE_RESCHEDULE_PREEMPTS_CALLER 66
-RTEMS_TASK_GET_NOTE_ONLY 32
-RTEMS_TASK_SET_NOTE_ONLY 32
-RTEMS_TASK_WAKE_AFTER_YIELD_RETURNS_TO_CALLER 18
-RTEMS_TASK_WAKE_AFTER_YIELD_PREEMPTS_CALLER 63
-RTEMS_TASK_WAKE_WHEN_ONLY 128
-#
-#  Interrupt Manager
-#
-RTEMS_INTR_ENTRY_RETURNS_TO_NESTED 12
-RTEMS_INTR_ENTRY_RETURNS_TO_INTERRUPTED_TASK 13
-RTEMS_INTR_ENTRY_RETURNS_TO_PREEMPTING_TASK 12
-RTEMS_INTR_EXIT_RETURNS_TO_NESTED 10
-RTEMS_INTR_EXIT_RETURNS_TO_INTERRUPTED_TASK 13
-RTEMS_INTR_EXIT_RETURNS_TO_PREEMPTING_TASK 58
-#
-#  Clock Manager
-#
-RTEMS_CLOCK_SET_ONLY 85
-RTEMS_CLOCK_GET_ONLY 2
-RTEMS_CLOCK_TICK_ONLY 16
-#
-#  Timer Manager
-#
-RTEMS_TIMER_CREATE_ONLY 34
-RTEMS_TIMER_IDENT_ONLY 729
-RTEMS_TIMER_DELETE_INACTIVE 48
-RTEMS_TIMER_DELETE_ACTIVE 52
-RTEMS_TIMER_FIRE_AFTER_INACTIVE 65
-RTEMS_TIMER_FIRE_AFTER_ACTIVE 69
-RTEMS_TIMER_FIRE_WHEN_INACTIVE 92
-RTEMS_TIMER_FIRE_WHEN_ACTIVE 92
-RTEMS_TIMER_RESET_INACTIVE 58
-RTEMS_TIMER_RESET_ACTIVE 63
-RTEMS_TIMER_CANCEL_INACTIVE 32
-RTEMS_TIMER_CANCEL_ACTIVE 37
-#
-#  Semaphore Manager
-#
-RTEMS_SEMAPHORE_CREATE_ONLY 64
-RTEMS_SEMAPHORE_IDENT_ONLY 787
-RTEMS_SEMAPHORE_DELETE_ONLY 60
-RTEMS_SEMAPHORE_OBTAIN_AVAILABLE 41
-RTEMS_SEMAPHORE_OBTAIN_NOT_AVAILABLE_NO_WAIT 40
-RTEMS_SEMAPHORE_OBTAIN_NOT_AVAILABLE_CALLER_BLOCKS 123
-RTEMS_SEMAPHORE_RELEASE_NO_WAITING_TASKS 47
-RTEMS_SEMAPHORE_RELEASE_TASK_READIED_RETURNS_TO_CALLER 70
-RTEMS_SEMAPHORE_RELEASE_TASK_READIED_PREEMPTS_CALLER 95
-#
-#  Message Manager
-#
-RTEMS_MESSAGE_QUEUE_CREATE_ONLY 294
-RTEMS_MESSAGE_QUEUE_IDENT_ONLY 730
-RTEMS_MESSAGE_QUEUE_DELETE_ONLY 81
-RTEMS_MESSAGE_QUEUE_SEND_NO_WAITING_TASKS 117
-RTEMS_MESSAGE_QUEUE_SEND_TASK_READIED_RETURNS_TO_CALLER 118
-RTEMS_MESSAGE_QUEUE_SEND_TASK_READIED_PREEMPTS_CALLER 144
-RTEMS_MESSAGE_QUEUE_URGENT_NO_WAITING_TASKS 117
-RTEMS_MESSAGE_QUEUE_URGENT_TASK_READIED_RETURNS_TO_CALLER 116
-RTEMS_MESSAGE_QUEUE_URGENT_TASK_READIED_PREEMPTS_CALLER 144
-RTEMS_MESSAGE_QUEUE_BROADCAST_NO_WAITING_TASKS 53
-RTEMS_MESSAGE_QUEUE_BROADCAST_TASK_READIED_RETURNS_TO_CALLER 122
-RTEMS_MESSAGE_QUEUE_BROADCAST_TASK_READIED_PREEMPTS_CALLER 146
-RTEMS_MESSAGE_QUEUE_RECEIVE_AVAILABLE 93
-RTEMS_MESSAGE_QUEUE_RECEIVE_NOT_AVAILABLE_NO_WAIT 45
-RTEMS_MESSAGE_QUEUE_RECEIVE_NOT_AVAILABLE_CALLER_BLOCKS 127
-RTEMS_MESSAGE_QUEUE_FLUSH_NO_MESSAGES_FLUSHED 29
-RTEMS_MESSAGE_QUEUE_FLUSH_MESSAGES_FLUSHED 41
-#
-#  Event Manager
-#
-RTEMS_EVENT_SEND_NO_TASK_READIED 26
-RTEMS_EVENT_SEND_TASK_READIED_RETURNS_TO_CALLER 60
-RTEMS_EVENT_SEND_TASK_READIED_PREEMPTS_CALLER 89
-RTEMS_EVENT_RECEIVE_OBTAIN_CURRENT_EVENTS <1
-RTEMS_EVENT_RECEIVE_AVAILABLE 27
-RTEMS_EVENT_RECEIVE_NOT_AVAILABLE_NO_WAIT 25
-RTEMS_EVENT_RECEIVE_NOT_AVAILABLE_CALLER_BLOCKS 94
-#
-#  Signal Manager
-#
-RTEMS_SIGNAL_CATCH_ONLY 13
-RTEMS_SIGNAL_SEND_RETURNS_TO_CALLER 34
-RTEMS_SIGNAL_SEND_SIGNAL_TO_SELF 59
-RTEMS_SIGNAL_EXIT_ASR_OVERHEAD_RETURNS_TO_CALLING_TASK 39
-RTEMS_SIGNAL_EXIT_ASR_OVERHEAD_RETURNS_TO_PREEMPTING_TASK 60
-#
-#  Partition Manager
-#
-RTEMS_PARTITION_CREATE_ONLY 83
-RTEMS_PARTITION_IDENT_ONLY 730
-RTEMS_PARTITION_DELETE_ONLY 40
-RTEMS_PARTITION_GET_BUFFER_AVAILABLE 34
-RTEMS_PARTITION_GET_BUFFER_NOT_AVAILABLE 33
-RTEMS_PARTITION_RETURN_BUFFER_ONLY 40
-#
-#  Region Manager
-#
-RTEMS_REGION_CREATE_ONLY 68
-RTEMS_REGION_IDENT_ONLY 739
-RTEMS_REGION_DELETE_ONLY 39
-RTEMS_REGION_GET_SEGMENT_AVAILABLE 49
-RTEMS_REGION_GET_SEGMENT_NOT_AVAILABLE_NO_WAIT 45
-RTEMS_REGION_GET_SEGMENT_NOT_AVAILABLE_CALLER_BLOCKS 127
-RTEMS_REGION_RETURN_SEGMENT_NO_WAITING_TASKS 52
-RTEMS_REGION_RETURN_SEGMENT_TASK_READIED_RETURNS_TO_CALLER 113
-RTEMS_REGION_RETURN_SEGMENT_TASK_READIED_PREEMPTS_CALLER 138
-#
-#  Dual-Ported Memory Manager
-#
-RTEMS_PORT_CREATE_ONLY 39
-RTEMS_PORT_IDENT_ONLY 728
-RTEMS_PORT_DELETE_ONLY 39
-RTEMS_PORT_INTERNAL_TO_EXTERNAL_ONLY 26
-RTEMS_PORT_EXTERNAL_TO_INTERNAL_ONLY 26
-#
-#  IO Manager
-#
-RTEMS_IO_INITIALIZE_ONLY 4
-RTEMS_IO_OPEN_ONLY 1
-RTEMS_IO_CLOSE_ONLY 1
-RTEMS_IO_READ_ONLY <1
-RTEMS_IO_WRITE_ONLY 1
-RTEMS_IO_CONTROL_ONLY 1
-#
-#  Rate Monotonic Manager
-#
-RTEMS_RATE_MONOTONIC_CREATE_ONLY 36
-RTEMS_RATE_MONOTONIC_IDENT_ONLY 725
-RTEMS_RATE_MONOTONIC_CANCEL_ONLY 39
-RTEMS_RATE_MONOTONIC_DELETE_ACTIVE 53
-RTEMS_RATE_MONOTONIC_DELETE_INACTIVE 49
-RTEMS_RATE_MONOTONIC_PERIOD_INITIATE_PERIOD_RETURNS_TO_CALLER 53
-RTEMS_RATE_MONOTONIC_PERIOD_CONCLUDE_PERIOD_CALLER_BLOCKS 82
-RTEMS_RATE_MONOTONIC_PERIOD_OBTAIN_STATUS 30
-#
-#  Size Information
-#
-#
-#  xxx alloted for numbers
-#
-RTEMS_DATA_SPACE 833
-RTEMS_MINIMUM_CONFIGURATION 22,660
-RTEMS_MAXIMUM_CONFIGURATION 39,592
-#  x,xxx alloted for numbers
-RTEMS_CORE_CODE_SIZE 16,948
-RTEMS_INITIALIZATION_CODE_SIZE 916
-RTEMS_TASK_CODE_SIZE 3,436
-RTEMS_INTERRUPT_CODE_SIZE 52
-RTEMS_CLOCK_CODE_SIZE 296
-RTEMS_TIMER_CODE_SIZE 1,084
-RTEMS_SEMAPHORE_CODE_SIZE 1,500
-RTEMS_MESSAGE_CODE_SIZE 1,596
-RTEMS_EVENT_CODE_SIZE 1,036
-RTEMS_SIGNAL_CODE_SIZE 396
-RTEMS_PARTITION_CODE_SIZE 1,052
-RTEMS_REGION_CODE_SIZE 1,392
-RTEMS_DPMEM_CODE_SIZE 664
-RTEMS_IO_CODE_SIZE 676
-RTEMS_FATAL_ERROR_CODE_SIZE 20
-RTEMS_RATE_MONOTONIC_CODE_SIZE 1,132
-RTEMS_MULTIPROCESSING_CODE_SIZE 6,840
-#  xxx alloted for numbers
-RTEMS_TIMER_CODE_OPTSIZE 144
-RTEMS_SEMAPHORE_CODE_OPTSIZE 136
-RTEMS_MESSAGE_CODE_OPTSIZE 224
-RTEMS_EVENT_CODE_OPTSIZE 44
-RTEMS_SIGNAL_CODE_OPTSIZE 44
-RTEMS_PARTITION_CODE_OPTSIZE 104
-RTEMS_REGION_CODE_OPTSIZE 124
-RTEMS_DPMEM_CODE_OPTSIZE 104
-RTEMS_IO_CODE_OPTSIZE 00
-RTEMS_RATE_MONOTONIC_CODE_OPTSIZE 136
-RTEMS_MULTIPROCESSING_CODE_OPTSIZE 228
-#  xxx alloted for numbers
-RTEMS_BYTES_PER_TASK 372
-RTEMS_BYTES_PER_TIMER 68
-RTEMS_BYTES_PER_SEMAPHORE 124
-RTEMS_BYTES_PER_MESSAGE_QUEUE 148
-RTEMS_BYTES_PER_REGION 144
-RTEMS_BYTES_PER_PARTITION 56
-RTEMS_BYTES_PER_PORT 36
-RTEMS_BYTES_PER_PERIOD 36
-RTEMS_BYTES_PER_EXTENSION 64
-RTEMS_BYTES_PER_FP_TASK 108
-RTEMS_BYTES_PER_NODE 48
-RTEMS_BYTES_PER_GLOBAL_OBJECT 20
-RTEMS_BYTES_PER_PROXY 124
-#  x,xxx alloted for numbers
-RTEMS_BYTES_OF_FIXED_SYSTEM_REQUIREMENTS 6,768
diff --git a/doc/supplements/i386/Makefile b/doc/supplements/i386/Makefile
deleted file mode 100644
index b4e15003b9..0000000000
--- a/doc/supplements/i386/Makefile
+++ /dev/null
@@ -1,165 +0,0 @@
-#
-#  COPYRIGHT (c) 1988-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  All rights reserved.
-#
-#  $Id$
-#
-
-PROJECT=i386
-DISTRIBUTION_LEVEL=support
-
-include ../../Make.config
-
-REPLACE=../../tools/word-replace
-
-all: html info ps
-
-COMMON_FILES=../../common/cpright.texi ../../common/setup.texi
-
-GENERATED_FILES=\
-  cpumodel.texi callconv.texi memmodel.texi intr.texi fatalerr.texi \
-  bsp.texi cputable.texi timing.texi wksheets.texi timeFORCE386.texi
-
-FILES= $(PROJECT).texi \
-  preface.texi \
-  $(GENERATED_FILES)
-
-
-dirs:
-	$(make-dirs)
-
-info: dirs c_i386
-	cp c_$(PROJECT) $(INFO_INSTALL)
-	#cp c_$(PROJECT) c_$(PROJECT)-* $(INFO_INSTALL)
-
-c_i386: $(FILES)
-	$(MAKEINFO) $(PROJECT).texi
-
-dvi: $(PROJECT).dvi
-ps: dirs $(PROJECT).ps
-	
-$(PROJECT).ps: $(PROJECT).dvi
-	dvips -o $(PROJECT).ps $(PROJECT).dvi
-	cp $(PROJECT).ps $(PS_INSTALL)
-
-$(PROJECT).dvi: $(FILES)
-	$(TEXI2DVI) $(PROJECT).texi
-
-html: dirs $(FILES)
-	-mkdir -p $(WWW_INSTALL)/c_i386
-	$(TEXI2WWW) $(TEXI2WWW_ARGS) -dir $(WWW_INSTALL)/c_$(PROJECT) \
- 	    $(PROJECT).texi
-
-clean:
-	rm -f *.o $(PROG) *.txt core 
-	rm -f *.dvi *.ps *.log *.aux *.cp *.fn *.ky *.pg *.toc *.tp *.vr $(BASE)
-	rm -f $(PROJECT) $(PROJECT)-*
-	rm -f c_i386 c_i386-*
-	rm -f intr.t $(GENERATED_FILES)
-	rm -f wksheets.t wksheets_NOTIMES.t timing.t intr.t
-	rm -f timeFORCE386_.t timeFORCE386_.texi
-	rm -f *.fixed _*
-
-#
-#  Chapters which get automatic processing
-#
-
-cpumodel.texi: cpumodel.t Makefile
-	$(BMENU) -p "Preface" \
-	    -u "Top" \
-	    -n "Calling Conventions" ${*}.t
-
-callconv.texi: callconv.t Makefile
-	$(BMENU) -p "CPU Model Dependent Features Floating Point Unit" \
-	    -u "Top" \
-	    -n "Memory Model" ${*}.t
-
-memmodel.texi: memmodel.t Makefile
-	$(BMENU) -p "Calling Conventions User-Provided Routines" \
-	    -u "Top" \
-	    -n "Interrupt Processing" ${*}.t
-
-# Interrupt Chapter:
-#  1.  Replace Times and Sizes
-#  2.  Build Node Structure
-
-#intr.texi: intr.t FORCE386_TIMES
-#	${REPLACE} -p FORCE386_TIMES intr.t
-#	mv intr.t.fixed intr.texi
-
-# Interrupt Chapter:
-#  1.  Replace Times and Sizes
-#  2.  Build Node Structure
-intr.t: intr_NOTIMES.t FORCE386_TIMES
-	${REPLACE} -p FORCE386_TIMES intr_NOTIMES.t
-	mv intr_NOTIMES.t.fixed intr.t
-
-intr.texi: intr.t Makefile
-	$(BMENU) -p "Memory Model Flat Memory Model" \
-	    -u "Top" \
-	    -n "Default Fatal Error Processing" ${*}.t
-
-fatalerr.texi: fatalerr.t Makefile
-	$(BMENU) -p "Interrupt Processing Interrupt Stack" \
-	    -u "Top" \
-	    -n "Board Support Packages" ${*}.t
-
-bsp.texi: bsp.t Makefile
-	$(BMENU) -p "Default Fatal Error Processing Default Fatal Error Handler Operations" \
-	    -u "Top" \
-	    -n "Processor Dependent Information Table" ${*}.t
-
-cputable.texi: cputable.t Makefile
-	$(BMENU) -p "Board Support Packages Processor Initialization" \
-	    -u "Top" \
-	    -n "Memory Requirements" ${*}.t
-
-# Worksheets Chapter:
-#  1.  Obtain the Shared File
-#  2.  Replace Times and Sizes
-#  3.  Build Node Structure
-
-wksheets_NOTIMES.t: ../../common/wksheets.t
-	cp ../../common/wksheets.t wksheets_NOTIMES.t
-
-wksheets.t: wksheets_NOTIMES.t FORCE386_TIMES
-	${REPLACE} -p FORCE386_TIMES wksheets_NOTIMES.t
-	mv wksheets_NOTIMES.t.fixed wksheets.t
-
-wksheets.texi: wksheets.t Makefile
-	$(BMENU) -p "Processor Dependent Information Table CPU Dependent Information Table" \
-	    -u "Top" \
-	    -n "Timing Specification" ${*}.t
-
-# Timing Specification Chapter:
-#  1.  Copy the Shared File
-#  3.  Build Node Structure
-
-timing.t: ../../common/timing.t
-	cp ../../common/timing.t timing.t
-
-timing.texi: timing.t Makefile
-	$(BMENU) -p "Memory Requirements RTEMS RAM Workspace Worksheet" \
-            -u "Top" \
-            -n "CPU386 Timing Data" ${*}.t
-
-# Timing Data for BSP Chapter:
-#  1.  Copy the Shared File
-#  2.  Replace Times and Sizes
-#  3.  Build Node Structure
-
-timeFORCE386_.t: ../../common/timetbl.t timeFORCE386.t
-	cat timeFORCE386.t ../../common/timetbl.t            >timeFORCE386_.t
-	@echo                                               >>timeFORCE386_.t
-	@echo "@tex"                                        >>timeFORCE386_.t
-	@echo "\\global\\advance \\smallskipamount by 4pt"  >>timeFORCE386_.t
-	@echo "@end tex"                                    >>timeFORCE386_.t
-	${REPLACE} -p FORCE386_TIMES timeFORCE386_.t
-	mv timeFORCE386_.t.fixed timeFORCE386_.t
-
-timeFORCE386.texi: timeFORCE386_.t Makefile
-	$(BMENU) -p "Timing Specification Terminology" \
-	    -u "Top" \
-	    -n "Command and Variable Index" timeFORCE386_.t
-	mv timeFORCE386_.texi timeFORCE386.texi
diff --git a/doc/supplements/i386/bsp.t b/doc/supplements/i386/bsp.t
deleted file mode 100644
index c15fb24835..0000000000
--- a/doc/supplements/i386/bsp.t
+++ /dev/null
@@ -1,109 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Board Support Packages
-
-@section Introduction
-
-An RTEMS Board Support Package (BSP) must be designed to support a
-particular processor and target board combination.  This chapter presents a
-discussion of i386 specific BSP issues.  For more information on developing
-a BSP, refer to the chapter titled Board Support Packages in the RTEMS
-Applications User's Guide. 
-
-@section System Reset
-
-An RTEMS based application is initiated when the i386
-processor is reset.  When the i386 is reset,
-
-@itemize @bullet
-
-@item The EAX register is set to indicate the results of the processor's
-power-up self test.  If the self-test was not executed, the contents of
-this register are undefined.  Otherwise, a non-zero value indicates the
-processor is faulty and a zero value indicates a successful self-test.
-
-@item The DX register holds a component identifier and revision level.  DH
-contains 3 to indicate an i386 component and DL contains a unique revision
-level indicator. 
-
-@item Control register zero (CR0) is set such that the processor is in real
-mode with paging disabled.  Other portions of CR0 are used to indicate the
-presence of a numeric coprocessor. 
-
-@item All bits in the extended flags register (EFLAG) which are not
-permanently set are cleared.  This inhibits all maskable interrupts. 
-
-@item The Interrupt Descriptor Register (IDTR) is set to point at address
-zero. 
-
-@item All segment registers are set to zero. 
-
-@item The instruction pointer is set to 0x0000FFF0.  The first instruction
-executed after a reset is actually at 0xFFFFFFF0 because the i386 asserts
-the upper twelve address until the first intersegment (FAR) JMP or CALL
-instruction.  When a JMP or CALL is executed, the upper twelve address
-lines are lowered and the processor begins executing in the first megabyte
-of memory.
-
-@end itemize
-
-Typically, an intersegment JMP to the application's initialization code is
-placed at address 0xFFFFFFF0. 
-
-@section Processor Initialization
-
-This initialization code is responsible for initializing all data
-structures required by the i386 in protected mode and for actually entering
-protected mode.  The i386 must be placed in protected mode and the segment
-registers and associated selectors must be initialized before the
-initialize_executive directive is invoked. 
-
-The initialization code is responsible for initializing the Global
-Descriptor Table such that the i386 is in the thirty-two bit flat memory
-model with paging disabled.  In this mode, the i386 automatically converts
-every address from a logical to a physical address each time it is used. 
-For more information on the memory model used by RTEMS, please refer to the
-Memory Model chapter in this document. 
-
-Since the processor is in real mode upon reset, the processor must be
-switched to protected mode before RTEMS can execute.  Before switching to
-protected mode, at least one descriptor table and two descriptors must be
-created.  Descriptors are needed for a code segment and a data segment. (
-This will give you the flat memory model.)  The stack can be placed in a
-normal read/write data segment, so no descriptor for the stack is needed.
-Before the GDT can be used, the base address and limit must be loaded into
-the GDTR register using an LGDT instruction. 
-
-If the hardware allows an NMI to be generated, you need to create the IDT
-and a gate for the NMI interrupt handler.  Before the IDT can be used, the
-base address and limit for the idt must be loaded into the IDTR register
-using an LIDT instruction. 
-
-Protected mode is entered by setting thye PE bit in the CR0 register. 
-Either a LMSW or MOV CR0 instruction may be used to set this bit. Because
-the processor overlaps the interpretation of several instructions, it is
-necessary to discard the instructions from the read-ahead cache. A JMP
-instruction immediately after the LMSW changes the flow and empties the
-processor if intructions which have been pre-fetched and/or decoded.  At
-this point, the processor is in protected mode and begins to perform
-protected mode application initialization.
-
-If the application requires that the IDTR be some value besides zero, then
-it should set it to the required value at this point.  All tasks share the
-same i386 IDTR value.  Because interrupts are enabled automatically by
-RTEMS as part of the initialize_executive directive, the IDTR MUST be set
-properly before this directive is invoked to insure correct interrupt
-vectoring.  If processor caching is to be utilized, then it should be
-enabled during the reset application initialization code.  The reset code
-which is executed before the call to initialize_executive has the following
-requirements:
-
-For more information regarding the i386s data structures and their
-contents, refer to Intel's 386 Programmer's Reference Manual.
-
diff --git a/doc/supplements/i386/callconv.t b/doc/supplements/i386/callconv.t
deleted file mode 100644
index 22415238f4..0000000000
--- a/doc/supplements/i386/callconv.t
+++ /dev/null
@@ -1,90 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Calling Conventions
-
-@section Introduction
-
-Each high-level language compiler generates
-subroutine entry and exit code based upon a set of rules known
-as the compiler's calling convention.   These rules address the
-following issues:
-
-@itemize @bullet
-@item register preservation and usage
-
-@item parameter passing
-
-@item call and return mechanism
-@end itemize
-
-A compiler's calling convention is of importance when
-interfacing to subroutines written in another language either
-assembly or high-level.  Even when the high-level language and
-target processor are the same, different compilers may use
-different calling conventions.  As a result, calling conventions
-are both processor and compiler dependent.
-
-@section Processor Background
-
-The i386 architecture supports a simple yet effective
-call and return mechanism.  A subroutine is invoked via the call
-(call) instruction.  This instruction pushes the return address
-on the stack.  The return from subroutine (ret) instruction pops
-the return address off the current stack and transfers control
-to that instruction.  It is is important to note that the i386
-call and return mechanism does not automatically save or restore
-any registers.  It is the responsibility of the high-level
-language compiler to define the register preservation and usage
-convention.
-
-@section Calling Mechanism
-
-All RTEMS directives are invoked using a call
-instruction and return to the user application via the ret
-instruction.
-
-@section Register Usage
-
-As discussed above, the call instruction does not
-automatically save any registers.  RTEMS uses the registers EAX,
-ECX, and EDX as scratch registers.  These registers are not
-preserved by RTEMS directives therefore, the contents of these
-registers should not be assumed upon return from any RTEMS
-directive.
-
-@section Parameter Passing
-
-RTEMS assumes that arguments are placed on the
-current stack before the directive is invoked via the call
-instruction.  The first argument is assumed to be closest to the
-return address on the stack.  This means that the first argument
-of the C calling sequence is pushed last.  The following
-pseudo-code illustrates the typical sequence used to call a
-RTEMS directive with three (3) arguments:
-
-@example
-push third argument
-push second argument
-push first argument
-invoke directive
-remove arguments from the stack
-@end example
-
-The arguments to RTEMS are typically pushed onto the
-stack using a push instruction.  These arguments must be removed
-from the stack after control is returned to the caller.  This
-removal is typically accomplished by adding the size of the
-argument list in bytes to the stack pointer.
-
-@section User-Provided Routines
-
-All user-provided routines invoked by RTEMS, such as
-user extensions, device drivers, and MPCI routines, must also
-adhere to these calling conventions.
-
diff --git a/doc/supplements/i386/cpumodel.t b/doc/supplements/i386/cpumodel.t
deleted file mode 100644
index 9b65e1d61d..0000000000
--- a/doc/supplements/i386/cpumodel.t
+++ /dev/null
@@ -1,72 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter CPU Model Dependent Features
-
-@section Introduction
-
-Microprocessors are generally classified into
-families with a variety of CPU models or implementations within
-that family.  Within a processor family, there is a high level
-of binary compatibility.  This family may be based on either an
-architectural specification or on maintaining compatibility with
-a popular processor.  Recent microprocessor families such as the
-SPARC or PA-RISC are based on an architectural specification
-which is independent or any particular CPU model or
-implementation.  Older families such as the M68xxx and the iX86
-evolved as the manufacturer strived to produce higher
-performance processor models which maintained binary
-compatibility with older models.
-
-RTEMS takes advantage of the similarity of the
-various models within a CPU family.  Although the models do vary
-in significant ways, the high level of compatibility makes it
-possible to share the bulk of the CPU dependent executive code
-across the entire family.  Each processor family supported by
-RTEMS has a list of features which vary between CPU models
-within a family.  For example, the most common model dependent
-feature regardless of CPU family is the presence or absence of a
-floating point unit or coprocessor.  When defining the list of
-features present on a particular CPU model, one simply notes
-that floating point hardware is or is not present and defines a
-single constant appropriately.  Conditional compilation is
-utilized to include the appropriate source code for this CPU
-model's feature set.  It is important to note that this means
-that RTEMS is thus compiled using the appropriate feature set
-and compilation flags optimal for this CPU model used.  The
-alternative would be to generate a binary which would execute on
-all family members using only the features which were always
-present.
-
-This chapter presents the set of features which vary
-across i386 implementations and are of importance to RTEMS.
-The set of CPU model feature macros are defined in the file
-c/src/exec/score/cpu/i386/i386.h based upon the particular CPU
-model defined on the compilation command line.
-
-@section CPU Model Name
-
-The macro CPU_MODEL_NAME is a string which designates
-the name of this CPU model.  For example, for the Intel i386 without an
-i387 coprocessor, this macro is set to the string "i386 with i387".
-
-@section bswap Instruction
-
-The macro I386_HAS_BSWAP is set to 1 to indicate that
-this CPU model has the @code{bswap} instruction which
-endian swaps a thirty-two bit quantity.  This instruction
-appears to be present in all CPU models
-i486's and above.
-
-@section Floating Point Unit
-
-The macro I386_HAS_FPU is set to 1 to indicate that
-this CPU model has a hardware floating point unit and 0
-otherwise.  The hardware floating point may be on-chip (as in the
-case of an i486DX or Pentium) or as a coprocessor (as in the case of
-an i386/i387 combination).
diff --git a/doc/supplements/i386/cputable.t b/doc/supplements/i386/cputable.t
deleted file mode 100644
index 9da005f732..0000000000
--- a/doc/supplements/i386/cputable.t
+++ /dev/null
@@ -1,121 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Processor Dependent Information Table
-
-@section Introduction
-
-Any highly processor dependent information required
-to describe a processor to RTEMS is provided in the CPU
-Dependent Information Table.  This table is not required for all
-processors supported by RTEMS.  This chapter describes the
-contents, if any, for a particular processor type.
-
-@section CPU Dependent Information Table
-
-The i386 version of the RTEMS CPU Dependent
-Information Table contains the information required to interface
-a Board Support Package and RTEMS on the i386.  This information
-is provided to allow RTEMS to interoperate effectively with the
-BSP.  The C structure definition is given here:
-
-@example
-@group
-typedef struct @{
-  void       (*pretasking_hook)( void );
-  void       (*predriver_hook)( void );
-  void       (*idle_task)( void );
-  boolean      do_zero_of_workspace;
-  unsigned32   idle_task_stack_size;
-  unsigned32   interrupt_stack_size;
-  unsigned32   extra_mpci_receive_server_stack;
-  void *     (*stack_allocate_hook)( unsigned32 );
-  void       (*stack_free_hook)( void* );
-  /* end of fields required on all CPUs */
- 
-  unsigned32   interrupt_segment;
-  void        *interrupt_vector_table;
-@} rtems_cpu_table;
-@end group
-@end example
-
-@table @code
-@item pretasking_hook
-is the address of the
-user provided routine which is invoked once RTEMS initialization
-is complete but before interrupts and tasking are enabled.  This
-field may be NULL to indicate that the hook is not utilized.
-
-@item predriver_hook
-is the address of the user provided
-routine which is invoked with tasking enabled immediately before
-the MPCI and device drivers are initialized. RTEMS
-initialization is complete, interrupts and tasking are enabled,
-but no device drivers are initialized.  This field may be NULL to
-indicate that the hook is not utilized.
-
-@item postdriver_hook
-is the address of the user provided
-routine which is invoked with tasking enabled immediately after
-the MPCI and device drivers are initialized. RTEMS
-initialization is complete, interrupts and tasking are enabled,
-and the device drivers are initialized.  This field may be NULL
-to indicate that the hook is not utilized.
-
-@item idle_task
-is the address of the optional user
-provided routine which is used as the system's IDLE task.  If
-this field is not NULL, then the RTEMS default IDLE task is not
-used.  This field may be NULL to indicate that the default IDLE
-is to be used.
-
-@item do_zero_of_workspace
-indicates whether RTEMS should
-zero the Workspace as part of its initialization.  If set to
-TRUE, the Workspace is zeroed.  Otherwise, it is not.
-
-@item idle_task_stack_size
-is the size of the RTEMS idle task stack in bytes.  
-If this number is less than MINIMUM_STACK_SIZE, then the 
-idle task's stack will be MINIMUM_STACK_SIZE in byte.
-
-@item interrupt_stack_size
-is the size of the RTEMS
-allocated interrupt stack in bytes.  This value must be at least
-as large as MINIMUM_STACK_SIZE.
-
-@item extra_mpci_receive_server_stack
-is the extra stack space allocated for the RTEMS MPCI receive server task
-in bytes.  The MPCI receive server may invoke nearly all directives and 
-may require extra stack space on some targets.
-
-@item stack_allocate_hook
-is the address of the optional user provided routine which allocates 
-memory for task stacks.  If this hook is not NULL, then a stack_free_hook
-must be provided as well.
-
-@item stack_free_hook
-is the address of the optional user provided routine which frees 
-memory for task stacks.  If this hook is not NULL, then a stack_allocate_hook
-must be provided as well.
-
-@item interrupt_segment
-is the value of the selector which should be placed in a segment 
-register to access the Interrupt Descriptor Table.
-
-@item interrupt_vector_table
-is the base address of the Interrupt Descriptor Table relative to the 
-interrupt_segment.
-
-@end table
-
-The contents of the i386 Interrupt Descriptor Table
-are discussed in  Intel's i386 User's Manual.  Structure
-definitions for the i386 IDT is provided by including the file
-rtems.h.
-
diff --git a/doc/supplements/i386/fatalerr.t b/doc/supplements/i386/fatalerr.t
deleted file mode 100644
index 7f9e0f3c56..0000000000
--- a/doc/supplements/i386/fatalerr.t
+++ /dev/null
@@ -1,31 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Default Fatal Error Processing
-
-@section Introduction
-
-Upon detection of a fatal error by either the
-application or RTEMS the fatal error manager is invoked.  The
-fatal error manager will invoke the user-supplied fatal error
-handlers.  If no user-supplied handlers are configured,  the
-RTEMS provided default fatal error handler is invoked.  If the
-user-supplied fatal error handlers return to the executive the
-default fatal error handler is then invoked.  This chapter
-describes the precise operations of the default fatal error
-handler.
-
-@section Default Fatal Error Handler Operations
-
-The default fatal error handler which is invoked by
-the fatal_error_occurred directive when there is no user handler
-configured or the user handler returns control to RTEMS.  The
-default fatal error handler disables processor interrupts,
-places the error code in EAX, and executes a HLT instruction to
-halt the processor.
-
diff --git a/doc/supplements/i386/i386.texi b/doc/supplements/i386/i386.texi
deleted file mode 100644
index 5e051828fe..0000000000
--- a/doc/supplements/i386/i386.texi
+++ /dev/null
@@ -1,120 +0,0 @@
-\input ../../texinfo/texinfo   @c -*-texinfo-*-
-@c %**start of header
-@setfilename c_i386
-@syncodeindex vr fn
-@synindex ky cp
-@paragraphindent 0
-@c @smallbook
-@c %**end of header
-
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@c
-@c   Master file for the Intel i386 Applications Supplement
-@c
-
-@include ../../common/setup.texi
-
-@ignore
-@ifinfo
-@format
-START-INFO-DIR-ENTRY
-* RTEMS Intel i386 Applications Supplement (i386):
-END-INFO-DIR-ENTRY
-@end format
-@end ifinfo
-@end ignore
-
-@c
-@c  Title Page Stuff
-@c
-
-@set edition @value{RTEMS-EDITION}
-@set version @value{RTEMS-VERSION}
-@set update-date @value{RTEMS-UPDATE-DATE}
-@set update-month @value{RTEMS-UPDATE-MONTH}
-
-@c
-@c  I don't really like having a short title page.  --joel
-@c
-@c @shorttitlepage RTEMS Intel i386 Applications Supplement 
-
-@setchapternewpage odd
-@settitle RTEMS Intel i386 Applications Supplement 
-@titlepage
-@finalout
-
-@title RTEMS Intel i386 Applications Supplement 
-@subtitle Edition @value{edition}, for RTEMS @value{version}
-@sp 1
-@subtitle @value{update-month}
-@author On-Line Applications Research Corporation
-@page
-@include ../../common/cpright.texi
-@end titlepage
-
-@c  This prevents a black box from being printed on "overflow" lines.
-@c  The alternative is to rework a sentence to avoid this problem.
-
-@include preface.texi
-@include cpumodel.texi
-@include callconv.texi
-@include memmodel.texi
-@include intr.texi
-@include fatalerr.texi
-@include bsp.texi
-@include cputable.texi
-@include wksheets.texi
-@include timing.texi
-@include timeFORCE386.texi
-@ifinfo
-@node Top, Preface, (dir), (dir)
-@top c_i386
-
-This is the online version of the RTEMS Intel i386
-Applications Supplement.
-
-@menu
-* Preface::
-* CPU Model Dependent Features::
-* Calling Conventions::
-* Memory Model::
-* Interrupt Processing::
-* Default Fatal Error Processing::
-* Board Support Packages::
-* Processor Dependent Information Table::
-* Memory Requirements::
-* Timing Specification::
-* CPU386 Timing Data::
-* Command and Variable Index::
-* Concept Index::
-@end menu
-
-@end ifinfo
-@c 
-@c 
-@c Need to copy the emacs stuff and "trailer stuff" (index, toc) into here
-@c
-
-@node Command and Variable Index, Concept Index, CPU386 Timing Data Rate Monotonic Manager, Top
-@unnumbered Command and Variable Index
-
-There are currently no Command and Variable Index entries.
-
-@c @printindex fn
-
-@node Concept Index, , Command and Variable Index, Top
-@unnumbered Concept Index
-
-There are currently no Concept Index entries.
-@c @printindex cp
-
-@c @contents
-@bye
-
diff --git a/doc/supplements/i386/intr_NOTIMES.t b/doc/supplements/i386/intr_NOTIMES.t
deleted file mode 100644
index 933973daa7..0000000000
--- a/doc/supplements/i386/intr_NOTIMES.t
+++ /dev/null
@@ -1,168 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Interrupt Processing
-
-@section Introduction
-
-Different types of processors respond to the
-occurrence of an interrupt in their own unique fashion. In
-addition, each processor type provides a control mechanism to
-allow the proper handling of an interrupt.  The processor
-dependent response to the interrupt modifies the execution state
-and results in the modification of the execution stream. This
-modification usually requires that an interrupt handler utilize
-the provided control mechanisms to return to the normal
-processing stream.  Although RTEMS hides many of the processor
-dependent details of interrupt processing, it is important to
-understand how the RTEMS interrupt manager is mapped onto the
-processor's unique architecture. Discussed in this chapter are
-the the processor's response and control mechanisms as they
-pertain to RTEMS.
-
-@section Vectoring of Interrupt Handler
-
-Although the i386 supports multiple privilege levels,
-RTEMS and all user software executes at privilege level 0.  This
-decision was made by the RTEMS designers to enhance
-compatibility with processors which do not provide sophisticated
-protection facilities like those of the i386.  This decision
-greatly simplifies the discussion of i386 processing, as one
-need only consider interrupts without privilege transitions.
-
-Upon receipt of an interrupt  the i386 automatically
-performs the following actions:
-
-@itemize @bullet
-@item pushes the EFLAGS register
-
-@item pushes the far address of the interrupted instruction
-
-@item vectors to the interrupt service routine (ISR).
-@end itemize
-
-A nested interrupt is processed similarly by the
-i386.
-
-@section Interrupt Stack Frame
-
-The structure of the Interrupt Stack Frame for the
-i386 which is placed on the interrupt stack by the processor in
-response to an interrupt is as follows:
-
-@ifset use-ascii
-@example
-@group
-               +----------------------+
-               | Old EFLAGS Register  | ESP+8
-               +----------+-----------+
-               |   UNUSED |  Old CS   | ESP+4
-               +----------+-----------+
-               |       Old EIP        | ESP
-               +----------------------+
-@end group
-@end example
-@end ifset
-
-@ifset use-tex
-@sp 1
-@tex
-\centerline{\vbox{\offinterlineskip\halign{
-\strut\vrule#&
-\hbox to 1.00in{\enskip\hfil#\hfil}&
-\vrule#&
-\hbox to 1.00in{\enskip\hfil#\hfil}&
-\vrule#&
-\hbox to 0.75in{\enskip\hfil#\hfil}
-\cr
-\multispan{4}\hrulefill\cr
-& \multispan{3} Old EFLAGS Register\quad&&ESP+8\cr
-\multispan{4}\hrulefill\cr
-&UNUSED &&Old CS &&ESP+4\cr
-\multispan{4}\hrulefill\cr
-& \multispan{3} Old EIP && ESP\cr
-\multispan{4}\hrulefill\cr
-}}\hfil}
-@end tex
-@end ifset
- 
-@ifset use-html
-@html
-<CENTER>
-  <TABLE COLS=3 WIDTH="40%" BORDER=2>
-<TR><TD ALIGN=center COLSPAN=2><STRONG>Old EFLAGS Register</STRONG></TD>
-    <TD ALIGN=center>0x0</TD></TR>
-<TR><TD ALIGN=center><STRONG>UNUSED</STRONG></TD>
-    <TD ALIGN=center><STRONG>Old CS</STRONG></TD>
-    <TD ALIGN=center>0x2</TD></TR>
-<TR><TD ALIGN=center COLSPAN=2><STRONG>Old EIP</STRONG></TD>
-    <TD ALIGN=center>0x4</TD></TR>
-  </TABLE>
-</CENTER>
-@end html
-@end ifset
-
-@section Interrupt Levels
-
-Although RTEMS supports 256 interrupt levels, the
-i386 only supports two -- enabled and disabled.  Interrupts are
-enabled when the interrupt-enable flag (IF) in the extended
-flags (EFLAGS) is set.  Conversely, interrupt processing is
-inhibited when the IF is cleared.  During a non-maskable
-interrupt, all other interrupts, including other non-maskable
-ones, are inhibited.
-
-RTEMS interrupt levels 0 and 1 such that level zero
-(0) indicates that interrupts are fully enabled and level one
-that interrupts are disabled.  All other RTEMS interrupt levels
-are undefined and their behavior is unpredictable.
-
-@section Disabling of Interrupts by RTEMS
-
-During the execution of directive calls, critical
-sections of code may be executed.  When these sections are
-encountered, RTEMS disables interrupts before the execution of
-this section and restores them to the previous level upon
-completion of the section.  RTEMS has been optimized to insure
-that interrupts are disabled for less than RTEMS_MAXIMUM_DISABLE_PERIOD
-microseconds on a RTEMS_MAXIMUM_DISABLE_PERIOD_MHZ Mhz i386 with zero
-wait states.  These numbers will vary based the number of wait states
-and processor speed present on the target board.   [NOTE:  The maximum
-period with interrupts disabled within RTEMS was last calculated for
-Release RTEMS_RELEASE_FOR_MAXIMUM_DISABLE_PERIOD.]
-
-Non-maskable interrupts (NMI) cannot be disabled, and
-ISRs which execute at this level MUST NEVER issue RTEMS system
-calls.  If a directive is invoked, unpredictable results may
-occur due to the inability of RTEMS to protect its critical
-sections.  However, ISRs that make no system calls may safely
-execute as non-maskable interrupts.
-
-@section Interrupt Stack
-
-The i386 family does not support a dedicated hardware
-interrupt stack.  On this processor, RTEMS allocates and manages
-a dedicated interrupt stack.  As part of vectoring a non-nested
-interrupt service routine, RTEMS switches from the stack of the
-interrupted task to a dedicated interrupt stack.  When a
-non-nested interrupt returns, RTEMS switches back to the stack
-of the interrupted stack.  The current stack pointer is not
-altered by RTEMS on nested interrupt.
-
-Without a dedicated interrupt stack, every task in
-the system MUST have enough stack space to accommodate the worst
-case stack usage of that particular task and the interrupt
-service routines COMBINED.  By supporting a dedicated interrupt
-stack, RTEMS significantly lowers the stack requirements for
-each task.
-
-RTEMS allocates the dedicated interrupt stack from
-the Workspace Area.  The amount of memory allocated for the
-interrupt stack is determined by the interrupt_stack_size field
-in the CPU Configuration Table.
-
diff --git a/doc/supplements/i386/memmodel.t b/doc/supplements/i386/memmodel.t
deleted file mode 100644
index e8bb2ab48d..0000000000
--- a/doc/supplements/i386/memmodel.t
+++ /dev/null
@@ -1,72 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Memory Model
-
-@section Introduction
-
-A processor may support any combination of memory
-models ranging from pure physical addressing to complex demand
-paged virtual memory systems.  RTEMS supports a flat memory
-model which ranges contiguously over the processor's allowable
-address space.  RTEMS does not support segmentation or virtual
-memory of any kind.  The appropriate memory model for RTEMS
-provided by the targeted processor and related characteristics
-of that model are described in this chapter.
-
-@section Flat Memory Model
-
-RTEMS supports the i386 protected mode, flat memory
-model with paging disabled.  In this mode, the i386
-automatically converts every address from a logical to a
-physical address each time it is used.  The i386 uses
-information provided in the segment registers and the Global
-Descriptor Table to convert these addresses.  RTEMS assumes the
-existence of the following segments:
-
-@itemize @bullet
-@item a single code segment at protection level (0) which
-contains all application and executive code.
-
-@item a single data segment at protection level zero (0) which
-contains all application and executive data.
-@end itemize
-
-The i386 segment registers and associated selectors
-must be initialized when the initialize_executive directive is
-invoked.  RTEMS treats the segment registers as system registers
-and does not modify or context switch them.
-
-This i386 memory model supports a flat 32-bit address
-space with addresses ranging from 0x00000000 to 0xFFFFFFFF (4
-gigabytes).  Each address is represented by a 32-bit value and
-is byte addressable.  The address may be used to reference a
-single byte, half-word (2-bytes), or word (4 bytes).
-
-RTEMS does not require that logical addresses map
-directly to physical addresses, although it is desirable in many
-applications to do so.  If logical and physical addresses are
-not the same, then an additional selector will be required so
-RTEMS can access the Interrupt Descriptor Table to install
-interrupt service routines.  The selector number of this segment
-is provided to RTEMS in the CPU Dependent Information Table.
-
-By not requiring that logical addresses map directly
-to physical addresses, the memory space of an RTEMS application
-can be separated from that of a ROM monitor.  For example, on
-the Force Computers CPU386, the ROM monitor loads application
-programs into a logical address space where logical address
-0x00000000 corresponds to physical address 0x0002000.  On this
-board, RTEMS and the application use virtual addresses which do
-not map to physical addresses.
-
-RTEMS assumes that the DS and ES registers contain
-the selector for the single data segment when a directive is
-invoked.   This assumption is especially important when
-developing interrupt service routines.
-
diff --git a/doc/supplements/i386/preface.texi b/doc/supplements/i386/preface.texi
deleted file mode 100644
index 5dcf605d60..0000000000
--- a/doc/supplements/i386/preface.texi
+++ /dev/null
@@ -1,41 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@ifinfo
-@node Preface, CPU Model Dependent Features, Top, Top
-@end ifinfo
-@unnumbered Preface
-
-The Real Time Executive for Multiprocessor Systems
-(RTEMS) is designed to be portable across multiple processor
-architectures.  However, the nature of real-time systems makes
-it essential that the application designer understand certain
-processor dependent implementation details.  These processor
-dependencies include calling convention, board support package
-issues, interrupt processing, exact RTEMS memory requirements,
-performance data, header files, and the assembly language
-interface to the executive.
-
-For information on the i386 processor, refer to the
-following documents:
-
-@itemize @bullet
-@item @cite{386 Programmer's Reference Manual, Intel, Order No.  230985-002}.
-
-@item @cite{386 Microprocessor Hardware Reference Manual, Intel,
-Order No. 231732-003}.
-
-@item @cite{80386 System Software Writer's Guide, Intel, Order No.  231499-001}.
-
-@item @cite{80387 Programmer's Reference Manual, Intel, Order No.  231917-001}.
-@end itemize
-
-It is highly recommended that the i386 RTEMS
-application developer obtain and become familiar with Intel's
-386 Programmer's Reference Manual.
-
diff --git a/doc/supplements/i386/timeFORCE386.t b/doc/supplements/i386/timeFORCE386.t
deleted file mode 100644
index 88d8ea09cf..0000000000
--- a/doc/supplements/i386/timeFORCE386.t
+++ /dev/null
@@ -1,101 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@include ../../common/timemac.texi
-@tex
-\global\advance \smallskipamount by -4pt
-@end tex
- 
-@chapter CPU386 Timing Data
-
-@section Introduction
-
-The timing data for the i386 version of RTEMS is
-provided along with the target dependent aspects concerning the
-gathering of the timing data.  The hardware platform used to
-gather the times is described to give the reader a better
-understanding of each directive time provided.  Also, provided
-is a description of the  interrupt latency and the context
-switch times as they pertain to the i386 version of RTEMS.
-
-@section Hardware Platform
-
-All times reported except for the maximum period
-interrupts are disabled by RTEMS were measured using a Force
-Computers CPU386 board.  The CPU386 is a 16 Mhz board with zero
-wait state dynamic memory and an i80387 numeric coprocessor.
-One of the count-down timers provided by a Motorola MC68901 was
-used to measure elapsed time with one microsecond resolution.
-All sources of hardware interrupts are disabled, although the
-interrupt level of the i386 allows all interrupts.
-
-The maximum period interrupts are disabled was
-measured by summing the number of CPU cycles required by each
-assembly language instruction executed while interrupts were
-disabled.  Zero wait state memory was assumed.  The total CPU
-cycles executed with interrupts disabled, including the
-instructions to disable and enable interrupts, was divided by 16
-to simulate a i386 executing at 16 Mhz.
-
-@section Interrupt Latency
-
-The maximum period with interrupts disabled within
-RTEMS is less than RTEMS_MAXIMUM_DISABLE_PERIOD microseconds 
-including the instructions
-which disable and re-enable interrupts.  The time required for
-the i386 to generate an interrupt using the int instruction,
-vectoring to an interrupt handler, and for the RTEMS entry
-overhead before invoking the user's interrupt handler are a
-total of 12 microseconds.  These combine to yield a worst case
-interrupt latency of less 
-RTEMS_MAXIMUM_DISABLE_PERIOD + RTEMS_INTR_ENTRY_RETURNS_TO_PREEMPTING_TASK 
-microseconds.  [NOTE:  The
-maximum period with interrupts disabled within RTEMS was last
-calculated for Release RTEMS_RELEASE_FOR_MAXIMUM_DISABLE_PERIOD.]
-
-It should be noted again that the maximum period with
-interrupts disabled within RTEMS is hand-timed.  The interrupt
-vector and entry overhead time was generated on the Force
-Computers CPU386 benchmark platform using the int instruction as
-the interrupt source.
-
-@section Context Switch
-
-The RTEMS processor context switch time is RTEMS_NO_FP_CONTEXTS
-microseconds on the Force Computers CPU386 benchmark platform.
-This time represents the raw context switch time with no user
-extensions configured.  Additional execution time is required
-when a TASK_SWITCH user extension is configured.  The use of the
-TASK_SWITCH extension is application dependent.  Thus, its
-execution time is not considered part of the base context switch
-time.
-
-Since RTEMS was designed specifically for embedded
-missile applications which are floating point intensive, the
-executive is optimized to avoid unnecessarily saving and
-restoring the state of the numeric coprocessor.  The state of
-the numeric coprocessor is only saved when a FLOATING_POINT task
-is dispatched and that task was not the last task to utilize the
-coprocessor.  In a system with only one FLOATING_POINT task, the
-state of the numeric coprocessor will never be saved or
-restored.  When the first FLOATING_POINT task is dispatched,
-RTEMS does not need to save the current state of the numeric
-coprocessor.
-
-The exact amount of time required to save and restore
-floating point context is dependent on the state of the numeric
-coprocessor.  RTEMS places the coprocessor in the initialized
-state when a task is started or restarted.  Once the task has
-utilized the coprocessor, it is in the idle state when floating
-point instructions are not executing and the busy state when
-floating point instructions are executing.  The state of the
-coprocessor is task specific.
-
-The following table summarizes the context switch
-times for the Force Computers CPU386 benchmark platform:
-
diff --git a/doc/supplements/i960/CVME961_TIMES b/doc/supplements/i960/CVME961_TIMES
deleted file mode 100644
index 17e022c0f5..0000000000
--- a/doc/supplements/i960/CVME961_TIMES
+++ /dev/null
@@ -1,247 +0,0 @@
-#
-#  Intel i960/Cyclone CVME961 (i960CA) Timing and Size Information
-#
-#  $Id$
-#
-
-#
-#  CPU Model Information
-#
-RTEMS_BSP       CVME961
-RTEMS_CPU_MODEL i960CA
-#
-#  Interrupt Latency
-#
-#  NOTE:  In general, the text says it is hand-calculated to be
-#         RTEMS_MAXIMUM_DISABLE_PERIOD at RTEMS_MAXIMUM_DISABLE_PERIOD_MHZ
-#         Mhz and this was last calculated for Release 
-#         RTEMS_VERSION_FOR_MAXIMUM_DISABLE_PERIOD.
-#
-RTEMS_MAXIMUM_DISABLE_PERIOD 2.5
-RTEMS_MAXIMUM_DISABLE_PERIOD_MHZ 33
-RTEMS_RELEASE_FOR_MAXIMUM_DISABLE_PERIOD 3.2.1
-#
-#  Context Switch Times
-#
-RTEMS_NO_FP_CONTEXTS 1
-RTEMS_RESTORE_1ST_FP_TASK 2
-RTEMS_SAVE_INIT_RESTORE_INIT 3
-RTEMS_SAVE_IDLE_RESTORE_INIT 4
-RTEMS_SAVE_IDLE_RESTORE_IDLE 5
-#
-#  Task Manager Times
-#
-RTEMS_TASK_CREATE_ONLY 6
-RTEMS_TASK_IDENT_ONLY 7
-RTEMS_TASK_START_ONLY 8
-RTEMS_TASK_RESTART_CALLING_TASK 9
-RTEMS_TASK_RESTART_SUSPENDED_RETURNS_TO_CALLER 9
-RTEMS_TASK_RESTART_BLOCKED_RETURNS_TO_CALLER 10
-RTEMS_TASK_RESTART_READY_RETURNS_TO_CALLER 11
-RTEMS_TASK_RESTART_SUSPENDED_PREEMPTS_CALLER 12
-RTEMS_TASK_RESTART_BLOCKED_PREEMPTS_CALLER 13
-RTEMS_TASK_RESTART_READY_PREEMPTS_CALLER 14
-RTEMS_TASK_DELETE_CALLING_TASK 15
-RTEMS_TASK_DELETE_SUSPENDED_TASK 16
-RTEMS_TASK_DELETE_BLOCKED_TASK 17
-RTEMS_TASK_DELETE_READY_TASK 18
-RTEMS_TASK_SUSPEND_CALLING_TASK 19
-RTEMS_TASK_SUSPEND_RETURNS_TO_CALLER 20
-RTEMS_TASK_RESUME_TASK_READIED_RETURNS_TO_CALLER 21
-RTEMS_TASK_RESUME_TASK_READIED_PREEMPTS_CALLER 22
-RTEMS_TASK_SET_PRIORITY_OBTAIN_CURRENT_PRIORITY 23
-RTEMS_TASK_SET_PRIORITY_RETURNS_TO_CALLER 24
-RTEMS_TASK_SET_PRIORITY_PREEMPTS_CALLER 25
-RTEMS_TASK_MODE_OBTAIN_CURRENT_MODE 26
-RTEMS_TASK_MODE_NO_RESCHEDULE 27
-RTEMS_TASK_MODE_RESCHEDULE_RETURNS_TO_CALLER 28
-RTEMS_TASK_MODE_RESCHEDULE_PREEMPTS_CALLER 29
-RTEMS_TASK_GET_NOTE_ONLY 30
-RTEMS_TASK_SET_NOTE_ONLY 31
-RTEMS_TASK_WAKE_AFTER_YIELD_RETURNS_TO_CALLER 32
-RTEMS_TASK_WAKE_AFTER_YIELD_PREEMPTS_CALLER 33
-RTEMS_TASK_WAKE_WHEN_ONLY 34
-#
-#  Interrupt Manager
-#
-RTEMS_INTR_ENTRY_RETURNS_TO_NESTED 35
-RTEMS_INTR_ENTRY_RETURNS_TO_INTERRUPTED_TASK 36
-RTEMS_INTR_ENTRY_RETURNS_TO_PREEMPTING_TASK 37
-RTEMS_INTR_EXIT_RETURNS_TO_NESTED 38
-RTEMS_INTR_EXIT_RETURNS_TO_INTERRUPTED_TASK 39
-RTEMS_INTR_EXIT_RETURNS_TO_PREEMPTING_TASK 40
-#
-#  Clock Manager
-#
-RTEMS_CLOCK_SET_ONLY 41
-RTEMS_CLOCK_GET_ONLY 42
-RTEMS_CLOCK_TICK_ONLY 43
-#
-#  Timer Manager
-#
-RTEMS_TIMER_CREATE_ONLY 44
-RTEMS_TIMER_IDENT_ONLY 45
-RTEMS_TIMER_DELETE_INACTIVE 46
-RTEMS_TIMER_DELETE_ACTIVE 47
-RTEMS_TIMER_FIRE_AFTER_INACTIVE 48
-RTEMS_TIMER_FIRE_AFTER_ACTIVE 49
-RTEMS_TIMER_FIRE_WHEN_INACTIVE 50
-RTEMS_TIMER_FIRE_WHEN_ACTIVE 51
-RTEMS_TIMER_RESET_INACTIVE 52
-RTEMS_TIMER_RESET_ACTIVE 53
-RTEMS_TIMER_CANCEL_INACTIVE 54
-RTEMS_TIMER_CANCEL_ACTIVE 55
-#
-#  Semaphore Manager
-#
-RTEMS_SEMAPHORE_CREATE_ONLY 56
-RTEMS_SEMAPHORE_IDENT_ONLY 57
-RTEMS_SEMAPHORE_DELETE_ONLY 58
-RTEMS_SEMAPHORE_OBTAIN_AVAILABLE 59
-RTEMS_SEMAPHORE_OBTAIN_NOT_AVAILABLE_NO_WAIT 60
-RTEMS_SEMAPHORE_OBTAIN_NOT_AVAILABLE_CALLER_BLOCKS 61
-RTEMS_SEMAPHORE_RELEASE_NO_WAITING_TASKS 62
-RTEMS_SEMAPHORE_RELEASE_TASK_READIED_RETURNS_TO_CALLER 63
-RTEMS_SEMAPHORE_RELEASE_TASK_READIED_PREEMPTS_CALLER 64
-#
-#  Message Manager
-#
-RTEMS_MESSAGE_QUEUE_CREATE_ONLY 65
-RTEMS_MESSAGE_QUEUE_IDENT_ONLY 66
-RTEMS_MESSAGE_QUEUE_DELETE_ONLY 67
-RTEMS_MESSAGE_QUEUE_SEND_NO_WAITING_TASKS 68
-RTEMS_MESSAGE_QUEUE_SEND_TASK_READIED_RETURNS_TO_CALLER 69
-RTEMS_MESSAGE_QUEUE_SEND_TASK_READIED_PREEMPTS_CALLER 70
-RTEMS_MESSAGE_QUEUE_URGENT_NO_WAITING_TASKS 71
-RTEMS_MESSAGE_QUEUE_URGENT_TASK_READIED_RETURNS_TO_CALLER 72
-RTEMS_MESSAGE_QUEUE_URGENT_TASK_READIED_PREEMPTS_CALLER 73
-RTEMS_MESSAGE_QUEUE_BROADCAST_NO_WAITING_TASKS 74
-RTEMS_MESSAGE_QUEUE_BROADCAST_TASK_READIED_RETURNS_TO_CALLER 75
-RTEMS_MESSAGE_QUEUE_BROADCAST_TASK_READIED_PREEMPTS_CALLER 76
-RTEMS_MESSAGE_QUEUE_RECEIVE_AVAILABLE 77
-RTEMS_MESSAGE_QUEUE_RECEIVE_NOT_AVAILABLE_NO_WAIT 78
-RTEMS_MESSAGE_QUEUE_RECEIVE_NOT_AVAILABLE_CALLER_BLOCKS 79
-RTEMS_MESSAGE_QUEUE_FLUSH_NO_MESSAGES_FLUSHED 80
-RTEMS_MESSAGE_QUEUE_FLUSH_MESSAGES_FLUSHED 81
-#
-#  Event Manager
-#
-RTEMS_EVENT_SEND_NO_TASK_READIED 82
-RTEMS_EVENT_SEND_TASK_READIED_RETURNS_TO_CALLER 83
-RTEMS_EVENT_SEND_TASK_READIED_PREEMPTS_CALLER 84
-RTEMS_EVENT_RECEIVE_OBTAIN_CURRENT_EVENTS 85
-RTEMS_EVENT_RECEIVE_AVAILABLE 86
-RTEMS_EVENT_RECEIVE_NOT_AVAILABLE_NO_WAIT 87
-RTEMS_EVENT_RECEIVE_NOT_AVAILABLE_CALLER_BLOCKS 88
-#
-#  Signal Manager
-#
-RTEMS_SIGNAL_CATCH_ONLY 89
-RTEMS_SIGNAL_SEND_RETURNS_TO_CALLER 90
-RTEMS_SIGNAL_SEND_SIGNAL_TO_SELF 91
-RTEMS_SIGNAL_EXIT_ASR_OVERHEAD_RETURNS_TO_CALLING_TASK 92
-RTEMS_SIGNAL_EXIT_ASR_OVERHEAD_RETURNS_TO_PREEMPTING_TASK 93
-#
-#  Partition Manager
-#
-RTEMS_PARTITION_CREATE_ONLY 94
-RTEMS_PARTITION_IDENT_ONLY 95
-RTEMS_PARTITION_DELETE_ONLY 96
-RTEMS_PARTITION_GET_BUFFER_AVAILABLE 97
-RTEMS_PARTITION_GET_BUFFER_NOT_AVAILABLE 98
-RTEMS_PARTITION_RETURN_BUFFER_ONLY 99
-#
-#  Region Manager
-#
-RTEMS_REGION_CREATE_ONLY 100
-RTEMS_REGION_IDENT_ONLY 101
-RTEMS_REGION_DELETE_ONLY 102
-RTEMS_REGION_GET_SEGMENT_AVAILABLE 103
-RTEMS_REGION_GET_SEGMENT_NOT_AVAILABLE_NO_WAIT 104
-RTEMS_REGION_GET_SEGMENT_NOT_AVAILABLE_CALLER_BLOCKS 105
-RTEMS_REGION_RETURN_SEGMENT_NO_WAITING_TASKS 106
-RTEMS_REGION_RETURN_SEGMENT_TASK_READIED_RETURNS_TO_CALLER 107
-RTEMS_REGION_RETURN_SEGMENT_TASK_READIED_PREEMPTS_CALLER 108
-#
-#  Dual-Ported Memory Manager
-#
-RTEMS_PORT_CREATE_ONLY 109
-RTEMS_PORT_IDENT_ONLY 110
-RTEMS_PORT_DELETE_ONLY 111
-RTEMS_PORT_INTERNAL_TO_EXTERNAL_ONLY 112
-RTEMS_PORT_EXTERNAL_TO_INTERNAL_ONLY 113
-#
-#  IO Manager
-#
-RTEMS_IO_INITIALIZE_ONLY 114
-RTEMS_IO_OPEN_ONLY 115
-RTEMS_IO_CLOSE_ONLY 116
-RTEMS_IO_READ_ONLY 117
-RTEMS_IO_WRITE_ONLY 118
-RTEMS_IO_CONTROL_ONLY 119
-#
-#  Rate Monotonic Manager
-#
-RTEMS_RATE_MONOTONIC_CREATE_ONLY 120
-RTEMS_RATE_MONOTONIC_IDENT_ONLY 121
-RTEMS_RATE_MONOTONIC_CANCEL_ONLY 122
-RTEMS_RATE_MONOTONIC_DELETE_ACTIVE 123
-RTEMS_RATE_MONOTONIC_DELETE_INACTIVE 124
-RTEMS_RATE_MONOTONIC_PERIOD_INITIATE_PERIOD_RETURNS_TO_CALLER 125
-RTEMS_RATE_MONOTONIC_PERIOD_CONCLUDE_PERIOD_CALLER_BLOCKS 126
-RTEMS_RATE_MONOTONIC_PERIOD_OBTAIN_STATUS 127
-#
-#  Size Information
-#
-#
-#  xxx alloted for numbers
-#
-RTEMS_DATA_SPACE 128
-RTEMS_MINIMUM_CONFIGURATION xx,129
-RTEMS_MAXIMUM_CONFIGURATION xx,130
-#  x,xxx alloted for numbers
-RTEMS_CORE_CODE_SIZE x,131
-RTEMS_INITIALIZATION_CODE_SIZE x,132
-RTEMS_TASK_CODE_SIZE x,133
-RTEMS_INTERRUPT_CODE_SIZE x,134
-RTEMS_CLOCK_CODE_SIZE x,135
-RTEMS_TIMER_CODE_SIZE x,136
-RTEMS_SEMAPHORE_CODE_SIZE x,137
-RTEMS_MESSAGE_CODE_SIZE x,138
-RTEMS_EVENT_CODE_SIZE x,139
-RTEMS_SIGNAL_CODE_SIZE x,140
-RTEMS_PARTITION_CODE_SIZE x,141
-RTEMS_REGION_CODE_SIZE x,142
-RTEMS_DPMEM_CODE_SIZE x,143
-RTEMS_IO_CODE_SIZE x,144
-RTEMS_FATAL_ERROR_CODE_SIZE x,145
-RTEMS_RATE_MONOTONIC_CODE_SIZE x,146
-RTEMS_MULTIPROCESSING_CODE_SIZE x,147
-#  xxx alloted for numbers
-RTEMS_TIMER_CODE_OPTSIZE 148
-RTEMS_SEMAPHORE_CODE_OPTSIZE 149
-RTEMS_MESSAGE_CODE_OPTSIZE 150
-RTEMS_EVENT_CODE_OPTSIZE 151
-RTEMS_SIGNAL_CODE_OPTSIZE 152
-RTEMS_PARTITION_CODE_OPTSIZE 153
-RTEMS_REGION_CODE_OPTSIZE 154
-RTEMS_DPMEM_CODE_OPTSIZE 155
-RTEMS_IO_CODE_OPTSIZE 156
-RTEMS_RATE_MONOTONIC_CODE_OPTSIZE 157
-RTEMS_MULTIPROCESSING_CODE_OPTSIZE 158
-#  xxx alloted for numbers
-RTEMS_BYTES_PER_TASK 159
-RTEMS_BYTES_PER_TIMER 160
-RTEMS_BYTES_PER_SEMAPHORE 161
-RTEMS_BYTES_PER_MESSAGE_QUEUE 162
-RTEMS_BYTES_PER_REGION 163
-RTEMS_BYTES_PER_PARTITION 164
-RTEMS_BYTES_PER_PORT 165
-RTEMS_BYTES_PER_PERIOD 166
-RTEMS_BYTES_PER_EXTENSION 167
-RTEMS_BYTES_PER_FP_TASK 168
-RTEMS_BYTES_PER_NODE 169
-RTEMS_BYTES_PER_GLOBAL_OBJECT 170
-RTEMS_BYTES_PER_PROXY 171
-#  x,xxx alloted for numbers
-RTEMS_BYTES_OF_FIXED_SYSTEM_REQUIREMENTS x,172
diff --git a/doc/supplements/i960/Makefile b/doc/supplements/i960/Makefile
deleted file mode 100644
index 37dd8b5327..0000000000
--- a/doc/supplements/i960/Makefile
+++ /dev/null
@@ -1,156 +0,0 @@
-#
-#  COPYRIGHT (c) 1988-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  All rights reserved.
-#
-#  $Id$
-#
-
-PROJECT=i960
-DISTRIBUTION_LEVEL=support
-
-include ../../Make.config
-
-REPLACE=../../tools/word-replace
-
-all: html info ps
-
-dirs:
-	$(make-dirs)
-
-COMMON_FILES=../../common/cpright.texi ../../common/setup.texi
-
-GENERATED_FILES=\
-  cpumodel.texi callconv.texi memmodel.texi intr.texi fatalerr.texi \
-  bsp.texi cputable.texi timing.texi wksheets.texi timeCVME961.texi
-
-FILES= $(PROJECT).texi \
-  preface.texi \
-  $(GENERATED_FILES)
-
-info: dirs c_i960
-	cp c_$(PROJECT) $(INFO_INSTALL)
-
-c_i960: $(FILES)
-	$(MAKEINFO) $(PROJECT).texi
-
-dvi: $(PROJECT).dvi
-ps: dirs $(PROJECT).ps
-	
-$(PROJECT).ps: $(PROJECT).dvi
-	dvips -o $(PROJECT).ps $(PROJECT).dvi
-	cp $(PROJECT).ps $(PS_INSTALL)
-
-$(PROJECT).dvi: $(FILES)
-	$(TEXI2DVI) $(PROJECT).texi
-
-html: dirs $(FILES)
-	-mkdir -p $(WWW_INSTALL)/c_i960
-	$(TEXI2WWW) $(TEXI2WWW_ARGS) -dir $(WWW_INSTALL)/c_$(PROJECT) \
- 	    $(PROJECT).texi
-
-clean:
-	rm -f *.o $(PROG) *.txt core 
-	rm -f *.dvi *.ps *.log *.aux *.cp *.fn *.ky *.pg *.toc *.tp *.vr $(BASE)
-	rm -f $(PROJECT) $(PROJECT)-*
-	rm -f c_i960 c_i960-*
-	rm -f intr.t $(GENERATED_FILES)
-	rm -f wksheets.t wksheets_NOTIMES.t 
-	rm -f *.fixed _* timing.t timing.texi
-	rm -f timeCVME961_.t timeCVME961_.texi
-
-#
-#  Chapters which get automatic processing
-#
-
-cpumodel.texi: cpumodel.t Makefile
-	$(BMENU) -p "Preface" \
-	    -u "Top" \
-	    -n "Calling Conventions" ${*}.t
-
-callconv.texi: callconv.t Makefile
-	$(BMENU) -p "CPU Model Dependent Features Floating Point Unit" \
-	    -u "Top" \
-	    -n "Memory Model" ${*}.t
-
-memmodel.texi: memmodel.t Makefile
-	$(BMENU) -p "Calling Conventions Leaf Procedures" \
-	    -u "Top" \
-	    -n "Interrupt Processing" ${*}.t
-
-# Interrupt Chapter:
-#  1.  Replace Times and Sizes
-#  2.  Build Node Structure
-intr.t: intr_NOTIMES.t CVME961_TIMES
-	${REPLACE} -p CVME961_TIMES intr_NOTIMES.t
-	mv intr_NOTIMES.t.fixed intr.t
-
-intr.texi: intr.t Makefile
-	$(BMENU) -p "Memory Model Flat Memory Model" \
-	    -u "Top" \
-	    -n "Default Fatal Error Processing" ${*}.t
-
-fatalerr.texi: fatalerr.t Makefile
-	$(BMENU) -p "Interrupt Processing Interrupt Stack" \
-	    -u "Top" \
-	    -n "Board Support Packages" ${*}.t
-
-bsp.texi: bsp.t Makefile
-	$(BMENU) -p "Default Fatal Error Processing Default Fatal Error Handler Operations" \
-	    -u "Top" \
-	    -n "Processor Dependent Information Table" ${*}.t
-
-cputable.texi: cputable.t Makefile
-	$(BMENU) -p "Board Support Packages Processor Initialization" \
-	    -u "Top" \
-	    -n "Memory Requirements" ${*}.t
-
-
-# Worksheets Chapter:
-#  1.  Obtain the Shared File
-#  2.  Replace Times and Sizes
-#  3.  Build Node Structure
-
-wksheets_NOTIMES.t: ../../common/wksheets.t
-	cp ../../common/wksheets.t wksheets_NOTIMES.t
-
-wksheets.t: wksheets_NOTIMES.t CVME961_TIMES
-	${REPLACE} -p CVME961_TIMES wksheets_NOTIMES.t
-	mv wksheets_NOTIMES.t.fixed wksheets.t
-
-wksheets.texi: wksheets.t Makefile
-	$(BMENU) -p "Processor Dependent Information Table CPU Dependent Information Table" \
-	    -u "Top" \
-	    -n "Timing Specification" ${*}.t
-
-# Timing Specification Chapter:
-#  1.  Copy the Shared File
-#  3.  Build Node Structure
-
-timing.t: ../../common/timing.t
-	cp ../../common/timing.t timing.t
-
-timing.texi: timing.t Makefile
-	$(BMENU) -p "Memory Requirements RTEMS RAM Workspace Worksheet" \
-            -u "Top" \
-            -n "CVME961 Timing Data" ${*}.t
-
-# Timing Data for BSP Chapter:
-#  1.  Copy the Shared File
-#  2.  Replace Times and Sizes
-#  3.  Build Node Structure
-
-timeCVME961_.t: ../../common/timetbl.t timeCVME961.t
-	cat timeCVME961.t ../../common/timetbl.t            >timeCVME961_.t
-	@echo                                               >>timeCVME961_.t
-	@echo "@tex"                                        >>timeCVME961_.t
-	@echo "\\global\\advance \\smallskipamount by 4pt"  >>timeCVME961_.t
-	@echo "@end tex"                                    >>timeCVME961_.t
-	${REPLACE} -p CVME961_TIMES timeCVME961_.t
-	mv timeCVME961_.t.fixed timeCVME961_.t
-
-timeCVME961.texi: timeCVME961_.t Makefile
-	$(BMENU) -p "Timing Specification Terminology" \
-	    -u "Top" \
-	    -n "Command and Variable Index" timeCVME961_.t
-	mv timeCVME961_.texi timeCVME961.texi
diff --git a/doc/supplements/i960/bsp.t b/doc/supplements/i960/bsp.t
deleted file mode 100644
index 425ad43aa9..0000000000
--- a/doc/supplements/i960/bsp.t
+++ /dev/null
@@ -1,54 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Board Support Packages
-
-@section Introduction
-
-An RTEMS Board Support Package (BSP) must be designed
-to support a particular processor and target board combination.
-This chapter presents a discussion of i960CA specific BSP
-issues.   For more information on developing a BSP, refer to the
-chapter titled Board Support Packages in the RTEMS
-Applications User's Guide.
-
-@section System Reset
-
-An RTEMS based application is initiated when the
-i960CA processor is reset.  When the i960CA is reset, the
-processor reads an Initial Memory Image (IMI) to establish its
-state.  The IMI consists of the Initialization Boot Record (IBR)
-and the Process Control Block (PRCB) from an Initial Memory
-Image (IMI) at location 0xFFFFFF00.  The IBR contains the
-initial bus configuration data, the address of the first
-instruction to execute after reset, the address of the PRCB, and
-the checksum used by the processor's self-test.
-
-@section Processor Initialization
-
-The PRCB contains the base addresses for system data
-structures, and initial configuration information for the core
-and integrated peripherals.  In particular, the PRCB contains
-the initial contents of the Arithmetic Control (AC) Register as
-well as the base addresses of the Interrupt Vector Table, System
-Procedure Entry Table, Fault Entry Table, and the Control Table.
-In addition, the PRCB is used to configure the depth of the
-instruction and register caches and the actions when certain
-types of faults are encountered.
-
-The Process Controls (PC) Register is initialized to
-0xC01F2002 which sets the i960CA's interrupt level to 0x1F  (31
-decimal).  In addition, the Interrupt Mask (IMSK) Register
-(alternately referred to as Special Function Register 1 or sf1)
-is set to 0x00000000 to mask all external and DMA interrupt
-sources.  Thus, all interrupts are disabled when the first
-instruction is executed.
-
-For more information regarding the i960CA's data
-structures and their contents, refer to Intel's i960CA User's
-Manual.
diff --git a/doc/supplements/i960/callconv.t b/doc/supplements/i960/callconv.t
deleted file mode 100644
index 0e4c06a1bb..0000000000
--- a/doc/supplements/i960/callconv.t
+++ /dev/null
@@ -1,97 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Calling Conventions
-
-@section Introduction
-
-Each high-level language compiler generates
-subroutine entry and exit code based upon a set of rules known
-as the compiler's calling convention.   These rules address the
-following issues:
-
-@itemize @bullet
-@item register preservation and usage
-
-@item parameter passing
-
-@item call and return mechanism
-@end itemize
-
-A compiler's calling convention is of importance when
-interfacing to subroutines written in another language either
-assembly or high-level.  Even when the high-level language and
-target processor are the same, different compilers may use
-different calling conventions.  As a result, calling conventions
-are both processor and compiler dependent.
-
-@section Processor Background
-
-All members of the i960 architecture family support
-two methods for performing procedure calls: a RISC-style
-branch-and-link and an integrated call and return mechanism.
-
-On a branch-and-link, the processor branches to the
-invoked procedure and saves the return address in a register,
-G14.  Typically, the invoked procedure will not invoke another
-procedure and is referred to as a leaf procedure.  Many
-high-level language compilers for the i960 family recognize leaf
-procedures and automatically optimize them to utilize the
-branch-and-link mechanism.  Branch-and-link procedures are
-invoked using the bal and balx instructions and return control
-via the bx instruction.  By convention, G14 is zero when not in
-a leaf procedure.  It is the responsibility of the leaf
-procedure to clear G14 before returning.
-
-The integrated call and return mechanism also
-branches to the invoked procedure and saves the return address
-as did the branch and link mechanism. However, the important
-difference is that the call, callx, and calls instructions save
-the local register set (R0 through R15) before transferring
-control to the invoked procedure.  The ret instruction
-automatically restores the previous local register set.  The
-i960CA provides a register cache which can be configured to
-retain the last five to sixteen recent register caches.  When
-the register cache is full, the oldest cached register set is
-written to the stack.
-
-@section Calling Mechanism
-
-All RTEMS directives are invoked using either a call
-or callx instruction and return to the user via the ret
-instruction.
-
-@section Register Usage
-
-As discussed above, the call and callx instructions
-automatically save the current contents of the local register
-set (R0 through R15).  The contents of the local registers will
-be restored as part of returning to the application.  The
-contents of global registers G0 through G7 are not preserved by
-RTEMS directives.
-
-@section Parameter Passing
-
-RTEMS uses the standard i960 family C parameter
-passing mechanism in which G0 contains the first parameter, G1
-the second,  and so on  for the remaining parameters.  No RTEMS
-directive requires more than six parameters.
-
-@section User-Provided Routines
-
-All user-provided routines invoked by RTEMS, such as
-user extensions, device drivers, and MPCI routines, must also
-adhere to these calling conventions.
-
-@section Leaf Procedures
-
-RTEMS utilizes leaf procedures internally to improve
-performance.  This improves execution speed as well as reducing
-stack usage and the number of register sets which must be cached.
-
-
diff --git a/doc/supplements/i960/cpumodel.t b/doc/supplements/i960/cpumodel.t
deleted file mode 100644
index 16ac726476..0000000000
--- a/doc/supplements/i960/cpumodel.t
+++ /dev/null
@@ -1,62 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter CPU Model Dependent Features
-
-@section Introduction
-
-Microprocessors are generally classified into
-families with a variety of CPU models or implementations within
-that family.  Within a processor family, there is a high level
-of binary compatibility.  This family may be based on either an
-architectural specification or on maintaining compatibility with
-a popular processor.  Recent microprocessor families such as the
-SPARC or PA-RISC are based on an architectural specification
-which is independent or any particular CPU model or
-implementation.  Older families such as the M68xxx and the iX86
-evolved as the manufacturer strived to produce higher
-performance processor models which maintained binary
-compatibility with older models.
-
-RTEMS takes advantage of the similarity of the
-various models within a CPU family.  Although the models do vary
-in significant ways, the high level of compatibility makes it
-possible to share the bulk of the CPU dependent executive code
-across the entire family.  Each processor family supported by
-RTEMS has a list of features which vary between CPU models
-within a family.  For example, the most common model dependent
-feature regardless of CPU family is the presence or absence of a
-floating point unit or coprocessor.  When defining the list of
-features present on a particular CPU model, one simply notes
-that floating point hardware is or is not present and defines a
-single constant appropriately.  Conditional compilation is
-utilized to include the appropriate source code for this CPU
-model's feature set.  It is important to note that this means
-that RTEMS is thus compiled using the appropriate feature set
-and compilation flags optimal for this CPU model used.  The
-alternative would be to generate a binary which would execute on
-all family members using only the features which were always
-present.
-
-This chapter presents the set of features which vary
-across i960 implementations and are of importance to RTEMS.
-The set of CPU model feature macros are defined in the file
-c/src/exec/score/cpu/i960/i960.h based upon the particular CPU
-model defined on the compilation command line.
-
-@section CPU Model Name
-
-The macro CPU_MODEL_NAME is a string which designates
-the name of this CPU model.  For example, for the Intel i960CA,
-this macro is set to the string "i960ca".
-
-@section Floating Point Unit
-
-The macro I960_HAS_FPU is set to 1 to indicate that
-this CPU model has a hardware floating point unit and 0
-otherwise.
diff --git a/doc/supplements/i960/cputable.t b/doc/supplements/i960/cputable.t
deleted file mode 100644
index e7833eb18b..0000000000
--- a/doc/supplements/i960/cputable.t
+++ /dev/null
@@ -1,125 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Processor Dependent Information Table
-
-@section Introduction
-
-Any highly processor dependent information required
-to describe a processor to RTEMS is provided in the CPU
-Dependent Information Table.  This table is not required for all
-processors supported by RTEMS.  This chapter describes the
-contents, if any, for a particular processor type.
-
-@section CPU Dependent Information Table
-
-The i960CA version of the RTEMS CPU Dependent
-Information Table contains the information required to interface
-a Board Support Package and RTEMS on the i960CA.  This
-information is provided to allow RTEMS to interoperate
-effectively with the BSP.  The C structure definition is given
-here:
-
-@example
-@group
-typedef struct @{
-  void        (*pretasking_hook)( void );
-  void        (*predriver_hook)( void );
-  void        (*postdriver_hook)( void );
-  void        (*idle_task)( void );
-  boolean       do_zero_of_workspace;
-  unsigned32    idle_task_stack_size;
-  unsigned32    interrupt_stack_size;
-  unsigned32    extra_mpci_receive_server_stack;
-  void       (*stack_free_hook)( void* );
-  /* end of fields required on all CPUs */
- 
-#if defined(__i960CA__) || defined(__i960_CA__) || defined(__i960CA)
-  i960ca_PRCB *Prcb;
-#endif
-
-@} rtems_cpu_table;
-@end group
-@end example
-
-The contents of the i960CA Processor Control Block
-are discussed in  Intel's i960CA User's Manual.  Structure
-definitions for the i960CA PRCB and Control Table are provided
-by including the file rtems.h.
-
-@table @code
-@item pretasking_hook
-is the address of the
-user provided routine which is invoked once RTEMS initialization
-is complete but before interrupts and tasking are enabled.  This
-field may be NULL to indicate that the hook is not utilized.
-
-@item predriver_hook
-is the address of the user provided
-routine which is invoked with tasking enabled immediately before
-the MPCI and device drivers are initialized. RTEMS
-initialization is complete, interrupts and tasking are enabled,
-but no device drivers are initialized.  This field may be NULL to
-indicate that the hook is not utilized.
-
-@item postdriver_hook
-is the address of the user provided
-routine which is invoked with tasking enabled immediately after
-the MPCI and device drivers are initialized. RTEMS
-initialization is complete, interrupts and tasking are enabled,
-and the device drivers are initialized.  This field may be NULL
-to indicate that the hook is not utilized.
-
-@item idle_task
-is the address of the optional user
-provided routine which is used as the system's IDLE task.  If
-this field is not NULL, then the RTEMS default IDLE task is not
-used.  This field may be NULL to indicate that the default IDLE
-is to be used.
-
-@item do_zero_of_workspace
-indicates whether RTEMS should
-zero the Workspace as part of its initialization.  If set to
-TRUE, the Workspace is zeroed.  Otherwise, it is not.
-
-@item idle_task_stack_size
-is the size of the RTEMS idle task stack in bytes.  
-If this number is less than MINIMUM_STACK_SIZE, then the 
-idle task's stack will be MINIMUM_STACK_SIZE in byte.
-
-@item interrupt_stack_size
-is the size of the RTEMS
-allocated interrupt stack in bytes.  This value must be at least
-as large as MINIMUM_STACK_SIZE.
-
-@item extra_mpci_receive_server_stack
-is the extra stack space allocated for the RTEMS MPCI receive server task
-in bytes.  The MPCI receive server may invoke nearly all directives and 
-may require extra stack space on some targets.
-
-@item stack_allocate_hook
-is the address of the optional user provided routine which allocates 
-memory for task stacks.  If this hook is not NULL, then a stack_free_hook
-must be provided as well.
-
-@item stack_free_hook
-is the address of the optional user provided routine which frees 
-memory for task stacks.  If this hook is not NULL, then a stack_allocate_hook
-must be provided as well.
-
-@item Prcb
-is the base address of the i960CA's Processor
-Control Block.  It is primarily used by RTEMS to install
-interrupt handlers.
-@end table
-
-
-
-
-
-
diff --git a/doc/supplements/i960/fatalerr.t b/doc/supplements/i960/fatalerr.t
deleted file mode 100644
index 87751a652e..0000000000
--- a/doc/supplements/i960/fatalerr.t
+++ /dev/null
@@ -1,30 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Default Fatal Error Processing
-
-@section Introduction
-
-Upon detection of a fatal error by either the
-application or RTEMS the fatal error manager is invoked.  The
-fatal error manager will invoke the user-supplied fatal error
-handlers.  If no user-supplied handlers is configured,  the
-RTEMS provided default fatal error handler is invoked.  If the
-user-supplied fatal error handlers return to the executive the
-default fatal error handler is then invoked.  This chapter
-describes the precise operations of the default fatal error
-handler.
-
-@section Default Fatal Error Handler Operations
-
-The default fatal error handler which is invoked by
-the fatal_error_occurred directive when there is no user handler
-configured or the user handler returns control to RTEMS.  The
-default fatal error handler disables processor interrupts to
-level 31, places the error code in G0, and executes a branch to
-self instruction to simulate a halt processor instruction.
diff --git a/doc/supplements/i960/i960.texi b/doc/supplements/i960/i960.texi
deleted file mode 100644
index aa2709ba7d..0000000000
--- a/doc/supplements/i960/i960.texi
+++ /dev/null
@@ -1,120 +0,0 @@
-\input ../../texinfo/texinfo   @c -*-texinfo-*-
-@c %**start of header
-@setfilename c_i960
-@syncodeindex vr fn
-@synindex ky cp
-@paragraphindent 0
-@c @smallbook
-@c %**end of header
-
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@c
-@c   Master file for the Intel i960 Applications Supplement
-@c
-
-@include ../../common/setup.texi
-
-@ignore
-@ifinfo
-@format
-START-INFO-DIR-ENTRY
-* RTEMS Intel i960 Applications Supplement (i960):
-END-INFO-DIR-ENTRY
-@end format
-@end ifinfo
-@end ignore
-
-@c
-@c  Title Page Stuff
-@c
-
-@set edition @value{RTEMS-EDITION}
-@set version @value{RTEMS-VERSION}
-@set update-date @value{RTEMS-UPDATE-DATE}
-@set update-month @value{RTEMS-UPDATE-MONTH}
-
-@c
-@c  I don't really like having a short title page.  --joel
-@c
-@c @shorttitlepage RTEMS Intel i960 Applications Supplement 
-
-@setchapternewpage odd
-@settitle RTEMS Intel i960 Applications Supplement 
-@titlepage
-@finalout
-
-@title RTEMS Intel i960 Applications Supplement 
-@subtitle Edition @value{edition}, for RTEMS @value{version}
-@sp 1
-@subtitle @value{update-month}
-@author On-Line Applications Research Corporation
-@page
-@include ../../common/cpright.texi
-@end titlepage
-
-@c  This prevents a black box from being printed on "overflow" lines.
-@c  The alternative is to rework a sentence to avoid this problem.
-
-@include preface.texi
-@include cpumodel.texi
-@include callconv.texi
-@include memmodel.texi
-@include intr.texi
-@include fatalerr.texi
-@include bsp.texi
-@include cputable.texi
-@include wksheets.texi
-@include timing.texi
-@include timeCVME961.texi
-@ifinfo
-@node Top, Preface, (dir), (dir)
-@top c_i960
-
-This is the online version of the RTEMS Intel i960
-Applications Supplement.
-
-@menu
-* Preface::
-* CPU Model Dependent Features::
-* Calling Conventions::
-* Memory Model::
-* Interrupt Processing::
-* Default Fatal Error Processing::
-* Board Support Packages::
-* Processor Dependent Information Table::
-* Memory Requirements::
-* Timing Specification::
-* CVME961 Timing Data::
-* Command and Variable Index::
-* Concept Index::
-@end menu
-
-@end ifinfo
-@c 
-@c 
-@c Need to copy the emacs stuff and "trailer stuff" (index, toc) into here
-@c
-
-@node Command and Variable Index, Concept Index, CVME961 Timing Data Rate Monotonic Manager, Top
-@unnumbered Command and Variable Index
-
-There are currently no Command and Variable Index entries.
-
-@c @printindex fn
-
-@node Concept Index, , Command and Variable Index, Top
-@unnumbered Concept Index
-
-There are currently no Concept Index entries.
-@c @printindex cp
-
-@c @contents
-@bye
-
diff --git a/doc/supplements/i960/intr_NOTIMES.t b/doc/supplements/i960/intr_NOTIMES.t
deleted file mode 100644
index 1851440723..0000000000
--- a/doc/supplements/i960/intr_NOTIMES.t
+++ /dev/null
@@ -1,193 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Interrupt Processing
-
-@section Introduction
-
-Different types of processors respond to the
-occurrence of an interrupt in its own unique fashion. In
-addition, each processor type provides a control mechanism to
-allow the proper handling of an interrupt.  The processor
-dependent response to the interrupt which modifies the execution
-state and results in the modification of the execution stream.
-This modification usually requires that an interrupt handler
-utilize the provided control mechanisms to return to the normal
-processing stream.  Although RTEMS hides many of the processor
-dependent details of interrupt processing, it is important to
-understand how the RTEMS interrupt manager is mapped onto the
-processor's unique architecture. Discussed in this chapter are
-the the processor's response and control mechanisms as they
-pertain to RTEMS.
-
-@section Vectoring of Interrupt Handler
-
-Upon receipt of an interrupt  the i960CA
-automatically performs the following actions:
-
-@itemize @bullet
-@item saves the local register set,
-
-@item sets the Frame Pointer (FP) to point to the interrupt
-stack,
-
-@item increments the FP by sixteen (16) to make room for the
-Interrupt Record,
-
-@item saves the current values of the arithmetic-controls (AC)
-register, the process-controls (PC) register, and the interrupt
-vector number are saved in the Interrupt Record,
-
-@item the CPU sets the Instruction Pointer (IP) to the address
-of the first instruction in the interrupt handler,
-
-@item the return-status field of the Previous Frame Pointer
-(PFP or R0) register is set to interrupt return,
-
-@item sets the PC state bit to interrupted,
-
-@item sets the current interrupt disable level in the PC to
-the level of the current interrupt, and
-
-@item disables tracing.
-@end itemize
-
-A nested interrupt is processed similarly by the
-i960CA with the exception that the Frame Pointer (FP) already
-points to the interrupt stack.  This means that the FP is NOT
-overwritten before space for the Interrupt Record is allocated.
-
-The state flag bit of the saved PC register in the
-Interrupt Record is examined by RTEMS to determine when an outer
-most interrupt is being exited.  Therefore, the user application
-code MUST NOT modify this bit.
-
-@section Interrupt Record
-
-The structure of the Interrupt Record for the i960CA
-which is placed on the interrupt stack by the processor in
-response to an interrupt is as follows:
-
-@ifset use-ascii
-@example
-@group
-               +---------------------------+
-               |  Saved Process Controls   | NFP-16
-               +---------------------------+
-               | Saved Arithmetic Controls | NFP-12
-               +---------------------------+
-               |           UNUSED          | NFP-8
-               +---------------------------+
-               |           UNUSED          | NFP-4
-               +---------------------------+
-@end group
-@end example
-@end ifset
-
-@ifset use-tex
-@sp 1
-@tex
-\centerline{\vbox{\offinterlineskip\halign{
-\strut\vrule#&
-\hbox to 2.00in{\enskip\hfil#\hfil}&
-\vrule#&
-\hbox to 1.00in{\enskip\hfil#\hfil}
-\cr
-\multispan{3}\hrulefill\cr
-& Saved Process Controls && NFP-16\cr
-\multispan{3}\hrulefill\cr
-& Saved Arithmetic Controls && NFP-12\cr
-\multispan{3}\hrulefill\cr
-& UNUSED && NFP-8\cr
-\multispan{3}\hrulefill\cr
-& UNUSED && NFP-4\cr
-\multispan{3}\hrulefill\cr
-}}\hfil}
-@end tex
-@end ifset
- 
-@ifset use-html
-@html
-<CENTER>
-  <TABLE COLS=2 WIDTH="40%" BORDER=2>
-<TR><TD ALIGN=center><STRONG>Saved Process Controls</STRONG></TD>
-    <TD ALIGN=center>NFP-16</TD></TR>
-<TR><TD ALIGN=center><STRONG>Saved Arithmetic Controls</STRONG></TD>
-    <TD ALIGN=center>NFP-12</TD></TR>
-<TR><TD ALIGN=center><STRONG>UNUSED</STRONG></TD>
-    <TD ALIGN=center>NFP-8</TD></TR>
-<TR><TD ALIGN=center><STRONG>UNUSED</STRONG></TD>
-    <TD ALIGN=center>NFP-4</TD></TR>
-  </TABLE>
-</CENTER>
-@end html
-@end ifset
-
-@section Interrupt Levels
-
-Thirty-two levels (0-31) of interrupt priorities are
-supported by the i960CA microprocessor with level thirty-one
-(31) being the highest priority.  Level zero (0) indicates that
-interrupts are fully enabled.  Interrupt requests for interrupts
-with priorities less than or equal to the current interrupt mask
-level are ignored.
-
-Although RTEMS supports 256 interrupt levels, the
-i960CA only supports thirty-two.  RTEMS interrupt levels 0
-through 31 directly correspond to i960CA interrupt levels.  All
-other RTEMS interrupt levels are undefined and their behavior is
-unpredictable.
-
-@section Disabling of Interrupts by RTEMS
-
-During the execution of directive calls, critical
-sections of code may be executed.  When these sections are
-encountered, RTEMS disables interrupts to level thirty-one (31)
-before the execution of this section and restores them to the
-previous level upon completion of the section.  RTEMS has been
-optimized to insure that interrupts are disabled for less than
-RTEMS_MAXIMUM_DISABLE_PERIOD microseconds on a
-RTEMS_MAXIMUM_DISABLE_PERIOD_MHZ Mhz i960CA with zero wait states.
-These numbers will vary based the number of wait states and
-processor speed present on the target board.  [NOTE:  This
-calculation was most recently performed for Release
-RTEMS_RELEASE_FOR_MAXIMUM_DISABLE_PERIOD.]
-
-Non-maskable interrupts (NMI) cannot be disabled, and
-ISRs which execute at this level MUST NEVER issue RTEMS system
-calls.  If a directive is invoked, unpredictable results may
-occur due to the inability of RTEMS to protect its critical
-sections.  However, ISRs that make no system calls may safely
-execute as non-maskable interrupts.
-
-@section Register Cache Flushing
-
-The i960CA version of the RTEMS interrupt manager is
-optimized to insure that the flushreg instruction is only
-executed when a context switch is necessary.  The flushreg
-instruction flushes the i960CA register set cache and takes (14
-+ 23 * number of sets flushed) cycles to execute.  As the i960CA
-supports caching of from five to sixteen register sets, this
-instruction takes from 129 to 382 cycles (3.90 to 11.57
-microseconds at 33 Mhz) to execute given no wait state memory.
-RTEMS flushes the register set cache only at the conclusion of
-the outermost ISR when a context switch is necessary.  The
-register set cache will not be flushed as part of processing a
-nested interrupt or when a context switch is not necessary.
-This optimization is essential to providing high-performance
-interrupt management on the i960CA.
-
-@section Interrupt Stack
-
-On the i960CA, RTEMS allocates the interrupt stack
-from the Workspace Area.  The amount of memory allocated for the
-interrupt stack is determined by the interrupt_stack_size field
-in the CPU Configuration Table.  During the initialization
-process, RTEMS will install its interrupt stack.
-
-
diff --git a/doc/supplements/i960/memmodel.t b/doc/supplements/i960/memmodel.t
deleted file mode 100644
index d11c1c32fe..0000000000
--- a/doc/supplements/i960/memmodel.t
+++ /dev/null
@@ -1,40 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Memory Model
-
-@section Introduction
-
-A processor may support any combination of memory
-models ranging from pure physical addressing to complex demand
-paged virtual memory systems.  RTEMS supports a flat memory
-model which ranges contiguously over the processor's allowable
-address space.  RTEMS does not support segmentation or virtual
-memory of any kind.  The appropriate memory model for RTEMS
-provided by the targeted processor and related characteristics
-of that model are described in this chapter.
-
-@section Flat Memory Model
-
-The i960CA supports a flat 32-bit address space with
-addresses ranging from 0x00000000 to 0xFFFFFFFF (4 gigabytes).
-Although the i960CA reserves portions of this address space,
-application code and data may be placed in any non-reserved
-areas.  Each address is represented by a 32-bit value and is
-byte addressable.  The address may be used to reference a single
-byte, half-word (2-bytes), word (4 bytes), double-word (8
-bytes), triple-word (12 bytes) or quad-word (16 bytes).  The
-i960CA does not support virtual memory or segmentation.
-
-The i960CA allows the memory space to be partitioned
-into sixteen regions which may be configured individually as big
-or little endian.  RTEMS assumes that the memory regions in
-which its code, data, and the RTEMS Workspace reside are
-configured as little endian.
-
-
diff --git a/doc/supplements/i960/preface.texi b/doc/supplements/i960/preface.texi
deleted file mode 100644
index 519eb3c90e..0000000000
--- a/doc/supplements/i960/preface.texi
+++ /dev/null
@@ -1,40 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@ifinfo
-@node Preface, CPU Model Dependent Features, Top, Top
-@end ifinfo
-@unnumbered Preface
-
-The Real Time Executive for Multiprocessor Systems
-(RTEMS) is designed to be portable across multiple processor
-architectures.  However, the nature of real-time systems makes
-it essential that the application designer understand certain
-processor dependent implementation details.  These processor
-dependencies include calling convention, board support package
-issues, interrupt processing, exact RTEMS memory requirements,
-performance data, header files, and the assembly language
-interface to the executive.
-
-For information on the i960CA and the i960 processor
-family in general, refer to the following documents:
-
-@itemize @bullet
-@item @cite{80960CA User's Manual, Intel, Order No. 270710}.
-
-@item @cite{32-Bit Embedded Controller Handbook, Intel, Order No.  270647}.
-
-@item @cite{Glenford J. Meyers and David L. Budde. The 80960
-Microprocessor Architecture. Wiley. New York. 1988}.
-@end itemize
-
-It is highly recommended that the i960CA RTEMS
-application developer obtain and become familiar with Intel's
-i960CA User's Manual.
-
-
diff --git a/doc/supplements/i960/timeCVME961.t b/doc/supplements/i960/timeCVME961.t
deleted file mode 100644
index 4fcfca41b4..0000000000
--- a/doc/supplements/i960/timeCVME961.t
+++ /dev/null
@@ -1,88 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@include ../../common/timemac.texi
-@tex
-\global\advance \smallskipamount by -4pt
-@end tex
-
-@chapter CVME961 Timing Data
-
-NOTE: The CVME961 board used by the RTEMS Project to
-obtain i960CA times is currently broken.  The information in
-this chapter was obtained using Release 3.2.1.
-
-@section Introduction
-
-The timing data for the i960CA version of RTEMS is
-provided along with the target dependent aspects concerning the
-gathering of the timing data.  The hardware platform used to
-gather the times is described to give the reader a better
-understanding of each directive time provided.  Also, provided
-is a description of the  interrupt latency and the context
-switch times as they pertain to the i960CA version of RTEMS.
-
-@section Hardware Platform
-
-All times reported except for the maximum period
-interrupts are disabled by RTEMS were measured using a Cyclone
-Microsystems CVME961 board.  The CVME961 is a 33 Mhz board with
-dynamic RAM which has two wait state dynamic memory (four CPU
-cycles) for read accesses and one wait state (two CPU cycles)
-for write accesses.  The Z8536 on a SQUALL SQSIO4 mezzanine
-board was used to measure elapsed time with one-half microsecond
-resolution.  All sources of hardware interrupts are disabled,
-although the interrupt level of the i960CA allows all interrupts.
-
-The maximum  interrupt disable period was measured by
-summing the number of CPU cycles required by each assembly
-language instruction executed while interrupts were disabled.
-Zero wait state memory was assumed.  The total CPU cycles
-executed with interrupts disabled, including the instructions to
-disable and enable interrupts, was divided by 33 to simulate a
-i960CA executing at 33 Mhz with zero wait states.
-
-@section Interrupt Latency
-
-The maximum period with interrupts disabled within
-RTEMS is less than
-RTEMS_MAXIMUM_DISABLE_PERIOD microseconds including the instructions
-which disable and re-enable interrupts.  The time required for
-the i960CA to generate an interrupt using the sysctl
-instruction, vectoring to an interrupt handler, and for the
-RTEMS entry overhead before invoking the user's interrupt
-handler are a total of RTEMS_INTR_ENTRY_RETURNS_TO_PREEMPTING_TASK
-microseconds.  These combine to yield
-a worst case interrupt latency of less than
-RTEMS_MAXIMUM_DISABLE_PERIOD + RTEMS_INTR_ENTRY_RETURNS_TO_PREEMPTING_TASK
-microseconds.  [NOTE: The maximum period with interrupts
-disabled within RTEMS was last calculated for Release
-RTEMS_RELEASE_FOR_MAXIMUM_DISABLE_PERIOD.]
-
-It should be noted again that the maximum period with
-interrupts disabled within RTEMS is hand-timed.  The interrupt
-vector and entry overhead time was generated on the Cyclone
-CVME961 benchmark platform using the sysctl instruction as the
-interrupt source.
-
-@section Context Switch
-
-The RTEMS processor context switch time is RTEMS_NO_FP_CONTEXTS
-microseconds on the Cyclone CVME961 benchmark platform.  This
-time represents the raw context switch time with no user
-extensions configured.  Additional execution time is required
-when a TSWITCH user extension is configured.  The use of the
-TSWITCH extension is application dependent.  Thus, its execution
-time is not considered part of the base context switch time.
-
-The CVME961 has no hardware floating point capability
-and floating point tasks are not supported.
-
-The following table summarizes the context switch
-times for the CVME961 benchmark platform:
-
diff --git a/doc/supplements/m68k/MVME136_TIMES b/doc/supplements/m68k/MVME136_TIMES
deleted file mode 100644
index 5b0dfe6fda..0000000000
--- a/doc/supplements/m68k/MVME136_TIMES
+++ /dev/null
@@ -1,247 +0,0 @@
-#
-#  M68020/MVME136 Timing and Size Information
-#
-#  $Id$
-#
-
-#
-#  CPU Model Information
-#
-RTEMS_BSP       MVME136
-RTEMS_CPU_MODEL MC68020
-#
-#  Interrupt Latency
-#
-#  NOTE:  In general, the text says it is hand-calculated to be
-#         RTEMS_MAXIMUM_DISABLE_PERIOD at RTEMS_MAXIMUM_DISABLE_PERIOD_MHZ
-#         Mhz and this was last calculated for Release 
-#         RTEMS_VERSION_FOR_MAXIMUM_DISABLE_PERIOD.
-#
-RTEMS_MAXIMUM_DISABLE_PERIOD TBD
-RTEMS_MAXIMUM_DISABLE_PERIOD_MHZ 20
-RTEMS_RELEASE_FOR_MAXIMUM_DISABLE_PERIOD 3.2.1
-#
-#  Context Switch Times
-#
-RTEMS_NO_FP_CONTEXTS 35
-RTEMS_RESTORE_1ST_FP_TASK 39
-RTEMS_SAVE_INIT_RESTORE_INIT 66
-RTEMS_SAVE_IDLE_RESTORE_INIT 66
-RTEMS_SAVE_IDLE_RESTORE_IDLE 68
-#
-#  Task Manager Times
-#
-RTEMS_TASK_CREATE_ONLY 148
-RTEMS_TASK_IDENT_ONLY 350
-RTEMS_TASK_START_ONLY 76
-RTEMS_TASK_RESTART_CALLING_TASK 95
-RTEMS_TASK_RESTART_SUSPENDED_RETURNS_TO_CALLER 89
-RTEMS_TASK_RESTART_BLOCKED_RETURNS_TO_CALLER 124
-RTEMS_TASK_RESTART_READY_RETURNS_TO_CALLER 92
-RTEMS_TASK_RESTART_SUSPENDED_PREEMPTS_CALLER 125
-RTEMS_TASK_RESTART_BLOCKED_PREEMPTS_CALLER 149
-RTEMS_TASK_RESTART_READY_PREEMPTS_CALLER 142
-RTEMS_TASK_DELETE_CALLING_TASK 170
-RTEMS_TASK_DELETE_SUSPENDED_TASK 138
-RTEMS_TASK_DELETE_BLOCKED_TASK 143
-RTEMS_TASK_DELETE_READY_TASK 144
-RTEMS_TASK_SUSPEND_CALLING_TASK 71
-RTEMS_TASK_SUSPEND_RETURNS_TO_CALLER 43
-RTEMS_TASK_RESUME_TASK_READIED_RETURNS_TO_CALLER 45
-RTEMS_TASK_RESUME_TASK_READIED_PREEMPTS_CALLER 67
-RTEMS_TASK_SET_PRIORITY_OBTAIN_CURRENT_PRIORITY 31
-RTEMS_TASK_SET_PRIORITY_RETURNS_TO_CALLER 64
-RTEMS_TASK_SET_PRIORITY_PREEMPTS_CALLER 106
-RTEMS_TASK_MODE_OBTAIN_CURRENT_MODE 14
-RTEMS_TASK_MODE_NO_RESCHEDULE 16
-RTEMS_TASK_MODE_RESCHEDULE_RETURNS_TO_CALLER 23
-RTEMS_TASK_MODE_RESCHEDULE_PREEMPTS_CALLER 60
-RTEMS_TASK_GET_NOTE_ONLY 33
-RTEMS_TASK_SET_NOTE_ONLY 33
-RTEMS_TASK_WAKE_AFTER_YIELD_RETURNS_TO_CALLER 16
-RTEMS_TASK_WAKE_AFTER_YIELD_PREEMPTS_CALLER 56
-RTEMS_TASK_WAKE_WHEN_ONLY 117
-#
-#  Interrupt Manager
-#
-RTEMS_INTR_ENTRY_RETURNS_TO_NESTED 12
-RTEMS_INTR_ENTRY_RETURNS_TO_INTERRUPTED_TASK 9
-RTEMS_INTR_ENTRY_RETURNS_TO_PREEMPTING_TASK 9
-RTEMS_INTR_EXIT_RETURNS_TO_NESTED <1
-RTEMS_INTR_EXIT_RETURNS_TO_INTERRUPTED_TASK 8
-RTEMS_INTR_EXIT_RETURNS_TO_PREEMPTING_TASK 54
-#
-#  Clock Manager
-#
-RTEMS_CLOCK_SET_ONLY 86
-RTEMS_CLOCK_GET_ONLY 1
-RTEMS_CLOCK_TICK_ONLY 17
-#
-#  Timer Manager
-#
-RTEMS_TIMER_CREATE_ONLY 28
-RTEMS_TIMER_IDENT_ONLY 343
-RTEMS_TIMER_DELETE_INACTIVE 43
-RTEMS_TIMER_DELETE_ACTIVE 47
-RTEMS_TIMER_FIRE_AFTER_INACTIVE 58
-RTEMS_TIMER_FIRE_AFTER_ACTIVE 61
-RTEMS_TIMER_FIRE_WHEN_INACTIVE 88
-RTEMS_TIMER_FIRE_WHEN_ACTIVE 88
-RTEMS_TIMER_RESET_INACTIVE 54
-RTEMS_TIMER_RESET_ACTIVE 58
-RTEMS_TIMER_CANCEL_INACTIVE 31
-RTEMS_TIMER_CANCEL_ACTIVE 34
-#
-#  Semaphore Manager
-#
-RTEMS_SEMAPHORE_CREATE_ONLY 60
-RTEMS_SEMAPHORE_IDENT_ONLY 367
-RTEMS_SEMAPHORE_DELETE_ONLY 58
-RTEMS_SEMAPHORE_OBTAIN_AVAILABLE 38
-RTEMS_SEMAPHORE_OBTAIN_NOT_AVAILABLE_NO_WAIT 38
-RTEMS_SEMAPHORE_OBTAIN_NOT_AVAILABLE_CALLER_BLOCKS 109
-RTEMS_SEMAPHORE_RELEASE_NO_WAITING_TASKS 44
-RTEMS_SEMAPHORE_RELEASE_TASK_READIED_RETURNS_TO_CALLER 66
-RTEMS_SEMAPHORE_RELEASE_TASK_READIED_PREEMPTS_CALLER 87
-#
-#  Message Manager
-#
-RTEMS_MESSAGE_QUEUE_CREATE_ONLY 200
-RTEMS_MESSAGE_QUEUE_IDENT_ONLY 341
-RTEMS_MESSAGE_QUEUE_DELETE_ONLY 80
-RTEMS_MESSAGE_QUEUE_SEND_NO_WAITING_TASKS 97
-RTEMS_MESSAGE_QUEUE_SEND_TASK_READIED_RETURNS_TO_CALLER 101
-RTEMS_MESSAGE_QUEUE_SEND_TASK_READIED_PREEMPTS_CALLER 123
-RTEMS_MESSAGE_QUEUE_URGENT_NO_WAITING_TASKS 96
-RTEMS_MESSAGE_QUEUE_URGENT_TASK_READIED_RETURNS_TO_CALLER 101
-RTEMS_MESSAGE_QUEUE_URGENT_TASK_READIED_PREEMPTS_CALLER 123
-RTEMS_MESSAGE_QUEUE_BROADCAST_NO_WAITING_TASKS 53
-RTEMS_MESSAGE_QUEUE_BROADCAST_TASK_READIED_RETURNS_TO_CALLER 111
-RTEMS_MESSAGE_QUEUE_BROADCAST_TASK_READIED_PREEMPTS_CALLER 133
-RTEMS_MESSAGE_QUEUE_RECEIVE_AVAILABLE 79
-RTEMS_MESSAGE_QUEUE_RECEIVE_NOT_AVAILABLE_NO_WAIT 43
-RTEMS_MESSAGE_QUEUE_RECEIVE_NOT_AVAILABLE_CALLER_BLOCKS 114
-RTEMS_MESSAGE_QUEUE_FLUSH_NO_MESSAGES_FLUSHED 29
-RTEMS_MESSAGE_QUEUE_FLUSH_MESSAGES_FLUSHED 39
-#
-#  Event Manager
-#
-RTEMS_EVENT_SEND_NO_TASK_READIED 24
-RTEMS_EVENT_SEND_TASK_READIED_RETURNS_TO_CALLER 60
-RTEMS_EVENT_SEND_TASK_READIED_PREEMPTS_CALLER 84
-RTEMS_EVENT_RECEIVE_OBTAIN_CURRENT_EVENTS 1
-RTEMS_EVENT_RECEIVE_AVAILABLE 28
-RTEMS_EVENT_RECEIVE_NOT_AVAILABLE_NO_WAIT 23
-RTEMS_EVENT_RECEIVE_NOT_AVAILABLE_CALLER_BLOCKS 84
-#
-#  Signal Manager
-#
-RTEMS_SIGNAL_CATCH_ONLY 15
-RTEMS_SIGNAL_SEND_RETURNS_TO_CALLER 37
-RTEMS_SIGNAL_SEND_SIGNAL_TO_SELF 55
-RTEMS_SIGNAL_EXIT_ASR_OVERHEAD_RETURNS_TO_CALLING_TASK 37
-RTEMS_SIGNAL_EXIT_ASR_OVERHEAD_RETURNS_TO_PREEMPTING_TASK 54
-#
-#  Partition Manager
-#
-RTEMS_PARTITION_CREATE_ONLY 70
-RTEMS_PARTITION_IDENT_ONLY 341
-RTEMS_PARTITION_DELETE_ONLY 42
-RTEMS_PARTITION_GET_BUFFER_AVAILABLE 35
-RTEMS_PARTITION_GET_BUFFER_NOT_AVAILABLE 33
-RTEMS_PARTITION_RETURN_BUFFER_ONLY 43
-#
-#  Region Manager
-#
-RTEMS_REGION_CREATE_ONLY 63
-RTEMS_REGION_IDENT_ONLY 348
-RTEMS_REGION_DELETE_ONLY 39
-RTEMS_REGION_GET_SEGMENT_AVAILABLE 52
-RTEMS_REGION_GET_SEGMENT_NOT_AVAILABLE_NO_WAIT 49
-RTEMS_REGION_GET_SEGMENT_NOT_AVAILABLE_CALLER_BLOCKS 123
-RTEMS_REGION_RETURN_SEGMENT_NO_WAITING_TASKS 54
-RTEMS_REGION_RETURN_SEGMENT_TASK_READIED_RETURNS_TO_CALLER 114
-RTEMS_REGION_RETURN_SEGMENT_TASK_READIED_PREEMPTS_CALLER 136
-#
-#  Dual-Ported Memory Manager
-#
-RTEMS_PORT_CREATE_ONLY 35
-RTEMS_PORT_IDENT_ONLY 340
-RTEMS_PORT_DELETE_ONLY 39
-RTEMS_PORT_INTERNAL_TO_EXTERNAL_ONLY 26
-RTEMS_PORT_EXTERNAL_TO_INTERNAL_ONLY 27
-#
-#  IO Manager
-#
-RTEMS_IO_INITIALIZE_ONLY 4
-RTEMS_IO_OPEN_ONLY 2
-RTEMS_IO_CLOSE_ONLY 1
-RTEMS_IO_READ_ONLY 2
-RTEMS_IO_WRITE_ONLY 3
-RTEMS_IO_CONTROL_ONLY 2
-#
-#  Rate Monotonic Manager
-#
-RTEMS_RATE_MONOTONIC_CREATE_ONLY 32
-RTEMS_RATE_MONOTONIC_IDENT_ONLY 341
-RTEMS_RATE_MONOTONIC_CANCEL_ONLY 39
-RTEMS_RATE_MONOTONIC_DELETE_ACTIVE 51
-RTEMS_RATE_MONOTONIC_DELETE_INACTIVE 48
-RTEMS_RATE_MONOTONIC_PERIOD_INITIATE_PERIOD_RETURNS_TO_CALLER 54
-RTEMS_RATE_MONOTONIC_PERIOD_CONCLUDE_PERIOD_CALLER_BLOCKS 74
-RTEMS_RATE_MONOTONIC_PERIOD_OBTAIN_STATUS 31
-#
-#  Size Information
-#
-#
-#  xxx alloted for numbers
-#
-RTEMS_DATA_SPACE 723
-RTEMS_MINIMUM_CONFIGURATION 18,980
-RTEMS_MAXIMUM_CONFIGURATION 36,438
-#  x,xxx alloted for numbers
-RTEMS_CORE_CODE_SIZE 12,674
-RTEMS_INITIALIZATION_CODE_SIZE 970
-RTEMS_TASK_CODE_SIZE 3,562
-RTEMS_INTERRUPT_CODE_SIZE 54
-RTEMS_CLOCK_CODE_SIZE 334
-RTEMS_TIMER_CODE_SIZE 1,110
-RTEMS_SEMAPHORE_CODE_SIZE 1,632
-RTEMS_MESSAGE_CODE_SIZE 1,754
-RTEMS_EVENT_CODE_SIZE 1,000
-RTEMS_SIGNAL_CODE_SIZE 418
-RTEMS_PARTITION_CODE_SIZE 1,164
-RTEMS_REGION_CODE_SIZE 1,494
-RTEMS_DPMEM_CODE_SIZE 724
-RTEMS_IO_CODE_SIZE 686
-RTEMS_FATAL_ERROR_CODE_SIZE 24
-RTEMS_RATE_MONOTONIC_CODE_SIZE 1,212
-RTEMS_MULTIPROCESSING_CODE_SIZE 6.952
-#  xxx alloted for numbers
-RTEMS_TIMER_CODE_OPTSIZE 184
-RTEMS_SEMAPHORE_CODE_OPTSIZE 172
-RTEMS_MESSAGE_CODE_OPTSIZE 288
-RTEMS_EVENT_CODE_OPTSIZE 56
-RTEMS_SIGNAL_CODE_OPTSIZE 56
-RTEMS_PARTITION_CODE_OPTSIZE 132
-RTEMS_REGION_CODE_OPTSIZE 160
-RTEMS_DPMEM_CODE_OPTSIZE 132
-RTEMS_IO_CODE_OPTSIZE 00
-RTEMS_RATE_MONOTONIC_CODE_OPTSIZE 184
-RTEMS_MULTIPROCESSING_CODE_OPTSIZE 332
-#  xxx alloted for numbers
-RTEMS_BYTES_PER_TASK 400
-RTEMS_BYTES_PER_TIMER 68
-RTEMS_BYTES_PER_SEMAPHORE 124
-RTEMS_BYTES_PER_MESSAGE_QUEUE 148
-RTEMS_BYTES_PER_REGION 144
-RTEMS_BYTES_PER_PARTITION 56
-RTEMS_BYTES_PER_PORT 36
-RTEMS_BYTES_PER_PERIOD 36
-RTEMS_BYTES_PER_EXTENSION 64
-RTEMS_BYTES_PER_FP_TASK 332
-RTEMS_BYTES_PER_NODE 48
-RTEMS_BYTES_PER_GLOBAL_OBJECT 20
-RTEMS_BYTES_PER_PROXY 124
-#  x,xxx alloted for numbers
-RTEMS_BYTES_OF_FIXED_SYSTEM_REQUIREMENTS 8,872
diff --git a/doc/supplements/m68k/Makefile b/doc/supplements/m68k/Makefile
deleted file mode 100644
index 9751428c7a..0000000000
--- a/doc/supplements/m68k/Makefile
+++ /dev/null
@@ -1,165 +0,0 @@
-#
-#  COPYRIGHT (c) 1988-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  All rights reserved.
-#
-#  $Id$
-#
-
-PROJECT=m68k
-DISTRIBUTION_LEVEL=support
-
-include ../../Make.config
-
-REPLACE=../../tools/word-replace
-
-all: html info ps
-
-dirs:
-	$(make-dirs)
-
-COMMON_FILES=../../common/cpright.texi ../../common/setup.texi
-
-GENERATED_FILES=\
-  cpumodel.texi callconv.texi memmodel.texi intr.texi fatalerr.texi \
-  bsp.texi cputable.texi timing.texi wksheets.texi timeMVME136.texi
-
-FILES= $(PROJECT).texi \
-  preface.texi \
-  $(GENERATED_FILES)
-
-info: dirs c_m68k
-	cp c_$(PROJECT) c_$(PROJECT)-* $(INFO_INSTALL)
-
-c_m68k: $(FILES)
-	$(MAKEINFO) $(PROJECT).texi
-
-dvi: $(PROJECT).dvi
-ps: dirs $(PROJECT).ps
-	
-$(PROJECT).ps: $(PROJECT).dvi
-	dvips -o $(PROJECT).ps $(PROJECT).dvi
-	cp $(PROJECT).ps $(PS_INSTALL)
-
-$(PROJECT).dvi: $(FILES)
-	$(TEXI2DVI) $(PROJECT).texi
-
-html: dirs $(FILES)
-	-mkdir -p $(WWW_INSTALL)/c_m68k
-	$(TEXI2WWW) $(TEXI2WWW_ARGS) -dir $(WWW_INSTALL)/c_$(PROJECT) \
- 	    $(PROJECT).texi
-
-clean:
-	rm -f *.o $(PROG) *.txt core 
-	rm -f *.dvi *.ps *.log *.aux *.cp *.fn *.ky *.pg *.toc *.tp *.vr $(BASE)
-	rm -f $(PROJECT) $(PROJECT)-*
-	rm -f c_m68k c_m68k-*
-	rm -f intr.t $(GENERATED_FILES)
-	rm -f wksheets.t wksheets_NOTIMES.t
-	rm -f timeMVME136_.t timeMVME136_.texi
-	rm -f *.fixed _* timing.t
-
-#
-#  Chapters which get automatic processing
-#
-
-cpumodel.texi: cpumodel.t Makefile
-	$(BMENU) -p "Preface" \
-	    -u "Top" \
-	    -n "Calling Conventions" ${*}.t
-
-callconv.texi: callconv.t Makefile
-	$(BMENU) -p "CPU Model Dependent Features Extend Byte to Long Instruction" \
-	    -u "Top" \
-	    -n "Memory Model" ${*}.t
-
-memmodel.texi: memmodel.t Makefile
-	$(BMENU) -p "Calling Conventions User-Provided Routines" \
-	    -u "Top" \
-	    -n "Interrupt Processing" ${*}.t
-
-
-## Interrupt Chapter:
-##  1.  Replace Times and Sizes
-##  2.  Build Node Structure
-#
-#intr.texi: intr.t MVME136_TIMES
-#	${REPLACE} -p MVME136_TIMES intr.t
-#	mv intr.t.fixed intr.texi
-
-# Interrupt Chapter:
-#  1.  Replace Times and Sizes
-#  2.  Build Node Structure
-intr.t: intr_NOTIMES.t MVME136_TIMES
-	${REPLACE} -p MVME136_TIMES intr_NOTIMES.t
-	mv intr_NOTIMES.t.fixed intr.t
-
-intr.texi: intr.t Makefile
-	$(BMENU) -p "Memory Model Flat Memory Model" \
-	    -u "Top" \
-	    -n "Default Fatal Error Processing" ${*}.t
-
-fatalerr.texi: fatalerr.t Makefile
-	$(BMENU) -p "Interrupt Processing Interrupt Stack" \
-	    -u "Top" \
-	    -n "Board Support Packages" ${*}.t
-
-bsp.texi: bsp.t Makefile
-	$(BMENU) -p "Default Fatal Error Processing Default Fatal Error Handler Operations" \
-	    -u "Top" \
-	    -n "Processor Dependent Information Table" ${*}.t
-
-cputable.texi: cputable.t Makefile
-	$(BMENU) -p "Board Support Packages Processor Initialization" \
-	    -u "Top" \
-	    -n "Memory Requirements" ${*}.t
-
-
-# Worksheets Chapter:
-#  1.  Obtain the Shared File
-#  2.  Replace Times and Sizes
-#  3.  Build Node Structure
-
-wksheets_NOTIMES.t: ../../common/wksheets.t
-	cp ../../common/wksheets.t wksheets_NOTIMES.t
-
-wksheets.t: wksheets_NOTIMES.t MVME136_TIMES
-	${REPLACE} -p MVME136_TIMES wksheets_NOTIMES.t
-	mv wksheets_NOTIMES.t.fixed wksheets.t
-
-wksheets.texi: wksheets.t Makefile
-	$(BMENU) -p "Processor Dependent Information Table CPU Dependent Information Table" \
-	    -u "Top" \
-	    -n "Timing Specification" ${*}.t
-
-# Timing Specification Chapter:
-#  1.  Copy the Shared File
-#  3.  Build Node Structure
-
-timing.t: ../../common/timing.t
-	cp ../../common/timing.t timing.t
-
-timing.texi: timing.t Makefile
-	$(BMENU) -p "Memory Requirements RTEMS RAM Workspace Worksheet" \
-            -u "Top" \
-            -n "MVME136 Timing Data" ${*}.t
-
-# Timing Data for BSP Chapter:
-#  1.  Copy the Shared File
-#  2.  Replace Times and Sizes
-#  3.  Build Node Structure
-
-timeMVME136_.t: ../../common/timetbl.t timeMVME136.t
-	cat timeMVME136.t ../../common/timetbl.t             >timeMVME136_.t
-	@echo                                               >>timeMVME136_.t
-	@echo "@tex"                                        >>timeMVME136_.t
-	@echo "\\global\\advance \\smallskipamount by 4pt"  >>timeMVME136_.t
-	@echo "@end tex"                                    >>timeMVME136_.t
-	${REPLACE} -p MVME136_TIMES timeMVME136_.t
-	mv timeMVME136_.t.fixed timeMVME136_.t
-
-timeMVME136.texi: timeMVME136_.t Makefile
-	$(BMENU) -p "Timing Specification Terminology" \
-	    -u "Top" \
-	    -n "Command and Variable Index" timeMVME136_.t
-	mv timeMVME136_.texi timeMVME136.texi
diff --git a/doc/supplements/m68k/bsp.t b/doc/supplements/m68k/bsp.t
deleted file mode 100644
index 7782fe2e3d..0000000000
--- a/doc/supplements/m68k/bsp.t
+++ /dev/null
@@ -1,93 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Board Support Packages
-
-@section Introduction
-
-An RTEMS Board Support Package (BSP) must be designed
-to support a particular processor and target board combination.
-This chapter presents a discussion of MC68020 specific BSP
-issues.   For more information on developing a BSP, refer to the
-chapter titled Board Support Packages in the RTEMS
-Applications User's Guide.
-
-@section System Reset
-
-An RTEMS based application is initiated or
-re-initiated when the MC68020 processor is reset.  When the
-MC68020 is reset, the processor performs the following actions:
-
-@itemize @bullet
-@item The tracing bits of the status register are cleared to
-disable tracing.
-
-@item The supervisor interrupt state is entered by setting the
-supervisor (S) bit and clearing the master/interrupt (M) bit of
-the status register.
-
-@item The interrupt mask of the status register is set to
-level 7 to effectively disable all maskable interrupts.
-
-@item The vector base register (VBR) is set to zero.
-
-@item The cache control register (CACR) is set to zero to
-disable and freeze the processor cache.
-
-@item The interrupt stack pointer (ISP) is set to the value
-stored at vector 0 (bytes 0-3) of the exception vector table
-(EVT).
-
-@item The program counter (PC) is set to the value stored at
-vector 1 (bytes 4-7) of the EVT.
-
-@item The processor begins execution at the address stored in
-the PC.
-@end itemize
-
-@section Processor Initialization
-
-The address of the application's initialization code
-should be stored in the first vector of the EVT which will allow
-the immediate vectoring to the application code.  If the
-application requires that the VBR be some value besides zero,
-then it should be set to the required value at this point.  All
-tasks share the same MC68020's VBR value.  Because interrupts
-are enabled automatically by RTEMS as part of the initialize
-executive directive, the VBR MUST be set before this directive
-is invoked to insure correct interrupt vectoring.  If processor
-caching is to be utilized, then it should be enabled during the
-reset application initialization code.
-
-In addition to the requirements described in the
-Board Support Packages chapter of the Applications User's
-Manual for the reset code which is executed before the call to
-initialize executive, the MC68020 version has the following
-specific requirements:
-
-@itemize @bullet
-@item Must leave the S bit of the status register set so that
-the MC68020 remains in the supervisor state.
-
-@item Must set the M bit of the status register to remove the
-MC68020 from the interrupt state.
-
-@item Must set the master stack pointer (MSP) such that a
-minimum stack size of MINIMUM_STACK_SIZE bytes is provided for
-the initialize executive directive.
-
-@item Must initialize the MC68020's vector table.
-@end itemize
-
-Note that the BSP is not responsible for allocating
-or installing the interrupt stack.  RTEMS does this
-automatically as part of initialization.  If the BSP does not
-install an interrupt stack and -- for whatever reason -- an
-interrupt occurs before initialize_executive is invoked, then
-the results are unpredictable.
-
diff --git a/doc/supplements/m68k/callconv.t b/doc/supplements/m68k/callconv.t
deleted file mode 100644
index 1ebdf7592e..0000000000
--- a/doc/supplements/m68k/callconv.t
+++ /dev/null
@@ -1,92 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Calling Conventions
-
-@section Introduction
-
-Each high-level language compiler generates
-subroutine entry and exit code based upon a set of rules known
-as the compiler's calling convention.   These rules address the
-following issues:
-
-@itemize @bullet
-@item register preservation and usage
-@item parameter passing
-@item call and return mechanism
-@end itemize
-
-A compiler's calling convention is of importance when
-interfacing to subroutines written in another language either
-assembly or high-level.  Even when the high-level language and
-target processor are the same, different compilers may use
-different calling conventions.  As a result, calling conventions
-are both processor and compiler dependent.
-
-@section Processor Background
-
-The MC68xxx architecture supports a simple yet
-effective call and return mechanism.  A subroutine is invoked
-via the branch to subroutine (bsr) or the jump to subroutine
-(jsr) instructions.  These instructions push the return address
-on the current stack.  The return from subroutine (rts)
-instruction pops the return address off the current stack and
-transfers control to that instruction.  It is is important to
-note that the MC68xxx call and return mechanism does not
-automatically save or restore any registers.  It is the
-responsibility of the high-level language compiler to define the
-register preservation and usage convention.
-
-@section Calling Mechanism
-
-All RTEMS directives are invoked using either a bsr
-or jsr instruction and return to the user application via the
-rts instruction.
-
-@section Register Usage
-
-As discussed above, the bsr and jsr instructions do
-not automatically save any registers.  RTEMS uses the registers
-D0, D1, A0, and A1 as scratch registers.  These registers are
-not preserved by RTEMS directives therefore, the contents of
-these registers should not be assumed upon return from any RTEMS
-directive.
-
-@section Parameter Passing
-
-RTEMS assumes that arguments are placed on the
-current stack before the directive is invoked via the bsr or jsr
-instruction.  The first argument is assumed to be closest to the
-return address on the stack.  This means that the first argument
-of the C calling sequence is pushed last.  The following
-pseudo-code illustrates the typical sequence used to call a
-RTEMS directive with three (3) arguments:
-
-@example
-@group
-push third argument
-push second argument
-push first argument
-invoke directive
-remove arguments from the stack
-@end group
-@end example
-
-The arguments to RTEMS are typically pushed onto the
-stack using a move instruction with a pre-decremented stack
-pointer as the destination.  These arguments must be removed
-from the stack after control is returned to the caller.  This
-removal is typically accomplished by adding the size of the
-argument list in bytes to the current stack pointer.
-
-@section User-Provided Routines
-
-All user-provided routines invoked by RTEMS, such as
-user extensions, device drivers, and MPCI routines, must also
-adhere to these calling conventions.
-
diff --git a/doc/supplements/m68k/cpumodel.t b/doc/supplements/m68k/cpumodel.t
deleted file mode 100644
index d9bf601e1f..0000000000
--- a/doc/supplements/m68k/cpumodel.t
+++ /dev/null
@@ -1,91 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter CPU Model Dependent Features
-
-@section Introduction
-
-Microprocessors are generally classified into
-families with a variety of CPU models or implementations within
-that family.  Within a processor family, there is a high level
-of binary compatibility.  This family may be based on either an
-architectural specification or on maintaining compatibility with
-a popular processor.  Recent microprocessor families such as the
-SPARC or PA-RISC are based on an architectural specification
-which is independent or any particular CPU model or
-implementation.  Older families such as the M68xxx and the iX86
-evolved as the manufacturer strived to produce higher
-performance processor models which maintained binary
-compatibility with older models.
-
-RTEMS takes advantage of the similarity of the
-various models within a CPU family.  Although the models do vary
-in significant ways, the high level of compatibility makes it
-possible to share the bulk of the CPU dependent executive code
-across the entire family.  Each processor family supported by
-RTEMS has a list of features which vary between CPU models
-within a family.  For example, the most common model dependent
-feature regardless of CPU family is the presence or absence of a
-floating point unit or coprocessor.  When defining the list of
-features present on a particular CPU model, one simply notes
-that floating point hardware is or is not present and defines a
-single constant appropriately.  Conditional compilation is
-utilized to include the appropriate source code for this CPU
-model's feature set.  It is important to note that this means
-that RTEMS is thus compiled using the appropriate feature set
-and compilation flags optimal for this CPU model used.  The
-alternative would be to generate a binary which would execute on
-all family members using only the features which were always
-present.
-
-This chapter presents the set of features which vary
-across SPARC implementations and are of importance to RTEMS.
-The set of CPU model feature macros are defined in the file
-c/src/exec/score/cpu/m68k/m68k.h based upon the particular CPU
-model defined on the compilation command line.
-
-@section CPU Model Name
-
-The macro CPU_MODEL_NAME is a string which designates
-the name of this CPU model.  For example, for the MC68020
-processor, this macro is set to the string "mc68020".
-
-@section Floating Point Unit
-
-The macro M68K_HAS_FPU is set to 1 to indicate that
-this CPU model has a hardware floating point unit and 0
-otherwise.  It does not matter whether the hardware floating
-point support is incorporated on-chip or is an external
-coprocessor.
-
-@section BFFFO Instruction
-
-The macro M68K_HAS_BFFFO is set to 1 to indicate that
-this CPU model has the bfffo instruction.
-
-@section Vector Base Register
-
-The macro M68K_HAS_VBR is set to 1 to indicate that
-this CPU model has a vector base register (vbr).
-
-@section Separate Stacks
-
-The macro M68K_HAS_SEPARATE_STACKS is set to 1 to
-indicate that this CPU model has separate interrupt, user, and
-supervisor mode stacks.
-
-@section Pre-Indexing Address Mode
-
-The macro M68K_HAS_PREINDEXING is set to 1 to indicate that
-this CPU model has the pre-indexing address mode.
-
-@section Extend Byte to Long Instruction
- 
-The macro M68K_HAS_EXTB_L is set to 1 to indicate that this CPU model 
-has the extb.l instruction.  This instruction is supposed to be available
-in all models based on the cpu32 core as well as mc68020 and up models.
diff --git a/doc/supplements/m68k/cputable.t b/doc/supplements/m68k/cputable.t
deleted file mode 100644
index 7a7273ea8e..0000000000
--- a/doc/supplements/m68k/cputable.t
+++ /dev/null
@@ -1,111 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Processor Dependent Information Table
-
-@section Introduction
-
-Any highly processor dependent information required
-to describe a processor to RTEMS is provided in the CPU
-Dependent Information Table.  This table is not required for all
-processors supported by RTEMS.  This chapter describes the
-contents, if any, for a particular processor type.
-
-@section CPU Dependent Information Table
-
-The MC68xxx version of the RTEMS CPU Dependent
-Information Table contains the information required to interface
-a Board Support Package and RTEMS on the MC68xxx.  This
-information is provided to allow RTEMS to interoperate
-effectively with the BSP.  The C structure definition is given
-here:
-
-@example
-@group
-typedef struct @{
-  void       (*pretasking_hook)( void );
-  void       (*predriver_hook)( void );
-  void       (*postdriver_hook)( void );
-  void       (*idle_task)( void );
-  boolean      do_zero_of_workspace;
-  unsigned32   idle_task_stack_size;
-  unsigned32   interrupt_stack_size;
-  unsigned32   extra_mpci_receive_server_stack;
-  void *     (*stack_allocate_hook)( unsigned32 );
-  void       (*stack_free_hook)( void* );
-  /* end of fields required on all CPUs */
-
-  m68k_isr    *interrupt_vector_table;
-@} rtems_cpu_table;
-@end group
-@end example
-
-@table @code
-@item pretasking_hook
-is the address of the
-user provided routine which is invoked once RTEMS initialization
-is complete but before interrupts and tasking are enabled.  This
-field may be NULL to indicate that the hook is not utilized.
-
-@item predriver_hook
-is the address of the user provided
-routine which is invoked with tasking enabled immediately before
-the MPCI and device drivers are initialized. RTEMS
-initialization is complete, interrupts and tasking are enabled,
-but no device drivers are initialized.  This field may be NULL to
-indicate that the hook is not utilized.
-
-@item postdriver_hook
-is the address of the user provided
-routine which is invoked with tasking enabled immediately after
-the MPCI and device drivers are initialized. RTEMS
-initialization is complete, interrupts and tasking are enabled,
-and the device drivers are initialized.  This field may be NULL
-to indicate that the hook is not utilized.
-
-@item idle_task
-is the address of the optional user
-provided routine which is used as the system's IDLE task.  If
-this field is not NULL, then the RTEMS default IDLE task is not
-used.  This field may be NULL to indicate that the default IDLE
-is to be used.
-
-@item do_zero_of_workspace
-indicates whether RTEMS should
-zero the Workspace as part of its initialization.  If set to
-TRUE, the Workspace is zeroed.  Otherwise, it is not.
-
-@item idle_task_stack_size
-is the size of the RTEMS idle task stack in bytes.  
-If this number is less than MINIMUM_STACK_SIZE, then the 
-idle task's stack will be MINIMUM_STACK_SIZE in byte.
-
-@item interrupt_stack_size
-is the size of the RTEMS
-allocated interrupt stack in bytes.  This value must be at least
-as large as MINIMUM_STACK_SIZE.
-
-@item extra_mpci_receive_server_stack
-is the extra stack space allocated for the RTEMS MPCI receive server task
-in bytes.  The MPCI receive server may invoke nearly all directives and 
-may require extra stack space on some targets.
-
-@item stack_allocate_hook
-is the address of the optional user provided routine which allocates 
-memory for task stacks.  If this hook is not NULL, then a stack_free_hook
-must be provided as well.
-
-@item stack_free_hook
-is the address of the optional user provided routine which frees 
-memory for task stacks.  If this hook is not NULL, then a stack_allocate_hook
-must be provided as well.
-
-@item interrupt_vector_table
-is the base address of the CPU's Exception Vector Table.
-
-@end table
diff --git a/doc/supplements/m68k/fatalerr.t b/doc/supplements/m68k/fatalerr.t
deleted file mode 100644
index 4b4c8d0b8d..0000000000
--- a/doc/supplements/m68k/fatalerr.t
+++ /dev/null
@@ -1,31 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Default Fatal Error Processing
-
-@section Introduction
-
-Upon detection of a fatal error by either the
-application or RTEMS the fatal error manager is invoked.  The
-fatal error manager will invoke the user-supplied fatal error
-handlers.  If no user-supplied handlers are configured,  the
-RTEMS provided default fatal error handler is invoked.  If the
-user-supplied fatal error handlers return to the executive the
-default fatal error handler is then invoked.  This chapter
-describes the precise operations of the default fatal error
-handler.
-
-@section Default Fatal Error Handler Operations
-
-The default fatal error handler which is invoked by
-the fatal_error_occurred directive when there is no user handler
-configured or the user handler returns control to RTEMS.  The
-default fatal error handler disables processor interrupts to
-level 7, places the error code in D0, and executes a stop
-instruction to simulate a halt processor instruction.
-
diff --git a/doc/supplements/m68k/intr_NOTIMES.t b/doc/supplements/m68k/intr_NOTIMES.t
deleted file mode 100644
index 89c5225625..0000000000
--- a/doc/supplements/m68k/intr_NOTIMES.t
+++ /dev/null
@@ -1,196 +0,0 @@
-@c
-@c  Interrupt Stack Frame Picture
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Interrupt Processing
-
-@section Introduction
-
-Different types of processors respond to the
-occurrence of an interrupt in its own unique fashion. In
-addition, each processor type provides a control mechanism to
-allow for the proper handling of an interrupt.  The processor
-dependent response to the interrupt modifies the current
-execution state and results in a change in the execution stream.
-Most processors require that an interrupt handler utilize some
-special control mechanisms to return to the normal processing
-stream.  Although RTEMS hides many of the processor dependent
-details of interrupt processing, it is important to understand
-how the RTEMS interrupt manager is mapped onto the processor's
-unique architecture. Discussed in this chapter are the MC68xxx's
-interrupt response and control mechanisms as they pertain to
-RTEMS.
-
-@section Vectoring of an Interrupt Handler
-
-Depending on whether or not the particular CPU
-supports a separate interrupt stack, the MC68xxx family has two
-different interrupt handling models.
-
-@subsection Models Without Separate Interrupt Stacks
-
-Upon receipt of an interrupt the MC68xxx family
-members without separate interrupt stacks automatically perform
-the following actions:
-
-@itemize @bullet
-@item To Be Written
-@end itemize
-
-@subsection Models With Separate Interrupt Stacks
-
-Upon receipt of an interrupt the MC68xxx family
-members with separate interrupt stacks automatically perform the
-following actions:
-
-@itemize @bullet
-@item saves the current status register (SR),
-
-@item clears the master/interrupt (M) bit of the SR to
-indicate the switch from master state to interrupt state,
-
-@item sets the privilege mode to supervisor,
-
-@item suppresses tracing,
-
-@item sets the interrupt mask level equal to the level of the
-interrupt being serviced,
-
-@item pushes an interrupt stack frame (ISF), which includes
-the program counter (PC), the status register (SR), and the
-format/exception vector offset (FVO) word, onto the supervisor
-and interrupt stacks,
-
-@item switches the current stack to the interrupt stack and
-vectors to an interrupt service routine (ISR).  If the ISR was
-installed with the interrupt_catch directive, then the RTEMS
-interrupt handler will begin execution.  The RTEMS interrupt
-handler saves all registers which are not preserved according to
-the calling conventions and invokes the application's ISR.
-@end itemize
-
-A nested interrupt is processed similarly by these
-CPU models with the exception that only a single ISF is placed
-on the interrupt stack and the current stack need not be
-switched.
-
-The FVO word in the Interrupt Stack Frame is examined
-by RTEMS to determine when an outer most interrupt is being
-exited. Since the FVO is used by RTEMS for this purpose, the
-user application code MUST NOT modify this field.
-
-The following shows the Interrupt Stack Frame for
-MC68xxx CPU models with separate interrupt stacks:
-
-@ifset use-ascii
-@example
-@group
-               +----------------------+
-               |    Status Register   | 0x0
-               +----------------------+    
-               | Program Counter High | 0x2
-               +----------------------+    
-               | Program Counter Low  | 0x4
-               +----------------------+    
-               | Format/Vector Offset | 0x6
-               +----------------------+    
-@end group
-@end example
-@end ifset
-
-@ifset use-tex
-@sp 1
-@tex
-\centerline{\vbox{\offinterlineskip\halign{
-\strut\vrule#&
-\hbox to 2.00in{\enskip\hfil#\hfil}&
-\vrule#&
-\hbox to 0.50in{\enskip\hfil#\hfil}
-\cr
-\multispan{3}\hrulefill\cr
-& Status Register && 0x0\cr
-\multispan{3}\hrulefill\cr
-& Program Counter High && 0x2\cr
-\multispan{3}\hrulefill\cr
-& Program Counter Low && 0x4\cr
-\multispan{3}\hrulefill\cr
-& Format/Vector Offset && 0x6\cr
-\multispan{3}\hrulefill\cr
-}}\hfil}
-@end tex
-@end ifset
-
-@ifset use-html
-@html
-<CENTER>
-  <TABLE COLS=2 WIDTH="40%" BORDER=2>
-<TR><TD ALIGN=center><STRONG>Status Register</STRONG></TD>
-    <TD ALIGN=center>0x0</TD></TR>
-<TR><TD ALIGN=center><STRONG>Program Counter High</STRONG></TD>
-    <TD ALIGN=center>0x2</TD></TR>
-<TR><TD ALIGN=center><STRONG>Program Counter Low</STRONG></TD>
-    <TD ALIGN=center>0x4</TD></TR>
-<TR><TD ALIGN=center><STRONG>Format/Vector Offset</STRONG></TD>
-    <TD ALIGN=center>0x6</TD></TR>
-  </TABLE>
-</CENTER>
-@end html
-@end ifset
-
-@section Interrupt Levels
-
-Eight levels (0-7) of interrupt priorities are
-supported by MC68xxx family members with level seven (7) being
-the highest priority.  Level zero (0) indicates that interrupts
-are fully enabled.  Interrupt requests for interrupts with
-priorities less than or equal to the current interrupt mask
-level are ignored.
-
-Although RTEMS supports 256 interrupt levels, the
-MC68xxx family only supports eight.  RTEMS interrupt levels 0
-through 7 directly correspond to MC68xxx interrupt levels.  All
-other RTEMS interrupt levels are undefined and their behavior is
-unpredictable.
-
-@section Disabling of Interrupts by RTEMS
-
-During the execution of directive calls, critical
-sections of code may be executed.  When these sections are
-encountered, RTEMS disables interrupts to level seven (7) before
-the execution of this section and restores them to the previous
-level upon completion of the section.  RTEMS has been optimized
-to insure that interrupts are disabled for less than 
-RTEMS_MAXIMUM_DISABLE_PERIOD microseconds on a 
-RTEMS_MAXIMUM_DISABLE_PERIOD_MHZ Mhz MC68020 with 
-zero wait states.  These numbers will vary based the 
-number of wait states and processor speed present on the target board.
-[NOTE:  The maximum period with interrupts disabled is hand calculated.  This
-calculation was last performed for Release 
-RTEMS_RELEASE_FOR_MAXIMUM_DISABLE_PERIOD.]
-
-Non-maskable interrupts (NMI) cannot be disabled, and
-ISRs which execute at this level MUST NEVER issue RTEMS system
-calls.  If a directive is invoked, unpredictable results may
-occur due to the inability of RTEMS to protect its critical
-sections.  However, ISRs that make no system calls may safely
-execute as non-maskable interrupts.
-
-@section Interrupt Stack
-
-RTEMS allocates the interrupt stack from the
-Workspace Area.  The amount of memory allocated for the
-interrupt stack is determined by the interrupt_stack_size field
-in the CPU Configuration Table.  During the initialization
-process, RTEMS will install its interrupt stack.
-
-The MC68xxx port of RTEMS supports a software managed
-dedicated interrupt stack on those CPU models which do not
-support a separate interrupt stack in hardware.
-
-
diff --git a/doc/supplements/m68k/m68k.texi b/doc/supplements/m68k/m68k.texi
deleted file mode 100644
index edd541331d..0000000000
--- a/doc/supplements/m68k/m68k.texi
+++ /dev/null
@@ -1,121 +0,0 @@
-\input ../../texinfo/texinfo   @c -*-texinfo-*-
-@c %**start of header
-@setfilename c_m68k
-@syncodeindex vr fn
-@synindex ky cp
-@paragraphindent 0
-@c @smallbook
-@c %**end of header
-
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@c
-@c   Master file for the Motorola MC68xxx Applications Supplement
-@c
-
-@include ../../common/setup.texi
-
-@ignore
-@ifinfo
-@format
-START-INFO-DIR-ENTRY
-* RTEMS Motorola MC68xxx Applications Supplement (m68k):
-END-INFO-DIR-ENTRY
-@end format
-@end ifinfo
-@end ignore
-
-@c
-@c  Title Page Stuff
-@c
-
-@set edition @value{RTEMS-EDITION}
-@set version @value{RTEMS-VERSION}
-@set update-date @value{RTEMS-UPDATE-DATE}
-@set update-month @value{RTEMS-UPDATE-MONTH}
-
-@c
-@c  I don't really like having a short title page.  --joel
-@c
-@c @shorttitlepage RTEMS Motorola MC68xxx Applications Supplement 
-
-@setchapternewpage odd
-@settitle RTEMS Motorola MC68xxx Applications Supplement 
-@titlepage
-@finalout
-
-@title RTEMS Motorola MC68xxx Applications Supplement 
-@subtitle Edition @value{edition}, for RTEMS @value{version}
-@sp 1
-@subtitle @value{update-month}
-@author On-Line Applications Research Corporation
-@page
-
-@include ../../common/cpright.texi
-@end titlepage
-
-@c  This prevents a black box from being printed on "overflow" lines.
-@c  The alternative is to rework a sentence to avoid this problem.
-
-@include preface.texi
-@include cpumodel.texi
-@include callconv.texi
-@include memmodel.texi
-@include intr.texi
-@include fatalerr.texi
-@include bsp.texi
-@include cputable.texi
-@include wksheets.texi
-@include timing.texi
-@include timeMVME136.texi
-@ifinfo
-@node Top, Preface, (dir), (dir)
-@top c_m68k
-
-This is the online version of the RTEMS Motorola MC68xxx
-Applications Supplement.
-
-@menu
-* Preface::
-* CPU Model Dependent Features::
-* Calling Conventions::
-* Memory Model::
-* Interrupt Processing::
-* Default Fatal Error Processing::
-* Board Support Packages::
-* Processor Dependent Information Table::
-* Memory Requirements::
-* Timing Specification::
-* MVME136 Timing Data::
-* Command and Variable Index::
-* Concept Index::
-@end menu
-
-@end ifinfo
-@c 
-@c 
-@c Need to copy the emacs stuff and "trailer stuff" (index, toc) into here
-@c
-
-@node Command and Variable Index, Concept Index, MVME136 Timing Data Rate Monotonic Manager, Top
-@unnumbered Command and Variable Index
-
-There are currently no Command and Variable Index entries.
-
-@c @printindex fn
-
-@node Concept Index, , Command and Variable Index, Top
-@unnumbered Concept Index
-
-There are currently no Concept Index entries.
-@c @printindex cp
-
-@c @contents
-@bye
-
diff --git a/doc/supplements/m68k/memmodel.t b/doc/supplements/m68k/memmodel.t
deleted file mode 100644
index 6054fd54a9..0000000000
--- a/doc/supplements/m68k/memmodel.t
+++ /dev/null
@@ -1,39 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Memory Model
-
-@section Introduction
-
-A processor may support any combination of memory
-models ranging from pure physical addressing to complex demand
-paged virtual memory systems.  RTEMS supports a flat memory
-model which ranges contiguously over the processor's allowable
-address space.  RTEMS does not support segmentation or virtual
-memory of any kind.  The appropriate memory model for RTEMS
-provided by the targeted processor and related characteristics
-of that model are described in this chapter.
-
-@section Flat Memory Model
-
-The MC68xxx family supports a flat 32-bit address
-space with addresses ranging from 0x00000000 to 0xFFFFFFFF (4
-gigabytes).  Each address is represented by a 32-bit value and
-is byte addressable.  The address may be used to reference a
-single byte, word (2-bytes), or long word (4 bytes).  Memory
-accesses within this address space are performed in big endian
-fashion by the processors in this family.
-
-Some of the MC68xxx family members such as the
-MC68020, MC68030, and MC68040 support virtual memory and
-segmentation.  The MC68020 requires external hardware support
-such as the MC68851 Paged Memory Management Unit coprocessor
-which is typically used to perform address translations for
-these systems.  RTEMS does not support virtual memory or
-segmentation on any of the MC68xxx family members.
-
diff --git a/doc/supplements/m68k/preface.texi b/doc/supplements/m68k/preface.texi
deleted file mode 100644
index cf3f9d2901..0000000000
--- a/doc/supplements/m68k/preface.texi
+++ /dev/null
@@ -1,60 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@ifinfo
-@node Preface, CPU Model Dependent Features, Top, Top
-@end ifinfo
-@unnumbered Preface
-
-The Real Time Executive for Multiprocessor Systems (RTEMS)
-is designed to be portable across multiple processor
-architectures.  However, the nature of real-time systems makes
-it essential that the application designer understand certain
-processor dependent implementation details.  These processor
-dependencies include calling convention, board support package
-issues, interrupt processing, exact RTEMS memory requirements,
-performance data, header files, and the assembly language
-interface to the executive.
-
-This document discusses the Motorola MC68xxx
-architecture dependencies in this port of RTEMS.  The MC68xxx
-family has a wide variety of CPU models within it.  The part
-numbers for these models are generally divided into MC680xx and
-MC683xx.  The MC680xx models are more general purpose processors
-with no integrated peripherals.  The MC683xx models, on the
-other hand, are more specialized and have a variety of
-peripherals on chip including sophisticated timers and serial
-communications controllers.
-
-It is highly recommended that the Motorola MC68xxx
-RTEMS application developer obtain and become familiar with the
-documentation for the processor being used as well as the
-documentation for the family as a whole.
-
-@subheading Architecture Documents
-
-For information on the Motorola MC68xxx architecture,
-refer to the following documents available from Motorola
-(@file{http//www.moto.com/}):
-
-@itemize @bullet
-@item @cite{M68000 Family Reference, Motorola, FR68K/D}.
-@end itemize
-
-@subheading MODEL SPECIFIC DOCUMENTS
-
-For information on specific processor models and
-their associated coprocessors, refer to the following documents:
-
-@itemize  @bullet
-@item @cite{MC68020 User's Manual, Motorola, MC68020UM/AD}.
-
-@item @cite{MC68881/MC68882 Floating-Point Coprocessor User's
-Manual, Motorola, MC68881UM/AD}.
-@end itemize
-
diff --git a/doc/supplements/m68k/timeMVME136.t b/doc/supplements/m68k/timeMVME136.t
deleted file mode 100644
index 7f126b4606..0000000000
--- a/doc/supplements/m68k/timeMVME136.t
+++ /dev/null
@@ -1,108 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@include ../../common/timemac.texi
-@tex
-\global\advance \smallskipamount by -4pt
-@end tex
-
-@chapter MVME136 Timing Data
-
-@section Introduction
-
-The timing data for the MC68020 version of RTEMS is
-provided along with the target dependent aspects concerning the
-gathering of the timing data.  The hardware platform used to
-gather the times is described to give the reader a better
-understanding of each directive time provided.  Also, provided
-is a description of the interrupt latency and the context switch
-times as they pertain to the MC68020 version of RTEMS.
-
-@section Hardware Platform
-
-All times reported except for the maximum period
-interrupts are disabled by RTEMS were measured using a Motorola
-MVME135 CPU board.  The MVME135 is a 20Mhz board with one wait
-state dynamic memory and a MC68881 numeric coprocessor.  The
-Zilog 8036 countdown timer on this board was used to measure
-elapsed time with a one-half microsecond resolution.  All
-sources of hardware interrupts were disabled, although the
-interrupt level of the MC68020 allows all interrupts.
-
-The maximum period interrupts are disabled was
-measured by summing the number of CPU cycles required by each
-assembly language instruction executed while interrupts were
-disabled.  The worst case times of the MC68020 microprocessor
-were used for each instruction.  Zero wait state memory was
-assumed.  The total CPU cycles executed with interrupts
-disabled, including the instructions to disable and enable
-interrupts, was divided by 20 to simulate a 20Mhz MC68020.  It
-should be noted that the worst case instruction times for the
-MC68020 assume that the internal cache is disabled and that no
-instructions overlap.
-
-@section Interrupt Latency
-
-The maximum period with interrupts disabled within
-RTEMS is less than RTEMS_MAXIMUM_DISABLE_PERIOD 
-microseconds including the instructions
-which disable and re-enable interrupts.  The time required for
-the MC68020 to vector an interrupt and for the RTEMS entry
-overhead before invoking the user's interrupt handler are a
-total of RTEMS_INTR_ENTRY_RETURNS_TO_PREEMPTING_TASK 
-microseconds.  These combine to yield a worst case
-interrupt latency of less than 
-RTEMS_MAXIMUM_DISABLE_PERIOD + RTEMS_INTR_ENTRY_RETURNS_TO_PREEMPTING_TASK 
-microseconds at 20Mhz.  [NOTE:  The maximum period with interrupts
-disabled was last determined for Release 
-RTEMS_RELEASE_FOR_MAXIMUM_DISABLE_PERIOD.]
-
-It should be noted again that the maximum period with
-interrupts disabled within RTEMS is hand-timed and based upon
-worst case (i.e. CPU cache disabled and no instruction overlap)
-times for a 20Mhz MC68020.  The interrupt vector and entry
-overhead time was generated on an MVME135 benchmark platform
-using the Multiprocessing Communications registers to generate
-as the interrupt source.
-
-@section Context Switch
-
-The RTEMS processor context switch time is RTEMS_NO_FP_CONTEXTS
-microseconds on the MVME135 benchmark platform when no floating
-point context is saved or restored.  Additional execution time
-is required when a TASK_SWITCH user extension is configured.
-The use of the TASK_SWITCH extension is application dependent.
-Thus, its execution time is not considered part of the raw
-context switch time.
-
-Since RTEMS was designed specifically for embedded
-missile applications which are floating point intensive, the
-executive is optimized to avoid unnecessarily saving and
-restoring the state of the numeric coprocessor.  The state of
-the numeric coprocessor is only saved when an FLOATING_POINT
-task is dispatched and that task was not the last task to
-utilize the coprocessor.  In a system with only one
-FLOATING_POINT task, the state of the numeric coprocessor will
-never be saved or restored.  When the first FLOATING_POINT task
-is dispatched, RTEMS does not need to save the current state of
-the numeric coprocessor.
-
-The exact amount of time required to save and restore
-floating point context is dependent on whether an MC68881 or
-MC68882 is being used as well as the state of the numeric
-coprocessor.  These numeric coprocessors define three operating
-states: initialized, idle, and busy.  RTEMS places the
-coprocessor in the initialized state when a task is started or
-restarted.  Once the task has utilized the coprocessor, it is in
-the idle state when floating point instructions are not
-executing and the busy state when floating point instructions
-are executing.  The state of the coprocessor is task specific.
-
-The following table summarizes the context switch
-times for the MVME135 benchmark platform:
-
diff --git a/doc/supplements/m68k/timedata.t b/doc/supplements/m68k/timedata.t
deleted file mode 100644
index 74b64bd088..0000000000
--- a/doc/supplements/m68k/timedata.t
+++ /dev/null
@@ -1,150 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@include ../../common/timemac.texi
-@tex
-\global\advance \smallskipamount by -4pt
-@end tex
-
-@ifinfo
-@node MVME136 Timing Data, MVME136 Timing Data Introduction, Timing Specification Terminology, Top
-@end ifinfo
-@chapter MVME136 Timing Data
-@ifinfo
-@menu
-* MVME136 Timing Data Introduction::
-* MVME136 Timing Data Hardware Platform::
-* MVME136 Timing Data Interrupt Latency::
-* MVME136 Timing Data Context Switch::
-* MVME136 Timing Data Directive Times::
-* MVME136 Timing Data Task Manager::
-* MVME136 Timing Data Interrupt Manager::
-* MVME136 Timing Data Clock Manager::
-* MVME136 Timing Data Timer Manager::
-* MVME136 Timing Data Semaphore Manager::
-* MVME136 Timing Data Message Manager::
-* MVME136 Timing Data Event Manager::
-* MVME136 Timing Data Signal Manager::
-* MVME136 Timing Data Partition Manager::
-* MVME136 Timing Data Region Manager::
-* MVME136 Timing Data Dual-Ported Memory Manager::
-* MVME136 Timing Data I/O Manager::
-* MVME136 Timing Data Rate Monotonic Manager::
-@end menu
-@end ifinfo
-
-@ifinfo
-@node MVME136 Timing Data Introduction, MVME136 Timing Data Hardware Platform, MVME136 Timing Data, MVME136 Timing Data
-@end ifinfo
-@section Introduction
-
-The timing data for the MC68020 version of RTEMS is
-provided along with the target dependent aspects concerning the
-gathering of the timing data.  The hardware platform used to
-gather the times is described to give the reader a better
-understanding of each directive time provided.  Also, provided
-is a description of the interrupt latency and the context switch
-times as they pertain to the MC68020 version of RTEMS.
-
-@ifinfo
-@node MVME136 Timing Data Hardware Platform, MVME136 Timing Data Interrupt Latency, MVME136 Timing Data Introduction, MVME136 Timing Data
-@end ifinfo
-@section Hardware Platform
-
-All times reported except for the maximum period
-interrupts are disabled by RTEMS were measured using a Motorola
-MVME135 CPU board.  The MVME135 is a 20Mhz board with one wait
-state dynamic memory and a MC68881 numeric coprocessor.  The
-Zilog 8036 countdown timer on this board was used to measure
-elapsed time with a one-half microsecond resolution.  All
-sources of hardware interrupts were disabled, although the
-interrupt level of the MC68020 allows all interrupts.
-
-The maximum period interrupts are disabled was
-measured by summing the number of CPU cycles required by each
-assembly language instruction executed while interrupts were
-disabled.  The worst case times of the MC68020 microprocessor
-were used for each instruction.  Zero wait state memory was
-assumed.  The total CPU cycles executed with interrupts
-disabled, including the instructions to disable and enable
-interrupts, was divided by 20 to simulate a 20Mhz MC68020.  It
-should be noted that the worst case instruction times for the
-MC68020 assume that the internal cache is disabled and that no
-instructions overlap.
-
-@ifinfo
-@node MVME136 Timing Data Interrupt Latency, MVME136 Timing Data Context Switch, MVME136 Timing Data Hardware Platform, MVME136 Timing Data
-@end ifinfo
-@section Interrupt Latency
-
-The maximum period with interrupts disabled within
-RTEMS is less than RTEMS_MAXIMUM_DISABLE_PERIOD 
-microseconds including the instructions
-which disable and re-enable interrupts.  The time required for
-the MC68020 to vector an interrupt and for the RTEMS entry
-overhead before invoking the user's interrupt handler are a
-total of RTEMS_INTR_ENTRY_RETURNS_TO_PREEMPTING_TASK 
-microseconds.  These combine to yield a worst case
-interrupt latency of less than 
-RTEMS_MAXIMUM_DISABLE_PERIOD + RTEMS_INTR_ENTRY_RETURNS_TO_PREEMPTING_TASK 
-microseconds at 20Mhz.  [NOTE:  The maximum period with interrupts
-disabled was last determined for Release 
-RTEMS_RELEASE_FOR_MAXIMUM_DISABLE_PERIOD.]
-
-It should be noted again that the maximum period with
-interrupts disabled within RTEMS is hand-timed and based upon
-worst case (i.e. CPU cache disabled and no instruction overlap)
-times for a 20Mhz MC68020.  The interrupt vector and entry
-overhead time was generated on an MVME135 benchmark platform
-using the Multiprocessing Communications registers to generate
-as the interrupt source.
-
-@ifinfo
-@node MVME136 Timing Data Context Switch, MVME136 Timing Data Directive Times, MVME136 Timing Data Interrupt Latency, MVME136 Timing Data
-@end ifinfo
-@section Context Switch
-
-The RTEMS processor context switch time is RTEMS_NO_FP_CONTEXTS
-microseconds on the MVME135 benchmark platform when no floating
-point context is saved or restored.  Additional execution time
-is required when a TASK_SWITCH user extension is configured.
-The use of the TASK_SWITCH extension is application dependent.
-Thus, its execution time is not considered part of the raw
-context switch time.
-
-Since RTEMS was designed specifically for embedded
-missile applications which are floating point intensive, the
-executive is optimized to avoid unnecessarily saving and
-restoring the state of the numeric coprocessor.  The state of
-the numeric coprocessor is only saved when an FLOATING_POINT
-task is dispatched and that task was not the last task to
-utilize the coprocessor.  In a system with only one
-FLOATING_POINT task, the state of the numeric coprocessor will
-never be saved or restored.  When the first FLOATING_POINT task
-is dispatched, RTEMS does not need to save the current state of
-the numeric coprocessor.
-
-The exact amount of time required to save and restore
-floating point context is dependent on whether an MC68881 or
-MC68882 is being used as well as the state of the numeric
-coprocessor.  These numeric coprocessors define three operating
-states: initialized, idle, and busy.  RTEMS places the
-coprocessor in the initialized state when a task is started or
-restarted.  Once the task has utilized the coprocessor, it is in
-the idle state when floating point instructions are not
-executing and the busy state when floating point instructions
-are executing.  The state of the coprocessor is task specific.
-
-The following table summarizes the context switch
-times for the MVME135 benchmark platform:
-
-@include timetbl.texi
-
-@tex
-\global\advance \smallskipamount by 4pt
-@end tex
diff --git a/doc/supplements/powerpc/DMV177_TIMES b/doc/supplements/powerpc/DMV177_TIMES
deleted file mode 100644
index 8f6ff2e3c0..0000000000
--- a/doc/supplements/powerpc/DMV177_TIMES
+++ /dev/null
@@ -1,248 +0,0 @@
-#
-#  PowerPC/603e/PSIM Timing and Size Information
-#
-#  $Id$
-#
-
-#
-#  CPU Model Information
-#
-RTEMS_BSP       DMV177
-RTEMS_CPU_MODEL PPC603e
-#
-#  Interrupt Latency
-#
-#  NOTE:  In general, the text says it is hand-calculated to be
-#         RTEMS_MAXIMUM_DISABLE_PERIOD at RTEMS_MAXIMUM_DISABLE_PERIOD_MHZ
-#         Mhz and this was last calculated for Release 
-#         RTEMS_VERSION_FOR_MAXIMUM_DISABLE_PERIOD.
-#
-RTEMS_MAXIMUM_DISABLE_PERIOD TBD
-RTEMS_MAXIMUM_DISABLE_PERIOD_MHZ 100.0
-RTEMS_RELEASE_FOR_MAXIMUM_DISABLE_PERIOD 4.0.0-lmco
-#
-#  Context Switch Times
-#
-RTEMS_NO_FP_CONTEXTS 585
-RTEMS_RESTORE_1ST_FP_TASK 730
-RTEMS_SAVE_INIT_RESTORE_INIT 478
-RTEMS_SAVE_IDLE_RESTORE_INIT 825
-RTEMS_SAVE_IDLE_RESTORE_IDLE 478
-#
-#  Task Manager Times
-#
-RTEMS_TASK_CREATE_ONLY 2301
-RTEMS_TASK_IDENT_ONLY 2900
-RTEMS_TASK_START_ONLY 794
-RTEMS_TASK_RESTART_CALLING_TASK 1137
-RTEMS_TASK_RESTART_SUSPENDED_RETURNS_TO_CALLER 906
-RTEMS_TASK_RESTART_BLOCKED_RETURNS_TO_CALLER 1102
-RTEMS_TASK_RESTART_READY_RETURNS_TO_CALLER 928
-RTEMS_TASK_RESTART_SUSPENDED_PREEMPTS_CALLER 1483
-RTEMS_TASK_RESTART_BLOCKED_PREEMPTS_CALLER 1640
-RTEMS_TASK_RESTART_READY_PREEMPTS_CALLER 1601
-RTEMS_TASK_DELETE_CALLING_TASK 2117
-RTEMS_TASK_DELETE_SUSPENDED_TASK 1555
-RTEMS_TASK_DELETE_BLOCKED_TASK 1609
-RTEMS_TASK_DELETE_READY_TASK 1620
-RTEMS_TASK_SUSPEND_CALLING_TASK 960
-RTEMS_TASK_SUSPEND_RETURNS_TO_CALLER 433
-RTEMS_TASK_RESUME_TASK_READIED_RETURNS_TO_CALLER 960
-RTEMS_TASK_RESUME_TASK_READIED_PREEMPTS_CALLER 803
-RTEMS_TASK_SET_PRIORITY_OBTAIN_CURRENT_PRIORITY 368
-RTEMS_TASK_SET_PRIORITY_RETURNS_TO_CALLER 633
-RTEMS_TASK_SET_PRIORITY_PREEMPTS_CALLER 1211
-RTEMS_TASK_MODE_OBTAIN_CURRENT_MODE 184
-RTEMS_TASK_MODE_NO_RESCHEDULE 213
-RTEMS_TASK_MODE_RESCHEDULE_RETURNS_TO_CALLER 247
-RTEMS_TASK_MODE_RESCHEDULE_PREEMPTS_CALLER 919
-RTEMS_TASK_GET_NOTE_ONLY 382
-RTEMS_TASK_SET_NOTE_ONLY 383
-RTEMS_TASK_WAKE_AFTER_YIELD_RETURNS_TO_CALLER 245
-RTEMS_TASK_WAKE_AFTER_YIELD_PREEMPTS_CALLER 851
-RTEMS_TASK_WAKE_WHEN_ONLY 1275
-#
-#  Interrupt Manager
-#
-RTEMS_INTR_ENTRY_RETURNS_TO_NESTED 201
-RTEMS_INTR_ENTRY_RETURNS_TO_INTERRUPTED_TASK 206
-RTEMS_INTR_ENTRY_RETURNS_TO_PREEMPTING_TASK 202
-RTEMS_INTR_EXIT_RETURNS_TO_NESTED 201
-RTEMS_INTR_EXIT_RETURNS_TO_INTERRUPTED_TASK 213
-RTEMS_INTR_EXIT_RETURNS_TO_PREEMPTING_TASK 857
-#
-#  Clock Manager
-#
-RTEMS_CLOCK_SET_ONLY 792
-RTEMS_CLOCK_GET_ONLY 78
-RTEMS_CLOCK_TICK_ONLY 214
-#
-#  Timer Manager
-#
-RTEMS_TIMER_CREATE_ONLY 357
-RTEMS_TIMER_IDENT_ONLY 2828
-RTEMS_TIMER_DELETE_INACTIVE 432
-RTEMS_TIMER_DELETE_ACTIVE 471
-RTEMS_TIMER_FIRE_AFTER_INACTIVE 607
-RTEMS_TIMER_FIRE_AFTER_ACTIVE 646
-RTEMS_TIMER_FIRE_WHEN_INACTIVE 766
-RTEMS_TIMER_FIRE_WHEN_ACTIVE 764
-RTEMS_TIMER_RESET_INACTIVE 552
-RTEMS_TIMER_RESET_ACTIVE 766
-RTEMS_TIMER_CANCEL_INACTIVE 339
-RTEMS_TIMER_CANCEL_ACTIVE 378
-#
-#  Semaphore Manager
-#
-RTEMS_SEMAPHORE_CREATE_ONLY 571
-RTEMS_SEMAPHORE_IDENT_ONLY 3243
-RTEMS_SEMAPHORE_DELETE_ONLY 575
-RTEMS_SEMAPHORE_OBTAIN_AVAILABLE 414
-RTEMS_SEMAPHORE_OBTAIN_NOT_AVAILABLE_NO_WAIT 414
-RTEMS_SEMAPHORE_OBTAIN_NOT_AVAILABLE_CALLER_BLOCKS 1254
-RTEMS_SEMAPHORE_RELEASE_NO_WAITING_TASKS 501
-RTEMS_SEMAPHORE_RELEASE_TASK_READIED_RETURNS_TO_CALLER 636
-RTEMS_SEMAPHORE_RELEASE_TASK_READIED_PREEMPTS_CALLER 982
-#
-#  Message Manager
-#
-RTEMS_MESSAGE_QUEUE_CREATE_ONLY 2270
-RTEMS_MESSAGE_QUEUE_IDENT_ONLY 2828
-RTEMS_MESSAGE_QUEUE_DELETE_ONLY 708
-RTEMS_MESSAGE_QUEUE_SEND_NO_WAITING_TASKS 923
-RTEMS_MESSAGE_QUEUE_SEND_TASK_READIED_RETURNS_TO_CALLER 955
-RTEMS_MESSAGE_QUEUE_SEND_TASK_READIED_PREEMPTS_CALLER 1322
-RTEMS_MESSAGE_QUEUE_URGENT_NO_WAITING_TASKS 919
-RTEMS_MESSAGE_QUEUE_URGENT_TASK_READIED_RETURNS_TO_CALLER 955
-RTEMS_MESSAGE_QUEUE_URGENT_TASK_READIED_PREEMPTS_CALLER 1322
-RTEMS_MESSAGE_QUEUE_BROADCAST_NO_WAITING_TASKS 589
-RTEMS_MESSAGE_QUEUE_BROADCAST_TASK_READIED_RETURNS_TO_CALLER 1079
-RTEMS_MESSAGE_QUEUE_BROADCAST_TASK_READIED_PREEMPTS_CALLER 1435
-RTEMS_MESSAGE_QUEUE_RECEIVE_AVAILABLE 755
-RTEMS_MESSAGE_QUEUE_RECEIVE_NOT_AVAILABLE_NO_WAIT 467
-RTEMS_MESSAGE_QUEUE_RECEIVE_NOT_AVAILABLE_CALLER_BLOCKS 1283
-RTEMS_MESSAGE_QUEUE_FLUSH_NO_MESSAGES_FLUSHED 369
-RTEMS_MESSAGE_QUEUE_FLUSH_MESSAGES_FLUSHED 431
-#
-#  Event Manager
-#
-RTEMS_EVENT_SEND_NO_TASK_READIED 354
-RTEMS_EVENT_SEND_TASK_READIED_RETURNS_TO_CALLER 571
-RTEMS_EVENT_SEND_TASK_READIED_PREEMPTS_CALLER 946
-RTEMS_EVENT_RECEIVE_OBTAIN_CURRENT_EVENTS 43
-RTEMS_EVENT_RECEIVE_AVAILABLE 357
-RTEMS_EVENT_RECEIVE_NOT_AVAILABLE_NO_WAIT 331
-RTEMS_EVENT_RECEIVE_NOT_AVAILABLE_CALLER_BLOCKS 1043
-#
-#  Signal Manager
-#
-RTEMS_SIGNAL_CATCH_ONLY 267
-RTEMS_SIGNAL_SEND_RETURNS_TO_CALLER 408
-RTEMS_SIGNAL_SEND_SIGNAL_TO_SELF 607
-RTEMS_SIGNAL_EXIT_ASR_OVERHEAD_RETURNS_TO_CALLING_TASK 464
-RTEMS_SIGNAL_EXIT_ASR_OVERHEAD_RETURNS_TO_PREEMPTING_TASK 752
-#
-#  Partition Manager
-#
-RTEMS_PARTITION_CREATE_ONLY 762
-RTEMS_PARTITION_IDENT_ONLY 2828
-RTEMS_PARTITION_DELETE_ONLY 426
-RTEMS_PARTITION_GET_BUFFER_AVAILABLE 394
-RTEMS_PARTITION_GET_BUFFER_NOT_AVAILABLE 376
-RTEMS_PARTITION_RETURN_BUFFER_ONLY 420
-#
-#  Region Manager
-#
-RTEMS_REGION_CREATE_ONLY 614
-RTEMS_REGION_IDENT_ONLY 2878
-RTEMS_REGION_DELETE_ONLY 425
-RTEMS_REGION_GET_SEGMENT_AVAILABLE 515 
-RTEMS_REGION_GET_SEGMENT_NOT_AVAILABLE_NO_WAIT 472
-RTEMS_REGION_GET_SEGMENT_NOT_AVAILABLE_CALLER_BLOCKS 1345
-RTEMS_REGION_RETURN_SEGMENT_NO_WAITING_TASKS 544
-RTEMS_REGION_RETURN_SEGMENT_TASK_READIED_RETURNS_TO_CALLER 935
-RTEMS_REGION_RETURN_SEGMENT_TASK_READIED_PREEMPTS_CALLER 1296
-#
-#  Dual-Ported Memory Manager
-#
-RTEMS_PORT_CREATE_ONLY 428
-RTEMS_PORT_IDENT_ONLY 2828
-RTEMS_PORT_DELETE_ONLY 421
-RTEMS_PORT_INTERNAL_TO_EXTERNAL_ONLY 339
-RTEMS_PORT_EXTERNAL_TO_INTERNAL_ONLY 339
-#
-#  IO Manager
-#
-RTEMS_IO_INITIALIZE_ONLY 52
-RTEMS_IO_OPEN_ONLY 42
-RTEMS_IO_CLOSE_ONLY 44
-RTEMS_IO_READ_ONLY 42
-RTEMS_IO_WRITE_ONLY 44
-RTEMS_IO_CONTROL_ONLY 42
-#
-#  Rate Monotonic Manager
-#
-RTEMS_RATE_MONOTONIC_CREATE_ONLY 388
-RTEMS_RATE_MONOTONIC_IDENT_ONLY 2826
-RTEMS_RATE_MONOTONIC_CANCEL_ONLY 427
-RTEMS_RATE_MONOTONIC_DELETE_ACTIVE 519
-RTEMS_RATE_MONOTONIC_DELETE_INACTIVE 465
-RTEMS_RATE_MONOTONIC_PERIOD_INITIATE_PERIOD_RETURNS_TO_CALLER 556
-RTEMS_RATE_MONOTONIC_PERIOD_CONCLUDE_PERIOD_CALLER_BLOCKS 842
-RTEMS_RATE_MONOTONIC_PERIOD_OBTAIN_STATUS 377
-#
-#  Size Information
-#
-#
-#  xxx alloted for numbers
-#
-RTEMS_DATA_SPACE 428
-RTEMS_MINIMUM_CONFIGURATION 30,980
-RTEMS_MAXIMUM_CONFIGURATION 55540
-#  x,xxx alloted for numbers
-RTEMS_CORE_CODE_SIZE 21,516
-RTEMS_INITIALIZATION_CODE_SIZE 1,412
-RTEMS_TASK_CODE_SIZE 4,804
-RTEMS_INTERRUPT_CODE_SIZE 96 
-RTEMS_CLOCK_CODE_SIZE 536
-RTEMS_TIMER_CODE_SIZE 1,380
-RTEMS_SEMAPHORE_CODE_SIZE 1,928
-RTEMS_MESSAGE_CODE_SIZE 532
-RTEMS_EVENT_CODE_SIZE 100
-RTEMS_SIGNAL_CODE_SIZE 100
-RTEMS_PARTITION_CODE_SIZE 1,384
-RTEMS_REGION_CODE_SIZE 1,780
-RTEMS_DPMEM_CODE_SIZE 928
-RTEMS_IO_CODE_SIZE 1,244
-RTEMS_FATAL_ERROR_CODE_SIZE 44
-RTEMS_RATE_MONOTONIC_CODE_SIZE 1,756
-RTEMS_MULTIPROCESSING_CODE_SIZE 11,448
-#  xxx alloted for numbers
-RTEMS_TIMER_CODE_OPTSIZE 340
-RTEMS_SEMAPHORE_CODE_OPTSIZE 308
-RTEMS_MESSAGE_CODE_OPTSIZE 532
-RTEMS_EVENT_CODE_OPTSIZE 100
-RTEMS_SIGNAL_CODE_OPTSIZE 100
-RTEMS_PARTITION_CODE_OPTSIZE 244
-RTEMS_REGION_CODE_OPTSIZE 292
-RTEMS_DPMEM_CODE_OPTSIZE 244
-RTEMS_IO_CODE_OPTSIZE NA
-RTEMS_RATE_MONOTONIC_CODE_OPTSIZE 336
-RTEMS_MULTIPROCESSING_CODE_OPTSIZE 612
-#  xxx alloted for numbers
-RTEMS_BYTES_PER_TASK 456
-RTEMS_BYTES_PER_TIMER 68
-RTEMS_BYTES_PER_SEMAPHORE 120
-RTEMS_BYTES_PER_MESSAGE_QUEUE 144
-RTEMS_BYTES_PER_REGION 140
-RTEMS_BYTES_PER_PARTITION 56
-RTEMS_BYTES_PER_PORT 36
-RTEMS_BYTES_PER_PERIOD 36
-RTEMS_BYTES_PER_EXTENSION 64
-RTEMS_BYTES_PER_FP_TASK 264
-RTEMS_BYTES_PER_NODE 48
-RTEMS_BYTES_PER_GLOBAL_OBJECT 20
-RTEMS_BYTES_PER_PROXY 124
-#  x,xxx alloted for numbers
-RTEMS_BYTES_OF_FIXED_SYSTEM_REQUIREMENTS 10008
-
diff --git a/doc/supplements/powerpc/Makefile b/doc/supplements/powerpc/Makefile
deleted file mode 100644
index 9ad8ce7626..0000000000
--- a/doc/supplements/powerpc/Makefile
+++ /dev/null
@@ -1,178 +0,0 @@
-#
-#  COPYRIGHT (c) 1988-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  All rights reserved.
-#
-#  $Id$
-#
-
-PROJECT=powerpc
-DISTRIBUTION_LEVEL=support
-
-include ../../Make.config
-
-REPLACE=../../tools/word-replace
-
-all: html info ps
-
-dirs:
-	$(make-dirs)
-
-COMMON_FILES=../../common/cpright.texi ../../common/setup.texi
-
-GENERATED_FILES=\
-  cpumodel.texi callconv.texi memmodel.texi intr.texi fatalerr.texi \
-  bsp.texi cputable.texi timing.texi wksheets.texi timePSIM.texi timeDMV177.texi
-
-FILES= $(PROJECT).texi \
-  preface.texi \
-  $(GENERATED_FILES)
-
-INFOFILES=$(wildcard $(PROJECT) $(PROJECT)-*)
-
-info: dirs c_$(PROJECT)
-	cp c_$(PROJECT) c_$(PROJECT)-* $(INFO_INSTALL)
-
-c_$(PROJECT): $(FILES)
-	$(MAKEINFO) $(PROJECT).texi
-
-dvi: $(PROJECT).dvi
-ps: dirs $(PROJECT).ps
-	
-$(PROJECT).ps: $(PROJECT).dvi
-	dvips -o $(PROJECT).ps $(PROJECT).dvi
-	cp $(PROJECT).ps $(PS_INSTALL)
-
-$(PROJECT).dvi: $(FILES)
-	$(TEXI2DVI) $(PROJECT).texi
-
-html: dirs $(FILES)
-	-mkdir -p $(WWW_INSTALL)/c_$(PROJECT)
-	$(TEXI2WWW) $(TEXI2WWW_ARGS) -dir $(WWW_INSTALL)/c_$(PROJECT) \
- 	    $(PROJECT).texi
-
-clean:
-	rm -f *.o $(PROG) *.txt core 
-	rm -f *.dvi *.ps *.log *.aux *.cp *.fn *.ky *.pg *.toc *.tp *.vr $(BASE)
-	rm -f $(PROJECT) $(PROJECT)-*
-	rm -f c_$(PROJECT) c_$(PROJECT)-*
-	rm -f intr.t $(GENERATED_FILES)
-	rm -f wksheets.t wksheets_NOTIMES.t timing.t
-	rm -f timePSIM_.t timePSIM_.texi
-	rm -f timeDMV177_.t timeDMV177_.texi
-	rm -f *.fixed _*
-
-#
-#  Chapters which get automatic processing
-#
-
-cpumodel.texi: cpumodel.t Makefile
-	$(BMENU) -p "Preface" \
-	    -u "Top" \
-	    -n "Calling Conventions" ${*}.t
-
-callconv.texi: callconv.t Makefile
-	$(BMENU) -p "CPU Model Dependent Features Low Power Model" \
-	    -u "Top" \
-	    -n "Memory Model" ${*}.t
-
-memmodel.texi: memmodel.t Makefile
-	$(BMENU) -p "Calling Conventions User-Provided Routines" \
-	    -u "Top" \
-	    -n "Interrupt Processing" ${*}.t
-
-# Interrupt Chapter:
-#  1.  Replace Times and Sizes
-#  2.  Build Node Structure
-intr.t: intr_NOTIMES.t PSIM_TIMES
-	${REPLACE} -p PSIM_TIMES intr_NOTIMES.t
-	mv intr_NOTIMES.t.fixed intr.t
-
-intr.texi: intr.t Makefile
-	$(BMENU) -p "Memory Model Flat Memory Model" \
-	    -u "Top" \
-	    -n "Default Fatal Error Processing" ${*}.t
-
-fatalerr.texi: fatalerr.t Makefile
-	$(BMENU) -p "Interrupt Processing Interrupt Stack" \
-	    -u "Top" \
-	    -n "Board Support Packages" ${*}.t
-
-bsp.texi: bsp.t Makefile
-	$(BMENU) -p "Default Fatal Error Processing Default Fatal Error Handler Operations" \
-	    -u "Top" \
-	    -n "Processor Dependent Information Table" ${*}.t
-
-cputable.texi: cputable.t Makefile
-	$(BMENU) -p "Board Support Packages Processor Initialization" \
-	    -u "Top" \
-	    -n "Memory Requirements" ${*}.t
-
-# Worksheets Chapter:
-#  1.  Obtain the Shared File
-#  2.  Replace Times and Sizes
-#  3.  Build Node Structure
-
-wksheets_NOTIMES.t: ../../common/wksheets.t
-	cp ../../common/wksheets.t wksheets_NOTIMES.t
-
-wksheets.t: wksheets_NOTIMES.t PSIM_TIMES
-	${REPLACE} -p PSIM_TIMES wksheets_NOTIMES.t
-	mv wksheets_NOTIMES.t.fixed wksheets.t
-
-wksheets.texi: wksheets.t Makefile
-	$(BMENU) -p "Processor Dependent Information Table CPU Dependent Information Table" \
-	    -u "Top" \
-	    -n "Timing Specification" ${*}.t
-
-# Timing Specification Chapter:
-#  1.  Copy the Shared File
-#  3.  Build Node Structure
-
-timing.t: ../../common/timing.t
-	cp ../../common/timing.t timing.t
-
-timing.texi: timing.t Makefile
-	$(BMENU) -p "Memory Requirements RTEMS RAM Workspace Worksheet" \
-            -u "Top" \
-            -n "PSIM Timing Data" ${*}.t
-
-# Timing Data for PSIM BSP Chapter:
-#  1.  Copy the Shared File
-#  2.  Replace Times and Sizes
-#  3.  Build Node Structure
-
-timePSIM_.t: ../../common/timetbl.t timePSIM.t
-	cat timePSIM.t ../../common/timetbl.t                >timePSIM_.t
-	@echo                                               >>timePSIM_.t
-	@echo "@tex"                                        >>timePSIM_.t
-	@echo "\\global\\advance \\smallskipamount by 4pt"  >>timePSIM_.t
-	@echo "@end tex"                                    >>timePSIM_.t
-	${REPLACE} -p PSIM_TIMES timePSIM_.t
-	mv timePSIM_.t.fixed timePSIM_.t
-
-timePSIM.texi: timePSIM_.t Makefile
-	$(BMENU) -p "Timing Specification Terminology" \
-	    -u "Top" \
-	    -n "DMV177 Timing Data" timePSIM_.t
-	mv timePSIM_.texi timePSIM.texi
-
-# Timing Data for DMV177 BSP Chapter:
-#  1.  Copy the Shared File
-#  2.  Replace Times and Sizes
-#  3.  Build Node Structure
-
-timeDMV177_.t: ../../common/timetbl.t timeDMV177.t
-	cat timeDMV177.t ../../common/timetbl.t              >timeDMV177_.t
-	@echo                                               >>timeDMV177_.t
-	@echo "@tex"                                        >>timeDMV177_.t
-	@echo "\\global\\advance \\smallskipamount by 4pt"  >>timeDMV177_.t
-	@echo "@end tex"                                    >>timeDMV177_.t
-	${REPLACE} -p DMV177_TIMES timeDMV177_.t
-	mv timeDMV177_.t.fixed timeDMV177_.t
-
-timeDMV177.texi: timeDMV177_.t Makefile
-	$(BMENU) -p "PSIM Timing Data Rate Monotonic Manager" \
-	    -u "Top" \
-	    -n "Command and Variable Index" timeDMV177_.t
-	mv timeDMV177_.texi timeDMV177.texi
diff --git a/doc/supplements/powerpc/PSIM_TIMES b/doc/supplements/powerpc/PSIM_TIMES
deleted file mode 100644
index b357a1fc3c..0000000000
--- a/doc/supplements/powerpc/PSIM_TIMES
+++ /dev/null
@@ -1,248 +0,0 @@
-#
-#  PowerPC/603e/PSIM Timing and Size Information
-#
-#  $Id$
-#
-
-#
-#  CPU Model Information
-#
-RTEMS_BSP       PSIM
-RTEMS_CPU_MODEL PPC603e
-#
-#  Interrupt Latency
-#
-#  NOTE:  In general, the text says it is hand-calculated to be
-#         RTEMS_MAXIMUM_DISABLE_PERIOD at RTEMS_MAXIMUM_DISABLE_PERIOD_MHZ
-#         Mhz and this was last calculated for Release 
-#         RTEMS_VERSION_FOR_MAXIMUM_DISABLE_PERIOD.
-#
-RTEMS_MAXIMUM_DISABLE_PERIOD TBD
-RTEMS_MAXIMUM_DISABLE_PERIOD_MHZ na
-RTEMS_RELEASE_FOR_MAXIMUM_DISABLE_PERIOD 4.0.0-lmco
-#
-#  Context Switch Times
-#
-RTEMS_NO_FP_CONTEXTS 214
-RTEMS_RESTORE_1ST_FP_TASK 255
-RTEMS_SAVE_INIT_RESTORE_INIT 140
-RTEMS_SAVE_IDLE_RESTORE_INIT 140
-RTEMS_SAVE_IDLE_RESTORE_IDLE 290
-#
-#  Task Manager Times
-#
-RTEMS_TASK_CREATE_ONLY 1075
-RTEMS_TASK_IDENT_ONLY 1637
-RTEMS_TASK_START_ONLY 345
-RTEMS_TASK_RESTART_CALLING_TASK 483
-RTEMS_TASK_RESTART_SUSPENDED_RETURNS_TO_CALLER 396
-RTEMS_TASK_RESTART_BLOCKED_RETURNS_TO_CALLER 491
-RTEMS_TASK_RESTART_READY_RETURNS_TO_CALLER 404
-RTEMS_TASK_RESTART_SUSPENDED_PREEMPTS_CALLER 644
-RTEMS_TASK_RESTART_BLOCKED_PREEMPTS_CALLER 709
-RTEMS_TASK_RESTART_READY_PREEMPTS_CALLER 686
-RTEMS_TASK_DELETE_CALLING_TASK 941
-RTEMS_TASK_DELETE_SUSPENDED_TASK 703
-RTEMS_TASK_DELETE_BLOCKED_TASK 723
-RTEMS_TASK_DELETE_READY_TASK 729
-RTEMS_TASK_SUSPEND_CALLING_TASK 403
-RTEMS_TASK_SUSPEND_RETURNS_TO_CALLER 181
-RTEMS_TASK_RESUME_TASK_READIED_RETURNS_TO_CALLER 191
-RTEMS_TASK_RESUME_TASK_READIED_PREEMPTS_CALLER 803
-RTEMS_TASK_SET_PRIORITY_OBTAIN_CURRENT_PRIORITY 147
-RTEMS_TASK_SET_PRIORITY_RETURNS_TO_CALLER 264
-RTEMS_TASK_SET_PRIORITY_PREEMPTS_CALLER 517
-RTEMS_TASK_MODE_OBTAIN_CURRENT_MODE 88
-RTEMS_TASK_MODE_NO_RESCHEDULE 110
-RTEMS_TASK_MODE_RESCHEDULE_RETURNS_TO_CALLER 112
-RTEMS_TASK_MODE_RESCHEDULE_PREEMPTS_CALLER 386
-RTEMS_TASK_GET_NOTE_ONLY 156
-RTEMS_TASK_SET_NOTE_ONLY 155
-RTEMS_TASK_WAKE_AFTER_YIELD_RETURNS_TO_CALLER 92
-RTEMS_TASK_WAKE_AFTER_YIELD_PREEMPTS_CALLER 348
-RTEMS_TASK_WAKE_WHEN_ONLY 546
-#
-#  Interrupt Manager
-#
-RTEMS_INTR_ENTRY_RETURNS_TO_NESTED 60
-RTEMS_INTR_ENTRY_RETURNS_TO_INTERRUPTED_TASK 62
-RTEMS_INTR_ENTRY_RETURNS_TO_PREEMPTING_TASK 61
-RTEMS_INTR_EXIT_RETURNS_TO_NESTED 55
-RTEMS_INTR_EXIT_RETURNS_TO_INTERRUPTED_TASK 67
-RTEMS_INTR_EXIT_RETURNS_TO_PREEMPTING_TASK 344
-#
-#  Clock Manager
-#
-RTEMS_CLOCK_SET_ONLY 340
-RTEMS_CLOCK_GET_ONLY 29
-RTEMS_CLOCK_TICK_ONLY 81
-#
-#  Timer Manager
-#
-RTEMS_TIMER_CREATE_ONLY 144
-RTEMS_TIMER_IDENT_ONLY 1595
-RTEMS_TIMER_DELETE_INACTIVE 197
-RTEMS_TIMER_DELETE_ACTIVE 181
-RTEMS_TIMER_FIRE_AFTER_INACTIVE 252
-RTEMS_TIMER_FIRE_AFTER_ACTIVE 269
-RTEMS_TIMER_FIRE_WHEN_INACTIVE 333
-RTEMS_TIMER_FIRE_WHEN_ACTIVE 334
-RTEMS_TIMER_RESET_INACTIVE 233
-RTEMS_TIMER_RESET_ACTIVE 250
-RTEMS_TIMER_CANCEL_INACTIVE 156
-RTEMS_TIMER_CANCEL_ACTIVE 140
-#
-#  Semaphore Manager
-#
-RTEMS_SEMAPHORE_CREATE_ONLY 223
-RTEMS_SEMAPHORE_IDENT_ONLY 1836
-RTEMS_SEMAPHORE_DELETE_ONLY 1836
-RTEMS_SEMAPHORE_OBTAIN_AVAILABLE 175
-RTEMS_SEMAPHORE_OBTAIN_NOT_AVAILABLE_NO_WAIT 175
-RTEMS_SEMAPHORE_OBTAIN_NOT_AVAILABLE_CALLER_BLOCKS 530
-RTEMS_SEMAPHORE_RELEASE_NO_WAITING_TASKS 206
-RTEMS_SEMAPHORE_RELEASE_TASK_READIED_RETURNS_TO_CALLER 272
-RTEMS_SEMAPHORE_RELEASE_TASK_READIED_PREEMPTS_CALLER 415
-#
-#  Message Manager
-#
-RTEMS_MESSAGE_QUEUE_CREATE_ONLY 1022
-RTEMS_MESSAGE_QUEUE_IDENT_ONLY 1596
-RTEMS_MESSAGE_QUEUE_DELETE_ONLY 308
-RTEMS_MESSAGE_QUEUE_SEND_NO_WAITING_TASKS 421
-RTEMS_MESSAGE_QUEUE_SEND_TASK_READIED_RETURNS_TO_CALLER 434
-RTEMS_MESSAGE_QUEUE_SEND_TASK_READIED_PREEMPTS_CALLER 581
-RTEMS_MESSAGE_QUEUE_URGENT_NO_WAITING_TASKS 422
-RTEMS_MESSAGE_QUEUE_URGENT_TASK_READIED_RETURNS_TO_CALLER 435
-RTEMS_MESSAGE_QUEUE_URGENT_TASK_READIED_PREEMPTS_CALLER 582
-RTEMS_MESSAGE_QUEUE_BROADCAST_NO_WAITING_TASKS 244
-RTEMS_MESSAGE_QUEUE_BROADCAST_TASK_READIED_RETURNS_TO_CALLER 482
-RTEMS_MESSAGE_QUEUE_BROADCAST_TASK_READIED_PREEMPTS_CALLER 630
-RTEMS_MESSAGE_QUEUE_RECEIVE_AVAILABLE 345
-RTEMS_MESSAGE_QUEUE_RECEIVE_NOT_AVAILABLE_NO_WAIT 197
-RTEMS_MESSAGE_QUEUE_RECEIVE_NOT_AVAILABLE_CALLER_BLOCKS 542
-RTEMS_MESSAGE_QUEUE_FLUSH_NO_MESSAGES_FLUSHED 142
-RTEMS_MESSAGE_QUEUE_FLUSH_MESSAGES_FLUSHED 170
-#
-#  Event Manager
-#
-RTEMS_EVENT_SEND_NO_TASK_READIED 145
-RTEMS_EVENT_SEND_TASK_READIED_RETURNS_TO_CALLER 250
-RTEMS_EVENT_SEND_TASK_READIED_PREEMPTS_CALLER 407
-RTEMS_EVENT_RECEIVE_OBTAIN_CURRENT_EVENTS 17
-RTEMS_EVENT_RECEIVE_AVAILABLE 133
-RTEMS_EVENT_RECEIVE_NOT_AVAILABLE_NO_WAIT 130
-RTEMS_EVENT_RECEIVE_NOT_AVAILABLE_CALLER_BLOCKS 442
-#
-#  Signal Manager
-#
-RTEMS_SIGNAL_CATCH_ONLY 95
-RTEMS_SIGNAL_SEND_RETURNS_TO_CALLER 165
-RTEMS_SIGNAL_SEND_SIGNAL_TO_SELF 275
-RTEMS_SIGNAL_EXIT_ASR_OVERHEAD_RETURNS_TO_CALLING_TASK 216
-RTEMS_SIGNAL_EXIT_ASR_OVERHEAD_RETURNS_TO_PREEMPTING_TASK 329
-#
-#  Partition Manager
-#
-RTEMS_PARTITION_CREATE_ONLY 320
-RTEMS_PARTITION_IDENT_ONLY 1596
-RTEMS_PARTITION_DELETE_ONLY 168
-RTEMS_PARTITION_GET_BUFFER_AVAILABLE 157
-RTEMS_PARTITION_GET_BUFFER_NOT_AVAILABLE 149
-RTEMS_PARTITION_RETURN_BUFFER_ONLY 172
-#
-#  Region Manager
-#
-RTEMS_REGION_CREATE_ONLY 239
-RTEMS_REGION_IDENT_ONLY 1625
-RTEMS_REGION_DELETE_ONLY 167
-RTEMS_REGION_GET_SEGMENT_AVAILABLE 206
-RTEMS_REGION_GET_SEGMENT_NOT_AVAILABLE_NO_WAIT 190
-RTEMS_REGION_GET_SEGMENT_NOT_AVAILABLE_CALLER_BLOCKS 556
-RTEMS_REGION_RETURN_SEGMENT_NO_WAITING_TASKS 230
-RTEMS_REGION_RETURN_SEGMENT_TASK_READIED_RETURNS_TO_CALLER 412
-RTEMS_REGION_RETURN_SEGMENT_TASK_READIED_PREEMPTS_CALLER 562
-#
-#  Dual-Ported Memory Manager
-#
-RTEMS_PORT_CREATE_ONLY 167
-RTEMS_PORT_IDENT_ONLY 1594
-RTEMS_PORT_DELETE_ONLY 165
-RTEMS_PORT_INTERNAL_TO_EXTERNAL_ONLY 133
-RTEMS_PORT_EXTERNAL_TO_INTERNAL_ONLY 134
-#
-#  IO Manager
-#
-RTEMS_IO_INITIALIZE_ONLY 23
-RTEMS_IO_OPEN_ONLY 18
-RTEMS_IO_CLOSE_ONLY 18
-RTEMS_IO_READ_ONLY 18
-RTEMS_IO_WRITE_ONLY 18
-RTEMS_IO_CONTROL_ONLY 18
-#
-#  Rate Monotonic Manager
-#
-RTEMS_RATE_MONOTONIC_CREATE_ONLY 149
-RTEMS_RATE_MONOTONIC_IDENT_ONLY 1595
-RTEMS_RATE_MONOTONIC_CANCEL_ONLY 169
-RTEMS_RATE_MONOTONIC_DELETE_ACTIVE 212
-RTEMS_RATE_MONOTONIC_DELETE_INACTIVE 186
-RTEMS_RATE_MONOTONIC_PERIOD_INITIATE_PERIOD_RETURNS_TO_CALLER 226
-RTEMS_RATE_MONOTONIC_PERIOD_CONCLUDE_PERIOD_CALLER_BLOCKS 362
-RTEMS_RATE_MONOTONIC_PERIOD_OBTAIN_STATUS 142
-#
-#  Size Information
-#
-#
-#  xxx alloted for numbers
-#
-RTEMS_DATA_SPACE 428
-RTEMS_MINIMUM_CONFIGURATION 30,912
-RTEMS_MAXIMUM_CONFIGURATION 55,572
-#  x,xxx alloted for numbers
-RTEMS_CORE_CODE_SIZE 21,452
-RTEMS_INITIALIZATION_CODE_SIZE 1,408
-RTEMS_TASK_CODE_SIZE 4,804
-RTEMS_INTERRUPT_CODE_SIZE 96 
-RTEMS_CLOCK_CODE_SIZE 536
-RTEMS_TIMER_CODE_SIZE 1,380
-RTEMS_SEMAPHORE_CODE_SIZE 1,928
-RTEMS_MESSAGE_CODE_SIZE 2,400
-RTEMS_EVENT_CODE_SIZE 1,460
-RTEMS_SIGNAL_CODE_SIZE 576
-RTEMS_PARTITION_CODE_SIZE 1,384
-RTEMS_REGION_CODE_SIZE 1,780
-RTEMS_DPMEM_CODE_SIZE 928
-RTEMS_IO_CODE_SIZE 1,244
-RTEMS_FATAL_ERROR_CODE_SIZE 44
-RTEMS_RATE_MONOTONIC_CODE_SIZE 1,756
-RTEMS_MULTIPROCESSING_CODE_SIZE 11,448
-#  xxx alloted for numbers
-RTEMS_TIMER_CODE_OPTSIZE 340
-RTEMS_SEMAPHORE_CODE_OPTSIZE 308
-RTEMS_MESSAGE_CODE_OPTSIZE 532
-RTEMS_EVENT_CODE_OPTSIZE 100
-RTEMS_SIGNAL_CODE_OPTSIZE 100
-RTEMS_PARTITION_CODE_OPTSIZE 244
-RTEMS_REGION_CODE_OPTSIZE 292
-RTEMS_DPMEM_CODE_OPTSIZE 244
-RTEMS_IO_CODE_OPTSIZE NA
-RTEMS_RATE_MONOTONIC_CODE_OPTSIZE 336
-RTEMS_MULTIPROCESSING_CODE_OPTSIZE 612
-#  xxx alloted for numbers
-RTEMS_BYTES_PER_TASK 456
-RTEMS_BYTES_PER_TIMER 68
-RTEMS_BYTES_PER_SEMAPHORE 120
-RTEMS_BYTES_PER_MESSAGE_QUEUE 144
-RTEMS_BYTES_PER_REGION 140
-RTEMS_BYTES_PER_PARTITION 56
-RTEMS_BYTES_PER_PORT 36
-RTEMS_BYTES_PER_PERIOD 36
-RTEMS_BYTES_PER_EXTENSION 64
-RTEMS_BYTES_PER_FP_TASK 264
-RTEMS_BYTES_PER_NODE 48
-RTEMS_BYTES_PER_GLOBAL_OBJECT 20
-RTEMS_BYTES_PER_PROXY 124
-#  x,xxx alloted for numbers
-RTEMS_BYTES_OF_FIXED_SYSTEM_REQUIREMENTS 10,008
-
diff --git a/doc/supplements/powerpc/bsp.t b/doc/supplements/powerpc/bsp.t
deleted file mode 100644
index 2c9539be88..0000000000
--- a/doc/supplements/powerpc/bsp.t
+++ /dev/null
@@ -1,76 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Board Support Packages
-
-@section Introduction
-
-An RTEMS Board Support Package (BSP) must be designed
-to support a particular processor and target board combination.
-This chapter presents a discussion of PowerPC specific BSP issues.
-For more information on developing a BSP, refer to the chapter
-titled Board Support Packages in the RTEMS
-Applications User's Guide.
-
-@section System Reset
-
-An RTEMS based application is initiated or
-re-initiated when the PowerPC processor is reset.  The PowerPC 
-architecture defines a Reset Exception, but leaves the
-details of the CPU state as implementation specific.  Please
-refer to the User's Manual for the CPU model in question.
-
-In general, at power-up the PowerPC begin execution at address
-0xFFF00100 in supervisor mode with all exceptions disabled.  For
-soft resets, the CPU will vector to either 0xFFF00100 or 0x00000100
-depending upon the setting of the Exception Prefix bit in the MSR.
-If during a soft reset, a Machine Check Exception occurs, then the
-CPU may execute a hard reset.
-
-@section Processor Initialization
-
-It is the responsibility of the application's
-initialization code to initialize the CPU and board
-to a quiescent state before invoking the @code{rtems_initialize_executive}
-directive.  It is recommended that the BSP utilize the @code{predriver_hook}
-to install default handlers for all exceptions.  These default handlers
-may be overwritten as various device drivers and subsystems install
-their own exception handlers.  Upon completion of RTEMS executive
-initialization, all interrupts are enabled.
-
-If this PowerPC implementation supports on-chip caching
-and this is to be utilized, then it should be enabled during the
-reset application initialization code.  On-chip caching has been
-observed to prevent some emulators from working properly, so it
-may be necessary to run with caching disabled to use these emulators.
-
-In addition to the requirements described in the
-@b{Board Support Packages} chapter of the @b{@value{LANGUAGE}
-Applications User's Manual} for the reset code
-which is executed before the call to @code{rtems_initialize_executive},
-the PowrePC version has the following specific requirements:
-
-@itemize @bullet
-@item Must leave the PR bit of the Machine State Register (MSR) set 
-to 0 so the PowerPC remains in the supervisor state.
-
-@item Must set stack pointer (sp or r1) such that a minimum stack
-size of MINIMUM_STACK_SIZE bytes is provided for the
-@code{rtems_initialize_executive} directive.
-
-@item Must disable all external interrupts (i.e. clear the EI (EE)
-bit of the machine state register).
-
-@item Must enable traps so window overflow and underflow
-conditions can be properly handled.
-
-@item Must initialize the PowerPC's initial Exception Table with default
-handlers.
-
-@end itemize
-
diff --git a/doc/supplements/powerpc/callconv.t b/doc/supplements/powerpc/callconv.t
deleted file mode 100644
index 7fc4bfd60f..0000000000
--- a/doc/supplements/powerpc/callconv.t
+++ /dev/null
@@ -1,229 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Calling Conventions
-
-@section Introduction
-
-Each high-level language compiler generates
-subroutine entry and exit code based upon a set of rules known
-as the compiler's calling convention.   These rules address the
-following issues:
-
-@itemize @bullet
-@item register preservation and usage
-
-@item parameter passing
-
-@item call and return mechanism
-@end itemize
-
-A compiler's calling convention is of importance when
-interfacing to subroutines written in another language either
-assembly or high-level.  Even when the high-level language and
-target processor are the same, different compilers may use
-different calling conventions.  As a result, calling conventions
-are both processor and compiler dependent.
-
-RTEMS supports the Embedded Application Binary Interface (EABI)
-calling convention.  Documentation for EABI is available by sending
-a message with a subject line of "EABI" to eabi@@goth.sis.mot.com.
-
-@section Programming Model
-
-This section discusses the programming model for the
-PowerPC architecture.
-
-@subsection Non-Floating Point Registers
-
-The PowerPC architecture defines thirty-two non-floating point registers
-directly visible to the programmer.  In thirty-two bit implementations, each
-register is thirty-two bits wide.  In sixty-four bit implementations, each
-register is sixty-four bits wide.
-
-These registers are referred to as @code{gpr0} to @code{gpr31}.
-
-Some of the registers serve defined roles in the EABI programming model.  
-The following table describes the role of each of these registers:
-
-@ifset use-ascii
-@example
-@group
-     +---------------+----------------+------------------------------+
-     | Register Name | Alternate Name |         Description          |
-     +---------------+----------------+------------------------------+
-     |      r1       |      sp        |         stack pointer        |
-     +---------------+----------------+------------------------------+
-     |               |                |  global pointer to the Small |
-     |      r2       |      na        |     Constant Area (SDA2)     |
-     +---------------+----------------+------------------------------+
-     |    r3 - r12   |      na        | parameter and result passing |
-     +---------------+----------------+------------------------------+
-     |               |                |  global pointer to the Small |
-     |      r13      |      na        |         Data Area (SDA)      |
-     +---------------+----------------+------------------------------+
-@end group
-@end example
-@end ifset
-
-@ifset use-tex
-@sp 1
-@tex
-\centerline{\vbox{\offinterlineskip\halign{
-\vrule\strut#&
-\hbox to 1.75in{\enskip\hfil#\hfil}&
-\vrule#&
-\hbox to 1.75in{\enskip\hfil#\hfil}&
-\vrule#&
-\hbox to 2.50in{\enskip\hfil#\hfil}&
-\vrule#\cr
-\noalign{\hrule}
-&\bf Register Name &&\bf Alternate Names&&\bf Description&\cr\noalign{\hrule}
-&r1&&sp&&stack pointer&\cr\noalign{\hrule}
-&r2&&NA&&global pointer to the Small&\cr
-&&&&&Constant Area (SDA2)&\cr\noalign{\hrule}
-&r3 - r12&&NA&&parameter and result passing&\cr\noalign{\hrule}
-&r13&&NA&&global pointer to the Small&\cr
-&&&&&Data Area (SDA2)&\cr\noalign{\hrule}
-}}\hfil}
-@end tex
-@end ifset
- 
-@ifset use-html
-@html
-<CENTER>
-  <TABLE COLS=3 WIDTH="80%" BORDER=2>
-<TR><TD ALIGN=center><STRONG>Register Name</STRONG></TD>
-    <TD ALIGN=center><STRONG>Alternate Name</STRONG></TD>
-    <TD ALIGN=center><STRONG>Description</STRONG></TD></TR>
-<TR><TD ALIGN=center>r1</TD>
-    <TD ALIGN=center>sp</TD>
-    <TD ALIGN=center>stack pointer</TD></TR>
-<TR><TD ALIGN=center>r2</TD>
-    <TD ALIGN=center>na</TD>
-    <TD ALIGN=center>global pointer to the Small Constant Area (SDA2)</TD></TR>
-<TR><TD ALIGN=center>r3 - r12</TD>
-    <TD ALIGN=center>NA</TD>
-    <TD ALIGN=center>parameter and result passing</TD></TR>
-<TR><TD ALIGN=center>r13</TD>
-    <TD ALIGN=center>NA</TD>
-    <TD ALIGN=center>global pointer to the Small Data Area (SDA)</TD></TR>
-  </TABLE>
-</CENTER>
-@end html
-@end ifset
-
-
-@subsection Floating Point Registers
-
-The PowerPC architecture includes thirty-two, sixty-four bit
-floating point registers.  All PowerPC floating point instructions 
-interpret these registers as 32 double precision floating point registers,
-regardless of whether the processor has 64-bit or 32-bit implementation.
-
-The floating point status and control register (fpscr) records exceptions
-and the type of result generated by floating-point operations.
-Additionally, it controls the rounding mode of operations and allows the
-reporting of floating exceptions to be enabled or disabled.
-
-@subsection Special Registers
-
-The PowerPC architecture includes a number of special registers
-which are critical to the programming model:
-
-@table @b
-
-@item Machine State Register
-
-The MSR contains the processor mode, power management mode, endian mode,
-exception information, privilege level, floating point available and
-floating point excepiton mode, address translation information and
-the exception prefix.
-
-@item Link Register
-
-The LR contains the return address after a function call.  This register
-must be saved before a subsequent subroutine call can be made.  The
-use of this register is discussed further in the @b{Call and Return
-Mechanism} section below.
-
-@item Count Register
-
-The CTR contains the iteration variable for some loops.  It may also be used
-for indirect function calls and jumps.
-
-@end table
-
-@section Call and Return Mechanism
-
-The PowerPC architecture supports a simple yet effective call
-and return mechanism.  A subroutine is invoked
-via the "branch and link" (@code{bl}) and
-"brank and link absolute" (@code{bla})
-instructions.  This instructions place the return address
-in the Link Register (LR).  The callee returns to the caller by 
-executing a "branch unconditional to the link register" (@code{blr})
-instruction.  Thus the callee returns to the caller via a jump
-to the return address which is stored in the LR.
-
-The previous contents of the LR are not automatically saved 
-by either the @code{bl} or @code{bla}.  It is the responsibility
-of the callee to save the contents of the LR before invoking
-another subroutine.  If the callee invokes another subroutine,
-it must restore the LR before executing the @code{blr} instruction
-to return to the caller.
-
-It is important to note that the PowerPC subroutine
-call and return mechanism does not automatically save and
-restore any registers.
-
-The LR may be accessed as special purpose register 8 (@code{SPR8}) using the
-"move from special register" (@code{mfspr}) and
-"move to special register" (@code{mtspr}) instructions.
-
-@section Calling Mechanism
-
-All RTEMS directives are invoked using the regular
-PowerPC EABI calling convention via the @code{bl} or
-@code{bla} instructions.
-
-@section Register Usage
-
-As discussed above, the call instruction does not
-automatically save any registers.  It is the responsibility
-of the callee to save and restore any registers which must be preserved
-across subroutine calls.  The callee is responsible for saving 
-callee-preserved registers to the program stack and restoring them
-before returning to the caller.
-
-@section Parameter Passing
-
-RTEMS assumes that arguments are placed in the
-general purpose registers with the first argument in 
-register 3 (@code{r3}), the second argument in general purpose
-register 4 (@code{r4}), and so forth until the seventh
-argument is in general purpose register 10 (@code{r10}).  
-If there are more than seven arguments, then subsequent arguments
-are placed on the program stack.  The following pseudo-code
-illustrates the typical sequence used to call a RTEMS directive
-with three (3) arguments:
-
-@example
-load third argument into r5
-load second argument into r4
-load first argument into r3
-invoke directive
-@end example
-
-@section User-Provided Routines
-
-All user-provided routines invoked by RTEMS, such as
-user extensions, device drivers, and MPCI routines, must also
-adhere to these same calling conventions.
-
-
diff --git a/doc/supplements/powerpc/cpumodel.t b/doc/supplements/powerpc/cpumodel.t
deleted file mode 100644
index 4b4acb4a78..0000000000
--- a/doc/supplements/powerpc/cpumodel.t
+++ /dev/null
@@ -1,156 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter CPU Model Dependent Features
-
-@section Introduction
-
-Microprocessors are generally classified into
-families with a variety of CPU models or implementations within
-that family.  Within a processor family, there is a high level
-of binary compatibility.  This family may be based on either an
-architectural specification or on maintaining compatibility with
-a popular processor.  Recent microprocessor families such as the
-PowerPC, SPARC, and PA-RISC are based on an architectural specification
-which is independent or any particular CPU model or
-implementation.  Older families such as the M68xxx and the iX86
-evolved as the manufacturer strived to produce higher
-performance processor models which maintained binary
-compatibility with older models.
-
-RTEMS takes advantage of the similarity of the
-various models within a CPU family.  Although the models do vary
-in significant ways, the high level of compatibility makes it
-possible to share the bulk of the CPU dependent executive code
-across the entire family.
-
-@section CPU Model Feature Flags
-
-Each processor family supported by RTEMS has a
-list of features which vary between CPU models
-within a family.  For example, the most common model dependent
-feature regardless of CPU family is the presence or absence of a
-floating point unit or coprocessor.  When defining the list of
-features present on a particular CPU model, one simply notes
-that floating point hardware is or is not present and defines a
-single constant appropriately.  Conditional compilation is
-utilized to include the appropriate source code for this CPU
-model's feature set.  It is important to note that this means
-that RTEMS is thus compiled using the appropriate feature set
-and compilation flags optimal for this CPU model used.  The
-alternative would be to generate a binary which would execute on
-all family members using only the features which were always
-present.
-
-This section presents the set of features which vary
-across PowerPC implementations and are of importance to RTEMS.
-The set of CPU model feature macros are defined in the file
-c/src/exec/score/cpu/ppc/ppc.h based upon the particular CPU
-model defined on the compilation command line.
-
-@subsection CPU Model Name
-
-The macro CPU_MODEL_NAME is a string which designates
-the name of this CPU model.  For example, for the PowerPC 603e
-model, this macro is set to the string "PowerPC 603e".
-
-@subsection Floating Point Unit
-
-The macro PPC_HAS_FPU is set to 1 to indicate that this CPU model
-has a hardware floating point unit and 0 otherwise.
-
-@subsection Alignment
-
-The macro PPC_ALIGNMENT is set to the PowerPC model's worst case alignment
-requirement for data types on a byte boundary.  This value is used
-to derive the alignment restrictions for memory allocated from 
-regions and partitions.
-
-@subsection Cache Alignment
-
-The macro PPC_CACHE_ALIGNMENT is set to the line size of the cache.  It is
-used to align the entry point of critical routines so that as much code
-as possible can be retrieved with the initial read into cache.  This
-is done for the interrupt handler as well as the context switch routines.
-
-In addition, the "shortcut" data structure used by the PowerPC implementation
-to ease access to data elements frequently accessed by RTEMS routines
-implemented in assembly language is aligned using this value.
-
-@subsection Maximum Interrupts
-
-The macro PPC_INTERRUPT_MAX is set to the number of exception sources
-supported by this PowerPC model.
-
-@subsection Has Double Precision Floating Point
-
-The macro PPC_HAS_DOUBLE is set to 1 to indicate that the PowerPC model
-has support for double precision floating point numbers.  This is
-important because the floating point registers need only be four bytes
-wide (not eight) if double precision is not supported.
-
-@subsection Critical Interrupts
-
-The macro PPC_HAS_RFCI is set to 1 to indicate that the PowerPC model
-has the Critical Interrupt capability as defined by the IBM 403 models.
-
-@subsection Use Multiword Load/Store Instructions
-
-The macro PPC_USE_MULTIPLE is set to 1 to indicate that multiword load and
-store instructions should be used to perform context switch operations.
-The relative efficiency of multiword load and store instructions versus
-an equivalent set of single word load and store instructions varies based
-upon the PowerPC model.
-
-@subsection Instruction Cache Size
-
-The macro PPC_I_CACHE is set to the size in bytes of the instruction cache.
-
-@subsection Data Cache Size
-
-The macro PPC_D_CACHE is set to the size in bytes of the data cache.
-
-@subsection Debug Model
-
-The macro PPC_DEBUG_MODEL is set to indicate the debug support features 
-present in this CPU model.  The following debug support feature sets
-are currently supported:
-
-@table @b
-
-@item @code{PPC_DEBUG_MODEL_STANDARD}
-indicates that the single-step trace enable (SE) and branch trace
-enable (BE) bits in the MSR are supported by this CPU model.
-
-@item @code{PPC_DEBUG_MODEL_SINGLE_STEP_ONLY}
-indicates that only the single-step trace enable (SE) bit in the MSR
-is supported by this CPU model. 
-
-@item @code{PPC_DEBUG_MODEL_IBM4xx}
-indicates that the debug exception enable (DE) bit in the MSR is supported
-by this CPU model.  At this time, this particular debug feature set 
-has only been seen in the IBM 4xx series.
-
-@end table
-
-@subsection Low Power Model
-
-The macro PPC_LOW_POWER_MODE is set to indicate the low power model
-supported by this CPU model.  The following low power modes are currently
-supported.
-
-@table @b
-
-@item @code{PPC_LOW_POWER_MODE_NONE}
-indicates that this CPU model has no low power mode support.
-
-@item @code{PPC_LOW_POWER_MODE_STANDARD}
-indicates that this CPU model follows the low power model defined for
-the PPC603e.
-
-@end table
diff --git a/doc/supplements/powerpc/cputable.t b/doc/supplements/powerpc/cputable.t
deleted file mode 100644
index 35fabdb6f3..0000000000
--- a/doc/supplements/powerpc/cputable.t
+++ /dev/null
@@ -1,156 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Processor Dependent Information Table
-
-@section Introduction
-
-Any highly processor dependent information required
-to describe a processor to RTEMS is provided in the CPU
-Dependent Information Table.  This table is not required for all
-processors supported by RTEMS.  This chapter describes the
-contents, if any, for a particular processor type.
-
-@section CPU Dependent Information Table
-
-The PowerPC version of the RTEMS CPU Dependent
-Information Table is given by the C structure definition is
-shown below:
-
-@example
-typedef struct @{
-  void       (*pretasking_hook)( void );
-  void       (*predriver_hook)( void );
-  void       (*postdriver_hook)( void );
-  void       (*idle_task)( void );
-  boolean      do_zero_of_workspace;
-  unsigned32   idle_task_stack_size;
-  unsigned32   interrupt_stack_size;
-  unsigned32   extra_mpci_receive_server_stack;
-  void *     (*stack_allocate_hook)( unsigned32 );
-  void       (*stack_free_hook)( void* );
-  /* end of fields required on all CPUs */
-
-  unsigned32   clicks_per_usec;       /* Timer clicks per microsecond */
-  void       (*spurious_handler)(unsigned32 vector, CPU_Interrupt_frame *);
-  boolean      exceptions_in_RAM;     /* TRUE if in RAM */
-
-#if defined(ppc403)
-  unsigned32   serial_per_sec;        /* Serial clocks per second */
-  boolean      serial_external_clock;
-  boolean      serial_xon_xoff;
-  boolean      serial_cts_rts;
-  unsigned32   serial_rate;
-  unsigned32   timer_average_overhead; /* in ticks */
-  unsigned32   timer_least_valid;      /* Least valid number from timer */
-#endif
-@};
-@end example
-
-@table @code
-@item pretasking_hook
-is the address of the
-user provided routine which is invoked once RTEMS initialization
-is complete but before interrupts and tasking are enabled.  This
-field may be NULL to indicate that the hook is not utilized.
-
-@item predriver_hook
-is the address of the user provided
-routine which is invoked with tasking enabled immediately before
-the MPCI and device drivers are initialized. RTEMS
-initialization is complete, interrupts and tasking are enabled,
-but no device drivers are initialized.  This field may be NULL to
-indicate that the hook is not utilized.
-
-@item postdriver_hook
-is the address of the user provided
-routine which is invoked with tasking enabled immediately after
-the MPCI and device drivers are initialized. RTEMS
-initialization is complete, interrupts and tasking are enabled,
-and the device drivers are initialized.  This field may be NULL
-to indicate that the hook is not utilized.
-
-@item idle_task
-is the address of the optional user
-provided routine which is used as the system's IDLE task.  If
-this field is not NULL, then the RTEMS default IDLE task is not
-used.  This field may be NULL to indicate that the default IDLE
-is to be used.
-
-@item do_zero_of_workspace
-indicates whether RTEMS should
-zero the Workspace as part of its initialization.  If set to
-TRUE, the Workspace is zeroed.  Otherwise, it is not.
-
-@item idle_task_stack_size
-is the size of the RTEMS idle task stack in bytes.  
-If this number is less than MINIMUM_STACK_SIZE, then the 
-idle task's stack will be MINIMUM_STACK_SIZE in byte.
-
-@item interrupt_stack_size
-is the size of the RTEMS allocated interrupt stack in bytes.
-This value must be at least as large as MINIMUM_STACK_SIZE.
-
-@item extra_mpci_receive_server_stack
-is the extra stack space allocated for the RTEMS MPCI receive server task
-in bytes.  The MPCI receive server may invoke nearly all directives and 
-may require extra stack space on some targets.
-
-@item stack_allocate_hook
-is the address of the optional user provided routine which allocates 
-memory for task stacks.  If this hook is not NULL, then a stack_free_hook
-must be provided as well.
-
-@item stack_free_hook
-is the address of the optional user provided routine which frees 
-memory for task stacks.  If this hook is not NULL, then a stack_allocate_hook
-must be provided as well.
-
-@item clicks_per_usec
-is the number of decrementer interupts that occur each microsecond.
-
-@item spurious_handler
-is the address of the
-routine which is invoked when a spurious interrupt occurs.
-
-@item exceptions_in_RAM
-indicates whether the exception vectors are located in RAM or ROM.  If 
-they are located in RAM dynamic vector installation occurs, otherwise
-it does not.
-
-@item serial_per_sec
-is a PPC403 specific field which specifies the number of clock
-ticks per second for the PPC403 serial timer.
-
-@item serial_rate
-is a PPC403 specific field which specifies the baud rate for the
-PPC403 serial port.
-
-@item serial_external_clock
-is a PPC403 specific field which indicates whether or not to mask in a 0x2 into
-the Input/Output Configuration Register (IOCR) during initialization of the
-PPC403 console.  (NOTE: This bit is defined as "reserved" 6-12?)
-
-@item serial_xon_xoff
-is a PPC403 specific field which indicates whether or not
-XON/XOFF flow control is supported for the PPC403 serial port.
-
-@item serial_cts_rts
-is a PPC403 specific field which indicates whether or not to set the 
-least significant bit of the Input/Output Configuration Register
-(IOCR) during initialization of the PPC403 console.  (NOTE: This
-bit is defined as "reserved" 6-12?)
-
-@item timer_average_overhead
-is a PPC403 specific field which specifies the average number of overhead ticks that occur on the PPC403 timer.
-
-@item timer_least_valid
-is a PPC403 specific field which specifies the maximum valid PPC403 timer value.
-
-@end table
-
diff --git a/doc/supplements/powerpc/fatalerr.t b/doc/supplements/powerpc/fatalerr.t
deleted file mode 100644
index df8ac491d0..0000000000
--- a/doc/supplements/powerpc/fatalerr.t
+++ /dev/null
@@ -1,47 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Default Fatal Error Processing
-
-@section Introduction
-
-Upon detection of a fatal error by either the
-application or RTEMS the fatal error manager is invoked.  The
-fatal error manager will invoke the user-supplied fatal error
-handlers.  If no user-supplied handlers are configured,  the
-RTEMS provided default fatal error handler is invoked.  If the
-user-supplied fatal error handlers return to the executive the
-default fatal error handler is then invoked.  This chapter
-describes the precise operations of the default fatal error
-handler.
-
-@section Default Fatal Error Handler Operations
-
-The default fatal error handler which is invoked by
-the @code{rtems_fatal_error_occurred} directive when there is no user handler
-configured or the user handler returns control to RTEMS.  The
-default fatal error handler performs the following actions:
-
-@itemize @bullet
-
-@item places the error code in r3, and
-
-@item executes a trap instruction which results in a Program Exception.
-
-@end itemize
-
-If the Program Exception returns, then the following actions are performed:
-
-@itemize @bullet
-
-@item disables all processor exceptions by loading a 0 into the MSR, and
-
-@item goes into an infinite loop to simulate a halt processor instruction.
-
-@end itemize
-
diff --git a/doc/supplements/powerpc/intr_NOTIMES.t b/doc/supplements/powerpc/intr_NOTIMES.t
deleted file mode 100644
index 7d5117e7d5..0000000000
--- a/doc/supplements/powerpc/intr_NOTIMES.t
+++ /dev/null
@@ -1,184 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Interrupt Processing
-
-@section Introduction
-
-Different types of processors respond to the
-occurrence of an interrupt in its own unique fashion. In
-addition, each processor type provides a control mechanism to
-allow for the proper handling of an interrupt.  The processor
-dependent response to the interrupt modifies the current
-execution state and results in a change in the execution stream.
-Most processors require that an interrupt handler utilize some
-special control mechanisms to return to the normal processing
-stream.  Although RTEMS hides many of the processor dependent
-details of interrupt processing, it is important to understand
-how the RTEMS interrupt manager is mapped onto the processor's
-unique architecture. Discussed in this chapter are the PowerPC's
-interrupt response and control mechanisms as they pertain to
-RTEMS.
-
-RTEMS and associated documentation uses the terms
-interrupt and vector.  In the PowerPC architecture, these terms
-correspond to exception and exception handler, respectively.  The terms will
-be used interchangeably in this manual.
-
-@section Synchronous Versus Asynchronous Exceptions
-
-In the PowerPC architecture exceptions can be either precise or 
-imprecise and either synchronous or asynchronous.  Asynchronous 
-exceptions occur when an external event interrupts the processor.
-Synchronous exceptions are caused by the actions of an 
-instruction. During an exception SRR0 is used to calculate where 
-instruction processing should resume.  All instructions prior to
-the resume instruction will have completed execution.  SRR1 is used to 
-store the machine status.
-
-There are two asynchronous nonmaskable, highest-priority exceptions
-system reset and machine check.  There are two asynchrononous maskable
-low-priority exceptions external interrupt and decrementer.  Nonmaskable
-execptions are never delayed, therefore if two nonmaskable, asynchronous 
-exceptions occur in immediate succession, the state information saved by
-the first exception may be overwritten when the subsequent exception occurs. 
-
-The PowerPC arcitecure defines one imprecise exception, the imprecise 
-floating point enabled exception.  All other synchronous exceptions are
-precise.  The synchronization occuring during asynchronous precise 
-exceptions conforms to the requirements for context synchronization.
-
-@section Vectoring of Interrupt Handler
-
-Upon determining that an exception can be taken the PowerPC automatically
-performs the following actions:
-
-@itemize @bullet
-@item an instruction address is loaded into SRR0
-
-@item bits 33-36 and 42-47 of SRR1 are loaded with information 
-specific to the exception.
-
-@item bits 0-32, 37-41, and 48-63 of SRR1 are loaded with corresponding
-bits from the MSR.
-
-@item the MSR is set based upon the exception type.
-
-@item instruction fetch and execution resumes, using the new MSR value, at a location specific to the execption type. 
-
-@end itemize
-
-If the interrupt handler was installed as an RTEMS
-interrupt handler, then upon receipt of the interrupt, the
-processor passes control to the RTEMS interrupt handler which
-performs the following actions:
-
-@itemize @bullet
-@item saves the state of the interrupted task on it's stack,
-
-@item saves all registers which are not normally preserved
-by the calling sequence so the user's interrupt service
-routine can be written in a high-level language.
-
-@item if this is the outermost (i.e. non-nested) interrupt,
-then the RTEMS interrupt handler switches from the current stack
-to the interrupt stack,
-
-@item enables exceptions,
-
-@item invokes the vectors to a user interrupt service routine (ISR).
-@end itemize
-
-Asynchronous interrupts are ignored while exceptions are
-disabled.  Synchronous interrupts which occur while are
-disabled result in the CPU being forced into an error mode.
-
-A nested interrupt is processed similarly with the
-exception that the current stack need not be switched to the
-interrupt stack.
-
-@section Interrupt Levels
-
-The PowerPC architecture supports only a single external
-asynchronous interrupt source.  This interrupt source
-may be enabled and disabled via the External Interrupt Enable (EE)
-bit in the Machine State Register (MSR).  Thus only two level (enabled
-and disabled) of external device interrupt priorities are 
-directly supported by the PowerPC architecture.  
-
-Some PowerPC implementations include a Critical Interrupt capability
-which is often used to receive interrupts from high priority external
-devices.
-
-The RTEMS interrupt level mapping scheme for the PowerPC is not 
-a numeric level as on most RTEMS ports.  It is a bit mapping in
-which the least three significiant bits of the interrupt level
-are mapped directly to the enabling of specific interrupt 
-sources as follows:
-
-@table @b
-
-@item Critical Interrupt
-Setting bit 0 (the least significant bit) of the interrupt level
-enables the Critical Interrupt source, if it is available on this
-CPU model.
-
-@item Machine Check
-Setting bit 1 of the interrupt level enables Machine Check execptions.
-
-@item External Interrupt
-Setting bit 2 of the interrupt level enables External Interrupt execptions.
-
-@end table
-
-All other bits in the RTEMS task interrupt level are ignored.
-
-@section Disabling of Interrupts by RTEMS
-
-During the execution of directive calls, critical
-sections of code may be executed.  When these sections are
-encountered, RTEMS disables Critical Interrupts, External Interrupts
-and Machine Checks before the execution of this section and restores
-them to the previous level upon completion of the section.  RTEMS has been
-optimized to insure that interrupts are disabled for less than
-RTEMS_MAXIMUM_DISABLE_PERIOD microseconds on a 
-RTEMS_MAXIMUM_DISABLE_PERIOD_MHZ Mhz PowerPC 603e with zero
-wait states.  These numbers will vary based the number of wait 
-states and processor speed present on the target board.
-[NOTE:  The maximum period with interrupts disabled is hand calculated.  This
-calculation was last performed for Release 
-RTEMS_RELEASE_FOR_MAXIMUM_DISABLE_PERIOD.]
-
-If a PowerPC implementation provides non-maskable interrupts (NMI)
-which cannot be disabled, ISRs which process these interrupts
-MUST NEVER issue RTEMS system calls.  If a directive is invoked,
-unpredictable results may occur due to the inability of RTEMS
-to protect its critical sections.  However, ISRs that make no
-system calls may safely execute as non-maskable interrupts.
-
-@section Interrupt Stack
-
-The PowerPC architecture does not provide for a
-dedicated interrupt stack.  Thus by default, exception handlers would
-execute on the stack of the RTEMS task which they interrupted.
-This artificially inflates the stack requirements for each task
-since EVERY task stack would have to include enough space to
-account for the worst case interrupt stack requirements in
-addition to it's own worst case usage.  RTEMS addresses this
-problem on the PowerPC by providing a dedicated interrupt stack
-managed by software.
-
-During system initialization, RTEMS allocates the
-interrupt stack from the Workspace Area.  The amount of memory
-allocated for the interrupt stack is determined by the
-interrupt_stack_size field in the CPU Configuration Table.  As
-part of processing a non-nested interrupt, RTEMS will switch to
-the interrupt stack before invoking the installed handler.
-
-
-
diff --git a/doc/supplements/powerpc/memmodel.t b/doc/supplements/powerpc/memmodel.t
deleted file mode 100644
index a8bd0f66ab..0000000000
--- a/doc/supplements/powerpc/memmodel.t
+++ /dev/null
@@ -1,110 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Memory Model
-
-@section Introduction
-
-A processor may support any combination of memory
-models ranging from pure physical addressing to complex demand
-paged virtual memory systems.  RTEMS supports a flat memory
-model which ranges contiguously over the processor's allowable
-address space.  RTEMS does not support segmentation or virtual
-memory of any kind.  The appropriate memory model for RTEMS
-provided by the targeted processor and related characteristics
-of that model are described in this chapter.
-
-@section Flat Memory Model
-
-The PowerPC architecture supports a variety of memory models.
-RTEMS supports the PowerPC using a flat memory model with 
-paging disabled.  In this mode, the PowerPC automatically
-converts every address from a logical to a physical address
-each time it is used.  The PowerPC uses information provided
-in the Block Address Translation (BAT) to convert these addresses.
-
-Implementations of the PowerPC architecture may be thirty-two or sixty-four bit.
-The PowerPC architecture supports a flat thirty-two or sixty-four bit address
-space with addresses ranging from 0x00000000 to 0xFFFFFFFF (4
-gigabytes) in thirty-two bit implementations or to 0xFFFFFFFFFFFFFFFF 
-in sixty-four bit implementations.  Each address is represented
-by either a thirty-two bit or sixty-four bit value and is byte addressable.  
-The address may be used to reference a single byte, half-word
-(2-bytes), word (4 bytes), or in sixty-four bit implementations a
-doubleword (8 bytes).  Memory accesses within the address space are
-performed in big or little endian fashion by the PowerPC based
-upon the current setting of the Little-endian mode enable bit (LE)
-in the Machine State Register (MSR).  While the processor is in
-big endian mode, memory accesses which are not properly aligned
-generate an "alignment exception" (vector offset 0x00600).  In
-little endian mode, the PowerPC architecture does not require
-the processor to generate alignment exceptions.
-
-The following table lists the alignment requirements for a variety
-of data accesses:
-
-@ifset use-ascii
-@example
-@group
-          +--------------+-----------------------+
-          |   Data Type  | Alignment Requirement |
-          +--------------+-----------------------+
-          |     byte     |          1            |
-          |   half-word  |          2            |
-          |     word     |          4            |
-          |  doubleword  |          8            |
-          +--------------+-----------------------+
-@end group
-@end example
-@end ifset
-
-@ifset use-tex
-@sp 1
-@tex
-\centerline{\vbox{\offinterlineskip\halign{
-\vrule\strut#&
-\hbox to 1.75in{\enskip\hfil#\hfil}&
-\vrule#&
-\hbox to 1.75in{\enskip\hfil#\hfil}&
-\vrule#\cr
-\noalign{\hrule}
-&\bf Data Type &&\bf Alignment Requirement&\cr\noalign{\hrule}
-&byte&&1&\cr\noalign{\hrule}
-&half-word&&2&\cr\noalign{\hrule}
-&word&&4&\cr\noalign{\hrule}
-&doubleword&&8&\cr\noalign{\hrule}
-}}\hfil}
-@end tex
-@end ifset
- 
-@ifset use-html
-@html
-<CENTER>
-  <TABLE COLS=2 WIDTH="60%" BORDER=2>
-<TR><TD ALIGN=center><STRONG>Data Type</STRONG></TD>
-    <TD ALIGN=center><STRONG>Alignment Requirement</STRONG></TD></TR>
-<TR><TD ALIGN=center>byte</TD>
-    <TD ALIGN=center>1</TD></TR>
-<TR><TD ALIGN=center>half-word</TD>
-    <TD ALIGN=center>2</TD></TR>
-<TR><TD ALIGN=center>word</TD>
-    <TD ALIGN=center>4</TD></TR>
-<TR><TD ALIGN=center>doubleword</TD>
-    <TD ALIGN=center>8</TD></TR>
-  </TABLE>
-</CENTER>
-@end html
-@end ifset
-
-Doubleword load and store operations are only available in 
-PowerPC CPU models which are sixty-four bit implementations.
-
-RTEMS does not directly support any PowerPC Memory Management
-Units, therefore, virtual memory or segmentation systems
-involving the PowerPC  are not supported.
-
diff --git a/doc/supplements/powerpc/powerpc.texi b/doc/supplements/powerpc/powerpc.texi
deleted file mode 100644
index 48dfc7da12..0000000000
--- a/doc/supplements/powerpc/powerpc.texi
+++ /dev/null
@@ -1,121 +0,0 @@
-\input ../../texinfo/texinfo   @c -*-texinfo-*-
-@c %**start of header
-@setfilename c_powerpc
-@syncodeindex vr fn
-@synindex ky cp
-@paragraphindent 0
-@c @smallbook
-@c %**end of header
-
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@c
-@c   Master file for the PowerPC Applications Supplement
-@c
-
-@include ../../common/setup.texi
-
-@ignore
-@ifinfo
-@format
-START-INFO-DIR-ENTRY
-* RTEMS PowerPC Applications Supplement (powerpc):
-END-INFO-DIR-ENTRY
-@end format
-@end ifinfo
-@end ignore
-
-@c
-@c  Title Page Stuff
-@c
-
-@set edition @value{RTEMS-EDITION}
-@set version @value{RTEMS-VERSION}
-@set update-date @value{RTEMS-UPDATE-DATE}
-@set update-month @value{RTEMS-UPDATE-MONTH}
-
-@c
-@c  I don't really like having a short title page.  --joel
-@c
-@c @shorttitlepage RTEMS PowerPC Applications Supplement 
-
-@setchapternewpage odd
-@settitle RTEMS PowerPC Applications Supplement 
-@titlepage
-@finalout
-
-@title RTEMS PowerPC Applications Supplement 
-@subtitle Edition @value{edition}, for RTEMS @value{version}
-@sp 1
-@subtitle @value{update-month}
-@author On-Line Applications Research Corporation
-@page
-@include ../../common/cpright.texi
-@end titlepage
-
-@c  This prevents a black box from being printed on "overflow" lines.
-@c  The alternative is to rework a sentence to avoid this problem.
-
-@include preface.texi
-@include cpumodel.texi
-@include callconv.texi
-@include memmodel.texi
-@include intr.texi
-@include fatalerr.texi
-@include bsp.texi
-@include cputable.texi
-@include wksheets.texi
-@include timing.texi
-@include timePSIM.texi
-@include timeDMV177.texi
-@ifinfo
-@node Top, Preface, (dir), (dir)
-@top c_powerpc
-
-This is the online version of the RTEMS PowerPC Applications Supplement.
-
-@menu
-* Preface::
-* CPU Model Dependent Features::
-* Calling Conventions::
-* Memory Model::
-* Interrupt Processing::
-* Default Fatal Error Processing::
-* Board Support Packages::
-* Processor Dependent Information Table::
-* Memory Requirements::
-* Timing Specification::
-* PSIM Timing Data::
-* DMV177 Timing Data::
-* Command and Variable Index::
-* Concept Index::
-@end menu
-
-@end ifinfo
-@c 
-@c 
-@c Need to copy the emacs stuff and "trailer stuff" (index, toc) into here
-@c
-
-@node Command and Variable Index, Concept Index, DMV177 Timing Data Rate Monotonic Manager, Top
-@unnumbered Command and Variable Index
-
-There are currently no Command and Variable Index entries.
-
-@c @printindex fn
-
-@node Concept Index, , Command and Variable Index, Top
-@unnumbered Concept Index
-
-There are currently no Concept Index entries.
-@c @printindex cp
-
-@c @contents
-@bye
-
diff --git a/doc/supplements/powerpc/preface.texi b/doc/supplements/powerpc/preface.texi
deleted file mode 100644
index e898c3d8dd..0000000000
--- a/doc/supplements/powerpc/preface.texi
+++ /dev/null
@@ -1,94 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@ifinfo
-@node Preface, CPU Model Dependent Features, Top, Top
-@end ifinfo
-@unnumbered Preface
-
-The Real Time Executive for Multiprocessor Systems
-(RTEMS) is designed to be portable across multiple processor
-architectures.  However, the nature of real-time systems makes
-it essential that the application designer understand certain
-processor dependent implementation details.  These processor
-dependencies include calling convention, board support package
-issues, interrupt processing, exact RTEMS memory requirements,
-performance data, header files, and the assembly language
-interface to the executive.
-
-This document discusses the PowerPC architecture
-dependencies in this port of RTEMS.
-
-It is highly recommended that the PowerPC RTEMS
-application developer obtain and become familiar with the
-documentation for the processor being used as well as the
-specification for the revision of the PowerPC architecture which
-corresponds to that processor.
-
-@subheading PowerPC Architecture Documents
-
-For information on the PowerPC architecture, refer to
-the following documents available from Motorola and IBM:
-
-@itemize @bullet
-
-@item @cite{PowerPC Microprocessor Family: The Programming Environment}
-(Motorola Document MPRPPCFPE-01).
-
-@item @cite{IBM PPC403GB Embedded Controller User's Manual}.
-
-@item @cite{PoweRisControl MPC500 Family RCPU RISC Central Processing
-Unit Reference Manual} (Motorola Document RCPUURM/AD).
-
-@item @cite{PowerPC 601 RISC Microprocessor User's Manual}
-(Motorola Document MPR601UM/AD).
-
-@item @cite{PowerPC 603 RISC Microprocessor User's Manual}
-(Motorola Document MPR603UM/AD).
-
-@item @cite{PowerPC 603e RISC Microprocessor User's Manual}
-(Motorola Document MPR603EUM/AD).
-
-@item @cite{PowerPC 604 RISC Microprocessor User's Manual}
-(Motorola Document MPR604UM/AD).
-
-@item @cite{PowerPC MPC821 Portable Systems Microprocessor User's Manual}
-(Motorola Document MPC821UM/AD).
-
-@item @cite{PowerQUICC MPC860 User's Manual} (Motorola Document MPC860UM/AD).
-
-
-@end itemize
-
-Motorola maintains an on-line electronic library for the PowerPC
-at the following URL:
-
-@itemize @code{ }
-@item @cite{http://www.mot.com/powerpc/library/library.html}
-@end itemize
-
-This site has a a wealth of information and examples.  Many of the
-manuals are available from that site in electronic format.
-
-@subheading PowerPC Processor Simulator Information
-
-PSIM is a program which emulates the Instruction Set Architecture
-of the PowerPC microprocessor family.  It is reely available in source
-code form under the terms of the GNU General Public License (version
-2 or later).  PSIM can be integrated with the GNU Debugger (gdb) to
-execute and debug PowerPC executables on non-PowerPC hosts.  PSIM 
-supports the addition of user provided device models which can be
-used to allow one to develop and debug embedded applications using
-the simulator.
-
-The latest version of PSIM is made available to the public via
-anonymous ftp at ftp://ftp.ci.com.au/pub/psim or
-ftp://cambridge.cygnus.com/pub/psim.  There is also a mailing list 
-at powerpc-psim@@ci.com.au.
-
-
diff --git a/doc/supplements/powerpc/timeDMV177.t b/doc/supplements/powerpc/timeDMV177.t
deleted file mode 100644
index 1117b03f6e..0000000000
--- a/doc/supplements/powerpc/timeDMV177.t
+++ /dev/null
@@ -1,113 +0,0 @@
-@c
-@c  Timing information for the DMV177
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@include ../../common/timemac.texi
-@tex
-\global\advance \smallskipamount by -4pt
-@end tex
-
-@chapter RTEMS_BSP Timing Data
-
-@section Introduction
-
-The timing data for RTEMS on the DY-4 RTEMS_BSP board
-is provided along with the target
-dependent aspects concerning the gathering of the timing data.
-The hardware platform used to gather the times is described to
-give the reader a better understanding of each directive time
-provided.  Also, provided is a description of the interrupt
-latency and the context switch times as they pertain to the
-PowerPC version of RTEMS.
-
-@section Hardware Platform
-
-All times reported in this chapter were measured using a RTEMS_BSP board.
-All data and code caching was disabled.  This results in very deterministic
-times which represent the worst possible performance.  Many embedded 
-applications disable caching to insure that execution times are
-repeatable.  Moreover, the JTAG port on certain revisions of the PowerPC
-603e does not operate properly if caching is enabled.  Thus during 
-development and debug, caching must be off.
-
-The PowerPC decrementer register was was used to gather
-all timing information.  In the PowerPC architecture,
-this register typically counts
-something like CPU cycles or is a function of the clock
-speed.  On the PPC603e decrements once for every four (4) bus cycles.
-On the RTEMS_BSP, the bus operates at a clock speed of 
-33 Mhz.  This result in a very accurate number since it is a function of the 
-microprocessor itself.  Thus all measurements in this 
-chapter are reported as the actual number of decrementer
-clicks reported.  
-
-To convert the numbers reported to microseconds, one should
-divide the number reported by 8.650752.  This number was derived as
-shown below:
-
-@example
-((33 * 1048576) / 1000000) / 4 = 8.650752
-@end example
-
-All sources of hardware interrupts were disabled,
-although traps were enabled and the interrupt level of the
-PowerPC allows all interrupts.
-
-@section Interrupt Latency
-
-The maximum period with traps disabled or the
-processor interrupt level set to it's highest value inside RTEMS
-is less than RTEMS_MAXIMUM_DISABLE_PERIOD
-microseconds including the instructions which
-disable and re-enable interrupts.  The time required for the
-PowerPC to vector an interrupt and for the RTEMS entry overhead
-before invoking the user's trap handler are a total of 
-RTEMS_INTR_ENTRY_RETURNS_TO_PREEMPTING_TASK
-microseconds.  These combine to yield a worst case interrupt
-latency of less than RTEMS_MAXIMUM_DISABLE_PERIOD +
-RTEMS_INTR_ENTRY_RETURNS_TO_PREEMPTING_TASK microseconds at 
-RTEMS_MAXIMUM_DISABLE_PERIOD_MHZ Mhz.
-[NOTE:  The maximum period with interrupts disabled was last
-determined for Release RTEMS_RELEASE_FOR_MAXIMUM_DISABLE_PERIOD.]
-
-The maximum period with interrupts disabled within
-RTEMS is hand-timed with some assistance from the PowerPC simulator.
-The maximum period with interrupts disabled with RTEMS has not
-been calculated on this target.
-
-The interrupt vector and entry overhead time was
-generated on the PSIM benchmark platform using the PowerPC's
-decrementer register.  This register was programmed to generate
-an interrupt after one countdown.
-
-@section Context Switch
-
-The RTEMS processor context switch time is RTEMS_NO_FP_CONTEXTS
-bus cycle on the RTEMS_BSP benchmark platform when no floating
-point context is saved or restored.  Additional execution time
-is required when a TASK_SWITCH user extension is configured.
-The use of the TASK_SWITCH extension is application dependent.
-Thus, its execution time is not considered part of the raw
-context switch time.
-
-Since RTEMS was designed specifically for embedded
-missile applications which are floating point intensive, the
-executive is optimized to avoid unnecessarily saving and
-restoring the state of the numeric coprocessor.  The state of
-the numeric coprocessor is only saved when an FLOATING_POINT
-task is dispatched and that task was not the last task to
-utilize the coprocessor.  In a system with only one
-FLOATING_POINT task, the state of the numeric coprocessor will
-never be saved or restored.  When the first FLOATING_POINT task
-is dispatched, RTEMS does not need to save the current state of
-the numeric coprocessor.
-
-The following table summarizes the context switch
-times for the RTEMS_BSP benchmark platform:
-
diff --git a/doc/supplements/powerpc/timePSIM.t b/doc/supplements/powerpc/timePSIM.t
deleted file mode 100644
index 520cb6df64..0000000000
--- a/doc/supplements/powerpc/timePSIM.t
+++ /dev/null
@@ -1,97 +0,0 @@
-@c
-@c  Timing information for PSIM
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@include ../../common/timemac.texi
-@tex
-\global\advance \smallskipamount by -4pt
-@end tex
-
-@chapter RTEMS_BSP Timing Data
-
-@section Introduction
-
-The timing data for RTEMS on the RTEMS_BSP target 
-is provided along with the target
-dependent aspects concerning the gathering of the timing data.
-The hardware platform used to gather the times is described to
-give the reader a better understanding of each directive time
-provided.  Also, provided is a description of the interrupt
-latency and the context switch times as they pertain to the
-PowerPC version of RTEMS.
-
-@section Hardware Platform
-
-All times reported in this chapter were measured using the PowerPC
-Instruction Simulator (PSIM). PSIM simulates a variety of PowerPC
-6xx models with the PPC603e being used as the basis for the measurements
-reported in this chapter.
-
-The PowerPC decrementer register was was used to gather
-all timing information.  In real hardware implementations
-of the PowerPC architecture, this register would typically
-count something like CPU cycles or be a function of the clock
-speed.  However, with PSIM each count of the decrementer register 
-represents an instruction.  Thus all measurements in this 
-chapter are reported as the actual number of instructions
-executed.  All sources of hardware interrupts were disabled,
-although traps were enabled and the interrupt level of the
-PowerPC allows all interrupts.
-
-@section Interrupt Latency
-
-The maximum period with traps disabled or the
-processor interrupt level set to it's highest value inside RTEMS
-is less than RTEMS_MAXIMUM_DISABLE_PERIOD
-microseconds including the instructions which
-disable and re-enable interrupts.  The time required for the
-PowerPC to vector an interrupt and for the RTEMS entry overhead
-before invoking the user's trap handler are a total of 
-RTEMS_INTR_ENTRY_RETURNS_TO_PREEMPTING_TASK
-microseconds.  These combine to yield a worst case interrupt
-latency of less than RTEMS_MAXIMUM_DISABLE_PERIOD +
-RTEMS_INTR_ENTRY_RETURNS_TO_PREEMPTING_TASK microseconds at 
-RTEMS_MAXIMUM_DISABLE_PERIOD_MHZ Mhz.
-[NOTE:  The maximum period with interrupts disabled was last
-determined for Release RTEMS_RELEASE_FOR_MAXIMUM_DISABLE_PERIOD.]
-
-The maximum period with interrupts disabled within
-RTEMS is hand-timed with some assistance from RTEMS_BSP.  The maximum
-period with interrupts disabled with RTEMS occurs was not measured
-on this target.
-
-The interrupt vector and entry overhead time was
-generated on the RTEMS_BSP benchmark platform using the PowerPC's
-decrementer register.  This register was programmed to generate
-an interrupt after one countdown.
-
-@section Context Switch
-
-The RTEMS processor context switch time is RTEMS_NO_FP_CONTEXTS
-instructions on the RTEMS_BSP benchmark platform when no floating
-point context is saved or restored.  Additional execution time
-is required when a TASK_SWITCH user extension is configured.
-The use of the TASK_SWITCH extension is application dependent.
-Thus, its execution time is not considered part of the raw
-context switch time.
-
-Since RTEMS was designed specifically for embedded
-missile applications which are floating point intensive, the
-executive is optimized to avoid unnecessarily saving and
-restoring the state of the numeric coprocessor.  The state of
-the numeric coprocessor is only saved when an FLOATING_POINT
-task is dispatched and that task was not the last task to
-utilize the coprocessor.  In a system with only one
-FLOATING_POINT task, the state of the numeric coprocessor will
-never be saved or restored.  When the first FLOATING_POINT task
-is dispatched, RTEMS does not need to save the current state of
-the numeric coprocessor.
-
-The following table summarizes the context switch
-times for the RTEMS_BSP benchmark platform:
diff --git a/doc/supplements/sh/callconv.texi b/doc/supplements/sh/callconv.texi
deleted file mode 100644
index adde30776c..0000000000
--- a/doc/supplements/sh/callconv.texi
+++ /dev/null
@@ -1,102 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Calling Conventions
-
-@section Introduction
-
-Each high-level language compiler generates
-subroutine entry and exit code based upon a set of rules known
-as the compiler's calling convention.   These rules address the
-following issues:
-
-@itemize @bullet
-@item register preservation and usage
-@item parameter passing
-@item call and return mechanism
-@end itemize
-
-A compiler's calling convention is of importance when
-interfacing to subroutines written in another language either
-assembly or high-level.  Even when the high-level language and
-target processor are the same, different compilers may use
-different calling conventions.  As a result, calling conventions
-are both processor and compiler dependent.
-
-The Hitachi SH architecture supports a simple yet
-effective call and return mechanism.  A subroutine is invoked
-via the branch to subroutine (XXX) or the jump to subroutine
-(XXX) instructions.  These instructions push the return address
-on the current stack.  The return from subroutine (rts)
-instruction pops the return address off the current stack and
-transfers control to that instruction.  It is is important to
-note that the MC68xxx call and return mechanism does not
-automatically save or restore any registers.  It is the
-responsibility of the high-level language compiler to define the
-register preservation and usage convention.
-
-@section Calling Mechanism
-
-All RTEMS directives are invoked using either a bsr
-or jsr instruction and return to the user application via the
-rts instruction.
-
-@section Register Usage
-
-As discussed above, the bsr and jsr instructions do
-not automatically save any registers.  RTEMS uses the registers
-D0, D1, A0, and A1 as scratch registers.  These registers are
-not preserved by RTEMS directives therefore, the contents of
-these registers should not be assumed upon return from any RTEMS
-directive.
-
-
-> > The SH1 has 16 general registers (r0..r15)
-> > r0..r3 used as general volatile registers
-> > r4..r7 used to pass up to 4 arguments to functions, arguments above 4 are
-> > passed via the stack)
-> > r8..13 caller saved registers (i.e. push them to the stack if you need them
-> > inside of a function)
-> > r14 frame pointer
-> > r15 stack pointer
->
-
-
-@section Parameter Passing
-
-RTEMS assumes that arguments are placed on the
-current stack before the directive is invoked via the bsr or jsr
-instruction.  The first argument is assumed to be closest to the
-return address on the stack.  This means that the first argument
-of the C calling sequence is pushed last.  The following
-pseudo-code illustrates the typical sequence used to call a
-RTEMS directive with three (3) arguments:
-
-@example
-@group
-push third argument
-push second argument
-push first argument
-invoke directive
-remove arguments from the stack
-@end group
-@end example
-
-The arguments to RTEMS are typically pushed onto the
-stack using a move instruction with a pre-decremented stack
-pointer as the destination.  These arguments must be removed
-from the stack after control is returned to the caller.  This
-removal is typically accomplished by adding the size of the
-argument list in bytes to the current stack pointer.
-
-@section User-Provided Routines
-
-All user-provided routines invoked by RTEMS, such as
-user extensions, device drivers, and MPCI routines, must also
-adhere to these calling conventions.
-
diff --git a/doc/supplements/sparc/ERC32_TIMES b/doc/supplements/sparc/ERC32_TIMES
deleted file mode 100644
index 4f9ce4c98b..0000000000
--- a/doc/supplements/sparc/ERC32_TIMES
+++ /dev/null
@@ -1,247 +0,0 @@
-#
-#  SPARC/ERC32/SIS Timing and Size Information
-#
-#  $Id$
-#
-
-#
-#  CPU Model Information
-#
-RTEMS_BSP       ERC32
-RTEMS_CPU_MODEL ERC32
-#
-#  Interrupt Latency
-#
-#  NOTE:  In general, the text says it is hand-calculated to be
-#         RTEMS_MAXIMUM_DISABLE_PERIOD at RTEMS_MAXIMUM_DISABLE_PERIOD_MHZ
-#         Mhz and this was last calculated for Release 
-#         RTEMS_VERSION_FOR_MAXIMUM_DISABLE_PERIOD.
-#
-RTEMS_MAXIMUM_DISABLE_PERIOD TBD
-RTEMS_MAXIMUM_DISABLE_PERIOD_MHZ 15.0
-RTEMS_RELEASE_FOR_MAXIMUM_DISABLE_PERIOD 4.2.0-prerelease
-#
-#  Context Switch Times
-#
-RTEMS_NO_FP_CONTEXTS 21
-RTEMS_RESTORE_1ST_FP_TASK 26
-RTEMS_SAVE_INIT_RESTORE_INIT 24
-RTEMS_SAVE_IDLE_RESTORE_INIT 23
-RTEMS_SAVE_IDLE_RESTORE_IDLE 33
-#
-#  Task Manager Times
-#
-RTEMS_TASK_CREATE_ONLY 59
-RTEMS_TASK_IDENT_ONLY 163
-RTEMS_TASK_START_ONLY 30
-RTEMS_TASK_RESTART_CALLING_TASK 64
-RTEMS_TASK_RESTART_SUSPENDED_RETURNS_TO_CALLER 36
-RTEMS_TASK_RESTART_BLOCKED_RETURNS_TO_CALLER 47
-RTEMS_TASK_RESTART_READY_RETURNS_TO_CALLER 37
-RTEMS_TASK_RESTART_SUSPENDED_PREEMPTS_CALLER 77
-RTEMS_TASK_RESTART_BLOCKED_PREEMPTS_CALLER 84
-RTEMS_TASK_RESTART_READY_PREEMPTS_CALLER 75
-RTEMS_TASK_DELETE_CALLING_TASK 91
-RTEMS_TASK_DELETE_SUSPENDED_TASK 47
-RTEMS_TASK_DELETE_BLOCKED_TASK 50
-RTEMS_TASK_DELETE_READY_TASK 51
-RTEMS_TASK_SUSPEND_CALLING_TASK 56
-RTEMS_TASK_SUSPEND_RETURNS_TO_CALLER 16
-RTEMS_TASK_RESUME_TASK_READIED_RETURNS_TO_CALLER 17
-RTEMS_TASK_RESUME_TASK_READIED_PREEMPTS_CALLER 52
-RTEMS_TASK_SET_PRIORITY_OBTAIN_CURRENT_PRIORITY 10
-RTEMS_TASK_SET_PRIORITY_RETURNS_TO_CALLER 25
-RTEMS_TASK_SET_PRIORITY_PREEMPTS_CALLER 67
-RTEMS_TASK_MODE_OBTAIN_CURRENT_MODE 5
-RTEMS_TASK_MODE_NO_RESCHEDULE 6
-RTEMS_TASK_MODE_RESCHEDULE_RETURNS_TO_CALLER 9
-RTEMS_TASK_MODE_RESCHEDULE_PREEMPTS_CALLER 42
-RTEMS_TASK_GET_NOTE_ONLY 10
-RTEMS_TASK_SET_NOTE_ONLY 10
-RTEMS_TASK_WAKE_AFTER_YIELD_RETURNS_TO_CALLER 6
-RTEMS_TASK_WAKE_AFTER_YIELD_PREEMPTS_CALLER 49
-RTEMS_TASK_WAKE_WHEN_ONLY 75
-#
-#  Interrupt Manager
-#
-RTEMS_INTR_ENTRY_RETURNS_TO_NESTED 7
-RTEMS_INTR_ENTRY_RETURNS_TO_INTERRUPTED_TASK 8
-RTEMS_INTR_ENTRY_RETURNS_TO_PREEMPTING_TASK 8
-RTEMS_INTR_EXIT_RETURNS_TO_NESTED 5
-RTEMS_INTR_EXIT_RETURNS_TO_INTERRUPTED_TASK 7
-RTEMS_INTR_EXIT_RETURNS_TO_PREEMPTING_TASK 14
-#
-#  Clock Manager
-#
-RTEMS_CLOCK_SET_ONLY 33
-RTEMS_CLOCK_GET_ONLY 4
-RTEMS_CLOCK_TICK_ONLY 6
-#
-#  Timer Manager
-#
-RTEMS_TIMER_CREATE_ONLY 11
-RTEMS_TIMER_IDENT_ONLY 159
-RTEMS_TIMER_DELETE_INACTIVE 15
-RTEMS_TIMER_DELETE_ACTIVE 17
-RTEMS_TIMER_FIRE_AFTER_INACTIVE 21
-RTEMS_TIMER_FIRE_AFTER_ACTIVE 23
-RTEMS_TIMER_FIRE_WHEN_INACTIVE 34
-RTEMS_TIMER_FIRE_WHEN_ACTIVE 34
-RTEMS_TIMER_RESET_INACTIVE 20
-RTEMS_TIMER_RESET_ACTIVE 22
-RTEMS_TIMER_CANCEL_INACTIVE 10
-RTEMS_TIMER_CANCEL_ACTIVE 13
-#
-#  Semaphore Manager
-#
-RTEMS_SEMAPHORE_CREATE_ONLY 19
-RTEMS_SEMAPHORE_IDENT_ONLY 171
-RTEMS_SEMAPHORE_DELETE_ONLY 19
-RTEMS_SEMAPHORE_OBTAIN_AVAILABLE 12
-RTEMS_SEMAPHORE_OBTAIN_NOT_AVAILABLE_NO_WAIT 12
-RTEMS_SEMAPHORE_OBTAIN_NOT_AVAILABLE_CALLER_BLOCKS 67
-RTEMS_SEMAPHORE_RELEASE_NO_WAITING_TASKS 14
-RTEMS_SEMAPHORE_RELEASE_TASK_READIED_RETURNS_TO_CALLER 23
-RTEMS_SEMAPHORE_RELEASE_TASK_READIED_PREEMPTS_CALLER 57
-#
-#  Message Manager
-#
-RTEMS_MESSAGE_QUEUE_CREATE_ONLY 114
-RTEMS_MESSAGE_QUEUE_IDENT_ONLY 159
-RTEMS_MESSAGE_QUEUE_DELETE_ONLY 25
-RTEMS_MESSAGE_QUEUE_SEND_NO_WAITING_TASKS 36
-RTEMS_MESSAGE_QUEUE_SEND_TASK_READIED_RETURNS_TO_CALLER 38
-RTEMS_MESSAGE_QUEUE_SEND_TASK_READIED_PREEMPTS_CALLER 76
-RTEMS_MESSAGE_QUEUE_URGENT_NO_WAITING_TASKS 36
-RTEMS_MESSAGE_QUEUE_URGENT_TASK_READIED_RETURNS_TO_CALLER 38
-RTEMS_MESSAGE_QUEUE_URGENT_TASK_READIED_PREEMPTS_CALLER 76
-RTEMS_MESSAGE_QUEUE_BROADCAST_NO_WAITING_TASKS 15
-RTEMS_MESSAGE_QUEUE_BROADCAST_TASK_READIED_RETURNS_TO_CALLER 42
-RTEMS_MESSAGE_QUEUE_BROADCAST_TASK_READIED_PREEMPTS_CALLER 83
-RTEMS_MESSAGE_QUEUE_RECEIVE_AVAILABLE 30
-RTEMS_MESSAGE_QUEUE_RECEIVE_NOT_AVAILABLE_NO_WAIT 13
-RTEMS_MESSAGE_QUEUE_RECEIVE_NOT_AVAILABLE_CALLER_BLOCKS 67
-RTEMS_MESSAGE_QUEUE_FLUSH_NO_MESSAGES_FLUSHED 9
-RTEMS_MESSAGE_QUEUE_FLUSH_MESSAGES_FLUSHED 13
-#
-#  Event Manager
-#
-RTEMS_EVENT_SEND_NO_TASK_READIED 9
-RTEMS_EVENT_SEND_TASK_READIED_RETURNS_TO_CALLER 22
-RTEMS_EVENT_SEND_TASK_READIED_PREEMPTS_CALLER 58
-RTEMS_EVENT_RECEIVE_OBTAIN_CURRENT_EVENTS 1
-RTEMS_EVENT_RECEIVE_AVAILABLE 10
-RTEMS_EVENT_RECEIVE_NOT_AVAILABLE_NO_WAIT 9
-RTEMS_EVENT_RECEIVE_NOT_AVAILABLE_CALLER_BLOCKS 60
-#
-#  Signal Manager
-#
-RTEMS_SIGNAL_CATCH_ONLY 6
-RTEMS_SIGNAL_SEND_RETURNS_TO_CALLER 14
-RTEMS_SIGNAL_SEND_SIGNAL_TO_SELF 22
-RTEMS_SIGNAL_EXIT_ASR_OVERHEAD_RETURNS_TO_CALLING_TASK 27
-RTEMS_SIGNAL_EXIT_ASR_OVERHEAD_RETURNS_TO_PREEMPTING_TASK 56
-#
-#  Partition Manager
-#
-RTEMS_PARTITION_CREATE_ONLY 34
-RTEMS_PARTITION_IDENT_ONLY 159
-RTEMS_PARTITION_DELETE_ONLY 14
-RTEMS_PARTITION_GET_BUFFER_AVAILABLE 12
-RTEMS_PARTITION_GET_BUFFER_NOT_AVAILABLE 10
-RTEMS_PARTITION_RETURN_BUFFER_ONLY 16
-#
-#  Region Manager
-#
-RTEMS_REGION_CREATE_ONLY 22
-RTEMS_REGION_IDENT_ONLY 162
-RTEMS_REGION_DELETE_ONLY 14
-RTEMS_REGION_GET_SEGMENT_AVAILABLE 19
-RTEMS_REGION_GET_SEGMENT_NOT_AVAILABLE_NO_WAIT 19
-RTEMS_REGION_GET_SEGMENT_NOT_AVAILABLE_CALLER_BLOCKS 67
-RTEMS_REGION_RETURN_SEGMENT_NO_WAITING_TASKS 17
-RTEMS_REGION_RETURN_SEGMENT_TASK_READIED_RETURNS_TO_CALLER 44
-RTEMS_REGION_RETURN_SEGMENT_TASK_READIED_PREEMPTS_CALLER 77
-#
-#  Dual-Ported Memory Manager
-#
-RTEMS_PORT_CREATE_ONLY 14
-RTEMS_PORT_IDENT_ONLY 159
-RTEMS_PORT_DELETE_ONLY 13
-RTEMS_PORT_INTERNAL_TO_EXTERNAL_ONLY 9
-RTEMS_PORT_EXTERNAL_TO_INTERNAL_ONLY 9
-#
-#  IO Manager
-#
-RTEMS_IO_INITIALIZE_ONLY 2
-RTEMS_IO_OPEN_ONLY 1
-RTEMS_IO_CLOSE_ONLY 1
-RTEMS_IO_READ_ONLY 1
-RTEMS_IO_WRITE_ONLY 1
-RTEMS_IO_CONTROL_ONLY 1
-#
-#  Rate Monotonic Manager
-#
-RTEMS_RATE_MONOTONIC_CREATE_ONLY 12
-RTEMS_RATE_MONOTONIC_IDENT_ONLY 159
-RTEMS_RATE_MONOTONIC_CANCEL_ONLY 14
-RTEMS_RATE_MONOTONIC_DELETE_ACTIVE 19
-RTEMS_RATE_MONOTONIC_DELETE_INACTIVE 16
-RTEMS_RATE_MONOTONIC_PERIOD_INITIATE_PERIOD_RETURNS_TO_CALLER 20
-RTEMS_RATE_MONOTONIC_PERIOD_CONCLUDE_PERIOD_CALLER_BLOCKS 55
-RTEMS_RATE_MONOTONIC_PERIOD_OBTAIN_STATUS 9
-#
-#  Size Information
-#
-#
-#  xxx alloted for numbers
-#
-RTEMS_DATA_SPACE 9059
-RTEMS_MINIMUM_CONFIGURATION 28,288
-RTEMS_MAXIMUM_CONFIGURATION 50,432
-#  x,xxx alloted for numbers
-RTEMS_CORE_CODE_SIZE 20,336
-RTEMS_INITIALIZATION_CODE_SIZE 1,408
-RTEMS_TASK_CODE_SIZE 4,496
-RTEMS_INTERRUPT_CODE_SIZE 72
-RTEMS_CLOCK_CODE_SIZE 576
-RTEMS_TIMER_CODE_SIZE 1,336
-RTEMS_SEMAPHORE_CODE_SIZE 1,888
-RTEMS_MESSAGE_CODE_SIZE 2,032
-RTEMS_EVENT_CODE_SIZE 1,696
-RTEMS_SIGNAL_CODE_SIZE 664
-RTEMS_PARTITION_CODE_SIZE 1,368
-RTEMS_REGION_CODE_SIZE 1,736
-RTEMS_DPMEM_CODE_SIZE 872
-RTEMS_IO_CODE_SIZE 1,144
-RTEMS_FATAL_ERROR_CODE_SIZE 32
-RTEMS_RATE_MONOTONIC_CODE_SIZE 1,656
-RTEMS_MULTIPROCESSING_CODE_SIZE 8,328
-#  xxx alloted for numbers
-RTEMS_TIMER_CODE_OPTSIZE 208
-RTEMS_SEMAPHORE_CODE_OPTSIZE 192
-RTEMS_MESSAGE_CODE_OPTSIZE 320
-RTEMS_EVENT_CODE_OPTSIZE 64
-RTEMS_SIGNAL_CODE_OPTSIZE 64
-RTEMS_PARTITION_CODE_OPTSIZE 152
-RTEMS_REGION_CODE_OPTSIZE 176
-RTEMS_DPMEM_CODE_OPTSIZE 152
-RTEMS_IO_CODE_OPTSIZE 00
-RTEMS_RATE_MONOTONIC_CODE_OPTSIZE 208
-RTEMS_MULTIPROCESSING_CODE_OPTSIZE 408
-#  xxx alloted for numbers
-RTEMS_BYTES_PER_TASK 488
-RTEMS_BYTES_PER_TIMER 68
-RTEMS_BYTES_PER_SEMAPHORE 124
-RTEMS_BYTES_PER_MESSAGE_QUEUE 148
-RTEMS_BYTES_PER_REGION 144
-RTEMS_BYTES_PER_PARTITION 56
-RTEMS_BYTES_PER_PORT 36
-RTEMS_BYTES_PER_PERIOD 36
-RTEMS_BYTES_PER_EXTENSION 64
-RTEMS_BYTES_PER_FP_TASK 136
-RTEMS_BYTES_PER_NODE 48
-RTEMS_BYTES_PER_GLOBAL_OBJECT 20
-RTEMS_BYTES_PER_PROXY 124
-#  x,xxx alloted for numbers
-RTEMS_BYTES_OF_FIXED_SYSTEM_REQUIREMENTS 10,072
diff --git a/doc/supplements/sparc/Makefile b/doc/supplements/sparc/Makefile
deleted file mode 100644
index 1e6c486747..0000000000
--- a/doc/supplements/sparc/Makefile
+++ /dev/null
@@ -1,158 +0,0 @@
-#
-#  COPYRIGHT (c) 1988-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  All rights reserved.
-#
-#  $Id$
-#
-
-PROJECT=sparc
-DISTRIBUTION_LEVEL=support
-
-include ../../Make.config
-
-REPLACE=../../tools/word-replace
-
-all: html info ps
-
-dirs:
-	$(make-dirs)
-
-COMMON_FILES=../../common/cpright.texi ../../common/setup.texi
-
-GENERATED_FILES=\
-  cpumodel.texi callconv.texi memmodel.texi intr.texi fatalerr.texi \
-  bsp.texi cputable.texi timing.texi wksheets.texi timeERC32.texi
-
-FILES= $(PROJECT).texi \
-  preface.texi \
-  $(GENERATED_FILES)
-
-INFOFILES=$(wildcard $(PROJECT) $(PROJECT)-*)
-
-info: dirs c_sparc
-	cp c_$(PROJECT) c_$(PROJECT)-* $(INFO_INSTALL)
-
-c_sparc: $(FILES)
-	$(MAKEINFO) $(PROJECT).texi
-
-dvi: $(PROJECT).dvi
-ps: dirs $(PROJECT).ps
-	
-$(PROJECT).ps: dirs $(PROJECT).dvi
-	dvips -o $(PROJECT).ps $(PROJECT).dvi
-	cp $(PROJECT).ps $(PS_INSTALL)
-
-$(PROJECT).dvi: $(FILES)
-	$(TEXI2DVI) $(PROJECT).texi
-
-html: dirs $(FILES)
-	-mkdir -p $(WWW_INSTALL)/c_$(PROJECT)
-	$(TEXI2WWW) $(TEXI2WWW_ARGS) -dir $(WWW_INSTALL)/c_$(PROJECT) \
- 	    $(PROJECT).texi
-
-clean:
-	rm -f *.o $(PROG) *.txt core 
-	rm -f *.dvi *.ps *.log *.aux *.cp *.fn *.ky *.pg *.toc *.tp *.vr $(BASE)
-	rm -f $(PROJECT) $(PROJECT)-*
-	rm -f c_$(PROJECT) c_$(PROJECT)-*
-	rm -f intr.t $(GENERATED_FILES)
-	rm -f wksheets.t wksheets_NOTIMES.t timing.t
-	rm -f timeERC32_.t timeERC32_.texi
-	rm -f *.fixed _*
-
-#
-#  Chapters which get automatic processing
-#
-
-cpumodel.texi: cpumodel.t Makefile
-	$(BMENU) -p "Preface" \
-	    -u "Top" \
-	    -n "Calling Conventions" ${*}.t
-
-callconv.texi: callconv.t Makefile
-	$(BMENU) -p "CPU Model Dependent Features CPU Model Implementation Notes" \
-	    -u "Top" \
-	    -n "Memory Model" ${*}.t
-
-memmodel.texi: memmodel.t Makefile
-	$(BMENU) -p "Calling Conventions User-Provided Routines" \
-	    -u "Top" \
-	    -n "Interrupt Processing" ${*}.t
-
-# Interrupt Chapter:
-#  1.  Replace Times and Sizes
-#  2.  Build Node Structure
-intr.t: intr_NOTIMES.t ERC32_TIMES
-	${REPLACE} -p ERC32_TIMES intr_NOTIMES.t
-	mv intr_NOTIMES.t.fixed intr.t
-
-intr.texi: intr.t Makefile
-	$(BMENU) -p "Memory Model Flat Memory Model" \
-	    -u "Top" \
-	    -n "Default Fatal Error Processing" ${*}.t
-
-fatalerr.texi: fatalerr.t Makefile
-	$(BMENU) -p "Interrupt Processing Interrupt Stack" \
-	    -u "Top" \
-	    -n "Board Support Packages" ${*}.t
-
-bsp.texi: bsp.t Makefile
-	$(BMENU) -p "Default Fatal Error Processing Default Fatal Error Handler Operations" \
-	    -u "Top" \
-	    -n "Processor Dependent Information Table" ${*}.t
-
-cputable.texi: cputable.t Makefile
-	$(BMENU) -p "Board Support Packages Processor Initialization" \
-	    -u "Top" \
-	    -n "Memory Requirements" ${*}.t
-
-
-# Worksheets Chapter:
-#  1.  Obtain the Shared File
-#  2.  Replace Times and Sizes
-#  3.  Build Node Structure
-
-wksheets_NOTIMES.t: ../../common/wksheets.t
-	cp ../../common/wksheets.t wksheets_NOTIMES.t
-
-wksheets.t: wksheets_NOTIMES.t ERC32_TIMES
-	${REPLACE} -p ERC32_TIMES wksheets_NOTIMES.t
-	mv wksheets_NOTIMES.t.fixed wksheets.t
-
-wksheets.texi: wksheets.t Makefile
-	$(BMENU) -p "Processor Dependent Information Table CPU Dependent Information Table" \
-	    -u "Top" \
-	    -n "Timing Specification" ${*}.t
-
-# Timing Specification Chapter:
-#  1.  Copy the Shared File
-#  3.  Build Node Structure
-
-timing.t: ../../common/timing.t
-	cp ../../common/timing.t timing.t
-
-timing.texi: timing.t Makefile
-	$(BMENU) -p "Memory Requirements RTEMS RAM Workspace Worksheet" \
-            -u "Top" \
-            -n "ERC32 Timing Data" ${*}.t
-
-# Timing Data for ERC32 BSP Chapter:
-#  1.  Copy the Shared File
-#  2.  Replace Times and Sizes
-#  3.  Build Node Structure
-
-timeERC32_.t: ../../common/timetbl.t timeERC32.t
-	cat timeERC32.t ../../common/timetbl.t               >timeERC32_.t
-	@echo                                               >>timeERC32_.t
-	@echo "@tex"                                        >>timeERC32_.t
-	@echo "\\global\\advance \\smallskipamount by 4pt"  >>timeERC32_.t
-	@echo "@end tex"                                    >>timeERC32_.t
-	${REPLACE} -p ERC32_TIMES timeERC32_.t
-	mv timeERC32_.t.fixed timeERC32_.t
-
-timeERC32.texi: timeERC32_.t Makefile
-	$(BMENU) -p "Timing Specification Terminology" \
-	    -u "Top" \
-	    -n "Command and Variable Index" timeERC32_.t
-	mv timeERC32_.texi timeERC32.texi
diff --git a/doc/supplements/sparc/bsp.t b/doc/supplements/sparc/bsp.t
deleted file mode 100644
index 2ba100edbd..0000000000
--- a/doc/supplements/sparc/bsp.t
+++ /dev/null
@@ -1,87 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Board Support Packages
-
-@section Introduction
-
-An RTEMS Board Support Package (BSP) must be designed
-to support a particular processor and target board combination.
-This chapter presents a discussion of SPARC specific BSP issues.
-For more information on developing a BSP, refer to the chapter
-titled Board Support Packages in the RTEMS
-Applications User's Guide.
-
-@section System Reset
-
-An RTEMS based application is initiated or
-re-initiated when the SPARC processor is reset.  When the SPARC
-is reset, the processor performs the following actions:
-
-@itemize @bullet
-@item the enable trap (ET) of the psr is set to 0 to disable
-traps,
-
-@item the supervisor bit (S) of the psr is set to 1 to enter
-supervisor mode, and
-
-@item the PC is set 0 and the nPC is set to 4.
-@end itemize
-
-The processor then begins to execute the code at
-location 0.  It is important to note that all fields in the psr
-are not explicitly set by the above steps and all other
-registers retain their value from the previous execution mode.
-This is true even of the Trap Base Register (TBR) whose contents
-reflect the last trap which occurred before the reset.
-
-@section Processor Initialization
-
-It is the responsibility of the application's
-initialization code to initialize the TBR and install trap
-handlers for at least the register window overflow and register
-window underflow conditions.  Traps should be enabled before
-invoking any subroutines to allow for register window
-management.  However, interrupts should be disabled by setting
-the Processor Interrupt Level (pil) field of the psr to 15.
-RTEMS installs it's own Trap Table as part of initialization
-which is initialized with the contents of the Trap Table in
-place when the @code{rtems_initialize_executive} directive was invoked.
-Upon completion of executive initialization, interrupts are
-enabled.
-
-If this SPARC implementation supports on-chip caching
-and this is to be utilized, then it should be enabled during the
-reset application initialization code.
-
-In addition to the requirements described in the
-Board Support Packages chapter of the @value{LANGUAGE}
-Applications User's Manual for the reset code
-which is executed before the call to
-@code{rtems_initialize_executive}, the SPARC version has the following
-specific requirements:
-
-@itemize @bullet
-@item Must leave the S bit of the status register set so that
-the SPARC remains in the supervisor state.
-
-@item Must set stack pointer (sp) such that a minimum stack
-size of MINIMUM_STACK_SIZE bytes is provided for the
-@code{rtems_initialize_executive} directive.
-
-@item Must disable all external interrupts (i.e. set the pil
-to 15).
-
-@item Must enable traps so window overflow and underflow
-conditions can be properly handled.
-
-@item Must initialize the SPARC's initial trap table with at
-least trap handlers for register window overflow and register
-window underflow.
-@end itemize
-
diff --git a/doc/supplements/sparc/callconv.t b/doc/supplements/sparc/callconv.t
deleted file mode 100644
index 030f9f9b5a..0000000000
--- a/doc/supplements/sparc/callconv.t
+++ /dev/null
@@ -1,392 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Calling Conventions
-
-@section Introduction
-
-Each high-level language compiler generates
-subroutine entry and exit code based upon a set of rules known
-as the compiler's calling convention.   These rules address the
-following issues:
-
-@itemize @bullet
-@item register preservation and usage
-
-@item parameter passing
-
-@item call and return mechanism
-@end itemize
-
-A compiler's calling convention is of importance when
-interfacing to subroutines written in another language either
-assembly or high-level.  Even when the high-level language and
-target processor are the same, different compilers may use
-different calling conventions.  As a result, calling conventions
-are both processor and compiler dependent.
-
-@section Programming Model
-
-This section discusses the programming model for the
-SPARC architecture.
-
-@subsection Non-Floating Point Registers
-
-The SPARC architecture defines thirty-two
-non-floating point registers directly visible to the programmer.
-These are divided into four sets:
-
-@itemize @bullet
-@item input registers
-
-@item local registers
-
-@item output registers
-
-@item global registers
-@end itemize
-
-Each register is referred to by either two or three
-names in the SPARC reference manuals.  First, the registers are
-referred to as r0 through r31 or with the alternate notation
-r[0] through r[31].  Second, each register is a member of one of
-the four sets listed above.  Finally, some registers have an
-architecturally defined role in the programming model which
-provides an alternate name.  The following table describes the
-mapping between the 32 registers and the register sets:
-
-@ifset use-ascii
-@example
-@group
-     +-----------------+----------------+------------------+
-     | Register Number | Register Names |   Description    |
-     +-----------------+----------------+------------------+
-     |     0 - 7       |    g0 - g7     | Global Registers |
-     +-----------------+----------------+------------------+
-     |     8 - 15      |    o0 - o7     | Output Registers |
-     +-----------------+----------------+------------------+
-     |    16 - 23      |    l0 - l7     | Local Registers  |
-     +-----------------+----------------+------------------+
-     |    24 - 31      |    i0 - i7     | Input Registers  |
-     +-----------------+----------------+------------------+
-@end group
-@end example
-@end ifset
-
-@ifset use-tex
-@sp 1
-@tex
-\centerline{\vbox{\offinterlineskip\halign{
-\vrule\strut#&
-\hbox to 1.75in{\enskip\hfil#\hfil}&
-\vrule#&
-\hbox to 1.75in{\enskip\hfil#\hfil}&
-\vrule#&
-\hbox to 1.75in{\enskip\hfil#\hfil}&
-\vrule#\cr
-\noalign{\hrule}
-&\bf Register Number &&\bf Register Names&&\bf Description&\cr\noalign{\hrule}
-&0 - 7&&g0 - g7&&Global Registers&\cr\noalign{\hrule}
-&8 - 15&&o0 - o7&&Output Registers&\cr\noalign{\hrule}
-&16 - 23&&l0 - l7&&Local Registers&\cr\noalign{\hrule}
-&24 - 31&&i0 - i7&&Input Registers&\cr\noalign{\hrule}
-}}\hfil}
-@end tex
-@end ifset
-
-@ifset use-html
-@html
-<CENTER>
-  <TABLE COLS=3 WIDTH="80%" BORDER=2>
-<TR><TD ALIGN=center><STRONG>Register Number</STRONG></TD>
-    <TD ALIGN=center><STRONG>Register Names</STRONG></TD>
-    <TD ALIGN=center><STRONG>Description</STRONG></TD>
-<TR><TD ALIGN=center>0 - 7</TD>
-    <TD ALIGN=center>g0 - g7</TD>
-    <TD ALIGN=center>Global Registers</TD></TR>
-<TR><TD ALIGN=center>8 - 15</TD>
-    <TD ALIGN=center>o0 - o7</TD>
-    <TD ALIGN=center>Output Registers</TD></TR>
-<TR><TD ALIGN=center>16 - 23</TD>
-    <TD ALIGN=center>l0 - l7</TD>
-    <TD ALIGN=center>Local Registers</TD></TR>
-<TR><TD ALIGN=center>24 - 31</TD>
-    <TD ALIGN=center>i0 - i7</TD>
-    <TD ALIGN=center>Input Registers</TD></TR>
-  </TABLE>
-</CENTER>
-@end html
-@end ifset
-
-As mentioned above, some of the registers serve
-defined roles in the programming model.  The following table
-describes the role of each of these registers:
-
-@ifset use-ascii
-@example
-@group
-     +---------------+----------------+----------------------+
-     | Register Name | Alternate Name |      Description     |
-     +---------------+----------------+----------------------+
-     |     g0        |      na        |    reads return 0    |
-     |               |                |  writes are ignored  |
-     +---------------+----------------+----------------------+
-     |     o6        |      sp        |     stack pointer    |
-     +---------------+----------------+----------------------+
-     |     i6        |      fp        |     frame pointer    |
-     +---------------+----------------+----------------------+
-     |     i7        |      na        |    return address    |
-     +---------------+----------------+----------------------+
-@end group
-@end example
-@end ifset
-
-@ifset use-tex
-@sp 1
-@tex
-\centerline{\vbox{\offinterlineskip\halign{
-\vrule\strut#&
-\hbox to 1.75in{\enskip\hfil#\hfil}&
-\vrule#&
-\hbox to 1.75in{\enskip\hfil#\hfil}&
-\vrule#&
-\hbox to 1.75in{\enskip\hfil#\hfil}&
-\vrule#\cr
-\noalign{\hrule}
-&\bf Register Name &&\bf Alternate Names&&\bf Description&\cr\noalign{\hrule}
-&g0&&NA&&reads return 0; &\cr
-&&&&&writes are ignored&\cr\noalign{\hrule}
-&o6&&sp&&stack pointer&\cr\noalign{\hrule}
-&i6&&fp&&frame pointer&\cr\noalign{\hrule}
-&i7&&NA&&return address&\cr\noalign{\hrule}
-}}\hfil}
-@end tex
-@end ifset
- 
-@ifset use-html
-@html
-<CENTER>
-  <TABLE COLS=3 WIDTH="80%" BORDER=2>
-<TR><TD ALIGN=center><STRONG>Register Name</STRONG></TD>
-    <TD ALIGN=center><STRONG>Alternate Name</STRONG></TD>
-    <TD ALIGN=center><STRONG>Description</STRONG></TD></TR>
-<TR><TD ALIGN=center>g0</TD>
-    <TD ALIGN=center>NA</TD>
-    <TD ALIGN=center>reads return 0 ; writes are ignored</TD></TR>
-<TR><TD ALIGN=center>o6</TD>
-    <TD ALIGN=center>sp</TD>
-    <TD ALIGN=center>stack pointer</TD></TR>
-<TR><TD ALIGN=center>i6</TD>
-    <TD ALIGN=center>fp</TD>
-    <TD ALIGN=center>frame pointer</TD></TR>
-<TR><TD ALIGN=center>i7</TD>
-    <TD ALIGN=center>NA</TD>
-    <TD ALIGN=center>return address</TD></TR>
-  </TABLE>
-</CENTER>
-@end html
-@end ifset
-
-
-@subsection Floating Point Registers
-
-The SPARC V7 architecture includes thirty-two,
-thirty-two bit registers.  These registers may be viewed as
-follows:
-
-@itemize @bullet
-@item 32 single precision floating point or integer registers
-(f0, f1,  ... f31)
-
-@item 16 double precision floating point registers (f0, f2,
-f4, ... f30)
-
-@item 8 extended precision floating point registers (f0, f4,
-f8, ... f28)
-@end itemize
-
-The floating point status register (fpsr) specifies
-the behavior of the floating point unit for rounding, contains
-its condition codes, version specification, and trap information.
-
-A queue of the floating point instructions which have
-started execution but not yet completed is maintained.  This
-queue is needed to support the multiple cycle nature of floating
-point operations and to aid floating point exception trap
-handlers.  Once a floating point exception has been encountered,
-the queue is frozen until it is emptied by the trap handler.
-The floating point queue is loaded by launching instructions.
-It is emptied normally when the floating point completes all
-outstanding instructions and by floating point exception
-handlers with the store double floating point queue (stdfq)
-instruction.
-
-@subsection Special Registers
-
-The SPARC architecture includes two special registers
-which are critical to the programming model: the Processor State
-Register (psr) and the Window Invalid Mask (wim).  The psr
-contains the condition codes, processor interrupt level, trap
-enable bit, supervisor mode and previous supervisor mode bits,
-version information, floating point unit and coprocessor enable
-bits, and the current window pointer (cwp).  The cwp field of
-the psr and wim register are used to manage the register windows
-in the SPARC architecture.  The register windows are discussed
-in more detail below.
-
-@section Register Windows
-
-The SPARC architecture includes the concept of
-register windows.  An overly simplistic way to think of these
-windows is to imagine them as being an infinite supply of
-"fresh" register sets available for each subroutine to use.  In
-reality, they are much more complicated.
-
-The save instruction is used to obtain a new register
-window.  This instruction decrements the current window pointer,
-thus providing a new set of registers for use.  This register
-set includes eight fresh local registers for use exclusively by
-this subroutine.  When done with a register set, the restore
-instruction increments the current window pointer and the
-previous register set is once again available.
-
-The two primary issues complicating the use of
-register windows are that (1) the set of register windows is
-finite, and (2) some registers are shared between adjacent
-registers windows.
-
-Because the set of register windows is finite, it is
-possible to execute enough save instructions without
-corresponding restore's to consume all of the register windows.
-This is easily accomplished in a high level language because
-each subroutine typically performs a save instruction upon
-entry.  Thus having a subroutine call depth greater than the
-number of register windows will result in a window overflow
-condition.  The window overflow condition generates a trap which
-must be handled in software.  The window overflow trap handler
-is responsible for saving the contents of the oldest register
-window on the program stack.
-
-Similarly, the subroutines will eventually complete
-and begin to perform restore's.  If the restore results in the
-need for a register window which has previously been written to
-memory as part of an overflow, then a window underflow condition
-results.  Just like the window overflow, the window underflow
-condition must be handled in software by a trap handler.  The
-window underflow trap handler is responsible for reloading the
-contents of the register window requested by the restore
-instruction from the program stack.
-
-The Window Invalid Mask (wim) and the Current Window
-Pointer (cwp) field in the psr are used in conjunction to manage
-the finite set of register windows and detect the window
-overflow and underflow conditions.  The cwp contains the index
-of the register window currently in use.  The save instruction
-decrements the cwp modulo the number of register windows.
-Similarly, the restore instruction increments the cwp modulo the
-number of register windows.  Each bit in the  wim represents
-represents whether a register window contains valid information.
-The value of 0 indicates the register window is valid and 1
-indicates it is invalid.  When a save instruction causes the cwp
-to point to a register window which is marked as invalid, a
-window overflow condition results.  Conversely, the restore
-instruction may result in a window underflow condition.
-
-Other than the assumption that a register window is
-always available for trap (i.e. interrupt) handlers, the SPARC
-architecture places no limits on the number of register windows
-simultaneously marked as invalid (i.e. number of bits set in the
-wim).  However, RTEMS assumes that only one register window is
-marked invalid at a time (i.e. only one bit set in the wim).
-This makes the maximum possible number of register windows
-available to the user while still meeting the requirement that
-window overflow and underflow conditions can be detected.
-
-The window overflow and window underflow trap
-handlers are a critical part of the run-time environment for a
-SPARC application.  The SPARC architectural specification allows
-for the number of register windows to be any power of two less
-than or equal to 32.  The most common choice for SPARC
-implementations appears to be 8 register windows.  This results
-in the cwp ranging in value from 0 to 7 on most implementations.
-
-
-The second complicating factor is the sharing of
-registers between adjacent register windows.  While each
-register window has its own set of local registers, the input
-and output registers are shared between adjacent windows.  The
-output registers for register window N are the same as the input
-registers for register window ((N - 1) modulo RW) where RW is
-the number of register windows.  An alternative way to think of
-this is to remember how parameters are passed to a subroutine on
-the SPARC.  The caller loads values into what are its output
-registers.  Then after the callee executes a save instruction,
-those parameters are available in its input registers.  This is
-a very efficient way to pass parameters as no data is actually
-moved by the save or restore instructions.
-
-@section Call and Return Mechanism
-
-The SPARC architecture supports a simple yet
-effective call and return mechanism.  A subroutine is invoked
-via the call (call) instruction.  This instruction places the
-return address in the caller's output register 7 (o7).  After
-the callee executes a save instruction, this value is available
-in input register 7 (i7) until the corresponding restore
-instruction is executed.
-
-The callee returns to the caller via a jmp to the
-return address.  There is a delay slot following this
-instruction which is commonly used to execute a restore
-instruction -- if a register window was allocated by this
-subroutine.
-
-It is important to note that the SPARC subroutine
-call and return mechanism does not automatically save and
-restore any registers.  This is accomplished via the save and
-restore instructions which manage the set of registers windows.
-
-@section Calling Mechanism
-
-All RTEMS directives are invoked using the regular
-SPARC calling convention via the call instruction.
-
-@section Register Usage
-
-As discussed above, the call instruction does not
-automatically save any registers.  The save and restore
-instructions are used to allocate and deallocate register
-windows.  When a register window is allocated, the new set of
-local registers are available for the exclusive use of the
-subroutine which allocated this register set.
-
-@section Parameter Passing
-
-RTEMS assumes that arguments are placed in the
-caller's output registers with the first argument in output
-register 0 (o0), the second argument in output register 1 (o1),
-and so forth.  Until the callee executes a save instruction, the
-parameters are still visible in the output registers.  After the
-callee executes a save instruction, the parameters are visible
-in the corresponding input registers.  The following pseudo-code
-illustrates the typical sequence used to call a RTEMS directive
-with three (3) arguments:
-
-@example
-load third argument into o2
-load second argument into o1
-load first argument into o0
-invoke directive
-@end example
-
-@section User-Provided Routines
-
-All user-provided routines invoked by RTEMS, such as
-user extensions, device drivers, and MPCI routines, must also
-adhere to these calling conventions.
-
diff --git a/doc/supplements/sparc/cpumodel.t b/doc/supplements/sparc/cpumodel.t
deleted file mode 100644
index 2871b08e7e..0000000000
--- a/doc/supplements/sparc/cpumodel.t
+++ /dev/null
@@ -1,128 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter CPU Model Dependent Features
-
-@section Introduction
-
-Microprocessors are generally classified into
-families with a variety of CPU models or implementations within
-that family.  Within a processor family, there is a high level
-of binary compatibility.  This family may be based on either an
-architectural specification or on maintaining compatibility with
-a popular processor.  Recent microprocessor families such as the
-SPARC or PA-RISC are based on an architectural specification
-which is independent or any particular CPU model or
-implementation.  Older families such as the M68xxx and the iX86
-evolved as the manufacturer strived to produce higher
-performance processor models which maintained binary
-compatibility with older models.
-
-RTEMS takes advantage of the similarity of the
-various models within a CPU family.  Although the models do vary
-in significant ways, the high level of compatibility makes it
-possible to share the bulk of the CPU dependent executive code
-across the entire family.
-
-@section CPU Model Feature Flags
-
-Each processor family supported by RTEMS has a
-list of features which vary between CPU models
-within a family.  For example, the most common model dependent
-feature regardless of CPU family is the presence or absence of a
-floating point unit or coprocessor.  When defining the list of
-features present on a particular CPU model, one simply notes
-that floating point hardware is or is not present and defines a
-single constant appropriately.  Conditional compilation is
-utilized to include the appropriate source code for this CPU
-model's feature set.  It is important to note that this means
-that RTEMS is thus compiled using the appropriate feature set
-and compilation flags optimal for this CPU model used.  The
-alternative would be to generate a binary which would execute on
-all family members using only the features which were always
-present.
-
-This section presents the set of features which vary
-across SPARC implementations and are of importance to RTEMS.
-The set of CPU model feature macros are defined in the file
-c/src/exec/score/cpu/sparc/sparc.h based upon the particular CPU
-model defined on the compilation command line.
-
-@subsection CPU Model Name
-
-The macro CPU_MODEL_NAME is a string which designates
-the name of this CPU model.  For example, for the European Space
-Agency's ERC32 SPARC model, this macro is set to the string
-"erc32".
-
-@subsection Floating Point Unit
-
-The macro SPARC_HAS_FPU is set to 1 to indicate that
-this CPU model has a hardware floating point unit and 0
-otherwise.
-
-@subsection Bitscan Instruction
-
-The macro SPARC_HAS_BITSCAN is set to 1 to indicate
-that this CPU model has the bitscan instruction.  For example,
-this instruction is supported by the Fujitsu SPARClite family.
-
-@subsection Number of Register Windows
-
-The macro SPARC_NUMBER_OF_REGISTER_WINDOWS is set to
-indicate the number of register window sets implemented by this
-CPU model.  The SPARC architecture allows a for a maximum of
-thirty-two register window sets although most implementations
-only include eight.
-
-@subsection Low Power Mode
-
-The macro SPARC_HAS_LOW_POWER_MODE is set to one to
-indicate that this CPU model has a low power mode.  If low power
-is enabled, then there must be CPU model specific implementation
-of the IDLE task in c/src/exec/score/cpu/sparc/cpu.c.  The low
-power mode IDLE task should be of the form:
-
-@example
-while ( TRUE ) @{
-  enter low power mode
-@}
-@end example
-
-The code required to enter low power mode is CPU model specific.
-
-@section CPU Model Implementation Notes 
-
-The ERC32 is a custom SPARC V7 implementation based on the Cypress 601/602
-chipset.  This CPU has a number of on-board peripherals and was developed by
-the European Space Agency to target space applications.  RTEMS currently
-provides support for the following peripherals:
-
-@itemize @bullet
-@item UART Channels A and B
-@item General Purpose Timer
-@item Real Time Clock
-@item Watchdog Timer (so it can be disabled)
-@item Control Register (so powerdown mode can be enabled)
-@item Memory Control Register
-@item Interrupt Control
-@end itemize
-
-The General Purpose Timer and Real Time Clock Timer provided with the ERC32
-share the Timer Control Register.  Because the Timer Control Register is write
-only, we must mirror it in software and insure that writes to one timer do not
-alter the current settings and status of the other timer.  Routines are
-provided in erc32.h which promote the view that the two timers are completely
-independent.  By exclusively using these routines to access the Timer Control
-Register, the application can view the system as having a General Purpose
-Timer Control Register and a Real Time Clock Timer Control Register
-rather than the single shared value.
-
-The RTEMS Idle thread take advantage of the low power mode provided by the
-ERC32.  Low power mode is entered during idle loops and is enabled at
-initialization time.
diff --git a/doc/supplements/sparc/cputable.t b/doc/supplements/sparc/cputable.t
deleted file mode 100644
index 4e37375c9c..0000000000
--- a/doc/supplements/sparc/cputable.t
+++ /dev/null
@@ -1,104 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Processor Dependent Information Table
-
-@section Introduction
-
-Any highly processor dependent information required
-to describe a processor to RTEMS is provided in the CPU
-Dependent Information Table.  This table is not required for all
-processors supported by RTEMS.  This chapter describes the
-contents, if any, for a particular processor type.
-
-@section CPU Dependent Information Table
-
-The SPARC version of the RTEMS CPU Dependent
-Information Table is given by the C structure definition is
-shown below:
-
-@example
-@group
-typedef struct @{
-  void       (*pretasking_hook)( void );
-  void       (*predriver_hook)( void );
-  void       (*postdriver_hook)( void );
-  void       (*idle_task)( void );
-  boolean      do_zero_of_workspace;
-  unsigned32   idle_task_stack_size;
-  unsigned32   interrupt_stack_size;
-  unsigned32   extra_mpci_receive_server_stack;
-  void *     (*stack_allocate_hook)( unsigned32 );
-  void       (*stack_free_hook)( void* );
-  /* end of fields required on all CPUs */
-
-@} rtems_cpu_table;
-@end group
-@end example
-
-@table @code
-@item pretasking_hook
-is the address of the
-user provided routine which is invoked once RTEMS initialization
-is complete but before interrupts and tasking are enabled.  This
-field may be NULL to indicate that the hook is not utilized.
-
-@item predriver_hook
-is the address of the user provided
-routine which is invoked with tasking enabled immediately before
-the MPCI and device drivers are initialized. RTEMS
-initialization is complete, interrupts and tasking are enabled,
-but no device drivers are initialized.  This field may be NULL to
-indicate that the hook is not utilized.
-
-@item postdriver_hook
-is the address of the user provided
-routine which is invoked with tasking enabled immediately after
-the MPCI and device drivers are initialized. RTEMS
-initialization is complete, interrupts and tasking are enabled,
-and the device drivers are initialized.  This field may be NULL
-to indicate that the hook is not utilized.
-
-@item idle_task
-is the address of the optional user
-provided routine which is used as the system's IDLE task.  If
-this field is not NULL, then the RTEMS default IDLE task is not
-used.  This field may be NULL to indicate that the default IDLE
-is to be used.
-
-@item do_zero_of_workspace
-indicates whether RTEMS should
-zero the Workspace as part of its initialization.  If set to
-TRUE, the Workspace is zeroed.  Otherwise, it is not.
-
-@item idle_task_stack_size
-is the size of the RTEMS idle task stack in bytes.  
-If this number is less than MINIMUM_STACK_SIZE, then the 
-idle task's stack will be MINIMUM_STACK_SIZE in byte.
-
-@item interrupt_stack_size
-is the size of the RTEMS allocated interrupt stack in bytes.
-This value must be at least as large as MINIMUM_STACK_SIZE.
-
-@item extra_mpci_receive_server_stack
-is the extra stack space allocated for the RTEMS MPCI receive server task
-in bytes.  The MPCI receive server may invoke nearly all directives and 
-may require extra stack space on some targets.
-
-@item stack_allocate_hook
-is the address of the optional user provided routine which allocates 
-memory for task stacks.  If this hook is not NULL, then a stack_free_hook
-must be provided as well.
-
-@item stack_free_hook
-is the address of the optional user provided routine which frees 
-memory for task stacks.  If this hook is not NULL, then a stack_allocate_hook
-must be provided as well.
-
-@end table
-
diff --git a/doc/supplements/sparc/fatalerr.t b/doc/supplements/sparc/fatalerr.t
deleted file mode 100644
index eb035b3596..0000000000
--- a/doc/supplements/sparc/fatalerr.t
+++ /dev/null
@@ -1,32 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Default Fatal Error Processing
-
-@section Introduction
-
-Upon detection of a fatal error by either the
-application or RTEMS the fatal error manager is invoked.  The
-fatal error manager will invoke the user-supplied fatal error
-handlers.  If no user-supplied handlers are configured,  the
-RTEMS provided default fatal error handler is invoked.  If the
-user-supplied fatal error handlers return to the executive the
-default fatal error handler is then invoked.  This chapter
-describes the precise operations of the default fatal error
-handler.
-
-@section Default Fatal Error Handler Operations
-
-The default fatal error handler which is invoked by
-the fatal_error_occurred directive when there is no user handler
-configured or the user handler returns control to RTEMS.  The
-default fatal error handler disables processor interrupts to
-level 15, places the error code in g1, and goes into an infinite
-loop to simulate a halt processor instruction.
-
-
diff --git a/doc/supplements/sparc/intr_NOTIMES.t b/doc/supplements/sparc/intr_NOTIMES.t
deleted file mode 100644
index 4a4b0086a2..0000000000
--- a/doc/supplements/sparc/intr_NOTIMES.t
+++ /dev/null
@@ -1,199 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Interrupt Processing
-
-@section Introduction
-
-Different types of processors respond to the
-occurrence of an interrupt in its own unique fashion. In
-addition, each processor type provides a control mechanism to
-allow for the proper handling of an interrupt.  The processor
-dependent response to the interrupt modifies the current
-execution state and results in a change in the execution stream.
-Most processors require that an interrupt handler utilize some
-special control mechanisms to return to the normal processing
-stream.  Although RTEMS hides many of the processor dependent
-details of interrupt processing, it is important to understand
-how the RTEMS interrupt manager is mapped onto the processor's
-unique architecture. Discussed in this chapter are the SPARC's
-interrupt response and control mechanisms as they pertain to
-RTEMS.
-
-RTEMS and associated documentation uses the terms
-interrupt and vector.  In the SPARC architecture, these terms
-correspond to traps and trap type, respectively.  The terms will
-be used interchangeably in this manual.
-
-@section Synchronous Versus Asynchronous Traps
-
-The SPARC architecture includes two classes of traps:
-synchronous and asynchronous.  Asynchronous traps occur when an
-external event interrupts the processor.  These traps are not
-associated with any instruction executed by the processor and
-logically occur between instructions.  The instruction currently
-in the execute stage of the processor is allowed to complete
-although subsequent instructions are annulled.  The return
-address reported by the processor for asynchronous traps is the
-pair of instructions following the current instruction.
-
-Synchronous traps are caused by the actions of an
-instruction.  The trap stimulus in this case either occurs
-internally to the processor or is from an external signal that
-was provoked by the instruction.  These traps are taken
-immediately and the instruction that caused the trap is aborted
-before any state changes occur in the processor itself.   The
-return address reported by the processor for synchronous traps
-is the instruction which caused the trap and the following
-instruction.
-
-@section Vectoring of Interrupt Handler
-
-Upon receipt of an interrupt the SPARC automatically
-performs the following actions:
-
-@itemize @bullet
-@item disables traps (sets the ET bit of the psr to 0),
-
-@item the S bit of the psr is copied into the Previous
-Supervisor Mode (PS) bit of the psr,
-
-@item the cwp is decremented by one (modulo the number of
-register windows) to activate a trap window,
-
-@item the PC and nPC are loaded into local register 1 and 2
-(l0 and l1),
-
-@item the trap type (tt) field of the Trap Base Register (TBR)
-is set to the appropriate value, and
-
-@item if the trap is not a reset, then the PC is written with
-the contents of the TBR and the nPC is written with TBR + 4.  If
-the trap is a reset, then the PC is set to zero and the nPC is
-set to 4.
-@end itemize
-
-Trap processing on the SPARC has two features which
-are noticeably different than interrupt processing on other
-architectures.  First, the value of psr register in effect
-immediately before the trap occurred is not explicitly saved.
-Instead only reversible alterations are made to it.  Second, the
-Processor Interrupt Level (pil) is not set to correspond to that
-of the interrupt being processed.  When a trap occurs, ALL
-subsequent traps are disabled.  In order to safely invoke a
-subroutine during trap handling, traps must be enabled to allow
-for the possibility of register window overflow and underflow
-traps.
-
-If the interrupt handler was installed as an RTEMS
-interrupt handler, then upon receipt of the interrupt, the
-processor passes control to the RTEMS interrupt handler which
-performs the following actions:
-
-@itemize @bullet
-@item saves the state of the interrupted task on it's stack,
-
-@item insures that a register window is available for
-subsequent traps,
-
-@item if this is the outermost (i.e. non-nested) interrupt,
-then the RTEMS interrupt handler switches from the current stack
-to the interrupt stack,
-
-@item enables traps,
-
-@item invokes the vectors to a user interrupt service routine (ISR).
-@end itemize
-
-Asynchronous interrupts are ignored while traps are
-disabled.  Synchronous traps which occur while traps are
-disabled result in the CPU being forced into an error mode.
-
-A nested interrupt is processed similarly with the
-exception that the current stack need not be switched to the
-interrupt stack.
-
-@section Traps and Register Windows
-
-One of the register windows must be reserved at all
-times for trap processing.  This is critical to the proper
-operation of the trap mechanism in the SPARC architecture.  It
-is the responsibility of the trap handler to insure that there
-is a register window available for a subsequent trap before
-re-enabling traps.  It is likely that any high level language
-routines invoked by the trap handler (such as a user-provided
-RTEMS interrupt handler) will allocate a new register window.
-The save operation could result in a window overflow trap.  This
-trap cannot be correctly processed unless (1) traps are enabled
-and (2) a register window is reserved for traps.  Thus, the
-RTEMS interrupt handler insures that a register window is
-available for subsequent traps before enabling traps and
-invoking the user's interrupt handler.
-
-@section Interrupt Levels
-
-Sixteen levels (0-15) of interrupt priorities are
-supported by the SPARC architecture with level fifteen (15)
-being the highest priority.  Level zero (0) indicates that
-interrupts are fully enabled.  Interrupt requests for interrupts
-with priorities less than or equal to the current interrupt mask
-level are ignored.
-
-Although RTEMS supports 256 interrupt levels, the
-SPARC only supports sixteen.  RTEMS interrupt levels 0 through
-15 directly correspond to SPARC processor interrupt levels.  All
-other RTEMS interrupt levels are undefined and their behavior is
-unpredictable.
-
-@section Disabling of Interrupts by RTEMS
-
-During the execution of directive calls, critical
-sections of code may be executed.  When these sections are
-encountered, RTEMS disables interrupts to level seven (15)
-before the execution of this section and restores them to the
-previous level upon completion of the section.  RTEMS has been
-optimized to insure that interrupts are disabled for less than
-RTEMS_MAXIMUM_DISABLE_PERIOD microseconds on a RTEMS_MAXIMUM_DISABLE_PERIOD_MHZ 
-Mhz ERC32 with zero wait states.
-These numbers will vary based the number of wait states and
-processor speed present on the target board.
-[NOTE:  The maximum period with interrupts disabled is hand calculated.  This
-calculation was last performed for Release 
-RTEMS_RELEASE_FOR_MAXIMUM_DISABLE_PERIOD.]
-
-[NOTE: It is thought that the length of time at which
-the processor interrupt level is elevated to fifteen by RTEMS is
-not anywhere near as long as the length of time ALL traps are
-disabled as part of the "flush all register windows" operation.]
-
-Non-maskable interrupts (NMI) cannot be disabled, and
-ISRs which execute at this level MUST NEVER issue RTEMS system
-calls.  If a directive is invoked, unpredictable results may
-occur due to the inability of RTEMS to protect its critical
-sections.  However, ISRs that make no system calls may safely
-execute as non-maskable interrupts.
-
-@section Interrupt Stack
-
-The SPARC architecture does not provide for a
-dedicated interrupt stack.  Thus by default, trap handlers would
-execute on the stack of the RTEMS task which they interrupted.
-This artificially inflates the stack requirements for each task
-since EVERY task stack would have to include enough space to
-account for the worst case interrupt stack requirements in
-addition to it's own worst case usage.  RTEMS addresses this
-problem on the SPARC by providing a dedicated interrupt stack
-managed by software.
-
-During system initialization, RTEMS allocates the
-interrupt stack from the Workspace Area.  The amount of memory
-allocated for the interrupt stack is determined by the
-interrupt_stack_size field in the CPU Configuration Table.  As
-part of processing a non-nested interrupt, RTEMS will switch to
-the interrupt stack before invoking the installed handler.
-
diff --git a/doc/supplements/sparc/memmodel.t b/doc/supplements/sparc/memmodel.t
deleted file mode 100644
index 3c7ae7b4e9..0000000000
--- a/doc/supplements/sparc/memmodel.t
+++ /dev/null
@@ -1,104 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Memory Model
-
-@section Introduction
-
-A processor may support any combination of memory
-models ranging from pure physical addressing to complex demand
-paged virtual memory systems.  RTEMS supports a flat memory
-model which ranges contiguously over the processor's allowable
-address space.  RTEMS does not support segmentation or virtual
-memory of any kind.  The appropriate memory model for RTEMS
-provided by the targeted processor and related characteristics
-of that model are described in this chapter.
-
-@section Flat Memory Model
-
-The SPARC architecture supports a flat 32-bit address
-space with addresses ranging from 0x00000000 to 0xFFFFFFFF (4
-gigabytes).  Each address is represented by a 32-bit value and
-is byte addressable.  The address may be used to reference a
-single byte, half-word (2-bytes), word (4 bytes), or doubleword
-(8 bytes).  Memory accesses within this address space are
-performed in big endian fashion by the SPARC.  Memory accesses
-which are not properly aligned generate a "memory address not
-aligned" trap (type number 7).  The following table lists the
-alignment requirements for a variety of data accesses:
-
-@ifset use-ascii
-@example
-@group
-          +--------------+-----------------------+
-          |   Data Type  | Alignment Requirement |
-          +--------------+-----------------------+
-          |     byte     |          1            |
-          |   half-word  |          2            |
-          |     word     |          4            |
-          |  doubleword  |          8            |
-          +--------------+-----------------------+
-@end group
-@end example
-@end ifset
-
-@ifset use-tex
-@sp 1
-@tex
-\centerline{\vbox{\offinterlineskip\halign{
-\vrule\strut#&
-\hbox to 1.75in{\enskip\hfil#\hfil}&
-\vrule#&
-\hbox to 1.75in{\enskip\hfil#\hfil}&
-\vrule#\cr
-\noalign{\hrule}
-&\bf Data Type &&\bf Alignment Requirement&\cr\noalign{\hrule}
-&byte&&1&\cr\noalign{\hrule}
-&half-word&&2&\cr\noalign{\hrule}
-&word&&4&\cr\noalign{\hrule}
-&doubleword&&8&\cr\noalign{\hrule}
-}}\hfil}
-@end tex
-@end ifset
- 
-@ifset use-html
-@html
-<CENTER>
-  <TABLE COLS=2 WIDTH="60%" BORDER=2>
-<TR><TD ALIGN=center><STRONG>Data Type</STRONG></TD>
-    <TD ALIGN=center><STRONG>Alignment Requirement</STRONG></TD></TR>
-<TR><TD ALIGN=center>byte</TD>
-    <TD ALIGN=center>1</TD></TR>
-<TR><TD ALIGN=center>half-word</TD>
-    <TD ALIGN=center>2</TD></TR>
-<TR><TD ALIGN=center>word</TD>
-    <TD ALIGN=center>4</TD></TR>
-<TR><TD ALIGN=center>doubleword</TD>
-    <TD ALIGN=center>8</TD></TR>
-  </TABLE>
-</CENTER>
-@end html
-@end ifset
-
-Doubleword load and store operations must use a pair
-of registers as their source or destination.  This pair of
-registers must be an adjacent pair of registers with the first
-of the pair being even numbered.  For example, a valid
-destination for a doubleword load might be input registers 0 and
-1 (i0 and i1).  The pair i1 and i2 would be invalid.  [NOTE:
-Some assemblers for the SPARC do not generate an error if an odd
-numbered register is specified as the beginning register of the
-pair.  In this case, the assembler assumes that what the
-programmer meant was to use the even-odd pair which ends at the
-specified register.  This may or may not have been a correct
-assumption.]
-
-RTEMS does not support any SPARC Memory Management
-Units, therefore, virtual memory or segmentation systems
-involving the SPARC are not supported.
-
diff --git a/doc/supplements/sparc/preface.texi b/doc/supplements/sparc/preface.texi
deleted file mode 100644
index e3d80cc43e..0000000000
--- a/doc/supplements/sparc/preface.texi
+++ /dev/null
@@ -1,91 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@ifinfo
-@node Preface, CPU Model Dependent Features, Top, Top
-@end ifinfo
-@unnumbered Preface
-
-The Real Time Executive for Multiprocessor Systems
-(RTEMS) is designed to be portable across multiple processor
-architectures.  However, the nature of real-time systems makes
-it essential that the application designer understand certain
-processor dependent implementation details.  These processor
-dependencies include calling convention, board support package
-issues, interrupt processing, exact RTEMS memory requirements,
-performance data, header files, and the assembly language
-interface to the executive.
-
-This document discusses the SPARC architecture
-dependencies in this port of RTEMS.  Currently, only
-implementations of SPARC Version 7 are supported by RTEMS.
-
-It is highly recommended that the SPARC RTEMS
-application developer obtain and become familiar with the
-documentation for the processor being used as well as the
-specification for the revision of the SPARC architecture which
-corresponds to that processor.
-
-@subheading SPARC Architecture Documents
-
-For information on the SPARC architecture, refer to
-the following documents available from SPARC International, Inc.
-(http://www.sparc.com):
-
-@itemize @bullet
-@item SPARC Standard Version 7.
-
-@item SPARC Standard Version 8.
-
-@item SPARC Standard Version 9.
-@end itemize
-
-@subheading ERC32 Specific Information
-
-The European Space Agency's ERC32 is a three chip
-computing core implementing a SPARC V7 processor and associated
-support circuitry for embedded space applications. The integer
-and floating-point units (90C601E & 90C602E) are based on the
-Cypress 7C601 and 7C602, with additional error-detection and
-recovery functions. The memory controller (MEC) implements
-system support functions such as address decoding, memory
-interface, DMA interface, UARTs, timers, interrupt control,
-write-protection, memory reconfiguration and error-detection.
-The core is designed to work at 25MHz, but using space qualified
-memories limits the system frequency to around 15 MHz, resulting
-in a performance of 10 MIPS and 2 MFLOPS.
-
-Information on the ERC32 and a number of development
-support tools, such as the SPARC Instruction Simulator (SIS),
-are freely available on the Internet.  The following documents
-and SIS are available via anonymous ftp or pointing your web
-browser at ftp://ftp.estec.esa.nl/pub/ws/wsd/erc32.
-
-@itemize @bullet
-@item ERC32 System Design Document
-
-@item MEC Device Specification
-@end itemize
-
-Additionally, the SPARC RISC User's Guide from Matra
-MHS documents the functionality of the integer and floating
-point units including the instruction set information.  To
-obtain this document as well as ERC32 components and VHDL models
-contact:
-
-@example
-Matra MHS SA
-3 Avenue du Centre, BP 309,
-78054 St-Quentin-en-Yvelines,
-Cedex, France
-VOICE: +31-1-30607087
-FAX: +31-1-30640693
-@end example
-
-Amar Guennon (amar.guennon@@matramhs.fr) is familiar with the ERC32.
-
diff --git a/doc/supplements/sparc/sparc.texi b/doc/supplements/sparc/sparc.texi
deleted file mode 100644
index f00e2aa8b7..0000000000
--- a/doc/supplements/sparc/sparc.texi
+++ /dev/null
@@ -1,119 +0,0 @@
-\input ../../texinfo/texinfo   @c -*-texinfo-*-
-@c %**start of header
-@setfilename c_sparc
-@syncodeindex vr fn
-@synindex ky cp
-@paragraphindent 0
-@c @smallbook
-@c %**end of header
-
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@c
-@c   Master file for the SPARC Applications Supplement
-@c
-
-@include ../../common/setup.texi
-
-@ignore
-@ifinfo
-@format
-START-INFO-DIR-ENTRY
-* RTEMS SPARC Applications Supplement (sparc):
-END-INFO-DIR-ENTRY
-@end format
-@end ifinfo
-@end ignore
-
-@c
-@c  Title Page Stuff
-@c
-
-@set edition @value{RTEMS-EDITION}
-@set version @value{RTEMS-VERSION}
-@set update-date @value{RTEMS-UPDATE-DATE}
-@set update-month @value{RTEMS-UPDATE-MONTH}
-
-@c
-@c  I don't really like having a short title page.  --joel
-@c
-@c @shorttitlepage RTEMS SPARC Applications Supplement 
-
-@setchapternewpage odd
-@settitle RTEMS SPARC Applications Supplement 
-@titlepage
-@finalout
-
-@title RTEMS SPARC Applications Supplement 
-@subtitle Edition @value{edition}, for RTEMS @value{version}
-@sp 1
-@subtitle @value{update-month}
-@author On-Line Applications Research Corporation
-@page
-@include ../../common/cpright.texi
-@end titlepage
-
-@c  This prevents a black box from being printed on "overflow" lines.
-@c  The alternative is to rework a sentence to avoid this problem.
-
-@include preface.texi
-@include cpumodel.texi
-@include callconv.texi
-@include memmodel.texi
-@include intr.texi
-@include fatalerr.texi
-@include bsp.texi
-@include cputable.texi
-@include wksheets.texi
-@include timing.texi
-@include timeERC32.texi
-@ifinfo
-@node Top, Preface, (dir), (dir)
-@top c_sparc
-
-This is the online version of the RTEMS SPARC Applications Supplement.
-
-@menu
-* Preface::
-* CPU Model Dependent Features::
-* Calling Conventions::
-* Memory Model::
-* Interrupt Processing::
-* Default Fatal Error Processing::
-* Board Support Packages::
-* Processor Dependent Information Table::
-* Memory Requirements::
-* Timing Specification::
-* ERC32 Timing Data::
-* Command and Variable Index::
-* Concept Index::
-@end menu
-
-@end ifinfo
-@c 
-@c 
-@c Need to copy the emacs stuff and "trailer stuff" (index, toc) into here
-@c
-
-@node Command and Variable Index, Concept Index, ERC32 Timing Data Rate Monotonic Manager, Top
-@unnumbered Command and Variable Index
-
-There are currently no Command and Variable Index entries.
-
-@c @printindex fn
-
-@node Concept Index, , Command and Variable Index, Top
-@unnumbered Concept Index
-
-There are currently no Concept Index entries.
-@c @printindex cp
-
-@c @contents
-@bye
-
diff --git a/doc/supplements/sparc/timeERC32.t b/doc/supplements/sparc/timeERC32.t
deleted file mode 100644
index dd2d12edbc..0000000000
--- a/doc/supplements/sparc/timeERC32.t
+++ /dev/null
@@ -1,120 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@include ../../common/timemac.texi
-@tex
-\global\advance \smallskipamount by -4pt
-@end tex
-
-@chapter ERC32 Timing Data
-
-@section Introduction
-
-The timing data for RTEMS on the ERC32 implementation
-of the SPARC architecture is provided along with the target
-dependent aspects concerning the gathering of the timing data.
-The hardware platform used to gather the times is described to
-give the reader a better understanding of each directive time
-provided.  Also, provided is a description of the interrupt
-latency and the context switch times as they pertain to the
-SPARC version of RTEMS.
-
-@section Hardware Platform
-
-All times reported in this chapter were measured
-using the SPARC Instruction Simulator (SIS) developed by the
-European Space Agency.  SIS simulates the ERC32 -- a custom low
-power implementation combining the Cypress 90C601 integer unit,
-the Cypress 90C602 floating point unit, and a number of
-peripherals such as counter timers, interrupt controller and a
-memory controller.
-
-For the RTEMS tests, SIS is configured with the
-following characteristics:
-
-@itemize @bullet
-@item 15 Mhz clock speed
-
-@item 0 wait states for PROM accesses
-
-@item 0 wait states for RAM accesses
-@end itemize
-
-The ERC32's General Purpose Timer was used to gather
-all timing information.  This timer was programmed to operate
-with one microsecond accuracy.  All sources of hardware
-interrupts were disabled, although traps were enabled and the
-interrupt level of the SPARC allows all interrupts.
-
-@section Interrupt Latency
-
-The maximum period with traps disabled or the
-processor interrupt level set to it's highest value inside RTEMS
-is less than RTEMS_MAXIMUM_DISABLE_PERIOD
-microseconds including the instructions which
-disable and re-enable interrupts.  The time required for the
-ERC32 to vector an interrupt and for the RTEMS entry overhead
-before invoking the user's trap handler are a total of 
-RTEMS_INTR_ENTRY_RETURNS_TO_PREEMPTING_TASK
-microseconds.  These combine to yield a worst case interrupt
-latency of less than RTEMS_MAXIMUM_DISABLE_PERIOD +
-RTEMS_INTR_ENTRY_RETURNS_TO_PREEMPTING_TASK microseconds at 
-RTEMS_MAXIMUM_DISABLE_PERIOD_MHZ Mhz.
-[NOTE:  The maximum period with interrupts disabled was last
-determined for Release RTEMS_RELEASE_FOR_MAXIMUM_DISABLE_PERIOD.]
-
-The maximum period with interrupts disabled within
-RTEMS is hand-timed with some assistance from SIS.  The maximum
-period with interrupts disabled with RTEMS occurs during a
-context switch when traps are disabled to flush all the register
-windows to memory.  The length of time spent flushing the
-register windows varies based on the number of windows which
-must be flushed.  Based on the information reported by SIS, it
-takes from 4.0 to 18.0 microseconds (37 to 122 instructions) to
-flush the register windows.  It takes approximately 41 CPU
-cycles (2.73 microseconds) to flush each register window set to
-memory.  The register window flush operation is heavily memory
-bound.
-
-[NOTE: All traps are disabled during the register
-window flush thus disabling both software generate traps and
-external interrupts.  During a normal RTEMS critical section,
-the processor interrupt level (pil) is raised to level 15 and
-traps are left enabled.  The longest path for a normal critical
-section within RTEMS is less than 50 instructions.]
-
-The interrupt vector and entry overhead time was
-generated on the SIS benchmark platform using the ERC32's
-ability to forcibly generate an arbitrary interrupt as the
-source of the "benchmark" interrupt.
-
-@section Context Switch
-
-The RTEMS processor context switch time is 10
-microseconds on the SIS benchmark platform when no floating
-point context is saved or restored.  Additional execution time
-is required when a TASK_SWITCH user extension is configured.
-The use of the TASK_SWITCH extension is application dependent.
-Thus, its execution time is not considered part of the raw
-context switch time.
-
-Since RTEMS was designed specifically for embedded
-missile applications which are floating point intensive, the
-executive is optimized to avoid unnecessarily saving and
-restoring the state of the numeric coprocessor.  The state of
-the numeric coprocessor is only saved when an FLOATING_POINT
-task is dispatched and that task was not the last task to
-utilize the coprocessor.  In a system with only one
-FLOATING_POINT task, the state of the numeric coprocessor will
-never be saved or restored.  When the first FLOATING_POINT task
-is dispatched, RTEMS does not need to save the current state of
-the numeric coprocessor.
-
-The following table summarizes the context switch
-times for the ERC32 benchmark platform:
-
diff --git a/doc/supplements/template/BSP_TIMES b/doc/supplements/template/BSP_TIMES
deleted file mode 100644
index c80ed37148..0000000000
--- a/doc/supplements/template/BSP_TIMES
+++ /dev/null
@@ -1,247 +0,0 @@
-#
-#  CPU MODEL/BSP Timing and Size Information
-#
-#  $Id$
-#
-
-#
-#  CPU Model Information
-#
-RTEMS_BSP       BSP_FOR_TIMES
-RTEMS_CPU_MODEL BSP_CPU_MODEL
-#
-#  Interrupt Latency
-#
-#  NOTE:  In general, the text says it is hand-calculated to be
-#         RTEMS_MAXIMUM_DISABLE_PERIOD at RTEMS_MAXIMUM_DISABLE_PERIOD_MHZ
-#         Mhz and this was last calculated for Release 
-#         RTEMS_VERSION_FOR_MAXIMUM_DISABLE_PERIOD.
-#
-RTEMS_MAXIMUM_DISABLE_PERIOD TBD
-RTEMS_MAXIMUM_DISABLE_PERIOD_MHZ 20
-RTEMS_RELEASE_FOR_MAXIMUM_DISABLE_PERIOD 4.0.0
-#
-#  Context Switch Times
-#
-RTEMS_NO_FP_CONTEXTS 35
-RTEMS_RESTORE_1ST_FP_TASK 39
-RTEMS_SAVE_INIT_RESTORE_INIT 66
-RTEMS_SAVE_IDLE_RESTORE_INIT 66
-RTEMS_SAVE_IDLE_RESTORE_IDLE 68
-#
-#  Task Manager Times
-#
-RTEMS_TASK_CREATE_ONLY 148
-RTEMS_TASK_IDENT_ONLY 350
-RTEMS_TASK_START_ONLY 76
-RTEMS_TASK_RESTART_CALLING_TASK 95
-RTEMS_TASK_RESTART_SUSPENDED_RETURNS_TO_CALLER 89
-RTEMS_TASK_RESTART_BLOCKED_RETURNS_TO_CALLER 124
-RTEMS_TASK_RESTART_READY_RETURNS_TO_CALLER 92
-RTEMS_TASK_RESTART_SUSPENDED_PREEMPTS_CALLER 125
-RTEMS_TASK_RESTART_BLOCKED_PREEMPTS_CALLER 149
-RTEMS_TASK_RESTART_READY_PREEMPTS_CALLER 142
-RTEMS_TASK_DELETE_CALLING_TASK 170
-RTEMS_TASK_DELETE_SUSPENDED_TASK 138
-RTEMS_TASK_DELETE_BLOCKED_TASK 143
-RTEMS_TASK_DELETE_READY_TASK 144
-RTEMS_TASK_SUSPEND_CALLING_TASK 71
-RTEMS_TASK_SUSPEND_RETURNS_TO_CALLER 43
-RTEMS_TASK_RESUME_TASK_READIED_RETURNS_TO_CALLER 45
-RTEMS_TASK_RESUME_TASK_READIED_PREEMPTS_CALLER 67
-RTEMS_TASK_SET_PRIORITY_OBTAIN_CURRENT_PRIORITY 31
-RTEMS_TASK_SET_PRIORITY_RETURNS_TO_CALLER 64
-RTEMS_TASK_SET_PRIORITY_PREEMPTS_CALLER 106
-RTEMS_TASK_MODE_OBTAIN_CURRENT_MODE 14
-RTEMS_TASK_MODE_NO_RESCHEDULE 16
-RTEMS_TASK_MODE_RESCHEDULE_RETURNS_TO_CALLER 23
-RTEMS_TASK_MODE_RESCHEDULE_PREEMPTS_CALLER 60
-RTEMS_TASK_GET_NOTE_ONLY 33
-RTEMS_TASK_SET_NOTE_ONLY 33
-RTEMS_TASK_WAKE_AFTER_YIELD_RETURNS_TO_CALLER 16
-RTEMS_TASK_WAKE_AFTER_YIELD_PREEMPTS_CALLER 56
-RTEMS_TASK_WAKE_WHEN_ONLY 117
-#
-#  Interrupt Manager
-#
-RTEMS_INTR_ENTRY_RETURNS_TO_NESTED 12
-RTEMS_INTR_ENTRY_RETURNS_TO_INTERRUPTED_TASK 9
-RTEMS_INTR_ENTRY_RETURNS_TO_PREEMPTING_TASK 9
-RTEMS_INTR_EXIT_RETURNS_TO_NESTED <1
-RTEMS_INTR_EXIT_RETURNS_TO_INTERRUPTED_TASK 8
-RTEMS_INTR_EXIT_RETURNS_TO_PREEMPTING_TASK 54
-#
-#  Clock Manager
-#
-RTEMS_CLOCK_SET_ONLY 86
-RTEMS_CLOCK_GET_ONLY 1
-RTEMS_CLOCK_TICK_ONLY 17
-#
-#  Timer Manager
-#
-RTEMS_TIMER_CREATE_ONLY 28
-RTEMS_TIMER_IDENT_ONLY 343
-RTEMS_TIMER_DELETE_INACTIVE 43
-RTEMS_TIMER_DELETE_ACTIVE 47
-RTEMS_TIMER_FIRE_AFTER_INACTIVE 58
-RTEMS_TIMER_FIRE_AFTER_ACTIVE 61
-RTEMS_TIMER_FIRE_WHEN_INACTIVE 88
-RTEMS_TIMER_FIRE_WHEN_ACTIVE 88
-RTEMS_TIMER_RESET_INACTIVE 54
-RTEMS_TIMER_RESET_ACTIVE 58
-RTEMS_TIMER_CANCEL_INACTIVE 31
-RTEMS_TIMER_CANCEL_ACTIVE 34
-#
-#  Semaphore Manager
-#
-RTEMS_SEMAPHORE_CREATE_ONLY 60
-RTEMS_SEMAPHORE_IDENT_ONLY 367
-RTEMS_SEMAPHORE_DELETE_ONLY 58
-RTEMS_SEMAPHORE_OBTAIN_AVAILABLE 38
-RTEMS_SEMAPHORE_OBTAIN_NOT_AVAILABLE_NO_WAIT 38
-RTEMS_SEMAPHORE_OBTAIN_NOT_AVAILABLE_CALLER_BLOCKS 109
-RTEMS_SEMAPHORE_RELEASE_NO_WAITING_TASKS 44
-RTEMS_SEMAPHORE_RELEASE_TASK_READIED_RETURNS_TO_CALLER 66
-RTEMS_SEMAPHORE_RELEASE_TASK_READIED_PREEMPTS_CALLER 87
-#
-#  Message Manager
-#
-RTEMS_MESSAGE_QUEUE_CREATE_ONLY 200
-RTEMS_MESSAGE_QUEUE_IDENT_ONLY 341
-RTEMS_MESSAGE_QUEUE_DELETE_ONLY 80
-RTEMS_MESSAGE_QUEUE_SEND_NO_WAITING_TASKS 97
-RTEMS_MESSAGE_QUEUE_SEND_TASK_READIED_RETURNS_TO_CALLER 101
-RTEMS_MESSAGE_QUEUE_SEND_TASK_READIED_PREEMPTS_CALLER 123
-RTEMS_MESSAGE_QUEUE_URGENT_NO_WAITING_TASKS 96
-RTEMS_MESSAGE_QUEUE_URGENT_TASK_READIED_RETURNS_TO_CALLER 101
-RTEMS_MESSAGE_QUEUE_URGENT_TASK_READIED_PREEMPTS_CALLER 123
-RTEMS_MESSAGE_QUEUE_BROADCAST_NO_WAITING_TASKS 53
-RTEMS_MESSAGE_QUEUE_BROADCAST_TASK_READIED_RETURNS_TO_CALLER 111
-RTEMS_MESSAGE_QUEUE_BROADCAST_TASK_READIED_PREEMPTS_CALLER 133
-RTEMS_MESSAGE_QUEUE_RECEIVE_AVAILABLE 79
-RTEMS_MESSAGE_QUEUE_RECEIVE_NOT_AVAILABLE_NO_WAIT 43
-RTEMS_MESSAGE_QUEUE_RECEIVE_NOT_AVAILABLE_CALLER_BLOCKS 114
-RTEMS_MESSAGE_QUEUE_FLUSH_NO_MESSAGES_FLUSHED 29
-RTEMS_MESSAGE_QUEUE_FLUSH_MESSAGES_FLUSHED 39
-#
-#  Event Manager
-#
-RTEMS_EVENT_SEND_NO_TASK_READIED 24
-RTEMS_EVENT_SEND_TASK_READIED_RETURNS_TO_CALLER 60
-RTEMS_EVENT_SEND_TASK_READIED_PREEMPTS_CALLER 84
-RTEMS_EVENT_RECEIVE_OBTAIN_CURRENT_EVENTS 1
-RTEMS_EVENT_RECEIVE_AVAILABLE 28
-RTEMS_EVENT_RECEIVE_NOT_AVAILABLE_NO_WAIT 23
-RTEMS_EVENT_RECEIVE_NOT_AVAILABLE_CALLER_BLOCKS 84
-#
-#  Signal Manager
-#
-RTEMS_SIGNAL_CATCH_ONLY 15
-RTEMS_SIGNAL_SEND_RETURNS_TO_CALLER 37
-RTEMS_SIGNAL_SEND_SIGNAL_TO_SELF 55
-RTEMS_SIGNAL_EXIT_ASR_OVERHEAD_RETURNS_TO_CALLING_TASK 37
-RTEMS_SIGNAL_EXIT_ASR_OVERHEAD_RETURNS_TO_PREEMPTING_TASK 54
-#
-#  Partition Manager
-#
-RTEMS_PARTITION_CREATE_ONLY 70
-RTEMS_PARTITION_IDENT_ONLY 341
-RTEMS_PARTITION_DELETE_ONLY 42
-RTEMS_PARTITION_GET_BUFFER_AVAILABLE 35
-RTEMS_PARTITION_GET_BUFFER_NOT_AVAILABLE 33
-RTEMS_PARTITION_RETURN_BUFFER_ONLY 43
-#
-#  Region Manager
-#
-RTEMS_REGION_CREATE_ONLY 63
-RTEMS_REGION_IDENT_ONLY 348
-RTEMS_REGION_DELETE_ONLY 39
-RTEMS_REGION_GET_SEGMENT_AVAILABLE 52
-RTEMS_REGION_GET_SEGMENT_NOT_AVAILABLE_NO_WAIT 49
-RTEMS_REGION_GET_SEGMENT_NOT_AVAILABLE_CALLER_BLOCKS 123
-RTEMS_REGION_RETURN_SEGMENT_NO_WAITING_TASKS 54
-RTEMS_REGION_RETURN_SEGMENT_TASK_READIED_RETURNS_TO_CALLER 114
-RTEMS_REGION_RETURN_SEGMENT_TASK_READIED_PREEMPTS_CALLER 136
-#
-#  Dual-Ported Memory Manager
-#
-RTEMS_PORT_CREATE_ONLY 35
-RTEMS_PORT_IDENT_ONLY 340
-RTEMS_PORT_DELETE_ONLY 39
-RTEMS_PORT_INTERNAL_TO_EXTERNAL_ONLY 26
-RTEMS_PORT_EXTERNAL_TO_INTERNAL_ONLY 27
-#
-#  IO Manager
-#
-RTEMS_IO_INITIALIZE_ONLY 4
-RTEMS_IO_OPEN_ONLY 2
-RTEMS_IO_CLOSE_ONLY 1
-RTEMS_IO_READ_ONLY 2
-RTEMS_IO_WRITE_ONLY 3
-RTEMS_IO_CONTROL_ONLY 2
-#
-#  Rate Monotonic Manager
-#
-RTEMS_RATE_MONOTONIC_CREATE_ONLY 32
-RTEMS_RATE_MONOTONIC_IDENT_ONLY 341
-RTEMS_RATE_MONOTONIC_CANCEL_ONLY 39
-RTEMS_RATE_MONOTONIC_DELETE_ACTIVE 51
-RTEMS_RATE_MONOTONIC_DELETE_INACTIVE 48
-RTEMS_RATE_MONOTONIC_PERIOD_INITIATE_PERIOD_RETURNS_TO_CALLER 54
-RTEMS_RATE_MONOTONIC_PERIOD_CONCLUDE_PERIOD_CALLER_BLOCKS 74
-RTEMS_RATE_MONOTONIC_PERIOD_OBTAIN_STATUS 31
-#
-#  Size Information
-#
-#
-#  xxx alloted for numbers
-#
-RTEMS_DATA_SPACE 723
-RTEMS_MINIMUM_CONFIGURATION 18,980
-RTEMS_MAXIMUM_CONFIGURATION 36,438
-#  x,xxx alloted for numbers
-RTEMS_CORE_CODE_SIZE 12,674
-RTEMS_INITIALIZATION_CODE_SIZE 970
-RTEMS_TASK_CODE_SIZE 3,562
-RTEMS_INTERRUPT_CODE_SIZE 54
-RTEMS_CLOCK_CODE_SIZE 334
-RTEMS_TIMER_CODE_SIZE 1,110
-RTEMS_SEMAPHORE_CODE_SIZE 1,632
-RTEMS_MESSAGE_CODE_SIZE 1,754
-RTEMS_EVENT_CODE_SIZE 1,000
-RTEMS_SIGNAL_CODE_SIZE 418
-RTEMS_PARTITION_CODE_SIZE 1,164
-RTEMS_REGION_CODE_SIZE 1,494
-RTEMS_DPMEM_CODE_SIZE 724
-RTEMS_IO_CODE_SIZE 686
-RTEMS_FATAL_ERROR_CODE_SIZE 24
-RTEMS_RATE_MONOTONIC_CODE_SIZE 1,212
-RTEMS_MULTIPROCESSING_CODE_SIZE 6.952
-#  xxx alloted for numbers
-RTEMS_TIMER_CODE_OPTSIZE 184
-RTEMS_SEMAPHORE_CODE_OPTSIZE 172
-RTEMS_MESSAGE_CODE_OPTSIZE 288
-RTEMS_EVENT_CODE_OPTSIZE 56
-RTEMS_SIGNAL_CODE_OPTSIZE 56
-RTEMS_PARTITION_CODE_OPTSIZE 132
-RTEMS_REGION_CODE_OPTSIZE 160
-RTEMS_DPMEM_CODE_OPTSIZE 132
-RTEMS_IO_CODE_OPTSIZE 00
-RTEMS_RATE_MONOTONIC_CODE_OPTSIZE 184
-RTEMS_MULTIPROCESSING_CODE_OPTSIZE 332
-#  xxx alloted for numbers
-RTEMS_BYTES_PER_TASK 400
-RTEMS_BYTES_PER_TIMER 68
-RTEMS_BYTES_PER_SEMAPHORE 124
-RTEMS_BYTES_PER_MESSAGE_QUEUE 148
-RTEMS_BYTES_PER_REGION 144
-RTEMS_BYTES_PER_PARTITION 56
-RTEMS_BYTES_PER_PORT 36
-RTEMS_BYTES_PER_PERIOD 36
-RTEMS_BYTES_PER_EXTENSION 64
-RTEMS_BYTES_PER_FP_TASK 332
-RTEMS_BYTES_PER_NODE 48
-RTEMS_BYTES_PER_GLOBAL_OBJECT 20
-RTEMS_BYTES_PER_PROXY 124
-#  x,xxx alloted for numbers
-RTEMS_BYTES_OF_FIXED_SYSTEM_REQUIREMENTS 8,872
diff --git a/doc/supplements/template/Makefile b/doc/supplements/template/Makefile
deleted file mode 100644
index 30aea5e334..0000000000
--- a/doc/supplements/template/Makefile
+++ /dev/null
@@ -1,154 +0,0 @@
-#
-#  COPYRIGHT (c) 1988-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  All rights reserved.
-#
-#  $Id$
-#
-
-PROJECT=template
-DISTRIBUTION_LEVEL=support
-
-include ../../Make.config
-
-REPLACE=../../tools/word-replace
-
-all: html info ps
-
-dirs:
-	$(make-dirs)
-
-COMMON_FILES=../../common/cpright.texi ../../common/setup.texi
-
-GENERATED_FILES=\
-  cpumodel.texi callconv.texi memmodel.texi intr.texi fatalerr.texi \
-  bsp.texi cputable.texi wksheets.texi timing.texi timeBSP.texi
-
-FILES= $(PROJECT).texi preface.texi \
-  $(COMMON_FILES) $(GENERATED_FILES)
-
-info: dirs c_$(PROJECT)
-	@echo NEED TO INSTALL THE INFO FILES
-	#cp c_$(PROJECT) c_$(PROJECT)-* $(INFO_INSTALL)
-	#cp c_$(PROJECT) c_$(PROJECT)-* $(INFO_INSTALL)
-
-c_$(PROJECT): $(FILES)
-	$(MAKEINFO) $(PROJECT).texi
-
-dvi: $(PROJECT).dvi
-ps: dirs $(PROJECT).ps
-	
-$(PROJECT).ps: $(PROJECT).dvi
-	dvips -o $(PROJECT).ps $(PROJECT).dvi
-	cp $(PROJECT).ps $(PS_INSTALL)
-
-$(PROJECT).dvi: $(FILES)
-	$(TEXI2DVI) $(PROJECT).texi
-
-html: dirs $(FILES)
-	-mkdir -p $(WWW_INSTALL)/c_$(PROJECT)
-	$(TEXI2WWW) $(TEXI2WWW_ARGS) -dir $(WWW_INSTALL)/c_$(PROJECT) \
- 	    $(PROJECT).texi
-
-clean:
-	rm -f *.o $(PROG) *.txt core 
-	rm -f *.dvi *.ps *.log *.aux *.cp *.fn *.ky *.pg *.toc *.tp *.vr $(BASE)
-	rm -f $(PROJECT) $(PROJECT)-*
-	rm -f c_$(PROJECT) c_$(PROJECT)-*
-	rm -f wksheets.t wksheets_NOTIMES.t 
-	rm -f intr.t 
-	rm -f timeBSP_.t timing.t
-	rm -f *.fixed _* $(GENERATED_FILES)
-	rm -f timeBSP_.t
-
-#
-#  Chapters which get automatic processing
-#
-cpumodel.texi: cpumodel.t Makefile
-	$(BMENU) -p "Preface" \
-	    -u "Top" \
-	    -n "Calling Conventions" ${*}.t
-
-callconv.texi: callconv.t Makefile
-	$(BMENU) -p "CPU Model Dependent Features Another Optional Feature" \
-	    -u "Top" \
-	    -n "Memory Model" ${*}.t
-
-memmodel.texi: memmodel.t Makefile
-	$(BMENU) -p "Calling Conventions User-Provided Routines" \
-	    -u "Top" \
-	    -n "Interrupt Processing" ${*}.t
-
-# Interrupt Chapter:
-#  1.  Replace Times and Sizes
-#  2.  Build Node Structure
-intr.t: intr_NOTIMES.t BSP_TIMES
-	${REPLACE} -p BSP_TIMES intr_NOTIMES.t
-	mv intr_NOTIMES.t.fixed intr.t
-
-intr.texi: intr.t Makefile
-	$(BMENU) -p "Memory Model Flat Memory Model" \
-	    -u "Top" \
-	    -n "Default Fatal Error Processing" ${*}.t
-
-fatalerr.texi: fatalerr.t Makefile
-	$(BMENU) -p "Interrupt Processing Interrupt Stack" \
-	    -u "Top" \
-	    -n "Board Support Packages" ${*}.t
-
-bsp.texi: bsp.t Makefile
-	$(BMENU) -p "Default Fatal Error Processing Default Fatal Error Handler Operations" \
-	    -u "Top" \
-	    -n "Processor Dependent Information Table" ${*}.t
-
-cputable.texi: cputable.t Makefile
-	$(BMENU) -p "Board Support Packages Processor Initialization" \
-	    -u "Top" \
-	    -n "Memory Requirements" ${*}.t
-
-# Worksheets Chapter:
-#  1.  Copy the Shared File
-#  2.  Replace Times and Sizes
-#  3.  Build Node Structure
-
-wksheets_NOTIMES.t: ../../common/wksheets.t
-	cp ../../common/wksheets.t wksheets_NOTIMES.t
-
-wksheets.t: wksheets_NOTIMES.t BSP_TIMES
-	${REPLACE} -p BSP_TIMES wksheets_NOTIMES.t
-	mv wksheets_NOTIMES.t.fixed wksheets.t
-
-wksheets.texi: wksheets.t Makefile
-	$(BMENU) -p "Processor Dependent Information Table CPU Dependent Information Table" \
-	    -u "Top" \
-	    -n "Timing Specification" ${*}.t
-
-# Timing Specification Chapter:
-#  1.  Copy the Shared File
-#  3.  Build Node Structure
-
-timing.t: ../../common/timing.t
-	cp ../../common/timing.t timing.t
-
-timing.texi: timing.t Makefile
-	$(BMENU) -p "Memory Requirements RTEMS RAM Workspace Worksheet" \
-	    -u "Top" \
-	    -n "BSP_FOR_TIMES Timing Data" ${*}.t
-
-# Timing Data for BSP Chapter:
-#  1.  Copy the Shared File
-#  2.  Replace Times and Sizes
-#  3.  Build Node Structure
-
-timeBSP_.t: ../../common/timetbl.t timeBSP.t
-	cat timeBSP.t ../../common/timetbl.t                 >timeBSP_.t
-	@echo                                               >>timeBSP_.t
-	@echo "@tex"                                        >>timeBSP_.t
-	@echo "\\global\\advance \\smallskipamount by 4pt"  >>timeBSP_.t
-	@echo "@end tex"                                    >>timeBSP_.t
-
-timeBSP.texi: timeBSP_.t Makefile
-	$(BMENU) -p "Timing Specification Terminology" \
-	    -u "Top" \
-	    -n "Command and Variable Index" timeBSP_.t
-	mv timeBSP_.t timeBSP.texi
diff --git a/doc/supplements/template/bsp.t b/doc/supplements/template/bsp.t
deleted file mode 100644
index 1f0de98d9d..0000000000
--- a/doc/supplements/template/bsp.t
+++ /dev/null
@@ -1,93 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Board Support Packages
-
-@section Introduction
-
-An RTEMS Board Support Package (BSP) must be designed
-to support a particular processor and target board combination.
-This chapter presents a discussion of XXX specific BSP
-issues.   For more information on developing a BSP, refer to the
-chapter titled Board Support Packages in the RTEMS
-Applications User's Guide.
-
-@section System Reset
-
-An RTEMS based application is initiated or
-re-initiated when the XXX processor is reset.  When the
-XXX is reset, the processor performs the following actions:
-
-@itemize @bullet
-@item The tracing bits of the status register are cleared to
-disable tracing.
-
-@item The supervisor interrupt state is entered by setting the
-supervisor (S) bit and clearing the master/interrupt (M) bit of
-the status register.
-
-@item The interrupt mask of the status register is set to
-level 7 to effectively disable all maskable interrupts.
-
-@item The vector base register (VBR) is set to zero.
-
-@item The cache control register (CACR) is set to zero to
-disable and freeze the processor cache.
-
-@item The interrupt stack pointer (ISP) is set to the value
-stored at vector 0 (bytes 0-3) of the exception vector table
-(EVT).
-
-@item The program counter (PC) is set to the value stored at
-vector 1 (bytes 4-7) of the EVT.
-
-@item The processor begins execution at the address stored in
-the PC.
-@end itemize
-
-@section Processor Initialization
-
-The address of the application's initialization code
-should be stored in the first vector of the EVT which will allow
-the immediate vectoring to the application code.  If the
-application requires that the VBR be some value besides zero,
-then it should be set to the required value at this point.  All
-tasks share the same XXX's VBR value.  Because interrupts
-are enabled automatically by RTEMS as part of the initialize
-executive directive, the VBR MUST be set before this directive
-is invoked to insure correct interrupt vectoring.  If processor
-caching is to be utilized, then it should be enabled during the
-reset application initialization code.
-
-In addition to the requirements described in the
-Board Support Packages chapter of the Applications User's
-Manual for the reset code which is executed before the call to
-initialize executive, the XXX version has the following
-specific requirements:
-
-@itemize @bullet
-@item Must leave the S bit of the status register set so that
-the XXX remains in the supervisor state.
-
-@item Must set the M bit of the status register to remove the
-XXX from the interrupt state.
-
-@item Must set the master stack pointer (MSP) such that a
-minimum stack size of MINIMUM_STACK_SIZE bytes is provided for
-the initialize executive directive.
-
-@item Must initialize the XXX's vector table.
-@end itemize
-
-Note that the BSP is not responsible for allocating
-or installing the interrupt stack.  RTEMS does this
-automatically as part of initialization.  If the BSP does not
-install an interrupt stack and -- for whatever reason -- an
-interrupt occurs before initialize_executive is invoked, then
-the results are unpredictable.
-
diff --git a/doc/supplements/template/callconv.t b/doc/supplements/template/callconv.t
deleted file mode 100644
index abdcce0304..0000000000
--- a/doc/supplements/template/callconv.t
+++ /dev/null
@@ -1,92 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Calling Conventions
-
-@section Introduction
-
-Each high-level language compiler generates
-subroutine entry and exit code based upon a set of rules known
-as the compiler's calling convention.   These rules address the
-following issues:
-
-@itemize @bullet
-@item register preservation and usage
-@item parameter passing
-@item call and return mechanism
-@end itemize
-
-A compiler's calling convention is of importance when
-interfacing to subroutines written in another language either
-assembly or high-level.  Even when the high-level language and
-target processor are the same, different compilers may use
-different calling conventions.  As a result, calling conventions
-are both processor and compiler dependent.
-
-@section Processor Background
-
-The MC68xxx architecture supports a simple yet
-effective call and return mechanism.  A subroutine is invoked
-via the branch to subroutine (@code{XXX}) or the jump to subroutine
-(@code{XXX}) instructions.  These instructions push the return address
-on the current stack.  The return from subroutine (@code{XXX})
-instruction pops the return address off the current stack and
-transfers control to that instruction.  It is is important to
-note that the XXX call and return mechanism does not
-automatically save or restore any registers.  It is the
-responsibility of the high-level language compiler to define the
-register preservation and usage convention.
-
-@section Calling Mechanism
-
-All RTEMS directives are invoked using either a @code{XXX}
-or @code{XXX} instruction and return to the user application via the
-@code{XXX} instruction.
-
-@section Register Usage
-
-As discussed above, the @code{XXX} and @code{XXX} instructions do
-not automatically save any registers.  RTEMS uses the registers
-@b{D0}, @b{D1}, @b{A0}, and @b{A1} as scratch registers.  These registers are
-not preserved by RTEMS directives therefore, the contents of
-these registers should not be assumed upon return from any RTEMS
-directive.
-
-@section Parameter Passing
-
-RTEMS assumes that arguments are placed on the
-current stack before the directive is invoked via the @code{XXX} or @code{XXX}
-instruction.  The first argument is assumed to be closest to the
-return address on the stack.  This means that the first argument
-of the C calling sequence is pushed last.  The following
-pseudo-code illustrates the typical sequence used to call a
-RTEMS directive with three (3) arguments:
-
-@example
-@group
-push third argument
-push second argument
-push first argument
-invoke directive
-remove arguments from the stack
-@end group
-@end example
-
-The arguments to RTEMS are typically pushed onto the
-stack using a move instruction with a pre-decremented stack
-pointer as the destination.  These arguments must be removed
-from the stack after control is returned to the caller.  This
-removal is typically accomplished by adding the size of the
-argument list in bytes to the current stack pointer.
-
-@section User-Provided Routines
-
-All user-provided routines invoked by RTEMS, such as
-user extensions, device drivers, and MPCI routines, must also
-adhere to these calling conventions.
-
diff --git a/doc/supplements/template/cpumodel.t b/doc/supplements/template/cpumodel.t
deleted file mode 100644
index 3540c1dc02..0000000000
--- a/doc/supplements/template/cpumodel.t
+++ /dev/null
@@ -1,68 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter CPU Model Dependent Features
-
-@section Introduction
-
-Microprocessors are generally classified into
-families with a variety of CPU models or implementations within
-that family.  Within a processor family, there is a high level
-of binary compatibility.  This family may be based on either an
-architectural specification or on maintaining compatibility with
-a popular processor.  Recent microprocessor families such as the
-SPARC or PA-RISC are based on an architectural specification
-which is independent or any particular CPU model or
-implementation.  Older families such as the M68xxx and the iX86
-evolved as the manufacturer strived to produce higher
-performance processor models which maintained binary
-compatibility with older models.
-
-RTEMS takes advantage of the similarity of the
-various models within a CPU family.  Although the models do vary
-in significant ways, the high level of compatibility makes it
-possible to share the bulk of the CPU dependent executive code
-across the entire family.  Each processor family supported by
-RTEMS has a list of features which vary between CPU models
-within a family.  For example, the most common model dependent
-feature regardless of CPU family is the presence or absence of a
-floating point unit or coprocessor.  When defining the list of
-features present on a particular CPU model, one simply notes
-that floating point hardware is or is not present and defines a
-single constant appropriately.  Conditional compilation is
-utilized to include the appropriate source code for this CPU
-model's feature set.  It is important to note that this means
-that RTEMS is thus compiled using the appropriate feature set
-and compilation flags optimal for this CPU model used.  The
-alternative would be to generate a binary which would execute on
-all family members using only the features which were always
-present.
-
-This chapter presents the set of features which vary
-across SPARC implementations and are of importance to RTEMS.
-The set of CPU model feature macros are defined in the file
-c/src/exec/score/cpu/XXX/XXX.h based upon the particular CPU
-model defined on the compilation command line.
-
-@section CPU Model Name
-
-The macro CPU_MODEL_NAME is a string which designates
-the name of this CPU model.  For example, for the MODEL
-processor, this macro is set to the string "XXX".
-
-@section Floating Point Unit
-
-The macro XXX_HAS_FPU is set to 1 to indicate that
-this CPU model has a hardware floating point unit and 0
-otherwise.  It does not matter whether the hardware floating
-point support is incorporated on-chip or is an external
-coprocessor.
-
-@section Another Optional Feature
-
-The macro XXX 
diff --git a/doc/supplements/template/cputable.t b/doc/supplements/template/cputable.t
deleted file mode 100644
index a2164335aa..0000000000
--- a/doc/supplements/template/cputable.t
+++ /dev/null
@@ -1,111 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Processor Dependent Information Table
-
-@section Introduction
-
-Any highly processor dependent information required
-to describe a processor to RTEMS is provided in the CPU
-Dependent Information Table.  This table is not required for all
-processors supported by RTEMS.  This chapter describes the
-contents, if any, for a particular processor type.
-
-@section CPU Dependent Information Table
-
-The XXX version of the RTEMS CPU Dependent
-Information Table contains the information required to interface
-a Board Support Package and RTEMS on the XXX.  This
-information is provided to allow RTEMS to interoperate
-effectively with the BSP.  The C structure definition is given
-here:
-
-@example
-@group
-typedef struct @{
-  void       (*pretasking_hook)( void );
-  void       (*predriver_hook)( void );
-  void       (*postdriver_hook)( void );
-  void       (*idle_task)( void );
-  boolean      do_zero_of_workspace;
-  unsigned32   idle_task_stack_size;
-  unsigned32   interrupt_stack_size;
-  unsigned32   extra_mpci_receive_server_stack;
-  void *     (*stack_allocate_hook)( unsigned32 );
-  void       (*stack_free_hook)( void* );
-  /* end of fields required on all CPUs */
-
-  /* XXX CPU family dependent stuff */
-@} rtems_cpu_table;
-@end group
-@end example
-
-@table @code
-@item pretasking_hook
-is the address of the
-user provided routine which is invoked once RTEMS initialization
-is complete but before interrupts and tasking are enabled.  This
-field may be NULL to indicate that the hook is not utilized.
-
-@item predriver_hook
-is the address of the user provided
-routine which is invoked with tasking enabled immediately before
-the MPCI and device drivers are initialized. RTEMS
-initialization is complete, interrupts and tasking are enabled,
-but no device drivers are initialized.  This field may be NULL to
-indicate that the hook is not utilized.
-
-@item postdriver_hook
-is the address of the user provided
-routine which is invoked with tasking enabled immediately after
-the MPCI and device drivers are initialized. RTEMS
-initialization is complete, interrupts and tasking are enabled,
-and the device drivers are initialized.  This field may be NULL
-to indicate that the hook is not utilized.
-
-@item idle_task
-is the address of the optional user
-provided routine which is used as the system's IDLE task.  If
-this field is not NULL, then the RTEMS default IDLE task is not
-used.  This field may be NULL to indicate that the default IDLE
-is to be used.
-
-@item do_zero_of_workspace
-indicates whether RTEMS should
-zero the Workspace as part of its initialization.  If set to
-TRUE, the Workspace is zeroed.  Otherwise, it is not.
-
-@item idle_task_stack_size
-is the size of the RTEMS idle task stack in bytes.  
-If this number is less than MINIMUM_STACK_SIZE, then the 
-idle task's stack will be MINIMUM_STACK_SIZE in byte.
-
-@item interrupt_stack_size
-is the size of the RTEMS
-allocated interrupt stack in bytes.  This value must be at least
-as large as MINIMUM_STACK_SIZE.
-
-@item extra_mpci_receive_server_stack
-is the extra stack space allocated for the RTEMS MPCI receive server task
-in bytes.  The MPCI receive server may invoke nearly all directives and 
-may require extra stack space on some targets.
-
-@item stack_allocate_hook
-is the address of the optional user provided routine which allocates 
-memory for task stacks.  If this hook is not NULL, then a stack_free_hook
-must be provided as well.
-
-@item stack_free_hook
-is the address of the optional user provided routine which frees 
-memory for task stacks.  If this hook is not NULL, then a stack_allocate_hook
-must be provided as well.
-
-@item XXX
-is where the CPU family dependent stuff goes.
-
-@end table
diff --git a/doc/supplements/template/fatalerr.t b/doc/supplements/template/fatalerr.t
deleted file mode 100644
index 4a3548ed8e..0000000000
--- a/doc/supplements/template/fatalerr.t
+++ /dev/null
@@ -1,31 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Default Fatal Error Processing
-
-@section Introduction
-
-Upon detection of a fatal error by either the
-application or RTEMS the fatal error manager is invoked.  The
-fatal error manager will invoke the user-supplied fatal error
-handlers.  If no user-supplied handlers are configured,  the
-RTEMS provided default fatal error handler is invoked.  If the
-user-supplied fatal error handlers return to the executive the
-default fatal error handler is then invoked.  This chapter
-describes the precise operations of the default fatal error
-handler.
-
-@section Default Fatal Error Handler Operations
-
-The default fatal error handler which is invoked by
-the @code{rtems_fatal_error_occurred} directive when there is
-no user handler configured or the user handler returns control to
-RTEMS.  The default fatal error handler disables processor interrupts,
-places the error code in @b{XXX}, and executes a @code{XXX}
-instruction to simulate a halt processor instruction.
-
diff --git a/doc/supplements/template/intr_NOTIMES.t b/doc/supplements/template/intr_NOTIMES.t
deleted file mode 100644
index deb645781a..0000000000
--- a/doc/supplements/template/intr_NOTIMES.t
+++ /dev/null
@@ -1,196 +0,0 @@
-@c
-@c  Interrupt Stack Frame Picture
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Interrupt Processing
-
-@section Introduction
-
-Different types of processors respond to the
-occurrence of an interrupt in its own unique fashion. In
-addition, each processor type provides a control mechanism to
-allow for the proper handling of an interrupt.  The processor
-dependent response to the interrupt modifies the current
-execution state and results in a change in the execution stream.
-Most processors require that an interrupt handler utilize some
-special control mechanisms to return to the normal processing
-stream.  Although RTEMS hides many of the processor dependent
-details of interrupt processing, it is important to understand
-how the RTEMS interrupt manager is mapped onto the processor's
-unique architecture. Discussed in this chapter are the XXX's
-interrupt response and control mechanisms as they pertain to
-RTEMS.
-
-@section Vectoring of an Interrupt Handler
-
-Depending on whether or not the particular CPU
-supports a separate interrupt stack, the XXX family has two
-different interrupt handling models.
-
-@subsection Models Without Separate Interrupt Stacks
-
-Upon receipt of an interrupt the XXX family
-members without separate interrupt stacks automatically perform
-the following actions:
-
-@itemize @bullet
-@item To Be Written
-@end itemize
-
-@subsection Models With Separate Interrupt Stacks
-
-Upon receipt of an interrupt the XXX family
-members with separate interrupt stacks automatically perform the
-following actions:
-
-@itemize @bullet
-@item saves the current status register (SR),
-
-@item clears the master/interrupt (M) bit of the SR to
-indicate the switch from master state to interrupt state,
-
-@item sets the privilege mode to supervisor,
-
-@item suppresses tracing,
-
-@item sets the interrupt mask level equal to the level of the
-interrupt being serviced,
-
-@item pushes an interrupt stack frame (ISF), which includes
-the program counter (PC), the status register (SR), and the
-format/exception vector offset (FVO) word, onto the supervisor
-and interrupt stacks,
-
-@item switches the current stack to the interrupt stack and
-vectors to an interrupt service routine (ISR).  If the ISR was
-installed with the interrupt_catch directive, then the RTEMS
-interrupt handler will begin execution.  The RTEMS interrupt
-handler saves all registers which are not preserved according to
-the calling conventions and invokes the application's ISR.
-@end itemize
-
-A nested interrupt is processed similarly by these
-CPU models with the exception that only a single ISF is placed
-on the interrupt stack and the current stack need not be
-switched.
-
-The FVO word in the Interrupt Stack Frame is examined
-by RTEMS to determine when an outer most interrupt is being
-exited. Since the FVO is used by RTEMS for this purpose, the
-user application code MUST NOT modify this field.
-
-The following shows the Interrupt Stack Frame for
-XXX CPU models with separate interrupt stacks:
-
-@ifset use-ascii
-@example
-@group
-               +----------------------+
-               |    Status Register   | 0x0
-               +----------------------+    
-               | Program Counter High | 0x2
-               +----------------------+    
-               | Program Counter Low  | 0x4
-               +----------------------+    
-               | Format/Vector Offset | 0x6
-               +----------------------+    
-@end group
-@end example
-@end ifset
-
-@ifset use-tex
-@sp 1
-@tex
-\centerline{\vbox{\offinterlineskip\halign{
-\strut\vrule#&
-\hbox to 2.00in{\enskip\hfil#\hfil}&
-\vrule#&
-\hbox to 0.50in{\enskip\hfil#\hfil}
-\cr
-\multispan{3}\hrulefill\cr
-& Status Register && 0x0\cr
-\multispan{3}\hrulefill\cr
-& Program Counter High && 0x2\cr
-\multispan{3}\hrulefill\cr
-& Program Counter Low && 0x4\cr
-\multispan{3}\hrulefill\cr
-& Format/Vector Offset && 0x6\cr
-\multispan{3}\hrulefill\cr
-}}\hfil}
-@end tex
-@end ifset
-
-@ifset use-html
-@html
-<CENTER>
-  <TABLE COLS=2 WIDTH="40%" BORDER=2>
-<TR><TD ALIGN=center><STRONG>Status Register</STRONG></TD>
-    <TD ALIGN=center>0x0</TD></TR>
-<TR><TD ALIGN=center><STRONG>Program Counter High</STRONG></TD>
-    <TD ALIGN=center>0x2</TD></TR>
-<TR><TD ALIGN=center><STRONG>Program Counter Low</STRONG></TD>
-    <TD ALIGN=center>0x4</TD></TR>
-<TR><TD ALIGN=center><STRONG>Format/Vector Offset</STRONG></TD>
-    <TD ALIGN=center>0x6</TD></TR>
-  </TABLE>
-</CENTER>
-@end html
-@end ifset
-
-@section Interrupt Levels
-
-Eight levels (0-7) of interrupt priorities are
-supported by XXX family members with level seven (7) being
-the highest priority.  Level zero (0) indicates that interrupts
-are fully enabled.  Interrupt requests for interrupts with
-priorities less than or equal to the current interrupt mask
-level are ignored.
-
-Although RTEMS supports 256 interrupt levels, the
-XXX family only supports eight.  RTEMS interrupt levels 0
-through 7 directly correspond to XXX interrupt levels.  All
-other RTEMS interrupt levels are undefined and their behavior is
-unpredictable.
-
-@section Disabling of Interrupts by RTEMS
-
-During the execution of directive calls, critical
-sections of code may be executed.  When these sections are
-encountered, RTEMS disables interrupts to level seven (7) before
-the execution of this section and restores them to the previous
-level upon completion of the section.  RTEMS has been optimized
-to insure that interrupts are disabled for less than 
-RTEMS_MAXIMUM_DISABLE_PERIOD microseconds on a 
-RTEMS_MAXIMUM_DISABLE_PERIOD_MHZ Mhz XXX with 
-zero wait states.  These numbers will vary based the 
-number of wait states and processor speed present on the target board.
-[NOTE:  The maximum period with interrupts disabled is hand calculated.  This
-calculation was last performed for Release 
-RTEMS_RELEASE_FOR_MAXIMUM_DISABLE_PERIOD.]
-
-Non-maskable interrupts (NMI) cannot be disabled, and
-ISRs which execute at this level MUST NEVER issue RTEMS system
-calls.  If a directive is invoked, unpredictable results may
-occur due to the inability of RTEMS to protect its critical
-sections.  However, ISRs that make no system calls may safely
-execute as non-maskable interrupts.
-
-@section Interrupt Stack
-
-RTEMS allocates the interrupt stack from the
-Workspace Area.  The amount of memory allocated for the
-interrupt stack is determined by the interrupt_stack_size field
-in the CPU Configuration Table.  During the initialization
-process, RTEMS will install its interrupt stack.
-
-The XXX port of RTEMS supports a software managed
-dedicated interrupt stack on those CPU models which do not
-support a separate interrupt stack in hardware.
-
-
diff --git a/doc/supplements/template/memmodel.t b/doc/supplements/template/memmodel.t
deleted file mode 100644
index 4cb46bab90..0000000000
--- a/doc/supplements/template/memmodel.t
+++ /dev/null
@@ -1,39 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Memory Model
-
-@section Introduction
-
-A processor may support any combination of memory
-models ranging from pure physical addressing to complex demand
-paged virtual memory systems.  RTEMS supports a flat memory
-model which ranges contiguously over the processor's allowable
-address space.  RTEMS does not support segmentation or virtual
-memory of any kind.  The appropriate memory model for RTEMS
-provided by the targeted processor and related characteristics
-of that model are described in this chapter.
-
-@section Flat Memory Model
-
-The XXX family supports a flat 32-bit address
-space with addresses ranging from 0x00000000 to 0xFFFFFFFF (4
-gigabytes).  Each address is represented by a 32-bit value and
-is byte addressable.  The address may be used to reference a
-single byte, word (2-bytes), or long word (4 bytes).  Memory
-accesses within this address space are performed in big endian
-fashion by the processors in this family.
-
-Some of the XXX family members such as the
-XXX, XXX, and XXX support virtual memory and
-segmentation.  The XXX requires external hardware support
-such as the XXX Paged Memory Management Unit coprocessor
-which is typically used to perform address translations for
-these systems.  RTEMS does not support virtual memory or
-segmentation on any of the XXX family members.
-
diff --git a/doc/supplements/template/preface.texi b/doc/supplements/template/preface.texi
deleted file mode 100644
index 05e8c3c4cd..0000000000
--- a/doc/supplements/template/preface.texi
+++ /dev/null
@@ -1,55 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@ifinfo
-@node Preface, CPU Model Dependent Features, Top, Top
-@end ifinfo
-@unnumbered Preface
-
-The Real Time Executive for Multiprocessor Systems (RTEMS)
-is designed to be portable across multiple processor
-architectures.  However, the nature of real-time systems makes
-it essential that the application designer understand certain
-processor dependent implementation details.  These processor
-dependencies include calling convention, board support package
-issues, interrupt processing, exact RTEMS memory requirements,
-performance data, header files, and the assembly language
-interface to the executive.
-
-This document discusses the VENDOR XXX
-architecture dependencies in this port of RTEMS.  The XXX
-family has a wide variety of CPU models within it.  The part 
-numbers ...
-
-XXX fill in some things here
-
-It is highly recommended that the XXX
-RTEMS application developer obtain and become familiar with the
-documentation for the processor being used as well as the
-documentation for the family as a whole.
-
-@subheading Architecture Documents
-
-For information on the XXX architecture,
-refer to the following documents available from VENDOR
-(@file{http//www.XXX.com/}):
-
-@itemize @bullet
-@item @cite{XXX Family Reference, VENDOR, PART NUMBER}.
-@end itemize
-
-@subheading MODEL SPECIFIC DOCUMENTS
-
-For information on specific processor models and
-their associated coprocessors, refer to the following documents:
-
-@itemize  @bullet
-@item @cite{XXX MODEL Manual, VENDOR, PART NUMBER}.
-@item @cite{XXX MODEL Manual, VENDOR, PART NUMBER}.
-@end itemize
-
diff --git a/doc/supplements/template/template.texi b/doc/supplements/template/template.texi
deleted file mode 100644
index 9f230acb21..0000000000
--- a/doc/supplements/template/template.texi
+++ /dev/null
@@ -1,121 +0,0 @@
-\input ../../texinfo/texinfo   @c -*-texinfo-*-
-@c %**start of header
-@setfilename c_template
-@syncodeindex vr fn
-@synindex ky cp
-@paragraphindent 0
-@c @smallbook
-@c %**end of header
-
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@c
-@c   Master file for the Template Applications Supplement
-@c
-
-@include ../../common/setup.texi
-
-@ignore
-@ifinfo
-@format
-START-INFO-DIR-ENTRY
-* RTEMS Template Applications Supplement (template):
-END-INFO-DIR-ENTRY
-@end format
-@end ifinfo
-@end ignore
-
-@c
-@c  Title Page Stuff
-@c
-
-@set edition @value{RTEMS-EDITION}
-@set version @value{RTEMS-VERSION}
-@set update-date @value{RTEMS-UPDATE-DATE}
-@set update-month @value{RTEMS-UPDATE-MONTH}
-
-@c
-@c  I don't really like having a short title page.  --joel
-@c
-@c @shorttitlepage RTEMS Template Applications Supplement 
-
-@setchapternewpage odd
-@settitle RTEMS Template Applications Supplement 
-@titlepage
-@finalout
-
-@title RTEMS Template Applications Supplement 
-@subtitle Edition @value{edition}, for RTEMS @value{version}
-@sp 1
-@subtitle @value{update-month}
-@author On-Line Applications Research Corporation
-@page
-
-@include ../../common/cpright.texi
-@end titlepage
-
-@c  This prevents a black box from being printed on "overflow" lines.
-@c  The alternative is to rework a sentence to avoid this problem.
-
-@include preface.texi
-@include cpumodel.texi
-@include callconv.texi
-@include memmodel.texi
-@include intr.texi
-@include fatalerr.texi
-@include bsp.texi
-@include cputable.texi
-@include wksheets.texi
-@include timing.texi
-@include timeBSP.texi
-@ifinfo
-@node Top, Preface, (dir), (dir)
-@top c_template
-
-This is the online version of the RTEMS Template
-Applications Supplement.
-
-@menu
-* Preface::
-* CPU Model Dependent Features::
-* Calling Conventions::
-* Memory Model::
-* Interrupt Processing::
-* Default Fatal Error Processing::
-* Board Support Packages::
-* Processor Dependent Information Table::
-* Memory Requirements::
-* Timing Specification::
-* BSP_FOR_TIMES Timing Data::
-* Command and Variable Index::
-* Concept Index::
-@end menu
-
-@end ifinfo
-@c 
-@c 
-@c Need to copy the emacs stuff and "trailer stuff" (index, toc) into here
-@c
-
-@node Command and Variable Index, Concept Index, BSP_FOR_TIMES Timing Data Context Switch, Top
-@unnumbered Command and Variable Index
-
-There are currently no Command and Variable Index entries.
-
-@c @printindex fn
-
-@node Concept Index, , Command and Variable Index, Top
-@unnumbered Concept Index
-
-There are currently no Concept Index entries.
-@c @printindex cp
-
-@c @contents
-@bye
-
diff --git a/doc/supplements/template/timeBSP.t b/doc/supplements/template/timeBSP.t
deleted file mode 100644
index 8b35c5de13..0000000000
--- a/doc/supplements/template/timeBSP.t
+++ /dev/null
@@ -1,108 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@include ../../common/timemac.texi
-@tex
-\global\advance \smallskipamount by -4pt
-@end tex
-
-@chapter BSP_FOR_TIMES Timing Data
-
-@section Introduction
-
-The timing data for the XXX version of RTEMS is
-provided along with the target dependent aspects concerning the
-gathering of the timing data.  The hardware platform used to
-gather the times is described to give the reader a better
-understanding of each directive time provided.  Also, provided
-is a description of the interrupt latency and the context switch
-times as they pertain to the XXX version of RTEMS.
-
-@section Hardware Platform
-
-All times reported except for the maximum period
-interrupts are disabled by RTEMS were measured using a Motorola
-BSP_FOR_TIMES CPU board.  The BSP_FOR_TIMES is a 20Mhz board with one wait
-state dynamic memory and a XXX numeric coprocessor.  The
-Zilog 8036 countdown timer on this board was used to measure
-elapsed time with a one-half microsecond resolution.  All
-sources of hardware interrupts were disabled, although the
-interrupt level of the XXX allows all interrupts.
-
-The maximum period interrupts are disabled was
-measured by summing the number of CPU cycles required by each
-assembly language instruction executed while interrupts were
-disabled.  The worst case times of the XXX microprocessor
-were used for each instruction.  Zero wait state memory was
-assumed.  The total CPU cycles executed with interrupts
-disabled, including the instructions to disable and enable
-interrupts, was divided by 20 to simulate a 20Mhz XXX.  It
-should be noted that the worst case instruction times for the
-XXX assume that the internal cache is disabled and that no
-instructions overlap.
-
-@section Interrupt Latency
-
-The maximum period with interrupts disabled within
-RTEMS is less than RTEMS_MAXIMUM_DISABLE_PERIOD 
-microseconds including the instructions
-which disable and re-enable interrupts.  The time required for
-the XXX to vector an interrupt and for the RTEMS entry
-overhead before invoking the user's interrupt handler are a
-total of RTEMS_INTR_ENTRY_RETURNS_TO_PREEMPTING_TASK 
-microseconds.  These combine to yield a worst case
-interrupt latency of less than 
-RTEMS_MAXIMUM_DISABLE_PERIOD + RTEMS_INTR_ENTRY_RETURNS_TO_PREEMPTING_TASK 
-microseconds at 20Mhz.  [NOTE:  The maximum period with interrupts
-disabled was last determined for Release 
-RTEMS_RELEASE_FOR_MAXIMUM_DISABLE_PERIOD.]
-
-It should be noted again that the maximum period with
-interrupts disabled within RTEMS is hand-timed and based upon
-worst case (i.e. CPU cache disabled and no instruction overlap)
-times for a 20Mhz XXX.  The interrupt vector and entry
-overhead time was generated on an BSP_FOR_TIMES benchmark platform
-using the Multiprocessing Communications registers to generate
-as the interrupt source.
-
-@section Context Switch
-
-The RTEMS processor context switch time is RTEMS_NO_FP_CONTEXTS
-microseconds on the BSP_FOR_TIMES benchmark platform when no floating
-point context is saved or restored.  Additional execution time
-is required when a TASK_SWITCH user extension is configured.
-The use of the TASK_SWITCH extension is application dependent.
-Thus, its execution time is not considered part of the raw
-context switch time.
-
-Since RTEMS was designed specifically for embedded
-missile applications which are floating point intensive, the
-executive is optimized to avoid unnecessarily saving and
-restoring the state of the numeric coprocessor.  The state of
-the numeric coprocessor is only saved when an FLOATING_POINT
-task is dispatched and that task was not the last task to
-utilize the coprocessor.  In a system with only one
-FLOATING_POINT task, the state of the numeric coprocessor will
-never be saved or restored.  When the first FLOATING_POINT task
-is dispatched, RTEMS does not need to save the current state of
-the numeric coprocessor.
-
-The exact amount of time required to save and restore
-floating point context is dependent on whether an XXX or
-XXX is being used as well as the state of the numeric
-coprocessor.  These numeric coprocessors define three operating
-states: initialized, idle, and busy.  RTEMS places the
-coprocessor in the initialized state when a task is started or
-restarted.  Once the task has utilized the coprocessor, it is in
-the idle state when floating point instructions are not
-executing and the busy state when floating point instructions
-are executing.  The state of the coprocessor is task specific.
-
-The following table summarizes the context switch
-times for the BSP_FOR_TIMES benchmark platform:
-
diff --git a/doc/texinfo/texinfo.tex b/doc/texinfo/texinfo.tex
deleted file mode 100644
index 8fcde98a03..0000000000
--- a/doc/texinfo/texinfo.tex
+++ /dev/null
@@ -1,4426 +0,0 @@
-%% TeX macros to handle texinfo files
-
-%   Copyright (C) 1985, 86, 88, 90, 91, 92, 93, 1994 Free Software Foundation, Inc.
-
-%This texinfo.tex file is free software; you can redistribute it and/or
-%modify it under the terms of the GNU General Public License as
-%published by the Free Software Foundation; either version 2, or (at
-%your option) any later version.
-
-%This texinfo.tex file is distributed in the hope that it will be
-%useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-%of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-%General Public License for more details.
-
-%You should have received a copy of the GNU General Public License
-%along with this texinfo.tex file; see the file COPYING.  If not, write
-%to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139,
-%USA.
-
-
-%In other words, you are welcome to use, share and improve this program.
-%You are forbidden to forbid anyone else to use, share and improve
-%what you give them.   Help stamp out software-hoarding!
-
-
-% Send bug reports to bug-texinfo@prep.ai.mit.edu.
-% Please include a *precise* test case in each bug report.
-
-
-% Make it possible to create a .fmt file just by loading this file:
-% if the underlying format is not loaded, start by loading it now.
-% Added by gildea November 1993.
-\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
-
-% This automatically updates the version number based on RCS.
-\def\deftexinfoversion$#1: #2 ${\def\texinfoversion{#2}}
-\deftexinfoversion$Revision$
-\message{Loading texinfo package [Version \texinfoversion]:}
-
-% If in a .fmt file, print the version number
-% and turn on active characters that we couldn't do earlier because
-% they might have appeared in the input file name.
-\everyjob{\message{[Texinfo version \texinfoversion]}\message{}
-  \catcode`+=\active \catcode`\_=\active}
-
-% Save some parts of plain tex whose names we will redefine.
-
-\let\ptextilde=\~
-\let\ptexlbrace=\{
-\let\ptexrbrace=\}
-\let\ptexdots=\dots
-\let\ptexdot=\.
-\let\ptexstar=\*
-\let\ptexend=\end
-\let\ptexbullet=\bullet
-\let\ptexb=\b
-\let\ptexc=\c
-\let\ptexi=\i
-\let\ptext=\t
-\let\ptexl=\l
-\let\ptexL=\L
-
-% Be sure we're in horizontal mode when doing a tie, since we make space
-% equivalent to this in @example-like environments. Otherwise, a space
-% at the beginning of a line will start with \penalty -- and
-% since \penalty is valid in vertical mode, we'd end up putting the
-% penalty on the vertical list instead of in the new paragraph.
-{\catcode`@ = 11
- % Avoid using \@M directly, because that causes trouble
- % if the definition is written into an index file.
- \global\let\tiepenalty = \@M
- \gdef\tie{\leavevmode\penalty\tiepenalty\ }
-}
-\let\~ = \tie                  % And make it available as @~.
-
-\message{Basics,}
-\chardef\other=12
-
-% If this character appears in an error message or help string, it
-% starts a new line in the output.
-\newlinechar = `^^J
-
-% Set up fixed words for English.
-\ifx\putwordChapter\undefined{\gdef\putwordChapter{Chapter}}\fi%
-\def\putwordInfo{Info}%
-\ifx\putwordSee\undefined{\gdef\putwordSee{See}}\fi%
-\ifx\putwordsee\undefined{\gdef\putwordsee{see}}\fi%
-\ifx\putwordfile\undefined{\gdef\putwordfile{file}}\fi%
-\ifx\putwordpage\undefined{\gdef\putwordpage{page}}\fi%
-\ifx\putwordsection\undefined{\gdef\putwordsection{section}}\fi%
-\ifx\putwordSection\undefined{\gdef\putwordSection{Section}}\fi%
-\ifx\putwordTableofContents\undefined{\gdef\putwordTableofContents{Table of Contents}}\fi%
-\ifx\putwordShortContents\undefined{\gdef\putwordShortContents{Short Contents}}\fi%
-\ifx\putwordAppendix\undefined{\gdef\putwordAppendix{Appendix}}\fi%
-
-% Ignore a token.
-%
-\def\gobble#1{}
-
-\hyphenation{ap-pen-dix}
-\hyphenation{mini-buf-fer mini-buf-fers}
-\hyphenation{eshell}
-
-% Margin to add to right of even pages, to left of odd pages.
-\newdimen \bindingoffset  \bindingoffset=0pt
-\newdimen \normaloffset   \normaloffset=\hoffset
-\newdimen\pagewidth \newdimen\pageheight
-\pagewidth=\hsize \pageheight=\vsize
-
-% Sometimes it is convenient to have everything in the transcript file
-% and nothing on the terminal.  We don't just call \tracingall here,
-% since that produces some useless output on the terminal.
-%
-\def\gloggingall{\begingroup \globaldefs = 1 \loggingall \endgroup}%
-\def\loggingall{\tracingcommands2 \tracingstats2
-   \tracingpages1 \tracingoutput1 \tracinglostchars1
-   \tracingmacros2 \tracingparagraphs1 \tracingrestores1
-   \showboxbreadth\maxdimen\showboxdepth\maxdimen
-}%
-
-%---------------------Begin change-----------------------
-%
-%%%% For @cropmarks command.
-% Dimensions to add cropmarks at corners Added by P. A. MacKay, 12 Nov. 1986
-%
-\newdimen\cornerlong \newdimen\cornerthick
-\newdimen \topandbottommargin
-\newdimen \outerhsize \newdimen \outervsize
-\cornerlong=1pc\cornerthick=.3pt	% These set size of cropmarks
-\outerhsize=7in
-%\outervsize=9.5in
-% Alternative @smallbook page size is 9.25in
-\outervsize=9.25in
-\topandbottommargin=.75in
-%
-%---------------------End change-----------------------
-
-% \onepageout takes a vbox as an argument.  Note that \pagecontents
-% does insertions itself, but you have to call it yourself.
-\chardef\PAGE=255  \output={\onepageout{\pagecontents\PAGE}}
-\def\onepageout#1{\hoffset=\normaloffset
-\ifodd\pageno  \advance\hoffset by \bindingoffset
-\else \advance\hoffset by -\bindingoffset\fi
-{\escapechar=`\\\relax % makes sure backslash is used in output files.
-\shipout\vbox{{\let\hsize=\pagewidth \makeheadline} \pagebody{#1}%
-{\let\hsize=\pagewidth \makefootline}}}%
-\advancepageno \ifnum\outputpenalty>-20000 \else\dosupereject\fi}
-
-%%%% For @cropmarks command %%%%
-
-% Here is a modification of the main output routine for Near East Publications
-% This provides right-angle cropmarks at all four corners.
-% The contents of the page are centerlined into the cropmarks,
-% and any desired binding offset is added as an \hskip on either
-% site of the centerlined box.  (P. A. MacKay, 12 November, 1986)
-%
-\def\croppageout#1{\hoffset=0pt % make sure this doesn't mess things up
-{\escapechar=`\\\relax % makes sure backslash is used in output files.
-		 \shipout
-		 \vbox to \outervsize{\hsize=\outerhsize
-                 \vbox{\line{\ewtop\hfill\ewtop}}
-                 \nointerlineskip
-                 \line{\vbox{\moveleft\cornerthick\nstop}
-                       \hfill
-                       \vbox{\moveright\cornerthick\nstop}}
-                 \vskip \topandbottommargin
-                 \centerline{\ifodd\pageno\hskip\bindingoffset\fi
-			\vbox{
-			{\let\hsize=\pagewidth \makeheadline}
-			\pagebody{#1}
-			{\let\hsize=\pagewidth \makefootline}}
-			\ifodd\pageno\else\hskip\bindingoffset\fi}
-		 \vskip \topandbottommargin plus1fill minus1fill
-                 \boxmaxdepth\cornerthick
-                 \line{\vbox{\moveleft\cornerthick\nsbot}
-                       \hfill
-                       \vbox{\moveright\cornerthick\nsbot}}
-                 \nointerlineskip
-                 \vbox{\line{\ewbot\hfill\ewbot}}
-	}}
-  \advancepageno
-  \ifnum\outputpenalty>-20000 \else\dosupereject\fi}
-%
-% Do @cropmarks to get crop marks
-\def\cropmarks{\let\onepageout=\croppageout }
-
-\newinsert\margin \dimen\margin=\maxdimen
-
-\def\pagebody#1{\vbox to\pageheight{\boxmaxdepth=\maxdepth #1}}
-{\catcode`\@ =11
-\gdef\pagecontents#1{\ifvoid\topins\else\unvbox\topins\fi
-% marginal hacks, juha@viisa.uucp (Juha Takala)
-\ifvoid\margin\else % marginal info is present
-  \rlap{\kern\hsize\vbox to\z@{\kern1pt\box\margin \vss}}\fi
-\dimen@=\dp#1 \unvbox#1
-\ifvoid\footins\else\vskip\skip\footins\footnoterule \unvbox\footins\fi
-\ifr@ggedbottom \kern-\dimen@ \vfil \fi}
-}
-
-%
-% Here are the rules for the cropmarks.  Note that they are
-% offset so that the space between them is truly \outerhsize or \outervsize
-% (P. A. MacKay, 12 November, 1986)
-%
-\def\ewtop{\vrule height\cornerthick depth0pt width\cornerlong}
-\def\nstop{\vbox
-  {\hrule height\cornerthick depth\cornerlong width\cornerthick}}
-\def\ewbot{\vrule height0pt depth\cornerthick width\cornerlong}
-\def\nsbot{\vbox
-  {\hrule height\cornerlong depth\cornerthick width\cornerthick}}
-
-% Parse an argument, then pass it to #1.  The argument is the rest of
-% the input line (except we remove a trailing comment).  #1 should be a
-% macro which expects an ordinary undelimited TeX argument.
-%
-\def\parsearg#1{%
-  \let\next = #1%
-  \begingroup
-    \obeylines
-    \futurelet\temp\parseargx
-}
-
-% If the next token is an obeyed space (from an @example environment or
-% the like), remove it and recurse.  Otherwise, we're done.
-\def\parseargx{%
-  % \obeyedspace is defined far below, after the definition of \sepspaces.
-  \ifx\obeyedspace\temp
-    \expandafter\parseargdiscardspace
-  \else
-    \expandafter\parseargline
-  \fi
-}
-
-% Remove a single space (as the delimiter token to the macro call).
-{\obeyspaces %
- \gdef\parseargdiscardspace {\futurelet\temp\parseargx}}
-
-{\obeylines %
-  \gdef\parseargline#1^^M{%
-    \endgroup % End of the group started in \parsearg.
-    %
-    % First remove any @c comment, then any @comment.
-    % Result of each macro is put in \toks0.
-    \argremovec #1\c\relax %
-    \expandafter\argremovecomment \the\toks0 \comment\relax %
-    %
-    % Call the caller's macro, saved as \next in \parsearg.
-    \expandafter\next\expandafter{\the\toks0}%
-  }%
-}
-
-% Since all \c{,omment} does is throw away the argument, we can let TeX
-% do that for us.  The \relax here is matched by the \relax in the call
-% in \parseargline; it could be more or less anything, its purpose is
-% just to delimit the argument to the \c.
-\def\argremovec#1\c#2\relax{\toks0 = {#1}}
-\def\argremovecomment#1\comment#2\relax{\toks0 = {#1}}
-
-% \argremovec{,omment} might leave us with trailing spaces, though; e.g.,
-%    @end itemize  @c foo
-% will have two active spaces as part of the argument with the
-% `itemize'.  Here we remove all active spaces from #1, and assign the
-% result to \toks0.
-%
-% This loses if there are any *other* active characters besides spaces
-% in the argument -- _ ^ +, for example -- since they get expanded.
-% Fortunately, Texinfo does not define any such commands.  (If it ever
-% does, the catcode of the characters in questionwill have to be changed
-% here.)  But this means we cannot call \removeactivespaces as part of
-% \argremovec{,omment}, since @c uses \parsearg, and thus the argument
-% that \parsearg gets might well have any character at all in it.
-%
-\def\removeactivespaces#1{%
-  \begingroup
-    \ignoreactivespaces
-    \edef\temp{#1}%
-    \global\toks0 = \expandafter{\temp}%
-  \endgroup
-}
-
-% Change the active space to expand to nothing.
-%
-\begingroup
-  \obeyspaces
-  \gdef\ignoreactivespaces{\obeyspaces\let =\empty}
-\endgroup
-
-
-\def\flushcr{\ifx\par\lisppar \def\next##1{}\else \let\next=\relax \fi \next}
-
-%% These are used to keep @begin/@end levels from running away
-%% Call \inENV within environments (after a \begingroup)
-\newif\ifENV \ENVfalse \def\inENV{\ifENV\relax\else\ENVtrue\fi}
-\def\ENVcheck{%
-\ifENV\errmessage{Still within an environment.  Type Return to continue.}
-\endgroup\fi} % This is not perfect, but it should reduce lossage
-
-% @begin foo  is the same as @foo, for now.
-\newhelp\EMsimple{Type <Return> to continue.}
-
-\outer\def\begin{\parsearg\beginxxx}
-
-\def\beginxxx #1{%
-\expandafter\ifx\csname #1\endcsname\relax
-{\errhelp=\EMsimple \errmessage{Undefined command @begin #1}}\else
-\csname #1\endcsname\fi}
-
-% @end foo executes the definition of \Efoo.
-%
-\def\end{\parsearg\endxxx}
-\def\endxxx #1{%
-  \removeactivespaces{#1}%
-  \edef\endthing{\the\toks0}%
-  %
-  \expandafter\ifx\csname E\endthing\endcsname\relax
-    \expandafter\ifx\csname \endthing\endcsname\relax
-      % There's no \foo, i.e., no ``environment'' foo.
-      \errhelp = \EMsimple
-      \errmessage{Undefined command `@end \endthing'}%
-    \else
-      \unmatchedenderror\endthing
-    \fi
-  \else
-    % Everything's ok; the right environment has been started.
-    \csname E\endthing\endcsname
-  \fi
-}
-
-% There is an environment #1, but it hasn't been started.  Give an error.
-%
-\def\unmatchedenderror#1{%
-  \errhelp = \EMsimple
-  \errmessage{This `@end #1' doesn't have a matching `@#1'}%
-}
-
-% Define the control sequence \E#1 to give an unmatched @end error.
-%
-\def\defineunmatchedend#1{%
-  \expandafter\def\csname E#1\endcsname{\unmatchedenderror{#1}}%
-}
-
-
-% Single-spacing is done by various environments (specifically, in
-% \nonfillstart and \quotations).
-\newskip\singlespaceskip \singlespaceskip = 12.5pt
-\def\singlespace{%
-  % Why was this kern here?  It messes up equalizing space above and below
-  % environments.  --karl, 6may93
-  %{\advance \baselineskip by -\singlespaceskip
-  %\kern \baselineskip}%
-  \setleading \singlespaceskip
-}
-
-%% Simple single-character @ commands
-
-% @@ prints an @
-% Kludge this until the fonts are right (grr).
-\def\@{{\tt \char '100}}
-
-% This is turned off because it was never documented
-% and you can use @w{...} around a quote to suppress ligatures.
-%% Define @` and @' to be the same as ` and '
-%% but suppressing ligatures.
-%\def\`{{`}}
-%\def\'{{'}}
-
-% Used to generate quoted braces.
-
-\def\mylbrace {{\tt \char '173}}
-\def\myrbrace {{\tt \char '175}}
-\let\{=\mylbrace
-\let\}=\myrbrace
-
-% @: forces normal size whitespace following.
-\def\:{\spacefactor=1000 }
-
-% @* forces a line break.
-\def\*{\hfil\break\hbox{}\ignorespaces}
-
-% @. is an end-of-sentence period.
-\def\.{.\spacefactor=3000 }
-
-% @enddots{} is an end-of-sentence ellipsis.
-\gdef\enddots{$\mathinner{\ldotp\ldotp\ldotp\ldotp}$\spacefactor=3000}
-
-% @! is an end-of-sentence bang.
-\gdef\!{!\spacefactor=3000 }
-
-% @? is an end-of-sentence query.
-\gdef\?{?\spacefactor=3000 }
-
-% @w prevents a word break.  Without the \leavevmode, @w at the
-% beginning of a paragraph, when TeX is still in vertical mode, would
-% produce a whole line of output instead of starting the paragraph.
-\def\w#1{\leavevmode\hbox{#1}}
-
-% @group ... @end group forces ... to be all on one page, by enclosing
-% it in a TeX vbox.  We use \vtop instead of \vbox to construct the box
-% to keep its height that of a normal line.  According to the rules for
-% \topskip (p.114 of the TeXbook), the glue inserted is
-% max (\topskip - \ht (first item), 0).  If that height is large,
-% therefore, no glue is inserted, and the space between the headline and
-% the text is small, which looks bad.
-%
-\def\group{\begingroup
-  \ifnum\catcode13=\active \else
-    \errhelp = \groupinvalidhelp
-    \errmessage{@group invalid in context where filling is enabled}%
-  \fi
-  %
-  % The \vtop we start below produces a box with normal height and large
-  % depth; thus, TeX puts \baselineskip glue before it, and (when the
-  % next line of text is done) \lineskip glue after it.  (See p.82 of
-  % the TeXbook.)  Thus, space below is not quite equal to space
-  % above.  But it's pretty close.
-  \def\Egroup{%
-    \egroup           % End the \vtop.
-    \endgroup         % End the \group.
-  }%
-  %
-  \vtop\bgroup
-    % We have to put a strut on the last line in case the @group is in
-    % the midst of an example, rather than completely enclosing it.
-    % Otherwise, the interline space between the last line of the group
-    % and the first line afterwards is too small.  But we can't put the
-    % strut in \Egroup, since there it would be on a line by itself.
-    % Hence this just inserts a strut at the beginning of each line.
-    \everypar = {\strut}%
-    %
-    % Since we have a strut on every line, we don't need any of TeX's
-    % normal interline spacing.
-    \offinterlineskip
-    %
-    % OK, but now we have to do something about blank
-    % lines in the input in @example-like environments, which normally
-    % just turn into \lisppar, which will insert no space now that we've
-    % turned off the interline space.  Simplest is to make them be an
-    % empty paragraph.
-    \ifx\par\lisppar
-      \edef\par{\leavevmode \par}%
-      %
-      % Reset ^^M's definition to new definition of \par.
-      \obeylines
-    \fi
-    %
-    % Do @comment since we are called inside an environment such as
-    % @example, where each end-of-line in the input causes an
-    % end-of-line in the output.  We don't want the end-of-line after
-    % the `@group' to put extra space in the output.  Since @group
-    % should appear on a line by itself (according to the Texinfo
-    % manual), we don't worry about eating any user text.
-    \comment
-}
-%
-% TeX puts in an \escapechar (i.e., `@') at the beginning of the help
-% message, so this ends up printing `@group can only ...'.
-%
-\newhelp\groupinvalidhelp{%
-group can only be used in environments such as @example,^^J%
-where each line of input produces a line of output.}
-
-% @need space-in-mils
-% forces a page break if there is not space-in-mils remaining.
-
-\newdimen\mil  \mil=0.001in
-
-\def\need{\parsearg\needx}
-
-% Old definition--didn't work.
-%\def\needx #1{\par %
-%% This method tries to make TeX break the page naturally
-%% if the depth of the box does not fit.
-%{\baselineskip=0pt%
-%\vtop to #1\mil{\vfil}\kern -#1\mil\penalty 10000
-%\prevdepth=-1000pt
-%}}
-
-\def\needx#1{%
-  % Go into vertical mode, so we don't make a big box in the middle of a
-  % paragraph.
-  \par
-  %
-  % Don't add any leading before our big empty box, but allow a page
-  % break, since the best break might be right here.
-  \allowbreak
-  \nointerlineskip
-  \vtop to #1\mil{\vfil}%
-  %
-  % TeX does not even consider page breaks if a penalty added to the
-  % main vertical list is 10000 or more.  But in order to see if the
-  % empty box we just added fits on the page, we must make it consider
-  % page breaks.  On the other hand, we don't want to actually break the
-  % page after the empty box.  So we use a penalty of 9999.
-  %
-  % There is an extremely small chance that TeX will actually break the
-  % page at this \penalty, if there are no other feasible breakpoints in
-  % sight.  (If the user is using lots of big @group commands, which
-  % almost-but-not-quite fill up a page, TeX will have a hard time doing
-  % good page breaking, for example.)  However, I could not construct an
-  % example where a page broke at this \penalty; if it happens in a real
-  % document, then we can reconsider our strategy.
-  \penalty9999
-  %
-  % Back up by the size of the box, whether we did a page break or not.
-  \kern -#1\mil
-  %
-  % Do not allow a page break right after this kern.
-  \nobreak
-}
-
-% @br   forces paragraph break
-
-\let\br = \par
-
-% @dots{}  output some dots
-
-\def\dots{$\ldots$}
-
-% @page    forces the start of a new page
-
-\def\page{\par\vfill\supereject}
-
-% @exdent text....
-% outputs text on separate line in roman font, starting at standard page margin
-
-% This records the amount of indent in the innermost environment.
-% That's how much \exdent should take out.
-\newskip\exdentamount
-
-% This defn is used inside fill environments such as @defun.
-\def\exdent{\parsearg\exdentyyy}
-\def\exdentyyy #1{{\hfil\break\hbox{\kern -\exdentamount{\rm#1}}\hfil\break}}
-
-% This defn is used inside nofill environments such as @example.
-\def\nofillexdent{\parsearg\nofillexdentyyy}
-\def\nofillexdentyyy #1{{\advance \leftskip by -\exdentamount
-\leftline{\hskip\leftskip{\rm#1}}}}
-
-%\hbox{{\rm#1}}\hfil\break}}
-
-% @include file    insert text of that file as input.
-
-\def\include{\parsearg\includezzz}
-%Use \input\thisfile to avoid blank after \input, which may be an active
-%char (in which case the blank would become the \input argument).
-%The grouping keeps the value of \thisfile correct even when @include
-%is nested.
-\def\includezzz #1{\begingroup
-\def\thisfile{#1}\input\thisfile
-\endgroup}
-
-\def\thisfile{}
-
-% @center line   outputs that line, centered
-
-\def\center{\parsearg\centerzzz}
-\def\centerzzz #1{{\advance\hsize by -\leftskip
-\advance\hsize by -\rightskip
-\centerline{#1}}}
-
-% @sp n   outputs n lines of vertical space
-
-\def\sp{\parsearg\spxxx}
-\def\spxxx #1{\par \vskip #1\baselineskip}
-
-% @comment ...line which is ignored...
-% @c is the same as @comment
-% @ignore ... @end ignore  is another way to write a comment
-
-\def\comment{\catcode 64=\other \catcode 123=\other \catcode 125=\other%
-\parsearg \commentxxx}
-
-\def\commentxxx #1{\catcode 64=0 \catcode 123=1 \catcode 125=2 }
-
-\let\c=\comment
-
-% Prevent errors for section commands.
-% Used in @ignore and in failing conditionals.
-\def\ignoresections{%
-\let\chapter=\relax
-\let\unnumbered=\relax
-\let\top=\relax
-\let\unnumberedsec=\relax
-\let\unnumberedsection=\relax
-\let\unnumberedsubsec=\relax
-\let\unnumberedsubsection=\relax
-\let\unnumberedsubsubsec=\relax
-\let\unnumberedsubsubsection=\relax
-\let\section=\relax
-\let\subsec=\relax
-\let\subsubsec=\relax
-\let\subsection=\relax
-\let\subsubsection=\relax
-\let\appendix=\relax
-\let\appendixsec=\relax
-\let\appendixsection=\relax
-\let\appendixsubsec=\relax
-\let\appendixsubsection=\relax
-\let\appendixsubsubsec=\relax
-\let\appendixsubsubsection=\relax
-\let\contents=\relax
-\let\smallbook=\relax
-\let\titlepage=\relax
-}
-
-% Used in nested conditionals, where we have to parse the Texinfo source
-% and so want to turn off most commands, in case they are used
-% incorrectly.
-%
-\def\ignoremorecommands{%
-  \let\defcv = \relax
-  \let\deffn = \relax
-  \let\deffnx = \relax
-  \let\defindex = \relax
-  \let\defivar = \relax
-  \let\defmac = \relax
-  \let\defmethod = \relax
-  \let\defop = \relax
-  \let\defopt = \relax
-  \let\defspec = \relax
-  \let\deftp = \relax
-  \let\deftypefn = \relax
-  \let\deftypefun = \relax
-  \let\deftypevar = \relax
-  \let\deftypevr = \relax
-  \let\defun = \relax
-  \let\defvar = \relax
-  \let\defvr = \relax
-  \let\ref = \relax
-  \let\xref = \relax
-  \let\printindex = \relax
-  \let\pxref = \relax
-  \let\settitle = \relax
-  \let\include = \relax
-  \let\lowersections = \relax
-  \let\down = \relax
-  \let\raisesections = \relax
-  \let\up = \relax
-  \let\set = \relax
-  \let\clear = \relax
-  \let\item = \relax
-  \let\message = \relax
-}
-
-% Ignore @ignore ... @end ignore.
-%
-\def\ignore{\doignore{ignore}}
-
-% Also ignore @ifinfo, @ifhtml, @html, @menu, and @direntry text.
-%
-\def\ifinfo{\doignore{ifinfo}}
-\def\ifhtml{\doignore{ifhtml}}
-\def\html{\doignore{html}}
-\def\menu{\doignore{menu}}
-\def\direntry{\doignore{direntry}}
-
-% Ignore text until a line `@end #1'.
-%
-\def\doignore#1{\begingroup
-  % Don't complain about control sequences we have declared \outer.
-  \ignoresections
-  %
-  % Define a command to swallow text until we reach `@end #1'.
-  \long\def\doignoretext##1\end #1{\enddoignore}%
-  %
-  % Make sure that spaces turn into tokens that match what \doignoretext wants.
-  \catcode32 = 10
-  %
-  % And now expand that command.
-  \doignoretext
-}
-
-% What we do to finish off ignored text.
-%
-\def\enddoignore{\endgroup\ignorespaces}%
-
-\newif\ifwarnedobs\warnedobsfalse
-\def\obstexwarn{%
-  \ifwarnedobs\relax\else
-  % We need to warn folks that they may have trouble with TeX 3.0.
-  % This uses \immediate\write16 rather than \message to get newlines.
-    \immediate\write16{}
-    \immediate\write16{***WARNING*** for users of Unix TeX 3.0!}
-    \immediate\write16{This manual trips a bug in TeX version 3.0 (tex hangs).}
-    \immediate\write16{If you are running another version of TeX, relax.}
-    \immediate\write16{If you are running Unix TeX 3.0, kill this TeX process.}
-    \immediate\write16{  Then upgrade your TeX installation if you can.}
-    \immediate\write16{If you are stuck with version 3.0, run the}
-    \immediate\write16{  script ``tex3patch'' from the Texinfo distribution}
-    \immediate\write16{  to use a workaround.}
-    \immediate\write16{}
-    \warnedobstrue
-    \fi
-}
-
-% **In TeX 3.0, setting text in \nullfont hangs tex.  For a
-% workaround (which requires the file ``dummy.tfm'' to be installed),
-% uncomment the following line:
-%%%%%\font\nullfont=dummy\let\obstexwarn=\relax
-
-% Ignore text, except that we keep track of conditional commands for
-% purposes of nesting, up to an `@end #1' command.
-%
-\def\nestedignore#1{%
-  \obstexwarn
-  % We must actually expand the ignored text to look for the @end
-  % command, so that nested ignore constructs work.  Thus, we put the
-  % text into a \vbox and then do nothing with the result.  To minimize
-  % the change of memory overflow, we follow the approach outlined on
-  % page 401 of the TeXbook: make the current font be a dummy font.
-  %
-  \setbox0 = \vbox\bgroup
-    % Don't complain about control sequences we have declared \outer.
-    \ignoresections
-    %
-    % Define `@end #1' to end the box, which will in turn undefine the
-    % @end command again.
-    \expandafter\def\csname E#1\endcsname{\egroup\ignorespaces}%
-    %
-    % We are going to be parsing Texinfo commands.  Most cause no
-    % trouble when they are used incorrectly, but some commands do
-    % complicated argument parsing or otherwise get confused, so we
-    % undefine them.
-    %
-    % We can't do anything about stray @-signs, unfortunately;
-    % they'll produce `undefined control sequence' errors.
-    \ignoremorecommands
-    %
-    % Set the current font to be \nullfont, a TeX primitive, and define
-    % all the font commands to also use \nullfont.  We don't use
-    % dummy.tfm, as suggested in the TeXbook, because not all sites
-    % might have that installed.  Therefore, math mode will still
-    % produce output, but that should be an extremely small amount of
-    % stuff compared to the main input.
-    %
-    \nullfont
-    \let\tenrm = \nullfont  \let\tenit = \nullfont  \let\tensl = \nullfont
-    \let\tenbf = \nullfont  \let\tentt = \nullfont  \let\smallcaps = \nullfont
-    \let\tensf = \nullfont
-    % Similarly for index fonts (mostly for their use in
-    % smallexample)
-    \let\indrm = \nullfont  \let\indit = \nullfont  \let\indsl = \nullfont
-    \let\indbf = \nullfont  \let\indtt = \nullfont  \let\indsc = \nullfont
-    \let\indsf = \nullfont
-    %
-    % Don't complain when characters are missing from the fonts.
-    \tracinglostchars = 0
-    %
-    % Don't bother to do space factor calculations.
-    \frenchspacing
-    %
-    % Don't report underfull hboxes.
-    \hbadness = 10000
-    %
-    % Do minimal line-breaking.
-    \pretolerance = 10000
-    %
-    % Do not execute instructions in @tex
-    \def\tex{\doignore{tex}}
-}
-
-% @set VAR sets the variable VAR to an empty value.
-% @set VAR REST-OF-LINE sets VAR to the value REST-OF-LINE.
-%
-% Since we want to separate VAR from REST-OF-LINE (which might be
-% empty), we can't just use \parsearg; we have to insert a space of our
-% own to delimit the rest of the line, and then take it out again if we
-% didn't need it.
-%
-\def\set{\parsearg\setxxx}
-\def\setxxx#1{\setyyy#1 \endsetyyy}
-\def\setyyy#1 #2\endsetyyy{%
-  \def\temp{#2}%
-  \ifx\temp\empty \global\expandafter\let\csname SET#1\endcsname = \empty
-  \else \setzzz{#1}#2\endsetzzz % Remove the trailing space \setxxx inserted.
-  \fi
-}
-% Can't use \xdef to pre-expand #2 and save some time, since \temp or
-% \next or other control sequences that we've defined might get us into
-% an infinite loop. Consider `@set foo @cite{bar}'.
-\def\setzzz#1#2 \endsetzzz{\expandafter\gdef\csname SET#1\endcsname{#2}}
-
-% @clear VAR clears (i.e., unsets) the variable VAR.
-%
-\def\clear{\parsearg\clearxxx}
-\def\clearxxx#1{\global\expandafter\let\csname SET#1\endcsname=\relax}
-
-% @value{foo} gets the text saved in variable foo.
-%
-\def\value#1{\expandafter
-		\ifx\csname SET#1\endcsname\relax
-			{\{No value for ``#1''\}}
-		\else \csname SET#1\endcsname \fi}
-
-% @ifset VAR ... @end ifset reads the `...' iff VAR has been defined
-% with @set.
-%
-\def\ifset{\parsearg\ifsetxxx}
-\def\ifsetxxx #1{%
-  \expandafter\ifx\csname SET#1\endcsname\relax
-    \expandafter\ifsetfail
-  \else
-    \expandafter\ifsetsucceed
-  \fi
-}
-\def\ifsetsucceed{\conditionalsucceed{ifset}}
-\def\ifsetfail{\nestedignore{ifset}}
-\defineunmatchedend{ifset}
-
-% @ifclear VAR ... @end ifclear reads the `...' iff VAR has never been
-% defined with @set, or has been undefined with @clear.
-%
-\def\ifclear{\parsearg\ifclearxxx}
-\def\ifclearxxx #1{%
-  \expandafter\ifx\csname SET#1\endcsname\relax
-    \expandafter\ifclearsucceed
-  \else
-    \expandafter\ifclearfail
-  \fi
-}
-\def\ifclearsucceed{\conditionalsucceed{ifclear}}
-\def\ifclearfail{\nestedignore{ifclear}}
-\defineunmatchedend{ifclear}
-
-% @iftex always succeeds; we read the text following, through @end
-% iftex).  But `@end iftex' should be valid only after an @iftex.
-%
-\def\iftex{\conditionalsucceed{iftex}}
-\defineunmatchedend{iftex}
-
-% We can't just want to start a group at @iftex (for example) and end it
-% at @end iftex, since then @set commands inside the conditional have no
-% effect (they'd get reverted at the end of the group).  So we must
-% define \Eiftex to redefine itself to be its previous value.  (We can't
-% just define it to fail again with an ``unmatched end'' error, since
-% the @ifset might be nested.)
-%
-\def\conditionalsucceed#1{%
-  \edef\temp{%
-    % Remember the current value of \E#1.
-    \let\nece{prevE#1} = \nece{E#1}%
-    %
-    % At the `@end #1', redefine \E#1 to be its previous value.
-    \def\nece{E#1}{\let\nece{E#1} = \nece{prevE#1}}%
-  }%
-  \temp
-}
-
-% We need to expand lots of \csname's, but we don't want to expand the
-% control sequences after we've constructed them.
-%
-\def\nece#1{\expandafter\noexpand\csname#1\endcsname}
-
-% @asis just yields its argument.  Used with @table, for example.
-%
-\def\asis#1{#1}
-
-% @math means output in math mode.
-% We don't use $'s directly in the definition of \math because control
-% sequences like \math are expanded when the toc file is written.  Then,
-% we read the toc file back, the $'s will be normal characters (as they
-% should be, according to the definition of Texinfo).  So we must use a
-% control sequence to switch into and out of math mode.
-%
-% This isn't quite enough for @math to work properly in indices, but it
-% seems unlikely it will ever be needed there.
-%
-\let\implicitmath = $
-\def\math#1{\implicitmath #1\implicitmath}
-
-% @bullet and @minus need the same treatment as @math, just above.
-\def\bullet{\implicitmath\ptexbullet\implicitmath}
-\def\minus{\implicitmath-\implicitmath}
-
-\def\node{\ENVcheck\parsearg\nodezzz}
-\def\nodezzz#1{\nodexxx [#1,]}
-\def\nodexxx[#1,#2]{\gdef\lastnode{#1}}
-\let\nwnode=\node
-\let\lastnode=\relax
-
-\def\donoderef{\ifx\lastnode\relax\else
-\expandafter\expandafter\expandafter\setref{\lastnode}\fi
-\global\let\lastnode=\relax}
-
-\def\unnumbnoderef{\ifx\lastnode\relax\else
-\expandafter\expandafter\expandafter\unnumbsetref{\lastnode}\fi
-\global\let\lastnode=\relax}
-
-\def\appendixnoderef{\ifx\lastnode\relax\else
-\expandafter\expandafter\expandafter\appendixsetref{\lastnode}\fi
-\global\let\lastnode=\relax}
-
-\let\refill=\relax
-
-% @setfilename is done at the beginning of every texinfo file.
-% So open here the files we need to have open while reading the input.
-% This makes it possible to make a .fmt file for texinfo.
-\def\setfilename{%
-   \readauxfile
-   \opencontents
-   \openindices
-   \fixbackslash  % Turn off hack to swallow `\input texinfo'.
-   \global\let\setfilename=\comment % Ignore extra @setfilename cmds.
-   \comment % Ignore the actual filename.
-}
-
-\outer\def\bye{\pagealignmacro\tracingstats=1\ptexend}
-
-\def\inforef #1{\inforefzzz #1,,,,**}
-\def\inforefzzz #1,#2,#3,#4**{\putwordSee{} \putwordInfo{} \putwordfile{} \file{\ignorespaces #3{}},
-  node \samp{\ignorespaces#1{}}}
-
-\message{fonts,}
-
-% Font-change commands.
-
-% Texinfo supports the sans serif font style, which plain TeX does not.
-% So we set up a \sf analogous to plain's \rm, etc.
-\newfam\sffam
-\def\sf{\fam=\sffam \tensf}
-\let\li = \sf % Sometimes we call it \li, not \sf.
-
-%% Try out Computer Modern fonts at \magstephalf
-\let\mainmagstep=\magstephalf
-
-% Set the font macro #1 to the font named #2, adding on the
-% specified font prefix (normally `cm').
-\def\setfont#1#2{\font#1=\fontprefix#2}
-
-% Use cm as the default font prefix.
-% To specify the font prefix, you must define \fontprefix
-% before you read in texinfo.tex.
-\ifx\fontprefix\undefined
-\def\fontprefix{cm}
-\fi
-
-\ifx\bigger\relax
-\let\mainmagstep=\magstep1
-\setfont\textrm{r12}
-\setfont\texttt{tt12}
-\else
-\setfont\textrm{r10 scaled \mainmagstep}
-\setfont\texttt{tt10 scaled \mainmagstep}
-\fi
-% Instead of cmb10, you many want to use cmbx10.
-% cmbx10 is a prettier font on its own, but cmb10
-% looks better when embedded in a line with cmr10.
-\setfont\textbf{b10 scaled \mainmagstep}
-\setfont\textit{ti10 scaled \mainmagstep}
-\setfont\textsl{sl10 scaled \mainmagstep}
-\setfont\textsf{ss10 scaled \mainmagstep}
-\setfont\textsc{csc10 scaled \mainmagstep}
-\font\texti=cmmi10 scaled \mainmagstep
-\font\textsy=cmsy10 scaled \mainmagstep
-
-% A few fonts for @defun, etc.
-\setfont\defbf{bx10 scaled \magstep1} %was 1314
-\setfont\deftt{tt10 scaled \magstep1}
-\def\df{\let\tentt=\deftt \let\tenbf = \defbf \bf}
-
-% Fonts for indices and small examples.
-% We actually use the slanted font rather than the italic,
-% because texinfo normally uses the slanted fonts for that.
-% Do not make many font distinctions in general in the index, since they
-% aren't very useful.
-\setfont\ninett{tt9}
-\setfont\indrm{r9}
-\setfont\indit{sl9}
-\let\indsl=\indit
-\let\indtt=\ninett
-\let\indsf=\indrm
-\let\indbf=\indrm
-\setfont\indsc{csc10 at 9pt}
-\font\indi=cmmi9
-\font\indsy=cmsy9
-
-% Fonts for headings
-\setfont\chaprm{bx12 scaled \magstep2}
-\setfont\chapit{ti12 scaled \magstep2}
-\setfont\chapsl{sl12 scaled \magstep2}
-\setfont\chaptt{tt12 scaled \magstep2}
-\setfont\chapsf{ss12 scaled \magstep2}
-\let\chapbf=\chaprm
-\setfont\chapsc{csc10 scaled\magstep3}
-\font\chapi=cmmi12 scaled \magstep2
-\font\chapsy=cmsy10 scaled \magstep3
-
-\setfont\secrm{bx12 scaled \magstep1}
-\setfont\secit{ti12 scaled \magstep1}
-\setfont\secsl{sl12 scaled \magstep1}
-\setfont\sectt{tt12 scaled \magstep1}
-\setfont\secsf{ss12 scaled \magstep1}
-\setfont\secbf{bx12 scaled \magstep1}
-\setfont\secsc{csc10 scaled\magstep2}
-\font\seci=cmmi12 scaled \magstep1
-\font\secsy=cmsy10 scaled \magstep2
-
-% \setfont\ssecrm{bx10 scaled \magstep1}    % This size an font looked bad.
-% \setfont\ssecit{cmti10 scaled \magstep1}    % The letters were too crowded.
-% \setfont\ssecsl{sl10 scaled \magstep1}
-% \setfont\ssectt{tt10 scaled \magstep1}
-% \setfont\ssecsf{ss10 scaled \magstep1}
-
-%\setfont\ssecrm{b10 scaled 1315}	% Note the use of cmb rather than cmbx.
-%\setfont\ssecit{ti10 scaled 1315}	% Also, the size is a little larger than
-%\setfont\ssecsl{sl10 scaled 1315}	% being scaled magstep1.
-%\setfont\ssectt{tt10 scaled 1315}
-%\setfont\ssecsf{ss10 scaled 1315}
-
-%\let\ssecbf=\ssecrm
-
-\setfont\ssecrm{bx12 scaled \magstephalf}
-\setfont\ssecit{ti12 scaled \magstephalf}
-\setfont\ssecsl{sl12 scaled \magstephalf}
-\setfont\ssectt{tt12 scaled \magstephalf}
-\setfont\ssecsf{ss12 scaled \magstephalf}
-\setfont\ssecbf{bx12 scaled \magstephalf}
-\setfont\ssecsc{csc10 scaled \magstep1}
-\font\sseci=cmmi12 scaled \magstephalf
-\font\ssecsy=cmsy10 scaled \magstep1
-% The smallcaps and symbol fonts should actually be scaled \magstep1.5,
-% but that is not a standard magnification.
-
-% Fonts for title page:
-\setfont\titlerm{bx12 scaled \magstep3}
-\let\authorrm = \secrm
-
-% In order for the font changes to affect most math symbols and letters,
-% we have to define the \textfont of the standard families.  Since
-% texinfo doesn't allow for producing subscripts and superscripts, we
-% don't bother to reset \scriptfont and \scriptscriptfont (which would
-% also require loading a lot more fonts).
-%
-\def\resetmathfonts{%
-  \textfont0 = \tenrm \textfont1 = \teni \textfont2 = \tensy
-  \textfont\itfam = \tenit \textfont\slfam = \tensl \textfont\bffam = \tenbf
-  \textfont\ttfam = \tentt \textfont\sffam = \tensf
-}
-
-
-% The font-changing commands redefine the meanings of \tenSTYLE, instead
-% of just \STYLE.  We do this so that font changes will continue to work
-% in math mode, where it is the current \fam that is relevant in most
-% cases, not the current.  Plain TeX does, for example,
-% \def\bf{\fam=\bffam \tenbf}  By redefining \tenbf, we obviate the need
-% to redefine \bf itself.
-\def\textfonts{%
-  \let\tenrm=\textrm \let\tenit=\textit \let\tensl=\textsl
-  \let\tenbf=\textbf \let\tentt=\texttt \let\smallcaps=\textsc
-  \let\tensf=\textsf \let\teni=\texti \let\tensy=\textsy
-  \resetmathfonts}
-\def\chapfonts{%
-  \let\tenrm=\chaprm \let\tenit=\chapit \let\tensl=\chapsl
-  \let\tenbf=\chapbf \let\tentt=\chaptt \let\smallcaps=\chapsc
-  \let\tensf=\chapsf \let\teni=\chapi \let\tensy=\chapsy
-  \resetmathfonts}
-\def\secfonts{%
-  \let\tenrm=\secrm \let\tenit=\secit \let\tensl=\secsl
-  \let\tenbf=\secbf \let\tentt=\sectt \let\smallcaps=\secsc
-  \let\tensf=\secsf \let\teni=\seci \let\tensy=\secsy
-  \resetmathfonts}
-\def\subsecfonts{%
-  \let\tenrm=\ssecrm \let\tenit=\ssecit \let\tensl=\ssecsl
-  \let\tenbf=\ssecbf \let\tentt=\ssectt \let\smallcaps=\ssecsc
-  \let\tensf=\ssecsf \let\teni=\sseci \let\tensy=\ssecsy
-  \resetmathfonts}
-\def\indexfonts{%
-  \let\tenrm=\indrm \let\tenit=\indit \let\tensl=\indsl
-  \let\tenbf=\indbf \let\tentt=\indtt \let\smallcaps=\indsc
-  \let\tensf=\indsf \let\teni=\indi \let\tensy=\indsy
-  \resetmathfonts}
-
-% Set up the default fonts, so we can use them for creating boxes.
-%
-\textfonts
-
-% Count depth in font-changes, for error checks
-\newcount\fontdepth \fontdepth=0
-
-% Fonts for short table of contents.
-\setfont\shortcontrm{r12}
-\setfont\shortcontbf{bx12}
-\setfont\shortcontsl{sl12}
-
-%% Add scribe-like font environments, plus @l for inline lisp (usually sans
-%% serif) and @ii for TeX italic
-
-% \smartitalic{ARG} outputs arg in italics, followed by an italic correction
-% unless the following character is such as not to need one.
-\def\smartitalicx{\ifx\next,\else\ifx\next-\else\ifx\next.\else\/\fi\fi\fi}
-\def\smartitalic#1{{\sl #1}\futurelet\next\smartitalicx}
-
-\let\i=\smartitalic
-\let\var=\smartitalic
-\let\dfn=\smartitalic
-\let\emph=\smartitalic
-\let\cite=\smartitalic
-
-\def\b#1{{\bf #1}}
-\let\strong=\b
-
-% We can't just use \exhyphenpenalty, because that only has effect at
-% the end of a paragraph.  Restore normal hyphenation at the end of the
-% group within which \nohyphenation is presumably called.
-%
-\def\nohyphenation{\hyphenchar\font = -1  \aftergroup\restorehyphenation}
-\def\restorehyphenation{\hyphenchar\font = `- }
-
-\def\t#1{%
-  {\tt \rawbackslash \frenchspacing #1}%
-  \null
-}
-\let\ttfont=\t
-\def\samp #1{`\tclose{#1}'\null}
-\def\key #1{{\tt \nohyphenation \uppercase{#1}}\null}
-\def\ctrl #1{{\tt \rawbackslash \hat}#1}
-
-\let\file=\samp
-
-% @code is a modification of @t,
-% which makes spaces the same size as normal in the surrounding text.
-\def\tclose#1{%
-  {%
-    % Change normal interword space to be same as for the current font.
-    \spaceskip = \fontdimen2\font
-    %
-    % Switch to typewriter.
-    \tt
-    %
-    % But `\ ' produces the large typewriter interword space.
-    \def\ {{\spaceskip = 0pt{} }}%
-    %
-    % Turn off hyphenation.
-    \nohyphenation
-    %
-    \rawbackslash
-    \frenchspacing
-    #1%
-  }%
-  \null
-}
-
-% We *must* turn on hyphenation at `-' and `_' in \code.
-% Otherwise, it is too hard to avoid overful hboxes
-% in the Emacs manual, the Library manual, etc.
-
-% Unfortunately, TeX uses one parameter (\hyphenchar) to control
-% both hyphenation at - and hyphenation within words.
-% We must therefore turn them both off (\tclose does that)
-% and arrange explicitly to hyphenate an a dash.
-%  -- rms.
-{
-\catcode`\-=\active
-\catcode`\_=\active
-\global\def\code{\begingroup \catcode`\-=\active \let-\codedash \catcode`\_=\active \let_\codeunder \codex}
-% The following is used by \doprintindex to insure that long function names
-% wrap around.  It is necessary for - and _ to be active before the index is
-% read from the file, as \entry parses the arguments long before \code is
-% ever called.  -- mycroft
-\global\def\indexbreaks{\catcode`\-=\active \let-\realdash \catcode`\_=\active \let_\realunder}
-}
-
-\def\realdash{-}
-\def\realunder{_}
-\def\codedash{-\discretionary{}{}{}}
-\def\codeunder{\normalunderscore\discretionary{}{}{}}
-\def\codex #1{\tclose{#1}\endgroup}
-
-%\let\exp=\tclose  %Was temporary
-
-% @kbd is like @code, except that if the argument is just one @key command,
-% then @kbd has no effect.
-
-\def\xkey{\key}
-\def\kbdfoo#1#2#3\par{\def\one{#1}\def\three{#3}\def\threex{??}%
-\ifx\one\xkey\ifx\threex\three \key{#2}%
-\else\tclose{\look}\fi
-\else\tclose{\look}\fi}
-
-% Typeset a dimension, e.g., `in' or `pt'.  The only reason for the
-% argument is to make the input look right: @dmn{pt} instead of
-% @dmn{}pt.
-%
-\def\dmn#1{\thinspace #1}
-
-\def\kbd#1{\def\look{#1}\expandafter\kbdfoo\look??\par}
-
-\def\l#1{{\li #1}\null}		%
-
-\def\r#1{{\rm #1}}		% roman font
-% Use of \lowercase was suggested.
-\def\sc#1{{\smallcaps#1}}	% smallcaps font
-\def\ii#1{{\it #1}}		% italic font
-
-\message{page headings,}
-
-\newskip\titlepagetopglue \titlepagetopglue = 1.5in
-\newskip\titlepagebottomglue \titlepagebottomglue = 2pc
-
-% First the title page.  Must do @settitle before @titlepage.
-\def\titlefont#1{{\titlerm #1}}
-
-\newif\ifseenauthor
-\newif\iffinishedtitlepage
-
-\def\shorttitlepage{\parsearg\shorttitlepagezzz}
-\def\shorttitlepagezzz #1{\begingroup\hbox{}\vskip 1.5in \chaprm \centerline{#1}%
-	\endgroup\page\hbox{}\page}
-
-\def\titlepage{\begingroup \parindent=0pt \textfonts
-   \let\subtitlerm=\tenrm
-% I deinstalled the following change because \cmr12 is undefined.
-% This change was not in the ChangeLog anyway.  --rms.
-%   \let\subtitlerm=\cmr12
-   \def\subtitlefont{\subtitlerm \normalbaselineskip = 13pt \normalbaselines}%
-   %
-   \def\authorfont{\authorrm \normalbaselineskip = 16pt \normalbaselines}%
-   %
-   % Leave some space at the very top of the page.
-   \vglue\titlepagetopglue
-   %
-   % Now you can print the title using @title.
-   \def\title{\parsearg\titlezzz}%
-   \def\titlezzz##1{\leftline{\titlefont{##1}}
-		    % print a rule at the page bottom also.
-		    \finishedtitlepagefalse
-		    \vskip4pt \hrule height 4pt width \hsize \vskip4pt}%
-   % No rule at page bottom unless we print one at the top with @title.
-   \finishedtitlepagetrue
-   %
-   % Now you can put text using @subtitle.
-   \def\subtitle{\parsearg\subtitlezzz}%
-   \def\subtitlezzz##1{{\subtitlefont \rightline{##1}}}%
-   %
-   % @author should come last, but may come many times.
-   \def\author{\parsearg\authorzzz}%
-   \def\authorzzz##1{\ifseenauthor\else\vskip 0pt plus 1filll\seenauthortrue\fi
-      {\authorfont \leftline{##1}}}%
-   %
-   % Most title ``pages'' are actually two pages long, with space
-   % at the top of the second.  We don't want the ragged left on the second.
-   \let\oldpage = \page
-   \def\page{%
-      \iffinishedtitlepage\else
-	 \finishtitlepage
-      \fi
-      \oldpage
-      \let\page = \oldpage
-      \hbox{}}%
-%   \def\page{\oldpage \hbox{}}
-}
-
-\def\Etitlepage{%
-   \iffinishedtitlepage\else
-      \finishtitlepage
-   \fi
-   % It is important to do the page break before ending the group,
-   % because the headline and footline are only empty inside the group.
-   % If we use the new definition of \page, we always get a blank page
-   % after the title page, which we certainly don't want.
-   \oldpage
-   \endgroup
-   \HEADINGSon
-}
-
-\def\finishtitlepage{%
-   \vskip4pt \hrule height 2pt width \hsize
-   \vskip\titlepagebottomglue
-   \finishedtitlepagetrue
-}
-
-%%% Set up page headings and footings.
-
-\let\thispage=\folio
-
-\newtoks \evenheadline    % Token sequence for heading line of even pages
-\newtoks \oddheadline     % Token sequence for heading line of odd pages
-\newtoks \evenfootline    % Token sequence for footing line of even pages
-\newtoks \oddfootline     % Token sequence for footing line of odd pages
-
-% Now make Tex use those variables
-\headline={{\textfonts\rm \ifodd\pageno \the\oddheadline
-                            \else \the\evenheadline \fi}}
-\footline={{\textfonts\rm \ifodd\pageno \the\oddfootline
-                            \else \the\evenfootline \fi}\HEADINGShook}
-\let\HEADINGShook=\relax
-
-% Commands to set those variables.
-% For example, this is what  @headings on  does
-% @evenheading @thistitle|@thispage|@thischapter
-% @oddheading @thischapter|@thispage|@thistitle
-% @evenfooting @thisfile||
-% @oddfooting ||@thisfile
-
-\def\evenheading{\parsearg\evenheadingxxx}
-\def\oddheading{\parsearg\oddheadingxxx}
-\def\everyheading{\parsearg\everyheadingxxx}
-
-\def\evenfooting{\parsearg\evenfootingxxx}
-\def\oddfooting{\parsearg\oddfootingxxx}
-\def\everyfooting{\parsearg\everyfootingxxx}
-
-{\catcode`\@=0 %
-
-\gdef\evenheadingxxx #1{\evenheadingyyy #1@|@|@|@|\finish}
-\gdef\evenheadingyyy #1@|#2@|#3@|#4\finish{%
-\global\evenheadline={\rlap{\centerline{#2}}\line{#1\hfil#3}}}
-
-\gdef\oddheadingxxx #1{\oddheadingyyy #1@|@|@|@|\finish}
-\gdef\oddheadingyyy #1@|#2@|#3@|#4\finish{%
-\global\oddheadline={\rlap{\centerline{#2}}\line{#1\hfil#3}}}
-
-\gdef\everyheadingxxx #1{\everyheadingyyy #1@|@|@|@|\finish}
-\gdef\everyheadingyyy #1@|#2@|#3@|#4\finish{%
-\global\evenheadline={\rlap{\centerline{#2}}\line{#1\hfil#3}}
-\global\oddheadline={\rlap{\centerline{#2}}\line{#1\hfil#3}}}
-
-\gdef\evenfootingxxx #1{\evenfootingyyy #1@|@|@|@|\finish}
-\gdef\evenfootingyyy #1@|#2@|#3@|#4\finish{%
-\global\evenfootline={\rlap{\centerline{#2}}\line{#1\hfil#3}}}
-
-\gdef\oddfootingxxx #1{\oddfootingyyy #1@|@|@|@|\finish}
-\gdef\oddfootingyyy #1@|#2@|#3@|#4\finish{%
-\global\oddfootline={\rlap{\centerline{#2}}\line{#1\hfil#3}}}
-
-\gdef\everyfootingxxx #1{\everyfootingyyy #1@|@|@|@|\finish}
-\gdef\everyfootingyyy #1@|#2@|#3@|#4\finish{%
-\global\evenfootline={\rlap{\centerline{#2}}\line{#1\hfil#3}}
-\global\oddfootline={\rlap{\centerline{#2}}\line{#1\hfil#3}}}
-%
-}% unbind the catcode of @.
-
-% @headings double	turns headings on for double-sided printing.
-% @headings single	turns headings on for single-sided printing.
-% @headings off		turns them off.
-% @headings on		same as @headings double, retained for compatibility.
-% @headings after	turns on double-sided headings after this page.
-% @headings doubleafter	turns on double-sided headings after this page.
-% @headings singleafter turns on single-sided headings after this page.
-% By default, they are off.
-
-\def\headings #1 {\csname HEADINGS#1\endcsname}
-
-\def\HEADINGSoff{
-\global\evenheadline={\hfil} \global\evenfootline={\hfil}
-\global\oddheadline={\hfil} \global\oddfootline={\hfil}}
-\HEADINGSoff
-% When we turn headings on, set the page number to 1.
-% For double-sided printing, put current file name in lower left corner,
-% chapter name on inside top of right hand pages, document
-% title on inside top of left hand pages, and page numbers on outside top
-% edge of all pages.
-\def\HEADINGSdouble{
-%\pagealignmacro
-\global\pageno=1
-\global\evenfootline={\hfil}
-\global\oddfootline={\hfil}
-\global\evenheadline={\line{\folio\hfil\thistitle}}
-\global\oddheadline={\line{\thischapter\hfil\folio}}
-}
-% For single-sided printing, chapter title goes across top left of page,
-% page number on top right.
-\def\HEADINGSsingle{
-%\pagealignmacro
-\global\pageno=1
-\global\evenfootline={\hfil}
-\global\oddfootline={\hfil}
-\global\evenheadline={\line{\thischapter\hfil\folio}}
-\global\oddheadline={\line{\thischapter\hfil\folio}}
-}
-\def\HEADINGSon{\HEADINGSdouble}
-
-\def\HEADINGSafter{\let\HEADINGShook=\HEADINGSdoublex}
-\let\HEADINGSdoubleafter=\HEADINGSafter
-\def\HEADINGSdoublex{%
-\global\evenfootline={\hfil}
-\global\oddfootline={\hfil}
-\global\evenheadline={\line{\folio\hfil\thistitle}}
-\global\oddheadline={\line{\thischapter\hfil\folio}}
-}
-
-\def\HEADINGSsingleafter{\let\HEADINGShook=\HEADINGSsinglex}
-\def\HEADINGSsinglex{%
-\global\evenfootline={\hfil}
-\global\oddfootline={\hfil}
-\global\evenheadline={\line{\thischapter\hfil\folio}}
-\global\oddheadline={\line{\thischapter\hfil\folio}}
-}
-
-% Subroutines used in generating headings
-% Produces Day Month Year style of output.
-\def\today{\number\day\space
-\ifcase\month\or
-January\or February\or March\or April\or May\or June\or
-July\or August\or September\or October\or November\or December\fi
-\space\number\year}
-
-% Use this if you want the Month Day, Year style of output.
-%\def\today{\ifcase\month\or
-%January\or February\or March\or April\or May\or June\or
-%July\or August\or September\or October\or November\or December\fi
-%\space\number\day, \number\year}
-
-% @settitle line...  specifies the title of the document, for headings
-% It generates no output of its own
-
-\def\thistitle{No Title}
-\def\settitle{\parsearg\settitlezzz}
-\def\settitlezzz #1{\gdef\thistitle{#1}}
-
-\message{tables,}
-
-% @tabs -- simple alignment
-
-% These don't work.  For one thing, \+ is defined as outer.
-% So these macros cannot even be defined.
-
-%\def\tabs{\parsearg\tabszzz}
-%\def\tabszzz #1{\settabs\+#1\cr}
-%\def\tabline{\parsearg\tablinezzz}
-%\def\tablinezzz #1{\+#1\cr}
-%\def\&{&}
-
-% Tables -- @table, @ftable, @vtable, @item(x), @kitem(x), @xitem(x).
-
-% default indentation of table text
-\newdimen\tableindent \tableindent=.8in
-% default indentation of @itemize and @enumerate text
-\newdimen\itemindent  \itemindent=.3in
-% margin between end of table item and start of table text.
-\newdimen\itemmargin  \itemmargin=.1in
-
-% used internally for \itemindent minus \itemmargin
-\newdimen\itemmax
-
-% Note @table, @vtable, and @vtable define @item, @itemx, etc., with
-% these defs.
-% They also define \itemindex
-% to index the item name in whatever manner is desired (perhaps none).
-
-\newif\ifitemxneedsnegativevskip
-
-\def\itemxpar{\par\ifitemxneedsnegativevskip\vskip-\parskip\nobreak\fi}
-
-\def\internalBitem{\smallbreak \parsearg\itemzzz}
-\def\internalBitemx{\itemxpar \parsearg\itemzzz}
-
-\def\internalBxitem "#1"{\def\xitemsubtopix{#1} \smallbreak \parsearg\xitemzzz}
-\def\internalBxitemx "#1"{\def\xitemsubtopix{#1} \itemxpar \parsearg\xitemzzz}
-
-\def\internalBkitem{\smallbreak \parsearg\kitemzzz}
-\def\internalBkitemx{\itemxpar \parsearg\kitemzzz}
-
-\def\kitemzzz #1{\dosubind {kw}{\code{#1}}{for {\bf \lastfunction}}%
-                 \itemzzz {#1}}
-
-\def\xitemzzz #1{\dosubind {kw}{\code{#1}}{for {\bf \xitemsubtopic}}%
-                 \itemzzz {#1}}
-
-\def\itemzzz #1{\begingroup %
-  \advance\hsize by -\rightskip
-  \advance\hsize by -\tableindent
-  \setbox0=\hbox{\itemfont{#1}}%
-  \itemindex{#1}%
-  \nobreak % This prevents a break before @itemx.
-  %
-  % Be sure we are not still in the middle of a paragraph.
-  %{\parskip = 0in
-  %\par
-  %}%
-  %
-  % If the item text does not fit in the space we have, put it on a line
-  % by itself, and do not allow a page break either before or after that
-  % line.  We do not start a paragraph here because then if the next
-  % command is, e.g., @kindex, the whatsit would get put into the
-  % horizontal list on a line by itself, resulting in extra blank space.
-  \ifdim \wd0>\itemmax
-    %
-    % Make this a paragraph so we get the \parskip glue and wrapping,
-    % but leave it ragged-right.
-    \begingroup
-      \advance\leftskip by-\tableindent
-      \advance\hsize by\tableindent
-      \advance\rightskip by0pt plus1fil
-      \leavevmode\unhbox0\par
-    \endgroup
-    %
-    % We're going to be starting a paragraph, but we don't want the
-    % \parskip glue -- logically it's part of the @item we just started.
-    \nobreak \vskip-\parskip
-    %
-    % Stop a page break at the \parskip glue coming up.  Unfortunately
-    % we can't prevent a possible page break at the following
-    % \baselineskip glue.
-    \nobreak
-    \endgroup
-    \itemxneedsnegativevskipfalse
-  \else
-    % The item text fits into the space.  Start a paragraph, so that the
-    % following text (if any) will end up on the same line.  Since that
-    % text will be indented by \tableindent, we make the item text be in
-    % a zero-width box.
-    \noindent
-    \rlap{\hskip -\tableindent\box0}\ignorespaces%
-    \endgroup%
-    \itemxneedsnegativevskiptrue%
-  \fi
-}
-
-\def\item{\errmessage{@item while not in a table}}
-\def\itemx{\errmessage{@itemx while not in a table}}
-\def\kitem{\errmessage{@kitem while not in a table}}
-\def\kitemx{\errmessage{@kitemx while not in a table}}
-\def\xitem{\errmessage{@xitem while not in a table}}
-\def\xitemx{\errmessage{@xitemx while not in a table}}
-
-%% Contains a kludge to get @end[description] to work
-\def\description{\tablez{\dontindex}{1}{}{}{}{}}
-
-\def\table{\begingroup\inENV\obeylines\obeyspaces\tablex}
-{\obeylines\obeyspaces%
-\gdef\tablex #1^^M{%
-\tabley\dontindex#1        \endtabley}}
-
-\def\ftable{\begingroup\inENV\obeylines\obeyspaces\ftablex}
-{\obeylines\obeyspaces%
-\gdef\ftablex #1^^M{%
-\tabley\fnitemindex#1        \endtabley
-\def\Eftable{\endgraf\afterenvbreak\endgroup}%
-\let\Etable=\relax}}
-
-\def\vtable{\begingroup\inENV\obeylines\obeyspaces\vtablex}
-{\obeylines\obeyspaces%
-\gdef\vtablex #1^^M{%
-\tabley\vritemindex#1        \endtabley
-\def\Evtable{\endgraf\afterenvbreak\endgroup}%
-\let\Etable=\relax}}
-
-\def\dontindex #1{}
-\def\fnitemindex #1{\doind {fn}{\code{#1}}}%
-\def\vritemindex #1{\doind {vr}{\code{#1}}}%
-
-{\obeyspaces %
-\gdef\tabley#1#2 #3 #4 #5 #6 #7\endtabley{\endgroup%
-\tablez{#1}{#2}{#3}{#4}{#5}{#6}}}
-
-\def\tablez #1#2#3#4#5#6{%
-\aboveenvbreak %
-\begingroup %
-\def\Edescription{\Etable}% Necessary kludge.
-\let\itemindex=#1%
-\ifnum 0#3>0 \advance \leftskip by #3\mil \fi %
-\ifnum 0#4>0 \tableindent=#4\mil \fi %
-\ifnum 0#5>0 \advance \rightskip by #5\mil \fi %
-\def\itemfont{#2}%
-\itemmax=\tableindent %
-\advance \itemmax by -\itemmargin %
-\advance \leftskip by \tableindent %
-\exdentamount=\tableindent
-\parindent = 0pt
-\parskip = \smallskipamount
-\ifdim \parskip=0pt \parskip=2pt \fi%
-\def\Etable{\endgraf\afterenvbreak\endgroup}%
-\let\item = \internalBitem %
-\let\itemx = \internalBitemx %
-\let\kitem = \internalBkitem %
-\let\kitemx = \internalBkitemx %
-\let\xitem = \internalBxitem %
-\let\xitemx = \internalBxitemx %
-}
-
-% This is the counter used by @enumerate, which is really @itemize
-
-\newcount \itemno
-
-\def\itemize{\parsearg\itemizezzz}
-
-\def\itemizezzz #1{%
-  \begingroup % ended by the @end itemsize
-  \itemizey {#1}{\Eitemize}
-}
-
-\def\itemizey #1#2{%
-\aboveenvbreak %
-\itemmax=\itemindent %
-\advance \itemmax by -\itemmargin %
-\advance \leftskip by \itemindent %
-\exdentamount=\itemindent
-\parindent = 0pt %
-\parskip = \smallskipamount %
-\ifdim \parskip=0pt \parskip=2pt \fi%
-\def#2{\endgraf\afterenvbreak\endgroup}%
-\def\itemcontents{#1}%
-\let\item=\itemizeitem}
-
-% Set sfcode to normal for the chars that usually have another value.
-% These are `.?!:;,'
-\def\frenchspacing{\sfcode46=1000 \sfcode63=1000 \sfcode33=1000
-  \sfcode58=1000 \sfcode59=1000 \sfcode44=1000 }
-
-% \splitoff TOKENS\endmark defines \first to be the first token in
-% TOKENS, and \rest to be the remainder.
-%
-\def\splitoff#1#2\endmark{\def\first{#1}\def\rest{#2}}%
-
-% Allow an optional argument of an uppercase letter, lowercase letter,
-% or number, to specify the first label in the enumerated list.  No
-% argument is the same as `1'.
-%
-\def\enumerate{\parsearg\enumeratezzz}
-\def\enumeratezzz #1{\enumeratey #1  \endenumeratey}
-\def\enumeratey #1 #2\endenumeratey{%
-  \begingroup % ended by the @end enumerate
-  %
-  % If we were given no argument, pretend we were given `1'.
-  \def\thearg{#1}%
-  \ifx\thearg\empty \def\thearg{1}\fi
-  %
-  % Detect if the argument is a single token.  If so, it might be a
-  % letter.  Otherwise, the only valid thing it can be is a number.
-  % (We will always have one token, because of the test we just made.
-  % This is a good thing, since \splitoff doesn't work given nothing at
-  % all -- the first parameter is undelimited.)
-  \expandafter\splitoff\thearg\endmark
-  \ifx\rest\empty
-    % Only one token in the argument.  It could still be anything.
-    % A ``lowercase letter'' is one whose \lccode is nonzero.
-    % An ``uppercase letter'' is one whose \lccode is both nonzero, and
-    %   not equal to itself.
-    % Otherwise, we assume it's a number.
-    %
-    % We need the \relax at the end of the \ifnum lines to stop TeX from
-    % continuing to look for a <number>.
-    %
-    \ifnum\lccode\expandafter`\thearg=0\relax
-      \numericenumerate % a number (we hope)
-    \else
-      % It's a letter.
-      \ifnum\lccode\expandafter`\thearg=\expandafter`\thearg\relax
-        \lowercaseenumerate % lowercase letter
-      \else
-        \uppercaseenumerate % uppercase letter
-      \fi
-    \fi
-  \else
-    % Multiple tokens in the argument.  We hope it's a number.
-    \numericenumerate
-  \fi
-}
-
-% An @enumerate whose labels are integers.  The starting integer is
-% given in \thearg.
-%
-\def\numericenumerate{%
-  \itemno = \thearg
-  \startenumeration{\the\itemno}%
-}
-
-% The starting (lowercase) letter is in \thearg.
-\def\lowercaseenumerate{%
-  \itemno = \expandafter`\thearg
-  \startenumeration{%
-    % Be sure we're not beyond the end of the alphabet.
-    \ifnum\itemno=0
-      \errmessage{No more lowercase letters in @enumerate; get a bigger
-                  alphabet}%
-    \fi
-    \char\lccode\itemno
-  }%
-}
-
-% The starting (uppercase) letter is in \thearg.
-\def\uppercaseenumerate{%
-  \itemno = \expandafter`\thearg
-  \startenumeration{%
-    % Be sure we're not beyond the end of the alphabet.
-    \ifnum\itemno=0
-      \errmessage{No more uppercase letters in @enumerate; get a bigger
-                  alphabet}
-    \fi
-    \char\uccode\itemno
-  }%
-}
-
-% Call itemizey, adding a period to the first argument and supplying the
-% common last two arguments.  Also subtract one from the initial value in
-% \itemno, since @item increments \itemno.
-%
-\def\startenumeration#1{%
-  \advance\itemno by -1
-  \itemizey{#1.}\Eenumerate\flushcr
-}
-
-% @alphaenumerate and @capsenumerate are abbreviations for giving an arg
-% to @enumerate.
-%
-\def\alphaenumerate{\enumerate{a}}
-\def\capsenumerate{\enumerate{A}}
-\def\Ealphaenumerate{\Eenumerate}
-\def\Ecapsenumerate{\Eenumerate}
-
-% Definition of @item while inside @itemize.
-
-\def\itemizeitem{%
-\advance\itemno by 1
-{\let\par=\endgraf \smallbreak}%
-\ifhmode \errmessage{\in hmode at itemizeitem}\fi
-{\parskip=0in \hskip 0pt
-\hbox to 0pt{\hss \itemcontents\hskip \itemmargin}%
-\vadjust{\penalty 1200}}%
-\flushcr}
-
-% @multitable macros
-% Amy Hendrickson, 8/18/94
-%
-% @multitable ... @endmultitable will make as many columns as desired.
-% Contents of each column will wrap at width given in preamble. Width
-% can be specified either with sample text given in a template line,
-% or in percent of \hsize, the current width of text on page.
-
-% Table can continue over pages but will only break between lines.
-
-% To make preamble:
-%
-% Either define widths of columns in terms of percent of \hsize: 
-%   @multitable @percentofhsize .2 .3 .5
-%   @item ...
-%
-%   Numbers following @percentofhsize are the percent of the total
-%   current hsize to be used for each column. You may use as many
-%   columns as desired.
-
-% Or use a template:
-%   @multitable {Column 1 template} {Column 2 template} {Column 3 template}
-%   @item ...
-%   using the widest term desired in each column.
-
-
-% Each new table line starts with @item, each subsequent new column 
-% starts with @tab. Empty columns may be produced by supplying @tab's
-% with nothing between them for as many times as empty columns are needed,
-% ie, @tab@tab@tab will produce two empty columns.
-
-% @item, @tab, @multicolumn or @endmulticolumn do not need to be on their
-% own lines, but it will not hurt if they are.
-
-% Sample multitable:
-
-%   @multitable {Column 1 template} {Column 2 template} {Column 3 template}
-%   @item first col stuff @tab second col stuff @tab third col
-%   @item 
-%   first col stuff 
-%   @tab 
-%   second col stuff 
-%   @tab 
-%   third col 
-%   @item first col stuff @tab second col stuff 
-%   @tab Many paragraphs of text may be used in any column.
-%     
-%         They will wrap at the width determined by the template.
-%   @item@tab@tab This will be in third column.
-%   @endmultitable
-
-% Default dimensions may be reset by user.
-% @intableparskip will set vertical space between paragraphs in table.
-% @intableparindent will set paragraph indent in table.
-% @spacebetweencols will set horizontal space to be left between columns.
-% @spacebetweenlines will set vertical space to be left between lines.
-
-%%%%
-% Dimensions 
-
-\newdimen\intableparskip
-\newdimen\intableparindent
-\newdimen\spacebetweencols
-\newdimen\spacebetweenlines
-\intableparskip=0pt
-\intableparindent=6pt
-\spacebetweencols=12pt
-\spacebetweenlines=12pt
-
-%%%%
-% Macros used to set up halign preamble:
-\let\endsetuptable\relax
-\def\xendsetuptable{\endsetuptable}
-\let\percentofhsize\relax
-\def\xpercentofhsize{\percentofhsize}
-\newif\ifsetpercent
-
-\newcount\colcount
-\def\setuptable#1{\def\firstarg{#1}%
-\ifx\firstarg\xendsetuptable\let\go\relax%
-\else
-  \ifx\firstarg\xpercentofhsize\global\setpercenttrue%
-  \else
-    \ifsetpercent
-       \if#1.\else%
-       \global\advance\colcount by1 %
-       \expandafter\xdef\csname col\the\colcount\endcsname{.#1\hsize}%
-       \fi
-    \else
-       \global\advance\colcount by1
-       \setbox0=\hbox{#1}%
-       \expandafter\xdef\csname col\the\colcount\endcsname{\the\wd0}%
-    \fi%
-  \fi%
-  \let\go\setuptable%
-\fi\go}
-%%%%
-% multitable syntax
-\def\tab{&}
-
-%%%%
-% @multitable ... @endmultitable definitions:
-
-\def\multitable#1\item{\bgroup
-\let\item\cr
-\tolerance=9500
-\hbadness=9500
-\parskip=\intableparskip
-\parindent=\intableparindent
-\overfullrule=0pt
-\global\colcount=0\relax%
-\def\Emultitable{\global\setpercentfalse\global\everycr{}\cr\egroup\egroup}%
- % To parse everything between @multitable and @item :
-\def\one{#1}\expandafter\setuptable\one\endsetuptable
- % Need to reset this to 0 after \setuptable.
-\global\colcount=0\relax% 
- %
- % This preamble sets up a generic column definition, which will
- % be used as many times as user calls for columns.
- % \vtop will set a single line and will also let text wrap and 
- % continue for many paragraphs if desired.
-\halign\bgroup&\global\advance\colcount by 1\relax%
-\vtop{\hsize=\expandafter\csname col\the\colcount\endcsname
- % In order to keep entries from bumping into each other
- % we will add a \leftskip of \spacebetweencols to all columns after
- % the first one.
- %  If a template has been used, we will add \spacebetweencols 
- % to the width of each template entry.
- %  If user has set preamble in terms of percent of \hsize
- % we will use that dimension as the width of the column, and
- % the \leftskip will keep entries from bumping into each other.
- % Table will start at left margin and final column will justify at
- % right margin.
-\ifnum\colcount=1
-\else
-  \ifsetpercent
-  \else
-   % If user has <not> set preamble in terms of percent of \hsize
-   % we will advance \hsize by \spacebetweencols 
-  \advance\hsize by \spacebetweencols
-  \fi
- % In either case we will make \leftskip=\spacebetweencols:
-\leftskip=\spacebetweencols
-\fi
-\noindent##}\cr%
- % \everycr will reset column counter, \colcount, at the end of
- % each line. Every column  entry will cause \colcount to advance by one. 
- % The table preamble
- % looks at the current \colcount to find the correct column width.
-\global\everycr{\noalign{\nointerlineskip\vskip\spacebetweenlines
-\filbreak%% keeps underfull box messages off when table breaks over pages.
-\global\colcount=0\relax}}}
-
-\message{indexing,}
-% Index generation facilities
-
-% Define \newwrite to be identical to plain tex's \newwrite
-% except not \outer, so it can be used within \newindex.
-{\catcode`\@=11
-\gdef\newwrite{\alloc@7\write\chardef\sixt@@n}}
-
-% \newindex {foo} defines an index named foo.
-% It automatically defines \fooindex such that
-% \fooindex ...rest of line... puts an entry in the index foo.
-% It also defines \fooindfile to be the number of the output channel for
-% the file that	accumulates this index.  The file's extension is foo.
-% The name of an index should be no more than 2 characters long
-% for the sake of vms.
-
-\def\newindex #1{
-\expandafter\newwrite \csname#1indfile\endcsname% Define number for output file
-\openout \csname#1indfile\endcsname \jobname.#1	% Open the file
-\expandafter\xdef\csname#1index\endcsname{%	% Define \xxxindex
-\noexpand\doindex {#1}}
-}
-
-% @defindex foo  ==  \newindex{foo}
-
-\def\defindex{\parsearg\newindex}
-
-% Define @defcodeindex, like @defindex except put all entries in @code.
-
-\def\newcodeindex #1{
-\expandafter\newwrite \csname#1indfile\endcsname% Define number for output file
-\openout \csname#1indfile\endcsname \jobname.#1	% Open the file
-\expandafter\xdef\csname#1index\endcsname{%	% Define \xxxindex
-\noexpand\docodeindex {#1}}
-}
-
-\def\defcodeindex{\parsearg\newcodeindex}
-
-% @synindex foo bar    makes index foo feed into index bar.
-% Do this instead of @defindex foo if you don't want it as a separate index.
-\def\synindex #1 #2 {%
-\expandafter\let\expandafter\synindexfoo\expandafter=\csname#2indfile\endcsname
-\expandafter\let\csname#1indfile\endcsname=\synindexfoo
-\expandafter\xdef\csname#1index\endcsname{%	% Define \xxxindex
-\noexpand\doindex {#2}}%
-}
-
-% @syncodeindex foo bar   similar, but put all entries made for index foo
-% inside @code.
-\def\syncodeindex #1 #2 {%
-\expandafter\let\expandafter\synindexfoo\expandafter=\csname#2indfile\endcsname
-\expandafter\let\csname#1indfile\endcsname=\synindexfoo
-\expandafter\xdef\csname#1index\endcsname{%	% Define \xxxindex
-\noexpand\docodeindex {#2}}%
-}
-
-% Define \doindex, the driver for all \fooindex macros.
-% Argument #1 is generated by the calling \fooindex macro,
-%  and it is "foo", the name of the index.
-
-% \doindex just uses \parsearg; it calls \doind for the actual work.
-% This is because \doind is more useful to call from other macros.
-
-% There is also \dosubind {index}{topic}{subtopic}
-% which makes an entry in a two-level index such as the operation index.
-
-\def\doindex#1{\edef\indexname{#1}\parsearg\singleindexer}
-\def\singleindexer #1{\doind{\indexname}{#1}}
-
-% like the previous two, but they put @code around the argument.
-\def\docodeindex#1{\edef\indexname{#1}\parsearg\singlecodeindexer}
-\def\singlecodeindexer #1{\doind{\indexname}{\code{#1}}}
-
-\def\indexdummies{%
-% Take care of the plain tex accent commands.
-\def\"{\realbackslash "}%
-\def\`{\realbackslash `}%
-\def\'{\realbackslash '}%
-\def\^{\realbackslash ^}%
-\def\~{\realbackslash ~}%
-\def\={\realbackslash =}%
-\def\b{\realbackslash b}%
-\def\c{\realbackslash c}%
-\def\d{\realbackslash d}%
-\def\u{\realbackslash u}%
-\def\v{\realbackslash v}%
-\def\H{\realbackslash H}%
-% Take care of the plain tex special European modified letters.
-\def\oe{\realbackslash oe}%
-\def\ae{\realbackslash ae}%
-\def\aa{\realbackslash aa}%
-\def\OE{\realbackslash OE}%
-\def\AE{\realbackslash AE}%
-\def\AA{\realbackslash AA}%
-\def\o{\realbackslash o}%
-\def\O{\realbackslash O}%
-\def\l{\realbackslash l}%
-\def\L{\realbackslash L}%
-\def\ss{\realbackslash ss}%
-% Take care of texinfo commands likely to appear in an index entry.
-\def\_{{\realbackslash _}}%
-\def\w{\realbackslash w }%
-\def\bf{\realbackslash bf }%
-\def\rm{\realbackslash rm }%
-\def\sl{\realbackslash sl }%
-\def\sf{\realbackslash sf}%
-\def\tt{\realbackslash tt}%
-\def\gtr{\realbackslash gtr}%
-\def\less{\realbackslash less}%
-\def\hat{\realbackslash hat}%
-\def\char{\realbackslash char}%
-\def\TeX{\realbackslash TeX}%
-\def\dots{\realbackslash dots }%
-\def\copyright{\realbackslash copyright }%
-\def\tclose##1{\realbackslash tclose {##1}}%
-\def\code##1{\realbackslash code {##1}}%
-\def\samp##1{\realbackslash samp {##1}}%
-\def\t##1{\realbackslash r {##1}}%
-\def\r##1{\realbackslash r {##1}}%
-\def\i##1{\realbackslash i {##1}}%
-\def\b##1{\realbackslash b {##1}}%
-\def\cite##1{\realbackslash cite {##1}}%
-\def\key##1{\realbackslash key {##1}}%
-\def\file##1{\realbackslash file {##1}}%
-\def\var##1{\realbackslash var {##1}}%
-\def\kbd##1{\realbackslash kbd {##1}}%
-\def\dfn##1{\realbackslash dfn {##1}}%
-\def\emph##1{\realbackslash emph {##1}}%
-\unsepspaces
-}
-
-% If an index command is used in an @example environment, any spaces
-% therein should become regular spaces in the raw index file, not the
-% expansion of \tie (\\leavevmode \penalty \@M \ ).
-{\obeyspaces
- \gdef\unsepspaces{\obeyspaces\let =\space}}
-
-% \indexnofonts no-ops all font-change commands.
-% This is used when outputting the strings to sort the index by.
-\def\indexdummyfont#1{#1}
-\def\indexdummytex{TeX}
-\def\indexdummydots{...}
-
-\def\indexnofonts{%
-% Just ignore accents.
-\let\"=\indexdummyfont
-\let\`=\indexdummyfont
-\let\'=\indexdummyfont
-\let\^=\indexdummyfont
-\let\~=\indexdummyfont
-\let\==\indexdummyfont
-\let\b=\indexdummyfont
-\let\c=\indexdummyfont
-\let\d=\indexdummyfont
-\let\u=\indexdummyfont
-\let\v=\indexdummyfont
-\let\H=\indexdummyfont
-% Take care of the plain tex special European modified letters.
-\def\oe{oe}%
-\def\ae{ae}%
-\def\aa{aa}%
-\def\OE{OE}%
-\def\AE{AE}%
-\def\AA{AA}%
-\def\o{o}%
-\def\O{O}%
-\def\l{l}%
-\def\L{L}%
-\def\ss{ss}%
-\let\w=\indexdummyfont
-\let\t=\indexdummyfont
-\let\r=\indexdummyfont
-\let\i=\indexdummyfont
-\let\b=\indexdummyfont
-\let\emph=\indexdummyfont
-\let\strong=\indexdummyfont
-\let\cite=\indexdummyfont
-\let\sc=\indexdummyfont
-%Don't no-op \tt, since it isn't a user-level command
-% and is used in the definitions of the active chars like <, >, |...
-%\let\tt=\indexdummyfont
-\let\tclose=\indexdummyfont
-\let\code=\indexdummyfont
-\let\file=\indexdummyfont
-\let\samp=\indexdummyfont
-\let\kbd=\indexdummyfont
-\let\key=\indexdummyfont
-\let\var=\indexdummyfont
-\let\TeX=\indexdummytex
-\let\dots=\indexdummydots
-}
-
-% To define \realbackslash, we must make \ not be an escape.
-% We must first make another character (@) an escape
-% so we do not become unable to do a definition.
-
-{\catcode`\@=0 \catcode`\\=\other
-@gdef@realbackslash{\}}
-
-\let\indexbackslash=0  %overridden during \printindex.
-
-\let\SETmarginindex=\relax %initialize!
-% workhorse for all \fooindexes
-% #1 is name of index, #2 is stuff to put there
-\def\doind #1#2{%
-% Put the index entry in the margin if desired.
-\ifx\SETmarginindex\relax\else%
-\insert\margin{\hbox{\vrule height8pt depth3pt width0pt #2}}%
-\fi%
-{\count10=\lastpenalty %
-{\indexdummies % Must do this here, since \bf, etc expand at this stage
-\escapechar=`\\%
-{\let\folio=0% Expand all macros now EXCEPT \folio
-\def\rawbackslashxx{\indexbackslash}% \indexbackslash isn't defined now
-% so it will be output as is; and it will print as backslash in the indx.
-%
-% Now process the index-string once, with all font commands turned off,
-% to get the string to sort the index by.
-{\indexnofonts
-\xdef\temp1{#2}%
-}%
-% Now produce the complete index entry.  We process the index-string again,
-% this time with font commands expanded, to get what to print in the index.
-\edef\temp{%
-\write \csname#1indfile\endcsname{%
-\realbackslash entry {\temp1}{\folio}{#2}}}%
-\temp }%
-}\penalty\count10}}
-
-\def\dosubind #1#2#3{%
-{\count10=\lastpenalty %
-{\indexdummies % Must do this here, since \bf, etc expand at this stage
-\escapechar=`\\%
-{\let\folio=0%
-\def\rawbackslashxx{\indexbackslash}%
-%
-% Now process the index-string once, with all font commands turned off,
-% to get the string to sort the index by.
-{\indexnofonts
-\xdef\temp1{#2 #3}%
-}%
-% Now produce the complete index entry.  We process the index-string again,
-% this time with font commands expanded, to get what to print in the index.
-\edef\temp{%
-\write \csname#1indfile\endcsname{%
-\realbackslash entry {\temp1}{\folio}{#2}{#3}}}%
-\temp }%
-}\penalty\count10}}
-
-% The index entry written in the file actually looks like
-%  \entry {sortstring}{page}{topic}
-% or
-%  \entry {sortstring}{page}{topic}{subtopic}
-% The texindex program reads in these files and writes files
-% containing these kinds of lines:
-%  \initial {c}
-%     before the first topic whose initial is c
-%  \entry {topic}{pagelist}
-%     for a topic that is used without subtopics
-%  \primary {topic}
-%     for the beginning of a topic that is used with subtopics
-%  \secondary {subtopic}{pagelist}
-%     for each subtopic.
-
-% Define the user-accessible indexing commands
-% @findex, @vindex, @kindex, @cindex.
-
-\def\findex {\fnindex}
-\def\kindex {\kyindex}
-\def\cindex {\cpindex}
-\def\vindex {\vrindex}
-\def\tindex {\tpindex}
-\def\pindex {\pgindex}
-
-\def\cindexsub {\begingroup\obeylines\cindexsub}
-{\obeylines %
-\gdef\cindexsub "#1" #2^^M{\endgroup %
-\dosubind{cp}{#2}{#1}}}
-
-% Define the macros used in formatting output of the sorted index material.
-
-% This is what you call to cause a particular index to get printed.
-% Write
-% @unnumbered Function Index
-% @printindex fn
-
-\def\printindex{\parsearg\doprintindex}
-
-\def\doprintindex#1{%
-  \tex
-  \dobreak \chapheadingskip {10000}
-  \catcode`\%=\other\catcode`\&=\other\catcode`\#=\other
-  \catcode`\$=\other
-  \catcode`\~=\other
-  \indexbreaks
-  %
-  % The following don't help, since the chars were translated
-  % when the raw index was written, and their fonts were discarded
-  % due to \indexnofonts.
-  %\catcode`\"=\active
-  %\catcode`\^=\active
-  %\catcode`\_=\active
-  %\catcode`\|=\active
-  %\catcode`\<=\active
-  %\catcode`\>=\active
-  % %
-  \def\indexbackslash{\rawbackslashxx}
-  \indexfonts\rm \tolerance=9500 \advance\baselineskip -1pt
-  \begindoublecolumns
-  %
-  % See if the index file exists and is nonempty.
-  \openin 1 \jobname.#1s
-  \ifeof 1
-    % \enddoublecolumns gets confused if there is no text in the index,
-    % and it loses the chapter title and the aux file entries for the
-    % index.  The easiest way to prevent this problem is to make sure
-    % there is some text.
-    (Index is nonexistent)
-    \else
-    %
-    % If the index file exists but is empty, then \openin leaves \ifeof
-    % false.  We have to make TeX try to read something from the file, so
-    % it can discover if there is anything in it.
-    \read 1 to \temp
-    \ifeof 1
-      (Index is empty)
-    \else
-      \input \jobname.#1s
-    \fi
-  \fi
-  \closein 1
-  \enddoublecolumns
-  \Etex
-}
-
-% These macros are used by the sorted index file itself.
-% Change them to control the appearance of the index.
-
-% Same as \bigskipamount except no shrink.
-% \balancecolumns gets confused if there is any shrink.
-\newskip\initialskipamount \initialskipamount 12pt plus4pt
-
-\def\initial #1{%
-{\let\tentt=\sectt \let\tt=\sectt \let\sf=\sectt
-\ifdim\lastskip<\initialskipamount
-\removelastskip \penalty-200 \vskip \initialskipamount\fi
-\line{\secbf#1\hfill}\kern 2pt\penalty10000}}
-
-% This typesets a paragraph consisting of #1, dot leaders, and then #2
-% flush to the right margin.  It is used for index and table of contents
-% entries.  The paragraph is indented by \leftskip.
-%
-\def\entry #1#2{\begingroup
-  %
-  % Start a new paragraph if necessary, so our assignments below can't
-  % affect previous text.
-  \par
-  %
-  % Do not fill out the last line with white space.
-  \parfillskip = 0in
-  %
-  % No extra space above this paragraph.
-  \parskip = 0in
-  %
-  % Do not prefer a separate line ending with a hyphen to fewer lines.
-  \finalhyphendemerits = 0
-  %
-  % \hangindent is only relevant when the entry text and page number
-  % don't both fit on one line.  In that case, bob suggests starting the
-  % dots pretty far over on the line.  Unfortunately, a large
-  % indentation looks wrong when the entry text itself is broken across
-  % lines.  So we use a small indentation and put up with long leaders.
-  %
-  % \hangafter is reset to 1 (which is the value we want) at the start
-  % of each paragraph, so we need not do anything with that.
-  \hangindent=2em
-  %
-  % When the entry text needs to be broken, just fill out the first line
-  % with blank space.
-  \rightskip = 0pt plus1fil
-  %
-  % Start a ``paragraph'' for the index entry so the line breaking
-  % parameters we've set above will have an effect.
-  \noindent
-  %
-  % Insert the text of the index entry.  TeX will do line-breaking on it.
-  #1%
-  % The following is kludged to not output a line of dots in the index if
-  % there are no page numbers.  The next person who breaks this will be
-  % cursed by a Unix daemon.
-  \def\tempa{{\rm }}%
-  \def\tempb{#2}%
-  \edef\tempc{\tempa}%
-  \edef\tempd{\tempb}%
-  \ifx\tempc\tempd\ \else%
-    %
-    % If we must, put the page number on a line of its own, and fill out
-    % this line with blank space.  (The \hfil is overwhelmed with the
-    % fill leaders glue in \indexdotfill if the page number does fit.)
-    \hfil\penalty50
-    \null\nobreak\indexdotfill % Have leaders before the page number.
-    %
-    % The `\ ' here is removed by the implicit \unskip that TeX does as
-    % part of (the primitive) \par.  Without it, a spurious underfull
-    % \hbox ensues.
-    \ #2% The page number ends the paragraph.
-  \fi%
-  \par
-\endgroup}
-
-% Like \dotfill except takes at least 1 em.
-\def\indexdotfill{\cleaders
-  \hbox{$\mathsurround=0pt \mkern1.5mu ${\it .}$ \mkern1.5mu$}\hskip 1em plus 1fill}
-
-\def\primary #1{\line{#1\hfil}}
-
-\newskip\secondaryindent \secondaryindent=0.5cm
-
-\def\secondary #1#2{
-{\parfillskip=0in \parskip=0in
-\hangindent =1in \hangafter=1
-\noindent\hskip\secondaryindent\hbox{#1}\indexdotfill #2\par
-}}
-
-%% Define two-column mode, which is used in indexes.
-%% Adapted from the TeXbook, page 416.
-\catcode `\@=11
-
-\newbox\partialpage
-
-\newdimen\doublecolumnhsize
-
-\def\begindoublecolumns{\begingroup
-  % Grab any single-column material above us.
-  \output = {\global\setbox\partialpage
-    =\vbox{\unvbox255\kern -\topskip \kern \baselineskip}}%
-  \eject
-  %
-  % Now switch to the double-column output routine.
-  \output={\doublecolumnout}%
-  %
-  % Change the page size parameters.  We could do this once outside this
-  % routine, in each of @smallbook, @afourpaper, and the default 8.5x11
-  % format, but then we repeat the same computation.  Repeating a couple
-  % of assignments once per index is clearly meaningless for the
-  % execution time, so we may as well do it once.
-  %
-  % First we halve the line length, less a little for the gutter between
-  % the columns.  We compute the gutter based on the line length, so it
-  % changes automatically with the paper format.  The magic constant
-  % below is chosen so that the gutter has the same value (well, +- <
-  % 1pt) as it did when we hard-coded it.
-  %
-  % We put the result in a separate register, \doublecolumhsize, so we
-  % can restore it in \pagesofar, after \hsize itself has (potentially)
-  % been clobbered.
-  %
-  \doublecolumnhsize = \hsize
-    \advance\doublecolumnhsize by -.04154\hsize
-    \divide\doublecolumnhsize by 2
-  \hsize = \doublecolumnhsize
-  %
-  % Double the \vsize as well.  (We don't need a separate register here,
-  % since nobody clobbers \vsize.)
-  \vsize = 2\vsize
-  \doublecolumnpagegoal
-}
-
-\def\enddoublecolumns{\eject \endgroup \pagegoal=\vsize \unvbox\partialpage}
-
-\def\doublecolumnsplit{\splittopskip=\topskip \splitmaxdepth=\maxdepth
-  \global\dimen@=\pageheight \global\advance\dimen@ by-\ht\partialpage
-  \global\setbox1=\vsplit255 to\dimen@ \global\setbox0=\vbox{\unvbox1}
-  \global\setbox3=\vsplit255 to\dimen@ \global\setbox2=\vbox{\unvbox3}
-  \ifdim\ht0>\dimen@ \setbox255=\vbox{\unvbox0\unvbox2} \global\setbox255=\copy5 \fi
-  \ifdim\ht2>\dimen@ \setbox255=\vbox{\unvbox0\unvbox2} \global\setbox255=\copy5 \fi
-}
-\def\doublecolumnpagegoal{%
-  \dimen@=\vsize \advance\dimen@ by-2\ht\partialpage \global\pagegoal=\dimen@
-}
-\def\pagesofar{\unvbox\partialpage %
-  \hsize=\doublecolumnhsize % have to restore this since output routine
-  \wd0=\hsize \wd2=\hsize \hbox to\pagewidth{\box0\hfil\box2}}
-\def\doublecolumnout{%
-  \setbox5=\copy255
-  {\vbadness=10000 \doublecolumnsplit}
-  \ifvbox255
-    \setbox0=\vtop to\dimen@{\unvbox0}
-    \setbox2=\vtop to\dimen@{\unvbox2}
-    \onepageout\pagesofar \unvbox255 \penalty\outputpenalty
-  \else
-    \setbox0=\vbox{\unvbox5}
-    \ifvbox0
-      \dimen@=\ht0 \advance\dimen@ by\topskip \advance\dimen@ by-\baselineskip
-      \divide\dimen@ by2 \splittopskip=\topskip \splitmaxdepth=\maxdepth
-      {\vbadness=10000
-	\loop \global\setbox5=\copy0
-          \setbox1=\vsplit5 to\dimen@
-          \setbox3=\vsplit5 to\dimen@
-          \ifvbox5 \global\advance\dimen@ by1pt \repeat
-        \setbox0=\vbox to\dimen@{\unvbox1}
-        \setbox2=\vbox to\dimen@{\unvbox3}
-        \global\setbox\partialpage=\vbox{\pagesofar}
-        \doublecolumnpagegoal
-      }
-    \fi
-  \fi
-}
-
-\catcode `\@=\other
-\message{sectioning,}
-% Define chapters, sections, etc.
-
-\newcount \chapno
-\newcount \secno        \secno=0
-\newcount \subsecno     \subsecno=0
-\newcount \subsubsecno  \subsubsecno=0
-
-% This counter is funny since it counts through charcodes of letters A, B, ...
-\newcount \appendixno  \appendixno = `\@
-\def\appendixletter{\char\the\appendixno}
-
-\newwrite \contentsfile
-% This is called from \setfilename.
-\def\opencontents{\openout \contentsfile = \jobname.toc}
-
-% Each @chapter defines this as the name of the chapter.
-% page headings and footings can use it.  @section does likewise
-
-\def\thischapter{} \def\thissection{}
-\def\seccheck#1{\if \pageno<0 %
-\errmessage{@#1 not allowed after generating table of contents}\fi
-%
-}
-
-\def\chapternofonts{%
-\let\rawbackslash=\relax%
-\let\frenchspacing=\relax%
-\def\result{\realbackslash result}
-\def\equiv{\realbackslash equiv}
-\def\expansion{\realbackslash expansion}
-\def\print{\realbackslash print}
-\def\TeX{\realbackslash TeX}
-\def\dots{\realbackslash dots}
-\def\copyright{\realbackslash copyright}
-\def\tt{\realbackslash tt}
-\def\bf{\realbackslash bf }
-\def\w{\realbackslash w}
-\def\less{\realbackslash less}
-\def\gtr{\realbackslash gtr}
-\def\hat{\realbackslash hat}
-\def\char{\realbackslash char}
-\def\tclose##1{\realbackslash tclose {##1}}
-\def\code##1{\realbackslash code {##1}}
-\def\samp##1{\realbackslash samp {##1}}
-\def\r##1{\realbackslash r {##1}}
-\def\b##1{\realbackslash b {##1}}
-\def\key##1{\realbackslash key {##1}}
-\def\file##1{\realbackslash file {##1}}
-\def\kbd##1{\realbackslash kbd {##1}}
-% These are redefined because @smartitalic wouldn't work inside xdef.
-\def\i##1{\realbackslash i {##1}}
-\def\cite##1{\realbackslash cite {##1}}
-\def\var##1{\realbackslash var {##1}}
-\def\emph##1{\realbackslash emph {##1}}
-\def\dfn##1{\realbackslash dfn {##1}}
-}
-
-\newcount\absseclevel % used to calculate proper heading level
-\newcount\secbase\secbase=0 % @raise/lowersections modify this count
-
-% @raisesections: treat @section as chapter, @subsection as section, etc.
-\def\raisesections{\global\advance\secbase by -1}
-\let\up=\raisesections % original BFox name
-
-% @lowersections: treat @chapter as section, @section as subsection, etc.
-\def\lowersections{\global\advance\secbase by 1}
-\let\down=\lowersections % original BFox name
-
-% Choose a numbered-heading macro
-% #1 is heading level if unmodified by @raisesections or @lowersections
-% #2 is text for heading
-\def\numhead#1#2{\absseclevel=\secbase\advance\absseclevel by #1
-\ifcase\absseclevel
-  \chapterzzz{#2}
-\or
-  \seczzz{#2}
-\or
-  \numberedsubseczzz{#2}
-\or
-  \numberedsubsubseczzz{#2}
-\else
-  \ifnum \absseclevel<0
-    \chapterzzz{#2}
-  \else
-    \numberedsubsubseczzz{#2}
-  \fi
-\fi
-}
-
-% like \numhead, but chooses appendix heading levels
-\def\apphead#1#2{\absseclevel=\secbase\advance\absseclevel by #1
-\ifcase\absseclevel
-  \appendixzzz{#2}
-\or
-  \appendixsectionzzz{#2}
-\or
-  \appendixsubseczzz{#2}
-\or
-  \appendixsubsubseczzz{#2}
-\else
-  \ifnum \absseclevel<0
-    \appendixzzz{#2}
-  \else
-    \appendixsubsubseczzz{#2}
-  \fi
-\fi
-}
-
-% like \numhead, but chooses numberless heading levels
-\def\unnmhead#1#2{\absseclevel=\secbase\advance\absseclevel by #1
-\ifcase\absseclevel
-  \unnumberedzzz{#2}
-\or
-  \unnumberedseczzz{#2}
-\or
-  \unnumberedsubseczzz{#2}
-\or
-  \unnumberedsubsubseczzz{#2}
-\else
-  \ifnum \absseclevel<0
-    \unnumberedzzz{#2}
-  \else
-    \unnumberedsubsubseczzz{#2}
-  \fi
-\fi
-}
-
-
-\def\thischaptername{No Chapter Title}
-\outer\def\chapter{\parsearg\chapteryyy}
-\def\chapteryyy #1{\numhead0{#1}} % normally numhead0 calls chapterzzz
-\def\chapterzzz #1{\seccheck{chapter}%
-\secno=0 \subsecno=0 \subsubsecno=0
-\global\advance \chapno by 1 \message{\putwordChapter \the\chapno}%
-\chapmacro {#1}{\the\chapno}%
-\gdef\thissection{#1}%
-\gdef\thischaptername{#1}%
-% We don't substitute the actual chapter name into \thischapter
-% because we don't want its macros evaluated now.
-\xdef\thischapter{\putwordChapter{} \the\chapno: \noexpand\thischaptername}%
-{\chapternofonts%
-\edef\temp{{\realbackslash chapentry {#1}{\the\chapno}{\noexpand\folio}}}%
-\escapechar=`\\%
-\write \contentsfile \temp  %
-\donoderef %
-\global\let\section = \numberedsec
-\global\let\subsection = \numberedsubsec
-\global\let\subsubsection = \numberedsubsubsec
-}}
-
-\outer\def\appendix{\parsearg\appendixyyy}
-\def\appendixyyy #1{\apphead0{#1}} % normally apphead0 calls appendixzzz
-\def\appendixzzz #1{\seccheck{appendix}%
-\secno=0 \subsecno=0 \subsubsecno=0
-\global\advance \appendixno by 1 \message{Appendix \appendixletter}%
-\chapmacro {#1}{\putwordAppendix{} \appendixletter}%
-\gdef\thissection{#1}%
-\gdef\thischaptername{#1}%
-\xdef\thischapter{\putwordAppendix{} \appendixletter: \noexpand\thischaptername}%
-{\chapternofonts%
-\edef\temp{{\realbackslash chapentry
-  {#1}{\putwordAppendix{} \appendixletter}{\noexpand\folio}}}%
-\escapechar=`\\%
-\write \contentsfile \temp  %
-\appendixnoderef %
-\global\let\section = \appendixsec
-\global\let\subsection = \appendixsubsec
-\global\let\subsubsection = \appendixsubsubsec
-}}
-
-\outer\def\top{\parsearg\unnumberedyyy}
-\outer\def\unnumbered{\parsearg\unnumberedyyy}
-\def\unnumberedyyy #1{\unnmhead0{#1}} % normally unnmhead0 calls unnumberedzzz
-\def\unnumberedzzz #1{\seccheck{unnumbered}%
-\secno=0 \subsecno=0 \subsubsecno=0
-%
-% This used to be simply \message{#1}, but TeX fully expands the
-% argument to \message.  Therefore, if #1 contained @-commands, TeX
-% expanded them.  For example, in `@unnumbered The @cite{Book}', TeX
-% expanded @cite (which turns out to cause errors because \cite is meant
-% to be executed, not expanded).
-%
-% Anyway, we don't want the fully-expanded definition of @cite to appear
-% as a result of the \message, we just want `@cite' itself.  We use
-% \the<toks register> to achieve this: TeX expands \the<toks> only once,
-% simply yielding the contents of the <toks register>.
-\toks0 = {#1}\message{(\the\toks0)}%
-%
-\unnumbchapmacro {#1}%
-\gdef\thischapter{#1}\gdef\thissection{#1}%
-{\chapternofonts%
-\edef\temp{{\realbackslash unnumbchapentry {#1}{\noexpand\folio}}}%
-\escapechar=`\\%
-\write \contentsfile \temp  %
-\unnumbnoderef %
-\global\let\section = \unnumberedsec
-\global\let\subsection = \unnumberedsubsec
-\global\let\subsubsection = \unnumberedsubsubsec
-}}
-
-\outer\def\numberedsec{\parsearg\secyyy}
-\def\secyyy #1{\numhead1{#1}} % normally calls seczzz
-\def\seczzz #1{\seccheck{section}%
-\subsecno=0 \subsubsecno=0 \global\advance \secno by 1 %
-\gdef\thissection{#1}\secheading {#1}{\the\chapno}{\the\secno}%
-{\chapternofonts%
-\edef\temp{{\realbackslash secentry %
-{#1}{\the\chapno}{\the\secno}{\noexpand\folio}}}%
-\escapechar=`\\%
-\write \contentsfile \temp %
-\donoderef %
-\penalty 10000 %
-}}
-
-\outer\def\appendixsection{\parsearg\appendixsecyyy}
-\outer\def\appendixsec{\parsearg\appendixsecyyy}
-\def\appendixsecyyy #1{\apphead1{#1}} % normally calls appendixsectionzzz
-\def\appendixsectionzzz #1{\seccheck{appendixsection}%
-\subsecno=0 \subsubsecno=0 \global\advance \secno by 1 %
-\gdef\thissection{#1}\secheading {#1}{\appendixletter}{\the\secno}%
-{\chapternofonts%
-\edef\temp{{\realbackslash secentry %
-{#1}{\appendixletter}{\the\secno}{\noexpand\folio}}}%
-\escapechar=`\\%
-\write \contentsfile \temp %
-\appendixnoderef %
-\penalty 10000 %
-}}
-
-\outer\def\unnumberedsec{\parsearg\unnumberedsecyyy}
-\def\unnumberedsecyyy #1{\unnmhead1{#1}} % normally calls unnumberedseczzz
-\def\unnumberedseczzz #1{\seccheck{unnumberedsec}%
-\plainsecheading {#1}\gdef\thissection{#1}%
-{\chapternofonts%
-\edef\temp{{\realbackslash unnumbsecentry{#1}{\noexpand\folio}}}%
-\escapechar=`\\%
-\write \contentsfile \temp %
-\unnumbnoderef %
-\penalty 10000 %
-}}
-
-\outer\def\numberedsubsec{\parsearg\numberedsubsecyyy}
-\def\numberedsubsecyyy #1{\numhead2{#1}} % normally calls numberedsubseczzz
-\def\numberedsubseczzz #1{\seccheck{subsection}%
-\gdef\thissection{#1}\subsubsecno=0 \global\advance \subsecno by 1 %
-\subsecheading {#1}{\the\chapno}{\the\secno}{\the\subsecno}%
-{\chapternofonts%
-\edef\temp{{\realbackslash subsecentry %
-{#1}{\the\chapno}{\the\secno}{\the\subsecno}{\noexpand\folio}}}%
-\escapechar=`\\%
-\write \contentsfile \temp %
-\donoderef %
-\penalty 10000 %
-}}
-
-\outer\def\appendixsubsec{\parsearg\appendixsubsecyyy}
-\def\appendixsubsecyyy #1{\apphead2{#1}} % normally calls appendixsubseczzz
-\def\appendixsubseczzz #1{\seccheck{appendixsubsec}%
-\gdef\thissection{#1}\subsubsecno=0 \global\advance \subsecno by 1 %
-\subsecheading {#1}{\appendixletter}{\the\secno}{\the\subsecno}%
-{\chapternofonts%
-\edef\temp{{\realbackslash subsecentry %
-{#1}{\appendixletter}{\the\secno}{\the\subsecno}{\noexpand\folio}}}%
-\escapechar=`\\%
-\write \contentsfile \temp %
-\appendixnoderef %
-\penalty 10000 %
-}}
-
-\outer\def\unnumberedsubsec{\parsearg\unnumberedsubsecyyy}
-\def\unnumberedsubsecyyy #1{\unnmhead2{#1}} %normally calls unnumberedsubseczzz
-\def\unnumberedsubseczzz #1{\seccheck{unnumberedsubsec}%
-\plainsecheading {#1}\gdef\thissection{#1}%
-{\chapternofonts%
-\edef\temp{{\realbackslash unnumbsubsecentry{#1}{\noexpand\folio}}}%
-\escapechar=`\\%
-\write \contentsfile \temp %
-\unnumbnoderef %
-\penalty 10000 %
-}}
-
-\outer\def\numberedsubsubsec{\parsearg\numberedsubsubsecyyy}
-\def\numberedsubsubsecyyy #1{\numhead3{#1}} % normally numberedsubsubseczzz
-\def\numberedsubsubseczzz #1{\seccheck{subsubsection}%
-\gdef\thissection{#1}\global\advance \subsubsecno by 1 %
-\subsubsecheading {#1}
-  {\the\chapno}{\the\secno}{\the\subsecno}{\the\subsubsecno}%
-{\chapternofonts%
-\edef\temp{{\realbackslash subsubsecentry %
-  {#1}
-  {\the\chapno}{\the\secno}{\the\subsecno}{\the\subsubsecno}
-  {\noexpand\folio}}}%
-\escapechar=`\\%
-\write \contentsfile \temp %
-\donoderef %
-\penalty 10000 %
-}}
-
-\outer\def\appendixsubsubsec{\parsearg\appendixsubsubsecyyy}
-\def\appendixsubsubsecyyy #1{\apphead3{#1}} % normally appendixsubsubseczzz
-\def\appendixsubsubseczzz #1{\seccheck{appendixsubsubsec}%
-\gdef\thissection{#1}\global\advance \subsubsecno by 1 %
-\subsubsecheading {#1}
-  {\appendixletter}{\the\secno}{\the\subsecno}{\the\subsubsecno}%
-{\chapternofonts%
-\edef\temp{{\realbackslash subsubsecentry{#1}%
-  {\appendixletter}
-  {\the\secno}{\the\subsecno}{\the\subsubsecno}{\noexpand\folio}}}%
-\escapechar=`\\%
-\write \contentsfile \temp %
-\appendixnoderef %
-\penalty 10000 %
-}}
-
-\outer\def\unnumberedsubsubsec{\parsearg\unnumberedsubsubsecyyy}
-\def\unnumberedsubsubsecyyy #1{\unnmhead3{#1}} %normally unnumberedsubsubseczzz
-\def\unnumberedsubsubseczzz #1{\seccheck{unnumberedsubsubsec}%
-\plainsecheading {#1}\gdef\thissection{#1}%
-{\chapternofonts%
-\edef\temp{{\realbackslash unnumbsubsubsecentry{#1}{\noexpand\folio}}}%
-\escapechar=`\\%
-\write \contentsfile \temp %
-\unnumbnoderef %
-\penalty 10000 %
-}}
-
-% These are variants which are not "outer", so they can appear in @ifinfo.
-% Actually, they should now be obsolete; ordinary section commands should work.
-\def\infotop{\parsearg\unnumberedzzz}
-\def\infounnumbered{\parsearg\unnumberedzzz}
-\def\infounnumberedsec{\parsearg\unnumberedseczzz}
-\def\infounnumberedsubsec{\parsearg\unnumberedsubseczzz}
-\def\infounnumberedsubsubsec{\parsearg\unnumberedsubsubseczzz}
-
-\def\infoappendix{\parsearg\appendixzzz}
-\def\infoappendixsec{\parsearg\appendixseczzz}
-\def\infoappendixsubsec{\parsearg\appendixsubseczzz}
-\def\infoappendixsubsubsec{\parsearg\appendixsubsubseczzz}
-
-\def\infochapter{\parsearg\chapterzzz}
-\def\infosection{\parsearg\sectionzzz}
-\def\infosubsection{\parsearg\subsectionzzz}
-\def\infosubsubsection{\parsearg\subsubsectionzzz}
-
-% These macros control what the section commands do, according
-% to what kind of chapter we are in (ordinary, appendix, or unnumbered).
-% Define them by default for a numbered chapter.
-\global\let\section = \numberedsec
-\global\let\subsection = \numberedsubsec
-\global\let\subsubsection = \numberedsubsubsec
-
-% Define @majorheading, @heading and @subheading
-
-% NOTE on use of \vbox for chapter headings, section headings, and
-% such:
-%	1) We use \vbox rather than the earlier \line to permit
-%	   overlong headings to fold.
-%	2) \hyphenpenalty is set to 10000 because hyphenation in a
-%	   heading is obnoxious; this forbids it.
-%       3) Likewise, headings look best if no \parindent is used, and
-%          if justification is not attempted.  Hence \raggedright.
-
-
-\def\majorheading{\parsearg\majorheadingzzz}
-\def\majorheadingzzz #1{%
-{\advance\chapheadingskip by 10pt \chapbreak }%
-{\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
-                  \parindent=0pt\raggedright
-                  \rm #1\hfill}}\bigskip \par\penalty 200}
-
-\def\chapheading{\parsearg\chapheadingzzz}
-\def\chapheadingzzz #1{\chapbreak %
-{\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
-                  \parindent=0pt\raggedright
-                  \rm #1\hfill}}\bigskip \par\penalty 200}
-
-\def\heading{\parsearg\secheadingi}
-
-\def\subheading{\parsearg\subsecheadingi}
-
-\def\subsubheading{\parsearg\subsubsecheadingi}
-
-% These macros generate a chapter, section, etc. heading only
-% (including whitespace, linebreaking, etc. around it),
-% given all the information in convenient, parsed form.
-
-%%% Args are the skip and penalty (usually negative)
-\def\dobreak#1#2{\par\ifdim\lastskip<#1\removelastskip\penalty#2\vskip#1\fi}
-
-\def\setchapterstyle #1 {\csname CHAPF#1\endcsname}
-
-%%% Define plain chapter starts, and page on/off switching for it
-% Parameter controlling skip before chapter headings (if needed)
-
-\newskip \chapheadingskip \chapheadingskip = 30pt plus 8pt minus 4pt
-
-\def\chapbreak{\dobreak \chapheadingskip {-4000}}
-\def\chappager{\par\vfill\supereject}
-\def\chapoddpage{\chappager \ifodd\pageno \else \hbox to 0pt{} \chappager\fi}
-
-\def\setchapternewpage #1 {\csname CHAPPAG#1\endcsname}
-
-\def\CHAPPAGoff{
-\global\let\pchapsepmacro=\chapbreak
-\global\let\pagealignmacro=\chappager}
-
-\def\CHAPPAGon{
-\global\let\pchapsepmacro=\chappager
-\global\let\pagealignmacro=\chappager
-\global\def\HEADINGSon{\HEADINGSsingle}}
-
-\def\CHAPPAGodd{
-\global\let\pchapsepmacro=\chapoddpage
-\global\let\pagealignmacro=\chapoddpage
-\global\def\HEADINGSon{\HEADINGSdouble}}
-
-\CHAPPAGon
-
-\def\CHAPFplain{
-\global\let\chapmacro=\chfplain
-\global\let\unnumbchapmacro=\unnchfplain}
-
-\def\chfplain #1#2{%
-  \pchapsepmacro
-  {%
-    \chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
-                     \parindent=0pt\raggedright
-                     \rm #2\enspace #1}%
-  }%
-  \bigskip
-  \penalty5000
-}
-
-\def\unnchfplain #1{%
-\pchapsepmacro %
-{\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
-                  \parindent=0pt\raggedright
-                  \rm #1\hfill}}\bigskip \par\penalty 10000 %
-}
-\CHAPFplain % The default
-
-\def\unnchfopen #1{%
-\chapoddpage {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
-                       \parindent=0pt\raggedright
-                       \rm #1\hfill}}\bigskip \par\penalty 10000 %
-}
-
-\def\chfopen #1#2{\chapoddpage {\chapfonts
-\vbox to 3in{\vfil \hbox to\hsize{\hfil #2} \hbox to\hsize{\hfil #1} \vfil}}%
-\par\penalty 5000 %
-}
-
-\def\CHAPFopen{
-\global\let\chapmacro=\chfopen
-\global\let\unnumbchapmacro=\unnchfopen}
-
-% Parameter controlling skip before section headings.
-
-\newskip \subsecheadingskip  \subsecheadingskip = 17pt plus 8pt minus 4pt
-\def\subsecheadingbreak{\dobreak \subsecheadingskip {-500}}
-
-\newskip \secheadingskip  \secheadingskip = 21pt plus 8pt minus 4pt
-\def\secheadingbreak{\dobreak \secheadingskip {-1000}}
-
-% @paragraphindent  is defined for the Info formatting commands only.
-\let\paragraphindent=\comment
-
-% Section fonts are the base font at magstep2, which produces
-% a size a bit more than 14 points in the default situation.
-
-\def\secheading #1#2#3{\secheadingi {#2.#3\enspace #1}}
-\def\plainsecheading #1{\secheadingi {#1}}
-\def\secheadingi #1{{\advance \secheadingskip by \parskip %
-\secheadingbreak}%
-{\secfonts \vbox{\hyphenpenalty=10000\tolerance=5000
-                 \parindent=0pt\raggedright
-                 \rm #1\hfill}}%
-\ifdim \parskip<10pt \kern 10pt\kern -\parskip\fi \penalty 10000 }
-
-
-% Subsection fonts are the base font at magstep1,
-% which produces a size of 12 points.
-
-\def\subsecheading #1#2#3#4{\subsecheadingi {#2.#3.#4\enspace #1}}
-\def\subsecheadingi #1{{\advance \subsecheadingskip by \parskip %
-\subsecheadingbreak}%
-{\subsecfonts \vbox{\hyphenpenalty=10000\tolerance=5000
-                     \parindent=0pt\raggedright
-                     \rm #1\hfill}}%
-\ifdim \parskip<10pt \kern 10pt\kern -\parskip\fi \penalty 10000 }
-
-\def\subsubsecfonts{\subsecfonts} % Maybe this should change:
-				  % Perhaps make sssec fonts scaled
-				  % magstep half
-\def\subsubsecheading #1#2#3#4#5{\subsubsecheadingi {#2.#3.#4.#5\enspace #1}}
-\def\subsubsecheadingi #1{{\advance \subsecheadingskip by \parskip %
-\subsecheadingbreak}%
-{\subsubsecfonts \vbox{\hyphenpenalty=10000\tolerance=5000
-                       \parindent=0pt\raggedright
-                       \rm #1\hfill}}%
-\ifdim \parskip<10pt \kern 10pt\kern -\parskip\fi \penalty 10000}
-
-
-\message{toc printing,}
-
-% Finish up the main text and prepare to read what we've written
-% to \contentsfile.
-
-\newskip\contentsrightmargin \contentsrightmargin=1in
-\def\startcontents#1{%
-   \pagealignmacro
-   \immediate\closeout \contentsfile
-   \ifnum \pageno>0
-      \pageno = -1		% Request roman numbered pages.
-   \fi
-   % Don't need to put `Contents' or `Short Contents' in the headline.
-   % It is abundantly clear what they are.
-   \unnumbchapmacro{#1}\def\thischapter{}%
-   \begingroup   		% Set up to handle contents files properly.
-      \catcode`\\=0  \catcode`\{=1  \catcode`\}=2  \catcode`\@=11
-      \catcode`\^=7 % to see ^^e4 as \"a etc. juha@piuha.ydi.vtt.fi
-      \raggedbottom             % Worry more about breakpoints than the bottom.
-      \advance\hsize by -\contentsrightmargin % Don't use the full line length.
-}
-
-
-% Normal (long) toc.
-\outer\def\contents{%
-   \startcontents{\putwordTableofContents}%
-      \input \jobname.toc
-   \endgroup
-   \vfill \eject
-}
-
-% And just the chapters.
-\outer\def\summarycontents{%
-   \startcontents{\putwordShortContents}%
-      %
-      \let\chapentry = \shortchapentry
-      \let\unnumbchapentry = \shortunnumberedentry
-      % We want a true roman here for the page numbers.
-      \secfonts
-      \let\rm=\shortcontrm \let\bf=\shortcontbf \let\sl=\shortcontsl
-      \rm
-      \advance\baselineskip by 1pt % Open it up a little.
-      \def\secentry ##1##2##3##4{}
-      \def\unnumbsecentry ##1##2{}
-      \def\subsecentry ##1##2##3##4##5{}
-      \def\unnumbsubsecentry ##1##2{}
-      \def\subsubsecentry ##1##2##3##4##5##6{}
-      \def\unnumbsubsubsecentry ##1##2{}
-      \input \jobname.toc
-   \endgroup
-   \vfill \eject
-}
-\let\shortcontents = \summarycontents
-
-% These macros generate individual entries in the table of contents.
-% The first argument is the chapter or section name.
-% The last argument is the page number.
-% The arguments in between are the chapter number, section number, ...
-
-% Chapter-level things, for both the long and short contents.
-\def\chapentry#1#2#3{\dochapentry{#2\labelspace#1}{#3}}
-
-% See comments in \dochapentry re vbox and related settings
-\def\shortchapentry#1#2#3{%
-  \tocentry{\shortchaplabel{#2}\labelspace #1}{\doshortpageno{#3}}%
-}
-
-% Typeset the label for a chapter or appendix for the short contents.
-% The arg is, e.g. `Appendix A' for an appendix, or `3' for a chapter.
-% We could simplify the code here by writing out an \appendixentry
-% command in the toc file for appendices, instead of using \chapentry
-% for both, but it doesn't seem worth it.
-\setbox0 = \hbox{\shortcontrm \putwordAppendix }
-\newdimen\shortappendixwidth \shortappendixwidth = \wd0
-
-\def\shortchaplabel#1{%
-  % We typeset #1 in a box of constant width, regardless of the text of
-  % #1, so the chapter titles will come out aligned.
-  \setbox0 = \hbox{#1}%
-  \dimen0 = \ifdim\wd0 > \shortappendixwidth \shortappendixwidth \else 0pt \fi
-  %
-  % This space should be plenty, since a single number is .5em, and the
-  % widest letter (M) is 1em, at least in the Computer Modern fonts.
-  % (This space doesn't include the extra space that gets added after
-  % the label; that gets put in in \shortchapentry above.)
-  \advance\dimen0 by 1.1em
-  \hbox to \dimen0{#1\hfil}%
-}
-
-\def\unnumbchapentry#1#2{\dochapentry{#1}{#2}}
-\def\shortunnumberedentry#1#2{\tocentry{#1}{\doshortpageno{#2}}}
-
-% Sections.
-\def\secentry#1#2#3#4{\dosecentry{#2.#3\labelspace#1}{#4}}
-\def\unnumbsecentry#1#2{\dosecentry{#1}{#2}}
-
-% Subsections.
-\def\subsecentry#1#2#3#4#5{\dosubsecentry{#2.#3.#4\labelspace#1}{#5}}
-\def\unnumbsubsecentry#1#2{\dosubsecentry{#1}{#2}}
-
-% And subsubsections.
-\def\subsubsecentry#1#2#3#4#5#6{%
-  \dosubsubsecentry{#2.#3.#4.#5\labelspace#1}{#6}}
-\def\unnumbsubsubsecentry#1#2{\dosubsubsecentry{#1}{#2}}
-
-
-% This parameter controls the indentation of the various levels.
-\newdimen\tocindent \tocindent = 3pc
-
-% Now for the actual typesetting. In all these, #1 is the text and #2 is the
-% page number.
-%
-% If the toc has to be broken over pages, we would want to be at chapters
-% if at all possible; hence the \penalty.
-\def\dochapentry#1#2{%
-   \penalty-300 \vskip\baselineskip
-   \begingroup
-     \chapentryfonts
-     \tocentry{#1}{\dopageno{#2}}%
-   \endgroup
-   \nobreak\vskip .25\baselineskip
-}
-
-\def\dosecentry#1#2{\begingroup
-  \secentryfonts \leftskip=\tocindent
-  \tocentry{#1}{\dopageno{#2}}%
-\endgroup}
-
-\def\dosubsecentry#1#2{\begingroup
-  \subsecentryfonts \leftskip=2\tocindent
-  \tocentry{#1}{\dopageno{#2}}%
-\endgroup}
-
-\def\dosubsubsecentry#1#2{\begingroup
-  \subsubsecentryfonts \leftskip=3\tocindent
-  \tocentry{#1}{\dopageno{#2}}%
-\endgroup}
-
-% Final typesetting of a toc entry; we use the same \entry macro as for
-% the index entries, but we want to suppress hyphenation here.  (We
-% can't do that in the \entry macro, since index entries might consist
-% of hyphenated-identifiers-that-do-not-fit-on-a-line-and-nothing-else.)
-%
-% \turnoffactive is for the sake of @" used for umlauts.
-\def\tocentry#1#2{\begingroup
-  \hyphenpenalty = 10000
-  \entry{\turnoffactive #1}{\turnoffactive #2}%
-\endgroup}
-
-% Space between chapter (or whatever) number and the title.
-\def\labelspace{\hskip1em \relax}
-
-\def\dopageno#1{{\rm #1}}
-\def\doshortpageno#1{{\rm #1}}
-
-\def\chapentryfonts{\secfonts \rm}
-\def\secentryfonts{\textfonts}
-\let\subsecentryfonts = \textfonts
-\let\subsubsecentryfonts = \textfonts
-
-
-\message{environments,}
-
-% Since these characters are used in examples, it should be an even number of
-% \tt widths. Each \tt character is 1en, so two makes it 1em.
-% Furthermore, these definitions must come after we define our fonts.
-\newbox\dblarrowbox    \newbox\longdblarrowbox
-\newbox\pushcharbox    \newbox\bullbox
-\newbox\equivbox       \newbox\errorbox
-
-\let\ptexequiv = \equiv
-
-%{\tentt
-%\global\setbox\dblarrowbox = \hbox to 1em{\hfil$\Rightarrow$\hfil}
-%\global\setbox\longdblarrowbox = \hbox to 1em{\hfil$\mapsto$\hfil}
-%\global\setbox\pushcharbox = \hbox to 1em{\hfil$\dashv$\hfil}
-%\global\setbox\equivbox = \hbox to 1em{\hfil$\ptexequiv$\hfil}
-% Adapted from the manmac format (p.420 of TeXbook)
-%\global\setbox\bullbox = \hbox to 1em{\kern.15em\vrule height .75ex width .85ex
-%                                      depth .1ex\hfil}
-%}
-
-\def\point{$\star$}
-
-\def\result{\leavevmode\raise.15ex\hbox to 1em{\hfil$\Rightarrow$\hfil}}
-\def\expansion{\leavevmode\raise.1ex\hbox to 1em{\hfil$\mapsto$\hfil}}
-\def\print{\leavevmode\lower.1ex\hbox to 1em{\hfil$\dashv$\hfil}}
-
-\def\equiv{\leavevmode\lower.1ex\hbox to 1em{\hfil$\ptexequiv$\hfil}}
-
-% Adapted from the TeXbook's \boxit.
-{\tentt \global\dimen0 = 3em}% Width of the box.
-\dimen2 = .55pt % Thickness of rules
-% The text. (`r' is open on the right, `e' somewhat less so on the left.)
-\setbox0 = \hbox{\kern-.75pt \tensf error\kern-1.5pt}
-
-\global\setbox\errorbox=\hbox to \dimen0{\hfil
-   \hsize = \dimen0 \advance\hsize by -5.8pt % Space to left+right.
-   \advance\hsize by -2\dimen2 % Rules.
-   \vbox{
-      \hrule height\dimen2
-      \hbox{\vrule width\dimen2 \kern3pt          % Space to left of text.
-         \vtop{\kern2.4pt \box0 \kern2.4pt}% Space above/below.
-         \kern3pt\vrule width\dimen2}% Space to right.
-      \hrule height\dimen2}
-    \hfil}
-
-% The @error{} command.
-\def\error{\leavevmode\lower.7ex\copy\errorbox}
-
-% @tex ... @end tex    escapes into raw Tex temporarily.
-% One exception: @ is still an escape character, so that @end tex works.
-% But \@ or @@ will get a plain tex @ character.
-
-\def\tex{\begingroup
-\catcode `\\=0 \catcode `\{=1 \catcode `\}=2
-\catcode `\$=3 \catcode `\&=4 \catcode `\#=6
-\catcode `\^=7 \catcode `\_=8 \catcode `\~=13 \let~=\tie
-\catcode `\%=14
-\catcode 43=12
-\catcode`\"=12
-\catcode`\==12
-\catcode`\|=12
-\catcode`\<=12
-\catcode`\>=12
-\escapechar=`\\
-%
-\let\~=\ptextilde
-\let\{=\ptexlbrace
-\let\}=\ptexrbrace
-\let\.=\ptexdot
-\let\*=\ptexstar
-\let\dots=\ptexdots
-\def\@{@}%
-\let\bullet=\ptexbullet
-\let\b=\ptexb \let\c=\ptexc \let\i=\ptexi \let\t=\ptext \let\l=\ptexl
-\let\L=\ptexL
-%
-\let\Etex=\endgroup}
-
-% Define @lisp ... @endlisp.
-% @lisp does a \begingroup so it can rebind things,
-% including the definition of @endlisp (which normally is erroneous).
-
-% Amount to narrow the margins by for @lisp.
-\newskip\lispnarrowing \lispnarrowing=0.4in
-
-% This is the definition that ^^M gets inside @lisp, @example, and other
-% such environments.  \null is better than a space, since it doesn't
-% have any width.
-\def\lisppar{\null\endgraf}
-
-% Make each space character in the input produce a normal interword
-% space in the output.  Don't allow a line break at this space, as this
-% is used only in environments like @example, where each line of input
-% should produce a line of output anyway.
-%
-{\obeyspaces %
-\gdef\sepspaces{\obeyspaces\let =\tie}}
-
-% Define \obeyedspace to be our active space, whatever it is.  This is
-% for use in \parsearg.
-{\sepspaces%
-\global\let\obeyedspace= }
-
-% This space is always present above and below environments.
-\newskip\envskipamount \envskipamount = 0pt
-
-% Make spacing and below environment symmetrical.  We use \parskip here
-% to help in doing that, since in @example-like environments \parskip
-% is reset to zero; thus the \afterenvbreak inserts no space -- but the
-% start of the next paragraph will insert \parskip
-%
-\def\aboveenvbreak{{\advance\envskipamount by \parskip
-\endgraf \ifdim\lastskip<\envskipamount
-\removelastskip \penalty-50 \vskip\envskipamount \fi}}
-
-\let\afterenvbreak = \aboveenvbreak
-
-% \nonarrowing is a flag.  If "set", @lisp etc don't narrow margins.
-\let\nonarrowing=\relax
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% \cartouche: draw rectangle w/rounded corners around argument
-\font\circle=lcircle10
-\newdimen\circthick
-\newdimen\cartouter\newdimen\cartinner
-\newskip\normbskip\newskip\normpskip\newskip\normlskip
-\circthick=\fontdimen8\circle
-%
-\def\ctl{{\circle\char'013\hskip -6pt}}% 6pt from pl file: 1/2charwidth
-\def\ctr{{\hskip 6pt\circle\char'010}}
-\def\cbl{{\circle\char'012\hskip -6pt}}
-\def\cbr{{\hskip 6pt\circle\char'011}}
-\def\carttop{\hbox to \cartouter{\hskip\lskip
-	\ctl\leaders\hrule height\circthick\hfil\ctr
-	\hskip\rskip}}
-\def\cartbot{\hbox to \cartouter{\hskip\lskip
-	\cbl\leaders\hrule height\circthick\hfil\cbr
-	\hskip\rskip}}
-%
-\newskip\lskip\newskip\rskip
-
-\long\def\cartouche{%
-\begingroup
-	\lskip=\leftskip \rskip=\rightskip
-	\leftskip=0pt\rightskip=0pt %we want these *outside*.
-	\cartinner=\hsize \advance\cartinner by-\lskip
-		 	  \advance\cartinner by-\rskip
-	\cartouter=\hsize
-	\advance\cartouter by 18pt % allow for 3pt kerns on either
-%				     side, and for 6pt waste from
-%				     each corner char
-	\normbskip=\baselineskip \normpskip=\parskip \normlskip=\lineskip
-	% Flag to tell @lisp, etc., not to narrow margin.
-	\let\nonarrowing=\comment
-	\vbox\bgroup
-		\baselineskip=0pt\parskip=0pt\lineskip=0pt
-		\carttop
-		\hbox\bgroup
-			\hskip\lskip
-			\vrule\kern3pt
-			\vbox\bgroup
-				\hsize=\cartinner
-				\kern3pt
-				\begingroup
-					\baselineskip=\normbskip
-					\lineskip=\normlskip
-					\parskip=\normpskip
-					\vskip -\parskip
-\def\Ecartouche{%
-				\endgroup
-				\kern3pt
-			\egroup
-			\kern3pt\vrule
-			\hskip\rskip
-		\egroup
-		\cartbot
-	\egroup
-\endgroup
-}}
-
-
-% This macro is called at the beginning of all the @example variants,
-% inside a group.
-\def\nonfillstart{%
-  \aboveenvbreak
-  \inENV % This group ends at the end of the body
-  \hfuzz = 12pt % Don't be fussy
-  \sepspaces % Make spaces be word-separators rather than space tokens.
-  \singlespace
-  \let\par = \lisppar % don't ignore blank lines
-  \obeylines % each line of input is a line of output
-  \parskip = 0pt
-  \parindent = 0pt
-  \emergencystretch = 0pt % don't try to avoid overfull boxes
-  % @cartouche defines \nonarrowing to inhibit narrowing
-  % at next level down.
-  \ifx\nonarrowing\relax
-    \advance \leftskip by \lispnarrowing
-    \exdentamount=\lispnarrowing
-    \let\exdent=\nofillexdent
-    \let\nonarrowing=\relax
-  \fi
-}
-
-% To ending an @example-like environment, we first end the paragraph
-% (via \afterenvbreak's vertical glue), and then the group.  That way we
-% keep the zero \parskip that the environments set -- \parskip glue
-% will be inserted at the beginning of the next paragraph in the
-% document, after the environment.
-%
-\def\nonfillfinish{\afterenvbreak\endgroup}%
-
-% This macro is
-\def\lisp{\begingroup
-  \nonfillstart
-  \let\Elisp = \nonfillfinish
-  \tt
-  \rawbackslash % have \ input char produce \ char from current font
-  \gobble
-}
-
-% Define the \E... control sequence only if we are inside the
-% environment, so the error checking in \end will work.
-%
-% We must call \lisp last in the definition, since it reads the
-% return following the @example (or whatever) command.
-%
-\def\example{\begingroup \def\Eexample{\nonfillfinish\endgroup}\lisp}
-\def\smallexample{\begingroup \def\Esmallexample{\nonfillfinish\endgroup}\lisp}
-\def\smalllisp{\begingroup \def\Esmalllisp{\nonfillfinish\endgroup}\lisp}
-
-% @smallexample and @smalllisp.  This is not used unless the @smallbook
-% command is given.  Originally contributed by Pavel@xerox.
-%
-\def\smalllispx{\begingroup
-  \nonfillstart
-  \let\Esmalllisp = \nonfillfinish
-  \let\Esmallexample = \nonfillfinish
-  %
-  % Smaller interline space and fonts for small examples.
-  \setleading{10pt}%
-  \indexfonts \tt
-  \rawbackslash % make \ output the \ character from the current font (tt)
-  \gobble
-}
-
-% This is @display; same as @lisp except use roman font.
-%
-\def\display{\begingroup
-  \nonfillstart
-  \let\Edisplay = \nonfillfinish
-  \gobble
-}
-
-% This is @format; same as @display except don't narrow margins.
-%
-\def\format{\begingroup
-  \let\nonarrowing = t
-  \nonfillstart
-  \let\Eformat = \nonfillfinish
-  \gobble
-}
-
-% @flushleft (same as @format) and @flushright.
-%
-\def\flushleft{\begingroup
-  \let\nonarrowing = t
-  \nonfillstart
-  \let\Eflushleft = \nonfillfinish
-  \gobble
-}
-\def\flushright{\begingroup
-  \let\nonarrowing = t
-  \nonfillstart
-  \let\Eflushright = \nonfillfinish
-  \advance\leftskip by 0pt plus 1fill
-  \gobble}
-
-% @quotation does normal linebreaking (hence we can't use \nonfillstart)
-% and narrows the margins.
-%
-\def\quotation{%
-  \begingroup\inENV %This group ends at the end of the @quotation body
-  {\parskip=0pt \aboveenvbreak}% because \aboveenvbreak inserts \parskip
-  \singlespace
-  \parindent=0pt
-  % We have retained a nonzero parskip for the environment, since we're
-  % doing normal filling. So to avoid extra space below the environment...
-  \def\Equotation{\parskip = 0pt \nonfillfinish}%
-  %
-  % @cartouche defines \nonarrowing to inhibit narrowing at next level down.
-  \ifx\nonarrowing\relax
-    \advance\leftskip by \lispnarrowing
-    \advance\rightskip by \lispnarrowing
-    \exdentamount = \lispnarrowing
-    \let\nonarrowing = \relax
-  \fi
-}
-
-\message{defuns,}
-% Define formatter for defuns
-% First, allow user to change definition object font (\df) internally
-\def\setdeffont #1 {\csname DEF#1\endcsname}
-
-\newskip\defbodyindent \defbodyindent=.4in
-\newskip\defargsindent \defargsindent=50pt
-\newskip\deftypemargin \deftypemargin=12pt
-\newskip\deflastargmargin \deflastargmargin=18pt
-
-\newcount\parencount
-% define \functionparens, which makes ( and ) and & do special things.
-% \functionparens affects the group it is contained in.
-\def\activeparens{%
-\catcode`\(=\active \catcode`\)=\active \catcode`\&=\active
-\catcode`\[=\active \catcode`\]=\active}
-
-% Make control sequences which act like normal parenthesis chars.
-\let\lparen = ( \let\rparen = )
-
-{\activeparens % Now, smart parens don't turn on until &foo (see \amprm)
-
-% Be sure that we always have a definition for `(', etc.  For example,
-% if the fn name has parens in it, \boldbrax will not be in effect yet,
-% so TeX would otherwise complain about undefined control sequence.
-\global\let(=\lparen \global\let)=\rparen
-\global\let[=\lbrack \global\let]=\rbrack
-
-\gdef\functionparens{\boldbrax\let&=\amprm\parencount=0 }
-\gdef\boldbrax{\let(=\opnr\let)=\clnr\let[=\lbrb\let]=\rbrb}
-% This is used to turn on special parens
-% but make & act ordinary (given that it's active).
-\gdef\boldbraxnoamp{\let(=\opnr\let)=\clnr\let[=\lbrb\let]=\rbrb\let&=\ampnr}
-
-% Definitions of (, ) and & used in args for functions.
-% This is the definition of ( outside of all parentheses.
-\gdef\oprm#1 {{\rm\char`\(}#1 \bf \let(=\opnested %
-\global\advance\parencount by 1 }
-%
-% This is the definition of ( when already inside a level of parens.
-\gdef\opnested{\char`\(\global\advance\parencount by 1 }
-%
-\gdef\clrm{% Print a paren in roman if it is taking us back to depth of 0.
-% also in that case restore the outer-level definition of (.
-\ifnum \parencount=1 {\rm \char `\)}\sl \let(=\oprm \else \char `\) \fi
-\global\advance \parencount by -1 }
-% If we encounter &foo, then turn on ()-hacking afterwards
-\gdef\amprm#1 {{\rm\&#1}\let(=\oprm \let)=\clrm\ }
-%
-\gdef\normalparens{\boldbrax\let&=\ampnr}
-} % End of definition inside \activeparens
-%% These parens (in \boldbrax) actually are a little bolder than the
-%% contained text.  This is especially needed for [ and ]
-\def\opnr{{\sf\char`\(}} \def\clnr{{\sf\char`\)}} \def\ampnr{\&}
-\def\lbrb{{\bf\char`\[}} \def\rbrb{{\bf\char`\]}}
-
-% First, defname, which formats the header line itself.
-% #1 should be the function name.
-% #2 should be the type of definition, such as "Function".
-
-\def\defname #1#2{%
-% Get the values of \leftskip and \rightskip as they were
-% outside the @def...
-\dimen2=\leftskip
-\advance\dimen2 by -\defbodyindent
-\dimen3=\rightskip
-\advance\dimen3 by -\defbodyindent
-\noindent        %
-\setbox0=\hbox{\hskip \deflastargmargin{\rm #2}\hskip \deftypemargin}%
-\dimen0=\hsize \advance \dimen0 by -\wd0 % compute size for first line
-\dimen1=\hsize \advance \dimen1 by -\defargsindent %size for continuations
-\parshape 2 0in \dimen0 \defargsindent \dimen1     %
-% Now output arg 2 ("Function" or some such)
-% ending at \deftypemargin from the right margin,
-% but stuck inside a box of width 0 so it does not interfere with linebreaking
-{% Adjust \hsize to exclude the ambient margins,
-% so that \rightline will obey them.
-\advance \hsize by -\dimen2 \advance \hsize by -\dimen3
-\rlap{\rightline{{\rm #2}\hskip \deftypemargin}}}%
-% Make all lines underfull and no complaints:
-\tolerance=10000 \hbadness=10000
-\advance\leftskip by -\defbodyindent
-\exdentamount=\defbodyindent
-{\df #1}\enskip        % Generate function name
-}
-
-% Actually process the body of a definition
-% #1 should be the terminating control sequence, such as \Edefun.
-% #2 should be the "another name" control sequence, such as \defunx.
-% #3 should be the control sequence that actually processes the header,
-%    such as \defunheader.
-
-\def\defparsebody #1#2#3{\begingroup\inENV% Environment for definitionbody
-\medbreak %
-% Define the end token that this defining construct specifies
-% so that it will exit this group.
-\def#1{\endgraf\endgroup\medbreak}%
-\def#2{\begingroup\obeylines\activeparens\spacesplit#3}%
-\parindent=0in
-\advance\leftskip by \defbodyindent \advance \rightskip by \defbodyindent
-\exdentamount=\defbodyindent
-\begingroup %
-\catcode 61=\active % 61 is `='
-\obeylines\activeparens\spacesplit#3}
-
-\def\defmethparsebody #1#2#3#4 {\begingroup\inENV %
-\medbreak %
-% Define the end token that this defining construct specifies
-% so that it will exit this group.
-\def#1{\endgraf\endgroup\medbreak}%
-\def#2##1 {\begingroup\obeylines\activeparens\spacesplit{#3{##1}}}%
-\parindent=0in
-\advance\leftskip by \defbodyindent \advance \rightskip by \defbodyindent
-\exdentamount=\defbodyindent
-\begingroup\obeylines\activeparens\spacesplit{#3{#4}}}
-
-\def\defopparsebody #1#2#3#4#5 {\begingroup\inENV %
-\medbreak %
-% Define the end token that this defining construct specifies
-% so that it will exit this group.
-\def#1{\endgraf\endgroup\medbreak}%
-\def#2##1 ##2 {\def#4{##1}%
-\begingroup\obeylines\activeparens\spacesplit{#3{##2}}}%
-\parindent=0in
-\advance\leftskip by \defbodyindent \advance \rightskip by \defbodyindent
-\exdentamount=\defbodyindent
-\begingroup\obeylines\activeparens\spacesplit{#3{#5}}}
-
-% These parsing functions are similar to the preceding ones
-% except that they do not make parens into active characters.
-% These are used for "variables" since they have no arguments.
-
-\def\defvarparsebody #1#2#3{\begingroup\inENV% Environment for definitionbody
-\medbreak %
-% Define the end token that this defining construct specifies
-% so that it will exit this group.
-\def#1{\endgraf\endgroup\medbreak}%
-\def#2{\begingroup\obeylines\spacesplit#3}%
-\parindent=0in
-\advance\leftskip by \defbodyindent \advance \rightskip by \defbodyindent
-\exdentamount=\defbodyindent
-\begingroup %
-\catcode 61=\active %
-\obeylines\spacesplit#3}
-
-% This is used for \def{tp,vr}parsebody.  It could probably be used for
-% some of the others, too, with some judicious conditionals.
-% 
-\def\parsebodycommon#1#2#3{%
-  \begingroup\inENV %
-  \medbreak %
-  % Define the end token that this defining construct specifies
-  % so that it will exit this group.
-  \def#1{\endgraf\endgroup\medbreak}%
-  \def#2##1 {\begingroup\obeylines\spacesplit{#3{##1}}}%
-  \parindent=0in
-  \advance\leftskip by \defbodyindent \advance \rightskip by \defbodyindent
-  \exdentamount=\defbodyindent
-  \begingroup\obeylines
-}
-
-\def\defvrparsebody#1#2#3#4 {%
-  \parsebodycommon{#1}{#2}{#3}%
-  \spacesplit{#3{#4}}%
-}
-
-% This loses on `@deftp {Data Type} {struct termios}' -- it thinks the
-% type is just `struct', because we lose the braces in `{struct
-% termios}' when \spacesplit reads its undelimited argument.  Sigh.
-% \let\deftpparsebody=\defvrparsebody
-%
-% So, to get around this, we put \empty in with the type name.  That
-% way, TeX won't find exactly `{...}' as an undelimited argument, and
-% won't strip off the braces.
-%
-\def\deftpparsebody #1#2#3#4 {%
-  \parsebodycommon{#1}{#2}{#3}%
-  \spacesplit{\parsetpheaderline{#3{#4}}}\empty
-}
-
-% Fine, but then we have to eventually remove the \empty *and* the
-% braces (if any).  That's what this does, putting the result in \tptemp.
-% 
-\def\removeemptybraces\empty#1\relax{\def\tptemp{#1}}%
-
-% After \spacesplit has done its work, this is called -- #1 is the final
-% thing to call, #2 the type name (which starts with \empty), and #3
-% (which might be empty) the arguments.
-% 
-\def\parsetpheaderline#1#2#3{%
-  \removeemptybraces#2\relax
-  #1{\tptemp}{#3}%
-}%
-
-\def\defopvarparsebody #1#2#3#4#5 {\begingroup\inENV %
-\medbreak %
-% Define the end token that this defining construct specifies
-% so that it will exit this group.
-\def#1{\endgraf\endgroup\medbreak}%
-\def#2##1 ##2 {\def#4{##1}%
-\begingroup\obeylines\spacesplit{#3{##2}}}%
-\parindent=0in
-\advance\leftskip by \defbodyindent \advance \rightskip by \defbodyindent
-\exdentamount=\defbodyindent
-\begingroup\obeylines\spacesplit{#3{#5}}}
-
-% Split up #2 at the first space token.
-% call #1 with two arguments:
-%  the first is all of #2 before the space token,
-%  the second is all of #2 after that space token.
-% If #2 contains no space token, all of it is passed as the first arg
-% and the second is passed as empty.
-
-{\obeylines
-\gdef\spacesplit#1#2^^M{\endgroup\spacesplitfoo{#1}#2 \relax\spacesplitfoo}%
-\long\gdef\spacesplitfoo#1#2 #3#4\spacesplitfoo{%
-\ifx\relax #3%
-#1{#2}{}\else #1{#2}{#3#4}\fi}}
-
-% So much for the things common to all kinds of definitions.
-
-% Define @defun.
-
-% First, define the processing that is wanted for arguments of \defun
-% Use this to expand the args and terminate the paragraph they make up
-
-\def\defunargs #1{\functionparens \sl
-% Expand, preventing hyphenation at `-' chars.
-% Note that groups don't affect changes in \hyphenchar.
-\hyphenchar\tensl=0
-#1%
-\hyphenchar\tensl=45
-\ifnum\parencount=0 \else \errmessage{unbalanced parens in @def arguments}\fi%
-\interlinepenalty=10000
-\advance\rightskip by 0pt plus 1fil
-\endgraf\penalty 10000\vskip -\parskip\penalty 10000%
-}
-
-\def\deftypefunargs #1{%
-% Expand, preventing hyphenation at `-' chars.
-% Note that groups don't affect changes in \hyphenchar.
-% Use \boldbraxnoamp, not \functionparens, so that & is not special.
-\boldbraxnoamp
-\tclose{#1}% avoid \code because of side effects on active chars
-\interlinepenalty=10000
-\advance\rightskip by 0pt plus 1fil
-\endgraf\penalty 10000\vskip -\parskip\penalty 10000%
-}
-
-% Do complete processing of one @defun or @defunx line already parsed.
-
-% @deffn Command forward-char nchars
-
-\def\deffn{\defmethparsebody\Edeffn\deffnx\deffnheader}
-
-\def\deffnheader #1#2#3{\doind {fn}{\code{#2}}%
-\begingroup\defname {#2}{#1}\defunargs{#3}\endgroup %
-\catcode 61=\other % Turn off change made in \defparsebody
-}
-
-% @defun == @deffn Function
-
-\def\defun{\defparsebody\Edefun\defunx\defunheader}
-
-\def\defunheader #1#2{\doind {fn}{\code{#1}}% Make entry in function index
-\begingroup\defname {#1}{Function}%
-\defunargs {#2}\endgroup %
-\catcode 61=\other % Turn off change made in \defparsebody
-}
-
-% @deftypefun int foobar (int @var{foo}, float @var{bar})
-
-\def\deftypefun{\defparsebody\Edeftypefun\deftypefunx\deftypefunheader}
-
-% #1 is the data type.  #2 is the name and args.
-\def\deftypefunheader #1#2{\deftypefunheaderx{#1}#2 \relax}
-% #1 is the data type, #2 the name, #3 the args.
-\def\deftypefunheaderx #1#2 #3\relax{%
-\doind {fn}{\code{#2}}% Make entry in function index
-\begingroup\defname {\defheaderxcond#1\relax$$$#2}{Function}%
-\deftypefunargs {#3}\endgroup %
-\catcode 61=\other % Turn off change made in \defparsebody
-}
-
-% @deftypefn {Library Function} int foobar (int @var{foo}, float @var{bar})
-
-\def\deftypefn{\defmethparsebody\Edeftypefn\deftypefnx\deftypefnheader}
-
-% \defheaderxcond#1\relax$$$
-% puts #1 in @code, followed by a space, but does nothing if #1 is null.
-\def\defheaderxcond#1#2$$${\ifx#1\relax\else\code{#1#2} \fi}
-
-% #1 is the classification.  #2 is the data type.  #3 is the name and args.
-\def\deftypefnheader #1#2#3{\deftypefnheaderx{#1}{#2}#3 \relax}
-% #1 is the classification, #2 the data type, #3 the name, #4 the args.
-\def\deftypefnheaderx #1#2#3 #4\relax{%
-\doind {fn}{\code{#3}}% Make entry in function index
-\begingroup
-\normalparens % notably, turn off `&' magic, which prevents
-%               at least some C++ text from working
-\defname {\defheaderxcond#2\relax$$$#3}{#1}%
-\deftypefunargs {#4}\endgroup %
-\catcode 61=\other % Turn off change made in \defparsebody
-}
-
-% @defmac == @deffn Macro
-
-\def\defmac{\defparsebody\Edefmac\defmacx\defmacheader}
-
-\def\defmacheader #1#2{\doind {fn}{\code{#1}}% Make entry in function index
-\begingroup\defname {#1}{Macro}%
-\defunargs {#2}\endgroup %
-\catcode 61=\other % Turn off change made in \defparsebody
-}
-
-% @defspec == @deffn Special Form
-
-\def\defspec{\defparsebody\Edefspec\defspecx\defspecheader}
-
-\def\defspecheader #1#2{\doind {fn}{\code{#1}}% Make entry in function index
-\begingroup\defname {#1}{Special Form}%
-\defunargs {#2}\endgroup %
-\catcode 61=\other % Turn off change made in \defparsebody
-}
-
-% This definition is run if you use @defunx
-% anywhere other than immediately after a @defun or @defunx.
-
-\def\deffnx #1 {\errmessage{@deffnx in invalid context}}
-\def\defunx #1 {\errmessage{@defunx in invalid context}}
-\def\defmacx #1 {\errmessage{@defmacx in invalid context}}
-\def\defspecx #1 {\errmessage{@defspecx in invalid context}}
-\def\deftypefnx #1 {\errmessage{@deftypefnx in invalid context}}
-\def\deftypeunx #1 {\errmessage{@deftypeunx in invalid context}}
-
-% @defmethod, and so on
-
-% @defop {Funny Method} foo-class frobnicate argument
-
-\def\defop #1 {\def\defoptype{#1}%
-\defopparsebody\Edefop\defopx\defopheader\defoptype}
-
-\def\defopheader #1#2#3{%
-\dosubind {fn}{\code{#2}}{on #1}% Make entry in function index
-\begingroup\defname {#2}{\defoptype{} on #1}%
-\defunargs {#3}\endgroup %
-}
-
-% @defmethod == @defop Method
-
-\def\defmethod{\defmethparsebody\Edefmethod\defmethodx\defmethodheader}
-
-\def\defmethodheader #1#2#3{%
-\dosubind {fn}{\code{#2}}{on #1}% entry in function index
-\begingroup\defname {#2}{Method on #1}%
-\defunargs {#3}\endgroup %
-}
-
-% @defcv {Class Option} foo-class foo-flag
-
-\def\defcv #1 {\def\defcvtype{#1}%
-\defopvarparsebody\Edefcv\defcvx\defcvarheader\defcvtype}
-
-\def\defcvarheader #1#2#3{%
-\dosubind {vr}{\code{#2}}{of #1}% Make entry in var index
-\begingroup\defname {#2}{\defcvtype{} of #1}%
-\defvarargs {#3}\endgroup %
-}
-
-% @defivar == @defcv {Instance Variable}
-
-\def\defivar{\defvrparsebody\Edefivar\defivarx\defivarheader}
-
-\def\defivarheader #1#2#3{%
-\dosubind {vr}{\code{#2}}{of #1}% Make entry in var index
-\begingroup\defname {#2}{Instance Variable of #1}%
-\defvarargs {#3}\endgroup %
-}
-
-% These definitions are run if you use @defmethodx, etc.,
-% anywhere other than immediately after a @defmethod, etc.
-
-\def\defopx #1 {\errmessage{@defopx in invalid context}}
-\def\defmethodx #1 {\errmessage{@defmethodx in invalid context}}
-\def\defcvx #1 {\errmessage{@defcvx in invalid context}}
-\def\defivarx #1 {\errmessage{@defivarx in invalid context}}
-
-% Now @defvar
-
-% First, define the processing that is wanted for arguments of @defvar.
-% This is actually simple: just print them in roman.
-% This must expand the args and terminate the paragraph they make up
-\def\defvarargs #1{\normalparens #1%
-\interlinepenalty=10000
-\endgraf\penalty 10000\vskip -\parskip\penalty 10000}
-
-% @defvr Counter foo-count
-
-\def\defvr{\defvrparsebody\Edefvr\defvrx\defvrheader}
-
-\def\defvrheader #1#2#3{\doind {vr}{\code{#2}}%
-\begingroup\defname {#2}{#1}\defvarargs{#3}\endgroup}
-
-% @defvar == @defvr Variable
-
-\def\defvar{\defvarparsebody\Edefvar\defvarx\defvarheader}
-
-\def\defvarheader #1#2{\doind {vr}{\code{#1}}% Make entry in var index
-\begingroup\defname {#1}{Variable}%
-\defvarargs {#2}\endgroup %
-}
-
-% @defopt == @defvr {User Option}
-
-\def\defopt{\defvarparsebody\Edefopt\defoptx\defoptheader}
-
-\def\defoptheader #1#2{\doind {vr}{\code{#1}}% Make entry in var index
-\begingroup\defname {#1}{User Option}%
-\defvarargs {#2}\endgroup %
-}
-
-% @deftypevar int foobar
-
-\def\deftypevar{\defvarparsebody\Edeftypevar\deftypevarx\deftypevarheader}
-
-% #1 is the data type.  #2 is the name.
-\def\deftypevarheader #1#2{%
-\doind {vr}{\code{#2}}% Make entry in variables index
-\begingroup\defname {\defheaderxcond#1\relax$$$#2}{Variable}%
-\interlinepenalty=10000
-\endgraf\penalty 10000\vskip -\parskip\penalty 10000
-\endgroup}
-
-% @deftypevr {Global Flag} int enable
-
-\def\deftypevr{\defvrparsebody\Edeftypevr\deftypevrx\deftypevrheader}
-
-\def\deftypevrheader #1#2#3{\doind {vr}{\code{#3}}%
-\begingroup\defname {\defheaderxcond#2\relax$$$#3}{#1}
-\interlinepenalty=10000
-\endgraf\penalty 10000\vskip -\parskip\penalty 10000
-\endgroup}
-
-% This definition is run if you use @defvarx
-% anywhere other than immediately after a @defvar or @defvarx.
-
-\def\defvrx #1 {\errmessage{@defvrx in invalid context}}
-\def\defvarx #1 {\errmessage{@defvarx in invalid context}}
-\def\defoptx #1 {\errmessage{@defoptx in invalid context}}
-\def\deftypevarx #1 {\errmessage{@deftypevarx in invalid context}}
-\def\deftypevrx #1 {\errmessage{@deftypevrx in invalid context}}
-
-% Now define @deftp
-% Args are printed in bold, a slight difference from @defvar.
-
-\def\deftpargs #1{\bf \defvarargs{#1}}
-
-% @deftp Class window height width ...
-
-\def\deftp{\deftpparsebody\Edeftp\deftpx\deftpheader}
-
-\def\deftpheader #1#2#3{\doind {tp}{\code{#2}}%
-\begingroup\defname {#2}{#1}\deftpargs{#3}\endgroup}
-
-% This definition is run if you use @deftpx, etc
-% anywhere other than immediately after a @deftp, etc.
-
-\def\deftpx #1 {\errmessage{@deftpx in invalid context}}
-
-\message{cross reference,}
-% Define cross-reference macros
-\newwrite \auxfile
-
-\newif\ifhavexrefs  % True if xref values are known.
-\newif\ifwarnedxrefs  % True if we warned once that they aren't known.
-
-% \setref{foo} defines a cross-reference point named foo.
-
-\def\setref#1{%
-\dosetq{#1-title}{Ytitle}%
-\dosetq{#1-pg}{Ypagenumber}%
-\dosetq{#1-snt}{Ysectionnumberandtype}}
-
-\def\unnumbsetref#1{%
-\dosetq{#1-title}{Ytitle}%
-\dosetq{#1-pg}{Ypagenumber}%
-\dosetq{#1-snt}{Ynothing}}
-
-\def\appendixsetref#1{%
-\dosetq{#1-title}{Ytitle}%
-\dosetq{#1-pg}{Ypagenumber}%
-\dosetq{#1-snt}{Yappendixletterandtype}}
-
-% \xref, \pxref, and \ref generate cross-references to specified points.
-% For \xrefX, #1 is the node name, #2 the name of the Info
-% cross-reference, #3 the printed node name, #4 the name of the Info
-% file, #5 the name of the printed manual.  All but the node name can be
-% omitted.
-%
-\def\href#1{\hrefX[#1,,,]}
-\def\hrefX[#1,#2,#3,#4]{#1}
-\def\pxref#1{\putwordsee{} \xrefX[#1,,,,,,,]}
-\def\xref#1{\putwordSee{} \xrefX[#1,,,,,,,]}
-\def\ref#1{\xrefX[#1,,,,,,,]}
-\def\xrefX[#1,#2,#3,#4,#5,#6]{\begingroup
-  \def\printedmanual{\ignorespaces #5}%
-  \def\printednodename{\ignorespaces #3}%
-  \setbox1=\hbox{\printedmanual}%
-  \setbox0=\hbox{\printednodename}%
-  \ifdim \wd0 = 0pt
-    % No printed node name was explicitly given.
-    \ifx\SETxref-automatic-section-title\thisisundefined
-      % Use the node name inside the square brackets.
-      \def\printednodename{\ignorespaces #1}%
-    \else
-      % Use the actual chapter/section title appear inside
-      % the square brackets.  Use the real section title if we have it.
-      \ifdim \wd1>0pt%
-        % It is in another manual, so we don't have it.
-        \def\printednodename{\ignorespaces #1}%
-      \else
-        \ifhavexrefs
-          % We know the real title if we have the xref values.
-          \def\printednodename{\refx{#1-title}{}}%
-        \else
-          % Otherwise just copy the Info node name.
-          \def\printednodename{\ignorespaces #1}%
-        \fi%
-      \fi
-    \fi
-  \fi
-  %
-  % If we use \unhbox0 and \unhbox1 to print the node names, TeX does not
-  % insert empty discretionaries after hyphens, which means that it will
-  % not find a line break at a hyphen in a node names.  Since some manuals
-  % are best written with fairly long node names, containing hyphens, this
-  % is a loss.  Therefore, we give the text of the node name again, so it
-  % is as if TeX is seeing it for the first time.
-  \ifdim \wd1 > 0pt
-    \putwordsection{} ``\printednodename'' in \cite{\printedmanual}%
-  \else
-    % _ (for example) has to be the character _ for the purposes of the
-    % control sequence corresponding to the node, but it has to expand
-    % into the usual \leavevmode...\vrule stuff for purposes of
-    % printing. So we \turnoffactive for the \refx-snt, back on for the
-    % printing, back off for the \refx-pg.
-    {\turnoffactive \refx{#1-snt}{}}%
-    \space [\printednodename],\space
-    \turnoffactive \putwordpage\tie\refx{#1-pg}{}%
-  \fi
-\endgroup}
-
-% \dosetq is the interface for calls from other macros
-
-% Use \turnoffactive so that punctuation chars such as underscore
-% work in node names.
-\def\dosetq #1#2{{\let\folio=0 \turnoffactive \auxhat%
-\edef\next{\write\auxfile{\internalsetq {#1}{#2}}}%
-\next}}
-
-% \internalsetq {foo}{page} expands into
-% CHARACTERS 'xrdef {foo}{...expansion of \Ypage...}
-% When the aux file is read, ' is the escape character
-
-\def\internalsetq #1#2{'xrdef {#1}{\csname #2\endcsname}}
-
-% Things to be expanded by \internalsetq
-
-\def\Ypagenumber{\folio}
-
-\def\Ytitle{\thissection}
-
-\def\Ynothing{}
-
-\def\Ysectionnumberandtype{%
-\ifnum\secno=0 \putwordChapter\xreftie\the\chapno %
-\else \ifnum \subsecno=0 \putwordSection\xreftie\the\chapno.\the\secno %
-\else \ifnum \subsubsecno=0 %
-\putwordSection\xreftie\the\chapno.\the\secno.\the\subsecno %
-\else %
-\putwordSection\xreftie\the\chapno.\the\secno.\the\subsecno.\the\subsubsecno %
-\fi \fi \fi }
-
-\def\Yappendixletterandtype{%
-\ifnum\secno=0 \putwordAppendix\xreftie'char\the\appendixno{}%
-\else \ifnum \subsecno=0 \putwordSection\xreftie'char\the\appendixno.\the\secno %
-\else \ifnum \subsubsecno=0 %
-\putwordSection\xreftie'char\the\appendixno.\the\secno.\the\subsecno %
-\else %
-\putwordSection\xreftie'char\the\appendixno.\the\secno.\the\subsecno.\the\subsubsecno %
-\fi \fi \fi }
-
-\gdef\xreftie{'tie}
-
-% Use TeX 3.0's \inputlineno to get the line number, for better error
-% messages, but if we're using an old version of TeX, don't do anything.
-%
-\ifx\inputlineno\thisisundefined
-  \let\linenumber = \empty % Non-3.0.
-\else
-  \def\linenumber{\the\inputlineno:\space}
-\fi
-
-% Define \refx{NAME}{SUFFIX} to reference a cross-reference string named NAME.
-% If its value is nonempty, SUFFIX is output afterward.
-
-\def\refx#1#2{%
-  \expandafter\ifx\csname X#1\endcsname\relax
-    % If not defined, say something at least.
-    $\langle$un\-de\-fined$\rangle$%
-    \ifhavexrefs
-      \message{\linenumber Undefined cross reference `#1'.}%
-    \else
-      \ifwarnedxrefs\else
-        \global\warnedxrefstrue
-        \message{Cross reference values unknown; you must run TeX again.}%
-      \fi
-    \fi
-  \else
-    % It's defined, so just use it.
-    \csname X#1\endcsname
-  \fi
-  #2% Output the suffix in any case.
-}
-
-% Read the last existing aux file, if any.  No error if none exists.
-
-% This is the macro invoked by entries in the aux file.
-\def\xrdef #1#2{
-{\catcode`\'=\other\expandafter \gdef \csname X#1\endcsname {#2}}}
-
-\def\readauxfile{%
-\begingroup
-\catcode `\^^@=\other
-\catcode `\
=\other
-\catcode `\=\other
-\catcode `\^^C=\other
-\catcode `\^^D=\other
-\catcode `\^^E=\other
-\catcode `\^^F=\other
-\catcode `\^^G=\other
-\catcode `\^^H=\other
-\catcode `\=\other
-\catcode `\^^L=\other
-\catcode `\=\other
-\catcode `\=\other
-\catcode `\=\other
-\catcode `\=\other
-\catcode `\=\other
-\catcode `\=\other
-\catcode `\=\other
-\catcode `\=\other
-\catcode `\=\other
-\catcode `\=\other
-\catcode `\=\other
-\catcode `\=\other
-\catcode 26=\other
-\catcode `\^^[=\other
-\catcode `\^^\=\other
-\catcode `\^^]=\other
-\catcode `\^^^=\other
-\catcode `\^^_=\other
-\catcode `\@=\other
-\catcode `\^=\other
-\catcode `\~=\other
-\catcode `\[=\other
-\catcode `\]=\other
-\catcode`\"=\other
-\catcode`\_=\other
-\catcode`\|=\other
-\catcode`\<=\other
-\catcode`\>=\other
-\catcode `\$=\other
-\catcode `\#=\other
-\catcode `\&=\other
-% `\+ does not work, so use 43.
-\catcode 43=\other
-% Make the characters 128-255 be printing characters
-{%
-  \count 1=128
-  \def\loop{%
-    \catcode\count 1=\other
-    \advance\count 1 by 1
-    \ifnum \count 1<256 \loop \fi
-  }%
-}%
-% the aux file uses ' as the escape.
-% Turn off \ as an escape so we do not lose on
-% entries which were dumped with control sequences in their names.
-% For example, 'xrdef {$\leq $-fun}{page ...} made by @defun ^^
-% Reference to such entries still does not work the way one would wish,
-% but at least they do not bomb out when the aux file is read in.
-\catcode `\{=1 \catcode `\}=2
-\catcode `\%=\other
-\catcode `\'=0
-\catcode`\^=7 % to make ^^e4 etc usable in xref tags 
-\catcode `\\=\other
-\openin 1 \jobname.aux
-\ifeof 1 \else \closein 1 \input \jobname.aux \global\havexrefstrue
-\global\warnedobstrue
-\fi
-% Open the new aux file.  Tex will close it automatically at exit.
-\openout \auxfile=\jobname.aux
-\endgroup}
-
-
-% Footnotes.
-
-\newcount \footnoteno
-
-% The trailing space in the following definition for supereject is
-% vital for proper filling; pages come out unaligned when you do a
-% pagealignmacro call if that space before the closing brace is
-% removed.
-\def\supereject{\par\penalty -20000\footnoteno =0 }
-
-% @footnotestyle is meaningful for info output only..
-\let\footnotestyle=\comment
-
-\let\ptexfootnote=\footnote
-
-{\catcode `\@=11
-%
-% Auto-number footnotes.  Otherwise like plain.
-\gdef\footnote{%
-  \global\advance\footnoteno by \@ne
-  \edef\thisfootno{$^{\the\footnoteno}$}%
-  %
-  % In case the footnote comes at the end of a sentence, preserve the
-  % extra spacing after we do the footnote number.
-  \let\@sf\empty
-  \ifhmode\edef\@sf{\spacefactor\the\spacefactor}\/\fi
-  %
-  % Remove inadvertent blank space before typesetting the footnote number.
-  \unskip
-  \thisfootno\@sf
-  \footnotezzz
-}%
-
-% Don't bother with the trickery in plain.tex to not require the
-% footnote text as a parameter.  Our footnotes don't need to be so general.
-%
-\long\gdef\footnotezzz#1{\insert\footins{%
-  % We want to typeset this text as a normal paragraph, even if the
-  % footnote reference occurs in (for example) a display environment.
-  % So reset some parameters.
-  \interlinepenalty\interfootnotelinepenalty
-  \splittopskip\ht\strutbox % top baseline for broken footnotes
-  \splitmaxdepth\dp\strutbox
-  \floatingpenalty\@MM
-  \leftskip\z@skip
-  \rightskip\z@skip
-  \spaceskip\z@skip
-  \xspaceskip\z@skip
-  \parindent\defaultparindent
-  %
-  % Hang the footnote text off the number.
-  \hang
-  \textindent{\thisfootno}%
-  %
-  % Don't crash into the line above the footnote text.  Since this
-  % expands into a box, it must come within the paragraph, lest it
-  % provide a place where TeX can split the footnote.
-  \footstrut
-  #1\strut}%
-}
-
-}%end \catcode `\@=11
-
-% Set the baselineskip to #1, and the lineskip and strut size
-% correspondingly.  There is no deep meaning behind these magic numbers
-% used as factors; they just match (closely enough) what Knuth defined.
-%
-\def\lineskipfactor{.08333}
-\def\strutheightpercent{.70833}
-\def\strutdepthpercent {.29167}
-%
-\def\setleading#1{%
-  \normalbaselineskip = #1\relax
-  \normallineskip = \lineskipfactor\normalbaselineskip
-  \normalbaselines
-  \setbox\strutbox =\hbox{%
-    \vrule width0pt height\strutheightpercent\baselineskip
-                    depth \strutdepthpercent \baselineskip
-  }%
-}
-
-% @| inserts a changebar to the left of the current line.  It should
-% surround any changed text.  This approach does *not* work if the
-% change spans more than two lines of output.  To handle that, we would
-% have adopt a much more difficult approach (putting marks into the main
-% vertical list for the beginning and end of each change).
-%
-\def\|{%
-  % \vadjust can only be used in horizontal mode.
-  \leavevmode
-  %
-  % Append this vertical mode material after the current line in the output.
-  \vadjust{%
-    % We want to insert a rule with the height and depth of the current
-    % leading; that is exactly what \strutbox is supposed to record.
-    \vskip-\baselineskip
-    %
-    % \vadjust-items are inserted at the left edge of the type.  So
-    % the \llap here moves out into the left-hand margin.
-    \llap{%
-      %
-      % For a thicker or thinner bar, change the `1pt'.
-      \vrule height\baselineskip width1pt
-      %
-      % This is the space between the bar and the text.
-      \hskip 12pt
-    }%
-  }%
-}
-
-% For a final copy, take out the rectangles
-% that mark overfull boxes (in case you have decided
-% that the text looks ok even though it passes the margin).
-%
-\def\finalout{\overfullrule=0pt}
-
-
-% End of control word definitions.
-
-\message{and turning on texinfo input format.}
-
-\def\openindices{%
-   \newindex{cp}%
-   \newcodeindex{fn}%
-   \newcodeindex{vr}%
-   \newcodeindex{tp}%
-   \newcodeindex{ky}%
-   \newcodeindex{pg}%
-}
-
-% Set some numeric style parameters, for 8.5 x 11 format.
-
-%\hsize = 6.5in
-\newdimen\defaultparindent \defaultparindent = 15pt
-\parindent = \defaultparindent
-\parskip 18pt plus 1pt
-\setleading{15pt}
-\advance\topskip by 1.2cm
-
-% Prevent underfull vbox error messages.
-\vbadness=10000
-
-% Following George Bush, just get rid of widows and orphans.
-\widowpenalty=10000
-\clubpenalty=10000
-
-% Use TeX 3.0's \emergencystretch to help line breaking, but if we're
-% using an old version of TeX, don't do anything.  We want the amount of
-% stretch added to depend on the line length, hence the dependence on
-% \hsize.  This makes it come to about 9pt for the 8.5x11 format.
-%
-\ifx\emergencystretch\thisisundefined
-  % Allow us to assign to \emergencystretch anyway.
-  \def\emergencystretch{\dimen0}%
-\else
-  \emergencystretch = \hsize
-  \divide\emergencystretch by 45
-\fi
-
-% Use @smallbook to reset parameters for 7x9.5 format  (or else 7x9.25)
-\def\smallbook{
-
-% These values for secheadingskip and subsecheadingskip are
-% experiments.  RJC 7 Aug 1992
-\global\secheadingskip = 17pt plus 6pt minus 3pt
-\global\subsecheadingskip = 14pt plus 6pt minus 3pt
-
-\global\lispnarrowing = 0.3in
-\setleading{12pt}
-\advance\topskip by -1cm
-\global\parskip 3pt plus 1pt
-\global\hsize = 5in
-\global\vsize=7.5in
-\global\tolerance=700
-\global\hfuzz=1pt
-\global\contentsrightmargin=0pt
-\global\deftypemargin=0pt
-\global\defbodyindent=.5cm
-
-\global\pagewidth=\hsize
-\global\pageheight=\vsize
-
-\global\let\smalllisp=\smalllispx
-\global\let\smallexample=\smalllispx
-\global\def\Esmallexample{\Esmalllisp}
-}
-
-% Use @afourpaper to print on European A4 paper.
-\def\afourpaper{
-\global\tolerance=700
-\global\hfuzz=1pt
-\setleading{12pt}
-\global\parskip 15pt plus 1pt
-
-\global\vsize= 53\baselineskip
-\advance\vsize by \topskip
-%\global\hsize=   5.85in     % A4 wide 10pt
-\global\hsize=  6.5in
-\global\outerhsize=\hsize
-\global\advance\outerhsize by 0.5in
-\global\outervsize=\vsize
-\global\advance\outervsize by 0.6in
-
-\global\pagewidth=\hsize
-\global\pageheight=\vsize
-}
-
-% Allow control of the text dimensions.  Parameters in order: textheight;
-% textwidth; \voffset; \hoffset (!); binding offset.  All require a dimension;
-% header is additional; added length extends the bottom of the page.
-
-\def\changepagesizes#1#2#3#4#5{
- \global\vsize= #1
- \advance\vsize by \topskip
- \global\voffset= #3
- \global\hsize= #2
- \global\outerhsize=\hsize
- \global\advance\outerhsize by 0.5in
- \global\outervsize=\vsize
- \global\advance\outervsize by 0.6in
- \global\pagewidth=\hsize
- \global\pageheight=\vsize
- \global\normaloffset= #4
- \global\bindingoffset= #5}
-
-% This layout is compatible with Latex on A4 paper.
-
-\def\afourlatex{\changepagesizes{22cm}{15cm}{7mm}{4.6mm}{5mm}}
-
-% Use @afourwide to print on European A4 paper in wide format.
-\def\afourwide{\afourpaper
-\changepagesizes{9.5in}{6.5in}{\hoffset}{\normaloffset}{\bindingoffset}}
-
-% Define macros to output various characters with catcode for normal text.
-\catcode`\"=\other
-\catcode`\~=\other
-\catcode`\^=\other
-\catcode`\_=\other
-\catcode`\|=\other
-\catcode`\<=\other
-\catcode`\>=\other
-\catcode`\+=\other
-\def\normaldoublequote{"}
-\def\normaltilde{~}
-\def\normalcaret{^}
-\def\normalunderscore{_}
-\def\normalverticalbar{|}
-\def\normalless{<}
-\def\normalgreater{>}
-\def\normalplus{+}
-
-% This macro is used to make a character print one way in ttfont
-% where it can probably just be output, and another way in other fonts,
-% where something hairier probably needs to be done.
-%
-% #1 is what to print if we are indeed using \tt; #2 is what to print
-% otherwise.  Since all the Computer Modern typewriter fonts have zero
-% interword stretch (and shrink), and it is reasonable to expect all
-% typewriter fonts to have this, we can check that font parameter.
-%
-\def\ifusingtt#1#2{\ifdim \fontdimen3\the\font=0pt #1\else #2\fi}
-
-% Turn off all special characters except @
-% (and those which the user can use as if they were ordinary).
-% Most of these we simply print from the \tt font, but for some, we can
-% use math or other variants that look better in normal text.
-
-\catcode`\"=\active
-\def\activedoublequote{{\tt \char '042}}
-\let"=\activedoublequote
-\catcode`\~=\active
-\def~{{\tt \char '176}}
-\chardef\hat=`\^
-\catcode`\^=\active
-\def\auxhat{\def^{'hat}}
-\def^{{\tt \hat}}
-
-\catcode`\_=\active
-\def_{\ifusingtt\normalunderscore\_}
-% Subroutine for the previous macro.
-\def\_{\leavevmode \kern.06em \vbox{\hrule width.3em height.1ex}}
-
-\catcode`\|=\active
-\def|{{\tt \char '174}}
-\chardef \less=`\<
-\catcode`\<=\active
-\def<{{\tt \less}}
-\chardef \gtr=`\>
-\catcode`\>=\active
-\def>{{\tt \gtr}}
-\catcode`\+=\active
-\def+{{\tt \char 43}}
-%\catcode 27=\active
-%\def^^[{$\diamondsuit$}
-
-% Set up an active definition for =, but don't enable it most of the time.
-{\catcode`\==\active
-\global\def={{\tt \char 61}}}
-
-\catcode`+=\active
-\catcode`\_=\active
-
-% If a .fmt file is being used, characters that might appear in a file
-% name cannot be active until we have parsed the command line.
-% So turn them off again, and have \everyjob (or @setfilename) turn them on.
-% \otherifyactive is called near the end of this file.
-\def\otherifyactive{\catcode`+=\other \catcode`\_=\other}
-
-\catcode`\@=0
-
-% \rawbackslashxx output one backslash character in current font
-\global\chardef\rawbackslashxx=`\\
-%{\catcode`\\=\other
-%@gdef@rawbackslashxx{\}}
-
-% \rawbackslash redefines \ as input to do \rawbackslashxx.
-{\catcode`\\=\active
-@gdef@rawbackslash{@let\=@rawbackslashxx }}
-
-% \normalbackslash outputs one backslash in fixed width font.
-\def\normalbackslash{{\tt\rawbackslashxx}}
-
-% Say @foo, not \foo, in error messages.
-\escapechar=`\@
-
-% \catcode 17=0   % Define control-q
-\catcode`\\=\active
-
-% Used sometimes to turn off (effectively) the active characters
-% even after parsing them.
-@def@turnoffactive{@let"=@normaldoublequote
-@let\=@realbackslash
-@let~=@normaltilde
-@let^=@normalcaret
-@let_=@normalunderscore
-@let|=@normalverticalbar
-@let<=@normalless
-@let>=@normalgreater
-@let+=@normalplus}
-
-@def@normalturnoffactive{@let"=@normaldoublequote
-@let\=@normalbackslash
-@let~=@normaltilde
-@let^=@normalcaret
-@let_=@normalunderscore
-@let|=@normalverticalbar
-@let<=@normalless
-@let>=@normalgreater
-@let+=@normalplus}
-
-% Make _ and + \other characters, temporarily.
-% This is canceled by @fixbackslash.
-@otherifyactive
-
-% If a .fmt file is being used, we don't want the `\input texinfo' to show up.
-% That is what \eatinput is for; after that, the `\' should revert to printing
-% a backslash.
-%
-@gdef@eatinput input texinfo{@fixbackslash}
-@global@let\ = @eatinput
-
-% On the other hand, perhaps the file did not have a `\input texinfo'. Then
-% the first `\{ in the file would cause an error. This macro tries to fix
-% that, assuming it is called before the first `\' could plausibly occur.
-% Also back turn on active characters that might appear in the input
-% file name, in case not using a pre-dumped format.
-%
-@gdef@fixbackslash{@ifx\@eatinput @let\ = @normalbackslash @fi
-  @catcode`+=@active @catcode`@_=@active}
-
-%% These look ok in all fonts, so just make them not special.  The @rm below
-%% makes sure that the current font starts out as the newly loaded cmr10
-@catcode`@$=@other @catcode`@%=@other @catcode`@&=@other @catcode`@#=@other
-
-@textfonts
-@rm
-
-@c Local variables:
-@c page-delimiter: "^\\\\message"
-@c End:
diff --git a/doc/tools/bmenu/Makefile b/doc/tools/bmenu/Makefile
deleted file mode 100644
index 2a3d20ac3e..0000000000
--- a/doc/tools/bmenu/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-#  COPYRIGHT (c) 1988-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  All rights reserved.
-#
-#  $Id$
-#
-
-CC=gcc
-#CFLAGS=-O4 -fomit-frame-pointer
-CFLAGS=-g 
-
-#TEXINPUTS=/home/gnu/work/binutils-2.6/texinfo:.  
-PROG=bmenu
-
-all:  $(PROG)
-
-$(BASE).txt: $(BASE).d ./$(PROG)
-	./$(PROG) $(BASE).d
-
-$(PROG): main.o chain.o
-	gcc main.o chain.o -o $(PROG)
-
-main.o: main.c base.h
-
-chain.o: chain.c 
-
-info: c_user.texinfo timer.texi
-	makeinfo c_user.texinfo
-
-TESTER=init
-test: all
-	#rm -f timer.txt
-	#./bmenu -v timer.texi
-	#cp ../user/$(TESTER).texi .
-	./bmenu -u "DOCS UP" -p "DOCS PREV" -n "DOCS NEXT" -v testdoc.txt
-	#mv $(TESTER).txt $(TESTER).texi
-	#makeinfo c_user.texinfo
-
-
-clean:
-	rm -f *.o $(PROG) *.txt core *.html 
-	rm -f *.dvi *.ps *.log *.aux *.cp *.fn *.ky *.pg *.toc *.tp *.vr $(BASE)
-	rm -f c_user c_user-* _*
-
diff --git a/doc/tools/bmenu/address.h b/doc/tools/bmenu/address.h
deleted file mode 100644
index f4cd38b255..0000000000
--- a/doc/tools/bmenu/address.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/*  address.h
- *
- *  This include file contains the information required to manipulate
- *  physical addresses.
- *
- *  COPYRIGHT (c) 1988-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  All rights reserved.
- *
- *  $Id$
- */
-
-#ifndef __ADDRESSES_h
-#define __ADDRESSES_h
-
-/*
- *  _Addresses_Add_offset
- *
- *  DESCRIPTION:
- *
- *  This function is used to add an offset to a base address.
- *  It returns the resulting address.  This address is typically
- *  converted to an access type before being used further.
- */
-
-STATIC INLINE void *_Addresses_Add_offset ( 
-  void       *base, 
-  unsigned32  offset
-);
-
-/*
- *  _Addresses_Subtract_offset
- *
- *  DESCRIPTION:
- *
- *  This function is used to subtract an offset from a base
- *  address.  It returns the resulting address.  This address is
- *  typically converted to an access type before being used further.
- */
-
-STATIC INLINE void *_Addresses_Subtract_offset( 
-  void       *base, 
-  unsigned32  offset
-);
-
-/*
- *  _Addresses_Add
- *
- *  DESCRIPTION:
- *
- *  This function is used to add two addresses.  It returns the
- *  resulting address.  This address is typically converted to an
- *  access type before being used further.
- */
-
-STATIC INLINE void *_Addresses_Add ( 
-  void *left, 
-  void *right 
-);
-
-/*
- *  _Addresses_Subtract
- *
- *  DESCRIPTION:
- *
- *  This function is used to subtract two addresses.  It returns the
- *  resulting offset.
- */
-
-STATIC INLINE unsigned32 _Addresses_Subtract ( 
-  void *left, 
-  void *right 
-);
-
-/*
- *  _Addresses_Is_aligned
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the given address is correctly
- *  aligned for this processor and FALSE otherwise.  Proper alignment
- *  is based on correctness and efficiency.
- */
-
-STATIC INLINE boolean _Addresses_Is_aligned ( 
-  void *address
-);
-
-/*
- *  _Addresses_Is_in_range
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the given address is within the
- *  memory range specified and FALSE otherwise.  base is the address
- *  of the first byte in the memory range and limit is the address
- *  of the last byte in the memory range.  The base address is
- *  assumed to be lower than the limit address.
- */
-
-STATIC INLINE boolean _Addresses_Is_in_range ( 
-  void *address, 
-  void *base,
-  void *limit 
-);
-
-#include "address.inl"
-
-#endif
-/* end of include file */
diff --git a/doc/tools/bmenu/address.inl b/doc/tools/bmenu/address.inl
deleted file mode 100644
index ddb1f76264..0000000000
--- a/doc/tools/bmenu/address.inl
+++ /dev/null
@@ -1,105 +0,0 @@
-/*  inline/address.inl
- *
- *  This include file contains the bodies of the routines
- *  about addresses which are inlined.
- *
- *  COPYRIGHT (c) 1988-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  All rights reserved.
- *
- *  $Id$
- */
-
-#ifndef __INLINE_ADDRESSES_inl
-#define __INLINE_ADDRESSES_inl
-
-/*PAGE
- *
- *  _Addresses_Add_offset
- *
- */
-
-STATIC INLINE void *_Addresses_Add_offset ( 
-  void       *base, 
-  unsigned32  offset
-)
-{
-  return (base + offset);
-}
-
-/*PAGE
- *
- *  _Addresses_Subtract_offset
- *
- */
-
-STATIC INLINE void *_Addresses_Subtract_offset ( 
-  void       *base, 
-  unsigned32  offset
-)
-{
-  return (base - offset);
-}
-
-/*PAGE
- *
- *  _Addresses_Add
- *
- *  NOTE:  The cast of an address to an unsigned32 makes this code
- *         dependent on an addresses being thirty two bits.
- */
-
-STATIC INLINE void *_Addresses_Add ( 
-  void *left, 
-  void *right 
-)
-{
-  return (left + (unsigned32)right);
-}
-
-/*PAGE
- *
- *  _Addresses_Subtract
- *
- *  NOTE:  The cast of an address to an unsigned32 makes this code
- *         dependent on an addresses being thirty two bits.
- */
-
-STATIC INLINE unsigned32 _Addresses_Subtract ( 
-  void *left, 
-  void *right 
-)
-{
-  return (left - right);
-}
-
-/*PAGE
- *
- *  _Addresses_Is_aligned
- *
- */
-
-STATIC INLINE boolean _Addresses_Is_aligned ( 
-  void *address
-)
-{
-    return ( ( (unsigned32)address % 4 ) == 0 );
-}
-
-/*PAGE
- *
- *  _Addresses_Is_aligned
- *
- */
-
-STATIC INLINE boolean _Addresses_Is_in_range ( 
-  void *address, 
-  void *base,
-  void *limit 
-)
-{
-  return ( address >= base && address <= limit );
-}
-
-#endif
-/* end of include file */
diff --git a/doc/tools/bmenu/base.h b/doc/tools/bmenu/base.h
deleted file mode 100644
index f7c3999b69..0000000000
--- a/doc/tools/bmenu/base.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- *  COPYRIGHT (c) 1988-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  All rights reserved.
- *
- *  $Id$
- */
-
-#ifndef __PDL2AMI_h
-#define __PDL2AMI_h
-
-#include "system.h"
-#include "chain.h"
-
-#ifndef EXTERN 
-#define EXTERN extern
-#endif
-
-/*
- *  Paragraph size should be kept down because it is allocated for each
- *  Line_Control.  If this number is large, the memory requirements for
- *  the program increase significantly.
- */
-
-#define BUFFER_SIZE    (2 * 1024)
-#define PARAGRAPH_SIZE (2 * 1024)
-
-#define NUMBER_ELEMENTS( _x ) (sizeof(_x) / sizeof _x[0])
-
-void exit_application( 
-  int status
-);
-
-void ProcessFile(
-  char   *inname,
-  char   *outname
-);
-
-void strtolower(
-  char *dest,
-  char *src
-);
-
-void strtoInitialCaps(
-  char *dest,
-  char *src
-);
-
-void StripBlanks( void );
-
-void MergeParagraphs( void );
-
-int CheckForIncomplete( void );
-
-int CheckOutline( void );
-
-int CheckSections( void );
-
-void GenerateLists( void );
-
-void GenerateAList( 
-  char          *section,
-  Chain_Control *the_list
-);
-
-void LookForInternalInconsistencies( void );
-
-int Match_Argument( 
-  char  **array,
-  int     entries,
-  char   *users
-);
-
-void usage( void  );
-
-void ReadFileIntoChain(
-  char *inname
-);
-
-int MergeText( void );
-
-int CheckForBadWhiteSpace();
-
-void RemoveCopyright();
-
-void RemovePagebreaks();
-
-int RemoveExtraBlankLines();
-
-void FormatToTexinfo( void );
-
-void PrintFile(
-   char *out
-);
-
-void DumpList( 
-  Chain_Control  *the_list
-);
-
-void ReleaseFile();
-
-EXTERN boolean          Verbose;                 /* status/debug msgs */
-EXTERN boolean          BlankAsWarnings;
-EXTERN Chain_Control    Lines;
-
-EXTERN int              NumberOfAttributes;
-EXTERN int              NumberOfAssociations;
-EXTERN int              NumberOfAbstractTypes;
-EXTERN int              NumberOfDataItems;
-EXTERN int              NumberOfMethods;
-EXTERN int              NumberOfTasks;
-
-#endif
diff --git a/doc/tools/bmenu/chain.c b/doc/tools/bmenu/chain.c
deleted file mode 100644
index 8ddc6add81..0000000000
--- a/doc/tools/bmenu/chain.c
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
- *  Chain Handler
- *
- *  COPYRIGHT (c) 1988-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  All rights reserved.
- *
- *  $Id$
- */
-
-#include "system.h"
-#include "address.h"
-#include "chain.h"
-#include "isr.h"
-
-/*PAGE
- *
- *  _Chain_Initialize
- *
- *  This kernel routine initializes a doubly linked chain. 
- *
- *  Input parameters:
- *    the_chain        - pointer to chain header
- *    starting_address - starting address of first node
- *    number_nodes     - number of nodes in chain
- *    node_size        - size of node in bytes
- *
- *  Output parameters:  NONE
- */
-
-void _Chain_Initialize( 
-  Chain_Control *the_chain,
-  void           *starting_address,
-  unsigned32     number_nodes,
-  unsigned32     node_size
-)
-{
-  unsigned32  count; 
-  Chain_Node *current;
-  Chain_Node *next;
-
-  count                     = number_nodes;
-  current                   = _Chain_Head( the_chain );
-  the_chain->permanent_null = NULL;
-  next                      = (Chain_Node *)starting_address;
-  while ( count-- ) {
-    current->next  = next;
-    next->previous = current;
-    current        = next;
-    next           = (Chain_Node *)
-                        _Addresses_Add_offset( (void *) next, node_size );
-  }
-  current->next    = _Chain_Tail( the_chain );
-  the_chain->last  = current;
-}
-
-/*PAGE
- *
- *  _Chain_Get_first_unprotected
- */
-
-#ifndef USE_INLINES
-STATIC INLINE Chain_Node *_Chain_Get_first_unprotected(
-  Chain_Control *the_chain
-)
-{ 
-  Chain_Node  *return_node;
-  Chain_Node  *new_first;
-
-  return_node         = the_chain->first;
-  new_first           = return_node->next;
-  the_chain->first    = new_first;
-  new_first->previous = _Chain_Head( the_chain );
-
-  return return_node;
-}
-#endif   /* USE_INLINES */
-
-/*PAGE
- *
- *  _Chain_Get
- *
- *  This kernel routine returns a pointer to a node taken from the
- *  given chain.
- *
- *  Input parameters:
- *    the_chain - pointer to chain header
- * 
- *  Output parameters: 
- *    return_node - pointer to node in chain allocated
- *    CHAIN_END   - if no nodes available
- * 
- *  INTERRUPT LATENCY:
- *    only case
- */
-
-Chain_Node *_Chain_Get(
-  Chain_Control *the_chain
-)
-{
-  ISR_Level          level;
-  Chain_Node *return_node;
-
-  return_node = NULL;
-  _ISR_Disable( level );
-    if ( !_Chain_Is_empty( the_chain ) ) 
-      return_node = _Chain_Get_first_unprotected( the_chain );
-  _ISR_Enable( level ); 
-  return return_node;
-}
-
-/*PAGE
- *
- *  _Chain_Append
- *
- *  This kernel routine puts a node on the end of the specified chain.
- *
- *  Input parameters:
- *    the_chain - pointer to chain header
- *    node      - address of node to put at rear of chain
- * 
- *  Output parameters:  NONE
- * 
- *  INTERRUPT LATENCY:
- *    only case
- */
-
-void _Chain_Append( 
-  Chain_Control *the_chain,
-  Chain_Node    *node
-)
-{
-  ISR_Level level;
-
-  _ISR_Disable( level );
-    _Chain_Append_unprotected( the_chain, node );
-  _ISR_Enable( level ); 
-}
-
-/*PAGE
- *
- *  _Chain_Extract
- *
- *  This kernel routine deletes the given node from a chain.
- *
- *  Input parameters:
- *    node - pointer to node in chain to be deleted
- * 
- *  Output parameters:  NONE
- * 
- *  INTERRUPT LATENCY:
- *    only case
- */
-
-void _Chain_Extract( 
-  Chain_Node *node
-)
-{ 
-  ISR_Level level;
-
-  _ISR_Disable( level );
-    _Chain_Extract_unprotected( node );
-  _ISR_Enable( level );
-}
-
-/*PAGE
- *
- *  _Chain_Insert
- *
- *  This kernel routine inserts a given node after a specified node
- *  a requested chain.
- *
- *  Input parameters:
- *    after_node - pointer to node in chain to be inserted after
- *    node       - pointer to node to be inserted
- * 
- *  Output parameters:  NONE
- * 
- *  INTERRUPT LATENCY:
- *    only case
- */
-
-void _Chain_Insert( 
-  Chain_Node *after_node,
-  Chain_Node *node
-)
-{
-  ISR_Level level;
-
-  _ISR_Disable( level );
-    _Chain_Insert_unprotected( after_node, node );
-  _ISR_Enable( level ); 
-}
-
-/*PAGE
- *
- *  _Chain_Insert_chain 
- *
- *  This routine inserts a chain after the specified node in another
- *  chain. It is assumed that the insert after node is not on the 
- *  second chain. 
- *
- *  Input parameters:
- *    insert_after - insert the chain after this node
- *    to_insert    - the chain to insert
- */ 
- 
-void _Chain_Insert_chain(
-  Chain_Node    *insert_after,
-  Chain_Control *to_insert
-)
-{
-  Chain_Node *first;
-  Chain_Node *last;
-  Chain_Node *insert_after_next;
-
-  first = to_insert->first;
-  last = to_insert->last;
-
-  insert_after_next = insert_after->next;
-
-  insert_after->next = first;
-  first->previous    = insert_after;
-
-  insert_after_next->previous = last;
-  last->next                  = insert_after_next;
-
-  _Chain_Initialize_empty( to_insert );
-}
diff --git a/doc/tools/bmenu/chain.h b/doc/tools/bmenu/chain.h
deleted file mode 100644
index b2c220516f..0000000000
--- a/doc/tools/bmenu/chain.h
+++ /dev/null
@@ -1,347 +0,0 @@
-/*  chain.h
- * 
- *  This include file contains all the constants and structures associated
- *  with the Doubly Linked Chain Handler.
- *
- *  COPYRIGHT (c) 1988-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  All rights reserved.
- *
- *  $Id$
- */
-
-#ifndef __CHAIN_h
-#define __CHAIN_h
-
-#include "address.h"
-
-/*
- *  This is used to manage each element (node) which is placed
- *  on a chain.
- *
- *  NOTE:  Typically, a more complicated structure will use the
- *         chain package.  The more complicated structure will
- *         include a chain node as the first element in its
- *         control structure.  It will then call the chain package
- *         with a pointer to that node element.  The node pointer
- *         and the higher level structure start at the same address
- *         so the user can cast the pointers back and forth.
- */
-
-typedef struct Chain_Node_struct Chain_Node;
-
-struct Chain_Node_struct {
-  Chain_Node *next;
-  Chain_Node *previous;
-};
-
-/*
- *  This is used to manage a chain.  A chain consists of a doubly
- *  linked list of zero or more nodes.
- *
- *  NOTE:  This implementation does not require special checks for
- *         manipulating the first and last elements on the chain.
- *         To accomplish this the chain control structure is 
- *         treated as two overlapping chain nodes.  The permanent
- *         head of the chain overlays a node structure on the
- *         first and permanent_null fields.  The permanent tail
- *         of the chain overlays a node structure on the 
- *         permanent_null and last elements of the structure.
- */
-
-typedef struct {
-  Chain_Node *first;
-  Chain_Node *permanent_null;
-  Chain_Node *last;
-} Chain_Control;
-
-/* 
- *  _Chain_Initialize
- *
- *  This routine initializes the_chain structure to manage the
- *  contiguous array of number_nodes nodes which starts at
- *  starting_address.  Each node is of node_size bytes.
- */
-
-void _Chain_Initialize( 
-  Chain_Control *the_chain,
-  void          *starting_address,
-  unsigned32     number_nodes,
-  unsigned32     node_size
-);
-
-/* 
- *  _Chain_Initialize_empty
- *
- *  This routine initializes the specified chain to contain zero nodes.
- */
-
-STATIC INLINE void _Chain_Initialize_empty(
-  Chain_Control *the_chain
-);
-
-/* 
- *  _Chain_Extract_unprotected
- *
- *  This routine extracts the_node from the chain on which it resides.
- *  It does NOT disable interrupts to insure the atomicity of the
- *  extract operation.
- */
-
-STATIC INLINE void _Chain_Extract_unprotected(
-  Chain_Node *the_node
-);
-
-/* 
- *  _Chain_Extract
- *
- *  This routine extracts the_node from the chain on which it resides.
- *  It disables interrupts to insure the atomicity of the
- *  extract operation.
- */
-
-void _Chain_Extract( 
-  Chain_Node *the_node
-);
-
-/* 
- *  _Chain_Get_unprotected
- *
- *  This function removes the first node from the_chain and returns
- *  a pointer to that node.  If the_chain is empty, then NULL is returned.
- *  It does NOT disable interrupts to insure the atomicity of the
- *  get operation.
- */
-
-STATIC INLINE Chain_Node *_Chain_Get_unprotected( 
-  Chain_Control *the_chain
-);
-
-/* 
- *  _Chain_Get
- *
- *  This function removes the first node from the_chain and returns
- *  a pointer to that node.  If the_chain is empty, then NULL is returned.
- *  It disables interrupts to insure the atomicity of the
- *  get operation.
- */
-
-Chain_Node *_Chain_Get( 
-  Chain_Control *the_chain
-);
-
-/* 
- *  _Chain_Get_first_unprotected
- *
- *  This function removes the first node from the_chain and returns
- *  a pointer to that node.  It does NOT disable interrupts to insure
- *  the atomicity of the get operation.
- */
-
-STATIC INLINE Chain_Node *_Chain_Get_first_unprotected( 
-  Chain_Control *the_chain
-);
-
-/* 
- *  _Chain_Insert_unprotected
- *
- *  This routine inserts the_node on a chain immediately following
- *  after_node.  It does NOT disable interrupts to insure the atomicity
- *  of the extract operation.
- */
-
-STATIC INLINE void _Chain_Insert_unprotected(
-  Chain_Node *after_node,
-  Chain_Node *the_node
-);
-
-/* 
- *  _Chain_Insert
- *
- *  This routine inserts the_node on a chain immediately following
- *  after_node.  It disables interrupts to insure the atomicity
- *  of the extract operation.
- */
-
-void _Chain_Insert( 
-  Chain_Node *after_node,
-  Chain_Node *the_node
-);
-
-/* 
- *  _Chain_Append_unprotected
- *
- *  This routine appends the_node onto the end of the_chain.
- *  It does NOT disable interrupts to insure the atomicity of the
- *  append operation.
- */
-
-STATIC INLINE void _Chain_Append_unprotected(
-  Chain_Control *the_chain,
-  Chain_Node    *the_node
-);
-
-/* 
- *  _Chain_Append
- *
- *  This routine appends the_node onto the end of the_chain.
- *  It disables interrupts to insure the atomicity of the
- *  append operation.
- */
-
-void _Chain_Append( 
-  Chain_Control *the_chain,
-  Chain_Node    *the_node
-);
-
-/* 
- *  _Chain_Prepend_unprotected
- *
- *  This routine prepends the_node onto the front of the_chain.
- *  It does NOT disable interrupts to insure the atomicity of the
- *  prepend operation.
- */
-
-STATIC INLINE void _Chain_Prepend_unprotected(
-  Chain_Control *the_chain,
-  Chain_Node    *the_node
-);
-
-/* 
- *  _Chain_Prepend
- *
- *  This routine prepends the_node onto the front of the_chain.
- *  It disables interrupts to insure the atomicity of the
- *  prepend operation.
- */
-
-STATIC INLINE void _Chain_Prepend(
-  Chain_Control *the_chain,
-  Chain_Node    *the_node
-);
-
-/*
- *  _Chain_Insert_chain
- *
- *  This routine inserts a chain after the specified node in another
- *  chain. It is assumed that the insert after node is not on the
- *  second chain.
- */
-
-void _Chain_Insert_chain(
-  Chain_Node    *insert_after,
-  Chain_Control *to_insert
-);
-
-/* 
- *  _Chain_Head
- *
- *  This function returns a pointer to the first node on the chain.
- */
-
-STATIC INLINE Chain_Node *_Chain_Head(
-  Chain_Control *the_chain
-);
-
-/* 
- *  _Chain_Tail
- *
- *  This function returns a pointer to the last node on the chain.
- */
-
-STATIC INLINE Chain_Node *_Chain_Tail(
-  Chain_Control *the_chain
-);
-
-/* 
- *  _Chain_Is_head
- *
- *  This function returns TRUE if the_node is the head of the_chain and
- *  FALSE otherwise.
- */
-
-STATIC INLINE boolean _Chain_Is_head(
-  Chain_Control *the_chain,
-  Chain_Node    *the_node
-);
-
-/* 
- *  _Chain_Is_tail
- *
- *  This function returns TRUE if the_node is the tail of the_chain and
- *  FALSE otherwise.
- */
-
-STATIC INLINE boolean _Chain_Is_tail(
-  Chain_Control *the_chain,
-  Chain_Node    *the_node
-);
-
-/* 
- *  _Chain_Is_first
- *
- *  This function returns TRUE if the_node is the first node on a chain and
- *  FALSE otherwise.
- */
-
-STATIC INLINE boolean _Chain_Is_first(
-  Chain_Node *the_node
-);
-
-/* 
- *  _Chain_Is_last
- *
- *  This function returns TRUE if the_node is the last node on a chain and
- *  FALSE otherwise.
- */
-
-STATIC INLINE boolean _Chain_Is_last(
-  Chain_Node *the_node
-);
-
-/* 
- *  _Chain_Is_empty
- *
- *  This function returns TRUE if there a no nodes on the_chain and
- *  FALSE otherwise.
- */
-
-STATIC INLINE boolean _Chain_Is_empty(
-  Chain_Control *the_chain
-);
-
-/* 
- *  _Chain_Has_only_one_node
- *
- *  This function returns TRUE if there is only one node on the_chain and
- *  FALSE otherwise.
- */
-
-STATIC INLINE boolean _Chain_Has_only_one_node(
-  Chain_Control *the_chain
-);
-
-/* 
- *  _Chain_Is_null
- *
- *  This function returns TRUE if the_chain is NULL and FALSE otherwise.
- */
-
-STATIC INLINE boolean _Chain_Is_null(
-  Chain_Control *the_chain
-);
-
-/* 
- *  _Chain_Is_null_node
- *
- *  This function returns TRUE if the_node is NULL and FALSE otherwise.
- */
-
-STATIC INLINE boolean _Chain_Is_null_node(
-  Chain_Node *the_node
-);
-
-#include "chain.inl"
-
-#endif
-/* end of include file */
diff --git a/doc/tools/bmenu/chain.inl b/doc/tools/bmenu/chain.inl
deleted file mode 100644
index 4316f5e5b8..0000000000
--- a/doc/tools/bmenu/chain.inl
+++ /dev/null
@@ -1,271 +0,0 @@
-/*  inline/chain.inl
- * 
- *  This include file contains the bodies of the routines which are
- *  associated with doubly linked chains and inlined.
- *
- *  COPYRIGHT (c) 1988-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  All rights reserved.
- *
- *  $Id$
- */
-
-#ifndef __INLINE_CHAIN_inl
-#define __INLINE_CHAIN_inl
-
-/*PAGE
- *
- *  _Chain_Is_null
- */
-
-STATIC INLINE boolean _Chain_Is_null(
-  Chain_Control *the_chain
-)
-{
-  return ( the_chain == NULL );
-}
-
-/*PAGE
- *
- *  _Chain_Is_null_node
- */
-
-STATIC INLINE boolean _Chain_Is_null_node(
-  Chain_Node *the_node
-)
-{
-  return ( the_node == NULL );
-}
-
-/*PAGE
- *
- *  _Chain_Head
- */
-
-STATIC INLINE Chain_Node *_Chain_Head(
-  Chain_Control *the_chain
-)
-{
-   return (Chain_Node *) the_chain;
-}
-
-/*PAGE
- *
- *  _Chain_Tail
- */
-
-STATIC INLINE Chain_Node *_Chain_Tail(
-  Chain_Control *the_chain
-)
-{
-   return (Chain_Node *) &the_chain->permanent_null;
-}
-
-/*PAGE
- *
- *  _Chain_Is_empty
- */
-
-STATIC INLINE boolean _Chain_Is_empty(
-  Chain_Control *the_chain
-)
-{
-  return ( the_chain->first == _Chain_Tail( the_chain ) );
-}
-
-/*PAGE
- *
- *  _Chain_Is_first
- */
-
-STATIC INLINE boolean _Chain_Is_first(
-  Chain_Node *the_node
-)
-{
-  return ( the_node->previous == NULL );
-}
-
-/*PAGE
- *
- *  _Chain_Is_last
- */
-
-STATIC INLINE boolean _Chain_Is_last(
-  Chain_Node *the_node
-)
-{
-  return ( the_node->next == NULL );
-}
-
-/*PAGE
- *
- *  _Chain_Has_only_one_node
- */
-
-STATIC INLINE boolean _Chain_Has_only_one_node(
-  Chain_Control *the_chain
-)
-{
-  return ( the_chain->first == the_chain->last );
-}
-
-/*PAGE
- *
- *  _Chain_Is_head
- */
-
-STATIC INLINE boolean _Chain_Is_head(
-  Chain_Control *the_chain,
-  Chain_Node    *the_node
-)
-{
-   return ( the_node == _Chain_Head( the_chain ) );
-}
-
-/*PAGE
- *
- *  _Chain_Is_tail
- */
-
-STATIC INLINE boolean _Chain_Is_tail(
-  Chain_Control *the_chain,
-  Chain_Node    *the_node
-)
-{
-   return ( the_node == _Chain_Tail( the_chain ) );
-}
-
-/*PAGE
- *
- *  Chain_Initialize_empty
- */
-
-STATIC INLINE void _Chain_Initialize_empty(
-  Chain_Control *the_chain
-)
-{
-  the_chain->first          = _Chain_Tail( the_chain );
-  the_chain->permanent_null = NULL;
-  the_chain->last           = _Chain_Head( the_chain );
-}
-
-/*PAGE
- *
- *  _Chain_Extract_unprotected
- */
-
-STATIC INLINE void _Chain_Extract_unprotected(
-  Chain_Node *the_node
-)
-{
-  Chain_Node *next;
-  Chain_Node *previous;
-  
-  next           = the_node->next;
-  previous       = the_node->previous;
-  next->previous = previous;
-  previous->next = next;
-}
-
-/*PAGE
- *
- *  _Chain_Get_first_unprotected
- */
-
-STATIC INLINE Chain_Node *_Chain_Get_first_unprotected( 
-  Chain_Control *the_chain
-)
-{ 
-  Chain_Node  *return_node;
-  Chain_Node  *new_first;
-
-  return_node         = the_chain->first;
-  new_first           = return_node->next;
-  the_chain->first    = new_first;
-  new_first->previous = _Chain_Head( the_chain );
-
-  return return_node;
-}
-
-/*PAGE
- *
- *  Chain_Get_unprotected
- */
-
-STATIC INLINE Chain_Node *_Chain_Get_unprotected( 
-  Chain_Control *the_chain
-)
-{ 
-  if ( !_Chain_Is_empty( the_chain ) ) 
-    return _Chain_Get_first_unprotected( the_chain );
-  else
-    return NULL;
-}
-
-/*PAGE
- *
- *  _Chain_Insert_unprotected
- */
-
-STATIC INLINE void _Chain_Insert_unprotected(
-  Chain_Node *after_node,
-  Chain_Node *the_node
-)
-{
-  Chain_Node *before_node;
-  
-  the_node->previous    = after_node;
-  before_node           = after_node->next;
-  after_node->next      = the_node; 
-  the_node->next        = before_node; 
-  before_node->previous = the_node; 
-}
-
-/*PAGE
- *
- *  _Chain_Append_unprotected
- */
-
-STATIC INLINE void _Chain_Append_unprotected(
-  Chain_Control *the_chain,
-  Chain_Node    *the_node
-)
-{
-  Chain_Node *old_last_node;
-   
-  the_node->next      = _Chain_Tail( the_chain );
-  old_last_node       = the_chain->last;
-  the_chain->last     = the_node;
-  old_last_node->next = the_node;
-  the_node->previous  = old_last_node;
-}
-
-/*PAGE
- *
- *  _Chain_Prepend_unprotected
- */
-
-STATIC INLINE void _Chain_Prepend_unprotected(
-  Chain_Control *the_chain,
-  Chain_Node    *the_node
-)
-{
-  _Chain_Insert_unprotected( _Chain_Head( the_chain ), the_node );
-
-}
-
-/*PAGE
- *
- *  _Chain_Prepend
- */
-
-STATIC INLINE void _Chain_Prepend(
-  Chain_Control *the_chain,
-  Chain_Node    *the_node
-)
-{
-  _Chain_Insert( _Chain_Head( the_chain ), the_node );
-}
-
-#endif
-/* end of include file */
diff --git a/doc/tools/bmenu/isr.h b/doc/tools/bmenu/isr.h
deleted file mode 100644
index 35a2e503cc..0000000000
--- a/doc/tools/bmenu/isr.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- *  COPYRIGHT (c) 1988-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  All rights reserved.
- *
- *  $Id$
- */
-
-
-#ifndef __ISR_h
-#define __ISR_h
-
-typedef unsigned32 ISR_Level;
-
-#define _ISR_Disable
-#define _ISR_Enable
-
-#endif
diff --git a/doc/tools/bmenu/main.c b/doc/tools/bmenu/main.c
deleted file mode 100644
index e0a5dc6ebd..0000000000
--- a/doc/tools/bmenu/main.c
+++ /dev/null
@@ -1,1048 +0,0 @@
-/*
- *  main.c
- *  
- *  This program takes a texinfo file without node and menu commands,
- *  build those commands and inserts them.
- *
- *  It works by reading the input file into a linked list of lines
- *  and then performing sweeps on that list until all formatting is
- *  complete.  After the program is run, there is still a little 
- *  clean up to be performed by hand.  The following have to be fixed 
- *  by hand:
- *    + previous of the first node
- *    + next of the last node
- *
- *  COPYRIGHT (c) 1988-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  All rights reserved.
- *
- *  $Id$
- */
-
-#include <assert.h>
-#include <ctype.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-/* XXX -- just for testing -- these should be set by options */
-char TopString[]   = "Top";
-char EmptyString[] = "";
-
-char *DocsNextNode;
-char *DocsPreviousNode;
-char *DocsUpNode;
-int NodeNameIncludesChapter = 1;
-
-extern int   optind;     /* Why is this not in <stdlib.h>? */
-extern char *optarg;     /* Why is this not in <stdlib.h>? */
-
-#ifndef NAME_MAX
-#define NAME_MAX      14 /* Why is the one in limits.h not showing up? */
-#endif
-#define INIT_DATA
-#define EXTERN
-
-#include "base.h"
-
-FILE           *OutFile = stdout;
-
-/*************************************************************************
- *************************************************************************
- *****                 DATA TYPES AND CONSTANT TABLES                *****
- *************************************************************************
- *************************************************************************/
-/*
- *  Usage Information
- */
-
-char *Usage_Strings[] = {
-  "\n",
-  "usage: cmd [-cv] [-p prev] [-n next] [-u up] files ...\n", 
-  "\n",
-  "EOF"
-};
-
-/*
- *  The page separator is not really a keyword and will be purged before
- *  it is seen elsewhere.
- */
-
-#define PAGE_SEPARATOR                            "#PAGE"
-
-/* 
- *  Section Delimiter Keywords
- */
-
-#define MAXIMUM_KEYWORD_LENGTH   32
-
-/*
- *  Level indicates where in the format the delimiter is allowed to occur.
- *    1 indicates a major section divider (e.g. "ATTRIBUTE DESCRIPTIONS:").
- *    2 indicates a subsection (e.g. "ATTRIBUTE:"). 
- *    3 indicates a heading (e.g. "DESCRIPTION:").
- */
-
-#define TEXT            0
-#define SECTION         1
-#define SUBSECTION      2
-#define SUBSUBSECTION   3
-#define HEADING         4
-  
-typedef enum {
-  UNUSED,                            /* dummy 0 slot */
-  KEYWORD_CHAPTER,
-  KEYWORD_CHAPHEADING,
-  KEYWORD_SECTION,
-  KEYWORD_SUBSECTION,
-  KEYWORD_SUBSUBSECTION,
-  KEYWORD_RAISE,
-  KEYWORD_LOWER,
-  KEYWORD_OTHER,
-  KEYWORD_END
-  
-}  Keyword_indices_t;
-
-#define KEYWORD_FIRST KEYOWRD_CHAPTER
-#define KEYWORD_LAST  KEYWORD_END
-
-/*
- *  Line Management Structure
- */
-
-typedef enum {
-  NO_EXTRA_FORMATTING_INFO,
-  RAW_OUTPUT,
-  PARAGRAPH_OUTPUT
-}  ExtraFormat_info_t;
-
-typedef struct {
-  Chain_Node         Node;
-  Keyword_indices_t  keyword;   /* unused is unknown/undecided */
-  ExtraFormat_info_t format;
-  int                number;
-  int                level;
-  char               Contents[ PARAGRAPH_SIZE ];
-} Line_Control;
-
-typedef enum {
-  RT_FORBIDDEN,     /* no text to right allowed */
-  RT_OPTIONAL,      /* text to right optional -- none below */
-  RT_NONE,          /* text to right is "none" or nothing -- none below */
-  RT_REQUIRED,      /* text to right required -- none below */
-  RT_BELOW,         /* text to right forbidden -- text below required */
-  RT_NONE_OR_BELOW, /* text to right is "none" OR there is text below  */
-  RT_EITHER,        /* text to right OR below */
-  RT_BOTH           /* text to right AND below */
-}  Keywords_text_mode_t;
-
-typedef enum {
-  BL_FORBIDDEN,     /* text below forbidden */
-  BL_FORMATTED,     /* text below is to be formatted as paragraphs */
-  BL_RAW,           /* text below is to be unprocessed by this program */
-}  Keywords_text_below_t;
-
-typedef (*Keyword_validater_t)( Line_Control * );
-
-typedef struct {
-  char                      Name[ MAXIMUM_KEYWORD_LENGTH ];
-  int                       level;
-  Keywords_text_mode_t      text_mode;
-  Keywords_text_below_t     text_below_mode;
-  Keyword_validater_t       keyword_validation_routine;
-}  Keyword_info_t;
-
-Keyword_info_t Keywords[] = {
-  { "unused",         0, 0, 0, NULL }, /* so 0 can be invalid */
-  { "@chapter",       SECTION,    RT_FORBIDDEN,      BL_FORBIDDEN, NULL },
-  { "@chapheading",   SECTION,    RT_FORBIDDEN,      BL_FORBIDDEN, NULL },
-  { "@section",       SECTION,    RT_FORBIDDEN,      BL_FORBIDDEN, NULL },
-  { "@subsection",    SUBSECTION, RT_FORBIDDEN,      BL_FORBIDDEN, NULL },
-  { "@subsubsection", SUBSUBSECTION, RT_FORBIDDEN,      BL_FORBIDDEN, NULL },
-  { "@raise",         SUBSECTION, RT_FORBIDDEN,      BL_FORBIDDEN, NULL },
-  { "@lower",         SUBSECTION, RT_FORBIDDEN,      BL_FORBIDDEN, NULL },
-  { "",               HEADING,    RT_FORBIDDEN,      BL_FORBIDDEN, NULL },
-  { "END OF FILE",    SECTION,    RT_FORBIDDEN,      BL_FORBIDDEN, NULL }
-};
-
-#define NUMBER_OF_KEYWORDS \
-  ( sizeof( Keywords ) / sizeof( Keyword_info_t ) ) - 2
-
-/*
- *  exit_application
- */
-
-void exit_application( 
-  int status
-)
-{
-  fprintf( stderr, "*** Error encountered ***\n" );
-/*
-  fprintf( stderr, "*** Error encountered on line %d ***\n", CurrentLine );
-*/
-  fclose( OutFile ); 
-  exit( status );
-}
-
-/*************************************************************************
- *************************************************************************
- *****                LINE MANIPULATION ROUTINES                     *****
- *************************************************************************
- *************************************************************************/
-
-/*
- * PrintLine
- */
-
-void PrintLine(
-  Line_Control *line
-)
-{
-  assert( line );
-
-  if ( line->number == -1 )
-    fprintf( stderr, "     " );
-  else
-    fprintf( stderr, "%5d", line->number );
-
-#if 0
-  fprintf( stderr, "%s\n", line->Contents );
-#else
-  /* 
-   *  Include some debugging information
-   */
-  fprintf(
-    stderr,
-    "<%d,%d,%d>:%s\n", 
-    line->keyword,
-    line->format,
-    line->level,
-    line->Contents
-  );
-#endif
-}
-
-Chain_Control Line_Pool;
-
-/*
- *  FillLinePool
- */
-
-void FillLinePool( void )
-{
-  void *pool;
-
-#define LINE_POOL_FILL_COUNT 100
-
-  pool = malloc( sizeof( Line_Control ) * LINE_POOL_FILL_COUNT );
-  assert( pool );
-
-  _Chain_Initialize(
-    &Line_Pool,
-    pool,
-    LINE_POOL_FILL_COUNT,
-    sizeof( Line_Control )
-  );
-}
-
-/*
- * AllocateLine
- */
-
-Line_Control *AllocateLine( void )
-{
-  Line_Control  *new_line;
-
-  new_line = (Line_Control *) _Chain_Get( &Line_Pool );
-  if ( !new_line ) {
-    FillLinePool();
-    new_line = (Line_Control *) _Chain_Get( &Line_Pool );
-    assert( new_line );
-  }
- 
-/*
- *  This is commented out because although it is helpful during debug,
- *  it consumes a significant percentage of the program's execution time.
- 
-  memset( new_line->Contents, '\0', sizeof( new_line->Contents ) );
-*/
-  new_line->number = -1;
-  new_line->level = -1;
-
-  new_line->keyword = UNUSED;
-  new_line->format = NO_EXTRA_FORMATTING_INFO;
-
-  new_line->Node.next     = NULL;
-  new_line->Node.previous = NULL;
-
-  return new_line;
-}
-
-/*
- * FreeLine
- */
-
-void FreeLine(
-  Line_Control *line
-)
-{
-  fflush( stdout );
-  _Chain_Append( &Line_Pool, &line->Node );
-}
-
-/*
- * DeleteLine
- */
-
-Line_Control *DeleteLine(
-  Line_Control *line
-)
-{
-  Line_Control *next;
-  
-  next = (Line_Control *)line->Node.next; 
-  _Chain_Extract( &line->Node );
-  FreeLine( line );
-  return next;
-}
-
-/* 
- *  PrintSurroundingLines
- */
-
-void PrintSurroundingLines(
-  Line_Control *line,
-  int           backward,
-  int           forward
-)
-{
-  int           i;
-  int           real_backward;
-  Line_Control *local;
-
-  for ( local=line, real_backward=0, i=1 ; 
-        i<=backward ; 
-        i++, real_backward++ ) {
-    if ( &local->Node == Lines.first )
-      break;
-    local = (Line_Control *) local->Node.previous;
-  }
-
-  for ( i=1 ; i<=real_backward ; i++ ) {
-    PrintLine( local );
-    local = (Line_Control *) local->Node.next;
-  }
- 
-  PrintLine( local );
-
-  for ( i=1 ; i<=forward ; i++ ) {
-    local = (Line_Control *) local->Node.next;
-    if ( _Chain_Is_last( &local->Node ) )
-      break;
-    PrintLine( local );
-  }
- 
-}
-
-/*
- *  SetLineFormat
- */
-
-void SetLineFormat(
-  Line_Control       *line,
-  ExtraFormat_info_t  format
-)
-{
-  if ( line->format != NO_EXTRA_FORMATTING_INFO ) {
-    fprintf( stderr, "Line %d is already formatted\n", line->number );
-    PrintLine( line );
-    assert( FALSE );
-  }
-
-  line->format = format;
-}
-
-/*
- *  LineCopyFromRight
- */
-
-void LineCopyFromRight(
-  Line_Control *line,
-  char         *dest
-)
-{
-  char *p;
-
-  for ( p=line->Contents ; *p != ' ' ; p++ ) 
-    ;
-  p++;  /* skip the ' ' */
-  for ( ; isspace( *p ) ; p++ )
-    ;
-
-  strcpy( dest, p );
-
-}
-
-/*
- *  LineCopySectionName
- */
-
-void LineCopySectionName(
-  Line_Control *line,
-  char         *dest
-)
-{
-  char *p;
-  char *d;
-
-  p = line->Contents;
-  d = dest;
-
-  if ( *p == '@' ) {                /* skip texinfo command */
-    while ( !isspace( *p++ ) )
-      ;
-  }
-
-  for ( ; *p ; ) 
-    *d++ = *p++;
-
-  *d = '\0';
-}
-
-/*************************************************************************
- *************************************************************************
- *****              END OF LINE MANIPULATION ROUTINES                *****
- *************************************************************************
- *************************************************************************/
-
-/*
- *  main
- */
-
-int main(
-  int    argc,
-  char **argv
-)
-{
-  int      c;
-  int      index;
-  boolean  single_file_mode;
-
-  Verbose = FALSE;
-  DocsNextNode     = EmptyString;
-  DocsPreviousNode = TopString;
-  DocsUpNode       = TopString;
-
-  while ((c = getopt(argc, argv, "vcp:n:u:")) != EOF) {
-    switch (c) {
-      case 'v':
-        Verbose = TRUE;
-        break;
-      case 'c':
-        NodeNameIncludesChapter = 0;
-        break;
-      case 'p':
-        DocsPreviousNode = strdup(optarg); 
-        break;
-      case 'n':
-        DocsNextNode = strdup(optarg); 
-        break;
-      case 'u':
-        DocsUpNode = strdup(optarg); 
-        break;
-
-      case '?':
-        usage();
-        return 0;
-    }
-  }
-
-  if ( Verbose )
-    fprintf( stderr, "Arguments successfully parsed\n" );
-
-  FillLinePool();
-
-  for ( index=optind ; index < argc ; index++ ) {
-    ProcessFile( argv[ index ], NULL );
-  }
-    
-  if ( Verbose )
-    fprintf( stderr, "Exitting\n" );
-
-  return 0;
-}
-
-/*
- *  ProcessFile
- */
-
-void ProcessFile(
-  char   *inname,
-  char   *outname
-)
-{
-   char            out[ 256 ];
-   int             index;
-
-   /*
-    *  Automatically generate the output file name.
-    */
-
-   if ( outname == NULL ) {
-     for( index=0 ; inname[index] && inname[index] != '.' ; index++ ) {
-       out[ index ] = inname[ index ];
-     }
-
-     if ( !strcmp( &inname[index], ".texi" ) ) {
-        fprintf( stderr, "Input file already has .texi extension\n" );
-        exit_application( 1 );
-     }
-
-     out[ index++ ] = '.';
-     out[ index++ ] = 't';
-     out[ index++ ] = 'e';
-     out[ index++ ] = 'x';
-     out[ index++ ] = 'i';
-     out[ index ] = '\0';
-   }
-
-   /*
-    *  Read the file into our internal data structure
-    */
-
-   if ( Verbose )
-     printf( "Processing (%s) -> (%s)\n", inname, out );
-
-   ReadFileIntoChain( inname );
-
-   if ( Verbose )
-     fprintf( stderr, "-------->FILE READ IN\n" );
-
-   /*
-    *  Remove any spaces before the keyword and mark each keyword line as
-    *  such.  Also remove extra white space at the end of lines.
-    */
-
-   StripBlanks();
-
-   if ( Verbose )
-     fprintf( stderr, "-------->BLANKS BEFORE KEYWORDS STRIPPED\n" );
-
-
-   FormatToTexinfo();
-
-   if ( Verbose ) 
-     fprintf( stderr, "-------->FILE FORMATTED TO TEXINFO\n" );
-
-   /*
-    *  Print the file 
-    */
-
-   PrintFile( out );
-
-   if ( Verbose ) 
-     fprintf( stderr, "-------->FILE PRINTED\n" );
-
-   /*
-    *  Clean Up 
-    */
-
-   ReleaseFile();
-
-   if ( Verbose )
-     fprintf( stderr, "-------->FILE RELEASED\n" );
-}
-
-/*
- *  usage
- */
-
-void usage( void )
-{
-  int index;
-
-  for ( index=0 ; strcmp( Usage_Strings[ index ], "EOF" ) ; index++ )
-    fprintf( stderr, Usage_Strings[ index ] );
-}
-
-/*
- *  ReadFileIntoChain
- */
-
-void ReadFileIntoChain( 
-  char *inname
-)
-{
-   FILE *InFile;
-   int   line_count;
-   int   max_length;
-   char *line;
-   char  Buffer[ BUFFER_SIZE ];
-   Line_Control *new_line;
-
-   InFile = fopen( inname, "r" );
-
-   if ( !InFile ) {
-     fprintf( stderr, "Unable to open (%s)\n", inname );
-     exit( 1 );
-   }
-   assert( InFile );
-
-   max_length = 0;
-   line_count = 0;
-
-   _Chain_Initialize_empty( &Lines );
-
-   for ( ;; ) {
-      line = fgets( Buffer, BUFFER_SIZE, InFile );
-      if ( !line ) 
-        break;
-
-      Buffer[ strlen( Buffer ) - 1 ] = '\0';
-
-      new_line = AllocateLine();
- 
-      strcpy( new_line->Contents, Buffer );
-
-      new_line->number = ++line_count;
- 
-      _Chain_Append( &Lines, &new_line->Node );
-   } 
-
-   fclose( InFile ); 
-}
-
-/*
- *  StripBlanks
- */
-
-void StripBlanks( void )
-{
-  Line_Control      *line;
-  Keyword_indices_t  index;
-  int                indentation;
-  int                length;
- 
-  for ( line = (Line_Control *) Lines.first ;
-        !_Chain_Is_last( &line->Node ) ;
-        line = (Line_Control *) line->Node.next
-        ) {
-
-    /*
-     *  Strip white space from the end of each line 
-     */
-
-    length = strlen( line->Contents );
-
-    while ( isspace( line->Contents[ --length ] ) ) 
-      line->Contents[ length ] = '\0';
-
-    if ( strstr( line->Contents, "@chapter" ) )
-      line->keyword = KEYWORD_CHAPTER;
-    else if ( strstr( line->Contents, "@chapheading" ) )
-      line->keyword = KEYWORD_CHAPHEADING;
-    else if ( strstr( line->Contents, "@section" ) )
-      line->keyword = KEYWORD_SECTION;
-    else if ( strstr( line->Contents, "@subsection" ) )
-      line->keyword = KEYWORD_SUBSECTION;
-    else if ( strstr( line->Contents, "@subsubsection" ) )
-      line->keyword = KEYWORD_SUBSUBSECTION;
-    else if ( strstr( line->Contents, "@raise" ) )
-      line->keyword = KEYWORD_RAISE;
-    else if ( strstr( line->Contents, "@lower" ) )
-      line->keyword = KEYWORD_LOWER;
-    else
-      line->keyword = KEYWORD_OTHER;
-    
-  }
-  line = AllocateLine();
-  line->keyword = KEYWORD_END;
-  _Chain_Append( &Lines, &line->Node );
-}
-
-/*
- *  strIsAllSpace
- */
-
-boolean strIsAllSpace(
-  char *s
-)
-{
-  char *p;
-
-  for ( p = s ; *p ; p++ )
-    if ( !isspace( *p ) )
-      return FALSE;
-
-  return TRUE;
-}
-
-/*
- *  BuildTexinfoNodes
- */
-
-void BuildTexinfoNodes( void ) 
-{
-  char               Buffer[ BUFFER_SIZE ];
-  Line_Control      *line;
-  Line_Control      *next_node;
-  Line_Control      *up_node;
-  Line_Control      *new_line;
-  Line_Control      *menu_insert_point;
-  Line_Control      *node_line;
-  int                next_found;
-  int                menu_items;
-  Keyword_indices_t  index;
-  char               ChapterName[ BUFFER_SIZE ];
-  char               NodeName[ BUFFER_SIZE ];
-  char               UpNodeName[ BUFFER_SIZE ];
-  char               NextNodeName[ BUFFER_SIZE ];
-  char               PreviousNodeName[ BUFFER_SIZE ];
-
-  /*
-   *  Set Initial Previous Node Name
-   */
-
-  strcpy( PreviousNodeName, DocsPreviousNode );
-
-  for ( line = (Line_Control *) Lines.first ;
-        !_Chain_Is_last( &line->Node ) ;
-        line = (Line_Control *) line->Node.next
-        ) {
-
-    if ( line->level == -1 )
-      continue;
-
-    LineCopyFromRight( line, NodeName );
-
-    if ( line->keyword == KEYWORD_CHAPTER ||
-         line->keyword == KEYWORD_CHAPHEADING ) {
-    
-      strcpy( ChapterName, NodeName );
-
-    } else if ( NodeNameIncludesChapter ) {
-
-      sprintf( Buffer, "%s %s", ChapterName, NodeName );
-      strcpy( NodeName, Buffer );
-    }
-
-    /*
-     *  Set Default Next Node Name
-     */
-
-    next_found = FALSE;
-    strcpy( NextNodeName, DocsNextNode );
-
-    /*
-     *  Go ahead and put it on the chain in the right order (ahead of
-     *  the menu) and we can fill it in later (after the menu is built).
-     */
-
-    new_line = AllocateLine();
-    strcpy( new_line->Contents, "" ); /*"@ifinfo" ); */
-    _Chain_Insert( line->Node.previous, &new_line->Node );
-
-    node_line = AllocateLine();
-    _Chain_Insert( line->Node.previous, &node_line->Node );
-
-    new_line = AllocateLine();
-    strcpy( new_line->Contents, "" ); /* "@end ifinfo" ); */
-    _Chain_Insert( line->Node.previous, &new_line->Node );
-
-    next_node = (Line_Control *) line->Node.next;
-    menu_insert_point = next_node;
-    menu_items = 0;
-
-    for ( ; ; ) {
-      if ( next_node->keyword == KEYWORD_END )
-        break;
-
-      if ( next_node->level == -1 )
-        goto continue_menu_loop;
-
-      LineCopySectionName( next_node, Buffer );
-      if ( !next_found ) {
-        next_found = TRUE;
-        if (NodeNameIncludesChapter)
-          sprintf( NextNodeName, "%s %s", ChapterName, Buffer );
-        else
-          sprintf( NextNodeName, "%s", Buffer );
-      }
-
-      if ( next_node->level <= line->level )
-        break;
-
-      if ( next_node->level != (line->level + 1) )
-        goto continue_menu_loop;
-
-      if ( menu_items == 0 ) {
-        new_line = AllocateLine();
-        strcpy( new_line->Contents, "@ifinfo" );
-        _Chain_Insert( menu_insert_point->Node.previous, &new_line->Node );
-
-        new_line = AllocateLine();
-        strcpy( new_line->Contents, "@menu" );
-        _Chain_Insert( menu_insert_point->Node.previous, &new_line->Node );
-      }
-
-      menu_items++;
-
-      new_line = AllocateLine();
-      if (NodeNameIncludesChapter)
-        sprintf( new_line->Contents, "* %s %s::", ChapterName, Buffer );
-      else
-        sprintf( new_line->Contents, "* %s::", Buffer );
-      _Chain_Insert( menu_insert_point->Node.previous, &new_line->Node );
-
-continue_menu_loop:
-      next_node = (Line_Control *) next_node->Node.next;
-    }
-
-    /*
-     *  If menu items were generated, then insert the end of menu stuff.
-     */
-
-    if ( menu_items ) {
-      new_line = AllocateLine();
-      strcpy( new_line->Contents, "@end menu" );
-      _Chain_Insert( menu_insert_point->Node.previous, &new_line->Node );
-
-      new_line = AllocateLine();
-      strcpy( new_line->Contents, "@end ifinfo" );
-      _Chain_Insert( menu_insert_point->Node.previous, &new_line->Node );
-    }
-
-    /*
-     *  Find the UpNodeName
-     */
-
-/* DumpList( &Lines ); */
-
-    if ( line->level == 0 ) {
-      strcpy( UpNodeName, DocsUpNode );
-    } else {
-      for ( up_node = line;
-            up_node && !_Chain_Is_first((Chain_Node *)up_node) ;
-            up_node = (Line_Control *) up_node->Node.previous
-            ) {
-
-        if ( (up_node->level == -1) )
-          continue;
-          
-        if ( up_node->level == (line->level - 1) ) { 
-          LineCopySectionName( up_node, Buffer );
-          if (NodeNameIncludesChapter) {
-            if (!strcmp(ChapterName, Buffer))
-              sprintf( UpNodeName, "%s", Buffer );
-            else
-              sprintf( UpNodeName, "%s %s", ChapterName, Buffer );
-          } else
-            sprintf( UpNodeName, "%s", Buffer );
-          break;
-        }
-      }
-    }
-
-    /*
-     *  Update the node information
-     */
-
-#if 0
-    fprintf(
-      stderr,
-      "@node %s, %s, %s, %s\n",
-      NodeName,
-      NextNodeName,
-      PreviousNodeName,
-      UpNodeName
-    );
-#endif
-
-    /* node_line was previously inserted */
-    if (!NodeNameIncludesChapter) {
-      sprintf(
-        node_line->Contents,
-        "@node %s, %s, %s, %s",
-        NodeName,
-        NextNodeName,
-        PreviousNodeName,
-        UpNodeName
-      );
-    } else {
-      sprintf(
-        node_line->Contents,
-        "@node %s, %s, %s, %s",
-        NodeName,
-        NextNodeName,
-        PreviousNodeName,
-        UpNodeName
-      );
-    }
-
-    strcpy( PreviousNodeName, NodeName );
-
-    /* PrintLine( line ); */
-  }
-}
-
-/*
- *  FormatToTexinfo
- */
-
-void FormatToTexinfo( void )
-{
-  Line_Control *line;
-  int           baselevel = 0;
-  int           currentlevel;
-
-  if ( Verbose )
-    fprintf( stderr, "-------->INSERTING TEXINFO MENUS\n" );
-
-  for ( line = (Line_Control *) Lines.first ;
-        !_Chain_Is_last( &line->Node ) ; 
-        line = (Line_Control *) line->Node.next ) {
-
-    switch (line->keyword) {
-      case UNUSED:
-      case KEYWORD_OTHER:
-      case KEYWORD_END:
-        line->level = -1;
-        break;
-      case KEYWORD_CHAPTER:
-      case KEYWORD_CHAPHEADING:
-        currentlevel = 0;
-        line->level = baselevel + currentlevel;
-        break;
-      case KEYWORD_SECTION:
-        currentlevel = 1;
-        line->level = baselevel + currentlevel;
-        break;
-      case KEYWORD_SUBSECTION:
-        currentlevel = 2;
-        line->level = baselevel + currentlevel;
-        break;
-      case KEYWORD_SUBSUBSECTION:
-        currentlevel = 3;
-        line->level = baselevel + currentlevel;
-        break;
-      case KEYWORD_RAISE:
-        assert( baselevel );
-        baselevel--;
-        line->level = -1;
-        break;
-      case KEYWORD_LOWER:
-        baselevel++;
-        line->level = -1;
-        break;
-    }
-  }
-
-  BuildTexinfoNodes();
-}
-
-/*
- *  PrintFile
- */
-
-void PrintFile(
-  char *out
-)
-{
-  Line_Control *line;
-
-  OutFile = fopen( out, "w+" );
-
-  if ( !OutFile ) {
-    fprintf( stderr, "Unable to open (%s) for output\n", out );
-    exit_application( 1 );
-  }
-  assert( OutFile );
-
-  for ( line = (Line_Control *) Lines.first ;
-        !_Chain_Is_last( &line->Node ) ; 
-        line = (Line_Control *) line->Node.next ) {
-    fprintf( OutFile, "%s\n", line->Contents );
-/*
-    fprintf(
-      OutFile,
-      "(%d,%d)%s\n",
-      line->keyword,
-      line->format,
-      line->Contents
-    );
-*/
-  }
-}
-
-/*
- *  DumpList
- */
-
-void DumpList( 
-  Chain_Control  *the_list
-)
-{
-  Line_Control  *line;
-
-  fprintf( stderr, "---> Dumping list (%p)\n", the_list );
-
-  for ( line = (Line_Control *) the_list->first ;
-      !_Chain_Is_last( &line->Node ) ; 
-      line = (Line_Control *) line->Node.next ) {
-    /* if (line->level != -1) */
-      PrintLine( line );
-      /* fprintf( stderr, "%s\n", line->Contents ); */
-  }
-}
-
-/*
- * ReleaseFile
- */
-
-void ReleaseFile()
-{
-   Line_Control *line;
-   Line_Control *next;
-
-   for ( line = (Line_Control *) Lines.first ;
-         !_Chain_Is_last( &line->Node ) ; 
-       ) {
-     next = (Line_Control *) line->Node.next;
-     line = next;
-   }
-}
-
-/*
- *  strtoInitialCaps
- */
-
-void strtoInitialCaps(
-  char *dest,
-  char *src
-)
-{
-  char *source = src;
-  char *destination = dest;
-
-  source = src;
-  destination = (dest) ? dest : src;
-
-  while ( *source ) {
-    while ( isspace( *source ) )
-      *destination++ = *source++;
-
-    if ( !*source )
-      break;
-
-    *destination++ = toupper( *source++ );
-
-    for ( ; *source && !isspace( *source ) ; source++ )
-      *destination++ = tolower( *source );
-     
-    if ( !*source )
-      break;
-  }
-
-  *destination = '\0';
-}
diff --git a/doc/tools/bmenu/system.h b/doc/tools/bmenu/system.h
deleted file mode 100644
index 397c3afca2..0000000000
--- a/doc/tools/bmenu/system.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- *  COPYRIGHT (c) 1988-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  All rights reserved.
- *
- *  $Id$
- */
-
-#ifndef __SYSTEM_h
-#define __SYSTEM_h
-
-typedef unsigned int   unsigned32;
-typedef unsigned short unsigned16;
-typedef unsigned char  unsigned8;
-
-#define USE_INLINES 
-#define STATIC static
-#define INLINE inline
-
-#ifndef NULL
-#define NULL 0
-#endif
-
-typedef unsigned int   boolean;
-
-#if !defined( TRUE ) || (TRUE != 1)
-#undef TRUE
-#define TRUE     (1)
-#endif
-
-#if !defined( FALSE ) || (FALSE != 0)
-#undef FALSE
-#define FALSE 0
-#endif
-
-#endif
diff --git a/doc/tools/bmenu/testdoc.texi b/doc/tools/bmenu/testdoc.texi
deleted file mode 100644
index da56254117..0000000000
--- a/doc/tools/bmenu/testdoc.texi
+++ /dev/null
@@ -1,690 +0,0 @@
-@ifinfo
-@node Avenger Control Electronics System, Avenger Control Electronics System General System, DOCS PREV, DOCS UP
-@end ifinfo
-@chapter Avenger Control Electronics System
-@ifinfo
-@menu
-* Avenger Control Electronics System General System::
-* Avenger Control Electronics System System Modes::
-* Avenger Control Electronics System System BIT::
-@end menu
-@end ifinfo
-
-@ifinfo
-@node General System, Avenger Control Electronics System Monitor and Control Avenger, Avenger Control Electronics System, DOCS UP
-@end ifinfo
-@section General System
-@ifinfo
-@menu
-* Avenger Control Electronics System Monitor and Control Avenger::
-* Avenger Control Electronics System Control Weapons::
-* Avenger Control Electronics System Handle Tone Signals::
-* Avenger Control Electronics System Provide AVDAS::
-* Avenger Control Electronics System Perform Initial Power-On Sequence::
-* Avenger Control Electronics System Perform Post-power-on Initialization -- Deleted::
-* Avenger Control Electronics System Update AVDAS Port::
-* Avenger Control Electronics System Handle Minor Faults::
-* Avenger Control Electronics System General Mode::
-* Avenger Control Electronics System Mode Transition::
-* Avenger Control Electronics System Boot BIT::
-* Avenger Control Electronics System Background BIT::
-@end menu
-@end ifinfo
-
-@ifinfo
-@node Monitor and Control Avenger, Avenger Control Electronics System Control Weapons, General System, Avenger Control Electronics System System Modes
-@end ifinfo
-@subsection Monitor and Control Avenger
-
-The AFCC shall be the main computer that monitors and controls all AVENGER
-system functions.  [MNTMN 1-21.b, MNTMN 11-3]
-
-@ifinfo
-@node Control Weapons, Avenger Control Electronics System Handle Tone Signals, Monitor and Control Avenger, Avenger Control Electronics System System Modes
-@end ifinfo
-@subsection Control Weapons
-
-The AFCC shall be capable of tracking a single target, and controlling the
-missile and machine-gun systems.  [FUNCTIONAL]
-
-@ifinfo
-@node Handle Tone Signals, Avenger Control Electronics System Provide AVDAS, Control Weapons, Avenger Control Electronics System System Modes
-@end ifinfo
-@subsection Handle Tone Signals
-
-The AFCC shall receive a tone signal from the IEA and IFF system.  [MNTMN
-11-3.a(3), MNTMN 11-3.b(1)] The AFCC shall generate a test tone.  [MNTMN
-11-3.a(3), MNTMN 11-3.b(2)] The AFCC shall also amplify the tone signals
-(target acquisition tone and IFF tone) from the IEA and IFF system and
-apply them to the communications system via the gunner's control box to
-the CVC helmet.  [MNTMN 11-3.a(3), MNTMN 11-3.b(2)] The IFF audio tone
-shall be mixed with the missile acquisition tone and built-in-test tone
-inside the AFCC.  [MNTMN 11-3.a(3), MNTMN 12-5.b(3&4)].
-
-@ifinfo
-@node Provide AVDAS, Avenger Control Electronics System Perform Initial Power-On Sequence, Handle Tone Signals, Avenger Control Electronics System System Modes
-@end ifinfo
-@subsection Provide AVDAS
-
-The AFCC shall provide system status information on the AVDAS serial test
-port.  [FUNCTIONAL]
-
-@ifinfo
-@node Perform Initial Power-On Sequence, Avenger Control Electronics System Perform Post-power-on Initialization -- Deleted, Provide AVDAS, Avenger Control Electronics System System Modes
-@end ifinfo
-@subsection Perform Initial Power-On Sequence
-
-During power-on, the AFCC shall perform the following:
-
-@itemize @bullet
-
-@item initialize all software programmable peripherals,
-
-@item set all A/D output values to zero,
-
-@item safe the laser range finder by setting both first return and last return to a high state,
-
-@item safe the machine-gun system,
-
-@item set the turret drive to high speed mode,
-
-@item set the following outputs inactive
-
-@enumerate 1
-@item  FLIR fire permit, missile active, RSO authorize, and uncage verify
-
-@item  sight fire permit, missile active, RSO authorize, and uncage verify
-
-@item  sight display active, and driven reticle
-
-@item  power interlock
-
-@item  FLIR field of view
-
-@item  IFF challenge
-
-@item  gunner palm grips and drift switch
-
-@item  fire command
-
-@item  uncage command
-
-@item  BIT initiate command
-
-@item  ATAS power on
-
-@item  sequence command
-
-@item  arm command
-
-@item  activate command
-
-@item  autotrack lock on command
-
-@item  laser fire command,
-
-@end enumerate
-
-@item set the following inputs to the indicated state
-
-@enumerate 1
-@item  uncage mode to AUTO
-
-@item  helicopter mode to OFF
-
-@item  track mode to MANUAL
-
-@item  turret drive mode to STAB.
-@end enumerate
-
-@item initialize the missile range tables in RAM from values in EPROM,
-
-@item clear the north reference value and fire permit limits.  [FUNCTIONAL]
-@end itemize
-
-@ifinfo
-@node Perform Post-power-on Initialization -- Deleted, Avenger Control Electronics System Update AVDAS Port, Perform Initial Power-On Sequence, Avenger Control Electronics System System Modes
-@end ifinfo
-@subsection Perform Post-power-on Initialization -- Deleted
-
-Requirement was deleted.
-
-@ifinfo
-@node Update AVDAS Port, Avenger Control Electronics System Handle Minor Faults, Perform Post-power-on Initialization -- Deleted, Avenger Control Electronics System System Modes
-@end ifinfo
-@subsection Update AVDAS Port
-
-The AFCC shall update the AVDAS port every 100ms.  [FUNCTIONAL]
-
-@ifinfo
-@node Handle Minor Faults, Avenger Control Electronics System System Modes, Update AVDAS Port, Avenger Control Electronics System System Modes
-@end ifinfo
-@subsection Handle Minor Faults
-
-Detection of a minor fault shall cause an error message to be displayed on
-the CDT and the system fault light to be lit.
-
-
-@ifinfo
-@node System Modes, Avenger Control Electronics System General Mode, Handle Minor Faults, DOCS UP
-@end ifinfo
-@section System Modes
-@ifinfo
-@menu
-* Avenger Control Electronics System General Mode::
-* Avenger Control Electronics System Mode Transition::
-* Avenger Control Electronics System Boot BIT::
-* Avenger Control Electronics System Background BIT::
-@end menu
-@end ifinfo
-
-
-@ifinfo
-@node General Mode, Avenger Control Electronics System Process System Mode Periodically -- Deleted, System Modes, Avenger Control Electronics System System BIT
-@end ifinfo
-@subsection General Mode
-@ifinfo
-@menu
-* Avenger Control Electronics System Process System Mode Periodically -- Deleted::
-* Avenger Control Electronics System Determine System Mode::
-* Avenger Control Electronics System OFF Mode::
-* Avenger Control Electronics System COMM Mode::
-* Avenger Control Electronics System SAFE Mode::
-* Avenger Control Electronics System RUN Mode::
-* Avenger Control Electronics System ENGAGE Mode::
-* Avenger Control Electronics System Mode Fault::
-* Avenger Control Electronics System ENGAGE Mode Processing::
-* Avenger Control Electronics System Process Transition to OFF Mode::
-* Avenger Control Electronics System Process Transition to COMM Mode::
-* Avenger Control Electronics System Process Transition to SAFE Mode::
-* Avenger Control Electronics System Process Transition to RUN Mode::
-* Avenger Control Electronics System Process Transition to ENGAGE Mode::
-@end menu
-@end ifinfo
-
-
-@ifinfo
-@node Process System Mode Periodically -- Deleted, Avenger Control Electronics System Determine System Mode, General Mode, Avenger Control Electronics System Mode Transition
-@end ifinfo
-@subsubsection Process System Mode Periodically -- Deleted
-
-Requirement was deleted.
-
-@ifinfo
-@node Determine System Mode, Avenger Control Electronics System OFF Mode, Process System Mode Periodically -- Deleted, Avenger Control Electronics System Mode Transition
-@end ifinfo
-@subsubsection Determine System Mode
-
-The AFCC shall determine the system mode from the state of the system mode
-switch on the gunner's console and the remote mode indication from the
-remote terminal.  [FUNCTIONAL]
-
-@ifinfo
-@node OFF Mode, Avenger Control Electronics System COMM Mode, Determine System Mode, Avenger Control Electronics System Mode Transition
-@end ifinfo
-@subsubsection OFF Mode
-
-If the system mode switch is in the OFF position, the system mode shall be
-OFF.  [FUNCTIONAL]
-
-@ifinfo
-@node COMM Mode, Avenger Control Electronics System SAFE Mode, OFF Mode, Avenger Control Electronics System Mode Transition
-@end ifinfo
-@subsubsection COMM Mode
-
-If the system mode switch is in the COMM position, the system mode shall
-be COMM.  [FUNCTIONAL]
-
-@ifinfo
-@node SAFE Mode, Avenger Control Electronics System RUN Mode, COMM Mode, Avenger Control Electronics System Mode Transition
-@end ifinfo
-@subsubsection SAFE Mode
-
-If the system mode switch is in the SAFE position, the system mode shall
-be SAFE.  [FUNCTIONAL]
-
-@ifinfo
-@node RUN Mode, Avenger Control Electronics System ENGAGE Mode, SAFE Mode, Avenger Control Electronics System Mode Transition
-@end ifinfo
-@subsubsection RUN Mode
-
-If the system mode switch is in the RUN position, the system mode shall be
-RUN.  [FUNCTIONAL]
-
-@ifinfo
-@node ENGAGE Mode, Avenger Control Electronics System Mode Fault, RUN Mode, Avenger Control Electronics System Mode Transition
-@end ifinfo
-@subsubsection ENGAGE Mode
-
-If the system mode switch is in the ENGAGE position, the system mode shall
-be ENGAGE or REMOTE.  [FUNCTIONAL]
-
-@ifinfo
-@node Mode Fault, Avenger Control Electronics System ENGAGE Mode Processing, ENGAGE Mode, Avenger Control Electronics System Mode Transition
-@end ifinfo
-@subsubsection Mode Fault
-
-If the system mode switch is not in a valid position, the system mode
-shall remain unchanged and the AFCC shall output 'MODE FAULT' to the CDT.
-[FUNCTIONAL]
-
-@ifinfo
-@node ENGAGE Mode Processing, Avenger Control Electronics System Mode Transition, Mode Fault, Avenger Control Electronics System Mode Transition
-@end ifinfo
-@subsubsection ENGAGE Mode Processing
-
-When the system is in the ENGAGE mode, the AFCC shall:
-
-@itemize @bullet
-
-@item perform auto slew processing,
-
-@item perform lead angle processing,
-
-@item perform autotrack processing,
-
-@item output rate commands to the turret drive system,
-
-@item control the firing of the weapons systems.  [FUNCTIONAL]
-
-@end itemize
-
-@ifinfo
-@node Mode Transition, Avenger Control Electronics System Process Transition to OFF Mode, ENGAGE Mode Processing, Avenger Control Electronics System System BIT
-@end ifinfo
-@subsection Mode Transition
-@ifinfo
-@menu
-* Avenger Control Electronics System Process Transition to OFF Mode::
-* Avenger Control Electronics System Process Transition to COMM Mode::
-* Avenger Control Electronics System Process Transition to SAFE Mode::
-* Avenger Control Electronics System Process Transition to RUN Mode::
-* Avenger Control Electronics System Process Transition to ENGAGE Mode::
-@end menu
-@end ifinfo
-
-The AFCC can operate in one of the following modes:  OFF, COMM, SAFE, RUN,
-or ENGAGE.  The mode transitions are depicted in Figure 3-1.
-
-@ifhtml
-@html
-<CENTER>
-<IMG SRC="modes.gif" ALT="Figure 3-1 Mode Transitions">
-</CENTER>
-@end html
-@end ifhtml
-
-@ifset use-ascii
-@example
-Figure 3-1 Mode Transitions - modes.gif
-@end example
-@end ifset
-
-@ifset use-tex
-@example
-Figure 3-1 Mode Transitions - modes.gif
-@end example
-@end ifset
-
-
-@ifinfo
-@node Process Transition to OFF Mode, Avenger Control Electronics System Process Transition to COMM Mode, Mode Transition, Avenger Control Electronics System Boot BIT
-@end ifinfo
-@subsubsection Process Transition to OFF Mode
-
-When the AFCC detects a valid transition to the OFF mode, the following
-actions shall be performed:
-
-@itemize @bullet
-
-@item update the elapsed time counter for the last mode the system was in,
-
-@item output 'OFF MODE' to the CDT,
-
-@item safe the laser by setting the last and first return to a high state,
-
-@item disable the turret drive system,
-
-@item disable the missile system,
-
-@item disable the machine-gun system,
-
-@item deactivate the sight and reticle,
-
-@item update the EEPROM with the current elapsed time and count values,
-
-@item disable continuous BIT,
-
-@item insure that the machine-gun cool down has completed before clearing the power hold circuit.  [FUNCTIONAL]
-
-@end itemize
-
-
-@ifinfo
-@node Process Transition to COMM Mode, Avenger Control Electronics System Process Transition to SAFE Mode, Process Transition to OFF Mode, Avenger Control Electronics System Boot BIT
-@end ifinfo
-@subsubsection Process Transition to COMM Mode
-
-When the AFCC detects a valid transition to the COMM mode, the following
-actions shall be performed:
-
-@itemize @bullet
-
-@item update the elapsed time counter for the last mode the system was in,
-
-@item output `COMM MODE' to the CDT,
-
-@item safe the laser by setting the last and first return to a high state,
-
-@item disable the turret drive system,
-
-@item disable the missile system,
-
-@item disable the machine-gun system,
-
-@item deactivate the sight and reticle,
-
-@item reset the power hold circuit to insure power if the system is put in the OFF mode,
-
-@item enable current monitoring.  [OPMAN 2-27.b(2), FUNCTIONAL]
-
-@end itemize
-
-@ifinfo
-@node Process Transition to SAFE Mode, Avenger Control Electronics System Process Transition to RUN Mode, Process Transition to COMM Mode, Avenger Control Electronics System Boot BIT
-@end ifinfo
-@subsubsection Process Transition to SAFE Mode
-
-When the AFCC detects a valid transition to the SAFE mode, the following
-actions shall be performed:
-
-@itemize @bullet
-
-@item update the elapsed time counter for the last mode the system was in,
-
-@item output `SAFE MODE' to the CDT,
-
-@item safe the laser by setting the last and first return to a high state,
-
-@item disable the turret drive system,
-
-@item disable the missile system,
-
-@item disable the machine-gun system,
-
-@item deactivate the sight and reticle,
-
-@item reset the power hold circuit to insure power if the system is put in the OFF mode,
-
-@item enable current monitoring.  [FUNCTIONAL]
-
-@end itemize
-
-@ifinfo
-@node Process Transition to RUN Mode, Avenger Control Electronics System Process Transition to ENGAGE Mode, Process Transition to SAFE Mode, Avenger Control Electronics System Boot BIT
-@end ifinfo
-@subsubsection Process Transition to RUN Mode
-
-When the AFCC detects a valid transition to the RUN mode, the following
-actions shall be performed:
-
-@itemize @bullet
-
-@item update the elapsed time counter for the last mode the system was in,
-
-@item output `RUN MODE' to the CDT,
-
-@item safe the laser by setting the last and first return to a high state,
-
-@item enable the turret drive system,
-
-@item disable the missile system,
-
-@item disable the machine-gun system,
-
-@item deactivate the sight and reticle,
-
-@item reset the power hold circuit to insure power if the system is put in the OFF mode,
-
-@item enable current monitoring.  [FUNCTIONAL]
-
-@end itemize
-
-@ifinfo
-@node Process Transition to ENGAGE Mode, Avenger Control Electronics System System BIT, Process Transition to RUN Mode, Avenger Control Electronics System Boot BIT
-@end ifinfo
-@subsubsection Process Transition to ENGAGE Mode
-
-When the AFCC detects a valid transition to the ENGAGE mode, the following
-actions shall be performed:
-
-@itemize @bullet
-
-@item update the elapsed time counter for the last mode the system was in,
-
-@item output `ENGAGE MODE' to the CDT,
-
-@item enable the turret drive system,
-
-@item enable the missile system power,
-
-@item reset the power hold circuit to insure power if the system is put in the OFF mode,
-
-@item enable current monitoring.  [FUNCTIONAL]
-
-@end itemize
-
-@ifinfo
-@node System BIT, Avenger Control Electronics System Boot BIT, Process Transition to ENGAGE Mode, DOCS UP
-@end ifinfo
-@section System BIT
-@ifinfo
-@menu
-* Avenger Control Electronics System Boot BIT::
-* Avenger Control Electronics System Background BIT::
-@end menu
-@end ifinfo
-
-
-@ifinfo
-@node Boot BIT, Avenger Control Electronics System Perform ROM Checksum, System BIT, DOCS UP
-@end ifinfo
-@subsection Boot BIT
-@ifinfo
-@menu
-* Avenger Control Electronics System Perform ROM Checksum::
-* Avenger Control Electronics System Boot Test AFCC Boards::
-* Avenger Control Electronics System Boot Test CPU Board::
-* Avenger Control Electronics System Boot Test AFCC Controller Board DAC's::
-* Avenger Control Electronics System Boot Test Interface Board Discrete Inputs::
-* Avenger Control Electronics System Boot Test AFCC Controller Board Relay and Discrete Outputs::
-* Avenger Control Electronics System Boot Check Voltages::
-* Avenger Control Electronics System Boot Handle Fatal Error::
-* Avenger Control Electronics System Perform Background BIT::
-* Avenger Control Electronics System Background Process CPU and Software Exceptions::
-* Avenger Control Electronics System Background Test AFCC Controller Board DAC's::
-* Avenger Control Electronics System Background Test AFCC Controller Board Relay and Discrete Outputs::
-* Avenger Control Electronics System Perform RAM Checksum::
-* Avenger Control Electronics System Background Monitor Voltages::
-* Avenger Control Electronics System Background Handle Fatal Error::
-@end menu
-@end ifinfo
-
-
-@ifinfo
-@node Perform ROM Checksum, Avenger Control Electronics System Boot Test AFCC Boards, Boot BIT, Avenger Control Electronics System Background BIT
-@end ifinfo
-@subsubsection Perform ROM Checksum
-
-During initialization of the AFCC, the AFCC shall checksum the code image
-stored in ROM to insure that it is correct.  If the checksum does not
-match the code image, the system shall halt.
-
-@ifinfo
-@node Boot Test AFCC Boards, Avenger Control Electronics System Boot Test CPU Board, Perform ROM Checksum, Avenger Control Electronics System Background BIT
-@end ifinfo
-@subsubsection Boot Test AFCC Boards
-
-During initialization of the AFCC, all boards shall be tested to determine
-their functional state.  If all tests performed on a board pass, the board
-shall have a functional state of passed.  If any test performed on a board
-fails, the board shall have a functional state of failed.
-
-@ifinfo
-@node Boot Test CPU Board, Avenger Control Electronics System Boot Test AFCC Controller Board DAC's, Boot Test AFCC Boards, Avenger Control Electronics System Background BIT
-@end ifinfo
-@subsubsection Boot Test CPU Board
-
-During initialization of the AFCC, the AFCC shall test the following CPU
-board components by invoking all non-destructive card-level diagnostic
-tests provided by the CPU board vendor.  If any CPU board component fails
-diagnostic testing, a fatal error shall occur.
-
-@ifinfo
-@node Boot Test AFCC Controller Board DAC's, Avenger Control Electronics System Boot Test Interface Board Discrete Inputs, Boot Test CPU Board, Avenger Control Electronics System Background BIT
-@end ifinfo
-@subsubsection Boot Test AFCC Controller Board DAC's
-
-During initialization of the AFCC, the AFCC shall utilize the DAC test
-capability of the AFCC Controller board to verify that the DAC components
-of the AFCC Controller board are set to their initial values.  If any DAC
-component is not properly set, a fatal error shall occur.
-
-@ifinfo
-@node Boot Test Interface Board Discrete Inputs, Avenger Control Electronics System Boot Test AFCC Controller Board Relay and Discrete Outputs, Boot Test AFCC Controller Board DAC's, Avenger Control Electronics System Background BIT
-@end ifinfo
-@subsubsection Boot Test Interface Board Discrete Inputs
-
-During initialization of the AFCC, the AFCC shall utilize the discrete
-input loopback capability of the AFCC Interface board to test that the
-discrete input components of the AFCC Interface board are working
-properly.  If any discrete input component does not function properly, a
-fatal error shall occur.
-
-@ifinfo
-@node Boot Test AFCC Controller Board Relay and Discrete Outputs, Avenger Control Electronics System Boot Check Voltages, Boot Test Interface Board Discrete Inputs, Avenger Control Electronics System Background BIT
-@end ifinfo
-@subsubsection Boot Test AFCC Controller Board Relay and Discrete Outputs
-
-During initialization of the AFCC, the AFCC shall utilize the relay and
-discrete output test capability of the AFCC Controller board to verify
-that the relay and discrete output components of the AFCC Controller board
-are set to their initial values.  If any relay or discrete output
-component is not properly set, a fatal error shall occur.
-
-@ifinfo
-@node Boot Check Voltages, Avenger Control Electronics System Boot Handle Fatal Error, Boot Test AFCC Controller Board Relay and Discrete Outputs, Avenger Control Electronics System Background BIT
-@end ifinfo
-@subsubsection Boot Check Voltages
-
-During initialization of the AFCC, the +5 volt, +15 volt, -15 volt, and
-+28 volt power supplies shall be checked to insure that they are within
-tolerance.  If any of the power supplies are out of tolerance, a fatal
-error shall occur.
-
-@ifinfo
-@node Boot Handle Fatal Error, Avenger Control Electronics System Background BIT, Boot Check Voltages, Avenger Control Electronics System Background BIT
-@end ifinfo
-@subsubsection Boot Handle Fatal Error
-
-If a fatal error occurs during initialization, the AFCC shall attempt to
-output a diagnostic message to the CDT and halt initialization.
-
-@ifinfo
-@node Background BIT, Avenger Control Electronics System Perform Background BIT, Boot Handle Fatal Error, DOCS UP
-@end ifinfo
-@subsection Background BIT
-@ifinfo
-@menu
-* Avenger Control Electronics System Perform Background BIT::
-* Avenger Control Electronics System Background Process CPU and Software Exceptions::
-* Avenger Control Electronics System Background Test AFCC Controller Board DAC's::
-* Avenger Control Electronics System Background Test AFCC Controller Board Relay and Discrete Outputs::
-* Avenger Control Electronics System Perform RAM Checksum::
-* Avenger Control Electronics System Background Monitor Voltages::
-* Avenger Control Electronics System Background Handle Fatal Error::
-@end menu
-@end ifinfo
-
-
-@ifinfo
-@node Perform Background BIT, Avenger Control Electronics System Background Process CPU and Software Exceptions, Background BIT, DOCS UP
-@end ifinfo
-@subsubsection Perform Background BIT
-
-During normal operation of the AFCC, the AFCC shall perform background BIT
-of various system components.  Background BIT shall be performed during
-system idle time.
-
-@ifinfo
-@node Background Process CPU and Software Exceptions, Avenger Control Electronics System Background Test AFCC Controller Board DAC's, Perform Background BIT, DOCS UP
-@end ifinfo
-@subsubsection Background Process CPU and Software Exceptions
-
-During normal operation of the AFCC, the AFCC shall recognize all CPU and
-software exceptions.  If any exception occurs, a fatal error shall occur.
-
-@ifinfo
-@node Background Test AFCC Controller Board DAC's, Avenger Control Electronics System Background Test AFCC Controller Board Relay and Discrete Outputs, Background Process CPU and Software Exceptions, DOCS UP
-@end ifinfo
-@subsubsection Background Test AFCC Controller Board DAC's
-
-During background BIT, the AFCC shall utilize the DAC test capability of
-the AFCC Controller board to verify that the DAC components of the AFCC
-Controller board are set to their last written values.  If any DAC
-component is not properly set, a fatal error shall occur.
-
-@ifinfo
-@node Background Test AFCC Controller Board Relay and Discrete Outputs, Avenger Control Electronics System Perform RAM Checksum, Background Test AFCC Controller Board DAC's, DOCS UP
-@end ifinfo
-@subsubsection Background Test AFCC Controller Board Relay and Discrete Outputs
-
-During background BIT, the AFCC shall utilize the relay and discrete
-output test capability of the AFCC Controller board to verify that the
-relay and discrete output components of the AFCC Controller board are set
-to their last written values.  If any relay or discrete output component
-is not properly set, a fatal error shall occur.
-
-@ifinfo
-@node Perform RAM Checksum, Avenger Control Electronics System Background Monitor Voltages, Background Test AFCC Controller Board Relay and Discrete Outputs, DOCS UP
-@end ifinfo
-@subsubsection Perform RAM Checksum
-
-During background BIT, the AFCC shall checksum the code image to insure
-that it is correct.  If the checksum does not match the code image, a
-fatal error shall occur.
-
-@ifinfo
-@node Background Monitor Voltages, Avenger Control Electronics System Background Handle Fatal Error, Perform RAM Checksum, DOCS UP
-@end ifinfo
-@subsubsection Background Monitor Voltages
-
-During background BIT, the AFCC shall monitor the +5 volt, +15 volt, -15
-volt, and +28 volt power supplies to insure that they are within
-tolerance.  If any of the power supplies are out of tolerance, a fatal
-error shall occur.
-
-@ifinfo
-@node Background Handle Fatal Error, DOCS NEXT, Background Monitor Voltages, DOCS UP
-@end ifinfo
-@subsubsection Background Handle Fatal Error
-
-When the AFCC detects a fatal error, the following shall be attempted:
-
-@enumerate a
-
-@item light the fault light on the gunner console,
-
-@item stop the execution of all tasks,
-
-@item reset all hardware outputs to a safe state,
-
-@item store a failure code or message in the EEPROM,
-
-@item output a diagnostic message to the CDT and Console port,
-
-@item halt the system.
-
-@end enumerate
-
-
diff --git a/doc/tools/pdl2texi/Drive.d b/doc/tools/pdl2texi/Drive.d
deleted file mode 100644
index 82c3de020e..0000000000
--- a/doc/tools/pdl2texi/Drive.d
+++ /dev/null
@@ -1,890 +0,0 @@
-OBJECT:  Drive
-  DESCRIPTION:
-    This object provides an interface to the elevation/azimuth
-    drive system(ECA).  
-  THEORY OF OPERATION:
-    This object encapsulates the turret drive.  The object provides
-    an interface to control the turret drive.  A method is provided
-    to set the azimuth and elevation rate of the drive.  Methods are
-    provided to request the drive to run in stabilized or power mode
-    and set the drive speed to high or low.  A method is also provided
-    to allow for drift adjust.  
-
-    This object also tracks drive system on hours.  It gets the hours
-    from the EEPROM data, allows the hours to be set, updates the
-    hours via the activation and deactivation of the drive, and
-    provides access to the hours.
-
-      + This is the first bullet.
-      + This is the second bullet.
-      + This is the third bullet.
-      + This is the fourth bullet.
-      + This is the fifth bullet.
-
-    The object also provides methods to access azimuth and elevation
-    displacement, and methods to process changes in the hardware
-    discretes drive on, stabilized mode, thermal fault and fault.
-  
-    The object also provides methods to enable and disable
-    both the remote and turret power interlocks which determine if
-    the drive can be driven by the remote or turret handstation
-    respectively.   
-
-ATTRIBUTE DESCRIPTIONS:
-
-
-ATTRIBUTE:  Azimuth_displacement
-  DESCRIPTION:
-    This attribute represents the current azimuth displacement
-    of the turret.
-  TYPE: floating point
-  RANGE: 0-0
-  UNITS: degrees
-  REQUIREMENTS:
-    AFS 8.2.11 Receive Azimuth Displacement and Elevation Displacement
-    AIS 5.2.6 Azimuth Displacement analog
-
-
-ATTRIBUTE:  Azimuth_rate
-  DESCRIPTION:
-    Azimuth rate command for movement of the turret. 
-  TYPE: floating point
-  RANGE: X-Y
-  UNITS: degrees / second
-  DEFAULT: none
-  REQUIREMENTS:
-    AFS 8.2.3 Send Azimuth and Elevation Rate to ECA
-    AIS 5.3.4 Elevation Rate analog
-    AIS 5.3.5 Azimuth Rate analog
-
-
-ATTRIBUTE:  Drift_adjust
-  DESCRIPTION:
-    This attribute represents the current drift adjustment mode
-    of the ECA turret drive.
-  TYPE: enumerated
-  MEMBERS:
-    ADJUST_OFF - drift adjust mode is OFF
-    ADJUST_ON  - drift adjust mode is ON
-  REQUIREMENTS:
-    AFS 8.2.6 Capable of turret drift adjustment
-    AIS 5.3.1 Drift Adjust discrete
- 
-
-ATTRIBUTE:  Drive_on
-  DESCRIPTION:
-    Current status of the turret drive.  The turret drive may either be
-    switched on or off.
-  TYPE: boolean
-  MEMBERS:
-    FALSE - turret drive is off
-    TRUE  - turret drive is on
-  DEFAULT: FALSE
-  REQUIREMENTS:
-    AFS 8.2.9 Monitor Drive System On
-    AIS 5.2.1 Drive System On discrete
-
-
-ATTRIBUTE:  Drive_system_hours
-  DESCRIPTION: 
-    Total number of hours drive has been activated. 
-  TYPE: integer
-  RANGE: 0 - +INFINITY 
-  UNITS: seconds
-  REQUIREMENTS:
-    AFS 4.11 Respond to CDT elapsed time indicator key
-
-
-ATTRIBUTE:  Elevation_displacement 
-  DESCRIPTION:
-    This attribute represents the current elevation displacement
-    of the turret.
-  TYPE: floating point
-  RANGE: 0-0
-  UNITS: degrees
-  REQUIREMENTS:
-    AFS 8.2.11 Receive Azimuth Displacement and Elevation Displacement
-    AIS 5.2.7 Elevation Displacement analog
-
-
-ATTRIBUTE:  Elevation_rate
-  DESCRIPTION:
-    Elevation rate command for movement of the turret.
-  TYPE: floating point
-  RANGE: X - Y
-  UNITS: degrees / second
-  DEFAULT: none
-  REQUIREMENTS:
-    AFS 8.2.3 Send Azimuth and Elevation Rate to ECA
-    AIS 5.3.4 Elevation Rate analog
-    AIS 5.3.5 Azimuth Rate analog
- 
-
-ATTRIBUTE:  Fault
-  DESCRIPTION:
-    This attribute denotes whether a turret malfunction has occurred.
-  TYPE: boolean
-  MEMBERS:
-    TRUE  - a turret malfunction has occurred
-    FALSE - no turret malfunction has occurred
-  DEFAULT: FALSE
-  REQUIREMENTS:
-    AFS 8.2.7 Check for ECA failure indication
-    AIS 5.2.4 Turret Drive Malfunction discrete
-
-
-ATTRIBUTE:  Mode
-  DESCRIPTION:
-    Current requested drive mode.
-  TYPE: enumerated
-  MEMBERS:
-    POWER - operate in POWER mode
-    STAB  - operate in STABILIZED mode
-  DEFAULT: POWER
-  REQUIREMENTS:
-    bogus requirement
-
-
-ATTRIBUTE:  Remote_power_interlock_position
-  DESCRIPTION:
-    This is the status of the remote's power interlock.
-  TYPE: enumerated
-  MEMBERS:
-    OPEN   - relay is open
-    CLOSED - relay is closed
-  REQUIREMENTS:  
-    AFS 8.2.12 Control Power Interlock
- 
-
-ATTRIBUTE:  Speed
-  DESCRIPTION:
-    Current speed mode of the ECA turret drive.
-  TYPE: enumerated
-  MEMBERS:
-    LOW_SPEED  - turret drive does not allow the maximum rate
-    HIGH_SPEED - turret drive allows the maximum rate
-  DEFAULT:  HIGH 
-  REQUIREMENTS:
-    AFS 8.2.5 Control Turret
-    AIS 5.3.3 Turret High Speed Mode discrete
-
-
-ATTRIBUTE:  Stabilized_mode
-  DESCRIPTION:
-    Current drive mode indicating whether the ECA electronics are
-    operating in Stabilized mode or Power mode.
-  TYPE: boolean
-  MEMBERS:
-    FALSE - not operating in STABILIZED mode
-    TRUE  - operating in STABILIZED mode
-  DEFAULT: FALSE
-  REQUIREMENTS:
-    AFS 8.2.8 Monitor Turret Stab Mode Indicate
-    AIS 5.2.3 Turret Stab Mode Indicate discrete
-
-
-ATTRIBUTE:  State
-  DESCRIPTION:
-    Current state of the turret drive.
-  TYPE: enumerated
-  MEMBERS:
-    ACTIVATED   - turret drive is ON and active
-    DEACTIVATED - turret drive is ON but deactivated
-  DEFAULT: DEACTIVATED
-  REQUIREMENTS:
-    AFS 8.2.4 Set Plam Grips Active
-    AIS 5.3.2 Palm Grips Active discrete
-
-
-ATTRIBUTE:  Thermal_fault
-  DESCRIPTION:
-    This attribute denotes whether a turret thermal fault has occurred.
-  TYPE: boolean
-  MEMBERS:
-    TRUE  - a turret thermal fault has occurred
-    FALSE - no turret thermal fault has occurred
-  DEFAULT: FALSE
-  REQUIREMENTS:
-    AFS 8.2.7 Check for ECA failure indication
-    AIS 5.2.2 Turret ECA Thermal Failure discrete
-
-
-ATTRIBUTE:  Turret_power_interlock_position
-  DESCRIPTION:
-    This is the status of the turret's power interlock.
-  TYPE: enumerated
-  MEMBERS:
-    OPEN   - relay is open
-    CLOSED - relay is closed
-  REQUIREMENTS:  
-    AFS 8.2.12 Control Power Interlock
- 
-
-ASSOCIATION DESCRIPTIONS: none
-
-ABSTRACT TYPE DESCRIPTIONS:
-
-ABSTRACT TYPE:  Drift_adjust_t
-  DESCRIPTION:
-    This abstract type represents the current drift adjustment mode
-    of the ECA turret drive.
-  VISIBILITY: public
-  DERIVATION:  enumerated
-  MEMBERS:  
-    ADJUST_OFF = 0 - drift adjust mode is OFF
-    ADJUST_ON  = 1 - drift adjust mode is ON
-  REQUIREMENTS:
-    AIS 5.3.1 Drift Adjust discrete
-
-ABSTRACT TYPE: Interlock_status
-  DESCRIPTION:
-    An interlock state being OPEN or CLOSED.
-  VISIBILITY: private
-  DERIVATION: enumerated
-  MEMBERS:
-    OPEN   - interlock relay is in the open state
-    CLOSED - interlock relay is in the closed state
-  REQUIREMENTS: 
-    AFS 8.2.12 Control Power Interlock
-
-ABSTRACT TYPE:  Mode
-  DESCRIPTION:
-    This type specifies the drive mode of the ECA turret drive.
-  VISIBILITY: public  
-  DERIVATION: enumerated
-  MEMBERS:
-    POWER - operate in POWER mode
-    STAB  - operate in STABILIZED mode
-
-ABSTRACT TYPE:  Speed
-  DESCRIPTION:
-    This type specifies the Speed mode of the ECA turret drive.
-  VISIBILITY: public
-  DERIVATION:  enumerated
-  MEMBERS:  
-    LOW_SPEED  = 0 - turret drive does not allow the maximum rate
-    HIGH_SPEED = 1 - turret drive allows the maximum rate
-  REQUIREMENTS:
-    AIS 5.3.3 Turret High Speed Mode discrete
-
-ABSTRACT TYPE:  State_t
-  DESCRIPTION:
-    This type specifies the state of the turret drive.
-  VISIBILITY: private
-  DERIVATION:  enumerated
-  MEMBERS:  
-    DEACTIVATED - turret drive is ON but deactivated
-    ACTIVATED   - turret drive is ON and active
-
-DATA ITEM DESCRIPTIONS:
-
-DATA ITEM: Azimuth_displacement_control
-  DESCRIPTION:
-    This data item contains the Azimuth_displacement analog control
-    information.
-  TYPE: handle
-
-
-DATA ITEM: Azimuth_rate_control
-  DESCRIPTION:
-    This data item contains the Azimuth_rate analog control
-    information.
-  TYPE: handle
-
-
-DATA ITEM: Drift_adjust_control
-  DESCRIPTION:
-    This data item contains the Drift_adjust discrete control
-    information.
-  TYPE: handle
-
-
-DATA ITEM: Drive_activate_control
-  DESCRIPTION:
-    This data item contains the activate drive relay control information. 
-  TYPE: handle
-
-
-DATA ITEM: Drive_activated_timestamp
-  DESCRIPTION:
-    This data item stores the timestamp of the last time the drive was
-    activated.  It will be used to compute the activated time when a
-    deactivate is received.
-  TYPE: time_t
-  DEFAULT: none
-  NOTES:
-    see C library for data type information 
-
-
-DATA ITEM: Drive_on
-  DESCRIPTION:
-    The current status of the turret drive representing whether
-    the drive is on or off.
-  TYPE: boolean
-  DEFAULT: FALSE
-
-
-DATA ITEM: Drive_on_control
-  DESCRIPTION:
-    This data item contains the Drive_on discrete flag control
-    information.
-  TYPE: handle
-
-
-DATA ITEM: Drive_system_hours
-  DESCRIPTION:
-    This data item stores the actual time the drive has been active.
-    This value will be output by the Get_time method and will be set
-    by the Set_time method.
-  TYPE: integer 
-  RANGE: 0 - +INFINITY 
-  UNITS: seconds
-  DEFAULT: 0
-
-
-DATA ITEM: Elevation_rate_control
-  DESCRIPTION:
-    This data item contains the Elevation_rate analog control 
-    information.
-  TYPE: handle
-
-
-DATA ITEM: Elevation_displacement_control
-  DESCRIPTION:
-    This data item contains the Elevation_displacement analog control
-    information.
-  TYPE: handle
-
-
-DATA ITEM: Fault_control
-  DESCRIPTION:
-    This data item contains the Fault discrete flag control
-    information.
-  TYPE: handle
-
-
-DATA ITEM: Remote_power_interlock_control
-  DESCRIPTION:
-    This data item contains the Remote_power_interlock relay control
-    information.
-  TYPE: handle
-
-
-DATA ITEM: Stabilized_mode_control
-  DESCRIPTION:
-    This data item contains the Stabilized_mode discrete flag control
-    information.
-  TYPE: handle
-
-
-DATA ITEM: State 
-  DESCRIPTION:
-    The current state of the turret drive representing an activated or
-    deactivated drive.
-  TYPE: State_t
-  DEFAULT: DEACTIVATED
-  
-
-DATA ITEM: Thermal_fault_control
-  DESCRIPTION:
-    This data item contains the Thermal_fault discrete flag control
-    information.
-  TYPE: handle
-
-
-DATA ITEM: Turret_power_interlock_control
-  DESCRIPTION:
-    This data item contains the Turret_power_interlock relay control
-    information.
-  TYPE: handle
-
-
-DATA ITEM: Turret_power_interlock_status
-  DESCRIPTION:
-    The accurate status of the turret power interlock relay.  This value
-    will be used to control the relay during a transition from the remote
-    back to the turret console.
-  TYPE: Interlock_status
-  DEFAULT: none
-
-
-METHOD DESCRIPTIONS:
-
-METHOD:  Activate 
-  DESCRIPTION:
-    This method activates the turret drive system.  A timestamp of the
-    activation is recorded to keep a running count of hours the drive has
-    been active.
-  VISIBILITY:  public
-  INPUTS:  none
-  OUTPUTS: none
-  REQUIREMENTS:
-    AFS 8.2.4 Set Palm Grips Active
-    AIS 5.3.2 Palm Grips Active discrete
-  PDL:
-
-    if Drive_on
-      if State is DEACTIVATED
-        close the Drive_activate_control relay using the Relay object
-        timestamp Drive_activated_timestamp for Drive_system_hours
-        running total
-        set State to ACTIVATED
-      else
-        already in the ACTIVATED state
-
-
-METHOD:  Create
-  DESCRIPTION:
-    This method initializes the Turret Drive object.  All monitors of 
-    turret drive signals are initialized and/or registered.  All turret
-    drive characteristics are set to their initial values.
-  VISIBILITY:  public
-  INPUTS: none
-  OUTPUTS: none
-  PDL:
-
-    set State to DEACTIVATED
-
-    get Drive_system_hours to initialize the elapsed drive time
-      from the Statistics (eeprom database) object - this is
-        stored upon shutdown in eeprom
-
-    create Fault_control using Discrete_flag object with the
-     following attributes 
-      true_sense     - DISCRETE_FLAG_TRUE_IS_1
-      is_buffered    - false
-      is_monitored   - true
-      period         - 10ms
-      change_routine - Change_fault
-    change fault using initial value returned from create Fault_control
- 
-    create Thermal_fault_control using Discrete_flag object with
-     the following attributes 
-      true_sense     - DISCRETE_FLAG_TRUE_IS_0
-      is_buffered    - false
-      is_monitored   - true
-      period         - 10ms
-      change_routine - Change_thermal_fault
-    change thermal fault using initial value returned from create
-     Thermal_fault_control
-
-    create Stabilized_mode_control using Discrete_flag object with the
-     following attributes  
-      true_sense     - DISCRETE_FLAG_TRUE_IS_1
-      is_buffered    - false
-      is_monitored   - true
-      period         - 10ms 
-      change_routine - Change_stabilized_mode
-    change stabilized mode using initial value returned from create
-     Stabilized_mode_control
-
-    create Drive_on_control using Discrete_flag object with the 
-     following attributes 
-      true_sense     - DISCRETE_FLAG_TRUE_IS_1
-      is_buffered    - false
-      is_monitored   - true
-      period         - 10ms
-      change_routine - Change_drive_on
-    change drive on using initial value returned from create
-     Drive_on_control
-
-    create Azimuth_rate_control using the Linear_dac object
-     with the following attributes:
-      voltage_low   - -10
-      voltage_high  - +10
-      logical_low   - -60
-      logical_high  - +60
-      is_buffered   - false
-      period        - none
-      initial_value - 0
-
-    create Elevation_rate_control using the Linear_dac object with the
-     following attributes:
-      voltage_low   - -10
-      voltage_high  - +10
-      logical_low   - -60
-      logical_high  - +60
-      is_buffered   - false
-      period        - none
-      initial_value - 0
-
-    create Azimuth_displacement_control using the Linear_adc object with
-     the following attributes:
-      voltage low    - 
-      voltage high   - 
-      logical low    - 
-      logical high   - 
-      is_buffered    - false 
-      is_monitored   - false
-      period         - none
-      change_routine - none
-      delta          - none
-
-    create Elevation_displacement_control using the Linear_adc object 
-     with the following attributes:
-      voltage low    - 
-      voltage high   - 
-      logical low    - 
-      logical high   - 
-      is_buffered    - false
-      is_monitored   - false
-      period         - none
-      change_routine - none
-      delta          - none
-
-    create Drive_activate_control using the Relay object with the
-     following attributes:
-      open_sense    - RELAY_OPEN_IS_0
-      is_buffered   - false
-      period        - none
-      initial_state - RELAY_OPEN
-
-    create Turret_power_interlock_control using the Relay object with 
-     the following attributes:
-      open_sense    - RELAY_OPEN_IS_0
-      is_buffered   - false
-      period        - none
-      initial_state - RELAY_OPEN
-    set Turret_power_interlock_status to OPEN
-
-    create Remote_power_interlock_control using the Relay
-     object with the following attributes:
-      open_sense    - RELAY_OPEN_IS_0
-      is_buffered   - false
-      period        - none
-      initial_state - RELAY_OPEN
-
-    create Drift_adjust_control using the Discrete_out object with 
-     following attributes:
-      is_buffered   - false
-      period        - 10ms
-      initial_value - ADJUST_OFF
-
-
-METHOD:  Deactivate
-  DESCRIPTION:
-    This method deactivates the turret drive system.  A timestamp of the
-    activation is recorded to keep a running count of hours the drive
-    has been active.
-  VISIBILITY:  public
-  INPUTS:  none
-  OUTPUTS: none
-  REQUIREMENTS:
-    AFS 8.2.4 Set Plam Grips Active
-    AIS 5.3.2 Palm Grips Active discrete
-  PDL:
-
-    if Drive_on
-      if State is DEACTIVATED 
-        timestamp deactivate for Drive_system_hours running total
-        deactivate drive by opening the Drive_activate_control relay
-        using the Relay object
-        compute running time since last activate
-        add running time to Drive_system_hours
-        set State to DEACTIVATED
-      else
-        already in the DEACTIVATED state
- 
-
-METHOD:  Disable_remote_power_interlock
-  DESCRIPTION:
-    This method disables the turret power interlock safety preventing
-    the turret from being driven by the remote's handstation. 
-  VISIBILITY:  public
-  INPUTS:  none
-  OUTPUTS: none
-  REQUIREMENTS:
-    AFS 8.2.12 Control Power Interlock
-  PDL:
-
-    open the remote power interlock relay
-    return the turret relay to its designated state defined by the
-      Turret_power_interlock_status
- 
-
-METHOD:  Disable_turret_power_interlock
-  DESCRIPTION:
-    This method disables the turret power interlock safety preventing
-    the turret from being driven by the turret's handstation. 
-  VISIBILITY:  public
-  INPUTS: none
-  OUTPUTS: none
-  REQUIREMENTS:
-    AFS 8.2.12 Control Power Interlock
-  PDL:
-
-    Deactivate the Drive object
-    open the turret power interlock relay
-    set Turret_power_interlock_status to OPEN
-
-
-METHOD:  Enable_remote_power_interlock
-  DESCRIPTION:
-    This method will enable the remote power interlock to allow
-    the turret to be driven from the remote station.
-  VISIBILITY:  public
-  INPUTS: none
-  OUTPUTS: none
-  REQUIREMENTS:
-    AFS 8.2.12 Control Power Interlock
-  NOTES:
-    At this time the turret's power interlock is opened to avoid
-    having both relays closed at a time.
-  PDL:
-
-    if Drive_on
-      open the turret power interlock relay using the Relay object
-      close the remote power interlock relay using the Relay object
-
-
-METHOD:  Enable_turret_power_interlock
-  DESCRIPTION:
-    This method will enable the turret power interlock to allow
-    the turret to be driven from the turret station.
-  VISIBILITY:  public
-  INPUTS: none
-  OUTPUTS: none
-  REQUIREMENTS:
-    AFS 8.2.12 Control Power Interlock
-  NOTES:
-    At this time the closed state is saved to allow the correct state
-    to be returned to in the event a remote overrides the turret and the 
-    remote gives up its control, we must return to the previous state of
-    the turret power interlock.
-  PDL:
-
-    if Drive_on
-      close the turret power interlock relay using the Relay object
-
-      set the Turret_power_interlock_status to CLOSED to return to
-        when remote gives up control
-
-
-METHOD: Get_AZ_EL_displacement  
-  DESCRIPTION:
-    This method returns the current azimuth displacement and elevation
-    displacement from the ECA.
-  VISIBILITY:  public
-  INPUTS:  none
-  OUTPUTS:
-    current azimuth displacement value
-    current elevation displacement value
-  REQUIREMENTS:
-    AFS 8.2.11 Receive Azimuth Displacement and Elevation Displacement
-    AIS 5.2.6 Azimuth Displacement analog
-    AIS 5.2.7 Elevation Displacement analog
-  NOTES:
-    Currently supported as an on-demand type of signal.  May change to a
-    monitored analog signal.
-  PDL:
-    
-    if Drive_on
-      get and return current azimuth displacement and current elevation
-      displacement from ECA using the Linear_ADC object
- 
-
-METHOD:  Get_hours
-  DESCRIPTION:
-    This method returns the current value contained in the elapsed
-    turret drive active time.
-  VISIBILITY:  public
-  INPUTS: none
-  OUTPUTS:
-    elapsed turret drive time - the current elasped turret drive time
-  REQUIREMENTS:
-    bogus requirements
-  REFERENCES:
-    AFS 4.11 Respond to CDT elapsed time indicator key
-  NOTES:
-    bogus notes
-  PDL:
-
-    return the current value for Drive_system_hours
-
-
-METHOD:  Set_drift_adjust
-  DESCRIPTION:
-    This method provides the ability to set the drift adjust to the 
-    value represented by the handstation.  Drift adjust is either ON
-    or OFF.
-  VISIBILITY:  public
-  INPUTS:
-    value - new drift adjust value 
-      ADJUST_OFF - drift adjust mode is OFF
-      ADJUST_ON  - drift adjust mode is ON
-  OUTPUTS: none
-  REQUIREMENTS:
-    AFS 8.2.6 Capable of turret drift adjustment
-    AIS 5.3.1 Drift Adjust discrete
-  PDL:
- 
-    if Drive_on
-      set drift adjust discrete to value using Discrete_out object
-
-METHOD:  Set_hours
-  DESCRIPTION:
-    This method will set the turret drive activated elapsed time value
-    to the specified value.
-  VISIBILITY:  public
-  INPUTS:
-    new_elapsed_time_value - specified turret drive elapsed time value
-  OUTPUTS: none
-  REQUIREMENTS:
-    AFS 4.11 Respond to CDT elapsed time indicator key
-  PDL:
- 
-    set the value of Drive_system_hours to the value specified by
-      new_elapsed_time_value
- 
-
-METHOD: Set_mode
-  DESCRIPTION:
-    This method sets the requested mode of the turret drive.
-  VISIBILITY: public
-  INPUTS:
-    mode - new requested mode
-      POWER - operating in POWER mode
-      STAB  - operating in STABILIZED mode
-  OUTPUTS:  none
-  REQUIREMENTS:
-    bogus requirements
-  PDL:
-    if mode is POWER
-      set drive mode switchlight to PWR_LAMP using the Console object
-    else if mode is STAB
-      set drive mode switchlight to STB_LAMP using the Console object
-
-    
-METHOD:  Set_rate
-  DESCRIPTION:
-    This method provides the ability to send azimuth and elevation rates
-    to the drive.  Two parameters are used as input to designate the
-    corresponding rates.  These parameters must be in degrees per second.
-  VISIBILITY:  public
-  INPUTS:
-    azimuth rate   - new azimuth rate in degress per second
-    elevation rate - new elevation rate in degress per second
-  OUTPUTS: none
-  REQUIREMENTS:
-    AFS 8.2.3 Send Azimuth and Elevation Rate to ECA
-    AIS 5.3.4 Elevation Rate analog
-    AIS 5.3.5 Azimuth Rate analog
-  NOTES:
-    May need to couple these analogs with an interface driver to close
-    the window between writes and conversions.
-  PDL:
-
-    if Drive_on
-      send the new azimuth rate to the Azimuth analog
-      send the new elevation rate to Elevation analog
-
-
-METHOD:  Set_speed
-  DESCRIPTION:
-    This method sets the turret drive speed mode to the specified value
-    either high or low based on user input.
-  VISIBILITY:  public
-  INPUTS:
-    new_speed_value - new value to set the turret speed to
-      LOW_SPEED  - turret drive does not allow the maximum rate
-      HIGH_SPEED - turret drive allows the maximum rate
-  OUTPUTS: none
-  REQUIREMENTS:
-    AFS 8.2.5 Control Turret
-    AIS 5.3.3 Turret High Speed Mode discrete
-  PDL:
-
-    if Drive_on
-      set turret drive high speed mode discrete to the new_speed_value
-       using Discrete_out object
-
-
-METHOD:  Change_drive_on
-  DESCRIPTION:
-    This method will be used to report a transition of the drive system
-    on discrete.
-  VISIBILITY:  private
-  INPUTS:
-    value - new drive system on value 
-      FALSE - indicates drive not on
-      TRUE  - indicates drive on
-  OUTPUTS: none
-  REQUIREMENTS:
-    AFS 8.2.9 Monitor Drive System On
-    AIS 5.2.1 Drive System On discrete
-  REFERENCES:
-    bogus references
-  NOTES:
-    bogus notes
-  PDL:
-
-    set Drive_on to value
-    if Drive_on is FALSE
-      deactivate the turret drive using the Drive object
-
-
-METHOD:  Change_fault
-  DESCRIPTION:
-    This method will be used to indicate that a turret malfunction
-    has been recognized by the turret drive.
-  VISIBILITY:  private
-  INPUTS:
-    value - new value resulting from a fault discrete change
-      FALSE - indicates no fault
-      TRUE  - indicates fault
-  OUTPUTS: none
-  REQUIREMENTS:
-    AFS 8.2.7 Check for ECA failure indication
-    AIS 5.2.4 Turret Drive Malfunction discrete
-  PDL:
- 
-    if value
-      send turret fault message using the Display object 
-    else 
-      return
-
-
-METHOD:  Change_stabilized_mode
-  DESCRIPTION:
-    This method will determine a transition from STAB mode to POWER mode.
-    It will set the stab mode lamp on the console.
-  VISIBILITY:  private
-  INPUTS:
-    value - new value resulting from a stab mode discrete change
-      FALSE - indicates not stabilized mode
-      TRUE -  indicates stabilized mode
-  OUTPUTS: none
-  REQUIREMENTS:
-    AFS 8.2.8 Monitor Turret Stab Mode Indicate
-    AIS 5.2.3 Turret Stab Mode Indicate discrete
-  PDL:
-
-    if value 
-      set STAB mode light to LAMP_ON using the Console object
-    else value indicates not stabilized mode
-      set STAB mode light to LAMP_OFF using the Console object
-
-
-METHOD:  Change_thermal_fault
-  DESCRIPTION:
-    This method will be used to indicate that a thermal fault has been
-     recognized by the turret drive.
-  VISIBILITY:  private
-  INPUTS:
-    value - new value resulting from a thermal fault discrete change
-      FALSE - indicates no thermal fault
-      TRUE  - indicates thermal fault
-  OUTPUTS: none
-  REQUIREMENTS:
-    AFS 8.2.7 Check for ECA failure indication
-    AIS 5.2.2 Turret ECA Thermal Failure discrete
-  PDL:
- 
-    if value
-      send thermal fault message using the Display object
-    else 
-      return
-
-TASK DESCRIPTIONS: none
-
-ENDOBJECT: Drive
diff --git a/doc/tools/pdl2texi/Makefile b/doc/tools/pdl2texi/Makefile
deleted file mode 100644
index f4867d32d6..0000000000
--- a/doc/tools/pdl2texi/Makefile
+++ /dev/null
@@ -1,83 +0,0 @@
-#
-#  COPYRIGHT (c) 1996-1997.
-#  On-Line Applications Research Corporation (OAR).
-#  All rights reserved.
-#
-#  $Id$
-#
-
-CC=gcc
-#CFLAGS=-O4 -fomit-frame-pointer
-CFLAGS=-g 
-
-PROJECT=afcc
-TEXINPUTS=/home/gnu/work/binutils-2.6/texinfo:.  
-BASE=Drive
-FILES=afcc.texi $(BASE).txt
-PROG=pdl2texi
-
-all:  $(PROG)
-
-$(BASE).texi: $(BASE).d ./$(PROG)
-	./$(PROG) $(BASE).d
-
-$(PROG): main.o chain.o
-	gcc -static main.o chain.o -o $(PROG)
-
-drive: Drive
-Drive: $(BASE).txt
-	/usr1/home/joel/tmp/makeinfo $(PROJECT).texi
-
-main.o: main.c base.h
-
-chain.o: chain.c 
-
-dvi: $(PROJECT).dvi
-ps: $(PROJECT).ps
-info: Drive
-html: $(PROJECT).texi $(BASE).txt
-	 ../textools/texi2html $(PROJECT).texi
-
-$(BASE).txt: $(BASE).d
-	./$(PROG) -v -p "Turret Subsystem" -u "Turret Subsystem" $(BASE).d
-
-$(PROJECT).ps: $(PROJECT).dvi
-	dvips -o $(PROJECT).ps $(PROJECT).dvi
-
-$(PROJECT).dvi: $(FILES)
-	texi2dvi $(PROJECT).texi
-
-view:
-	test -r $(PROJECT).ps && ghostview $(PROJECT).ps
-
-tests: test test1
-
-test: $(PROG)
-	rm -f $(BASE).texi
-	./$(PROG) -v -p "Turret Subsystem" -u "Turret Subsystem" $(BASE).d
-
-test1:
-	rm -f t1.txt
-	./$(PROG) -v t1.d
-
-wtest:
-	rm -f $(BASE).txt
-	./$(PROG) -w -v -p "Turret Subsystem" -u "Turret Subsystem" $(BASE).d
-
-enum:
-	./$(PROG) -w -v -p "Magic Subsystem" \
-	    -u "Magic Subsystem" test_cases/enum.d
-	./$(PROG) -w -v -p "Magic Subsystem" \
-	    -u "Magic Subsystem" test_cases/enumbad.d
-	
-avdas:
-	./$(PROG) -v -p "Magic Subsystem" \
-	    -u "Magic Subsystem" test_cases/avdas.d
-	./$(PROG) -w -v -p "Magic Subsystem" \
-	    -u "Magic Subsystem" test_cases/avdas.d
-	
-clean:
-	rm -f *.o $(PROG) *.txt core *.html $(PROJECT) Drive.texi
-	rm -f *.dvi *.ps *.log *.aux *.cp *.fn *.ky *.pg *.toc *.tp *.vr $(BASE)
-	rm -f test_cases/*.txt test_cases/*.texi
-
diff --git a/doc/tools/pdl2texi/address.h b/doc/tools/pdl2texi/address.h
deleted file mode 100644
index 82d73b917d..0000000000
--- a/doc/tools/pdl2texi/address.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/*  address.h
- *
- *  This include file contains the information required to manipulate
- *  physical addresses.
- *
- *  COPYRIGHT (c) 1997.
- *  On-Line Applications Research Corporation (OAR).
- *  All rights reserved.
- *
- *  $Id$
- */
-
-#ifndef __ADDRESSES_h
-#define __ADDRESSES_h
-
-/*
- *  _Addresses_Add_offset
- *
- *  DESCRIPTION:
- *
- *  This function is used to add an offset to a base address.
- *  It returns the resulting address.  This address is typically
- *  converted to an access type before being used further.
- */
-
-STATIC INLINE void *_Addresses_Add_offset ( 
-  void       *base, 
-  unsigned32  offset
-);
-
-/*
- *  _Addresses_Subtract_offset
- *
- *  DESCRIPTION:
- *
- *  This function is used to subtract an offset from a base
- *  address.  It returns the resulting address.  This address is
- *  typically converted to an access type before being used further.
- */
-
-STATIC INLINE void *_Addresses_Subtract_offset( 
-  void       *base, 
-  unsigned32  offset
-);
-
-/*
- *  _Addresses_Add
- *
- *  DESCRIPTION:
- *
- *  This function is used to add two addresses.  It returns the
- *  resulting address.  This address is typically converted to an
- *  access type before being used further.
- */
-
-STATIC INLINE void *_Addresses_Add ( 
-  void *left, 
-  void *right 
-);
-
-/*
- *  _Addresses_Subtract
- *
- *  DESCRIPTION:
- *
- *  This function is used to subtract two addresses.  It returns the
- *  resulting offset.
- */
-
-STATIC INLINE unsigned32 _Addresses_Subtract ( 
-  void *left, 
-  void *right 
-);
-
-/*
- *  _Addresses_Is_aligned
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the given address is correctly
- *  aligned for this processor and FALSE otherwise.  Proper alignment
- *  is based on correctness and efficiency.
- */
-
-STATIC INLINE boolean _Addresses_Is_aligned ( 
-  void *address
-);
-
-/*
- *  _Addresses_Is_in_range
- *
- *  DESCRIPTION:
- *
- *  This function returns TRUE if the given address is within the
- *  memory range specified and FALSE otherwise.  base is the address
- *  of the first byte in the memory range and limit is the address
- *  of the last byte in the memory range.  The base address is
- *  assumed to be lower than the limit address.
- */
-
-STATIC INLINE boolean _Addresses_Is_in_range ( 
-  void *address, 
-  void *base,
-  void *limit 
-);
-
-#include "address.inl"
-
-#endif
-/* end of include file */
diff --git a/doc/tools/pdl2texi/address.inl b/doc/tools/pdl2texi/address.inl
deleted file mode 100644
index fda92a9371..0000000000
--- a/doc/tools/pdl2texi/address.inl
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- *  This include file contains the bodies of the routines
- *  about addresses which are inlined.
- *
- *  COPYRIGHT (c) 1997.
- *  On-Line Applications Research Corporation (OAR).
- *  All rights reserved.
- *
- *  $Id$
- */
-
-#ifndef __INLINE_ADDRESSES_inl
-#define __INLINE_ADDRESSES_inl
-
-/*PAGE
- *
- *  _Addresses_Add_offset
- *
- */
-
-STATIC INLINE void *_Addresses_Add_offset ( 
-  void       *base, 
-  unsigned32  offset
-)
-{
-  return (base + offset);
-}
-
-/*PAGE
- *
- *  _Addresses_Subtract_offset
- *
- */
-
-STATIC INLINE void *_Addresses_Subtract_offset ( 
-  void       *base, 
-  unsigned32  offset
-)
-{
-  return (base - offset);
-}
-
-/*PAGE
- *
- *  _Addresses_Add
- *
- *  NOTE:  The cast of an address to an unsigned32 makes this code
- *         dependent on an addresses being thirty two bits.
- */
-
-STATIC INLINE void *_Addresses_Add ( 
-  void *left, 
-  void *right 
-)
-{
-  return (left + (unsigned32)right);
-}
-
-/*PAGE
- *
- *  _Addresses_Subtract
- *
- *  NOTE:  The cast of an address to an unsigned32 makes this code
- *         dependent on an addresses being thirty two bits.
- */
-
-STATIC INLINE unsigned32 _Addresses_Subtract ( 
-  void *left, 
-  void *right 
-)
-{
-  return (left - right);
-}
-
-/*PAGE
- *
- *  _Addresses_Is_aligned
- *
- */
-
-STATIC INLINE boolean _Addresses_Is_aligned ( 
-  void *address
-)
-{
-    return ( ( (unsigned32)address % 4 ) == 0 );
-}
-
-/*PAGE
- *
- *  _Addresses_Is_aligned
- *
- */
-
-STATIC INLINE boolean _Addresses_Is_in_range ( 
-  void *address, 
-  void *base,
-  void *limit 
-)
-{
-  return ( address >= base && address <= limit );
-}
-
-#endif
-/* end of include file */
diff --git a/doc/tools/pdl2texi/afcc.texi b/doc/tools/pdl2texi/afcc.texi
deleted file mode 100644
index ed5333b5be..0000000000
--- a/doc/tools/pdl2texi/afcc.texi
+++ /dev/null
@@ -1,94 +0,0 @@
-\input texinfo   @c -*-texinfo-*-
-@c %**start of header
-@setfilename afcc
-@settitle AFCC Internals Guide
-@paragraphindent 0
-@c %**end of header
-
-@c
-@c  COPYRIGHT (c) 1996-1997.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-
-@c  This prevents a black box from being printed on "overflow" lines.
-@c  The alternative is to rework a sentence to avoid this problem.
-@finalout
-
-@tex
-\global\parindent 0in
-\global\chapheadingskip = 15pt plus 4pt minus 2pt
-\global\secheadingskip = 12pt plus 4pt minus 2pt
-\global\subsecheadingskip = 9pt plus 4pt minus 2pt
-
-@ifclear smallbook
-\global\parskip 6pt plus 1pt
-@end ifclear
-@end tex
-
-@ifinfo
-@format
-START-INFO-DIR-ENTRY
-* AFCC: .             AFCC Objects
-END-INFO-DIR-ENTRY
-@end format
-@end ifinfo
-
-
-@c Joel's Questions
-@c
-@c  1.  Why does paragraphindent only impact makeinfo?
-@c
-
-@setchapternewpage odd
-
-@c
-@c   Master file for the C User's Guide
-@c
-@include Drive.texi
-@ifinfo
-
-@node Top, Turret Subsystem, Gunner Station Subsystem, (dir)
-@top afcc
-
-This is the info version of the object documentation for the AFCC.
-
-The following subsystems are in the AFCC:
-
-@menu
-* Turret Subsystem::
-* Vehicle Subsystem::
-* Gunner Station Subsystem::
-@end menu
-
-@node Turret Subsystem, , Top, Top
-
-The following objects are in the Turret Subsystem:
-
-@menu
-* Drive Object::                Drive Object
-@end menu
-
-@node Vehicle Subsystem, Gunner Station Subsystem, , Top
-
-@menu
-The following objects are in the Turret Subsystem:
-
-* ::
-@end menu
-
-@node Gunner Station Subsystem, Top,  Vehicle Subsystem, Top
-@menu
-
-The following objects are in the Gunner Station Subsystem:
-
-* ::
-@end menu
-
-
-@end ifinfo
-@c 
-@c 
-@c Need to copy the emacs stuff and "trailer stuff" (index, toc) into here
-@c
-@bye
diff --git a/doc/tools/pdl2texi/base.h b/doc/tools/pdl2texi/base.h
deleted file mode 100644
index 12d481b3c7..0000000000
--- a/doc/tools/pdl2texi/base.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- *  COPYRIGHT (c) 1997.
- *  On-Line Applications Research Corporation (OAR).
- *  All rights reserved.
- *
- *  $Id$
- */
-
-#ifndef __PDL2AMI_h
-#define __PDL2AMI_h
-
-#include "system.h"
-#include "chain.h"
-
-#ifndef EXTERN 
-#define EXTERN extern
-#endif
-
-/*
- *  Paragraph size should be kept down because it is allocated for each
- *  Line_Control.  If this number is large, the memory requirements for
- *  the program increase significantly.
- */
-
-#define BUFFER_SIZE    (10 * 1024)
-#define PARAGRAPH_SIZE (8 * 1024)
-
-#define NUMBER_ELEMENTS( _x ) (sizeof(_x) / sizeof _x[0])
-
-void exit_application( 
-  int status
-);
-
-void ProcessFile(
-  char   *inname,
-  char   *outname
-);
-
-void strtolower(
-  char *dest,
-  char *src
-);
-
-void strtoInitialCaps(
-  char *dest,
-  char *src
-);
-
-void StripBlanks( void );
-
-void MergeParagraphs( void );
-
-int CheckForIncomplete( void );
-
-int CheckOutline( void );
-
-int CheckSections( void );
-
-void GenerateLists( void );
-
-void GenerateAList( 
-  char          *section,
-  Chain_Control *the_list
-);
-
-void LookForInternalInconsistencies( void );
-
-int Match_Argument( 
-  char  **array,
-  int     entries,
-  char   *users
-);
-
-void usage( void  );
-
-void ReadFileIntoChain(
-  char *inname
-);
-
-int MergeText( void );
-
-int CheckForBadWhiteSpace();
-
-void RemoveCopyright();
-
-void RemovePagebreaks();
-
-int RemoveExtraBlankLines();
-
-void FormatToTexinfo( void );
-
-void FormatToWord( void );
-
-void PrintFile(
-   char *out
-);
-
-void DumpList( 
-  Chain_Control  *the_list
-);
-
-void ReleaseFile();
-
-EXTERN boolean          Verbose;                 /* status/debug msgs */
-EXTERN boolean          Statistics;              /* statistics msgs */
-EXTERN boolean          OutputWord;              /* Output MS-Word */
-EXTERN boolean          IncompletesAreErrors;
-EXTERN boolean          InsertTBDs;
-EXTERN Chain_Control    Lines;
-
-EXTERN int              NumberOfAttributes;
-EXTERN int              NumberOfAssociations;
-EXTERN int              NumberOfAbstractTypes;
-EXTERN int              NumberOfDataItems;
-EXTERN int              NumberOfMethods;
-EXTERN int              NumberOfTasks;
-
-
-#endif
diff --git a/doc/tools/pdl2texi/chain.c b/doc/tools/pdl2texi/chain.c
deleted file mode 100644
index 10c96308e9..0000000000
--- a/doc/tools/pdl2texi/chain.c
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
- *  Chain Handler
- *
- *  COPYRIGHT (c) 1997.
- *  On-Line Applications Research Corporation (OAR).
- *  All rights reserved.
- *
- *  $Id$
- */
-
-#include "system.h"
-#include "address.h"
-#include "chain.h"
-#include "isr.h"
-
-/*PAGE
- *
- *  _Chain_Initialize
- *
- *  This kernel routine initializes a doubly linked chain. 
- *
- *  Input parameters:
- *    the_chain        - pointer to chain header
- *    starting_address - starting address of first node
- *    number_nodes     - number of nodes in chain
- *    node_size        - size of node in bytes
- *
- *  Output parameters:  NONE
- */
-
-void _Chain_Initialize( 
-  Chain_Control *the_chain,
-  void           *starting_address,
-  unsigned32     number_nodes,
-  unsigned32     node_size
-)
-{
-  unsigned32  count; 
-  Chain_Node *current;
-  Chain_Node *next;
-
-  count                     = number_nodes;
-  current                   = _Chain_Head( the_chain );
-  the_chain->permanent_null = NULL;
-  next                      = (Chain_Node *)starting_address;
-  while ( count-- ) {
-    current->next  = next;
-    next->previous = current;
-    current        = next;
-    next           = (Chain_Node *)
-                        _Addresses_Add_offset( (void *) next, node_size );
-  }
-  current->next    = _Chain_Tail( the_chain );
-  the_chain->last  = current;
-}
-
-/*PAGE
- *
- *  _Chain_Get_first_unprotected
- */
-
-#ifndef USE_INLINES
-STATIC INLINE Chain_Node *_Chain_Get_first_unprotected(
-  Chain_Control *the_chain
-)
-{ 
-  Chain_Node  *return_node;
-  Chain_Node  *new_first;
-
-  return_node         = the_chain->first;
-  new_first           = return_node->next;
-  the_chain->first    = new_first;
-  new_first->previous = _Chain_Head( the_chain );
-
-  return return_node;
-}
-#endif   /* USE_INLINES */
-
-/*PAGE
- *
- *  _Chain_Get
- *
- *  This kernel routine returns a pointer to a node taken from the
- *  given chain.
- *
- *  Input parameters:
- *    the_chain - pointer to chain header
- * 
- *  Output parameters: 
- *    return_node - pointer to node in chain allocated
- *    CHAIN_END   - if no nodes available
- * 
- *  INTERRUPT LATENCY:
- *    only case
- */
-
-Chain_Node *_Chain_Get(
-  Chain_Control *the_chain
-)
-{
-  ISR_Level          level;
-  Chain_Node *return_node;
-
-  return_node = NULL;
-  _ISR_Disable( level );
-    if ( !_Chain_Is_empty( the_chain ) ) 
-      return_node = _Chain_Get_first_unprotected( the_chain );
-  _ISR_Enable( level ); 
-  return return_node;
-}
-
-/*PAGE
- *
- *  _Chain_Append
- *
- *  This kernel routine puts a node on the end of the specified chain.
- *
- *  Input parameters:
- *    the_chain - pointer to chain header
- *    node      - address of node to put at rear of chain
- * 
- *  Output parameters:  NONE
- * 
- *  INTERRUPT LATENCY:
- *    only case
- */
-
-void _Chain_Append( 
-  Chain_Control *the_chain,
-  Chain_Node    *node
-)
-{
-  ISR_Level level;
-
-  _ISR_Disable( level );
-    _Chain_Append_unprotected( the_chain, node );
-  _ISR_Enable( level ); 
-}
-
-/*PAGE
- *
- *  _Chain_Extract
- *
- *  This kernel routine deletes the given node from a chain.
- *
- *  Input parameters:
- *    node - pointer to node in chain to be deleted
- * 
- *  Output parameters:  NONE
- * 
- *  INTERRUPT LATENCY:
- *    only case
- */
-
-void _Chain_Extract( 
-  Chain_Node *node
-)
-{ 
-  ISR_Level level;
-
-  _ISR_Disable( level );
-    _Chain_Extract_unprotected( node );
-  _ISR_Enable( level );
-}
-
-/*PAGE
- *
- *  _Chain_Insert
- *
- *  This kernel routine inserts a given node after a specified node
- *  a requested chain.
- *
- *  Input parameters:
- *    after_node - pointer to node in chain to be inserted after
- *    node       - pointer to node to be inserted
- * 
- *  Output parameters:  NONE
- * 
- *  INTERRUPT LATENCY:
- *    only case
- */
-
-void _Chain_Insert( 
-  Chain_Node *after_node,
-  Chain_Node *node
-)
-{
-  ISR_Level level;
-
-  _ISR_Disable( level );
-    _Chain_Insert_unprotected( after_node, node );
-  _ISR_Enable( level ); 
-}
-
-/*PAGE
- *
- *  _Chain_Insert_chain 
- *
- *  This routine inserts a chain after the specified node in another
- *  chain. It is assumed that the insert after node is not on the 
- *  second chain. 
- *
- *  Input parameters:
- *    insert_after - insert the chain after this node
- *    to_insert    - the chain to insert
- */ 
- 
-void _Chain_Insert_chain(
-  Chain_Node    *insert_after,
-  Chain_Control *to_insert
-)
-{
-  Chain_Node *first;
-  Chain_Node *last;
-  Chain_Node *insert_after_next;
-
-  first = to_insert->first;
-  last = to_insert->last;
-
-  insert_after_next = insert_after->next;
-
-  insert_after->next = first;
-  first->previous    = insert_after;
-
-  insert_after_next->previous = last;
-  last->next                  = insert_after_next;
-
-  _Chain_Initialize_empty( to_insert );
-}
diff --git a/doc/tools/pdl2texi/chain.h b/doc/tools/pdl2texi/chain.h
deleted file mode 100644
index e9221aec60..0000000000
--- a/doc/tools/pdl2texi/chain.h
+++ /dev/null
@@ -1,347 +0,0 @@
-/*  chain.h
- * 
- *  This include file contains all the constants and structures associated
- *  with the Doubly Linked Chain Handler.
- *
- *  COPYRIGHT (c) 1997.
- *  On-Line Applications Research Corporation (OAR).
- *  All rights reserved.
- *
- *  $Id$
- */
-
-#ifndef __CHAIN_h
-#define __CHAIN_h
-
-#include "address.h"
-
-/*
- *  This is used to manage each element (node) which is placed
- *  on a chain.
- *
- *  NOTE:  Typically, a more complicated structure will use the
- *         chain package.  The more complicated structure will
- *         include a chain node as the first element in its
- *         control structure.  It will then call the chain package
- *         with a pointer to that node element.  The node pointer
- *         and the higher level structure start at the same address
- *         so the user can cast the pointers back and forth.
- */
-
-typedef struct Chain_Node_struct Chain_Node;
-
-struct Chain_Node_struct {
-  Chain_Node *next;
-  Chain_Node *previous;
-};
-
-/*
- *  This is used to manage a chain.  A chain consists of a doubly
- *  linked list of zero or more nodes.
- *
- *  NOTE:  This implementation does not require special checks for
- *         manipulating the first and last elements on the chain.
- *         To accomplish this the chain control structure is 
- *         treated as two overlapping chain nodes.  The permanent
- *         head of the chain overlays a node structure on the
- *         first and permanent_null fields.  The permanent tail
- *         of the chain overlays a node structure on the 
- *         permanent_null and last elements of the structure.
- */
-
-typedef struct {
-  Chain_Node *first;
-  Chain_Node *permanent_null;
-  Chain_Node *last;
-} Chain_Control;
-
-/* 
- *  _Chain_Initialize
- *
- *  This routine initializes the_chain structure to manage the
- *  contiguous array of number_nodes nodes which starts at
- *  starting_address.  Each node is of node_size bytes.
- */
-
-void _Chain_Initialize( 
-  Chain_Control *the_chain,
-  void          *starting_address,
-  unsigned32     number_nodes,
-  unsigned32     node_size
-);
-
-/* 
- *  _Chain_Initialize_empty
- *
- *  This routine initializes the specified chain to contain zero nodes.
- */
-
-STATIC INLINE void _Chain_Initialize_empty(
-  Chain_Control *the_chain
-);
-
-/* 
- *  _Chain_Extract_unprotected
- *
- *  This routine extracts the_node from the chain on which it resides.
- *  It does NOT disable interrupts to insure the atomicity of the
- *  extract operation.
- */
-
-STATIC INLINE void _Chain_Extract_unprotected(
-  Chain_Node *the_node
-);
-
-/* 
- *  _Chain_Extract
- *
- *  This routine extracts the_node from the chain on which it resides.
- *  It disables interrupts to insure the atomicity of the
- *  extract operation.
- */
-
-void _Chain_Extract( 
-  Chain_Node *the_node
-);
-
-/* 
- *  _Chain_Get_unprotected
- *
- *  This function removes the first node from the_chain and returns
- *  a pointer to that node.  If the_chain is empty, then NULL is returned.
- *  It does NOT disable interrupts to insure the atomicity of the
- *  get operation.
- */
-
-STATIC INLINE Chain_Node *_Chain_Get_unprotected( 
-  Chain_Control *the_chain
-);
-
-/* 
- *  _Chain_Get
- *
- *  This function removes the first node from the_chain and returns
- *  a pointer to that node.  If the_chain is empty, then NULL is returned.
- *  It disables interrupts to insure the atomicity of the
- *  get operation.
- */
-
-Chain_Node *_Chain_Get( 
-  Chain_Control *the_chain
-);
-
-/* 
- *  _Chain_Get_first_unprotected
- *
- *  This function removes the first node from the_chain and returns
- *  a pointer to that node.  It does NOT disable interrupts to insure
- *  the atomicity of the get operation.
- */
-
-STATIC INLINE Chain_Node *_Chain_Get_first_unprotected( 
-  Chain_Control *the_chain
-);
-
-/* 
- *  _Chain_Insert_unprotected
- *
- *  This routine inserts the_node on a chain immediately following
- *  after_node.  It does NOT disable interrupts to insure the atomicity
- *  of the extract operation.
- */
-
-STATIC INLINE void _Chain_Insert_unprotected(
-  Chain_Node *after_node,
-  Chain_Node *the_node
-);
-
-/* 
- *  _Chain_Insert
- *
- *  This routine inserts the_node on a chain immediately following
- *  after_node.  It disables interrupts to insure the atomicity
- *  of the extract operation.
- */
-
-void _Chain_Insert( 
-  Chain_Node *after_node,
-  Chain_Node *the_node
-);
-
-/* 
- *  _Chain_Append_unprotected
- *
- *  This routine appends the_node onto the end of the_chain.
- *  It does NOT disable interrupts to insure the atomicity of the
- *  append operation.
- */
-
-STATIC INLINE void _Chain_Append_unprotected(
-  Chain_Control *the_chain,
-  Chain_Node    *the_node
-);
-
-/* 
- *  _Chain_Append
- *
- *  This routine appends the_node onto the end of the_chain.
- *  It disables interrupts to insure the atomicity of the
- *  append operation.
- */
-
-void _Chain_Append( 
-  Chain_Control *the_chain,
-  Chain_Node    *the_node
-);
-
-/* 
- *  _Chain_Prepend_unprotected
- *
- *  This routine prepends the_node onto the front of the_chain.
- *  It does NOT disable interrupts to insure the atomicity of the
- *  prepend operation.
- */
-
-STATIC INLINE void _Chain_Prepend_unprotected(
-  Chain_Control *the_chain,
-  Chain_Node    *the_node
-);
-
-/* 
- *  _Chain_Prepend
- *
- *  This routine prepends the_node onto the front of the_chain.
- *  It disables interrupts to insure the atomicity of the
- *  prepend operation.
- */
-
-STATIC INLINE void _Chain_Prepend(
-  Chain_Control *the_chain,
-  Chain_Node    *the_node
-);
-
-/*
- *  _Chain_Insert_chain
- *
- *  This routine inserts a chain after the specified node in another
- *  chain. It is assumed that the insert after node is not on the
- *  second chain.
- */
-
-void _Chain_Insert_chain(
-  Chain_Node    *insert_after,
-  Chain_Control *to_insert
-);
-
-/* 
- *  _Chain_Head
- *
- *  This function returns a pointer to the first node on the chain.
- */
-
-STATIC INLINE Chain_Node *_Chain_Head(
-  Chain_Control *the_chain
-);
-
-/* 
- *  _Chain_Tail
- *
- *  This function returns a pointer to the last node on the chain.
- */
-
-STATIC INLINE Chain_Node *_Chain_Tail(
-  Chain_Control *the_chain
-);
-
-/* 
- *  _Chain_Is_head
- *
- *  This function returns TRUE if the_node is the head of the_chain and
- *  FALSE otherwise.
- */
-
-STATIC INLINE boolean _Chain_Is_head(
-  Chain_Control *the_chain,
-  Chain_Node    *the_node
-);
-
-/* 
- *  _Chain_Is_tail
- *
- *  This function returns TRUE if the_node is the tail of the_chain and
- *  FALSE otherwise.
- */
-
-STATIC INLINE boolean _Chain_Is_tail(
-  Chain_Control *the_chain,
-  Chain_Node    *the_node
-);
-
-/* 
- *  _Chain_Is_first
- *
- *  This function returns TRUE if the_node is the first node on a chain and
- *  FALSE otherwise.
- */
-
-STATIC INLINE boolean _Chain_Is_first(
-  Chain_Node *the_node
-);
-
-/* 
- *  _Chain_Is_last
- *
- *  This function returns TRUE if the_node is the last node on a chain and
- *  FALSE otherwise.
- */
-
-STATIC INLINE boolean _Chain_Is_last(
-  Chain_Node *the_node
-);
-
-/* 
- *  _Chain_Is_empty
- *
- *  This function returns TRUE if there a no nodes on the_chain and
- *  FALSE otherwise.
- */
-
-STATIC INLINE boolean _Chain_Is_empty(
-  Chain_Control *the_chain
-);
-
-/* 
- *  _Chain_Has_only_one_node
- *
- *  This function returns TRUE if there is only one node on the_chain and
- *  FALSE otherwise.
- */
-
-STATIC INLINE boolean _Chain_Has_only_one_node(
-  Chain_Control *the_chain
-);
-
-/* 
- *  _Chain_Is_null
- *
- *  This function returns TRUE if the_chain is NULL and FALSE otherwise.
- */
-
-STATIC INLINE boolean _Chain_Is_null(
-  Chain_Control *the_chain
-);
-
-/* 
- *  _Chain_Is_null_node
- *
- *  This function returns TRUE if the_node is NULL and FALSE otherwise.
- */
-
-STATIC INLINE boolean _Chain_Is_null_node(
-  Chain_Node *the_node
-);
-
-#include "chain.inl"
-
-#endif
-/* end of include file */
diff --git a/doc/tools/pdl2texi/chain.inl b/doc/tools/pdl2texi/chain.inl
deleted file mode 100644
index 7393fee7b8..0000000000
--- a/doc/tools/pdl2texi/chain.inl
+++ /dev/null
@@ -1,270 +0,0 @@
-/*
- *  This include file contains the bodies of the routines which are
- *  associated with doubly linked chains and inlined.
- *
- *  COPYRIGHT (c) 1997.
- *  On-Line Applications Research Corporation (OAR).
- *  All rights reserved.
- *
- *  $Id$
- */
-
-#ifndef __INLINE_CHAIN_inl
-#define __INLINE_CHAIN_inl
-
-/*PAGE
- *
- *  _Chain_Is_null
- */
-
-STATIC INLINE boolean _Chain_Is_null(
-  Chain_Control *the_chain
-)
-{
-  return ( the_chain == NULL );
-}
-
-/*PAGE
- *
- *  _Chain_Is_null_node
- */
-
-STATIC INLINE boolean _Chain_Is_null_node(
-  Chain_Node *the_node
-)
-{
-  return ( the_node == NULL );
-}
-
-/*PAGE
- *
- *  _Chain_Head
- */
-
-STATIC INLINE Chain_Node *_Chain_Head(
-  Chain_Control *the_chain
-)
-{
-   return (Chain_Node *) the_chain;
-}
-
-/*PAGE
- *
- *  _Chain_Tail
- */
-
-STATIC INLINE Chain_Node *_Chain_Tail(
-  Chain_Control *the_chain
-)
-{
-   return (Chain_Node *) &the_chain->permanent_null;
-}
-
-/*PAGE
- *
- *  _Chain_Is_empty
- */
-
-STATIC INLINE boolean _Chain_Is_empty(
-  Chain_Control *the_chain
-)
-{
-  return ( the_chain->first == _Chain_Tail( the_chain ) );
-}
-
-/*PAGE
- *
- *  _Chain_Is_first
- */
-
-STATIC INLINE boolean _Chain_Is_first(
-  Chain_Node *the_node
-)
-{
-  return ( the_node->previous == NULL );
-}
-
-/*PAGE
- *
- *  _Chain_Is_last
- */
-
-STATIC INLINE boolean _Chain_Is_last(
-  Chain_Node *the_node
-)
-{
-  return ( the_node->next == NULL );
-}
-
-/*PAGE
- *
- *  _Chain_Has_only_one_node
- */
-
-STATIC INLINE boolean _Chain_Has_only_one_node(
-  Chain_Control *the_chain
-)
-{
-  return ( the_chain->first == the_chain->last );
-}
-
-/*PAGE
- *
- *  _Chain_Is_head
- */
-
-STATIC INLINE boolean _Chain_Is_head(
-  Chain_Control *the_chain,
-  Chain_Node    *the_node
-)
-{
-   return ( the_node == _Chain_Head( the_chain ) );
-}
-
-/*PAGE
- *
- *  _Chain_Is_tail
- */
-
-STATIC INLINE boolean _Chain_Is_tail(
-  Chain_Control *the_chain,
-  Chain_Node    *the_node
-)
-{
-   return ( the_node == _Chain_Tail( the_chain ) );
-}
-
-/*PAGE
- *
- *  Chain_Initialize_empty
- */
-
-STATIC INLINE void _Chain_Initialize_empty(
-  Chain_Control *the_chain
-)
-{
-  the_chain->first          = _Chain_Tail( the_chain );
-  the_chain->permanent_null = NULL;
-  the_chain->last           = _Chain_Head( the_chain );
-}
-
-/*PAGE
- *
- *  _Chain_Extract_unprotected
- */
-
-STATIC INLINE void _Chain_Extract_unprotected(
-  Chain_Node *the_node
-)
-{
-  Chain_Node *next;
-  Chain_Node *previous;
-  
-  next           = the_node->next;
-  previous       = the_node->previous;
-  next->previous = previous;
-  previous->next = next;
-}
-
-/*PAGE
- *
- *  _Chain_Get_first_unprotected
- */
-
-STATIC INLINE Chain_Node *_Chain_Get_first_unprotected( 
-  Chain_Control *the_chain
-)
-{ 
-  Chain_Node  *return_node;
-  Chain_Node  *new_first;
-
-  return_node         = the_chain->first;
-  new_first           = return_node->next;
-  the_chain->first    = new_first;
-  new_first->previous = _Chain_Head( the_chain );
-
-  return return_node;
-}
-
-/*PAGE
- *
- *  Chain_Get_unprotected
- */
-
-STATIC INLINE Chain_Node *_Chain_Get_unprotected( 
-  Chain_Control *the_chain
-)
-{ 
-  if ( !_Chain_Is_empty( the_chain ) ) 
-    return _Chain_Get_first_unprotected( the_chain );
-  else
-    return NULL;
-}
-
-/*PAGE
- *
- *  _Chain_Insert_unprotected
- */
-
-STATIC INLINE void _Chain_Insert_unprotected(
-  Chain_Node *after_node,
-  Chain_Node *the_node
-)
-{
-  Chain_Node *before_node;
-  
-  the_node->previous    = after_node;
-  before_node           = after_node->next;
-  after_node->next      = the_node; 
-  the_node->next        = before_node; 
-  before_node->previous = the_node; 
-}
-
-/*PAGE
- *
- *  _Chain_Append_unprotected
- */
-
-STATIC INLINE void _Chain_Append_unprotected(
-  Chain_Control *the_chain,
-  Chain_Node    *the_node
-)
-{
-  Chain_Node *old_last_node;
-   
-  the_node->next      = _Chain_Tail( the_chain );
-  old_last_node       = the_chain->last;
-  the_chain->last     = the_node;
-  old_last_node->next = the_node;
-  the_node->previous  = old_last_node;
-}
-
-/*PAGE
- *
- *  _Chain_Prepend_unprotected
- */
-
-STATIC INLINE void _Chain_Prepend_unprotected(
-  Chain_Control *the_chain,
-  Chain_Node    *the_node
-)
-{
-  _Chain_Insert_unprotected( _Chain_Head( the_chain ), the_node );
-
-}
-
-/*PAGE
- *
- *  _Chain_Prepend
- */
-
-STATIC INLINE void _Chain_Prepend(
-  Chain_Control *the_chain,
-  Chain_Node    *the_node
-)
-{
-  _Chain_Insert( _Chain_Head( the_chain ), the_node );
-}
-
-#endif
-/* end of include file */
diff --git a/doc/tools/pdl2texi/drive.d b/doc/tools/pdl2texi/drive.d
deleted file mode 100644
index ff41d5ad38..0000000000
--- a/doc/tools/pdl2texi/drive.d
+++ /dev/null
@@ -1,874 +0,0 @@
-OBJECT:  Drive
-  DESCRIPTION:
-    This object provides an interface to the elevation/azimuth
-    drive system(ECA).  
-  THEORY OF OPERATION:
-    This object encapsulates the turret drive.  The object provides
-    an interface to control the turret drive.  A method is provided
-    to set the azimuth and elevation rate of the drive.  Methods are
-    provided to request the drive to run in stabilized or power mode
-    and set the drive speed to high or low.  A method is also provided
-    to allow for drift adjust.  
-
-    This object also tracks drive system on hours.  It gets the hours
-    from the EEPROM data, allows the hours to be set, updates the
-    hours via the activation and deactivation of the drive, and
-    provides access to the hours.
-
-    The object also provides methods to access azimuth and elevation
-    displacement, and methods to process changes in the hardware
-    discretes drive on, stabilized mode, thermal fault and fault.
-  
-    The object also provides methods to enable and disable
-    both the remote and turret power interlocks which determine if
-    the drive can be driven by the remote or turret handstation
-    respectively.   
-
-ATTRIBUTE DESCRIPTIONS:
-
-
-ATTRIBUTE:  Azimuth_displacement
-  DESCRIPTION:
-    This attribute represents the current azimuth displacement
-    of the turret.
-  TYPE: floating point
-  RANGE: ???
-  UNITS: degrees
-  REQUIREMENTS:
-    AFS 8.2.11 Receive Azimuth Displacement and Elevation Displacement
-    AIS 5.2.6 Azimuth Displacement analog
-
-
-ATTRIBUTE:  Azimuth_rate
-  DESCRIPTION:
-    Azimuth rate command for movement of the turret. 
-  TYPE: floating point
-  UNITS: degrees / second
-  DEFAULTS: none
-  REQUIREMENTS:
-    AFS 8.2.3 Send Azimuth and Elevation Rate to ECA
-    AIS 5.3.4 Elevation Rate analog
-    AIS 5.3.5 Azimuth Rate analog
-
-
-ATTRIBUTE:  Drift_adjust
-  DESCRIPTION:
-    This attribute represents the current drift adjustment mode
-    of the ECA turret drive.
-  TYPE: enumerated
-  MEMBERS:
-    ADJUST_OFF - drift adjust mode is OFF
-    ADJUST_ON  - drift adjust mode is ON
-  REQUIREMENTS:
-    AFS 8.2.6 Capable of turret drift adjustment
-    AIS 5.3.1 Drift Adjust discrete
- 
-
-ATTRIBUTE:  Drive_on
-  DESCRIPTION:
-    Current status of the turret drive.  The turret drive may either be
-    switched on or off.
-  TYPE: boolean
-  MEMBERS:
-    FALSE - turret drive is off
-    TRUE  - turret drive is on
-  DEFAULTS: FALSE
-  REQUIREMENTS:
-    AFS 8.2.9 Monitor Drive System On
-    AIS 5.2.1 Drive System On discrete
-
-
-ATTRIBUTE:  Drive_system_hours
-  DESCRIPTION: 
-    Total number of hours drive has been activated. 
-  TYPE: integer
-  RANGE: 0 - +INFINITY 
-  UNITS: seconds
-  REQUIREMENTS:
-    AFS 4.11 Respond to CDT elapsed time indicator key
-
-
-ATTRIBUTE:  Elevation_displacement 
-  DESCRIPTION:
-    This attribute represents the current elevation displacement
-    of the turret.
-  TYPE: floating point
-  RANGE: ???
-  UNITS: degrees
-  REQUIREMENTS:
-    AFS 8.2.11 Receive Azimuth Displacement and Elevation Displacement
-    AIS 5.2.7 Elevation Displacement analog
-
-
-ATTRIBUTE:  Elevation_rate
-  DESCRIPTION:
-    Elevation rate command for movement of the turret.
-  TYPE: floating point
-  UNITS: degrees / second
-  DEFAULTS: none
-  REQUIREMENTS:
-    AFS 8.2.3 Send Azimuth and Elevation Rate to ECA
-    AIS 5.3.4 Elevation Rate analog
-    AIS 5.3.5 Azimuth Rate analog
- 
-
-ATTRIBUTE:  Fault
-  DESCRIPTION:
-    This attribute denotes whether a turret malfunction has occurred.
-  TYPE: boolean
-  MEMBERS:
-    TRUE  - a turret malfunction has occurred
-    FALSE - no turret malfunction has occurred
-  DEFAULTS: FALSE
-  REQUIREMENTS:
-    AFS 8.2.7 Check for ECA failure indication
-    AIS 5.2.4 Turret Drive Malfunction discrete
-
-
-ATTRIBUTE:  Mode
-  DESCRIPTION:
-    Current requested drive mode.
-  TYPE: enumerated
-  MEMBERS:
-    POWER - operate in POWER mode
-    STAB  - operate in STABILIZED mode
-  DEFAULTS: POWER
-  REQUIREMENTS:
-
-
-ATTRIBUTE:  Remote_power_interlock_position
-  DESCRIPTION:
-    This is the status of the remote's power interlock.
-  TYPE: enumerated
-  MEMBERS:
-    OPEN   - relay is open
-    CLOSED - relay is closed
-  REQUIREMENTS:  
-    AFS 8.2.12 Control Power Interlock
- 
-
-ATTRIBUTE:  Speed
-  DESCRIPTION:
-    Current speed mode of the ECA turret drive.
-  TYPE: enumerated
-  MEMBERS:
-    LOW_SPEED  - turret drive does not allow the maximum rate
-    HIGH_SPEED - turret drive allows the maximum rate
-  DEFAULTS:  HIGH 
-  REQUIREMENTS:
-    AFS 8.2.5 Control Turret
-    AIS 5.3.3 Turret High Speed Mode discrete
-
-
-ATTRIBUTE:  Stabilized_mode
-  DESCRIPTION:
-    Current drive mode indicating whether the ECA electronics are
-    operating in Stabilized mode or Power mode.
-  TYPE: boolean
-  MEMBERS:
-    FALSE - not operating in STABILIZED mode
-    TRUE  - operating in STABILIZED mode
-  DEFAULTS: FALSE
-  REQUIREMENTS:
-    AFS 8.2.8 Monitor Turret Stab Mode Indicate
-    AIS 5.2.3 Turret Stab Mode Indicate discrete
-
-
-ATTRIBUTE:  State
-  DESCRIPTION:
-    Current state of the turret drive.
-  TYPE: enumerated
-  MEMBERS:
-    ACTIVATED   - turret drive is ON and active
-    DEACTIVATED - turret drive is ON but deactivated
-  DEFAULTS: DEACTIVATED
-  REQUIREMENTS:
-    AFS 8.2.4 Set Plam Grips Active
-    AIS 5.3.2 Palm Grips Active discrete
-
-
-ATTRIBUTE:  Thermal_fault
-  DESCRIPTION:
-    This attribute denotes whether a turret thermal fault has occurred.
-  TYPE: boolean
-  MEMBERS:
-    TRUE  - a turret thermal fault has occurred
-    FALSE - no turret thermal fault has occurred
-  DEFAULTS: FALSE
-  REQUIREMENTS:
-    AFS 8.2.7 Check for ECA failure indication
-    AIS 5.2.2 Turret ECA Thermal Failure discrete
-
-
-ATTRIBUTE:  Turret_power_interlock_position
-  DESCRIPTION:
-    This is the status of the turret's power interlock.
-  TYPE: enumerated
-  MEMBERS:
-    OPEN   - relay is open
-    CLOSED - relay is closed
-  REQUIREMENTS:  
-    AFS 8.2.12 Control Power Interlock
- 
-
-ASSOCIATION DESCRIPTIONS: none
-
-ABSTRACT TYPE DESCRIPTIONS:
-
-ABSTRACT TYPE:  Drift_adjust_t
-  DESCRIPTION:
-    This abstract type represents the current drift adjustment mode
-    of the ECA turret drive.
-  VISIBILITY: public
-  DERIVATION:  enumerated
-  MEMBERS:  
-    ADJUST_OFF = 0 - drift adjust mode is OFF
-    ADJUST_ON  = 1 - drift adjust mode is ON
-  REQUIREMENTS:
-    AIS 5.3.1 Drift Adjust discrete
-
-ABSTRACT TYPE: Interlock_status
-  DESCRIPTION:
-    An interlock state being OPEN or CLOSED.
-  VISIBILITY: private
-  DERIVATION: enumerated
-  MEMBERS:
-    OPEN   - interlock relay is in the open state
-    CLOSED - interlock relay is in the closed state
-  REQUIREMENTS: 
-    AFS 8.2.12 Control Power Interlock
-
-ABSTRACT TYPE:  Mode
-  DESCRIPTION:
-    This type specifies the drive mode of the ECA turret drive.
-  VISIBILITY: public  
-  DERIVATION: enumerated
-  MEMBERS:
-    POWER - operate in POWER mode
-    STAB  - operate in STABILIZED mode
-
-ABSTRACT TYPE:  Speed
-  DESCRIPTION:
-    This type specifies the Speed mode of the ECA turret drive.
-  VISIBILITY: public
-  DERIVATION:  enumerated
-  MEMBERS:  
-    LOW_SPEED  = 0 - turret drive does not allow the maximum rate
-    HIGH_SPEED = 1 - turret drive allows the maximum rate
-  REQUIREMENTS:
-    AIS 5.3.3 Turret High Speed Mode discrete
-
-ABSTRACT TYPE:  State_t
-  DESCRIPTION:
-    This type specifies the state of the turret drive.
-  VISIBILITY: private
-  DERIVATION:  enumerated
-  MEMBERS:  
-    DEACTIVATED - turret drive is ON but deactivated
-    ACTIVATED   - turret drive is ON and active
-
-DATA ITEM DESCRIPTIONS:
-
-DATA ITEM: Azimuth_displacement_control
-  DESCRIPTION:
-    This data item contains the Azimuth_displacement analog control
-    information.
-  TYPE: handle
-
-
-DATA ITEM: Azimuth_rate_control
-  DESCRIPTION:
-    This data item contains the Azimuth_rate analog control
-    information.
-  TYPE: handle
-
-
-DATA ITEM: Drift_adjust_control
-  DESCRIPTION:
-    This data item contains the Drift_adjust discrete control
-    information.
-  TYPE: handle
-
-
-DATA ITEM: Drive_activate_control
-  DESCRIPTION:
-    This data item contains the activate drive relay control information. 
-  TYPE: handle
-
-
-DATA ITEM: Drive_activated_timestamp
-  DESCRIPTION:
-    This data item stores the timestamp of the last time the drive was
-    activated.  It will be used to compute the activated time when a
-    deactivate is received.
-  TYPE: time_t
-  DEFAULT: none
-  NOTES:
-    see C library for data type information ??? 
-
-
-DATA ITEM: Drive_on
-  DESCRIPTION:
-    The current status of the turret drive representing whether
-    the drive is on or off.
-  TYPE: boolean
-  DEFAULT: FALSE
-
-
-DATA ITEM: Drive_on_control
-  DESCRIPTION:
-    This data item contains the Drive_on discrete flag control
-    information.
-  TYPE: handle
-
-
-DATA ITEM: Drive_system_hours
-  DESCRIPTION:
-    This data item stores the actual time the drive has been active.
-    This value will be output by the Get_time method and will be set
-    by the Set_time method.
-  TYPE: integer 
-  RANGE: 0 - +INFINITY 
-  UNITS: seconds
-  DEFAULT: 0
-
-
-DATA ITEM: Elevation_rate_control
-  DESCRIPTION:
-    This data item contains the Elevation_rate analog control 
-    information.
-  TYPE: handle
-
-
-DATA ITEM: Elevation_displacement_control
-  DESCRIPTION:
-    This data item contains the Elevation_displacement analog control
-    information.
-  TYPE: handle
-
-
-DATA ITEM: Fault_control
-  DESCRIPTION:
-    This data item contains the Fault discrete flag control
-    information.
-  TYPE: handle
-
-
-DATA ITEM: Remote_power_interlock_control
-  DESCRIPTION:
-    This data item contains the Remote_power_interlock relay control
-    information.
-  TYPE: handle
-
-
-DATA ITEM: Stabilized_mode_control
-  DESCRIPTION:
-    This data item contains the Stabilized_mode discrete flag control
-    information.
-  TYPE: handle
-
-
-DATA ITEM: State 
-  DESCRIPTION:
-    The current state of the turret drive representing an activated or
-    deactivated drive.
-  TYPE: State_t
-  DEFAULT: DEACTIVATED
-  
-
-DATA ITEM: Thermal_fault_control
-  DESCRIPTION:
-    This data item contains the Thermal_fault discrete flag control
-    information.
-  TYPE: handle
-
-
-DATA ITEM: Turret_power_interlock_control
-  DESCRIPTION:
-    This data item contains the Turret_power_interlock relay control
-    information.
-  TYPE: handle
-
-
-DATA ITEM: Turret_power_interlock_status
-  DESCRIPTION:
-    The accurate status of the turret power interlock relay.  This value
-    will be used to control the relay during a transition from the remote
-    back to the turret console.
-  TYPE: Interlock_status
-  DEFAULT: none
-
-
-METHODS DESCRIPTIONS:
-
-METHOD:  Activate 
-  DESCRIPTION:
-    This method activates the turret drive system.  A timestamp of the
-    activation is recorded to keep a running count of hours the drive has
-    been active.
-  VISIBILITY:  public
-  INPUTS:  none
-  OUTPUTS: none
-  REQUIREMENTS:
-    AFS 8.2.4 Set Palm Grips Active
-    AIS 5.3.2 Palm Grips Active discrete
-  PDL:
-
-    if Drive_on
-      if State is DEACTIVATED
-        close the Drive_activate_control relay using the Relay object
-        timestamp Drive_activated_timestamp for Drive_system_hours
-        running total
-        set State to ACTIVATED
-      else
-        already in the ACTIVATED state
-
-
-METHOD:  Create
-  DESCRIPTION:
-    This method initializes the Turret Drive object.  All monitors of 
-    turret drive signals are initialized and/or registered.  All turret
-    drive characteristics are set to their initial values.
-  VISIBILITY:  public
-  INPUTS: none
-  OUTPUTS: none
-  PDL:
-
-    set State to DEACTIVATED
-
-    get Drive_system_hours to initialize the elapsed drive time
-      from the Statistics (eeprom database ???) object - this is
-        stored upon shutdown in eeprom
-
-    create Fault_control using Discrete_flag object with the
-     following attributes 
-      true_sense     - DISCRETE_FLAG_TRUE_IS_1
-      is_buffered    - false
-      is_monitored   - true
-      period         - 10ms
-      change_routine - Change_fault
-    change fault using initial value returned from create Fault_control
- 
-    create Thermal_fault_control using Discrete_flag object with
-     the following attributes 
-      true_sense     - DISCRETE_FLAG_TRUE_IS_0
-      is_buffered    - false
-      is_monitored   - true
-      period         - 10ms
-      change_routine - Change_thermal_fault
-    change thermal fault using initial value returned from create
-     Thermal_fault_control
-
-    create Stabilized_mode_control using Discrete_flag object with the
-     following attributes  
-      true_sense     - DISCRETE_FLAG_TRUE_IS_1
-      is_buffered    - false
-      is_monitored   - true
-      period         - 10ms 
-      change_routine - Change_stabilized_mode
-    change stabilized mode using initial value returned from create
-     Stabilized_mode_control
-
-    create Drive_on_control using Discrete_flag object with the 
-     following attributes 
-      true_sense     - DISCRETE_FLAG_TRUE_IS_1
-      is_buffered    - false
-      is_monitored   - true
-      period         - 10ms
-      change_routine - Change_drive_on
-    change drive on using initial value returned from create
-     Drive_on_control
-
-    create Azimuth_rate_control using the Linear_dac object
-     with the following attributes:
- none    voltage_low   - -10
-      voltage_high  - +10
-      logical_low   - -60
-      logical_high  - +60
-      is_buffered   - false
-      period        - none
-      initial_value - 0
-
-    create Elevation_rate_control using the Linear_dac object with the
-     following attributes:
-      voltage_low   - -10
-      voltage_high  - +10
-      logical_low   - -60
-      logical_high  - +60
-      is_buffered   - false
-      period        - none
-      initial_value - 0
-
-    create Azimuth_displacement_control using the Linear_adc object with
-     the following attributes:
-      voltage low    - 
-      voltage high   - 
-      logical low    - 
-      logical high   - 
-      is_buffered    - false 
-      is_monitored   - false
-      period         - none
-      change_routine - none
-      delta          - none
-
-    create Elevation_displacement_control using the Linear_adc object 
-     with the following attributes:
-      voltage low    - 
-      voltage high   - 
-      logical low    - 
-      logical high   - 
-      is_buffered    - false
-      is_monitored   - false
-      period         - none
-      change_routine - none
-      delta          - none
-
-    create Drive_activate_control using the Relay object with the
-     following attributes:
-      open_sense    - RELAY_OPEN_IS_0
-      is_buffered   - false
-      period        - none
-      initial_state - RELAY_OPEN
-
-    create Turret_power_interlock_control using the Relay object with 
-     the following attributes:
-      open_sense    - RELAY_OPEN_IS_0
-      is_buffered   - false
-      period        - none
-      initial_state - RELAY_OPEN
-    set Turret_power_interlock_status to OPEN
-
-    create Remote_power_interlock_control using the Relay
-     object with the following attributes:
-      open_sense    - RELAY_OPEN_IS_0
-      is_buffered   - false
-      period        - none
-      initial_state - RELAY_OPEN
-
-    create Drift_adjust_control using the Discrete_out object with 
-     following attributes:
-      is_buffered   - false
-      period        - 10ms
-      initial_value - ADJUST_OFF
-
-
-METHOD:  Deactivate
-  DESCRIPTION:
-    This method deactivates the turret drive system.  A timestamp of the
-    activation is recorded to keep a running count of hours the drive
-    has been active.
-  VISIBILITY:  public
-  INPUTS:  none
-  OUTPUTS: none
-  REQUIREMENTS:
-    AFS 8.2.4 Set Plam Grips Active
-    AIS 5.3.2 Palm Grips Active discrete
-  PDL:
-
-    if Drive_on
-      if State is DEACTIVATED 
-        timestamp deactivate for Drive_system_hours running total
-        deactivate drive by opening the Drive_activate_control relay
-        using the Relay object
-        compute running time since last activate
-        add running time to Drive_system_hours
-        set State to DEACTIVATED
-      else
-        already in the DEACTIVATED state
- 
-
-METHOD:  Disable_remote_power_interlock
-  DESCRIPTION:
-    This method disables the turret power interlock safety preventing
-    the turret from being driven by the remote's handstation. 
-  VISIBILITY:  public
-  INPUTS:  none
-  OUTPUTS: none
-  REQUIREMENTS:
-    AFS 8.2.12 Control Power Interlock
-  PDL:
-
-    open the remote power interlock relay
-    return the turret relay to its designated state defined by the
-      Turret_power_interlock_status
- 
-
-METHOD:  Disable_turret_power_interlock
-  DESCRIPTION:
-    This method disables the turret power interlock safety preventing
-    the turret from being driven by the turret's handstation. 
-  VISIBILITY:  public
-  INPUTS: none
-  OUTPUTS: none
-  REQUIREMENTS:
-    AFS 8.2.12 Control Power Interlock
-  PDL:
-
-    Deactivate the Drive object
-    open the turret power interlock relay
-    set Turret_power_interlock_status to OPEN
-
-
-METHOD:  Enable_remote_power_interlock
-  DESCRIPTION:
-    This method will enable the remote power interlock to allow
-    the turret to be driven from the remote station.
-  VISIBILITY:  public
-  INPUTS: none
-  OUTPUTS: none
-  REQUIREMENTS:
-    AFS 8.2.12 Control Power Interlock
-  NOTES:
-    At this time the turret's power interlock is opened to avoid
-    having both relays closed at a time.
-  PDL:
-
-    if Drive_on
-      open the turret power interlock relay using the Relay object
-      close the remote power interlock relay using the Relay object
-
-
-METHOD:  Enable_turret_power_interlock
-  DESCRIPTION:
-    This method will enable the turret power interlock to allow
-    the turret to be driven from the turret station.
-  VISIBILITY:  public
-  INPUTS: none
-  OUTPUTS: none
-  REQUIREMENTS:
-    AFS 8.2.12 Control Power Interlock
-  NOTES:
-    At this time the closed state is saved to allow the correct state
-    to be returned to in the event a remote overrides the turret and the 
-    remote gives up its control, we must return to the previous state of
-    the turret power interlock.
-  PDL:
-
-    if Drive_on
-      close the turret power interlock relay using the Relay object
-
-      set the Turret_power_interlock_status to CLOSED to return to
-        when remote gives up control
-
-
-METHOD: Get_AZ_EL_displacement  
-  DESCRIPTION:
-    This method returns the current azimuth displacement and elevation
-    displacement from the ECA.
-  VISIBILITY:  public
-  INPUTS:  none
-  OUTPUTS:
-    current azimuth displacement value
-    current elevation displacement value
-  REQUIREMENTS:
-    AFS 8.2.11 Receive Azimuth Displacement and Elevation Displacement
-    AIS 5.2.6 Azimuth Displacement analog
-    AIS 5.2.7 Elevation Displacement analog
-  NOTES:
-    Currently supported as an on-demand type of signal.  May change to a
-    monitored analog signal.
-  PDL:
-    
-    if Drive_on
-      get and return current azimuth displacement and current elevation
-      displacement from ECA using the Linear_ADC object
- 
-
-METHOD:  Get_hours
-  DESCRIPTION:
-    This method returns the current value contained in the elapsed
-    turret drive active time.
-  VISIBILITY:  public
-  INPUTS: none
-  OUTPUTS:
-    elapsed turret drive time - the current elasped turret drive time
-  REQUIREMENTS:
-  REFERENCES:
-    AFS 4.11 Respond to CDT elapsed time indicator key
-  NOTES:
-  PDL:
-
-    return the current value for Drive_system_hours
-
-
-METHOD:  Set_drift_adjust
-  DESCRIPTION:
-    This method provides the ability to set the drift adjust to the 
-    value represented by the handstation.  Drift adjust is either ON
-    or OFF.
-  VISIBILITY:  public
-  INPUTS:
-    value - new drift adjust value 
-      ADJUST_OFF - drift adjust mode is OFF
-      ADJUST_ON  - drift adjust mode is ON
-  OUTPUTS: none
-  REQUIREMENTS:
-    AFS 8.2.6 Capable of turret drift adjustment
-    AIS 5.3.1 Drift Adjust discrete
-  PDL:
- 
-    if Drive_on
-      set drift adjust discrete to value using Discrete_out object
-
-METHOD:  Set_hours
-  DESCRIPTION:
-    This method will set the turret drive activated elapsed time value
-    to the specified value.
-  VISIBILITY:  public
-  INPUTS:
-    new_elapsed_time_value - specified turret drive elapsed time value
-  OUTPUTS: none
-  REQUIREMENTS:
-    AFS 4.11 Respond to CDT elapsed time indicator key
-  PDL:
- 
-    set the value of Drive_system_hours to the value specified by
-      new_elapsed_time_value
- 
-
-METHOD: Set_mode
-  DESCRIPTION:
-    This method sets the requested mode of the turret drive.
-  VISIBILITY: public
-  INPUTS:
-    mode - new requested mode
-      POWER - operating in POWER mode
-      STAB  - operating in STABILIZED mode
-  OUTPUTS:  none
-  REQUIREMENTS:
-  PDL:
-    if mode is POWER
-      set drive mode switchlight to PWR_LAMP using the Console object
-    else if mode is STAB
-      set drive mode switchlight to STB_LAMP using the Console object
-
-    
-METHOD:  Set_rate
-  DESCRIPTION:
-    This method provides the ability to send azimuth and elevation rates
-    to the drive.  Two parameters are used as input to designate the
-    corresponding rates.  These parameters must be in degrees per second.
-  VISIBILITY:  public
-  INPUTS:
-    azimuth rate   - new azimuth rate in degress per second
-    elevation rate - new elevation rate in degress per second
-  OUTPUTS: none
-  REQUIREMENTS:
-    AFS 8.2.3 Send Azimuth and Elevation Rate to ECA
-    AIS 5.3.4 Elevation Rate analog
-    AIS 5.3.5 Azimuth Rate analog
-  NOTES:
-    May need to couple these analogs with an interface driver to close
-    the window between writes and conversions.
-  PDL:
-
-    if Drive_on
-      send the new azimuth rate to the Azimuth analog
-      send the new elevation rate to Elevation analog
-
-
-METHOD:  Set_speed
-  DESCRIPTION:
-    This method sets the turret drive speed mode to the specified value
-    either high or low based on user input.
-  VISIBILITY:  public
-  INPUTS:
-    new_speed_value - new value to set the turret speed to
-      LOW_SPEED  - turret drive does not allow the maximum rate
-      HIGH_SPEED - turret drive allows the maximum rate
-  OUTPUTS: none
-  REQUIREMENTS:
-    AFS 8.2.5 Control Turret
-    AIS 5.3.3 Turret High Speed Mode discrete
-  PDL:
-
-    if Drive_on
-      set turret drive high speed mode discrete to the new_speed_value
-       using Discrete_out object
-
-
-METHOD:  Change_drive_on
-  DESCRIPTION:
-    This method will be used to report a transition of the drive system
-    on discrete.
-  VISIBILITY:  private
-  INPUTS:
-    value - new drive system on value 
-      FALSE - indicates drive not on
-      TRUE  - indicates drive on
-  OUTPUTS: none
-  REQUIREMENTS:
-    AFS 8.2.9 Monitor Drive System On
-    AIS 5.2.1 Drive System On discrete
-  REFERENCES:
-  NOTES:
-  PDL:
-
-    set Drive_on to value
-    if Drive_on is FALSE
-      deactivate the turret drive using the Drive object
-
-
-METHOD:  Change_fault
-  DESCRIPTION:
-    This method will be used to indicate that a turret malfunction
-    has been recognized by the turret drive.
-  VISIBILITY:  private
-  INPUTS:
-    value - new value resulting from a fault discrete change
-      FALSE - indicates no fault
-      TRUE  - indicates fault
-  OUTPUTS: none
-  REQUIREMENTS:
-    AFS 8.2.7 Check for ECA failure indication
-    AIS 5.2.4 Turret Drive Malfunction discrete
-  PDL:
- 
-    if value
-      send turret fault message using the Display object 
-    else 
-      return
-
-
-METHOD:  Change_stabilized_mode
-  DESCRIPTION:
-    This method will determine a transition from STAB mode to POWER mode.
-    It will set the stab mode lamp on the console.
-  VISIBILITY:  private
-  INPUTS:
-    value - new value resulting from a stab mode discrete change
-      FALSE - indicates not stabilized mode
-      TRUE -  indicates stabilized mode
-  OUTPUTS: none
-  REQUIREMENTS:
-    AFS 8.2.8 Monitor Turret Stab Mode Indicate
-    AIS 5.2.3 Turret Stab Mode Indicate discrete
-  PDL:
-
-    if value 
-      set STAB mode light to LAMP_ON using the Console object
-    else value indicates not stabilized mode
-      set STAB mode light to LAMP_OFF using the Console object
-
-
-METHOD:  Change_thermal_fault
-  DESCRIPTION:
-    This method will be used to indicate that a thermal fault has been
-     recognized by the turret drive.
-  VISIBILITY:  private
-  INPUTS:
-    value - new value resulting from a thermal fault discrete change
-      FALSE - indicates no thermal fault
-      TRUE  - indicates thermal fault
-  OUTPUTS: none
-  REQUIREMENTS:
-    AFS 8.2.7 Check for ECA failure indication
-    AIS 5.2.2 Turret ECA Thermal Failure discrete
-  PDL:
- 
-    if value
-      send thermal fault message using the Display object
-    else 
-      return
-
-END OBJECT: Drive
diff --git a/doc/tools/pdl2texi/isr.h b/doc/tools/pdl2texi/isr.h
deleted file mode 100644
index b9a78fabbc..0000000000
--- a/doc/tools/pdl2texi/isr.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- *  COPYRIGHT (c) 1997.
- *  On-Line Applications Research Corporation (OAR).
- *  All rights reserved.
- *
- *  $Id$
- */
-
-
-#ifndef __ISR_h
-#define __ISR_h
-
-typedef unsigned32 ISR_Level;
-
-#define _ISR_Disable
-#define _ISR_Enable
-
-#endif
diff --git a/doc/tools/pdl2texi/main.c b/doc/tools/pdl2texi/main.c
deleted file mode 100644
index 3c52d4871a..0000000000
--- a/doc/tools/pdl2texi/main.c
+++ /dev/null
@@ -1,3615 +0,0 @@
-/*
- *  main.c
- *  
- *  This program error checks the OAR PDL and converts it into 
- *  It works by reading the input file into a linked list of lines
- *  and then performing sweeps on that list until all formatting is
- *  complete.
- *
- *  FEATURES:
- *    + rudimentary statistics
- *    + forgiveness features 
- *    + output in Texinfo format
- *    + output in a form that a sibling MS-Word VBA program can format
- * 
- *  CHECKS PERFORMED:
- *    + unable to open file
- *    + unexpected end of file
- *    + line should have a colon
- *    + basic text (to right or below) associated with keyword
- *      improperly placed
- *    + an "incomplete marker" is still in place
- *    + missing keywords within a subsection
- *    + duplicated keywords withing a subsection
- *    + subsections in correct order
- *    + section header indicates no subsections and there are subsections
- *    + section header indicates subsections and there are no subsections
- *    + inconsistent spacing in RAW text.  This tends to be 1st line with
- *      text is indented further than a subsequent line.
- *    + missing components on line (incomplete)
- *    + invalid repitition of a subsection
- *    + type keyword validated for class, type, and spacing between
- *    + both members and range are present
- *    + neither members and range are present
- *    + enumerated types and attributes have members
- *    + non-enumerated types and attributes have ranges.
- *    + Object name and end object have the same name
- *    + booleans in attribute section list both true and false
- *    + task synchronization keyword is checked.  There must be a valid 
- *      type of synchronization primitive and a description when expected.
- *    + sections in correct order
- *
- *  INTERNAL ERRORS:
- *    + attempting to reformat an already formatted line
- *    + end of processing reached and no formatting assigned to line
- *
- *  CHECKS NOT PERFORMED:
- *
- *  TODO:
- *
- *  IDEAS NOT IMPLEMENTED:
- *    + smarter reporting of sections not in the right order
- *    + task which uses multiple synchronization types
- *    + improved error messages
- *    + no introductions inserted to sections
- *    + recognize special "symbols" like infinity, +-, etc.
- *
- *  QUESTIONS:
- *    + "what do I know" is actually a table and should not be reformatted.
- *
- *  COPYRIGHT (c) 1997.
- *  On-Line Applications Research Corporation (OAR).
- *  All rights reserved.
- *
- *  $Id$
- */
-
-#include <assert.h>
-#include <ctype.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-/* XXX -- just for testing -- these should be set by options */
-char DocsNextNode[256]     = "";
-char DocsPreviousNode[256] = "";
-char DocsUpNode[256]       = "";
-
-extern int   optind;     /* Why is this not in <stdlib.h>? */
-extern char *optarg;     /* Why is this not in <stdlib.h>? */
-
-#ifndef NAME_MAX
-#define NAME_MAX      14 /* Why is the one in limits.h not showing up? */
-#endif
-#define INIT_DATA
-#define EXTERN
-
-#include "base.h"
-
-FILE           *OutFile = stdout;
-
-/*************************************************************************
- *************************************************************************
- *****                 DATA TYPES AND CONSTANT TABLES                *****
- *************************************************************************
- *************************************************************************/
-/*
- *  Usage Information
- */
-
-char *Usage_Strings[] = {
-  "\n",
-  "usage: cmd [-vti?] [-p previous_node] [-u up_node] files ...\n", 
-  "\n",
-  "EOF"
-};
-
-/*
- *  The page separator is not really a keyword and will be purged before
- *  it is seen elsewhere.
- */
-
-#define PAGE_SEPARATOR                            "#PAGE"
-
-/* 
- *  Section Delimiter Keywords
- */
-
-#define MAXIMUM_KEYWORD_LENGTH   32
-
-/*
- *  Level indicates where in the format the delimiter is allowed to occur.
- *    1 indicates a major section divider (e.g. "ATTRIBUTE DESCRIPTIONS:").
- *    2 indicates a subsection (e.g. "ATTRIBUTE:"). 
- *    3 indicates a heading (e.g. "DESCRIPTION:").
- */
-
-#define TEXT         0
-#define SECTION      1
-#define SUBSECTION   2
-#define HEADING      3
-  
-typedef enum {
-  UNUSED,                            /* dummy 0 slot */
-  OBJECT,                            /* sections */
-  ATTRIBUTE_DESCRIPTIONS,
-  ASSOCIATION_DESCRIPTIONS,
-  ABSTRACT_TYPE_DESCRIPTIONS,
-  DATA_ITEM_DESCRIPTIONS,
-  METHOD_DESCRIPTIONS,
-  TASK_DESCRIPTIONS,
-  END_OBJECT,
- 
-  ATTRIBUTE,                         /* subsections */
-  ASSOCIATION,
-  ABSTRACT_TYPE,
-  DATA_ITEM,
-  METHOD,
-  TASK,
- 
-  DESCRIPTION,                       /* headings */
-  COPYRIGHT,
-  PORTING,
-  THEORY_OF_OPERATION,
-  DERIVATION,
-  DEPENDENCIES,
-  NOTES,
-  TYPE,
-  RANGE,
-  MEMBERS,
-  UNITS,
-  SCALE_FACTOR,
-  DEFAULT,
-  TOLERANCE,
-  REQUIREMENTS,
-  REFERENCES,
-  VISIBILITY,
-  ASSOCIATED_WITH,
-  MULTIPLICITY,
-  INPUTS,
-  OUTPUTS,
-  PDL,
-  SYNCHRONIZATION,
-  TIMING,
-
-  RAW_EXAMPLE,                       /* our own */
-  
-}  Keyword_indices_t;
-
-#define KEYWORD_FIRST OBJECT
-#define KEYWORD_LAST  TIMING
-
-/*
- *  Line Management Structure
- */
-
-typedef enum {
-  NO_EXTRA_FORMATTING_INFO,
-  RAW_OUTPUT,
-  PARAGRAPH_OUTPUT,
-  BULLET_OUTPUT,
-}  ExtraFormat_info_t;
-
-typedef struct {
-  Chain_Node         Node;
-  Keyword_indices_t  keyword;   /* unused is unknown/undecided */
-  ExtraFormat_info_t format;
-  int                number;
-  char               Contents[ PARAGRAPH_SIZE ];
-} Line_Control;
-
-typedef enum {
-  RT_NO_CHECK,      /* don't do this at all */
-  RT_FORBIDDEN,     /* no text to right allowed */
-  RT_OPTIONAL,      /* text to right optional -- none below */
-  RT_NONE,          /* text to right is "none" or nothing -- none below */
-  RT_REQUIRED,      /* text to right required -- none below */
-  RT_BELOW,         /* text to right forbidden -- text below required */
-  RT_NONE_OR_BELOW, /* text to right is "none" OR there is text below  */
-  RT_MAYBE_BELOW,   /* text to right required -- text below optional */
-  RT_EITHER,        /* text to right OR below */
-  RT_BOTH           /* text to right AND below */
-}  Keywords_text_mode_t;
-
-typedef enum {
-  BL_FORBIDDEN,     /* text below forbidden */
-  BL_FORMATTED,     /* text below is to be formatted as paragraphs */
-  BL_RAW,           /* text below is to be unprocessed by this program */
-}  Keywords_text_below_t;
-
-typedef int (*Keyword_validater_t)( Line_Control * );
-
-typedef struct {
-  char                      Name[ MAXIMUM_KEYWORD_LENGTH ];
-  int                       level;
-  Keywords_text_mode_t      text_mode;
-  Keywords_text_below_t     text_below_mode;
-  Keyword_validater_t       keyword_validation_routine;
-}  Keyword_info_t;
-
-/*
- *  Keyword Validation Routines
- */
-
-int Validate_visibility(
-  Line_Control   *line
-);
-
-int Validate_synchronization(
-  Line_Control   *line
-);
-
-Keyword_info_t Keywords[] = {
-  { "unused",
-        0,          0,                0, NULL }, /* so 0 can be invalid */
-  { "OBJECT:",
-        SECTION,    RT_REQUIRED,      BL_FORBIDDEN, NULL },
-  { "ATTRIBUTE DESCRIPTIONS:",
-        SECTION,    RT_NONE,          BL_FORBIDDEN, NULL },
-  { "ASSOCIATION DESCRIPTIONS:",
-        SECTION,    RT_NONE,          BL_FORBIDDEN, NULL },
-  { "ABSTRACT TYPE DESCRIPTIONS:",
-        SECTION,    RT_NONE,          BL_FORBIDDEN, NULL },
-  { "DATA ITEM DESCRIPTIONS:",
-        SECTION,    RT_NONE,          BL_FORBIDDEN, NULL },
-  { "METHOD DESCRIPTIONS:",
-        SECTION,    RT_NONE,          BL_FORBIDDEN, NULL },
-  { "TASK DESCRIPTIONS:",
-        SECTION,    RT_NONE,          BL_FORBIDDEN, NULL },
-  { "ENDOBJECT:",
-        SECTION,    RT_REQUIRED,      BL_FORBIDDEN, NULL },
-
-  { "ATTRIBUTE:",
-        SUBSECTION, RT_REQUIRED,      BL_FORBIDDEN, NULL },
-  { "ASSOCIATION:",
-        SUBSECTION, RT_REQUIRED,      BL_FORBIDDEN, NULL },
-  { "ABSTRACT TYPE:",
-        SUBSECTION, RT_REQUIRED,      BL_FORBIDDEN, NULL },
-  { "DATA ITEM:",
-        SUBSECTION, RT_REQUIRED,      BL_FORBIDDEN, NULL },
-  { "METHOD:",
-        SUBSECTION, RT_REQUIRED,      BL_FORBIDDEN, NULL },
-  { "TASK:",
-        SUBSECTION, RT_REQUIRED,      BL_FORBIDDEN, NULL },
-
-  { "DESCRIPTION:",
-        HEADING,    RT_BELOW,         BL_FORMATTED, NULL },
-  { "COPYRIGHT:",
-        HEADING,    RT_BELOW,         BL_FORMATTED, NULL },
-  { "PORTING:",
-        HEADING,    RT_BELOW,         BL_FORMATTED, NULL },
-  { "THEORY OF OPERATION:",
-        HEADING,    RT_BELOW,         BL_FORMATTED, NULL },
-  { "DERIVATION:",
-        HEADING,    RT_REQUIRED,      BL_FORBIDDEN, NULL },
-  { "DEPENDENCIES:",
-        HEADING,    RT_BELOW,         BL_FORMATTED, NULL },
-  { "NOTES:",
-        HEADING,    RT_BELOW,         BL_FORMATTED, NULL },
-  { "TYPE:",
-        HEADING,    RT_REQUIRED,      BL_FORBIDDEN, NULL },
-  { "RANGE:",
-        HEADING,    RT_REQUIRED,      BL_FORBIDDEN, NULL },
-  { "MEMBERS:",
-        HEADING,    RT_BELOW,         BL_RAW,       NULL },
-  { "UNITS:",
-        HEADING,    RT_REQUIRED,      BL_FORBIDDEN, NULL },
-  { "SCALE FACTOR:",
-        HEADING,    RT_REQUIRED,      BL_FORBIDDEN, NULL },
-  { "DEFAULT:",
-        HEADING,    RT_EITHER,        BL_RAW, NULL },
-  { "TOLERANCE:",
-        HEADING,    RT_REQUIRED,      BL_FORBIDDEN, NULL },
-  { "REQUIREMENTS:",
-        HEADING,    RT_BELOW,         BL_RAW,       NULL },
-  { "REFERENCES:",
-        HEADING,    RT_BELOW,         BL_RAW,       NULL },
-  { "VISIBILITY:",
-        HEADING,    RT_REQUIRED,      BL_FORBIDDEN, Validate_visibility },
-  { "ASSOCIATED WITH:",
-        HEADING,    RT_REQUIRED,      BL_FORBIDDEN, NULL },
-  { "MULTIPLICITY:",
-        HEADING,    RT_REQUIRED,      BL_FORBIDDEN, NULL },
-  { "INPUTS:",
-        HEADING,    RT_NONE_OR_BELOW, BL_RAW,       NULL },
-  { "OUTPUTS:",
-        HEADING,    RT_NONE_OR_BELOW, BL_RAW,       NULL },
-  { "PDL:",
-        HEADING,    RT_BELOW,         BL_RAW,       NULL },
-  { "SYNCHRONIZATION:",
-        HEADING,    RT_MAYBE_BELOW,   BL_RAW,    Validate_synchronization },
-  { "TIMING:",
-        HEADING,    RT_REQUIRED,      BL_FORBIDDEN, NULL },
-  { "",
-        TEXT,       RT_NO_CHECK,   BL_RAW,       NULL }
-};
-
-#define NUMBER_OF_KEYWORDS \
-  ( sizeof( Keywords ) / sizeof( Keyword_info_t ) ) - 2
-
-/*
- *  Section Descriptions
- */
-
-#define MAXIMUM_ELEMENTS 16
-
-typedef struct {
-  Keyword_indices_t  keyword;
-  boolean            is_required;
-}  Element_info_t;
-
-typedef struct Section_info_struct_t Section_info_t;
-
-typedef (*Section_validater_t)(
-  Section_info_t *,
-  Line_Control *,  /* start */
-  Line_Control *   /* next_section */
-);
-
-struct Section_info_struct_t {
-  boolean              repeats;
-  Keyword_indices_t    This_section;
-  Keyword_indices_t    Next_section;
-  Section_validater_t  section_validation_routine;
-  Element_info_t       Description[MAXIMUM_ELEMENTS];
-};
-
-int Validate_object(
-  Section_info_t *section,
-  Line_Control   *start,
-  Line_Control   *next_section
-);
-  
-int Validate_attribute(
-  Section_info_t *section,
-  Line_Control   *start,
-  Line_Control   *next_section
-);
-  
-int Validate_abstract_type(
-  Section_info_t *section,
-  Line_Control   *start,
-  Line_Control   *next_section
-);
-  
-
-Section_info_t ObjectSection = {
-  FALSE,                        /* subsections repeat */
-  OBJECT,                       /* this section */
-  ATTRIBUTE_DESCRIPTIONS,       /* next section */
-  Validate_object,              /* validation routine */
-  {
-    { OBJECT,              TRUE },     /*  0 */
-    { DESCRIPTION,         TRUE },     /*  1 */
-    { COPYRIGHT,           FALSE },    /*  2 */
-    { PORTING,             FALSE },    /*  3 */
-    { THEORY_OF_OPERATION, TRUE },     /*  4 */
-    { DERIVATION,          FALSE },    /*  5 */
-    { DEPENDENCIES,        FALSE },    /*  6 */
-    { REQUIREMENTS,        FALSE },    /*  7 */
-    { REFERENCES,          FALSE },    /*  8 */
-    { NOTES,               FALSE },    /*  9 */
-    { UNUSED,              FALSE },    /* 10 */
-    { UNUSED,              FALSE },    /* 11 */
-    { UNUSED,              FALSE },    /* 12 */
-    { UNUSED,              FALSE },    /* 13 */
-    { UNUSED,              FALSE },    /* 14 */
-    { UNUSED,              FALSE },    /* 15 */
-  }
-};
-
-Section_info_t AttributeSection = {
-  TRUE,                         /* subsections repeat */
-  ATTRIBUTE_DESCRIPTIONS,       /* this section */
-  ASSOCIATION_DESCRIPTIONS,     /* next section */
-  Validate_attribute,           /* validation routine */
-  {
-    { ATTRIBUTE,           TRUE },     /*  0 */
-    { DESCRIPTION,         TRUE },     /*  1 */
-    { TYPE,                TRUE },     /*  2 */
-    { MEMBERS,             FALSE },    /*  3 */
-    { RANGE,               FALSE },    /*  4 */
-    { UNITS,               FALSE },    /*  5 */
-    { SCALE_FACTOR,        FALSE },    /*  6 */
-    { DEFAULT,             FALSE },    /*  7 */
-    { TOLERANCE,           FALSE },    /*  8 */
-    { REQUIREMENTS,        FALSE },    /*  9 */
-    { REFERENCES,          FALSE },    /* 10 */
-    { NOTES,               FALSE },    /* 11 */
-    { UNUSED,              FALSE },    /* 12 */
-    { UNUSED,              FALSE },    /* 13 */
-    { UNUSED,              FALSE },    /* 14 */
-    { UNUSED,              FALSE },    /* 15 */
-  }
-};
-
-Section_info_t AssociationSection = {
-  TRUE,                         /* subsections repeat */
-  ASSOCIATION_DESCRIPTIONS,     /* this section */
-  ABSTRACT_TYPE_DESCRIPTIONS,   /* next section */
-  NULL,                         /* validation routine */
-  {
-    { ASSOCIATION,         TRUE },     /*  0 */
-    { DESCRIPTION,         TRUE },     /*  1 */
-    { VISIBILITY,          TRUE },     /*  2 */
-    { ASSOCIATED_WITH,     TRUE },     /*  3 */
-    { MULTIPLICITY,        TRUE },     /*  4 */
-    { REQUIREMENTS,        FALSE },    /*  5 */
-    { REFERENCES,          FALSE },    /*  6 */
-    { NOTES,               FALSE },    /*  7 */
-    { UNUSED,              FALSE },    /*  8 */
-    { UNUSED,              FALSE },    /*  9 */
-    { UNUSED,              FALSE },    /* 10 */
-    { UNUSED,              FALSE },    /* 11 */
-    { UNUSED,              FALSE },    /* 12 */
-    { UNUSED,              FALSE },    /* 13 */
-    { UNUSED,              FALSE },    /* 14 */
-    { UNUSED,              FALSE },    /* 15 */
-  }
-};
-
-Section_info_t AbstractTypeSection = {
-  TRUE,                         /* subsections repeat */
-  ABSTRACT_TYPE_DESCRIPTIONS,   /* this section */
-  DATA_ITEM_DESCRIPTIONS,       /* next section */
-  Validate_abstract_type,       /* validation routine */
-  {
-    { ABSTRACT_TYPE,       TRUE },     /*  0 */
-    { DESCRIPTION,         TRUE },     /*  1 */
-    { VISIBILITY,          TRUE },     /*  2 */
-    { DERIVATION,          TRUE },     /*  3 */
-    { MEMBERS,             FALSE },    /*  4 */
-    { RANGE,               FALSE },    /*  5 */
-    { UNITS,               FALSE },    /*  6 */
-    { SCALE_FACTOR,        FALSE },    /*  7 */
-    { DEFAULT,             FALSE },    /*  8 */
-    { TOLERANCE,           FALSE },    /*  9 */
-    { REQUIREMENTS,        FALSE },    /* 10 */
-    { REFERENCES,          FALSE },    /* 11 */
-    { NOTES,               FALSE },    /* 12 */
-    { UNUSED,              FALSE },    /* 13 */
-    { UNUSED,              FALSE },    /* 14 */
-    { UNUSED,              FALSE },    /* 15 */
-  }
-};
-
-Section_info_t DataItemSection = {
-  TRUE,                         /* subsections repeat */
-  DATA_ITEM_DESCRIPTIONS,       /* this section */
-  METHOD_DESCRIPTIONS,          /* next section */
-  NULL,                         /* validation routine */
-  {
-    { DATA_ITEM,           TRUE },     /*  0 */
-    { DESCRIPTION,         TRUE },     /*  1 */
-    { TYPE,                TRUE },     /*  2 */
-    { UNITS,               FALSE },    /*  3 */
-    { SCALE_FACTOR,        FALSE },    /*  4 */
-    { DEFAULT,             FALSE },    /*  5 */
-    { TOLERANCE,           FALSE },    /*  6 */
-    { NOTES,               FALSE },    /*  7 */
-    { UNUSED,              FALSE },    /*  8 */
-    { UNUSED,              FALSE },    /*  9 */
-    { UNUSED,              FALSE },    /* 10 */
-    { UNUSED,              FALSE },    /* 11 */
-    { UNUSED,              FALSE },    /* 12 */
-    { UNUSED,              FALSE },    /* 13 */
-    { UNUSED,              FALSE },    /* 14 */
-    { UNUSED,              FALSE },    /* 15 */
-  }
-};
-
-Section_info_t MethodSection = {
-  TRUE,                         /* subsections repeat */
-  METHOD_DESCRIPTIONS,          /* this section */
-  TASK_DESCRIPTIONS,            /* next section */
-  NULL,                         /* validation routine */
-  {
-    { METHOD,              TRUE },     /*  0 */
-    { DESCRIPTION,         TRUE },     /*  1 */
-    { VISIBILITY,          TRUE },     /*  2 */
-    { INPUTS,              TRUE },     /*  3 */
-    { OUTPUTS,             TRUE },     /*  4 */
-    { REQUIREMENTS,        FALSE },    /*  5 */
-    { REFERENCES,          FALSE },    /*  6 */
-    { NOTES,               FALSE },    /*  7 */
-    { PDL,                 TRUE },     /*  8 */
-    { UNUSED,              FALSE },    /*  9 */
-    { UNUSED,              FALSE },    /* 10 */
-    { UNUSED,              FALSE },    /* 11 */
-    { UNUSED,              FALSE },    /* 12 */
-    { UNUSED,              FALSE },    /* 13 */
-    { UNUSED,              FALSE },    /* 14 */
-    { UNUSED,              FALSE },    /* 15 */
-  }
-};
-
-Section_info_t TaskSection = {
-  TRUE,                         /* subsections repeat */
-  TASK_DESCRIPTIONS,            /* this section */
-  END_OBJECT,                   /* next section */
-  NULL,                         /* validation routine */
-  {
-    { METHOD,              TRUE },     /*  0 */
-    { DESCRIPTION,         TRUE },     /*  1 */
-    { VISIBILITY,          TRUE },     /*  2 */
-    { INPUTS,              TRUE },     /*  3 */
-    { SYNCHRONIZATION,     TRUE },     /*  4 */
-    { TIMING,              TRUE },     /*  5 */
-    { REQUIREMENTS,        FALSE },    /*  6 */
-    { REFERENCES,          FALSE },    /*  7 */
-    { NOTES,               FALSE },    /*  8 */
-    { PDL,                 TRUE },     /*  9 */
-    { UNUSED,              FALSE },    /* 10 */
-    { UNUSED,              FALSE },    /* 11 */
-    { UNUSED,              FALSE },    /* 12 */
-    { UNUSED,              FALSE },    /* 13 */
-    { UNUSED,              FALSE },    /* 14 */
-    { UNUSED,              FALSE },    /* 15 */
-  }
-};
-
-
-Section_info_t *Sections[] = {
-  &ObjectSection,
-  &AttributeSection,
-  &AssociationSection,
-  &AbstractTypeSection,
-  &DataItemSection,
-  &MethodSection,
-  &TaskSection
-};
-
-/*
- *  exit_application
- */
-
-void exit_application( 
-  int status
-)
-{
-  fprintf( stderr, "*** Error encountered ***\n" );
-/*
-  fprintf( stderr, "*** Error encountered on line %d ***\n", CurrentLine );
-*/
-  fclose( OutFile ); 
-  exit( 1 );
-}
-
-/*************************************************************************
- *************************************************************************
- *****                LINE MANIPULATION ROUTINES                     *****
- *************************************************************************
- *************************************************************************/
-
-/*
- * PrintLine
- */
-
-void PrintLine(
-  Line_Control *line
-)
-{
-  assert( line );
-
-  if ( line->number == -1 )
-    fprintf( stderr, "     " );
-  else
-    fprintf( stderr, "%5d", line->number );
-
-#if 0
-  fprintf( stderr, "%s\n", line->Contents );
-#else
-  /* 
-   *  Include some debugging information
-   */
-  fprintf(
-    stderr,
-    "<%d,%d>:%s\n", 
-    line->keyword,
-    line->format,
-    line->Contents
-  );
-#endif
-}
-
-Chain_Control Line_Pool;
-
-/*
- *  FillLinePool
- */
-
-void FillLinePool( void )
-{
-  void *pool;
-
-#define LINE_POOL_FILL_COUNT 100
-
-  pool = malloc( sizeof( Line_Control ) * LINE_POOL_FILL_COUNT );
-  assert( pool );
-
-  _Chain_Initialize(
-    &Line_Pool,
-    pool,
-    LINE_POOL_FILL_COUNT,
-    sizeof( Line_Control )
-  );
-}
-
-/*
- * AllocateLine
- */
-
-Line_Control *AllocateLine( void )
-{
-  Line_Control  *new_line;
-
-  new_line = (Line_Control *) _Chain_Get( &Line_Pool );
-  if ( !new_line ) {
-    FillLinePool();
-    new_line = (Line_Control *) _Chain_Get( &Line_Pool );
-    assert( new_line );
-  }
- 
-/*
- *  This is commented out because although it is helpful during debug,
- *  it consumes a significant percentage of the program's execution time.
- */
-
-  memset( new_line->Contents, '\0', sizeof( new_line->Contents ) );
-  new_line->number = -1;
-
-  new_line->keyword = UNUSED;
-  new_line->format = NO_EXTRA_FORMATTING_INFO;
-
-  new_line->Node.next     = NULL;
-  new_line->Node.previous = NULL;
-
-  return new_line;
-}
-
-/*
- * FreeLine
- */
-
-void FreeLine(
-  Line_Control *line
-)
-{
-  fflush( stdout );
-  _Chain_Append( &Line_Pool, &line->Node );
-}
-
-/*
- * DeleteLine
- */
-
-Line_Control *DeleteLine(
-  Line_Control *line
-)
-{
-  Line_Control *next;
-  
-  next = (Line_Control *)line->Node.next; 
-  _Chain_Extract( &line->Node );
-  FreeLine( line );
-  return next;
-}
-
-/* 
- *  PrintSurroundingLines
- */
-
-void PrintSurroundingLines(
-  Line_Control *line,
-  int           backward,
-  int           forward
-)
-{
-  int           i;
-  int           real_backward;
-  Line_Control *local;
-
-  for ( local=line, real_backward=0, i=1 ; 
-        i<=backward ; 
-        i++, real_backward++ ) {
-    if ( &local->Node == Lines.first )
-      break;
-    local = (Line_Control *) local->Node.previous;
-  }
-
-  for ( i=1 ; i<=real_backward ; i++ ) {
-    PrintLine( local );
-    local = (Line_Control *) local->Node.next;
-  }
- 
-  PrintLine( local );
-
-  for ( i=1 ; i<=forward ; i++ ) {
-    local = (Line_Control *) local->Node.next;
-    if ( _Chain_Is_last( &local->Node ) )
-      break;
-    PrintLine( local );
-  }
- 
-}
-
-/*
- *  SetLineFormat
- */
-
-void SetLineFormat(
-  Line_Control       *line,
-  ExtraFormat_info_t  format
-)
-{
-  if ( line->format != NO_EXTRA_FORMATTING_INFO ) {
-    fprintf( stderr, "Line %d is already formatted\n", line->number );
-    PrintLine( line );
-    assert( FALSE );
-  }
-
-  line->format = format;
-}
-
-/*
- *  LineCopyFromRight
- */
-
-void LineCopyFromRight(
-  Line_Control *line,
-  char         *dest
-)
-{
-  char *p;
-
-  for ( p=line->Contents ; *p != ':' ; p++ ) 
-    ;
-  p++;  /* skip the ':' */
-  for ( ; isspace( *p ) ; p++ )
-    ;
-
-  strcpy( dest, p );
-
-}
-
-/*
- *  LineCopySectionName
- */
-
-void LineCopySectionName(
-  Line_Control *line,
-  char         *dest
-)
-{
-  char *p;
-  char *d;
-
-  p = line->Contents;
-  d = dest;
-
-  if ( *p == '@' ) {                /* skip texinfo command */
-    while ( !isspace( *p++ ) )
-      ;
-  }
-
-  for ( ; *p != ':' ; ) 
-    *d++ = *p++;
-
-  *d = '\0';
-}
-
-/*
- *  FormatParagraph
- */
-
-Line_Control *FormatParagraph(
-  Line_Control *starting
-)
-{
-  Chain_Node   *insert_after;
-  Line_Control *to_add;
-  Line_Control *new_line;
-  char          Paragraph[ PARAGRAPH_SIZE ];
-  int           starting_line;
-  char         *src;
-  char         *dest;
-  boolean       do_loop;
-  boolean       is_bullet;
-  int           length;
-  int           i;
-
-  length = 0;
-
-  starting_line = starting->number;
-  insert_after = starting->Node.previous;
-  to_add = starting;
-
-  dest = Paragraph;
-
-  is_bullet = FALSE;
-
-  for ( ; ; ) {
-    src = to_add->Contents;
-
-    for ( ; *src && isspace( *src ) ; src++ ); /* skip leading spaces */
-
-    if ( !strncmp( src, "@table", 6 ) ) {
-
-      to_add = DeleteLine( to_add );
-      src = to_add->Contents;
-      for ( i=4 ; *src && isspace( *src ) && i-- ; src++ );
-         /* skip leading spaces */
-
-      for ( ; ; ) {
-        if ( _Chain_Is_last( &to_add->Node ) ) {
-          fprintf(
-             stderr,
-             "Missing end table for table starting at line %d\n",
-             starting_line
-           );
-           exit_application( 1 );
-        }
-        if ( !strncmp( src, "@end table", 10 ) ) {
-          to_add = DeleteLine( to_add );  
-          return to_add;
-        } 
-        strcpy( Paragraph, src );
-        strcpy( to_add->Contents, Paragraph );
-        SetLineFormat( to_add, PARAGRAPH_OUTPUT );
-        to_add->keyword = RAW_EXAMPLE;
-        to_add = (Line_Control *) to_add->Node.next;
-
-        src = to_add->Contents;
-        for ( i=4 ; *src && isspace( *src ) && i-- ; src++ );
-           /* skip leading spaces */
-
-      }
-    }
-
-    if ( *src == '+' ) {
-      if ( is_bullet == TRUE )
-        break;
-      is_bullet = TRUE;
-      for ( src++ ; isspace(*src) ; src++ ) ;
-    }
-
-    do_loop = TRUE;
-    while ( *src && do_loop == TRUE ) {
-                    
-      if ( isspace( *src ) ) {         /* convert multiple spaces to 1 */
-
-        if ( *(dest-1) == '.' ) {      /* two spaces after period */
-          *dest++ = ' ';
-          length++;
-        }
-
-        assert( length < PARAGRAPH_SIZE );
-
-        *dest++ = ' ';
-        length++;
-
-        assert( length < PARAGRAPH_SIZE );
- 
-        for (  ; isspace( *src ) ; src++ )
-          if ( !*src ) {
-            do_loop = FALSE;
-            break;
-          }
- 
-        continue;
- 
-      } else {
-        *dest++ = *src;
-        length++;
-        assert( length < PARAGRAPH_SIZE );
-        src++;
-      }
-    }
-
-    to_add = DeleteLine( to_add );
-
-    if ( _Chain_Is_last( &to_add->Node ) )
-      break;
-
-    if ( !strlen( to_add->Contents ) )
-      break;
-
-    if ( to_add->keyword )
-      break;
-
-    if ( !isspace( *(dest-1) ) ) {
-      if ( *(dest-1) == '.' ) {
-        *dest++ = ' ';
-        length++;
-        assert( length < PARAGRAPH_SIZE );
-      }
-      *dest++ = ' ';
-      length++;
-      assert( length < PARAGRAPH_SIZE );
-    }
-  }
-
-  new_line = AllocateLine();
-  
-  SetLineFormat( new_line, (is_bullet) ? BULLET_OUTPUT : PARAGRAPH_OUTPUT );
-
-  *dest = '\0';
-
-  strcpy( new_line->Contents, Paragraph );
-
-  new_line->number = starting_line;
- 
-  _Chain_Insert( insert_after, &new_line->Node );
-
-  return new_line;
-}
-
-/*
- *  FormatMultipleParagraphs
- */
-
-Line_Control *FormatMultipleParagraphs(
-  Line_Control *starting
-)
-{
-  Line_Control *line = starting;
-
-  if ( _Chain_Is_last( &line->Node ) ) {
-    fprintf( stderr, "end of file reached when expecting text\n" ); 
-    exit_application( 0 );
-  }
-
-  if ( line->keyword ) {
-    line = (Line_Control *) line->Node.next;
-
-    if ( _Chain_Is_last( &line->Node ) ) {
-      fprintf( stderr, "end of file reached when expecting text\n" ); 
-      exit_application( 0 );
-    }
-  }
-    
-  for ( ;; ) {
-    assert( line );
-
-    if ( _Chain_Is_last( &line->Node ) )
-      break;
-
-    if ( line->keyword )
-      break;
-    
-    if ( !strlen( line->Contents ) ) {
-      line = DeleteLine( line );
-      continue;
-    }
-
-    line = FormatParagraph( line );
-    line = (Line_Control *) line->Node.next;
-  }
-}
-
-/*************************************************************************
- *************************************************************************
- *****              END OF LINE MANIPULATION ROUTINES                *****
- *************************************************************************
- *************************************************************************/
-
-/*
- *  CountKeywordOccurrences
- */
-
-int CountKeywordOccurrences(
-  Keyword_indices_t  keyword
-)
-{
-  int           count = 0;
-  Line_Control *line;
-
-  for ( line = (Line_Control *) Lines.first ;
-        !_Chain_Is_last( &line->Node ) ; 
-        line = (Line_Control *) line->Node.next ) {
-    if ( line->keyword == keyword )
-      count += 1;
-  }
-
-  return count;
-}
-
-/*
- *  main
- */
-
-int main(
-  int    argc,
-  char **argv
-)
-{
-  int      c;
-  int      index;
-  boolean  single_file_mode;
-
-  Verbose = FALSE;
-  Statistics = FALSE;
-  OutputWord = FALSE;
-  IncompletesAreErrors = TRUE;
-  InsertTBDs = FALSE;
-
-  while ((c = getopt(argc, argv, "istvw?n:p:u:")) != EOF) {
-    switch (c) {
-      case 'i':
-        IncompletesAreErrors = FALSE;
-        break;
-      case 't':
-        InsertTBDs = TRUE;
-        break;
-      case 'v':
-        Verbose = TRUE;
-        break;
-      case 'n':
-         strcpy( DocsNextNode, optarg );
-         break;
-      case 'p':
-         strcpy( DocsPreviousNode, optarg );
-         break;
-      case 'u':
-         strcpy( DocsUpNode, optarg );
-         break;
-      case 's':
-         Statistics = TRUE;
-         break;
-      case 'w':
-         OutputWord = TRUE;
-         break;
-      case '?':
-        usage();
-        return 0;
-    }
-  }
-
-  if ( Verbose ) {
-    fprintf( stderr, "Arguments successfully parsed\n" );
-    fprintf( stderr, "Next Node = (%s)\n", DocsNextNode );
-    fprintf( stderr, "Previous Node = (%s)\n", DocsPreviousNode );
-    fprintf( stderr, "Up Node = (%s)\n", DocsUpNode );
-    fprintf( stderr, "Output Format = (%s)\n", (OutputWord) ? "Word" : "Texi" );
-  }
-
-  FillLinePool();
-
-  for ( index=optind ; index < argc ; index++ ) {
-    ProcessFile( argv[ index ], NULL );
-  }
-    
-  if ( Verbose )
-    fprintf( stderr, "Exitting\n" );
-
-  return 0;
-}
-
-/*
- *  ProcessFile
- */
-
-void ProcessFile(
-  char   *inname,
-  char   *outname
-)
-{
-   char            out[ 256 ];
-   int             index;
-   int             out_index;
-
-   /*
-    *  Automatically generate the output file name.
-    */
-
-   if ( outname == NULL ) {
-     out_index = 0;
-     for( index=0 ; inname[index] && inname[index] != '.' ; index++ ) {
-/*
-       if ( inname[ index ] != '_' )
-*/
-         out[ out_index++ ] = inname[ index ];
-     }
-
-     if ( OutputWord ) {
-       out[ out_index++ ] = '.';
-       out[ out_index++ ] = 't';
-       out[ out_index++ ] = 'x';
-       out[ out_index++ ] = 't';
-     } else {
-       out[ out_index++ ] = '.';
-       out[ out_index++ ] = 't';
-       out[ out_index++ ] = 'e';
-       out[ out_index++ ] = 'x';
-       out[ out_index++ ] = 'i';
-     }
-     out[ out_index ] = '\0';
-
-   }
-
-   /*
-    *  Read the file into our internal data structure
-    */
-
-   if ( Verbose )
-     printf( "Processing (%s) -> (%s)\n", inname, out );
-
-   ReadFileIntoChain( inname );
-
-   if ( Verbose )
-     fprintf( stderr, "-------->FILE READ IN\n" );
-
-   /*
-    *  Remove any spaces before the keyword and mark each keyword line as
-    *  such.  Also remove extra white space at the end of lines.
-    */
-
-   StripBlanks();
-
-   if ( Verbose )
-     fprintf( stderr, "-------->BLANKS BEFORE KEYWORDS STRIPPED\n" );
-
-   /*
-    *  Count the number of each type of thing
-    */
-
-   NumberOfAttributes    = CountKeywordOccurrences( ATTRIBUTE );
-   NumberOfAssociations  = CountKeywordOccurrences( ASSOCIATION );
-   NumberOfAbstractTypes = CountKeywordOccurrences( ABSTRACT_TYPE );
-   NumberOfDataItems     = CountKeywordOccurrences( DATA_ITEM );
-   NumberOfMethods       = CountKeywordOccurrences( METHOD );
-   NumberOfTasks         = CountKeywordOccurrences( TASK );
-
-   if ( Verbose || Statistics ) {
-     fprintf( stderr, "NUMBER OF ATTRIBUTES = %d\n", NumberOfAttributes );
-     fprintf( stderr, "NUMBER OF ASSOCIATIONS = %d\n", NumberOfAssociations );
-     fprintf( stderr, "NUMBER OF ABSTRACT TYPES = %d\n", NumberOfAbstractTypes);
-     fprintf( stderr, "NUMBER OF DATA ITEMS = %d\n", NumberOfDataItems );
-     fprintf( stderr, "NUMBER OF METHODS = %d\n", NumberOfMethods );
-     fprintf( stderr, "NUMBER OF TASKS = %d\n", NumberOfTasks );
-   }
-
-   /*
-    *  1.  Merge paragraphs entered as multiple lines into a single node 
-    *      on the chain.
-    *  2.  Clean up "colon lines".
-    */
-
-   if ( MergeText() == -1 )
-     exit_application( 1 );
-
-   if ( Verbose )
-     fprintf( stderr, "-------->PARAGRAPHS MERGED\n" );
-
-   RemovePagebreaks();
-   
-   /*
-    *  Remove extraneous white space
-    */
-
-   if ( Verbose )
-     fprintf( stderr, "-------->PAGEBREAKS REMOVED\n" );
-
-   /*
-    *  At this point, the only unmarked lines should be empty or errors.
-    *  This deletes empty unmarked lines and flags the others as errors.
-    */
-
-   if ( RemoveExtraBlankLines() == -1 )
-     exit_application( 1 );
- 
-   if ( Verbose )
-     fprintf( stderr, "-------->EXTRA BLANK LINES REMOVED\n" );
-
-   /*
-    *  Now report which lines do not appear to be complete
-    */
-
-   if ( CheckForIncomplete() == -1 )
-     exit_application( 1 );
-
-   if ( Verbose )
-     fprintf( stderr, "-------->CHECKED FOR INCOMPLETE KEYWORDS\n" );
-
-   /*
-    *  Check that all the required sections are present.
-    */
-
-   if ( CheckOutline() == -1 )
-     exit_application( 1 );
-  
-   if ( Verbose )
-     fprintf( stderr, "-------->CHECKED FOR HIGH LEVEL SECTION PROBLEMS\n" );
-
-   /*
-    *  Check for problems in each section.
-    */
-
-   if ( CheckSections() == -1 )
-     exit_application( 1 );
-
-   if ( Verbose )
-     fprintf( stderr, "-------->CHECKED FOR INTERNAL SECTION PROBLEMS\n" );
-
-   /*
-    *  Look for Internal Consistencies
-    */
-
-   if ( Verbose ) 
-     fprintf( stderr, "-------->LOOKING FOR ERRORS\n" );
-
-   LookForInternalInconsistencies();
-
-   /*
-    *  Formatting the file 
-    */
-
-   if ( OutputWord ) {
-     FormatToWord();
-     if ( Verbose ) 
-       fprintf( stderr, "-------->FILE FORMATTED TO WORD\n" );
-   } else {
-     FormatToTexinfo();
-     if ( Verbose ) 
-       fprintf( stderr, "-------->FILE FORMATTED TO TEXINFO\n" );
-   }
-
-   /*
-    *  Print the file 
-    */
-
-   PrintFile( out );
-
-   if ( Verbose ) 
-     fprintf( stderr, "-------->FILE PRINTED\n" );
-
-   /*
-    *  Clean Up 
-    */
-
-   ReleaseFile();
-
-   if ( Verbose )
-     fprintf( stderr, "-------->FILE RELEASED\n" );
-}
-
-/*
- *  LookForInternalInconsistencies
- *
- *  This routine looks for lines with no formatting information and
- *  lines with too much formatting information.
- */
-
-void LookForInternalInconsistencies( void )
-{
-  Line_Control  *line;
-  int            i;
-  int            errors = 0;
-  char          *src;
-
-  for ( line = (Line_Control *) Lines.first ;
-        !_Chain_Is_last( &line->Node ) ;
-        line = (Line_Control *)line->Node.next
-        ) {
-    if ( !line->keyword && line->format == NO_EXTRA_FORMATTING_INFO ) {
-      fprintf(
-        stderr,
-        "\nLine %d has no keyword or formatting:\n", 
-        line->number
-      );
-      PrintSurroundingLines( line, 3,  3 );
-      errors++;
-    } 
-  }
- 
-  if ( errors ) 
-    exit_application( 1 );
-}
-
-/*
- *  usage
- */
-
-void usage( void )
-{
-  int index;
-
-  for ( index=0 ; strcmp( Usage_Strings[ index ], "EOF" ) ; index++ )
-    fprintf( stderr, Usage_Strings[ index ] );
-}
-
-/*
- *  ReadFileIntoChain
- */
-
-void ReadFileIntoChain( 
-  char *inname
-)
-{
-   FILE *InFile;
-   int   line_count;
-   int   max_length;
-   char *line;
-   char  Buffer[ BUFFER_SIZE ];
-   Line_Control *new_line;
-
-   InFile = fopen( inname, "r" );
-
-   if ( !InFile ) {
-     fprintf( stderr, "Unable to open (%s)\n", inname );
-     exit( 1 );
-   }
-   assert( InFile );
-
-   max_length = 0;
-   line_count = 0;
-
-   _Chain_Initialize_empty( &Lines );
-
-   for ( ;; ) {
-      line = fgets( Buffer, BUFFER_SIZE, InFile );
-      if ( !line ) 
-        break;
-
-      Buffer[ strlen( Buffer ) - 1 ] = '\0';
-
-      new_line = AllocateLine();
- 
-      strcpy( new_line->Contents, Buffer );
-
-      new_line->number = ++line_count;
- 
-      _Chain_Append( &Lines, &new_line->Node );
-   } 
-
-   fclose( InFile ); 
-}
-
-/*
- *  StripBlanks
- */
-
-void StripBlanks( void )
-{
-  Line_Control      *line;
-  Keyword_indices_t  index;
-  int                indentation;
-  int                length;
-  Keyword_info_t    *key;
- 
-  for ( line = (Line_Control *) Lines.first ;
-        !_Chain_Is_last( &line->Node ) ;
-        line = (Line_Control *) line->Node.next
-        ) {
-
-    /*
-     *  Strip white space from the end of each line 
-     */
-
-    length = strlen( line->Contents );
-
-    while ( isspace( line->Contents[ --length ] ) ) 
-      line->Contents[ length ] = '\0';
-
-    /*
-     *  Strip white space from the front of each keyword line.
-     */
-
-    for ( index=KEYWORD_FIRST ; index <= KEYWORD_LAST ; index++ ) {
-      key = &Keywords[ index ];
-
-      switch ( key->level ) {
-        case SECTION:    indentation = 0; break; 
-        case SUBSECTION: indentation = 0; break; 
-        case HEADING:    indentation = 2; break; 
-        default:         assert( FALSE );
-      }
-
-      if ( !strncmp( &line->Contents[ indentation ], key->Name, 
-                    strlen( key->Name ) ) ) {
-        if ( indentation )
-          strcpy( line->Contents,  &line->Contents[ indentation ] );
-        line->keyword = index;
-        break;
-      }
-    }
-  }
-}
-
-/*
- *  CrunchRight
- */
-
-boolean CrunchRight(
-  Line_Control *line
-)
-{
-  char  Buffer[ PARAGRAPH_SIZE ];
-  char *src;
-  char *dest;
-  boolean is_text_to_right = FALSE;
-
-  src  = line->Contents;
-  dest = Buffer;
-
-  while( *src != ':' ) {
-    if ( !*src ) {
-      fprintf(
-        stderr,
-        "Line %d should have had a colon\n",
-        line->number
-      );
-      exit_application( 1 );
-    }
-    *dest++ = *src++;
-  }
- 
-  *dest++ = *src++;    /* this is the ':' */
- 
-  if ( *src ) {
-    *dest++ = ' ';
-    while ( *src && isspace( *src ) )
-      src++;
- 
-    if ( *src )
-      is_text_to_right = TRUE;
- 
-    while ( *src )
-      *dest++ = *src++;
-  }
- 
-  *dest = '\0';
-
-  strcpy( line->Contents, Buffer );
-
-  return is_text_to_right;
-}
-
-/*
- *  CrunchBelow
- */
-
-void CrunchBelow(
-  Line_Control          *start_line,
-  Keywords_text_below_t  text_below_mode
-)
-{
-  Line_Control      *line;
-  int                i;
-  int                leading_white;
-  int                length;
- 
-  switch ( text_below_mode ) {
-    case BL_FORBIDDEN:
-      assert( FALSE );
-    case BL_FORMATTED:
-      (void) FormatMultipleParagraphs( start_line );
-      break;
-    case BL_RAW:
-      for ( line = (Line_Control *) start_line->Node.next;
-            !_Chain_Is_last( &line->Node ) ;
-          ) {
-         if ( strlen( line->Contents ) )
-           break;
-         line = DeleteLine( line );
-      }  
-
-      for ( i=0 ; isspace( line->Contents[ i ] ) ; i++ )
-        ;
-      
-      leading_white = i;
-
-      for ( ;
-            !_Chain_Is_last( &line->Node ) ;
-            ) {
- 
-         assert( line );
-
-         if ( line->keyword )
-           break;
-
-         assert( !_Chain_Is_last( &line->Node ) );
-
-         length = strlen( line->Contents );
-
-         if ( length ) {
-           if ( length < leading_white ) {
-             fprintf(
-               stderr,
-               "\nLine %d %s:\n",
-               line->number,
-               "has inconsistent spacing -- is too short -- see 1st line of text"
-             );
-             PrintSurroundingLines( line, 0,  0 );
-             fprintf( stderr, "\n" );
-
-           } 
-           for ( i=0 ; i < leading_white ; i++ ) {
-             if ( !isspace( line->Contents[ i ] ) ) {
-               fprintf(
-                 stderr,
-                 "\nLine %d %s:\n",
-                 line->number,
-                 "has inconsistent spacing -- see 1st line of text"
-               );
-               PrintSurroundingLines( line, 0,  0 );
-               fprintf( stderr, "\n" );
-               break;
-             }
-           } 
-
-           strcpy( line->Contents, &line->Contents[ leading_white ] );
-
-           SetLineFormat( line, RAW_OUTPUT );
-           line = (Line_Control *) line->Node.next;
-         } else {
-           SetLineFormat( line, RAW_OUTPUT );
-           /* line = DeleteLine( line ); */
-           line = (Line_Control *) line->Node.next;
-         }
-      }
-      break;
-  }
-}
-
-/*
- *  MergeText
- */
- 
-/* XXX expand this and address the error numbers */
-char *Format_Errors[] = {
-  /* unused */             "no formatting error",
-  /* RT_NO_CHECK      */   "why am I here",
-  /* RT_FORBIDDEN     */   "no text allowed to right or below",
-  /* RT_OPTIONAL      */   "text to right optional -- none below",
-  /* RT_NONE          */   "text to right is \"none\" or nothing -- none below",
-  /* RT_REQUIRED      */   "text to right required -- none below",
-  /* RT_BELOW         */   "text to right forbidden -- text below required",
-  /* RT_NONE_OR_BELOW */   "text to right is \"none\" OR there is text below",
-  /* RT_MAYBE_BELOW   */   "text to right required -- text below optional",
-  /* RT_EITHER        */   "text to right OR below",
-  /* RT_BOTH          */   "text to right AND below"
-};
-
-
-int MergeText( void )
-{
-  Line_Control      *line;
-  Line_Control      *next;
-  Line_Control      *new_line;
-  Keyword_info_t    *key;
-  boolean            is_text_to_right;
-  boolean            is_text_below;
-  boolean            add_text_to_right;
-  boolean            add_text_below;
-  int                errors = 0;
-  int                error_code = 0;
- 
-  for ( line = (Line_Control *) Lines.first ;
-        !_Chain_Is_last( &line->Node ) ;
-        ) {
- 
-    if ( error_code ) {
-
-      fprintf(
-        stderr,
-        "\nLine %d %s:\n",
-        line->number,
-        Format_Errors[ error_code ]
-      );
-      PrintSurroundingLines( line, 0,  3 );
-      fprintf( stderr, "\n" );
-      error_code = 0;
-      line = (Line_Control *) line->Node.next;
-    }
-
-    key = &Keywords[ line->keyword ];
-
-    if ( !line->keyword || key->text_mode == RT_NO_CHECK ) {
-      line = (Line_Control *) line->Node.next;
-      continue;
-    }
-
-    /*
-     *  Figure out where the text is for this keyword.  It is a pretty
-     *  ugly thing to look ahead for text below because of intermediate
-     *  blank lines which we are not allowed to remove.
-     */
-
-    add_text_to_right = FALSE;
-    add_text_below = FALSE;
-
-    is_text_to_right = CrunchRight( line );
-
-    is_text_below = FALSE;
-
-    for ( next = (Line_Control *) line->Node.next ; 
-          !_Chain_Is_last( &next->Node ) ;
-          next = (Line_Control *) next->Node.next ) {
-
-      if ( next->keyword )
-        break;
-
-      if ( strlen( next->Contents ) ) {
-        is_text_below = TRUE;
-        break;
-      }
-    }
-
-    switch ( key->text_mode ) {
-      case RT_NO_CHECK:  /* no requirements */
-        break;
-
-      case RT_FORBIDDEN: /* no text to right or below allowed */
-        if ( is_text_to_right || is_text_below ) {
-          error_code = 1;
-          errors++;
-          continue;
-        }
-        break;
-
-      case RT_OPTIONAL:  /* text to right optional -- none below */
-        if ( is_text_below ) {
-          error_code = 2;
-          errors++;
-          continue;
-        }
-        break;
-
-      case RT_NONE:      /* text to right is "none" or nothing -- none below */
-        if ( (is_text_to_right && !strstr( line->Contents, "none" )) ||
-             is_text_below ) {
-          error_code = 3;
-          errors++;
-          continue;
-        }
-        break;
-
-      case RT_REQUIRED:  /* text to right required -- none below */
-        if ( is_text_below ) {
-          error_code = 4;
-          errors++;
-          continue;
-        }
-
-        if ( !is_text_to_right ) {
-          if ( !InsertTBDs ) {
-            error_code = 4;
-            errors++;
-            continue;
-          } else
-            add_text_to_right = TRUE;
-        }
-        break;
-
-      case RT_BELOW:     /* text to right forbidden -- text below required */
-        if ( is_text_to_right ) {
-          error_code = 5;
-          errors++;
-          continue;
-        }
-
-        if ( !is_text_below ) {
-          if ( !InsertTBDs ) {
-            error_code = 5;
-            errors++;
-            continue;
-          } else
-            add_text_below = TRUE;
-        }
-        break;
-
-      case RT_NONE_OR_BELOW: /* text to right is "none" OR text below */
-
-        if ( is_text_to_right ) {
-          if ( strstr( line->Contents, "none" ) )
-            break;
-          error_code = 6;
-          errors++;
-          continue;
-        }
-
-        if ( !is_text_below ) {
-          if ( !InsertTBDs ) {
-            error_code = 6;
-            errors++;
-            continue;
-          } else
-            add_text_to_right = TRUE;
-        }
-        break;
-                          /* text to right required -- text below optional */
-      case RT_MAYBE_BELOW:
-        if ( !is_text_to_right ) {
-          error_code = 7;
-          errors++;
-          continue;
-        }
-        break;
-
-      case RT_EITHER:    /* text to right OR below */
-        if ( !(is_text_to_right || is_text_below) ) {
-          if ( !InsertTBDs ) {
-            error_code = 8;
-            errors++;
-            continue;
-          } else
-            add_text_to_right = TRUE;
-        }
-        break;
-
-      case RT_BOTH:      /* text to right AND below */
-        if ( !(is_text_to_right && is_text_below) ) {
-          if ( !InsertTBDs ) {
-            error_code = 9;
-            errors++;
-            continue;
-          } else {
-            add_text_to_right = TRUE;
-            add_text_below = TRUE;
-          }
-        }
-        break;
-    }
-
-    if ( add_text_to_right )
-      strcat( line->Contents, " TBD" );
-
-    if ( add_text_below ) {
-      new_line = AllocateLine();
-      strcpy( new_line->Contents, "TBD" );
-      _Chain_Insert( &line->Node, &new_line->Node );
-      is_text_below = TRUE;
-    }
-
-    if ( is_text_below )
-      CrunchBelow( line, key->text_below_mode );
-
-    line = (Line_Control *) line->Node.next;
-  }
-  return (errors) ? -1 : 0;
-}
-
-/*
- *  CheckForIncomplete
- */
-
-char *IncompleteMarkers[] = {
-  "??",
-  "xxx",
-  "XXX",
-  "xyz",
-  "XYZ"
-};
-
-int CheckForIncomplete()
-{
-  Line_Control *line;
-  int           i;
-  int           errors = 0;
-
-  for ( line = (Line_Control *) Lines.first ;
-        !_Chain_Is_last( &line->Node ) ; 
-        line = (Line_Control *) line->Node.next
-        ) {
-    for ( i=0 ; i < NUMBER_ELEMENTS( IncompleteMarkers ) ; i++ ) {
-      if ( !strstr( line->Contents, IncompleteMarkers[ i ] ) ) 
-        continue;
-
-      fprintf(
-        stderr,
-        "\nLine %d %s:\n",
-        line->number,
-        "appears to be incomplete"
-      );
-      PrintSurroundingLines( line, 0,  0 );
-      fprintf( stderr, "\n" );
-      if ( IncompletesAreErrors )
-        errors++;
-      break;
-    }
-  }
-  return ( errors ) ? -1 : 0;
-}
-
-/*
- *  CheckOutline
- *
- *  Insure all section headers are present.
- *  Check sections which say "none", really have subsections.
- *  Check sections which have subsections, don't say none.
- */
-
-int CheckOutline( void )
-{
-  Line_Control      *line;
-  int                count;
-  int                errors = 0;
-  void              *none_present;
-  boolean            KeywordsPresent[ KEYWORD_LAST + 1 ];
-  Keyword_indices_t  keyword;
-
-  for ( keyword=0 ; keyword <= KEYWORD_LAST ; keyword++ )
-    KeywordsPresent[ keyword ] = FALSE;
-
-  for ( line = (Line_Control *) Lines.first ;
-        !_Chain_Is_last( &line->Node ) ; 
-        line = (Line_Control *) line->Node.next
-        ) {
-
-    KeywordsPresent[ line->keyword ] = TRUE;
-
-    switch ( line->keyword ) {
-      case ATTRIBUTE_DESCRIPTIONS:
-        count = NumberOfAttributes;
-        break;
-      case ASSOCIATION_DESCRIPTIONS:
-        count = NumberOfAssociations;
-        break;
-      case ABSTRACT_TYPE_DESCRIPTIONS:
-        count = NumberOfAbstractTypes;
-        break;
-      case DATA_ITEM_DESCRIPTIONS:
-        count = NumberOfDataItems;
-        break;
-      case METHOD_DESCRIPTIONS:
-        count = NumberOfMethods;
-        break;
-      case TASK_DESCRIPTIONS:
-        count = NumberOfTasks;
-        break;
-      default:
-        count = -1;
-        break;
-    }
-    if ( count == -1 )
-      continue;
-
-    none_present = strstr( line->Contents, "none" );
-
-    /* valid cases are (none_present && !count) AND (!none_present && count) */
-    if ( none_present && count ) {
-      fprintf(
-        stderr,
-        "\nLine %d : %s\n",
-        line->number,
-        "section header says \"none\" and there are subsections"
-      );
-      PrintSurroundingLines( line, 0,  0 );
-      fprintf( stderr, "\n" );
-      errors++;
-    }
-    if ( !none_present && !count ) {
-      fprintf(
-        stderr,
-        "\nLine %d : %s\n",
-        line->number,
-        "section header does not say \"none\" and there are no subsections"
-      );
-      PrintSurroundingLines( line, 0,  0 );
-      fprintf( stderr, "\n" );
-      errors++;
-    }
-  }
-
-  for ( keyword=0 ; keyword <= KEYWORD_LAST ; keyword++ ) {
-    if ( Keywords[ keyword ].level != SECTION )
-      continue;
-
-    if ( !KeywordsPresent[ keyword ] ) {
-      fprintf(
-        stderr,
-        "Section (%s) is missing\n",
-        Keywords[ keyword ].Name
-      );
-      errors++;
-    }
-  }
-
-  return (errors) ? -1 : 0;
-}
-
-/*
- *  ReportMissingKeywords
- */
-
-int ReportMissingKeywords(
-  Section_info_t  *section,
-  Line_Control    *line,
-  int              elements_present[ MAXIMUM_ELEMENTS ]
-)
-{
-  int       i;
-  int       errors = 0;
-  int       last_found;
-
-#ifdef SECTION_DEBUG
-  PrintLine( line );
-  for ( i=0 ; i < MAXIMUM_ELEMENTS ; i++ )
-    fprintf( stderr, "%d ", elements_present[ i ] );
-  fprintf( stderr, "\n" );
-#endif
-  
-  /*
-   *  Check for missing sections
-   */
-
-  for ( i=0 ; i < MAXIMUM_ELEMENTS ; i++ ) {
-    if ( section->Description[ i ].keyword == UNUSED )
-      break;
-
-#ifdef SECTION_DEBUG
-    fprintf(
-      stderr, 
-      "%d %d %s\n",
-      section->Description[ i ].is_required,
-      elements_present[ i ],
-      Keywords[ section->Description[ i ].keyword ].Name
-    );
-#endif
-
-    if ( section->Description[ i ].is_required && elements_present[i] == -1 ) {
-      fprintf( 
-        stderr,
-        "Section starting at line %d is missing the %s keyword\n",
-        line->number,
-        Keywords[ section->Description[ i ].keyword ].Name
-      );
-      errors++;
-    }
-  }
-
-  last_found = -1;
-
-  for ( i=0 ; i < MAXIMUM_ELEMENTS ; i++ ) {
-    if ( section->Description[ i ].keyword == UNUSED )
-      break;
-
-    if ( elements_present[i] == -1 )
-      continue;
-
-    if ( elements_present[i] > last_found ) {
-      last_found = elements_present[i];
-      continue;
-    }
-
-    fprintf(
-      stderr,
-      "Keywords in the section starting at line %d are in the wrong order\n",
-      line->number
-    );
-    errors++;
-    break;
-
-  }
-
-  return errors;
-}
-
-/*
- *  ScanForNextSection
- */
-
-Line_Control *ScanForNextSection(
-  Line_Control   *start_line,
-  Section_info_t *section
-)
-{
-  Line_Control   *line;
-  Element_info_t *Elements;
-
-  line = start_line;
-  Elements = section->Description;
-
-  for ( ;; ) {
-    line = (Line_Control *) line->Node.next;
-
-    if ( line->keyword == END_OBJECT ) 
-      break;
-
-    assert( line );
-    assert( !_Chain_Is_last( &line->Node ) );
-
-    if ( Keywords[ line->keyword ].level == SECTION && 
-         section->Next_section != line->keyword ) {
-
-        fprintf( 
-          stderr,
-          "Sections appear to be out of order at line %d\n",
-          start_line->number
-        );
-        return NULL;
-    }
-
-    if ( section->Next_section == line->keyword )   /* next section */
-      break;
-
-    if ( Elements[ 0 ].keyword == line->keyword )   /* repeating subsection */
-      break;
-  }
-
-  return line;
-}
-
-/*
- *  CheckSections
- */
-
-int CheckSections( void )
-{
-  Line_Control   *line;
-  Line_Control   *scan_line;
-  Section_info_t *section;
-  Keyword_info_t *key;
-  Element_info_t *Elements;
-  int             elements_present[ MAXIMUM_ELEMENTS ];
-  boolean         stay_in_subsection;
-  int             i;
-  int             errors;
-  int             subsection;
-  int             element;
-  int             keyword_count;
-  Line_Control   *next_section;
-
-  errors = 0;
-  line = (Line_Control *) Lines.first;
-
-  for ( i=0 ; i < NUMBER_ELEMENTS( Sections ) ; i++ ) {
-    section = Sections[ i ];
-    Elements = section->Description;
-    subsection = 0;
-
-    if ( strstr( line->Contents, "none" ) ) {
-      next_section = ScanForNextSection( line, section );
-      if ( !next_section ) {
-        errors++;
-        goto end_object;
-      }
-      line = next_section;
-      if ( line->keyword == END_OBJECT )
-        goto end_object;
-      continue;
-    }
-
-    while ( Elements[ 0 ].keyword != line->keyword ) {
-      if ( line->keyword == END_OBJECT )
-        goto end_object;
-
-      if( !line || _Chain_Is_last( &line->Node ) ) {
-        fprintf( stderr, "out of sync -- aborting\n" );
-        errors++;
-        goto end_object;
-      }
-      line = (Line_Control *) line->Node.next;
-    }
-
-repeating_subsection:
-
-#ifdef SECTION_DEBUG
-    fprintf( stderr, "Checking Section %d Subsection %d\n", i, subsection );
-#endif
-    assert( line );
-    assert( !_Chain_Is_last( &line->Node ) );
-  
-    /*
-     *  Per Subsection Initialization
-     */
-
-    subsection++;
-
-    keyword_count = 0;
-
-    next_section = ScanForNextSection( line, section );
-    if ( !next_section ) {
-      errors++;
-      goto end_object;
-    }
-
-    for ( element=0 ; element < MAXIMUM_ELEMENTS ; element++ )
-      elements_present[ element ] = -1;
-
-    /*  
-     *  Do a subsection
-     */
-
-    /*  validate each keyword */
-
-    for ( scan_line = line ; ; ) {
-
-      if ( !scan_line->keyword ) {
-        scan_line = (Line_Control *) scan_line->Node.next;
-        continue;
-      }
-
-      if ( scan_line == next_section )
-        break;
-
-      if ( *Keywords[ scan_line->keyword ].keyword_validation_routine ) {
-        if ( (*Keywords[ scan_line->keyword ].keyword_validation_routine )(
-               scan_line
-              ) ) errors++;
-      }
-
-      scan_line = (Line_Control *) scan_line->Node.next;
-    }
-
-    /* scan subsection for keywords */
-
-    for ( scan_line = line ; ; ) {
-
-      if ( !scan_line->keyword ) {
-        scan_line = (Line_Control *) scan_line->Node.next;
-        continue;
-      }
-
-      if ( scan_line == next_section )
-        break;
-
-      for ( element=0 ; element < MAXIMUM_ELEMENTS ; element++ ) {
-        if ( scan_line->keyword == Elements[ element ].keyword ) {
-          if ( elements_present[ element ] != -1 ) {
-            fprintf( 
-              stderr,
-              "Section starting at line %d has the %s keyword more than once\n",
-              line->number,
-              Keywords[ Elements[ i ].keyword ].Name
-            );
-            errors++;
-          }
-          
-#ifdef SECTION_DEBUG
-          fprintf( stderr, "FOUND %s %d %d\n", 
-            Keywords[ Elements[ element ].keyword ].Name, 
-            element, keyword_count ); 
-#endif
-          elements_present[ element ] = keyword_count++;
-          break;
-        }
-        if ( Elements[ element ].keyword == UNUSED )
-          break;
-      }
-
-      scan_line = (Line_Control *) scan_line->Node.next;
-    }
-    errors += ReportMissingKeywords( section, line, elements_present );
-
-    /*
-     *  Validate the section as a whole
-     */
-     
-    if ( section->section_validation_routine ) {
-      if ( (*section->section_validation_routine)(section, line, next_section) )
-        errors++;
-    }
-
-scan_for_next_section:
-    /*
-     *  Scan forward until next subsection or next section
-     */
-
-#ifdef SECTION_DEBUG
-    fprintf( stderr, "End of Subsection\n" );
-#endif
-    line = next_section;
-    if ( line->keyword == END_OBJECT ) {
-      goto end_object;
-    }
-
-    if ( Elements[ 0 ].keyword == line->keyword ) { /* repeating subsection */
-      if ( !section->repeats ) {
-        fprintf(
-          stderr,
-          "Invalid repeating subsection starting at line %d\n",
-          line->number
-        );
-        errors++;
-        goto end_object;
-      }
-      goto repeating_subsection;
-    }
- 
-  }
-
-end_object:
-  return (errors) ? -1 : 0;
-}
-/*
- *  RemovePagebreaks
- */
-
-void RemovePagebreaks()
-{
-  Line_Control *line;
-
-  for ( line = (Line_Control *) Lines.first ;
-        !_Chain_Is_last( &line->Node ) ; 
-        ) {
-    if ( !strcmp( line->Contents, PAGE_SEPARATOR ) ) 
-        line = DeleteLine( line );
-    else 
-      line = (Line_Control *) line->Node.next;
-  }
-}
-
-/*
- *  strIsAllSpace
- */
-
-boolean strIsAllSpace(
-  char *s
-)
-{
-  char *p;
-
-  for ( p = s ; *p ; p++ )
-    if ( !isspace( *p ) )
-      return FALSE;
-
-  return TRUE;
-}
-
-/*
- *  RemoveExtraBlankLines
- *
- *  NOTE:  Be careful not remove to remove white space in raw text.
- */
-
-int RemoveExtraBlankLines()
-{
-  Line_Control *line;
-  Line_Control *previous;
-  int errors;
-
-  errors = 0;
-
-  for ( line = (Line_Control *) Lines.first ;
-        !_Chain_Is_last( &line->Node ) ; 
-        line = (Line_Control *) line->Node.next
-        ) {
-    if ( line->keyword || line->format )
-      continue;
-
-    if ( !strlen( line->Contents ) ) {
-      line = DeleteLine( line );
-      line = (Line_Control *) line->Node.previous;
-      continue;
-    }
-
-    fprintf(
-      stderr,
-      "\nLine %d is not associated with a keyword:\n", 
-      line->number
-    );
-    PrintSurroundingLines( line, 0,  0 );
-    fprintf( stderr, "\n" );
-    errors++;
-  }
-  return ( errors ) ? -1 : 0;
-}
-
-/*
- *  strCopyToColon
- */
-
-void strCopyToColon(
-  char *src,
-  char *dest
-)
-{
-  char *s = src;
-  char *d = dest;
-
-  for ( ; *s && *s != ':' ; ) 
-    *d++ = *s++;
-  *d ='\0';
-}
-
-/*
- *  BuildTexinfoNodes
- */
-
-void BuildTexinfoNodes( void ) 
-{
-  Line_Control *line;
-  Line_Control *new_line;
-  Line_Control *next_node;
-  char          Buffer[ BUFFER_SIZE ];
-  char          ObjectName[ BUFFER_SIZE ];
-  char          NodeName[ BUFFER_SIZE ];
-  char          NextNode[ BUFFER_SIZE ];
-  char          NextNodeName[ BUFFER_SIZE ];
-  char          PreviousNodeName[ BUFFER_SIZE ];
-  char          UpNodeName[ BUFFER_SIZE ];
-  char          SectionName[ BUFFER_SIZE ];
-  char          MenuBuffer[ BUFFER_SIZE ];
-  Line_Control *menu_insert_point;
-  Line_Control *node_line;
-  boolean       next_found;
-  int           menu_items;
-
-  strcpy( PreviousNodeName, DocsPreviousNode );
-
-  for ( line = (Line_Control *) Lines.first ;
-        !_Chain_Is_last( &line->Node ) ; 
-        line = (Line_Control *) line->Node.next
-      ) {
-    menu_insert_point = (Line_Control *) line->Node.next;
-
-    switch ( Keywords[ line->keyword ].level ) {
-      case TEXT:
-      case HEADING:
-        break;
-      case SECTION:
-        if ( line->keyword == END_OBJECT )
-          goto bottom; 
-
-        if ( line->keyword == OBJECT ) {
-          LineCopyFromRight( line, Buffer );
-          sprintf( ObjectName, "%s Object", Buffer );
-          strcpy( NodeName, ObjectName );
-          strcpy( UpNodeName, DocsUpNode );
-        } else {
-          LineCopySectionName( line, Buffer );
-          sprintf( NodeName, "%s %s", ObjectName, Buffer );
-          strcpy( UpNodeName, ObjectName );
-        }
-        strtoInitialCaps( NULL, NodeName );
-        strtoInitialCaps( NULL, UpNodeName );
-        strcpy( SectionName, NodeName );
-
-        /*
-         *  Go ahead and put it on the chain in the right order (ahead of
-         *  the menu) and we can fill it in later (after the menu is built).
-         */
-
-        new_line = AllocateLine();
-        strcpy( new_line->Contents, "@ifinfo" );
-        _Chain_Insert( line->Node.previous, &new_line->Node );
-
-        node_line = AllocateLine();
-        _Chain_Insert( line->Node.previous, &node_line->Node );
-
-        new_line = AllocateLine();
-        strcpy( new_line->Contents, "@end ifinfo" );
-        _Chain_Insert( line->Node.previous, &new_line->Node );
-
-        menu_items = 0;
-       
-        if ( line->keyword == OBJECT ) {
-          next_node = (Line_Control *) line->Node.next;
-          next_found = FALSE;
-          for ( ; ; ) {
-            if ( next_node->keyword == END_OBJECT )
-              break;
-            if ( Keywords[ next_node->keyword ].level == SECTION ) {
-              LineCopySectionName( next_node, Buffer );
-              strtoInitialCaps( NULL, Buffer );     
-
-              if ( !next_found ) {
-                next_found = TRUE;
-                sprintf( NextNodeName, "%s %s", ObjectName, Buffer );
-              }
-              if ( menu_items == 0 ) {
-                new_line = AllocateLine();
-                strcpy( new_line->Contents, "@ifinfo" );
-                _Chain_Insert( menu_insert_point->Node.previous, &new_line->Node );
- 
-                new_line = AllocateLine();
-                strcpy( new_line->Contents, "@menu" );
-                _Chain_Insert( menu_insert_point->Node.previous, &new_line->Node );
-              }
-
-              menu_items++;
-
-              new_line = AllocateLine();
-              sprintf( new_line->Contents, "* %s %s::", ObjectName, Buffer );
-              _Chain_Insert( menu_insert_point->Node.previous, &new_line->Node);
-            }
-            next_node = (Line_Control *) next_node->Node.next;
-          }
-        } else {
-          next_node = (Line_Control *) line->Node.next;
-        
-          next_found = FALSE;
-          for ( ; ; ) {
-            if ( Keywords[ next_node->keyword ].level == SECTION ) {
-              if ( !next_found ) {
-                if ( next_node->keyword == END_OBJECT ) {
-                  strcpy( NextNodeName, DocsNextNode );
-                } else {
-                  LineCopySectionName( next_node, Buffer );
-                  sprintf( NextNodeName, "%s %s", ObjectName, Buffer );
-                  strtoInitialCaps( NULL, NextNodeName );
-                }
-                next_found = TRUE;
-              }
-              break;
-            } else if ( Keywords[ next_node->keyword ].level == SUBSECTION ) {
-              LineCopySectionName( next_node, Buffer );
-              strtoInitialCaps( NULL, Buffer );
-              sprintf( MenuBuffer, "%s %s - ", ObjectName, Buffer );
-              LineCopyFromRight( next_node, Buffer );
-              strcat( MenuBuffer, Buffer );
-
-              if ( menu_items == 0 ) {
-                new_line = AllocateLine();
-                strcpy( new_line->Contents, "@ifinfo" );
-                _Chain_Insert( menu_insert_point->Node.previous, &new_line->Node );
- 
-                new_line = AllocateLine();
-                strcpy( new_line->Contents, "@menu" );
-                _Chain_Insert( menu_insert_point->Node.previous, &new_line->Node );
-              }
-
-              menu_items++;
-
-              new_line = AllocateLine();
-              sprintf( new_line->Contents, "* %s::", MenuBuffer );
-              _Chain_Insert( menu_insert_point->Node.previous, &new_line->Node );
-
-              if ( !next_found ) {
-                next_found = TRUE;
-                strcpy( NextNodeName, MenuBuffer );
-              }
-            }
-            next_node = (Line_Control *) next_node->Node.next;
-          }
-        }
-
-        if ( menu_items ) {
-          new_line = AllocateLine();
-          strcpy( new_line->Contents, "@end menu" );
-          _Chain_Insert( menu_insert_point->Node.previous, &new_line->Node );
- 
-          new_line = AllocateLine();
-          strcpy( new_line->Contents, "@end ifinfo" );
-          _Chain_Insert( menu_insert_point->Node.previous, &new_line->Node );
-        }
-
-#if 0
-        fprintf(
-          stderr,
-          "@node %s, %s, %s, %s\n",
-          NodeName,
-          NextNodeName,
-          PreviousNodeName,
-          UpNodeName
-        );
-#endif
-        /* node_line was previously inserted */
-        sprintf(
-          node_line->Contents,
-          "@node %s, %s, %s, %s",
-          NodeName,
-          NextNodeName,
-          PreviousNodeName,
-          UpNodeName
-        );
-
-        strcpy( PreviousNodeName, NodeName );
-        break;
-
-      case SUBSECTION:
-        strcpy( UpNodeName, SectionName );
-
-        LineCopySectionName( line, Buffer );
-        strtoInitialCaps( NULL, Buffer );
-        sprintf( NodeName, "%s %s - ", ObjectName, Buffer );
-        LineCopyFromRight( line, Buffer );
-        strcat( NodeName, Buffer );
-
-        new_line = AllocateLine();
-        strcpy( new_line->Contents, "@ifinfo" );
-        _Chain_Insert( line->Node.previous, &new_line->Node );
-
-        next_node = (Line_Control *) line->Node.next;
-        for ( ; ; ) {
-          if ( Keywords[ next_node->keyword ].level == SECTION ) {
-            if ( next_node->keyword == END_OBJECT ) {
-              strcpy( NextNodeName, DocsNextNode );
-            } else {
-              LineCopySectionName( next_node, Buffer );
-              sprintf( NextNodeName, "%s %s", ObjectName, Buffer );
-              strtoInitialCaps( NULL, NextNodeName );
-            }
-            break;
-          } else if ( Keywords[ next_node->keyword ].level == SUBSECTION ) {
-            LineCopySectionName( next_node, Buffer );
-            strtoInitialCaps( NULL, Buffer );
-            sprintf( NextNodeName, "%s %s - ", ObjectName, Buffer );
-            LineCopyFromRight( next_node, Buffer );
-            strcat( NextNodeName, Buffer );
-            break;
-          }
-          next_node = (Line_Control *) next_node->Node.next;
-        }
-
-#if 0
-        fprintf(
-          stderr,
-          "@node %s, %s, %s, %s\n",
-          NodeName,
-          NextNodeName,
-          PreviousNodeName,
-          UpNodeName
-        );
-#endif
-        new_line = AllocateLine();
-        sprintf(
-          new_line->Contents,
-          "@node %s, %s, %s, %s",
-          NodeName,
-          NextNodeName,
-          PreviousNodeName,
-          UpNodeName
-        );
-        _Chain_Insert( line->Node.previous, &new_line->Node );
-
-        new_line = AllocateLine();
-        strcpy( new_line->Contents, "@end ifinfo" );
-        _Chain_Insert( line->Node.previous, &new_line->Node );
-
-        strcpy( PreviousNodeName, NodeName );
-        break;
-    }
-  }
-bottom:
-}
-
-/*
- *  FormatToTexinfo
- */
-
-char *Texinfo_Headers[] = {
-  "\\input texinfo   @c -*-texinfo-*-",
-  "@c %**start of header",
-  "@setfilename ",
-  "@settitle ",
-  "@paragraphindent 0",
-  "@c %**end of header",
-  "",
-  "@c",
-  "@c  COPYRIGHT (c) 1996.",
-  "@c  On-Line Applications Research Corporation (OAR).",
-  "@c  All rights reserved.",
-  "@c",
-  "@c  This file is automatically generated.  DO NOT EDIT!!",
-  "@c",
-  "",
-  "@c  This prevents a black box from being printed on overfull lines.",
-  "@c  The alternative is to rework a sentence to avoid this problem.",
-  "@finalout",
-  "",
-  "@tex",
-  "\\global\\parindent 0in",
-  "\\global\\chapheadingskip = 15pt plus 4pt minus 2pt",
-  "\\global\\secheadingskip = 12pt plus 4pt minus 2pt",
-  "\\global\\subsecheadingskip = 9pt plus 4pt minus 2pt",
-  "",
-  "@ifclear smallbook",
-  "\\global\\parskip 6pt plus 1pt",
-  "@end ifclear",
-  "@end tex",
-  "@setchapternewpage odd",
-  "@ifinfo",
-  "@top ",
-  "@node Top, (dir), (dir), (dir)",
-  "@end ifinfo",
-  "@c ",
-  "@c This is the end of the header block",
-  "@c "
-};
-
-void FormatToTexinfo( void )
-{
-  Line_Control *line;
-  Line_Control *new_line;
-  char          Buffer[ PARAGRAPH_SIZE ];
-  int           i;
-  char          ChapterTitle[ PARAGRAPH_SIZE ];
-  char          InfoFile[ PARAGRAPH_SIZE ];
-  char          *p;
-  boolean        new_section; 
-  boolean        in_bullets; 
-
-  for ( line = (Line_Control *) Lines.first ;
-        !_Chain_Is_last( &line->Node ) ; 
-      ) {
-
-    switch ( line->keyword ) {
-      case UNUSED:
-        line = (Line_Control *) line->Node.next;
-        break;
-
-      case OBJECT:
-        LineCopyFromRight( line, ChapterTitle );
-        strcpy( InfoFile, ChapterTitle );
-
-        for ( p=InfoFile ; *p ; *p++ )   /* turn this into a file name */
-          if ( isspace( *p ) )
-            *p = '_';             
-
-        sprintf( Buffer, "@chapter %s", line->Contents );
-        strcpy( line->Contents, Buffer );
-        line = (Line_Control *) line->Node.next;
-        break;
-
-      case ATTRIBUTE_DESCRIPTIONS:
-      case ASSOCIATION_DESCRIPTIONS:
-      case ABSTRACT_TYPE_DESCRIPTIONS:
-      case DATA_ITEM_DESCRIPTIONS:
-      case METHOD_DESCRIPTIONS:
-      case TASK_DESCRIPTIONS:
-        sprintf( Buffer, "@section %s", line->Contents );
-        strcpy( line->Contents, Buffer );
-
-        new_line = AllocateLine();
-        strcpy( new_line->Contents, "@page" );
-        _Chain_Insert( line->Node.previous, &new_line->Node );
-
-        line = (Line_Control *) line->Node.next;
-        new_section = TRUE;
-        break;
-
-      case END_OBJECT:
-        line->Contents[ 0 ] = '\0';
-        goto bottom;
-
-      case ATTRIBUTE:
-      case ASSOCIATION:
-      case ABSTRACT_TYPE:
-      case DATA_ITEM:
-        if ( !new_section ) {
-          new_line = AllocateLine();
-          strcpy( new_line->Contents, "@need 4000" );
-          _Chain_Insert( line->Node.previous, &new_line->Node );
-        }
-        new_section = FALSE;
-        sprintf( Buffer, "@subsection %s", line->Contents );
-        strcpy( line->Contents, Buffer );
-        line = (Line_Control *) line->Node.next;
-         break;
-
-      case METHOD:
-      case TASK:
-        if ( !new_section ) {
-          new_line = AllocateLine();
-          strcpy( new_line->Contents, "@page" );
-          _Chain_Insert( line->Node.previous, &new_line->Node );
-        }
-        new_section = FALSE;
-        sprintf( Buffer, "@subsection %s", line->Contents );
-        strcpy( line->Contents, Buffer );
-        line = (Line_Control *) line->Node.next;
-        break;
-
-      case DESCRIPTION:
-      case COPYRIGHT:
-      case PORTING:
-      case THEORY_OF_OPERATION:
-      case DEPENDENCIES:
-      case NOTES:
-        sprintf( Buffer, "@subheading %s\n", line->Contents );
-        strcpy( line->Contents, Buffer );
-        line = (Line_Control *) line->Node.next;
-
-        /* now take care of the paragraphs which are here */
-
-        in_bullets = FALSE;
-        do {
-          line = (Line_Control *) line->Node.next;
-          if ( line->format == BULLET_OUTPUT ) {
-            if ( !in_bullets ) {
-              in_bullets = TRUE;
-
-              new_line = AllocateLine();
-              _Chain_Insert( line->Node.previous, &new_line->Node );
-
-              new_line = AllocateLine();
-              strcpy( new_line->Contents, "@itemize @bullet" );
-              _Chain_Insert( line->Node.previous, &new_line->Node );
-            }
-            sprintf( Buffer, "@item %s\n", line->Contents );
-            strcpy( line->Contents, Buffer );
-          } else if ( in_bullets ) {
-            in_bullets = FALSE;
-
-            new_line = AllocateLine();
-            strcpy( new_line->Contents, "@end itemize" );
-            _Chain_Insert( line->Node.previous, &new_line->Node );
-
-            new_line = AllocateLine();
-            _Chain_Insert( line->Node.previous, &new_line->Node );
-          } else {
-            new_line = AllocateLine();
-            _Chain_Insert( line->Node.previous, &new_line->Node );
-          }
-        } while ( !line->keyword );
-
-        break;
-
-      case DERIVATION:
-      case TYPE:
-      case RANGE:
-      case UNITS:
-      case SCALE_FACTOR:
-      case TOLERANCE:
-      case VISIBILITY:
-      case ASSOCIATED_WITH:
-      case MULTIPLICITY:
-      case TIMING:
-        sprintf( Buffer, "@subheading %s\n", line->Contents );
-        strcpy( line->Contents, Buffer );
-        line = (Line_Control *) line->Node.next;
-        break;
-
-      case MEMBERS:
-      case DEFAULT:
-      case REQUIREMENTS:
-      case REFERENCES:
-      case INPUTS:
-      case OUTPUTS:
-      case PDL:
-      case SYNCHRONIZATION:
-        sprintf( Buffer, "@subheading %s\n", line->Contents );
-        strcpy( line->Contents, Buffer );
-
-        /* now take care of the raw text which is here */
-
-        new_line = AllocateLine();
-        strcpy( new_line->Contents, "@example" );
-        _Chain_Insert( &line->Node, &new_line->Node );
-
-        do {
-          line = (Line_Control *) line->Node.next;
-          if ( !strlen( line->Contents ) ) {
-            new_line = AllocateLine();
-            strcpy( new_line->Contents, "@end example" );
-            _Chain_Insert( line->Node.previous, &new_line->Node );
-
-            new_line = AllocateLine();
-            strcpy( new_line->Contents, "@example" );
-            _Chain_Insert( &line->Node, &new_line->Node );
-
-          } 
-        } while ( !line->keyword );
-
-        new_line = AllocateLine();
-        strcpy( new_line->Contents, "@end example" );
-        _Chain_Insert( line->Node.previous, &new_line->Node );
-        /* at this point line points to the next keyword */
-        break;
-
-      case RAW_EXAMPLE:
-
-        /* now take care of the raw text which is here */
-
-        new_line = AllocateLine();
-        strcpy( new_line->Contents, "@example" );
-        _Chain_Insert( line->Node.previous, &new_line->Node );
-
-        while ( line->keyword == RAW_EXAMPLE ) {
-          line = (Line_Control *) line->Node.next;
-        }
-
-        new_line = AllocateLine();
-        strcpy( new_line->Contents, "@end example" );
-        _Chain_Insert( line->Node.previous, &new_line->Node );
-
-        /* at this point line points to the next keyword */
-        break;
-
-    }   
-  }
-
-bottom:
-#if 0
-  for ( i=NUMBER_ELEMENTS( Texinfo_Headers ) - 1 ; i >= 0 ; i-- ) {
-    new_line = AllocateLine();
-    strcpy( new_line->Contents, Texinfo_Headers[ i ] );
-    if ( !strcmp( "@setfilename ", new_line->Contents ) )
-      strcat( new_line->Contents, ChapterTitle );
-    else if ( !strcmp( "@settitle ", new_line->Contents ) )
-      strcat( new_line->Contents, InfoFile );
-    else if ( !strcmp( "@top ", new_line->Contents ) )
-      strcat( new_line->Contents, InfoFile );
-    _Chain_Insert( _Chain_Head( &Lines ), &new_line->Node );
-  }
-
-  /*
-   *  Remove the special end of object string.  No one wants to see 
-   *  it in the printed output and the node is already marked "END_OBJECT".
-   */
-
-  ((Line_Control *)Lines.last)->Contents[ 0 ] = '\0';
-
-  new_line = AllocateLine();
-  strcpy( new_line->Contents, "@bye" );
-  _Chain_Append( &Lines, &new_line->Node );
-
-#endif
-  if ( Verbose )
-    fprintf( stderr, "-------->INSERTING TEXINFO MENUS\n" );
-
-  BuildTexinfoNodes();
-}
-
-/*
- *  FormatToWord
- */
-
-void FormatToWord( void )
-{
-  Line_Control *line;
-  Line_Control *new_line;
-  char          Buffer[ PARAGRAPH_SIZE ];
-  int           i;
-  int           length;
-  char          ChapterTitle[ PARAGRAPH_SIZE ];
-  char          InfoFile[ PARAGRAPH_SIZE ];
-  char         *p;
-  boolean       new_section; 
-  boolean       in_bullets; 
-
-  for ( line = (Line_Control *) Lines.first ;
-        !_Chain_Is_last( &line->Node ) ; 
-      ) {
-
-    switch ( line->keyword ) {
-      case UNUSED:
-        line = (Line_Control *) line->Node.next;
-        break;
-
-      case OBJECT:
-        LineCopyFromRight( line, ChapterTitle );
-        strcpy( InfoFile, ChapterTitle );
-
-        for ( p=InfoFile ; *p ; *p++ )   /* turn this into a file name */
-          if ( isspace( *p ) )
-            *p = '_';             
-
-        sprintf( Buffer, "@Chapter = %s", line->Contents );
-        strcpy( line->Contents, Buffer );
-        line = (Line_Control *) line->Node.next;
-        break;
-
-      case ATTRIBUTE_DESCRIPTIONS:
-      case ASSOCIATION_DESCRIPTIONS:
-      case ABSTRACT_TYPE_DESCRIPTIONS:
-      case DATA_ITEM_DESCRIPTIONS:
-      case METHOD_DESCRIPTIONS:
-      case TASK_DESCRIPTIONS:
-        sprintf( Buffer, "@Section = %s", line->Contents );
-        strcpy( line->Contents, Buffer );
-
-        new_line = AllocateLine();
-        strcpy( new_line->Contents, "@Page" );
-        _Chain_Insert( line->Node.previous, &new_line->Node );
-
-        line = (Line_Control *) line->Node.next;
-        new_section = TRUE;
-        break;
-
-      case END_OBJECT:
-        line->Contents[ 0 ] = '\0';
-        goto bottom;
-
-      case ATTRIBUTE:
-      case ASSOCIATION:
-      case ABSTRACT_TYPE:
-      case DATA_ITEM:
-        if ( !new_section ) {
-          /*
-           *  Do something with the style to keep subsection
-           *  contents together
-           */
-          ;
-        }
-        new_section = FALSE;
-        sprintf( Buffer, "@Subsection = %s", line->Contents );
-        strcpy( line->Contents, Buffer );
-        line = (Line_Control *) line->Node.next;
-        break;
-
-      case METHOD:
-      case TASK:
-        if ( !new_section ) {
-          new_line = AllocateLine();
-          strcpy( new_line->Contents, "@Page" );
-          _Chain_Insert( line->Node.previous, &new_line->Node );
-        }
-        new_section = FALSE;
-        sprintf( Buffer, "@Subsection = %s", line->Contents );
-        strcpy( line->Contents, Buffer );
-        line = (Line_Control *) line->Node.next;
-        break;
-
-      case DESCRIPTION:
-      case COPYRIGHT:
-      case PORTING:
-      case THEORY_OF_OPERATION:
-      case DEPENDENCIES:
-      case NOTES:
-        sprintf( Buffer, "@Subheading = %s\n", line->Contents );
-        strcpy( line->Contents, Buffer );
-        line = (Line_Control *) line->Node.next;
-
-        /* now take care of the paragraphs which are here */
-
-        in_bullets = FALSE;
-        do {
-          line = (Line_Control *) line->Node.next;
-          if ( line->format == BULLET_OUTPUT ) {
-            if ( !in_bullets ) {
-              in_bullets = TRUE;
-
-              new_line = AllocateLine();
-              _Chain_Insert( line->Node.previous, &new_line->Node );
-            }
-            sprintf( Buffer, "@Bullet = %s\n", line->Contents );
-            strcpy( line->Contents, Buffer );
-          } else if ( in_bullets ) {
-            in_bullets = FALSE;
-
-            new_line = AllocateLine();
-            _Chain_Insert( line->Node.previous, &new_line->Node );
-          } else {
-            new_line = AllocateLine();
-            _Chain_Insert( line->Node.previous, &new_line->Node );
-          }
-        } while ( !line->keyword );
-
-        break;
-
-      case DERIVATION:
-      case TYPE:
-      case RANGE:
-      case UNITS:
-      case SCALE_FACTOR:
-      case TOLERANCE:
-      case VISIBILITY:
-      case ASSOCIATED_WITH:
-      case MULTIPLICITY:
-      case TIMING:
-        sprintf( Buffer, "@Subheading = %s\n", line->Contents );
-        strcpy( line->Contents, Buffer );
-        line = (Line_Control *) line->Node.next;
-        break;
-
-      case MEMBERS:
-      case DEFAULT:
-      case REQUIREMENTS:
-      case REFERENCES:
-      case INPUTS:
-      case OUTPUTS:
-      case PDL:
-      case SYNCHRONIZATION:
-        sprintf( Buffer, "@Subheading = %s\n", line->Contents );
-        strcpy( line->Contents, Buffer );
-        line = (Line_Control *) line->Node.next;
-
-        /* now take care of the raw text which is here */
-
-#if 0
-        while ( !line->keyword ) {
-          sprintf( Buffer, "@Example = %s\n", line->Contents );
-          strcpy( line->Contents, Buffer );
-          line = (Line_Control *) line->Node.next;
-        }
-
-        /* at this point line points to the next keyword */
-#endif
-
-        /* now take care of the raw text which is here */
-
-        new_line = AllocateLine();
-        _Chain_Insert( line->Node.previous, &new_line->Node );
-        strcpy( new_line->Contents, "@Example = " );
-
-        while ( !line->keyword ) {
-          if ( strlen( line->Contents ) ) {
-            new_line->keyword = line->keyword;
-            new_line->format = line->format;
-            length = strlen(new_line->Contents); 
-            if ( (length + strlen(line->Contents) + 12) > PARAGRAPH_SIZE ) {
-              fprintf( stderr, "Output line too long at %d\n", line->number );
-              exit_application( 1 );
-            }
-
-            strcat( new_line->Contents, line->Contents );
-            strcat( new_line->Contents, "<@ManualCR>" );
-            line = DeleteLine( line );
-          } else {
-            line = (Line_Control *) line->Node.next;
-            new_line = AllocateLine();
-            _Chain_Insert( line->Node.previous, &new_line->Node );
-            strcpy( new_line->Contents, "@Example = " );
-          }
-        }
-
-        /* at this point line points to the next keyword */
-        break;
-
-      case RAW_EXAMPLE:
-
-        /* now take care of the raw text which is here */
-
-        new_line = AllocateLine();
-        _Chain_Insert( line->Node.previous, &new_line->Node );
-        strcpy( new_line->Contents, "@Example = " );
-
-
-        while ( line->keyword == RAW_EXAMPLE ) {
-          if ( strlen( line->Contents ) ) {
-            new_line->keyword = line->keyword;
-            new_line->format = line->format;
-            length = strlen(new_line->Contents);
-            if ( (length + strlen(line->Contents) + 12) > PARAGRAPH_SIZE ) {
-              fprintf( stderr, "Output line too long at %d\n", line->number );
-              exit_application( 1 );
-            }
-
-            strcat( new_line->Contents, line->Contents );
-            strcat( new_line->Contents, "<@ManualCR>" );
-            line = DeleteLine( line );
-          } else {
-            line = (Line_Control *) line->Node.next;
-            new_line = AllocateLine();
-            _Chain_Insert( line->Node.previous, &new_line->Node );
-            strcpy( new_line->Contents, "@Example = " );
-          }
-        }
-
-        /* at this point line points to the next keyword */
-        break;
-
-    }   
-  }
-
-bottom:
-}
-
-/*
- *  PrintFile
- */
-
-void PrintFile(
-  char *out
-)
-{
-  Line_Control *line;
-
-  OutFile = fopen( out, "w+" );
-
-  if ( !OutFile ) {
-    fprintf( stderr, "Unable to open (%s) for output\n", out );
-    exit_application( 1 );
-  }
-  assert( OutFile );
-
-  for ( line = (Line_Control *) Lines.first ;
-        !_Chain_Is_last( &line->Node ) ; 
-        line = (Line_Control *) line->Node.next ) {
-    fprintf( OutFile, "%s\n", line->Contents );
-/*
-    fprintf(
-      OutFile,
-      "(%d,%d)%s\n",
-      line->keyword,
-      line->format,
-      line->Contents
-    );
-*/
-  }
-}
-
-/*
- *  DumpList
- */
-
-void DumpList( 
-  Chain_Control  *the_list
-)
-{
-  Line_Control  *line;
-
-  fprintf( stderr, "---> Dumping list (%p)\n", the_list );
-
-  for ( line = (Line_Control *) the_list->first ;
-      !_Chain_Is_last( &line->Node ) ; 
-      line = (Line_Control *) line->Node.next ) {
-    fprintf( stderr, "%s\n", line->Contents );
-  }
-}
-
-/*
- * ReleaseFile
- */
-
-void ReleaseFile()
-{
-   Line_Control *line;
-   Line_Control *next;
-
-   for ( line = (Line_Control *) Lines.first ;
-         !_Chain_Is_last( &line->Node ) ; 
-       ) {
-     next = (Line_Control *) line->Node.next;
-     line = next;
-   }
-}
-
-/*
- *  strtoInitialCaps
- */
-
-void strtoInitialCaps(
-  char *dest,
-  char *src
-)
-{
-  char *source = src;
-  char *destination = dest;
-
-  if ( !dest )
-    return;
-  strcpy( dest, src );
-#if 0
-  source = src;
-  destination = (dest) ? dest : src;
-
-  while ( *source ) {
-    while ( isspace( *source ) )
-      *destination++ = *source++;
-
-    if ( !*source )
-      break;
-
-    *destination++ = toupper( *source++ );
-
-    for ( ; *source && !isspace( *source ) ; source++ )
-      *destination++ = tolower( *source );
-     
-    if ( !*source )
-      break;
-  }
-
-  *destination = '\0';
-#endif
-}
-
-/*
- *  Validate_visibility
- */
- 
-char *Valid_visibilities[] = {
-  "public",
-  "private"
-};
- 
-int Validate_visibility(
-  Line_Control   *line
-)
-{
-  char   *s;
-  char   *d;
-  char    Buffer[ BUFFER_SIZE ];
-  char    Visibility[ BUFFER_SIZE ];
-  int     i;
-  boolean found;
-  int     errors = 0;
- 
-  LineCopyFromRight( line, Buffer );
- 
-  memset( Visibility, '\0', sizeof( Visibility ) );
-  s = Buffer;
- 
-  for ( d=Visibility ; ; s++, d++ ) {
-    *d = *s;
-    if ( !*s || isspace(*s) )
-      break;
-  }
-  *d = '\0';
- 
-  if ( isspace(*s) ) {
-    fprintf(
-       stderr,
-       "Unexpected white space on line %d -- are there multiple words?\n",
-       line->number
-     );
-     errors++;
-  }
- 
-  /*
-   *  Check out the type part of this keyword
-   */
- 
-  for ( found=FALSE, i=0 ; i<NUMBER_ELEMENTS(Valid_visibilities) ; i++ ) {
-    if ( !strcmp( Valid_visibilities[ i ], Visibility ) ) {
-      found = TRUE;
-      break;
-    }
-  }
- 
-  if ( !found ) {
-    if ( !(InsertTBDs && !strcmp( Visibility, "TBD" )) ) {
-      fprintf(
-        stderr,
-        "Invalid visibility type (%s) on line %d\n",
-        Visibility,
-        line->number
-      );
-      errors++;
-    }
-  }
- 
-  return (errors) ? -1 : 0;
-}
-
-/*
- *  Validate_synchronization
- */
- 
-char *Valid_synchronization[] = {
-  "delay",
-  "event",
-  "mutex",
-  "semaphore",
-  "message",
-  "signal",
-  "period"
-};
- 
-boolean Valid_synchronization_text_below[] = {
-  FALSE,   /* delay */
-  TRUE,    /* event */
-  TRUE,    /* mutex */
-  TRUE,    /* semaphore */
-  TRUE,    /* message */
-  TRUE,    /* signal */
-  FALSE    /* period */
-};
-
-int Validate_synchronization(
-  Line_Control   *line
-)
-{
-  char   *s;
-  char   *d;
-  char    Buffer[ BUFFER_SIZE ];
-  char    Synchronization[ BUFFER_SIZE ];
-  int     i;
-  boolean found;
-  int     errors = 0;
- 
-  LineCopyFromRight( line, Buffer );
- 
-  memset( Synchronization, '\0', sizeof( Synchronization ) );
-  s = Buffer;
- 
-  for ( d=Synchronization ; ; s++, d++ ) {
-    *d = *s;
-    if ( !*s || isspace(*s) )
-      break;
-  }
-  *d = '\0';
- 
-  if ( isspace(*s) ) {
-    fprintf(
-       stderr,
-       "Unexpected white space on line %d -- invalid use of multiple words\n",
-       line->number
-     );
-     errors++;
-  }
- 
-  /*
-   *  Check out the type part of this keyword
-   */
- 
-  for ( found=FALSE, i=0 ; i<NUMBER_ELEMENTS(Valid_synchronization) ; i++ ) {
-    if ( !strcmp( Valid_synchronization[ i ], Synchronization ) ) {
-      found = TRUE;
-      break;
-    }
-  }
- 
-  if ( !found ) {
-    fprintf(
-       stderr,
-       "Invalid synchronization type (%s) on line %d\n",
-       Synchronization,
-       line->number
-     );
-     errors++;
-  }
-
-  if ( line->keyword && !Valid_synchronization_text_below[ i ] ) {
-    fprintf(
-       stderr,
-       "Expected text below synchronization type (%s) on line %d\n",
-       Synchronization,
-       line->number
-     );
-     errors++;
-  }
- 
-  return (errors) ? -1 : 0;
-}
-
-/*
- *  Validate_abstract_type
- *
- * presence of range or members but not both
- */
-
-int Validate_abstract_type(
-  Section_info_t *section,
-  Line_Control   *start,
-  Line_Control   *next_section
-)
-{
-  boolean       range_found = FALSE;
-  boolean       members_found = FALSE;
-  boolean       enumerated_found = FALSE;
-  boolean       no_range_or_members = FALSE;
-  boolean       true_found = FALSE;
-  boolean       false_found = FALSE;
-  Line_Control *line;
-  int           errors = 0;
-
-  for ( line = start; 
-        line != next_section ; 
-        line = (Line_Control *) line->Node.next ) {
-    if ( line->keyword == RANGE ) 
-      range_found = TRUE;
-    else if ( line->keyword == MEMBERS ) {
-      members_found = TRUE;
-    } else if ( line->keyword == TYPE ) {
-      if ( strstr( line->Contents, "enumerated" ) || 
-           strstr( line->Contents, "structure" ) )
-        enumerated_found = TRUE;
-    } else if ( line->keyword == DERIVATION ) {
-      if ( strstr( line->Contents, "enumerated" ) || 
-           strstr( line->Contents, "structure" ) ) {
-        enumerated_found = TRUE;
-      } else if ( strstr( line->Contents, "handle" ) || 
-                  strstr( line->Contents, "array" ) || 
-                  strstr( line->Contents, "string" ) ) {
-        no_range_or_members = TRUE;
-      }
-    }
-  }
-
-  if ( no_range_or_members ) {
-/* This code does not like:
-
-ABSTRACT TYPE: Times
-  DESCRIPTION:
-    This type specifies mode elapsed times.
-  VISIBILITY: public
-  DERIVATION: array of Elapsed_Seconds of Timeutil
-  RANGE: COMM - ENGAGE of Current_mode_t
-
-    if ( range_found ) {
-       fprintf(
-         stderr,
-         "Range should not be specified in subsection starting at line %d\n",
-         start->number
-       );
-       errors++;
-    }
-*/
-    if ( members_found ) {
-       fprintf(
-         stderr,
-         "Members should not be specified in subsection starting at line %d\n",
-         start->number
-       );
-       errors++;
-    }
-  } else {
-    if ( !range_found && !members_found ) {
-      fprintf(
-         stderr,
-         "Neither range nor members keyword present in "
-           "subsection starting at line %d\n",
-         start->number
-       );
-       errors++;
-    }
-
-    if ( !enumerated_found  && !range_found ) {
-      fprintf(
-         stderr,
-         "Type does not have range specified in "
-           "subsection starting at line %d\n",
-         start->number
-       );
-       errors++;
-    }
-
-  }
-
-  if ( !InsertTBDs ) {
-    if ( range_found && members_found ) {
-      fprintf(
-         stderr,
-         "Both range and members keyword present in "
-           "subsection starting at line %d\n",
-         start->number
-       );
-       errors++;
-    }
-  }  
-
-  if ( enumerated_found  && !members_found ) {
-    fprintf(
-       stderr,
-       "Enumerated type without list of members in "
-         "subsection starting at line %d\n",
-       start->number
-     );
-     errors++;
-  }
-
-  return (errors) ? -1 : 0;
-}
-
-/*
- *  Validate_attribute
- *
- * presence of range or members but not both
- */
- 
-int Validate_attribute(
-  Section_info_t *section,
-  Line_Control   *start,
-  Line_Control   *next_section
-)
-{
-  boolean       range_found = FALSE;
-  boolean       members_found = FALSE;
-  boolean       enumerated_found = FALSE;
-  boolean       boolean_found = FALSE;
-  boolean       true_found = FALSE;
-  boolean       false_found = FALSE;
-  Line_Control *line;
-  int           errors = 0;
- 
-  for ( line = start;
-        line != next_section ;
-        line = (Line_Control *) line->Node.next ) {
-    if ( line->keyword == RANGE )
-      range_found = TRUE;
-    else if ( line->keyword == MEMBERS ) {
-      members_found = TRUE;
-      if ( boolean_found == TRUE ) {
-        line = (Line_Control *) line->Node.next;
-        while ( !_Chain_Is_last( &line->Node ) ) {
-          if ( line->keyword )
-            break;
-          if ( strstr( line->Contents, "FALSE" ) )
-            false_found = TRUE;
-          else if ( strstr( line->Contents, "TRUE" ) )
-            true_found = TRUE;
-          line = (Line_Control *) line->Node.next;
-        }
-        line = (Line_Control *) line->Node.previous;
-      }
-    } else if ( line->keyword == TYPE || line->keyword == DERIVATION ) {
-      if ( strstr( line->Contents, "enumerated" ) )
-        enumerated_found = TRUE;
-      else if ( strstr( line->Contents, "boolean" ) ) {
-        enumerated_found = TRUE;
-        boolean_found = TRUE;
-      }
-    }
-  }
- 
-  if ( !range_found && !members_found ) {
-    fprintf(
-       stderr,
-       "Neither range nor members keyword present in "
-         "subsection starting at line %d\n",
-       start->number
-     );
-     errors++;
-  }
- 
-  if ( !InsertTBDs ) {
-    if ( range_found && members_found ) {
-      fprintf(
-         stderr,
-         "Both range and members keyword present in "
-           "subsection starting at line %d\n",
-         start->number
-       );
-       errors++;
-    }
-  }
- 
-  if ( enumerated_found  && !members_found ) {
-    fprintf(
-       stderr,
-       "Enumerated type without list of members in "
-         "subsection starting at line %d\n",
-       start->number
-     );
-     errors++;
-  }
- 
-  if ( !enumerated_found  && !range_found ) {
-    fprintf(
-       stderr,
-       "Type does not have range specified in "
-         "subsection starting at line %d\n",
-       start->number
-     );
-     errors++;
-  }
- 
-  if ( boolean_found && !true_found ) {
-    fprintf(
-       stderr,
-       "Boolean without a TRUE case specified in "
-         "subsection starting at line %d\n",
-       start->number
-     );
-     errors++;
-  }
- 
-  if ( boolean_found && !false_found ) {
-    fprintf(
-       stderr,
-       "Boolean without a FALSE case specified in "
-         "subsection starting at line %d\n",
-       start->number
-     );
-     errors++;
-  }
- 
-  return (errors) ? -1 : 0;
-}
-
-/*
- *  Validate_object
- *
- * presence of range or members but not both
- */
- 
-int Validate_object(
-  Section_info_t *section,
-  Line_Control   *start,
-  Line_Control   *next_section
-)
-{
-  char          ObjectName[ BUFFER_SIZE ];
-  char          EndObjectName[ BUFFER_SIZE ];
-  Line_Control *line;
-  int           errors = 0;
- 
-  
-  LineCopyFromRight( start, ObjectName );
-
-  for ( line = start;
-        !_Chain_Is_last( &line->Node ) ; 
-        line = (Line_Control *) line->Node.next ) {
-    if ( line->keyword == END_OBJECT ) {
-      LineCopyFromRight( line, EndObjectName );
-      break;
-    }
-  }
- 
-  if ( strcmp( ObjectName, EndObjectName ) ) {
-    fprintf(
-       stderr,
-       "Object and End Object names do not match\n"
-     );
-     errors++;
-  }
-
-  return (errors) ? -1 : 0;
-}
-
diff --git a/doc/tools/pdl2texi/s.d b/doc/tools/pdl2texi/s.d
deleted file mode 100644
index a434bf4523..0000000000
--- a/doc/tools/pdl2texi/s.d
+++ /dev/null
@@ -1,129 +0,0 @@
-
-OBJECT: Object_name
-  DESCRIPTION:
-    This object ...
-    (briefly describe the object's primary responsibility or purpose)
-  COPYRIGHT:
-    Copyright (c) 1995, On-Line Applications Research Corporation (OAR)
-  PORTING:
-  THEORY OF OPERATION:
-  DERIVATION:
-  DEPENDENCIES:
-  NOTES:
-
-ATTRIBUTE DESCRIPTIONS:
-
-ATTRIBUTE: An_attribute
-  DESCRIPTION:
-    This attribute ...
-    (briefly describe the attribute's primary purpose)
-  TYPE: float [constant]|integer [constant]
-    (indicate one of the above)
-  RANGE|MEMBERS: 0 - +INFINITY  or  MEMBER1, MEMBER2, MEMBER3
-    (indicate RANGE or MEMBERS and specify, MEMBERS should be listed
-     in all caps, RANGE can use +/-INFINITY)
-  UNITS:
-  SCALE FACTOR:
-  DEFAULTS:
-  TOLERANCE:
-  REQUIREMENTS:
-    ABCD 3.2.4 A paragraph title
-    (indicate document, paragraph number, paragraph title)
-  REFERENCES:
-  NOTES:
-
-ASSOCIATION DESCRIPTIONS:
-
-ASSOCIATION:
-  DESCRIPTION:
-  VISIBILTY:
-  ASSOCIATED WITH:
-  MULTIPLICITY:
-  REQUIREMENTS:
-    ABCD 3.2.4 A paragraph title
-    (indicate document, paragraph number, paragraph title)
-  REFERENCES:
-  NOTES:  
-
-ABSTRACT TYPE DESCRIPTIONS:
-
-ABSTRACT TYPE:
-  DESCRIPTION:
-    This type ...
-    (briefly describe the type's primary purpose)
-  VISIBILITY: private|public
-    (indicate one of the above)
-  DERIVATION:  
-  MEMBERS|RANGE:  0 - +INFINITY  or  MEMBER1, MEMBER2, MEMBER3
-    (indicate RANGE or MEMBERS and specify, MEMBERS should be listed
-     in all caps, RANGE can use +/-INFINITY)
-  UNITS:
-  SCALE FACTOR:
-  DEFAULTS:
-  TOLERANCE:
-  REQUIREMENTS:
-    ABCD 3.2.4 A paragraph title
-    (indicate document, paragraph number, paragraph title)
-  REFERENCES:
-  NOTES:
-
-DATA ITEM DESCRIPTIONS:
-
-DATA ITEM:
-  DESCRIPTION:
-    This data item ...
-    (briefly describe the data item's primary purpose)
-  TYPE:
-  UNITS:
-  SCALE FACTOR:
-  DEFAULTS:
-  TOLERANCE:
-  NOTES:
-
-METHODS DESCRIPTIONS:
-  (List methods alphabetically grouping public methods followed
-   by private methods.)
-
-METHOD: Some_method
-  DESCRIPTION:
-    This method ...
-    (briefly describe the method's primary responsibility)
-  VISIBILITY: private|public
-    (indicate one of the above)
-  INPUTS:
-    input_one - the first and only input
-    (specify the logical inputs followed by a description,
-     indicate 'none' if there are no inputs)
-  OUTPUTS:
-    output_one - the first and only output
-    (specify the logical outputs followed by a description,
-     indicate 'none' if there are no outputs, use 'result' if the
-     method is a boolean function)
-  REQUIREMENTS:
-    ABCD 3.2.4 A paragraph title
-    (indicate document, paragraph number, paragraph title)
-  REFERENCES:
-  NOTES:
-  PDL:
-
-TASK DESCRIPTIONS:
-
-TASK:
-  DESCRIPTION:
-    This task ...
-    (briefly describe the task's primary responsibility)
-  INPUTS:
-  SYNCHRONIZATION: delay|event|message|semaphore|signal|period
-    (indicate one or more of the above and list any events,
-     messages, or signals that can be received)
-  TIMING:
-    (specify any timing information that is related to the
-     synchronization specified above)
-  REQUIREMENTS:
-    ABCD 3.2.4 A paragraph title
-    (indicate document, paragraph number, paragraph title)
-  REFERENCES:
-  NOTES:
-  PDL:
-
-ENDOBJECT: Object_name
diff --git a/doc/tools/pdl2texi/sample.d b/doc/tools/pdl2texi/sample.d
deleted file mode 100644
index c381cb3de2..0000000000
--- a/doc/tools/pdl2texi/sample.d
+++ /dev/null
@@ -1,136 +0,0 @@
-(All fields marked with an '*' are optional and can be deleted if
- there is no applicable information.
- All entity names (OBJECT, ATTRIBUTE, METHOD, etc.)  are proper nouns
- and thus should only have the first letter capitalized.)
-
-OBJECT: Object_name
-  DESCRIPTION:
-    This object ...
-    (briefly describe the object's primary responsibility or purpose)
- *COPYRIGHT:
-    Copyright (c) 1995, On-Line Applications Research Corporation (OAR)
- *PORTING:
-  THEORY OF OPERATION:
- *DERIVATION:
- *DEPENDENCIES:
- *NOTES:
-
-ATTRIBUTE DESCRIPTIONS:
-
-ATTRIBUTE: An_attribute
-  DESCRIPTION:
-    This attribute ...
-    (briefly describe the attribute's primary purpose)
-  TYPE: float [constant]|integer [constant]
-    (indicate one of the above)
-  MEMBERS|RANGE: 0 - +INFINITY  or  MEMBER1, MEMBER2, MEMBER3
-    (indicate RANGE or MEMBERS and specify, MEMBERS should be listed
-     in all caps, RANGE can use +/-INFINITY)
- *UNITS:
- *SCALE FACTOR:
- *DEFAULTS:
- *TOLERANCE:
- *REQUIREMENTS:
-    ABCD 3.2.4 A paragraph title
-    (indicate document, paragraph number, paragraph title)
- *REFERENCES:
- *NOTES:
-
-ASSOCIATION DESCRIPTIONS:
-
-ASSOCIATION: name
-  DESCRIPTION:
-    This association ...
-    (briefly describe the association's primary purpose)
-  VISIBILITY: private|public
-    (indicate one of the above)
-  ASSOCIATED WITH: object_name
-  MULTIPLICITY:
- *REQUIREMENTS:
-    ABCD 3.2.4 A paragraph title
-    (indicate document, paragraph number, paragraph title)
- *REFERENCES:
- *NOTES:  
-
-ABSTRACT TYPE DESCRIPTIONS:
-
-ABSTRACT TYPE: name
-  DESCRIPTION:
-    This type ...
-    (briefly describe the type's primary purpose)
-  VISIBILITY: private|public
-    (indicate one of the above)
-  DERIVATION:  
-  MEMBERS|RANGE:  0 - +INFINITY  or  MEMBER1, MEMBER2, MEMBER3
-    (indicate RANGE or MEMBERS and specify, MEMBERS should be listed
-     in all caps, RANGE can use +/-INFINITY)
- *UNITS:
- *SCALE FACTOR:
- *DEFAULTS:
- *TOLERANCE:
- *REQUIREMENTS:
-    ABCD 3.2.4 A paragraph title
-    (indicate document, paragraph number, paragraph title)
- *REFERENCES:
- *NOTES:
-
-DATA ITEM DESCRIPTIONS:
-
-DATA ITEM: name
-  DESCRIPTION:
-    This data item ...
-    (briefly describe the data item's primary purpose)
-  TYPE:
- *UNITS:
- *SCALE FACTOR:
- *DEFAULTS:
- *TOLERANCE:
- *NOTES:
-
-METHOD DESCRIPTIONS:
-  (List methods alphabetically grouping public methods followed
-   by private methods.)
-
-METHOD: Some_method
-  DESCRIPTION:
-    This method ...
-    (briefly describe the method's primary responsibility)
-  VISIBILITY: private|public
-    (indicate one of the above)
-  INPUTS:
-    input_one - the first and only input
-    (specify the logical inputs followed by a description,
-     indicate 'none' if there are no inputs)
-  OUTPUTS:
-    output_one - the first and only output
-    (specify the logical outputs followed by a description,
-     indicate 'none' if there are no outputs, use 'result' if the
-     method is a boolean function)
- *REQUIREMENTS:
-    ABCD 3.2.4 A paragraph title
-    (indicate document, paragraph number, paragraph title)
- *REFERENCES:
- *NOTES:
-  PDL:
-
-TASK DESCRIPTIONS:
-
-TASK: name
-  DESCRIPTION:
-    This task ...
-    (briefly describe the task's primary responsibility)
-  INPUTS:
-  SYNCHRONIZATION: delay|event|message|semaphore|signal|period
-    (indicate one or more of the above and list any events,
-     messages, or signals that can be received)
-  TIMING:
-    (specify any timing information that is related to the
-     synchronization specified above)
- *REQUIREMENTS:
-    ABCD 3.2.4 A paragraph title
-    (indicate document, paragraph number, paragraph title)
- *REFERENCES:
- *NOTES:
-  PDL:
-
-ENDOBJECT: Object_name
diff --git a/doc/tools/pdl2texi/system.h b/doc/tools/pdl2texi/system.h
deleted file mode 100644
index 173e48ce04..0000000000
--- a/doc/tools/pdl2texi/system.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- *  COPYRIGHT (c) 1997.
- *  On-Line Applications Research Corporation (OAR).
- *  All rights reserved.
- *
- *  $Id$
- */
-
-#ifndef __SYSTEM_h
-#define __SYSTEM_h
-
-typedef unsigned int   unsigned32;
-typedef unsigned short unsigned16;
-typedef unsigned char  unsigned8;
-
-#define USE_INLINES 
-#define STATIC static
-#define INLINE inline
-
-#ifndef NULL
-#define NULL 0
-#endif
-
-typedef unsigned int   boolean;
-
-#if !defined( TRUE ) || (TRUE != 1)
-#undef TRUE
-#define TRUE     (1)
-#endif
-
-#if !defined( FALSE ) || (FALSE != 0)
-#undef FALSE
-#define FALSE 0
-#endif
-
-#endif
diff --git a/doc/tools/pdl2texi/t1.d b/doc/tools/pdl2texi/t1.d
deleted file mode 100644
index 4f54e74738..0000000000
--- a/doc/tools/pdl2texi/t1.d
+++ /dev/null
@@ -1,52 +0,0 @@
-OBJECT:  Drive
-  DESCRIPTION:
-    This object provides an interface to the elevation/azimuth
-    drive system(ECA).  
-  THEORY OF OPERATION:
-    This object encapsulates the turret drive.  The object provides
-    an interface to control the turret drive.  A method is provided
-    to set the azimuth and elevation rate of the drive.  Methods are
-    provided to request the drive to run in stabilized or power mode
-    and set the drive speed to high or low.  A method is also provided
-    to allow for drift adjust.  
-
-    This object also tracks drive system on hours.  It gets the hours
-    from the EEPROM data, allows the hours to be set, updates the
-    hours via the activation and deactivation of the drive, and
-    provides access to the hours.
-
-    The object also provides methods to access azimuth and elevation
-    displacement, and methods to process changes in the hardware
-    discretes drive on, stabilized mode, thermal fault and fault.
-  
-    The object also provides methods to enable and disable
-    both the remote and turret power interlocks which determine if
-    the drive can be driven by the remote or turret handstation
-    respectively.   
-
-ATTRIBUTE DESCRIPTIONS:
-
-
-ATTRIBUTE:  Azimuth_displacement
-  DESCRIPTION:
-    This attribute represents the current azimuth displacement
-    of the turret.
-  TYPE: float constant
-  RANGE: 0-0
-  UNITS: degrees
-  REQUIREMENTS:
-    AFS 8.2.11 Receive Azimuth Displacement and Elevation Displacement
-    AIS 5.2.6 Azimuth Displacement analog
-
-
-ASSOCIATION DESCRIPTIONS: none
-
-ABSTRACT TYPE DESCRIPTIONS: none
-
-DATA ITEM DESCRIPTIONS: none
-
-METHOD DESCRIPTIONS: none
-
-TASK DESCRIPTIONS: none
-
-END OBJECT: Drive
diff --git a/doc/tools/pdl2texi/test_cases/avdas.d b/doc/tools/pdl2texi/test_cases/avdas.d
deleted file mode 100644
index 1d79a319f1..0000000000
--- a/doc/tools/pdl2texi/test_cases/avdas.d
+++ /dev/null
@@ -1,260 +0,0 @@
-OBJECT: AVDAS
-  DESCRIPTION:
-    This object collects various values from other objects in the system
-    and outputs the values in a message on a serial interface.  The message
-    can be read and used as diagnostic information.
-  THEORY OF OPERATION:
-    This object contains a Server task which periodically collects 
-    diagnostic values from other objects in the system and outputs the 
-    values in a message on a serial interface.  The diagnostic values
-    collected and formatted reflect system status.
-  NOTES:
-    The following engineering note consists of a chart to aid in the
-    decision making process of whether the AVDAS should reflect System
-    status or Switch status.  As it is right now, it was decided to 
-    reflect System status.
-
-    @table
-                               System                  Switch
-    Gun Manual              Weapon_control          Gunner_console
-    Gun Air                 -------                 -------
-    Gun Ground              -------                 -------
-    *Remote Status          Remote                  Remote
-    *Msl Armed Indicate     Missiles                Missiles
-    *Rain Mode              FOV                     FOV
-    *Msl Uncage Verified    Missiles                Missiles
-    *Msl Activate Status    Missiles                Missiles
-    *RSO Status             Weapon_control          Weapon_control
-    *Fire Permit            Weapon_control_(new)    Weapon_control_(new)
-    *Stab Mode Status       Drive_(new)             Drive_(new)
-    Uncage Mode Status      Weapon_control          Gunner_console_(new)
-    Engage Mode Status      Mode                    Gunner_console_(new)
-    *Palm Grip Status       Gunner_handstation      Gunner_handstation
-    *System Fault Status    Fault (Add)             Fault_(new)
-    FLIR FOV Status         FOV                     Gunner_console
-    *Autotrack Status       Video_tracker           Video_tracker
-    Arm Switch Status       Weapon_control          Gunner_console
-    *Uncage Switch Status   Gunner_handstation      Gunner_handstation
-    *Trig Switch Status     Gunner_handstation      Gunner_handstation
-    *Msl Fire Cmd Status    Missiles_(new)          Missiles_(new)
-    Helicopter Mode         Weapon_control          Gunner_console_(new)
-    IFF Challenge Switch    IFF_(new)               Gunner_console
-    *Auto Slew Status       Autoslew_Is_on          Autoslew_Is_on
-
-    @end table
-
-    Message bytes 26 through 29 are not set at this time pending 
-    completion of the Super Elevate object.
-  
-ATTRIBUTE DESCRIPTIONS: none
-
-ASSOCIATION DESCRIPTIONS: none
-
-ABSTRACT TYPE DESCRIPTIONS: none
-
-DATA ITEM DESCRIPTIONS:
- 
-DATA ITEM: Message
-  DESCRIPTION:
-    This data item is the buffer used to build an AVDAS data message.
-    The first two bytes are place-holders for the header bytes.  The 
-    last byte is a place-holder for the checksum byte.
-  DERIVATION: array[ 36 ]
-  TYPE: bytes
-  DEFAULT:
-    all bytes = 0x00
-
-DATA ITEM: The_Channel
-  DESCRIPTION:
-    This data item contains the handle to the AVDAS channel.
-  TYPE: Channel_Control handle
-  DEFAULT: NULL
- 
-METHOD DESCRIPTIONS:
-
-METHOD: Break_Up
-  DESCRIPTION:
-    This method converts a floating point number to two ascii bytes
-    based on an input range and weighting factor.
-  VISIBILITY: private
-  INPUTS:
-    max_range
-    min_range
-    value
-    weight_factor
-  OUTPUTS:
-    lower_byte
-    upper_byte
-  PDL:
-    if value between 0 and min_range
-      set temp2 to min_range
-      set bit_ratio to absolute value( temp2 / 0x8000 )
-    else if value between 0 and max_range
-      set temp2 to max_range
-      set bit_ratio to absolute value( temp2 / 0x7FF0 )
-
-    set temp3 to (value / temp2) * weight_factor
-
-    set temp4 to temp3 converted to unsigned 16 bit value
-
-    set temp4 to two's compliment of temp4
-
-    set lower_byte to lower 8 bits of temp4
-
-    set upper_byte to upper 8 bits of temp4
-
-METHOD: Create
-  DESCRIPTION:
-    This method performs the necessary actions to create this object.
-  VISIBILITY: public
-  INPUTS: none
-  OUTPUTS: none
-  PDL:
-    initialize Message to default
-
-    get AVDAS protocol information using the AVDAS_protocol object
-    create a channel for the AVDAS interface using the Channel object
-    attach the channel to the AVDAS interface using the Channel object
-     with the following parameters:
-       flush        - FALSE
-       major_number - CONFIGURATION_AVDAS_MAJOR
-       minor_number - CONFIGURATION_AVDAS_MINOR
- 
-TASK DESCRIPTIONS:
-
-TASK: Server 
-  DESCRIPTION: 
-    This task periodically collects diagnostic values and outputs the
-    values in a message on a serial interface.
-  INPUTS: none
-  SYNCHRONIZATION: period
-  TIMING: 100 ms
-  REQUIREMENTS: 
-    AFS 3.1.4 Provide AVDAS
-    AFS 3.1.7 Update AVDAS port 
-  PDL:
-    create a period
-
-    wait for completion using the Initialization object
-
-    loop forever
-       wait for period to expire
-
-       initialize Message
-
-       get absolute azimuth using the Turret object
-       format absolute azimuth and store in Message[2] and Message[3]
-
-       get elevation using the Turret object
-       format elevation and store in Message[4] and Message[5]
-
-       get drive rate using the Drive object
-       format azimuth rate and store in Message[6] and Message[7]
-       format elevation rate and store in Message[8] and Message[9]
-
-       get drive displacement using the Drive object
-       format azimuth displacement and store in Message[10] and Message[11]
-       format elevation displacement and
-        store in Message[12] and Message[13]
-
-       get seeker position error using the Seeker object
-       format azimuth position error and
-        store in Message[14] and Message[15]
-       format elevation position error and
-        store in Message[16] and Message[17]
-
-       get range using the Laser object
-       format range and store in Message[18] and Message[19]
-
-       get north reference using the Turret object
-       format north reference and store in Message[20] and Message[21]
-
-       get video tracker position error using the Video_tracker object
-       format azimuth position error and
-        store in Message[22] and Message[23]
-       format elevation position error and
-        store in Message[24] and Message[25]
-
-       ?get lead command?
-
-       get gun mode switch using the Weapon_control object
-       format gun mode switch and store in Message[30]
-
-       determine if remote is active using the Remote object
-       format remote active and store in Message[30]
-
-       determine if missile is safed using the Missiles object
-       format missile safed and store in Message[30]
-
-       determine if rain mode is active using the FOV object
-       format rain mode active and store in Message[30]
-
-       get missile inventory using the Missiles object
-       format present indicators and store in Message[31]
-       format selected indicators and store in Message[32]
-
-       determine if missile uncage verified using the Missiles object
-       format missile uncage verified and store in Message[32]
-
-       determine if missile activated using the Missiles object
-       format missile activated and store in Message[32]
-
-       determine if RSO is authorized using the Weapon_control object
-       format RSO authorized and store in Message[32]
-
-       determine if fire permit using the Weapon_control object
-       format fire permit and store in Message[32]
-
-       determine if stab mode using the Drive object
-       format stab mode and store in Message[33]
-
-       determine if uncage mode is WEAPON_CONTROL_MANUAL_UNCAGE using 
-        the Weapon_control object
-       format uncage mode and store in Message[33]
-
-       determine if current mode is MODE_ENGAGE using the Mode object
-       format current mode and store in Message[33]
-
-       determine if palmgrip switch is pressed using the
-        Gunner_handstation object
-       format palmgrip switch pressed and store in Message[33]
-
-       determine if fault is active using the Fault object
-       format fault active and store in Message[33]
-
-       determine if FOV FLIR zoom is FOV_ZOOM_NARROW using the FOV object
-       format FOV FLIR zoom and store in Message[33]
-
-       determine if video tracker is on using the Video_tracker object
-       format video tracker on and store in Message[34]
-
-       determine if armed using the Weapon_control object
-       format armed and store in Message[34]
-
-       determine if uncage trigger switch pressed using the
-        Gunner_handstation object
-       format uncage trigger switch pressed and store in Message[34]
-
-       determine if fire trigger switch pressed using the
-        Gunner_handstation object
-       format fire trigger switch pressed and store in Message[34]
-
-       determine if missiles is firing using the Missiles object
-       format missiles firing and store in Message[34]
-
-       determine if helicopter mode is WEAPON_CONTROL_ON using the 
-        Weapon_control object
-       format helicopter mode and store in Message[34]
-
-       determine if IFF challenge using the IFF object
-       format IFF challenge and store in Message[34]
-
-       determine if autoslew is on using the Autoslew object
-       format autoslew is on and store in Message[34]
-
-       loop until successful
-          write Message using the Channel object
-          if unsuccessful
-             reset the Channel object
-
-ENDOBJECT: AVDAS
diff --git a/doc/tools/pdl2texi/test_cases/enum.d b/doc/tools/pdl2texi/test_cases/enum.d
deleted file mode 100644
index fc03c04f44..0000000000
--- a/doc/tools/pdl2texi/test_cases/enum.d
+++ /dev/null
@@ -1,44 +0,0 @@
-OBJECT: Testfile
-  DESCRIPTION:
-    This file contains one abstract type without a range and two 
-    abstract types with filler ranges.
-  THEORY OF OPERATION:
-    This file will be used to test the .d compiler.
-
-ATTRIBUTE DESCRIPTIONS: none
-
-ASSOCIATION DESCRIPTIONS: none
-
-ABSTRACT TYPE DESCRIPTIONS:
-
-ABSTRACT TYPE: ID
-  DESCRIPTION:
-    This type defines an identifier for an event set that may be manipulated.
-  VISIBILITY: public
-  DERIVATION: Bin_type handle
-
-ABSTRACT TYPE: Test_ID
-  DESCRIPTION:
-    This is the abstract type with the range made optional.
-  VISIBILITY: public
-  DERIVATION: Bin_type handle
-
-ABSTRACT TYPE: Input_Buffer
-  DESCRIPTION:
-    This type indicates the maximum input buffer.
-  VISIBILITY: public
-  DERIVATION: string
-
-ABSTRACT TYPE: Image_t
-  DESCRIPTION:
-    This type specifies the data maintained for the screen.
-  VISIBILITY: public
-  DERIVATION: array [LINES][COLUMNS] of character
-
-DATA ITEM DESCRIPTIONS: none
-
-METHOD DESCRIPTIONS: none
-
-TASK DESCRIPTIONS: none
-
-ENDOBJECT: Testfile
diff --git a/doc/tools/pdl2texi/test_cases/enumbad.d b/doc/tools/pdl2texi/test_cases/enumbad.d
deleted file mode 100644
index 8bcd9f823e..0000000000
--- a/doc/tools/pdl2texi/test_cases/enumbad.d
+++ /dev/null
@@ -1,48 +0,0 @@
-OBJECT: Testfile
-  DESCRIPTION:
-    This file contains one abstract type without a range and two 
-    abstract types with filler ranges.
-  THEORY OF OPERATION: 
-    This file will be used to test the .d compiler.
-
-ATTRIBUTE DESCRIPTIONS: none 
-
-ASSOCIATION DESCRIPTIONS: none 
-
-ABSTRACT TYPE DESCRIPTIONS:
-
-ABSTRACT TYPE: ID
-  DESCRIPTION:
-    This type defines an identifier for an event set that may be manipulated.
-  VISIBILITY: public
-  DERIVATION: Bin_type handle
-  RANGE: 99 - 99
-
-ABSTRACT TYPE: Test_ID
-  DESCRIPTION:
-    This is the abstract type with the range made optional.
-  VISIBILITY: public
-  DERIVATION: Bin_type handle
-    
-ABSTRACT TYPE: Input_Buffer
-  DESCRIPTION:
-    This type indicates the maximum input buffer.
-  VISIBILITY: public
-  DERIVATION: string
-  RANGE: 99 - 99       
-    
-ABSTRACT TYPE: Image_t 
-  DESCRIPTION:         
-    This type specifies the data maintained for the screen.
-  VISIBILITY: public
-  DERIVATION: array [LINES][COLUMNS] of character
-  RANGE: 0 - 1 QQQ
-
-DATA ITEM DESCRIPTIONS: none
-
-METHOD DESCRIPTIONS: none
-  
-TASK DESCRIPTIONS: none
-  
-ENDOBJECT: Testfile
-
diff --git a/doc/tools/pdl2texi/test_cases/table.d b/doc/tools/pdl2texi/test_cases/table.d
deleted file mode 100644
index 954a9b419b..0000000000
--- a/doc/tools/pdl2texi/test_cases/table.d
+++ /dev/null
@@ -1,27 +0,0 @@
-OBJECT: AVDAS
-  DESCRIPTION:
-    This file contains a test case which blows up pdl2texi when optimization
-    is enabled.  See the makefile for details.
-  THEORY OF OPERATION:
-    This object ..
-  NOTES:
-    The following blows up pdl2texi when -O is set.
-
-@table
-                               System                  Switch
-
-@end table
-
-ATTRIBUTE DESCRIPTIONS: none
-
-ASSOCIATION DESCRIPTIONS: none
-
-ABSTRACT TYPE DESCRIPTIONS: none
-
-DATA ITEM DESCRIPTIONS: none
- 
-METHOD DESCRIPTIONS: none
-
-TASK DESCRIPTIONS: none
-
-ENDOBJECT: AVDAS
diff --git a/doc/tools/src2html/Makefile b/doc/tools/src2html/Makefile
deleted file mode 100644
index 208f901559..0000000000
--- a/doc/tools/src2html/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-#  COPYRIGHT (c) 1988-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  All rights reserved.
-#
-#  $Id$
-#
-
-CC=gcc
-CFLAGS=-g 
-
-PROGS=ctags-wr ctags-new ctags src2html
-
-SRC2HTMLDIR=src2html1.4a
-
-all:  tools
-
-tools: $(PROGS)
-	chmod +x $(PROGS)
-
-ctags-wr:
-	cp ../$(SRC2HTMLDIR)/ctags-wr .
-
-ctags-new:
-	cd ../$(SRC2HTMLDIR)/Ctags ; gmake 
-	cp ../$(SRC2HTMLDIR)/Ctags/ctags-new .
-
-# EMACS ctags with Ada awareness
-ctags:
-	cp ../$(SRC2HTMLDIR)/ctags-emacs/ctags ctags
-
-src2html:
-	cp ../$(SRC2HTMLDIR)/src2html .
-
-clean:
-	rm -f $(PROGS) 
-	cd ../$(SRC2HTMLDIR)/Ctags ; gmake clean
-
diff --git a/doc/tools/src2html1.4a/Ctags/C.c b/doc/tools/src2html1.4a/Ctags/C.c
deleted file mode 100644
index f091fcedad..0000000000
--- a/doc/tools/src2html1.4a/Ctags/C.c
+++ /dev/null
@@ -1,444 +0,0 @@
-/*
- * Copyright (c) 1987 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef lint
-static char sccsid[] = "@(#)C.c	5.5 (Berkeley) 2/26/91";
-#endif /* not lint */
-
-#include <stdio.h>
-#include <string.h>
-#include "ctags.h"
-
-static int func_entry(), str_entry();
-static void hash_entry();
-
-/*
- * c_entries --
- *	read .c and .h files and call appropriate routines
- */
-c_entries()
-{
-	extern int	tflag;		/* -t: create tags for typedefs */
-	register int	c,		/* current character */
-			level;		/* brace level */
-	register char	*sp;		/* buffer pointer */
-	int	token,			/* if reading a token */
-		t_def,			/* if reading a typedef */
-		t_level;		/* typedef's brace level */
-	char	tok[MAXTOKEN];		/* token buffer */
-	int	st;			/* Symbol type */
-	int	rparen;			/* State of last rparen */
-
-	lineftell = ftell(inf);
-	sp = tok; token = t_def = NO; t_level = -1; level = 0; lineno = 1;
-	rparen=0;
-	while (GETC(!=,EOF)) {
-	rparen--;
-	switch ((char)c) {
-		/*
-		 * Here's where it DOESN'T handle:
-		 *	foo(a)
-		 *	{
-		 *	#ifdef notdef
-		 *		}
-		 *	#endif
-		 *		if (a)
-		 *			puts("hello, world");
-		 *	}
-		 */
-		case '{':
-			++level;
-			goto endtok;
-		case '}':
-			/*
-			 * if level goes below zero, try and fix
-			 * it, even though we've already messed up
-			 */
-			if (--level < 0)
-				level = 0;
-			goto endtok;
-
-		case '\n':
-			SETLINE;
-			/*
-			 * the above 3 cases are similar in that they
-			 * are special characters that also end tokens.
-			 */
-endtok:			if (sp > tok) {
-				*sp = EOS;
-				token = YES;
-				sp = tok;
-			}
-			else
-				token = NO;
-			continue;
-
-		/* we ignore quoted strings and comments in their entirety */
-		case '"':
-		case '\'':
-			(void)skip_key(c);
-			break;
-		/* We ignore everything between [] */
-		case '[':
-			(void)skip_key(']');
-			goto storec;
-
-		/*
-		 * comments can be fun; note the state is unchanged after
-		 * return, in case we found:
-		 *	"foo() XX comment XX { int bar; }"
-		 */
-		case '/':
-			if (GETC(==,'*')) {
-				skip_comment();
-				continue;
-			}
-			(void)ungetc(c,inf);
-			c = '/';
-			goto storec;
-
-		/* hash marks flag #define's. */
-		case '#':
-			if (sp == tok) {
-				hash_entry();
-				break;
-			}
-			goto storec;
-
-		/*
-	 	 * if we have a current token, parenthesis on
-		 * level zero indicates a function.
-		 */
-		case '(':
-			if (!level && token) {
-				int	curline;
-
-				if (sp != tok)
-					*sp = EOS;
-				/*
-				 * grab the line immediately, we may
-				 * already be wrong, for example,
-				 *	foo\n
-				 *	(arg1,
-				 */
-				getline();
-				curline = lineno;
-				if (func_entry()) {
-					++level;
-					pfnote(tok,curline,SY_FUN);
-				} else rparen=2;
-				break;
-			}
-			goto storec;
-
-		/*
-		 * semi-colons indicate the end of a typedef; if we find a
-		 * typedef we search for the next semi-colon of the same
-		 * level as the typedef.  Ignoring "structs", they are
-		 * tricky, since you can find:
-		 *
-		 *	"typedef long time_t;"
-		 *	"typedef unsigned int u_int;"
-		 *	"typedef unsigned int u_int [10];"
-		 *
-		 * If looking at a typedef, we save a copy of the last token
-		 * found.  Then, when we find the ';' we take the current
-		 * token if it starts with a valid token name, else we take
-		 * the one we saved.  There's probably some reasonable
-		 * alternative to this...
-		 */
-		case ';':
-			if (t_def && level == t_level) {
-				t_def = NO;
-				getline();
-				if (sp != tok)
-					*sp = EOS;
-				pfnote(tok,lineno,SY_TYP);
-				break;
-			}
-		/*
-		 * Catch global variables by the fact that they end in ; or ,
-		 * and they are at level zero.
-		 */
-		case ',':
-			if (sp != tok) *sp = EOS;
-			if (level==0 && rparen!=1) {
-				pfnote(tok,lineno,SY_VAR);
-				break;
-			}
-			goto storec;
-
-		/*
-		 * store characters until one that can't be part of a token
-		 * comes along; check the current token against certain
-		 * reserved words.
-		 */
-		default:
-storec:			if (!intoken(c)) {
-				if (sp == tok)
-					break;
-				*sp = EOS;
-				if (tflag) {
-					/* no typedefs inside typedefs */
-					if (!t_def && !bcmp(tok,"typedef",8)) {
-						t_def = YES;
-						t_level = level;
-						break;
-					}
-					/* catch "typedef struct" */
-					if ((!t_def || t_level < level)
-					    && (!bcmp(tok,"struct",7)
-					    || !bcmp(tok,"union",6)
-					    || !bcmp(tok,"enum",5))) {
-						/* Get type of symbol */
-						st=0;
-						switch (*tok) {
-						 case 's' : st= SY_STR; break;
-						 case 'u' : st= SY_UNI; break;
-						 case 'e' : st= SY_ENU; break;
-						}
-						/*
-						 * get line immediately;
-						 * may change before '{'
-						 */
-						getline();
-						if (str_entry(c,st))
-							++level;
-						break;
-					}
-				}
-				sp = tok;
-			}
-			else if (sp != tok || begtoken(c)) {
-				*sp++ = c;
-				token = YES;
-			}
-			continue;
-		}
-		sp = tok;
-		token = NO;
-	}
-}
-
-/*
- * func_entry --
- *	handle a function reference
- */
-static
-func_entry()
-{
-	register int	c;		/* current character */
-
-	/*
-	 * we assume that the character after a function's right paren
-	 * is a token character if it's a function and a non-token
-	 * character if it's a declaration.  Comments don't count...
-	 */
-	(void)skip_key((int)')');
-	for (;;) {
-		while (GETC(!=,EOF) && iswhite(c))
-			if (c == (int)'\n')
-				SETLINE;
-		if (intoken(c) || c == (int)'{')
-			break;
-		if (c == (int)'/' && GETC(==,'*'))
-			skip_comment();
-		else {				/* don't ever "read" '/' */
-			(void)ungetc(c,inf);
-			return(NO);
-		}
-	}
-	if (c != (int)'{')
-		(void)skip_key((int)'{');
-	return(YES);
-}
-
-/*
- * hash_entry --
- *	handle a line starting with a '#'
- */
-static void
-hash_entry()
-{
-	extern int	dflag;		/* -d: non-macro defines */
-	register int	c,		/* character read */
-			curline;	/* line started on */
-	register char	*sp;		/* buffer pointer */
-	char	tok[MAXTOKEN];		/* storage buffer */
-
-	curline = lineno;
-	for (sp = tok;;) {		/* get next token */
-		if (GETC(==,EOF))
-			return;
-		if (iswhite(c))
-			break;
-		*sp++ = c;
-	}
-	*sp = EOS;
-	if (bcmp(tok,"define",6))	/* only interested in #define's */
-		goto skip;
-	for (;;) {			/* this doesn't handle "#define \n" */
-		if (GETC(==,EOF))
-			return;
-		if (!iswhite(c))
-			break;
-	}
-	for (sp = tok;;) {		/* get next token */
-		*sp++ = c;
-		if (GETC(==,EOF))
-			return;
-		/*
-		 * this is where it DOESN'T handle
-		 * "#define \n"
-		 */
-		if (!intoken(c))
-			break;
-	}
-	*sp = EOS;
-	if (dflag || c == (int)'(') {	/* only want macros */
-		getline();
-		if (c == (int)'(') pfnote(tok,curline,SY_MAC);
-		else pfnote(tok,curline,SY_DEF);
-	}
-skip:	if (c == (int)'\n') {		/* get rid of rest of define */
-		SETLINE
-		if (*(sp - 1) != '\\')
-			return;
-	}
-	(void)skip_key((int)'\n');
-}
-
-/*
- * str_entry --
- *	handle a struct, union or enum entry
- */
-static
-str_entry(c,st)
-	register int	c;		/* current character */
-	int	st;			/* type of symbol */
-{
-	register char	*sp;		/* buffer pointer */
-	int	curline;		/* line started on */
-	char	tok[BUFSIZ];		/* storage buffer */
-
-	curline = lineno;
-	while (iswhite(c))
-		if (GETC(==,EOF))
-			return(NO);
-	if (c == (int)'{')		/* it was "struct {" */
-		return(YES);
-	for (sp = tok;;) {		/* get next token */
-		*sp++ = c;
-		if (GETC(==,EOF))
-			return(NO);
-		if (!intoken(c))
-			break;
-	}
-	switch ((char)c) {
-		case '{':		/* it was "struct foo{" */
-			--sp;
-			break;
-		case '\n':		/* it was "struct foo\n" */
-			SETLINE;
-			/*FALLTHROUGH*/
-		default:		/* probably "struct foo " */
-			while (GETC(!=,EOF))
-				if (!iswhite(c))
-					break;
-			if (c != (int)'{') {
-				(void)ungetc(c, inf);
-				return(NO);
-			}
-	}
-	*sp = EOS;
-	pfnote(tok,curline,st);
-	return(YES);
-}
-
-/*
- * skip_comment --
- *	skip over comment
- */
-skip_comment()
-{
-	register int	c,		/* character read */
-			star;		/* '*' flag */
-
-	for (star = 0;GETC(!=,EOF);)
-		switch((char)c) {
-			/* comments don't nest, nor can they be escaped. */
-			case '*':
-				star = YES;
-				break;
-			case '/':
-				if (star)
-					return;
-				break;
-			case '\n':
-				SETLINE;
-				/*FALLTHROUGH*/
-			default:
-				star = NO;
-		}
-}
-
-/*
- * skip_key --
- *	skip to next char "key"
- */
-skip_key(key)
-	register int	key;
-{
-	register int	c,
-			skip,
-			retval;
-
-	for (skip = retval = NO;GETC(!=,EOF);)
-		switch((char)c) {
-		case '\\':		/* a backslash escapes anything */
-			skip = !skip;	/* we toggle in case it's "\\" */
-			break;
-		case ';':		/* special case for yacc; if one */
-		case '|':		/* of these chars occurs, we may */
-			retval = YES;	/* have moved out of the rule */
-			break;		/* not used by C */
-		case '\n':
-			SETLINE;
-			/*FALLTHROUGH*/
-		default:
-			if (c == key && !skip)
-				return(retval);
-			skip = NO;
-		}
-	return(retval);
-}
diff --git a/doc/tools/src2html1.4a/Ctags/Makefile b/doc/tools/src2html1.4a/Ctags/Makefile
deleted file mode 100644
index c6dd7f0d6a..0000000000
--- a/doc/tools/src2html1.4a/Ctags/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-#	@(#)Makefile	5.6 (Berkeley) 5/11/90
-
-CC=gcc
-
-PROG=	ctags-new
-CFLAGS+=-I. -g
-
-SRCS=	C.c ctags.c fortran.c lisp.c print.c tree.c yacc.c strerror.c
-
-ctags: C.o ctags.o fortran.o lisp.o print.o tree.o yacc.o strerror.o
-	$(CC) -o ctags-new C.o ctags.o fortran.o lisp.o print.o tree.o yacc.o \
-	strerror.o
-
-clean:
-	rm -f *.o ctags-new
diff --git a/doc/tools/src2html1.4a/Ctags/ctags.1 b/doc/tools/src2html1.4a/Ctags/ctags.1
deleted file mode 100644
index aea23f9826..0000000000
--- a/doc/tools/src2html1.4a/Ctags/ctags.1
+++ /dev/null
@@ -1,225 +0,0 @@
-.\" Ctags-new is a modified version of the ctags produced by UCB and
-.\" distributed in their BSD distributions.
-.\" You should be able to diff this version against theirs to see what I
-.\" have changed.
-.\" 	Warren Toomey
-.\"
-.\" Copyright (c) 1987, 1990 The Regents of the University of California.
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"     @(#)ctags.1	6.8 (Berkeley) 4/24/91
-.\"
-.Dd April 24, 1991
-.Dt CTAGS 1
-.Os BSD 4
-.Sh NAME
-.Nm ctags-new
-.Nd create a tags file
-.Sh SYNOPSIS
-.Nm ctags-new
-.Op Fl BFadtuwvx
-.Op Fl f Ar tagsfile
-.Ar name ...
-.Sh DESCRIPTION
-.Nm Ctags-new
-makes a tags file for
-.Xr ex 1
-from the specified C,
-Pascal, Fortran,
-.Tn YACC ,
-lex, and lisp sources.  A tags file gives the
-locations of specified objects in a group of files.  Each line of the
-tags file contains the object name, the file in which it is defined,
-and a search pattern for the object definition, separated by white-space.
-Using the
-.Ar tags
-file,
-.Xr ex 1
-can quickly locate these object
-definitions.  Depending on the options provided to
-.Nm ctags-new ,
-objects will consist of subroutines, typedefs, defines, structs,
-enums and unions.
-.Bl -tag -width Ds
-.It Fl B
-use backward searching patterns
-.Pq Li ?...? .
-.It Fl F
-use forward searching patterns
-.Pq Li /.../
-(the default).
-.It Fl a
-append to
-.Ar tags
-file.
-.It Fl d
-create tags for
-.Li #defines
-that don't take arguments;
-.Li #defines
-that take arguments are tagged automatically.
-.It Fl f
-Places the tag descriptions in a file called
-.Ar tagsfile .
-The default behaviour is to place them in a file
-.Ar tags .
-.It Fl t
-create tags for typedefs, structs, unions, and enums.
-.It Fl u
-update the specified files in the
-.Ar tags
-file, that is, all
-references to them are deleted, and the new values are appended to the
-file.  (Beware: this option is implemented in a way which is rather
-slow; it is usually faster to simply rebuild the
-.Ar tags
-file.)
-.It Fl v
-An index of the form expected by
-.Xr vgrind 1
-is produced on the standard output.  This listing
-contains the object name, file name, and page number (assuming 64
-line pages).  Since the output will be sorted into lexicographic order,
-it may be desired to run the output through
-.Xr sort 1 .
-Sample use:
-.Bd -literal -offset indent
-ctags-new \-v files \&| sort \-f > index
-vgrind \-x index
-.Ed
-.It Fl y
-Yet another output format. This produces lines with the information:
-symbol, line number, file name, type of symbol, each separated by whitespace.
-This is used by the
-.Xr src2html 1L
-program.
-.It Fl w
-suppress warning diagnostics.
-.It Fl x
-.Nm ctags-new
-produces a list of object
-names, the line number and file name on which each is defined, as well
-as the text of that line and prints this on the standard output.  This
-is a simple index which can be printed out as an off-line readable
-function index.
-.El
-.Pp
-Files whose names end in
-.Nm \&.c
-or
-.Nm \&.h
-are assumed to be C
-source files and are searched for C style routine and macro definitions.
-Files whose names end in
-.Nm \&.y
-are assumed to be
-.Tn YACC
-source files.
-Files whose names end in
-.Nm \&.l
-are assumed to be lisp files if their
-first non-blank character is `;', `(', or `[',
-otherwise, they are
-treated as lex files.  Other files are first examined to see if they
-contain any Pascal or Fortran routine definitions, and, if not, are
-searched for C style definitions.
-.Pp
-The tag
-.Li main
-is treated specially in C programs.  The tag formed
-is created by prepending
-.Ar M
-to the name of the file, with the
-trailing
-.Nm \&.c
-and any leading pathname components removed.  This
-makes use of
-.Nm ctags-new
-practical in directories with more than one
-program.
-.Pp
-Yacc and lex files each have a special tag.
-.Ar Yyparse
-is the start
-of the second section of the yacc file, and
-.Ar yylex
-is the start of
-the second section of the lex file.
-.Sh FILES
-.Bl -tag -width tags -compact
-.It Pa tags
-default output tags file
-.El
-.Sh DIAGNOSTICS
-.Nm Ctags-new
-exits with a value of 1 if an error occurred, where
-duplicate objects are not considered errors, 0 otherwise.
-.Sh SEE ALSO
-.Xr ex 1 ,
-.Xr vi 1
-.Sh BUGS
-Recognition of
-.Nm functions  ,
-.Nm subroutines
-and
-.Nm procedures
-for
-.Tn FORTRAN
-and Pascal is done is a very simpleminded way.  No attempt
-is made to deal with block structure; if you have two Pascal procedures
-in different blocks with the same name you lose.
-.Nm Ctags-new
-doesn't
-understand about Pascal types.
-.Pp
-The method of deciding whether to look for C, Pascal or
-.Tn FORTRAN
-functions is a hack.
-.Pp
-.Nm Ctags-new
-relies on the input being well formed, and any syntactical
-errors will completely confuse it.  It also finds some legal syntax
-confusing; for example, as it doesn't understand
-.Li #ifdef Ns 's ,
-(incidentally, that's a feature, not a bug) any code with unbalanced
-braces inside
-.Li #ifdef Ns 's
-will cause it to become somewhat disoriented.
-In a similar fashion, multiple line changes within a definition will
-cause it to enter the last line of the object, rather than the first, as
-the searching pattern.  The last line of multiple line
-.Li typedef Ns 's
-will similarly be noted.
-.Sh HISTORY
-The
-.Nm
-command appeared in 
-.Bx 3.0 .
diff --git a/doc/tools/src2html1.4a/Ctags/ctags.c b/doc/tools/src2html1.4a/Ctags/ctags.c
deleted file mode 100644
index 08d01a2ba0..0000000000
--- a/doc/tools/src2html1.4a/Ctags/ctags.c
+++ /dev/null
@@ -1,265 +0,0 @@
-/*
- * Copyright (c) 1987 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef lint
-char copyright[] =
-"@(#) Copyright (c) 1987 The Regents of the University of California.\n\
- All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-static char sccsid[] = "@(#)ctags.c	5.8 (Berkeley) 2/26/91";
-#endif /* not lint */
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include "ctags.h"
-
-/*
- * ctags: create a tags file
- */
-
-NODE	*head;			/* head of the sorted binary tree */
-
-				/* boolean "func" (see init()) */
-bool	_wht[0177],_etk[0177],_itk[0177],_btk[0177],_gd[0177];
-
-FILE	*inf,			/* ioptr for current input file */
-	*outf;			/* ioptr for tags file */
-
-long	lineftell;		/* ftell after getc( inf ) == '\n' */
-
-int	lineno,			/* line number of current line */
-	dflag,			/* -d: non-macro defines */
-	tflag,			/* -t: create tags for typedefs */
-	wflag,			/* -w: suppress warnings */
-	vflag,			/* -v: vgrind style index output */
-	xflag,			/* -x: cxref style output */
-	yflag;			/* -y: yet another style output */
-
-char	*curfile,		/* current input file name */
-	searchar = '/',		/* use /.../ searches by default */
-	lbuf[BUFSIZ];
-
-main(argc,argv)
-	int	argc;
-	char	**argv;
-{
-	extern char	*optarg;		/* getopt arguments */
-	extern int	optind;
-	static char	*outfile = "tags";	/* output file */
-	int	aflag,				/* -a: append to tags */
-		uflag,				/* -u: update tags */
-		exit_val,			/* exit value */
-		step,				/* step through args */
-		ch;				/* getopts char */
-	char	cmd[100];			/* too ugly to explain */
-
-	aflag = uflag = NO;
-	while ((ch = getopt(argc,argv,"BFadf:tuwvxy")) != EOF)
-		switch((char)ch) {
-			case 'B':
-				searchar = '?';
-				break;
-			case 'F':
-				searchar = '/';
-				break;
-			case 'a':
-				aflag++;
-				break;
-			case 'd':
-				dflag++;
-				break;
-			case 'f':
-				outfile = optarg;
-				break;
-			case 't':
-				tflag++;
-				break;
-			case 'u':
-				uflag++;
-				break;
-			case 'w':
-				wflag++;
-				break;
-			case 'v':
-				vflag++;
-			case 'x':
-				xflag++;
-				break;
-			case 'y':
-				yflag++;
-				break;
-			case '?':
-			default:
-				goto usage;
-		}
-	argv += optind;
-	argc -= optind;
-	if (!argc) {
-usage:		puts("Usage: ctags [-BFadtuwvx] [-f tagsfile] file ...");
-		exit(1);
-	}
-
-	init();
-
-	for (exit_val = step = 0;step < argc;++step)
-		if (!(inf = fopen(argv[step],"r"))) {
-			perror(argv[step]);
-			exit_val = 1;
-		}
-		else {
-			curfile = argv[step];
-			find_entries(argv[step]);
-			(void)fclose(inf);
-		}
-
-	if (head)
-		if (xflag)
-			put_entries(head);
-		else {
-			if (uflag) {
-				for (step = 0;step < argc;step++) {
-					(void)sprintf(cmd,"mv %s OTAGS;fgrep -v '\t%s\t' OTAGS >%s;rm OTAGS",outfile,argv[step],outfile);
-					system(cmd);
-				}
-				++aflag;
-			}
-			if (!(outf = fopen(outfile, aflag ? "a" : "w"))) {
-				perror(outfile);
-				exit(exit_val);
-			}
-			put_entries(head);
-			(void)fclose(outf);
-			if (uflag) {
-				(void)sprintf(cmd,"sort %s -o %s",outfile,outfile);
-				system(cmd);
-			}
-		}
-	exit(exit_val);
-}
-
-/*
- * init --
- *	this routine sets up the boolean psuedo-functions which work by
- *	setting boolean flags dependent upon the corresponding character.
- *	Every char which is NOT in that string is false with respect to
- *	the pseudo-function.  Therefore, all of the array "_wht" is NO
- *	by default and then the elements subscripted by the chars in
- *	CWHITE are set to YES.  Thus, "_wht" of a char is YES if it is in
- *	the string CWHITE, else NO.
- */
-init()
-{
-	register int	i;
-	register char	*sp;
-
-	for (i = 0; i < 0177; i++) {
-		_wht[i] = _etk[i] = _itk[i] = _btk[i] = NO;
-		_gd[i] = YES;
-	}
-#define	CWHITE	" \f\t\n"
-	for (sp = CWHITE; *sp; sp++)	/* white space chars */
-		_wht[*sp] = YES;
-#define	CTOKEN	" \t\n\"'#()[]{}=-+%*/&|^~!<>;,.:?"
-	for (sp = CTOKEN; *sp; sp++)	/* token ending chars */
-		_etk[*sp] = YES;
-#define	CINTOK	"ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz0123456789"
-	for (sp = CINTOK; *sp; sp++)	/* valid in-token chars */
-		_itk[*sp] = YES;
-#define	CBEGIN	"ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz"
-	for (sp = CBEGIN; *sp; sp++)	/* token starting chars */
-		_btk[*sp] = YES;
-#define	CNOTGD	",;"
-	for (sp = CNOTGD; *sp; sp++)	/* invalid after-function chars */
-		_gd[*sp] = NO;
-}
-
-/*
- * find_entries --
- *	this routine opens the specified file and calls the function
- *	which searches the file.
- */
-find_entries(file)
-	char	*file;
-{
-	register char	*cp;
-
-	lineno = 0;				/* should be 1 ?? KB */
-	if (cp = rindex(file, '.')) {
-		if (cp[1] == 'l' && !cp[2]) {
-			register int	c;
-
-			for (;;) {
-				if (GETC(==,EOF))
-					return;
-				if (!iswhite(c)) {
-					rewind(inf);
-					break;
-				}
-			}
-#define	LISPCHR	";(["
-/* lisp */		if (index(LISPCHR,(char)c)) {
-				l_entries();
-				return;
-			}
-/* lex */		else {
-				/*
-				 * we search all 3 parts of a lex file
-				 * for C references.  This may be wrong.
-				 */
-				toss_yysec();
-				(void)strcpy(lbuf,"%%$");
-				pfnote("yylex",lineno);
-				rewind(inf);
-			}
-		}
-/* yacc */	else if (cp[1] == 'y' && !cp[2]) {
-			/*
-			 * we search only the 3rd part of a yacc file
-			 * for C references.  This may be wrong.
-			 */
-			toss_yysec();
-			(void)strcpy(lbuf,"%%$");
-			pfnote("yyparse",lineno);
-			y_entries();
-		}
-/* fortran */	else if ((cp[1] != 'c' && cp[1] != 'h') && !cp[2]) {
-			if (PF_funcs())
-				return;
-			rewind(inf);
-		}
-	}
-/* C */	c_entries();
-}
diff --git a/doc/tools/src2html1.4a/Ctags/ctags.h b/doc/tools/src2html1.4a/Ctags/ctags.h
deleted file mode 100644
index 7b28018714..0000000000
--- a/doc/tools/src2html1.4a/Ctags/ctags.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (c) 1987 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)ctags.h	5.4 (Berkeley) 2/26/91
- */
-
-#include <strings.h>
-#define	bool	char
-
-#define	YES		1
-#define	NO		0
-#define	EOS		'\0'
-
-#define	ENDLINE		50		/* max length of pattern */
-#define	MAXTOKEN	250		/* max size of single token */
-
-#define	SETLINE		{++lineno;lineftell = ftell(inf);}
-#define	GETC(op,exp)	((c = getc(inf)) op (int)exp)
-
-#define	iswhite(arg)	(_wht[arg])	/* T if char is white */
-#define	begtoken(arg)	(_btk[arg])	/* T if char can start token */
-#define	intoken(arg)	(_itk[arg])	/* T if char can be in token */
-#define	endtoken(arg)	(_etk[arg])	/* T if char ends tokens */
-#define	isgood(arg)	(_gd[arg])	/* T if char can be after ')' */
-
-					/* Symbol types */
-#define SY_MAC	1			/* Preprocessor Macros */
-#define SY_DEF	2			/* Preprocessor Defines */
-#define SY_FUN	3			/* C Functions */
-#define SY_VAR	4			/* C Variables */
-#define SY_STR	5			/* C Structs */
-#define SY_UNI	6			/* C Unions */
-#define SY_TYP	7			/* C Typedefs */
-#define SY_ENU	8			/* C Enums */
-
-typedef struct nd_st {			/* sorting structure */
-	struct nd_st	*left,
-			*right;		/* left and right sons */
-	char	*entry,			/* function or type name */
-		*file,			/* file name */
-		*pat;			/* search pattern */
-	int	symbtype;		/* Type of symbol */
-	int	lno;			/* for -x option */
-	bool	been_warned;		/* set if noticed dup */
-} NODE;
-
-extern FILE	*inf;			/* ioptr for current input file */
-extern long	lineftell;		/* ftell after getc( inf ) == '\n' */
-extern int	lineno,			/* line number of current line */
-		xflag;			/* -x: cxref style output */
-extern bool	_wht[0177],_etk[0177],_itk[0177],_btk[0177],_gd[0177];
-extern char	lbuf[BUFSIZ];
diff --git a/doc/tools/src2html1.4a/Ctags/fortran.c b/doc/tools/src2html1.4a/Ctags/fortran.c
deleted file mode 100644
index 025a204b6b..0000000000
--- a/doc/tools/src2html1.4a/Ctags/fortran.c
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * Copyright (c) 1987 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef lint
-static char sccsid[] = "@(#)fortran.c	5.5 (Berkeley) 2/26/91";
-#endif /* not lint */
-
-#include <stdio.h>
-#include <string.h>
-#include "ctags.h"
-
-static void takeprec();
-
-char *lbp;				/* line buffer pointer */
-
-PF_funcs()
-{
-	register bool	pfcnt;		/* pascal/fortran functions found */
-	register char	*cp;
-	char	tok[MAXTOKEN],
-		*gettoken();
-
-	for (pfcnt = NO;;) {
-		lineftell = ftell(inf);
-		if (!fgets(lbuf,sizeof(lbuf),inf))
-			return(pfcnt);
-		++lineno;
-		lbp = lbuf;
-		if (*lbp == '%')	/* Ratfor escape to fortran */
-			++lbp;
-		for (;isspace(*lbp);++lbp);
-		if (!*lbp)
-			continue;
-		switch (*lbp | ' ') {	/* convert to lower-case */
-		case 'c':
-			if (cicmp("complex") || cicmp("character"))
-				takeprec();
-			break;
-		case 'd':
-			if (cicmp("double")) {
-				for (;isspace(*lbp);++lbp);
-				if (!*lbp)
-					continue;
-				if (cicmp("precision"))
-					break;
-				continue;
-			}
-			break;
-		case 'i':
-			if (cicmp("integer"))
-				takeprec();
-			break;
-		case 'l':
-			if (cicmp("logical"))
-				takeprec();
-			break;
-		case 'r':
-			if (cicmp("real"))
-				takeprec();
-			break;
-		}
-		for (;isspace(*lbp);++lbp);
-		if (!*lbp)
-			continue;
-		switch (*lbp | ' ') {
-		case 'f':
-			if (cicmp("function"))
-				break;
-			continue;
-		case 'p':
-			if (cicmp("program") || cicmp("procedure"))
-				break;
-			continue;
-		case 's':
-			if (cicmp("subroutine"))
-				break;
-		default:
-			continue;
-		}
-		for (;isspace(*lbp);++lbp);
-		if (!*lbp)
-			continue;
-		for (cp = lbp + 1;*cp && intoken(*cp);++cp);
-		if (cp = lbp + 1)
-			continue;
-		*cp = EOS;
-		(void)strcpy(tok,lbp);
-		getline();			/* process line for ex(1) */
-		pfnote(tok,lineno);
-		pfcnt = YES;
-	}
-	/*NOTREACHED*/
-}
-
-/*
- * cicmp --
- *	do case-independent strcmp
- */
-cicmp(cp)
-	register char	*cp;
-{
-	register int	len;
-	register char	*bp;
-
-	for (len = 0,bp = lbp;*cp && (*cp &~ ' ') == (*bp++ &~ ' ');
-	    ++cp,++len);
-	if (!*cp) {
-		lbp += len;
-		return(YES);
-	}
-	return(NO);
-}
-
-static void
-takeprec()
-{
-	for (;isspace(*lbp);++lbp);
-	if (*lbp == '*') {
-		for (++lbp;isspace(*lbp);++lbp);
-		if (!isdigit(*lbp))
-			--lbp;			/* force failure */
-		else
-			while (isdigit(*++lbp));
-	}
-}
diff --git a/doc/tools/src2html1.4a/Ctags/lisp.c b/doc/tools/src2html1.4a/Ctags/lisp.c
deleted file mode 100644
index 652313d4fe..0000000000
--- a/doc/tools/src2html1.4a/Ctags/lisp.c
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright (c) 1987 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef lint
-static char sccsid[] = "@(#)lisp.c	5.5 (Berkeley) 2/26/91";
-#endif /* not lint */
-
-#include <stdio.h>
-#include <string.h>
-#include "ctags.h"
-
-extern char	*lbp;			/* pointer shared with fortran */
-
-/*
- * lisp tag functions
- * just look for (def or (DEF
- */
-l_entries()
-{
-	register int	special;
-	register char	*cp,
-			savedc;
-	char	tok[MAXTOKEN];
-
-	for (;;) {
-		lineftell = ftell(inf);
-		if (!fgets(lbuf,sizeof(lbuf),inf))
-			return;
-		++lineno;
-		lbp = lbuf;
-		if (!cicmp("(def"))
-			continue;
-		special = NO;
-		switch(*lbp | ' ') {
-		case 'm':
-			if (cicmp("method"))
-				special = YES;
-			break;
-		case 'w':
-			if (cicmp("wrapper") || cicmp("whopper"))
-				special = YES;
-		}
-		for (;!isspace(*lbp);++lbp);
-		for (;isspace(*lbp);++lbp);
-		for (cp = lbp;*cp && *cp != '\n';++cp);
-		*cp = EOS;
-		if (special) {
-			if (!(cp = index(lbp,')')))
-				continue;
-			for (;cp >= lbp && *cp != ':';--cp);
-			if (cp < lbp)
-				continue;
-			lbp = cp;
-			for (;*cp && *cp != ')' && *cp != ' ';++cp);
-		}
-		else
-			for (cp = lbp + 1;
-			    *cp && *cp != '(' && *cp != ' ';++cp);
-		savedc = *cp;
-		*cp = EOS;
-		(void)strcpy(tok,lbp);
-		*cp = savedc;
-		getline();
-		pfnote(tok,lineno);
-	}
-	/*NOTREACHED*/
-}
diff --git a/doc/tools/src2html1.4a/Ctags/print.c b/doc/tools/src2html1.4a/Ctags/print.c
deleted file mode 100644
index 1c1c545ab6..0000000000
--- a/doc/tools/src2html1.4a/Ctags/print.c
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Copyright (c) 1987 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef lint
-static char sccsid[] = "@(#)print.c	5.4 (Berkeley) 2/26/91";
-#endif /* not lint */
-
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "ctags.h"
-
-extern char	searchar;		/* ex search character */
-
-/*
- * getline --
- *	get the line the token of interest occurred on,
- *	prepare it for printing.
- */
-getline()
-{
-	register long	saveftell;
-	register int	c,
-			cnt;
-	register char	*cp;
-
-	saveftell = ftell(inf);
-	(void)fseek(inf,lineftell,SEEK_SET);
-	if (xflag)
-		for (cp = lbuf;GETC(!=,'\n');*cp++ = c);
-	/*
-	 * do all processing here, so we don't step through the
-	 * line more than once; means you don't call this routine
-	 * unless you're sure you've got a keeper.
-	 */
-	else for (cnt = 0,cp = lbuf;GETC(!=,EOF) && cnt < ENDLINE;++cnt) {
-		if (c == (int)'\\') {		/* backslashes */
-			if (cnt > ENDLINE - 2)
-				break;
-			*cp++ = '\\'; *cp++ = '\\';
-			++cnt;
-		}
-		else if (c == (int)searchar) {	/* search character */
-			if (cnt > ENDLINE - 2)
-				break;
-			*cp++ = '\\'; *cp++ = c;
-			++cnt;
-		}
-		else if (c == (int)'\n') {	/* end of keep */
-			*cp++ = '$';		/* can find whole line */
-			break;
-		}
-		else
-			*cp++ = c;
-	}
-	*cp = EOS;
-	(void)fseek(inf,saveftell,SEEK_SET);
-}
-
-char *symtype[]= {
-	"Unknown",
-	"Preprocessor macro",
-	"Preprocessor define",
-	"C function",
-	"C variable",
-	"C struct",
-	"C union",
-	"C typedef",
-	"C enum"
-};
-
-/*
- * put_entries --
- *	write out the tags
- */
-put_entries(node)
-	register NODE	*node;
-{
-	extern FILE	*outf;		/* ioptr for tags file */
-	extern int	vflag;		/* -v: vgrind style output */
-	extern int	yflag;		/* -y: yet another style output */
-
-	if (node->left)
-		put_entries(node->left);
-	if (vflag)
-		printf("%s %s %d\n",
-		    node->entry,node->file,(node->lno + 63) / 64);
-	else if (xflag)
-		printf("%-16s %4d %-16s %s\n",
-		    node->entry,node->lno,node->file,node->pat);
-	else if (yflag)
-		printf("%-16s %4d %-16s %s\n",
-		    node->entry,node->lno,node->file,symtype[node->symbtype]);
-	else
-		fprintf(outf,"%s\t%s\t%c^%s%c\n",
-		    node->entry,node->file,searchar,node->pat,searchar);
-	if (node->right)
-		put_entries(node->right);
-}
diff --git a/doc/tools/src2html1.4a/Ctags/strerror.c b/doc/tools/src2html1.4a/Ctags/strerror.c
deleted file mode 100644
index 7a82b869bf..0000000000
--- a/doc/tools/src2html1.4a/Ctags/strerror.c
+++ /dev/null
@@ -1,6 +0,0 @@
-char *strerror(i)
- int i;
- {
-  extern char *sys_errlist[];
-  return sys_errlist[i];
- }
diff --git a/doc/tools/src2html1.4a/Ctags/tree.c b/doc/tools/src2html1.4a/Ctags/tree.c
deleted file mode 100644
index e82c72c404..0000000000
--- a/doc/tools/src2html1.4a/Ctags/tree.c
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * Copyright (c) 1987 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef lint
-static char sccsid[] = "@(#)tree.c	5.5 (Berkeley) 2/26/91";
-#endif /* not lint */
-
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "ctags.h"
-
-/*
- * pfnote --
- *	enter a new node in the tree
- */
-pfnote(name,ln,type)
-	char	*name;
-	int	ln;
-	int 	type;
-{
-	extern NODE	*head;		/* head of the sorted binary tree */
-	extern char	*curfile;	/* current input file name */
-	register NODE	*np;
-	register char	*fp;
-	char	nbuf[MAXTOKEN];
-
-	/*NOSTRICT*/
-	if (!(np = (NODE *)malloc(sizeof(NODE)))) {
-		fputs("ctags: too many entries to sort\n",stderr);
-		put_entries(head);
-		free_tree(head);
-		/*NOSTRICT*/
-		if (!(head = np = (NODE *)malloc(sizeof(NODE)))) {
-			fputs("ctags: out of space.\n",stderr);
-			exit(1);
-		}
-	}
-	if (!xflag && !strcmp(name,"main")) {
-		if (!(fp = rindex(curfile,'/')))
-			fp = curfile;
-		else
-			++fp;
-		(void)sprintf(nbuf,"M%s",fp);
-		fp = rindex(nbuf,'.');
-		if (fp && !fp[2])
-			*fp = EOS;
-		name = nbuf;
-	}
-	if (!(np->entry = strdup(name))) {
-		(void)fprintf(stderr, "ctags: %s\n", strerror(errno));
-		exit(1);
-	}
-	np->file = curfile;
-	np->lno = ln; np->symbtype= type;
-	np->left = np->right = 0;
-	if (!(np->pat = strdup(lbuf))) {
-		(void)fprintf(stderr, "ctags: %s\n", strerror(errno));
-		exit(1);
-	}
-	if (!head)
-		head = np;
-	else
-		add_node(np,head);
-}
-
-add_node(node,cur_node)
-	register NODE	*node,
-			*cur_node;
-{
-	extern int	wflag;			/* -w: suppress warnings */
-	register int	dif;
-
-	dif = strcmp(node->entry,cur_node->entry);
-	if (!dif) {
-		if (node->file == cur_node->file) {
-			if (!wflag)
-				fprintf(stderr,"Duplicate entry in file %s, line %d: %s\nSecond entry ignored\n",node->file,lineno,node->entry);
-			return;
-		}
-		if (!cur_node->been_warned)
-			if (!wflag)
-				fprintf(stderr,"Duplicate entry in files %s and %s: %s (Warning only)\n",node->file,cur_node->file,node->entry);
-		cur_node->been_warned = YES;
-	}
-	else if (dif < 0)
-		if (cur_node->left)
-			add_node(node,cur_node->left);
-		else
-			cur_node->left = node;
-	else if (cur_node->right)
-		add_node(node,cur_node->right);
-	else
-		cur_node->right = node;
-}
-
-free_tree(node)
-	register NODE	*node;
-{
-	NODE	*nl;
-	while (node) {
-		if (node->right)
-			free_tree(node->right);
-		nl= node->left; free(node);
-		node = nl;
-	}
-}
diff --git a/doc/tools/src2html1.4a/Ctags/yacc.c b/doc/tools/src2html1.4a/Ctags/yacc.c
deleted file mode 100644
index f073f2bb7c..0000000000
--- a/doc/tools/src2html1.4a/Ctags/yacc.c
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Copyright (c) 1987 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef lint
-static char sccsid[] = "@(#)yacc.c	5.6 (Berkeley) 2/26/91";
-#endif /* not lint */
-
-#include <stdio.h>
-#include <string.h>
-#include "ctags.h"
-
-/*
- * y_entries:
- *	find the yacc tags and put them in.
- */
-y_entries()
-{
-	register int	c;
-	register char	*sp;
-	register bool	in_rule;
-	char	tok[MAXTOKEN];
-
-	while (GETC(!=,EOF))
-		switch ((char)c) {
-		case '\n':
-			SETLINE;
-			/* FALLTHROUGH */
-		case ' ':
-		case '\f':
-		case '\r':
-		case '\t':
-			break;
-		case '{':
-			if (skip_key((int)'}'))
-				in_rule = NO;
-			break;
-		case '\'':
-		case '"':
-			if (skip_key(c))
-				in_rule = NO;
-			break;
-		case '%':
-			if (GETC(==,'%'))
-				return;
-			(void)ungetc(c,inf);
-			break;
-		case '/':
-			if (GETC(==,'*'))
-				skip_comment();
-			else
-				(void)ungetc(c,inf);
-			break;
-		case '|':
-		case ';':
-			in_rule = NO;
-			break;
-		default:
-			if (in_rule || !isalpha(c) && c != (int)'.'
-			    && c != (int)'_')
-				break;
-			sp = tok;
-			*sp++ = c;
-			while (GETC(!=,EOF) && (intoken(c) || c == (int)'.'))
-				*sp++ = c;
-			*sp = EOS;
-			getline();		/* may change before ':' */
-			while (iswhite(c)) {
-				if (c == (int)'\n')
-					SETLINE;
-				if (GETC(==,EOF))
-					return;
-			}
-			if (c == (int)':') {
-				pfnote(tok,lineno);
-				in_rule = YES;
-			}
-			else
-				(void)ungetc(c,inf);
-		}
-}
-
-/*
- * toss_yysec --
- *	throw away lines up to the next "\n%%\n"
- */
-toss_yysec()
-{
-	register int	c,			/* read character */
-			state;
-
-	/*
-	 * state == 0 : waiting
-	 * state == 1 : received a newline
-	 * state == 2 : received first %
-	 * state == 3 : recieved second %
-	 */
-	lineftell = ftell(inf);
-	for (state = 0;GETC(!=,EOF);)
-		switch ((char)c) {
-			case '\n':
-				++lineno;
-				lineftell = ftell(inf);
-				if (state == 3)		/* done! */
-					return;
-				state = 1;		/* start over */
-				break;
-			case '%':
-				if (state)		/* if 1 or 2 */
-					++state;	/* goto 3 */
-				break;
-			default:
-				state = 0;		/* reset */
-		}
-}
diff --git a/doc/tools/src2html1.4a/Ctags/z.c b/doc/tools/src2html1.4a/Ctags/z.c
deleted file mode 100644
index 4c90e6ec95..0000000000
--- a/doc/tools/src2html1.4a/Ctags/z.c
+++ /dev/null
@@ -1,20 +0,0 @@
-#define fred 23
-#define jim(a) (a+2)
-
-int helo;
-
-struct thing {
-	int v;
-} doris;
-
-union what {
-	int v;
-	char q;
-} mary;
-
-enum thinddd { 1,2,3,4,5 } zoo;
-
-typedef unsigned int uinty;
-
-int rain()
- { printf("Hello world\n"); }
diff --git a/doc/tools/src2html1.4a/FreeBSD/FreeBSD.hdr b/doc/tools/src2html1.4a/FreeBSD/FreeBSD.hdr
deleted file mode 100644
index 6c2f8e185c..0000000000
--- a/doc/tools/src2html1.4a/FreeBSD/FreeBSD.hdr
+++ /dev/null
@@ -1,25 +0,0 @@
-Welcome to the hyperlinked source code tree for FreeBSD-2.1.0. This is an
-attempt at a WWW document that allows you to find functions, structs
-etc. in the FreeBSD source code by name.<p>
-
-If you are interested in a particular type of symbols (e.g functions), use
-the type links below. If you are interested in a particular directory in
-FreeBSD, choose the directory link below.<p>
-
-Follow the links until you reach the source code you are interested in.<p>
-
-<h3>Bugs and Missing Features</h3>
-
-I am using ctags and perl to find the symbols and produce the html documents.
-My parsing of the ctags output (especially for variables) seems slightly
-wrong. I'd appreciate a better way of doing things.<p>
-
-The final code should have hyperlinks that allow you to follow references
-to other symbols in the tree (e.g calls to bread() etc). This is difficult
-given C's scoping rules, and I don't want to write a C grammar parser.
-Until I can think of a clean way, I'll omit the desired hyperlinks.<p>
-
-<author>
-<a href="http://minnie.cs.adfa.oz.au/warren.html">Warren Toomey</a>
-wkt@cs.adfa.oz.au, January 1996
-</author>
diff --git a/doc/tools/src2html1.4a/FreeBSD/FreeBSD.s2h b/doc/tools/src2html1.4a/FreeBSD/FreeBSD.s2h
deleted file mode 100644
index 925eefeb58..0000000000
--- a/doc/tools/src2html1.4a/FreeBSD/FreeBSD.s2h
+++ /dev/null
@@ -1,68 +0,0 @@
-#
-#
-# Input description for the FreeBSD 2.1.0 source tree
-# Place this file and all the .hdr files in a directory,
-# cd into that directory, and say `src2html FreeBSD.s2h'.
-#
-set Formdir /cgi-bin
-set Htmldir FreeBSD-srctree
-set Htmlroot .
-set Newsrctree newsrc
-set Srctree sys
-#
-dir conf		Kernel configuration parameters
-dir ddb			Kernel debugging routines
-dir dev/aic7xxx		Adaptec AIC7770/AIC7870 sequencer code
-dir dev/vn		Vnode disk driver
-dir gnu/i386/fpemul 	GNU's i387 floating point emulator
-dir gnu/i386/isa	Device drivers with GNU licensing
-dir gnu/isdn		An ISDN driver
-dir i386/apm		i386-specific power management
-dir i386/apm/apm_init	i386-specific power management
-dir i386/boot/biosboot	i386-specific boot code
-dir i386/boot/dosboot	i386-specific boot code
-dir i386/boot/kzipboot	i386-specific boot code
-dir i386/boot/netboot	i386-specific boot code
-dir i386/eisa		Device drivers for peripherals on the EISA bus
-dir i386/i386		i386-specific code
-dir i386/ibcs2		Intel Unix Binary Compatibility code
-dir i386/include 	i386-specific C-language include files
-dir i386/include/pc	i386-specific C-language include files
-dir i386/isa		Device drivers for peripherals on the ISA bus
-dir i386/isa/ic		Device drivers for peripherals on the ISA bus
-dir i386/isa/matcd	Matsushita device driver
-dir i386/isa/pcvt	VT-220 emulation code
-dir i386/isa/sound	Device drivers for sound peripherals on the ISA bus
-dir i386/linux		Linux binaries support
-dir i386/scsi		Device drivers for SCSI peripherals on the ISA bus
-dir isofs/cd9660	ISO CD9660 file-system code
-dir kern		The core OS routines: processes, scheduling, syscalls
-dir libkern		The kernel library
-dir miscfs/deadfs	Miscellaneous file systems
-dir miscfs/devfs	Miscellaneous file systems
-dir miscfs/fdesc	Miscellaneous file systems
-dir miscfs/fifofs	Miscellaneous file systems
-dir miscfs/kernfs	Miscellaneous file systems
-dir miscfs/nullfs	Miscellaneous file systems
-dir miscfs/portal	Miscellaneous file systems
-dir miscfs/procfs	Miscellaneous file systems
-dir miscfs/specfs	Miscellaneous file systems
-dir miscfs/umapfs	Miscellaneous file systems
-dir miscfs/union	Miscellaneous file systems
-dir msdosfs		The MS-DOS file system code
-dir net			Routing and general network interfaces
-dir netccitt		CCITT Networking code
-dir netinet		Internet protocols
-dir netiso		ISO Networking code
-dir netiso/xebec	ISO Networking code
-dir netns		Xerox NS Networking code
-dir nfs			The Network File System
-dir pccard		Interface code for PC-CARD controllers.
-dir pci			Device drivers for peripherals on the PCI bus
-dir scsi		Device drivers for peripherals on the SCSI bus
-dir sys			Widely used C-language include files
-dir ufs/ffs		The Berkeley Fast Filesystem
-dir ufs/lfs		The Log Filesystem
-dir ufs/mfs		The Memory Filesystem
-dir ufs/ufs		The Unix Filesystem
-dir vm			The Virtual Memory Management subsystem
diff --git a/doc/tools/src2html1.4a/FreeBSD/conf.hdr b/doc/tools/src2html1.4a/FreeBSD/conf.hdr
deleted file mode 100644
index 103742dbe2..0000000000
--- a/doc/tools/src2html1.4a/FreeBSD/conf.hdr
+++ /dev/null
@@ -1,9 +0,0 @@
-The <tt>conf</tt> directory holds miscellaneous files, such as the list of
-files which are needed/optional in the OS. The main file of concern is
-<tt>param.c</tt>, which describes the system-dependent configuration
-parameters of FreeBSD.
-
-The 4.3BSD Internals book by Leffler, McKusick, Karels and Quarterman
-doesn't really cover this directory. It is vaguely covered in Chapter 8 of
-the "System Performance Tuning" Nutshell book by Mike Loukides.
-<p>
diff --git a/doc/tools/src2html1.4a/FreeBSD/ddb.hdr b/doc/tools/src2html1.4a/FreeBSD/ddb.hdr
deleted file mode 100644
index 2882f3dfa8..0000000000
--- a/doc/tools/src2html1.4a/FreeBSD/ddb.hdr
+++ /dev/null
@@ -1,6 +0,0 @@
-The <tt>ddb</tt> directory holds routines used to debug the kernel.
-The 4.3BSD Internals book by Leffler, McKusick, Karels and Quarterman
-doesn't really cover this directory. However, some information has been
-presented by Kirk KcKusick and Keith Bostic in their "UNIX Kernel Internals"
-notes, which they have presented in many places in the past few years.
-<p>
diff --git a/doc/tools/src2html1.4a/FreeBSD/i386.i386.hdr b/doc/tools/src2html1.4a/FreeBSD/i386.i386.hdr
deleted file mode 100644
index 72ea58d1f1..0000000000
--- a/doc/tools/src2html1.4a/FreeBSD/i386.i386.hdr
+++ /dev/null
@@ -1,5 +0,0 @@
-The <tt>i386/i386</tt> directory holds the routines that deal with the Intel
-386/486 CPU in the PC architecture.
-The 4.3BSD Internals book by Leffler, McKusick, Karels and Quarterman
-doesn't describe this anywhere at all, because this is machine-specific.
-<p>
diff --git a/doc/tools/src2html1.4a/FreeBSD/i386.include.hdr b/doc/tools/src2html1.4a/FreeBSD/i386.include.hdr
deleted file mode 100644
index 7acfb0ec1b..0000000000
--- a/doc/tools/src2html1.4a/FreeBSD/i386.include.hdr
+++ /dev/null
@@ -1,5 +0,0 @@
-The <tt>i386/include</tt> directory holds C-language include files that
-define things that are specific about the PC architecture.<p>
-
-The 4.3BSD Internals book by Leffler, McKusick, Karels and Quarterman
-doesn't describe this anywhere at all. <p>
diff --git a/doc/tools/src2html1.4a/FreeBSD/i386.isa.hdr b/doc/tools/src2html1.4a/FreeBSD/i386.isa.hdr
deleted file mode 100644
index ec13230f00..0000000000
--- a/doc/tools/src2html1.4a/FreeBSD/i386.isa.hdr
+++ /dev/null
@@ -1,10 +0,0 @@
-The <tt>i386/isa</tt> directory holds the routines that deal with the ISA
-I/O bus in the PC architecture.
-The 4.3BSD Internals book by Leffler, McKusick, Karels and Quarterman
-doesn't describe this anywhere at all, because this is machine-specific.
-You can however glean some information from the following chapter:
-
-<dl>
-<dt> <b>Chapter 8</b>, pp 225-256 <i>Device Drivers</i>.
-</dl>
-<p>
diff --git a/doc/tools/src2html1.4a/FreeBSD/i386.stand.hdr b/doc/tools/src2html1.4a/FreeBSD/i386.stand.hdr
deleted file mode 100644
index c548c044b0..0000000000
--- a/doc/tools/src2html1.4a/FreeBSD/i386.stand.hdr
+++ /dev/null
@@ -1,14 +0,0 @@
-The <tt>i386/stand</tt> directory holds functions that are useful, but cannot
-be called from the kernel. For example printf() is great, but if the kernel
-called printf() it would generate a TRAP and wind up back in the kernel.<p>
-
-The functions here emulate these functions by dealing directly with the
-hardware on the system.<p>
-
-The 4.3BSD Internals book by Leffler, McKusick, Karels and Quarterman
-covers machine-independent <tt>stand</tt> functionality in:
-
-<dl>
-<dt> <b>Chapter 13.2</b>, pg 394 <i>Bootstrapping</i>.
-</dl>
-<p>
diff --git a/doc/tools/src2html1.4a/FreeBSD/kern.hdr b/doc/tools/src2html1.4a/FreeBSD/kern.hdr
deleted file mode 100644
index f8ec13e4a1..0000000000
--- a/doc/tools/src2html1.4a/FreeBSD/kern.hdr
+++ /dev/null
@@ -1,18 +0,0 @@
-The <tt>kern</tt> directory holds the core functionality of FreeBSD:
-system startup, core system calls and syscall dispatching, process
-management, scheduling, signals, file descriptors, top-level filesystem
-code, interprocess communication and terminal handling.<p>
-
-The 4.3BSD Internals book by Leffler, McKusick, Karels and Quarterman
-covers <tt>kern</tt> in:
-
-<dl>
-<dt> <b>Chapter 2</b>, pp 19-42 <i>Overview of the Kernel</i>.
-<dt> <b>Chapter 3</b>, pp 43-66 <i>Kernel Services</i>.
-<dt> <b>Chapter 4</b>, pp 69-108 <i>Process Management</i>.
-<dt> <b>Chapter 6</b>, pp 169-186 <i>I/O System Overview</i>.
-<dt> <b>Chapter 9</b>, pp 259-278 <i>Terminal Handling</i>.
-<dt> <b>Chapter 10</b>, pp 281-309 <i>Interprocess Communication</i>.
-<dt> <b>Chapter 13</b>, pp 393-411 <i>System Startup</i>.
-</dl>
-<p>
diff --git a/doc/tools/src2html1.4a/FreeBSD/net.hdr b/doc/tools/src2html1.4a/FreeBSD/net.hdr
deleted file mode 100644
index 59c1f67741..0000000000
--- a/doc/tools/src2html1.4a/FreeBSD/net.hdr
+++ /dev/null
@@ -1,11 +0,0 @@
-The <tt>net</tt> directory holds the network functionality of FreeBSD that
-deals with routing and generic interfaces: SLIP, PPP, Ethernet, packet
-filters.
-
-The 4.3BSD Internals book by Leffler, McKusick, Karels and Quarterman
-covers <tt>kern</tt> in:
-
-<dl>
-<dt> <b>Chapter 11</b>, pp 311-341 <i>Network Communication</i>.
-</dl>
-<p>
diff --git a/doc/tools/src2html1.4a/FreeBSD/netinet.hdr b/doc/tools/src2html1.4a/FreeBSD/netinet.hdr
deleted file mode 100644
index 19cdffa577..0000000000
--- a/doc/tools/src2html1.4a/FreeBSD/netinet.hdr
+++ /dev/null
@@ -1,10 +0,0 @@
-The <tt>netinet</tt> directory holds the code for the Internet network
-protocols used in FreeBSD: TCP, IP, ICMP, ARP.<p>
-
-The 4.3BSD Internals book by Leffler, McKusick, Karels and Quarterman
-covers <tt>netinet</tt> in:
-
-<dl>
-<dt> <b>Chapter 12</b>, pp 343-389 <i>Network Protocols</i>.
-</dl>
-<p>
diff --git a/doc/tools/src2html1.4a/FreeBSD/nfs.hdr b/doc/tools/src2html1.4a/FreeBSD/nfs.hdr
deleted file mode 100644
index f9aeab2bbb..0000000000
--- a/doc/tools/src2html1.4a/FreeBSD/nfs.hdr
+++ /dev/null
@@ -1,7 +0,0 @@
-The <tt>nfs</tt> directory holds the code for the Network File System.
-The code was developed from a specification of NFS from Sun Microsystems.<p>
-
-The 4.3BSD Internals book by Leffler, McKusick, Karels and Quarterman
-doesn't cover <tt>nfs</tt>. You probably don't really want to delve into
-it too much, but there is an RFC around describing the protocol, but not
-the code here. <p>
diff --git a/doc/tools/src2html1.4a/FreeBSD/stand.hdr b/doc/tools/src2html1.4a/FreeBSD/stand.hdr
deleted file mode 100644
index 9e7df8861f..0000000000
--- a/doc/tools/src2html1.4a/FreeBSD/stand.hdr
+++ /dev/null
@@ -1,14 +0,0 @@
-The <tt>stand</tt> directory holds functions that are useful, but cannot be
-called from the kernel. For example printf() is great, but if the kernel
-called printf() it would generate a TRAP and wind up back in the kernel.<p>
-
-The functions here emulate these functions by dealing directly with the
-hardware on the system.<p>
-
-The 4.3BSD Internals book by Leffler, McKusick, Karels and Quarterman
-covers <tt>stand</tt> in:
-
-<dl>
-<dt> <b>Chapter 13.2</b>, pg 394 <i>Bootstrapping</i>.
-</dl>
-<p>
diff --git a/doc/tools/src2html1.4a/FreeBSD/sys.hdr b/doc/tools/src2html1.4a/FreeBSD/sys.hdr
deleted file mode 100644
index 2624741a87..0000000000
--- a/doc/tools/src2html1.4a/FreeBSD/sys.hdr
+++ /dev/null
@@ -1,6 +0,0 @@
-The <tt>sys</tt> directory holds C-language include files that are used
-by all parts of the FreeBSD source tree.<p>
-
-The 4.3BSD Internals book by Leffler, McKusick, Karels and Quarterman
-doesn't cover these files specifically, but discussion of their contents
-crops up everywhere.<p>
diff --git a/doc/tools/src2html1.4a/FreeBSD/ufs.hdr b/doc/tools/src2html1.4a/FreeBSD/ufs.hdr
deleted file mode 100644
index 8cec8cddac..0000000000
--- a/doc/tools/src2html1.4a/FreeBSD/ufs.hdr
+++ /dev/null
@@ -1,10 +0,0 @@
-The <tt>ufs</tt> directory holds the code for the Berkeley Fast Filesystem,
-which is the filesystem used on locally mounted hard and floppy disks.<p>
-
-The 4.3BSD Internals book by Leffler, McKusick, Karels and Quarterman
-covers <tt>ufs</tt> in:
-
-<dl>
-<dt> <b>Chapter 7</b>, pp 187-223 <i>The Filesystem</i>.
-</dl>
-<p>
diff --git a/doc/tools/src2html1.4a/FreeBSD/vm.hdr b/doc/tools/src2html1.4a/FreeBSD/vm.hdr
deleted file mode 100644
index 26205175a8..0000000000
--- a/doc/tools/src2html1.4a/FreeBSD/vm.hdr
+++ /dev/null
@@ -1,9 +0,0 @@
-The <tt>vm</tt> directory holds the virtual memory subsystem used by
-FreeBSD. This was derived from the VM system used in the Mach kernel,
-with the interface to the rest of the kernel rewritten. As such, it is
-not described in the
-4.3BSD Internals book by Leffler, McKusick, Karels and Quarterman,
-but it is described by Kirk KcKusick and Keith Bostic in their
-"UNIX Kernel Internals"
-notes, which they have presented in many places in the past few years.
-<p>
diff --git a/doc/tools/src2html1.4a/Readme b/doc/tools/src2html1.4a/Readme
deleted file mode 100644
index 2153411891..0000000000
--- a/doc/tools/src2html1.4a/Readme
+++ /dev/null
@@ -1,65 +0,0 @@
-   src2html - Hyperlink a C source code tree using HTML, Version 1.3-alpha
-
-	     Warren Toomey	wkt@cs.adfa.oz.au	June 1995
-
-
-Src2html is a program which takes a C source tree and creates a set of
-HTML hypertext documents that allows the most important symbols in the
-source tree to be found easily. As well, a HTML version of the source
-tree is created, with the symbols given in bold font where they are defined
-in the source.
-
-
-REQUIREMENTS
-
-You will need:
-
-	+ Perl 4.x
-	+ a standard Unix sort(1) command.
-	+ a mkdir(1) that supports recursive creation of directories.
-	  src2html is configured to use `mkdir -p' to do this.
-	+ an egrep(1) if you're going to use the search facility.
-	+ httpd(1) if you're going to use the search facility.
-	+ Ctags-new, which is bundled with src2html, and a C compiler
-	  to compile it.
-
-
-INSTALLATION
-
-Extract the src2html archive, including the Ctags-new and Example directories;
-you probably have already done that. Go into the Ctags-new directory and make
-ctags-new. This should be very straight-forward.
-
-Install ctags-new and src2html in a directory on your path, make them
-executable and install their man pages as well. If your mkdir(1) uses a
-different option to -p, edit src2html to fix this.
-
-If you want to use the search facility, you need to install src2html.cgi
-in your httpd script directory, and edit it to reflect the root of your
-HTML documents, as set in DirectryRoot in conf/srm.conf.
-
-Make sure that ctags-new, src2html and src2html.cgi are executable, and
-that the latter two can find the Perl interpreter. Installation is complete.
-
-
-USING SRC2HTML
-
-Using src2html is pretty straight-forward. Print out and read the man page
-before trying anything. In the FreeBSD directory I have included the config
-file and header files for my src2html conversion of the FreeBSD-2.0.5 source
-tree; read the man page and FreeBSD/FreeBSD.s2h in tandem. The root document of
-this HTML tree is at http://minnie.cs.adfa.oz.au/FreeBSD-srctree/FreeBSD.html.
-
-
-COMMENTS AND QUESTIONS
-
-Surprisingly, src2html is reasonably fast even on large source trees. This was
-my first Perl program, so it could probably be made faster and smaller. I've
-placed comments in the source to give you an idea of what each section does. If
-you have any questions or comments, please email them to me at
-wkt@cs.adfa.oz.au. Now that it's finished I'm not that keen on overhauling it
-etc. I consider it as a good prototype. Getting inter-source hyperlinks done
-would be great, but I really don't want to write a C parser myself.
-
-Cheers,
-	Warren Toomey
diff --git a/doc/tools/src2html1.4a/ctags-emacs/README b/doc/tools/src2html1.4a/ctags-emacs/README
deleted file mode 100644
index 83415c92f4..0000000000
--- a/doc/tools/src2html1.4a/ctags-emacs/README
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-#  $Id$
-#
-
-Included in this directory is a patch for the file lib-src/etags.c
-from emacs-20.2.  This patch and the following instructions may
-or may not work for any other emacs version.
-
-mkdir work
-tar xzf ..../emacs-20.2.tar.gz
-cd emacs-20.2/lib-src
-patch <...../etags.c-ada-patch
-cd ../..
-mkdir build
-cd build
-../emacs-20.2/configure
-cd lib-src
-gmake ctags
-
-The ctags file in this directory is a pre-compiled binary.
diff --git a/doc/tools/src2html1.4a/ctags-emacs/ctags b/doc/tools/src2html1.4a/ctags-emacs/ctags
deleted file mode 100644
index 7fc51e6e9c..0000000000
--- a/doc/tools/src2html1.4a/ctags-emacs/ctags
+++ /dev/null
diff --git a/doc/tools/src2html1.4a/ctags-emacs/etags.c-ada-patch b/doc/tools/src2html1.4a/ctags-emacs/etags.c-ada-patch
deleted file mode 100644
index 7f660ce864..0000000000
--- a/doc/tools/src2html1.4a/ctags-emacs/etags.c-ada-patch
+++ /dev/null
@@ -1,424 +0,0 @@
-*** etags.c.orig	Wed Aug  6 02:09:19 1997
---- etags.c	Wed Nov  5 13:30:11 1997
-***************
-*** 31,37 ****
-   *	Francesco Potorti` (F.Potorti@cnuce.cnr.it) is the current maintainer.
-   */
-  
-! char pot_etags_version[] = "@(#) pot revision number is 12.11";
-  
-  #define	TRUE	1
-  #define	FALSE	0
---- 31,37 ----
-   *	Francesco Potorti` (F.Potorti@cnuce.cnr.it) is the current maintainer.
-   */
-  
-! char pot_etags_version[] = "@(#) pot revision number is 12.11/patched for Ada";
-  
-  #define	TRUE	1
-  #define	FALSE	0
-***************
-*** 182,193 ****
---- 182,195 ----
-  char *relative_filename (), *absolute_filename (), *absolute_dirname ();
-  void grow_linebuffer ();
-  long *xmalloc (), *xrealloc ();
-+ char *basename_no_extension ();
-  
-  typedef void Lang_function ();
-  /* Many compilers barf on this:
-  	Lang_function Asm_labels;
-     so let's write it this way */
-  void Asm_labels ();
-+ void Ada_funcs ();
-  void C_entries ();
-  void default_C_entries ();
-  void plain_C_entries ();
-***************
-*** 300,305 ****
---- 302,309 ----
-  bool cxref_style;		/* -x: create cxref style output */
-  bool cplusplus;			/* .[hc] means C++, not C */
-  bool noindentypedefs;		/* -I: ignore indentation in C */
-+ bool packages_only;             /* -P: only ada packages */
-+ bool do_filename_tags;          /* -F: insert a tag for the filename */
-  
-  #ifdef LONG_OPTIONS
-  struct option longopts[] =
-***************
-*** 330,335 ****
---- 334,341 ----
-    { "update",			no_argument,	   NULL,     'u'   },
-    { "version",			no_argument,	   NULL,     'V'   },
-    { "vgrind",			no_argument,	   NULL,     'v'   },
-+   { "packages-only",		no_argument,	   NULL,     'P'   }, 
-+   { "do-filename-tags",		no_argument,	   NULL,     'F'   }, 
-    { 0 }
-  };
-  #endif /* LONG_OPTIONS */
-***************
-*** 371,376 ****
---- 377,386 ----
-  			  NULL
-  			};
-  
-+ /* Ada code */
-+ char *Ada_suffixes [] = 
-+   { "ads", "adb", "ada", NULL };
-+ 
-  /* Note that .c and .h can be considered C++, if the --c++ flag was
-     given.  That is why default_C_entries is called here. */
-  char *default_C_suffixes [] =
-***************
-*** 445,450 ****
---- 455,461 ----
-  struct lang_entry lang_names [] =
-  {
-    { "asm",     Asm_labels,          Asm_suffixes,         NULL              },
-+   { "Ada",     Ada_funcs,           Ada_suffixes,         NULL              },
-    { "c",       default_C_entries,   default_C_suffixes,   NULL              },
-    { "c++",     Cplusplus_entries,   Cplusplus_suffixes,   NULL              },
-    { "c*",      Cstar_entries,       Cstar_suffixes,       NULL              },
-***************
-*** 609,614 ****
---- 620,631 ----
-          which you like.");
-      }
-  
-+   puts ("-P, --packages-only\n\
-+         For Ada files, generates tags entries only for packages.");
-+ 
-+   puts ("-F, --do-filename-tags\n\
-+         Generates a tag entry with tagname being file basename without suffix.");
-+ 
-    puts ("-V, --version\n\
-          Print the version of the program.\n\
-  -h, --help\n\
-***************
-*** 816,824 ****
-        char *optstring;
-  
-  #ifdef ETAGS_REGEXPS
-!       optstring = "-aCdDf:Il:o:r:RStTi:BuvxwVhH";
-  #else
-!       optstring = "-aCdDf:Il:o:StTi:BuvxwVhH";
-  #endif /* ETAGS_REGEXPS */
-  
-  #ifndef LONG_OPTIONS
---- 833,841 ----
-        char *optstring;
-  
-  #ifdef ETAGS_REGEXPS
-!       optstring = "-aCdDf:Il:o:r:RStTi:BuvxwVhHPF";
-  #else
-!       optstring = "-aCdDf:Il:o:StTi:BuvxwVhHPF";
-  #endif /* ETAGS_REGEXPS */
-  
-  #ifndef LONG_OPTIONS
-***************
-*** 892,897 ****
---- 909,923 ----
-  	case 'T':
-  	  typedefs = typedefs_and_cplusplus = TRUE;
-  	  break;
-+ 
-+         case 'P':
-+           packages_only++;
-+           break;
-+ 
-+         case 'F':
-+           do_filename_tags++;
-+           break;
-+ 
-  #if (!CTAGS)
-  	  /* Etags options */
-  	case 'i':
-***************
-*** 1169,1174 ****
---- 1195,1201 ----
-    if (!CTAGS)
-      {
-        char *filename;
-+       char *tagfilename;
-  
-        if (absolutefn (file))
-  	{
-***************
-*** 1181,1186 ****
---- 1208,1220 ----
-  	     to the directory of the tags file. */
-  	  filename = relative_filename (file, tagfiledir);
-  	}
-+       if (do_filename_tags)
-+         {
-+           tagfilename = basename_no_extension(filename);
-+           pfnote(savestr(tagfilename), FALSE, tagfilename, 0, 1, 0);
-+           free (tagfilename);
-+         }
-+       
-        fprintf (tagf, "\f\n%s,%d\n", filename, total_size_of_entries (head));
-        free (filename);
-        put_entries (head);
-***************
-*** 2954,2959 ****
---- 2988,3198 ----
-    C_entries (YACC, inf);
-  }
-  
-+ /* ada parsing */
-+ 
-+ char    *adbp;
-+ int     apfcnt;
-+ 
-+ void
-+ Ada_funcs(fi)
-+      FILE *fi;
-+ {
-+   int inquote;
-+ 
-+   inquote = 0;
-+   lineno = 0;
-+   charno = 0;
-+   apfcnt = 0;
-+ 
-+   while (!feof (fi))
-+     {
-+       if (adbp == NULL || *adbp == 0)
-+       {
-+         lineno++;
-+         linecharno = charno;
-+         charno += readline (&lb, fi) + 1;
-+         adbp = lb.buffer;
-+       }
-+       if (*adbp == '-')
-+       {
-+         adbp++ ;
-+         if (*adbp == '-')
-+         {
-+           while (*adbp)
-+             adbp++;
-+           continue;
-+         }
-+       }
-+       if (*adbp == '\'')
-+       {
-+         adbp++ ;
-+         if (*adbp) adbp++;
-+         continue;
-+       }
-+       if (inquote || (*adbp == '"'))
-+       {
-+         inquote = 1;
-+         adbp++ ;
-+         while (*adbp && *adbp != '"')
-+           adbp++;
-+         if (*adbp == '"')
-+         {
-+           adbp++;
-+           inquote = 0;
-+         }
-+         continue;
-+       }
-+       while (*adbp && !begtoken(*adbp))
-+       {
-+         if ((*adbp == '-') || (*adbp == '"') || (*adbp == '\''))
-+           break;
-+         adbp++;
-+       }
-+       if ((*adbp == '-') || (*adbp == '"') || (*adbp == '\''))
-+         continue;
-+       if (*adbp == 0)
-+         continue;
-+       switch (*adbp)
-+         {
-+         case 'f':
-+         case 'F':
-+           if (adatail("function") && !packages_only)
-+             adagetit(fi, "/f");
-+           else
-+             adaskip();
-+           continue;
-+         case 'p':
-+         case 'P':
-+           if (adatail("procedure") && !packages_only)
-+             adagetit(fi, "/p");
-+           else if (adatail("package"))
-+             adagetit(fi, "/s");
-+           else
-+             adaskip();
-+           continue;
-+         case 't':
-+         case 'T':
-+           if (adatail("task") && !packages_only)
-+               adagetit(fi, "/k");
-+           else if (typedefs && adatail("type") && !packages_only)
-+             adagetit(fi, "/t");
-+           else
-+             adaskip();
-+           continue;
-+ 
-+         default:
-+           adaskip();
-+           continue;
-+         }
-+     }
-+ }
-+ adaskip()
-+ {
-+    while (*adbp && !endtoken(*adbp))
-+      adbp++;
-+    while (*adbp && !begtoken(*adbp))
-+    {
-+      if ((*adbp == '"') || (*adbp == '\'') || (*adbp == '-'))
-+        return;
-+      adbp++;
-+    }
-+ }
-+ 
-+ adatail(cp)
-+      char *cp;
-+ {
-+   register int len = 0;
-+ 
-+   while (*cp && (*cp == tolower(*(adbp+len))))
-+     cp++, len++;
-+   if (*cp == 0)
-+     {
-+       adbp += len;
-+       if (intoken(*adbp))
-+         return (0);
-+       else
-+         return (1);
-+     }
-+   return (0);
-+ }
-+ 
-+ adagetit(fi, name_qualifier)
-+      FILE *fi;
-+      char *name_qualifier;
-+      
-+ {
-+   register char *cp;
-+   char c;
-+   char nambuf[BUFSIZ];
-+   char * local_name_qualifier;
-+   
-+   local_name_qualifier = name_qualifier;
-+   
-+   while (!feof (fi))
-+     {
-+       if (*adbp == '\0')
-+       {
-+         lineno++;
-+         linecharno = charno;
-+         charno += readline (&lb, fi) + 1;
-+         adbp = lb.buffer;
-+       }
-+       if (*adbp == '-')
-+       {
-+         adbp++ ;
-+         if (*adbp == '-')
-+         {
-+           while (*adbp)
-+             adbp++;
-+           continue;
-+         }
-+       }
-+       while (isspace(*adbp))
-+         adbp++;
-+       if (*adbp == 0)
-+         continue;
-+       if (*adbp == '-')
-+         continue;
-+       switch(*adbp)
-+         {
-+         case 'b':
-+         case 'B':
-+           if (adatail("body"))
-+             {
-+               local_name_qualifier = "/b";
-+               continue;
-+             }
-+           break;
-+           
-+         case 't':
-+         case 'T':
-+           if (adatail("type"))
-+             continue;
-+           break;
-+         }
-+       if (*adbp == '"')
-+       {
-+         for (cp = adbp+1; *cp && *cp != '"'; cp++)
-+           continue;
-+       }
-+       else
-+         for (cp = adbp+1;
-+              *cp && (isalpha(*cp) || isdigit(*cp) || *cp == '_');
-+              cp++)
-+           continue;
-+       c = cp[0];
-+       cp[0] = 0;
-+       strcpy(nambuf, adbp);
-+       strcat(nambuf, local_name_qualifier);
-+       cp[0] = c;
-+       pfnote(savenstr (nambuf, strlen(nambuf)), TRUE, lb.buffer, cp - lb.buffer + 1, lineno, linecharno);
-+       /* I am not really sure what the name is used for. */
-+       /* probably to be used to add a qualifier like /f /p /b /s /k /t */
-+       apfcnt++;
-+       return;
-+     }
-+ }
-+ 
-  /* Fortran parsing */
-  
-  char *dbp;
-***************
-*** 4684,4689 ****
---- 4923,4968 ----
-    return path.buffer;
-  #endif /* not MSDOS */
-  #endif /* not HAVE_GETCWD */
-+ }
-+ 
-+ /* Returna newly allocated string containing the filename
-+    of FILE without any precending directory and without
-+    extension. */
-+ char *
-+ basename_no_extension (file)
-+      char *file;
-+ {
-+   char *begin = file + strlen(file);
-+   char *end = begin;
-+   char *res, *rescp;
-+   bool in_extension;
-+   
-+ 
-+   /* position begin at the begining of the basename
-+      end will point to the end of the basename 
-+      without extension */
-+   in_extension = TRUE;
-+   
-+   while (begin > file && *begin != '/')
-+     {
-+       if (*begin == '.' && in_extension)
-+         {
-+           end = begin;
-+           in_extension = FALSE;
-+         }
-+       begin--;
-+     }
-+   if (*begin == '/') 
-+     begin++;
-+ 
-+   res = xnew(strlen(begin) - strlen(end) + 1, char);
-+   rescp = res;
-+   while (begin != end)
-+     {
-+       *rescp++ = *begin++;
-+     }
-+   *rescp = '\0';
-+   return res;
-  }
-  
-  /* Return a newly allocated string containing the file name
diff --git a/doc/tools/src2html1.4a/ctags-wr b/doc/tools/src2html1.4a/ctags-wr
deleted file mode 100644
index d514e85cab..0000000000
--- a/doc/tools/src2html1.4a/ctags-wr
+++ /dev/null
@@ -1,41 +0,0 @@
-#! /bin/sh
-#
-#  Ctags wrapper
-#
-#  Invokes the version shipped with src2html for C.
-#  Invokes the Ada patched GNU Emacs version for Ada.
-#
-#  $Id$
-
-TOOLSBASE=/usr1/rtems/rtemsdoc-work/tools/src2html
-
-if [ ! -f ${TOOLSBASE}/ctags-new ]; then
-  echo Can not find ${TOOLSBASE}/ctags-new for C programs.
-  exit 1
-fi
-
-if [ ! -f ${TOOLSBASE}/ctags ]; then
-  echo Can not find ${TOOLSBASE}/ctags for Ada programs.
-  exit 1
-fi
-
-cfiles=`find $1 -name "*.[ch]" -o "*.inl" 2>/dev/null | grep -v "/no-"`
-adafiles=`find $1 -name "*.ad[sb]" 2>/dev/null | grep -v "/no-"`
-adafiles=`ls -1 $1/*.ad[sb] 2>/dev/null`
-
-#cfiles=`ls -1 $1/*.[ch] $1/*.inl 2>/dev/null | grep -v "/no-"`
-#adafiles=`ls -1 $1/*.ad[sb] 2>/dev/null`
-
-if [ "x${cfiles}" != x ] ; then
-  ${TOOLSBASE}/ctags-new -d -t -w -y ${cfiles}
-  #mv tags tags.c
-fi
-
-if [ "x${adafiles}" != x ] ; then
-  ${TOOLSBASE}-src/ctags -d -t -x --no-warn ${adafiles} 
-fi 
-# cat tags
-#mv tags tags.ada
-#
-#cat tags.c tags.ada 
-#rm -f tags.c tags.ada
diff --git a/doc/tools/src2html1.4a/src2html b/doc/tools/src2html1.4a/src2html
deleted file mode 100644
index 98d9d83d7f..0000000000
--- a/doc/tools/src2html1.4a/src2html
+++ /dev/null
@@ -1,704 +0,0 @@
-#!/usr/bin/perl
-# Src2html: Take a source tree and generate Html documents that have hyperlinks
-# to the definition of structures, variables, functions, and preprocessor
-# definitions. Read the manual page for details on how to use the program.
-#
-# Version 1.4-alpha. Written by Warren Toomey wkt@cs.adfa.oz.au
-#
-# 19th January 1996
-#
-#  $Id$
-#
-
-if ($#ARGV <= 0 || $#ARGV > 4) {		# Check arg count
-    print(STDERR "Usage: $0 [-na] [-nl] [-d num] input_description\n");
-    print(STDERR "           -na: Don't produce top-level category files\n");
-    print(STDERR "           -nl: Don't produce per-letter files\n");
-    print(STDERR "            -d: Set debugging to given number (0-3)\n");
-    exit(1);
-}
-
-# Set up default option values
-$NoLetters= 0;
-$NoAll= 0;
-$Debug=0;
-$Top= $ARGV[$#ARGV];
-$Top=~ s/\.s2h$//;
-
-# Parse the options
-for ($i=0; $i<= $#ARGV; $i++) {
-	if ($ARGV[$i] eq "-na") { $NoAll= 1; next; }
-	if ($ARGV[$i] eq "-nl") { $NoLetters= 1; next; }
-	if ($ARGV[$i] eq "-d") { $i++; $Debug= $ARGV[$i]; next; }
-}
-
-$Title{"m"}= "C Macros";
-$Title{"d"}= "C Defines";
-$Title{"f"}= "C Functions";
-$Title{"v"}= "C Variables";
-$Title{"s"}= "C Structs";
-$Title{"u"}= "C Unions";
-$Title{"t"}= "C Typedefs";
-$Title{"e"}= "C Enums";
-$Title{"AdaType"}= "Ada Types";
-$Title{"AdaProcedure"}= "Ada Procedures";
-$Title{"AdaFunction"}= "Ada Functions";
-$Title{"AdaPackage"}= "Ada Packages";
-$Title{"AdaTask"}= "Ada Tasks";
-$Title{"g"}= "All symbols";
-
-&get_s2h;				# Read the description file
-&make_dirs;				# Make directories as needed
-&make_ctags;				# Generate ctags for all src
-&parse_ctags;				# Parse ctags, generate html ptr files
-foreach $i (keys(%Dirinfo))
-{ &rewrite_src($i); }			# Rewrite the src code
-exit(0);				# and exit
- 
-
-## get_s2h: Opens the source description file, reads it, and sets up some
-## variables describing where some directories are, and the source directories
-## to process. Variables used are:
-## Srctree - The root of the source tree we are processing
-## Htmlroot - The directory where all WWW documents are kept
-## Htmldir -  The directory under Htmlroot for this source tree
-## Htmltree - The root of the destination tree for the Html code
-## Newsrctree - The directory in Htmltree to store the new Htmlised code
-## Headers - The directory where we keep information to prepend in some docs
-## Formdir - The place to put the index searching script
-## Dirinfo{} - The list of dirs and the info about the directory
-## Dotdir{} - The directory name with /'s -> .'s
-
-sub get_s2h {
-    $Newsrctree= 'newsrc';			# Set up as default
-    $Headers= '.';
-
-
-    #########################################################
-    # make sure we dump out the last bit of the last file....
-
-			# Print out the remainder of the
-			# current file, incl. the buffered line
-    if ($In_file == 1) {
-      if ("$line" ne "") { print OUT $line; }
-      while (<IN>) {
-	      s/\&/&amp;/g; s/\</&lt;/g; s/\>/&gt;/g; print OUT;
-	} 
-      print OUT "\n\n\n\n\n\n\n\n</pre></body>\n";
-      close(IN); close(OUT);
-    }
-    #########################################################
-
-    open(S2H,$ARGV[$#ARGV])				# Open descript
-	|| die "$0: can't open $ARGV[$#ARGV]: $!\n";
-
-    while(<S2H>) {				# Read in input lines
-	next if /^#/;				# Skip comments
-	if ( /^set\s+Srctree\s+(\S+)/ ) {
-	    $Srctree = $1; next;		# Set the variable
-	}
-	if ( /^set\s+Htmlroot\s+(\S+)/ ) {
-	    $Htmlroot = $1; next;		# Set the variable
-	}
-	if ( /^set\s+Htmldir\s+(\S+)/ ) {
-	    $Htmldir = $1; next;		# Set the variable
-	}
-	if ( /^set\s+Newsrctree\s+(\S+)/ ) {
-	    $Newsrctree = $1; next;		# Set the variable
-	}
-	if ( /^set\s+Headers\s+(\S+)/ ) {
-	    $Headers = $1; next;		# Set the variable
-	}
-	if ( /^set\s+Formdir\s+(\S+)/ ) {
-	    $Formdir = $1; next;		# Set the variable
-	}
-	if ( /^dir\s+(\S+)\s+(.*)/ ) {
-	    $Dirinfo{$1}= $2; $Dotdir{$1}=$1;
-	    $Dotdir{$1}=~ s/\//./g;
-	    next;				# Get dir commands
-	}
-	if ( /^\n/ ) { next; }			# Ignore blank lines
-						# Bad input line, give warning
-	chop; print "$_: Bad line, ignoring\n"; next;
-    }
-    close(S2H);
-    if (!defined($Srctree)) { die "$0: Srctree undefined in $ARGV[$#ARGV]\n"; }
-    if (!defined($Htmlroot)) { die "$0: Htmlroot undefined in $ARGV[$#ARGV]\n"; }
-    if (!defined($Htmldir)) { die "$0: Htmldir undefined in $ARGV[$#ARGV]\n"; }
-    $Htmltree= "$Htmlroot/$Htmldir";
-}
-
-## make_dirs: Make the directories need to store the Html documents, and also
-## check to make sure that the input directories exist. We depend upon mkdir(1)
-## having the -p option to make intermediate directories as needed.
-
-sub make_dirs {
-    local($i);
-
-    foreach $i (keys(%Dirinfo)) {	     # Check that the directories exist
-	if (! -e "$Srctree/$i") {
-	    die "$0: Input dir $Srctree/$i doesn't exist\n";
-	}
-	if (! -d "$Srctree/$i") {
-	    die "$0: Input dir $Srctree/$i is not a directory\n";
-	}
-    }
-    if (! -e "$Htmltree") {
-	system("mkdir -p $Htmltree") && die "$0: Can't mkdir $Htmltree\n";
-    }
-    if (! -e "$Htmltree/$Newsrctree") {
-	system("mkdir -p $Htmltree/$Newsrctree")
-		&& die "$0: Can't mkdir $Htmltree/$Newsrctree\n";
-    }
-    if (! -e "$Htmltree/ctags") {
-	system("mkdir -p $Htmltree/ctags") && die "$0: Can't mkdir ctags\n";
-    }
-    foreach $i (keys(%Dirinfo)) {
-	if (! -e "$Htmltree/$Newsrctree/$i") {
-	    system("mkdir -p $Htmltree/$Newsrctree/$i")
-		&& die "$0: Can't mkdir $Htmltree/$Newsrctree/$i\n";
-	}
-    }
-}
-
-## make_ctags: Process all the source code, creating the ctags files.
-## The Ctagsfile{} array is set up to hold the name of the ctags files
-## created.
-
-sub make_ctags {
-    local($i);
-
-    foreach $i (keys(%Dirinfo)) {
-	$Ctagsfile{$i}= "$Htmltree/ctags/$Dotdir{$i}.ctags";
-	if ($Debug > 0 ) { print "Generating ctags for $Ctagsfile{$i}\n"; }
-	system("(cd $Srctree; /usr1/rtems/rtemsdoc-work/tools/src2html/ctags-wr $i) > $Ctagsfile{$i}")
-	&& print "$0: ctags failed on $Srctree/$i\n";
-    }
-}
-
-
-## parse_ctags: Parse the ctags file produced by make_ctags, creating several
-## arrays of information. The arrays created are:
-## Macro{} - The name of every macro and its name lowercased
-## Def{} - The name of every define and its name lowercased
-## Func{} - The name of every function and its name lowercased
-## Var{} - The name of every variable and its name lowercased
-## Struct{} - The name of every struct and its name lowercased
-## Union{} - The name of every union and its name lowercased
-## Type{} - The name of every typedef and its name lowercased
-## Enum{} - The name of every enum and its name lowercased
-## Nfile{} - The directory in which the symbol was found
-## Nline{} - The line number where the symbol was found
-
-sub parse_ctags {
-    local($i);
-    local($low);
-    local($count);
-
-    $count = 0;
-
-    foreach $i (keys(%Dirinfo)) {
-	open(CTAGS,$Ctagsfile{$i}) || die "$0: Can't open $Ctagsfile{$i}, $!\n";
-	if ($Debug > 0) { print "Parsing $Ctagsfile{$i} to build ptr files\n"; }
-	while (<CTAGS>) {
-            $count ++;
-	    if ( /^(\w+)\s+(\d+)\s+(\S+)\s+Preprocessor macro/ ) {
-		($low=$1)=~tr/A-Z_/a-z/d;	$k="$low$count";
-		$Macro{$k}=$1;			$Nline{$k}= $2;
-		$Nfile{$k}= $3;			next;
-	    }
-	    if ( /^(\w+)\s+(\d+)\s+(\S+)\s+Preprocessor define/ ) {
-		($low=$1)=~tr/A-Z_/a-z/d; 	$k="$low$count";
-		$Def{$k}=$1;			$Nline{$k}= $2;
-		$Nfile{$k}= $3;			next; 
-	    }
-	    if ( /^(\w+)\s+(\d+)\s+(\S+)\s+C struct/ ) {
-		($low=$1)=~tr/A-Z_/a-z/d; 	$k="$low$count";
-		$Struct{$k}=$1;			$Nline{$k}= $2;
-		$Nfile{$k}= $3;			next;
-	    }
-	    if ( /^(\w+)\s+(\d+)\s+(\S+)\s+C union/ ) {
-		($low=$1)=~tr/A-Z_/a-z/d; 	$k="$low$count";
-		$Union{$k}=$1;			$Nline{$k}= $2;
-		$Nfile{$k}= $3;			next; 
-	    }
-	    if ( /^(\w+)\s+(\d+)\s+(\S+)\s+C typedef/ ) {
-		($low=$1)=~tr/A-Z_/a-z/d; 	$k="$low$count";
-		$Type{$k}=$1;			$Nline{$k}= $2;
-		$Nfile{$k}= $3;			next; 
-	    }
-	    if ( /^(\w+)\s+(\d+)\s+(\S+)\s+C enum/ ) {
-		($low=$1)=~tr/A-Z_/a-z/d; 	$k="$low$count";
-		$Enum{$k}=$1;			$Nline{$k}= $2;
-		$Nfile{$k}= $3;			next;
-	    }
-	    if ( /^(\w+)\s+(\d+)\s+(\S+)\s+C function/ ) {
-		($low=$1)=~tr/A-Z_/a-z/d; 	$k="$low$count";
-		$Func{$k}=$1;			$Nline{$k}= $2;
-		$Nfile{$k}= $3;			next;
-	    }
-	    if ( /^(\w+)\s+(\d+)\s+(\S+)\s+C variable/ ) {
-		($low=$1)=~tr/A-Z_/a-z/d; 	$k="$low$count";
-		$Var{$k}=$1;			$Nline{$k}= $2;
-		$Nfile{$k}= $3;			next;
-	    }
-	    if ( /^(return)\/.\s+(\d+)\s+(\S+)\s+.*/ ) {
-                next;
-                # Code like the following line results in "return" as ctag
-                #    "type Action is access function return Boolean;
-            }
-	    if ( /^(\w+)\/.\s+(\d+)\s+(\S+)\s+use .*/ ) {
-                next;
-                # throw away lines like "use type System"
-            }
-
-	    if ( /^(\w+)\/.\s+(\d+)\s+(\S+)\s+type .*/ ) {
-		($low=$1)=~tr/A-Z_/a-z/d; 	$k="$low$count";
-		$AdaType{$k}=$1;		$Nline{$k}= $2;
-		$Nfile{$k}= $3;			next;
-	    }
-	    if ( /^(\w+)\/.+\s+(\d+)\s+(\S+)\s+procedure .*/ ) {
-		($low=$1)=~tr/A-Z_/a-z/d; 	$k="$low$count";
-                $AdaProcedure{$k}=$1;		$Nline{$k}= $2;
-		$Nfile{$k}= $3;			next;
-	    }
-	    if ( /^(\w+)\/.+\s+(\d+)\s+(\S+)\s+function .*/ ) {
-		($low=$1)=~tr/A-Z_/a-z/d; 	$k="$low$count";
-		$AdaFunction{$k}=$1;		$Nline{$k}= $2;
-		$Nfile{$k}= $3;			next;
-	    }
-	    if ( /^(\".+)\/.+\s+(\d+)\s+(\S+)\s+function .*/ ) {
-                next;
-                # throw away functions like "*"
-	    }
-	    if ( /^(\w+)\/.\s+(\d+)\s+(\S+)\s+package .*/ ) {
-		($low=$1)=~tr/A-Z_/a-z/d; 	$k="$low$count";
-		$AdaPackage{$k}=$1;		$Nline{$k}= $2;
-		$Nfile{$k}= $3;			next;
-	    }
-	    if ( /^(\w+)\/.\s+(\d+)\s+(\S+)\s+task .*/ ) {
-		($low=$1)=~tr/A-Z_/a-z/d; 	$k="$low$count";
-		$AdaTask{$k}=$1;		$Nline{$k}= $2;
-		$Nfile{$k}= $3; next;
-	    }
-	    if ( /^([\w\/]+)\s+(\d+)\s+(\S+)\s+use type .*/ ) {
-		next;
-	    }
-	    if ( /^([\w\/\(]+)\s+(\d+)\s+(\S+)\s+type .*/ ) {
-		next;
-	    }
-	    if ( /^;([\w\/\(]+)\s+(\d+)\s+(\S+)\s+type .*/ ) {
-		next;
-	    }
-	    if ( /^\(([\w\/\(]+)\s+(\d+)\s+(\S+)\s+procedure .*/ ) {
-		next;
-	    }
-	    print "$0: In Ctagsfile{$i}, don't recognise $_";
-	}
-	close(CTAGS);
-	&make_dir_html($i);
-	undef %Macro; undef %Def; undef %Func; undef %Var;
-	undef %Struct; undef %Union; undef %Type; undef %Enum;
-	undef %AdaType; undef %AdaProcedure; undef %AdaFunction;
-        undef %AdaPackage; undef %AdaTask;
-    }
-  &make_top_html;
-}
-
-## make_letters_html: Make the lowest HTML documents, i.e those per-directory
-## per-type per-letter Htmls that point directly at the source code.
-## Arguments are:  Dir name, prefix, title, Name/dir list
-## If the file is created, set $Exists(letter) positive, else to 0.
-
-sub make_letters_html {
-    local($dir)= $_[0];
-    local($pref)= $_[1];
-    local($title)= $_[2];
-    local(*type)= $_[3];
-    local($htmlfile);
-    local($let)="@";
-  
-    foreach $i ( "a".."z",
-       "AdaType", "AdaProcedure", "AdaFunction", "AdaPackage", "AdaTask" ) {
-        $Exists{$i}=0;
-    }
-    foreach $name (sort keys( %type )) {
-	if (substr($name,0,1) ne $let) {
-	    if ($let ne "@") {
-	        print HTML "</ul></body>\n";
-	        close(HTML);
-	        $Exists{$let}= 1;
-	    }
-	    $let= substr($name, 0, 1);
-	    $htmlfile= "$Htmltree/$Dotdir{$dir}.$pref$let.html";
-	    open(HTML, "> $htmlfile") || die "$0: Can't open $htmlfile, $!\n";
-  
-	    print HTML "<head>\n<title>$title starting with ";
-	    print HTML "`$let' in $dir</title>\n";
-	    print HTML "</head><body><h1>$title starting with ";
-	    print HTML "`$let' in $dir</h1><p>\n";
-	    print HTML "<ul>\n";
-	}
-        # print HTML "<li><a href=\"$Newsrctree/$Nfile{$type{$name}}";
-        # print HTML ".html#$type{$name}\">$type{$name}</a> ";
-        # print HTML "$Nfile{$type{$name}}:$Nline{$type{$name}}\n"; next;
-
-        print HTML "<li><a href=\"$Newsrctree/$Nfile{$name}";
-        print HTML ".html#$type{$name}\">$type{$name}</a> ";
-        print HTML "$Nfile{$name}:$Nline{$name}\n"; next;
-    }
-    print HTML "</ul></body>\n";
-    close(HTML);
-    $Exists{$let}= 1;
-}
-
-## make_type_html: Make the type htmls. If there are <50 symbols for the
-## directory, create the per-directory per-type html document only. Otherwise
-## for every letter grep symbols, call make_lowest_letter_html, and
-## finally create the per-directory per-type html document that points only
-## at the letter files created.
-## Arguments are:  Dir name, prefix, title, Name/dir list
-
-sub make_type_html {
-    local($dir)= $_[0];
-    local($pref)= $_[1];
-    local($title)= $_[2];
-    local(*type)= $_[3];
-    local($i);
-    local($htmlfile);
-    local(@keys)= keys(%type);
-    local($name);
-
-    $Exists{$title}=0;
-    if ( $#keys < 0 ) { return; }
-    if ($Debug > 0) {
-	$i= $#keys + 1;
-	print "The associative array for $dir $title has $i elements\n";
-    }
-    if ( ($#keys < 50) || ($NoLetters == 1) ) {
-	$htmlfile= "$Htmltree/$Dotdir{$dir}.$pref.html";
-	open(HTML, "> $htmlfile") || die "$0: Can't open $htmlfile, $!\n";
-	print HTML "<head>\n<title>$title in $dir</title>\n";
-	print HTML "</head><body><h1>$title in $dir</h1>\n";
-	print HTML "<ul>\n";
-	foreach $name (sort keys( %type )) {
-	    # print HTML "<li><a href=\"$Newsrctree/$Nfile{$type{$name}}";
-	    # print HTML ".html#$type{$name}\">$type{$name}</a> ";
-	    # print HTML "$Nfile{$type{$name}}:$Nline{$type{$name}}\n"; next;
-
-            print HTML "<li><a href=\"$Newsrctree/$Nfile{$name}";
-            print HTML ".html#$type{$name}\">$type{$name}</a> ";
-            print HTML "$Nfile{$name}:$Nline{$name}\n"; next;
-	}
-	print HTML "</ul></body>\n";
-	close(HTML);
-	$Exists{$title}=1;
-    }
-    else {
-	&make_letters_html($dir, $pref, $title, *type);
-
-	open(HTML, "> $Htmltree/$Dotdir{$dir}.$pref.html")
-		|| die "$0: Can't open $htmlfile.$pref.html, $!\n";
-	print HTML "<head>\n<title>$title in $dir</title>\n";
-	print HTML "</head><body><h1>$title in $dir</h1><p>\n";
-	print HTML "<ul>\n";
-    
-	foreach $i ( "a".."z",
-           "AdaType", "AdaProcedure", "AdaFunction", "AdaPackage", "AdaTask" ) {
-	    if ($Exists{$i} > 0) {			# A file exists
-		print HTML "<li><a href=\"$Dotdir{$dir}.$pref$i.html\">";
-		print HTML "$i</a>\n"; $Exists{$title}++; $Exists{$i}=0;
-	    }
-	}
-	print HTML "</ul></body>\n";
-	close(HTML);
-	if ($Exists{$title} == 0) { unlink($htmlfile); }
-    }
-}
-
-## asappend: Append the contents of the second associative array to the
-## first.
-
-sub asappend {
-    local(*To)= $_[0];
-    local(*From)= $_[1];
-    local($i);
-
-    foreach $i (keys(%From)) { $To{$i}= $From{$i} ; }
-}
-
-## make_dir_html: Make the html document for the directory. Use the
-## Exist{} array to determine what types to include on the document.
-## Arguments are:  Dir name
-
-sub make_dir_html {
-    local($dir)= $_[0];
-    local($i);
-    local(@keys);
-
-    if ($Debug > 1) { print"In makedir, dir is $dir\n"; }
-    &make_type_html($dir, "f", $Title{"f"}, *Func);
-    &make_type_html($dir, "m", $Title{"m"}, *Macro);
-    &make_type_html($dir, "d", $Title{"d"}, *Def);
-    &make_type_html($dir, "v", $Title{"v"}, *Var);
-    &make_type_html($dir, "s", $Title{"s"}, *Struct);
-    &make_type_html($dir, "u", $Title{"u"}, *Union);
-    &make_type_html($dir, "t", $Title{"t"}, *Type);
-    &make_type_html($dir, "e", $Title{"e"}, *Enum);
-    &make_type_html($dir, "AdaType", $Title{"AdaType"}, *AdaType);
-    &make_type_html($dir,
-         "AdaProcedure", $Title{"AdaProcedure"}, *AdaProcedure);
-    &make_type_html($dir, "AdaFunction", $Title{"AdaFunction"}, *AdaFunction);
-    &make_type_html($dir, "AdaPackage", $Title{"AdaPackage"}, *AdaPackage);
-    &make_type_html($dir, "AdaTask", $Title{"AdaTask"}, *AdaTask);
-
-    if ($NoAll != 1) {
-        &asappend(*GFunc, *Func);
-        &asappend(*GMacro, *Macro);
-        &asappend(*GDef, *Def);
-        &asappend(*GVar, *Var);
-        &asappend(*GStruct, *Struct);
-        &asappend(*GUnion, *Union);
-        &asappend(*GType, *Type);
-        &asappend(*GEnum, *Enum);
-        &asappend(*GAdaType, *AdaType);
-        &asappend(*GAdaProcedure, *AdaProcedure);
-        &asappend(*GAdaFunction, *AdaFunction);
-        &asappend(*GAdaPackage, *AdaPackage);
-        &asappend(*GAdaTask, *AdaTask);
-    }
-
-    &asappend(*Alldir, *Func);
-    &asappend(*Alldir, *Macro);
-    &asappend(*Alldir, *Def);
-    &asappend(*Alldir, *Var);
-    &asappend(*Alldir, *Struct);
-    &asappend(*Alldir, *Union);
-    &asappend(*Alldir, *Type);
-    &asappend(*Alldir, *Enum);
-    &asappend(*Alldir, *AdaType);
-    &asappend(*Alldir, *AdaProcedure);
-    &asappend(*Alldir, *AdaFunction);
-    &asappend(*Alldir, *AdaPackage);
-    &asappend(*Alldir, *AdaTask);
-
-    if ($NoLetters != 1) {
-        &make_letters_html($dir, "g", $Title{"g"}, *Alldir);
-    }
-    undef %Alldir;
-
-    open(HTML, "> $Htmltree/$Dotdir{$dir}.html")
-	|| die "$0: Can't open $Htmltree/$Dotdir{$dir}.html, $!\n";
-    print HTML "<head>\n<title>Cross-references for $dir</title>\n";
-    print HTML "</head><body><h1>Cross-references for $dir</h1><p>\n";
-    if (-f "$Headers/$Dotdir{$dir}.hdr" ) {
-	open(TOPHDR, "$Headers/$Dotdir{$dir}.hdr");
-	while (<TOPHDR>) { print HTML; }
-	close(TOPHDR);
-    }
-
-    if (defined($Formdir)) {
-        print HTML "<hr><form action=\"$Formdir/src2html.cgi\" ";
-	print HTML "method=\"POST\">\n";
-        print HTML "<input type=\"submit\" value=\"Search\">\n";
-        print HTML "<input type= \"text\" ";
-	print HTML "name=\"$Htmldir/$Newsrctree\">\n";
-        print HTML "Enter a symbol's name here to quickly find it.\n";
-        print HTML "</form><hr>\n";
-    }
-    print HTML "<h1>Cross-references for $dir by type</h1><p><ul>\n";
-    
-    foreach $i ( "f","m","d","v","s","u","t","e",
-           "AdaType", "AdaProcedure", "AdaFunction", "AdaPackage", "AdaTask" ) {
-	if ($Exists{$Title{$i}} > 0) {		# A type exists
-	    print HTML "<li><a href=\"$Dotdir{$dir}.$i.html\">";
-	    print HTML "$Title{$i}</a>\n";
-	    $Exists{$dir}++; $Exists{$Title{$i}}=0;
-	}
-    }
-    print HTML "</ul><p>\n";
-    if ($NoLetters != 1) {
-        print HTML "<h1>Cross-references for $dir by letter</h1><p><ul>\n";
-        foreach $i ( "a".."z" ) {
-	    if ($Exists{$i} > 0) {			# A letter exists
-	        print HTML "<li><a href=\"$Dotdir{$dir}.g$i.html\">";
-	        print HTML "$i</a>\n"; $Exists{$i}=0;
-	    }
-        }
-    }
-    print HTML "</ul></body>\n";
-    close(HTML);
-}
-
-## Make_top_html: Make the top html document by making the ones below
-## it and then adding links to them.
-
-sub make_top_html {
-    local($i);
-    local(@keys);
-
-    $Dotdir{$Top}=$Top;
-    &make_type_html($Top, "f", $Title{"f"}, *GFunc);
-    &make_type_html($Top, "m", $Title{"m"}, *GMacro);
-    &make_type_html($Top, "d", $Title{"d"}, *GDef);
-    &make_type_html($Top, "v", $Title{"v"}, *GVar);
-    &make_type_html($Top, "s", $Title{"s"}, *GStruct);
-    &make_type_html($Top, "u", $Title{"u"}, *GUnion);
-    &make_type_html($Top, "t", $Title{"t"}, *GType);
-    &make_type_html($Top, "e", $Title{"e"}, *GEnum);
-    &make_type_html($Top, "AdaType", $Title{"AdaType"}, *GAdaType);
-    &make_type_html($Top, "AdaProcedure", $Title{"AdaProcedure"}, *GAdaProcedure);
-    &make_type_html($Top, "AdaFunction", $Title{"AdaFunction"}, *GAdaFunction);
-    &make_type_html($Top, "AdaPackage", $Title{"AdaPackage"}, *GAdaPackage);
-    &make_type_html($Top, "AdaTask", $Title{"AdaTask"}, *GAdaTask);
-
-    open(HTMLTOP, "> $Htmltree/$Top.html")
-	|| die "$0: Can't open $Htmltree/$Top.html, $!\n";
-    print HTMLTOP "<head>\n<title>Cross-references for $Top</title>\n";
-    print HTMLTOP "</head><body><h1>Cross-references for $Top</h1><p>\n";
-
-    if (-f "$Headers/$Top.hdr" ) {
-	open(TOPHDR, "$Headers/$Top.hdr");
-	while (<TOPHDR>) { print HTMLTOP; }
-	close(TOPHDR);
-    }
-
-    if (defined($Formdir)) {
-        print HTMLTOP "<hr><form action=\"$Formdir/src2html.cgi\" ";
-	print HTMLTOP "method=\"POST\">\n";
-        print HTMLTOP "<input type=\"submit\" value=\"Search\">\n";
-        print HTMLTOP "<input type= \"text\" ";
-	print HTMLTOP "name=\"$Htmldir/$Newsrctree\">\n";
-        print HTMLTOP "Enter a symbol's name here to quickly find it.\n";
-        print HTMLTOP "</form><hr>\n";
-    }
-    print HTMLTOP "<h2>Cross-references by directory</h2><p>\n";
-    print HTMLTOP "<ul>\n";
-    
-    foreach $i (sort keys(%Dirinfo)) {
-	if ($Exists{$i} > 0) {			# A dir exists
-	    print HTMLTOP "<li><a href=\"$Dotdir{$i}.html\">";
-	    print HTMLTOP "$i</a> $Dirinfo{$i}\n"; $Exists{$i}=0;
-	}
-    }
-    if ($NoAll != 1) {
-        print HTMLTOP "</ul><p><h2>Cross-references by type</h2><p><ul>\n";
-        foreach $i ( "f","m","d","v","s","u","t","e",
-           "AdaType", "AdaProcedure", "AdaFunction", "AdaPackage", "AdaTask" ) {
-	    if ($Exists{$Title{$i}} > 0) {		# A type exists
-	        print HTMLTOP "<li><a href=\"$Top.$i.html\">";
-	        print HTMLTOP "$Title{$i}</a>\n"; 
-	    }
-        }
-        if ($NoLetters != 1) {
-            print HTMLTOP "</ul><p><h2>All Cross-references for $Top";
-	    print HTMLTOP "</h2><p><ul>\n";
-            &asappend(*Alltop, *GFunc);
-            &asappend(*Alltop, *GMacro);
-            &asappend(*Alltop, *GDef);
-            &asappend(*Alltop, *GVar);
-            &asappend(*Alltop, *GStruct);
-            &asappend(*Alltop, *GUnion);
-            &asappend(*Alltop, *GType);
-            &asappend(*Alltop, *GEnum);
-            &asappend(*Alltop, *GAdaType);
-            &asappend(*Alltop, *GAdaProcedure);
-            &asappend(*Alltop, *GAdaFunction);
-            &asappend(*Alltop, *GAdaPackage);
-            &asappend(*Alltop, *GAdaTask);
-    
-            if ($Debug > 0) { print "Making top letters\n"; }
-   	    &make_letters_html($Top, "g", $Title{"g"}, *Alltop);
-    	    if ($Debug > 0) { print "Making top letters, part 2\n"; }
-    	    foreach $i ( "a".."z" ) {
-		    if ($Exists{$i} > 0) {
-	    	    print HTMLTOP "<li><a href=\"$Dotdir{$Top}.g$i.html\">";
-	    	    print HTMLTOP "$i</a>\n";
-		    }
-    	    }
-        }
-    }
-    print HTMLTOP "</ul>\n";
-    print HTMLTOP "<hr>This source tree was made with ";
-    print HTMLTOP "<a href=\"http://minnie.cs.adfa.oz.au/Src2html/index.html";
-    print HTMLTOP "\">src2html</a>.</body>\n";
-    close(HTMLTOP);
-}
-
-
-## rewrite_src: Reread the ctags file for the given directory, and
-## rewrite the source code, adding in anchor points and bolding symbols.
-## This is messy as we can have multiple symbols on a single source line,
-## therefore we must buffer each line while reading from the ctags file.
-##
-sub rewrite_src {
-    local($dir)= $_[0];
-    local($i);
-    local($file)="";
-    local($line)="";
-    local($symb);
-    local($cnt);
-    local($nextcnt);
-
-    $In_file=0;
-    open(CTAGS,"sort +2 -3 +1n -2 $Ctagsfile{$dir} |")
-	|| die "$0: Can't open sorted $Ctagsfile{$dir}, $!\n";
-    if ($Debug > 0) { print "Rewriting source in $dir\n"; }
-    while (<CTAGS>) {
-					# Get the next file, line, symbol
-	if (/^([\w\/]+)\s+(\d+)\s+([A-Za-z0-9_\+\-\.\/]+)/) {
-            if ($Debug > 2) { print "Symb $1 at $2 in $3\n"; }
-	    $fname=$3; $nextcnt= $2; $symb=$1;
-            $symb=~ s/\/.//g;
-
-					# If it's in a new file
-	    if ("$file" ne "$fname") {
-					# Print out the remainder of the
-					# current file, incl. the buffered line
-		if ($In_file == 1) {
-		    if ("$line" ne "") { print OUT $line; }
-		    while (<IN>) {
-	                s/\&/&amp;/g; s/\</&lt;/g; s/\>/&gt;/g; print OUT;
-		    }
-		    print OUT "\n\n\n\n\n\n\n\n\n\n</pre></body>\n";
-		    close(IN); close(OUT);
-		}
-		$file= "$fname";
-					# Open the new file & do the preamble
-		open(IN, "$Srctree/$file") ||
-		    print "Cannot open $Srctree/$file\n";
-		open(OUT, "> $Htmltree/$Newsrctree/$file.html");
-		$In_file=1;
-		print OUT "<head>\n<title>$file Source</title>\n";
-		print OUT "</head><body>\n";
-		print OUT "<h1>Source to $file</h1>\n";
-		if (defined($Formdir)) {
-        	    print OUT "<hr><form action=\"$Formdir/src2html.cgi\" ";
-	 	    print OUT "method=\"POST\">\n";
-        	    print OUT "<input type=\"submit\" value=\"Search\">\n";
-        	    print OUT "<input type= \"text\" ";
-		    print OUT "name=\"$Htmldir/$Newsrctree\">\n";
-		    print OUT "Enter a symbol's name here to quickly find it.\n";
-		    print OUT "</form><hr>\n";
-		}
-		print OUT "<pre>\n";
-					# Get the first line
-		$cnt=1; $line = <IN>;
-	        $line=~ s/\&/&amp;/g;
-	        $line=~ s/\</&lt;/g;
-	        $line=~ s/\>/&gt;/g;
-	    }
-	}
-					# Print all lines until one with a symb
-	while ($cnt < $nextcnt) {
-	    print OUT $line; $cnt++; $line= <IN>;
-	    $line=~ s/\&/&amp;/g;
-	    $line=~ s/\</&lt;/g;
-	    $line=~ s/\>/&gt;/g;
-	}
-						# Now rewrite the line
-	$line=~ s/\b$symb\b/<a name="$symb"<\/a><b>$symb<\/b>/;
-	next;
-    }
-    close(CTAGS); close(IN); close(OUT);
-}
diff --git a/doc/tools/src2html1.4a/src2html.1 b/doc/tools/src2html1.4a/src2html.1
deleted file mode 100644
index 7401859ca8..0000000000
--- a/doc/tools/src2html1.4a/src2html.1
+++ /dev/null
@@ -1,244 +0,0 @@
-.TH src2html 1L "June 1994"
-.SH NAME
-src2html \- Hyperlink a C source code tree  using HTML, Version 1.3-alpha
-
-.SH SYNOPSIS
-.B src2html
-[
-.I \-na
-] [
-.I \-nl
-] [
-.I \-d debug_level
-]
-.I configuration_file
-
-.SH DESCRIPTION
-
-.B src2html
-is a program which takes a C source tree and creates a set of
-HTML hypertext documents that allows the most important symbols in the
-source tree to be found easily. As well, a HTML version of the source
-tree is created, with the symbols given in bold font where they are defined
-in the source.
-
-.B src2html
-finds and hyperlinks the following C symbols: Preprocessor defines
-and macros, C functions, global variables, structs, unions, enums and typedefs.
-If defined in the
-.I configuration file,
-a query document is used so that symbols can be located by an index query
-as well as following the hyperlinks.
-
-.SH OPTIONS
-The
-.I debug level
-was used when debugging the program, and its only use is
-to assure the user that something is actually happening, especially for large
-source trees. The highest debug level of 3 is not particularly verbose.
-.PP
-By default,
-.B src2html
-produces html pages for each category of C symbols. If there are more than
-50 in each category,
-.B src2html
-then further subdivides the symbols on a first-letter basis, making HTML
-documents for each letter.
-.PP
-If the
-.I -nl
-flag is set, no first-letter HTML documents will ever be produced.
-Similarly,
-.B src2html
-creates a top-level document with category links. If the
-.I -na
-flag is set, no top-level category links will be produced.
-
-.SH CONFIGURATION FILE
-
-.B src2html
-takes as an argument a
-.I configuration file
-which describes the directories in a source tree to process, and
-where to place the resulting HTML documents. Lines beginning with a #
-sign are ignored, as are blank lines. The following lines have special meaning:
-.P
-.IP "set Srctree source_tree"
-Set the root of the tree where the original source is kept, e.g
-/usr/src/sys. Do not leave a trailing slash on the tree name.
-This line must appear in the configuration file.
-.P
-.IP "set Htmlroot html_tree"
-Set the root of the tree where HTML documents are normally kept.
-This is the same as DocumentRoot in the httpd(1L) configuration.
-Again, do not leave a trailing slash on the tree name.
-This line must appear in the configuration file.
-.P
-.IP "set Htmldir html_dir"
-Set the directory within Htmlroot where the HTML documents for this
-tree will be placed.
-Again, do not leave a trailing slash on the tree name.
-This line must appear in the configuration file.
-.P
-.IP "set Newsrctree new_source_tree"
-Set the directory within the Htmltree where the marked up source code
-is placed, e.g src. This allows the source to be kept separate from the
-`pointer' documents which point at the source; see the next section for
-more details. This line is optional, and the default value of
-Newsrctree is `newsrc'.
-.P
-.IP "set Headers header_dir"
-.B src2html
-allows information to be placed at the beginning of the HTML
-documents created, e.g to describe the contents of a particular
-subdirectory. Files containing this information are kept in this
-directory. This line is optional, and the default value of
-Headers is `.'.
-.P
-.IP "set Formdir form_dir"
-If set, this tells
-.B src2html
-that the active HTML document which can
-perform index lookups for the source tree is located in this
-directory. If not set,
-.B src2html
-will not put query boxes in the
-HTML documents created. This line is optional, and there is no
-default value.
-.P
-.IP "dir directory comments_about_the_dir"
-This line may appear may times, and tells
-.B src2html
-to process
-source files in the directory Srctree/dir. This allows only particular
-sections of the source tree to be marked up. The comments after the
-directory are placed in the top-level HTML document to explain
-what that directory contains.
-
-.SH DIRECTORY STRUCTURE
-
-.B src2html
-expects to be given a source tree to process, and it produces
-a new tree with HTML documents. The configuration file should have a suffix
-of `.s2h', although this is strictly not needed.
-
-As an example, consider the following configuration file named BSD.s2h:
-.PP
-.nf
-# Comments
-set Srctree /usr/src/sys
-set Htmltree /usr/local/WWW
-set Htmldir sys
-set Newsrctree newsrc				# Comments here too
-set Headers /home/staff/warren/sys_headers
-set Formdir /cgi
-dir kern        The core OS routines: processes, scheduling, syscalls
-dir sys         Widely used C-language include files
-dir i386/isa    Device drivers for peripherals on the ISA bus
-.fi
-.PP
-Three directories containing C source will be processed,
-.nf
-	/usr/src/sys/kern,
-	/usr/src/sys/sys and
-	/usr/src/sys/i386/isa
-.fi
-
-The resulting marked up source code will be placed in
-.nf
-	/usr/local/WWW/sys/newsrc/kern,
-	/usr/local/WWW/sys/newsrc/sys and
-	/usr/local/WWW/sys/newsrc/i386/isa
-.fi
-respectivey.
-.PP
-The directory /usr/local/WWW/sys will itself contain a set of pointer
-documents which point to the source code documents on a per-directory,
-per-symbol-type and per-first-letter basis (and combinations of the
-above). One file, BSD.html (named from the configuration file name), is the
-root of the hyperlinks, and the entire source tree can be browsed from this
-one document.
-
-.SH HEADER FILES
-
-.B src2html
-creates a root HTML document, and HTML documents for each directory
-named in the configuration file. Textual information can be placed in the
-head of these documents to describe the contents of the tree/directory,
-give references etc. The files that hold this information are kept in the
-Headers directory. Taking the above configuration file as an example,
-
-	/home/staff/warren/sys_headers/BSD.hdr
-	/home/staff/warren/sys_headers/kern.hdr
-	/home/staff/warren/sys_headers/sys.hdr
-	/home/staff/warren/sys_headers/i386.isa.hdr
-
-can hold the information to be placed in the head of the appropriate
-documents. Note that if a directory name has a slash as given in the
-configuration file, the name of the header file has a dot instead.
-.PP
-Header files are placed `as is' into the head of the document, and thus
-can contain HTML markup commands. Any and all header files are optional;
-if the file does not exist, nothing will be placed in the head of the
-appropriate HTML document.
-.PP
-Once
-.B src2html
-has completed, the header files may be removed. However,
-you may wish to keep them in case you ever need to re-run
-.B src2html
-on the same source tree.
-
-.SH SEARCH SCRIPT
-
-During execution,
-.B src2html
-builds a ctags directory in Htmltree and places
-the output of ctags-new(1L) on the source tree directories in this place.
-This information is needed if a search script is also requested.
-.PP
-If the Formdir is set in the configuration file,
-.B src2html
-will configure the HTML code produced to use the search script
-.I src2html.cgi
-to search for symbols in the source tree. This script
-conforms to the cgi query format as used by httpd(1). You must move the
-supplied
-.I src2html.cgi
-file into the Formdir in the httpd hierachy before the query functionality
-can be used.
-.PP
-Again, from the example configuration file above,
-/usr/local/httpd/cgi/src2html.cgi is where to place the script, if the
-httpd hierachy is kept in /usr/local/httpd.
-
-.SH EXAMPLE SOURCE TREE
-
-The output from
-.B src2html
-for the full FreeBSD 2.0.5 kernel source directory can be browsed
-from the Web page http://minnie.cs.adfa.oz.au/FreeBSD-srctree/FreeBSD.html.
-
-.SH BUGS AND SHORTCOMINGS
-
-.B src2html
-uses the ctags-new(1L) program, which does not correctly parse C variable
-declarations and function pointer usage. Someone should rewrite this in Perl.
-.PP
-Ideally,
-.B src2html
-should include hyperlinks within each source file,
-but this is difficult given C's scoping rules, and would need a more
-sophisticated parser than ctags(1L).
-.PP
-.B src2html
-looks at all files in the named source directories, including
-files that don't end in .c and .h. This may be construed as a feature.
-
-.SH SEE ALSO
-.PD
-ctags-new(1L), httpd(1L), perl(1L)
-
-.SH AUTHOR
-.PD
-Warren Toomey   wkt@cs.adfa.oz.au
diff --git a/doc/tools/src2html1.4a/src2html.cgi b/doc/tools/src2html1.4a/src2html.cgi
deleted file mode 100644
index cfc93d4134..0000000000
--- a/doc/tools/src2html1.4a/src2html.cgi
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/usr/local/bin/perl
-#
-# src2html.cgi -- A search script to file symbols in a src2html tree.
-# You need to install this in your httpd script directory AND set the
-# httpd web root below.
-#
-# We need the cgi-lib.pl package to be available to Perl
-require 'cgi-lib.pl';
-#
-## We MUST know the root of the httpd server, so we can find the ctags
-## 
-#
-$Http_root= "/usr/pub/pub/www";
-
-						# Parse input -> %in
-&ReadParse;					# and print first 2 lines
-
-@keys= keys(%in);			# We only expect one name/val pair
-if ($#keys != 0) {			# Otherwise, return an error document
-    print <<"query_error";
-Content-type: text/html
-
-    <header><title>Query Error</title></header><body>
-    <h1>Query Error</h1>
-    The document you used to query this source tree has an error in it.
-    You should email the maintainer of the source tree with a copy of the
-    document with the query form in it.
-    </body>
-query_error
-    exit(1);
-}
-					# Given the name, determine which tree
-$Htmltree= "$Http_root/$keys[0]"; 
-$Htmltree=~ s/\/[^\/]*$//;		# Location of the Html tree root
-$Srctree= "/$keys[0]";			# URL of the actual source
-$Ctags= "$Htmltree/ctags";		# Location of the ctags files
-
-@symbol= split(/\s+/, $in{$keys[0]});	# Get one symbol to search for
-
-if ($#symbol != 0) {			# Hmm, <> 1 symbol, return an error
-    print <<"symbol_error";
-Content-type: text/html
-
-    <header><title>$Htmltree Search Error</title></header><body>
-    <h1>$Htmltree Search Error</h1>
-    Hmm, you either sent in no symbols to me to search, or a number of
-    symbols to find, separated by whitespace.<p>
-    The search function can only handle regexp expressions with no 
-    whitespace. Try resubmitting your query.
-    </body>
-symbol_error
-    exit(1);
-}
-					# Let's go to work, egrep the ctags
-
-# Naftali Schwartz (nschwart@SLINKY.CS.NYU.EDU) reports that using the ^
-# on the following line stops the script from working under SunOS 4.1.3.
-# Sounds like ctags-new doesn't start the symbol in the 1st column.
-open(IN, "cat $Ctags/* | egrep ^$symbol[0] |") || die "$0: egrep failed\n";
-$cnt=0;
-while(<IN>) {
-    ($sym, $line, $file, $com)= split(/\s+/);
-    $Sym[$cnt]=$sym; $Line[$cnt]= $line; $File[$cnt]= $file; $cnt++;
-}
-close(IN);
-					# How many did we get? Zero, no symbol
-if ($cnt == 0) {
-    print <<"symbol_missing";
-Content-type: text/html
-
-    <header><title>$Htmltree Search Error</title></header><body>
-    <h1>$Htmltree Search Error</h1>
-    The symbol $symbol[0] does not appear in the source tree.
-    </body>
-symbol_missing
-    exit(1);
-}
-
-if ($cnt == 1) {			# Exactly one, return ptr to that doc
-    print "Location: $Srctree/$File[0]";
-
-# I used to use the commented out line under NCSA httpd because the other
-# line didn't work. You may need to try things out on your server.
-    print ".html\#$Sym[0]\n\n";
-#   print ".html\n\n";
-    exit(0);
-}
-					# Else return a list of choices
-print <<"many_found";
-Content-type: text/html
-
-<header><title>$Htmltree Search</title></header><body>
-<h1>$Htmltree Search</h1><ul>
-many_found
-for ($i = 0; $i < $cnt; $i++) {
-    print "<li><a href= \"$Srctree/$File[$i]";
-    print ".html#$Sym[$i]\">$Sym[$i]</a> $File[$i]:$Line[$i]\n";
-}
-print "</ul></body>\n";
-exit(0);
diff --git a/doc/tools/texi2www/Makefile b/doc/tools/texi2www/Makefile
deleted file mode 100644
index c66db06399..0000000000
--- a/doc/tools/texi2www/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-#  COPYRIGHT (c) 1988-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  All rights reserved.
-#
-#  $Id$
-#
-
-PROJECT=texi2www
-DISTRIBUTION_LEVEL=internal
-
-include ../../Make.config
-
-all: html info ps
-
-dirs:
-	$(make-dirs)
-
-FILES= texi2www.texi
-
-info: 
-
-dvi: $(PROJECT).dvi
-
-ps: dirs $(PROJECT).ps
-	
-$(PROJECT).ps: $(PROJECT).dvi
-	dvips -o $(PROJECT).ps $(PROJECT).dvi
-	cp $(PROJECT).ps $(PS_INSTALL)
-
-$(PROJECT).dvi: $(FILES)
-	$(TEXI2DVI) -v $(PROJECT).texi
-
-html: dirs $(FILES)
-	-mkdir -p $(WWW_INSTALL)/$(PROJECT)
-	$(TEXI2WWW) $(TEXI2WWW_ARGS) -dir $(WWW_INSTALL)/$(PROJECT) \
- 	    $(PROJECT).texi
-
-clean:
-	rm -f *.o $(PROG) *.txt core 
-	rm -f *.dvi *.ps *.log *.aux *.cp *.cps \
-	rm -f *.fn *.ky *.pg *.toc *.tp *.vr $(BASE)
-	rm -f $(PROJECT)-* $(GENERATED_FILES)
-	rm -f *.fixed _*
-
diff --git a/doc/tools/texi2www/archive/texi2www-960103.tgz b/doc/tools/texi2www/archive/texi2www-960103.tgz
deleted file mode 100644
index b0851552c2..0000000000
--- a/doc/tools/texi2www/archive/texi2www-960103.tgz
+++ /dev/null
diff --git a/doc/tools/texi2www/dir-arrow.gif b/doc/tools/texi2www/dir-arrow.gif
deleted file mode 100644
index 5d661527cc..0000000000
--- a/doc/tools/texi2www/dir-arrow.gif
+++ /dev/null
diff --git a/doc/tools/texi2www/missing-arrow.gif b/doc/tools/texi2www/missing-arrow.gif
deleted file mode 100644
index c686c80b5f..0000000000
--- a/doc/tools/texi2www/missing-arrow.gif
+++ /dev/null
diff --git a/doc/tools/texi2www/next-arrow.gif b/doc/tools/texi2www/next-arrow.gif
deleted file mode 100644
index 57f5cddb81..0000000000
--- a/doc/tools/texi2www/next-arrow.gif
+++ /dev/null
diff --git a/doc/tools/texi2www/prev-arrow.gif b/doc/tools/texi2www/prev-arrow.gif
deleted file mode 100644
index 350785be10..0000000000
--- a/doc/tools/texi2www/prev-arrow.gif
+++ /dev/null
diff --git a/doc/tools/texi2www/texi2dvi b/doc/tools/texi2www/texi2dvi
deleted file mode 100644
index 913904a921..0000000000
--- a/doc/tools/texi2www/texi2dvi
+++ /dev/null
@@ -1,218 +0,0 @@
-#!/usr/bin/perl
-#
-#  $Id$
-#
-
-$version = <<END_VERSION;
-Jan 2 1996
-END_VERSION
-
-$copyright = <<END_COPYRIGHT;
-texi2dvi - converts texinfo to dvi
-Copyright (C) 1996 Tim Singletary
-
-This program is freely distributable under the terms of the GNU 
-GENERAL PUBLIC LICENSE.  In particular, modified versions of this 
-program must retain this copyright notice and must remain freely
-distributable.
-END_COPYRIGHT
-
-$usage = <<END_USAGE;
-Usage: texi2dvi [option ...] texinfo_file ...
-  -k (-nocleanup) -- don't ``rm -f'' the intermediate files.
-  -v (-verbose) -- print additional output.
-  -copyright -- print the copyright and die.
-  -version -- print the version and die.
-Generates a .dvi file from each texinfo (.texi or .texinfo) file.
-Understands texi2www extensions (\@gif, etc.).
-END_USAGE
-
-unless ($tex = $ENV{TEX}) {$tex = tex;}
-unless ($texindex = $ENV{TEXINDEX}) {$texindex = texindex;}
-$texinputs = $ENV{TEXINPUTS};
-
-$cleanup = 1;
-while ($ARGV[0] =~ /^-/) {
-    $_ = shift;
-    if (/-k$/ || /-nocleanup/) {$cleanup = 0; next;}
-    if (/-v$/ || /-verbose/) {$verbose = 1; next;}
-    if (/-d$/ || /-vv$/ || /-debug/)   {$verbose = 2; next;}
-    if (/-copyright/) {die $copyright;}
-    if (/-version/) {die $version;}
-    die $usage;
-}
-
-$font_prefix = "xx";
-while (&prefix_in_use($font_prefix)) {
-    ++$font_prefix;
-    if (length($font_prefix) > 2) {
-	$font_prefix = "aa";
-    }
-}
-
-$unique_base = "_" . $$ . "a-";
-while (&prefix_in_use($unique_base)) {++$unique_base;}
-
-print "Generated files will begin with \`$unique_base\'\n" if $verbose;
-
-$arg_index = 'a';
-foreach $raw_texi (@ARGV) {
-    $base = $unique_base . $arg_index;
-    ++$arg_index;
-
-    # $tawtexifile is a texinfo file; suffix must be either `.texi' or
-    # `.texinfo'.  If arg is in a different directory, adjust
-    # TEXINPUTS environment variable to include that (and the current)
-    # directory.
-    unless ($raw_texi =~ /(.*).texi(nfo)?$/) {
-	print "skipping $raw_texi -- has unknown extension!\n";
-	next;
-    }
-    $raw_texi_base = $1;
-    if ($raw_texi_base =~ m|^(.*)/([^/]*)$|) {
-	$raw_texi_base = $2;
-     	$ENV{TEXINPUTS} = ".:$1:$texinputs";
-    } else {
-	$ENV{TEXINPUTS} = ".:$texinputs";
-    }
-
-    unless (-r $raw_texi) {
-	print "skipping $raw_texi -- not readable or doesn't exist!\n";
-	next;
-    }
-
-    # Preprocesses the $rawtexifile (because of @gif{} and other extensions)
-    $processed_texi = "$base.texi";
-    print "Preprocessing $raw_texi into $processed_texi:\n" if $verbose;
-    &preprocess_texinfo($raw_texi,$processed_texi,$base);
-
-    print "$tex $processed_texi\n" if $verbose;
-    if (system("$tex $processed_texi") == 0) {
-
-	# @possible_index_file = <$base.??>; only works for the
-	# first value of $base ... so,
-	opendir(DIR,".") || die "Couldn't read current directory -- $!\n";
-	@possible_index_files = ();
-	while ($_ = readdir(DIR)) {
-	    if (/^$base\...$/) {
-	      push(@possible_index_files,$_);
-            }
-	}
-	closedir(DIR);
-
-	@index_files = ();
-	foreach $possible_index_file (@possible_index_files) {
-	    print "DEBUG: possible_index_file $possible_index_file\n"
-		                                           if ($verbose > 1);
-	    next unless (-s $possible_index_file);
-	    push(@index_files,$possible_index_file);
-	}
-
-	if (@index_files > 0) {
-	    $texindex_cmd =  "$texindex " . join(' ',@index_files);
-	    print "$texindex_cmd\n" if $verbose;
-	    if (system($texindex_cmd) == 0) {
-		print "$tex $processed_texi\n" if $verbose;
-		system("$tex $processed_texi");
-	    }
-	}
-    }
-
-    # At this point, $base.dvi should exist -- rename it
-    # to $raw_texi_base.dvi
-    if (-e "$base.dvi") {
-	rename("$base.dvi","$raw_texi_base.dvi")
-	    || die "rename $base.dvi $raw_texi_base.dvi -- $!\n";
-    }
-}
-if ($cleanup) {unlink(<$base*>);}
-
-sub preprocess_texinfo 
-{
-    local ($infile,$outfile,$b) = @_;
-
-    open(IN,"<$infile") || die "Couldn't open $infile -- $!\n";
-    open(OUT,">$outfile") || die "Couldn't open $outfile -- $!\n";
-
-    $gif_index = 'a';
-    while (<IN>) {
-
-	# @gif{gif} or @gif{html_gif, tex_gif}
-	if (/(.*)\@gif\{([^{]*)\}(.*)/) {
-	    $prefix = $1;
-	    $arg = $2;
-	    $suffix = $3;
-	    print OUT "$prefix\n" if $prefix;
-
-	    while (1) {
-		$gif_base = $b . $gif_index;
-		last unless (-e $gif_base . ".gif");
-		++$gif_index;
-	    }
-
-	    $gif_file = '';
-	    if ($arg =~ /.*,(..*\.gif)/) {
-		$gif_file = $1;
-		$font_base = $gif_file;
-	    } else {
-		$font_base = $arg;
-		$gif_file = $gif_base . ".gif";
-		print "Scaling $arg into $gif_file:\n" if $verbose;
-		$scale_cmd = "giftopnm $arg | pnmscale 2 | pnmnlfilt 2 1 "
-		    . "| ppmquant 255 | ppmtogif > $gif_file";
-		print "$scale_cmd\n" if $verbose;
-		if (system($scale_cmd) != 0) {
-		    print "$scale_cmd failed\n";
-		    $gif_file = '';
-		}
-	    }
-	    
-	    if ($gif_file =~ /.*\.gif/) {
-
-
-		$font_base =~ s|.*/||;
-		$font_base =~ s|\..*||;
-
-		# $font_base, due to bm2font requirements, can't be more
-		# than six characters long and must consist entirely of
-		# lower case letters.
-		$font_base =~ s/[^a-z]//g;
-		$font_base = $font_prefix . substr($font_base,0,5);
-		while (&prefix_in_use($font_base)) {++$font_base;}
-
-		$bm2font_cmd = "bm2font -f$font_base $gif_file";
-		print "$bm2font_cmd\n" if $verbose;
-		if (system($bm2font_cmd) != 0) {
-		    print "$bm2font_cmd failed\n";
-		} else {
-		    print OUT "\@tex\n";
-		    print OUT "\\input $font_base.tex\n";
-		    print OUT "\\set$font_base\n";
-		    print OUT "\@end tex\n";
-		}
-	    }
-
-	    print OUT "$suffix \n" if $suffix;
-        } else {
-	    print OUT "$_";
-	}
-    }
-    close OUT;
-    close IN;
-}
-
-sub prefix_in_use
-{
-    local ($p) = @_;
-
-    # Returns true or false; returns true if any file in the current
-    # directory begins with $p.  This function is here because
-    # `<$p*>' only works for the first value of $p!
-
-    opendir(DIR,".") || die "Couldn't read current directory -- $!\n";
-    while ($_ = readdir(DIR)) {
-	last if /^$p/;
-    }
-    closedir(DIR);
-    $rc = /^$p/;
-}
diff --git a/doc/tools/texi2www/texi2www b/doc/tools/texi2www/texi2www
deleted file mode 100755
index 3e677936b9..0000000000
--- a/doc/tools/texi2www/texi2www
+++ /dev/null
@@ -1,1276 +0,0 @@
-#!/usr/bin/perl
-# (Works with both perl 4 and perl 5)
-#
-#  $Id$
-#
-
-$version = 'Jan 2 1996';
-$copyright = <<EOT;
-texi2www - converts texinfo to HTML
-Copyright (C) 1994, 1995, 1996 Tim Singletary
-
-This program is freely distributable under the terms of the GNU 
-GENERAL PUBLIC LICENSE.  In particular, modified versions of this 
-program must retain this copyright notice and must remain freely
-distributable.
-
-EOT
-$usage = <<EOT;
-Usage: texi2www [option ...] texinfo_file
-where options are:
-  -dir directory    -- Specify output directory.  Default is `.'.
-  -dirfile path     -- Specifies a replacement for ../dir.html
-  -header path      -- Specifies the path to a file containing HTML;
-                       this files gets inserted near the top of each
-                       generated HTML file.
-  -footer path      -- Specifies the path to a file containing HTML;
-                       this files gets inserted near the bottom of each
-                       generated HTML file.
-  -icons path       -- Specifies the path, relative to the output directory,
-                       to the arrow files.  Default is `..'.
-  -base             -- Specify the base part fo the genrated short file names
-  -uselongnames     -- Use long names for generated html files
-  -verbose          -- Verbose output.
-
-The complete user\'s is available at
-http://sunland.gsfc.nasa.gov/info/texi2www/Top.html
-EOT
-
-########################################################################
-
-%lookup = ();                      # clear the name mapping hash
-$uselongnames=0;                   # default to using short names
-$base = "a";                       # default short name base (BASEnnnnn.html)
-$outcount = 0;                     # count for the nnnnn part of short names
-$icons = "..";                     # where are the icons
-$dir = ".";                        # where are the generated files to go
-$dirfile = "../dir.html";          # "up" node pointer
-while ($ARGV[0] =~ /^-/) {
-    $_ = shift;
-    if (/-base/) {$base = shift; next;}
-    if (/-dirfile/) {$dirfile = shift; next;}
-    if (/-dir/) {$_ = shift; s!/$!!; s!$!/!; $dir = $_; next;}
-    if (/-footer/) {$footer = shift; next;}
-    if (/-header/) {$header = shift; next;}
-    if (/-icons/) {$_ = shift; s!\/$!!; $icons = $_; next;}
-    if (/-uselongnames/) {$uselongnames = 1; next;}
-    if (/-verbose/) {$verbose = 1; next;}
-    die $usage;
-}
-
-&initialize_tables();
-
-#
-# Read the texinfo input into @texinfo
-#
-&open_input_file($ARGV[0]);
-&read_input(1,'/^\@bye/',"$texinfo_file[0] line 1");
-$texinfo[$ntexinfo] = "\@bye\n";
-$origin[$ntexinfo] = "$texinfo_file[0] line $.";
-
-#
-# Parse @texinfo
-#
-$texinfo_index = 0;
-while ($texinfo_index < @texinfo) {
-    &get_more_stuff_to_parse();
-    if (/^\@bye/) {
-        &terminate_node();
-        print "Normal completion\n";
-        exit;
-    }
-    &parse();
-}
-
-print "Huh? didn't parse the \@bye directive!\n";
-
-########################################################################
-sub canonical # (node_name)
-{
-    local ($n) = @_;
-
-    $n =~ s/^\s+//; $n =~ s/\s+$//; # strip whitespace
-
-    return "$dirfile" if ($n =~ /\(dir\)/i); # handle (dir)
-    
-    if ($n =~ /^\(([^\)]+)\)(.*)/) {
-	$p = $1; $p =~ s/^\s+//; $p =~ s/\s+$//; $p .= "/";
-	$n = $2; $n =~ s/^\s+//; $n =~ s/\s+$//;
-    } else {
-	$p = "";
-    }
-
-
-    $n =~ s/\$/\$\$/;		# `$' -> `$$'
-    $n =~ s/_/\$_/g;		# `_' -> `$_'
-    $n =~ s/\s+/_/g;		# whitespace -> `_'
-
-				# anything else that's funky get
-				# translated to `$xx' where `xx'
-				# are hex digits.
-    while ($n =~ /(.*)([^-a-zA-Z0-9\$_.])(.*)/) {
-	$n = $1 . sprintf("\$%02x",ord($2)) . $3;
-    }
-
-    if ($uselongnames) {
-      return "$p$n.html" if ($n);
-    } else {
-      if ($n eq 'Top') {
-        $lookup{"$p$n"}= "index.html"; 
-        return $lookup{"$p$n"};
-      } elsif ($n) {
-        if (! $lookup{"$p$n"})  {
-          $outcount = $outcount + 1;
-          #$lookup{"$p$n"}= "$base$outcount.html"; 
-          $lookup{"$p$n"} = sprintf "%s%05d.html", $base, $outcount;
-        }
-        return $lookup{"$p$n"};
-      }
-    }
-    return "";
-} # canonical
-
-########################################################################
-sub deduce_node_links
-#
-# On entry, $_ is a node line and $start_index is the index (in @texinfo)
-# the node line.
-#
-# &deduce_node_links() sets $next, $prev, and $up.
-{
-    local ($level,$i,$node,$j);
-
-    # First, search down from this node to the next sectioning command.
-    $level = &determine_node_level($start_index+1);
-
-    # Next, look for the `next' node (i.e., the next node at the
-    # same or a higher level).
-    undef($next);
-    for ($i=$start_index+1; $i < $ntexinfo; ++$i) {
-	$_ = $texinfo[$i];
-	next unless /^\@node +([^,]+).*\n/;
-	$j = &determine_node_level($i+1);
-	if ($j <= $level) {
-	    if ($j == $level) {$next = $1;}
-	    last;
-	} 
-    }
-
-    # Look for the `prev' and `up' nodes
-    undef($prev);
-    undef($up);
-    for ($i=$start_index-1; $i > 1; --$i) {
-	$_ = $texinfo[$i];
-	next unless /^\@node\s+([^,]+).*\n/;
-	$j = &determine_node_level($i+1);
-	if ($j == $level) {
-	    unless ($prev) {$prev = $1;}
-	} elsif ($j < $level) {
-	    $up = $1;
-	    last;
-	}
-    }
-    unless (defined($up)) {$up = "(dir)";}
-
-    $xthis = $this;
-    $xthis =~ s/\n//;
-
-} # deduce_node_links
-
-########################################################################
-sub determine_node_level
-{
-    local ($i) = @_;
-    local ($level);
-
-    $level = 0;
-    while ($i < $ntexinfo) {
-	$_ = $texinfo[$i];
-	++$i;
-	next if /^\s+$/;
-	last if (/\@node/);
-	last unless (/\@(\w+)/);
-	if ($directive_section{$1}) {
-	    $level = $directive_section{$1};
-	    last;
-	}
-    }
-
-    return $level;
-} # determine_node_level
-
-
-########################################################################
-sub expand_xref
-{
-    local ($cmd,$arg) = @_;
-    local ($node,$xrefname,$topic,$infofile,$manual,$url,$x);
-
-    if ($cmd eq 'inforef') {
-	($node,$xrefname,$infofile) = split(/,/,$arg);
-	$topic = $manual = '';
-    } elsif ($cmd eq 'href') {
-	($xrefname,$node,$infofile,$url) = split(/,/,$arg);
-    } else {
-	($node,$xrefname,$topic,$infofile,$manual) = split(/,/,$arg);
-    }
-    $xrefname =~ s/^\s+//; $infofile =~ s/^\s+//;
-    $xrefname =~ s/\s+$//; $infofile =~ s/\s+$//;
-    $xrefname =~ s/\s+/ /; $infofile =~ s/\s+/ /;
-    $infofile =~ s/\.texi$//;
-    $infofile =~ s/\.texinfo$//;
-
-    if ($xrefname =~ /^$/) {$xrefname = $node;}
-
-    $node = &canonical($node);
-    unless ($url) {
-	unless ($infofile =~ /^$/) {$url = "../$infofile/";}
-	$url = $url . $node;
-    }
-    $x = "<A HREF=\"$url\">$xrefname</A>";
-} # expand_xref
-
-########################################################################
-sub get_more_stuff_to_parse
-{
-    $start_index = $texinfo_index;
-
-    $_ = '';
-    do {
-	if ($texinfo_index >= @texinfo) {
-	    print "Unclosed \@x{y} in chunk beginning at "
-		. "$origin[$start_index]\n";
-	    return;
-	}
-        s/\n$/ /;
-	$more = $texinfo[$texinfo_index++];
-	$more =~ s/\@\*/<BR>\n/g;
-	$more =~ s/\@\./\./g;
-	$more =~ s/\@\://g;
-	$more =~ s/\@refill//g;
-
-	$_ .= $more;
-
-	# Expand all @a{b} in line
-	while (/\@(\w+)\{([^{}]*)\}/) {
-            $atcmd = $1;
-	    $atarg = $2;
-
-            if ($z = $atxy_2_zyz{$atcmd}) {
-		if ($z =~ /(.+),(.+),(.+)/) {
-		    $left = $1; $z = $2; $right = $3;
-		} else {
-		    $left = ''; $right = '';
-		}
-		if ($z =~ s/^\^//) {$atarg =~ tr/a-z/A-Z/;}
-		$x = "$left<$z>$atarg</$z>$right";
-            } elsif ($atxy_2_y{$atcmd}) {
-                $x = $atarg;
-            } elsif ($z = $atxy_2_z{$atcmd}) {
-                $x = $z;
-            } elsif ($z = $atxy_2_ref{$atcmd}) {
-                $x = $z . &expand_xref($atcmd,$atarg);
-                $x =~ s/^X//; # works because $z must start with 'X'!
-            } elsif ($atcmd eq 'value') {
-                $x = $texinfo_variable{$atarg};
-            } elsif ($atcmd eq 'today') {
-                $x = &today();
-            } elsif ($atcmd eq 'footnote') {
-		$footnote[$nfootnotes++] = $atarg;
-                $x = "\[$nfootnotes\]";
-	    } elsif ($atcmd eq 'gif') {
-		$atarg =~ s/,.*//;
-		&copy_to_destdir($atarg);
-		$atarg =~ s|.*/||;
-		$x = "<IMG SRC=\"$atarg\">";
-            } else {
-                print "**WARNING** Don't know how to expand "
-                    . "\@$atcmd\{$atarg\}\n";
-		$debug = 1;
-                $x = "?$atcmd\?$atarg\?";
-            }
-            
-	    print "$origin[$start_index]: \@$atcmd\{$atarg\} => $x\n"
-		                                   if $debug{expansions};
-
-            s/\@\w+\{[^{}]*\}/$x/;	    
-        }
-    } while (/\@\w+\{[^}]*$/);
-    print "$origin[$start_index]: $_" if $debug{chunks};
-} # get_more_stuff_to_parse
-
-########################################################################
-sub parse
-# On entry:
-#    $_ -- the line(s) to parse.
-#    $start_index -- where, in $texinfo, $_ begins.
-{
-    local ($x);
-
-    if (/^\@(\w+)/) {
-	if ($x=$directive_block{$1}) { # @example, @quotation, etc.
-	    &parse_block($1,$x);
-	} elsif ($directive_section{$1}) { # @chapter, @subsection, etc.
-	    &process_section();
-	} elsif ($1 eq 'bye') {
-	    if ($nfootnotes > 0) {
-		&printHTML("<P><HR>\n");
-		for ($n=0; $n < $nfootnotes; ++$n) {
-		    &printHTML("<P>\[" . ($n+1) . "\] $footnote[$n]</P>\n");
-		}
-	    }
-            &printHTML("<P><HR>\n");
-            &print_arrows;
-            &printHTML("</P>\n");
-	    &print_footer if $footer;
-	    &printHTML("</BODY></HTML>\n");
-	    close (HTML);
-	    return;
-	} elsif ($1 eq 'center') {
-	    /^\@center\s+(.*)/;
-	    &printHTML("$paragraph_end") if $in_paragraph;
-	    &printHTML("<P ALIGN=CENTER>$1</P>\n");
-	    $in_paragraph = 0;
-	} elsif ($1 eq 'clear') {
-	    /^\@clear\s+(\S+)/;
-	    undef($texinfo_variable{$1});
-	} elsif ($1 =~ /^def(code)?index/) {
-	    /^\@(def|defcode)index\s+(\w+)/;
-	    $index_name{$2} = $2 . "index";
-	    $index_style{$2} = 'CODE' if ($1 eq "defcode");
-	} elsif ($1 =~ /^(def.*)/) { # @defn, @defun, ... @deftp
-	    &parse_def($1);
-	} elsif ($1 eq 'enumerate') {
-	    &parse_enumerate();
-	} elsif ($1 eq 'exdent') {
-	    /^\@exdent\s+(.*)/;
-	    &printHTML("$paragraph_end") if $in_paragraph;
-	    # A bug -- doesn't exdent the line!
-	    &printHTML("<P>$1</P>\n");
-	    $in_paragraph = 0;
-	} elsif ($1 eq 'flushleft' || $1 eq 'flushright') {
-	    &parse_flush();
-	} elsif ($1 eq 'html') {
-	    while ($texinfo_index < @texinfo) {
-		&get_more_stuff_to_parse();
-		last if (/^\@end\s+html/);
-		s/\&quot;/\"/g; s/\&gt;/\>/g; s/\&lt;/\</g; s/\&amp;/\&/g;
-		&printHTML("$_");
-	    }
-	} elsif ($1 eq 'itemize') {
-	    &parse_itemize();
-	} elsif ($1 eq 'menu') {
-	    &parse_menu();
-	} elsif ($1 eq 'node') {
-	    $node=$_;
-	    &process_node();
-	} elsif ($1 eq 'printindex') {
-	    /^\@printindex\s+([a-z]+)/;
-	    &print_index($1);
-	} elsif ($1 eq 'settitle') {
-	    /^\@settitle\s+(.*)/;
-	    unless ($title) {$title = $1;}
-	} elsif ($1 eq 'set') {
-	    if (/^\@set\s+(\S+)\s+(.+)$/) {
-		$texinfo_variable{$1} = $2;
-	    } else {
-		/^\@set\s+(\S+)/;
-		$texinfo_variable{$1} = 1;
-	    }
-	} elsif ($1 eq 'syncodeindex') {
-	    &process_synindex(1);
-	} elsif ($1 eq 'synindex') {
-	    &process_synindex(0);
-	} elsif ($1 =~ /^.?table/) { # @table, @vtable, @ftable
-	    unless (/^\@(.?table)\s*\@(\w*)/
-		           && ($2 eq 'asis' || ($tbltype=$atxy_2_zyz{$2}))) {
-		print "**WARNING** $origin[$start_index]: assuming "
-		    . "\@table \@asis\n";
-		$tbltype = '';
-	    }
-	    &parse_table($1,$tbltype);
-	} elsif ($1 =~ /..?index/) { # @cindex, @findex, .. @auindex, etc.
-	    &process_index();
-	} else {
-	    print "**WARNING** $origin[$start_index]: ignoring $_";
-	}
-    } else {
-	if (/^\s*$/) {
-	    if ($in_paragraph) {
-		&printHTML("$paragraph_end");
-	    } elsif ($in_preformatted) {
-		&printHTML("\n");
-	    }
-	    $in_paragraph = 0;
-	} else {
-	    unless ($in_preformatted) {
-		unless ($in_paragraph) {
-		    &printHTML("<P>\n");
-		    $in_paragraph = 1;
-		    $paragraph_end = "</P>\n";
-		}
-	    }
-	    &printHTML("$_");
-	}
-    }
-} # parse
-
-########################################################################
-sub parse_block
-#
-# Handles @example, @display, etc.
-#
-#    > @example            > <PRE>
-#    > a + b = c     ==>   > a + b = c
-#    > @end example        > </PRE>
-{
-    local ($block,$pre) = @_;
-    local ($started_at);
-
-    $started_at = $start_index;
-
-    &printHTML("$paragraph_end") if $in_paragraph;
-    $in_paragraph = 0;
-
-    if ($pre eq '>PRE') {
-	&printHTML("<DL><DT><DD>\n<PRE>\n");
-    } else {
-	&printHTML("<$pre>\n") unless ($pre eq '-');
-    }
-    $in_preformatted = $block;
-    while ($texinfo_index < @texinfo) {
-	&get_more_stuff_to_parse();
-	if (/^\@end\s+$block/) {
-	    if ($pre eq 'HR') {
-		&printHTML("</HR>\n");
-	    } elsif ($pre eq '>PRE') {
-		&printHTML("</PRE>\n</DL>\n");
-	    } else {
-		&printHTML("</$pre>\n") unless ($pre eq '-');
-	    }
-	    $in_preformatted = 0;
-	    return;
-	}
-	&parse();
-    }
-    print "**ERROR** reached EOF while searching for end of the \@$block "
-	. "block that started on $origin[$started_at]\n";
-} # parse_block
-
-########################################################################
-sub parse_def
-# $_ contains a @def* command
-{
-    local ($def) = @_;
-    local ($started_at,$in_dd);
-
-    $started_at = $start_index;
-        
-    &printHTML("$paragraph_end") if $in_paragraph;
-    $in_paragraph = 0;
-    
-    &printHTML("<DL>\n");
-
-    &printdef();
-
-    while ($texinfo_index < @texinfo) {
-	&get_more_stuff_to_parse();
-	if (/^\@end\s+$def/) {
-	    &printHTML("</DL>\n");
-	    $in_paragraph = 0;
-	    return;
-	}
-	if (s/^(\@def\w+)x\s/$1 /) {&printdef();}
-	else {
-	    unless ($in_dd) {
-		&printHTML("<DD>\n");
-		++$in_dd;
-		$in_paragraph = 1;
-		$paragraph_end = "\n";
-	    }
-	    &parse();
-	}
-    }
-    print "**ERROR** reached EOF while searching for end of the $def "
-	. "definition that started on $origin[$started_at]\n";
-
-} # parse_def
-sub printdef
-{
-
-    s/\@defun(x?)\s/\@deffn Function / 
-	|| s/\@defmac(x?)\s/\@deffn Macro /
-	|| s/\@defspec(x?)\s/\@deffn \{Special Form\} /
-        || s/\@defvar(x?)\s/\@defvr Variable /
-        || s/\@defopt(x?)\s/\@defvr \{User Option\} /
-        || s/\@deftypefun(x?)\s/\@deftypefn Function /
-        || s/\@deftypevar(x?)\s/\@deftypefn Variable /
-	|| s/\@defivar(x?)\s/\@defcv \{Instance Variable\} /
-	|| s/\@defmethod(x?)\s/\@defop Method /;
-    s/(\@\w+)x\s/$1 /;
-
-    @words = split;
-
-    $i = 1;
-    $category = $words[$i++];
-    while ($i < @words && $category =~ /^\{[^}]*$/) {
-        $category .= ' ' . $words[$i++];
-    }
-    if ($i>=@words) {
-	print "def error at $origin{$started_at}\n";
-    }
-    $category =~ s/^\{//;
-    $category =~ s/\}$//;
-
-    &printHTML("<DT>$category: ");
-
-    if ($words[0] eq '@deftypefn' || $words[0] eq '@deftypevr'
-	|| $words[0] eq '@defcv' || $words[0] eq '@defop') {
-	if ($words[$i] =~ s/^\{//) {
-	    &printHTML("<VAR>");
-	    until ($words[$i] =~ s/\}$//) {&printHTML("$words[$i++]");}
-	    &printHTML("$words[$i++]</VAR> ");
-	} else {
-	    &printHTML("<VAR>$words[$i++]</VAR> ");
-	}
-	$words[0] =~ /.*([a-z][a-z])/;
-	$_ = "\@" . $1 . "index " . $words[$i];
-	&process_index;
-    }
-    &printHTML("<STRONG>$words[$i++]</STRONG>\n<VAR>");
-
-    while ($i < @words) {&printHTML(" $words[$i++]");}
-    &printHTML("</VAR>\n");
-
-} # printdef
-
-########################################################################
-sub parse_enumerate
-# $_ is `@enumerate'.  Note that @enumerate with an arg (`@enumerate 3',
-# for example) is kinda funky due to HTML limitations.
-{
-    local ($count,$started_at);
-    
-    $started_at = $start_index;
-
-    &printHTML("$paragraph_end") if $in_paragraph;
-    $in_paragraph = 0;
-
-    if (/^\@enumerate\s*(\S+)/) {$count = $1;}
-
-    &printHTML("<" . ($count ? "UL" : "OL") . ">\n");
-
-    while ($texinfo_index < @texinfo) {
-	&get_more_stuff_to_parse();
-	if (/^\@end\s+enumerate/) {
-	    &printHTML("</" . ($count ? "UL" : "OL") . ">\n");
-	    return;
-	}
-	if (/^\@item\s+(.*)/ || /^\@item()$/) {
-	    if ($count) {
-		&printHTML("<LI>$count: $1\n");
-		++$count;
-	    } else {
-		&printHTML("<LI>$1\n");
-	    }
-	    $in_paragraph = 1;
-	    $paragraph_end = "\n";
-	} else {
-	    &parse();
-	}
-    }
-    print "**ERROR** reached EOF while searching for end of the \@enumerate "
-	. "that started on $origin[$started_at]\n";
-} # parse_enumerate
-
-########################################################################
-sub parse_flush
-{
-    local ($started_at,$flush);
-
-    /^\@(\w+)\s/;
-    $flush = $1;
-    $started_at = $start_index;
-
-    &printHTML("$paragraph_end") if $in_paragraph;
-    $in_paragraph = 0;
-
-    while ($texinfo_index < @texinfo) {
-	&get_more_stuff_to_parse();
-	if (/^\@end\s+$flush/) {
-	    return;
-	}
-	&parse();
-    }
-    print "**ERROR** reached EOF while searching for end of the $flush "
-	. "that started on $origin[$started_at]\n";
-
-
-} # parse_flush
-
-########################################################################
-sub parse_itemize
-# $_ is `@itemize'.  Due to HTML limitation, `@itemize @bullet' comes
-# out the same as `@itemize @minus'.
-{
-    local ($started_at);
-
-    $started_at = $start_index;
-
-    &printHTML("$paragraph_end") if $in_paragraph;
-    $in_paragraph = 0;
-
-    &printHTML("<UL>\n");
-    
-
-    while ($texinfo_index < @texinfo) {
-	&get_more_stuff_to_parse();
-	if (/^\@end\s+itemize/) {
-	    &printHTML("</UL>\n");
-	    return;
-	}
-	if (/^\@item\s+(.*)/ || /^\@item()$/) {
-	    &printHTML("<LI>$1\n");
-	    $in_paragraph = 1;
-	    $paragraph_end = "\n";
-	} else {
-	    &parse();
-	}
-    }
-    print "**ERROR** reached EOF while searching for end of the itemize "
-	. "that started on $origin[$started_at]\n";
-} # parse_itemize
-
-########################################################################
-sub parse_menu
-{
-    local ($started_at);
-
-    $started_at = $start_index;
-
-    &printHTML("$paragraph_end") if $in_paragraph;
-    $in_paragraph = 0;
-
-    &printHTML("<MENU>\n");
-
-    while ($texinfo_index < @texinfo) {
-	&get_more_stuff_to_parse();
-	if (/^\@end\s+menu/) {
-	    &printHTML("</MENU>\n");
-	    return;
-	}
-
-        # Like ` * menu-item:: description of item'
-	if (/^\s*\*\s*([^:]*)\s*::\s*(.*)$/) {
-	    &printHTML("$paragraph_end") if $in_paragraph;
-	    $in_paragraph = 0;
-	    $node = &canonical($1);	
-	    &printHTML("<LI><A HREF=\"$node\">$1</A>\n");
-	    &printHTML("$2\n") if $2;
-        # Like ` * menu-item: cross-reference. description of item'
-	} elsif (/^\s*\*\s*([^:]*)\s*:([^.]*)\.\s*(.*)$/) {
-	    &printHTML("$paragraph_end") if $in_paragraph;
-	    $in_paragraph = 0;
-	    $node = &canonical($2);
-	    &printHTML("<LI><A HREF=\"$node\">$1</A>\n");
-	    &printHTML("$3\n");
-	} elsif (/^\@/) {
-	    print "**WARNING** Don\'t know how to process \`$_\' inside "
-		. "a menu!\n";
-	} else {
-	    if (/^\s*$/ && !$in_paragraph) {
-		&printHTML("<P>");
-		$in_paragraph = "1";
-	        $paragraph_end = "</P>\n";
-	    }
-	    &printHTML("$_");
-	}
-    }
-    print "**ERROR** reached EOF while searching for end of the menu "
-	. "that started on $origin[$started_at]\n";
-} # parse_menu
-
-########################################################################
-sub parse_table
-# $_ is `@itemize'.  Due to HTML limitation, `@itemize @bullet' comes
-# out the same as `@itemize @minus'.
-{
-    local ($table,$ttype,$after_DT,$started_at,$first_para);
-    ($table,$ttype) = @_;
-
-    $started_at = $start_index;
-
-    &printHTML("$paragraph_end") if $in_paragraph;
-    $in_paragraph = 0;
-
-    &printHTML("<DL>\n");
-
-    while ($texinfo_index < @texinfo) {
-	&get_more_stuff_to_parse();    
-	if (/^\@end\s+$table/) {
-	    &printHTML("</DL>\n");
-	    return;
-	}
-	if (/^\@item(x?)\s+(.*)/ || /^\@item(x?)()$/) {
-	    $atarg = $2;
-	    if ($ttype) {
-		if ($ttype =~ /(.+),(.+),(.+)/) {
-		    $left = $1; $z = $2; $right = $3;
-		} else {
-		    $left = ''; $z = $ttype; $right = '';
-		}
-		if ($z =~ s/^\^//) {$atarg =~ tr/a-z/A-Z/;}
-		&printHTML("<DT>$left<$z>$atarg</$z>$right\n");
-	    } else {
-		&printHTML("<DT>$2\n");
-	    }
-	    $item = $2;
-	    if ($item && $table =~ /([fv])table/) {
-		$_ = "\@" . $1 . "index " . $item;
-		&process_index;
-	    }
-	    $after_DT = 1;
-	} else {
-	    if ($after_DT) {
-		&printHTML("<DD>\n");
-		$in_paragraph = 1;
-		$paragraph_end = "\n";
-		$after_DT = 0;
-		$first_para = 1;
-	    }
-	    unless ($first_para && /^\s*$/) {
-		$first_para = 0;
-		&parse();
-	    }
-	}
-    }
-    print "**ERROR** reached EOF while searching for end of the table "
-	. "that started on $origin[$started_at]\n";
-} # parse_table
-
-########################################################################
-sub print_index
-{
-    local ($index) = @_;
-    $index = $index_name{$index};
-
-    eval "\@keys = keys \%$index";
-
-    &printHTML("<MENU>\n");
-    foreach $item (sort texinfo_sort @keys) {
-	eval "\$val = \$$index\{\$item\}";
-	&printHTML("<LI>$val\n");
-    }
-    &printHTML("</MENU>\n");
-} # print_index
-
-sub texinfo_sort
-{
-    $x = $a; $x =~ s/<[^>]*>//g; $x =~ tr/A-Z/a-z/;
-    $y = $b; $y =~ s/<[^>]*>//g; $y =~ tr/A-Z/a-z/;
-    $x cmp $y;
-} # texinfo_sort
-
-########################################################################
-sub process_index
-#
-# For example, `@cindex whatever' generates an entry in %cpindex
-#
-{
-    s/\@cindex/\@cpindex/ || s/\@findex/\@fnindex/
-	|| s/\@vindex/\@vrindex/ || s/\@kindex/\@kyindex/
-	|| s/\@pindex/\@pgindex/ || s/\@tindex/\@tpindex/;
-
-    /\@(..)index\s+(.*)/;
-
-    if ($x=$index_style{$1}) {
-	$entry = "<A HREF=\"$cthis\"><$x>$2</$x></A>";
-    } else {
-	$entry = "<A HREF=\"$cthis\">$2</A>";
-    }
-
-    print "*** \$$index_name{$1}\{$2\} = $entry\n" if $debug{'index'};
-    eval "\$$index_name{$1}\{\$2\} = \$entry";
-} # process_index
-
-########################################################################
-sub print_arrows
-{
-    &printHTML("<LINK REL=\"Precedes\" HREF=\"$cnext\">\n") if $next;
-    &printHTML("<LINK REV=\"Precedes\" HREF=\"$cprev\">\n") if $prev;
-    &printHTML("<LINK REV=\"Subdocument\" HREF=\"$cup\">\n") if $up;
-    &printHTML("<LINK REV=\"Library\" HREF=\"$dirfile\">\n") if $dirfile;
-    &printHTML("</HEAD><BODY><P>\n");
-    if ($cprev) {
-        &printHTML("<A HREF=\"$cprev\"><IMG ALIGN=MIDDLE "
-                   . "SRC=\"$icons/prev-arrow.gif\" ALT=\"PREV\"></A>\n");
-    } else {
-        &printHTML("<A><IMG ALIGN=MIDDLE "
-                   . "SRC=\"$icons/missing-arrow.gif\" ALT=\"prev\"></A>\n");
-    }
-    if ($cup) {
-        &printHTML("<A HREF=\"$cup\"> <IMG ALIGN=MIDDLE "
-                   . "SRC=\"$icons/up-arrow.gif\" ALT=\"UP\"></A>\n");
-    } else {
-        &printHTML("<A><IMG ALIGN=MIDDLE "
-                   . "SRC=\"$icons/missing-arrow.gif\" ALT=\"up\"></A>\n");
-    }
-    if ($cnext) {
-        &printHTML("<A HREF=\"$cnext\"><IMG ALIGN=MIDDLE "
-                   . "SRC=\"$icons/next-arrow.gif\" ALT=\"NEXT\"></A>\n");
-    } else {
-        &printHTML("<A><IMG ALIGN=MIDDLE "
-                   . "SRC=\"$icons/missing-arrow.gif\" ALT=\"next\"></A>\n");
-    }
-    if ($dirfile) {
-# XXX need new graphic for this one
-        &printHTML("<A HREF=\"$dirfile\"> <IMG ALIGN=MIDDLE "
-                   . "SRC=\"$icons/dir-arrow.gif\" ALT=\"Bookshelf\"></A>\n");
-    } else {
-        &printHTML("<A><IMG ALIGN=MIDDLE "
-                   . "SRC=\"$icons/missing-arrow.gif\" ALT=\"Bookshelf\"></A>\n");
-    }
-    &printHTML("<CITE>$title</CITE>") if $title;
-}
-
-########################################################################
-sub process_node
-# On entry, $_ is an @node line.
-{
-    s/^\@node\s+//;
-    ($this,$next,$prev,$up) = split(/,/);
-
-    &deduce_node_links() unless ($next || $prev || $up);
-
-    &terminate_node();
-
-    $cthis = &canonical($this);
-    $cnext = &canonical($next);
-    $cprev = &canonical($prev);
-    $cup = &canonical($up);
-
-    print "... opening $dir$cthis ...\n" if $debug{nodes};
-    open(HTML,">$dir/$cthis") || die "Couldn't open $dir$cthis -- $!\n";
-    
-    $nfootnotes = 0;
-
-    &printHTML("<HTML>\n");
-    &printHTML("<!-- created $today from " .
-	       $origin[$start_index] . " via texi2www -->\n");
-    &print_header if $header;
-    &printHTML("<HEAD>\n<TITLE>$this</TITLE>\n");
-    &print_arrows;
-    &printHTML("</P>\n");
-        
-} # process_node
-
-sub terminate_node
-{
-    if ($nfootnotes) {
-	&printHTML("<P><HR>\n");
-	for ($n=0; $n < $nfootnotes; ++$n) {
-	    &printHTML("<P>\[" . ($n+1) . "\] $footnote[$n]</P>\n");
-	}
-    }
-
-    
-    &printHTML("<P><HR>\n");
-    &print_arrows;
-    &printHTML("</P>\n");
-    &print_footer if $footer;
-    &printHTML("</BODY></HTML>\n");
-    close (HTML);
-}
-
-########################################################################
-sub process_section
-#
-# On entry:
-#     $_ is the section command (I.e. `@chapter Overview')
-#     $i is the index to $_ in @lines
-{
-    &printHTML("$paragraph_end") if $in_paragraph;
-    $in_paragraph = 0;
-
-    /^\@(\w+)\s+(.*)/;
-
-    $section_number = '';
-    if ($1 eq 'chapter') {
-	++$chapter; $section=$subsection=$subsubsection=0;
-	$section_number = "Chapter $chapter: ";
-    } elsif ($1 eq 'section') {
-	++$section; $subsection=$subsubsection=0;
-	$section_number = "$chapter.$section: ";
-    } elsif ($1 eq 'subsection') {
-	++$subsection; $subsubsection=0;
-	$section_number = "$chapter.$section.$subsection: ";
-    } elsif ($1 eq 'subsubsection') {
-	++$subsubsection;
-	$section_number = "$chapter.$section.$subsection.$subsubsection: ";
-    } elsif ($1 eq 'appendix') {
-	++$appendix; $section=$subsection=$subsubsection=0;
-	$x = ('A'..'Z')[$appendix-1];
-	$section_number = "Appendix $x: ";
-    } elsif ($1 eq 'appendixsec') {
-	++$section; $subsection=$subsubsection=0;
-	$x = ('A'..'Z')[$appendix-1];
-	$section_number = "$x.$section: ";
-    } elsif ($1 eq 'appendixsubsec') {
-	++$subsection; $subsubsection=0;
-	$x = ('A'..'Z')[$appendix-1];
-	$section_number = "$x.$section.$subsection: ";
-    } elsif ($1 eq 'appendixsubsubsec') {
-	++$subsubsection;
-	$x = ('A'..'Z')[$appendix-1];
-	$section_number = "$x.$section.$subsection.$subsubsection: ";
-    }
-
-    $x = $directive_section{$1};
-    &printHTML("<H$x>$section_number$2</H$x>\n");
-} # process_section
-
-########################################################################
-sub process_synindex
-#
-# There's perhaps a bug here -- this presumes the @synindex comes before
-# any @?index directives; anything already in <from> doesn't get merged
-# into <to>!
-#
-{
-    local ($code) = @_;		# Either 0 or 1; 1 means @syncodeindex
-
-    /\@syn\w*index\s+(\w+)\s+(\w+)/;
-
-    print "*** synindex $1 $2\n" if $debug{'index'};
-
-    $index_name{$1} = $2 . "index";
-    $index_style{$1} = 'CODE' if $code;
-} # process_synindex
-
-########################################################################
-sub printHTML
-{
-    local ($line) = @_;
-    $line =~ s/\$R/\}/g;
-    $line =~ s/\$L/\{/g;
-    $line =~ s/\$A/\@/g;
-    $line =~ s/\$D/\$/g;
-    if ($debug{printHTML}) {
-	print $line;
-    } else {
-	print HTML $line;
-    }
-} # printHTML
-
-########################################################################
-sub print_header
-{
-    unless (open(HEADER,$header)) {
-	print "WARNING -- couldn't open header file \"$header\" -- $!\n";
-	$header = 0;
-	return;
-    }
-    while (<HEADER>) {
-	&printHTML($_);
-    }
-    close(HEADER);
-}
-
-########################################################################
-sub print_footer
-{
-    unless (open(FOOTER,$footer)) {
-	print "WARNING -- couldn't open footer file \"$footer\" -- $!\n";
-	$footer = 0;
-	return;
-    }
-    while (<FOOTER>) {
-	&printHTML($_);
-    }
-    close(FOOTER);
-}
-
-########################################################################
-sub read_input
-#
-# Read the texinfo source into @texinfo.  Don't copy comments or the
-# `@ifxxx' and `@end ifxxx' surrounding [or the contents of] conditional
-# blocks.  Read `@include' files.
-{
-    local ($echo,$terminator_re,$started_at) = @_;
-
-    while (&texinfo_read()) {
-
-	next if (/^\@c$/ || /^\@c\s/ || /^\@comment/);
-
-	if (/^\@ifinfo/) {
-	    &read_input($echo,'/^\@end\s+ifinfo/',
-			                      "$texinfo_file[0] line $.");
-	    next;
-	}
-	if (/^\@ifhtml/) {
-	    &read_input($echo,'/^\@end\s+ifhtml/',
-			                      "$texinfo_file[0] line $.");
-	    next;
-	}
-	if (/^\@iftex/)  {
-	    &read_input(0,'/^\@end\s+iftex/',
-			                      "$texinfo_file[0] line $.");
-	    next;
-	}
-	if (/^\@tex/)  {
-	    &read_input(0,'/^\@end\s+tex/',
-			                      "$texinfo_file[0] line $.");
-	    next;
-	}
-	if (/^\@ignore/) {
-	    # @ignore doesn't nest
-	    $ignore_from = "$texinfo_file[0] line $.";
-	    while (&texinfo_read()) {
-		last if (/^\@end\s+ignore/);
-	    }
-	    unless (/^\@end\s+ignore/) {
-		print "Unexpected EOF while searching from $ignore_from "
-		    . "for \'\@end ignore\'\n";
-	    }
-	    next;
-	}
-	if (/^\@titlepage/) {
-	    &read_input(0,'/^\@end\s+titlepage/',"$texinfo_file[0] line $.");
-	    next;
-	}
-
-	if (/^\@ifclear\s+(\S+)/) {
-	    &read_input($echo&&(!defined($set{$1})),'/^\@end\s+ifclear/',
-			                          "$texinfo_file[0] line $.");
-	    next;
-	}
-	if (/^\@ifset\s+(\S+)/) {
-	    &read_input($echo&&defined($set{$1}),'/^\@end\s+ifset/',
-			                          "$texinfo_file[0] line $.");
-	    next;
-	}
-	
-	return if eval "$terminator_re";
-
-	if (/^\@include\s+(\S+)/) {
-	    &open_input_file($1);
-	    next;
-	}
-
-	if (/^\@(set|clear)\s+(\S+)/) {
-	    if ($1 eq "set") {
-		$set{$2} = 1;
-	    } else {
-		undef($set{$2});
-	    }
-	}
-
-	next unless $echo;
-
-	if (/^\@(\w+)/) {next if $ignore_these_directives{$1};}
-	
-	# Hide @@, @{, and @} so later on it'll be easier to process
-	# stuff like `@code{@@TeX@{@}}'.
-	s/\$/\$D/g; s/\@\@/\$A/g; s/\@{/\$L/g; s/\@}/\$R/g;
-
-	# Convert the HTML special characters
-	s/\&/\&amp;/g; s/\</\&lt;/g; s/\>/\&gt;/g; s/\"/\&quot;/g;
-	
-	$texinfo[$ntexinfo] = $_;
-	$origin[$ntexinfo] =  "$texinfo_file[0] line $.";
-	++$ntexinfo;
-    }
-
-    print "Unexpected EOF while searching from $started_at "
-	. "for $terminator_re\n";
-} # read_input
-
-########################################################################
-sub initialize_tables
-{
-    # Lists which `@x{y}' get expanded into `y'.
-    %atxy_2_y = (
-	'asis', 1,
-         'r', 1,
-         'w', 1,
-    );
-
-    # Describes which `@x{y}' get expanded into `<z>y</z>' and what `z'
-    # is in those expansions!  (If the expansion matches
-    # ``/(.*),(.*),(.*)/'' then y actually expands to ``$1<$2>y</$2>$3'';
-    # if z (or $2) begins with ^ then uppercase y before doing the
-    # expansion). 
-    %atxy_2_zyz= (
-        'b',         'STRONG',
-	'cite',      'CITE',
-	'code',      "CODE",
-	'dfn',       'EM',
-        'dmn',       'EM',
-	'emph',      'EM',
-	'file',      "`,CODE,'",
-        'i',         'EM',
-	'kbd',       'KBD',
-	'key',       '^CODE',
-	'math',      'CODE',
-	'samp',      "`,CODE,'",
-        'sc',        '^EM',
-	'strong',    'STRONG',
-        't',         'CODE',
-	'titlefont', 'CITE',
-	'var',       'VAR',
-    );
-
-    # Describes which `@x{y}' can be expanded into `z' and what `z' is in
-    # those expansions!
-    %atxy_2_z = (
-	'TeX',       '<i>T</i>e<i>X</i>',
-	'bullet',    '*',
-	'copyright', '(C)',
-	'dots',      '...',
-	'equiv',     '==',
-	'error',     'error-->',
-	'expansion', '==>',
-	'minus',     '-',
-	'point',     '-!-',
-	'print',     '-|',
-	'result',    '=>',
-	'today',     &today(),
-    );
-
-    # Lists the '@x{y}' cross reference commands, and describes how they get
-    # expanded.  Note the 'X' beginning each expansion -- it's there so 'ref'
-    # doesn't get expanded to ''!
-    %atxy_2_ref = (
-	'xref',     'XSee ',
-	'ref',      'X',
-	'pxref',    'Xsee ',
-	'href',     'X',
-	'inforef',  'XSee ',
-    );
-
-    %ignore_these_directives = (
-	'author', 1,
-	'break', 1,
-	'contents', 1,
-	'evenfooting', 1,
-	'everyfooting', 1,
-	'everyheading', 1,
-	'finalout', 1,
-	'footnotestyle', 1,
-	'headings', 1,
-        'need', 1,
-	'noindent', 1,
-	'oddfooting', 1,
-        'page', 1,
-	'paragraphindent', 1,
-	'setchapternewpage', 1,
-	'setfilename', 1,
-	'shortcontents', 1,
-	'shorttitlepage', 1,
-	'smallbook', 1,
-        'sp', 1,
-	'subtitle', 1,
-	'summarycontents', 1,
-        'top', 1,
-        'vskip', 1,			    
-    );
-
-    # List the section directives and indicate what heading level 
-    # each one gets.
-    %directive_section = (
-	'chapter', 1,
-	'section', 2,
-	'subsection', 3,
-	'subsubsection',4,
-	'appendix', 1,
-	'appendixsec', 2,
-	'appendixsubsec', 3,
-	'appendixsubsubsec', 4,
-	'chapheading', 1,
-	'majorheading', 1,
-	'heading', 2,
-	'subheading', 3,
-	'subsubheading', 4,
-	'unnumbered', 1,
-	'unnumberedsec', 2,
-	'unnumberedsubsec', 3,
-	'unnumberedsubsubsec', 4,
-    );
-
-    # These @ directives begin a block of preformatted text
-    # (">PRE" means indented inside <PRE>...</PRE>)
-    %directive_block = (
-	'cartouche',   'HR',
-	'display',     '>PRE',
-	'example',     '>PRE',
-	'format',      'PRE',
-	'group',       '-',
-	'lisp',        '>PRE',
-	'quotation',   'BLOCKQUOTE',
-        'smallexample','>PRE',
-    );
-
-    %index_name = (
-        'cp', 'cpindex',
-	'fn', 'fnindex',
-	'ky', 'kyindex',
-	'pg', 'pgindex',
-	'tp', 'tpindex',
-	'vr', 'vrindex',
-    );
-    %index_style = (
-	'fn', 'CODE',
-	'ky', 'CODE',
-	'pg', 'CODE',
-	'tp', 'CODE',
-	'vr', 'CODE',
-    );
-} # initialize_tables
-
-########################################################################
-sub open_input_file
-{
-    unshift(@texinfo_file,$_[0]);
-    print "opening $_[0] ...\n" if $debug{open_input_file};
-    open($texinfo_file[0],$_[0]) || die "Couldn't open $_[0]: $!\n";
-} # open_input_file
-
-########################################################################
-sub texinfo_read
-# Reads the next line of texinfo input into $_.
-{
-    do {
-	$fd = $texinfo_file[0];
-	$_ = <$fd>;
-    } while ($_ eq '' && shift @texinfo_file);
-    return $_;
-} # texinfo_read
-
-########################################################################
-sub today
-{
-    $today = `date`;
-    $today =~ s/\w+ (\w+ +[0-9]+) [0-9]+:[0-9]+:[0-9]+ \w+ ([0-9]+)\n/$1 $2/;
-    $today =~ s/ +/ /g;
-    return $today;
-} # today
-
-########################################################################
-sub copy_to_destdir
-{
-    ($copy_from) = @_;
-
-    if ($copy_from =~ m|(.*)/([^/]*)|) {
-	$copy_from_dir = $1;
-	$copy_from_file = $2;
-    } else {
-	$copy_from_dir = ".";
-	$copy_from_file = $copy_from;
-    }
-
-    if ($copy_from_dir ne $dir && !-e "$dir/$copy_from_file") {
-	system("cp $copy_from $dir")
-	    && die "Couldn\'t \`cp $copy_from $dir\'\n";
-    }
-}
diff --git a/doc/tools/texi2www/texi2www.texi b/doc/tools/texi2www/texi2www.texi
deleted file mode 100644
index c726564c39..0000000000
--- a/doc/tools/texi2www/texi2www.texi
+++ /dev/null
@@ -1,707 +0,0 @@
-\input ../../texinfo/texinfo   @c -*-texinfo-*-
-
-@comment %**start of header
-@setfilename texi2www
-@settitle texi2www user's guide
-@comment %**end of header
-
-@finalout
-
-@titlepage
-@title texi2www
-@author Tim Singletary
-@end titlepage
-
-@iftex
-@everyfooting @| Jan 2 1996
-@end iftex
-
-@comment ******************************************************** TOP
-@node Top,,,(dir)
-@ifhtml
-This document describes @var{texi2www}, a utility for converting
-texinfo to HTML.
-
-This document provides a pretty good example of @var{texi2www}'s texinfo
-to HTML conversion.  @href{Click here,,,texi2wwwdoc.texi.txt} to view
-the texinfo source to this document.
-@end ifhtml
-
-@menu
-* Overview::    What is texi2www? texinfo? HTML? mosaic? WWW?
-* Real life::   A real-life example using texi2www
-* Invocation::  Command line args, etc.
-* Extensions::  @@ commands not in GNU texinfo
-* Known Bugs::  Oops!
-* Demo::        What various things look like
-
-* texi2dvi::
-
-* Index::
-@end menu
-
-@ifhtml
-@today{}.
-@end ifhtml
-
-
-@comment **************************************************** CHAPTER
-@node Overview
-@unnumbered Overview
-@cindex What is HTML
-@cindex What is texinfo
-@cindex What is mosaic
-@cindex texi2html
-@cindex info2html
-@cindex Other texinfo to HTML converters
-
-@var{Texi2www} converts texinfo to HTML:
-
-@table @asis
-@item
-@table @asis
-@item texinfo
-A documentation system that uses a single source file to produce both
-on-line documentation and printed output.  For details see
-@ref{Top,the Texinfo User's Guide,Overview,texinfo,The Texinfo User's Guide}.
-@item HTML
-@href{HyperText Markup Language,,,
-http://www.ncsa.uiuc.edu/General/Internet/WWW/HTMLPrimer.html}
-used in World Wide Web documents.  Programs like mosaic
-understand HTML.
-@end table
-@end table
-
-Texinfo's on-line documentation viewers (emacs, info, xinfo, etc.) are
-quite limited when compared to mosaic.  Mosaic supports multiple fonts,
-variable width fonts, embedded images, and hypertext links to anywhere
-(not just to other texinfo documents).  In addition, mosaic keeps a
-history of nodes visited and can easily go back to previously visited
-nodes.
-
-@var{Texinfo} converts @var{texinfo} directly to @var{HTML} without
-going through an intermediate @var{info} conversion.
-
-Other @var{texinfo} to @var{HTML} converters include:
-
-@table @asis
-@item 
-@href{@var{http://wwwcn.cern.ch/dci/texi2html/},,,
-      http://wwwcn.cern.ch/dci/texi2html/}; and
-@item 
-@href{@var{http://www.ericsson.nl/info2www/info2www.html},,,
-      http://www.ericsson.nl/info2www/info2www.html}
-@end table
-
-Texi2html is very good, but is different from texi2www in several respects,
-including: 
-
-@itemize
-@item Texi2www processes @@ifinfo blocks, whereas texi2html processes
-      @@iftex blocks.
-@item Texi2www always generates menus, whereas menu generation is
-      optional in texi2html.
-@item Texi2www generates a seperate document for each node, wherease
-      texi2html can combine several nodes into one document.
-@item Texi2www adds @href{@code{@@ifhtml} blocks,ifhtml blocks}, 
-      @href{@code{@@html} blocks,html blocks}, and @href{@code{@@href@{@}},
-      href}.  Texi2html has @code{@@ifhtml} blocks, but they work like
-      texi2www's @code{@@html} blocks.
-@item Texi2www uses icons for the prev, up, and next links; texi2html
-      doesn't.
-@end itemize
-
-Texi2www is written in perl and may be used and distributed under the
-terms of the @href{GNU General Public License,Copying,emacs}.
-
-Texi2www was written by
-@href{Tim Singletary,,,
-http://sunland.gsfc.nasa.gov/personnel/aam/singletary.html}
-(@cite{tsingle@@sunland.gsfc.nasa.gov}) and is available at
-@href{@var{ftp://sunland.gsfc.nasa.gov/pub/tarfiles/texi2www.tgz},,,
-ftp://sunland.gsfc.nasa.gov/pub/tarfiles/texi2www.tgz}.
-
-@comment **************************************************** CHAPTER
-@node Real life
-@chapter A Real Life Example
-
-Here's how I used texi2www to set up a 
-@href{directory of texinfo documents,,,
-                            http://sunland.gsfc.nasa.gov/info/dir.html}.
-This discussion is the minimum I had to do to set up 
-@href{texinfo,,,http://sunland.gsfc.nasa.gov/info/texinfo/Top.html} and
-texi2www.
-First, I created the directory ``@var{$HTDOCS/info}'' (@var{$HTDOCS} is
-the root directory of my web server).
-
-Then, I copied arrow icons ``@var{missing-arrow.gif}'',
-``@var{next-arrow.gif}'', ``@var{prev-arrow.gif}'', and
-``@var{up-arrow.gif}'' into ``@var{$HTDOCS/info}''.
-(I obtained my icons from 
-@cite{Rutgers University Network Services} at
-@href{http://ns2.rutgers.edu/doc-images/buttons,,,
-      http://ns2.rutgers.edu/doc-images/buttons}.)
-
-Next, I created subdirectories ``@var{$HTDOCS/info/texinfo}'' and
-``@var{$HTDOCS/info/texi2wwwdoc}''.
-(I determined the names of these subdirectories by examining the
-``@var{@@setfilename}'' line in the texinfo files.
-files; @var{texi2wwwdoc.texi} contains the line
-``@var{@@setfilename texi2wwwdoc.info}'' and @var{texinfo.texi} contains
-``@var{@@setfilename texinfo.info}''.
-
-Next, I copied the texinfo files into the appropriate directories.  This
-step isn't strictly required, but I think its a good idea since it makes
-it simple to keep track of which texinfo files generated which set of
-html documents.
-
-Then I generated the html documents.  I used the commands:
-@example
-> cd $HTDOCS/info/texinfo
-> texi2www texinfo.texi
-Normal completion.
-> cd ../texi2wwwdoc
-> texi2www texi2wwwdoc.texi
-Normal completion.
-@end example
-Examing these directories shows that a bunch of @var{.html} files got
-generated, including, in each directory,  ``@var{Top.html}''.
-
-Finally, I created a table of contents file
-``@var{$HTDOCS/info/dir.html}''.  The first version of that file looked
-like:
-
-@example
-<HTML>
-<HEAD><TITLE>info directory table of contents</TITLE></HEAD>
-<BODY>
-<MENU>
-<LI><A HREF="texinfo/Top.html">texinfo</A>
-    GNU texinfo version 3.1
-<LI><A HREF="texi2wwwdoc/Top.html">texi2www</A>
-    Converts texinfo to html
-</MENU>
-</BODY></HTML>
-@end example
-
-@comment **************************************************** CHAPTER
-@node Invocation
-@chapter Invocation
-@cindex Command line options
-@cindex Obtaining gif files
-
-@unnumberedsec Synopsys
-
-@code{texi2www [options] texinfo-file}
-
-@unnumberedsec Options
-@table @asis
-
-@item @code{-dir} @var{path} 
-      Specifies the path to the directory where the
-      generated files get placed.  If not specified, the current
-      directory is assumed.
-
-@item @code{-footer} @var{file} 
-      Specifies a file whose contents get
-      appended at the bottom of each generated HTML file.  Typically
-      looks something like:
-
-@example
-<HR>
-<P>Back to our <A HREF="../../homepage.html">home page</A>.</P>
-@end example
-
-@item @code{-icons} @var{path}
-      Specifies the path (relative to the directory where the generated
-      files get placed) to the arrow files.  If not specified, @file{..}
-      is assumed.  The names of the arrow
-      files are @file{up_arrow.gif}, @file{left_arrow.gif},
-      @file{right_arrow.gif}, and @file{missing_arrow.gif}
-
-@end table
-
-@unnumberedsec Directory structure
-
-Texi2www will generate a set of HTML files from each texinfo document;
-each set of HTML files must go in a seperate directory (why? one reason
-is because each set includes a file named @code{Top.html}!).
-
-These directories should be subdirectories of the same base directory.
-Assume the base directory is @code{$TEXIBASE}.  Then HTML files for
-emacs go in directory @code{$TEXIBASE/emacs}, HTML files for texinfo go
-in @code{$TEXIBASE/texinfo}, etc, where the name of the subdirectory is
-the same as the name of the info file (so cross references between
-documents will work).
-
-In addition to the subdirectories of HTML files, @code{$TEXIBASE}
-contains a file @code{dir.html} and the four arrow gif files
-@code{up_arrow.gif}, @code{left_arrow.gif}, @code{right_arrow.gif}, and
-@code{missing_arrow.gif}.
-
-@code{$TEXIBASE/dir.html} is typically just a menu of links to the
-subdirectories and can be as simple as
-
-@example
-<HTML><HEAD><TITLE>dir</TITLE></HEAD>
-<BODY>
-<MENU>
-<LI><A HREF="emacs/Top.html">emacs</A>
-<LI><A HREF="texinfo/Top.html">texinfo</A>
-</MENU>
-</BODY></HTML>
-@end example
-
-(@code{$TEXIBASE/dir.html} is not generated via texi2www and must be
-created by hand).
-
-
-
-@comment **************************************************** CHAPTER
-@node Extensions
-@chapter Extensions
-@ifhtml
-Texi2www understands the following extensions to pure texinfo:
-@end ifhtml
-@menu
-* ifhtml blocks:: @code{@@ifhtml} and @code{@@end ifhtml}
-* html blocks:: @code{@@html} and @code{@@end html}
-* href:: @code{@@href@{text,node,file,URL@}}
-* gif:: @code{@@gif@{gif-file@}}
-@end menu
-
-@comment ******************************************************* NODE
-@comment Top -> Extensions ->
-@node ifhtml blocks
-@section @code{@@ifhtml} and @code{@@end ifhtml}
-@cindex Conditional HTML blocks
-
-@var{@@ifhtml} blocks are similar to @var{@@ifinfo} and @var{@@iftex}
-blocks.  Lines between @var{@@ifhtml} and @var{@@end ifhtml} get
-processed when generating the hypertext manual but get ignored when
-generating the printed manual.
-
-@var{texinfo.tex} (in @var{/usr/local/lib/tex/macros} on my machine)
-needs to be modified in order to use @@ifhtml.  I inserted
-@example
-\def\ifhtml@{\doignore@{ifhtml@}@}
-@end example
-after the @code{\def\ifinfo@{\doignore@{ifinfo@}@}} line (line
-596 ???).
-
-In most cases, it is better to use @var{@@ifinfo} than @var{@@ifhtml}.
-
-@comment ******************************************************* NODE
-@node html blocks
-@section @code{@@html} and @code{@@end html}
-@cindex Pure HTML blocks
-
-@var{@@html} blocks are similar to @var{@@tex} blocks; @var{@@html}
-blocks only get processed when generating HTML and lines within
-@var{@@html} blocks may contain HTML commands.
-
-@ifhtml
-For example,
-
-@example
-@@html
-produces <EM>&lt;EM&gt;</EM> in HTML is like @@var@{@@@@var@} in texinfo.
-@@end html
-@end example
-
-@html
-produces <EM>&lt;EM&gt;</EM> in HTML is like @var{@@var} in texinfo.
-@end html
-@end ifhtml
-
-@var{texinfo.tex} (in @var{/usr/local/lib/tex/macros} on my machine)
-needs to be modified in order to use @@ifhtml.  I inserted
-@example
-\def\html@{\doignore@{html@}@}
-@end example
-after the @code{\def\ifinfo@{\doignore@{ifinfo@}@}} line (line
-596 ???). 
-
-@comment ******************************************************* NODE
-@node href
-@section @code{@@href@{text,node,file,URL@}}
-
-Use @code{@@href@{text,node,file,URL@}} when you want a hypertext link in an
-HTML document and plain text everywhere else.
-
-@var{Text} is the text you want displayed in the document.  
-@var{Node},@var{file}, and @var{URL} indicate what @var{text} is linked to.
-@var{Node} and @var{file} are a normal texinfo style node reference;
-@var{URL} is a HTML URL.  
-One of @var{node} or @var{URL} must be specified (if both are specified,
-@var{URL} is used).
-
-The @href{texinfo source used to create this
-document,,,texi2wwwdoc.texi.txt} contains numerous examples of how
-@@href might be used.
-
-@var{texinfo.tex} (in @var{/usr/local/lib/tex/macros} on my machine)
-needs to be modified in order to use @@href@{@}.  All I did was insert
-@example
-\def\href#1{\hrefX[#1,,,]}
-\def\hrefX[#1,#2,#3,#4]{#1}
-@end example
-before the @code{\def\pxref} line (line 3497 ???).
-
-@comment ******************************************************* NODE
-@node gif
-@section @code{@@gif@{@var{pict.gif}@}}
-
-This extension provides a method for inserting a gif file in both the
-html and printed document.  For example, here are my arrow icons:
-@*
-prev: @gif{prev-arrow.gif},
-up: @gif{up-arrow.gif},
-and next: @gif{next-arrow.gif}
-
-@subsection @code{@@gif@{@}} and @var{texi2www}
-
-@var{texi2www} copies @var{pict.gif} to the destination directory.
-
-@subsection @code{@@gif@{@}} and @var{texi2dvi}
-
-@href{@var{texi2dvi},texi2dvi} converts @var{pict.gif} to a font and
-uses this font to insert the picture in the document.  This conversion
-to a font requires that the pbmplus and bm2font utilities be installed on
-your system:
-
-@table @asis
-@item pbmplus
-      A suite of utilities for manipulating images.  @var{texi2dvi} uses
-      @var{giftopnm}, @var{pnmscale}, @var{pnmnlfilt}, @var{ppmquant},
-      and @var{ppmtogif}.  These utilities can be obtained from
-      @href{@code{
-         <ftp://ftp.x.org/contrib/utilities/netpbm-1mar1994.tar.gz>},,,
-          ftp://ftp.x.org/contrib/utilities/netpbm-1mar1994.tar.gz}.
-
-  
-@item bm2font
-      @var{bm2font} converts a bitmap images (including ``@code{.gif}''
-      images) to a font that can be used in a @TeX{} document.
-      @var{bm2font} can be obtained from
-      @href{@code{<ftp://ftp.shsu.edu/tex-archive/graphics/bm2font.tar.gz>},,,
-                   ftp://ftp.shsu.edu/tex-archive/graphics/bm2font.tar.gz}.
-@end table
-
-@comment **************************************************** CHAPTER
-@node Known Bugs
-@chapter Known Bugs
-
-@enumerate
-
-@item The @href{@code{@@center},titlefont center sp,texinfo} command
-      doesn't work since HTML doesn't support centering yet. 
-
-@item The @href{@code{@@noindent},noindent,texinfo} and
-      @href{@code{@@exdent},exdent,texinfo} commands don't work since
-      HTML doesn't include any facility to control indentation.
-
-@item Mark specifications in the @href{@code{@@itemize},itemize,texinfo}
-      command are ignored since HTML doesn't include any facility to
-      specify the tag in itemized lists.
-
-@item The @href{emacs texinfo files need to be tweaked,
-                problems with emacs} to work with @var{texi2www}.
-
-@item One @href{@code{@@gif},gif} command is allowed per line.
-
-@end enumerate
-
-@unnumberedsec Fixed Bugs
-
-@enumerate 
-
-@item Previous versions didn't handle nested tables correctly.  The
-      @@item following an inner @@table would be drawn in the wrong
-      font.  @var{(tsingle, Jan 2 1996)}
-   
-@item Previous versions didn't capitalize
-      @href{@code{@@sc@{@}},Smallcaps,texinfo} text.  (There's still
-      the problem of HTML not supporting true smallcaps, however).
-      @var{(tsingle, Sep 6 1995)}
-
-@item Previous versions of @var{texi2www} didn't correctly index
-      @href{@code{@@ftable} and @code{@@vtable},ftable vtable,texinfo}
-      items; this bug has been fixed! @var{(tsingle, Aug 17 1995)}
-
-@end enumerate
-
-@node problems with emacs
-@section emacs.texi @result{} HTML problems
-
-The file @var{man/commands.texi} distributed with GNU Emacs version
-version 19.25 contains, near the top of the file:
-
-@example
-@@c See file emacs.texi for copying conditions.
-@@iftex
-@@chapter Characters, Keys and Commands
-
-  This chapter explains the character set used by Emacs for input commands
-and for the contents of files, and also explains the concepts of
-@@dfn@{keys@} and @@dfn@{commands@} which are necessary for understanding how
-your keyboard input is understood by Emacs.
-@@end iftex
-@@node User Input, Keys, Screen, Top
-@@section Keyboard Input
-@end example
-
-Texi2www doesn't see the @@chapter since it's inside an @@iftex block;
-this confuses texi2www's chapter numbering.  My fix was to change this
-section to:
-
-@example
-@@c See file emacs.texi for copying conditions.
-@@node User Input, Keys, Screen, Top
-@@chapter Characters, Keys and Commands
-@@iftex
-
-  This chapter explains the character set used by Emacs for input commands
-and for the contents of files, and also explains the concepts of
-@@dfn@{keys@} and @@dfn@{commands@} which are necessary for understanding how
-your keyboard input is understood by Emacs.
-@@end iftex
-@@section Keyboard Input
-@end example
-
-@var{killing.texi}, @var{misc.texi}, and @var{trouble.texi} have similar
-problems.
-
-@comment **************************************************** CHAPTER
-@node Demo
-@appendix Sample output
-
-This document itself is a pretty good example of what texi2www supports
-and produces.  Following are some examples to really make things clear;
-to fully appreciate these examples compare the source and printed output
-to your html viewer.
-
-@menu
-* Fonts::  @@var@{@}, etc.
-* Glyphs:: @@result@{@}, etc.
-* Blocks:: @@example ... @@end example, etc.
-* Tables and Lists:: @@table .. @@end table, etc.
-@end menu
-
-@comment **************************************************** SECTION
-@node Fonts
-@unnumberedsec Text markup
-
-Texi2www supports:
-
-@table @asis
-
-@item @@b@{@var{bold text}@} @result{} @b{bold text}
-Here is @b{some text} in the @@b font.
-
-@item @@cite@{@var{reference}@} @result{} @cite{reference}
-Indicate the name of a book.
-Here is @cite{some text} in the @@cite font.
-
-@item @@code@{@var{sample-code}@} @result{} @code{sample-code}
-Indicate text that is a literal example of a piece of a program.
-Here is @code{some text} in the @@code font.
-
-@item @@dfn@{@var{term}@} @result{} @dfn{term}
-Indicate the introductory or defining use of a term.
-Here is @dfn{some text} in the @@dfn font.
-
-@item @@dmn@{@var{text}@} @result{} @dmn{text}
-Here is @dmn{some text} in the @@dmn font.
-
-@item @@emph@{@var{text}@} @result{} @emph{text}
-Here is @emph{some text} in the @@emph font.
-
-@item @@file@{@var{file-name}@} @result{} @file{file-name}
-Indicate the name of a file.
-Here is @file{some text} in the @@file font.
-
-@item @@i@{@var{italic text}@} @result{} @i{italic text}
-Here is @i{some text} in the @@i font.
-
-@item @@kbd@{@var{keyboard-characters}@} @result{} @kbd{keyboard-characters}
-Indicate keyboard input.
-Here is @kbd{some text} in the @@kbd font.
-
-@item @@key@{@var{key-name}@} @result{} @key{key-name}
-Indicate the conventional name for a key on a keyboard.
-Here is @key{some text} in the @@key font.
-
-@item @@math@{@var{ax^2+b}@} @result{} @math{ax^2+b}
-Here is @r{some text} in the @@math font.
-
-@item @@r@{@var{roman font text}@} @result{} @r{roman font text}
-Here is @r{some text} in the @@r font.
-
-@item @@samp@{@var{text}@} @result{} @samp{text}
-Indicate text that is a literal example of a sequence of characters.
-Here is @samp{some text} in the @@samp font.
-
-@item @@sc@{@var{text}@} @result{} @sc{text}
-Here is @sc{some text} in the @@sc font.
-
-@item @@strong@{@var{text}@} @result{} @strong{text}
-Here is @strong{some text} in the @@strong font.
-
-@item @@t@{@var{fixed-width text}@} @result{} @t{fixed-width text}
-Here is @t{some text} in the @@t font.
-
-@item @@titlefont@{@var{text}@} @result{} @titlefont{text}
-Here is @titlefont{some text} in the @@titlefont font.
-
-@item @@var@{@var{metasyntactic-variable}@} @result{} @var{metasyntactic-variable}
-Indicate a metasyntactic variable.
-Here is @var{some text} in the @@var font.
-
-@end table
-
-
-@comment **************************************************** SECTION
-@node Glyphs
-@unnumberedsec Glyphs
-
-@table @asis
-
-@item @@TeX@{@}       @result{} @TeX{}
-@item @@bullet@{@}    @result{} @bullet{}
-@item @@copyright@{@} @result{} @copyright{}
-@item @@dots@{@}      @result{} @dots{}
-@item @@equiv@{@}     @result{} @equiv{}
-@item @@error@{@}     @result{} @error{}
-@item @@expansion@{@} @result{} @expansion{}
-@item @@minus@{@}     @result{} @minus{}
-@item @@point@{@}     @result{} @point{}
-@item @@print@{@}     @result{} @print{}
-@item @@result@{@}    @result{} @result{}
-@item @@today@{@}     @result{} @today{}
-
-@end table
-
-@comment **************************************************** SECTION
-@node Blocks
-@unnumberedsec Blocks
-
-@example
-@cartouche
-@@example
-@@cartouche
-Here's two lines
-of text
-@@end cartouche
-@@end example
-@end cartouche
-@end example
-
-@display
-@@display
-Here's two lines
-of text
-@@end display
-@end display
-
-@example
-@@example
-Here's two lines
-of text
-@@end example
-@end example
-
-@format
-@@format
-Here's two lines
-of text
-@@end format
-@end format
-
-@lisp
-@@lisp
-Here's two lines
-of text
-@@end lisp
-@end lisp
-
-@quotation
-@@quotation
-Here's two lines
-of text
-@@end quotation
-@end quotation
-
-@smallexample
-@@smallexample
-Here's two lines
-of text
-@@end smallexample
-@end smallexample
-
-@comment **************************************************** SECTION
-@node Tables and Lists
-@unnumberedsec Tables and Lists
-
-@example
-@@table @@code
-@@item code-one
-@@table @@var
-@@item var-one
-@@table @@samp
-@@item samp-one
-Hmmm.
-@@item samp-two
-Mmmmh.
-@@end table
-@@item var-two
-Huh?
-@@end table
-@@item code-two
-Duh?
-@@end table
-@end example
-
-@table @code
-@item code-one
-@table @var
-@item var-one
-@table @samp
-@item samp-one
-Hmmm.
-@item samp-two
-Mmmmh.
-@end table
-@item var-two
-Huh?
-@end table
-@item code-two
-Duh?
-@end table
-
-
-@comment **************************************************** CHAPTER
-@node texi2dvi
-@appendix texi2dvi & texinfo.tex
-
-Versions of ``@code{texi2dvi}'' and ``@code{texinfo.tex}'' are included
-with this package.  These are compatible with the
-@href{texi2www extensions,Extensions}.
-
-@appendixsec texi2dvi
-
-@appendixsec texinfo.tex
-
-``@code{texinfo.tex}'' is a @TeX{} macro used during the @var{texinfo}
-@result{} @var{dvi} conversion.  
-
-
-
-
-@comment **************************************************** CHAPTER
-@node Index
-@unnumbered Index
-@printindex cp
-
-@contents
-@bye
diff --git a/doc/tools/texi2www/up-arrow.gif b/doc/tools/texi2www/up-arrow.gif
deleted file mode 100644
index 82aa8ccc68..0000000000
--- a/doc/tools/texi2www/up-arrow.gif
+++ /dev/null
diff --git a/doc/tools/update b/doc/tools/update
deleted file mode 100644
index 6199707a74..0000000000
--- a/doc/tools/update
+++ /dev/null
@@ -1,221 +0,0 @@
-#!/bin/ksh
-#
-# Either bash or ksh will be ok for this; requires 'test -ot'
-#  (-p above just says to not parse $ENV file; makes it faster for
-#   those of us who set $ENV)
-#
-#
-# NOTE
-#
-#   This is potentially a very dangerous program.
-#
-#  $Id$
-#
-
-# progname=`basename $0`
-progname=${0##*/}        # fast basename hack for ksh, bash
-
-USAGE=\
-"
-usage: $progname [ -vs ] [ -b base_directory ] [-p file] [-f] [files...]
-	-v	    -- verbose
-	-p	    -- file with replacement instructions
-	-s	    -- skip prompt for backup verification
-	-f	    -- do files at end of line
-
-base_directory is the root directory of the source code to update.  It
-defaults to the current directory.
-
-This program updates C, H, and .inl files.
-"
-
-fatal() {
-    if [ "$1" ]
-    then
-        echo    >&2
-        echo $* >&2
-        echo    >&2
-    fi
-    echo "$USAGE" 1>&2
-    exit 1
-}
-
-#
-#  KLUDGE to figure out at runtime how to echo a line without a
-#  newline.
-#
-count=`echo "\\c" | wc -c`
-if [ ${count} -ne 0 ] ; then
-  EARG="-n"
-  EOL=""
-else
-  EARG=""
-  EOL="\\c"
-fi
-
-#
-#  Function to make sure they do a backup
-#
-
-WARNING=\
-"
-
-*******************************************************************************
-*******************************************************************************
-*******************************************************************************
-****                                                                       ****
-****        WARNING!!!          WARNING!!!           WARNING!!!            ****
-****                                                                       ****
-****   ALL SOURCE CODE SHOULD BE BACKED UP BEFORE RUNNING THIS PROGRAM!!   ****
-****                                                                       ****
-****        WARNING!!!          WARNING!!!           WARNING!!!            ****
-****                                                                       ****
-*******************************************************************************
-*******************************************************************************
-*******************************************************************************
-
-"
-
-verify_backup()
-{
-  echo "$WARNING"
-  continue="yes"
-  while [ $continue = "yes" ]
-  do
-echo ${EARG} "Do you wish to update the source tree at this time [y|n]? " ${EOL}
-    read answer
-    case $answer in
-      [yY]*)
-        continue="no"
-        ;;
-      [nN]*)
-        echo
-        echo "Exitting at user request"
-        echo
-        exit 0
-        ;;
-    esac
-  done
-}
-
-#
-#  Default tools to use...
-#
-#  NOTE: The GNU versions of both of these are faster.
-#
-find_prog=find
-xargs_prog=xargs
-
-#
-# process the options
-#
-
-verbose=""
-suffix=""
-mode=""
-base_directory=.
-do_files="no"
-do_prompt="yes"
-replacement_file=""
-
-while getopts sfp:b:v OPT
-do
-    case "$OPT" in
-        v)
-          verbose="yes";;
-        s)
-          do_prompt="no";;
-        b)
-          base_directory=${OPTARG};;
-        p)
-          replacement_file=${OPTARG};;
-        f)
-          do_files="yes";;
-        *)
-          fatal
-    esac
-done
-
-let $((shiftcount = $OPTIND - 1))
-shift $shiftcount
-
-args=$*
-
-#
-#  Make sure they have done a backup
-#
-
-if [ ${do_prompt} = "yes" ]
-then
-  verify_backup
-fi
-
-#
-# Validate the base directory
-#
-
-if [ ! -d $base_directory ]
-then
-    fatal "${base_directory} does not exist"
-fi
-
-#
-# Validate the replacement file
-#
-
-if [ ! -r $replacement_file ]
-then
-    fatal "${replacement_file} does not exist or is not readable"
-fi
-
-
-#
-#  Verify enough of the RTEMS environment variables are set
-#
-
-RTEMS_HOME=/usr1/rtems/rtemsdoc-work
-if [ ! -d "${RTEMS_HOME}" ]
-then
-    fatal "RTEMS_HOME environment variable is not initialized"
-fi
-
-#
-# Update the files
-#
-
-generate_list()
-{
-  if [ ${do_files} = "yes" ]
-  then
-    for i in $args
-    do
-      echo $i
-    done
-  else
-    ${find_prog} ${base_directory} \(  -name "*.[ch]" -o -name "*.inl" \) -print
-  fi
-}
-
-generate_list | ${xargs_prog} |
-  while read line
-  do
-
-    if [ ${verbose} = yes ] ; then
-       echo ${RTEMS_HOME}/tools/word-replace -p ${replacement_file} ${line}
-    fi
-    ${RTEMS_HOME}/tools/word-replace -p ${replacement_file} ${line}
-    if [ $? -ne 0 ]
-    then
-      exit 1
-    fi
-    for file in ${line}
-    do
-      mv ${file}.fixed ${file}
-    done
-  done
-
-exit 0
-
-# Local Variables: ***
-# mode:ksh ***
-# End: ***
diff --git a/doc/tools/word-replace b/doc/tools/word-replace
deleted file mode 100755
index 90e72117fd..0000000000
--- a/doc/tools/word-replace
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/usr/bin/perl
-#
-#  $Id$
-#
-
-eval "exec /usr/local/bin/perl -S $0 $*"
-    if $running_under_some_shell;
-
-require 'getopts.pl';
-&Getopts("p:vh");		# help, pattern file, verbose,
-
-if ($opt_h || ! $opt_p) {
-    print STDERR <<NO_MORE_HELP;
-word-replace
-
-   Replace *words* with patterns.   Pattern file specifies which patterns
-   to replace on each line.  All patterns are wrapped with perl \\b regexp
-   specifiers.
-
-Usage: $0       [-v] -p pattern-file files to replace
-
-    -v          -- possibly more verbose
-    -p file     -- pattern file
-    -h          -- help
-
-    anything else == this help message
-
-Pattern file looks like this:
-
-# Example:
-# ignores all lines with beginning with # or not exactly 2 fields
-_Dorky_Name  rtems_dorky_name           # comments, and blank lines are cool
-_Dorky_Name2 rtems_dorky_name2          # comments, and blank lines are cool
-NO_MORE_HELP
-    exit 0;
-}
-
-$verbose = $opt_v;
-$pattern_file = $opt_p;
-
-# make standard outputs unbuffered (so the '.'s come out ok)
-$oldfh = select(STDERR); $| = 1; select($oldfh);
-$oldfh = select(STDOUT); $| = 1; select($oldfh);
-
-# pull in the patterns
-open(PATTERNS, "<$pattern_file") ||
-    die "could not open $pattern_file: $!, crapped out at";
-
-foreach (<PATTERNS>)
-{
-    chop;
-    s/#.*//;
-    next if /^$/;
-    ($orig, $new, $junk, @rest) = split;
-    next if ( ! $orig || ! $new || $junk); # <2 or >2 patterns
-    die "pattern appears 2x: '$orig' in '$pattern_file'--" if defined($patterns{$orig});
-    $patterns{$orig} = $new;
-}
-close PATTERNS;
-
-# walk thru each line in each file
-foreach $file (@ARGV)
-{
-    print "$file\t";
-
-    open (INFILE, "<$file") ||
-        die "could not open input file $file: $!";
-
-    $outfile = $file . ".fixed";;
-    open (OUTFILE, ">$outfile") ||
-        die "could not open output file $outfile: $!";
-
-    while (<INFILE>)
-    {
-        study;                  # maybe make s/// faster
-        foreach $key (keys %patterns)
-        {
-            if ( s/\b$key\b/$patterns{$key}/ge )
-            {
-                print ".";
-            }
-        }
-        print OUTFILE $_;
-    }
-    print "\n";
-    close INFILE;
-    close OUTFILE;
-}
-
diff --git a/doc/user/Makefile b/doc/user/Makefile
deleted file mode 100644
index 806699f28c..0000000000
--- a/doc/user/Makefile
+++ /dev/null
@@ -1,180 +0,0 @@
-#
-#  COPYRIGHT (c) 1988-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  All rights reserved.
-#
-#  $Id$
-#
-
-PROJECT=c_user
-DISTRIBUTION_LEVEL=public
-
-include ../Make.config
-
-all: html info ps
-
-dirs:
-	$(make-dirs)
-
-COMMON_FILES=../common/cpright.texi
-FILES= bsp.texi c_user.texi clock.texi concepts.texi conf.texi \
-    dirstat.texi dpmem.texi event.texi example.texi fatal.texi \
-    glossary.texi init.texi intr.texi io.texi mp.texi msg.texi overview.texi \
-    part.texi preface.texi region.texi rtmon.texi schedule.texi sem.texi \
-    signal.texi task.texi timer.texi userext.texi $(COMMON_FILES)
-
-GENERATED_FILES=overview.texi concepts.texi init.texi task.texi \
-    intr.texi clock.texi timer.texi sem.texi msg.texi \
-    event.texi signal.texi part.texi region.texi \
-    dpmem.texi io.texi fatal.texi schedule.texi rtmon.texi \
-    bsp.texi userext.texi conf.texi mp.texi 
-
-INFOFILES=$(wildcard $(PROJECT) $(PROJECT)-*)
-
-info: dirs c_user
-	cp $(PROJECT) $(PROJECT)-* $(INFO_INSTALL)
-
-c_user: $(FILES)
-	$(MAKEINFO) $(PROJECT).texi
-
-dvi: $(PROJECT).dvi
-ps: dirs $(PROJECT).ps
-	
-$(PROJECT).ps: $(PROJECT).dvi
-	dvips -o $(PROJECT).ps $(PROJECT).dvi
-	cp $(PROJECT).ps $(PS_INSTALL)
-
-$(PROJECT).dvi: $(FILES)
-	$(TEXI2DVI) $(PROJECT).texi
-
-html: dirs $(FILES)
-	-mkdir -p $(WWW_INSTALL)/c_user
-	cp rtemsarc.gif rtemspie.gif states.gif $(WWW_INSTALL)/c_user
-	$(TEXI2WWW) $(TEXI2WWW_ARGS) -dir $(WWW_INSTALL)/$(PROJECT) \
- 	    $(PROJECT).texi
-
-clean:
-	rm -f *.o $(PROG) *.txt core *.html 
-	rm -f *.dvi *.ps *.log *.aux *.cp *.fn *.ky *.pg *.toc *.tp *.vr $(BASE)
-	rm -f c_user c_user-* _* $(GENERATED_FILES)
-
-#preface.texi: preface.t
-#	$(BMENU) -p "Top" \
-#	    -u "Top" \
-#	    -n "Overview" ${*}.t
-
-overview.texi: overview.t
-	$(BMENU) -p "Preface" \
-	    -u "Top" \
-	    -n "Key Concepts" ${*}.t
-
-concepts.texi: concepts.t
-	$(BMENU) -p "Overview Manual Organization" \
-	    -u "Top" \
-	    -n "Initialization Manager" ${*}.t
-
-init.texi: init.t
-	$(BMENU) -p "Key Concepts Memory Management" \
-	    -u "Top" \
-	    -n "Task Manager" ${*}.t
-
-task.texi: task.t
-	$(BMENU) -p "Initialization Manager SHUTDOWN_EXECUTIVE - Shutdown RTEMS" \
-	    -u "Top" \
-	    -n "Interrupt Manager" ${*}.t
-
-intr.texi: intr.t
-	$(BMENU) -p "Task Manager TASK_WAKE_WHEN - Wake up when specified" \
-	    -u "Top" \
-	    -n "Clock Manager" ${*}.t
-
-clock.texi: clock.t
-	$(BMENU) \
-	 -p "Interrupt Manager INTERRUPT_IS_IN_PROGRESS - Is an ISR in Progress" \
-	    -u "Top" \
-	    -n "Timer Manager" ${*}.t
-
-timer.texi: timer.t
-	$(BMENU) -p "Clock Manager CLOCK_TICK - Announce a clock tick" \
-	    -u "Top" \
-	    -n "Semaphore Manager" ${*}.t
-
-sem.texi: sem.t
-	$(BMENU) -p "Timer Manager TIMER_RESET - Reset an interval timer" \
-	    -u "Top" \
-	    -n "Message Manager" ${*}.t
-
-msg.texi: msg.t
-	$(BMENU) -p "Semaphore Manager SEMAPHORE_RELEASE - Release a semaphore" \
-	    -u "Top" \
-	    -n "Event Manager" ${*}.t
-
-event.texi: event.t
-	$(BMENU) \
-	-p "Message Manager MESSAGE_QUEUE_FLUSH - Flush all messages on a queue" \
-	    -u "Top" \
-	    -n "Signal Manager" ${*}.t
-
-signal.texi: signal.t
-	$(BMENU) -p "Event Manager EVENT_RECEIVE - Receive event condition" \
-	    -u "Top" \
-	    -n "Partition Manager" ${*}.t
-
-part.texi: part.t
-	$(BMENU) -p "Signal Manager SIGNAL_SEND - Send signal set to a task" \
-	    -u "Top" \
-	    -n "Region Manager" ${*}.t
-
-region.texi: region.t
-	$(BMENU) \
--p "Partition Manager PARTITION_RETURN_BUFFER - Return buffer to a partition" \
-	    -u "Top" \
-	    -n "Dual-Ported Memory Manager" ${*}.t
-
-dpmem.texi: dpmem.t
-	$(BMENU) \
-	  -p "Region Manager REGION_GET_SEGMENT_SIZE - Obtain size of a segment" \
-	    -u "Top" \
-	    -n "I/O Manager" ${*}.t
-
-io.texi: io.t
-	$(BMENU) -p "Dual-Ported Memory Manager PORT_INTERNAL_TO_EXTERNAL - Convert internal to external address" \
-	    -u "Top" \
-	    -n "Fatal Error Manager" ${*}.t
-
-fatal.texi: fatal.t
-	$(BMENU) -p "I/O Manager IO_CONTROL - Special device services" \
-	    -u "Top" \
-	    -n "Scheduling Concepts" ${*}.t
-
-schedule.texi: schedule.t
-	$(BMENU) \
--p "Fatal Error Manager FATAL_ERROR_OCCURRED - Invoke the fatal error handler" \
-	    -u "Top" \
-	    -n "Rate Monotonic Manager" ${*}.t
-
-rtmon.texi: rtmon.t
-	$(BMENU) -p "Scheduling Concepts Task State Transitions" \
-	    -u "Top" \
-	    -n "Board Support Packages" ${*}.t
-
-bsp.texi: bsp.t
-	$(BMENU) -p "Rate Monotonic Manager RATE_MONOTONIC_GET_STATUS - Obtain status information on period" \
-	    -u "Top" \
-	    -n "User Extensions Manager" ${*}.t
-
-userext.texi: userext.t
-	$(BMENU) -p "Board Support Packages Heterogeneous Systems" \
-	    -u "Top" \
-	    -n "Configuring a System" ${*}.t
-
-conf.texi: conf.t
-	$(BMENU) -p "User Extensions Manager EXTENSION_DELETE - Delete a extension set" \
-	    -u "Top" \
-	    -n "Multiprocessing Manager" ${*}.t
-
-mp.texi: mp.t
-	$(BMENU) -p "Configuring a System Sizing the RTEMS RAM Workspace" \
-	    -u "Top" \
-	    -n "Directive Status Codes" ${*}.t
-
diff --git a/doc/user/bsp.t b/doc/user/bsp.t
deleted file mode 100644
index f1350c0c96..0000000000
--- a/doc/user/bsp.t
+++ /dev/null
@@ -1,313 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Board Support Packages
-
-@section Introduction
-
-A board support package (BSP) is a collection of
-user-provided facilities which interface RTEMS and an
-application with a specific hardware platform.  These facilities
-may  include hardware initialization, device drivers, user
-extensions, and a Multiprocessor Communications Interface
-(MPCI).  However, a minimal BSP need only support processor
-reset and initialization and, if needed, a clock tick.
-
-@section Reset and Initialization
-
-An RTEMS based application is initiated or
-re-initiated when the processor is reset.  This initialization
-code is responsible for preparing the target platform for the
-RTEMS application.  Although the exact actions performed by the
-initialization code are highly processor and target dependent,
-the logical functionality of these actions are similar across a
-variety of processors and target platforms.
-
-Normally, the application's initialization is
-performed at two separate times:  before the call to
-@code{@value{DIRPREFIX}initialize_executive}
-(reset application initialization) and
-after @code{@value{DIRPREFIX}initialize_executive}
-in the user's initialization tasks
-(local and global application initialization).  The order of the
-startup procedure is as follows:
-
-@enumerate
-@item Reset application initialization.
-@item Call to @code{@value{DIRPREFIX}initialize_executive}
-@item Local and global application initialization.
-@end enumerate
-
-The reset application initialization code is executed
-first when the processor is reset.  All of the hardware must be
-initialized to a quiescent state by this software before
-initializing RTEMS.  When in quiescent state, devices do not
-generate any interrupts or require any servicing by the
-application.  Some of the hardware components may be initialized
-in this code as well as any application initialization that does
-not involve calls to RTEMS directives.
-
-The processor's Interrupt Vector Table which will be
-used by the application may need to be set to the required value
-by the reset application initialization code.  Because
-interrupts are enabled automatically by RTEMS as part of the
-@code{@value{DIRPREFIX}initialize_executive} directive,
-the Interrupt Vector Table MUST
-be set before this directive is invoked to insure correct
-interrupt vectoring.  The processor's Interrupt Vector Table
-must be accessible by RTEMS as it will be modified by the
-@code{@value{DIRPREFIX}interrupt_catch} directive.  
-On some CPUs, RTEMS installs it's
-own Interrupt Vector Table as part of initialization and thus
-these requirements are met automatically.  The reset code which
-is executed before the call to @code{@value{DIRPREFIX}initialize_executive}
-has the following requirements:
-
-@itemize @bullet
-@item Must not make any RTEMS directive calls.
-
-@item If the processor supports multiple privilege levels,
-must leave the processor in the most privileged, or supervisory,
-state.
-
-@item Must allocate a stack of at least @code{@value{RPREFIX}MINIMUM_STACK_SIZE}
-bytes and initialize the stack pointer for the
-@code{@value{DIRPREFIX}initialize_executive} directive.
-
-@item Must initialize the processor's Interrupt Vector Table.
-
-@item Must disable all maskable interrupts.
-
-@item If the processor supports a separate interrupt stack,
-must allocate the interrupt stack and initialize the interrupt
-stack pointer.
-@end itemize
-
-The @code{@value{DIRPREFIX}initialize_executive} directive does not return to
-the initialization code, but causes the highest priority
-initialization task to begin execution.  Initialization tasks
-are used to perform both local and global application
-initialization which is dependent on RTEMS facilities.  The user
-initialization task facility is typically used to create the
-application's set of tasks.
-
-@subsection Interrupt Stack Requirements
-
-The worst-case stack usage by interrupt service
-routines must be taken into account when designing an
-application.  If the processor supports interrupt nesting, the
-stack usage must include the deepest nest level.  The worst-case
-stack usage must account for the following requirements:
-
-@itemize @bullet
-@item Processor's interrupt stack frame
-
-@item Processor's subroutine call stack frame
-
-@item RTEMS system calls
-
-@item Registers saved on stack
-
-@item Application subroutine calls
-@end itemize
-
-The size of the interrupt stack must be greater than
-or equal to the constant @code{@value{RPREFIX}MINIMUM_STACK_SIZE}.
-
-@subsection Processors with a Separate Interrupt Stack
-
-Some processors support a separate stack for
-interrupts.  When an interrupt is vectored and the interrupt is
-not nested, the processor will automatically switch from the
-current stack to the interrupt stack.  The size of this stack is
-based solely on the worst-case stack usage by interrupt service
-routines.
-
-The dedicated interrupt stack for the entire
-application is supplied and initialized by the reset and
-initialization code of the user's board support package.  Since
-all ISRs use this stack, the stack size must take into account
-the worst case stack usage by any combination of nested ISRs.
-
-@subsection Processors without a Separate Interrupt Stack
-
-Some processors do not support a separate stack for
-interrupts.  In this case, without special assistance every
-task's stack must include enough space to handle the task's
-worst-case stack usage as well as the worst-case interrupt stack
-usage.  This is necessary because the worst-case interrupt
-nesting could occur while any task is executing.
-
-On many processors without dedicated hardware managed
-interrupt stacks, RTEMS manages a dedicated interrupt stack in
-software.  If this capability is supported on a CPU, then it is
-logically equivalent to the processor supporting a separate
-interrupt stack in hardware.
-
-@section Device Drivers
-
-Device drivers consist of control software for
-special peripheral devices and provide a logical interface for
-the application developer.  The RTEMS I/O manager provides
-directives which allow applications to access these device
-drivers in a consistent fashion.  A Board Support Package may
-include device drivers to access the hardware on the target
-platform.  These devices typically include serial and parallel
-ports, counter/timer peripherals, real-time clocks, disk
-interfaces, and network controllers.
-
-For more information on device drivers, refer to the
-I/O Manager chapter.
-
-@subsection Clock Tick Device Driver
-
-Most RTEMS applications will include a clock tick
-device driver which invokes the @code{@value{DIRPREFIX}clock_tick}
-directive at regular intervals.  The clock tick is necessary if
-the application is to utilize timeslicing, the clock manager, the
-timer manager, the rate monotonic manager, or the timeout option on blocking
-directives.
-
-The clock tick is usually provided as an interrupt
-from a counter/timer or a real-time clock device.  When a
-counter/timer is used to provide the clock tick, the device is
-typically programmed to operate in continuous mode.  This mode
-selection causes the device to automatically reload the initial
-count and continue the countdown without programmer
-intervention.  This reduces the overhead required to manipulate
-the counter/timer in the clock tick ISR and increases the
-accuracy of tick occurrences.  The initial count can be based on
-the microseconds_per_tick field in the RTEMS Configuration
-Table.  An alternate approach is to set the initial count for a
-fixed time period (such as one millisecond) and have the ISR
-invoke @code{@value{DIRPREFIX}clock_tick}
-on the microseconds_per_tick boundaries.
-Obviously, this can induce some error if the configured
-microseconds_per_tick is not evenly divisible by the chosen
-clock interrupt quantum.
-
-It is important to note that the interval between
-clock ticks directly impacts the granularity of RTEMS timing
-operations.  In addition, the frequency of clock ticks is an
-important factor in the overall level of system overhead.  A
-high clock tick frequency results in less processor time being
-available for task execution due to the increased number of
-clock tick ISRs.
-
-@section User Extensions
-
-RTEMS allows the application developer to augment
-selected features by invoking user-supplied extension routines
-when the following system events occur:
-
-@itemize @bullet
-@item Task creation
-@item Task initiation
-@item Task reinitiation
-@item Task deletion
-@item Task context switch
-@item Post task context switch
-@item Task begin
-@item Task exits
-@item Fatal error detection
-@end itemize
-
-User extensions can be used to implement a wide variety of
-functions including execution profiling, non-standard
-coprocessor support, debug support, and error detection and
-recovery.  For example, the context of a non-standard numeric
-coprocessor may be maintained via the user extensions.  In this
-example, the task creation and deletion extensions are
-responsible for allocating and deallocating the context area,
-the task initiation and reinitiation extensions would be
-responsible for priming the context area, and the task context
-switch extension would save and restore the context of the
-device.
-
-For more information on user extensions, refer to the
-User Extensions chapter.
-
-@section Multiprocessor Communications Interface (MPCI)
-
-RTEMS requires that an MPCI layer be provided when a
-multiple node application is developed.  This MPCI layer must
-provide an efficient and reliable communications mechanism
-between the multiple nodes.  Tasks on different nodes
-communicate and synchronize with one another via the MPCI.  Each
-MPCI layer must be tailored to support the architecture of the
-target platform.
-
-For more information on the MPCI, refer to the
-Multiprocessing Manager chapter.
-
-@subsection Tightly-Coupled Systems
-
-A tightly-coupled system is a multiprocessor
-configuration in which the processors communicate solely via
-shared global memory.  The MPCI can simply place the RTEMS
-packets in the shared memory space.  The two primary
-considerations when designing an MPCI for a tightly-coupled
-system are data consistency and informing another node of a
-packet.
-
-The data consistency problem may be solved using
-atomic "test and set" operations to provide a "lock" in the
-shared memory.  It is important to minimize the length of time
-any particular processor locks a shared data structure.
-
-The problem of informing another node of a packet can
-be addressed using one of two techniques.  The first technique
-is to use an interprocessor interrupt capability to cause an
-interrupt on the receiving node.  This technique requires that
-special support hardware be provided by either the processor
-itself or the target platform.  The second technique is to have
-a node poll for arrival of packets.  The drawback to this
-technique is the overhead associated with polling.
-
-@subsection Loosely-Coupled Systems
-
-A loosely-coupled system is a multiprocessor
-configuration in which the processors communicate via some type
-of communications link which is not shared global memory.  The
-MPCI sends the RTEMS packets across the communications link to
-the destination node.  The characteristics of the communications
-link vary widely and have a significant impact on the MPCI
-layer.  For example, the bandwidth of the communications link
-has an obvious impact on the maximum MPCI throughput.
-
-The characteristics of a shared network, such as
-Ethernet, lend themselves to supporting an MPCI layer.  These
-networks provide both the point-to-point and broadcast
-capabilities which are expected by RTEMS.
-
-@subsection Systems with Mixed Coupling
-
-A mixed-coupling system is a multiprocessor
-configuration in which the processors communicate via both
-shared memory and communications links.  A unique characteristic
-of mixed-coupling systems is that a node may not have access to
-all communication methods.  There may be multiple shared memory
-areas and communication links.  Therefore, one of the primary
-functions of the MPCI layer is to efficiently route RTEMS
-packets between nodes.  This routing may be based on numerous
-algorithms. In addition, the router may provide alternate
-communications paths in the event of an overload or a partial
-failure.
-
-@subsection Heterogeneous Systems
-
-Designing an MPCI layer for a heterogeneous system
-requires special considerations by the developer.  RTEMS is
-designed to eliminate many of the problems associated with
-sharing data in a heterogeneous environment.  The MPCI layer
-need only address the representation of thirty-two (32) bit
-unsigned quantities.
-
-For more information on supporting a heterogeneous
-system, refer the Supporting Heterogeneous Environments in the
-Multiprocessing Manager chapter.
diff --git a/doc/user/c_user.texi b/doc/user/c_user.texi
deleted file mode 100644
index a5aa2c0a89..0000000000
--- a/doc/user/c_user.texi
+++ /dev/null
@@ -1,169 +0,0 @@
-\input ../texinfo/texinfo   @c -*-texinfo-*-
-@c %**start of header
-@setfilename c_user
-@syncodeindex vr fn
-@synindex ky cp
-@paragraphindent 0
-@c @smallbook
-@c %**end of header
-
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@c
-@c   Master file for the C User's Guide
-@c
-
-@c Joel's Questions
-@c
-@c  1.  Why does paragraphindent only impact makeinfo?
-@c  2.  Why does paragraphindent show up in HTML?
-@c
-
-@include ../common/setup.texi
-
-@ignore
-@ifinfo
-@format
-START-INFO-DIR-ENTRY
-* RTEMS C User: (c_user).             The C User's Guide
-END-INFO-DIR-ENTRY
-@end format
-@end ifinfo
-@end ignore
-
-@c variable substitution info:
-@c
-@set is-C
-@clear is-Ada
-@set LANGUAGE C
-@set STRUCTURE structure
-@set ROUTINE function
-@set OR |
-@set RPREFIX RTEMS_
-@set DIRPREFIX rtems_
-@c the language is @value{LANGUAGE}
-@c NOTE:  don't use underscore in the name
-@c
-
-@c
-@c  Title Page Stuff
-@c
-
-@set edition @value{RTEMS-EDITION}
-@set version @value{RTEMS-VERSION}
-@set update-date @value{RTEMS-UPDATE-DATE}
-@set update-month @value{RTEMS-UPDATE-MONTH}
-
-@c
-@c  I don't really like having a short title page.  --joel
-@c
-@c @shorttitlepage RTEMS Applications C User's Guide
-
-@setchapternewpage odd
-@settitle RTEMS C User's Guide
-@titlepage
-@finalout
-
-@title RTEMS C User's Guide
-@subtitle Edition @value{edition}, for RTEMS @value{version}
-@sp 1
-@subtitle @value{update-month}
-@author On-Line Applications Research Corporation
-@page
-@include ../common/cpright.texi
-@end titlepage
-
-@c  This prevents a black box from being printed on "overflow" lines.
-@c  The alternative is to rework a sentence to avoid this problem.
-
-@include preface.texi
-@include overview.texi
-@include concepts.texi
-@include init.texi
-@include task.texi
-@include intr.texi
-@include clock.texi
-@include timer.texi
-@include sem.texi
-@include msg.texi
-@include event.texi
-@include signal.texi
-@include part.texi
-@include region.texi
-@include dpmem.texi
-@include io.texi
-@include fatal.texi
-@include schedule.texi
-@include rtmon.texi
-@include bsp.texi
-@include userext.texi
-@include conf.texi
-@include mp.texi
-@include dirstat.texi
-@include example.texi
-@include glossary.texi
-@ifinfo
-@node Top, Preface, (dir), (dir)
-@top c_user
-
-This is the online version of the RTEMS C User's Guide.
-
-@menu
-* Preface::
-* Overview::
-* Key Concepts::
-* Initialization Manager::
-* Task Manager::
-* Interrupt Manager::
-* Clock Manager::
-* Timer Manager::
-* Semaphore Manager::
-* Message Manager::
-* Event Manager::
-* Signal Manager::
-* Partition Manager::
-* Region Manager::
-* Dual-Ported Memory Manager::
-* I/O Manager::
-* Fatal Error Manager::
-* Scheduling Concepts::
-* Rate Monotonic Manager::
-* Board Support Packages::
-* User Extensions Manager::
-* Configuring a System::
-* Multiprocessing Manager::
-* Directive Status Codes::
-* Example Application::
-* Glossary::
-* Command and Variable Index::
-* Concept Index::
-@end menu
-
-@end ifinfo
-@c 
-@c 
-@c Need to copy the emacs stuff and "trailer stuff" (index, toc) into here
-@c
-
-@node Command and Variable Index, Concept Index, Glossary, Top
-@unnumbered Command and Variable Index
-
-There are currently no Command and Variable Index entries.
-
-@c @printindex fn
-
-@node Concept Index, , Command and Variable Index, Top
-@unnumbered Concept Index
-
-There are currently no Concept Index entries.
-@c @printindex cp
-
-@contents
-@bye
-
diff --git a/doc/user/clock.t b/doc/user/clock.t
deleted file mode 100644
index 3153adb878..0000000000
--- a/doc/user/clock.t
+++ /dev/null
@@ -1,403 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Clock Manager
-
-@section Introduction
-
-The clock manager provides support for time of day
-and other time related capabilities.  The directives provided by
-the clock manager are:
-
-@itemize @bullet
-@item @code{@value{DIRPREFIX}clock_set} - Set system date and time
-@item @code{@value{DIRPREFIX}clock_get} - Get system date and time information
-@item @code{@value{DIRPREFIX}clock_tick} - Announce a clock tick
-@end itemize
-
-@section Background
-
-@subsection Required Support
-
-For the features provided by the clock manager to be
-utilized, periodic timer interrupts are required.  Therefore, a
-real-time clock or hardware timer is necessary to create the
-timer interrupts.  The @code{@value{DIRPREFIX}clock_tick}
-directive is normally called
-by the timer ISR to announce to RTEMS that a system clock tick
-has occurred.  Elapsed time is measured in ticks.  A tick is
-defined to be an integral number of microseconds which is
-specified by the user in the Configuration Table.
-
-@subsection Time and Date Data Structures
-
-The clock facilities of the clock manager operate
-upon calendar time.  These directives utilize the following date
-and time @value{STRUCTURE} for the native time and date format:
-
-@ifset is-C
-@example
-struct rtems_tod_control @{
-  rtems_unsigned32 year;   /* greater than 1987 */
-  rtems_unsigned32 month;  /* 1 - 12 */
-  rtems_unsigned32 day;    /* 1 - 31 */
-  rtems_unsigned32 hour;   /* 0 - 23 */
-  rtems_unsigned32 minute; /* 0 - 59 */
-  rtems_unsigned32 second; /* 0 - 59 */
-  rtems_unsigned32 ticks;  /* elapsed between seconds */
-@};
-
-typedef struct rtems_tod_control rtems_time_of_day;
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-type Time_Of_Day is
-   record
-      Year    : RTEMS.Unsigned32; -- year, A.D.
-      Month   : RTEMS.Unsigned32; -- month, 1 .. 12
-      Day     : RTEMS.Unsigned32; -- day, 1 .. 31
-      Hour    : RTEMS.Unsigned32; -- hour, 0 .. 23
-      Minute  : RTEMS.Unsigned32; -- minute, 0 .. 59
-      Second  : RTEMS.Unsigned32; -- second, 0 .. 59
-      Ticks   : RTEMS.Unsigned32; -- elapsed ticks between seconds
-   end record;
-@end example
-@end ifset
-
-
-The native date and time format is the only format
-supported when setting the system date and time using the
-@code{@value{DIRPREFIX}clock_get} directive.  Some applications
-expect to operate on a "UNIX-style" date and time data structure.  The 
-@code{@value{DIRPREFIX}clock_get} directive can optionally return
-the current date and time in the
-following @value{STRUCTURE}:
-
-@ifset is-C
-@example
-@group
-typedef struct @{
-  rtems_unsigned32 seconds;       /* seconds since RTEMS epoch*/
-  rtems_unsigned32 microseconds;  /* since last second        */
-@} rtems_clock_time_value;
-@end group
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-type Clock_Time_Value is
-   record
-      Seconds      : Unsigned32;
-      Microseconds : Unsigned32;
-   end record;
-@end example
-@end ifset
-
-The seconds field in this @value{STRUCTURE} is the number of
-seconds since the RTEMS epoch of January 1, 1988.
-
-@subsection Clock Tick and Timeslicing
-
-Timeslicing is a task scheduling discipline in which
-tasks of equal priority are executed for a specific period of
-time before control of the CPU is passed to another task.  It is
-also sometimes referred to as the automatic round-robin
-scheduling algorithm.  The length of time allocated to each task
-is known as the quantum or timeslice.
-
-The system's timeslice is defined as an integral
-number of ticks, and is specified in the Configuration Table.
-The timeslice is defined for the entire system of tasks, but
-timeslicing is enabled and disabled on a per task basis.
-
-The @code{@value{DIRPREFIX}clock_tick}
-directive implements timeslicing by
-decrementing the running task's time-remaining counter when both
-timeslicing and preemption are enabled.  If the task's timeslice
-has expired, then that task will be preempted if there exists a
-ready task of equal priority.
-
-@subsection Delays
-
-A sleep timer allows a task to delay for a given
-interval or up until a given time, and then wake and continue
-execution.  This type of timer is created automatically by the
-@code{@value{DIRPREFIX}task_wake_after}
-and @code{@value{DIRPREFIX}task_wake_when} directives and, as a result,
-does not have an RTEMS ID.  Once activated, a sleep timer cannot
-be explicitly deleted.  Each task may activate one and only one
-sleep timer at a time.
-
-@subsection Timeouts
-
-Timeouts are a special type of timer automatically
-created when the timeout option is used on the
-@code{@value{DIRPREFIX}message_queue_receive},
-@code{@value{DIRPREFIX}event_receive},
-@code{@value{DIRPREFIX}semaphore_obtain} and
-@code{@value{DIRPREFIX}region_get_segment} directives.  
-Each task may have one and only one timeout active at a time.  
-When a timeout expires, it unblocks the task with a timeout status code.
-
-@section Operations
-
-@subsection Announcing a Tick
-
-RTEMS provides the @code{@value{DIRPREFIX}clock_tick} directive which is
-called from the user's real-time clock ISR to inform RTEMS that
-a tick has elapsed.  The tick frequency value, defined in
-microseconds, is a configuration parameter found in the
-Configuration Table.  RTEMS divides one million microseconds
-(one second) by the number of microseconds per tick to determine
-the number of calls to the
-@code{@value{DIRPREFIX}clock_tick} directive per second.  The
-frequency of @code{@value{DIRPREFIX}clock_tick}
-calls determines the resolution
-(granularity) for all time dependent RTEMS actions.  For
-example, calling @code{@value{DIRPREFIX}clock_tick}
-ten times per second yields a higher
-resolution than calling @code{@value{DIRPREFIX}clock_tick}
-two times per second.  The @code{@value{DIRPREFIX}clock_tick}
-directive is responsible for maintaining both
-calendar time and the dynamic set of timers.
-
-@subsection Setting the Time
-
-The @code{@value{DIRPREFIX}clock_set} directive allows a task or an ISR to
-set the date and time maintained by RTEMS.  If setting the date
-and time causes any outstanding timers to pass their deadline,
-then the expired timers will be fired during the invocation of
-the @code{@value{DIRPREFIX}clock_set} directive.
-
-@subsection Obtaining the Time
-
-The @code{@value{DIRPREFIX}clock_get} directive allows a task or an ISR to
-obtain the current date and time or date and time related
-information.  The current date and time can be returned in
-either native or UNIX-style format.  Additionally, the
-application can obtain date and time related information such as
-the number of seconds since the RTEMS epoch, the number of ticks
-since the executive was initialized, and the number of ticks per
-second.  The information returned by the
-@code{@value{DIRPREFIX}clock_get} directive is
-dependent on the option selected by the caller.  The following
-options are available:
-
-@itemize @bullet
-@item @code{@value{RPREFIX}CLOCK_GET_TOD} - obtain native style date and time
-
-@item @code{@value{RPREFIX}CLOCK_GET_TIME_VALUE} - obtain UNIX-style
-date and time
-
-@item @code{@value{RPREFIX}CLOCK_GET_TICKS_SINCE_BOOT} - obtain number of ticks
-since RTEMS was initialized
-
-@item @code{@value{RPREFIX}CLOCK_GET_SECONDS_SINCE_EPOCH} - obtain number
-of seconds since RTEMS epoch
-
-@item @code{@value{RPREFIX}CLOCK_GET_TICKS_PER_SECOND} - obtain number of clock
-ticks per second
-
-@end itemize
-
-Calendar time operations will return an error code if
-invoked before the date and time have been set.
-
-@section Directives
-
-This section details the clock manager's directives.
-A subsection is dedicated to each of this manager's directives
-and describes the calling sequence, related constants, usage,
-and status codes.
-
-@page
-@subsection CLOCK_SET - Set system date and time
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_clock_set
-@example
-rtems_status_code rtems_clock_set(
-  rtems_time_of_day *time_buffer
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure Clock_Set (
-   Time_Buffer : in     RTEMS.Time_Of_Day;
-   Result      :    out RTEMS.Status_Codes
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-@code{@value{RPREFIX}SUCCESSFUL} - date and time set successfully@*
-@code{INVALID_TIME_OF_DAY} - invalid time of day
-
-@subheading DESCRIPTION:
-
-This directive sets the system date and time.  The
-date, time, and ticks in the time_buffer @value{STRUCTURE} are all
-range-checked, and an error is returned if any one is out of its
-valid range.
-
-@subheading NOTES:
-
-Years before 1988 are invalid.
-
-The system date and time are based on the configured
-tick rate (number of microseconds in a tick).
-
-Setting the time forward may cause a higher priority
-task, blocked waiting on a specific time, to be made ready.  In
-this case, the calling task will be preempted after the next
-clock tick.
-
-Re-initializing RTEMS causes the system date and time
-to be reset to an uninitialized state.  Another call to
-@code{@value{DIRPREFIX}clock_set} is required to re-initialize
-the system date and time to application specific specifications.
-
-@page
-@subsection CLOCK_GET - Get system date and time information
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_clock_get
-@example
-rtems_status_code rtems_clock_get(
-  rtems_clock_get_options  option,
-  void                    *time_buffer
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure Clock_Get (
-   Option      : in     RTEMS.Clock_Get_Options;
-   Time_Buffer : in     RTEMS.Address;
-   Result      :    out RTEMS.Status_Codes
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-@code{@value{RPREFIX}SUCCESSFUL} - current time obtained successfully@*
-@code{@value{RPREFIX}NOT_DEFINED} - system date and time is not set
-
-@subheading DESCRIPTION:
-
-This directive obtains the system date and time.  If
-the caller is attempting to obtain the date and time (i.e.
-option is set to either @code{@value{RPREFIX}CLOCK_GET_SECONDS_SINCE_EPOCH},
-@code{@value{RPREFIX}CLOCK_GET_TOD}, or
-@code{@value{RPREFIX}CLOCK_GET_TIME_VALUE}) and the date and time
-has not been set with a previous call to
-@code{@value{DIRPREFIX}clock_set}, then the
-@code{@value{RPREFIX}NOT_DEFINED} status code is returned. 
-The caller can always obtain the number of ticks per second (option is
-@code{@value{RPREFIX}CLOCK_GET_TICKS_PER_SECOND}) and the number of
-ticks since the executive was initialized option is
-@code{@value{RPREFIX}CLOCK_GET_TICKS_SINCE_BOOT}).
-
-The data type expected for time_buffer is indicated below:
-
-@ifset is-C
-@itemize @bullet
-@item @code{@value{RPREFIX}CLOCK_GET_TOD} - (rtems_time_of_day *)
-
-@item @code{@value{RPREFIX}CLOCK_GET_TIME_VALUE} - (rtems_clock_time_value *)
-
-@item @code{@value{RPREFIX}CLOCK_GET_TICKS_SINCE_BOOT} - (rtems_interval *)
-
-@item @code{@value{RPREFIX}CLOCK_GET_SECONDS_SINCE_EPOCH} - (rtems_interval *)
-
-@item @code{@value{RPREFIX}CLOCK_GET_TICKS_PER_SECOND} - (rtems_interval *)
-
-@end itemize
-@end ifset
-
-@ifset is-Ada
-@itemize @bullet
-@item @code{@value{RPREFIX}CLOCK_GET_TOD} - Address of an variable of
-type RTEMS.Time_Of_Day
-
-@item @code{@value{RPREFIX}CLOCK_GET_TIME_VALUE} - Address of an variable of
-type RTEMS.Clock_Time_Value
-
-@item @code{@value{RPREFIX}CLOCK_GET_TICKS_SINCE_BOOT} - Address of an
-variable of type RTEMS.Interval
-
-@item @code{@value{RPREFIX}CLOCK_GET_SECONDS_SINCE_EPOCH} - Address of an
-variable of type RTEMS.Interval
-
-@item @code{@value{RPREFIX}CLOCK_GET_TICKS_PER_SECOND} - Address of an
-variable of type RTEMS.Interval
-
-@end itemize
-@end ifset
-
-@subheading NOTES:
-
-This directive is callable from an ISR.
-
-This directive will not cause the running task to be
-preempted.  Re-initializing RTEMS causes the system date and
-time to be reset to an uninitialized state.  Another call to
-@code{@value{DIRPREFIX}clock_set} is required to re-initialize the
-system date and time to application specific specifications.
-
-@page
-@subsection CLOCK_TICK - Announce a clock tick
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_clock_tick
-@example
-rtems_status_code rtems_clock_tick( void );
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure Clock_Tick (
-   Result :    out RTEMS.Status_Codes
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-@code{@value{RPREFIX}SUCCESSFUL} - current time obtained successfully
-
-@subheading DESCRIPTION:
-
-This directive announces to RTEMS that a system clock
-tick has occurred.  The directive is usually called from the
-timer interrupt ISR of the local processor.  This directive
-maintains the system date and time, decrements timers for
-delayed tasks, timeouts, rate monotonic periods, and implements
-timeslicing.
-
-@subheading NOTES:
-
-This directive is typically called from an ISR.
-
-The microseconds_per_tick and ticks_per_timeslice
-parameters in the Configuration Table contain the number of
-microseconds per tick and number of ticks per timeslice,
-respectively.
-
diff --git a/doc/user/concepts.t b/doc/user/concepts.t
deleted file mode 100644
index c68a9a95b4..0000000000
--- a/doc/user/concepts.t
+++ /dev/null
@@ -1,297 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@c
-@c  The following figure was replaced with an ASCII equivalent.
-@c    Figure 2-1 Object ID Composition
-@c
-
-@chapter Key Concepts
-
-@section Introduction
-
-The facilities provided by RTEMS are built upon a
-foundation of very powerful concepts.  These concepts must be
-understood before the application developer can efficiently
-utilize RTEMS.  The purpose of this chapter is to familiarize
-one with these concepts.
-
-@section Objects
-
-RTEMS provides directives which can be used to
-dynamically create, delete, and manipulate a set of predefined
-object types.  These types include tasks, message queues,
-semaphores, memory regions, memory partitions, timers, ports,
-and rate monotonic periods.  The object-oriented nature of RTEMS
-encourages the creation of modular applications built upon
-re-usable "building block" routines.
-
-All objects are created on the local node as required
-by the application and have an RTEMS assigned ID.  All objects
-have a user-assigned name.  Although a relationship exists
-between an object's name and its RTEMS assigned ID, the name and
-ID are not identical.  Object names are completely arbitrary and
-selected by the user as a meaningful "tag" which may commonly
-reflect the object's use in the application.  Conversely, object
-IDs are designed to facilitate efficient object manipulation by
-the executive.
-
-An object name is an unsigned thirty-two bit entity
-associated with the object by the user.  Although not required
-by RTEMS, object names are typically composed of four ASCII
-characters which help identify that object.  For example, a task
-which causes a light to blink might be called "LITE".  Utilities
-are provided to build an object name from four ASCII characters
-and to decompose an object name into four ASCII characters.
-However, it is not required that the application use ASCII
-characters to build object names.  For example, if an
-application requires one-hundred tasks, it would be difficult to
-assign meaningful ASCII names to each task.  A more convenient
-approach would be to name them the binary values one through
-one-hundred, respectively.
-
-@need 3000
-
-An object ID is a unique unsigned thirty-two bit
-entity composed of three parts: object class, node, and index.
-The most significant six bits are the object class.  The next
-ten bits are the number of the node on which this object was
-created.  The node number is always one (1) in a single
-processor system.  The least significant sixteen bits form an
-identifier within a particular object type.  This identifier,
-called the object index, ranges in value from 1 to the maximum
-number of objects configured for this object type.
-
-@ifset use-ascii
-@example
-@group
-     31        26 25              16 15                             0
-     +-----------+------------------+-------------------------------+
-     |           |                  |                               |
-     |   Class   |       Node       |             Index             |
-     |           |                  |                               |
-     +-----------+------------------+-------------------------------+
-@end group
-@end example
-@end ifset
-
-@ifset use-tex
-@sp 1
-@tex
-\centerline{\vbox{\offinterlineskip\halign{
-\strut#&
-\hbox to 0.50in{\enskip#}&
-\hbox to 0.50in{\enskip#}&
-#&
-\hbox to 0.50in{\enskip#}&
-\hbox to 0.50in{\enskip#}&
-#&
-\hbox to 1.00in{\enskip#}&
-\hbox to 1.00in{\enskip#}&
-#\cr
-\multispan{9}\cr
-\multispan{2}31\hfil&\multispan{2}\hfil26\enskip&
- \multispan{1}\enskip25\hfil&\multispan{2}\hfil16\enskip&
- \multispan{1}\enskip15\hfil&\multispan{2}\hfil0\cr
-&&&&&&&&&\cr
-}}\hfil}
-\centerline{\vbox{\offinterlineskip\halign{
-\strut\vrule#&
-\hbox to 0.50in{\enskip#}&
-\hbox to 0.50in{\enskip#}&
-\vrule#&
-\hbox to 0.50in{\enskip#}&
-\hbox to 0.50in{\enskip#}&
-\vrule#&
-\hbox to 0.50in{\enskip#}&
-\hbox to 0.50in{\enskip#}&
-\vrule#\cr
-\multispan{9}\cr
-\noalign{\hrule}
-&&&&&&&&&\cr
-&\multispan{2}\hfil Class\hfil&&
- \multispan{2}\hfil Node\hfil&&
- \multispan{2}\hfil Index\hfil&\cr
-&&&&&&&&&\cr
-\noalign{\hrule}
-}}\hfil}
-@end tex
-@end ifset
-
-@ifset use-html
-@html
-<CENTER>
-  <TABLE COLS=6 WIDTH="60%" BORDER=0>
-<TR><TD ALIGN=left><STRONG>31</STRONG></TD>
-    <TD ALIGN=right><STRONG>26</STRONG></TD>
-    <TD ALIGN=left><STRONG>25</STRONG></TD>
-    <TD ALIGN=right><STRONG>16</STRONG></TD>
-    <TD ALIGN=left><STRONG>15</STRONG></TD>
-    <TD ALIGN=right><STRONG>0</STRONG></TD></TR>
-  </TABLE>
-</CENTER>
-<CENTER>
-  <TABLE COLS=6 WIDTH="60%" BORDER=2>
-<TR><TD ALIGN=center COLSPAN=2>Class</TD>
-    <TD ALIGN=center COLSPAN=2>Node</TD>
-    <TD ALIGN=center COLSPAN=2>Index</TD></TD>
-  </TABLE>
-</CENTER>
-@end html
-@end ifset
-
-
-The three components of an object ID make it possible
-to quickly locate any object in even the most complicated
-multiprocessor system.  Object ID's are associated with an
-object by RTEMS when the object is created and the corresponding
-ID is returned by the appropriate object create directive.  The
-object ID is required as input to all directives involving
-objects, except those which create an object or obtain the ID of
-an object.
-
-The object identification directives can be used to
-dynamically obtain a particular object's ID given its name.
-This mapping is accomplished by searching the name table
-associated with this object type.  If the name is non-unique,
-then the ID associated with the first occurrence of the name
-will be returned to the application.  Since object IDs are
-returned when the object is created, the object identification
-directives are not necessary in a properly designed single
-processor application.
-
-An object control block is a data structure defined
-by RTEMS which contains the information necessary to manage a
-particular object type.  For efficiency reasons, the format of
-each object type's control block is different.  However, many of
-the fields are similar in function.  The number of each type of
-control block is application dependent and determined by the
-values specified in the user's Configuration Table.  An object
-control block is allocated at object create time and freed when
-the object is deleted.  With the exception of user extension
-routines, object control blocks are not directly manipulated by
-user applications.
-
-@section Communication and Synchronization
-
-In real-time multitasking applications, the ability
-for cooperating execution threads to communicate and synchronize
-with each other is imperative.  A real-time executive should
-provide an application with the following capabilities:
-
-@itemize @bullet
-@item Data transfer between cooperating tasks
-@item Data transfer between tasks and ISRs
-@item Synchronization of cooperating tasks
-@item Synchronization of tasks and ISRs
-@end itemize
-
-Most RTEMS managers can be used to provide some form
-of communication and/or synchronization.  However, managers
-dedicated specifically to communication and synchronization
-provide well established mechanisms which directly map to the
-application's varying needs.  This level of flexibility allows
-the application designer to match the features of a particular
-manager with the complexity of communication and synchronization
-required.  The following managers were specifically designed for
-communication and synchronization:
-
-@itemize @bullet
-@item Semaphore
-@item Message Queue
-@item Event
-@item Signal
-@end itemize
-
-The semaphore manager supports mutual exclusion
-involving the synchronization of access to one or more shared
-user resources.  Binary semaphores may utilize the optional
-priority inheritance algorithm to avoid the problem of priority
-inversion.  The message manager supports both communication and
-synchronization, while the event manager primarily provides a
-high performance synchronization mechanism.  The signal manager
-supports only asynchronous communication and is typically used
-for exception handling.
-
-@section Time
-
-The development of responsive real-time applications
-requires an understanding of how RTEMS maintains and supports
-time-related operations.  The basic unit of time in RTEMS is
-known as a tick.  The frequency of clock ticks is completely
-application dependent and determines the granularity and
-accuracy of all interval and calendar time operations.
-
-By tracking time in units of ticks, RTEMS is capable
-of supporting interval timing functions such as task delays,
-timeouts, timeslicing, the delayed execution of timer service
-routines, and the rate monotonic scheduling of tasks.  An
-interval is defined as a number of ticks relative to the current
-time.  For example, when a task delays for an interval of ten
-ticks, it is implied that the task will not execute until ten
-clock ticks have occurred.
-
-A characteristic of interval timing is that the
-actual interval period may be a fraction of a tick less than the
-interval requested.  This occurs because the time at which the
-delay timer is set up occurs at some time between two clock
-ticks.  Therefore, the first countdown tick occurs in less than
-the complete time interval for a tick.  This can be a problem if
-the clock granularity is large.
-
-The rate monotonic scheduling algorithm is a hard
-real-time scheduling methodology.  This methodology provides
-rules which allows one to guarantee that a set of independent
-periodic tasks will always meet their deadlines -- even under
-transient overload conditions.  The rate monotonic manager
-provides directives built upon the Clock Manager's interval
-timer support routines.
-
-Interval timing is not sufficient for the many
-applications which require that time be kept in wall time or
-true calendar form.  Consequently, RTEMS maintains the current
-date and time.  This allows selected time operations to be
-scheduled at an actual calendar date and time.  For example, a
-task could request to delay until midnight on New Year's Eve
-before lowering the ball at Times Square.
-
-Obviously, the directives which use intervals or wall
-time cannot operate without some external mechanism which
-provides a periodic clock tick.  This clock tick is typically
-provided by a real time clock or counter/timer device.
-
-@section Memory Management
-
-RTEMS memory management facilities can be grouped
-into two classes: dynamic memory allocation and address
-translation.  Dynamic memory allocation is required by
-applications whose memory requirements vary through the
-application's course of execution.  Address translation is
-needed by applications which share memory with another CPU or an
-intelligent Input/Output processor.  The following RTEMS
-managers provide facilities to manage memory:
-
-@itemize @bullet
-@item Region
-
-@item Partition
-
-@item Dual Ported Memory
-@end itemize
-
-RTEMS memory management features allow an application
-to create simple memory pools of fixed size buffers and/or more
-complex memory pools of variable size segments.  The partition
-manager provides directives to manage and maintain pools of
-fixed size entities such as resource control blocks.
-Alternatively, the region manager provides a more general
-purpose memory allocation scheme that supports variable size
-blocks of memory which are dynamically obtained and freed by the
-application.  The dual-ported memory manager provides executive
-support for address translation between internal and external
-dual-ported RAM address space.
diff --git a/doc/user/conf.t b/doc/user/conf.t
deleted file mode 100644
index 35cd9f2d2f..0000000000
--- a/doc/user/conf.t
+++ /dev/null
@@ -1,966 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Configuring a System
-
-@section Configuration Table
-
-The RTEMS Configuration Table is used to tailor an
-application for its specific needs.  For example, the user can
-configure the number of device drivers or which APIs may be used.
-THe address of the user-defined Configuration Table is passed as an
-argument to the @code{@value{DIRPREFIX}initialize_executive}
-directive, which MUST be the first RTEMS directive called.  
-The RTEMS Configuration Table
-is defined in the following @value{LANGUAGE} @value{STRUCTURE}:
-
-@ifset is-C
-@example
-@group
-typedef struct @{
-  void                             *work_space_start;
-  rtems_unsigned32                  work_space_size;
-  rtems_unsigned32                  maximum_extensions;
-  rtems_unsigned32                  microseconds_per_tick;
-  rtems_unsigned32                  ticks_per_timeslice;
-  rtems_unsigned32                  maximum_devices;
-  rtems_unsigned32                  number_of_device_drivers;
-  rtems_driver_address_table       *Device_driver_table;
-  rtems_unsigned32                  number_of_initial_extensions;
-  rtems_extensions_table           *User_extension_table;
-  rtems_multiprocessing_table      *User_multiprocessing_table;
-  rtems_api_configuration_table    *RTEMS_api_configuration;
-  posix_api_configuration_table    *POSIX_api_configuration;
-@} rtems_configuration_table;
-@end group
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-type Configuration_Table is
-   record
-       Work_Space_Start             : RTEMS.Address;
-       Work_Space_Size              : RTEMS.Unsigned32;
-       Maximum_Extensions           : RTEMS.Unsigned32;
-       Microseconds_Per_Tick        : RTEMS.Unsigned32;
-       Ticks_Per_Timeslice          : RTEMS.Unsigned32;
-       Maximum_Devices              : RTEMS.Unsigned32;
-       Number_Of_Device_Drivers     : RTEMS.Unsigned32;
-       Device_Driver_Table          : RTEMS.Driver_Address_Table_Pointer;
-       Number_Of_Initial_Extensions : RTEMS.Unsigned32;
-       User_Extension_Table         : RTEMS.Extensions_Table_Pointer;
-       User_Multiprocessing_Table   : RTEMS.Multiprocessing_Table_Pointer;
-       RTEMS_API_Configuration      : RTEMS.API_Configuration_Table_Pointer;
-       POSIX_API_Configuration      :
-                       RTEMS.POSIX_API_Configuration_Table_Pointer;
-   end record;
-
-type Configuration_Table_Pointer is access all Configuration_Table;
-@end example
-@end ifset
-
-@table @b
-@item work_space_start
-is the address of the RTEMS RAM Workspace.  
-This area contains items such as the
-various object control blocks (TCBs, QCBs, ...) and task stacks.
-If the address is not aligned on a four-word boundary, then
-RTEMS will invoke the fatal error handler during
-@code{@value{DIRPREFIX}initialize_executive}.
-
-@item work_space_size
-is the calculated size of the
-RTEMS RAM Workspace.  The section Sizing the RTEMS RAM Workspace
-details how to arrive at this number.
-
-@item microseconds_per_tick
-is number of microseconds per clock tick.
-
-@item ticks_per_timeslice
-is the number of clock ticks for a timeslice.
-
-@item maximum_devices
-is the maximum number of devices that can be registered.
-
-@item number_of_device_drivers
-is the number of device drivers for the system.  There should be
-the same number of entries in the Device Driver Table.  If this field
-is zero, then the User_driver_address_table entry should be NULL.
-
-@item Device_driver_table
-is the address of the Device Driver Table.  This table contains the entry
-points for each device driver.  If the number_of_device_drivers field is zero,
-then this entry should be NULL. The format of this table will be
-discussed below.
-
-@item number_of_initial_extensions
-is the number of initial user extensions.  There should be
-the same number of entries as in the User_extension_table.  If this field
-is zero, then the User_driver_address_table entry should be NULL.
-
-@item User_extension_table
-is the address of the User
-Extension Table.  This table contains the entry points for the
-static set of optional user extensions.  If no user extensions
-are configured, then this entry should be NULL.  The format of
-this table will be discussed below.
-
-@item User_multiprocessing_table
-is the address of the Multiprocessor Configuration Table.  This
-table contains information needed by RTEMS only when used in a multiprocessor
-configuration.  This field must be NULL when RTEMS is used in a
-single processor configuration.
-
-@item RTEMS_api_configuration
-is the address of the RTEMS API Configuration Table.  This table
-contains information needed by the RTEMS API.  This field should be
-NULL if the RTEMS API is not used.  [NOTE: Currently the RTEMS API
-is required to support support components such as BSPs and libraries 
-which use this API.]
-
-@item POSIX_api_configuration
-is the address of the POSIX API Configuration Table.  This table
-contains information needed by the POSIX API.  This field should be
-NULL if the POSIX API is not used.
-
-@end table
-
-@section RTEMS API Configuration Table
-
-The RTEMS API Configuration Table is used to configure the 
-managers which constitute the RTEMS API for a particular application.  
-For example, the user can configure the maximum number of tasks for 
-this application. The RTEMS API Configuration Table is defined in 
-the following @value{LANGUAGE} @value{STRUCTURE}:
-
-@ifset is-C
-@example
-@group
-typedef struct @{
-  rtems_unsigned32                  maximum_tasks;
-  rtems_unsigned32                  maximum_timers;
-  rtems_unsigned32                  maximum_semaphores;
-  rtems_unsigned32                  maximum_message_queues;
-  rtems_unsigned32                  maximum_partitions;
-  rtems_unsigned32                  maximum_regions;
-  rtems_unsigned32                  maximum_ports;
-  rtems_unsigned32                  maximum_periods;
-  rtems_unsigned32                  number_of_initialization_tasks;
-  rtems_initialization_tasks_table *User_initialization_tasks_table;
-@} rtems_api_configuration_table;
-@end group
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-type API_Configuration_Table is
-   record
-      Maximum_Tasks                   : RTEMS.Unsigned32;
-      Maximum_Timers                  : RTEMS.Unsigned32;
-      Maximum_Semaphores              : RTEMS.Unsigned32;
-      Maximum_Message_queues          : RTEMS.Unsigned32;
-      Maximum_Partitions              : RTEMS.Unsigned32;
-      Maximum_Regions                 : RTEMS.Unsigned32;
-      Maximum_Ports                   : RTEMS.Unsigned32;
-      Maximum_Periods                 : RTEMS.Unsigned32;
-      Number_Of_Initialization_Tasks  : RTEMS.Unsigned32;
-      User_Initialization_Tasks_Table :
-                                RTEMS.Initialization_Tasks_Table_Pointer;
-   end record;
-
-type API_Configuration_Table_Pointer is access all API_Configuration_Table;
-@end example
-@end ifset
-
-@table @b
-@item maximum_tasks
-is the maximum number of tasks that
-can be concurrently active (created) in the system including
-initialization tasks.
-
-@item maximum_timers
-is the maximum number of timers
-that can be concurrently active in the system.
-
-@item maximum_semaphores
-is the maximum number of
-semaphores that can be concurrently active in the system.
-
-@item maximum_message_queues
-is the maximum number of
-message queues that can be concurrently active in the system.
-
-@item maximum_partitions
-is the maximum number of
-partitions that can be concurrently active in the system.
-
-@item maximum_regions
-is the maximum number of regions
-that can be concurrently active in the system.
-
-@item maximum_ports
-is the maximum number of ports into
-dual-port memory areas that can be concurrently active in the
-system.
-
-@item number_of_initialization_tasks
-is the number of initialization tasks configured.  At least one
-initialization task must be configured.
-
-@item User_initialization_tasks_table
-is the address of the Initialization Task Table. This table contains the
-information needed to create and start each of the
-initialization tasks.  The format of this table will be discussed below.
-
-@end table
-
-@section POSIX API Configuration Table
-
-The POSIX API Configuration Table is used to configure the
-managers which constitute the POSIX API for a particular application.
-For example, the user can configure the maximum number of threads for
-this application. The POSIX API Configuration Table is defined in
-the following @value{LANGUAGE} @value{STRUCTURE}:
- 
-@ifset is-C
-@example
-@group
-typedef struct @{
-  void       *(*thread_entry)(void *);
-@} posix_initialization_threads_table;
- 
-typedef struct @{
-  int                                 maximum_threads;
-  int                                 maximum_mutexes;
-  int                                 maximum_condition_variables;
-  int                                 maximum_keys;
-  int                                 maximum_queued_signals;
-  int                                 number_of_initialization_tasks;
-  posix_initialization_threads_table *User_initialization_tasks_table;
-@} posix_api_configuration_table;
-@end group
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-   type POSIX_Thread_Entry is access procedure (
-      Argument : in     RTEMS.Address
-   );
-
-   type POSIX_Initialization_Threads_Table_Entry is
-   record
-      Thread_Entry : RTEMS.POSIX_Thread_Entry;
-   end record;
-
-   type POSIX_Initialization_Threads_Table is array
-       ( RTEMS.Unsigned32 range <> ) of 
-       RTEMS.POSIX_Initialization_Threads_Table_Entry;
-
-   type POSIX_Initialization_Threads_Table_Pointer is access all
-       POSIX_Initialization_Threads_Table; 
-
-   type POSIX_API_Configuration_Table_Entry is
-      record
-         Maximum_Threads                 : Interfaces.C.Int;
-         Maximum_Mutexes                 : Interfaces.C.Int;
-         Maximum_Condition_Variables     : Interfaces.C.Int;
-         Maximum_Keys                    : Interfaces.C.Int;
-         Maximum_Queued_Signals          : Interfaces.C.Int;
-         Number_Of_Initialization_Tasks  : Interfaces.C.Int;
-         User_Initialization_Tasks_Table : 
-            RTEMS.POSIX_Initialization_Threads_Table_Pointer;
-      end record;
-
-   type POSIX_API_Configuration_Table is array ( RTEMS.Unsigned32 range <> ) of
-      RTEMS.POSIX_API_Configuration_Table_Entry;
-
-   type POSIX_API_Configuration_Table_Pointer is access all
-          RTEMS.POSIX_API_Configuration_Table;
-@end example
-@end ifset
- 
-@table @b
-@item maximum_threads
-is the maximum number of threads that
-can be concurrently active (created) in the system including
-initialization threads.
-
-@item maximum_mutexes
-is the maximum number of mutexes that can be concurrently 
-active in the system.
-
-@item maximum_condition_variables
-is the maximum number of condition variables that can be 
-concurrently active in the system.
-
-@item maximum_keys
-is the maximum number of keys that can be concurrently active in the system.
-
-@item maximum_queued_signals
-is the maximum number of queued signals that can be concurrently 
-pending in the system.
-
-@item number_of_initialization_threads
-is the number of initialization threads configured.  At least one
-initialization threads must be configured.
- 
-@item User_initialization_threads_table
-is the address of the Initialization Threads Table. This table contains the
-information needed to create and start each of the initialization threads.  
-The format of each entry in this table is defined in the 
-posix_initialization_threads_table @value{STRUCTURE}.
-
-@end table
-
-@section CPU Dependent Information Table
-
-The CPU Dependent Information Table is used to
-describe processor dependent information required by RTEMS.
-This table is generally used to supply RTEMS with information
-only known by the Board Support Package.  The contents of this
-table are discussed in the CPU Dependent Information Table
-chapter of the Applications Supplement document for a specific
-target processor.
-
-@section Initialization Task Table
-
-The Initialization Task Table is used to describe
-each of the user initialization tasks to the Initialization
-Manager.  The table contains one entry for each initialization
-task the user wishes to create and start.  The fields of this
-data structure directly correspond to arguments to the
-task_create and task_start directives.  The number of entries is
-found in the number_of_initialization_tasks entry in the
-Configuration Table.  The format of each entry in the
-Initialization Task Table is defined in the following @value{LANGUAGE}
-@value{STRUCTURE}:
-
-@ifset is-C
-@example
-typedef struct @{
-  rtems_name           name;
-  rtems_unsigned32     stack_size;
-  rtems_task_priority  initial_priority;
-  rtems_attribute      attribute_set;
-  rtems_task_entry     entry_point;
-  rtems_mode           mode_set;
-  rtems_task_argument  argument;
-@} rtems_initialization_tasks_table;
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-type Initialization_Tasks_Table_Entry is
-   record
-      Name             : RTEMS.Name;          -- task name
-      Stack_Size       : RTEMS.Unsigned32;    -- task stack size
-      Initial_Priority : RTEMS.Task_priority; -- task priority
-      Attribute_Set    : RTEMS.Attribute;     -- task attributes
-      Entry_Point      : RTEMS.Task_Entry;    -- task entry point
-      Mode_Set         : RTEMS.Mode;          -- task initial mode
-      Argument         : RTEMS.Unsigned32;    -- task argument
-   end record;
-
-type Initialization_Tasks_Table is array ( RTEMS.Unsigned32 range <> ) of
-  RTEMS.Initialization_Tasks_Table_Entry;
-
-type Initialization_Tasks_Table_Pointer is access all
-     Initialization_Tasks_Table;
-@end example
-@end ifset
-
-@table @b
-@item name
-is the name of this initialization task.
-
-@item stack_size
-is the size of the stack for this initialization task.
-
-@item initial_priority
-is the priority of this initialization task.
-
-@item attribute_set
-is the attribute set used during creation of this initialization task.
-
-@item entry_point
-is the address of the entry point of this initialization task.
-
-@item mode_set
-is the initial execution mode of this initialization task.
-
-@item argument
-is the initial argument for this initialization task.
-
-@end table
-
-A typical declaration for an Initialization Task Table might appear as follows:
-
-@ifset is-C
-@example
-rtems_initialization_tasks_table
-Initialization_tasks[2] = @{
-   @{ INIT_1_NAME,
-     1024,
-     1,
-     DEFAULT_ATTRIBUTES,
-     Init_1,
-     DEFAULT_MODES,
-     1
-
-   @},
-   @{ INIT_2_NAME,
-     1024,
-     250,
-     FLOATING_POINT,
-     Init_2,
-     NO_PREEMPT,
-     2
-
-   @}
-@};
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-Initialization_Tasks : aliased RTEMS.Initialization_Tasks_Table( 1 .. 2 ) := (
-   (INIT_1_NAME,
-    1024,
-    1,
-    RTEMS.Default_Attributes,
-    Init_1'Access,
-    RTEMS.Default_Modes,
-    1),
-   (INIT_2_NAME,
-    1024,
-    250,
-    RTEMS.Floating_Point,
-    Init_2'Access,
-    RTEMS.No_Preempt,
-    2)
-);
-@end example
-@end ifset
-
-@section Driver Address Table
-
-The Device Driver Table is used to inform the I/O
-Manager of the set of entry points for each device driver
-configured in the system.  The table contains one entry for each
-device driver required by the application.  The number of
-entries is defined in the number_of_device_drivers entry in the
-Configuration Table.  The format of each entry in the Device
-Driver Table is defined in 
-the following @value{LANGUAGE} @value{STRUCTURE}:
-
-@ifset is-C
-@example
-typedef struct @{
-  rtems_device_driver_entry initialization;
-  rtems_device_driver_entry open;
-  rtems_device_driver_entry close;
-  rtems_device_driver_entry read;
-  rtems_device_driver_entry write;
-  rtems_device_driver_entry control;
-@} rtems_driver_address_table;
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-type Driver_Address_Table_Entry is
-   record
-      Initialization : RTEMS.Device_Driver_Entry;
-      Open           : RTEMS.Device_Driver_Entry;
-      Close          : RTEMS.Device_Driver_Entry;
-      Read           : RTEMS.Device_Driver_Entry;
-      Write          : RTEMS.Device_Driver_Entry;
-      Control        : RTEMS.Device_Driver_Entry;
-   end record;
-
-type Driver_Address_Table is array ( RTEMS.Unsigned32 range <> ) of
-  RTEMS.Driver_Address_Table_Entry;
-
-type Driver_Address_Table_Pointer is access all Driver_Address_Table;
-@end example
-@end ifset
-
-@table @b
-@item initialization
-is the address of the entry point called by
-@code{@value{DIRPREFIX}io_initialize}
-to initialize a device driver and its associated devices.
-
-@item open
-is the address of the entry point called by @code{@value{DIRPREFIX}io_open}.
-
-@item close
-is the address of the entry point called by @code{@value{DIRPREFIX}io_close}.
-
-@item read
-is the address of the entry point called by @code{@value{DIRPREFIX}io_read}.
-
-@item write
-is the address of the entry point called by @code{@value{DIRPREFIX}io_write}.
-
-@item control
-is the address of the entry point called by @code{@value{DIRPREFIX}io_control}.
-
-@end table
-
-Driver entry points configured as NULL will always
-return a status code of @code{@value{RPREFIX}SUCCESSFUL}.  No user code will be
-executed in this situation.
-
-A typical declaration for a Device Driver Table might appear as follows:
-
-@ifset is-C
-@example
-rtems_driver_address_table Driver_table[2] = @{
-   @{ tty_initialize, tty_open,  tty_close,  /* major = 0 */
-     tty_read,       tty_write, tty_control
-   @},
-   @{ lp_initialize, lp_open,    lp_close,   /* major = 1 */
-     NULL,          lp_write,   lp_control
-   @}
-@};
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-@end example
-@end ifset
-
-More information regarding the construction and
-operation of device drivers is provided in the I/O Manager
-chapter.
-
-@section User Extensions Table
-
-The User Extensions Table is used to inform RTEMS of
-the optional user-supplied static extension set.  This table
-contains one entry for each possible extension.  The entries are
-called at critical times in the life of the system and
-individual tasks.  The application may create dynamic extensions
-in addition to this single static set.  The format of each entry
-in the User Extensions Table is defined in the following @value{LANGUAGE}
-@value{STRUCTURE}:
-
-@ifset is-C
-@example
-typedef User_extensions_routine                   rtems_extension;
-typedef User_extensions_thread_create_extension   rtems_task_create_extension;
-typedef User_extensions_thread_delete_extension   rtems_task_delete_extension;
-typedef User_extensions_thread_start_extension    rtems_task_start_extension;
-typedef User_extensions_thread_restart_extension  rtems_task_restart_extension;
-typedef User_extensions_thread_switch_extension   rtems_task_switch_extension;
-typedef User_extensions_thread_begin_extension    rtems_task_begin_extension;
-typedef User_extensions_thread_exitted_extension  rtems_task_exitted_extension;
-typedef User_extensions_fatal_extension           rtems_fatal_extension;
-
-typedef User_extensions_Table                     rtems_extensions_table;
-
-typedef struct @{
-  rtems_task_create_extension      thread_create;
-  rtems_task_start_extension       thread_start;
-  rtems_task_restart_extension     thread_restart;
-  rtems_task_delete_extension      thread_delete;
-  rtems_task_switch_extension      thread_switch;
-  rtems_task_post_switch_extension thread_post_switch;
-  rtems_task_begin_extension       thread_begin;
-  rtems_task_exitted_extension     thread_exitted;
-  rtems_fatal_extension            fatal;
-@} User_extensions_Table;
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-type Extensions_Table_Entry is
-   record
-      Thread_Create      : RTEMS.Thread_Create_Extension;
-      Thread_Start       : RTEMS.Thread_Start_Extension;
-      Thread_Restart     : RTEMS.Thread_Restart_Extension;
-      Thread_Delete      : RTEMS.Thread_Delete_Extension;
-      Thread_Switch      : RTEMS.Thread_Switch_Extension;
-      Thread_Post_Switch : RTEMS.Thread_Post_Switch_Extension;
-      Thread_Begin       : RTEMS.Thread_Begin_Extension;
-      Thread_Exitted     : RTEMS.Thread_Exitted_Extension;
-      Fatal            : RTEMS.Fatal_Error_Extension;
-   end record;
-@end example
-@end ifset
-
-@table @b
-
-@item thread_create
-is the address of the
-user-supplied subroutine for the TASK_CREATE extension.  If this
-extension for task creation is defined, it is called from the
-task_create directive.  A value of NULL indicates that no
-extension is provided.
-
-@item thread_start
-is the address of the user-supplied
-subroutine for the TASK_START extension.  If this extension for
-task initiation is defined, it is called from the task_start
-directive.  A value of NULL indicates that no extension is
-provided.
-
-@item thread_restart
-is the address of the user-supplied
-subroutine for the TASK_RESTART extension.  If this extension
-for task re-initiation is defined, it is called from the
-task_restart directive.  A value of NULL indicates that no
-extension is provided.
-
-@item thread_delete
-is the address of the user-supplied
-subroutine for the TASK_DELETE extension.  If this RTEMS
-extension for task deletion is defined, it is called from the
-task_delete directive.  A value of NULL indicates that no
-extension is provided.
-
-@item thread_switch
-is the address of the user-supplied
-subroutine for the task context switch extension.  This
-subroutine is called from RTEMS dispatcher after the current
-task has been swapped out but before the new task has been
-swapped in.  A value of NULL indicates that no extension is
-provided.  As this routine is invoked after saving the current
-task's context and before restoring the heir task's context, it
-is not necessary for this routine to save and restore any
-registers.
-
-@item thread_post_switch
-is the address of the
-user-supplied subroutine for the post task context switch
-extension.  This subroutine is called from RTEMS dispatcher in
-the context of the task which has just been swapped in.
-
-@item thread_begin
-is the address of the user-supplied
-subroutine which is invoked immediately before a task begins
-execution.  It is invoked in the context of the beginning task.
-A value of NULL indicates that no extension is provided.
-
-@item thread_exitted
-is the address of the user-supplied
-subroutine which is invoked when a task exits.  This procedure
-is responsible for some action which will allow the system to
-continue execution (i.e. delete or restart the task) or to
-terminate with a fatal error.  If this field is set to NULL, the
-default RTEMS TASK_EXITTED handler will be invoked.
-
-@item fatal
-is the address of the user-supplied
-subroutine for the FATAL extension.  This RTEMS extension of
-fatal error handling is called from the 
-@code{@value{DIRPREFIX}fatal_error_occurred}
-directive.  If the user's fatal error handler returns or if this
-entry is NULL then the default RTEMS fatal error handler will be
-executed.
-
-@end table
-
-A typical declaration for a User Extension Table
-which defines the TASK_CREATE, TASK_DELETE, TASK_SWITCH, and
-FATAL extension might appear as follows:
-
-@ifset is-C
-@example
-rtems_extensions_table User_extensions = @{
-   task_create_extension,
-   NULL,
-   NULL,
-   task_delete_extension,
-   task_switch_extension,
-   NULL,
-   NULL,
-   fatal_extension
-@};
-@end example
-@end ifset
-
-@ifset is-Ada
-User_Extensions : RTEMS.Extensions_Table := (
-   Task_Create_Extension'Access,
-   null,
-   null,
-   Task_Delete_Extension'Access,
-   Task_Switch_Extension'Access,
-   null,
-   null,
-   Fatal_Extension'Access
-);
-@example
-
-@end example
-@end ifset
-
-More information regarding the user extensions is
-provided in the User Extensions chapter.
-
-@section Multiprocessor Configuration Table
-
-The Multiprocessor Configuration Table contains
-information needed when using RTEMS in a multiprocessor
-configuration.  Many of the details associated with configuring
-a multiprocessor system are dependent on the multiprocessor
-communications layer provided by the user.  The address of the
-Multiprocessor Configuration Table should be placed in the
-User_multiprocessing_table entry in the primary Configuration
-Table.  Further details regarding many of the entries in the
-Multiprocessor Configuration Table will be provided in the
-Multiprocessing chapter.  The format of the Multiprocessor
-Configuration Table is defined in 
-the following @value{LANGUAGE} @value{STRUCTURE}:
-
-@ifset is-C
-@example
-typedef struct @{
-  rtems_unsigned32  node;
-  rtems_unsigned32  maximum_nodes;
-  rtems_unsigned32  maximum_global_objects;
-  rtems_unsigned32  maximum_proxies;
-  rtems_mpci_table *User_mpci_table;
-@} rtems_multiprocessing_table;
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-type Multiprocessing_Table is
-   record
-      Node                   : RTEMS.Unsigned32;
-      Maximum_Nodes          : RTEMS.Unsigned32;
-      Maximum_Global_Objects : RTEMS.Unsigned32;
-      Maximum_Proxies        : RTEMS.Unsigned32;
-      User_MPCI_Table        : RTEMS.MPCI_Table_Pointer;
-   end record;
-
-type Multiprocessing_Table_Pointer is access all Multiprocessing_Table;
-@end example
-@end ifset
-
-@table @b
-@item node
-is a unique processor identifier
-and is used in routing messages between nodes in a
-multiprocessor configuration.  Each processor must have a unique
-node number.  RTEMS assumes that node numbers start at one and
-increase sequentially.  This assumption can be used to advantage
-by the user-supplied MPCI layer.  Typically, this requirement is
-made when the node numbers are used to calculate the address of
-inter-processor communication links.  Zero should be avoided as
-a node number because some MPCI layers use node zero to
-represent broadcasted packets.  Thus, it is recommended that
-node numbers start at one and increase sequentially.
-
-@item maximum_nodes
-is the number of processor nodes in the system.
-
-@item maximum_global_objects
-is the maximum number of global objects which can exist at any
-given moment in the entire system.  If this parameter is not the
-same on all nodes in the system, then a fatal error is generated
-to inform the user that the system is inconsistent.
-
-@item maximum_proxies
-is the maximum number of proxies which can exist at any given moment
-on this particular node.  A proxy is a substitute task control block
-which represent a task residing on a remote node when that task blocks
-on a remote object.  Proxies are used in situations in which delayed
-interaction is required with a remote node.
-
-@item User_mpci_table
-is the address of the Multiprocessor Communications Interface
-Table.  This table contains the entry points of user-provided functions
-which constitute the multiprocessor communications layer.  This table
-must be provided in multiprocessor configurations with all
-entries configured.  The format of this table and details
-regarding its entries can be found in the next section.
-
-@end table
-
-@section Multiprocessor Communications Interface Table
-
-The format of this table is defined in 
-the following @value{LANGUAGE} @value{STRUCTURE}:
-
-@ifset is-C
-@example
-typedef struct @{
-  rtems_unsigned32                 default_timeout; /* in ticks */
-  rtems_unsigned32                 maximum_packet_size;
-  rtems_mpci_initialization_entry initialization;
-  rtems_mpci_get_packet_entry     get_packet;
-  rtems_mpci_return_packet_entry  return_packet;
-  rtems_mpci_send_entry           send;
-  rtems_mpci_receive_entry        receive;
-@} rtems_mpci_table;
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-type MPCI_Table is
-   record
-      Default_Timeout     : RTEMS.Unsigned32; -- in ticks
-      Maximum_Packet_Size : RTEMS.Unsigned32;
-      Initialization      : RTEMS.MPCI_Initialization_Entry;
-      Get_Packet          : RTEMS.MPCI_Get_Packet_Entry;
-      Return_Packet       : RTEMS.MPCI_Return_Packet_Entry;
-      Send                : RTEMS.MPCI_Send_Entry;
-      Receive             : RTEMS.MPCI_Receive_Entry;
-   end record;
-
-type MPCI_Table_Pointer is access all MPCI_Table;
-@end example
-@end ifset
-
-@table @b
-@item default_timeout
-is the default maximum length of time a task should block waiting for
-a response to a directive which results in communication with a remote node.
-The maximum length of time is a function the user supplied
-multiprocessor communications layer and the media used.  This
-timeout only applies to directives which would not block if the
-operation were performed locally.
-
-@item maximum_packet_size
-is the size in bytes of the longest packet which the MPCI layer is capable
-of sending.  This value should represent the total number of bytes available
-for a RTEMS interprocessor messages.
-
-@item initialization
-is the address of the entry point for the initialization procedure of the
-user supplied multiprocessor communications layer.
-
-@item get_packet
-is the address of the entry point for the procedure called by RTEMS to
-obtain a packet from the user supplied multiprocessor communications layer.
-
-@item return_packet
-is the address of the entry point for the procedure called by RTEMS to
-return a packet to the user supplied multiprocessor communications layer.
-
-@item send
-is the address of the entry point for the procedure called by RTEMS to
-send an envelope to another node.  This procedure is part of the user
-supplied multiprocessor communications layer.
-
-@item receive
-is the address of the entry point for the
-procedure called by RTEMS to retrieve an envelope containing a
-message from another node.  This procedure is part of the user
-supplied multiprocessor communications layer.
-
-@end table
-
-More information regarding the required functionality of these
-entry points is provided in the Multiprocessor chapter.
-
-@section Determining Memory Requirements
-
-Since memory is a critical resource in many real-time
-embedded systems, RTEMS was specifically designed to allow
-unused managers to be excluded from the run-time environment.
-This allows the application designer the flexibility to tailor
-RTEMS to most efficiently meet system requirements while still
-satisfying even the most stringent memory constraints.  As
-result, the size of the RTEMS executive is application
-dependent.  A Memory Requirements worksheet is provided in the
-Applications Supplement document for a specific target
-processor.  This worksheet can be used to calculate the memory
-requirements of a custom RTEMS run-time environment.  To insure
-that enough memory is allocated for future versions of RTEMS,
-the application designer should round these memory requirements
-up.  The following managers may be optionally excluded:
-
-@itemize @bullet
-@item signal
-@item region
-@item dual ported memory
-@item event
-@item multiprocessing
-@item partition
-@item timer
-@item semaphore
-@item message
-@item rate monotonic
-@end itemize
-
-RTEMS based applications must somehow provide memory
-for RTEMS' code and data space.  Although RTEMS' data space must
-be in RAM, its code space can be located in either ROM or RAM.
-In addition, the user must allocate RAM for the RTEMS RAM
-Workspace.  The size of this area is application dependent and
-can be calculated using the formula provided in the Memory
-Requirements chapter of the Applications Supplement document
-for a specific target processor.
-
-All RTEMS data variables and routine names used by
-RTEMS begin with the underscore ( _ ) character followed by an
-upper-case letter.  If RTEMS is linked with an application, then
-the application code should NOT contain any symbols which begin
-with the underscore character and followed by an upper-case
-letter to avoid any naming conflicts.  All RTEMS directive names
-should be treated as reserved words.
-
-@section Sizing the RTEMS RAM Workspace
-
-The RTEMS RAM Workspace is a user-specified block of
-memory reserved for use by RTEMS.  The application should NOT
-modify this memory.  This area consists primarily of the RTEMS
-data structures whose exact size depends upon the values
-specified in the Configuration Table.  In addition, task stacks
-and floating point context areas are dynamically allocated from
-the RTEMS RAM Workspace.
-
-The starting address of the RTEMS RAM Workspace must
-be aligned on a four-byte boundary.  Failure to properly align
-the workspace area will result in the 
-@code{@value{DIRPREFIX}fatal_error_occurred}
-directive being invoked with the
-@code{@value{RPREFIX}INVALID_ADDRESS} error code.
-
-A worksheet is provided in the Memory Requirements
-chapter of the Applications Supplement document for a specific
-target processor to assist the user in calculating the minimum
-size of the RTEMS RAM Workspace for each application.  The value
-calculated with this worksheet is the minimum value that should
-be specified as the work_space_size parameter of the
-Configuration Table.  The user is cautioned that future versions
-of RTEMS may not have the same memory requirements per object.
-Although the value calculated is sufficient for a particular
-target processor and release of RTEMS, memory usage is subject
-to change across versions and target processors.  The user is
-advised to allocate somewhat more memory than the worksheet
-recommends to insure compatibility with future releases for a
-specific target processor and other target processors.  To avoid
-problems, the user should recalculate the memory requirements
-each time one of the following events occurs:
-
-@itemize @bullet
-@item a configuration parameter is modified,
-@item task or interrupt stack requirements change,
-@item task floating point attribute is altered,
-@item RTEMS is upgraded, or
-@item the target processor is changed.
-@end itemize
-
-Failure to provide enough space in the RTEMS RAM
-Workspace will result in the 
-@code{@value{DIRPREFIX}fatal_error_occurred} directive
-being invoked with the appropriate error code.
diff --git a/doc/user/dirstat.texi b/doc/user/dirstat.texi
deleted file mode 100644
index 1f447e31fe..0000000000
--- a/doc/user/dirstat.texi
+++ /dev/null
@@ -1,42 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@ifinfo
-@node Directive Status Codes, Example Application, Multiprocessing Manager MULTIPROCESSING_ANNOUNCE - Announce the arrival of a packet, Top
-@end ifinfo
-@chapter Directive Status Codes
-@table @b
-@item @code{@value{RPREFIX}SUCCESSFUL} - successful completion
-@item @code{@value{RPREFIX}TASK_EXITTED} - returned from a task
-@item @code{@value{RPREFIX}MP_NOT_CONFIGURED} - multiprocessing not configured
-@item @code{@value{RPREFIX}INVALID_NAME} - invalid object name
-@item @code{@value{RPREFIX}INVALID_ID} - invalid object id
-@item @code{@value{RPREFIX}TOO_MANY} - too many
-@item @code{@value{RPREFIX}TIMEOUT} - timed out waiting
-@item @code{@value{RPREFIX}OBJECT_WAS_DELETED} - object was deleted while waiting
-@item @code{@value{RPREFIX}INVALID_SIZE} - invalid specified size
-@item @code{@value{RPREFIX}INVALID_ADDRESS} - invalid address specified
-@item @code{@value{RPREFIX}INVALID_NUMBER} - number was invalid
-@item @code{@value{RPREFIX}NOT_DEFINED} - item not initialized
-@item @code{@value{RPREFIX}RESOURCE_IN_USE} - resources outstanding
-@item @code{@value{RPREFIX}UNSATISFIED} - request not satisfied
-@item @code{@value{RPREFIX}INCORRECT_STATE} - task is in wrong state
-@item @code{@value{RPREFIX}ALREADY_SUSPENDED} - task already in state
-@item @code{@value{RPREFIX}ILLEGAL_ON_SELF} - illegal for calling task
-@item @code{@value{RPREFIX}ILLEGAL_ON_REMOTE_OBJECT} - illegal for remote object
-@item @code{@value{RPREFIX}CALLED_FROM_ISR} - invalid environment
-@item @code{@value{RPREFIX}INVALID_PRIORITY} - invalid task priority
-@item @code{@value{RPREFIX}INVALID_CLOCK} - invalid time buffer
-@item @code{@value{RPREFIX}INVALID_NODE} - invalid node id
-@item @code{@value{RPREFIX}NOT_CONFIGURED} - directive not configured
-@item @code{@value{RPREFIX}NOT_OWNER_OF_RESOURCE} - not owner of resource
-@item @code{@value{RPREFIX}NOT_IMPLEMENTED} - directive not implemented
-@item @code{@value{RPREFIX}INTERNAL_ERROR} - RTEMS inconsistency detected
-@item @code{@value{RPREFIX}NO_MEMORY} - could not get enough memory
-@end table
-
diff --git a/doc/user/dpmem.t b/doc/user/dpmem.t
deleted file mode 100644
index 8d01469363..0000000000
--- a/doc/user/dpmem.t
+++ /dev/null
@@ -1,327 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Dual-Ported Memory Manager
-
-@section Introduction
-
-The dual-ported memory manager provides a mechanism
-for converting addresses between internal and external
-representations for multiple dual-ported memory areas (DPMA).
-The directives provided by the dual-ported memory manager are:
-
-@itemize @bullet
-@item @code{@value{DIRPREFIX}port_create} - Create a port
-@item @code{@value{DIRPREFIX}port_ident} - Get ID of a port
-@item @code{@value{DIRPREFIX}port_delete} - Delete a port
-@item @code{@value{DIRPREFIX}port_external_to_internal} - Convert external to internal address
-@item @code{@value{DIRPREFIX}port_internal_to_external} - Convert internal to external address
-@end itemize
-
-@section Background
-
-A dual-ported memory area (DPMA) is an contiguous
-block of RAM owned by a particular processor but which can be
-accessed by other processors in the system.  The owner accesses
-the memory using internal addresses, while other processors must
-use external addresses.  RTEMS defines a port as a particular
-mapping of internal and external addresses.
-
-There are two system configurations in which
-dual-ported memory is commonly found.  The first is
-tightly-coupled multiprocessor computer systems where the
-dual-ported memory is shared between all nodes and is used for
-inter-node communication.  The second configuration is computer
-systems with intelligent peripheral controllers.  These
-controllers typically utilize the DPMA for high-performance data
-transfers.
-
-@section Operations
-
-@subsection Creating a Port
-
-The @code{@value{DIRPREFIX}port_create} directive creates a port into a DPMA
-with the user-defined name.  The user specifies the association
-between internal and external representations for the port being
-created.  RTEMS allocates a Dual-Ported Memory Control Block
-(DPCB) from the DPCB free list to maintain the newly created
-DPMA.  RTEMS also generates a unique dual-ported memory port ID
-which is returned to the calling task.  RTEMS does not
-initialize the dual-ported memory area or access any memory
-within it.
-
-@subsection Obtaining Port IDs
-
-When a port is created, RTEMS generates a unique port
-ID and assigns it to the created port until it is deleted.  The
-port ID may be obtained by either of two methods.  First, as the
-result of an invocation of the
-@code{@value{DIRPREFIX}port_create} directive, the task
-ID is stored in a user provided location.  Second, the port ID
-may be obtained later using the
-@code{@value{DIRPREFIX}port_ident} directive.  The port
-ID is used by other dual-ported memory manager directives to
-access this port.
-
-@subsection Converting an Address
-
-The @code{@value{DIRPREFIX}port_external_to_internal} directive is used to
-convert an address from external to internal representation for
-the specified port.  
-The @code{@value{DIRPREFIX}port_internal_to_external} directive is
-used to convert an address from internal to external
-representation for the specified port.  If an attempt is made to
-convert an address which lies outside the specified DPMA, then
-the address to be converted will be returned.
-
-@subsection Deleting a DPMA Port
-
-A port can be removed from the system and returned to
-RTEMS with the @code{@value{DIRPREFIX}port_delete} directive.  When a port is deleted,
-its control block is returned to the DPCB free list.
-
-@section Directives
-
-This section details the dual-ported memory manager's
-directives.  A subsection is dedicated to each of this manager's
-directives and describes the calling sequence, related
-constants, usage, and status codes.
-
-@page
-@subsection PORT_CREATE - Create a port
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_port_create
-@example
-rtems_status_code rtems_port_create(
-  rtems_name        name,
-  void             *internal_start,
-  void             *external_start,
-  rtems_unsigned32  length,
-  rtems_id         *id
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure Port_Create (
-   Name           : in     RTEMS.Name;
-   Internal_Start : in     RTEMS.Address;
-   External_Start : in     RTEMS.Address;
-   Length         : in     RTEMS.Unsigned32;
-   ID             :    out RTEMS.ID;
-   Result         :    out RTEMS.Status_Codes
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-@code{@value{RPREFIX}SUCCESSFUL} - port created successfully@*
-@code{@value{RPREFIX}INVALID_NAME} - invalid task name@*
-@code{@value{RPREFIX}INVALID_ADDRESS} - address not on four byte boundary@*
-@code{@value{RPREFIX}TOO_MANY} - too many DP memory areas created
-
-@subheading DESCRIPTION:
-
-This directive creates a port which resides on the
-local node for the specified DPMA.  The assigned port id is
-returned in id.  This port id is used as an argument to other
-dual-ported memory manager directives to convert addresses
-within this DPMA.
-
-For control and maintenance of the port, RTEMS
-allocates and initializes an DPCB from the DPCB free pool.  Thus
-memory from the dual-ported memory area is not used to store the
-DPCB.
-
-@subheading NOTES:
-
-The internal_address and external_address parameters
-must be on a four byte boundary.
-
-This directive will not cause the calling task to be
-preempted.
-
-@page
-@subsection PORT_IDENT - Get ID of a port
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_port_ident
-@example
-rtems_status_code rtems_port_ident(
-  rtems_name  name,
-  rtems_id   *id
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure Port_Ident (
-   Name   : in     RTEMS.Name;
-   ID     :    out RTEMS.ID;
-   Result :    out RTEMS.Status_Codes
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-@code{@value{RPREFIX}SUCCESSFUL} - port identified successfully@*
-@code{@value{RPREFIX}INVALID_NAME} - port name not found
-
-@subheading DESCRIPTION:
-
-This directive obtains the port id associated with
-the specified name to be acquired.  If the port name is not
-unique, then the port id will match one of the DPMAs with that
-name.  However, this port id is not guaranteed to correspond to
-the desired DPMA.  The port id is used to access this DPMA in
-other dual-ported memory area related directives.
-
-@subheading NOTES:
-
-This directive will not cause the running task to be
-preempted.
-
-@page
-@subsection PORT_DELETE - Delete a port
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_port_delete
-@example
-rtems_status_code rtems_port_delete(
-  rtems_id id
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure Port_Delete (
-   ID     : in     RTEMS.ID;
-   Result :    out RTEMS.Status_Codes
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-@code{@value{RPREFIX}SUCCESSFUL} - port deleted successfully@*
-@code{@value{RPREFIX}INVALID_ID} - invalid port id
-
-@subheading DESCRIPTION:
-
-This directive deletes the dual-ported memory area
-specified by id.  The DPCB for the deleted dual-ported memory
-area is reclaimed by RTEMS.
-
-@subheading NOTES:
-
-This directive will not cause the calling task to be
-preempted.
-
-The calling task does not have to be the task that
-created the port.  Any local task that knows the port id can
-delete the port.
-
-@page
-@subsection PORT_EXTERNAL_TO_INTERNAL - Convert external to internal address
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_port_external_to_internal
-@example
-rtems_status_code rtems_port_external_to_internal(
-  rtems_id   id,
-  void      *external,
-  void     **internal
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure Port_External_To_Internal (
-   ID       : in     RTEMS.ID;
-   External : in     RTEMS.Address;
-   Internal :    out RTEMS.Address;
-   Result   :    out RTEMS.Status_Codes
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-@code{@value{RPREFIX}SUCCESSFUL} -  always successful
-
-@subheading DESCRIPTION:
-
-This directive converts a dual-ported memory address
-from external to internal representation for the specified port.
-If the given external address is invalid for the specified
-port, then the internal address is set to the given external
-address.
-
-@subheading NOTES:
-
-This directive is callable from an ISR.
-
-This directive will not cause the calling task to be
-preempted.
-
-@page
-@subsection PORT_INTERNAL_TO_EXTERNAL - Convert internal to external address
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_port_internal_to_external
-@example
-rtems_status_code rtems_port_internal_to_external(
-  rtems_id   id,
-  void      *internal,
-  void     **external
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure Port_Internal_To_External (
-   ID       : in     RTEMS.ID;
-   Internal : in     RTEMS.Address;
-   External :    out RTEMS.Address;
-   Result   :    out RTEMS.Status_Codes
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-@code{@value{RPREFIX}SUCCESSFUL} -  always successful
-
-@subheading DESCRIPTION:
-
-This directive converts a dual-ported memory address
-from internal to external representation so that it can be
-passed to owner of the DPMA represented by the specified port.
-If the given internal address is an invalid dual-ported address,
-then the external address is set to the given internal address.
-
-@subheading NOTES:
-
-This directive is callable from an ISR.
-
-This directive will not cause the calling task to be
-preempted.
-
diff --git a/doc/user/event.t b/doc/user/event.t
deleted file mode 100644
index 6eb3266373..0000000000
--- a/doc/user/event.t
+++ /dev/null
@@ -1,320 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Event Manager
-
-@section Introduction
-
-The event manager provides a high performance method
-of intertask communication and synchronization.  The directives
-provided by the event manager are:
-
-@itemize @bullet
-@item @code{@value{DIRPREFIX}event_send} - Send event set to a task
-@item @code{@value{DIRPREFIX}event_receive} - Receive event condition
-@end itemize
-
-@section Background
-
-@subsection Event Sets
-
-An event flag is used by a task (or ISR) to inform
-another task of the occurrence of a significant situation.
-Thirty-two event flags are associated with each task.  A
-collection of one or more event flags is referred to as an event
-set.  The application developer should remember the following
-key characteristics of event operations when utilizing the event
-manager:
-
-@itemize @bullet
-@item Events provide a simple synchronization facility.
-
-@item Events are aimed at tasks.
-
-@item Tasks can wait on more than one event simultaneously.
-
-@item Events are independent of one another.
-
-@item Events do not hold or transport data.
-
-@item Events are not queued.  In other words, if an event is
-sent more than once to a task before being received, the second and
-subsequent send operations to that same task have no effect.  
-@end itemize
-
-An event set is posted when it is directed (or sent) to a task.  A
-pending event is an event that has been posted but not received.  An event
-condition is used to specify the events which the task desires to receive
-and the algorithm which will be used to determine when the request is
-satisfied. An event condition is satisfied based upon one of two
-algorithms which are selected by the user.  The
-@code{@value{RPREFIX}EVENT_ANY} algorithm states that an event condition
-is satisfied when at least a single requested event is posted.  The
-@code{@value{RPREFIX}EVENT_ALL} algorithm states that an event condition
-is satisfied when every requested event is posted.
-
-@subsection Building an Event Set or Condition
-
-An event set or condition is built by a bitwise OR of
-the desired events.  The set of valid events is @code{@value{RPREFIX}EVENT_0} through
-@code{@value{RPREFIX}EVENT_31}.  If an event is not explicitly specified in the set or
-condition, then it is not present.  Events are specifically
-designed to be mutually exclusive, therefore bitwise OR and
-addition operations are equivalent as long as each event appears
-exactly once in the event set list.
-
-For example, when sending the event set consisting of
-@code{@value{RPREFIX}EVENT_6}, @code{@value{RPREFIX}EVENT_15}, and @code{@value{RPREFIX}EVENT_31},
-the event parameter to the @code{@value{DIRPREFIX}event_send}
-directive should be @code{@value{RPREFIX}EVENT_6 @value{OR}
-@value{RPREFIX}EVENT_15 @value{OR} @value{RPREFIX}EVENT_31}.
-
-@subsection Building an EVENT_RECEIVE Option Set
-
-In general, an option is built by a bitwise OR of the
-desired option components.  The set of valid options for the
-@code{@value{DIRPREFIX}event_receive} directive are listed
-in the following table:
-
-@itemize @bullet
-@item @code{@value{RPREFIX}WAIT} - task will wait for event (default)
-@item @code{@value{RPREFIX}NO_WAIT} - task should not wait
-@item @code{@value{RPREFIX}EVENT_ALL} - return after all events (default)
-@item @code{@value{RPREFIX}EVENT_ANY} - return after any events
-@end itemize
-
-Option values are specifically designed to be
-mutually exclusive, therefore bitwise OR and addition operations
-are equivalent as long as each option appears exactly once in
-the component list.  An option listed as a default is not
-required to appear in the option list, although it is a good
-programming practice to specify default options.  If all
-defaults are desired, the option @code{@value{RPREFIX}DEFAULT_OPTIONS} should be
-specified on this call.
-
-This example demonstrates the option parameter needed
-to poll for all events in a particular event condition to
-arrive.  The option parameter passed to the
-@code{@value{DIRPREFIX}event_receive} directive should be either
-@code{@value{RPREFIX}EVENT_ALL @value{OR} @value{RPREFIX}NO_WAIT}
-or @code{@value{RPREFIX}NO_WAIT}.  The option parameter can be set to
-@code{@value{RPREFIX}NO_WAIT} because @code{@value{RPREFIX}EVENT_ALL} is the
-default condition for @code{@value{DIRPREFIX}event_receive}.
-
-@section Operations
-
-@subsection Sending an Event Set
-
-The @code{@value{DIRPREFIX}event_send} directive allows a task (or an ISR) to
-direct an event set to a target task.  Based upon the state of
-the target task, one of the following situations applies:
-
-@itemize @bullet
-@item Target Task is Blocked Waiting for Events
-
-@itemize -
-
-@item If the waiting task's input event condition is
-satisfied, then the task is made ready for execution.
-
-@item If the waiting task's input event condition is not
-satisfied, then the event set is posted but left pending and the
-task remains blocked.
-
-@end itemize
-
-@item Target Task is Not Waiting for Events
-
-@itemize -
-@item The event set is posted and left pending.
-@end itemize
-
-@end itemize
-
-@subsection Receiving an Event Set
-
-The @code{@value{DIRPREFIX}event_receive} directive is used by tasks to
-accept a specific input event condition.  The task also
-specifies whether the request is satisfied when all requested
-events are available or any single requested event is available.
-If the requested event condition is satisfied by pending
-events, then a successful return code and the satisfying event
-set are returned immediately.  If the condition is not
-satisfied, then one of the following situations applies:
-
-@itemize @bullet
-@item By default, the calling task will wait forever for the
-event condition to be satisfied.
-
-@item Specifying the @code{@value{RPREFIX}NO_WAIT} option forces an immediate return
-with an error status code.
-
-@item Specifying a timeout limits the period the task will
-wait before returning with an error status code.
-@end itemize
-
-@subsection Determining the Pending Event Set
-
-A task can determine the pending event set by calling
-the @code{@value{DIRPREFIX}event_receive} directive with a value of
-@code{@value{RPREFIX}PENDING_EVENTS} for the input event condition.  
-The pending events are returned to the calling task but the event
-set is left unaltered.
-
-@subsection Receiving all Pending Events
-
-A task can receive all of the currently pending
-events by calling the @code{@value{DIRPREFIX}event_receive}
-directive with a value of @code{@value{RPREFIX}ALL_EVENTS}
-for the input event condition and
-@code{@value{RPREFIX}NO_WAIT @value{OR} @value{RPREFIX}EVENT_ANY}
-for the option set.  The pending events are returned to the
-calling task and the event set is cleared.  If no events are
-pending then the @code{@value{RPREFIX}UNSATISFIED} status code will be returned.
-
-@section Directives
-
-This section details the event manager's directives.
-A subsection is dedicated to each of this manager's directives
-and describes the calling sequence, related constants, usage,
-and status codes.
-
-@page
-@subsection EVENT_SEND - Send event set to a task
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_event_send
-@example
-rtems_status_code rtems_event_send (
-  rtems_id         id,
-  rtems_event_set  event_in
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure Event_Send (
-   ID       : in     RTEMS.ID;
-   Event_In : in     RTEMS.Event_Set;
-   Result   :    out RTEMS.Status_Codes
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-@code{@value{RPREFIX}SUCCESSFUL} - event set sent successfully@*
-@code{@value{RPREFIX}INVALID_ID} - invalid task id
-
-@subheading DESCRIPTION:
-
-This directive sends an event set, event_in, to the
-task specified by id.  If a blocked task's input event condition
-is satisfied by this directive, then it will be made ready.  If
-its input event condition is not satisfied, then the events
-satisfied are updated and the events not satisfied are left
-pending.  If the task specified by id is not blocked waiting for
-events, then the events sent are left pending.
-
-@subheading NOTES:
-
-Specifying @code{@value{RPREFIX}SELF} for id results in the event set being
-sent to the calling task.
-
-Identical events sent to a task are not queued.  In
-other words, the second, and subsequent, posting of an event to
-a task before it can perform an @code{@value{DIRPREFIX}event_receive}
-has no effect.
-
-The calling task will be preempted if it has
-preemption enabled and a higher priority task is unblocked as
-the result of this directive.
-
-Sending an event set to a global task which does not
-reside on the local node will generate a request telling the
-remote node to send the event set to the appropriate task.
-
-@page
-@subsection EVENT_RECEIVE - Receive event condition
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_event_receive
-@example 
-rtems_status_code rtems_event_receive (
-  rtems_event_set  event_in,
-  rtems_option     option_set,
-  rtems_interval   ticks,
-  rtems_event_set *event_out
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure Event_Receive (
-   Event_In   : in     RTEMS.Event_Set;
-   Option_Set : in     RTEMS.Option;
-   Ticks      : in     RTEMS.Interval;
-   Event_Out  :    out RTEMS.Event_Set;
-   Result     :    out RTEMS.Status_Codes
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-@code{@value{RPREFIX}SUCCESSFUL} - event received successfully@*
-@code{@value{RPREFIX}UNSATISFIED} - input event not satisfied (@code{@value{RPREFIX}NO_WAIT})@*
-@code{@value{RPREFIX}TIMEOUT} - timed out waiting for event
-
-@subheading DESCRIPTION:
-
-This directive attempts to receive the event
-condition specified in event_in.  If event_in is set to
-@code{@value{RPREFIX}PENDING_EVENTS}, then the current pending events are returned in
-event_out and left pending.  The @code{@value{RPREFIX}WAIT} and @code{@value{RPREFIX}NO_WAIT} options in the
-option_set parameter are used to specify whether or not the task
-is willing to wait for the event condition to be satisfied.
-@code{@value{RPREFIX}EVENT_ANY} and @code{@value{RPREFIX}EVENT_ALL} are used in the option_set parameter are
-used to specify whether a single event or the complete event set
-is necessary to satisfy the event condition.  The event_out
-parameter is returned to the calling task with the value that
-corresponds to the events in event_in that were satisfied.
-
-If pending events satisfy the event condition, then
-event_out is set to the satisfied events and the pending events
-in the event condition are cleared.  If the event condition is
-not satisfied and @code{@value{RPREFIX}NO_WAIT} is specified, then event_out is set to
-the currently satisfied events.  If the calling task chooses to
-wait, then it will block waiting for the event condition.
-
-If the calling task must wait for the event condition
-to be satisfied, then the timeout parameter is used to specify
-the maximum interval to wait.  If it is set to @code{@value{RPREFIX}NO_TIMEOUT}, then
-the calling task will wait forever.
-
-@subheading NOTES:
-
-This directive only affects the events specified in
-event_in.  Any pending events that do not correspond to any of
-the events specified in event_in will be left pending.
-
-The following event receive option constants are defined by
-RTEMS:
-
-@itemize @bullet
-@item @code{@value{RPREFIX}WAIT} 	task will wait for event (default)
-@item @code{@value{RPREFIX}NO_WAIT} 	task should not wait
-@item @code{@value{RPREFIX}EVENT_ALL} 	return after all events (default)
-@item @code{@value{RPREFIX}EVENT_ANY} 	return after any events
-@end itemize
-
-A clock tick is required to support the functionality of this directive.
diff --git a/doc/user/example.texi b/doc/user/example.texi
deleted file mode 100644
index 683777511d..0000000000
--- a/doc/user/example.texi
+++ /dev/null
@@ -1,105 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@ifinfo
-@node Example Application, Glossary, Directive Status Codes, Top
-@end ifinfo
-@chapter Example Application
-
-@example
-/*  example.c
- *
- *  This file contains an example of a simple RTEMS
- *  application.  It contains a Configuration Table, a
- *  user initialization task, and a simple task.
- *
- *  This example assumes that a board support package exists
- *  and invokes the initialize_executive() directive.
- */
-
-#include "rtems.h"
-
-rtems_task init_task();
-
-#define INIT_NAME      rtems_build_name( 'A', 'B', 'C', ' ' ' )
-
-rtems_initialization_tasks_table init_task = @{
-  @{ INIT_NAME,          /* init task name  "ABC" */
-    1024,               /* init task stack size */
-    1,                  /* init task priority */
-    DEFAULT_ATTRIBUTES, /* init task attributes */
-    init_task,          /* init task entry point */
-    TIMESLICE,          /* init task initial mode */
-    0                   /* init task argument */
-  @}
-@};
-
-rtems_configuration_table User_Configuration_Table = @{
-  NULL,                 /* filled in by the BSP */
-  65536,                /* executive RAM size */
-  2,                    /* maximum tasks */
-  0,                    /* maximum timers */
-  0,                    /* maximum semaphores */
-  0,                    /* maximum message queues */
-  0,                    /* maximum messages */
-  0,                    /* maximum partitions */
-  0,                    /* maximum regions */
-  0,                    /* maximum ports */
-  0,                    /* maximum periods */
-  0,                    /* maximum extensions */
-  RTEMS_MILLISECONDS_TO_MICROSECONDS(10), /* number of ms in a tick */
-  1,                    /* num of ticks in a timeslice  */
-  1,                    /* number of user init tasks    */
-  init_task_tbl,        /* user init task(s) table      */
-  0,                    /* number of device drivers     */
-  NULL,                 /* ptr to driver address table  */
-  NULL,                 /* ptr to extension table */
-  NULL                  /* ptr to MP config table */
-@};
-
-task user_application(
-  rtems_task_argument ignored
-);
-
-#define USER_APP_NAME  1  /* any 32-bit name; unique helps */
-
-rtems_task init_task(
-  rtems_task_argument ignored
-)
-@{
-  rtems_id tid;
-
-  /* example assumes SUCCESSFUL return value */
-
-  (void) rtems_task_create( USER_APP_NAME, 1, 1024,
-                        RTEMS_NO_PREEMPT, RTEMS_FLOATING_POINT, &tid );
-  (void) rtems_task_start( tid, user_application, 0 );
-  (void) rtems_task_delete( SELF );
-@}
-
-
-
-rtems_task user_application()
-
-@{
-  /* application specific initialization goes here */
-
-  while ( 1 )  @{              /* infinite loop */
-
-    /*  APPLICATION CODE GOES HERE
-     *
-     *  This code will typically include at least one
-     *  directive which causes the calling task to
-     *  give up the processor.
-     */
-  @}
-@}
-@end example
-
-
-
diff --git a/doc/user/fatal.t b/doc/user/fatal.t
deleted file mode 100644
index b39de2269c..0000000000
--- a/doc/user/fatal.t
+++ /dev/null
@@ -1,158 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Fatal Error Manager
-
-@section Introduction
-
-The fatal error manager processes all fatal or
-irrecoverable errors.  The directive provided by the fatal error
-manager is:
-
-@itemize @bullet
-@item @code{@value{DIRPREFIX}fatal_error_occurred} - Invoke the fatal error handler
-@end itemize
-
-@section Background
-
-The fatal error manager is called upon detection of
-an irrecoverable error condition by either RTEMS or the
-application software.  Fatal errors can be detected from three
-sources:
-
-@itemize @bullet
-@item the executive (RTEMS)
-@item user system code
-@item user application code
-@end itemize
-
-RTEMS automatically invokes the fatal error manager
-upon detection of an error it considers to be fatal.  Similarly,
-the user should invoke the fatal error manager upon detection of
-a fatal error.
-
-Each status or dynamic user extension set may include
-a fatal error handler.  The fatal error handler in the static
-extension set can be used to provide access to debuggers and
-monitors which may be present on the target hardware.  If any
-user-supplied fatal error handlers are installed, the fatal
-error manager will invoke them.  If no user handlers are
-configured or if all the user handler return control to the
-fatal error manager, then the RTEMS default fatal error handler
-is invoked.  If the default fatal error handler is invoked, then
-the system state is marked as failed.
-
-Although the precise behavior of the default fatal
-error handler is processor specific, in general, it will disable
-all maskable interrupts, place the error code in a known
-processor dependent place (generally either on the stack or in a
-register), and halt the processor.  The precise actions of the
-RTEMS fatal error are discussed in the Default Fatal Error
-Processing chapter of the Applications Supplement document for
-a specific target processor.
-
-@section Operations
-
-@subsection Announcing a Fatal Error
-
-The @code{@value{DIRPREFIX}fatal_error_occurred} directive is invoked when a
-fatal error is detected.  Before invoking any user-supplied
-fatal error handlers or the RTEMS fatal error handler, the
-@code{@value{DIRPREFIX}fatal_error_occurred}
-directive stores useful information in the
-variable @code{_Internal_errors_What_happened}.  This @value{STRUCTURE}
-contains three pieces of information:
-
-@itemize @bullet
-@item the source of the error (API or executive core),
-
-@item whether the error was generated internally by the
-executive, and a
-
-@item a numeric code to indicate the error type.
-@end itemize
-
-The error type indicator is dependent on the source
-of the error and whether or not the error was internally
-generated by the executive.  If the error was generated
-from an API, then the error code will be of that API's
-error or status codes.  The status codes for the RTEMS
-API are in c/src/exec/rtems/headers/status.h.  Those
-for the POSIX API can be found in <errno.h>.
-
-The @code{@value{DIRPREFIX}fatal_error_occurred} directive is responsible
-for invoking an optional user-supplied fatal error handler
-and/or the RTEMS fatal error handler.  All fatal error handlers
-are passed an error code to describe the error detected.
-
-Occasionally, an application requires more
-sophisticated fatal error processing such as passing control to
-a debugger.  For these cases, a user-supplied fatal error
-handler can be specified in the RTEMS configuration table.  The
-User Extension Table field fatal contains the address of the
-fatal error handler to be executed when the
-@code{@value{DIRPREFIX}fatal_error_occurred}
-directive is called.  If the field is set to NULL or if the
-configured fatal error handler returns to the executive, then
-the default handler provided by RTEMS is executed.  This default
-handler will halt execution on the processor where the error
-occurred.
-
-@section Directives
-
-This section details the fatal error manager's
-directives.  A subsection is dedicated to each of this manager's
-directives and describes the calling sequence, related
-constants, usage, and status codes.
-
-@page
-@subsection FATAL_ERROR_OCCURRED - Invoke the fatal error handler
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_fatal_error_occurred
-@example
-void volatile rtems_fatal_error_occurred(
-  rtems_unsigned32        the_error
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure Fatal_Error_Occurred (
-   The_Error : in     RTEMS.Unsigned32
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES
-
-NONE
-
-@subheading DESCRIPTION:
-
-This directive processes fatal errors.  If the FATAL
-error extension is defined in the configuration table, then the
-user-defined error extension is called.  If configured and the
-provided FATAL error extension returns, then the RTEMS default
-error handler is invoked.  This directive can be invoked by
-RTEMS or by the user's application code including initialization
-tasks, other tasks, and ISRs.
-
-@subheading NOTES:
-
-This directive supports local operations only.
-
-Unless the user-defined error extension takes special
-actions such as restarting the calling task, this directive WILL
-NOT RETURN to the caller.
-
-The user-defined extension for this directive may
-wish to initiate a global shutdown.
diff --git a/doc/user/glossary.texi b/doc/user/glossary.texi
deleted file mode 100644
index 1f3794e994..0000000000
--- a/doc/user/glossary.texi
+++ /dev/null
@@ -1,771 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@ifinfo
-@node Glossary, Command and Variable Index, Example Application, Top
-@end ifinfo
-@chapter Glossary
-
-@table @b
-@item active
-A term used to describe an object
-which has been created by an application.
-
-@item aperiodic task
-A task which must execute only at
-irregular intervals and has only a soft deadline.
-
-@item application
-In this document, software which makes
-use of RTEMS.
-
-@item ASR
-see Asynchronous Signal Routine.
-
-@item asynchronous
-Not related in order or timing to
-other occurrences in the system.
-
-@item Asynchronous Signal Routine
-Similar to a hardware
-interrupt except that it is associated with a task and is run in
-the context of a task.  The directives provided by the signal
-manager are used to service signals.
-
-@item awakened
-A term used to describe a task that has
-been unblocked and may be scheduled to the CPU.
-
-@item big endian
-A data representation scheme in which
-the bytes composing a numeric value are arranged such that the
-most significant byte is at the lowest address.
-
-@item bit-mapped
-A data encoding scheme in which each bit
-in a variable is used to represent something different.  This
-makes for compact data representation.
-
-@item block
-A physically contiguous area of memory.
-
-@item blocked
-The task state entered by a task which has
-been previously started and cannot continue execution until the
-reason for waiting has been satisfied.
-
-@item broadcast
-To simultaneously send a message to a
-logical set of destinations.
-
-@item BSP
-see Board Support Package.
-
-@item Board Support Package
-A collection of device
-initialization and control routines specific to a particular
-type of board or collection of boards.
-
-@item buffer
-A fixed length block of memory allocated
-from a partition.
-
-@item calling convention
-The processor and compiler
-dependent rules which define the mechanism used to invoke
-subroutines in a high-level language.  These rules define the
-passing of arguments, the call and return mechanism, and the
-register set which must be preserved.
-
-@item Central Processing Unit
-This term is equivalent to
-the terms processor and microprocessor.
-
-@item chain
-A data structure which allows for efficient
-dynamic addition and removal of elements.  It differs from an
-array in that it is not limited to a predefined size.
-
-@item coalesce
-The process of merging adjacent holes into
-a single larger hole.  Sometimes this process is referred to as
-garbage collection.
-
-@item Configuration Table
-A table which contains
-information used to tailor RTEMS for a particular application.
-
-@item context
-All of the processor registers and
-operating system data structures associated with a task.
-
-@item context switch
-Alternate term for task switch.
-Taking control of the processor from one task and transferring
-it to another task.
-
-@item control block
-A data structure used by the
-executive to define and control an object.
-
-@item core
-When used in this manual, this term refers to
-the internal executive utility functions.  In the interest of
-application portability, the core of the executive should not be
-used directly by applications.
-
-@item CPU
-An acronym for Central Processing Unit.
-
-@item critical section
-A section of code which must be
-executed indivisibly.
-
-@item CRT
-An acronym for Cathode Ray Tube.  Normally used
-in reference to the man-machine interface.
-
-@item deadline
-A fixed time limit by which a task must
-have completed a set of actions.  Beyond this point, the results
-are of reduced value and may even be considered useless or
-harmful.
-
-@item device
-A peripheral used by the application that
-requires special operation software.  See also device driver.
-
-@item device driver
-Control software for special
-peripheral devices used by the application.
-
-@item directives
-RTEMS' provided routines that provide
-support mechanisms for real-time applications.
-
-@item dispatch
-The act of loading a task's context onto
-the CPU and transferring control of the CPU to that task.
-
-@item dormant
-The state entered by a task after it is
-created and before it has been started.
-
-@item Device Driver Table
-A table which contains the
-entry points for each of the configured device drivers.
-
-@item dual-ported
-A term used to describe memory which
-can be accessed at two different addresses.
-
-@item embedded
-An application that is delivered as a
-hidden part of a larger system.  For example, the software in a
-fuel-injection control system is an embedded application found
-in many late-model automobiles.
-
-@item envelope
-A buffer provided by the MPCI layer to
-RTEMS which is used to pass messages between nodes in a
-multiprocessor system.  It typically contains routing
-information needed by the MPCI.  The contents of an envelope are
-referred to as a packet.
-
-@item entry point
-The address at which a function or task
-begins to execute.  In C, the entry point of a function is the
-function's name.
-
-@item events
-A method for task communication and
-synchronization. The directives provided by the event manager
-are used to service events.
-
-@item exception
-A synonym for interrupt.
-
-@item executing
-The task state entered by a task after it
-has been given control of the CPU.
-
-@item executive
-In this document, this term is used to
-referred to RTEMS.  Commonly, an executive is a small real-time
-operating system used in embedded systems.
-
-@item exported
-An object known by all nodes in a
-multiprocessor system.  An object created with the GLOBAL
-attribute will be exported.
-
-@item external address
-The address used to access
-dual-ported memory by all the nodes in a system which do not own
-the memory.
-
-@item FIFO
-An acronym for First In First Out.
-
-@item First In First Out
-A discipline for manipulating entries in a data structure.
-
-@item floating point coprocessor
-A component used in
-computer systems to enhance performance in mathematically
-intensive situations.  It is typically viewed as a logical
-extension of the primary processor.
-
-@item freed
-A resource that has been released by the
-application to RTEMS.
-
-@item global
-An object that has been created with the
-GLOBAL attribute and exported to all nodes in a multiprocessor
-system.
-
-@item handler
-The equivalent of a manager, except that it
-is internal to RTEMS and forms part of the core.  A handler is a
-collection of routines which provide a related set of functions.
-For example, there is a handler used by RTEMS to manage all
-objects.
-
-@item hard real-time system
-A real-time system in which a
-missed deadline causes the worked performed to have no value or
-to result in a catastrophic effect on the integrity of the
-system.
-
-@item heap
-A data structure used to dynamically allocate
-and deallocate variable sized blocks of memory.
-
-@item heterogeneous
-A multiprocessor computer system composed of dissimilar processors.
-
-@item homogeneous
-A multiprocessor computer system composed of a single type of processor.
-
-@item ID
-An RTEMS assigned identification tag used to
-access an active object.
-
-@item IDLE task
-A special low priority task which assumes
-control of the CPU when no other task is able to execute.
-
-@item interface
-A specification of the methodology used
-to connect multiple independent subsystems.
-
-@item internal address
-The address used to access
-dual-ported memory by the node which owns the memory.
-
-@item interrupt
-A hardware facility that causes the CPU
-to suspend execution, save its status, and transfer control to a
-specific location.
-
-@item interrupt level
-A mask used to by the CPU to
-determine which pending interrupts should be serviced.  If a
-pending interrupt is below the current interrupt level, then the
-CPU does not recognize that interrupt.
-
-@item Interrupt Service Routine
-An ISR is invoked by the
-CPU to process a pending interrupt.
-
-@item I/O
-An acronym for Input/Output.
-
-@item ISR
-An acronym for Interrupt Service Routine.
-
-@item kernel
-In this document, this term is used as a
-synonym for executive.
-
-@item list
-A data structure which allows for dynamic
-addition and removal of entries.  It is not statically limited
-to a particular size.
-
-@item little endian
-A data representation scheme in which
-the bytes composing a numeric value are arranged such that the
-least significant byte is at the lowest address.
-
-@item local
-An object which was created with the LOCAL
-attribute and is accessible only on the node it was created and
-resides upon.  In a single processor configuration, all objects
-are local.
-
-@item local operation
-The manipulation of an object which
-resides on the same node as the calling task.
-
-@item logical address
-An address used by an application.
-In a system without memory management, logical addresses will
-equal physical addresses.
-
-@item loosely-coupled
-A multiprocessor configuration
-where shared memory is not used for communication.
-
-@item major number
-The index of a device driver in the
-Device Driver Table.
-
-@item manager
-A group of related RTEMS' directives which
-provide access and control over resources.
-
-@item memory pool
-Used interchangeably with heap.
-
-@item message
-A sixteen byte entity used to communicate
-between tasks.  Messages are sent to message queues and stored
-in message buffers.
-
-@item message buffer
-A block of memory used to store
-messages.
-
-@item message queue
-An RTEMS object used to synchronize
-and communicate between tasks by transporting messages between
-sending and receiving tasks.
-
-@item Message Queue Control Block
-A data structure associated with each message queue used by RTEMS
-to manage that message queue.
-
-@item minor number
-A numeric value passed to a device
-driver, the exact usage of which is driver dependent.
-
-@item mode
-An entry in a task's control block that is
-used to determine if the task allows preemption, timeslicing,
-processing of signals, and the interrupt disable level used by
-the task.
-
-@item MPCI
-An acronym for Multiprocessor Communications
-Interface Layer.
-
-@item multiprocessing
-The simultaneous execution of two
-or more processes by a multiple processor computer system.
-
-@item multiprocessor
-A computer with multiple CPUs
-available for executing applications.
-
-@item Multiprocessor Communications Interface Layer
-A set
-of user-provided routines which enable the nodes in a
-multiprocessor system to communicate with one another.
-
-@item Multiprocessor Configuration Table
-The data structure defining the characteristics of the multiprocessor
-target system with which RTEMS will communicate.
-
-@item multitasking
-The alternation of execution amongst a
-group of processes on a single CPU.  A scheduling algorithm is
-used to determine which process executes at which time.
-
-@item mutual exclusion
-A term used to describe the act of
-preventing other tasks from accessing a resource simultaneously.
-
-@item nested
-A term used to describe an ASR that occurs
-during another ASR or an ISR that occurs during another ISR.
-
-@item node
-A term used to reference a processor running
-RTEMS in a multiprocessor system.
-
-@item non-existent
-The state occupied by an uncreated or
-deleted task.
-
-@item numeric coprocessor
-A component used in computer
-systems to enhance performance in mathematically intensive
-situations.  It is typically viewed as a logical extension of
-the primary processor.
-
-@item object
-In this document, this term is used to refer
-collectively to tasks, timers, message queues, partitions,
-regions, semaphores, ports, and rate monotonic periods.  All
-RTEMS objects have IDs and user-assigned names.
-
-@item object-oriented
-A term used to describe systems
-with common mechanisms for utilizing a variety of entities.
-Object-oriented systems shield the application from
-implementation details.
-
-@item operating system
-The software which controls all
-the computer's resources and provides the base upon which
-application programs can be written.
-
-@item overhead
-The portion of the CPUs processing power
-consumed by the operating system.
-
-@item packet
-A buffer which contains the messages passed
-between nodes in a multiprocessor system.  A packet is the
-contents of an envelope.
-
-@item partition
-An RTEMS object which is used to allocate
-and deallocate fixed size blocks of memory from an dynamically
-specified area of memory.
-
-@item Partition Control Block
-A data structure associated
-with each partition used by RTEMS to manage that partition.
-
-@item pending
-A term used to describe a task blocked
-waiting for an event, message, semaphore, or signal.
-
-@item periodic task
-A task which must execute at regular
-intervals and comply with a hard deadline.
-
-@item physical address
-The actual hardware address of a
-resource.
-
-@item poll
-A mechanism used to determine if an event has
-occurred by periodically checking for a particular status.
-Typical events include arrival of data, completion of an action,
-and errors.
-
-@item pool
-A collection from which resources are
-allocated.
-
-@item portability
-A term used to describe the ease with
-which software can be rehosted on another computer.
-
-@item posting
-The act of sending an event, message,
-semaphore, or signal to a task.
-
-@item preempt
-The act of forcing a task to relinquish the
-processor and dispatching to another task.
-
-@item priority
-A mechanism used to represent the relative
-importance of an element in a set of items.  RTEMS uses priority
-to determine which task should execute.
-
-@item priority inheritance
-An algorithm that calls for
-the lower priority task holding a resource to have its priority
-increased to that of the highest priority task blocked waiting
-for that resource.  This avoids the problem of priority
-inversion.
-
-@item priority inversion
-A form of indefinite
-postponement which occurs when a high priority tasks requests
-access to shared resource currently allocated to low priority
-task.  The high priority task must block until the low priority
-task releases the resource.
-
-@item processor utilization
-The percentage of processor
-time used by a task or a set of tasks.
-
-@item proxy
-An RTEMS control structure used to represent,
-on a remote node, a task which must block as part of a remote
-operation.
-
-@item Proxy Control Block
-A data structure associated
-with each proxy used by RTEMS to manage that proxy.
-
-@item PTCB
-An acronym for Partition Control Block.
-
-@item PXCB
-An acronym for Proxy Control Block.
-
-@item quantum
-The application defined unit of time in
-which the processor is allocated.
-
-@item queue
-Alternate term for message queue.
-
-@item QCB
-An acronym for Message Queue Control Block.
-
-@item ready
-A task occupies this state when it is
-available to be given control of the CPU.
-
-@item real-time
-A term used to describe systems which are
-characterized by requiring deterministic response times to
-external stimuli.  The external stimuli require that the
-response occur at a precise time or the response is incorrect.
-
-@item reentrant
-A term used to describe routines which do
-not modify themselves or global variables.
-
-@item region
-An RTEMS object which is used to allocate
-and deallocate variable size blocks of memory from a dynamically
-specified area of memory.
-
-@item Region Control Block
-A data structure associated
-with each region used by RTEMS to manage that region.
-
-@item registers
-Registers are locations physically
-located within a component, typically used for device control or
-general purpose storage.
-
-@item remote
-Any object that does not reside on the local
-node.
-
-@item remote operation
-The manipulation of an object
-which does not reside on the same node as the calling task.
-
-@item return code
-Also known as error code or return
-value.
-
-@item resource
-A hardware or software entity to which
-access must be controlled.
-
-@item resume
-Removing a task from the suspend state.  If
-the task's state is ready following a call to the 
-@code{@value{DIRPREFIX}task_resume}
-directive, then the task is available for scheduling.
-
-@item return code
-A value returned by RTEMS directives to
-indicate the completion status of the directive.
-
-@item RNCB
-An acronym for Region Control Block.
-
-@item round-robin
-A task scheduling discipline in which
-tasks of equal priority are executed in the order in which they
-are made ready.
-
-@item RS-232
-A standard for serial communications.
-
-@item running
-The state of a rate monotonic timer while
-it is being used to delineate a period.  The timer exits this
-state by either expiring or being canceled.
-
-@item schedule
-The process of choosing which task should
-next enter the executing state.
-
-@item schedulable
-A set of tasks which can be guaranteed
-to meet their deadlines based upon a specific scheduling
-algorithm.
-
-@item segments
-Variable sized memory blocks allocated
-from a region.
-
-@item semaphore
-An RTEMS object which is used to
-synchronize tasks and provide mutually exclusive access to
-resources.
-
-@item Semaphore Control Block
-A data structure associated
-with each semaphore used by RTEMS to manage that semaphore.
-
-@item shared memory
-Memory which is accessible by
-multiple nodes in a multiprocessor system.
-
-@item signal
-An RTEMS provided mechanism to communicate
-asynchronously with a task.  Upon reception of a signal, the ASR
-of the receiving task will be invoked.
-
-@item signal set
-A thirty-two bit entity which is used to
-represent a task's collection of pending signals and the signals
-sent to a task.
-
-@item SMCB
-An acronym for Semaphore Control Block.
-
-@item soft real-time system
-A real-time system in which a
-missed deadline does not compromise the integrity of the system.
-
-@item sporadic task
-A task which executes at irregular
-intervals and must comply with a hard deadline.  A minimum
-period of time between successive iterations of the task can be
-guaranteed.
-
-@item stack
-A data structure that is managed using a Last
-In First Out (LIFO) discipline.  Each task has a stack
-associated with it which is  used to store return information
-and local variables.
-
-@item status code
-Also known as error code or return
-value.
-
-@item suspend
-A term used to describe a task that is not
-competing for the CPU because it has had a 
-@code{@value{DIRPREFIX}task_suspend} directive.
-
-@item synchronous
-Related in order or timing to other
-occurrences in the system.
-
-@item system call
-In this document, this is used as an
-alternate term for directive.
-
-@item target
-The system on which the application will
-ultimately execute.
-
-@item task
-A logically complete thread of execution.  The
-CPU is allocated among the ready tasks.
-
-@item Task Control Block
-A data structure associated with
-each task used by RTEMS to manage that task.
-
-@item task switch
-Alternate terminology for context
-switch.  Taking control of the processor from one task and given
-to another.
-
-@item TCB
-An acronym for Task Control Block.
-
-@item tick
-The basic unit of time used by RTEMS.  It is a
-user-configurable number of microseconds.  The current tick
-expires when the @code{@value{DIRPREFIX}clock_tick}
-directive is invoked.
-
-@item tightly-coupled
-A multiprocessor configuration
-system which communicates via shared memory.
-
-@item timeout
-An argument provided to a number of
-directives which determines the maximum length of time an
-application task is willing to wait to acquire the resource if
-it is not immediately available.
-
-@item timer
-An RTEMS object used to invoke subprograms at
-a later time.
-
-@item Timer Control Block
-A data structure associated
-with each timer used by RTEMS to manage that timer.
-
-@item timeslicing
-A task scheduling discipline in which
-tasks of equal priority are executed for a specific period of
-time before being preempted by another task.
-
-@item timeslice
-The application defined unit of time in
-which the processor is allocated.
-
-@item TMCB
-An acronym for Timer Control Block.
-
-@item transient overload
-A temporary rise in system
-activity which may cause deadlines to be missed.  Rate Monotonic
-Scheduling can be used to determine if all deadlines will be met
-under transient overload.
-
-@item user extensions
-Software routines provided by the
-application to enhance the functionality of RTEMS.
-
-@item User Extension Table
-A table which contains the
-entry points for each user extensions.
-
-@item User Initialization Tasks Table
-A table which
-contains the information needed to create and start each of the
-user initialization tasks.
-
-@item user-provided
-Alternate term for user-supplied.
-This term is used to designate any software routines which must
-be written by the application designer.
-
-@item user-supplied
-Alternate term for user-provided.
-This term is used to designate any software routines which must
-be written by the application designer.
-
-@item vector
-Memory pointers used by the processor to
-fetch the address of routines which will handle various
-exceptions and interrupts.
-
-@item wait queue
-The list of tasks blocked pending the
-release of a particular resource.  Message queues, regions, and
-semaphores have a wait queue associated with them.
-
-@item yield
-When a task voluntarily releases control of the processor.
-
-@end table
-
diff --git a/doc/user/init.t b/doc/user/init.t
deleted file mode 100644
index 4fb93048c2..0000000000
--- a/doc/user/init.t
+++ /dev/null
@@ -1,405 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Initialization Manager
-
-@section Introduction
-
-The initialization manager is responsible for
-initiating and shutting down RTEMS.  Initiating RTEMS involves
-creating and starting all configured initialization tasks, and
-for invoking the initialization routine for each user-supplied
-device driver.  In a multiprocessor configuration, this manager
-also initializes the interprocessor communications layer.  The
-directives provided by the initialization manager are:
-
-@itemize @bullet
-@item @code{@value{DIRPREFIX}initialize_executive} - Initialize RTEMS
-@item @code{@value{DIRPREFIX}initialize_executive_early} - Initialize RTEMS and do NOT Start Multitasking
-@item @code{@value{DIRPREFIX}initialize_executive_late} - Complete Initialization and Start Multitasking
-@item @code{@value{DIRPREFIX}shutdown_executive} - Shutdown RTEMS
-@end itemize
-
-@section Background
-
-@subsection Initialization Tasks
-
-Initialization task(s) are the mechanism by which
-RTEMS transfers initial control to the user's application.
-Initialization tasks differ from other application tasks in that
-they are defined in the User Initialization Tasks Table and
-automatically created and started by RTEMS as part of its
-initialization sequence.  Since the initialization tasks are
-scheduled using the same algorithm as all other RTEMS tasks,
-they must be configured at a priority and mode which will insure
-that they will complete execution before other application tasks
-execute.  Although there is no upper limit on the number of
-initialization tasks, an application is required to define at
-least one.
-
-A typical initialization task will create and start
-the static set of application tasks.  It may also create any
-other objects used by the application.  Initialization tasks
-which only perform initialization should delete themselves upon
-completion to free resources for other tasks.  Initialization
-tasks may transform themselves into a "normal" application task.
-This transformation typically involves changing priority and
-execution mode.  RTEMS does not automatically delete the
-initialization tasks.
-
-@subsection The System Initialization Task
-
-The System Initialization Task is responsible for
-initializing all device drivers.  As a result, this task has a
-higher priority than all other tasks to insure that no
-application tasks executes until all device drivers are
-initialized.  After device initialization in a single processor
-system, this task will delete itself.
-
-The System Initialization Task must have enough stack
-space to successfully execute the initialization routines for
-all device drivers and, in multiprocessor configurations, the
-Multiprocessor Communications Interface Layer initialization
-routine.  The CPU Configuration Table contains a field which
-allows the application or BSP to increase the default amount of
-stack space allocated for this task.
-
-In multiprocessor configurations, the System
-Initialization Task does not delete itself after initializing
-the device drivers.  Instead it transforms itself into the
-Multiprocessing Server which initializes the Multiprocessor
-Communications Interface Layer, verifies multiprocessor system
-consistency, and processes all requests from remote nodes.
-
-@subsection The Idle Task
-
-The Idle Task is the lowest priority task in a system
-and executes only when no other task is ready to execute.  This
-task consists of an infinite loop and will be preempted when any
-other task is made ready to execute.
-
-@subsection Initialization Manager Failure
-
-The fatal_error_occurred directive will be called
-from @code{@value{DIRPREFIX}initialize_executive}
-for any of the following reasons:
-
-@itemize @bullet
-@item If either the Configuration Table or the CPU Dependent
-Information Table is not provided.
-
-@item If the starting address of the RTEMS RAM Workspace,
-supplied by the application in the Configuration Table, is NULL
-or is not aligned on a four-byte boundary.
-
-@item If the size of the RTEMS RAM Workspace is not large
-enough to initialize and configure the system.
-
-@item If the interrupt stack size specified is too small.
-
-@item If multiprocessing is configured and the node entry in
-the Multiprocessor Configuration Table is not between one and
-the maximum_nodes entry.
-
-@item If a multiprocessor system is being configured and no
-Multiprocessor Communications Interface is specified.
-
-@item If no user initialization tasks are configured.  At
-least one initialization task must be configured to allow RTEMS
-to pass control to the application at the end of the executive
-initialization sequence.
-
-@item If any of the user initialization tasks cannot be
-created or started successfully.
-@end itemize
-
-@section Operations
-
-@subsection Initializing RTEMS
-
-The @code{@value{DIRPREFIX}initialize_executive}
-directive is called by the
-board support package at the completion of its initialization
-sequence.  RTEMS assumes that the board support package
-successfully completed its initialization activities.  The
-@code{@value{DIRPREFIX}initialize_executive}
-directive completes the initialization
-sequence by performing the following actions:
-
-@itemize @bullet
-@item Initializing internal RTEMS variables;
-@item Allocating system resources;
-@item Creating and starting the System Initialization Task;
-@item Creating and starting the Idle Task;
-@item Creating and starting the user initialization task(s); and
-@item Initiating multitasking.
-@end itemize
-
-This directive MUST be called before any other RTEMS
-directives.  The effect of calling any RTEMS directives before
-@code{@value{DIRPREFIX}initialize_executive}
-is unpredictable.  Many of RTEMS actions
-during initialization are based upon the contents of the
-Configuration Table and CPU Dependent Information Table.  For
-more information regarding the format and contents of these
-tables, please refer to the chapter Configuring a System.
-
-The final step in the initialization sequence is the
-initiation of multitasking.  When the scheduler and dispatcher
-are enabled, the highest priority, ready task will be dispatched
-to run.  Control will not be returned to the board support
-package after multitasking is enabled until
-@code{@value{DIRPREFIX}shutdown_executive}
-the directive is called.
-
-The @code{@value{DIRPREFIX}initialize_executive}
-directive provides a
-conceptually simple way to initialize RTEMS.  However, in
-certain cases, this mechanism cannot be used.  The
-@code{@value{DIRPREFIX}initialize_executive_early}
-and @code{@value{DIRPREFIX}initialize_executive_late}
-directives are provided as an alternative mechanism for
-initializing RTEMS.  The
-@code{@value{DIRPREFIX}initialize_executive_early} directive
-returns to the caller BEFORE initiating multitasking.  The
-@code{@value{DIRPREFIX}initialize_executive_late}
-directive is invoked to start
-multitasking.  It is critical that only one of the RTEMS
-initialization sequences be used in an application.
-
-@subsection Shutting Down RTEMS
-
-The @code{@value{DIRPREFIX}shutdown_executive} directive is invoked by the
-application to end multitasking and return control to the board
-support package.  The board support package resumes execution at
-the code immediately following the invocation of the
-@code{@value{DIRPREFIX}initialize_executive} directive.
-
-@section Directives
-
-This section details the initialization manager's
-directives.  A subsection is dedicated to each of this manager's
-directives and describes the calling sequence, related
-constants, usage, and status codes.
-
-@page
-@subsection INITIALIZE_EXECUTIVE - Initialize RTEMS
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_initialize_executive
-@example
-void rtems_initialize_executive(
-  rtems_configuration_table *configuration_table,
-  rtems_cpu_table           *cpu_table
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure Initialize_Executive (
-  Configuration_Table : in     RTEMS.Configuration_Table_Pointer;
-  CPU_Table           : in     RTEMS.CPU_Table_Pointer
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-
-NONE
-
-@subheading DESCRIPTION:
-
-This directive is called when the board support
-package has completed its initialization to allow RTEMS to
-initialize the application environment based upon the
-information in the Configuration Table, CPU Dependent
-Information Table, User Initialization Tasks Table, Device
-Driver Table, User Extension Table, Multiprocessor Configuration
-Table, and the Multiprocessor Communications Interface (MPCI)
-Table.  This directive starts multitasking and does not return
-to the caller until the @code{@value{DIRPREFIX}shutdown_executive}
-directive is invoked.
-
-@subheading NOTES:
-
-This directive MUST be the first RTEMS directive
-called and it DOES NOT RETURN to the caller until the
-@code{@value{DIRPREFIX}shutdown_executive}
-is invoked.
-
-This directive causes all nodes in the system to
-verify that certain configuration parameters are the same as
-those of the local node.  If an inconsistency is detected, then
-a fatal error is generated.
-
-The application must use only one of the two
-initialization sequences: 
-@code{@value{DIRPREFIX}initialize_executive} or
-@code{@value{DIRPREFIX}initialize_executive_early} and 
-@code{@value{DIRPREFIX}initialize_executive_late}.  The
-@code{@value{DIRPREFIX}initialize_executive}
-directive is logically equivalent to invoking 
-@code{@value{DIRPREFIX}initialize_executive_early} and
-@code{@value{DIRPREFIX}initialize_executive_late}
-with no intervening actions.
-
-@page
-@subsection INITIALIZE_EXECUTIVE_EARLY - Initialize RTEMS and do NOT Start Multitasking
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_initialize_executive_early
-@example
-rtems_interrupt_level rtems_initialize_executive_early(
-  rtems_configuration_table *configuration_table,
-  rtems_cpu_table           *cpu_table
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure Initialize_Executive_Early(
-  Configuration_Table : in     RTEMS.Configuration_Table_Pointer;
-  CPU_Table           : in     RTEMS.Cpu_Table;
-  Level               :    out RTEMS.ISR_Level
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-
-NONE
-
-@subheading DESCRIPTION:
-
-This directive is called when the board support
-package has completed its initialization to allow RTEMS to
-initialize the application environment based upon the
-information in the Configuration Table, CPU Dependent
-Information Table, User Initialization Tasks Table, Device
-Driver Table, User Extension Table, Multiprocessor Configuration
-Table, and the Multiprocessor Communications Interface (MPCI)
-Table.  This directive returns to the caller after completing
-the basic RTEMS initialization but before multitasking is
-initiated.  The interrupt level in place when the directive is
-invoked is returned to the caller.  This interrupt level should
-be the same one passed to
-@code{@value{DIRPREFIX}initialize_executive_late}.
-
-@subheading NOTES:
-
-The application must use only one of the two
-initialization sequences:
-@code{@value{DIRPREFIX}initialize_executive} or
-@code{@value{DIRPREFIX}nitialize_executive_early} and 
-@code{@value{DIRPREFIX}nitialize_executive_late}.
-
-@page
-@subsection INITIALIZE_EXECUTIVE_LATE - Complete Initialization and Start Multitasking
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_initialize_executive_late
-@example
-void rtems_initialize_executive_late(
-  rtems_interrupt_level  bsp_level
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure Initialize_Executive_Late(
-  BSP_Level : in    RTEMS.ISR_Level
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-
-NONE
-
-@subheading DESCRIPTION:
-
-This directive is called after the
-@code{@value{DIRPREFIX}initialize_executive_early}
-directive has been called to complete
-the RTEMS initialization sequence and initiate multitasking.
-The interrupt level returned by the
-@code{@value{DIRPREFIX}initialize_executive_early}
-directive should be in bsp_level and this value is restored as
-part of this directive returning to the caller after the
-@code{@value{DIRPREFIX}shutdown_executive}
-directive is invoked.
-
-@subheading NOTES:
-
-This directive MUST be the second RTEMS directive
-called and it DOES NOT RETURN to the caller until the
-@code{@value{DIRPREFIX}shutdown_executive} is invoked.
-
-This directive causes all nodes in the system to
-verify that certain configuration parameters are the same as
-those of the local node.  If an inconsistency is detected, then
-a fatal error is generated.
-
-The application must use only one of the two
-initialization sequences:
-@code{@value{DIRPREFIX}initialize_executive} or
-@code{@value{DIRPREFIX}nitialize_executive_early} and
-@code{@value{DIRPREFIX}initialize_executive_late}.
-
-
-
-@page
-@subsection SHUTDOWN_EXECUTIVE - Shutdown RTEMS
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_shutdown_executive
-@example
-void rtems_shutdown_executive(
-  rtems_unsigned32 result
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure Shutdown_Executive(
-  result : in     RTEMS.Unsigned32
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-
-NONE
-
-@subheading DESCRIPTION:
-
-This directive is called when the application wishes
-to shutdown RTEMS and return control to the board support
-package.  The board support package resumes execution at the
-code immediately following the invocation of the
-@code{@value{DIRPREFIX}initialize_executive} directive.
-
-@subheading NOTES:
-
-This directive MUST be the last RTEMS directive
-invoked by an application and it DOES NOT RETURN to the caller.
-
-This directive should not be invoked until the
-executive has successfully completed initialization.
diff --git a/doc/user/intr.t b/doc/user/intr.t
deleted file mode 100644
index 74fbf7af6b..0000000000
--- a/doc/user/intr.t
+++ /dev/null
@@ -1,426 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Interrupt Manager
-
-@section Introduction
-
-Any real-time executive must provide a mechanism for
-quick response to externally generated interrupts to satisfy the
-critical time constraints of the application.  The interrupt
-manager provides this mechanism for RTEMS.  This manager permits
-quick interrupt response times by providing the critical ability
-to alter task execution which allows a task to be preempted upon
-exit from an ISR.  The interrupt manager includes the following
-directive:
-
-@itemize @bullet
-@item @code{@value{DIRPREFIX}interrupt_catch} - Establish an ISR
-@item @code{@value{DIRPREFIX}interrupt_disable} - Disable Interrupts
-@item @code{@value{DIRPREFIX}interrupt_enable} - Enable Interrupts
-@item @code{@value{DIRPREFIX}interrupt_flash} - Flash Interrupt
-@item @code{@value{DIRPREFIX}interrupt_is_in_progress} - Is an ISR in Progress
-@end itemize
-
-@section Background
-
-@subsection Processing an Interrupt
-
-The interrupt manager allows the application to
-connect a function to a hardware interrupt vector.  When an
-interrupt occurs, the processor will automatically vector to
-RTEMS.  RTEMS saves and restores all registers which are not
-preserved by the normal @value{LANGUAGE} calling convention
-for the target
-processor and invokes the user's ISR.  The user's ISR is
-responsible for processing the interrupt, clearing the interrupt
-if necessary, and device specific manipulation.
-
-The @code{@value{DIRPREFIX}interrupt_catch}
-directive connects a procedure to
-an interrupt vector.  The interrupt service routine is assumed
-to abide by these conventions and have a prototype similar to
-the following:
-
-@ifset is-C
-@example
-rtems_isr user_isr(
-  rtems_vector_number vector
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure User_ISR (
-  vector : in     RTEMS.Vector_Number
-);
-@end example
-@end ifset
-
-The vector number argument is provided by RTEMS to
-allow the application to identify the interrupt source.  This
-could be used to allow a single routine to service interrupts
-from multiple instances of the same device.  For example, a
-single routine could service interrupts from multiple serial
-ports and use the vector number to identify which port requires
-servicing.
-
-To minimize the masking of lower or equal priority
-level interrupts, the ISR should perform the minimum actions
-required to service the interrupt.  Other non-essential actions
-should be handled by application tasks.  Once the user's ISR has
-completed, it returns control to the RTEMS interrupt manager
-which will perform task dispatching and restore the registers
-saved before the ISR was invoked.
-
-The RTEMS interrupt manager guarantees that proper
-task scheduling and dispatching are performed at the conclusion
-of an ISR.  A system call made by the ISR may have readied a
-task of higher priority than the interrupted task.  Therefore,
-when the ISR completes, the postponed dispatch processing must
-be performed.  No dispatch processing is performed as part of
-directives which have been invoked by an ISR.
-
-Applications must adhere to the following rule if
-proper task scheduling and dispatching is to be performed:
-
-@itemize @b{ }
-
-@item @b{The interrupt manager must be used for all ISRs which
-may be interrupted by the highest priority ISR which invokes an
-RTEMS directive.}
-
-@end itemize
-
-
-Consider a processor which allows a numerically low
-interrupt level to interrupt a numerically greater interrupt
-level.  In this example, if an RTEMS directive is used in a
-level 4 ISR, then all ISRs which execute at levels 0 through 4
-must use the interrupt manager.
-
-Interrupts are nested whenever an interrupt occurs
-during the execution of another ISR.  RTEMS supports efficient
-interrupt nesting by allowing the nested ISRs to terminate
-without performing any dispatch processing.  Only when the
-outermost ISR terminates will the postponed dispatching occur.
-
-@subsection RTEMS Interrupt Levels
-
-Many processors support multiple interrupt levels or
-priorities.  The exact number of interrupt levels is processor
-dependent.  RTEMS internally supports 256 interrupt levels which
-are mapped to the processor's interrupt levels.  For specific
-information on the mapping between RTEMS and the target
-processor's interrupt levels, refer to the Interrupt Processing
-chapter of the Applications Supplement document for a specific
-target processor.
-
-@subsection Disabling of Interrupts by RTEMS
-
-During the execution of directive calls, critical
-sections of code may be executed.  When these sections are
-encountered, RTEMS disables all maskable interrupts before the
-execution of the section and restores them to the previous level
-upon completion of the section.  RTEMS has been optimized to
-insure that interrupts are disabled for a minimum length of
-time.  The maximum length of time interrupts are disabled by
-RTEMS is processor dependent and is detailed in the Timing
-Specification chapter of the Applications Supplement document
-for a specific target processor.
-
-Non-maskable interrupts (NMI) cannot be disabled, and
-ISRs which execute at this level MUST NEVER issue RTEMS system
-calls.  If a directive is invoked, unpredictable results may
-occur due to the inability of RTEMS to protect its critical
-sections.  However, ISRs that make no system calls may safely
-execute as non-maskable interrupts.
-
-@section Operations
-
-@subsection Establishing an ISR
-
-The @code{@value{DIRPREFIX}interrupt_catch}
-directive establishes an ISR for
-the system.  The address of the ISR and its associated CPU
-vector number are specified to this directive.  This directive
-installs the RTEMS interrupt wrapper in the processor's
-Interrupt Vector Table and the address of the user's ISR in the
-RTEMS' Vector Table.  This directive returns the previous
-contents of the specified vector in the RTEMS' Vector Table.
-
-@subsection Directives Allowed from an ISR
-
-Using the interrupt manager insures that RTEMS knows
-when a directive is being called from an ISR.  The ISR may then
-use system calls to synchronize itself with an application task.
-The synchronization may involve messages, events or signals
-being passed by the ISR to the desired task.  Directives invoked
-by an ISR must operate only on objects which reside on the local
-node.  The following is a list of RTEMS system calls that may be
-made from an ISR:
-
-@itemize @bullet
-@item Task Management
-
-@itemize -
-@item task_get_note, task_set_note, task_suspend, task_resume
-@end itemize
-
-@item Clock Management
-
-@itemize -
-@item clock_get, clock_tick
-@end itemize
-
-@item Message, Event, and Signal Management
-
-@itemize -
-@item message_queue_send, message_queue_urgent
-@item event_send
-@item signal_send
-@end itemize
-
-@item Semaphore Management
-
-@itemize -
-@item semaphore_release
-@end itemize
-
-@item Dual-Ported Memory Management
-
-@itemize -
-@item port_external_to_internal, port_internal_to_external
-@end itemize
-
-@item IO Management
-
-@itemize -
-@item io_initialize, io_open, io_close, io_read, io_write, io_control
-@end itemize
-
-@item Fatal Error Management
-
-@itemize -
-@item fatal_error_occurred
-@end itemize
-
-@item Multiprocessing
-
-@itemize -
-@item multiprocessing_announce
-@end itemize
-@end itemize
-
-@section Directives
-
-This section details the interrupt manager's
-directives.  A subsection is dedicated to each of this manager's
-directives and describes the calling sequence, related
-constants, usage, and status codes.
-
-@page
-@subsection INTERRUPT_CATCH - Establish an ISR
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_interrupt_catch
-@example
-rtems_status_code rtems_interrupt_catch(
-  rtems_isr_entry      new_isr_handler,
-  rtems_vector_number  vector,
-  rtems_isr_entry     *old_isr_handler
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure Interrupt_Catch (
-   New_ISR_handler : in     RTEMS.Address;
-   Vector          : in     RTEMS.Vector_Number;
-   Old_ISR_Handler :    out RTEMS.Address;
-   Result          :    out RTEMS.Status_Codes
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-@code{@value{RPREFIX}SUCCESSFUL} - ISR established successfully@*
-@code{@value{RPREFIX}INVALID_NUMBER} - illegal vector number@*
-@code{@value{RPREFIX}INVALID_ADDRESS} - illegal ISR entry point or invalid old_isr_handler
-
-@subheading DESCRIPTION:
-
-This directive establishes an interrupt service
-routine (ISR) for the specified interrupt vector number.  The
-@code{new_isr_handler} parameter specifies the entry point of the ISR.
-The entry point of the previous ISR for the specified vector is
-returned in @code{old_isr_handler}.
-
-@subheading NOTES:
-
-This directive will not cause the calling task to be preempted.
-
-@page
-@subsection INTERRUPT_DISABLE - Disable Interrupts
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_interrupt_disable
-@example
-void rtems_interrupt_disable(
-  rtems_isr_level  level
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-function Interrupt_Disable
-return RTEMS.ISR_Level;
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-
-NONE
-
-@subheading DESCRIPTION:
-
-This directive disables all maskable interrupts and returns
-the previous @code{level}.  A later invocation of the
-@code{@value{DIRPREFIX}interrupt_enable} directive should be used to
-restore the interrupt level.
-
-@subheading NOTES:
-
-This directive will not cause the calling task to be preempted.
-
-@ifset is-C
-@b{This directive is implemented as a macro which modifies the @code{level}
-parameter.}
-@end ifset
-
-@page
-@subsection INTERRUPT_ENABLE - Enable Interrupts
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_interrupt_enable
-@example
-void rtems_interrupt_enable(
-  rtems_isr_level  level
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example 
-procedure Interrupt_Enable (
-   Level : in     RTEMS.ISR_Level
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-
-NONE
-
-@subheading DESCRIPTION:
-
-This directive enables maskable interrupts to the @code{level}
-which was returned by a previous call to
-@code{@value{DIRPREFIX}interrupt_disable}.
-Immediately prior to invoking this directive, maskable interrupts should
-be disabled by a call to @code{@value{DIRPREFIX}interrupt_disable}
-and will be enabled when this directive returns to the caller.
-
-@subheading NOTES:
-
-This directive will not cause the calling task to be preempted.
-
-
-@page
-@subsection INTERRUPT_FLASH - Flash Interrupts
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C 
-@c @findex rtems_interrupt_flash
-@example
-void rtems_interrupt_flash(
-  rtems_isr_level level
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure Interrupt_Flash (
-   Level : in     RTEMS.ISR_Level
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-
-NONE
-
-@subheading DESCRIPTION:
-
-This directive temporarily enables maskable interrupts to the @code{level}
-which was returned by a previous call to
-@code{@value{DIRPREFIX}interrupt_disable}.  
-Immediately prior to invoking this directive, maskable interrupts should
-be disabled by a call to @code{@value{DIRPREFIX}interrupt_disable}
-and will be redisabled when this directive returns to the caller.
-
-@subheading NOTES:
-
-This directive will not cause the calling task to be preempted.
-
-@page
-@subsection INTERRUPT_IS_IN_PROGRESS - Is an ISR in Progress
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_interrupt_is_in_progress
-@example
-rtems_boolean rtems_interrupt_is_in_progress( void );
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-function Interrupt_Is_In_Progress
-return RTEMS.Boolean;
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-
-NONE
-
-@subheading DESCRIPTION:
-
-This directive returns @code{TRUE} if the processor is currently
-servicing an interrupt and @code{FALSE} otherwise.  A return value
-of @code{TRUE} indicates that the caller is an interrupt service
-routine, @b{NOT} a task.  The directives available to an interrupt
-service routine are restricted.
-
-@subheading NOTES:
-
-This directive will not cause the calling task to be preempted.
-
diff --git a/doc/user/io.t b/doc/user/io.t
deleted file mode 100644
index 9c592b425c..0000000000
--- a/doc/user/io.t
+++ /dev/null
@@ -1,563 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter I/O Manager
-
-@section Introduction
-
-The input/output interface manager provides a
-well-defined mechanism for accessing device drivers and a
-structured methodology for organizing device drivers.  The
-directives provided by the I/O manager are:
-
-@itemize @bullet
-@item @code{@value{DIRPREFIX}io_initialize} - Initialize a device driver
-@item @code{@value{DIRPREFIX}io_register_name} - Register a device name
-@item @code{@value{DIRPREFIX}io_lookup_name} - Look up a device name
-@item @code{@value{DIRPREFIX}io_open} - Open a device
-@item @code{@value{DIRPREFIX}io_close} - Close a device
-@item @code{@value{DIRPREFIX}io_read} - Read from a device
-@item @code{@value{DIRPREFIX}io_write} - Write to a device
-@item @code{@value{DIRPREFIX}io_control} - Special device services
-@end itemize
-
-@section Background
-
-@subsection Device Driver Table
-
-Each application utilizing the RTEMS I/O manager must
-specify the address of a Device Driver Table in its
-Configuration Table.  This table contains each device driver's
-entry points.  Each device driver may contain the following
-entry points:
-
-@itemize @bullet
-@item Initialization
-@item Open
-@item Close
-@item Read
-@item Write
-@item Control
-@end itemize
-
-If the device driver does not support a particular
-entry point, then that entry in the Configuration Table should
-be NULL.  RTEMS will return
-@code{@value{RPREFIX}SUCCESSFUL} as the executive's and
-zero (0) as the device driver's return code for these device
-driver entry points.
-
-@subsection Major and Minor Device Numbers
-
-Each call to the I/O manager must provide a device's
-major and minor numbers as arguments.  The major number is the
-index of the requested driver's entry points in the Device
-Driver Table, and is used to select a specific device driver.
-The exact usage of the minor number is driver specific, but is
-commonly used to distinguish between a number of devices
-controlled by the same driver.
-
-@subsection Device Names
-
-The I/O Manager provides facilities to associate a
-name with a particular device.  Directives are provided to
-register the name of a device and to look up the major/minor
-number pair associated with a device name.
-
-@subsection Device Driver Environment
-
-Application developers, as well as device driver
-developers, must be aware of the following regarding the RTEMS
-I/O Manager:
-
-@itemize @bullet
-@item A device driver routine executes in the context of the
-invoking task.  Thus if the driver blocks, the invoking task
-blocks.
-
-@item The device driver is free to change the modes of the
-invoking task, although the driver should restore them to their
-original values.
-
-@item Device drivers may be invoked from ISRs.
-
-@item Only local device drivers are accessible through the I/O
-manager.
-
-@item A device driver routine may invoke all other RTEMS
-directives, including I/O directives, on both local and global
-objects.
-
-@end itemize
-
-Although the RTEMS I/O manager provides a framework
-for device drivers, it makes no assumptions regarding the
-construction or operation of a device driver.
-
-@subsection Device Driver Interface
-
-When an application invokes an I/O manager directive,
-RTEMS determines which device driver entry point must be
-invoked.  The information passed by the application to RTEMS is
-then passed to the correct device driver entry point.  RTEMS
-will invoke each device driver entry point assuming it is
-compatible with the following prototype:
-
-@ifset is-C
-@example
-rtems_device_driver io_entry(
-  rtems_device_major_number  major,
-  rtems_device_minor_number  minor,
-  void                      *argument_block
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-function IO_Entry (
-  Major          : in     RTEMS.Device_Major_Number;
-  Minor          : in     RTEMS.Device_Major_Number;
-  Argument_Block : in     RTEMS.Address
-) return RTEMS.Status_Code;
-@end example
-@end ifset
-
-The format and contents of the parameter block are
-device driver and entry point dependent.
-
-It is recommended that a device driver avoid
-generating error codes which conflict with those used by
-application components.  A common technique used to generate
-driver specific error codes is to make the most significant part
-of the status indicate a driver specific code.
-
-@subsection Device Driver Initialization
-
-RTEMS automatically initializes all device drivers
-when multitasking is initiated via the initialize_executive
-directive.  RTEMS initializes the device drivers by invoking
-each device driver initialization entry point with the following
-parameters:
-
-@table @asis
-@item major
-the major device number for this device driver.
-
-@item minor
-zero.
-
-@item argument_block
-will point to  the Configuration Table.
-
-@end table
-
-The returned status will be ignored by RTEMS.  If the driver
-cannot successfully initialize the device, then it should invoke
-the fatal_error_occurred directive.
-
-@section Operations
-
-@subsection Register and Lookup Name
-
-The @code{@value{DIRPREFIX}io_register} directive associates a name with the
-specified device (i.e. major/minor number pair).  Device names
-are typically registered as part of the device driver
-initialization sequence.  The @code{@value{DIRPREFIX}io_lookup}
-directive is used to
-determine the major/minor number pair associated with the
-specified device name.  The use of these directives frees the
-application from being dependent on the arbitrary assignment of
-major numbers in a particular application.  No device naming
-conventions are dictated by RTEMS.
-
-@subsection Accessing an Device Driver
-
-The I/O manager provides directives which enable the
-application program to utilize device drivers in a standard
-manner.  There is a direct correlation between the RTEMS I/O
-manager directives
-@code{@value{DIRPREFIX}io_initialize},
-@code{@value{DIRPREFIX}io_open},
-@code{@value{DIRPREFIX}io_close},
-@code{@value{DIRPREFIX}io_read},
-@code{@value{DIRPREFIX}io_write}, and
-@code{@value{DIRPREFIX}io_control}
-and the underlying device driver entry points.
-
-@section Directives
-
-This section details the I/O manager's directives.  A
-subsection is dedicated to each of this manager's directives and
-describes the calling sequence, related constants, usage, and
-status codes.
-
-@page
-@subsection IO_INITIALIZE - Initialize a device driver
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_io_initialize
-@example
-rtems_status_code rtems_io_initialize(
-  rtems_device_major_number  major,
-  rtems_device_minor_number  minor,
-  void                      *argument
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure IO_Initialize (
-   Major        : in     RTEMS.Device_Major_Number;
-   Minor        : in     RTEMS.Device_Minor_Number;
-   Argument     : in     RTEMS.Address;
-   Return_Value :    out RTEMS.Unsigned32;
-   Result       :    out RTEMS.Status_Codes
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-@code{@value{RPREFIX}SUCCESSFUL} - successfully initialized@*
-@code{@value{RPREFIX}INVALID_NUMBER} - invalid major device number
-
-@subheading DESCRIPTION:
-
-This directive calls the device driver initialization
-routine specified in the Device Driver Table for this major
-number. This directive is automatically invoked for each device
-driver when multitasking is initiated via the
-initialize_executive directive.
-
-A device driver initialization module is responsible
-for initializing all hardware and data structures associated
-with a device. If necessary, it can allocate memory to be used
-during other operations.
-
-@subheading NOTES:
-
-This directive may or may not cause the calling task
-to be preempted.  This is dependent on the device driver being
-initialized.
-
-@page
-@subsection IO_REGISTER_NAME - Register a device
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_io_register_name
-@example
-rtems_status_code rtems_io_register_name(
-  char                      *name,
-  rtems_device_major_number  major,
-  rtems_device_minor_number  minor
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure IO_Register_Name (
-   Name   : in     String;
-   Major  : in     RTEMS.Device_Major_Number;
-   Minor  : in     RTEMS.Device_Minor_Number;
-   Result :    out RTEMS.Status_Codes
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-@code{@value{RPREFIX}SUCCESSFUL} - successfully initialized@*
-@code{@value{RPREFIX}TOO_MANY} - too many devices registered
-
-@subheading DESCRIPTION:
-
-This directive associates name with the specified
-major/minor number pair.
-
-@subheading NOTES:
-
-This directive will not cause the calling task to be
-preempted.
-
-@page
-@subsection IO_LOOKUP_NAME - Lookup a device
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_io_lookup_name
-@example
-rtems_status_code rtems_io_lookup_name(
-  const char                *name,
-  rtems_driver_name_t      **device_info
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure IO_Lookup_Name (
-   Name         : in     String;
-   Device_Info  :    out RTEMS.Driver_Name_t;
-   Result       :    out RTEMS.Status_Codes
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-@code{@value{RPREFIX}SUCCESSFUL} - successfully initialized@*
-@code{@value{RPREFIX}UNSATISFIED} - name not registered
-
-@subheading DESCRIPTION:
-
-This directive returns the major/minor number pair
-associated with the given device name in device_info.
-
-@subheading NOTES:
-
-This directive will not cause the calling task to be
-preempted.
-
-@page
-@subsection IO_OPEN - Open a device
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_io_open
-@example
-rtems_status_code rtems_io_open(
-  rtems_device_major_number  major,
-  rtems_device_minor_number  minor,
-  void                      *argument
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure IO_Open (
-   Major        : in     RTEMS.Device_Major_Number;
-   Minor        : in     RTEMS.Device_Minor_Number;
-   Argument     : in     RTEMS.Address;
-   Return_Value :    out RTEMS.Unsigned32;
-   Result       :    out RTEMS.Status_Codes
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-@code{@value{RPREFIX}SUCCESSFUL} - successfully initialized@*
-@code{@value{RPREFIX}INVALID_NUMBER} - invalid major device number
-
-@subheading DESCRIPTION:
-
-This directive calls the device driver open routine
-specified in the Device Driver Table for this major number.  The
-open entry point is commonly used by device drivers to provide
-exclusive access to a device.
-
-@subheading NOTES:
-
-This directive may or may not cause the calling task
-to be preempted.  This is dependent on the device driver being
-invoked.
-
-@page
-@subsection IO_CLOSE - Close a device
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_io_close
-@example
-rtems_status_code rtems_io_close(
-  rtems_device_major_number  major,
-  rtems_device_minor_number  minor,
-  void                      *argument
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure IO_Close (
-   Major        : in     RTEMS.Device_Major_Number;
-   Minor        : in     RTEMS.Device_Minor_Number;
-   Argument     : in     RTEMS.Address;
-   Return_Value :    out RTEMS.Unsigned32;
-   Result       :    out RTEMS.Status_Codes
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-@code{@value{RPREFIX}SUCCESSFUL} - successfully initialized@*
-@code{@value{RPREFIX}INVALID_NUMBER} - invalid major device number
-
-@subheading DESCRIPTION:
-
-This directive calls the device driver close routine
-specified in the Device Driver Table for this major number.  The
-close entry point is commonly used by device drivers to
-relinquish exclusive access to a device.
-
-@subheading NOTES:
-
-This directive may or may not cause the calling task
-to be preempted.  This is dependent on the device driver being
-invoked.
-
-@page
-@subsection IO_READ - Read from a device
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_io_read
-@example
-rtems_status_code rtems_io_read(
-  rtems_device_major_number  major,
-  rtems_device_minor_number  minor,
-  void                      *argument
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure IO_Read (
-   Major        : in     RTEMS.Device_Major_Number;
-   Minor        : in     RTEMS.Device_Minor_Number;
-   Argument     : in     RTEMS.Address;
-   Return_Value :    out RTEMS.Unsigned32;
-   Result       :    out RTEMS.Status_Codes
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-@code{@value{RPREFIX}SUCCESSFUL} - successfully initialized@*
-@code{@value{RPREFIX}INVALID_NUMBER} - invalid major device number
-
-@subheading DESCRIPTION:
-
-This directive calls the device driver read routine
-specified in the Device Driver Table for this major number.
-Read operations typically require a buffer address as part of
-the argument parameter block.  The contents of this buffer will
-be replaced with data from the device.
-
-@subheading NOTES:
-
-This directive may or may not cause the calling task
-to be preempted.  This is dependent on the device driver being
-invoked.
-
-@page
-@subsection IO_WRITE - Write to a device
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_io_write
-@example
-rtems_status_code rtems_io_write(
-  rtems_device_major_number  major,
-  rtems_device_minor_number  minor,
-  void                      *argument
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure IO_Write (
-   Major        : in     RTEMS.Device_Major_Number;
-   Minor        : in     RTEMS.Device_Minor_Number;
-   Argument     : in     RTEMS.Address;
-   Return_Value :    out RTEMS.Unsigned32;
-   Result       :    out RTEMS.Status_Codes
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-@code{@value{RPREFIX}SUCCESSFUL} - successfully initialized@*
-@code{@value{RPREFIX}INVALID_NUMBER} - invalid major device number
-
-@subheading DESCRIPTION:
-
-This directive calls the device driver write routine
-specified in the Device Driver Table for this major number.
-Write operations typically require a buffer address as part of
-the argument parameter block.  The contents of this buffer will
-be sent to the device.
-
-@subheading NOTES:
-
-This directive may or may not cause the calling task
-to be preempted.  This is dependent on the device driver being
-invoked.
-
-@page
-@subsection IO_CONTROL - Special device services
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_io_control
-@example
-rtems_status_code rtems_io_control(
-  rtems_device_major_number  major,
-  rtems_device_minor_number  minor,
-  void                      *argument
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure IO_Control (
-   Major        : in     RTEMS.Device_Major_Number;
-   Minor        : in     RTEMS.Device_Minor_Number;
-   Argument     : in     RTEMS.Address;
-   Return_Value :    out RTEMS.Unsigned32;
-   Result       :    out RTEMS.Status_Codes
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-@code{@value{RPREFIX}SUCCESSFUL} - successfully initialized@*
-@code{@value{RPREFIX}INVALID_NUMBER} - invalid major device number
-
-@subheading DESCRIPTION:
-
-This directive calls the device driver I/O control
-routine specified in the Device Driver Table for this major
-number.  The exact functionality of the driver entry called by
-this directive is driver dependent.  It should not be assumed
-that the control entries of two device drivers are compatible.
-For example, an RS-232 driver I/O control operation may change
-the baud rate of a serial line, while an I/O control operation
-for a floppy disk driver may cause a seek operation.
-
-@subheading NOTES:
-
-This directive may or may not cause the calling task
-to be preempted.  This is dependent on the device driver being
-invoked.
-
-
-
diff --git a/doc/user/mp.t b/doc/user/mp.t
deleted file mode 100644
index bcffdd06a4..0000000000
--- a/doc/user/mp.t
+++ /dev/null
@@ -1,593 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Multiprocessing Manager
-
-@section Introduction
-
-In multiprocessor real-time systems, new
-requirements, such as sharing data and global resources between
-processors, are introduced.  This requires an efficient and
-reliable communications vehicle which allows all processors to
-communicate with each other as necessary.  In addition, the
-ramifications of multiple processors affect each and every
-characteristic of a real-time system, almost always making them
-more complicated.
-
-RTEMS addresses these issues by providing simple and
-flexible real-time multiprocessing capabilities.  The executive
-easily lends itself to both tightly-coupled and loosely-coupled
-configurations of the target system hardware.  In addition,
-RTEMS supports systems composed of both homogeneous and
-heterogeneous mixtures of processors and target boards.
-
-A major design goal of the RTEMS executive was to
-transcend the physical boundaries of the target hardware
-configuration.  This goal is achieved by presenting the
-application software with a logical view of the target system
-where the boundaries between processor nodes are transparent.
-As a result, the application developer may designate objects
-such as tasks, queues, events, signals, semaphores, and memory
-blocks as global objects.  These global objects may then be
-accessed by any task regardless of the physical location of the
-object and the accessing task.  RTEMS automatically determines
-that the object being accessed resides on another processor and
-performs the actions required to access the desired object.
-Simply stated, RTEMS allows the entire system, both hardware and
-software, to be viewed logically as a single system.
-
-@section Background
-
-RTEMS makes no assumptions regarding the connection
-media or topology of a multiprocessor system.  The tasks which
-compose a particular application can be spread among as many
-processors as needed to satisfy the application's timing
-requirements.  The application tasks can interact using a subset
-of the RTEMS directives as if they were on the same processor.
-These directives allow application tasks to exchange data,
-communicate, and synchronize regardless of which processor they
-reside upon.
-
-The RTEMS multiprocessor execution model is multiple
-instruction streams with multiple data streams (MIMD).  This
-execution model has each of the processors executing code
-independent of the other processors.  Because of this
-parallelism, the application designer can more easily guarantee
-deterministic behavior.
-
-By supporting heterogeneous environments, RTEMS
-allows the systems designer to select the most efficient
-processor for each subsystem of the application.  Configuring
-RTEMS for a heterogeneous environment is no more difficult than
-for a homogeneous one.  In keeping with RTEMS philosophy of
-providing transparent physical node boundaries, the minimal
-heterogeneous processing required is isolated in the MPCI layer.
-
-@subsection Nodes
-
-A processor in a RTEMS system is referred to as a
-node.  Each node is assigned a unique non-zero node number by
-the application designer.  RTEMS assumes that node numbers are
-assigned consecutively from one to maximum_nodes.  The node
-number, node, and the maximum number of nodes, maximum_nodes, in
-a system are found in the Multiprocessor Configuration Table.
-The maximum_nodes field and the number of global objects,
-maximum_global_objects, is required to be the same on all nodes
-in a system.
-
-The node number is used by RTEMS to identify each
-node when performing remote operations.  Thus, the
-Multiprocessor Communications Interface Layer (MPCI) must be
-able to route messages based on the node number.
-
-@subsection Global Objects
-
-All RTEMS objects which are created with the GLOBAL
-attribute will be known on all other nodes.  Global objects can
-be referenced from any node in the system, although certain
-directive specific restrictions (e.g. one cannot delete a remote
-object) may apply.  A task does not have to be global to perform
-operations involving remote objects.  The maximum number of
-global objects is the system is user configurable and can be
-found in the maximum_global_objects field in the Multiprocessor
-Configuration Table.  The distribution of tasks to processors is
-performed during the application design phase.  Dynamic task
-relocation is not supported by RTEMS.
-
-@subsection Global Object Table
-
-RTEMS maintains two tables containing object
-information on every node in a multiprocessor system: a local
-object table and a global object table.  The local object table
-on each node is unique and contains information for all objects
-created on this node whether those objects are local or global.
-The global object table contains information regarding all
-global objects in the system and, consequently, is the same on
-every node.
-
-Since each node must maintain an identical copy of
-the global object table,  the maximum number of entries in each
-copy of the table must be the same.  The maximum number of
-entries in each copy is determined by the
-maximum_global_objects parameter in the Multiprocessor
-Configuration Table.  This parameter, as well as the
-maximum_nodes parameter, is required to be the same on all
-nodes.  To maintain consistency among the table copies, every
-node in the system must be informed of the creation or deletion
-of a global object.
-
-@subsection Remote Operations
-
-When an application performs an operation on a remote
-global object, RTEMS must generate a Remote Request (RQ) message
-and send it to the appropriate node.  After completing the
-requested operation, the remote node will build a Remote
-Response (RR) message and send it to the originating node.
-Messages generated as a side-effect of a directive (such as
-deleting a global task) are known as Remote Processes (RP) and
-do not require the receiving node to respond.
-
-Other than taking slightly longer to execute
-directives on remote objects, the application is unaware of the
-location of the objects it acts upon.  The exact amount of
-overhead required for a remote operation is dependent on the
-media connecting the nodes and, to a lesser degree, on the
-efficiency of the user-provided MPCI routines.
-
-The following shows the typical transaction sequence
-during a remote application:
-
-@enumerate
-
-@item The application issues a directive accessing a
-remote global object.
-
-@item RTEMS determines the node on which the object
-resides.
-
-@item RTEMS calls the user-provided MPCI routine
-GET_PACKET to obtain a packet in which to build a RQ message.
-
-@item After building a message packet, RTEMS calls the
-user-provided MPCI routine SEND_PACKET to transmit the packet to
-the node on which the object resides (referred to as the
-destination node).
-
-@item The calling task is blocked until the RR message
-arrives, and control of the processor is transferred to another
-task.
-
-@item The MPCI layer on the destination node senses the
-arrival of a packet (commonly in an ISR), and calls the
-@code{@value{DIRPREFIX}multiprocessing_announce}
-directive.  This directive readies the Multiprocessing Server.
-
-@item The Multiprocessing Server calls the user-provided
-MPCI routine RECEIVE_PACKET, performs the requested operation,
-builds an RR message, and returns it to the originating node.
-
-@item The MPCI layer on the originating node senses the
-arrival of a packet (typically via an interrupt), and calls the RTEMS
-@code{@value{DIRPREFIX}multiprocessing_announce} directive.  This directive
-readies the Multiprocessing Server.
-
-@item The Multiprocessing Server calls the user-provided
-MPCI routine RECEIVE_PACKET, readies the original requesting
-task, and blocks until another packet arrives.  Control is
-transferred to the original task which then completes processing
-of the directive.
-
-@end enumerate
-
-If an uncorrectable error occurs in the user-provided
-MPCI layer, the fatal error handler should be invoked.  RTEMS
-assumes the reliable transmission and reception of messages by
-the MPCI and makes no attempt to detect or correct errors.
-
-@subsection Proxies
-
-A proxy is an RTEMS data structure which resides on a
-remote node and is used to represent a task which must block as
-part of a remote operation. This action can occur as part of the
-@code{@value{DIRPREFIX}semaphore_obtain} and
-@code{@value{DIRPREFIX}message_queue_receive} directives.  If the
-object were local, the task's control block would be available
-for modification to indicate it was blocking on a message queue
-or semaphore.  However, the task's control block resides only on
-the same node as the task.  As a result, the remote node must
-allocate a proxy to represent the task until it can be readied.
-
-The maximum number of proxies is defined in the
-Multiprocessor Configuration Table.  Each node in a
-multiprocessor system may require a different number of proxies
-to be configured.  The distribution of proxy control blocks is
-application dependent and is different from the distribution of
-tasks.
-
-@subsection Multiprocessor Configuration Table
-
-The Multiprocessor Configuration Table contains
-information needed by RTEMS when used in a multiprocessor
-system.  This table is discussed in detail in the section
-Multiprocessor Configuration Table of the Configuring a System
-chapter.
-
-@section Multiprocessor Communications Interface Layer
-
-The Multiprocessor Communications Interface Layer
-(MPCI) is a set of user-provided procedures which enable the
-nodes in a multiprocessor system to communicate with one
-another.  These routines are invoked by RTEMS at various times
-in the preparation and processing of remote requests.
-Interrupts are enabled when an MPCI procedure is invoked.  It is
-assumed that if the execution mode and/or interrupt level are
-altered by the MPCI layer, that they will be restored prior to
-returning to RTEMS.
-
-The MPCI layer is responsible for managing a pool of
-buffers called packets and for sending these packets between
-system nodes.  Packet buffers contain the messages sent between
-the nodes.  Typically, the MPCI layer will encapsulate the
-packet within an envelope which contains the information needed
-by the MPCI layer.  The number of packets available is dependent
-on the MPCI layer implementation.
-
-The entry points to the routines in the user's MPCI
-layer should be placed in the Multiprocessor Communications
-Interface Table.  The user must provide entry points for each of
-the following table entries in a multiprocessor system:
-
-@itemize @bullet
-@item initialization 	initialize the MPCI
-@item get_packet 	obtain a packet buffer
-@item return_packet 	return a packet buffer
-@item send_packet 	send a packet to another node
-@item receive_packet 	called to get an arrived packet
-@end itemize
-
-A packet is sent by RTEMS in each of the following
-situations:
-
-@itemize @bullet
-@item an RQ is generated on an originating node;
-@item an RR is generated on a destination node;
-@item a global object is created;
-@item a global object is deleted;
-@item a local task blocked on a remote object is deleted;
-@item during system initialization to check for system consistency.
-@end itemize
-
-If the target hardware supports it, the arrival of a
-packet at a node may generate an interrupt.  Otherwise, the
-real-time clock ISR can check for the arrival of a packet.  In
-any case, the 
-@code{@value{DIRPREFIX}multiprocessing_announce} directive must be called
-to announce the arrival of a packet.  After exiting the ISR,
-control will be passed to the Multiprocessing Server to process
-the packet.  The Multiprocessing Server will call the get_packet
-entry to obtain a packet buffer and the receive_entry entry to
-copy the message into the buffer obtained.
-
-@subsection INITIALIZATION
-
-The INITIALIZATION component of the user-provided
-MPCI layer is called as part of the @code{@value{DIRPREFIX}initialize_executive}
-directive to initialize the MPCI layer and associated hardware.
-It is invoked immediately after all of the device drivers have
-been initialized.  This component should be adhere to the
-following prototype:
-
-@ifset is-C
-@example
-@group
-rtems_mpci_entry user_mpci_initialization(
-  rtems_configuration_table *configuration
-);
-@end group
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure User_MPCI_Initialization (
-   Configuration : in     RTEMS.Configuration_Table_Pointer
-);
-@end example
-@end ifset
-
-where configuration is the address of the user's
-Configuration Table.  Operations on global objects cannot be
-performed until this component is invoked.  The INITIALIZATION
-component is invoked only once in the life of any system.  If
-the MPCI layer cannot be successfully initialized, the fatal
-error manager should be invoked by this routine.
-
-One of the primary functions of the MPCI layer is to
-provide the executive with packet buffers.  The INITIALIZATION
-routine must create and initialize a pool of packet buffers.
-There must be enough packet buffers so RTEMS can obtain one
-whenever needed.
-
-@subsection GET_PACKET
-
-The GET_PACKET component of the user-provided MPCI
-layer is called when RTEMS must obtain a packet buffer to send
-or broadcast a message.  This component should be adhere to the
-following prototype:
-
-@ifset is-C
-@example
-@group
-rtems_mpci_entry user_mpci_get_packet(
-  rtems_packet_prefix **packet
-);
-@end group
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure User_MPCI_Get_Packet (
-   Packet : access RTEMS.Packet_Prefix_Pointer
-);
-@end example
-@end ifset
-
-where packet is the address of a pointer to a packet.
-This routine always succeeds and, upon return, packet will
-contain the address of a packet.  If for any reason, a packet
-cannot be successfully obtained, then the fatal error manager
-should be invoked.
-
-RTEMS has been optimized to avoid the need for
-obtaining a packet each time a message is sent or broadcast.
-For example, RTEMS sends response messages (RR) back to the
-originator in the same packet in which the request message (RQ)
-arrived.
-
-@subsection RETURN_PACKET
-
-The RETURN_PACKET component of the user-provided MPCI
-layer is called when RTEMS needs to release a packet to the free
-packet buffer pool.  This component should be adhere to the
-following prototype:
-
-@ifset is-C
-@example
-@group
-rtems_mpci_entry user_mpci_return_packet(
-  rtems_packet_prefix *packet
-);
-@end group
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure User_MPCI_Return_Packet (
-   Packet : in     RTEMS.Packet_Prefix_Pointer
-);
-@end example
-@end ifset
-
-where packet is the address of a packet.  If the
-packet cannot be successfully returned, the fatal error manager
-should be invoked.
-
-@subsection RECEIVE_PACKET
-
-The RECEIVE_PACKET component of the user-provided
-MPCI layer is called when RTEMS needs to obtain a packet which
-has previously arrived.  This component should be adhere to the
-following prototype:
-
-@ifset is-C
-@example
-@group
-rtems_mpci_entry user_mpci_receive_packet(
-  rtems_packet_prefix **packet
-);
-@end group
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure User_MPCI_Receive_Packet (
-   Packet : access RTEMS.Packet_Prefix_Pointer
-);
-@end example
-@end ifset
-
-where packet is a pointer to the address of a packet
-to place the message from another node.  If a message is
-available, then packet will contain the address of the message
-from another node.  If no messages are available, this entry
-packet should contain NULL.
-
-@subsection SEND_PACKET
-
-The SEND_PACKET component of the user-provided MPCI
-layer is called when RTEMS needs to send a packet containing a
-message to another node.  This component should be adhere to the
-following prototype:
-
-@ifset is-C
-@example
-@group
-rtems_mpci_entry user_mpci_send_packet(
-  rtems_unsigned32       node,
-  rtems_packet_prefix  **packet
-);
-@end group
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure User_MPCI_Send_Packet (
-   Node   : in     RTEMS.Unsigned32;
-   Packet : access RTEMS.Packet_Prefix_Pointer
-);
-@end example
-@end ifset
-
-where node is the node number of the destination and packet is the 
-address of a packet which containing a message.  If the packet cannot 
-be successfully sent, the fatal error manager should be invoked.
-
-If node is set to zero, the packet is to be
-broadcasted to all other nodes in the system.  Although some
-MPCI layers will be built upon hardware which support a
-broadcast mechanism, others may be required to generate a copy
-of the packet for each node in the system.
-
-Many MPCI layers use the packet_length field of the MP_packet_prefix
-of the packet to avoid sending unnecessary data.  This is especially 
-useful if the media connecting the nodes is relatively slow.
-
-The to_convert field of the MP_packet_prefix portion of the packet indicates
-how much of the packet (in unsigned32's) may require conversion in a 
-heterogeneous system.
-
-@subsection Supporting Heterogeneous Environments
-
-Developing an MPCI layer for a heterogeneous system
-requires a thorough understanding of the differences between the
-processors which comprise the system.  One difficult problem is
-the varying data representation schemes used by different
-processor types.  The most pervasive data representation problem
-is the order of the bytes which compose a data entity.
-Processors which place the least significant byte at the
-smallest address are classified as little endian processors.
-Little endian byte-ordering is shown below:
-
-
-@example
-@group
-+---------------+----------------+---------------+----------------+
-|               |                |               |                |
-|    Byte 3     |     Byte 2     |    Byte 1     |    Byte 0      |
-|               |                |               |                |
-+---------------+----------------+---------------+----------------+
-@end group
-@end example
-
-Conversely, processors which place the most
-significant byte at the smallest address are classified as big
-endian processors.  Big endian byte-ordering is shown below:
-
-@example
-@group
-+---------------+----------------+---------------+----------------+
-|               |                |               |                |
-|    Byte 0     |     Byte 1     |    Byte 2     |    Byte 3      |
-|               |                |               |                |
-+---------------+----------------+---------------+----------------+
-@end group
-@end example
-
-Unfortunately, sharing a data structure between big
-endian and little endian processors requires translation into a
-common endian format.  An application designer typically chooses
-the common endian format to minimize conversion overhead.
-
-Another issue in the design of shared data structures
-is the alignment of data structure elements.  Alignment is both
-processor and compiler implementation dependent.  For example,
-some processors allow data elements to begin on any address
-boundary, while others impose restrictions.  Common restrictions
-are that data elements must begin on either an even address or
-on a long word boundary.  Violation of these restrictions may
-cause an exception or impose a performance penalty.
-
-Other issues which commonly impact the design of
-shared data structures include the representation of floating
-point numbers, bit fields, decimal data, and character strings.
-In addition, the representation method for negative integers
-could be one's or two's complement.  These factors combine to
-increase the complexity of designing and manipulating data
-structures shared between processors.
-
-RTEMS addressed these issues in the design of the
-packets used to communicate between nodes.  The RTEMS packet
-format is designed to allow the MPCI layer to perform all
-necessary conversion without burdening the developer with the
-details of the RTEMS packet format.  As a result, the MPCI layer
-must be aware of the following:
-
-@itemize @bullet
-@item All packets must begin on a four byte boundary.
-
-@item Packets are composed of both RTEMS and application data.
-All RTEMS data is treated as thirty-two (32) bit unsigned
-quantities and is in the first @code{@value{RPREFIX}MINIMUM_UNSIGNED32S_TO_CONVERT}
-thirty-two (32) quantities of the packet.
-
-@item The RTEMS data component of the packet must be in native
-endian format.  Endian conversion may be performed by either the
-sending or receiving MPCI layer.
-
-@item RTEMS makes no assumptions regarding the application
-data component of the packet.
-@end itemize
-
-@section Operations
-
-@subsection Announcing a Packet
-
-The @code{@value{DIRPREFIX}multiprocessing_announce} directive is called by
-the MPCI layer to inform RTEMS that a packet has arrived from
-another node.  This directive can be called from an interrupt
-service routine or from within a polling routine.
-
-@section Directives
-
-This section details the additional directives
-required to support RTEMS in a multiprocessor configuration.  A
-subsection is dedicated to each of this manager's directives and
-describes the calling sequence, related constants, usage, and
-status codes.
-
-@page
-@subsection MULTIPROCESSING_ANNOUNCE - Announce the arrival of a packet
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_multiprocessing_announce
-@example
-void rtems_multiprocessing_announce( void );
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure Multiprocessing_Announce;
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-
-NONE
-
-@subheading DESCRIPTION:
-
-This directive informs RTEMS that a multiprocessing
-communications packet has arrived from another node.  This
-directive is called by the user-provided MPCI, and is only used
-in multiprocessor configurations.
-
-@subheading NOTES:
-
-This directive is typically called from an ISR.
-
-This directive will almost certainly cause the
-calling task to be preempted.
-
-This directive does not generate activity on remote nodes.
diff --git a/doc/user/msg.t b/doc/user/msg.t
deleted file mode 100644
index b593e17bf5..0000000000
--- a/doc/user/msg.t
+++ /dev/null
@@ -1,774 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Message Manager
-
-@section Introduction
-
-The message manager provides communication and
-synchronization capabilities using RTEMS message queues.  The
-directives provided by the message manager are:
-
-@itemize @bullet
-@item @code{@value{DIRPREFIX}message_queue_create} - Create a queue
-@item @code{@value{DIRPREFIX}message_queue_ident} - Get ID of a queue
-@item @code{@value{DIRPREFIX}message_queue_delete} - Delete a queue
-@item @code{@value{DIRPREFIX}message_queue_send} - Put message at rear of a queue
-@item @code{@value{DIRPREFIX}message_queue_urgent} - Put message at front of a queue
-@item @code{@value{DIRPREFIX}message_queue_broadcast} - Broadcast N messages to a queue
-@item @code{@value{DIRPREFIX}message_queue_receive} - Receive message from a queue
-@item @code{@value{DIRPREFIX}message_queue_get_number_pending} - Get number of messages pending on a queue
-@item @code{@value{DIRPREFIX}message_queue_flush} - Flush all messages on a queue
-@end itemize
-
-@section Background
-
-@subsection Messages
-
-A message is a variable length buffer where
-information can be stored to support communication.  The length
-of the message and the information stored in that message are
-user-defined and can be actual data, pointer(s), or empty.
-
-@subsection Message Queues
-
-A message queue permits the passing of messages among
-tasks and ISRs.  Message queues can contain a variable number of
-messages.  Normally messages are sent to and received from the
-queue in FIFO order using the @code{@value{DIRPREFIX}message_queue_send}
-directive.  However, the @code{@value{DIRPREFIX}message_queue_urgent}
-directive can be used to place
-messages at the head of a queue in LIFO order.
-
-Synchronization can be accomplished when a task can
-wait for a message to arrive at a queue.  Also, a task may poll
-a queue for the arrival of a message.
-
-The maximum length message which can be sent is set
-on a per message queue basis.
-
-@subsection Building a Message Queue's Attribute Set
-
-In general, an attribute set is built by a bitwise OR
-of the desired attribute components.  The set of valid message
-queue attributes is provided in the following table:
-
-@itemize @bullet
-@item @code{@value{RPREFIX}FIFO} - tasks wait by FIFO (default)
-@item @code{@value{RPREFIX}PRIORITY} - tasks wait by priority
-@item @code{@value{RPREFIX}LOCAL} - local message queue (default)
-@item @code{@value{RPREFIX}GLOBAL} - global message queue
-@end itemize
-
-
-An attribute listed as a default is not required to
-appear in the attribute list, although it is a good programming
-practice to specify default attributes.  If all defaults are
-desired, the attribute @code{@value{RPREFIX}DEFAULT_ATTRIBUTES}
-should be specified on this call.
-
-This example demonstrates the attribute_set parameter
-needed to create a local message queue with the task priority
-waiting queue discipline.  The attribute_set parameter to the
-@code{@value{DIRPREFIX}message_queue_create} directive could be either 
-@code{@value{RPREFIX}PRIORITY} or
-@code{@value{RPREFIX}LOCAL @value{OR} @value{RPREFIX}PRIORITY}.  
-The attribute_set parameter can be set to @code{@value{RPREFIX}PRIORITY}
-because @code{@value{RPREFIX}LOCAL} is the default for all created
-message queues.  If a similar message queue were to be known globally, then the
-attribute_set parameter would be
-@code{@value{RPREFIX}GLOBAL @value{OR} @value{RPREFIX}PRIORITY}.
-
-@subsection Building a MESSAGE_QUEUE_RECEIVE Option Set
-
-In general, an option is built by a bitwise OR of the
-desired option components.  The set of valid options for the
-@code{@value{DIRPREFIX}message_queue_receive} directive are
-listed in the following table:
-
-@itemize @bullet
-@item @code{@value{RPREFIX}WAIT} - task will wait for a message (default)
-@item @code{@value{RPREFIX}NO_WAIT} - task should not wait
-@end itemize
-
-An option listed as a default is not required to
-appear in the option OR list, although it is a good programming
-practice to specify default options.  If all defaults are
-desired, the option @code{@value{RPREFIX}DEFAULT_OPTIONS} should
-be specified on this call.
-
-This example demonstrates the option parameter needed
-to poll for a message to arrive.  The option parameter passed to
-the @code{@value{DIRPREFIX}message_queue_receive} directive should
-be @code{@value{RPREFIX}NO_WAIT}.
-
-@section Operations
-
-@subsection Creating a Message Queue
-
-The @code{@value{DIRPREFIX}message_queue_create} directive creates a message
-queue with the user-defined name.  The user specifies the
-maximum message size and maximum number of messages which can be
-placed in the message queue at one time.  The user may select
-FIFO or task priority as the method for placing waiting tasks in
-the task wait queue.  RTEMS allocates a Queue Control Block
-(QCB) from the QCB free list to maintain the newly created queue
-as well as memory for the message buffer pool associated with
-this message queue.  RTEMS also generates a message queue ID
-which is returned to the calling task.
-
-For GLOBAL message queues, the maximum message size
-is effectively limited to the longest message which the MPCI is
-capable of transmitting.
-
-@subsection Obtaining Message Queue IDs
-
-When a message queue is created, RTEMS generates a
-unique message queue ID.  The message queue ID may be obtained
-by either of two methods.  First, as the result of an invocation
-of the @code{@value{DIRPREFIX}message_queue_create} directive, the
-queue ID is stored in a user provided location.  Second, the queue
-ID may be obtained later using the @code{@value{DIRPREFIX}message_queue_ident}
-directive.  The queue ID is used by other message manager
-directives to access this message queue.
-
-@subsection Receiving a Message
-
-The @code{@value{DIRPREFIX}message_queue_receive} directive attempts to
-retrieve a message from the specified message queue.  If at
-least one message is in the queue, then the message is removed
-from the queue, copied to the caller's message buffer, and
-returned immediately along with the length of the message.  When
-messages are unavailable, one of the following situations
-applies:
-
-@itemize @bullet
-@item By default, the calling task will wait forever for the
-message to arrive.
-
-@item Specifying the @code{@value{RPREFIX}NO_WAIT} option forces an immediate return
-with an error status code.
-
-@item Specifying a timeout limits the period the task will
-wait before returning with an error status.
-@end itemize
-
-If the task waits for a message, then it is placed in
-the message queue's task wait queue in either FIFO or task
-priority order.  All tasks waiting on a message queue are
-returned an error code when the message queue is deleted.
-
-@subsection Sending a Message
-
-Messages can be sent to a queue with the
-@code{@value{DIRPREFIX}message_queue_send} and
-@code{@value{DIRPREFIX}message_queue_urgent} directives.  These
-directives work identically when tasks are waiting to receive a
-message.  A task is removed from the task waiting queue,
-unblocked,  and the message is copied to a waiting task's
-message buffer.
-
-When no tasks are waiting at the queue,
-@code{@value{DIRPREFIX}message_queue_send} places the
-message at the rear of the message queue, while
-@code{@value{DIRPREFIX}message_queue_urgent} places the message at the
-front of the queue.  The message is copied to a message buffer
-from this message queue's buffer pool and then placed in the
-message queue.  Neither directive can successfully send a
-message to a message queue which has a full queue of pending
-messages.
-
-@subsection Broadcasting a Message
-
-The @code{@value{DIRPREFIX}message_queue_broadcast} directive sends the same
-message to every task waiting on the specified message queue as
-an atomic operation.  The message is copied to each waiting
-task's message buffer and each task is unblocked.  The number of
-tasks which were unblocked is returned to the caller.
-
-@subsection Deleting a Message Queue
-
-The @code{@value{DIRPREFIX}message_queue_delete} directive removes a message
-queue from the system and frees its control block as well as the
-memory associated with this message queue's message buffer pool.
-A message queue can be deleted by any local task that knows the
-message queue's ID.  As a result of this directive, all tasks
-blocked waiting to receive a message from the message queue will
-be readied and returned a status code which indicates that the
-message queue was deleted.  Any subsequent references to the
-message queue's name and ID are invalid.  Any messages waiting
-at the message queue are also deleted and deallocated.
-
-@section Directives
-
-This section details the message manager's
-directives.  A subsection is dedicated to each of this manager's
-directives and describes the calling sequence, related
-constants, usage, and status codes.
-
-@page
-@subsection MESSAGE_QUEUE_CREATE - Create a queue
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_message_queue_create
-@example
-rtems_status_code rtems_message_queue_create(
-  rtems_name        name,
-  rtems_unsigned32  count,
-  rtems_unsigned32  max_message_size,
-  rtems_attribute   attribute_set,
-  rtems_id         *id
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure Message_Queue_Create (
-   Name             : in     RTEMS.Name;
-   Count            : in     RTEMS.Unsigned32;
-   Max_Message_Size : in     RTEMS.Unsigned32;
-   Attribute_Set    : in     RTEMS.Attribute;
-   ID               :    out RTEMS.ID;
-   Result           :    out RTEMS.Status_Codes
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-@code{@value{RPREFIX}SUCCESSFUL} - queue created successfully@*
-@code{@value{RPREFIX}INVALID_NAME} - invalid task name@*
-@code{@value{RPREFIX}INVALID_NUMBER} - invalid message count@*
-@code{@value{RPREFIX}INVALID_SIZE} - invalid message size@*
-@code{@value{RPREFIX}TOO_MANY} - too many queues created@*
-@code{@value{RPREFIX}MP_NOT_CONFIGURED} - multiprocessing not configured@*
-@code{@value{RPREFIX}TOO_MANY} - too many global objects
-
-@subheading DESCRIPTION:
-
-This directive creates a message queue which resides
-on the local node with the user-defined name specified in name.
-For control and maintenance of the queue, RTEMS allocates and
-initializes a QCB.  Memory is allocated from the RTEMS Workspace
-for the specified count of messages, each of max_message_size
-bytes in length.  The RTEMS-assigned queue id, returned in id,
-is used to access the message queue.
-
-Specifying @code{@value{RPREFIX}PRIORITY} in attribute_set causes tasks
-waiting for a message to be serviced according to task priority.
-When @code{@value{RPREFIX}FIFO} is specified, waiting tasks are serviced in First
-In-First Out order.
-
-@subheading NOTES:
-
-This directive will not cause the calling task to be
-preempted.
-
-The following message queue attribute constants are
-defined by RTEMS:
-
-@itemize @bullet
-@item @code{@value{RPREFIX}FIFO} - tasks wait by FIFO (default)
-@item @code{@value{RPREFIX}PRIORITY} - tasks wait by priority
-@item @code{@value{RPREFIX}LOCAL} - local message queue (default)
-@item @code{@value{RPREFIX}GLOBAL} - global message queue
-@end itemize
-
-Message queues should not be made global unless
-remote tasks must interact with the created message queue.  This
-is to avoid the system overhead incurred by the creation of a
-global message queue.  When a global message queue is created,
-the message queue's name and id must be transmitted to every
-node in the system for insertion in the local copy of the global
-object table.
-
-For GLOBAL message queues, the maximum message size
-is effectively limited to the longest message which the MPCI is
-capable of transmitting.
-
-The total number of global objects, including message
-queues, is limited by the maximum_global_objects field in the
-configuration table.
-
-@page
-@subsection MESSAGE_QUEUE_IDENT - Get ID of a queue
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_message_queue_ident
-@example
-rtems_status_code rtems_message_queue_ident(
-  rtems_name        name,
-  rtems_unsigned32  node,
-  rtems_id         *id
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure Message_Queue_Ident (
-   Name   : in     RTEMS.Name;
-   Node   : in     RTEMS.Unsigned32;
-   ID     :    out RTEMS.ID;
-   Result :    out RTEMS.Status_Codes
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-@code{@value{RPREFIX}SUCCESSFUL} - queue identified successfully@*
-@code{@value{RPREFIX}INVALID_NAME} - queue name not found@*
-@code{@value{RPREFIX}INVALID_NODE} - invalid node id
-
-@subheading DESCRIPTION:
-
-This directive obtains the queue id associated with
-the queue name specified in name.  If the queue name is not
-unique, then the queue id will match one of the queues with that
-name.  However, this queue id is not guaranteed to correspond to
-the desired queue.  The queue id is used with other message
-related directives to access the message queue.
-
-@subheading NOTES:
-
-This directive will not cause the running task to be
-preempted.
-
-If node is @code{@value{RPREFIX}SEARCH_ALL_NODES}, all nodes are searched
-with the local node being searched first.  All other nodes are
-searched with the lowest numbered node searched first.
-
-If node is a valid node number which does not
-represent the local node, then only the message queues exported
-by the designated node are searched.
-
-This directive does not generate activity on remote
-nodes.  It accesses only the local copy of the global object
-table.
-
-@page
-@subsection MESSAGE_QUEUE_DELETE - Delete a queue
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_message_queue_delete
-@example
-rtems_status_code rtems_message_queue_delete(
-  rtems_id id
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure Message_Queue_Delete (
-   ID     : in     RTEMS.ID;
-   Result :    out RTEMS.Status_Codes
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-@code{@value{RPREFIX}SUCCESSFUL} - queue deleted successfully@*
-@code{@value{RPREFIX}INVALID_ID} - invalid queue id@*
-@code{@value{RPREFIX}ILLEGAL_ON_REMOTE_OBJECT} - cannot delete remote queue
-
-@subheading DESCRIPTION:
-
-This directive deletes the message queue specified by
-id.  As a result of this directive, all tasks blocked waiting to
-receive a message from this queue will be readied and returned a
-status code which indicates that the message queue was deleted.
-If no tasks are waiting, but the queue contains messages, then
-RTEMS returns these message buffers back to the system message
-buffer pool.  The QCB for this queue as well as the memory for
-the message buffers is reclaimed by RTEMS.
-
-@subheading NOTES:
-
-The calling task will be preempted if its preemption
-mode is enabled and one or more local tasks with a higher
-priority than the calling task are waiting on the deleted queue.
-The calling task will NOT be preempted if the tasks that are
-waiting are remote tasks.
-
-The calling task does not have to be the task that
-created the queue, although the task and queue must reside on
-the same node.
-
-When the queue is deleted, any messages in the queue
-are returned to the free message buffer pool.  Any information
-stored in those messages is lost.
-
-When a global message queue is deleted, the message
-queue id must be transmitted to every node in the system for
-deletion from the local copy of the global object table.
-
-Proxies, used to represent remote tasks, are
-reclaimed when the message queue is deleted.
-
-@page
-@subsection MESSAGE_QUEUE_SEND - Put message at rear of a queue
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_message_queue_send
-@example
-rtems_status_code rtems_message_queue_send(
-  rtems_id           id,
-  void              *buffer,
-  rtems_unsigned32   size
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure Message_Queue_Send (
-   ID     : in     RTEMS.ID;
-   Buffer : in     RTEMS.Address;
-   Size   : in     RTEMS.Unsigned32;
-   Result :    out RTEMS.Status_Codes
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-@code{@value{RPREFIX}SUCCESSFUL} - message sent successfully@*
-@code{@value{RPREFIX}INVALID_ID} - invalid queue id@*
-@code{@value{RPREFIX}INVALID_SIZE} - invalid message size@*
-@code{@value{RPREFIX}UNSATISFIED} - out of message buffers@*
-@code{@value{RPREFIX}TOO_MANY} - queue's limit has been reached
-
-@subheading DESCRIPTION:
-
-This directive sends the message buffer of size bytes
-in length to the queue specified by id.  If a task is waiting at
-the queue, then the message is copied to the waiting task's
-buffer and the task is unblocked. If no tasks are waiting at the
-queue, then the message is copied to a message buffer which is
-obtained from this message queue's message buffer pool.  The
-message buffer is then placed at the rear of the queue.
-
-@subheading NOTES:
-
-The calling task will be preempted if it has
-preemption enabled and a higher priority task is unblocked as
-the result of this directive.
-
-Sending a message to a global message queue which
-does not reside on the local node will generate a request to the
-remote node to post the message on the specified message queue.
-
-If the task to be unblocked resides on a different
-node from the message queue, then the message is forwarded to
-the appropriate node, the waiting task is unblocked, and the
-proxy used to represent the task is reclaimed.
-
-@page
-@subsection MESSAGE_QUEUE_URGENT - Put message at front of a queue
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_message_queue_urgent
-@example
-rtems_status_code rtems_message_queue_urgent(
-  rtems_id           id,
-  void              *buffer,
-  rtems_unsigned32   size
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure Message_Queue_Urgent (
-   ID     : in     RTEMS.ID;
-   Buffer : in     RTEMS.Address;
-   Size   : in     RTEMS.Unsigned32;
-   Result :    out RTEMS.Status_Codes
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-@code{@value{RPREFIX}SUCCESSFUL} - message sent successfully@*
-@code{@value{RPREFIX}INVALID_ID} - invalid queue id@*
-@code{@value{RPREFIX}INVALID_SIZE} - invalid message size@*
-@code{@value{RPREFIX}UNSATISFIED} - out of message buffers@*
-@code{@value{RPREFIX}TOO_MANY} - queue's limit has been reached
-
-@subheading DESCRIPTION:
-
-This directive sends the message buffer of size bytes
-in length to the queue specified by id.  If a task is waiting on
-the queue, then the message is copied to the task's buffer and
-the task is unblocked.  If no tasks are waiting on the queue,
-then the message is copied to a message buffer which is obtained
-from this message queue's message buffer pool.  The message
-buffer is then placed at the front of the queue.
-
-@subheading NOTES:
-
-The calling task will be preempted if it has
-preemption enabled and a higher priority task is unblocked as
-the result of this directive.
-
-Sending a message to a global message queue which
-does not reside on the local node will generate a request
-telling the remote node to post the message on the specified
-message queue.
-
-If the task to be unblocked resides on a different
-node from the message queue, then the message is forwarded to
-the appropriate node, the waiting task is unblocked, and the
-proxy used to represent the task is reclaimed.
-
-@page
-@subsection MESSAGE_QUEUE_BROADCAST - Broadcast N messages to a queue
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_message_queue_broadcast
-@example
-rtems_status_code rtems_message_queue_broadcast(
-  rtems_id           id,
-  void              *buffer,
-  rtems_unsigned32   size,
-  rtems_unsigned32  *count
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure Message_Queue_Broadcast (
-   ID     : in     RTEMS.ID;
-   Buffer : in     RTEMS.Address;
-   Size   : in     RTEMS.Unsigned32;
-   Count  :    out RTEMS.Unsigned32;
-   Result :    out RTEMS.Status_Codes
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-@code{@value{RPREFIX}SUCCESSFUL} - message broadcasted successfully@*
-@code{@value{RPREFIX}INVALID_ID} - invalid queue id@*
-@code{@value{RPREFIX}INVALID_SIZE} - invalid message size
-
-@subheading DESCRIPTION:
-
-This directive causes all tasks that are waiting at
-the queue specified by id to be unblocked and sent the message
-contained in buffer.  Before a task is unblocked, the message
-buffer of size byes in length is copied to that task's message
-buffer.  The number of tasks that were unblocked is returned in
-count.
-
-@subheading NOTES:
-
-The calling task will be preempted if it has
-preemption enabled and a higher priority task is unblocked as
-the result of this directive.
-
-The execution time of this directive is directly
-related to the number of tasks waiting on the message queue,
-although it is more efficient than the equivalent number of
-invocations of @code{@value{DIRPREFIX}message_queue_send}.
-
-Broadcasting a message to a global message queue
-which does not reside on the local node will generate a request
-telling the remote node to broadcast the message to the
-specified message queue.
-
-When a task is unblocked which resides on a different
-node from the message queue, a copy of the message is forwarded
-to the appropriate node,  the waiting task is unblocked, and the
-proxy used to represent the task is reclaimed.
-
-@page
-@subsection MESSAGE_QUEUE_RECEIVE - Receive message from a queue
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_message_queue_receive
-@example
-rtems_status_code rtems_message_queue_receive(
-  rtems_id           id,
-  void              *buffer,
-  rtems_unsigned32  *size,
-  rtems_unsigned32   option_set,
-  rtems_interval     timeout
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure Message_Queue_Receive (
-   ID         : in     RTEMS.ID;
-   Buffer     : in     RTEMS.Address;
-   Option_Set : in     RTEMS.Option;
-   Timeout    : in     RTEMS.Interval;
-   Size       :    out RTEMS.Unsigned32;
-   Result     :    out RTEMS.Status_Codes
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-@code{@value{RPREFIX}SUCCESSFUL} - message received successfully@*
-@code{@value{RPREFIX}INVALID_ID} - invalid queue id@*
-@code{@value{RPREFIX}UNSATISFIED} - queue is empty@*
-@code{@value{RPREFIX}TIMEOUT} - timed out waiting for message@*
-@code{@value{RPREFIX}OBJECT_WAS_DELETED} - queue deleted while waiting
-
-@subheading DESCRIPTION:
-
-This directive receives a message from the message
-queue specified in id.  The @code{@value{RPREFIX}WAIT} and @code{@value{RPREFIX}NO_WAIT} options of the
-options parameter allow the calling task to specify whether to
-wait for a message to become available or return immediately.
-For either option, if there is at least one message in the
-queue, then it is copied to buffer, size is set to return the
-length of the message in bytes, and this directive returns
-immediately with a successful return code.
-
-If the calling task chooses to return immediately and
-the queue is empty, then a status code indicating this condition
-is returned.  If the calling task chooses to wait at the message
-queue and the queue is empty, then the calling task is placed on
-the message wait queue and blocked.  If the queue was created
-with the @code{@value{RPREFIX}PRIORITY} option specified, then
-the calling task is inserted into the wait queue according to
-its priority.  But, if the queue was created with the
-@code{@value{RPREFIX}FIFO} option specified, then the
-calling task is placed at the rear of the wait queue.
-
-A task choosing to wait at the queue can optionally
-specify a timeout value in the timeout parameter.  The timeout
-parameter specifies the maximum interval to wait before the
-calling task desires to be unblocked.  If it is set to
-@code{@value{RPREFIX}NO_TIMEOUT}, then the calling task will wait forever.
-
-@subheading NOTES:
-
-The following message receive option constants are
-defined by RTEMS:
-
-@itemize @bullet
-@item @code{@value{RPREFIX}WAIT} - task will wait for a message (default)
-@item @code{@value{RPREFIX}NO_WAIT} - task should not wait
-@end itemize
-
-Receiving a message from a global message queue which
-does not reside on the local node will generate a request to the
-remote node to obtain a message from the specified message
-queue.  If no message is available and @code{@value{RPREFIX}WAIT} was specified, then
-the task must be blocked until a message is posted.  A proxy is
-allocated on the remote node to represent the task until the
-message is posted.
-
-A clock tick is required to support the timeout functionality of
-this directive.
-
-@page
-@subsection MESSAGE_QUEUE_GET_NUMBER_PENDING - Get number of messages pending on a queue
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_message_queue_get_number_pending
-@example
-rtems_status_code rtems_message_queue_get_number_pending(
-  rtems_id          id,
-  rtems_unsigned32 *count
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure Message_Queue_Get_Number_Pending (
-   ID     : in     RTEMS.ID;
-   Count  :    out RTEMS.Unsigned32;
-   Result :    out RTEMS.Status_Codes
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-@code{@value{RPREFIX}SUCCESSFUL} - number of messages pending returned successfully@*
-@code{@value{RPREFIX}INVALID_ID} - invalid queue id
-
-@subheading DESCRIPTION:
-
-This directive returns the number of messages pending on this
-message queue in count.  If no messages are present
-on the queue, count is set to zero.
-
-@subheading NOTES:
-
-Getting the number of pending messages on a global message queue which
-does not reside on the local node will generate a request to the
-remote node to actually obtain the pending message count for
-the specified message queue.
-
-
-@page
-@subsection MESSAGE_QUEUE_FLUSH - Flush all messages on a queue
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_message_queue_flush
-@example
-rtems_status_code rtems_message_queue_flush(
-  rtems_id          id,
-  rtems_unsigned32 *count
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure Message_Queue_Flush (
-   ID     : in     RTEMS.ID;
-   Count  :    out RTEMS.Unsigned32;
-   Result :    out RTEMS.Status_Codes
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-@code{@value{RPREFIX}SUCCESSFUL} - message queue flushed successfully@*
-@code{@value{RPREFIX}INVALID_ID} - invalid queue id
-
-@subheading DESCRIPTION:
-
-This directive removes all pending messages from the
-specified queue id.  The number of messages removed is returned
-in count.  If no messages are present on the queue, count is set
-to zero.
-
-@subheading NOTES:
-
-Flushing all messages on a global message queue which
-does not reside on the local node will generate a request to the
-remote node to actually flush the specified message queue.
-
diff --git a/doc/user/overview.t b/doc/user/overview.t
deleted file mode 100644
index 3bb79a2054..0000000000
--- a/doc/user/overview.t
+++ /dev/null
@@ -1,530 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@c
-@c  This chapter is missing the following figures:
-@c
-@c     Figure 1-1  RTEMS Application Architecture
-@c     Figure 1-2  RTEMS Internal Architecture
-@c
-
-@chapter Overview
-
-@section Introduction
-
-RTEMS, Real-Time Executive for Multiprocessor Systems, is a
-real-time executive (kernel) which provides a high performance
-environment for embedded military applications including the
-following features:
-
-@itemize @bullet
-@item multitasking capabilities
-@item homogeneous and heterogeneous multiprocessor systems
-@item event-driven, priority-based, preemptive scheduling
-@item optional rate monotonic scheduling
-@item intertask communication and synchronization
-@item priority inheritance
-@item responsive interrupt management
-@item dynamic memory allocation
-@item high level of user configurability
-@end itemize
-
-This manual describes the usage of RTEMS for
-applications written in the @value{LANGUAGE} programming language.  Those
-implementation details that are processor dependent are provided
-in the Applications Supplement documents.  A supplement
-document which addresses specific architectural issues that
-affect RTEMS is provided for each processor type that is
-supported.
-
-@section Real-time Application Systems
-
-Real-time application systems are a special class of
-computer applications.  They have a complex set of
-characteristics that distinguish them from other software
-problems.  Generally, they must adhere to more rigorous
-requirements.  The correctness of the system depends not only on
-the results of computations, but also on the time at which the
-results are produced.  The most important and complex
-characteristic of real-time application systems is that they
-must receive and respond to a set of external stimuli within
-rigid and critical time constraints referred to as deadlines.
-Systems can be buried by an avalanche of interdependent,
-asynchronous or cyclical event streams.
-
-Deadlines can be further characterized as either hard
-or soft based upon the value of the results when produced after
-the deadline has passed.  A deadline is hard if the results have
-no value or if their use will result in a catastrophic event.
-In contrast, results which are produced after a soft deadline
-may have some value.
-
-Another distinguishing requirement of real-time
-application systems is the ability to coordinate or manage a
-large number of concurrent activities. Since software is a
-synchronous entity, this presents special problems.  One
-instruction follows another in a repeating synchronous cycle.
-Even though mechanisms have been developed to allow for the
-processing of external asynchronous events, the software design
-efforts required to process and manage these events and tasks
-are growing more complicated.
-
-The design process is complicated further by
-spreading this activity over a set of processors instead of a
-single processor. The challenges associated with designing and
-building real-time application systems become very complex when
-multiple processors are involved.  New requirements such as
-interprocessor communication channels and global resources that
-must be shared between competing processors are introduced.  The
-ramifications of multiple processors complicate each and every
-characteristic of a real-time system.
-
-@section Real-time Executive
-
-Fortunately, real-time operating systems or real-time
-executives serve as a cornerstone on which to build the
-application system.  A real-time multitasking executive allows
-an application to be cast into a set of logical, autonomous
-processes or tasks which become quite manageable.  Each task is
-internally synchronous, but different tasks execute
-independently, resulting in an asynchronous processing stream.
-Tasks can be dynamically paused for many reasons resulting in a
-different task being allowed to execute for a period of time.
-The executive also provides an interface to other system
-components such as interrupt handlers and device drivers.
-System components may request the executive to allocate and
-coordinate resources, and to wait for and trigger synchronizing
-conditions.  The executive system calls effectively extend the
-CPU instruction set to support efficient multitasking.  By
-causing tasks to travel through well-defined state transitions,
-system calls permit an application to demand-switch between
-tasks in response to real-time events.
-
-By proper grouping of responses to stimuli into
-separate tasks, a system can now asynchronously switch between
-independent streams of execution, directly responding to
-external stimuli as they occur.  This allows the system design
-to meet critical performance specifications which are typically
-measured by guaranteed response time and transaction throughput.
-The multiprocessor extensions of RTEMS provide the features
-necessary to manage the extra requirements introduced by a
-system distributed across several processors.  It removes the
-physical barriers of processor boundaries from the world of the
-system designer, enabling more critical aspects of the system to
-receive the required attention. Such a system, based on an
-efficient real-time, multiprocessor executive, is a more
-realistic model of the outside world or environment for which it
-is designed.  As a result, the system will always be more
-logical, efficient, and reliable.
-
-By using the directives provided by RTEMS, the
-real-time applications developer is freed from the problem of
-controlling and synchronizing multiple tasks and processors.  In
-addition, one need not develop, test, debug, and document
-routines to manage memory, pass messages, or provide mutual
-exclusion.  The developer is then able to concentrate solely on
-the application.  By using standard software components, the
-time and cost required to develop sophisticated real-time
-applications is significantly reduced.
-
-@section RTEMS Application Architecture
-
-One important design goal of RTEMS was to provide a
-bridge between two critical layers of typical real-time systems.
-As shown in the following figure, RTEMS serves as a buffer between the
-project dependent application code and the target hardware.
-Most hardware dependencies for real-time applications can be
-localized to the low level device drivers.  The RTEMS I/O
-interface manager provides an efficient tool for incorporating
-these hardware dependencies into the system while simultaneously
-providing a general mechanism to the application code that
-accesses them.  A well designed real-time system can benefit
-from this architecture by building a rich library of standard
-application components which can be used repeatedly in other
-real-time projects.
-
-@ifset use-ascii
-@example
-@group
-      +-----------------------------------------------------------+
-      |             Application Dependent Software                |
-      |        +----------------------------------------+         |
-      |        |    Standard Application Components     |         |
-      |        |                          +-------------+---+     |
-      |    +---+-----------+              |                 |     |
-      |    | Board Support |              |      RTEMS      |     |
-      |    |    Package    |              |                 |     |
-      +----+---------------+--------------+-----------------+-----|
-      |                      Target Hardware                      |
-      +-----------------------------------------------------------+
-@end group
-@end example
-@end ifset
-
-@ifset use-tex
-@sp 1
-@tex
-\centerline{\vbox{\offinterlineskip\halign{
-\vrule#&
-\hbox to 0.50in{\enskip\hfil#\hfil}&
-\vrule#&
-\hbox to 0.50in{\enskip\hfil#\hfil}&
-\vrule#&
-\hbox to 0.75in{\enskip\hfil#\hfil}&
-\vrule#&
-\hbox to 0.75in{\enskip\hfil#\hfil}&
-\vrule#&
-\hbox to 0.75in{\enskip\hfil#\hfil}&
-\vrule#&
-\hbox to 0.75in{\enskip\hfil#\hfil}&
-\vrule#&
-\hbox to 0.50in{\enskip\hfil#\hfil}&
-\vrule#&
-\hbox to 0.50in{\enskip\hfil#\hfil}&
-\vrule#\cr
-\multispan{17}\hrulefill\cr
-% to force all columns to desired width
-& \enskip && \enskip && \enskip && \enskip &&
-    \enskip && \enskip &&\enskip &&\enskip &\cr
-% For debugging columns
-%& \enskip 0&& \enskip 1&& \enskip 2&& \enskip 3&&
-%    \enskip 4&& \enskip 5&&\enskip 6&&\enskip 7&\cr
-\strut&\multispan{15}&\cr
-&\multispan{15}\hfil Application Dependent Software\hfil&\cr
-\strut&\multispan{15}&\cr
-&\multispan{2}&&\multispan{8}\hrulefill &\multispan{2}&\cr
-\strut&\multispan{2}&&&\multispan{7}&&\multispan{2}&&\cr
-&\multispan{2}&&&\multispan{7}\hfil Standard Application Components\hfil&
-    &\multispan{2}&&\cr
-\strut&\multispan{2}&&&\multispan{7}&&\multispan{2}&&\cr
-&&\multispan{5}\hrulefill&&\multispan{7}\hrulefill&&\cr
-\strut&&&\multispan{3}                  &&&&\multispan{5}&&&\cr
-&&&\multispan{3}\hfil Device\hfil&&&&\multispan{5}\hfil RTEMS\hfil&&&\cr
-&&&\multispan{3}\hfil Drivers\hfil&&&&\multispan{5}&&&\cr
-\strut&&&\multispan{3}                  &&&&\multispan{5}&&&\cr
-\multispan{17}\hrulefill\cr
-\strut&\multispan{15}&\cr
-&\multispan{15}\hfil Target Hardware\hfil&\cr
-\strut&\multispan{15}&\cr
-\multispan{17}\hrulefill\cr
-}}\hfil}
-@end tex
-@end ifset
-
-@ifset use-html
-@html
-<IMG SRC="rtemsarc.gif" WIDTH=500 HEIGHT=300 ALT="RTEMS Application Architecture">
-@end html
-@end ifset
-
-@section RTEMS Internal Architecture
-
-RTEMS can be viewed as a set of layered components that work in
-harmony to provide a set of services to a real-time application
-system.  The executive interface presented to the application is
-formed by grouping directives into logical sets called resource managers.
-Functions utilized by multiple managers such as scheduling,
-dispatching, and object management are provided in the executive
-core.  The executive core depends on a small set of CPU dependent routines.
-Together these components provide a powerful run time
-environment that promotes the development of efficient real-time
-application systems.  The following figure illustrates this organization:
-
-@ifset use-ascii
-@example
-@group
-           +-----------------------------------------------+
-           |          RTEMS Executive Interface            |
-           +-----------------------------------------------+
-           |                 RTEMS Core                    |
-           +-----------------------------------------------+
-           |              CPU Dependent Code               |
-           +-----------------------------------------------+
-@end group
-@end example
-@end ifset
-
-@ifset use-tex
-@c for now use the ascii version
-@example
-@group
-           +-----------------------------------------------+
-           |          RTEMS Executive Interface            |
-           +-----------------------------------------------+
-           |                 RTEMS Core                    |
-           +-----------------------------------------------+
-           |              CPU Dependent Code               |
-           +-----------------------------------------------+
-@end group
-@end example
-@tex
-@end tex
-@end ifset
-
-@ifset use-html
-@html
-<IMG SRC="rtemspie.gif" WIDTH=500 HEIGHT=300 ALT="RTEMS Architecture">
-@end html
-@end ifset
-Subsequent chapters present a detailed description of the capabilities
-provided by each of the following RTEMS managers:
-
-@itemize @bullet
-@item initialization
-@item task
-@item interrupt
-@item clock
-@item timer
-@item semaphore
-@item message
-@item event
-@item signal
-@item partition
-@item region
-@item dual ported memory
-@item I/O
-@item fatal error
-@item rate monotonic
-@item user extensions
-@item multiprocessing
-@end itemize
-
-@section User Customization and Extensibility
-
-As thirty-two bit microprocessors have decreased in
-cost, they have become increasingly common in a variety of
-embedded systems.  A wide range of custom and general-purpose
-processor boards are based on various thirty-two bit processors.
-RTEMS was designed to make no assumptions concerning the
-characteristics of individual microprocessor families or of
-specific support hardware.  In addition, RTEMS allows the system
-developer a high degree of freedom in customizing and extending
-its features.
-
-RTEMS assumes the existence of a supported
-microprocessor and sufficient memory for both RTEMS and the
-real-time application.  Board dependent components such as
-clocks, interrupt controllers, or I/O devices can be easily
-integrated with RTEMS.  The customization and extensibility
-features allow RTEMS to efficiently support as many environments
-as possible.
-
-@section Portability
-
-The issue of portability was the major factor in the
-creation of RTEMS.  Since RTEMS is designed to isolate the
-hardware dependencies in the specific board support packages,
-the real-time application should be easily ported to any other
-processor.  The use of RTEMS allows the development of real-time
-applications which can be completely independent of a particular
-microprocessor architecture.
-
-@section Memory Requirements
-
-Since memory is a critical resource in many real-time
-embedded systems, RTEMS was specifically designed to allow
-unused managers to be excluded from the run-time environment.
-This allows the application designer the flexibility to tailor
-RTEMS to most efficiently meet system requirements while still
-satisfying even the most stringent memory constraints.  As a
-result, the size of the RTEMS executive is application
-dependent.  A worksheet is provided in the Memory Requirements
-chapter of the Applications Supplement document for a specific
-target processor.  The worksheet is used to calculate the memory
-requirements of a custom RTEMS run-time environment.  The
-following managers may be optionally excluded:
-
-@itemize @bullet
-@item clock
-@item timer
-@item semaphore
-@item message
-@item event
-@item signal
-@item partition
-@item region
-@item dual ported memory
-@item I/O
-@item rate monotonic
-@item fatal error
-@item multiprocessing
-@end itemize
-
-RTEMS utilizes memory for both code and data space.
-Although RTEMS' data space must be in RAM, its code space can be
-located in either ROM or RAM.
-
-@section Audience
-
-This manual was written for experienced real-time
-software developers.  Although some background is provided, it
-is assumed that the reader is familiar with the concepts of task
-management as well as intertask communication and
-synchronization.  Since directives, user related data
-structures, and examples are presented in @value{LANGUAGE}, a basic
-understanding of the @value{LANGUAGE} programming language
-is required to fully
-understand the material presented.  However, because of the
-similarity of the Ada and C RTEMS implementations, users will
-find that the use and behavior of the two implementations is
-very similar.  A working knowledge of the target processor is
-helpful in understanding some of RTEMS' features.  A thorough
-understanding of the executive cannot be obtained without
-studying the entire manual because many of RTEMS' concepts and
-features are interrelated.  Experienced RTEMS users will find
-that the manual organization facilitates its use as a reference
-document.
-
-@section Conventions
-
-The following conventions are used in this manual:
-
-@itemize @bullet
-@item Significant words or phrases as well as all directive
-names are printed in bold type.
-
-@item Items in bold capital letters are constants defined by
-RTEMS.  Each language interface provided by RTEMS includes a
-file containing the standard set of constants, data types, and
-@value{STRUCTURE} definitions which can be incorporated into the user
-application.
-
-@item A number of type definitions are provided by RTEMS and
-can be found in rtems.h.
-
-@item The characters "0x" preceding a number indicates that
-the number is in hexadecimal format.  Any other numbers are
-assumed to be in decimal format.
-@end itemize
-
-@section Manual Organization
-
-This first chapter has presented the introductory and
-background material for the RTEMS executive.  The remaining
-chapters of this manual present a detailed description of RTEMS
-and the environment, including run time behavior, it creates for
-the user.
-
-A chapter is dedicated to each manager and provides a
-detailed discussion of each RTEMS manager and the directives
-which it provides.  The presentation format for each directive
-includes the following sections:
-
-@itemize @bullet
-@item Calling sequence
-@item Directive status codes
-@item Description
-@item Notes
-@end itemize
-
-The following provides an overview of the remainder
-of this manual:
-
-@table @asis
-@item Chapter 2
-Key Concepts: presents an
-introduction to the ideas which are common across multiple RTEMS
-managers.
-
-@item Chapter 3:
-Initialization Manager: describes the functionality and directives
-provided by the Initialization Manager.
-
-@item Chapter 4:
-Task Manager: describes the functionality and directives provided
-by the Task Manager.
-
-@item Chapter 5:
-Interrupt Manager: describes the functionality and directives
-provided by the Interrupt Manager.
-
-@item Chapter 6:
-Clock Manager: describes the functionality and directives
-provided by the Clock Manager.
-
-@item Chapter 7
-Timer Manager: describes the functionality and directives provided
-by the Timer Manager.
-
-@item Chapter 8:
-Semaphore Manager: describes the functionality and directives
-provided by the Semaphore Manager.
-
-@item Chapter 9:
-Message Manager: describes the functionality and directives
-provided by the Message Manager.
-
-@item Chapter 10:
-Event Manager: describes the
-functionality and directives provided by the Event Manager.
-
-@item Chapter 11:
-Signal Manager: describes the
-functionality and directives provided by the Signal Manager.
-
-@item Chapter 12:
-Partition Manager: describes the
-functionality and directives provided by the Partition Manager.
-
-@item Chapter 13:
-Region Manager: describes the
-functionality and directives provided by the Region Manager.
-
-@item Chapter 14:
-Dual-Ported Memory Manager: describes
-the functionality and directives provided by the Dual-Ported
-Memory Manager.
-
-@item Chapter 15:
-I/O Manager: describes the
-functionality and directives provided by the I/O Manager.
-
-@item Chapter 16:
-Fatal Error Manager: describes the functionality and directives
-provided by the Fatal Error Manager.
-
-@item Chapter 17:
-Scheduling Concepts: details the RTEMS scheduling algorithm and
-task state transitions.
-
-@item Chapter 18:
-Rate Monotonic Manager: describes the functionality and directives
-provided by the Rate Monotonic Manager.
-
-@item Chapter 19:
-Board Support Packages: defines the
-functionality required of user-supplied board support packages.
-
-@item Chapter 20:
-User Extensions: shows the user how to
-extend RTEMS to incorporate custom features.
-
-@item Chapter 21:
-Configuring a System: details the process by which one tailors RTEMS
-for a particular single-processor or multiprocessor application.
-
-@item Chapter 22:
-Multiprocessing Manager: presents a
-conceptual overview of the multiprocessing capabilities provided
-by RTEMS as well as describing the Multiprocessing
-Communications Interface Layer and Multiprocessing Manager
-directives.
-
-@item Chapter 23:
-Directive Status Codes: provides a definition of each of the
-directive status codes referenced in this manual.
-
-@item Chapter 24:
-Example Application: provides a template for simple RTEMS applications.
-
-@item Chapter 25:
-Glossary: defines terms used throughout this manual.
-
-@end table
-
-
diff --git a/doc/user/part.t b/doc/user/part.t
deleted file mode 100644
index 412a3a57c9..0000000000
--- a/doc/user/part.t
+++ /dev/null
@@ -1,414 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Partition Manager
-
-@section Introduction
-
-The partition manager provides facilities to
-dynamically allocate memory in fixed-size units.  The directives
-provided by the partition manager are:
-
-@itemize @bullet
-@item @code{@value{DIRPREFIX}partition_create} - Create a partition
-@item @code{@value{DIRPREFIX}partition_ident} - Get ID of a partition
-@item @code{@value{DIRPREFIX}partition_delete} - Delete a partition
-@item @code{@value{DIRPREFIX}partition_get_buffer} - Get buffer from a partition
-@item @code{@value{DIRPREFIX}partition_return_buffer} - Return buffer to a partition
-@end itemize
-
-@section Background
-
-@subsection Partition Manager Definitions
-
-A partition is a physically contiguous memory area
-divided into fixed-size buffers that can be dynamically
-allocated and deallocated.
-
-Partitions are managed and maintained as a list of
-buffers.  Buffers are obtained from the front of the partition's
-free buffer chain and returned to the rear of the same chain.
-When a buffer is on the free buffer chain, RTEMS uses eight
-bytes of each buffer as the free buffer chain.  When a buffer is
-allocated, the entire buffer is available for application use.
-Therefore, modifying memory that is outside of an allocated
-buffer could destroy the free buffer chain or the contents of an
-adjacent allocated buffer.
-
-@subsection Building a Partition's Attribute Set
-
-In general, an attribute set is built by a bitwise OR
-of the desired attribute components.  The set of valid partition
-attributes is provided in the following table:
-
-@itemize @bullet
-@item @code{@value{RPREFIX}LOCAL} - local task (default)
-@item @code{@value{RPREFIX}GLOBAL} - global task
-@end itemize
-
-
-Attribute values are specifically designed to be
-mutually exclusive, therefore bitwise OR and addition operations
-are equivalent as long as each attribute appears exactly once in
-the component list.  An attribute listed as a default is not
-required to appear in the attribute list, although it is a good
-programming practice to specify default attributes.  If all
-defaults are desired, the attribute
-@code{@value{RPREFIX}DEFAULT_ATTRIBUTES} should be
-specified on this call.  The attribute_set parameter should be
-@code{@value{RPREFIX}GLOBAL} to indicate that the partition
-is to be known globally.
-
-@section Operations
-
-@subsection Creating a Partition
-
-The @code{@value{DIRPREFIX}partition_create} directive creates a partition
-with a user-specified name.  The partition's name, starting
-address, length and buffer size are all specified to the
-@code{@value{DIRPREFIX}partition_create} directive.  
-RTEMS allocates a Partition Control
-Block (PTCB) from the PTCB free list.  This data structure is
-used by RTEMS to manage the newly created partition.  The number
-of buffers in the partition is calculated based upon the
-specified partition length and buffer size, and returned to the
-calling task along with a unique partition ID.
-
-@subsection Obtaining Partition IDs
-
-When a partition is created, RTEMS generates a unique
-partition ID and assigned it to the created partition until it
-is deleted.  The partition ID may be obtained by either of two
-methods.  First, as the result of an invocation of the
-@code{@value{DIRPREFIX}partition_create} directive, the partition
-ID is stored in a user provided location.  Second, the partition
-ID may be obtained later using the @code{@value{DIRPREFIX}partition_ident}
-directive.  The partition ID is used by other partition manager directives
-to access this partition.
-
-@subsection Acquiring a Buffer
-
-A buffer can be obtained by calling the
-@code{@value{DIRPREFIX}partition_get_buffer} directive.  
-If a buffer is available, then
-it is returned immediately with a successful return code.
-Otherwise, an unsuccessful return code is returned immediately
-to the caller.  Tasks cannot block to wait for a buffer to
-become available.
-
-@subsection Releasing a Buffer
-
-Buffers are returned to a partition's free buffer
-chain with the @code{@value{DIRPREFIX}partition_return_buffer} directive.  This
-directive returns an error status code if the returned buffer
-was not previously allocated from this partition.
-
-@subsection Deleting a Partition
-
-The @code{@value{DIRPREFIX}partition_delete} directive allows a partition to
-be removed and returned to RTEMS.  When a partition is deleted,
-the PTCB for that partition is returned to the PTCB free list.
-A partition with buffers still allocated cannot be deleted.  Any
-task attempting to do so will be returned an error status code.
-
-@section Directives
-
-This section details the partition manager's
-directives.  A subsection is dedicated to each of this manager's
-directives and describes the calling sequence, related
-constants, usage, and status codes.
-
-@page
-@subsection PARTITION_CREATE - Create a partition
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_partition_create
-@example
-rtems_status_code rtems_partition_create(
-  rtems_name        name,
-  void             *starting_address,
-  rtems_unsigned32  length,
-  rtems_unsigned32  buffer_size,
-  rtems_attribute   attribute_set,
-  rtems_id         *id
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure Partition_Create (
-   Name             : in     RTEMS.Name;
-   Starting_Address : in     RTEMS.Address;
-   Length           : in     RTEMS.Unsigned32;
-   Buffer_Size      : in     RTEMS.Unsigned32;
-   Attribute_Set    : in     RTEMS.Attribute;
-   ID               :    out RTEMS.ID;
-   Result           :    out RTEMS.Status_Codes
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-@code{@value{RPREFIX}SUCCESSFUL} - partition created successfully@*
-@code{@value{RPREFIX}INVALID_NAME} - invalid task name@*
-@code{@value{RPREFIX}TOO_MANY} - too many partitions created@*
-@code{@value{RPREFIX}INVALID_ADDRESS} - address not on four byte boundary@*
-@code{@value{RPREFIX}INVALID_SIZE} - length or buffer size is 0@*
-@code{@value{RPREFIX}INVALID_SIZE} - length is less than the buffer size@*
-@code{@value{RPREFIX}INVALID_SIZE} - buffer size not a multiple of 4@*
-@code{@value{RPREFIX}MP_NOT_CONFIGURED} - multiprocessing not configured@*
-@code{@value{RPREFIX}TOO_MANY} - too many global objects
-
-@subheading DESCRIPTION:
-
-This directive creates a partition of fixed size
-buffers from a physically contiguous memory space which starts
-at starting_address and is length bytes in size.  Each allocated
-buffer is to be of buffer_length in bytes.  The assigned
-partition id is returned in id.  This partition id is used to
-access the partition with other partition related directives.
-For control and maintenance of the partition, RTEMS allocates a
-PTCB from the local PTCB free pool and initializes it.
-
-@subheading NOTES:
-
-This directive will not cause the calling task to be
-preempted.
-
-The starting_address and buffer_size parameters must
-be multiples of four.
-
-Memory from the partition is not used by RTEMS to
-store the Partition Control Block.
-
-The following partition attribute constants are
-defined by RTEMS:
-
-@itemize @bullet
-@item @code{@value{RPREFIX}LOCAL} - local task (default)
-@item @code{@value{RPREFIX}GLOBAL} - global task
-@end itemize
-
-The PTCB for a global partition is allocated on the
-local node.  The memory space used for the partition must reside
-in shared memory. Partitions should not be made global unless
-remote tasks must interact with the partition.  This is to avoid
-the overhead incurred by the creation of a global partition.
-When a global partition is created, the partition's name and id
-must be transmitted to every node in the system for insertion in
-the local copy of the global object table.
-
-The total number of global objects, including
-partitions, is limited by the maximum_global_objects field in
-the Configuration Table.
-
-@page
-@subsection PARTITION_IDENT - Get ID of a partition
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_partition_ident
-@example
-rtems_status_code rtems_partition_ident(
-  rtems_name        name,
-  rtems_unsigned32  node,
-  rtems_id         *id
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure Partition_Ident (
-   Name   : in     RTEMS.Name;
-   Node   : in     RTEMS.Unsigned32;
-   ID     :    out RTEMS.ID;
-   Result :    out RTEMS.Status_Codes
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-@code{@value{RPREFIX}SUCCESSFUL} - partition identified successfully@*
-@code{@value{RPREFIX}INVALID_NAME} - partition name not found@*
-@code{@value{RPREFIX}INVALID_NODE} - invalid node id
-
-@subheading DESCRIPTION:
-
-This directive obtains the partition id associated
-with the partition name.  If the partition name is not unique,
-then the partition id will match one of the partitions with that
-name.  However, this partition id is not guaranteed to
-correspond to the desired partition.  The partition id is used
-with other partition related directives to access the partition.
-
-@subheading NOTES:
-
-This directive will not cause the running task to be
-preempted.
-
-If node is @code{@value{RPREFIX}SEARCH_ALL_NODES}, all nodes are searched
-with the local node being searched first.  All other nodes are
-searched with the lowest numbered node searched first.
-
-If node is a valid node number which does not
-represent the local node, then only the partitions exported by
-the designated node are searched.
-
-This directive does not generate activity on remote
-nodes.  It accesses only the local copy of the global object
-table.
-
-@page
-@subsection PARTITION_DELETE - Delete a partition
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_partition_delete
-@example
-rtems_status_code rtems_partition_delete(
-  rtems_id id
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure Partition_Delete (
-   ID     : in     RTEMS.ID;
-   Result :    out RTEMS.Status_Codes
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-@code{@value{RPREFIX}SUCCESSFUL} - partition deleted successfully@*
-@code{@value{RPREFIX}INVALID_ID} - invalid partition id@*
-@code{@value{RPREFIX}RESOURCE_IN_USE} - buffers still in use@*
-@code{@value{RPREFIX}ILLEGAL_ON_REMOTE_OBJECT} - cannot delete remote partition
-
-@subheading DESCRIPTION:
-
-This directive deletes the partition specified by id.
-The partition cannot be deleted if any of its buffers are still
-allocated.  The PTCB for the deleted partition is reclaimed by
-RTEMS.
-
-@subheading NOTES:
-
-This directive will not cause the calling task to be
-preempted.
-
-The calling task does not have to be the task that
-created the partition.  Any local task that knows the partition
-id can delete the partition.
-
-When a global partition is deleted, the partition id
-must be transmitted to every node in the system for deletion
-from the local copy of the global object table.
-
-The partition must reside on the local node, even if
-the partition was created with the @code{@value{RPREFIX}GLOBAL} option.
-
-@page
-@subsection PARTITION_GET_BUFFER - Get buffer from a partition
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_partition_get_buffer
-@example
-rtems_status_code rtems_partition_get_buffer(
-  rtems_id   id,
-  void     **buffer
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure Partition_Get_Buffer (
-   ID     : in     RTEMS.ID;
-   Buffer :    out RTEMS.Address;
-   Result :    out RTEMS.Status_Codes
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-@code{@value{RPREFIX}SUCCESSFUL} - buffer obtained successfully@*
-@code{@value{RPREFIX}INVALID_ID} - invalid partition id@*
-@code{@value{RPREFIX}UNSATISFIED} - all buffers are allocated
-
-@subheading DESCRIPTION:
-
-This directive allows a buffer to be obtained from
-the partition specified in id.  The address of the allocated
-buffer is returned in buffer.
-
-@subheading NOTES:
-
-This directive will not cause the running task to be
-preempted.
-
-All buffers begin on a four byte boundary.
-
-A task cannot wait on a buffer to become available.
-
-Getting a buffer from a global partition which does
-not reside on the local node will generate a request telling the
-remote node to allocate a buffer from the specified partition.
-
-@page
-@subsection PARTITION_RETURN_BUFFER - Return buffer to a partition
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_partition_return_buffer
-@example
-rtems_status_code rtems_partition_return_buffer(
-  rtems_id  id,
-  void     *buffer
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure Partition_Return_Buffer (
-   ID     : in     RTEMS.ID;
-   Buffer : in     RTEMS.Address;
-   Result :    out RTEMS.Status_Codes
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-@code{@value{RPREFIX}SUCCESSFUL} - buffer returned successfully@*
-@code{@value{RPREFIX}INVALID_ID} - invalid partition id@*
-@code{@value{RPREFIX}INVALID_ADDRESS} - buffer address not in partition
-
-@subheading DESCRIPTION:
-
-This directive returns the buffer specified by buffer
-to the partition specified by id.
-
-@subheading NOTES:
-
-This directive will not cause the running task to be
-preempted.
-
-Returning a buffer to a global partition which does
-not reside on the local node will generate a request telling the
-remote node to return the buffer to the specified partition.
diff --git a/doc/user/preface.texi b/doc/user/preface.texi
deleted file mode 100644
index 9ea6546130..0000000000
--- a/doc/user/preface.texi
+++ /dev/null
@@ -1,189 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@ifinfo
-@node Preface, Overview, Top, Top
-@end ifinfo
-@unnumbered Preface
-
-In recent years, the cost required to develop a
-software product has increased significantly while the target
-hardware costs have decreased.  Now a larger portion of money is
-expended in developing, using, and maintaining software.  The
-trend in computing costs is the complete dominance of software
-over hardware costs.  Because of this, it is necessary that
-formal disciplines be established to increase the probability
-that software is characterized by a high degree of correctness,
-maintainability, and portability.  In addition, these
-disciplines must promote practices that aid in the consistent
-and orderly development of a software system within schedule and
-budgetary constraints.  To be effective, these disciplines must
-adopt standards which channel individual software efforts toward
-a common goal.
-
-The push for standards in the software development
-field has been met with various degrees of success.  The
-Microprocessor Operating Systems Interfaces (MOSI) effort has
-experienced only limited success.  As popular as the UNIX
-operating system has grown, the attempt to develop a standard
-interface definition to allow portable application development
-has only recently begun to produce the results needed in this
-area.  Unfortunately, very little effort has been expended to
-provide standards addressing the needs of the real-time
-community.  Several organizations have addressed this need
-during recent years.
-
-The Real Time Executive Interface Definition (RTEID)
-was developed by Motorola with technical input from Software
-Components Group.  RTEID was adopted by the VMEbus International
-Trade Association (VITA) as a baseline draft for their proposed
-standard multiprocessor, real-time executive interface, Open
-Real-Time Kernel Interface Definition (ORKID).  These two groups
-are currently working together with the IEEE P1003.4 committee
-to insure that the functionality of their proposed standards is
-adopted as the real-time extensions to POSIX.
-
-This emerging standard defines an interface for the
-development of real-time software to ease the writing of
-real-time application programs that are directly portable across
-multiple real-time executive implementations.  This interface
-includes both the source code interfaces and run-time behavior
-as seen by a real-time application.  It does not include the
-details of how a kernel implements these functions.  The
-standard's goal is to serve as a complete definition of external
-interfaces so that application code that conforms to these
-interfaces will execute properly in all real-time executive
-environments.  With the use of a standards compliant executive,
-routines that acquire memory blocks, create and manage message
-queues, establish and use semaphores, and send and receive
-signals need not be redeveloped for a different real-time
-environment as long as the new environment is compliant with the
-standard.  Software developers need only concentrate on the
-hardware dependencies of the real-time system.  Furthermore,
-most hardware dependencies for real-time applications can be
-localized to the device drivers.
-
-A compliant executive provides simple and flexible
-real-time multiprocessing.  It easily lends itself to both
-tightly-coupled and loosely-coupled configurations (depending on
-the system hardware configuration).  Objects such as tasks,
-queues, events, signals, semaphores, and memory blocks can be
-designated as global objects and accessed by any task regardless
-of which processor the object and the accessing task reside.
-
-The acceptance of a standard for real-time executives
-will produce the same advantages enjoyed from the push for UNIX
-standardization by AT&T's System V Interface Definition and
-IEEE's POSIX efforts.  A compliant multiprocessing executive
-will allow close coupling between UNIX systems and real-time
-executives to provide the many benefits of the UNIX development
-environment to be applied to real-time software development.
-Together they provide the necessary laboratory environment to
-implement real-time, distributed, embedded systems using a wide
-variety of computer architectures.
-
-A study was completed in 1988, within the Research,
-Development, and Engineering Center, U.S. Army Missile Command,
-which compared the various aspects of the Ada programming
-language as they related to the application of Ada code in
-distributed and/or multiple processing systems.  Several
-critical conclusions were derived from the study.  These
-conclusions have a major impact on the way the Army develops
-application software for embedded applications. These impacts
-apply to both in-house software development and contractor
-developed software.
-
-A conclusion of the analysis, which has been
-previously recognized by other agencies attempting to utilize
-Ada in a distributed or multiprocessing environment, is that the
-Ada programming language does not adequately support
-multiprocessing.  Ada does provide a mechanism for
-multi-tasking, however, this capability exists only for a single
-processor system.  The language also does not have inherent
-capabilities to access global named variables, flags or program
-code.  These critical features are essential in order for data
-to be shared between processors.  However, these drawbacks do
-have workarounds which are sometimes awkward and defeat the
-intent of software maintainability and portability goals.
-
-Another conclusion drawn from the analysis, was that
-the run time executives being delivered with the Ada compilers
-were too slow and inefficient to be used in modern missile
-systems.  A run time executive is the core part of the run time
-system code, or operating system code, that controls task
-scheduling, input/output management and memory management.
-Traditionally, whenever efficient executive (also known as
-kernel) code was required by the application, the user developed
-in-house software.  This software was usually written in
-assembly language for optimization.
-
-Because of this shortcoming in the Ada programming
-language, software developers in research and development and
-contractors for project managed systems, are mandated by
-technology to purchase and utilize off-the-shelf third party
-kernel code.  The contractor, and eventually the Government,
-must pay a licensing fee for every copy of the kernel code used
-in an embedded system.
-
-The main drawback to this development environment is
-that the Government does not own, nor has the right to modify
-code contained within the kernel.  V&V techniques in this
-situation are more difficult than if the complete source code
-were available. Responsibility for system failures due to faulty
-software is yet another area to be resolved under this
-environment.
-
-The Guidance and Control Directorate began a software
-development effort to address these problems.  A project to
-develop an experimental run time kernel was begun that will
-eliminate the major drawbacks of the Ada programming language
-mentioned above. The Real Time Executive for Multiprocessor Systems
-(RTEMS) provides full capabilities for management of tasks,
-interrupts, time, and multiple processors in addition to those
-features typical of generic operating systems.  The code is
-Government owned, so no licensing fees are necessary.  RTEMS has
-been implemented in both the Ada and C programming languages.
-It has been ported to the following processor families:
-
-@itemize @bullet
-@item Intel i80386 and above 
-@item Intel i80960
-@item Motorola MC68xxx 
-@item Motorola MC683xx
-@item MIPS
-@item PowerPC
-@item SPARC
-@item Hewlett Packard PA-RISC
-@item Hitach SH
-@item AMD A29K
-@item UNIX
-@end itemize
-
-Support for other processor families, including RISC, CISC, and DSP, is
-planned.  Since almost all of RTEMS is written in a high level language,
-ports to additional processor families require minimal effort.
-
-RTEMS multiprocessor support is capable of handling
-either homogeneous or heterogeneous systems.  The kernel
-automatically compensates for architectural differences (byte
-swapping, etc.) between processors.  This allows a much easier
-transition from one processor family to another without a major
-system redesign.
-
-Since the proposed standards are still in draft form,
-RTEMS cannot and does not claim compliance.  However, the status
-of the standard is being carefully monitored to guarantee that
-RTEMS provides the functionality specified in the standard.
-Once approved, RTEMS will be made compliant.
-
-This document is a detailed users guide for a
-functionally compliant real-time multiprocessor executive.  It
-describes the user interface and run-time behavior of Release
-@value{RELEASE} of the @value{LANGUAGE} interface
-to RTEMS.
-
diff --git a/doc/user/region.t b/doc/user/region.t
deleted file mode 100644
index c9c6c88f18..0000000000
--- a/doc/user/region.t
+++ /dev/null
@@ -1,613 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Region Manager
-
-@section Introduction
-
-The region manager provides facilities to dynamically
-allocate memory in variable sized units.  The directives
-provided by the region manager are:
-
-@itemize @bullet
-@item @code{@value{DIRPREFIX}region_create} - Create a region
-@item @code{@value{DIRPREFIX}region_ident} - Get ID of a region
-@item @code{@value{DIRPREFIX}region_delete} - Delete a region
-@item @code{@value{DIRPREFIX}region_extend} - Add memory to a region
-@item @code{@value{DIRPREFIX}region_get_segment} - Get segment from a region
-@item @code{@value{DIRPREFIX}region_return_segment} - Return segment to a region
-@item @code{@value{DIRPREFIX}region_get_segment_size} - Obtain size of a segment
-@end itemize
-
-@section Background
-
-@subsection Region Manager Definitions
-
-A region makes up a physically contiguous memory
-space with user-defined boundaries from which variable-sized
-segments are dynamically allocated and deallocated.  A segment
-is a variable size section of memory which is allocated in
-multiples of a user-defined page size.  This page size is
-required to be a multiple of four greater than or equal to four.
-For example, if a request for a 350-byte segment is made in a
-region with 256-byte pages, then a 512-byte segment is allocated.
-
-Regions are organized as doubly linked chains of
-variable sized memory blocks.  Memory requests are allocated
-using a first-fit algorithm.  If available, the requester
-receives the number of bytes requested (rounded up to the next
-page size).  RTEMS requires some overhead from the region's
-memory for each segment that is allocated.  Therefore, an
-application should only modify the memory of a segment that has
-been obtained from the region.  The application should NOT
-modify the memory outside of any obtained segments and within
-the region's boundaries while the region is currently active in
-the system.
-
-Upon return to the region, the free block is
-coalesced with its neighbors (if free) on both sides to produce
-the largest possible unused block.
-
-@subsection Building an Attribute Set
-
-In general, an attribute set is built by a bitwise OR
-of the desired attribute components.  The set of valid region
-attributes is provided in the following table:
-
-@itemize @bullet
-@item @code{@value{RPREFIX}FIFO} - tasks wait by FIFO (default)
-@item @code{@value{RPREFIX}PRIORITY} - tasks wait by priority
-@end itemize
-
-Attribute values are specifically designed to be
-mutually exclusive, therefore bitwise OR and addition operations
-are equivalent as long as each attribute appears exactly once in
-the component list.  An attribute listed as a default is not
-required to appear in the attribute list, although it is a good
-programming practice to specify default attributes.  If all
-defaults are desired, the attribute
-@code{@value{RPREFIX}DEFAULT_ATTRIBUTES} should be
-specified on this call.
-
-This example demonstrates the attribute_set parameter
-needed to create a region with the task priority waiting queue
-discipline.  The attribute_set parameter to the
-@code{@value{DIRPREFIX}region_create}
-directive should be @code{@value{RPREFIX}PRIORITY}.
-
-@subsection Building an Option Set
-
-In general, an option is built by a bitwise OR of the
-desired option components.  The set of valid options for the
-@code{@value{DIRPREFIX}region_get_segment} directive are
-listed in the following table:
-
-@itemize @bullet
-@item @code{@value{RPREFIX}WAIT} - task will wait for semaphore (default)
-@item @code{@value{RPREFIX}NO_WAIT} - task should not wait
-@end itemize
-
-Option values are specifically designed to be
-mutually exclusive, therefore bitwise OR and addition operations
-are equivalent as long as each option appears exactly once in
-the component list.  An option listed as a default is not
-required to appear in the option list, although it is a good
-programming practice to specify default options.  If all
-defaults are desired, the option
-@code{@value{RPREFIX}DEFAULT_OPTIONS} should be
-specified on this call.
-
-This example demonstrates the option parameter needed
-to poll for a segment.  The option parameter passed to the
-@code{@value{DIRPREFIX}region_get_segment} directive should
-be @code{@value{RPREFIX}NO_WAIT}.
-
-@section Operations
-
-@subsection Creating a Region
-
-The @code{@value{DIRPREFIX}region_create} directive creates a region with the
-user-defined name.  The user may select FIFO or task priority as
-the method for placing waiting tasks in the task wait queue.
-RTEMS allocates a Region Control Block (RNCB) from the RNCB free
-list to maintain the newly created region.  RTEMS also generates
-a unique region ID which is returned to the calling task.
-
-It is not possible to calculate the exact number of
-bytes available to the user since RTEMS requires overhead for
-each segment allocated.  For example, a region with one segment
-that is the size of the entire region has more available bytes
-than a region with two segments that collectively are the size
-of the entire region.  This is because the region with one
-segment requires only the overhead for one segment, while the
-other region requires the overhead for two segments.
-
-Due to automatic coalescing, the number of segments
-in the region dynamically changes.  Therefore, the total
-overhead required by RTEMS dynamically changes.
-
-@subsection Obtaining Region IDs
-
-When a region is created, RTEMS generates a unique
-region ID and assigns it to the created region until it is
-deleted.  The region ID may be obtained by either of two
-methods.  First, as the result of an invocation of the
-@code{@value{DIRPREFIX}region_create} directive,
-the region ID is stored in a user
-provided location.  Second, the region ID may be obtained later
-using the @code{@value{DIRPREFIX}region_ident} directive.  
-The region ID is used by other region manager directives to
-access this region.
-
-@subsection Adding Memory to a Region
-
-The @code{@value{DIRPREFIX}region_extend} directive may be used to add memory
-to an existing region.  The caller specifies the size in bytes
-and starting address of the memory being added.
-
-NOTE:  Please see the release notes or RTEMS source
-code for information regarding restrictions on the location of
-the memory being added in relation to memory already in the
-region.
-
-@subsection Acquiring a Segment
-
-The @code{@value{DIRPREFIX}region_get_segment} directive attempts to acquire
-a segment from a specified region.  If the region has enough
-available free memory, then a segment is returned successfully
-to the caller.  When the segment cannot be allocated, one of the
-following situations applies:
-
-@itemize @bullet
-@item By default, the calling task will wait forever to acquire the segment.
-
-@item Specifying the @code{@value{RPREFIX}NO_WAIT} option forces
-an immediate return with an error status code.
-
-@item Specifying a timeout limits the interval the task will
-wait before returning with an error status code.
-@end itemize
-
-If the task waits for the segment, then it is placed
-in the region's task wait queue in either FIFO or task priority
-order.  All tasks waiting on a region are returned an error when
-the message queue is deleted.
-
-@subsection Releasing a Segment
-
-When a segment is returned to a region by the
-@code{@value{DIRPREFIX}region_return_segment} directive, it is merged with its
-unallocated neighbors to form the largest possible segment.  The
-first task on the wait queue is examined to determine if its
-segment request can now be satisfied.  If so, it is given a
-segment and unblocked.  This process is repeated until the first
-task's segment request cannot be satisfied.
-
-@subsection Obtaining the Size of a Segment
-
-The @code{@value{DIRPREFIX}region_get_segment_size} directive returns the
-size in bytes of the specified segment.  The size returned
-includes any "extra" memory included in the segment because of
-rounding up to a page size boundary.
-
-@subsection Deleting a Region
-
-A region can be removed from the system and returned
-to RTEMS with the @code{@value{DIRPREFIX}region_delete}
-directive.  When a region is
-deleted, its control block is returned to the RNCB free list.  A
-region with segments still allocated is not allowed to be
-deleted.  Any task attempting to do so will be returned an
-error.  As a result of this directive, all tasks blocked waiting
-to obtain a segment from the region will be readied and returned
-a status code which indicates that the region was deleted.
-
-@section Directives
-
-This section details the region manager's directives.
-A subsection is dedicated to each of this manager's directives
-and describes the calling sequence, related constants, usage,
-and status codes.
-
-@page
-@subsection REGION_CREATE - Create a region
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_region_create
-@example
-rtems_status_code rtems_region_create(
-  rtems_name        name,
-  void             *starting_address,
-  rtems_unsigned32  length,
-  rtems_unsigned32  page_size,
-  rtems_attribute   attribute_set,
-  rtems_id         *id
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure Region_Create (
-   Name             : in     RTEMS.Name;
-   Starting_Address : in     RTEMS.Address;
-   Length           : in     RTEMS.Unsigned32;
-   Page_Size        : in     RTEMS.Unsigned32;
-   Attribute_Set    : in     RTEMS.Attribute;
-   ID               :    out RTEMS.ID;
-   Result           :    out RTEMS.Status_Codes
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-
-@code{@value{RPREFIX}SUCCESSFUL} - region created successfully@*
-@code{@value{RPREFIX}INVALID_NAME} - invalid task name@*
-@code{@value{RPREFIX}INVALID_ADDRESS} - address not on four byte boundary@*
-@code{@value{RPREFIX}TOO_MANY} - too many regions created@*
-@code{@value{RPREFIX}INVALID_SIZE} - invalid page size
-
-@subheading DESCRIPTION:
-
-This directive creates a region from a physically
-contiguous memory space which starts at starting_address and is
-length bytes long.  Segments allocated from the region will be a
-multiple of page_size bytes in length.  The assigned region id
-is returned in id.  This region id is used as an argument to
-other region related directives to access the region.
-
-For control and maintenance of the region, RTEMS
-allocates and initializes an RNCB from the RNCB free pool.  Thus
-memory from the region is not used to store the RNCB.  However,
-some overhead within the region is required by RTEMS each time a
-segment is constructed in the region.
-
-Specifying @code{@value{RPREFIX}PRIORITY} in attribute_set causes tasks
-waiting for a segment to be serviced according to task priority.
-Specifying @code{@value{RPREFIX}FIFO} in attribute_set or selecting
-@code{@value{RPREFIX}DEFAULT_ATTRIBUTES} will cause waiting tasks to
-be serviced in First In-First Out order.
-
-The starting_address parameter must be aligned on a
-four byte boundary.  The page_size parameter must be a multiple
-of four greater than or equal to four.
-
-@subheading NOTES:
-
-This directive will not cause the calling task to be
-preempted.
-
-The following region attribute constants are defined
-by RTEMS:
-
-@itemize @bullet
-@item @code{@value{RPREFIX}FIFO} - tasks wait by FIFO (default)
-@item @code{@value{RPREFIX}PRIORITY} - tasks wait by priority
-@end itemize
-
-@page
-@subsection REGION_IDENT - Get ID of a region
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_region_ident
-@example
-rtems_status_code rtems_region_ident(
-  rtems_name  name,
-  rtems_id   *id
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure Region_Ident (
-   Name   : in     RTEMS.Name;
-   ID     :    out RTEMS.ID;
-   Result :    out RTEMS.Status_Codes
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-
-@code{@value{RPREFIX}SUCCESSFUL} - region identified successfully@*
-@code{@value{RPREFIX}INVALID_NAME} - region name not found
-
-@subheading DESCRIPTION:
-
-This directive obtains the region id associated with
-the region name to be acquired.  If the region name is not
-unique, then the region id will match one of the regions with
-that name.  However, this region id is not guaranteed to
-correspond to the desired region.  The region id is used to
-access this region in other region manager directives.
-
-@subheading NOTES:
-
-This directive will not cause the running task to be preempted.
-
-@page
-@subsection REGION_DELETE - Delete a region
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_region_delete
-@example
-rtems_status_code rtems_region_delete(
-  rtems_id id
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure Region_Delete (
-   ID     : in     RTEMS.ID;
-   Result :    out RTEMS.Status_Codes
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-
-@code{@value{RPREFIX}SUCCESSFUL} - region deleted successfully@*
-@code{@value{RPREFIX}INVALID_ID} - invalid region id@*
-@code{@value{RPREFIX}RESOURCE_IN_USE} - segments still in use
-
-@subheading DESCRIPTION:
-
-This directive deletes the region specified by id.
-The region cannot be deleted if any of its segments are still
-allocated.  The RNCB for the deleted region is reclaimed by
-RTEMS.
-
-@subheading NOTES:
-
-This directive will not cause the calling task to be preempted.
-
-The calling task does not have to be the task that
-created the region.  Any local task that knows the region id can
-delete the region.
-
-@page
-@subsection REGION_EXTEND - Add memory to a region
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_region_extend
-@example
-rtems_status_code rtems_region_extend(
-  rtems_id            id,
-  void               *starting_address,
-  rtems_unsigned32    length
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure Region_Extend (
-   ID               : in     RTEMS.ID;
-   Starting_Address : in     RTEMS.Address;
-   Length           : in     RTEMS.Unsigned32;
-   Result           :    out RTEMS.Status_Codes
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-
-@code{@value{RPREFIX}SUCCESSFUL} - region extended successfully@*
-@code{@value{RPREFIX}INVALID_ID} - invalid region id@*
-@code{@value{RPREFIX}INVALID_ADDRESS} - invalid address of area to add
-
-@subheading DESCRIPTION:
-
-This directive adds the memory which starts at
-starting_address for length bytes to the region specified by id.
-
-@subheading NOTES:
-
-This directive will not cause the calling task to be preempted.
-
-The calling task does not have to be the task that
-created the region.  Any local task that knows the region id can
-extend the region.
-
-@page
-@subsection REGION_GET_SEGMENT - Get segment from a region
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_region_get_segment
-@example
-rtems_status_code rtems_region_get_segment(
-  rtems_id            id,
-  rtems_unsigned32    size,
-  rtems_option        option_set,
-  rtems_interval      timeout,
-  void              **segment
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure Region_Get_Segment (
-   ID         : in     RTEMS.ID;
-   Size       : in     RTEMS.Unsigned32;
-   Option_Set : in     RTEMS.Option;
-   Timeout    : in     RTEMS.Interval;
-   Segment    :    out RTEMS.Address;
-   Result     :    out RTEMS.Status_Codes
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-
-@code{@value{RPREFIX}SUCCESSFUL} - segment obtained successfully@*
-@code{@value{RPREFIX}INVALID_ID} - invalid region id@*
-@code{@value{RPREFIX}INVALID_SIZE} - request is for zero bytes or exceeds
-the size of maximum segment which is possible for this region@*
-@code{@value{RPREFIX}UNSATISFIED} - segment of requested size not available@*
-@code{@value{RPREFIX}TIMEOUT} - timed out waiting for segment@*
-@code{@value{RPREFIX}OBJECT_WAS_DELETED} - semaphore deleted while waiting
-
-@subheading DESCRIPTION:
-
-This directive obtains a variable size segment from
-the region specified by id.  The address of the allocated
-segment is returned in segment.  The @code{@value{RPREFIX}WAIT}
-and @code{@value{RPREFIX}NO_WAIT} components
-of the options parameter are used to specify whether the calling
-tasks wish to wait for a segment to become available or return
-immediately if no segment is available.  For either option, if a
-sufficiently sized segment is available, then the segment is
-successfully acquired by returning immediately with  the
-@code{@value{RPREFIX}SUCCESSFUL} status code.
-
-If the calling task chooses to return immediately and
-a segment large enough is not available, then an error code
-indicating this fact is returned.  If the calling task chooses
-to wait for the segment and a segment large enough is not
-available, then the calling task is placed on the region's
-segment wait queue and blocked.  If the region was created with
-the @code{@value{RPREFIX}PRIORITY} option, then the calling
-task is inserted into the
-wait queue according to its priority.  However, if the region
-was created with the @code{@value{RPREFIX}FIFO} option, then the calling
-task is placed at the rear of the wait queue.
-
-The timeout parameter specifies the maximum interval
-that a task is willing to wait to obtain a segment.  If timeout
-is set to @code{@value{RPREFIX}NO_TIMEOUT}, then the
-calling task will wait forever.
-
-@subheading NOTES:
-
-The actual length of the allocated segment may be
-larger than the requested size because a segment size is always
-a multiple of the region's page size.
-
-The following segment acquisition option constants
-are defined by RTEMS:
-
-@itemize @bullet
-@item @code{@value{RPREFIX}WAIT} - task will wait for semaphore (default)
-@item @code{@value{RPREFIX}NO_WAIT} - task should not wait
-@end itemize
-
-A clock tick is required to support the timeout functionality of
-this directive.
-
-@page
-@subsection REGION_RETURN_SEGMENT - Return segment to a region
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_region_return_segment
-@example
-rtems_status_code rtems_region_return_segment(
-  rtems_id  id,
-  void     *segment
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure Region_Return_Segment (
-   ID      : in     RTEMS.ID;
-   Segment : in     RTEMS.Address;
-   Result  :    out RTEMS.Status_Codes
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-
-@code{@value{RPREFIX}SUCCESSFUL} - segment returned successfully@*
-@code{@value{RPREFIX}INVALID_ID} - invalid region id@*
-@code{@value{RPREFIX}INVALID_ADDRESS} - segment address not in region
-
-@subheading DESCRIPTION:
-
-This directive returns the segment specified by
-segment to the region specified by id.  The returned segment is
-merged with its neighbors to form the largest possible segment.
-The first task on the wait queue is examined to determine if its
-segment request can now be satisfied.  If so, it is given a
-segment and unblocked.  This process is repeated until the first
-task's segment request cannot be satisfied.
-
-@subheading NOTES:
-
-This directive will cause the calling task to be
-preempted if one or more local tasks are waiting for a segment
-and the following conditions exist:
-
-@itemize @bullet
-@item a waiting task has a higher priority than the calling task
-
-@item the size of the segment required by the waiting task
-is less than or equal to the size of the segment returned.
-@end itemize
-
-@page
-@subsection REGION_GET_SEGMENT_SIZE - Obtain size of a segment
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_region_get_segment_size
-@example
-rtems_status_code rtems_region_get_segment_size(
-  rtems_id            id,
-  void               *segment,
-  rtems_unsigned32   *size
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure Region_Get_Segment_Size (
-   ID         : in     RTEMS.ID;
-   Segment    : in     RTEMS.Address;
-   Size       :    out RTEMS.Unsigned32;
-   Result     :    out RTEMS.Status_Codes
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-
-@code{@value{RPREFIX}SUCCESSFUL} - segment obtained successfully@*
-@code{@value{RPREFIX}INVALID_ID} - invalid region id@*
-@code{@value{RPREFIX}INVALID_ADDRESS} - segment address not in region
-
-@subheading DESCRIPTION:
-
-This directive obtains the size in bytes of the specified segment.
-
-@subheading NOTES:
-
-The actual length of the allocated segment may be
-larger than the requested size because a segment size is always
-a multiple of the region's page size.
-
diff --git a/doc/user/rtemsarc.gif b/doc/user/rtemsarc.gif
deleted file mode 100644
index fea62ecb42..0000000000
--- a/doc/user/rtemsarc.gif
+++ /dev/null
diff --git a/doc/user/rtemspie.gif b/doc/user/rtemspie.gif
deleted file mode 100644
index 8341861b0d..0000000000
--- a/doc/user/rtemspie.gif
+++ /dev/null
diff --git a/doc/user/rtmon.t b/doc/user/rtmon.t
deleted file mode 100644
index 208a5a73e2..0000000000
--- a/doc/user/rtmon.t
+++ /dev/null
@@ -1,1123 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@c
-@c  Open Issues
-@c    - nicen up the tables
-@c    - use math mode to print formulas
-@c
-
-@chapter Rate Monotonic Manager
-
-@section Introduction
-
-The rate monotonic manager provides facilities to
-implement tasks which execute in a periodic fashion.  The
-directives provided by the rate monotonic manager are:
-
-@itemize @bullet
-@item @code{@value{DIRPREFIX}rate_monotonic_create} - Create a rate monotonic period
-@item @code{@value{DIRPREFIX}rate_monotonic_ident} - Get ID of a period
-@item @code{@value{DIRPREFIX}rate_monotonic_cancel} - Cancel a period
-@item @code{@value{DIRPREFIX}rate_monotonic_delete} - Delete a rate monotonic period
-@item @code{@value{DIRPREFIX}rate_monotonic_period} - Conclude current/Start next period
-@item @code{@value{DIRPREFIX}rate_monotonic_get_status} - Obtain status information on period
-@end itemize
-
-@section Background
-
-The rate monotonic manager provides facilities to
-manage the execution of periodic tasks.  This manager was
-designed to support application designers who utilize the Rate
-Monotonic Scheduling Algorithm (RMS) to insure that their
-periodic tasks will meet their deadlines, even under transient
-overload conditions.  Although designed for hard real-time
-systems, the services provided by the rate monotonic manager may
-be used by any application which requires periodic tasks.
-
-@subsection Rate Monotonic Manager Required Support
-
-A clock tick is required to support the functionality provided by this manager.
-
-@subsection Rate Monotonic Manager Definitions
-
-A periodic task is one which must be executed at a
-regular interval.  The interval between successive iterations of
-the task is referred to as its period.  Periodic tasks can be
-characterized by the length of their period and execution time.
-The period and execution time of a task can be used to determine
-the processor utilization for that task.  Processor utilization
-is the percentage of processor time used and can be calculated
-on a per-task or system-wide basis.  Typically, the task's
-worst-case execution time will be less than its period.  For
-example, a periodic task's requirements may state that it should
-execute for 10 milliseconds every 100 milliseconds.  Although
-the execution time may be the average, worst, or best case, the
-worst-case execution time is more appropriate for use when
-analyzing system behavior under transient overload conditions.
-
-In contrast, an aperiodic task executes at irregular
-intervals and has only a soft deadline.  In other words, the
-deadlines for aperiodic tasks are not rigid, but adequate
-response times are desirable.  For example, an aperiodic task
-may process user input from a terminal.
-
-Finally, a sporadic task is an aperiodic task with a
-hard deadline and minimum interarrival time.  The minimum
-interarrival time is the minimum period of time which exists
-between successive iterations of the task.  For example, a
-sporadic task could be used to process the pressing of a fire
-button on a joystick.  The mechanical action of the fire button
-insures a minimum time period between successive activations,
-but the missile must be launched by a hard deadline.
-
-@subsection Rate Monotonic Scheduling Algorithm
-
-The Rate Monotonic Scheduling Algorithm (RMS) is
-important to real-time systems designers because it allows one
-to guarantee that a set of tasks is schedulable.  A set of tasks
-is said to be schedulable if all of the tasks can meet their
-deadlines.  RMS provides a set of rules which can be used to
-perform a guaranteed schedulability analysis for a task set.
-This analysis determines whether a task set is schedulable under
-worst-case conditions and emphasizes the predictability of the
-system's behavior.  It has been proven that:
-
-@itemize @code{ }
-@b{RMS is an optimal static priority algorithm for
-scheduling independent, preemptible, periodic tasks
-on a single processor.}
-@end itemize
-
-RMS is optimal in the sense that if a set of tasks
-can be scheduled by any static priority algorithm, then RMS will
-be able to schedule that task set.  RMS bases it schedulability
-analysis on the processor utilization level below which all
-deadlines can be met.
-
-RMS calls for the static assignment of task
-priorities based upon their period.  The shorter a task's
-period, the higher its priority.  For example, a task with a 1
-millisecond period has higher priority than a task with a 100
-millisecond period.  If two tasks have the same period, then RMS
-does not distinguish between the tasks.  However, RTEMS
-specifies that when given tasks of equal priority, the task
-which has been ready longest will execute first.  RMS's priority
-assignment scheme does not provide one with exact numeric values
-for task priorities.  For example, consider the following task
-set and priority assignments:
-
-@ifset use-ascii
-@example
-@group
-+--------------------+---------------------+---------------------+
-|        Task        |       Period        |      Priority       |
-|                    |  (in milliseconds)  |                     |
-+--------------------+---------------------+---------------------+
-|         1          |         100         |         Low         |
-+--------------------+---------------------+---------------------+
-|         2          |          50         |       Medium        |
-+--------------------+---------------------+---------------------+
-|         3          |          50         |       Medium        |
-+--------------------+---------------------+---------------------+
-|         4          |          25         |        High         |
-+--------------------+---------------------+---------------------+
-@end group
-@end example
-@end ifset
-
-@ifset use-tex
-@sp 1
-@tex
-\centerline{\vbox{\offinterlineskip\halign{
-\vrule\strut#&
-\hbox to 0.75in{\enskip\hfil#\hfil}&
-\vrule#&
-\hbox to 1.25in{\enskip\hfil#\hfil}&
-\vrule#&
-\hbox to 1.25in{\enskip\hfil#\hfil}&
-\vrule#\cr\noalign{\hrule}
-&\bf Task&& \bf Period && \bf Priority &\cr
-& && \bf (in milliseconds) && &\cr\noalign{\hrule}
-& 1 && 100 && Low &\cr\noalign{\hrule}
-& 2 && 50 && Medium &\cr\noalign{\hrule}
-& 3 && 50 && Medium &\cr\noalign{\hrule}
-& 4 && 25 && High &\cr\noalign{\hrule}
-}}\hfil}
-@end tex
-@end ifset
-
-@ifset use-html
-@html
-<CENTER>
-  <TABLE COLS=3 WIDTH="80%" BORDER=2>
-<TR><TD ALIGN=center><STRONG>Task</STRONG></TD>
-    <TD ALIGN=center><STRONG>Period (in milliseconds)</STRONG></TD>
-    <TD ALIGN=center><STRONG>Priority</STRONG></TD></TR>
-<TR><TD ALIGN=center>1</TD>
-    <TD ALIGN=center>100 </TD>
-    <TD ALIGN=center>Low</TD></TR>
-<TR><TD ALIGN=center>2</TD>
-    <TD ALIGN=center>50 </TD>
-    <TD ALIGN=center>Medium</TD></TR>
-<TR><TD ALIGN=center>3</TD>
-    <TD ALIGN=center>50 </TD>
-    <TD ALIGN=center>Medium</TD></TR>
-<TR><TD ALIGN=center>4</TD>
-    <TD ALIGN=center>25 </TD>
-    <TD ALIGN=center>High</TD></TR>
-  </TABLE>
-</CENTER>
-@end html
-@end ifset
-
-RMS only calls for task 1 to have the lowest
-priority, task 4 to have the highest priority, and tasks 2 and 3
-to have an equal priority between that of tasks 1 and 4.  The
-actual RTEMS priorities assigned to the tasks must only adhere
-to those guidelines.
-
-Many applications have tasks with both hard and soft
-deadlines.  The tasks with hard deadlines are typically referred
-to as the critical task set, with the soft deadline tasks being
-the non-critical task set.  The critical task set can be
-scheduled using RMS, with the non-critical tasks not executing
-under transient overload, by simply assigning priorities such
-that the lowest priority critical task (i.e. longest period) has
-a higher priority than the highest priority non-critical task.
-Although RMS may be used to assign priorities to the
-non-critical tasks, it is not necessary.  In this instance,
-schedulability is only guaranteed for the critical task set.
-
-@subsection Schedulability Analysis
-
-RMS allows application designers to insure that tasks
-can meet all deadlines, even under transient overload, without
-knowing exactly when any given task will execute by applying
-proven schedulability analysis rules.
-
-@lowersections
-
-@subsection Assumptions
-
-The schedulability analysis rules for RMS were
-developed based on the following assumptions:
-
-
-@itemize @bullet
-@item The requests for all tasks for which hard deadlines
-exist are periodic, with a constant interval between requests.
-
-@item Each task must complete before the next request for it
-occurs.
-
-@item The tasks are independent in that a task does not depend
-on the initiation or completion of requests for other tasks.
-
-@item The execution time for each task without preemption or
-interruption is constant and does not vary.
-
-@item Any non-periodic tasks in the system are special.  These
-tasks displace periodic tasks while executing and do not have
-hard, critical deadlines.
-@end itemize
-
-Once the basic schedulability analysis is understood,
-some of the above assumptions can be relaxed and the
-side-effects accounted for.
-
-@subsection Processor Utilization Rule
-
-The Processor Utilization Rule requires that
-processor utilization be calculated based upon the period and
-execution time of each task.  The fraction of processor time
-spent executing task index is Time(index) / Period(index).  The
-processor utilization can be calculated as follows:
-
-@example
-@group
-Utilization = 0
-
-for index = 1 to maximum_tasks
-  Utilization = Utilization + (Time(index)/Period(index))
-@end group
-@end example
-
-To insure schedulability even under transient
-overload, the processor utilization must adhere to the following
-rule:
-
-@example
-Utilization = maximum_tasks * (2(1/maximum_tasks) - 1)
-@end example
-
-As the number of tasks increases, the above formula
-approaches ln(2) for a worst-case utilization factor of
-approximately 0.693.  Many tasks sets can be scheduled with a
-greater utilization factor.  In fact, the average processor
-utilization threshold for a randomly generated task set is
-approximately 0.88.
-
-@subsection Processor Utilization Rule Example
-
-This example illustrates the application of the
-Processor Utilization Rule to an application with three critical
-periodic tasks.  The following table details the RMS priority,
-period, execution time, and processor utilization for each task:
-
-@ifset use-ascii
-@example
-@group
-    +------------+----------+--------+-----------+-------------+
-    |    Task    |   RMS    | Period | Execution |  Processor  |
-    |            | Priority |        |   Time    | Utilization |
-    +------------+----------+--------+-----------+-------------+
-    |     1      |   High   |  100   |    15     |    0.15     |
-    +------------+----------+--------+-----------+-------------+
-    |     2      |  Medium  |  200   |    50     |    0.25     |
-    +------------+----------+--------+-----------+-------------+
-    |     3      |   Low    |  300   |   100     |    0.33     |
-    +------------+----------+--------+-----------+-------------+
-@end group
-@end example
-@end ifset
-
-@ifset use-tex
-@sp 1
-@tex
-\centerline{\vbox{\offinterlineskip\halign{
-\vrule\strut#&
-\hbox to 0.75in{\enskip\hfil#\hfil}&
-\vrule#&
-\hbox to 0.75in{\enskip\hfil#\hfil}&
-\vrule#&
-\hbox to 0.75in{\enskip\hfil#\hfil}&
-\vrule#&
-\hbox to 1.00in{\enskip\hfil#\hfil}&
-\vrule#&
-\hbox to 1.00in{\enskip\hfil#\hfil}&
-\vrule#\cr\noalign{\hrule}
-&\bf Task&& \bf RMS && \bf Period && \bf Execution &&\bf Processor&\cr
-& && \bf Priority && &&\bf Time &&\bf Utilization &\cr\noalign{\hrule}
-& 1 && High && 100 && 15 && 0.15 &\cr\noalign{\hrule}
-& 2 && Medium && 200 && 50 && 0.25 &\cr\noalign{\hrule}
-& 3 && Low && 300 && 100 && 0.33 &\cr\noalign{\hrule}
-}}\hfil}
-@end tex
-@end ifset
- 
-@ifset use-html
-@html
-<CENTER>
-  <TABLE COLS=5 WIDTH="80%" BORDER=2>
-<TR><TD ALIGN=center><STRONG>Task</STRONG></TD>
-    <TD ALIGN=center><STRONG>RMS Priority</STRONG></TD>
-    <TD ALIGN=center><STRONG>Period</STRONG></TD>
-    <TD ALIGN=center><STRONG>Execution Time</STRONG></TD>
-    <TD ALIGN=center><STRONG>Processor Utilization</STRONG></TD></TR>
-<TR><TD ALIGN=center>1</TD>
-    <TD ALIGN=center>High</TD>
-    <TD ALIGN=center>100</TD>
-    <TD ALIGN=center>15</TD>
-    <TD ALIGN=center>0.15</TD></TR>
-<TR><TD ALIGN=center>2</TD>
-    <TD ALIGN=center>Medium</TD>
-    <TD ALIGN=center>200</TD>
-    <TD ALIGN=center>50</TD>
-    <TD ALIGN=center>0.25</TD></TR>
-<TR><TD ALIGN=center>3</TD>
-    <TD ALIGN=center>Low</TD>
-    <TD ALIGN=center>300</TD>
-    <TD ALIGN=center>100</TD>
-    <TD ALIGN=center>0.33</TD></TR>
-  </TABLE>
-</CENTER>
-@end html
-@end ifset
-
-The total processor utilization for this task set is
-0.73 which is below the upper bound of 3 * (2(1/3) - 1), or
-0.779, imposed by the Processor Utilization Rule.  Therefore,
-this task set is guaranteed to be schedulable using RMS.
-
-@subsection First Deadline Rule
-
-If a given set of tasks do exceed the processor
-utilization upper limit imposed by the Processor Utilization
-Rule, they can still be guaranteed to meet all their deadlines
-by application of the First Deadline Rule.  This rule can be
-stated as follows:
-
-For a given set of independent periodic tasks, if
-each task meets its first deadline when all tasks are started at
-the same time, then the deadlines will always be met for any
-combination of start times.
-
-A key point with this rule is that ALL periodic tasks
-are assumed to start at the exact same instant in time.
-Although this assumption may seem to be invalid,  RTEMS makes it
-quite easy to insure.  By having a non-preemptible user
-initialization task, all application tasks, regardless of
-priority, can be created and started before the initialization
-deletes itself.  This technique insures that all tasks begin to
-compete for execution time at the same instant -- when the user
-initialization task deletes itself.
-
-@subsection First Deadline Rule Example
-
-The First Deadline Rule can insure schedulability
-even when the Processor Utilization Rule fails.  The example
-below is a modification of the Processor Utilization Rule
-example where task execution time has been increased from 15 to
-25 units.  The following table details the RMS priority, period,
-execution time, and processor utilization for each task:
-
-@ifset use-ascii
-@example
-@group
-    +------------+----------+--------+-----------+-------------+
-    |    Task    |   RMS    | Period | Execution |  Processor  |
-    |            | Priority |        |   Time    | Utilization |
-    +------------+----------+--------+-----------+-------------+
-    |     1      |   High   |  100   |    25     |    0.25     |
-    +------------+----------+--------+-----------+-------------+
-    |     2      |  Medium  |  200   |    50     |    0.25     |
-    +------------+----------+--------+-----------+-------------+
-    |     3      |   Low    |  300   |   100     |    0.33     |
-    +------------+----------+--------+-----------+-------------+
-@end group
-@end example
-@end ifset
-
-@ifset use-tex
-@sp 1
-@tex
-\centerline{\vbox{\offinterlineskip\halign{
-\vrule\strut#&
-\hbox to 0.75in{\enskip\hfil#\hfil}&
-\vrule#&
-\hbox to 0.75in{\enskip\hfil#\hfil}&
-\vrule#&
-\hbox to 0.75in{\enskip\hfil#\hfil}&
-\vrule#&
-\hbox to 1.00in{\enskip\hfil#\hfil}&
-\vrule#&
-\hbox to 1.00in{\enskip\hfil#\hfil}&
-\vrule#\cr\noalign{\hrule}
-&\bf Task&& \bf RMS && \bf Period && \bf Execution &&\bf Processor&\cr
-& && \bf Priority && &&\bf Time &&\bf Utilization &\cr\noalign{\hrule}
-& 1 && High && 100 && 25 && 0.25 &\cr\noalign{\hrule}
-& 2 && Medium && 200 && 50 && 0.25 &\cr\noalign{\hrule}
-& 3 && Low && 300 && 100 && 0.33 &\cr\noalign{\hrule}
-}}\hfil}
-@end tex
-@end ifset
- 
-@ifset use-html
-@html
-<CENTER>
-  <TABLE COLS=5 WIDTH="80%" BORDER=2>
-<TR><TD ALIGN=center><STRONG>Task</STRONG></TD>
-    <TD ALIGN=center><STRONG>RMS Priority</STRONG></TD>
-    <TD ALIGN=center><STRONG>Period</STRONG></TD>
-    <TD ALIGN=center><STRONG>Execution Time</STRONG></TD>
-    <TD ALIGN=center><STRONG>Processor Utilization</STRONG></TD></TR>
-<TR><TD ALIGN=center>1</TD>
-    <TD ALIGN=center>High</TD>
-    <TD ALIGN=center>100</TD>
-    <TD ALIGN=center>25</TD>
-    <TD ALIGN=center>0.25</TD></TR>
-<TR><TD ALIGN=center>2</TD>
-    <TD ALIGN=center>Medium</TD>
-    <TD ALIGN=center>200</TD>
-    <TD ALIGN=center>50</TD>
-    <TD ALIGN=center>0.25</TD></TR>
-<TR><TD ALIGN=center>3</TD>
-    <TD ALIGN=center>Low</TD>
-    <TD ALIGN=center>300</TD>
-    <TD ALIGN=center>100</TD>
-    <TD ALIGN=center>0.33</TD></TR>
-  </TABLE>
-</CENTER>
-@end html
-@end ifset
-
-The total processor utilization for the modified task
-set is 0.83 which is above the upper bound of 3 * (2(1/3) - 1),
-or 0.779, imposed by the Processor Utilization Rule.  Therefore,
-this task set is not guaranteed to be schedulable using RMS.
-However, the First Deadline Rule can guarantee the
-schedulability of this task set.  This rule calls for one to
-examine each occurrence of deadline until either all tasks have
-met their deadline or one task failed to meet its first
-deadline.  The following table details the time of each deadline
-occurrence, the maximum number of times each task may have run,
-the total execution time, and whether all the deadlines have
-been met.
-
-@ifset use-ascii
-@example
-@group
-+----------+------+------+------+----------------------+---------------+
-| Deadline | Task | Task | Task |        Total         | All Deadlines |
-|   Time   |  1   |  2   |  3   |    Execution Time    |     Met?      |
-+----------+------+------+------+----------------------+---------------+
-|   100    |  1   |  1   |  1   |  25 + 50 + 100 = 175 |      NO       |
-+----------+------+------+------+----------------------+---------------+
-|   200    |  2   |  1   |  1   |  50 + 50 + 100 = 200 |     YES       |
-+----------+------+------+------+----------------------+---------------+
-@end group
-@end example
-@end ifset
-
-@ifset use-tex
-@sp 1
-@tex
-\centerline{\vbox{\offinterlineskip\halign{
-\vrule\strut#&
-\hbox to 0.75in{\enskip\hfil#\hfil}&
-\vrule#&
-\hbox to 0.75in{\enskip\hfil#\hfil}&
-\vrule#&
-\hbox to 0.75in{\enskip\hfil#\hfil}&
-\vrule#&
-\hbox to 0.75in{\enskip\hfil#\hfil}&
-\vrule#&
-\hbox to 2.00in{\enskip\hfil#\hfil}&
-\vrule#&
-\hbox to 1.00in{\enskip\hfil#\hfil}&
-\vrule#\cr\noalign{\hrule}
-&\bf Deadline&& \bf Task &&\bf Task&&\bf Task&&\bf Total          &&\bf All Deadlines &\cr
-&\bf Time    && \bf 1    &&\bf 2   &&\bf 3   &&\bf Execution Time &&\bf Net?&\cr\noalign{\hrule}
-& 100&& 1 && 1 && 1 && 25 + 50 + 100 = 175 && NO &\cr\noalign{\hrule}
-& 200&& 2 && 1 && 1 && 50 + 50 + 100 = 200 && YES &\cr\noalign{\hrule}
-}}\hfil}
-@end tex
-@end ifset
- 
-@ifset use-html
-@html
-<CENTER>
-  <TABLE COLS=6 WIDTH="80%" BORDER=2>
-<TR><TD ALIGN=center><STRONG>Deadline Time</STRONG></TD>
-    <TD ALIGN=center><STRONG>Task 1</STRONG></TD>
-    <TD ALIGN=center><STRONG>Task 2</STRONG></TD>
-    <TD ALIGN=center><STRONG>Task 3</STRONG></TD>
-    <TD ALIGN=center><STRONG>Total Execution Time</STRONG></TD>
-    <TD ALIGN=center><STRONG>All Deadlines Met?</STRONG></TD></TR>
-<TR><TD ALIGN=center>100</TD>
-    <TD ALIGN=center>1</TD>
-    <TD ALIGN=center>1</TD>
-    <TD ALIGN=center>1</TD>
-    <TD ALIGN=center>25 + 50 + 100 = 175</TD>
-    <TD ALIGN=center>NO</TD></TR>
-<TR><TD ALIGN=center>200</TD>
-    <TD ALIGN=center>2</TD>
-    <TD ALIGN=center>1</TD>
-    <TD ALIGN=center>1</TD>
-    <TD ALIGN=center>50 + 50 + 100 = 175</TD>
-    <TD ALIGN=center>YES</TD></TR>
-  </TABLE>
-</CENTER>
-@end html
-@end ifset
-
-The key to this analysis is to recognize when each
-task will execute.  For example	at time 100, task 1 must have
-met its first deadline, but tasks 2 and 3 may also have begun
-execution.  In this example, at time 100 tasks 1 and 2 have
-completed execution and thus have met their first deadline.
-Tasks 1 and 2 have used (25 + 50) = 75 time units, leaving (100
-- 75) = 25 time units for task 3 to begin.  Because task 3 takes
-100 ticks to execute, it will not have completed execution at
-time 100.  Thus at time 100, all of the tasks except task 3 have
-met their first deadline.
-
-At time 200, task 1 must have met its second deadline
-and task 2 its first deadline.  As a result, of the first 200
-time units, task 1 uses (2 * 25) = 50 and task 2 uses 50,
-leaving (200 - 100) time units for task 3.  Task 3 requires 100
-time units to execute, thus it will have completed execution at
-time 200.  Thus, all of the tasks have met their first deadlines
-at time 200, and the task set is schedulable using the First
-Deadline Rule.
-
-@subsection Relaxation of Assumptions
-
-The assumptions used to develop the RMS
-schedulability rules are uncommon in most real-time systems.
-For example, it was assumed that tasks have constant unvarying
-execution time.  It is possible to relax this assumption, simply
-by using the worst-case execution time of each task.
-
-Another assumption is that the tasks are independent.
-This means that the tasks do not wait for one another or
-contend for resources.  This assumption can be relaxed by
-accounting for the amount of time a task spends waiting to
-acquire resources.  Similarly, each task's execution time must
-account for any I/O performed and any RTEMS directive calls.
-
-In addition, the assumptions did not account for the
-time spent executing interrupt service routines.  This can be
-accounted for by including all the processor utilization by
-interrupt service routines in the utilization calculation.
-Similarly, one should also account for the impact of delays in
-accessing local memory caused by direct memory access and other
-processors accessing local dual-ported memory.
-
-The assumption that nonperiodic tasks are used only
-for initialization or failure-recovery can be relaxed by placing
-all periodic tasks in the critical task set.  This task set can
-be scheduled and analyzed using RMS.  All nonperiodic tasks are
-placed in the non-critical task set.  Although the critical task
-set can be guaranteed to execute even under transient overload,
-the non-critical task set is not guaranteed to execute.
-
-In conclusion, the application designer must be fully
-cognizant of the system and its run-time behavior when
-performing schedulability analysis for a system using RMS.
-Every hardware and software factor which impacts the execution
-time of each task must be accounted for in the schedulability
-analysis.
-
-@subsection Further Reading
-
-For more information on Rate Monotonic Scheduling and
-its schedulability analysis, the reader is referred to the
-following:
-
-@itemize @code{ }
-@item @cite{C. L. Liu and J. W. Layland. "Scheduling Algorithms for
-Multiprogramming in a Hard Real Time Environment." @b{Journal of
-the Association of Computing Machinery}. January 1973. pp. 46-61.}
-
-@item @cite{John Lehoczky, Lui Sha, and Ye Ding. "The Rate Monotonic
-Scheduling Algorithm: Exact Characterization and Average Case
-Behavior."  @b{IEEE Real-Time Systems Symposium}. 1989. pp. 166-171.}
-
-@item @cite{Lui Sha and John Goodenough. "Real-Time Scheduling
-Theory and Ada."  @b{IEEE Computer}. April 1990. pp. 53-62.}
-
-@item @cite{Alan Burns. "Scheduling hard real-time systems: a
-review."  @b{Software Engineering Journal}. May 1991. pp. 116-128.}
-@end itemize
-
-@raisesections
-
-@section Operations
-
-@subsection Creating a Rate Monotonic Period
-
-The @code{@value{DIRPREFIX}rate_monotonic_create} directive creates a rate
-monotonic period which is to be used by the calling task to
-delineate a period.  RTEMS allocates a Period Control Block
-(PCB) from the PCB free list.  This data structure is used by
-RTEMS to manage the newly created rate monotonic period.  RTEMS
-returns a unique period ID to the application which is used by
-other rate monotonic manager directives to access this rate
-monotonic period.
-
-@subsection Manipulating a Period
-
-The @code{@value{DIRPREFIX}rate_monotonic_period} directive is used to
-establish and maintain periodic execution utilizing a previously
-created rate monotonic period.   Once initiated by the
-@code{@value{DIRPREFIX}rate_monotonic_period} directive, the period is
-said to run until it either expires or is reinitiated.  The state of the rate
-monotonic period results in one of the following scenarios:
-
-@itemize @bullet
-@item If the rate monotonic period is running, the calling
-task will be blocked for the remainder of the outstanding period
-and, upon completion of that period, the period will be
-reinitiated with the specified period.
-
-@item If the rate monotonic period is not currently running
-and has not expired, it is initiated with a length of period
-ticks and the calling task returns immediately.
-
-@item If the rate monotonic period has expired before the task
-invokes the @code{@value{DIRPREFIX}rate_monotonic_period} directive,
-the period will be initiated with a length of period ticks and the calling task
-returns immediately with a timeout error status.
-
-@end itemize
-
-@subsection Obtaining a Period's Status
-
-If the @code{@value{DIRPREFIX}rate_monotonic_period} directive is invoked
-with a period of @code{@value{RPREFIX}PERIOD_STATUS} ticks, the current
-state of the specified rate monotonic period will be returned.  The following
-table details the relationship between the period's status and
-the directive status code returned by the
-@code{@value{DIRPREFIX}rate_monotonic_period}
-directive:
-
-@itemize @bullet
-@item @code{@value{RPREFIX}SUCCESSFUL} - period is running
-
-@item @code{@value{RPREFIX}TIMEOUT} - period has expired
-
-@item @code{@value{RPREFIX}NOT_DEFINED} - period has never been initiated
-@end itemize
-
-Obtaining the status of a rate monotonic period does
-not alter the state or length of that period.
-
-@subsection Canceling a Period
-
-The @code{@value{DIRPREFIX}rate_monotonic_cancel} directive is used to stop
-the period maintained by the specified rate monotonic period.
-The period is stopped and the rate monotonic period can be
-reinitiated using the @code{@value{DIRPREFIX}rate_monotonic_period} directive.
-
-@subsection Deleting a Rate Monotonic Period
-
-The @code{@value{DIRPREFIX}rate_monotonic_delete} directive is used to delete
-a rate monotonic period.  If the period is running and has not
-expired, the period is automatically canceled.  The rate
-monotonic period's control block is returned to the PCB free
-list when it is deleted.  A rate monotonic period can be deleted
-by a task other than the task which created the period.
-
-@subsection Examples
-
-The following sections illustrate common uses of rate
-monotonic periods to construct periodic tasks.
-
-@subsection Simple Periodic Task
-
-This example consists of a single periodic task
-which, after initialization, executes every 100 clock ticks.
-
-@page
-@example
-rtems_task Periodic_task()
-@{
-  rtems_name        name;
-  rtems_id          period;
-  rtems_status_code status;
-
-  name = rtems_build_name( 'P', 'E', 'R', 'D' );
-
-  (void) rate_monotonic_create( name, &period );
-
-  while ( 1 ) @{
-    if ( rate_monotonic_period( period, 100 ) == TIMEOUT )
-      break;
-
-    /* Perform some periodic actions */
-  @}
-
-  /* missed period so delete period and SELF */
-
-  (void) rate_monotonic_delete( period );
-  (void) task_delete( SELF );
-@}
-@end example
-
-
-The above task creates a rate monotonic period as
-part of its initialization.  The first time the loop is
-executed, the @code{@value{DIRPREFIX}rate_monotonic_period}
-directive will initiate the period for 100 ticks and return
-immediately.  Subsequent invocations of the
-@code{@value{DIRPREFIX}rate_monotonic_period} directive will result
-in the task blocking for the remainder of the 100 tick period.
-If, for any reason, the body of the loop takes more than 100
-ticks to execute, the @code{@value{DIRPREFIX}rate_monotonic_period}
-directive will return the @code{@value{RPREFIX}TIMEOUT} status.  
-If the above task misses its deadline, it will delete the rate
-monotonic period and itself.
-
-@subsection Task with Multiple Periods
-
-This example consists of a single periodic task
-which, after initialization, performs two sets of actions every
-100 clock ticks.  The first set of actions is performed in the
-first forty clock ticks of every 100 clock ticks, while the
-second set of actions is performed between the fortieth and
-seventieth clock ticks.  The last thirty clock ticks are not
-used by this task.
-
-@page
-@example
-task Periodic_task()
-@{
-  rtems_name        name_1, name_2;
-  rtems_id          period_1, period_2;
-  rtems_status_code status;
-
-  name_1 = rtems_build_name( 'P', 'E', 'R', '1' );
-  name_2 = rtems_build_name( 'P', 'E', 'R', '2' );
-
-  (void ) rate_monotonic_create( name_1, &period_1 );
-  (void ) rate_monotonic_create( name_2, &period_2 );
-
-  while ( 1 ) @{
-    if ( rate_monotonic_period( period_1, 100 ) == TIMEOUT )
-      break;
-
-    if ( rate_monotonic_period( period_2, 40 ) == TIMEOUT )
-      break;
-
-    /*
-     *  Perform first set of actions between clock
-     *  ticks 0 and 39 of every 100 ticks.
-     */
-
-    if ( rate_monotonic_period( period_2, 30 ) == TIMEOUT )
-      break;
-
-    /*
-     *  Perform second set of actions between clock 40 and 69
-     *  of every 100 ticks.  THEN ...
-     *
-     *  Check to make sure we didn't miss the period_2 period.
-     */
-
-    if ( rate_monotonic_period( period_2, STATUS ) == TIMEOUT )
-      break;
-
-    (void) rate_monotonic_cancel( period_2 );
-  @}
-
-  /* missed period so delete period and SELF */
-
-  (void ) rate_monotonic_delete( period_1 );
-  (void ) rate_monotonic_delete( period_2 );
-  (void ) task_delete( SELF );
-@}
-@end example
-
-The above task creates two rate monotonic periods as
-part of its initialization.  The first time the loop is
-executed, the @code{@value{DIRPREFIX}rate_monotonic_period}
-directive will initiate the period_1 period for 100 ticks
-and return immediately.  Subsequent invocations of the
-@code{@value{DIRPREFIX}rate_monotonic_period} directive
-for period_1 will result in the task blocking for the remainder
-of the 100 tick period.  The period_2 period is used to control
-the execution time of the two sets of actions within each 100
-tick period established by period_1.  The
-@code{@value{DIRPREFIX}rate_monotonic_cancel( period_2 )}
-call is performed to insure that the period_2 period
-does not expire while the task is blocked on the period_1
-period.  If this cancel operation were not performed, every time
-the @code{@value{DIRPREFIX}rate_monotonic_period( period_1, 40 )}
-call is executed, except for the initial one, a directive status
-of @code{@value{RPREFIX}TIMEOUT} is returned.  It is important to
-note that every time this call is made, the period_1 period will be
-initiated immediately and the task will not block.
-
-If, for any reason, the task misses any deadline, the
-@code{@value{DIRPREFIX}rate_monotonic_period} directive will
-return the @code{@value{RPREFIX}TIMEOUT}
-directive status.  If the above task misses its deadline, it
-will delete the rate monotonic periods and itself.
-
-@section Directives
-
-This section details the rate monotonic manager's
-directives.  A subsection is dedicated to each of this manager's
-directives and describes the calling sequence, related
-constants, usage, and status codes.
-
-@page
-@subsection RATE_MONOTONIC_CREATE - Create a rate monotonic period
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_rate_monotonic_create
-@example
-rtems_status_code rtems_rate_monotonic_create(
-  rtems_name  name,
-  rtems_id   *id
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure Rate_Monotonic_Create (
-   Name   : in     RTEMS.Name;
-   ID     :    out RTEMS.ID;
-   Result :    out RTEMS.Status_Codes
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-@code{@value{RPREFIX}SUCCESSFUL} - rate monotonic period created successfully@*
-@code{@value{RPREFIX}INVALID_NAME} - invalid task name@*
-@code{@value{RPREFIX}TOO_MANY} - too many periods created
-
-@subheading DESCRIPTION:
-
-This directive creates a rate monotonic period.  The
-assigned rate monotonic id is returned in id.  This id is used
-to access the period with other rate monotonic manager
-directives.  For control and maintenance of the rate monotonic
-period, RTEMS allocates a PCB from the local PCB free pool and
-initializes it.
-
-@subheading NOTES:
-
-This directive will not cause the calling task to be
-preempted.
-
-@page
-@subsection RATE_MONOTONIC_IDENT - Get ID of a period
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_rate_monotonic_ident
-@example
-rtems_status_code rtems_rate_monotonic_ident(
-  rtems_name  name,
-  rtems_id   *id
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure Rate_Monotonic_Ident (
-   Name   : in     RTEMS.Name;
-   ID     :    out RTEMS.ID;
-   Result :    out RTEMS.Status_Codes
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-@code{@value{RPREFIX}SUCCESSFUL} - period identified successfully@*
-@code{@value{RPREFIX}INVALID_NAME} - period name not found
-
-@subheading DESCRIPTION:
-
-This directive obtains the period id associated with
-the period name to be acquired.  If the period name is not
-unique, then the period id will match one of the periods with
-that name.  However, this period id is not guaranteed to
-correspond to the desired period.  The period id is used to
-access this period in other rate monotonic manager directives.
-
-@subheading NOTES:
-
-This directive will not cause the running task to be
-preempted.
-
-@page
-@subsection RATE_MONOTONIC_CANCEL - Cancel a period
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_rate_monotonic_cancel
-@example
-rtems_status_code rtems_rate_monotonic_cancel(
-  rtems_id id
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure Rate_Monotonic_Cancel (
-   ID     : in     RTEMS.ID;
-   Result :    out RTEMS.Status_Codes
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-@code{@value{RPREFIX}SUCCESSFUL} - period canceled successfully@*
-@code{@value{RPREFIX}INVALID_ID} - invalid rate monotonic period id@*
-@code{@value{RPREFIX}NOT_OWNER_OF_RESOURCE} - rate monotonic period not created by calling task
-
-@subheading DESCRIPTION:
-
-This directive cancels the rate monotonic period id.
-This period will be reinitiated by the next invocation of
-@code{@value{DIRPREFIX}rate_monotonic_period} with id.
-
-@subheading NOTES:
-
-This directive will not cause the running task to be
-preempted.
-
-The rate monotonic period specified by id must have
-been created by the calling task.
-
-@page
-@subsection RATE_MONOTONIC_DELETE - Delete a rate monotonic period
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_rate_monotonic_delete
-@example
-rtems_status_code rtems_rate_monotonic_delete(
-  rtems_id id
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure Rate_Monotonic_Delete (
-   ID     : in     RTEMS.ID;
-   Result :    out RTEMS.Status_Codes
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-@code{@value{RPREFIX}SUCCESSFUL} - period deleted successfully@*
-@code{@value{RPREFIX}INVALID_ID} - invalid rate monotonic period id
-
-@subheading DESCRIPTION:
-
-This directive deletes the rate monotonic period
-specified by id.  If the period is running, it is automatically
-canceled.  The PCB for the deleted period is reclaimed by RTEMS.
-
-@subheading NOTES:
-
-This directive will not cause the running task to be
-preempted.
-
-A rate monotonic period can be deleted by a task
-other than the task which created the period.
-
-@page
-@subsection RATE_MONOTONIC_PERIOD - Conclude current/Start next period
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_rate_monotonic_period
-@example
-rtems_status_code rtems_rate_monotonic_period(
-  rtems_id       id,
-  rtems_interval length
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure Rate_Monotonic_Period (
-   ID      : in     RTEMS.ID;
-   Length  : in     RTEMS.Interval;
-   Result  :    out RTEMS.Status_Codes
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-@code{@value{RPREFIX}SUCCESSFUL} - period initiated successfully@*
-@code{@value{RPREFIX}INVALID_ID} - invalid rate monotonic period id@*
-@code{@value{RPREFIX}NOT_OWNER_OF_RESOURCE} - period not created by calling task@*
-@code{@value{RPREFIX}NOT_DEFINED} - period has never been initiated (only
-possible when period is set to PERIOD_STATUS)@*
-@code{@value{RPREFIX}TIMEOUT} - period has expired
-
-@subheading DESCRIPTION:
-
-This directive initiates the rate monotonic period id
-with a length of period ticks.  If id is running, then the
-calling task will block for the remainder of the period before
-reinitiating the period with the specified period.  If id was
-not running (either expired or never initiated), the period is
-immediately initiated and the directive returns immediately.
-
-If invoked with a period of @code{@value{RPREFIX}PERIOD_STATUS} ticks, the
-current state of id will be returned.  The directive status
-indicates the current state of the period.  This does not alter
-the state or period of the period.
-
-@subheading NOTES:
-
-This directive will not cause the running task to be preempted.
-
----------------------
-@page
-@subsection RATE_MONOTONIC_GET_STATUS - Obtain status information on period
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_rate_monotonic_get_status
-@example
-rtems_status_code rtems_rate_monotonic_get_status(
-  rtems_id                            id,
-  rtems_rate_monotonic_period_status *status
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure Rate_Monotonic_Get_Status (
-   ID      : in     RTEMS.ID;
-   Status  :    out RTEMS.Rate_Monotonic_Period_Status;
-   Result  :    out RTEMS.Status_Codes
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-@code{@value{RPREFIX}SUCCESSFUL} - period initiated successfully@*
-@code{@value{RPREFIX}INVALID_ID} - invalid rate monotonic period id@*
-@code{@value{RPREFIX}INVALID_ADDRESS} - invalid address of status@*
-
-@subheading DESCRIPTION:
-
-This directive returns status information associated with 
-the rate monotonic period id in the following data @value{STRUCTURE}:
-
-@ifset is-C
-@example
-typedef struct @{
-  rtems_rate_monotonic_period_states  state;
-  unsigned32                          ticks_since_last_period;
-  unsigned32                          ticks_executed_since_last_period;
-@}  rtems_rate_monotonic_period_status;
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-type Rate_Monotonic_Period_Status is
-   begin
-      State                            : RTEMS.Rate_Monotonic_Period_States;
-      Ticks_Since_Last_Period          : RTEMS.Unsigned32;
-      Ticks_Executed_Since_Last_Period : RTEMS.Unsigned32;
-   end record;
-@end example
-@end ifset
-
-@c RATE_MONOTONIC_INACTIVE does not have RTEMS_ in front of it.
-
-If the period's state is @code{RATE_MONOTONIC_INACTIVE}, both
-ticks_since_last_period and ticks_executed_since_last_period 
-will be set to 0.  Otherwise, ticks_since_last_period will
-contain the number of clock ticks which have occurred since
-the last invocation of the
-@code{@value{DIRPREFIX}rate_monotonic_period} directive.
-Also in this case, the ticks_executed_since_last_period will indicate
-how much processor time the owning task has consumed since the invocation
-of the @code{@value{DIRPREFIX}rate_monotonic_period} directive.
-
-@subheading NOTES:
-
-This directive will not cause the running task to be preempted.
diff --git a/doc/user/schedule.t b/doc/user/schedule.t
deleted file mode 100644
index aa187afb13..0000000000
--- a/doc/user/schedule.t
+++ /dev/null
@@ -1,390 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@c
-@c   This figure is not included:
-@c      Figure 17-1  RTEMS Task State Transitions
-@c
-
-@chapter Scheduling Concepts
-
-@section Introduction
-
-The concept of scheduling in real-time systems
-dictates the ability to provide immediate response to specific
-external events, particularly the necessity of scheduling tasks
-to run within a specified time limit after the occurrence of an
-event.  For example, software embedded in life-support systems
-used to monitor hospital patients must take instant action if a
-change in the patient's status is detected.
-
-The component of RTEMS responsible for providing this
-capability is appropriately called the scheduler.  The
-scheduler's sole purpose is to allocate the all important
-resource of processor time to the various tasks competing for
-attention.  The RTEMS scheduler allocates the processor using a
-priority-based, preemptive algorithm augmented to provide
-round-robin characteristics within individual priority groups.
-The goal of this algorithm is to guarantee that the task which
-is executing on the processor at any point in time is the one
-with the highest priority among all tasks in the ready state.
-
-There are two common methods of accomplishing the
-mechanics of this algorithm.  Both ways involve a list or chain
-of tasks in the ready state.  One method is to randomly place
-tasks in the ready chain forcing the scheduler to scan the
-entire chain to determine which task receives the processor.
-The other method is to schedule the task by placing it in the
-proper place on the ready chain based on the designated
-scheduling criteria at the time it enters the ready state.
-Thus, when the processor is free, the first task on the ready
-chain is allocated the processor.  RTEMS schedules tasks using
-the second method to guarantee faster response times to external
-events.
-
-@section Scheduling Mechanisms
-
-RTEMS provides four mechanisms which allow the user
-to impact the task scheduling process:
-
-@itemize @bullet
-@item user-selectable task priority level
-@item task preemption control
-@item task timeslicing control
-@item manual round-robin selection
-@end itemize
-
-Each of these methods provides a powerful capability
-to customize sets of tasks to satisfy the unique and particular
-requirements encountered in custom real-time applications.
-Although each mechanism operates independently, there is a
-precedence relationship which governs the effects of scheduling
-modifications.  The evaluation order for scheduling
-characteristics is always priority, preemption mode, and
-timeslicing.  When reading the descriptions of timeslicing and
-manual round-robin it is important to keep in mind that
-preemption (if enabled) of a task by higher priority tasks will
-occur as required, overriding the other factors presented in the
-description.
-
-@subsection Task Priority and Scheduling
-
-The most significant of these mechanisms is the
-ability for the user to assign a priority level to each
-individual task when it is created and to alter a task's
-priority at run-time.  RTEMS provides 255 priority levels.
-Level 255 is the lowest priority and level 1 is the highest.
-When a task is added to the ready chain, it is placed behind all
-other tasks of the same priority.  This rule provides a
-round-robin within priority group scheduling characteristic.
-This means that in a group of equal priority tasks, tasks will
-execute in the order they become ready or FIFO order.  Even
-though there are ways to manipulate and adjust task priorities,
-the most important rule to remember is:
-
-@itemize @code{ }
-@item @b{The RTEMS scheduler will always select the highest
-priority task that is ready to run when allocating the processor
-to a task.}
-@end itemize
-
-@subsection Preemption
-
-Another way the user can alter the basic scheduling
-algorithm is by manipulating the preemption mode flag
-(@code{@value{RPREFIX}PREEMPT_MASK}) of individual tasks.  If preemption is disabled
-for a task (@code{@value{RPREFIX}NO_PREEMPT}), then the task will not relinquish
-control of the processor until it terminates, blocks, or
-re-enables preemption.  Even tasks which become ready to run and
-possess higher priority levels will not be allowed to execute.
-Note that the preemption setting has no effect on the manner in
-which a task is scheduled.  It only applies once a task has
-control of the processor.
-
-@subsection Timeslicing
-
-Timeslicing or round-robin scheduling is an
-additional method which can be used to alter the basic
-scheduling algorithm.  Like preemption, timeslicing is specified
-on a task by task basis using the timeslicing mode flag
-(@code{@value{RPREFIX}TIMESLICE_MASK}).  If timeslicing is enabled for a task
-(@code{@value{RPREFIX}TIMESLICE}), then RTEMS will limit the amount of time the task
-can execute before the processor is allocated to another task.
-Each tick of the real-time clock reduces the currently running
-task's timeslice.  When the execution time equals the timeslice,
-RTEMS will dispatch another task of the same priority to
-execute.  If there are no other tasks of the same priority ready
-to execute, then the current task is allocated an additional
-timeslice and continues to run.  Remember that a higher priority
-task will preempt the task (unless preemption is disabled) as
-soon as it is ready to run, even if the task has not used up its
-entire timeslice.
-
-@subsection Manual Round-Robin
-
-The final mechanism for altering the RTEMS scheduling
-algorithm is called manual round-robin.  Manual round-robin is
-invoked by using the @code{@value{DIRPREFIX}task_wake_after}
-directive with a time interval of @code{@value{RPREFIX}YIELD_PROCESSOR}.  
-This allows a task to give up the
-processor and be immediately returned to the ready chain at the
-end of its priority group.  If no other tasks of the same
-priority are ready to run, then the task does not lose control
-of the processor.
-
-@subsection Dispatching Tasks
-
-The dispatcher is the RTEMS component responsible for
-allocating the processor to a ready task.  In order to allocate
-the processor to one task, it must be deallocated or retrieved
-from the task currently using it.  This involves a concept
-called a context switch.  To perform a context switch, the
-dispatcher saves the context of the current task and restores
-the context of the task which has been allocated to the
-processor.  Saving and restoring a task's context is the
-storing/loading of all the essential information about a task to
-enable it to continue execution without any effects of the
-interruption.  For example, the contents of a task's register
-set must be the same when it is given the processor as they were
-when it was taken away.  All of the information that must be
-saved or restored for a context switch is located either in the
-TCB or on the task's stacks.
-
-Tasks that utilize a numeric coprocessor and are
-created with the @code{@value{RPREFIX}FLOATING_POINT} attribute
-require additional operations during a context switch.  These
-additional operations
-are necessary to save and restore the floating point context of
-@code{@value{RPREFIX}FLOATING_POINT} tasks.  To avoid unnecessary save and restore
-operations, the state of the numeric coprocessor is only saved
-when a @code{@value{RPREFIX}FLOATING_POINT} task is dispatched and that task was not
-the last task to utilize the coprocessor.
-
-@section Task State Transitions
-
-Tasks in an RTEMS system must always be in one of the
-five allowable task states.  These states are: executing, ready,
-blocked, dormant, and non-existent.
-
-@ifset use-ascii
-@example
-@group
-     +-------------------------------------------------------------+
-     |                         Non-existent                        |
-     |  +-------------------------------------------------------+  |
-     |  |                                                       |  |
-     |  |                                                       |  |
-     |  |      Creating        +---------+     Deleting         |  |
-     |  | -------------------> | Dormant | -------------------> |  |
-     |  |                      +---------+                      |  |
-     |  |                           |                           |  |
-     |  |                  Starting |                           |  |
-     |  |                           |                           |  |
-     |  |                           V          Deleting         |  |
-     |  |             +-------> +-------+ ------------------->  |  |
-     |  |  Yielding  /   +----- | Ready | ------+               |  |
-     |  |           /   /       +-------+ <--+   \              |  |
-     |  |          /   /                      \   \ Blocking    |  |
-     |  |         /   / Dispatching   Readying \   \            |  |
-     |  |        /   V                          \   V           |  |
-     |  |      +-----------+    Blocking     +---------+        |  |
-     |  |      | Executing | --------------> | Blocked |        |  |
-     |  |      +-----------+                 +---------+        |  |
-     |  |                                                       |  |
-     |  |                                                       |  |
-     |  +-------------------------------------------------------+  |
-     |                         Non-existent                        |
-     +-------------------------------------------------------------+
-@end group
-@end example
-@end ifset
-
-@ifset use-tex
-@c for now use the ascii version
-@example
-@group
-     +-------------------------------------------------------------+
-     |                         Non-existent                        |
-     |  +-------------------------------------------------------+  |
-     |  |                                                       |  |
-     |  |                                                       |  |
-     |  |      Creating        +---------+     Deleting         |  |
-     |  | -------------------> | Dormant | -------------------> |  |
-     |  |                      +---------+                      |  |
-     |  |                           |                           |  |
-     |  |                  Starting |                           |  |
-     |  |                           |                           |  |
-     |  |                           V          Deleting         |  |
-     |  |             +-------> +-------+ ------------------->  |  |
-     |  |  Yielding  /   +----- | Ready | ------+               |  |
-     |  |           /   /       +-------+ <--+   \              |  |
-     |  |          /   /                      \   \ Blocking    |  |
-     |  |         /   / Dispatching   Readying \   \            |  |
-     |  |        /   V                          \   V           |  |
-     |  |      +-----------+    Blocking     +---------+        |  |
-     |  |      | Executing | --------------> | Blocked |        |  |
-     |  |      +-----------+                 +---------+        |  |
-     |  |                                                       |  |
-     |  |                                                       |  |
-     |  +-------------------------------------------------------+  |
-     |                         Non-existent                        |
-     +-------------------------------------------------------------+
-@end group
-@end example
-@tex
-@end tex
-@end ifset
-
-@ifset use-html
-@html
-<IMG SRC="states.gif" WIDTH=550 HEIGHT=400 ALT="RTEMS Task States">
-@end html
-@end ifset
-
-A task occupies the non-existent state before a
-@code{@value{DIRPREFIX}task_create} has been
-issued on its behalf.  A task enters the
-non-existent state from any other state in the system when it is
-deleted with the @code{@value{DIRPREFIX}task_delete}
-directive.  While a task occupies
-this state it does not have a TCB or a task ID assigned to it;
-therefore, no other tasks in the system may reference this task.
-
-When a task is created via the @code{@value{DIRPREFIX}task_create} directive
-it enters the dormant state.  This state is not entered through
-any other means.  Although the task exists in the system, it
-cannot actively compete for system resources.  It will remain in
-the dormant state until it is started via the @code{@value{DIRPREFIX}task_start}
-directive, at which time it enters the ready state.  The task is
-now permitted to be scheduled for the processor and to compete
-for other system resources.
-
-A task occupies the blocked state whenever it is
-unable to be scheduled to run.  A running task may block itself
-or be blocked by other tasks in the system.  The running task
-blocks itself through voluntary operations that cause the task
-to wait.  The only way a task can block a task other than itself
-is with the @code{@value{DIRPREFIX}task_suspend} directive.  
-A task enters the blocked state due to any of the following conditions:
-
-@itemize @bullet
-@item A task issues a @code{@value{DIRPREFIX}task_suspend} directive
-which blocks either itself or another task in the system.
-
-@item The running task issues a @code{@value{DIRPREFIX}message_queue_receive}
-directive with the wait option and the message queue is empty.
-
-@item The running task issues an @code{@value{DIRPREFIX}event_receive}
-directive with the wait option and the currently pending events do not
-satisfy the request.
-
-@item The running task issues a @code{@value{DIRPREFIX}semaphore_obtain}
-directive with the wait option and the requested semaphore is unavailable.
-
-@item The running task issues a @code{@value{DIRPREFIX}task_wake_after}
-directive which blocks the task for the given time interval.  If the time
-interval specified is zero, the task yields the processor and
-remains in the ready state.
-
-@item The running task issues a @code{@value{DIRPREFIX}task_wake_when}
-directive which blocks the task until the requested date and time arrives.
-
-@item The running task issues a @code{@value{DIRPREFIX}region_get_segment}
-directive with the wait option and there is not an available segment large
-enough to satisfy the task's request.
-
-@item The running task issues a @code{@value{DIRPREFIX}rate_monotonic_period}
-directive and must wait for the specified rate monotonic period
-to conclude.
-@end itemize
-
-A blocked task may also be suspended.  Therefore,
-both the suspension and the blocking condition must be removed
-before the task becomes ready to run again.
-
-A task occupies the ready state when it is able to be
-scheduled to run, but currently does not have control of the
-processor.  Tasks of the same or higher priority will yield the
-processor by either becoming blocked, completing their
-timeslice, or being deleted.  All tasks with the same priority
-will execute in FIFO order.  A task enters the ready state due
-to any of the following conditions:
-
-@itemize @bullet
-
-@item A running task issues a @code{@value{DIRPREFIX}task_resume}
-directive for a task that is suspended and the task is not blocked
-waiting on any resource.
-
-@item A running task issues a @code{@value{DIRPREFIX}message_queue_send},
-@code{@value{DIRPREFIX}message_queue_broadcast}, or a
-@code{@value{DIRPREFIX}message_queue_urgent} directive
-which posts a message to the queue on which the blocked task is
-waiting.
-
-@item A running task issues an @code{@value{DIRPREFIX}event_send}
-directive which sends an event condition to a task which is blocked
-waiting on that event condition.
-
-@item A running task issues a @code{@value{DIRPREFIX}semaphore_release}
-directive which releases the semaphore on which the blocked task is
-waiting.
-
-@item A timeout interval expires for a task which was blocked
-by a call to the @code{@value{DIRPREFIX}task_wake_after} directive.
-
-@item A timeout period expires for a task which blocked by a
-call to the @code{@value{DIRPREFIX}task_wake_when} directive.
-
-@item A running task issues a @code{@value{DIRPREFIX}region_return_segment}
-directive which releases a segment to the region on which the blocked task
-is waiting and a resulting segment is large enough to satisfy
-the task's request.
-
-@item A rate monotonic period expires for a task which blocked
-by a call to the @code{@value{DIRPREFIX}rate_monotonic_period} directive.
-
-@item A timeout interval expires for a task which was blocked
-waiting on a message, event, semaphore, or segment with a
-timeout specified.
-
-@item A running task issues a directive which deletes a
-message queue, a semaphore, or a region on which the blocked
-task is waiting.
-
-@item A running task issues a @code{@value{DIRPREFIX}task_restart}
-directive for the blocked task.
-
-@item The running task, with its preemption mode enabled, may
-be made ready by issuing any of the directives that may unblock
-a task with a higher priority.  This directive may be issued
-from the running task itself or from an ISR.
-
-A ready task occupies the executing state when it has
-control of the CPU.  A task enters the executing state due to
-any of the following conditions:
-
-@item The task is the highest priority ready task in the
-system.
-
-@item The running task blocks and the task is next in the
-scheduling queue.  The task may be of equal priority as in
-round-robin scheduling or the task may possess the highest
-priority of the remaining ready tasks.
-
-@item The running task may reenable its preemption mode and a
-task exists in the ready queue that has a higher priority than
-the running task.
-
-@item The running task lowers its own priority and another
-task is of higher priority as a result.
-
-@item The running task raises the priority of a task above its
-own and the running task is in preemption mode.
-
-@end itemize
diff --git a/doc/user/sem.t b/doc/user/sem.t
deleted file mode 100644
index 679fc621a6..0000000000
--- a/doc/user/sem.t
+++ /dev/null
@@ -1,729 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Semaphore Manager
-
-@section Introduction
-
-The semaphore manager utilizes standard Dijkstra
-counting semaphores to provide synchronization and mutual
-exclusion capabilities.  The directives provided by the
-semaphore manager are:
-
-@itemize @bullet
-@item @code{@value{DIRPREFIX}semaphore_create} -  Create a semaphore
-@item @code{@value{DIRPREFIX}semaphore_ident} - Get ID of a semaphore
-@item @code{@value{DIRPREFIX}semaphore_delete} - Delete a semaphore
-@item @code{@value{DIRPREFIX}semaphore_obtain} - Acquire a semaphore
-@item @code{@value{DIRPREFIX}semaphore_release} - Release a semaphore
-@end itemize
-
-@section Background
-
-A semaphore can be viewed as a protected variable
-whose value can be modified only with the
-@code{@value{DIRPREFIX}semaphore_create},
-@code{@value{DIRPREFIX}semaphore_obtain}, and
-@code{@value{DIRPREFIX}semaphore_release} directives.  RTEMS
-supports both binary and counting semaphores. A binary semaphore
-is restricted to values of zero or one, while a counting
-semaphore can assume any non-negative integer value.
-
-A binary semaphore can be used to control access to a
-single resource.  In particular, it can be used to enforce
-mutual exclusion for a critical section in user code.  In this
-instance, the semaphore would be created with an initial count
-of one to indicate that no task is executing the critical
-section of code.  Upon entry to the critical section, a task
-must issue the @code{@value{DIRPREFIX}semaphore_obtain}
-directive to prevent other tasks from entering the critical section.  
-Upon exit from the critical section, the task must issue the
-@code{@value{DIRPREFIX}semaphore_release} directive to
-allow another task to execute the critical section.
-
-A counting semaphore can be used to control access to
-a pool of two or more resources.  For example, access to three
-printers could be administered by a semaphore created with an
-initial count of three.  When a task requires access to one of
-the printers, it issues the @code{@value{DIRPREFIX}semaphore_obtain}
-directive to obtain access to a printer.  If a printer is not currently
-available, the task can wait for a printer to become available or return
-immediately.  When the task has completed printing, it should
-issue the @code{@value{DIRPREFIX}semaphore_release}
-directive to allow other tasks access to the printer.
-
-Task synchronization may be achieved by creating a
-semaphore with an initial count of zero.  One task waits for the
-arrival of another task by issuing a @code{@value{DIRPREFIX}semaphore_obtain}
-directive when it reaches a synchronization point.  The other task
-performs a corresponding @code{@value{DIRPREFIX}semaphore_release}
-operation when it reaches its synchronization point, thus unblocking
-the pending task.
-
-@subsection Nested Resource Access
-
-Deadlock occurs when a task owning a binary semaphore
-attempts to acquire that same semaphore and blocks as result.
-Since the semaphore is allocated to a task, it cannot be
-deleted.  Therefore, the task that currently holds the semaphore
-and is also blocked waiting for that semaphore will never
-execute again.
-
-RTEMS addresses this problem by allowing the task
-holding the binary semaphore to obtain the same binary semaphore
-multiple times in a nested manner.  Each
-@code{@value{DIRPREFIX}semaphore_obtain} must be accompanied with a
-@code{@value{DIRPREFIX}semaphore_release}.  The semaphore will
-only be made available for acquisition by other tasks when the
-outermost @code{@value{DIRPREFIX}semaphore_obtain} is matched with
-a @code{@value{DIRPREFIX}semaphore_release}.
-
-
-@subsection Priority Inversion
-
-Priority inversion is a form of indefinite
-postponement which is common in multitasking, preemptive
-executives with shared resources.  Priority inversion occurs
-when a high priority tasks requests access to shared resource
-which is currently allocated to low priority task.  The high
-priority task must block until the low priority task releases
-the resource.  This problem is exacerbated when the low priority
-task is prevented from executing by one or more medium priority
-tasks.  Because the low priority task is not executing, it
-cannot complete its interaction with the resource and release
-that resource.  The high priority task is effectively prevented
-from executing by lower priority tasks.
-
-@subsection Priority Inheritance
-
-Priority inheritance is an algorithm that calls for
-the lower priority task holding a resource to have its priority
-increased to that of the highest priority task blocked waiting
-for that resource.  Each time a task blocks attempting to obtain
-the resource, the task holding the resource may have its
-priority increased.
-
-RTEMS supports priority inheritance for local, binary
-semaphores that use the priority task wait queue blocking
-discipline.   When a task of higher priority than the task
-holding the semaphore blocks, the priority of the task holding
-the semaphore is increased to that of the blocking task.  When
-the task holding the task completely releases the binary
-semaphore (i.e. not for a nested release), the holder's priority
-is restored to the value it had before any higher priority was
-inherited.
-
-The RTEMS implementation of the priority inheritance
-algorithm takes into account the scenario in which a task holds
-more than one binary semaphore.  The holding task will execute
-at the priority of the higher of the highest ceiling priority or
-at the priority of the highest priority task blocked waiting for
-any of the semaphores the task holds.  Only when the task
-releases ALL of the binary semaphores it holds will its priority
-be restored to the normal value.
-
-@subsection Priority Ceiling
-
-Priority ceiling is an algorithm that calls for the
-lower priority task holding a resource to have its priority
-increased to that of the highest priority task which will EVER
-block waiting for that resource.  This algorithm addresses the
-problem of priority inversion although it avoids the possibility
-of changing the priority of the task holding the resource
-multiple times.  The priority ceiling algorithm will only change
-the priority of the task holding the resource a maximum of one
-time.  The ceiling priority is set at creation time and must be
-the priority of the highest priority task which will ever
-attempt to acquire that semaphore.
-
-RTEMS supports priority ceiling for local, binary
-semaphores that use the priority task wait queue blocking
-discipline.   When a task of lower priority than the ceiling
-priority successfully obtains the semaphore, its priority is
-raised to the ceiling priority.  When the task holding the task
-completely releases the binary semaphore (i.e. not for a nested
-release), the holder's priority is restored to the value it had
-before any higher priority was put into effect.
-
-The need to identify the highest priority task which
-will attempt to obtain a particular semaphore can be a difficult
-task in a large, complicated system.  Although the priority
-ceiling algorithm is more efficient than the priority
-inheritance algorithm with respect to the maximum number of task
-priority changes which may occur while a task holds a particular
-semaphore, the priority inheritance algorithm is more forgiving
-in that it does not require this apriori information.
-
-The RTEMS implementation of the priority ceiling
-algorithm takes into account the scenario in which a task holds
-more than one binary semaphore.  The holding task will execute
-at the priority of the higher of the highest ceiling priority or
-at the priority of the highest priority task blocked waiting for
-any of the semaphores the task holds.  Only when the task
-releases ALL of the binary semaphores it holds will its priority
-be restored to the normal value.
-
-@subsection Building a Semaphore's Attribute Set
-
-In general, an attribute set is built by a bitwise OR
-of the desired attribute components.  The following table lists
-the set of valid semaphore attributes:
-
-@itemize @bullet
-@item @code{@value{RPREFIX}FIFO} - tasks wait by FIFO (default)
-
-@item @code{@value{RPREFIX}PRIORITY} - tasks wait by priority
-
-@item @code{@value{RPREFIX}BINARY_SEMAPHORE} - restrict values to
-0 and 1 (default)
-
-@item @code{@value{RPREFIX}COUNTING_SEMAPHORE} - no restriction on values
-
-@item @code{@value{RPREFIX}NO_INHERIT_PRIORITY} - do not use priority
-inheritance (default)
-
-@item @code{@value{RPREFIX}INHERIT_PRIORITY} - use priority inheritance
-
-@item @code{@value{RPREFIX}PRIORITY_CEILING} - use priority ceiling
-
-@item @code{@value{RPREFIX}NO_PRIORITY_CEILING} - do not use priority
-ceiling (default)
-
-@item @code{@value{RPREFIX}LOCAL} - local task (default)
-
-@item @code{@value{RPREFIX}GLOBAL} - global task
-@end itemize
-
-Attribute values are specifically designed to be
-mutually exclusive, therefore bitwise OR and addition operations
-are equivalent as long as each attribute appears exactly once in
-the component list.  An attribute listed as a default is not
-required to appear in the attribute list, although it is a good
-programming practice to specify default attributes.  If all
-defaults are desired, the attribute
-@code{@value{RPREFIX}DEFAULT_ATTRIBUTES} should be
-specified on this call.
-
-This example demonstrates the attribute_set parameter
-needed to create a local semaphore with the task priority
-waiting queue discipline.  The attribute_set parameter passed to
-the @code{@value{DIRPREFIX}semaphore_create} directive could be either
-@code{@value{RPREFIX}PRIORITY} or
-@code{@value{RPREFIX}LOCAL @value{OR} @value{RPREFIX}PRIORITY}.  
-The attribute_set parameter can be set to @code{@value{RPREFIX}PRIORITY}
-because @code{@value{RPREFIX}LOCAL} is the default for all created tasks.  If a
-similar semaphore were to be known globally, then the
-attribute_set parameter would be
-@code{@value{RPREFIX}GLOBAL @value{OR} @value{RPREFIX}PRIORITY}.
-
-@subsection Building a SEMAPHORE_OBTAIN Option Set
-
-In general, an option is built by a bitwise OR of the
-desired option components.  The set of valid options for the
-@code{@value{DIRPREFIX}semaphore_obtain} directive are listed
-in the following table:
-
-@itemize @bullet
-@item @code{@value{RPREFIX}WAIT} - task will wait for semaphore (default)
-@item @code{@value{RPREFIX}NO_WAIT} - task should not wait
-@end itemize
-
-Option values are specifically designed to be
-mutually exclusive, therefore bitwise OR and addition operations
-are equivalent as long as each attribute appears exactly once in
-the component list.  An option listed as a default is not
-required to appear in the list, although it is a good
-programming practice to specify default options.  If all
-defaults are desired, the option @code{@value{RPREFIX}DEFAULT_OPTIONS} should be
-specified on this call.
-
-This example demonstrates the option parameter needed
-to poll for a semaphore.  The option parameter passed to the
-@code{@value{DIRPREFIX}semaphore_obtain}
-directive should be @code{@value{RPREFIX}NO_WAIT}.
-
-@section Operations
-
-@subsection Creating a Semaphore
-
-The @code{@value{DIRPREFIX}semaphore_create} directive creates a binary or
-counting semaphore with a user-specified name as well as an
-initial count.  If a binary semaphore is created with a count of
-zero (0) to indicate that it has been allocated, then the task
-creating the semaphore is considered the current holder of the
-semaphore.  At create time the method for ordering waiting tasks
-in the semaphore's task wait queue (by FIFO or task priority) is
-specified.  Additionally, the priority inheritance or priority
-ceiling algorithm may be selected for local, binary semaphores
-that use the priority task wait queue blocking discipline.  If
-the priority ceiling algorithm is selected, then the highest
-priority of any task which will attempt to obtain this semaphore
-must be specified.  RTEMS allocates a Semaphore Control Block
-(SMCB) from the SMCB free list.  This data structure is used by
-RTEMS to manage the newly created semaphore.  Also, a unique
-semaphore ID is generated and returned to the calling task.
-
-@subsection Obtaining Semaphore IDs
-
-When a semaphore is created, RTEMS generates a unique
-semaphore ID and assigns it to the created semaphore until it is
-deleted.  The semaphore ID may be obtained by either of two
-methods.  First, as the result of an invocation of the
-@code{@value{DIRPREFIX}semaphore_create} directive, the
-semaphore ID is stored in a user provided location.  Second,
-the semaphore ID may be obtained later using the
-@code{@value{DIRPREFIX}semaphore_ident} directive.  The semaphore ID is
-used by other semaphore manager directives to access this
-semaphore.
-
-@subsection Acquiring a Semaphore
-
-The @code{@value{DIRPREFIX}semaphore_obtain} directive is used to acquire the
-specified semaphore.  A simplified version of the
-@code{@value{DIRPREFIX}semaphore_obtain} directive can be described as follows:
-
-@example
-if semaphore's count is greater than zero
-   then decrement semaphore's count
-   else wait for release of semaphore
-
-return SUCCESSFUL
-@end example
-
-When the semaphore cannot be immediately acquired,
-one of the following situations applies:
-
-@itemize @bullet
-@item By default, the calling task will wait forever to
-acquire the semaphore.
-
-@item Specifying @code{@value{RPREFIX}NO_WAIT} forces an immediate return with an
-error status code.
-
-@item Specifying a timeout limits the interval the task will
-wait before returning with an error status code.
-@end itemize
-
-If the task waits to acquire the semaphore, then it
-is placed in the semaphore's task wait queue in either FIFO or
-task priority order.  If the task blocked waiting for a binary
-semaphore using priority inheritance and the task's priority is
-greater than that of the task currently holding the semaphore,
-then the holding task will inherit the priority of the blocking
-task.  All tasks waiting on a semaphore are returned an error
-code when the semaphore is deleted.
-
-When a task successfully obtains a semaphore using
-priority ceiling and the priority ceiling for this semaphore is
-greater than that of the holder, then the holder's priority will
-be elevated.
-
-@subsection Releasing a Semaphore
-
-The @code{@value{DIRPREFIX}semaphore_release} directive is used to release
-the specified semaphore.  A simplified version of the
-@code{@value{DIRPREFIX}semaphore_release} directive can be described as follows:
-
-@example
-if no tasks are waiting on this semaphore
-   then increment semaphore's count
-   else assign semaphore to a waiting task
-
-return SUCCESSFUL
-@end example
-
-If this is the outermost release of a binary
-semaphore that uses priority inheritance or priority ceiling and
-the task does not currently hold any other binary semaphores,
-then the task performing the @code{@value{DIRPREFIX}semaphore_release}
-will have its priority restored to its normal value.
-
-@subsection Deleting a Semaphore
-
-The @code{@value{DIRPREFIX}semaphore_delete} directive removes a semaphore
-from the system and frees its control block.  A semaphore can be
-deleted by any local task that knows the semaphore's ID.  As a
-result of this directive, all tasks blocked waiting to acquire
-the semaphore will be readied and returned a status code which
-indicates that the semaphore was deleted.  Any subsequent
-references to the semaphore's name and ID are invalid.
-
-@section Directives
-
-This section details the semaphore manager's
-directives.  A subsection is dedicated to each of this manager's
-directives and describes the calling sequence, related
-constants, usage, and status codes.
-
-@page
-@subsection SEMAPHORE_CREATE - Create a semaphore
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_semaphore_create
-@example
-rtems_status_code rtems_semaphore_create(
-  rtems_name           name,
-  rtems_unsigned32     count,
-  rtems_attribute      attribute_set,
-  rtems_task_priority  priority_ceiling,
-  rtems_id            *id
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure Semaphore_Create (
-   Name          : in     RTEMS.Name;
-   Count         : in     RTEMS.Unsigned32;
-   Attribute_Set : in     RTEMS.Attribute;
-   ID            :    out RTEMS.ID;
-   Result        :    out RTEMS.Status_Codes
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-@code{@value{RPREFIX}SUCCESSFUL} - semaphore created successfully@*
-@code{@value{RPREFIX}INVALID_NAME} - invalid task name@*
-@code{@value{RPREFIX}TOO_MANY} - too many semaphores created@*
-@code{@value{RPREFIX}NOT_DEFINED} - invalid attribute set@*
-@code{@value{RPREFIX}INVALID_NUMBER} - invalid starting count for binary semaphore@*
-@code{@value{RPREFIX}MP_NOT_CONFIGURED} - multiprocessing not configured@*
-@code{@value{RPREFIX}TOO_MANY} - too many global objects
-
-@subheading DESCRIPTION:
-
-This directive creates a semaphore which resides on
-the local node. The created semaphore has the user-defined name
-specified in name and the initial count specified in count.  For
-control and maintenance of the semaphore, RTEMS allocates and
-initializes a SMCB.  The RTEMS-assigned semaphore id is returned
-in id.  This semaphore id is used with other semaphore related
-directives to access the semaphore.
-
-Specifying PRIORITY in attribute_set causes tasks
-waiting for a semaphore to be serviced according to task
-priority.  When FIFO is selected, tasks are serviced in First
-In-First Out order.
-
-@subheading NOTES:
-
-This directive will not cause the calling task to be
-preempted.
-
-The priority inheritance and priority ceiling
-algorithms are only supported for local, binary semaphores that
-use the priority task wait queue blocking discipline.
-
-The following semaphore attribute constants are
-defined by RTEMS:
-
-@itemize @bullet
-@item @code{@value{RPREFIX}FIFO} - tasks wait by FIFO (default)
-
-@item @code{@value{RPREFIX}PRIORITY} - tasks wait by priority
-
-@item @code{@value{RPREFIX}BINARY_SEMAPHORE} - restrict values to
-0 and 1 (default)
-
-@item @code{@value{RPREFIX}COUNTING_SEMAPHORE} - no restriction on values
-
-@item @code{@value{RPREFIX}NO_INHERIT_PRIORITY} - do not use priority
-inheritance (default)
-
-@item @code{@value{RPREFIX}INHERIT_PRIORITY} - use priority inheritance
-
-@item @code{@value{RPREFIX}PRIORITY_CEILING} - use priority ceiling
-
-@item @code{@value{RPREFIX}NO_PRIORITY_CEILING} - do not use priority
-ceiling (default)
-
-@item @code{@value{RPREFIX}LOCAL} - local task (default)
-
-@item @code{@value{RPREFIX}GLOBAL} - global task
-@end itemize
-
-Semaphores should not be made global unless remote
-tasks must interact with the created semaphore.  This is to
-avoid the system overhead incurred by the creation of a global
-semaphore.  When a global semaphore is created, the semaphore's
-name and id must be transmitted to every node in the system for
-insertion in the local copy of the global object table.
-
-The total number of global objects, including
-semaphores, is limited by the maximum_global_objects field in
-the Configuration Table.
-
-@page
-@subsection SEMAPHORE_IDENT - Get ID of a semaphore
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_semaphore_ident
-@example
-rtems_status_code rtems_semaphore_ident(
-  rtems_name        name,
-  rtems_unsigned32  node,
-  rtems_id         *id
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure Semaphore_Ident (
-   Name   : in     RTEMS.Name;
-   Node   : in     RTEMS.Unsigned32;
-   ID     :    out RTEMS.ID;
-   Result :    out RTEMS.Status_Codes
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-@code{@value{RPREFIX}SUCCESSFUL} - semaphore identified successfully@*
-@code{@value{RPREFIX}INVALID_NAME} - semaphore name not found@*
-@code{@value{RPREFIX}INVALID_NODE} - invalid node id
-
-@subheading DESCRIPTION:
-
-This directive obtains the semaphore id associated
-with the semaphore name.  If the semaphore name is not unique,
-then the semaphore id will match one of the semaphores with that
-name.  However, this semaphore id is not guaranteed to
-correspond to the desired semaphore.  The semaphore id is used
-by other semaphore related directives to access the semaphore.
-
-@subheading NOTES:
-
-This directive will not cause the running task to be
-preempted.
-
-If node is @code{@value{RPREFIX}SEARCH_ALL_NODES}, all nodes are searched
-with the local node being searched first.  All other nodes are
-searched with the lowest numbered node searched first.
-
-If node is a valid node number which does not
-represent the local node, then only the semaphores exported by
-the designated node are searched.
-
-This directive does not generate activity on remote
-nodes.  It accesses only the local copy of the global object
-table.
-
-@page
-@subsection SEMAPHORE_DELETE - Delete a semaphore
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_semaphore_delete
-@example
-rtems_status_code rtems_semaphore_delete(
-  rtems_id id
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure Semaphore_Delete (
-   ID     : in     RTEMS.ID;
-   Result :    out RTEMS.Status_Codes
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-@code{@value{RPREFIX}SUCCESSFUL} -  semaphore deleted successfully@*
-@code{@value{RPREFIX}INVALID_ID} - invalid semaphore id@*
-@code{@value{RPREFIX}ILLEGAL_ON_REMOTE_OBJECT} - cannot delete remote semaphore@*
-@code{@value{RPREFIX}RESOURCE_IN_USE} - binary semaphore is in use
-
-@subheading DESCRIPTION:
-
-This directive deletes the semaphore specified by id.
-All tasks blocked waiting to acquire the semaphore will be
-readied and returned a status code which indicates that the
-semaphore was deleted.  The SMCB for this semaphore is reclaimed
-by RTEMS.
-
-@subheading NOTES:
-
-The calling task will be preempted if it is enabled
-by the task's execution mode and a higher priority local task is
-waiting on the deleted semaphore.  The calling task will NOT be
-preempted if all of the tasks that are waiting on the semaphore
-are remote tasks.
-
-The calling task does not have to be the task that
-created the semaphore.  Any local task that knows the semaphore
-id can delete the semaphore.
-
-When a global semaphore is deleted, the semaphore id
-must be transmitted to every node in the system for deletion
-from the local copy of the global object table.
-
-The semaphore must reside on the local node, even if
-the semaphore was created with the @code{@value{RPREFIX}GLOBAL} option.
-
-Proxies, used to represent remote tasks, are
-reclaimed when the semaphore is deleted.
-
-@page
-@subsection SEMAPHORE_OBTAIN - Acquire a semaphore
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_semaphore_obtain
-@example
-rtems_status_code rtems_semaphore_obtain(
-  rtems_id         id,
-  rtems_unsigned32 option_set,
-  rtems_interval   timeout
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure Semaphore_Obtain (
-   ID         : in     RTEMS.ID;
-   Option_Set : in     RTEMS.Option;
-   Timeout    : in     RTEMS.Interval;
-   Result     :    out RTEMS.Status_Codes
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-@code{@value{RPREFIX}SUCCESSFUL} - semaphore obtained successfully@*
-@code{@value{RPREFIX}UNSATISFIED} - semaphore not available@*
-@code{@value{RPREFIX}TIMEOUT} - timed out waiting for semaphore@*
-@code{@value{RPREFIX}OBJECT_WAS_DELETED} - semaphore deleted while waiting@*
-@code{@value{RPREFIX}INVALID_ID} - invalid semaphore id
-
-@subheading DESCRIPTION:
-
-This directive acquires the semaphore specified by
-id.  The @code{@value{RPREFIX}WAIT} and @code{@value{RPREFIX}NO_WAIT} components of the options parameter
-indicate whether the calling task wants to wait for the
-semaphore to become available or return immediately if the
-semaphore is not currently available.  With either @code{@value{RPREFIX}WAIT} or
-@code{@value{RPREFIX}NO_WAIT}, if the current semaphore count is positive, then it is
-decremented by one and the semaphore is successfully acquired by
-returning immediately with a successful return code.
-
-If the calling task chooses to return immediately and
-the current semaphore count is zero or negative, then a status
-code is returned indicating that the semaphore is not available.
-If the calling task chooses to wait for a semaphore and the
-current semaphore count is zero or negative, then it is
-decremented by one and the calling task is placed on the
-semaphore's wait queue and blocked.  If the semaphore was
-created with the @code{@value{RPREFIX}PRIORITY} attribute, then the calling task is
-inserted into the queue according to its priority.  However, if
-the semaphore was created with the @code{@value{RPREFIX}FIFO} attribute, then the
-calling task is placed at the rear of the wait queue.  If the
-binary semaphore was created with the @code{@value{RPREFIX}INHERIT_PRIORITY}
-attribute, then the priority of the task currently holding the
-binary semaphore is guaranteed to be greater than or equal to
-that of the blocking task.  If the binary semaphore was created
-with the @code{@value{RPREFIX}PRIORITY_CEILING} attribute, a task successfully obtains
-the semaphore, and the priority of that task is greater than the
-ceiling priority for this semaphore, then the priority of the
-task obtaining the semaphore is elevated to that of the ceiling.
-
-The timeout parameter specifies the maximum interval
-the calling task is willing to be blocked waiting for the
-semaphore.  If it is set to @code{@value{RPREFIX}NO_TIMEOUT}, then the calling task
-will wait forever.  If the semaphore is available or the @code{@value{RPREFIX}NO_WAIT}
-option component is set, then timeout is ignored.
-
-@subheading NOTES:
-The following semaphore acquisition option constants
-are defined by RTEMS:
-
-@itemize @bullet
-@item @code{@value{RPREFIX}WAIT} - task will wait for semaphore (default)
-@item @code{@value{RPREFIX}NO_WAIT} - task should not wait
-@end itemize
-
-Attempting to obtain a global semaphore which does not reside on
-the local node will generate a request to the remote node to
-access the semaphore.  If the semaphore is not available and
-@code{@value{RPREFIX}NO_WAIT} was not specified, then the task must be blocked until
-the semaphore is released.  A proxy is allocated on the remote
-node to represent the task until the semaphore is released.
-
-A clock tick is required to support the timeout functionality of
-this directive.
-
-@page
-@subsection SEMAPHORE_RELEASE - Release a semaphore
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_semaphore_release
-@example
-rtems_status_code rtems_semaphore_release(
-  rtems_id id
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure Semaphore_Release (
-   ID     : in     RTEMS.ID;
-   Result :    out RTEMS.Status_Codes
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-@code{@value{RPREFIX}SUCCESSFUL} - semaphore released successfully@*
-@code{@value{RPREFIX}INVALID_ID} - invalid semaphore id@*
-@code{@value{RPREFIX}NOT_OWNER_OF_RESOURCE} - calling task does not own semaphore
-
-@subheading DESCRIPTION:
-
-This directive releases the semaphore specified by
-id.  The semaphore count is incremented by one.  If the count is
-zero or negative, then the first task on this semaphore's wait
-queue is removed and unblocked.  The unblocked task may preempt
-the running task if the running task's preemption mode is
-enabled and the unblocked task has a higher priority than the
-running task.
-
-@subheading NOTES:
-
-The calling task may be preempted if it causes a
-higher priority task to be made ready for execution.
-
-Releasing a global semaphore which does not reside on
-the local node will generate a request telling the remote node
-to release the semaphore.
-
-If the task to be unblocked resides on a different
-node from the semaphore, then the semaphore allocation is
-forwarded to the appropriate node, the waiting task is
-unblocked, and the proxy used to represent the task is reclaimed.
-
-The outermost release of a local, binary, priority
-inheritance or priority ceiling semaphore may result in the
-calling task having its priority lowered.  This will occur if
-the calling task holds no other binary semaphores and it has
-inherited a higher priority.
-
diff --git a/doc/user/signal.t b/doc/user/signal.t
deleted file mode 100644
index c1afa9cfc6..0000000000
--- a/doc/user/signal.t
+++ /dev/null
@@ -1,360 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Signal Manager
-
-@section Introduction
-
-The signal manager provides the capabilities required
-for asynchronous communication.  The directives provided by the
-signal manager are:
-
-@itemize @bullet
-@item @code{@value{DIRPREFIX}signal_catch} - Establish an ASR
-@item @code{@value{DIRPREFIX}signal_send} - Send signal set to a task
-@end itemize
-
-@section Background
-
-@subsection Signal Manager Definitions
-
-The signal manager allows a task to optionally define
-an asynchronous signal routine (ASR).  An ASR is to a task what
-an ISR is to an application's set of tasks.  When the processor
-is interrupted, the execution of an application is also
-interrupted and an ISR is given control.  Similarly, when a
-signal is sent to a task, that task's execution path will be
-"interrupted" by the ASR.  Sending a signal to a task has no
-effect on the receiving task's current execution state.
-
-A signal flag is used by a task (or ISR) to inform
-another task of the occurrence of a significant situation.
-Thirty-two signal flags are associated with each task.  A
-collection of one or more signals is referred to as a signal
-set.  A signal set is posted when it is directed (or sent) to a
-task. A pending signal is a signal that has been sent to a task
-with a valid ASR, but has not been processed by that task's ASR.
-
-
-@subsection A Comparison of ASRs and ISRs
-
-The format of an ASR is similar to that of an ISR
-with the following exceptions:
-
-@itemize @bullet
-@item ISRs are scheduled by the processor hardware.  ASRs are
-scheduled by RTEMS.
-
-@item ISRs do not execute in the context of a task and may
-invoke only a subset of directives.  ASRs execute in the context
-of a task and may execute any directive.
-
-@item When an ISR is invoked, it is passed the vector number
-as its argument.  When an ASR is invoked, it is passed the
-signal set as its argument.
-
-@item An ASR has a task mode which can be different from that
-of the task.  An ISR does not execute as a task and, as a
-result, does not have a task mode.
-@end itemize
-
-@subsection Building a Signal Set
-
-A signal set is built by a bitwise OR of the desired
-signals.  The set of valid signals is @code{@value{RPREFIX}SIGNAL_0} through
-@code{@value{RPREFIX}SIGNAL_31}.  If a signal is not explicitly specified in the
-signal set, then it is not present.  Signal values are
-specifically designed to be mutually exclusive, therefore
-bitwise OR and addition operations are equivalent as long as
-each signal appears exactly once in the component list.
-
-This example demonstrates the signal parameter used
-when sending the signal set consisting of
-@code{@value{RPREFIX}SIGNAL_6},
-@code{@value{RPREFIX}SIGNAL_15}, and
-@code{@value{RPREFIX}SIGNAL_31}.  The signal parameter provided
-to the @code{@value{DIRPREFIX}signal_send} directive should be
-@code{@value{RPREFIX}SIGNAL_6 @value{OR} 
-@value{RPREFIX}SIGNAL_15 @value{OR} @value{RPREFIX}SIGNAL_31}.
-
-@subsection Building an ASR's Mode
-
-In general, an ASR's mode is built by a bitwise OR of
-the desired mode components.  The set of valid mode components
-is the same as those allowed with the task_create and task_mode
-directives.  A complete list of mode options is provided in the
-following table:
-
-@itemize @bullet
-@item @code{@value{RPREFIX}PREEMPT} is masked by
-@code{@value{RPREFIX}PREEMPT_MASK} and enables preemption
-
-@item @code{@value{RPREFIX}NO_PREEMPT} is masked by
-@code{@value{RPREFIX}PREEMPT_MASK} and disables preemption
-
-@item @code{@value{RPREFIX}NO_TIMESLICE} is masked by
-@code{@value{RPREFIX}TIMESLICE_MASK} and disables timeslicing
-
-@item @code{@value{RPREFIX}TIMESLICE} is masked by
-@code{@value{RPREFIX}TIMESLICE_MASK} and enables timeslicing
-
-@item @code{@value{RPREFIX}ASR} is masked by
-@code{@value{RPREFIX}ASR_MASK} and enables ASR processing
-
-@item @code{@value{RPREFIX}NO_ASR} is masked by
-@code{@value{RPREFIX}ASR_MASK} and disables ASR processing
-
-@item @code{@value{RPREFIX}INTERRUPT_LEVEL(0)} is masked by
-@code{@value{RPREFIX}INTERRUPT_MASK} and enables all interrupts
-
-@item @code{@value{RPREFIX}INTERRUPT_LEVEL(n)} is masked by
-@code{@value{RPREFIX}INTERRUPT_MASK} and sets interrupts level n
-@end itemize
-
-Mode values are specifically designed to be mutually
-exclusive, therefore bitwise OR and addition operations are
-equivalent as long as each mode appears exactly once in the
-component list.  A mode component listed as a default is not
-required to appear in the mode list, although it is a good
-programming practice to specify default components.  If all
-defaults are desired, the mode DEFAULT_MODES should be specified
-on this call.
-
-This example demonstrates the mode parameter used
-with the @code{@value{DIRPREFIX}signal_catch}
-to establish an ASR which executes at
-interrupt level three and is non-preemptible.  The mode should
-be set to
-@code{@value{RPREFIX}INTERRUPT_LEVEL(3) @value{OR} @value{RPREFIX}NO_PREEMPT}
-to indicate the
-desired processor mode and interrupt level.
-
-@section Operations
-
-@subsection Establishing an ASR
-
-The @code{@value{DIRPREFIX}signal_catch} directive establishes an ASR for the
-calling task.  The address of the ASR and its execution mode are
-specified to this directive.  The ASR's mode is distinct from
-the task's mode.  For example, the task may allow preemption,
-while that task's ASR may have preemption disabled.  Until a
-task calls @code{@value{DIRPREFIX}signal_catch} the first time,
-its ASR is invalid, and no signal sets can be sent to the task.
-
-A task may invalidate its ASR and discard all pending
-signals by calling @code{@value{DIRPREFIX}signal_catch}
-with a value of NULL for the ASR's address.  When a task's
-ASR is invalid, new signal sets sent to this task are discarded.
-
-A task may disable ASR processing (@code{@value{RPREFIX}NO_ASR}) via the
-task_mode directive.  When a task's ASR is disabled, the signals
-sent to it are left pending to be processed later when the ASR
-is enabled.
-
-Any directive that can be called from a task can also
-be called from an ASR.  A task is only allowed one active ASR.
-Thus, each call to @code{@value{DIRPREFIX}signal_catch}
-replaces the previous one.
-
-Normally, signal processing is disabled for the ASR's
-execution mode, but if signal processing is enabled for the ASR,
-the ASR must be reentrant.
-
-@subsection Sending a Signal Set
-
-The @code{@value{DIRPREFIX}signal_send} directive allows both
-tasks and ISRs to send signals to a target task.  The target task and
-a set of signals are specified to the
-@code{@value{DIRPREFIX}signal_send} directive.  The sending
-of a signal to a task has no effect on the execution state of
-that task.  If the task is not the currently running task, then
-the signals are left pending and processed by the task's ASR the
-next time the task is dispatched to run.  The ASR is executed
-immediately before the task is dispatched.  If the currently
-running task sends a signal to itself or is sent a signal from
-an ISR, its ASR is immediately dispatched to run provided signal
-processing is enabled.
-
-If an ASR with signals enabled is preempted by
-another task or an ISR and a new signal set is sent, then a new
-copy of the ASR will be invoked, nesting the preempted ASR.
-Upon completion of processing the new signal set, control will
-return to the preempted ASR.  In this situation, the ASR must be
-reentrant.
-
-Like events, identical signals sent to a task are not
-queued.  In other words, sending the same signal multiple times
-to a task (without any intermediate signal processing occurring
-for the task), has the same result as sending that signal to
-that task once.
-
-@subsection Processing an ASR
-
-Asynchronous signals were designed to provide the
-capability to generate software interrupts.  The processing of
-software interrupts parallels that of hardware interrupts.  As a
-result, the differences between the formats of ASRs and ISRs is
-limited to the meaning of the single argument passed to an ASR.
-The ASR should have the following calling sequence and adhere to
-@value{LANGUAGE} calling conventions:
-
-@ifset is-C
-@example
-rtems_asr user_routine(
-  rtems_signal_set signals
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure User_Routine (
-  Signals : in     RTEMS.Signal_Set
-);
-@end example
-@end ifset
-
-When the ASR returns to RTEMS the mode and execution
-path of the interrupted task (or ASR) is restored to the context
-prior to entering the ASR.
-
-@section Directives
-
-This section details the signal manager's directives.
-A subsection is dedicated to each of this manager's directives
-and describes the calling sequence, related constants, usage,
-and status codes.
-
-@page
-@subsection SIGNAL_CATCH - Establish an ASR
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_signal_catch
-@example
-rtems_status_code rtems_signal_catch(
-  rtems_asr_entry  asr_handler,
-  rtems_mode mode
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure Signal_Catch (
-   ASR_Handler : in     RTEMS.ASR_Handler;
-   Mode_Set    : in     RTEMS.Mode;
-   Result      :    out RTEMS.Status_Codes
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-@code{@value{RPREFIX}SUCCESSFUL} - always successful
-
-@subheading DESCRIPTION:
-
-This directive establishes an asynchronous signal
-routine (ASR) for the calling task.  The asr_handler parameter
-specifies the entry point of the ASR.  If asr_handler is NULL,
-the ASR for the calling task is invalidated and all pending
-signals are cleared.  Any signals sent to a task with an invalid
-ASR are discarded.  The mode parameter specifies the execution
-mode for the ASR.  This execution mode supersedes the task's
-execution mode while the ASR is executing.
-
-@subheading NOTES:
-
-This directive will not cause the calling task to be
-preempted.
-
-The following task mode constants are defined by RTEMS:
-
-@itemize @bullet
-@item @code{@value{RPREFIX}PREEMPT} is masked by
-@code{@value{RPREFIX}PREEMPT_MASK} and enables preemption
-
-@item @code{@value{RPREFIX}NO_PREEMPT} is masked by
-@code{@value{RPREFIX}PREEMPT_MASK} and disables preemption
-
-@item @code{@value{RPREFIX}NO_TIMESLICE} is masked by
-@code{@value{RPREFIX}TIMESLICE_MASK} and disables timeslicing
-
-@item @code{@value{RPREFIX}TIMESLICE} is masked by
-@code{@value{RPREFIX}TIMESLICE_MASK} and enables timeslicing
-
-@item @code{@value{RPREFIX}ASR} is masked by
-@code{@value{RPREFIX}ASR_MASK} and enables ASR processing
-
-@item @code{@value{RPREFIX}NO_ASR} is masked by
-@code{@value{RPREFIX}ASR_MASK} and disables ASR processing
-
-@item @code{@value{RPREFIX}INTERRUPT_LEVEL(0)} is masked by
-@code{@value{RPREFIX}INTERRUPT_MASK} and enables all interrupts
-
-@item @code{@value{RPREFIX}INTERRUPT_LEVEL(n)} is masked by
-@code{@value{RPREFIX}INTERRUPT_MASK} and sets interrupts level n
-@end itemize
-
-@page
-@subsection SIGNAL_SEND - Send signal set to a task
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_signal_send
-@example
-rtems_status_code rtems_signal_send(
-  rtems_id         id,
-  rtems_signal_set signal_set
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure Signal_Send (
-   ID         : in     RTEMS.ID;
-   Signal_Set : in     RTEMS.Signal_Set;
-   Result     :    out RTEMS.Status_Codes
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-@code{@value{RPREFIX}SUCCESSFUL} - signal sent successfully@*
-@code{@value{RPREFIX}INVALID_ID} - task id invalid@*
-@code{@value{RPREFIX}NOT_DEFINED} - ASR invalid
-
-@subheading DESCRIPTION:
-
-This directive sends a signal set to the task
-specified in id.  The signal_set parameter contains the signal
-set to be sent to the task.
-
-If a caller sends a signal set to a task with an
-invalid ASR, then an error code is returned to the caller.  If a
-caller sends a signal set to a task whose ASR is valid but
-disabled, then the signal set will be caught and left pending
-for the ASR to process when it is enabled. If a caller sends a
-signal set to a task with an ASR that is both valid and enabled,
-then the signal set is caught and the ASR will execute the next
-time the task is dispatched to run.
-
-@subheading NOTES:
-
-Sending a signal set to a task has no effect on that
-task's state.  If a signal set is sent to a blocked task, then
-the task will remain blocked and the signals will be processed
-when the task becomes the running task.
-
-Sending a signal set to a global task which does not
-reside on the local node will generate a request telling the
-remote node to send the signal set to the specified task.
-
diff --git a/doc/user/states.gif b/doc/user/states.gif
deleted file mode 100644
index cd0799ea2e..0000000000
--- a/doc/user/states.gif
+++ /dev/null
diff --git a/doc/user/task.t b/doc/user/task.t
deleted file mode 100644
index eaf8821321..0000000000
--- a/doc/user/task.t
+++ /dev/null
@@ -1,1440 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Task Manager
-
-@section Introduction
-
-The task manager provides a comprehensive set of directives to
-create, delete, and administer tasks.  The directives provided
-by the task manager are:
-
-@itemize @bullet
-@item @code{@value{DIRPREFIX}task_create} - Create a task 
-@item @code{@value{DIRPREFIX}task_ident} - Get ID of a task 
-@item @code{@value{DIRPREFIX}task_start} - Start a task 
-@item @code{@value{DIRPREFIX}task_restart} - Restart a task 
-@item @code{@value{DIRPREFIX}task_delete} - Delete a task 
-@item @code{@value{DIRPREFIX}task_suspend} - Suspend a task 
-@item @code{@value{DIRPREFIX}task_resume} - Resume a task 
-@item @code{@value{DIRPREFIX}task_set_priority} - Set task priority 
-@item @code{@value{DIRPREFIX}task_mode} - Change current task's mode 
-@item @code{@value{DIRPREFIX}task_get_note} - Get task notepad entry 
-@item @code{@value{DIRPREFIX}task_set_note} - Set task notepad entry 
-@item @code{@value{DIRPREFIX}task_wake_after} - Wake up after interval 
-@item @code{@value{DIRPREFIX}task_wake_when} - Wake up when specified  
-@end itemize
-
-@section Background
-
-@subsection Task Definition
-
-Many definitions of a task have been proposed in computer literature. 
-Unfortunately, none of these definitions encompasses all facets of the
-concept in a manner which is operating system independent.  Several of the
-more common definitions are provided to enable each user to select a
-definition which best matches their own experience and understanding of the
-task concept: 
-
-@itemize @bullet
-@item a "dispatchable" unit.
-
-@item an entity to which the processor is allocated.
-
-@item an atomic unit of a real-time, multiprocessor system.
-
-@item single threads of execution which concurrently compete for resources.
-
-@item a sequence of closely related computations which can execute
-concurrently with other computational sequences.
-
-@end itemize
-
-From RTEMS' perspective, a task is the smallest thread of
-execution which can compete on its own for system resources.  A
-task is manifested by the existence of a task control block
-(TCB).
-
-@subsection Task Control Block
-
-The Task Control Block (TCB) is an RTEMS defined data structure
-which contains all the information that is pertinent to the
-execution of a task.  During system initialization, RTEMS
-reserves a TCB for each task configured.  A TCB is allocated
-upon creation of the task and is returned to the TCB free list
-upon deletion of the task.
-
-The TCB's elements are modified as a result of system calls made
-by the application in response to external and internal stimuli.
-TCBs are the only RTEMS internal data structure that can be
-accessed by an application via user extension routines.  The TCB
-contains a task's name, ID, current priority, current and
-starting states, execution mode, set of notepad locations, TCB
-user extension pointer, scheduling control structures, as well
-as data required by a blocked task. 
-
-A task's context is stored in the TCB when a task switch occurs.
-When the task regains control of the processor, its context is
-restored from the TCB.  When a task is restarted, the initial
-state of the task is restored from the starting context area in
-the task's TCB.
-
-@subsection Task States
-
-A task may exist in one of the following five states:
-
-@itemize @bullet
-@item @b{executing} - Currently scheduled to the CPU 
-@item @b{ready} - May be scheduled to the CPU 
-@item @b{blocked} - Unable to be scheduled to the CPU 
-@item @b{dormant} - Created task that is not started 
-@item @b{non-existent} - Uncreated or deleted task 
-@end itemize
-
-An active task may occupy the executing, ready, blocked or
-dormant state, otherwise the task is considered non-existent. 
-One or more tasks may be active in the system simultaneously. 
-Multiple tasks communicate, synchronize, and compete for system
-resources with each other via system calls.  The multiple tasks
-appear to execute in parallel, but actually each is dispatched
-to the CPU for periods of time determined by the RTEMS
-scheduling algorithm.  The scheduling of a task is based on its
-current state and priority.
-
-@subsection Task Priority
-
-A task's priority determines its importance in relation to the
-other tasks executing on the same processor.  RTEMS supports 255
-levels of priority ranging from 1 to 255.  Tasks of numerically
-smaller priority values are more important tasks than tasks of
-numerically larger priority values.  For example, a task at
-priority level 5 is of higher privilege than a task at priority
-level 10.  There is no limit to the number of tasks assigned to
-the same priority.
-
-Each task has a priority associated with it at all times.  The
-initial value of this priority is assigned at task creation
-time.  The priority of a task may be changed at any subsequent
-time.
-
-Priorities are used by the scheduler to determine which ready
-task will be allowed to execute.  In general, the higher the
-logical priority of a task, the more likely it is to receive
-processor execution time.
-
-@subsection Task Mode
-
-A task's mode is a combination of the following four components:
-
-@itemize @bullet
-@item preemption
-@item ASR processing 
-@item timeslicing
-@item interrupt level 
-@end itemize
-
-It is used to modify RTEMS' scheduling process and to alter the
-execution environment of the task. 
-
-The preemption component allows a task to determine when control of the
-processor is relinquished.  If preemption is disabled
-(@code{@value{RPREFIX}NO_PREEMPT}), the task will retain control of the
-processor as long as it is in the executing state -- even if a higher
-priority task is made ready.  If preemption is enabled
-(@code{@value{RPREFIX}PREEMPT})  and a higher priority task is made ready,
-then the processor will be taken away from the current task immediately and
-given to the higher priority task. 
-
-The timeslicing component is used by the RTEMS scheduler to determine how
-the processor is allocated to tasks of equal priority.  If timeslicing is
-enabled (@code{@value{RPREFIX}TIMESLICE}), then RTEMS will limit the amount
-of time the task can execute before the processor is allocated to another
-ready task of equal priority. The length of the timeslice is application
-dependent and specified in the Configuration Table.  If timeslicing is
-disabled (@code{@value{RPREFIX}NO_TIMESLICE}), then the task will be
-allowed to execute until a task of higher priority is made ready.  If
-@code{@value{RPREFIX}NO_PREEMPT} is selected, then the timeslicing
-component is ignored by the scheduler. 
-
-The asynchronous signal processing component is used to determine when
-received signals are to be processed by the task. 
-If signal processing is enabled (@code{@value{RPREFIX}ASR}), then signals
-sent to the task will be processed the next time the task executes.  If
-signal processing is disabled (@code{@value{RPREFIX}NO_ASR}), then all
-signals received by the task will remain posted until signal processing is
-enabled.  This component affects only tasks which have established a
-routine to process asynchronous signals.
-
-The interrupt level component is used to determine which
-interrupts will be enabled when the task is executing. 
-@code{@value{RPREFIX}INTERRUPT_LEVEL(n)}
-specifies that the task will execute at interrupt level n.
-
-@itemize  @bullet
-@item @code{@value{RPREFIX}PREEMPT} - enable preemption (default) 
-@item @code{@value{RPREFIX}NO_PREEMPT} - disable preemption
-@item @code{@value{RPREFIX}NO_TIMESLICE} - disable timeslicing (default) 
-@item @code{@value{RPREFIX}TIMESLICE} - enable timeslicing
-@item @code{@value{RPREFIX}ASR} - enable ASR processing (default) 
-@item @code{@value{RPREFIX}NO_ASR} - disable ASR processing
-@item @code{@value{RPREFIX}INTERRUPT_LEVEL(0)} - enable all interrupts (default) 
-@item @code{@value{RPREFIX}INTERRUPT_LEVEL(n)} - execute at interrupt level n
-@end itemize
-
-@subsection Accessing Task Arguments
-
-All RTEMS tasks are invoked with a single argument which is
-specified when they are started or restarted.  The argument is
-commonly used to communicate startup information to the task. 
-The simplest manner in which to define a task which accesses it
-argument is:
-
-@ifset is-C
-@example
-rtems_task user_task( 
-  rtems_task_argument argument
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure User_Task (
-  Argument : in    RTEMS.Task_Argument_Ptr
-);
-@end example
-@end ifset
-
-Application tasks requiring more information may view this
-single argument as an index into an array of parameter blocks.
-
-@subsection Floating Point Considerations
-
-Creating a task with the @code{@value{RPREFIX}FLOATING_POINT} flag results
-in additional memory being allocated for the TCB to store the state of the
-numeric coprocessor during task switches.  This additional memory is
-@b{NOT} allocated for @code{@value{RPREFIX}NO_FLOATING_POINT} tasks. Saving
-and restoring the context of a @code{@value{RPREFIX}FLOATING_POINT} task
-takes longer than that of a @code{@value{RPREFIX}NO_FLOATING_POINT} task
-because of the relatively large amount of time required for the numeric
-coprocessor to save or restore its computational state. 
-
-Since RTEMS was designed specifically for embedded military applications
-which are floating point intensive, the executive is optimized to avoid
-unnecessarily saving and restoring the state of the numeric coprocessor. 
-The state of the numeric coprocessor is only saved when a
-@code{@value{RPREFIX}FLOATING_POINT} task is dispatched and that task was
-not the last task to utilize the coprocessor.  In a system with only one
-@code{@value{RPREFIX}FLOATING_POINT} task, the state of the numeric
-coprocessor will never be saved or restored. 
-
-Although the overhead imposed by @code{@value{RPREFIX}FLOATING_POINT} tasks
-is minimal, some applications may wish to completely avoid the overhead
-associated with @code{@value{RPREFIX}FLOATING_POINT} tasks and still
-utilize a numeric coprocessor.  By preventing a task from being preempted
-while performing a sequence of floating point operations, a
-@code{@value{RPREFIX}NO_FLOATING_POINT} task can utilize the numeric
-coprocessor without incurring the overhead of a
-@code{@value{RPREFIX}FLOATING_POINT} context switch.  This approach also
-avoids the allocation of a floating point context area.  However, if this
-approach is taken by the application designer, NO tasks should be created
-as @code{@value{RPREFIX}FLOATING_POINT} tasks.  Otherwise, the floating
-point context will not be correctly maintained because RTEMS assumes that
-the state of the numeric coprocessor will not be altered by
-@code{@value{RPREFIX}NO_FLOATING_POINT} tasks. 
-
-If the supported processor type does not have hardware floating
-capabilities or a standard numeric coprocessor, RTEMS will not provide
-built-in support for hardware floating point on that processor.  In this
-case, all tasks are considered @code{@value{RPREFIX}NO_FLOATING_POINT}
-whether created as @code{@value{RPREFIX}FLOATING_POINT} or
-@code{@value{RPREFIX}NO_FLOATING_POINT} tasks.  A floating point emulation
-software library must be utilized for floating point operations. 
-
-On some processors, it is possible to disable the floating point unit
-dynamically.  If this capability is supported by the target processor, then
-RTEMS will utilize this capability to enable the floating point unit only
-for tasks which are created with the @code{@value{RPREFIX}FLOATING_POINT}
-attribute.  The consequence of a @code{@value{RPREFIX}NO_FLOATING_POINT}
-task attempting to access the floating point unit is CPU dependent but will
-generally result in an exception condition. 
-
-@subsection Building a Task's Attribute Set
-
-In general, an attribute set is built by a bitwise OR of the
-desired components.  The set of valid task attribute components
-is listed below:
-
-@itemize @bullet
-@item @code{@value{RPREFIX}NO_FLOATING_POINT} - does not use coprocessor (default)
-@item @code{@value{RPREFIX}FLOATING_POINT} - uses numeric coprocessor
-@item @code{@value{RPREFIX}LOCAL} - local task (default)
-@item @code{@value{RPREFIX}GLOBAL} - global task
-@end itemize
-
-Attribute values are specifically designed to be mutually
-exclusive, therefore bitwise OR and addition operations are
-equivalent as long as each attribute appears exactly once in the
-component list.  A component listed as a default is not required
-to appear in the component list, although it is a good
-programming practice to specify default components.  If all
-defaults are desired, then @code{@value{RPREFIX}DEFAULT_ATTRIBUTES} should be used.
-
-This example demonstrates the attribute_set parameter needed to
-create a local task which utilizes the numeric coprocessor.  The
-attribute_set parameter could be @code{@value{RPREFIX}FLOATING_POINT} or
-@code{@value{RPREFIX}LOCAL @value{OR} @value{RPREFIX}FLOATING_POINT}.  
-The attribute_set parameter can be set to
-@code{@value{RPREFIX}FLOATING_POINT} because @code{@value{RPREFIX}LOCAL} is the default for all created
-tasks.  If the task were global and used the numeric
-coprocessor, then the attribute_set parameter would be
-@code{@value{RPREFIX}GLOBAL @value{OR} @value{RPREFIX}FLOATING_POINT}. 
-
-@subsection Building a Mode and Mask
-
-In general, a mode and its corresponding mask is built by a
-bitwise OR of the desired components.  The set of valid mode
-constants and each mode's corresponding mask constant is
-listed below:
-
-@ifset use-ascii
-@itemize @bullet
-@item @code{@value{RPREFIX}PREEMPT} is masked by
-@code{@value{RPREFIX}PREEMPT_MASK} and enables preemption
-
-@item @code{@value{RPREFIX}NO_PREEMPT} is masked by
-@code{@value{RPREFIX}PREEMPT_MASK} and disables preemption
-
-@item @code{@value{RPREFIX}NO_TIMESLICE} is masked by
-@code{@value{RPREFIX}TIMESLICE_MASK} and disables timeslicing
-
-@item @code{@value{RPREFIX}TIMESLICE} is masked by
-@code{@value{RPREFIX}TIMESLICE_MASK} and enables timeslicing
-
-@item @code{@value{RPREFIX}ASR} is masked by
-@code{@value{RPREFIX}ASR_MASK} and enables ASR processing
-
-@item @code{@value{RPREFIX}NO_ASR} is masked by
-@code{@value{RPREFIX}ASR_MASK} and disables ASR processing
-
-@item @code{@value{RPREFIX}INTERRUPT_LEVEL(0)} is masked by
-@code{@value{RPREFIX}INTERRUPT_MASK} and enables all interrupts
-
-@item @code{@value{RPREFIX}INTERRUPT_LEVEL(n)} is masked by
-@code{@value{RPREFIX}INTERRUPT_MASK} and sets interrupts level n
-@end itemize
-@end ifset
-
-@ifset use-tex
-@sp 1
-@c this is temporary
-@itemize @bullet
-@item @code{@value{RPREFIX}PREEMPT} is masked by
-@code{@value{RPREFIX}PREEMPT_MASK} and enables preemption
-
-@item @code{@value{RPREFIX}NO_PREEMPT} is masked by
-@code{@value{RPREFIX}PREEMPT_MASK} and disables preemption
-
-@item @code{@value{RPREFIX}NO_TIMESLICE} is masked by
-@code{@value{RPREFIX}TIMESLICE_MASK} and disables timeslicing
-
-@item @code{@value{RPREFIX}TIMESLICE} is masked by
-@code{@value{RPREFIX}TIMESLICE_MASK} and enables timeslicing
-
-@item @code{@value{RPREFIX}ASR} is masked by
-@code{@value{RPREFIX}ASR_MASK} and enables ASR processing
-
-@item @code{@value{RPREFIX}NO_ASR} is masked by
-@code{@value{RPREFIX}ASR_MASK} and disables ASR processing
-
-@item @code{@value{RPREFIX}INTERRUPT_LEVEL(0)} is masked by
-@code{@value{RPREFIX}INTERRUPT_MASK} and enables all interrupts
-
-@item @code{@value{RPREFIX}INTERRUPT_LEVEL(n)} is masked by
-@code{@value{RPREFIX}INTERRUPT_MASK} and sets interrupts level n
- 
-@end itemize
-
-@tex
-@end tex
-@end ifset
-
-@ifset use-html
-@html
-<CENTER>
-  <TABLE COLS=3 WIDTH="80%" BORDER=2>
-<TR><TD ALIGN=center><STRONG>Mode Constant</STRONG></TD>
-    <TD ALIGN=center><STRONG>Mask Constant</STRONG></TD>
-    <TD ALIGN=center><STRONG>Description</STRONG></TD></TR>
-<TR><TD ALIGN=center>@value{RPREFIX}PREEMPT</TD>
-    <TD ALIGN=center>@value{RPREFIX}PREEMPT_MASK</TD>
-    <TD ALIGN=center>enables preemption</TD></TR>
-<TR><TD ALIGN=center>@value{RPREFIX}NO_PREEMPT</TD>
-    <TD ALIGN=center>@value{RPREFIX}PREEMPT_MASK</TD>
-    <TD ALIGN=center>disables preemption</TD></TR>
-<TR><TD ALIGN=center>@value{RPREFIX}NO_TIMESLICE</TD>
-    <TD ALIGN=center>@value{RPREFIX}TIMESLICE_MASK</TD>
-    <TD ALIGN=center>disables timeslicing</TD></TR>
-<TR><TD ALIGN=center>@value{RPREFIX}TIMESLICE</TD>
-    <TD ALIGN=center>@value{RPREFIX}TIMESLICE_MASK</TD>
-    <TD ALIGN=center>enables timeslicing</TD></TR>
-<TR><TD ALIGN=center>@value{RPREFIX}ASR</TD>
-    <TD ALIGN=center>@value{RPREFIX}ASR_MASK</TD>
-    <TD ALIGN=center>enables ASR processing</TD></TR>
-<TR><TD ALIGN=center>@value{RPREFIX}NO_ASR</TD>
-    <TD ALIGN=center>@value{RPREFIX}ASR_MASK</TD>
-    <TD ALIGN=center>disables ASR processing</TD></TR>
-<TR><TD ALIGN=center>@value{RPREFIX}INTERRUPT_LEVEL(0)</TD>
-    <TD ALIGN=center>@value{RPREFIX}INTERRUPT_MASK</TD>
-    <TD ALIGN=center>enables all interrupts</TD></TR>
-<TR><TD ALIGN=center>@value{RPREFIX}INTERRUPT_LEVEL(n)</TD>
-    <TD ALIGN=center>@value{RPREFIX}INTERRUPT_MASK</TD>
-    <TD ALIGN=center>sets interrupts level n</TD></TR>
-  </TABLE>
-</CENTER>
-@end html
-@end ifset
-
-Mode values are specifically designed to be mutually exclusive, therefore
-bitwise OR and addition operations are equivalent as long as each mode
-appears exactly once in the component list.  A mode component listed as a
-default is not required to appear in the mode component list, although it
-is a good programming practice to specify default components.  If all
-defaults are desired, the mode @code{@value{RPREFIX}DEFAULT_MODES} and the
-mask @code{@value{RPREFIX}ALL_MODE_MASKS} should be used. 
-
-The following example demonstrates the mode and mask parameters used with
-the @code{@value{DIRPREFIX}task_mode}
-directive to place a task at interrupt level 3 and make it
-non-preemptible.  The mode should be set to
-@code{@value{RPREFIX}INTERRUPT_LEVEL(3)  @value{OR}
-@value{RPREFIX}NO_PREEMPT} to indicate the desired preemption mode and
-interrupt level, while the mask parameter should be set to
-@code{@value{RPREFIX}INTERRUPT_MASK @value{OR}
-@value{RPREFIX}NO_PREEMPT_MASK} to indicate that the calling task's
-interrupt level and preemption mode are being altered.
-
-@section Operations
-
-@subsection Creating Tasks
-
-The @code{@value{DIRPREFIX}task_create}
-directive creates a task by allocating a task
-control block, assigning the task a user-specified name,
-allocating it a stack and floating point context area, setting a
-user-specified initial priority, setting a user-specified
-initial mode, and assigning it a task ID.  Newly created tasks
-are initially placed in the dormant state.  All RTEMS tasks
-execute in the most privileged mode of the processor.
-
-@subsection Obtaining Task IDs
-
-When a task is created, RTEMS generates a unique task ID and
-assigns it to the created task until it is deleted.  The task ID
-may be obtained by either of two methods.  First, as the result
-of an invocation of the @code{@value{DIRPREFIX}task_create}
-directive, the task ID is
-stored in a user provided location.  Second, the task ID may be
-obtained later using the @code{@value{DIRPREFIX}task_ident}
-directive.  The task ID is
-used by other directives to manipulate this task.
-
-@subsection Starting and Restarting Tasks
-
-The @code{@value{DIRPREFIX}task_start}
-directive is used to place a dormant task in the
-ready state.  This enables the task to compete, based on its
-current priority, for the processor and other system resources. 
-Any actions, such as suspension or change of priority, performed
-on a task prior to starting it are nullified when the task is
-started.
-
-With the @code{@value{DIRPREFIX}task_start}
-directive the user specifies the task's
-starting address and argument.  The argument is used to
-communicate some startup information to the task.  As part of
-this directive, RTEMS initializes the task's stack based upon
-the task's initial execution mode and start address.  The
-starting argument is passed to the task in accordance with the
-target processor's calling convention.
-
-The @code{@value{DIRPREFIX}task_restart}
-directive restarts a task at its initial
-starting address with its original priority and execution mode,
-but with a possibly different argument.  The new argument may be
-used to distinguish between the original invocation of the task
-and subsequent invocations.  The task's stack and control block
-are modified to reflect their original creation values. 
-Although references to resources that have been requested are
-cleared, resources allocated by the task are NOT automatically
-returned to RTEMS.  A task cannot be restarted unless it has
-previously been started (i.e. dormant tasks cannot be
-restarted).  All restarted tasks are placed in the ready state.
-
-@subsection Suspending and Resuming Tasks
-
-The @code{@value{DIRPREFIX}task_suspend}
-directive is used to place either the caller or
-another task into a suspended state.  The task remains suspended
-until a @code{@value{DIRPREFIX}task_resume}
-directive is issued.  This implies that a
-task may be suspended as well as blocked waiting either to
-acquire a resource or for the expiration of a timer.
-
-The @code{@value{DIRPREFIX}task_resume}
-directive is used to remove another task from
-the suspended state. If the task is not also blocked, resuming
-it will place it in the ready state, allowing it to once again
-compete for the processor and resources.  If the task was
-blocked as well as suspended, this directive clears the
-suspension and leaves the task in the blocked state.
-
-Suspending a task which is already suspended or resuming a 
-task which is not suspended is considered an error.
-
-@subsection Delaying the Currently Executing Task
-
-The @code{@value{DIRPREFIX}task_wake_after} directive creates a sleep timer
-which allows a task to go to sleep for a specified interval.  The task is
-blocked until the delay interval has elapsed, at which time the task is
-unblocked.  A task calling the @code{@value{DIRPREFIX}task_wake_after}
-directive with a delay
-interval of @code{@value{RPREFIX}YIELD_PROCESSOR} ticks will yield the
-processor to any other ready task of equal or greater priority and remain
-ready to execute. 
-
-The @code{@value{DIRPREFIX}task_wake_when}
-directive creates a sleep timer which allows
-a task to go to sleep until a specified date and time.  The
-calling task is blocked until the specified date and time has
-occurred, at which time the task is unblocked.
-
-@subsection Changing Task Priority 
-
-The @code{@value{DIRPREFIX}task_set_priority}
-directive is used to obtain or change the
-current priority of either the calling task or another task.  If
-the new priority requested is
-@code{@value{RPREFIX}CURRENT_PRIORITY} or the task's
-actual priority, then the current priority will be returned and
-the task's priority will remain unchanged.  If the task's
-priority is altered, then the task will be scheduled according
-to its new priority.
-
-The @code{@value{DIRPREFIX}task_restart}
-directive resets the priority of a task to its
-original value.
-
-@subsection Changing Task Mode
-
-The @code{@value{DIRPREFIX}task_mode}
-directive is used to obtain or change the current
-execution mode of the calling task.  A task's execution mode is
-used to enable preemption, timeslicing, ASR processing, and to
-set the task's interrupt level.  
-
-The @code{@value{DIRPREFIX}task_restart}
-directive resets the mode of a task to its
-original value.
-
-@subsection Notepad Locations
-
-RTEMS provides sixteen notepad locations for each task.  Each
-notepad location may contain a note consisting of four bytes of
-information.  RTEMS provides two directives,
-@code{@value{DIRPREFIX}task_set_note} and
-@code{@value{DIRPREFIX}task_get_note}, that enable a user
-to access and change the
-notepad locations.  The @code{@value{DIRPREFIX}task_set_note}
-directive enables the user
-to set a task's notepad entry to a specified note.  The
-@code{@value{DIRPREFIX}task_get_note}
-directive allows the user to obtain the note
-contained in any one of the sixteen notepads of a specified task.
-
-@subsection Task Deletion
-
-RTEMS provides the @code{@value{DIRPREFIX}task_delete}
-directive to allow a task to
-delete itself or any other task.  This directive removes all
-RTEMS references to the task, frees the task's control block,
-removes it from resource wait queues, and deallocates its stack
-as well as the optional floating point context.  The task's name
-and ID become inactive at this time, and any subsequent
-references to either of them is invalid.  In fact, RTEMS may
-reuse the task ID for another task which is created later in the
-application.
-
-Unexpired delay timers (i.e. those used by
-@code{@value{DIRPREFIX}task_wake_after} and
-@code{@value{DIRPREFIX}task_wake_when}) and
-timeout timers associated with the task are
-automatically deleted, however, other resources dynamically
-allocated by the task are NOT automatically returned to RTEMS. 
-Therefore, before a task is deleted, all of its dynamically
-allocated resources should be deallocated by the user.  This may
-be accomplished by instructing the task to delete itself rather
-than directly deleting the task.  Other tasks may instruct a
-task to delete itself by sending a "delete self" message, event,
-or signal, or by restarting the task with special arguments
-which instruct the task to delete itself.
-
-@section Directives
-
-This section details the task manager's directives.  A
-subsection is dedicated to each of this manager's directives and
-describes the calling sequence, related constants, usage, and
-status codes.
-
-@page
-
-@subsection TASK_CREATE - Create a task
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_task_create
-@example
-rtems_status_code rtems_task_create(
-  rtems_name           name,
-  rtems_task_priority  initial_priority,
-  rtems_unsigned32     stack_size,
-  rtems_mode           initial_modes,
-  rtems_attribute      attribute_set,
-  rtems_id            *id
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure Task_Create (
-   Name             : in     RTEMS.Name;
-   Initial_Priority : in     RTEMS.Task_Priority;
-   Stack_Size       : in     RTEMS.Unsigned32;
-   Initial_Modes    : in     RTEMS.Mode;
-   Attribute_Set    : in     RTEMS.Attribute;
-   ID               :    out RTEMS.ID;
-   Result           :    out RTEMS.Status_Codes
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-@code{@value{RPREFIX}SUCCESSFUL} - task created successfully@*
-@code{@value{RPREFIX}INVALID_NAME} - invalid task name@*
-@code{@value{RPREFIX}INVALID_SIZE} - stack too small@*
-@code{@value{RPREFIX}INVALID_PRIORITY} - invalid task priority@*
-@code{@value{RPREFIX}MP_NOT_CONFIGURED} - multiprocessing not configured@*
-@code{@value{RPREFIX}TOO_MANY} - too many tasks created@*
-@code{@value{RPREFIX}UNSATISFIED} - not enough memory for stack/FP context@*
-@code{@value{RPREFIX}TOO_MANY} - too many global objects
-
-@subheading DESCRIPTION:
-This directive creates a task which resides on the local node. 
-It allocates and initializes a TCB, a stack, and an optional
-floating point context area.  The mode parameter contains values
-which sets the task's initial execution mode.  The
-@code{@value{RPREFIX}FLOATING_POINT} attribute should be
-specified if the created task
-is to use a numeric coprocessor.  For performance reasons, it is
-recommended that tasks not using the numeric coprocessor should
-specify the @code{@value{RPREFIX}NO_FLOATING_POINT} attribute.  
-If the @code{@value{RPREFIX}GLOBAL}
-attribute is specified, the task can be accessed from remote
-nodes.  The task id, returned in id, is used in other task
-related directives to access the task.  When created, a task is
-placed in the dormant state and can only be made ready to
-execute using the directive @code{@value{DIRPREFIX}task_start}.
-
-@subheading NOTES:
-This directive will not cause the calling task to be preempted.
-
-Valid task priorities range from a high of 1 to a low of 255.
-
-RTEMS supports a maximum of 256 interrupt levels which are
-mapped onto the interrupt levels actually supported by the
-target processor.
-
-The requested stack size should be at least
-@code{@value{RPREFIX}MINIMUM_STACK_SIZE}
-bytes.  The value of @code{@value{RPREFIX}MINIMUM_STACK_SIZE}
-is processor dependent. 
-Application developers should consider the stack usage of the
-device drivers when calculating the stack size required for
-tasks which utilize the driver.
-
-The following task attribute constants are defined by RTEMS:
-
-@itemize @bullet
-@item @code{@value{RPREFIX}NO_FLOATING_POINT} - does not use coprocessor (default)
-@item @code{@value{RPREFIX}FLOATING_POINT} - uses numeric coprocessor
-@item @code{@value{RPREFIX}LOCAL} - local task (default)
-@item @code{@value{RPREFIX}GLOBAL} - global task
-@end itemize
-
-The following task mode constants are defined by RTEMS:
-
-@itemize  @bullet
-@item @code{@value{RPREFIX}PREEMPT} - enable preemption (default) 
-@item @code{@value{RPREFIX}NO_PREEMPT} - disable preemption
-@item @code{@value{RPREFIX}NO_TIMESLICE} - disable timeslicing (default) 
-@item @code{@value{RPREFIX}TIMESLICE} - enable timeslicing
-@item @code{@value{RPREFIX}ASR} - enable ASR processing (default) 
-@item @code{@value{RPREFIX}NO_ASR} - disable ASR processing
-@item @code{@value{RPREFIX}INTERRUPT_LEVEL(0)} - enable all interrupts (default) 
-@item @code{@value{RPREFIX}INTERRUPT_LEVEL(n)} - execute at interrupt level n
-@end itemize
-
-Tasks should not be made global unless remote tasks must
-interact with them.  This avoids the system overhead incurred by
-the creation of a global task.  When a global task is created,
-the task's name and id must be transmitted to every node in the
-system for insertion in the local copy of the global object
-table.
-
-The total number of global objects, including tasks, is limited
-by the maximum_global_objects field in the Configuration Table.
-
-@page
-
-@subsection TASK_IDENT - Get ID of a task
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_task_ident
-@example
-rtems_status_code rtems_task_ident(
-  rtems_name        name,
-  rtems_unsigned32  node,
-  rtems_id         *id
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure Task_Ident (
-   Name   : in     RTEMS.Name;
-   Node   : in     RTEMS.Node;
-   ID     :    out RTEMS.ID;
-   Result :    out RTEMS.Status_Codes
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-@code{@value{RPREFIX}SUCCESSFUL} - task identified successfully@*
-@code{@value{RPREFIX}INVALID_NAME} - invalid task name@*
-@code{@value{RPREFIX}INVALID_NODE} - invalid node id
-
-@subheading DESCRIPTION:
-This directive obtains the task id associated with the task name
-specified in name.  A task may obtain its own id by specifying
-@code{@value{RPREFIX}SELF} or its own task name in name.  If the task name is not
-unique, then the task id returned will match one of the tasks
-with that name.  However, this task id is not guaranteed to
-correspond to the desired task.  The task id, returned in id, is
-used in other task related directives to access the task.
-
-@subheading NOTES:
-This directive will not cause the running task to be preempted.
-
-If node is @code{@value{RPREFIX}SEARCH_ALL_NODES}, all nodes are searched with the
-local node being searched first.  All other nodes are searched
-with the lowest numbered node searched first.
-
-If node is a valid node number which does not represent the
-local node, then only the tasks exported by the designated node
-are searched.
-
-This directive does not generate activity on remote nodes.  It
-accesses only the local copy of the global object table.
-
-@page
-
-@subsection TASK_START - Start a task
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_task_start
-@example
-rtems_status_code rtems_task_start(
-  rtems_id            id,
-  rtems_task_entry    entry_point,
-  rtems_task_argument argument
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure Task_Start (
-   ID          : in     RTEMS.ID;
-   Entry_Point : in     System.Address;
-   Argument    : in     RTEMS.Task_Argument_PTR;
-   Result      :    out RTEMS.Status_Codes
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-@code{@value{RPREFIX}SUCCESSFUL} - ask started successfully@*
-@code{@value{RPREFIX}INVALID_ADDRESS} - invalid task entry point@*
-@code{@value{RPREFIX}INVALID_ID} - invalid task id@*
-@code{@value{RPREFIX}INCORRECT_STATE} - task not in the dormant state@*
-@code{@value{RPREFIX}ILLEGAL_ON_REMOTE_OBJECT} - cannot start remote task
-
-@subheading DESCRIPTION:
-This directive readies the task, specified by tid, for execution
-based on the priority and execution mode specified when the task
-was created.  The starting address of the task is given in
-entry_point.  The task's starting argument is contained in
-argument.  This argument can be a single value or used as an
-index into an array of parameter blocks.
-
-@subheading NOTES:
-The calling task will be preempted if its preemption mode is
-enabled and the task being started has a higher priority.
-
-Any actions performed on a dormant task such as suspension or
-change of priority are nullified when the task is initiated via
-the @code{@value{DIRPREFIX}task_start} directive.
-
-@page
-
-@subsection TASK_RESTART - Restart a task
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_task_restart
-@example
-rtems_status_code rtems_task_restart(
-  rtems_id            id,
-  rtems_task_argument argument
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure Task_Restart (
-   ID       : in     RTEMS.ID;
-   Argument : in     RTEMS.Task_Argument_PTR;
-   Result   :    out RTEMS.Status_Codes
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-@code{@value{RPREFIX}SUCCESSFUL} - task restarted successfully@*
-@code{@value{RPREFIX}INVALID_ID} - task id invalid@*
-@code{@value{RPREFIX}INCORRECT_STATE} - task never started@*
-@code{@value{RPREFIX}ILLEGAL_ON_REMOTE_OBJECT} - cannot restart remote task
-
-@subheading DESCRIPTION:
-This directive resets the task specified by id to begin
-execution at its original starting address.  The task's priority
-and execution mode are set to the original creation values.  If
-the task is currently blocked, RTEMS automatically makes the
-task ready.  A task can be restarted from any state, except the
-dormant state.
-
-The task's starting argument is contained in argument.  This
-argument can be a single value or an index into an array of
-parameter blocks.  This new argument may be used to distinguish
-between the initial @code{@value{DIRPREFIX}task_start}
-of the task and any ensuing calls
-to @code{@value{DIRPREFIX}task_restart}
-of the task.  This can be beneficial in deleting
-a task.  Instead of deleting a task using
-the @code{@value{DIRPREFIX}task_delete}
-directive, a task can delete another task by restarting that
-task, and allowing that task to release resources back to RTEMS
-and then delete itself.
-
-@subheading NOTES:
-If id is @code{@value{RPREFIX}SELF}, the calling task will be restarted and will not
-return from this directive.
-
-The calling task will be preempted if its preemption mode is
-enabled and the task being restarted has a higher priority.
-
-The task must reside on the local node, even if the task was
-created with the @code{@value{RPREFIX}GLOBAL} option.
-
-@page
-
-@subsection TASK_DELETE - Delete a task
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_task_delete
-@example
-rtems_status_code rtems_task_delete(
-  rtems_id id
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure Task_Delete (
-   ID     : in     RTEMS.ID;
-   Result :    out RTEMS.Status_Codes
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-@code{@value{RPREFIX}SUCCESSFUL} - task restarted successfully@*
-@code{@value{RPREFIX}INVALID_ID} - task id invalid@*
-@code{@value{RPREFIX}ILLEGAL_ON_REMOTE_OBJECT} - cannot restart remote task
-
-@subheading DESCRIPTION:
-This directive deletes a task, either the calling task or
-another task, as specified by id.  RTEMS stops the execution of
-the task and reclaims the stack memory, any allocated delay or
-timeout timers, the TCB, and, if the task is @code{@value{RPREFIX}FLOATING_POINT}, its
-floating point context area.  RTEMS does not reclaim the
-following resources: region segments, partition buffers,
-semaphores, timers, or rate monotonic periods.
-
-@subheading NOTES:
-A task is responsible for releasing its resources back to RTEMS
-before deletion.  To insure proper deallocation of resources, a
-task should not be deleted unless it is unable to execute or
-does not hold any RTEMS resources.  If a task holds RTEMS
-resources, the task should be allowed to deallocate its
-resources before deletion.  A task can be directed to release
-its resources and delete itself by restarting it with a special
-argument or by sending it a message, an event, or a signal.
-
-Deletion of the current task (@code{@value{RPREFIX}SELF}) will force RTEMS to select
-another task to execute.
-
-When a global task is deleted, the task id must be transmitted
-to every node in the system for deletion from the local copy of
-the global object table.
-
-The task must reside on the local node, even if the task was
-created with the @code{@value{RPREFIX}GLOBAL} option.
-
-@page
-
-@subsection TASK_SUSPEND - Suspend a task
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_task_suspend
-@example
-rtems_status_code rtems_task_suspend(
-  rtems_id id
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure Task_Suspend (
-   ID     : in     RTEMS.ID;
-   Result :    out RTEMS.Status_Codes
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-@code{@value{RPREFIX}SUCCESSFUL} - task restarted successfully@*
-@code{@value{RPREFIX}INVALID_ID} - task id invalid@*
-@code{@value{RPREFIX}ALREADY_SUSPENDED} - task already suspended
-
-@subheading DESCRIPTION:
-This directive suspends the task specified by id from further
-execution by placing it in the suspended state.  This state is
-additive to any other blocked state that the task may already be
-in.  The task will not execute again until another task issues
-the @code{@value{DIRPREFIX}task_resume}
-directive for this task and any blocked state
-has been removed.
-
-@subheading NOTES:
-The requesting task can suspend itself by specifying @code{@value{RPREFIX}SELF} as id.
-In this case, the task will be suspended and a successful
-return code will be returned when the task is resumed.
-
-Suspending a global task which does not reside on the local node
-will generate a request to the remote node to suspend the
-specified task.
-
-If the task specified by id is already suspended, then the
-@code{@value{RPREFIX}ALREADY_SUSPENDED} status code is returned.
-
-@page
-
-@subsection TASK_RESUME - Resume a task
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_task_resume
-@example
-rtems_status_code rtems_task_resume(
-  rtems_id id
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure Task_Resume (
-   ID     : in     RTEMS.ID;
-   Result :    out RTEMS.Status_Codes
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-@code{@value{RPREFIX}SUCCESSFUL} - task restarted successfully@*
-@code{@value{RPREFIX}INVALID_ID} - task id invalid@*
-@code{@value{RPREFIX}INCORRECT_STATE} - task not suspended
-
-@subheading DESCRIPTION:
-This directive removes the task specified by id from the
-suspended state.  If the task is in the ready state after the
-suspension is removed, then it will be scheduled to run.  If the
-task is still in a blocked state after the suspension is
-removed, then it will remain in that blocked state.
-
-@subheading NOTES:
-The running task may be preempted if its preemption mode is
-enabled and the local task being resumed has a higher priority.
-
-Resuming a global task which does not reside on the local node
-will generate a request to the remote node to resume the
-specified task.
-
-If the task specified by id is not suspended, then the
-@code{@value{RPREFIX}INCORRECT_STATE} status code is returned.
-
-@page
-
-@subsection TASK_SET_PRIORITY - Set task priority
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_task_set_priority
-@example
-rtems_status_code rtems_task_set_priority(
-  rtems_id             id,
-  rtems_task_priority  new_priority,
-  rtems_task_priority *old_priority
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure Task_Set_Priority (
-   ID           : in     RTEMS.ID;
-   New_Priority : in     RTEMS.Task_Priority;
-   Old_Priority :    out RTEMS.Task_Priority;
-   Result       :    out RTEMS.Status_Codes
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-@code{@value{RPREFIX}SUCCESSFUL} - task priority set successfully@*
-@code{@value{RPREFIX}INVALID_ID} - invalid task id@*
-@code{@value{RPREFIX}INVALID_PRIORITY} - invalid task priority
-
-@subheading DESCRIPTION:
-This directive manipulates the priority of the task specified by
-id.  An id of @code{@value{RPREFIX}SELF} is used to indicate
-the calling task.  When new_priority is not equal to
-@code{@value{RPREFIX}CURRENT_PRIORITY}, the specified
-task's previous priority is returned in old_priority.  When
-new_priority is @code{@value{RPREFIX}CURRENT_PRIORITY},
-the specified task's current
-priority is returned in old_priority.  Valid priorities range
-from a high of 1 to a low of 255.
-
-@subheading NOTES:
-The calling task may be preempted if its preemption mode is
-enabled and it lowers its own priority or raises another task's
-priority.
-
-Setting the priority of a global task which does not reside on
-the local node will generate a request to the remote node to
-change the priority of the specified task.
-
-If the task specified by id is currently holding any binary
-semaphores which use the priority inheritance algorithm, then
-the task's priority cannot be lowered immediately.  If the
-task's priority were lowered immediately, then priority
-inversion results.  The requested lowering of the task's
-priority will occur when the task has released all priority
-inheritance binary semaphores.  The task's priority can be
-increased regardless of the task's use of priority inheritance
-binary semaphores.
-
-@page
-
-@subsection TASK_MODE - Change current task's mode
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_task_mode
-@example
-rtems_status_code rtems_task_mode(
-  rtems_mode  mode_set,
-  rtems_mode  mask,
-  rtems_mode *previous_mode_set
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure Task_Delete (
-   Mode_Set          : in     RTEMS.Mode;
-   Mask              : in     RTEMS.Mode;
-   Previous_Mode_Set : in     RTEMS.Mode;
-   Result            :    out RTEMS.Status_Codes
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-@code{@value{RPREFIX}SUCCESSFUL} - task mode set successfully
-
-@subheading DESCRIPTION:
-This directive manipulates the execution mode of the calling
-task.  A task's execution mode enables and disables preemption,
-timeslicing, asynchronous signal processing, as well as
-specifying the current interrupt level.  To modify an execution
-mode, the mode class(es) to be changed must be specified in the
-mask parameter and the desired mode(s) must be specified in the
-mode parameter.  
-
-@subheading NOTES:
-The calling task will be preempted if it enables preemption and
-a higher priority task is ready to run.
-
-Enabling timeslicing has no effect if preemption is enabled.
-
-A task can obtain its current execution mode, without modifying
-it, by calling this directive with a mask value of
-@code{@value{RPREFIX}CURRENT_MODE}.
-
-To temporarily disable the processing of a valid ASR, a task
-should call this directive with the @code{@value{RPREFIX}NO_ASR}
-indicator specified in mode.
-
-The set of task mode constants and each mode's corresponding
-mask constant is provided in the following table:
-
-@ifset use-ascii
-@itemize @bullet
-@item @code{@value{RPREFIX}PREEMPT} is masked by
-@code{@value{RPREFIX}PREEMPT_MASK} and enables preemption
-
-@item @code{@value{RPREFIX}NO_PREEMPT} is masked by
-@code{@value{RPREFIX}PREEMPT_MASK} and disables preemption
-
-@item @code{@value{RPREFIX}NO_TIMESLICE} is masked by
-@code{@value{RPREFIX}TIMESLICE_MASK} and disables timeslicing
-
-@item @code{@value{RPREFIX}TIMESLICE} is masked by
-@code{@value{RPREFIX}TIMESLICE_MASK} and enables timeslicing
-
-@item @code{@value{RPREFIX}ASR} is masked by
-@code{@value{RPREFIX}ASR_MASK} and enables ASR processing
-
-@item @code{@value{RPREFIX}NO_ASR} is masked by
-@code{@value{RPREFIX}ASR_MASK} and disables ASR processing
-
-@item @code{@value{RPREFIX}INTERRUPT_LEVEL(0)} is masked by
-@code{@value{RPREFIX}INTERRUPT_MASK} and enables all interrupts
-
-@item @code{@value{RPREFIX}INTERRUPT_LEVEL(n)} is masked by
-@code{@value{RPREFIX}INTERRUPT_MASK} and sets interrupts level n
- 
-@end itemize
-@end ifset
- 
-@ifset use-tex
-@sp 1
-@c this is temporary
-@itemize @bullet
-@item @code{@value{RPREFIX}PREEMPT} is masked by
-@code{@value{RPREFIX}PREEMPT_MASK} and enables preemption
-
-@item @code{@value{RPREFIX}NO_PREEMPT} is masked by
-@code{@value{RPREFIX}PREEMPT_MASK} and disables preemption
-
-@item @code{@value{RPREFIX}NO_TIMESLICE} is masked by
-@code{@value{RPREFIX}TIMESLICE_MASK} and disables timeslicing
-
-@item @code{@value{RPREFIX}TIMESLICE} is masked by
-@code{@value{RPREFIX}TIMESLICE_MASK} and enables timeslicing
-
-@item @code{@value{RPREFIX}ASR} is masked by
-@code{@value{RPREFIX}ASR_MASK} and enables ASR processing
-
-@item @code{@value{RPREFIX}NO_ASR} is masked by
-@code{@value{RPREFIX}ASR_MASK} and disables ASR processing
-
-@item @code{@value{RPREFIX}INTERRUPT_LEVEL(0)} is masked by
-@code{@value{RPREFIX}INTERRUPT_MASK} and enables all interrupts
-
-@item @code{@value{RPREFIX}INTERRUPT_LEVEL(n)} is masked by
-@code{@value{RPREFIX}INTERRUPT_MASK} and sets interrupts level n
- 
-@end itemize
- 
-@tex
-@end tex
-@end ifset
- 
-@ifset use-html
-@html
-<CENTER>
-  <TABLE COLS=3 WIDTH="80%" BORDER=2>
-<TR><TD ALIGN=center><STRONG>Mode Constant</STRONG></TD>
-    <TD ALIGN=center><STRONG>Mask Constant</STRONG></TD>
-    <TD ALIGN=center><STRONG>Description</STRONG></TD></TR>
-<TR><TD ALIGN=center>@value{RPREFIX}PREEMPT</TD>
-    <TD ALIGN=center>@value{RPREFIX}PREEMPT_MASK</TD>
-    <TD ALIGN=center>enables preemption</TD></TR>
-<TR><TD ALIGN=center>@value{RPREFIX}NO_PREEMPT</TD>
-    <TD ALIGN=center>@value{RPREFIX}PREEMPT_MASK</TD>
-    <TD ALIGN=center>disables preemption</TD></TR>
-<TR><TD ALIGN=center>@value{RPREFIX}NO_TIMESLICE</TD>
-    <TD ALIGN=center>@value{RPREFIX}TIMESLICE_MASK</TD>
-    <TD ALIGN=center>disables timeslicing</TD></TR>
-<TR><TD ALIGN=center>@value{RPREFIX}TIMESLICE</TD>
-    <TD ALIGN=center>@value{RPREFIX}TIMESLICE_MASK</TD>
-    <TD ALIGN=center>enables timeslicing</TD></TR>
-<TR><TD ALIGN=center>@value{RPREFIX}ASR</TD>
-    <TD ALIGN=center>@value{RPREFIX}ASR_MASK</TD>
-    <TD ALIGN=center>enables ASR processing</TD></TR>
-<TR><TD ALIGN=center>@value{RPREFIX}NO_ASR</TD>
-    <TD ALIGN=center>@value{RPREFIX}ASR_MASK</TD>
-    <TD ALIGN=center>disables ASR processing</TD></TR>
-<TR><TD ALIGN=center>@value{RPREFIX}INTERRUPT_LEVEL(0)</TD>
-    <TD ALIGN=center>@value{RPREFIX}INTERRUPT_MASK</TD>
-    <TD ALIGN=center>enables all interrupts</TD></TR>
-<TR><TD ALIGN=center>@value{RPREFIX}INTERRUPT_LEVEL(n)</TD>
-    <TD ALIGN=center>@value{RPREFIX}INTERRUPT_MASK</TD>
-    <TD ALIGN=center>sets interrupts level n</TD></TR>
-  </TABLE>
-</CENTER>
-@end html
-@end ifset
-
-@page
-
-@subsection TASK_GET_NOTE - Get task notepad entry
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_task_get_note
-@example
-rtems_status_code rtems_task_get_note(
-  rtems_id          id,
-  rtems_unsigned32  notepad,
-  rtems_unsigned32 *note
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure Task_Get_Note (
-   ID      : in     RTEMS.ID;
-   Notepad : in     RTEMS.Notepad_Index;
-   Note    :    out RTEMS.Unsigned32;
-   Result  :    out RTEMS.Status_Codes
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-@code{@value{RPREFIX}SUCCESSFUL} - note obtained successfully@*
-@code{@value{RPREFIX}INVALID_ID} - invalid task id@*
-@code{@value{RPREFIX}INVALID_NUMBER} - invalid notepad location
-
-@subheading DESCRIPTION:
-This directive returns the note contained in the notepad
-location of the task specified by id.
-
-@subheading NOTES:
-This directive will not cause the running task to be preempted.
-
-If id is set to @code{@value{RPREFIX}SELF},
-the calling task accesses its own notepad.
-
-@c This version of the paragraph avoids the overfull hbox error.
-@c The constants NOTEPAD_0 through NOTEPAD_15 can be used to access the
-@c sixteen notepad locations.
-
-The sixteen notepad locations can be accessed using the constants
-@code{@value{RPREFIX}NOTEPAD_0} through @code{@value{RPREFIX}NOTEPAD_15}.
-
-Getting a note of a global task which does not reside on the
-local node will generate a request to the remote node to obtain
-the notepad entry of the specified task.
-
-@page
-
-@subsection TASK_SET_NOTE - Set task notepad entry
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_task_set_note
-@example
-rtems_status_code rtems_task_set_note(
-  rtems_id         id,
-  rtems_unsigned32 notepad,
-  rtems_unsigned32 note
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure Task_Set_Note (
-   ID      : in     RTEMS.ID;
-   Notepad : in     RTEMS.Notepad_Index;
-   Note    : in     RTEMS.Unsigned32;
-   Result  :    out RTEMS.Status_Codes
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-@code{@value{RPREFIX}SUCCESSFUL} - task's note set successfully@*
-@code{@value{RPREFIX}INVALID_ID} - invalid task id@*
-@code{@value{RPREFIX}INVALID_NUMBER} - invalid notepad location
-
-@subheading DESCRIPTION:
-This directive sets the notepad entry for the task specified by
-id to the value note.
-
-@subheading NOTES:
-If id is set to @code{@value{RPREFIX}SELF}, the calling
-task accesses its own notepad locations.
-
-This directive will not cause the running task to be preempted.
-
-@c This version of the paragraph avoids the overfull hbox error.
-@c The constants NOTEPAD_0 through NOTEPAD_15 can be used to access the
-@c sixteen notepad locations.
-
-The sixteen notepad locations can be accessed using the constants
-@code{@value{RPREFIX}NOTEPAD_0} through @code{@value{RPREFIX}NOTEPAD_15}.
-
-Setting a notepad location of a global task which does not
-reside on the local node will generate a request to the remote
-node to set the specified notepad entry.
-
-@page
-
-@subsection TASK_WAKE_AFTER - Wake up after interval
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_task_wake_after
-@example
-rtems_status_code rtems_task_wake_after(
-  rtems_interval ticks
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure Task_Wake_After (
-   Ticks  : in     RTEMS.Interval;
-   Result :    out RTEMS.Status_Codes
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-@code{@value{RPREFIX}SUCCESSFUL} - always successful
-
-@subheading DESCRIPTION:
-This directive blocks the calling task for the specified number
-of system clock ticks.  When the requested interval has elapsed,
-the task is made ready.  The @code{@value{DIRPREFIX}clock_tick}
-directive automatically updates the delay period.
-
-@subheading NOTES:
-Setting the system date and time with the
-@code{@value{DIRPREFIX}clock_set} directive
-has no effect on a @code{@value{DIRPREFIX}task_wake_after} blocked task.
-
-A task may give up the processor and remain in the ready state
-by specifying a value of @code{@value{RPREFIX}YIELD_PROCESSOR} in ticks.
-
-The maximum timer interval that can be specified is the maximum
-value which can be represented by the rtems_unsigned32 type.
-
-A clock tick is required to support the functionality of this directive.
-
-@page
-
-@subsection TASK_WAKE_WHEN - Wake up when specified
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_task_wake_when
-@example
-rtems_status_code rtems_task_wake_when(
-  rtems_time_of_day *time_buffer
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure Task_Wake_When (
-   Time_Buffer : in     RTEMS.Time_Of_Day;
-   Result      :    out RTEMS.Status_Codes
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-@code{@value{RPREFIX}SUCCESSFUL} - awakened at date/time successfully@*
-@code{INVALID_TIME_OF_DAY} - invalid time buffer@*
-@code{@value{RPREFIX}NOT_DEFINED} - system date and time is not set
-
-@subheading DESCRIPTION:
-This directive blocks a task until the date and time specified
-in time_buffer.  At the requested date and time, the calling
-task will be unblocked and made ready to execute.
-
-@subheading NOTES:
-The ticks portion of time_buffer @value{STRUCTURE} is ignored.  The
-timing granularity of this directive is a second.
-
-A clock tick is required to support the functionality of this directive.
diff --git a/doc/user/timer.t b/doc/user/timer.t
deleted file mode 100644
index a962512925..0000000000
--- a/doc/user/timer.t
+++ /dev/null
@@ -1,467 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter Timer Manager
-
-@section Introduction
-
-The timer manager provides support for timer
-facilities.  The directives provided by the timer manager are:
-
-@itemize @bullet
-@item @code{@value{DIRPREFIX}timer_create} - Create a timer
-@item @code{@value{DIRPREFIX}timer_ident} - Get ID of a timer
-@item @code{@value{DIRPREFIX}timer_cancel} - Cancel a timer
-@item @code{@value{DIRPREFIX}timer_delete} - Delete a timer
-@item @code{@value{DIRPREFIX}timer_fire_after} - Fire timer after interval
-@item @code{@value{DIRPREFIX}timer_fire_when} - Fire timer when specified
-@item @code{@value{DIRPREFIX}timer_reset} - Reset an interval timer
-@end itemize
-
-
-@section Background
-
-@subsection Required Support
-
-A clock tick is required to support the functionality provided by this manager.
-
-@subsection Timers
-
-A timer is an RTEMS object which allows the
-application to schedule operations to occur at specific times in
-the future.  User supplied timer service routines are invoked by
-the @code{@value{DIRPREFIX}clock_tick} directive
-when the timer fires.  Timer service routines may perform
-any operations or directives which normally
-would be performed by the application code which invoked the
-@code{@value{DIRPREFIX}clock_tick} directive.
-
-The timer can be used to implement watchdog routines
-which only fire to denote that an application error has
-occurred.  The timer is reset at specific points in the
-application to insure that the watchdog does not fire.  Thus, if
-the application does not reset the watchdog timer, then the
-timer service routine will fire to indicate that the application
-has failed to reach a reset point.  This use of a timer is
-sometimes referred to as a "keep alive" or a "deadman" timer.
-
-@subsection Timer Service Routines
-
-The timer service routine should adhere to @value{LANGUAGE} calling
-conventions and have a prototype similar to the following:
-
-@ifset is-C
-@example
-rtems_timer_service_routine user_routine(
-  rtems_id   timer_id,
-  void      *user_data
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure User_Routine(
-  Timer_ID  : in     RTEMS.ID;
-  User_Data : in     System.Address
-);
-@end example
-@end ifset
-
-Where the timer_id parameter is the RTEMS object ID
-of the timer which is being fired and user_data is a pointer to
-user-defined information which may be utilized by the timer
-service routine.  The argument user_data may be NULL.
-
-@section Operations
-
-@subsection Creating a Timer
-
-The @code{@value{DIRPREFIX}timer_create} directive creates a timer by
-allocating a Timer Control Block (TMCB), assigning the timer a
-user-specified name, and assigning it a timer ID.  Newly created
-timers do not have a timer service routine associated with them
-and are not active.
-
-@subsection Obtaining Timer IDs
-
-When a timer is created, RTEMS generates a unique
-timer ID and assigns it to the created timer until it is
-deleted.  The timer ID may be obtained by either of two methods.
-First, as the result of an invocation of the
-@code{@value{DIRPREFIX}timer_create}
-directive, the timer ID is stored in a user provided location.
-Second, the timer ID may be obtained later using the
-@code{@value{DIRPREFIX}timer_ident} directive.  The timer ID
-is used by other directives to manipulate this timer.
-
-@subsection Initiating an Interval Timer
-
-The @code{@value{DIRPREFIX}timer_fire_after} directive initiates a timer to
-fire a user provided timer service routine after the specified
-number of clock ticks have elapsed.  When the interval has
-elapsed, the timer service routine will be invoked from the
-@code{@value{DIRPREFIX}clock_tick} directive.
-
-@subsection Initiating a Time of Day Timer
-
-The @code{@value{DIRPREFIX}timer_fire_when} directive initiates a timer to
-fire a user provided timer service routine when the specified
-time of day has been reached.  When the interval has elapsed,
-the timer service routine will be invoked from the
-@code{@value{DIRPREFIX}clock_tick} directive.
-
-@subsection Canceling a Timer
-
-The @code{@value{DIRPREFIX}timer_cancel} directive is used to halt the
-specified timer.  Once canceled, the timer service routine will
-not fire unless the timer is reinitiated.  The timer can be
-reinitiated using the @code{@value{DIRPREFIX}timer_reset},
-@code{@value{DIRPREFIX}timer_fire_after}, and
-@code{@value{DIRPREFIX}timer_fire_when} directives.
-
-@subsection Resetting a Timer
-
-The @code{@value{DIRPREFIX}timer_reset} directive is used to restore an
-interval timer initiated by a previous invocation of
-@code{@value{DIRPREFIX}timer_fire_after} to
-its original interval length.  If the
-timer has not been used or the last usage of this timer
-was by a @code{@value{DIRPREFIX}timer_fire_when} directive, then an error is
-returned.  The timer service routine is not changed or
-fired by this directive.
-
-@subsection Deleting a Timer
-
-The @code{@value{DIRPREFIX}timer_delete} directive is used to delete a timer.
-If the timer is running and has not expired, the timer is
-automatically canceled.  The timer's control block is returned
-to the TMCB free list when it is deleted.  A timer can be
-deleted by a task other than the task which created the timer.
-Any subsequent references to the timer's name and ID are invalid.
-
-@section Directives
-
-This section details the timer manager's directives.
-A subsection is dedicated to each of this manager's directives
-and describes the calling sequence, related constants, usage,
-and status codes.
-
-@page
-@subsection TIMER_CREATE - Create a timer
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_timer_create
-@example
-rtems_status_code rtems_timer_create(
-  rtems_name  name,
-  rtems_id   *id
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure Timer_Create (
-   Name   : in     RTEMS.Name;
-   ID     :    out RTEMS.ID;
-   Result :    out RTEMS.Status_Codes
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-@code{@value{RPREFIX}SUCCESSFUL} - timer created successfully@*
-@code{@value{RPREFIX}INVALID_NAME} - invalid timer name@*
-@code{@value{RPREFIX}TOO_MANY} - too many timers created
-
-@subheading DESCRIPTION:
-
-This directive creates a timer.  The assigned timer
-id is returned in id.  This id is used to access the timer with
-other timer manager directives.  For control and maintenance of
-the timer, RTEMS allocates a TMCB from the local TMCB free pool
-and initializes it.
-
-@subheading NOTES:
-
-This directive will not cause the calling task to be
-preempted.
-
-@page
-@subsection TIMER_IDENT - Get ID of a timer
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_timer_ident
-@example
-rtems_status_code rtems_timer_ident(
-  rtems_name  name,
-  rtems_id   *id
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure Timer_Ident (
-   Name   : in     RTEMS.Name;
-   ID     :    out RTEMS.ID;
-   Result :    out RTEMS.Status_Codes
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-@code{@value{RPREFIX}SUCCESSFUL} - timer identified successfully@*
-@code{@value{RPREFIX}INVALID_NAME} - timer name not found
-
-@subheading DESCRIPTION:
-
-This directive obtains the timer id associated with
-the timer name to be acquired.  If the timer name is not unique,
-then the timer id will match one of the timers with that name.
-However, this timer id is not guaranteed to correspond to the
-desired timer.  The timer id is used to access this timer in
-other timer related directives.
-
-@subheading NOTES:
-
-This directive will not cause the running task to be
-preempted.
-
-@page
-@subsection TIMER_CANCEL - Cancel a timer
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_timer_cancel
-@example
-rtems_status_code rtems_timer_cancel(
-  rtems_id id
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure Timer_Cancel (
-   ID     : in     RTEMS.ID;
-   Result :    out RTEMS.Status_Codes
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-@code{@value{RPREFIX}SUCCESSFUL} - timer canceled successfully@*
-@code{@value{RPREFIX}INVALID_ID} - invalid timer id
-
-@subheading DESCRIPTION:
-
-This directive cancels the timer id.  This timer will
-be reinitiated by the next invocation of @code{@value{DIRPREFIX}timer_reset},
-@code{@value{DIRPREFIX}timer_fire_after}, or
-@code{@value{DIRPREFIX}timer_fire_when} with id.
-
-@subheading NOTES:
-
-This directive will not cause the running task to be preempted.
-
-@page
-@subsection TIMER_DELETE - Delete a timer
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_timer_delete
-@example
-rtems_status_code rtems_timer_delete(
-  rtems_id id
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure Timer_Delete (
-   ID     : in     RTEMS.ID;
-   Result :    out RTEMS.Status_Codes
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-@code{@value{RPREFIX}SUCCESSFUL} - timer deleted successfully@*
-@code{@value{RPREFIX}INVALID_ID} - invalid timer id
-
-@subheading DESCRIPTION:
-
-This directive deletes the timer specified by id.  If
-the timer is running, it is automatically canceled.  The TMCB
-for the deleted timer is reclaimed by RTEMS.
-
-@subheading NOTES:
-
-This directive will not cause the running task to be
-preempted.
-
-A timer can be deleted by a task other than the task
-which created the timer.
-
-@page
-@subsection TIMER_FIRE_AFTER - Fire timer after interval
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_timer_fire_after
-@example
-rtems_status_code rtems_timer_fire_after(
-  rtems_id                           id,
-  rtems_interval                     ticks,
-  rtems_timer_service_routine_entry  routine,
-  void                              *user_data
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure Timer_Fire_After (
-   ID        : in     RTEMS.ID;
-   Ticks     : in     RTEMS.Interval;
-   Routine   : in     RTEMS.Timer_Service_Routine;
-   User_Data : in     RTEMS.Address;
-   Result    :    out RTEMS.Status_Codes
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-@code{@value{RPREFIX}SUCCESSFUL} - timer initiated successfully@*
-@code{@value{RPREFIX}INVALID_ID} - invalid timer id@*
-@code{@value{RPREFIX}INVALID_NUMBER} - invalid interval
-
-@subheading DESCRIPTION:
-
-This directive initiates the timer specified by id.
-If the timer is running, it is automatically canceled before
-being initiated.  The timer is scheduled to fire after an
-interval ticks clock ticks has passed.  When the timer fires,
-the timer service routine routine will be invoked with the
-argument user_data.
-
-@subheading NOTES:
-
-This directive will not cause the running task to be
-preempted.
-
-@page
-@subsection TIMER_FIRE_WHEN - Fire timer when specified
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_timer_fire_when
-@example
-rtems_status_code rtems_timer_fire_when(
-  rtems_id                           id,
-  rtems_time_of_day                 *wall_time,
-  rtems_timer_service_routine_entry  routine,
-  void                              *user_data
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure Timer_Fire_When (
-   ID        : in     RTEMS.ID;
-   Wall_Time : in     RTEMS.Time_Of_Day;
-   Routine   : in     RTEMS.Timer_Service_Routine;
-   User_Data : in     RTEMS.Address;
-   Result    :    out RTEMS.Status_Codes
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-@code{@value{RPREFIX}SUCCESSFUL} - timer initiated successfully@*
-@code{@value{RPREFIX}INVALID_ID} - invalid timer id@*
-@code{@value{RPREFIX}NOT_DEFINED} - system date and time is not set@*
-@code{@value{RPREFIX}INVALID_CLOCK} - invalid time of day
-
-@subheading DESCRIPTION:
-
-This directive initiates the timer specified by id.
-If the timer is running, it is automatically canceled before
-being initiated.  The timer is scheduled to fire at the time of
-day specified by wall_time.  When the timer fires, the timer
-service routine routine will be invoked with the argument
-user_data.
-
-@subheading NOTES:
-
-This directive will not cause the running task to be
-preempted.
-
-@page
-@subsection TIMER_RESET - Reset an interval timer
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_timer_reset
-@example
-rtems_status_code rtems_timer_reset(
-  rtems_id   id
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure Timer_Reset (
-   ID     : in     RTEMS.ID;
-   Result :    out RTEMS.Status_Codes
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-@code{@value{RPREFIX}SUCCESSFUL} - timer reset successfully@*
-@code{@value{RPREFIX}INVALID_ID} - invalid timer id@*
-@code{@value{RPREFIX}NOT_DEFINED} - attempted to reset a when or newly created timer
-
-@subheading DESCRIPTION:
-
-This directive resets the timer associated with id.
-This timer must have been previously initiated with a
-@code{@value{DIRPREFIX}timer_fire_after}
-directive.  If active the timer is canceled,
-after which the timer is reinitiated using the same interval and
-timer service routine which the original
-@code{@value{DIRPREFIX}timer_fire_after}
-directive used.
-
-@subheading NOTES:
-
-If the timer has not been used or the last usage of this timer
-was by a @code{@value{DIRPREFIX}timer_fire_when}
-directive, then the @code{@value{RPREFIX}NOT_DEFINED} error is
-returned. 
-
-Restarting a cancelled after timer results in the timer being 
-reinitiated with its previous timer service routine and interval.
-
-This directive will not cause the running task to be preempted.
-
diff --git a/doc/user/userext.t b/doc/user/userext.t
deleted file mode 100644
index b73799a7ba..0000000000
--- a/doc/user/userext.t
+++ /dev/null
@@ -1,696 +0,0 @@
-@c
-@c  COPYRIGHT (c) 1988-1998.
-@c  On-Line Applications Research Corporation (OAR).
-@c  All rights reserved.
-@c
-@c  $Id$
-@c
-
-@chapter User Extensions Manager
-
-@section Introduction
-
-The RTEMS User Extensions Manager allows the
-application developer to augment the executive by allowing them
-to supply extension routines which are invoked at critical
-system events.  The directives provided by the user extensions
-manager are:
-
-@itemize @bullet
-@item @code{@value{DIRPREFIX}extension_create} - Create an extension set
-@item @code{@value{DIRPREFIX}extension_ident} - Get ID of an extension set
-@item @code{@value{DIRPREFIX}extension_delete} - Delete an extension set
-@end itemize
-
-@section Background
-
-User extension routines are invoked when the
-following system events occur:
-
-@itemize @bullet
-@item Task creation
-@item Task initiation
-@item Task reinitiation
-@item Task deletion
-@item Task context switch
-@item Post task context switch
-@item Task begin
-@item Task exits
-@item Fatal error detection
-@end itemize
-
-These extensions are invoked as a function with
-arguments that are appropriate to the system event.
-
-@subsection Extension Sets
-
-An extension set is defined as a set of routines
-which are invoked at each of the critical system events at which
-user extension routines are invoked.  Together a set of these
-routines typically perform a specific functionality such as
-performance monitoring or debugger support.  RTEMS is informed of
-the entry points which constitute an extension set via the
-following @value{STRUCTURE}:
-
-@ifset is-C
-@example
-@group
-typedef struct @{
-  User_extensions_thread_create_extension      thread_create;
-  User_extensions_thread_start_extension       thread_start;
-  User_extensions_thread_restart_extension     thread_restart;
-  User_extensions_thread_delete_extension      thread_delete;
-  User_extensions_thread_switch_extension      thread_switch;
-  User_extensions_thread_post_switch_extension thread_post_switch;
-  User_extensions_thread_begin_extension       thread_begin;
-  User_extensions_thread_exitted_extension     thread_exitted;
-  User_extensions_fatal_error_extension        fatal;
-@} User_extensions_Table;
-@end group
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-type Extensions_Table is
-   record
-      Task_Create      : RTEMS.Task_Create_Extension;
-      Task_Start       : RTEMS.Task_Start_Extension;
-      Task_Restart     : RTEMS.Task_Restart_Extension;
-      Task_Delete      : RTEMS.Task_Delete_Extension;
-      Task_Switch      : RTEMS.Task_Switch_Extension;
-      Task_Post_Switch : RTEMS.Task_Post_Switch_Extension;
-      Task_Begin       : RTEMS.Task_Begin_Extension;
-      Task_Exitted     : RTEMS.Task_Exitted_Extension;
-      Fatal            : RTEMS.Fatal_Error_Extension;
-   end record;
-@end example
-@end ifset
-
-
-RTEMS allows the user to have multiple extension sets
-active at the same time.  First, a single static extension set
-may be defined as the application's User Extension Table which
-is included as part of the Configuration Table.  This extension
-set is active for the entire life of the system and may not be
-deleted.  This extension set is especially important because it
-is the only way the application can provided a FATAL error
-extension which is invoked if RTEMS fails during the
-initialize_executive directive.  The static extension set is
-optional and may be configured as NULL if no static extension
-set is required.
-
-Second, the user can install dynamic extensions using
-the @code{@value{DIRPREFIX}extension_create}
-directive.  These extensions are RTEMS
-objects in that they have a name, an ID, and can be dynamically
-created and deleted.  In contrast to the static extension set,
-these extensions can only be created and installed after the
-initialize_executive directive successfully completes execution.
-Dynamic extensions are useful for encapsulating the
-functionality of an extension set.  For example, the application
-could use extensions to manage a special coprocessor, do
-performance monitoring, and to do stack bounds checking.  Each
-of these extension sets could be written and installed
-independently of the others.
-
-All user extensions are optional and RTEMS places no
-naming  restrictions on the user.
-
-@subsection TCB Extension Area
-
-RTEMS provides for a pointer to a user-defined data
-area for each extension set to be linked to each task's control
-block.  This set of pointers is an extension of the TCB and can
-be used to store additional data required by the user's
-extension functions.  It is also possible for a user extension
-to utilize the notepad locations associated with each task
-although this may conflict with application usage of those
-particular notepads.
-
-The TCB extension is an array of pointers in the TCB.
-The number of pointers in the area is the same as the number of
-user extension sets configured.  This allows an application to
-augment the TCB with user-defined information.  For example, an
-application could implement task profiling by storing timing
-statistics in the TCB's extended memory area.  When a task
-context switch is being executed, the TASK_SWITCH extension
-could read a real-time clock to calculate how long the task
-being swapped out has run as well as timestamp the starting time
-for the task being swapped in.
-
-If used, the extended memory area for the TCB should
-be allocated and the TCB extension pointer should be set at the
-time the task is created or started by either the TASK_CREATE or
-TASK_START extension.  The application is responsible for
-managing this extended memory area for the TCBs.  The memory may
-be reinitialized by the TASK_RESTART extension and should be
-deallocated by the TASK_DELETE extension when the task is
-deleted.  Since the TCB extension buffers would most likely be
-of a fixed size, the RTEMS partition manager could be used to
-manage the application's extended memory area.  The application
-could create a partition of fixed size TCB extension buffers and
-use the partition manager's allocation and deallocation
-directives to obtain and release the extension buffers.
-
-@subsection Extensions
-
-The sections that follow will contain a description
-of each extension.  Each section will contain a prototype of a
-function with the appropriate calling sequence for the
-corresponding extension.  The names given for the @value{LANGUAGE} 
-@value{ROUTINE} and
-its arguments are all defined by the user.  The names used in
-the examples were arbitrarily chosen and impose no naming
-conventions on the user.
-
-@subsection TASK_CREATE Extension
-
-The TASK_CREATE extension directly corresponds to the
-task_create directive.  If this extension is defined in any
-static or dynamic extension set and a task is being created,
-then the extension routine will automatically be invoked by
-RTEMS.  The extension should have a prototype similar to the
-following:
-
-@ifset is-C
-@example
-rtems_extension user_task_create(
-  rtems_tcb *current_task,
-  rtems_tcb *new_task
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure User_Task_Create (
-   Current_Task : in     RTEMS.TCB_Pointer;
-   New_Task     : in     RTEMS.TCB_Pointer
-);
-@end example
-@end ifset
-
-where current_task can be used to access the TCB for
-the currently executing task, and new_task can be used to access
-the TCB for the new task being created.  This extension is
-invoked from the task_create directive after new_task has been
-completely initialized, but before it is placed on a ready TCB
-chain.
-
-@subsection TASK_START Extension
-
-The TASK_START extension directly corresponds to the
-task_start directive.  If this extension is defined in any
-static or dynamic extension set and a task is being started,
-then the extension routine will automatically be invoked by
-RTEMS.  The extension should have a prototype similar to the
-following:
-
-@ifset is-C
-@example
-rtems_extension user_task_start(
-  rtems_tcb *current_task,
-  rtems_tcb *started_task
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure User_Task_Start (
-   Current_Task : in     RTEMS.TCB_Pointer;
-   Started_Task : in     RTEMS.TCB_Pointer
-);
-@end example
-@end ifset
-
-where current_task can be used to access the TCB for
-the currently executing task, and started_task can be used to
-access the TCB for the dormant task being started. This
-extension is invoked from the task_start directive after
-started_task has been made ready to start execution, but before
-it is placed on a ready TCB chain.
-
-@subsection TASK_RESTART Extension
-
-The TASK_RESTART extension directly corresponds to
-the task_restart directive.  If this extension is defined in any
-static or dynamic extension set and a task is being restarted,
-then the extension should have a prototype similar to the
-following:
-
-@ifset is-C
-@example
-rtems_extension user_task_restart(
-  rtems_tcb *current_task,
-  rtems_tcb *restarted_task
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure User_Task_Restart (
-   Current_Task   : in     RTEMS.TCB_Pointer;
-   Restarted_Task : in     RTEMS.TCB_Pointer
-);
-@end example
-@end ifset
-
-where current_task can be used to access the TCB for
-the currently executing task, and restarted_task can be used to
-access the TCB for the task being restarted. This extension is
-invoked from the task_restart directive after restarted_task has
-been made ready to start execution, but before it is placed on a
-ready TCB chain.
-
-@subsection TASK_DELETE Extension
-
-The TASK_DELETE extension is associated with the
-task_delete directive.  If this extension is defined in any
-static or dynamic extension set and a task is being deleted,
-then the extension routine will automatically be invoked by
-RTEMS.  The extension should have a prototype similar to the
-following:
-
-@ifset is-C
-@example
-rtems_extension user_task_delete(
-  rtems_tcb *current_task,
-  rtems_tcb *deleted_task
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure User_Task_Delete (
-   Current_Task : in     RTEMS.TCB_Pointer;
-   Deleted_Task : in     RTEMS.TCB_Pointer
-);
-@end example
-@end ifset
-
-where current_task can be used to access the TCB for
-the currently executing task, and deleted_task can be used to
-access the TCB for the task being deleted. This extension is
-invoked from the task_delete directive after the TCB has been
-removed from a ready TCB chain, but before all its resources
-including the TCB have been returned to their respective free
-pools.  This extension should not call any RTEMS directives if a
-task is deleting itself (current_task is equal to deleted_task).
-
-@subsection TASK_SWITCH Extension
-
-The TASK_SWITCH extension corresponds to a task
-context switch.  If this extension is defined in any static or
-dynamic extension set and a task context switch is in progress,
-then the extension routine will automatically be invoked by
-RTEMS.  The extension should have a prototype similar to the
-following:
-
-@ifset is-C
-@example
-rtems_extension user_task_switch(
-  rtems_tcb *current_task,
-  rtems_tcb *heir_task
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure User_Task_Switch (
-   Current_Task : in     RTEMS.TCB_Pointer;
-   Heir_Task    : in     RTEMS.TCB_Pointer
-);
-@end example
-@end ifset
-
-where current_task can be used to access the TCB for
-the task that is being swapped out, and heir_task can be used to
-access the TCB for the task being swapped in.  This extension is
-invoked from RTEMS' dispatcher routine after the current_task
-context has been saved, but before the heir_task context has
-been restored.  This extension should not call any RTEMS
-directives.
-
-@subsection TASK_POST_SWITCH Extension
-
-The TASK_POST_SWITCH extension corresponds to a task
-context switch.  If this extension is defined in any static or
-dynamic extension set and a raw task context switch has been
-completed, then the extension routine will automatically be
-invoked by RTEMS.  The extension should have a prototype similar
-to the following:
-
-@ifset is-C
-@example
-rtems_extension user_task_post_switch(
-  rtems_tcb *current_task
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure User_Task_Post_Switch (
-   Current_Task : in     RTEMS.TCB_Pointer
-);
-@end example
-@end ifset
-
-where current_task can be used to access the TCB for
-the task that is being swapped out, and heir_task can be used to
-access the TCB for the task being swapped in.  This extension is
-invoked from RTEMS' dispatcher routine after the current_task
-context has been restored and the extension runs in the context
-of the current_task.
-
-@subsection TASK_BEGIN Extension
-
-The TASK_BEGIN extension is invoked when a task
-begins execution.  It is invoked immediately before the body of
-the starting procedure and executes in the context in the task.
-This user extension have a prototype similar to the following:
-
-@ifset is-C
-@example
-rtems_extension user_task_begin(
-  rtems_tcb *current_task
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure User_Task_Begin (
-   Current_Task : in     RTEMS.TCB_Pointer
-);
-@end example
-@end ifset
-
-where current_task can be used to access the TCB for
-the currently executing task which has begun.  The distinction
-between the TASK_BEGIN and TASK_START extension is that the
-TASK_BEGIN extension is executed in the context of the actual
-task while the TASK_START extension is executed in the context
-of the task performing the task_start directive.  For most
-extensions, this is not a critical distinction.
-
-@subsection TASK_EXITTED Extension
-
-The TASK_EXITTED extension is invoked when a task
-exits the body of the starting procedure by either an implicit
-or explicit return statement.  This user extension have a
-prototype similar to the following:
-
-@ifset is-C
-@example
-rtems_extension user_task_exitted(
-  rtems_tcb *current_task
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure User_Task_Exitted (
-   Current_Task : in     RTEMS.TCB_Pointer
-);
-@end example
-@end ifset
-
-where current_task can be used to access the TCB for
-the currently executing task which has just exitted.
-
-Although exiting of task is often considered to be a
-fatal error, this extension allows recovery by either restarting
-or deleting the exiting task.  If the user does not wish to
-recover, then a fatal error may be reported.  If the user does
-not provide a TASK_EXITTED extension or the provided handler
-returns control to RTEMS, then the RTEMS default handler will be
-used.  This default handler invokes the directive
-fatal_error_occurred with the @code{@value{RPREFIX}TASK_EXITTED} directive status.
-
-@lowersections
-
-@subsection FATAL Error Extension
-
-The FATAL error extension is associated with the
-fatal_error_occurred directive.  If this extension is defined in
-any static or dynamic extension set and the fatal_error_occurred
-directive has been invoked, then this extension will be called.
-This extension should have a prototype similar to the following:
-
-@ifset is-C
-@example
-rtems_extension user_fatal_error(
-  Internal_errors_Source  the_source,
-  rtems_boolean           is_internal,
-  rtems_unsigned32        the_error
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure User_Fatal_Error (
-   Error : in     RTEMS.Unsigned32
-);
-@end example
-@end ifset
-
-where the_error is the error code passed to the
-fatal_error_occurred directive. This extension is invoked from
-the fatal_error_occurred directive.
-
-If defined, the user's FATAL error extension is
-invoked before RTEMS' default fatal error routine is invoked and
-the processor is stopped.  For example, this extension could be
-used to pass control to a debugger when a fatal error occurs.
-This extension should not call any RTEMS directives.
-
-@raisesections
-
-@subsection Order of Invocation
-
-When one of the critical system events occur, the
-user extensions are invoked in either "forward" or "reverse"
-order.  Forward order indicates that the static extension set is
-invoked followed by the dynamic extension sets in the order in
-which they were created.  Reverse order means that the dynamic
-extension sets are invoked in the opposite of the order in which
-they were created followed by the static extension set.  By
-invoking the extension sets in this order, extensions can be
-built upon one another.  At the following system events, the
-extensions are invoked in forward order:
-
-@itemize @bullet
-@item Task creation
-@item Task initiation
-@item Task reinitiation
-@item Task deletion
-@item Task context switch
-@item Post task context switch
-@item Task begins to execute
-@end itemize
-
-
-At the following system events, the extensions are
-invoked in reverse order:
-
-@itemize @bullet
-@item Task deletion
-@item Fatal error detection
-@end itemize
-
-At these system events, the extensions are invoked in
-reverse order to insure that if an extension set is built upon
-another, the more complicated extension is invoked before the
-extension set it is built upon.  For example, by invoking the
-static extension set last it is known that the "system" fatal
-error extension will be the last fatal error extension executed.
-Another example is use of the task delete extension by the
-Standard C Library.  Extension sets which are installed after
-the Standard C Library will operate correctly even if they
-utilize the C Library because the C Library's TASK_DELETE
-extension is invoked after that of the other extensions.
-
-@section Operations
-
-@subsection Creating an Extension Set
-
-The @code{@value{DIRPREFIX}extension_create} directive creates and installs
-an extension set by allocating a Extension Set Control Block
-(ESCB), assigning the extension set a user-specified name, and
-assigning it an extension set ID.  Newly created extension sets
-are immediately installed and are invoked upon the next system
-even supporting an extension.
-
-@subsection Obtaining Extension Set IDs
-
-When an extension set is created, RTEMS generates a
-unique extension set ID and assigns it to the created extension
-set until it is deleted.  The extension ID may be obtained by
-either of two methods.  First, as the result of an invocation of
-the @code{@value{DIRPREFIX}extension_create}
-directive, the extension set ID is stored
-in a user provided location.  Second, the extension set ID may
-be obtained later using the @code{@value{DIRPREFIX}extension_ident}
-directive.  The extension set ID is used by other directives
-to manipulate this extension set.
-
-@subsection Deleting an Extension Set
-
-The @code{@value{DIRPREFIX}extension_delete} directive is used to delete an
-extension set.  The extension set's control block is returned to
-the ESCB free list when it is deleted.  An extension set can be
-deleted by a task other than the task which created the
-extension set.  Any subsequent references to the extension's
-name and ID are invalid.
-
-@section Directives
-
-This section details the user extension manager's
-directives.  A subsection is dedicated to each of this manager's
-directives and describes the calling sequence, related
-constants, usage, and status codes.
-
-@page
-@subsection EXTENSION_CREATE - Create a extension set
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_extension_create
-@example
-rtems_status_code rtems_extension_create(
-  rtems_name              name,
-  rtems_extensions_table *table,
-  rtems_id               *id
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure Extension_Create (
-   Name   : in     RTEMS.Name;
-   Table  : in     RTEMS.Extensions_Table_Pointer;
-   ID     :    out RTEMS.ID;
-   Result :    out RTEMS.Status_Codes
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-@code{@value{RPREFIX}SUCCESSFUL} -  extension set created successfully@*
-@code{@value{RPREFIX}INVALID_NAME} - invalid extension set name@*
-@code{@value{RPREFIX}TOO_MANY} - too many extension sets created
-
-@subheading DESCRIPTION:
-
-This directive creates a extension set.  The assigned
-extension set id is returned in id.  This id is used to access
-the extension set with other user extension manager directives.
-For control and maintenance of the extension set, RTEMS
-allocates an ESCB from the local ESCB free pool and initializes
-it.
-
-@subheading NOTES:
-
-This directive will not cause the calling task to be
-preempted.
-
-@page
-@subsection EXTENSION_IDENT - Get ID of a extension set
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_extension_ident
-@example
-rtems_status_code rtems_extension_ident(
-  rtems_name  name,
-  rtems_id   *id
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure Extension_Ident (
-   Name   : in     RTEMS.Name;
-   ID     :    out RTEMS.ID;
-   Result :    out RTEMS.Status_Codes
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-@code{@value{RPREFIX}SUCCESSFUL} -  extension set identified successfully@*
-@code{@value{RPREFIX}INVALID_NAME} - extension set name not found
-
-@subheading DESCRIPTION:
-
-This directive obtains the extension set id
-associated with the extension set name to be acquired.  If the
-extension set name is not unique, then the extension set id will
-match one of the extension sets with that name.  However, this
-extension set id is not guaranteed to correspond to the desired
-extension set.  The extension set id is used to access this
-extension set in other extension set related directives.
-
-@subheading NOTES:
-
-This directive will not cause the running task to be
-preempted.
-
-@page
-@subsection EXTENSION_DELETE - Delete a extension set
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@c @findex rtems_extension_delete
-@example
-rtems_status_code rtems_extension_delete(
-  rtems_id id
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure Extension_Delete (
-   ID     : in     RTEMS.ID;
-   Result :    out RTEMS.Status_Codes
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-@code{@value{RPREFIX}SUCCESSFUL} -  extension set deleted successfully@*
-@code{@value{RPREFIX}INVALID_ID} - invalid extension set id
-
-@subheading DESCRIPTION:
-
-This directive deletes the extension set specified by
-id.  If the extension set is running, it is automatically
-canceled.  The ESCB for the deleted extension set is reclaimed
-by RTEMS.
-
-@subheading NOTES:
-
-This directive will not cause the running task to be
-preempted.
-
-A extension set can be deleted by a task other than
-the task which created the extension set.
-
-@subheading NOTES:
-
-This directive will not cause the running task to be
-preempted.
diff --git a/make/custom/dmv177.cfg b/make/custom/dmv177.cfg
deleted file mode 100644
index 006f81968b..0000000000
--- a/make/custom/dmv177.cfg
+++ /dev/null
@@ -1,117 +0,0 @@
-#
-#  Config file for a PowerPC 603e based DY-4 VMEbus Single Board Computer.
-#  This BSP should work with the following models:
-#
-#     + SVME-171/DMV-171
-#     + SVME-176/DMV-176
-#
-#  $Id$
-#
-
-include $(RTEMS_ROOT)/make/custom/default.cfg
-
-RTEMS_CPU=powerpc
-RTEMS_CPU_MODEL=ppc603e
-
-# This is the actual bsp directory used during the build process.
-RTEMS_BSP_FAMILY=dmv177
-
-#  This section makes the target dependent options file.
-
-#  NDEBUG (C library)
-#     if defined asserts do not generate code.  This is commonly used
-#     as a command line option.
-#
-#  RTEMS_TEST_NO_PAUSE (RTEMS tests)
-#     do not pause between screens of output in the rtems tests
-#
-#  RTEMS_DEBUG (RTEMS)
-#     If defined, debug checks in RTEMS and support library code are enabled.
-#
-#  CONSOLE_USE_POLLED     (psim_bsp)
-#  CONSOLE_USE_INTERRUPTS (psim_bsp)
-#     The psim console driver has the structure to operate in either
-#     polled or interrupt mode.  However both modes only trap to the
-#     monitor currently.
-#
-#  PPC_VECTOR_FILE_BASE (ppc)
-#     This defines the base address of the exception table.
-#     NOTE: Vectors are actually at 0xFFF00000 but file starts at offset 0x0100
-#
-#  PPC_ABI (ppc)
-#     This defines the calling convention (Application Binary Interface)
-#     used in this configuration.  EABI is the only one supported.
-#
-#  PPC_ASM (ppc)
-#     This defines the assembly language format used in this configuration.
-#     ELF is the only one supported.
-#
-#  PPC_USE_SPRG (RTEMS PowerPC port)
-#     If defined, then the PowerPC specific code in RTEMS will use some
-#     of the special purpose registers to slightly optimize interrupt
-#     response time.  The use of these registers can conflict with
-#     other tools like debuggers.
-#
-#  PPC_USE_DATA_CACHE (RTEMS PowerPC port)
-#     If defined, then the PowerPC specific code in RTEMS will use
-#     data cache instructions to optimize the context switch code.
-#     This code can conflict with debuggers or emulators.
-
-define make-target-options
-	@echo "/* #define NDEBUG 1 */ "                            >>$@
-	@echo "#define RTEMS_TEST_NO_PAUSE 1"                      >>$@
-	@echo "/* #define RTEMS_DEBUG  1 */"                       >>$@
-	@echo "#define CONSOLE_USE_INTERRUPTS 0"                   >>$@
-	@echo "#define CONSOLE_USE_POLLED ~CONSOLE_USE_INTERRUPTS" >>$@
-	@echo "#define PPC_VECTOR_FILE_BASE 0x0100"                >>$@
-	@echo "#define PPC_ABI PPC_ABI_EABI"                       >>$@
-	@echo "#define PPC_ASM PPC_ASM_ELF"                        >>$@
-	@echo "#define PPC_USE_SPRG 0"                             >>$@
-	@echo "#define PPC_USE_DATA_CACHE 0"                       >>$@
-endef
-
-#  This contains the compiler options necessary to select the CPU model
-#  and (hopefully) optimize for it. 
-#
-CPU_CFLAGS = -mcpu=603
-
-# optimize flag: typically -0, could use -O4 or -fast
-# -O4 is ok for RTEMS
-# NOTE: some level of -O may be actually required by inline assembler
-CFLAGS_OPTIMIZE_V=-O4 -fno-keep-inline-functions
-
-# Define this to yes if this target supports multiprocessor environments.
-HAS_MP=no
-
-# Define this to yes if this target supports a real-time clock.
-HAS_RTC=yes
-
-# The following is a ld command file which works without using the
-# -specs system in gcc 2.8.  IT HAS NEVER BEEN TESTED WITH THIS BSP!!!
-#       $(LD) $(XLDFLAGS) -T $(LINKCMDS) \
-#         -o $@ -u atexit -u __vectors -u download_entry $(LINK_FILES)
-#       $(LD) $(XLDFLAGS) -Ttext 0x20000 \
-#         -o $@ -u atexit -u __vectors -u download_entry $(LINK_FILES)
-
-#       $(CC) -mmvme -mrtems -nostartfiles -mcpu=603 \
-#           -o $(basename $@).exe -L $(PROJECT_RELEASE)/lib \
-#            $(START_FILE) $(LINK_OBJS) \
-#            $(LD_LIBS) \
-#           -Wl,-\( -Wl,-lc -Wl,-lrtemsall -Wl,-lgcc -Wl,-\)
-define make-exe
-	$(CC) $(CFLAGS) -o $(basename $@).nxe $(LINK_OBJS) $(LINK_LIBS)
-	$(OBJCOPY) -O srec $(basename $@).nxe $(basename $@).i
-	$(SED) -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \
-	    $(PROJECT_TOOLS)/packhex > $(basename $@).exe
-	$(NM) -g -n $(basename $@).nxe > $(basename $@).num
-	$(SIZE) $(basename $@).nxe
-	$(STRIP) $(basename $@).nxe
-endef
-
-# Miscellaneous additions go here
-
-# No start file
-START_BASE=
-
-# Let the HWAPI know which set of drivers to build
-DRIVER_ARCHITECTURE=vmebus
diff --git a/testsuites/PROBLEMS b/testsuites/PROBLEMS
deleted file mode 100644
index 6f3e2920be..0000000000
--- a/testsuites/PROBLEMS
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-#  $Id$
-#
-
-The tests were designed to operate in a very controlled environment.  If
-one uses interrupt-driven console output, then tasks will block unexpectedly 
-when a buffer filles and interrupts will perturb with the task execution order.
-
-The tmtests should only be run with all interrupt sources disabled using
-polled IO.
-
-The following is a list of reported failures from running the tests on
-a board with interrupt driven console IO.  These problems do not 
-occur when using polled IO.
-
-tm03, tm04, tm05, tm07, tm11, tm12, tm13, tm14, tm15, tm16, tm17,  
-tm19, tm22, tm23, tm24 - All hit my breakpoint at  
-_Internal_error_Occurred.
-
-tm20, tm27 - hang in middle of tests.
-tm26 - hangs at end of tests.
-
-sp02 - Gets through some tests, then attempts to execute code at  
-location 0.
-sp04 - hangs at end of tests.
-sp06 - rtems_task_restart of TA3 FAILED -- expected (0) got (4)
-sp07, sp14 - hang in middle of tests
-sp13, sp15 - terminate properly, but output at end is missing.
-sp16 - _Internal_error_Occurred.
-sp19 - rtems_clock_get FAILED -- expected (0) got (11), and hangs in  
-middle of test.
-
-cpuuse - hangs in middle of tests
-malloctest - prints nothing
-
-psx05 - Init: pthread_mutex_init - EINVAL (bad protocol)
-../../../../../../../src/rtems-981001/c/src/tests/psxtests/psx05/../../../../../
-../../src/rtems-981001/c/src/tests/psxtests/psx05/task.c:35:  
-failed assertion `status == EBUSY'
-N\: pthread_mutex_init - EINVAL (bad priority ceiling)
-
-
diff --git a/testsuites/README b/testsuites/README
deleted file mode 100644
index f799370569..0000000000
--- a/testsuites/README
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-#  $Id$
-#
-
-This is the directory under which the RTEMS
-test programs provided with the release are located.  The
-following is a description of the contents of each file and
-subdirectory directly in this directory:
-
-NOTE: Other than the 'samples' directory these tests are intended
-      only to exercise RTEMS features and are *not* good examples
-      of programming for RTEMS.
-
-    samples
-
-       This directory contains a set of simple sample applications
-       which can be used either to test a board support package
-       or as the starting point for a custom application.
-
-    mptests
-
-       This directory contains the RTEMS Multiprocessor Test Suite.
-       The tests in this directory provide near complete (98%+) test
-       coverage of the multiprocessor specific code in RTEMS.
-
-    psxtests
-
-       This directory contains the RTEMS POSIX API Test Suite.
-       The tests in this directory test the POSIX API support in RTEMS.
-
-    sptests
-
-       This directory contains the RTEMS Single Processor Test Suite.
-       The tests in this directory provide near complete (98%+) test
-       coverage of the non-multiprocessor code in RTEMS.
-
-    tmtests
-
-       This directory contains the RTEMS Timing Test Suite.
-       The tests in this directory are used to measure the execution
-       time of RTEMS directive and some critical internal functions.
-       The results of these test are reported in the Fact Sheets
-       and Supplental Manuals.
-
diff --git a/testsuites/libtests/README b/testsuites/libtests/README
deleted file mode 100644
index bc4b217832..0000000000
--- a/testsuites/libtests/README
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-#  $Id$
-#
-
-This directory contains tests for some of the items in
-the lib directories.  The intent is to be able to
-verify the basic functionality of a library.  For example,
-it is important to know that the stack checker successfully
-detects tasks which both stay within and exceed their
-stack limits.
diff --git a/testsuites/libtests/cpuuse/cpuuse.scn b/testsuites/libtests/cpuuse/cpuuse.scn
deleted file mode 100644
index f104c0c482..0000000000
--- a/testsuites/libtests/cpuuse/cpuuse.scn
+++ /dev/null
@@ -1,24 +0,0 @@
-*** TEST 4 ***
-TA1 - 09:15:00   12/31/1988
-TA1 - rtems_task_suspend - on Task 2
-TA1 - rtems_task_suspend - on Task 3
-TA1 - killing time
-TA1 - rtems_task_resume - on Task 2
-TA1 - rtems_task_resume - on Task 3
-TA2 - 09:15:03   12/31/1988
-TA3 - 09:15:04   12/31/1988
-TA1 - 09:15:05   12/31/1988
-TA2 - 09:15:06   12/31/1988
-TA3 - 09:15:07   12/31/1988
-TA1 - 09:15:08   12/31/1988
-TA1 - rtems_task_mode - change mode to NO RTEMS_PREEMPT
-TA1 - 09:15:09   12/31/1988
-TA1 - 09:15:10   12/31/1988
-TA1 - 09:15:11   12/31/1988
-TA1 - 09:15:12   12/31/1988
-TA1 - 09:15:13   12/31/1988
-TA1 - 09:15:14   12/31/1988
-TA1 - rtems_task_mode - change mode to RTEMS_PREEMPT
-TA2 - 09:15:15   12/31/1988
-TA3 - 09:15:16   12/31/1988
-*** END OF TEST 4 ***
diff --git a/testsuites/libtests/cpuuse/init.c b/testsuites/libtests/cpuuse/init.c
deleted file mode 100644
index 31e017c698..0000000000
--- a/testsuites/libtests/cpuuse/init.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/*  
- *  This is a clone of sp04 which has been modified to use the cpu monitoring
- *  library.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "system.h"
-
-rtems_extensions_table Extensions = {
-  NULL,                      /* task create user extension */
-  NULL,                      /* task start user extension */
-  NULL,                      /* task restart user extension */
-  NULL,                      /* task delete user extension */
-  Task_switch,               /* task switch user extension */
-  NULL,                      /* task begin user extension */
-  NULL,                      /* task exitted user extension */
-  NULL                       /* fatal error user extension */
-};
-
-rtems_task Init(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-  rtems_time_of_day time;
-
-  puts( "\n\n*** CPU USAGE LIBRARY TEST ***" );
-  build_time( &time, 12, 31, 1988, 9, 15, 0, 0 );
-
-  status = rtems_clock_set( &time );
-  directive_failed( status, "rtems_clock_set" );
-
-  Extension_name[ 1 ] =  rtems_build_name( 'E', 'X', 'T', ' ' );
-
-  status = rtems_extension_create(
-    Extension_name[ 1 ],
-    &Extensions,
-    &Extension_id[ 1 ]
-  );
-  directive_failed( status, "rtems_extension_create" );
-
-  Task_name[ 1 ] =  rtems_build_name( 'T', 'A', '1', ' ' );
-  Task_name[ 2 ] =  rtems_build_name( 'T', 'A', '2', ' ' );
-  Task_name[ 3 ] =  rtems_build_name( 'T', 'A', '3', ' ' );
-
-  Run_count[ 1 ] = 0;
-  Run_count[ 2 ] = 0;
-  Run_count[ 3 ] = 0;
-
-  status = rtems_task_create(
-     Task_name[ 1 ],
-     1,
-     RTEMS_MINIMUM_STACK_SIZE * 2,
-     RTEMS_TIMESLICE,
-     RTEMS_FLOATING_POINT,
-     &Task_id[ 1 ]
-  );
-  directive_failed( status, "rtems_task_create of TA1" );
-
-  status = rtems_task_create(
-     Task_name[ 2 ],
-     1,
-     RTEMS_MINIMUM_STACK_SIZE * 2,
-     RTEMS_TIMESLICE,
-     RTEMS_FLOATING_POINT,
-     &Task_id[ 2 ]
-  );
-  directive_failed( status, "rtems_task_create of TA2" );
-
-  status = rtems_task_create(
-     Task_name[ 3 ],
-     1,
-     RTEMS_MINIMUM_STACK_SIZE * 2,
-     RTEMS_TIMESLICE,
-     RTEMS_FLOATING_POINT,
-     &Task_id[ 3 ]
-  );
-  directive_failed( status, "rtems_task_create of TA3" );
-
-  status = rtems_task_start( Task_id[ 1 ], Task_1, 0 );
-  directive_failed( status, "rtems_task_start of TA1" );
-
-  status = rtems_task_start( Task_id[ 2 ], Task_2, 0 );
-  directive_failed( status, "rtems_task_start of TA2" );
-
-  status = rtems_task_start( Task_id[ 3 ], Task_3, 0 );
-  directive_failed( status, "rtems_task_start of TA3" );
-
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-}
diff --git a/testsuites/libtests/cpuuse/system.h b/testsuites/libtests/cpuuse/system.h
deleted file mode 100644
index 055d93a098..0000000000
--- a/testsuites/libtests/cpuuse/system.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*  system.h
- *
- *  This include file contains information that is included in every
- *  function in the test set.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <tmacros.h>
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
-
-rtems_task Task_1(
-  rtems_task_argument argument
-);
- 
-rtems_task Task_2(
-  rtems_task_argument argument
-);
- 
-rtems_task Task_3(
-  rtems_task_argument argument
-);
- 
-void Task_switch(
-  rtems_tcb *unused,
-  rtems_tcb *heir
-);
-
-/* configuration information */
-
-#define CONFIGURE_SPTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_MAXIMUM_USER_EXTENSIONS     1
-#define CONFIGURE_TICKS_PER_TIMESLICE       100
-
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#define CONFIGURE_EXTRA_TASK_STACKS (6 * RTEMS_MINIMUM_STACK_SIZE)
-
-#include <confdefs.h>
-
-/* global variables */
-
-TEST_EXTERN rtems_id   Task_id[ 4 ];         /* array of task ids */
-TEST_EXTERN rtems_name Task_name[ 4 ];       /* array of task names */
-
-TEST_EXTERN rtems_id   Extension_id[ 4 ];
-TEST_EXTERN rtems_name Extension_name[ 4 ];  /* array of task names */
- 
-/* array of task run counts */
-TEST_EXTERN volatile rtems_unsigned32 Run_count[ 4 ];  
- 
-/* end of include file */
diff --git a/testsuites/libtests/cpuuse/task1.c b/testsuites/libtests/cpuuse/task1.c
deleted file mode 100644
index 53f0188ca0..0000000000
--- a/testsuites/libtests/cpuuse/task1.c
+++ /dev/null
@@ -1,103 +0,0 @@
-/*  Task_1
- *
- *  This test serves as a test task.  It verifies timeslicing activities
- *  and tswitch extension processing.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_task Task_1(
-  rtems_task_argument argument
-)
-{
-  rtems_unsigned32  seconds;
-  rtems_unsigned32  old_seconds;
-  rtems_mode        previous_mode;
-  rtems_time_of_day time;
-  rtems_status_code status;
-  rtems_unsigned32  start_time;
-  rtems_unsigned32  end_time;
-
-  puts( "TA1 - rtems_task_suspend - on Task 2" );
-  status = rtems_task_suspend( Task_id[ 2 ] );
-  directive_failed( status, "rtems_task_suspend of TA2" );
-
-  puts( "TA1 - rtems_task_suspend - on Task 3" );
-  status = rtems_task_suspend( Task_id[ 3 ] );
-  directive_failed( status, "rtems_task_suspend of TA3" );
-
-  status = rtems_clock_get( RTEMS_CLOCK_GET_SECONDS_SINCE_EPOCH, &start_time );
-  directive_failed( status, "rtems_clock_get" );
-
-  puts( "TA1 - killing time" );
-
-  for ( ; ; ) {
-    status = rtems_clock_get( RTEMS_CLOCK_GET_SECONDS_SINCE_EPOCH, &end_time );
-    directive_failed( status, "rtems_clock_get" );
-
-    if ( end_time > (start_time + 2) )
-      break;
-  }
-
-  puts( "TA1 - rtems_task_resume - on Task 2" );
-  status = rtems_task_resume( Task_id[ 2 ] );
-  directive_failed( status, "rtems_task_resume of TA2" );
-
-  puts( "TA1 - rtems_task_resume - on Task 3" );
-  status = rtems_task_resume( Task_id[ 3 ] );
-  directive_failed( status, "rtems_task_resume of TA3" );
-
-  while ( FOREVER ) {
-    if ( Run_count[ 1 ] == 3 ) {
-      puts( "TA1 - rtems_task_mode - change mode to NO RTEMS_PREEMPT" );
-
-      status = rtems_task_mode(
-        RTEMS_NO_PREEMPT,
-        RTEMS_PREEMPT_MASK,
-        &previous_mode
-      );
-      directive_failed( status, "rtems_task_mode" );
-
-      status = rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time );
-      directive_failed( status, "rtems_clock_get" );
-
-      old_seconds = time.second;
-
-      for ( seconds = 0 ; seconds < 6 ; ) {
-        status = rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time );
-        directive_failed( status, "rtems_clock_get" );
-
-        if ( time.second != old_seconds ) {
-          old_seconds = time.second;
-          seconds++;
-          print_time( "TA1 - ", &time, "\n" );
-        }
-      }
-
-      puts( "TA1 - rtems_task_mode - change mode to RTEMS_PREEMPT" );
-      status = rtems_task_mode(
-        RTEMS_PREEMPT,
-        RTEMS_PREEMPT_MASK,
-        &previous_mode
-      );
-      directive_failed( status, "rtems_task_mode" );
-
-      while ( FOREVER );
-    }
-  }
-}
diff --git a/testsuites/libtests/cpuuse/task2.c b/testsuites/libtests/cpuuse/task2.c
deleted file mode 100644
index ff22274284..0000000000
--- a/testsuites/libtests/cpuuse/task2.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/*  Task_2
- *
- *  This routine serves as a test task.  It is just a CPU bound task
- *  requiring timesliced operation.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_task Task_2(
-  rtems_task_argument argument
-)
-{
-  while( FOREVER );
-}
diff --git a/testsuites/libtests/cpuuse/task3.c b/testsuites/libtests/cpuuse/task3.c
deleted file mode 100644
index a431a99f9d..0000000000
--- a/testsuites/libtests/cpuuse/task3.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/*  Task_3
- *
- *  This routine serves as a test task.  It is just a CPU bound task
- *  requiring timesliced operation.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_task Task_3(
-  rtems_task_argument argument
-)
-{
-  while( FOREVER );
-}
diff --git a/testsuites/libtests/cpuuse/tswitch.c b/testsuites/libtests/cpuuse/tswitch.c
deleted file mode 100644
index 9abd5f80cb..0000000000
--- a/testsuites/libtests/cpuuse/tswitch.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/*  Task_switch
- *
- *  This routine is the tswitch user extension.  It determines which
- *  task is being switched to and displays a message indicating the
- *  time and date that it gained control.
- *
- *  Input parameters:
- *    unused  - pointer to currently running TCB
- *    heir    - pointer to heir TCB
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-#include "cpuuse.h"
-
-rtems_extension Task_switch( 
-  rtems_tcb *unused,
-  rtems_tcb *heir
-)
-{
-  rtems_unsigned32  index;
-  rtems_time_of_day time;
-  rtems_status_code status;
-
-  index = task_number( heir->Object.id );
-
-  switch( index ) {
-    case 1:
-    case 2:
-    case 3:
-      Run_count[ index ] += 1;
-
-      status = rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time );
-      directive_failed( status, "rtems_clock_get" );
-
-      put_name( Task_name[ index ], FALSE );
-      print_time( "- ", &time, "\n" );
-
-      if ( time.second >= 16 ) {
-        CPU_usage_Dump();
-        puts( "*** END OF CPU USAGE LIBRARY TEST ***" );
-        exit( 0 );
-      }
-      break;
-
-    case 0:
-    default:
-      break;
-  }
-}
diff --git a/testsuites/libtests/malloctest/init.c b/testsuites/libtests/malloctest/init.c
deleted file mode 100644
index 643aa843b8..0000000000
--- a/testsuites/libtests/malloctest/init.c
+++ /dev/null
@@ -1,114 +0,0 @@
-/*  Init
- *
- *  This routine is the initialization task for this test program.
- *  It is a user initialization task and has the responsibility for creating
- *  and starting the tasks that make up the test.  If the time of day
- *  clock is required for the test, it should also be set to a known
- *  value by this function.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "system.h"
-
-rtems_task Init(
-  rtems_task_argument argument
-)
-{
-  rtems_time_of_day time;
-  rtems_status_code status;
-
-  puts( "\n\n*** MALLOC TEST ***" );
-
-  build_time( &time, 12, 31, 1988, 9, 0, 0, 0 );
-  status = rtems_clock_set( &time );
-  directive_failed( status, "rtems_clock_set" );
-
-  Task_name[ 1 ] = rtems_build_name( 'T', 'A', '1', ' ' );
-  Task_name[ 2 ] = rtems_build_name( 'T', 'A', '2', ' ' );
-  Task_name[ 3 ] = rtems_build_name( 'T', 'A', '3', ' ' );
-  Task_name[ 4 ] = rtems_build_name( 'T', 'A', '4', ' ' );
-  Task_name[ 5 ] = rtems_build_name( 'T', 'A', '5', ' ' );
-
-  status = rtems_task_create(
-     Task_name[ 1 ],
-     1,
-     TASK_STACK_SIZE,
-     RTEMS_DEFAULT_MODES,
-     RTEMS_DEFAULT_ATTRIBUTES,
-     &Task_id[ 1 ]
-  );
-  directive_failed( status, "rtems_task_create of TA1" );
-
-  status = rtems_task_create(
-     Task_name[ 2 ],
-     1,
-     TASK_STACK_SIZE,
-     RTEMS_DEFAULT_MODES,
-     RTEMS_DEFAULT_ATTRIBUTES,
-     &Task_id[ 2 ]
-  );
-  directive_failed( status, "rtems_task_create of TA2" );
-
-  status = rtems_task_create(
-     Task_name[ 3 ],
-     1,
-     TASK_STACK_SIZE,
-     RTEMS_DEFAULT_MODES,
-     RTEMS_DEFAULT_ATTRIBUTES,
-     &Task_id[ 3 ]
-  );
-  directive_failed( status, "rtems_task_create of TA3" );
-
-  status = rtems_task_create(
-     Task_name[ 4 ],
-     1,
-     TASK_STACK_SIZE,
-     RTEMS_DEFAULT_MODES,
-     RTEMS_DEFAULT_ATTRIBUTES,
-     &Task_id[ 4 ]
-  );
-  directive_failed( status, "rtems_task_create of TA4" );
-
-  status = rtems_task_create(
-     Task_name[ 5 ],
-     1,
-     TASK_STACK_SIZE,
-     RTEMS_DEFAULT_MODES,
-     RTEMS_DEFAULT_ATTRIBUTES,
-     &Task_id[ 5 ]
-  );
-  directive_failed( status, "rtems_task_create of TA5" );
-
-  status = rtems_task_start( Task_id[ 1 ], Task_1_through_5, 0 );
-  directive_failed( status, "rtems_task_start of TA1" );
-
-  status = rtems_task_start( Task_id[ 2 ], Task_1_through_5, 0 );
-  directive_failed( status, "rtems_task_start of TA2" );
-
-  status = rtems_task_start( Task_id[ 3 ], Task_1_through_5, 0 );
-  directive_failed( status, "rtems_task_start of TA3" );
-
-  status = rtems_task_start( Task_id[ 4 ], Task_1_through_5, 0 );
-  directive_failed( status, "rtems_task_start of TA4" );
-
-  status = rtems_task_start( Task_id[ 5 ], Task_1_through_5, 0 );
-  directive_failed( status, "rtems_task_start of TA5" );
-
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-}
diff --git a/testsuites/libtests/malloctest/system.h b/testsuites/libtests/malloctest/system.h
deleted file mode 100644
index 7c95130900..0000000000
--- a/testsuites/libtests/malloctest/system.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*  system.h
- *
- *  This include file contains information that is included in every
- *  function in the test set.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <tmacros.h>
-
-/* macros */
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
-
-rtems_task Task_1_through_5(
-  rtems_task_argument argument
-);
-
-void blow_stack( void );
-
-/* configuration information */
-
-#define CONFIGURE_SPTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-
-#define TASK_STACK_SIZE (RTEMS_MINIMUM_STACK_SIZE*3)
-
-#define CONFIGURE_EXTRA_TASK_STACKS (10 * RTEMS_MINIMUM_STACK_SIZE)
-
-#include <confdefs.h>
-
-/* global variables */
-
-TEST_EXTERN rtems_id   Task_id[ 4 ];         /* array of task ids */
-TEST_EXTERN rtems_name Task_name[ 4 ];       /* array of task names */
-
-/* end of include file */
diff --git a/testsuites/libtests/malloctest/task1.c b/testsuites/libtests/malloctest/task1.c
deleted file mode 100644
index aa47bd404b..0000000000
--- a/testsuites/libtests/malloctest/task1.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/*  task1.c
- *
- *  This set of three tasks do some simple task switching for about
- *  15 seconds and then call a routine to "blow the stack".
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-#include <libcsupport.h>    /* for malloc_dump, malloc_walk */
-#include <string.h>         /* for memset */
-
-#define NUM_PASSES 100
-
-rtems_task Task_1_through_5(
-  rtems_task_argument argument
-)
-{
-  int i;
-  unsigned int passes = 0;
-  rtems_id          tid;
-  rtems_time_of_day time;
-  rtems_status_code status;
-  unsigned char *mem_ptr;
-  int mem_amt;
-
-  status = rtems_task_ident( RTEMS_SELF, RTEMS_SEARCH_ALL_NODES, &tid );
-  directive_failed( status, "rtems_task_ident" );
-
-  while (TRUE)
-  {
-    if ( passes++ > NUM_PASSES )
-        exit(0);
-
-    status = rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time );
-    directive_failed( status, "rtems_clock_get" );
-
-    put_name( Task_name[ task_number( tid ) ], FALSE );
-    print_time( " - rtems_clock_get - ", &time, "\n" );
-
-    mem_amt = rand() * task_number( tid );
-    printf("mallocing %d bytes\n",mem_amt);
-    mem_ptr = malloc ( mem_amt);
-    memset( mem_ptr, mem_amt, mem_amt );
-    malloc_dump();
-    malloc_walk(1,FALSE);
-    status = rtems_task_wake_after( task_number( tid ) * 1 * TICKS_PER_SECOND/4 );
-    for (i=0; i < mem_amt; i++)
-    {
-       if ( mem_ptr[i] != (mem_amt & 0xff))
-       {
-          printf("failed %d, %d, 0x%x, 0x%x\n",i,mem_amt,mem_ptr[i],mem_amt&0xff);
-          exit(1);
-       }
-    }
-    directive_failed( status, "rtems_task_wake_after" );
-    free( mem_ptr );
-  }
-}
diff --git a/testsuites/libtests/monitor/init.c b/testsuites/libtests/monitor/init.c
deleted file mode 100644
index 0766c5f8cc..0000000000
--- a/testsuites/libtests/monitor/init.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- *  This is a simple test whose only purpose is to start the Monitor
- *  task.  The Monitor task can be used to obtain information about
- *  a variety of RTEMS objects.  
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "system.h"
-
-#include <rtems/monitor.h>
-
-rtems_task_priority Priorities[6] = { 0,   1,   1,   3,   4,   5 };
-
-rtems_task Task_1_through_5(
-  rtems_unsigned32 argument
-)
-{
-  rtems_status_code status;
-
-  for ( ; ; ) {
-    status = rtems_task_wake_after( 100 );
-    directive_failed( status, "rtems_task_wake_after" );
-  }
-}
-
-
-
-rtems_task Init(
-  rtems_task_argument argument
-)
-{
-  rtems_unsigned32  index;
-  rtems_status_code status;
-
-  puts( "\n\n*** MONITOR TASK TEST ***" );
-
-  Task_name[ 1 ] =  rtems_build_name( 'T', 'A', '1', ' ' );
-  Task_name[ 2 ] =  rtems_build_name( 'T', 'A', '2', ' ' );
-  Task_name[ 3 ] =  rtems_build_name( 'T', 'A', '3', ' ' );
-  Task_name[ 4 ] =  rtems_build_name( 'T', 'A', '4', ' ' );
-  Task_name[ 5 ] =  rtems_build_name( 'T', 'A', '5', ' ' );
-
-  for ( index = 1 ; index <= 5 ; index++ ) {
-    status = rtems_task_create(
-      Task_name[ index ],
-      Priorities[ index ],
-      RTEMS_MINIMUM_STACK_SIZE * 4,
-      RTEMS_DEFAULT_MODES,
-      (index == 5) ? RTEMS_FLOATING_POINT : RTEMS_DEFAULT_ATTRIBUTES,
-      &Task_id[ index ]
-    );
-    directive_failed( status, "rtems_task_create loop" );
-  }
-
-  for ( index = 1 ; index <= 5 ; index++ ) {
-    status = rtems_task_start( Task_id[ index ], Task_1_through_5, index );
-    directive_failed( status, "rtems_task_start loop" );
-  }
-
-  rtems_monitor_init( 0 );
-
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-}
diff --git a/testsuites/libtests/monitor/system.h b/testsuites/libtests/monitor/system.h
deleted file mode 100644
index 75f5771161..0000000000
--- a/testsuites/libtests/monitor/system.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*  system.h
- *
- *  This include file contains information that is included in every
- *  function in the test set.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <tmacros.h>
-
-/* types */
-
-struct counters {
-  rtems_unsigned32 count[6];
-};
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
- 
-rtems_task Task_1_through_5(
-  rtems_task_argument argument
-);
- 
-void Get_all_counters( void );
- 
-/* configuration information */
-
-#define CONFIGURE_SPTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_INIT_TASK_PRIORITY          10
-#define CONFIGURE_INIT_TASK_INITIAL_MODES     RTEMS_DEFAULT_MODES
-#define CONFIGURE_MAXIMUM_PERIODS             10
-
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-#define CONFIGURE_EXTRA_TASK_STACKS           (3 * RTEMS_MINIMUM_STACK_SIZE)
-
-#include <confdefs.h>
-
-/* global variables */
-
-TEST_EXTERN rtems_id   Task_id[ 6 ];     /* array of task ids */
-TEST_EXTERN rtems_name Task_name[ 6 ];   /* array of task names */
-
-/* end of include file */
diff --git a/testsuites/libtests/rtems++/Init.cc b/testsuites/libtests/rtems++/Init.cc
deleted file mode 100644
index 4474580bc3..0000000000
--- a/testsuites/libtests/rtems++/Init.cc
+++ /dev/null
@@ -1,63 +0,0 @@
-/*  Init
- *
- *  This routine is the initialization task for this test program.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1997
- *  Objective Design Systems Ltd Pty (ODS)
- *  All rights reserved (R) Objective Design Systems Ltd Pty
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "System.h"
-
-// make global so it lasts past the Init task's stack's life time
-Task1 task_1;
-
-rtems_task Init(rtems_task_argument )
-{
-  puts( "\n\n*** RTEMS++ TEST ***" );
-
-  printf( "INIT - Task.create() - " );
-  task_1.create("TA1 ", 0, RTEMS_MINIMUM_STACK_SIZE);
-  printf("%s\n", task_1.last_status_string());
-
-  printf( "INIT - Task.create() - " );
-  task_1.create("TA1 ", 10, RTEMS_MINIMUM_STACK_SIZE * 6);
-  printf("%s\n", task_1.last_status_string());
-
-  printf( "INIT - Task.create() - " );
-  task_1.create("TA1 ", 10, RTEMS_MINIMUM_STACK_SIZE * 6);
-  printf("%s\n", task_1.last_status_string());
-
-  printf( "INIT - Task.restart() - " );
-  task_1.restart(0);
-  printf("%s\n", task_1.last_status_string());
-
-  printf( "INIT - Task.start(0xDEADDEAD) - " );
-  task_1.start(0xDEADDEAD);
-  printf("%s\n", task_1.last_status_string());
-
-  printf("INIT - Destroy it's self\n");
-
-  // needs to be in C, no C++ object owns the Init task
-  rtems_status_code status  = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-}
-
-
-
diff --git a/testsuites/libtests/rtems++/System.h b/testsuites/libtests/rtems++/System.h
deleted file mode 100644
index 18668d3b9a..0000000000
--- a/testsuites/libtests/rtems++/System.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/*  system.h
- *
- *  This include file contains information that is included in every
- *  function in the test set.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <tmacros.h>
-#include <rtems++/rtemsEvent.h>
-#include <rtems++/rtemsMessageQueue.h>
-#include <rtems++/rtemsTask.h>
-#include <rtems++/rtemsTaskMode.h>
-
-/* functions */
-
-extern "C"
-{  
-  rtems_task Init(
-    rtems_task_argument argument
-    );
-}
-
-rtems_timer_service_routine Delayed_routine(
-  rtems_id  ignored_id,
-  void     *ignored_address
-);
-
-class Task1
-  : public rtemsTask
-{
-  void print_mode(rtems_mode mode, rtems_mode mask);
-  
-  void screen1(void);
-  void screen2(void);
-  void screen3(void);
-  void screen4(void);
-  void screen5(void);
-  void screen6(void);
-
-protected:
-  virtual void body(rtems_task_argument argument);
-
-public:
-};
-
-class Task2
-  : public rtemsTask
-{
-  void screen4(void);
-
-protected:
-  virtual void body(rtems_task_argument argument);
-
-public:  
-  Task2(const char* name,
-        const rtems_task_priority initial_priority,
-        const rtems_unsigned32 stack_size);
-};
-
-class Task3
-  : public rtemsTask
-{
-  void screen6(void);
-
-protected:
-  virtual void body(rtems_task_argument argument);
-
-public:  
-  Task3(const char* name,
-        const rtems_task_priority initial_priority,
-        const rtems_unsigned32 stack_size);
-};
-
-class EndTask
-  : public rtemsTask
-{
-protected:
-  virtual void body(rtems_task_argument argument);
-
-public:  
-  EndTask(const char* name,
-          const rtems_task_priority initial_priority,
-          const rtems_unsigned32 stack_size);
-};
-
-#if 0
-
-//
-// Not sure this can be tested in a generic manner, any ideas anyone !!
-//
-
-class Service_routine
-  : public rtemsInterrupt
-{
-};
-
-class Io_during_interrupt
-  : pubic rtemsTimer
-{
-
-};
-
-#endif
-
-/* configuration information */
-
-#define CONFIGURE_SPTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_MAXIMUM_TIMERS              1
-#define CONFIGURE_MAXIMUM_SEMAPHORES          2
-#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES      1
-#define CONFIGURE_MAXIMUM_PARTITIONS          1
-#define CONFIGURE_MAXIMUM_REGIONS             1
-#define CONFIGURE_MAXIMUM_PERIODS             1
-#define CONFIGURE_MAXIMUM_USER_EXTENSIONS     0
-#define CONFIGURE_TICKS_PER_TIMESLICE       100
-
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-#define CONFIGURE_INIT_TASK_STACK_SIZE      (4 * RTEMS_MINIMUM_STACK_SIZE) 
-
-#define CONFIGURE_EXTRA_TASK_STACKS         (3 * RTEMS_MINIMUM_STACK_SIZE)
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/testsuites/libtests/rtems++/Task1.cc b/testsuites/libtests/rtems++/Task1.cc
deleted file mode 100644
index 0d334ca977..0000000000
--- a/testsuites/libtests/rtems++/Task1.cc
+++ /dev/null
@@ -1,682 +0,0 @@
-/*  Task1
- *
- *  This task is the main line for the test. It creates other
- *  tasks which can create
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1997
- *  Objective Design Systems Ltd Pty (ODS)
- *  All rights reserved (R) Objective Design Systems Ltd Pty
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <stdlib.h>
-#include <string.h>
-#include "System.h"
-
-void Task1::body(rtems_task_argument argument)
-{
-  rtems_test_pause_and_screen_number(1);
-  
-  printf(" * START Task Class test *\n");
-  
-  printf("%s - test argument - ", name_string());
-  if (argument != 0xDEADDEAD)
-    printf("argument is not 0xDEADDEAD\n");
-  else
-    printf("argument matched\n");
-  
-  screen1();
-  rtems_test_pause_and_screen_number(2);
-
-  screen2();
-  rtems_test_pause_and_screen_number(3);
-  
-  screen3();
-  rtems_test_pause_and_screen_number(4);
-  
-  screen4();
-  rtems_test_pause_and_screen_number(5);
-  
-  screen5();
-  rtems_test_pause_and_screen_number(6);
-  
-  screen6();
-
-  // do not call exit(0) from this thread as this object is static
-  // the static destructor call delete the task which is calling exit
-  // so exit never completes
-  
-  EndTask end_task("ENDT", (rtems_task_priority) 1, RTEMS_MINIMUM_STACK_SIZE * 6);
-  end_task.start(0);
-
-  rtemsEvent block_me;
-  rtems_event_set out;
-  
-  block_me.receive(RTEMS_SIGNAL_0, out);
-
-  printf("**** TASK 1 did not block ????\n");
-}
-
-void Task1::screen1(void)
-{
-  // create two local task objects to connect to this task
-  rtemsTask local_task_1 = *this;
-  rtemsTask local_task_2;
-
-  local_task_2 = *this;
-  
-  // check the copy constructor works
-  printf("%s - copy constructor - ", name_string());
-  if (local_task_1.id_is() == id_is())
-    printf("local and this id's match\n");
-  else
-    printf("local and this id's do not match\n");
-
-  printf("%s - copy constructor - ", name_string());
-  if (local_task_1.name_is() == name_is())
-    printf("local and this name's match\n");
-  else
-    printf("local and this name's do not match\n");
-
-  // check the copy operator works
-  printf("%s - copy operator - ", name_string());
-  if (local_task_2.id_is() == id_is())
-    printf("local and this id's match\n");
-  else
-    printf("local and this id's do not match\n");
-  printf("%s - copy operator - ", name_string());
-  if (local_task_2.name_is() == name_is())
-    printf("local and this name's match\n");
-  else
-    printf("local and this name's do not match\n");
-  
-  // check that the owner of the id cannot delete this task
-  printf("%s - not owner destroy's task - ", local_task_1.name_string());
-  local_task_1.destroy();
-  printf("%s\n", local_task_1.last_status_string());
-  
-  // connect to a valid task
-  printf("%s - connect to a local valid task name - ", local_task_2.name_string());
-  local_task_2.connect("TA1 ", RTEMS_SEARCH_ALL_NODES);
-  printf("%s\n", local_task_2.last_status_string());
-  
-  // connect to an invalid task
-  printf("%s - connect to an invalid task name - ", local_task_2.name_string());
-  local_task_2.connect("BADT", RTEMS_SEARCH_ALL_NODES);
-  printf("%s\n", local_task_2.last_status_string());
-  
-  // connect to a task an invalid node
-  printf("%s - connect to a task on an invalid node - ", local_task_2.name_string());
-  local_task_2.connect("BADT", 10);
-  printf("%s\n", local_task_2.last_status_string());
-  
-  // restart this task
-  printf("%s - restart from a non-owner - ", name_string());
-  local_task_1.restart(0);
-  printf("%s\n", local_task_1.last_status_string());
-}
-
-void Task1::screen2(void)
-{
-  // wake after using this object
-  
-  printf("%s - wake after 0 secs - ", name_string());
-  wake_after(0);
-  printf("%s\n", last_status_string());
-  
-  printf("%s - wake after 500 msecs - ", name_string());
-  wake_after(500000);
-  printf("%s\n", last_status_string());
-  
-  printf("%s - wake after 5 secs - ", name_string());
-  wake_after(5000000);
-  printf("%s\n", last_status_string());
-
-  printf("%s - wake when - to do\n", name_string());
-
-  rtemsTask task_1 = *this;
-  
-  // wake after using a connected object
-  
-  printf("%s - connected object wake after 0 secs - ", task_1.name_string());
-  task_1.wake_after(0);
-  printf("%s\n", task_1.last_status_string());
-  
-  printf("%s - connected object wake after 500 msecs - ", task_1.name_string());
-  task_1.wake_after(500000);
-  printf("%s\n", task_1.last_status_string());
-  
-  printf("%s - connected object wake after 5 secs - ", task_1.name_string());
-  task_1.wake_after(5000000);
-  printf("%s\n", task_1.last_status_string());
-
-  printf("%s - connected object wake when - to do\n", task_1.name_string());
-
-  rtemsTask task_2;
-  
-  // wake after using a self object
-  
-  printf("%s - self object wake after 0 secs - ", task_2.name_string());
-  task_2.wake_after(0);
-  printf("%s\n", task_2.last_status_string());
-  
-  printf("%s - self object wake after 500 msecs - ", task_2.name_string());
-  task_2.wake_after(500000);
-  printf("%s\n", task_2.last_status_string());
-  
-  printf("%s - self object wake after 5 secs - ", task_2.name_string());
-  task_2.wake_after(5000000);
-  printf("%s\n", task_2.last_status_string());
-
-  printf("%s - self object wake when - to do\n", task_2.name_string());
-
-  rtems_task_priority current_priority;
-  rtems_task_priority priority;
-
-  // priorities with this object
-  
-  printf("%s - get priority - ", name_string());
-  get_priority(current_priority);
-  printf("%s, priority is %i\n", last_status_string(), current_priority);
-
-  printf("%s - set priority to 512 - ", name_string());
-  set_priority(512);
-  printf("%s\n", last_status_string());
-
-  printf("%s - set priority to 25 - ", name_string());
-  set_priority(25);
-  printf("%s\n", last_status_string());
-
-  printf("%s - set priority to original - ", name_string());
-  set_priority(current_priority, priority);
-  printf("%s, priority was %i\n", last_status_string(), priority);
-
-  // priorities with connected object
-    
-  printf("%s - connected object get priority - ", task_1.name_string());
-  task_1.get_priority(current_priority);
-  printf("%s, priority is %i\n", task_1.last_status_string(), current_priority);
-
-  printf("%s - connected object set priority to 512 - ", task_1.name_string());
-  task_1.set_priority(512);
-  printf("%s\n", task_1.last_status_string());
-
-  printf("%s - connected object set priority to 25 - ", task_1.name_string());
-  task_1.set_priority(25);
-  printf("%s\n", task_1.last_status_string());
-
-  printf("%s - connected object set priority to original - ", task_1.name_string());
-  task_1.set_priority(current_priority, priority);
-  printf("%s, priority was %i\n", task_1.last_status_string(), priority);  
-
-  // priorities with self object
-    
-  printf("%s - self object get priority - ", task_2.name_string());
-  task_2.get_priority(current_priority);
-  printf("%s, priority is %i\n", task_2.last_status_string(), current_priority);
-
-  printf("%s - self object set priority to 512 - ", task_2.name_string());
-  task_2.set_priority(512);
-  printf("%s\n", task_2.last_status_string());
-
-  printf("%s - self object set priority to 25 - ", task_2.name_string());
-  task_2.set_priority(25);
-  printf("%s\n", task_2.last_status_string());
-
-  printf("%s - self object set priority to original - ", task_2.name_string());
-  task_2.set_priority(current_priority, priority);
-  printf("%s, priority was %i\n", task_2.last_status_string(), priority);
-
-  rtems_unsigned32 current_note;
-  rtems_unsigned32 note;
-  
-  // notepad registers for this object
-
-  printf("%s - get note - ", name_string());
-  get_note(0, current_note);
-  printf("%s, note is %i\n", last_status_string(), current_note);
-
-  printf("%s - get with bad notepad number - ", name_string());
-  get_note(100, current_note);
-  printf("%s, note is %i\n", last_status_string(), current_note);
-
-  printf("%s - set note to 0xDEADBEEF - ", name_string());
-  set_note(0, 0xDEADBEEF);
-  printf("%s\n", last_status_string());
-
-  printf("%s - get note - ", name_string());
-  get_note(0, note);
-  printf("%s, note is 0x%08X\n", last_status_string(), note);
-
-  printf("%s - set note to original value - ", name_string());
-  set_note(0, current_note);
-  printf("%s\n", last_status_string());
-
-  // notepad registers for connected object
-
-  printf("%s - connected object get note - ", task_1.name_string());
-  task_1.get_note(0, current_note);
-  printf("%s, notepad is %i\n", task_1.last_status_string(), current_note);
-
-  printf("%s - connected object get with bad notepad number - ", task_1.name_string());
-  task_1.get_note(100, current_note);
-  printf("%s, note is %i\n", task_1.last_status_string(), current_note);
-
-  printf("%s - connected object set note to 0xDEADBEEF - ", task_1.name_string());
-  task_1.set_note(0, 0xDEADBEEF);
-  printf("%s\n", task_1.last_status_string());
-
-  printf("%s - connected object get note - ", task_1.name_string());
-  task_1.get_note(0, note);
-  printf("%s, note is 0x%08X\n", task_1.last_status_string(), note);
-
-  printf("%s - connected object set note to original value - ", task_1.name_string());
-  task_1.set_note(0, current_note);
-  printf("%s\n", task_1.last_status_string());
-
-  // notepad registers for self object
-
-  printf("%s - self object get note - ", task_2.name_string());
-  task_2.get_note(0, current_note);
-  printf("%s, note is %i\n", task_2.last_status_string(), current_note);
-
-  printf("%s - self object get with bad notepad number - ", task_2.name_string());
-  task_2.get_note(100, current_note);
-  printf("%s, note is %i\n", task_2.last_status_string(), current_note);
-
-  printf("%s - self object set note to 0xDEADBEEF - ", task_2.name_string());
-  task_2.set_note(0, 0xDEADBEEF);
-  printf("%s\n", task_2.last_status_string());
-
-  printf("%s - self object get note - ", task_2.name_string());
-  task_2.get_note(0, note);
-  printf("%s, notepad is 0x%08X\n", task_2.last_status_string(), note);
-
-  printf("%s - self object set note to original value - ", task_2.name_string());
-  task_2.set_note(0, current_note);
-  printf("%s\n", task_2.last_status_string());
-
-  printf(" * END Task Class test *\n");
-}
-
-#define RTEMS_ALL_MODES (RTEMS_PREEMPT_MASK | \
-                         RTEMS_TIMESLICE_MASK | \
-                         RTEMS_ASR_MASK | \
-                         RTEMS_INTERRUPT_MASK)
-
-void Task1::screen3(void)
-{
-  printf(" * START TaskMode Class test *\n");
-
-  rtemsTask self;
-  rtemsTaskMode task_mode;
-  rtems_mode current_mode;
-  rtems_mode mode;
-
-  printf("%s - get mode - ", self.name_string());
-  task_mode.get_mode(current_mode);
-  printf("%s,\n\t mode is 0x%08X, ", task_mode.last_status_string(), current_mode);
-  print_mode(current_mode, RTEMS_ALL_MODES);
-  printf("\n");
-
-  // PREEMPTION mode control
-  
-  printf("%s - get preemption state - ", self.name_string());
-  task_mode.get_preemption_state(mode);
-  printf("%s,\n\t mode is 0x%08X, ", task_mode.last_status_string(), mode);
-  print_mode(mode, RTEMS_PREEMPT_MASK);
-  printf("\n");
-  
-  printf("%s - set preemption state to RTEMS_PREEMPT - ", self.name_string());
-  task_mode.set_preemption_state(RTEMS_PREEMPT);
-  task_mode.get_mode(mode);
-  printf("%s,\n\t mode is 0x%08X, ", task_mode.last_status_string(), mode);
-  print_mode(mode, RTEMS_ALL_MODES);
-  printf("\n");
-  
-  printf("%s - set preemption state to RTEMS_NO_PREEMPT - ", self.name_string());
-  task_mode.set_preemption_state(RTEMS_NO_PREEMPT);
-  task_mode.get_mode(mode);
-  printf("%s,\n\t mode is 0x%08X, ", task_mode.last_status_string(), mode);
-  print_mode(mode, RTEMS_ALL_MODES);
-  printf("\n");
-
-  // TIMESLICE mode control
-  
-  printf("%s - get timeslice state - ", self.name_string());
-  task_mode.get_timeslice_state(mode);
-  printf("%s,\n\t mode is 0x%08X, ", task_mode.last_status_string(), mode);
-  print_mode(mode, RTEMS_TIMESLICE_MASK);
-  printf("\n");
-  
-  printf("%s - set timeslice state to RTEMS_TIMESLICE - ", self.name_string());
-  task_mode.set_timeslice_state(RTEMS_TIMESLICE);
-  task_mode.get_mode(mode);
-  printf("%s,\n\t mode is 0x%08X, ", task_mode.last_status_string(), mode);
-  print_mode(mode, RTEMS_ALL_MODES);
-  printf("\n");
-  
-  printf("%s - set timeslice state to RTEMS_NO_TIMESLICE - ", self.name_string());
-  task_mode.set_timeslice_state(RTEMS_NO_TIMESLICE);
-  task_mode.get_mode(mode);
-  printf("%s,\n\t mode is 0x%08X, ", task_mode.last_status_string(), mode);
-  print_mode(mode, RTEMS_ALL_MODES);
-  printf("\n");
-
-  // ASR mode control
-  
-  printf("%s - get asr state - ", self.name_string());
-  task_mode.get_asr_state(mode);
-  printf("%s,\n\t mode is 0x%08X, ", task_mode.last_status_string(), mode);
-  print_mode(mode, RTEMS_ASR_MASK);
-  printf("\n");
-  
-  printf("%s - set asr state to RTEMS_ASR - ", self.name_string());
-  task_mode.set_asr_state(RTEMS_ASR);
-  task_mode.get_mode(mode);
-  printf("%s,\n\t mode is 0x%08X, ", task_mode.last_status_string(), mode);
-  print_mode(mode, RTEMS_ALL_MODES);
-  printf("\n");
-  
-  printf("%s - set asr state to RTEMS_NO_ASR - ", self.name_string());
-  task_mode.set_asr_state(RTEMS_NO_ASR);
-  task_mode.get_mode(mode);
-  printf("%s,\n\t mode is 0x%08X, ", task_mode.last_status_string(), mode);
-  print_mode(mode, RTEMS_ALL_MODES);
-  printf("\n");
-
-  // interrupt level control
-  
-  rtems_interrupt_level current_level;
-  rtems_interrupt_level level;
-
-  printf("%s - get current interrupt level - ", self.name_string());
-  task_mode.get_interrupt_level(current_level);
-  printf("%s, level is %i\n", task_mode.last_status_string(), current_level);
-
-  printf("%s - set interrupt level to 102 - ", self.name_string());
-  task_mode.set_interrupt_level(102);
-  printf("%s\n", task_mode.last_status_string());
-  
-  printf("%s - set interrupt level to original level - ", self.name_string());
-  task_mode.set_interrupt_level(current_level, level);
-  printf("%s, level was %i\n", task_mode.last_status_string(), level);
-
-  printf("%s - set mode to original mode - ", self.name_string());
-  task_mode.set_mode(current_mode,
-                     RTEMS_PREEMPT_MASK | RTEMS_TIMESLICE_MASK |
-                     RTEMS_ASR_MASK | RTEMS_INTERRUPT_MASK);
-  task_mode.get_mode(mode);
-  printf("%s,\n\t mode is 0x%08X, ", task_mode.last_status_string(), mode);
-  print_mode(mode, RTEMS_ALL_MODES);
-  printf("\n");
-  
-  printf(" * END TaskMode Class test *\n");  
-}
-
-void Task1::screen4(void)
-{
-  printf(" * START Event Class test *\n");
-
-  printf("%s - create task 2 - ", name_string());
-  Task2 task_2("TA2", (rtems_task_priority) 9, RTEMS_MINIMUM_STACK_SIZE * 6);
-  printf("%s\n", task_2.last_status_string());
-
-  printf("%s - start task 2 - ", name_string());
-  task_2.start(0);
-  printf("%s\n", task_2.last_status_string());
-  
-  printf("%s - construct event connecting to task 2 - ", name_string());
-  rtemsEvent event_2("TA2 ");
-  printf("%s\n", event_2.last_status_string());
-
-  // wait for task 2 to complete its timeout tests
-  wake_after(7000000);
-
-  printf("%s - send event signal 0 using the task id - ", name_string());
-  event_2.send(task_2.id_is(), RTEMS_SIGNAL_0);
-  printf("%s\n", event_2.last_status_string());
-  
-  wake_after(1000000);
-
-  printf("%s - send event signal 0 using the task object reference - ", name_string());
-  event_2.send(task_2, RTEMS_SIGNAL_0);
-  printf("%s\n", event_2.last_status_string());
-  
-  wake_after(1000000);
-
-  printf("%s - send event signal 31 using connected id - ", name_string());
-  event_2.send(RTEMS_SIGNAL_31);
-  printf("%s\n", event_2.last_status_string());
-  
-  wake_after(1000000);
-
-  rtemsEvent event_2_2;
-
-  event_2_2.connect("TA2");
-  
-  printf("%s - send event signal 0 and 31 - ", name_string());
-  event_2_2.send(task_2, RTEMS_SIGNAL_0 | RTEMS_SIGNAL_31);
-  printf("%s\n", event_2_2.last_status_string());
-  
-  printf("%s - waiting 5 secs for TA2 to finish\n", name_string());
-  wake_after(500000);
-  
-  printf(" * END Event Class test *\n");  
-}
-
-void Task1::screen5(void)
-{
-  printf(" * START Interrupt Class test *\n");
-
-  printf(" do not know a portable BSP type interrupt test\n");
-
-  printf(" * END Interrupt Class test *\n");  
-}
-
-void Task1::screen6(void)
-{
-  printf(" * START MessageQueue Class test *\n");
-
-  printf("%s - construct message queue 1 with no memory error - ", name_string());
-  rtemsMessageQueue mq_1("MQ1", 1000000, 1000);
-  printf("%s\n", mq_1.last_status_string());
-
-  printf("%s - construct/create message queue 2 - ", name_string());
-  rtemsMessageQueue mq_2("MQ2", 4, 50);
-  printf("%s\n", mq_2.last_status_string());
-
-  char *u1 = "normal send";
-  char *u2 = "urgent send";
-  char in[100];
-  rtems_unsigned32 size;
-  
-  printf("%s - send u1 to mq_2 - ", name_string());
-  mq_2.send(u1, strlen(u1) + 1);
-  printf("%s\n", mq_2.last_status_string());
-  
-  printf("%s - urgent send u2 to mq_2 - ", name_string());
-  mq_2.urgent(u2, strlen(u2) + 1);
-  printf("%s\n", mq_2.last_status_string());
-  
-  printf("%s - create task 3_1 - ", name_string());
-  Task3 task_3_1("TA31", 9, RTEMS_MINIMUM_STACK_SIZE * 6);
-  printf("%s\n", task_3_1.last_status_string());
-
-  printf("%s - start task 3_1 - ", name_string());
-  task_3_1.start(0);
-  printf("%s\n", task_3_1.last_status_string());
-  
-  printf("%s - create task 3_2 - ", name_string());
-  Task3 task_3_2("TA32", 9, RTEMS_MINIMUM_STACK_SIZE * 6);
-  printf("%s\n", task_3_2.last_status_string());
-
-  printf("%s - start task 3_2 - ", name_string());
-  task_3_2.start(0);
-  printf("%s\n", task_3_1.last_status_string());
-  
-  wake_after(1000000);
-  
-  printf("%s - receive u2 on mq_2 ...\n", name_string()); fflush(stdout);
-  mq_2.receive(in, size, 5000000);
-  printf("%s - %s\n", name_string(), mq_2.last_status_string());
-
-  if (size == (strlen(u2) + 5))
-  {
-    if ((strncmp(in, task_3_1.name_string(), 4) == 0) &&
-        (strcmp(in + 4, u2) == 0))
-    {
-      printf("%s - message u2 received correctly\n", name_string());
-    }
-    else
-    {
-      printf("%s - message u2 received incorrectly, message='%s', size=%i\n",
-             name_string(), in, size);
-    }
-  }
-  else
-    printf("%s - message u2 size incorrect, size=%i\n", name_string(), size);
-
-  printf("%s - receive u1 on mq_2 ...\n", name_string()); fflush(stdout);
-  mq_2.receive(in, size, 5000000);
-  printf("%s - %s\n", name_string(), mq_2.last_status_string());
-
-  if (size == (strlen(u1) + 5))
-  {
-    if ((strncmp(in, task_3_2.name_string(), 4) == 0) &&
-        (strcmp(in + 4, u1) == 0))
-    {
-      printf("%s - message u1 received correctly\n", name_string());
-    }
-    else
-    {
-      printf("%s - message u1 received incorrectly, message='%s', size=%i\n",
-             name_string(), in, size);
-    }
-  }
-  else
-    printf("%s - message u1 size incorrect, size=%i\n", name_string(), size);
-
-  wake_after(3000000);
-  
-  char *b1 = "broadcast message";
-  rtems_unsigned32 count;
-  
-  printf("%s - broadcast send b1 ...\n", name_string());
-  mq_2.broadcast(b1, strlen(b1) + 1, count);
-  printf("%s - mq_2 broadcast send - %s, count=%i\n",
-         name_string(), mq_2.last_status_string(), count);
-
-  wake_after(1000000);
-  
-  printf("%s - receive message b1 on mq_2 from %s...\n",
-         name_string(), task_3_1.name_string()); fflush(stdout);
-  mq_2.receive(in, size, 5000000);
-  printf("%s - %s\n", name_string(), mq_2.last_status_string());
-
-  if (size == (strlen(b1) + 5))
-  {
-    if ((strncmp(in, task_3_1.name_string(), 4) == 0) &&
-        (strcmp(in + 4, b1) == 0))
-    {
-      printf("%s - message b1 received correctly\n", name_string());
-    }
-    else
-    {
-      printf("%s - message b1 received incorrectly, message='%s'\n",
-             name_string(), in);
-    }
-  }
-  else
-    printf("%s - message b1 size incorrect, size=%i\n", name_string(), size);
-
-  printf("%s - receive message b1 on mq_2 from %s...\n",
-         name_string(), task_3_1.name_string()); fflush(stdout);
-  mq_2.receive(in, size, 5000000);
-  printf("%s - %s\n", name_string(), mq_2.last_status_string());
-
-  if (size == (strlen(b1) + 5))
-  {
-    if ((strncmp(in, task_3_2.name_string(), 4) == 0) &&
-        (strcmp(in + 4, b1) == 0))
-    {
-      printf("%s - message b1 received correctly\n", name_string());
-    }
-    else
-    {
-      printf("%s - message b1 received incorrectly, message='%s', size=%i\n",
-             name_string(), in, size);
-    }
-  }
-  else
-    printf("%s - message b1 size incorrect, size=%i\n", name_string(), size);
-
-  // wait for task 3_1, and 3_2 to complete their timeout tests, will
-  // start these after getting the broadcast message
-  wake_after(7000000);  
-
-  char *f1 = "flush message";
-  
-  printf("%s - send f1 to mq_2 - ", name_string());
-  mq_2.send(f1, strlen(f1) + 1);
-  printf("%s\n", mq_2.last_status_string());
-  
-  printf("%s - send f1 to mq_2 - ", name_string());
-  mq_2.send(f1, strlen(f1) + 1);
-  printf("%s\n", mq_2.last_status_string());
-  
-  printf("%s - send f1 to mq_2 - ", name_string());
-  mq_2.send(f1, strlen(f1) + 1);
-  printf("%s\n", mq_2.last_status_string());
-
-  printf("%s - flush mq_2 - ", name_string());
-  mq_2.flush(size);
-  printf("%s, flushed=%i\n", mq_2.last_status_string(), size);
-  
-  printf(" * END MessageQueue Class test *\n");  
-}
-
-void Task1::print_mode(rtems_mode mode, rtems_mode mask)
-{
-  rtemsTaskMode task_mode;
-  if (mask & RTEMS_PREEMPT_MASK)
-    printf("RTEMS_%sPREEMPT ",
-           task_mode.preemption_set(mode) ? "" : "NO_");
-  if (mask & RTEMS_TIMESLICE_MASK)
-    printf("RTEMS_%sTIMESLICE ",
-           task_mode.preemption_set(mode) ? "" : "NO_");
-  if (mask & RTEMS_ASR_MASK)
-    printf("RTEMS_%sASR ",
-           task_mode.asr_set(mode) ? "" : "NO_");
-  if (mask & RTEMS_INTERRUPT_MASK)
-    printf("INTMASK=%i",
-           mode & RTEMS_INTERRUPT_MASK);
-}
-
-EndTask::EndTask(const char* name,
-                 const rtems_task_priority initial_priority,
-                 const rtems_unsigned32 stack_size)
-  : rtemsTask(name, initial_priority, stack_size, RTEMS_NO_PREEMPT)
-{
-}
-  
-void EndTask::body(rtems_task_argument)
-{
- printf("*** END OF RTEMS++ TEST ***\n");
- exit(0);
-}
-
diff --git a/testsuites/libtests/rtems++/Task2.cc b/testsuites/libtests/rtems++/Task2.cc
deleted file mode 100644
index afddbca67d..0000000000
--- a/testsuites/libtests/rtems++/Task2.cc
+++ /dev/null
@@ -1,81 +0,0 @@
-/*  Task_2
- *
- *  This routine serves as a test task.  Its only purpose is to generate the
- *  error where a semaphore is deleted while a task is waiting for it.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "System.h"
-
-Task2::Task2(const char* name,
-             const rtems_task_priority initial_priority,
-             const rtems_unsigned32 stack_size)
-  : rtemsTask(name, initial_priority, stack_size, RTEMS_NO_PREEMPT)
-{
-}
-  
-void Task2::body(rtems_task_argument )
-{
-  screen4();
-
-  printf("%s - destroy itself\n", name_string());
-  destroy();
-}
-
-void Task2::screen4()
-{
-  rtemsEvent event;
-
-  // block waiting for any event
-  rtems_event_set out;
-  
-  printf("%s - event no wait - ", name_string());
-  event.receive(RTEMS_SIGNAL_0, out, 0, rtemsEvent::no_wait);
-  printf("%s\n", event.last_status_string());
-  
-  printf("%s - event 5 secs timeout - ", name_string()); fflush(stdout);
-  event.receive(RTEMS_SIGNAL_0, out, 5000000);
-  printf("%s\n", event.last_status_string());
-
-  // send using task id
-  printf("%s - event wait forever for signal 0 from TA1 ....\n", name_string());
-  event.receive(RTEMS_SIGNAL_0, out);
-  printf("%s - %s, signals out are 0x%08X\n", name_string(), event.last_status_string(), out);
-
-  // send using task object reference
-  printf("%s - event wait forever for signal 0 from TA1 ....\n", name_string());
-  event.receive(RTEMS_SIGNAL_0, out);
-  printf("%s - %s, signals out are 0x%08X\n", name_string(), event.last_status_string(), out);
-  
-  printf("%s - event wait forever for signal 31 from TA1 ....\n", name_string());
-  event.receive(RTEMS_SIGNAL_31, out);
-  printf("%s - %s, signals out are 0x%08X\n", name_string(), event.last_status_string(), out);
-  
-  printf("%s - event wait forever for signal 0 and 31 from TA1 ....\n", name_string());
-  event.receive(RTEMS_SIGNAL_0 | RTEMS_SIGNAL_31, out, 0, rtemsEvent::wait, rtemsEvent::all);
-  printf("%s - %s, signals out are 0x%08X\n", name_string(), event.last_status_string(), out);
-
-  printf("%s - send event signal 1 - ", name_string());
-  event.send(RTEMS_SIGNAL_1);
-  printf("%s\n", event.last_status_string());
-  
-  printf("%s - event wait forever for signal 1 from TA2 - ", name_string());
-  event.receive(RTEMS_SIGNAL_1, out, 0, rtemsEvent::wait, rtemsEvent::all);
-  printf("%s, signals out are 0x%08X\n", event.last_status_string(), out);  
-}
-
-
diff --git a/testsuites/libtests/rtems++/Task3.cc b/testsuites/libtests/rtems++/Task3.cc
deleted file mode 100644
index 73ddb3b6b2..0000000000
--- a/testsuites/libtests/rtems++/Task3.cc
+++ /dev/null
@@ -1,81 +0,0 @@
-/*  Task_3
- *
- *  This routine serves as a test task. Loopback the messages and test
- *  timeouts
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "System.h"
-
-Task3::Task3(const char* name,
-             const rtems_task_priority initial_priority,
-             const rtems_unsigned32 stack_size)
-  : rtemsTask(name, initial_priority, stack_size, RTEMS_NO_PREEMPT)
-{
-}
-  
-void Task3::body(rtems_task_argument )
-{
-  screen6();
-
-  printf("%s - destroy itself\n", name_string());
-  destroy();
-}
-
-void Task3::screen6()
-{
-  rtemsMessageQueue mq_2("MQ2");
-  printf("%s - construction connect mq_2 - %s\n", name_string(), mq_2.last_status_string());
-
-  if (mq_2.successful())
-  {
-    char in[100];
-    char out[100];
-    rtems_unsigned32 size;
-    bool loopback = true;
-  
-    while (loopback)
-    {
-    printf("%s - loopback from mq_2 to mq_2 ...\n", name_string()); fflush(stdout);
-
-    mq_2.receive(in, size);
-      printf("%s - mq_2 receive - %s, size=%i, message string size=%i\n",
-             name_string(), mq_2.last_status_string(), size, (int) strlen(in));
-      if (mq_2.successful())
-      {
-        if (size > (100 - 5))
-          printf("%s - size to large\n", name_string());
-        else
-        {
-          strcpy(out, name_string());
-          strcpy(out + 4, in);
-      
-          printf("%s - loopback to mq_2 - ", name_string());
-          mq_2.send(out, strlen(out) + 1);
-          printf("%s\n", mq_2.last_status_string());
-        }
-
-        if (strcmp(in, "broadcast message") == 0)
-          loopback = false;
-        else
-          wake_after(1500000);
-      }
-    }
-  }
-}
-
-
diff --git a/testsuites/libtests/rtems++/rtems++.doc b/testsuites/libtests/rtems++/rtems++.doc
deleted file mode 100644
index 5834b4077d..0000000000
--- a/testsuites/libtests/rtems++/rtems++.doc
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# $Id$
-#
-# COPYRIGHT (c) 1997
-# Objective Design Systems Ltd Pty (ODS)
-# All rights reserved (R) Objective Design Systems Ltd Pty
-# 
-# The license and distribution terms for this file may be found in the
-# file LICENSE in this distribution or at
-# http://www.OARcorp.com/rtems/license.html.
-#
-
-The file describes the directives and concepts tested by this test set.
-
-test set name: rtems++
-
-classes:
-  rtemsTask, rtemsTaskMode, rtemsEvent, rtemsMessageQueue
-
-concepts:
-
-  a. Verify each class tested can be constructed using each of the constructors.
-
-  b. Verify each class can be an owner of an object id if capable.
-
-  c. Verify each class can connect to an existing object id if capable.
-
-  d. Verify the operation of each method of each class.
-
diff --git a/testsuites/libtests/rtems++/rtems++.scn b/testsuites/libtests/rtems++/rtems++.scn
deleted file mode 100644
index 2b3682d6b6..0000000000
--- a/testsuites/libtests/rtems++/rtems++.scn
+++ /dev/null
@@ -1,161 +0,0 @@
-*** RTEMS++ TEST ***
-INIT - Task.create() - RTEMS[19] invalid thread priority
-INIT - Task.create() - RTEMS[00] successful completion
-INIT - Task.create() - RTEMS[16] illegal on calling thread
-INIT - Task.restart() - RTEMS[14] thread is in wrong state
-INIT - Task.start(0xDEADDEAD) - RTEMS[00] successful completion
-<pause - screen 1>
- * START Task Class test *
-TA1  - test argument - argument matched
-TA1  - copy constructor - local and this id's match
-TA1  - copy constructor - local and this name's match
-TA1  - copy operator - local and this id's match
-TA1  - copy operator - local and this name's match
-TA1  - not owner destroy's task - RTEMS[23] not owner of resource
-TA1  - connect to a local valid task name - RTEMS[00] successful completion
-TA1  - connect to an invalid task name - RTEMS[03] invalid object name
-SELF - connect to a task on an invalid node - RTEMS[21] invalid node id
-TA1  - restart from a non-owner - RTEMS[23] not owner of resource
-<pause - screen 2>
-TA1  - wake after 0 secs - RTEMS[00] successful completion
-TA1  - wake after 500 msecs - RTEMS[00] successful completion
-TA1  - wake after 5 secs - RTEMS[00] successful completion
-TA1  - wake when - to do
-TA1  - connected object wake after 0 secs - RTEMS[00] successful completion
-TA1  - connected object wake after 500 msecs - RTEMS[00] successful completion
-TA1  - connected object wake after 5 secs - RTEMS[00] successful completion
-TA1  - connected object wake when - to do
-SELF - self object wake after 0 secs - RTEMS[00] successful completion
-SELF - self object wake after 500 msecs - RTEMS[00] successful completion
-SELF - self object wake after 5 secs - RTEMS[00] successful completion
-SELF - self object wake when - to do
-TA1  - get priority - RTEMS[00] successful completion, priority is 10
-TA1  - set priority to 512 - RTEMS[19] invalid thread priority
-TA1  - set priority to 25 - RTEMS[00] successful completion
-TA1  - set priority to original - RTEMS[00] successful completion, priority was 25
-TA1  - connected object get priority - RTEMS[00] successful completion, priority is 10
-TA1  - connected object set priority to 512 - RTEMS[19] invalid thread priority
-TA1  - connected object set priority to 25 - RTEMS[00] successful completion
-TA1  - connected object set priority to original - RTEMS[00] successful completion, priority was 25
-SELF - self object get priority - RTEMS[00] successful completion, priority is 10
-SELF - self object set priority to 512 - RTEMS[19] invalid thread priority
-SELF - self object set priority to 25 - RTEMS[00] successful completion
-SELF - self object set priority to original - RTEMS[00] successful completion, priority was 25
-TA1  - get note - RTEMS[00] successful completion, note is 0
-TA1  - get with bad notepad number - RTEMS[10] number was invalid, note is 0
-TA1  - set note to 0xDEADBEEF - RTEMS[00] successful completion
-TA1  - get note - RTEMS[00] successful completion, note is 0xDEADBEEF
-TA1  - set note to original value - RTEMS[00] successful completion
-TA1  - connected object get note - RTEMS[00] successful completion, notepad is 0
-TA1  - connected object get with bad notepad number - RTEMS[10] number was invalid, note is 0
-TA1  - connected object set note to 0xDEADBEEF - RTEMS[00] successful completion
-TA1  - connected object get note - RTEMS[00] successful completion, note is 0xDEADBEEF
-TA1  - connected object set note to original value - RTEMS[00] successful completion
-SELF - self object get note - RTEMS[00] successful completion, note is 0
-SELF - self object get with bad notepad number - RTEMS[10] number was invalid, note is 0
-SELF - self object set note to 0xDEADBEEF - RTEMS[00] successful completion
-SELF - self object get note - RTEMS[00] successful completion, notepad is 0xDEADBEEF
-SELF - self object set note to original value - RTEMS[00] successful completion
- * END Task Class test *
-<pause - screen 3>
- * START TaskMode Class test *
-SELF - get mode - RTEMS[00] successful completion,
-         mode is 0x00000100, RTEMS_NO_PREEMPT RTEMS_NO_TIMESLICE RTEMS_NO_ASR INTMASK=0
-SELF - get preemption state - RTEMS[00] successful completion,
-         mode is 0x00000100, RTEMS_NO_PREEMPT 
-SELF - set preemption state to RTEMS_PREEMPT - RTEMS[00] successful completion,
-         mode is 0x00000000, RTEMS_PREEMPT RTEMS_TIMESLICE RTEMS_NO_ASR INTMASK=0
-SELF - set preemption state to RTEMS_NO_PREEMPT - RTEMS[00] successful completion,
-         mode is 0x00000100, RTEMS_NO_PREEMPT RTEMS_NO_TIMESLICE RTEMS_NO_ASR INTMASK=0
-SELF - get timeslice state - RTEMS[00] successful completion,
-         mode is 0x00000000, RTEMS_TIMESLICE 
-SELF - set timeslice state to RTEMS_TIMESLICE - RTEMS[00] successful completion,
-         mode is 0x00000300, RTEMS_NO_PREEMPT RTEMS_NO_TIMESLICE RTEMS_NO_ASR INTMASK=0
-SELF - set timeslice state to RTEMS_NO_TIMESLICE - RTEMS[00] successful completion,
-         mode is 0x00000100, RTEMS_NO_PREEMPT RTEMS_NO_TIMESLICE RTEMS_NO_ASR INTMASK=0
-SELF - get asr state - RTEMS[00] successful completion,
-         mode is 0x00000000, RTEMS_NO_ASR 
-SELF - set asr state to RTEMS_ASR - RTEMS[00] successful completion,
-         mode is 0x00000100, RTEMS_NO_PREEMPT RTEMS_NO_TIMESLICE RTEMS_NO_ASR INTMASK=0
-SELF - set asr state to RTEMS_NO_ASR - RTEMS[00] successful completion,
-         mode is 0x00000500, RTEMS_NO_PREEMPT RTEMS_NO_TIMESLICE RTEMS_ASR INTMASK=0
-SELF - get current interrupt level - RTEMS[00] successful completion, level is 0
-SELF - set interrupt level to 102 - RTEMS[00] successful completion
-SELF - set interrupt level to original level - RTEMS[00] successful completion, level was 0
-SELF - set mode to original mode - RTEMS[00] successful completion,
-         mode is 0x00000100, RTEMS_NO_PREEMPT RTEMS_NO_TIMESLICE RTEMS_NO_ASR INTMASK=0
- * END TaskMode Class test *
-<pause - screen 4>
- * START Event Class test *
-TA1  - create task 2 - RTEMS[00] successful completion
-TA1  - start task 2 - RTEMS[00] successful completion
-TA1  - construct event connecting to task 2 - RTEMS[00] successful completion
-TA2  - event no wait - RTEMS[13] request not satisfied
-TA2  - event 5 secs timeout - RTEMS[06] timed out waiting
-TA2  - event wait forever for signal 0 from TA1 ....
-TA1  - send event signal 0 using the task id - RTEMS[00] successful completion
-TA2  - RTEMS[00] successful completion, signals out are 0x00000001
-TA2  - event wait forever for signal 0 from TA1 ....
-TA1  - send event signal 0 using the task object reference - RTEMS[00] successful completion
-TA2  - RTEMS[00] successful completion, signals out are 0x00000001
-TA2  - event wait forever for signal 31 from TA1 ....
-TA1  - send event signal 31 using connected id - RTEMS[00] successful completion
-TA2  - RTEMS[00] successful completion, signals out are 0x80000000
-TA2  - event wait forever for signal 0 and 31 from TA1 ....
-TA1  - send event signal 0 and 31 - RTEMS[00] successful completion
-TA1  - waiting 5 secs for TA2 to finish
-TA2  - RTEMS[00] successful completion, signals out are 0x80000001
-TA2  - send event signal 1 - RTEMS[00] successful completion
-TA2  - event wait forever for signal 1 from TA2 - RTEMS[00] successful completion, signals out are 0x00000002
-TA2  - destory itself
- * END Event Class test *
-<pause - screen 5>
- * START Interrupt Class test *
- do not know a portable BSP type interrupt test
- * END Interrupt Class test *
-<pause - screen 6>
- * START MessageQueue Class test *
-TA1  - construct message queue 1 with no memory error - RTEMS[05] too many
-TA1  - construct/create message queue 2 - RTEMS[00] successful completion
-TA1  - send u1 to mq_2 - RTEMS[00] successful completion
-TA1  - urgent send u2 to mq_2 - RTEMS[00] successful completion
-TA1  - create task 3_1 - RTEMS[00] successful completion
-TA1  - start task 3_1 - RTEMS[00] successful completion
-TA1  - create task 3_2 - RTEMS[00] successful completion
-TA1  - start task 3_2 - RTEMS[00] successful completion
-TA31 - construction connect mq_2 - RTEMS[00] successful completion
-TA31 - loopback from mq_2 to mq_2 ...
-TA31 - mq_2 receive - RTEMS[00] successful completion, size=12, message string size=11
-TA31 - loopback to mq_2 - RTEMS[00] successful completion
-TA32 - construction connect mq_2 - RTEMS[00] successful completion
-TA32 - loopback from mq_2 to mq_2 ...
-TA32 - mq_2 receive - RTEMS[00] successful completion, size=12, message string size=11
-TA32 - loopback to mq_2 - RTEMS[00] successful completion
-TA1  - receive u2 on mq_2 ...
-TA1  - RTEMS[00] successful completion
-TA1  - message u2 received correctly
-TA1  - receive u1 on mq_2 ...
-TA1  - RTEMS[00] successful completion
-TA1  - message u1 received correctly
-TA31 - loopback from mq_2 to mq_2 ...
-TA32 - loopback from mq_2 to mq_2 ...
-TA1  - broadcast send b1 ...
-TA1  - mq_2 broadcast send - RTEMS[00] successful completion, count=2
-TA31 - mq_2 receive - RTEMS[00] successful completion, size=18, message string size=17
-TA31 - loopback to mq_2 - RTEMS[00] successful completion
-TA31 - destory itself
-TA32 - mq_2 receive - RTEMS[00] successful completion, size=18, message string size=17
-TA32 - loopback to mq_2 - RTEMS[00] successful completion
-TA32 - destory itself
-TA1  - receive message b1 on mq_2 from TA31...
-TA1  - RTEMS[00] successful completion
-TA1  - message b1 received correctly
-TA1  - receive message b1 on mq_2 from TA31...
-TA1  - RTEMS[00] successful completion
-TA1  - message b1 received correctly
-TA1  - send f1 to mq_2 - RTEMS[00] successful completion
-TA1  - send f1 to mq_2 - RTEMS[00] successful completion
-TA1  - send f1 to mq_2 - RTEMS[00] successful completion
-TA1  - flush mq_2 - RTEMS[00] successful completion, flushed=3
- * END MessageQueue Class test *
-<pause - screen 7>
diff --git a/testsuites/libtests/rtmonuse/getall.c b/testsuites/libtests/rtmonuse/getall.c
deleted file mode 100644
index 85f6470d1c..0000000000
--- a/testsuites/libtests/rtmonuse/getall.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/*  Get_all_counters
- *
- *  This routine allows TA5 to atomically obtain the iteration counters.
- *
- *  Input parameters:  NONE
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-void Get_all_counters()
-{
-  rtems_mode        previous_mode;
-  rtems_status_code status;
-
-  status = rtems_task_mode(
-    RTEMS_NO_PREEMPT,
-    RTEMS_PREEMPT_MASK,
-    &previous_mode
-  );
-  directive_failed( status, "rtems_task_mode to RTEMS_NO_PREEMPT" );
-
-  Temporary_count = Count;
-  Count.count[ 1 ] = 0;
-  Count.count[ 2 ] = 0;
-  Count.count[ 3 ] = 0;
-  Count.count[ 4 ] = 0;
-  Count.count[ 5 ] = 0;
-
-  status = rtems_task_mode( RTEMS_PREEMPT, RTEMS_PREEMPT_MASK, &previous_mode );
-  directive_failed( status, "rtems_task_mode to RTEMS_PREEMPT" );
-}
diff --git a/testsuites/libtests/rtmonuse/init.c b/testsuites/libtests/rtmonuse/init.c
deleted file mode 100644
index c599df3c5a..0000000000
--- a/testsuites/libtests/rtmonuse/init.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/*  Init
- *
- *  This routine is the initialization task for this test program.
- *  It is a user initialization task and has the responsibility for creating
- *  and starting the tasks that make up the test.  If the time of day
- *  clock is required for the test, it should also be set to a known
- *  value by this function.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "system.h"
-
-#include "rtmonuse.h"
-
-rtems_task Init(
-  rtems_task_argument argument
-)
-{
-  rtems_unsigned32  index;
-  rtems_status_code status;
-
-  puts( "\n\n*** RATE MONOTONIC PERIOD STATISTICS TEST ***" );
-  Period_usage_Initialize();
-
-  Task_name[ 1 ] =  rtems_build_name( 'T', 'A', '1', ' ' );
-  Task_name[ 2 ] =  rtems_build_name( 'T', 'A', '2', ' ' );
-  Task_name[ 3 ] =  rtems_build_name( 'T', 'A', '3', ' ' );
-  Task_name[ 4 ] =  rtems_build_name( 'T', 'A', '4', ' ' );
-  Task_name[ 5 ] =  rtems_build_name( 'T', 'A', '5', ' ' );
-
-  for ( index = 1 ; index <= 5 ; index++ ) {
-    status = rtems_task_create(
-      Task_name[ index ],
-      Priorities[ index ],
-      RTEMS_MINIMUM_STACK_SIZE * 4,
-      RTEMS_DEFAULT_MODES,
-      (index == 5) ? RTEMS_FLOATING_POINT : RTEMS_DEFAULT_ATTRIBUTES,
-      &Task_id[ index ]
-    );
-    directive_failed( status, "rtems_task_create loop" );
-  }
-
-  for ( index = 1 ; index <= 5 ; index++ ) {
-    status = rtems_task_start( Task_id[ index ], Task_1_through_5, index );
-    directive_failed( status, "rtems_task_start loop" );
-  }
-
-  Count.count[ 1 ] = 0;
-  Count.count[ 2 ] = 0;
-  Count.count[ 3 ] = 0;
-  Count.count[ 4 ] = 0;
-  Count.count[ 5 ] = 0;
-
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-}
diff --git a/testsuites/libtests/rtmonuse/rtmonuse.scn b/testsuites/libtests/rtmonuse/rtmonuse.scn
deleted file mode 100644
index bb4e8814da..0000000000
--- a/testsuites/libtests/rtmonuse/rtmonuse.scn
+++ /dev/null
@@ -1,27 +0,0 @@
-*** TEST 20 ***
-TA1 - rtems_rate_monotonic_create id = 0x28010001
-TA1 - rtems_rate_monotonic_ident id = 0x28010001
-TA1 - (0x28010001) period 2
-TA2 - rtems_rate_monotonic_create id = 0x28010002
-TA2 - rtems_rate_monotonic_ident id = 0x28010002
-TA2 - (0x28010002) period 2
-TA3 - rtems_rate_monotonic_create id = 0x28010003
-TA3 - rtems_rate_monotonic_ident id = 0x28010003
-TA3 - (0x28010003) period 2
-TA4 - rtems_rate_monotonic_create id = 0x28010004
-TA4 - rtems_rate_monotonic_ident id = 0x28010004
-TA4 - (0x28010004) period 2
-TA5 - rtems_rate_monotonic_create id = 0x28010005
-TA5 - rtems_rate_monotonic_ident id = 0x28010005
-TA5 - (0x28010005) period 100
-TA5 - PERIODS CHECK OK (1)
-TA5 - PERIODS CHECK OK (2)
-TA5 - PERIODS CHECK OK (3)
-TA5 - PERIODS CHECK OK (4)
-TA5 - PERIODS CHECK OK (5)
-TA5 - PERIODS CHECK OK (6)
-TA5 - PERIODS CHECK OK (7)
-TA5 - PERIODS CHECK OK (8)
-TA5 - PERIODS CHECK OK (9)
-TA5 - PERIODS CHECK OK (10)
-*** END OF TEST 20 ***
diff --git a/testsuites/libtests/rtmonuse/system.h b/testsuites/libtests/rtmonuse/system.h
deleted file mode 100644
index b10fb1193b..0000000000
--- a/testsuites/libtests/rtmonuse/system.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*  system.h
- *
- *  This include file contains information that is included in every
- *  function in the test set.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <tmacros.h>
-
-/* types */
-
-struct counters {
-  rtems_unsigned32 count[6];
-};
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
- 
-rtems_task Task_1_through_5(
-  rtems_task_argument argument
-);
- 
-void Get_all_counters( void );
- 
-/* configuration information */
-
-#define CONFIGURE_SPTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_INIT_TASK_PRIORITY          10
-#define CONFIGURE_INIT_TASK_INITIAL_MODES     RTEMS_DEFAULT_MODES
-#define CONFIGURE_MAXIMUM_PERIODS             10
-
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#define CONFIGURE_EXTRA_TASK_STACKS           (15 * RTEMS_MINIMUM_STACK_SIZE)
-#include <confdefs.h>
-
-/* global variables */
-
-TEST_EXTERN rtems_id   Task_id[ 6 ];     /* array of task ids */
-TEST_EXTERN rtems_name Task_name[ 6 ];   /* array of task names */
-
-TEST_EXTERN struct counters Count;       /* iteration counters */
-TEST_EXTERN struct counters Temporary_count;
-extern rtems_task_priority Priorities[ 6 ];
-
-/* end of include file */
diff --git a/testsuites/libtests/rtmonuse/task1.c b/testsuites/libtests/rtmonuse/task1.c
deleted file mode 100644
index 92b22178af..0000000000
--- a/testsuites/libtests/rtmonuse/task1.c
+++ /dev/null
@@ -1,124 +0,0 @@
-/*  Task_1_through_5
- *
- *  This routine serves as a test task for the period capabilities of the
- *  Rate Monotonic Manager.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-#include <cpuuse.h>
-#include "rtmonuse.h"
-
-rtems_unsigned32    Periods[6]    = { 0,   2,   2,   2,   2, 100 };
-rtems_unsigned32    Iterations[6] = { 0,  50,  50,  50,  50,   1 };
-rtems_task_priority Priorities[6] = { 0,   1,   1,   3,   4,   5 };
-
-rtems_task Task_1_through_5(
-  rtems_unsigned32 argument
-)
-{
-  rtems_id          rmid;
-  rtems_id          test_rmid;
-  rtems_unsigned32  index;
-  rtems_unsigned32  pass;
-  rtems_unsigned32  failed;
-  rtems_status_code status;
-
-  status = rtems_rate_monotonic_create( argument, &rmid );
-  directive_failed( status, "rtems_rate_monotonic_create" );
-  put_name( Task_name[ argument ], FALSE );
-  printf( "- rtems_rate_monotonic_create id = 0x%08x\n", rmid );
-
-  status = rtems_rate_monotonic_ident( argument, &test_rmid );
-  directive_failed( status, "rtems_rate_monotonic_ident" );
-  put_name( Task_name[ argument ], FALSE );
-  printf( "- rtems_rate_monotonic_ident id = 0x%08x\n", test_rmid );
-
-  if ( rmid != test_rmid ) {
-     printf( "RMID's DO NOT MATCH (0x%x and 0x%x)\n", rmid, test_rmid );
-     exit( 0 );
-  }
-
-  put_name( Task_name[ argument ], FALSE );
-  printf( "- (0x%08x) period %d\n", rmid, Periods[ argument ] );
-
-  status = rtems_task_wake_after( 2 );
-  directive_failed( status, "rtems_task_wake_after" );
-
-  switch ( argument ) {
-    case 1:
-    case 2:
-    case 3:
-    case 4:
-      while ( FOREVER ) {
-        Period_usage_Update( rmid );
-
-        status = rtems_rate_monotonic_period( rmid, Periods[ argument ] );
-        directive_failed( status, "rtems_rate_monotonic_period" );
-        Count.count[ argument ]++;
-      }
-      break;
-    case 5:
-      pass   = 0;
-      failed = 0;
-
-      status = rtems_rate_monotonic_period( rmid, Periods[ argument ] );
-      directive_failed( status, "rtems_rate_monotonic_period 1 of TA5" );
-
-      Get_all_counters();
-
-      while ( FOREVER ) {
-        Period_usage_Update( rmid );
-
-        status = rtems_rate_monotonic_period( rmid, Periods[ argument ] );
-        directive_failed( status, "rtems_rate_monotonic_period 2 of TA5" );
-
-        Get_all_counters();
-
-        for( index = 1 ; index <= 4 ; index++ ) {
-          if ( Temporary_count.count[ index ] != Iterations[ index ] ) {
-            puts_nocr( "FAIL -- " );
-            put_name ( Task_name[ index ], FALSE );
-            printf   ( " Actual=%d, Expected=%d\n",
-                       Temporary_count.count[ index ],
-                       Iterations[ index ]
-                     );
-            failed += 1;
-          }
-        }
-
-        if ( failed == 5 )
-          exit( 0 );
-
-        pass += 1;
-
-        printf( "TA5 - PERIODS CHECK OK (%d)\n", pass );
-
-        fflush( stdout );
-
-        if ( pass == 10 ) {
-          puts( "*** END OF RATE MONOTONIC PERIOD STATISTICS TEST ***" );
-          CPU_usage_Dump();
-          Period_usage_Dump();
-          exit( 0 );
-        }
-
-      }
-      break;
-  }
-}
diff --git a/testsuites/libtests/stackchk/blow.c b/testsuites/libtests/stackchk/blow.c
deleted file mode 100644
index 0be35308c8..0000000000
--- a/testsuites/libtests/stackchk/blow.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*  task1.c
- *
- *  This set of three tasks do some simple task switching for about
- *  15 seconds and then call a routine to "blow the stack".
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems.h>
-
-void b() {}
-
-void blow_stack( void )
-{
-  volatile unsigned32 *low, *high;
-  unsigned char *area;
-
-b();
-  /*
-   *  Destroy the first and last 16 bytes of our stack... Hope it
-   *  does not cause problems :)
-   */
-
- area = (unsigned char *)_Thread_Executing->Start.Initial_stack.area;
-
- low  = (volatile unsigned32 *) (area + HEAP_OVERHEAD);
- high = (volatile unsigned32 *)
-            (area + _Thread_Executing->Start.Initial_stack.size - 16);
-
-
- low[0] = 0x11111111;
- low[1] = 0x22222222;
- low[2] = 0x33333333;
- low[3] = 0x44444444;
-
- high[0] = 0x55555555;
- high[1] = 0x66666666;
- high[2] = 0x77777777;
- high[3] = 0x88888888;
-
-}
diff --git a/testsuites/libtests/stackchk/init.c b/testsuites/libtests/stackchk/init.c
deleted file mode 100644
index f4aab85d95..0000000000
--- a/testsuites/libtests/stackchk/init.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/*  Init
- *
- *  This routine is the initialization task for this test program.
- *  It is a user initialization task and has the responsibility for creating
- *  and starting the tasks that make up the test.  If the time of day
- *  clock is required for the test, it should also be set to a known
- *  value by this function.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "system.h"
-
-rtems_task Init(
-  rtems_task_argument argument
-)
-{
-  rtems_time_of_day time;
-  rtems_status_code status;
-
-  puts( "\n\n*** TEST STACK CHECKER ***" );
-
-  build_time( &time, 12, 31, 1988, 9, 0, 0, 0 );
-  status = rtems_clock_set( &time );
-  directive_failed( status, "rtems_clock_set" );
-
-  Task_name[ 1 ] = rtems_build_name( 'T', 'A', '1', ' ' );
-  Task_name[ 2 ] = rtems_build_name( 'T', 'A', '2', ' ' );
-  Task_name[ 3 ] = rtems_build_name( 'T', 'A', '3', ' ' );
-
-  status = rtems_task_create(
-     Task_name[ 1 ],
-     1,
-     TASK_STACK_SIZE,
-     RTEMS_DEFAULT_MODES,
-     RTEMS_DEFAULT_ATTRIBUTES,
-     &Task_id[ 1 ]
-  );
-  directive_failed( status, "rtems_task_create of TA1" );
-
-  status = rtems_task_create(
-     Task_name[ 2 ],
-     1,
-     TASK_STACK_SIZE,
-     RTEMS_DEFAULT_MODES,
-     RTEMS_DEFAULT_ATTRIBUTES,
-     &Task_id[ 2 ]
-  );
-  directive_failed( status, "rtems_task_create of TA2" );
-
-  status = rtems_task_create(
-     Task_name[ 3 ],
-     1,
-     TASK_STACK_SIZE,
-     RTEMS_DEFAULT_MODES,
-     RTEMS_DEFAULT_ATTRIBUTES,
-     &Task_id[ 3 ]
-  );
-  directive_failed( status, "rtems_task_create of TA3" );
-
-  status = rtems_task_start( Task_id[ 1 ], Task_1_through_3, 0 );
-  directive_failed( status, "rtems_task_start of TA1" );
-
-  status = rtems_task_start( Task_id[ 2 ], Task_1_through_3, 0 );
-  directive_failed( status, "rtems_task_start of TA2" );
-
-  status = rtems_task_start( Task_id[ 3 ], Task_1_through_3, 0 );
-  directive_failed( status, "rtems_task_start of TA3" );
-
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-}
diff --git a/testsuites/libtests/stackchk/stackchk.scn b/testsuites/libtests/stackchk/stackchk.scn
deleted file mode 100644
index 84a5c5e342..0000000000
--- a/testsuites/libtests/stackchk/stackchk.scn
+++ /dev/null
@@ -1,9 +0,0 @@
-*** TEST STACK CHECKER ***
-TA1  - rtems_clock_get - 09:00:00   12/31/1988
-TA2  - rtems_clock_get - 09:00:00   12/31/1988
-TA3  - rtems_clock_get - 09:00:00   12/31/1988
-TA1  - rtems_clock_get - 09:00:05   12/31/1988
-TA1  - rtems_clock_get - 09:00:10   12/31/1988
-TA2  - rtems_clock_get - 09:00:10   12/31/1988
-TA1  - rtems_clock_get - 09:00:15   12/31/1988
----> error indictation
diff --git a/testsuites/libtests/stackchk/system.h b/testsuites/libtests/stackchk/system.h
deleted file mode 100644
index a656d24e26..0000000000
--- a/testsuites/libtests/stackchk/system.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*  system.h
- *
- *  This include file contains information that is included in every
- *  function in the test set.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <tmacros.h>
-
-/* macros */
-
-#define TASK_STACK_SIZE (RTEMS_MINIMUM_STACK_SIZE*3)
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
-
-rtems_task Task_1_through_3(
-  rtems_task_argument argument
-);
-
-void blow_stack( void );
-
-/* configuration information */
-
-#define CONFIGURE_SPTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#define STACK_CHECKER_ON
-
-#include <confdefs.h>
-
-/* global variables */
-
-TEST_EXTERN rtems_id   Task_id[ 4 ];         /* array of task ids */
-TEST_EXTERN rtems_name Task_name[ 4 ];       /* array of task names */
-
-/* end of include file */
diff --git a/testsuites/libtests/stackchk/task1.c b/testsuites/libtests/stackchk/task1.c
deleted file mode 100644
index 14cc35ae35..0000000000
--- a/testsuites/libtests/stackchk/task1.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/*  task1.c
- *
- *  This set of three tasks do some simple task switching for about
- *  15 seconds and then call a routine to "blow the stack".
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_task Task_1_through_3(
-  rtems_task_argument argument
-)
-{
-  rtems_id          tid;
-  rtems_time_of_day time;
-  rtems_status_code status;
-
-  status = rtems_task_ident( RTEMS_SELF, RTEMS_SEARCH_ALL_NODES, &tid );
-  directive_failed( status, "rtems_task_ident" );
-
-  while( FOREVER ) {
-    status = rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time );
-    directive_failed( status, "rtems_clock_get" );
-
-    if ( time.second >= 15 && tid == Task_id[ 1 ] ) {
-       blow_stack();
-    }
-
-    put_name( Task_name[ task_number( tid ) ], FALSE );
-    print_time( " - rtems_clock_get - ", &time, "\n" );
-
-    status = rtems_task_wake_after( task_number( tid ) * 5 * TICKS_PER_SECOND );
-    directive_failed( status, "rtems_task_wake_after" );
-  }
-}
diff --git a/testsuites/libtests/termios/README b/testsuites/libtests/termios/README
deleted file mode 100644
index 6991d80309..0000000000
--- a/testsuites/libtests/termios/README
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-#  $Id$
-#
-
-These tests are brought to you by the letter `q'.
-
-VMIN=0, VTIME=0
-        Each letter you type should produce a line of output.
-        The `count' should be quite large, since (as you correctly
-        pointed out) the read is non-blocking.  The time should be
-        the interval between typing characters.
-        Type a `q' to finish the test.
-VMIN=0, VTIME=20
-        Again, each letter should produce a line of output.  The
-        `count' should be much smaller -- the read is non-blocking
-        but has a timeout of 2 seconds, so the count should be about
-        half the `interval'.
-        Type a `q' to finish the test.
-VMIN=5, VTIME=0
-        A line should be produced for every 5 characters typed.  The
-        count should be 1.  This is a blocking read.
-        Type a `q' as the first character of a group of 5 to finish
-        the test.
-VMIN=5, VTIME=20
-        Type a character.  Two seconds later a line should be printed.
-        Count should be 1.  Type a character, and another within 2  
-seconds.
-        Two seconds after last character (or right after the 5th  
-character)
-        a line should be printed.
-        Type a `q' as the first character of a group to finish the test.
-        
-Clear???
-
-Also, when testing the cooked mode input, try typing some tabs  
-and/or control characters and make sure that you can backspace over  
-them properly.
-
----
-Eric Norum
-eric@skatter.usask.ca
-Saskatchewan Accelerator Laboratory
-University of Saskatchewan
-Saskatoon, Canada.
-
diff --git a/testsuites/libtests/termios/init.c b/testsuites/libtests/termios/init.c
deleted file mode 100644
index 96c7e0934e..0000000000
--- a/testsuites/libtests/termios/init.c
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * RTEMS configuration/initialization
- * 
- * This program may be distributed and used for any purpose.
- * I ask only that you:
- *	1. Leave this author information intact.
- *	2. Document any changes you make.
- *
- * W. Eric Norum
- * Saskatchewan Accelerator Laboratory
- * University of Saskatchewan
- * Saskatoon, Saskatchewan, CANADA
- * eric@skatter.usask.ca
- *
- *  $Id$
- */
-
-#include <bsp.h>
-
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#define CONFIGURE_MAXIMUM_SEMAPHORES		20
-#define CONFIGURE_MAXIMUM_TIMERS		5
-#define CONFIGURE_MAXIMUM_PERIODS		1
-
-#define CONFIGURE_MICROSECONDS_PER_TICK	        1000
-
-#define CONFIGURE_INIT
-rtems_task Init (rtems_task_argument argument);
-
-#include <confdefs.h>
-
-#include <stdio.h>
-#include <unistd.h>
-#include <termios.h>
-#include <errno.h>
-#include <string.h>
-
-/*
- * Test raw (ICANON=0) input
- */
-static void
-testRawInput (int vmin, int vtime)
-{
-	int i;
-	struct termios old, new;
-	rtems_interval ticksPerSecond, then, now;
-	unsigned int msec;
-	unsigned long count;
-	int nread;
-	unsigned char cbuf[100];
-
-	printf ("*** Raw input  VMIN=%d  VTIME=%d ***\n", vmin, vtime);
-	rtems_clock_get (RTEMS_CLOCK_GET_TICKS_PER_SECOND, &ticksPerSecond);
-	i = tcgetattr (fileno (stdin), &old);
-	if (i < 0) {
-		printf ("tcgetattr failed: %s\n", strerror (errno));
-		return;
-	}
-	new = old;
-	new.c_lflag &= ~(ICANON|ECHO|ECHONL|ECHOK|ECHOE|ECHOPRT|ECHOCTL);
-	new.c_cc[VMIN] = vmin;
-	new.c_cc[VTIME] = vtime;
-	i = tcsetattr (fileno (stdin), TCSANOW, &new);
-	if (i < 0) {
-		printf ("tcsetattr failed: %s\n", strerror (errno));
-		return;
-	}
-	do {
-		rtems_clock_get (RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &then);
-		count = 0;
-		for (;;) {
-			nread = read (fileno (stdin), cbuf, sizeof cbuf);
-			if (nread < 0) {
-				printf ("Read error: %s\n", strerror (errno));
-				goto out;
-			}
-			count++;
-			if (nread != 0)
-				break;
-		}
-		rtems_clock_get (RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &now);
-		msec = (now - then) * 1000 / ticksPerSecond;
-		printf ("Count:%-10lu  Interval:%3u.%3.3d  Char:",
-					count, msec / 1000, msec % 1000);
-		for (i = 0 ; i < nread ; i++)
-			printf (" %2.2x", cbuf[i]);
-		printf ("\n");
-	} while (cbuf[0] != 'q');
-    out:
-	i = tcsetattr (fileno (stdin), TCSANOW, &old);
-	if (i < 0)
-		printf ("tcsetattr failed: %s\n", strerror (errno));
-	printf ("*** End of Raw input  VMIN=%d  VTIME=%d ***\n", vmin, vtime);
-}
-
-/*
- * RTEMS Startup Task
- */
-rtems_task
-Init (rtems_task_argument ignored)
-{
-	int i, j;
-
-	printf( "\n\n*** HELLO WORLD TEST ***\n" );
-	printf( "Hello World\n" );
-	printf( "*** END OF HELLO WORLD TEST ***\n" );
-
-        printf( "\n\ntype 'q' to exit raw input tests\n\n" );
-
-	for (;;) {
-		/*
-		 * Test  blocking, line-oriented input
-		 */
-		do {
-			printf (">>> ");
-			fflush (stdout);
-			i = scanf (" %d", &j);
-			printf ("Return: %d Value: %d\n", i, j);
-		} while (i != 0);
-
-		/*
-		 * Consume what scanf rejected
-		 */
-		while ((i = getchar ()) != '\n')
-			if (i == EOF)
-				break;
-
-		/*
-		 * Test character-oriented input
-		 */
-		testRawInput (0, 0);
-		testRawInput (0, 20);
-		testRawInput (5, 0);
-		testRawInput (5, 20);
-	}
-	exit (1);
-}
diff --git a/testsuites/mptests/README b/testsuites/mptests/README
deleted file mode 100644
index 68cb459b55..0000000000
--- a/testsuites/mptests/README
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-#  $Id$
-#
-
-This directory contains the RTEMS Multiprocessor Test Suite.
-The tests in this directory provide near complete (98%+) test
-coverage of the multiprocessor specific code in RTEMS.
-
-These tests are designed to test RTEMS in a two node configuration.
-
diff --git a/testsuites/mptests/mp01/init.c b/testsuites/mptests/mp01/init.c
deleted file mode 100644
index 4234ba1473..0000000000
--- a/testsuites/mptests/mp01/init.c
+++ /dev/null
@@ -1,96 +0,0 @@
-/*  Init
- *
- *  This routine is the initialization task for this test program.
- *  It is a user initialization task and has the responsibility for creating
- *  and starting the tasks that make up the test.  If the time of day
- *  clock is required for the test, it should also be set to a known
- *  value by this function.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "system.h"
-
-rtems_task Init(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-  rtems_time_of_day time;
-  char              c;
-
-  printf(
-    "\n\n*** TEST 1 -- NODE %d ***\n",
-    Multiprocessing_configuration.node
-  );
-
-  if ( Multiprocessing_configuration.node != 1 ) c = 'S';
-  else                                           c = 'M';
-
-  Task_name[ 1 ] = rtems_build_name( c, 'A', '1', ' ' );
-  Task_name[ 2 ] = rtems_build_name( c, 'A', '2', ' ' );
-  Task_name[ 3 ] = rtems_build_name( c, 'A', '3', ' ' );
-
-  build_time( &time, 12, 31, 1988, 9, 0, 0, 0 );
-  status = rtems_clock_set( &time );
-  directive_failed( status, "rtems_clock_set" );
-
-  puts( "Creating task 1 (Global)" );
-  status = rtems_task_create(
-    Task_name[ 1 ],
-    1,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_GLOBAL,
-    &Task_id[ 1 ]
-  );
-  directive_failed( status, "rtems_task_create of Task 1" );
-
-  puts( "Creating task 2 (Global)" );
-  status = rtems_task_create(
-    Task_name[ 2 ],
-    1,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_TIMESLICE,
-    RTEMS_GLOBAL,
-    &Task_id[ 2 ]
-  );
-  directive_failed( status, "rtems_task_create of Task 2" );
-
-  puts( "Creating task 3 (Local)" );
-  status = rtems_task_create(
-    Task_name[ 3 ],
-    1,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Task_id[ 3 ]
-  );
-  directive_failed( status, "rtems_task_create of Task 3" );
-
-  status = rtems_task_start( Task_id[ 1 ], Test_task, 0 );
-  directive_failed( status, "rtems_task_start of Task 1" );
-
-  status = rtems_task_start( Task_id[ 2 ], Test_task, 0 );
-  directive_failed( status, "rtems_task_start of Task 2" );
-
-  status = rtems_task_start( Task_id[ 3 ], Test_task, 0 );
-  directive_failed( status, "rtems_task_start of Task 3" );
-
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-}
diff --git a/testsuites/mptests/mp01/node1/mp01.doc b/testsuites/mptests/mp01/node1/mp01.doc
deleted file mode 100644
index f2c86a4433..0000000000
--- a/testsuites/mptests/mp01/node1/mp01.doc
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
-This file describes the directives and concepts tested by this test set.
-
-test set name:  test50
-
-directives:
-  ex_init, ex_start, t_create, t_start, tm_tick, i_return, t_ident,
-  tm_set, tm_get, tm_wkafter, t_delete
-
-concepts:
-
-  a.  Verifies system can create and start both the executive's system
-      initialization and idle task.
-
-  b.  Verifies executive can swap between three application tasks at the
-      same priority and the executive's internal idle task.
-
-  c.  Verifies can print strings to the CRT on port 2 of the mvme136 board
-      using Print and Println in the board support package.
-
-  d.  Verifies interrupt handler can handler a task switch from an interrupt
-      as specified with the i_return directive.
-
-  e.  Verifies executive initialization performed correctly.
-
-  f.  Verifies the executive trap handler except for the halt function.
-
-  g.  Verifies that a task can get the task identification number of itself.
-
-  h.  Verifies that a task can get the task identification number
-      of a global task on the local processor.
-
-  i.  Verifies that a task can delete itself or a global task on
-      the local processor.
-
-  j.  Verifies Shared Memory Locked Queue driver for initialization,
-      getting a packet, broadcasting a packet, and returning a packet.
-
-  k.  Can be used to verify that global packet type P_SYSVERIFY,
-      P_OBJCREATE (task), and P_OBJDELETE (task) are sent and
-      correctly processed by a remote node.
diff --git a/testsuites/mptests/mp01/node1/mp01.scn b/testsuites/mptests/mp01/node1/mp01.scn
deleted file mode 100644
index d399f79b2a..0000000000
--- a/testsuites/mptests/mp01/node1/mp01.scn
+++ /dev/null
@@ -1,15 +0,0 @@
-*** TEST 1 -- NODE 1 ***
-Creating task 1 (Global)
-Creating task 2 (Global)
-Creating task 3 (Local)
-MA1 - rtems_clock_get - 09:00:00   12/31/1988
-MA2 - rtems_clock_get - 09:00:00   12/31/1988
-MA3 - rtems_clock_get - 09:00:00   12/31/1988
-MA1 - rtems_clock_get - 09:00:05   12/31/1988
-MA1 - deleting self
-MA2 - rtems_clock_get - 09:00:10   12/31/1988
-MA2 - waiting to be deleted by MA3
-MA3 - rtems_clock_get - 09:00:15   12/31/1988
-MA3 - getting TID of MA2
-MA3 - deleting MA2
-*** END OF TEST 1 ***
diff --git a/testsuites/mptests/mp01/node2/mp01.doc b/testsuites/mptests/mp01/node2/mp01.doc
deleted file mode 100644
index 496f3569e5..0000000000
--- a/testsuites/mptests/mp01/node2/mp01.doc
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
diff --git a/testsuites/mptests/mp01/node2/mp01.scn b/testsuites/mptests/mp01/node2/mp01.scn
deleted file mode 100644
index c9831ff9db..0000000000
--- a/testsuites/mptests/mp01/node2/mp01.scn
+++ /dev/null
@@ -1,15 +0,0 @@
-*** TEST 1 -- NODE 2 ***
-Creating task 1 (Global)
-Creating task 2 (Global)
-Creating task 3 (Local)
-SA1 - rtems_clock_get - 09:00:00   12/31/1988
-SA2 - rtems_clock_get - 09:00:00   12/31/1988
-SA3 - rtems_clock_get - 09:00:00   12/31/1988
-SA1 - rtems_clock_get - 09:00:05   12/31/1988
-SA1 - deleting self
-SA2 - rtems_clock_get - 09:00:10   12/31/1988
-SA2 - waiting to be deleted by SA3
-SA3 - rtems_clock_get - 09:00:15   12/31/1988
-SA3 - getting TID of SA2
-SA3 - deleting SA2
-*** END OF TEST 1 ***
diff --git a/testsuites/mptests/mp01/system.h b/testsuites/mptests/mp01/system.h
deleted file mode 100644
index 2abd7fabfa..0000000000
--- a/testsuites/mptests/mp01/system.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*  system.h
- *
- *  This include file contains information that is included in every
- *  function in the test set.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <tmacros.h>
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
-
-rtems_task Test_task(
-  rtems_task_argument argument
-);
-
-/* configuration information */
- 
-#define CONFIGURE_MPTEST
- 
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
- 
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-#define CONFIGURE_INIT_TASK_ATTRIBUTES    RTEMS_GLOBAL
-
-#include <confdefs.h>
-
-/* variables */
-
-TEST_EXTERN rtems_id   Task_id[ 4 ];     /* array of task ids */
-TEST_EXTERN rtems_name Task_name[ 4 ];   /* array of task names */
-
-/* end of include file */
diff --git a/testsuites/mptests/mp01/task1.c b/testsuites/mptests/mp01/task1.c
deleted file mode 100644
index 559ef3781a..0000000000
--- a/testsuites/mptests/mp01/task1.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/*  Test_task
- *
- *  This task is used for three test tasks.  It obtains its task id and
- *  based upon that id, performs certain actions.
- *
- *       Task_1 delays 5 seconds and deletes itself.
- *       Task_2 delays 10 seconds and then loops until
- *             deleted by the third task.
- *       Task 3 delays 15 seconds, then deletes task 2 and itself.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_task Test_task(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-  rtems_id          tid;
-  rtems_time_of_day time;
-
-  status = rtems_task_ident( RTEMS_SELF, RTEMS_SEARCH_ALL_NODES, &tid );
-  directive_failed( status, "rtems_task_ident" );
-
-  status = rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time );
-  directive_failed( status, "rtems_clock_get" );
-
-  put_name( Task_name[ task_number( tid ) ], FALSE );
-  print_time( " - rtems_clock_get - ", &time, "\n" );
-
-  status = rtems_task_wake_after( task_number( tid ) * 1 * TICKS_PER_SECOND );
-  directive_failed( status, "rtems_task_wake_after" );
-
-  status = rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time );
-  directive_failed( status, "rtems_clock_get" );
-  put_name( Task_name[ task_number( tid ) ], FALSE );
-  print_time( " - rtems_clock_get - ", &time, "\n" );
-
-  if ( task_number(tid) == 1 ) {          /* TASK 1 */
-    put_name( Task_name[ 1 ], FALSE );
-    printf( " - deleting self\n" );
-    status = rtems_task_delete( RTEMS_SELF );
-    directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-  }
-  else if ( task_number(tid) == 2 ) {     /* TASK 2 */
-    put_name( Task_name[ 2 ], FALSE );
-    printf( " - waiting to be deleted by " );
-    put_name( Task_name[ 3 ], TRUE );
-    while ( FOREVER );
-  }
-  else {                                  /* TASK 3 */
-    put_name( Task_name[ 3 ], FALSE );
-    printf( " - getting TID of " );
-    put_name( Task_name[ 2 ], TRUE );
-    do {
-      status = rtems_task_ident( Task_name[ 2 ], RTEMS_SEARCH_ALL_NODES, &tid );
-    } while ( status != RTEMS_SUCCESSFUL );
-    directive_failed( status, "rtems_task_ident" );
-
-    put_name( Task_name[ 3 ], FALSE );
-    printf( " - deleting " );
-    put_name( Task_name[ 2 ], TRUE );
-    status = rtems_task_delete( tid );
-    directive_failed( status, "rtems_task_delete of Task 2" );
-
-    puts( "*** END OF TEST 1 ***" );
-    exit(0);
-  }
-}
diff --git a/testsuites/mptests/mp02/init.c b/testsuites/mptests/mp02/init.c
deleted file mode 100644
index 17ceff147a..0000000000
--- a/testsuites/mptests/mp02/init.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*  Init
- *
- *  This routine is the initialization task for this test program.
- *  It is a user initialization task and has the responsibility for creating
- *  and starting the tasks that make up the test.  If the time of day
- *  clock is required for the test, it should also be set to a known
- *  value by this function.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "system.h"
-
-rtems_task Init(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-
-  printf(
-    "\n\n*** TEST 2 -- NODE %d ***\n",
-    Multiprocessing_configuration.node
-  );
-
-  Task_name[ 1 ] = rtems_build_name( '1', '1', '1', ' ' );
-  Task_name[ 2 ] = rtems_build_name( '2', '2', '2', ' ' );
-
-  puts( "Creating Test_task (Global)" );
-  status = rtems_task_create(
-    Task_name[Multiprocessing_configuration.node],
-    1,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_NO_PREEMPT,
-    RTEMS_GLOBAL,
-    &Task_id[ 1 ]
-  );
-  directive_failed( status, "rtems_task_create" );
-
-  puts( "Starting Test_task (Global)" );
-  status = rtems_task_start( Task_id[ 1 ], Test_task, 0 );
-  directive_failed( status, "rtems_task_start" );
-
-  puts( "Deleting initialization task" );
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-}
diff --git a/testsuites/mptests/mp02/node1/mp02.doc b/testsuites/mptests/mp02/node1/mp02.doc
deleted file mode 100644
index 532dad1f43..0000000000
--- a/testsuites/mptests/mp02/node1/mp02.doc
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
-This file describes the directives and concepts tested by this test set.
-
-test set name:  test51
-
-directives:
-  ex_init, ex_start, t_create, t_start, tm_tick, i_return, t_ident,
-  tm_set, tm_get, tm_wkafter, t_delete, t_restart, t_getreg, t_setreg
-
-concepts:
-
-  a.  Verifies system can create and start both the executive's system
-      initialization and idle task.
-
-  b.  Verifies can print strings to the CRT on port 2 of the mvme136 board
-      using Print and Println in the board support package.
-
-  c.  Verifies interrupt handler can handler a task switch from an interrupt
-      as specified with the i_return directive.
-
-  d.  Verifies executive initialization performed correctly.
-
-  e.  Verifies that a task can get the task identification number of itself.
-
-  f.  Verifies that a task can get the task identification number
-      of another task.
-
-  g.  Verifies that a task can delete itself or another task.
-
-  h.  Verifies that errors are returned in the following situations:
-        1)  when attempting to delete a remote task.
-        2)  when attempting to start a remote task.
-        3)  when attempting to restart a remote task.
-
-  i.  Verifies that a remote task's registers can be set and read.
diff --git a/testsuites/mptests/mp02/node1/mp02.scn b/testsuites/mptests/mp02/node1/mp02.scn
deleted file mode 100644
index 72fdefe69d..0000000000
--- a/testsuites/mptests/mp02/node1/mp02.scn
+++ /dev/null
@@ -1,14 +0,0 @@
-*** TEST 2 -- NODE 1 ***
-Creating Test_task (Global)
-Starting Test_task (Global)
-Deleting initialization task
-Remote task's name is : 222
-Getting TID of remote task (all nodes)
-Getting TID of remote task (1 node)
-rtems_task_delete of remote task returned the correct error
-rtems_task_start of remote task returned the correct error
-rtems_task_restart of remote task returned the correct error
-Setting notepad 1 of the remote task to 1
-Getting a notepad of the remote task
-Remote notepad set and read correctly
-*** END OF TEST 2 ***
diff --git a/testsuites/mptests/mp02/node2/mp02.doc b/testsuites/mptests/mp02/node2/mp02.doc
deleted file mode 100644
index 496f3569e5..0000000000
--- a/testsuites/mptests/mp02/node2/mp02.doc
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
diff --git a/testsuites/mptests/mp02/node2/mp02.scn b/testsuites/mptests/mp02/node2/mp02.scn
deleted file mode 100644
index 233a910999..0000000000
--- a/testsuites/mptests/mp02/node2/mp02.scn
+++ /dev/null
@@ -1,14 +0,0 @@
-*** TEST 2 -- NODE 2 ***
-Creating Test_task (Global)
-Starting Test_task (Global)
-Deleting initialization task
-Remote task's name is : 111
-Getting TID of remote task (all nodes)
-Getting TID of remote task (1 node)
-rtems_task_delete of remote task returned the correct error
-rtems_task_start of remote task returned the correct error
-rtems_task_restart of remote task returned the correct error
-Setting notepad 2 of the remote task to 2
-Getting a notepad of the remote task
-Remote notepad set and read correctly
-*** END OF TEST 2 ***
diff --git a/testsuites/mptests/mp02/system.h b/testsuites/mptests/mp02/system.h
deleted file mode 100644
index 01abf230f6..0000000000
--- a/testsuites/mptests/mp02/system.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*  system.h
- *
- *  This include file contains information that is included in every
- *  function in the test set.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <tmacros.h>
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
-
-rtems_task Test_task(
-  rtems_task_argument argument
-);
-
-/* configuration information */
- 
-#define CONFIGURE_MPTEST
- 
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
- 
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#include <confdefs.h>
-
-/* variables */
-
-TEST_EXTERN rtems_id   Task_id[ 4 ];     /* array of task ids */
-TEST_EXTERN rtems_name Task_name[ 4 ];   /* array of task names */
-
-/* end of include file */
diff --git a/testsuites/mptests/mp02/task1.c b/testsuites/mptests/mp02/task1.c
deleted file mode 100644
index 854dcae9bc..0000000000
--- a/testsuites/mptests/mp02/task1.c
+++ /dev/null
@@ -1,118 +0,0 @@
-/*  Test_task
- *
- *  This task tests the rtems_task_set_note directive on a remote task and that
- *  errors are returned when attempting to delete, start, or restart
- *  a remote task.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-extern rtems_multiprocessing_table Multiprocessing_configuration;
-
-rtems_task Test_task(
-  rtems_task_argument argument
-)
-{
-  rtems_id          tid;
-  rtems_status_code status;
-  rtems_unsigned32  remote_node;
-  rtems_id          remote_tid;
-  rtems_id          test_tid;
-  rtems_unsigned32  note;
-
-  status = rtems_task_ident( RTEMS_SELF, RTEMS_SEARCH_ALL_NODES, &tid );
-
-  remote_node = (Multiprocessing_configuration.node == 1) ? 2 : 1;
-  printf( "Remote task's name is : " );
-  put_name( Task_name[ remote_node ], TRUE );
-
-  puts( "Getting TID of remote task (all nodes)" );
-  do {
-      status = rtems_task_ident(
-          Task_name[ remote_node ],
-          RTEMS_SEARCH_ALL_NODES,
-          &remote_tid
-          );
-  } while ( status != RTEMS_SUCCESSFUL );
-
-  directive_failed( status, "rtems_task_ident" );
-
-  puts( "Getting TID of remote task (1 node)" );
-  status = rtems_task_ident( Task_name[ remote_node ], remote_node, &test_tid );
-  directive_failed( status, "rtems_task_ident" );
-
-  if ( test_tid != remote_tid ) {
-    puts( "rtems_task_ident tid's do not match!!" );
-    rtems_fatal_error_occurred( status );
-  }
-
-  status = rtems_task_delete( remote_tid );
-  fatal_directive_status(
-    status,
-    RTEMS_ILLEGAL_ON_REMOTE_OBJECT,
-    "rtems_task_delete of remote task"
-  );
-  puts( "rtems_task_delete of remote task returned the correct error" );
-
-  status = rtems_task_start( remote_tid, Test_task, 0 );
-  fatal_directive_status(
-    status,
-    RTEMS_ILLEGAL_ON_REMOTE_OBJECT,
-    "rtems_task_start of remote task"
-  );
-  puts( "rtems_task_start of remote task returned the correct error" );
-
-  status = rtems_task_restart( remote_tid, 0 );
-  fatal_directive_status(
-    status,
-    RTEMS_ILLEGAL_ON_REMOTE_OBJECT,
-    "rtems_task_restart of remote task"
-  );
-  puts( "rtems_task_restart of remote task returned the correct error" );
-
-  printf(
-   "Setting notepad %d of the remote task to %d\n",
-   rtems_get_node(tid),
-   rtems_get_node(tid)
-  );
-  status = rtems_task_set_note(
-    remote_tid,
-    rtems_get_node(tid),
-    rtems_get_node(tid)
-  );
-  directive_failed( status, "rtems_task_set_note" );
-
-  puts( "Getting a notepad of the remote task" );
-  status = rtems_task_get_note( remote_tid, rtems_get_node(tid), &note );
-  directive_failed( status, "rtems_task_get_note" );
-
-  if ( note == rtems_get_node(tid) )
-    puts( "Remote notepad set and read correctly" );
-  else
-    printf(
-      "FAILURE!! Remote notepad was not set and read correctly (%d, %d)\n",
-      note,
-      rtems_get_node( tid )
-    );
-
-  status = rtems_task_wake_after( TICKS_PER_SECOND );
-  directive_failed( status, "rtems_task_wake_after" );
-
-  puts( "*** END OF TEST 2 ***" );
-  exit( 0 );
-}
diff --git a/testsuites/mptests/mp03/delay.c b/testsuites/mptests/mp03/delay.c
deleted file mode 100644
index 06c329a254..0000000000
--- a/testsuites/mptests/mp03/delay.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/*  Delayed_send_event
- *
- *  This routine is a timer service routine which sends an event to task 1.
- *
- *  Input parameters:  NONE
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_timer_service_routine Delayed_send_event(
-  rtems_id  ignored_id,
-  void     *ignored_address
-)
-{
-  rtems_status_code status;
-
-  status = rtems_event_send( Task_id[ 1 ], RTEMS_EVENT_16 );
-  directive_failed( status, "rtems_event_send" );
-}
diff --git a/testsuites/mptests/mp03/init.c b/testsuites/mptests/mp03/init.c
deleted file mode 100644
index 2b178c972e..0000000000
--- a/testsuites/mptests/mp03/init.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*  Init
- *
- *  This routine is the initialization task for this test program.
- *  It is a user initialization task and has the responsibility for creating
- *  and starting the tasks that make up the test.  If the time of day
- *  clock is required for the test, it should also be set to a known
- *  value by this function.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "system.h"
-
-rtems_task Init(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-
-  printf(
-    "\n\n*** TEST 3 -- NODE %d ***\n",
-    Multiprocessing_configuration.node
-  );
-
-  Task_name[ 1 ] = rtems_build_name( '1', '1', '1', ' ' );
-  Task_name[ 2 ] = rtems_build_name( '2', '2', '2', ' ' );
-
-  puts( "Creating Test_task (Global)" );
-  status = rtems_task_create(
-    Task_name[ Multiprocessing_configuration.node ],
-    1,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_NO_PREEMPT,
-    RTEMS_GLOBAL,
-    &Task_id[ 1 ]
-  );
-  directive_failed( status, "rtems_task_create" );
-
-  puts( "Starting Test_task (Global)" );
-  status = rtems_task_start( Task_id[ 1 ], Test_task, 0 );
-  directive_failed( status, "rtems_task_start" );
-
-  Timer_name[ 1 ] = rtems_build_name( 'T', 'M', '1', ' ' );
-
-  status = rtems_timer_create( Timer_name[ 1 ], &Timer_id[ 1 ] );
-  directive_failed( status, "rtems_timer_create" );
-
-  puts( "Deleting initialization task" );
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-}
diff --git a/testsuites/mptests/mp03/node1/mp03.doc b/testsuites/mptests/mp03/node1/mp03.doc
deleted file mode 100644
index 6a1d5517f5..0000000000
--- a/testsuites/mptests/mp03/node1/mp03.doc
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
-This file describes the directives and concepts tested by this test set.
-
-test set name:  test52
-
-directives:
-  ex_init, ex_start, t_create, t_start, tm_tick, i_return, t_ident,
-  tm_wkafter, t_suspend, t_resume
-
-concepts:
-
-  a.  Verifies system can create and start both the executive's system
-      initialization and idle task.
-
-  b.  Verifies executive can swap between three application tasks at the
-      same priority and the executive's internal idle task.
-
-  c.  Verifies can print strings to the CRT on port 2 of the mvme136 board
-      using Print and Println in the board support package.
-
-  d.  Verifies interrupt handler can handler a task switch from an interrupt
-      as specified with the i_return directive.
-
-  e.  Verifies executive initialization performed correctly.
-
-  f.  Verifies the executive trap handler except for the halt function.
-
-  g.  Verifies that a task can get the task identification number of itself.
-
-  h.  Verifies that a task can get the task identification number
-      of another task (on another node).
-
-  i.  Verifies that a task can suspend and resume a remote task.
diff --git a/testsuites/mptests/mp03/node1/mp03.scn b/testsuites/mptests/mp03/node1/mp03.scn
deleted file mode 100644
index 129e5bccba..0000000000
--- a/testsuites/mptests/mp03/node1/mp03.scn
+++ /dev/null
@@ -1,24 +0,0 @@
-*** TEST 3 -- NODE 1 ***
-Creating Test_task (Global)
-Starting Test_task (Global)
-Deleting initialization task
-Getting TID of remote task
-Remote task's name is : 222
-111 - Suspending remote task
-111 - Resuming remote task
-111 - Suspending remote task
-111 - Resuming remote task
-111 - Suspending remote task
-111 - Resuming remote task
-111 - Have I been suspended?????
-111 - Have I been suspended?????
-111 - Have I been suspended?????
-111 - Have I been suspended?????
-
-      ........
-
-111 - Have I been suspended?????
-111 - Have I been suspended?????
-111 - Have I been suspended?????
-111 - Have I been suspended?????
-*** END OF TEST 3 ***
diff --git a/testsuites/mptests/mp03/node2/mp03.doc b/testsuites/mptests/mp03/node2/mp03.doc
deleted file mode 100644
index 496f3569e5..0000000000
--- a/testsuites/mptests/mp03/node2/mp03.doc
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
diff --git a/testsuites/mptests/mp03/node2/mp03.scn b/testsuites/mptests/mp03/node2/mp03.scn
deleted file mode 100644
index d77c09e9f7..0000000000
--- a/testsuites/mptests/mp03/node2/mp03.scn
+++ /dev/null
@@ -1,24 +0,0 @@
-*** TEST 3 -- NODE 2 ***
-Creating Test_task (Global)
-Starting Test_task (Global)
-Deleting initialization task
-Getting TID of remote task
-Remote task's name is : 111
-222 - Have I been suspended?????
-222 - Have I been suspended?????
-222 - Have I been suspended?????
-222 - Have I been suspended?????
-
-      ........
-
-222 - Have I been suspended?????
-222 - Have I been suspended?????
-222 - Have I been suspended?????
-222 - Have I been suspended?????
-222 - Suspending remote task
-222 - Resuming remote task
-222 - Suspending remote task
-222 - Resuming remote task
-222 - Suspending remote task
-222 - Resuming remote task
-*** END OF TEST 3 ***
diff --git a/testsuites/mptests/mp03/system.h b/testsuites/mptests/mp03/system.h
deleted file mode 100644
index a6f517ae1a..0000000000
--- a/testsuites/mptests/mp03/system.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*  system.h
- *
- *  This include file contains information that is included in every
- *  function in the test set.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <tmacros.h>
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
-
-rtems_task Test_task(
-  rtems_task_argument argument
-);
-
-rtems_timer_service_routine Delayed_send_event(
-  rtems_id  ignored_id,
-  void     *ignored_address
-);
- 
-/* configuration information */
- 
-#define CONFIGURE_MPTEST
- 
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
- 
-#define CONFIGURE_MAXIMUM_TIMERS              1
-
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#include <confdefs.h>
-
-/* variables */
-
-TEST_EXTERN rtems_id   Task_id[ 4 ];     /* array of task ids */
-TEST_EXTERN rtems_name Task_name[ 4 ];   /* array of task names */
-
-TEST_EXTERN rtems_id   Timer_id[ 2 ];    /* array of timer ids */
-TEST_EXTERN rtems_name Timer_name[ 2 ];  /* array of timer names */
- 
-TEST_EXTERN rtems_unsigned32  remote_node;
-TEST_EXTERN rtems_id          remote_tid;
- 
-/* end of include file */
diff --git a/testsuites/mptests/mp03/task1.c b/testsuites/mptests/mp03/task1.c
deleted file mode 100644
index 47a921e7b3..0000000000
--- a/testsuites/mptests/mp03/task1.c
+++ /dev/null
@@ -1,155 +0,0 @@
-/*  Test_task
- *
- *  This task suspends and resumes a remote task.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-/*PAGE
- *
- *  Test_Task_Support
- *
- */
-
-void Test_Task_Support(
-  rtems_unsigned32  node
-)
-{
-  rtems_event_set   events;
-  rtems_status_code status;
-
-  if ( Multiprocessing_configuration.node == node ) {
-
-    for ( ; ; ) {
-
-      status = rtems_event_receive(
-        RTEMS_EVENT_16,
-        RTEMS_NO_WAIT,
-        RTEMS_NO_TIMEOUT,
-        &events
-      );
-
-      if ( status == RTEMS_SUCCESSFUL )
-        break;
-
-      fatal_directive_status(status, RTEMS_UNSATISFIED, "rtems_event_receive");
-
-      status = rtems_task_wake_after( 2 * TICKS_PER_SECOND );
-      directive_failed( status, "rtems_task_wake_after" );
-
-      put_name( Task_name[ node ], FALSE );
-      puts( " - Suspending remote task" );
-
-      status = rtems_task_suspend( remote_tid );
-      directive_failed( status, "rtems_task_suspend" );
-
-      status = rtems_task_wake_after( 2 * TICKS_PER_SECOND );
-      directive_failed( status, "rtems_task_wake_after" );
-
-      put_name( Task_name[ node ], FALSE );
-      puts( " - Resuming remote task" );
-
-      status = rtems_task_resume( remote_tid ) ;
-      directive_failed( status, "rtems_task_resume" );
-
-    }
-
-  }  else {
-
-    for ( ; ; ) {
-      status = rtems_event_receive(
-        RTEMS_EVENT_16,
-        RTEMS_NO_WAIT,
-        RTEMS_NO_TIMEOUT,
-        &events
-      );
-
-      if ( status == RTEMS_SUCCESSFUL )
-        break;
-
-      fatal_directive_status(status, RTEMS_UNSATISFIED, "rtems_event_receive");
-
-      put_name( Task_name[ remote_node ], FALSE );
-      puts( " - have I been suspended???" );
-
-      status = rtems_task_wake_after( TICKS_PER_SECOND / 2 );
-      directive_failed( status, "rtems_task_wake_after" );
-    }
-
-  }
-
-}
-
-/*PAGE
- *
- *  Test_task
- */
-
-rtems_task Test_task(
-  rtems_task_argument argument
-)
-{
-  rtems_id          tid;
-  rtems_status_code status;
-
-  status = rtems_task_ident( RTEMS_SELF, RTEMS_SEARCH_ALL_NODES, &tid );
-  directive_failed( status, "rtems_task_ident" );
-
-  puts( "Getting TID of remote task" );
-  remote_node = (Multiprocessing_configuration.node == 1) ? 2 : 1;
-  printf( "Remote task's name is : " );
-  put_name( Task_name[ remote_node ], TRUE );
-
-  do {
-      status = rtems_task_ident(
-          Task_name[ remote_node ],
-          RTEMS_SEARCH_ALL_NODES,
-          &remote_tid
-          );
-  } while ( status != RTEMS_SUCCESSFUL );
-
-  directive_failed( status, "rtems_task_ident" );
-
-  status = rtems_timer_fire_after(
-    Timer_id[ 1 ],
-    5 * TICKS_PER_SECOND,
-    Delayed_send_event,
-    NULL
-  );
-  directive_failed( status, "rtems_timer_fire_after" );
-
-  Test_Task_Support( 1 );
-
-  status = rtems_timer_fire_after(
-    Timer_id[ 1 ],
-    5 * TICKS_PER_SECOND,
-    Delayed_send_event,
-    NULL
-  );
-  directive_failed( status, "rtems_timer_fire_after" );
-
-  if ( Multiprocessing_configuration.node == 1 ) {
-    status = rtems_task_wake_after( 2 * TICKS_PER_SECOND );
-    directive_failed( status, "rtems_task_wake_after" );
-  }
-
-  Test_Task_Support( 2 );
-
-  puts( "*** END OF TEST 3 ***" );
-  exit( 0 );
-}
diff --git a/testsuites/mptests/mp04/init.c b/testsuites/mptests/mp04/init.c
deleted file mode 100644
index 0523bede6b..0000000000
--- a/testsuites/mptests/mp04/init.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*  Init
- *
- *  This routine is the initialization task for this test program.
- *  It is a user initialization task and has the responsibility for creating
- *  and starting the tasks that make up the test.  If the time of day
- *  clock is required for the test, it should also be set to a known
- *  value by this function.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "system.h"
-
-rtems_task Init(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-
-  printf(
-    "\n\n*** TEST 4 -- NODE %d ***\n",
-    Multiprocessing_configuration.node
-  );
-
-  Task_name[ 1 ] = rtems_build_name( '1', '1', '1', ' ' );
-  Task_name[ 2 ] = rtems_build_name( '2', '2', '2', ' ' );
-
-  puts( "Creating Test_task (Global)" );
-  status = rtems_task_create(
-    Task_name[ Multiprocessing_configuration.node ],
-    Multiprocessing_configuration.node,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_GLOBAL,
-    &Task_id[ 1 ]
-  );
-  directive_failed( status, "rtems_task_create" );
-
-  puts( "Starting Test_task (Global)" );
-  status = rtems_task_start( Task_id[ 1 ], Test_task, 0 );
-  directive_failed( status, "rtems_task_start" );
-
-  puts( "Deleting initialization task" );
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-}
diff --git a/testsuites/mptests/mp04/node1/mp04.doc b/testsuites/mptests/mp04/node1/mp04.doc
deleted file mode 100644
index 7165e7c841..0000000000
--- a/testsuites/mptests/mp04/node1/mp04.doc
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
-This file describes the directives and concepts tested by this test set.
-
-test set name:  test53
-
-directives:
-  ex_init, ex_start, t_create, t_start, i_return, t_ident, tm_get,
-  tm_wkafter, tm_setpri
-
-concepts:
-
-  a.  Verifies system can create and start both the executive's system
-      initialization and idle task.
-
-  b.  Verifies that the system can get the id of a remote task.
-
-  c.  Verifies that the system can change the priority of a remote
-      task.
-
-  d.  Verifies interrupt handler can handler a task switch from an interrupt
-      as specified with the i_return directive.
-
-  e.  Verifies executive initialization performed correctly.
-
-  f.  Verifies the executive trap handler except for the halt function.
-
-  g.  Verifies that a task can get the task identification number of itself.
-
-  h.  Verifies that a task can delete itself or another task.
diff --git a/testsuites/mptests/mp04/node1/mp04.scn b/testsuites/mptests/mp04/node1/mp04.scn
deleted file mode 100644
index e9518f3ac2..0000000000
--- a/testsuites/mptests/mp04/node1/mp04.scn
+++ /dev/null
@@ -1,8 +0,0 @@
-*** TEST 4 -- NODE 1 ***
-Creating Test_task (Global)
-Starting Test_task (Global)
-Deleting initialization task
-Getting TID of remote task
-Remote task's name is : 222
-Local task priority has been set
-*** END OF TEST 4 ***
diff --git a/testsuites/mptests/mp04/node2/mp04.doc b/testsuites/mptests/mp04/node2/mp04.doc
deleted file mode 100644
index 496f3569e5..0000000000
--- a/testsuites/mptests/mp04/node2/mp04.doc
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
diff --git a/testsuites/mptests/mp04/node2/mp04.scn b/testsuites/mptests/mp04/node2/mp04.scn
deleted file mode 100644
index 8ccfcfef79..0000000000
--- a/testsuites/mptests/mp04/node2/mp04.scn
+++ /dev/null
@@ -1,8 +0,0 @@
-*** TEST 4 -- NODE 2 ***
-Creating Test_task (Global)
-Starting Test_task (Global)
-Deleting initialization task
-Getting TID of remote task
-Remote task's name is : 111
-Local task priority has been set
-*** END OF TEST 4 ***
diff --git a/testsuites/mptests/mp04/system.h b/testsuites/mptests/mp04/system.h
deleted file mode 100644
index f432fd6216..0000000000
--- a/testsuites/mptests/mp04/system.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*  system.h
- *
- *  This include file contains information that is included in every
- *  function in the test set.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <tmacros.h>
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
-
-rtems_task Test_task(
-  rtems_task_argument argument
-);
-
-/* configuration information */
- 
-#define CONFIGURE_MPTEST
- 
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
- 
-#define CONFIGURE_MAXIMUM_TIMERS              1
-
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#include <confdefs.h>
-
-/* variables */
-
-TEST_EXTERN rtems_id   Task_id[ 4 ];     /* array of task ids */
-TEST_EXTERN rtems_name Task_name[ 4 ];   /* array of task names */
-
-/* end of include file */
diff --git a/testsuites/mptests/mp04/task1.c b/testsuites/mptests/mp04/task1.c
deleted file mode 100644
index ffa0d1b9a5..0000000000
--- a/testsuites/mptests/mp04/task1.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/*  Test_task
- *
- *  This task tests the rtems_task_set_priority directive on a remote task.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-extern rtems_multiprocessing_table Multiprocessing_configuration;
-
-rtems_task Test_task(
-  rtems_task_argument argument
-)
-{
-  rtems_id            tid;
-  rtems_status_code   status;
-  rtems_unsigned32    remote_node;
-  rtems_id            remote_tid;
-  rtems_task_priority previous_priority;
-  rtems_task_priority previous_priority_1;
-
-  status = rtems_task_ident( RTEMS_SELF, RTEMS_SEARCH_ALL_NODES, &tid );
-  directive_failed( status, "rtems_task_ident" );
-
-  puts( "Getting TID of remote task" );
-  remote_node = (Multiprocessing_configuration.node == 1) ? 2 : 1;
-  puts_nocr( "Remote task's name is : " );
-  put_name( Task_name[ remote_node ], TRUE );
-
-  do {
-      status = rtems_task_ident(
-          Task_name[ remote_node ],
-          RTEMS_SEARCH_ALL_NODES,
-          &remote_tid
-          );
-  } while ( status != RTEMS_SUCCESSFUL );
-
-  directive_failed( status, "rtems_task_ident" );
-
-  status = rtems_task_set_priority(
-    remote_tid,
-    Multiprocessing_configuration.node,
-    &previous_priority
-  );
-  directive_failed( status, "rtems_task_set_priority" );
-
-  if ( previous_priority != remote_node ) {
-    printf(
-      "Remote priority (0x%x) does not match remote node (0x%x)!!!\n",
-      previous_priority,
-      remote_node
-    );
-    exit( 0xf0000 );
-  }
-
-  do {
-    status = rtems_task_set_priority(
-      RTEMS_SELF,
-      RTEMS_CURRENT_PRIORITY,
-      &previous_priority_1
-    );
-    directive_failed( status, "rtems_task_set_priority" );
-  } while ( previous_priority_1 != remote_node );
-
-  puts( "Local task priority has been set" );
-
-  puts( "*** END OF TEST 4 ***" );
-  exit( 0 );
-}
diff --git a/testsuites/mptests/mp05/asr.c b/testsuites/mptests/mp05/asr.c
deleted file mode 100644
index d90c5b0056..0000000000
--- a/testsuites/mptests/mp05/asr.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*  Process_asr
- *
- *  This routine performs the processing for task 1's RTEMS_ASR.  It is called
- *  by an assembly routine which saves the necessary registers.
- *
- *  Input parameters:
- *    signal - signal set
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_asr Process_asr(
-    rtems_signal_set signal
-)
-{
-  if ( signal != expected_signal ) {
-     printf(
-       "ERROR: I was expecting signal 0x%.8x got 0x%.8x\n",
-       expected_signal,
-       signal
-     );
-     rtems_fatal_error_occurred( 0xf0000 );
-  }
-  signal_caught = 1;
-}
diff --git a/testsuites/mptests/mp05/init.c b/testsuites/mptests/mp05/init.c
deleted file mode 100644
index 56a420752a..0000000000
--- a/testsuites/mptests/mp05/init.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*  Init
- *
- *  This routine is the initialization task for this test program.
- *  It is a user initialization task and has the responsibility for creating
- *  and starting the tasks that make up the test.  If the time of day
- *  clock is required for the test, it should also be set to a known
- *  value by this function.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "system.h"
-
-rtems_task Init(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-
-  printf(
-    "\n\n*** TEST 5 -- NODE %d ***\n",
-    Multiprocessing_configuration.node
-  );
-
-  Task_name[ 1 ] = rtems_build_name( '1', '1', '1', ' ' );
-  Task_name[ 2 ] = rtems_build_name( '2', '2', '2', ' ' );
-
-  puts( "Creating Test_task (Global)" );
-  status = rtems_task_create(
-    Task_name[Multiprocessing_configuration.node],
-    1,
-    RTEMS_MINIMUM_STACK_SIZE * 2,
-    RTEMS_TIMESLICE,
-    RTEMS_GLOBAL,
-    &Task_id[ 1 ]
-  );
-  directive_failed( status, "rtems_task_create" );
-
-  puts( "Starting Test_task (Global)" );
-  status = rtems_task_start( Task_id[ 1 ], Test_task, 0 );
-  directive_failed( status, "rtems_task_start" );
-
-  Timer_name[ 1 ] = rtems_build_name( 'T', 'M', '1', ' ' );
-
-  status = rtems_timer_create( Timer_name[ 1 ], &Timer_id[ 1 ] );
-  directive_failed( status, "rtems_timer_create" );
-
-  puts( "Deleting initialization task" );
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-}
diff --git a/testsuites/mptests/mp05/node1/mp05.doc b/testsuites/mptests/mp05/node1/mp05.doc
deleted file mode 100644
index 508e664600..0000000000
--- a/testsuites/mptests/mp05/node1/mp05.doc
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
-This file describes the directives and concepts tested by this test set.
-
-test set name:  test54
-
-directives:
-  ex_init, ex_start, t_create, t_start, tm_tick, i_return, t_ident,
-  tm_wkafter, as_catch, as_return
-
-concepts:
-
-  a.  Verifies system can create and start both the executive's system
-      initialization and idle task.
-
-  b.  Verifies executive can swap between three application tasks at the
-      same priority and the executive's internal idle task.
-
-  c.  Verifies can print strings to the CRT on port 2 of the mvme136 board
-      using Print and Println in the board support package.
-
-  d.  Verifies interrupt handler can handler a task switch from an interrupt
-      as specified with the i_return directive.
-
-  e.  Verifies executive initialization performed correctly.
-
-  f.  Verifies the executive trap handler except for the halt function.
-
-  g.  Verifies that a task can get the task identification number of itself.
-
-  h.  Verifies that a task can get the task identification number
-      of another task.
-
-  i.  Verifies that a signal can be sent to a remote task.
diff --git a/testsuites/mptests/mp05/node1/mp05.scn b/testsuites/mptests/mp05/node1/mp05.scn
deleted file mode 100644
index 472740ba18..0000000000
--- a/testsuites/mptests/mp05/node1/mp05.scn
+++ /dev/null
@@ -1,11 +0,0 @@
-*** TEST 5 -- NODE 1 ***
-Creating Test_task (Global)
-Starting Test_task (Global)
-Deleting initialization task
-rtems_signal_catch: initializing signal catcher
-Remote task's name is : 222
-Getting TID of remote task
-Sending signal to remote task
-....................................................
-....................................................
-*** END OF TEST 5 ***
diff --git a/testsuites/mptests/mp05/node2/mp05.doc b/testsuites/mptests/mp05/node2/mp05.doc
deleted file mode 100644
index 496f3569e5..0000000000
--- a/testsuites/mptests/mp05/node2/mp05.doc
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
diff --git a/testsuites/mptests/mp05/node2/mp05.scn b/testsuites/mptests/mp05/node2/mp05.scn
deleted file mode 100644
index 0c4b412f65..0000000000
--- a/testsuites/mptests/mp05/node2/mp05.scn
+++ /dev/null
@@ -1,10 +0,0 @@
-*** TEST 5 -- NODE 2 ***
-Creating Test_task (Global)
-Starting Test_task (Global)
-Deleting initialization task
-rtems_signal_catch: initializing signal catcher
-Remote task's name is : 111
-Getting TID of remote task
-....................................................
-....................................................
-*** END OF TEST 5 ***
diff --git a/testsuites/mptests/mp05/system.h b/testsuites/mptests/mp05/system.h
deleted file mode 100644
index a3d66bf338..0000000000
--- a/testsuites/mptests/mp05/system.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*  system.h
- *
- *  This include file contains information that is included in every
- *  function in the test set.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <tmacros.h>
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
-
-rtems_task Test_task(
-  rtems_task_argument argument
-);
-
-rtems_asr Process_asr( rtems_signal_set );
-
-/* configuration information */
- 
-#define CONFIGURE_MPTEST
- 
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
- 
-#define CONFIGURE_MAXIMUM_TIMERS              1
-
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#define CONFIGURE_EXTRA_TASK_STACKS         (1 * RTEMS_MINIMUM_STACK_SIZE)
-
-#include <confdefs.h>
-
-/* variables */
-
-TEST_EXTERN rtems_id   Task_id[ 4 ];     /* array of task ids */
-TEST_EXTERN rtems_name Task_name[ 4 ];   /* array of task names */
-
-TEST_EXTERN rtems_id   Timer_id[ 2 ];    /* array of timer ids */
-TEST_EXTERN rtems_name Timer_name[ 2 ];  /* array of timer names */
- 
-TEST_EXTERN volatile rtems_boolean Stop_Test;
- 
-TEST_EXTERN rtems_unsigned32          remote_node;
-TEST_EXTERN rtems_id                  remote_tid;
-TEST_EXTERN rtems_signal_set          remote_signal;
-TEST_EXTERN rtems_signal_set          expected_signal;
-TEST_EXTERN volatile rtems_unsigned32 signal_count;
-TEST_EXTERN volatile rtems_unsigned32 signal_caught;
- 
-/* end of include file */
diff --git a/testsuites/mptests/mp05/task1.c b/testsuites/mptests/mp05/task1.c
deleted file mode 100644
index dd97f261c6..0000000000
--- a/testsuites/mptests/mp05/task1.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/*  Test_task
- *
- *  This task initializes the signal catcher, sends the first signal
- *  if running on the first node, and loops while waiting for signals.
- *
- *  NOTE: The signal catcher is not reentrant and hence RTEMS_NO_ASR must
- *        be a part of its execution mode.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-#define SIGNALS_PER_DOT 15
-
-rtems_timer_service_routine Stop_Test_TSR(
-  rtems_id  ignored_id,
-  void     *ignored_address
-)
-{
-  Stop_Test = TRUE;
-}
-
-rtems_task Test_task(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-
-  Stop_Test = FALSE;
-
-  signal_caught = 0;
-  signal_count  = 0;
-
-  puts( "rtems_signal_catch: initializing signal catcher" );
-  status = rtems_signal_catch( Process_asr, RTEMS_NO_ASR|RTEMS_NO_PREEMPT );
-  directive_failed( status, "rtems_signal_catch" );
-
-  if (Multiprocessing_configuration.node == 1) {
-     remote_node = 2;
-     remote_signal  = RTEMS_SIGNAL_18;
-     expected_signal = RTEMS_SIGNAL_17;
-  }
-  else {
-     remote_node = 1;
-     remote_signal  = RTEMS_SIGNAL_17;
-     expected_signal = RTEMS_SIGNAL_18;
-  }
-  puts_nocr( "Remote task's name is : " );
-  put_name( Task_name[ remote_node ], TRUE );
-
-  puts( "Getting TID of remote task" );
-  do {
-      status = rtems_task_ident(
-          Task_name[ remote_node ],
-          RTEMS_SEARCH_ALL_NODES,
-          &remote_tid
-          );
-  } while ( status != RTEMS_SUCCESSFUL );
-  directive_failed( status, "rtems_task_ident" );
-
-  status = rtems_timer_fire_after(
-    Timer_id[ 1 ],
-    3 * TICKS_PER_SECOND,
-    Stop_Test_TSR,
-    NULL
-  );
-  directive_failed( status, "rtems_timer_fire_after" );
-
-  if ( Multiprocessing_configuration.node == 1 ) {
-    puts( "Sending signal to remote task" );
-    do {
-      status = rtems_signal_send( remote_tid, remote_signal );
-      if ( status == RTEMS_NOT_DEFINED )
-        continue;
-    } while ( status != RTEMS_SUCCESSFUL );
-    directive_failed( status, "rtems_signal_send" );
-  }
-
-  while ( Stop_Test == FALSE ) {
-    if ( signal_caught ) {
-      signal_caught = 0;
-      if ( ++signal_count >= SIGNALS_PER_DOT ) {
-        signal_count = 0;
-        put_dot( '.' );
-      }
-      status = rtems_signal_send( remote_tid, remote_signal );
-      directive_failed( status, "rtems_signal_send" );
-    }
-  }
-  puts( "\n*** END OF TEST 5 ***" );
-  exit( 0 );
-}
diff --git a/testsuites/mptests/mp06/init.c b/testsuites/mptests/mp06/init.c
deleted file mode 100644
index 9e33f8f284..0000000000
--- a/testsuites/mptests/mp06/init.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*  Init
- *
- *  This routine is the initialization task for this test program.
- *  It is a user initialization task and has the responsibility for creating
- *  and starting the tasks that make up the test.  If the time of day
- *  clock is required for the test, it should also be set to a known
- *  value by this function.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "system.h"
-
-rtems_task Init(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-
-  printf(
-    "\n\n*** TEST 6 -- NODE %d ***\n",
-    Multiprocessing_configuration.node
-  );
-
-  Task_name[ 1 ] = rtems_build_name( '1', '1', '1', ' ' );
-  Task_name[ 2 ] = rtems_build_name( '2', '2', '2', ' ' );
-
-  puts( "Creating Test_task (Global)" );
-  status = rtems_task_create(
-    Task_name[Multiprocessing_configuration.node],
-    1,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_GLOBAL,
-    &Task_id[ 1 ]
-  );
-  directive_failed( status, "rtems_task_create" );
-
-  puts( "Starting Test_task (Global)" );
-  status = rtems_task_start( Task_id[ 1 ], Test_task, 0 );
-  directive_failed( status, "rtems_task_start" );
-
-  Timer_name[ 1 ] = rtems_build_name( 'T', 'M', '1', ' ' );
-
-  status = rtems_timer_create( Timer_name[ 1 ], &Timer_id[ 1 ] );
-  directive_failed( status, "rtems_timer_create" );
-
-  puts( "Deleting initialization task" );
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-}
diff --git a/testsuites/mptests/mp06/node1/mp06.doc b/testsuites/mptests/mp06/node1/mp06.doc
deleted file mode 100644
index 086434fcb7..0000000000
--- a/testsuites/mptests/mp06/node1/mp06.doc
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
-This file describes the directives and concepts tested by this test set.
-
-test set name:  test55
-
-directives:
-  ex_init, ex_start, t_create, t_start, tm_tick, i_return, t_ident,
-  ev_send, ev_receive
-
-concepts:
-
-  a.  Verifies system can create and start both the executive's system
-      initialization and idle task.
-
-  b.  Verifies executive can swap between three application tasks at the
-      same priority and the executive's internal idle task.
-
-  c.  Verifies can print strings to the CRT on port 2 of the mvme136 board
-      using Print and Println in the board support package.
-
-  d.  Verifies interrupt handler can handler a task switch from an interrupt
-      as specified with the i_return directive.
-
-  e.  Verifies executive initialization performed correctly.
-
-  f.  Verifies the executive trap handler except for the halt function.
-
-  g.  Verifies that a task can get the task identification number of itself.
-
-  h.  Verifies that a task can get the task identification number
-      of another task.
-
-  i.  Verifies that events can be sent to a remote task.
diff --git a/testsuites/mptests/mp06/node1/mp06.scn b/testsuites/mptests/mp06/node1/mp06.scn
deleted file mode 100644
index 592777e5d7..0000000000
--- a/testsuites/mptests/mp06/node1/mp06.scn
+++ /dev/null
@@ -1,11 +0,0 @@
-*** TEST 6 -- NODE 1 ***
-Creating Test_task (Global)
-Starting Test_task (Global)
-Deleting initialization task
-Remote task's name is : 222
-Getting TID of remote task
-Sending events to remote task
-....................................................
-....................................................
-*** END OF TEST 6 ***
-
diff --git a/testsuites/mptests/mp06/node2/mp06.doc b/testsuites/mptests/mp06/node2/mp06.doc
deleted file mode 100644
index 496f3569e5..0000000000
--- a/testsuites/mptests/mp06/node2/mp06.doc
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
diff --git a/testsuites/mptests/mp06/node2/mp06.scn b/testsuites/mptests/mp06/node2/mp06.scn
deleted file mode 100644
index 9cb653c2f3..0000000000
--- a/testsuites/mptests/mp06/node2/mp06.scn
+++ /dev/null
@@ -1,12 +0,0 @@
-*** TEST 6 -- NODE 2 ***
-Creating Test_task (Global)
-Starting Test_task (Global)
-Deleting initialization task
-Remote task's name is : 111
-Getting TID of remote task
-Receiving events from remote task
-....................................................
-....................................................
-rtems_event_receive - correctly returned RTEMS_TIMEOUT
-*** END OF TEST 6 ***
-
diff --git a/testsuites/mptests/mp06/system.h b/testsuites/mptests/mp06/system.h
deleted file mode 100644
index fa86b90798..0000000000
--- a/testsuites/mptests/mp06/system.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*  system.h
- *
- *  This include file contains information that is included in every
- *  function in the test set.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <tmacros.h>
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
-
-rtems_task Test_task(
-  rtems_task_argument argument
-);
-
-/* configuration information */
- 
-#define CONFIGURE_MPTEST
- 
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
- 
-#define CONFIGURE_MAXIMUM_TIMERS              1
-
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#include <confdefs.h>
-
-/* variables */
-
-TEST_EXTERN rtems_id   Task_id[ 4 ];     /* array of task ids */
-TEST_EXTERN rtems_name Task_name[ 4 ];   /* array of task names */
-
-TEST_EXTERN rtems_id   Timer_id[ 4 ];     /* array of timer ids */
-TEST_EXTERN rtems_name Timer_name[ 4 ];   /* array of timer names */
- 
-TEST_EXTERN volatile rtems_boolean Stop_Test;
-
-/* end of include file */
diff --git a/testsuites/mptests/mp06/task1.c b/testsuites/mptests/mp06/task1.c
deleted file mode 100644
index 6ec9a24534..0000000000
--- a/testsuites/mptests/mp06/task1.c
+++ /dev/null
@@ -1,176 +0,0 @@
-/*  Test_task
- *
- *  This task tests global event operations.  If running on node one, it
- *  continuously sends events.   If running on node two, it continuously
- *  receives events.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-#define DOT_COUNT 25
-
-/*PAGE
- *
- *  Stop_Test_TSR
- */
-
-rtems_timer_service_routine Stop_Test_TSR(
-  rtems_id  ignored_id,
-  void     *ignored_address
-)
-{
-  Stop_Test = TRUE;
-}
-
-/*PAGE
- *
- *  Event_set_table
- */
-
-rtems_event_set Event_set_table[] = {
-  RTEMS_EVENT_0,
-  RTEMS_EVENT_1,
-  RTEMS_EVENT_2,
-  RTEMS_EVENT_3,
-  RTEMS_EVENT_4,
-  RTEMS_EVENT_5,
-  RTEMS_EVENT_6,
-  RTEMS_EVENT_7,
-  RTEMS_EVENT_8,
-  RTEMS_EVENT_9,
-  RTEMS_EVENT_10,
-  RTEMS_EVENT_11,
-  RTEMS_EVENT_12,
-  RTEMS_EVENT_13,
-  RTEMS_EVENT_14,
-  RTEMS_EVENT_15,
-  RTEMS_EVENT_16,
-  RTEMS_EVENT_17,
-  RTEMS_EVENT_18,
-  RTEMS_EVENT_19,
-  RTEMS_EVENT_20,
-  RTEMS_EVENT_21,
-  RTEMS_EVENT_22,
-  RTEMS_EVENT_23,
-  RTEMS_EVENT_24,
-  RTEMS_EVENT_25,
-  RTEMS_EVENT_26,
-  RTEMS_EVENT_27,
-  RTEMS_EVENT_28,
-  RTEMS_EVENT_29,
-  RTEMS_EVENT_30,
-  RTEMS_EVENT_31
-};
-
-/*PAGE
- *
- *  Test_task
- */
-
-rtems_task Test_task(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-  rtems_unsigned32  count;
-  rtems_unsigned32  remote_node;
-  rtems_id          remote_tid;
-  rtems_event_set   event_out;
-  rtems_event_set   event_for_this_iteration;
-
-  Stop_Test = FALSE;
-
-  remote_node = (Multiprocessing_configuration.node == 1) ? 2 : 1;
-  puts_nocr( "Remote task's name is : " );
-  put_name( Task_name[ remote_node ], TRUE );
-
-  puts( "Getting TID of remote task" );
-  do {
-      status = rtems_task_ident(
-          Task_name[ remote_node ],
-          RTEMS_SEARCH_ALL_NODES,
-          &remote_tid
-          );
-  } while ( status != RTEMS_SUCCESSFUL );
-  directive_failed( status, "rtems_task_ident FAILED!!" );
-
-  if ( Multiprocessing_configuration.node == 1 )
-    puts( "Sending events to remote task" );
-  else
-    puts( "Receiving events from remote task" );
-
-  status = rtems_timer_fire_after(
-    Timer_id[ 1 ],
-    5 * TICKS_PER_SECOND,
-    Stop_Test_TSR,
-    NULL
-  );
-  directive_failed( status, "rtems_timer_fire_after" );
-
-  count = 0;
-
-  for ( ; ; ) {
-    if ( Stop_Test == TRUE )
-      break;
-
-    event_for_this_iteration = Event_set_table[ count % 32 ];
-
-    if ( Multiprocessing_configuration.node == 1 ) {
-      status = rtems_event_send( remote_tid, event_for_this_iteration );
-      directive_failed( status, "rtems_event_send" );
-
-      status = rtems_task_wake_after( 1 );
-      directive_failed( status, "rtems_task_wake_after" );
-    } else {
-      status = rtems_event_receive(
-        event_for_this_iteration,
-        RTEMS_DEFAULT_OPTIONS,
-        1 * TICKS_PER_SECOND,
-        &event_out
-      );
-      if ( rtems_are_statuses_equal( status, RTEMS_TIMEOUT ) ) {
-        if ( Multiprocessing_configuration.node == 2 )
-          puts( "\nCorrect behavior if the other node exitted." );
-        else
-          puts( "\nERROR... node 1 died" );
-        break;
-      } else
-        directive_failed( status, "rtems_event_receive" );
-    }
-
-    if ( (count % DOT_COUNT) == 0 )
-      put_dot('.');
-
-    count++;
-  }
-
-  putchar( '\n' );
-
-  if ( Multiprocessing_configuration.node == 2 ) {
-    status = rtems_event_receive(
-      RTEMS_EVENT_16,
-      RTEMS_DEFAULT_OPTIONS,
-      1 * TICKS_PER_SECOND,
-      &event_out
-    );
-    fatal_directive_status( status, RTEMS_TIMEOUT, "rtems_event_receive" );
-    puts( "rtems_event_receive - correctly returned RTEMS_TIMEOUT" );
-  }
-  puts( "*** END OF TEST 6 ***" );
-  exit( 0 );
-}
diff --git a/testsuites/mptests/mp07/init.c b/testsuites/mptests/mp07/init.c
deleted file mode 100644
index 658b2dc5cf..0000000000
--- a/testsuites/mptests/mp07/init.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*  Init
- *
- *  This routine is the initialization task for this test program.
- *  It is a user initialization task and has the responsibility for creating
- *  and starting the tasks that make up the test.  If the time of day
- *  clock is required for the test, it should also be set to a known
- *  value by this function.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "system.h"
-
-rtems_task Init(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-
-  printf(
-   "\n\n*** TEST 7 -- NODE %d ***\n",
-   Multiprocessing_configuration.node
-  );
-
-  Task_name[ 1 ] = rtems_build_name( '1', '1', '1', ' ' );
-  Task_name[ 2 ] = rtems_build_name( '2', '2', '2', ' ' );
-
-  puts( "Creating Test_task (Global)" );
-  status = rtems_task_create(
-    Task_name[Multiprocessing_configuration.node],
-    1,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_TIMESLICE,
-    RTEMS_GLOBAL,
-    &Task_id[ 1 ]
-  );
-  directive_failed( status, "rtems_task_create" );
-
-  puts( "Starting Test_task (Global)" );
-  status = rtems_task_start( Task_id[ 1 ], Test_task, 0 );
-  directive_failed( status, "rtems_task_start" );
-
-  Timer_name[ 1 ] = rtems_build_name( 'T', 'M', '1', ' ' );
-
-  status = rtems_timer_create( Timer_name[ 1 ], &Timer_id[ 1 ] );
-  directive_failed( status, "rtems_timer_create" );
-
-  puts( "Deleting initialization task" );
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-}
diff --git a/testsuites/mptests/mp07/node1/mp07.doc b/testsuites/mptests/mp07/node1/mp07.doc
deleted file mode 100644
index 196a33defc..0000000000
--- a/testsuites/mptests/mp07/node1/mp07.doc
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
-This file describes the directives and concepts tested by this test set.
-
-test set name:  test56
-
-directives:
-  ex_init, ex_start, t_create, t_start, tm_tick, i_return, t_ident,
-  ev_send, ev_receive
-
-concepts:
-
-  a.  Verifies system can create and start both the executive's system
-      initialization and idle task.
-
-  b.  Verifies executive can swap between three application tasks at the
-      same priority and the executive's internal idle task.
-
-  c.  Verifies can print strings to the CRT on port 2 of the mvme136 board
-      using Print and Println in the board support package.
-
-  d.  Verifies interrupt handler can handler a task switch from an interrupt
-      as specified with the i_return directive.
-
-  e.  Verifies executive initialization performed correctly.
-
-  f.  Verifies the executive trap handler except for the halt function.
-
-  g.  Verifies that a task can get the task identification number of itself.
-
-  h.  Verifies that a task can get the task identification number
-      of another task.
-
-  i.  Verifies that two tasks on different processors can alternate
-      sending each other events.
diff --git a/testsuites/mptests/mp07/node1/mp07.scn b/testsuites/mptests/mp07/node1/mp07.scn
deleted file mode 100644
index d348f48612..0000000000
--- a/testsuites/mptests/mp07/node1/mp07.scn
+++ /dev/null
@@ -1,10 +0,0 @@
-*** TEST 7 -- NODE 1 ***
-Creating Test_task (Global)
-Starting Test_task (Global)
-Deleting initialization task
-Remote task's name is : 222
-Getting TID of remote task
-Sending first event to remote task
-....................................................
-....................................................
-*** END OF TEST 7 ***
diff --git a/testsuites/mptests/mp07/node2/mp07.doc b/testsuites/mptests/mp07/node2/mp07.doc
deleted file mode 100644
index 496f3569e5..0000000000
--- a/testsuites/mptests/mp07/node2/mp07.doc
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
diff --git a/testsuites/mptests/mp07/node2/mp07.scn b/testsuites/mptests/mp07/node2/mp07.scn
deleted file mode 100644
index 9e361d713c..0000000000
--- a/testsuites/mptests/mp07/node2/mp07.scn
+++ /dev/null
@@ -1,9 +0,0 @@
-*** TEST 7 -- NODE 2 ***
-Creating Test_task (Global)
-Starting Test_task (Global)
-Deleting initialization task
-Remote task's name is : 111
-Getting TID of remote task
-....................................................
-....................................................
-*** END OF TEST 7 ***
diff --git a/testsuites/mptests/mp07/system.h b/testsuites/mptests/mp07/system.h
deleted file mode 100644
index fa86b90798..0000000000
--- a/testsuites/mptests/mp07/system.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*  system.h
- *
- *  This include file contains information that is included in every
- *  function in the test set.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <tmacros.h>
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
-
-rtems_task Test_task(
-  rtems_task_argument argument
-);
-
-/* configuration information */
- 
-#define CONFIGURE_MPTEST
- 
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
- 
-#define CONFIGURE_MAXIMUM_TIMERS              1
-
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#include <confdefs.h>
-
-/* variables */
-
-TEST_EXTERN rtems_id   Task_id[ 4 ];     /* array of task ids */
-TEST_EXTERN rtems_name Task_name[ 4 ];   /* array of task names */
-
-TEST_EXTERN rtems_id   Timer_id[ 4 ];     /* array of timer ids */
-TEST_EXTERN rtems_name Timer_name[ 4 ];   /* array of timer names */
- 
-TEST_EXTERN volatile rtems_boolean Stop_Test;
-
-/* end of include file */
diff --git a/testsuites/mptests/mp07/task1.c b/testsuites/mptests/mp07/task1.c
deleted file mode 100644
index 8434f9d6f9..0000000000
--- a/testsuites/mptests/mp07/task1.c
+++ /dev/null
@@ -1,103 +0,0 @@
-/*  Test_task
- *
- *  This task continuously sends an event to its counterpart on the
- *  other node, and then waits for it to send an event.  The copy
- *  running on node one send the first event.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-#define DOT_COUNT 100
-
-rtems_timer_service_routine Stop_Test_TSR(
-  rtems_id  ignored_id,
-  void     *ignored_address
-)
-{
-  Stop_Test = TRUE;
-}
-
-rtems_task Test_task(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-  rtems_unsigned32  count;
-  rtems_unsigned32  remote_node;
-  rtems_id          remote_tid;
-  rtems_event_set   event_out;
-
-  Stop_Test = FALSE;
-
-  remote_node = (Multiprocessing_configuration.node == 1) ? 2 : 1;
-  puts_nocr( "Remote task's name is : " );
-  put_name( Task_name[ remote_node ], TRUE );
-
-  puts( "Getting TID of remote task" );
-  do {
-    status = rtems_task_ident(
-      Task_name[ remote_node ],
-      RTEMS_SEARCH_ALL_NODES,
-      &remote_tid
-    );
-  } while ( !rtems_is_status_successful( status ) );
-
-  if ( Multiprocessing_configuration.node == 1 ) {
-    puts( "Sending first event to remote task" );
-    status = rtems_event_send( remote_tid, RTEMS_EVENT_16 );
-    directive_failed( status, "rtems_event_send" );
-  }
-
-  status = rtems_timer_fire_after(
-    Timer_id[ 1 ],
-    5 * TICKS_PER_SECOND,
-    Stop_Test_TSR,
-    NULL
-  );
-  directive_failed( status, "rtems_timer_fire_after" );
-
-  while ( Stop_Test == FALSE ) {
-    for ( count=DOT_COUNT ; count && (Stop_Test == FALSE) ; count-- ) {
-      status = rtems_event_receive(
-        RTEMS_EVENT_16,
-        RTEMS_DEFAULT_OPTIONS,
-        RTEMS_NO_TIMEOUT,
-        &event_out
-      );
-      if ( status == RTEMS_TIMEOUT ) {
-        puts( "\nTA1 - RTEMS_TIMEOUT .. probably OK if the other node exits" );
-        break;
-      } else
-        directive_failed( status, "rtems_event_receive" );
-
-      status = rtems_event_send( remote_tid, RTEMS_EVENT_16 );
-      directive_failed( status, "rtems_event_send" );
-    }
-    put_dot('.');
-  }
-
-  /*
-   * Wait a bit before shutting down so we don't screw up the other node
-   * when our MPCI shuts down
-   */
-
-  rtems_task_wake_after(10);
-
-  puts( "\n*** END OF TEST 7 ***" );
-  exit( 0 );
-}
diff --git a/testsuites/mptests/mp08/init.c b/testsuites/mptests/mp08/init.c
deleted file mode 100644
index 499bbf166c..0000000000
--- a/testsuites/mptests/mp08/init.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/*  Init
- *
- *  This routine is the initialization task for this test program.
- *  It is a user initialization task and has the responsibility for creating
- *  and starting the tasks that make up the test.  If the time of day
- *  clock is required for the test, it should also be set to a known
- *  value by this function.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "system.h"
-
-rtems_task Init(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-
-  printf(
-    "\n\n*** TEST 8 -- NODE %d ***\n",
-    Multiprocessing_configuration.node
-  );
-
-  Task_name[ 1 ] = rtems_build_name( '1', '1', '1', ' ' );
-  Task_name[ 2 ] = rtems_build_name( '2', '2', '2', ' ' );
-
-  Semaphore_name[ 1 ] = rtems_build_name( 'S', 'E', 'M', '\0' );
-
-  if ( Multiprocessing_configuration.node == 1 ) {
-    puts( "Creating Sempahore (Global)" );
-    status = rtems_semaphore_create(
-      Semaphore_name[ 1 ],
-      1,
-      RTEMS_GLOBAL,
-      RTEMS_NO_PRIORITY,
-      &Semaphore_id[ 1 ]
-    );
-    directive_failed( status, "rtems_semaphore_create" );
-  }
-
-  puts( "Creating Test_task (Global)" );
-  status = rtems_task_create(
-    Task_name[ Multiprocessing_configuration.node ],
-    1,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_TIMESLICE,
-    RTEMS_GLOBAL,
-    &Task_id[ 1 ]
-  );
-  directive_failed( status, "rtems_task_create" );
-
-  puts( "Starting Test_task (Global)" );
-  status = rtems_task_start( Task_id[ 1 ], Test_task, 0 );
-  directive_failed( status, "rtems_task_start" );
-
-  puts( "Deleting initialization task" );
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-}
diff --git a/testsuites/mptests/mp08/node1/mp08.doc b/testsuites/mptests/mp08/node1/mp08.doc
deleted file mode 100644
index 93cef0a0d7..0000000000
--- a/testsuites/mptests/mp08/node1/mp08.doc
+++ /dev/null
@@ -1,52 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-This file describes the directives and concepts tested by this test set.
-
-test set name:  test57
-
-GLOBAL SEMAPHORE TEST
-
-directives:
-  ex_init, ex_start, t_create, t_start, tm_tick, i_return, t_ident,
-  sm_create, sm_ident, sm_p, sm_v, sm_delete
-
-concepts:
-
-  a.  Verifies system can create and start both the executive's system
-      initialization and idle task.
-
-  b.  Verifies executive can swap between three application tasks at the
-      same priority and the executive's internal idle task.
-
-  c.  Verifies can print strings to the CRT on port 2 of the mvme136 board
-      using Print and Println in the board support package.
-
-  d.  Verifies interrupt handler can handler a task switch from an interrupt
-      as specified with the i_return directive.
-
-  e.  Verifies executive initialization performed correctly.
-
-  f.  Verifies the executive trap handler except for the halt function.
-
-  g.  Verifies that a task can get the identification number of
-      a global sempahore.
-
-  h.  Verifies that two tasks on different processors can
-      alternate accessing a semaphore.
-
-  i.  Verifies operation of sm_delete on global semaphores
-      for both normal and error case.
-
-  j.  Verifies Rpc and Process_pkt for packet types Q_SMP, Q_SMV,
-      P_OBJCREATE (semaphore), P_OBJDELETE (semaphore), P_SMDEL_TQ.
-
diff --git a/testsuites/mptests/mp08/node1/mp08.scn b/testsuites/mptests/mp08/node1/mp08.scn
deleted file mode 100644
index cde263420c..0000000000
--- a/testsuites/mptests/mp08/node1/mp08.scn
+++ /dev/null
@@ -1,11 +0,0 @@
-*** TEST 8 -- NODE 1 ***
-Creating Test_task (Global)
-Starting Test_task (Global)
-Deleting initialization task
-Getting SMID of semaphore
-pvpvpvpvpvp.......
-(continued) pvp
-
-Deleting global semaphore
-*** END OF TEST 8 ***
-
diff --git a/testsuites/mptests/mp08/node2/mp08.doc b/testsuites/mptests/mp08/node2/mp08.doc
deleted file mode 100644
index 496f3569e5..0000000000
--- a/testsuites/mptests/mp08/node2/mp08.doc
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
diff --git a/testsuites/mptests/mp08/node2/mp08.scn b/testsuites/mptests/mp08/node2/mp08.scn
deleted file mode 100644
index 5a613f45e5..0000000000
--- a/testsuites/mptests/mp08/node2/mp08.scn
+++ /dev/null
@@ -1,12 +0,0 @@
-*** TEST 8 -- NODE 2 ***
-Creating Test_task (Global)
-Starting Test_task (Global)
-Deleting initialization task
-Getting SMID of semaphore
-rtems_semaphore_delete correctly returned RTEMS_ILLEGAL_ON_REMOTE_OBJECT
-pvpvpvpvpvp.......
-(continued) pvp
-
-Global semaphore deleted
-*** END OF TEST 8 ***
-
diff --git a/testsuites/mptests/mp08/system.h b/testsuites/mptests/mp08/system.h
deleted file mode 100644
index 939c78fd9b..0000000000
--- a/testsuites/mptests/mp08/system.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*  system.h
- *
- *  This include file contains information that is included in every
- *  function in the test set.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <tmacros.h>
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
-
-rtems_task Test_task(
-  rtems_task_argument argument
-);
-
-/* configuration information */
- 
-#define CONFIGURE_MPTEST
- 
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
- 
-#define CONFIGURE_MAXIMUM_TIMERS              1
-#define CONFIGURE_MAXIMUM_SEMAPHORES          1
-
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#include <confdefs.h>
-
-/* variables */
-
-TEST_EXTERN rtems_id   Task_id[ 4 ];     /* array of task ids */
-TEST_EXTERN rtems_name Task_name[ 4 ];   /* array of task names */
-
-TEST_EXTERN rtems_id   Semaphore_id[ 2 ];     /* array of semaphore ids */
-TEST_EXTERN rtems_name Semaphore_name[ 2 ];   /* array of semaphore names */
-
-/* end of include file */
diff --git a/testsuites/mptests/mp08/task1.c b/testsuites/mptests/mp08/task1.c
deleted file mode 100644
index 3fc914ee35..0000000000
--- a/testsuites/mptests/mp08/task1.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/*  Test_task
- *
- *  This task tests global semaphore operations.  It verifies that
- *  global semaphore errors are correctly returned.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_task Test_task(
-  rtems_task_argument argument
-)
-{
-  rtems_unsigned32  count;
-  rtems_status_code status;
-
-  puts( "Getting SMID of semaphore" );
-
-  do {
-    status = rtems_semaphore_ident(
-      Semaphore_name[ 1 ],
-      RTEMS_SEARCH_ALL_NODES,
-      &Semaphore_id[ 1 ]
-    );
-  } while ( !rtems_is_status_successful( status ) );
-
-  if ( Multiprocessing_configuration.node == 2 ) {
-    status = rtems_semaphore_delete( Semaphore_id[ 1 ] );
-    fatal_directive_status(
-      status,
-      RTEMS_ILLEGAL_ON_REMOTE_OBJECT,
-      "rtems_semaphore_delete did not return RTEMS_ILLEGAL_ON_REMOTE_OBJECT"
-    );
-    puts(
-      "rtems_semaphore_delete correctly returned RTEMS_ILLEGAL_ON_REMOTE_OBJECT"
-    );
-  }
-
-  count = 0;            /* number of times node 1 releases semaphore */
-  while ( FOREVER ) {
-    put_dot( 'p' );
-    status = rtems_semaphore_obtain(
-      Semaphore_id[ 1 ],
-      RTEMS_DEFAULT_OPTIONS,
-      RTEMS_NO_TIMEOUT
-    );
-    if ( status != RTEMS_SUCCESSFUL ) {
-      fatal_directive_status(
-        status,
-        RTEMS_OBJECT_WAS_DELETED,
-        "rtems_semaphore_obtain"
-      );
-      puts( "\nGlobal semaphore deleted" );
-      puts( "*** END OF TEST 8 ***" );
-      exit( 0 );
-    }
-
-    if ( Multiprocessing_configuration.node == 1 && ++count == 1000 ) {
-      status = rtems_task_wake_after( TICKS_PER_SECOND );
-      directive_failed( status, "rtems_task_wake_after" );
-
-      puts( "\nDeleting global semaphore" );
-      status = rtems_semaphore_delete( Semaphore_id[ 1 ] );
-      directive_failed( status, "rtems_semaphore_delete" );
-
-      puts( "*** END OF TEST 8 ***" );
-      exit( 0 );
-    }
-    else {
-      put_dot( 'v' );
-      status = rtems_semaphore_release( Semaphore_id[ 1 ] );
-      directive_failed( status, "rtems_semaphore_release FAILED!!" );
-    }
-  }
-}
diff --git a/testsuites/mptests/mp09/init.c b/testsuites/mptests/mp09/init.c
deleted file mode 100644
index 85af601bce..0000000000
--- a/testsuites/mptests/mp09/init.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/*  Init
- *
- *  This routine is the initialization task for this test program.
- *  It is a user initialization task and has the responsibility for creating
- *  and starting the tasks that make up the test.  If the time of day
- *  clock is required for the test, it should also be set to a known
- *  value by this function.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "system.h"
-
-rtems_task Init(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-
-  printf(
-    "\n\n*** TEST 9 -- NODE %d ***\n",
-    Multiprocessing_configuration.node
-  );
-
-  Task_name[ 1 ] = rtems_build_name( '1', '1', '1', ' ' );
-  Task_name[ 2 ] = rtems_build_name( '2', '2', '2', ' ' );
-
-  Queue_name[ 1 ] = rtems_build_name( 'M', 'S', 'G', ' ' );
-
-  if ( Multiprocessing_configuration.node == 1 ) {
-    puts( "Creating Message Queue (Global)" );
-    status = rtems_message_queue_create(
-      Queue_name[ 1 ],
-      3,
-      16,
-      RTEMS_GLOBAL,
-      &Queue_id[ 1 ]
-    );
-    directive_failed( status, "rtems_message_queue_create" );
-  }
-
-  puts( "Creating Test_task (local)" );
-  status = rtems_task_create(
-    Task_name[Multiprocessing_configuration.node],
-    1,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_TIMESLICE,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Task_id[ 1 ]
-  );
-  directive_failed( status, "rtems_task_create" );
-
-  puts( "Starting Test_task (local)" );
-  status = rtems_task_start( Task_id[ 1 ], Test_task, 0 );
-  directive_failed( status, "rtems_task_start" );
-
-  puts( "Deleting initialization task" );
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-}
diff --git a/testsuites/mptests/mp09/node1/mp09.doc b/testsuites/mptests/mp09/node1/mp09.doc
deleted file mode 100644
index 239298cf4e..0000000000
--- a/testsuites/mptests/mp09/node1/mp09.doc
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-This file describes the directives and concepts tested by this test set.
-
-test set name:  test58
-
-GLOBAL MESSAGE QUEUE TEST
-
-directives:
-  ex_init, ex_start, t_create, t_start, tm_tick, i_return,
-  tm_wkafter, q_create, q_send, q_broadcast, q_urgent, q_receive,
-  q_delete
-
-concepts:
-
-  a.  Verifies system can create and start both the executive's system
-      initialization and idle task.
-
-  b.  Verifies executive can swap between three application tasks at the
-      same priority and the executive's internal idle task.
-
-  c.  Verifies can print strings to the CRT on port 2 of the mvme136 board
-      using Print and Println in the board support package.
-
-  d.  Verifies interrupt handler can handler a task switch from an interrupt
-      as specified with the i_return directive.
-
-  e.  Verifies executive initialization performed correctly.
-
-  f.  Verifies the executive trap handler except for the halt function.
-
-  g.  Verifies that a task can get the task identification number of itself.
-
-  h.  Verifies that a task can delete itself.
-
-  i.  Verifies Rpc and Process_pkt for message queue related packets.
-
-  j.  Verifies normal and error paths for global message queue handling.
-
-NOTE:  The SLAVE must be started first for this test to successfully run.
diff --git a/testsuites/mptests/mp09/node1/mp09.scn b/testsuites/mptests/mp09/node1/mp09.scn
deleted file mode 100644
index 74cf06904d..0000000000
--- a/testsuites/mptests/mp09/node1/mp09.scn
+++ /dev/null
@@ -1,22 +0,0 @@
-*** TEST 9 -- NODE 1 ***
-Creating Message Queue (Global)
-Creating Test_task (local)
-Starting Test_task (local)
-Deleting initialization task
-Getting QID of message queue
-Receiving message ...
-Received : 123456789012345
-Receiving message ...
-Received : abcdefghijklmno
-Receiving message ...
-Received : ABCDEFGHIJKLMNO
-Receiver delaying for a second
-rtems_message_queue_send: 123456789012345
-Delaying for a second
-rtems_message_queue_urgent: abcdefghijklmno
-Delaying for a second
-rtems_message_queue_broadcast: ABCDEFGHIJKLMNO
-Delaying for a second
-Delaying for 5 seconds
-Deleting Message queue
-*** END OF TEST 9 ***
diff --git a/testsuites/mptests/mp09/node2/mp09.doc b/testsuites/mptests/mp09/node2/mp09.doc
deleted file mode 100644
index 496f3569e5..0000000000
--- a/testsuites/mptests/mp09/node2/mp09.doc
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
diff --git a/testsuites/mptests/mp09/node2/mp09.scn b/testsuites/mptests/mp09/node2/mp09.scn
deleted file mode 100644
index 1bd17cecd9..0000000000
--- a/testsuites/mptests/mp09/node2/mp09.scn
+++ /dev/null
@@ -1,27 +0,0 @@
-*** TEST 9 -- NODE 2 ***
-Creating Test_task (local)
-Starting Test_task (local)
-Deleting initialization task
-Getting QID of message queue
-rtems_message_queue_delete correctly returned RTEMS_ILLEGAL_ON_REMOTE_OBJECT
-rtems_message_queue_send: 123456789012345
-Delaying for a second
-rtems_message_queue_urgent: abcdefghijklmno
-Delaying for a second
-rtems_message_queue_broadcast: ABCDEFGHIJKLMNO
-Delaying for a second
-Receiving message ...
-Received : 123456789012345
-Receiving message ...
-Received : abcdefghijklmno
-Receiving message ...
-Received : ABCDEFGHIJKLMNO
-Receiver delaying for a second
-Flushing remote empty queue
-0 messages were flushed on the remote queue
-Send messages to be flushed from remote queue
-Flushing remote queue
-1 messages were flushed on the remote queue
-Waiting for message queue to be deleted
-Global message queue deleted
-*** END OF TEST 9 ***
diff --git a/testsuites/mptests/mp09/recvmsg.c b/testsuites/mptests/mp09/recvmsg.c
deleted file mode 100644
index 2de46306a7..0000000000
--- a/testsuites/mptests/mp09/recvmsg.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*  Receive_messages
- *
- *  This routine receives and prints three messages.
- *  an error condition.
- *
- *  Input parameters:  NONE
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-void Receive_messages()
-{
- rtems_status_code status;
- rtems_unsigned32  index;
- rtems_unsigned32  size;
- char              receive_buffer[16];
-
- for ( index=1 ; index <=3 ; index++ ) {
-   puts( "Receiving message ..." );
-   status = rtems_message_queue_receive(
-     Queue_id[ 1 ],
-     (long (*)[4])receive_buffer,
-     &size,
-     RTEMS_DEFAULT_OPTIONS,
-     RTEMS_NO_TIMEOUT
-   );
-   directive_failed( status, "rtems_message_queue_receive" );
-   puts_nocr( "Received : ");
-   puts( receive_buffer );
- }
-
-  puts( "Receiver delaying for a second" );
-  status = rtems_task_wake_after( TICKS_PER_SECOND );
-  directive_failed( status, "rtems_task_wake_after" );
-}
diff --git a/testsuites/mptests/mp09/sendmsg.c b/testsuites/mptests/mp09/sendmsg.c
deleted file mode 100644
index 0992d21ae5..0000000000
--- a/testsuites/mptests/mp09/sendmsg.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*  Send_messages
- *
- *  This routine sends a series of three messages.
- *  an error condition.
- *
- *  Input parameters:  NONE
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-void Send_messages()
-{
-  rtems_status_code status;
-  rtems_unsigned32  broadcast_count;
-
-  puts_nocr( "rtems_message_queue_send: " );
-  puts( buffer1 );
-
-  status = rtems_message_queue_send( Queue_id[ 1 ], (long (*)[4])buffer1, 16 );
-  directive_failed( status, "rtems_message_queue_send" );
-
-  puts( "Delaying for a second" );
-  status = rtems_task_wake_after( TICKS_PER_SECOND );
-  directive_failed( status, "rtems_task_wake_after" );
-
-  puts_nocr( "rtems_message_queue_urgent: " );
-  puts( buffer2 );
-  status = rtems_message_queue_urgent( Queue_id[ 1 ], (long (*)[4])buffer2, 16 );
-  directive_failed( status, "rtems_message_queue_urgent" );
-
-  puts( "Delaying for a second" );
-  status = rtems_task_wake_after( TICKS_PER_SECOND );
-  directive_failed( status, "rtems_task_wake_after" );
-
-  puts_nocr( "rtems_message_queue_broadcast: " );
-  puts( buffer3 );
-  status = rtems_message_queue_broadcast(
-    Queue_id[ 1 ],
-    (long (*)[4])buffer3,
-    16,
-    &broadcast_count
-  );
-  directive_failed( status, "rtems_message_queue_broadcast" );
-
-  puts( "Delaying for a second" );
-  status = rtems_task_wake_after( TICKS_PER_SECOND );
-  directive_failed( status, "rtems_task_wake_after" );
-}
diff --git a/testsuites/mptests/mp09/system.h b/testsuites/mptests/mp09/system.h
deleted file mode 100644
index 1115045c3e..0000000000
--- a/testsuites/mptests/mp09/system.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*  system.h
- *
- *  This include file contains information that is included in every
- *  function in the test set.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <tmacros.h>
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
-
-rtems_task Test_task(
-  rtems_task_argument argument
-);
-
-void Receive_messages( void );
-
-void Send_messages( void );
-
-/* configuration information */
- 
-#define CONFIGURE_MPTEST
- 
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
- 
-#define CONFIGURE_MAXIMUM_TIMERS              1
-#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES      1
-
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#include <confdefs.h>
-
-/* variables */
-
-TEST_EXTERN rtems_id   Task_id[ 4 ];     /* array of task ids */
-TEST_EXTERN rtems_name Task_name[ 4 ];   /* array of task names */
-
-TEST_EXTERN rtems_id   Queue_id[ 2 ];    /* array of message queue ids */
-TEST_EXTERN rtems_name Queue_name[ 2 ];  /* array of message queue names */
- 
-extern char buffer1[16];
-extern char buffer2[16];
-extern char buffer3[16];
-extern char buffer4[16];
-
-/* end of include file */
diff --git a/testsuites/mptests/mp09/task1.c b/testsuites/mptests/mp09/task1.c
deleted file mode 100644
index ab16e8b4eb..0000000000
--- a/testsuites/mptests/mp09/task1.c
+++ /dev/null
@@ -1,109 +0,0 @@
-/*  Test_task
- *
- *  This task tests global message queue operations.  It also generates
- *  an error condition.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-char buffer1[16] = "123456789012345";
-char buffer2[16] = "abcdefghijklmno";
-char buffer3[16] = "ABCDEFGHIJKLMNO";
-char buffer4[16] = "PQRSTUVWXYZ(){}";
-
-rtems_task Test_task(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-  rtems_unsigned32  count;
-  rtems_unsigned32  size;
-  char              receive_buffer[16];
-
-  status = rtems_task_wake_after( TICKS_PER_SECOND );
-  directive_failed( status, "rtems_task_wake_after" );
-
-  puts( "Getting QID of message queue" );
-
-  do {
-    status = rtems_message_queue_ident(
-      Queue_name[ 1 ],
-      RTEMS_SEARCH_ALL_NODES,
-      &Queue_id[ 1 ]
-    );
-  } while ( !rtems_is_status_successful( status ) );
-
-  if ( Multiprocessing_configuration.node == 2 ) {
-    status = rtems_message_queue_delete( Queue_id[ 1 ] );
-    fatal_directive_status(
-      status,
-      RTEMS_ILLEGAL_ON_REMOTE_OBJECT,
-      "rtems_message_queue_delete"
-    );
-    puts(
-  "rtems_message_queue_delete correctly returned RTEMS_ILLEGAL_ON_REMOTE_OBJECT"
-    );
-
-    Send_messages();
-    Receive_messages();
-
-    puts( "Flushing remote empty queue" );
-    status = rtems_message_queue_flush( Queue_id[ 1 ], &count );
-    directive_failed( status, "rtems_message_queue_flush" );
-    printf( "%d messages were flushed on the remote queue\n", count );
-
-    puts( "Send messages to be flushed from remote queue" );
-    status = rtems_message_queue_send( Queue_id[ 1 ], (long (*)[4])buffer1, 16 );
-    directive_failed( status, "rtems_message_queue_send" );
-
-    puts( "Flushing remote queue" );
-    status = rtems_message_queue_flush( Queue_id[ 1 ], &count );
-    directive_failed( status, "rtems_message_queue_flush" );
-    printf( "%d messages were flushed on the remote queue\n", count );
-
-    puts( "Waiting for message queue to be deleted" );
-    status = rtems_message_queue_receive(
-      Queue_id[ 1 ],
-      (long (*)[4])receive_buffer,
-      &size,
-      RTEMS_DEFAULT_OPTIONS,
-      RTEMS_NO_TIMEOUT
-    );
-    fatal_directive_status(
-      status,
-      RTEMS_OBJECT_WAS_DELETED,
-      "rtems_message_queue_receive"
-    );
-    puts( "\nGlobal message queue deleted" );
-  }
-  else {                   /* node == 1 */
-    Receive_messages();
-    Send_messages();
-
-    puts( "Delaying for 5 seconds" );
-    status = rtems_task_wake_after( 5*TICKS_PER_SECOND );
-    directive_failed( status, "rtems_task_wake_after" );
-
-    puts( "Deleting Message queue" );
-    status = rtems_message_queue_delete( Queue_id[ 1 ] );
-    directive_failed( status, "rtems_message_queue_delete" );
-  }
-
-  puts( "*** END OF TEST 9 ***" );
-  exit( 0 );
-}
diff --git a/testsuites/mptests/mp10/init.c b/testsuites/mptests/mp10/init.c
deleted file mode 100644
index d5ab43d908..0000000000
--- a/testsuites/mptests/mp10/init.c
+++ /dev/null
@@ -1,143 +0,0 @@
-/*  Init
- *
- *  This routine is the initialization routine for this test program.
- *  Other than creating all objects needed by this test, if this routine
- *  is running on node one, it acquires a global semaphore to
- *  force all other tasks to pend.  If running on node two, this task
- *  sleeps for a while, and then deletes two local tasks which are
- *  waiting on a remote message queue or a semaphore.
- *  This routine is the initialization task for this test program.
- *  It is a user initialization task and has the responsibility for creating
- *  and starting the tasks that make up the test.  If the time of day
- *  clock is required for the test, it should also be set to a known
- *  value by this function.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "system.h"
-
-rtems_task Init(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-
-  printf(
-   "\n\n*** TEST 10 -- NODE %d ***\n",
-   Multiprocessing_configuration.node
-  );
-
-  Task_name[ 1 ] =  rtems_build_name( 'T', 'A', '1', ' ' );
-  Task_name[ 2 ] =  rtems_build_name( 'T', 'A', '2', ' ' );
-  Task_name[ 3 ] =  rtems_build_name( 'S', 'A', '3', ' ' );
-
-  Queue_name[ 1 ] = rtems_build_name( 'M', 'S', 'G', ' ' );
-
-  Semaphore_name[ 1 ] = rtems_build_name( 'S', 'E', 'M', ' ' );
-
-  if ( Multiprocessing_configuration.node == 1 ) {
-    puts( "Creating Message Queue (Global)" );
-    status = rtems_message_queue_create(
-      Queue_name[ 1 ],
-      3,
-      16,
-      RTEMS_GLOBAL,
-      &Queue_id[ 1 ]
-    );
-    directive_failed( status, "rtems_message_queue_create" );
-
-    puts( "Creating Semaphore (Global)" );
-    status = rtems_semaphore_create(
-      Semaphore_name[ 1 ],
-      0,
-      RTEMS_GLOBAL | RTEMS_PRIORITY,
-      RTEMS_NO_PRIORITY,
-      &Semaphore_id[ 1 ]
-    );
-    directive_failed( status, "rtems_semaphore_create" );
-
-    status = rtems_task_wake_after( 10 * TICKS_PER_SECOND );
-    directive_failed( status, "rtems_task_wake_after" );
-
-  } else {
-
-    puts( "Creating Test_task 1 (local)" );
-    status = rtems_task_create(
-      Task_name[ 1 ],
-      1,
-      RTEMS_MINIMUM_STACK_SIZE,
-      RTEMS_TIMESLICE,
-      RTEMS_DEFAULT_ATTRIBUTES,
-      &Task_id[ 1 ]
-    );
-    directive_failed( status, "rtems_task_create" );
-
-    puts( "Starting Test_task 1 (local)" );
-    status = rtems_task_start( Task_id[ 1 ], Test_task1, 0 );
-    directive_failed( status, "rtems_task_start" );
-
-    puts( "Creating Test_task 2 (local)" );
-    status = rtems_task_create(
-      Task_name[ 2 ],
-      1,
-      RTEMS_MINIMUM_STACK_SIZE,
-      RTEMS_TIMESLICE,
-      RTEMS_DEFAULT_ATTRIBUTES,
-      &Task_id[ 2 ]
-    );
-    directive_failed( status, "rtems_task_create" );
-
-    puts( "Starting Test_task 2 (local)" );
-    status = rtems_task_start( Task_id[ 2 ], Test_task2, 0 );
-    directive_failed( status, "rtems_task_start" );
-
-    puts( "Creating Test_task 3 (local)" );
-    status = rtems_task_create(
-      Task_name[ 3 ],
-      1,
-      RTEMS_MINIMUM_STACK_SIZE,
-      RTEMS_TIMESLICE,
-      RTEMS_DEFAULT_ATTRIBUTES,
-      &Task_id[ 3 ]
-    );
-    directive_failed( status, "rtems_task_create" );
-
-    puts( "Starting Test_task 3 (local)" );
-    status = rtems_task_start( Task_id[ 3 ], Test_task2, 0 );
-    directive_failed( status, "rtems_task_start" );
-
-    puts( "Sleeping for 1 seconds ..." );
-    status = rtems_task_wake_after( TICKS_PER_SECOND );
-    directive_failed( status, "rtems_task_wake_after" );
-
-    puts( "Deleting Test_task2" );
-    status = rtems_task_delete( Task_id[ 2 ] );
-    directive_failed( status, "rtems_task_delete of Task 2" );
-
-    puts( "Deleting Test_task1" );
-    status = rtems_task_delete( Task_id[ 1 ] );
-    directive_failed( status, "rtems_task_delete of Task 1" );
-
-    puts( "Restarting Test_task3" );
-    status = rtems_task_restart( Task_id[ 3 ], 1 );
-    directive_failed( status, "rtems_task_restart of Task 3" );
-
-  }
-  puts( "*** END OF TEST 10 ***" );
-  exit( 0 );
-}
diff --git a/testsuites/mptests/mp10/node1/mp10.doc b/testsuites/mptests/mp10/node1/mp10.doc
deleted file mode 100644
index fd264018d3..0000000000
--- a/testsuites/mptests/mp10/node1/mp10.doc
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-This file describes the directives and concepts tested by this test set.
-
-test set name:  test59
-
-GLOBAL SEMAPHORE TEST
-
-directives:
-  ex_init, ex_start, t_create, t_start, tm_tick, i_return, t_ident,
-  tm_set, tm_get, tm_wkafter
-
-concepts:
-
-  a.  Verifies system can create and start both the executive's system
-      initialization and idle task.
-
-  b.  Verifies executive can swap between three application tasks at the
-      same priority and the executive's internal idle task.
-
-  c.  Verifies can print strings to the CRT on port 2 of the mvme136 board
-      using Print and Println in the board support package.
-
-  d.  Verifies interrupt handler can handler a task switch from an interrupt
-      as specified with the i_return directive.
-
-  e.  Verifies executive initialization performed correctly.
-
-  f.  Verifies the executive trap handler except for the halt function.
-
-  g.  Verifies that a task can get the task identification number of itself.
-
-  h.  Verifies that a task can get the task identification number
-      of another task.
-
-  i.  Verifies that a task can delete itself or another task.
diff --git a/testsuites/mptests/mp10/node1/mp10.scn b/testsuites/mptests/mp10/node1/mp10.scn
deleted file mode 100644
index deeafc0a9a..0000000000
--- a/testsuites/mptests/mp10/node1/mp10.scn
+++ /dev/null
@@ -1,4 +0,0 @@
-*** TEST 10 -- NODE 1 ***
-Creating Message Queue (Global)
-Creating Semaphore (Global)
-*** END OF TEST 10 ***
diff --git a/testsuites/mptests/mp10/node2/mp10.doc b/testsuites/mptests/mp10/node2/mp10.doc
deleted file mode 100644
index 496f3569e5..0000000000
--- a/testsuites/mptests/mp10/node2/mp10.doc
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
diff --git a/testsuites/mptests/mp10/node2/mp10.scn b/testsuites/mptests/mp10/node2/mp10.scn
deleted file mode 100644
index 25c07e6202..0000000000
--- a/testsuites/mptests/mp10/node2/mp10.scn
+++ /dev/null
@@ -1,19 +0,0 @@
-*** TEST 10 -- NODE 2 ***
-Creating Test_task 1 (local)
-Starting Test_task 1 (local)
-Creating Test_task 2 (local)
-Starting Test_task 2 (local)
-Creating Test_task 3 (local)
-Starting Test_task 3 (local)
-Sleeping for 1 seconds ...
-Getting QID of message queue
-Attempting to receive message ...
-Getting SMID of semaphore
-Attempting to acquire semaphore ...
-Getting SMID of semaphore
-Attempting to acquire semaphore ...
-Deleting Test_task2
-Deleting Test_task1
-Restarting Test_task3
-*** END OF TEST 10 ***
-
diff --git a/testsuites/mptests/mp10/system.h b/testsuites/mptests/mp10/system.h
deleted file mode 100644
index 669eff75ac..0000000000
--- a/testsuites/mptests/mp10/system.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*  system.h
- *
- *  This include file contains information that is included in every
- *  function in the test set.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <tmacros.h>
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
- 
-rtems_task Test_task1(
-  rtems_task_argument argument
-);
- 
-rtems_task Test_task2(
-  rtems_task_argument argument
-);
- 
-rtems_task Test_task3(
-  rtems_task_argument restart
-);
-
-/* configuration information */
- 
-#define CONFIGURE_MPTEST
- 
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
- 
-#if ( NODE_NUMBER == 1 )
-#define CONFIGURE_MAXIMUM_SEMAPHORES          1
-#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES      1
-#endif
-
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#include <confdefs.h>
-
-/* variables */
-
-TEST_EXTERN rtems_id   Task_id[ 4 ];     /* array of task ids */
-TEST_EXTERN rtems_name Task_name[ 4 ];   /* array of task names */
-
-TEST_EXTERN rtems_id   Queue_id[ 2 ];       /* array of message queue ids */
-TEST_EXTERN rtems_name Queue_name[ 2 ];     /* array of message queue names */
-
-TEST_EXTERN rtems_id   Semaphore_id[ 2 ];   /* array of semaphore ids */
-TEST_EXTERN rtems_name Semaphore_name[ 2 ]; /* array of semaphore names */
-
-/* end of include file */
diff --git a/testsuites/mptests/mp10/task1.c b/testsuites/mptests/mp10/task1.c
deleted file mode 100644
index df7a8e9e03..0000000000
--- a/testsuites/mptests/mp10/task1.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*  Test_task1
- *
- *  This task attempts to receive a message from a global message queue.
- *  It should never actually receive the message.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_task Test_task1(
-  rtems_task_argument argument
-)
-{
-  char              receive_buffer[16];
-  rtems_unsigned32  size;
-  rtems_status_code status;
-
-  puts( "Getting QID of message queue" );
-
-  do {
-    status = rtems_message_queue_ident(
-      Queue_name[ 1 ],
-      RTEMS_SEARCH_ALL_NODES,
-      &Queue_id[ 1 ]
-    );
-  } while ( !rtems_is_status_successful( status ) );
-
-  puts( "Attempting to receive message ..." );
-  status = rtems_message_queue_receive(
-    Queue_id[ 1 ],
-    (long (*)[4])receive_buffer,
-    &size,
-    RTEMS_DEFAULT_OPTIONS,
-    RTEMS_NO_TIMEOUT
-  );
-  directive_failed( status, "rtems_message_queue_receive" );
-
-}
diff --git a/testsuites/mptests/mp10/task2.c b/testsuites/mptests/mp10/task2.c
deleted file mode 100644
index 86e944fb2f..0000000000
--- a/testsuites/mptests/mp10/task2.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*  Test_task2
- *
- *  This task attempts to receive control of a global semaphore.
- *  It should never receive control of the semaphore.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_task Test_task2(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-
-  puts( "Getting SMID of semaphore" );
-
-  do {
-    status = rtems_semaphore_ident(
-      Semaphore_name[ 1 ],
-      RTEMS_SEARCH_ALL_NODES,
-      &Semaphore_id[ 1 ]
-    );
-  } while ( !rtems_is_status_successful( status ) );
-
-  puts( "Attempting to acquire semaphore ..." );
-  status = rtems_semaphore_obtain(
-    Semaphore_id[ 1 ],
-    RTEMS_DEFAULT_OPTIONS,
-    RTEMS_NO_TIMEOUT
-  );
-  directive_failed( status, "rtems_semaphore_obtain" );
-}
diff --git a/testsuites/mptests/mp10/task3.c b/testsuites/mptests/mp10/task3.c
deleted file mode 100644
index fe91319879..0000000000
--- a/testsuites/mptests/mp10/task3.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*  Test_task3
- *
- *  This task attempts to receive control of a global semaphore.
- *  It should never receive control of the semaphore.
- *
- *  Input parameters:  NONE
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_task Test_task3( restart )
-rtems_task_argument restart;
-{
-  rtems_status_code status;
-
-  if ( restart == 1 ) {
-    status = rtems_task_delete( RTEMS_SELF );
-    directive_failed( status, "rtems_task_delete" );
-  }
-
-  puts( "Getting SMID of semaphore" );
-
-  do {
-    status = rtems_semaphore_ident(
-      Semaphore_name[ 1 ],
-      RTEMS_SEARCH_ALL_NODES,
-      &Semaphore_id[ 1 ]
-    );
-  } while ( !rtems_is_status_successful( status ) );
-
-  puts( "Attempting to acquire semaphore ..." );
-  status = rtems_semaphore_obtain(
-    Semaphore_id[ 1 ],
-    RTEMS_DEFAULT_OPTIONS,
-    RTEMS_NO_TIMEOUT
-  );
-  directive_failed( status, "rtems_semaphore_obtain" );
-}
diff --git a/testsuites/mptests/mp11/init.c b/testsuites/mptests/mp11/init.c
deleted file mode 100644
index 7d74289ee4..0000000000
--- a/testsuites/mptests/mp11/init.c
+++ /dev/null
@@ -1,105 +0,0 @@
-/*  Init
- *
- *  This routine is the initialization and test routine for
- *  this test program.  It attempts to create more global
- *  objects than are configured (zero should be configured).
- *  This routine is the initialization task for this test program.
- *  It is a user initialization task and has the responsibility for creating
- *  and starting the tasks that make up the test.  If the time of day
- *  clock is required for the test, it should also be set to a known
- *  value by this function.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "system.h"
-
-rtems_unsigned8 my_partition[0x30000] CPU_STRUCTURE_ALIGNMENT;
-
-rtems_task Init(
-  rtems_task_argument argument
-)
-{
-  rtems_id          junk_id;
-  rtems_status_code status;
-
-  printf(
-    "\n\n*** TEST 11 -- NODE %d ***\n",
-    Multiprocessing_configuration.node
-  );
-
-  Task_name[ 1 ] = rtems_build_name( '1', '1', '1', ' ' );
-  Task_name[ 2 ] = rtems_build_name( '2', '2', '2', ' ' );
-
-  Queue_name[ 1 ] = rtems_build_name( 'M', 'S', 'G', ' ' );
-
-  Semaphore_name[ 1 ] = rtems_build_name( 'S', 'E', 'M', ' ' );
-
-  if ( Multiprocessing_configuration.node == 1 ) {
-    puts( "Attempting to create Test_task (Global)" );
-    status = rtems_task_create(
-      Task_name[ 1 ],
-      1,
-      RTEMS_MINIMUM_STACK_SIZE,
-      RTEMS_DEFAULT_MODES,
-      RTEMS_GLOBAL,
-      &junk_id
-    );
-    fatal_directive_status( status, RTEMS_TOO_MANY, "rtems_task_create" );
-    puts( "rtems_task_create correctly returned RTEMS_TOO_MANY" );
-
-    puts( "Attempting to create Message Queue (Global)" );
-    status = rtems_message_queue_create(
-      Queue_name[ 1 ],
-      3,
-      16,
-      RTEMS_GLOBAL,
-      &junk_id
-    );
-    fatal_directive_status(
-      status,
-      RTEMS_TOO_MANY,
-      "rtems_message_queue_create"
-    );
-    puts( "rtems_message_queue_create correctly returned RTEMS_TOO_MANY" );
-
-    puts( "Attempting to create Semaphore (Global)" );
-    status = rtems_semaphore_create(
-      Semaphore_name[ 1 ],
-      1,
-      RTEMS_GLOBAL,
-      RTEMS_NO_PRIORITY,
-      &junk_id
-    );
-    fatal_directive_status( status, RTEMS_TOO_MANY, "rtems_semaphore_create" );
-    puts( "rtems_semaphore_create correctly returned RTEMS_TOO_MANY" );
-
-    puts( "Attempting to create Partition (Global)" );
-    status = rtems_partition_create(
-      1,
-      (rtems_unsigned8 *) my_partition,
-      128,
-      64,
-      RTEMS_GLOBAL,
-      &junk_id
-    );
-    fatal_directive_status( status, RTEMS_TOO_MANY, "rtems_partition_create" );
-    puts( "rtems_partition_create correctly returned RTEMS_TOO_MANY" );
-  }
-  puts( "*** END OF TEST 11 ***" );
-  exit( 0 );
-}
diff --git a/testsuites/mptests/mp11/node1/mp11.doc b/testsuites/mptests/mp11/node1/mp11.doc
deleted file mode 100644
index bc525ffa30..0000000000
--- a/testsuites/mptests/mp11/node1/mp11.doc
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-This file describes the directives and concepts tested by this test set.
-
-test set name:  test60
-
-TOO MANY GLOBAL OBJECTS ERROR TEST
-
-directives:
-  ex_init, ex_start, t_create, t_start, tm_tick, i_return,
-  t_create, q_create, sm_create, pt_create
-
-concepts:
-
-  a.  Verifies system can create and start both the executive's system
-      initialization and idle task.
-
-  b.  Verifies executive can swap between three application tasks at the
-      same priority and the executive's internal idle task.
-
-  c.  Verifies can print strings to the CRT on port 2 of the mvme136 board
-      using Print and Println in the board support package.
-
-  d.  Verifies interrupt handler can handler a task switch from an interrupt
-      as specified with the i_return directive.
-
-  e.  Verifies executive initialization performed correctly.
-
-  f.  Verifies the executive trap handler except for the halt function.
-
-  g.  Verifies that all object create directives correctly return
-      E_TOOMANYGOBJECTS.
diff --git a/testsuites/mptests/mp11/node1/mp11.scn b/testsuites/mptests/mp11/node1/mp11.scn
deleted file mode 100644
index fb26583852..0000000000
--- a/testsuites/mptests/mp11/node1/mp11.scn
+++ /dev/null
@@ -1,10 +0,0 @@
-*** TEST 11 -- NODE 1 ***
-Attempting to create Test_task (Global)
-rtems_task_create correctly returned RTEMS_TOO_MANY
-Attempting to create Message Queue (Global)
-rtems_message_queue_create correctly returned RTEMS_TOO_MANY
-Attempting to create Semaphore (Global)
-rtems_semaphore_create correctly returned RTEMS_TOO_MANY
-Attempting to create Partition (Global)
-rtems_partition_create correctly returned RTEMS_TOO_MANY
-*** END OF TEST 11 ***
diff --git a/testsuites/mptests/mp11/node2/mp11.doc b/testsuites/mptests/mp11/node2/mp11.doc
deleted file mode 100644
index 496f3569e5..0000000000
--- a/testsuites/mptests/mp11/node2/mp11.doc
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
diff --git a/testsuites/mptests/mp11/node2/mp11.scn b/testsuites/mptests/mp11/node2/mp11.scn
deleted file mode 100644
index 49bd8a3219..0000000000
--- a/testsuites/mptests/mp11/node2/mp11.scn
+++ /dev/null
@@ -1,2 +0,0 @@
-*** TEST 11 -- NODE 2 ***
-*** END OF TEST 11 ***
diff --git a/testsuites/mptests/mp11/system.h b/testsuites/mptests/mp11/system.h
deleted file mode 100644
index a7b1a2e5d8..0000000000
--- a/testsuites/mptests/mp11/system.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*  system.h
- *
- *  This include file contains information that is included in every
- *  function in the test set.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <tmacros.h>
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
-
-/* configuration information */
- 
-#define CONFIGURE_MPTEST
- 
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_MP_MAXIMUM_GLOBAL_OBJECTS     0
-#define CONFIGURE_MP_MAXIMUM_PROXIES            0
- 
-#if ( NODE_NUMBER == 1 )
-#define CONFIGURE_MAXIMUM_SEMAPHORES          1
-#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES      1
-#define CONFIGURE_MAXIMUM_PARTITIONS          1
-#endif
-
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#include <confdefs.h>
-
-/* variables */
-
-TEST_EXTERN rtems_id   Task_id[ 4 ];     /* array of task ids */
-TEST_EXTERN rtems_name Task_name[ 4 ];   /* array of task names */
-
-TEST_EXTERN rtems_id   Queue_id[ 2 ];       /* array of message queue ids */
-TEST_EXTERN rtems_name Queue_name[ 2 ];     /* array of message queue names */
- 
-TEST_EXTERN rtems_id   Semaphore_id[ 2 ];   /* array of semaphore ids */
-TEST_EXTERN rtems_name Semaphore_name[ 2 ]; /* array of semaphore names */
-
-/* end of include file */
diff --git a/testsuites/mptests/mp12/init.c b/testsuites/mptests/mp12/init.c
deleted file mode 100644
index b0e54bc8d9..0000000000
--- a/testsuites/mptests/mp12/init.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/*  Init
- *
- *  This routine is the initialization routine and test code for
- *  global partitions.  It creates a global partition, obtains and
- *  releases a buffer, and deletes the partition.  The partition
- *  is created on node one, and an attempt is made to delete it
- *  by node two.
- *  This routine is the initialization task for this test program.
- *  It is a user initialization task and has the responsibility for creating
- *  and starting the tasks that make up the test.  If the time of day
- *  clock is required for the test, it should also be set to a known
- *  value by this function.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "system.h"
-
-rtems_unsigned8 Partition_area[ 1024 ] CPU_STRUCTURE_ALIGNMENT;
-
-rtems_task Init(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code  status;
-  void              *bufaddr;
-
-  printf(
-    "\n\n*** TEST 12 -- NODE %d ***\n",
-    Multiprocessing_configuration.node
-   );
-
-  Task_name[ 1 ] = rtems_build_name( '1', '1', '1', ' ' );
-  Task_name[ 2 ] = rtems_build_name( '2', '2', '2', ' ' );
-
-  Partition_name[ 1 ] = rtems_build_name( 'P', 'A', 'R', ' ' );
-
-  puts( "Got to initialization task" );
-
-  if ( Multiprocessing_configuration.node == 2 )  {
-    status = rtems_task_wake_after( 1 * TICKS_PER_SECOND );
-    directive_failed( status, "rtems_task_wake_after" );
-
-    puts( "Getting ID of remote Partition (Global)" );
-
-    do {
-      status = rtems_partition_ident(
-        Partition_name[ 1 ],
-        RTEMS_SEARCH_ALL_NODES,
-        &Partition_id[ 1 ]
-      );
-    } while ( !rtems_is_status_successful( status ) );
-
-    puts( "Attempting to delete remote Partition (Global)" );
-    status = rtems_partition_delete( Partition_id[ 1 ] );
-    fatal_directive_status(
-      status,
-      RTEMS_ILLEGAL_ON_REMOTE_OBJECT,
-      "rtems_partition_delete"
-    );
-    puts(
-     "rtems_partition_delete correctly returned RTEMS_ILLEGAL_ON_REMOTE_OBJECT"
-    );
-
-    puts( "Obtaining a buffer from the global partition" );
-    status = rtems_partition_get_buffer( Partition_id[ 1 ], &bufaddr );
-    directive_failed( status, "rtems_partition_get_buffer" );
-    printf( "Address returned was : 0x%p\n", bufaddr );
-
-    puts( "Releasing a buffer to the global partition" );
-    status = rtems_partition_return_buffer( Partition_id[ 1 ], bufaddr );
-    directive_failed( status, "rtems_partition_return_buffer" );
-
-    status = rtems_task_wake_after( 2 * TICKS_PER_SECOND );
-    directive_failed( status, "rtems_task_wake_after" );
-  }
-  else {
-    puts( "Creating Partition (Global)" );
-    status = rtems_partition_create(
-      Partition_name[ 1 ],
-      Partition_area,
-      128,
-      64,
-      RTEMS_GLOBAL,
-      &Partition_id[ 1 ]
-    );
-    directive_failed( status, "rtems_partition_create" );
-
-    puts( "Sleeping for two seconds" );
-    status = rtems_task_wake_after( 2 * TICKS_PER_SECOND );
-    directive_failed( status, "rtems_task_wake_after" );
-
-    puts( "Deleting Partition (Global)" );
-    status = rtems_partition_delete( Partition_id[ 1 ] );
-    directive_failed( status, "rtems_partition_delete" );
- }
- puts( "*** END OF TEST 12 ***" );
- exit( 0 );
-}
diff --git a/testsuites/mptests/mp12/node1/mp12.doc b/testsuites/mptests/mp12/node1/mp12.doc
deleted file mode 100644
index 3ce94b73eb..0000000000
--- a/testsuites/mptests/mp12/node1/mp12.doc
+++ /dev/null
@@ -1,52 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-This file describes the directives and concepts tested by this test set.
-
-test set name:  test61
-
-GLOBAL PARTITION TEST
-
-directives:
-  ex_init, ex_start, t_create, t_start, tm_tick, i_return, tm_wkafter,
-  pt_create, pt_delete, pt_getbuf, pt_retbuf
-
-concepts:
-
-  a.  Verifies system can create and start both the executive's system
-      initialization and idle task.
-
-  b.  Verifies executive can swap between three application tasks at the
-      same priority and the executive's internal idle task.
-
-  c.  Verifies can print strings to the CRT on port 2 of the mvme136 board
-      using Print and Println in the board support package.
-
-  d.  Verifies interrupt handler can handler a task switch from an interrupt
-      as specified with the i_return directive.
-
-  e.  Verifies executive initialization performed correctly.
-
-  f.  Verifies the executive trap handler except for the halt function.
-
-  g.  Verifies the Shared Memory Locked Queue Driver.
-
-  h.  Verifies _Rpc() and _Process_pkt() for the following packet types:
-         P_OBJCREATE (partitions),
-         P_OBJDELETE (partitions),
-         P_PTGETBUF, and
-         P_PTRETBUF.
-
-  i.  Verifies normal and error paths (other than E_TOOMANYGOBJECTS)
-      for global partitions.
-
-  j.  Verifies that a task can delete itself.
diff --git a/testsuites/mptests/mp12/node1/mp12.scn b/testsuites/mptests/mp12/node1/mp12.scn
deleted file mode 100644
index 605a2c11db..0000000000
--- a/testsuites/mptests/mp12/node1/mp12.scn
+++ /dev/null
@@ -1,6 +0,0 @@
-*** TEST 12 -- NODE 1 ***
-Got to initialization task
-Creating Partition (Global)
-Sleeping for two seconds
-Deleting Partition (Global)
-*** END OF TEST 12 ***
diff --git a/testsuites/mptests/mp12/node2/mp12.doc b/testsuites/mptests/mp12/node2/mp12.doc
deleted file mode 100644
index 496f3569e5..0000000000
--- a/testsuites/mptests/mp12/node2/mp12.doc
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
diff --git a/testsuites/mptests/mp12/node2/mp12.scn b/testsuites/mptests/mp12/node2/mp12.scn
deleted file mode 100644
index ad65e9cb32..0000000000
--- a/testsuites/mptests/mp12/node2/mp12.scn
+++ /dev/null
@@ -1,10 +0,0 @@
-*** TEST 12 -- NODE 2 ***
-Got to initialization task
-Getting ID of remote Partition (Global)
-Attempting to delete remote Partition (Global)
-rtems_partition_delete correctly returned RTEMS_ILLEGAL_ON_REMOTE_OBJECT
-Obtaining a buffer from the global partition
->>>>>>> address returned will differ
-Address returned was : 0x200f0000
-Releasing a buffer to the global partition
-*** END OF TEST 12 ***
diff --git a/testsuites/mptests/mp12/system.h b/testsuites/mptests/mp12/system.h
deleted file mode 100644
index 6469a7f12c..0000000000
--- a/testsuites/mptests/mp12/system.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*  system.h
- *
- *  This include file contains information that is included in every
- *  function in the test set.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <tmacros.h>
-
-#define PT_NAME       rtems_build_name( 'P', 'A', 'R', '\0' )
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
-
-/* configuration information */
- 
-#define CONFIGURE_MPTEST
- 
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_MP_MAXIMUM_GLOBAL_OBJECTS     1
-#define CONFIGURE_MP_MAXIMUM_PROXIES            0
- 
-#if ( NODE_NUMBER == 1 )
-#define CONFIGURE_MAXIMUM_PARTITIONS          1
-#elif ( NODE_NUMBER == 2 )
-#define CONFIGURE_MAXIMUM_PARTITIONS          2
-#endif
-
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#include <confdefs.h>
-
-/* variables */
-
-TEST_EXTERN rtems_id   Task_id[ 4 ];     /* array of task ids */
-TEST_EXTERN rtems_name Task_name[ 4 ];   /* array of task names */
-
-TEST_EXTERN rtems_id   Partition_id[ 2 ];   /* array of partition ids */
-TEST_EXTERN rtems_name Partition_name[ 2 ]; /* array of partition names */
-
-/* end of include file */
diff --git a/testsuites/mptests/mp13/init.c b/testsuites/mptests/mp13/init.c
deleted file mode 100644
index e33048ffcb..0000000000
--- a/testsuites/mptests/mp13/init.c
+++ /dev/null
@@ -1,115 +0,0 @@
-/*  Init
- *
- *  This routine is the initialization task for this test program.
- *  It is a user initialization task and has the responsibility for creating
- *  and starting the tasks that make up the test.  If the time of day
- *  clock is required for the test, it should also be set to a known
- *  value by this function.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "system.h"
-
-rtems_task Init(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-
-  printf(
-    "\n\n*** TEST 13 -- NODE %d ***\n",
-    Multiprocessing_configuration.node
-  );
-
-  Task_name[ 1 ] = rtems_build_name( '1', '1', '1', ' ' );
-  Task_name[ 2 ] = rtems_build_name( '2', '2', '2', ' ' );
-
-  Queue_name[ 1 ] = rtems_build_name( 'M', 'S', 'G', ' ' );
-
-  Semaphore_name[ 1 ] = rtems_build_name( 'S', 'E', 'M', ' ' );
-
-  if ( Multiprocessing_configuration.node == 1 ) {
-    puts( "Creating Message Queue (Global)" );
-    status = rtems_message_queue_create(
-      Queue_name[ 1 ],
-      3,
-      16,
-      RTEMS_GLOBAL,
-      &Queue_id[ 1 ]
-    );
-    directive_failed( status, "rtems_message_queue_create" );
-
-    puts( "Creating Semaphore (Global)" );
-    status = rtems_semaphore_create(
-      Semaphore_name[ 1 ],
-      1,
-      RTEMS_GLOBAL | RTEMS_PRIORITY,
-      RTEMS_NO_PRIORITY,
-      &Semaphore_id[ 1 ]
-    );
-    directive_failed( status, "rtems_semaphore_create" );
-
-    status = rtems_semaphore_obtain(
-      Semaphore_id[ 1 ],
-      RTEMS_DEFAULT_OPTIONS,
-      RTEMS_NO_TIMEOUT
-    );
-    directive_failed( status, "rtems_semaphore_obtain" );
-  }
-
-  puts( "Creating Test_task 1 (local)" );
-  status = rtems_task_create(
-    Task_name[ 1 ],
-    1,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_TIMESLICE,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Task_id[ 1 ]
-  );
-  directive_failed( status, "rtems_task_create" );
-
-  puts( "Starting Test_task 1 (local)" );
-  status = rtems_task_start( Task_id[ 1 ], Test_task1, 0 );
-  directive_failed( status, "rtems_task_start" );
-
-  puts( "Creating Test_task 2 (local)" );
-  status = rtems_task_create(
-    Task_name[ 2 ],
-    1,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_TIMESLICE,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Task_id[ 2 ]
-  );
-  directive_failed( status, "rtems_task_create" );
-
-  puts( "Starting Test_task 2 (local)" );
-  status = rtems_task_start( Task_id[ 2 ], Test_task2, 0 );
-  directive_failed( status, "rtems_task_start" );
-
-  if ( Multiprocessing_configuration.node == 1 ) {
-    status = rtems_task_wake_after( 5 * TICKS_PER_SECOND );
-    directive_failed( status, "rtems_task_wake_after" );
-
-    puts( "*** END OF TEST 13 ***" );
-    exit( 0 );
-  }
-  puts( "Deleting initialization task" );
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-}
diff --git a/testsuites/mptests/mp13/node1/mp13.doc b/testsuites/mptests/mp13/node1/mp13.doc
deleted file mode 100644
index 13b100e7fa..0000000000
--- a/testsuites/mptests/mp13/node1/mp13.doc
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-This file describes the directives and concepts tested by this test set.
-
-test set name:  test62
-
-GLOBAL SEMAPHORE TEST
-
-directives:
-  ex_init, ex_start, t_create, t_start, tm_tick, i_return, tm_wkafter,
-  sm_create, q_create, sm_p, q_receive
-
-concepts:
-
-  a.  Verifies system can create and start both the executive's system
-      initialization and idle task.
-
-  b.  Verifies executive can swap between three application tasks at the
-      same priority and the executive's internal idle task.
-
-  c.  Verifies can print strings to the CRT on port 2 of the mvme136 board
-      using Print and Println in the board support package.
-
-  d.  Verifies interrupt handler can handler a task switch from an interrupt
-      as specified with the i_return directive.
-
-  e.  Verifies executive initialization performed correctly.
-
-  f.  Verifies the executive trap handler except for the halt function.
-
-  g.  Verifies the Shared Memory Locked Queue Driver.
-
-  h.  Verifies that E_MESSAGETIMEOUT is when waiting on a
-      remote message queue.
-
-  i.  Verifies that E_SEMTIMEOUT is when waiting on a remote semaphore.
-
-  j.  Verifies that a task can delete itself.
diff --git a/testsuites/mptests/mp13/node1/mp13.scn b/testsuites/mptests/mp13/node1/mp13.scn
deleted file mode 100644
index d3bd11f65e..0000000000
--- a/testsuites/mptests/mp13/node1/mp13.scn
+++ /dev/null
@@ -1,14 +0,0 @@
-*** TEST 13 -- NODE 1 ***
-Creating Message Queue (Global)
-Creating Semaphore (Global)
-Creating Test_task 1 (local)
-Starting Test_task 1 (local)
-Creating Test_task 2 (local)
-Starting Test_task 2 (local)
-Getting QID of message queue
-Receiving message ...
-Getting SMID of semaphore
-Releasing semaphore ...
-Getting semaphore ...
-Getting semaphore ...
-*** END OF TEST 13 ***
diff --git a/testsuites/mptests/mp13/node2/mp13.doc b/testsuites/mptests/mp13/node2/mp13.doc
deleted file mode 100644
index 496f3569e5..0000000000
--- a/testsuites/mptests/mp13/node2/mp13.doc
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
diff --git a/testsuites/mptests/mp13/node2/mp13.scn b/testsuites/mptests/mp13/node2/mp13.scn
deleted file mode 100644
index e9df202a94..0000000000
--- a/testsuites/mptests/mp13/node2/mp13.scn
+++ /dev/null
@@ -1,16 +0,0 @@
-*** TEST 13 -- NODE 2 ***
-Creating Test_task 1 (local)
-Starting Test_task 1 (local)
-Creating Test_task 2 (local)
-Starting Test_task 2 (local)
-Deleting initialization task
-Getting QID of message queue
-Getting SMID of semaphore
-Getting semaphore ...
-Receiving message ...
-Releasing semaphore ...
-Getting semaphore ...
-rtems_message_queue_receive correctly returned RTEMS_TIMEOUT
-Deleting self
-rtems_semaphore_obtain correctly returned RTEMS_TIMEOUT
-*** END OF TEST 13 ***
diff --git a/testsuites/mptests/mp13/system.h b/testsuites/mptests/mp13/system.h
deleted file mode 100644
index 81c96b4f54..0000000000
--- a/testsuites/mptests/mp13/system.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*  system.h
- *
- *  This include file contains information that is included in every
- *  function in the test set.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <tmacros.h>
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
-
-rtems_task Test_task1(
-  rtems_task_argument argument
-);
-
-rtems_task Test_task2(
-  rtems_task_argument argument
-);
-
-/* configuration information */
- 
-#define CONFIGURE_MPTEST
- 
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-
-#if ( NODE_NUMBER == 1 )
-#define CONFIGURE_MAXIMUM_SEMAPHORES          1
-#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES      1
-#endif
-
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#include <confdefs.h>
-
-/* variables */
-
-TEST_EXTERN rtems_id   Task_id[ 4 ];     /* array of task ids */
-TEST_EXTERN rtems_name Task_name[ 4 ];   /* array of task names */
-
-TEST_EXTERN rtems_id   Queue_id[ 2 ];       /* array of message queue ids */
-TEST_EXTERN rtems_name Queue_name[ 2 ];     /* array of message queue names */
- 
-TEST_EXTERN rtems_id   Semaphore_id[ 2 ];   /* array of semaphore ids */
-TEST_EXTERN rtems_name Semaphore_name[ 2 ]; /* array of semaphore names */
-
-/* end of include file */
diff --git a/testsuites/mptests/mp13/task1.c b/testsuites/mptests/mp13/task1.c
deleted file mode 100644
index 5b6d3a9f89..0000000000
--- a/testsuites/mptests/mp13/task1.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/*  Test_task1
- *
- *  This task attempts to receive a message from a global message queue.
- *  If running on the node on which the queue resides, the wait is
- *  forever, otherwise it times out on a remote message queue.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_task Test_task1(
-  rtems_task_argument argument
-)
-{
-  char              receive_buffer[16];
-  rtems_unsigned32  size;
-  rtems_status_code status;
-
-  puts( "Getting QID of message queue" );
-
-  do {
-    status = rtems_message_queue_ident(
-      Queue_name[ 1 ],
-      RTEMS_SEARCH_ALL_NODES,
-      &Queue_id[ 1 ]
-    );
-  } while ( !rtems_is_status_successful( status ) );
-
-  if ( Multiprocessing_configuration.node == 1 ) {
-    puts( "Receiving message ..." );
-    status = rtems_message_queue_receive(
-      Queue_id[ 1 ],
-      (long (*)[4])receive_buffer,
-      &size,
-      RTEMS_DEFAULT_OPTIONS,
-      RTEMS_NO_TIMEOUT
-    );
-    puts( "How did I get back from here????" );
-    directive_failed( status, "rtems_message_queue_receive" );
-  }
-
-  status = rtems_task_wake_after( TICKS_PER_SECOND );
-  directive_failed( status, "rtems_task_wake_after" );
-
-  puts( "Receiving message ..." );
-  status = rtems_message_queue_receive(
-    Queue_id[ 1 ],
-    (long (*)[4])receive_buffer,
-    &size,
-    RTEMS_DEFAULT_OPTIONS,
-    2 * TICKS_PER_SECOND
-  );
-  fatal_directive_status(status, RTEMS_TIMEOUT, "rtems_message_queue_receive");
-  puts( "rtems_message_queue_receive correctly returned RTEMS_TIMEOUT" );
-
-  puts( "Deleting self" );
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-}
diff --git a/testsuites/mptests/mp13/task2.c b/testsuites/mptests/mp13/task2.c
deleted file mode 100644
index ab1f165788..0000000000
--- a/testsuites/mptests/mp13/task2.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/*  Test_task2
- *
- *  This task attempts to receive control of a global semaphore.
- *  If running on the node on which the semaphore resides, the wait is
- *  forever, otherwise it times out on a remote semaphore.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_task Test_task2(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-
-  puts( "Getting SMID of semaphore" );
-  do {
-    status = rtems_semaphore_ident(
-      Semaphore_name[ 1 ],
-      RTEMS_SEARCH_ALL_NODES,
-      &Semaphore_id[ 1 ]
-    );
-  } while ( !rtems_is_status_successful( status ) );
-
-  directive_failed( status, "rtems_semaphore_ident" );
-
-  if ( Multiprocessing_configuration.node == 1 ) {
-    status = rtems_task_wake_after( TICKS_PER_SECOND );
-    directive_failed( status, "rtems_task_wake_after" );
-
-    puts( "Releasing semaphore ..." );
-    status = rtems_semaphore_release( Semaphore_id[ 1 ] );
-    directive_failed( status, "rtems_semaphore_release" );
-
-    status = rtems_task_wake_after( TICKS_PER_SECOND / 2 );
-    directive_failed( status, "rtems_task_wake_after" );
-
-    puts( "Getting semaphore ..." );
-    status = rtems_semaphore_obtain(
-      Semaphore_id[ 1 ],
-      RTEMS_DEFAULT_OPTIONS,
-      RTEMS_NO_TIMEOUT
-    );
-    directive_failed( status, "rtems_semaphore_obtain" );
-
-    puts( "Getting semaphore ..." );
-    status = rtems_semaphore_obtain(
-      Semaphore_id[ 1 ],
-      RTEMS_DEFAULT_OPTIONS,
-      RTEMS_NO_TIMEOUT
-    );
-    puts( "How did I get back from here????" );
-    directive_failed( status, "rtems_semaphore_obtain" );
-  }
-
-/*
-  status = rtems_task_wake_after( TICKS_PER_SECOND / 2 );
-  directive_failed( status, "rtems_task_wake_after" );
-*/
-
-  puts( "Getting semaphore ..." );
-  status = rtems_semaphore_obtain(
-    Semaphore_id[ 1 ],
-    RTEMS_DEFAULT_OPTIONS,
-    RTEMS_NO_TIMEOUT
-  );
-  directive_failed( status, "rtems_semaphore_obtain" );
-
-  puts( "Releasing semaphore ..." );
-  status = rtems_semaphore_release( Semaphore_id[ 1 ] );
-  directive_failed( status, "rtems_semaphore_release" );
-
-  status = rtems_task_wake_after( TICKS_PER_SECOND );
-  directive_failed( status, "rtems_task_wake_after" );
-
-  puts( "Getting semaphore ..." );
-  status = rtems_semaphore_obtain(
-    Semaphore_id[ 1 ],
-    RTEMS_DEFAULT_OPTIONS,
-    2 * TICKS_PER_SECOND
-  );
-  fatal_directive_status(
-    status,
-    RTEMS_TIMEOUT,
-    "rtems_semaphore_obtain"
-  );
-  puts( "rtems_semaphore_obtain correctly returned RTEMS_TIMEOUT" );
-
-  puts( "*** END OF TEST 13 ***" );
-  exit( 0 );
-}
diff --git a/testsuites/mptests/mp14/delay.c b/testsuites/mptests/mp14/delay.c
deleted file mode 100644
index 8c2d177ddf..0000000000
--- a/testsuites/mptests/mp14/delay.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/*  Delayed_send_event
- *
- *  This routine is a timer service routine which sends an event to a task.
- *
- *  Input parameters:  NONE
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_timer_service_routine Delayed_send_event(
-  rtems_id  timer_id,
-  void     *ignored
-)
-{
-  rtems_status_code status;
-
-  status = rtems_event_send(
-    Task_id[ rtems_get_index( timer_id ) ],
-    RTEMS_EVENT_16
-  );
-  directive_failed( status, "rtems_event_send" );
-}
diff --git a/testsuites/mptests/mp14/evtask1.c b/testsuites/mptests/mp14/evtask1.c
deleted file mode 100644
index 742aee2613..0000000000
--- a/testsuites/mptests/mp14/evtask1.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/*  Test_task
- *
- *  This task either continuously sends events to a remote task, or
- *  continuously receives events sent by a remote task.  This decision
- *  is based upon the local node number.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-extern rtems_multiprocessing_table Multiprocessing_configuration;
-
-rtems_task Test_task(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-  rtems_unsigned32  count;
-  rtems_unsigned32  remote_node;
-  rtems_id          remote_tid;
-  rtems_event_set   event_out;
-
-  remote_node = ((Multiprocessing_configuration.node == 1) ? 2 : 1);
-
-  puts( "About to go to sleep!" );
-  status = rtems_task_wake_after( TICKS_PER_SECOND );
-  directive_failed( status, "rtems_task_wake_after" );
-  puts( "Waking up!" );
-
-  puts_nocr( "Remote task's name is : " );
-  put_name( Task_name[ remote_node ], TRUE );
-
-  puts( "Getting TID of remote task" );
-  while ( FOREVER ) {
-    status = rtems_task_ident(
-      Task_name[ remote_node ],
-      RTEMS_SEARCH_ALL_NODES,
-      &remote_tid
-    );
-
-    if ( status == RTEMS_SUCCESSFUL )
-      break;
-    puts( "rtems_task_ident FAILED!!" );
-    rtems_task_wake_after(2);
-  }
-
-  if ( Multiprocessing_configuration.node == 1 ) {
-    puts( "Sending events to remote task" );
-    while ( Stop_Test == FALSE ) {
-      for ( count=EVENT_TASK_DOT_COUNT; Stop_Test == FALSE && count; count-- ) {
-        status = rtems_event_send( remote_tid, RTEMS_EVENT_16 );
-        directive_failed( status, "rtems_event_send" );
-     }
-     put_dot( 'e' );
-    }
-  }
-
-  puts( "Receiving events from remote task" );
-  while ( Stop_Test == FALSE ) {
-    for ( count=EVENT_TASK_DOT_COUNT ; Stop_Test == FALSE && count ; count-- ) {
-      status = rtems_event_receive(
-        RTEMS_EVENT_16,
-        RTEMS_DEFAULT_OPTIONS,
-        RTEMS_NO_TIMEOUT,
-        &event_out
-      );
-      directive_failed( status, "rtems_event_receive" );
-    }
-    put_dot( 'e' );
-  }
-
-  Exit_test();
-}
diff --git a/testsuites/mptests/mp14/evtmtask.c b/testsuites/mptests/mp14/evtmtask.c
deleted file mode 100644
index 165274dc21..0000000000
--- a/testsuites/mptests/mp14/evtmtask.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*  Delayed_events_task
- *
- *  This task continuously sends itself events at one tick
- *  intervals.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_task Delayed_events_task(
-  rtems_task_argument argument
-)
-{
-  rtems_unsigned32  count;
-  rtems_unsigned32  previous_mode;
-  rtems_status_code status;
-  rtems_event_set   events;
-
-  status = rtems_task_mode(
-    RTEMS_PREEMPT | RTEMS_TIMESLICE,
-    RTEMS_PREEMPT_MASK | RTEMS_TIMESLICE_MASK,
-    &previous_mode
-  );
-  directive_failed( status, "rtems_task_mode" );
-
-  status = rtems_timer_create( Timer_name[ 1 ], &Timer_id[ 1 ] );
-  directive_failed( status, "rtems_timer_create" );
-
-  while ( Stop_Test == FALSE ) {
-    for ( count=DELAYED_EVENT_DOT_COUNT; Stop_Test == FALSE && count; count-- ){
-      status = rtems_timer_fire_after(
-        Timer_id[ 1 ],
-        1,
-        Delayed_send_event,
-        NULL
-      );
-      directive_failed( status, "rtems_timer_reset" );
-
-      status = rtems_event_receive(
-        RTEMS_EVENT_16,
-        RTEMS_DEFAULT_OPTIONS,
-        RTEMS_NO_TIMEOUT,
-        &events
-      );
-      directive_failed( status, "rtems_event_receive" );
-    }
-    put_dot('.');
-  }
-
-  Exit_test();
-}
diff --git a/testsuites/mptests/mp14/exit.c b/testsuites/mptests/mp14/exit.c
deleted file mode 100644
index 6e944c2a18..0000000000
--- a/testsuites/mptests/mp14/exit.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/*  Exit_test
- *
- *  This routine safely stops the test and prints some information
- *
- *  Input parameters:   NONE
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-void Exit_test( void )
-{
-  rtems_status_code status;
-  rtems_mode        old_mode;
-
-  /*
-   * Wait a bit before shutting down so we don't screw up the other node
-   * when our MPCI shuts down
-   */
- 
-  rtems_task_wake_after(20);
- 
-  status = rtems_task_mode( RTEMS_NO_PREEMPT, RTEMS_PREEMPT_MASK, &old_mode );
-  directive_failed( status, "rtems_task_mode" );
-
-  MPCI_Print_statistics();
-
-  rtems_shutdown_executive( 0 );
-}
diff --git a/testsuites/mptests/mp14/init.c b/testsuites/mptests/mp14/init.c
deleted file mode 100644
index 6dace461aa..0000000000
--- a/testsuites/mptests/mp14/init.c
+++ /dev/null
@@ -1,191 +0,0 @@
-/*  Init
- *
- *  This routine is the initialization task for this test program.
- *  It is a user initialization task and has the responsibility for creating
- *  and starting the tasks that make up the test.  If the time of day
- *  clock is required for the test, it should also be set to a known
- *  value by this function.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "system.h"
-
-rtems_unsigned8 my_partition[0x30000] CPU_STRUCTURE_ALIGNMENT;
-
-rtems_timer_service_routine Stop_Test_TSR(
-  rtems_id  ignored_id,
-  void     *ignored_address
-)
-{
-  Stop_Test = TRUE;
-}
-
-rtems_task Init(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code   status;
-  rtems_task_priority previous_priority;
-
-  printf(
-    "\n\n*** TEST 14 -- NODE %d ***\n",
-    Multiprocessing_configuration.node
-  );
-
-  Stop_Test = FALSE;
-
-  status = rtems_timer_create(
-    rtems_build_name('S', 'T', 'O', 'P'),
-    &timer_id
-  );
-  directive_failed( status, "rtems_timer_create" );
-
-  status = rtems_timer_fire_after(
-    timer_id,
-    MAX_LONG_TEST_DURATION * TICKS_PER_SECOND,
-    Stop_Test_TSR,
-    NULL
-  );
-  directive_failed( status, "rtems_timer_fire_after" );
-
-  Task_name[ 1 ] = rtems_build_name( '1', '1', '1', ' ' );
-  Task_name[ 2 ] = rtems_build_name( '2', '2', '2', ' ' );
-
-  Queue_task_name[ 1 ] = rtems_build_name( 'M', 'T', '1', ' ' );
-  Queue_task_name[ 2 ] = rtems_build_name( 'M', 'T', '2', ' ' );
-
-  Partition_task_name[ 1 ] = rtems_build_name( 'P', 'T', '1', ' ' );
-  Partition_task_name[ 2 ] = rtems_build_name( 'P', 'T', '2', ' ' );
-
-  Semaphore_task_name[ 1 ] = rtems_build_name( 'S', 'M', '1', ' ' );
-  Semaphore_task_name[ 2 ] = rtems_build_name( 'S', 'M', '2', ' ' );
-
-  Semaphore_name[ 1 ] =  rtems_build_name( 'S', 'E', 'M', ' ' );
-
-  Queue_name[ 1 ] = rtems_build_name( 'M', 'S', 'G', ' ' );
-
-  Partition_name[ 1 ] = rtems_build_name( 'P', 'A', 'R', ' ' );
-
-  Timer_name[ 1 ] = rtems_build_name( 'T', 'M', 'R', ' ' );
-
-  if ( Multiprocessing_configuration.node == 1 ) {
-    puts( "Creating Semaphore (Global)" );
-    status = rtems_semaphore_create(
-      Semaphore_name[ 1 ],
-      1,
-      RTEMS_GLOBAL,
-      RTEMS_NO_PRIORITY,
-      &Semaphore_id[ 1 ]
-    );
-    directive_failed( status, "rtems_semaphore_create" );
-
-    puts( "Creating Message Queue (Global)" );
-    status = rtems_message_queue_create(
-      Queue_name[ 1 ],
-      1,
-      16,
-      RTEMS_GLOBAL,
-      &Queue_id[ 1 ]
-    );
-    directive_failed( status, "rtems_message_queue_create" );
-
-    puts( "Creating Partition (Global)" );
-    status = rtems_partition_create(
-      Partition_name[ 1 ],
-      (void *)my_partition,
-      0x8000,
-      0x3800,
-      RTEMS_GLOBAL,
-      &Partition_id[ 1 ]
-    );
-    directive_failed( status, "rtems_partition_create" );
-  }
-
-  puts( "Creating Event task (Global)" );
-  status = rtems_task_create(
-    Task_name[ Multiprocessing_configuration.node ],
-    2,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_TIMESLICE,
-    RTEMS_GLOBAL,
-    &Event_task_id[ 1 ]
-  );
-  directive_failed( status, "rtems_task_create" );
-
-  puts( "Starting Event task (Global)" );
-  status = rtems_task_start( Event_task_id[ 1 ], Test_task, 0 );
-  directive_failed( status, "rtems_task_start" );
-
-  puts( "Creating Semaphore task (Global)" );
-  status = rtems_task_create(
-    Semaphore_task_name[ Multiprocessing_configuration.node ],
-    2,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_TIMESLICE,
-    RTEMS_GLOBAL,
-    &Semaphore_task_id[ 1 ]
-  );
-  directive_failed( status, "rtems_task_create" );
-
-  puts( "Starting Semaphore task (Global)" );
-  status = rtems_task_start( Semaphore_task_id[ 1 ], Semaphore_task, 0 );
-  directive_failed( status, "rtems_task_start" );
-
-  puts( "Creating Message Queue task (Global)" );
-  status = rtems_task_create(
-    Queue_task_name[ Multiprocessing_configuration.node ],
-    2,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_TIMESLICE,
-    RTEMS_GLOBAL,
-    &Queue_task_id[ 1 ]
-  );
-  directive_failed( status, "rtems_task_create" );
-
-  /* argument is index into Buffers */
-  puts( "Starting Message Queue task (Global)" );
-  status = rtems_task_start( Queue_task_id[ 1 ], Message_queue_task, 1 );
-  directive_failed( status, "rtems_task_start" );
-
-  puts( "Creating Partition task (Global)" );
-  status = rtems_task_create(
-    Partition_task_name[ Multiprocessing_configuration.node ],
-    2,
-    RTEMS_MINIMUM_STACK_SIZE * 2,
-    RTEMS_TIMESLICE,
-    RTEMS_GLOBAL,
-    &Partition_task_id[ 1 ]
-  );
-  directive_failed( status, "rtems_task_create" );
-
-  puts( "Starting Partition task (Global)" );
-  status = rtems_task_start( Partition_task_id[ 1 ], Partition_task, 0 );
-  directive_failed( status, "rtems_task_start" );
-
-  status = rtems_task_set_priority( RTEMS_SELF, 2, &previous_priority );
-  directive_failed( status, "rtems_task_set_priority" );
-
-  status = rtems_task_ident(
-    RTEMS_SELF,
-    RTEMS_SEARCH_ALL_NODES,
-    &Task_id[ 1 ]
-  );
-  directive_failed( status, "rtems_task_ident" );
-
-  Delayed_events_task( 1 );
-}
diff --git a/testsuites/mptests/mp14/msgtask1.c b/testsuites/mptests/mp14/msgtask1.c
deleted file mode 100644
index 0d698d58ef..0000000000
--- a/testsuites/mptests/mp14/msgtask1.c
+++ /dev/null
@@ -1,107 +0,0 @@
-/*  Message_queue_task
- *
- *  This task continuously sends messages to and receives messages from
- *  a global message queue.    The message buffer is viewed as an array
- *  of two sixty-four bit counts which are incremented when a message is
- *  received.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_task Message_queue_task(
-  rtems_task_argument index
-)
-{
-  rtems_status_code  status;
-  rtems_unsigned32   count;
-  rtems_unsigned32   yield_count;
-  rtems_unsigned32  *buffer_count;
-  rtems_unsigned32  *overflow_count;
-  rtems_unsigned32   size;
-
-  Msg_buffer[ index ][0] = 0;
-  Msg_buffer[ index ][1] = 0;
-  Msg_buffer[ index ][2] = 0;
-  Msg_buffer[ index ][3] = 0;
-
-  puts( "Getting ID of msg queue" );
-  while ( FOREVER ) {
-    status = rtems_message_queue_ident(
-      Queue_name[ 1 ],
-      RTEMS_SEARCH_ALL_NODES,
-      &Queue_id[ 1 ]
-    );
-    if ( status == RTEMS_SUCCESSFUL )
-      break;
-    puts( "rtems_message_queue_ident FAILED!!" );
-    rtems_task_wake_after(2);
-  }
-
-  if ( Multiprocessing_configuration.node == 1 ) {
-      status = rtems_message_queue_send(
-        Queue_id[ 1 ],
-        (long (*)[4])Msg_buffer[ index ],
-        16
-      );
-      directive_failed( status, "rtems_message_queue_send" );
-      overflow_count = &Msg_buffer[ index ][0];
-      buffer_count   = &Msg_buffer[ index ][1];
-  } else {
-      overflow_count = &Msg_buffer[ index ][2];
-      buffer_count   = &Msg_buffer[ index ][3];
-  }
-
-  while ( Stop_Test == FALSE ) {
-    yield_count = 100;
-
-    for ( count=MESSAGE_DOT_COUNT ; Stop_Test == FALSE && count ; count-- ) {
-      status = rtems_message_queue_receive(
-        Queue_id[ 1 ],
-        (long (*)[4])Msg_buffer[ index ],
-        &size,
-        RTEMS_DEFAULT_OPTIONS,
-        RTEMS_NO_TIMEOUT
-      );
-      directive_failed( status, "rtems_message_queue_receive" );
-
-      if ( *buffer_count == (rtems_unsigned32)0xffffffff ) {
-        *buffer_count    = 0;
-        *overflow_count += 1;
-      } else
-        *buffer_count += 1;
-
-      status = rtems_message_queue_send(
-        Queue_id[ 1 ],
-        (long (*)[4])Msg_buffer[ index ],
-        16
-      );
-      directive_failed( status, "rtems_message_queue_send" );
-
-      if (Stop_Test == FALSE)
-        if ( Multiprocessing_configuration.node == 1 && --yield_count == 0 ) {
-          status = rtems_task_wake_after( RTEMS_YIELD_PROCESSOR );
-          directive_failed( status, "rtems_task_wake_after" );
-
-          yield_count = 100;
-        }
-    }
-    put_dot( 'm' );
-  }
-
-  Exit_test();
-}
diff --git a/testsuites/mptests/mp14/node1/mp14.doc b/testsuites/mptests/mp14/node1/mp14.doc
deleted file mode 100644
index 6fbbe4b2cd..0000000000
--- a/testsuites/mptests/mp14/node1/mp14.doc
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
-This file describes the directives and concepts tested by this test set.
-
-test set name:  test63
-
-INTERRUPT SATURATION TEST
-
-directives:
-  ex_init, ex_start, t_create, t_start, t_ident, tm_tick,
-  tm_evwhen, tm_wkafter, i_return, ev_send, ev_receive
-
-concepts:
-
-  a.  Verifies system can create and start both the executive's system
-      initialization and idle task.
-
-  b.  Verifies executive can swap between three application tasks at the
-      same priority and the executive's internal idle task.
-
-  c.  Verifies printing of strings to the CRT on port 2 of the mvme136 board
-      using Print and Println in the board support package.
-
-  d.  Verifies printing of strings to the CRT on port 2 of the mvme136 board
-      using Write and Writeln and the TTY driver.
-
-  e.  Verifies interrupt handler can handler a task switch from an interrupt
-      as specified with the i_return directive.
-
-  f.  Verifies executive initialization performed correctly.
-
-  g.  Verifies the executive trap handler except for the halt function.
-
-  h.  Verifies that a task can get the task identification number of itself.
-
-  i.  Verifies that a task can get the task identification number
-      of another task.
-
-  j.  Verifies that events can be sent to a remote task.
diff --git a/testsuites/mptests/mp14/node1/mp14.scn b/testsuites/mptests/mp14/node1/mp14.scn
deleted file mode 100644
index f57c4f47b3..0000000000
--- a/testsuites/mptests/mp14/node1/mp14.scn
+++ /dev/null
@@ -1,41 +0,0 @@
-*** TEST 14 -- NODE 1 ***
-Creating Semaphore (Global)
-Creating Message Queue (Global)
-Creating Partition (Global)
-Creating Event task (Global)
-Starting Event task (Global)
-Creating Semaphore task (Global)
-About to go to sleep!
-Starting Semaphore task (Global)
-Creating Message Queue task (Global)
-Getting SMID of semaphore
-Starting Message Queue task (Global)
-Creating Partition task (Global)
-Getting ID of msg queue
-Starting Partition task (Global)
-Getting ID of partition
-Waking up!
-Remote task's name is : 222
-Getting TID of remote task
-Sending events to remote task
-<stream of following characters>
-
-. - indicates 100 iterations of
-    tm_evafter of 1 tick and rtems_event_receive.
-
-e - indicates that 100
-    events have been sent to the remote task.
-
-m - indicates 100 iterations of
-    rtems_message_queue_send and rtems_message_queue_receive.
-
-p - indicates 100 iterations of
-    rtems_partition_get_buffer and rtems_partition_return_buffer.
-
-s - indicates 100 iterations of
-    rtems_semaphore_obtain and rtems_semaphore_release.
-
-NOTES: 1.  The messages could be interspersed.
-       2.  If one of the nodes exits first, the other may report
-           timeout errors on blocking directives.
-    
diff --git a/testsuites/mptests/mp14/node2/mp14.doc b/testsuites/mptests/mp14/node2/mp14.doc
deleted file mode 100644
index 496f3569e5..0000000000
--- a/testsuites/mptests/mp14/node2/mp14.doc
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
diff --git a/testsuites/mptests/mp14/node2/mp14.scn b/testsuites/mptests/mp14/node2/mp14.scn
deleted file mode 100644
index d128c870e9..0000000000
--- a/testsuites/mptests/mp14/node2/mp14.scn
+++ /dev/null
@@ -1,38 +0,0 @@
-*** TEST 14 -- NODE 2 ***
-Creating Event task (Global)
-Starting Event task (Global)
-Creating Semaphore task (Global)
-About to go to sleep!
-Starting Semaphore task (Global)
-Creating Message Queue task (Global)
-Getting SMID of semaphore
-Starting Message Queue task (Global)
-Creating Partition task (Global)
-Getting ID of msg queue
-Starting Partition task (Global)
-Getting ID of partition
-Waking up!
-Remote task's name is : 111
-Getting TID of remote task
-Receiving events from remote task
-<stream of following characters>
-
-. - indicates 100 iterations of
-    tm_evafter of 1 tick and rtems_event_receive.
-
-e - indicates that 100
-    events have been sent to the remote task.
-
-m - indicates 100 iterations of
-    rtems_message_queue_send and rtems_message_queue_receive.
-
-p - indicates 100 iterations of
-    rtems_partition_get_buffer and rtems_partition_return_buffer.
-
-s - indicates 100 iterations of
-    rtems_semaphore_obtain and rtems_semaphore_release.
-
-NOTES: 1.  The messages could be interspersed.
-       2.  If one of the nodes exits first, the other may report
-           timeout errors on blocking directives.
-    
diff --git a/testsuites/mptests/mp14/pttask1.c b/testsuites/mptests/mp14/pttask1.c
deleted file mode 100644
index f8933db339..0000000000
--- a/testsuites/mptests/mp14/pttask1.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/*  Partition_task
- *
- *  This task continuously gets a buffer from and returns that buffer
- *  to a global partition.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-extern rtems_multiprocessing_table Multiprocessing_configuration;
-
-rtems_task Partition_task(
-  rtems_task_argument argument
-)
-{
-  rtems_unsigned32   count;
-  rtems_status_code  status;
-  rtems_unsigned32   yield_count;
-  void              *buffer;
-
-  puts( "Getting ID of partition" );
-  while ( FOREVER ) {
-    status = rtems_partition_ident(
-      Partition_name[ 1 ],
-      RTEMS_SEARCH_ALL_NODES,
-      &Partition_id[ 1 ]
-    );
-
-    if ( status == RTEMS_SUCCESSFUL )
-      break;
-
-    puts( "rtems_partition_ident FAILED!!" );
-    rtems_task_wake_after(2);
-  }
-
-  yield_count = 100;
-
-  while ( Stop_Test == FALSE ) {
-    for ( count=PARTITION_DOT_COUNT ; Stop_Test == FALSE && count ; count-- ) {
-      status = rtems_partition_get_buffer( Partition_id[ 1 ], &buffer );
-      directive_failed( status, "rtems_partition_get_buffer" );
-
-      status = rtems_partition_return_buffer( Partition_id[ 1 ], buffer );
-      directive_failed( status, "rtems_partition_return_buffer" );
-
-      if (Stop_Test == FALSE)
-        if ( Multiprocessing_configuration.node == 1 && --yield_count == 0 ) {
-          status = rtems_task_wake_after( 1 );
-          directive_failed( status, "rtems_task_wake_after" );
-          yield_count = 100;
-        }
-    }
-    put_dot( 'p' );
-  }
-
-  Exit_test();
-}
diff --git a/testsuites/mptests/mp14/smtask1.c b/testsuites/mptests/mp14/smtask1.c
deleted file mode 100644
index eeeb111352..0000000000
--- a/testsuites/mptests/mp14/smtask1.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/*  Sm_test_task
- *
- *  This task continuously obtains and releases a global semaphore.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-extern rtems_multiprocessing_table Multiprocessing_configuration;
-
-rtems_task Semaphore_task(
-  rtems_task_argument argument
-)
-{
-  rtems_unsigned32  count;
-  rtems_status_code status;
-  rtems_unsigned32  yield_count;
-
-  puts( "Getting SMID of semaphore" );
-  while ( FOREVER ) {
-    status = rtems_semaphore_ident(
-      Semaphore_name[ 1 ],
-      RTEMS_SEARCH_ALL_NODES,
-      &Semaphore_id[ 1 ]
-    );
-    if ( status == RTEMS_SUCCESSFUL )
-      break;
-    puts( "rtems_semaphore_ident FAILED!!" );
-    rtems_task_wake_after(2);
-  }
-
-  yield_count = 100;
-
-  while ( Stop_Test == FALSE ) {
-
-    for ( count=SEMAPHORE_DOT_COUNT ; Stop_Test == FALSE && count ; count-- ) {
-      status = rtems_semaphore_obtain(
-        Semaphore_id[ 1 ],
-        RTEMS_DEFAULT_OPTIONS,
-        RTEMS_NO_TIMEOUT
-      );
-      directive_failed( status, "rtems_semaphore_obtain" );
-
-      status = rtems_semaphore_release( Semaphore_id[ 1 ] );
-      directive_failed( status, "rtems_semaphore_release" );
-
-      if ( Stop_Test == FALSE )
-        if ( Multiprocessing_configuration.node == 1 && --yield_count == 0 ) {
-          status = rtems_task_wake_after( RTEMS_YIELD_PROCESSOR );
-          directive_failed( status, "rtems_task_wake_after" );
-
-          yield_count = 100;
-        }
-    }
-    put_dot( 's' );
-  }
-
-  Exit_test();
-}
diff --git a/testsuites/mptests/mp14/system.h b/testsuites/mptests/mp14/system.h
deleted file mode 100644
index 1bbc8ca1e9..0000000000
--- a/testsuites/mptests/mp14/system.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/*  system.h
- *
- *  This include file contains information that is included in every
- *  function in the test set.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <tmacros.h>
-
-/* functions */
-
-rtems_timer_service_routine Delayed_send_event(
-  rtems_id  timer_id,
-  void     *ignored_address
-);
-
-rtems_task Init(
-  rtems_task_argument argument
-);
-
-rtems_task Test_task(
-  rtems_task_argument argument
-);
-
-rtems_task Delayed_events_task(
-  rtems_task_argument argument
-);
-
-rtems_task Message_queue_task(
-  rtems_task_argument index
-);
-
-rtems_task Partition_task(
-  rtems_task_argument argument
-);
-
-rtems_task Semaphore_task(
-  rtems_task_argument argument
-);
-
-void Exit_test( void );
-
-/* configuration information */
- 
-#define CONFIGURE_MPTEST
- 
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
- 
-#define CONFIGURE_TICKS_PER_TIMESLICE   1
-#define CONFIGURE_MICROSECONDS_PER_TICK RTEMS_MILLISECONDS_TO_MICROSECONDS(1)
-
-#if ( NODE_NUMBER == 1 )
-#define CONFIGURE_MAXIMUM_TIMERS              12
-#define CONFIGURE_MAXIMUM_SEMAPHORES          1
-#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES      1
-#define CONFIGURE_MAXIMUM_PARTITIONS          1
-#elif ( NODE_NUMBER == 2 )
-#define CONFIGURE_MAXIMUM_TIMERS              2
-#endif
-
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#define CONFIGURE_EXTRA_TASK_STACKS         (1 * RTEMS_MINIMUM_STACK_SIZE)
-
-#include <confdefs.h>
-
-/* variables */
-
-TEST_EXTERN rtems_id   Event_task_id[ 2 ];       /* event task ids */
-
-TEST_EXTERN rtems_id   Semaphore_task_id[ 2 ];   /* semaphore task ids */
-TEST_EXTERN rtems_name Semaphore_task_name[ 2 ]; /* semaphore task names */
-
-TEST_EXTERN rtems_id   Queue_task_id[ 3 ];       /* message queue task ids */
-TEST_EXTERN rtems_name Queue_task_name[ 3 ];     /* message queue task names */
-
-TEST_EXTERN rtems_id   Partition_task_id[ 4 ];   /* partition task ids */
-TEST_EXTERN rtems_name Partition_task_name[ 4 ]; /* partition task names */
-
-TEST_EXTERN rtems_id   Partition_id[ 3 ];    /* partition ids */
-TEST_EXTERN rtems_name Partition_name[ 3 ];  /* partition names */
-
-TEST_EXTERN rtems_id   Semaphore_id[ 3 ];    /* semaphore ids */
-TEST_EXTERN rtems_name Semaphore_name[ 3 ];  /* semaphore names */
-
-TEST_EXTERN rtems_id   Queue_id[ 3 ];        /* message queue ids */
-TEST_EXTERN rtems_name Queue_name[ 3 ];      /* message queue names */
-
-TEST_EXTERN rtems_id   Task_id[ 4 ];         /* remote event task ids */
-TEST_EXTERN rtems_name Task_name[ 4 ];       /* remote event task names */
-
-TEST_EXTERN rtems_id   Timer_id[ 4 ];         /* event timer ids */
-TEST_EXTERN rtems_name Timer_name[ 4 ];       /* event timer names */
-
-TEST_EXTERN rtems_unsigned32 Msg_buffer[ 4 ][ 4 ];
-
-extern rtems_multiprocessing_table Multiprocessing_configuration;
-
-TEST_EXTERN volatile rtems_boolean Stop_Test;
-TEST_EXTERN rtems_id timer_id;
-
-#define EVENT_TASK_DOT_COUNT        100
-#define EVENT_SEND_DOT_COUNT        100
-#define DELAYED_EVENT_DOT_COUNT     1000
-#define MESSAGE_DOT_COUNT           200
-#define PARTITION_DOT_COUNT         200
-#define SEMAPHORE_DOT_COUNT         200
-
-/* end of include file */
diff --git a/testsuites/psxtests/include/pmacros.h b/testsuites/psxtests/include/pmacros.h
deleted file mode 100644
index 1f15dac9c0..0000000000
--- a/testsuites/psxtests/include/pmacros.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- *  $Id$
- */
-
-#ifndef __POSIX_TEST_MACROS_h
-#define __POSIX_TEST_MACROS_h
-
-#include <bsp.h>
-#include <pthread.h>
-#include <assert.h>
-#include <stdio.h>
-#include <string.h>
-#include <time.h>
-#include <unistd.h>
-
-/*
- *  These help manipulate the "struct tm" form of time
- */
-
-#define TM_SUNDAY    0
-#define TM_MONDAY    1
-#define TM_TUESDAY   2
-#define TM_WEDNESDAY 3
-#define TM_THURSDAY  4
-#define TM_FRIDAY    5
-#define TM_SATURDAY  6
- 
-#define TM_JANUARY     0
-#define TM_FEBRUARY    1
-#define TM_MARCH       2
-#define TM_APRIL       3
-#define TM_MAY         4
-#define TM_JUNE        5
-#define TM_JULY        6
-#define TM_AUGUST      7
-#define TM_SEPTEMBER   8
-#define TM_OCTOBER    10
-#define TM_NOVEMBER   12
-#define TM_DECEMBER   12
- 
-#define build_time( TM, WEEKDAY, MON, DAY, YR, HR, MIN, SEC ) \
-  { (TM)->tm_year = YR;  \
-    (TM)->tm_mon  = MON; \
-    (TM)->tm_mday = DAY; \
-    (TM)->tm_wday  = WEEKDAY; \
-    (TM)->tm_hour = HR;  \
-    (TM)->tm_min  = MIN; \
-    (TM)->tm_sec  = SEC; }
-
-#define set_time( WEEKDAY, MON, DAY, YR, HR, MIN, SEC ) \
-  do { \
-    struct tm tm; \
-    struct timespec tv; \
-    int status; \
-    \
-    build_time( &tm, WEEKDAY, MON, DAY, YR, HR, MIN, SEC ); \
-    \
-    tv.tv_sec = mktime( &tm ); \
-    tv.tv_nsec = 0; \
-    assert( tv.tv_sec != -1 ); \
-    \
-    status = clock_settime( CLOCK_REALTIME, &tv ); \
-    assert( !status ); \
-  } while ( 0 ) 
-
-#define print_current_time(s1, s2) \
-  do { \
-    char _buffer[32]; \
-    int  _status; \
-    struct timespec _tv; \
-    \
-    _status = clock_gettime( CLOCK_REALTIME, &_tv ); \
-    assert( !_status ); \
-    \
-    (void) ctime_r( &_tv.tv_sec, _buffer ); \
-    _buffer[ strlen( _buffer ) - 1 ] = 0; \
-    printf( "%s%s%s\n", s1, _buffer, s2 ); \
-    fflush(stdout); \
-  } while ( 0 )
-
-#define empty_line() puts( "" )
-
-#endif
-
-/* end of file */
diff --git a/testsuites/psxtests/psx01/init.c b/testsuites/psxtests/psx01/init.c
deleted file mode 100644
index a2101a5f16..0000000000
--- a/testsuites/psxtests/psx01/init.c
+++ /dev/null
@@ -1,225 +0,0 @@
-/* 
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define CONFIGURE_INIT
-#include "system.h"
-#include <sched.h>
-
-void *POSIX_Init(
-  void *argument
-)
-{
-  struct timespec tv;
-  struct timespec tr;
-  int             status;
-  int             priority;
-  pthread_t       thread_id;
-  time_t          seconds;
-  time_t          seconds1;
-  time_t          remaining;
-  struct tm       tm;
-
-  puts( "\n\n*** POSIX TEST 1 ***" );
-
-  build_time( &tm, TM_FRIDAY, TM_MAY, 24, 96, 11, 5, 0 );
-
-  /* error cases in clock_gettime and clock_settime */
-
-  puts( "Init: clock_gettime - EINVAL (invalid clockid)" );
-  status = clock_settime( -1, &tv );
-  assert( status == -1 );
-  assert( errno == EINVAL );
-
-  puts( "Init: clock_settime - EINVAL (invalid clockid)" );
-  status = clock_settime( -1, &tv );
-  assert( status == -1 );
-  assert( errno == EINVAL );
-
-  /* exercise clock_getres */
-
-  puts( "Init: clock_getres - EINVAL (invalid clockid)" );
-  status = clock_getres( -1, &tv );
-  assert( status == -1 );
-  assert( errno == EINVAL );
-
-  puts( "Init: clock_getres - EINVAL (NULL resolution)" );
-  status = clock_getres( CLOCK_REALTIME, NULL );
-  assert( status == -1 );
-  assert( errno == EINVAL );
-
-  puts( "Init: clock_getres - SUCCESSFUL" );
-  status = clock_getres( CLOCK_REALTIME, &tv );
-  printf( "Init: resolution = sec (%ld), nsec (%ld)\n", tv.tv_sec, tv.tv_nsec );
-  assert( !status );
-
-  /* set the time of day, and print our buffer in multiple ways */
-
-  tv.tv_sec = mktime( &tm );
-  assert( tv.tv_sec != -1 );
-
-  tv.tv_nsec = 0;
-
-  /* now set the time of day */
-
-  empty_line();
-
-  printf( asctime( &tm ) );
-  puts( "Init: clock_settime - SUCCESSFUL" );
-  status = clock_settime( CLOCK_REALTIME, &tv );
-  assert( !status );
-
-  printf( asctime( &tm ) );
-  printf( ctime( &tv.tv_sec ) );
-
-  /* use sleep to delay */
-
-  remaining = sleep( 3 );
-  assert( !remaining );
-
-  /* print new times to make sure it has changed and we can get the realtime */
-
-  status = clock_gettime( CLOCK_REALTIME, &tv );
-  assert( !status );
-
-  printf( ctime( &tv.tv_sec ) );
-
-  seconds = time( NULL );
-  printf( ctime( &seconds ) );
-
-  /*  just to have the value copied out through the parameter */
-  
-  seconds = time( &seconds1 );
-  assert( seconds == seconds1 );
-
-  /* check the time remaining */
-
-  printf( "Init: seconds remaining (%d)\n", (int)remaining );
-  assert( !remaining );
-
-  /* error cases in nanosleep */
-
-  empty_line();
-  puts( "Init: nanosleep - EINVAL (NULL time)" );
-  status = nanosleep ( NULL, &tr );
-  assert( status == -1 );
-  assert( errno == EINVAL );
-
-  tv.tv_sec = 0;
-  tv.tv_nsec = TOD_NANOSECONDS_PER_SECOND * 2;
-  puts( "Init: nanosleep - EINVAL (too many nanoseconds)" );
-  status = nanosleep ( &tv, &tr );
-  assert( status == -1 );
-  assert( errno == EINVAL );
-
-  /* this is actually a small delay or yield */
-  tv.tv_sec = -1;
-  tv.tv_nsec = 0;
-  puts( "Init: nanosleep - negative seconds small delay " );
-  status = nanosleep ( &tv, &tr );
-  assert( !status );
-
-  /* use nanosleep to yield */
-
-  tv.tv_sec = 0; 
-  tv.tv_nsec = 0; 
-
-  puts( "Init: nanosleep - yield" ); 
-  status = nanosleep ( &tv, &tr );
-  assert( !status );
-  assert( !tr.tv_sec );
-  assert( !tr.tv_nsec );
-
-  /* use nanosleep to delay */
-
-  tv.tv_sec = 3; 
-  tv.tv_nsec = 500000; 
-
-  puts( "Init: nanosleep - 3.05 seconds" ); 
-  status = nanosleep ( &tv, &tr );
-  assert( !status );
-
-  /* print the current real time again */
-
-  status = clock_gettime( CLOCK_REALTIME, &tv );
-  assert( !status );
- 
-  printf( ctime( &tv.tv_sec ) );
-
-  /* check the time remaining */
-
-  printf( "Init: sec (%ld), nsec (%ld) remaining\n", tr.tv_sec, tr.tv_nsec );
-  assert( !tr.tv_sec && !tr.tv_nsec );
-
-  /* get id of this thread */
-
-  Init_id = pthread_self();
-  printf( "Init: ID is 0x%08x\n", Init_id );
-
-  /* exercise get minimum priority */
-
-  priority = sched_get_priority_min( SCHED_FIFO );
-  printf( "Init: sched_get_priority_min (SCHED_FIFO) -- %d\n", priority );
-  assert( priority != -1 );
-
-  puts( "Init: sched_get_priority_min -- EINVAL (invalid policy)" );
-  priority = sched_get_priority_min( -1 );
-  assert( priority == -1 );
-  assert( errno == EINVAL );
-
-  /* exercise get maximum priority */
- 
-  priority = sched_get_priority_max( SCHED_FIFO );
-  printf( "Init: sched_get_priority_max (SCHED_FIFO) -- %d\n", priority );
-  assert( priority != -1 );
-
-  puts( "Init: sched_get_priority_min -- EINVAL (invalid policy)" );
-  priority = sched_get_priority_min( -1 );
-  assert( priority == -1 );
-  assert( errno == EINVAL );
-
-  /* print the round robin time quantum */
- 
-  status = sched_rr_get_interval( getpid(), &tr );
-  printf(
-    "Init: Round Robin quantum is %ld seconds, %ld nanoseconds\n",
-    tr.tv_sec,
-    tr.tv_nsec
-  );
-  assert( !status );
-  
-  /* create a thread */
-
-  puts( "Init: pthread_create - SUCCESSFUL" );
-  status = pthread_create( &thread_id, NULL, Task_1_through_3, NULL );
-  assert( !status );
-
-  /* too may threads error */
-
-  puts( "Init: pthread_create - EAGAIN (too many threads)" );
-  status = pthread_create( &thread_id, NULL, Task_1_through_3, NULL );
-  assert( status == EAGAIN );
-
-  puts( "Init: sched_yield to Task_1" );
-  status = sched_yield();
-  assert( !status );
-
-    /* switch to Task_1 */
-
-  /* exit this thread */
-
-  puts( "Init: pthread_exit" );
-  pthread_exit( NULL );
-
-    /* switch to Task_1 */
-
-  return NULL; /* just so the compiler thinks we returned something */
-}
diff --git a/testsuites/psxtests/psx01/psx01.scn b/testsuites/psxtests/psx01/psx01.scn
deleted file mode 100644
index 8f563dd26c..0000000000
--- a/testsuites/psxtests/psx01/psx01.scn
+++ /dev/null
@@ -1,46 +0,0 @@
-*** POSIX TEST 1 ***
-Init: clock_gettime - EINVAL (invalid clockid)
-Init: clock_settime - EINVAL (invalid clockid)
-Init: clock_getres - EINVAL (invalid clockid)
-Init: clock_getres - EINVAL (NULL resolution)
-Init: clock_getres - SUCCESSFUL
-Init: resolution = sec (100), nsec (0)
- 
-Fri May 24 11:05:00 1996
-Init: clock_settime - SUCCESSFUL
-Fri May 24 11:05:00 1996
-Fri May 24 11:05:00 1996
-Fri May 24 11:05:03 1996
-Fri May 24 11:05:03 1996
-Init: seconds remaining (0)
- 
-Init: nanosleep - EINVAL (NULL time)
-Init: nanosleep - EAGAIN (negative seconds)
-Init: nanosleep - EINVAL (too many nanoseconds)
-Init: nanosleep - yield
-Init: nanosleep - 3.05 seconds
-Fri May 24 11:05:06 1996
-Init: sec (0), nsec (0) remaining
-Init: ID is 0x0c010001
-Init: sched_get_priority_min (SCHED_FIFO) -- 1
-Init: sched_get_priority_min -- EINVAL (invalid policy)
-Init: sched_get_priority_max (SCHED_FIFO) -- 254
-Init: sched_get_priority_min -- EINVAL (invalid policy)
-Init: Round Robin quantum is 0 seconds, 500000000 nanoseconds
-Init: pthread_create - SUCCESSFUL
-Init: pthread_create - EAGAIN (too many threads)
-Init: sched_yield to Task_1
-Task_1: sched_yield to Init
-Init: pthread_exit
- 
-Task_1: ID is 0x0c010002
-Task_1: pthread_equal - match case passed
-Task_1: pthread_equal - different case passed
-Task_1: pthread_equal - first id bad
-Task_1: pthread_equal - second id bad
-Task_1: pthread_once - EINVAL (NULL once_control)
-Task_1: pthread_once - EINVAL (NULL init_routine)
-Task_1: pthread_once - SUCCESSFUL (init_routine executes)
-Test_init_routine: invoked
-Task_1: pthread_once - SUCCESSFUL (init_routine does not execute)
-*** END OF POSIX TEST 1 ***
diff --git a/testsuites/psxtests/psx01/system.h b/testsuites/psxtests/psx01/system.h
deleted file mode 100644
index 9ff369cc01..0000000000
--- a/testsuites/psxtests/psx01/system.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*  system.h
- *
- *  This include file contains information that is included in every
- *  function in the test set.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-/* functions */
-
-#include <pmacros.h>
-#include <unistd.h>
-#include <errno.h>
-#include <sched.h>
-
-void *POSIX_Init(
-  void *argument
-);
-
-void *Task_1_through_3(
-  void *argument
-);
-
-/* configuration information */
-
-#define CONFIGURE_SPTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#define CONFIGURE_MAXIMUM_POSIX_THREADS     2
-
-#include <confdefs.h>
-
-/* global variables */
-
-#ifdef CONFIGURE_INIT
-#define TEST_EXTERN
-#else
-#define TEST_EXTERN extern
-#endif
-
-TEST_EXTERN pthread_t        Init_id;
-TEST_EXTERN pthread_t        Task_id;
-
-/* end of include file */
diff --git a/testsuites/psxtests/psx01/task.c b/testsuites/psxtests/psx01/task.c
deleted file mode 100644
index d6733a8a82..0000000000
--- a/testsuites/psxtests/psx01/task.c
+++ /dev/null
@@ -1,94 +0,0 @@
-/*  Task_1_through_3
- *
- *  This routine serves as a test task.  It verifies the basic task
- *  switching capabilities of the executive.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-void Test_init_routine( void )
-{
-  puts( "Test_init_routine: invoked" );
-}
-
-
-void *Task_1_through_3(
-  void *argument
-)
-{
-  int            status;
-  pthread_once_t once = PTHREAD_ONCE_INIT;
-
-  puts( "Task_1: sched_yield to Init" );
-  status = sched_yield();
-  assert( !status );
- 
-    /* switch to Task_1 */
-
-  /* now do some real testing */
-
-  empty_line();
-
-  /* get id of this thread */
-
-  Task_id = pthread_self();
-  printf( "Task_1: ID is 0x%08x\n", Task_id );
-
-  /* exercise pthread_equal */
-
-  status = pthread_equal( Task_id, Task_id );
-  if ( status )
-    puts( "Task_1: pthread_equal - match case passed" );
-  assert( status );
-
-  status = pthread_equal( Init_id, Task_id );
-  if ( !status )
-    puts( "Task_1: pthread_equal - different case passed" );
-  assert( !status );
-
-  puts( "Task_1: pthread_equal - first id bad" );
-  status = pthread_equal( -1, Task_id );
-  assert( !status );
-
-  puts( "Task_1: pthread_equal - second id bad" );
-  status = pthread_equal( Init_id, -1 );
-  assert( !status );
-
-  /* exercise pthread_once */
-
-  puts( "Task_1: pthread_once - EINVAL (NULL once_control)" );
-  status = pthread_once( NULL, Test_init_routine );
-  assert( status == EINVAL );
-
-  puts( "Task_1: pthread_once - EINVAL (NULL init_routine)" );
-  status = pthread_once( &once, NULL );
-  assert( status == EINVAL );
-
-  puts( "Task_1: pthread_once - SUCCESSFUL (init_routine executes)" );
-  status = pthread_once( &once, Test_init_routine );
-  assert( !status );
-
-  puts( "Task_1: pthread_once - SUCCESSFUL (init_routine does not execute)" );
-  status = pthread_once( &once, Test_init_routine );
-  assert( !status );
-
-  puts( "*** END OF POSIX TEST 1 ***" );
-  exit( 0 );
-
-  return NULL; /* just so the compiler thinks we returned something */
-}
diff --git a/testsuites/psxtests/psx02/init.c b/testsuites/psxtests/psx02/init.c
deleted file mode 100644
index 27a0778583..0000000000
--- a/testsuites/psxtests/psx02/init.c
+++ /dev/null
@@ -1,146 +0,0 @@
-/* 
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define CONFIGURE_INIT
-#include "system.h"
-#include <signal.h>
-
-volatile int Signal_occurred;
-volatile int Signal_count;
-
-void Signal_handler(
-  int signo
-)
-{
-  Signal_count++;
-  printf(
-    "Signal: %d caught by 0x%x (%d)\n",
-    signo,
-    pthread_self(),
-    Signal_count
-  );
-  Signal_occurred = 1;
-}
-
-void *POSIX_Init(
-  void *argument
-)
-{
-  int               status;
-  struct timespec   tv;
-  struct timespec   tr;
-  struct sigaction  act;
-  sigset_t          mask;
-  sigset_t          pending_set;
-
-  puts( "\n\n*** POSIX TEST 2 ***" );
-
-  /* set the time of day, and print our buffer in multiple ways */
-
-  set_time( TM_FRIDAY, TM_MAY, 24, 96, 11, 5, 0 );
-
-  /* get id of this thread */
-
-  Init_id = pthread_self();
-  printf( "Init's ID is 0x%08x\n", Init_id );
-
-  /* install a signal handler */
-
-  status = sigemptyset( &act.sa_mask );
-  assert( !status );
-
-  act.sa_handler = Signal_handler;
-  act.sa_flags   = 0;
- 
-  sigaction( SIGUSR1, &act, NULL );
-
-  /* simple signal to self */
-
-  Signal_count = 0;
-  Signal_occurred = 0;
-
-  status = pthread_kill( Init_id, SIGUSR1 );
-  assert( !status );
-
-  Signal_occurred = 0;
-
-  /* now block the signal, send it, see if it is pending, and unblock it */
-
-  status = sigemptyset( &mask );
-  assert( !status );
-
-  status = sigaddset( &mask, SIGUSR1 );
-  assert( !status );
-
-  printf( "Init: Block SIGUSR1\n" );
-  status = sigprocmask( SIG_BLOCK, &mask, NULL );
-  assert( !status );
-
-  status = sigpending( &pending_set );
-  assert( !status );
-  printf( "Init: Signals pending 0x%08x\n", pending_set );
-  
-  
-  printf( "Init: send SIGUSR1 to self\n" );
-  status = pthread_kill( Init_id, SIGUSR1 );
-  assert( !status );
-
-  status = sigpending( &pending_set );
-  assert( !status );
-  printf( "Init: Signals pending 0x%08x\n", pending_set );
-  
-  printf( "Init: Unblock SIGUSR1\n" );
-  status = sigprocmask( SIG_UNBLOCK, &mask, NULL );
-  assert( !status );
-
-  /* create a thread */
-
-  status = pthread_create( &Task_id, NULL, Task_1_through_3, NULL );
-  assert( !status );
-
-  /*
-   *  Loop for 5 seconds seeing how many signals we catch 
-   */
-
-  tr.tv_sec = 5;
-  tr.tv_nsec = 0;
- 
-  do {
-    tv = tr;
-
-    Signal_occurred = 0;
-
-    status = nanosleep ( &tv, &tr );
-  
-    if ( status == -1 ) {
-      assert( errno == EINTR );
-      assert( tr.tv_nsec || tr.tv_sec );
-    } else if ( !status ) {
-      assert( !tr.tv_nsec && !tr.tv_sec );
-    }
-     
-    printf(
-      "Init: signal was %sprocessed with %d:%d time remaining\n",
-      (Signal_occurred) ? "" : "not ",
-      (int) tr.tv_sec,
-      (int) tr.tv_nsec
-   );
-
-  } while ( tr.tv_sec || tr.tv_nsec );
-
-  /* exit this thread */
-
-  puts( "*** END OF POSIX TEST 2 ***" );
-  exit( 0 );
-
-  return NULL; /* just so the compiler thinks we returned something */
-}
diff --git a/testsuites/psxtests/psx02/psx02.scn b/testsuites/psxtests/psx02/psx02.scn
deleted file mode 100644
index 3b0d373b16..0000000000
--- a/testsuites/psxtests/psx02/psx02.scn
+++ /dev/null
@@ -1,26 +0,0 @@
-*** POSIX TEST 2 ***
-Init's ID is 0x0c010001
-Signal: 16 caught by 0xc010001 (1)
-Init: Block SIGUSR1
-Init: Signals pending 0x00000000
-Init: send SIGUSR1 to self
-Init: Signals pending 0x00008000
-Init: Unblock SIGUSR1
-Signal: 16 caught by 0xc010001 (2)
-Task1: Fri May 24 11:05:00 1996
-Signal: 16 caught by 0xc010001 (3)
-Init: signal was processed with 5:0 time remaining
-Task1: Fri May 24 11:05:01 1996
-Signal: 16 caught by 0xc010001 (4)
-Init: signal was processed with 3:990000000 time remaining
-Task1: Fri May 24 11:05:02 1996
-Signal: 16 caught by 0xc010001 (5)
-Init: signal was processed with 2:980000000 time remaining
-Task1: Fri May 24 11:05:03 1996
-Signal: 16 caught by 0xc010001 (6)
-Init: signal was processed with 1:970000000 time remaining
-Task1: Fri May 24 11:05:04 1996
-Signal: 16 caught by 0xc010001 (7)
-Init: signal was processed with 0:960000000 time remaining
-Init: signal was not processed with 0:0 time remaining
-*** END OF POSIX TEST 2 ***
diff --git a/testsuites/psxtests/psx02/system.h b/testsuites/psxtests/psx02/system.h
deleted file mode 100644
index 862e5c80f1..0000000000
--- a/testsuites/psxtests/psx02/system.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*  system.h
- *
- *  This include file contains information that is included in every
- *  function in the test set.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-/* functions */
-
-#include <pmacros.h>
-#include <errno.h>
-
-void *POSIX_Init(
-  void *argument
-);
-
-void *Task_1_through_3(
-  void *argument
-);
-
-/* configuration information */
-
-#define CONFIGURE_SPTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#include <confdefs.h>
-
-/* global variables */
-
-#ifdef CONFIGURE_INIT
-#define TEST_EXTERN
-#else
-#define TEST_EXTERN extern
-#endif
-
-TEST_EXTERN pthread_t        Init_id;
-TEST_EXTERN pthread_t        Task_id;
-
-/* end of include file */
diff --git a/testsuites/psxtests/psx02/task.c b/testsuites/psxtests/psx02/task.c
deleted file mode 100644
index ce8f4b0a4d..0000000000
--- a/testsuites/psxtests/psx02/task.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*  Task_1_through_3
- *
- *  This routine serves as a test task.  It verifies the basic task
- *  switching capabilities of the executive.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-#include <signal.h>
-
-void *Task_1_through_3(
-  void *argument
-)
-{
-  int seconds;
-  int i;
-  int status;
-
-  for ( i=0 ; i<5 ; i++ ) {
-    print_current_time( "Task1: ", "" );
-    status = pthread_kill( Init_id, SIGUSR1 );
-    assert( !status );
-
-    seconds = sleep( 1 );
-    assert( !seconds );
-  }
-  puts( "*** END OF POSIX TEST 2 ***" );
-  exit( 0 );
-
-  return NULL; /* just so the compiler thinks we returned something */
-}
diff --git a/testsuites/psxtests/psx03/init.c b/testsuites/psxtests/psx03/init.c
deleted file mode 100644
index 4ccd89e3cc..0000000000
--- a/testsuites/psxtests/psx03/init.c
+++ /dev/null
@@ -1,176 +0,0 @@
-/* 
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define CONFIGURE_INIT
-#include "system.h"
-#include <signal.h>
-#include <errno.h>
-
-volatile int Signal_occurred;
-volatile int Signal_count;
-
-void Signal_handler(
-  int signo
-)
-{
-  Signal_count++;
-  printf(
-    "Signal: %d caught by 0x%x (%d)\n",
-    signo,
-    pthread_self(),
-    Signal_count
-  );
-  Signal_occurred = 1;
-}
-
-void *POSIX_Init(
-  void *argument
-)
-{
-  int               status;
-  struct timespec   timeout;
-  struct sigaction  act;
-  sigset_t          mask;
-  sigset_t          waitset;
-  int               signo;
-  siginfo_t         siginfo;
-
-  puts( "\n\n*** POSIX TEST 3 ***" );
-
-  /* set the time of day, and print our buffer in multiple ways */
-
-  set_time( TM_FRIDAY, TM_MAY, 24, 96, 11, 5, 0 );
-
-  /* get id of this thread */
-
-  Init_id = pthread_self();
-  printf( "Init's ID is 0x%08x\n", Init_id );
-
-  /* install a signal handler */
-
-  status = sigemptyset( &act.sa_mask );
-  assert( !status );
-
-  act.sa_handler = Signal_handler;
-  act.sa_flags   = 0;
- 
-  sigaction( SIGUSR1, &act, NULL );
-
-  /* initialize signal handler variables */
-
-  Signal_count = 0;
-  Signal_occurred = 0;
-
-  /*
-   *  wait on SIGUSR1 for 3 seconds, will timeout 
-   */
-
-  /* initialize the signal set we will wait for to SIGUSR1 */
-
-  status = sigemptyset( &waitset );
-  assert( !status );
-
-  status = sigaddset( &waitset, SIGUSR1 );
-  assert( !status );
-
-  timeout.tv_sec = 3;
-  timeout.tv_nsec = 0;
-
-  puts( "Init: waiting on any signal for 3 seconds." );
-  signo = sigtimedwait( &waitset, &siginfo, &timeout );
-  assert( signo == -1 );
-
-  if ( errno == EAGAIN ) 
-    puts( "Init: correctly timed out waiting for SIGUSR1." );
-  else
-    printf( "sigtimedwait returned wrong errno - %d\n", errno );
-
-  Signal_occurred = 0;
-
-  /*
-   *  wait on SIGUSR1 for 3 seconds, will timeout because Task_1 sends SIGUSR2
-   */
-
-  empty_line();
-
-  /* initialize a mask to block SIGUSR2 */
-
-  status = sigemptyset( &mask );
-  assert( !status );
-
-  status = sigaddset( &mask, SIGUSR2 );
-  assert( !status );
-
-  printf( "Init: Block SIGUSR2\n" );
-  status = sigprocmask( SIG_BLOCK, &mask, NULL );
-  assert( !status );
-
-  /* create a thread */
-
-  status = pthread_create( &Task_id, NULL, Task_1, NULL );
-  assert( !status );
-
-  /* signal handler is still installed, waitset is still set for SIGUSR1 */
-   
-  timeout.tv_sec = 3;
-  timeout.tv_nsec = 0;
- 
-  puts( "Init: waiting on any signal for 3 seconds." );
-  signo = sigtimedwait( &waitset, &siginfo, &timeout );
-
-     /* switch to Task 1 */
-
-  if ( errno == EAGAIN )
-    puts( "Init: correctly timed out waiting for SIGUSR1." );
-  else
-    printf( "sigtimedwait returned wrong errno - %d\n", errno );
-  assert( signo == -1 );
- 
-  /*
-   *  wait on SIGUSR1 for 3 seconds, Task_2 will send it to us
-   */
-
-  empty_line();
-
-  /* create a thread */
-
-  status = pthread_create( &Task_id, NULL, Task_2, NULL );
-  assert( !status );
-
-  /* signal handler is still installed, waitset is still set for SIGUSR1 */
- 
-  /* wait on SIGUSR1 for 3 seconds, will receive SIGUSR1 from Task_2 */
- 
-  timeout.tv_sec = 3;
-  timeout.tv_nsec = 0;
- 
-  /* just so we can check that these were altered */
-
-  siginfo.si_code = -1;
-  siginfo.si_signo = -1;
-  siginfo.si_value.sival_int = -1;
-
-  puts( "Init: waiting on any signal for 3 seconds." );
-  signo = sigtimedwait( &waitset, &siginfo, &timeout );
-  printf( "Init: received (%d) SIGUSR1=%d\n", siginfo.si_signo, SIGUSR1 );
-  assert( signo == SIGUSR1 );
-  assert( siginfo.si_signo == SIGUSR1 );
-  assert( siginfo.si_code == SI_USER );
-  assert( siginfo.si_value.sival_int != -1 );   /* rtems does always set this */
- 
-  /* exit this thread */
-
-  puts( "*** END OF POSIX TEST 3 ***" );
-  exit( 0 );
-
-  return NULL; /* just so the compiler thinks we returned something */
-}
diff --git a/testsuites/psxtests/psx03/psx03.scn b/testsuites/psxtests/psx03/psx03.scn
deleted file mode 100644
index 61ba36592a..0000000000
--- a/testsuites/psxtests/psx03/psx03.scn
+++ /dev/null
@@ -1,17 +0,0 @@
-*** POSIX TEST 3 ***
-Init's ID is 0x0c010001
-Init: waiting on any signal for 3 seconds.
-Init: correctly timed out waiting for SIGUSR1.
- 
-Init: Block SIGUSR2
-Init: waiting on any signal for 3 seconds.
-Task_1: Fri May 24 11:05:03 1996
-Task_1: pthread_kill - SIGUSR2 to Init
-Init: correctly timed out waiting for SIGUSR1.
- 
-Init: waiting on any signal for 3 seconds.
-Task_2: Fri May 24 11:05:06 1996
-Task_1: pthread_kill - SIGUSR1 to Init
-Signal: 16 caught by 0xc010001 (1)
-Init: received (16) SIGUSR1=16
-*** END OF POSIX TEST 3 ***
diff --git a/testsuites/psxtests/psx03/system.h b/testsuites/psxtests/psx03/system.h
deleted file mode 100644
index a17b36812d..0000000000
--- a/testsuites/psxtests/psx03/system.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*  system.h
- *
- *  This include file contains information that is included in every
- *  function in the test set.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-/* functions */
-
-#include <pmacros.h>
-
-void *POSIX_Init(
-  void *argument
-);
-
-void *Task_1(
-  void *argument
-);
-
-void *Task_2(
-  void *argument
-);
-
-/* configuration information */
-
-#define CONFIGURE_SPTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#include <confdefs.h>
-
-/* global variables */
-
-#ifdef CONFIGURE_INIT
-#define TEST_EXTERN
-#else
-#define TEST_EXTERN extern
-#endif
-
-TEST_EXTERN pthread_t        Init_id;
-TEST_EXTERN pthread_t        Task_id;
-
-/* end of include file */
diff --git a/testsuites/psxtests/psx03/task.c b/testsuites/psxtests/psx03/task.c
deleted file mode 100644
index be9b1ae96c..0000000000
--- a/testsuites/psxtests/psx03/task.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*  Task_1_through_3
- *
- *  This routine serves as a test task.  It verifies the basic task
- *  switching capabilities of the executive.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-#include <signal.h>
-
-void *Task_1(
-  void *argument
-)
-{
-  int status;
-
-  /* send SIGUSR2 to Init which is waiting on SIGUSR1 */
-
-  print_current_time( "Task_1: ", "" );
-
-  puts( "Task_1: pthread_kill - SIGUSR2 to Init" );
-  status = pthread_kill( Init_id, SIGUSR2 );
-  assert( !status );
-
-  pthread_exit( NULL );
-
-     /* switch to Init */
-
-  return NULL; /* just so the compiler thinks we returned something */
-}
-
-void *Task_2(
-  void *argument
-)
-{
-  int status;
-
-  /* send SIGUSR1 to Init which is waiting on SIGUSR1 */
- 
-  print_current_time( "Task_2: ", "" );
-
-  puts( "Task_1: pthread_kill - SIGUSR1 to Init" );
-  status = pthread_kill( Init_id, SIGUSR1 );
-  assert( !status );
- 
-  pthread_exit( NULL );
-
-     /* switch to Init */
-
-  return NULL; /* just so the compiler thinks we returned something */
-}
diff --git a/testsuites/psxtests/psx04/init.c b/testsuites/psxtests/psx04/init.c
deleted file mode 100644
index a1dfbd5ac5..0000000000
--- a/testsuites/psxtests/psx04/init.c
+++ /dev/null
@@ -1,564 +0,0 @@
-/* 
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define CONFIGURE_INIT
-#include "system.h"
-#include <signal.h>
-#include <errno.h>
-
-volatile int Signal_occurred;
-volatile int Signal_count;
-
-void Signal_handler(
-  int signo
-)
-{
-  Signal_count++;
-  printf(
-    "Signal: %d caught by 0x%x (%d)\n",
-    signo,
-    pthread_self(),
-    Signal_count
-  );
-  Signal_occurred = 1;
-}
-
-void Signal_info_handler(
-  int        signo,
-  siginfo_t *info,
-  void      *context
-)
-{
-  Signal_count++;
-  printf(
-    "Signal_info: %d caught by 0x%x (%d) si_signo= %d si_code= %d value= %d\n",
-    signo,
-    pthread_self(),
-    Signal_count,
-    info->si_signo,
-    info->si_code,
-    info->si_value.sival_int
-  );
-  Signal_occurred = 1;
-}
-
-void *POSIX_Init(
-  void *argument
-)
-{
-  int               status;
-  struct sigaction  act;
-  sigset_t          mask;
-  sigset_t          pending_set;
-  sigset_t          oset;
-  struct timespec   timeout;
-  siginfo_t         info;
-
-  puts( "\n\n*** POSIX TEST 4 ***" );
-
-  /* set the time of day, and print our buffer in multiple ways */
-
-  set_time( TM_FRIDAY, TM_MAY, 24, 96, 11, 5, 0 );
-
-  /* get id of this thread */
-
-  Init_id = pthread_self();
-  printf( "Init's ID is 0x%08x\n", Init_id );
-
-/* install a signal handler for SIGUSR1 */
-
-  status = sigemptyset( &act.sa_mask );
-  assert( !status );
-  printf( "Init: sigemptyset -  set= 0x%08x\n", act.sa_mask );
-
-  /* test sigfillset following the above sigemptyset */
-
-  status = sigfillset( &act.sa_mask );
-  assert( !status );
-  printf( "Init: sigfillset -  set= 0x%08x\n", act.sa_mask );
-
-  /* test sigdelset */
-
-  status = sigdelset( &act.sa_mask, SIGUSR1 );
-  assert( !status );
-  printf( "Init: sigdelset - delete SIGUSR1 set= 0x%08x\n", act.sa_mask );
-
-  /* test sigismember - FALSE */
-
-  status = sigismember( &act.sa_mask, SIGUSR1 );
-  assert( !status );
-  puts( "Init: sigismember - FALSE since SIGUSR1 is not a member" );
-
-  /* test sigismember - TRUE */
-
-  status = sigismember( &act.sa_mask, SIGUSR2 );
-  assert( status );
-  puts( "Init: sigismember - TRUE since SIGUSR2 is a member" );
-
-  /* return the set to empty */
-
-  act.sa_handler = Signal_handler;
-  act.sa_flags   = 0;
- 
-  sigaction( SIGUSR1, &act, NULL );
-
-  /* simple signal to process */
-
-  Signal_count = 0;
-  Signal_occurred = 0;
-
-  puts( "Init: send SIGUSR1 to process" );
-  status = kill( getpid(), SIGUSR1 );
-  assert( !status );
-
-/* end of install a signal handler for SIGUSR1 */
-
-  Signal_occurred = 0;
-
-  /* now block the signal, send it, see if it is pending, and unblock it */
-
-  empty_line();
-
-  status = sigemptyset( &mask );
-  assert( !status );
-
-  status = sigaddset( &mask, SIGUSR1 );
-  assert( !status );
-
-  puts( "Init: Block SIGUSR1" );
-  act.sa_handler = Signal_handler;
-  act.sa_flags   = 0;
- 
-  sigaction( SIGUSR1, &act, NULL );
-
-  /* simple signal to process */
-
-  Signal_count = 0;
-  Signal_occurred = 0;
-
-  puts( "Init: send SIGUSR1 to process" );
-  status = kill( getpid(), SIGUSR1 );
-  assert( !status );
-
-  Signal_occurred = 0;
-
-  /* now block the signal, send it, see if it is pending, and unblock it */
-
-  empty_line();
-
-  status = sigemptyset( &mask );
-  assert( !status );
-
-  status = sigaddset( &mask, SIGUSR1 );
-  assert( !status );
-
-  puts( "Init: Block SIGUSR1" );
-  status = sigprocmask( SIG_BLOCK, &mask, NULL );
-  assert( !status );
-
-  status = sigpending( &pending_set );
-  assert( !status );
-  printf( "Init: Signals pending 0x%08x\n", pending_set );
-  
-  puts( "Init: send SIGUSR1 to process" );
-  status = kill( getpid(), SIGUSR1 );
-  assert( !status );
-
-  status = sigpending( &pending_set );
-  assert( !status );
-  printf( "Init: Signals pending 0x%08x\n", pending_set );
-  
-  puts( "Init: Unblock SIGUSR1" );
-  status = sigprocmask( SIG_UNBLOCK, &mask, NULL );
-  assert( !status );
-
-  /* now let another task get interrupted by a signal */
-
-  empty_line();
-
-  puts( "Init: create a thread interested in SIGUSR1" );
-  status = pthread_create( &Task1_id, NULL, Task_1, NULL );
-  assert( !status );
-
-  puts( "Init: Block SIGUSR1" );
-  status = sigprocmask( SIG_BLOCK, &mask, NULL );
-  assert( !status );
- 
-  status = sigpending( &pending_set );
-  assert( !status );
-  printf( "Init: Signals pending 0x%08x\n", pending_set );
-
-  puts( "Init: sleep so the other task can block" ); 
-  status = sleep( 1 );
-  assert( !status );
-
-     /* switch to task 1 */
-
-  puts( "Init: send SIGUSR1 to process" );
-  status = kill( getpid(), SIGUSR1 );
-  assert( !status );
- 
-  status = sigpending( &pending_set );
-  assert( !status );
-  printf( "Init: Signals pending 0x%08x\n", pending_set );
-
-  puts( "Init: sleep so the other task can catch signal" ); 
-  status = sleep( 1 );
-  assert( !status );
-
-     /* switch to task 1 */
-
-  /* test alarm */
-
-  empty_line();
-
-  /* install a signal handler for SIGALRM and unblock it */
- 
-  status = sigemptyset( &act.sa_mask );
-  assert( !status );
- 
-  act.sa_handler = Signal_handler;
-  act.sa_flags   = 0;
- 
-  sigaction( SIGALRM, &act, NULL );
- 
-  status = sigemptyset( &mask );
-  assert( !status );
- 
-  status = sigaddset( &mask, SIGALRM );
-  assert( !status );
- 
-  puts( "Init: Unblock SIGALRM" );
-  status = sigprocmask( SIG_UNBLOCK, &mask, NULL );
-  assert( !status );
-
-  /* schedule the alarm */
- 
-  puts( "Init: Firing alarm in 5 seconds" );
-  status = alarm( 5 );
-  printf( "Init: %d seconds left on previous alarm\n", status );
-  assert( !status );
-
-  puts( "Init: Firing alarm in 2 seconds" );
-  status = alarm( 2 );
-  printf( "Init: %d seconds left on previous alarm\n", status );
-  assert( status );
-
-  puts( "Init: Wait 4 seconds for alarm" );
-  status = sleep( 4 );
-  printf( "Init: %d seconds left in sleep\n", status );
-  assert( status );
-
-  /* test SIG_SETMASK case and returning oset of pthread_sigmask */
-
-  empty_line();
-
-  status = sigemptyset( &mask );
-  assert( !status );
- 
-  status = sigaddset( &mask, SIGUSR1 );
-  assert( !status );
-
-  status = sigaddset( &mask, SIGUSR2 );
-  assert( !status );
-
-  puts( "Init: Block SIGUSR1 and SIGUSR2 only" );
-  status = pthread_sigmask( SIG_SETMASK, &mask, &oset );
-  printf( "Init: Previous blocked set was 0x%08x\n", oset );
-  assert( !status );
-
-  /* test inquiry about current blocked set with pthread_sigmask */
-  
-  status = pthread_sigmask( 0, NULL, &oset );
-  printf( "Init: Current blocked set is 0x%08x\n", oset );
-  assert( !status );
-
-  /* return blocked mask to no signals blocked */
-
-  status = sigemptyset( &mask );
-  assert( !status );
- 
-  puts( "Init: Unblock all signals" );
-  status = pthread_sigmask( SIG_SETMASK, &mask, &oset );
-  printf( "Init: Previous blocked set was 0x%08x\n", oset );
-  assert( !status );
-
-  /* test sigsuspend */
-
-  empty_line();
-
-  puts( "Init: create a thread to send Init SIGUSR1" );
-  status = pthread_create( &Task2_id, NULL, Task_2, NULL );
-  assert( !status );
-
-  status = sigemptyset( &mask );
-  assert( !status );
- 
-  puts( "Init: sigsuspend for any signal" );
-  status = sigsuspend( &mask );
-  assert( status );
-  printf( "Init: awakended from sigsuspend status=%08d \n", status );
-
-  /* test a SIGINFO case, these are signals sent to a process only */
-
-  empty_line();
-
-  puts( "Init: create a thread to sent Process SIGUSR1 with SA_SIGINFO" );
-  status = pthread_create( &Task3_id, NULL, Task_3, NULL );
-  assert( !status );
-
-  /* set action on SIGUSR1 to an info case */
-  act.sa_handler   = Signal_handler;
-  act.sa_flags     = SA_SIGINFO;
-  act.sa_sigaction = Signal_info_handler;
- 
-  sigaction( SIGUSR1, &act, NULL );
-
-  puts( "Init: sleep so the Task_3 can sigqueue SIGUSR1" ); 
-  status = sleep( 1 );
-  assert( !status );
-
-     /* switch to task 1 */
-
-  puts( "Init: sigqueue occurred" );
-
-  /* Send SIGUSR1, Task_3 has issued a sigwaitinfo */
-
-  status = sigemptyset( &mask );
-  assert( !status );
-
-  status = sigaddset( &mask, SIGUSR1 );
-  assert( !status );
-
-  puts( "Init: Block SIGUSR1" );
-  status = sigprocmask( SIG_BLOCK, &mask, NULL );
-  assert( !status );
-
-  puts( "Init: send SIGUSR1 to process" );
-  status = kill( getpid(), SIGUSR1 );
-  assert( !status );
-
-  puts( "Init: sleep so the Task_3 can receive SIGUSR1" ); 
-  status = sleep( 1 );
-  assert( !status );
-
-  /* Send SIGUSR1, Task_3 has issued a sigwait */
- 
-  status = sigemptyset( &mask );
-  assert( !status );
- 
-  status = sigaddset( &mask, SIGUSR1 );
-  assert( !status );
- 
-  puts( "Init: Block SIGUSR1" );
-  status = sigprocmask( SIG_BLOCK, &mask, NULL );
-  assert( !status );
- 
-  puts( "Init: send SIGUSR1 to process" );
-  status = kill( getpid(), SIGUSR1 );
-  assert( !status );
- 
-  puts( "Init: sleep so the Task_3 can receive SIGUSR1" );
-  status = sleep( 1 );
-  assert( !status );
-
-  /* Send SIGUSR1, Task_3 has issued a sigwaitinfo */
- 
-  status = sigemptyset( &mask );
-  assert( !status );
- 
-  status = sigaddset( &mask, SIGUSR2 );
-  assert( !status );
- 
-  puts( "Init: Block SIGUSR2" );
-  status = sigprocmask( SIG_BLOCK, &mask, NULL );
-  assert( !status );
- 
-  puts( "Init: send SIGUSR2 to process" );
-  status = kill( getpid(), SIGUSR2 );
-  assert( !status );
- 
-  puts( "Init: sleep so the Task_3 can receive SIGUSR2" );
-  status = sleep( 1 );
-  assert( !status );
-
-  /* Suspend for signal that has already be sent */
-
-  puts( "Init: sigsuspend for any signal" );
-  status = sigsuspend( &mask );
-  assert( status );
-  printf( "Init: awakended from sigsuspend status=%d \n", status );
-
-  /* generate error cases for psignal */
-
-  empty_line();
-
-  status = sigemptyset( NULL );
-  if ( status != -1 )
-    printf( "status = %d\n", status );
-  assert( errno == EINVAL );
-  puts( "Init: sigemptyset - EINVAL (set invalid)" );
-
-  status = sigfillset( NULL );
-  if ( status != -1 )
-    printf( "status = %d\n", status );
-  assert( errno == EINVAL );
-  puts( "Init: sigfillset - EINVAL (set invalid)" );
-
-  status = sigaddset( NULL, SIGUSR1 );
-  if ( status != -1 )
-    printf( "status = %d\n", status );
-  assert( errno == EINVAL );
-  puts( "Init: sigaddset - EINVAL (set invalid)" );
-
-  status = sigaddset( &mask, 0 );
-  assert( !status );
-  puts( "Init: sigaddset - SUCCESSFUL (signal = 0)" );
-
-  status = sigaddset( &mask, 999 );
-  if ( status != -1 )
-    printf( "status = %d\n", status );
-  assert( errno == EINVAL );
-  puts( "Init: sigaddset - EINVAL (set invalid)" );
-
-  status = sigdelset( NULL, SIGUSR1 );
-  if ( status != -1 )
-    printf( "status = %d\n", status );
-  assert( errno == EINVAL );
-  puts( "Init: sigdelset - EINVAL (set invalid)" );
- 
-  status = sigdelset( &mask, 0 );
-  assert( !status );
-  puts( "Init: sigdelset - SUCCESSFUL (signal = 0)" );
- 
-  status = sigdelset( &mask, 999 );
-  if ( status != -1 )
-    printf( "status = %d\n", status );
-  assert( errno == EINVAL );
-  puts( "Init: sigdelset - EINVAL (set invalid)" );
-
-  status = sigismember( NULL, SIGUSR1 );
-  if ( status != -1 )
-    printf( "status = %d\n", status );
-  assert( errno == EINVAL );
-  puts( "Init: sigismember - EINVAL (set invalid)" );
- 
-  status = sigismember( &mask, 0 );
-  assert( !status );
-  puts( "Init: sigismember - SUCCESSFUL (signal = 0)" );
- 
-  status = sigismember( &mask, 999 );
-  if ( status != -1 )
-    printf( "status = %d\n", status );
-  assert( errno == EINVAL );
-  puts( "Init: sigismember - EINVAL (signal invalid)" );
-
-  status = sigaction( 0, &act, 0 );
-  assert( !status );
-  puts( "Init: sigaction - SUCCESSFUL (signal = 0)" );
- 
-  status = sigaction( 999, &act, NULL );
-  if ( status != -1 )
-    printf( "status = %d\n", status );
-  assert( errno == EINVAL );
-  puts( "Init: sigaction - EINVAL (signal invalid)" );
-
-  status = sigaction( SIGKILL, &act, NULL );
-  if ( status != -1 )
-    printf( "status = %d\n", status );
-  assert( errno == EINVAL );
-  puts( "Init: sigaction - EINVAL (SIGKILL)" );
-
-  status = pthread_sigmask( SIG_BLOCK, NULL, NULL );
-  if ( status != -1 )
-    printf( "status = %d\n", status );
-  assert( errno == EINVAL );
-  puts( "Init: pthread_sigmask - EINVAL (set and oset invalid)" );
-
-  status = pthread_sigmask( 999, &pending_set, NULL );
-  if ( status != -1 )
-    printf( "status = %d\n", status );
-  assert( errno == EINVAL );
-  puts( "Init: pthread_sigmask - EINVAL (how invalid)" );
-
-  status = sigpending( NULL );
-  if ( status != -1 )
-    printf( "status = %d\n", status );
-  assert( errno == EINVAL );
-  puts( "Init: sigpending - EINVAL (set invalid)" );
-
-  timeout.tv_nsec = -1;
-  status = sigtimedwait( &mask, &info, &timeout );
-  if ( status != -1 )
-    printf( "status = %d\n", status );
-  assert( errno == EINVAL );
-  puts( "Init: pthread_sigmask - EINVAL (timout->nsec invalid < 0)" );
-
-  timeout.tv_nsec = 0x7fffffff;
-  status = sigtimedwait( &mask, &info, &timeout );
-  if ( status != -1 )
-    printf( "status = %d\n", status );
-  assert( errno == EINVAL );
-  puts( "Init: pthread_sigmask - EINVAL (timout->nsec invalid to large)" );
-
-  status = pthread_kill( Init_id, 999 );
-  if ( status != -1 )
-    printf( "status = %d\n", status );
-  assert( errno == EINVAL );
-  puts( "Init: pthread_kill - EINVAL (sig invalid)" );
-
-  status = pthread_kill( 0, SIGUSR1 );
-  if ( status != -1 )
-    printf( "status = %d\n", status );
-  assert( errno == ENOSYS );
-  puts( "Init: pthread_kill - ENOSYS (signal SA_SIGINFO)" );
-
-  status = pthread_kill( 0, SIGUSR2 );
-  if ( status != -1 )
-    printf( "status = %d\n", status );
-  assert( errno == ESRCH );
-  puts( "Init: pthread_kill - ESRCH (signal SA_SIGINFO)" );
-
-  status = pthread_kill( Init_id, 0 );
-  assert( !status );
-  puts( "Init: pthread_kill - SUCCESSFUL (signal = 0)" );
-
-  act.sa_handler = SIG_IGN;
-  act.sa_flags = 0;
-  sigaction( SIGUSR2, &act, NULL );
-  status = pthread_kill( Init_id, SIGUSR2 );
-  assert( !status );
-  puts( "Init: pthread_kill - SUCCESSFUL (signal = SIG_IGN)" );
-
-  status = kill( 0x7fffffff, SIGUSR1 );
-  if ( status != -1 )
-    printf( "status = %d\n", status );
-  assert( errno == ESRCH );
-  puts( "Init: kill - ESRCH (pid invalid)" );
-
-  status = kill( getpid(), 0 );
-  assert( !status );
-  puts( "Init: kill - SUCCESSFUL (signal = 0)" );
-
-  status = kill( getpid(), 999 );
-  if ( status != -1 )
-    printf( "status = %d\n", status );
-  assert( errno == EINVAL );
-  puts( "Init: kill - EINVAL (sig invalid)" );
-
-  /* exit this thread */
-
-  puts( "*** END OF POSIX TEST 4 ***" );
-  exit( 0 );
-
-  return NULL; /* just so the compiler thinks we returned something */
-}
diff --git a/testsuites/psxtests/psx04/psx04.scn b/testsuites/psxtests/psx04/psx04.scn
deleted file mode 100644
index 83237ec768..0000000000
--- a/testsuites/psxtests/psx04/psx04.scn
+++ /dev/null
@@ -1,112 +0,0 @@
-*** POSIX TEST 4 ***
-Init's ID is 0x0c010001
-Init: sigemptyset -  set= 0x00000000
-Init: sigfillset -  set= 0xffffffff
-Init: sigdelset - delete SIGUSR1 set= 0xffff7fff
-Init: sigismember - FALSE since SIGUSR1 is not a member
-Init: sigismember - TRUE since SIGUSR2 is a member
-Init: send SIGUSR1 to process
-Signal: 16 caught by 0xc010001 (1)
- 
-Init: Block SIGUSR1
-Init: send SIGUSR1 to process
-Signal: 16 caught by 0xc010001 (1)
- 
-Init: Block SIGUSR1
-Init: Signals pending 0x00000000
-Init: send SIGUSR1 to process
-Init: Signals pending 0x00008000
-Init: Unblock SIGUSR1
-Signal: 16 caught by 0xc010001 (2)
- 
-Init: create a thread interested in SIGUSR1
-Init: Block SIGUSR1
-Init: Signals pending 0x00000000
-Init: sleep so the other task can block
-Task_1: sleeping for 5 seconds
-Init: send SIGUSR1 to process
-Init: Signals pending 0x00008000
-Init: sleep so the other task can catch signal
-Signal: 16 caught by 0xc010002 (3)
-Task_1: 4 seconds left
-Task_1: exit
- 
-Init: Unblock SIGALRM
-Init: Firing alarm in 5 seconds
-Init: 0 seconds left on previous alarm
-Init: Firing alarm in 2 seconds
-Init: 4 seconds left on previous alarm
-Init: Wait 4 seconds for alarm
-Signal: 14 caught by 0xc010001 (4)
-Init: 2 seconds left in sleep
- 
-Init: Block SIGUSR1 and SIGUSR2 only
-Init: Previous blocked set was 0x00008000
-Init: Current blocked set is 0x00018000
-Init: Unblock all signals
-Init: Previous blocked set was 0x00018000
- 
-Init: create a thread to send Init SIGUSR1
-Init: sigsuspend for any signal
-Task_2: sending SIGUSR1
-Task_2: exit
-Signal: 16 caught by 0xc010001 (5)
-Init: awakended from sigsuspend status=00000016 
- 
-Init: create a thread to sent Process SIGUSR1 with SA_SIGINFO
-Init: sleep so the Task_3 can sigqueue SIGUSR1
-Task_3: sigqueue SIGUSR1 with value= 16
-Signal_info: 16 caught by 0xc010004 (6) si_signo= 16 si_code= 1 value= 16
- 
-Task_3: sigwaitinfo SIGUSR1 with value= 16
-Init: sigqueue occurred
-Init: Block SIGUSR1
-Init: send SIGUSR1 to process
-Init: sleep so the Task_3 can receive SIGUSR1
-Task_3: si_signo= 16 si_code= 1 value= 0
- 
-Task_3: sigwait SIGUSR1
-Init: Block SIGUSR1
-Init: send SIGUSR1 to process
-Init: sleep so the Task_3 can receive SIGUSR1
-Task_3: signo= 16
- 
-Task_3: pause
-Init: Block SIGUSR2
-Init: send SIGUSR2 to process
-Init: sleep so the Task_3 can receive SIGUSR2
-Task_3: pause= 17
- 
-Task_3: sending SIGUSR2
-Task_3: sleep so the Init task can reguest a signal
-Init: sigsuspend for any signal
-Init: awakended from sigsuspend status=17 
- 
-Init: sigemptyset - EINVAL (set invalid)
-Init: sigfillset - EINVAL (set invalid)
-Init: sigaddset - EINVAL (set invalid)
-Init: sigaddset - SUCCESSFUL (signal = 0)
-Init: sigaddset - EINVAL (set invalid)
-Init: sigdelset - EINVAL (set invalid)
-Init: sigdelset - SUCCESSFUL (signal = 0)
-Init: sigdelset - EINVAL (set invalid)
-Init: sigismember - EINVAL (set invalid)
-Init: sigismember - SUCCESSFUL (signal = 0)
-Init: sigismember - EINVAL (signal invalid)
-Init: sigaction - SUCCESSFUL (signal = 0)
-Init: sigaction - EINVAL (signal invalid)
-Init: sigaction - EINVAL (SIGKILL)
-Init: pthread_sigmask - EINVAL (set and oset invalid)
-Init: pthread_sigmask - EINVAL (how invalid)
-Init: sigpending - EINVAL (set invalid)
-Init: pthread_sigmask - EINVAL (timout->nsec invalid < 0)
-Init: pthread_sigmask - EINVAL (timout->nsec invalid to large)
-Init: pthread_kill - EINVAL (sig invalid)
-Init: pthread_kill - ENOSYS (signal SA_SIGINFO)
-Init: pthread_kill - ESRCH (signal SA_SIGINFO)
-Init: pthread_kill - SUCCESSFUL (signal = 0)
-Init: pthread_kill - SUCCESSFUL (signal = SIG_IGN)
-Init: kill - ESRCH (pid invalid)
-Init: kill - SUCCESSFUL (signal = 0)
-Init: kill - EINVAL (sig invalid)
-*** END OF POSIX TEST 4 ***
diff --git a/testsuites/psxtests/psx04/system.h b/testsuites/psxtests/psx04/system.h
deleted file mode 100644
index 7128f0f807..0000000000
--- a/testsuites/psxtests/psx04/system.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*  system.h
- *
- *  This include file contains information that is included in every
- *  function in the test set.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-/* functions */
-
-#include <pmacros.h>
-
-void *POSIX_Init(
-  void *argument
-);
-
-void *Task_1(
-  void *argument
-);
-
-void *Task_2(
-  void *argument
-);
-
-void *Task_3(
-  void *argument
-);
-
-/* configuration information */
-
-#define CONFIGURE_SPTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_MAXIMUM_POSIX_QUEUED_SIGNALS 5
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#include <confdefs.h>
-
-/* global variables */
-
-#ifdef CONFIGURE_INIT
-#define TEST_EXTERN
-#else
-#define TEST_EXTERN extern
-#endif
-
-TEST_EXTERN pthread_t        Init_id;
-TEST_EXTERN pthread_t        Task1_id;
-TEST_EXTERN pthread_t        Task2_id;
-TEST_EXTERN pthread_t        Task3_id;
-
-/* end of include file */
diff --git a/testsuites/psxtests/psx04/task1.c b/testsuites/psxtests/psx04/task1.c
deleted file mode 100644
index 0f628b95d9..0000000000
--- a/testsuites/psxtests/psx04/task1.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/*  Task_1
- *
- *  This routine serves as a test task.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-#include <signal.h>
-
-void *Task_1(
-  void *argument
-)
-{
-  int seconds;
-
-  printf( "Task_1: sleeping for 5 seconds\n" );
-
-  seconds = sleep( 5 );
-  printf( "Task_1: %d seconds left\n", seconds );
-  assert( seconds );
-
-     /* switch to Init */
-
-  printf( "Task_1: exit\n" );
-  pthread_exit( NULL );
-
-     /* switch to Init */
-
-  return NULL; /* just so the compiler thinks we returned something */
-}
diff --git a/testsuites/psxtests/psx04/task2.c b/testsuites/psxtests/psx04/task2.c
deleted file mode 100644
index fa19e36be9..0000000000
--- a/testsuites/psxtests/psx04/task2.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/*  Task_2
- *
- *  This routine serves as a test task.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-#include <signal.h>
-
-void *Task_2(
-  void *argument
-)
-{
-  int status;
-
-  printf( "Task_2: sending SIGUSR1\n" );
-  status = pthread_kill( Init_id, SIGUSR1 );
-  assert( !status );
-
-     /* switch to Init */
-
-  printf( "Task_2: exit\n" );
-  pthread_exit( NULL );
-
-     /* switch to Init */
-
-  return NULL; /* just so the compiler thinks we returned something */
-}
diff --git a/testsuites/psxtests/psx04/task3.c b/testsuites/psxtests/psx04/task3.c
deleted file mode 100644
index 0c169c099f..0000000000
--- a/testsuites/psxtests/psx04/task3.c
+++ /dev/null
@@ -1,119 +0,0 @@
-/*  Task_3
- *
- *  This routine serves as a test task.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-#include <signal.h>
-
-void *Task_3(
-  void *argument
-)
-{
-  int           status;
-  int           sig;
-  union sigval  value;
-  sigset_t      mask;
-  siginfo_t     info;
-
-  value.sival_int = SIGUSR1;
-
-  printf( "Task_3: sigqueue SIGUSR1 with value= %d\n", value.sival_int );
-  status = sigqueue( getpid(), SIGUSR1, value );
-  assert( !status );
-
-     /* catch signal with sigwaitinfo */
-
-  empty_line();
-
-  status = sigemptyset( &mask );
-  assert( !status );
-
-  status = sigaddset( &mask, SIGUSR1 );
-  assert( !status );
-
-  printf( "Task_3: sigwaitinfo SIGUSR1 with value= %d\n", value.sival_int );
-  status = sigwaitinfo( &mask, &info );
-
-     /* switch to Init */
-
-  assert( !(status==-1) );
-  printf(
-    "Task_3: si_signo= %d si_code= %d value= %d\n",
-    info.si_signo,
-    info.si_code,
-    info.si_value.sival_int
-  );
-
-     /* catch signal with sigwait */
-
-  empty_line();
-
-  status = sigemptyset( &mask );
-  assert( !status );
- 
-  status = sigaddset( &mask, SIGUSR1 );
-  assert( !status );
- 
-  printf( "Task_3: sigwait SIGUSR1\n" );
-  status = sigwait( &mask, &sig );
- 
-     /* switch to Init */
- 
-  assert( !status );
-  printf( "Task_3: signo= %d\n", sig );
-
-     /* catch signal with pause */
- 
-  empty_line();
-
-  status = sigemptyset( &mask );
-  assert( !status );
- 
-  status = sigaddset( &mask, SIGUSR1 );
-  assert( !status );
- 
-  printf( "Task_3: pause\n" );
-  status = pause( );
- 
-     /* switch to Init */
- 
-  assert( !(status==-1) );
-  printf( "Task_3: pause= %d\n", status );
- 
-
-     /* send signal to Init task before it has pended for a signal */
-
-  empty_line();
-
-  printf( "Task_3: sending SIGUSR2\n" );
-  status = pthread_kill( Init_id, SIGUSR2 );
-  assert( !status );
-
-  printf( "Task_3: sleep so the Init task can reguest a signal\n" ); 
-  status = sleep( 1 );
-  assert( !status );
-
-     /* end of task 3 */
-  printf( "Task_3: exit\n" );
-  pthread_exit( NULL );
-
-     /* switch to Init */
-
-  return NULL; /* just so the compiler thinks we returned something */
-}
diff --git a/testsuites/psxtests/psx05/init.c b/testsuites/psxtests/psx05/init.c
deleted file mode 100644
index 08b059310f..0000000000
--- a/testsuites/psxtests/psx05/init.c
+++ /dev/null
@@ -1,569 +0,0 @@
-/* 
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define CONFIGURE_INIT
-#include "system.h"
-#include <errno.h>
-
-#define MUTEX_BAD_ID 0xfffffffe 
-
-void Print_mutexattr(
-  char                *msg,
-  pthread_mutexattr_t *attr
-)
-{
-  int status;
-  int protocol;
-  int prioceiling;
-  int pshared;
-
-  /* protocol */
-
-  status = pthread_mutexattr_getprotocol( attr, &protocol );
-  assert( !status );
-
-  printf( "%smutex protocol is (%d) -- ", msg, protocol );
-  switch ( protocol ) {
-    case PTHREAD_PRIO_NONE:
-      puts( "PTHREAD_PRIO_NONE" );
-      break;
-    case PTHREAD_PRIO_INHERIT:
-      puts( "PTHREAD_PRIO_INHERIT" );
-      break;
-    case PTHREAD_PRIO_PROTECT:
-      puts( "PTHREAD_PRIO_PROTECT" );
-      break;
-    default:
-      puts( "UNKNOWN" );
-      assert( 0 );
-      break;
-  }
-
-  /* priority ceiling */
-
-  status = pthread_mutexattr_getprioceiling( attr, &prioceiling );
-  assert( !status );
-  printf( "%smutex priority ceiling is %d\n", msg, prioceiling );
-
-  /* process shared */
-
-  status = pthread_mutexattr_getpshared( attr, &pshared );
-  assert( !status );
-  printf( "%smutex process shared is (%d) -- ", msg, pshared );
-  switch ( pshared ) {
-    case PTHREAD_PROCESS_PRIVATE:
-      puts( "PTHREAD_PROCESS_PRIVATE" );
-      break;
-    case PTHREAD_PROCESS_SHARED:
-      puts( "PTHREAD_PROCESS_SHARED" );
-      break;
-    default:
-      puts( "UNKNOWN" );
-      assert( 0 );
-      break;
-  }
-}
-
-void *POSIX_Init(
-  void *argument
-)
-{
-  int                  status;
-  pthread_mutexattr_t  attr;
-  pthread_mutexattr_t  destroyed_attr;
-  struct timespec      times;
-  struct sched_param   param;
-  int                  pshared;
-  int                  policy;
-  int                  protocol;
-  int                  ceiling;
-  int                  old_ceiling;
-
-  assert( MUTEX_BAD_ID != PTHREAD_MUTEX_INITIALIZER );
-  Mutex_bad_id = MUTEX_BAD_ID; 
-
-  puts( "\n\n*** POSIX TEST 5 ***" );
-
-  /* set the time of day, and print our buffer in multiple ways */
-
-  set_time( TM_FRIDAY, TM_MAY, 24, 96, 11, 5, 0 );
-
-  /* get id of this thread */
-
-  Init_id = pthread_self();
-  printf( "Init's ID is 0x%08x\n", Init_id );
-  
-  /* tes pthread_mutex_attr_init */
-
-  puts( "Init: pthread_mutexattr_init - EINVAL (NULL attr)" );
-  status = pthread_mutexattr_init( NULL );
-  assert( status == EINVAL );
-
-  puts( "Init: pthread_mutexattr_init - SUCCESSFUL" );
-  status = pthread_mutexattr_init( &attr );
-  assert( !status );
-
-  Print_mutexattr( "Init: ", &attr );
-
-  /* create an "uninitialized" attribute structure */
-
-  status = pthread_mutexattr_init( &destroyed_attr );
-  assert( !status );
-
-  puts( "Init: pthread_mutexattr_destroy - SUCCESSFUL" );
-  status = pthread_mutexattr_destroy( &destroyed_attr );
-  assert( !status );
-
-  puts( "Init: pthread_mutexattr_destroy - EINVAL (NULL attr)" );
-  status = pthread_mutexattr_destroy( NULL );
-  assert( status == EINVAL );
-
-  puts( "Init: pthread_mutexattr_destroy - EINVAL (not initialized)" );
-  status = pthread_mutexattr_destroy( &destroyed_attr );
-  assert( status == EINVAL );
-
-  /* error cases for set and get pshared attribute */
-
-  empty_line();
-
-  puts( "Init: pthread_mutexattr_getpshared - EINVAL (NULL attr)" );
-  status = pthread_mutexattr_getpshared( NULL, &pshared );
-  assert( status == EINVAL );
- 
-  puts( "Init: pthread_mutexattr_getpshared - EINVAL (NULL pshared)" );
-  status = pthread_mutexattr_getpshared( &attr, NULL );
-  assert( status == EINVAL );
- 
-  puts( "Init: pthread_mutexattr_getpshared - EINVAL (not initialized)" );
-  status = pthread_mutexattr_getpshared( &destroyed_attr, &pshared );
-  assert( status == EINVAL );
-
-  pshared = PTHREAD_PROCESS_PRIVATE;
-  puts( "Init: pthread_mutexattr_setpshared - EINVAL (NULL attr)" );
-  status = pthread_mutexattr_setpshared( NULL, pshared );
-  assert( status == EINVAL );
- 
-  pshared = PTHREAD_PROCESS_PRIVATE;
-  puts( "Init: pthread_mutexattr_setpshared - EINVAL (not initialized)" );
-  status = pthread_mutexattr_setpshared( &destroyed_attr, pshared );
-  assert( status == EINVAL );
-
-  /* error cases for set and get protocol attribute */
-
-  empty_line();
-
-  puts( "Init: pthread_mutexattr_getprotocol - EINVAL (NULL attr)" );
-  status = pthread_mutexattr_getprotocol( NULL, &protocol );
-  assert( status == EINVAL );
- 
-  puts( "Init: pthread_mutexattr_getprotocol - EINVAL (NULL protocol)" );
-  status = pthread_mutexattr_getprotocol( &attr, NULL );
-  assert( status == EINVAL );
- 
-  puts( "Init: pthread_mutexattr_getprotocol - EINVAL (not initialized)" );
-  status = pthread_mutexattr_getprotocol( &destroyed_attr, &protocol );
-  assert( status == EINVAL );
- 
-  puts( "Init: pthread_mutexattr_setprotocol - EINVAL (NULL attr)" );
-  status = pthread_mutexattr_setprotocol( NULL, PTHREAD_PRIO_NONE );
-  assert( status == EINVAL );
- 
-  puts( "Init: pthread_mutexattr_setprotocol - EINVAL (invalid protocol)" );
-  status = pthread_mutexattr_setprotocol( &attr, -1 );
-  assert( status == EINVAL );
- 
-  puts( "Init: pthread_mutexattr_setprotocol - EINVAL (not initialized)" );
-  status = pthread_mutexattr_setprotocol( &destroyed_attr, -1 );
-  assert( status == EINVAL );
-
-  /* error cases for set and get prioceiling attribute */
-
-  empty_line();
- 
-  puts( "Init: pthread_mutexattr_getprioceiling - EINVAL (NULL attr)" );
-  status = pthread_mutexattr_getprioceiling( NULL, &ceiling );
-  assert( status == EINVAL );
- 
-  puts( "Init: pthread_mutexattr_getprioceiling - EINVAL (NULL prioceiling)" );
-  status = pthread_mutexattr_getprioceiling( &attr, NULL );
-  assert( status == EINVAL );
- 
-  puts( "Init: pthread_mutexattr_getprioceiling - EINVAL (not initialized)" );
-  status = pthread_mutexattr_getprioceiling( &destroyed_attr, &ceiling );
-  assert( status == EINVAL );
- 
-  puts( "Init: pthread_mutexattr_setprioceiling - EINVAL (NULL attr)" );
-  status = pthread_mutexattr_setprioceiling( NULL, 128 );
-  assert( status == EINVAL );
- 
-  puts( "Init: pthread_mutexattr_setprioceiling - EINVAL (invalid priority)" );
-  status = pthread_mutexattr_setprioceiling( &attr, 512 );
-  if ( status != EINVAL )
-    printf( "status = %d\n", status );
-  assert( status == EINVAL );
- 
-  puts( "Init: pthread_mutexattr_setprioceiling - EINVAL (not initialized)" );
-  status = pthread_mutexattr_setprioceiling( &destroyed_attr, -1 );
-  assert( status == EINVAL );
-
-  /* create a thread */
-
-  status = pthread_create( &Task_id, NULL, Task_1, NULL );
-  assert( !status );
-
-  /* now try some basic mutex operations */
-
-  empty_line();
-
-  puts( "Init: pthread_mutex_init - EINVAL (NULL mutex_id)" );
-  status = pthread_mutex_init( NULL, &attr );
-  assert( status == EINVAL );
-
-  puts( "Init: pthread_mutex_init - EINVAL (not initialized attr)" );
-  status = pthread_mutex_init( &Mutex_id, &destroyed_attr );
-  assert( status == EINVAL );
-
-  /* must get around error checks in attribute set routines */
-  attr.protocol = -1;
-
-  puts( "Init: pthread_mutex_init - EINVAL (bad protocol)" );
-  status = pthread_mutex_init( &Mutex_id, &attr );
-  assert( status == EINVAL );
-
-  /* must get around error checks in attribute set routines */
-  attr.protocol = PTHREAD_PRIO_INHERIT;
-  attr.prio_ceiling = -1;
-
-  puts( "Init: pthread_mutex_init - EINVAL (bad priority ceiling)" );
-  status = pthread_mutex_init( &Mutex_id, &attr );
-  assert( status == EINVAL );
-
-  /* now set up for a success pthread_mutex_init */
-
-  puts( "Init: Resetting mutex attributes" );
-  status = pthread_mutexattr_init( &attr );
-  assert( !status );
-
-  puts( "Init: Changing mutex attributes" );
-  status = pthread_mutexattr_setprotocol( &attr, PTHREAD_PRIO_INHERIT );
-  assert( !status );
- 
-  status = pthread_mutexattr_setprioceiling( &attr, 128 );
-  assert( !status );
- 
-  status = pthread_mutexattr_setpshared( &attr, PTHREAD_PROCESS_SHARED );
-  assert( !status );
- 
-  Print_mutexattr( "Init: ", &attr );
- 
-  puts( "Init: Resetting mutex attributes" );
-  status = pthread_mutexattr_init( &attr );
-  assert( !status );
-
-  puts( "Init: pthread_mutex_init - SUCCESSFUL" );
-  status = pthread_mutex_init( &Mutex_id, &attr );
-  if ( status )
-    printf( "status = %d\n", status );
-  assert( !status );
-
-  puts( "Init: pthread_mutex_init - EBUSY (attempt to initialize an existing mutex)" );
-  status = pthread_mutex_init( &Mutex_id, &attr );
-  if ( !status )
-    printf( "status = %d\n", status );
-  assert( status == EBUSY );
-
-  puts( "Init: pthread_mutex_trylock - EINVAL (illegal ID)" );
-  status = pthread_mutex_trylock( &Mutex_bad_id );
-  if ( status != EINVAL )
-    printf( "status = %d\n", status );
-  assert( status == EINVAL );
-
-  puts( "Init: pthread_mutex_trylock - SUCCESSFUL" );
-  status = pthread_mutex_trylock( &Mutex_id );
-  if ( status )
-    printf( "status = %d\n", status );
-  assert( !status );
-
-  puts( "Init: pthread_mutex_trylock - EDEADLK (already locked)" );
-  status = pthread_mutex_trylock( &Mutex_id );
-  if ( status != EDEADLK )
-    printf( "status = %d\n", status );
-  assert( status == EDEADLK );
-
-  puts( "Init: pthread_mutex_lock - EDEADLK (already locked)" );
-  status = pthread_mutex_lock( &Mutex_id );
-  if ( status != EDEADLK )
-    printf( "status = %d\n", status );
-  assert( status == EDEADLK );
-
-  puts( "Init: Sleep 1 second" );
-
-  sleep( 1 );
-  
-     /* switch to task 1 */
-
-  puts( "Init: pthread_mutex_unlock - EINVAL (invalid id)" );
-  status = pthread_mutex_unlock( &Mutex_bad_id );
-  if ( status != EINVAL )
-    printf( "status = %d\n", status );
-  assert( status == EINVAL );
-
-  puts( "Init: pthread_mutex_unlock - SUCCESSFUL" );
-  status = pthread_mutex_unlock( &Mutex_id );
-  if ( status )
-    printf( "status = %d\n", status );
-  assert( !status );
-
-  puts( "Init: pthread_mutex_unlock - EPERM (not owner)" );
-  status = pthread_mutex_unlock( &Mutex_id );
-  if ( status != EPERM )
-    printf( "status = %d\n", status );
-  assert( status == EPERM );
-
-  times.tv_sec = 0;
-  times.tv_nsec = 500000000;
-  puts( "Init: pthread_mutex_timedlock - time out in 1/2 second" );
-  status = pthread_mutex_timedlock( &Mutex_id, &times );
-  if ( status != EAGAIN )
-    printf( "status = %d\n", status );
-  assert( status == EAGAIN );
-
-     /* switch to idle */
-
-  puts( "Init: pthread_mutex_timedlock - EAGAIN (timeout)" );
-
-  /* destroy a mutex */
-
-  empty_line();
-
-  puts( "Init: pthread_mutex_init - SUCCESSFUL" );
-  status = pthread_mutex_init( &Mutex2_id, &attr );
-  if ( status )
-    printf( "status = %d\n", status );
-  assert( !status );
-
-  puts( "Init: pthread_mutex_init - EAGAIN (too many)" );
-  status = pthread_mutex_init( &Mutex3_id, &attr );
-  assert( status == EAGAIN );
-
-  puts( "Init: pthread_mutexattr_destroy - SUCCESSFUL" );
-  status = pthread_mutexattr_destroy( &attr );
-  assert( !status );
-
-  puts( "Init: pthread_mutex_destroy - SUCCESSFUL" );
-  status = pthread_mutex_destroy( &Mutex2_id );
-  assert( !status );
- 
-  puts( "Init: pthread_mutex_destroy - EINVAL (invalid id)" );
-  status = pthread_mutex_destroy( &Mutex_bad_id );
-  assert( status == EINVAL );
- 
-  /* destroy a busy mutex */
- 
-  empty_line();
- 
-  puts( "Init: pthread_mutexattr_init - SUCCESSFUL" );
-  status = pthread_mutexattr_init( &attr );
-  assert( !status );
-
-  puts( "Init: pthread_mutex_init - SUCCESSFUL" );
-  status = pthread_mutex_init( &Mutex2_id, &attr );
-  assert( !status );
- 
-  puts( "Init: pthread_mutex_trylock - SUCCESSFUL" );
-  status = pthread_mutex_trylock( &Mutex2_id );
-  if ( status )
-    printf( "status = %d\n", status );
-  assert( !status );
-
-  puts( "Init: pthread_mutex_destroy - EBUSY (already locked)" );
-  status = pthread_mutex_destroy( &Mutex2_id );
-  if ( status != EBUSY )
-    printf( "status = %d\n", status );
-  assert( status == EBUSY );
-
-  puts( "Init: pthread_mutex_unlock - SUCCESSFUL" );
-  status = pthread_mutex_unlock( &Mutex2_id );
-  assert( !status );
-
-  puts( "Init: pthread_mutex_destroy - SUCCESSFUL" );
-  status = pthread_mutex_destroy( &Mutex2_id );
-  assert( !status );
-
-  /* priority inherit mutex */
-
-  empty_line();
- 
-  puts( "Init: pthread_mutexattr_init - SUCCESSFUL" );
-  status = pthread_mutexattr_init( &attr );
-  assert( !status );
-
-  puts(
-    "Init: pthread_mutexattr_setprotocol - SUCCESSFUL (PTHREAD_PRIO_INHERIT)"
-  );
-  status = pthread_mutexattr_setprotocol( &attr, PTHREAD_PRIO_INHERIT );
-  assert( !status );
-
-  puts( "Init: pthread_mutex_init - SUCCESSFUL" );
-  status = pthread_mutex_init( &Mutex2_id, &attr );
-  assert( !status );
-
-  puts( "Init: pthread_mutex_trylock - SUCCESSFUL" );
-  status = pthread_mutex_trylock( &Mutex2_id );
-  assert( !status );
-
-  /* create a thread at a lower priority */
- 
-  status = pthread_create( &Task2_id, NULL, Task_2, NULL );
-  assert( !status );
- 
-  /* set priority of Task2 to highest priority */
- 
-  param.sched_priority = 254;
- 
-  puts( "Init: pthread_setschedparam - Setting Task2 priority to highest" );
-  status = pthread_setschedparam( Task2_id, SCHED_FIFO, &param );
-  assert( !status );
-
-  /* switching to Task2 */
-
-  status = pthread_getschedparam( pthread_self(), &policy, &param );
-  assert( !status );
-  printf( "Init: pthread_getschedparam - priority = %d\n", param.sched_priority);
-
-  puts( "Init: pthread_mutex_unlock - SUCCESSFUL" );
-  status = pthread_mutex_unlock( &Mutex2_id );
-  assert( !status );
-  
-  puts( "Init: pthread_mutexattr_destroy - SUCCESSFUL" );
-  status = pthread_mutexattr_destroy( &attr );
-  assert( !status );
-
-  puts( "Init: pthread_mutex_destroy - SUCCESSFUL" );
-  status = pthread_mutex_destroy( &Mutex2_id );
-  assert( !status );
- 
-  /* priority ceiling mutex */
- 
-  empty_line();
- 
-  puts( "Init: pthread_mutexattr_init - SUCCESSFUL" );
-  status = pthread_mutexattr_init( &attr );
-  assert( !status );
- 
-  puts(
-    "Init: pthread_mutexattr_setprotocol - SUCCESSFUL (PTHREAD_PRIO_PROTECT)"
-  );
-  status = pthread_mutexattr_setprotocol( &attr, PTHREAD_PRIO_PROTECT );
-  assert( !status );
- 
-  puts( "Init: pthread_mutex_init - SUCCESSFUL" );
-  status = pthread_mutex_init( &Mutex2_id, &attr );
-  assert( !status );
- 
-  puts( "Init: pthread_mutex_getprioceiling - EINVAL (invalid id)" );
-  status = pthread_mutex_getprioceiling( &Mutex_bad_id, &ceiling );
-  assert( status == EINVAL );
-
-  puts( "Init: pthread_mutex_getprioceiling - EINVAL (NULL ceiling)" );
-  status = pthread_mutex_getprioceiling( &Mutex2_id, NULL );
-  assert( status == EINVAL );
-
-  status = pthread_mutex_getprioceiling( &Mutex2_id, &ceiling );
-  assert( !status );
-  printf( "Init: pthread_mutex_getprioceiling - %d\n", ceiling );
- 
-  puts( "Init: pthread_mutex_setprioceiling - EINVAL (invalid id)" );
-  status = pthread_mutex_setprioceiling( &Mutex_bad_id, 200, &old_ceiling );
-  assert( status == EINVAL );
-
-  puts( "Init: pthread_mutex_setprioceiling - EINVAL (illegal priority)" );
-  status = pthread_mutex_setprioceiling( &Mutex2_id, 512, &old_ceiling );
-  assert( status == EINVAL );
-
-  puts( "Init: pthread_mutex_setprioceiling - EINVAL (NULL ceiling)" );
-  status = pthread_mutex_setprioceiling( &Mutex2_id, 128, NULL );
-  assert( status == EINVAL );
-
-  /* normal cases of set priority ceiling */
-
-  puts( "Init: pthread_mutex_setprioceiling - new ceiling = 200" );
-  status = pthread_mutex_setprioceiling( &Mutex2_id, 200, &old_ceiling );
-  assert( !status );
-  printf(
-    "Init: pthread_mutex_setprioceiling - old ceiling = %d\n",old_ceiling
-  );
- 
-  status = pthread_getschedparam( pthread_self(), &policy, &param );
-  assert( !status );
-  printf(
-    "Init: pthread_getschedparam - priority = %d\n", param.sched_priority
-  );
-
-  puts( "Init: pthread_mutex_trylock - SUCCESSFUL" );
-  status = pthread_mutex_trylock( &Mutex2_id );
-  assert( !status );
- 
-  status = pthread_getschedparam( pthread_self(), &policy, &param );
-  assert( !status );
-  printf(
-    "Init: pthread_getschedparam - priority = %d\n", param.sched_priority
-  );
-
-  /* create a thread at a higher priority */
- 
-  status = pthread_create( &Task3_id, NULL, Task_3, NULL );
-  assert( !status );
- 
-  /* set priority of Task3 to highest priority */
- 
-  param.sched_priority = 199;
- 
-  status = pthread_setschedparam( Task3_id, SCHED_FIFO, &param );
-  assert( !status );
-  puts( "Init: pthread_setschedparam - set Task3 priority to highest" );
- 
-  /* DOES NOT SWITCH to Task3 */
-
-  puts( "Init: Sleep 1 second" );
-  assert( !status );
-  sleep( 1 );
-  
-  /* switch to task 3 */
- 
-  puts( "Init: pthread_mutex_unlock - SUCCESSFUL" );
-  status = pthread_mutex_unlock( &Mutex2_id );
-  assert( !status );
- 
-  status = pthread_mutex_getprioceiling( &Mutex2_id, &ceiling );
-  assert( !status );
-  printf( "Init: pthread_mutex_getprioceiling- ceiling = %d\n", ceiling );
- 
-  /* set priority of Init to highest priority */
- 
-  param.sched_priority = 254;
- 
-  status = pthread_setschedparam( Init_id, SCHED_FIFO, &param );
-  assert( !status );
-  puts( "Init: pthread_setschedparam - set Init priority to highest" );
- 
-  puts( "Init: pthread_mutex_lock - EINVAL (priority ceiling violation)" );
-  status = pthread_mutex_lock( &Mutex2_id );
-  if ( status != EINVAL )
-    printf( "status = %d\n", status );
-  assert( status == EINVAL );
-
-  puts( "*** END OF POSIX TEST 5 ***" );
-  exit( 0 );
-
-  return NULL; /* just so the compiler thinks we returned something */
-}
diff --git a/testsuites/psxtests/psx05/psx05.scn b/testsuites/psxtests/psx05/psx05.scn
deleted file mode 100644
index 6e4bc7320d..0000000000
--- a/testsuites/psxtests/psx05/psx05.scn
+++ /dev/null
@@ -1,111 +0,0 @@
-*** POSIX TEST 5 ***
-Init's ID is 0x0c010001
-Init: pthread_mutexattr_init - EINVAL (NULL attr)
-Init: pthread_mutexattr_init - SUCCESSFUL
-Init: mutex protocol is (0) -- PTHREAD_PRIO_NONE
-Init: mutex priority ceiling is 254
-Init: mutex process shared is (0) -- PTHREAD_PROCESS_PRIVATE
-Init: pthread_mutexattr_destroy - SUCCESSFUL
-Init: pthread_mutexattr_destroy - EINVAL (NULL attr)
-Init: pthread_mutexattr_destroy - EINVAL (not initialized)
- 
-Init: pthread_mutexattr_getpshared - EINVAL (NULL attr)
-Init: pthread_mutexattr_getpshared - EINVAL (NULL pshared)
-Init: pthread_mutexattr_getpshared - EINVAL (not initialized)
-Init: pthread_mutexattr_setpshared - EINVAL (NULL attr)
-Init: pthread_mutexattr_setpshared - EINVAL (not initialized)
- 
-Init: pthread_mutexattr_getprotocol - EINVAL (NULL attr)
-Init: pthread_mutexattr_getprotocol - EINVAL (NULL protocol)
-Init: pthread_mutexattr_getprotocol - EINVAL (not initialized)
-Init: pthread_mutexattr_setprotocol - EINVAL (NULL attr)
-Init: pthread_mutexattr_setprotocol - EINVAL (invalid protocol)
-Init: pthread_mutexattr_setprotocol - EINVAL (not initialized)
- 
-Init: pthread_mutexattr_getprioceiling - EINVAL (NULL attr)
-Init: pthread_mutexattr_getprioceiling - EINVAL (NULL prioceiling)
-Init: pthread_mutexattr_getprioceiling - EINVAL (not initialized)
-Init: pthread_mutexattr_setprioceiling - EINVAL (NULL attr)
-Init: pthread_mutexattr_setprioceiling - EINVAL (invalid priority)
-Init: pthread_mutexattr_setprioceiling - EINVAL (not initialized)
- 
-Init: pthread_mutex_init - EINVAL (NULL mutex_id)
-Init: pthread_mutex_init - EINVAL (not initialized attr)
-Init: pthread_mutex_init - EINVAL (bad protocol)
-Init: pthread_mutex_init - EINVAL (bad priority ceiling)
-Init: Resetting mutex attributes
-Init: Changing mutex attributes
-Init: mutex protocol is (1) -- PTHREAD_PRIO_INHERIT
-Init: mutex priority ceiling is 128
-Init: mutex process shared is (1) -- PTHREAD_PROCESS_SHARED
-Init: Resetting mutex attributes
-Init: pthread_mutex_init - SUCCESSFUL
-Init: pthread_mutex_init - EBUSY (attempt to initialize an existing mutex)
-Init: pthread_mutex_trylock - EINVAL (illegal ID)
-Init: pthread_mutex_trylock - SUCCESSFUL
-Init: pthread_mutex_trylock - EDEADLK (already locked)
-Init: pthread_mutex_lock - EDEADLK (already locked)
-Init: Sleep 1 second
-Task: pthread_mutex_trylock already locked
-Task: pthread_mutex_lock unavailable
-Init: pthread_mutex_unlock - EINVAL (invalid id)
-Init: pthread_mutex_unlock - SUCCESSFUL
-Init: pthread_mutex_unlock - EPERM (not owner)
-Init: pthread_mutex_timedlock - time out in 1/2 second
-Task: mutex acquired
-Task: sleep for 2 seconds
-Init: pthread_mutex_timedlock - EAGAIN (timeout)
- 
-Init: pthread_mutex_init - SUCCESSFUL
-Init: pthread_mutex_init - EAGAIN (too many)
-Init: pthread_mutexattr_destroy - SUCCESSFUL
-Init: pthread_mutex_destroy - SUCCESSFUL
-Init: pthread_mutex_destroy - EINVAL (invalid id)
- 
-Init: pthread_mutexattr_init - SUCCESSFUL
-Init: pthread_mutex_init - SUCCESSFUL
-Init: pthread_mutex_trylock - SUCCESSFUL
-Init: pthread_mutex_destroy - EBUSY (already locked)
-Init: pthread_mutex_unlock - SUCCESSFUL
-Init: pthread_mutex_destroy - SUCCESSFUL
- 
-Init: pthread_mutexattr_init - SUCCESSFUL
-Init: pthread_mutexattr_setprotocol - SUCCESSFUL (PTHREAD_PRIO_INHERIT)
-Init: pthread_mutex_init - SUCCESSFUL
-Init: pthread_mutex_trylock - SUCCESSFUL
-Init: pthread_setschedparam - Setting Task2 priority to highest
-Task 2: pthread_mutex_lock unavailable (inherit case)
-Init: pthread_getschedparam - priority = 254
-Init: pthread_mutex_unlock - SUCCESSFUL
-Task 2: mutex acquired
-Task 2: unlock Mutex 2
-Task 2: exit
-Init: pthread_mutexattr_destroy - SUCCESSFUL
-Init: pthread_mutex_destroy - SUCCESSFUL
- 
-Init: pthread_mutexattr_init - SUCCESSFUL
-Init: pthread_mutexattr_setprotocol - SUCCESSFUL (PTHREAD_PRIO_PROTECT)
-Init: pthread_mutex_init - SUCCESSFUL
-Init: pthread_mutex_getprioceiling - EINVAL (invalid id)
-Init: pthread_mutex_getprioceiling - EINVAL (NULL ceiling)
-Init: pthread_mutex_getprioceiling - 254
-Init: pthread_mutex_setprioceiling - EINVAL (invalid id)
-Init: pthread_mutex_setprioceiling - EINVAL (illegal priority)
-Init: pthread_mutex_setprioceiling - EINVAL (NULL ceiling)
-Init: pthread_mutex_setprioceiling - new ceiling = 200
-Init: pthread_mutex_setprioceiling - old ceiling = 1
-Init: pthread_getschedparam - priority = 2
-Init: pthread_mutex_trylock - SUCCESSFUL
-Init: pthread_getschedparam - priority = 200
-Init: pthread_setschedparam - set Task3 priority to highest
-Init: Sleep 1 second
-Task 3: pthread_mutex_lock unavailable (inherit case)
-Init: pthread_mutex_unlock - SUCCESSFUL
-Task 3: mutex acquired
-Task 3: unlock Mutex 2
-Task 3: pthread_getschedparam priority = 199
-Task 3: exit
-Init: pthread_mutex_getprioceiling- ceiling = 200
-Init: pthread_setschedparam - set Init priority to highest
-Init: pthread_mutex_lock - EINVAL (priority ceiling violation)
-*** END OF POSIX TEST 5 ***
diff --git a/testsuites/psxtests/psx05/system.h b/testsuites/psxtests/psx05/system.h
deleted file mode 100644
index 271c7559f8..0000000000
--- a/testsuites/psxtests/psx05/system.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*  system.h
- *
- *  This include file contains information that is included in every
- *  function in the test set.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-/* functions */
-
-#include <pmacros.h>
-
-void *POSIX_Init(
-  void *argument
-);
-
-void *Task_1(
-  void *argument
-);
-
-void *Task_2(
-  void *argument
-);
-
-void *Task_3(
-  void *argument
-);
-
-/* configuration information */
-
-#define CONFIGURE_SPTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#define CONFIGURE_MAXIMUM_POSIX_MUTEXES  2
-
-#include <confdefs.h>
-
-/* global variables */
-
-#ifdef CONFIGURE_INIT
-#define TEST_EXTERN
-#else
-#define TEST_EXTERN extern
-#endif
-
-TEST_EXTERN pthread_t        Init_id;
-TEST_EXTERN pthread_t        Task_id;
-TEST_EXTERN pthread_t        Task2_id;
-TEST_EXTERN pthread_t        Task3_id;
-TEST_EXTERN pthread_mutex_t  Mutex_id;
-TEST_EXTERN pthread_mutex_t  Mutex2_id;
-TEST_EXTERN pthread_mutex_t  Mutex3_id;
-TEST_EXTERN pthread_mutex_t  Mutex_bad_id;
-
-/* end of include file */
diff --git a/testsuites/psxtests/psx05/task.c b/testsuites/psxtests/psx05/task.c
deleted file mode 100644
index 705d288ebe..0000000000
--- a/testsuites/psxtests/psx05/task.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*  Task_1
- *
- *  This routine serves as a test task.  It verifies the basic task
- *  switching capabilities of the executive.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-#include <errno.h>
-
-void *Task_1(
-  void *argument
-)
-{
-  int status;
-
-  printf( "Task: pthread_mutex_trylock already locked\n" );
-  status = pthread_mutex_trylock( &Mutex_id );
-  if ( status != EBUSY )
-    printf( "status = %d\n", status );
-  assert( status == EBUSY );
-
-  printf( "Task: pthread_mutex_lock unavailable\n" );
-  status = pthread_mutex_lock( &Mutex_id );
-  if ( status )
-    printf( "status = %d\n", status );
-  assert( !status );
-
-     /* switch to init */
-
-  printf( "Task: mutex acquired\n" );
-
-  printf( "Task: sleep for 2 seconds\n" );
-  sleep( 2 );
-
-     /* switch to init */
-
-  printf( "Task: exit\n" );
-  pthread_exit( NULL );
-
-     /* switch to Init */
-
-  return NULL; /* just so the compiler thinks we returned something */
-}
diff --git a/testsuites/psxtests/psx05/task2.c b/testsuites/psxtests/psx05/task2.c
deleted file mode 100644
index 4b6a3e38c7..0000000000
--- a/testsuites/psxtests/psx05/task2.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*  Task_2
- *
- *  This routine serves as a test task.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-#include <errno.h>
-
-void *Task_2(
-  void *argument
-)
-{
-  int status;
-
-  printf( "Task 2: pthread_mutex_lock unavailable (inherit case)\n" );
-  status = pthread_mutex_lock( &Mutex2_id );
-  if ( status )
-    printf( "status =%d\n", status );
-  assert( !status );
-  printf( "Task 2: mutex acquired\n" );
-
-     /* switch to init */
-
-  printf( "Task 2: unlock Mutex 2\n" );
-  status = pthread_mutex_unlock( &Mutex2_id );
-  assert( !status );
-
-  printf( "Task 2: exit\n" );
-  pthread_exit( NULL );
-
-     /* switch to Init */
-
-  return NULL; /* just so the compiler thinks we returned something */
-}
diff --git a/testsuites/psxtests/psx05/task3.c b/testsuites/psxtests/psx05/task3.c
deleted file mode 100644
index 5b869ff96f..0000000000
--- a/testsuites/psxtests/psx05/task3.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*  Task_3
- *
- *  This routine serves as a test task.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-#include <errno.h>
-
-void *Task_3(
-  void *argument
-)
-{
-  int                 status;
-  struct sched_param  param;
-  int                 policy;
-
-  printf( "Task 3: pthread_mutex_lock unavailable (inherit case)\n" );
-  status = pthread_mutex_lock( &Mutex2_id );
-  printf( "Task 3: mutex acquired\n" );
-  assert( !status );
-
-  printf( "Task 3: unlock Mutex 2\n" );
-  status = pthread_mutex_unlock( &Mutex2_id );
-  assert( !status );
-
-  status = pthread_getschedparam( pthread_self(), &policy, &param );
-  assert( !status );
-  printf( "Task 3: pthread_getschedparam priority = %d\n", param.sched_priority );
-
-  printf( "Task 3: exit\n" );
-  pthread_exit( NULL );
-
-     /* switch to Init */
-
-  return NULL; /* just so the compiler thinks we returned something */
-}
diff --git a/testsuites/psxtests/psx06/init.c b/testsuites/psxtests/psx06/init.c
deleted file mode 100644
index 913ae2c1f3..0000000000
--- a/testsuites/psxtests/psx06/init.c
+++ /dev/null
@@ -1,121 +0,0 @@
-/* 
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define CONFIGURE_INIT
-#include "system.h"
-#include <errno.h>
-
-void Key_destructor(
-   void *key_data
-)
-{
-  Destructor_invoked++;
-
-  /*
-   *  This checks out that we only run the destructor multiple times
-   *  when the key data is non null.
-   */
-
-  if ( Destructor_invoked == 5 )
-     (void) pthread_setspecific( Key_id, NULL );
-}
-
-void *POSIX_Init(
-  void *argument
-)
-{
-  int               status;
-  unsigned int      remaining;
-  rtems_unsigned32 *key_data;
-
-  puts( "\n\n*** POSIX TEST 6 ***" );
-
-  /* set the time of day, and print our buffer in multiple ways */
-
-  set_time( TM_FRIDAY, TM_MAY, 24, 96, 11, 5, 0 );
-
-  /* get id of this thread */
-
-  Init_id = pthread_self();
-  printf( "Init's ID is 0x%08x\n", Init_id );
-  
-  /* create a couple of threads */
-
-  status = pthread_create( &Task_id, NULL, Task_1, NULL );
-  assert( !status );
-
-  status = pthread_create( &Task2_id, NULL, Task_2, NULL );
-  assert( !status );
-
-  /* create a key */
-
-  empty_line();
-
-  Destructor_invoked = 0;
-  puts( "Init: pthread_key_create - SUCCESSFUL" );
-  status = pthread_key_create( &Key_id, Key_destructor );
-  if ( status )
-    printf( "status = %d\n", status );
-  assert( !status );
-
-  printf( "Destructor invoked %d times\n", Destructor_invoked );
-
-  puts( "Init: pthread_key_create - EAGAIN (too many keys)" );
-  status = pthread_key_create( &Key_id, Key_destructor );
-  assert( status == EAGAIN );
-
-  puts( "Init: pthread_setspecific - EINVAL (invalid key)" );
-  status = pthread_setspecific( -1, &Data_array[ 0 ] );
-  assert( status == EINVAL );
-
-  puts( "Init: pthread_getspecific - EINVAL (invalid key)" );
-  key_data = pthread_getspecific( -1 );
-  assert( !key_data );
-
-  puts( "Init: pthread_key_delete - EINVAL (invalid key)" );
-  status = pthread_key_delete( -1 );
-  assert( status == EINVAL );
-
-  printf( "Init: Setting the key to %d\n", 0 );
-  status = pthread_setspecific( Key_id, &Data_array[ 0 ] );
-  if ( status )
-    printf( "status = %d\n", status );
-  assert( !status );
-
-     /* switch to task 1 */
-
-  key_data = pthread_getspecific( Key_id );
-  printf( "Init: Got the key value of %ld\n",
-          (unsigned long) ((rtems_unsigned32 *)key_data - Data_array) );
-
-  remaining = sleep( 3 );
-  if ( remaining )
-     printf( "seconds remaining = %d\n", remaining );
-  assert( !remaining );
-
-     /* switch to task 1 */
-
-  /* delete the key */
-
-  puts( "Init: pthread_key_delete - SUCCESSFUL" );
-  status = pthread_key_delete( Key_id );
-  if ( status )
-    printf( "status = %d\n", status );
-  assert( !status );
-
-  printf( "Destructor invoked %d times\n", Destructor_invoked );
-
-  puts( "*** END OF POSIX TEST 6 ***" );
-  exit( 0 );
-
-  return NULL; /* just so the compiler thinks we returned something */
-}
diff --git a/testsuites/psxtests/psx06/psx06.scn b/testsuites/psxtests/psx06/psx06.scn
deleted file mode 100644
index a17fa043ee..0000000000
--- a/testsuites/psxtests/psx06/psx06.scn
+++ /dev/null
@@ -1,21 +0,0 @@
-*** POSIX TEST 6 ***
-Init's ID is 0x0c010001
- 
-Init: pthread_key_create - SUCCESSFUL
-Destructor invoked 0 times
-Init: pthread_key_create - EAGAIN (too many keys)
-Init: pthread_setspecific - EINVAL (invalid key)
-Init: pthread_getspecific - EINVAL (invalid key)
-Init: pthread_key_delete - EINVAL (invalid key)
-Init: Setting the key to 0
-Init: Got the key value of 0
-Task_1: Setting the key to 1
-Task_1: Got the key value of 1
-Task_1: exitting
-Destructor invoked 4 times
-Task_2: Setting the key to 2
-Task_2: Got the key value of 2
-Task2: exitting
-Init: pthread_key_delete - SUCCESSFUL
-Destructor invoked 5 times
-*** END OF POSIX TEST 6 ***
diff --git a/testsuites/psxtests/psx06/system.h b/testsuites/psxtests/psx06/system.h
deleted file mode 100644
index c6945ef23a..0000000000
--- a/testsuites/psxtests/psx06/system.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*  system.h
- *
- *  This include file contains information that is included in every
- *  function in the test set.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-/* functions */
-
-#include <pmacros.h>
-
-void *POSIX_Init(
-  void *argument
-);
-
-void *Task_1(
-  void *argument
-);
-
-void *Task_2(
-  void *argument
-);
-
-/* configuration information */
-
-#define CONFIGURE_SPTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#define CONFIGURE_MAXIMUM_POSIX_KEYS     1
-
-#include <confdefs.h>
-
-/* global variables */
-
-#ifdef CONFIGURE_INIT
-#define TEST_EXTERN
-#else
-#define TEST_EXTERN extern
-#endif
-
-TEST_EXTERN pthread_t        Init_id;
-TEST_EXTERN pthread_t        Task_id;
-TEST_EXTERN pthread_t        Task2_id;
-TEST_EXTERN pthread_key_t    Key_id;
-TEST_EXTERN rtems_unsigned32 Data_array[ CONFIGURE_MAXIMUM_POSIX_THREADS ];
-TEST_EXTERN rtems_unsigned32 Destructor_invoked;
-
-/* end of include file */
diff --git a/testsuites/psxtests/psx06/task.c b/testsuites/psxtests/psx06/task.c
deleted file mode 100644
index 0918033b8d..0000000000
--- a/testsuites/psxtests/psx06/task.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*  Task_1
- *
- *  This routine serves as a test task.  It verifies the basic task
- *  switching capabilities of the executive.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-#include <errno.h>
-
-void *Task_1(
-  void *argument
-)
-{
-  int               status;
-  rtems_unsigned32 *key_data; 
-
-  printf( "Task_1: Setting the key to %d\n", 1 );
-  status = pthread_setspecific( Key_id, &Data_array[ 1 ] );
-  if ( status )
-    printf( "status = %d\n", status );
-  assert( !status );
- 
-  key_data = pthread_getspecific( Key_id );
-  printf( "Task_1: Got the key value of %ld\n",
-          (unsigned long) ((rtems_unsigned32 *)key_data - Data_array) );
-  if ( status )
-    printf( "status = %d\n", status );
-  assert( !status );
-
-  puts( "Task_1: exitting" );
-  pthread_exit( NULL );
-
-     /* switch to task 2 */
-
-  return NULL; /* just so the compiler thinks we returned something */
-}
diff --git a/testsuites/psxtests/psx06/task2.c b/testsuites/psxtests/psx06/task2.c
deleted file mode 100644
index ef70e0f0f9..0000000000
--- a/testsuites/psxtests/psx06/task2.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*  Task_2
- *
- *  This routine serves as a test task.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-#include <errno.h>
-
-void *Task_2(
-  void *argument
-)
-{
-  int               status;
-  rtems_unsigned32 *key_data;
- 
-  printf( "Destructor invoked %d times\n", Destructor_invoked );
-
-  printf( "Task_2: Setting the key to %d\n", 2 );
-  status = pthread_setspecific( Key_id, &Data_array[ 2 ] );
-  if ( status )
-    printf( "status = %d\n", status );
-  assert( !status );
- 
-  key_data = pthread_getspecific( Key_id );
-  printf( "Task_2: Got the key value of %ld\n",
-          (unsigned long) ((rtems_unsigned32 *)key_data - Data_array) );
-  if ( status )
-    printf( "status = %d\n", status );
-  assert( !status );
- 
-  puts( "Task2: exitting" );
-  pthread_exit( NULL );
- 
-     /* switch to init task */
- 
-  return NULL; /* just so the compiler thinks we returned something */
-}
diff --git a/testsuites/psxtests/psx07/init.c b/testsuites/psxtests/psx07/init.c
deleted file mode 100644
index f4da65213a..0000000000
--- a/testsuites/psxtests/psx07/init.c
+++ /dev/null
@@ -1,495 +0,0 @@
-/* 
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define CONFIGURE_INIT
-#include "system.h"
-#include <errno.h>
-
-void print_schedparam(
-  char               *prefix,
-  struct sched_param *schedparam
-)
-{
-  printf( "%ssched priority      = %d\n", prefix, schedparam->sched_priority ); 
-#if defined(_POSIX_SPORADIC_SERVER)
-  printf( "%sss_low_priority     = %d\n", prefix, schedparam->ss_low_priority );
-  printf( "%sss_replenish_period = (%ld, %ld)\n", prefix,
-     schedparam->ss_replenish_period.tv_sec,
-     schedparam->ss_replenish_period.tv_nsec );
-  printf( "%sss_initial_budget = (%ld, %ld)\n", prefix,
-     schedparam->ss_initial_budget.tv_sec,
-     schedparam->ss_initial_budget.tv_nsec );
-#else
-  printf( "%s_POSIX_SPORADIC_SERVER is not defined\n" );
-#endif
-}
- 
-extern rtems_configuration_table BSP_Configuration;
-
-void *POSIX_Init(
-  void *argument
-)
-{
-  int                 status;
-  int                 scope;
-  int                 inheritsched;
-  int                 schedpolicy;
-  size_t              stacksize;
-  void               *stackaddr;
-  int                 detachstate;
-  struct sched_param  schedparam;
-  pthread_attr_t      attr;
-  pthread_attr_t      destroyed_attr;
-
-  puts( "\n\n*** POSIX TEST 7 ***" );
-
-  /* set the time of day, and print our buffer in multiple ways */
-
-  set_time( TM_FRIDAY, TM_MAY, 24, 96, 11, 5, 0 );
-
-  /* get id of this thread */
-
-  Init_id = pthread_self();
-  printf( "Init's ID is 0x%08x\n", Init_id );
-  
-  /* exercise init and destroy */
-
-  puts( "Init: pthread_attr_init - EINVAL (NULL attr)" );
-  status = pthread_attr_init( NULL );
-  assert( status == EINVAL );
-
-  puts( "Init: pthread_attr_init - SUCCESSFUL" );
-  status = pthread_attr_init( &attr );
-  assert( !status );
-
-  puts( "Init: initialize and destroy an attribute - SUCCESSFUL" );
-  status = pthread_attr_init( &destroyed_attr );
-  assert( !status );
-
-  status = pthread_attr_destroy( &destroyed_attr );
-  assert( !status );
-
-  puts( "Init: pthread_attr_destroy - EINVAL (NULL attr)" );
-  status = pthread_attr_destroy( NULL );
-  assert( status == EINVAL );
-
-  puts( "Init: pthread_attr_destroy - EINVAL (not initialized)" );
-  status = pthread_attr_destroy( &destroyed_attr );
-  assert( status == EINVAL );
-
-  /* check some errors in pthread_create */
-
-  puts( "Init: pthread_create - EINVAL (attr not initialized)" );
-  status = pthread_create( &Task_id, &destroyed_attr, Task_1, NULL );
-  assert( status == EINVAL );
-
-  /* junk stack address */
-  status = pthread_attr_setstackaddr( &attr, (void *)&schedparam );
-  assert( !status );
- 
-  /* must go around pthread_attr_setstacksize to set a bad stack size */
-  attr.stacksize = 0;
- 
-  puts( "Init: pthread_create - EINVAL (stacksize too small)" );
-  status = pthread_create( &Task_id, &attr, Task_1, NULL );
-  assert( status == EINVAL );
-
-  /* reset all the fields */
-  status = pthread_attr_init( &attr );
-  assert( !status );
-
-  attr.stacksize = BSP_Configuration.work_space_size * 10;
-  puts( "Init: pthread_create - EAGAIN (stacksize too large)" );
-  status = pthread_create( &Task_id, &attr, Task_1, NULL );
-  assert( status == EAGAIN );
-
-  status = pthread_attr_init( &attr );
-  assert( !status );
-
-  /* must go around pthread_attr_set routines to set a bad value */
-  attr.inheritsched = -1;
-  
-  puts( "Init: pthread_create - EINVAL (invalid inherit scheduler)" );
-  status = pthread_create( &Task_id, &attr, Task_1, NULL );
-  assert( status == EINVAL );
-
-  /* check out the error case for system scope not supported */
-
-  status = pthread_attr_init( &attr );
-  assert( !status );
-
-  /* must go around pthread_attr_set routines to set a bad value */
-  attr.contentionscope = PTHREAD_SCOPE_SYSTEM;
-
-  puts( "Init: pthread_create - ENOTSUP (unsupported system contention scope)" );
-  status = pthread_create( &Task_id, &attr, Task_1, NULL );
-  assert( status == ENOTSUP );
-
-  status = pthread_attr_init( &attr );
-  assert( !status );
-
-  /* now check out pthread_create for inherit scheduler */
-
-  status = pthread_attr_setinheritsched( &attr, PTHREAD_INHERIT_SCHED );
-  assert( !status );
-  
-  puts( "Init: pthread_create - SUCCESSFUL (inherit scheduler)" );
-  status = pthread_create( &Task_id, &attr, Task_1, NULL );
-  assert( !status );
-
-  status = pthread_join( Task_id, NULL );
-  assert( !status );
-
-    /* switch to Task_1 */
-
-  /* exercise get and set scope */
-
-  empty_line();
-
-  status = pthread_attr_init( &attr );
-  assert( !status );
-
-  puts( "Init: pthread_attr_setscope - EINVAL (NULL attr)" );
-  status = pthread_attr_setscope( NULL, PTHREAD_SCOPE_PROCESS );
-  assert( status == EINVAL );
-
-  puts( "Init: pthread_attr_setscope - ENOTSUP" );
-  status = pthread_attr_setscope( &attr, PTHREAD_SCOPE_SYSTEM );
-  assert( status == ENOTSUP );
-
-  puts( "Init: pthread_attr_setscope - EINVAL (not initialized attr)" );
-  status = pthread_attr_setscope( &destroyed_attr, PTHREAD_SCOPE_PROCESS );
-  assert( status == EINVAL );
-
-  puts( "Init: pthread_attr_setscope - EINVAL (invalid scope)" );
-  status = pthread_attr_setscope( &attr, -1 );
-  assert( status == EINVAL );
-
-  puts( "Init: pthread_attr_setscope - SUCCESSFUL" );
-  status = pthread_attr_setscope( &attr, PTHREAD_SCOPE_PROCESS );
-  assert( !status );
- 
-  puts( "Init: pthread_attr_getscope - EINVAL (NULL attr)" );
-  status = pthread_attr_getscope( NULL, &scope );
-  assert( status == EINVAL );
- 
-  puts( "Init: pthread_attr_getscope - EINVAL (NULL scope)" );
-  status = pthread_attr_getscope( &attr, NULL );
-  assert( status == EINVAL );
- 
-  puts( "Init: pthread_attr_getscope - EINVAL (not initialized attr)" );
-  status = pthread_attr_getscope( &destroyed_attr, &scope );
-  assert( status == EINVAL );
- 
-  puts( "Init: pthread_attr_getscope - SUCCESSFUL" );
-  status = pthread_attr_getscope( &attr, &scope );
-  assert( !status );
-  printf( "Init: current scope attribute = %d\n", scope );
-
-  /* exercise get and set inherit scheduler */
-
-  empty_line();
-
-  puts( "Init: pthread_attr_setinheritsched - EINVAL (NULL attr)" );
-  status = pthread_attr_setinheritsched( NULL, PTHREAD_INHERIT_SCHED );
-  assert( status == EINVAL );
- 
-  puts( "Init: pthread_attr_setinheritsched - EINVAL (not initialized attr)" );
-  status =
-     pthread_attr_setinheritsched( &destroyed_attr, PTHREAD_INHERIT_SCHED );
-  assert( status == EINVAL );
- 
-  puts( "Init: pthread_attr_setinheritsched - ENOTSUP (invalid inheritsched)" );
-  status = pthread_attr_setinheritsched( &attr, -1 );
-  assert( status == ENOTSUP );
- 
-  puts( "Init: pthread_attr_setinheritsched - SUCCESSFUL" );
-  status = pthread_attr_setinheritsched( &attr, PTHREAD_INHERIT_SCHED );
-  assert( !status );
- 
-  puts( "Init: pthread_attr_getinheritsched - EINVAL (NULL attr)" );
-  status = pthread_attr_getinheritsched( NULL, &inheritsched );
-  assert( status == EINVAL );
- 
-  puts( "Init: pthread_attr_getinheritsched - EINVAL (NULL inheritsched)" );
-  status = pthread_attr_getinheritsched( &attr, NULL );
-  assert( status == EINVAL );
- 
-  puts( "Init: pthread_attr_getinheritsched - EINVAL (not initialized attr)" );
-  status = pthread_attr_getinheritsched( &destroyed_attr, &inheritsched );
-  assert( status == EINVAL );
- 
-  puts( "Init: pthread_attr_getinheritsched - SUCCESSFUL" );
-  status = pthread_attr_getinheritsched( &attr, &inheritsched );
-  assert( !status );
-  printf( "Init: current inherit scheduler attribute = %d\n", inheritsched );
-
-  /* exercise get and set inherit scheduler */
- 
-  empty_line();
- 
-  puts( "Init: pthread_attr_setschedpolicy - EINVAL (NULL attr)" );
-  status = pthread_attr_setschedpolicy( NULL, SCHED_FIFO );
-  assert( status == EINVAL );
- 
-  puts( "Init: pthread_attr_setschedpolicy - EINVAL (not initialized attr)" );
-  status =
-     pthread_attr_setschedpolicy( &destroyed_attr, SCHED_OTHER );
-  assert( status == EINVAL );
- 
-  puts( "Init: pthread_attr_setschedpolicy - ENOTSUP (invalid schedpolicy)" );
-  status = pthread_attr_setschedpolicy( &attr, -1 );
-  assert( status == ENOTSUP );
- 
-  puts( "Init: pthread_attr_setschedpolicy - SUCCESSFUL" );
-  status = pthread_attr_setschedpolicy( &attr, SCHED_RR );
-  assert( !status );
- 
-  puts( "Init: pthread_attr_getschedpolicy - EINVAL (NULL attr)" );
-  status = pthread_attr_getschedpolicy( NULL, &schedpolicy );
-  assert( status == EINVAL );
- 
-  puts( "Init: pthread_attr_getschedpolicy - EINVAL (NULL schedpolicy)" );
-  status = pthread_attr_getschedpolicy( &attr, NULL );
-  assert( status == EINVAL );
- 
-  puts( "Init: pthread_attr_getschedpolicy - EINVAL (not initialized attr)" );
-  status = pthread_attr_getschedpolicy( &destroyed_attr, &schedpolicy );
-  assert( status == EINVAL );
- 
-  puts( "Init: pthread_attr_getschedpolicy - SUCCESSFUL" );
-  status = pthread_attr_getschedpolicy( &attr, &schedpolicy );
-  assert( !status );
-  printf( "Init: current scheduler policy attribute = %d\n", schedpolicy );
- 
-  /* exercise get and set stack size */
- 
-  empty_line();
- 
-  puts( "Init: pthread_attr_setstacksize - EINVAL (NULL attr)" );
-  status = pthread_attr_setstacksize( NULL, 0 );
-  assert( status == EINVAL );
- 
-  puts( "Init: pthread_attr_setstacksize - EINVAL (not initialized attr)" );
-  status =
-     pthread_attr_setstacksize( &destroyed_attr, 0 );
-  assert( status == EINVAL );
- 
-  puts( "Init: pthread_attr_setstacksize - SUCCESSFUL (low stacksize)" );
-  status = pthread_attr_setstacksize( &attr, 0 );
-  assert( !status );
-
-  puts( "Init: pthread_attr_setstacksize - SUCCESSFUL (high stacksize)" );
-  status = pthread_attr_setstacksize( &attr, STACK_MINIMUM_SIZE * 2 );
-  assert( !status );
- 
-  puts( "Init: pthread_attr_getstacksize - EINVAL (NULL attr)" );
-  status = pthread_attr_getstacksize( NULL, &stacksize );
-  assert( status == EINVAL );
- 
-  puts( "Init: pthread_attr_getstacksize - EINVAL (NULL stacksize)" );
-  status = pthread_attr_getstacksize( &attr, NULL );
-  assert( status == EINVAL );
- 
-  puts( "Init: pthread_attr_getstacksize - EINVAL (not initialized attr)" );
-  status = pthread_attr_getstacksize( &destroyed_attr, &stacksize );
-  assert( status == EINVAL );
- 
-  puts( "Init: pthread_attr_getstacksize - SUCCESSFUL" );
-  status = pthread_attr_getstacksize( &attr, &stacksize );
-  assert( !status );
-  printf( "Init: current stack size attribute = %ld\n", (long) stacksize );
-
-  /* exercise get and set stack address */
- 
-  empty_line();
- 
-  puts( "Init: pthread_attr_setstackaddr - EINVAL (NULL attr)" );
-  status = pthread_attr_setstackaddr( NULL, NULL );
-  assert( status == EINVAL );
- 
-  puts( "Init: pthread_attr_setstackaddr - EINVAL (not initialized attr)" );
-  status =
-     pthread_attr_setstackaddr( &destroyed_attr, NULL );
-  assert( status == EINVAL );
- 
-  puts( "Init: pthread_attr_setstackaddr - SUCCESSFUL" );
-  status = pthread_attr_setstackaddr( &attr, 0 );
-  assert( !status );
- 
-  puts( "Init: pthread_attr_getstackaddr - EINVAL (NULL attr)" );
-  status = pthread_attr_getstackaddr( NULL, &stackaddr );
-  assert( status == EINVAL );
- 
-  puts( "Init: pthread_attr_getstackaddr - EINVAL (NULL stackaddr)" );
-  status = pthread_attr_getstackaddr( &attr, NULL );
-  assert( status == EINVAL );
- 
-  puts( "Init: pthread_attr_getstackaddr - EINVAL (not initialized attr)" );
-  status = pthread_attr_getstackaddr( &destroyed_attr, &stackaddr );
-  assert( status == EINVAL );
- 
-  puts( "Init: pthread_attr_getstackaddr - SUCCESSFUL" );
-  status = pthread_attr_getstackaddr( &attr, &stackaddr );
-  assert( !status );
-  printf( "Init: current stack address attribute = %p\n", stackaddr );
- 
-  /* exercise get and set detach state */
- 
-  empty_line();
- 
-  puts( "Init: pthread_attr_setdetachstate - EINVAL (NULL attr)" );
-  status = pthread_attr_setdetachstate( NULL, PTHREAD_CREATE_DETACHED );
-  assert( status == EINVAL );
- 
-  puts( "Init: pthread_attr_setdetachstate - EINVAL (not initialized attr)" );
-  status =
-     pthread_attr_setdetachstate( &destroyed_attr, PTHREAD_CREATE_JOINABLE );
-  assert( status == EINVAL );
- 
-  puts( "Init: pthread_attr_setdetachstate - EINVAL (invalid detachstate)" );
-  status = pthread_attr_setdetachstate( &attr, -1 );
-  assert( status == EINVAL );
- 
-  puts( "Init: pthread_attr_setdetachstate - SUCCESSFUL" );
-  status = pthread_attr_setdetachstate( &attr, PTHREAD_CREATE_JOINABLE );
-  assert( !status );
- 
-  puts( "Init: pthread_attr_getdetachstate - EINVAL (NULL attr)" );
-  status = pthread_attr_getdetachstate( NULL, &detachstate );
-  assert( status == EINVAL );
- 
-  puts( "Init: pthread_attr_getdetachstate - EINVAL (NULL detatchstate)" );
-  status = pthread_attr_getdetachstate( &attr, NULL );
-  assert( status == EINVAL );
- 
-  puts( "Init: pthread_attr_getdetachstate - EINVAL (not initialized attr)" );
-  status = pthread_attr_getdetachstate( &destroyed_attr, &detachstate );
-  assert( status == EINVAL );
- 
-  puts( "Init: pthread_attr_getdetachstate - SUCCESSFUL" );
-  status = pthread_attr_getdetachstate( &attr, &detachstate );
-  assert( !status );
-  printf( "Init: current detach state attribute = %d\n", detachstate );
-
-  /* exercise get and set scheduling parameters */
-
-  empty_line();
-
-  puts( "Init: pthread_attr_getschedparam - SUCCESSFUL" );
-  status = pthread_attr_getschedparam( &attr, &schedparam );
-  assert( !status );
-
-  print_schedparam( "Init: ", &schedparam );
-
-  puts( "Init: pthread_attr_setschedparam - EINVAL (NULL attr)" );
-  status = pthread_attr_setschedparam( NULL, &schedparam );
-  assert( status == EINVAL );
- 
-  puts( "Init: pthread_attr_setschedparam - EINVAL (not initialized attr)" );
-  status = pthread_attr_setschedparam( &destroyed_attr, &schedparam );
-  assert( status == EINVAL );
- 
-  puts( "Init: pthread_attr_setschedparam - EINVAL (NULL schedparam)" );
-  status = pthread_attr_setschedparam( &attr, NULL );
-  assert( status == EINVAL );
- 
-  puts( "Init: pthread_attr_setschedparam - SUCCESSFUL" );
-  status = pthread_attr_setschedparam( &attr, &schedparam );
-  assert( !status );
- 
-  puts( "Init: pthread_attr_getschedparam - EINVAL (NULL attr)" );
-  status = pthread_attr_getschedparam( NULL, &schedparam );
-  assert( status == EINVAL );
- 
-  puts( "Init: pthread_attr_getschedparam - EINVAL (not initialized attr)" );
-  status = pthread_attr_getschedparam( &destroyed_attr, &schedparam );
-  assert( status == EINVAL );
- 
-  puts( "Init: pthread_attr_getschedparam - EINVAL (NULL schedparam)" );
-  status = pthread_attr_getschedparam( &attr, NULL );
-  assert( status == EINVAL );
- 
-  /* exercise pthread_getschedparam */
-
-  empty_line();
-
-  puts( "Init: pthread_getschedparam - EINVAL (NULL policy)" );
-  status = pthread_getschedparam( pthread_self(), NULL, &schedparam );
-  assert( status == EINVAL );
- 
-  puts( "Init: pthread_getschedparam - EINVAL (NULL schedparam)" );
-  status = pthread_getschedparam( pthread_self(), &schedpolicy, NULL );
-  assert( status == EINVAL );
- 
-  puts( "Init: pthread_getschedparam - ESRCH (bad thread)" );
-  status = pthread_getschedparam( -1, &schedpolicy, &schedparam );
-  assert( status == ESRCH );
- 
-  puts( "Init: pthread_getschedparam - SUCCESSFUL" );
-  status = pthread_getschedparam( pthread_self(), &schedpolicy, &schedparam );
-  assert( !status );
- 
-  printf( "Init: policy = %d\n", schedpolicy );
-
-  print_schedparam( "Init: ", &schedparam );
-
-  /* exercise pthread_setschedparam */
-
-  empty_line();
-
-  puts( "Init: pthread_setschedparam - EINVAL (NULL schedparam)" );
-  status = pthread_setschedparam( pthread_self(), SCHED_OTHER, NULL );
-  assert( status == EINVAL );
-
-  schedparam.sched_priority = -1;
-
-  puts( "Init: pthread_setschedparam - EINVAL (invalid priority)" );
-  status = pthread_setschedparam( pthread_self(), SCHED_OTHER, NULL );
-  assert( status == EINVAL );
-
-  schedparam.sched_priority = 128;
-
-  puts( "Init: pthread_setschedparam - EINVAL (invalid policy)" );
-  status = pthread_setschedparam( pthread_self(), -1, &schedparam );
-  assert( status == EINVAL );
-
-  puts( "Init: pthread_setschedparam - ESRCH (invalid thread)" );
-  status = pthread_setschedparam( -1, SCHED_OTHER, &schedparam );
-  assert( status == ESRCH );
-
-  /* now get sporadic server errors */ 
-
-  schedparam.ss_replenish_period.tv_sec = 1;
-  schedparam.ss_replenish_period.tv_nsec = 0;
-  schedparam.ss_initial_budget.tv_sec = 1;
-  schedparam.ss_initial_budget.tv_nsec = 1;
-
-  puts( "Init: pthread_setschedparam - EINVAL (replenish < budget)" );
-  status = pthread_setschedparam( pthread_self(), SCHED_SPORADIC, &schedparam );
-  assert( status == EINVAL );
-
-  schedparam.ss_replenish_period.tv_sec = 2;
-  schedparam.ss_replenish_period.tv_nsec = 0;
-  schedparam.ss_initial_budget.tv_sec = 1;
-  schedparam.ss_initial_budget.tv_nsec = 0;
-  schedparam.ss_low_priority = -1;
-
-  puts( "Init: pthread_setschedparam - EINVAL (invalid priority)" );
-  status = pthread_setschedparam( pthread_self(), SCHED_SPORADIC, &schedparam );
-  assert( status == EINVAL );
-
-  puts( "*** END OF POSIX TEST 7 ***" );
-  exit( 0 );
-
-  return NULL; /* just so the compiler thinks we returned something */
-}
diff --git a/testsuites/psxtests/psx07/psx07.scn b/testsuites/psxtests/psx07/psx07.scn
deleted file mode 100644
index 33f5c68f6a..0000000000
--- a/testsuites/psxtests/psx07/psx07.scn
+++ /dev/null
@@ -1,105 +0,0 @@
-*** POSIX TEST 7 ***
-Init's ID is 0x0c010001
-Init: pthread_attr_init - EINVAL (NULL attr)
-Init: pthread_attr_init - SUCCESSFUL
-Init: initialize and destroy an attribute - SUCCESSFUL
-Init: pthread_attr_destroy - EINVAL (NULL attr)
-Init: pthread_attr_destroy - EINVAL (not initialized)
-Init: pthread_create - EINVAL (attr not initialized)
-Init: pthread_create - EINVAL (stacksize too small)
-Init: pthread_create - EAGAIN (stacksize too large)
-Init: pthread_create - EINVAL (invalid inherit scheduler)
-Init: pthread_create - ENOTSUP (unsupported system contention scope)
-Init: pthread_create - SUCCESSFUL (inherit scheduler)
-Task_1: exitting
- 
-Init: pthread_attr_setscope - EINVAL (NULL attr)
-Init: pthread_attr_setscope - ENOTSUP
-Init: pthread_attr_setscope - EINVAL (not initialized attr)
-Init: pthread_attr_setscope - EINVAL (invalid scope)
-Init: pthread_attr_setscope - SUCCESSFUL
-Init: pthread_attr_getscope - EINVAL (NULL attr)
-Init: pthread_attr_getscope - EINVAL (NULL scope)
-Init: pthread_attr_getscope - EINVAL (not initialized attr)
-Init: pthread_attr_getscope - SUCCESSFUL
-Init: current scope attribute = 0
- 
-Init: pthread_attr_setinheritsched - EINVAL (NULL attr)
-Init: pthread_attr_setinheritsched - EINVAL (not initialized attr)
-Init: pthread_attr_setinheritsched - ENOTSUP (invalid inheritsched)
-Init: pthread_attr_setinheritsched - SUCCESSFUL
-Init: pthread_attr_getinheritsched - EINVAL (NULL attr)
-Init: pthread_attr_getinheritsched - EINVAL (NULL inheritsched)
-Init: pthread_attr_getinheritsched - EINVAL (not initialized attr)
-Init: pthread_attr_getinheritsched - SUCCESSFUL
-Init: current inherit scheduler attribute = 1
- 
-Init: pthread_attr_setschedpolicy - EINVAL (NULL attr)
-Init: pthread_attr_setschedpolicy - EINVAL (not initialized attr)
-Init: pthread_attr_setschedpolicy - ENOTSUP (invalid schedpolicy)
-Init: pthread_attr_setschedpolicy - SUCCESSFUL
-Init: pthread_attr_getschedpolicy - EINVAL (NULL attr)
-Init: pthread_attr_getschedpolicy - EINVAL (NULL schedpolicy)
-Init: pthread_attr_getschedpolicy - EINVAL (not initialized attr)
-Init: pthread_attr_getschedpolicy - SUCCESSFUL
-Init: current scheduler policy attribute = 2
- 
-Init: pthread_attr_setstacksize - EINVAL (NULL attr)
-Init: pthread_attr_setstacksize - EINVAL (not initialized attr)
-Init: pthread_attr_setstacksize - SUCCESSFUL (low stacksize)
-Init: pthread_attr_setstacksize - SUCCESSFUL (high stacksize)
-Init: pthread_attr_getstacksize - EINVAL (NULL attr)
-Init: pthread_attr_getstacksize - EINVAL (NULL stacksize)
-Init: pthread_attr_getstacksize - EINVAL (not initialized attr)
-Init: pthread_attr_getstacksize - SUCCESSFUL
-Init: current stack size attribute = 5120
- 
-Init: pthread_attr_setstackaddr - EINVAL (NULL attr)
-Init: pthread_attr_setstackaddr - EINVAL (not initialized attr)
-Init: pthread_attr_setstackaddr - SUCCESSFUL
-Init: pthread_attr_getstackaddr - EINVAL (NULL attr)
-Init: pthread_attr_getstackaddr - EINVAL (NULL stackaddr)
-Init: pthread_attr_getstackaddr - EINVAL (not initialized attr)
-Init: pthread_attr_getstackaddr - SUCCESSFUL
-Init: current stack address attribute = 0x0
- 
-Init: pthread_attr_setdetachstate - EINVAL (NULL attr)
-Init: pthread_attr_setdetachstate - EINVAL (not initialized attr)
-Init: pthread_attr_setdetachstate - EINVAL (invalid detachstate)
-Init: pthread_attr_setdetachstate - SUCCESSFUL
-Init: pthread_attr_getdetachstate - EINVAL (NULL attr)
-Init: pthread_attr_getdetachstate - EINVAL (NULL detatchstate)
-Init: pthread_attr_getdetachstate - EINVAL (not initialized attr)
-Init: pthread_attr_getdetachstate - SUCCESSFUL
-Init: current detach state attribute = 1
- 
-Init: pthread_attr_getschedparam - SUCCESSFUL
-Init: sched priority      = 2
-Init: ss_low_priority     = 0
-Init: ss_replenish_period = (0, 0)
-Init: ss_initial_budget = (0, 0)
-Init: pthread_attr_setschedparam - EINVAL (NULL attr)
-Init: pthread_attr_setschedparam - EINVAL (not initialized attr)
-Init: pthread_attr_setschedparam - EINVAL (NULL schedparam)
-Init: pthread_attr_setschedparam - SUCCESSFUL
-Init: pthread_attr_getschedparam - EINVAL (NULL attr)
-Init: pthread_attr_getschedparam - EINVAL (not initialized attr)
-Init: pthread_attr_getschedparam - EINVAL (NULL schedparam)
- 
-Init: pthread_getschedparam - EINVAL (NULL policy)
-Init: pthread_getschedparam - EINVAL (NULL schedparam)
-Init: pthread_getschedparam - ESRCH (bad thread)
-Init: pthread_getschedparam - SUCCESSFUL
-Init: policy = 1
-Init: sched priority      = 2
-Init: ss_low_priority     = 0
-Init: ss_replenish_period = (0, 0)
-Init: ss_initial_budget = (0, 0)
- 
-Init: pthread_setschedparam - EINVAL (NULL schedparam)
-Init: pthread_setschedparam - EINVAL (invalid priority)
-Init: pthread_setschedparam - EINVAL (invalid policy)
-Init: pthread_setschedparam - ESRCH (invalid thread)
-Init: pthread_setschedparam - EINVAL (replenish < budget)
-Init: pthread_setschedparam - EINVAL (invalid priority)
-*** END OF POSIX TEST 7 ***
diff --git a/testsuites/psxtests/psx07/system.h b/testsuites/psxtests/psx07/system.h
deleted file mode 100644
index a402b65128..0000000000
--- a/testsuites/psxtests/psx07/system.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*  system.h
- *
- *  This include file contains information that is included in every
- *  function in the test set.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-/* functions */
-
-#include <pmacros.h>
-
-void *POSIX_Init(
-  void *argument
-);
-
-void *Task_1(
-  void *argument
-);
-
-/* configuration information */
-
-#define CONFIGURE_SPTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#include <confdefs.h>
-
-/* global variables */
-
-#ifdef CONFIGURE_INIT
-#define TEST_EXTERN
-#else
-#define TEST_EXTERN extern
-#endif
-
-TEST_EXTERN pthread_t        Init_id;
-TEST_EXTERN pthread_t        Task_id;
-
-/* end of include file */
diff --git a/testsuites/psxtests/psx07/task.c b/testsuites/psxtests/psx07/task.c
deleted file mode 100644
index a477e4ee88..0000000000
--- a/testsuites/psxtests/psx07/task.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/*  Task_1
- *
- *  This routine serves as a test task.  It verifies the basic task
- *  switching capabilities of the executive.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-#include <time.h>
-#include <sched.h>
-
-void *Task_1(
-  void *argument
-)
-{
-  puts( "Task_1: exitting" );
-  pthread_exit( NULL );
-
-  return NULL; /* just so the compiler thinks we returned something */
-}
diff --git a/testsuites/psxtests/psx08/init.c b/testsuites/psxtests/psx08/init.c
deleted file mode 100644
index f1ec5a6b09..0000000000
--- a/testsuites/psxtests/psx08/init.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/* 
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define CONFIGURE_INIT
-#include "system.h"
-#include <errno.h>
-
-void *POSIX_Init(
-  void *argument
-)
-{
-  int    status;
-  void  *return_pointer;
-
-  puts( "\n\n*** POSIX TEST 8 ***" );
-
-  /* set the time of day, and print our buffer in multiple ways */
-
-  set_time( TM_FRIDAY, TM_MAY, 24, 96, 11, 5, 0 );
-
-  /* get id of this thread */
-
-  Init_id = pthread_self();
-  printf( "Init's ID is 0x%08x\n", Init_id );
-
-  puts( "Init: pthread_detach - ESRCH (invalid id)" );
-  status = pthread_detach( -1 );
-  assert( status == ESRCH );
-
-  /* detach this thread */
-
-  puts( "Init: pthread_detach self" );
-  status = pthread_detach( pthread_self() );
-  assert( !status );
-
-  /* create thread */
- 
-  puts( "Init: creating two tasks" );
-  status = pthread_create( &Task_id, NULL, Task_1, NULL );
-  assert( !status );
-  
-  status = pthread_create( &Task2_id, NULL, Task_2, NULL );
-  assert( !status );
-  
-  puts( "Init: pthread_join - ESRCH (invalid id)" );
-  status = pthread_join( -1, &return_pointer );
-  assert( status == ESRCH );
-
-  puts( "Init: pthread_join - SUCCESSFUL" );
-  status = pthread_join( Task_id, &return_pointer );
-  /* assert is below comment */
-
-     /* switch to Task 1 */
-
-  puts( "Init: returned from pthread_join" );
-  if ( status )
-    printf( "status = %d\n", status );
-  assert( !status );
-
-  if ( return_pointer == &Task_id )
-    puts( "Init: pthread_join returned correct pointer" );
-  else
-    printf(
-      "Init: pthread_join returned incorrect pointer (%p != %p)\n",
-      return_pointer,
-      &Task_id
-    );
-  
-  puts( "Init: exitting" );
-  pthread_exit( NULL );
-
-  return NULL; /* just so the compiler thinks we returned something */
-}
diff --git a/testsuites/psxtests/psx08/psx08.scn b/testsuites/psxtests/psx08/psx08.scn
deleted file mode 100644
index 34c1934f59..0000000000
--- a/testsuites/psxtests/psx08/psx08.scn
+++ /dev/null
@@ -1,18 +0,0 @@
-*** POSIX TEST 8 ***
-Init's ID is 0x0c010001
-Init: pthread_detach - ESRCH (invalid id)
-Init: pthread_detach self
-Init: creating two tasks
-Init: pthread_join - ESRCH (invalid id)
-Init: pthread_join - SUCCESSFUL
-Task_1: sleep 1 second
-Task_2: join to Task_1
-Task_1: join to detached task (Init) -- EINVAL
-Task_1: join to self task (Init) -- EDEADLK
-Task_1: exitting
-Init: returned from pthread_join
-Init: pthread_join returned correct pointer
-Init: exitting
-Task_2: returned from pthread_join
-Task_2: pthread_join returned correct pointer
-*** END OF POSIX TEST 8 ***
diff --git a/testsuites/psxtests/psx08/system.h b/testsuites/psxtests/psx08/system.h
deleted file mode 100644
index 18c0c49f35..0000000000
--- a/testsuites/psxtests/psx08/system.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*  system.h
- *
- *  This include file contains information that is included in every
- *  function in the test set.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-/* functions */
-
-#include <pmacros.h>
-
-void *POSIX_Init(
-  void *argument
-);
-
-void *Task_1(
-  void *argument
-);
-
-void *Task_2(
-  void *argument
-);
-
-/* configuration information */
-
-#define CONFIGURE_SPTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#include <confdefs.h>
-
-/* global variables */
-
-#ifdef CONFIGURE_INIT
-#define TEST_EXTERN
-#else
-#define TEST_EXTERN extern
-#endif
-
-TEST_EXTERN pthread_t        Init_id;
-TEST_EXTERN pthread_t        Task_id;
-TEST_EXTERN pthread_t        Task2_id;
-
-/* end of include file */
diff --git a/testsuites/psxtests/psx08/task2.c b/testsuites/psxtests/psx08/task2.c
deleted file mode 100644
index 028df4cb91..0000000000
--- a/testsuites/psxtests/psx08/task2.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*  Task_2
- *
- *  This routine serves as a test task.  It verifies the basic task
- *  switching capabilities of the executive.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-#include <errno.h>
-
-void *Task_2(
-  void *argument
-)
-{
-  int   status;
-  void  *return_pointer;
-
-  puts( "Task_2: join to Task_1" );
-  status = pthread_join( Task_id, &return_pointer );
-  puts( "Task_2: returned from pthread_join" );
-  if ( status )
-    printf( "status = %d\n", status );
-  assert( !status );
- 
-  if ( return_pointer == &Task_id )
-    puts( "Task_2: pthread_join returned correct pointer" );
-  else
-    printf(
-      "Task_2: pthread_join returned incorrect pointer (%p != %p)\n",
-      return_pointer,
-      &Task_id
-    );
-
-  puts( "*** END OF POSIX TEST 8 ***" );
-  exit( 0 );
-
-  return NULL; /* just so the compiler thinks we returned something */
-}
diff --git a/testsuites/psxtests/psx09/init.c b/testsuites/psxtests/psx09/init.c
deleted file mode 100644
index b4856583cf..0000000000
--- a/testsuites/psxtests/psx09/init.c
+++ /dev/null
@@ -1,226 +0,0 @@
-/* 
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define CONFIGURE_INIT
-#include "system.h"
-#include <errno.h>
-
-void print_schedparam(
-  char               *prefix,
-  struct sched_param *schedparam
-)
-{
-  printf( "%ssched priority      = %d\n", prefix, schedparam->sched_priority );
-#if defined(_POSIX_SPORADIC_SERVER)
-  printf( "%sss_low_priority     = %d\n", prefix, schedparam->ss_low_priority );
-  printf( "%sss_replenish_period = (%ld, %ld)\n", prefix,
-     schedparam->ss_replenish_period.tv_sec,
-     schedparam->ss_replenish_period.tv_nsec );
-  printf( "%sss_initial_budget = (%ld, %ld)\n", prefix,
-     schedparam->ss_initial_budget.tv_sec,
-     schedparam->ss_initial_budget.tv_nsec );
-#else
-  printf( "%s_POSIX_SPORADIC_SERVER is not defined\n" );
-#endif
-}
-
-void *POSIX_Init(
-  void *argument
-)
-{
-  int                  status;
-  int                  passes;
-  int                  schedpolicy;
-  int                  priority;
-  struct sched_param   schedparam;
-  char                 buffer[ 80 ];
-  pthread_mutexattr_t  attr;
-
-  puts( "\n\n*** POSIX TEST 9 ***" );
-
-  /* set the time of day, and print our buffer in multiple ways */
-
-  set_time( TM_FRIDAY, TM_MAY, 24, 96, 11, 5, 0 );
-
-  /* get id of this thread */
-
-  Init_id = pthread_self();
-  printf( "Init's ID is 0x%08x\n", Init_id );
-  
-  /* try to use this thread as a sporadic server */
-
-  puts( "Init: pthread_getschedparam - SUCCESSFUL" );
-  status = pthread_getschedparam( pthread_self(), &schedpolicy, &schedparam );
-  assert( !status );
-
-  priority = schedparam.sched_priority;
-  sprintf( buffer, " - current priority = %d", priority );
-  print_current_time( "Init: ", buffer );
-
-  schedparam.ss_replenish_period.tv_sec = 0;
-  schedparam.ss_replenish_period.tv_nsec = 500000000;  /* 1/2 second */
-  schedparam.ss_initial_budget.tv_sec = 0;
-  schedparam.ss_initial_budget.tv_nsec = 250000000;    /* 1/4 second */
-
-  schedparam.sched_priority = 200;
-  schedparam.ss_low_priority = 100;
-
-  puts( "Init: pthread_setschedparam - SUCCESSFUL (sporadic server)" );
-  status = pthread_setschedparam( pthread_self(), SCHED_SPORADIC, &schedparam );
-  assert( !status );
-
-  status = pthread_getschedparam( pthread_self(), &schedpolicy, &schedparam );
-  assert( !status );
-
-  priority = schedparam.sched_priority;
-  sprintf( buffer, " - new priority = %d", priority );
-  print_current_time( "Init: ", buffer );
-
-  /* go into a loop consuming CPU time to watch our priority change */
-
-  for ( passes=0 ; passes <= 3 ; ) {
-    status = pthread_getschedparam( pthread_self(), &schedpolicy, &schedparam );
-    assert( !status );
- 
-    if ( priority != schedparam.sched_priority ) {
-      priority = schedparam.sched_priority;
-      sprintf( buffer, " - new priority = %d", priority );
-      print_current_time( "Init: ", buffer );
-      passes++;
-    }
-  }
-
-  /* now see if this works if we are holding a priority ceiling mutex */
-
-  empty_line();
-
-
-  status = pthread_getschedparam( pthread_self(), &schedpolicy, &schedparam );
-  assert( !status );
-
-  schedparam.ss_replenish_period.tv_sec = 0;
-  schedparam.ss_replenish_period.tv_nsec = 500000000;  /* 1/2 second */
-  schedparam.ss_initial_budget.tv_sec = 0;
-  schedparam.ss_initial_budget.tv_nsec = 250000000;    /* 1/4 second */
-
-#define HIGH_PRIORITY 150
-#define MEDIUM_PRIORITY 131
-#define LOW_PRIORITY 100
-
-  schedparam.sched_priority = HIGH_PRIORITY;
-  schedparam.ss_low_priority = LOW_PRIORITY;
- 
-  puts( "Init: pthread_setschedparam - SUCCESSFUL (sporadic server)" );
-  status = pthread_setschedparam( pthread_self(), SCHED_SPORADIC, &schedparam );
-  assert( !status );
-
-  puts( "Init: Initializing mutex attributes for priority ceiling" );
-  status = pthread_mutexattr_init( &attr );
-  assert( !status );
-
-  status = pthread_mutexattr_setprotocol( &attr, PTHREAD_PRIO_PROTECT );
-  assert( !status );
- 
-  status = pthread_mutexattr_setprioceiling( &attr, MEDIUM_PRIORITY );
-  assert( !status );
- 
-  puts( "Init: Creating a mutex" );
-  status = pthread_mutex_init( &Mutex_id, &attr );
-  if ( status )
-    printf( "status = %d\n", status );
-  assert( !status );
-
-  status = pthread_getschedparam( pthread_self(), &schedpolicy, &schedparam );
-  assert( !status );
- 
-  priority = schedparam.sched_priority;
-  sprintf( buffer, " - new priority = %d", priority );
-  print_current_time( "Init: ", buffer );
-
-  /* go into a loop consuming CPU time to watch our priority lower */
-
-  for ( ; ; ) {
-    status = pthread_getschedparam( pthread_self(), &schedpolicy, &schedparam );
-    assert( !status );
-
-    if ( schedparam.sched_priority != LOW_PRIORITY )
-      continue;
-
-    priority = schedparam.sched_priority;
-    sprintf( buffer, " - new priority = %d", priority );
-    print_current_time( "Init: ", buffer );
-
-    puts( "Init: pthread_mutex_lock acquire the lock" );
-    status = pthread_mutex_lock( &Mutex_id );
-    if ( status )
-      printf( "status = %d\n", status );
-    assert( !status );
-
-    status = pthread_getschedparam( pthread_self(), &schedpolicy, &schedparam );
-    assert( !status );
-
-    priority = schedparam.sched_priority;
-    sprintf( buffer, " - new priority = %d", priority );
-    print_current_time( "Init: ", buffer );
-
-    break;
-  }
-
-  /* now spin waiting for our budget to be replenished */
-
-  for ( ; ; ) {
-    status = pthread_getschedparam( pthread_self(), &schedpolicy, &schedparam );
-    assert( !status );
- 
-    if ( schedparam.sched_priority == HIGH_PRIORITY )
-      break;
-  }
- 
-  priority = schedparam.sched_priority;
-  sprintf( buffer, " - new priority = %d", priority );
-  print_current_time( "Init: ", buffer );
- 
-  /* with this unlock we should be able to go to low priority */
-
-  puts( "Init: unlock mutex" ); 
-  status = pthread_mutex_unlock( &Mutex_id );
-  if ( status )
-    printf( "status = %d\n", status );
-  assert( !status );
-
-  status = pthread_getschedparam( pthread_self(), &schedpolicy, &schedparam );
-  assert( !status );
-
-  priority = schedparam.sched_priority;
-  sprintf( buffer, " - new priority = %d", priority );
-  print_current_time( "Init: ", buffer );
-
-  for ( ; ; ) {
-    status = pthread_getschedparam( pthread_self(), &schedpolicy, &schedparam );
-    assert( !status );
- 
-    if ( schedparam.sched_priority == LOW_PRIORITY )
-      break;
-  }
-
-  status = pthread_getschedparam( pthread_self(), &schedpolicy, &schedparam );
-  assert( !status );
- 
-  priority = schedparam.sched_priority;
-  sprintf( buffer, " - new priority = %d", priority );
-  print_current_time( "Init: ", buffer );
-
-  puts( "*** END OF POSIX TEST 9 ***" );
-  exit( 0 );
-
-  return NULL; /* just so the compiler thinks we returned something */
-}
diff --git a/testsuites/psxtests/psx09/psx09.scn b/testsuites/psxtests/psx09/psx09.scn
deleted file mode 100644
index afc609c456..0000000000
--- a/testsuites/psxtests/psx09/psx09.scn
+++ /dev/null
@@ -1,23 +0,0 @@
-*** POSIX TEST 9 ***
-Init's ID is 0x0c010001
-Init: pthread_getschedparam - SUCCESSFUL
-Init: Fri May 24 11:05:00 1996 - current priority = 2
-Init: pthread_setschedparam - SUCCESSFUL (sporadic server)
-Init: Fri May 24 11:05:00 1996 - new priority = 200
-Init: Fri May 24 11:05:00 1996 - new priority = 100
-Init: Fri May 24 11:05:00 1996 - new priority = 200
-Init: Fri May 24 11:05:00 1996 - new priority = 100
-Init: Fri May 24 11:05:01 1996 - new priority = 200
- 
-Init: pthread_setschedparam - SUCCESSFUL (sporadic server)
-Init: Initializing mutex attributes for priority ceiling
-Init: Creating a mutex
-Init: Fri May 24 11:05:01 1996 - new priority = 150
-Init: Fri May 24 11:05:01 1996 - new priority = 100
-Init: pthread_mutex_lock acquire the lock
-Init: Fri May 24 11:05:01 1996 - new priority = 131
-Init: Fri May 24 11:05:01 1996 - new priority = 150
-Init: unlock mutex
-Init: Fri May 24 11:05:01 1996 - new priority = 150
-Init: Fri May 24 11:05:01 1996 - new priority = 100
-*** END OF POSIX TEST 9 ***
diff --git a/testsuites/psxtests/psx09/system.h b/testsuites/psxtests/psx09/system.h
deleted file mode 100644
index 48197e1589..0000000000
--- a/testsuites/psxtests/psx09/system.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*  system.h
- *
- *  This include file contains information that is included in every
- *  function in the test set.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-/* functions */
-
-#include <pmacros.h>
-
-void *POSIX_Init(
-  void *argument
-);
-
-void *Task_1(
-  void *argument
-);
-
-void *Task_2(
-  void *argument
-);
-
-/* configuration information */
-
-#define CONFIGURE_SPTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#define CONFIGURE_MAXIMUM_POSIX_KEYS     10
-#define CONFIGURE_MAXIMUM_POSIX_MUTEXES  10
-
-#include <confdefs.h>
-
-/* global variables */
-
-#ifdef CONFIGURE_INIT
-#define TEST_EXTERN
-#else
-#define TEST_EXTERN extern
-#endif
-
-TEST_EXTERN pthread_t        Init_id;
-TEST_EXTERN pthread_mutex_t  Mutex_id;
-
-/* end of include file */
diff --git a/testsuites/psxtests/psx10/init.c b/testsuites/psxtests/psx10/init.c
deleted file mode 100644
index 940cfaa27e..0000000000
--- a/testsuites/psxtests/psx10/init.c
+++ /dev/null
@@ -1,312 +0,0 @@
-/* 
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define CONFIGURE_INIT
-#include "system.h"
-#include <sched.h>
-
-
-void *POSIX_Init(
-  void *argument
-)
-{
-  int                 status;
-  pthread_condattr_t  attr;
-  pthread_condattr_t  attr_error;
-  int                 pshared;
-  pthread_cond_t      cond;
-  struct timespec     timeout;
-
-  puts( "\n\n*** POSIX TEST 10 ***" );
-
-  puts( "Init: pthread_condattr_init" );
-  status = pthread_condattr_init( &attr );
-  assert( !status );
-
-  puts( "Init: pthread_condattr_init - EINVAL (attribute invalid)" );
-  status = pthread_condattr_init( NULL );
-  if ( status != EINVAL )
-    printf( "status = %d\n", status );
-  assert( status == EINVAL );
-
-  puts( "Init: pthread_condattr_destroy" );
-  status = pthread_condattr_destroy( &attr );
-  assert( !status );
-
-  puts( "Init: pthread_condattr_destroy - EINVAL (attribute invalid)" );
-  status = pthread_condattr_destroy( NULL );
-  if ( status != EINVAL )
-    printf( "status = %d\n", status );
-  assert( status == EINVAL );
-
-  puts( "Init: pthread_condattr_init" );
-  status = pthread_condattr_init( &attr );
-  assert( !status );
-
-  puts( "Init: pthread_condattr_setpshared - PTHREAD_PROCESS_SHARED" );
-  status = pthread_condattr_setpshared( &attr, PTHREAD_PROCESS_SHARED );
-  assert( !status );
-
-  puts( "Init: pthread_condattr_setpshared - PTHREAD_PROCESS_PRIVATE" );
-  status = pthread_condattr_setpshared( &attr, PTHREAD_PROCESS_PRIVATE );
-  assert( !status );
-
-  status = pthread_condattr_setpshared( NULL, PTHREAD_PROCESS_PRIVATE );
-  if ( status != EINVAL )
-    printf( "status = %d\n", status );
-  assert( status == EINVAL );
-  puts( "Init: pthread_condattr_setpshared - EINVAL (attribute invalid)" );
-
-  status = pthread_condattr_setpshared( &attr, 0xFFFFFF );
-  if ( status != EINVAL )
-    printf( "status = %d\n", status );
-  assert( status == EINVAL );
-  puts( "Init: pthread_condattr_setpshared - EINVAL (pshared invalid)" );
-
-  status = pthread_condattr_getpshared( &attr, &pshared );
-  assert( !status );
-  printf( "Init: pthread_condattr_getpshared - %d\n", pshared );
-
-  status = pthread_condattr_getpshared( NULL, &pshared );
-  if ( status != EINVAL )
-    printf( "status = %d\n", status );
-  assert( status == EINVAL );
-  puts( "Init: pthread_condattr_getpshared - EINVAL (attribute invalid)" );
-
-  puts( "Init: pthread_cond_init - NULL attr" );
-  status = pthread_cond_init( &cond, NULL );
-  assert( !status );
-
-/* error for attribute not initialized */
-
-  attr_error.is_initialized = FALSE;
-  status = pthread_cond_init( &cond, &attr_error );
-  if ( status != EINVAL )
-    printf( "status = %d\n", status );
-  assert( status == EINVAL );
-  puts( "Init: pthread_cond_init - EINVAL (attr not initialized)" );
-
-  status = pthread_cond_init( &cond, NULL );
-  if ( status != ENOMEM )
-    printf( "status = %d\n", status );
-  assert( status == ENOMEM );
-  puts( "Init: pthread_cond_init - ENOMEM (too many conds)" );
-
-  puts( "Init: pthread_cond_destroy" );
-  status = pthread_cond_destroy( &cond );
-  assert( !status );
-
-/* error for bad condition variable passed */
-
-  status = pthread_cond_destroy( NULL );
-  if ( status != EINVAL )
-    printf( "status = %d\n", status );
-  assert( status == EINVAL );
-  puts( "Init: pthread_cond_destroy - EINVAL (cond invalid)" );
-
-/* initiailize the attribute for the rest of the test */
-
-  puts( "Init: pthread_cond_init - attr" );
-  status = pthread_cond_init( &Cond1_id, &attr );
-  assert( !status );
-
-/* signal task1 with a condition variable */
-
-  empty_line();
-
-  status = pthread_create( &Task_id, NULL, Task_1, NULL );
-  assert( !status );
-
-/* switch to task1 to allow it to wait for a condition variable */
-
-  puts( "Init: sleep to switch to Task_1" );
-  sleep( 1 );
-
-  status = pthread_cond_destroy( &Cond1_id );
-  if ( status != EBUSY )
-    printf( "status = %d\n", status );
-  assert( status == EBUSY );
-  puts( "Init: pthread_cond_destroy - EBUSY (task1 waiting)" );
-
-  puts( "Init: pthread_cond_signal" );
-  status = pthread_cond_signal( &Cond1_id );
-  assert( !status );
-
-  empty_line();
-
-  status = pthread_create( &Task2_id, NULL, Task_2, NULL );
-  assert( !status );
-
-/* switch to task1 and task2 to allow them to wait for broadcast signal */
-
-  puts( "Init: sleep - switch to Task_1 and Task_2" );
-  sleep( 1 );
-
-/* broadcast a condition variable to task1 and task2 */
-
-  puts( "Init: pthread_cond_broadcast" );
-  status = pthread_cond_broadcast( &Cond1_id );
-  assert( !status );
-
-  puts( "Init: sleep - switch to Task_1" );
-  sleep( 0 );
-
-/* timedwait case - timeout */
-
-  status = pthread_mutex_lock( &Mutex_id );
-  assert( !status );
-
-/* set timeout to 3 seconds */
-
-  status = clock_gettime( CLOCK_REALTIME, &timeout );
-  assert( !status );
-  timeout.tv_sec += 3;
-  timeout.tv_nsec = 0;
-
-  puts( "Init: pthread_cond_timedwait for 3 seconds" );
-  status = pthread_cond_timedwait( &Cond1_id, &Mutex_id, &timeout );
-  if ( status != ETIMEDOUT )
-    printf( "status = %d\n", status );
-  assert( status == ETIMEDOUT );
-  puts( "Init: pthread_cond_timedwait - ETIMEDOUT - (mutex not acquired)" );
-
-  status = pthread_mutex_unlock( &Mutex_id );
-  assert( !status );
-
-/* remaining error messages */
-
-  empty_line();
-
-/* errors for bad variable passed */
-
-  status = pthread_cond_signal( NULL );
-  if ( status != EINVAL )
-    printf( "status = %d\n", status );
-  assert( status == EINVAL );
-  puts( "Init: pthread_cond_signal - EINVAL (cond invalid)" );
-
-  status = pthread_cond_broadcast( NULL );
-  if ( status != EINVAL )
-    printf( "status = %d\n", status );
-  assert( status == EINVAL );
-  puts( "Init: pthread_cond_broadcast - EINVAL (cond invalid)" );
-
-/* acquire mutex so errors will occur */
-
-  status = pthread_mutex_lock( &Mutex_id );
-  assert( !status );
-
-  status = pthread_cond_wait( NULL, &Mutex_id );
-  if ( status != EINVAL )
-    printf( "status = %d\n", status );
-  assert( status == EINVAL );
-  puts( "Init: pthread_cond_wait - EINVAL (cond invalid)" );
-
-  status = pthread_cond_timedwait( NULL, &Mutex_id, &timeout );
-  if ( status != EINVAL )
-    printf( "status = %d\n", status );
-  assert( status == EINVAL );
-  puts( "Init: pthread_cond_timedwait - EINVAL (cond invalid)" );
-
-  status = pthread_cond_wait( &Cond1_id, NULL );
-  if ( status != EINVAL )
-    printf( "status = %d\n", status );
-  assert( status == EINVAL );
-  puts( "Init: pthread_cond_wait - EINVAL (mutex invalid)" );
- 
-  status = pthread_cond_timedwait( &Cond1_id, NULL, &timeout );
-  if ( status != EINVAL )
-    printf( "status = %d\n", status );
-  assert( status == EINVAL );
-  puts( "Init: pthread_cond_timedwait - EINVAL (mutex invalid)" );
-
-  status = pthread_cond_timedwait( &Cond1_id, &Mutex_id, NULL );
-  if ( status != EINVAL )
-    printf( "status = %d\n", status );
-  assert( status == EINVAL );
-  puts( "Init: pthread_cond_timedwait - EINVAL (abstime NULL)" );
-
-  status = clock_gettime( CLOCK_REALTIME, &timeout );
-  assert( !status );
-  timeout.tv_sec -= 1;
-  status = pthread_cond_timedwait( &Cond1_id, &Mutex_id, &timeout );
-  if ( status != ETIMEDOUT )
-    printf( "status = %d\n", status );
-  assert( status == ETIMEDOUT );
-  puts( "Init: pthread_cond_timedwait - ETIMEDOUT (abstime->tv_sec < current time)" );
-  status = pthread_mutex_unlock( &Mutex_id );
-  assert( !status );
-
-  status = pthread_mutex_lock( &Mutex_id );
-  assert( !status );
-  status = clock_gettime( CLOCK_REALTIME, &timeout );
-  assert( !status );
-  timeout.tv_nsec -= 1;
-  status = pthread_cond_timedwait( &Cond1_id, &Mutex_id, &timeout );
-  if ( status != ETIMEDOUT )
-    printf( "status = %d\n", status );
-  assert( status == ETIMEDOUT );
-  puts( "Init: pthread_cond_timedwait - ETIMEDOUT (abstime->tv_nsec < current time)" );
-  status = pthread_mutex_unlock( &Mutex_id );
-  assert( !status );
-
-/* wait and timedwait without mutex */
-
-/* XXX - this case is commented out in the code pending review
- * 
- *   status = pthread_cond_wait( &Cond1_id, &Mutex_id );
- *   if ( status != EINVAL )
- *     printf( "status = %d\n", status );
- *   assert( status == EINVAL );
- */
-  puts( "Init: pthread_cond_wait - EINVAL (mutex not locked before call)" );
-
-/* XXX - this case is commented out in the code pending review
- * 
- *  status = clock_gettime( CLOCK_REALTIME, &timeout );
- *  assert( !status );
- *  timeout.tv_sec += 1;
- *  status = pthread_cond_timedwait( &Cond1_id, &Mutex_id, &timeout );
- *  if ( status != EINVAL )
- *    printf( "status = %d\n", status );
- *  assert( status == EINVAL );
- */
-  puts( "Init: pthread_cond_timedwait - EINVAL (mutex not locked before call)");
-
-  empty_line();
-
-  status = pthread_create( &Task3_id, NULL, Task_3, NULL );
-  assert( !status );
-
-/* switch to task3 to allow it to wait for broadcast signal */
-
-  puts( "Init: sleep - switch to Task_3" );
-  sleep( 1 );
-
-/* destroy the mutex so Task3 can not acguire at the end of Wait_support */
-
-  status = pthread_mutex_destroy( &Mutex_id );
-  assert( !status );
-
-/* signal a condition variable to task3 */
-
-  puts( "Init: pthread_cond_signal" );
-  status = pthread_cond_signal( &Cond1_id );
-
-  puts( "Init: sleep - switch to Task_3" );
-  sleep( 1 );
-
-  puts( "*** END OF POSIX TEST 10 ***" );
-  exit( 0 );
-
-  return NULL; /* just so the compiler thinks we returned something */
-}
diff --git a/testsuites/psxtests/psx10/psx10.scn b/testsuites/psxtests/psx10/psx10.scn
deleted file mode 100644
index a26432ac6e..0000000000
--- a/testsuites/psxtests/psx10/psx10.scn
+++ /dev/null
@@ -1,59 +0,0 @@
-*** POSIX TEST 10 ***
-Init: pthread_condattr_init
-Init: pthread_condattr_init - EINVAL (attribute invalid)
-Init: pthread_condattr_destroy
-Init: pthread_condattr_destroy - EINVAL (attribute invalid)
-Init: pthread_condattr_init
-Init: pthread_condattr_setpshared - PTHREAD_PROCESS_SHARED
-Init: pthread_condattr_setpshared - PTHREAD_PROCESS_PRIVATE
-Init: pthread_condattr_setpshared - EINVAL (attribute invalid)
-Init: pthread_condattr_setpshared - EINVAL (pshared invalid)
-Init: pthread_condattr_getpshared - 0
-Init: pthread_condattr_getpshared - EINVAL (attribute invalid)
-Init: pthread_cond_init - NULL attr
-Init: pthread_cond_init - EINVAL (attr not initialized)
-Init: pthread_cond_init - ENOMEM (too many conds)
-Init: pthread_cond_destroy
-Init: pthread_cond_destroy - EINVAL (cond invalid)
-Init: pthread_cond_init - attr
- 
-Init: sleep to switch to Task_1
-Task_1: ID is 0x0c010002
-Task_1: pthread_cond_wait
-Init: pthread_cond_destroy - EBUSY (task1 waiting)
-Init: pthread_cond_signal
- 
-Init: sleep - switch to Task_1 and Task_2
-Task_1: back from pthread_cond_wait release mutex
-Task_1: pthread_cond_wait
-Task_2: ID is 0x0c010003
-Task_2: pthread_cond_wait
-Init: pthread_cond_broadcast
-Init: sleep - switch to Task_1
-Task_1: back from pthread_cond_wait release mutex
-Task_1: task exit
-Task_2: back from pthread_cond_wait release mutex
-Task_2: task exit
-Init: pthread_cond_timedwait for 3 seconds
-Init: pthread_cond_timedwait - ETIMEDOUT - (mutex not acquired)
- 
-Init: pthread_cond_signal - EINVAL (cond invalid)
-Init: pthread_cond_broadcast - EINVAL (cond invalid)
-Init: pthread_cond_wait - EINVAL (cond invalid)
-Init: pthread_cond_timedwait - EINVAL (cond invalid)
-Init: pthread_cond_wait - EINVAL (mutex invalid)
-Init: pthread_cond_timedwait - EINVAL (mutex invalid)
-Init: pthread_cond_timedwait - EINVAL (abstime NULL)
-Init: pthread_cond_timedwait - ETIMEDOUT (abstime->tv_sec < current time)
-Init: pthread_cond_timedwait - ETIMEDOUT (abstime->tv_nsec < current time)
-Init: pthread_cond_wait - EINVAL (mutex not locked before call)
-Init: pthread_cond_timedwait - EINVAL (mutex not locked before call)
- 
-Init: sleep - switch to Task_3
-Task_3: ID is 0x0c010004
-Task_3: pthread_cond_wait
-Init: pthread_cond_signal
-Init: sleep - switch to Task_3
-Task_3: pthread_cond_wait - EINVAL (mutex not locked after signal)
-Task_3: task exit
-*** END OF POSIX TEST 10 ***
diff --git a/testsuites/psxtests/psx10/system.h b/testsuites/psxtests/psx10/system.h
deleted file mode 100644
index 9bbdac0f25..0000000000
--- a/testsuites/psxtests/psx10/system.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*  system.h
- *
- *  This include file contains information that is included in every
- *  function in the test set.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-/* functions */
-
-#include <pmacros.h>
-#include <unistd.h>
-#include <errno.h>
-
-void *POSIX_Init(
-  void *argument
-);
-
-void *Task_1(
-  void *argument
-);
-
-void *Task_2(
-  void *argument
-);
-
-void *Task_3(
-  void *argument
-);
-
-/* configuration information */
-
-#define CONFIGURE_SPTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES  1
-
-#define CONFIGURE_MAXIMUM_POSIX_MUTEXES  2
-
-#include <confdefs.h>
-
-/* global variables */
-
-#ifdef CONFIGURE_INIT
-#define TEST_EXTERN
-#else
-#define TEST_EXTERN extern
-#endif
-
-TEST_EXTERN pthread_t        Init_id;
-TEST_EXTERN pthread_t        Task_id;
-TEST_EXTERN pthread_t        Task2_id;
-TEST_EXTERN pthread_t        Task3_id;
-TEST_EXTERN pthread_cond_t   Cond1_id;
-TEST_EXTERN pthread_mutex_t  Mutex_id;
-
-/* end of include file */
diff --git a/testsuites/psxtests/psx10/task.c b/testsuites/psxtests/psx10/task.c
deleted file mode 100644
index 6419b13c3c..0000000000
--- a/testsuites/psxtests/psx10/task.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*  Task_1
- *
- *  This routine serves as a test task.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-void *Task_1(
-  void *argument
-)
-{
-  int  status;
-
-/* wait for a condition variable signal from Init */
-
-  Task_id = pthread_self();
-  printf( "Task_1: ID is 0x%08x\n", Task_id );
-
-  status = pthread_mutex_init( &Mutex_id, NULL );
-  assert( !status );
-
-  status = pthread_mutex_lock( &Mutex_id );
-  assert( !status );
-
-  puts( "Task_1: pthread_cond_wait" );
-  status = pthread_cond_wait( &Cond1_id, &Mutex_id );
-  assert( !status );
-
-  puts( "Task_1: back from pthread_cond_wait release mutex" );
-  status = pthread_mutex_unlock( &Mutex_id );
-  assert( !status );
-
-/* wait for a condition variable broadcast from Init */
-
-  status = pthread_mutex_lock( &Mutex_id );
-  assert( !status );
-
-  puts( "Task_1: pthread_cond_wait" );
-  status = pthread_cond_wait( &Cond1_id, &Mutex_id );
-  assert( !status );
-
-  puts( "Task_1: back from pthread_cond_wait release mutex" );
-  status = pthread_mutex_unlock( &Mutex_id );
-  assert( !status );
-
-  puts( "Task_1: task exit" );
-  pthread_exit( NULL );
-
-  return NULL; /* just so the compiler thinks we returned something */
-}
diff --git a/testsuites/psxtests/psx10/task2.c b/testsuites/psxtests/psx10/task2.c
deleted file mode 100644
index 5095178e6f..0000000000
--- a/testsuites/psxtests/psx10/task2.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*  Task_2
- *
- *  This routine serves as a test task.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-void *Task_2(
-  void *argument
-)
-{
-  int  status;
-
-  Task_id = pthread_self();
-  printf( "Task_2: ID is 0x%08x\n", Task_id );
-
-  status = pthread_mutex_lock( &Mutex_id );
-  assert( !status );
-
-  puts( "Task_2: pthread_cond_wait" );
-  status = pthread_cond_wait( &Cond1_id, &Mutex_id );
-  assert( !status );
-
-  puts( "Task_2: back from pthread_cond_wait release mutex" );
-  status = pthread_mutex_unlock( &Mutex_id );
-  assert( !status );
-
-  puts( "Task_2: task exit" );
-  pthread_exit( NULL );
-
-  return NULL; /* just so the compiler thinks we returned something */
-}
diff --git a/testsuites/psxtests/psx10/task3.c b/testsuites/psxtests/psx10/task3.c
deleted file mode 100644
index d276bf86cb..0000000000
--- a/testsuites/psxtests/psx10/task3.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/*  Task_3
- *
- *  This routine serves as a test task.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-void *Task_3(
-  void *argument
-)
-{
-  int  status;
-
-  Task_id = pthread_self();
-  printf( "Task_3: ID is 0x%08x\n", Task_id );
-
-  status = pthread_mutex_lock( &Mutex_id );
-  assert( !status );
-
-  puts( "Task_3: pthread_cond_wait" );
-  status = pthread_cond_wait( &Cond1_id, &Mutex_id );
-  if ( status != EINVAL )
-    printf( "status = %d\n", status );
-  assert( status == EINVAL );
-  puts( "Task_3: pthread_cond_wait - EINVAL (mutex not locked after signal)");
-
-  puts( "Task_3: task exit" );
-  pthread_exit( NULL );
-
-  return NULL; /* just so the compiler thinks we returned something */
-}
diff --git a/testsuites/psxtests/psx11/init.c b/testsuites/psxtests/psx11/init.c
deleted file mode 100644
index 2a64517935..0000000000
--- a/testsuites/psxtests/psx11/init.c
+++ /dev/null
@@ -1,108 +0,0 @@
-/* 
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define CONFIGURE_INIT
-#include "system.h"
-#include <errno.h>
-
-void *POSIX_Init(
-  void *argument
-)
-{
-  int                  status;
-  struct sched_param   param;
-  pthread_attr_t       attr;
-
-  puts( "\n\n*** POSIX TEST 11 ***" );
-
-  /* set the time of day, and print our buffer in multiple ways */
-
-  set_time( TM_FRIDAY, TM_MAY, 24, 96, 11, 5, 0 );
-
-  /* get id of this thread */
-
-  Init_id = pthread_self();
-  printf( "Init's ID is 0x%08x\n", Init_id );
-  
-  /* exercise pthread_setschedparam */
-
-  param.sched_priority = 127;
-
-  puts( "Init: Setting scheduling parameters to FIFO with priority 127" );
-  status = pthread_setschedparam( Init_id, SCHED_FIFO, &param );
-  assert( !status );
-
-  param.sched_priority = 125;
-
-  puts( "Init: Setting scheduling parameters to RR with priority 125" );
-  status = pthread_setschedparam( Init_id, SCHED_RR, &param );
-  assert( !status );
-
-  param.sched_priority = 121;
-
-  puts( "Init: Setting scheduling parameters to OTHER with priority 121" );
-  status = pthread_setschedparam( Init_id, SCHED_OTHER, &param );
-  assert( !status );
-
-  /* create a thread as SCHED_FIFO */
- 
-  puts( "Init: create a thread of SCHED_FIFO with priority 120" );
-  status = pthread_attr_init( &attr );
-  assert( !status );
- 
-  attr.schedpolicy = SCHED_FIFO;
-  attr.schedparam.sched_priority = 120;
- 
-  status = pthread_create( &Task_id, &attr, Task_1, NULL );
-  assert( !status );
- 
-  puts( "Init: join with the other thread" );
-  status = pthread_join( Task_id, NULL );
-  assert( !status );
-
-  /* create a thread as SCHED_RR */
- 
-  puts( "Init: create a thread of SCHED_RR with priority 120" );
-  status = pthread_attr_init( &attr );
-  assert( !status );
- 
-  attr.schedpolicy = SCHED_RR;
-  attr.schedparam.sched_priority = 120;
- 
-  status = pthread_create( &Task_id, &attr, Task_1, NULL );
-  assert( !status );
- 
-  puts( "Init: join with the other thread" );
-  status = pthread_join( Task_id, NULL );
-  assert( !status );
-
-  /* create a thread as SCHED_OTHER */
-
-  puts( "Init: create a thread of SCHED_OTHER with priority 120" );
-  status = pthread_attr_init( &attr );
-  assert( !status );
-
-  attr.schedpolicy = SCHED_OTHER;
-  attr.schedparam.sched_priority = 120;
-
-  status = pthread_create( &Task_id, &attr, Task_1, NULL );
-  assert( !status );
-
-  puts( "Init: join with the other thread" );
-  status = pthread_join( Task_id, NULL );
-  assert( !status );
-
-  puts( "*** END OF POSIX TEST 11 ***" );
-  exit( 0 );
-
-  return NULL; /* just so the compiler thinks we returned something */
-}
diff --git a/testsuites/psxtests/psx11/psx11.scn b/testsuites/psxtests/psx11/psx11.scn
deleted file mode 100644
index 69df5ec1b9..0000000000
--- a/testsuites/psxtests/psx11/psx11.scn
+++ /dev/null
@@ -1,18 +0,0 @@
-*** POSIX TEST 11 ***
-Init's ID is 0x0c010001
-Init: Setting scheduling parameters to FIFO with priority 127
-Init: Setting scheduling parameters to RR with priority 125
-Init: Setting scheduling parameters to OTHER with priority 121
-Init: create a thread of SCHED_FIFO with priority 120
-Init: join with the other thread
-Task_1: killing time
-Task_1: exitting
-Init: create a thread of SCHED_RR with priority 120
-Init: join with the other thread
-Task_1: killing time
-Task_1: exitting
-Init: create a thread of SCHED_OTHER with priority 120
-Init: join with the other thread
-Task_1: killing time
-Task_1: exitting
-*** END OF POSIX TEST 11 ***
diff --git a/testsuites/psxtests/psx11/system.h b/testsuites/psxtests/psx11/system.h
deleted file mode 100644
index a402b65128..0000000000
--- a/testsuites/psxtests/psx11/system.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*  system.h
- *
- *  This include file contains information that is included in every
- *  function in the test set.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-/* functions */
-
-#include <pmacros.h>
-
-void *POSIX_Init(
-  void *argument
-);
-
-void *Task_1(
-  void *argument
-);
-
-/* configuration information */
-
-#define CONFIGURE_SPTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#include <confdefs.h>
-
-/* global variables */
-
-#ifdef CONFIGURE_INIT
-#define TEST_EXTERN
-#else
-#define TEST_EXTERN extern
-#endif
-
-TEST_EXTERN pthread_t        Init_id;
-TEST_EXTERN pthread_t        Task_id;
-
-/* end of include file */
diff --git a/testsuites/psxtests/psx11/task.c b/testsuites/psxtests/psx11/task.c
deleted file mode 100644
index dbc90cbc58..0000000000
--- a/testsuites/psxtests/psx11/task.c
+++ /dev/null
@@ -1,92 +0,0 @@
-/*  Task_1
- *
- *  This routine serves as a test task.  It verifies the basic task
- *  switching capabilities of the executive.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-#include <time.h>
-#include <sched.h>
-
-void diff_timespec(
-  struct timespec *start,
-  struct timespec *stop,
-  struct timespec *result
-)
-{
-   int nsecs_per_sec = 1000000000;
- 
-   result->tv_sec = stop->tv_sec - start->tv_sec;
-   if ( stop->tv_nsec < start->tv_nsec ) {
-      result->tv_nsec = nsecs_per_sec - start->tv_nsec + stop->tv_nsec;
-      result->tv_sec--;
-   } else
-      result->tv_nsec = stop->tv_nsec - start->tv_nsec;
- 
-}
-
-void *Task_1(
-  void *argument
-)
-{
-  int status;
-  struct timespec start;
-  struct timespec current;
-  struct timespec difference;
-  struct timespec delay;
-
-  status = clock_gettime( CLOCK_REALTIME, &start );
-  assert( !status );
-  
-  status = sched_rr_get_interval( getpid(), &delay );
-  assert( !status );
-
-  /* double the rr interval for confidence */
-
-  delay.tv_sec *= 2;
-  delay.tv_nsec *= 2;
-  if ( delay.tv_nsec >= 1000000000 ) {   /* handle overflow/carry */
-    delay.tv_nsec -= 1000000000;
-    delay.tv_sec++;
-  }
-    
-  
-  puts( "Task_1: killing time" );
-  for ( ; ; ) {
-
-    status = clock_gettime( CLOCK_REALTIME, &current );
-    assert( !status );
-
-    diff_timespec( &start, &current, &difference );
-
-    if ( difference.tv_sec < delay.tv_sec )
-      continue;
-
-    if ( difference.tv_sec > delay.tv_sec )
-      break;
-    
-    if ( difference.tv_nsec > delay.tv_nsec )
-      break;
-    
-  }
-
-  puts( "Task_1: exitting" );
-  pthread_exit( NULL );
-
-  return NULL; /* just so the compiler thinks we returned something */
-}
diff --git a/testsuites/psxtests/psx12/init.c b/testsuites/psxtests/psx12/init.c
deleted file mode 100644
index 17ca4e0f5d..0000000000
--- a/testsuites/psxtests/psx12/init.c
+++ /dev/null
@@ -1,140 +0,0 @@
-/* 
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define CONFIGURE_INIT
-#include "system.h"
-#include <errno.h>
-
-void print_schedparam(
-  char               *prefix,
-  struct sched_param *schedparam
-)
-{
-  printf( "%ssched priority      = %d\n", prefix, schedparam->sched_priority );
-#if defined(_POSIX_SPORADIC_SERVER)
-  printf( "%sss_low_priority     = %d\n", prefix, schedparam->ss_low_priority );
-  printf( "%sss_replenish_period = (%ld, %ld)\n", prefix,
-     schedparam->ss_replenish_period.tv_sec,
-     schedparam->ss_replenish_period.tv_nsec );
-  printf( "%sss_initial_budget = (%ld, %ld)\n", prefix,
-     schedparam->ss_initial_budget.tv_sec,
-     schedparam->ss_initial_budget.tv_nsec );
-#else
-  printf( "%s_POSIX_SPORADIC_SERVER is not defined\n" );
-#endif
-}
-
-void *POSIX_Init(
-  void *argument
-)
-{
-  int                 status;
-  pthread_attr_t      attr;
-  struct sched_param  schedparam;
-
-  puts( "\n\n*** POSIX TEST 12 ***" );
-
-  /* set the time of day, and print our buffer in multiple ways */
-
-  set_time( TM_FRIDAY, TM_MAY, 24, 96, 11, 5, 0 );
-
-  /* get id of this thread */
-
-  Init_id = pthread_self();
-  printf( "Init's ID is 0x%08x\n", Init_id );
-  
-  /* invalid scheduling policy error */
-
-  puts( "Init: pthread_attr_init - SUCCESSFUL" );
-  status = pthread_attr_init( &attr );
-  assert( !status );
-
-  status = pthread_attr_setinheritsched( &attr, PTHREAD_EXPLICIT_SCHED );
-  assert( !status );
-  attr.schedpolicy = -1;
-
-  puts( "Init: pthread_create - EINVAL (invalid scheduling policy)" );
-  status = pthread_create( &Task_id, &attr, Task_1, NULL );
-  assert( status == EINVAL );
-
-  /* replenish period < budget error */
-
-  puts( "Init: pthread_attr_init - SUCCESSFUL" );
-  status = pthread_attr_init( &attr );
-  assert( !status );
-
-  puts( "Init: set scheduling parameter attributes for sporadic server" );
-  status = pthread_attr_setschedpolicy( &attr, SCHED_SPORADIC );
-  assert( !status );
-
-  schedparam.ss_replenish_period.tv_sec = 1;
-  schedparam.ss_replenish_period.tv_nsec = 0;
-  schedparam.ss_initial_budget.tv_sec = 2;
-  schedparam.ss_initial_budget.tv_nsec = 0;
- 
-  schedparam.sched_priority = 200;
-  schedparam.ss_low_priority = 100;
-
-  status = pthread_attr_setschedparam( &attr, &schedparam );
-  assert( !status );
-
-  status = pthread_attr_setinheritsched( &attr, PTHREAD_EXPLICIT_SCHED );
-  assert( !status );
- 
-  puts( "Init: pthread_create - EINVAL (replenish < budget)" );
-  status = pthread_create( &Task_id, &attr, Task_1, NULL );
-  assert( status == EINVAL );
-
-  /* invalid ss_low_priority error */
-
-  schedparam.ss_replenish_period.tv_sec = 2;
-  schedparam.ss_replenish_period.tv_nsec = 0;
-  schedparam.ss_initial_budget.tv_sec = 1;
-  schedparam.ss_initial_budget.tv_nsec = 0;
- 
-  schedparam.sched_priority = 200;
-  schedparam.ss_low_priority = -1;
-
-  status = pthread_attr_setschedparam( &attr, &schedparam );
-  assert( !status );
-
-  puts( "Init: pthread_create - EINVAL (invalid ss_low_priority)" );
-  status = pthread_create( &Task_id, &attr, Task_1, NULL );
-  assert( status == EINVAL );
-
-  /* create a thread as a sporadic server */
-
-  schedparam.ss_replenish_period.tv_sec = 2;
-  schedparam.ss_replenish_period.tv_nsec = 0;
-  schedparam.ss_initial_budget.tv_sec = 1;
-  schedparam.ss_initial_budget.tv_nsec = 0;
- 
-  schedparam.sched_priority = 200;
-  schedparam.ss_low_priority = 100;
- 
-  status = pthread_attr_setschedparam( &attr, &schedparam );
-  assert( !status );
- 
-  puts( "Init: pthread_create - SUCCESSFUL" );
-  status = pthread_create( &Task_id, &attr, Task_1, NULL );
-  assert( !status );
-
-  status = pthread_join( Task_id, NULL );
-  assert( status );
-
-    /* switch to Task_1 */
-
-  puts( "*** END OF POSIX TEST 12 ***" );
-  exit( 0 );
-
-  return NULL; /* just so the compiler thinks we returned something */
-}
diff --git a/testsuites/psxtests/psx12/psx12.scn b/testsuites/psxtests/psx12/psx12.scn
deleted file mode 100644
index fd969cb122..0000000000
--- a/testsuites/psxtests/psx12/psx12.scn
+++ /dev/null
@@ -1,11 +0,0 @@
-*** POSIX TEST 12 ***
-Init's ID is 0x0c010001
-Init: pthread_attr_init - SUCCESSFUL
-Init: pthread_create - EINVAL (invalid scheduling policy)
-Init: pthread_attr_init - SUCCESSFUL
-Init: set scheduling parameter attributes for sporadic server
-Init: pthread_create - EINVAL (replenish < budget)
-Init: pthread_create - EINVAL (invalid ss_low_priority)
-Init: pthread_create - SUCCESSFUL
-Task_1: exitting
-*** END OF POSIX TEST 12 ***
diff --git a/testsuites/psxtests/psx12/system.h b/testsuites/psxtests/psx12/system.h
deleted file mode 100644
index ebdf74e20b..0000000000
--- a/testsuites/psxtests/psx12/system.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*  system.h
- *
- *  This include file contains information that is included in every
- *  function in the test set.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-/* functions */
-
-#include <pmacros.h>
-
-void *POSIX_Init(
-  void *argument
-);
-
-void *Task_1(
-  void *argument
-);
-
-/* configuration information */
-
-#define CONFIGURE_SPTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-
-#define CONFIGURE_MAXIMUM_POSIX_KEYS     10
-#define CONFIGURE_MAXIMUM_POSIX_MUTEXES  10
-
-#include <confdefs.h>
-
-/* global variables */
-
-#ifdef CONFIGURE_INIT
-#define TEST_EXTERN
-#else
-#define TEST_EXTERN extern
-#endif
-
-TEST_EXTERN pthread_t        Init_id;
-TEST_EXTERN pthread_t        Task_id;
-
-/* end of include file */
diff --git a/testsuites/psxtests/psx12/task.c b/testsuites/psxtests/psx12/task.c
deleted file mode 100644
index a477e4ee88..0000000000
--- a/testsuites/psxtests/psx12/task.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/*  Task_1
- *
- *  This routine serves as a test task.  It verifies the basic task
- *  switching capabilities of the executive.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-#include <time.h>
-#include <sched.h>
-
-void *Task_1(
-  void *argument
-)
-{
-  puts( "Task_1: exitting" );
-  pthread_exit( NULL );
-
-  return NULL; /* just so the compiler thinks we returned something */
-}
diff --git a/testsuites/psxtests/psxhdrs/clock01.c b/testsuites/psxtests/psxhdrs/clock01.c
deleted file mode 100644
index 4677dac3f8..0000000000
--- a/testsuites/psxtests/psxhdrs/clock01.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <time.h>
- 
-#ifndef _POSIX_TIMERS
-#error "rtems is supposed to have clock_gettime"
-#endif
-
-void test( void )
-{
-  clockid_t        clock_id = 0;
-  struct timespec  tp;
-  int              result;
-
-  result = clock_gettime( clock_id, &tp );
-}
diff --git a/testsuites/psxtests/psxhdrs/clock02.c b/testsuites/psxtests/psxhdrs/clock02.c
deleted file mode 100644
index 9bd35c1be6..0000000000
--- a/testsuites/psxtests/psxhdrs/clock02.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <time.h>
- 
-#ifndef _POSIX_TIMERS
-#error "rtems is supposed to have clock_settime"
-#endif
-
-void test( void )
-{
-  clockid_t        clock_id = 0;
-  struct timespec  tp;
-  int              result;
-
-  result = clock_settime( clock_id, &tp );
-}
diff --git a/testsuites/psxtests/psxhdrs/clock03.c b/testsuites/psxtests/psxhdrs/clock03.c
deleted file mode 100644
index 489390fcec..0000000000
--- a/testsuites/psxtests/psxhdrs/clock03.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <time.h>
- 
-#ifndef _POSIX_TIMERS
-#error "rtems is supposed to have clock_getres"
-#endif
-
-void test( void )
-{
-  clockid_t        clock_id = 0;
-  struct timespec  res;
-  int              result;
-
-  result = clock_getres( clock_id, &res );
-}
diff --git a/testsuites/psxtests/psxhdrs/clock04.c b/testsuites/psxtests/psxhdrs/clock04.c
deleted file mode 100644
index 721f73666b..0000000000
--- a/testsuites/psxtests/psxhdrs/clock04.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <time.h>
- 
-#ifndef _POSIX_CPUTIME
-#error "rtems is supposed to have clock_getcpuclockid"
-#endif
-
-void test( void )
-{
-  pid_t      pid = 0;
-  clockid_t  clock_id;
-  int        result;
-
-  result = clock_getcpuclockid( pid, &clock_id );
-}
diff --git a/testsuites/psxtests/psxhdrs/clock05.c b/testsuites/psxtests/psxhdrs/clock05.c
deleted file mode 100644
index 7c862db4a0..0000000000
--- a/testsuites/psxtests/psxhdrs/clock05.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <time.h>
- 
-#ifndef _POSIX_CPUTIME
-#error "rtems is supposed to have clock_setenable_attr"
-#endif
-#ifndef _POSIX_THREAD_CPUTIME
-#error "rtems is supposed to have clock_setenable_attr"
-#endif
-
-void test( void )
-{
-  clockid_t  clock_id = 0;
-  int        attr;
-  int        result;
-
-  attr = CLOCK_ENABLED;
-  attr = CLOCK_DISABLED;
-
-  result = clock_setenable_attr( clock_id, attr );
-}
diff --git a/testsuites/psxtests/psxhdrs/clock06.c b/testsuites/psxtests/psxhdrs/clock06.c
deleted file mode 100644
index 614da056d5..0000000000
--- a/testsuites/psxtests/psxhdrs/clock06.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <time.h>
- 
-#ifndef _POSIX_CPUTIME
-#error "rtems is supposed to have clock_getenable_attr"
-#endif
-#ifndef _POSIX_THREAD_CPUTIME
-#error "rtems is supposed to have clock_getenable_attr"
-#endif
-
-void test( void )
-{
-  clockid_t  clock_id = 0;
-  int        attr;
-  int        result;
-
-  result = clock_getenable_attr( clock_id, &attr );
-}
diff --git a/testsuites/psxtests/psxhdrs/cond01.c b/testsuites/psxtests/psxhdrs/cond01.c
deleted file mode 100644
index 3dfd686313..0000000000
--- a/testsuites/psxtests/psxhdrs/cond01.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <pthread.h>
-
-#ifndef _POSIX_THREADS
-#error "rtems is supposed to have pthread_condattr_init"
-#endif
- 
-void test( void )
-{
-  pthread_condattr_t attribute;
-  int result;
-
-  result = pthread_condattr_init( &attribute );
-}
diff --git a/testsuites/psxtests/psxhdrs/cond02.c b/testsuites/psxtests/psxhdrs/cond02.c
deleted file mode 100644
index 0f0f84ba17..0000000000
--- a/testsuites/psxtests/psxhdrs/cond02.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <pthread.h>
- 
-#ifndef _POSIX_THREADS
-#error "rtems is supposed to have pthread_condattr_destroy"
-#endif
-
-void test( void )
-{
-  pthread_condattr_t attribute;
-  int result;
-
-  result = pthread_condattr_destroy( &attribute );
-}
diff --git a/testsuites/psxtests/psxhdrs/cond03.c b/testsuites/psxtests/psxhdrs/cond03.c
deleted file mode 100644
index a1e848ff82..0000000000
--- a/testsuites/psxtests/psxhdrs/cond03.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <pthread.h>
- 
-#ifndef _POSIX_THREADS
-#error "rtems is supposed to have pthread_cond_init"
-#endif
-
-void test( void )
-{
-  pthread_cond_t     cond = PTHREAD_COND_INITIALIZER;
-  pthread_condattr_t attribute;
-  int result;
-
-  result = pthread_cond_init( &cond, &attribute );
-}
diff --git a/testsuites/psxtests/psxhdrs/cond04.c b/testsuites/psxtests/psxhdrs/cond04.c
deleted file mode 100644
index ebf340182e..0000000000
--- a/testsuites/psxtests/psxhdrs/cond04.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <pthread.h>
- 
-#ifndef _POSIX_THREADS
-#error "rtems is supposed to have pthread_cond_destroy"
-#endif
-
-void test( void )
-{
-  pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
-  int result;
-
-  result = pthread_cond_destroy( &cond );
-}
diff --git a/testsuites/psxtests/psxhdrs/cond05.c b/testsuites/psxtests/psxhdrs/cond05.c
deleted file mode 100644
index 3daf62c66b..0000000000
--- a/testsuites/psxtests/psxhdrs/cond05.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <pthread.h>
- 
-#ifndef _POSIX_THREADS
-#error "rtems is supposed to have pthread_cond_signal"
-#endif
-
-void test( void )
-{
-  pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
-  int result;
-
-  result = pthread_cond_signal( &cond );
-}
diff --git a/testsuites/psxtests/psxhdrs/cond06.c b/testsuites/psxtests/psxhdrs/cond06.c
deleted file mode 100644
index e3a5466264..0000000000
--- a/testsuites/psxtests/psxhdrs/cond06.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <pthread.h>
- 
-#ifndef _POSIX_THREADS
-#error "rtems is supposed to have pthread_cond_wait"
-#endif
-
-void test( void )
-{
-  pthread_cond_t  cond  = PTHREAD_COND_INITIALIZER;
-  pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
-  int result;
-
-  result = pthread_cond_wait( &cond, &mutex );
-}
diff --git a/testsuites/psxtests/psxhdrs/cond07.c b/testsuites/psxtests/psxhdrs/cond07.c
deleted file mode 100644
index e5551d2487..0000000000
--- a/testsuites/psxtests/psxhdrs/cond07.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <pthread.h>
- 
-#ifndef _POSIX_THREADS
-#error "rtems is supposed to have pthread_cond_timedwait"
-#endif
-
-void test( void )
-{
-  pthread_cond_t  cond  = PTHREAD_COND_INITIALIZER;
-  pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
-  struct timespec abstime;
-  int result;
-
-  result = pthread_cond_timedwait( &cond, &mutex, &abstime );
-}
diff --git a/testsuites/psxtests/psxhdrs/cond08.c b/testsuites/psxtests/psxhdrs/cond08.c
deleted file mode 100644
index ff4bc7d233..0000000000
--- a/testsuites/psxtests/psxhdrs/cond08.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <pthread.h>
- 
-#ifndef _POSIX_THREADS
-#error "rtems is supposed to have pthread_condattr_getpshared"
-#endif
-#ifndef _POSIX_THREAD_PROCESS_SHARED
-#error "rtems is supposed to have pthread_condattr_setpshared"
-#endif
-
-void test( void )
-{
-  pthread_condattr_t attribute;
-  int                pshared;
-  int                result;
-
-  result = pthread_condattr_getpshared( &attribute, &pshared );
-}
diff --git a/testsuites/psxtests/psxhdrs/cond09.c b/testsuites/psxtests/psxhdrs/cond09.c
deleted file mode 100644
index c563c0a3ef..0000000000
--- a/testsuites/psxtests/psxhdrs/cond09.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <pthread.h>
- 
-#ifndef _POSIX_THREADS
-#error "rtems is supposed to have pthread_condattr_setpshared"
-#endif
-#ifndef _POSIX_THREAD_PROCESS_SHARED
-#error "rtems is supposed to have pthread_condattr_setpshared"
-#endif
-
-void test( void )
-{
-  pthread_condattr_t attribute;
-  int                pshared;
-  int                result;
-
-  pshared = PTHREAD_PROCESS_SHARED;
-  pshared = PTHREAD_PROCESS_PRIVATE;
-
-  result = pthread_condattr_setpshared( &attribute, pshared );
-}
diff --git a/testsuites/psxtests/psxhdrs/cond10.c b/testsuites/psxtests/psxhdrs/cond10.c
deleted file mode 100644
index 01ff0ba63f..0000000000
--- a/testsuites/psxtests/psxhdrs/cond10.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <pthread.h>
- 
-#ifndef _POSIX_THREADS
-#error "rtems is supposed to have pthread_cond_broadcast"
-#endif
-
-void test( void )
-{
-  pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
-  int result;
-
-  result = pthread_cond_broadcast( &cond );
-}
diff --git a/testsuites/psxtests/psxhdrs/key01.c b/testsuites/psxtests/psxhdrs/key01.c
deleted file mode 100644
index 513d81a7c3..0000000000
--- a/testsuites/psxtests/psxhdrs/key01.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <pthread.h>
- 
-#ifndef _POSIX_THREADS
-#error "rtems is supposed to have pthread_key_create"
-#endif
-
-void key_destructor(
-  void *argument
-)
-{
-}
-
-void test( void )
-{
-  pthread_key_t    key;
-  int              result;
-
-  result = pthread_key_create( &key, key_destructor );
-}
diff --git a/testsuites/psxtests/psxhdrs/key02.c b/testsuites/psxtests/psxhdrs/key02.c
deleted file mode 100644
index 85e5f07577..0000000000
--- a/testsuites/psxtests/psxhdrs/key02.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <pthread.h>
- 
-#ifndef _POSIX_THREADS
-#error "rtems is supposed to have pthread_setspecific"
-#endif
-
-void test( void )
-{
-  pthread_key_t    key;
-  int              value;
-  int              result;
-
-  key = 0;
-  value = 0;
-
-  result = pthread_setspecific( key, &value );
-}
diff --git a/testsuites/psxtests/psxhdrs/key03.c b/testsuites/psxtests/psxhdrs/key03.c
deleted file mode 100644
index 62ad1fdc0b..0000000000
--- a/testsuites/psxtests/psxhdrs/key03.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <pthread.h>
- 
-#ifndef _POSIX_THREADS
-#error "rtems is supposed to have pthread_getspecific"
-#endif
-
-void test( void )
-{
-  pthread_key_t    key;
-  void            *value;
-
-  key = 0;
-
-  value = pthread_getspecific( key );
-}
diff --git a/testsuites/psxtests/psxhdrs/key04.c b/testsuites/psxtests/psxhdrs/key04.c
deleted file mode 100644
index d3440106cf..0000000000
--- a/testsuites/psxtests/psxhdrs/key04.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <pthread.h>
- 
-#ifndef _POSIX_THREADS
-#error "rtems is supposed to have pthread_key_delete"
-#endif
-
-void test( void )
-{
-  pthread_key_t    key = 0;
-  int              result;
-
-  result = pthread_key_delete( key );
-}
diff --git a/testsuites/psxtests/psxhdrs/mutex01.c b/testsuites/psxtests/psxhdrs/mutex01.c
deleted file mode 100644
index 318b79b684..0000000000
--- a/testsuites/psxtests/psxhdrs/mutex01.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <pthread.h>
- 
-#ifndef _POSIX_THREADS
-#error "rtems is supposed to have pthread_mutexattr_init"
-#endif
-
-void test( void )
-{
-  pthread_mutexattr_t attribute;
-  int result;
-
-  result = pthread_mutexattr_init( &attribute );
-}
diff --git a/testsuites/psxtests/psxhdrs/mutex02.c b/testsuites/psxtests/psxhdrs/mutex02.c
deleted file mode 100644
index 0d53b8ba1d..0000000000
--- a/testsuites/psxtests/psxhdrs/mutex02.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <pthread.h>
- 
-#ifndef _POSIX_THREADS
-#error "rtems is supposed to have pthread_mutexattr_destroy"
-#endif
-
-void test( void )
-{
-  pthread_mutexattr_t attribute;
-  int result;
-
-  result = pthread_mutexattr_destroy( &attribute );
-}
diff --git a/testsuites/psxtests/psxhdrs/mutex03.c b/testsuites/psxtests/psxhdrs/mutex03.c
deleted file mode 100644
index 8d2d23b871..0000000000
--- a/testsuites/psxtests/psxhdrs/mutex03.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <pthread.h>
- 
-#ifndef _POSIX_THREADS
-#error "rtems is supposed to have pthread_mutex_init"
-#endif
-
-void test( void )
-{
-  pthread_mutex_t     mutex = PTHREAD_MUTEX_INITIALIZER;
-  pthread_mutexattr_t attribute;
-  int result;
-
-  result = pthread_mutex_init( &mutex, &attribute );
-}
diff --git a/testsuites/psxtests/psxhdrs/mutex04.c b/testsuites/psxtests/psxhdrs/mutex04.c
deleted file mode 100644
index ca9b8b8abe..0000000000
--- a/testsuites/psxtests/psxhdrs/mutex04.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <pthread.h>
- 
-#ifndef _POSIX_THREADS
-#error "rtems is supposed to have pthread_mutex_destroy"
-#endif
-
-void test( void )
-{
-  pthread_mutex_t  mutex = PTHREAD_MUTEX_INITIALIZER;
-  int result;
-
-  result = pthread_mutex_destroy( &mutex );
-}
diff --git a/testsuites/psxtests/psxhdrs/mutex05.c b/testsuites/psxtests/psxhdrs/mutex05.c
deleted file mode 100644
index 6b0aa58296..0000000000
--- a/testsuites/psxtests/psxhdrs/mutex05.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <pthread.h>
- 
-#ifndef _POSIX_THREADS
-#error "rtems is supposed to have pthread_mutex_lock"
-#endif
-
-void test( void )
-{
-  pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
-  int result;
-
-  result = pthread_mutex_lock( &mutex );
-}
diff --git a/testsuites/psxtests/psxhdrs/mutex06.c b/testsuites/psxtests/psxhdrs/mutex06.c
deleted file mode 100644
index 9773d02a27..0000000000
--- a/testsuites/psxtests/psxhdrs/mutex06.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <pthread.h>
- 
-#ifndef _POSIX_THREADS
-#error "rtems is supposed to have pthread_mutex_unlock"
-#endif
-
-void test( void )
-{
-  pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
-  int result;
-
-  result = pthread_mutex_unlock( &mutex );
-}
diff --git a/testsuites/psxtests/psxhdrs/mutex07.c b/testsuites/psxtests/psxhdrs/mutex07.c
deleted file mode 100644
index 709b15093d..0000000000
--- a/testsuites/psxtests/psxhdrs/mutex07.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <pthread.h>
- 
-#ifndef _POSIX_THREAD_PRIO_INHERIT
-#error "rtems is supposed to have pthread_mutexattr_setprotocol"
-#endif
-#ifndef _POSIX_THREAD_PRIO_PROTECT
-#error "rtems is supposed to have pthread_mutexattr_setprotocol"
-#endif
-
-void test( void )
-{
-  pthread_mutexattr_t attribute;
-  int                 protocol;
-  int                 result;
-
-  protocol = PTHREAD_PRIO_NONE;
-  protocol = PTHREAD_PRIO_INHERIT;
-  protocol = PTHREAD_PRIO_PROTECT;
-
-  result = pthread_mutexattr_setprotocol( &attribute, protocol );
-}
diff --git a/testsuites/psxtests/psxhdrs/mutex08.c b/testsuites/psxtests/psxhdrs/mutex08.c
deleted file mode 100644
index 119cccc190..0000000000
--- a/testsuites/psxtests/psxhdrs/mutex08.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <pthread.h>
- 
-#ifndef _POSIX_THREAD_PRIO_INHERIT
-#error "rtems is supposed to have pthread_mutexattr_getprioceiling"
-#endif
-#ifndef _POSIX_THREAD_PRIO_PROTECT
-#error "rtems is supposed to have pthread_mutexattr_getprioceiling"
-#endif
-
-void test( void )
-{
-  pthread_mutexattr_t attribute;
-  int                 prioceiling = 0;
-  int                 result;
-
-  result = pthread_mutexattr_getprioceiling( &attribute, &prioceiling );
-}
diff --git a/testsuites/psxtests/psxhdrs/mutex09.c b/testsuites/psxtests/psxhdrs/mutex09.c
deleted file mode 100644
index 322b00060e..0000000000
--- a/testsuites/psxtests/psxhdrs/mutex09.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <pthread.h>
- 
-#ifndef _POSIX_THREAD_PRIO_INHERIT
-#error "rtems is supposed to have pthread_mutexattr_setprioceiling"
-#endif
-#ifndef _POSIX_THREAD_PRIO_PROTECT
-#error "rtems is supposed to have pthread_mutexattr_setprioceiling"
-#endif
-
-void test( void )
-{
-  pthread_mutexattr_t attribute;
-  int                 prioceiling = 0;
-  int                 result;
-
-  result = pthread_mutexattr_setprioceiling( &attribute, prioceiling );
-}
diff --git a/testsuites/psxtests/psxhdrs/mutex10.c b/testsuites/psxtests/psxhdrs/mutex10.c
deleted file mode 100644
index 11ee1ac294..0000000000
--- a/testsuites/psxtests/psxhdrs/mutex10.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <pthread.h>
- 
-#ifndef _POSIX_THREADS
-#error "rtems is supposed to have pthread_mutexattr_getpshared"
-#endif
-#ifndef _POSIX_THREAD_PROCESS_SHARED
-#error "rtems is supposed to have pthread_mutexattr_setpshared"
-#endif
-
-void test( void )
-{
-  pthread_mutexattr_t attribute;
-  int                 pshared;
-  int                 result;
-
-  result = pthread_mutexattr_getpshared( &attribute, &pshared );
-}
diff --git a/testsuites/psxtests/psxhdrs/mutex11.c b/testsuites/psxtests/psxhdrs/mutex11.c
deleted file mode 100644
index 58fa2017cf..0000000000
--- a/testsuites/psxtests/psxhdrs/mutex11.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <pthread.h>
- 
-#ifndef _POSIX_THREADS
-#error "rtems is supposed to have pthread_mutexattr_setpshared"
-#endif
-#ifndef _POSIX_THREAD_PROCESS_SHARED
-#error "rtems is supposed to have pthread_mutexattr_setpshared"
-#endif
-
-void test( void )
-{
-  pthread_mutexattr_t attribute;
-  int                 pshared;
-  int                 result;
-
-  pshared = PTHREAD_PROCESS_SHARED;
-  pshared = PTHREAD_PROCESS_PRIVATE;
-
-  result = pthread_mutexattr_setpshared( &attribute, pshared );
-}
diff --git a/testsuites/psxtests/psxhdrs/mutex12.c b/testsuites/psxtests/psxhdrs/mutex12.c
deleted file mode 100644
index 2a0090e26e..0000000000
--- a/testsuites/psxtests/psxhdrs/mutex12.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <pthread.h>
- 
-#ifndef _POSIX_THREADS
-#error "rtems is supposed to have pthread_mutex_trylock"
-#endif
-
-void test( void )
-{
-  pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
-  int result;
-
-  result = pthread_mutex_trylock( &mutex );
-}
diff --git a/testsuites/psxtests/psxhdrs/mutex13.c b/testsuites/psxtests/psxhdrs/mutex13.c
deleted file mode 100644
index b3ab3fb070..0000000000
--- a/testsuites/psxtests/psxhdrs/mutex13.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <pthread.h>
- 
-#ifndef _POSIX_THREADS
-#error "rtems is supposed to have pthread_mutex_timedlock"
-#endif
-#ifndef _POSIX_TIMEOUTS
-#error "rtems is supposed to have pthread_mutex_timedlock"
-#endif
-
-void test( void )
-{
-  pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
-  struct timespec timeout;
-  int result;
-
-  result = pthread_mutex_timedlock( &mutex, &timeout );
-}
diff --git a/testsuites/psxtests/psxhdrs/mutex14.c b/testsuites/psxtests/psxhdrs/mutex14.c
deleted file mode 100644
index 6410e021a4..0000000000
--- a/testsuites/psxtests/psxhdrs/mutex14.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <pthread.h>
- 
-#ifndef _POSIX_THREAD_PRIO_INHERIT
-#error "rtems is supposed to have pthread_mutexattr_getprotocol"
-#endif
-#ifndef _POSIX_THREAD_PRIO_PROTECT
-#error "rtems is supposed to have pthread_mutexattr_getprotocol"
-#endif
-
-void test( void )
-{
-  pthread_mutexattr_t attribute;
-  int                 protocol;
-  int                 result;
-
-  result = pthread_mutexattr_getprotocol( &attribute, &protocol );
-}
diff --git a/testsuites/psxtests/psxhdrs/mutex15.c b/testsuites/psxtests/psxhdrs/mutex15.c
deleted file mode 100644
index cbef40b0c9..0000000000
--- a/testsuites/psxtests/psxhdrs/mutex15.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <pthread.h>
- 
-#ifndef _POSIX_THREAD_PRIO_INHERIT
-#error "rtems is supposed to have pthread_mutex_getprioceiling"
-#endif
-#ifndef _POSIX_THREAD_PRIO_PROTECT
-#error "rtems is supposed to have pthread_mutex_getprioceiling"
-#endif
-
-void test( void )
-{
-  pthread_mutex_t mutex;
-  int             prioceiling;
-  int             result;
-
-  result = pthread_mutex_getprioceiling( &mutex, &prioceiling );
-}
diff --git a/testsuites/psxtests/psxhdrs/mutex16.c b/testsuites/psxtests/psxhdrs/mutex16.c
deleted file mode 100644
index 8adbff564e..0000000000
--- a/testsuites/psxtests/psxhdrs/mutex16.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <pthread.h>
- 
-#ifndef _POSIX_THREAD_PRIO_INHERIT
-#error "rtems is supposed to have pthread_mutex_setprioceiling"
-#endif
-#ifndef _POSIX_THREAD_PRIO_PROTECT
-#error "rtems is supposed to have pthread_mutex_setprioceiling"
-#endif
-
-void test( void )
-{
-  pthread_mutex_t mutex;
-  int             prioceiling;
-  int             oldceiling;
-  int             result;
-
-  prioceiling = 0;
-
-  result = pthread_mutex_setprioceiling( &mutex, prioceiling, &oldceiling );
-}
diff --git a/testsuites/psxtests/psxhdrs/proc01.c b/testsuites/psxtests/psxhdrs/proc01.c
deleted file mode 100644
index 52b286fd70..0000000000
--- a/testsuites/psxtests/psxhdrs/proc01.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <sys/types.h>
- 
-void test( void )
-{
-  pid_t pid;
-
-  pid = getpid();
-}
diff --git a/testsuites/psxtests/psxhdrs/proc02.c b/testsuites/psxtests/psxhdrs/proc02.c
deleted file mode 100644
index 469ef59382..0000000000
--- a/testsuites/psxtests/psxhdrs/proc02.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <sys/types.h>
- 
-void test( void )
-{
-  pid_t pid;
-
-  pid = getppid();
-}
diff --git a/testsuites/psxtests/psxhdrs/proc03.c b/testsuites/psxtests/psxhdrs/proc03.c
deleted file mode 100644
index 69a94d51af..0000000000
--- a/testsuites/psxtests/psxhdrs/proc03.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <sys/types.h>
- 
-void test( void )
-{
-  uid_t uid;
-
-  uid = getuid();
-}
diff --git a/testsuites/psxtests/psxhdrs/proc04.c b/testsuites/psxtests/psxhdrs/proc04.c
deleted file mode 100644
index 25809433c5..0000000000
--- a/testsuites/psxtests/psxhdrs/proc04.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <sys/types.h>
- 
-void test( void )
-{
-  uid_t uid;
-
-  uid = geteuid();
-}
diff --git a/testsuites/psxtests/psxhdrs/proc05.c b/testsuites/psxtests/psxhdrs/proc05.c
deleted file mode 100644
index d3cb7835cf..0000000000
--- a/testsuites/psxtests/psxhdrs/proc05.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <sys/types.h>
- 
-void test( void )
-{
-  gid_t gid;
-
-  gid = getgid();
-}
diff --git a/testsuites/psxtests/psxhdrs/proc06.c b/testsuites/psxtests/psxhdrs/proc06.c
deleted file mode 100644
index 9de56e6de3..0000000000
--- a/testsuites/psxtests/psxhdrs/proc06.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <sys/types.h>
- 
-void test( void )
-{
-  gid_t gid;
-
-  gid = getegid();
-}
diff --git a/testsuites/psxtests/psxhdrs/proc07.c b/testsuites/psxtests/psxhdrs/proc07.c
deleted file mode 100644
index 1f05103761..0000000000
--- a/testsuites/psxtests/psxhdrs/proc07.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <sys/types.h>
- 
-void test( void )
-{
-  uid_t uid;
-  int   result;
-
-  uid = 0;
-
-  result = setuid( uid );
-}
diff --git a/testsuites/psxtests/psxhdrs/proc08.c b/testsuites/psxtests/psxhdrs/proc08.c
deleted file mode 100644
index 9ef24d36c1..0000000000
--- a/testsuites/psxtests/psxhdrs/proc08.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <sys/types.h>
- 
-void test( void )
-{
-  gid_t gid;
-  int   result;
-
-  gid = 0;
-
-  result = setgid( gid );
-}
diff --git a/testsuites/psxtests/psxhdrs/proc09.c b/testsuites/psxtests/psxhdrs/proc09.c
deleted file mode 100644
index 10d90ada2f..0000000000
--- a/testsuites/psxtests/psxhdrs/proc09.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <sys/types.h>
- 
-void test( void )
-{
-  gid_t grouplist[ 20 ];
-  int   gidsetsize;
-  int   result;
-
-  gidsetsize = 20;
-
-  result = getgroups( gidsetsize, grouplist );
-}
diff --git a/testsuites/psxtests/psxhdrs/proc10.c b/testsuites/psxtests/psxhdrs/proc10.c
deleted file mode 100644
index c57d0cd05e..0000000000
--- a/testsuites/psxtests/psxhdrs/proc10.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <sys/types.h>
- 
-void test( void )
-{
-  char *loginname;
-
-  loginname = getlogin();
-}
diff --git a/testsuites/psxtests/psxhdrs/proc11.c b/testsuites/psxtests/psxhdrs/proc11.c
deleted file mode 100644
index 531139f8f7..0000000000
--- a/testsuites/psxtests/psxhdrs/proc11.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <sys/types.h>
-#include <limits.h>   /* for LOGIN_NAME_MAX */
- 
-void test( void )
-{
-  char  loginnamebuffer[ LOGIN_NAME_MAX ];
-  int   result;
-
-  result = getlogin_r( loginnamebuffer, LOGIN_NAME_MAX );
-}
diff --git a/testsuites/psxtests/psxhdrs/proc12.c b/testsuites/psxtests/psxhdrs/proc12.c
deleted file mode 100644
index 7437189dbe..0000000000
--- a/testsuites/psxtests/psxhdrs/proc12.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <sys/types.h>
- 
-void test( void )
-{
-  pid_t pgrp;
-
-  pgrp = getpgrp();
-}
diff --git a/testsuites/psxtests/psxhdrs/proc13.c b/testsuites/psxtests/psxhdrs/proc13.c
deleted file mode 100644
index 7982132e9b..0000000000
--- a/testsuites/psxtests/psxhdrs/proc13.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <sys/types.h>
- 
-void test( void )
-{
-  pid_t pid;
-
-  pid = setsid();
-}
diff --git a/testsuites/psxtests/psxhdrs/proc14.c b/testsuites/psxtests/psxhdrs/proc14.c
deleted file mode 100644
index b905d18ea1..0000000000
--- a/testsuites/psxtests/psxhdrs/proc14.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <sys/types.h>
- 
-void test( void )
-{
-  pid_t pid = 0;
-  pid_t pgid = 0;
-  int   result;
-
-  result = setpgid( pid, pgid );
-}
diff --git a/testsuites/psxtests/psxhdrs/pthread01.c b/testsuites/psxtests/psxhdrs/pthread01.c
deleted file mode 100644
index 9b95ecd5f9..0000000000
--- a/testsuites/psxtests/psxhdrs/pthread01.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <pthread.h>
- 
-#ifndef _POSIX_THREADS
-#error "rtems is supposed to have pthread_attr_init"
-#endif
-
-void test( void )
-{
-  pthread_attr_t attribute;
-  int result;
-
-  result = pthread_attr_init( &attribute );
-}
diff --git a/testsuites/psxtests/psxhdrs/pthread02.c b/testsuites/psxtests/psxhdrs/pthread02.c
deleted file mode 100644
index a88a76b4a5..0000000000
--- a/testsuites/psxtests/psxhdrs/pthread02.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <pthread.h>
-
-#ifndef _POSIX_THREADS
-#error "rtems is supposed to have pthread_attr_destroy"
-#endif
-
-void test( void )
-{
-  pthread_attr_t  attribute;
-  int             result;
-
-  result = pthread_attr_destroy( &attribute );
-}
diff --git a/testsuites/psxtests/psxhdrs/pthread03.c b/testsuites/psxtests/psxhdrs/pthread03.c
deleted file mode 100644
index 28be165a5f..0000000000
--- a/testsuites/psxtests/psxhdrs/pthread03.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <pthread.h>
- 
-#ifndef _POSIX_THREADS
-#error "rtems is supposed to have pthread_attr_setdetachstate"
-#endif
-
-void test( void )
-{
-  pthread_attr_t  attribute;
-  int             state;
-  int             result;
-
-  state = PTHREAD_CREATE_DETACHED;
-  state = PTHREAD_CREATE_JOINABLE;
-
-  result = pthread_attr_setdetachstate( &attribute, state );
-}
diff --git a/testsuites/psxtests/psxhdrs/pthread04.c b/testsuites/psxtests/psxhdrs/pthread04.c
deleted file mode 100644
index 84a4aad280..0000000000
--- a/testsuites/psxtests/psxhdrs/pthread04.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <pthread.h>
- 
-#ifndef _POSIX_THREADS
-#error "rtems is supposed to have pthread_attr_getdetachstate"
-#endif
-
-void test( void )
-{
-  pthread_attr_t  attribute;
-  int             state;
-  int             result;
-
-  result = pthread_attr_getdetachstate( &attribute, &state );
-}
diff --git a/testsuites/psxtests/psxhdrs/pthread05.c b/testsuites/psxtests/psxhdrs/pthread05.c
deleted file mode 100644
index 669a356fbf..0000000000
--- a/testsuites/psxtests/psxhdrs/pthread05.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <pthread.h>
-#include <limits.h>  /* only for PTHREAD_STACK_MIN */
-
-#ifndef _POSIX_THREADS
-#error "rtems is supposed to have pthread_setstacksize"
-#endif
-
-#ifndef _POSIX_THREAD_ATTR_STACKSIZE
-#error "rtems is supposed to have pthread_setstacksize"
-#endif
-
-void test( void )
-{
-  pthread_attr_t  attribute;
-  size_t          size;
-  int             result;
-
-  size = PTHREAD_STACK_MIN;
-
-  result = pthread_attr_setstacksize( &attribute, size );
-}
diff --git a/testsuites/psxtests/psxhdrs/pthread06.c b/testsuites/psxtests/psxhdrs/pthread06.c
deleted file mode 100644
index 2140678008..0000000000
--- a/testsuites/psxtests/psxhdrs/pthread06.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <pthread.h>
- 
-#ifndef _POSIX_THREADS
-#error "rtems is supposed to have pthread_getstacksize"
-#endif
-
-#ifndef _POSIX_THREAD_ATTR_STACKSIZE
-#error "rtems is supposed to have pthread_getstacksize"
-#endif
-
-void test( void )
-{
-  pthread_attr_t  attribute;
-  size_t          size;
-  int             result;
-
-  result = pthread_attr_getstacksize( &attribute, &size );
-}
diff --git a/testsuites/psxtests/psxhdrs/pthread07.c b/testsuites/psxtests/psxhdrs/pthread07.c
deleted file mode 100644
index 7b6b6c8c55..0000000000
--- a/testsuites/psxtests/psxhdrs/pthread07.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <pthread.h>
- 
-#ifndef _POSIX_THREADS
-#error "rtems is supposed to have pthread_create"
-#endif
-
-void *test_task(
-  void * arg
-)
-{
-  for ( ; ; )
-    ;
-}
-
-void test( void )
-{
-  pthread_t       thread;
-  pthread_attr_t  attribute;
-  void           *arg = NULL;
-  int             result;
-
-  result = pthread_create( &thread, &attribute, test_task, arg );
-}
diff --git a/testsuites/psxtests/psxhdrs/pthread08.c b/testsuites/psxtests/psxhdrs/pthread08.c
deleted file mode 100644
index a3bab33ef1..0000000000
--- a/testsuites/psxtests/psxhdrs/pthread08.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <pthread.h>
-
-#ifndef _POSIX_THREADS
-#error "rtems is supposed to have pthread_exit"
-#endif
-
-void test( void )
-{
-  void   *status = NULL;
-
-  pthread_exit( status );
-}
diff --git a/testsuites/psxtests/psxhdrs/pthread09.c b/testsuites/psxtests/psxhdrs/pthread09.c
deleted file mode 100644
index d4a9754fb8..0000000000
--- a/testsuites/psxtests/psxhdrs/pthread09.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <pthread.h>
- 
-#ifndef _POSIX_THREADS
-#error "rtems is supposed to have pthread_self"
-#endif
-
-void test( void )
-{
-  pthread_t  self;
-
-  self = pthread_self();
-}
diff --git a/testsuites/psxtests/psxhdrs/pthread10.c b/testsuites/psxtests/psxhdrs/pthread10.c
deleted file mode 100644
index 8cb965ca87..0000000000
--- a/testsuites/psxtests/psxhdrs/pthread10.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <pthread.h>
- 
-#ifndef _POSIX_THREADS
-#error "rtems is supposed to have pthread_equal"
-#endif
-
-void test( void )
-{
-  pthread_t  id_1 = 0;
-  pthread_t  id_2 = 0;
-  int        result;
-
-  result = pthread_equal( id_1, id_2 );
-}
diff --git a/testsuites/psxtests/psxhdrs/pthread11.c b/testsuites/psxtests/psxhdrs/pthread11.c
deleted file mode 100644
index 5a9faca6dd..0000000000
--- a/testsuites/psxtests/psxhdrs/pthread11.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <pthread.h>
- 
-#ifndef _POSIX_THREAD_PRIORITY_SCHEDULING
-#error "RTEMS is supposed to have pthread_setschedparam"
-#endif
-
-void test( void )
-{
-  pthread_t           thread;
-  int                 policy;
-  struct sched_param  param;
-  int                 result;
-
-  thread = 0;
-
-  policy = SCHED_OTHER;
-  policy = SCHED_FIFO;
-  policy = SCHED_RR;
-#ifdef _POSIX_SPORADIC_SERVER
-  policy = SCHED_SPORADIC;
-#endif
-
-  /*
-   *  really should use sched_get_priority_min() and sched_get_priority_max()
-   */
-
-  param.sched_priority = 0; 
-#ifdef _POSIX_SPORADIC_SERVER
-  param.ss_low_priority = 0;
-  param.ss_replenish_period.tv_sec = 0;
-  param.ss_replenish_period.tv_nsec = 0;
-  param.ss_initial_budget.tv_sec = 0;
-  param.ss_initial_budget.tv_nsec = 0;
-#endif
-
-  result = pthread_setschedparam( thread, policy, &param );
-}
diff --git a/testsuites/psxtests/psxhdrs/pthread12.c b/testsuites/psxtests/psxhdrs/pthread12.c
deleted file mode 100644
index 00b88a53ab..0000000000
--- a/testsuites/psxtests/psxhdrs/pthread12.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <pthread.h>
- 
-#ifndef _POSIX_THREAD_PRIORITY_SCHEDULING
-#error "RTEMS is supposed to have pthread_getschedparam"
-#endif
-
-void test( void )
-{
-  pthread_t           thread;
-  int                 policy;
-  struct sched_param  param;
-  int                 result;
-
-  thread = 0;
-
-  result = pthread_getschedparam( thread, &policy, &param );
-}
diff --git a/testsuites/psxtests/psxhdrs/pthread13.c b/testsuites/psxtests/psxhdrs/pthread13.c
deleted file mode 100644
index 9126951486..0000000000
--- a/testsuites/psxtests/psxhdrs/pthread13.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <pthread.h>
- 
-#ifndef _POSIX_THREAD_PRIORITY_SCHEDULING
-#error "RTEMS is supposed to have pthread_attr_setscope"
-#endif
-
-void test( void )
-{
-  pthread_attr_t  attr;
-  int             contentionscope;
-  int             result;
-
-  contentionscope = PTHREAD_SCOPE_SYSTEM;
-  contentionscope = PTHREAD_SCOPE_PROCESS;
-
-  result = pthread_attr_setscope( &attr, contentionscope );
-}
diff --git a/testsuites/psxtests/psxhdrs/pthread14.c b/testsuites/psxtests/psxhdrs/pthread14.c
deleted file mode 100644
index 58a75a4f17..0000000000
--- a/testsuites/psxtests/psxhdrs/pthread14.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <pthread.h>
- 
-#ifndef _POSIX_THREAD_PRIORITY_SCHEDULING
-#error "RTEMS is supposed to have pthread_attr_getscope"
-#endif
-
-void test( void )
-{
-  pthread_attr_t  attr;
-  int             contentionscope;
-  int             result;
-
-  result = pthread_attr_getscope( &attr, &contentionscope );
-}
diff --git a/testsuites/psxtests/psxhdrs/pthread15.c b/testsuites/psxtests/psxhdrs/pthread15.c
deleted file mode 100644
index 10435a266b..0000000000
--- a/testsuites/psxtests/psxhdrs/pthread15.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <pthread.h>
- 
-#ifndef _POSIX_THREAD_PRIORITY_SCHEDULING
-#error "RTEMS is supposed to have pthread_attr_setinheritsched"
-#endif
-
-void test( void )
-{
-  pthread_attr_t  attr;
-  int             inheritsched;
-  int             result;
-
-  inheritsched = PTHREAD_INHERIT_SCHED;
-  inheritsched = PTHREAD_EXPLICIT_SCHED;
-  
-  result = pthread_attr_setinheritsched( &attr, inheritsched );
-}
diff --git a/testsuites/psxtests/psxhdrs/pthread16.c b/testsuites/psxtests/psxhdrs/pthread16.c
deleted file mode 100644
index 54960897ec..0000000000
--- a/testsuites/psxtests/psxhdrs/pthread16.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <pthread.h>
- 
-#ifndef _POSIX_THREAD_PRIORITY_SCHEDULING
-#error "RTEMS is supposed to have pthread_attr_getinheritsched"
-#endif
-
-void test( void )
-{
-  pthread_attr_t  attr;
-  int             inheritsched;
-  int             result;
-
-  result = pthread_attr_getinheritsched( &attr, &inheritsched );
-}
diff --git a/testsuites/psxtests/psxhdrs/pthread17.c b/testsuites/psxtests/psxhdrs/pthread17.c
deleted file mode 100644
index 24f6b0386f..0000000000
--- a/testsuites/psxtests/psxhdrs/pthread17.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <pthread.h>
- 
-#ifndef _POSIX_THREAD_PRIORITY_SCHEDULING
-#error "RTEMS is supposed to have pthread_attr_setschedpolicy"
-#endif
-
-void test( void )
-{
-  pthread_attr_t  attr;
-  int             policy;
-  int             result;
-
-  policy = SCHED_FIFO;
-  policy = SCHED_RR;
-  policy = SCHED_OTHER;
-#ifdef _POSIX_SPORADIC_SERVER
-  policy = SCHED_SPORADIC;
-#endif
-  
-  result = pthread_attr_setschedpolicy( &attr, policy );
-}
diff --git a/testsuites/psxtests/psxhdrs/pthread18.c b/testsuites/psxtests/psxhdrs/pthread18.c
deleted file mode 100644
index b59860997d..0000000000
--- a/testsuites/psxtests/psxhdrs/pthread18.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <pthread.h>
- 
-#ifndef _POSIX_THREAD_PRIORITY_SCHEDULING
-#error "RTEMS is supposed to have pthread_attr_getschedpolicy"
-#endif
-
-void test( void )
-{
-  pthread_attr_t  attr;
-  int             policy;
-  int             result;
-
-  result = pthread_attr_getschedpolicy( &attr, &policy );
-}
diff --git a/testsuites/psxtests/psxhdrs/pthread19.c b/testsuites/psxtests/psxhdrs/pthread19.c
deleted file mode 100644
index fc968e065e..0000000000
--- a/testsuites/psxtests/psxhdrs/pthread19.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <pthread.h>
- 
-#ifndef _POSIX_THREAD_PRIORITY_SCHEDULING
-#error "RTEMS is supposed to have pthread_attr_setschedparam"
-#endif
-
-void test( void )
-{
-  pthread_attr_t      attr;
-  struct sched_param  param;
-  int                 result;
-
-  result = pthread_attr_setschedparam( &attr, &param );
-}
diff --git a/testsuites/psxtests/psxhdrs/pthread20.c b/testsuites/psxtests/psxhdrs/pthread20.c
deleted file mode 100644
index d6432f25c4..0000000000
--- a/testsuites/psxtests/psxhdrs/pthread20.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <pthread.h>
- 
-#ifndef _POSIX_THREAD_PRIORITY_SCHEDULING
-#error "RTEMS is supposed to have pthread_attr_getschedparam"
-#endif
-
-void test( void )
-{
-  pthread_attr_t      attr;
-  struct sched_param  param;
-  int                 result;
-
-  result = pthread_attr_getschedparam( &attr, &param );
-}
diff --git a/testsuites/psxtests/psxhdrs/pthread21.c b/testsuites/psxtests/psxhdrs/pthread21.c
deleted file mode 100644
index e94a5c5f29..0000000000
--- a/testsuites/psxtests/psxhdrs/pthread21.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <pthread.h>
- 
-#ifndef _POSIX_THREADS
-#error "rtems is supposed to have pthread_detach"
-#endif
-
-void test( void )
-{
-  pthread_t   thread;
-  int         result;
-
-  thread = 0;
-  result = pthread_detach( thread );
-}
diff --git a/testsuites/psxtests/psxhdrs/pthread22.c b/testsuites/psxtests/psxhdrs/pthread22.c
deleted file mode 100644
index d163cc3352..0000000000
--- a/testsuites/psxtests/psxhdrs/pthread22.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <pthread.h>
- 
-#ifndef _POSIX_THREAD_PRIORITY_SCHEDULING
-#error "RTEMS is supposed to have pthread_setschedparam"
-#endif
-
-void test( void )
-{
-  pthread_t           thread = 0;
-  int                 policy;
-  struct sched_param  param;
-  int                 result;
-
-  policy = SCHED_OTHER;
-  policy = SCHED_FIFO;
-  policy = SCHED_RR;
-#ifdef _POSIX_SPORADIC_SERVER
-  policy = SCHED_SPORADIC;
-#endif
-
-  /*
-   *  really should use sched_get_priority_min() and sched_get_priority_max()
-   */
-
-  param.sched_priority = 0;
-#ifdef _POSIX_SPORADIC_SERVER
-  param.ss_low_priority = 0;
-  param.ss_replenish_period.tv_sec = 0;
-  param.ss_replenish_period.tv_nsec = 0;
-  param.ss_initial_budget.tv_sec = 0;
-  param.ss_initial_budget.tv_nsec = 0;
-#endif
-
-  result = pthread_setschedparam( thread, policy, &param );
-}
diff --git a/testsuites/psxtests/psxhdrs/pthread23.c b/testsuites/psxtests/psxhdrs/pthread23.c
deleted file mode 100644
index fc12a615cc..0000000000
--- a/testsuites/psxtests/psxhdrs/pthread23.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <pthread.h>
- 
-#ifndef _POSIX_THREAD_PRIORITY_SCHEDULING
-#error "RTEMS is supposed to have pthread_getschedparam"
-#endif
-
-void test( void )
-{
-  pthread_t           thread = 0;
-  int                 policy;
-  struct sched_param  param;
-  int                 result;
-
-  result = pthread_getschedparam( thread, &policy, &param );
-}
diff --git a/testsuites/psxtests/psxhdrs/pthread24.c b/testsuites/psxtests/psxhdrs/pthread24.c
deleted file mode 100644
index afb8d3b2e9..0000000000
--- a/testsuites/psxtests/psxhdrs/pthread24.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <pthread.h>
-#include <limits.h>  /* only for PTHREAD_STACK_MIN */
-
-#ifndef _POSIX_THREADS
-#error "rtems is supposed to have pthread_setstackaddr"
-#endif
-
-#ifndef _POSIX_THREAD_ATTR_STACKADDR
-#error "rtems is supposed to have pthread_setstackaddr"
-#endif
-
-void test( void )
-{
-  pthread_attr_t  attribute;
-  void           *stackaddr;
-  int             result;
-
-  stackaddr = NULL;
-
-  result = pthread_attr_setstackaddr( &attribute, stackaddr );
-}
diff --git a/testsuites/psxtests/psxhdrs/pthread25.c b/testsuites/psxtests/psxhdrs/pthread25.c
deleted file mode 100644
index 48e01eaa53..0000000000
--- a/testsuites/psxtests/psxhdrs/pthread25.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <pthread.h>
-#include <limits.h>  /* only for PTHREAD_STACK_MIN */
-
-#ifndef _POSIX_THREADS
-#error "rtems is supposed to have pthread_getstackaddr"
-#endif
-
-#ifndef _POSIX_THREAD_ATTR_STACKADDR
-#error "rtems is supposed to have pthread_getstackaddr"
-#endif
-
-void test( void )
-{
-  pthread_attr_t  attribute;
-  void           *stackaddr;
-  int             result;
-
-  result = pthread_attr_getstackaddr( &attribute, &stackaddr );
-}
diff --git a/testsuites/psxtests/psxhdrs/pthread26.c b/testsuites/psxtests/psxhdrs/pthread26.c
deleted file mode 100644
index 6643454b6f..0000000000
--- a/testsuites/psxtests/psxhdrs/pthread26.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <pthread.h>
- 
-#ifndef _POSIX_THREADS
-#error "rtems is supposed to have pthread_join"
-#endif
-
-void test( void )
-{
-  pthread_t   thread;
-  void       *value_ptr;
-  int         result;
-
-  thread = 0;
-
-  result = pthread_join( thread, &value_ptr );
-}
diff --git a/testsuites/psxtests/psxhdrs/pthread27.c b/testsuites/psxtests/psxhdrs/pthread27.c
deleted file mode 100644
index 2f80f1c098..0000000000
--- a/testsuites/psxtests/psxhdrs/pthread27.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <pthread.h>
- 
-#ifndef _POSIX_THREADS
-#error "rtems is supposed to have pthread_once"
-#endif
-
-void init_routine( void )
-{
-}
-
-void test( void )
-{
-  pthread_once_t   once_control = PTHREAD_ONCE_INIT;
-  int              result;
-
-  result = pthread_once( &once_control, init_routine );
-}
diff --git a/testsuites/psxtests/psxhdrs/pthread28.c b/testsuites/psxtests/psxhdrs/pthread28.c
deleted file mode 100644
index a9d78e36fa..0000000000
--- a/testsuites/psxtests/psxhdrs/pthread28.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <pthread.h>
- 
-#ifndef _POSIX_THREADS
-#error "rtems is supposed to have pthread_cancel"
-#endif
-
-void init_routine( void )
-{
-}
-
-void test( void )
-{
-  pthread_t   thread;
-  int         result;
-
-  thread = 0;
-  result = pthread_cancel( thread );
-}
diff --git a/testsuites/psxtests/psxhdrs/pthread29.c b/testsuites/psxtests/psxhdrs/pthread29.c
deleted file mode 100644
index 45efbc0bb9..0000000000
--- a/testsuites/psxtests/psxhdrs/pthread29.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <pthread.h>
- 
-#ifndef _POSIX_THREADS
-#error "rtems is supposed to have pthread_setcancelstate"
-#endif
-
-void init_routine( void )
-{
-}
-
-void test( void )
-{
-  int         state;
-  int         oldstate;
-  int         result;
-
-  state = PTHREAD_CANCEL_ENABLE;
-  state = PTHREAD_CANCEL_DISABLE;
-
-  result = pthread_setcancelstate( state, &oldstate );
-}
diff --git a/testsuites/psxtests/psxhdrs/pthread30.c b/testsuites/psxtests/psxhdrs/pthread30.c
deleted file mode 100644
index 44e885612e..0000000000
--- a/testsuites/psxtests/psxhdrs/pthread30.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <pthread.h>
- 
-#ifndef _POSIX_THREADS
-#error "rtems is supposed to have pthread_setcanceltype"
-#endif
-
-void init_routine( void )
-{
-}
-
-void test( void )
-{
-  int         type;
-  int         oldtype;
-  int         result;
-
-  type = PTHREAD_CANCEL_DEFERRED;
-  type = PTHREAD_CANCEL_ASYNCHRONOUS;
-
-  result = pthread_setcanceltype( type, &oldtype );
-}
diff --git a/testsuites/psxtests/psxhdrs/pthread31.c b/testsuites/psxtests/psxhdrs/pthread31.c
deleted file mode 100644
index d553a09e65..0000000000
--- a/testsuites/psxtests/psxhdrs/pthread31.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <pthread.h>
- 
-#ifndef _POSIX_THREADS
-#error "rtems is supposed to have pthread_testcancel"
-#endif
-
-void init_routine( void )
-{
-}
-
-void test( void )
-{
-  pthread_testcancel();
-}
diff --git a/testsuites/psxtests/psxhdrs/pthread32.c b/testsuites/psxtests/psxhdrs/pthread32.c
deleted file mode 100644
index 80990610ec..0000000000
--- a/testsuites/psxtests/psxhdrs/pthread32.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <pthread.h>
- 
-#ifndef _POSIX_THREADS
-#error "rtems is supposed to have pthread_cleanup_push"
-#endif
-
-void cleanup_routine(
-  void *argument
-)
-{
-}
-
-void test( void )
-{
-  int argument;
-
-  argument = 0;
-
-  pthread_cleanup_push( cleanup_routine, &argument );
-}
diff --git a/testsuites/psxtests/psxhdrs/pthread33.c b/testsuites/psxtests/psxhdrs/pthread33.c
deleted file mode 100644
index 7cff807ef0..0000000000
--- a/testsuites/psxtests/psxhdrs/pthread33.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <pthread.h>
- 
-#ifndef _POSIX_THREADS
-#error "rtems is supposed to have pthread_cleanup_pop"
-#endif
-
-void test( void )
-{
-  pthread_cleanup_pop( 1 );
-}
diff --git a/testsuites/psxtests/psxhdrs/pthread34.c b/testsuites/psxtests/psxhdrs/pthread34.c
deleted file mode 100644
index fc575a6056..0000000000
--- a/testsuites/psxtests/psxhdrs/pthread34.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <pthread.h>
- 
-#ifndef _POSIX_THREAD_CPUTIME
-#error "rtems is supposed to have pthread_getcpuclockid"
-#endif
-
-void test( void )
-{
-  pthread_t  thread;
-  clockid_t  clock_id;
-  int        result;
-
-  thread = 0;
-
-  result = pthread_getcpuclockid( thread, &clock_id );
-}
diff --git a/testsuites/psxtests/psxhdrs/pthread35.c b/testsuites/psxtests/psxhdrs/pthread35.c
deleted file mode 100644
index d9dd771c2c..0000000000
--- a/testsuites/psxtests/psxhdrs/pthread35.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <pthread.h>
- 
-#ifndef _POSIX_THREAD_CPUTIME
-#error "rtems is supposed to have pthread_attr_setcputime"
-#endif
-
-void test( void )
-{
-  pthread_attr_t  attr;
-  int             clock_allowed;
-  int             result;
-
-  clock_allowed = CLOCK_ALLOWED;
-  clock_allowed = CLOCK_DISALLOWED;
-
-  result = pthread_attr_setcputime( &attr, clock_allowed );
-}
diff --git a/testsuites/psxtests/psxhdrs/pthread36.c b/testsuites/psxtests/psxhdrs/pthread36.c
deleted file mode 100644
index 80ddd64578..0000000000
--- a/testsuites/psxtests/psxhdrs/pthread36.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <pthread.h>
- 
-#ifndef _POSIX_THREAD_CPUTIME
-#error "rtems is supposed to have pthread_attr_getcputime"
-#endif
-
-void test( void )
-{
-  pthread_attr_t  attr;
-  int             clock_allowed;
-  int             result;
-
-  result = pthread_attr_getcputime( &attr, &clock_allowed );
-}
diff --git a/testsuites/psxtests/psxhdrs/sched01.c b/testsuites/psxtests/psxhdrs/sched01.c
deleted file mode 100644
index 7e1e9ca621..0000000000
--- a/testsuites/psxtests/psxhdrs/sched01.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <sched.h>
-
-#ifndef _POSIX_PRIORITY_SCHEDULING
-#error "rtems is supposed to have sched_setparam"
-#endif
- 
-void test( void )
-{
-  pid_t  pid;
-  struct sched_param param;
-  int    result;
-
-  pid = 0;
-
-  /*
-   *  really should use sched_get_priority_min() and sched_get_priority_max()
-   */
-
-  param.sched_priority = 0;
-#ifdef _POSIX_SPORADIC_SERVER
-  param.ss_low_priority = 0;
-  param.ss_replenish_period.tv_sec = 0;
-  param.ss_replenish_period.tv_nsec = 0;
-  param.ss_initial_budget.tv_sec = 0;
-  param.ss_initial_budget.tv_nsec = 0;
-#endif
-
-  result = sched_setparam( pid, &param );
-}
diff --git a/testsuites/psxtests/psxhdrs/sched02.c b/testsuites/psxtests/psxhdrs/sched02.c
deleted file mode 100644
index 5475b22382..0000000000
--- a/testsuites/psxtests/psxhdrs/sched02.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <sched.h>
-
-#ifndef _POSIX_PRIORITY_SCHEDULING
-#error "rtems is supposed to have sched_getparam"
-#endif
- 
-void test( void )
-{
-  pid_t  pid;
-  struct sched_param param;
-  int    result;
-
-  pid = 0;
-
-  result = sched_getparam( pid, &param );
-}
diff --git a/testsuites/psxtests/psxhdrs/sched03.c b/testsuites/psxtests/psxhdrs/sched03.c
deleted file mode 100644
index 19a2774b94..0000000000
--- a/testsuites/psxtests/psxhdrs/sched03.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <sched.h>
-
-#ifndef _POSIX_PRIORITY_SCHEDULING
-#error "rtems is supposed to have sched_setscheduler"
-#endif
- 
-void test( void )
-{
-  pid_t  pid;
-  int    policy;
-  struct sched_param param;
-  int    result;
-
-  pid = 0;
-
-  policy = SCHED_RR;
-  policy = SCHED_FIFO;
-  policy = SCHED_OTHER;
-#ifdef _POSIX_SPORADIC_SERVER
-  policy = SCHED_SPORADIC;
-#endif
-
-  /*
-   *  really should use sched_get_priority_min() and sched_get_priority_max()
-   */
-
-  param.sched_priority = 0;
-#ifdef _POSIX_SPORADIC_SERVER
-  param.ss_low_priority = 0;
-  param.ss_replenish_period.tv_sec = 0;
-  param.ss_replenish_period.tv_nsec = 0;
-  param.ss_initial_budget.tv_sec = 0;
-  param.ss_initial_budget.tv_nsec = 0;
-#endif
-
-  result = sched_setscheduler( pid, policy, &param );
-}
diff --git a/testsuites/psxtests/psxhdrs/sched04.c b/testsuites/psxtests/psxhdrs/sched04.c
deleted file mode 100644
index bc002be98a..0000000000
--- a/testsuites/psxtests/psxhdrs/sched04.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <sched.h>
-
-#ifndef _POSIX_PRIORITY_SCHEDULING
-#error "rtems is supposed to have sched_getscheduler"
-#endif
- 
-void test( void )
-{
-  pid_t  pid;
-  int    result;
-
-  pid = 0;
-
-  result = sched_getscheduler( pid );
-}
diff --git a/testsuites/psxtests/psxhdrs/sched05.c b/testsuites/psxtests/psxhdrs/sched05.c
deleted file mode 100644
index 179bc7b4e0..0000000000
--- a/testsuites/psxtests/psxhdrs/sched05.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <sched.h>
-
-#ifndef _POSIX_PRIORITY_SCHEDULING
-#error "rtems is supposed to have sched_yield"
-#endif
- 
-void test( void )
-{
-  int    result;
-
-  result = sched_yield();
-}
diff --git a/testsuites/psxtests/psxhdrs/sched06.c b/testsuites/psxtests/psxhdrs/sched06.c
deleted file mode 100644
index 055b0d197f..0000000000
--- a/testsuites/psxtests/psxhdrs/sched06.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <sched.h>
-
-#ifndef _POSIX_PRIORITY_SCHEDULING
-#error "rtems is supposed to have sched_get_priority_max"
-#endif
- 
-void test( void )
-{
-  int    policy;
-  int    result;
-
-  policy = SCHED_RR;
-  policy = SCHED_FIFO;
-  policy = SCHED_OTHER;
-#ifdef _POSIX_SPORADIC_SERVER
-  policy = SCHED_SPORADIC;
-#endif
-
-  result = sched_get_priority_max( policy );
-}
diff --git a/testsuites/psxtests/psxhdrs/sched07.c b/testsuites/psxtests/psxhdrs/sched07.c
deleted file mode 100644
index 5743359f6a..0000000000
--- a/testsuites/psxtests/psxhdrs/sched07.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <sched.h>
-
-#ifndef _POSIX_PRIORITY_SCHEDULING
-#error "rtems is supposed to have sched_get_priority_min"
-#endif
- 
-void test( void )
-{
-  int    policy;
-  int    result;
-
-  policy = SCHED_RR;
-  policy = SCHED_FIFO;
-  policy = SCHED_OTHER;
-#ifdef _POSIX_SPORADIC_SERVER
-  policy = SCHED_SPORADIC;
-#endif
-
-  result = sched_get_priority_min( policy );
-}
diff --git a/testsuites/psxtests/psxhdrs/sched08.c b/testsuites/psxtests/psxhdrs/sched08.c
deleted file mode 100644
index 2fdadc2924..0000000000
--- a/testsuites/psxtests/psxhdrs/sched08.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <sched.h>
-
-#ifndef _POSIX_PRIORITY_SCHEDULING
-#error "rtems is supposed to have sched_rr_get_interval"
-#endif
- 
-void test( void )
-{
-  pid_t  pid;
-  struct timespec interval;
-  int    result;
-
-  pid = 0;
-
-  result = sched_rr_get_interval( pid, &interval );
-}
diff --git a/testsuites/psxtests/psxhdrs/signal01.c b/testsuites/psxtests/psxhdrs/signal01.c
deleted file mode 100644
index adc7c43f4d..0000000000
--- a/testsuites/psxtests/psxhdrs/signal01.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <signal.h>
- 
-void test( void )
-{
-  sigset_t signal_set;
-  int      signal_number;
-  int      result;
-
-  signal_number = SIGALRM;
-
-  result = sigaddset( &signal_set, signal_number );
-}
diff --git a/testsuites/psxtests/psxhdrs/signal02.c b/testsuites/psxtests/psxhdrs/signal02.c
deleted file mode 100644
index a16ed63a6b..0000000000
--- a/testsuites/psxtests/psxhdrs/signal02.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <signal.h>
- 
-void test( void )
-{
-  sigset_t signal_set;
-  int      signal_number;
-  int      result;
-
-  signal_number = SIGALRM;
-
-  result = sigdelset( &signal_set, signal_number );
-}
diff --git a/testsuites/psxtests/psxhdrs/signal03.c b/testsuites/psxtests/psxhdrs/signal03.c
deleted file mode 100644
index 27c778b7c4..0000000000
--- a/testsuites/psxtests/psxhdrs/signal03.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <signal.h>
- 
-void test( void )
-{
-  sigset_t signal_set;
-  int      result;
-
-  result = sigfillset( &signal_set );
-}
diff --git a/testsuites/psxtests/psxhdrs/signal04.c b/testsuites/psxtests/psxhdrs/signal04.c
deleted file mode 100644
index a0b22d39ca..0000000000
--- a/testsuites/psxtests/psxhdrs/signal04.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <signal.h>
- 
-void test( void )
-{
-  sigset_t signal_set;
-  int      signal_number;
-  int      result;
-
-  signal_number = SIGALRM;
-
-  result = sigismember( &signal_set, signal_number );
-}
diff --git a/testsuites/psxtests/psxhdrs/signal05.c b/testsuites/psxtests/psxhdrs/signal05.c
deleted file mode 100644
index b473c55f1e..0000000000
--- a/testsuites/psxtests/psxhdrs/signal05.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <signal.h>
- 
-void test( void )
-{
-  sigset_t signal_set;
-  int      result;
-
-  result = sigemptyset( &signal_set );
-}
diff --git a/testsuites/psxtests/psxhdrs/signal06.c b/testsuites/psxtests/psxhdrs/signal06.c
deleted file mode 100644
index e90bc62e37..0000000000
--- a/testsuites/psxtests/psxhdrs/signal06.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <signal.h>
- 
-void test( void )
-{
-  int              signal_number;
-  struct sigaction act;
-  struct sigaction oact;
-  int              result;
-
-  signal_number = SIGALRM;
-
-  /*
-   *  Really should not reference sa_handler and sa_signction simultaneously.
-   */
-
-  act.sa_handler = SIG_DFL;
-  act.sa_handler = SIG_IGN;
-  act.sa_mask  = 0;
-  act.sa_flags = SA_NOCLDSTOP;
-  act.sa_flags = SA_SIGINFO;
-  act.sa_sigaction = NULL;
-
-  result = sigaction( signal_number, &act, &oact );
-}
diff --git a/testsuites/psxtests/psxhdrs/signal07.c b/testsuites/psxtests/psxhdrs/signal07.c
deleted file mode 100644
index e30a07791d..0000000000
--- a/testsuites/psxtests/psxhdrs/signal07.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <signal.h>
- 
-#ifndef _POSIX_THREADS
-#error "rtems is supposed to have pthread_kill"
-#endif
-
-void test( void )
-{
-  pthread_t  thread;
-  int        signal_number;
-  int        result;
-
-  thread = 0;
-  signal_number = SIGALRM;
-
-  result = pthread_kill( thread, signal_number );
-}
diff --git a/testsuites/psxtests/psxhdrs/signal08.c b/testsuites/psxtests/psxhdrs/signal08.c
deleted file mode 100644
index 251c8d3af6..0000000000
--- a/testsuites/psxtests/psxhdrs/signal08.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <signal.h>
- 
-#ifndef _POSIX_THREADS
-#error "rtems is supposed to have pthread_sigmask"
-#endif
-
-void test( void )
-{
-  int       how;
-  sigset_t  set;
-  sigset_t  oset;
-  int       result;
-
-  how = SIG_BLOCK;
-  how = SIG_UNBLOCK;
-  how = SIG_SETMASK;
-
-  result = pthread_sigmask( how, &set, &oset );
-}
diff --git a/testsuites/psxtests/psxhdrs/signal09.c b/testsuites/psxtests/psxhdrs/signal09.c
deleted file mode 100644
index b33647d147..0000000000
--- a/testsuites/psxtests/psxhdrs/signal09.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <sys/types.h>
-#include <signal.h>
- 
-void test( void )
-{
-  pid_t pid;
-  int   signal_number;
-  int   result;
-  
-  pid = 0;
-  signal_number = SIGALRM;
-
-  result = kill( pid, signal_number );
-}
diff --git a/testsuites/psxtests/psxhdrs/signal10.c b/testsuites/psxtests/psxhdrs/signal10.c
deleted file mode 100644
index dc5f7c27d5..0000000000
--- a/testsuites/psxtests/psxhdrs/signal10.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <signal.h>
- 
-void test( void )
-{
-  sigset_t  set;
-  int       sig;
-  int       result;
-
-  result = sigwait( &set, &sig );
-}
diff --git a/testsuites/psxtests/psxhdrs/signal11.c b/testsuites/psxtests/psxhdrs/signal11.c
deleted file mode 100644
index 0af70d9ef5..0000000000
--- a/testsuites/psxtests/psxhdrs/signal11.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <signal.h>
- 
-void test( void )
-{
-  int      signal_number;
-  int      result;
-
-  signal_number = SIGALRM;
-
-  result = raise( signal_number );
-}
diff --git a/testsuites/psxtests/psxhdrs/signal12.c b/testsuites/psxtests/psxhdrs/signal12.c
deleted file mode 100644
index 36926a98ea..0000000000
--- a/testsuites/psxtests/psxhdrs/signal12.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <signal.h>
- 
-void test( void )
-{
-  void (*signal_function_pointer)();
-  int  signal_number;
-
-  signal_number = SIGALRM;
-
-  signal_function_pointer = signal( signal_number, SIG_IGN );
-}
diff --git a/testsuites/psxtests/psxhdrs/signal13.c b/testsuites/psxtests/psxhdrs/signal13.c
deleted file mode 100644
index 2270066aaa..0000000000
--- a/testsuites/psxtests/psxhdrs/signal13.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <signal.h>
- 
-void test( void )
-{
-  int       how;
-  sigset_t  set;
-  sigset_t  oset;
-  int       result;
-
-  how = SIG_BLOCK;
-  how = SIG_UNBLOCK;
-  how = SIG_SETMASK;
-
-  (void) sigemptyset( &set );
-
-  result = sigprocmask( how, &set, &oset );
-}
diff --git a/testsuites/psxtests/psxhdrs/signal14.c b/testsuites/psxtests/psxhdrs/signal14.c
deleted file mode 100644
index 192b824655..0000000000
--- a/testsuites/psxtests/psxhdrs/signal14.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <signal.h>
- 
-void test( void )
-{
-  sigset_t  set;
-  int       result;
-
-  (void) sigemptyset( &set );
-
-  result = sigpending( &set );
-}
diff --git a/testsuites/psxtests/psxhdrs/signal15.c b/testsuites/psxtests/psxhdrs/signal15.c
deleted file mode 100644
index 1dabed1945..0000000000
--- a/testsuites/psxtests/psxhdrs/signal15.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <signal.h>
- 
-void test( void )
-{
-  sigset_t  sigmask;
-  int       result;
-
-  (void) sigemptyset( &sigmask );
-
-  result = sigsuspend( &sigmask );
-}
diff --git a/testsuites/psxtests/psxhdrs/signal16.c b/testsuites/psxtests/psxhdrs/signal16.c
deleted file mode 100644
index cc8bfe9bbb..0000000000
--- a/testsuites/psxtests/psxhdrs/signal16.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <signal.h>
-
-#ifndef _POSIX_THREADS
-#define "rtems is supposed to have pthread_sigmask"
-#endif
- 
-void test( void )
-{
-  int       how;
-  sigset_t  set;
-  sigset_t  oset;
-  int       result;
-
-  how = SIG_BLOCK;
-  how = SIG_UNBLOCK;
-  how = SIG_SETMASK;
-
-  (void) sigemptyset( &set );
-
-  result = pthread_sigmask( how, &set, &oset );
-}
diff --git a/testsuites/psxtests/psxhdrs/signal17.c b/testsuites/psxtests/psxhdrs/signal17.c
deleted file mode 100644
index 152883d0bf..0000000000
--- a/testsuites/psxtests/psxhdrs/signal17.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <signal.h>
- 
-void test( void )
-{
-  sigset_t  set;
-  siginfo_t info;
-  int       result;
-
-  (void) sigemptyset( &set );
-
-  result = sigwaitinfo( &set, &info );
-}
diff --git a/testsuites/psxtests/psxhdrs/signal18.c b/testsuites/psxtests/psxhdrs/signal18.c
deleted file mode 100644
index 1deb450c27..0000000000
--- a/testsuites/psxtests/psxhdrs/signal18.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <signal.h>
- 
-void test( void )
-{
-  sigset_t        set;
-  siginfo_t       info;
-  struct timespec timeout;
-  int             result;
-
-  (void) sigemptyset( &set );
-
-  result = sigtimedwait( &set, &info, &timeout );
-}
diff --git a/testsuites/psxtests/psxhdrs/signal19.c b/testsuites/psxtests/psxhdrs/signal19.c
deleted file mode 100644
index e4497623bb..0000000000
--- a/testsuites/psxtests/psxhdrs/signal19.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <signal.h>
- 
-void test( void )
-{
-  sigset_t        set;
-  int             sig;
-  int             result;
-
-  (void) sigemptyset( &set );
-
-  result = sigwait( &set, &sig );
-}
diff --git a/testsuites/psxtests/psxhdrs/signal20.c b/testsuites/psxtests/psxhdrs/signal20.c
deleted file mode 100644
index 928b528906..0000000000
--- a/testsuites/psxtests/psxhdrs/signal20.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <signal.h>
- 
-void test( void )
-{
-  unsigned int seconds;
-  unsigned int result;
-
-  seconds = 10;
-
-  result = alarm( seconds );
-}
diff --git a/testsuites/psxtests/psxhdrs/signal21.c b/testsuites/psxtests/psxhdrs/signal21.c
deleted file mode 100644
index 6572d5a9af..0000000000
--- a/testsuites/psxtests/psxhdrs/signal21.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <signal.h>
- 
-void test( void )
-{
-  int result;
-
-  result = pause();
-}
diff --git a/testsuites/psxtests/psxhdrs/signal22.c b/testsuites/psxtests/psxhdrs/signal22.c
deleted file mode 100644
index a944c79edd..0000000000
--- a/testsuites/psxtests/psxhdrs/signal22.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <unistd.h>
- 
-void test( void )
-{
-  unsigned int seconds;
-  unsigned int result;
-
-  seconds = 10;
-
-  result = sleep( seconds );
-}
diff --git a/testsuites/psxtests/psxhdrs/time01.c b/testsuites/psxtests/psxhdrs/time01.c
deleted file mode 100644
index 2c2a811ebd..0000000000
--- a/testsuites/psxtests/psxhdrs/time01.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <time.h>
- 
-void test( void )
-{
-  clock_t clock_ticks;
-
-  clock_ticks = clock();
-}
diff --git a/testsuites/psxtests/psxhdrs/time02.c b/testsuites/psxtests/psxhdrs/time02.c
deleted file mode 100644
index 233b33adbe..0000000000
--- a/testsuites/psxtests/psxhdrs/time02.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <time.h>
- 
-void test( void )
-{
-  time_t time1;
-  time_t time2;
-  double difference;
-
-  time1 = 0;
-  time2 = 0;
-
-  difference = difftime( time1, time2 );
-}
diff --git a/testsuites/psxtests/psxhdrs/time03.c b/testsuites/psxtests/psxhdrs/time03.c
deleted file mode 100644
index 1d44f3d927..0000000000
--- a/testsuites/psxtests/psxhdrs/time03.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <time.h>
- 
-void test( void )
-{
-  struct tm timestruct;
-  time_t    time_encoded;
-
-  timestruct.tm_sec = 0;
-  timestruct.tm_min = 0;
-  timestruct.tm_hour = 0;
-  timestruct.tm_mday = 1;
-  timestruct.tm_mon = 0;
-  timestruct.tm_year = 0;
-  timestruct.tm_wday = 0;
-  timestruct.tm_yday = 0;
-  timestruct.tm_isdst = 0;
-
-  time_encoded = mktime( &timestruct );
-}
diff --git a/testsuites/psxtests/psxhdrs/time04.c b/testsuites/psxtests/psxhdrs/time04.c
deleted file mode 100644
index 9db332a605..0000000000
--- a/testsuites/psxtests/psxhdrs/time04.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <time.h>
- 
-void test( void )
-{
-  time_t    new_time;
-
-  new_time = time( &new_time );
-}
diff --git a/testsuites/psxtests/psxhdrs/time05.c b/testsuites/psxtests/psxhdrs/time05.c
deleted file mode 100644
index 817df63f30..0000000000
--- a/testsuites/psxtests/psxhdrs/time05.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <time.h>
- 
-void test( void )
-{
-  size_t    length;
-  size_t    max_length;
-  char      buffer[ 80 ];
-  struct tm timestruct;
-  
-  max_length = sizeof( buffer );
-
-  length = strftime( buffer, max_length, "%A", &timestruct );
-}
diff --git a/testsuites/psxtests/psxhdrs/time06.c b/testsuites/psxtests/psxhdrs/time06.c
deleted file mode 100644
index abdeee0d24..0000000000
--- a/testsuites/psxtests/psxhdrs/time06.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <time.h>
- 
-void test( void )
-{
-  char      *buffer;
-  struct tm  timestruct;
-  
-  buffer = asctime( &timestruct );
-}
diff --git a/testsuites/psxtests/psxhdrs/time07.c b/testsuites/psxtests/psxhdrs/time07.c
deleted file mode 100644
index 66eebe6d37..0000000000
--- a/testsuites/psxtests/psxhdrs/time07.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <time.h>
- 
-void test( void )
-{
-  char     *buffer;
-  time_t    time;
-  
-  buffer = ctime( &time );
-}
diff --git a/testsuites/psxtests/psxhdrs/time08.c b/testsuites/psxtests/psxhdrs/time08.c
deleted file mode 100644
index 8e0cd49bcd..0000000000
--- a/testsuites/psxtests/psxhdrs/time08.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <time.h>
- 
-void test( void )
-{
-  time_t     time;
-  struct tm *timestruct;
-  
-  timestruct = gmtime( &time );
-}
diff --git a/testsuites/psxtests/psxhdrs/time09.c b/testsuites/psxtests/psxhdrs/time09.c
deleted file mode 100644
index 9069927fcc..0000000000
--- a/testsuites/psxtests/psxhdrs/time09.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <time.h>
- 
-void test( void )
-{
-  time_t     time;
-  struct tm *timestruct;
-  
-  timestruct = localtime( &time );
-}
diff --git a/testsuites/psxtests/psxhdrs/time10.c b/testsuites/psxtests/psxhdrs/time10.c
deleted file mode 100644
index a87fa0079b..0000000000
--- a/testsuites/psxtests/psxhdrs/time10.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <time.h>
- 
-void test( void )
-{
-  char      *buffer_pointer;
-  struct tm  timestruct;
-  char       buffer[ 80 ];
-  
-  buffer_pointer = asctime_r( &timestruct, buffer );
-}
diff --git a/testsuites/psxtests/psxhdrs/time11.c b/testsuites/psxtests/psxhdrs/time11.c
deleted file mode 100644
index 8c5e4d8a7f..0000000000
--- a/testsuites/psxtests/psxhdrs/time11.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <time.h>
- 
-void test( void )
-{
-  char     *buffer_pointer;
-  char      buffer[ 80 ];
-  time_t    time;
-  
-  buffer_pointer = ctime_r( &time, buffer );
-}
diff --git a/testsuites/psxtests/psxhdrs/time12.c b/testsuites/psxtests/psxhdrs/time12.c
deleted file mode 100644
index 46ac4d44bf..0000000000
--- a/testsuites/psxtests/psxhdrs/time12.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <time.h>
- 
-void test( void )
-{
-  time_t     time;
-  struct tm *timestruct_pointer;
-  struct tm  timestruct;
-  
-  timestruct_pointer = gmtime_r( &time, &timestruct );
-}
diff --git a/testsuites/psxtests/psxhdrs/time13.c b/testsuites/psxtests/psxhdrs/time13.c
deleted file mode 100644
index ff9a42eb96..0000000000
--- a/testsuites/psxtests/psxhdrs/time13.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <time.h>
- 
-void test( void )
-{
-  time_t     time;
-  struct tm *timestruct_pointer;
-  struct tm  timestruct;
-  
-  timestruct_pointer = localtime_r( &time, &timestruct );
-}
diff --git a/testsuites/psxtests/psxhdrs/timer01.c b/testsuites/psxtests/psxhdrs/timer01.c
deleted file mode 100644
index 02be02cff1..0000000000
--- a/testsuites/psxtests/psxhdrs/timer01.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <time.h>
- 
-#ifndef _POSIX_TIMERS
-#error "rtems is supposed to have timer_create"
-#endif
-
-void test( void )
-{
-  clockid_t        clock_id = 0;
-  timer_t          timerid = 0;
-  struct sigevent  evp;
-  int              result;
-
-  evp.sigev_notify = SIGEV_NONE;
-  evp.sigev_notify = SIGEV_SIGNAL;
-  evp.sigev_notify = SIGEV_THREAD;
-  evp.sigev_signo = SIGALRM;
-  evp.sigev_value.sival_int = 0;
-  evp.sigev_value.sival_ptr = NULL;
-  
-  result = timer_create( clock_id, &evp, &timerid );
-}
diff --git a/testsuites/psxtests/psxhdrs/timer02.c b/testsuites/psxtests/psxhdrs/timer02.c
deleted file mode 100644
index b312d2e143..0000000000
--- a/testsuites/psxtests/psxhdrs/timer02.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <time.h>
- 
-#ifndef _POSIX_TIMERS
-#error "rtems is supposed to have timer_delete"
-#endif
-
-void test( void )
-{
-  timer_t timerid = 0;
-  int     result;
-  
-  result = timer_delete( timerid );
-}
diff --git a/testsuites/psxtests/psxhdrs/timer03.c b/testsuites/psxtests/psxhdrs/timer03.c
deleted file mode 100644
index 5ae0efe07f..0000000000
--- a/testsuites/psxtests/psxhdrs/timer03.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <time.h>
- 
-#ifndef _POSIX_TIMERS
-#error "rtems is supposed to have timer_settime"
-#endif
-
-void test( void )
-{
-  timer_t           timerid = 0;
-  int               flags;
-  struct itimerspec value;
-  struct itimerspec ovalue;
-  int               result;
-
-  value.it_interval.tv_sec = 0;
-  value.it_interval.tv_nsec = 0;
-  value.it_value.tv_sec = 0;
-  value.it_value.tv_nsec = 0;
-
-  flags = TIMER_ABSTIME;
-  flags = CLOCK_REALTIME;
-
-  result = timer_settime( timerid, flags, &value, &ovalue );
-}
diff --git a/testsuites/psxtests/psxhdrs/timer04.c b/testsuites/psxtests/psxhdrs/timer04.c
deleted file mode 100644
index aea13743f0..0000000000
--- a/testsuites/psxtests/psxhdrs/timer04.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <time.h>
- 
-#ifndef _POSIX_TIMERS
-#error "rtems is supposed to have timer_gettime"
-#endif
-
-void test( void )
-{
-  timer_t           timerid = 0;
-  struct itimerspec value;
-  int               result;
-
-  result = timer_gettime( timerid, &value );
-}
diff --git a/testsuites/psxtests/psxhdrs/timer05.c b/testsuites/psxtests/psxhdrs/timer05.c
deleted file mode 100644
index f514857e12..0000000000
--- a/testsuites/psxtests/psxhdrs/timer05.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <time.h>
- 
-#ifndef _POSIX_TIMERS
-#error "rtems is supposed to have timer_getoverrun"
-#endif
-
-void test( void )
-{
-  timer_t           timerid = 0;
-  int               result;
-
-  result = timer_getoverrun( timerid );
-}
diff --git a/testsuites/psxtests/psxhdrs/timer06.c b/testsuites/psxtests/psxhdrs/timer06.c
deleted file mode 100644
index 5d0274397c..0000000000
--- a/testsuites/psxtests/psxhdrs/timer06.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <time.h>
- 
-#ifndef _POSIX_TIMERS
-#error "rtems is supposed to have nanosleep"
-#endif
-
-void test( void )
-{
-  struct timespec rqtp; 
-  struct timespec rmtp; 
-  int             result;
-
-  rqtp.tv_sec = 0;
-  rqtp.tv_nsec = 0;
-  result = nanosleep( &rqtp, &rmtp );
-}
diff --git a/testsuites/samples/README b/testsuites/samples/README
deleted file mode 100644
index bc618c5cfd..0000000000
--- a/testsuites/samples/README
+++ /dev/null
@@ -1,73 +0,0 @@
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-#  $Id$
-#
-
-This directory contains the RTEMS Sample Application Suite.
-The tests in this directory perform two functions:
-
-   + provide simple examples of applications which can be
-     used as a starting point for your application.
-
-   + help test a new board support package
-
-The hello and ticker applications are useful when first bringing up
-a new board support package.  The base_mp test is useful when
-performing initial checkout on a new MPCI layer.
-
-The following describes each of the sample applications:
-
-   base_mp
-
-      This is a very simple two node multiprocessor application.  It consists
-      of a single initialization task on each node which print out
-      their respective node numbers and task IDs.  This test can be
-      used as a simple test of a new MPCI layer because it minimizes
-      the number of packets sent by RTEMS.
-
-      This is intended as a starting point for custom developed multiprocessor
-      applications.
-
-   base_sp
-
-      This is a simple single processor application which consists of
-      an initialization task which creates another task.
-
-      This is intended as a starting point for custom developed single
-      processor applications.
-
-   cdtest
-
-      A very simple C++ application which demonstrates that it is
-      possible to use C++ contructors and destructors in an RTEMS
-      application.  Also does a perfunctory iostream test.
-
-   hello
-
-      This is the RTEMS version of the classic hello world program.
-      It consists of single initialization task which prints out
-      a few messages.
-
-      This test does not include a Clock Tick device driver and can
-      be used to test the startup code of the board support package
-      as well as console output.
-
-   paranoia
-
-      A public domain test of the floating point and math library
-      capabilities of a toolset.  It reports discrepancies between
-      actual and expected results.  It is a large test.
-
-   ticker
-
-      This is a simple test of the user's Clock Tick device driver.
-      This test has an initialization task create three application
-      tasks which sleep and periodically wake up and print the time.
-
diff --git a/testsuites/samples/base_mp/apptask.c b/testsuites/samples/base_mp/apptask.c
deleted file mode 100644
index c4ffaa1625..0000000000
--- a/testsuites/samples/base_mp/apptask.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*  Application_task
- *
- *  This routine is as an example of an application task which
- *  prints a message including its RTEMS task id.  This task
- *  then invokes exit to return to the monitor.
- *
- *  Input parameters:
- *    node - processor's node number
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_task Application_task(
-  rtems_task_argument node
-)
-{
-  rtems_id          tid;
-  rtems_status_code status;
-
-  status = rtems_task_ident( RTEMS_SELF, RTEMS_SEARCH_ALL_NODES, &tid );
-  printf( "This task was invoked with the node argument (%d)\n", node );
-  printf( "This task has the id of 0x%x\n",  tid );
-  printf( "*** END OF SAMPLE MULTIPROCESSOR APPLICATION ***\n" );
-  exit( 0 );
-}
diff --git a/testsuites/samples/base_mp/init.c b/testsuites/samples/base_mp/init.c
deleted file mode 100644
index 58f66e76e5..0000000000
--- a/testsuites/samples/base_mp/init.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/*  Init
- *
- *  This routine is the initialization task for this test program.
- *  It is called from init_exec and has the responsibility for creating
- *  and starting the tasks that make up the test.  If the time of day
- *  clock is required for the application, the current time might be
- *  set by this task.
- *
- *  Input parameters:  NONE
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "system.h"
-
-rtems_task Init(
-  rtems_task_argument argument
-)
-{
-  rtems_name        task_name;
-  rtems_id          tid;
-  rtems_status_code status;
-
-  printf( "\n\n*** SAMPLE MULTIPROCESSOR APPLICATION ***\n" );
-  printf( "Creating and starting an application task\n" );
-  task_name = rtems_build_name( 'T', 'A', '1', ' ' );
-  status = rtems_task_create( task_name, 1, RTEMS_MINIMUM_STACK_SIZE,
-             RTEMS_INTERRUPT_LEVEL(0), RTEMS_DEFAULT_ATTRIBUTES, &tid );
-  status = rtems_task_start(
-    tid,
-    Application_task,
-    Multiprocessing_configuration.node
-  );
-  status = rtems_task_delete( RTEMS_SELF );
-}
diff --git a/testsuites/samples/base_mp/node1/base_mp.doc b/testsuites/samples/base_mp/node1/base_mp.doc
deleted file mode 100644
index 496f3569e5..0000000000
--- a/testsuites/samples/base_mp/node1/base_mp.doc
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
diff --git a/testsuites/samples/base_mp/node1/base_mp.scn b/testsuites/samples/base_mp/node1/base_mp.scn
deleted file mode 100644
index a2d2f359be..0000000000
--- a/testsuites/samples/base_mp/node1/base_mp.scn
+++ /dev/null
@@ -1,5 +0,0 @@
-*** SAMPLE MULTIPROCESSOR APPLICATION ***
-Creating and starting an application task
-This task was invoked with the node argument (1)
-This task has the id of 0x10002
-*** END OF SAMPLE MULTIPROCESSOR APPLICATION ***
diff --git a/testsuites/samples/base_mp/node2/base_mp.doc b/testsuites/samples/base_mp/node2/base_mp.doc
deleted file mode 100644
index 496f3569e5..0000000000
--- a/testsuites/samples/base_mp/node2/base_mp.doc
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
diff --git a/testsuites/samples/base_mp/node2/base_mp.scn b/testsuites/samples/base_mp/node2/base_mp.scn
deleted file mode 100644
index 95bc96a808..0000000000
--- a/testsuites/samples/base_mp/node2/base_mp.scn
+++ /dev/null
@@ -1,5 +0,0 @@
-*** SAMPLE MULTIPROCESSOR APPLICATION ***
-Creating and starting an application task
-This task was invoked with the node argument (2)
-This task has the id of 0x20002
-*** END OF SAMPLE MULTIPROCESSOR APPLICATION ***
diff --git a/testsuites/samples/base_mp/system.h b/testsuites/samples/base_mp/system.h
deleted file mode 100644
index 27088d078c..0000000000
--- a/testsuites/samples/base_mp/system.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*  system.h
- *
- *  This include file contains information that is included in every
- *  function in the test set.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <tmacros.h>
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
-
-rtems_task Application_task(
-  rtems_task_argument argument
-);
-
-/* configuration information */
- 
-#define CONFIGURE_MPTEST
- 
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
- 
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-/*
- *  Put the overrides of default configuration parameters here.
- */
-
-#include <confdefs.h>
-
-/* variables */
-
-TEST_EXTERN rtems_id Global_variable;   /* example global variable     */
- 
-/* end of include file */
diff --git a/testsuites/samples/base_sp/apptask.c b/testsuites/samples/base_sp/apptask.c
deleted file mode 100644
index 2a3196a37f..0000000000
--- a/testsuites/samples/base_sp/apptask.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/*  Application_task
- *
- *  This routine is as an example of an application task which
- *  prints a message including its RTEMS task id.  This task
- *  then invokes exit to return to the monitor.
- *
- *  Input parameters:  NONE
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_task Application_task(
-  rtems_task_argument argument
-)
-{
-  rtems_id          tid;
-  rtems_status_code status;
-
-  status = rtems_task_ident( RTEMS_SELF, RTEMS_SEARCH_ALL_NODES, &tid );
-
-  printf( "Application task was invoked with argument (%d) "
-          "and has id of 0x%x\n", argument, tid );
-
-  printf( "*** END OF SAMPLE SINGLE PROCESSOR APPLICATION ***\n" );
-  exit( 0 );
-}
diff --git a/testsuites/samples/base_sp/base_sp.doc b/testsuites/samples/base_sp/base_sp.doc
deleted file mode 100644
index 496f3569e5..0000000000
--- a/testsuites/samples/base_sp/base_sp.doc
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
diff --git a/testsuites/samples/base_sp/base_sp.scn b/testsuites/samples/base_sp/base_sp.scn
deleted file mode 100644
index 117ddaecb8..0000000000
--- a/testsuites/samples/base_sp/base_sp.scn
+++ /dev/null
@@ -1,5 +0,0 @@
-*** SAMPLE SINGLE PROCESSOR APPLICATION ***
-Creating and starting an application task
-Application task was invoked with argument (0) and has id of 0x10002
-*** END OF SAMPLE SINGLE PROCESSOR APPLICATION ***
-
diff --git a/testsuites/samples/base_sp/init.c b/testsuites/samples/base_sp/init.c
deleted file mode 100644
index c3f1aabefc..0000000000
--- a/testsuites/samples/base_sp/init.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*  Init
- *
- *  This routine is the initialization task for this test program.
- *  It is called from init_exec and has the responsibility for creating
- *  and starting the tasks that make up the test.  If the time of day
- *  clock is required for the application, the current time might be
- *  set by this task.
- *
- *  Input parameters:  NONE
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "system.h"
-
-#define ARGUMENT 0
-
-rtems_task Init(
-  rtems_task_argument argument
-)
-{
-  rtems_name        task_name;
-  rtems_id          tid;
-  rtems_status_code status;
-
-  printf( "\n\n*** SAMPLE SINGLE PROCESSOR APPLICATION ***\n" );
-  printf( "Creating and starting an application task\n" );
-
-  task_name = rtems_build_name( 'T', 'A', '1', ' ' );
-
-  status = rtems_task_create( task_name, 1, RTEMS_MINIMUM_STACK_SIZE,
-             RTEMS_INTERRUPT_LEVEL(0), RTEMS_DEFAULT_ATTRIBUTES, &tid );
-
-  status = rtems_task_start( tid, Application_task, ARGUMENT );
-
-  status = rtems_task_delete( RTEMS_SELF );
-}
diff --git a/testsuites/samples/base_sp/system.h b/testsuites/samples/base_sp/system.h
deleted file mode 100644
index b0c56044ae..0000000000
--- a/testsuites/samples/base_sp/system.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*  system.h
- *
- *  This include file contains information that is included in every
- *  function in the test set.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <tmacros.h>
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
-
-rtems_task Application_task(
-  rtems_task_argument argument
-);
-
-/* configuration information */
-
-#define CONFIGURE_SPTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#include <confdefs.h>
-
-/* global variables */
-
-TEST_EXTERN rtems_id Global_variable;    /* example global variable     */
-
-/* end of include file */
diff --git a/testsuites/samples/cdtest/cdtest.scn b/testsuites/samples/cdtest/cdtest.scn
deleted file mode 100644
index a832a72372..0000000000
--- a/testsuites/samples/cdtest/cdtest.scn
+++ /dev/null
@@ -1,31 +0,0 @@
-Hey I'm in base class constructor number 1 for 0x400010cc.
-Hey I'm in base class constructor number 2 for 0x400010d4.
-Hey I'm in derived class constructor number 3 for 0x400010d4.
-
-
-*** CONSTRUCTOR/DESTRUCTOR TEST ***
-Hey I'm in base class constructor number 4 for 0x4009ee08.
-Hey I'm in base class constructor number 5 for 0x4009ee10.
-Hey I'm in base class constructor number 6 for 0x4009ee18.
-Hey I'm in base class constructor number 7 for 0x4009ee20.
-Hey I'm in derived class constructor number 8 for 0x4009ee20.
-Testing a C++ I/O stream
-Hey I'm in derived class destructor number 8 for 0x4009ee20.
-Derived class - Instantiation order 8
-Hey I'm in base class destructor number 7 for 0x4009ee20.
-Instantiation order 8
-Hey I'm in base class destructor number 6 for 0x4009ee18.
-Instantiation order 6
-Hey I'm in base class destructor number 5 for 0x4009ee10.
-Instantiation order 5
-Hey I'm in base class destructor number 4 for 0x4009ee08.
-Instantiation order 5
-*** END OF CONSTRUCTOR/DESTRUCTOR TEST ***
-
-
-Hey I'm in derived class destructor number 3 for 0x400010d4.
-Derived class - Instantiation order 3
-Hey I'm in base class destructor number 2 for 0x400010d4.
-Instantiation order 3
-Hey I'm in base class destructor number 1 for 0x400010cc.
-Instantiation order 1
diff --git a/testsuites/samples/cdtest/init.c b/testsuites/samples/cdtest/init.c
deleted file mode 100644
index 4d408147cc..0000000000
--- a/testsuites/samples/cdtest/init.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/*  Init
- *
- *  This routine is the initialization task for this test program.
- *  It is called from init_exec and has the responsibility for creating
- *  and starting the tasks that make up the test.  If the time of day
- *  clock is required for the test, it should also be set to a known
- *  value by this function.
- *
- *  Input parameters:  NONE
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "system.h"
-#include <stdio.h>
diff --git a/testsuites/samples/cdtest/main.cc b/testsuites/samples/cdtest/main.cc
deleted file mode 100644
index 19f7d50174..0000000000
--- a/testsuites/samples/cdtest/main.cc
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- *  This routine is the initialization task for this test program.
- *  It is called from init_exec and has the responsibility for creating
- *  and starting the tasks that make up the test.  If the time of day
- *  clock is required for the test, it should also be set to a known
- *  value by this function.
- *
- *  Input parameters:  NONE
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1994 by Division Incorporated
- *  Based in part on OAR works.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems.h>
-#include <stdio.h>
-#include <stdlib.h>
-#ifdef RTEMS_TEST_IO_STREAM
-#include <iostream.h>
-#endif
-
-extern "C" {
-extern rtems_task main_task(rtems_task_argument);
-}
-
-static int num_inst = 0;
-
-class A {
-public:
-    A(void)
-    {
-        num_inst++;
-        printf(
-          "Hey I'm in base class constructor number %d for %p.\n",
-          num_inst,
-          this
-        );
-
-	/*
-	 * Make sure we use some space
-	 */
-
-        string = new char[50];
-	sprintf(string, "Instantiation order %d", num_inst);
-    };
-
-    virtual ~A()
-    {
-        printf(
-          "Hey I'm in base class destructor number %d for %p.\n",
-          num_inst,
-          this
-        );
-	print();
-        num_inst--;
-    };
-
-    virtual void print()  { printf("%s\n", string); };
-
-protected:
-    char  *string;
-};
-
-class B : public A {
-public:
-    B(void)
-    {
-        num_inst++;
-        printf(
-          "Hey I'm in derived class constructor number %d for %p.\n",
-          num_inst,
-          this
-        );
-
-	/*
-	 * Make sure we use some space
-	 */
-
-        string = new char[50];
-	sprintf(string, "Instantiation order %d", num_inst);
-    };
-
-    ~B()
-    {
-        printf(
-          "Hey I'm in derived class destructor number %d for %p.\n",
-          num_inst,
-          this
-        );
-	      print();
-        num_inst--;
-    };
-
-    void print()  { printf("Derived class - %s\n", string); }
-};
-
-
-A foo;
-B foobar;
-
-void
-cdtest(void)
-{
-    A bar, blech, blah;
-    B bleak;
-
-#ifdef RTEMS_TEST_IO_STREAM
-    cout << "Testing a C++ I/O stream" << endl;
-#else
-    printf("IO Stream not tested\n");
-#endif
-
-    bar = blech;
-}
-
-//
-// main equivalent
-//      It can not be called 'main' since the bsp owns that name
-//      in many implementations in order to get global constructors
-//      run.
-//
-
-
-rtems_task main_task(
-  rtems_task_argument 
-)
-{
-    printf( "\n\n*** CONSTRUCTOR/DESTRUCTOR TEST ***\n" );
-
-    cdtest();
-
-    printf( "*** END OF CONSTRUCTOR/DESTRUCTOR TEST ***\n\n\n" );
-
-    exit(0);
-}
diff --git a/testsuites/samples/cdtest/system.h b/testsuites/samples/cdtest/system.h
deleted file mode 100644
index 975be98a2f..0000000000
--- a/testsuites/samples/cdtest/system.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*  system.h
- *
- *  This include file contains information that is included in every
- *  function in the test set.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <tmacros.h>
-
-/* functions */
-
-rtems_task main_task(
-  rtems_task_argument argument
-);
-
-/* configuration information */
-
-#define CONFIGURE_SPTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-#define CONFIGURE_INIT_TASK_ENTRY_POINT   main_task
-#define CONFIGURE_INIT_TASK_NAME          rtems_build_name( 'C', 'T', 'O', 'R' )
-
-#include <confdefs.h>
-
-/* global variables */
-
-TEST_EXTERN rtems_id Global_variable;   /* example global variable     */
- 
-/* end of include file */
diff --git a/testsuites/samples/hello/hello.doc b/testsuites/samples/hello/hello.doc
deleted file mode 100644
index 496f3569e5..0000000000
--- a/testsuites/samples/hello/hello.doc
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
diff --git a/testsuites/samples/hello/hello.scn b/testsuites/samples/hello/hello.scn
deleted file mode 100644
index d9e92d81d5..0000000000
--- a/testsuites/samples/hello/hello.scn
+++ /dev/null
@@ -1,3 +0,0 @@
-*** HELLO WORLD TEST ***
-Hello World
-*** END OF HELLO WORLD TEST ***
diff --git a/testsuites/samples/hello/init.c b/testsuites/samples/hello/init.c
deleted file mode 100644
index 3931c1a2bf..0000000000
--- a/testsuites/samples/hello/init.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/*  Init
- *
- *  This routine is the initialization task for this test program.
- *  It is called from init_exec and has the responsibility for creating
- *  and starting the tasks that make up the test.  If the time of day
- *  clock is required for the test, it should also be set to a known
- *  value by this function.
- *
- *  Input parameters:  NONE
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "system.h"
-#include <stdio.h>
-
-rtems_task Init(
-  rtems_task_argument ignored
-)
-{
-  printf( "\n\n*** HELLO WORLD TEST ***\n" );
-  printf( "Hello World\n" );
-  printf( "*** END OF HELLO WORLD TEST ***\n" );
-  exit( 0 );
-}
diff --git a/testsuites/samples/hello/system.h b/testsuites/samples/hello/system.h
deleted file mode 100644
index 94a854da15..0000000000
--- a/testsuites/samples/hello/system.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*  system.h
- *
- *  This include file contains information that is included in every
- *  function in the test set.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <tmacros.h>
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
-
-/* configuration information */
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#include <confdefs.h>
-
-/* global variables */
-
-TEST_EXTERN rtems_id Global_variable;   /* example global variable     */
-
-/* end of include file */
diff --git a/testsuites/samples/paranoia/init.c b/testsuites/samples/paranoia/init.c
deleted file mode 100644
index c562e9c44a..0000000000
--- a/testsuites/samples/paranoia/init.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*  Init
- *
- *  This routine is the initialization task for this test program.
- *  It is called from init_exec and has the responsibility for creating
- *  and starting the tasks that make up the test.  If the time of day
- *  clock is required for the test, it should also be set to a known
- *  value by this function.
- *
- *  Input parameters:  NONE
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "system.h"
-
-extern int paranoia(int, char **);
-
-char *args[2] = { "paranoia", 0 };
-
-rtems_task Init(
-  rtems_task_argument ignored
-)
-{
-  /*
-   *  Install whatever optional floating point assistance package
-   *  is required by this CPU.
-   */
-
-#if (defined (m68040))
-  M68KFPSPInstallExceptionHandlers ();
-#endif
-
-  printf( "\n\n*** PARANOIA TEST ***\n" );
-  paranoia(1, args);
-  printf( "*** END OF PARANOIA TEST ***\n" );
-  exit( 0 );
-}
diff --git a/testsuites/samples/paranoia/paranoia.c b/testsuites/samples/paranoia/paranoia.c
deleted file mode 100644
index 67228436e1..0000000000
--- a/testsuites/samples/paranoia/paranoia.c
+++ /dev/null
@@ -1,2304 +0,0 @@
-/*
- *  $Id$
- *
- *      A C version of Kahan's Floating Point Test "Paranoia"
- *
- *                      Thos Sumner, UCSF, Feb. 1985
- *                      David Gay, BTL, Jan. 1986
- *
- *      This is a rewrite from the Pascal version by
- *
- *                      B. A. Wichmann, 18 Jan. 1985
- *
- *      (and does NOT exhibit good C programming style).
- *
- *      Sun May 16 18:21:51 MDT 1993 Jeffrey Wheat (cassidy@cygnus.com)
- *      Removed KR_headers defines, removed ANSI prototyping
- *      Cleaned up and reformated code. Added special CYGNUS
- *      "verbose" mode type messages (-DCYGNUS).
- *      Note: This code is VERY NASTY.
- *
- *      Adjusted to use Standard C headers 19 Jan. 1992 (dmg);
- *      compile with -DKR_headers or insert
- * #define KR_headers
- *      at the beginning if you have an old-style C compiler.
- *
- * (C) Apr 19 1983 in BASIC version by:
- *      Professor W. M. Kahan,
- *      567 Evans Hall
- *      Electrical Engineering & Computer Science Dept.
- *      University of California
- *      Berkeley, California 94720
- *      USA
- *
- * converted to Pascal by:
- *      B. A. Wichmann
- *      National Physical Laboratory
- *      Teddington Middx
- *      TW11 OLW
- *      UK
- *
- * converted to C by:
- *
- *      David M. Gay            and     Thos Sumner
- *      AT&T Bell Labs                  Computer Center, Rm. U-76
- *      600 Mountain Avenue             University of California
- *      Murray Hill, NJ 07974           San Francisco, CA 94143
- *      USA                             USA
- *
- * with simultaneous corrections to the Pascal source (reflected
- * in the Pascal source available over netlib).
- * [A couple of bug fixes from dgh = sun!dhough incorporated 31 July 1986.]
- *
- * Reports of results on various systems from all the versions
- * of Paranoia are being collected by Richard Karpinski at the
- * same address as Thos Sumner.  This includes sample outputs,
- * bug reports, and criticisms.
- *
- * You may copy this program freely if you acknowledge its source.
- * Comments on the Pascal version to NPL, please.
- *
- *
- * The C version catches signals from floating-point exceptions.
- * If signal(SIGFPE,...) is unavailable in your environment, you may
- * #define NOSIGNAL to comment out the invocations of signal.
- *
- * This source file is too big for some C compilers, but may be split
- * into pieces.  Comments containing "SPLIT" suggest convenient places
- * for this splitting.  At the end of these comments is an "ed script"
- * (for the UNIX(tm) editor ed) that will do this splitting.
- *
- * By #defining SINGLE_PRECISION when you compile this source, you may
- * obtain a single-precision C version of Paranoia.
- *
- * The following is from the introductory commentary from Wichmann's work:
- *
- * The BASIC program of Kahan is written in Microsoft BASIC using many
- * facilities which have no exact analogy in Pascal.  The Pascal
- * version below cannot therefore be exactly the same.  Rather than be
- * a minimal transcription of the BASIC program, the Pascal coding
- * follows the conventional style of block-structured languages.  Hence
- * the Pascal version could be useful in producing versions in other
- * structured languages.
- *
- * Rather than use identifiers of minimal length (which therefore have
- * little mnemonic significance), the Pascal version uses meaningful
- * identifiers as follows [Note: A few changes have been made for C]:
- *
- *
- * BASIC   C               BASIC   C               BASIC   C
- *
- *   A                       J                       S    StickyBit
- *   A1   AInverse           J0   NoErrors           T
- *   B    Radix                    [Failure]         T0   Underflow
- *   B1   BInverse           J1   NoErrors           T2   ThirtyTwo
- *   B2   RadixD2                  [SeriousDefect]   T5   OneAndHalf
- *   B9   BMinusU2           J2   NoErrors           T7   TwentySeven
- *   C                             [Defect]          T8   TwoForty
- *   C1   CInverse           J3   NoErrors           U    OneUlp
- *   D                             [Flaw]            U0   UnderflowThreshold
- *   D4   FourD              K    PageNo             U1
- *   E0                      L    Milestone          U2
- *   E1                      M                       V
- *   E2   Exp2               N                       V0
- *   E3                      N1                      V8
- *   E5   MinSqEr            O    Zero               V9
- *   E6   SqEr               O1   One                W
- *   E7   MaxSqEr            O2   Two                X
- *   E8                      O3   Three              X1
- *   E9                      O4   Four               X8
- *   F1   MinusOne           O5   Five               X9   Random1
- *   F2   Half               O8   Eight              Y
- *   F3   Third              O9   Nine               Y1
- *   F6                      P    Precision          Y2
- *   F9                      Q                       Y9   Random2
- *   G1   GMult              Q8                      Z
- *   G2   GDiv               Q9                      Z0   PseudoZero
- *   G3   GAddSub            R                       Z1
- *   H                       R1   RMult              Z2
- *   H1   HInverse           R2   RDiv               Z9
- *   I                       R3   RAddSub
- *   IO   NoTrials           R4   RSqrt
- *   I3   IEEE               R9   Random9
- *
- * SqRWrng
- *
- * All the variables in BASIC are true variables and in consequence,
- * the program is more difficult to follow since the "constants" must
- * be determined (the glossary is very helpful).  The Pascal version
- * uses Real constants, but checks are added to ensure that the values
- * are correctly converted by the compiler.
- *
- * The major textual change to the Pascal version apart from the
- * identifiersis that named procedures are used, inserting parameters
- * wherehelpful.  New procedures are also introduced.  The
- * correspondence is as follows:
- *
- *
- * BASIC       Pascal
- * lines
- *
- *   90- 140   Pause
- *  170- 250   Instructions
- *  380- 460   Heading
- *  480- 670   Characteristics
- *  690- 870   History
- * 2940-2950   Random
- * 3710-3740   NewD
- * 4040-4080   DoesYequalX
- * 4090-4110   PrintIfNPositive
- * 4640-4850   TestPartialUnderflow
- *
-*/
-
-#include <stdio.h>
-#include <string.h>
-
-#if defined(solaris2)
-#include <math.h>
-#endif
-
-/*
- * To compile this on host using only libm from newlib (and using host libc)
- * do:
- *       gcc -g -DNEED_REENT -DCYGNUS paranoia.c .../newlib-1.6/newlib/libm.a
- */
-
-#ifdef NEED_REENT
-#include <reent.h>
-struct _reent libm_reent = _REENT_INIT(libm_reent);
-struct _reent *_impure_ptr = &libm_reent;
-#endif
-
-#ifndef NOSIGNAL
-#include <signal.h>
-#include <setjmp.h>
-#else   /* NOSIGNAL */
-#define longjmp(e,v)
-#define setjmp(e)       0
-#define jmp_buf  int
-#endif /* NOSIGNAL */
-
-#ifdef SINGLE_PRECISION
-#define FLOAT float
-#define FABS(x) (float)fabs((double)(x))
-#define FLOOR(x) (float)floor((double)(x))
-#define LOG(x) (float)log((double)(x))
-#define POW(x,y) (float)pow((double)(x),(double)(y))
-#define SQRT(x) (float)sqrt((double)(x))
-#else /* !SINGLE_PRECISION */
-#define FLOAT double
-#define FABS(x) fabs(x)
-#define FLOOR(x) floor(x)
-#define LOG(x) log(x)
-#define POW(x,y) pow(x,y)
-#define SQRT(x) sqrt(x)
-#endif /* SINGLE_PRECISION */
-
-jmp_buf ovfl_buf;
-extern double fabs (), floor (), log (), pow (), sqrt ();
-extern void exit ();
-typedef void (*Sig_type) ();
-FLOAT   Sign (), Random ();
-extern void BadCond ();
-extern void SqXMinX ();
-extern void TstCond ();
-extern void notify ();
-extern int read ();
-extern void Characteristics ();
-extern void Heading ();
-extern void History ();
-extern void Instructions ();
-extern void IsYeqX ();
-extern void NewD ();
-extern void Pause ();
-extern void PrintIfNPositive ();
-extern void SR3750 ();
-extern void SR3980 ();
-extern void TstPtUf ();
-
-Sig_type sigsave;
-
-#define KEYBOARD 0
-
-FLOAT   Radix, BInvrse, RadixD2, BMinusU2;
-
-/*Small floating point constants.*/
-FLOAT   Zero = 0.0;
-FLOAT   Half = 0.5;
-FLOAT   One = 1.0;
-FLOAT   Two = 2.0;
-FLOAT   Three = 3.0;
-FLOAT   Four = 4.0;
-FLOAT   Five = 5.0;
-FLOAT   Eight = 8.0;
-FLOAT   Nine = 9.0;
-FLOAT   TwentySeven = 27.0;
-FLOAT   ThirtyTwo = 32.0;
-FLOAT   TwoForty = 240.0;
-FLOAT   MinusOne = -1.0;
-FLOAT   OneAndHalf = 1.5;
-
-/*Integer constants*/
-int     NoTrials = 20;          /*Number of tests for commutativity. */
-#define False 0
-#define True 1
-
-/*
- * Definitions for declared types
- *      Guard == (Yes, No);
- *      Rounding == (Chopped, Rounded, Other);
- *      Message == packed array [1..40] of char;
- *      Class == (Flaw, Defect, Serious, Failure);
- */
-#define Yes 1
-#define No  0
-#define Chopped 2
-#define Rounded 1
-#define Other   0
-#define Flaw    3
-#define Defect  2
-#define Serious 1
-#define Failure 0
-typedef int Guard, Rounding, Class;
-typedef char Message;
-
-/* Declarations of Variables */
-int     Indx;
-char    ch[8];
-FLOAT   AInvrse, A1;
-FLOAT   C, CInvrse;
-FLOAT   D, FourD;
-FLOAT   E0, E1, Exp2, E3, MinSqEr;
-FLOAT   SqEr, MaxSqEr, E9;
-FLOAT   Third;
-FLOAT   F6, F9;
-FLOAT   H, HInvrse;
-int     I;
-FLOAT   StickyBit, J;
-FLOAT   MyZero;
-FLOAT   Precision;
-FLOAT   Q, Q9;
-FLOAT   R, Random9;
-FLOAT   T, Underflow, S;
-FLOAT   OneUlp, UfThold, U1, U2;
-FLOAT   V, V0, V9;
-FLOAT   W;
-FLOAT   X, X1, X2, X8, Random1;
-FLOAT   Y, Y1, Y2, Random2;
-FLOAT   Z, PseudoZero, Z1, Z2, Z9;
-int     ErrCnt[4];
-int     fpecount;
-int     Milestone;
-int     PageNo;
-int     M, N, N1;
-Guard   GMult, GDiv, GAddSub;
-Rounding RMult, RDiv, RAddSub, RSqrt;
-int     Break, Done, NotMonot, Monot, Anomaly, IEEE, SqRWrng, UfNGrad;
-
-/* Computed constants.
- *   U1 gap below 1.0, i.e, 1.0 - U1 is next number below 1.0
- *   U2 gap above 1.0, i.e, 1.0 + U2 is next number above 1.0
- */
-
-int     batchmode;              /* global batchmode test */
-
-/* program name and version variables and macro */
-char   *temp;
-char   *program_name;
-char   *program_vers;
-
-#ifndef VERSION
-#define VERSION "1.1 [cygnus]"
-#endif /* VERSION */
-
-#define basename(cp)    ((temp=(char *)strrchr((cp), '/')) ? temp+1 : (cp))
-
-#ifndef BATCHMODE
-# ifdef CYGNUS
-#  define BATCHMODE
-# endif
-#endif
-
-/* floating point exception receiver */
-void
-_sigfpe (x)
-int x;
-{
-    fpecount++;
-    printf ("\n* * * FLOATING-POINT ERROR %d * * *\n", x);
-    fflush (stdout);
-    if (sigsave) {
-#ifndef NOSIGNAL
-        signal (SIGFPE, sigsave);
-#endif /* NOSIGNAL */
-        sigsave = 0;
-        longjmp (ovfl_buf, 1);
-    }
-    exit (1);
-}
-
-#ifdef NOMAIN
-#define main paranoia
-#endif
-
-int
-main (argc, argv)
-int argc;
-char **argv;
-{
-    /* First two assignments use integer right-hand sides. */
-    Zero = 0;
-    One = 1;
-    Two = One + One;
-    Three = Two + One;
-    Four = Three + One;
-    Five = Four + One;
-    Eight = Four + Four;
-    Nine = Three * Three;
-    TwentySeven = Nine * Three;
-    ThirtyTwo = Four * Eight;
-    TwoForty = Four * Five * Three * Four;
-    MinusOne = -One;
-    Half = One / Two;
-    OneAndHalf = One + Half;
-    ErrCnt[Failure] = 0;
-    ErrCnt[Serious] = 0;
-    ErrCnt[Defect] = 0;
-    ErrCnt[Flaw] = 0;
-    PageNo = 1;
-
-#ifdef BATCHMODE
-    batchmode = 1;              /* run test in batchmode? */
-#else /* !BATCHMODE */
-    batchmode = 0;              /* run test interactively */
-#endif /* BATCHMODE */
-
-    program_name = basename (argv[0]);
-    program_vers = VERSION;
-
-    printf ("%s version %s\n", program_name, program_vers);
-
-    /*=============================================*/
-    Milestone = 0;
-    /*=============================================*/
-#ifndef NOSIGNAL
-    signal (SIGFPE, _sigfpe);
-#endif
-
-    if (!batchmode) {
-        Instructions ();
-        Pause ();
-        Heading ();
-        Instructions ();
-        Pause ();
-        Heading ();
-        Pause ();
-        Characteristics ();
-        Pause ();
-        History ();
-        Pause ();
-    }
-
-    /*=============================================*/
-    Milestone = 7;
-    /*=============================================*/
-    printf ("Program is now RUNNING tests on small integers:\n");
-    TstCond (Failure, (Zero + Zero == Zero) && (One - One == Zero)
-        && (One > Zero) && (One + One == Two),
-        "0+0 != 0, 1-1 != 0, 1 <= 0, or 1+1 != 2");
-    Z = -Zero;
-    if (Z != 0.0) {
-        ErrCnt[Failure] = ErrCnt[Failure] + 1;
-        printf ("Comparison alleges that -0.0 is Non-zero!\n");
-        U1 = 0.001;
-        Radix = 1;
-        TstPtUf ();
-    }
-    TstCond (Failure, (Three == Two + One) && (Four == Three + One)
-        && (Four + Two * (-Two) == Zero)
-        && (Four - Three - One == Zero),
-        "3 != 2+1, 4 != 3+1, 4+2*(-2) != 0, or 4-3-1 != 0");
-    TstCond (Failure, (MinusOne == (0 - One))
-        && (MinusOne + One == Zero) && (One + MinusOne == Zero)
-        && (MinusOne + FABS (One) == Zero)
-        && (MinusOne + MinusOne * MinusOne == Zero),
-        "-1+1 != 0, (-1)+abs(1) != 0, or -1+(-1)*(-1) != 0");
-    TstCond (Failure, Half + MinusOne + Half == Zero,
-        "1/2 + (-1) + 1/2 != 0");
-    /*=============================================*/
-    Milestone = 10;
-    /*=============================================*/
-    TstCond (Failure, (Nine == Three * Three)
-        && (TwentySeven == Nine * Three) && (Eight == Four + Four)
-        && (ThirtyTwo == Eight * Four)
-        && (ThirtyTwo - TwentySeven - Four - One == Zero),
-        "9 != 3*3, 27 != 9*3, 32 != 8*4, or 32-27-4-1 != 0");
-    TstCond (Failure, (Five == Four + One) &&
-        (TwoForty == Four * Five * Three * Four)
-        && (TwoForty / Three - Four * Four * Five == Zero)
-        && (TwoForty / Four - Five * Three * Four == Zero)
-        && (TwoForty / Five - Four * Three * Four == Zero),
-        "5 != 4+1, 240/3 != 80, 240/4 != 60, or 240/5 != 48");
-    if (ErrCnt[Failure] == 0) {
-        printf ("-1, 0, 1/2, 1, 2, 3, 4, 5, 9, 27, 32 & 240 are O.K.\n");
-        printf ("\n");
-    }
-    printf ("Searching for Radix and Precision.\n");
-    W = One;
-    do {
-        W = W + W;
-        Y = W + One;
-        Z = Y - W;
-        Y = Z - One;
-    }
-    while (MinusOne + FABS (Y) < Zero);
-    /*.. now W is just big enough that |((W+1)-W)-1| >= 1 ...*/
-    Precision = Zero;
-    Y = One;
-    do {
-        Radix = W + Y;
-        Y = Y + Y;
-        Radix = Radix - W;
-    }
-    while (Radix == Zero);
-    if (Radix < Two)
-        Radix = One;
-    printf ("Radix = %f .\n", Radix);
-    if (Radix != 1) {
-        W = One;
-        do {
-            Precision = Precision + One;
-            W = W * Radix;
-            Y = W + One;
-        }
-        while ((Y - W) == One);
-    }
-    /*... now W == Radix^Precision is barely too big to satisfy (W+1)-W == 1
-                                                      ...*/
-    U1 = One / W;
-    U2 = Radix * U1;
-    printf ("Closest relative separation found is U1 = %.7e .\n\n", U1);
-    printf ("Recalculating radix and precision\n ");
-
-    /*save old values*/
-    E0 = Radix;
-    E1 = U1;
-    E9 = U2;
-    E3 = Precision;
-
-    X = Four / Three;
-    Third = X - One;
-    F6 = Half - Third;
-    X = F6 + F6;
-    X = FABS (X - Third);
-    if (X < U2)
-        X = U2;
-
-    /*... now X = (unknown no.) ulps of 1+...*/
-    do {
-        U2 = X;
-        Y = Half * U2 + ThirtyTwo * U2 * U2;
-        Y = One + Y;
-        X = Y - One;
-    }
-    while (!((U2 <= X) || (X <= Zero)));
-
-    /*... now U2 == 1 ulp of 1 + ... */
-    X = Two / Three;
-    F6 = X - Half;
-    Third = F6 + F6;
-    X = Third - Half;
-    X = FABS (X + F6);
-    if (X < U1)
-        X = U1;
-
-    /*... now  X == (unknown no.) ulps of 1 -... */
-    do {
-        U1 = X;
-        Y = Half * U1 + ThirtyTwo * U1 * U1;
-        Y = Half - Y;
-        X = Half + Y;
-        Y = Half - X;
-        X = Half + Y;
-    }
-    while (!((U1 <= X) || (X <= Zero)));
-    /*... now U1 == 1 ulp of 1 - ... */
-    if (U1 == E1)
-        printf ("confirms closest relative separation U1 .\n");
-    else
-        printf ("gets better closest relative separation U1 = %.7e .\n", U1);
-    W = One / U1;
-    F9 = (Half - U1) + Half;
-    Radix = FLOOR (0.01 + U2 / U1);
-    if (Radix == E0)
-        printf ("Radix confirmed.\n");
-    else
-        printf ("MYSTERY: recalculated Radix = %.7e .\n", Radix);
-    TstCond (Defect, Radix <= Eight + Eight,
-        "Radix is too big: roundoff problems");
-    TstCond (Flaw, (Radix == Two) || (Radix == 10)
-        || (Radix == One), "Radix is not as good as 2 or 10");
-    /*=============================================*/
-    Milestone = 20;
-    /*=============================================*/
-    TstCond (Failure, F9 - Half < Half,
-        "(1-U1)-1/2 < 1/2 is FALSE, prog. fails?");
-    X = F9;
-    I = 1;
-    Y = X - Half;
-    Z = Y - Half;
-    TstCond (Failure, (X != One)
-        || (Z == Zero), "Comparison is fuzzy,X=1 but X-1/2-1/2 != 0");
-    X = One + U2;
-    I = 0;
-    /*=============================================*/
-    Milestone = 25;
-    /*=============================================*/
-    /*... BMinusU2 = nextafter(Radix, 0) */
-    BMinusU2 = Radix - One;
-    BMinusU2 = (BMinusU2 - U2) + One;
-    /* Purify Integers */
-    if (Radix != One) {
-        X = -TwoForty * LOG (U1) / LOG (Radix);
-        Y = FLOOR (Half + X);
-        if (FABS (X - Y) * Four < One)
-            X = Y;
-        Precision = X / TwoForty;
-        Y = FLOOR (Half + Precision);
-        if (FABS (Precision - Y) * TwoForty < Half)
-            Precision = Y;
-    }
-    if ((Precision != FLOOR (Precision)) || (Radix == One)) {
-        printf ("Precision cannot be characterized by an Integer number\n");
-        printf ("of significant digits but, by itself, this is a minor flaw.\n");
-    }
-    if (Radix == One)
-        printf ("logarithmic encoding has precision characterized solely by U1.\n");
-    else
-        printf ("The number of significant digits of the Radix is %f .\n",
-            Precision);
-    TstCond (Serious, U2 * Nine * Nine * TwoForty < One,
-        "Precision worse than 5 decimal figures  ");
-    /*=============================================*/
-    Milestone = 30;
-    /*=============================================*/
-    /* Test for extra-precise subepressions */
-    X = FABS (((Four / Three - One) - One / Four) * Three - One / Four);
-    do {
-        Z2 = X;
-        X = (One + (Half * Z2 + ThirtyTwo * Z2 * Z2)) - One;
-    }
-    while (!((Z2 <= X) || (X <= Zero)));
-    X = Y = Z = FABS ((Three / Four - Two / Three) * Three - One / Four);
-    do {
-        Z1 = Z;
-        Z = (One / Two - ((One / Two - (Half * Z1 + ThirtyTwo * Z1 * Z1))
-                + One / Two)) + One / Two;
-    }
-    while (!((Z1 <= Z) || (Z <= Zero)));
-    do {
-        do {
-            Y1 = Y;
-            Y = (Half - ((Half - (Half * Y1 + ThirtyTwo * Y1 * Y1)) + Half
-                )) + Half;
-        }
-        while (!((Y1 <= Y) || (Y <= Zero)));
-        X1 = X;
-        X = ((Half * X1 + ThirtyTwo * X1 * X1) - F9) + F9;
-    }
-    while (!((X1 <= X) || (X <= Zero)));
-    if ((X1 != Y1) || (X1 != Z1)) {
-        BadCond (Serious, "Disagreements among the values X1, Y1, Z1,\n");
-        printf ("respectively  %.7e,  %.7e,  %.7e,\n", X1, Y1, Z1);
-        printf ("are symptoms of inconsistencies introduced\n");
-        printf ("by extra-precise evaluation of arithmetic subexpressions.\n");
-        notify ("Possibly some part of this");
-        if ((X1 == U1) || (Y1 == U1) || (Z1 == U1))
-            printf (
-                "That feature is not tested further by this program.\n");
-    } else {
-        if ((Z1 != U1) || (Z2 != U2)) {
-            if ((Z1 >= U1) || (Z2 >= U2)) {
-                BadCond (Failure, "");
-                notify ("Precision");
-                printf ("\tU1 = %.7e, Z1 - U1 = %.7e\n", U1, Z1 - U1);
-                printf ("\tU2 = %.7e, Z2 - U2 = %.7e\n", U2, Z2 - U2);
-            } else {
-                if ((Z1 <= Zero) || (Z2 <= Zero)) {
-                    printf ("Because of unusual Radix = %f", Radix);
-                    printf (", or exact rational arithmetic a result\n");
-                    printf ("Z1 = %.7e, or Z2 = %.7e ", Z1, Z2);
-                    notify ("of an\nextra-precision");
-                }
-                if (Z1 != Z2 || Z1 > Zero) {
-                    X = Z1 / U1;
-                    Y = Z2 / U2;
-                    if (Y > X)
-                        X = Y;
-                    Q = -LOG (X);
-                    printf ("Some subexpressions appear to be calculated extra\n");
-                    printf ("precisely with about %g extra B-digits, i.e.\n",
-                        (Q / LOG (Radix)));
-                    printf ("roughly %g extra significant decimals.\n",
-                        Q / LOG (10.));
-                }
-                printf ("That feature is not tested further by this program.\n");
-            }
-        }
-    }
-    Pause ();
-    /*=============================================*/
-    Milestone = 35;
-    /*=============================================*/
-    if (Radix >= Two) {
-        X = W / (Radix * Radix);
-        Y = X + One;
-        Z = Y - X;
-        T = Z + U2;
-        X = T - Z;
-        TstCond (Failure, X == U2,
-            "Subtraction is not normalized X=Y,X+Z != Y+Z!");
-        if (X == U2)
-            printf (
-                "Subtraction appears to be normalized, as it should be.");
-    }
-    printf ("\nChecking for guard digit in *, /, and -.\n");
-    Y = F9 * One;
-    Z = One * F9;
-    X = F9 - Half;
-    Y = (Y - Half) - X;
-    Z = (Z - Half) - X;
-    X = One + U2;
-    T = X * Radix;
-    R = Radix * X;
-    X = T - Radix;
-    X = X - Radix * U2;
-    T = R - Radix;
-    T = T - Radix * U2;
-    X = X * (Radix - One);
-    T = T * (Radix - One);
-    if ((X == Zero) && (Y == Zero) && (Z == Zero) && (T == Zero))
-        GMult = Yes;
-    else {
-        GMult = No;
-        TstCond (Serious, False,
-            "* lacks a Guard Digit, so 1*X != X");
-    }
-    Z = Radix * U2;
-    X = One + Z;
-    Y = FABS ((X + Z) - X * X) - U2;
-    X = One - U2;
-    Z = FABS ((X - U2) - X * X) - U1;
-    TstCond (Failure, (Y <= Zero)
-        && (Z <= Zero), "* gets too many final digits wrong.\n");
-    Y = One - U2;
-    X = One + U2;
-    Z = One / Y;
-    Y = Z - X;
-    X = One / Three;
-    Z = Three / Nine;
-    X = X - Z;
-    T = Nine / TwentySeven;
-    Z = Z - T;
-    TstCond (Defect, X == Zero && Y == Zero && Z == Zero,
-        "Division lacks a Guard Digit, so error can exceed 1 ulp\n\
-or  1/3  and  3/9  and  9/27 may disagree");
-    Y = F9 / One;
-    X = F9 - Half;
-    Y = (Y - Half) - X;
-    X = One + U2;
-    T = X / One;
-    X = T - X;
-    if ((X == Zero) && (Y == Zero) && (Z == Zero))
-        GDiv = Yes;
-    else {
-        GDiv = No;
-        TstCond (Serious, False,
-            "Division lacks a Guard Digit, so X/1 != X");
-    }
-    X = One / (One + U2);
-    Y = X - Half - Half;
-    TstCond (Serious, Y < Zero,
-        "Computed value of 1/1.000..1 >= 1");
-    X = One - U2;
-    Y = One + Radix * U2;
-    Z = X * Radix;
-    T = Y * Radix;
-    R = Z / Radix;
-    StickyBit = T / Radix;
-    X = R - X;
-    Y = StickyBit - Y;
-    TstCond (Failure, X == Zero && Y == Zero,
-        "* and/or / gets too many last digits wrong");
-    Y = One - U1;
-    X = One - F9;
-    Y = One - Y;
-    T = Radix - U2;
-    Z = Radix - BMinusU2;
-    T = Radix - T;
-    if ((X == U1) && (Y == U1) && (Z == U2) && (T == U2))
-        GAddSub = Yes;
-    else {
-        GAddSub = No;
-        TstCond (Serious, False,
-            "- lacks Guard Digit, so cancellation is obscured");
-    }
-    if (F9 != One && F9 - One >= Zero) {
-        BadCond (Serious, "comparison alleges  (1-U1) < 1  although\n");
-        printf ("  subtraction yields  (1-U1) - 1 = 0 , thereby vitiating\n");
-        printf ("  such precautions against division by zero as\n");
-        printf ("  ...  if (X == 1.0) {.....} else {.../(X-1.0)...}\n");
-    }
-    if (GMult == Yes && GDiv == Yes && GAddSub == Yes)
-        printf (
-            "     *, /, and - appear to have guard digits, as they should.\n");
-    /*=============================================*/
-    Milestone = 40;
-    /*=============================================*/
-    Pause ();
-    printf ("Checking rounding on multiply, divide and add/subtract.\n");
-    RMult = Other;
-    RDiv = Other;
-    RAddSub = Other;
-    RadixD2 = Radix / Two;
-    A1 = Two;
-    Done = False;
-    do {
-        AInvrse = Radix;
-        do {
-            X = AInvrse;
-            AInvrse = AInvrse / A1;
-        }
-        while (!(FLOOR (AInvrse) != AInvrse));
-        Done = (X == One) || (A1 > Three);
-        if (!Done)
-            A1 = Nine + One;
-    }
-    while (!(Done));
-    if (X == One)
-        A1 = Radix;
-    AInvrse = One / A1;
-    X = A1;
-    Y = AInvrse;
-    Done = False;
-    do {
-        Z = X * Y - Half;
-        TstCond (Failure, Z == Half,
-            "X * (1/X) differs from 1");
-        Done = X == Radix;
-        X = Radix;
-        Y = One / X;
-    }
-    while (!(Done));
-    Y2 = One + U2;
-    Y1 = One - U2;
-    X = OneAndHalf - U2;
-    Y = OneAndHalf + U2;
-    Z = (X - U2) * Y2;
-    T = Y * Y1;
-    Z = Z - X;
-    T = T - X;
-    X = X * Y2;
-    Y = (Y + U2) * Y1;
-    X = X - OneAndHalf;
-    Y = Y - OneAndHalf;
-    if ((X == Zero) && (Y == Zero) && (Z == Zero) && (T <= Zero)) {
-        X = (OneAndHalf + U2) * Y2;
-        Y = OneAndHalf - U2 - U2;
-        Z = OneAndHalf + U2 + U2;
-        T = (OneAndHalf - U2) * Y1;
-        X = X - (Z + U2);
-        StickyBit = Y * Y1;
-        S = Z * Y2;
-        T = T - Y;
-        Y = (U2 - Y) + StickyBit;
-        Z = S - (Z + U2 + U2);
-        StickyBit = (Y2 + U2) * Y1;
-        Y1 = Y2 * Y1;
-        StickyBit = StickyBit - Y2;
-        Y1 = Y1 - Half;
-        if ((X == Zero) && (Y == Zero) && (Z == Zero) && (T == Zero)
-            && (StickyBit == Zero) && (Y1 == Half)) {
-            RMult = Rounded;
-            printf ("Multiplication appears to round correctly.\n");
-        } else if ((X + U2 == Zero) && (Y < Zero) && (Z + U2 == Zero)
-                && (T < Zero) && (StickyBit + U2 == Zero)
-            && (Y1 < Half)) {
-            RMult = Chopped;
-            printf ("Multiplication appears to chop.\n");
-        } else
-            printf ("* is neither chopped nor correctly rounded.\n");
-        if ((RMult == Rounded) && (GMult == No))
-            notify ("Multiplication");
-    } else
-        printf ("* is neither chopped nor correctly rounded.\n");
-    /*=============================================*/
-    Milestone = 45;
-    /*=============================================*/
-    Y2 = One + U2;
-    Y1 = One - U2;
-    Z = OneAndHalf + U2 + U2;
-    X = Z / Y2;
-    T = OneAndHalf - U2 - U2;
-    Y = (T - U2) / Y1;
-    Z = (Z + U2) / Y2;
-    X = X - OneAndHalf;
-    Y = Y - T;
-    T = T / Y1;
-    Z = Z - (OneAndHalf + U2);
-    T = (U2 - OneAndHalf) + T;
-    if (!((X > Zero) || (Y > Zero) || (Z > Zero) || (T > Zero))) {
-        X = OneAndHalf / Y2;
-        Y = OneAndHalf - U2;
-        Z = OneAndHalf + U2;
-        X = X - Y;
-        T = OneAndHalf / Y1;
-        Y = Y / Y1;
-        T = T - (Z + U2);
-        Y = Y - Z;
-        Z = Z / Y2;
-        Y1 = (Y2 + U2) / Y2;
-        Z = Z - OneAndHalf;
-        Y2 = Y1 - Y2;
-        Y1 = (F9 - U1) / F9;
-        if ((X == Zero) && (Y == Zero) && (Z == Zero) && (T == Zero)
-            && (Y2 == Zero) && (Y2 == Zero)
-            && (Y1 - Half == F9 - Half)) {
-            RDiv = Rounded;
-            printf ("Division appears to round correctly.\n");
-            if (GDiv == No)
-                notify ("Division");
-        } else if ((X < Zero) && (Y < Zero) && (Z < Zero) && (T < Zero)
-            && (Y2 < Zero) && (Y1 - Half < F9 - Half)) {
-            RDiv = Chopped;
-            printf ("Division appears to chop.\n");
-        }
-    }
-    if (RDiv == Other)
-        printf ("/ is neither chopped nor correctly rounded.\n");
-    BInvrse = One / Radix;
-    TstCond (Failure, (BInvrse * Radix - Half == Half),
-        "Radix * ( 1 / Radix ) differs from 1");
-    /*=============================================*/
-    Milestone = 50;
-    /*=============================================*/
-    TstCond (Failure, ((F9 + U1) - Half == Half)
-        && ((BMinusU2 + U2) - One == Radix - One),
-        "Incomplete carry-propagation in Addition");
-    X = One - U1 * U1;
-    Y = One + U2 * (One - U2);
-    Z = F9 - Half;
-    X = (X - Half) - Z;
-    Y = Y - One;
-    if ((X == Zero) && (Y == Zero)) {
-        RAddSub = Chopped;
-        printf ("Add/Subtract appears to be chopped.\n");
-    }
-    if (GAddSub == Yes) {
-        X = (Half + U2) * U2;
-        Y = (Half - U2) * U2;
-        X = One + X;
-        Y = One + Y;
-        X = (One + U2) - X;
-        Y = One - Y;
-        if ((X == Zero) && (Y == Zero)) {
-            X = (Half + U2) * U1;
-            Y = (Half - U2) * U1;
-            X = One - X;
-            Y = One - Y;
-            X = F9 - X;
-            Y = One - Y;
-            if ((X == Zero) && (Y == Zero)) {
-                RAddSub = Rounded;
-                printf ("Addition/Subtraction appears to round correctly.\n");
-                if (GAddSub == No)
-                    notify ("Add/Subtract");
-            } else
-                printf ("Addition/Subtraction neither rounds nor chops.\n");
-        } else
-            printf ("Addition/Subtraction neither rounds nor chops.\n");
-    } else
-        printf ("Addition/Subtraction neither rounds nor chops.\n");
-    S = One;
-    X = One + Half * (One + Half);
-    Y = (One + U2) * Half;
-    Z = X - Y;
-    T = Y - X;
-    StickyBit = Z + T;
-    if (StickyBit != Zero) {
-        S = Zero;
-        BadCond (Flaw, "(X - Y) + (Y - X) is non zero!\n");
-    }
-    StickyBit = Zero;
-    if ((GMult == Yes) && (GDiv == Yes) && (GAddSub == Yes)
-        && (RMult == Rounded) && (RDiv == Rounded)
-        && (RAddSub == Rounded) && (FLOOR (RadixD2) == RadixD2)) {
-        printf ("Checking for sticky bit.\n");
-        X = (Half + U1) * U2;
-        Y = Half * U2;
-        Z = One + Y;
-        T = One + X;
-        if ((Z - One <= Zero) && (T - One >= U2)) {
-            Z = T + Y;
-            Y = Z - X;
-            if ((Z - T >= U2) && (Y - T == Zero)) {
-                X = (Half + U1) * U1;
-                Y = Half * U1;
-                Z = One - Y;
-                T = One - X;
-                if ((Z - One == Zero) && (T - F9 == Zero)) {
-                    Z = (Half - U1) * U1;
-                    T = F9 - Z;
-                    Q = F9 - Y;
-                    if ((T - F9 == Zero) && (F9 - U1 - Q == Zero)) {
-                        Z = (One + U2) * OneAndHalf;
-                        T = (OneAndHalf + U2) - Z + U2;
-                        X = One + Half / Radix;
-                        Y = One + Radix * U2;
-                        Z = X * Y;
-                        if (T == Zero && X + Radix * U2 - Z == Zero) {
-                            if (Radix != Two) {
-                                X = Two + U2;
-                                Y = X / Two;
-                                if ((Y - One == Zero))
-                                    StickyBit = S;
-                            } else
-                                StickyBit = S;
-                        }
-                    }
-                }
-            }
-        }
-    }
-    if (StickyBit == One)
-        printf ("Sticky bit apparently used correctly.\n");
-    else
-        printf ("Sticky bit used incorrectly or not at all.\n");
-    TstCond (Flaw, !(GMult == No || GDiv == No || GAddSub == No ||
-            RMult == Other || RDiv == Other || RAddSub == Other),
-        "lack(s) of guard digits or failure(s) to correctly round or chop\n\
-(noted above) count as one flaw in the final tally below");
-    /*=============================================*/
-    Milestone = 60;
-    /*=============================================*/
-    printf ("\n");
-    printf ("Does Multiplication commute?  ");
-    printf ("Testing on %d random pairs.\n", NoTrials);
-    Random9 = SQRT (3.0);
-    Random1 = Third;
-    I = 1;
-    do {
-        X = Random ();
-        Y = Random ();
-        Z9 = Y * X;
-        Z = X * Y;
-        Z9 = Z - Z9;
-        I = I + 1;
-    }
-    while (!((I > NoTrials) || (Z9 != Zero)));
-    if (I == NoTrials) {
-        Random1 = One + Half / Three;
-        Random2 = (U2 + U1) + One;
-        Z = Random1 * Random2;
-        Y = Random2 * Random1;
-        Z9 = (One + Half / Three) * ((U2 + U1) + One) - (One + Half /
-            Three) * ((U2 + U1) + One);
-    }
-    if (!((I == NoTrials) || (Z9 == Zero)))
-        BadCond (Defect, "X * Y == Y * X trial fails.\n");
-    else
-        printf ("     No failures found in %d integer pairs.\n", NoTrials);
-    /*=============================================*/
-    Milestone = 70;
-    /*=============================================*/
-    printf ("\nRunning test of square root(x).\n");
-    TstCond (Failure, (Zero == SQRT (Zero))
-        && (-Zero == SQRT (-Zero))
-        && (One == SQRT (One)), "Square root of 0.0, -0.0 or 1.0 wrong");
-    MinSqEr = Zero;
-    MaxSqEr = Zero;
-    J = Zero;
-    X = Radix;
-    OneUlp = U2;
-    SqXMinX (Serious);
-    X = BInvrse;
-    OneUlp = BInvrse * U1;
-    SqXMinX (Serious);
-    X = U1;
-    OneUlp = U1 * U1;
-    SqXMinX (Serious);
-    if (J != Zero)
-        Pause ();
-    printf ("Testing if sqrt(X * X) == X for %d Integers X.\n", NoTrials);
-    J = Zero;
-    X = Two;
-    Y = Radix;
-    if ((Radix != One))
-        do {
-            X = Y;
-            Y = Radix * Y;
-        }
-        while (!((Y - X >= NoTrials)));
-    OneUlp = X * U2;
-    I = 1;
-    while (I <= NoTrials) {
-        X = X + One;
-        SqXMinX (Defect);
-        if (J > Zero)
-            break;
-        I = I + 1;
-    }
-    printf ("Test for sqrt monotonicity.\n");
-    I = -1;
-    X = BMinusU2;
-    Y = Radix;
-    Z = Radix + Radix * U2;
-    NotMonot = False;
-    Monot = False;
-    while (!(NotMonot || Monot)) {
-        I = I + 1;
-        X = SQRT (X);
-        Q = SQRT (Y);
-        Z = SQRT (Z);
-        if ((X > Q) || (Q > Z))
-            NotMonot = True;
-        else {
-            Q = FLOOR (Q + Half);
-            if ((I > 0) || (Radix == Q * Q))
-                Monot = True;
-            else if (I > 0) {
-                if (I > 1)
-                    Monot = True;
-                else {
-                    Y = Y * BInvrse;
-                    X = Y - U1;
-                    Z = Y + U1;
-                }
-            } else {
-                Y = Q;
-                X = Y - U2;
-                Z = Y + U2;
-            }
-        }
-    }
-    if (Monot)
-        printf ("sqrt has passed a test for Monotonicity.\n");
-    else {
-        BadCond (Defect, "");
-        printf ("sqrt(X) is non-monotonic for X near %.7e .\n", Y);
-    }
-    /*=============================================*/
-    Milestone = 80;
-    /*=============================================*/
-    MinSqEr = MinSqEr + Half;
-    MaxSqEr = MaxSqEr - Half;
-    Y = (SQRT (One + U2) - One) / U2;
-    SqEr = (Y - One) + U2 / Eight;
-    if (SqEr > MaxSqEr)
-        MaxSqEr = SqEr;
-    SqEr = Y + U2 / Eight;
-    if (SqEr < MinSqEr)
-        MinSqEr = SqEr;
-    Y = ((SQRT (F9) - U2) - (One - U2)) / U1;
-    SqEr = Y + U1 / Eight;
-    if (SqEr > MaxSqEr)
-        MaxSqEr = SqEr;
-    SqEr = (Y + One) + U1 / Eight;
-    if (SqEr < MinSqEr)
-        MinSqEr = SqEr;
-    OneUlp = U2;
-    X = OneUlp;
-    for (Indx = 1; Indx <= 3; ++Indx) {
-        Y = SQRT ((X + U1 + X) + F9);
-        Y = ((Y - U2) - ((One - U2) + X)) / OneUlp;
-        Z = ((U1 - X) + F9) * Half * X * X / OneUlp;
-        SqEr = (Y + Half) + Z;
-        if (SqEr < MinSqEr)
-            MinSqEr = SqEr;
-        SqEr = (Y - Half) + Z;
-        if (SqEr > MaxSqEr)
-            MaxSqEr = SqEr;
-        if (((Indx == 1) || (Indx == 3)))
-            X = OneUlp * Sign (X) * FLOOR (Eight / (Nine * SQRT (OneUlp)));
-        else {
-            OneUlp = U1;
-            X = -OneUlp;
-        }
-    }
-    /*=============================================*/
-    Milestone = 85;
-    /*=============================================*/
-    SqRWrng = False;
-    Anomaly = False;
-    RSqrt = Other;              /* ~dgh */
-    if (Radix != One) {
-        printf ("Testing whether sqrt is rounded or chopped.\n");
-        D = FLOOR (Half + POW (Radix, One + Precision - FLOOR (Precision)));
-        /* ... == Radix^(1 + fract) if (Precision == Integer + fract. */
-        X = D / Radix;
-        Y = D / A1;
-        if ((X != FLOOR (X)) || (Y != FLOOR (Y))) {
-            Anomaly = True;
-        } else {
-            X = Zero;
-            Z2 = X;
-            Y = One;
-            Y2 = Y;
-            Z1 = Radix - One;
-            FourD = Four * D;
-            do {
-                if (Y2 > Z2) {
-                    Q = Radix;
-                    Y1 = Y;
-                    do {
-                        X1 = FABS (Q + FLOOR (Half - Q / Y1) * Y1);
-                        Q = Y1;
-                        Y1 = X1;
-                    }
-                    while (!(X1 <= Zero));
-                    if (Q <= One) {
-                        Z2 = Y2;
-                        Z = Y;
-                    }
-                }
-                Y = Y + Two;
-                X = X + Eight;
-                Y2 = Y2 + X;
-                if (Y2 >= FourD)
-                    Y2 = Y2 - FourD;
-            }
-            while (!(Y >= D));
-            X8 = FourD - Z2;
-            Q = (X8 + Z * Z) / FourD;
-            X8 = X8 / Eight;
-            if (Q != FLOOR (Q))
-                Anomaly = True;
-            else {
-                Break = False;
-                do {
-                    X = Z1 * Z;
-                    X = X - FLOOR (X / Radix) * Radix;
-                    if (X == One)
-                        Break = True;
-                    else
-                        Z1 = Z1 - One;
-                }
-                while (!(Break || (Z1 <= Zero)));
-                if ((Z1 <= Zero) && (!Break))
-                    Anomaly = True;
-                else {
-                    if (Z1 > RadixD2)
-                        Z1 = Z1 - Radix;
-                    do {
-                        NewD ();
-                    }
-                    while (!(U2 * D >= F9));
-                    if (D * Radix - D != W - D)
-                        Anomaly = True;
-                    else {
-                        Z2 = D;
-                        I = 0;
-                        Y = D + (One + Z) * Half;
-                        X = D + Z + Q;
-                        SR3750 ();
-                        Y = D + (One - Z) * Half + D;
-                        X = D - Z + D;
-                        X = X + Q + X;
-                        SR3750 ();
-                        NewD ();
-                        if (D - Z2 != W - Z2)
-                            Anomaly = True;
-                        else {
-                            Y = (D - Z2) + (Z2 + (One - Z) * Half);
-                            X = (D - Z2) + (Z2 - Z + Q);
-                            SR3750 ();
-                            Y = (One + Z) * Half;
-                            X = Q;
-                            SR3750 ();
-                            if (I == 0)
-                                Anomaly = True;
-                        }
-                    }
-                }
-            }
-        }
-        if ((I == 0) || Anomaly) {
-            BadCond (Failure, "Anomalous arithmetic with Integer < ");
-            printf ("Radix^Precision = %.7e\n", W);
-            printf (" fails test whether sqrt rounds or chops.\n");
-            SqRWrng = True;
-        }
-    }
-    if (!Anomaly) {
-        if (!((MinSqEr < Zero) || (MaxSqEr > Zero))) {
-            RSqrt = Rounded;
-            printf ("Square root appears to be correctly rounded.\n");
-        } else {
-            if ((MaxSqEr + U2 > U2 - Half) || (MinSqEr > Half)
-                || (MinSqEr + Radix < Half))
-                SqRWrng = True;
-            else {
-                RSqrt = Chopped;
-                printf ("Square root appears to be chopped.\n");
-            }
-        }
-    }
-    if (SqRWrng) {
-        printf ("Square root is neither chopped nor correctly rounded.\n");
-        printf ("Observed errors run from %.7e ", MinSqEr - Half);
-        printf ("to %.7e ulps.\n", Half + MaxSqEr);
-        TstCond (Serious, MaxSqEr - MinSqEr < Radix * Radix,
-            "sqrt gets too many last digits wrong");
-    }
-    /*=============================================*/
-    Milestone = 90;
-    /*=============================================*/
-    Pause ();
-    printf ("Testing powers Z^i for small Integers Z and i.\n");
-    N = 0;
-    /* ... test powers of zero. */
-    I = 0;
-    Z = -Zero;
-    M = 3;
-    Break = False;
-    do {
-        X = One;
-        SR3980 ();
-        if (I <= 10) {
-            I = 1023;
-            SR3980 ();
-        }
-        if (Z == MinusOne)
-            Break = True;
-        else {
-            Z = MinusOne;
-            /* .. if(-1)^N is invalid, replace MinusOne by One. */
-            I = -4;
-        }
-    }
-    while (!Break);
-    PrintIfNPositive ();
-    N1 = N;
-    N = 0;
-    Z = A1;
-    M = (int) FLOOR (Two * LOG (W) / LOG (A1));
-    Break = False;
-    do {
-        X = Z;
-        I = 1;
-        SR3980 ();
-        if (Z == AInvrse)
-            Break = True;
-        else
-            Z = AInvrse;
-    }
-    while (!(Break));
-    /*=============================================*/
-    Milestone = 100;
-    /*=============================================*/
-    /*  Powers of Radix have been tested, */
-    /*         next try a few primes     */
-    M = NoTrials;
-    Z = Three;
-    do {
-        X = Z;
-        I = 1;
-        SR3980 ();
-        do {
-            Z = Z + Two;
-        }
-        while (Three * FLOOR (Z / Three) == Z);
-    }
-    while (Z < Eight * Three);
-    if (N > 0) {
-        printf ("Errors like this may invalidate financial calculations\n");
-        printf ("\tinvolving interest rates.\n");
-    }
-    PrintIfNPositive ();
-    N += N1;
-    if (N == 0)
-        printf ("... no discrepancies found.\n");
-    if (N > 0)
-        Pause ();
-    else
-        printf ("\n");
-    /*=============================================*/
-    Milestone = 110;
-    /*=============================================*/
-    printf ("Seeking Underflow thresholds UfThold and E0.\n");
-    D = U1;
-    if (Precision != FLOOR (Precision)) {
-        D = BInvrse;
-        X = Precision;
-        do {
-            D = D * BInvrse;
-            X = X - One;
-        }
-        while (X > Zero);
-    }
-    Y = One;
-    Z = D;
-    /* ... D is power of 1/Radix < 1. */
-    do {
-        C = Y;
-        Y = Z;
-        Z = Y * Y;
-    }
-    while ((Y > Z) && (Z + Z > Z));
-    Y = C;
-    Z = Y * D;
-    do {
-        C = Y;
-        Y = Z;
-        Z = Y * D;
-    }
-    while ((Y > Z) && (Z + Z > Z));
-    if (Radix < Two)
-        HInvrse = Two;
-    else
-        HInvrse = Radix;
-    H = One / HInvrse;
-    /* ... 1/HInvrse == H == Min(1/Radix, 1/2) */
-    CInvrse = One / C;
-    E0 = C;
-    Z = E0 * H;
-    /* ...1/Radix^(BIG Integer) << 1 << CInvrse == 1/C */
-    do {
-        Y = E0;
-        E0 = Z;
-        Z = E0 * H;
-    }
-    while ((E0 > Z) && (Z + Z > Z));
-    UfThold = E0;
-    E1 = Zero;
-    Q = Zero;
-    E9 = U2;
-    S = One + E9;
-    D = C * S;
-    if (D <= C) {
-        E9 = Radix * U2;
-        S = One + E9;
-        D = C * S;
-        if (D <= C) {
-            BadCond (Failure, "multiplication gets too many last digits wrong.\n");
-            Underflow = E0;
-            Y1 = Zero;
-            PseudoZero = Z;
-            Pause ();
-        }
-    } else {
-        Underflow = D;
-        PseudoZero = Underflow * H;
-        UfThold = Zero;
-        do {
-            Y1 = Underflow;
-            Underflow = PseudoZero;
-            if (E1 + E1 <= E1) {
-                Y2 = Underflow * HInvrse;
-                E1 = FABS (Y1 - Y2);
-                Q = Y1;
-                if ((UfThold == Zero) && (Y1 != Y2))
-                    UfThold = Y1;
-            }
-            PseudoZero = PseudoZero * H;
-        }
-        while ((Underflow > PseudoZero)
-            && (PseudoZero + PseudoZero > PseudoZero));
-    }
-    /* Comment line 4530 .. 4560 */
-    if (PseudoZero != Zero) {
-        printf ("\n");
-        Z = PseudoZero;
-        /* ... Test PseudoZero for "phoney- zero" violates */
-        /* ... PseudoZero < Underflow or PseudoZero < PseudoZero + PseudoZero
-                   ... */
-        if (PseudoZero <= Zero) {
-            BadCond (Failure, "Positive expressions can underflow to an\n");
-            printf ("allegedly negative value\n");
-            printf ("PseudoZero that prints out as: %g .\n", PseudoZero);
-            X = -PseudoZero;
-            if (X <= Zero) {
-                printf ("But -PseudoZero, which should be\n");
-                printf ("positive, isn't; it prints out as  %g .\n", X);
-            }
-        } else {
-            BadCond (Flaw, "Underflow can stick at an allegedly positive\n");
-            printf ("value PseudoZero that prints out as %g .\n", PseudoZero);
-        }
-        TstPtUf ();
-    }
-    /*=============================================*/
-    Milestone = 120;
-    /*=============================================*/
-    if (CInvrse * Y > CInvrse * Y1) {
-        S = H * S;
-        E0 = Underflow;
-    }
-    if (!((E1 == Zero) || (E1 == E0))) {
-        BadCond (Defect, "");
-        if (E1 < E0) {
-            printf ("Products underflow at a higher");
-            printf (" threshold than differences.\n");
-            if (PseudoZero == Zero)
-                E0 = E1;
-        } else {
-            printf ("Difference underflows at a higher");
-            printf (" threshold than products.\n");
-        }
-    }
-    printf ("Smallest strictly positive number found is E0 = %g .\n", E0);
-    Z = E0;
-    TstPtUf ();
-    Underflow = E0;
-    if (N == 1)
-        Underflow = Y;
-    I = 4;
-    if (E1 == Zero)
-        I = 3;
-    if (UfThold == Zero)
-        I = I - 2;
-    UfNGrad = True;
-    switch (I) {
-    case 1:
-        UfThold = Underflow;
-        if ((CInvrse * Q) != ((CInvrse * Y) * S)) {
-            UfThold = Y;
-            BadCond (Failure, "Either accuracy deteriorates as numbers\n");
-            printf ("approach a threshold = %.17e\n", UfThold);;
-            printf (" coming down from %.17e\n", C);
-            printf (" or else multiplication gets too many last digits wrong.\n");
-        }
-        Pause ();
-        break;
-
-    case 2:
-        BadCond (Failure, "Underflow confuses Comparison, which alleges that\n");
-        printf ("Q == Y while denying that |Q - Y| == 0; these values\n");
-        printf ("print out as Q = %.17e, Y = %.17e .\n", Q, Y2);
-        printf ("|Q - Y| = %.17e .\n", FABS (Q - Y2));
-        UfThold = Q;
-        break;
-
-    case 3:
-        X = X;
-        break;
-
-    case 4:
-        if ((Q == UfThold) && (E1 == E0)
-            && (FABS (UfThold - E1 / E9) <= E1)) {
-            UfNGrad = False;
-            printf ("Underflow is gradual; it incurs Absolute Error =\n");
-            printf ("(roundoff in UfThold) < E0.\n");
-            Y = E0 * CInvrse;
-            Y = Y * (OneAndHalf + U2);
-            X = CInvrse * (One + U2);
-            Y = Y / X;
-            IEEE = (Y == E0);
-        }
-    }
-    if (UfNGrad) {
-        printf ("\n");
-        sigsave = _sigfpe;
-        if (setjmp (ovfl_buf)) {
-            printf ("Underflow / UfThold failed!\n");
-            R = H + H;
-        } else
-            R = SQRT (Underflow / UfThold);
-        sigsave = 0;
-        if (R <= H) {
-            Z = R * UfThold;
-            X = Z * (One + R * H * (One + H));
-        } else {
-            Z = UfThold;
-            X = Z * (One + H * H * (One + H));
-        }
-        if (!((X == Z) || (X - Z != Zero))) {
-            BadCond (Flaw, "");
-            printf ("X = %.17e\n\tis not equal to Z = %.17e .\n", X, Z);
-            Z9 = X - Z;
-            printf ("yet X - Z yields %.17e .\n", Z9);
-            printf ("    Should this NOT signal Underflow, ");
-            printf ("this is a SERIOUS DEFECT\nthat causes ");
-            printf ("confusion when innocent statements like\n");;
-            printf ("    if (X == Z)  ...  else");
-            printf ("  ... (f(X) - f(Z)) / (X - Z) ...\n");
-            printf ("encounter Division by Zero although actually\n");
-            sigsave = _sigfpe;
-            if (setjmp (ovfl_buf))
-                printf ("X / Z fails!\n");
-            else
-                printf ("X / Z = 1 + %g .\n", (X / Z - Half) - Half);
-            sigsave = 0;
-        }
-    }
-    printf ("The Underflow threshold is %.17e, %s\n", UfThold,
-        " below which");
-    printf ("calculation may suffer larger Relative error than ");
-    printf ("merely roundoff.\n");
-    Y2 = U1 * U1;
-    Y = Y2 * Y2;
-    Y2 = Y * U1;
-    if (Y2 <= UfThold) {
-        if (Y > E0) {
-            BadCond (Defect, "");
-            I = 5;
-        } else {
-            BadCond (Serious, "");
-            I = 4;
-        }
-        printf ("Range is too narrow; U1^%d Underflows.\n", I);
-    }
-    /*=============================================*/
-    Milestone = 130;
-    /*=============================================*/
-    Y = -FLOOR (Half - TwoForty * LOG (UfThold) / LOG (HInvrse)) / TwoForty;
-    Y2 = Y + Y;
-    printf ("Since underflow occurs below the threshold\n");
-    printf ("UfThold = (%.17e) ^ (%.17e)\nonly underflow ", HInvrse, Y);
-    printf ("should afflict the expression\n\t(%.17e) ^ (%.17e);\n",
-        HInvrse, Y2);
-    printf ("actually calculating yields:");
-    if (setjmp (ovfl_buf)) {
-        sigsave = 0;
-        BadCond (Serious, "trap on underflow.\n");
-    } else {
-        sigsave = _sigfpe;
-        V9 = POW (HInvrse, Y2);
-        sigsave = 0;
-        printf (" %.17e .\n", V9);
-        if (!((V9 >= Zero) && (V9 <= (Radix + Radix + E9) * UfThold))) {
-            BadCond (Serious, "this is not between 0 and underflow\n");
-            printf ("   threshold = %.17e .\n", UfThold);
-        } else if (!(V9 > UfThold * (One + E9)))
-            printf ("This computed value is O.K.\n");
-        else {
-            BadCond (Defect, "this is not between 0 and underflow\n");
-            printf ("   threshold = %.17e .\n", UfThold);
-        }
-    }
-    /*=============================================*/
-    Milestone = 140;
-    /*=============================================*/
-    printf ("\n");
-    /* ...calculate Exp2 == exp(2) == 7.389056099... */
-    X = Zero;
-    I = 2;
-    Y = Two * Three;
-    Q = Zero;
-    N = 0;
-    do {
-        Z = X;
-        I = I + 1;
-        Y = Y / (I + I);
-        R = Y + Q;
-        X = Z + R;
-        Q = (Z - X) + R;
-    }
-    while (X > Z);
-    Z = (OneAndHalf + One / Eight) + X / (OneAndHalf * ThirtyTwo);
-    X = Z * Z;
-    Exp2 = X * X;
-    X = F9;
-    Y = X - U1;
-    printf ("Testing X^((X + 1) / (X - 1)) vs. exp(2) = %.17e as X -> 1.\n",
-        Exp2);
-    for (I = 1;;) {
-        Z = X - BInvrse;
-        Z = (X + One) / (Z - (One - BInvrse));
-        Q = POW (X, Z) - Exp2;
-        if (FABS (Q) > TwoForty * U2) {
-            N = 1;
-            V9 = (X - BInvrse) - (One - BInvrse);
-            BadCond (Defect, "Calculated");
-            printf (" %.17e for\n", POW (X, Z));
-            printf ("\t(1 + (%.17e) ^ (%.17e);\n", V9, Z);
-            printf ("\tdiffers from correct value by %.17e .\n", Q);
-            printf ("\tThis much error may spoil financial\n");
-            printf ("\tcalculations involving tiny interest rates.\n");
-            break;
-        } else {
-            Z = (Y - X) * Two + Y;
-            X = Y;
-            Y = Z;
-            Z = One + (X - F9) * (X - F9);
-            if (Z > One && I < NoTrials)
-                I++;
-            else {
-                if (X > One) {
-                    if (N == 0)
-                        printf ("Accuracy seems adequate.\n");
-                    break;
-                } else {
-                    X = One + U2;
-                    Y = U2 + U2;
-                    Y += X;
-                    I = 1;
-                }
-            }
-        }
-    }
-    /*=============================================*/
-    Milestone = 150;
-    /*=============================================*/
-    printf ("Testing powers Z^Q at four nearly extreme values.\n");
-    N = 0;
-    Z = A1;
-    Q = FLOOR (Half - LOG (C) / LOG (A1));
-    Break = False;
-    do {
-        X = CInvrse;
-        Y = POW (Z, Q);
-        IsYeqX ();
-        Q = -Q;
-        X = C;
-        Y = POW (Z, Q);
-        IsYeqX ();
-        if (Z < One)
-            Break = True;
-        else
-            Z = AInvrse;
-    }
-    while (!(Break));
-    PrintIfNPositive ();
-    if (N == 0)
-        printf (" ... no discrepancies found.\n");
-    printf ("\n");
-
-    /*=============================================*/
-    Milestone = 160;
-    /*=============================================*/
-    Pause ();
-    printf ("Searching for Overflow threshold:\n");
-    printf ("This may generate an error.\n");
-    Y = -CInvrse;
-    V9 = HInvrse * Y;
-    sigsave = _sigfpe;
-    if (setjmp (ovfl_buf)) {
-        I = 0;
-        V9 = Y;
-        goto overflow;
-    }
-    do {
-        V = Y;
-        Y = V9;
-        V9 = HInvrse * Y;
-    }
-    while (V9 < Y);
-    I = 1;
-  overflow:
-    sigsave = 0;
-    Z = V9;
-    printf ("Can `Z = -Y' overflow?\n");
-    printf ("Trying it on Y = %.17e .\n", Y);
-    V9 = -Y;
-    V0 = V9;
-    if (V - Y == V + V0)
-        printf ("Seems O.K.\n");
-    else {
-        printf ("finds a ");
-        BadCond (Flaw, "-(-Y) differs from Y.\n");
-    }
-    if (Z != Y) {
-        BadCond (Serious, "");
-        printf ("overflow past %.17e\n\tshrinks to %.17e .\n", Y, Z);
-    }
-    if (I) {
-        Y = V * (HInvrse * U2 - HInvrse);
-        Z = Y + ((One - HInvrse) * U2) * V;
-        if (Z < V0)
-            Y = Z;
-        if (Y < V0)
-            V = Y;
-        if (V0 - V < V0)
-            V = V0;
-    } else {
-        V = Y * (HInvrse * U2 - HInvrse);
-        V = V + ((One - HInvrse) * U2) * Y;
-    }
-    printf ("Overflow threshold is V  = %.17e .\n", V);
-    if (I)
-        printf ("Overflow saturates at V0 = %.17e .\n", V0);
-    else
-        printf ("There is no saturation value because \
-the system traps on overflow.\n");
-    V9 = V * One;
-    printf ("No Overflow should be signaled for V * 1 = %.17e\n", V9);
-    V9 = V / One;
-    printf ("                           nor for V / 1 = %.17e .\n", V9);
-    printf ("Any overflow signal separating this * from the one\n");
-    printf ("above is a DEFECT.\n");
-    /*=============================================*/
-    Milestone = 170;
-    /*=============================================*/
-    if (!(-V < V && -V0 < V0 && -UfThold < V && UfThold < V)) {
-        BadCond (Failure, "Comparisons involving ");
-        printf ("+-%g, +-%g\nand +-%g are confused by Overflow.",
-            V, V0, UfThold);
-    }
-    /*=============================================*/
-    Milestone = 175;
-    /*=============================================*/
-    printf ("\n");
-    for (Indx = 1; Indx <= 3; ++Indx) {
-        switch (Indx) {
-        case 1:
-            Z = UfThold;
-            break;
-        case 2:
-            Z = E0;
-            break;
-        case 3:
-            Z = PseudoZero;
-            break;
-        }
-        if (Z != Zero) {
-            V9 = SQRT (Z);
-            Y = V9 * V9;
-            if (Y / (One - Radix * E9) < Z
-                || Y > (One + Radix * E9) * Z) {        /* dgh: + E9 --> * E9 */
-                if (V9 > U1)
-                    BadCond (Serious, "");
-                else
-                    BadCond (Defect, "");
-                printf ("Comparison alleges that what prints as Z = %.17e\n", Z);
-                printf (" is too far from sqrt(Z) ^ 2 = %.17e .\n", Y);
-            }
-        }
-    }
-    /*=============================================*/
-    Milestone = 180;
-    /*=============================================*/
-    for (Indx = 1; Indx <= 2; ++Indx) {
-        if (Indx == 1)
-            Z = V;
-        else
-            Z = V0;
-        V9 = SQRT (Z);
-        X = (One - Radix * E9) * V9;
-        V9 = V9 * X;
-        if (((V9 < (One - Two * Radix * E9) * Z) || (V9 > Z))) {
-            Y = V9;
-            if (X < W)
-                BadCond (Serious, "");
-            else
-                BadCond (Defect, "");
-            printf ("Comparison alleges that Z = %17e\n", Z);
-            printf (" is too far from sqrt(Z) ^ 2 (%.17e) .\n", Y);
-        }
-    }
-    /*=============================================*/
-    Milestone = 190;
-    /*=============================================*/
-    Pause ();
-    X = UfThold * V;
-    Y = Radix * Radix;
-    if (X * Y < One || X > Y) {
-        if (X * Y < U1 || X > Y / U1)
-            BadCond (Defect, "Badly");
-        else
-            BadCond (Flaw, "");
-
-        printf (" unbalanced range; UfThold * V = %.17e\n\t%s\n",
-            X, "is too far from 1.\n");
-    }
-    /*=============================================*/
-    Milestone = 200;
-    /*=============================================*/
-    for (Indx = 1; Indx <= 5; ++Indx) {
-        X = F9;
-        switch (Indx) {
-        case 2:
-            X = One + U2;
-            break;
-        case 3:
-            X = V;
-            break;
-        case 4:
-            X = UfThold;
-            break;
-        case 5:
-            X = Radix;
-        }
-        Y = X;
-        sigsave = _sigfpe;
-        if (setjmp (ovfl_buf))
-            printf ("  X / X  traps when X = %g\n", X);
-        else {
-            V9 = (Y / X - Half) - Half;
-            if (V9 == Zero)
-                continue;
-            if (V9 == -U1 && Indx < 5)
-                BadCond (Flaw, "");
-            else
-                BadCond (Serious, "");
-            printf ("  X / X differs from 1 when X = %.17e\n", X);
-            printf ("  instead, X / X - 1/2 - 1/2 = %.17e .\n", V9);
-        }
-        sigsave = 0;
-    }
-    /*=============================================*/
-    Milestone = 210;
-    /*=============================================*/
-    MyZero = Zero;
-    printf ("\n");
-    printf ("What message and/or values does Division by Zero produce?\n");
-#ifndef BATCHMODE
-    printf ("This can interupt your program.  You can ");
-    printf ("skip this part if you wish.\n");
-    printf ("Do you wish to compute 1 / 0? ");
-    fflush (stdout);
-    read (KEYBOARD, ch, 8);
-    if ((ch[0] == 'Y') || (ch[0] == 'y')) {
-#endif /* !BATCHMODE */
-        sigsave = _sigfpe;
-        printf ("    Trying to compute 1 / 0 produces ...");
-        if (!setjmp (ovfl_buf))
-            printf ("  %.7e .\n", One / MyZero);
-        sigsave = 0;
-#ifndef BATCHMODE
-    } else
-        printf ("O.K.\n");
-    printf ("\nDo you wish to compute 0 / 0? ");
-    fflush (stdout);
-    read (KEYBOARD, ch, 80);
-    if ((ch[0] == 'Y') || (ch[0] == 'y')) {
-#endif /* !BATCHMODE */
-        sigsave = _sigfpe;
-        printf ("\n    Trying to compute 0 / 0 produces ...");
-        if (!setjmp (ovfl_buf))
-            printf ("  %.7e .\n", Zero / MyZero);
-        sigsave = 0;
-#ifndef BATCHMODE
-    } else
-        printf ("O.K.\n");
-#endif /* !BATCHMODE */
-    /*=============================================*/
-    Milestone = 220;
-    /*=============================================*/
-
-    Pause ();
-    printf ("\n");
-    {
-        static char *msg[] =
-        {
-            "FAILUREs  encountered =",
-            "SERIOUS DEFECTs  discovered =",
-            "DEFECTs  discovered =",
-            "FLAWs  discovered ="};
-        int     i;
-        for (i = 0; i < 4; i++)
-            if (ErrCnt[i])
-                printf ("The number of  %-29s %d.\n",
-                    msg[i], ErrCnt[i]);
-    }
-
-    printf ("\n");
-    if ((ErrCnt[Failure] + ErrCnt[Serious] + ErrCnt[Defect]
-            + ErrCnt[Flaw]) > 0) {
-        if ((ErrCnt[Failure] + ErrCnt[Serious] + ErrCnt[
-                    Defect] == 0) && (ErrCnt[Flaw] > 0)) {
-            printf ("The arithmetic diagnosed seems ");
-            printf ("Satisfactory though flawed.\n");
-        }
-        if ((ErrCnt[Failure] + ErrCnt[Serious] == 0)
-            && (ErrCnt[Defect] > 0)) {
-            printf ("The arithmetic diagnosed may be Acceptable\n");
-            printf ("despite inconvenient Defects.\n");
-        }
-        if ((ErrCnt[Failure] + ErrCnt[Serious]) > 0) {
-            printf ("The arithmetic diagnosed has ");
-            printf ("unacceptable Serious Defects.\n");
-        }
-        if (ErrCnt[Failure] > 0) {
-            printf ("Potentially fatal FAILURE may have spoiled this");
-            printf (" program's subsequent diagnoses.\n");
-        }
-    } else {
-
-        printf ("No failures, defects nor flaws have been discovered.\n");
-        if (!((RMult == Rounded) && (RDiv == Rounded)
-                && (RAddSub == Rounded) && (RSqrt == Rounded)))
-            printf ("The arithmetic diagnosed seems Satisfactory.\n");
-        else {
-            if (StickyBit >= One &&
-                (Radix - Two) * (Radix - Nine - One) == Zero) {
-                printf ("Rounding appears to conform to ");
-                printf ("the proposed IEEE standard P");
-                if ((Radix == Two) &&
-                    ((Precision - Four * Three * Two) *
-                        (Precision - TwentySeven -
-                            TwentySeven + One) == Zero))
-                    printf ("754");
-                else
-                    printf ("854");
-                if (IEEE)
-                    printf (".\n");
-                else {
-                    printf (",\nexcept for possibly Double Rounding");
-                    printf (" during Gradual Underflow.\n");
-                }
-            }
-            printf ("The arithmetic diagnosed appears to be Excellent!\n");
-        }
-    }
-
-    if (fpecount)
-        printf ("\nA total of %d floating point exceptions were registered.\n",
-            fpecount);
-    printf ("END OF TEST.\n");
-    return 0;
-}
-
-FLOAT
-Sign (X)
-     FLOAT   X;
-{
-    return X >= 0. ? 1.0 : -1.0;
-}
-
-void
-Pause ()
-{
-#ifndef BATCHMODE
-    char    ch[8];
-
-    printf ("\nTo continue, press RETURN");
-    fflush (stdout);
-    read (KEYBOARD, ch, 8);
-#endif /* !BATCHMODE */
-#ifndef CYGNUS
-    printf ("\nDiagnosis resumes after milestone Number %d", Milestone);
-    printf ("          Page: %d\n\n", PageNo);
-    ++Milestone;
-    ++PageNo;
-#endif /* !CYGNUS */
-}
-
-void
-TstCond (K, Valid, T)
-     int     K, Valid;
-     char   *T;
-{
-#ifdef CYGNUS
-    printf ("TEST: %s\n", T);
-#endif /* CYGNUS */
-    if (!Valid) {
-        BadCond (K, T);
-        printf (".\n");
-    }
-#ifdef CYGNUS
-    printf ("PASS: %s\n", T);
-#endif /* CYGNUS */
-}
-
-void
-BadCond (K, T)
-     int     K;
-     char   *T;
-{
-    static char *msg[] =
-    {"FAILURE", "SERIOUS DEFECT", "DEFECT", "FLAW"};
-
-    ErrCnt[K] = ErrCnt[K] + 1;
-#ifndef CYGNUS
-    printf ("%s:  %s", msg[K], T);
-#else
-    printf ("ERROR: Severity: %s:  %s", msg[K], T);
-#endif /* CYGNUS */
-}
-
-/*
- * Random computes
- *     X = (Random1 + Random9)^5
- *     Random1 = X - FLOOR(X) + 0.000005 * X;
- *   and returns the new value of Random1
-*/
-FLOAT
-Random ()
-{
-    FLOAT   X, Y;
-
-    X = Random1 + Random9;
-    Y = X * X;
-    Y = Y * Y;
-    X = X * Y;
-    Y = X - FLOOR (X);
-    Random1 = Y + X * 0.000005;
-    return (Random1);
-}
-
-void
-SqXMinX (ErrKind)
-     int     ErrKind;
-{
-    FLOAT   XA, XB;
-
-    XB = X * BInvrse;
-    XA = X - XB;
-    SqEr = ((SQRT (X * X) - XB) - XA) / OneUlp;
-    if (SqEr != Zero) {
-        if (SqEr < MinSqEr)
-            MinSqEr = SqEr;
-        if (SqEr > MaxSqEr)
-            MaxSqEr = SqEr;
-        J = J + 1.0;
-        BadCond (ErrKind, "\n");
-        printf ("sqrt( %.17e) - %.17e  = %.17e\n", X * X, X, OneUlp * SqEr);
-        printf ("\tinstead of correct value 0 .\n");
-    }
-}
-
-void
-NewD ()
-{
-    X = Z1 * Q;
-    X = FLOOR (Half - X / Radix) * Radix + X;
-    Q = (Q - X * Z) / Radix + X * X * (D / Radix);
-    Z = Z - Two * X * D;
-    if (Z <= Zero) {
-        Z = -Z;
-        Z1 = -Z1;
-    }
-    D = Radix * D;
-}
-
-void
-SR3750 ()
-{
-    if (!((X - Radix < Z2 - Radix) || (X - Z2 > W - Z2))) {
-        I = I + 1;
-        X2 = SQRT (X * D);
-        Y2 = (X2 - Z2) - (Y - Z2);
-        X2 = X8 / (Y - Half);
-        X2 = X2 - Half * X2 * X2;
-        SqEr = (Y2 + Half) + (Half - X2);
-        if (SqEr < MinSqEr)
-            MinSqEr = SqEr;
-        SqEr = Y2 - X2;
-        if (SqEr > MaxSqEr)
-            MaxSqEr = SqEr;
-    }
-}
-
-void
-IsYeqX ()
-{
-    if (Y != X) {
-        if (N <= 0) {
-            if (Z == Zero && Q <= Zero)
-                printf ("WARNING:  computing\n");
-            else
-                BadCond (Defect, "computing\n");
-            printf ("\t(%.17e) ^ (%.17e)\n", Z, Q);
-            printf ("\tyielded %.17e;\n", Y);
-            printf ("\twhich compared unequal to correct %.17e ;\n",
-                X);
-            printf ("\t\tthey differ by %.17e .\n", Y - X);
-        }
-        N = N + 1;              /* ... count discrepancies. */
-    }
-}
-
-void
-SR3980 ()
-{
-    do {
-        Q = (FLOAT) I;
-        Y = POW (Z, Q);
-        IsYeqX ();
-        if (++I > M)
-            break;
-        X = Z * X;
-    }
-    while (X < W);
-}
-
-void
-PrintIfNPositive ()
-{
-    if (N > 0)
-        printf ("Similar discrepancies have occurred %d times.\n", N);
-}
-
-void
-TstPtUf ()
-{
-    N = 0;
-    if (Z != Zero) {
-        printf ("Since comparison denies Z = 0, evaluating ");
-        printf ("(Z + Z) / Z should be safe.\n");
-        sigsave = _sigfpe;
-        if (setjmp (ovfl_buf))
-            goto very_serious;
-        Q9 = (Z + Z) / Z;
-        printf ("What the machine gets for (Z + Z) / Z is  %.17e .\n",
-            Q9);
-        if (FABS (Q9 - Two) < Radix * U2) {
-            printf ("This is O.K., provided Over/Underflow");
-            printf (" has NOT just been signaled.\n");
-        } else {
-            if ((Q9 < One) || (Q9 > Two)) {
-              very_serious:
-                N = 1;
-                ErrCnt[Serious] = ErrCnt[Serious] + 1;
-                printf ("This is a VERY SERIOUS DEFECT!\n");
-            } else {
-                N = 1;
-                ErrCnt[Defect] = ErrCnt[Defect] + 1;
-                printf ("This is a DEFECT!\n");
-            }
-        }
-        sigsave = 0;
-        V9 = Z * One;
-        Random1 = V9;
-        V9 = One * Z;
-        Random2 = V9;
-        V9 = Z / One;
-        if ((Z == Random1) && (Z == Random2) && (Z == V9)) {
-            if (N > 0)
-                Pause ();
-        } else {
-            N = 1;
-            BadCond (Defect, "What prints as Z = ");
-            printf ("%.17e\n\tcompares different from  ", Z);
-            if (Z != Random1)
-                printf ("Z * 1 = %.17e ", Random1);
-            if (!((Z == Random2)
-                    || (Random2 == Random1)))
-                printf ("1 * Z == %g\n", Random2);
-            if (!(Z == V9))
-                printf ("Z / 1 = %.17e\n", V9);
-            if (Random2 != Random1) {
-                ErrCnt[Defect] = ErrCnt[Defect] + 1;
-                BadCond (Defect, "Multiplication does not commute!\n");
-                printf ("\tComparison alleges that 1 * Z = %.17e\n",
-                    Random2);
-                printf ("\tdiffers from Z * 1 = %.17e\n", Random1);
-            }
-            Pause ();
-        }
-    }
-}
-
-void
-notify (s)
-     char   *s;
-{
-    printf ("%s test appears to be inconsistent...\n", s);
-    printf ("   PLEASE NOTIFY KARPINKSI!\n");
-}
-
-void
-msglist (s)
-     char  **s;
-{
-    while (*s)
-        printf ("%s\n", *s++);
-}
-
-void
-Instructions ()
-{
-    static char *instr[] =
-    {
-        "Lest this program stop prematurely, i.e. before displaying\n",
-        "    `END OF TEST',\n",
-        "try to persuade the computer NOT to terminate execution when an",
-        "error like Over/Underflow or Division by Zero occurs, but rather",
-        "to persevere with a surrogate value after, perhaps, displaying some",
-        "warning.  If persuasion avails naught, don't despair but run this",
-        "program anyway to see how many milestones it passes, and then",
-        "amend it to make further progress.\n",
-        "Answer questions with Y, y, N or n (unless otherwise indicated).\n",
-        0};
-
-    msglist (instr);
-}
-
-void
-Heading ()
-{
-    static char *head[] =
-    {
-        "Users are invited to help debug and augment this program so it will",
-        "cope with unanticipated and newly uncovered arithmetic pathologies.\n",
-        "Please send suggestions and interesting results to",
-        "\tRichard Karpinski",
-        "\tComputer Center U-76",
-        "\tUniversity of California",
-        "\tSan Francisco, CA 94143-0704, USA\n",
-        "In doing so, please include the following information:",
-#ifdef SINGLE_PRECISION
-        "\tPrecision:\tsingle;",
-#else /* !SINGLE_PRECISION */
-        "\tPrecision:\tdouble;",
-#endif /* SINGLE_PRECISION */
-        "\tVersion:\t10 February 1989;",
-        "\tComputer:\n",
-        "\tCompiler:\n",
-        "\tOptimization level:\n",
-        "\tOther relevant compiler options:",
-        0};
-
-    msglist (head);
-}
-
-void
-Characteristics ()
-{
-    static char *chars[] =
-    {
-        "Running this program should reveal these characteristics:",
-        "     Radix = 1, 2, 4, 8, 10, 16, 100, 256 ...",
-        "     Precision = number of significant digits carried.",
-        "     U2 = Radix/Radix^Precision = One Ulp",
-        "\t(OneUlpnit in the Last Place) of 1.000xxx .",
-        "     U1 = 1/Radix^Precision = One Ulp of numbers a little less than 1.0 .",
-        "     Adequacy of guard digits for Mult., Div. and Subt.",
-        "     Whether arithmetic is chopped, correctly rounded, or something else",
-        "\tfor Mult., Div., Add/Subt. and Sqrt.",
-        "     Whether a Sticky Bit used correctly for rounding.",
-        "     UnderflowThreshold = an underflow threshold.",
-        "     E0 and PseudoZero tell whether underflow is abrupt, gradual, or fuzzy.",
-        "     V = an overflow threshold, roughly.",
-        "     V0  tells, roughly, whether  Infinity  is represented.",
-        "     Comparisions are checked for consistency with subtraction",
-        "\tand for contamination with pseudo-zeros.",
-        "     Sqrt is tested.  Y^X is not tested.",
-        "     Extra-precise subexpressions are revealed but NOT YET tested.",
-        "     Decimal-Binary conversion is NOT YET tested for accuracy.",
-        0};
-
-    msglist (chars);
-}
-
-void
-History ()
-{                               /* History */
-    /* Converted from Brian Wichmann's Pascal version to C by Thos Sumner,
-        with further massaging by David M. Gay. */
-
-    static char *hist[] =
-    {
-        "The program attempts to discriminate among",
-        "   FLAWs, like lack of a sticky bit,",
-        "   Serious DEFECTs, like lack of a guard digit, and",
-        "   FAILUREs, like 2+2 == 5 .",
-        "Failures may confound subsequent diagnoses.\n",
-        "The diagnostic capabilities of this program go beyond an earlier",
-        "program called `MACHAR', which can be found at the end of the",
-        "book  `Software Manual for the Elementary Functions' (1980) by",
-        "W. J. Cody and W. Waite. Although both programs try to discover",
-        "the Radix, Precision and range (over/underflow thresholds)",
-        "of the arithmetic, this program tries to cope with a wider variety",
-        "of pathologies, and to say how well the arithmetic is implemented.",
-        "\nThe program is based upon a conventional radix representation for",
-        "floating-point numbers, but also allows logarithmic encoding",
-        "as used by certain early WANG machines.\n",
-        "BASIC version of this program (C) 1983 by Prof. W. M. Kahan;",
-        "see source comments for more history.",
-        0};
-
-    msglist (hist);
-}
diff --git a/testsuites/samples/paranoia/paranoia.doc b/testsuites/samples/paranoia/paranoia.doc
deleted file mode 100644
index 496f3569e5..0000000000
--- a/testsuites/samples/paranoia/paranoia.doc
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
diff --git a/testsuites/samples/paranoia/system.h b/testsuites/samples/paranoia/system.h
deleted file mode 100644
index a3e79d92f4..0000000000
--- a/testsuites/samples/paranoia/system.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*  system.h
- *
- *  This include file contains information that is included in every
- *  function in the test set.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <tmacros.h>
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
-
-/* configuration information */
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-#define CONFIGURE_INIT_TASK_ATTRIBUTES    RTEMS_FLOATING_POINT
-#define CONFIGURE_INIT_TASK_STACK_SIZE    (RTEMS_MINIMUM_STACK_SIZE * 2)
-
-#define CONFIGURE_EXTRA_TASK_STACKS       (1 * RTEMS_MINIMUM_STACK_SIZE)
-
-#include <confdefs.h>
-
-/* global variables */
-
-TEST_EXTERN rtems_id Global_variable;   /* example global variable     */
-
-/* end of include file */
diff --git a/testsuites/samples/ticker/init.c b/testsuites/samples/ticker/init.c
deleted file mode 100644
index 47e086ff66..0000000000
--- a/testsuites/samples/ticker/init.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/*  Init
- *
- *  This routine is the initialization task for this test program.
- *  It is called from init_exec and has the responsibility for creating
- *  and starting the tasks that make up the test.  If the time of day
- *  clock is required for the test, it should also be set to a known
- *  value by this function.
- *
- *  Input parameters:  NONE
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "system.h"
-
-rtems_task Init(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-  rtems_time_of_day time;
-
-  puts( "\n\n*** CLOCK TICK TEST ***" );
-
-  build_time( &time, 12, 31, 1988, 9, 0, 0, 0 );
-  status = rtems_clock_set( &time );
-
-  Task_name[ 1 ] = rtems_build_name( 'T', 'A', '1', ' ' );
-  Task_name[ 2 ] = rtems_build_name( 'T', 'A', '2', ' ' );
-  Task_name[ 3 ] = rtems_build_name( 'T', 'A', '3', ' ' );
-
-  status = rtems_task_create(
-    Task_name[ 1 ], 1, RTEMS_MINIMUM_STACK_SIZE, RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES, &Task_id[ 1 ]
-  );
-  status = rtems_task_create(
-    Task_name[ 2 ], 1, RTEMS_MINIMUM_STACK_SIZE, RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES, &Task_id[ 2 ]
-  );
-  status = rtems_task_create(
-    Task_name[ 3 ], 1, RTEMS_MINIMUM_STACK_SIZE, RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES, &Task_id[ 3 ]
-  );
-
-  status = rtems_task_start( Task_id[ 1 ], Test_task, 1 );
-  status = rtems_task_start( Task_id[ 2 ], Test_task, 2 );
-  status = rtems_task_start( Task_id[ 3 ], Test_task, 3 );
-
-  status = rtems_task_delete( RTEMS_SELF );
-}
diff --git a/testsuites/samples/ticker/system.h b/testsuites/samples/ticker/system.h
deleted file mode 100644
index 99943044c1..0000000000
--- a/testsuites/samples/ticker/system.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*  system.h
- *
- *  This include file contains information that is included in every
- *  function in the test set.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <tmacros.h>
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
-
-rtems_task Test_task(
-  rtems_task_argument argument
-);
-
-/* configuration information */
-
-#define CONFIGURE_SPTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#include <confdefs.h>
-
-/* global variables */
-
-TEST_EXTERN rtems_id   Task_id[ 4 ];         /* array of task ids */
-TEST_EXTERN rtems_name Task_name[ 4 ];       /* array of task names */
-
-/* end of include file */
diff --git a/testsuites/samples/ticker/tasks.c b/testsuites/samples/ticker/tasks.c
deleted file mode 100644
index f5f9ea28ff..0000000000
--- a/testsuites/samples/ticker/tasks.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/*  Test_task
- *
- *  This routine serves as a test task.  It verifies the basic task
- *  switching capabilities of the executive.
- *
- *  Input parameters:  NONE
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_task Test_task(
-  rtems_task_argument unused
-)
-{
-  rtems_id          tid;
-  rtems_time_of_day time;
-  rtems_unsigned32  task_index;
-  rtems_status_code status;
-
-  status = rtems_task_ident( RTEMS_SELF, RTEMS_SEARCH_ALL_NODES, &tid );
-  task_index = task_number( tid );
-  while( FOREVER ) {
-    status = rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time );
-    if ( time.second >= 35 ) {
-      puts( "*** END OF CLOCK TICK TEST ***" );
-      exit( 0 );
-    }
-    put_name( Task_name[ task_index ], FALSE );
-    print_time( " - rtems_clock_get - ", &time, "\n" );
-    status = rtems_task_wake_after( task_index * 5 * TICKS_PER_SECOND );
-  }
-}
diff --git a/testsuites/samples/ticker/ticker.doc b/testsuites/samples/ticker/ticker.doc
deleted file mode 100644
index 496f3569e5..0000000000
--- a/testsuites/samples/ticker/ticker.doc
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
diff --git a/testsuites/samples/ticker/ticker.scn b/testsuites/samples/ticker/ticker.scn
deleted file mode 100644
index 35952e6170..0000000000
--- a/testsuites/samples/ticker/ticker.scn
+++ /dev/null
@@ -1,16 +0,0 @@
-*** CLOCK TICK TEST ***
-TA1 - tm_get - 09:00:00   12/31/1988
-TA2 - tm_get - 09:00:00   12/31/1988
-TA3 - tm_get - 09:00:00   12/31/1988
-TA1 - tm_get - 09:00:05   12/31/1988
-TA1 - tm_get - 09:00:10   12/31/1988
-TA2 - tm_get - 09:00:10   12/31/1988
-TA1 - tm_get - 09:00:15   12/31/1988
-TA3 - tm_get - 09:00:15   12/31/1988
-TA1 - tm_get - 09:00:20   12/31/1988
-TA2 - tm_get - 09:00:20   12/31/1988
-TA1 - tm_get - 09:00:25   12/31/1988
-TA1 - tm_get - 09:00:30   12/31/1988
-TA2 - tm_get - 09:00:30   12/31/1988
-TA3 - tm_get - 09:00:30   12/31/1988
-*** END OF CLOCK TICK TEST ***
diff --git a/testsuites/sptests/README b/testsuites/sptests/README
deleted file mode 100644
index 2843063c31..0000000000
--- a/testsuites/sptests/README
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-#  $Id$
-#
-
-This directory contains the RTEMS Single Processor Test Suite.
-The tests in this directory provide near complete (98%+) test
-coverage of the non-multiprocessor code in RTEMS.
-
-
diff --git a/testsuites/sptests/sp01/init.c b/testsuites/sptests/sp01/init.c
deleted file mode 100644
index 59b89d7c67..0000000000
--- a/testsuites/sptests/sp01/init.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/*  Init
- *
- *  This routine is the initialization task for this test program.
- *  It is a user initialization task and has the responsibility for creating
- *  and starting the tasks that make up the test.  If the time of day
- *  clock is required for the test, it should also be set to a known
- *  value by this function.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "system.h"
-
-rtems_task Init(
-  rtems_task_argument argument
-)
-{
-  rtems_time_of_day time;
-  rtems_status_code status;
-
-  puts( "\n\n*** TEST 1 ***" );
-
-  build_time( &time, 12, 31, 1988, 9, 0, 0, 0 );
-  status = rtems_clock_set( &time );
-  directive_failed( status, "rtems_clock_set" );
-
-  Task_name[ 1 ] = rtems_build_name( 'T', 'A', '1', ' ' );
-  Task_name[ 2 ] = rtems_build_name( 'T', 'A', '2', ' ' );
-  Task_name[ 3 ] = rtems_build_name( 'T', 'A', '3', ' ' );
-
-  status = rtems_task_create(
-     Task_name[ 1 ],
-     1,
-     RTEMS_MINIMUM_STACK_SIZE,
-     RTEMS_INTERRUPT_LEVEL(31),
-     RTEMS_DEFAULT_ATTRIBUTES,
-     &Task_id[ 1 ]
-  );
-  directive_failed( status, "rtems_task_create of TA1" );
-
-  status = rtems_task_create(
-     Task_name[ 2 ],
-     1,
-     RTEMS_MINIMUM_STACK_SIZE * 2,
-     RTEMS_DEFAULT_MODES,
-     RTEMS_DEFAULT_ATTRIBUTES,
-     &Task_id[ 2 ]
-  );
-  directive_failed( status, "rtems_task_create of TA2" );
-
-  status = rtems_task_create(
-     Task_name[ 3 ],
-     1,
-     RTEMS_MINIMUM_STACK_SIZE * 3,
-     RTEMS_DEFAULT_MODES,
-     RTEMS_DEFAULT_ATTRIBUTES,
-     &Task_id[ 3 ]
-  );
-  directive_failed( status, "rtems_task_create of TA3" );
-
-  status = rtems_task_start( Task_id[ 1 ], Task_1_through_3, 0 );
-  directive_failed( status, "rtems_task_start of TA1" );
-
-  status = rtems_task_start( Task_id[ 2 ], Task_1_through_3, 0 );
-  directive_failed( status, "rtems_task_start of TA2" );
-
-  status = rtems_task_start( Task_id[ 3 ], Task_1_through_3, 0 );
-  directive_failed( status, "rtems_task_start of TA3" );
-
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-}
diff --git a/testsuites/sptests/sp01/sp01.doc b/testsuites/sptests/sp01/sp01.doc
deleted file mode 100644
index 019cc4d18a..0000000000
--- a/testsuites/sptests/sp01/sp01.doc
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-This file describes the directives and concepts tested by this test set.
-
-test set name:  test1
-
-directives:
-  ex_init, ex_start, t_create, t_start, tm_tick, i_return, t_ident,
-  tm_set, tm_get, tm_wkafter
-
-concepts:
-
-  a.  Verifies system can create and start both the executive's system
-      initialization and idle task.
-
-  b.  Verifies executive can swap between three application tasks at the
-      same priority and the executive's internal idle task.
-
-  c.  Verifies can print strings to the CRT on port 2 of the mvme136 board
-      using Print and Println in the board support package.
-
-  d.  Verifies interrupt handler can handle a task switch from an interrupt
-      as specified with the i_return directive.
-
-  e.  Verifies executive initialization performed correctly.
-
-  f.  Verifies the executive trap handler except for the halt function.
-
-  g.  Verifies that a task can get the task identification number of itself.
-
-output:
- "TA1" is printed once every 5 seconds.  "TA2" is printed once
- every 10 seconds.  "TA3" is printed once every 15 seconds.
diff --git a/testsuites/sptests/sp01/sp01.scn b/testsuites/sptests/sp01/sp01.scn
deleted file mode 100644
index 6d687d042a..0000000000
--- a/testsuites/sptests/sp01/sp01.scn
+++ /dev/null
@@ -1,18 +0,0 @@
-*** TEST 1 ***
-TA1  - rtems_clock_get - 09:00:00   12/31/1988
-TA2  - rtems_clock_get - 09:00:00   12/31/1988
-TA3  - rtems_clock_get - 09:00:00   12/31/1988
-TA1  - rtems_clock_get - 09:00:05   12/31/1988
-TA2  - rtems_clock_get - 09:00:10   12/31/1988
-TA1  - rtems_clock_get - 09:00:10   12/31/1988
-TA3  - rtems_clock_get - 09:00:15   12/31/1988
-TA1  - rtems_clock_get - 09:00:15   12/31/1988
-TA2  - rtems_clock_get - 09:00:20   12/31/1988
-TA1  - rtems_clock_get - 09:00:20   12/31/1988
-TA1  - rtems_clock_get - 09:00:25   12/31/1988
-TA3  - rtems_clock_get - 09:00:30   12/31/1988
-TA2  - rtems_clock_get - 09:00:30   12/31/1988
-TA1  - rtems_clock_get - 09:00:30   12/31/1988
-*** END OF TEST 1 ***
-
-NOTE: The order of the prints at each time interval is irrelevant.
diff --git a/testsuites/sptests/sp01/system.h b/testsuites/sptests/sp01/system.h
deleted file mode 100644
index ddcefc02a9..0000000000
--- a/testsuites/sptests/sp01/system.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*  system.h
- *
- *  This include file contains information that is included in every
- *  function in the test set.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <tmacros.h>
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
-
-rtems_task Task_1_through_3(
-  rtems_task_argument argument
-);
-
-/* configuration information */
-
-#define CONFIGURE_SPTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#define CONFIGURE_EXTRA_TASK_STACKS         (3 * RTEMS_MINIMUM_STACK_SIZE)
-
-#include <confdefs.h>
-
-/* global variables */
-
-TEST_EXTERN rtems_id   Task_id[ 4 ];         /* array of task ids */
-TEST_EXTERN rtems_name Task_name[ 4 ];       /* array of task names */
-
-/* end of include file */
diff --git a/testsuites/sptests/sp01/task1.c b/testsuites/sptests/sp01/task1.c
deleted file mode 100644
index 88ec7c85f7..0000000000
--- a/testsuites/sptests/sp01/task1.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*  Task_1_through_3
- *
- *  This routine serves as a test task.  It verifies the basic task
- *  switching capabilities of the executive.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_task Task_1_through_3(
-  rtems_task_argument argument
-)
-{
-  rtems_id          tid;
-  rtems_time_of_day time;
-  rtems_status_code status;
-
-  status = rtems_task_ident( RTEMS_SELF, RTEMS_SEARCH_ALL_NODES, &tid );
-  directive_failed( status, "rtems_task_ident" );
-
-  while( FOREVER ) {
-    status = rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time );
-    directive_failed( status, "rtems_clock_get" );
-
-    if ( time.second >= 35 ) {
-      puts( "*** END OF TEST 1 ***" );
-      exit( 0 );
-    }
-
-    put_name( Task_name[ task_number( tid ) ], FALSE );
-    print_time( " - rtems_clock_get - ", &time, "\n" );
-
-    status = rtems_task_wake_after( task_number( tid ) * 5 * TICKS_PER_SECOND );
-    directive_failed( status, "rtems_task_wake_after" );
-  }
-}
diff --git a/testsuites/sptests/sp02/init.c b/testsuites/sptests/sp02/init.c
deleted file mode 100644
index dda2f9661c..0000000000
--- a/testsuites/sptests/sp02/init.c
+++ /dev/null
@@ -1,152 +0,0 @@
-/*  Init
- *
- *  This routine is the initialization task for this test program.
- *  It is a user initialization task and has the responsibility for creating
- *  and starting the tasks that make up the test.  If the time of day
- *  clock is required for the test, it should also be set to a known
- *  value by this function.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "system.h"
-
-rtems_task Init(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-
-  puts( "\n\n*** TEST 2 ***" );
-
-  Preempt_task_name =  rtems_build_name( 'P', 'R', 'M', 'T' );
-
-  status = rtems_task_create(
-     Preempt_task_name,
-     1,
-     RTEMS_MINIMUM_STACK_SIZE,
-     RTEMS_DEFAULT_MODES,
-     RTEMS_DEFAULT_ATTRIBUTES,
-     &Preempt_task_id
-  );
-  directive_failed( status, "rtems_task_create of RTEMS_PREEMPT" );
-
-  status = rtems_task_start( Preempt_task_id, Preempt_task, 0 );
-  directive_failed( status, "rtems_task_start of RTEMS_PREEMPT" );
-
-  puts( "INIT - rtems_task_wake_after - yielding processor" );
-  status = rtems_task_wake_after( RTEMS_YIELD_PROCESSOR );
-  directive_failed( status, "rtems_task_wake_after" );
-
-  Task_name[ 1 ] =  rtems_build_name( 'T', 'A', '1', ' ' );
-  Task_name[ 2 ] =  rtems_build_name( 'T', 'A', '2', ' ' );
-  Task_name[ 3 ] =  rtems_build_name( 'T', 'A', '3', ' ' );
-
-  status = rtems_task_create(
-     Task_name[ 1 ],
-     3,
-     RTEMS_MINIMUM_STACK_SIZE,
-     RTEMS_DEFAULT_MODES,
-     RTEMS_DEFAULT_ATTRIBUTES,
-     &Task_id[ 1 ]
-  );
-  directive_failed( status, "rtems_task_create of TA1" );
-
-  status = rtems_task_create(
-     Task_name[ 2 ],
-     3,
-     RTEMS_MINIMUM_STACK_SIZE,
-     RTEMS_DEFAULT_MODES,
-     RTEMS_DEFAULT_ATTRIBUTES,
-     &Task_id[ 2 ]
-  );
-  directive_failed( status, "rtems_task_create of TA2" );
-
-  status = rtems_task_create(
-     Task_name[ 3 ],
-     3,
-     RTEMS_MINIMUM_STACK_SIZE,
-     RTEMS_DEFAULT_MODES,
-     RTEMS_DEFAULT_ATTRIBUTES,
-     &Task_id[ 3 ]
-  );
-  directive_failed( status, "rtems_task_create of TA3" );
-
-  status = rtems_task_start( Task_id[ 1 ], Task_1, 0 );
-  directive_failed( status, "rtems_task_start of TA1" );
-
-  status = rtems_task_start( Task_id[ 2 ], Task_2, 0 );
-  directive_failed( status, "rtems_task_start of TA2" );
-
-  status = rtems_task_start( Task_id[ 3 ], Task_3, 0 );
-  directive_failed( status, "rtems_task_start of TA3" );
-
-  puts( "INIT - suspending TA2 while middle task on a ready chain" );
-  status = rtems_task_suspend( Task_id[ 2 ] );
-  directive_failed( status, "rtems_task_suspend of TA2" );
-
-  status = rtems_task_delete( Task_id[ 1 ] );
-  directive_failed( status, "rtems_task_delete of TA1" );
-
-  status = rtems_task_delete( Task_id[ 2 ] );
-  directive_failed( status, "rtems_task_delete of TA2" );
-
-  status = rtems_task_delete( Task_id[ 3 ] );
-  directive_failed( status, "rtems_task_delete of TA3" );
-
-  status = rtems_task_create(
-     Task_name[ 1 ],
-     1,
-     RTEMS_MINIMUM_STACK_SIZE,
-     RTEMS_DEFAULT_MODES,
-     RTEMS_DEFAULT_ATTRIBUTES,
-     &Task_id[ 1 ]
-  );
-  directive_failed( status, "rtems_task_create of TA1" );
-
-  status = rtems_task_create(
-     Task_name[ 2 ],
-     3,
-     RTEMS_MINIMUM_STACK_SIZE,
-     RTEMS_DEFAULT_MODES,
-     RTEMS_DEFAULT_ATTRIBUTES,
-     &Task_id[ 2 ]
-  );
-  directive_failed( status, "rtems_task_create of TA2" );
-
-  status = rtems_task_create(
-     Task_name[ 3 ],
-     3,
-     RTEMS_MINIMUM_STACK_SIZE,
-     RTEMS_DEFAULT_MODES,
-     RTEMS_DEFAULT_ATTRIBUTES,
-     &Task_id[ 3 ]
-  );
-  directive_failed( status, "rtems_task_create of TA3" );
-
-  status = rtems_task_start( Task_id[ 1 ], Task_1, 0 );
-  directive_failed( status, "rtems_task_start of TA1" );
-
-  status = rtems_task_start( Task_id[ 2 ], Task_2, 0 );
-  directive_failed( status, "rtems_task_start of TA2" );
-
-  status = rtems_task_start( Task_id[ 3 ], Task_3, 0 );
-  directive_failed( status, "rtems_task_start of TA3" );
-
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-}
diff --git a/testsuites/sptests/sp02/preempt.c b/testsuites/sptests/sp02/preempt.c
deleted file mode 100644
index 4ce362e8fa..0000000000
--- a/testsuites/sptests/sp02/preempt.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/*  Preempt_task
- *
- *  This routine serves as a test task.  It verifies the task manager.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_task Preempt_task(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-
-  puts( "PREEMPT - rtems_task_delete - deleting self" );
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_PREEMPT" );
-}
diff --git a/testsuites/sptests/sp02/sp02.doc b/testsuites/sptests/sp02/sp02.doc
deleted file mode 100644
index 5e50b42f12..0000000000
--- a/testsuites/sptests/sp02/sp02.doc
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
-This file describes the directives and concepts tested by this test set.
-
-test set name:  test2
-
-directives:
-  ex_init, ex_start, t_create, t_start, tm_tick, i_return, t_ident,
-  t_delete, tm_wkafter, t_setpri, t_suspend
-
-concepts:
-
-  a.  Verifies that a task can delete another task and also delete itself.
-
-  b.  Verifies that memory is freed back to the heap correctly.
-
-  c.  Verifies that TCBs are freed back to the inactive chain correctly.
-
-  d.  Verifies that a task can get the task identification number of
-      another task.
-
-  e.  Verifies the _Set_state routine where the task is not READY.
-
-  f.  Verifies the break statement in the _Block_activate routine.
-
-  g.  Verifies the while loop in the _Prev_tcb routine.
diff --git a/testsuites/sptests/sp02/sp02.scn b/testsuites/sptests/sp02/sp02.scn
deleted file mode 100644
index d3f3d61cd1..0000000000
--- a/testsuites/sptests/sp02/sp02.scn
+++ /dev/null
@@ -1,15 +0,0 @@
-*** TEST 2 ***
-INIT - rtems_task_wake_after - yielding processor
-PREEMPT - rtems_task_delete - deleting self
-INIT - suspending TA2 while middle task on a ready chain
-TA1 - rtems_task_wake_after - sleep 1 second
-TA2 - rtems_task_wake_after - sleep 1 minute
-TA3 - rtems_task_wake_after - sleep 5 seconds
-TA1 - rtems_task_ident - tid of TA2 (0x08010007)
-TA1 - rtems_task_ident - tid of TA3 (0x08010008)
-TA1 - rtems_task_set_priority - set TA3's priority to 2
-TA1 - rtems_task_suspend - suspend TA2
-TA1 - rtems_task_delete - delete TA2
-TA1 - rtems_task_wake_after - sleep for 5 seconds
-TA3 - rtems_task_delete - delete self
-*** END OF TEST 2 ***
diff --git a/testsuites/sptests/sp02/system.h b/testsuites/sptests/sp02/system.h
deleted file mode 100644
index aedcd2d375..0000000000
--- a/testsuites/sptests/sp02/system.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*  system.h
- *
- *  This include file contains information that is included in every
- *  function in the test set.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <tmacros.h>
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
-
-rtems_task Preempt_task(
-  rtems_task_argument argument
-);
-
-rtems_task Task_1(
-  rtems_task_argument argument
-);
-
-rtems_task Task_2(
-  rtems_task_argument argument
-);
-
-rtems_task Task_3(
-  rtems_task_argument argument
-);
-
-/* configuration information */
-
-#define CONFIGURE_SPTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#include <confdefs.h>
-
-/* global variables */
-
-TEST_EXTERN rtems_id   Task_id[ 4 ];         /* array of task ids */
-TEST_EXTERN rtems_name Task_name[ 4 ];       /* array of task names */
-
-TEST_EXTERN rtems_id   Preempt_task_id;         /* preempt task id */
-TEST_EXTERN rtems_name Preempt_task_name;       /* preempt task name */
-
-/* end of include file */
diff --git a/testsuites/sptests/sp02/task1.c b/testsuites/sptests/sp02/task1.c
deleted file mode 100644
index 2ab2caa7e8..0000000000
--- a/testsuites/sptests/sp02/task1.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/*  Task_1
- *
- *  This routine serves as a test task.  It verifies the task manager.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_task Task_1(
-  rtems_task_argument argument
-)
-{
-  rtems_id          tid2;
-  rtems_id          tid3;
-  rtems_status_code status;
-  rtems_unsigned32  previous_priority;
-
-  puts( "TA1 - rtems_task_wake_after - sleep 1 second" );
-  status = rtems_task_wake_after( 1*TICKS_PER_SECOND );
-  directive_failed( status, "rtems_task_wake_after" );
-
-  status = rtems_task_ident( Task_name[ 2 ], RTEMS_SEARCH_ALL_NODES, &tid2 );
-  directive_failed( status, "rtems_task_ident of TA2" );
-
-  printf( "TA1 - rtems_task_ident - tid of TA2 (0x%.8x)\n", tid2 );
-
-  status = rtems_task_ident( Task_name[ 3 ], RTEMS_SEARCH_ALL_NODES, &tid3 );
-  directive_failed( status, "rtems_task_ident of TA3" );
-
-  printf( "TA1 - rtems_task_ident - tid of TA3 (0x%.8x)\n", tid3 );
-
-  status = rtems_task_set_priority( tid3, 2, &previous_priority );
-  directive_failed( status, "rtems_task_set_priority" );
-
-  puts( "TA1 - rtems_task_set_priority - set TA3's priority to 2" );
-
-
-  puts( "TA1 - rtems_task_suspend - suspend TA2" );
-  status = rtems_task_suspend( tid2 );
-  directive_failed( status, "rtems_task_suspend of TA2" );
-
-  puts( "TA1 - rtems_task_delete - delete TA2" );
-  status = rtems_task_delete( tid2 );
-  directive_failed( status, "rtems_task_delete of TA2" );
-
-  puts( "TA1 - rtems_task_wake_after - sleep for 5 seconds" );
-  status = rtems_task_wake_after( 5*TICKS_PER_SECOND );
-  directive_failed( status, "rtems_task_wake_after" );
-
-  puts( "*** END OF TEST 2 ***" );
-  exit( 0 );
-}
diff --git a/testsuites/sptests/sp02/task2.c b/testsuites/sptests/sp02/task2.c
deleted file mode 100644
index 0b10e3db53..0000000000
--- a/testsuites/sptests/sp02/task2.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/*  Task_2
- *
- *  This routine serves as a test task.  It sleeps for 1 minute but
- *  does not expect to wake up.  Task 1 should suspend then delete it
- *  so that it appears to never wake up.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_task Task_2(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-
-  puts( "TA2 - rtems_task_wake_after - sleep 1 minute" );
-  status = rtems_task_wake_after( 60*TICKS_PER_SECOND );
-  directive_failed( status, "rtems_task_wake_after in TA2" );
-}
diff --git a/testsuites/sptests/sp02/task3.c b/testsuites/sptests/sp02/task3.c
deleted file mode 100644
index ddc6b8e5bd..0000000000
--- a/testsuites/sptests/sp02/task3.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*  Task_3
- *
- *  This routine serves as a test task.  It simply sleeps for 5 seconds
- *  and then deletes itself.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_task Task_3(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-
-  puts( "TA3 - rtems_task_wake_after - sleep 5 seconds" );
-  status = rtems_task_wake_after( 5*TICKS_PER_SECOND );
-  directive_failed( status, "rtems_task_wake_after in TA3" );
-
-  puts( "TA3 - rtems_task_delete - delete self" );
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of TA3" );
-}
diff --git a/testsuites/sptests/sp03/init.c b/testsuites/sptests/sp03/init.c
deleted file mode 100644
index c266cfd600..0000000000
--- a/testsuites/sptests/sp03/init.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/*  Init
- *
- *  This routine is the initialization task for this test program.
- *  It is a user initialization task and has the responsibility for creating
- *  and starting the tasks that make up the test.  If the time of day
- *  clock is required for the test, it should also be set to a known
- *  value by this function.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "system.h"
-
-rtems_task Init(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-
-  puts( "\n\n*** TEST 3 ***" );
-
-  Task_name[ 1 ] =  rtems_build_name( 'T', 'A', '1', ' ' );
-  Task_name[ 2 ] =  rtems_build_name( 'T', 'A', '2', ' ' );
-
-  status = rtems_task_create(
-     Task_name[ 1 ],
-     1,
-     RTEMS_MINIMUM_STACK_SIZE,
-     RTEMS_DEFAULT_MODES,
-     RTEMS_DEFAULT_ATTRIBUTES,
-     &Task_id[ 1 ]
-  );
-  directive_failed( status, "rtems_task_create of TA1" );
-
-  status = rtems_task_create(
-     Task_name[ 2 ],
-     1,
-     RTEMS_MINIMUM_STACK_SIZE,
-     RTEMS_DEFAULT_MODES,
-     RTEMS_DEFAULT_ATTRIBUTES,
-     &Task_id[ 2 ]
-  );
-  directive_failed( status, "rtems_task_create of TA2" );
-
-  status = rtems_task_start( Task_id[ 1 ], Task_1, 0 );
-  directive_failed( status, "rtems_task_start of TA1" );
-
-  status = rtems_task_start( Task_id[ 2 ], Task_2, 0 );
-  directive_failed( status, "rtems_task_start of TA2" );
-
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-}
diff --git a/testsuites/sptests/sp03/sp03.doc b/testsuites/sptests/sp03/sp03.doc
deleted file mode 100644
index b5182f2f94..0000000000
--- a/testsuites/sptests/sp03/sp03.doc
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
-This file describes the directives and concepts tested by this test set.
-
-test set name:  test3
-
-directives:
-  ex_init, ex_start, t_create, t_start, tm_tick, i_return, tm_wkafter,
-  tm_wkwhen, tm_set, tm_get
-
-concepts:
-
-  a.  Verifies conversion routines - _Utd_to_etd and _Etd_to_utd
diff --git a/testsuites/sptests/sp03/sp03.scn b/testsuites/sptests/sp03/sp03.scn
deleted file mode 100644
index 496982e86f..0000000000
--- a/testsuites/sptests/sp03/sp03.scn
+++ /dev/null
@@ -1,26 +0,0 @@
-*** TEST 3 ***
-TA1 sets clock: 09:15:00   12/31/1988
-TA1 going to sleep:  09:15:00   12/31/1988
-TA2  09:15:01   12/31/1988
-TA2  09:15:02   12/31/1988
-TA2  09:15:03   12/31/1988
-TA2  09:15:04   12/31/1988
-TA1 awakened:  09:15:05   12/31/1988
-TA1 going to sleep:  09:15:05   12/31/1988
-TA2  09:15:05   12/31/1988
-TA2  09:15:06   12/31/1988
-TA2  09:15:07   12/31/1988
-TA2  09:15:08   12/31/1988
-TA2  09:15:09   12/31/1988
-TA1 awakened:  09:15:10   12/31/1988
-TA1 going to sleep:  09:15:10   12/31/1988
-TA2  09:15:10   12/31/1988
-TA2  09:15:11   12/31/1988
-TA2  09:15:12   12/31/1988
-TA2  09:15:13   12/31/1988
-TA2  09:15:14   12/31/1988
-TA1 awakened:  09:15:15   12/31/1988
-TA1 going to sleep:  09:15:15   12/31/1988
-TA2   09:15:15   12/31/1988
-TA2   09:15:16   12/31/1988
-*** END OF TEST 3 ***
diff --git a/testsuites/sptests/sp03/system.h b/testsuites/sptests/sp03/system.h
deleted file mode 100644
index c52f7a9896..0000000000
--- a/testsuites/sptests/sp03/system.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*  system.h
- *
- *  This include file contains information that is included in every
- *  function in the test set.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <tmacros.h>
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
-
-rtems_task Task_1(
-  rtems_task_argument argument
-);
- 
-rtems_task Task_2(
-  rtems_task_argument argument
-);
-
-/* configuration information */
-
-#define CONFIGURE_SPTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#include <confdefs.h>
-
-/* global variables */
-
-TEST_EXTERN rtems_id   Task_id[ 4 ];         /* array of task ids */
-TEST_EXTERN rtems_name Task_name[ 4 ];       /* array of task names */
-
-/* end of include file */
diff --git a/testsuites/sptests/sp03/task1.c b/testsuites/sptests/sp03/task1.c
deleted file mode 100644
index 9f39d26293..0000000000
--- a/testsuites/sptests/sp03/task1.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*  Task_1
- *
- *  This routine serves as a test task.  It verifies the capability to
- *  set and read the executives calender and clock.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_task Task_1(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-  rtems_time_of_day time;
-
-  build_time( &time, 12, 31, 1988, 9, 15, 0, 0 );
-
-  status = rtems_clock_set( &time );
-  directive_failed( status, "rtems_clock_set" );
-
-  put_name( Task_name[ 1 ], FALSE );
-  print_time( " sets clock: ", &time, "\n" );
-
-  while( FOREVER ) {
-    status = rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time );
-    directive_failed( status, "rtems_clock_get" );
-
-    put_name( Task_name[ 1 ], FALSE );
-    print_time( " going to sleep:  ", &time, "\n" );
-
-    time.second += 5;
-    time.minute += ( time.second / 60 );
-    time.second %= 60;
-    time.hour += ( time.minute / 60 );
-    time.minute %= 60;
-    time.hour %= 24;
-
-    status = rtems_task_wake_when( &time );
-    directive_failed( status, "rtems_task_wake_when" );
-
-    put_name( Task_name[ 1 ], FALSE );
-    print_time( " awakened:  ", &time, "\n" );
-  }
-}
diff --git a/testsuites/sptests/sp03/task2.c b/testsuites/sptests/sp03/task2.c
deleted file mode 100644
index 4f40582ab3..0000000000
--- a/testsuites/sptests/sp03/task2.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/*  Task_2
- *
- *  This routine serves as a test task.  It repeatedly gets the system time
- *  and date, converts it to printable form, and print it.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_task Task_2(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-  rtems_time_of_day time;
-
-  while( FOREVER ) {
-    status = rtems_task_wake_after( 1*TICKS_PER_SECOND );
-    directive_failed( status, "rtems_task_wake_after" );
-
-    status = rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time );
-    directive_failed( status, "rtems_clock_get" );
-
-    if ( time.second >= 17 ) {
-      puts( "*** END OF TEST 3 *** " );
-      exit( 0 );
-    }
-
-    put_name( Task_name[ 2 ], FALSE );
-    print_time( "  ", &time, "\n" );
-  }
-}
diff --git a/testsuites/sptests/sp04/init.c b/testsuites/sptests/sp04/init.c
deleted file mode 100644
index 531b42af64..0000000000
--- a/testsuites/sptests/sp04/init.c
+++ /dev/null
@@ -1,110 +0,0 @@
-/*  Init
- *
- *  This routine is the initialization task for this test program.
- *  It is a user initialization task and has the responsibility for creating
- *  and starting the tasks that make up the test.  If the time of day
- *  clock is required for the test, it should also be set to a known
- *  value by this function.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "system.h"
-
-rtems_extensions_table Extensions = {
-  NULL,                      /* task create user extension */
-  NULL,                      /* task start user extension */
-  NULL,                      /* task restart user extension */
-  NULL,                      /* task delete user extension */
-  Task_switch,               /* task switch user extension */
-  NULL,                      /* task begin user extension */
-  NULL,                      /* task exitted user extension */
-  NULL                       /* fatal error user extension */
-};
-
-rtems_task Init(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-  rtems_time_of_day time;
-
-  puts( "\n\n*** TEST 4 ***" );
-  build_time( &time, 12, 31, 1988, 9, 15, 0, 0 );
-
-  status = rtems_clock_set( &time );
-  directive_failed( status, "rtems_clock_set" );
-
-  Extension_name[ 1 ] =  rtems_build_name( 'E', 'X', 'T', ' ' );
-
-  status = rtems_extension_create(
-    Extension_name[ 1 ],
-    &Extensions,
-    &Extension_id[ 1 ]
-  );
-  directive_failed( status, "rtems_extension_create" );
-
-  Task_name[ 1 ] =  rtems_build_name( 'T', 'A', '1', ' ' );
-  Task_name[ 2 ] =  rtems_build_name( 'T', 'A', '2', ' ' );
-  Task_name[ 3 ] =  rtems_build_name( 'T', 'A', '3', ' ' );
-
-  Run_count[ 1 ] = 0;
-  Run_count[ 2 ] = 0;
-  Run_count[ 3 ] = 0;
-
-  status = rtems_task_create(
-     Task_name[ 1 ],
-     1,
-     RTEMS_MINIMUM_STACK_SIZE * 2,
-     RTEMS_TIMESLICE,
-     RTEMS_DEFAULT_ATTRIBUTES,
-     &Task_id[ 1 ]
-  );
-  directive_failed( status, "rtems_task_create of TA1" );
-
-  status = rtems_task_create(
-     Task_name[ 2 ],
-     1,
-     RTEMS_MINIMUM_STACK_SIZE * 2,
-     RTEMS_TIMESLICE,
-     RTEMS_DEFAULT_ATTRIBUTES,
-     &Task_id[ 2 ]
-  );
-  directive_failed( status, "rtems_task_create of TA2" );
-
-  status = rtems_task_create(
-     Task_name[ 3 ],
-     1,
-     RTEMS_MINIMUM_STACK_SIZE * 2,
-     RTEMS_TIMESLICE,
-     RTEMS_DEFAULT_ATTRIBUTES,
-     &Task_id[ 3 ]
-  );
-  directive_failed( status, "rtems_task_create of TA3" );
-
-  status = rtems_task_start( Task_id[ 1 ], Task_1, 0 );
-  directive_failed( status, "rtems_task_start of TA1" );
-
-  status = rtems_task_start( Task_id[ 2 ], Task_2, 0 );
-  directive_failed( status, "rtems_task_start of TA2" );
-
-  status = rtems_task_start( Task_id[ 3 ], Task_3, 0 );
-  directive_failed( status, "rtems_task_start of TA3" );
-
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-}
diff --git a/testsuites/sptests/sp04/sp04.doc b/testsuites/sptests/sp04/sp04.doc
deleted file mode 100644
index 13a235886a..0000000000
--- a/testsuites/sptests/sp04/sp04.doc
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
-This file describes the directives and concepts tested by this test set.
-
-test set name:  test4
-
-directives:
-  ex_init, ex_start, t_create, t_start, tm_tick, i_return,
-  tm_set, tm_get, ev_receive, t_mode
-
-concepts:
-
-  a.  Verifies timeslicing ( all tasks are in timeslice mode ).
-
-  b.  Verifies the tswitch user extension.
-
-  c.  Verifies the no preemption mode.
-
-  d.  Verifies time-slice gets reset even if only one task ready.
-
-output:
-  The task name and the current time are printed out each time that a new
-  task is being dispatched.  The configured timeslice is 100 ticks
-  ( 1 second ); therefore, a task name and the time are printed once
-  every second.  After each task runs 3 times, task 1 changes its mode to
-  no preempt and runs for about 6 seconds and then changes its mode back to
-  preempt mode.
diff --git a/testsuites/sptests/sp04/sp04.scn b/testsuites/sptests/sp04/sp04.scn
deleted file mode 100644
index 1acd83a82f..0000000000
--- a/testsuites/sptests/sp04/sp04.scn
+++ /dev/null
@@ -1,23 +0,0 @@
-*** TEST 4 ***
-TA1 - 09:15:00   12/31/1988
-TA1 - rtems_task_suspend - on Task 2
-TA1 - rtems_task_suspend - on Task 3
-TA1 - killing time
-TA1 - rtems_task_resume - on Task 2
-TA1 - rtems_task_resume - on Task 3
-TA2 - 09:15:04   12/31/1988
-TA3 - 09:15:05   12/31/1988
-TA1 - 09:15:06   12/31/1988
-TA2 - 09:15:07   12/31/1988
-TA3 - 09:15:08   12/31/1988
-TA1 - 09:15:09   12/31/1988
-TA1 - rtems_task_mode - change mode to NO RTEMS_PREEMPT
-TA1 - 09:15:10   12/31/1988
-TA1 - 09:15:11   12/31/1988
-TA1 - 09:15:12   12/31/1988
-TA1 - 09:15:13   12/31/1988
-TA1 - 09:15:14   12/31/1988
-TA1 - 09:15:15   12/31/1988
-TA1 - rtems_task_mode - change mode to RTEMS_PREEMPT
-TA2 - 09:15:16   12/31/1988
-*** END OF TEST 4 ***
diff --git a/testsuites/sptests/sp04/system.h b/testsuites/sptests/sp04/system.h
deleted file mode 100644
index cef8f5546b..0000000000
--- a/testsuites/sptests/sp04/system.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*  system.h
- *
- *  This include file contains information that is included in every
- *  function in the test set.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <tmacros.h>
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
-
-rtems_task Task_1(
-  rtems_task_argument argument
-);
- 
-rtems_task Task_2(
-  rtems_task_argument argument
-);
- 
-rtems_task Task_3(
-  rtems_task_argument argument
-);
- 
-void Task_switch(
-  rtems_tcb *unused,
-  rtems_tcb *heir
-);
-
-/* configuration information */
-
-#define CONFIGURE_SPTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_MAXIMUM_USER_EXTENSIONS     1
-#define CONFIGURE_TICKS_PER_TIMESLICE       100
-
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#define CONFIGURE_EXTRA_TASK_STACKS         (3 * RTEMS_MINIMUM_STACK_SIZE)
-
-#include <confdefs.h>
-
-/* global variables */
-
-TEST_EXTERN rtems_id   Task_id[ 4 ];         /* array of task ids */
-TEST_EXTERN rtems_name Task_name[ 4 ];       /* array of task names */
-
-TEST_EXTERN rtems_id   Extension_id[ 4 ];
-TEST_EXTERN rtems_name Extension_name[ 4 ];  /* array of task names */
- 
-/* array of task run counts */
-TEST_EXTERN volatile rtems_unsigned32 Run_count[ 4 ];  
- 
-/*
- * Keep track of task switches
- */
-struct taskSwitchLog {
-  int               taskIndex;
-  rtems_time_of_day when;
-};
-extern struct taskSwitchLog taskSwitchLog[];
-extern int taskSwitchLogIndex;
-volatile extern int testsFinished;
-
-/* end of include file */
diff --git a/testsuites/sptests/sp04/task1.c b/testsuites/sptests/sp04/task1.c
deleted file mode 100644
index 40b7c175f4..0000000000
--- a/testsuites/sptests/sp04/task1.c
+++ /dev/null
@@ -1,118 +0,0 @@
-/*  Task_1
- *
- *  This test serves as a test task.  It verifies timeslicing activities
- *  and tswitch extension processing.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-static void
-showTaskSwitches (void)
-{
-  int i;
-  int switches = taskSwitchLogIndex;
-
-  for (i = 0 ; i < switches ; i++) {
-      put_name( Task_name[taskSwitchLog[i].taskIndex], FALSE );
-      print_time( "- ", &taskSwitchLog[i].when, "\n" );
-  }
-}
-
-rtems_task Task_1(
-  rtems_task_argument argument
-)
-{
-  rtems_unsigned32  seconds;
-  rtems_unsigned32  old_seconds;
-  rtems_mode        previous_mode;
-  rtems_time_of_day time;
-  rtems_status_code status;
-  rtems_unsigned32  start_time;
-  rtems_unsigned32  end_time;
-
-  puts( "TA1 - rtems_task_suspend - on Task 2" );
-  status = rtems_task_suspend( Task_id[ 2 ] );
-  directive_failed( status, "rtems_task_suspend of TA2" );
-
-  puts( "TA1 - rtems_task_suspend - on Task 3" );
-  status = rtems_task_suspend( Task_id[ 3 ] );
-  directive_failed( status, "rtems_task_suspend of TA3" );
-
-  status = rtems_clock_get( RTEMS_CLOCK_GET_SECONDS_SINCE_EPOCH, &start_time );
-  directive_failed( status, "rtems_clock_get" );
-
-  puts( "TA1 - killing time" );
-
-  for ( ; ; ) {
-    status = rtems_clock_get( RTEMS_CLOCK_GET_SECONDS_SINCE_EPOCH, &end_time );
-    directive_failed( status, "rtems_clock_get" );
-
-    if ( end_time > (start_time + 2) )
-      break;
-  }
-
-  puts( "TA1 - rtems_task_resume - on Task 2" );
-  status = rtems_task_resume( Task_id[ 2 ] );
-  directive_failed( status, "rtems_task_resume of TA2" );
-
-  puts( "TA1 - rtems_task_resume - on Task 3" );
-  status = rtems_task_resume( Task_id[ 3 ] );
-  directive_failed( status, "rtems_task_resume of TA3" );
-
-  while ( FOREVER ) {
-    if ( Run_count[ 1 ] == 3 ) {
-      puts( "TA1 - rtems_task_mode - change mode to NO RTEMS_PREEMPT" );
-
-      status = rtems_task_mode(
-        RTEMS_NO_PREEMPT,
-        RTEMS_PREEMPT_MASK,
-        &previous_mode
-      );
-      directive_failed( status, "rtems_task_mode" );
-
-      status = rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time );
-      directive_failed( status, "rtems_clock_get" );
-
-      old_seconds = time.second;
-
-      for ( seconds = 0 ; seconds < 6 ; ) {
-        status = rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time );
-        directive_failed( status, "rtems_clock_get" );
-
-        if ( time.second != old_seconds ) {
-          old_seconds = time.second;
-          seconds++;
-          print_time( "TA1 - ", &time, "\n" );
-        }
-      }
-
-      puts( "TA1 - rtems_task_mode - change mode to RTEMS_PREEMPT" );
-      status = rtems_task_mode(
-        RTEMS_PREEMPT,
-        RTEMS_PREEMPT_MASK,
-        &previous_mode
-      );
-      directive_failed( status, "rtems_task_mode" );
-
-      while ( !testsFinished );
-      showTaskSwitches ();
-      puts( "*** END OF TEST 4 ***" );
-      exit (0);
-    }
-  }
-}
diff --git a/testsuites/sptests/sp04/task2.c b/testsuites/sptests/sp04/task2.c
deleted file mode 100644
index ff22274284..0000000000
--- a/testsuites/sptests/sp04/task2.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/*  Task_2
- *
- *  This routine serves as a test task.  It is just a CPU bound task
- *  requiring timesliced operation.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_task Task_2(
-  rtems_task_argument argument
-)
-{
-  while( FOREVER );
-}
diff --git a/testsuites/sptests/sp04/task3.c b/testsuites/sptests/sp04/task3.c
deleted file mode 100644
index a431a99f9d..0000000000
--- a/testsuites/sptests/sp04/task3.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/*  Task_3
- *
- *  This routine serves as a test task.  It is just a CPU bound task
- *  requiring timesliced operation.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_task Task_3(
-  rtems_task_argument argument
-)
-{
-  while( FOREVER );
-}
diff --git a/testsuites/sptests/sp04/tswitch.c b/testsuites/sptests/sp04/tswitch.c
deleted file mode 100644
index 1301507782..0000000000
--- a/testsuites/sptests/sp04/tswitch.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/*  Task_switch
- *
- *  This routine is the tswitch user extension.  It determines which
- *  task is being switched to and displays a message indicating the
- *  time and date that it gained control.
- *
- *  Input parameters:
- *    unused  - pointer to currently running TCB
- *    heir    - pointer to heir TCB
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-struct taskSwitchLog taskSwitchLog[1000];
-int taskSwitchLogIndex;
-volatile int testsFinished;;
-
-rtems_extension Task_switch( 
-  rtems_tcb *unused,
-  rtems_tcb *heir
-)
-{
-  rtems_unsigned32  index;
-  rtems_time_of_day time;
-  rtems_status_code status;
-
-  index = task_number( heir->Object.id );
-
-  switch( index ) {
-    case 1:
-    case 2:
-    case 3:
-      Run_count[ index ] += 1;
-
-      status = rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time );
-      directive_failed( status, "rtems_clock_get" );
-
-      if (taskSwitchLogIndex < (sizeof taskSwitchLog / sizeof taskSwitchLog[0])) {
-        taskSwitchLog[taskSwitchLogIndex].taskIndex = index;
-        taskSwitchLog[taskSwitchLogIndex].when = time;
-        taskSwitchLogIndex++;
-      }
-      if ( time.second >= 16 )
-	testsFinished = 1;
-      break;
-
-    case 0:
-    default:
-      break;
-  }
-}
diff --git a/testsuites/sptests/sp05/init.c b/testsuites/sptests/sp05/init.c
deleted file mode 100644
index df81e48052..0000000000
--- a/testsuites/sptests/sp05/init.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*  Init
- *
- *  This routine is the initialization task for this test program.
- *  It is a user initialization task and has the responsibility for creating
- *  and starting the tasks that make up the test.  If the time of day
- *  clock is required for the test, it should also be set to a known
- *  value by this function.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "system.h"
-
-rtems_task Init(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-
-  puts( "\n\n*** TEST 5 ***" );
-
-  Task_name[ 1 ] =  rtems_build_name( 'T', 'A', '1', ' ' );
-  Task_name[ 2 ] =  rtems_build_name( 'T', 'A', '2', ' ' );
-  Task_name[ 3 ] =  rtems_build_name( 'T', 'A', '3', ' ' );
-
-  status = rtems_task_create(
-     Task_name[ 1 ],
-     1,
-     RTEMS_MINIMUM_STACK_SIZE,
-     RTEMS_DEFAULT_MODES,
-     RTEMS_DEFAULT_ATTRIBUTES,
-     &Task_id[ 1 ]
-  );
-  directive_failed( status, "rtems_task_create of TA1" );
-
-  status = rtems_task_create(
-     Task_name[ 2 ],
-     1,
-     RTEMS_MINIMUM_STACK_SIZE,
-     RTEMS_DEFAULT_MODES,
-     RTEMS_DEFAULT_ATTRIBUTES,
-     &Task_id[ 2 ]
-  );
-  directive_failed( status, "rtems_task_create of TA2" );
-
-  status = rtems_task_create(
-     Task_name[ 3 ],
-     1,
-     RTEMS_MINIMUM_STACK_SIZE,
-     RTEMS_DEFAULT_MODES,
-     RTEMS_DEFAULT_ATTRIBUTES,
-     &Task_id[ 3 ]
-  );
-  directive_failed( status, "rtems_task_create of TA3" );
-
-  status = rtems_task_start( Task_id[ 1 ], Task_1, 0 );
-  directive_failed( status, "rtems_task_start of TA1" );
-
-  status = rtems_task_start( Task_id[ 2 ], Task_2, 0 );
-  directive_failed( status, "rtems_task_start of TA2" );
-
-  status = rtems_task_start( Task_id[ 3 ], Task_3, 0 );
-  directive_failed( status, "rtems_task_start of TA3" );
-
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-}
diff --git a/testsuites/sptests/sp05/sp05.doc b/testsuites/sptests/sp05/sp05.doc
deleted file mode 100644
index 0f005cf007..0000000000
--- a/testsuites/sptests/sp05/sp05.doc
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
-This file describes the directives and concepts tested by this test set.
-
-test set name:  test5
-
-directives:
-  ex_init, ex_start, t_create, t_start, tm_tick, i_return, t_ident
-  tm_wkafter, t_suspend, t_resume
-
-concepts:
-
-  a.  Verifies that a task can be suspended and resumed.
-
-  b.  Verifies that a task can suspend itself.
diff --git a/testsuites/sptests/sp05/sp05.scn b/testsuites/sptests/sp05/sp05.scn
deleted file mode 100644
index 40afb2d4b2..0000000000
--- a/testsuites/sptests/sp05/sp05.scn
+++ /dev/null
@@ -1,47 +0,0 @@
-*** TEST 5 ***
-TA1 - rtems_task_wake_after - sleep 5 seconds
-TA2 - rtems_task_suspend - suspend self
-TA3 - rtems_task_suspend - suspend self
-TA1 - rtems_task_suspend - suspend TA3
-TA1 - rtems_task_resume  - resume TA2
-TA1 - rtems_task_wake_after - sleep 5 seconds
-TA2 - rtems_task_wake_after - sleep 1 second
-TA2 - rtems_task_wake_after - sleep 1 second
-TA2 - rtems_task_wake_after - sleep 1 second
-TA2 - rtems_task_wake_after - sleep 1 second
-TA2 - rtems_task_wake_after - sleep 1 second
-TA1 - rtems_task_suspend - suspend TA2
-TA1 - rtems_task_resume - resume TA3
-TA1 - rtems_task_wake_after - sleep 5 seconds
-TA3 - rtems_task_wake_after - sleep 1 second
-TA3 - rtems_task_wake_after - sleep 1 second
-TA3 - rtems_task_wake_after - sleep 1 second
-TA3 - rtems_task_wake_after - sleep 1 second
-TA3 - rtems_task_wake_after - sleep 1 second
-TA1 - rtems_task_suspend - suspend TA3
-TA1 - rtems_task_resume  - resume TA2
-TA1 - rtems_task_wake_after - sleep 5 seconds
-TA2 - rtems_task_wake_after - sleep 1 second
-TA2 - rtems_task_wake_after - sleep 1 second
-TA2 - rtems_task_wake_after - sleep 1 second
-TA2 - rtems_task_wake_after - sleep 1 second
-TA2 - rtems_task_wake_after - sleep 1 second
-TA1 - rtems_task_suspend - suspend TA2
-TA1 - rtems_task_resume - resume TA3
-TA1 - rtems_task_wake_after - sleep 5 seconds
-TA3 - rtems_task_wake_after - sleep 1 second
-TA3 - rtems_task_wake_after - sleep 1 second
-TA3 - rtems_task_wake_after - sleep 1 second
-TA3 - rtems_task_wake_after - sleep 1 second
-TA3 - rtems_task_wake_after - sleep 1 second
-TA1 - rtems_task_suspend - suspend TA3
-TA1 - rtems_task_resume - resume TA2
-TA1 - rtems_task_wake_after - sleep 5 seconds
-TA2 - rtems_task_wake_after - sleep 1 second
-TA2 - rtems_task_wake_after - sleep 1 second
-TA2 - rtems_task_wake_after - sleep 1 second
-TA2 - rtems_task_wake_after - sleep 1 second
-TA2 - rtems_task_wake_after - sleep 1 second
-TA1 - rtems_task_suspend - suspend TA2
-TA1 - rtems_task_resume - resume TA3
-*** END OF TEST 5 ***
diff --git a/testsuites/sptests/sp05/system.h b/testsuites/sptests/sp05/system.h
deleted file mode 100644
index 785491d481..0000000000
--- a/testsuites/sptests/sp05/system.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*  system.h
- *
- *  This include file contains information that is included in every
- *  function in the test set.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <tmacros.h>
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
-
-rtems_task Task_1(
-  rtems_task_argument argument
-);
- 
-rtems_task Task_2(
-  rtems_task_argument argument
-);
- 
-rtems_task Task_3(
-  rtems_task_argument argument
-);
- 
-/* configuration information */
-
-#define CONFIGURE_SPTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_TICKS_PER_TIMESLICE       100
-
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#include <confdefs.h>
-
-/* global variables */
-
-TEST_EXTERN rtems_id   Task_id[ 4 ];         /* array of task ids */
-TEST_EXTERN rtems_name Task_name[ 4 ];       /* array of task names */
-
-/* end of include file */
diff --git a/testsuites/sptests/sp05/task1.c b/testsuites/sptests/sp05/task1.c
deleted file mode 100644
index 8e67584e90..0000000000
--- a/testsuites/sptests/sp05/task1.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/*  Task_1
- *
- *  This routine serves as a test task.  It verifies that tasks can
- *  be suspended and resumed.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  NOTE: The rtems_task_suspend() directives fail on the first iteration.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_task Task_1(
-  rtems_task_argument argument
-)
-{
-  rtems_id          tid2;
-  rtems_id          tid3;
-  rtems_unsigned32  pass;
-  rtems_status_code status;
-
-  status = rtems_task_ident( Task_name[ 2 ], 1, &tid2 );
-  directive_failed( status, "rtems_task_ident of TA2" );
-
-  status = rtems_task_ident( Task_name[ 3 ], 1, &tid3 );
-  directive_failed( status, "rtems_task_ident of TA3" );
-
-  for ( pass=1 ; pass <= 3 ; pass++ ) {
-
-    puts( "TA1 - rtems_task_wake_after - sleep 5 seconds" );
-    status = rtems_task_wake_after( 5*TICKS_PER_SECOND );
-    directive_failed( status, "rtems_task_wake_after of TA1" );
-
-    puts( "TA1 - rtems_task_suspend - suspend TA3" );
-    status = rtems_task_suspend( tid3 );
-    if ( pass == 1 ) {
-      fatal_directive_status(
-         status,
-         RTEMS_ALREADY_SUSPENDED,
-         "rtems_task_suspend of TA3"
-      );
-    } else {
-      directive_failed( status, "rtems_task_suspend of TA3" );
-    }
-
-    puts( "TA1 - rtems_task_resume - resume TA2" );
-    status = rtems_task_resume( tid2 );
-    directive_failed( status, "rtems_task_resume of TA2" );
-
-    puts( "TA1 - rtems_task_wake_after - sleep 5 seconds" );
-    status = rtems_task_wake_after( 5*TICKS_PER_SECOND );
-    directive_failed( status, "rtems_task_wake_after" );
-
-    puts( "TA1 - rtems_task_suspend - suspend TA2" );
-    status = rtems_task_suspend( tid2 );
-    directive_failed( status, "rtems_task_suspend of TA2" );
-
-    puts( "TA1 - rtems_task_resume - resume TA3" );
-    status = rtems_task_resume( tid3 );
-    directive_failed( status, "rtems_task_resume" );
-  }
-
-  puts( "*** END OF TEST 5 ***" );
-  exit( 0 );
-}
diff --git a/testsuites/sptests/sp05/task2.c b/testsuites/sptests/sp05/task2.c
deleted file mode 100644
index 2d492746c4..0000000000
--- a/testsuites/sptests/sp05/task2.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/*  Task_2
- *
- *  This routine serves as a test task.  Makes sure a task can suspend
- *  itself.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_task Task_2(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-
-  puts( "TA2 - rtems_task_suspend - suspend self" );
-  status = rtems_task_suspend( RTEMS_SELF );
-  directive_failed( status, "rtems_task_suspend of TA2" );
-
-  while( FOREVER ) {
-    puts( "TA2 - rtems_task_wake_after - sleep 1 second" );
-    status = rtems_task_wake_after( 1*TICKS_PER_SECOND );
-    directive_failed( status, "rtems_task_wake_after of TA2" );
-  }
-}
diff --git a/testsuites/sptests/sp05/task3.c b/testsuites/sptests/sp05/task3.c
deleted file mode 100644
index bc63d771d0..0000000000
--- a/testsuites/sptests/sp05/task3.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/*  Task_3
- *
- *  This routine serves as a test task.  Makes sure a task can suspend
- *  itself.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_task Task_3(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-
-  puts( "TA3 - rtems_task_suspend - suspend self" );
-  status = rtems_task_suspend( RTEMS_SELF );
-  directive_failed( status, "rtems_task_suspend of TA3" );
-
-  while( FOREVER ) {
-    puts( "TA3 - rtems_task_wake_after - sleep 1 second" );
-    status = rtems_task_wake_after( 1*TICKS_PER_SECOND );
-    directive_failed( status, "rtems_task_wake_after of TA3" );
-  }
-}
diff --git a/testsuites/sptests/sp06/init.c b/testsuites/sptests/sp06/init.c
deleted file mode 100644
index 2b551e48b5..0000000000
--- a/testsuites/sptests/sp06/init.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/*  Init
- *
- *  This routine is the initialization task for this test program.
- *  It is a user initialization task and has the responsibility for creating
- *  and starting the tasks that make up the test.  If the time of day
- *  clock is required for the test, it should also be set to a known
- *  value by this function.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "system.h"
-
-rtems_task Init(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code   status;
-  rtems_task_priority previous_priority;
-
-  puts( "\n\n*** TEST 6 ***" );
-
-  Task_name[ 1 ] =  rtems_build_name( 'T', 'A', '1', ' ' );
-  Task_name[ 2 ] =  rtems_build_name( 'T', 'A', '2', ' ' );
-  Task_name[ 3 ] =  rtems_build_name( 'T', 'A', '3', ' ' );
-
-  Argument = 0;
-  Restart_argument = 1;
-
-  status = rtems_task_create(
-     Task_name[ 1 ],
-     1,
-     RTEMS_MINIMUM_STACK_SIZE,
-     RTEMS_DEFAULT_MODES,
-     RTEMS_DEFAULT_ATTRIBUTES,
-     &Task_id[ 1 ]
-  );
-  directive_failed( status, "rtems_task_create of TA1" );
-
-  status = rtems_task_create(
-     Task_name[ 2 ],
-     1,
-     RTEMS_MINIMUM_STACK_SIZE,
-     RTEMS_DEFAULT_MODES,
-     RTEMS_DEFAULT_ATTRIBUTES,
-     &Task_id[ 2 ]
-  );
-  directive_failed( status, "rtems_task_create of TA2" );
-
-  status = rtems_task_create(
-     Task_name[ 3 ],
-     10,
-     RTEMS_MINIMUM_STACK_SIZE,
-     RTEMS_DEFAULT_MODES,
-     RTEMS_DEFAULT_ATTRIBUTES,
-     &Task_id[ 3 ]
-  );
-  directive_failed( status, "rtems_task_create of TA3" );
-
-  status = rtems_task_start( Task_id[ 1 ], Task_1, 0 );
-  directive_failed( status, "rtems_task_start of TA1" );
-
-  status = rtems_task_start( Task_id[ 2 ], Task_2, Argument );
-  directive_failed( status, "rtems_task_start of TA2" );
-
-  status = rtems_task_start( Task_id[ 3 ], Task_3, Argument );
-  directive_failed( status, "rtems_task_start of TA3" );
-
-  status = rtems_task_set_priority( Task_id[ 3 ], 5, &previous_priority );
-
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-}
diff --git a/testsuites/sptests/sp06/sp06.doc b/testsuites/sptests/sp06/sp06.doc
deleted file mode 100644
index 6ec1bb23d7..0000000000
--- a/testsuites/sptests/sp06/sp06.doc
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
-This file describes the directives and concepts tested by this test set.
-
-test set name:  test6
-
-directives:
-  ex_init, ex_start, t_create, t_start, tm_tick, i_return,
-  tm_wkafter, t_restart
-
-concepts:
-
-  a.  Verifies that a task can restart a task other than itself.
-
-  b.  Verifies that a task can restart itself.
diff --git a/testsuites/sptests/sp06/sp06.scn b/testsuites/sptests/sp06/sp06.scn
deleted file mode 100644
index 64f6489dc8..0000000000
--- a/testsuites/sptests/sp06/sp06.scn
+++ /dev/null
@@ -1,40 +0,0 @@
-*** TEST 6 ***
-TA1 - is beginning to run
-TA1 - restarting TA3
-TA2 - is beginning to run
-TA2 - rtems_task_wake_after - sleep 1/2 second
-TA2 - rtems_task_wake_after - sleep 1/2 second
-TA1 - rtems_task_restart - restarting TA2
-TA2 - is beginning to run
-TA2 - rtems_task_wake_after - sleep 1/2 second
-TA2 - rtems_task_wake_after - sleep 1/2 second
-TA1 - rtems_task_restart - restarting self
-TA1 - is beginning to run
-TA2 - rtems_task_wake_after - sleep 1/2 second
-TA2 - rtems_task_wake_after - sleep 1/2 second
-TA1 - rtems_task_restart - restarting TA2
-TA2 - is beginning to run
-TA2 - rtems_task_wake_after - sleep 1/2 second
-TA2 - rtems_task_wake_after - sleep 1/2 second
-TA1 - rtems_task_restart - restarting self
-TA1 - is beginning to run
-TA2 - rtems_task_wake_after - sleep 1/2 second
-TA2 - rtems_task_wake_after - sleep 1/2 second
-TA1 - rtems_task_restart - restarting TA2
-TA2 - is beginning to run
-TA2 - rtems_task_wake_after - sleep 1/2 second
-TA2 - rtems_task_wake_after - sleep 1/2 second
-TA1 - rtems_task_restart - restarting self
-TA1 - is beginning to run
-TA2 - rtems_task_wake_after - sleep 1/2 second
-TA2 - rtems_task_wake_after - sleep 1/2 second
-TA1 - rtems_task_restart - restarting TA2
-TA2 - is beginning to run
-TA2 - rtems_task_wake_after - sleep 1/2 second
-TA2 - rtems_task_wake_after - sleep 1/2 second
-TA1 - rtems_task_restart - restarting self
-TA1 - is beginning to run
-*** END OF TEST 6 ***
-
-NOTE:  The prints from TA2 may not be as regular as indicated in the screen.
-       The important point is that TA2 is running and gets restarted.
diff --git a/testsuites/sptests/sp06/system.h b/testsuites/sptests/sp06/system.h
deleted file mode 100644
index b3c2786832..0000000000
--- a/testsuites/sptests/sp06/system.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*  system.h
- *
- *  This include file contains information that is included in every
- *  function in the test set.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <tmacros.h>
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
-
-rtems_task Task_1(
-  rtems_task_argument argument
-);
- 
-rtems_task Task_2(
-  rtems_task_argument argument
-);
- 
-rtems_task Task_3(
-  rtems_task_argument argument
-);
- 
-/* configuration information */
-
-#define CONFIGURE_SPTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_TICKS_PER_TIMESLICE       100
-
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#include <confdefs.h>
-
-/* global variables */
-
-TEST_EXTERN rtems_id   Task_id[ 4 ];         /* array of task ids */
-TEST_EXTERN rtems_name Task_name[ 4 ];       /* array of task names */
-
-TEST_EXTERN rtems_task_argument Argument;         /* generic task argument */
-TEST_EXTERN rtems_task_argument Restart_argument; /* task 1 restart argument */
-
-/* end of include file */
diff --git a/testsuites/sptests/sp06/task1.c b/testsuites/sptests/sp06/task1.c
deleted file mode 100644
index 63af3d680f..0000000000
--- a/testsuites/sptests/sp06/task1.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/*  Task_1
- *
- *  This task serves as a test task.  Verifies that a task can restart
- *  both itself and other tasks.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_task Task_1( argument )
-rtems_unsigned32 argument;
-{
-  rtems_unsigned32  pass;
-  rtems_status_code status;
-
-  puts( "TA1 - is beginning to run" );
-
-  pass = argument + 1;
-
-  if ( pass == 5 ) {
-    puts( "*** END OF TEST 6 ***" );
-    exit( 0 );
-  }
-
-  if ( pass == 1 ) {
-    puts( "TA1 - restarting TA3" );
-    status = rtems_task_restart( Task_id[ 3 ], Restart_argument );
-    directive_failed( status, "rtems_task_restart of TA3" );
-
-    status = rtems_task_wake_after( 2 * TICKS_PER_SECOND );
-    directive_failed( status, "rtems_task_wake_after" );
-  }
-
-  status = rtems_task_wake_after( TICKS_PER_SECOND );
-  directive_failed( status, "rtems_task_wake_after" );
-
-  puts( "TA1 - rtems_task_restart - restarting TA2" );
-  status = rtems_task_restart( Task_id[ 2 ], Restart_argument );
-  directive_failed( status, "rtems_task_restart TA2" );
-
-  status = rtems_task_wake_after( 1*TICKS_PER_SECOND );
-  directive_failed( status, "rtems_task_wake_after" );
-
-  puts( "TA1 - rtems_task_restart - restarting self" );
-  status = rtems_task_restart( Task_id[ 1 ], pass );
-  directive_failed( status, "rtems_task_restart of RTEMS_SELF" );
-}
diff --git a/testsuites/sptests/sp06/task2.c b/testsuites/sptests/sp06/task2.c
deleted file mode 100644
index 6a57b907e2..0000000000
--- a/testsuites/sptests/sp06/task2.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/*  Task_2
- *
- *  This routine serves as a test task.  It simply runs forever so
- *  another task can restart it.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_task Task_2( argument )
-rtems_task_argument argument;
-{
-  rtems_status_code status;
-
-  puts( "TA2 - is beginning to run" );
-  if ( argument == Argument ) {
-    status = rtems_task_wake_after( 2 * TICKS_PER_SECOND );
-    directive_failed( status, "rtems_task_wake_after" );
-  }
-
-  while( FOREVER ) {
-    puts( "TA2 - rtems_task_wake_after - sleep 1/2 second" );
-    status = rtems_task_wake_after( TICKS_PER_SECOND / 2 );
-    directive_failed( status, "rtems_task_wake_after" );
-  }
-}
diff --git a/testsuites/sptests/sp06/task3.c b/testsuites/sptests/sp06/task3.c
deleted file mode 100644
index af1a398da5..0000000000
--- a/testsuites/sptests/sp06/task3.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/*  Task_3
- *
- *  This routine serves as a test task.  It is started, has its priority
- *  changed, and when it runs it deletes itself.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_task Task_3(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-}
diff --git a/testsuites/sptests/sp07/init.c b/testsuites/sptests/sp07/init.c
deleted file mode 100644
index df627a2895..0000000000
--- a/testsuites/sptests/sp07/init.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/*  Init
- *
- *  This routine is the initialization task for this test program.
- *  It is a user initialization task and has the responsibility for creating
- *  and starting the tasks that make up the test.  If the time of day
- *  clock is required for the test, it should also be set to a known
- *  value by this function.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "system.h"
-
-rtems_extensions_table Extensions = {
-  Task_create_extension,     /* task create user extension */
-  Task_start_extension,      /* task start user extension */
-  Task_restart_extension,    /* task restart user extension */
-  Task_delete_extension,     /* task delete user extension */
-  NULL,                      /* task switch user extension */
-  NULL,                      /* begin user extension */
-  Task_exit_extension,       /* task exitted user extension */
-  NULL                       /* fatal error extension */
-};
-
-rtems_task Init(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-
-  puts( "\n\n*** TEST 7 ***" );
-
-  Extension_name[ 1 ] =  rtems_build_name( 'E', 'X', 'T', ' ' );
-
-  status = rtems_extension_create(
-    Extension_name[ 1 ],
-    &Extensions,
-    &Extension_id[ 1 ]
-  );
-  directive_failed( status, "rtems_extension_create" );
-
-  Task_name[ 1 ] = rtems_build_name( 'T', 'A', '1', ' ' );
-  Task_name[ 2 ] = rtems_build_name( 'T', 'A', '2', ' ' );
-  Task_name[ 3 ] = rtems_build_name( 'T', 'A', '3', ' ' );
-  Task_name[ 4 ] = rtems_build_name( 'T', 'A', '4', ' ' );
-
-  status = rtems_task_create(
-    Task_name[ 1 ],
-    4,
-    RTEMS_MINIMUM_STACK_SIZE * 2,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Task_id[ 1 ]
-  );
-  directive_failed( status, "rtems_task_create of TA1" );
-
-  status = rtems_task_create(
-    Task_name[ 2 ],
-    4,
-    RTEMS_MINIMUM_STACK_SIZE * 2,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Task_id[ 2 ]
-  );
-  directive_failed( status, "rtems_task_create of TA2" );
-
-  status = rtems_task_create(
-    Task_name[ 3 ],
-    250,
-    RTEMS_MINIMUM_STACK_SIZE * 2,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Task_id[ 3 ]
-  );
-  directive_failed( status, "rtems_task_create of TA3" );
-
-  status = rtems_task_create(
-    Task_name[ 4 ],
-    254,
-    RTEMS_MINIMUM_STACK_SIZE * 2,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Task_id[ 4 ]
-  );
-  directive_failed( status, "rtems_task_create of TA4" );
-
-  status = rtems_task_start( Task_id[ 1 ], Task_1, 0 );
-  directive_failed( status, "rtems_task_start of TA1" );
-
-  status = rtems_task_start( Task_id[ 2 ], Task_2, 0 );
-  directive_failed( status, "rtems_task_start of TA2" );
-
-  status = rtems_task_start( Task_id[ 3 ], Task_3, 0 );
-  directive_failed( status, "rtems_task_start of TA3" );
-
-  status = rtems_task_start( Task_id[ 4 ], Task_4, 0 );
-  directive_failed( status, "rtems_task_start of TA4" );
-
-  status = rtems_task_restart( Task_id[ 3 ], 0 );
-  directive_failed( status, "rtems_task_restart of TA3" );
-
-  status = rtems_task_set_note( Task_id[ 1 ], RTEMS_NOTEPAD_8, 4 );
-  directive_failed( status, "task_set_node of TA1" );
-  printf( "INIT - rtems_task_set_note - set TA1's RTEMS_NOTEPAD_8 " );
-  puts  ( "to TA1's priority: 04" );
-
-  status = rtems_task_set_note( Task_id[ 2 ], RTEMS_NOTEPAD_8, 4 );
-  directive_failed( status, "task_set_node of TA2" );
-  printf( "INIT - rtems_task_set_note - set TA2's RTEMS_NOTEPAD_8 " );
-  puts  ( "to TA2's priority: 04");
-
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-}
diff --git a/testsuites/sptests/sp07/sp07.doc b/testsuites/sptests/sp07/sp07.doc
deleted file mode 100644
index 6ecc0e0c20..0000000000
--- a/testsuites/sptests/sp07/sp07.doc
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
-This file describes the directives and concepts tested by this test set.
-
-test set name:  test7
-
-directives:
-  ex_init, ex_start, t_create, t_start, tm_tick, i_return,
-  t_delete, t_setreg, t_getreg, t_setpri, t_suspend
-
-concepts:
-
-  a.  Verifies that tasks can communicate with each other via the
-      t_setreg and t_getreg directives.
-
-  b.  Verifies that the highest priority task is dispatched to execute.
-
-  c.  Verifies setting the priority of both a ready and a blocked task.
-
-  d.  Verifies the deletion of ready and blocked tasks.
-
-  e.  Verifies the tcreate user extension.
-
-  f.  Verifies the tstart user extension.
-
-  g.  Verifies the tdelete user extension.
diff --git a/testsuites/sptests/sp07/sp07.scn b/testsuites/sptests/sp07/sp07.scn
deleted file mode 100644
index 1f6de2d93d..0000000000
--- a/testsuites/sptests/sp07/sp07.scn
+++ /dev/null
@@ -1,33 +0,0 @@
-*** TEST 7 ***
-TASK_CREATE - TA1  - created.
-TASK_CREATE - TA2  - created.
-TASK_CREATE - TA3  - created.
-TASK_CREATE - TA4  - created.
-TASK_START - TA1  - started.
-TASK_START - TA2  - started.
-TASK_START - TA3  - started.
-TASK_START - TA4  - started.
-TASK_RESTART - TA3  - restarted.
-INIT - rtems_task_set_note - set TA1's RTEMS_NOTEPAD_8 to TA1's priority: 04
-INIT - rtems_task_set_note - set TA2's RTEMS_NOTEPAD_8 to TA2's priority: 04
-<pause>
-TA1 - rtems_task_set_priority - get initial priority of self: 04
-TA1 - rtems_task_get_note - get RTEMS_NOTEPAD_8 - current priority: 04
-TA1 - rtems_task_set_note - set TA2's RTEMS_NOTEPAD_8: 03
-TA1 - rtems_task_set_priority - set TA2's priority: 03
-TA2 - rtems_task_get_note - get RTEMS_NOTEPAD_8 - current priority: 03
-TA2 - rtems_task_set_note - set TA1's RTEMS_NOTEPAD_8: 02
-TA2 - rtems_task_set_priority - set TA1's priority: 02
-TA1 - rtems_task_get_note - get RTEMS_NOTEPAD_8 - current priority: 02
-TA1 - rtems_task_set_note - set TA2's RTEMS_NOTEPAD_8: 01
-TA1 - rtems_task_set_priority - set TA2's priority: 01
-TA2 - rtems_task_get_note - get RTEMS_NOTEPAD_8 - current priority: 01
-TA2 - rtems_task_suspend - suspend TA1
-TA2 - rtems_task_set_priority - set priority of TA1 ( blocked )
-TASK_DELETE - TA2 deleting TA1
-TASK_DELETE - TA2 deleting TA3
-TASK_DELETE - TA2 deleting TA2
-TA4 - exitting task
-RTEMS_TASK_EXITTED - extension invoked for TA4
-*** END OF TEST 7 ***
-TASK_DELETE - TA4 deleting TA4  <---- may not appear
diff --git a/testsuites/sptests/sp07/system.h b/testsuites/sptests/sp07/system.h
deleted file mode 100644
index 110f844957..0000000000
--- a/testsuites/sptests/sp07/system.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*  system.h
- *
- *  This include file contains information that is included in every
- *  function in the test set.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <tmacros.h>
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
-
-rtems_task Task_1(
-  rtems_task_argument argument
-);
- 
-rtems_task Task_2(
-  rtems_task_argument argument
-);
- 
-rtems_task Task_3(
-  rtems_task_argument argument
-);
- 
-rtems_task Task_4(
-  rtems_task_argument argument
-);
- 
-rtems_boolean Task_create_extension(
-  rtems_tcb *unused,
-  rtems_tcb *created_task
-);
- 
-rtems_extension Task_delete_extension(
-  rtems_tcb *running_task,
-  rtems_tcb *deleted_task
-);
- 
-rtems_extension Task_restart_extension(
-  rtems_tcb *unused,
-  rtems_tcb *restarted_task
-);
- 
-rtems_extension Task_start_extension(
-  rtems_tcb *unused,
-  rtems_tcb *started_task
-);
- 
-rtems_extension Task_exit_extension(
-  rtems_tcb *running_task
-);
-
-/* configuration information */
-
-#define CONFIGURE_SPTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_MAXIMUM_USER_EXTENSIONS     1
-#define CONFIGURE_TICKS_PER_TIMESLICE       100
-
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#define CONFIGURE_EXTRA_TASK_STACKS         (4 * RTEMS_MINIMUM_STACK_SIZE)
-
-#include <confdefs.h>
-
-/* global variables */
-
-TEST_EXTERN rtems_id   Task_id[ 5 ];         /* array of task ids */
-TEST_EXTERN rtems_name Task_name[ 5 ];       /* array of task names */
-
-TEST_EXTERN rtems_id   Extension_id[ 4 ];
-TEST_EXTERN rtems_name Extension_name[ 4 ];  /* array of task names */
- 
-/* end of include file */
diff --git a/testsuites/sptests/sp07/task1.c b/testsuites/sptests/sp07/task1.c
deleted file mode 100644
index d6e5e4d1f1..0000000000
--- a/testsuites/sptests/sp07/task1.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/*  Task_1
- *
- *  This routine serves as a test task.  It verifies intertask communication
- *  using task notepads and verifies the the user extensions (tcreate, etc).
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_task Task_1(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code   status;
-  rtems_task_priority the_priority;
-  rtems_task_priority previous_priority;
-
-  rtems_test_pause();
-
-  status = rtems_task_set_priority(
-    RTEMS_SELF,
-    RTEMS_CURRENT_PRIORITY,
-    &the_priority
-  );
-  directive_failed( status, "rtems_task_set_priority" );
-  printf(
-    "TA1 - rtems_task_set_priority - get initial priority of self: %02d\n",
-    the_priority
-  );
-
-  while( FOREVER ) {
-    status = rtems_task_get_note( RTEMS_SELF, RTEMS_NOTEPAD_8, &the_priority );
-    directive_failed( status, "rtems_task_get_note" );
-    printf(
-"TA1 - rtems_task_get_note - get RTEMS_NOTEPAD_8 - current priority: %02d\n",
-       the_priority
-    );
-
-    if ( --the_priority == 0 ) {
-      puts( "TA1 - rtems_task_suspend - suspend TA2" );
-      status = rtems_task_suspend( Task_id[ 2 ] );
-      directive_failed( status, "rtems_task_suspend" );
-
-      puts( "TA1 - rtems_task_set_priority - set priority of TA2 ( blocked )" );
-      status = rtems_task_set_priority( Task_id[ 2 ], 5, &previous_priority );
-      directive_failed( status, "rtems_task_set_priority" );
-
-      status = rtems_task_delete( Task_id[ 2 ] );
-      directive_failed( status, "rtems_task_delete of TA2" );
-
-      status = rtems_task_delete( RTEMS_SELF );
-      directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-    }
-
-    printf( "TA1 - rtems_task_set_note - set TA2's RTEMS_NOTEPAD_8: %02d\n",
-            the_priority
-    );
-    status = rtems_task_set_note( Task_id[ 2 ], RTEMS_NOTEPAD_8, the_priority );
-    directive_failed( status, "rtems_task_set_note" );
-
-    printf( "TA1 - rtems_task_set_priority - set TA2's priority: %02d\n",
-            the_priority
-    );
-    status = rtems_task_set_priority(
-               Task_id[ 2 ],
-               the_priority,
-               &previous_priority
-    );
-    directive_failed( status, "rtems_task_set_priority" );
-  }
-}
diff --git a/testsuites/sptests/sp07/task2.c b/testsuites/sptests/sp07/task2.c
deleted file mode 100644
index d528fa2dde..0000000000
--- a/testsuites/sptests/sp07/task2.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/*  Task_2
- *
- *  This routine serves as a test task.  Plays with priorities to verify
- *  that the highest priority task is always executed.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_task Task_2(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code   status;
-  rtems_task_priority the_priority;
-  rtems_task_priority previous_priority;
-
-  while( FOREVER ) {
-
-    status = rtems_task_get_note( RTEMS_SELF, RTEMS_NOTEPAD_8, &the_priority );
-    directive_failed( status, "rtems_task_get_note" );
-    printf(
-"TA2 - rtems_task_get_note - get RTEMS_NOTEPAD_8 - current priority: %02d\n",
-      the_priority
-    );
-
-    if ( --the_priority == 0 ) {
-      puts( "TA2 - rtems_task_suspend - suspend TA1" );
-      status = rtems_task_suspend( Task_id[ 1 ] );
-      directive_failed( status, "rtems_task_suspend" );
-
-      puts( "TA2 - rtems_task_set_priority - set priority of TA1 ( blocked )" );
-      status = rtems_task_set_priority( Task_id[ 1 ], 5, &previous_priority );
-      directive_failed( status, "rtems_task_set_priority" );
-
-      status = rtems_task_delete( Task_id[ 1 ] );          /* TA1 is blocked */
-      directive_failed( status, "rtems_task_delete of TA1" );
-
-      status = rtems_task_delete( Task_id[ 3 ] );          /* TA3 is ready   */
-      directive_failed( status, "rtems_task_delete of TA3" );
-
-      status = rtems_task_delete( RTEMS_SELF );
-      directive_failed( status, "rtems_task_delete of SELD" );
-
-    } else {
-
-      printf( "TA2 - rtems_task_set_note - set TA1's RTEMS_NOTEPAD_8: %02d\n",
-              the_priority
-      );
-      status = rtems_task_set_note(Task_id[ 1 ], RTEMS_NOTEPAD_8, the_priority);
-      directive_failed( status, "rtems_task_set_note" );
-
-      printf( "TA2 - rtems_task_set_priority - set TA1's priority: %02d\n",
-              the_priority
-      );
-      status = rtems_task_set_priority(
-                 Task_id[ 1 ],
-                 the_priority,
-                 &previous_priority
-      );
-      directive_failed( status, "rtems_task_set_priority" );
-    }
-  }
-}
diff --git a/testsuites/sptests/sp07/task3.c b/testsuites/sptests/sp07/task3.c
deleted file mode 100644
index 71aec743a4..0000000000
--- a/testsuites/sptests/sp07/task3.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/*  Task_3
- *
- *  This routine serves as a low priority test task that should never
- *  execute.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_task Task_3(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-
-  while( FOREVER ) {
-    status = rtems_task_wake_after( RTEMS_YIELD_PROCESSOR );
-    directive_failed( status, "rtems_task_wake_after" );
-  }
-}
diff --git a/testsuites/sptests/sp07/task4.c b/testsuites/sptests/sp07/task4.c
deleted file mode 100644
index 6ea75d42e6..0000000000
--- a/testsuites/sptests/sp07/task4.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/*  Task_4
- *
- *  This routine serves as a low priority test task that should exit
- *  a soon as it runs to test the taskexitted user extension.
- *  execute.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_task Task_4(
-  rtems_task_argument argument
-)
-{
-  puts( "TA4 - exitting task" );
-}
diff --git a/testsuites/sptests/sp07/taskexit.c b/testsuites/sptests/sp07/taskexit.c
deleted file mode 100644
index a7b0745f16..0000000000
--- a/testsuites/sptests/sp07/taskexit.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/*  Task_exit_extension
- *
- *  This routine is the task exitted user extension.
- *
- *  Input parameters:   NONE
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_extension Task_exit_extension(
-  rtems_tcb *running_task
-)
-{
-  if ( task_number( running_task->Object.id ) > 0 ) {
-    puts_nocr( "RTEMS_TASK_EXITTED - extension invoked for " );
-    put_name( Task_name[ task_number( running_task->Object.id ) ], TRUE );
-  }
-
-  puts("*** END OF TEST 7 ***" );
-  exit( 0 );
-}
diff --git a/testsuites/sptests/sp07/tcreate.c b/testsuites/sptests/sp07/tcreate.c
deleted file mode 100644
index bba5b8d40d..0000000000
--- a/testsuites/sptests/sp07/tcreate.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/*  Task_create_extension
- *
- *  This routine is the tcreate user extension.
- *
- *  Input parameters:
- *    unused       - pointer to currently running TCB
- *    created_task - pointer to new TCB being created
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_boolean Task_create_extension(
-  rtems_tcb *unused,
-  rtems_tcb *created_task
-)
-{
-  if ( task_number( created_task->Object.id ) > 0 ) {
-    puts_nocr( "TASK_CREATE - " );
-    put_name( Task_name[ task_number( created_task->Object.id ) ], FALSE );
-    puts( " - created." );
-  }
-  return TRUE;
-}
diff --git a/testsuites/sptests/sp07/tdelete.c b/testsuites/sptests/sp07/tdelete.c
deleted file mode 100644
index 5276369d47..0000000000
--- a/testsuites/sptests/sp07/tdelete.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*  Task_delete_extension
- *
- *  This routine is the delete user extension.
- *
- *  Input parameters:
- *    running_task - pointer to running TCB
- *    deleted_task - pointer to TCB deleted
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_extension Task_delete_extension(
-  rtems_tcb *running_task,
-  rtems_tcb *deleted_task
-)
-{
-  if ( task_number( running_task->Object.id ) > 0 ) {
-    puts_nocr( "TASK_DELETE - " );
-    put_name( Task_name[ task_number( running_task->Object.id ) ], FALSE );
-  }
-  if ( task_number( deleted_task->Object.id ) > 0 ) {
-    puts_nocr( " deleting " );
-    put_name( Task_name[ task_number( deleted_task->Object.id ) ], TRUE );
-  }
-}
diff --git a/testsuites/sptests/sp07/trestart.c b/testsuites/sptests/sp07/trestart.c
deleted file mode 100644
index 9195ca7c3f..0000000000
--- a/testsuites/sptests/sp07/trestart.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/*  Task_restart_extension
- *
- *  This routine is the trestart user extension.
- *
- *  Input parameters:
- *    unused          - pointer to currently running TCB
- *    restarted_task  - pointer to new TCB being started
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-void Task_restart_extension(
-  rtems_tcb *unused,
-  rtems_tcb *restarted_task
-)
-{
-  if ( task_number( restarted_task->Object.id ) > 0 ) {
-    puts_nocr( "TASK_RESTART - " );
-    put_name( Task_name[ task_number( restarted_task->Object.id ) ], FALSE );
-    puts( " - restarted." );
-  }
-}
diff --git a/testsuites/sptests/sp07/tstart.c b/testsuites/sptests/sp07/tstart.c
deleted file mode 100644
index 6fac296b87..0000000000
--- a/testsuites/sptests/sp07/tstart.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/*  Task_start_extension
- *
- *  This routine is the tstart user extension.
- *
- *  Input parameters:
- *    unused        - pointer to currently running TCB
- *    started_task  - pointer to new TCB being started
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_extension Task_start_extension(
-  rtems_tcb *unused,
-  rtems_tcb *started_task
-)
-{
-  if ( task_number( started_task->Object.id ) > 0 ) {
-    puts_nocr( "TASK_START - " );
-    put_name( Task_name[ task_number( started_task->Object.id ) ], FALSE );
-    puts( " - started." );
-  }
-}
diff --git a/testsuites/sptests/sp08/init.c b/testsuites/sptests/sp08/init.c
deleted file mode 100644
index 260fec7f65..0000000000
--- a/testsuites/sptests/sp08/init.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*  Init
- *
- *  This routine is the initialization task for this test program.
- *  It is a user initialization task and has the responsibility for creating
- *  and starting the tasks that make up the test.  If the time of day
- *  clock is required for the test, it should also be set to a known
- *  value by this function.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "system.h"
-
-rtems_task Init(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-
-  puts( "\n\n*** TEST 8 ***" );
-
-  Task_name[ 1 ] =  rtems_build_name( 'T', 'A', '1', ' ' );
-
-  status = rtems_task_create(
-    Task_name[ 1 ],
-    1,
-    RTEMS_MINIMUM_STACK_SIZE * 2,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Task_id[ 1 ]
-  );
-  directive_failed( status, "rtems_task_create of TA1" );
-
-  status = rtems_task_start( Task_id[ 1 ], Task_1, 0 );
-  directive_failed( status, "rtems_task_start of TA1" );
-
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-}
diff --git a/testsuites/sptests/sp08/sp08.doc b/testsuites/sptests/sp08/sp08.doc
deleted file mode 100644
index 734bfde9ca..0000000000
--- a/testsuites/sptests/sp08/sp08.doc
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
-This file describes the directives and concepts tested by this test set.
-
-test set name:  test8
-
-directives:
-  ex_init, ex_start, t_create, t_start, tm_tick, i_return,
-  t_mode
-
-concepts:
-
-  a. Verifies every mode change possible.
-
-  b. Verifies the fatal error handler.
diff --git a/testsuites/sptests/sp08/sp08.scn b/testsuites/sptests/sp08/sp08.scn
deleted file mode 100644
index d85ccc384f..0000000000
--- a/testsuites/sptests/sp08/sp08.scn
+++ /dev/null
@@ -1,22 +0,0 @@
-*** TEST 8 ***
-TA1 - rtems_task_mode - RTEMS_ASR                  - previous mode:  00000000
-TA1 - rtems_task_mode - RTEMS_NO_ASR               - previous mode:  00000000
-TA1 - rtems_task_mode - RTEMS_NO_ASR               - previous mode:  00000400
-TA1 - rtems_task_mode - RTEMS_ASR                  - previous mode:  00000400
-TA1 - rtems_task_mode - RTEMS_NO_TIMESLICE         - previous mode:  00000000
-TA1 - rtems_task_mode - RTEMS_TIMESLICE            - previous mode:  00000000
-TA1 - rtems_task_mode - RTEMS_TIMESLICE            - previous mode:  00000200
-TA1 - rtems_task_mode - RTEMS_NO_TIMESLICE         - previous mode:  00000200
-TA1 - rtems_task_mode - RTEMS_PREEMPT              - previous mode:  00000000
-TA1 - rtems_task_mode - RTEMS_NO_PREEMPT           - previous mode:  00000000
-TA1 - rtems_task_mode - RTEMS_NO_PREEMPT           - previous mode:  00000100
-TA1 - rtems_task_mode - RTEMS_PREEMPT              - previous mode:  00000100
-TA1 - rtems_task_mode - RTEMS_INTERRUPT_LEVEL( 3 ) - previous mode:  00000000
-TA1 - rtems_task_mode - RTEMS_INTERRUPT_LEVEL( 5 ) - previous mode:  00000003
-TA1 - rtems_task_mode - set all modes        - previous mode:  00000005
-TA1 - rtems_task_mode - set all modes        - previous mode:  00000703
-TA1 - rtems_task_mode - clear all modes      - previous mode:  00000703
-TA1 - rtems_task_mode - get current mode     - previous mode:  00000000
-*** END OF TEST 8 ***
-
-NOTE: The interrupt level lines will be different on CPUs with few levels.
diff --git a/testsuites/sptests/sp08/system.h b/testsuites/sptests/sp08/system.h
deleted file mode 100644
index 352bfe9a13..0000000000
--- a/testsuites/sptests/sp08/system.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*  system.h
- *
- *  This include file contains information that is included in every
- *  function in the test set.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <tmacros.h>
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
-
-rtems_task Task_1(
-  rtems_task_argument argument
-);
- 
-#define put_mode( _comment, _output_mode ) \
-   printf( "%s %08x\n", _comment, _output_mode );
-
-/* configuration information */
-
-#define CONFIGURE_SPTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_TICKS_PER_TIMESLICE       100
-
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#define CONFIGURE_EXTRA_TASK_STACKS         (1 * RTEMS_MINIMUM_STACK_SIZE)
-
-#include <confdefs.h>
-
-/* global variables */
-
-TEST_EXTERN rtems_id   Task_id[ 4 ];         /* array of task ids */
-TEST_EXTERN rtems_name Task_name[ 4 ];       /* array of task names */
-
-/* end of include file */
diff --git a/testsuites/sptests/sp08/task1.c b/testsuites/sptests/sp08/task1.c
deleted file mode 100644
index 257e9586a9..0000000000
--- a/testsuites/sptests/sp08/task1.c
+++ /dev/null
@@ -1,256 +0,0 @@
-/*  Task_1
- *
- *  This routine serves as a test task.  It verifies all combinations of
- *  task mode changes.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_task Task_1(
-  rtems_task_argument argument
-)
-{
-  rtems_mode        previous_mode;
-  rtems_status_code status;
-
-/* BEGINNING OF RTEMS_ASR */
-
-  status = rtems_task_mode( RTEMS_ASR, RTEMS_ASR_MASK, &previous_mode );
-  directive_failed( status, "rtems_task_mode" );
-  put_mode(
-    "TA1 - rtems_task_mode - RTEMS_ASR                  - previous mode: ",
-    previous_mode
-  );
-
-  status = rtems_task_mode(
-    RTEMS_NO_ASR,
-    RTEMS_ASR_MASK,
-    &previous_mode
-  );
-  directive_failed( status, "rtems_task_mode" );
-  put_mode(
-    "TA1 - rtems_task_mode - RTEMS_NO_ASR               - previous mode: ",
-    previous_mode
-  );
-
-  status = rtems_task_mode(
-    RTEMS_NO_ASR,
-    RTEMS_ASR_MASK,
-    &previous_mode
-  );
-  directive_failed( status, "rtems_task_mode" );
-  put_mode(
-    "TA1 - rtems_task_mode - RTEMS_NO_ASR               - previous mode: ",
-    previous_mode
-  );
-
-  status = rtems_task_mode(
-    RTEMS_ASR,
-    RTEMS_ASR_MASK,
-    &previous_mode
-  );
-  directive_failed( status, "rtems_task_mode" );
-  put_mode(
-    "TA1 - rtems_task_mode - RTEMS_ASR                  - previous mode: ",
-    previous_mode
-  );
-
-/* END OF RTEMS_ASR */
-
-/* BEGINNING OF RTEMS_TIMESLICE */
-
-  status = rtems_task_mode(
-    RTEMS_NO_TIMESLICE,
-    RTEMS_TIMESLICE_MASK,
-    &previous_mode
-  );
-  directive_failed( status, "rtems_task_mode" );
-  put_mode(
-    "TA1 - rtems_task_mode - RTEMS_NO_TIMESLICE         - previous mode: ",
-    previous_mode
-  );
-
-  status = rtems_task_mode(
-    RTEMS_TIMESLICE,
-    RTEMS_TIMESLICE_MASK,
-    &previous_mode
-  );
-  directive_failed( status, "rtems_task_mode" );
-  put_mode(
-    "TA1 - rtems_task_mode - RTEMS_TIMESLICE            - previous mode: ",
-    previous_mode
-  );
-
-  status = rtems_task_mode(
-    RTEMS_TIMESLICE,
-    RTEMS_TIMESLICE_MASK,
-    &previous_mode
-  );
-  directive_failed( status, "rtems_task_mode" );
-  put_mode(
-    "TA1 - rtems_task_mode - RTEMS_TIMESLICE            - previous mode: ",
-    previous_mode
-  );
-
-  status = rtems_task_mode(
-    RTEMS_NO_TIMESLICE,
-    RTEMS_TIMESLICE_MASK,
-    &previous_mode
-  );
-  directive_failed( status, "rtems_task_mode" );
-  put_mode(
-    "TA1 - rtems_task_mode - RTEMS_NO_TIMESLICE         - previous mode: ",
-    previous_mode
-  );
-
-/* END OF RTEMS_TIMESLICE */
-
-/* BEGINNING OF RTEMS_PREEMPT */
-
-  status = rtems_task_mode(
-    RTEMS_PREEMPT,
-    RTEMS_PREEMPT_MASK,
-    &previous_mode
-  );
-  directive_failed( status, "rtems_task_mode" );
-  put_mode(
-    "TA1 - rtems_task_mode - RTEMS_PREEMPT              - previous mode: ",
-    previous_mode
-  );
-
-  status = rtems_task_mode(
-    RTEMS_NO_PREEMPT,
-    RTEMS_PREEMPT_MASK,
-    &previous_mode
-  );
-  directive_failed( status, "rtems_task_mode" );
-  put_mode(
-    "TA1 - rtems_task_mode - RTEMS_NO_PREEMPT           - previous mode: ",
-    previous_mode
-  );
-
-  status = rtems_task_mode(
-    RTEMS_NO_PREEMPT,
-    RTEMS_PREEMPT_MASK,
-    &previous_mode
-  );
-  directive_failed( status, "rtems_task_mode" );
-  put_mode(
-    "TA1 - rtems_task_mode - RTEMS_NO_PREEMPT           - previous mode: ",
-    previous_mode
-  );
-
-  status = rtems_task_mode(
-    RTEMS_PREEMPT,
-    RTEMS_PREEMPT_MASK,
-    &previous_mode
-  );
-  directive_failed( status, "rtems_task_mode" );
-  put_mode(
-    "TA1 - rtems_task_mode - RTEMS_PREEMPT              - previous mode: ",
-    previous_mode
-  );
-
-/* END OF RTEMS_PREEMPT */
-
-/* BEGINNING OF RTEMS_INTERRUPT_LEVEL */
-
-  status = rtems_task_mode(
-    RTEMS_INTERRUPT_LEVEL(3),
-    RTEMS_INTERRUPT_MASK,
-    &previous_mode
-  );
-  directive_failed( status, "rtems_task_mode" );
-  put_mode(
-    "TA1 - rtems_task_mode - RTEMS_INTERRUPT_LEVEL( 3 ) - previous mode: ",
-    previous_mode
-  );
-
-  status = rtems_task_mode(
-    RTEMS_INTERRUPT_LEVEL(5),
-    RTEMS_INTERRUPT_MASK,
-    &previous_mode
-  );
-  directive_failed( status, "rtems_task_mode" );
-  put_mode(
-    "TA1 - rtems_task_mode - RTEMS_INTERRUPT_LEVEL( 5 ) - previous mode: ",
-    previous_mode
-  );
-
-/* END OF RTEMS_INTERRUPT_LEVEL */
-
-/* BEGINNING OF COMBINATIONS */
-
-  status = rtems_task_mode(
-    RTEMS_INTERRUPT_LEVEL(3) | RTEMS_NO_ASR |
-      RTEMS_TIMESLICE | RTEMS_NO_PREEMPT,
-    RTEMS_INTERRUPT_MASK | RTEMS_ASR_MASK |
-      RTEMS_TIMESLICE_MASK | RTEMS_PREEMPT_MASK,
-    &previous_mode
-  );
-  directive_failed( status, "rtems_task_mode" );
-  put_mode(
-    "TA1 - rtems_task_mode - set all modes        - previous mode: ",
-    previous_mode
-  );
-
-  status = rtems_task_mode(
-    RTEMS_INTERRUPT_LEVEL(3) | RTEMS_NO_ASR |
-      RTEMS_TIMESLICE | RTEMS_NO_PREEMPT,
-    RTEMS_INTERRUPT_MASK | RTEMS_ASR_MASK |
-      RTEMS_TIMESLICE_MASK | RTEMS_PREEMPT_MASK,
-    &previous_mode
-  );
-  directive_failed( status, "rtems_task_mode" );
-  put_mode(
-    "TA1 - rtems_task_mode - set all modes        - previous mode: ",
-    previous_mode
-  );
-
-  status = rtems_task_mode(
-    RTEMS_INTERRUPT_LEVEL(0) | RTEMS_ASR | RTEMS_NO_TIMESLICE | RTEMS_PREEMPT,
-    RTEMS_INTERRUPT_MASK | RTEMS_ASR_MASK |
-    RTEMS_TIMESLICE_MASK | RTEMS_PREEMPT_MASK,
-    &previous_mode
-  );
-  directive_failed( status, "rtems_task_mode" );
-  put_mode(
-    "TA1 - rtems_task_mode - clear all modes      - previous mode: ",
-    previous_mode
-  );
-
-/* END OF COMBINATIONS */
-
-/* BEGINNING OF CURRENT MODE */
-
-  status = rtems_task_mode(
-    RTEMS_CURRENT_MODE,
-    RTEMS_CURRENT_MODE,
-    &previous_mode
-  );
-  directive_failed( status, "rtems_task_mode" );
-  put_mode(
-    "TA1 - rtems_task_mode - get current mode     - previous mode: ",
-    previous_mode
-  );
-
-/* END OF CURRENT MODE */
-
-  puts( "*** END OF TEST 8 ***" );
-  exit( 0 );
-}
diff --git a/testsuites/sptests/sp09/delay.c b/testsuites/sptests/sp09/delay.c
deleted file mode 100644
index 23f1c8730f..0000000000
--- a/testsuites/sptests/sp09/delay.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/*  Delayed_routine
- *
- *  This routine is used as the timer routine for Timer Manager tests.
- *
- *  Input parameters:
- *    ignored - this parameter is ignored
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_timer_service_routine Delayed_routine(
-  rtems_id  ignored_id,
-  void     *ignored_address
-)
-{
-}
diff --git a/testsuites/sptests/sp09/init.c b/testsuites/sptests/sp09/init.c
deleted file mode 100644
index fb80e38d00..0000000000
--- a/testsuites/sptests/sp09/init.c
+++ /dev/null
@@ -1,120 +0,0 @@
-/*  Init
- *
- *  This routine is the initialization task for this test program.
- *  It is a user initialization task and has the responsibility for creating
- *  and starting the tasks that make up the test.  If the time of day
- *  clock is required for the test, it should also be set to a known
- *  value by this function.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "system.h"
-
-rtems_task Init(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-
-  puts( "\n\n*** TEST 9 ***" );
-
-  Task_name[ 1 ]       =  rtems_build_name( 'T', 'A', '1', ' ' );
-  Task_name[ 2 ]       =  rtems_build_name( 'T', 'A', '2', ' ' );
-  Task_name[ 3 ]       =  rtems_build_name( 'T', 'A', '3', ' ' );
-  Task_name[ 4 ]       =  rtems_build_name( 'T', 'A', '4', ' ' );
-  Task_name[ 5 ]       =  rtems_build_name( 'T', 'A', '5', ' ' );
-  Task_name[ 6 ]       =  rtems_build_name( 'T', 'A', '6', ' ' );
-  Task_name[ 7 ]       =  rtems_build_name( 'T', 'A', '7', ' ' );
-  Task_name[ 8 ]       =  rtems_build_name( 'T', 'A', '8', ' ' );
-  Task_name[ 9 ]       =  rtems_build_name( 'T', 'A', '9', ' ' );
-  Task_name[ 10 ]      =  rtems_build_name( 'T', 'A', 'A', ' ' );
-
-  Timer_name[ 1 ]      =  rtems_build_name( 'T', 'M', '1', ' ' );
-
-  Semaphore_name[ 1 ]  =  rtems_build_name( 'S', 'M', '1', ' ' );
-  Semaphore_name[ 2 ]  =  rtems_build_name( 'S', 'M', '2', ' ' );
-  Semaphore_name[ 3 ]  =  rtems_build_name( 'S', 'M', '3', ' ' );
-
-  Queue_name[ 1 ]      =  rtems_build_name( 'M', 'Q', '1', ' ' );
-  Queue_name[ 2 ]      =  rtems_build_name( 'M', 'Q', '2', ' ' );
-
-  Partition_name[ 1 ]  =  rtems_build_name( 'P', 'T', '1', ' ' );
-
-  Region_name[ 1 ]     =  rtems_build_name( 'R', 'N', '1', ' ' );
-
-  Port_name[ 1 ]       =  rtems_build_name( 'D', 'P', '1', ' ' );
-
-  Period_name[ 1 ]     =  rtems_build_name( 'T', 'M', '1', ' ' );
-
-#if 0
-  status = rtems_task_create(
-    Task_name[1],
-    4,
-    10,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Task_id[ 1 ]
-  );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_SIZE,
-    "rtems_task_create with illegal stack size"
-  );
-  puts( "INIT - rtems_task_create - RTEMS_INVALID_SIZE" );
-#endif
-  puts( "INIT - rtems_task_create - RTEMS_INVALID_SIZE -- NOT CHECKED" );
-
-  status = rtems_task_create(
-     Task_name[1],
-     0,
-     RTEMS_MINIMUM_STACK_SIZE,
-     RTEMS_DEFAULT_MODES,
-     RTEMS_DEFAULT_ATTRIBUTES,
-     &Task_id[ 1 ]
-  );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_PRIORITY,
-    "rtems_task_create with illegal priority"
-  );
-  puts( "INIT - rtems_task_create - RTEMS_INVALID_PRIORITY" );
-
-  status = rtems_task_create(
-    Task_name[ 1 ],
-    4,
-    RTEMS_MINIMUM_STACK_SIZE * 3,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Task_id[ 1 ]
-  );
-  directive_failed( status, "rtems_task_create of TA1" );
-
-  status = rtems_task_restart( Task_id[ 1 ], 0 );
-  fatal_directive_status(
-    status,
-    RTEMS_INCORRECT_STATE,
-    "rtems_task_restart of DORMANT task"
-  );
-  puts( "INIT - rtems_task_restart - RTEMS_INCORRECT_STATE" );
-
-  status = rtems_task_start( Task_id[ 1 ], Task_1, 0 );
-  directive_failed( status, "rtems_task_start of TA1" );
-
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-}
diff --git a/testsuites/sptests/sp09/isr.c b/testsuites/sptests/sp09/isr.c
deleted file mode 100644
index 4098dc0f95..0000000000
--- a/testsuites/sptests/sp09/isr.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/*  Service_routine
- *
- *  This routine is used as the timer routine for Interrupt Manager tests.
- *
- *  Input parameters:
- *    ignored - this parameter is ignored
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_isr Service_routine(
-  rtems_vector_number ignored
-)
-{
-}
diff --git a/testsuites/sptests/sp09/screen01.c b/testsuites/sptests/sp09/screen01.c
deleted file mode 100644
index e3d0359837..0000000000
--- a/testsuites/sptests/sp09/screen01.c
+++ /dev/null
@@ -1,168 +0,0 @@
-/*  Screen1
- *
- *  This routine generates error screen 1 for test 9.
- *
- *  Input parameters:  NONE
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-void Screen1()
-{
-  rtems_unsigned32    notepad_value;
-  rtems_id            self_id;
-  rtems_task_priority previous_priority;
-  rtems_status_code   status;
-
-  status = rtems_task_delete( 100 );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_ID,
-    "rtems_task_delete with illegal id"
-  );
-  puts( "TA1 - rtems_task_delete - RTEMS_INVALID_ID" );
-
-  status = rtems_task_get_note( RTEMS_SELF, 100, &notepad_value );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_NUMBER,
-    "rtems_task_get_note with illegal notepad"
-  );
-  puts( "TA1 - rtems_task_get_note - RTEMS_INVALID_NUMBER" );
-
-  status = rtems_task_get_note( 100, RTEMS_NOTEPAD_LAST, &notepad_value );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_ID,
-    "rtems_task_get_note with illegal id"
-  );
-  puts( "TA1 - rtems_task_get_note - RTEMS_INVALID_ID" );
-
-  status = rtems_task_ident( RTEMS_SELF, RTEMS_SEARCH_ALL_NODES, &self_id );
-  directive_failed( status, "rtems_task_ident of self" );
-
-  if ( self_id != Task_id[ 1 ] ) {
-    puts( "ERROR - rtems_task_ident - incorrect ID returned!" );
-  }
-  puts( "TA1 - rtems_task_ident - current task RTEMS_SUCCESSFUL" );
-
-  status = rtems_task_ident( 100, RTEMS_SEARCH_ALL_NODES, &Junk_id );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_NAME,
-    "rtems_task_ident with illegal name (local)"
-  );
-  puts( "TA1 - rtems_task_ident - global RTEMS_INVALID_NAME" );
-
-  status = rtems_task_ident( 100, 1, &Junk_id );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_NAME,
-    "rtems_task_ident with illegal name (global)"
-  );
-  puts( "TA1 - rtems_task_ident - local RTEMS_INVALID_NAME" );
-
-  status = rtems_task_ident( 100, 2, &Junk_id );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_NODE,
-    "rtems_task_ident with illegal node"
-  );
-  puts( "TA1 - rtems_task_ident - RTEMS_INVALID_NODE" );
-
-  status = rtems_task_restart( 100, 0 );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_ID,
-    "rtems_task_restart with illegal id"
-  );
-  puts( "TA1 - rtems_task_restart - RTEMS_INVALID_ID" );
-
-  status = rtems_task_resume( 100 );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_ID,
-    "rtems_task_resume with illegal id"
-  );
-  puts( "TA1 - rtems_task_resume - RTEMS_INVALID_ID" );
-
-  status = rtems_task_resume( RTEMS_SELF );
-  fatal_directive_status(
-    status,
-    RTEMS_INCORRECT_STATE,
-    "rtems_task_resume of ready task"
-  );
-  puts( "TA1 - rtems_task_resume - RTEMS_INCORRECT_STATE" );
-
-  status = rtems_task_set_priority( RTEMS_SELF, 512, &previous_priority );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_PRIORITY,
-    "rtems_task_set_priority with illegal priority"
-  );
-  puts( "TA1 - rtems_task_set_priority - RTEMS_INVALID_PRIORITY" );
-
-  status = rtems_task_set_priority( 100, 8, &previous_priority );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_ID,
-    "rtems_task_set_priority with illegal id"
-  );
-  puts( "TA1 - rtems_task_set_priority - RTEMS_INVALID_ID" );
-
-  status = rtems_task_set_note(
-    RTEMS_SELF,
-    RTEMS_NOTEPAD_LAST+10,
-    notepad_value
-  );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_NUMBER,
-    "rtems_task_set_note with illegal notepad"
-  );
-  puts( "TA1 - rtems_task_set_note - RTEMS_INVALID_NUMBER" );
-
-  status = rtems_task_set_note( 100, RTEMS_NOTEPAD_LAST, notepad_value );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_ID,
-    "rtems_task_set_note with illegal id"
-  );
-  puts( "TA1 - rtems_task_set_note - RTEMS_INVALID_ID" );
-
-  status = rtems_task_start( 100, Task_1, 0 );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_ID,
-    "rtems_task_start with illegal id"
-  );
-  puts( "TA1 - rtems_task_start - RTEMS_INVALID_ID" );
-
-  status = rtems_task_start( 0, Task_1, 0 );
-  fatal_directive_status(
-    status,
-    RTEMS_INCORRECT_STATE,
-    "rtems_task_start of ready task"
-  );
-  puts( "TA1 - rtems_task_start - RTEMS_INCORRECT_STATE" );
-
-  status = rtems_task_suspend( 100 );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_ID,
-    "rtems_task_suspend with illegal id"
-  );
-  puts( "TA1 - rtems_task_suspend - RTEMS_INVALID_ID" );
-}
diff --git a/testsuites/sptests/sp09/screen02.c b/testsuites/sptests/sp09/screen02.c
deleted file mode 100644
index 27982c0af7..0000000000
--- a/testsuites/sptests/sp09/screen02.c
+++ /dev/null
@@ -1,192 +0,0 @@
-/*  Screen2
- *
- *  This routine generates error screen 2 for test 9.
- *
- *  Input parameters:  NONE
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-void Screen2()
-{
-  rtems_time_of_day time;
-  rtems_status_code status;
-
-/* errors before clock is set */
-
-  status = rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time );
-  if ( status == RTEMS_SUCCESSFUL ) {
-    puts(
-     "TA1 - rtems_clock_get - RTEMS_NOT_DEFINED -- DID BSP SET THE TIME OF DAY?"
-    );
-  } else {
-    fatal_directive_status(
-      status,
-      RTEMS_NOT_DEFINED,
-      "rtems_clock_get before clock is set"
-    );
-    puts( "TA1 - rtems_clock_get - RTEMS_NOT_DEFINED" );
-  }
-
-  status = rtems_task_wake_when( &time );
-  if ( status == RTEMS_SUCCESSFUL ) {
-    puts(
-"TA1 - rtems_task_wake_when - RTEMS_NOT_DEFINED -- DID BSP SET THE TIME OF DAY?"
-    );
-  } else {
-    fatal_directive_status(
-      status,
-      RTEMS_NOT_DEFINED,
-      "rtems_task_wake_when before clock is set"
-    );
-    puts( "TA1 - rtems_task_wake_when - RTEMS_NOT_DEFINED" );
-  }
-
-  status = rtems_timer_fire_when( 0, &time, Delayed_routine, NULL );
-  if ( status == RTEMS_SUCCESSFUL ) {
-    puts(
-    "TA1 - timer_wake_when - RTEMS_NOT_DEFINED -- DID BSP SET THE TIME OF DAY?"
-    );
-  } else {
-    fatal_directive_status(
-      status,
-      RTEMS_NOT_DEFINED,
-      "task_fire_when before clock is set"
-    );
-    puts( "TA1 - rtems_timer_fire_when - RTEMS_NOT_DEFINED" );
-  }
-
-  build_time( &time, 2, 5, 1987, 8, 30, 45, 0 );
-  print_time( "TA1 - rtems_clock_set - ", &time, "" );
-  status = rtems_clock_set( &time );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_CLOCK,
-    "rtems_clock_set with invalid year"
-  );
-  puts( " - RTEMS_INVALID_CLOCK" );
-
-  build_time( &time, 15, 5, 1988, 8, 30, 45, 0 );
-  print_time( "TA1 - rtems_clock_set - ", &time, "" );
-  status = rtems_clock_set( &time );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_CLOCK,
-    "rtems_clock_set with invalid month"
-  );
-  puts( " - RTEMS_INVALID_CLOCK" );
-
-  build_time( &time, 2, 32, 1988, 8, 30, 45, 0 );
-  print_time( "TA1 - rtems_clock_set - ", &time, "" );
-  status = rtems_clock_set( &time );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_CLOCK,
-    "rtems_clock_set with invalid day"
-  );
-  puts( " - RTEMS_INVALID_CLOCK" );
-
-  build_time( &time, 2, 5, 1988, 25, 30, 45, 0 );
-  print_time( "TA1 - rtems_clock_set - ", &time, "" );
-  status = rtems_clock_set( &time );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_CLOCK,
-    "rtems_clock_set with invalid hour"
-  );
-  puts( " - RTEMS_INVALID_CLOCK" );
-
-  build_time( &time, 2, 5, 1988, 8, 61, 45, 0 );
-  print_time( "TA1 - rtems_clock_set - ", &time, "" );
-  status = rtems_clock_set( &time );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_CLOCK,
-    "rtems_clock_set with invalid minute"
-  );
-  puts( " - RTEMS_INVALID_CLOCK" );
-
-  build_time( &time, 2, 5, 1988, 8, 30, 61, 0 );
-  print_time( "TA1 - rtems_clock_set - ", &time, "" );
-  status = rtems_clock_set( &time );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_CLOCK,
-    "rtems_clock_set with invalid second"
-  );
-  puts( " - RTEMS_INVALID_CLOCK" );
-
-  build_time( &time, 2, 5, 1988, 8, 30, 45, TICKS_PER_SECOND + 1 );
-  print_time( "TA1 - rtems_clock_set - ", &time, "" );
-  status = rtems_clock_set( &time );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_CLOCK,
-    "rtems_clock_set with invalid ticks per second"
-  );
-  puts( " - RTEMS_INVALID_CLOCK" );
-
-  build_time( &time, 2, 5, 1988, 8, 30, 45, 0 );
-  print_time( "TA1 - rtems_clock_set - ", &time, "" );
-  status = rtems_clock_set( &time );
-  directive_failed( status, "rtems_clock_set successful" );
-  puts( " - RTEMS_SUCCESSFUL" );
-
-/* rtems_task_wake_when */
-
-  build_time( &time, 2, 5, 1988, 8, 30, 48, TICKS_PER_SECOND + 1 );
-  time.second += 3;
-  puts( "TA1 - rtems_task_wake_when - TICKINVALID - sleep about 3 seconds" );
-
-  status = rtems_task_wake_when( &time );
-  directive_failed(
-    status,
-    "rtems_task_wake_when with invalid ticks per second"
-  );
-  puts( "TA1 - rtems_task_wake_when - TICKINVALID - woke up RTEMS_SUCCESSFUL" );
-
-  build_time( &time, 2, 5, 1961, 8, 30, 48, 0 );
-  print_time( "TA1 - rtems_task_wake_when - ", &time, "" );
-  status = rtems_task_wake_when( &time );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_CLOCK,
-    "rtems_task_wake_when with invalid year"
-  );
-  puts( " - RTEMS_INVALID_CLOCK" );
-
-  build_time( &time, 2, 5, 1988, 25, 30, 48, 0 );
-  print_time( "TA1 - rtems_task_wake_when - ", &time, "" );
-  status = rtems_task_wake_when( &time );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_CLOCK,
-    "rtems_task_wake_when with invalid hour"
-  );
-  puts( " - RTEMS_INVALID_CLOCK" );
-
-  rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time );
-  print_time( "TA1 - current time - ", &time, "\n" );
-
-  time.month = 1;
-  print_time( "TA1 - rtems_task_wake_when - ", &time, "" );
-  status = rtems_task_wake_when( &time );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_CLOCK,
-    "rtems_task_wake_when before current time"
-  );
-  puts( " - RTEMS_INVALID_CLOCK" );
-}
diff --git a/testsuites/sptests/sp09/screen03.c b/testsuites/sptests/sp09/screen03.c
deleted file mode 100644
index 713375cb52..0000000000
--- a/testsuites/sptests/sp09/screen03.c
+++ /dev/null
@@ -1,217 +0,0 @@
-/*  Screen3
- *
- *  This routine generates error screen 3 for test 9.
- *
- *  Input parameters:  NONE
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-extern rtems_configuration_table BSP_Configuration;
-extern rtems_cpu_table           _CPU_Table;
-
-void Screen3()
-{
-  rtems_name        task_name;
-  rtems_status_code status;
-
-  task_name = 1;
-  status = rtems_task_create(
-    0,
-    1,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Junk_id
-  );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_NAME,
-    "rtems_task_create with illegal name"
-  );
-  puts( "TA1 - rtems_task_create - RTEMS_INVALID_NAME" );
-
-  /*
-   * If the bsp provides its own stack allocator, then
-   * skip the test that tries to allocate a stack that is too big.
-   */
-
-  if (_CPU_Table.stack_allocate_hook)
-  {
-      puts( "TA1 - rtems_task_create - stack size - RTEMS_UNSATISFIED  -- SKIPPED" );
-  }
-  else
-  {
-      status = rtems_task_create(
-        task_name,
-        1,
-        BSP_Configuration.work_space_size,
-        RTEMS_DEFAULT_MODES,
-        RTEMS_DEFAULT_ATTRIBUTES,
-        &Junk_id
-      );
-      fatal_directive_status(
-        status,
-        RTEMS_UNSATISFIED,
-        "rtems_task_create with a stack size larger than the workspace"
-      );
-      puts( "TA1 - rtems_task_create - stack size - RTEMS_UNSATISFIED" );
-  }
-
-  status = rtems_task_create(
-    Task_name[ 2 ],
-    4,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Task_id[ 2 ]
-  );
-  directive_failed( status, "rtems_task_create of TA2" );
-  puts( "TA1 - rtems_task_create - TA2 created - RTEMS_SUCCESSFUL" );
-
-  status = rtems_task_suspend( Task_id[ 2 ] );
-  directive_failed( status, "rtems_task_suspend of TA2" );
-  puts( "TA1 - rtems_task_suspend - suspend TA2 - RTEMS_SUCCESSFUL" );
-
-  status = rtems_task_suspend( Task_id[ 2 ] );
-  fatal_directive_status(
-    status,
-    RTEMS_ALREADY_SUSPENDED,
-    "rtems_task_suspend of suspended TA2"
-  );
-  puts( "TA1 - rtems_task_suspend - suspend TA2 - RTEMS_ALREADY_SUSPENDED" );
-
-  status = rtems_task_resume( Task_id[ 2 ] );
-  directive_failed( status, "rtems_task_resume of TA2" );
-  puts( "TA1 - rtems_task_resume - TA2 resumed - RTEMS_SUCCESSFUL" );
-
-  status = rtems_task_create(
-    Task_name[ 3 ],
-    4,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Task_id[ 3 ]
-  );
-  directive_failed( status, "rtems_task_create of TA3" );
-  puts( "TA1 - rtems_task_create - TA3 created - RTEMS_SUCCESSFUL" );
-
-  status = rtems_task_create(
-    Task_name[ 4 ],
-    4,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Task_id[ 4 ]
-  );
-  directive_failed( status, "rtems_task_create of TA4" );
-  puts( "TA1 - rtems_task_create - 4 created - RTEMS_SUCCESSFUL" );
-
-  status = rtems_task_create(
-    Task_name[ 5 ],
-    4,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Task_id[ 5 ]
-  );
-  directive_failed( status, "rtems_task_create of TA5" );
-  puts( "TA1 - rtems_task_create - 5 created - RTEMS_SUCCESSFUL" );
-
-  status = rtems_task_create(
-    Task_name[ 6 ],
-    4,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Task_id[ 6 ]
-  );
-  directive_failed( status, "rtems_task_create of TA6" );
-  puts( "TA1 - rtems_task_create - 6 created - RTEMS_SUCCESSFUL" );
-
-  status = rtems_task_create(
-    Task_name[ 7 ],
-    4,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Task_id[ 7 ]
-  );
-  directive_failed( status, "rtems_task_create of TA7" );
-  puts( "TA1 - rtems_task_create - 7 created - RTEMS_SUCCESSFUL" );
-
-  status = rtems_task_create(
-    Task_name[ 8 ],
-    4,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Task_id[ 8 ]
-  );
-  directive_failed( status, "rtems_task_create of TA8" );
-  puts( "TA1 - rtems_task_create - 8 created - RTEMS_SUCCESSFUL" );
-
-  status = rtems_task_create(
-    Task_name[ 9 ],
-    4,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Task_id[ 9 ]
-  );
-  directive_failed( status, "rtems_task_create of TA9" );
-  puts( "TA1 - rtems_task_create - 9 created - RTEMS_SUCCESSFUL" );
-
-  status = rtems_task_create(
-    Task_name[ 10 ],
-    4,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Task_id[ 10 ]
-  );
-  directive_failed( status, "rtems_task_create of TA10" );
-  puts( "TA1 - rtems_task_create - 10 created - RTEMS_SUCCESSFUL" );
-
-  status = rtems_task_create(
-    task_name,
-    4,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Junk_id
-  );
-  fatal_directive_status(
-    status,
-    RTEMS_TOO_MANY,
-    "rtems_task_create for too many tasks"
-  );
-  puts( "TA1 - rtems_task_create - 11 - RTEMS_TOO_MANY" );
-
-  status = rtems_task_create(
-    task_name,
-    4,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_GLOBAL,
-    &Junk_id
-  );
-  fatal_directive_status(
-    status,
-    RTEMS_MP_NOT_CONFIGURED,
-    "rtems_task_create of global task in a single cpu system"
-  );
-  puts( "TA1 - rtems_task_create - RTEMS_MP_NOT_CONFIGURED" );
-}
diff --git a/testsuites/sptests/sp09/screen04.c b/testsuites/sptests/sp09/screen04.c
deleted file mode 100644
index 3dcddf9581..0000000000
--- a/testsuites/sptests/sp09/screen04.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/*  Screen4
- *
- *  This routine generates error screen 4 for test 9.
- *
- *  Input parameters:  NONE
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-void Screen4()
-{
-  rtems_event_set   event_out;
-  rtems_time_of_day time;
-  rtems_status_code status;
-
-  status = rtems_event_receive(
-    RTEMS_EVENT_16,
-    RTEMS_NO_WAIT,
-    RTEMS_NO_TIMEOUT,
-    &event_out
-  );
-  fatal_directive_status(
-    status,
-    RTEMS_UNSATISFIED,
-    "rtems_event_receive unsatisfied (ALL)"
-  );
-  puts( "TA1 - rtems_event_receive - RTEMS_UNSATISFIED ( all conditions )" );
-
-  status = rtems_event_receive(
-    RTEMS_EVENT_16,
-    RTEMS_EVENT_ANY | RTEMS_NO_WAIT,
-    RTEMS_NO_TIMEOUT,
-    &event_out
-  );
-  fatal_directive_status(
-    status,
-    RTEMS_UNSATISFIED,
-    "rtems_event_receive unsatisfied (ANY)"
-  );
-  puts( "TA1 - rtems_event_receive - RTEMS_UNSATISFIED ( any condition )" );
-
-  puts( "TA1 - rtems_event_receive - timeout in 3 seconds" );
-  status = rtems_event_receive(
-    RTEMS_EVENT_16,
-    RTEMS_DEFAULT_OPTIONS,
-    3 * TICKS_PER_SECOND,
-    &event_out
-  );
-  fatal_directive_status(
-    status,
-    RTEMS_TIMEOUT,
-    "rtems_event_receive"
-  );
-  puts( "TA1 - rtems_event_receive - woke up with RTEMS_TIMEOUT" );
-
-  status = rtems_event_send( 100, RTEMS_EVENT_16 );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_ID,
-    "rtems_event_send with illegal id"
-  );
-  puts( "TA1 - rtems_event_send - RTEMS_INVALID_ID" );
-
-  puts( "TA1 - rtems_task_wake_after - sleep 1 second - RTEMS_SUCCESSFUL" );
-  status = rtems_task_wake_after( TICKS_PER_SECOND );
-  directive_failed( status, "rtems_task_wake_after" );
-
-  build_time( &time, 2, 5, 1988, 8, 30, 45, 0 );
-  print_time( "TA1 - rtems_clock_set - ", &time, "" );
-  status = rtems_clock_set( &time );
-  directive_failed( status, "rtems_clock_set" );
-  puts( " - RTEMS_SUCCESSFUL" );
-}
diff --git a/testsuites/sptests/sp09/screen05.c b/testsuites/sptests/sp09/screen05.c
deleted file mode 100644
index c5dfd1a067..0000000000
--- a/testsuites/sptests/sp09/screen05.c
+++ /dev/null
@@ -1,164 +0,0 @@
-/*  Screen5
- *
- *  This routine generates error screen 5 for test 9.
- *
- *  Input parameters:  NONE
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-void Screen5()
-{
-  rtems_status_code status;
-
-  status = rtems_semaphore_create(
-    0,
-    1,
-    RTEMS_DEFAULT_ATTRIBUTES, 
-    RTEMS_NO_PRIORITY,
-    &Junk_id
-  );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_NAME,
-    "rtems_semaphore_create with illegal name"
-  );
-  puts( "TA1 - rtems_semaphore_create - RTEMS_INVALID_NAME" );
-
-  status = rtems_semaphore_create(
-    Semaphore_name[ 1 ],
-    1,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    RTEMS_NO_PRIORITY,
-    &Semaphore_id[ 1 ]
-  );
-  directive_failed( status, "rtems_semaphore_create" );
-  puts( "TA1 - rtems_semaphore_create - 1 - RTEMS_SUCCESSFUL" );
-
-  status = rtems_semaphore_create(
-    Semaphore_name[ 2 ],
-    1,
-    RTEMS_BINARY_SEMAPHORE | RTEMS_PRIORITY | RTEMS_INHERIT_PRIORITY,
-    RTEMS_NO_PRIORITY,
-    &Semaphore_id[ 2 ]
-  );
-  directive_failed( status, "rtems_semaphore_create" );
-  puts( "TA1 - rtems_semaphore_create - 2 - RTEMS_SUCCESSFUL" );
-
-  do {
-      status = rtems_semaphore_create(
-          Semaphore_name[ 3 ],
-          1,
-          RTEMS_DEFAULT_ATTRIBUTES,
-          RTEMS_NO_PRIORITY,
-          &Junk_id
-      );
-  } while (status == RTEMS_SUCCESSFUL);
-
-  fatal_directive_status(
-    status,
-    RTEMS_TOO_MANY,
-    "rtems_semaphore_create of too many"
-  );
-  puts( "TA1 - rtems_semaphore_create - 3 - RTEMS_TOO_MANY" );
-
-  status = rtems_semaphore_create(
-    Semaphore_name[ 1 ],
-    1,
-    RTEMS_INHERIT_PRIORITY | RTEMS_BINARY_SEMAPHORE | RTEMS_FIFO,
-    RTEMS_NO_PRIORITY,
-    &Junk_id
-  );
-  fatal_directive_status(
-    status,
-    RTEMS_NOT_DEFINED,
-    "rtems_semaphore_create of RTEMS_FIFO RTEMS_INHERIT_PRIORITY"
-  );
-  puts( "TA1 - rtems_semaphore_create - RTEMS_NOT_DEFINED" );
-
-  status = rtems_semaphore_create(
-    Semaphore_name[ 1 ],
-    1,
-    RTEMS_INHERIT_PRIORITY | RTEMS_COUNTING_SEMAPHORE | RTEMS_PRIORITY,
-    RTEMS_NO_PRIORITY,
-    &Junk_id
-  );
-  fatal_directive_status(
-    status,
-    RTEMS_NOT_DEFINED,
-    "rtems_semaphore_create of RTEMS_COUNTING_SEMAPHORE RTEMS_INHERIT_PRIORITY"
-  );
-  puts( "TA1 - rtems_semaphore_create - RTEMS_NOT_DEFINED" );
-
-  status = rtems_semaphore_create(
-    Semaphore_name[ 1 ],
-    2,
-    RTEMS_BINARY_SEMAPHORE,
-    RTEMS_NO_PRIORITY,
-    &Junk_id
-  );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_NUMBER,
-    "rtems_semaphore_create of binary semaphore with count > 1"
-  );
-  puts( "TA1 - rtems_semaphore_create - RTEMS_INVALID_NUMBER" );
-
-  status = rtems_semaphore_create(
-    Semaphore_name[ 3 ],
-    1,
-    RTEMS_GLOBAL,
-    RTEMS_NO_PRIORITY,
-    &Junk_id
-  );
-  fatal_directive_status(
-    status,
-    RTEMS_MP_NOT_CONFIGURED,
-    "rtems_semaphore_create of mp not configured"
-  );
-  puts( "TA1 - rtems_semaphore_create - RTEMS_MP_NOT_CONFIGURED" );
-
-  status = rtems_semaphore_delete( 100 );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_ID,
-    "rtems_semaphore_delete with illegal id"
-  );
-  puts( "TA1 - rtems_semaphore_delete - unknown RTEMS_INVALID_ID" );
-
-  status = rtems_semaphore_delete( 0x010100 );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_ID,
-    "rtems_semaphore_delete with local illegal id"
-  );
-  puts( "TA1 - rtems_semaphore_delete - local RTEMS_INVALID_ID" );
-
-  status = rtems_semaphore_ident( 100, RTEMS_SEARCH_ALL_NODES, &Junk_id );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_NAME,
-    "rtems_semaphore_ident will illegal name (local)"
-  );
-  puts( "TA1 - rtems_semaphore_ident - global RTEMS_INVALID_NAME" );
-
-  status = rtems_semaphore_ident( 100, 1, &Junk_id );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_NAME,
-    "rtems_semaphore_ident will illegal name (global)"
-  );
-  puts( "TA1 - rtems_semaphore_ident - local RTEMS_INVALID_NAME" );
-}
diff --git a/testsuites/sptests/sp09/screen06.c b/testsuites/sptests/sp09/screen06.c
deleted file mode 100644
index 948598dff3..0000000000
--- a/testsuites/sptests/sp09/screen06.c
+++ /dev/null
@@ -1,125 +0,0 @@
-/*  Screen6
- *
- *  This routine generates error screen 6 for test 9.
- *
- *  Input parameters:  NONE
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-void Screen6()
-{
-  rtems_status_code status;
-
-  status = rtems_semaphore_obtain(
-    100,
-    RTEMS_DEFAULT_OPTIONS,
-    RTEMS_NO_TIMEOUT
-  );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_ID,
-    "rtems_semaphore_obtain with illegal id"
-  );
-  puts( "TA1 - rtems_semaphore_obtain - RTEMS_INVALID_ID" );
-
-  status = rtems_semaphore_obtain(
-    Semaphore_id[ 1 ],
-    RTEMS_DEFAULT_OPTIONS,
-    RTEMS_NO_TIMEOUT
-  );
-  directive_failed( status, "rtems_semaphore_obtain successful" );
-  puts( "TA1 - rtems_semaphore_obtain - got sem 1 - RTEMS_SUCCESSFUL" );
-
-  status = rtems_semaphore_obtain(
-    Semaphore_id[ 1 ],
-    RTEMS_NO_WAIT,
-    RTEMS_NO_TIMEOUT
-  );
-  fatal_directive_status(
-    status,
-    RTEMS_UNSATISFIED,
-    "rtems_semaphore_obtain not available"
-  );
-  puts( "TA1 - rtems_semaphore_obtain - RTEMS_UNSATISFIED" );
-
-  puts( "TA1 - rtems_semaphore_obtain - timeout in 3 seconds" );
-  status = rtems_semaphore_obtain(
-    Semaphore_id[ 1 ],
-    RTEMS_DEFAULT_OPTIONS,
-    3 * TICKS_PER_SECOND
-  );
-  fatal_directive_status(
-    status,
-    RTEMS_TIMEOUT,
-    "rtems_semaphore_obtain timeout"
-  );
-  puts( "TA1 - rtems_semaphore_obtain - woke up with RTEMS_TIMEOUT" );
-
-  status = rtems_semaphore_release( Semaphore_id[ 2 ] );
-  fatal_directive_status(
-    status,
-    RTEMS_NOT_OWNER_OF_RESOURCE,
-    "rtems_semaphore_release and not owner"
-  );
-  puts( "TA1 - rtems_semaphore_release - RTEMS_NOT_OWNER_OF_RESOURCE" );
-
-  status = rtems_semaphore_release( 100 );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_ID,
-    "rtems_semaphore_release with illegal id"
-  );
-  puts( "TA1 - rtems_semaphore_release - RTEMS_INVALID_ID" );
-
-  puts( "TA1 - rtems_task_start - start TA2 - RTEMS_SUCCESSFUL" );
-  status = rtems_task_start( Task_id[ 2 ], Task_2, 0 );
-  directive_failed( status, "rtems_task_start of TA2" );
-
-  puts( "TA1 - rtems_task_wake_after - yield processor - RTEMS_SUCCESSFUL" );
-  status = rtems_task_wake_after( RTEMS_YIELD_PROCESSOR );
-  directive_failed( status, "rtems_task_wake_after (yield)" );
-
-  puts( "TA1 - rtems_semaphore_delete - delete sem 1 - RTEMS_SUCCESSFUL" );
-  status = rtems_semaphore_delete( Semaphore_id[ 1 ] );
-  directive_failed( status, "rtems_semaphore_delete of SM1" );
-
-  puts( "TA1 - rtems_semaphore_obtain - binary semaphore" );
-  status = rtems_semaphore_obtain(
-    Semaphore_id[ 2 ],
-    RTEMS_DEFAULT_OPTIONS,
-    RTEMS_NO_TIMEOUT
-  );
-  directive_failed( status, "rtems_semaphore_obtain");
-
-  puts( "TA1 - rtems_semaphore_delete - delete sem 2 - RTEMS_RESOURCE_IN_USE" );
-  status = rtems_semaphore_delete( Semaphore_id[ 2 ] );
-  fatal_directive_status(
-     status,
-     RTEMS_RESOURCE_IN_USE,
-     "rtems_semaphore_delete of SM2"
-  );
-
-  puts( "TA1 - rtems_task_wake_after - yield processor - RTEMS_SUCCESSFUL" );
-  status = rtems_task_wake_after( RTEMS_YIELD_PROCESSOR );
-  directive_failed( status, "rtems_task_wake_after (yield)" );
-
-  status = rtems_task_delete( Task_id[ 2 ] );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_ID,
-    "rtems_task_delete after the task has been deleted"
-  );
-}
diff --git a/testsuites/sptests/sp09/screen07.c b/testsuites/sptests/sp09/screen07.c
deleted file mode 100644
index 14ba4ff2d2..0000000000
--- a/testsuites/sptests/sp09/screen07.c
+++ /dev/null
@@ -1,200 +0,0 @@
-/*  Screen7
- *
- *  This routine generates error screen 7 for test 9.
- *
- *  Input parameters:  NONE
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-void Screen7()
-{
-  long              buffer[ 4 ];
-  rtems_unsigned32  size;
-  rtems_unsigned32  count;
-  rtems_status_code status;
-
-  status = rtems_message_queue_broadcast( 100, (long (*)[4]) buffer, 16, &count );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_ID,
-    "rtems_message_queue_broadcast with illegal id"
-  );
-  puts( "TA1 - rtems_message_queue_broadcast - RTEMS_INVALID_ID" );
-
-  status = rtems_message_queue_create(
-    0,
-    3,
-    16,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Junk_id
-  );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_NAME,
-    "rtems_message_queue_create with illegal name"
-  );
-
-  puts( "TA1 - rtems_message_queue_create - Q 1 - RTEMS_INVALID_NAME" );
-  status = rtems_message_queue_create(
-    Queue_name[ 1 ],
-    1,
-    16,
-    RTEMS_GLOBAL,
-    &Junk_id
-  );
-  fatal_directive_status(
-    status,
-    RTEMS_MP_NOT_CONFIGURED,
-    "rtems_message_queue_create of mp not configured"
-  );
-  puts( "TA1 - rtems_message_queue_create - Q 1 - RTEMS_MP_NOT_CONFIGURED" );
-
-  status = rtems_message_queue_create(
-    Queue_name[ 1 ],
-    2,
-    16,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Queue_id[ 1 ]
-  );
-  directive_failed( status, "rtems_message_queue_create successful" );
-  puts(
-    "TA1 - rtems_message_queue_create - Q 1 - 2 DEEP - RTEMS_SUCCESSFUL"
-  );
-
-  status = rtems_message_queue_create(
-    Queue_name[ 2 ],
-    1,
-    16,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Junk_id
-  );
-  fatal_directive_status(
-    status,
-    RTEMS_TOO_MANY,
-    "rtems_message_queue_create of too many"
-  );
-  puts( "TA1 - rtems_message_queue_create - Q 2 - RTEMS_TOO_MANY" );
-
-  status = rtems_message_queue_delete( 100 );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_ID,
-    "rtems_message_queue_create with illegal id"
-  );
-  puts( "TA1 - rtems_message_queue_delete - unknown RTEMS_INVALID_ID" );
-
-  status = rtems_message_queue_delete( 0x10100 );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_ID,
-    "rtems_message_queue_delete with local illegal id"
-  );
-  puts( "TA1 - rtems_message_queue_delete - local RTEMS_INVALID_ID" );
-
-  status = rtems_message_queue_ident( 100, RTEMS_SEARCH_ALL_NODES, &Junk_id );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_NAME,
-    "rtems_message_queue_ident with illegal name"
-  );
-  puts( "TA1 - rtems_message_queue_ident - RTEMS_INVALID_NAME" );
-
-  status = rtems_message_queue_get_number_pending( 100, &count );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_ID,
-    "rtems_message_queue_get_number_pending with illegal id"
-  );
-  puts( "TA1 - rtems_message_queue_get_number_pending - RTEMS_INVALID_ID" );
-
-  status = rtems_message_queue_flush( 100, &count );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_ID,
-    "rtems_message_queue_flush with illegal id"
-  );
-  puts( "TA1 - rtems_message_queue_flush - RTEMS_INVALID_ID" );
-
-  status = rtems_message_queue_receive(
-    100,
-    (long (*)[4]) buffer,
-    &size,
-    RTEMS_DEFAULT_OPTIONS,
-    0
-  );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_ID,
-    "rtems_message_queue_receive wit illegal id"
-  );
-  puts( "TA1 - rtems_message_queue_receive - RTEMS_INVALID_ID" );
-
-  status = rtems_message_queue_receive(
-    Queue_id[ 1 ],
-    (long (*)[4]) buffer,
-    &size,
-    RTEMS_NO_WAIT,
-    RTEMS_NO_TIMEOUT
-  );
-  fatal_directive_status(
-    status,
-    RTEMS_UNSATISFIED,
-    "rtems_message_queue_receive unsatisfied"
-  );
-  puts( "TA1 - rtems_message_queue_receive - Q 1 - RTEMS_UNSATISFIED" );
-
-  puts( "TA1 - rtems_message_queue_receive - Q 1 - timeout in 3 seconds" );
-  status = rtems_message_queue_receive(
-    Queue_id[ 1 ],
-    (long (*)[4]) buffer,
-    &size,
-    RTEMS_DEFAULT_OPTIONS,
-    3 * TICKS_PER_SECOND
-  );
-  fatal_directive_status(
-    status,
-    RTEMS_TIMEOUT,
-    "rtems_message_queue_receive 3 second timeout"
-  );
-
-  puts(
-    "TA1 - rtems_message_queue_receive - Q 1 - woke up with RTEMS_TIMEOUT"
-  );
-
-  status = rtems_message_queue_send( 100, (long (*)[4]) buffer, 16 );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_ID,
-    "rtems_message_queue_send with illegal id"
-  );
-  puts( "TA1 - rtems_message_queue_send - RTEMS_INVALID_ID" );
-
-  status = rtems_message_queue_send( Queue_id[ 1 ], (long (*)[4]) buffer, 16 );
-  directive_failed( status, "rtems_message_queue_send" );
-  puts( "TA1 - rtems_message_queue_send - BUFFER 1 TO Q 1 - RTEMS_SUCCESSFUL" );
-
-  status = rtems_message_queue_send( Queue_id[ 1 ], (long (*)[4]) buffer, 16 );
-  directive_failed( status, "rtems_message_queue_send" );
-  puts( "TA1 - rtems_message_queue_send - BUFFER 2 TO Q 1 - RTEMS_SUCCESSFUL" );
-
-  status = rtems_message_queue_send( Queue_id[ 1 ], (long (*)[4]) buffer, 16 );
-  fatal_directive_status(
-    status,
-    RTEMS_TOO_MANY,
-    "rtems_message_queue_send too many to a limited queue"
-  );
-  puts( "TA1 - rtems_message_queue_send - BUFFER 3 TO Q 1 - RTEMS_TOO_MANY" );
-}
diff --git a/testsuites/sptests/sp09/screen08.c b/testsuites/sptests/sp09/screen08.c
deleted file mode 100644
index 705b9111fa..0000000000
--- a/testsuites/sptests/sp09/screen08.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/*  Screen8
- *
- *  This routine generates error screen 8 for test 9.
- *
- *  Input parameters:  NONE
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-void Screen8()
-{
-  long              buffer[ 4 ];
-  rtems_status_code status;
-
-  status = rtems_message_queue_delete( Queue_id[ 1 ] );
-  directive_failed( status, "rtems_message_queue_delete successful" );
-  puts( "TA1 - rtems_message_queue_delete - Q 1 - RTEMS_SUCCESSFUL" );
-
-  status = rtems_message_queue_create(
-    Queue_name[ 1 ],
-    2,
-    16,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Queue_id[ 1 ]
-  );
-  directive_failed( status, "rtems_message_queue_create successful" );
-  puts(
-    "TA1 - rtems_message_queue_create - Q 1 - 2 DEEP - RTEMS_SUCCESSFUL"
-  );
-
-  status = rtems_message_queue_send( Queue_id[ 1 ], (long (*)[4])buffer, 16 );
-  directive_failed( status, "rtems_message_queue_send successful" );
-  puts( "TA1 - rtems_message_queue_send - BUFFER 1 TO Q 1 - RTEMS_SUCCESSFUL" );
-
-  status = rtems_message_queue_send( Queue_id[ 1 ], (long (*)[4])buffer, 16 );
-  directive_failed( status, "rtems_message_queue_send successful" );
-  puts( "TA1 - rtems_message_queue_send - BUFFER 2 TO Q 1 - RTEMS_SUCCESSFUL" );
-
-  status = rtems_message_queue_send( Queue_id[ 1 ], (long (*)[4])buffer, 16 );
-  fatal_directive_status(
-    status,
-    RTEMS_TOO_MANY,
-    "rtems_message_queue_send too many to limited queue"
-  );
-  puts( "TA1 - rtems_message_queue_send - BUFFER 3 TO Q 1 - RTEMS_TOO_MANY" );
-
-  status = rtems_message_queue_delete( Queue_id[ 1 ] );
-  directive_failed( status, "rtems_message_queue_delete successful" );
-  puts( "TA1 - rtems_message_queue_delete - Q 1 - RTEMS_SUCCESSFUL" );
-
-  status = rtems_message_queue_create(
-    Queue_name[ 1 ],
-    3,
-    16,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Queue_id[ 1 ]
-  );
-  directive_failed( status, "rtems_message_queue_create successful" );
-  puts(
-    "TA1 - rtems_message_queue_create - Q 1 - 3 DEEP - RTEMS_SUCCESSFUL"
-  );
-
-  status = rtems_message_queue_send( Queue_id[ 1 ], (long (*)[4])buffer, 16 );
-  directive_failed( status, "rtems_message_queue_send successful" );
-  puts( "TA1 - rtems_message_queue_send - BUFFER 1 TO Q 1 - RTEMS_SUCCESSFUL" );
-
-  status = rtems_message_queue_send( Queue_id[ 1 ], (long (*)[4])buffer, 16 );
-  directive_failed( status, "rtems_message_queue_send successful" );
-  puts( "TA1 - rtems_message_queue_send - BUFFER 2 TO Q 1 - RTEMS_SUCCESSFUL" );
-
-  status = rtems_message_queue_send( Queue_id[ 1 ], (long (*)[4])buffer, 16 );
-  directive_failed( status, "rtems_message_queue_send successful" );
-  puts( "TA1 - rtems_message_queue_send - BUFFER 3 TO Q 1 - RTEMS_SUCCESSFUL" );
-
-  status = rtems_message_queue_send( Queue_id[ 1 ], (long (*)[4])buffer, 16 );
-  fatal_directive_status(
-    status,
-    RTEMS_TOO_MANY,
-    "rtems_message_queue_send too many to limited queue"
-  );
-  puts(
-    "TA1 - rtems_message_queue_send - BUFFER 4 TO Q 1 - RTEMS_TOO_MANY"
-  );
-
-  status = rtems_message_queue_delete( Queue_id[ 1 ] );
-  directive_failed( status, "rtems_message_queue_delete successful" );
-  puts( "TA1 - rtems_message_queue_delete - Q 1 - RTEMS_SUCCESSFUL" );
-
-  status = rtems_message_queue_create(
-    Queue_name[ 1 ],
-    3,
-    16,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Queue_id[ 1 ]
-  );
-  directive_failed( status, "rtems_message_queue_create successful" );
-  puts(
-    "TA1 - rtems_message_queue_create - Q 1 - 3 DEEP - RTEMS_SUCCESSFUL"
-  );
-
-  puts( "TA1 - rtems_task_start - start TA3 - RTEMS_SUCCESSFUL" );
-  status = rtems_task_start( Task_id[ 3 ], Task_3, 0 );
-  directive_failed( status, "rtems_task_start of TA3" );
-
-  puts( "TA1 - rtems_task_wake_after - yield processor - RTEMS_SUCCESSFUL" );
-  status = rtems_task_wake_after( RTEMS_YIELD_PROCESSOR );
-  directive_failed( status, "rtems_task_wake_after (yield)" );
-
-  puts( "TA1 - rtems_message_queue_delete - delete Q 1 - RTEMS_SUCCESSFUL" );
-  status = rtems_message_queue_delete( Queue_id[ 1 ] );
-  directive_failed( status, "rtems_message_queue_delete successful" );
-
-  puts( "TA1 - rtems_task_wake_after - yield processor - RTEMS_SUCCESSFUL" );
-  status = rtems_task_wake_after( RTEMS_YIELD_PROCESSOR );
-  directive_failed( status, "rtems_task_wake_after (yield)" );
-}
diff --git a/testsuites/sptests/sp09/screen09.c b/testsuites/sptests/sp09/screen09.c
deleted file mode 100644
index a932c38e7c..0000000000
--- a/testsuites/sptests/sp09/screen09.c
+++ /dev/null
@@ -1,152 +0,0 @@
-/*  Screen9
- *
- *  This routine generates error screen 9 for test 9.
- *
- *  Input parameters:  NONE
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-void Screen9()
-{
-  void              *converted;
-  rtems_status_code status;
-  rtems_isr_entry   old_service_routine;
-
-  status = rtems_interrupt_catch(
-    Service_routine,
-    ISR_INTERRUPT_MAXIMUM_VECTOR_NUMBER + 10,
-    &old_service_routine
-  );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_NUMBER,
-    "rtems_interrupt_catch with invalid vector"
-  );
-  puts( "TA1 - rtems_interrupt_catch - RTEMS_INVALID_NUMBER" );
-
-  status = rtems_interrupt_catch( NULL, 3, &old_service_routine );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_ADDRESS,
-    "rtems_interrupt_catch with invalid handler"
-  );
-  puts( "TA1 - rtems_interrupt_catch - bad handler RTEMS_INVALID_ADDRESS" );
-
-  status = rtems_interrupt_catch( Service_routine, 3, NULL );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_ADDRESS,
-    "rtems_interrupt_catch with invalid old isr pointer"
-  );
-  puts( "TA1 - rtems_interrupt_catch - old isr RTEMS_INVALID_ADDRESS" );
-
-  status = rtems_signal_send( 100, RTEMS_SIGNAL_1 );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_ID,
-    "rtems_signal_send with illegal id"
-  );
-  puts( "TA1 - rtems_signal_send - RTEMS_INVALID_ID" );
-
-  status = rtems_signal_send( RTEMS_SELF, RTEMS_SIGNAL_16 );
-  fatal_directive_status(
-    status,
-    RTEMS_NOT_DEFINED,
-    "rtems_signal_send with no handler"
-  );
-  puts( "TA1 - rtems_signal_send - RTEMS_NOT_DEFINED" );
-
-  status = rtems_port_create(
-     0,
-     Internal_port_area,
-     External_port_area,
-     sizeof( Internal_port_area ),
-     &Junk_id
-  );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_NAME,
-    "rtems_port_create with illegal name"
-  );
-  puts( "TA1 - rtems_port_create - RTEMS_INVALID_NAME" );
-
-  status = rtems_port_create(
-     Port_name[ 1 ],
-     &((char *)Internal_port_area)[ 1 ],
-     External_port_area,
-     sizeof( Internal_port_area ),
-     &Junk_id
-  );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_ADDRESS,
-    "rtems_port_create with illegal address"
-  );
-  puts( "TA1 - rtems_port_create - RTEMS_INVALID_ADDRESS" );
-
-  status = rtems_port_create(
-     Port_name[ 1 ],
-     Internal_port_area,
-     External_port_area,
-     sizeof( Internal_port_area ),
-     &Junk_id
-  );
-  fatal_directive_status(
-    status,
-    RTEMS_TOO_MANY,
-    "rtems_port_create of too many"
-  );
-  puts( "TA1 - rtems_port_create - RTEMS_TOO_MANY" );
-
-  status = rtems_port_delete( 0 );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_ID,
-    "rtems_port_delete with illegal id"
-  );
-  puts( "TA1 - rtems_port_delete - RTEMS_INVALID_ID" );
-
-  status = rtems_port_ident( 0, &Junk_id );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_NAME,
-    "rtems_port_ident with illegal name"
-  );
-  puts( "TA1 - rtems_port_ident - RTEMS_INVALID_NAME" );
-
-  status = rtems_port_external_to_internal(
-    100,
-    Internal_port_area,
-    &converted
-  );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_ID,
-    "rtems_port_external_to_internal with illegal id"
-  );
-  puts( "TA1 - rtems_port_external_to_internal - RTEMS_INVALID_ID" );
-  status = rtems_port_internal_to_external(
-    100,
-    Internal_port_area,
-    &converted
-  );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_ID,
-    "rtems_port_internal_to_external with illegal id"
-  );
-  puts( "TA1 - rtems_port_internal_to_external - RTEMS_INVALID_ID" );
-}
diff --git a/testsuites/sptests/sp09/screen10.c b/testsuites/sptests/sp09/screen10.c
deleted file mode 100644
index bb09ab2d7e..0000000000
--- a/testsuites/sptests/sp09/screen10.c
+++ /dev/null
@@ -1,164 +0,0 @@
-/*  Screen10
- *
- *  This routine generates error screen 10 for test 9.
- *
- *  Input parameters:  NONE
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-void Screen10()
-{
-  rtems_status_code status;
-
-  status = rtems_rate_monotonic_create( 0, &Junk_id );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_NAME,
-    "rtems_rate_monotonic_create with illegal name"
-  );
-  puts( "TA1 - rtems_rate_monotonic_create - RTEMS_INVALID_NAME" );
-
-  status = rtems_rate_monotonic_create( Period_name[ 1 ], &Period_id[ 1 ] );
-  directive_failed( status, "rtems_rate_monotonic_create successful" );
-  puts( "TA1 - rtems_rate_monotonic_create - RTEMS_SUCCESSFUL" );
-
-  status = rtems_rate_monotonic_create( Period_name[ 1 ], &Junk_id );
-  fatal_directive_status(
-    status,
-    RTEMS_TOO_MANY,
-    "rtems_rate_monotonic_create of too many"
-  );
-  puts( "TA1 - rtems_rate_monotonic_create - RTEMS_TOO_MANY" );
-
-  status = rtems_rate_monotonic_ident( 0, &Junk_id );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_NAME,
-    "rtems_rate_monotonic_ident with illegal name"
-  );
-  puts( "TA1 - rtems_rate_monotonic_ident - RTEMS_INVALID_NAME" );
-
-  status = rtems_rate_monotonic_period( 100, 5 );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_ID,
-    "rtems_rate_monotonic_period with illegal id"
-  );
-  puts( "TA1 - rtems_rate_monotonic_period - unknown RTEMS_INVALID_ID" );
-
-  status = rtems_rate_monotonic_period( 0x10100, 5 );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_ID,
-    "rtems_rate_monotonic_period with illegal id"
-  );
-  puts( "TA1 - rtems_rate_monotonic_period - local RTEMS_INVALID_ID" );
-
-  status = rtems_rate_monotonic_period( Period_id[ 1 ], RTEMS_PERIOD_STATUS );
-  fatal_directive_status(
-    status,
-    RTEMS_NOT_DEFINED,
-    "rtems_rate_monotonic_period status not defined"
-  );
-  puts(
-    "TA1 - rtems_rate_monotonic_period(RTEMS_PERIOD_STATUS) - RTEMS_NOT_DEFINED"
-  );
-
-  status = rtems_rate_monotonic_period( Period_id[ 1 ], 100 );
-  directive_failed( status, "rtems_rate_monotonic_period successful" );
-  puts( "TA1 - rtems_rate_monotonic_period - 100 ticks - RTEMS_SUCCESSFUL" );
-
-  status = rtems_rate_monotonic_period( Period_id[ 1 ], RTEMS_PERIOD_STATUS );
-  directive_failed( status, "rtems_rate_monotonic_period status" );
-  puts(
-    "TA1 - rtems_rate_monotonic_period(RTEMS_PERIOD_STATUS) - RTEMS_SUCCESSFUL"
-  );
-
-  while ( FOREVER ) {
-
-     status = rtems_rate_monotonic_period(Period_id[ 1 ], RTEMS_PERIOD_STATUS);
-
-     if ( status == RTEMS_TIMEOUT ) break;
-
-     directive_failed(
-       status,
-       "rtems_rate_monotonic_period waiting for timeout"
-     );
-  }
-  puts(
-    "TA1 - rtems_rate_monotonic_period(RTEMS_PERIOD_STATUS) - RTEMS_TIMEOUT"
-  );
-
-  status = rtems_rate_monotonic_cancel( 100 );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_ID,
-    "rtems_rate_monotonic_cancel with illegal id"
-  );
-  puts( "TA1 - rtems_rate_monotonic_cancel - unknown RTEMS_INVALID_ID" );
-
-  status = rtems_rate_monotonic_cancel( 0x10100 );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_ID,
-    "rtems_rate_monotonic_cancel will illegal id"
-  );
-  puts( "TA1 - rtems_rate_monotonic_cancel - local RTEMS_INVALID_ID" );
-
-  status = rtems_rate_monotonic_cancel( Period_id[ 1 ] );
-  directive_failed( status, "rtems_rate_monotonic_cancel" );
-  puts( "TA1 - rtems_rate_monotonic_cancel - RTEMS_SUCCESSFUL" );
-
-  status = rtems_rate_monotonic_period( Period_id[ 1 ], 5 );
-  directive_failed( status, "rtems_rate_monotonic_period restart" );
-
-  status = rtems_task_wake_after( 1 * TICKS_PER_SECOND );
-  directive_failed( status, "rtems_task_wake_after" );
-
-  status = rtems_rate_monotonic_period( Period_id[ 1 ], 5 );
-  fatal_directive_status(
-    status,
-    RTEMS_TIMEOUT,
-    "rtems_rate_monotonic_period"
-  );
-  puts( "TA1 - rtems_rate_monotonic_period - 5 ticks - RTEMS_TIMEOUT" );
-
-  status = rtems_task_start( Task_id[ 4 ], Task_4, 0 );
-  directive_failed( status, "rtems_task_start of TA4" );
-
-  puts( "TA1 - yielding to TA4" );
-  status = rtems_task_wake_after( RTEMS_YIELD_PROCESSOR );
-
-  status = rtems_rate_monotonic_delete( 100 );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_ID,
-    "rtems_rate_monotonic_delete with illegal id"
-  );
-  puts( "TA1 - rtems_rate_monotonic_delete - unknown RTEMS_INVALID_ID" );
-
-  status = rtems_rate_monotonic_delete( 0x10100 );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_ID,
-    "rtems_rate_monotonic_delete with illegal id"
-  );
-  puts( "TA1 - rtems_rate_monotonic_delete - local RTEMS_INVALID_ID" );
-
-  status = rtems_rate_monotonic_delete( Period_id[ 1 ] );
-  directive_failed( status, "rtems_rate_monotonic_delete" );
-  puts( "TA1 - rtems_rate_monotonic_delete - RTEMS_SUCCESSFUL" );
-}
diff --git a/testsuites/sptests/sp09/screen11.c b/testsuites/sptests/sp09/screen11.c
deleted file mode 100644
index 7857a98c95..0000000000
--- a/testsuites/sptests/sp09/screen11.c
+++ /dev/null
@@ -1,250 +0,0 @@
-/*  Screen11
- *
- *  This routine generates error screen 11 for test 9.
- *
- *  Input parameters:  NONE
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-void Screen11()
-{
-  void              *buffer_address_1;
-  void              *buffer_address_2;
-  void              *buffer_address_3;
-  rtems_status_code  status;
-
-  status = rtems_partition_create(
-    0,
-    Partition_good_area,
-    128,
-    40,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Junk_id
-  );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_NAME,
-    "rtems_partition_create with illegal name"
-  );
-  puts( "TA1 - rtems_partition_create - RTEMS_INVALID_NAME" );
-
-  status = rtems_partition_create(
-    Partition_name[ 1 ],
-    Partition_good_area,
-    0,
-    80,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Junk_id
-  );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_SIZE,
-    "rtems_partition_create with illegal length"
-  );
-  puts( "TA1 - rtems_partition_create - length - RTEMS_INVALID_SIZE" );
-
-  status = rtems_partition_create(
-    Partition_name[ 1 ],
-    Partition_good_area,
-    128,
-    0,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Junk_id
-  );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_SIZE,
-    "rtems_partition_create with illegal buffer size"
-  );
-  puts( "TA1 - rtems_partition_create - buffer size - RTEMS_INVALID_SIZE" );
-
-  status = rtems_partition_create(
-    Partition_name[ 1 ],
-    Partition_good_area,
-    128,
-    256,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Junk_id
-  );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_SIZE,
-    "rtems_partition_create with buffer_size > length"
-  );
-  puts(
-    "TA1 - rtems_partition_create - length < buffer size - RTEMS_INVALID_SIZE"
-  );
-
-  status = rtems_partition_create(
-    Partition_name[ 1 ],
-    Partition_good_area,
-    128,
-    64,
-    RTEMS_GLOBAL,
-    &Junk_id
-  );
-  fatal_directive_status(
-    status,
-    RTEMS_MP_NOT_CONFIGURED,
-    "rtems_partition_create of global"
-  );
-  puts( "TA1 - rtems_partition_create - RTEMS_MP_NOT_CONFIGURED" );
-
-  status = rtems_partition_create(
-    Partition_name[ 1 ],
-    Partition_bad_area,
-    128,
-    64,
-    RTEMS_GLOBAL,
-    &Junk_id
-  );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_ADDRESS,
-    "rtems_partition_create with bad address"
-  );
-  puts( "TA1 - rtems_partition_create - RTEMS_INVALID_ADDRESS" );
-
-  status = rtems_partition_create(
-    Partition_name[ 1 ],
-    Partition_good_area,
-    128,
-    34,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Junk_id
-  );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_SIZE,
-    "rtems_partition_create with unaligned buffer_size"
-  );
-  puts( "TA1 - rtems_partition_create - RTEMS_INVALID_SIZE" );
-
-  status = rtems_partition_delete( 100 );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_ID,
-    "rtems_partition_delete with illegal id"
-  );
-  puts( "TA1 - rtems_partition_delete - unknown RTEMS_INVALID_ID" );
-
-  status = rtems_partition_delete( 0x10100 );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_ID,
-    "rtems_partition_delete with illegal id"
-  );
-  puts( "TA1 - rtems_partition_delete - local RTEMS_INVALID_ID" );
-
-  status = rtems_partition_get_buffer( 100, &buffer_address_1 );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_ID,
-    "rtems_partition_get_buffer with illegal id"
-  );
-  puts( "TA1 - rtems_partition_get_buffer - RTEMS_INVALID_ID" );
-
-  status = rtems_partition_ident( 0, RTEMS_SEARCH_ALL_NODES, &Junk_id );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_NAME,
-    "rtems_partition_ident with illegal name"
-  );
-  puts( "TA1 - rtems_partition_ident - RTEMS_INVALID_NAME" );
-
-  status = rtems_partition_return_buffer( 100, buffer_address_1 );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_ID,
-    "rtems_partition_return_buffer with illegal id"
-  );
-  puts( "TA1 - rtems_partition_return_buffer - RTEMS_INVALID_ID" );
-
-  status = rtems_partition_create(
-    Partition_name[ 1 ],
-    Partition_good_area,
-    128,
-    64,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Partition_id[ 1 ]
-  );
-  directive_failed( status, "rtems_partition_create" );
-  puts( "TA1 - rtems_partition_create - RTEMS_SUCCESSFUL" );
-
-  status = rtems_partition_create(
-    Partition_name[ 1 ],
-    Partition_good_area,
-    128,
-    32,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Junk_id
-  );
-  fatal_directive_status(
-    status,
-    RTEMS_TOO_MANY,
-    "rtems_partition_create of too many"
-  );
-  puts( "TA1 - rtems_partition_create - RTEMS_TOO_MANY" );
-
-  status = rtems_partition_get_buffer( Partition_id[ 1 ], &buffer_address_1 );
-  directive_failed( status, "rtems_partition_get_buffer");
-  puts( "TA1 - rtems_partition_get_buffer - RTEMS_SUCCESSFUL" );
-
-  status = rtems_partition_get_buffer( Partition_id[ 1 ], &buffer_address_2 );
-  directive_failed( status, "rtems_partition_get_buffer" );
-  puts( "TA1 - rtems_partition_get_buffer - RTEMS_SUCCESSFUL" );
-
-  status = rtems_partition_get_buffer( Partition_id[ 1 ], &buffer_address_3 );
-  fatal_directive_status(
-    status,
-    RTEMS_UNSATISFIED,
-    "rtems_partition_get_buffer unsatisfied"
-  );
-  puts( "TA1 - rtems_partition_get_buffer - RTEMS_UNSATISFIED" );
-
-  status = rtems_partition_delete( Partition_id[ 1 ] );
-  fatal_directive_status(
-    status,
-    RTEMS_RESOURCE_IN_USE,
-    "rtems_partition_delete with buffers in use"
-  );
-  puts( "TA1 - rtems_partition_delete - RTEMS_RESOURCE_IN_USE" );
-
-  status = rtems_partition_return_buffer(
-    Partition_id[ 1 ],
-    Region_good_area                  /* NOTE: Region Memory */
-  );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_ADDRESS,
-    "rtems_partition_return_buffer with buffer address out of partition"
-  );
-  puts(
-    "TA1 - rtems_partition_return_buffer - RTEMS_INVALID_ADDRESS - out of range"
-  );
-
-  status = rtems_partition_return_buffer(
-    Partition_id[ 1 ],
-    &Partition_good_area[ 7 ]
-  );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_ADDRESS,
-    "rtems_partition_return_buffer with buffer address not on boundary"
-  );
-  puts_nocr( "TA1 - rtems_partition_return_buffer - " );
-  puts     ( "RTEMS_INVALID_ADDRESS - not on boundary");
-}
diff --git a/testsuites/sptests/sp09/screen12.c b/testsuites/sptests/sp09/screen12.c
deleted file mode 100644
index 281885994a..0000000000
--- a/testsuites/sptests/sp09/screen12.c
+++ /dev/null
@@ -1,337 +0,0 @@
-/*  Screen12
- *
- *  This routine generates error screen 12 for test 9.
- *
- *  Input parameters:  NONE
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-void Screen12()
-{
-  void              *segment_address_1;
-  void              *segment_address_2;
-  void              *segment_address_3;
-  rtems_unsigned32   offset;
-  rtems_unsigned32   good_front_flag;
-  rtems_unsigned32   good_back_flag;
-  rtems_status_code  status;
-
-  status = rtems_region_create(
-    0,
-    Region_good_area,
-    0x40,
-    32,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Junk_id
-  );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_NAME,
-    "rtems_region_create with illegal name"
-  );
-  puts( "TA1 - rtems_region_create - RTEMS_INVALID_NAME" );
-
-  status = rtems_region_create(
-    Region_name[ 1 ],
-    Region_bad_area,
-    0x40,
-    32,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Junk_id
-  );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_ADDRESS,
-    "rtems_region_create with illegal address"
-  );
-  puts( "TA1 - rtems_region_create - RTEMS_INVALID_ADDRESS" );
-
-  status = rtems_region_create(
-    Region_name[ 1 ],
-    Region_good_area,
-    0x40,
-    34,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Junk_id
-  );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_SIZE,
-    "rtems_region_create with illegal size"
-  );
-  puts( "TA1 - rtems_region_create - RTEMS_INVALID_SIZE" );
-
-  status = rtems_region_create(
-    Region_name[ 1 ],
-    &Region_good_area[ REGION_START_OFFSET ],
-    REGION_LENGTH,
-    0x40,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Region_id[ 1 ]
-  );
-  directive_failed( status, "rtems_region_create" );
-  puts( "TA1 - rtems_region_create - RTEMS_SUCCESSFUL" );
-
-  status = rtems_region_create(
-    Region_name[ 1 ],
-    Region_good_area,
-    REGION_LENGTH,
-    0x40,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Junk_id
-  );
-  fatal_directive_status(
-    status,
-    RTEMS_TOO_MANY,
-    "rtems_region_create of too many"
-  );
-  puts( "TA1 - rtems_region_create - RTEMS_TOO_MANY" );
-
-  status = rtems_region_delete( 100 );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_ID,
-    "rtems_region_delete with illegal id"
-  );
-  puts( "TA1 - rtems_region_delete - unknown RTEMS_INVALID_ID" );
-
-  status = rtems_region_delete( 0x10100 );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_ID,
-    "rtems_region_delete with illegal id"
-  );
-  puts( "TA1 - rtems_region_delete - local RTEMS_INVALID_ID" );
-
-  status = rtems_region_ident( 0, &Junk_id );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_NAME,
-    "rtems_region_ident with illegal name"
-  );
-  puts( "TA1 - rtems_region_ident - RTEMS_INVALID_NAME" );
-
-  status = rtems_region_get_segment(
-    100,
-    0x40,
-    RTEMS_DEFAULT_OPTIONS,
-    RTEMS_NO_TIMEOUT,
-    &segment_address_1
-  );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_ID,
-    "rtems_region_get_segment with illegal id"
-  );
-  puts( "TA1 - rtems_region_get_segment - RTEMS_INVALID_ID" );
-
-  status = rtems_region_get_segment(
-     Region_id[ 1 ],
-     sizeof( Region_good_area ) * 2,
-     RTEMS_DEFAULT_OPTIONS,
-     RTEMS_NO_TIMEOUT,
-     &segment_address_1
-  );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_SIZE,
-    "rtems_region_get_segment with illegal size"
-  );
-  puts( "TA1 - rtems_region_get_segment - RTEMS_INVALID_SIZE" );
-
-  status = rtems_region_get_segment(
-     Region_id[ 1 ],
-     384,
-     RTEMS_DEFAULT_OPTIONS,
-     RTEMS_NO_TIMEOUT,
-     &segment_address_1
-  );
-  directive_failed( status, "rtems_region_get_segment" );
-  puts( "TA1 - rtems_region_get_segment - RTEMS_SUCCESSFUL" );
-
-  status = rtems_region_get_segment(
-     Region_id[ 1 ],
-     REGION_LENGTH / 2,
-     RTEMS_NO_WAIT,
-     RTEMS_NO_TIMEOUT,
-     &segment_address_2
-  );
-  fatal_directive_status(
-    status,
-    RTEMS_UNSATISFIED,
-    "rtems_region_get_segment unsatisfied"
-  );
-  puts( "TA1 - rtems_region_get_segment - RTEMS_UNSATISFIED" );
-
-  puts( "TA1 - rtems_region_get_segment - timeout in 3 seconds" );
-  status = rtems_region_get_segment(
-    Region_id[ 1 ],
-    128,
-    RTEMS_DEFAULT_OPTIONS,
-    3 * TICKS_PER_SECOND,
-    &segment_address_3
-  );
-  fatal_directive_status(
-    status,
-    RTEMS_TIMEOUT,
-    "rtems_region_get_segment timeout"
-  );
-  puts( "TA1 - rtems_region_get_segment - woke up with RTEMS_TIMEOUT" );
-
-  status = rtems_region_delete( Region_id[ 1 ] );
-  fatal_directive_status(
-    status,
-    RTEMS_RESOURCE_IN_USE,
-    "rtems_region_delete with buffers in use"
-  );
-  puts( "TA1 - rtems_region_delete - RTEMS_RESOURCE_IN_USE" );
-
-  status = rtems_region_return_segment( 100, segment_address_1 );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_ID,
-    "rtems_region_return_segment with illegal id"
-  );
-  puts( "TA1 - rtems_region_return_segment - RTEMS_INVALID_ID" );
-
-  status = rtems_region_return_segment( Region_id[ 1 ], Region_good_area );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_ADDRESS,
-    "rtems_region_return_segment with illegal segment"
-  );
-  puts( "TA1 - rtems_region_return_segment - RTEMS_INVALID_ADDRESS" );
-
-/*
- *  The following generate internal heap errors.  Thus this code
- *  is subject to change if the heap code changes.
- */
-
-  puts( "TA1 - rtems_debug_disable - RTEMS_DEBUG_REGION" );
-  rtems_debug_disable( RTEMS_DEBUG_REGION );
-
-#if 0
-
-  offset = (segment_address_1 - (void *)Region_good_area) / 4;
-
-/* bad FRONT_FLAG error */
-
-  good_front_flag = Region_good_area[ offset - 1 ];
-  Region_good_area[ offset - 1 ] = good_front_flag + 2;
-
-  status = rtems_region_return_segment( Region_id[ 1 ], segment_address_1 );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_ADDRESS,
-    "rtems_region_return_segment with back_flag != front_flag"
-  );
-  puts( "TA1 - rtems_region_return_segment - RTEMS_INVALID_ADDRESS" );
-
-  Region_good_area[ offset - 1 ] = good_front_flag;
-
-/* bad FRONT_FLAG error */
-
-  good_back_flag = Region_good_area[ offset - 2 ];
-  Region_good_area[ offset - 2 ] = 1024;
-
-  status = rtems_region_return_segment( Region_id[ 1 ], segment_address_1 );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_ADDRESS,
-    "rtems_region_return_segment with back_flag != front_flag"
-  );
-  puts( "TA1 - rtems_region_return_segment - RTEMS_INVALID_ADDRESS" );
-
-  Region_good_area[ offset - 2 ] = good_back_flag;
-
-#else
-  offset = 0;
-  good_front_flag = 0;
-  good_back_flag = 0;
-  puts( "TA1 - rtems_region_return_segment - RTEMS_INVALID_ADDRESS - SKIPPED" );
-  puts( "TA1 - rtems_region_return_segment - RTEMS_INVALID_ADDRESS - SKIPPED" );
-#endif
-
-  puts( "TA1 - rtems_debug_enable - RTEMS_DEBUG_REGION" );
-  rtems_debug_enable( RTEMS_DEBUG_REGION );
-
-  status = rtems_region_extend(
-    100,
-    Region_good_area,
-    128
-  );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_ID,
-    "rtems_region_extend with illegal id"
-  );
-  puts( "TA1 - rtems_region_extend - RTEMS_INVALID_ID" );
-
-  status = rtems_region_extend(
-    Region_id[ 1 ],
-    &Region_good_area[ REGION_START_OFFSET + 16 ],
-    128
-  );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_ADDRESS,
-    "rtems_region_extend with illegal starting address"
-  );
-  puts( "TA1 - rtems_region_extend - within heap - RTEMS_INVALID_ADDRESS" );
-
-  status = rtems_region_extend(
-    Region_id[ 1 ],
-    Region_bad_area,
-    128
-  );
-  fatal_directive_status(
-    status,
-    RTEMS_NOT_IMPLEMENTED,
-    "rtems_region_extend with unsupported starting address"
-  );
-  puts(
-    "TA1 - rtems_region_extend - non-contiguous lower - RTEMS_NOT_IMPLEMENTED"
-  );
-
-  status = rtems_region_extend(
-    Region_id[ 1 ],
-    &Region_good_area[ REGION_START_OFFSET - REGION_LENGTH ],
-    128
-  );
-  fatal_directive_status(
-    status,
-    RTEMS_NOT_IMPLEMENTED,
-    "rtems_region_extend with unsupported starting address"
-  );
-  puts(
-    "TA1 - rtems_region_extend - contiguous lower - RTEMS_NOT_IMPLEMENTED"
-  );
-
-  status = rtems_region_extend(
-    Region_id[ 1 ],
-    &Region_good_area[ REGION_START_OFFSET + REGION_LENGTH + 16 ],
-    128
-  );
-  fatal_directive_status(
-    status,
-    RTEMS_NOT_IMPLEMENTED,
-    "rtems_region_extend with unsupported starting address"
-  );
-  puts(
-    "TA1 - rtems_region_extend - non-contiguous higher - RTEMS_NOT_IMPLEMENTED"
-  );
-
-}
diff --git a/testsuites/sptests/sp09/screen13.c b/testsuites/sptests/sp09/screen13.c
deleted file mode 100644
index 5aee5a3995..0000000000
--- a/testsuites/sptests/sp09/screen13.c
+++ /dev/null
@@ -1,114 +0,0 @@
-/*  Screen13
- *
- *  This routine generates error screen 13 for test 9.
- *
- *  Input parameters:  NONE
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-void Screen13()
-{
-  rtems_time_of_day time;
-  rtems_status_code status;
-
-  status = rtems_io_close( 0xffff, 0x0000, NULL);
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_NUMBER,
-    "rtems_io_close with bad major number"
-  );
-  puts( "TA1 - rtems_io_close - RTEMS_INVALID_NUMBER" );
-  status = rtems_io_control( 0xffff, 0x00000, NULL);
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_NUMBER,
-    "rtems_io_close with bad major number"
-  );
-  puts( "TA1 - rtems_io_control - RTEMS_INVALID_NUMBER" );
-  status = rtems_io_initialize( 0xffff, 0x00000, NULL);
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_NUMBER,
-    "rtems_io_initialize with bad major number"
-  );
-  puts( "TA1 - rtems_io_initialize - RTEMS_INVALID_NUMBER" );
-  status = rtems_io_open( 0xffff, 0x00000, NULL);
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_NUMBER,
-    "rtems_io_open with bad major number"
-  );
-  puts( "TA1 - rtems_io_open - RTEMS_INVALID_NUMBER" );
-  status = rtems_io_read( 0xffff, 0x00000, NULL);
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_NUMBER,
-    "rtems_io_read with bad major number"
-  );
-  puts( "TA1 - rtems_io_read - RTEMS_INVALID_NUMBER" );
-  status = rtems_io_write( 0xffff, 0x0ffff, NULL);
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_NUMBER,
-    "rtems_io_write with bad major number"
-  );
-  puts( "TA1 - rtems_io_write - RTEMS_INVALID_NUMBER" );
-
-  build_time( &time, 12, 31, 2000, 23, 59, 59, 0 );
-  status = rtems_clock_set( &time );
-  directive_failed( status, "rtems_clock_set" );
-  print_time( "TA1 - rtems_clock_set - ", &time, " - RTEMS_SUCCESSFUL\n" );
-  status = rtems_task_wake_after( 1 * TICKS_PER_SECOND );
-  status = rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time );
-  directive_failed( status, "rtems_clock_set" );
-  print_time( "TA1 - rtems_clock_get - ", &time, " - RTEMS_SUCCESSFUL\n" );
-
-  build_time( &time, 12, 31, 1999, 23, 59, 59, 0 );
-  status = rtems_clock_set( &time );
-  directive_failed( status, "rtems_clock_set" );
-  print_time( "TA1 - rtems_clock_set - ", &time, " - RTEMS_SUCCESSFUL\n" );
-  status = rtems_task_wake_after( 1 * TICKS_PER_SECOND );
-  status = rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time );
-  directive_failed( status, "rtems_clock_set" );
-  print_time( "TA1 - rtems_clock_get - ", &time, " - RTEMS_SUCCESSFUL\n" );
-
-  build_time( &time, 12, 31, 2100, 23, 59, 59, 0 );
-  status = rtems_clock_set( &time );
-  directive_failed( status, "rtems_clock_set" );
-  print_time( "TA1 - rtems_clock_set - ", &time, " - RTEMS_SUCCESSFUL\n" );
-  status = rtems_task_wake_after( 1 * TICKS_PER_SECOND );
-  status = rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time );
-  directive_failed( status, "rtems_clock_set" );
-  print_time( "TA1 - rtems_clock_get - ", &time, " - RTEMS_SUCCESSFUL\n" );
-
-  build_time( &time, 12, 31, 2099, 23, 59, 59, 0 );
-  status = rtems_clock_set( &time );
-  directive_failed( status, "rtems_clock_set" );
-  print_time( "TA1 - rtems_clock_set - ", &time, " - RTEMS_SUCCESSFUL\n" );
-  status = rtems_task_wake_after( 1 * TICKS_PER_SECOND );
-  status = rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time );
-  directive_failed( status, "rtems_clock_set" );
-  print_time( "TA1 - rtems_clock_get - ", &time, " - RTEMS_SUCCESSFUL\n" );
-
-  build_time( &time, 12, 31, 1991, 23, 59, 59, 0 );
-  status = rtems_clock_set( &time );
-  directive_failed( status, "rtems_clock_set" );
-  print_time( "TA1 - rtems_clock_set - ", &time, " - RTEMS_SUCCESSFUL\n" );
-  status = rtems_task_wake_after( 1 * TICKS_PER_SECOND );
-  status = rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time );
-  directive_failed( status, "rtems_clock_set" );
-  print_time( "TA1 - rtems_clock_get - ", &time, " - RTEMS_SUCCESSFUL\n" );
-}
diff --git a/testsuites/sptests/sp09/screen14.c b/testsuites/sptests/sp09/screen14.c
deleted file mode 100644
index a53ac99ee4..0000000000
--- a/testsuites/sptests/sp09/screen14.c
+++ /dev/null
@@ -1,154 +0,0 @@
-/*  Screen14
- *
- *  This routine generates error screen 14 for test 9.
- *
- *  Input parameters:  NONE
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-void Screen14()
-{
-  rtems_status_code  status;
-  rtems_time_of_day  time;
-
-  status = rtems_timer_create( 0, &Junk_id );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_NAME,
-    "rtems_timer_create with illegal name"
-  );
-  puts( "TA1 - rtems_timer_create - RTEMS_INVALID_NAME" );
-
-  status = rtems_timer_create( Timer_name[ 1 ], &Timer_id[ 1 ] );
-  directive_failed( status, "rtems_timer_create" );
-  puts( "TA1 - rtems_timer_create - 1 - RTEMS_SUCCESSFUL" );
-
-  status = rtems_timer_create( 2, &Junk_id );
-  fatal_directive_status(
-    status,
-    RTEMS_TOO_MANY,
-    "rtems_timer_create for too many"
-  );
-  puts( "TA1 - rtems_timer_create - 2 - RTEMS_TOO_MANY" );
-
-  status = rtems_timer_delete( 100 );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_ID,
-    "rtems_timer_delete with illegal id"
-  );
-  puts( "TA1 - rtems_timer_delete - local RTEMS_INVALID_ID" );
-
-  status = rtems_timer_delete( 0x010100 );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_ID,
-    "rtems_timer_delete with illegal id"
-  );
-  puts( "TA1 - rtems_timer_delete - global RTEMS_INVALID_ID" );
-
-  status = rtems_timer_ident( 0, &Junk_id );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_NAME,
-    "rtems_timer_ident with illegal name"
-  );
-  puts( "TA1 - rtems_timer_ident - RTEMS_INVALID_NAME" );
-
-  status = rtems_timer_cancel( 0x010100 );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_ID,
-    "rtems_timer_cancel with illegal id"
-  );
-  puts( "TA1 - rtems_timer_cancel - RTEMS_INVALID_ID" );
-
-  status = rtems_timer_reset( 0x010100 );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_ID,
-    "rtems_timer_reset with illegal id"
-  );
-  puts( "TA1 - rtems_timer_reset - RTEMS_INVALID_ID" );
-
-  status = rtems_timer_reset( Timer_id[ 1 ] );
-  fatal_directive_status(
-    status,
-    RTEMS_NOT_DEFINED,
-    "rtems_timer_reset before initiated"
-  );
-  puts( "TA1 - rtems_timer_reset - RTEMS_NOT_DEFINED" );
-
-  status = rtems_timer_fire_after(
-    0x010100,
-    5 * TICKS_PER_SECOND,
-    Delayed_routine,
-    NULL
-  );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_ID,
-    "rtems_timer_fire_after illegal id"
-  );
-  puts( "TA1 - rtems_timer_fire_after - RTEMS_INVALID_ID" );
-
-  build_time( &time, 12, 31, 1994, 9, 0, 0, 0 );
-  status = rtems_timer_fire_when( 0x010100, &time, Delayed_routine, NULL );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_ID,
-    "rtems_timer_fire_when with illegal id"
-  );
-  puts( "TA1 - rtems_timer_fire_when - RTEMS_INVALID_ID" );
-
-  status = rtems_timer_fire_after( Timer_id[ 1 ], 0, Delayed_routine, NULL );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_NUMBER,
-    "rtems_timer_fire_after with 0 ticks"
-  );
-  puts( "TA1 - rtems_timer_fire_after - RTEMS_INVALID_NUMBER" );
-
-  build_time( &time, 2, 5, 1987, 8, 30, 45, 0 );
-  status = rtems_timer_fire_when( Timer_id[ 1 ], &time, Delayed_routine, NULL );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_CLOCK,
-    "rtems_timer_fire_when with illegal time"
-  );
-  print_time(
-    "TA1 - rtems_timer_fire_when - ",
-    &time,
-    " - RTEMS_INVALID_CLOCK\n"
-  );
-
-  status = rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time );
-  directive_failed( status, "rtems_clock_set" );
-  print_time( "TA1 - rtems_clock_get       - ", &time, "\n" );
-
-  build_time( &time, 2, 5, 1990, 8, 30, 45, 0 );
-  status = rtems_timer_fire_when( Timer_id[ 1 ], &time, Delayed_routine, NULL );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_CLOCK,
-    "rtems_timer_fire_when before current time"
-  );
-  print_time(
-    "TA1 - rtems_timer_fire_when - ",
-    &time,
-    " - before RTEMS_INVALID_CLOCK\n"
-  );
-}
diff --git a/testsuites/sptests/sp09/sp09.doc b/testsuites/sptests/sp09/sp09.doc
deleted file mode 100644
index db8ec401bb..0000000000
--- a/testsuites/sptests/sp09/sp09.doc
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
-This file describes the directives and concepts tested by this test set.
-
-test set name:  test9
-
-directives:
-  ex_init, ex_start, tm_tick, i_return,
-  t_create,t_delete, t_getreg, t_ident, t_restart, t_resume, t_setpri,
-  t_setreg, t_start, t_suspend, tm_delete, tm_get,
-  tm_set, tm_wkafter, tm_wkwhen, ev_receive, ev_send, sm_create, sm_delete,
-  sm_ident, sm_p, sm_v, q_broadcast, q_create, q_delete, q_ident, q_receive,
-  q_send, q_urgent, as_catch, as_send, as_return, rn_create, rn_delete,
-  rn_getseg, rn_ident, rn_retseg, pt_create, pt_delete, pt_getbug, pt_ident,
-  pt_retbuf, de_close, de_cntrl, de_init, de_open, de_read, de_write
-
-concepts:
-
-  a.  Verifies all error codes returned by the executive in single
-      processor configurations.
-
-  b.  Verifies error conditions in the following kernel routines or macros:
-        _Ck_date_time, _Expired, _Q_submit, _Get_mnodes, _Get_node,
-        _Free_mem, _Get_mem, _Valid_block, _Set_tcb, _Set_resource,
-        _In_range, _On_boundary
diff --git a/testsuites/sptests/sp09/sp09.scn b/testsuites/sptests/sp09/sp09.scn
deleted file mode 100644
index 67471b8d7d..0000000000
--- a/testsuites/sptests/sp09/sp09.scn
+++ /dev/null
@@ -1,251 +0,0 @@
-*** TEST 9 ***
-INIT - rtems_task_create - RTEMS_INVALID_SIZE -- NOT CHECKED
-INIT - rtems_task_create - RTEMS_INVALID_PRIORITY
-INIT - rtems_task_restart - RTEMS_INCORRECT_STATE
-TA1 - rtems_task_delete - RTEMS_INVALID_ID
-TA1 - rtems_task_get_note - RTEMS_INVALID_NUMBER
-TA1 - rtems_task_get_note - RTEMS_INVALID_ID
-TA1 - rtems_task_ident - current task RTEMS_SUCCESSFUL
-TA1 - rtems_task_ident - global RTEMS_INVALID_NAME
-TA1 - rtems_task_ident - local RTEMS_INVALID_NAME
-TA1 - rtems_task_ident - RTEMS_INVALID_NODE
-TA1 - rtems_task_restart - RTEMS_INVALID_ID
-TA1 - rtems_task_resume - RTEMS_INVALID_ID
-TA1 - rtems_task_resume - RTEMS_INCORRECT_STATE
-TA1 - rtems_task_set_priority - RTEMS_INVALID_PRIORITY
-TA1 - rtems_task_set_priority - RTEMS_INVALID_ID
-TA1 - rtems_task_set_note - RTEMS_INVALID_NUMBER
-TA1 - rtems_task_set_note - RTEMS_INVALID_ID
-TA1 - rtems_task_start - RTEMS_INVALID_ID
-TA1 - rtems_task_start - RTEMS_INCORRECT_STATE
-TA1 - rtems_task_suspend - RTEMS_INVALID_ID
-<pause - screen 2>
-TA1 - rtems_clock_get - RTEMS_NOT_DEFINED
-TA1 - rtems_task_wake_when - RTEMS_NOT_DEFINED
-TA1 - rtems_timer_fire_when - RTEMS_NOT_DEFINED
-TA1 - rtems_clock_set - 08:30:45   02/05/1987 - RTEMS_INVALID_CLOCK
-TA1 - rtems_clock_set - 08:30:45   15/05/1988 - RTEMS_INVALID_CLOCK
-TA1 - rtems_clock_set - 08:30:45   02/32/1988 - RTEMS_INVALID_CLOCK
-TA1 - rtems_clock_set - 25:30:45   02/05/1988 - RTEMS_INVALID_CLOCK
-TA1 - rtems_clock_set - 08:61:45   02/05/1988 - RTEMS_INVALID_CLOCK
-TA1 - rtems_clock_set - 08:30:61   02/05/1988 - RTEMS_INVALID_CLOCK
-TA1 - rtems_clock_set - 08:30:45   02/05/1988 - RTEMS_INVALID_CLOCK
-TA1 - rtems_clock_set - 08:30:45   02/05/1988 - RTEMS_SUCCESSFUL
-TA1 - rtems_task_wake_when - TICKINVALID - sleep about 3 seconds
-TA1 - rtems_task_wake_when - TICKINVALID - woke up RTEMS_SUCCESSFUL
-TA1 - rtems_task_wake_when - 08:30:48   02/05/1961 - RTEMS_INVALID_CLOCK
-TA1 - rtems_task_wake_when - 25:30:48   02/05/1988 - RTEMS_INVALID_CLOCK
-TA1 - current time - 08:30:51   02/05/1988
-TA1 - rtems_task_wake_when - 08:30:51   01/05/1988 - RTEMS_INVALID_CLOCK
-<pause - screen 3>
-TA1 - rtems_task_create - RTEMS_INVALID_NAME
-TA1 - rtems_task_create - stack size - RTEMS_UNSATISFIED
-TA1 - rtems_task_create - TA2 created - RTEMS_SUCCESSFUL
-TA1 - rtems_task_suspend - suspend TA2 - RTEMS_SUCCESSFUL
-TA1 - rtems_task_suspend - suspend TA2 - RTEMS_ALREADY_SUSPENDED
-TA1 - rtems_task_resume - TA2 resumed - RTEMS_SUCCESSFUL
-TA1 - rtems_task_create - TA3 created - RTEMS_SUCCESSFUL
-TA1 - rtems_task_create - 4 created - RTEMS_SUCCESSFUL
-TA1 - rtems_task_create - 5 created - RTEMS_SUCCESSFUL
-TA1 - rtems_task_create - 6 created - RTEMS_SUCCESSFUL
-TA1 - rtems_task_create - 7 created - RTEMS_SUCCESSFUL
-TA1 - rtems_task_create - 8 created - RTEMS_SUCCESSFUL
-TA1 - rtems_task_create - 9 created - RTEMS_SUCCESSFUL
-TA1 - rtems_task_create - 10 created - RTEMS_SUCCESSFUL
-TA1 - rtems_task_create - 11 - RTEMS_TOO_MANY
-TA1 - rtems_task_create - RTEMS_MP_NOT_CONFIGURED
-<pause - screen 4>
-TA1 - rtems_event_receive - RTEMS_UNSATISFIED ( all conditions )
-TA1 - rtems_event_receive - RTEMS_UNSATISFIED ( any condition )
-TA1 - rtems_event_receive - timeout in 3 seconds
-TA1 - rtems_event_receive - woke up with RTEMS_TIMEOUT
-TA1 - rtems_event_send - RTEMS_INVALID_ID
-TA1 - rtems_task_wake_after - sleep 1 second - RTEMS_SUCCESSFUL
-TA1 - rtems_clock_set - 08:30:45   02/05/1988 - RTEMS_SUCCESSFUL
-<pause - screen 5>
-TA1 - rtems_semaphore_create - RTEMS_INVALID_NAME
-TA1 - rtems_semaphore_create - 1 - RTEMS_SUCCESSFUL
-TA1 - rtems_semaphore_create - 2 - RTEMS_SUCCESSFUL
-TA1 - rtems_semaphore_create - 3 - RTEMS_TOO_MANY
-TA1 - rtems_semaphore_create - RTEMS_NOT_DEFINED
-TA1 - rtems_semaphore_create - RTEMS_NOT_DEFINED
-TA1 - rtems_semaphore_create - RTEMS_INVALID_NUMBER
-TA1 - rtems_semaphore_create - RTEMS_MP_NOT_CONFIGURED
-TA1 - rtems_semaphore_delete - unknown RTEMS_INVALID_ID
-TA1 - rtems_semaphore_delete - local RTEMS_INVALID_ID
-TA1 - rtems_semaphore_ident - global RTEMS_INVALID_NAME
-TA1 - rtems_semaphore_ident - local RTEMS_INVALID_NAME
-<pause - screen 6>
-TA1 - rtems_semaphore_obtain - RTEMS_INVALID_ID
-TA1 - rtems_semaphore_obtain - got sem 1 - RTEMS_SUCCESSFUL
-TA1 - rtems_semaphore_obtain - RTEMS_UNSATISFIED
-TA1 - rtems_semaphore_obtain - timeout in 3 seconds
-TA1 - rtems_semaphore_obtain - woke up with RTEMS_TIMEOUT
-TA1 - rtems_semaphore_release - RTEMS_NOT_OWNER_OF_RESOURCE
-TA1 - rtems_semaphore_release - RTEMS_INVALID_ID
-TA1 - rtems_task_start - start TA2 - RTEMS_SUCCESSFUL
-TA1 - rtems_task_wake_after - yield processor - RTEMS_SUCCESSFUL
-TA2 - rtems_semaphore_obtain - sem 1 - RTEMS_WAIT FOREVER
-TA1 - rtems_semaphore_delete - delete sem 1 - RTEMS_SUCCESSFUL
-TA1 - rtems_semaphore_obtain - binary semaphore
-TA1 - rtems_semaphore_delete - delete sem 2 - RTEMS_RESOURCE_IN_USE
-TA1 - rtems_task_wake_after - yield processor - RTEMS_SUCCESSFUL
-TA2 - rtems_semaphore_obtain - woke up with RTEMS_OBJECT_WAS_DELETED
-TA2 - rtems_task_delete - delete self - RTEMS_SUCCESSFUL
-<pause - screen 7>
-TA1 - rtems_message_queue_broadcast - RTEMS_INVALID_ID
-TA1 - rtems_message_queue_create - Q 1 - RTEMS_INVALID_NAME
-TA1 - rtems_message_queue_create - Q 1 - RTEMS_MP_NOT_CONFIGURED
-TA1 - rtems_message_queue_create - Q 1 - 2 DEEP - RTEMS_SUCCESSFUL
-TA1 - rtems_message_queue_create - Q 2 - RTEMS_TOO_MANY
-TA1 - rtems_message_queue_delete - unknown RTEMS_INVALID_ID
-TA1 - rtems_message_queue_delete - local RTEMS_INVALID_ID
-TA1 - rtems_message_queue_ident - RTEMS_INVALID_NAME
-TA1 - rtems_message_queue_get_number_pending - RTEMS_INVALID_ID
-TA1 - rtems_message_queue_flush - RTEMS_INVALID_ID
-TA1 - rtems_message_queue_receive - RTEMS_INVALID_ID
-TA1 - rtems_message_queue_receive - Q 1 - RTEMS_UNSATISFIED
-TA1 - rtems_message_queue_receive - Q 1 - timeout in 3 seconds
-TA1 - rtems_message_queue_receive - Q 1 - woke up with RTEMS_TIMEOUT
-TA1 - rtems_message_queue_send - RTEMS_INVALID_ID
-TA1 - rtems_message_queue_send - BUFFER 1 TO Q 1 - RTEMS_SUCCESSFUL
-TA1 - rtems_message_queue_send - BUFFER 2 TO Q 1 - RTEMS_SUCCESSFUL
-TA1 - rtems_message_queue_send - BUFFER 3 TO Q 1 - RTEMS_TOO_MANY
-<pause - screen 8>
-TA1 - rtems_message_queue_delete - Q 1 - RTEMS_SUCCESSFUL
-TA1 - rtems_message_queue_create - Q 1 - 2 DEEP - RTEMS_SUCCESSFUL
-TA1 - rtems_message_queue_send - BUFFER 1 TO Q 1 - RTEMS_SUCCESSFUL
-TA1 - rtems_message_queue_send - BUFFER 2 TO Q 1 - RTEMS_SUCCESSFUL
-TA1 - rtems_message_queue_send - BUFFER 3 TO Q 1 - RTEMS_TOO_MANY
-TA1 - rtems_message_queue_delete - Q 1 - RTEMS_SUCCESSFUL
-TA1 - rtems_message_queue_create - Q 1 - 3 DEEP - RTEMS_SUCCESSFUL
-TA1 - rtems_message_queue_send - BUFFER 1 TO Q 1 - RTEMS_SUCCESSFUL
-TA1 - rtems_message_queue_send - BUFFER 2 TO Q 1 - RTEMS_SUCCESSFUL
-TA1 - rtems_message_queue_send - BUFFER 3 TO Q 1 - RTEMS_SUCCESSFUL
-TA1 - rtems_message_queue_send - BUFFER 4 TO Q 1 - RTEMS_TOO_MANY
-TA1 - rtems_message_queue_delete - Q 1 - RTEMS_SUCCESSFUL
-TA1 - rtems_message_queue_create - Q 1 - 3 DEEP - RTEMS_SUCCESSFUL
-TA1 - rtems_task_start - start TA3 - RTEMS_SUCCESSFUL
-TA1 - rtems_task_wake_after - yield processor - RTEMS_SUCCESSFUL
-TA3 - rtems_message_queue_receive - Q 1 - RTEMS_WAIT FOREVER
-TA1 - rtems_message_queue_delete - delete Q 1 - RTEMS_SUCCESSFUL
-TA1 - rtems_task_wake_after - yield processor - RTEMS_SUCCESSFUL
-TA3 - rtems_message_queue_receive - woke up with RTEMS_OBJECT_WAS_DELETED
-TA3 - rtems_task_delete - delete self - RTEMS_SUCCESSFUL
-<pause - screen 9>
-TA1 - rtems_interrupt_catch - RTEMS_INVALID_NUMBER
-TA1 - rtems_interrupt_catch - bad handler RTEMS_INVALID_ADDRESS
-TA1 - rtems_interrupt_catch - old isr RTEMS_INVALID_ADDRESS
-TA1 - rtems_signal_send - RTEMS_INVALID_ID
-TA1 - rtems_signal_send - RTEMS_NOT_DEFINED
-TA1 - rtems_port_create - RTEMS_INVALID_NAME
-TA1 - rtems_port_create - RTEMS_INVALID_ADDRESS
-TA1 - rtems_port_create - RTEMS_TOO_MANY
-TA1 - rtems_port_delete - RTEMS_INVALID_ID
-TA1 - rtems_port_ident - RTEMS_INVALID_NAME
-TA1 - rtems_port_external_to_internal - RTEMS_INVALID_ID
-TA1 - rtems_port_internal_to_external - RTEMS_INVALID_ID
-<pause - screen 10>
-TA1 - rtems_rate_monotonic_create - RTEMS_INVALID_NAME
-TA1 - rtems_rate_monotonic_create - RTEMS_SUCCESSFUL
-TA1 - rtems_rate_monotonic_create - RTEMS_TOO_MANY
-TA1 - rtems_rate_monotonic_ident - RTEMS_INVALID_NAME
-TA1 - rtems_rate_monotonic_period - unknown RTEMS_INVALID_ID
-TA1 - rtems_rate_monotonic_period - local RTEMS_INVALID_ID
-TA1 - rtems_rate_monotonic_period(RTEMS_PERIOD_STATUS) - RTEMS_NOT_DEFINED
-TA1 - rtems_rate_monotonic_period - 100 ticks - RTEMS_SUCCESSFUL
-TA1 - rtems_rate_monotonic_period(RTEMS_PERIOD_STATUS) - RTEMS_SUCCESSFUL
-TA1 - rtems_rate_monotonic_period(RTEMS_PERIOD_STATUS) - RTEMS_TIMEOUT
-TA1 - rtems_rate_monotonic_cancel - unknown RTEMS_INVALID_ID
-TA1 - rtems_rate_monotonic_cancel - local RTEMS_INVALID_ID
-TA1 - rtems_rate_monotonic_cancel - RTEMS_SUCCESSFUL
-TA1 - rtems_rate_monotonic_period - 5 ticks - RTEMS_TIMEOUT
-TA1 - yielding to TA4
-TA4 - rtems_rate_monotonic_cancel - RTEMS_NOT_OWNER_OF_RESOURCE
-TA4 - rtems_rate_monotonic_period - RTEMS_NOT_OWNER_OF_RESOURCE
-TA4 - rtems_task_delete - delete self - RTEMS_SUCCESSFUL
-TA1 - rtems_rate_monotonic_delete - unknown RTEMS_INVALID_ID
-TA1 - rtems_rate_monotonic_delete - local RTEMS_INVALID_ID
-TA1 - rtems_rate_monotonic_delete - RTEMS_SUCCESSFUL
-<pause - screen 11>
-TA1 - rtems_partition_create - RTEMS_INVALID_NAME
-TA1 - rtems_partition_create - length - RTEMS_INVALID_SIZE
-TA1 - rtems_partition_create - buffer size - RTEMS_INVALID_SIZE
-TA1 - rtems_partition_create - length < buffer size - RTEMS_INVALID_SIZE
-TA1 - rtems_partition_create - RTEMS_MP_NOT_CONFIGURED
-TA1 - rtems_partition_create - RTEMS_INVALID_ADDRESS
-TA1 - rtems_partition_create - RTEMS_INVALID_SIZE
-TA1 - rtems_partition_delete - unknown RTEMS_INVALID_ID
-TA1 - rtems_partition_delete - local RTEMS_INVALID_ID
-TA1 - rtems_partition_get_buffer - RTEMS_INVALID_ID
-TA1 - rtems_partition_ident - RTEMS_INVALID_NAME
-TA1 - rtems_partition_return_buffer - RTEMS_INVALID_ID
-TA1 - rtems_partition_create - RTEMS_SUCCESSFUL
-TA1 - rtems_partition_create - RTEMS_TOO_MANY
-TA1 - rtems_partition_get_buffer - RTEMS_SUCCESSFUL
-TA1 - rtems_partition_get_buffer - RTEMS_SUCCESSFUL
-TA1 - rtems_partition_get_buffer - RTEMS_UNSATISFIED
-TA1 - rtems_partition_delete - RTEMS_RESOURCE_IN_USE
-TA1 - rtems_partition_return_buffer - RTEMS_INVALID_ADDRESS - out of range
-TA1 - rtems_partition_return_buffer - RTEMS_INVALID_ADDRESS - not on boundary
-<pause - screen 12>
-TA1 - rtems_region_create - RTEMS_INVALID_NAME
-TA1 - rtems_region_create - RTEMS_INVALID_ADDRESS
-TA1 - rtems_region_create - RTEMS_INVALID_SIZE
-TA1 - rtems_region_create - RTEMS_SUCCESSFUL
-TA1 - rtems_region_create - RTEMS_TOO_MANY
-TA1 - rtems_region_delete - unknown RTEMS_INVALID_ID
-TA1 - rtems_region_delete - local RTEMS_INVALID_ID
-TA1 - rtems_region_ident - RTEMS_INVALID_NAME
-TA1 - rtems_region_get_segment - RTEMS_INVALID_ID
-TA1 - rtems_region_get_segment - RTEMS_INVALID_SIZE
-TA1 - rtems_region_get_segment - RTEMS_SUCCESSFUL
-TA1 - rtems_region_get_segment - RTEMS_UNSATISFIED
-TA1 - rtems_region_get_segment - timeout in 3 seconds
-TA1 - rtems_region_get_segment - woke up with RTEMS_TIMEOUT
-TA1 - rtems_region_delete - RTEMS_RESOURCE_IN_USE
-TA1 - rtems_region_return_segment - RTEMS_INVALID_ID
-TA1 - rtems_region_return_segment - RTEMS_INVALID_ADDRESS
-TA1 - rtems_debug_disable - RTEMS_DEBUG_REGION
-TA1 - rtems_region_return_segment - RTEMS_INVALID_ADDRESS - SKIPPED
-TA1 - rtems_region_return_segment - RTEMS_INVALID_ADDRESS - SKIPPED
-TA1 - rtems_debug_enable - RTEMS_DEBUG_REGION
-TA1 - rtems_region_extend - RTEMS_INVALID_ID
-TA1 - rtems_region_extend - within heap - RTEMS_INVALID_ADDRESS
-TA1 - rtems_region_extend - non-contiguous lower - RTEMS_NOT_IMPLEMENTED
-TA1 - rtems_region_extend - contiguous lower - RTEMS_NOT_IMPLEMENTED
-TA1 - rtems_region_extend - non-contiguous higher - RTEMS_NOT_IMPLEMENTED
-<pause - screen 13>
-TA1 - rtems_io_close - RTEMS_INVALID_NUMBER
-TA1 - rtems_io_control - RTEMS_INVALID_NUMBER
-TA1 - rtems_io_initialize - RTEMS_INVALID_NUMBER
-TA1 - rtems_io_open - RTEMS_INVALID_NUMBER
-TA1 - rtems_io_read - RTEMS_INVALID_NUMBER
-TA1 - rtems_io_write - RTEMS_INVALID_NUMBER
-TA1 - rtems_clock_set - 23:59:59   12/31/2000 - RTEMS_SUCCESSFUL
-TA1 - rtems_clock_get - 00:00:00   01/01/2001 - RTEMS_SUCCESSFUL
-TA1 - rtems_clock_set - 23:59:59   12/31/1999 - RTEMS_SUCCESSFUL
-TA1 - rtems_clock_get - 00:00:00   01/01/2000 - RTEMS_SUCCESSFUL
-TA1 - rtems_clock_set - 23:59:59   12/31/2100 - RTEMS_SUCCESSFUL
-TA1 - rtems_clock_get - 00:00:00   01/01/2101 - RTEMS_SUCCESSFUL
-TA1 - rtems_clock_set - 23:59:59   12/31/2099 - RTEMS_SUCCESSFUL
-TA1 - rtems_clock_get - 00:00:00   01/01/2100 - RTEMS_SUCCESSFUL
-TA1 - rtems_clock_set - 23:59:59   12/31/1991 - RTEMS_SUCCESSFUL
-TA1 - rtems_clock_get - 00:00:00   01/01/1992 - RTEMS_SUCCESSFUL
-<pause - screen 14>
-TA1 - rtems_timer_create - RTEMS_INVALID_NAME
-TA1 - rtems_timer_create - 1 - RTEMS_SUCCESSFUL
-TA1 - rtems_timer_create - 2 - RTEMS_TOO_MANY
-TA1 - rtems_timer_delete - local RTEMS_INVALID_ID
-TA1 - rtems_timer_delete - global RTEMS_INVALID_ID
-TA1 - rtems_timer_ident - RTEMS_INVALID_NAME
-TA1 - rtems_timer_cancel - RTEMS_INVALID_ID
-TA1 - rtems_timer_reset - RTEMS_INVALID_ID
-TA1 - rtems_timer_reset - RTEMS_NOT_DEFINED
-TA1 - rtems_timer_fire_after - RTEMS_INVALID_ID
-TA1 - rtems_timer_fire_when - RTEMS_INVALID_ID
-TA1 - rtems_timer_fire_after - RTEMS_INVALID_NUMBER
-TA1 - rtems_timer_fire_when - 08:30:45   02/05/1987 - RTEMS_INVALID_CLOCK
-TA1 - rtems_clock_get       - 00:00:00   01/01/1992
-TA1 - rtems_timer_fire_when - 08:30:45   02/05/1990 - before RTEMS_INVALID_CLOCK
-*** END OF TEST 9 ***
diff --git a/testsuites/sptests/sp09/system.h b/testsuites/sptests/sp09/system.h
deleted file mode 100644
index 69b28b1b4d..0000000000
--- a/testsuites/sptests/sp09/system.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/*  system.h
- *
- *  This include file contains information that is included in every
- *  function in the test set.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <tmacros.h>
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
-
-rtems_timer_service_routine Delayed_routine(
-  rtems_id  ignored_id,
-  void     *ignored_address
-);
-
-rtems_task Task_1(
-  rtems_task_argument argument
-);
-
-rtems_task Task_2(
-  rtems_task_argument argument
-);
-
-rtems_task Task_3(
-  rtems_task_argument argument
-);
-
-rtems_task Task_4(
-  rtems_task_argument argument
-);
-
-rtems_isr Service_routine(
-  rtems_vector_number ignored
-);
-
-rtems_timer_service_routine Io_during_interrupt(
-  rtems_id ignored
-);
-
-void Screen1( void );
-
-void Screen2( void );
-
-void Screen3( void );
-
-void Screen4( void );
-
-void Screen5( void );
-
-void Screen6( void );
-
-void Screen7( void );
-
-void Screen8( void );
-
-void Screen9( void );
-
-void Screen10( void );
-
-void Screen11( void );
-
-void Screen12( void );
-
-void Screen13( void );
-
-void Screen14( void );
-
-/* configuration information */
-
-#define CONFIGURE_SPTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_MAXIMUM_TIMERS              1
-#define CONFIGURE_MAXIMUM_SEMAPHORES          2
-#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES      1
-#define CONFIGURE_MAXIMUM_PARTITIONS          1
-#define CONFIGURE_MAXIMUM_REGIONS             1
-#define CONFIGURE_MAXIMUM_PERIODS             1
-#define CONFIGURE_MAXIMUM_USER_EXTENSIONS     0
-#define CONFIGURE_TICKS_PER_TIMESLICE       100
-
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#define CONFIGURE_EXTRA_TASK_STACKS         (2 * RTEMS_MINIMUM_STACK_SIZE)
-
-#include <confdefs.h>
-
-/* global variables */
-
-TEST_EXTERN rtems_id   Task_id[ 11 ];       /* array of task ids */
-TEST_EXTERN rtems_name Task_name[ 11 ];     /* array of task names */
- 
-TEST_EXTERN rtems_name Timer_name[ 2 ];     /* array of timer names */
-TEST_EXTERN rtems_id   Timer_id[ 2 ];       /* array of timer ids */
- 
-TEST_EXTERN rtems_name Semaphore_name[ 4 ]; /* array of semaphore names */
-TEST_EXTERN rtems_id   Semaphore_id[ 4 ];   /* array of semaphore ids */
- 
-TEST_EXTERN rtems_name Queue_name[ 3 ];     /* array of queue names */
-TEST_EXTERN rtems_id   Queue_id[ 3 ];       /* array of queue ids */
- 
-TEST_EXTERN rtems_name Partition_name[ 2 ]; /* array of partition names */
-TEST_EXTERN rtems_id   Partition_id[ 2 ];   /* array of partition ids */
- 
-TEST_EXTERN rtems_name Region_name[ 2 ];    /* array of region names */
-TEST_EXTERN rtems_id   Region_id[ 2 ];      /* array of region ids */
- 
-TEST_EXTERN rtems_name Port_name[ 2 ];      /* array of port names */
-TEST_EXTERN rtems_id   Port_id[ 2 ];        /* array of port ids */
- 
-TEST_EXTERN rtems_name Period_name[ 2 ];    /* array of period names */
-TEST_EXTERN rtems_id   Period_id[ 2 ];      /* array of period ids */
- 
-TEST_EXTERN rtems_id   Junk_id;             /* id used to return errors */
- 
-#define Internal_port_area (void *) 0x00001000
-#define External_port_area (void *) 0x00002000
- 
-TEST_EXTERN rtems_unsigned8 Partition_good_area[256] CPU_STRUCTURE_ALIGNMENT;
-#define Partition_bad_area (void *) 0x00000006
- 
-TEST_EXTERN rtems_unsigned32 Region_good_area[4096] CPU_STRUCTURE_ALIGNMENT;
-#define Region_bad_area    (void *) 0x00000006
-#define REGION_START_OFFSET 1024
-#define REGION_LENGTH       512
-
-/* end of include file */
diff --git a/testsuites/sptests/sp09/task1.c b/testsuites/sptests/sp09/task1.c
deleted file mode 100644
index 997204674d..0000000000
--- a/testsuites/sptests/sp09/task1.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*  Task_1
- *
- *  This task generates all possible errors for the RTEMS executive.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_task Task_1(
-  rtems_task_argument argument
-)
-{
-  Screen1();
-  rtems_test_pause_and_screen_number( 2 );
-
-  Screen2();
-  rtems_test_pause_and_screen_number( 3 );
-
-  Screen3();
-  rtems_test_pause_and_screen_number( 4 );
-
-  Screen4();
-  rtems_test_pause_and_screen_number( 5 );
-
-  Screen5();
-  rtems_test_pause_and_screen_number( 6 );
-
-  Screen6();
-  rtems_test_pause_and_screen_number( 7 );
-
-  Screen7();
-  rtems_test_pause_and_screen_number( 8 );
-
-  Screen8();
-  rtems_test_pause_and_screen_number( 9 );
-
-  Screen9();
-  rtems_test_pause_and_screen_number( 10 );
-
-  Screen10();
-  rtems_test_pause_and_screen_number( 11 );
-
-  Screen11();
-  rtems_test_pause_and_screen_number( 12 );
-
-  Screen12();
-  rtems_test_pause_and_screen_number( 13 );
-
-  Screen13();
-  rtems_test_pause_and_screen_number( 14 );
-
-  Screen14();
-
-  puts( "*** END OF TEST 9 ***" );
-  exit( 0 );
-}
diff --git a/testsuites/sptests/sp09/task2.c b/testsuites/sptests/sp09/task2.c
deleted file mode 100644
index 9fdd9160da..0000000000
--- a/testsuites/sptests/sp09/task2.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*  Task_2
- *
- *  This routine serves as a test task.  Its only purpose is to generate the
- *  error where a semaphore is deleted while a task is waiting for it.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_task Task_2(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-
-  puts( "TA2 - rtems_semaphore_obtain - sem 1 - RTEMS_WAIT FOREVER" );
-  status = rtems_semaphore_obtain(
-    Semaphore_id[ 1 ],
-    RTEMS_DEFAULT_OPTIONS,
-    RTEMS_NO_TIMEOUT
-  );
-  fatal_directive_status(
-    status,
-    RTEMS_OBJECT_WAS_DELETED,
-    "rtems_semaphore_obtain waiting to be deleted"
-  );
-  puts(
-    "TA2 - rtems_semaphore_obtain - woke up with RTEMS_OBJECT_WAS_DELETED"
-  );
-
-  puts( "TA2 - rtems_task_delete - delete self - RTEMS_SUCCESSFUL" );
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of TA2" );
-}
diff --git a/testsuites/sptests/sp09/task3.c b/testsuites/sptests/sp09/task3.c
deleted file mode 100644
index 2f1a91f5d6..0000000000
--- a/testsuites/sptests/sp09/task3.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*  Task_3
- *
- *  This routine serves as a test task.  Its only purpose in life is to
- *  generate the error where a message queue is deleted while a task
- *  is waiting there for a message.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_task Task_3(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-  long              buffer[ 4 ];
-  rtems_unsigned32  size;
-
-  puts( "TA3 - rtems_message_queue_receive - Q 1 - RTEMS_WAIT FOREVER" );
-  status = rtems_message_queue_receive(
-    Queue_id[ 1 ],
-    (long (*)[4])buffer,
-    &size,
-    RTEMS_DEFAULT_OPTIONS,
-    RTEMS_NO_TIMEOUT
-  );
-  fatal_directive_status(
-    status,
-    RTEMS_OBJECT_WAS_DELETED,
-    "rtems_message_queue_receive waiting to be deleted"
-  );
-  puts(
-    "TA3 - rtems_message_queue_receive - woke up with RTEMS_OBJECT_WAS_DELETED"
-  );
-
-  puts( "TA3 - rtems_task_delete - delete self - RTEMS_SUCCESSFUL" );
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of TA3" );
-}
diff --git a/testsuites/sptests/sp09/task4.c b/testsuites/sptests/sp09/task4.c
deleted file mode 100644
index 2b8c127a98..0000000000
--- a/testsuites/sptests/sp09/task4.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*  Task_4
- *
- *  This routine serves as a test task.  Its only purpose in life is to
- *  generate the error where a rate monotonic period is accessed by a
- *  task other than its creator.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_task Task_4(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-
-  status = rtems_rate_monotonic_cancel( Period_id[ 1 ] );
-  fatal_directive_status(
-    status,
-    RTEMS_NOT_OWNER_OF_RESOURCE,
-    "rtems_rate_monotonic_cancel not the owner"
-  );
-  puts( "TA4 - rtems_rate_monotonic_cancel - RTEMS_NOT_OWNER_OF_RESOURCE" );
-
-  status = rtems_rate_monotonic_period( Period_id[ 1 ], 5 );
-  fatal_directive_status(
-    status,
-    RTEMS_NOT_OWNER_OF_RESOURCE,
-    "rtems_rate_monotonic_period not the owner"
-  );
-  puts( "TA4 - rtems_rate_monotonic_period - RTEMS_NOT_OWNER_OF_RESOURCE" );
-
-  puts( "TA4 - rtems_task_delete - delete self - RTEMS_SUCCESSFUL" );
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of TA4" );
-}
diff --git a/testsuites/sptests/sp11/init.c b/testsuites/sptests/sp11/init.c
deleted file mode 100644
index 6382f31bae..0000000000
--- a/testsuites/sptests/sp11/init.c
+++ /dev/null
@@ -1,92 +0,0 @@
-/*  Init
- *
- *  This routine is the initialization task for this test program.
- *  It is a user initialization task and has the responsibility for creating
- *  and starting the tasks that make up the test.  If the time of day
- *  clock is required for the test, it should also be set to a known
- *  value by this function.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "system.h"
-
-rtems_task Init(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-
-  puts( "\n\n*** TEST 11 ***" );
-
-  Task_name[ 1 ] = rtems_build_name( 'T', 'A', '1', ' ' );
-  Task_name[ 2 ] = rtems_build_name( 'T', 'A', '2', ' ' );
-
-  status = rtems_task_create(
-    Task_name[ 1 ],
-    4,
-    RTEMS_MINIMUM_STACK_SIZE * 2,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Task_id[ 1 ]
-  );
-  directive_failed( status, "rtems_task_create of TA1" );
-
-  status = rtems_task_create(
-    Task_name[ 2 ],
-    4,
-    RTEMS_MINIMUM_STACK_SIZE * 2,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Task_id[ 2 ]
-  );
-  directive_failed( status, "rtems_task_create of TA2" );
-
-  status = rtems_task_start( Task_id[ 1 ], Task_1, 0 );
-  directive_failed( status, "rtems_task_start of TA1" );
-
-  status = rtems_task_start( Task_id[ 2 ], Task_2, 0 );
-  directive_failed( status, "rtems_task_start of TA2" );
-
-  Timer_name[ 1 ] = rtems_build_name( 'T', 'M', '1', ' ' );
-  Timer_name[ 2 ] = rtems_build_name( 'T', 'M', '2', ' ' );
-  Timer_name[ 3 ] = rtems_build_name( 'T', 'M', '3', ' ' );
-  Timer_name[ 4 ] = rtems_build_name( 'T', 'M', '4', ' ' );
-  Timer_name[ 5 ] = rtems_build_name( 'T', 'M', '5', ' ' );
-  Timer_name[ 6 ] = rtems_build_name( 'T', 'M', '6', ' ' );
-
-  status = rtems_timer_create( Timer_name[ 1 ], &Timer_id[ 1 ] );
-  directive_failed( status, "rtems_timer_create of TM1" );
-
-  status = rtems_timer_create( Timer_name[ 2 ], &Timer_id[ 2 ] );
-  directive_failed( status, "rtems_timer_create of TM2" );
-
-  status = rtems_timer_create( Timer_name[ 3 ], &Timer_id[ 3 ] );
-  directive_failed( status, "rtems_timer_create of TM3" );
-
-  status = rtems_timer_create( Timer_name[ 4 ], &Timer_id[ 4 ] );
-  directive_failed( status, "rtems_timer_create of TM4" );
-
-  status = rtems_timer_create( Timer_name[ 5 ], &Timer_id[ 5 ] );
-  directive_failed( status, "rtems_timer_create of TM5" );
-
-  status = rtems_timer_create( Timer_name[ 6 ], &Timer_id[ 6 ] );
-  directive_failed( status, "rtems_timer_create of TM6" );
-
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-}
diff --git a/testsuites/sptests/sp11/sp11.doc b/testsuites/sptests/sp11/sp11.doc
deleted file mode 100644
index 5bc0bae8bd..0000000000
--- a/testsuites/sptests/sp11/sp11.doc
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
-This file describes the directives and concepts tested by this test set.
-
-test set name:  test11
-
-directives:
-  ex_init, ex_start, t_create, t_start, t_delete, tm_tick, i_return,
-  ev_send, ev_receive
-  tm_wkafter, tm_set, tm_get
-
-concepts:
-
-  a.  This test checks out the event manager along with the associated
-      event directives contained in the time manager.
diff --git a/testsuites/sptests/sp11/sp11.scn b/testsuites/sptests/sp11/sp11.scn
deleted file mode 100644
index db0469eb60..0000000000
--- a/testsuites/sptests/sp11/sp11.scn
+++ /dev/null
@@ -1,74 +0,0 @@
-*** TEST 11 ***
-TA1 - rtems_event_send - send RTEMS_EVENT_16 to TA2
-TA1 - rtems_event_receive - waiting forever on RTEMS_EVENT_14 and RTEMS_EVENT_15
-TA2 - rtems_event_receive - waiting forever on RTEMS_EVENT_16
-TA2 - RTEMS_EVENT_16 received - eventout => 00010000
-TA2 - rtems_event_send - send RTEMS_EVENT_14 and RTEMS_EVENT_15 to TA1
-TA2 - rtems_event_receive - RTEMS_EVENT_17 or RTEMS_EVENT_18 - forever and ANY
-TA1 - RTEMS_EVENT_14 and RTEMS_EVENT_15 received - eventout => 0000c000
-TA1 - rtems_event_send - send RTEMS_EVENT_18 to TA2
-TA1 - rtems_event_receive - waiting with 10 second timeout on RTEMS_EVENT_14
-TA2 - RTEMS_EVENT_17 or RTEMS_EVENT_18 received - eventout => 00040000
-TA2 - rtems_event_send - send RTEMS_EVENT_14 to TA1
-TA2 - rtems_clock_set - 08:15:00   02/12/1988
-TA2 - rtems_event_send - sending RTEMS_EVENT_10 to self after 4 seconds
-TA2 - rtems_event_receive - waiting forever on RTEMS_EVENT_10
-TA1 - RTEMS_EVENT_14 received - eventout => 00004000
-TA1 - rtems_event_send - send RTEMS_EVENT_19 to TA2
-TA1 - rtems_clock_get - 08:15:00   02/12/1988
-<pause>
-TA1 - rtems_event_send - send RTEMS_EVENT_18 to self after 5 seconds
-TA1 - rtems_event_receive - waiting forever on RTEMS_EVENT_18
-TA2 - RTEMS_EVENT_10 received - eventout => 00000400
-TA2 - rtems_clock_get - 08:15:05   02/12/1988
-TA2 - rtems_event_receive - RTEMS_PENDING_EVENTS
-TA2 - eventout => 00080000
-TA2 - rtems_event_receive - RTEMS_EVENT_19 - RTEMS_NO_WAIT
-TA2 - RTEMS_EVENT_19 received - eventout => 00080000
-TA2 - rtems_task_delete - deletes self
-TA1 - RTEMS_EVENT_18 received - eventout => 00040000
-TA1 - rtems_clock_get - 08:15:05   02/12/1988
-TA1 - rtems_event_send - send RTEMS_EVENT_3 to self
-TA1 - rtems_event_receive - RTEMS_EVENT_3 or RTEMS_EVENT_22 - NO_WAIT and ANY
-TA1 - RTEMS_EVENT_3 received - eventout => 00000008
-TA1 - rtems_event_send - send RTEMS_EVENT_4 to self
-TA1 - rtems_event_receive - RTEMS_EVENT_4 or RTEMS_EVENT_5 - forever and ANY
-TA1 - RTEMS_EVENT_4 received - eventout => 00000010
-<pause>
-TA1 - rtems_event_send - send RTEMS_EVENT_18 to self after 5 seconds
-TA1 - rtems_timer_cancel - cancelling timer for event RTEMS_EVENT_18
-TA1 - rtems_event_send - send RTEMS_EVENT_8 to self after 60 seconds
-TA1 - rtems_event_send - send RTEMS_EVENT_9 to self after 60 seconds
-TA1 - rtems_event_send - send RTEMS_EVENT_10 to self after 60 seconds
-TA1 - rtems_timer_cancel - cancelling timer for event RTEMS_EVENT_8
-TA1 - rtems_clock_set - 08:15:00   02/12/1988
-TA1 - rtems_event_send - send RTEMS_EVENT_1 every second
-TA1 - RTEMS_EVENT_1 received - eventout => 00000002 - at 08:15:01   02/12/1988
-TA1 - RTEMS_EVENT_1 received - eventout => 00000002 - at 08:15:02   02/12/1988
-TA1 - RTEMS_EVENT_1 received - eventout => 00000002 - at 08:15:03   02/12/1988
-TA1 - rtems_timer_cancel - cancelling timer for event RTEMS_EVENT_1
-<pause>
-TA1 - rtems_event_send - sending RTEMS_EVENT_11 to self in 1 day
-TA1 - rtems_event_send - sending RTEMS_EVENT_11 to self in 1 day
-TA1 - rtems_event_send - sending RTEMS_EVENT_11 to self in 2 days
-TA1 - rtems_timer_cancel - cancelling RTEMS_EVENT_11 to self in 1 day
-TA1 - rtems_timer_cancel - cancelling RTEMS_EVENT_11 to self in 2 days
-TA1 - rtems_event_send - resending RTEMS_EVENT_11 to self in 2 days
-TA1 - rtems_clock_set - 08:15:03   02/15/1988
-TA1 - rtems_event_receive - waiting forever on RTEMS_EVENT_11
-TA1 - RTEMS_EVENT_11 received - eventout => 00000800
-<pause>
-TA1 - rtems_event_send/rtems_event_receive combination
-TA1 - rtems_clock_set - 08:15:00   02/12/1988
-TA1 - rtems_event_receive all outstanding events
-TA1 - rtems_event_send - sending RTEMS_EVENT_10 to self in 1 day
-TA1 - rtems_event_send - sending RTEMS_EVENT_11 to self in 2 days
-TA1 - rtems_clock_set - 07:15:00   02/12/1988
-TA1 - set time backwards
-TA1 - no events received
-TA1 - rtems_clock_set - 07:15:00   02/14/1988
-TA1 - set time forwards (leave a timer)
-TA1 - RTEMS_EVENT_10 received
-TA1 - rtems_event_send - sending RTEMS_EVENT_11 to self in 100 ticks
-TA1 - rtems_event_send - sending RTEMS_EVENT_11 to self in 200 ticks
-*** END OF TEST 11 ***
diff --git a/testsuites/sptests/sp11/system.h b/testsuites/sptests/sp11/system.h
deleted file mode 100644
index 113113969c..0000000000
--- a/testsuites/sptests/sp11/system.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*  system.h
- *
- *  This include file contains information that is included in every
- *  function in the test set.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <tmacros.h>
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
- 
-rtems_task Task_1(
-  rtems_task_argument argument
-);
- 
-rtems_task Task_2(
-  rtems_task_argument argument
-);
- 
-rtems_timer_service_routine TA1_send_18_to_self_5_seconds(
-  rtems_id  ignored_id,
-  void     *ignored_address
-);
- 
-rtems_timer_service_routine TA1_send_8_to_self_60_seconds(
-  rtems_id  ignored_id,
-  void     *ignored_address
-);
- 
-rtems_timer_service_routine TA1_send_9_to_self_60_seconds(
-  rtems_id  ignored_id,
-  void     *ignored_address
-);
- 
-rtems_timer_service_routine TA1_send_10_to_self(
-  rtems_id  ignored_id,
-  void     *ignored_address
-);
- 
-rtems_timer_service_routine TA1_send_1_to_self_every_second(
-  rtems_id  ignored_id,
-  void     *ignored_address
-);
- 
-rtems_timer_service_routine TA1_send_11_to_self(
-  rtems_id  ignored_id,
-  void     *ignored_address
-);
- 
-rtems_timer_service_routine TA2_send_10_to_self(
-  rtems_id  ignored_id,
-  void     *ignored_address
-);
-
-/* configuration information */
-
-#define CONFIGURE_SPTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_MAXIMUM_TIMERS              6
-#define CONFIGURE_TICKS_PER_TIMESLICE       100
-
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#define CONFIGURE_EXTRA_TASK_STACKS         (2 * RTEMS_MINIMUM_STACK_SIZE)
-
-#include <confdefs.h>
-
-/* global variables */
-
-TEST_EXTERN rtems_id   Task_id[ 4 ];         /* array of task ids */
-TEST_EXTERN rtems_name Task_name[ 4 ];       /* array of task names */
-
-TEST_EXTERN rtems_id   Timer_id[ 7 ];     /* array of timer ids */
-TEST_EXTERN rtems_name Timer_name[ 7 ];   /* array of timer names */
-
-/* end of include file */
diff --git a/testsuites/sptests/sp11/task1.c b/testsuites/sptests/sp11/task1.c
deleted file mode 100644
index b8d3530b04..0000000000
--- a/testsuites/sptests/sp11/task1.c
+++ /dev/null
@@ -1,410 +0,0 @@
-/*  Task_1
- *
- *  This routine serves as a test task.  It verifies the event maager.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_task Task_1(
-  rtems_task_argument argument
-)
-{
-  rtems_event_set   eventout;
-  rtems_time_of_day time;
-  rtems_status_code status;
-  rtems_unsigned32  index;
-
-  puts( "TA1 - rtems_event_send - send RTEMS_EVENT_16 to TA2" );
-  status = rtems_event_send( Task_id[ 2 ], RTEMS_EVENT_16 );
-  directive_failed( status, "rtems_event_send" );
-
-  puts(
-    "TA1 - rtems_event_receive - waiting forever on "
-      "RTEMS_EVENT_14 and RTEMS_EVENT_15"
-  );
-  status = rtems_event_receive(
-    RTEMS_EVENT_14 | RTEMS_EVENT_15,
-    RTEMS_DEFAULT_OPTIONS,
-    RTEMS_NO_TIMEOUT,
-    &eventout
-  );
-  directive_failed( status, "rtems_event_receive" );
-  printf(
-    "TA1 - RTEMS_EVENT_14 and RTEMS_EVENT_15 received - eventout => %08x\n",
-    eventout
-  );
-
-  puts( "TA1 - rtems_event_send - send RTEMS_EVENT_18 to TA2" );
-  status = rtems_event_send( Task_id[ 2 ], RTEMS_EVENT_18 );
-  directive_failed( status, "rtems_event_send" );
-
-  puts(
-  "TA1 - rtems_event_receive - waiting with 10 second timeout on RTEMS_EVENT_14"
-  );
-  status = rtems_event_receive(
-    RTEMS_EVENT_14,
-    RTEMS_DEFAULT_OPTIONS,
-    10 * TICKS_PER_SECOND,
-    &eventout
-  );
-  directive_failed( status, "rtems_event_receive" );
-  printf( "TA1 - RTEMS_EVENT_14 received - eventout => %08x\n", eventout );
-
-  puts( "TA1 - rtems_event_send - send RTEMS_EVENT_19 to TA2" );
-  status = rtems_event_send( Task_id[ 2 ], RTEMS_EVENT_19 );
-  directive_failed( status, "rtems_event_send" );
-
-  status = rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time );
-  directive_failed( status, "rtems_clock_get" );
-  print_time( "TA1 - rtems_clock_get - ", &time, "\n" );
-
-rtems_test_pause();
-
-  puts( "TA1 - rtems_event_send - send RTEMS_EVENT_18 to self after 5 seconds");
-  status = rtems_timer_fire_after(
-    Timer_id[ 1 ],
-    5 * TICKS_PER_SECOND,
-    TA1_send_18_to_self_5_seconds,
-    NULL
-  );
-  directive_failed( status, "rtems_timer_fire_after 5 seconds" );
-
-  puts( "TA1 - rtems_event_receive - waiting forever on RTEMS_EVENT_18"  );
-  status = rtems_event_receive(
-    RTEMS_EVENT_18,
-    RTEMS_DEFAULT_OPTIONS,
-    RTEMS_NO_TIMEOUT,
-    &eventout
-  );
-  directive_failed( status, "rtems_event_receive of 18" );
-  printf( "TA1 - RTEMS_EVENT_18 received - eventout => %08x\n", eventout );
-
-  status = rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time );
-  directive_failed( status, "TA1 rtems_clock_get" );
-  print_time( "TA1 - rtems_clock_get - ", &time, "\n" );
-
-  puts( "TA1 - rtems_event_send - send RTEMS_EVENT_3 to self" );
-  status = rtems_event_send( RTEMS_SELF, RTEMS_EVENT_3 );
-  directive_failed( status, "rtems_event_send" );
-
-  puts(
-    "TA1 - rtems_event_receive - RTEMS_EVENT_3 or "
-      "RTEMS_EVENT_22 - NO_WAIT and ANY"
-  );
-  status = rtems_event_receive(
-    RTEMS_EVENT_3 | RTEMS_EVENT_22,
-    RTEMS_NO_WAIT | RTEMS_EVENT_ANY,
-    RTEMS_NO_TIMEOUT,
-    &eventout
-  );
-  directive_failed( status, "rtems_event_receive of 3 and 22" );
-  printf( "TA1 - RTEMS_EVENT_3 received - eventout => %08x\n", eventout );
-
-  puts( "TA1 - rtems_event_send - send RTEMS_EVENT_4 to self" );
-  status = rtems_event_send( RTEMS_SELF, RTEMS_EVENT_4 );
-  directive_failed( status, "rtems_event_send" );
-
-  puts (
-  "TA1 - rtems_event_receive - RTEMS_EVENT_4 or "
-      "RTEMS_EVENT_5 - forever and ANY"
-  );
-  status = rtems_event_receive(
-    RTEMS_EVENT_4 | RTEMS_EVENT_5,
-    RTEMS_EVENT_ANY,
-    RTEMS_NO_TIMEOUT,
-    &eventout
-  );
-  directive_failed( status, "rtems_event_receive" );
-  printf( "TA1 - RTEMS_EVENT_4 received - eventout => %08x\n", eventout );
-
-rtems_test_pause();
-
-  puts( "TA1 - rtems_event_send - send RTEMS_EVENT_18 to self after 5 seconds");
-  status = rtems_timer_fire_after(
-    Timer_id[ 1 ],
-    5 * TICKS_PER_SECOND,
-    TA1_send_18_to_self_5_seconds,
-    NULL
-  );
-  directive_failed( status, "rtems_timer_fire_after 5 seconds" );
-
-  puts( "TA1 - rtems_timer_cancel - cancelling timer for event RTEMS_EVENT_18");
-  status = rtems_timer_cancel( Timer_id[ 1 ] );
-  directive_failed( status, "rtems_timer_cancel" );
-
-  puts( "TA1 - rtems_event_send - send RTEMS_EVENT_8 to self after 60 seconds");
-  status = rtems_timer_fire_after(
-    Timer_id[ 1 ],
-    60 * TICKS_PER_SECOND,
-    TA1_send_8_to_self_60_seconds,
-    NULL
-  );
-  directive_failed( status, "rtems_timer_fire_after 60 seconds" );
-
-  puts( "TA1 - rtems_event_send - send RTEMS_EVENT_9 to self after 60 seconds");
-  status = rtems_timer_fire_after(
-    Timer_id[ 2 ],
-    60 * TICKS_PER_SECOND,
-    TA1_send_9_to_self_60_seconds,
-    NULL
-  );
-  directive_failed( status, "rtems_timer_fire_after 60 seconds" );
-
-  puts(
-    "TA1 - rtems_event_send - send RTEMS_EVENT_10 to self after 60 seconds"
-  );
-  status = rtems_timer_fire_after(
-    Timer_id[ 3 ],
-    60 * TICKS_PER_SECOND,
-    TA1_send_10_to_self,
-    NULL
-  );
-  directive_failed( status, "rtems_timer_fire_after 60 seconds" );
-
-  puts( "TA1 - rtems_timer_cancel - cancelling timer for event RTEMS_EVENT_8" );
-  status = rtems_timer_cancel( Timer_id[ 1 ] );
-  directive_failed( status, "rtems_timer_cancel" );
-
-  build_time( &time, 2, 12, 1988, 8, 15, 0, 0 );
-
-  print_time( "TA1 - rtems_clock_set - ", &time, "\n" );
-  status = rtems_clock_set( &time );
-  directive_failed( status, "rtems_clock_set" );
-
-  puts( "TA1 - rtems_event_send - send RTEMS_EVENT_1 every second" );
-  status = rtems_timer_fire_after(
-    Timer_id[ 1 ],
-    TICKS_PER_SECOND,
-    TA1_send_1_to_self_every_second,
-    NULL
-  );
-  directive_failed( status, "rtems_timer_fire_after 1 second" );
-
-  for ( index = 0; index < 3; index++ ) {
-
-    status = rtems_event_receive(
-      RTEMS_EVENT_1,
-      RTEMS_EVENT_ANY,
-      RTEMS_NO_TIMEOUT,
-      &eventout
-    );
-    directive_failed( status, "rtems_event_receive" );
-
-    status = rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time );
-    directive_failed( status, "rtems_clock_get" );
-
-    printf( "TA1 - RTEMS_EVENT_1 received - eventout => %08x - ", eventout );
-    print_time( "at ", &time, "\n" );
-
-    if ( index < 2 ) {
-      status = rtems_timer_reset( Timer_id[ 1 ] );
-      directive_failed( status, "rtems_timer_reset" );
-    };
-
-  }
-
-  puts( "TA1 - rtems_timer_cancel - cancelling timer for event RTEMS_EVENT_1" );
-  status = rtems_timer_cancel( Timer_id[ 1 ] );
-  directive_failed( status, "rtems_timer_cancel" );
-
-rtems_test_pause();
-
-  time.day = 13;
-  puts( "TA1 - rtems_event_send - sending RTEMS_EVENT_11 to self in 1 day" );
-  status = rtems_timer_fire_when(
-    Timer_id[ 1 ],
-    &time,
-    TA1_send_11_to_self,
-    NULL
-  );
-  directive_failed( status, "rtems_timer_fire_when 1 day" );
-
-  time.hour = 7;
-  puts( "TA1 - rtems_event_send - sending RTEMS_EVENT_11 to self in 1 day" );
-  status = rtems_timer_fire_when(
-    Timer_id[ 2 ],
-    &time,
-    TA1_send_11_to_self,
-    NULL
-  );
-  directive_failed( status, "rtems_timer_fire_when 1 day" );
-
-  time.hour = 8;   /* so code below has correct time/date */
-  time.day = 14;
-  puts( "TA1 - rtems_event_send - sending RTEMS_EVENT_11 to self in 2 days" );
-  status = rtems_timer_fire_when(
-    Timer_id[ 3 ],
-    &time,
-    TA1_send_11_to_self,
-    NULL
-  );
-  directive_failed( status, "rtems_timer_fire_when 2 days" );
-
-  puts("TA1 - rtems_timer_cancel - cancelling RTEMS_EVENT_11 to self in 1 day");
-  status = rtems_timer_cancel( Timer_id[ 1 ] );
-  directive_failed( status, "rtems_timer_cancel" );
-
-  puts(
-    "TA1 - rtems_timer_cancel - cancelling RTEMS_EVENT_11 to self in 2 days"
-  );
-  status = rtems_timer_cancel( Timer_id[ 3 ] );
-  directive_failed( status, "rtems_timer_cancel" );
-
-  puts(
-    "TA1 - rtems_event_send - resending RTEMS_EVENT_11 to self in 2 days"
-  );
-  status = rtems_timer_fire_when(
-    Timer_id[ 3 ],
-    &time,
-    TA1_send_11_to_self,
-    NULL
-  );
-  directive_failed( status, "rtems_timer_fire_when 2 days" );
-
-  time.day = 15;
-  print_time( "TA1 - rtems_clock_set - ", &time, "\n" );
-  status = rtems_clock_set( &time );
-  directive_failed( status, "TA1 rtems_clock_set" );
-
-  puts( "TA1 - rtems_event_receive - waiting forever on RTEMS_EVENT_11" );
-  status = rtems_event_receive(
-    RTEMS_EVENT_11,
-    RTEMS_DEFAULT_OPTIONS,
-    RTEMS_NO_TIMEOUT,
-    &eventout
-  );
-  directive_failed( status, "rtems_event_receive" );
-  printf( "TA1 - RTEMS_EVENT_11 received - eventout => %08x\n", eventout );
-
-rtems_test_pause();
-
-  puts( "TA1 - rtems_event_send/rtems_event_receive combination" );
-  status = rtems_timer_fire_after(
-    Timer_id[ 1 ],
-    10,
-    TA1_send_11_to_self,
-    NULL
-  );
-  directive_failed( status, "rtems_timer_fire_after 10 ticks" );
-
-  status = rtems_event_receive(
-    RTEMS_EVENT_11,
-    RTEMS_DEFAULT_OPTIONS,
-    RTEMS_NO_TIMEOUT,
-    &eventout
-  );
-  directive_failed( status, "rtems_event_receive" );
-
-  build_time( &time, 2, 12, 1988, 8, 15, 0, 0 );
-
-  print_time( "TA1 - rtems_clock_set - ", &time, "\n" );
-  status = rtems_clock_set( &time );
-  directive_failed( status, "rtems_clock_set" );
-
-  time.day = 13;
-  puts( "TA1 - rtems_event_receive all outstanding events" );
-  status  = rtems_event_receive(
-    RTEMS_ALL_EVENTS,
-    RTEMS_NO_WAIT | RTEMS_EVENT_ANY,
-    0,
-    &eventout
-  );
-  fatal_directive_status(
-    status,
-    RTEMS_UNSATISFIED,
-    "rtems_event_receive all events"
-  );
-
-  puts( "TA1 - rtems_event_send - sending RTEMS_EVENT_10 to self in 1 day" );
-  status = rtems_timer_fire_when(
-    Timer_id[ 1 ],
-    &time,
-    TA1_send_10_to_self,
-    NULL
-  );
-  directive_failed( status, "rtems_timer_fire_when 1 day" );
-
-  time.day = 14;
-  puts( "TA1 - rtems_event_send - sending RTEMS_EVENT_11 to self in 2 days" );
-  status = rtems_timer_fire_when(
-    Timer_id[ 2 ],
-    &time,
-    TA1_send_11_to_self,
-    NULL
-  );
-  directive_failed( status, "rtems_timer_fire_when 2 days" );
-
-  build_time( &time, 2, 12, 1988, 7, 15, 0, 0 );
-
-  print_time( "TA1 - rtems_clock_set - ", &time, "\n" );
-  puts( "TA1 - set time backwards" );
-  status = rtems_clock_set( &time );
-  directive_failed( status, "rtems_clock_set" );
-
-  status  = rtems_event_receive(
-    RTEMS_ALL_EVENTS,
-    RTEMS_NO_WAIT | RTEMS_EVENT_ANY,
-    RTEMS_NO_TIMEOUT,
-    &eventout
-  );
-  if ( eventout ) printf( "ERROR -0x%08x events received\n", eventout );
-  else            puts( "TA1 - no events received" );
-  fatal_directive_status(
-    status,
-    RTEMS_UNSATISFIED,
-    "rtems_event_receive all events"
-  );
-
-  build_time( &time, 2, 14, 1988, 7, 15, 0, 0 );
-
-  print_time( "TA1 - rtems_clock_set - ", &time, "\n" );
-  puts( "TA1 - set time forwards (leave a timer)" );
-  status = rtems_clock_set( &time );
-  directive_failed( status, "rtems_clock_set" );
-
-  status  = rtems_event_receive(
-    RTEMS_ALL_EVENTS,
-    RTEMS_NO_WAIT | RTEMS_EVENT_ANY,
-    RTEMS_NO_TIMEOUT,
-    &eventout
-  );
-  if ( eventout == RTEMS_EVENT_10 ) puts( "TA1 - RTEMS_EVENT_10 received" );
-  else      printf( "ERROR -0x%08x events received\n", eventout );
-  directive_failed( status, "rtems_event_receive all events" );
-
-  puts( "TA1 - rtems_event_send - sending RTEMS_EVENT_11 to self in 100 ticks");
-  status = rtems_timer_fire_after(
-    Timer_id[ 1 ],
-    100,
-    TA1_send_11_to_self,
-    NULL
-  );
-  directive_failed( status, "rtems_timer_fire_after 100 ticks" );
-
-  puts( "TA1 - rtems_event_send - sending RTEMS_EVENT_11 to self in 200 ticks");
-  status = rtems_timer_fire_after(
-    Timer_id[ 1 ],
-    200,
-    TA1_send_11_to_self,
-    NULL
-  );
-  directive_failed( status, "rtems_timer_fire_after 200 ticks" );
-
-  puts( "*** END OF TEST 11 ***" );
-  exit( 0 );
-}
diff --git a/testsuites/sptests/sp11/task2.c b/testsuites/sptests/sp11/task2.c
deleted file mode 100644
index 8522334b9a..0000000000
--- a/testsuites/sptests/sp11/task2.c
+++ /dev/null
@@ -1,126 +0,0 @@
-/*  Task_2
- *
- *  This routine serves as a test task.  Multiple tasks are required to
- *  verify all capabilities of the event manager.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_task Task_2(
-  rtems_task_argument argument
-)
-{
-  rtems_event_set   eventout;
-  rtems_time_of_day time;
-  rtems_status_code status;
-
-  status = rtems_task_wake_after( 1*TICKS_PER_SECOND );
-  directive_failed( status, "rtems_task_wake_after" );
-
-  puts( "TA2 - rtems_event_receive - waiting forever on RTEMS_EVENT_16" );
-  status = rtems_event_receive(
-    RTEMS_EVENT_16,
-    RTEMS_DEFAULT_OPTIONS,
-    RTEMS_NO_TIMEOUT,
-    &eventout
-  );
-  directive_failed( status, "rtems_event_receive" );
-  printf( "TA2 - RTEMS_EVENT_16 received - eventout => %08x\n", eventout );
-
-  puts(
-    "TA2 - rtems_event_send - send RTEMS_EVENT_14 and RTEMS_EVENT_15 to TA1"
-  );
-  status = rtems_event_send( Task_id[ 1 ], RTEMS_EVENT_14 | RTEMS_EVENT_15 );
-  directive_failed( status, "rtems_event_send" );
-
-  puts(
-    "TA2 - rtems_event_receive - RTEMS_EVENT_17 or "
-      "RTEMS_EVENT_18 - forever and ANY"
-  );
-  status = rtems_event_receive(
-    RTEMS_EVENT_17 | RTEMS_EVENT_18,
-    RTEMS_EVENT_ANY,
-    RTEMS_NO_TIMEOUT,
-    &eventout
-  );
-  directive_failed( status, "rtems_event_receive" );
-  printf(
-    "TA2 - RTEMS_EVENT_17 or RTEMS_EVENT_18 received - eventout => %08x\n",
-    eventout
-  );
-
-  puts( "TA2 - rtems_event_send - send RTEMS_EVENT_14 to TA1" );
-  status = rtems_event_send( Task_id[ 1 ], RTEMS_EVENT_14 );
-  directive_failed( status, "rtems_event_send" );
-
-  build_time( &time, 2, 12, 1988, 8, 15, 0, 0 );
-  print_time( "TA2 - rtems_clock_set - ", &time, "\n" );
-  status = rtems_clock_set( &time );
-  directive_failed( status, "TA2 rtems_clock_set" );
-
-  time.second += 4;
-  puts(
-    "TA2 - rtems_event_send - sending RTEMS_EVENT_10 to self after 4 seconds"
-  );
-  status = rtems_timer_fire_when(
-    Timer_id[ 5 ],
-    &time,
-    TA2_send_10_to_self,
-    NULL
-  );
-  directive_failed( status, "rtems_timer_fire_when after 4 seconds" );
-
-  puts( "TA2 - rtems_event_receive - waiting forever on RTEMS_EVENT_10" );
-  status = rtems_event_receive(
-    RTEMS_EVENT_10,
-    RTEMS_DEFAULT_OPTIONS,
-    RTEMS_NO_TIMEOUT,
-    &eventout
-  );
-  directive_failed( status, "rtems_event_receive" );
-
-  status = rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time );
-  directive_failed( status, "rtems_clock_get" );
-
-  printf( "TA2 - RTEMS_EVENT_10 received - eventout => %08x\n", eventout );
-  print_time( "TA2 - rtems_clock_get - ", &time, "\n" );
-
-  puts( "TA2 - rtems_event_receive - RTEMS_PENDING_EVENTS" );
-  status = rtems_event_receive(
-    RTEMS_PENDING_EVENTS,
-    RTEMS_DEFAULT_OPTIONS,
-    RTEMS_NO_TIMEOUT,
-    &eventout
-  );
-  directive_failed( status, "rtems_event_receive" );
-  printf( "TA2 - eventout => %08x\n", eventout );
-
-  puts( "TA2 - rtems_event_receive - RTEMS_EVENT_19 - RTEMS_NO_WAIT" );
-  status = rtems_event_receive(
-    RTEMS_EVENT_19,
-    RTEMS_NO_WAIT,
-    RTEMS_NO_TIMEOUT,
-    &eventout
-  );
-  directive_failed( status, "rtems_event_receive" );
-  printf( "TA2 - RTEMS_EVENT_19 received - eventout => %08x\n", eventout );
-
-  puts( "TA2 - rtems_task_delete - deletes self" );
-  status = rtems_task_delete( Task_id[ 2 ] );
-  directive_failed( status, "rtems_task_delete of TA2" );
-}
diff --git a/testsuites/sptests/sp11/timer.c b/testsuites/sptests/sp11/timer.c
deleted file mode 100644
index 986b7b91ad..0000000000
--- a/testsuites/sptests/sp11/timer.c
+++ /dev/null
@@ -1,97 +0,0 @@
-/*  Timer_functions
- *
- *  These routines are the timer service routines used by this test.
- *
- *  Input parameters:  NONE
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_timer_service_routine TA1_send_18_to_self_5_seconds(
-  rtems_id  ignored_id,
-  void     *ignored_address
-)
-{
-  rtems_status_code status;
-
-  status = rtems_event_send( Task_id[ 1 ], RTEMS_EVENT_18 );
-  directive_failed( status, "rtems_event_send of 18" );
-}
-
-rtems_timer_service_routine TA1_send_8_to_self_60_seconds(
-  rtems_id  ignored_id,
-  void     *ignored_address
-)
-{
-  rtems_status_code status;
-
-  status = rtems_event_send( Task_id[ 1 ], RTEMS_EVENT_8 );
-  directive_failed( status, "rtems_event_send of 8" );
-}
-
-rtems_timer_service_routine TA1_send_9_to_self_60_seconds(
-  rtems_id  ignored_id,
-  void     *ignored_address
-)
-{
-  rtems_status_code status;
-
-  status = rtems_event_send( Task_id[ 1 ], RTEMS_EVENT_9 );
-  directive_failed( status, "rtems_event_send of 9" );
-}
-
-rtems_timer_service_routine TA1_send_10_to_self(
-  rtems_id  ignored_id,
-  void     *ignored_address
-)
-{
-  rtems_status_code status;
-
-  status = rtems_event_send( Task_id[ 1 ], RTEMS_EVENT_10 );
-  directive_failed( status, "rtems_event_send of 10" );
-}
-
-rtems_timer_service_routine TA1_send_1_to_self_every_second(
-  rtems_id  ignored_id,
-  void     *ignored_address
-)
-{
-  rtems_status_code status;
-
-  status = rtems_event_send( Task_id[ 1 ], RTEMS_EVENT_1 );
-  directive_failed( status, "rtems_event_send of 1" );
-}
-
-rtems_timer_service_routine TA1_send_11_to_self(
-  rtems_id  ignored_id,
-  void     *ignored_address
-)
-{
-  rtems_status_code status;
-
-  status = rtems_event_send( Task_id[ 1 ], RTEMS_EVENT_11 );
-  directive_failed( status, "rtems_event_send of 11" );
-}
-
-rtems_timer_service_routine TA2_send_10_to_self(
-  rtems_id  ignored_id,
-  void     *ignored_address
-)
-{
-  rtems_status_code status;
-
-  status = rtems_event_send( Task_id[ 2 ], RTEMS_EVENT_10 );
-  directive_failed( status, "rtems_event_send of 10" );
-}
diff --git a/testsuites/sptests/sp12/init.c b/testsuites/sptests/sp12/init.c
deleted file mode 100644
index d610dc070b..0000000000
--- a/testsuites/sptests/sp12/init.c
+++ /dev/null
@@ -1,179 +0,0 @@
-/*  Init
- *
- *  This routine is the initialization task for this test program.
- *  It is a user initialization task and has the responsibility for creating
- *  and starting the tasks that make up the test.  If the time of day
- *  clock is required for the test, it should also be set to a known
- *  value by this function.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "system.h"
-
-rtems_task Init(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-
-  puts( "\n\n*** TEST 12 ***" );
-
-  Task_name[ 1 ]          = rtems_build_name( 'T', 'A', '1', ' ' );
-  Task_name[ 2 ]          = rtems_build_name( 'T', 'A', '2', ' ' );
-  Task_name[ 3 ]          = rtems_build_name( 'T', 'A', '3', ' ' );
-  Task_name[ 4 ]          = rtems_build_name( 'T', 'A', '4', ' ' );
-  Task_name[ 5 ]          = rtems_build_name( 'T', 'A', '5', ' ' );
-
-  Priority_task_name[ 1 ] = rtems_build_name( 'P', 'R', 'I', '1' );
-  Priority_task_name[ 2 ] = rtems_build_name( 'P', 'R', 'I', '2' );
-  Priority_task_name[ 3 ] = rtems_build_name( 'P', 'R', 'I', '3' );
-  Priority_task_name[ 4 ] = rtems_build_name( 'P', 'R', 'I', '4' );
-  Priority_task_name[ 5 ] = rtems_build_name( 'P', 'R', 'I', '5' );
-
-  Semaphore_name[ 1 ]     = rtems_build_name( 'S', 'M', '1', ' ' );
-  Semaphore_name[ 2 ]     = rtems_build_name( 'S', 'M', '2', ' ' );
-  Semaphore_name[ 3 ]     = rtems_build_name( 'S', 'M', '3', ' ' );
-
-  status = rtems_semaphore_create(
-    Semaphore_name[ 1 ],
-    1,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    RTEMS_NO_PRIORITY,
-    &Semaphore_id[ 1 ]
-  );
-  directive_failed( status, "rtems_semaphore_create of SM1" );
-
-  status = rtems_semaphore_create(
-    Semaphore_name[ 2 ],
-    0,
-    RTEMS_PRIORITY,
-    RTEMS_NO_PRIORITY,
-    &Semaphore_id[ 2 ]
-  );
-  directive_failed( status, "rtems_semaphore_create of SM2" );
-
-  status = rtems_semaphore_create(
-    Semaphore_name[ 3 ],
-    1,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    RTEMS_NO_PRIORITY,
-    &Semaphore_id[ 3 ]
-  );
-  directive_failed( status, "rtems_semaphore_create of SM3" );
-
-  puts( "INIT - Forward priority queue test" );
-  Priority_test_driver( 0 );
-
-  puts( "INIT - Backward priority queue test" );
-  Priority_test_driver( 32 );
-
-rtems_test_pause();
-
-  puts( "INIT - Binary Semaphore and Priority Inheritance Test" );
-
-  status = rtems_semaphore_delete( Semaphore_id[ 2 ] );
-  directive_failed( status, "rtems_semaphore_delete of SM2" );
-
-  puts( "INIT - rtems_semaphore_create - allocated binary semaphore" );
-  status = rtems_semaphore_create(
-    Semaphore_name[ 2 ],
-    0,
-    RTEMS_BINARY_SEMAPHORE | RTEMS_PRIORITY | RTEMS_INHERIT_PRIORITY,
-    RTEMS_NO_PRIORITY,
-    &Semaphore_id[ 2 ]
-  );
-  directive_failed( status, "rtems_semaphore_create of priority inherit SM2" );
-
-  puts( "INIT - rtems_semaphore_release - allocated binary semaphore" );
-  status = rtems_semaphore_release( Semaphore_id[ 2 ] );
-  directive_failed( status, "rtems_semaphore_release of SM2" );
-
-  puts( "INIT - rtems_semaphore_delete - allocated binary semaphore" );
-  status = rtems_semaphore_delete( Semaphore_id[ 2 ] );
-  directive_failed( status, "rtems_semaphore_delete of SM2" );
-
-  status = rtems_semaphore_create(
-    Semaphore_name[ 2 ],
-    1,
-    RTEMS_BINARY_SEMAPHORE | RTEMS_PRIORITY | RTEMS_INHERIT_PRIORITY,
-    RTEMS_NO_PRIORITY,
-    &Semaphore_id[ 2 ]
-  );
-  directive_failed( status, "rtems_semaphore_create of priority inherit SM2" );
-
-  Priority_test_driver( 64 );
-
-rtems_test_pause();
-
-  status = rtems_semaphore_delete( Semaphore_id[ 2 ] );
-  directive_failed( status, "rtems_semaphore_delete of SM2" );
-
-  status = rtems_semaphore_create(
-    Semaphore_name[ 2 ],
-    0,
-    RTEMS_PRIORITY,
-    RTEMS_NO_PRIORITY,
-    &Semaphore_id[ 2 ]
-  );
-  directive_failed( status, "rtems_semaphore_create of priority SM2" );
-
-  status = rtems_semaphore_release( Semaphore_id[ 2 ] );
-  directive_failed( status, "rtems_semaphore_release of SM2" );
-
-  status = rtems_task_create(
-    Task_name[ 1 ],
-    4,
-    RTEMS_MINIMUM_STACK_SIZE * 2,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Task_id[ 1 ]
-  );
-  directive_failed( status, "rtems_task_create of TA1" );
-
-  status = rtems_task_create(
-    Task_name[ 2 ],
-    4,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Task_id[ 2 ]
-  );
-  directive_failed( status, "rtems_task_create of TA2" );
-
-  status = rtems_task_create(
-    Task_name[ 3 ],
-    4,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Task_id[ 3 ]
-  );
-  directive_failed( status, "rtems_task_create of TA3" );
-
-  status = rtems_task_start( Task_id[ 1 ], Task_1, 0 );
-  directive_failed( status, "rtems_task_start of TA1" );
-
-  status = rtems_task_start( Task_id[ 2 ], Task_2, 0 );
-  directive_failed( status, "rtems_task_start of TA2" );
-
-  status = rtems_task_start( Task_id[ 3 ], Task_3, 0 );
-  directive_failed( status, "rtems_task_start of TA3" );
-
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-}
diff --git a/testsuites/sptests/sp12/pridrv.c b/testsuites/sptests/sp12/pridrv.c
deleted file mode 100644
index 24c96c10ea..0000000000
--- a/testsuites/sptests/sp12/pridrv.c
+++ /dev/null
@@ -1,131 +0,0 @@
-/*  Priority_test_driver
- *
- *  This routine is the initialization task for this test program.
- *  It is a user initialization task and has the responsibility for creating
- *  and starting the tasks that make up the test.  If the time of day
- *  clock is required for the test, it should also be set to a known
- *  value by this function.
- *
- *  Input parameters:
- *    priority_base - priority_base switch
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-void Priority_test_driver(
-  rtems_unsigned32 priority_base
-)
-{
-  rtems_task_priority previous_priority;
-  rtems_unsigned32    index;
-  rtems_status_code   status;
-
-  for ( index = 1 ; index <= 5 ; index++ ) {
-    switch ( index ) {
-       case 1:
-       case 2:
-       case 3:
-         Task_priority[ index ] = priority_base + index;
-         break;
-       default:
-         Task_priority[ index ] = priority_base + 3;
-         break;
-    }
-
-    status = rtems_task_create(
-      Priority_task_name[ index ],
-      Task_priority[ index ],
-      RTEMS_MINIMUM_STACK_SIZE * 2,
-      RTEMS_DEFAULT_MODES,
-      RTEMS_DEFAULT_ATTRIBUTES,
-      &Priority_task_id[ index ]
-    );
-    directive_failed( status, "rtems_task_create loop" );
-
-  }
-
-  if ( priority_base == 0 ) {
-    for ( index = 1 ; index <= 5 ; index++ ) {
-      status = rtems_task_start(
-        Priority_task_id[ index ],
-        Priority_task,
-        index
-      );
-      directive_failed( status, "rtems_task_start loop" );
-    }
-  } else {
-    for ( index = 5 ; index >= 1 ; index-- ) {
-      status = rtems_task_start(
-        Priority_task_id[ index ],
-        Priority_task,
-        index
-      );
-      directive_failed( status, "rtems_task_start loop" );
-
-      status = rtems_task_wake_after( TICKS_PER_SECOND );
-      directive_failed( status, "rtems_task_wake_after loop" );
-
-      if ( priority_base == 64 ) {
-        if ( index == 4 ) {
-          status = rtems_task_set_priority(
-            Priority_task_id[ 5 ],
-            priority_base + 4,
-            &previous_priority
-          );
-          printf( "PDRV - change priority of PRI5 from %d to %d\n",
-             previous_priority,
-             priority_base + 4
-          );
-          directive_failed( status, "PDRV rtems_task_set_priority" );
-        }
-        status = rtems_task_set_priority(
-          Priority_task_id[ 5 ],
-          RTEMS_CURRENT_PRIORITY,
-          &previous_priority
-        );
-        directive_failed( status, "PDRV rtems_task_set_priority CURRENT" );
-        printf( "PDRV - priority of PRI5 is %d\n", previous_priority );
-      }
-    }
-  }
-
-  status = rtems_task_wake_after( TICKS_PER_SECOND );
-  directive_failed( status, "rtems_task_wake_after after loop" );
-
-  if ( priority_base == 0 ) {
-    for ( index = 1 ; index <= 5 ; index++ ) {
-      status = rtems_semaphore_release( Semaphore_id[ 2 ] );
-      directive_failed( status, "rtems_semaphore_release loop" );
-    }
-  }
-
-  if ( priority_base == 64 ) {
-    puts( "PDRV - rtems_task_resume - PRI5" );
-    status = rtems_task_resume( Priority_task_id[ 5 ] );
-    directive_failed( status, "rtems_task_resume" );
-
-    status = rtems_task_wake_after( 1 * TICKS_PER_SECOND );
-    directive_failed( status, "rtems_task_wake_after so PRI5 can run" );
-
-    status = rtems_task_delete( Priority_task_id[ 5 ] );
-    directive_failed( status, "rtems_task_delete of PRI5" );
-  }
-  else {
-    for ( index = 1 ; index <= 5 ; index++ ) {
-      status = rtems_task_delete( Priority_task_id[ index ] );
-      directive_failed( status, "rtems_task_delete loop" );
-    }
-  }
-}
diff --git a/testsuites/sptests/sp12/pritask.c b/testsuites/sptests/sp12/pritask.c
deleted file mode 100644
index eb5ac15603..0000000000
--- a/testsuites/sptests/sp12/pritask.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/*  Priority_task
- *
- *  This routine serves as a test task.  It verifies the semaphore manager.
- *
- *  Input parameters:
- *    its_index - priority index
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_task Priority_task(
-  rtems_task_argument its_index
-)
-{
-  rtems_interval      timeout;
-  rtems_task_priority its_priority;
-  rtems_task_priority current_priority;
-  rtems_status_code   status;
-  rtems_unsigned32    index;
-
-  its_priority = Task_priority[ its_index ];
-
-  if ( its_priority < 3 )
-    timeout = 5 * TICKS_PER_SECOND;
-  else
-    timeout = RTEMS_NO_TIMEOUT;
-
-  put_name( Priority_task_name[ its_index ], FALSE );
-  puts( " - rtems_semaphore_obtain - wait forever on SM2" );
-
-  status = rtems_semaphore_obtain(
-    Semaphore_id[ 2 ],
-    RTEMS_DEFAULT_OPTIONS,
-    timeout
-  );
-  directive_failed( status, "rtems_semaphore_obtain of SM2" );
-
-  if ( its_priority < 64 ) {
-    printf( "PRI%d - WHY AM I HERE? (pri=%d)", its_index, its_priority );
-    exit( 0 );
-  }
-
-  if ( its_index == 5 )
-    puts( "PRI5 - rtems_task_suspend - until all priority tasks blocked" );
-  status = rtems_task_suspend( RTEMS_SELF );
-  directive_failed( status, "rtems_task_suspend" );
-
-  puts( "PRI5 - rtems_task_delete - all tasks waiting on SM2" );
-  for ( index = 1 ; index < 5 ; index++ ) {
-    status = rtems_task_delete( Priority_task_id[ index ] );
-    directive_failed( status, "rtems_task_delete loop" );
-  }
-
-  puts( "PRI5 - rtems_semaphore_obtain - nested" );
-  status = rtems_semaphore_obtain(
-    Semaphore_id[ 2 ],
-    RTEMS_DEFAULT_OPTIONS,
-    timeout
-  );
-  directive_failed( status, "rtems_semaphore_obtain nested" );
-
-  puts( "PRI5 - rtems_semaphore_release - nested" );
-  status = rtems_semaphore_release( Semaphore_id[ 2 ] );
-  directive_failed( status, "rtems_semaphore_release nested " );
-
-  puts( "PRI5 - rtems_semaphore_release - restore priority" );
-  status = rtems_semaphore_release( Semaphore_id[ 2 ] );
-  directive_failed( status, "rtems_semaphore_release" );
-
-  status = rtems_task_set_priority(
-    RTEMS_SELF,
-    RTEMS_CURRENT_PRIORITY,
-    &current_priority
-  );
-  directive_failed( status, "PRI5 rtems_task_set_priority CURRENT" );
-  printf( "PRI5 - priority of PRI5 is %d\n", current_priority );
-
-  (void) rtems_task_suspend( RTEMS_SELF );
-}
diff --git a/testsuites/sptests/sp12/sp12.doc b/testsuites/sptests/sp12/sp12.doc
deleted file mode 100644
index a729ab0843..0000000000
--- a/testsuites/sptests/sp12/sp12.doc
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
-This file describes the directives and concepts tested by this test set.
-
-test set name:  test12
-
-directives:
-  ex_init, ex_start, t_create, t_start, t_delete, tm_tick, i_return,
-  sm_create, sm_ident, sm_delete, sm_p, sm_v, tm_wkafter, t_setpri
-
-concepts:
-
-  a.  This test checks out the semaphore manager.
-
-  b.  This test forces _Flush_taskq() to unblock a task waiting
-		  on a deleted object.
diff --git a/testsuites/sptests/sp12/sp12.scn b/testsuites/sptests/sp12/sp12.scn
deleted file mode 100644
index e87a729259..0000000000
--- a/testsuites/sptests/sp12/sp12.scn
+++ /dev/null
@@ -1,78 +0,0 @@
-*** TEST 12 ***
-INIT - Forward priority queue test
-PRI1 - rtems_semaphore_obtain - wait forever on SM2
-PRI2 - rtems_semaphore_obtain - wait forever on SM2
-PRI3 - rtems_semaphore_obtain - wait forever on SM2
-PRI4 - rtems_semaphore_obtain - wait forever on SM2
-PRI5 - rtems_semaphore_obtain - wait forever on SM2
-INIT - Backward priority queue test
-PRI5 - rtems_semaphore_obtain - wait forever on SM2
-PRI4 - rtems_semaphore_obtain - wait forever on SM2
-PRI3 - rtems_semaphore_obtain - wait forever on SM2
-PRI2 - rtems_semaphore_obtain - wait forever on SM2
-PRI1 - rtems_semaphore_obtain - wait forever on SM2
-<pause>
-INIT - Binary Semaphore and Priority Inheritance Test
-INIT - rtems_semaphore_create - allocated binary semaphore
-INIT - rtems_semaphore_release - allocated binary semaphore
-INIT - rtems_semaphore_delete - allocated binary semaphore
-PRI5 - rtems_semaphore_obtain - wait forever on SM2
-PRI5 - rtems_task_suspend - until all priority tasks blocked
-PDRV - priority of PRI5 is 67
-PRI4 - rtems_semaphore_obtain - wait forever on SM2
-PDRV - change priority of PRI5 from 67 to 68
-PDRV - priority of PRI5 is 67
-PRI3 - rtems_semaphore_obtain - wait forever on SM2
-PDRV - priority of PRI5 is 67
-PRI2 - rtems_semaphore_obtain - wait forever on SM2
-PDRV - priority of PRI5 is 66
-PRI1 - rtems_semaphore_obtain - wait forever on SM2
-PDRV - priority of PRI5 is 65
-PDRV - rtems_task_resume - PRI5
-PRI5 - rtems_task_delete - all tasks waiting on SM2
-PRI5 - rtems_semaphore_obtain - nested
-PRI5 - rtems_semaphore_release - nested
-PRI5 - rtems_semaphore_release - restore priority
-PRI5 - priority of PRI5 is 68
-<pause>
-TA1 - rtems_semaphore_ident - smid => 14010002
-TA1 - rtems_semaphore_obtain - wait forever on SM2
-TA1 - got SM2
-TA1 - rtems_semaphore_obtain - wait forever on SM3
-TA1 - got SM3
-TA1 - rtems_semaphore_obtain - get SM1 - RTEMS_NO_WAIT
-TA1 - got SM1
-TA1 - rtems_task_wake_after - sleep 5 seconds
-TA2 - rtems_semaphore_obtain - wait forever on SM1
-TA3 - rtems_semaphore_obtain - wait forever on SM2
-<pause>
-TA1 - rtems_semaphore_release - release SM1
-TA1 - rtems_semaphore_obtain - waiting for SM1 with 10 second timeout
-TA2 - got SM1
-TA2 - rtems_semaphore_release - release SM1
-TA2 - rtems_task_set_priority - make self highest priority task
-TA2 - rtems_semaphore_obtain - wait forever on SM2
-TA1 - got SM1
-TA1 - rtems_semaphore_release - release SM2
-TA2 - got SM2
-TA2 - rtems_semaphore_release - release SM2
-TA2 - rtems_task_delete - delete self
-TA1 - rtems_task_wake_after - sleep 5 seconds
-TA3 - got SM2
-TA3 - rtems_semaphore_release - release SM2
-TA3 - rtems_semaphore_obtain - wait forever on SM3
-<pause>
-TA1 - rtems_task_delete - delete TA3
-TA1 - rtems_task_wake_after - sleep 5 seconds
-TA4 - rtems_semaphore_obtain - wait forever on SM1
-TA5 - rtems_semaphore_obtain - wait forever on SM1
-TA1 - rtems_task_delete - delete TA4
-TA1 - rtems_semaphore_release - release SM1
-TA1 - rtems_task_wake_after - sleep 5 seconds
-TA5 - got SM1
-TA5 - rtems_semaphore_obtain - wait forever on SM1
-TA1 - rtems_semaphore_delete - delete SM1
-TA1 - rtems_semaphore_delete - delete SM3
-TA1 - rtems_task_delete - delete self
-TA5 - SM1 deleted by TA1
-*** END OF TEST 12 ***
diff --git a/testsuites/sptests/sp12/system.h b/testsuites/sptests/sp12/system.h
deleted file mode 100644
index 08b43430a6..0000000000
--- a/testsuites/sptests/sp12/system.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*  system.h
- *
- *  This include file contains information that is included in every
- *  function in the test set.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <tmacros.h>
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
- 
-void Priority_test_driver(
-  rtems_unsigned32 priority_base
-);
- 
-rtems_task Priority_task(
-  rtems_task_argument its_index
-);
- 
-rtems_task Task_1(
-  rtems_task_argument argument
-);
- 
-rtems_task Task_2(
-  rtems_task_argument argument
-);
- 
-rtems_task Task_3(
-  rtems_task_argument argument
-);
- 
-rtems_task Task_4(
-  rtems_task_argument argument
-);
- 
-rtems_task Task5(
-  rtems_task_argument argument
-);
-
-/* configuration information */
-
-#define CONFIGURE_SPTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_INIT_TASK_STACK_SIZE      (RTEMS_MINIMUM_STACK_SIZE * 2)
-#define CONFIGURE_MAXIMUM_SEMAPHORES         10
-#define CONFIGURE_TICKS_PER_TIMESLICE       100
-
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#define CONFIGURE_EXTRA_TASK_STACKS         (6 * RTEMS_MINIMUM_STACK_SIZE)
-
-#include <confdefs.h>
-
-/* global variables */
-
- 
-TEST_EXTERN rtems_id   Task_id[ 6 ];             /* array of task ids */
-TEST_EXTERN rtems_name Task_name[ 6 ];           /* array of task names */
- 
-TEST_EXTERN rtems_id   Priority_task_id[ 6 ];    /* array of task ids */
-TEST_EXTERN rtems_name Priority_task_name[ 6 ];  /* array of task names */
- 
-TEST_EXTERN rtems_task_priority Task_priority[ 6 ];
- 
-TEST_EXTERN rtems_id   Semaphore_id[ 4 ];        /* array of semaphore ids */
-TEST_EXTERN rtems_name Semaphore_name[ 4 ];      /* array of semaphore names */
-
-/* end of include file */
diff --git a/testsuites/sptests/sp12/task1.c b/testsuites/sptests/sp12/task1.c
deleted file mode 100644
index 4b284ee364..0000000000
--- a/testsuites/sptests/sp12/task1.c
+++ /dev/null
@@ -1,153 +0,0 @@
-/*  Task_1
- *
- *  This routine serves as a test task.  It verifies the semaphore manager.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_task Task_1(
-  rtems_task_argument argument
-)
-{
-  rtems_id          smid;
-  rtems_status_code status;
-
-  status = rtems_semaphore_ident(
-    Semaphore_name[ 1 ],
-    RTEMS_SEARCH_ALL_NODES,
-    &smid
-  );
-  printf( "TA1 - rtems_semaphore_ident - smid => %08x\n", smid );
-  directive_failed( status, "rtems_semaphore_ident of SM1" );
-
-  puts( "TA1 - rtems_semaphore_obtain - wait forever on SM2" );
-  status = rtems_semaphore_obtain(
-    Semaphore_id[ 2 ],
-    RTEMS_DEFAULT_OPTIONS,
-    RTEMS_NO_TIMEOUT
-  );
-  directive_failed( status, "rtems_semaphore_obtain of SM2" );
-  puts( "TA1 - got SM2" );
-
-  puts( "TA1 - rtems_semaphore_obtain - wait forever on SM3" );
-  status = rtems_semaphore_obtain(
-    Semaphore_id[ 3 ],
-    RTEMS_DEFAULT_OPTIONS,
-    RTEMS_NO_TIMEOUT
-  );
-  directive_failed( status, "rtems_semaphore_obtain of SM3" );
-  puts( "TA1 - got SM3" );
-
-  puts( "TA1 - rtems_semaphore_obtain - get SM1 - RTEMS_NO_WAIT" );
-  status = rtems_semaphore_obtain(
-    Semaphore_id[ 1 ],
-    RTEMS_NO_WAIT,
-    RTEMS_NO_TIMEOUT
-  );
-  directive_failed( status, "rtems_semaphore_obtain of SM1" );
-  puts( "TA1 - got SM1" );
-
-  puts( "TA1 - rtems_task_wake_after - sleep 5 seconds" );
-  status = rtems_task_wake_after( 5*TICKS_PER_SECOND );
-  directive_failed( status, "rtems_task_wake_after" );
-
-rtems_test_pause();
-
-  puts( "TA1 - rtems_semaphore_release - release SM1" );
-  status = rtems_semaphore_release( Semaphore_id[ 1 ] );
-  directive_failed( status, "rtems_semaphore_release of SM1" );
-
-  puts(
-    "TA1 - rtems_semaphore_obtain - waiting for SM1 with 10 second timeout"
-  );
-  status = rtems_semaphore_obtain(
-    Semaphore_id[ 1 ],
-    RTEMS_DEFAULT_OPTIONS,
-    10 * TICKS_PER_SECOND
-  );
-  directive_failed( status, "rtems_semaphore_obtain of SM1" );
-  puts( "TA1 - got SM1" );
-
-  puts( "TA1 - rtems_semaphore_release - release SM2" );
-  status = rtems_semaphore_release( Semaphore_id[ 2 ] );
-  directive_failed( status, "rtems_semaphore_release of SM2" );
-
-  puts( "TA1 - rtems_task_wake_after - sleep 5 seconds" );
-  status = rtems_task_wake_after( 5*TICKS_PER_SECOND );
-  directive_failed( status, "rtems_task_wake_after" );
-
-rtems_test_pause();
-
-  puts( "TA1 - rtems_task_delete - delete TA3" );
-  status = rtems_task_delete( Task_id[ 3 ] );
-  directive_failed( status, "rtems_task_delete of TA3" );
-
-  status = rtems_task_create(
-    Task_name[ 4 ],
-    4,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Task_id[ 4 ]
-  );
-  directive_failed( status, "rtems_task_create of TA4" );
-
-  status = rtems_task_create(
-    Task_name[ 5 ],
-    4,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Task_id[ 5 ]
-   );
-  directive_failed( status, "rtems_task_create of TA5" );
-
-  status = rtems_task_start( Task_id[ 4 ], Task_4, 0 );
-  directive_failed( status, "rtems_task_start of TA4" );
-
-  status = rtems_task_start( Task_id[ 5 ], Task5, 0 );
-  directive_failed( status, "rtems_task_start of TA5" );
-
-  puts( "TA1 - rtems_task_wake_after - sleep 5 seconds" );
-  status = rtems_task_wake_after( 5*TICKS_PER_SECOND );
-  directive_failed( status, "rtems_task_wake_after" );
-
-  puts( "TA1 - rtems_task_delete - delete TA4" );
-  status = rtems_task_delete( Task_id[ 4 ] );
-  directive_failed( status, "rtems_task_delete of TA4" );
-
-  puts( "TA1 - rtems_semaphore_release - release SM1" );
-  status = rtems_semaphore_release( Semaphore_id[ 1 ] );
-  directive_failed( status, "rtems_semaphore_release on SM1" );
-
-  puts( "TA1 - rtems_task_wake_after - sleep 5 seconds" );
-  status = rtems_task_wake_after( 5*TICKS_PER_SECOND );
-  directive_failed( status, "rtems_task_wake_after" );
-
-  puts( "TA1 - rtems_semaphore_delete - delete SM1" );
-  status = rtems_semaphore_delete( Semaphore_id[ 1 ] );
-  directive_failed( status, "rtems_semaphore_delete of SM1" );
-
-  puts( "TA1 - rtems_semaphore_delete - delete SM3" );
-  status = rtems_semaphore_delete( Semaphore_id[ 3 ] );
-  directive_failed( status, "rtems_semaphore_delete of SM3" );
-
-  puts( "TA1 - rtems_task_delete - delete self" );
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of TA1" );
-}
diff --git a/testsuites/sptests/sp12/task2.c b/testsuites/sptests/sp12/task2.c
deleted file mode 100644
index c83fd87b8a..0000000000
--- a/testsuites/sptests/sp12/task2.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*  Task_2
- *
- *  This routine serves as a test task.  It simply obtains semaphores
- *  1 and 2, the later when it is a high priority task.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-#include "system.h"
-
-rtems_task Task_2(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code   status;
-  rtems_task_priority previous_priority;
-
-  puts( "TA2 - rtems_semaphore_obtain - wait forever on SM1" );
-  status = rtems_semaphore_obtain(
-    Semaphore_id[ 1 ],
-    RTEMS_DEFAULT_OPTIONS,
-    RTEMS_NO_TIMEOUT
-  );
-  puts( "TA2 - got SM1" );
-  directive_failed( status, "rtems_semaphore_obtain on SM1" );
-
-  puts( "TA2 - rtems_semaphore_release - release SM1" );
-  status = rtems_semaphore_release( Semaphore_id[ 1 ] );
-  directive_failed( status, "rtems_semaphore_release on SM1" );
-
-  puts( "TA2 - rtems_task_set_priority - make self highest priority task" );
-  status = rtems_task_set_priority( RTEMS_SELF, 3, &previous_priority );
-  directive_failed( status, "rtems_task_set_priority on TA2" );
-
-  puts( "TA2 - rtems_semaphore_obtain - wait forever on SM2" );
-  status = rtems_semaphore_obtain(
-    Semaphore_id[ 2 ],
-    RTEMS_DEFAULT_OPTIONS,
-    RTEMS_NO_TIMEOUT
-  );
-  puts( "TA2 - got SM2" );
-  directive_failed( status, "rtems_semaphore_obtain on SM2" );
-
-  puts( "TA2 - rtems_semaphore_release - release SM2" );
-  status = rtems_semaphore_release( Semaphore_id[ 2 ] );
-  directive_failed( status, "rtems_semaphore_release on SM2" );
-
-  puts( "TA2 - rtems_task_delete - delete self" );
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of TA2" );
-}
diff --git a/testsuites/sptests/sp12/task3.c b/testsuites/sptests/sp12/task3.c
deleted file mode 100644
index 5622df991f..0000000000
--- a/testsuites/sptests/sp12/task3.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*  Task_3
- *
- *  This routine serves as a test task.  It simply obtains semaphore
- *  2 and waits forever attempting to obtain semaphore 3.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_task Task_3(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-
-  puts( "TA3 - rtems_semaphore_obtain - wait forever on SM2" );
-  status = rtems_semaphore_obtain(
-    Semaphore_id[ 2 ],
-    RTEMS_DEFAULT_OPTIONS,
-    RTEMS_NO_TIMEOUT
-  );
-  directive_failed( status, "rtems_semaphore_obtain on SM2" );
-  puts( "TA3 - got SM2" );
-
-  puts( "TA3 - rtems_semaphore_release - release SM2" );
-  status = rtems_semaphore_release( Semaphore_id[ 2 ] );
-  directive_failed( status, "rtems_semaphore_release on SM2" );
-
-  puts( "TA3 - rtems_semaphore_obtain - wait forever on SM3" );
-  status = rtems_semaphore_obtain(
-    Semaphore_id[ 3 ],
-    RTEMS_DEFAULT_OPTIONS,
-    RTEMS_NO_TIMEOUT
-  );
-  directive_failed( status, "rtems_semaphore_obtain on SM3" );
-}
diff --git a/testsuites/sptests/sp12/task4.c b/testsuites/sptests/sp12/task4.c
deleted file mode 100644
index f392007fe2..0000000000
--- a/testsuites/sptests/sp12/task4.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*  Task_4
- *
- *  This routine serves as a test task.  It waits forever attempting
- *  to obtain semaphore 1.  However, it should never get the semaphore!
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_task Task_4(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-
-  puts( "TA4 - rtems_semaphore_obtain - wait forever on SM1" );
-  status = rtems_semaphore_obtain(
-    Semaphore_id[ 1 ],
-    RTEMS_DEFAULT_OPTIONS,
-    RTEMS_NO_TIMEOUT
-  );
-  directive_failed( status, "rtems_semaphore_obtain on SM1" );
-}
diff --git a/testsuites/sptests/sp12/task5.c b/testsuites/sptests/sp12/task5.c
deleted file mode 100644
index 263eed640b..0000000000
--- a/testsuites/sptests/sp12/task5.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*  Task5
- *
- *  This routine serves as a test task.  It obtains semaphore 1 correctly
- *  once, then waits for semaphore 1 again.  Task 1 should delete the
- *  semaphore, thus waking this task up.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_task Task5(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-
-  puts( "TA5 - rtems_semaphore_obtain - wait forever on SM1" );
-  status = rtems_semaphore_obtain(
-    Semaphore_id[ 1 ],
-    RTEMS_DEFAULT_OPTIONS,
-    RTEMS_NO_TIMEOUT
-  );
-  directive_failed( status, "rtems_semaphore_obtain on SM1" );
-  puts( "TA5 - got SM1" );
-
-  puts( "TA5 - rtems_semaphore_obtain - wait forever on SM1" );
-  status = rtems_semaphore_obtain(
-    Semaphore_id[ 1 ],
-    RTEMS_DEFAULT_OPTIONS,
-    RTEMS_NO_TIMEOUT
-  );
-  fatal_directive_status(
-    status,
-    RTEMS_OBJECT_WAS_DELETED,
-    "rtems_semaphore_obtain on SM1"
-  );
-  puts( "TA5 - SM1 deleted by TA1" );
-
-  puts( "*** END OF TEST 12 ***" );
-  exit( 0 );
-}
diff --git a/testsuites/sptests/sp13/fillbuff.c b/testsuites/sptests/sp13/fillbuff.c
deleted file mode 100644
index 2f821d6c1c..0000000000
--- a/testsuites/sptests/sp13/fillbuff.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/*  Fill_buffer
- *
- *  This test routine copies a given source string to a given destination
- *  buffer.
- *
- *  Input parameters:
- *    source - pointer to string to be copied
- *    buffer - pointer to message buffer to be filled
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-void Fill_buffer(
-  char *source,
-  long *buffer
-)
-{
-  memcpy( buffer, source, 16 );
-}
diff --git a/testsuites/sptests/sp13/init.c b/testsuites/sptests/sp13/init.c
deleted file mode 100644
index 40b6574d68..0000000000
--- a/testsuites/sptests/sp13/init.c
+++ /dev/null
@@ -1,112 +0,0 @@
-/*  Init
- *
- *  This routine is the initialization task for this test program.
- *  It is a user initialization task and has the responsibility for creating
- *  and starting the tasks that make up the test.  If the time of day
- *  clock is required for the test, it should also be set to a known
- *  value by this function.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "system.h"
-
-rtems_task Init(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-
-  puts( "\n\n*** TEST 13 ***" );
-
-  Task_name[ 1 ] =  rtems_build_name( 'T', 'A', '1', ' ' );
-  Task_name[ 2 ] =  rtems_build_name( 'T', 'A', '2', ' ' );
-  Task_name[ 3 ] =  rtems_build_name( 'T', 'A', '3', ' ' );
-
-  status = rtems_task_create(
-    Task_name[ 1 ],
-    4,
-    RTEMS_MINIMUM_STACK_SIZE * 2,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Task_id[ 1 ]
-  );
-  directive_failed( status, "rtems_task_create of TA1" );
-
-  status = rtems_task_create(
-    Task_name[ 2 ],
-    4,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Task_id[ 2 ]
-  );
-  directive_failed( status, "rtems_task_create of TA2" );
-
-  status = rtems_task_create(
-    Task_name[ 3 ],
-    4,
-    RTEMS_MINIMUM_STACK_SIZE * 2,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Task_id[ 3 ]
-  );
-  directive_failed( status, "rtems_task_create of TA3" );
-
-  status = rtems_task_start( Task_id[ 1 ], Task_1, 0 );
-  directive_failed( status, "rtems_task_start of TA1" );
-
-  status = rtems_task_start( Task_id[ 2 ], Task_2, 0 );
-  directive_failed( status, "rtems_task_start of TA2" );
-
-  status = rtems_task_start( Task_id[ 3 ], Task_3, 0 );
-  directive_failed( status, "rtems_task_start of TA3" );
-  
-  Queue_name[ 1 ] = rtems_build_name( 'Q', '1', ' ', ' ' );
-  Queue_name[ 2 ] = rtems_build_name( 'Q', '2', ' ', ' ' );
-  Queue_name[ 3 ] = rtems_build_name( 'Q', '3', ' ', ' ' );
-
-  status = rtems_message_queue_create(
-    Queue_name[ 1 ],
-    100,
-    16,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Queue_id[ 1 ]
-  );
-  directive_failed( status, "rtems_message_queue_create of Q1" );
-
-  status = rtems_message_queue_create(
-    Queue_name[ 2 ],
-    10,
-    16,
-    RTEMS_PRIORITY,
-    &Queue_id[ 2 ]
-  );
-  directive_failed( status, "rtems_message_queue_create of Q2" );
-
-  status = rtems_message_queue_create(
-    Queue_name[ 3 ],
-    100,
-    16,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Queue_id[ 3 ]
-  );
-  directive_failed( status, "rtems_message_queue_create of Q3" );
-
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-}
diff --git a/testsuites/sptests/sp13/putbuff.c b/testsuites/sptests/sp13/putbuff.c
deleted file mode 100644
index 154be5d400..0000000000
--- a/testsuites/sptests/sp13/putbuff.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/*  Put_buffer
- *
- *  This test routine prints the given buffer.
- *  buffer.
- *
- *  Input parameters:
- *    buffer - pointer to message buffer to be printer
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-void Put_buffer(
-  long *buffer
-)
-{
-  printf( "%16s", (char *)buffer );
-}
diff --git a/testsuites/sptests/sp13/sp13.doc b/testsuites/sptests/sp13/sp13.doc
deleted file mode 100644
index e46d8b6eed..0000000000
--- a/testsuites/sptests/sp13/sp13.doc
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
-This file describes the directives and concepts tested by this test set.
-
-test set name:  test13
-
-directives:
-  ex_init, ex_start, t_create, t_start, t_delete, tm_tick, i_return,
-  q_create, q_ident, q_delete, q_send, q_urgent, q_broadcast, q_receive,
-  tm_wkafter, t_setpri
-
-concepts:
-
-  a.  This test checks out the message manager.
diff --git a/testsuites/sptests/sp13/sp13.scn b/testsuites/sptests/sp13/sp13.scn
deleted file mode 100644
index cb34131eb9..0000000000
--- a/testsuites/sptests/sp13/sp13.scn
+++ /dev/null
@@ -1,76 +0,0 @@
-*** TEST 13 ***
-TA1 - rtems_message_queue_ident - qid => 18010001
-TA1 - rtems_message_queue_send - BUFFER 1 TO Q 1
-TA1 - rtems_message_queue_send - BUFFER 2 TO Q 1
-TA1 - rtems_task_wake_after - sleep 5 seconds
-TA2 - rtems_message_queue_receive - receive from queue 1 - RTEMS_NO_WAIT
-TA2 - buffer received: BUFFER 1 TO Q 1
-TA2 - rtems_message_queue_receive - receive from queue 1 - RTEMS_WAIT FOREVER
-TA2 - buffer received: BUFFER 2 TO Q 1
-TA2 - rtems_message_queue_receive - receive from queue 1 - RTEMS_WAIT FOREVER
-TA3 - rtems_message_queue_receive - receive from queue 2 - RTEMS_WAIT FOREVER
-TA1 - rtems_message_queue_send - BUFFER 3 TO Q 1
-TA1 - rtems_task_wake_after - sleep 5 seconds
-TA2 - buffer received: BUFFER 3 TO Q 1
-TA2 - rtems_task_set_priority - make self highest priority task
-TA2 - rtems_message_queue_receive - receive from queue 2 - RTEMS_WAIT FOREVER
-<pause>
-TA1 - rtems_message_queue_send - BUFFER 1 TO Q 2
-TA2 - buffer received: BUFFER 1 TO Q 2
-TA2 - rtems_message_queue_send - BUFFER 2 TO Q 2
-TA2 - rtems_message_queue_receive - receive from queue 1 - 10 second timeout
-TA1 - rtems_message_queue_receive - receive from queue 1 - 10 second timeout
-TA3 - buffer received: BUFFER 2 TO Q 2
-TA3 - rtems_message_queue_broadcast - BUFFER 3 TO Q 1
-TA2 - buffer received: BUFFER 3 TO Q 1
-TA2 - rtems_message_queue_receive - receive from queue 3 - RTEMS_WAIT FOREVER
-TA3 - number of tasks awakened = 02
-TA3 - rtems_message_queue_receive - receive from queue 3 - RTEMS_WAIT FOREVER
-TA1 - buffer received: BUFFER 3 TO Q 1
-TA1 - rtems_task_delete - delete TA2
-TA1 - rtems_message_queue_send - BUFFER 1 TO Q 3
-TA1 - rtems_task_wake_after - sleep 5 seconds
-TA3 - buffer received: BUFFER 1 TO Q 3
-TA3 - rtems_task_delete - delete self
-<pause>
-TA1 - rtems_message_queue_send - BUFFER 2 TO Q 3
-TA1 - rtems_message_queue_send - BUFFER 3 TO Q 3
-TA1 - rtems_message_queue_send - BUFFER 4 TO Q 3
-TA1 - rtems_message_queue_urgent - BUFFER 5 TO Q 3
-TA1 - rtems_message_queue_receive - receive from queue 3 - RTEMS_WAIT FOREVER
-TA1 - buffer received: BUFFER 5 TO Q 3
-TA1 - rtems_message_queue_receive - receive from queue 3 - RTEMS_WAIT FOREVER
-TA1 - buffer received: BUFFER 2 TO Q 3
-TA1 - rtems_message_queue_receive - receive from queue 3 - RTEMS_WAIT FOREVER
-TA1 - buffer received: BUFFER 3 TO Q 3
-TA1 - rtems_message_queue_receive - receive from queue 3 - RTEMS_WAIT FOREVER
-TA1 - buffer received: BUFFER 4 TO Q 3
-TA1 - rtems_message_queue_urgent - BUFFER 3 TO Q 2
-TA1 - rtems_message_queue_receive - receive from queue 2 - RTEMS_WAIT FOREVER
-TA1 - buffer received: BUFFER 3 TO Q 2
-<pause>
-TA1 - rtems_message_queue_delete - delete queue 1
-TA1 - rtems_message_queue_urgent - BUFFER 3 TO Q 2
-TA1 - rtems_message_queue_delete - delete queue 2
-TA1 - rtems_message_queue_get_number_pending - SUCCESSFUL
-TA1 - 0 messages are pending on Q 3
-TA1 - rtems_message_queue_flush - empty Q 3
-TA1 - 0 messages were flushed from Q 3
-TA1 - rtems_message_queue_send - BUFFER 1 TO Q 3
-TA1 - rtems_message_queue_send - BUFFER 2 TO Q 3
-TA1 - rtems_message_queue_get_number_pending - SUCCESSFUL
-TA1 - 2 messages are pending on Q 3
-TA1 - rtems_message_queue_send - BUFFER 3 TO Q 3
-TA1 - rtems_message_queue_flush - Q 3
-TA1 - 3 messages were flushed from Q 3
-TA1 - rtems_message_queue_send until all message buffers consumed
-TA1 - all message buffers consumed
-TA1 - rtems_message_queue_flush - Q 3
-TA1 - 100 messages were flushed from Q 3
-<pause> 
-TA1 - create message queue of 20 bytes on queue 1
-TA1 - rtems_message_queue_delete - delete queue 1
-<pause> 
-TA1 - rtems_message_queue_create - variable sizes 
-TA1 - rtems_message_queue_create and send - variable sizes 
-*** END OF TEST 13 ***
diff --git a/testsuites/sptests/sp13/system.h b/testsuites/sptests/sp13/system.h
deleted file mode 100644
index e1efa42963..0000000000
--- a/testsuites/sptests/sp13/system.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*  system.h
- *
- *  This include file contains information that is included in every
- *  function in the test set.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <tmacros.h>
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
- 
-void Fill_buffer(
-  char  source[],
-  long *buffer
-);
- 
-void Put_buffer(
-  long *buffer
-);
- 
-rtems_task Task_1(
-  rtems_task_argument argument
-);
- 
-rtems_task Task_2(
-  rtems_task_argument argument
-);
- 
-rtems_task Task_3(
-  rtems_task_argument argument
-);
-
-/* configuration information */
-
-#define CONFIGURE_SPTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES     10
-#define CONFIGURE_TICKS_PER_TIMESLICE       100
-
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#define CONFIGURE_EXTRA_TASK_STACKS         (2 * RTEMS_MINIMUM_STACK_SIZE)
-
-#include <confdefs.h>
-
-/* global variables */
-
-TEST_EXTERN rtems_id   Task_id[ 4 ];         /* array of task ids */
-TEST_EXTERN rtems_name Task_name[ 4 ];       /* array of task names */
-
-TEST_EXTERN rtems_id   Queue_id[ 4 ];        /* array of queue ids */
-TEST_EXTERN rtems_name Queue_name[ 4 ];      /* array of queue names */
-
-/* end of include file */
diff --git a/testsuites/sptests/sp13/task1.c b/testsuites/sptests/sp13/task1.c
deleted file mode 100644
index 3ac0c398eb..0000000000
--- a/testsuites/sptests/sp13/task1.c
+++ /dev/null
@@ -1,352 +0,0 @@
-/*  Task_1
- *
- *  This routine serves as a test task.  It verifies the message manager.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-#include <string.h>             /* for memcmp */
-
-extern rtems_configuration_table BSP_Configuration;
-
-char    big_send_buffer[2048];
-char    big_receive_buffer[2048];
-
-long    buffer[ 4 ];
-
-void dope_buffer(unsigned char *buff,
-                 int   buff_size,
-                 unsigned32 v)
-{
-    int i;
-    unsigned char ch;
-
-    ch = (' ' + (v % (0x7f - ' ')));
-    
-    for (i=0; i<buff_size; i++)
-    {
-        *buff++ = ch++;
-        if (ch >= 0x7f)
-            ch = ' ';
-    }
-}
-
-rtems_task Task_1(
-  rtems_task_argument argument
-)
-{
-  rtems_id          qid;
-  rtems_unsigned32  index;
-  rtems_unsigned32  count;
-  rtems_status_code status;
-  rtems_unsigned32  size;
-  rtems_unsigned32  queue_size;
-  char             *cp;
-  
-  status = rtems_message_queue_ident(
-    Queue_name[ 1 ],
-    RTEMS_SEARCH_ALL_NODES,
-    &qid
-  );
-  printf( "TA1 - rtems_message_queue_ident - qid => %08x\n", qid );
-  directive_failed( status, "rtems_message_queue_ident" );
-
-  Fill_buffer( "BUFFER 1 TO Q 1", buffer );
-  puts( "TA1 - rtems_message_queue_send - BUFFER 1 TO Q 1" );
-  status = rtems_message_queue_send( Queue_id[ 1 ], buffer, 16 );
-  directive_failed( status, "rtems_message_queue_send" );
-
-  Fill_buffer( "BUFFER 2 TO Q 1", buffer );
-  puts( "TA1 - rtems_message_queue_send - BUFFER 2 TO Q 1" );
-  status = rtems_message_queue_send( Queue_id[ 1 ], buffer, 16 );
-  directive_failed( status, "rtems_message_queue_send" );
-
-  puts( "TA1 - rtems_task_wake_after - sleep 5 seconds" );
-  status = rtems_task_wake_after( 5*TICKS_PER_SECOND );
-  directive_failed( status, "rtems_task_wake_after" );
-
-  Fill_buffer( "BUFFER 3 TO Q 1", buffer );
-  puts( "TA1 - rtems_message_queue_send - BUFFER 3 TO Q 1" );
-  status = rtems_message_queue_send( Queue_id[ 1 ], buffer, 16 );
-  directive_failed( status, "rtems_message_queue_send" );
-
-  puts( "TA1 - rtems_task_wake_after - sleep 5 seconds" );
-  status = rtems_task_wake_after( 5*TICKS_PER_SECOND );
-  directive_failed( status, "rtems_task_wake_after" );
-
-rtems_test_pause();
-
-  Fill_buffer( "BUFFER 1 TO Q 2", buffer );
-  puts( "TA1 - rtems_message_queue_send - BUFFER 1 TO Q 2" );
-  status = rtems_message_queue_send( Queue_id[ 2 ], buffer, 16 );
-  directive_failed( status, "rtems_message_queue_send" );
-
-  puts_nocr( "TA1 - rtems_message_queue_receive - receive from queue 1 - " );
-  puts     ( "10 second timeout" );
-  status = rtems_message_queue_receive(
-    Queue_id[ 1 ],
-    buffer,
-    &size,
-    RTEMS_DEFAULT_OPTIONS,
-    10 * TICKS_PER_SECOND
-  );
-  directive_failed( status, "rtems_message_queue_receive" );
-  puts_nocr( "TA1 - buffer received: " );
-  Put_buffer( buffer );
-  new_line;
-
-  puts( "TA1 - rtems_task_delete - delete TA2" );
-  status = rtems_task_delete( Task_id[ 2 ] );
-  directive_failed( status, "rtems_task_delete" );
-
-  Fill_buffer( "BUFFER 1 TO Q 3", buffer );
-  puts( "TA1 - rtems_message_queue_send - BUFFER 1 TO Q 3" );
-  status = rtems_message_queue_send( Queue_id[ 3 ], buffer, 16 );
-  directive_failed( status, "rtems_message_queue_send" );
-
-  puts( "TA1 - rtems_task_wake_after - sleep 5 seconds" );
-  status = rtems_task_wake_after( 5*TICKS_PER_SECOND );
-  directive_failed( status, "rtems_task_wake_after" );
-
-rtems_test_pause();
-
-  Fill_buffer( "BUFFER 2 TO Q 3", buffer );
-  puts( "TA1 - rtems_message_queue_send - BUFFER 2 TO Q 3" );
-  status = rtems_message_queue_send( Queue_id[ 3 ], buffer, 16 );
-  directive_failed( status, "rtems_message_queue_send" );
-
-  Fill_buffer( "BUFFER 3 TO Q 3", buffer );
-  puts( "TA1 - rtems_message_queue_send - BUFFER 3 TO Q 3" );
-  status = rtems_message_queue_send( Queue_id[ 3 ], buffer, 16 );
-  directive_failed( status, "rtems_message_queue_send" );
-
-  Fill_buffer( "BUFFER 4 TO Q 3", buffer );
-  puts( "TA1 - rtems_message_queue_send - BUFFER 4 TO Q 3" );
-  status = rtems_message_queue_send( Queue_id[ 3 ], buffer, 16 );
-  directive_failed( status, "rtems_message_queue_send" );
-
-  Fill_buffer( "BUFFER 5 TO Q 3", buffer );
-  puts( "TA1 - rtems_message_queue_urgent - BUFFER 5 TO Q 3" );
-  status = rtems_message_queue_urgent( Queue_id[ 3 ], buffer, 16 );
-  directive_failed( status, "rtems_message_queue_urgent" );
-
-  for ( index = 1 ; index <= 4 ; index++ ) {
-    puts(
-      "TA1 - rtems_message_queue_receive - receive from queue 3 - "
-        "RTEMS_WAIT FOREVER"
-    );
-    status = rtems_message_queue_receive(
-      Queue_id[ 3 ],
-      buffer,
-      &size,
-      RTEMS_DEFAULT_OPTIONS,
-      RTEMS_NO_TIMEOUT
-    );
-    directive_failed( status, "rtems_message_queue_receive" );
-    puts_nocr( "TA1 - buffer received: " );
-    Put_buffer( buffer );
-    new_line;
-  }
-
-  Fill_buffer( "BUFFER 3 TO Q 2", buffer );
-  puts( "TA1 - rtems_message_queue_urgent - BUFFER 3 TO Q 2" );
-  status = rtems_message_queue_urgent( Queue_id[ 2 ], buffer, 16 );
-  directive_failed( status, "rtems_message_queue_urgent" );
-
-  puts(
-    "TA1 - rtems_message_queue_receive - receive from queue 2 - "
-      "RTEMS_WAIT FOREVER"
-  );
-  status = rtems_message_queue_receive(
-    Queue_id[ 2 ],
-    buffer,
-    &size,
-    RTEMS_DEFAULT_OPTIONS,
-    RTEMS_NO_TIMEOUT
-  );
-  directive_failed( status, "rtems_message_queue_receive" );
-  puts_nocr( "TA1 - buffer received: " );
-  Put_buffer( buffer );
-  new_line;
-
-rtems_test_pause();
-
-  puts( "TA1 - rtems_message_queue_delete - delete queue 1" );
-  status = rtems_message_queue_delete( Queue_id[ 1 ] );
-  directive_failed( status, "rtems_message_queue_delete" );
-
-  Fill_buffer( "BUFFER 3 TO Q 2", buffer );
-  puts( "TA1 - rtems_message_queue_urgent - BUFFER 3 TO Q 2" );
-  status = rtems_message_queue_urgent( Queue_id[ 2 ], buffer, 16 );
-  directive_failed( status, "rtems_message_queue_urgent" );
-
-  puts( "TA1 - rtems_message_queue_delete - delete queue 2" );
-  status = rtems_message_queue_delete( Queue_id[ 2 ] );
-  directive_failed( status, "rtems_message_queue_delete" );
-
-  puts( "TA1 - rtems_message_queue_get_number_pending - SUCCESSFUL\n" );
-  status = rtems_message_queue_get_number_pending( Queue_id[ 3 ], &count );
-  printf( "TA1 - %d messages are pending on Q 3\n", count );
-
-  puts( "TA1 - rtems_message_queue_flush - empty Q 3" );
-  status = rtems_message_queue_flush( Queue_id[ 3 ], &count );
-  printf( "TA1 - %d messages were flushed from Q 3\n", count );
-
-  Fill_buffer( "BUFFER 1 TO Q 3", buffer );
-  puts( "TA1 - rtems_message_queue_send - BUFFER 1 TO Q 3" );
-  status = rtems_message_queue_send( Queue_id[ 3 ], buffer, 16 );
-  directive_failed( status, "rtems_message_queue_send" );
-
-  Fill_buffer( "BUFFER 2 TO Q 3", buffer );
-  puts( "TA1 - rtems_message_queue_send - BUFFER 2 TO Q 3" );
-  status = rtems_message_queue_send( Queue_id[ 3 ], buffer, 16 );
-  directive_failed( status, "rtems_message_queue_send" );
-
-  puts( "TA1 - rtems_message_queue_get_number_pending - SUCCESSFUL\n" );
-  status = rtems_message_queue_get_number_pending( Queue_id[ 3 ], &count );
-  printf( "TA1 - %d messages are pending on Q 3\n", count );
-
-  Fill_buffer( "BUFFER 3 TO Q 3", buffer );
-  puts( "TA1 - rtems_message_queue_send - BUFFER 3 TO Q 3" );
-  status = rtems_message_queue_send( Queue_id[ 3 ], buffer, 16 );
-  directive_failed( status, "rtems_message_queue_send" );
-
-  puts( "TA1 - rtems_message_queue_flush - Q 3" );
-  status = rtems_message_queue_flush( Queue_id[ 3 ], &count );
-  printf( "TA1 - %d messages were flushed from Q 3\n", count );
-
-  puts( "TA1 - rtems_message_queue_send until all message buffers consumed" );
-  while ( FOREVER ) {
-    status = rtems_message_queue_send( Queue_id[ 3 ], buffer, 16 );
-    if ( status == RTEMS_TOO_MANY ) break;
-    directive_failed( status, "rtems_message_queue_send loop" );
-  }
-
-  puts( "TA1 - all message buffers consumed" );
-  puts( "TA1 - rtems_message_queue_flush - Q 3" );
-  status = rtems_message_queue_flush( Queue_id[ 3 ], &count );
-  printf( "TA1 - %d messages were flushed from Q 3\n", count );
-
-rtems_test_pause();
-
-  puts( "TA1 - create message queue of 20 bytes on queue 1" );
-  status = rtems_message_queue_create(
-    Queue_name[ 1 ],
-    100,
-    20,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Queue_id[ 1 ]
-  );
-  directive_failed( status, "rtems_message_queue_create of Q1; 20 bytes each" );
-  status = rtems_message_queue_send( Queue_id[ 3 ], big_send_buffer, 40 );
-  fatal_directive_status(status, RTEMS_INVALID_SIZE, "expected RTEMS_INVALID_SIZE");
-  
-  puts( "TA1 - rtems_message_queue_delete - delete queue 1" );
-  status = rtems_message_queue_delete( Queue_id[ 1 ] );
-  directive_failed( status, "rtems_message_queue_delete" );
-
-rtems_test_pause();
-  
-  puts( "TA1 - rtems_message_queue_create - variable sizes " );
-  for (queue_size = 1; queue_size < 1030; queue_size++)
-  {
-      status = rtems_message_queue_create(
-          Queue_name[ 1 ],
-          2,            /* just 2 msgs each */
-          queue_size,
-          RTEMS_DEFAULT_ATTRIBUTES,
-          &Queue_id[ 1 ]
-          );
-      if (status != RTEMS_SUCCESSFUL)
-      {
-          printf("TA1 - msq que size: %d\n", queue_size);
-          directive_failed( status, "rtems_message_queue_create of Q1" );
-      }
-
-      status = rtems_message_queue_delete( Queue_id[ 1 ] );
-      directive_failed( status, "rtems_message_queue_delete" );
-  }
-  
-  puts( "TA1 - rtems_message_queue_create and send - variable sizes " );
-  for (queue_size = 1; queue_size < 1030; queue_size++)
-  {
-      /* printf("TA1 - message queue size: %d\n", queue_size); */
-
-      status = rtems_message_queue_create(
-          Queue_name[ 1 ],
-          2,            /* just 2 msgs each */
-          queue_size,
-          RTEMS_DEFAULT_ATTRIBUTES,
-          &Queue_id[ 1 ]
-          );
-
-      directive_failed( status, "rtems_message_queue_create of Q1" );
-
-      dope_buffer(big_send_buffer, sizeof(big_send_buffer), queue_size);
-      memset(big_receive_buffer, 'Z', sizeof(big_receive_buffer));
-
-      /* send a msg too big */
-      status = rtems_message_queue_send( Queue_id[ 1 ],
-                                         big_send_buffer,
-                                         queue_size + 1 );
-
-      fatal_directive_status(status,
-                             RTEMS_INVALID_SIZE,
-                             "rtems_message_queue_send too large");
-
-      /* send a msg that is just right */
-      status = rtems_message_queue_send(Queue_id[ 1 ],
-                                        big_send_buffer,
-                                        queue_size);
-      directive_failed(status, "rtems_message_queue_send exact size");
-
-      /* now read and verify the message just sent */
-      status = rtems_message_queue_receive(Queue_id[ 1 ],
-                                           big_receive_buffer,
-                                           &size,
-                                           RTEMS_DEFAULT_OPTIONS,
-                                           1 * TICKS_PER_SECOND);
-      directive_failed(status, "rtems_message_queue_receive exact size");
-      if (size != queue_size)
-      {
-          puts("TA1 - exact size size match failed");
-          exit(1);
-      }
-
-      if (memcmp(big_send_buffer, big_receive_buffer, size) != 0)
-      {
-          puts("TA1 - exact size data match failed");
-          exit(1);
-      }
-
-      for (cp = (big_receive_buffer + size);
-           cp < (big_receive_buffer + sizeof(big_receive_buffer));
-           cp++)
-          if (*cp != 'Z')
-          {
-              puts("TA1 - exact size overrun match failed");
-              exit(1);
-          }
-          
-      /* all done with this one; delete it */
-      status = rtems_message_queue_delete( Queue_id[ 1 ] );
-      directive_failed( status, "rtems_message_queue_delete" );
-  }
-  
-  puts( "*** END OF TEST 13 ***" );
-  exit( 0 );
-}
diff --git a/testsuites/sptests/sp13/task2.c b/testsuites/sptests/sp13/task2.c
deleted file mode 100644
index 1246e84d30..0000000000
--- a/testsuites/sptests/sp13/task2.c
+++ /dev/null
@@ -1,139 +0,0 @@
-/*  Task_2
- *
- *  This routine serves as a test task.  Multiple tasks are required to
- *  verify all message manager capabilities.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_task Task_2(
-  rtems_task_argument argument
-)
-{
-  long                buffer[ 4 ];
-  rtems_unsigned32    size;
-  rtems_task_priority previous_priority;
-  rtems_status_code   status;
-
-  puts(
-    "TA2 - rtems_message_queue_receive - receive from queue 1 - RTEMS_NO_WAIT"
-  );
-  status = rtems_message_queue_receive(
-    Queue_id[ 1 ],
-    (long (*)[4])buffer,
-    &size,
-    RTEMS_NO_WAIT,
-    RTEMS_NO_TIMEOUT
-  );
-  directive_failed( status, "rtems_message_queue_receive" );
-  puts_nocr( "TA2 - buffer received: " );
-  Put_buffer( buffer );
-  new_line;
-
-  puts(
-    "TA2 - rtems_message_queue_receive - receive from queue 1 - "
-      "RTEMS_WAIT FOREVER"
-  );
-  status = rtems_message_queue_receive(
-    Queue_id[ 1 ],
-    (long (*)[4])buffer,
-    &size,
-    RTEMS_DEFAULT_OPTIONS,
-    RTEMS_NO_TIMEOUT
-  );
-  directive_failed( status, "rtems_message_queue_receive" );
-  puts_nocr( "TA2 - buffer received: " );
-  Put_buffer( buffer );
-  new_line;
-
-  puts(
-    "TA2 - rtems_message_queue_receive - receive from queue 1 - "
-      "RTEMS_WAIT FOREVER"
- );
-  status = rtems_message_queue_receive(
-    Queue_id[ 1 ],
-    (long (*)[4])buffer,
-    &size,
-    RTEMS_DEFAULT_OPTIONS,
-    RTEMS_NO_TIMEOUT
-  );
-  directive_failed( status, "rtems_message_queue_receive" );
-  puts_nocr( "TA2 - buffer received: " );
-  Put_buffer( buffer );
-  new_line;
-
-  puts( "TA2 - rtems_task_set_priority - make self highest priority task" );
-  status = rtems_task_set_priority( RTEMS_SELF, 3, &previous_priority );
-  directive_failed( status, "rtems_task_set_priority" );
-
-  puts(
-    "TA2 - rtems_message_queue_receive - receive from queue 2 - "
-      "RTEMS_WAIT FOREVER"
-  );
-  status = rtems_message_queue_receive(
-    Queue_id[ 2 ],
-    (long (*)[4])buffer,
-    &size,
-    RTEMS_DEFAULT_OPTIONS,
-    RTEMS_NO_TIMEOUT
-  );
-  directive_failed( status, "rtems_message_queue_receive" );
-  puts_nocr( "TA2 - buffer received: " );
-  Put_buffer( buffer );
-  new_line;
-
-  Fill_buffer( "BUFFER 2 TO Q 2", (long *)buffer );
-  puts( "TA2 - rtems_message_queue_send - BUFFER 2 TO Q 2" );
-  directive_failed( status, "rtems_message_queue_send" );
-
-  status = rtems_message_queue_send( Queue_id[ 2 ], (long (*)[4])buffer, 16 );
-  directive_failed( status, "rtems_message_queue_send" );
-
-  puts(
-    "TA2 - rtems_message_queue_receive - receive from queue 1 - "
-      "10 second timeout"
-  );
-  status = rtems_message_queue_receive(
-    Queue_id[ 1 ],
-    (long (*)[4])buffer,
-    &size,
-    RTEMS_DEFAULT_OPTIONS,
-    10 * TICKS_PER_SECOND
-  );
-  directive_failed( status, "rtems_message_queue_receive" );
-  puts_nocr( "TA2 - buffer received: " );
-  Put_buffer( buffer );
-  new_line;
-
-  puts(
-    "TA2 - rtems_message_queue_receive - receive from queue 3 - "
-      "RTEMS_WAIT FOREVER"
-  );
-  status = rtems_message_queue_receive(
-    Queue_id[ 3 ],
-    (long (*)[4])buffer,
-    &size,
-    RTEMS_DEFAULT_OPTIONS,
-    RTEMS_NO_TIMEOUT
-  );
-  directive_failed( status, "rtems_message_queue_receive" );
-  puts_nocr( "TA2 - buffer received: " );
-  Put_buffer( buffer );
-  new_line;
-
-}
diff --git a/testsuites/sptests/sp13/task3.c b/testsuites/sptests/sp13/task3.c
deleted file mode 100644
index 501bc01e3e..0000000000
--- a/testsuites/sptests/sp13/task3.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/*  Task_3
- *
- *  This routine serves as a test task.  Its major function is to
- *  broadcast a messge to all the other tasks.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_task Task_3(
-  rtems_task_argument argument
-)
-{
-  long              buffer[ 4 ];
-  rtems_unsigned32  size;
-  rtems_unsigned32  count;
-  rtems_status_code status;
-
-  puts(
-    "TA3 - rtems_message_queue_receive - receive from queue 2 - "
-      "RTEMS_WAIT FOREVER"
-  );
-  status = rtems_message_queue_receive(
-    Queue_id[ 2 ],
-    (long (*)[4])buffer,
-    &size,
-    RTEMS_DEFAULT_OPTIONS,
-    RTEMS_NO_TIMEOUT
-  );
-  directive_failed( status, "rtems_message_queue_receive" );
-  puts_nocr( "TA3 - buffer received: " );
-  Put_buffer( buffer );
-  new_line;
-
-  Fill_buffer( "BUFFER 3 TO Q 1", (long *)buffer );
-  puts( "TA3 - rtems_message_queue_broadcast - BUFFER 3 TO Q 1" );
-  status = rtems_message_queue_broadcast(
-    Queue_id[ 1 ],
-    (long (*)[4])buffer,
-    16,
-    &count
-  );
-  printf( "TA3 - number of tasks awakened = %02d\n", count );
-  puts(
-    "TA3 - rtems_message_queue_receive - receive from queue 3 - "
-      "RTEMS_WAIT FOREVER"
-  );
-
-  status = rtems_message_queue_receive(
-    Queue_id[ 3 ],
-    (long (*)[4])buffer,
-    &size,
-    RTEMS_DEFAULT_OPTIONS,
-    RTEMS_NO_TIMEOUT
-  );
-  directive_failed( status, "rtems_message_queue_receive" );
-  puts_nocr( "TA3 - buffer received: " );
-  Put_buffer( buffer );
-  new_line;
-
-  puts( "TA3 - rtems_task_delete - delete self" );
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-}
diff --git a/testsuites/sptests/sp14/asr.c b/testsuites/sptests/sp14/asr.c
deleted file mode 100644
index 04902c605a..0000000000
--- a/testsuites/sptests/sp14/asr.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*  Process_asr
- *
- *  This is the asynchronous signal routine (asr) for task 1.
- *  It demonstrates that ASRs can block execute and block.
- *
- *  Input parameters:
- *    the_signal_set - signal set
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_asr Process_asr(
-  rtems_signal_set the_signal_set
-)
-{
-  rtems_status_code status;
-
-  printf( "ASR - ENTRY - signal => %08x\n", the_signal_set );
-  switch( the_signal_set ) {
-    case RTEMS_SIGNAL_16:
-    case RTEMS_SIGNAL_17:
-    case RTEMS_SIGNAL_18 | RTEMS_SIGNAL_19:
-      break;
-    case RTEMS_SIGNAL_0:
-    case RTEMS_SIGNAL_1:
-      puts( "ASR - rtems_task_wake_after - yield processor" );
-      status = rtems_task_wake_after( RTEMS_YIELD_PROCESSOR );
-      directive_failed( status, "rtems_task_wake_after yield" );
-      break;
-    case RTEMS_SIGNAL_3:
-      Asr_fired = TRUE;
-      break;
-  }
-  printf( "ASR - EXIT  - signal => %08x\n", the_signal_set );
-}
diff --git a/testsuites/sptests/sp14/init.c b/testsuites/sptests/sp14/init.c
deleted file mode 100644
index bc59a52cb4..0000000000
--- a/testsuites/sptests/sp14/init.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*  Init
- *
- *  This routine is the initialization task for this test program.
- *  It is a user initialization task and has the responsibility for creating
- *  and starting the tasks that make up the test.  If the time of day
- *  clock is required for the test, it should also be set to a known
- *  value by this function.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "system.h"
-
-rtems_task Init(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-
-  puts( "\n\n*** TEST 14 ***" );
-
-  Task_name[ 1 ] =  rtems_build_name( 'T', 'A', '1', ' ' );
-  Task_name[ 2 ] =  rtems_build_name( 'T', 'A', '2', ' ' );
-
-  status = rtems_task_create(
-    Task_name[ 1 ],
-    4,
-    RTEMS_MINIMUM_STACK_SIZE * 2,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Task_id[ 1 ]
-  );
-  directive_failed( status, "rtems_task_create of TA1" );
-
-  status = rtems_task_create(
-    Task_name[ 2 ],
-    4,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Task_id[ 2 ]
-  );
-  directive_failed( status, "rtems_task_create of TA2" );
-
-  status = rtems_task_start( Task_id[ 1 ], Task_1, 0 );
-  directive_failed( status, "rtems_task_start of TA1" );
-
-  status = rtems_task_start( Task_id[ 2 ], Task_2, 0 );
-  directive_failed( status, "rtems_task_start of TA2" );
-
-  Timer_name[ 1 ] = rtems_build_name( 'T', 'M', '1', ' ' );
-
-  status = rtems_timer_create( Timer_name[ 1 ], &Timer_id[ 1 ] );
-  directive_failed( status, "rtems_timer_create of TM1" );
-
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-}
diff --git a/testsuites/sptests/sp14/sp14.doc b/testsuites/sptests/sp14/sp14.doc
deleted file mode 100644
index c5f06e136f..0000000000
--- a/testsuites/sptests/sp14/sp14.doc
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
-This file describes the directives and concepts tested by this test set.
-
-test set name:  test14
-
-directives:
-  ex_init, ex_start, t_create, t_start, t_delete, tm_tick, i_return,
-  as_catch, as_return, as_send, tm_wkafter
-
-concepts:
-
-  a.  This test checks out the signal manager.
diff --git a/testsuites/sptests/sp14/sp14.scn b/testsuites/sptests/sp14/sp14.scn
deleted file mode 100644
index 31e6d067d2..0000000000
--- a/testsuites/sptests/sp14/sp14.scn
+++ /dev/null
@@ -1,33 +0,0 @@
-*** TEST 14 ***
-TA1 - rtems_signal_catch - RTEMS_INTERRUPT_LEVEL( 3 )
-TA1 - rtems_signal_send - RTEMS_SIGNAL_16 to self
-ASR - ENTRY - signal => 00010000
-ASR - EXIT  - signal => 00010000
-TA1 - rtems_signal_send - RTEMS_SIGNAL_0 to self
-ASR - ENTRY - signal => 00000001
-ASR - rtems_task_wake_after - yield processor
-TA2 - rtems_signal_send - RTEMS_SIGNAL_17 to TA1
-TA2 - rtems_task_wake_after - yield processor
-ASR - ENTRY - signal => 00020000
-ASR - EXIT  - signal => 00020000
-ASR - EXIT  - signal => 00000001
-TA1 - rtems_signal_catch - RTEMS_NO_ASR
-<pause>
-TA1 - rtems_signal_send - RTEMS_SIGNAL_1 to self
-ASR - ENTRY - signal => 00000002
-ASR - rtems_task_wake_after - yield processor
-TA2 - rtems_signal_send - RTEMS_SIGNAL_18 and RTEMS_SIGNAL_19 to TA1
-TA2 - rtems_task_wake_after - yield processor
-ASR - EXIT  - signal => 00000002
-ASR - ENTRY - signal => 000c0000
-ASR - EXIT  - signal => 000c0000
-TA1 - rtems_task_mode - disable ASRs
-TA1 - sending signal to RTEMS_SELF from timer
-TA1 - waiting for signal to arrive
-TA1 - timer routine got the correct arguments
-TA1 - rtems_task_mode - enable ASRs
-ASR - ENTRY - signal => 00000008
-ASR - EXIT  - signal => 00000008
-TA1 - rtems_signal_catch - asraddr of NULL
-TA1 - rtems_task_delete - delete self
-*** END OF TEST 14 ***
diff --git a/testsuites/sptests/sp14/system.h b/testsuites/sptests/sp14/system.h
deleted file mode 100644
index ecb34d21b7..0000000000
--- a/testsuites/sptests/sp14/system.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*  system.h
- *
- *  This include file contains information that is included in every
- *  function in the test set.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <tmacros.h>
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
- 
-rtems_timer_service_routine Signal_3_to_task_1(
-  rtems_id  id,
-  void     *pointer
-);
- 
-rtems_asr Process_asr(
-  rtems_signal_set the_signal_set
-);
- 
-rtems_task Task_1(
-  rtems_task_argument argument
-);
- 
-rtems_task Task_2(
-  rtems_task_argument argument
-);
-
-/* configuration information */
-
-#define CONFIGURE_SPTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_MAXIMUM_TIMERS              1
-#define CONFIGURE_TICKS_PER_TIMESLICE       100
-
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#define CONFIGURE_EXTRA_TASK_STACKS         (1 * RTEMS_MINIMUM_STACK_SIZE)
-
-#include <confdefs.h>
-
-/* global variables */
-
-TEST_EXTERN rtems_id   Task_id[ 4 ];         /* array of task ids */
-TEST_EXTERN rtems_name Task_name[ 4 ];       /* array of task names */
-
-TEST_EXTERN rtems_id   Timer_id[ 3 ];      /* array of timer ids */
-TEST_EXTERN rtems_name Timer_name[ 3 ];    /* array of timer names */
-
-TEST_EXTERN volatile rtems_unsigned32 Signals_sent;
-                                      /* set to TRUE to indicate that a */
-                                      /* signal set has been sent from  */
-                                      /* an ISR to the executing task   */
-
-TEST_EXTERN volatile rtems_unsigned32 Asr_fired;
-                                      /* set to TRUE to indicate that the */
-                                      /* RTEMS_ASR has executed and was   */
-                                      /* passed the correct signal set    */
-
-TEST_EXTERN volatile rtems_id  Timer_got_this_id;
-
-TEST_EXTERN volatile void     *Timer_got_this_pointer;
-
-/* end of include file */
diff --git a/testsuites/sptests/sp14/task1.c b/testsuites/sptests/sp14/task1.c
deleted file mode 100644
index c46d833dde..0000000000
--- a/testsuites/sptests/sp14/task1.c
+++ /dev/null
@@ -1,116 +0,0 @@
-/*  Task_1
- *
- *  This routine serves as a test task.  It establishes an RTEMS_ASR and
- *  sends signal to itself to determine if the RTEMS_ASR gets to execute.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_timer_service_routine Signal_3_to_task_1(
-  rtems_id  id,
-  void     *pointer
-)
-{
-  rtems_status_code status;
-
-  status = rtems_signal_send( Task_id[ 1 ], RTEMS_SIGNAL_3 );
-  directive_failed( status, "rtems_signal_send of 3" );
-
-  Timer_got_this_id  = id;
-  Timer_got_this_pointer = pointer;
-
-  Signals_sent = TRUE;
-}
-
-rtems_task Task_1(
-  rtems_task_argument argument
-)
-{
-  rtems_mode        previous_mode;
-  rtems_status_code status;
-
-  puts( "TA1 - rtems_signal_catch - RTEMS_INTERRUPT_LEVEL( 3 )" );
-  status = rtems_signal_catch( Process_asr, RTEMS_INTERRUPT_LEVEL(3) );
-  directive_failed( status, "rtems_signal_catch" );
-
-  puts( "TA1 - rtems_signal_send - RTEMS_SIGNAL_16 to self" );
-  status = rtems_signal_send( RTEMS_SELF, RTEMS_SIGNAL_16 );
-  directive_failed( status, "rtems_signal_send" );
-
-  puts( "TA1 - rtems_signal_send - RTEMS_SIGNAL_0 to self" );
-  status = rtems_signal_send( RTEMS_SELF, RTEMS_SIGNAL_0 );
-  directive_failed( status, "rtems_signal_send" );
-
-  puts( "TA1 - rtems_signal_catch - RTEMS_NO_ASR" );
-  status = rtems_signal_catch( Process_asr, RTEMS_NO_ASR );
-  directive_failed( status, "rtems_signal_catch" );
-
-rtems_test_pause();
-
-  puts( "TA1 - rtems_signal_send - RTEMS_SIGNAL_1 to self" );
-  status = rtems_signal_send( RTEMS_SELF, RTEMS_SIGNAL_1 );
-  directive_failed( status, "rtems_signal_send" );
-
-  puts( "TA1 - rtems_task_mode - disable ASRs" );
-  status = rtems_task_mode( RTEMS_NO_ASR, RTEMS_ASR_MASK, &previous_mode );
-  directive_failed( status, "rtems_task_mode" );
-
-  Timer_got_this_id = 0;
-  Timer_got_this_pointer = NULL;
-
-  puts( "TA1 - sending signal to RTEMS_SELF from timer" );
-  status = rtems_timer_fire_after(
-    Timer_id[ 1 ],
-    TICKS_PER_SECOND / 2,
-    Signal_3_to_task_1,
-    (void *) Task_1
-  );
-  directive_failed( status, "rtems_timer_fire_after" );
-
-  puts( "TA1 - waiting for signal to arrive" );
-
-  Signals_sent = FALSE;
-  Asr_fired    = FALSE;
-
-  while ( Signals_sent == FALSE )
-    ;
-
-  if ( Timer_got_this_id == Timer_id[ 1 ] &&
-       Timer_got_this_pointer == Task_1 )
-    puts( "TA1 - timer routine got the correct arguments" );
-  else
-    printf(
-      "TA1 - timer got (0x%x, %p) instead of (0x%x, %p)!!!!\n",
-      Timer_got_this_id,
-      Timer_got_this_pointer,
-      Timer_id[ 1 ],
-      Task_1
-    );
-
-  puts( "TA1 - rtems_task_mode - enable ASRs" );
-  status = rtems_task_mode( RTEMS_ASR, RTEMS_ASR_MASK, &previous_mode );
-  directive_failed( status, "rtems_task_mode" );
-
-  puts( "TA1 - rtems_signal_catch - asraddr of NULL" );
-  status = rtems_signal_catch( NULL, RTEMS_DEFAULT_MODES );
-  directive_failed( status, "rtems_signal_catch" );
-
-  puts( "TA1 - rtems_task_delete - delete self" );
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-}
diff --git a/testsuites/sptests/sp14/task2.c b/testsuites/sptests/sp14/task2.c
deleted file mode 100644
index 27d17dbe3c..0000000000
--- a/testsuites/sptests/sp14/task2.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*  Task_2
- *
- *  This routine serves as a test task.  It verifies that one task can
- *  send signals to another task ( invoking the other task's RTEMS_ASR ).
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_task Task_2(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-
-  puts( "TA2 - rtems_signal_send - RTEMS_SIGNAL_17 to TA1" );
-  status = rtems_signal_send( Task_id[ 1 ], RTEMS_SIGNAL_17 );
-  directive_failed( status, "rtems_signal_send" );
-
-  puts( "TA2 - rtems_task_wake_after - yield processor" );
-  status = rtems_task_wake_after( RTEMS_YIELD_PROCESSOR );
-  directive_failed( status, "rtems_task_wake_after" );
-
-  puts("TA2 - rtems_signal_send - RTEMS_SIGNAL_18 and RTEMS_SIGNAL_19 to TA1");
-  status = rtems_signal_send( Task_id[ 1 ], RTEMS_SIGNAL_18 | RTEMS_SIGNAL_19 );
-  directive_failed( status, "rtems_signal_send" );
-
-  puts( "TA2 - rtems_task_wake_after - yield processor" );
-  status = rtems_task_wake_after( RTEMS_YIELD_PROCESSOR );
-  directive_failed( status, "rtems_task_wake_after" );
-
-  puts( "*** END OF TEST 14 ***" );
-  exit( 0 );
-}
diff --git a/testsuites/sptests/sp15/init.c b/testsuites/sptests/sp15/init.c
deleted file mode 100644
index 489b387cc3..0000000000
--- a/testsuites/sptests/sp15/init.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/*  Init
- *
- *  This routine is the initialization task for this test program.
- *  It is a user initialization task and has the responsibility for creating
- *  and starting the tasks that make up the test.  If the time of day
- *  clock is required for the test, it should also be set to a known
- *  value by this function.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "system.h"
-
-rtems_task Init(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-
-  puts( "\n\n*** TEST 15 ***" );
-
-  Task_name[ 1 ] =  rtems_build_name( 'T', 'A', '1', ' ' );
-
-  Partition_name[ 1 ] =  rtems_build_name( 'P', 'T', '1', ' ' );
-  Partition_name[ 2 ] =  rtems_build_name( 'P', 'T', '2', ' ' );
-
-  status = rtems_task_create(
-    Task_name[ 1 ],
-    4,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Task_id[ 1 ]
-  );
-  directive_failed( status, "rtems_task_create of TA1" );
-
-  status = rtems_task_start( Task_id[ 1 ], Task_1, 0 );
-  directive_failed( status, "rtems_task_start of TA1" );
-
-  puts("INIT - rtems_partition_create - partition 1");
-  status = rtems_partition_create(
-    Partition_name[ 1 ],
-    Area_1,
-    4096,
-    512,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Partition_id[ 1 ]
-  );
-  directive_failed( status, "rtems_partition_create of PT1" );
-
-  puts("INIT - rtems_partition_create - partition 2");
-  status = rtems_partition_create(
-    Partition_name[ 2 ],
-    Area_2,
-    274,
-    128,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Partition_id[ 2 ]
-  );
-  directive_failed( status, "rtems_partition_create of PT2" );
-
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-}
diff --git a/testsuites/sptests/sp15/sp15.doc b/testsuites/sptests/sp15/sp15.doc
deleted file mode 100644
index 261f9e7a49..0000000000
--- a/testsuites/sptests/sp15/sp15.doc
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
-This file describes the directives and concepts tested by this test set.
-
-test set name:  test15
-
-directives:
-  ex_init, ex_start, t_create, t_start, t_delete, tm_tick, i_return,
-  pt_create, pt_ident, pt_getbuf, pt_retbuf, pt_delete
-
-concepts:
-
-  a.  This test checks out the partition manager.
diff --git a/testsuites/sptests/sp15/sp15.scn b/testsuites/sptests/sp15/sp15.scn
deleted file mode 100644
index f1a800dc0d..0000000000
--- a/testsuites/sptests/sp15/sp15.scn
+++ /dev/null
@@ -1,16 +0,0 @@
-*** TEST 15 ***
-INIT - rtems_partition_create - partition 1
-INIT - rtems_partition_create - partition 2
-TA1 - rtems_partition_ident - partition 1 id = 1c010001
-TA1 - rtems_partition_ident - partition 2 id = 1c010002
-TA1 - rtems_partition_get_buffer - buffer 1 from partition 1  - 0x00000000
-TA1 - rtems_partition_get_buffer - buffer 2 from partition 1  - 0x00000200
-TA1 - rtems_partition_get_buffer - buffer 1 from partition 2  - 0x00000000
-TA1 - rtems_partition_get_buffer - buffer 2 from partition 2  - 0x00000080
-TA1 - rtems_partition_return_buffer - buffer 1 to partition 1 - 0x00000000
-TA1 - rtems_partition_return_buffer - buffer 2 to partition 1 - 0x00000200
-TA1 - rtems_partition_return_buffer - buffer 1 to partition 2 - 0x00000000
-TA1 - rtems_partition_return_buffer - buffer 2 to partition 2 - 0x00000080
-TA1 - rtems_partition_delete - delete partition 1
-TA1 - rtems_partition_delete - delete partition 2
-*** END OF TEST 15 ***
diff --git a/testsuites/sptests/sp15/system.h b/testsuites/sptests/sp15/system.h
deleted file mode 100644
index ef5e481920..0000000000
--- a/testsuites/sptests/sp15/system.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*  system.h
- *
- *  This include file contains information that is included in every
- *  function in the test set.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <tmacros.h>
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
- 
-rtems_task Task_1(
-  rtems_task_argument argument
-);
-
-/* configuration information */
-
-#define CONFIGURE_SPTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_MAXIMUM_PARTITIONS          2
-#define CONFIGURE_TICKS_PER_TIMESLICE       100
-
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#include <confdefs.h>
-
-/* global variables */
-
-TEST_EXTERN rtems_id   Task_id[ 4 ];         /* array of task ids */
-TEST_EXTERN rtems_name Task_name[ 4 ];       /* array of task names */
-
-TEST_EXTERN rtems_name Partition_id[ 4 ];   /* array of partition ids */
-TEST_EXTERN rtems_name Partition_name[ 4 ]; /* array of partition names */
- 
-TEST_EXTERN rtems_unsigned8 Area_1[4096] CPU_STRUCTURE_ALIGNMENT;
-TEST_EXTERN rtems_unsigned8 Area_2[274] CPU_STRUCTURE_ALIGNMENT;
- 
-#define Put_address_from_area_1( _to_be_printed ) \
-   printf( "0x%08lx", \
-     (unsigned long)((rtems_unsigned8 *)(_to_be_printed) - Area_1 ) )
- 
-#define Put_address_from_area_2( _to_be_printed ) \
-   printf( "0x%08lx", \
-     (unsigned long)((rtems_unsigned8 *)(_to_be_printed) - Area_2 ) )
- 
-/* end of include file */
diff --git a/testsuites/sptests/sp15/task1.c b/testsuites/sptests/sp15/task1.c
deleted file mode 100644
index da77cdf478..0000000000
--- a/testsuites/sptests/sp15/task1.c
+++ /dev/null
@@ -1,129 +0,0 @@
-/*  Task_1
- *
- *  This routine serves as a test task.  It tests the partition manager.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_task Task_1(
-  rtems_task_argument argument
-)
-{
-  rtems_id           ptid_1;
-  rtems_id           ptid_2;
-  void              *buffer_address_1;
-  void              *buffer_address_2;
-  void              *buffer_address_3;
-  void              *buffer_address_4;
-  rtems_status_code  status;
-
-  puts_nocr( "TA1 - rtems_partition_ident - partition 1 id = " );
-  status = rtems_partition_ident(
-    Partition_name[ 1 ],
-    RTEMS_SEARCH_ALL_NODES,
-    &ptid_1
-  );
-  directive_failed( status, "rtems_partition_ident of PT1" );
-  printf( "%08x\n", ptid_1 );
-
-  puts_nocr( "TA1 - rtems_partition_ident - partition 2 id = " );
-  status = rtems_partition_ident(
-    Partition_name[ 2 ],
-    RTEMS_SEARCH_ALL_NODES,
-    &ptid_2
-  );
-  directive_failed( status, "rtems_partition_ident of PT2" );
-  printf( "%08x\n", ptid_2 );
-
-  puts_nocr(
-    "TA1 - rtems_partition_get_buffer - buffer 1 from partition 1  - "
-  );
-  status = rtems_partition_get_buffer( ptid_1, &buffer_address_1 );
-  directive_failed( status, "rtems_partition_get_buffer" );
-  Put_address_from_area_1( buffer_address_1 );
-  new_line;
-
-  puts_nocr(
-    "TA1 - rtems_partition_get_buffer - buffer 2 from partition 1  - "
-  );
-  status = rtems_partition_get_buffer( ptid_1, &buffer_address_2 );
-  directive_failed( status, "rtems_partition_get_buffer" );
-  Put_address_from_area_1( buffer_address_2 );
-  new_line;
-
-  puts_nocr(
-    "TA1 - rtems_partition_get_buffer - buffer 1 from partition 2  - "
-  );
-  status = rtems_partition_get_buffer( ptid_2, &buffer_address_3 );
-  directive_failed( status, "rtems_partition_get_buffer" );
-  Put_address_from_area_2( buffer_address_3 );
-  new_line;
-
-  puts_nocr(
-    "TA1 - rtems_partition_get_buffer - buffer 2 from partition 2  - "
-  );
-  status = rtems_partition_get_buffer( ptid_2, &buffer_address_4 );
-  directive_failed( status, "rtems_partition_get_buffer" );
-  Put_address_from_area_2( buffer_address_4 );
-  new_line;
-
-  puts_nocr(
-    "TA1 - rtems_partition_return_buffer - buffer 1 to partition 1 - "
-  );
-  Put_address_from_area_1( buffer_address_1 );
-  new_line;
-  status = rtems_partition_return_buffer( ptid_1, buffer_address_1 );
-  directive_failed( status, "rtems_partition_return_buffer" );
-
-  puts_nocr(
-    "TA1 - rtems_partition_return_buffer - buffer 2 to partition 1 - "
-  );
-  Put_address_from_area_1( buffer_address_2 );
-  new_line;
-  status = rtems_partition_return_buffer( ptid_1, buffer_address_2 );
-  directive_failed( status, "rtems_partition_return_buffer" );
-
-  puts_nocr(
-    "TA1 - rtems_partition_return_buffer - buffer 1 to partition 2 - "
-  );
-  Put_address_from_area_2( buffer_address_3 );
-  new_line;
-  status = rtems_partition_return_buffer( ptid_2, buffer_address_3 );
-  directive_failed( status, "rtems_partition_return_buffer" );
-
-  puts_nocr(
-    "TA1 - rtems_partition_return_buffer - buffer 2 to partition 2 - "
-  );
-  Put_address_from_area_2( buffer_address_4 );
-  new_line;
-  status = rtems_partition_return_buffer( ptid_2, buffer_address_4 );
-  directive_failed( status, "rtems_partition_return_buffer" );
-
-  puts( "TA1 - rtems_partition_delete - delete partition 1"
-  );
-  status = rtems_partition_delete( ptid_1 );
-  directive_failed( status, "rtems_partition_delete" );
-
-  puts( "TA1 - rtems_partition_delete - delete partition 2"
-  );
-  status = rtems_partition_delete( ptid_2 );
-  directive_failed( status, "rtems_partition_delete" );
-
-  puts( "*** END OF TEST 15 ***" );
-  exit( 0 );
-}
diff --git a/testsuites/sptests/sp16/init.c b/testsuites/sptests/sp16/init.c
deleted file mode 100644
index d526b7d3e3..0000000000
--- a/testsuites/sptests/sp16/init.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/*  Init
- *
- *  This routine is the initialization task for this test program.
- *  It is a user initialization task and has the responsibility for creating
- *  and starting the tasks that make up the test.  If the time of day
- *  clock is required for the test, it should also be set to a known
- *  value by this function.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "system.h"
-
-rtems_task Init(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-
-  puts( "\n\n*** TEST 16 ***" );
-
-  Task_name[ 1 ] =  rtems_build_name( 'T', 'A', '1', ' ' );
-  Task_name[ 2 ] =  rtems_build_name( 'T', 'A', '2', ' ' );
-  Task_name[ 3 ] =  rtems_build_name( 'T', 'A', '3', ' ' );
-  Task_name[ 4 ] =  rtems_build_name( 'T', 'A', '4', ' ' );
-  Task_name[ 5 ] =  rtems_build_name( 'T', 'A', '5', ' ' );
-
-  status = rtems_task_create(
-    Task_name[ 1 ],
-    BASE_PRIORITY,
-    RTEMS_MINIMUM_STACK_SIZE * 2,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Task_id[ 1 ]
-  );
-  directive_failed( status, "rtems_task_create of TA1" );
-
-  status = rtems_task_create(
-    Task_name[ 2 ],
-    BASE_PRIORITY,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Task_id[ 2 ]
-  );
-  directive_failed( status, "rtems_task_create of TA2" );
-
-  status = rtems_task_create(
-    Task_name[ 3 ],
-    BASE_PRIORITY,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Task_id[ 3 ]
-  );
-  directive_failed( status, "rtems_task_create of TA3" );
-
-  status = rtems_task_start( Task_id[ 1 ], Task_1, 0 );
-  directive_failed( status, "rtems_task_start of TA1" );
-
-  status = rtems_task_start( Task_id[ 2 ], Task_2, 0 );
-  directive_failed( status, "rtems_task_start of TA2" );
-
-  status = rtems_task_start( Task_id[ 3 ], Task_3, 0 );
-  directive_failed( status, "rtems_task_start of TA3" );
-
-  Region_name[ 1 ] = rtems_build_name( 'R', 'N', '1', ' ' );
-  Region_name[ 2 ] = rtems_build_name( 'R', 'N', '2', ' ' );
-  Region_name[ 3 ] = rtems_build_name( 'R', 'N', '3', ' ' );
-  Region_name[ 4 ] = rtems_build_name( 'R', 'N', '4', ' ' );
-
-  status = rtems_region_create(
-    Region_name[ 1 ],
-    Area_1,
-    4096,
-    128,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Region_id[ 1 ]
-  );
-  directive_failed( status, "rtems_region_create of RN1" );
-
-  status = rtems_region_create(
-    Region_name[ 2 ],
-    Area_2,
-    4096,
-    128,
-    RTEMS_PRIORITY,
-    &Region_id[ 2 ]
-  );
-  directive_failed( status, "rtems_region_create of RN2" );
-
-  status = rtems_region_create(
-    Region_name[ 3 ],
-    Area_3,
-    4096,
-    128,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Region_id[ 3 ]
-  );
-  directive_failed( status, "rtems_region_create of RN3" );
-
-  status = rtems_region_create(
-    Region_name[ 4 ],
-    Area_4,
-    4096,
-    128,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Region_id[ 4 ]
-  );
-  directive_failed( status, "rtems_region_create of RN4" );
-
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-}
diff --git a/testsuites/sptests/sp16/sp16.doc b/testsuites/sptests/sp16/sp16.doc
deleted file mode 100644
index 1a208582dc..0000000000
--- a/testsuites/sptests/sp16/sp16.doc
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
-This file describes the directives and concepts tested by this test set.
-
-test set name:  test16
-
-directives:
-  ex_init, ex_start, t_create, t_start, t_delete, tm_tick, i_return,
-  rn_create, rn_ident, rn_getbuf, rn_retbuf, rn_delete
-
-concepts:
-
-  a.  This test checks out the region manager.
diff --git a/testsuites/sptests/sp16/sp16.scn b/testsuites/sptests/sp16/sp16.scn
deleted file mode 100644
index 36d533c2b4..0000000000
--- a/testsuites/sptests/sp16/sp16.scn
+++ /dev/null
@@ -1,58 +0,0 @@
-*** TEST 16 ***
-TA1 - rtems_region_ident - rnid => 20010002
-TA1 - rtems_region_get_segment - wait on 100 byte segment from region 2
-TA1 - got segment from region 2 - 0x00000f78
-TA1 - rtems_region_get_segment - wait on 3K segment from region 3
-TA1 - got segment from region 3 - 0x000003f8
-TA1 - rtems_region_get_segment - get 3080 byte segment from region 1 - NO_WAIT
-TA1 - got segment from region 1 - 0x00000378
-TA1 - rtems_task_wake_after - yield processor
-TA2 - rtems_region_get_segment - wait on 2K segment from region 1
-TA3 - rtems_region_get_segment - wait on 3968 byte segment from region 2
-<pause>
-TA1 - rtems_region_return_segment - return segment to region 1 - 0x00000378
-TA1 - rtems_region_get_segment - wait 10 seconds for 3K segment from region 1
-TA2 - got segment from region 1 - 0x000007f8
-TA2 - rtems_region_return_segment - return segment to region 1 - 0x000007f8
-TA2 - rtems_task_set_priority - make self highest priority task
-TA2 - rtems_region_get_segment - wait on 3968 byte segment
-TA1 - got segment from region 1 - 0x000003f8
-TA1 - rtems_region_return_segment - return segment to region 2 - 0x00000f78
-TA2 - got segment from region 2 - 0x00000008
-TA2 - rtems_region_return_segment - return segment to region 2 - 0x00000008
-TA2 - rtems_task_delete - delete self
-TA1 - rtems_task_wake_after - yield processor
-TA3 - got segment from region 2 - 0x00000008
-TA3 - rtems_region_get_segment - wait on 2K segment from region 3
-TA1 - rtems_task_delete - delete TA3
-<pause>
-TA1 - rtems_task_wake_after - yield processor
-TA4 - rtems_region_get_segment - wait on 1.5K segment from region 1
-TA5 - rtems_region_get_segment - wait on 1.5K segment from region 1
-TA1 - rtems_region_return_segment - return segment to region 1 - 0x000003f8
-TA1 - rtems_task_wake_after - yield processor
-TA4 - got and returned 0x000009f8
-TA5 - got and returned 0x000003f0
-TA1 - rtems_region_get_segment - wait 10 seconds for 3K segment from region 1
-TA1 - got segment from region 1 - 0x000003f8
-TA1 - rtems_task_wake_after - yield processor
-TA4 - rtems_region_get_segment - wait on 3K segment from region 1
-TA5 - rtems_region_get_segment - wait on 3K segment from region 1
-TA1 - rtems_task_delete - delete TA4
-TA1 - rtems_region_return_segment - return segment to region 1 - 0x000003f8
-TA1 - rtems_task_wake_after - yield processor
-TA5 - got segment from region 1 - 0x000003f8
-TA5 - rtems_region_return_segment - return segment to region 1 - 0x000003f8
-TA5 - rtems_task_delete - delete self
-TA1 - rtems_region_delete - delete region 1
-TA1 - rtems_region_get_segment - get 3K segment from region 4
-TA1 - got segment from region 4 - 0x000003f8
-TA1 - rtems_region_get_segment - attempt to get 3K segment from region 4
-TA1 - rtems_task_get_note - RTEMS_UNSATISFIED
-TA1 - rtems_region_extend - extend region 4 by 4K
-TA1 - rtems_region_get_segment - attempt to get 3K segment from region 4
-TA1 - got 3K segment from region 4 - 0x00001400
-TA1 - rtems_region_return_segment - return segment to region 4 - 0x000003f8
-TA1 - rtems_region_return_segment - return segment to region 4 - 0x00001400
-TA1 - rtems_region_delete - delete region 4
-*** END OF TEST 16 ***
diff --git a/testsuites/sptests/sp16/system.h b/testsuites/sptests/sp16/system.h
deleted file mode 100644
index b507d2a562..0000000000
--- a/testsuites/sptests/sp16/system.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*  system.h
- *
- *  This include file contains information that is included in every
- *  function in the test set.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <tmacros.h>
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
- 
-rtems_task Task_1(
-  rtems_task_argument argument
-);
- 
-rtems_task Task_2(
-  rtems_task_argument argument
-);
- 
-rtems_task Task_3(
-  rtems_task_argument argument
-);
- 
-rtems_task Task_4(
-  rtems_task_argument argument
-);
- 
-rtems_task Task5(
-  rtems_task_argument argument
-);
- 
-/* configuration information */
-
-#define CONFIGURE_SPTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_MAXIMUM_REGIONS             4
-#define CONFIGURE_TICKS_PER_TIMESLICE       100
-
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#define CONFIGURE_EXTRA_TASK_STACKS         (1 * RTEMS_MINIMUM_STACK_SIZE)
-
-#include <confdefs.h>
-
-/* global variables */
-
-TEST_EXTERN rtems_id   Task_id[ 6 ];      /* array of task ids */
-TEST_EXTERN rtems_name Task_name[ 6 ];    /* array of task names */
-TEST_EXTERN rtems_id   Region_id[ 5 ];    /* array of region ids */
-TEST_EXTERN rtems_name Region_name[ 5 ];  /* array of region names */
-
-TEST_EXTERN rtems_unsigned8 Area_1[4096] CPU_STRUCTURE_ALIGNMENT;
-TEST_EXTERN rtems_unsigned8 Area_2[4096] CPU_STRUCTURE_ALIGNMENT;
-TEST_EXTERN rtems_unsigned8 Area_3[4096] CPU_STRUCTURE_ALIGNMENT;
-TEST_EXTERN rtems_unsigned8 Area_4[8192] CPU_STRUCTURE_ALIGNMENT;
-
-#define BASE_PRIORITY 140
-
-#define Put_address_from_area_1( _to_be_printed ) \
-   printf( "0x%08lx", \
-     (unsigned long) ((rtems_unsigned8 *)(_to_be_printed) - Area_1 ) )
-
-#define Put_address_from_area_2( _to_be_printed ) \
-   printf( "0x%08lx", \
-     (unsigned long) ((rtems_unsigned8 *)(_to_be_printed) - Area_2 ) )
-
-#define Put_address_from_area_3( _to_be_printed ) \
-   printf( "0x%08lx", \
-     (unsigned long) ((rtems_unsigned8 *)(_to_be_printed) - Area_3 ) )
-
-#define Put_address_from_area_4( _to_be_printed ) \
-   printf( "0x%08lx", \
-     (unsigned long) ((rtems_unsigned8 *)(_to_be_printed) - Area_4 ) )
-
-/* end of include file */
diff --git a/testsuites/sptests/sp16/task1.c b/testsuites/sptests/sp16/task1.c
deleted file mode 100644
index fdd2776e93..0000000000
--- a/testsuites/sptests/sp16/task1.c
+++ /dev/null
@@ -1,282 +0,0 @@
-/*  Task_1
- *
- *  This routine serves as a test task.  It tests the region manager.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_task Task_1(
-  rtems_task_argument argument
-)
-{
-  rtems_id           rnid;
-  void              *segment_address_1;
-  void              *segment_address_2;
-  void              *segment_address_3;
-  void              *segment_address_4;
-  rtems_status_code  status;
-
-  status = rtems_region_ident( Region_name[ 1 ], &rnid );
-  printf( "TA1 - rtems_region_ident - rnid => %08x\n", rnid );
-  directive_failed( status, "rtems_region_ident of RN1" );
-
-  puts(
-    "TA1 - rtems_region_get_segment - wait on 100 byte segment from region 2"
-  );
-  status = rtems_region_get_segment(
-    Region_id[ 2 ],
-    100,
-    RTEMS_DEFAULT_OPTIONS,
-    RTEMS_NO_TIMEOUT,
-    &segment_address_1
-  );
-  directive_failed( status, "rtems_region_get_segment" );
-  puts_nocr( "TA1 - got segment from region 2 - " );
-  Put_address_from_area_2( segment_address_1 );
-  new_line;
-
-  puts( "TA1 - rtems_region_get_segment - wait on 3K segment from region 3" );
-  status = rtems_region_get_segment(
-    Region_id[ 3 ],
-    3072,
-    RTEMS_DEFAULT_OPTIONS,
-    RTEMS_NO_TIMEOUT,
-    &segment_address_2
-  );
-  directive_failed( status, "rtems_region_get_segment" );
-  puts_nocr( "TA1 - got segment from region 3 - " );
-  Put_address_from_area_3( segment_address_2 );
-  new_line;
-
-  puts_nocr( "TA1 - rtems_region_get_segment - get 3080 byte segment " );
-  puts     ( "from region 1 - NO_WAIT" );
-  status = rtems_region_get_segment(
-    Region_id[ 1 ],
-    3080,
-    RTEMS_NO_WAIT,
-    RTEMS_NO_TIMEOUT,
-    &segment_address_3
-  );
-  directive_failed( status, "rtems_region_get_segment" );
-  puts_nocr( "TA1 - got segment from region 1 - " );
-  Put_address_from_area_1( segment_address_3 );
-  new_line;
-
-  puts( "TA1 - rtems_task_wake_after - yield processor" );
-  status = rtems_task_wake_after( RTEMS_YIELD_PROCESSOR );
-  directive_failed( status, "rtems_task_wake_after" );
-
-rtems_test_pause();
-
-  puts_nocr(
-    "TA1 - rtems_region_return_segment - return segment to region 1 - "
-  );
-  Put_address_from_area_1( segment_address_3 );
-  status = rtems_region_return_segment( Region_id[ 1 ], segment_address_3 );
-  directive_failed( status, "rtems_region_return_segment" );
-  new_line;
-
-  puts(
-    "TA1 - rtems_region_get_segment - wait 10 seconds for 3K "
-      "segment from region 1"
-  );
-  status = rtems_region_get_segment(
-    Region_id[ 1 ],
-    3072,
-    RTEMS_DEFAULT_OPTIONS,
-    10 * TICKS_PER_SECOND,
-    &segment_address_4
-  );
-  directive_failed( status, "rtems_region_get_segment" );
-  puts_nocr( "TA1 - got segment from region 1 - " );
-  Put_address_from_area_1( segment_address_4 );
-  new_line;
-
-  puts_nocr(
-    "TA1 - rtems_region_return_segment - return segment to region 2 - "
-  );
-  Put_address_from_area_2( segment_address_1 );
-  new_line;
-  status = rtems_region_return_segment( Region_id[ 2 ], segment_address_1 );
-  directive_failed( status, "rtems_region_return_segment" );
-
-  puts( "TA1 - rtems_task_wake_after - yield processor" );
-  status = rtems_task_wake_after( RTEMS_YIELD_PROCESSOR );
-  directive_failed( status, "rtems_task_wake_after" );
-
-  puts( "TA1 - rtems_task_delete - delete TA3" );
-  status = rtems_task_delete( Task_id[ 3 ] );
-  directive_failed( status, "rtems_task_delete of TA3" );
-
-rtems_test_pause();
-
-  status = rtems_task_create(
-    Task_name[ 4 ],
-    BASE_PRIORITY,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Task_id[ 4 ]
-  );
-  directive_failed( status, "rtems_task_create of TA4" );
-
-  status = rtems_task_create(
-    Task_name[ 5 ],
-    BASE_PRIORITY,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Task_id[ 5 ]
-  );
-  directive_failed( status, "rtems_task_create of TA5" );
-
-  status = rtems_task_start( Task_id[ 4 ], Task_4, 0 );
-  directive_failed( status, "rtems_task_start of TA4" );
-
-  status = rtems_task_start( Task_id[ 5 ], Task5, 0 );
-  directive_failed( status, "rtems_task_start of TA5" );
-
-  puts( "TA1 - rtems_task_wake_after - yield processor" );
-  status = rtems_task_wake_after( 1 * TICKS_PER_SECOND );
-  directive_failed( status, "rtems_task_wake_after" );
-
-  puts_nocr(
-    "TA1 - rtems_region_return_segment - return segment to region 1 - "
-  );
-  Put_address_from_area_1( segment_address_4 );
-  status = rtems_region_return_segment( Region_id[ 1 ], segment_address_4 );
-  directive_failed( status, "rtems_region_return_segment" );
-  new_line;
-
-  puts( "TA1 - rtems_task_wake_after - yield processor" );
-  status = rtems_task_wake_after( 1 * TICKS_PER_SECOND );
-  directive_failed( status, "rtems_task_wake_after" );
-
-  puts_nocr( "TA1 - rtems_region_get_segment - wait 10 seconds for 3K " );
-  puts     ( "segment from region 1");
-  status = rtems_region_get_segment(
-    Region_id[ 1 ],
-    3072,
-    RTEMS_DEFAULT_OPTIONS,
-    10 * TICKS_PER_SECOND,
-    &segment_address_4
-  );
-  directive_failed( status, "rtems_region_get_segment" );
-  puts_nocr( "TA1 - got segment from region 1 - " );
-  Put_address_from_area_1( segment_address_4 );
-  new_line;
-
-  puts( "TA1 - rtems_task_wake_after - yield processor" );
-  status = rtems_task_wake_after( 1 * TICKS_PER_SECOND );
-  directive_failed( status, "rtems_task_wake_after" );
-
-  puts( "TA1 - rtems_task_delete - delete TA4" );
-  status = rtems_task_delete( Task_id[ 4 ] );
-  directive_failed( status, "rtems_task_delete of TA4" );
-
-  puts_nocr(
-    "TA1 - rtems_region_return_segment - return segment to region 1 - "
-  );
-  Put_address_from_area_1( segment_address_4 );
-  status = rtems_region_return_segment( Region_id[ 1 ], segment_address_4 );
-  directive_failed( status, "rtems_region_return_segment" );
-  new_line;
-
-  puts( "TA1 - rtems_task_wake_after - yield processor" );
-  status = rtems_task_wake_after( RTEMS_YIELD_PROCESSOR );
-
-  puts( "TA1 - rtems_region_delete - delete region 1" );
-  status = rtems_region_delete( Region_id[ 1 ] );
-  directive_failed( status, "rtems_region_delete" );
-
-  puts( "TA1 - rtems_region_get_segment - get 3K segment from region 4" );
-  status = rtems_region_get_segment(
-    Region_id[ 4 ],
-    3072,
-    RTEMS_DEFAULT_OPTIONS,
-    RTEMS_NO_TIMEOUT,
-    &segment_address_1
-  );
-  directive_failed( status, "rtems_region_get_segment" );
-  puts_nocr( "TA1 - got segment from region 4 - " );
-  Put_address_from_area_4( segment_address_1 );
-  new_line;
-
-  puts(
-   "TA1 - rtems_region_get_segment - attempt to get 3K segment from region 4"
-  );
-  status =  rtems_region_get_segment(
-    Region_id[ 4 ],
-    3072,
-    RTEMS_NO_WAIT,
-    RTEMS_NO_TIMEOUT,
-    &segment_address_2
-  );
-  fatal_directive_status(
-    status,
-    RTEMS_UNSATISFIED,
-    "rtems_task_get_segment with no memory left"
-  );
-  puts( "TA1 - rtems_task_get_note - RTEMS_UNSATISFIED" );
-
-  puts( "TA1 - rtems_region_extend - extend region 4 by 4K" );
-  status = rtems_region_extend(
-    Region_id[ 4 ],
-    &Area_4[4096],
-    4096
-  );
-  directive_failed( status, "rtems_region_extend" );
-
-  puts(
-   "TA1 - rtems_region_get_segment - attempt to get 3K segment from region 4"
-  );
-  status = rtems_region_get_segment(
-    Region_id[ 4 ],
-    3072,
-    RTEMS_NO_WAIT,
-    RTEMS_NO_TIMEOUT,
-    &segment_address_3
-  );
-  directive_failed( status, "rtems_region_get_segment" );
-  puts_nocr( "TA1 - got 3K segment from region 4 - " );
-  Put_address_from_area_4( segment_address_3 );
-  new_line;
-
-  puts_nocr(
-    "TA1 - rtems_region_return_segment - return segment to region 4 - "
-  );
-  Put_address_from_area_4( segment_address_1 );
-  status = rtems_region_return_segment( Region_id[ 4 ], segment_address_1 );
-  directive_failed( status, "rtems_region_return_segment" );
-  new_line;
-
-  puts_nocr(
-    "TA1 - rtems_region_return_segment - return segment to region 4 - "
-  );
-  Put_address_from_area_4( segment_address_3 );
-  status = rtems_region_return_segment( Region_id[ 4 ], segment_address_3 );
-  directive_failed( status, "rtems_region_return_segment" );
-  new_line;
-
-  puts( "TA1 - rtems_region_delete - delete region 4" );
-  status = rtems_region_delete( Region_id[ 4 ] );
-  directive_failed( status, "rtems_region_delete" );
-
-  puts( "*** END OF TEST 16 ***" );
-  exit( 0 );
-}
diff --git a/testsuites/sptests/sp16/task2.c b/testsuites/sptests/sp16/task2.c
deleted file mode 100644
index 2f17952b09..0000000000
--- a/testsuites/sptests/sp16/task2.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/*  Task_2
- *
- *  This routine serves as a test task.  It competes with the other tasks
- *  for region resources.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_task Task_2(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code    status;
-  rtems_task_priority  previous_priority;
-  void                *segment_address_1;
-  void                *segment_address_2;
-
-  puts( "TA2 - rtems_region_get_segment - wait on 2K segment from region 1" );
-  status = rtems_region_get_segment(
-    Region_id[ 1 ],
-    2048,
-    RTEMS_DEFAULT_OPTIONS,
-    RTEMS_NO_TIMEOUT,
-    &segment_address_1
-  );
-  directive_failed( status, "rtems_region_get_segment" );
-  puts_nocr( "TA2 - got segment from region 1 - " );
-  Put_address_from_area_1( segment_address_1 );
-  new_line;
-
-  puts_nocr(
-    "TA2 - rtems_region_return_segment - return segment to region 1 - "
-  );
-  Put_address_from_area_1( segment_address_1 );
-  status = rtems_region_return_segment( Region_id[ 1 ], segment_address_1 );
-  directive_failed( status, "rtems_region_return_segment" );
-  new_line;
-
-  puts( "TA2 - rtems_task_set_priority - make self highest priority task" );
-  status = rtems_task_set_priority(
-    RTEMS_SELF,
-    BASE_PRIORITY-1,
-    &previous_priority
-  );
-  directive_failed( status, "rtems_task_set_priority" );
-
-  puts("TA2 - rtems_region_get_segment - wait on 3968 byte segment");
-  status = rtems_region_get_segment(
-    Region_id[ 2 ],
-    3968,
-    RTEMS_DEFAULT_OPTIONS,
-    RTEMS_NO_TIMEOUT,
-    &segment_address_2
-  );
-  directive_failed( status, "rtems_region_get_segment" );
-  puts_nocr( "TA2 - got segment from region 2 - ");
-  Put_address_from_area_2( segment_address_2 );
-  new_line;
-
-  puts_nocr(
-    "TA2 - rtems_region_return_segment - return segment to region 2 - "
-  );
-  Put_address_from_area_2( segment_address_2 );
-  status = rtems_region_return_segment( Region_id[ 2 ], segment_address_2 );
-  directive_failed( status, "rtems_region_return_segment" );
-  new_line;
-
-  puts( "TA2 - rtems_task_delete - delete self" );
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-}
diff --git a/testsuites/sptests/sp16/task3.c b/testsuites/sptests/sp16/task3.c
deleted file mode 100644
index 09a3ec87ad..0000000000
--- a/testsuites/sptests/sp16/task3.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*  Task_3
- *
- *  This routine serves as a test task.  It competes with the other tasks
- *  for region resources.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_task Task_3(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code  status;
-  void              *segment_address_1;
-  void              *segment_address_2;
-
-  puts(
-    "TA3 - rtems_region_get_segment - wait on 3968 byte segment from region 2"
-  );
-  status = rtems_region_get_segment(
-    Region_id[ 2 ],
-    3968,
-    RTEMS_DEFAULT_OPTIONS,
-    RTEMS_NO_TIMEOUT,
-    &segment_address_1
-  );
-  directive_failed( status, "rtems_region_get_segment" );
-  puts_nocr( "TA3 - got segment from region 2 - " );
-  Put_address_from_area_2( segment_address_1 );
-  new_line;
-  directive_failed( status, "rtems_region_return_segment" );
-
-  puts( "TA3 - rtems_region_get_segment - wait on 2K segment from region 3" );
-  status = rtems_region_get_segment(
-    Region_id[ 3 ],
-    2048,
-    RTEMS_DEFAULT_OPTIONS,
-    RTEMS_NO_TIMEOUT,
-    &segment_address_2
-  );
-  directive_failed( status, "rtems_region_get_segment" );
-}
diff --git a/testsuites/sptests/sp16/task4.c b/testsuites/sptests/sp16/task4.c
deleted file mode 100644
index 3f1eebeb28..0000000000
--- a/testsuites/sptests/sp16/task4.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*  Task_4
- *
- *  This routine serves as a test task.  It competes with the other tasks
- *  for region resources.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_task Task_4(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code  status;
-  void              *segment_address_1;
-  void              *segment_address_2;
-
-  puts( "TA4 - rtems_region_get_segment - wait on 1.5K segment from region 1" );
-  status = rtems_region_get_segment(
-    Region_id[ 1 ],
-    1536,
-    RTEMS_DEFAULT_OPTIONS,
-    RTEMS_NO_TIMEOUT,
-    &segment_address_1
-  );
-  directive_failed( status, "rtems_region_get_segment" );
-
-  status = rtems_region_return_segment( Region_id[ 1 ], segment_address_1 );
-  directive_failed( status, "rtems_region_return_segment" );
-  puts_nocr( "TA4 - got and returned " );
-  Put_address_from_area_1( segment_address_1 );
-  new_line;
-
-  status = rtems_task_wake_after( TICKS_PER_SECOND );
-  directive_failed( status, "rtems_task_wake_after" );
-
-  puts( "TA4 - rtems_region_get_segment - wait on 3K segment from region 1" );
-  status = rtems_region_get_segment(
-    Region_id[ 1 ],
-    3072,
-    RTEMS_DEFAULT_OPTIONS,
-    RTEMS_NO_TIMEOUT,
-    &segment_address_2
-  );
-  directive_failed( status, "rtems_region_get_segment" );
-}
diff --git a/testsuites/sptests/sp16/task5.c b/testsuites/sptests/sp16/task5.c
deleted file mode 100644
index 0f36aec535..0000000000
--- a/testsuites/sptests/sp16/task5.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/*  Task5
- *
- *  This routine serves as a test task.  It competes with the other tasks
- *  for region resources.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_task Task5(
-  rtems_task_argument argument
-)
-{
-  void              *segment_address_1;
-  void              *segment_address_2;
-  rtems_status_code  status;
-
-  puts( "TA5 - rtems_region_get_segment - wait on 1.5K segment from region 1" );
-  status = rtems_region_get_segment(
-    Region_id[ 1 ],
-    1536,
-    RTEMS_DEFAULT_OPTIONS,
-    RTEMS_NO_TIMEOUT,
-    &segment_address_1
-  );
-  directive_failed( status, "rtems_region_get_segment" );
-
-  status = rtems_region_return_segment( Region_id[ 1 ], segment_address_1 );
-  directive_failed( status, "rtems_region_return_segment" );
-  puts_nocr( "TA5 - got and returned " );
-  Put_address_from_area_1( segment_address_1 );
-  new_line;
-
-  status = rtems_task_wake_after( TICKS_PER_SECOND );
-  directive_failed( status, "rtems_task_wake_after" );
-
-  puts( "TA5 - rtems_region_get_segment - wait on 3K segment from region 1" );
-  status = rtems_region_get_segment(
-    Region_id[ 1 ],
-    3072,
-    RTEMS_DEFAULT_OPTIONS,
-    RTEMS_NO_TIMEOUT,
-    &segment_address_2
-  );
-  puts_nocr( "TA5 - got segment from region 1 - " );
-  Put_address_from_area_1( segment_address_2 );
-  new_line;
-
-  status = rtems_region_return_segment( Region_id[ 1 ], segment_address_2 );
-  puts_nocr(
-    "TA5 - rtems_region_return_segment - return segment to region 1 - "
-  );
-  Put_address_from_area_1( segment_address_2 );
-  new_line;
-
-  puts( "TA5 - rtems_task_delete - delete self" );
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-}
diff --git a/testsuites/sptests/sp17/asr.c b/testsuites/sptests/sp17/asr.c
deleted file mode 100644
index d4384a0774..0000000000
--- a/testsuites/sptests/sp17/asr.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/*  Process_asr
- *
- *  This routine performs the processing for task 1's RTEMS_ASR.  It is called
- *  by an assembly routine which saves the necessary registers.
- *
- *  Input parameters:
- *    signal - signal set
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_asr Process_asr(
-  rtems_signal_set signal_set
-)
-{
-  rtems_status_code status;
-
-  status = rtems_task_resume( Task_id[ 2 ] );
-  directive_failed( status, "RTEMS_ASR - rtems_task_resume of TA2" );
-}
diff --git a/testsuites/sptests/sp17/init.c b/testsuites/sptests/sp17/init.c
deleted file mode 100644
index 1a49b46c78..0000000000
--- a/testsuites/sptests/sp17/init.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/*  Init
- *
- *  This routine is the initialization task for this test program.
- *  It is a user initialization task and has the responsibility for creating
- *  and starting the tasks that make up the test.  If the time of day
- *  clock is required for the test, it should also be set to a known
- *  value by this function.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "system.h"
-
-rtems_task Init(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-
-  puts( "\n\n*** TEST 17 ***" );
-
-  Task_name[ 1 ] =  rtems_build_name( 'T', 'A', '1', ' ' );
-  Task_name[ 2 ] =  rtems_build_name( 'T', 'A', '2', ' ' );
-
-  Task_2_preempted = FALSE;
-
-  status = rtems_task_create(
-    Task_name[ 1 ],
-    2,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Task_id[ 1 ]
-  );
-  directive_failed( status, "rtems_task_create of TA1" );
-
-  status = rtems_task_start( Task_id[ 1 ], Task_1, 0 );
-  directive_failed( status, "rtems_task_start of TA1" );
-
-  status = rtems_task_create(
-    Task_name[ 2 ],
-    1,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Task_id[ 2 ]
-  );
-  directive_failed( status, "rtems_task_create of TA2" );
-
-  status = rtems_task_start( Task_id[ 2 ], Task_2, 0 );
-  directive_failed( status, "rtems_task_start of TA2" );
-
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-}
diff --git a/testsuites/sptests/sp17/sp17.doc b/testsuites/sptests/sp17/sp17.doc
deleted file mode 100644
index dcff893039..0000000000
--- a/testsuites/sptests/sp17/sp17.doc
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
-This file describes the directives and concepts tested by this test set.
-
-test set name:  test17
-
-directives:
-  ex_init, ex_start, t_create, t_start, tm_tick, i_return, t_ident,
-  as_catch, as_return
-
-concepts:
-
-  a.  Verifies system can create and start both the executive's system
-      initialization and idle task.
-
-  b.  Verifies can print strings to the CRT on port 2 of the mvme136 board
-      using Print and Println in the board support package.
-
-  c.  Verifies executive initialization performed correctly.
-
-  d.  Verifies that a task can get the task identification number
-      of another task.
-
-  e.  Verifies that a signal can be sent to a remote task.
diff --git a/testsuites/sptests/sp17/sp17.scn b/testsuites/sptests/sp17/sp17.scn
deleted file mode 100644
index 47fd140e2a..0000000000
--- a/testsuites/sptests/sp17/sp17.scn
+++ /dev/null
@@ -1,8 +0,0 @@
-*** TEST 17 ***
-TA2 - Suspending self
-TA1 - rtems_signal_catch: initializing signal catcher
-TA1 - Sending signal to self
-TA2 - signal_return preempted correctly
-TA1 - TA2 correctly preempted me
-TA1 - Got Back!!!
-*** END OF TEST 17 ***
diff --git a/testsuites/sptests/sp17/system.h b/testsuites/sptests/sp17/system.h
deleted file mode 100644
index 8f595b3e6b..0000000000
--- a/testsuites/sptests/sp17/system.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*  system.h
- *
- *  This include file contains information that is included in every
- *  function in the test set.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <tmacros.h>
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
- 
-rtems_asr Process_asr(
-  rtems_signal_set signal_set
-);
- 
-rtems_task Task_1(
-  rtems_task_argument argument
-);
- 
-rtems_task Task_2(
-  rtems_task_argument argument
-);
-
-/* configuration information */
-
-#define CONFIGURE_SPTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_MICROSECONDS_PER_TICK   RTEMS_MILLISECONDS_TO_MICROSECONDS(25)
-#define CONFIGURE_TICKS_PER_TIMESLICE     1000
-
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#include <confdefs.h>
-
-/* global variables */
-
-TEST_EXTERN rtems_id   Task_id[ 4 ];         /* array of task ids */
-TEST_EXTERN rtems_name Task_name[ 4 ];       /* array of task names */
-
-TEST_EXTERN rtems_unsigned32 Task_2_preempted;
-
-/* end of include file */
diff --git a/testsuites/sptests/sp17/task1.c b/testsuites/sptests/sp17/task1.c
deleted file mode 100644
index 9bd1a04e01..0000000000
--- a/testsuites/sptests/sp17/task1.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*  Task_1
- *
- *  This task initializes the signal catcher, sends the first signal
- *  if running on the first node, and loops while waiting for signals.
- *
- *  NOTE: The signal catcher is not reentrant and hence RTEMS_NO_ASR must
- *        be a part of its execution mode.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_task Task_1(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-
-  puts( "TA1 - rtems_signal_catch: initializing signal catcher" );
-  status = rtems_signal_catch( Process_asr, RTEMS_NO_ASR | RTEMS_NO_PREEMPT );
-  directive_failed( status, "rtems_signal_catch" );
-
-  puts( "TA1 - Sending signal to self" );
-  status = rtems_signal_send( Task_id[ 1 ], RTEMS_SIGNAL_16 );
-  directive_failed( status, "rtems_signal_send" );
-
-  if ( Task_2_preempted == TRUE )
-    puts( "TA1 - TA2 correctly preempted me" );
-
-  puts("TA1 - Got Back!!!");
-
-  puts( "*** END OF TEST 17 ***" );
-  exit( 0 );
-}
diff --git a/testsuites/sptests/sp17/task2.c b/testsuites/sptests/sp17/task2.c
deleted file mode 100644
index 1b9759c9b6..0000000000
--- a/testsuites/sptests/sp17/task2.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*  Task_2
- *
- *  This task initializes the signal catcher, sends the first signal
- *  if running on the first node, and loops while waiting for signals.
- *
- *  NOTE: The signal catcher is not reentrant and hence RTEMS_NO_ASR must
- *        be a part of its execution mode.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_task Task_2(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-
-  Task_2_preempted = FALSE;
-
-  puts( "TA2 - Suspending self" );
-  status = rtems_task_suspend( RTEMS_SELF );
-  directive_failed( status, "rtems_task_suspend of TA2" );
-
-  puts( "TA2 - signal_return preempted correctly" );
-
-  Task_2_preempted = TRUE;
-
-  status = rtems_task_suspend( RTEMS_SELF );
-  directive_failed( status, "rtems_task_suspend of TA2" );
-}
diff --git a/testsuites/sptests/sp19/first.c b/testsuites/sptests/sp19/first.c
deleted file mode 100644
index 82348300ed..0000000000
--- a/testsuites/sptests/sp19/first.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/*  First_FP_task
- *
- *  This routine serves as a floating point test task.  It verifies the
- *  basic task switching capabilities of the executive when floating
- *  point is configured.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-#include "fptest.h"
-#include "inttest.h"
-
-rtems_task First_FP_task(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-  rtems_id          tid;
-  rtems_time_of_day time;
-  rtems_unsigned32  task_index;
-  INTEGER_DECLARE;
-  FP_DECLARE;
-
-  status = rtems_task_ident( RTEMS_SELF, RTEMS_SEARCH_ALL_NODES, &tid );
-  directive_failed( status, "rtems_task_ident" );
-
-  task_index = task_number( tid );
-
-  INTEGER_LOAD( INTEGER_factors[ task_index ] );
-  FP_LOAD( FP_factors[ task_index ] );
-
-  put_name( Task_name[ task_index ], FALSE );
-  printf( " - integer base = (0x%x)\n", INTEGER_factors[ task_index ] );
-  put_name( Task_name[ task_index ], FALSE );
-#if ( RTEMS_HAS_HARDWARE_FP == 1 )
-  printf( " - float base = (%g)\n", FP_factors[ task_index ] );
-#else
-  printf( " - float base = (NA)\n" );
-#endif
-
-  if ( argument == 0 ) {
-    status = rtems_task_restart( RTEMS_SELF, 1 );
-    directive_failed( status, "rtems_task_restart of RTEMS_SELF" );
-  } else {
-    build_time( &time, 12, 31, 1988, 9, 0, 0, 0 );
-    status = rtems_clock_set( &time );
-    directive_failed( status, "rtems_clock_set" );
-
-    status = rtems_task_delete( RTEMS_SELF );
-    directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-  }
-}
diff --git a/testsuites/sptests/sp19/fptask.c b/testsuites/sptests/sp19/fptask.c
deleted file mode 100644
index f80e0decca..0000000000
--- a/testsuites/sptests/sp19/fptask.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/*  FP_task
- *
- *  This routine serves as a floating point test task.  It verifies the
- *  basic task switching capabilities of the executive when floating
- *  point is configured.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-#include "fptest.h"
-#include "inttest.h"
-
-rtems_task FP_task(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-  rtems_id          tid;
-  rtems_time_of_day time;
-  rtems_unsigned32  task_index;
-  rtems_unsigned32  previous_seconds;
-  INTEGER_DECLARE;
-  FP_DECLARE;
-
-  status = rtems_task_ident( RTEMS_SELF, RTEMS_SEARCH_ALL_NODES, &tid );
-  directive_failed( status, "rtems_task_ident of self" );
-
-  task_index = task_number( tid );
-
-  INTEGER_LOAD( INTEGER_factors[ task_index ] );
-  FP_LOAD( FP_factors[ task_index ] );
-
-  put_name( Task_name[ task_index ], FALSE );
-  printf( " - integer base = (0x%x)\n", INTEGER_factors[ task_index ] );
-  put_name( Task_name[ task_index ], FALSE );
-#if ( RTEMS_HAS_HARDWARE_FP == 1 )
-  printf( " - float base = (%g)\n", FP_factors[ task_index ] );
-#else
-  printf( " - float base = (NA)\n" );
-#endif
-
-  previous_seconds = -1;
-
-  while( FOREVER ) {
-
-    status = rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time );
-    directive_failed( status, "rtems_clock_get" );
-
-    if ( time.second >= 16 ) {
-
-      if ( task_number( tid ) == 4 ) {
-        puts( "TA4 - rtems_task_delete - self" );
-        status = rtems_task_delete( RTEMS_SELF );
-        directive_failed( status, "rtems_task_delete of TA4" );
-      }
-      puts( "TA5 - rtems_task_delete - TA3" );
-      status = rtems_task_delete( Task_id[ 3 ] );
-      directive_failed( status, "rtems_task_delete of TA3" );
-
-      puts( "*** END OF TEST 19 *** " );
-      exit( 0 );
-    }
-
-    if (previous_seconds != time.second)
-    {
-      put_name( Task_name[ task_index ], FALSE );
-      print_time( " - rtems_clock_get - ", &time, "\n" );
-      previous_seconds = time.second;
-    }
-
-    INTEGER_CHECK( INTEGER_factors[ task_index ] );
-    FP_CHECK( FP_factors[ task_index ] );
-
-    /* for the first 4 seconds we spin as fast as possible
-     * so that we likely are interrupted
-     * After that, we go to sleep for a second at a time
-     */
-    if (time.second >= 4)
-    {
-      status = rtems_task_wake_after( TICKS_PER_SECOND );
-      directive_failed( status, "rtems_task_wake_after" );
-    }
-  }
-}
diff --git a/testsuites/sptests/sp19/fptest.h b/testsuites/sptests/sp19/fptest.h
deleted file mode 100644
index a30f2cf451..0000000000
--- a/testsuites/sptests/sp19/fptest.h
+++ /dev/null
@@ -1,172 +0,0 @@
-/*  fptest.h
- *
- *  This include file contains the CPU dependent implementation
- *  of the following routines needed to test RTEMS floating
- *  point support:
- *           FP_load( &context )
- *           FP_check( &context )
- *
- *  FP_load   - loads the specified floating point context
- *  FP_check  - checks the specified floating point context
- *
- *  NOTE:  These routines are VERY CPU dependent and are thus
- *         located in in the CPU dependent include file
- *         fptest.h.  These routines form the core of the
- *         floating point context switch test.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-#ifndef __FPTEST_h
-#define __FPTEST_h
-
-#include <stdio.h>
-
-#ifndef RTEMS_HAS_HARDWARE_FP
-#error "This CPU does not have RTEMS_HAS_HARDWARE_FP defined"
-#endif
-
-#if ( RTEMS_HAS_HARDWARE_FP == FALSE )
-
-/*
- *  The following is useless except to avoid some warnings.
- */
-
-#define FP_DECLARE unsigned int fp01 = 0;
-#define FP_LOAD( _factor ) fp01 = 2;
-#define FP_CHECK( _factor ) \
-   if ( fp01 != 2 ) \
-          printf("%d: single integer is wrong -- (%d != 2) \n", \
-             task_index, fp01 );  \
-
-#else
-
-#define FP_DECLARE \
-    double  fp01 = 1.0; \
-    double  fp02 = 2.0; \
-    double  fp03 = 3.0; \
-    double  fp04 = 4.0; \
-    double  fp05 = 5.0; \
-    double  fp06 = 6.0; \
-    double  fp07 = 7.0; \
-    double  fp08 = 8.0; \
-    double  fp09 = 9.0; \
-    double  fp10 = 10.0; \
-    double  fp11 = 11.0; \
-    double  fp12 = 12.0; \
-    double  fp13 = 13.0; \
-    double  fp14 = 14.0; \
-    double  fp15 = 15.0; \
-    double  fp16 = 16.0; \
-    double  fp17 = 17.0; \
-    double  fp18 = 18.0; \
-    double  fp19 = 19.0; \
-    double  fp20 = 20.0; \
-    double  fp21 = 21.0; \
-    double  fp22 = 22.0; \
-    double  fp23 = 23.0; \
-    double  fp24 = 24.0; \
-    double  fp25 = 25.0; \
-    double  fp26 = 26.0; \
-    double  fp27 = 27.0; \
-    double  fp28 = 28.0; \
-    double  fp29 = 29.0; \
-    double  fp30 = 30.0; \
-    double  fp31 = 31.0; \
-    double  fp32 = 32.0
-
-#define FP_LOAD( _factor ) \
-  do {                \
-    fp01  += _factor; \
-    fp02  += _factor; \
-    fp03  += _factor; \
-    fp04  += _factor; \
-    fp05  += _factor; \
-    fp06  += _factor; \
-    fp07  += _factor; \
-    fp08  += _factor; \
-    fp09  += _factor; \
-    fp10  += _factor; \
-    fp11  += _factor; \
-    fp12  += _factor; \
-    fp13  += _factor; \
-    fp14  += _factor; \
-    fp15  += _factor; \
-    fp16  += _factor; \
-    fp17  += _factor; \
-    fp18  += _factor; \
-    fp19  += _factor; \
-    fp20  += _factor; \
-    fp21  += _factor; \
-    fp22  += _factor; \
-    fp23  += _factor; \
-    fp24  += _factor; \
-    fp25  += _factor; \
-    fp26  += _factor; \
-    fp27  += _factor; \
-    fp28  += _factor; \
-    fp29  += _factor; \
-    fp30  += _factor; \
-    fp31  += _factor; \
-    fp32  += _factor; \
-  } while (0)
-
-#define EPSILON    (0.0005)
-#define FPABS(d)   (((d) < 0.0) ? -(d) : (d))
-#define FPNEQ(a,b) (FPABS((a)-(b)) > EPSILON)
-
-#define FP_CHECK_ONE( _v, _base, _factor ) \
-      if ( FPNEQ( (_v), ((_base) + (_factor)) ) )  { \
-          printf("%d: " #_v " wrong -- (%g not %g)\n", \
-             task_index, (_v), (_base + _factor));  \
-      }
-
-
-#define FP_CHECK( _factor ) \
-    do { \
-      FP_CHECK_ONE( fp01,  1.0, (_factor) ); \
-      FP_CHECK_ONE( fp02,  2.0, (_factor) ); \
-      FP_CHECK_ONE( fp03,  3.0, (_factor) ); \
-      FP_CHECK_ONE( fp04,  4.0, (_factor) ); \
-      FP_CHECK_ONE( fp05,  5.0, (_factor) ); \
-      FP_CHECK_ONE( fp06,  6.0, (_factor) ); \
-      FP_CHECK_ONE( fp07,  7.0, (_factor) ); \
-      FP_CHECK_ONE( fp08,  8.0, (_factor) ); \
-      FP_CHECK_ONE( fp09,  9.0, (_factor) ); \
-      FP_CHECK_ONE( fp10, 10.0, (_factor) ); \
-      FP_CHECK_ONE( fp11, 11.0, (_factor) ); \
-      FP_CHECK_ONE( fp12, 12.0, (_factor) ); \
-      FP_CHECK_ONE( fp13, 13.0, (_factor) ); \
-      FP_CHECK_ONE( fp14, 14.0, (_factor) ); \
-      FP_CHECK_ONE( fp15, 15.0, (_factor) ); \
-      FP_CHECK_ONE( fp16, 16.0, (_factor) ); \
-      FP_CHECK_ONE( fp17, 17.0, (_factor) ); \
-      FP_CHECK_ONE( fp18, 18.0, (_factor) ); \
-      FP_CHECK_ONE( fp19, 19.0, (_factor) ); \
-      FP_CHECK_ONE( fp20, 20.0, (_factor) ); \
-      FP_CHECK_ONE( fp21, 21.0, (_factor) ); \
-      FP_CHECK_ONE( fp22, 22.0, (_factor) ); \
-      FP_CHECK_ONE( fp23, 23.0, (_factor) ); \
-      FP_CHECK_ONE( fp24, 24.0, (_factor) ); \
-      FP_CHECK_ONE( fp25, 25.0, (_factor) ); \
-      FP_CHECK_ONE( fp26, 26.0, (_factor) ); \
-      FP_CHECK_ONE( fp27, 27.0, (_factor) ); \
-      FP_CHECK_ONE( fp28, 28.0, (_factor) ); \
-      FP_CHECK_ONE( fp29, 29.0, (_factor) ); \
-      FP_CHECK_ONE( fp30, 30.0, (_factor) ); \
-      FP_CHECK_ONE( fp31, 31.0, (_factor) ); \
-      FP_CHECK_ONE( fp32, 32.0, (_factor) ); \
-    } while (0)
-
-#endif
-
-#endif
diff --git a/testsuites/sptests/sp19/init.c b/testsuites/sptests/sp19/init.c
deleted file mode 100644
index 86c38134ef..0000000000
--- a/testsuites/sptests/sp19/init.c
+++ /dev/null
@@ -1,150 +0,0 @@
-/*  Init
- *
- *  This routine is the initialization task for this test program.
- *  It is a user initialization task and has the responsibility for creating
- *  and starting the tasks that make up the test.  If the time of day
- *  clock is required for the test, it should also be set to a known
- *  value by this function.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "system.h"
-
-rtems_task Init(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-
-  puts( "\n\n*** TEST 19 ***" );
-
-  Task_name[ 1 ] =  rtems_build_name( 'T', 'A', '1', ' ' );
-  Task_name[ 2 ] =  rtems_build_name( 'T', 'A', '2', ' ' );
-  Task_name[ 3 ] =  rtems_build_name( 'T', 'A', '3', ' ' );
-  Task_name[ 4 ] =  rtems_build_name( 'T', 'A', '4', ' ' );
-  Task_name[ 5 ] =  rtems_build_name( 'T', 'A', '5', ' ' );
-  Task_name[ 6 ] =  rtems_build_name( 'F', 'P', '1', ' ' );
-
-  status = rtems_task_create(
-    Task_name[ 1 ],
-    2,
-    RTEMS_MINIMUM_STACK_SIZE * 4,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_FLOATING_POINT,
-    &Task_id[ 1 ]
-  );
-  directive_failed( status, "rtems_task_create of TA1" );
-
-  status = rtems_task_create(
-    Task_name[ 2 ],
-    2,
-    RTEMS_MINIMUM_STACK_SIZE * 4,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Task_id[ 2 ]
-  );
-  directive_failed( status, "rtems_task_create of TA2" );
-
-  status = rtems_task_create(
-    Task_name[ 3 ],
-    2,
-    RTEMS_MINIMUM_STACK_SIZE * 4,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Task_id[ 3 ]
-  );
-  directive_failed( status, "rtems_task_create of TA3" );
-
-  status = rtems_task_create(
-    Task_name[ 4 ],
-    2,
-    RTEMS_MINIMUM_STACK_SIZE * 4,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_FLOATING_POINT,
-    &Task_id[ 4 ]
-  );
-  directive_failed( status, "rtems_task_create of TA4" );
-
-  status = rtems_task_create(
-    Task_name[ 5 ],
-    2,
-    RTEMS_MINIMUM_STACK_SIZE * 4,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_FLOATING_POINT,
-    &Task_id[ 5 ]
-  );
-  directive_failed( status, "rtems_task_create of TA5" );
-
-  status = rtems_task_create(
-    Task_name[ 6 ],
-    1,
-    RTEMS_MINIMUM_STACK_SIZE * 4,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_FLOATING_POINT,
-    &Task_id[ 6 ]
-  );
-  directive_failed( status, "rtems_task_create of FP1" );
-
-  status = rtems_task_start( Task_id[ 6 ], First_FP_task, 0 );
-  directive_failed( status, "rtems_task_start of FP1" );
-
-  status = rtems_task_start( Task_id[ 1 ], Task_1, 0 );
-  directive_failed( status, "rtems_task_start of TA1" );
-
-  status = rtems_task_start( Task_id[ 2 ], Task_1, 0 );
-  directive_failed( status, "rtems_task_start of TA2" );
-
-  status = rtems_task_start( Task_id[ 3 ], Task_1, 0 );
-  directive_failed( status, "rtems_task_start of TA3" );
-
-  status = rtems_task_start( Task_id[ 4 ], FP_task, 0 );
-  directive_failed( status, "rtems_task_start of TA4" );
-
-  status = rtems_task_start( Task_id[ 5 ], FP_task, 0 );
-  directive_failed( status, "rtems_task_create of TA5" );
-
-  /*
-   *  Load "task dependent factors" in the context areas
-   */
-
-
-  FP_factors[0] =    0.0;
-  FP_factors[1] = 1000.1;
-  FP_factors[2] = 2000.2;
-  FP_factors[3] = 3000.3;
-  FP_factors[4] = 4000.4;
-  FP_factors[5] = 5000.5;
-  FP_factors[6] = 6000.6;
-  FP_factors[7] = 7000.7;
-  FP_factors[8] = 8000.8;
-  FP_factors[9] = 9000.9;
-
-  INTEGER_factors[0] = 0x0000;
-  INTEGER_factors[1] = 0x1000;
-  INTEGER_factors[2] = 0x2000;
-  INTEGER_factors[3] = 0x3000;
-  INTEGER_factors[4] = 0x4000;
-  INTEGER_factors[5] = 0x5000;
-  INTEGER_factors[6] = 0x6000;
-  INTEGER_factors[7] = 0x7000;
-  INTEGER_factors[8] = 0x8000;
-  INTEGER_factors[9] = 0x9000;
-
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of TA1" );
-}
diff --git a/testsuites/sptests/sp19/inttest.h b/testsuites/sptests/sp19/inttest.h
deleted file mode 100644
index 1da6c7d42a..0000000000
--- a/testsuites/sptests/sp19/inttest.h
+++ /dev/null
@@ -1,149 +0,0 @@
-/*  inttest.h
- *
- *  XXX: ???
- *  This include file contains the CPU dependent implementation
- *  of the following routines needed to test RTEMS floating
- *  point support:
- *           INTEGER_load( &context )
- *           INTEGER_check( &context )
- *
- *  INTEGER_load   - loads the specified floating point context
- *  INTEGER_check  - checks the specified floating point context
- *
- *  NOTE:  These routines are VERY CPU dependent and are thus
- *         located in in the CPU dependent include file
- *         inttest.h.  These routines form the core of the
- *         floating point context switch test.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-#ifndef __INTEGER_TEST_h
-#define __INTEGER_TEST_h
-
-#include <stdio.h>
-#define REG_VARIABLE rtems_unsigned32
-
-#define INTEGER_DECLARE \
-    REG_VARIABLE int01 = 1; \
-    REG_VARIABLE int02 = 2; \
-    REG_VARIABLE int03 = 3; \
-    REG_VARIABLE int04 = 4; \
-    REG_VARIABLE int05 = 5; \
-    REG_VARIABLE int06 = 6; \
-    REG_VARIABLE int07 = 7; \
-    REG_VARIABLE int08 = 8; \
-    REG_VARIABLE int09 = 9; \
-    REG_VARIABLE int10 = 10; \
-    REG_VARIABLE int11 = 11; \
-    REG_VARIABLE int12 = 12; \
-    REG_VARIABLE int13 = 13; \
-    REG_VARIABLE int14 = 14; \
-    REG_VARIABLE int15 = 15; \
-    REG_VARIABLE int16 = 16; \
-    REG_VARIABLE int17 = 17; \
-    REG_VARIABLE int18 = 18; \
-    REG_VARIABLE int19 = 19; \
-    REG_VARIABLE int20 = 20; \
-    REG_VARIABLE int21 = 21; \
-    REG_VARIABLE int22 = 22; \
-    REG_VARIABLE int23 = 23; \
-    REG_VARIABLE int24 = 24; \
-    REG_VARIABLE int25 = 25; \
-    REG_VARIABLE int26 = 26; \
-    REG_VARIABLE int27 = 27; \
-    REG_VARIABLE int28 = 28; \
-    REG_VARIABLE int29 = 29; \
-    REG_VARIABLE int30 = 30; \
-    REG_VARIABLE int31 = 31; \
-    REG_VARIABLE int32 = 32
-
-#define INTEGER_LOAD( _factor ) \
-  do {                \
-    int01  += _factor; \
-    int02  += _factor; \
-    int03  += _factor; \
-    int04  += _factor; \
-    int05  += _factor; \
-    int06  += _factor; \
-    int07  += _factor; \
-    int08  += _factor; \
-    int09  += _factor; \
-    int10  += _factor; \
-    int11  += _factor; \
-    int12  += _factor; \
-    int13  += _factor; \
-    int14  += _factor; \
-    int15  += _factor; \
-    int16  += _factor; \
-    int17  += _factor; \
-    int18  += _factor; \
-    int19  += _factor; \
-    int20  += _factor; \
-    int21  += _factor; \
-    int22  += _factor; \
-    int23  += _factor; \
-    int24  += _factor; \
-    int25  += _factor; \
-    int26  += _factor; \
-    int27  += _factor; \
-    int28  += _factor; \
-    int29  += _factor; \
-    int30  += _factor; \
-    int31  += _factor; \
-    int32  += _factor; \
-  } while (0)
-
-#define INTEGER_CHECK_ONE( _v, _base, _factor ) \
-      if ( (_v) != ((_base) + (_factor)) )  { \
-          printf("%d: " #_v " wrong -- (0x%x not 0x%x)\n", \
-             task_index, (_v), (_base + _factor));  \
-      }
-
-
-#define INTEGER_CHECK( _factor ) \
-    do { \
-      INTEGER_CHECK_ONE( int01,  1, (_factor) ); \
-      INTEGER_CHECK_ONE( int02,  2, (_factor) ); \
-      INTEGER_CHECK_ONE( int03,  3, (_factor) ); \
-      INTEGER_CHECK_ONE( int04,  4, (_factor) ); \
-      INTEGER_CHECK_ONE( int05,  5, (_factor) ); \
-      INTEGER_CHECK_ONE( int06,  6, (_factor) ); \
-      INTEGER_CHECK_ONE( int07,  7, (_factor) ); \
-      INTEGER_CHECK_ONE( int08,  8, (_factor) ); \
-      INTEGER_CHECK_ONE( int09,  9, (_factor) ); \
-      INTEGER_CHECK_ONE( int10, 10, (_factor) ); \
-      INTEGER_CHECK_ONE( int11, 11, (_factor) ); \
-      INTEGER_CHECK_ONE( int12, 12, (_factor) ); \
-      INTEGER_CHECK_ONE( int13, 13, (_factor) ); \
-      INTEGER_CHECK_ONE( int14, 14, (_factor) ); \
-      INTEGER_CHECK_ONE( int15, 15, (_factor) ); \
-      INTEGER_CHECK_ONE( int16, 16, (_factor) ); \
-      INTEGER_CHECK_ONE( int17, 17, (_factor) ); \
-      INTEGER_CHECK_ONE( int18, 18, (_factor) ); \
-      INTEGER_CHECK_ONE( int19, 19, (_factor) ); \
-      INTEGER_CHECK_ONE( int20, 20, (_factor) ); \
-      INTEGER_CHECK_ONE( int21, 21, (_factor) ); \
-      INTEGER_CHECK_ONE( int22, 22, (_factor) ); \
-      INTEGER_CHECK_ONE( int23, 23, (_factor) ); \
-      INTEGER_CHECK_ONE( int24, 24, (_factor) ); \
-      INTEGER_CHECK_ONE( int25, 25, (_factor) ); \
-      INTEGER_CHECK_ONE( int26, 26, (_factor) ); \
-      INTEGER_CHECK_ONE( int27, 27, (_factor) ); \
-      INTEGER_CHECK_ONE( int28, 28, (_factor) ); \
-      INTEGER_CHECK_ONE( int29, 29, (_factor) ); \
-      INTEGER_CHECK_ONE( int30, 30, (_factor) ); \
-      INTEGER_CHECK_ONE( int31, 31, (_factor) ); \
-      INTEGER_CHECK_ONE( int32, 32, (_factor) ); \
-    } while (0)
-
-#endif
diff --git a/testsuites/sptests/sp19/sp19.doc b/testsuites/sptests/sp19/sp19.doc
deleted file mode 100644
index 0b26e5d8b2..0000000000
--- a/testsuites/sptests/sp19/sp19.doc
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
-This file describes the directives and concepts tested by this test set.
-
-test set name:  test19
-
-directives:
-
-concepts:
-
-  a.  Verifies system can dispatch a mixture of floating point and
-      non-floating point tasks.
diff --git a/testsuites/sptests/sp19/sp19.scn b/testsuites/sptests/sp19/sp19.scn
deleted file mode 100644
index d70c8ad89a..0000000000
--- a/testsuites/sptests/sp19/sp19.scn
+++ /dev/null
@@ -1,50 +0,0 @@
-*** TEST 19 ***
-FP1  - integer base = (0x6000)
-FP1  - float base = (6000.6)
-FP1  - integer base = (0x6000)
-FP1  - float base = (6000.6)
-TA1  - integer base = (0x1000)
-TA1  - rtems_clock_get - 09:00:00   12/31/1988
-TA2  - integer base = (0x2000)
-TA2  - rtems_clock_get - 09:00:00   12/31/1988
-TA3  - integer base = (0x3000)
-TA3  - rtems_clock_get - 09:00:00   12/31/1988
-TA4  - integer base = (0x4000)
-TA4  - float base = (4000.4)
-TA4  - rtems_clock_get - 09:00:00   12/31/1988
-TA4  - rtems_clock_get - 09:00:01   12/31/1988
-TA4  - rtems_clock_get - 09:00:02   12/31/1988
-TA4  - rtems_clock_get - 09:00:03   12/31/1988
-TA4  - rtems_clock_get - 09:00:04   12/31/1988
-TA5  - integer base = (0x5000)
-TA5  - float base = (5000.5)
-TA5  - rtems_clock_get - 09:00:04   12/31/1988
-TA1  - rtems_clock_get - 09:00:05   12/31/1988
-TA5  - rtems_clock_get - 09:00:05   12/31/1988
-TA4  - rtems_clock_get - 09:00:05   12/31/1988
-TA5  - rtems_clock_get - 09:00:06   12/31/1988
-TA4  - rtems_clock_get - 09:00:06   12/31/1988
-TA5  - rtems_clock_get - 09:00:07   12/31/1988
-TA4  - rtems_clock_get - 09:00:07   12/31/1988
-TA5  - rtems_clock_get - 09:00:08   12/31/1988
-TA4  - rtems_clock_get - 09:00:08   12/31/1988
-TA5  - rtems_clock_get - 09:00:09   12/31/1988
-TA4  - rtems_clock_get - 09:00:09   12/31/1988
-TA2  - rtems_clock_get - 09:00:10   12/31/1988
-TA1  - rtems_clock_get - 09:00:10   12/31/1988
-TA5  - rtems_clock_get - 09:00:10   12/31/1988
-TA4  - rtems_clock_get - 09:00:10   12/31/1988
-TA5  - rtems_clock_get - 09:00:11   12/31/1988
-TA4  - rtems_clock_get - 09:00:11   12/31/1988
-TA5  - rtems_clock_get - 09:00:12   12/31/1988
-TA4  - rtems_clock_get - 09:00:12   12/31/1988
-TA5  - rtems_clock_get - 09:00:13   12/31/1988
-TA4  - rtems_clock_get - 09:00:13   12/31/1988
-TA5  - rtems_clock_get - 09:00:14   12/31/1988
-TA4  - rtems_clock_get - 09:00:14   12/31/1988
-TA3  - rtems_clock_get - 09:00:15   12/31/1988
-TA1  - rtems_clock_get - 09:00:15   12/31/1988
-TA5  - rtems_clock_get - 09:00:15   12/31/1988
-TA4  - rtems_clock_get - 09:00:15   12/31/1988
-TA5 - rtems_task_delete - TA3
-*** END OF TEST 19 ***
diff --git a/testsuites/sptests/sp19/system.h b/testsuites/sptests/sp19/system.h
deleted file mode 100644
index fefd7ece07..0000000000
--- a/testsuites/sptests/sp19/system.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*  system.h
- *
- *  This include file contains information that is included in every
- *  function in the test set.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <tmacros.h>
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
- 
-rtems_task First_FP_task(
-  rtems_task_argument argument
-);
- 
-rtems_task FP_task(
-  rtems_task_argument argument
-);
- 
-rtems_task Task_1(
-  rtems_task_argument argument
-);
-
-/* configuration information */
-
-#define CONFIGURE_SPTEST
-
-#define CONFIGURE_INIT_TASK_ATTRIBUTES    RTEMS_FLOATING_POINT 
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#define CONFIGURE_EXTRA_TASK_STACKS         (18 * RTEMS_MINIMUM_STACK_SIZE)
-
-#include <confdefs.h>
-
-/* global variables */
-
-TEST_EXTERN rtems_id Task_id[ 7 ];     /* array of task ids */
-TEST_EXTERN rtems_id Task_name[ 7 ];   /* array of task names */
-
-TEST_EXTERN rtems_double FP_factors[ 10 ];  /* FP "uniqueness" factors */
-TEST_EXTERN rtems_unsigned32 INTEGER_factors[ 10 ];  /* INT "uniqueness" factors */
-/* end of include file */
diff --git a/testsuites/sptests/sp19/task1.c b/testsuites/sptests/sp19/task1.c
deleted file mode 100644
index 9b271fac8f..0000000000
--- a/testsuites/sptests/sp19/task1.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*  Task_1
- *
- *  This routine serves as a test task.  It verifies the basic task
- *  switching capabilities of the executive.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-#include "inttest.h"
-
-rtems_task Task_1(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-  rtems_id          tid;
-  rtems_time_of_day time;
-  rtems_unsigned32  task_index;
-  INTEGER_DECLARE;
-
-  status = rtems_task_ident( RTEMS_SELF, RTEMS_SEARCH_ALL_NODES, &tid );
-  directive_failed( status, "rtems_task_ident" );
-
-  task_index = task_number( tid );
-
-  INTEGER_LOAD( INTEGER_factors[ task_index ] );
-
-  put_name( Task_name[ task_index ], FALSE );
-  printf( " - integer base = (0x%x)\n", INTEGER_factors[ task_index ] );
-
-  while( FOREVER ) {
-    status = rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time );
-    directive_failed( status, "rtems_clock_get" );
-
-    put_name( Task_name[ task_number( tid ) ], FALSE );
-    print_time( " - rtems_clock_get - ", &time, "\n" );
-
-    INTEGER_CHECK( INTEGER_factors[ task_index ] );
-
-    status = rtems_task_wake_after(
-      ( task_number( tid ) ) * 5 * TICKS_PER_SECOND
-    );
-    directive_failed( status, "rtems_task_wake_after" );
-  }
-}
diff --git a/testsuites/sptests/sp20/getall.c b/testsuites/sptests/sp20/getall.c
deleted file mode 100644
index 85f6470d1c..0000000000
--- a/testsuites/sptests/sp20/getall.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/*  Get_all_counters
- *
- *  This routine allows TA5 to atomically obtain the iteration counters.
- *
- *  Input parameters:  NONE
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-void Get_all_counters()
-{
-  rtems_mode        previous_mode;
-  rtems_status_code status;
-
-  status = rtems_task_mode(
-    RTEMS_NO_PREEMPT,
-    RTEMS_PREEMPT_MASK,
-    &previous_mode
-  );
-  directive_failed( status, "rtems_task_mode to RTEMS_NO_PREEMPT" );
-
-  Temporary_count = Count;
-  Count.count[ 1 ] = 0;
-  Count.count[ 2 ] = 0;
-  Count.count[ 3 ] = 0;
-  Count.count[ 4 ] = 0;
-  Count.count[ 5 ] = 0;
-
-  status = rtems_task_mode( RTEMS_PREEMPT, RTEMS_PREEMPT_MASK, &previous_mode );
-  directive_failed( status, "rtems_task_mode to RTEMS_PREEMPT" );
-}
diff --git a/testsuites/sptests/sp20/init.c b/testsuites/sptests/sp20/init.c
deleted file mode 100644
index e70df5aa47..0000000000
--- a/testsuites/sptests/sp20/init.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/*  Init
- *
- *  This routine is the initialization task for this test program.
- *  It is a user initialization task and has the responsibility for creating
- *  and starting the tasks that make up the test.  If the time of day
- *  clock is required for the test, it should also be set to a known
- *  value by this function.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "system.h"
-
-rtems_task Init(
-  rtems_task_argument argument
-)
-{
-  rtems_unsigned32  index;
-  rtems_status_code status;
-
-  puts( "\n\n*** TEST 20 ***" );
-
-  Task_name[ 1 ] =  rtems_build_name( 'T', 'A', '1', ' ' );
-  Task_name[ 2 ] =  rtems_build_name( 'T', 'A', '2', ' ' );
-  Task_name[ 3 ] =  rtems_build_name( 'T', 'A', '3', ' ' );
-  Task_name[ 4 ] =  rtems_build_name( 'T', 'A', '4', ' ' );
-  Task_name[ 5 ] =  rtems_build_name( 'T', 'A', '5', ' ' );
-
-  for ( index = 1 ; index <= 5 ; index++ ) {
-    status = rtems_task_create(
-      Task_name[ index ],
-      Priorities[ index ],
-      RTEMS_MINIMUM_STACK_SIZE * 4,
-      RTEMS_DEFAULT_MODES,
-      RTEMS_DEFAULT_ATTRIBUTES,
-      &Task_id[ index ]
-    );
-    directive_failed( status, "rtems_task_create loop" );
-  }
-
-  for ( index = 1 ; index <= 5 ; index++ ) {
-    status = rtems_task_start( Task_id[ index ], Task_1_through_5, index );
-    directive_failed( status, "rtems_task_start loop" );
-  }
-
-  Count.count[ 1 ] = 0;
-  Count.count[ 2 ] = 0;
-  Count.count[ 3 ] = 0;
-  Count.count[ 4 ] = 0;
-  Count.count[ 5 ] = 0;
-
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-}
diff --git a/testsuites/sptests/sp20/sp20.doc b/testsuites/sptests/sp20/sp20.doc
deleted file mode 100644
index 668aa4a844..0000000000
--- a/testsuites/sptests/sp20/sp20.doc
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
-This file describes the directives and concepts tested by this test set.
-
-test set name:  test20
-
-directives:
-
-  rm_create, rm_period
-
-concepts:
-
-  a.  Verifies Rate Monotonic Manager behavior.
diff --git a/testsuites/sptests/sp20/sp20.scn b/testsuites/sptests/sp20/sp20.scn
deleted file mode 100644
index bb4e8814da..0000000000
--- a/testsuites/sptests/sp20/sp20.scn
+++ /dev/null
@@ -1,27 +0,0 @@
-*** TEST 20 ***
-TA1 - rtems_rate_monotonic_create id = 0x28010001
-TA1 - rtems_rate_monotonic_ident id = 0x28010001
-TA1 - (0x28010001) period 2
-TA2 - rtems_rate_monotonic_create id = 0x28010002
-TA2 - rtems_rate_monotonic_ident id = 0x28010002
-TA2 - (0x28010002) period 2
-TA3 - rtems_rate_monotonic_create id = 0x28010003
-TA3 - rtems_rate_monotonic_ident id = 0x28010003
-TA3 - (0x28010003) period 2
-TA4 - rtems_rate_monotonic_create id = 0x28010004
-TA4 - rtems_rate_monotonic_ident id = 0x28010004
-TA4 - (0x28010004) period 2
-TA5 - rtems_rate_monotonic_create id = 0x28010005
-TA5 - rtems_rate_monotonic_ident id = 0x28010005
-TA5 - (0x28010005) period 100
-TA5 - PERIODS CHECK OK (1)
-TA5 - PERIODS CHECK OK (2)
-TA5 - PERIODS CHECK OK (3)
-TA5 - PERIODS CHECK OK (4)
-TA5 - PERIODS CHECK OK (5)
-TA5 - PERIODS CHECK OK (6)
-TA5 - PERIODS CHECK OK (7)
-TA5 - PERIODS CHECK OK (8)
-TA5 - PERIODS CHECK OK (9)
-TA5 - PERIODS CHECK OK (10)
-*** END OF TEST 20 ***
diff --git a/testsuites/sptests/sp20/system.h b/testsuites/sptests/sp20/system.h
deleted file mode 100644
index 45d79b70d8..0000000000
--- a/testsuites/sptests/sp20/system.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*  system.h
- *
- *  This include file contains information that is included in every
- *  function in the test set.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <tmacros.h>
-
-/* types */
-
-struct counters {
-  rtems_unsigned32 count[6];
-};
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
- 
-rtems_task Task_1_through_5(
-  rtems_task_argument argument
-);
- 
-void Get_all_counters( void );
- 
-/* configuration information */
-
-#define CONFIGURE_SPTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_INIT_TASK_PRIORITY          10
-#define CONFIGURE_INIT_TASK_INITIAL_MODES     RTEMS_DEFAULT_MODES
-#define CONFIGURE_MAXIMUM_PERIODS             10
-
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#define CONFIGURE_EXTRA_TASK_STACKS         (15 * RTEMS_MINIMUM_STACK_SIZE)
-
-#include <confdefs.h>
-
-/* global variables */
-
-TEST_EXTERN rtems_id   Task_id[ 6 ];     /* array of task ids */
-TEST_EXTERN rtems_name Task_name[ 6 ];   /* array of task names */
-
-TEST_EXTERN struct counters Count;       /* iteration counters */
-TEST_EXTERN struct counters Temporary_count;
-extern rtems_task_priority Priorities[ 6 ];
-
-/* end of include file */
diff --git a/testsuites/sptests/sp20/task1.c b/testsuites/sptests/sp20/task1.c
deleted file mode 100644
index dc80a405d5..0000000000
--- a/testsuites/sptests/sp20/task1.c
+++ /dev/null
@@ -1,116 +0,0 @@
-/*  Task_1_through_5
- *
- *  This routine serves as a test task for the period capabilities of the
- *  Rate Monotonic Manager.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_unsigned32    Periods[6]    = { 0,   2,   2,   2,   2, 100 };
-rtems_unsigned32    Iterations[6] = { 0,  50,  50,  50,  50,   1 };
-rtems_task_priority Priorities[6] = { 0,   1,   1,   3,   4,   5 };
-
-rtems_task Task_1_through_5(
-  rtems_unsigned32 argument
-)
-{
-  rtems_id          rmid;
-  rtems_id          test_rmid;
-  rtems_unsigned32  index;
-  rtems_unsigned32  pass;
-  rtems_unsigned32  failed;
-  rtems_status_code status;
-
-  status = rtems_rate_monotonic_create( argument, &rmid );
-  directive_failed( status, "rtems_rate_monotonic_create" );
-  put_name( Task_name[ argument ], FALSE );
-  printf( "- rtems_rate_monotonic_create id = 0x%08x\n", rmid );
-
-  status = rtems_rate_monotonic_ident( argument, &test_rmid );
-  directive_failed( status, "rtems_rate_monotonic_ident" );
-  put_name( Task_name[ argument ], FALSE );
-  printf( "- rtems_rate_monotonic_ident id = 0x%08x\n", test_rmid );
-
-  if ( rmid != test_rmid ) {
-     printf( "RMID's DO NOT MATCH (0x%x and 0x%x)\n", rmid, test_rmid );
-     exit( 0 );
-  }
-
-  put_name( Task_name[ argument ], FALSE );
-  printf( "- (0x%08x) period %d\n", rmid, Periods[ argument ] );
-
-  status = rtems_task_wake_after( 2 );
-  directive_failed( status, "rtems_task_wake_after" );
-
-  switch ( argument ) {
-    case 1:
-    case 2:
-    case 3:
-    case 4:
-      while ( FOREVER ) {
-        status = rtems_rate_monotonic_period( rmid, Periods[ argument ] );
-        directive_failed( status, "rtems_rate_monotonic_period" );
-        Count.count[ argument ]++;
-      }
-      break;
-    case 5:
-      pass   = 0;
-      failed = 0;
-
-      status = rtems_rate_monotonic_period( rmid, Periods[ argument ] );
-      directive_failed( status, "rtems_rate_monotonic_period 1 of TA5" );
-
-      Get_all_counters();
-
-      while ( FOREVER ) {
-
-        status = rtems_rate_monotonic_period( rmid, Periods[ argument ] );
-        directive_failed( status, "rtems_rate_monotonic_period 2 of TA5" );
-
-        Get_all_counters();
-
-        for( index = 1 ; index <= 4 ; index++ ) {
-          if ( Temporary_count.count[ index ] != Iterations[ index ] ) {
-            puts_nocr( "FAIL -- " );
-            put_name ( Task_name[ index ], FALSE );
-            printf   ( " Actual=%d, Expected=%d\n",
-                       Temporary_count.count[ index ],
-                       Iterations[ index ]
-                     );
-            failed += 1;
-          }
-        }
-
-        if ( failed == 5 )
-          exit( 0 );
-
-        pass += 1;
-
-        printf( "TA5 - PERIODS CHECK OK (%d)\n", pass );
-
-        fflush( stdout );
-
-        if ( pass == 10 ) {
-          puts( "*** END OF TEST 20 ***" );
-          exit( 0 );
-        }
-
-      }
-      break;
-  }
-}
diff --git a/testsuites/sptests/sp21/init.c b/testsuites/sptests/sp21/init.c
deleted file mode 100644
index acfa626b6c..0000000000
--- a/testsuites/sptests/sp21/init.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*  Init
- *
- *  This routine is the initialization task for this test program.
- *  It is a user initialization task and has the responsibility for creating
- *  and starting the tasks that make up the test.  If the time of day
- *  clock is required for the test, it should also be set to a known
- *  value by this function.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "system.h"
-
-rtems_task Init(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-
-  puts( "\n\n*** TEST 21 ***" );
-
-  Task_name[ 1 ] =  rtems_build_name( 'T', 'A', '1', ' ' );
-
-  status = rtems_task_create(
-    Task_name[ 1 ],
-    1,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Task_id[ 1 ]
-  );
-  directive_failed( status, "rtems_task_create of TA1" );
-
-  status = rtems_task_start( Task_id[ 1 ], Task_1, 0 );
-  directive_failed( status, "rtems_task_start of TA1" );
-
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-}
diff --git a/testsuites/sptests/sp21/sp21.doc b/testsuites/sptests/sp21/sp21.doc
deleted file mode 100644
index 6666e315f2..0000000000
--- a/testsuites/sptests/sp21/sp21.doc
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
-This file describes the directives and concepts tested by this test set.
-
-test set name:  test21
-
-directives:
-  ex_init, ex_start, t_create, t_start, tm_tick, i_return, t_delete
-  de_init, de_open, de_close, de_read, de_write, de_cntrl
-
-concepts:
-
-  a.  Verifies all I/O manager directives always return successful for
-      null drivers.
-
-  b.  Verifies all I/O manager directives call and return from the driver
-      entry points in the driver address table.
diff --git a/testsuites/sptests/sp21/sp21.scn b/testsuites/sptests/sp21/sp21.scn
deleted file mode 100644
index c6392e3ea3..0000000000
--- a/testsuites/sptests/sp21/sp21.scn
+++ /dev/null
@@ -1,19 +0,0 @@
-*** TEST 21 ***
------  TESTING THE NULL DRIVER CHECKS  -----
-TA1 - rtems_io_initialize  - NULL DRIVER RTEMS_SUCCESSFUL
-TA1 - rtems_io_open        - NULL DRIVER RTEMS_SUCCESSFUL
-TA1 - rtems_io_close       - NULL DRIVER RTEMS_SUCCESSFUL
-TA1 - rtems_io_read        - NULL DRIVER RTEMS_SUCCESSFUL
-TA1 - rtems_io_write       - NULL DRIVER RTEMS_SUCCESSFUL
-TA1 - rtems_io_control     - NULL DRIVER RTEMS_SUCCESSFUL
------  TESTING THE I/O MANAGER DIRECTIVES  -----
-TA1 - rtems_io_initialize  - STUB DRIVER RTEMS_SUCCESSFUL
-TA1 - rtems_io_open        - STUB DRIVER RTEMS_SUCCESSFUL
-TA1 - rtems_io_close       - STUB DRIVER RTEMS_SUCCESSFUL
-TA1 - rtems_io_read        - STUB DRIVER RTEMS_SUCCESSFUL
-TA1 - rtems_io_write       - STUB DRIVER RTEMS_SUCCESSFUL
-TA1 - rtems_io_control     - STUB DRIVER RTEMS_SUCCESSFUL
------  RETURNING INVALID MAJOR NUMBER -----
-TA1 - rtems_io_initialize  - RTEMS_INVALID_NUMBER
-TA1 - rtems_io_open        - RTEMS_INVALID_NUMBER
-*** END OF TEST 21 ***
diff --git a/testsuites/sptests/sp21/system.h b/testsuites/sptests/sp21/system.h
deleted file mode 100644
index 563ce8b63d..0000000000
--- a/testsuites/sptests/sp21/system.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*  system.h
- *
- *  This include file contains information that is included in every
- *  function in the test set.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <tmacros.h>
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
- 
-rtems_task Task_1(
-  rtems_task_argument argument
-);
-
-/* configuration information */
-
-#define CONFIGURE_SPTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-#define CONFIGURE_TEST_NEEDS_STUB_DRIVER
-
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#include <confdefs.h>
-
-/* global variables */
-
-TEST_EXTERN rtems_id   Task_id[ 4 ];         /* array of task ids */
-TEST_EXTERN rtems_name Task_name[ 4 ];       /* array of task names */
-
-/* end of include file */
diff --git a/testsuites/sptests/sp21/task1.c b/testsuites/sptests/sp21/task1.c
deleted file mode 100644
index b961b2e0d6..0000000000
--- a/testsuites/sptests/sp21/task1.c
+++ /dev/null
@@ -1,105 +0,0 @@
-/*  Task_1
- *
- *  This routine serves as a test task.  It tests the I/O manager.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-#define STUB_DRIVER_MAJOR     0x2
-#define NO_DRIVER_MAJOR       0x3
-#define INVALID_DRIVER_MAJOR  0x5
-
-rtems_task Task_1(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-
-  puts( "-----  TESTING THE NULL DRIVER CHECKS  -----" );
-
-  status = rtems_io_initialize( NO_DRIVER_MAJOR, 0, NULL );
-  directive_failed( status, "rtems_io_initialize" );
-  puts( "TA1 - rtems_io_initialize  - NULL DRIVER RTEMS_SUCCESSFUL" );
-
-  status = rtems_io_open( NO_DRIVER_MAJOR, 0, NULL );
-  directive_failed( status, "rtems_io_open" );
-  puts( "TA1 - rtems_io_open        - NULL DRIVER RTEMS_SUCCESSFUL" );
-
-  status = rtems_io_close( NO_DRIVER_MAJOR, 0, NULL );
-  directive_failed( status, "rtems_io_close" );
-  puts( "TA1 - rtems_io_close       - NULL DRIVER RTEMS_SUCCESSFUL" );
-
-  status = rtems_io_read( NO_DRIVER_MAJOR, 0, NULL );
-  directive_failed( status, "rtems_io_read" );
-  puts( "TA1 - rtems_io_read        - NULL DRIVER RTEMS_SUCCESSFUL" );
-
-  status = rtems_io_write( NO_DRIVER_MAJOR, 0, NULL );
-  directive_failed( status, "rtems_io_write" );
-  puts( "TA1 - rtems_io_write       - NULL DRIVER RTEMS_SUCCESSFUL" );
-
-  status = rtems_io_control( NO_DRIVER_MAJOR, 0, NULL );
-  directive_failed( status, "rtems_io_control" );
-  puts( "TA1 - rtems_io_control     - NULL DRIVER RTEMS_SUCCESSFUL" );
-
-  puts( "-----  TESTING THE I/O MANAGER DIRECTIVES  -----" );
-
-  status = rtems_io_initialize( STUB_DRIVER_MAJOR, 0, NULL );
-  directive_failed( status, "rtems_io_initialize" );
-  puts( "TA1 - rtems_io_initialize  - STUB DRIVER RTEMS_SUCCESSFUL" );
-
-  status = rtems_io_open( STUB_DRIVER_MAJOR, 0, NULL );
-  directive_failed( status, "rtems_io_open" );
-  puts( "TA1 - rtems_io_open        - STUB DRIVER RTEMS_SUCCESSFUL" );
-
-  status = rtems_io_close( STUB_DRIVER_MAJOR, 0, NULL );
-  directive_failed( status, "rtems_io_close" );
-  puts( "TA1 - rtems_io_close       - STUB DRIVER RTEMS_SUCCESSFUL" );
-
-  status = rtems_io_read( STUB_DRIVER_MAJOR, 0, NULL );
-  directive_failed( status, "rtems_io_read" );
-  puts( "TA1 - rtems_io_read        - STUB DRIVER RTEMS_SUCCESSFUL" );
-
-  status = rtems_io_write( STUB_DRIVER_MAJOR, 0, NULL );
-  directive_failed( status, "rtems_io_write" );
-  puts( "TA1 - rtems_io_write       - STUB DRIVER RTEMS_SUCCESSFUL" );
-
-  status = rtems_io_control( STUB_DRIVER_MAJOR, 0, NULL );
-  directive_failed( status, "rtems_io_control" );
-  puts( "TA1 - rtems_io_control     - STUB DRIVER RTEMS_SUCCESSFUL" );
-
-  puts( "-----  RETURNING INVALID MAJOR NUMBER -----" );
-
-  status = rtems_io_initialize( INVALID_DRIVER_MAJOR, 0, NULL );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_NUMBER,
-    "rtems_io_initialize"
-  );
-  puts( "TA1 - rtems_io_initialize  - RTEMS_INVALID_NUMBER" );
-
-  status = rtems_io_open( INVALID_DRIVER_MAJOR, 0, NULL );
-  fatal_directive_status(
-    status,
-    RTEMS_INVALID_NUMBER,
-    "rtems_io_open"
-  );
-  puts( "TA1 - rtems_io_open        - RTEMS_INVALID_NUMBER" );
-
-  puts( "*** END OF TEST 21 ***" );
-  exit( 0 );
-}
diff --git a/testsuites/sptests/sp22/delay.c b/testsuites/sptests/sp22/delay.c
deleted file mode 100644
index 17b8b8b412..0000000000
--- a/testsuites/sptests/sp22/delay.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/*  Delayed_resume
- *
- *  This routine is scheduled to be fired as a timer service routine.
- *  When fired this subprogram resumes Task_1.
- *
- *  Input parameters:  NONE
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_timer_service_routine Delayed_resume(
-  rtems_id  ignored_id,
-  void     *ignored_address
-)
-{
-  rtems_status_code status;
-
-  status = rtems_task_resume( Task_id[ 1 ] );
-  directive_failed( status, "rtems_task_resume of self" );
-}
diff --git a/testsuites/sptests/sp22/init.c b/testsuites/sptests/sp22/init.c
deleted file mode 100644
index 92dc031a25..0000000000
--- a/testsuites/sptests/sp22/init.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/*  Init
- *
- *  This routine is the initialization task for this test program.
- *  It is a user initialization task and has the responsibility for creating
- *  and starting the tasks that make up the test.  If the time of day
- *  clock is required for the test, it should also be set to a known
- *  value by this function.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "system.h"
-
-rtems_task Init(
-  rtems_task_argument argument
-)
-{
-  rtems_time_of_day  time;
-  rtems_status_code  status;
-
-  puts( "\n\n*** TEST 22 ***" );
-
-  build_time( &time, 12, 31, 1988, 9, 0, 0, 0 );
-
-  status = rtems_clock_set( &time );
-  directive_failed( status, "rtems_clock_set" );
-
-  Task_name[ 1 ]  = rtems_build_name( 'T', 'A', '1', ' ' );
-  Timer_name[ 1 ] = rtems_build_name( 'T', 'M', '1', ' ' );
-
-  status = rtems_task_create(
-    Task_name[ 1 ],
-    1,
-    RTEMS_MINIMUM_STACK_SIZE * 2,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Task_id[ 1 ]
-  );
-  directive_failed( status, "rtems_task_create of TA1" );
-
-  status = rtems_task_start( Task_id[ 1 ], Task_1, 0 );
-  directive_failed( status, "rtems_task_start of TA1" );
-
-  puts( "INIT - rtems_timer_create - creating timer 1" );
-  status = rtems_timer_create( Timer_name[ 1 ], &Timer_id[ 1 ] );
-  directive_failed( status, "rtems_timer_create" );
-
-  printf( "INIT - timer 1 has id (0x%x)\n", Timer_id[ 1 ] );
-
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-}
diff --git a/testsuites/sptests/sp22/prtime.c b/testsuites/sptests/sp22/prtime.c
deleted file mode 100644
index 9d36f1e0d8..0000000000
--- a/testsuites/sptests/sp22/prtime.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/*  Print_time
- *
- *  This routine prints the name of Task_1 and the current time of day.
- *
- *  Input parameters:  NONE
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-void Print_time( void )
-{
-  rtems_time_of_day time;
-  rtems_status_code status;
-
-  status = rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time );
-  directive_failed( status, "rtems_clock_get" );
-
-  put_name( Task_name[ 1 ], FALSE );
-  print_time( "- rtems_clock_get - ", &time, "\n" );
-}
diff --git a/testsuites/sptests/sp22/sp22.doc b/testsuites/sptests/sp22/sp22.doc
deleted file mode 100644
index 262f441342..0000000000
--- a/testsuites/sptests/sp22/sp22.doc
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
-This file describes the directives and concepts tested by this test set.
-
-test set name:  test22
-
-directives:
-
-concepts:
diff --git a/testsuites/sptests/sp22/sp22.scn b/testsuites/sptests/sp22/sp22.scn
deleted file mode 100644
index 6fb08156c5..0000000000
--- a/testsuites/sptests/sp22/sp22.scn
+++ /dev/null
@@ -1,29 +0,0 @@
-*** TEST 22 ***
-INIT - rtems_timer_create - creating timer 1
-INIT - timer 1 has id (0x10010001)
-TA1 - rtems_timer_ident - identing timer 1
-TA1 - timer 1 has id (0x10010001)
-TA1 - rtems_clock_get - 09:00:00   12/31/1988
-TA1 - rtems_timer_fire_after - timer 1 in 3 seconds
-TA1 - rtems_task_suspend( RTEMS_SELF )
-TA1 - rtems_clock_get - 09:00:03   12/31/1988
-TA1 - rtems_timer_fire_after - timer 1 in 3 seconds
-TA1 - rtems_task_wake_after - 1 second
-TA1 - rtems_clock_get - 09:00:04   12/31/1988
-TA1 - rtems_timer_reset - timer 1
-TA1 - rtems_task_suspend( RTEMS_SELF )
-TA1 - rtems_clock_get - 09:00:07   12/31/1988
-<pause>
-TA1 - rtems_timer_fire_after - timer 1 in 3 seconds
-TA1 - rtems_timer_cancel - timer 1
-TA1 - rtems_clock_get - 09:00:07   12/31/1988
-TA1 - rtems_timer_fire_when - timer 1 in 3 seconds
-TA1 - rtems_task_suspend( RTEMS_SELF )
-TA1 - rtems_clock_get - 09:00:10   12/31/1988
-TA1 - rtems_timer_fire_when - timer 1 in 3 seconds
-TA1 - rtems_task_wake_after - 1 second
-TA1 - rtems_clock_get - 09:00:11   12/31/1988
-TA1 - rtems_timer_cancel - timer 1
-TA1 - rtems_task_wake_after - YIELD (only task at priority)
-TA1 - timer_deleting - timer 1
-*** END OF TEST 22 ***
diff --git a/testsuites/sptests/sp22/system.h b/testsuites/sptests/sp22/system.h
deleted file mode 100644
index 8e23bd3e02..0000000000
--- a/testsuites/sptests/sp22/system.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*  system.h
- *
- *  This include file contains information that is included in every
- *  function in the test set.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <tmacros.h>
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
- 
-rtems_timer_service_routine Delayed_resume(
-  rtems_id  ignored_id,
-  void     *ignored_address
-);
- 
-void Print_time( void );
- 
-rtems_task Task_1(
-  rtems_task_argument argument
-);
-
-/* configuration information */
-
-#define CONFIGURE_SPTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_MAXIMUM_TIMERS          2
-#define CONFIGURE_INIT_TASK_STACK_SIZE    (RTEMS_MINIMUM_STACK_SIZE * 2)
-
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#define CONFIGURE_EXTRA_TASK_STACKS       (1 * RTEMS_MINIMUM_STACK_SIZE)
-
-#include <confdefs.h>
-
-/* global variables */
-
-TEST_EXTERN rtems_id   Task_id[ 4 ];         /* array of task ids */
-TEST_EXTERN rtems_name Task_name[ 4 ];       /* array of task names */
-
-TEST_EXTERN rtems_id   Timer_id[ 2 ];    /* array of timer ids */
-TEST_EXTERN rtems_name Timer_name[ 2 ];  /* array of timer names */
-
-/* end of include file */
diff --git a/testsuites/sptests/sp22/task1.c b/testsuites/sptests/sp22/task1.c
deleted file mode 100644
index 38c20ad956..0000000000
--- a/testsuites/sptests/sp22/task1.c
+++ /dev/null
@@ -1,164 +0,0 @@
-/*  Task_1
- *
- *  This routine serves as a test task.  It verifies the basic task
- *  switching capabilities of the executive.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_task Task_1(
-  rtems_task_argument argument
-)
-{
-  rtems_id          tmid;
-  rtems_time_of_day time;
-  rtems_status_code status;
-
-/* Get id */
-
-  puts( "TA1 - rtems_timer_ident - identing timer 1" );
-  status = rtems_timer_ident( Timer_name[ 1 ], &tmid );
-  directive_failed( status, "rtems_timer_ident" );
-  printf( "TA1 - timer 1 has id (0x%x)\n", tmid );
-
-/* after which is allowed to fire */
-
-  Print_time();
-
-  puts( "TA1 - rtems_timer_fire_after - timer 1 in 3 seconds" );
-  status = rtems_timer_fire_after(
-    tmid,
-    3 * TICKS_PER_SECOND,
-    Delayed_resume,
-    NULL
-  );
-  directive_failed( status, "rtems_timer_fire_after" );
-
-  puts( "TA1 - rtems_task_suspend( RTEMS_SELF )" );
-  status = rtems_task_suspend( RTEMS_SELF );
-  directive_failed( status, "rtems_task_suspend" );
-
-  Print_time();
-
-/* after which is reset and allowed to fire */
-
-  puts( "TA1 - rtems_timer_fire_after - timer 1 in 3 seconds" );
-  status = rtems_timer_fire_after(
-    tmid,
-    3 * TICKS_PER_SECOND,
-    Delayed_resume,
-    NULL
-  );
-  directive_failed( status, "rtems_timer_fire_after" );
-
-  puts( "TA1 - rtems_task_wake_after - 1 second" );
-  status = rtems_task_wake_after( 1 * TICKS_PER_SECOND );
-  directive_failed( status, "rtems_task_wake_after" );
-
-  Print_time();
-
-  puts( "TA1 - rtems_timer_reset - timer 1" );
-  status = rtems_timer_reset( tmid );
-  directive_failed( status, "rtems_timer_reset" );
-
-  puts( "TA1 - rtems_task_suspend( RTEMS_SELF )" );
-  status = rtems_task_suspend( RTEMS_SELF );
-  directive_failed( status, "rtems_task_suspend" );
-
-  Print_time();
-
-  rtems_test_pause();
-
-  /*
-   *  Reset the time since we do not know how long the user waited
-   *  before pressing <cr> at the pause.  This insures that the 
-   *  actual output matches the screen.
-   */
-
-  build_time( &time, 12, 31, 1988, 9, 0, 7, 0 );
-
-  status = rtems_clock_set( &time );
-  directive_failed( status, "rtems_clock_set" );
-
-/* after which is canceled */
-
-  puts( "TA1 - rtems_timer_fire_after - timer 1 in 3 seconds" );
-  status = rtems_timer_fire_after(
-    tmid,
-    3 * TICKS_PER_SECOND,
-    Delayed_resume,
-    NULL
-  );
-  directive_failed( status, "rtems_timer_fire_after" );
-
-  puts( "TA1 - rtems_timer_cancel - timer 1" );
-  status = rtems_timer_cancel( tmid );
-  directive_failed( status, "rtems_timer_cancel" );
-
-/* when which is allowed to fire */
-
-  Print_time();
-
-  status = rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time );
-  directive_failed( status, "rtems_clock_get" );
-
-  time.second += 3;
-
-  puts( "TA1 - rtems_timer_fire_when - timer 1 in 3 seconds" );
-  status = rtems_timer_fire_when( tmid, &time, Delayed_resume, NULL );
-  directive_failed( status, "rtems_timer_fire_when" );
-
-  puts( "TA1 - rtems_task_suspend( RTEMS_SELF )" );
-  status = rtems_task_suspend( RTEMS_SELF );
-  directive_failed( status, "rtems_task_suspend" );
-
-  Print_time();
-
-/* when which is canceled */
-
-  status = rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time );
-  directive_failed( status, "rtems_clock_get" );
-
-  time.second += 3;
-
-  puts( "TA1 - rtems_timer_fire_when - timer 1 in 3 seconds" );
-  status = rtems_timer_fire_when( tmid, &time, Delayed_resume, NULL );
-  directive_failed( status, "rtems_timer_fire_when" );
-
-  puts( "TA1 - rtems_task_wake_after - 1 second" );
-  status = rtems_task_wake_after( 1 * TICKS_PER_SECOND );
-  directive_failed( status, "rtems_task_wake_after" );
-
-  Print_time();
-
-  puts( "TA1 - rtems_timer_cancel - timer 1" );
-  status = rtems_timer_cancel( tmid );
-  directive_failed( status, "rtems_timer_cancel" );
-
-/* delete */
-  puts( "TA1 - rtems_task_wake_after - YIELD (only task at priority)" );
-  status = rtems_task_wake_after( RTEMS_YIELD_PROCESSOR );
-  directive_failed( status, "rtems_task_wake_after" );
-
-  puts( "TA1 - timer_deleting - timer 1" );
-  status = rtems_timer_delete( tmid );
-  directive_failed( status, "rtems_timer_delete" );
-
-  puts( "*** END OF TEST 22 *** " );
-  exit( 0 );
-}
diff --git a/testsuites/sptests/sp23/init.c b/testsuites/sptests/sp23/init.c
deleted file mode 100644
index c91f107a4e..0000000000
--- a/testsuites/sptests/sp23/init.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/*  Init
- *
- *  This routine is the initialization task for this test program.
- *  It is a user initialization task and has the responsibility for creating
- *  and starting the tasks that make up the test.  If the time of day
- *  clock is required for the test, it should also be set to a known
- *  value by this function.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "system.h"
-
-rtems_task Init(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-
-  puts( "\n\n*** TEST 23 ***" );
-
-  Task_name[ 1 ] =  rtems_build_name( 'T', 'A', '1', ' ' );
-
-  status = rtems_task_create(
-    Task_name[ 1 ],
-    1,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Task_id[ 1 ]
-  );
-  directive_failed( status, "rtems_task_create of TA1" );
-
-  status = rtems_task_start( Task_id[ 1 ], Task_1, 0 );
-  directive_failed( status, "rtems_task_start of TA1" );
-
-  Port_name[ 1 ] = rtems_build_name( 'D', 'P', '1', ' ' );
-
-  status = rtems_port_create(
-    Port_name[ 1 ],
-    Internal_port_area,
-    External_port_area,
-    0xff,
-    &Port_id[ 1 ]
-  );
-  directive_failed( status, "rtems_port_create of DP1" );
-
-  printf( "INIT - rtems_port_create - DP1 - int = %p   ext = %p\n",
-          Internal_port_area,
-          External_port_area
-  );
-
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-}
diff --git a/testsuites/sptests/sp23/sp23.doc b/testsuites/sptests/sp23/sp23.doc
deleted file mode 100644
index 2ea35a714a..0000000000
--- a/testsuites/sptests/sp23/sp23.doc
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
-This file describes the directives and concepts tested by this test set.
-
-test set name:  test23
-
-directives:
-  ex_init, ex_start, t_create, t_start, tm_tick, i_return, t_delete,
-  m_ext2int, m_int2ext
-
-concepts:
-
-  a.  Verifies the dual ported RAM directives work correctly.
-
-output:
diff --git a/testsuites/sptests/sp23/sp23.scn b/testsuites/sptests/sp23/sp23.scn
deleted file mode 100644
index 7d9f8ff898..0000000000
--- a/testsuites/sptests/sp23/sp23.scn
+++ /dev/null
@@ -1,9 +0,0 @@
-*** TEST 23 ***
-INIT - rtems_port_create - DP1 - int = 0x1000   ext = 0x2000
-TA1 - rtems_port_ident - 0x24010001
-TA1 - rtems_port_external_to_internal - 0x200e  =>  0x100e
-TA1 - rtems_port_internal_to_external - 0x100e  =>  0x200e
-TA1 - rtems_port_external_to_internal - 0x300e  =>  0x300e
-TA1 - rtems_port_internal_to_external - 0x50e  =>  0x50e
-TA1 - rtems_port_delete - DP1
-*** END OF TEST 23 ***
diff --git a/testsuites/sptests/sp23/system.h b/testsuites/sptests/sp23/system.h
deleted file mode 100644
index e88f367859..0000000000
--- a/testsuites/sptests/sp23/system.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*  system.h
- *
- *  This include file contains information that is included in every
- *  function in the test set.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <tmacros.h>
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
-
-rtems_task Task_1(
-  rtems_task_argument argument
-);
-
-/* configuration information */
-
-#define CONFIGURE_SPTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_MAXIMUM_PORTS               1
-#define CONFIGURE_INIT_TASK_STACK_SIZE    (RTEMS_MINIMUM_STACK_SIZE * 2)
-
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#define CONFIGURE_EXTRA_TASK_STACKS       (1 * RTEMS_MINIMUM_STACK_SIZE)
-
-#include <confdefs.h>
-
-/* global variables */
-
-TEST_EXTERN rtems_id   Task_id[ 2 ];     /* array of task ids */
-TEST_EXTERN rtems_name Task_name[ 2 ];   /* array of task names */
- 
-TEST_EXTERN rtems_id   Port_id[ 2 ];     /* array of port ids */
-TEST_EXTERN rtems_name Port_name[ 2 ];   /* array of port names */
- 
-#define Internal_port_area ((rtems_unsigned8 *) 0x00001000)
-#define External_port_area ((rtems_unsigned8 *) 0x00002000)
- 
-#define Below_port_area    ((rtems_unsigned8 *) 0x00000500)
-#define Above_port_area    ((rtems_unsigned8 *) 0x00003000)
-
-/* end of include file */
diff --git a/testsuites/sptests/sp23/task1.c b/testsuites/sptests/sp23/task1.c
deleted file mode 100644
index 886f7c8d04..0000000000
--- a/testsuites/sptests/sp23/task1.c
+++ /dev/null
@@ -1,96 +0,0 @@
-/*  Task_1
- *
- *  This task verifies that the dual ported RAM directives work
- *  correctly by converting external addresses to internal addresses and
- *  internal addresses to external addresses.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_task Task_1(
-  rtems_task_argument argument
-)
-{
-  rtems_id           dpid;
-  void              *to_be_converted;
-  void              *converted;
-  rtems_status_code  status;
-
-  status = rtems_port_ident( Port_name[ 1 ], &dpid );
-  directive_failed( status, "rtems_port_ident" );
-  printf( "TA1 - rtems_port_ident - 0x%08x\n", dpid );
-
-  to_be_converted = &External_port_area[ 0xe ];
-  status = rtems_port_external_to_internal(
-    Port_id[ 1 ],
-    to_be_converted,
-    &converted
-  );
-  directive_failed( status, "rtems_port_external_to_internal" );
-  printf(
-    "TA1 - rtems_port_external_to_internal - %p => %p\n",
-    to_be_converted,
-    converted
-  );
-
-  to_be_converted = &Internal_port_area[ 0xe ];
-  status = rtems_port_internal_to_external(
-    Port_id[ 1 ],
-    to_be_converted,
-    &converted
-  );
-  directive_failed( status, "rtems_port_internal_to_external" );
-  printf(
-    "TA1 - rtems_port_internal_to_external - %p => %p\n",
-    to_be_converted,
-    converted
-  );
-
-  to_be_converted = &Above_port_area[ 0xe ];
-  status = rtems_port_external_to_internal(
-    Port_id[ 1 ],
-    to_be_converted,
-    &converted
-  );
-  directive_failed( status, "rtems_port_external_to_internal" );
-  printf(
-    "TA1 - rtems_port_external_to_internal - %p => %p\n",
-    to_be_converted,
-    converted
-  );
-
-  to_be_converted = &Below_port_area[ 0xe ];
-  status = rtems_port_internal_to_external(
-    Port_id[ 1 ],
-    to_be_converted,
-    &converted
-  );
-  directive_failed( status, "rtems_port_internal_to_external" );
-  printf(
-    "TA1 - rtems_port_internal_to_external - %p => %p\n",
-    to_be_converted,
-    converted
-  );
-
-  status = rtems_port_delete( Port_id[ 1 ] );
-  directive_failed( status, "rtems_port_delete" );
-  puts( "TA1 - rtems_port_delete - DP1" );
-
-  puts( "*** END OF TEST 23 ***" );
-  exit( 0 );
-}
diff --git a/testsuites/sptests/sp24/init.c b/testsuites/sptests/sp24/init.c
deleted file mode 100644
index 8cb39f3d34..0000000000
--- a/testsuites/sptests/sp24/init.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/*  Init
- *
- *  This routine is the initialization task for this test program.
- *  It is a user initialization task and has the responsibility for creating
- *  and starting the tasks that make up the test.  If the time of day
- *  clock is required for the test, it should also be set to a known
- *  value by this function.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "system.h"
-
-rtems_task Init(
-  rtems_task_argument argument
-)
-{
-  rtems_time_of_day time;
-  rtems_unsigned32  index;
-  rtems_status_code status;
-
-  puts( "\n\n*** TEST 24 ***" );
-
-  build_time( &time, 12, 31, 1988, 9, 0, 0, 0 );
-
-  status = rtems_clock_set( &time );
-  directive_failed( status, "rtems_clock_set" );
-
-  Task_name[ 1 ] =  rtems_build_name( 'T', 'A', '1', ' ' );
-  Task_name[ 2 ] =  rtems_build_name( 'T', 'A', '2', ' ' );
-  Task_name[ 3 ] =  rtems_build_name( 'T', 'A', '3', ' ' );
-
-  Timer_name[ 1 ] =  rtems_build_name( 'T', 'M', '1', ' ' );
-  Timer_name[ 2 ] =  rtems_build_name( 'T', 'M', '2', ' ' );
-  Timer_name[ 3 ] =  rtems_build_name( 'T', 'M', '3', ' ' );
-
-  for ( index = 1 ; index <= 3 ; index++ ) {
-    status = rtems_task_create(
-      Task_name[ index ],
-      1,
-      RTEMS_MINIMUM_STACK_SIZE * 2,
-      RTEMS_DEFAULT_MODES,
-      RTEMS_DEFAULT_ATTRIBUTES,
-      &Task_id[ index ]
-    );
-    directive_failed( status, "rtems_task_create loop" );
-
-    status = rtems_timer_create(
-      Timer_name[ index ],
-      &Timer_id[ index ]
-    );
-    directive_failed( status, "rtems_timer_create loop" );
-  }
-
-  for ( index = 1 ; index <= 3 ; index++ ) {
-    status = rtems_task_start( Task_id[ index ], Task_1_through_3, index );
-    directive_failed( status, "rtems_task_start loop" );
-  }
-
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-}
diff --git a/testsuites/sptests/sp24/resume.c b/testsuites/sptests/sp24/resume.c
deleted file mode 100644
index 81e37c361f..0000000000
--- a/testsuites/sptests/sp24/resume.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/*  Resume_task
- *
- *  This subprogram is scheduled as a timer service routine.  When
- *  it fires it resumes the task which is mapped to this timer.
- *
- *  Input parameters:  NONE
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_timer_service_routine Resume_task(
-  rtems_id  timer_id,
-  void     *ignored_address
-)
-{
-  rtems_id          task_to_resume;
-  rtems_status_code status;
-
-  task_to_resume = Task_id[ rtems_get_index( timer_id ) ];
-  status = rtems_task_resume( task_to_resume );
-  directive_failed( status, "rtems_task_resume" );
-}
diff --git a/testsuites/sptests/sp24/sp24.doc b/testsuites/sptests/sp24/sp24.doc
deleted file mode 100644
index aecae8b27a..0000000000
--- a/testsuites/sptests/sp24/sp24.doc
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
-This file describes the directives and concepts tested by this test set.
-
-test set name:  test24
-
-directives:
-  ex_init, ex_start, t_create, t_start, tm_tick, i_return, t_ident,
-  ev_receive
-
-concepts:
-
-  a.  This test is a cyclic version of test1.  The times printed by
-      each test should not skew as in test1 (see output section).
-
-  b.  Verifies system can create and start both the executive's system
-      initialization and idle task.
-
-  c.  Verifies executive can swap between three application tasks at the
-      same priority and the executive's internal idle task.
-
-  d.  Verifies can print strings to the CRT on port 2 of the mvme136 board
-      using Print and Println in the board support package.
-
-  e.  Verifies interrupt handler can handler a task switch from an interrupt
-      as specified with the i_return directive.
-
-  f.  Verifies executive initialization performed correctly.
-
-  g.  Verifies the executive trap handler except for the halt function.
-
-  h.  Verifies that a task can get the task identification number of itself.
-
-output:
-  "TA1" is printed once every 5 seconds.  "TA2" is printed once
-  every 10 seconds.  "TA3" is printed once every 15 seconds.
-
-  The times printed should be multiples of 5 seconds for TA1, 10 seconds
-  for TA2, and 15 seconds for TA3.  If this does not happen, the calendar
-  time does not correspond correctly to the number of ticks.
diff --git a/testsuites/sptests/sp24/sp24.scn b/testsuites/sptests/sp24/sp24.scn
deleted file mode 100644
index 96a58f35e3..0000000000
--- a/testsuites/sptests/sp24/sp24.scn
+++ /dev/null
@@ -1,16 +0,0 @@
-*** TEST 24 ***
-TA1  - rtems_clock_get - 09:00:00   12/31/1988
-TA2  - rtems_clock_get - 09:00:00   12/31/1988
-TA3  - rtems_clock_get - 09:00:00   12/31/1988
-TA1  - rtems_clock_get - 09:00:05   12/31/1988
-TA2  - rtems_clock_get - 09:00:10   12/31/1988
-TA1  - rtems_clock_get - 09:00:10   12/31/1988
-TA3  - rtems_clock_get - 09:00:15   12/31/1988
-TA1  - rtems_clock_get - 09:00:15   12/31/1988
-TA2  - rtems_clock_get - 09:00:20   12/31/1988
-TA1  - rtems_clock_get - 09:00:20   12/31/1988
-TA1  - rtems_clock_get - 09:00:25   12/31/1988
-TA3  - rtems_clock_get - 09:00:30   12/31/1988
-TA2  - rtems_clock_get - 09:00:30   12/31/1988
-TA1  - rtems_clock_get - 09:00:30   12/31/1988
-*** END OF TEST 24 ***
diff --git a/testsuites/sptests/sp24/system.h b/testsuites/sptests/sp24/system.h
deleted file mode 100644
index c3775f4ee3..0000000000
--- a/testsuites/sptests/sp24/system.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*  system.h
- *
- *  This include file contains information that is included in every
- *  function in the test set.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <tmacros.h>
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
- 
-rtems_timer_service_routine Resume_task(
-  rtems_id  timer_id,
-  void     *ignored_address
-);
- 
-rtems_task Task_1_through_3(
-  rtems_task_argument argument
-);
-
-/* configuration information */
-
-#define CONFIGURE_SPTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_MAXIMUM_TIMERS              3
-
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#define CONFIGURE_EXTRA_TASK_STACKS           (3 * RTEMS_MINIMUM_STACK_SIZE)
-
-#include <confdefs.h>
-
-/* global variables */
-
-TEST_EXTERN rtems_id   Task_id[ 4 ];         /* array of task ids */
-TEST_EXTERN rtems_name Task_name[ 4 ];       /* array of task names */
-
-TEST_EXTERN rtems_id   Timer_id[ 4 ];     /* array of timer ids */
-TEST_EXTERN rtems_name Timer_name[ 4 ];   /* array of timer names */
-
-/* end of include file */
diff --git a/testsuites/sptests/sp24/task1.c b/testsuites/sptests/sp24/task1.c
deleted file mode 100644
index 464286ae1f..0000000000
--- a/testsuites/sptests/sp24/task1.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*  Task_1_through_3
- *
- *  This task is a cyclic version of test1 to asssure that the times
- *  displayed are not skewed as in test1.  "TA1" is printed once every
- *  5 seconds, "TA2" is printed once every 10 seconds, and "TA3" is
- *  printed once every 15 seconds.  The times displayed should be
- *  in multiples of 5, 10, and 15 for TA1, TA2, and TA3 respectively.
- *  If the times are skewed from these values, then the calendar time
- *  does not correspond correctly with the number of ticks.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_task Task_1_through_3(
-  rtems_task_argument argument
-)
-{
-  rtems_id          tid;
-  rtems_time_of_day time;
-  rtems_status_code status;
-
-  status = rtems_task_ident( RTEMS_SELF, RTEMS_SEARCH_ALL_NODES, &tid );
-  directive_failed( status, "rtems_task_ident of self" );
-
-  while ( FOREVER )  {
-    status = rtems_timer_fire_after(
-      Timer_id[ argument ],
-      task_number( tid ) * 5 * TICKS_PER_SECOND,
-      Resume_task,
-      NULL
-    );
-    directive_failed( status, "tm_fire_after failed" );
-
-    status = rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time );
-    directive_failed( status, "rtems_clock_get failed" );
-
-    if ( time.second >= 35 ) {
-      puts( "*** END OF TEST 24 ***" );
-      exit( 0 );
-    }
-
-    put_name( Task_name[ task_number( tid ) ], FALSE );
-    print_time( " - rtems_clock_get - ", &time, "\n" );
-
-    status = rtems_task_suspend( RTEMS_SELF );
-    directive_failed( status, "rtems_task_suspend" );
-  }
-}
diff --git a/testsuites/sptests/sp25/init.c b/testsuites/sptests/sp25/init.c
deleted file mode 100644
index 6fb95bbb8f..0000000000
--- a/testsuites/sptests/sp25/init.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/*  Init
- *
- *  This routine is the initialization task for this test program.
- *  It is a user initialization task and has the responsibility for creating
- *  and starting the tasks that make up the test.  If the time of day
- *  clock is required for the test, it should also be set to a known
- *  value by this function.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "system.h"
-
-rtems_task Init(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-
-  puts( "\n\n*** TEST 25 ***" );
-
-  Task_name[ 1 ] =  rtems_build_name( 'T', 'A', '1', ' ' );
-
-  status = rtems_task_create(
-    Task_name[ 1 ],
-    BASE_PRIORITY,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Task_id[ 1 ]
-  );
-  directive_failed( status, "rtems_task_create of TA1" );
-
-  status = rtems_task_start( Task_id[ 1 ], Task_1, 0 );
-  directive_failed( status, "rtems_task_start of TA1" );
-
-  Region_name[ 1 ] = rtems_build_name('R', 'N', '0', '1');
-
-
-  status = rtems_region_create(
-    Region_name[ 1 ],
-    Area_1,
-    sizeof( Area_1 ),
-    64,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Region_id[ 1 ]
-  );
-  directive_failed( status, "rtems_region_create of RN1" );
-
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-}
diff --git a/testsuites/sptests/sp25/sp25.doc b/testsuites/sptests/sp25/sp25.doc
deleted file mode 100644
index 9a0417dfea..0000000000
--- a/testsuites/sptests/sp25/sp25.doc
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
-This file describes the directives and concepts tested by this test set.
-
-test set name:  test25
-
-directives:
-     task_create
-     task_start
-     task_delete
-     region_create
-     region_ident
-     region_get_segment
-     region_return_segment
-     region_delete
-
-concepts:
-
-  a.  Verifies that the heap maintains it's integrity trhough a series
-      on region_get_segments and region_return_segments.
-
diff --git a/testsuites/sptests/sp25/sp25.scn b/testsuites/sptests/sp25/sp25.scn
deleted file mode 100644
index af2599663d..0000000000
--- a/testsuites/sptests/sp25/sp25.scn
+++ /dev/null
@@ -1,29 +0,0 @@
-*** TEST 25 ***
-TA1 - rtems_region_ident - 0x20010002
-TA1 - rtems_region_get_segment - wait on 64 byte segment from region 1
-TA1 - got segment from region 1 - 0x0000f9b8
-TA1 - rtems_region_get_segment - wait on 128 byte segment from region 1
-TA1 - got segment from region 1 - 0x0000f930
-TA1 - rtems_region_get_segment - wait on 256 byte segment from region 1
-TA1 - got segment from region 1 - 0x0000f828
-TA1 - rtems_region_get_segment - wait on 512 byte segment from region 1
-TA1 - got segment from region 1 - 0x0000f620
-TA1 - rtems_region_get_segment - wait on 1024 byte segment from region 1
-TA1 - got segment from region 1 - 0x0000f218
-TA1 - rtems_region_get_segment - wait on 2048 byte segment from region 1
-TA1 - got segment from region 1 - 0x0000ea10
-TA1 - rtems_region_get_segment - wait on 4096 byte segment from region 1
-TA1 - got segment from region 1 - 0x0000da08
-TA1 - rtems_region_get_segment - wait on 8192 byte segment from region 1
-TA1 - got segment from region 1 - 0x0000ba00
-<pause>
-TA1 - rtems_region_return_segment - return segment to region 1 - 0x0000f828
-TA1 - rtems_region_return_segment - return segment to region 1 - 0x0000f620
-TA1 - rtems_region_return_segment - return segment to region 1 - 0x0000f9b8
-TA1 - rtems_region_return_segment - return segment to region 1 - 0x0000f930
-TA1 - rtems_region_return_segment - return segment to region 1 - 0x0000da08
-TA1 - rtems_region_return_segment - return segment to region 1 - 0x0000ea10
-TA1 - rtems_region_return_segment - return segment to region 1 - 0x0000ba00
-TA1 - rtems_region_return_segment - return segment to region 1 - 0x0000f218
-TA1 - rtems_region_delete - walks heap if debug enabled
-*** END OF TEST 25 ***
diff --git a/testsuites/sptests/sp25/system.h b/testsuites/sptests/sp25/system.h
deleted file mode 100644
index 3435288228..0000000000
--- a/testsuites/sptests/sp25/system.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*  system.h
- *
- *  This include file contains information that is included in every
- *  function in the test set.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <tmacros.h>
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
-
-rtems_task Task_1(
-  rtems_task_argument argument
-);
-
-/* configuration information */
-
-#define CONFIGURE_SPTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_MAXIMUM_REGIONS             1
-
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#include <confdefs.h>
-
-/* global variables */
-
-TEST_EXTERN rtems_id   Task_id[ 6 ];      /* array of task ids */
-TEST_EXTERN rtems_name Task_name[ 6 ];    /* array of task names */
-TEST_EXTERN rtems_id   Region_id[ 2 ];    /* array of region ids */
-TEST_EXTERN rtems_name Region_name[ 2 ];  /* array of region names */
- 
-TEST_EXTERN rtems_unsigned8 Area_1[64000]  CPU_STRUCTURE_ALIGNMENT;
- 
-#define BASE_PRIORITY 140
- 
-#define Put_address_from_area_1( _to_be_printed ) \
-   printf( "0x%08lx", \
-     (unsigned long) ((rtems_unsigned8 *)(_to_be_printed) - Area_1 ) )
- 
-/* end of include file */
diff --git a/testsuites/sptests/sp25/task1.c b/testsuites/sptests/sp25/task1.c
deleted file mode 100644
index 45bf5780f4..0000000000
--- a/testsuites/sptests/sp25/task1.c
+++ /dev/null
@@ -1,241 +0,0 @@
-/*  Task_1
- *
- *  This routine serves as a test task.  It tests the region manager.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_task Task_1(
-  rtems_task_argument argument
-)
-{
-  void              *address_1;
-  void              *address_2;
-  void              *address_3;
-  void              *address_4;
-  void              *address_5;
-  void              *address_6;
-  void              *address_7;
-  void              *address_8;
-  rtems_status_code  status;
-  rtems_id           region_id;
-
-  status = rtems_region_ident(Region_name[ 1 ], &region_id);
-  printf( "TA1 - rtems_region_ident - 0x%08x\n", region_id );
-  directive_failed(status, "rtems_region_ident of RN01");
-
-  puts(
-    "TA1 - rtems_region_get_segment - wait on 64 byte segment from region 1"
-  );
-  rtems_region_get_segment(
-    Region_id[ 1 ],
-    64,
-    RTEMS_DEFAULT_OPTIONS,
-    RTEMS_NO_TIMEOUT,
-    &address_1
-  );
-  directive_failed( status, "rtems_region_get_segment" );
-  puts_nocr( "TA1 - got segment from region 1 - " );
-  Put_address_from_area_1( address_1 );
-  new_line;
-
-  puts(
-    "TA1 - rtems_region_get_segment - wait on 128 byte segment from region 1"
-  );
-  rtems_region_get_segment(
-    Region_id[ 1 ],
-    128,
-    RTEMS_DEFAULT_OPTIONS,
-    RTEMS_NO_TIMEOUT,
-    &address_2
-  );
-  directive_failed( status, "rtems_region_get_segment" );
-  puts_nocr( "TA1 - got segment from region 1 - " );
-  Put_address_from_area_1( address_2 );
-  new_line;
-
-  puts(
-    "TA1 - rtems_region_get_segment - wait on 256 byte segment from region 1"
-  );
-  rtems_region_get_segment(
-    Region_id[ 1 ],
-    256,
-    RTEMS_DEFAULT_OPTIONS,
-    RTEMS_NO_TIMEOUT,
-    &address_3
-  );
-  directive_failed( status, "rtems_region_get_segment" );
-  puts_nocr( "TA1 - got segment from region 1 - " );
-  Put_address_from_area_1( address_3 );
-  new_line;
-
-  puts(
-    "TA1 - rtems_region_get_segment - wait on 512 byte segment from region 1"
-  );
-  rtems_region_get_segment(
-    Region_id[ 1 ],
-    512,
-    RTEMS_DEFAULT_OPTIONS,
-    RTEMS_NO_TIMEOUT,
-    &address_4
-  );
-  directive_failed( status, "rtems_region_get_segment" );
-  puts_nocr( "TA1 - got segment from region 1 - " );
-  Put_address_from_area_1( address_4 );
-  new_line;
-
-  puts(
-    "TA1 - rtems_region_get_segment - wait on 1024 byte segment from region 1"
-  );
-  rtems_region_get_segment(
-    Region_id[ 1 ],
-    1024,
-    RTEMS_DEFAULT_OPTIONS,
-    RTEMS_NO_TIMEOUT,
-    &address_5
-  );
-  directive_failed( status, "rtems_region_get_segment" );
-  puts_nocr( "TA1 - got segment from region 1 - " );
-  Put_address_from_area_1( address_5 );
-  new_line;
-
-  puts(
-    "TA1 - rtems_region_get_segment - wait on 2048 byte segment from region 1"
-  );
-  rtems_region_get_segment(
-    Region_id[ 1 ],
-    2048,
-    RTEMS_DEFAULT_OPTIONS,
-    RTEMS_NO_TIMEOUT,
-    &address_6
-  );
-  directive_failed( status, "rtems_region_get_segment" );
-  puts_nocr( "TA1 - got segment from region 1 - " );
-  Put_address_from_area_1( address_6 );
-  new_line;
-
-  puts(
-    "TA1 - rtems_region_get_segment - wait on 4096 byte segment from region 1"
-  );
-  rtems_region_get_segment(
-    Region_id[ 1 ],
-    4096,
-    RTEMS_DEFAULT_OPTIONS,
-    RTEMS_NO_TIMEOUT,
-    &address_7
-  );
-  directive_failed( status, "rtems_region_get_segment" );
-  puts_nocr( "TA1 - got segment from region 1 - " );
-  Put_address_from_area_1( address_7 );
-  new_line;
-
-  puts(
-    "TA1 - rtems_region_get_segment - wait on 8192 byte segment from region 1"
-  );
-  rtems_region_get_segment(
-    Region_id[ 1 ],
-    8192,
-    RTEMS_DEFAULT_OPTIONS,
-    RTEMS_NO_TIMEOUT,
-    &address_8
-  );
-  directive_failed( status, "rtems_region_get_segment" );
-  puts_nocr( "TA1 - got segment from region 1 - " );
-  Put_address_from_area_1( address_8 );
-  new_line;
-
-rtems_test_pause();
-
-  puts_nocr(
-    "TA1 - rtems_region_return_segment - return segment to region 1 - "
-  );
-  Put_address_from_area_1( address_3 );
-  status = rtems_region_return_segment( Region_id[ 1 ], address_3 );
-  directive_failed( status, "rtems_region_return_segment" );
-  new_line;
-  address_3 = 0;
-
-  puts_nocr(
-    "TA1 - rtems_region_return_segment - return segment to region 1 - "
-  );
-  Put_address_from_area_1( address_4 );
-  status = rtems_region_return_segment( Region_id[ 1 ], address_4 );
-  directive_failed( status, "rtems_region_return_segment" );
-  new_line;
-  address_4 = 0;
-
-  puts_nocr(
-    "TA1 - rtems_region_return_segment - return segment to region 1 - "
-  );
-  Put_address_from_area_1( address_1 );
-  status = rtems_region_return_segment( Region_id[ 1 ], address_1 );
-  directive_failed( status, "rtems_region_return_segment" );
-  new_line;
-  address_1 = 0;
-
-  puts_nocr(
-    "TA1 - rtems_region_return_segment - return segment to region 1 - "
-  );
-  Put_address_from_area_1( address_2 );
-  status = rtems_region_return_segment( Region_id[ 1 ], address_2 );
-  directive_failed( status, "rtems_region_return_segment" );
-  new_line;
-  address_2 = 0;
-
-  puts_nocr(
-    "TA1 - rtems_region_return_segment - return segment to region 1 - "
-  );
-  Put_address_from_area_1( address_7 );
-  status = rtems_region_return_segment( Region_id[ 1 ], address_7 );
-  directive_failed( status, "rtems_region_return_segment" );
-  new_line;
-  address_7 = 0;
-
-  puts_nocr(
-    "TA1 - rtems_region_return_segment - return segment to region 1 - "
-  );
-  Put_address_from_area_1( address_6 );
-  status = rtems_region_return_segment( Region_id[ 1 ], address_6 );
-  directive_failed( status, "rtems_region_return_segment" );
-  new_line;
-  address_6 = 0;
-
-  puts_nocr(
-    "TA1 - rtems_region_return_segment - return segment to region 1 - "
-  );
-  Put_address_from_area_1( address_8 );
-  status = rtems_region_return_segment( Region_id[ 1 ], address_8 );
-  directive_failed( status, "rtems_region_return_segment" );
-  new_line;
-  address_8 = 0;
-
-  puts_nocr(
-    "TA1 - rtems_region_return_segment - return segment to region 1 - "
-  );
-  Put_address_from_area_1( address_5 );
-  status = rtems_region_return_segment( Region_id[ 1 ], address_5 );
-  directive_failed( status, "rtems_region_return_segment" );
-  new_line;
-  address_5 = 0;
-
-  puts( "TA1 - rtems_region_delete - walks heap if debug enabled" );
-  rtems_region_delete(Region_id[ 1 ]);
-
-  puts( "*** END OF TEST 25 ***" );
-  exit( 0 );
-}
diff --git a/testsuites/sptests/spfatal/fatal.c b/testsuites/sptests/spfatal/fatal.c
deleted file mode 100644
index aef4a159de..0000000000
--- a/testsuites/sptests/spfatal/fatal.c
+++ /dev/null
@@ -1,136 +0,0 @@
-/*  Fatal Error Test
- *
- *  NOTE:
- *
- *  This test actually modifies the Configuration table and restarts
- *  the executive.  It is very carefully constructed to do this and
- *  uses the Configuration very carefully.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-#include <setjmp.h>
-
-char Workspace[ 64 * 1024 ] CPU_STRUCTURE_ALIGNMENT;
-
-typedef enum {
-  FATAL_WORKSPACE_OF_ZERO,
-  FATAL_NULL_WORKSPACE,
-  FATAL_WORKSPACE_TOO_SMALL,
-  FATAL_TASK_CREATE,
-  FATAL_TASK_START
-}  Fatal_errors_t;
-
-#define FATAL_LAST FATAL_TASK_START
-
-volatile Fatal_errors_t Case_in_switch;
-
-rtems_status_code Expected_Errors[] = {
-  RTEMS_UNSATISFIED,
-  RTEMS_INVALID_ADDRESS,
-  RTEMS_UNSATISFIED,
-  RTEMS_INVALID_PRIORITY,
-  RTEMS_TASK_EXITTED
-};
-
-rtems_status_code Error_Happened[ FATAL_LAST + 1];
-
-jmp_buf Restart_Context;
-
-/*
- *  We depend on this being zeroed during initialization.  This
- *  occurs automatically because this is part of the BSS.
- */
-
-rtems_unsigned32  First_Time_Through;
-
-void Process_case();
-
-rtems_extension Fatal_extension(
-  rtems_unsigned32 source,
-  boolean          is_internal,
-  rtems_unsigned32 error
-)
-{
-  int index;
-
-  Error_Happened[ Case_in_switch ] = error;
-
-  if ( First_Time_Through == 0 ) {
-    Case_in_switch = FATAL_WORKSPACE_OF_ZERO;
-    First_Time_Through = 1;
-    setjmp( Restart_Context );
-  } else if ( Case_in_switch == FATAL_LAST ) {
-
-    /*
-     *  Depending on the C library we use, we cannot get the
-     *  task exitted error so do not check for it.
-     */
-
-    puts( "*** TEST FATAL ***" );
-    for ( index=0 ; index< FATAL_LAST ; index++ )
-      put_error( Error_Happened[ index ], Expected_Errors[ index ] );
-    puts( "NOT TESTING FATAL ERROR WHEN TASK EXITS -- C LIBRARY CATCHES THIS" );
-    puts( "*** END OF TEST FATAL ***" );
-
-    /*
-     *  returns to the default fatal error handler instead of
-     *  calling rtems_shutdown_executive
-     */
-    return;
-
-  } else {
-
-    longjmp( Restart_Context, 1 );
-  }
-
-  Process_case();
-}
-
-
-
-void Process_case()
-{
-  switch ( Case_in_switch ) {
-    case FATAL_WORKSPACE_OF_ZERO:
-      New_Configuration = BSP_Configuration;
-      New_Configuration.work_space_start = NULL;
-      Case_in_switch = FATAL_NULL_WORKSPACE;
-      break;
-
-    case FATAL_NULL_WORKSPACE:
-      New_Configuration.work_space_start = Workspace;
-      New_Configuration.work_space_size  = 256;
-      Case_in_switch = FATAL_WORKSPACE_TOO_SMALL;
-      break;
-
-    case FATAL_WORKSPACE_TOO_SMALL:
-      Initialization_tasks[ 0 ].initial_priority = RTEMS_CURRENT_PRIORITY;
-      New_Configuration.work_space_size = sizeof( Workspace );
-      Case_in_switch = FATAL_TASK_CREATE;
-      break;
-
-    case FATAL_TASK_CREATE:
-      Initialization_tasks[ 0 ].initial_priority = 1;
-      Initialization_tasks[ 0 ].entry_point      = NULL;
-      Case_in_switch = FATAL_TASK_START;
-      break;
-
-    case FATAL_TASK_START:
-      /* this extension exits the test */
-      Initialization_tasks[ 0 ].entry_point = Init;
-      break;
-  }
-  rtems_initialize_executive( &New_Configuration, &Cpu_table );
-}
-
diff --git a/testsuites/sptests/spfatal/init.c b/testsuites/sptests/spfatal/init.c
deleted file mode 100644
index 1892975f29..0000000000
--- a/testsuites/sptests/spfatal/init.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*  Init
- *
- *  This routine is the initialization task for this test program.
- *  It is a user initialization task and has the responsibility for creating
- *  and starting the tasks that make up the test.  If the time of day
- *  clock is required for the test, it should also be set to a known
- *  value by this function.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "system.h"
-
-rtems_task Init(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-
-  Task_name[ 1 ] =  rtems_build_name( 'T', 'A', '1', ' ' );
-
-  status = rtems_task_create(
-    Task_name[ 1 ],
-    1,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Task_id[ 1 ]
-  );
-  directive_failed( status, "rtems_task_create of TA1" );
-
-  status = rtems_task_start( Task_id[ 1 ], Task_1, 0 );
-  directive_failed( status, "rtems_task_start of TA1" );
-
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-}
diff --git a/testsuites/sptests/spfatal/puterr.c b/testsuites/sptests/spfatal/puterr.c
deleted file mode 100644
index d5404d3d1b..0000000000
--- a/testsuites/sptests/spfatal/puterr.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/*  put_error
- *
- *  This routine verifies that the given error is the expected error.
- *
- *  Input parameters:
- *    error    - actual error code
- *    expected - expected error code
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-char *Errors[] = {
-  "RTEMS_SUCCESSFUL",               /* successful completion */
-  "RTEMS_TASK_EXITTED",             /* returned from a task */
-  "RTEMS_MP_NOT_CONFIGURED",        /* multiprocessing not configured */
-  "RTEMS_INVALID_NAME",             /* invalid object name */
-  "RTEMS_INVALID_ID",               /* invalid object id */
-  "RTEMS_TOO_MANY",                 /* too many */
-  "RTEMS_TIMEOUT",                  /* timed out waiting */
-  "RTEMS_OBJECT_WAS_DELETED",       /* object was deleted while waiting */
-  "RTEMS_INVALID_SIZE",             /* specified size was invalid */
-  "RTEMS_INVALID_ADDRESS",          /* address specified is invalid */
-  "RTEMS_INVALID_NUMBER",           /* number was invalid */
-  "RTEMS_NOT_DEFINED",              /* item has not been initialized */
-  "RTEMS_RESOURCE_IN_USE",          /* resources still outstanding */
-  "RTEMS_UNSATISFIED",              /* request not satisfied */
-  "RTEMS_INCORRECT_STATE",          /* task is in wrong state */
-  "RTEMS_ALREADY_SUSPENDED",        /* task already in state */
-  "RTEMS_ILLEGAL_ON_SELF",          /* illegal operation on calling task */
-  "RTEMS_ILLEGAL_ON_REMOTE_OBJECT", /* illegal operation for remote object */
-  "RTEMS_CALLED_FROM_ISR",          /* called from ISR */
-  "RTEMS_INVALID_PRIORITY",         /* invalid task priority */
-  "RTEMS_INVALID_CLOCK",            /* invalid date/time */
-  "RTEMS_INVALID_NODE",             /* invalid node id */
-  "RTEMS_NOT_OWNER_OF_RESOURCE",    /* not owner of resource */
-  "RTEMS_NOT_CONFIGURED",           /* directive not configured */
-  "RTEMS_NOT_IMPLEMENTED"           /* directive not implemented */
-};
-
-/* Task states */
-
-void put_error(
-  rtems_unsigned32  error,
-  rtems_status_code expected
-)
-{
-
-  if ( error <= RTEMS_NOT_IMPLEMENTED )
-    printf( "EXPECTED FATAL - error code is correctly %s\n", Errors[ error ] );
-  else
-    printf( "ERROR - out of range error code is %d\n", error );
-
-  if ( error != expected ) {
-    printf( "ERROR - did not get expected code of %d\n", expected );
-  }
-}
diff --git a/testsuites/sptests/spfatal/spfatal.doc b/testsuites/sptests/spfatal/spfatal.doc
deleted file mode 100644
index b6ff6b5504..0000000000
--- a/testsuites/sptests/spfatal/spfatal.doc
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
-This file describes the directives and concepts tested by this test set.
-
-test set name:  testfatal
-
-directives: none
-
-concepts:
-
-  a.  Verifies that the proper error is reported by k_fatal when a task
-      exits.
-
-  b.  Verifies that the task exitted extension works correctly.
-
-  c.  Verifies that the fatal error extension works corectly.
-
diff --git a/testsuites/sptests/spfatal/spfatal.scn b/testsuites/sptests/spfatal/spfatal.scn
deleted file mode 100644
index ecb9f63597..0000000000
--- a/testsuites/sptests/spfatal/spfatal.scn
+++ /dev/null
@@ -1,8 +0,0 @@
-*** TEST FATAL ***
-EXPECTED FATAL - error code is correctly RTEMS_UNSATISFIED
-EXPECTED FATAL - error code is correctly RTEMS_INVALID_ADDRESS
-EXPECTED FATAL - error code is correctly RTEMS_UNSATISFIED
-EXPECTED FATAL - error code is correctly RTEMS_INVALID_PRIORITY
-EXPECTED FATAL - error code is correctly RTEMS_TASK_EXITTED
-NOT TESTING FATAL ERROR WHEN TASK EXITS -- C LIBRARY CATCHES THIS
-*** END OF TEST FATAL ***
diff --git a/testsuites/sptests/spfatal/system.h b/testsuites/sptests/spfatal/system.h
deleted file mode 100644
index f2391c2a94..0000000000
--- a/testsuites/sptests/spfatal/system.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*  system.h
- *
- *  This include file contains information that is included in every
- *  function in the test set.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <tmacros.h>
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
- 
-void put_error(
-  rtems_unsigned32  error,
-  rtems_status_code expected
-);
- 
-rtems_extension Fatal_extension(
-  rtems_unsigned32 source,
-  boolean          is_internal,
-  rtems_unsigned32 error
-);
- 
-rtems_task Task_1(
-  rtems_task_argument argument
-);
-
-/* configuration information */
-
-extern rtems_extensions_table initial_extensions;
-
-#define CONFIGURE_INITIAL_EXTENSIONS \
-  { \
-    NULL,                    /* create  */ \
-    NULL,                    /* start   */ \
-    NULL,                    /* restart */ \
-    NULL,                    /* delete  */ \
-    NULL,                    /* switch  */ \
-    NULL,                    /* begin   */ \
-    NULL,                    /* exitted */ \
-    Fatal_extension          /* fatal   */ \
-  }
-
-#define CONFIGURE_SPTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_MICROSECONDS_PER_TICK RTEMS_MILLISECONDS_TO_MICROSECONDS(0)
-#define CONFIGURE_TICKS_PER_TIMESLICE   0
-
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#include <confdefs.h>
-
-/* global variables */
-
-TEST_EXTERN rtems_id   Task_id[ 4 ];         /* array of task ids */
-TEST_EXTERN rtems_name Task_name[ 4 ];       /* array of task names */
-
-TEST_EXTERN rtems_configuration_table        New_Configuration;
-
-extern rtems_extensions_table           Extensions;
-extern rtems_configuration_table        BSP_Configuration;
-extern rtems_cpu_table                  Cpu_table;
-
-/* end of include file */
diff --git a/testsuites/sptests/spfatal/task1.c b/testsuites/sptests/spfatal/task1.c
deleted file mode 100644
index f7298ab2a4..0000000000
--- a/testsuites/sptests/spfatal/task1.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/*  Task_1
- *
- *  This routine serves as a test task.  It verifies the task manager.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_task Task_1(
-  rtems_task_argument argument
-)
-{
-  puts( "\n\n*** TEST FATAL ***" );
-  puts( "TA1 - exitting task" );
-}
diff --git a/testsuites/sptests/spsize/getint.c b/testsuites/sptests/spsize/getint.c
deleted file mode 100644
index 01eae17fec..0000000000
--- a/testsuites/sptests/spsize/getint.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/*  getint
- *
- *  This routine reads and returns an integer.
- *  It assumes decimal.
- *
- *  Input parameters:   NONE
- *
- *  Output parameters:
- *    returns - number read
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-int getint( void )
-{
-  char buff[16];
-
-  gets(buff);
-  return atoi(buff);
-}
diff --git a/testsuites/sptests/spsize/init.c b/testsuites/sptests/spsize/init.c
deleted file mode 100644
index f7d3b67fd6..0000000000
--- a/testsuites/sptests/spsize/init.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*  Init
- *
- *  This routine is the initialization task for this test program.
- *  It is a user initialization task and has the responsibility for creating
- *  and starting the tasks that make up the test.  If the time of day
- *  clock is required for the test, it should also be set to a known
- *  value by this function.
- *
- *  Input parameters:
- *    argument - task argument
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "system.h"
-
-/* #define HAVE_MENU */
-
-rtems_task Test_task();
-void size_rtems( int mode );
-
-rtems_task Init(
-  rtems_task_argument argument
-)
-{
-#if defined(HAVE_MENU)
-  int choice = 0;
-#endif
-
-  setvbuf(stdout, 0, _IONBF, 0);
-
-  puts( "\n*** RTEMS SIZE PROGRAM ***" );
-  size_rtems( 1 );
-  puts( "*** END OF RTEMS SIZE PROGRAM ***" );
-  exit( 0 );
-#if defined(HAVE_MENU)
-  do {
-    printf( "\n\nPlease select program mode:\n" );
-    printf( "  1) Print Formulas\n" );
-    printf( "  2) Determine Workspace Size\n" );
-    printf( "  3) Exit\n" );
-    printf( "Enter number of choice (1,2,3) : " );
-
-    choice = getint();
-    switch( choice ) {
-      case 1: size_rtems( 1 );  break;
-      case 2: size_rtems( 0 );  break;
-      case 3: exit( 0 );
-      default:  continue;
-    }
-  } while ( FOREVER );
-#endif
-}
diff --git a/testsuites/sptests/spsize/size.c b/testsuites/sptests/spsize/size.c
deleted file mode 100644
index 9ebad1aad6..0000000000
--- a/testsuites/sptests/spsize/size.c
+++ /dev/null
@@ -1,650 +0,0 @@
-/*  main
- *
- *  This program is run to determine the data space and work space
- *  requirements of the current version of RTEMS.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <rtems/system.h>
-#include <rtems/config.h>
-#include <rtems/directives.h>
-#include <rtems/score/apiext.h>
-#include <rtems/score/copyrt.h>
-#include <rtems/rtems/clock.h>
-#include <rtems/rtems/tasks.h>
-#include <rtems/rtems/dpmem.h>
-#include <rtems/rtems/event.h>
-#include <rtems/extension.h>
-#include <rtems/fatal.h>
-#include <rtems/init.h>
-#include <rtems/score/isr.h>
-#include <rtems/rtems/intr.h>
-#include <rtems/io.h>
-#include <rtems/rtems/message.h>
-#include <rtems/rtems/mp.h>
-#include <rtems/score/mpci.h>
-#include <rtems/rtems/part.h>
-#include <rtems/score/priority.h>
-#include <rtems/rtems/ratemon.h>
-#include <rtems/rtems/region.h>
-#include <rtems/rtems/sem.h>
-#include <rtems/rtems/signal.h>
-#include <rtems/score/sysstate.h>
-#include <rtems/score/thread.h>
-#include <rtems/rtems/timer.h>
-#include <rtems/score/tod.h>
-#include <rtems/score/userext.h>
-#include <rtems/score/wkspace.h>
-
-#include <stdlib.h>
-
-/* These are always defined by the executive.
- *
- * #include <rtems/copyrt.h>
- * #include <rtems/tables.h>
- * #include <rtems/sptables.h>
- */
-#define  HEAP_OVHD        16    /* wasted heap space per task stack */
-#define  NAME_PTR_SIZE     8    /* size of name and pointer table entries */
-#define  READYCHAINS_SIZE  \
-    ((RTEMS_MAXIMUM_PRIORITY + 1) * sizeof(Chain_Control ))
-
-#define PER_TASK      \
-     (long) (sizeof (Thread_Control) + \
-      NAME_PTR_SIZE + HEAP_OVHD + sizeof( RTEMS_API_Control ))
-#define PER_SEMAPHORE \
-     (long) (sizeof (Semaphore_Control) + NAME_PTR_SIZE)
-#define PER_TIMER     \
-     (long) (sizeof (Timer_Control) + NAME_PTR_SIZE)
-#define PER_MSGQ      \
-     (long) (sizeof (Message_queue_Control) + NAME_PTR_SIZE)
-#define PER_REGN      \
-     (long) (sizeof (Region_Control) + NAME_PTR_SIZE)
-#define PER_PART      \
-     (long) (sizeof (Partition_Control) + NAME_PTR_SIZE)
-#define PER_PERIOD      \
-     (long) (sizeof (Rate_monotonic_Control) + NAME_PTR_SIZE)
-#define PER_PORT      \
-     (long) (sizeof (Dual_ported_memory_Control) + NAME_PTR_SIZE)
-#define PER_EXTENSION     \
-     (long) (sizeof (Extension_Control) + NAME_PTR_SIZE)
-
-#define PER_DRV       (long) (0)
-#define PER_FPTASK    (long) (CONTEXT_FP_SIZE)
-#define PER_GOBTBL    (long) (sizeof (Chain_Control)*4)
-#define PER_NODE      (long) PER_GOBTBL
-#define PER_GOBJECT   (long) (sizeof (Objects_MP_Control))
-#define PER_PROXY     (long) (sizeof (Thread_Proxy_control))
-
-#if (CPU_ALL_TASKS_ARE_FP == TRUE)
-#define MPCI_RECEIVE_SERVER_FP (long) (sizeof( Context_Control_fp ))
-#else
-#define MPCI_RECEIVE_SERVER_FP (long) 0
-#endif
-
-#if (CPU_IDLE_TASK_IS_FP == TRUE)
-#define SYSTEM_IDLE_FP (long) (sizeof( Context_Control_fp ))
-#else
-#define SYSTEM_IDLE_FP (long) 0
-#endif
-
-#define SYSTEM_TASKS  \
-    (STACK_MINIMUM_SIZE + \
-     MPCI_RECEIVE_SERVER_STACK_SIZE + \
-     (2*sizeof(Thread_Control))) + \
-     MPCI_RECEIVE_SERVER_FP + \
-     SYSTEM_IDLE_FP
-
-#define rtems_unsigned32 unsigned32
-
-rtems_unsigned32 sys_req;
-
-/* to avoid warnings */
-int puts();
-int printf();
-int getint();
-#undef getchar
-int getchar();
-void help_size();
-void print_formula();
-
-void size_rtems(
-  int mode
-)
-{
-int uninitialized = 0;
-int initialized = 0;
-
-/*
- *  The following data is allocated for each Manager:
- *
- *    + Per Manager Object Information
- *      - local pointer table
- *      - local name table
- *      - the object's control blocks
- *      - global name chains
- *
- *  The following is the data allocate from the RTEMS Workspace Area.
- *  The order indicates the order in which RTEMS allocates it.
- *
- *    + Object MP
- *      - Global Object CB's
- *    + Thread
- *      - Ready Chain
- *    + Thread MP
- *      - Proxies Chain
- *    + Interrupt Manager
- *      - Interrupt Stack
- *    + Timer Manager
- *      - per Manager Object Data
- *    + Extension Manager
- *      - per Manager Object Data
- *    + Message Queue Manager
- *      - per Manager Object Data
- *      - Message Buffers
- *    + Semaphore Manager
- *      - per Manager Object Data
- *    + Partition Manager
- *      - per Manager Object Data
- *    + Region Manager
- *      - per Manager Object Data
- *    + Dual Ported Memory Manager
- *      - per Manager Object Data
- *    + Rate Monotonic Manager
- *      - per Manager Object Data
- *    + Internal Threads Handler
- *      - MPCI Receive Server Thread TCB
- *      - IDLE Thread TCB
- *      - MPCI Receive Server Thread stack
- *      - MPCI Receive Server Thread FP area (if CPU requires this)
- *      - IDLE Thread stack
- *      - IDLE Thread FP area (if CPU requires this)
- *
- *  This does not take into account any CPU dependent alignment requirements.
- *
- *  The following calculates the overhead needed by RTEMS from the
- *  Workspace Area.
- */
-sys_req = SYSTEM_TASKS     +     /* MPCI Receive Server and IDLE */
-          NAME_PTR_SIZE    +     /* Task Overhead */
-          READYCHAINS_SIZE +     /* Ready Chains */
-          NAME_PTR_SIZE    +     /* Timer Overhead */
-          NAME_PTR_SIZE    +     /* Semaphore Overhead */
-          NAME_PTR_SIZE    +     /* Message Queue Overhead */
-          NAME_PTR_SIZE    +     /* Region Overhead */
-          NAME_PTR_SIZE    +     /* Partition Overhead */
-          NAME_PTR_SIZE    +     /* Dual-Ported Memory Overhead */
-          NAME_PTR_SIZE    +     /* Rate Monotonic Overhead */
-          NAME_PTR_SIZE    +     /* Extension Overhead */
-          PER_NODE;              /* Extra Gobject Table */
-
-uninitialized =
-/*address.h*/   0                                         +
-
-/*apiext.h*/    (sizeof _API_extensions_List)             +
-
-/*asr.h*/       0                                         +
-
-/*attr.h*/      0                                         +
-
-/*bitfield.h*/  0                                         +
-
-/*chain.h*/     0                                         +
-
-/*clock.h*/     0                                         +
-
-/*config.h*/    (sizeof _Configuration_Table)             +
-                (sizeof _Configuration_MP_table)          +
-
-/*context.h*/   (sizeof _Context_Switch_necessary)        +
-
-/*copyrt.h*/    0                                         +
-
-/*debug.h*/     (sizeof _Debug_Level)                     +
-
-/*dpmem.h*/     (sizeof _Dual_ported_memory_Information)  +
-
-/*event.h*/     (sizeof _Event_Sync_state)                +
-
-/*eventmp.h*/   0                                         +
-
-/*eventset.h*/  0                                         +
-
-/*extension.h*/ (sizeof _Extension_Information)           +
-
-/*fatal.h*/     0                                         +
-
-/*heap.h*/      0                                         +
-
-/*init.h*/      0                                         +
-
-/*interr.h*/    (sizeof Internal_errors_What_happened)    +
-
-/*intr.h*/      0                                         +
-
-/*io.h*/        (sizeof _IO_Number_of_drivers)            +
-                (sizeof _IO_Driver_address_table)         +
-                (sizeof _IO_Number_of_devices)            +
-                (sizeof _IO_Driver_name_table)            +
-
-/*isr.h*/       (sizeof _ISR_Nest_level)                  +
-                (sizeof _ISR_Vector_table)                +
-                (sizeof _ISR_Signals_to_thread_executing) +
-
-/*message.h*/   (sizeof _Message_queue_Information)       +
-
-/*modes.h*/     0                                         +
-
-/*mp.h*/        0                                         +
-
-/*mpci.h*/      (sizeof _MPCI_Remote_blocked_threads)     +
-                (sizeof _MPCI_Semaphore)                  +
-                (sizeof _MPCI_table)                      +
-                (sizeof _MPCI_Receive_server_tcb)         +
-                (sizeof _MPCI_Packet_processors)          +
-
-/*mppkt.h*/     0                                         +
-
-/*mptables.h*/  0                                         +
-
-/*msgmp.h*/     0                                         +
-
-/*object.h*/    (sizeof _Objects_Local_node)              +
-                (sizeof _Objects_Maximum_nodes)           +
-                (sizeof _Objects_Information_table)       +
-
-/*objectmp.h*/  (sizeof _Objects_MP_Maximum_global_objects) +
-                (sizeof _Objects_MP_Inactive_global_objects) +
-
-/*options.h*/   0                                         +
-
-/*part.h*/      (sizeof _Partition_Information)           +
-
-/*partmp.h*/    0                                         +
-
-/*priority.h*/  (sizeof _Priority_Major_bit_map)          +
-                (sizeof _Priority_Bit_map)                +
-
-/*ratemon.h*/   (sizeof _Rate_monotonic_Information)      +
-
-/*region.h*/    (sizeof _Region_Information)              +
-
-/*regionmp.h*/  0                                         +
-
-/*rtems.h*/     /* Not applicable */
-
-/*sem.h*/       (sizeof _Semaphore_Information)           +
-
-/*semmp.h*/     0                                         +
-
-/*signal.h*/    0                                         +
-
-/*signalmp.h*/  0                                         +
-
-/*stack.h*/     0                                         +
-
-/*states.h*/    0                                         +
-
-/*status.h*/    0                                         +
-
-/*sysstate.h*/  (sizeof _System_state_Is_multiprocessing) +
-                (sizeof _System_state_Current)            +
-
-/*system.h*/    (sizeof _CPU_Table)                       +
-
-/*taskmp.h*/    0                                         +
-
-/*tasks.h*/     (sizeof _RTEMS_tasks_Information)         +
-                (sizeof _RTEMS_tasks_User_initialization_tasks) +
-                (sizeof _RTEMS_tasks_Number_of_initialization_tasks) +
-
-/*thread.h*/    (sizeof _Thread_BSP_context)              +
-                (sizeof _Thread_Dispatch_disable_level)   +
-                (sizeof _Thread_Do_post_task_switch_extension) +
-                (sizeof _Thread_Maximum_extensions)       +
-                (sizeof _Thread_Ticks_per_timeslice)      +
-                (sizeof _Thread_Ready_chain)              +
-                (sizeof _Thread_Executing)                +
-                (sizeof _Thread_Heir)                     +
-                (sizeof _Thread_Allocated_fp)             +
-                (sizeof _Thread_Internal_information)     +
-                (sizeof _Thread_Idle)                     +
-
-/*threadmp.h*/  (sizeof _Thread_MP_Receive)               +
-                (sizeof _Thread_MP_Active_proxies)        +
-                (sizeof _Thread_MP_Inactive_proxies)      +
-
-/*threadq.h*/   (sizeof _Thread_queue_Extract_table)      +
-
-/*timer.h*/     (sizeof _Timer_Information)               +
-
-/*tod.h*/       (sizeof _TOD_Current)                     +
-                (sizeof _TOD_Seconds_since_epoch)         +
-                (sizeof _TOD_Microseconds_per_tick)       +
-                (sizeof _TOD_Ticks_per_second)            +
-                (sizeof _TOD_Seconds_watchdog)            +
-
-/*tqdata.h*/    0                                         +
-
-/*types.h*/     0                                         +
-
-/*userext.h*/   (sizeof _User_extensions_List)            +
-
-/*watchdog.h*/  (sizeof _Watchdog_Sync_level)             +
-                (sizeof _Watchdog_Sync_count)             +
-                (sizeof _Watchdog_Ticks_since_boot)       +
-                (sizeof _Watchdog_Ticks_chain)            +
-                (sizeof _Watchdog_Seconds_chain)          +
-
-/*wkspace.h*/   (sizeof _Workspace_Area);
-
-uninitialized = 0;
-
-#ifndef unix  /* make sure this is not a native compile */
-
-#ifdef __i386__
-
-/* cpu.h */
-uninitialized += (sizeof _CPU_Null_fp_context) +
-                 (sizeof _CPU_Interrupt_stack_low) +
-                 (sizeof _CPU_Interrupt_stack_high);
-
-#endif
-
-#ifdef __i960__
-
-/* cpu.h */
-uninitialized += (sizeof _CPU_Interrupt_stack_low) +
-                 (sizeof _CPU_Interrupt_stack_high);
-
-#endif
-
-#ifdef __hppa__
-
-/* cpu.h */
-uninitialized += (sizeof _CPU_Null_fp_context) +
-#ifndef RTEMS_UNIX
-                 (sizeof _CPU_Default_gr27) +
-#endif
-                 (sizeof _CPU_Interrupt_stack_low) +
-                 (sizeof _CPU_Interrupt_stack_high);
-#endif
-
-#ifdef __mc68000__
-
-/* cpu.h */
-uninitialized += (sizeof _CPU_Interrupt_stack_low) +
-                 (sizeof _CPU_Interrupt_stack_high);
-
-#endif
-
-#ifdef __sparc__
- 
-/* cpu.h */
-uninitialized += (sizeof _CPU_Interrupt_stack_low) +
-                 (sizeof _CPU_Interrupt_stack_high) +
-                 (sizeof _CPU_Null_fp_context);
-
-#ifndef NO_TABLE_MOVE
-uninitialized += (sizeof _CPU_Trap_Table_area);
-#endif
-
-#ifdef erc32
-uninitialized += (sizeof _ERC32_MEC_Timer_Control_Mirror);
-#endif
-
- 
-#endif
-
-
-#ifdef no_cpu
-
-/* cpu.h */
-uninitialized += (sizeof _CPU_Null_fp_context) +
-                 (sizeof _CPU_Interrupt_stack_low) +
-                 (sizeof _CPU_Interrupt_stack_high) +
-                 (sizeof _CPU_Thread_dispatch_pointer);
-
-#endif
-
-#ifdef __PPC__
-
-/* cpu.h */
-uninitialized += (sizeof _CPU_Interrupt_stack_low) +
-                 (sizeof _CPU_Interrupt_stack_high) +
-                 (sizeof _CPU_IRQ_info);
-
-#endif
-#endif /* !unix */
-
-initialized +=
-/*copyrt.h*/    (strlen(_Copyright_Notice)+1)             +
-
-/*sptables.h*/  (sizeof _Initialization_Default_multiprocessing_table)  +
-                (strlen(_RTEMS_version)+1)      +
-                (sizeof _Entry_points)          +
-
-
-/*tod.h*/       (sizeof _TOD_Days_per_month)    +
-                (sizeof _TOD_Days_to_date)      +
-                (sizeof _TOD_Days_since_last_leap_year);
-
-#ifndef unix /* make sure this is not native */
-#ifdef __sparc__
-
-initialized +=  (sizeof _CPU_Trap_slot_template);
-
-#endif
-#endif /* !unix */
-
-puts( "" );
-
-  if ( mode == 0 ) help_size();
-  else             print_formula();
-
-printf( "\n" );
-printf( "RTEMS uninitialized data consumes %d bytes\n", uninitialized );
-printf( "RTEMS intialized data consumes %d bytes\n", initialized );
-
-}
-
-void help_size()
-{
-int c = '\0';
-int break_loop;
-int total_size;
-int task_stacks;
-int interrupt_stack;
-int maximum_tasks, size_tasks;
-int maximum_sems, size_sems;
-int maximum_timers, size_timers;
-int maximum_msgqs, size_msgqs;
-int maximum_msgs, size_msgs_overhead;
-int maximum_regns, size_regns;
-int maximum_parts, size_parts;
-int maximum_ports, size_ports;
-int maximum_periods, size_periods;
-int maximum_extensions, size_extensions;
-int maximum_drvs, size_drvs;
-int maximum_fps, size_fps;
-int maximum_nodes, size_nodes;
-int maximum_gobjs, size_gobjs;
-int maximum_proxies, size_proxies;
-
-total_size = sys_req;    /* Fixed Overhead */
-printf( "What is maximum_tasks? " );
-maximum_tasks = getint();
-size_tasks = PER_TASK * maximum_tasks;
-total_size += size_tasks;
-
-printf( "What is maximum_semaphores? " );
-maximum_sems = getint();
-size_sems = PER_SEMAPHORE * maximum_sems;
-total_size += size_sems;
-
-printf( "What is maximum_timers? " );
-maximum_timers = getint();
-size_timers = PER_TIMER * maximum_timers;
-total_size += size_timers;
-
-printf( "What is maximum_message_queues? " );
-maximum_msgqs = getint();
-size_msgqs = PER_MSGQ * maximum_msgqs;
-total_size += size_msgqs;
-
-printf( "What is maximum_messages?  XXXX " );
-maximum_msgs = getint();
-size_msgs_overhead = 0;
-total_size += size_msgs_overhead;
-
-printf( "What is maximum_regions? " );
-maximum_regns = getint();
-size_regns = PER_REGN * maximum_regns;
-total_size += size_regns;
-
-printf( "What is maximum_partitions? " );
-maximum_parts = getint();
-size_parts = PER_PART * maximum_parts;
-total_size += size_parts;
-
-printf( "What is maximum_ports? " );
-maximum_ports = getint();
-size_ports = PER_PORT * maximum_ports;
-total_size += size_ports;
-
-printf( "What is maximum_periods? " );
-maximum_periods = getint();
-size_periods = PER_PORT * maximum_periods;
-total_size += size_periods;
-
-printf( "What is maximum_extensions? " );
-maximum_extensions = getint();
-size_extensions = PER_EXTENSION * maximum_extensions;
-total_size += size_extensions;
-
-printf( "What is number_of_device_drivers? " );
-maximum_drvs = getint();
-size_drvs = PER_DRV  * maximum_drvs;
-total_size += size_drvs;
-
-printf( "What will be total stack requirement for all tasks? " );
-task_stacks = getint();
-total_size += task_stacks;
-
-printf( "What is the size of the interrupt stack? " );
-interrupt_stack = getint();
-total_size += interrupt_stack;
-
-printf( "How many tasks will be created with the FP flag? " );
-maximum_fps = getint();
-size_fps = PER_FPTASK  * maximum_fps;
-total_size += size_fps;
-
-printf( "Is this a single processor system? " );
-for ( break_loop=0 ; !break_loop; c = getchar() ) {
-  switch ( c ) {
-    case 'Y':  case 'y':
-    case 'N':  case 'n':
-      break_loop = 1;
-      break;
-  }
-}
-printf( "%c\n", c );
-if ( c == 'n' || c == 'N' ) {
-  printf( "What is maximum_nodes? " );
-  maximum_nodes = getint();
-  size_nodes = PER_NODE * maximum_nodes;
-  total_size += size_nodes;
-  printf( "What is maximum_global_objects? " );
-  maximum_gobjs = getint();
-  size_gobjs = PER_GOBJECT * maximum_gobjs;
-  total_size += size_gobjs;
-  printf( "What is maximum_proxies? " );
-  maximum_proxies = getint();
-  size_proxies = PER_PROXY * maximum_proxies;
-  total_size += size_proxies;
-} else {
-  maximum_nodes = 0;
-  size_nodes = PER_NODE * 0;
-  maximum_gobjs = 0;
-  size_gobjs = PER_GOBJECT * 0;
-  maximum_proxies = 0;
-  size_proxies = PER_PROXY * 0;
-}
-
-printf( "\n\n" );
-printf( " ************** EXECUTIVE WORK SPACE REQUIRED **************\n" );
-printf( " Tasks                - %03d * %03ld            =  %ld\n",
-          maximum_tasks, PER_TASK, (long) size_tasks );
-printf( " Semaphores           - %03d * %03ld            =  %ld\n",
-          maximum_sems, PER_SEMAPHORE, (long) size_sems );
-printf( " Timers               - %03d * %03ld            =  %ld\n",
-          maximum_timers, PER_TIMER, (long) size_timers );
-printf( " Msg Queues           - %03d * %03ld            =  %ld\n",
-          maximum_msgqs, PER_MSGQ, (long) size_msgqs );
-printf( " Messages Overhead    - %03d * %03d            =  %ld\n",
-          maximum_msgs, 0 /* PER_MSG_OVERHEAD */, (long) size_msgs_overhead );
-printf( " Regions              - %03d * %03ld            =  %ld\n",
-          maximum_regns, PER_REGN, (long) size_regns);
-printf( " Partitions           - %03d * %03ld            =  %ld\n",
-          maximum_parts, PER_PART, (long) size_parts );
-printf( " Periods              - %03d * %03ld            =  %ld\n",
-          maximum_periods, PER_PERIOD, (long) size_periods );
-printf( " Extensions           - %03d * %03ld            =  %ld\n",
-          maximum_extensions, PER_EXTENSION, (long) size_extensions );
-printf( " Device Drivers       - %03d * %03ld            =  %ld\n",
-          maximum_drvs, PER_DRV, (long) size_drvs );
-
-printf( " System Requirements  - %04d                 =  %d\n",
-          sys_req, sys_req );
-
-printf( " Floating Point Tasks - %03d * %03ld            =  %ld\n",
-          maximum_fps, PER_FPTASK, (long) size_fps );
-printf( " Application Task Stacks -                     =  %d\n",
-          task_stacks );
-printf( " Interrupt Stacks -                            =  %d\n",
-          task_stacks );
-printf( " \n" );
-printf( " Global object tables - %03d * %03ld            =  %ld\n",
-          maximum_nodes, PER_NODE, (long) size_nodes );
-printf( " Global objects       - %03d * %03ld            =  %ld\n",
-          maximum_gobjs, PER_GOBJECT, (long) size_gobjs );
-printf( " Proxies              - %03d * %03ld            =  %ld\n",
-          maximum_proxies, PER_PROXY, (long) size_proxies );
-printf( "\n\n" );
-printf( " TOTAL                                       = %d bytes\n",
-      total_size );
-}
-
-void print_formula()
-{
-printf( " ************** EXECUTIVE WORK SPACE FORMULA **************\n" );
-printf( " Tasks                - maximum_tasks * %ld\n",      PER_TASK );
-printf( " Timers               - maximum_timers * %ld\n",     PER_TIMER );
-printf( " Semaphores           - maximum_semaphores * %ld\n", PER_SEMAPHORE);
-printf( " Message Queues       - maximum_message_queues * %ld\n", PER_MSGQ );
-printf( " Messages             -\n");
-printf( " Regions              - maximum_regions * %ld\n",    PER_REGN );
-printf( " Partitions           - maximum_partitions * %ld\n", PER_PART );
-printf( " Ports                - maximum_ports * %ld\n",      PER_PORT );
-printf( " Periods              - maximum_periods * %ld\n",    PER_PORT );
-printf( " Extensions           - maximum_extensions * %ld\n", PER_EXTENSION );
-printf( " Device Drivers       - number_of_device_drivers * %ld\n", PER_DRV);
-printf( " System Requirements  - %d\n",                       sys_req );
-printf( " Floating Point Tasks - FPMASK Tasks * %ld\n",       PER_FPTASK );
-printf( " User's Tasks' Stacks -\n" );
-printf( " Interrupt Stack      -\n" );
-printf( " \n" );
-printf( " Global object tables - maximum_nodes * %ld\n",          PER_NODE );
-printf( " Global objects       - maximum_global_objects * %ld\n", PER_GOBJECT );
-printf( " Proxies              - maximum_proxies * %ld\n",        PER_PROXY );
-}
diff --git a/testsuites/sptests/spsize/system.h b/testsuites/sptests/spsize/system.h
deleted file mode 100644
index 21abdab2f7..0000000000
--- a/testsuites/sptests/spsize/system.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*  system.h
- *
- *  This include file contains information that is included in every
- *  function in the test set.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <tmacros.h>
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
- 
-rtems_task Test_task(
-  rtems_task_argument argument
-);
- 
-int getint( void );
-
-/* configuration information */
-
-#define CONFIGURE_SPTEST
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#include <confdefs.h>
-
-/* global variables */
-
-TEST_EXTERN rtems_id   Task_id[ 4 ];         /* array of task ids */
-TEST_EXTERN rtems_name Task_name[ 4 ];       /* array of task names */
-
-/* end of include file */
diff --git a/testsuites/support/include/tmacros.h b/testsuites/support/include/tmacros.h
deleted file mode 100644
index ec2b5a0409..0000000000
--- a/testsuites/support/include/tmacros.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/*  tmacros.h
- *
- *  This include file contains macros which are useful in the RTEMS
- *  test suites.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __TMACROS_h
-#define __TMACROS_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <bsp.h>    /* includes <rtems.h> */
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#define FOREVER 1                  /* infinite loop */
-
-#ifdef TEST_INIT
-#define TEST_EXTERN 
-#define CONFIGURE_INIT
-#else
-#define TEST_EXTERN extern
-#endif
-
-#define directive_failed( dirstat, failmsg )  \
-    fatal_directive_status( dirstat, RTEMS_SUCCESSFUL, failmsg )
-
-#define fatal_directive_status( stat, desired, msg ) \
-     do { \
-       if ( (stat) != (desired) ) { \
-         printf( "\n%s FAILED -- expected (%d) got (%d)\n", \
-                 (msg), (desired), (stat) ); \
-         fflush(stdout); \
-         exit( stat ); \
-       } \
-     } while ( 0 ) 
-
-#define sprint_time(str,s1,tb,s2) \
-  do { \
-    sprintf( (str), "%s%02d:%02d:%02d   %02d/%02d/%04d%s", \
-       s1, (tb)->hour, (tb)->minute, (tb)->second, \
-       (tb)->month, (tb)->day, (tb)->year, s2 ); \
-  } while ( 0 )
-
-#define print_time(s1,tb,s2) \
-  do { \
-    printf( "%s%02d:%02d:%02d   %02d/%02d/%04d%s", \
-       s1, (tb)->hour, (tb)->minute, (tb)->second, \
-       (tb)->month, (tb)->day, (tb)->year, s2 ); \
-    fflush(stdout); \
-  } while ( 0 )
-
-#define put_dot( c ) putchar( c ); fflush( stdout )
-
-#define new_line  puts( "" )
-
-#define puts_nocr printf
-
-#ifdef RTEMS_TEST_NO_PAUSE
-#define rtems_test_pause() \
-    do { \
-      printf( "<pause>\n" ); fflush( stdout ); \
-  } while ( 0 )
-
-#define rtems_test_pause_and_screen_number( _screen ) \
-  do { \
-    printf( "<pause - screen %d>\n", (_screen) ); fflush( stdout ); \
-  } while ( 0 )
-#else
-#define rtems_test_pause() \
-  do { \
-    char buffer[ 80 ]; \
-    printf( "<pause>" ); fflush( stdout ); \
-    gets( buffer ); \
-    puts( "" ); \
-  } while ( 0 )
-
-#define rtems_test_pause_and_screen_number( _screen ) \
-  do { \
-    char buffer[ 80 ]; \
-    printf( "<pause - screen %d>", (_screen) ); fflush( stdout ); \
-    gets( buffer ); \
-    puts( "" ); \
-  } while ( 0 )
-#endif
-
-#define put_name( name, crlf ) \
-{ rtems_unsigned32 c0, c1, c2, c3; \
-  c0 = (name >> 24) & 0xff; \
-  c1 = (name >> 16) & 0xff; \
-  c2 = (name >> 8) & 0xff; \
-  c3 = name & 0xff; \
-  putchar( (char)c0 ); \
-  if ( c1 ) putchar( (char)c1 ); \
-  if ( c2 ) putchar( (char)c2 ); \
-  if ( c3 ) putchar( (char)c3 ); \
-  if ( crlf ) \
-    putchar( '\n' ); \
-}
-
-#define build_time( TB, MON, DAY, YR, HR, MIN, SEC, TK ) \
-  { (TB)->year   = YR;  \
-    (TB)->month  = MON; \
-    (TB)->day    = DAY; \
-    (TB)->hour   = HR;  \
-    (TB)->minute = MIN; \
-    (TB)->second = SEC; \
-    (TB)->ticks  = TK; }
-
-#define task_number( tid ) \
-  ( rtems_get_index( tid ) - \
-     BSP_Configuration.RTEMS_api_configuration->number_of_initialization_tasks )
-
-static inline rtems_unsigned32 get_ticks_per_second( void )
-{
-  rtems_interval ticks_per_second;
-  (void) rtems_clock_get( RTEMS_CLOCK_GET_TICKS_PER_SECOND, &ticks_per_second );
-  return ticks_per_second;
-}
-
-#define TICKS_PER_SECOND get_ticks_per_second()
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/testsuites/tmtests/README b/testsuites/tmtests/README
deleted file mode 100644
index c27617d5a3..0000000000
--- a/testsuites/tmtests/README
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-#  $Id$
-#
-
-This directory contains the RTEMS Timing Test Suite.
-The tests in this directory are used to measure the execution
-time of RTEMS directive and some critical internal functions.
-The results of these test are reported in the Fact Sheets
-and Supplental Manuals.
-
-These tests attempt to benchmark RTEMS as the user would.  They measure
-the execution time for a directive (under various circumstances)
-from the time RTEMS is entered until it is executed.  Where possible,
-the time is the average of at least 100 invocations of the directive.
-
-The accuracy of the times reported by these benchmarks is very dependent
-on the resolution of the timer being used.  It is also important to
-insure that all sources of hardware interrupts are disabled during
-execution of the tests.  This insures that the directive time reported
-does not include any interrupt time.
-
diff --git a/testsuites/tmtests/include/timesys.h b/testsuites/tmtests/include/timesys.h
deleted file mode 100644
index 40337e9924..0000000000
--- a/testsuites/tmtests/include/timesys.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*  timesys.h
- *
- *  This header file contains the global variables for the Time
- *  suite.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <tmacros.h>
-
-/*
- *   How many times a particular operation is performed while timed.
- */
- 
-#define OPERATION_COUNT 100
-#define IT_COUNT        100
-
-/* functions */
-
-#define put_time( _message, _total_time, \
-                  _iterations, _loop_overhead, _overhead ) \
-    printf( \
-      "%s %d\n", \
-      (_message), \
-      (((_total_time) - (_loop_overhead)) / (_iterations)) - (_overhead) \
-    )
-
-#if  defined(STACK_CHECKER_ON) || defined(RTEMS_DEBUG)
-#define Print_Warning() \
-  do { \
-    puts( \
-      "\n" \
-      "THE TIMES REPORTED BY THIS TEST INCLUDE DEBUG CODE!\n" \
-      "\n" \
-    ); \
-  } while (0)
-
-#else
-#define Print_Warning()
-#endif
-
-/* variables */
-
-TEST_EXTERN volatile rtems_unsigned32 end_time;   /* ending time variable */
-TEST_EXTERN volatile rtems_unsigned32 overhead;   /* loop overhead variable */
-
-TEST_EXTERN rtems_id   Task_id[ OPERATION_COUNT+1 ];   /* array of task ids */
-TEST_EXTERN rtems_id   Task_name[ OPERATION_COUNT+1 ]; /* array of task names */
-
-/* end of include file */
diff --git a/testsuites/tmtests/tm01/system.h b/testsuites/tmtests/tm01/system.h
deleted file mode 100644
index f66403dcdc..0000000000
--- a/testsuites/tmtests/tm01/system.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*  system.h
- *
- *  This include file is used by all tests in the Time Suite.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-#include <coverhd.h>
-#include <tmacros.h>
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
-
-#include <timesys.h>
-
-/* configuration information */
- 
-#define CONFIGURE_TMTEST
- 
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
-
-#define CONFIGURE_MAXIMUM_TASKS              2
-#define CONFIGURE_MAXIMUM_SEMAPHORES         1
-#define CONFIGURE_TICKS_PER_TIMESLICE        0
- 
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/testsuites/tmtests/tm01/task1.c b/testsuites/tmtests/tm01/task1.c
deleted file mode 100644
index e3a6b49dad..0000000000
--- a/testsuites/tmtests/tm01/task1.c
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "system.h"
-
-rtems_task Test_task(
-  rtems_task_argument argument
-);
-
-rtems_task Init(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-
-  Print_Warning();
-
-  puts( "\n\n*** TIME TEST 1 ***" );
-
-  Task_name[ 1 ] = rtems_build_name( 'T', 'A', '1', ' ' );
-  Task_name[ 2 ] = rtems_build_name( 'T', 'A', '2', ' ' );
-  Task_name[ 3 ] = rtems_build_name( 'T', 'A', '3', ' ' );
-
-  status = rtems_task_create(
-    Task_name[ 1 ],
-    128,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Task_id[ 1 ]
-  );
-  directive_failed( status, "rtems_task_create of TA1" );
-
-  status = rtems_task_start( Task_id[ 1 ], Test_task, 0 );
-  directive_failed( status, "rtems_task_start of TA1" );
-
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-
-}
-
-rtems_task Test_task(
-  rtems_task_argument argument
-)
-{
-  rtems_unsigned32  semaphore_obtain_time;
-  rtems_unsigned32  semaphore_release_time;
-  rtems_unsigned32  semaphore_obtain_no_wait_time;
-  rtems_unsigned32  semaphore_obtain_loop_time;
-  rtems_unsigned32  semaphore_release_loop_time;
-  rtems_unsigned32  index;
-  rtems_unsigned32  iterations;
-  rtems_name        name;
-  rtems_id          smid;
-  rtems_status_code status;
-
-  name = rtems_build_name( 'S', 'M', '1', ' ' );
-
-  semaphore_obtain_time          = 0;
-  semaphore_release_time         = 0;
-  semaphore_obtain_no_wait_time  = 0;
-  semaphore_obtain_loop_time     = 0;
-  semaphore_release_loop_time    = 0;
-
-
-  /* Time one invocation of rtems_semaphore_create */
-
-  Timer_initialize();
-    (void) rtems_semaphore_create(
-      name,
-      OPERATION_COUNT,
-      RTEMS_DEFAULT_MODES,
-      RTEMS_NO_PRIORITY,
-      &smid
-    );
-  end_time = Read_timer();
-  put_time(
-    "rtems_semaphore_create",
-    end_time,
-    1,
-    0,
-    CALLING_OVERHEAD_SEMAPHORE_CREATE
-  );
-
-  /* Time one invocation of rtems_semaphore_delete */
-
-  Timer_initialize();
-    (void) rtems_semaphore_delete( smid );
-  end_time = Read_timer();
-  put_time(
-    "rtems_semaphore_delete",
-    end_time,
-    1,
-    0,
-    CALLING_OVERHEAD_SEMAPHORE_CREATE
-  );
-
-  status = rtems_semaphore_create(
-    name,
-    OPERATION_COUNT,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    RTEMS_NO_PRIORITY,
-    &smid
-  );
-
-  for ( iterations=OPERATION_COUNT ; iterations ; iterations-- ) {
-
-    Timer_initialize();
-      for ( index = 1 ; index<=OPERATION_COUNT ; index++ )
-        (void) Empty_function();
-    end_time = Read_timer();
-
-    semaphore_obtain_loop_time  += end_time;
-    semaphore_release_loop_time += end_time;
-
-    /* rtems_semaphore_obtain (available) */
-
-    Timer_initialize();
-      for ( index = 1 ; index<=OPERATION_COUNT ; index++ )
-        (void) rtems_semaphore_obtain(
-          smid,
-          RTEMS_DEFAULT_OPTIONS,
-          RTEMS_NO_TIMEOUT
-        );
-    end_time = Read_timer();
-
-    semaphore_obtain_time += end_time;
-
-    /* rtems_semaphore_release */
-
-    Timer_initialize();
-      for ( index = 1 ; index<=OPERATION_COUNT ; index++ )
-        (void) rtems_semaphore_release( smid );
-    end_time = Read_timer();
-
-    semaphore_release_time += end_time;
-
-    /* semaphore obtain (RTEMS_NO_WAIT) */
-    Timer_initialize();
-      for ( index = 1 ; index<=OPERATION_COUNT ; index++ )
-        rtems_semaphore_obtain( smid, RTEMS_NO_WAIT, RTEMS_NO_TIMEOUT );
-    semaphore_obtain_no_wait_time += Read_timer();
-
-    Timer_initialize();
-      for ( index = 1 ; index<=OPERATION_COUNT ; index++ )
-        rtems_semaphore_release( smid );
-    end_time = Read_timer();
-
-    semaphore_release_time += end_time;
-  }
-
-  put_time(
-    "rtems_semaphore_obtain: available",
-    semaphore_obtain_time,
-    OPERATION_COUNT * OPERATION_COUNT,
-    semaphore_obtain_loop_time,
-    CALLING_OVERHEAD_SEMAPHORE_OBTAIN
-  );
-
-  put_time(
-    "rtems_semaphore_obtain: not available -- NO_WAIT",
-    semaphore_obtain_no_wait_time,
-    OPERATION_COUNT * OPERATION_COUNT,
-    semaphore_obtain_loop_time,
-    CALLING_OVERHEAD_SEMAPHORE_OBTAIN
-  );
-
-  put_time(
-    "rtems_semaphore_release: no waiting tasks",
-    semaphore_release_time,
-    OPERATION_COUNT * OPERATION_COUNT * 2,
-    semaphore_release_loop_time * 2,
-    CALLING_OVERHEAD_SEMAPHORE_RELEASE
-  );
-
-  puts( "*** END OF TEST 1 ***" );
-  exit( 0 );
-}
diff --git a/testsuites/tmtests/tm01/tm01.doc b/testsuites/tmtests/tm01/tm01.doc
deleted file mode 100644
index 496f3569e5..0000000000
--- a/testsuites/tmtests/tm01/tm01.doc
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
diff --git a/testsuites/tmtests/tm02/system.h b/testsuites/tmtests/tm02/system.h
deleted file mode 100644
index 2fd0f720d0..0000000000
--- a/testsuites/tmtests/tm02/system.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*  system.h
- *
- *  This include file is used by all tests in the Time Suite.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-#include <coverhd.h>
-#include <tmacros.h>
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
-
-#include <timesys.h>
-
-/* configuration information */
- 
-#define CONFIGURE_TMTEST
- 
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
-
-#define CONFIGURE_MAXIMUM_TASKS              111
-#define CONFIGURE_MAXIMUM_TIMERS             110
-#define CONFIGURE_MAXIMUM_SEMAPHORES         101
-#define CONFIGURE_TICKS_PER_TIMESLICE        0
- 
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/testsuites/tmtests/tm02/task1.c b/testsuites/tmtests/tm02/task1.c
deleted file mode 100644
index cd7d73e78d..0000000000
--- a/testsuites/tmtests/tm02/task1.c
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "system.h"
-
-rtems_id High_id;
-rtems_id Low_id;
-rtems_id Semaphore_id;
-
-rtems_task High_task(
-  rtems_task_argument argument
-);
-
-rtems_task Middle_tasks(
-  rtems_task_argument argument
-);
-
-rtems_task Low_task(
-  rtems_task_argument argument
-);
-
-
-void test_init();
-
-rtems_task Init(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-
-  Print_Warning();
-
-  puts( "\n\n*** TIME TEST 2 ***" );
-
-  test_init();
-
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete" );
-}
-
-void test_init()
-{
-  rtems_status_code   status;
-  rtems_unsigned32    index;
-  rtems_task_priority priority;
-
-  priority = 5;
-
-  status = rtems_task_create(
-    rtems_build_name( 'H', 'I', 'G', 'H' ),
-    priority,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &High_id
-  );
-  directive_failed( status, "rtems_task_create of high task" );
-
-  priority++;
-
-  status = rtems_task_start( High_id, High_task, 0 );
-  directive_failed( status, "rtems_task_start of high task" );
-
-  for ( index=2 ; index <= OPERATION_COUNT ; index++ ) {
-    status = rtems_task_create(
-      rtems_build_name( 'M', 'I', 'D', ' ' ),
-      priority,
-      RTEMS_MINIMUM_STACK_SIZE,
-      RTEMS_DEFAULT_MODES,
-      RTEMS_DEFAULT_ATTRIBUTES,
-      &Low_id
-    );
-    directive_failed( status, "rtems_task_create middle" );
-
-    priority++;
-
-    status = rtems_task_start( Low_id, Middle_tasks, 0 );
-    directive_failed( status, "rtems_task_start middle" );
-  }
-
-  status = rtems_task_create(
-    rtems_build_name( 'L', 'O', 'W', ' ' ),
-    priority,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Low_id
-  );
-  directive_failed( status, "rtems_task_create low" );
-
-  status = rtems_task_start( Low_id, Low_task, 0 );
-  directive_failed( status, "rtems_task_start low" );
-
-  status = rtems_semaphore_create(
-    rtems_build_name( 'S', 'M', '1', ' '),
-    0,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    RTEMS_NO_PRIORITY,
-    &Semaphore_id
-  );
-  directive_failed( status, "rtems_semaphore_create of SM1" );
-}
-
-rtems_task High_task(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-
-  Timer_initialize();           /* start blocking rtems_semaphore_obtain time */
-  status = rtems_semaphore_obtain(
-    Semaphore_id,
-    RTEMS_DEFAULT_OPTIONS,
-    RTEMS_NO_TIMEOUT
-  );
-}
-
-rtems_task Middle_tasks(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-
-  status = rtems_semaphore_obtain(
-    Semaphore_id,
-    RTEMS_DEFAULT_OPTIONS,
-    RTEMS_NO_TIMEOUT
-  );
-}
-
-rtems_task Low_task(
-  rtems_task_argument argument
-)
-{
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_semaphore_obtain: not available -- caller blocks",
-    end_time,
-    OPERATION_COUNT,
-    0,
-    CALLING_OVERHEAD_SEMAPHORE_OBTAIN
-  );
-
-  puts( "*** END OF TEST 2 ***" );
-  exit( 0 );
-}
diff --git a/testsuites/tmtests/tm02/tm02.doc b/testsuites/tmtests/tm02/tm02.doc
deleted file mode 100644
index 496f3569e5..0000000000
--- a/testsuites/tmtests/tm02/tm02.doc
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
diff --git a/testsuites/tmtests/tm03/system.h b/testsuites/tmtests/tm03/system.h
deleted file mode 100644
index 2fd0f720d0..0000000000
--- a/testsuites/tmtests/tm03/system.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*  system.h
- *
- *  This include file is used by all tests in the Time Suite.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-#include <coverhd.h>
-#include <tmacros.h>
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
-
-#include <timesys.h>
-
-/* configuration information */
- 
-#define CONFIGURE_TMTEST
- 
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
-
-#define CONFIGURE_MAXIMUM_TASKS              111
-#define CONFIGURE_MAXIMUM_TIMERS             110
-#define CONFIGURE_MAXIMUM_SEMAPHORES         101
-#define CONFIGURE_TICKS_PER_TIMESLICE        0
- 
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/testsuites/tmtests/tm03/task1.c b/testsuites/tmtests/tm03/task1.c
deleted file mode 100644
index 0b6d8e6263..0000000000
--- a/testsuites/tmtests/tm03/task1.c
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "system.h"
-
-rtems_id Semaphore_id;
-rtems_task test_init(
-  rtems_task_argument argument
-);
-
-rtems_task Middle_tasks(
-  rtems_task_argument argument
-);
-
-rtems_task High_task(
-  rtems_task_argument argument
-);
-
-
-rtems_task Init(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-  rtems_id          task_id;
-
-  Print_Warning();
-
-  puts( "\n\n*** TIME TEST 3 ***" );
-  status = rtems_task_create(
-    rtems_build_name( 'T', 'A', '1', ' ' ),
-    252,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &task_id
-  );
-  directive_failed( status, "rtems_task_create of test_init" );
-
-  status = rtems_task_start( task_id, test_init, 0 );
-  directive_failed( status, "rtems_task_start of test_init" );
-
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-}
-
-rtems_task test_init(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code   status;
-  rtems_unsigned32    index;
-  rtems_id            task_id;
-  rtems_task_priority priority;
-
-  priority = 250;
-
-  status = rtems_semaphore_create(
-    rtems_build_name( 'S', 'M', '1', '\0'),
-    0,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    RTEMS_NO_PRIORITY,
-    &Semaphore_id
-  );
-  directive_failed( status, "rtems_semaphore_create of SM1" );
-
-  for ( index = 2 ; index <= OPERATION_COUNT ; index ++ ) {
-    rtems_task_create(
-      rtems_build_name( 'M', 'I', 'D', ' ' ),
-      priority,
-      RTEMS_MINIMUM_STACK_SIZE,
-      RTEMS_DEFAULT_MODES,
-      RTEMS_DEFAULT_ATTRIBUTES,
-      &task_id
-    );
-    directive_failed( status, "rtems_task_create middle" );
-
-    priority--;
-
-    rtems_task_start( task_id, Middle_tasks, 0 );
-    directive_failed( status, "rtems_task_start middle" );
-  }
-
-  status = rtems_task_create(
-    rtems_build_name( 'H', 'I', 'G', 'H' ),
-    priority,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &task_id
-  );
-  directive_failed( status, "rtems_task_create of high task" );
-
-  status = rtems_task_start( task_id, High_task, 0 );
-  directive_failed( status, "rtems_task_start of high task" );
-
-  Timer_initialize();                          /* start the timer */
-  status = rtems_semaphore_release( Semaphore_id );
-}
-
-rtems_task Middle_tasks(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-
-  status = rtems_semaphore_obtain(
-    Semaphore_id,
-    RTEMS_DEFAULT_OPTIONS,
-    RTEMS_NO_TIMEOUT
-  );
-
-  status = rtems_semaphore_release( Semaphore_id );
-}
-
-rtems_task High_task(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-
-  status = rtems_semaphore_obtain(
-    Semaphore_id,
-    RTEMS_DEFAULT_OPTIONS,
-    RTEMS_NO_TIMEOUT
-  );
-
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_semaphore_release: task readied -- preempts caller",
-    end_time,
-    OPERATION_COUNT,
-    0,
-    CALLING_OVERHEAD_SEMAPHORE_RELEASE
-  );
-
-  puts( "*** END OF TEST 3 ***" );
-  exit( 0 );
-}
diff --git a/testsuites/tmtests/tm03/tm03.doc b/testsuites/tmtests/tm03/tm03.doc
deleted file mode 100644
index 496f3569e5..0000000000
--- a/testsuites/tmtests/tm03/tm03.doc
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
diff --git a/testsuites/tmtests/tm04/system.h b/testsuites/tmtests/tm04/system.h
deleted file mode 100644
index a31ee198f7..0000000000
--- a/testsuites/tmtests/tm04/system.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*  system.h
- *
- *  This include file is used by all tests in the Time Suite.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-#include <coverhd.h>
-#include <tmacros.h>
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
-
-#include <timesys.h>
-
-/* configuration information */
- 
-#define CONFIGURE_TMTEST
- 
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
-
-#define CONFIGURE_MAXIMUM_TASKS              111
-#define CONFIGURE_MAXIMUM_SEMAPHORES         1
-#define CONFIGURE_TICKS_PER_TIMESLICE        0
- 
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/testsuites/tmtests/tm04/task1.c b/testsuites/tmtests/tm04/task1.c
deleted file mode 100644
index 2ba3932016..0000000000
--- a/testsuites/tmtests/tm04/task1.c
+++ /dev/null
@@ -1,388 +0,0 @@
-/*
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "system.h"
-
-rtems_id         Semaphore_id;
-rtems_id         Task_id[OPERATION_COUNT+1];
-rtems_unsigned32 task_count;
-rtems_id         Highest_id;
-
-rtems_task Low_tasks(
-  rtems_task_argument argument
-);
-
-rtems_task High_task(
-  rtems_task_argument argument
-);
-
-rtems_task Restart_task(
-  rtems_task_argument argument
-);
-
-void test_init();
-
-rtems_task Init(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-
-  Print_Warning();
-
-  puts( "\n\n*** TIME TEST 4 ***" );
-
-  test_init();
-
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-}
-
-void test_init()
-{
-  rtems_status_code status;
-  rtems_unsigned32  index;
-
-  task_count = OPERATION_COUNT;
-
-  for ( index = 1 ; index <= OPERATION_COUNT ; index++ ) {
-
-    status = rtems_task_create(
-      rtems_build_name( 'T', 'I', 'M', 'E' ),
-      10,
-      RTEMS_MINIMUM_STACK_SIZE,
-      RTEMS_NO_PREEMPT,
-      RTEMS_DEFAULT_ATTRIBUTES,
-      &Task_id[ index ]
-    );
-    directive_failed( status, "rtems_task_create loop" );
-
-    status = rtems_task_start( Task_id[ index ], Low_tasks, 0 );
-    directive_failed( status, "rtems_task_start loop" );
-  }
-
-  status = rtems_semaphore_create(
-    rtems_build_name( 'S', 'M', '1', ' ' ),
-    0,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    RTEMS_NO_PRIORITY,
-    &Semaphore_id
-  );
-  directive_failed( status, "rtems_semaphore_create of SM1" );
-}
-
-rtems_task Highest_task(
-  rtems_task_argument argument
-)
-{
-  rtems_task_priority old_priority;
-  rtems_status_code   status;
-
-  if ( argument == 1 ) {
-
-    end_time = Read_timer();
-
-    put_time(
-      "rtems_task_restart: blocked task -- preempts caller",
-      end_time,
-      1,
-      0,
-      CALLING_OVERHEAD_TASK_RESTART
-    );
-
-    status = rtems_task_set_priority(
-      RTEMS_CURRENT_PRIORITY,
-      254,
-      &old_priority
-    );
-    directive_failed( status, "rtems_task_set_priority" );
-
- } else if ( argument == 2 ) {
-
-  end_time = Read_timer();
-
-    put_time(
-      "rtems_task_restart: ready task -- preempts caller",
-      end_time,
-      1,
-      0,
-      CALLING_OVERHEAD_TASK_RESTART
-    );
-
-    status = rtems_task_delete( RTEMS_SELF );
-    directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-
-  } else
-    (void) rtems_semaphore_obtain(
-      Semaphore_id,
-      RTEMS_DEFAULT_OPTIONS,
-      RTEMS_NO_TIMEOUT
-    );
-
-}
-
-rtems_task High_task(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code   status;
-  rtems_unsigned32    index;
-  rtems_name          name;
-  rtems_task_priority old_priority;
-
-  Timer_initialize();
-    (void) rtems_task_restart( Highest_id, 1 );
-  /* preempted by Higher_task */
-
-  Timer_initialize();
-    (void) rtems_task_restart( Highest_id, 2 );
-  /* preempted by Higher_task */
-
-  Timer_initialize();
-    for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) Empty_function();
-  overhead = Read_timer();
-
-  Timer_initialize();
-    for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      rtems_semaphore_release( Semaphore_id );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_semaphore_release: task readied -- returns to caller",
-    end_time,
-    OPERATION_COUNT,
-    0,
-    CALLING_OVERHEAD_SEMAPHORE_RELEASE
-  );
-
-  name = rtems_build_name( 'T', 'I', 'M', 'E' );
-
-  for ( index=1 ; index <= OPERATION_COUNT ; index++ ) {
-    status = rtems_task_delete( Task_id[index] );
-    directive_failed( status, "rtems_task_delete" );
-  }
-
-  Timer_initialize();
-    for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-     rtems_task_create(
-        name,
-        10,
-        RTEMS_MINIMUM_STACK_SIZE,
-        RTEMS_NO_PREEMPT,
-        RTEMS_DEFAULT_ATTRIBUTES,
-        &Task_id[ index ]
-      );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_task_create",
-    end_time,
-    OPERATION_COUNT,
-    overhead,
-    CALLING_OVERHEAD_TASK_CREATE
-  );
-
-  Timer_initialize();
-    for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      rtems_task_start( Task_id[ index ], Low_tasks, 0 );
-
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_task_start",
-    end_time,
-    OPERATION_COUNT,
-    overhead,
-    CALLING_OVERHEAD_TASK_START
-  );
-
-  for ( index=1 ; index <= OPERATION_COUNT ; index++ ) {
-    status = rtems_task_delete( Task_id[ index ] );
-    directive_failed( status, "rtems_task_delete" );
-  }
-
-  for ( index=1 ; index <= OPERATION_COUNT ; index++ ) {
-    status = rtems_task_create(
-      name,
-      250,
-      RTEMS_MINIMUM_STACK_SIZE,
-      RTEMS_NO_PREEMPT,
-      RTEMS_DEFAULT_ATTRIBUTES,
-      &Task_id[ index ]
-    );
-    directive_failed( status, "rtems_task_create LOOP" );
-
-    status = rtems_task_start( Task_id[ index ], Restart_task, 0 );
-    directive_failed( status, "rtems_task_start LOOP" );
-
-    status = rtems_task_suspend( Task_id[ index ] );
-    directive_failed( status, "rtems_task_suspend LOOP" );
-  }
-
-  Timer_initialize();
-    for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) rtems_task_restart( Task_id[ index ], 0 );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_task_restart: suspended task -- returns to caller",
-    end_time,
-    OPERATION_COUNT,
-    overhead,
-    CALLING_OVERHEAD_TASK_RESTART
-  );
-
-  for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-    (void) rtems_task_suspend( Task_id[ index ] );
-
-  Timer_initialize();
-    for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) rtems_task_delete( Task_id[ index ] );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_task_delete: suspended task",
-    end_time,
-    OPERATION_COUNT,
-    overhead,
-    CALLING_OVERHEAD_TASK_DELETE
-  );
-
-  for ( index=1 ; index <= OPERATION_COUNT ; index++ ) {
-    status = rtems_task_create(
-      name,
-      250,
-      RTEMS_MINIMUM_STACK_SIZE,
-      RTEMS_DEFAULT_MODES,
-      RTEMS_DEFAULT_ATTRIBUTES,
-      &Task_id[ index ]
-    );
-    directive_failed( status, "rtems_task_create LOOP" );
-
-    status = rtems_task_start( Task_id[ index ], Restart_task, 0 );
-    directive_failed( status, "rtems_task_start LOOP" );
-  }
-
-  Timer_initialize();
-    for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) rtems_task_restart( Task_id[ index ], 1 );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_task_restart: ready task -- returns to caller",
-    end_time,
-    OPERATION_COUNT,
-    overhead,
-    CALLING_OVERHEAD_TASK_RESTART
-  );
-
-  for ( index=1 ; index <= OPERATION_COUNT ; index++ ) {
-    status = rtems_task_set_priority( Task_id[ index ], 5, &old_priority );
-    directive_failed( status, "rtems_task_set_priority loop" );
-  }
-
-  /* yield processor -- tasks block */
-  status = rtems_task_wake_after( RTEMS_YIELD_PROCESSOR );
-  directive_failed( status, "rtems_task_wake_after" );
-
-  Timer_initialize();
-    for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) rtems_task_restart( Task_id[ index ], 1 );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_task_restart: blocked task -- returns to caller",
-    end_time,
-    OPERATION_COUNT,
-    overhead,
-    CALLING_OVERHEAD_TASK_RESTART
-  );
-
-  /* yield processor -- tasks block */
-  status = rtems_task_wake_after( RTEMS_YIELD_PROCESSOR );
-  directive_failed( status, "rtems_task_wake_after" );
-
-  Timer_initialize();
-    for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) rtems_task_delete( Task_id[ index ] );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_task_delete: blocked task",
-    end_time,
-    OPERATION_COUNT,
-    overhead,
-    CALLING_OVERHEAD_TASK_DELETE
-  );
-
-  puts( "*** END OF TEST 4 ***" );
-  exit( 0 );
-}
-
-rtems_task Low_tasks(
-  rtems_task_argument argument
-)
-{
-  rtems_id          id;
-  rtems_status_code status;
-
-  task_count--;
-
-  if ( task_count == 0 ) {
-    status = rtems_task_create(
-      rtems_build_name( 'H', 'I', ' ', ' ' ),
-      5,
-      RTEMS_MINIMUM_STACK_SIZE,
-      RTEMS_DEFAULT_MODES,
-      RTEMS_DEFAULT_ATTRIBUTES,
-      &id
-    );
-    directive_failed( status, "rtems_task_create HI" );
-
-    status = rtems_task_start( id, High_task, 0 );
-    directive_failed( status, "rtems_task_start HI" );
-
-    status = rtems_task_create(
-      rtems_build_name( 'H', 'I', 'G', 'H' ),
-      3,
-      RTEMS_MINIMUM_STACK_SIZE,
-      RTEMS_DEFAULT_MODES,
-      RTEMS_DEFAULT_ATTRIBUTES,
-      &Highest_id
-    );
-    directive_failed( status, "rtems_task_create HIGH" );
-
-    status = rtems_task_start( Highest_id, Highest_task, 0 );
-    directive_failed( status, "rtems_task_start HIGH" );
-
-  }
-  (void) rtems_semaphore_obtain(
-    Semaphore_id,
-    RTEMS_DEFAULT_OPTIONS,
-    RTEMS_NO_TIMEOUT
-  );
-}
-
-rtems_task Restart_task(
-  rtems_task_argument argument
-)
-{
-  if ( argument == 1 )
-    (void) rtems_semaphore_obtain(
-      Semaphore_id,
-      RTEMS_DEFAULT_OPTIONS,
-      RTEMS_NO_TIMEOUT
-    );
-}
diff --git a/testsuites/tmtests/tm04/tm04.doc b/testsuites/tmtests/tm04/tm04.doc
deleted file mode 100644
index 496f3569e5..0000000000
--- a/testsuites/tmtests/tm04/tm04.doc
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
diff --git a/testsuites/tmtests/tm05/system.h b/testsuites/tmtests/tm05/system.h
deleted file mode 100644
index 2fd0f720d0..0000000000
--- a/testsuites/tmtests/tm05/system.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*  system.h
- *
- *  This include file is used by all tests in the Time Suite.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-#include <coverhd.h>
-#include <tmacros.h>
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
-
-#include <timesys.h>
-
-/* configuration information */
- 
-#define CONFIGURE_TMTEST
- 
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
-
-#define CONFIGURE_MAXIMUM_TASKS              111
-#define CONFIGURE_MAXIMUM_TIMERS             110
-#define CONFIGURE_MAXIMUM_SEMAPHORES         101
-#define CONFIGURE_TICKS_PER_TIMESLICE        0
- 
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/testsuites/tmtests/tm05/task1.c b/testsuites/tmtests/tm05/task1.c
deleted file mode 100644
index 959bab006a..0000000000
--- a/testsuites/tmtests/tm05/task1.c
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "system.h"
-
-rtems_id         Task_id[OPERATION_COUNT+1];
-rtems_unsigned32 Task_index;
-
-rtems_task High_task(
-  rtems_task_argument argument
-);
-
-rtems_task Middle_tasks(
-  rtems_task_argument argument
-);
-
-rtems_task Low_task(
-  rtems_task_argument argument
-);
-
-void test_init();
-
-rtems_task Init(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-
-  Print_Warning();
-
-  puts( "\n\n*** TIME TEST 5 ***" );
-
-  test_init();
-
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-}
-
-void test_init()
-{
-  rtems_status_code   status;
-  rtems_task_entry    task_entry;
-  rtems_task_priority priority;
-  rtems_unsigned32    index;
-
-  priority = 250;
-
-  for( index = 0; index <= OPERATION_COUNT ; index++ ) {
-
-    status = rtems_task_create(
-      rtems_build_name( 'T', 'I', 'M', 'E' ),
-      priority,
-      RTEMS_MINIMUM_STACK_SIZE,
-      RTEMS_DEFAULT_MODES,
-      RTEMS_DEFAULT_ATTRIBUTES,
-      &Task_id[ index ]
-    );
-    directive_failed( status, "rtems_task_create loop" );
-
-    priority--;
-
-    if ( index==0 )                    task_entry = Low_task;
-    else if ( index==OPERATION_COUNT ) task_entry = High_task;
-    else                               task_entry = Middle_tasks;
-
-    status = rtems_task_start( Task_id[ index ], task_entry, 0 );
-    directive_failed( status, "rtems_task_start loop" );
-  }
-}
-
-rtems_task High_task(
-  rtems_task_argument argument
-)
-{
-  Timer_initialize();
-
-  (void) rtems_task_suspend( RTEMS_SELF );
-
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_task_resume: task readied -- preempts caller",
-    end_time,
-    OPERATION_COUNT,
-    0,
-    CALLING_OVERHEAD_TASK_RESUME
-  );
-
-  puts( "*** END OF TEST 5 ***" );
-  exit( 0 );
-}
-
-rtems_task Middle_tasks(
-  rtems_task_argument argument
-)
-{
-  (void) rtems_task_suspend( RTEMS_SELF );
-
-  Task_index++;
-  (void) rtems_task_resume( Task_id[ Task_index ] );
-}
-
-rtems_task Low_task(
-  rtems_task_argument argument
-)
-{
-
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_task_suspend: calling task",
-    end_time,
-    OPERATION_COUNT,
-    0,
-    CALLING_OVERHEAD_TASK_SUSPEND
-  );
-
-  Task_index = 1;
-  Timer_initialize();
-  (void) rtems_task_resume( Task_id[ Task_index ] );
-}
diff --git a/testsuites/tmtests/tm05/tm05.doc b/testsuites/tmtests/tm05/tm05.doc
deleted file mode 100644
index 496f3569e5..0000000000
--- a/testsuites/tmtests/tm05/tm05.doc
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
diff --git a/testsuites/tmtests/tm06/system.h b/testsuites/tmtests/tm06/system.h
deleted file mode 100644
index 2fd0f720d0..0000000000
--- a/testsuites/tmtests/tm06/system.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*  system.h
- *
- *  This include file is used by all tests in the Time Suite.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-#include <coverhd.h>
-#include <tmacros.h>
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
-
-#include <timesys.h>
-
-/* configuration information */
- 
-#define CONFIGURE_TMTEST
- 
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
-
-#define CONFIGURE_MAXIMUM_TASKS              111
-#define CONFIGURE_MAXIMUM_TIMERS             110
-#define CONFIGURE_MAXIMUM_SEMAPHORES         101
-#define CONFIGURE_TICKS_PER_TIMESLICE        0
- 
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/testsuites/tmtests/tm06/task1.c b/testsuites/tmtests/tm06/task1.c
deleted file mode 100644
index 7b0a31efe9..0000000000
--- a/testsuites/tmtests/tm06/task1.c
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "system.h"
-
-rtems_id Task_id[ OPERATION_COUNT + 1 ];
-
-rtems_unsigned32 Task_restarted;
-
-rtems_task null_task(
-  rtems_task_argument argument
-);
-
-rtems_task Task_1(
-  rtems_task_argument argument
-);
-
-void test_init( void );
-
-rtems_task Init(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-
-  Print_Warning();
-
-  puts( "\n\n*** TIME TEST 6 ***" );
-
-  test_init();
-
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-}
-
-void test_init( void )
-{
-  rtems_status_code status;
-  rtems_id id;
-
-  Task_restarted = OPERATION_COUNT;
-
-  status = rtems_task_create(
-    rtems_build_name( 'T', 'I', 'M', 'E' ),
-    128,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &id
-  );
-  directive_failed( status, "rtems_task_create" );
-
-  status = rtems_task_start( id, Task_1, 0 );
-  directive_failed( status, "rtems_task_start" );
-}
-
-rtems_task Task_1(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-  rtems_unsigned32  index;
-
-  if ( Task_restarted == OPERATION_COUNT )
-     Timer_initialize();
-
-  Task_restarted--;
-
-  if ( Task_restarted != 0 )
-    (void) rtems_task_restart( RTEMS_SELF, 0 );
-
-  end_time = Read_timer();
-
-  Timer_initialize();
-    for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) Empty_function();
-  overhead = Read_timer();
-
-  put_time(
-    "rtems_task_restart: calling task",
-    end_time,
-    OPERATION_COUNT,
-    overhead,
-    CALLING_OVERHEAD_TASK_RESTART
-  );
-
-  for ( index=1 ; index <= OPERATION_COUNT ; index++ ) {
-    status = rtems_task_create(
-      rtems_build_name( 'T', 'I', 'M', 'E' ),
-      254,
-      RTEMS_MINIMUM_STACK_SIZE,
-      RTEMS_DEFAULT_MODES,
-      RTEMS_DEFAULT_ATTRIBUTES,
-      &Task_id[ index ]
-    );
-    directive_failed( status, "rtems_task_create loop" );
-
-    status = rtems_task_start( Task_id[ index ], null_task, 0 );
-    directive_failed( status, "rtems_task_start loop" );
-  }
-
-  Timer_initialize();
-    for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) rtems_task_suspend( Task_id[ index ] );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_task_suspend: returns to caller",
-    end_time,
-    OPERATION_COUNT,
-    0,
-    CALLING_OVERHEAD_TASK_SUSPEND
-  );
-
-  Timer_initialize();
-    for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) rtems_task_resume( Task_id[ index ] );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_task_resume: task readied -- returns to caller",
-    end_time,
-    OPERATION_COUNT,
-    0,
-    CALLING_OVERHEAD_TASK_RESUME
-  );
-
-  Timer_initialize();
-    for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) rtems_task_delete( Task_id[ index ] );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_task_delete: ready task",
-    end_time,
-    OPERATION_COUNT,
-    0,
-    CALLING_OVERHEAD_TASK_RESUME
-  );
-
-  puts( "*** END OF TEST 6 ***" );
-  exit( 0 );
-}
-
-rtems_task null_task(
-  rtems_task_argument argument
-)
-{
-  while ( FOREVER )
-    ;
-}
diff --git a/testsuites/tmtests/tm06/tm06.doc b/testsuites/tmtests/tm06/tm06.doc
deleted file mode 100644
index 496f3569e5..0000000000
--- a/testsuites/tmtests/tm06/tm06.doc
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
diff --git a/testsuites/tmtests/tm07/system.h b/testsuites/tmtests/tm07/system.h
deleted file mode 100644
index 2fd0f720d0..0000000000
--- a/testsuites/tmtests/tm07/system.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*  system.h
- *
- *  This include file is used by all tests in the Time Suite.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-#include <coverhd.h>
-#include <tmacros.h>
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
-
-#include <timesys.h>
-
-/* configuration information */
- 
-#define CONFIGURE_TMTEST
- 
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
-
-#define CONFIGURE_MAXIMUM_TASKS              111
-#define CONFIGURE_MAXIMUM_TIMERS             110
-#define CONFIGURE_MAXIMUM_SEMAPHORES         101
-#define CONFIGURE_TICKS_PER_TIMESLICE        0
- 
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/testsuites/tmtests/tm07/task1.c b/testsuites/tmtests/tm07/task1.c
deleted file mode 100644
index 09380a67c2..0000000000
--- a/testsuites/tmtests/tm07/task1.c
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "system.h"
-
-rtems_id Task_id[ OPERATION_COUNT+1 ], task_index;
-
-rtems_task High_task(
-  rtems_task_argument argument
-);
-
-rtems_task Middle_tasks(
-  rtems_task_argument argument
-);
-
-rtems_task Low_task(
-  rtems_task_argument argument
-);
-
-void test_init();
-
-rtems_task Init(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-
-  Print_Warning();
-
-  puts( "\n\n*** TIME TEST 7 ***" );
-
-  test_init();
-
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-}
-
-void test_init()
-{
-  rtems_status_code   status;
-  rtems_task_priority priority;
-  rtems_task_entry    task_entry;
-  rtems_unsigned32    index;
-
-  priority = 250;
-
-  for( index=0 ; index <= OPERATION_COUNT ; index++ ) {
-    status = rtems_task_create(
-      rtems_build_name( 'T', 'I', 'M', 'E' ),
-      priority,
-      RTEMS_MINIMUM_STACK_SIZE,
-      RTEMS_DEFAULT_MODES,
-      RTEMS_DEFAULT_ATTRIBUTES,
-      &Task_id[index]
-    );
-    directive_failed( status, "rtems_task_create" );
-    priority--;
-
-    if      ( index == 0 )               task_entry = Low_task;
-    else if ( index == OPERATION_COUNT ) task_entry = High_task;
-    else                                 task_entry = Middle_tasks;
-
-    status = rtems_task_start( Task_id[index], task_entry, 0 );
-    directive_failed( status, "rtems_task_start" );
-  }
-}
-
-rtems_task High_task(
-  rtems_task_argument argument
-)
-{
-  if ( argument != 0 ) {
-    end_time = Read_timer();
-
-    put_time(
-      "rtems_task_restart: suspended task -- preempts caller",
-      end_time,
-      OPERATION_COUNT,
-      0,
-      CALLING_OVERHEAD_TASK_RESTART
-    );
-  } else
-    (void) rtems_task_suspend( RTEMS_SELF );
-
-  puts( "*** END OF TEST 7 ***" );
-  exit( 0 );
-}
-
-rtems_task Middle_tasks(
-  rtems_task_argument argument
-)
-{
-  task_index++;
-
-  if ( argument != 0 )
-    (void) rtems_task_restart( Task_id[ task_index ], 0xffffffff );
-  else
-    (void) rtems_task_suspend( RTEMS_SELF );
-}
-
-rtems_task Low_task(
-  rtems_task_argument argument
-)
-{
-  task_index = 1;
-
-  Timer_initialize();
-  (void) rtems_task_restart( Task_id[ task_index ], 0xffffffff );
-}
diff --git a/testsuites/tmtests/tm07/tm07.doc b/testsuites/tmtests/tm07/tm07.doc
deleted file mode 100644
index 496f3569e5..0000000000
--- a/testsuites/tmtests/tm07/tm07.doc
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
diff --git a/testsuites/tmtests/tm08/system.h b/testsuites/tmtests/tm08/system.h
deleted file mode 100644
index 2fd0f720d0..0000000000
--- a/testsuites/tmtests/tm08/system.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*  system.h
- *
- *  This include file is used by all tests in the Time Suite.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-#include <coverhd.h>
-#include <tmacros.h>
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
-
-#include <timesys.h>
-
-/* configuration information */
- 
-#define CONFIGURE_TMTEST
- 
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
-
-#define CONFIGURE_MAXIMUM_TASKS              111
-#define CONFIGURE_MAXIMUM_TIMERS             110
-#define CONFIGURE_MAXIMUM_SEMAPHORES         101
-#define CONFIGURE_TICKS_PER_TIMESLICE        0
- 
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/testsuites/tmtests/tm08/task1.c b/testsuites/tmtests/tm08/task1.c
deleted file mode 100644
index e2527797ba..0000000000
--- a/testsuites/tmtests/tm08/task1.c
+++ /dev/null
@@ -1,255 +0,0 @@
-/*
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "system.h"
-
-rtems_id Test_task_id;
-
-rtems_task test_task(
-  rtems_task_argument argument
-);
-rtems_task test_task1(
-  rtems_task_argument argument
-);
-void test_init();
-
-rtems_task Init(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-
-  Print_Warning();
-
-  puts( "\n\n*** TIME TEST 8 ***" );
-
-  test_init();
-
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-}
-
-void test_init()
-{
-  rtems_status_code status;
-
-  status = rtems_task_create(
-    1,
-    128,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Test_task_id
-  );
-  directive_failed( status, "rtems_task_create" );
-
-  status = rtems_task_start( Test_task_id, test_task, 0 );
-  directive_failed( status, "rtems_task_start" );
-
-  status = rtems_task_create(
-    1,
-    254,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Test_task_id
-  );
-  directive_failed( status, "rtems_task_create" );
-
-  status = rtems_task_start( Test_task_id, test_task1, 0 );
-  directive_failed( status, "rtems_task_start" );
-}
-
-rtems_task test_task(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code   status;
-  rtems_unsigned32    index;
-  rtems_task_priority old_priority;
-  rtems_time_of_day   time;
-  rtems_unsigned32    old_note;
-  rtems_unsigned32    old_mode;
-
-  Timer_initialize();
-    for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) Empty_function();
-  overhead = Read_timer();
-
-  Timer_initialize();
-    for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) rtems_task_set_priority(
-               Test_task_id,
-               RTEMS_CURRENT_PRIORITY,
-               &old_priority
-             );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_task_set_priority: obtain current priority",
-    end_time,
-    OPERATION_COUNT,
-    overhead,
-    CALLING_OVERHEAD_TASK_SET_PRIORITY
-  );
-
-  Timer_initialize();
-    for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) rtems_task_set_priority( Test_task_id, 253, &old_priority );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_task_set_priority: returns to caller",
-    end_time,
-    OPERATION_COUNT,
-    overhead,
-    CALLING_OVERHEAD_TASK_SET_PRIORITY
-  );
-
-  Timer_initialize();
-    for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) rtems_task_mode(
-        RTEMS_CURRENT_MODE,
-        RTEMS_CURRENT_MODE,
-        &old_mode
-      );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_task_mode: obtain current mode",
-    end_time,
-    OPERATION_COUNT,
-    overhead,
-    CALLING_OVERHEAD_TASK_MODE
-  );
-
-  Timer_initialize();
-    for ( index=1 ; index <= OPERATION_COUNT ; index++ ) {
-      (void) rtems_task_mode(
-        RTEMS_INTERRUPT_LEVEL(1),
-        RTEMS_INTERRUPT_MASK,
-        &old_mode
-      );
-      (void) rtems_task_mode(
-        RTEMS_INTERRUPT_LEVEL(0),
-        RTEMS_INTERRUPT_MASK,
-        &old_mode
-      );
-    }
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_task_mode: no reschedule",
-    end_time,
-    OPERATION_COUNT * 2,
-    overhead,
-    CALLING_OVERHEAD_TASK_MODE
-  );
-
-  Timer_initialize();                 /* must be one host */
-    (void) rtems_task_mode( RTEMS_NO_ASR, RTEMS_ASR_MASK, &old_mode );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_task_mode: reschedule -- returns to caller",
-    end_time,
-    1,
-    0,
-    CALLING_OVERHEAD_TASK_MODE
-  );
-
-  status = rtems_task_mode( RTEMS_NO_PREEMPT, RTEMS_PREEMPT_MASK, &old_mode );
-  directive_failed( status, "rtems_task_mode" );
-
-  status = rtems_task_set_priority( Test_task_id, 1, &old_priority );
-  directive_failed( status, "rtems_task_set_priority" );
-
-  /* preempted by test_task1 */
-  Timer_initialize();
-    (void)  rtems_task_mode( RTEMS_PREEMPT, RTEMS_PREEMPT_MASK, &old_mode );
-
-  Timer_initialize();
-    for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) rtems_task_set_note( Test_task_id, 8, 10 );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_task_set_note",
-    end_time,
-    OPERATION_COUNT,
-    overhead,
-    CALLING_OVERHEAD_TASK_SET_NOTE
-  );
-
-  Timer_initialize();
-    for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) rtems_task_get_note( Test_task_id, 8, &old_note );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_task_get_note",
-    end_time,
-    OPERATION_COUNT,
-    overhead,
-    CALLING_OVERHEAD_TASK_GET_NOTE
-  );
-
-  build_time( &time, 1, 1, 1988, 0, 0, 0, 0 );
-
-  Timer_initialize();
-    for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) rtems_clock_set( &time );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_clock_set",
-    end_time,
-    OPERATION_COUNT,
-    overhead,
-    CALLING_OVERHEAD_CLOCK_SET
-  );
-
-  Timer_initialize();
-    for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_clock_get",
-    end_time,
-    OPERATION_COUNT,
-    overhead,
-    CALLING_OVERHEAD_CLOCK_GET
-  );
-
-  puts( "*** END OF TEST 8 ***" );
-  exit( 0 );
-}
-
-rtems_task test_task1(
-  rtems_task_argument argument
-)
-{
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_task_mode: reschedule -- preempts caller",
-    end_time,
-    1,
-    0,
-    CALLING_OVERHEAD_TASK_MODE
-  );
-
-  (void) rtems_task_suspend( RTEMS_SELF );
-}
diff --git a/testsuites/tmtests/tm08/tm08.doc b/testsuites/tmtests/tm08/tm08.doc
deleted file mode 100644
index 496f3569e5..0000000000
--- a/testsuites/tmtests/tm08/tm08.doc
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
diff --git a/testsuites/tmtests/tm09/system.h b/testsuites/tmtests/tm09/system.h
deleted file mode 100644
index c973e40ffc..0000000000
--- a/testsuites/tmtests/tm09/system.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*  system.h
- *
- *  This include file is used by all tests in the Time Suite.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-#include <coverhd.h>
-#include <tmacros.h>
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
-
-#include <timesys.h>
-
-/* configuration information */
- 
-#define CONFIGURE_TMTEST
- 
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
-
-#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES     1
-#define CONFIGURE_TICKS_PER_TIMESLICE        0
- 
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#define CONFIGURE_EXTRA_TASK_STACKS         (1 * RTEMS_MINIMUM_STACK_SIZE)
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/testsuites/tmtests/tm09/task1.c b/testsuites/tmtests/tm09/task1.c
deleted file mode 100644
index 0df6233c6e..0000000000
--- a/testsuites/tmtests/tm09/task1.c
+++ /dev/null
@@ -1,226 +0,0 @@
-/*
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "system.h"
-
-rtems_id Queue_id;
-
-rtems_task Test_task(
-  rtems_task_argument argument
-);
-void queue_test();
-
-rtems_task Init(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-
-  Print_Warning();
-
-  puts( "\n\n*** TIME TEST 9 ***" );
-
-  status = rtems_task_create(
-    1,
-    128,
-    RTEMS_MINIMUM_STACK_SIZE * 2,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Task_id[ 1 ]
-  );
-  directive_failed( status, "rtems_task_create" );
-
-  status = rtems_task_start( Task_id[ 1 ], Test_task, 0 );
-  directive_failed( status, "rtems_task_start" );
-
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-}
-
-rtems_task Test_task (
-  rtems_task_argument argument
-)
-{
-  Timer_initialize();
-    rtems_message_queue_create(
-      1,
-      OPERATION_COUNT,
-      16,
-      RTEMS_DEFAULT_ATTRIBUTES,
-      &Queue_id
-    );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_message_queue_create",
-    end_time,
-    1,
-    0,
-    CALLING_OVERHEAD_MESSAGE_QUEUE_CREATE
-  );
-
-  queue_test();
-
-  Timer_initialize();
-    rtems_message_queue_delete( Queue_id );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_message_queue_delete",
-    end_time,
-    1,
-    0,
-    CALLING_OVERHEAD_MESSAGE_QUEUE_DELETE
-  );
-
-  puts( "*** END OF TEST 9 ***" );
-  exit( 0 );
-}
-
-void queue_test()
-{
-  rtems_unsigned32  send_loop_time;
-  rtems_unsigned32  urgent_loop_time;
-  rtems_unsigned32  receive_loop_time;
-  rtems_unsigned32  send_time;
-  rtems_unsigned32  urgent_time;
-  rtems_unsigned32  receive_time;
-  rtems_unsigned32  empty_flush_time;
-  rtems_unsigned32  flush_time;
-  rtems_unsigned32  empty_flush_count;
-  rtems_unsigned32  flush_count;
-  rtems_unsigned32  index;
-  rtems_unsigned32  iterations;
-  long              buffer[4];
-  rtems_status_code status;
-  rtems_unsigned32  size;
-
-  send_loop_time    = 0;
-  urgent_loop_time  = 0;
-  receive_loop_time = 0;
-  send_time         = 0;
-  urgent_time       = 0;
-  receive_time      = 0;
-  empty_flush_time  = 0;
-  flush_time        = 0;
-  flush_count       = 0;
-  empty_flush_count = 0;
-
-  for ( iterations = 1 ; iterations <= OPERATION_COUNT ; iterations++ ) {
-
-    Timer_initialize();
-      for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-        (void) Empty_function();
-    send_loop_time += Read_timer();
-
-    Timer_initialize();
-      for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-        (void) Empty_function();
-    urgent_loop_time += Read_timer();
-
-    Timer_initialize();
-      for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-        (void) Empty_function();
-    receive_loop_time += Read_timer();
-
-    Timer_initialize();
-      for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-        (void) rtems_message_queue_send( Queue_id, (long (*)[4])buffer, 16 );
-    send_time += Read_timer();
-
-    Timer_initialize();
-      for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-        (void) rtems_message_queue_receive(
-                 Queue_id,
-                 (long (*)[4])buffer,
-                 &size,
-                 RTEMS_DEFAULT_OPTIONS,
-                 RTEMS_NO_TIMEOUT
-               );
-    receive_time += Read_timer();
-
-    Timer_initialize();
-      for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-        (void) rtems_message_queue_urgent( Queue_id, (long (*)[4])buffer, 16 );
-    urgent_time += Read_timer();
-
-    Timer_initialize();
-      for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-        (void) rtems_message_queue_receive(
-                 Queue_id,
-                 (long (*)[4])buffer,
-                 &size,
-                 RTEMS_DEFAULT_OPTIONS,
-                 RTEMS_NO_TIMEOUT
-               );
-    receive_time += Read_timer();
-
-    Timer_initialize();
-      rtems_message_queue_flush( Queue_id, &empty_flush_count );
-    empty_flush_time += Read_timer();
-
-    /* send one message to flush */
-    status = rtems_message_queue_send(
-       Queue_id,
-       (long (*)[4])buffer,
-       16
-    );
-    directive_failed( status, "rtems_message_queue_send" );
-
-    Timer_initialize();
-      rtems_message_queue_flush( Queue_id, &flush_count );
-    flush_time += Read_timer();
-  }
-
-  put_time(
-    "rtems_message_queue_send: no waiting tasks",
-    send_time,
-    OPERATION_COUNT * OPERATION_COUNT,
-    send_loop_time,
-    CALLING_OVERHEAD_MESSAGE_QUEUE_SEND
-  );
-
-  put_time(
-    "rtems_message_queue_urgent: no waiting tasks",
-    urgent_time,
-    OPERATION_COUNT * OPERATION_COUNT,
-    urgent_loop_time,
-    CALLING_OVERHEAD_MESSAGE_QUEUE_URGENT
-  );
-
-  put_time(
-    "rtems_message_queue_receive: available",
-    receive_time,
-    OPERATION_COUNT * OPERATION_COUNT * 2,
-    receive_loop_time * 2,
-    CALLING_OVERHEAD_MESSAGE_QUEUE_RECEIVE
-  );
-
-  put_time(
-    "rtems_message_queue_flush: no messages flushed",
-    empty_flush_time,
-    OPERATION_COUNT,
-    0,
-    CALLING_OVERHEAD_MESSAGE_QUEUE_FLUSH
-  );
-
-  put_time(
-    "rtems_message_queue_flush: messages flushed",
-    flush_time,
-    OPERATION_COUNT,
-    0,
-    CALLING_OVERHEAD_MESSAGE_QUEUE_FLUSH
-  );
-
-}
diff --git a/testsuites/tmtests/tm09/tm09.doc b/testsuites/tmtests/tm09/tm09.doc
deleted file mode 100644
index 496f3569e5..0000000000
--- a/testsuites/tmtests/tm09/tm09.doc
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
diff --git a/testsuites/tmtests/tm10/system.h b/testsuites/tmtests/tm10/system.h
deleted file mode 100644
index e406249fd2..0000000000
--- a/testsuites/tmtests/tm10/system.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*  system.h
- *
- *  This include file is used by all tests in the Time Suite.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-#include <coverhd.h>
-#include <tmacros.h>
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
-
-#include <timesys.h>
-
-/* configuration information */
- 
-#define CONFIGURE_TMTEST
- 
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
-
-#define CONFIGURE_MAXIMUM_TASKS              110
-#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES     1
-#define CONFIGURE_TICKS_PER_TIMESLICE        0
- 
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/testsuites/tmtests/tm10/task1.c b/testsuites/tmtests/tm10/task1.c
deleted file mode 100644
index 9177ed8b12..0000000000
--- a/testsuites/tmtests/tm10/task1.c
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "system.h"
-
-rtems_id Queue_id;
-long Buffer[4];
-
-rtems_task High_task(
-  rtems_task_argument argument
-);
-
-rtems_task Middle_tasks(
-  rtems_task_argument argument
-);
-
-rtems_task Low_task(
-  rtems_task_argument argument
-);
-
-void test_init();
-
-rtems_task Init(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-
-  Print_Warning();
-
-  puts( "\n\n*** TIME TEST 10 ***" );
-
-  test_init();
-
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-}
-
-void test_init()
-{
-  rtems_unsigned32    index;
-  rtems_unsigned32    size;
-  rtems_task_entry    task_entry;
-  rtems_status_code   status;
-  rtems_task_priority priority;
-  rtems_id            task_id;
-
-  priority = 5;
-
-  for( index = 0; index <= OPERATION_COUNT ; index++ ) {
-    status = rtems_task_create(
-      rtems_build_name( 'T', 'I', 'M', 'E' ),
-      priority,
-      RTEMS_MINIMUM_STACK_SIZE,
-      RTEMS_DEFAULT_MODES,
-      RTEMS_DEFAULT_ATTRIBUTES,
-      &task_id
-    );
-    directive_failed( status, "rtems_task_create LOOP" );
-
-    priority++;
-
-    if ( index==0 )                    task_entry = High_task;
-    else if ( index==OPERATION_COUNT ) task_entry = Low_task;
-    else                               task_entry = Middle_tasks;
-
-    status = rtems_task_start( task_id, task_entry, 0 );
-    directive_failed( status, "rtems_task_start LOOP" );
-  }
-
-  status = rtems_message_queue_create(
-    1,
-    OPERATION_COUNT,
-    16,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Queue_id
-  );
-  directive_failed( status, "rtems_message_queue_create" );
-
-  Timer_initialize();
-    for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) Empty_function();
-  overhead = Read_timer();
-
-  Timer_initialize();
-    for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) rtems_message_queue_receive(
-               Queue_id,
-               (long (*)[4]) Buffer,
-               &size,
-               RTEMS_NO_WAIT,
-               RTEMS_NO_TIMEOUT
-             );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_message_queue_receive: not available -- NO_WAIT",
-    end_time,
-    OPERATION_COUNT,
-    overhead,
-    CALLING_OVERHEAD_MESSAGE_QUEUE_RECEIVE
-  );
-
-}
-
-rtems_task High_task(
-  rtems_task_argument argument
-)
-{
-  rtems_unsigned32 size;
-  
-  Timer_initialize();
-     (void) rtems_message_queue_receive(
-              Queue_id,
-              (long (*)[4]) Buffer,
-              &size,
-              RTEMS_DEFAULT_OPTIONS,
-              RTEMS_NO_TIMEOUT
-            );
-}
-
-rtems_task Middle_tasks(
-  rtems_task_argument argument
-)
-{
-  rtems_unsigned32 size;
-  
-  (void) rtems_message_queue_receive(
-           Queue_id,
-           (long (*)[4]) Buffer,
-           &size,
-           RTEMS_DEFAULT_OPTIONS,
-           RTEMS_NO_TIMEOUT
-         );
-}
-
-
-rtems_task Low_task(
-  rtems_task_argument argument
-)
-{
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_message_queue_receive: not available -- caller blocks",
-    end_time,
-    OPERATION_COUNT,
-    0,
-    CALLING_OVERHEAD_MESSAGE_QUEUE_RECEIVE
-  );
-
-  puts( "*** END OF TEST 10 ***" );
-  exit( 0 );
-}
diff --git a/testsuites/tmtests/tm10/tm10.doc b/testsuites/tmtests/tm10/tm10.doc
deleted file mode 100644
index 496f3569e5..0000000000
--- a/testsuites/tmtests/tm10/tm10.doc
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
diff --git a/testsuites/tmtests/tm11/system.h b/testsuites/tmtests/tm11/system.h
deleted file mode 100644
index 534584eed0..0000000000
--- a/testsuites/tmtests/tm11/system.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*  system.h
- *
- *  This include file is used by all tests in the Time Suite.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-#include <coverhd.h>
-#include <tmacros.h>
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
-
-#include <timesys.h>
-
-/* configuration information */
- 
-#define CONFIGURE_TMTEST
- 
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
-
-#define CONFIGURE_MAXIMUM_TASKS              111
-#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES     1
-#define CONFIGURE_TICKS_PER_TIMESLICE        0
- 
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/testsuites/tmtests/tm11/task1.c b/testsuites/tmtests/tm11/task1.c
deleted file mode 100644
index e67852aca3..0000000000
--- a/testsuites/tmtests/tm11/task1.c
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "system.h"
-
-rtems_id Queue_id;
-
-long Buffer[4];
-
-rtems_task test_init(
-  rtems_task_argument argument
-);
-
-rtems_task Middle_tasks(
-  rtems_task_argument argument
-);
-
-rtems_task High_task(
-  rtems_task_argument argument
-);
-
-
-void Init(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-  rtems_id id;
-
-  Print_Warning();
-
-  puts( "\n\n*** TIME TEST 11 ***" );
-
-  status = rtems_task_create(
-    1,
-    251,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &id
-  );
-  directive_failed( status, "rtems_task_create" );
-
-  status = rtems_task_start( id, test_init, 0 );
-  directive_failed( status, "rtems_task_start" );
-
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-}
-
-rtems_task test_init(
-  rtems_task_argument argument
-)
-{
-  rtems_unsigned32    index;
-  rtems_task_entry    task_entry;
-  rtems_task_priority priority;
-  rtems_id            task_id;
-  rtems_status_code   status;
-
-/*  As each task is started, it preempts this task and
- *  performs a blocking rtems_message_queue_receive.  Upon completion of
- *  this loop all created tasks are blocked.
- */
-
-  status = rtems_message_queue_create(
-    rtems_build_name( 'M', 'Q', '1', ' '  ),
-    OPERATION_COUNT,
-    16,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Queue_id
-  );
-  directive_failed( status, "rtems_message_queue_create" );
-
-  priority = 250;
-
-  for( index = 0; index < OPERATION_COUNT ; index++ ) {
-    status = rtems_task_create(
-      rtems_build_name( 'T', 'I', 'M', 'E'  ),
-      priority,
-      RTEMS_MINIMUM_STACK_SIZE,
-      RTEMS_DEFAULT_MODES,
-      RTEMS_DEFAULT_ATTRIBUTES,
-      &task_id
-    );
-    directive_failed( status, "rtems_task_create LOOP" );
-
-    priority--;
-
-    if ( index==OPERATION_COUNT-1 ) task_entry = High_task;
-    else                            task_entry = Middle_tasks;
-
-    status = rtems_task_start( task_id, task_entry, 0 );
-    directive_failed( status, "rtems_task_start LOOP" );
-  }
-
-  Timer_initialize();
-    (void) rtems_message_queue_send( Queue_id, (long (*)[4]) Buffer, 16 );
-}
-
-rtems_task Middle_tasks(
-  rtems_task_argument argument
-)
-{
-  rtems_unsigned32 size;
-
-  (void) rtems_message_queue_receive(
-           Queue_id,
-           (long (*)[4]) Buffer,
-           &size,
-           RTEMS_DEFAULT_OPTIONS,
-           RTEMS_NO_TIMEOUT
-         );
-
-  (void) rtems_message_queue_send( Queue_id, (long (*)[4]) Buffer, size );
-}
-
-rtems_task High_task(
-  rtems_task_argument argument
-)
-{
-  rtems_unsigned32 size;
-  
-  (void) rtems_message_queue_receive(
-           Queue_id,
-           (long (*)[4]) Buffer,
-           &size,
-           RTEMS_DEFAULT_OPTIONS,
-           RTEMS_NO_TIMEOUT
-         );
-
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_message_queue_send: task readied -- preempts caller",
-    end_time,
-    OPERATION_COUNT,
-    0,
-    CALLING_OVERHEAD_MESSAGE_QUEUE_SEND
-  );
-
-  puts( "*** END OF TEST 11 ***" );
-  exit( 0 );
-}
diff --git a/testsuites/tmtests/tm11/tm11.doc b/testsuites/tmtests/tm11/tm11.doc
deleted file mode 100644
index 496f3569e5..0000000000
--- a/testsuites/tmtests/tm11/tm11.doc
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
diff --git a/testsuites/tmtests/tm12/system.h b/testsuites/tmtests/tm12/system.h
deleted file mode 100644
index 534584eed0..0000000000
--- a/testsuites/tmtests/tm12/system.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*  system.h
- *
- *  This include file is used by all tests in the Time Suite.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-#include <coverhd.h>
-#include <tmacros.h>
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
-
-#include <timesys.h>
-
-/* configuration information */
- 
-#define CONFIGURE_TMTEST
- 
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
-
-#define CONFIGURE_MAXIMUM_TASKS              111
-#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES     1
-#define CONFIGURE_TICKS_PER_TIMESLICE        0
- 
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/testsuites/tmtests/tm12/task1.c b/testsuites/tmtests/tm12/task1.c
deleted file mode 100644
index d8a427c618..0000000000
--- a/testsuites/tmtests/tm12/task1.c
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "system.h"
-
-rtems_id Queue_id;
-
-long Buffer[4];
-
-rtems_task test_init(
-  rtems_task_argument argument
-);
-
-rtems_task High_task(
-  rtems_task_argument argument
-);
-
-rtems_task Low_tasks(
-  rtems_task_argument argument
-);
-
-
-rtems_task Init(
-  rtems_task_argument argument
-)
-{
-  rtems_id          task_id;
-  rtems_status_code status;
-
-  Print_Warning();
-
-  puts( "\n\n*** TIME TEST 12 ***" );
-
-  status = rtems_task_create(
-    1,
-    251,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &task_id
-  );
-  directive_failed( status, "rtems_task_create" );
-
-  status = rtems_task_start( task_id, test_init, 0 );
-  directive_failed( status, "rtems_task_start" );
-
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-}
-
-rtems_task test_init(
-  rtems_task_argument argument
-)
-{
-  rtems_unsigned32     index;
-  rtems_task_entry     task_entry;
-  rtems_task_priority  priority;
-  rtems_id             task_id;
-  rtems_status_code    status;
-
-
-  status = rtems_message_queue_create(
-    rtems_build_name( 'M', 'Q', '1', ' ' ),
-    OPERATION_COUNT,
-    16,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Queue_id
-  );
-  directive_failed( status, "rtems_message_queue_create" );
-
-  priority = 250;
-
-  for( index = 0; index <= OPERATION_COUNT ; index++ ) {
-    status = rtems_task_create(
-      rtems_build_name( 'T', 'I', 'M', 'E' ),
-      priority,
-      RTEMS_MINIMUM_STACK_SIZE,
-      RTEMS_DEFAULT_MODES,
-      RTEMS_DEFAULT_ATTRIBUTES,
-      &task_id
-    );
-    directive_failed( status, "rtems_task_create LOOP" );
-
-    priority--;
-
-    if ( index==OPERATION_COUNT ) task_entry = High_task;
-    else                          task_entry = Low_tasks;
-
-    status = rtems_task_start( task_id, task_entry, 0 );
-    directive_failed( status, "rtems_task_start LOOP" );
-  }
-}
-
-rtems_task High_task(
-  rtems_task_argument argument
-)
-{
-  rtems_unsigned32  index;
-
-  Timer_initialize();
-    for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) Empty_function();
-  overhead = Read_timer();
-
-  Timer_initialize();
-    for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) rtems_message_queue_send( Queue_id, (long (*)[4]) Buffer, 16 );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_message_queue_send: task readied -- returns to caller",
-    end_time,
-    OPERATION_COUNT,
-    overhead,
-    CALLING_OVERHEAD_MESSAGE_QUEUE_SEND
-  );
-
-  puts( "*** END OF TEST 12 ***" );
-  exit( 0 );
-}
-
-rtems_task Low_tasks(
-  rtems_task_argument argument
-)
-{
-  rtems_unsigned32 size;
-
-  (void) rtems_message_queue_receive(
-           Queue_id,
-           (long (*)[4]) Buffer,
-           &size,
-           RTEMS_DEFAULT_OPTIONS,
-           RTEMS_NO_TIMEOUT
-         );
-}
diff --git a/testsuites/tmtests/tm12/tm12.doc b/testsuites/tmtests/tm12/tm12.doc
deleted file mode 100644
index 496f3569e5..0000000000
--- a/testsuites/tmtests/tm12/tm12.doc
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
diff --git a/testsuites/tmtests/tm13/system.h b/testsuites/tmtests/tm13/system.h
deleted file mode 100644
index 534584eed0..0000000000
--- a/testsuites/tmtests/tm13/system.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*  system.h
- *
- *  This include file is used by all tests in the Time Suite.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-#include <coverhd.h>
-#include <tmacros.h>
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
-
-#include <timesys.h>
-
-/* configuration information */
- 
-#define CONFIGURE_TMTEST
- 
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
-
-#define CONFIGURE_MAXIMUM_TASKS              111
-#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES     1
-#define CONFIGURE_TICKS_PER_TIMESLICE        0
- 
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/testsuites/tmtests/tm13/task1.c b/testsuites/tmtests/tm13/task1.c
deleted file mode 100644
index 4071ded7a8..0000000000
--- a/testsuites/tmtests/tm13/task1.c
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "system.h"
-
-rtems_id Queue_id;
-
-long Buffer[4];
-
-rtems_task test_init(
-  rtems_task_argument argument
-);
-
-rtems_task Middle_tasks(
-  rtems_task_argument argument
-);
-
-rtems_task High_task(
-  rtems_task_argument argument
-);
-
-void Init(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-  rtems_id id;
-
-  Print_Warning();
-
-  puts( "\n\n*** TIME TEST 13 ***" );
-
-  status = rtems_task_create(
-    1,
-    251,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &id
-  );
-  directive_failed( status, "rtems_task_create" );
-
-  status = rtems_task_start( id, test_init, 0 );
-  directive_failed( status, "rtems_task_start" );
-
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-}
-
-rtems_task test_init(
-  rtems_task_argument argument
-)
-{
-  rtems_unsigned32    index;
-  rtems_task_entry    task_entry;
-  rtems_task_priority priority;
-  rtems_id            task_id;
-  rtems_status_code   status;
-
-/*  As each task is started, it preempts this task and
- *  performs a blocking rtems_message_queue_receive.  Upon completion of
- *  this loop all created tasks are blocked.
- */
-
-  status = rtems_message_queue_create(
-    rtems_build_name( 'M', 'Q', '1', ' '  ),
-    OPERATION_COUNT,
-    16,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Queue_id
-  );
-  directive_failed( status, "rtems_message_queue_create" );
-
-  priority = 250;
-
-  for( index = 0; index < OPERATION_COUNT ; index++ ) {
-    status = rtems_task_create(
-      rtems_build_name( 'T', 'I', 'M', 'E'  ),
-      priority,
-      RTEMS_MINIMUM_STACK_SIZE,
-      RTEMS_DEFAULT_MODES,
-      RTEMS_DEFAULT_ATTRIBUTES,
-      &task_id
-    );
-    directive_failed( status, "rtems_task_create LOOP" );
-
-    priority--;
-
-    if ( index==OPERATION_COUNT-1 ) task_entry = High_task;
-    else                            task_entry = Middle_tasks;
-
-    status = rtems_task_start( task_id, task_entry, 0 );
-    directive_failed( status, "rtems_task_start LOOP" );
-  }
-
-  Timer_initialize();
-    (void) rtems_message_queue_urgent( Queue_id, (long (*)[4]) Buffer, 16 );
-}
-
-rtems_task Middle_tasks(
-  rtems_task_argument argument
-)
-{
-  rtems_unsigned32 size;
-
-  (void) rtems_message_queue_receive(
-           Queue_id,
-           (long (*)[4]) Buffer,
-           &size,
-           RTEMS_DEFAULT_OPTIONS,
-           RTEMS_NO_TIMEOUT
-         );
-
-  (void) rtems_message_queue_urgent( Queue_id, (long (*)[4]) Buffer, size );
-}
-
-rtems_task High_task(
-  rtems_task_argument argument
-)
-{
-  rtems_unsigned32 size;
-
-  (void) rtems_message_queue_receive(
-           Queue_id,
-           (long (*)[4]) Buffer,
-           &size,
-           RTEMS_DEFAULT_OPTIONS,
-           RTEMS_NO_TIMEOUT
-         );
-
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_message_queue_urgent: task readied -- preempts caller",
-    end_time,
-    OPERATION_COUNT,
-    0,
-    CALLING_OVERHEAD_MESSAGE_QUEUE_URGENT
-  );
-
-  puts( "*** END OF TEST 13 ***" );
-  exit( 0 );
-}
diff --git a/testsuites/tmtests/tm13/tm13.doc b/testsuites/tmtests/tm13/tm13.doc
deleted file mode 100644
index 496f3569e5..0000000000
--- a/testsuites/tmtests/tm13/tm13.doc
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
diff --git a/testsuites/tmtests/tm14/system.h b/testsuites/tmtests/tm14/system.h
deleted file mode 100644
index 534584eed0..0000000000
--- a/testsuites/tmtests/tm14/system.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*  system.h
- *
- *  This include file is used by all tests in the Time Suite.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-#include <coverhd.h>
-#include <tmacros.h>
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
-
-#include <timesys.h>
-
-/* configuration information */
- 
-#define CONFIGURE_TMTEST
- 
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
-
-#define CONFIGURE_MAXIMUM_TASKS              111
-#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES     1
-#define CONFIGURE_TICKS_PER_TIMESLICE        0
- 
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/testsuites/tmtests/tm14/task1.c b/testsuites/tmtests/tm14/task1.c
deleted file mode 100644
index 30e1e8a38d..0000000000
--- a/testsuites/tmtests/tm14/task1.c
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "system.h"
-
-rtems_id Queue_id;
-
-long Buffer[4];
-
-rtems_task test_init(
-  rtems_task_argument argument
-);
-
-rtems_task High_task(
-  rtems_task_argument argument
-);
-
-rtems_task Low_tasks(
-  rtems_task_argument argument
-);
-
-
-rtems_task Init(
-  rtems_task_argument argument
-)
-{
-  rtems_id          task_id;
-  rtems_status_code status;
-
-  Print_Warning();
-
-  puts( "\n\n*** TIME TEST 14 ***" );
-
-  status = rtems_task_create(
-    1,
-    251,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &task_id
-  );
-  directive_failed( status, "rtems_task_create" );
-
-  status = rtems_task_start( task_id, test_init, 0 );
-  directive_failed( status, "rtems_task_start" );
-
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-}
-
-rtems_task test_init(
-  rtems_task_argument argument
-)
-{
-  rtems_unsigned32     index;
-  rtems_task_entry     task_entry;
-  rtems_task_priority  priority;
-  rtems_id             task_id;
-  rtems_status_code    status;
-
-
-  status = rtems_message_queue_create(
-    rtems_build_name( 'M', 'Q', '1', ' ' ),
-    OPERATION_COUNT,
-    16,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Queue_id
-  );
-  directive_failed( status, "rtems_message_queue_create" );
-
-  priority = 250;
-
-  for( index = 0; index <= OPERATION_COUNT ; index++ ) {
-    status = rtems_task_create(
-      rtems_build_name( 'T', 'I', 'M', 'E' ),
-      priority,
-      RTEMS_MINIMUM_STACK_SIZE,
-      RTEMS_DEFAULT_MODES,
-      RTEMS_DEFAULT_ATTRIBUTES,
-      &task_id
-    );
-    directive_failed( status, "rtems_task_create LOOP" );
-
-    priority--;
-
-    if ( index==OPERATION_COUNT ) task_entry = High_task;
-    else                          task_entry = Low_tasks;
-
-    status = rtems_task_start( task_id, task_entry, 0 );
-    directive_failed( status, "rtems_task_start LOOP" );
-  }
-}
-
-rtems_task High_task(
-  rtems_task_argument argument
-)
-{
-  rtems_unsigned32  index;
-
-  Timer_initialize();
-    for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) Empty_function();
-  overhead = Read_timer();
-
-  Timer_initialize();
-    for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) rtems_message_queue_urgent( Queue_id, (long (*)[4]) Buffer, 16 );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_message_queue_urgent: task readied -- returns to caller",
-    end_time,
-    OPERATION_COUNT,
-    overhead,
-    CALLING_OVERHEAD_MESSAGE_QUEUE_URGENT
-  );
-
-  puts( "*** END OF TEST 14 ***" );
-  exit( 0 );
-}
-
-rtems_task Low_tasks(
-  rtems_task_argument argument
-)
-{
-  rtems_unsigned32 size;
-
-  (void) rtems_message_queue_receive(
-           Queue_id,
-           (long (*)[4]) Buffer,
-           &size,
-           RTEMS_DEFAULT_OPTIONS,
-           RTEMS_NO_TIMEOUT
-         );
-}
diff --git a/testsuites/tmtests/tm14/tm14.doc b/testsuites/tmtests/tm14/tm14.doc
deleted file mode 100644
index 496f3569e5..0000000000
--- a/testsuites/tmtests/tm14/tm14.doc
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
diff --git a/testsuites/tmtests/tm15/system.h b/testsuites/tmtests/tm15/system.h
deleted file mode 100644
index 534584eed0..0000000000
--- a/testsuites/tmtests/tm15/system.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*  system.h
- *
- *  This include file is used by all tests in the Time Suite.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-#include <coverhd.h>
-#include <tmacros.h>
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
-
-#include <timesys.h>
-
-/* configuration information */
- 
-#define CONFIGURE_TMTEST
- 
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
-
-#define CONFIGURE_MAXIMUM_TASKS              111
-#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES     1
-#define CONFIGURE_TICKS_PER_TIMESLICE        0
- 
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/testsuites/tmtests/tm15/task1.c b/testsuites/tmtests/tm15/task1.c
deleted file mode 100644
index c968f6d28c..0000000000
--- a/testsuites/tmtests/tm15/task1.c
+++ /dev/null
@@ -1,222 +0,0 @@
-/*
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "system.h"
-
-rtems_unsigned32 time_set, eventout;
-
-rtems_task High_tasks(
-  rtems_task_argument argument
-);
-
-rtems_task Low_task(
-  rtems_task_argument argument
-);
-
-void test_init();
-
-rtems_task Init(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-
-  Print_Warning();
-
-  puts( "\n\n*** TIME TEST 15 ***" );
-
-  test_init();
-
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-}
-
-void test_init()
-{
-  rtems_id          id;
-  rtems_unsigned32  index;
-  rtems_event_set   event_out;
-  rtems_status_code status;
-
-  time_set = FALSE;
-
-  status = rtems_task_create(
-    rtems_build_name( 'L', 'O', 'W', ' ' ),
-    10,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_NO_PREEMPT,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &id
-  );
-  directive_failed( status, "rtems_task_create LOW" );
-
-  status = rtems_task_start( id, Low_task, 0 );
-  directive_failed( status, "rtems_task_start LOW" );
-
-  for ( index = 1 ; index <= OPERATION_COUNT ; index++ ) {
-    status = rtems_task_create(
-      rtems_build_name( 'H', 'I', 'G', 'H' ),
-      5,
-      RTEMS_MINIMUM_STACK_SIZE,
-      RTEMS_DEFAULT_MODES,
-      RTEMS_DEFAULT_ATTRIBUTES,
-      &Task_id[ index ]
-    );
-    directive_failed( status, "rtems_task_create LOOP" );
-
-    status = rtems_task_start( Task_id[ index ], High_tasks, 0 );
-    directive_failed( status, "rtems_task_start LOOP" );
-  }
-
-  Timer_initialize();
-    for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) Empty_function();
-  overhead = Read_timer();
-
-  Timer_initialize();
-    for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-    {
-        (void) rtems_event_receive(
-                 RTEMS_PENDING_EVENTS,
-                 RTEMS_DEFAULT_OPTIONS,
-                 RTEMS_NO_TIMEOUT,
-                 &event_out
-               );
-    }
-
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_event_receive: obtain current events",
-    end_time,
-    OPERATION_COUNT,
-    overhead,
-    CALLING_OVERHEAD_EVENT_RECEIVE
-  );
-
-
-  Timer_initialize();
-    for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-    {
-      (void) rtems_event_receive(
-               RTEMS_ALL_EVENTS,
-               RTEMS_NO_WAIT,
-               RTEMS_NO_TIMEOUT,
-               &event_out
-             );
-    }
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_event_receive: not available -- NO_WAIT",
-    end_time,
-    OPERATION_COUNT,
-    overhead,
-    CALLING_OVERHEAD_EVENT_RECEIVE
-  );
-}
-
-rtems_task Low_task(
-  rtems_task_argument argument
-)
-{
-  rtems_unsigned32  index;
-  rtems_event_set   event_out;
-
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_event_receive: not available -- caller blocks",
-    end_time,
-    OPERATION_COUNT,
-    0,
-    CALLING_OVERHEAD_EVENT_RECEIVE
-  );
-
-  Timer_initialize();
-    for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) Empty_function();
-  overhead = Read_timer();
-
-  Timer_initialize();
-    for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) rtems_event_send( RTEMS_SELF, RTEMS_EVENT_16 );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_event_send: no task readied",
-    end_time,
-    OPERATION_COUNT,
-    overhead,
-    CALLING_OVERHEAD_EVENT_SEND
-  );
-
-  Timer_initialize();
-    (void) rtems_event_receive(
-             RTEMS_EVENT_16,
-             RTEMS_DEFAULT_OPTIONS,
-             RTEMS_NO_TIMEOUT,
-             &event_out
-           );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_event_receive: available",
-    end_time,
-    1,
-    0,
-    CALLING_OVERHEAD_EVENT_RECEIVE
-  );
-
-  Timer_initialize();
-    for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) rtems_event_send( Task_id[ index ], RTEMS_EVENT_16 );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_event_send: task readied -- returns to caller",
-    end_time,
-    OPERATION_COUNT,
-    overhead,
-    CALLING_OVERHEAD_EVENT_SEND
-  );
-
-  puts( "*** END OF TEST 15 ***" );
-  exit( 0 );
-}
-
-rtems_task High_tasks(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-
-  if ( time_set )
-    status = rtems_event_receive(
-      RTEMS_EVENT_16,
-      RTEMS_DEFAULT_OPTIONS,
-      RTEMS_NO_TIMEOUT,
-      &eventout
-    );
-  else {
-    time_set = 1;
-    Timer_initialize();            /* start blocking rtems_event_receive time */
-    status = rtems_event_receive(
-      RTEMS_EVENT_16,
-      RTEMS_DEFAULT_OPTIONS,
-      RTEMS_NO_TIMEOUT,
-      &eventout
-    );
-  }
-}
diff --git a/testsuites/tmtests/tm15/tm15.doc b/testsuites/tmtests/tm15/tm15.doc
deleted file mode 100644
index 496f3569e5..0000000000
--- a/testsuites/tmtests/tm15/tm15.doc
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
diff --git a/testsuites/tmtests/tm16/system.h b/testsuites/tmtests/tm16/system.h
deleted file mode 100644
index 534584eed0..0000000000
--- a/testsuites/tmtests/tm16/system.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*  system.h
- *
- *  This include file is used by all tests in the Time Suite.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-#include <coverhd.h>
-#include <tmacros.h>
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
-
-#include <timesys.h>
-
-/* configuration information */
- 
-#define CONFIGURE_TMTEST
- 
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
-
-#define CONFIGURE_MAXIMUM_TASKS              111
-#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES     1
-#define CONFIGURE_TICKS_PER_TIMESLICE        0
- 
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/testsuites/tmtests/tm16/task1.c b/testsuites/tmtests/tm16/task1.c
deleted file mode 100644
index 93a65c17d9..0000000000
--- a/testsuites/tmtests/tm16/task1.c
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "system.h"
-
-rtems_unsigned32 Task_count;
-
-rtems_task test_init(
-  rtems_task_argument argument
-);
-
-rtems_task Middle_tasks(
-  rtems_task_argument argument
-);
-
-rtems_task High_task(
-  rtems_task_argument argument
-);
-
-rtems_task Init(
-  rtems_task_argument argument
-)
-{
-  rtems_id          id;
-  rtems_status_code status;
-
-  Print_Warning();
-
-  puts( "\n\n*** TIME TEST 16 ***" );
-
-  status = rtems_task_create(
-    rtems_build_name( 'T', 'E', 'S', 'T' ),
-    251,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &id
-  );
-  directive_failed( status, "rtems_task_create of test_init" );
-
-  status = rtems_task_start( id, test_init, 0 );
-  directive_failed( status, "rtems_task_start of test_init" );
-
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-}
-
-rtems_task test_init(
-  rtems_task_argument argument
-)
-{
-  rtems_task_priority priority;
-  rtems_status_code   status;
-  rtems_unsigned32    index;
-  rtems_task_entry    task_entry;
-
-/*  As each task is started, it preempts this task and
- *  performs a blocking rtems_event_receive.  Upon completion of
- *  this loop all created tasks are blocked.
- */
-
-  priority = 250;
-
-  for( index = 0 ; index <= OPERATION_COUNT ; index++ ) {
-    status = rtems_task_create(
-      rtems_build_name( 'M', 'I', 'D', ' ' ),
-      priority,
-      RTEMS_MINIMUM_STACK_SIZE,
-      RTEMS_DEFAULT_MODES,
-      RTEMS_DEFAULT_ATTRIBUTES,
-      &Task_id[ index ]
-    );
-    directive_failed( status, "rtems_task_create LOOP" );
-
-    if (  index == OPERATION_COUNT ) task_entry = High_task;
-    else                             task_entry = Middle_tasks;
-
-    status = rtems_task_start( Task_id[ index ], task_entry, 0 );
-    directive_failed( status, "rtems_task_start LOOP" );
-
-    priority--;
-  }
-
-  Task_count = 0;
-
-  Timer_initialize();
-    (void) rtems_event_send( Task_id[ Task_count ], RTEMS_EVENT_16 );
-  /* preempts task */
-}
-
-rtems_task Middle_tasks(
-  rtems_task_argument argument
-)
-{
-  rtems_event_set event_out;
-
-  (void) rtems_event_receive(              /* task blocks */
-           RTEMS_EVENT_16,
-           RTEMS_DEFAULT_OPTIONS,
-           RTEMS_NO_TIMEOUT,
-           &event_out
-         );
-
-  Task_count++;
-
-  (void) rtems_event_send(               /* preempts task */
-    Task_id[ Task_count ],
-    RTEMS_EVENT_16
-  );
-}
-
-rtems_task High_task(
-  rtems_task_argument argument
-)
-{
-  rtems_event_set event_out;
-
-  (void) rtems_event_receive(                /* task blocks */
-            RTEMS_EVENT_16,
-            RTEMS_DEFAULT_OPTIONS,
-            RTEMS_NO_TIMEOUT,
-            &event_out
-          );
-
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_event_send: task readied -- preempts caller",
-    end_time,
-    OPERATION_COUNT,
-    0,
-    CALLING_OVERHEAD_EVENT_SEND
-  );
-
-  puts( "*** END OF TEST 16 ***" );
-  exit( 0 );
-}
diff --git a/testsuites/tmtests/tm16/tm16.doc b/testsuites/tmtests/tm16/tm16.doc
deleted file mode 100644
index 496f3569e5..0000000000
--- a/testsuites/tmtests/tm16/tm16.doc
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
diff --git a/testsuites/tmtests/tm17/system.h b/testsuites/tmtests/tm17/system.h
deleted file mode 100644
index 534584eed0..0000000000
--- a/testsuites/tmtests/tm17/system.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*  system.h
- *
- *  This include file is used by all tests in the Time Suite.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-#include <coverhd.h>
-#include <tmacros.h>
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
-
-#include <timesys.h>
-
-/* configuration information */
- 
-#define CONFIGURE_TMTEST
- 
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
-
-#define CONFIGURE_MAXIMUM_TASKS              111
-#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES     1
-#define CONFIGURE_TICKS_PER_TIMESLICE        0
- 
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/testsuites/tmtests/tm17/task1.c b/testsuites/tmtests/tm17/task1.c
deleted file mode 100644
index 1ef373e61b..0000000000
--- a/testsuites/tmtests/tm17/task1.c
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "system.h"
-
-rtems_unsigned32 Task_count;
-rtems_task_priority Task_priority;
-
-rtems_task First_task(
-  rtems_task_argument argument
-);
-
-rtems_task Middle_tasks(
-  rtems_task_argument argument
-);
-
-rtems_task Last_task(
-  rtems_task_argument argument
-);
-
-rtems_task Init(
-  rtems_task_argument argument
-)
-{
-  rtems_task_entry  task_entry;
-  rtems_unsigned32  index;
-  rtems_status_code status;
-
-  Print_Warning();
-
-  puts( "\n\n*** TIME TEST 17 ***" );
-
-  Task_priority = 254;
-
-  for( index = 0; index <= OPERATION_COUNT ; index++ ) {
-    status = rtems_task_create(
-      rtems_build_name( 'T', 'I', 'M', 'E' ),
-      Task_priority,
-      RTEMS_MINIMUM_STACK_SIZE,
-      RTEMS_DEFAULT_MODES,
-      RTEMS_DEFAULT_ATTRIBUTES,
-      &Task_id[ index ]
-    );
-    directive_failed( status, "rtems_task_create loop" );
-
-    if ( index == OPERATION_COUNT ) task_entry = Last_task;
-    else if ( index == 0 )          task_entry = First_task;
-    else                            task_entry = Middle_tasks;
-
-    status = rtems_task_start( Task_id[ index ], task_entry, 0 );
-    directive_failed( status, "rtems_task_start loop" );
-  }
-
-  Task_count = 1;
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-}
-
-rtems_task First_task(
-  rtems_task_argument argument
-)
-{
-  rtems_task_priority previous_priority;
-
-  Timer_initialize();
-
-  Task_priority--;
-  Task_count++;
-
-  (void) rtems_task_set_priority(
-           Task_id[ Task_count ],
-           Task_priority,
-           &previous_priority
-         );
-}
-
-rtems_task Middle_tasks(
-  rtems_task_argument argument
-)
-{
-  rtems_task_priority previous_priority;
-
-  Task_priority--;
-  Task_count++;
-
-  (void) rtems_task_set_priority(
-           Task_id[ Task_count ],
-           Task_priority,
-           &previous_priority
-         );
-}
-
-rtems_task Last_task(
-  rtems_task_argument argument
-)
-{
-  rtems_unsigned32 index;
-
-  end_time = Read_timer();
-
-  Timer_initialize();
-    for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) Empty_function();
-  overhead = Read_timer();
-
-  put_time(
-    "rtems_task_set_priority: preempts caller",
-    end_time,
-    OPERATION_COUNT,
-    overhead,
-    CALLING_OVERHEAD_TASK_SET_PRIORITY
-  );
-
-  puts( "*** END OF TEST 17 ***" );
-  exit( 0 );
-}
diff --git a/testsuites/tmtests/tm17/tm17.doc b/testsuites/tmtests/tm17/tm17.doc
deleted file mode 100644
index 496f3569e5..0000000000
--- a/testsuites/tmtests/tm17/tm17.doc
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
diff --git a/testsuites/tmtests/tm18/system.h b/testsuites/tmtests/tm18/system.h
deleted file mode 100644
index 534584eed0..0000000000
--- a/testsuites/tmtests/tm18/system.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*  system.h
- *
- *  This include file is used by all tests in the Time Suite.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-#include <coverhd.h>
-#include <tmacros.h>
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
-
-#include <timesys.h>
-
-/* configuration information */
- 
-#define CONFIGURE_TMTEST
- 
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
-
-#define CONFIGURE_MAXIMUM_TASKS              111
-#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES     1
-#define CONFIGURE_TICKS_PER_TIMESLICE        0
- 
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/testsuites/tmtests/tm18/task1.c b/testsuites/tmtests/tm18/task1.c
deleted file mode 100644
index e86b889848..0000000000
--- a/testsuites/tmtests/tm18/task1.c
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "system.h"
-
-rtems_unsigned32 taskcount;
-rtems_task_priority taskpri;
-
-rtems_task First_task(
-  rtems_task_argument argument
-);
-
-rtems_task Middle_tasks(
-  rtems_task_argument argument
-);
-
-rtems_task Last_task(
-  rtems_task_argument argument
-);
-
-
-void test_init();
-
-rtems_task Init(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-
-  Print_Warning();
-
-  puts( "\n\n*** TIME TEST 18 ***" );
-
-  test_init();
-
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-}
-
-void test_init()
-{
-  rtems_id          id;
-  rtems_task_entry  task_entry;
-  rtems_unsigned32  index;
-  rtems_status_code status;
-
-  for ( index = 0 ; index <= OPERATION_COUNT ; index++ ) {
-    status = rtems_task_create(
-      rtems_build_name( 'T', 'I', 'M', 'E' ),
-      128,
-      RTEMS_MINIMUM_STACK_SIZE,
-      RTEMS_DEFAULT_MODES,
-      RTEMS_DEFAULT_ATTRIBUTES,
-      &id
-    );
-    directive_failed( status, "rtems_task_create loop" );
-
-    if ( index == OPERATION_COUNT ) task_entry = Last_task;
-    else if ( index == 0 )          task_entry = First_task;
-    else                            task_entry = Middle_tasks;
-
-
-    status = rtems_task_start( id, task_entry, 0 );
-    directive_failed( status, "rtems_task_start loop" );
-  }
-
-}
-
-rtems_task First_task(
-  rtems_task_argument argument
-)
-{
-  Timer_initialize();
-
-  (void) rtems_task_delete( RTEMS_SELF );
-}
-
-rtems_task Middle_tasks(
-  rtems_task_argument argument
-)
-{
-  (void) rtems_task_delete( RTEMS_SELF );
-}
-
-rtems_task Last_task(
-  rtems_task_argument argument
-)
-{
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_task_delete: calling task",
-    end_time,
-    OPERATION_COUNT,
-    0,
-    CALLING_OVERHEAD_TASK_DELETE
-  );
-
-  puts( "*** END OF TEST 18 ***" );
-  exit( 0 );
-}
diff --git a/testsuites/tmtests/tm18/tm18.doc b/testsuites/tmtests/tm18/tm18.doc
deleted file mode 100644
index 496f3569e5..0000000000
--- a/testsuites/tmtests/tm18/tm18.doc
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
diff --git a/testsuites/tmtests/tm19/system.h b/testsuites/tmtests/tm19/system.h
deleted file mode 100644
index 534584eed0..0000000000
--- a/testsuites/tmtests/tm19/system.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*  system.h
- *
- *  This include file is used by all tests in the Time Suite.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-#include <coverhd.h>
-#include <tmacros.h>
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
-
-#include <timesys.h>
-
-/* configuration information */
- 
-#define CONFIGURE_TMTEST
- 
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
-
-#define CONFIGURE_MAXIMUM_TASKS              111
-#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES     1
-#define CONFIGURE_TICKS_PER_TIMESLICE        0
- 
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/testsuites/tmtests/tm19/task1.c b/testsuites/tmtests/tm19/task1.c
deleted file mode 100644
index 14bd4a9a9a..0000000000
--- a/testsuites/tmtests/tm19/task1.c
+++ /dev/null
@@ -1,208 +0,0 @@
-/*
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "system.h"
-
-rtems_asr Process_asr_for_pass_1(
-  rtems_signal_set signals
-);
-
-rtems_asr Process_asr_for_pass_2(
-  rtems_signal_set signals
-);
-
-rtems_task Task_1(
-  rtems_task_argument argument
-);
-
-rtems_task Task_2(
-  rtems_task_argument argument
-);
-
-rtems_task Task_3(
-  rtems_task_argument argument
-);
-
-rtems_task Init(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-
-  Print_Warning();
-
-  puts( "\n\n*** TIME TEST 19 ***" );
-
-  status = rtems_task_create(
-    rtems_build_name( 'T', 'I', 'M', 'E' ),
-    128,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Task_id[ 1 ]
-  );
-  directive_failed( status, "rtems_task_create of TASK1" );
-
-  status = rtems_task_start( Task_id[ 1 ], Task_1, 0 );
-  directive_failed( status, "rtems_task_start of TASK1" );
-
-  status = rtems_task_create(
-    rtems_build_name( 'T', 'I', 'M', 'E' ),
-    127,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Task_id[ 2 ]
-  );
-  directive_failed( status, "rtems_task_create of TASK2" );
-
-  status = rtems_task_start( Task_id[ 2 ], Task_2, 0 );
-  directive_failed( status, "rtems_task_start of TASK2" );
-
-  status = rtems_task_create(
-    rtems_build_name( 'T', 'I', 'M', 'E' ),
-    126,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Task_id[ 3 ]
-  );
-  directive_failed( status, "rtems_task_create of TASK3" );
-
-  status = rtems_task_start( Task_id[ 3 ], Task_3, 0 );
-  directive_failed( status, "rtems_task_start of TASK3" );
-
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-}
-
-rtems_asr Process_asr_for_pass_1(
-  rtems_signal_set signals
-)
-{
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_signal_send: signal to self",
-    end_time,
-    1,
-    0,
-    CALLING_OVERHEAD_SIGNAL_SEND
-  );
-
-  Timer_initialize();
-}
-
-rtems_asr Process_asr_for_pass_2(
-  rtems_signal_set signals
-)
-{
-  rtems_status_code status;
-
-  status = rtems_task_resume( Task_id[ 3 ] );
-  directive_failed( status, "rtems_task_resume" );
-
-  Timer_initialize();
-}
-
-rtems_task Task_1(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-
-  Timer_initialize();
-    (void) rtems_signal_catch( Process_asr_for_pass_1, RTEMS_DEFAULT_MODES );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_signal_catch",
-    end_time,
-    1,
-    0,
-    CALLING_OVERHEAD_SIGNAL_CATCH
-  );
-
-  Timer_initialize();
-    rtems_signal_send( Task_id[ 2 ], 1 );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_signal_send: returns to caller",
-    end_time,
-    1,
-    0,
-    CALLING_OVERHEAD_SIGNAL_SEND
-  );
-
-  Timer_initialize();
-    (void) rtems_signal_send( RTEMS_SELF, RTEMS_SIGNAL_1 );
-
-  /* end time is done is RTEMS_ASR */
-
-  end_time = Read_timer();
-
-  put_time(
-    "exit ASR overhead: returns to calling task",
-    end_time,
-    1,
-    0,
-    0
-  );
-
-  status = rtems_signal_catch( Process_asr_for_pass_2, RTEMS_NO_PREEMPT );
-  directive_failed( status, "rtems_signal_catch" );
-
-  Timer_initialize();
-    (void) rtems_signal_send( RTEMS_SELF, RTEMS_SIGNAL_1 );
-}
-
-rtems_asr Process_asr_for_task_2(
-  rtems_signal_set signals
-)
-{
-  ;
-}
-
-rtems_task Task_2(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-
-  status = rtems_signal_catch( Process_asr_for_task_2, RTEMS_DEFAULT_MODES );
-  directive_failed( status, "rtems_signal_catch" );
-
-  (void) rtems_task_suspend( RTEMS_SELF );
-}
-
-rtems_task Task_3(
-  rtems_task_argument argument
-)
-{
-  (void) rtems_task_suspend( RTEMS_SELF );
-
-  end_time = Read_timer();
-
-  put_time(
-    "exit ASR overhead: returns to preempting task",
-    end_time,
-    1,
-    0,
-    0
-  );
-
-  puts( "*** END OF TEST 19 ***" );
-  exit( 0 );
-}
diff --git a/testsuites/tmtests/tm19/tm19.doc b/testsuites/tmtests/tm19/tm19.doc
deleted file mode 100644
index 496f3569e5..0000000000
--- a/testsuites/tmtests/tm19/tm19.doc
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
diff --git a/testsuites/tmtests/tm20/system.h b/testsuites/tmtests/tm20/system.h
deleted file mode 100644
index a96f77a41d..0000000000
--- a/testsuites/tmtests/tm20/system.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*  system.h
- *
- *  This include file is used by all tests in the Time Suite.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-#include <coverhd.h>
-#include <tmacros.h>
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
-
-#include <timesys.h>
-
-/* configuration information */
- 
-#define CONFIGURE_TMTEST
- 
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
-#define CONFIGURE_TEST_NEEDS_STUB_DRIVER
-
-#define CONFIGURE_MAXIMUM_PARTITIONS         1
-#define CONFIGURE_MAXIMUM_REGIONS            1
-#define CONFIGURE_TICKS_PER_TIMESLICE        0
- 
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/testsuites/tmtests/tm20/task1.c b/testsuites/tmtests/tm20/task1.c
deleted file mode 100644
index 6f2505c7aa..0000000000
--- a/testsuites/tmtests/tm20/task1.c
+++ /dev/null
@@ -1,466 +0,0 @@
-/*
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "system.h"
-
-rtems_device_major_number _STUB_major = 1;
-
-rtems_id         Region_id;
-rtems_name       Region_name;
-rtems_unsigned8  Region_area[ 2048 ] CPU_STRUCTURE_ALIGNMENT;
-
-rtems_id         Partition_id;
-rtems_name       Partition_name;
-rtems_unsigned8  Partition_area[ 2048 ] CPU_STRUCTURE_ALIGNMENT;
-
-void            *Buffer_address_1;
-void            *Buffer_address_2;
-void            *Buffer_address_3;
-void            *Buffer_address_4;
-
-rtems_unsigned32 buffer_count;
-
-void            *Buffer_addresses[ OPERATION_COUNT+1 ];
-
-rtems_task Task_1(
-  rtems_task_argument argument
-);
-
-rtems_task Task_2(
-  rtems_task_argument argument
-);
-
-rtems_task Init(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-
-  Print_Warning();
-
-  puts( "\n\n*** TIME TEST 20 ***" );
-
-  status = rtems_task_create(
-    rtems_build_name( 'T', 'I', 'M', '1' ),
-    128,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Task_id[ 1 ]
-  );
-  directive_failed( status, "rtems_task_create of TASK1" );
-
-  status = rtems_task_start( Task_id[ 1 ], Task_1, 0 );
-  directive_failed( status, "rtems_task_start of TASK1" );
-
-  status = rtems_task_create(
-    rtems_build_name( 'T', 'I', 'M', '2' ),
-    129,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Task_id[ 2 ]
-  );
-  directive_failed( status, "rtems_task_create of TASK2" );
-
-  status = rtems_task_start( Task_id[ 2 ], Task_2, 0 );
-  directive_failed( status, "rtems_task_start of TASK2" );
-
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-}
-
-rtems_task Task_1(
-  rtems_task_argument argument
-)
-{
-  rtems_unsigned32    index;
-  rtems_mode          previous_mode;
-  rtems_task_priority previous_priority;
-  rtems_status_code   status;
-
-  Partition_name = rtems_build_name( 'P', 'A', 'R', 'T' );
-
-  Timer_initialize();
-    rtems_partition_create(
-      Partition_name,
-      Partition_area,
-      2048,
-      128,
-      RTEMS_DEFAULT_ATTRIBUTES,
-      &Partition_id
-    );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_partition_create",
-    end_time,
-    1,
-    0,
-    CALLING_OVERHEAD_PARTITION_CREATE
-  );
-
-  Region_name = rtems_build_name( 'R', 'E', 'G', 'N' );
-
-  Timer_initialize();
-    rtems_region_create(
-      Region_name,
-      Region_area,
-      2048,
-      16,
-      RTEMS_DEFAULT_ATTRIBUTES,
-      &Region_id
-    );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_region_create",
-    end_time,
-    1,
-    0,
-    CALLING_OVERHEAD_REGION_CREATE
-  );
-
-  Timer_initialize();
-    (void) rtems_partition_get_buffer( Partition_id, &Buffer_address_1 );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_partition_get_buffer: available",
-    end_time,
-    1,
-    0,
-    CALLING_OVERHEAD_PARTITION_GET_BUFFER
-  );
-
-  buffer_count = 0;
-  while ( FOREVER ) {
-
-    status = rtems_partition_get_buffer(
-               Partition_id,
-               &Buffer_addresses[ buffer_count ]
-            );
-
-    if ( status == RTEMS_UNSATISFIED ) break;
-
-    buffer_count++;
-  }
-
-  Timer_initialize();
-    (void) rtems_partition_get_buffer( Partition_id, &Buffer_address_2 );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_partition_get_buffer: not available",
-    end_time,
-    1,
-    0,
-    CALLING_OVERHEAD_PARTITION_GET_BUFFER
-  );
-
-  Timer_initialize();
-    (void) rtems_partition_return_buffer( Partition_id, Buffer_address_1 );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_partition_return_buffer",
-    end_time,
-    1,
-    0,
-    CALLING_OVERHEAD_PARTITION_RETURN_BUFFER
-  );
-
-  for ( index = 0 ; index < buffer_count ; index++ ) {
-
-    status = rtems_partition_return_buffer(
-               Partition_id,
-               Buffer_addresses[ index ]
-             );
-    directive_failed( status, "rtems_partition_return_buffer" );
-
-  }
-
-  Timer_initialize();
-    (void) rtems_partition_delete( Partition_id );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_partition_delete",
-    end_time,
-    1,
-    0,
-    CALLING_OVERHEAD_PARTITION_DELETE
-  );
-
-  status = rtems_region_get_segment(
-             Region_id,
-             400,
-             RTEMS_DEFAULT_OPTIONS,
-             RTEMS_NO_TIMEOUT,
-             &Buffer_address_2
-           );
-  directive_failed( status, "region_get_semgent" );
-
-  Timer_initialize();
-    (void) rtems_region_get_segment(
-      Region_id,
-      400,
-      RTEMS_DEFAULT_OPTIONS,
-      RTEMS_NO_TIMEOUT,
-      &Buffer_address_3
-    );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_region_get_segment: available",
-    end_time,
-    1,
-    0,
-    CALLING_OVERHEAD_REGION_GET_SEGMENT
-  );
-
-  Timer_initialize();
-    (void) rtems_region_get_segment(
-      Region_id,
-      1998,
-      RTEMS_NO_WAIT,
-      RTEMS_NO_TIMEOUT,
-      &Buffer_address_4
-    );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_region_get_segment: not available -- NO_WAIT",
-    end_time,
-    1,
-    0,
-    CALLING_OVERHEAD_REGION_GET_SEGMENT
-  );
-
-  status = rtems_region_return_segment( Region_id, Buffer_address_3 );
-  directive_failed( status, "rtems_region_return_segment" );
-
-  Timer_initialize();
-    (void) rtems_region_return_segment( Region_id, Buffer_address_2 );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_region_return_segment: no waiting tasks",
-    end_time,
-    1,
-    0,
-    CALLING_OVERHEAD_REGION_RETURN_SEGMENT
-  );
-
-  status = rtems_region_get_segment(
-    Region_id,
-    400,
-    RTEMS_DEFAULT_OPTIONS,
-    RTEMS_NO_TIMEOUT,
-    &Buffer_address_1
-  );
-  directive_failed( status, "rtems_region_get_segment" );
-
-  Timer_initialize();
-    (void) rtems_region_get_segment(
-      Region_id,
-      1998,
-      RTEMS_DEFAULT_OPTIONS,
-      RTEMS_NO_TIMEOUT,
-      &Buffer_address_2
-    );
-
-  /* execute Task_2 */
-
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_region_return_segment: task readied -- preempts caller",
-    end_time,
-    1,
-    0,
-    CALLING_OVERHEAD_REGION_RETURN_SEGMENT
-  );
-
-  status = rtems_region_return_segment( Region_id, Buffer_address_2 );
-  directive_failed( status, "rtems_region_return_segment" );
-
-  status = rtems_task_mode(
-    RTEMS_NO_PREEMPT,
-    RTEMS_PREEMPT_MASK,
-    &previous_mode
-  );
-  directive_failed( status, "rtems_task_mode" );
-
-  status = rtems_task_set_priority( RTEMS_SELF, 254, &previous_priority );
-  directive_failed( status, "rtems_task_set_priority" );
-
-  status = rtems_region_get_segment(
-    Region_id,
-    400,
-    RTEMS_DEFAULT_OPTIONS,
-    RTEMS_NO_TIMEOUT,
-    &Buffer_address_1
-  );
-  directive_failed( status, "rtems_region_return_segment" );
-
-  status = rtems_region_get_segment(
-    Region_id,
-    1998,
-    RTEMS_DEFAULT_OPTIONS,
-    RTEMS_NO_TIMEOUT,
-    &Buffer_address_2
-  );
-  directive_failed( status, "rtems_region_get_segment" );
-
-  /* execute Task_2 */
-
-  status = rtems_region_return_segment( Region_id, Buffer_address_2 );
-  directive_failed( status, "rtems_region_return_segment" );
-
-  Timer_initialize();
-    (void) rtems_region_delete( Region_id );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_region_delete",
-    end_time,
-    1,
-    0,
-    CALLING_OVERHEAD_REGION_DELETE
-  );
-
-  Timer_initialize();
-    for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) Empty_function();
-  overhead = Read_timer();
-
-  Timer_initialize();
-    for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) rtems_io_initialize( _STUB_major, 0, NULL );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_io_initialize",
-    end_time,
-    OPERATION_COUNT,
-    overhead,
-    CALLING_OVERHEAD_IO_INITIALIZE
-  );
-
-  Timer_initialize();
-    for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) rtems_io_open( _STUB_major, 0, NULL );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_io_open",
-    end_time,
-    OPERATION_COUNT,
-    overhead,
-    CALLING_OVERHEAD_IO_OPEN
-  );
-
-  Timer_initialize();
-    for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) rtems_io_close( _STUB_major, 0, NULL );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_io_close",
-    end_time,
-    OPERATION_COUNT,
-    overhead,
-    CALLING_OVERHEAD_IO_CLOSE
-  );
-
-  Timer_initialize();
-    for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) rtems_io_read( _STUB_major, 0, NULL );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_io_read",
-    end_time,
-    OPERATION_COUNT,
-    overhead,
-    CALLING_OVERHEAD_IO_READ
-  );
-
-  Timer_initialize();
-    for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) rtems_io_write( _STUB_major, 0, NULL );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_io_write",
-    end_time,
-    OPERATION_COUNT,
-    overhead,
-    CALLING_OVERHEAD_IO_WRITE
-  );
-
-  Timer_initialize();
-    for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) rtems_io_control( _STUB_major, 0, NULL );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_io_control",
-    end_time,
-    OPERATION_COUNT,
-    overhead,
-    CALLING_OVERHEAD_IO_CONTROL
-  );
-
-  puts( "*** END OF TEST 20 ***" );
-  exit( 0 );
-}
-
-rtems_task Task_2(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_region_get_segment: not available -- caller blocks",
-    end_time,
-    1,
-    0,
-    CALLING_OVERHEAD_REGION_GET_SEGMENT
-  );
-
-  Timer_initialize();
-    (void) rtems_region_return_segment( Region_id, Buffer_address_1 );
-
-  /* preempt back to Task_1 */
-
-  Timer_initialize();
-    (void) rtems_region_return_segment( Region_id, Buffer_address_1 );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_region_return_segment: task readied -- returns to caller",
-    end_time,
-    1,
-    0,
-    CALLING_OVERHEAD_REGION_RETURN_SEGMENT
-  );
-
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-}
diff --git a/testsuites/tmtests/tm20/tm20.doc b/testsuites/tmtests/tm20/tm20.doc
deleted file mode 100644
index 496f3569e5..0000000000
--- a/testsuites/tmtests/tm20/tm20.doc
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
diff --git a/testsuites/tmtests/tm21/system.h b/testsuites/tmtests/tm21/system.h
deleted file mode 100644
index 28b5a31469..0000000000
--- a/testsuites/tmtests/tm21/system.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*  system.h
- *
- *  This include file is used by all tests in the Time Suite.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-#include <coverhd.h>
-#include <tmacros.h>
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
-
-#include <timesys.h>
-
-/* configuration information */
- 
-#define CONFIGURE_TMTEST
- 
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
-
-#define CONFIGURE_MAXIMUM_TASKS              102
-#define CONFIGURE_MAXIMUM_TIMERS             100
-#define CONFIGURE_MAXIMUM_SEMAPHORES         100
-#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES     100
-#define CONFIGURE_MAXIMUM_PARTITIONS         100
-#define CONFIGURE_MAXIMUM_REGIONS            100
-#define CONFIGURE_MAXIMUM_PORTS              100
-#define CONFIGURE_MAXIMUM_PERIODS            100
-
-#define CONFIGURE_TICKS_PER_TIMESLICE        0
- 
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/testsuites/tmtests/tm21/task1.c b/testsuites/tmtests/tm21/task1.c
deleted file mode 100644
index f3fd4e04e3..0000000000
--- a/testsuites/tmtests/tm21/task1.c
+++ /dev/null
@@ -1,236 +0,0 @@
-/*
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "system.h"
-
-rtems_unsigned8 Region_area[ 2048 ] CPU_STRUCTURE_ALIGNMENT;
-rtems_unsigned8 Partition_area[ 2048 ] CPU_STRUCTURE_ALIGNMENT;
-
-rtems_task Task_1(
-  rtems_task_argument argument
-);
-
-rtems_task Init(
-  rtems_task_argument argument
-)
-{
-  rtems_id          id;
-  rtems_status_code status;
-
-  Print_Warning();
-
-  puts( "\n\n*** TIME TEST 21 ***" );
-
-  status = rtems_task_create(
-    rtems_build_name( 'T', 'I', 'M', 'E' ),
-    250,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &id
-  );
-  directive_failed( status, "rtems_task_create of TASK1" );
-
-  status = rtems_task_start( id, Task_1, 0 );
-  directive_failed( status, "rtems_task_start of TASK1" );
-
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-}
-
-rtems_task Task_1(
-  rtems_task_argument argument
-)
-{
-  rtems_unsigned32  index;
-  rtems_id          id;
-  rtems_status_code status;
-
-  for( index = 1 ; index <= OPERATION_COUNT ; index++ ) {
-    status = rtems_task_create (
-      index,
-      254,
-      RTEMS_MINIMUM_STACK_SIZE,
-      RTEMS_DEFAULT_MODES,
-      RTEMS_DEFAULT_ATTRIBUTES,
-      &id
-    );
-    directive_failed( status, "rtems_task_create" );
-
-    status = rtems_message_queue_create(
-      index,
-      1,                       /* only going to ident this queue */
-      16,
-      RTEMS_DEFAULT_ATTRIBUTES,
-      &id
-    );
-    directive_failed( status, "rtems_message_queue_create" );
-
-    status = rtems_semaphore_create(
-      index,
-      OPERATION_COUNT,
-      RTEMS_DEFAULT_ATTRIBUTES,
-      RTEMS_NO_PRIORITY,
-      &id
-    );
-    directive_failed( status, "rtems_semaphore_create" );
-
-    status = rtems_region_create(
-      index,
-      Region_area,
-      2048,
-      16,
-      RTEMS_DEFAULT_ATTRIBUTES,
-      &id
-    );
-    directive_failed( status, "rtems_region_create" );
-
-    status = rtems_partition_create(
-      index,
-      Partition_area,
-      2048,
-      128,
-      RTEMS_DEFAULT_ATTRIBUTES,
-      &id
-    );
-    directive_failed( status, "rtems_partition_create" );
-
-    status = rtems_port_create(
-      index,
-      Partition_area,
-      Region_area,
-      0xff,
-      &id
-    );
-    directive_failed( status, "rtems_port_create" );
-
-    status = rtems_timer_create( index, &id );
-    directive_failed( status, "rtems_timer_create" );
-
-    status = rtems_rate_monotonic_create( index, &id );
-    directive_failed( status, "rtems_rate_monotonic_create" );
-  }
-
-  Timer_initialize();
-    for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) Empty_function();
-  overhead = Read_timer();
-
-  Timer_initialize();
-    for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) rtems_task_ident( index, RTEMS_SEARCH_ALL_NODES, &id );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_task_ident",
-    end_time,
-    OPERATION_COUNT,
-    overhead,
-    CALLING_OVERHEAD_TASK_IDENT
-  );
-
-  Timer_initialize();
-    for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) rtems_message_queue_ident( index, RTEMS_SEARCH_ALL_NODES, &id );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_message_queue_ident",
-    end_time,
-    OPERATION_COUNT,
-    overhead,
-    CALLING_OVERHEAD_MESSAGE_QUEUE_IDENT
-  );
-
-  Timer_initialize();
-    for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) rtems_semaphore_ident( index, RTEMS_SEARCH_ALL_NODES, &id );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_semaphore_ident",
-    end_time,
-    OPERATION_COUNT,
-    overhead,
-    CALLING_OVERHEAD_SEMAPHORE_IDENT
-  );
-
-  Timer_initialize();
-    for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) rtems_partition_ident( index, RTEMS_SEARCH_ALL_NODES, &id );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_partition_ident",
-    end_time,
-    OPERATION_COUNT,
-    overhead,
-    CALLING_OVERHEAD_PARTITION_IDENT
-  );
-
-  Timer_initialize();
-    for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) rtems_region_ident( index, &id );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_region_ident",
-    end_time,
-    OPERATION_COUNT,
-    overhead,
-    CALLING_OVERHEAD_REGION_IDENT
-  );
-
-  Timer_initialize();
-    for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) rtems_port_ident( index, &id );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_port_ident",
-    end_time,
-    OPERATION_COUNT,
-    overhead,
-    CALLING_OVERHEAD_PORT_IDENT
-  );
-
-  Timer_initialize();
-    for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) rtems_timer_ident( index, &id );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_timer_ident",
-    end_time,
-    OPERATION_COUNT,
-    overhead,
-    CALLING_OVERHEAD_TIMER_IDENT
-  );
-
-  Timer_initialize();
-    for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) rtems_rate_monotonic_ident( index, &id );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_rate_monotonic_ident",
-    end_time,
-    OPERATION_COUNT,
-    overhead,
-    CALLING_OVERHEAD_RATE_MONOTONIC_IDENT
-  );
-
-  puts( "*** END OF TEST 21 ***" );
-  exit( 0 );
-}
diff --git a/testsuites/tmtests/tm21/tm21.doc b/testsuites/tmtests/tm21/tm21.doc
deleted file mode 100644
index 496f3569e5..0000000000
--- a/testsuites/tmtests/tm21/tm21.doc
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
diff --git a/testsuites/tmtests/tm22/system.h b/testsuites/tmtests/tm22/system.h
deleted file mode 100644
index 8884d8eaf6..0000000000
--- a/testsuites/tmtests/tm22/system.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*  system.h
- *
- *  This include file is used by all tests in the Time Suite.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-#include <coverhd.h>
-#include <tmacros.h>
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
-
-#include <timesys.h>
-
-/* configuration information */
- 
-#define CONFIGURE_TMTEST
- 
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
-
-#define CONFIGURE_MAXIMUM_TASKS              103
-#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES     1
-#define CONFIGURE_TICKS_PER_TIMESLICE        0
- 
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/testsuites/tmtests/tm22/task1.c b/testsuites/tmtests/tm22/task1.c
deleted file mode 100644
index 817f3a71d6..0000000000
--- a/testsuites/tmtests/tm22/task1.c
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "system.h"
-
-rtems_id Queue_id;
-
-long Buffer[4];
-
-rtems_task Low_task(
-  rtems_task_argument argument
-);
-
-rtems_task High_task(
-  rtems_task_argument argument
-);
-
-rtems_task Preempt_task(
-  rtems_task_argument argument
-);
-
-rtems_task Init(
-  rtems_task_argument argument
-)
-{
-  rtems_id          id;
-  rtems_status_code status;
-
-  Print_Warning();
-
-  puts( "\n\n*** TIME TEST 22 ***" );
-
-  status = rtems_message_queue_create(
-    rtems_build_name( 'M', 'Q', '1', ' '),
-    100,
-    16,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Queue_id
-  );
-  directive_failed( status, "rtems_message_queue_create" );
-
-  status = rtems_task_create(
-    rtems_build_name( 'L', 'O', 'W', ' ' ),
-    10,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_NO_PREEMPT,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &id
-  );
-  directive_failed( status, "rtems_task_create" );
-
-  status = rtems_task_start( id, Low_task, 0 );
-  directive_failed( status, "rtems_task_start LOW" );
-
-  status = rtems_task_create(
-    1,
-    11,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &id
-  );
-  directive_failed( status, "rtems_task_create RTEMS_PREEMPT" );
-
-  status = rtems_task_start( id, Preempt_task, 0 );
-  directive_failed( status, "rtems_task_start RTEMS_PREEMPT" );
-
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-}
-
-rtems_task High_task(
-  rtems_task_argument argument
-)
-{
-  rtems_unsigned32  count;
-  rtems_status_code status;
-
-  Timer_initialize();
-    (void) rtems_message_queue_broadcast(
-             Queue_id,
-             (long (*)[4]) Buffer,
-             16,
-             &count
-           );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_message_queue_broadcast: task readied -- returns to caller",
-    end_time,
-    1,
-    0,
-    CALLING_OVERHEAD_MESSAGE_QUEUE_BROADCAST
-  );
-
-  status = rtems_task_suspend(RTEMS_SELF);
-  directive_failed( status, "rtems_task_suspend" );
-}
-
-rtems_task Low_task(
-  rtems_task_argument argument
-)
-{
-  rtems_id          id;
-  rtems_unsigned32  index;
-  rtems_unsigned32  count;
-  rtems_unsigned32  size;
-  rtems_status_code status;
-
-  status = rtems_task_create(
-    rtems_build_name( 'H', 'I', 'G', 'H' ),
-    5,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_NO_PREEMPT,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &id
-  );
-  directive_failed( status, "rtems_task_create" );
-
-  status = rtems_task_start( id, High_task, 0 );
-  directive_failed( status, "rtems_task_start HIGH" );
-
-  status = rtems_message_queue_receive(
-    Queue_id,
-    (long (*)[4]) Buffer,
-    &size,
-    RTEMS_DEFAULT_OPTIONS,
-    RTEMS_NO_TIMEOUT
-  );
-  directive_failed( status, "message_queu_receive" );
-
-  Timer_initialize();
-    for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) rtems_message_queue_broadcast(
-               Queue_id,
-               (long (*)[4]) Buffer,
-               16,
-               &count
-             );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_message_queue_broadcast: no waiting tasks",
-    end_time,
-    OPERATION_COUNT,
-    1,
-    CALLING_OVERHEAD_MESSAGE_QUEUE_BROADCAST
-  );
-
-  (void) rtems_message_queue_receive(
-           Queue_id,
-           (long (*)[4]) Buffer,
-           &size,
-           RTEMS_DEFAULT_OPTIONS,
-           RTEMS_NO_TIMEOUT
-         );
-
-  /* should go to Preempt_task here */
-
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_message_queue_broadcast: task readied -- preempts caller",
-    end_time,
-    1,
-    0,
-    CALLING_OVERHEAD_MESSAGE_QUEUE_BROADCAST
-  );
-
-  puts( "*** END OF TEST 22 ***" );
-  exit( 0 );
-}
-
-rtems_task Preempt_task(
-  rtems_task_argument argument
-)
-{
-  rtems_unsigned32  count;
-
-  Timer_initialize();
-    (void) rtems_message_queue_broadcast(
-             Queue_id,
-             (long (*)[4]) Buffer,
-             16,
-             &count
-           );
-
- /* should be preempted by low task */
-}
diff --git a/testsuites/tmtests/tm22/tm22.doc b/testsuites/tmtests/tm22/tm22.doc
deleted file mode 100644
index 496f3569e5..0000000000
--- a/testsuites/tmtests/tm22/tm22.doc
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
diff --git a/testsuites/tmtests/tm23/system.h b/testsuites/tmtests/tm23/system.h
deleted file mode 100644
index 246a14480d..0000000000
--- a/testsuites/tmtests/tm23/system.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*  system.h
- *
- *  This include file is used by all tests in the Time Suite.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-#include <coverhd.h>
-#include <tmacros.h>
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
-
-#include <timesys.h>
-
-/* configuration information */
- 
-#define CONFIGURE_TMTEST
- 
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
-
-#define CONFIGURE_MAXIMUM_TASKS              111
-#define CONFIGURE_MAXIMUM_TIMERS             110
-#define CONFIGURE_TICKS_PER_TIMESLICE        0
- 
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/testsuites/tmtests/tm23/task1.c b/testsuites/tmtests/tm23/task1.c
deleted file mode 100644
index 70c59e93f5..0000000000
--- a/testsuites/tmtests/tm23/task1.c
+++ /dev/null
@@ -1,302 +0,0 @@
-/*
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "system.h"
-
-rtems_id          Timer_id[ OPERATION_COUNT+1 ];
-
-rtems_time_of_day time_of_day;
-
-void null_delay(
-  rtems_id  ignored_id,
-  void     *ignored_address
-);
-
-rtems_task Low_task(
-  rtems_task_argument argument
-);
-
-rtems_task Middle_tasks(
-  rtems_task_argument argument
-);
-
-rtems_task High_task(
-  rtems_task_argument argument
-);
-
-
-rtems_task Init(
-  rtems_task_argument argument
-)
-{
-
-  rtems_task_priority priority;
-  rtems_unsigned32    index;
-  rtems_id            id;
-  rtems_task_entry    task_entry;
-  rtems_status_code   status;
-
-  Print_Warning();
-
-  puts( "\n\n*** TIME TEST 23 ***" );
-
-  Timer_initialize();
-    for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) Empty_function();
-  overhead = Read_timer();
-
-  priority = 5;
-
-  for( index=1 ; index <= OPERATION_COUNT ; index++ ) {
-    status = rtems_task_create(
-      rtems_build_name( 'T', 'I', 'M', 'E' ),
-      priority,
-      RTEMS_MINIMUM_STACK_SIZE,
-      RTEMS_DEFAULT_MODES,
-      RTEMS_DEFAULT_ATTRIBUTES,
-      &id
-    );
-    directive_failed( status, "rtems_task_create LOOP" );
-
-    if ( index == 1 )                    task_entry = High_task;
-    else if ( index == OPERATION_COUNT ) task_entry = Low_task;
-    else                                 task_entry = Middle_tasks;
-
-    status = rtems_task_start( id, task_entry, 0 );
-    directive_failed( status, "rtems_task_start LOOP" );
-
-    priority++;
-  }
-
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-}
-
-void null_delay(
-  rtems_id  ignored_id,
-  void     *ignored_address
-)
-{
-}
-
-rtems_task High_task(
-  rtems_task_argument argument
-)
-{
-  rtems_unsigned32  index;
-  rtems_status_code status;
-  int i;
-
-  Timer_initialize();
-    for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) Empty_function();
-  overhead = Read_timer();
-
-  Timer_initialize();
-    for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) rtems_timer_create( index, &Timer_id[ index ] );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_timer_create",
-    end_time,
-    OPERATION_COUNT,
-    overhead,
-    CALLING_OVERHEAD_TIMER_CREATE
-  );
-
-  Timer_initialize();
-    for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) rtems_timer_fire_after( Timer_id[ index ], 500, null_delay, NULL );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_timer_fire_after: inactive",
-    end_time,
-    OPERATION_COUNT,
-    overhead,
-    CALLING_OVERHEAD_TIMER_FIRE_AFTER
-  );
-
-  Timer_initialize();
-    for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) rtems_timer_fire_after( Timer_id[ index ], 500, null_delay, NULL );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_timer_fire_after: active",
-    end_time,
-    OPERATION_COUNT,
-    overhead,
-    CALLING_OVERHEAD_TIMER_FIRE_AFTER
-  );
-
-  Timer_initialize();
-    for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) rtems_timer_cancel( Timer_id[ index ] );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_timer_cancel: active",
-    end_time,
-    OPERATION_COUNT,
-    overhead,
-    CALLING_OVERHEAD_TIMER_CANCEL
-  );
-
-  for ( Timer_initialize(), i=0 ; i<OPERATION_COUNT ; i++ )
-  Timer_initialize();
-    for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) rtems_timer_cancel( Timer_id[ index ] );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_timer_cancel: inactive",
-    end_time,
-    OPERATION_COUNT,
-    overhead,
-    CALLING_OVERHEAD_TIMER_CANCEL
-  );
-
-  for ( Timer_initialize(), i=0 ; i<OPERATION_COUNT ; i++ )
-  Timer_initialize();
-    for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) rtems_timer_reset( Timer_id[ index ] );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_timer_reset: inactive",
-    end_time,
-    OPERATION_COUNT,
-    overhead,
-    CALLING_OVERHEAD_TIMER_RESET
-  );
-
-  Timer_initialize();
-    for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) rtems_timer_reset( Timer_id[ index ] );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_timer_reset: active",
-    end_time,
-    OPERATION_COUNT,
-    overhead,
-    CALLING_OVERHEAD_TIMER_RESET
-  );
-
-  for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-    (void) rtems_timer_reset( Timer_id[ index ] );
-
-  build_time( &time_of_day, 12, 31, 1988, 9, 0, 0, 0 );
-
-  status = rtems_clock_set( &time_of_day );
-  directive_failed( status, "rtems_clock_set" );
-
-  time_of_day.year = 1989;
-
-  Timer_initialize();
-    for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) rtems_timer_fire_when(
-         Timer_id[ index ], &time_of_day, null_delay, NULL );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_timer_fire_when: inactive",
-    end_time,
-    OPERATION_COUNT,
-    overhead,
-    CALLING_OVERHEAD_TIMER_FIRE_WHEN
-  );
-
-  Timer_initialize();
-    for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) rtems_timer_fire_when(
-         Timer_id[ index ], &time_of_day, null_delay, NULL );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_timer_fire_when: active",
-    end_time,
-    OPERATION_COUNT,
-    overhead,
-    CALLING_OVERHEAD_TIMER_FIRE_WHEN
-  );
-
-  Timer_initialize();
-    for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) rtems_timer_delete( Timer_id[ index ] );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_timer_delete: active",
-    end_time,
-    OPERATION_COUNT,
-    overhead,
-    CALLING_OVERHEAD_TIMER_DELETE
-  );
-
-  Timer_initialize();
-  for ( index=1 ; index <= OPERATION_COUNT ; index++ ) {
-    status = rtems_timer_create( index, &Timer_id[ index ] );
-    directive_failed( status, "rtems_timer_create" );
-
-    status = rtems_timer_fire_after( Timer_id[ index ], 500, null_delay, NULL );
-    directive_failed( status, "rtems_timer_fire_after" );
-
-    status = rtems_timer_cancel( Timer_id[ index ] );
-    directive_failed( status, "rtems_timer_cancel" );
-  }
-
-  Timer_initialize();
-    for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) rtems_timer_delete( Timer_id[ index ] );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_timer_delete: inactive",
-    end_time,
-    OPERATION_COUNT,
-    overhead,
-    CALLING_OVERHEAD_TIMER_DELETE
-  );
-
-  Timer_initialize();
-    (void) rtems_task_wake_when( &time_of_day );
-}
-
-rtems_task Middle_tasks(
-  rtems_task_argument argument
-)
-{
-  (void) rtems_task_wake_when( &time_of_day );
-}
-
-rtems_task Low_task(
-  rtems_task_argument argument
-)
-{
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_task_wake_when",
-    end_time,
-    OPERATION_COUNT,
-    0,
-    CALLING_OVERHEAD_TASK_WAKE_WHEN
-  );
-
-  puts( "*** END OF TEST 23 ***" );
-  exit( 0 );
-}
diff --git a/testsuites/tmtests/tm23/tm23.doc b/testsuites/tmtests/tm23/tm23.doc
deleted file mode 100644
index 496f3569e5..0000000000
--- a/testsuites/tmtests/tm23/tm23.doc
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
diff --git a/testsuites/tmtests/tm24/system.h b/testsuites/tmtests/tm24/system.h
deleted file mode 100644
index 51fbb131b8..0000000000
--- a/testsuites/tmtests/tm24/system.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*  system.h
- *
- *  This include file is used by all tests in the Time Suite.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-#include <coverhd.h>
-#include <tmacros.h>
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
-
-#include <timesys.h>
-
-/* configuration information */
- 
-#define CONFIGURE_TMTEST
- 
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
-
-#define CONFIGURE_MAXIMUM_TASKS              111
-#define CONFIGURE_TICKS_PER_TIMESLICE        0
- 
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/testsuites/tmtests/tm24/task1.c b/testsuites/tmtests/tm24/task1.c
deleted file mode 100644
index a4e78f126a..0000000000
--- a/testsuites/tmtests/tm24/task1.c
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "system.h"
-
-rtems_unsigned32 Task_count;
-
-rtems_task Tasks(
-  rtems_task_argument argument
-);
-
-rtems_task High_task(
-  rtems_task_argument argument
-);
-
-rtems_task Init(
-  rtems_task_argument argument
-)
-{
-  rtems_id          id;
-  rtems_unsigned32  index;
-  rtems_status_code status;
-
-  Print_Warning();
-
-  puts( "\n\n*** TIME TEST 24 ***" );
-
-  status = rtems_task_create(
-    rtems_build_name( 'H', 'I', 'G', 'H' ),
-    10,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &id
-  );
-  directive_failed( status, "rtems_task_create HIGH" );
-
-  status = rtems_task_start( id, High_task, 0 );
-  directive_failed( status, "rtems_task_create HIGH" );
-
-  for ( index = 1 ; index <= OPERATION_COUNT ; index++ ) {
-    status = rtems_task_create(
-      rtems_build_name( 'R', 'E', 'S', 'T' ),
-      128,
-      RTEMS_MINIMUM_STACK_SIZE,
-      RTEMS_DEFAULT_MODES,
-      RTEMS_DEFAULT_ATTRIBUTES,
-      &id
-    );
-    directive_failed( status, "rtems_task_create LOOP" );
-
-    status = rtems_task_start( id, Tasks, 0 );
-    directive_failed( status, "rtems_task_start LOOP" );
-  }
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-}
-
-rtems_task High_task(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-  rtems_unsigned32  index;
-
-  Timer_initialize();
-    for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) Empty_function();
-  overhead = Read_timer();
-
-  Timer_initialize();
-    for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) rtems_task_wake_after( RTEMS_YIELD_PROCESSOR );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_task_wake_after: yield -- returns to caller",
-    end_time,
-    OPERATION_COUNT,
-    overhead,
-    CALLING_OVERHEAD_TASK_WAKE_AFTER
-  );
-
-  Task_count = 0;
-
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-}
-
-rtems_task Tasks(
-  rtems_task_argument argument
-)
-{
-  Task_count++;
-
-  if ( Task_count == 1 )
-    Timer_initialize();
-  else if ( Task_count == OPERATION_COUNT ) {
-    end_time = Read_timer();
-
-    put_time(
-      "rtems_task_wake_after: yields -- preempts caller",
-      end_time,
-      OPERATION_COUNT,
-      overhead,
-      CALLING_OVERHEAD_TASK_WAKE_AFTER
-    );
-
-  puts( "*** END OF TEST 24 ***" );
-    exit( 0 );
-  }
-  (void) rtems_task_wake_after( RTEMS_YIELD_PROCESSOR );
-}
diff --git a/testsuites/tmtests/tm24/tm24.doc b/testsuites/tmtests/tm24/tm24.doc
deleted file mode 100644
index 496f3569e5..0000000000
--- a/testsuites/tmtests/tm24/tm24.doc
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
diff --git a/testsuites/tmtests/tm25/system.h b/testsuites/tmtests/tm25/system.h
deleted file mode 100644
index a31ee198f7..0000000000
--- a/testsuites/tmtests/tm25/system.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*  system.h
- *
- *  This include file is used by all tests in the Time Suite.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-#include <coverhd.h>
-#include <tmacros.h>
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
-
-#include <timesys.h>
-
-/* configuration information */
- 
-#define CONFIGURE_TMTEST
- 
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
-
-#define CONFIGURE_MAXIMUM_TASKS              111
-#define CONFIGURE_MAXIMUM_SEMAPHORES         1
-#define CONFIGURE_TICKS_PER_TIMESLICE        0
- 
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/testsuites/tmtests/tm25/task1.c b/testsuites/tmtests/tm25/task1.c
deleted file mode 100644
index 6d79ed46a0..0000000000
--- a/testsuites/tmtests/tm25/task1.c
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "system.h"
-
-rtems_id Semaphore_id;
-
-rtems_task High_tasks(
-  rtems_task_argument argument
-);
-
-rtems_task Low_task(
-  rtems_task_argument argument
-);
-
-rtems_task Init(
-  rtems_task_argument argument
-)
-{
-  rtems_id          task_id;
-  rtems_unsigned32  index;
-  rtems_status_code status;
-
-  Print_Warning();
-
-  puts( "\n\n*** TIME TEST 25 ***" );
-
-  status = rtems_semaphore_create(
-    rtems_build_name( 'S', 'M', '1', ' ') ,
-    0,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    RTEMS_NO_PRIORITY,
-    &Semaphore_id
-  );
-  directive_failed( status, "rtems_semaphore_create of SM1" );
-
-  status = rtems_task_create(
-    rtems_build_name( 'L', 'O', 'W', ' ' ),
-    254,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &task_id
-  );
-  directive_failed( status, "rtems_task_create LOW" );
-
-  status = rtems_task_start( task_id, Low_task, 0 );
-  directive_failed( status, "rtems_task_start LOW" );
-
-  for ( index=1 ; index <= OPERATION_COUNT ; index++ ) {
-    status = rtems_task_create(
-      rtems_build_name( 'T', 'I', 'M', 'E' ),
-      128,
-      RTEMS_MINIMUM_STACK_SIZE,
-      RTEMS_DEFAULT_MODES,
-      RTEMS_DEFAULT_ATTRIBUTES,
-      &task_id
-    );
-    directive_failed( status, "rtems_task_create LOOP" );
-
-    status = rtems_task_start( task_id, High_tasks, 0 );
-    directive_failed( status, "rtems_task_start LOOP" );
-  }
-
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-}
-
-rtems_task High_tasks(
-  rtems_task_argument argument
-)
-{
-  (void) rtems_semaphore_obtain(
-    Semaphore_id,
-    RTEMS_DEFAULT_OPTIONS,
-    0xffffffff
-  );
-}
-
-rtems_task Low_task(
-  rtems_task_argument argument
-)
-{
-  Timer_initialize();
-    (void) rtems_clock_tick();
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_clock_tick",
-    end_time,
-    1,
-    0,
-    CALLING_OVERHEAD_CLOCK_TICK
-  );
-
-  puts( "*** END OF TEST 25 ***" );
-  exit( 0 );
-}
diff --git a/testsuites/tmtests/tm25/tm25.doc b/testsuites/tmtests/tm25/tm25.doc
deleted file mode 100644
index 496f3569e5..0000000000
--- a/testsuites/tmtests/tm25/tm25.doc
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
diff --git a/testsuites/tmtests/tm26/fptest.h b/testsuites/tmtests/tm26/fptest.h
deleted file mode 100644
index 551aa0989e..0000000000
--- a/testsuites/tmtests/tm26/fptest.h
+++ /dev/null
@@ -1,165 +0,0 @@
-/*  fptest.h
- *
- *  This include file contains the CPU dependent implementation
- *  of the following routines needed to test RTEMS floating
- *  point support:
- *           FP_load( &context )
- *           FP_check( &context )
- *
- *  FP_load   - loads the specified floating point context
- *  FP_check  - checks the specified floating point context
- *
- *  NOTE:  These routines are VERY CPU dependent and are thus
- *         located in in the CPU dependent include file
- *         fptest.h.  These routines form the core of the
- *         floating point context switch test.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-#ifndef __FPTEST_h
-#define __FPTEST_h
-
-#include <stdio.h>
-
-#ifndef CPU_HARDWARE_FP
-#error "This CPU does not have CPU_HARDWARE_FP defined"
-#endif
-
-#if ( CPU_HARDWARE_FP == FALSE )
-
-#define FP_DECLARE
-#define FP_LOAD( _factor )
-#define FP_CHECK( _factor ) 0
-
-#else
-
-#define FP_DECLARE \
-    double  fp01 = 1.0; \
-    double  fp02 = 2.0; \
-    double  fp03 = 3.0; \
-    double  fp04 = 4.0; \
-    double  fp05 = 5.0; \
-    double  fp06 = 6.0; \
-    double  fp07 = 7.0; \
-    double  fp08 = 8.0; \
-    double  fp09 = 9.0; \
-    double  fp10 = 10.0; \
-    double  fp11 = 11.0; \
-    double  fp12 = 12.0; \
-    double  fp13 = 13.0; \
-    double  fp14 = 14.0; \
-    double  fp15 = 15.0; \
-    double  fp16 = 16.0; \
-    double  fp17 = 17.0; \
-    double  fp18 = 18.0; \
-    double  fp19 = 19.0; \
-    double  fp20 = 20.0; \
-    double  fp21 = 21.0; \
-    double  fp22 = 22.0; \
-    double  fp23 = 23.0; \
-    double  fp24 = 24.0; \
-    double  fp25 = 25.0; \
-    double  fp26 = 26.0; \
-    double  fp27 = 27.0; \
-    double  fp28 = 28.0; \
-    double  fp29 = 29.0; \
-    double  fp30 = 30.0; \
-    double  fp31 = 31.0; \
-    double  fp32 = 32.0
-
-#define FP_LOAD( _factor ) \
-  do {                \
-    fp01  += _factor; \
-    fp02  += _factor; \
-    fp03  += _factor; \
-    fp04  += _factor; \
-    fp05  += _factor; \
-    fp06  += _factor; \
-    fp07  += _factor; \
-    fp08  += _factor; \
-    fp09  += _factor; \
-    fp10  += _factor; \
-    fp11  += _factor; \
-    fp12  += _factor; \
-    fp13  += _factor; \
-    fp14  += _factor; \
-    fp15  += _factor; \
-    fp16  += _factor; \
-    fp17  += _factor; \
-    fp18  += _factor; \
-    fp19  += _factor; \
-    fp20  += _factor; \
-    fp21  += _factor; \
-    fp22  += _factor; \
-    fp23  += _factor; \
-    fp24  += _factor; \
-    fp25  += _factor; \
-    fp26  += _factor; \
-    fp27  += _factor; \
-    fp28  += _factor; \
-    fp29  += _factor; \
-    fp30  += _factor; \
-    fp31  += _factor; \
-    fp32  += _factor; \
-  } while (0)
-
-#define EPSILON    (0.0005)
-#define FPABS(d)   (((d) < 0.0) ? -(d) : (d))
-#define FPNEQ(a,b) (FPABS((a)-(b)) > EPSILON)
-
-#define FP_CHECK_ONE( _v, _base, _factor ) \
-      if ( FPNEQ( (_v), ((_base) + (_factor)) ) )  { \
-          printf("%d: " #_v " wrong -- (%g not %g)\n", \
-             task_index, (_v), (_base + _factor));  \
-      }
-
-
-#define FP_CHECK( _factor ) \
-    do { \
-      FP_CHECK_ONE( fp01,  1.0, (_factor) ); \
-      FP_CHECK_ONE( fp02,  2.0, (_factor) ); \
-      FP_CHECK_ONE( fp03,  3.0, (_factor) ); \
-      FP_CHECK_ONE( fp04,  4.0, (_factor) ); \
-      FP_CHECK_ONE( fp05,  5.0, (_factor) ); \
-      FP_CHECK_ONE( fp06,  6.0, (_factor) ); \
-      FP_CHECK_ONE( fp07,  7.0, (_factor) ); \
-      FP_CHECK_ONE( fp08,  8.0, (_factor) ); \
-      FP_CHECK_ONE( fp09,  9.0, (_factor) ); \
-      FP_CHECK_ONE( fp10, 10.0, (_factor) ); \
-      FP_CHECK_ONE( fp11, 11.0, (_factor) ); \
-      FP_CHECK_ONE( fp12, 12.0, (_factor) ); \
-      FP_CHECK_ONE( fp13, 13.0, (_factor) ); \
-      FP_CHECK_ONE( fp14, 14.0, (_factor) ); \
-      FP_CHECK_ONE( fp15, 15.0, (_factor) ); \
-      FP_CHECK_ONE( fp16, 16.0, (_factor) ); \
-      FP_CHECK_ONE( fp17, 17.0, (_factor) ); \
-      FP_CHECK_ONE( fp18, 18.0, (_factor) ); \
-      FP_CHECK_ONE( fp19, 19.0, (_factor) ); \
-      FP_CHECK_ONE( fp20, 20.0, (_factor) ); \
-      FP_CHECK_ONE( fp21, 21.0, (_factor) ); \
-      FP_CHECK_ONE( fp22, 22.0, (_factor) ); \
-      FP_CHECK_ONE( fp23, 23.0, (_factor) ); \
-      FP_CHECK_ONE( fp24, 24.0, (_factor) ); \
-      FP_CHECK_ONE( fp25, 25.0, (_factor) ); \
-      FP_CHECK_ONE( fp26, 26.0, (_factor) ); \
-      FP_CHECK_ONE( fp27, 27.0, (_factor) ); \
-      FP_CHECK_ONE( fp28, 28.0, (_factor) ); \
-      FP_CHECK_ONE( fp29, 29.0, (_factor) ); \
-      FP_CHECK_ONE( fp30, 30.0, (_factor) ); \
-      FP_CHECK_ONE( fp31, 31.0, (_factor) ); \
-      FP_CHECK_ONE( fp32, 32.0, (_factor) ); \
-    } while (0)
-
-#endif
-
-#endif
diff --git a/testsuites/tmtests/tm26/system.h b/testsuites/tmtests/tm26/system.h
deleted file mode 100644
index a31ee198f7..0000000000
--- a/testsuites/tmtests/tm26/system.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*  system.h
- *
- *  This include file is used by all tests in the Time Suite.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-#include <coverhd.h>
-#include <tmacros.h>
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
-
-#include <timesys.h>
-
-/* configuration information */
- 
-#define CONFIGURE_TMTEST
- 
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
-
-#define CONFIGURE_MAXIMUM_TASKS              111
-#define CONFIGURE_MAXIMUM_SEMAPHORES         1
-#define CONFIGURE_TICKS_PER_TIMESLICE        0
- 
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/testsuites/tmtests/tm26/task1.c b/testsuites/tmtests/tm26/task1.c
deleted file mode 100644
index 4eb40b09d7..0000000000
--- a/testsuites/tmtests/tm26/task1.c
+++ /dev/null
@@ -1,580 +0,0 @@
-/*
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#define __RTEMS_VIOLATE_KERNEL_VISIBILITY__
-#include <rtems.h>
-#include "system.h"
-#include "fptest.h"
-#include <coverhd.h>
-#include <tmacros.h>
-#include <timesys.h>
-
-
-/* TEST DATA */
-rtems_id Semaphore_id;
-
-Objects_Locations location;   /* uses internal RTEMS type */
-
-Thread_Control *Middle_tcb;   /* uses internal RTEMS type */
-
-Thread_Control *Low_tcb;      /* uses internal RTEMS type */
-
-/*
- *  Variables to hold execution times until they are printed
- *  at the end of the test.
- */
-
-rtems_unsigned32 isr_disable_time;
-rtems_unsigned32 isr_flash_time;
-rtems_unsigned32 isr_enable_time;
-rtems_unsigned32 thread_disable_dispatch_time;
-rtems_unsigned32 thread_enable_dispatch_time;
-rtems_unsigned32 thread_set_state_time;
-rtems_unsigned32 thread_dispatch_no_fp_time;
-rtems_unsigned32 context_switch_no_fp_time;
-rtems_unsigned32 context_switch_self_time;
-rtems_unsigned32 context_switch_another_task_time;
-rtems_unsigned32 context_switch_restore_1st_fp_time;
-rtems_unsigned32 context_switch_save_idle_restore_initted_time;
-rtems_unsigned32 context_switch_save_restore_idle_time;
-rtems_unsigned32 context_switch_save_restore_initted_time;
-rtems_unsigned32 thread_resume_time;
-rtems_unsigned32 thread_unblock_time;
-rtems_unsigned32 thread_ready_time;
-rtems_unsigned32 thread_get_time;
-rtems_unsigned32 semaphore_get_time;
-rtems_unsigned32 thread_get_invalid_time;
-
-rtems_task High_task(
-  rtems_task_argument argument
-);
-
-rtems_task Middle_task(
-  rtems_task_argument argument
-);
-
-rtems_task Low_task(
-  rtems_task_argument argument
-);
-
-rtems_task Floating_point_task_1(
-  rtems_task_argument argument
-);
-
-rtems_task Floating_point_task_2(
-  rtems_task_argument argument
-);
-
-void complete_test( void );
-
-rtems_task null_task(
-  rtems_task_argument argument
-)
-{
-}
-
-rtems_task Init(
-  rtems_task_argument argument
-)
-{
-  rtems_unsigned32  index;
-  rtems_id          task_id;
-  rtems_status_code status;
-
-  Print_Warning();
-
-  puts( "\n\n*** TIME TEST 26 ***" );
-
-  status = rtems_task_create(
-    rtems_build_name( 'F', 'P', '1', ' ' ),
-    201,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_FLOATING_POINT,
-    &task_id
-  );
-  directive_failed( status, "rtems_task_create of FP1" );
-
-  status = rtems_task_start( task_id, Floating_point_task_1, 0 );
-  directive_failed( status, "rtems_task_start of FP1" );
-
-  status = rtems_task_create(
-    rtems_build_name( 'F', 'P', '2', ' ' ),
-    202,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_FLOATING_POINT,
-    &task_id
-  );
-  directive_failed( status, "rtems_task_create of FP2" );
-
-  status = rtems_task_start( task_id, Floating_point_task_2, 0 );
-  directive_failed( status, "rtems_task_start of FP2" );
-
-  status = rtems_task_create(
-    rtems_build_name( 'L', 'O', 'W', ' ' ),
-    200,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &task_id
-  );
-  directive_failed( status, "rtems_task_create of LOW" );
-
-  status = rtems_task_start( task_id, Low_task, 0 );
-  directive_failed( status, "rtems_task_start of LOW" );
-
-  status = rtems_task_create(
-    rtems_build_name( 'M', 'I', 'D', ' ' ),
-    128,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &task_id
-  );
-  directive_failed( status, "rtems_task_create of MIDDLE" );
-
-  status = rtems_task_start( task_id, Middle_task, 0 );
-  directive_failed( status, "rtems_task_start of MIDDLE" );
-
-  status = rtems_task_create(
-    rtems_build_name( 'H', 'I', 'G', 'H' ),
-    5,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &task_id
-  );
-  directive_failed( status, "rtems_task_create of HIGH" );
-
-  status = rtems_task_start( task_id, High_task, 0 );
-  directive_failed( status, "rtems_task_start of HIGH" );
-
-  status = rtems_semaphore_create(
-    rtems_build_name( 'S', 'E', 'M', '1' ),
-    OPERATION_COUNT,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    RTEMS_NO_PRIORITY,
-    &Semaphore_id
-  );
-  directive_failed( status, "rtems_semaphore_create" );
-
-  for ( index = 1 ; index <= OPERATION_COUNT ; index++ ) {
-    status = rtems_task_create(
-      rtems_build_name( 'N', 'U', 'L', 'L' ),
-      254,
-      RTEMS_MINIMUM_STACK_SIZE,
-      RTEMS_DEFAULT_MODES,
-      RTEMS_DEFAULT_ATTRIBUTES,
-      &task_id
-    );
-    directive_failed( status, "rtems_task_create LOOP" );
-
-    status = rtems_task_start( task_id, null_task, 0 );
-    directive_failed( status, "rtems_task_start LOOP" );
-  }
-
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-}
-
-rtems_task High_task(
-  rtems_task_argument argument
-)
-{
-  rtems_interrupt_level level;
-
-  Timer_initialize();
-    rtems_interrupt_disable( level );
-  isr_disable_time = Read_timer();
- 
-  Timer_initialize();
-    rtems_interrupt_flash( level );
-  isr_flash_time = Read_timer();
- 
-  Timer_initialize();
-    rtems_interrupt_enable( level );
-  isr_enable_time = Read_timer();
- 
-  Timer_initialize();
-    _Thread_Disable_dispatch();
-  thread_disable_dispatch_time = Read_timer();
-
-  Timer_initialize();
-    _Thread_Enable_dispatch();
-  thread_enable_dispatch_time = Read_timer();
-
-  Timer_initialize();
-    _Thread_Set_state( _Thread_Executing, STATES_SUSPENDED );
-  thread_set_state_time = Read_timer();
-
-  _Context_Switch_necessary = TRUE;
-
-  Timer_initialize();
-    _Thread_Dispatch();           /* dispatches Middle_task */
-}
-
-rtems_task Middle_task(
-  rtems_task_argument argument
-)
-{
-  thread_dispatch_no_fp_time = Read_timer();
-
-  _Thread_Set_state( _Thread_Executing, STATES_SUSPENDED );
-
-  Middle_tcb   = _Thread_Executing;
-
-  _Thread_Executing =
-        (Thread_Control *) _Thread_Ready_chain[200].first;
-
-  /* do not force context switch */
-
-  _Context_Switch_necessary = FALSE;
-
-  _Thread_Disable_dispatch();
-
-  Timer_initialize();
-    _Context_Switch( &Middle_tcb->Registers, &_Thread_Executing->Registers );
-
-  Timer_initialize();
-    _Context_Switch(&Middle_tcb->Registers, &Low_tcb->Registers);
-}
-
-rtems_task Low_task(
-  rtems_task_argument argument
-)
-{
-  Thread_Control *executing;
-
-  context_switch_no_fp_time = Read_timer();
-
-  executing    = _Thread_Executing;
-
-  Low_tcb = executing;
-
-  Timer_initialize();
-    _Context_Switch( &executing->Registers, &executing->Registers );
-
-  context_switch_self_time = Read_timer();
-
-  _Context_Switch(&executing->Registers, &Middle_tcb->Registers);
-
-  context_switch_another_task_time = Read_timer();
-
-  _Thread_Executing =
-        (Thread_Control *) _Thread_Ready_chain[201].first;
-
-  /* do not force context switch */
-
-  _Context_Switch_necessary = FALSE;
-
-  _Thread_Disable_dispatch();
-
-  Timer_initialize();
-    _Context_Restore_fp( &_Thread_Executing->fp_context );
-    _Context_Switch( &executing->Registers, &_Thread_Executing->Registers );
-}
-
-rtems_task Floating_point_task_1(
-  rtems_task_argument argument
-)
-{
-  Thread_Control *executing;
-  FP_DECLARE;
-
-  context_switch_restore_1st_fp_time = Read_timer();
-
-  executing = _Thread_Executing;
-
-  _Thread_Executing =
-        (Thread_Control *) _Thread_Ready_chain[202].first;
-
-  /* do not force context switch */
-
-  _Context_Switch_necessary = FALSE;
-
-  _Thread_Disable_dispatch();
-
-  Timer_initialize();
-    _Context_Save_fp( &executing->fp_context );
-    _Context_Restore_fp( &_Thread_Executing->fp_context );
-    _Context_Switch( &executing->Registers, &_Thread_Executing->Registers );
-  /* switch to Floating_point_task_2 */
-
-  context_switch_save_idle_restore_initted_time = Read_timer();
-
-  FP_LOAD( 1.0 );
-
-  executing = _Thread_Executing;
-
-  _Thread_Executing =
-       (Thread_Control *) _Thread_Ready_chain[202].first;
-
-  /* do not force context switch */
-
-  _Context_Switch_necessary = FALSE;
-
-  _Thread_Disable_dispatch();
-
-  Timer_initialize();
-    _Context_Save_fp( &executing->fp_context );
-    _Context_Restore_fp( &_Thread_Executing->fp_context );
-    _Context_Switch( &executing->Registers, &_Thread_Executing->Registers );
-  /* switch to Floating_point_task_2 */
-}
-
-rtems_task Floating_point_task_2(
-  rtems_task_argument argument
-)
-{
-  Thread_Control *executing;
-  FP_DECLARE;
-
-  context_switch_save_restore_idle_time = Read_timer();
-
-  executing = _Thread_Executing;
-
-  _Thread_Executing =
-       (Thread_Control *) _Thread_Ready_chain[201].first;
-
-  FP_LOAD( 1.0 );
-
-  /* do not force context switch */
-
-  _Context_Switch_necessary = FALSE;
-
-  _Thread_Disable_dispatch();
-
-  Timer_initialize();
-    _Context_Save_fp( &executing->fp_context );
-    _Context_Restore_fp( &_Thread_Executing->fp_context );
-    _Context_Switch( &executing->Registers, &_Thread_Executing->Registers );
-  /* switch to Floating_point_task_1 */
-
-  context_switch_save_restore_initted_time = Read_timer();
-
-  complete_test();
-}
-
-void complete_test( void )
-{
-  rtems_unsigned32  index;
-  rtems_id          task_id;
-
-  Timer_initialize();
-    _Thread_Resume( Middle_tcb );
-  thread_resume_time = Read_timer();
-
-  _Thread_Set_state( Middle_tcb, STATES_WAITING_FOR_MESSAGE );
-
-  Timer_initialize();
-    _Thread_Unblock( Middle_tcb );
-  thread_unblock_time = Read_timer();
-
-  _Thread_Set_state( Middle_tcb, STATES_WAITING_FOR_MESSAGE );
-
-  Timer_initialize();
-    _Thread_Ready( Middle_tcb );
-  thread_ready_time = Read_timer();
-
-  Timer_initialize();
-    for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) Empty_function();
-  overhead = Read_timer();
-
-  task_id = Middle_tcb->Object.id;
-
-  Timer_initialize();
-    for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) _Thread_Get( task_id, &location );
-  thread_get_time = Read_timer();
-
-  Timer_initialize();
-    for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) _Semaphore_Get( Semaphore_id, &location );
-  semaphore_get_time = Read_timer();
-
-  Timer_initialize();
-    for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) _Thread_Get( 0x3, &location );
-  thread_get_invalid_time = Read_timer();
-
-  /*
-   *  Now dump all the times
-   */
-
-  put_time(
-    "_ISR_Disable",
-    isr_disable_time,
-    1,
-    0,
-    0
-  );
-
-  put_time(
-    "_ISR_Flash",
-    isr_flash_time,
-    1,
-    0,
-    0
-  );
- 
-  put_time(
-    "_ISR_Enable",
-    isr_enable_time,
-    1,
-    0,
-    0
-  );
- 
-  put_time(
-    "_Thread_Disable_dispatch",
-    thread_disable_dispatch_time,
-    1,
-    0,
-    0
-  );
-
-  put_time(
-    "_Thread_Enable_dispatch",
-    thread_enable_dispatch_time,
-    1,
-    0,
-    0
-  );
-
-  put_time(
-    "_Thread_Set_state",
-    thread_set_state_time,
-    1,
-    0,
-    0
-  );
-
-  put_time(
-    "_Thread_Disptach (NO FP)",
-    thread_dispatch_no_fp_time,
-    1,
-    0,
-    0
-  );
-
-  put_time(
-    "context switch: no floating point contexts",
-    context_switch_no_fp_time,
-    1,
-    0,
-    0
-  );
-
-  put_time(
-    "context switch: self",
-    context_switch_self_time,
-    1,
-    0,
-    0
-  );
-
-  put_time(
-    "context switch: to another task",
-    context_switch_another_task_time,
-    1,
-    0,
-    0
-  );
-
-  put_time(
-    "fp context switch: restore 1st FP task",
-    context_switch_restore_1st_fp_time,
-    1,
-    0,
-    0
-  );
-
-  put_time(
-    "fp context switch: save idle, restore initialized",
-    context_switch_save_idle_restore_initted_time,
-    1,
-    0,
-    0
-  );
-
-  put_time(
-    "fp context switch: save idle, restore idle",
-    context_switch_save_restore_idle_time,
-    1,
-    0,
-    0
-  );
-
-  put_time(
-    "fp context switch: save initialized, restore initialized",
-    context_switch_save_restore_initted_time,
-    1,
-    0,
-    0
-  );
-
-  put_time(
-    "_Thread_Resume",
-    thread_resume_time,
-    1,
-    0,
-    0
-  );
-
-  put_time(
-    "_Thread_Unblock",
-    thread_unblock_time,
-    1,
-    0,
-    0
-  );
-
-  put_time(
-    "_Thread_Ready",
-    thread_ready_time,
-    1,
-    0,
-    0
-  );
-
-  put_time(
-    "_Thread_Get",
-    thread_get_time,
-    OPERATION_COUNT,
-    0,
-    0
-  );
-
-  put_time(
-    "_Semaphore_Get",
-    semaphore_get_time,
-    OPERATION_COUNT,
-    0,
-    0
-  );
-
-  put_time(
-    "_Thread_Get: invalid id",
-    thread_get_invalid_time,
-    OPERATION_COUNT,
-    0,
-    0
-  );
-
-  puts( "*** END OF TEST 26 ***" );
-  exit( 0 );
-}
-
diff --git a/testsuites/tmtests/tm26/tm26.doc b/testsuites/tmtests/tm26/tm26.doc
deleted file mode 100644
index 496f3569e5..0000000000
--- a/testsuites/tmtests/tm26/tm26.doc
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
diff --git a/testsuites/tmtests/tm27/system.h b/testsuites/tmtests/tm27/system.h
deleted file mode 100644
index 51fbb131b8..0000000000
--- a/testsuites/tmtests/tm27/system.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*  system.h
- *
- *  This include file is used by all tests in the Time Suite.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-#include <coverhd.h>
-#include <tmacros.h>
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
-
-#include <timesys.h>
-
-/* configuration information */
- 
-#define CONFIGURE_TMTEST
- 
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
-
-#define CONFIGURE_MAXIMUM_TASKS              111
-#define CONFIGURE_TICKS_PER_TIMESLICE        0
- 
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/testsuites/tmtests/tm27/task1.c b/testsuites/tmtests/tm27/task1.c
deleted file mode 100644
index a852979986..0000000000
--- a/testsuites/tmtests/tm27/task1.c
+++ /dev/null
@@ -1,272 +0,0 @@
-/*
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-/*
- *  WARNING!!!!!!!!!   
- *
- *  THIS TEST USES INTERNAL RTEMS VARIABLES!!!
- */
-
-#define TEST_INIT
-#include "system.h"
-
-#include <bsp.h>
-
-rtems_task Task_1(
-  rtems_task_argument argument
-);
-
-rtems_task Task_2(
-  rtems_task_argument argument
-);
-
-volatile rtems_unsigned32 Interrupt_occurred;
-volatile rtems_unsigned32 Interrupt_enter_time, Interrupt_enter_nested_time;
-volatile rtems_unsigned32 Interrupt_return_time, Interrupt_return_nested_time;
-rtems_unsigned32 Interrupt_nest;
-
-rtems_isr Isr_handler(
-  rtems_vector_number vector
-);
-
-rtems_task Init(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-
-  Print_Warning();
-
-  puts( "\n\n*** TIME TEST 27 ***" );
-
-  status = rtems_task_create(
-    rtems_build_name( 'T', 'A', '1', ' ' ),
-    254,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Task_id[ 1 ]
-  );
-  directive_failed( status, "rtems_task_create Task_1" );
-
-  status = rtems_task_start( Task_id[ 1 ], Task_1, 0 );
-  directive_failed( status, "rtems_task_start Task_1" );
-
-  status = rtems_task_create(
-    rtems_build_name( 'T', 'A', '2', ' ' ),
-    254,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Task_id[ 2 ]
-  );
-  directive_failed( status, "rtems_task_create of Task_2" );
-
-  status = rtems_task_start( Task_id[ 2 ], Task_2, 0 );
-  directive_failed( status, "rtems_task_start of Task_2" );
-
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-}
-
-rtems_task Task_1(
-  rtems_task_argument argument
-)
-{
-  Install_tm27_vector( Isr_handler );
-
-  /*
-   *  No preempt .. no nesting
-   */
-
-  Interrupt_nest = 0;
-
-  _Thread_Dispatch_disable_level = 0;
-
-  Interrupt_occurred = 0;
-  Timer_initialize();
-    Cause_tm27_intr();
-  /* goes to Isr_handler */
-
-#if (MUST_WAIT_FOR_INTERRUPT == 1)
-  while ( Interrupt_occurred == 0 );
-#endif
-  Interrupt_return_time = Read_timer();
-
-  put_time(
-    "interrupt entry overhead: returns to interrupted task",
-    Interrupt_enter_time,
-    1,
-    0,
-    0
-  );
-
-  put_time(
-    "interrupt exit overhead: returns to interrupted task",
-    Interrupt_return_time,
-    1,
-    0,
-    0
-  );
-
-  /*
-   *  No preempt .. nested
-   */
-
-  _Thread_Dispatch_disable_level = 1;
-
-  Interrupt_nest = 1;
-
-  Interrupt_occurred = 0;
-  Timer_initialize();
-    Cause_tm27_intr();
-  /* goes to Isr_handler */
-
-#if (MUST_WAIT_FOR_INTERRUPT == 1)
-  while ( Interrupt_occurred == 0 );
-#endif
-  Interrupt_return_time = Read_timer();
-
-  put_time(
-    "interrupt entry overhead: returns to nested interrupt",
-    Interrupt_enter_nested_time,
-    1,
-    0,
-    0
-  );
-
-  put_time(
-    "interrupt exit overhead: returns to nested interrupt",
-    Interrupt_return_nested_time,
-    1,
-    0,
-    0
-  );
-
-  /*
-   *  Does a preempt .. not nested
-   */
-
-  _Thread_Dispatch_disable_level = 0;
-
-  _Thread_Heir = (rtems_tcb *) _Thread_Ready_chain[254].last;
-
-  _Context_Switch_necessary = 1;
-
-  Interrupt_occurred = 0;
-  Timer_initialize();
-    Cause_tm27_intr();
-
-  /*
-   *  goes to Isr_handler and then returns
-   */
-
-  puts( "*** END OF TEST 27 ***" );
-  exit( 0 );
-}
-
-/*
- *  NOTE:  When this task is executing, some of the assumptions made 
- *         regarding the placement of the currently executing task's TCB
- *         on the ready chains have been violated.  At least the assumption
- *         that this task is at the head of the chain for its priority
- *         has been violated.
- */
-
-rtems_task Task_2(
-  rtems_task_argument argument
-)
-{
-#if (MUST_WAIT_FOR_INTERRUPT == 1)
-  while ( Interrupt_occurred == 0 );
-#endif
-  end_time = Read_timer();
-
-  put_time(
-    "interrupt entry overhead: returns to preempting task",
-    Interrupt_enter_time,
-    1,
-    0,
-    0
-  );
-
-  put_time(
-    "interrupt exit overhead: returns to preempting task",
-    end_time,
-    1,
-    0,
-    0
-  );
-
-  fflush( stdout );
-
-  /*
-   *  Switch back to the other task to exit the test.
-   */
-
-  _Thread_Dispatch_disable_level = 0;
- 
-  _Thread_Heir = (rtems_tcb *) _Thread_Ready_chain[254].first;
- 
-  _Context_Switch_necessary = 1;
-
-  _Thread_Dispatch();
-
-}
-
-/*  The Isr_handler() and Isr_handler_inner() routines are structured
- *  so that there will be as little entry overhead as possible included
- *  in the interrupt entry time.
- */
-
-void Isr_handler_inner( void );
-
-rtems_isr Isr_handler(
-  rtems_vector_number vector
-)
-{
-  end_time = Read_timer();
-
-  Interrupt_occurred = 1;
-  Isr_handler_inner();
-}
-
-void Isr_handler_inner( void )
-{
-
-  /*enable_tracing();*/
-  Clear_tm27_intr();
-  switch ( Interrupt_nest ) {
-    case 0:
-      Interrupt_enter_time = end_time;
-      break;
-    case 1:
-      Interrupt_enter_time = end_time;
-      Interrupt_nest = 2;
-      Interrupt_occurred = 0;
-      Lower_tm27_intr();
-      Timer_initialize();
-        Cause_tm27_intr();
-      /* goes to a nested copy of Isr_handler */
-#if (MUST_WAIT_FOR_INTERRUPT == 1)
-       while ( Interrupt_occurred == 0 );
-#endif
-      Interrupt_return_nested_time = Read_timer();
-      break;
-    case 2:
-      Interrupt_enter_nested_time = end_time;
-      break;
-  }
-
-  Timer_initialize();
-}
diff --git a/testsuites/tmtests/tm27/tm27.doc b/testsuites/tmtests/tm27/tm27.doc
deleted file mode 100644
index 496f3569e5..0000000000
--- a/testsuites/tmtests/tm27/tm27.doc
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
diff --git a/testsuites/tmtests/tm28/system.h b/testsuites/tmtests/tm28/system.h
deleted file mode 100644
index dbadf8b14c..0000000000
--- a/testsuites/tmtests/tm28/system.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*  system.h
- *
- *  This include file is used by all tests in the Time Suite.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-#include <coverhd.h>
-#include <tmacros.h>
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
-
-#include <timesys.h>
-
-/* configuration information */
- 
-#define CONFIGURE_TMTEST
- 
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
-
-#define CONFIGURE_MAXIMUM_TASKS              2
-#define CONFIGURE_MAXIMUM_PORTS              1
-#define CONFIGURE_TICKS_PER_TIMESLICE        0
- 
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/testsuites/tmtests/tm28/task1.c b/testsuites/tmtests/tm28/task1.c
deleted file mode 100644
index aa5df73865..0000000000
--- a/testsuites/tmtests/tm28/task1.c
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "system.h"
-
-rtems_id Port_id;
-
-rtems_unsigned8 Internal_area[ 256 ] CPU_STRUCTURE_ALIGNMENT;
-rtems_unsigned8 External_area[ 256 ] CPU_STRUCTURE_ALIGNMENT;
-
-rtems_task Test_task(
-  rtems_task_argument argument
-);
-
-rtems_task Init(
-  rtems_task_argument argument
-)
-{
-  rtems_status_code status;
-
-  Print_Warning();
-
-  puts( "\n\n*** TIME TEST 28 ***" );
-
-  status = rtems_task_create(
-    rtems_build_name( 'T', 'I', 'M', 'E' ),
-    128,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &Task_id[ 1 ]
-  );
-  directive_failed( status, "rtems_task_create" );
-
-  status = rtems_task_start( Task_id[ 1 ], Test_task, 0 );
-  directive_failed( status, "rtems_task_start" );
-
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-}
-
-rtems_task Test_task (
-  rtems_task_argument argument
-)
-{
-  rtems_name         name;
-  rtems_unsigned32   index;
-  void              *converted;
-
-  Timer_initialize();
-    for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) Empty_function();
-  overhead = Read_timer();
-
-  name = rtems_build_name( 'P', 'O', 'R', 'T' ),
-
-  Timer_initialize();
-    rtems_port_create(
-      name,
-      Internal_area,
-      External_area,
-      0xff,
-      &Port_id
-    );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_port_create",
-    end_time,
-    1,
-    0,
-    CALLING_OVERHEAD_PORT_CREATE
-  );
-
-  Timer_initialize();
-    for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) rtems_port_external_to_internal(
-               Port_id,
-               &External_area[ 0xf ],
-               &converted
-             );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_port_external_to_internal",
-    end_time,
-    OPERATION_COUNT,
-    overhead,
-    CALLING_OVERHEAD_PORT_EXTERNAL_TO_INTERNAL
-  );
-
-  Timer_initialize();
-    for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) rtems_port_internal_to_external(
-               Port_id,
-               &Internal_area[ 0xf ],
-               &converted
-             );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_port_internal_to_external",
-    end_time,
-    OPERATION_COUNT,
-    overhead,
-    CALLING_OVERHEAD_PORT_INTERNAL_TO_EXTERNAL
-  );
-
-  Timer_initialize();
-    rtems_port_delete( Port_id );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_port_delete",
-    end_time,
-    1,
-    0,
-    CALLING_OVERHEAD_PORT_DELETE
-  );
-
-  puts( "*** END OF TEST 28 ***" );
-  exit( 0 );
-}
diff --git a/testsuites/tmtests/tm28/tm28.doc b/testsuites/tmtests/tm28/tm28.doc
deleted file mode 100644
index 496f3569e5..0000000000
--- a/testsuites/tmtests/tm28/tm28.doc
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
diff --git a/testsuites/tmtests/tm29/system.h b/testsuites/tmtests/tm29/system.h
deleted file mode 100644
index c2b1355153..0000000000
--- a/testsuites/tmtests/tm29/system.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*  system.h
- *
- *  This include file is used by all tests in the Time Suite.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-#include <coverhd.h>
-#include <tmacros.h>
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
-
-#include <timesys.h>
-
-/* configuration information */
- 
-#define CONFIGURE_TMTEST
- 
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
-
-#define CONFIGURE_MAXIMUM_TASKS              111
-#define CONFIGURE_MAXIMUM_PERIODS            111
-#define CONFIGURE_TICKS_PER_TIMESLICE        0
- 
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/testsuites/tmtests/tm29/task1.c b/testsuites/tmtests/tm29/task1.c
deleted file mode 100644
index 779a0df49b..0000000000
--- a/testsuites/tmtests/tm29/task1.c
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "system.h"
-
-rtems_name Period_name;
-
-rtems_task Tasks(
-  rtems_task_argument argument
-);
-
-rtems_task Low_task(
-  rtems_task_argument argument
-);
-
-rtems_unsigned32 Task_count;
-
-rtems_task Init(
-  rtems_task_argument argument
-)
-{
-  rtems_id          id;
-  rtems_unsigned32  index;
-  rtems_status_code status;
-
-  Print_Warning();
-
-  puts( "\n\n*** TIME TEST 29 ***" );
-
-  Period_name = rtems_build_name( 'P', 'R', 'D', ' ' );
-
-  Timer_initialize();
-    (void) rtems_rate_monotonic_create( Period_name, &id );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_rate_monotonic_create",
-    end_time,
-    1,
-    0,
-    CALLING_OVERHEAD_RATE_MONOTONIC_CREATE
-  );
-
-  Timer_initialize();
-    (void) rtems_rate_monotonic_period( id, 10 );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_rate_monotonic_period: initiate period -- returns to caller",
-    end_time,
-    1,
-    0,
-    CALLING_OVERHEAD_RATE_MONOTONIC_PERIOD
-  );
-
-  Timer_initialize();
-    (void) rtems_rate_monotonic_period( id, RTEMS_PERIOD_STATUS );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_rate_monotonic_period: obtain status",
-    end_time,
-    1,
-    0,
-    CALLING_OVERHEAD_RATE_MONOTONIC_PERIOD
-  );
-
-  Timer_initialize();
-    (void) rtems_rate_monotonic_cancel( id );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_rate_monotonic_cancel",
-    end_time,
-    1,
-    0,
-    CALLING_OVERHEAD_RATE_MONOTONIC_CANCEL
-  );
-
-  Timer_initialize();
-    (void) rtems_rate_monotonic_delete( id );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_rate_monotonic_delete: inactive",
-    end_time,
-    1,
-    0,
-    CALLING_OVERHEAD_RATE_MONOTONIC_DELETE
-  );
-
-  status = rtems_rate_monotonic_create( Period_name, &id );
-  directive_failed( status, "rtems_rate_monotonic_create" );
-
-  status = rtems_rate_monotonic_period( id, 10 );
-  directive_failed( status, "rtems_rate_monotonic_period" );
-
-  Timer_initialize();
-    rtems_rate_monotonic_delete( id );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_rate_monotonic_delete: active",
-    end_time,
-    1,
-    0,
-    CALLING_OVERHEAD_RATE_MONOTONIC_DELETE
-  );
-
-  for ( index=1 ; index <= OPERATION_COUNT ; index++ ) {
-    status = rtems_task_create(
-      rtems_build_name( 'T', 'E', 'S', 'T' ),
-      128,
-      RTEMS_MINIMUM_STACK_SIZE,
-      RTEMS_DEFAULT_MODES,
-      RTEMS_DEFAULT_ATTRIBUTES,
-      &id
-    );
-    directive_failed( status, "rtems_task_create LOOP" );
-
-    status = rtems_task_start( id, Tasks, 0 );
-    directive_failed( status, "rtems_task_start LOOP" );
-  }
-
-  status = rtems_task_create(
-    rtems_build_name( 'L', 'O', 'W', ' ' ),
-    200,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &id
-  );
-  directive_failed( status, "rtems_task_create LOW" );
-
-  status = rtems_task_start( id, Low_task, 0 );
-  directive_failed( status, "rtems_task_start LOW" );
-
-  Task_count = 0;
-
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-}
-
-rtems_task Tasks(
-  rtems_task_argument argument
-)
-{
-  rtems_id          id;
-  rtems_status_code status;
-
-  status = rtems_rate_monotonic_create( 1, &id );
-  directive_failed( status, "rtems_rate_monotonic_create" );
-
-  status = rtems_rate_monotonic_period( id, 100 );
-  directive_failed( status, "rtems_rate_monotonic_period" );
-
-  /*
-   *  Give up the processor to allow all tasks to actually
-   *  create and start their period timer before the benchmark
-   *  timer is initialized.
-   */
-
-  (void) rtems_task_wake_after( RTEMS_YIELD_PROCESSOR );
-
-  Task_count++;
-
-  if ( Task_count == 1 )
-    Timer_initialize();
-
-  (void) rtems_rate_monotonic_period( id, 100 );
-}
-
-rtems_task Low_task(
-  rtems_task_argument argument
-)
-{
-  rtems_unsigned32 index;
-
-  end_time = Read_timer();
-
-  Timer_initialize();
-    for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) Empty_function();
-  overhead = Read_timer();
-
-  put_time(
-    "rtems_rate_monotonic_period: conclude periods -- caller blocks",
-    end_time,
-    OPERATION_COUNT,
-    overhead,
-    CALLING_OVERHEAD_RATE_MONOTONIC_PERIOD
-  );
-
-  puts( "*** END OF TEST 29 ***" );
-  exit( 0 );
-}
diff --git a/testsuites/tmtests/tm29/tm29.doc b/testsuites/tmtests/tm29/tm29.doc
deleted file mode 100644
index 496f3569e5..0000000000
--- a/testsuites/tmtests/tm29/tm29.doc
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
diff --git a/testsuites/tmtests/tmck/system.h b/testsuites/tmtests/tmck/system.h
deleted file mode 100644
index 43d3be0fb5..0000000000
--- a/testsuites/tmtests/tmck/system.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*  system.h
- *
- *  This include file is used by all tests in the Time Suite.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-#include <coverhd.h>
-#include <tmacros.h>
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
-
-#include <timesys.h>
-
-/* configuration information */
- 
-#define CONFIGURE_TMTEST
- 
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
-
-#define CONFIGURE_MAXIMUM_TASKS              2
-#define CONFIGURE_TICKS_PER_TIMESLICE        0
- 
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/testsuites/tmtests/tmck/task1.c b/testsuites/tmtests/tmck/task1.c
deleted file mode 100644
index bee3bf5f5b..0000000000
--- a/testsuites/tmtests/tmck/task1.c
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-#define TEST_INIT
-#include "system.h"
-
-#define MAXIMUM_DISTRIBUTION 10000
-
-#undef OPERATION_COUNT
-#define OPERATION_COUNT    100000
-
-int Distribution[ MAXIMUM_DISTRIBUTION + 1 ];
-
-rtems_task Task_1(
-  rtems_task_argument argument
-);
-
-void check_read_timer( void );
-
-rtems_task Init(
-  rtems_task_argument argument
-)
-{
-  rtems_id          id;
-  rtems_status_code status;
-
-  /*
-   *  Tell the Timer Driver what we are doing 
-   */
-
-  Set_find_average_overhead( 1 );
-
-  Print_Warning();
-
-  puts( "\n\n*** TIME CHECKER ***" );
-
-  Task_name[ 1 ] = rtems_build_name( 'T', 'A', '1', ' ' ),
-
-  status = rtems_task_create(
-    1,
-    5,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &id
-  );
-  directive_failed( status, "rtems_task_create of TA1" );
-
-  status = rtems_task_start( id, Task_1, 0 );
-  directive_failed( status, "rtems_task_start of TA1" );
-
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-}
-
-rtems_task Task_1(
-  rtems_task_argument argument
-)
-{
-  rtems_unsigned32 index;
-
-  check_read_timer();
-rtems_test_pause();
-
-  Timer_initialize();
-  end_time = Read_timer();
-
-  put_time(
-    "NULL timer stopped at",
-    end_time,
-    1,
-    0,
-    0
-  );
-
-  Timer_initialize();
-  for ( index = 1 ; index <= 1000 ; index++ )
-    (void) Empty_function();
-  end_time = Read_timer();
-
-  put_time(
-    "LOOP (1000) timer stopped at",
-    end_time,
-    1,
-    0,
-    0
-  );
-
-  Timer_initialize();
-  for ( index = 1 ; index <= 10000 ; index++ )
-    (void) Empty_function();
-  end_time = Read_timer();
-
-  put_time(
-    "LOOP (10000) timer stopped at",
-    end_time,
-    1,
-    0,
-    0
-  );
-
-  Timer_initialize();
-  for ( index = 1 ; index <= 50000 ; index++ )
-    (void) Empty_function();
-  end_time = Read_timer();
-
-  put_time(
-    "LOOP (50000) timer stopped at",
-    end_time,
-    1,
-    0,
-    0
-  );
-
-  Timer_initialize();
-  for ( index = 1 ; index <= 100000 ; index++ )
-    (void) Empty_function();
-  end_time = Read_timer();
-
-  put_time(
-    "LOOP (100000) timer stopped at",
-    end_time,
-    1,
-    0,
-    0
-  );
-
-  puts( "*** END OF TIME CHECKER ***" );
-  exit( 0 );
-}
-
-void check_read_timer()
-{
-  rtems_unsigned32 index;
-  rtems_unsigned32 time;
-
-  for ( index = 1 ; index <= MAXIMUM_DISTRIBUTION ; index++ )
-    Distribution[ index ] = 0;
-
-  for ( index = 1 ; index <= OPERATION_COUNT ; index++ ) {
-    Timer_initialize();
-    end_time = Read_timer();
-    if ( end_time > MAXIMUM_DISTRIBUTION ) {
-      /*
-       *  Under UNIX a simple process swap takes longer than we 
-       *  consider valid for our testing purposes.
-       */
-      printf( "TOO LONG (%d) at index %d!!!\n", end_time, index );
-#if defined(unix) || defined(go32)
-      index--; 
-      continue;
-#else
-      exit( 1 );
-#endif
-    }
-    else
-      Distribution[ end_time ]++;
-  }
-
-  printf( "Units may not be in microseconds for this test!!!\n" );
-  time = 0;
-  for ( index = 0 ; index <= MAXIMUM_DISTRIBUTION ; index++ ) {
-    time += (Distribution[ index ] * index);
-    if ( Distribution[ index ] != 0 )
-      printf( "%d %d\n", index, Distribution[ index ] );
-  }
-  printf( "Total time = %d\n", time );
-  printf( "Average time = %d\n", time / OPERATION_COUNT );
-}
diff --git a/testsuites/tmtests/tmck/tmck.doc b/testsuites/tmtests/tmck/tmck.doc
deleted file mode 100644
index b8997c7b35..0000000000
--- a/testsuites/tmtests/tmck/tmck.doc
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
-This file describes the directives timed by this test.
-
-benchmark name:  timecheck
-
-This becnchmark is used to calibrate the timer.  It is only used to
-when initial timing begins on a particular processor board.
-
diff --git a/testsuites/tmtests/tmoverhd/dumrtems.h b/testsuites/tmtests/tmoverhd/dumrtems.h
deleted file mode 100644
index 7eee650ebc..0000000000
--- a/testsuites/tmtests/tmoverhd/dumrtems.h
+++ /dev/null
@@ -1,255 +0,0 @@
-/*  dumrtems.h
- *
- *  This include file contains phony macros to map
- *  executive calls to Empty_directive().
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#ifndef __DUMRTEMS_h
-#define __DUMRTEMS_h
-
-/* RTEMS call redefinition macros */
-
-#undef rtems_signal_catch
-#undef rtems_signal_send
-#undef rtems_io_close
-#undef rtems_io_control
-#undef rtems_io_initialize
-#undef rtems_io_open
-#undef rtems_io_read
-#undef rtems_io_write
-#undef rtems_port_internal_to_external
-#undef rtems_port_external_to_internal
-#undef rtems_port_create
-#undef rtems_port_delete
-#undef rtems_port_ident
-#undef rtems_event_receive
-#undef rtems_event_send
-#undef rtems_initialize_executive
-#undef rtems_shutdown_executive
-#undef rtems_interrupt_catch
-#undef rtems_partition_create
-#undef rtems_partition_delete
-#undef rtems_partition_get_buffer
-#undef rtems_partition_ident
-#undef rtems_partition_return_buffer
-#undef rtems_message_queue_broadcast
-#undef rtems_message_queue_create
-#undef rtems_message_queue_delete
-#undef rtems_message_queue_flush
-#undef rtems_message_queue_ident
-#undef rtems_message_queue_receive
-#undef rtems_message_queue_send
-#undef rtems_message_queue_urgent
-#undef rtems_region_create
-#undef rtems_region_delete
-#undef rtems_region_get_segment
-#undef rtems_region_ident
-#undef rtems_region_return_segment
-#undef rtems_semaphore_create
-#undef rtems_semaphore_delete
-#undef rtems_semaphore_ident
-#undef rtems_semaphore_obtain
-#undef rtems_semaphore_release
-#undef rtems_task_create
-#undef rtems_task_delete
-#undef rtems_task_get_note
-#undef rtems_task_ident
-#undef rtems_task_mode
-#undef rtems_task_restart
-#undef rtems_task_resume
-#undef rtems_task_set_note
-#undef rtems_task_set_priority
-#undef rtems_task_start
-#undef rtems_task_suspend
-#undef rtems_clock_get
-#undef rtems_clock_set
-#undef rtems_clock_tick
-#undef rtems_task_wake_after
-#undef rtems_task_wake_when
-#undef rtems_fatal_error_occurred
-#undef rtems_rate_monotonic_create
-#undef rtems_rate_monotonic_ident
-#undef rtems_rate_monotonic_delete
-#undef rtems_rate_monotonic_cancel
-#undef rtems_rate_monotonic_period
-#undef rtems_multiprocessing_announce
-#undef rtems_timer_create
-#undef rtems_timer_ident
-#undef rtems_timer_delete
-#undef rtems_timer_cancel
-#undef rtems_timer_fire_after
-#undef rtems_timer_fire_when
-#undef rtems_timer_reset
-
-#define     rtems_signal_catch( asraddr, mode ) \
-           Empty_directive( asraddr, mode )
-#define     rtems_signal_send( tid, signal ) \
-           Empty_directive( tid, signal )
-
-#define     rtems_io_close( major, minor, argp, rval ) \
-           Empty_directive( major, minor, argp, rval )
-#define     rtems_io_control( major, minor, argp, rval ) \
-           Empty_directive( major, minor, argp, rval )
-#define     rtems_io_initialize( major, minor, argp, rval ) \
-           Empty_directive( major, minor, argp, rval )
-#define     rtems_io_open( major, minor, argp, rval ) \
-           Empty_directive( major, minor, argp, rval )
-#define     rtems_io_read( major, minor, argp, rval ) \
-           Empty_directive( major, minor, argp, rval )
-#define     rtems_io_write( major, minor, argp, rval ) \
-           Empty_directive( major, minor, argp, rval )
-
-#define     rtems_port_internal_to_external( dpid, internal, external ) \
-           Empty_directive( dpid, internal, external )
-#define     rtems_port_external_to_internal( dpid, external, internal ) \
-           Empty_directive( dpid, external, internal )
-#define     rtems_port_create( name, intaddr, extaddr, length, dpid ) \
-           Empty_directive( name, intaddr, extaddr, length, dpid )
-#define     rtems_port_delete( dpid ) \
-           Empty_directive( dpid )
-#define     rtems_port_ident( name, dpid ) \
-           Empty_directive( name, dpid )
-
-#define     rtems_event_receive( eventin, options, timeout, eventout ) \
-           Empty_directive( eventin, options, timeout, eventout )
-#define     rtems_event_send( tid, event ) \
-           Empty_directive( tid, event )
-
-#define     rtems_initialize_executive( conftbl, cputbl ) \
-           Empty_directive( conftbl, cputbl )
-#define     rtems_shutdown_executive( the_error ) \
-           Empty_directive( the_error )
-
-#define     rtems_interrupt_catch( israddr, vector, oldisr ) \
-           Empty_directive( israddr, vector, oldisr )
-
-#define     rtems_partition_create( name, paddr, length, bsize, attr, ptid ) \
-           Empty_directive( name, paddr, length, bsize, attr, ptid )
-#define     rtems_partition_delete( ptid ) \
-           Empty_directive( ptid )
-#define     rtems_partition_get_buffer( ptid, bufaddr ) \
-           Empty_directive( ptid, bufaddr )
-#define     rtems_partition_ident( name, node, ptid ) \
-           Empty_directive( name, node, ptid )
-#define     rtems_partition_return_buffer( ptid, bufaddr ) \
-           Empty_directive( ptid, bufaddr )
-
-#define     rtems_message_queue_broadcast( qid, buffer, count ) \
-           Empty_directive( qid, buffer, count )
-#define     rtems_message_queue_create( name, count, attr, qid ) \
-           Empty_directive( name, count, attr, qid )
-#define     rtems_message_queue_delete( qid ) \
-           Empty_directive( qid )
-#define     rtems_message_queue_flush( qid, count ) \
-           Empty_directive( qid, count )
-#define     rtems_message_queue_ident( name, node, qid ) \
-           Empty_directive( name, node, qid )
-#define     rtems_message_queue_receive( qid, buffer, options, timeout ) \
-           Empty_directive( qid, buffer, options, timeout )
-#define     rtems_message_queue_send( qid, buffer ) \
-           Empty_directive( qid, buffer )
-#define     rtems_message_queue_urgent( qid, buffer ) \
-           Empty_directive( qid, buffer )
-
-#define     rtems_region_create( name, paddr, length, pagesize, attr, rnid ) \
-           Empty_directive( name, paddr, length, pagesize, attr, rnid )
-#define     rtems_region_delete( rnid ) \
-           Empty_directive( rnid )
-#define     rtems_region_get_segment( rnid, size, options, timeout, segaddr ) \
-           Empty_directive( rnid, size, options, timeout, segaddr )
-#define     rtems_region_ident( name, rnid ) \
-           Empty_directive( name, rnid )
-#define     rtems_region_return_segment( rnid, segaddr ) \
-           Empty_directive( rnid, segaddr )
-
-#define     rtems_semaphore_create( name, count, attr, priceil, smid ) \
-           Empty_directive( name, count, attr, priceil, smid )
-#define     rtems_semaphore_delete( smid ) \
-           Empty_directive( smid )
-#define     rtems_semaphore_ident( name, node, smid ) \
-           Empty_directive( name, node, smid )
-#define     rtems_semaphore_obtain( smid, options, timeout ) \
-           Empty_directive( smid, options, timeout )
-#define     rtems_semaphore_release( smid ) \
-           Empty_directive( smid )
-
-#define     rtems_task_create( name, priority, stack_size, mode, attr, tid ) \
-           Empty_directive( name, priority, stack_size, mode, attr, tid )
-#define     rtems_task_delete( tid ) \
-           Empty_directive( tid )
-#define     rtems_task_get_note( tid, notepad, note ) \
-           Empty_directive( tid, notepad, note )
-#define     rtems_task_ident( name, node, tid ) \
-           Empty_directive( name, node, tid )
-#define     rtems_task_mode( mode, mask, pmode ) \
-           Empty_directive( mode, mask, pmode )
-#define     rtems_task_restart( tid, arg ) \
-           Empty_directive( tid, arg )
-#define     rtems_task_resume( tid ) \
-           Empty_directive( tid )
-#define     rtems_task_set_note( tid, notepad, note ) \
-           Empty_directive( tid, notepad, note )
-#define     rtems_task_set_priority( tid, priority, ppriority ) \
-           Empty_directive( tid, priority, ppriority )
-#define     rtems_task_start( tid, saddr, arg ) \
-           Empty_directive( tid, saddr, arg )
-#define     rtems_task_suspend( tid ) \
-           Empty_directive( tid )
-
-#define     rtems_clock_get( options, time ) \
-           Empty_directive( options, time )
-#define     rtems_clock_set( time ) \
-           Empty_directive( time )
-#define     rtems_clock_tick() \
-           Empty_directive()
-#define     rtems_task_wake_after( ticks ) \
-           Empty_directive( ticks )
-#define     rtems_task_wake_when( time ) \
-           Empty_directive( time )
-
-#define     rtems_fatal_error_occurred( errcode ) \
-           Empty_directive( errcode )
-
-#define     rtems_rate_monotonic_create( name, id ) \
-           Empty_directive( name, id )
-#define     rtems_rate_monotonic_ident( name, id ) \
-           Empty_directive( name, id )
-#define     rtems_rate_monotonic_delete( id ) \
-           Empty_directive( id )
-#define     rtems_rate_monotonic_cancel( id ) \
-           Empty_directive( id )
-#define     rtems_rate_monotonic_period( id, period ) \
-           Empty_directive( id, period )
-
-#define     rtems_multiprocessing_announce() \
-           Empty_directive()
-
-#define     rtems_timer_create( name, tmid ) \
-           Empty_directive( name, tmid )
-#define     rtems_timer_delete( tmid ) \
-           Empty_directive( tmid )
-#define     rtems_timer_cancel( tmid ) \
-           Empty_directive( tmid )
-#define     rtems_timer_ident( name, tmid ) \
-           Empty_directive( name, tmid )
-#define     rtems_timer_fire_after( tmid, ticks, routine, user_data ) \
-           Empty_directive( tmid, ticks, routine, user_data )
-#define     rtems_timer_fire_when( tmid, time, routine, user_data ) \
-           Empty_directive( tmid, time, routine, user_data )
-#define     rtems_timer_reset( tmid ) \
-           Empty_directive( tmid )
-
-rtems_status_code Empty_directive();
-
-#endif
-/* end of include file */
diff --git a/testsuites/tmtests/tmoverhd/empty.c b/testsuites/tmtests/tmoverhd/empty.c
deleted file mode 100644
index cef38f2e73..0000000000
--- a/testsuites/tmtests/tmoverhd/empty.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "system.h"
-
-rtems_timer_service_routine Timer_handler(
-  rtems_id argument
-)
-{
-}
-
-rtems_asr Isr_handler(
-  rtems_signal_set signals
-)
-{
-}
-
-rtems_asr Asr_handler(
-  rtems_signal_set signals
-)
-{
-}
-
-rtems_task task_func() {}
-
-void null_func() {}
-
-rtems_status_code Empty_directive()
-{
-  return( RTEMS_SUCCESSFUL );
-}
diff --git a/testsuites/tmtests/tmoverhd/system.h b/testsuites/tmtests/tmoverhd/system.h
deleted file mode 100644
index ea369d97cb..0000000000
--- a/testsuites/tmtests/tmoverhd/system.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*  system.h
- *
- *  This include file is used by all tests in the Time Suite.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-
-#include <coverhd.h>
-#include <tmacros.h>
-
-/* functions */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
-
-rtems_timer_service_routine Timer_handler(
-  rtems_id argument
-);
- 
-rtems_asr Isr_handler(
-  rtems_signal_set signals
-);
- 
-rtems_asr Asr_handler(
-  rtems_signal_set signals
-);
- 
-rtems_task task_func();
- 
-void null_func();
- 
-rtems_status_code Empty_directive();
-
-#include <timesys.h>
-
-/* configuration information */
- 
-#define CONFIGURE_TMTEST
- 
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
-
-#define CONFIGURE_MAXIMUM_TASKS              2
-#define CONFIGURE_TICKS_PER_TIMESLICE        0
- 
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#include <confdefs.h>
-
-/* end of include file */
diff --git a/testsuites/tmtests/tmoverhd/testtask.c b/testsuites/tmtests/tmoverhd/testtask.c
deleted file mode 100644
index 96413ac722..0000000000
--- a/testsuites/tmtests/tmoverhd/testtask.c
+++ /dev/null
@@ -1,1279 +0,0 @@
-/*
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#define TEST_INIT
-#include "system.h"
-
-rtems_unsigned8 Memory_area[ 2048 ];
-rtems_unsigned8 Internal_port_area[ 256 ];
-rtems_unsigned8 External_port_area[ 256 ];
-
-rtems_task Task_1(
-  rtems_task_argument argument
-);
-
-rtems_task Init(
-  rtems_task_argument argument
-)
-{ rtems_id id;
-  rtems_status_code status;
-
-  Set_find_average_overhead( TRUE );
-
-  Print_Warning();
-
-  puts( "\n\n*** TIME TEST OVERHEAD ***" );
-
-  status = rtems_task_create(
-    rtems_build_name( 'T', 'A', '1', ' ' ),
-    254,
-    RTEMS_MINIMUM_STACK_SIZE,
-    RTEMS_DEFAULT_MODES,
-    RTEMS_DEFAULT_ATTRIBUTES,
-    &id
-  );
-  directive_failed( status, "rtems_task_create of TA1" );
-
-  status = rtems_task_start( id, Task_1, 0 );
-  directive_failed( status, "rtems_task_start of TA1" );
-
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
-}
-
-/* comment out the following include to verify type are correct */
-#include "dumrtems.h"
-
-rtems_task Task_1(
-  rtems_task_argument argument
-)
-{
-  rtems_name                 name;
-  rtems_unsigned32           index;
-  rtems_cpu_table            cpu_table;
-  rtems_id                   id;
-  rtems_task_priority        in_priority;
-  rtems_task_priority        out_priority;
-  rtems_mode                 in_mode;
-  rtems_mode                 mask;
-  rtems_mode                 out_mode;
-  rtems_unsigned32           note;
-  rtems_time_of_day          time;
-  rtems_interval             timeout;
-  rtems_signal_set           signals;
-  void                      *address_1;
-  rtems_event_set            events;
-  long                       buffer[ 4 ];
-  rtems_unsigned32           count;
-  rtems_device_major_number  major;
-  rtems_device_minor_number  minor;
-  rtems_unsigned32           io_result;
-  rtems_unsigned32           error;
-  rtems_clock_get_options    options;
-
-  name        = rtems_build_name( 'N', 'A', 'M', 'E' );
-  in_priority = 250;
-  in_mode     = RTEMS_NO_PREEMPT;
-  mask        = RTEMS_PREEMPT_MASK;
-  note        = 8;
-  timeout     = 100;
-  signals     = RTEMS_SIGNAL_1 | RTEMS_SIGNAL_3;
-  major       = 10;
-  minor       = 0;
-  error       = 100;
-  options     = 0;
-
-/* rtems_initialize_executive */
-  Timer_initialize();
-    for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) rtems_initialize_executive( &BSP_Configuration, &cpu_table );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_initialize_executive",
-    end_time,
-    OPERATION_COUNT,
-    overhead,
-    0
-  );
-
-/* rtems_shutdown_executive */
-
-  Timer_initialize();
-    for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) rtems_shutdown_executive( error );
-  end_time = Read_timer();
-
-  put_time(
-    "rtems_shutdown_executive",
-    end_time,
-    OPERATION_COUNT,
-    overhead,
-    0
-  );
-
-/* rtems_task_create */
-
-      Timer_initialize();
-         for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
-            (void) rtems_task_create(
-               name,
-               in_priority,
-               RTEMS_MINIMUM_STACK_SIZE,
-               RTEMS_DEFAULT_MODES,
-               RTEMS_DEFAULT_ATTRIBUTES,
-               &id
-            );
-      end_time = Read_timer();
-
-      put_time(
-         "rtems_task_create",
-         end_time,
-         OPERATION_COUNT,
-         overhead,
-         0
-      );
-
-/* rtems_task_ident */
-
-      Timer_initialize();
-         for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
-            (void) rtems_task_ident( name, RTEMS_SEARCH_ALL_NODES, id );
-      end_time = Read_timer();
-
-      put_time(
-         "rtems_task_ident",
-         end_time,
-         OPERATION_COUNT,
-         overhead,
-         0
-      );
-
-/* rtems_task_start */
-
-      Timer_initialize();
-         for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
-            (void) rtems_task_start( id, Task_1, 0 );
-      end_time = Read_timer();
-
-      put_time(
-         "rtems_task_start",
-         end_time,
-         OPERATION_COUNT,
-         overhead,
-         0
-      );
-
-/* rtems_task_restart */
-
-      Timer_initialize();
-         for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
-            (void) rtems_task_restart( id, 0 );
-      end_time = Read_timer();
-
-      put_time(
-         "rtems_task_restart",
-         end_time,
-         OPERATION_COUNT,
-         overhead,
-         0
-      );
-
-/* rtems_task_delete */
-
-      Timer_initialize();
-         for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
-            (void) rtems_task_delete( id );
-      end_time = Read_timer();
-
-      put_time(
-         "rtems_task_delete",
-         end_time,
-         OPERATION_COUNT,
-         overhead,
-         0
-      );
-
-/* rtems_task_suspend */
-
-      Timer_initialize();
-         for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
-            (void) rtems_task_suspend( id );
-      end_time = Read_timer();
-
-      put_time(
-         "rtems_task_suspend",
-         end_time,
-         OPERATION_COUNT,
-         overhead,
-         0
-      );
-
-/* rtems_task_resume */
-
-      Timer_initialize();
-         for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
-            (void) rtems_task_resume( id );
-      end_time = Read_timer();
-
-      put_time(
-         "rtems_task_resume",
-         end_time,
-         OPERATION_COUNT,
-         overhead,
-         0
-      );
-
-/* rtems_task_set_priority */
-
-      Timer_initialize();
-         for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
-            (void) rtems_task_set_priority( id, in_priority, &out_priority );
-      end_time = Read_timer();
-
-      put_time(
-         "rtems_task_set_priority",
-         end_time,
-         OPERATION_COUNT,
-         overhead,
-         0
-      );
-
-/* rtems_task_mode */
-
-      Timer_initialize();
-         for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
-            (void) rtems_task_mode( in_mode, mask, &out_mode );
-      end_time = Read_timer();
-
-      put_time(
-         "rtems_task_mode",
-         end_time,
-         OPERATION_COUNT,
-         overhead,
-         0
-      );
-
-/* rtems_task_get_note */
-
-      Timer_initialize();
-         for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
-            (void) rtems_task_get_note( id, 1, note );
-      end_time = Read_timer();
-
-      put_time(
-         "rtems_task_get_note",
-         end_time,
-         OPERATION_COUNT,
-         overhead,
-         0
-      );
-
-/* rtems_task_set_note */
-
-      Timer_initialize();
-         for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
-            (void) rtems_task_set_note( id, 1, note );
-      end_time = Read_timer();
-
-      put_time(
-         "rtems_task_set_note",
-         end_time,
-         OPERATION_COUNT,
-         overhead,
-         0
-      );
-
-/* rtems_task_wake_when */
-
-      Timer_initialize();
-         for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
-            (void) rtems_task_wake_when( time );
-      end_time = Read_timer();
-
-      put_time(
-         "rtems_task_wake_when",
-         end_time,
-         OPERATION_COUNT,
-         overhead,
-         0
-      );
-
-/* rtems_task_wake_after */
-
-      Timer_initialize();
-         for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
-            (void) rtems_task_wake_after( timeout );
-      end_time = Read_timer();
-
-      put_time(
-         "rtems_task_wake_after",
-         end_time,
-         OPERATION_COUNT,
-         overhead,
-         0
-      );
-
-/* rtems_interrupt_catch */
-
-      Timer_initialize();
-         for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
-            (void) rtems_interrupt_catch( Isr_handler, 5, address_1 );
-      end_time = Read_timer();
-
-      put_time(
-         "rtems_interrupt_catch",
-         end_time,
-         OPERATION_COUNT,
-         overhead,
-         0
-      );
-
-/* rtems_clock_get */
-
-      Timer_initialize();
-         for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
-            (void) rtems_clock_get( options, time );
-      end_time = Read_timer();
-
-      put_time(
-         "rtems_clock_get",
-         end_time,
-         OPERATION_COUNT,
-         overhead,
-         0
-      );
-
-/* rtems_clock_set */
-
-      Timer_initialize();
-         for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
-            (void) rtems_clock_set( time );
-      end_time = Read_timer();
-
-      put_time(
-         "rtems_clock_set",
-         end_time,
-         OPERATION_COUNT,
-         overhead,
-         0
-      );
-
-/* rtems_clock_tick */
-
-      Timer_initialize();
-         for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
-           (void) rtems_clock_tick();
-      end_time = Read_timer();
-
-      put_time(
-         "rtems_clock_tick",
-         end_time,
-         OPERATION_COUNT,
-         overhead,
-         0
-      );
-
-rtems_test_pause();
-
-/* rtems_timer_create */
-
-      Timer_initialize();
-         for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
-            (void) rtems_timer_create( name, &id );
-      end_time = Read_timer();
-
-      put_time(
-         "rtems_timer_create",
-         end_time,
-         OPERATION_COUNT,
-         overhead,
-         0
-      );
-
-/* rtems_timer_delete */
-
-      Timer_initialize();
-         for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
-            (void) rtems_timer_delete( id );
-      end_time = Read_timer();
-
-      put_time(
-         "rtems_timer_delete",
-         end_time,
-         OPERATION_COUNT,
-         overhead,
-         0
-      );
-
-/* rtems_timer_ident */
-
-      Timer_initialize();
-         for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
-            (void) rtems_timer_ident( name, id );
-      end_time = Read_timer();
-
-      put_time(
-         "rtems_timer_ident",
-         end_time,
-         OPERATION_COUNT,
-         overhead,
-         0
-      );
-
-/* rtems_timer_fire_after */
-
-      Timer_initialize();
-         for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
-            (void) rtems_timer_fire_after(
-               id,
-               timeout,
-               Timer_handler,
-               NULL
-            );
-      end_time = Read_timer();
-
-      put_time(
-         "rtems_timer_fire_after",
-         end_time,
-         OPERATION_COUNT,
-         overhead,
-         0
-      );
-
-/* rtems_timer_fire_when */
-
-      Timer_initialize();
-         for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
-            (void) rtems_timer_fire_when(
-               id,
-               time,
-               Timer_handler,
-               NULL
-            );
-      end_time = Read_timer();
-
-      put_time(
-         "rtems_timer_fire_when",
-         end_time,
-         OPERATION_COUNT,
-         overhead,
-         0
-      );
-
-/* rtems_timer_reset */
-
-      Timer_initialize();
-         for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
-            (void) rtems_timer_reset( id );
-      end_time = Read_timer();
-
-      put_time(
-         "rtems_timer_reset",
-         end_time,
-         OPERATION_COUNT,
-         overhead,
-         0
-      );
-
-/* rtems_timer_cancel */
-
-      Timer_initialize();
-         for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
-            (void) rtems_timer_cancel( id );
-      end_time = Read_timer();
-
-      put_time(
-         "rtems_timer_cancel",
-         end_time,
-         OPERATION_COUNT,
-         overhead,
-         0
-      );
-
-/* rtems_semaphore_create */
-
-      Timer_initialize();
-         for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
-            (void) rtems_semaphore_create(
-               name,
-               128,
-               RTEMS_DEFAULT_ATTRIBUTES,
-               RTEMS_NO_PRIORITY,
-               &id
-            );
-      end_time = Read_timer();
-
-      put_time(
-         "rtems_semaphore_create",
-         end_time,
-         OPERATION_COUNT,
-         overhead,
-         0
-      );
-
-/* rtems_semaphore_delete */
-
-      Timer_initialize();
-         for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
-            (void) rtems_semaphore_delete( id );
-      end_time = Read_timer();
-
-      put_time(
-         "rtems_semaphore_delete",
-         end_time,
-         OPERATION_COUNT,
-         overhead,
-         0
-      );
-
-/* rtems_semaphore_ident */
-
-      Timer_initialize();
-         for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
-            (void) rtems_semaphore_ident( name, RTEMS_SEARCH_ALL_NODES, id );
-      end_time = Read_timer();
-
-      put_time(
-         "rtems_semaphore_ident",
-         end_time,
-         OPERATION_COUNT,
-         overhead,
-         0
-      );
-
-/* rtems_semaphore_obtain */
-
-      Timer_initialize();
-         for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
-            (void) rtems_semaphore_obtain( id, RTEMS_DEFAULT_OPTIONS, timeout );
-      end_time = Read_timer();
-
-      put_time(
-         "rtems_semaphore_obtain",
-         end_time,
-         OPERATION_COUNT,
-         overhead,
-         0
-      );
-
-/* rtems_semaphore_release */
-
-      Timer_initialize();
-         for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
-            (void) rtems_semaphore_release( id );
-      end_time = Read_timer();
-
-      put_time(
-         "rtems_semaphore_release",
-         end_time,
-         OPERATION_COUNT,
-         overhead,
-         0
-      );
-
-/* rtems_message_queue_create */
-
-      Timer_initialize();
-         for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
-            (void) rtems_message_queue_create(
-               name,
-               128,
-               RTEMS_DEFAULT_ATTRIBUTES,
-               &id
-            );
-      end_time = Read_timer();
-
-      put_time(
-         "rtems_message_queue_create",
-         end_time,
-         OPERATION_COUNT,
-         overhead,
-         0
-      );
-
-/* rtems_message_queue_ident */
-
-      Timer_initialize();
-         for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
-            (void) rtems_message_queue_ident(
-              name,
-              RTEMS_SEARCH_ALL_NODES,
-              id
-            );
-      end_time = Read_timer();
-
-      put_time(
-         "rtems_message_queue_ident",
-         end_time,
-         OPERATION_COUNT,
-         overhead,
-         0
-      );
-
-/* rtems_message_queue_delete */
-
-      Timer_initialize();
-         for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
-            (void) rtems_message_queue_delete( id );
-      end_time = Read_timer();
-
-      put_time(
-         "rtems_message_queue_delete",
-         end_time,
-         OPERATION_COUNT,
-         overhead,
-         0
-      );
-
-/* rtems_message_queue_send */
-
-      Timer_initialize();
-         for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
-            (void) rtems_message_queue_send( id, (long (*)[4])buffer );
-      end_time = Read_timer();
-
-      put_time(
-         "rtems_message_queue_send",
-         end_time,
-         OPERATION_COUNT,
-         overhead,
-         0
-      );
-
-/* rtems_message_queue_urgent */
-
-      Timer_initialize();
-         for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
-            (void) rtems_message_queue_urgent( id, (long (*)[4])buffer );
-      end_time = Read_timer();
-
-      put_time(
-         "rtems_message_queue_urgent",
-         end_time,
-         OPERATION_COUNT,
-         overhead,
-         0
-      );
-
-/* rtems_message_queue_broadcast */
-
-      Timer_initialize();
-         for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
-            (void) rtems_message_queue_broadcast(
-               id,
-               (long (*)[4])buffer,
-               &count
-            );
-      end_time = Read_timer();
-
-      put_time(
-         "rtems_message_queue_broadcast",
-         end_time,
-         OPERATION_COUNT,
-         overhead,
-         0
-      );
-
-/* rtems_message_queue_receive */
-
-      Timer_initialize();
-         for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
-            (void) rtems_message_queue_receive(
-               id,
-               (long (*)[4])buffer,
-               RTEMS_DEFAULT_OPTIONS,
-               timeout
-            );
-      end_time = Read_timer();
-
-      put_time(
-         "rtems_message_queue_receive",
-         end_time,
-         OPERATION_COUNT,
-         overhead,
-         0
-      );
-
-/* rtems_message_queue_flush */
-
-      Timer_initialize();
-         for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
-            (void) rtems_message_queue_flush( id, &count );
-      end_time = Read_timer();
-
-      put_time(
-         "rtems_message_queue_flush",
-         end_time,
-         OPERATION_COUNT,
-         overhead,
-         0
-      );
-
-rtems_test_pause();
-
-/* rtems_event_send */
-
-      Timer_initialize();
-         for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
-            (void) rtems_event_send( id, events );
-      end_time = Read_timer();
-
-      put_time(
-         "rtems_event_send",
-         end_time,
-         OPERATION_COUNT,
-         overhead,
-         0
-      );
-
-/* rtems_event_receive */
-
-      Timer_initialize();
-         for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
-            (void) rtems_event_receive(
-               RTEMS_EVENT_16,
-               RTEMS_DEFAULT_OPTIONS,
-               timeout,
-               &events
-            );
-      end_time = Read_timer();
-
-      put_time(
-         "rtems_event_receive",
-         end_time,
-         OPERATION_COUNT,
-         overhead,
-         0
-      );
-
-/* rtems_signal_catch */
-
-      Timer_initialize();
-         for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
-            (void) rtems_signal_catch( Asr_handler, RTEMS_DEFAULT_MODES );
-      end_time = Read_timer();
-
-      put_time(
-         "rtems_signal_catch",
-         end_time,
-         OPERATION_COUNT,
-         overhead,
-         0
-      );
-
-/* rtems_signal_send */
-
-      Timer_initialize();
-         for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
-            (void) rtems_signal_send( id, signals );
-      end_time = Read_timer();
-
-      put_time(
-         "rtems_signal_send",
-         end_time,
-         OPERATION_COUNT,
-         overhead,
-         0
-      );
-
-/* rtems_partition_create */
-
-      Timer_initialize();
-         for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
-            (void) rtems_partition_create(
-               name,
-               Memory_area,
-               2048,
-               128,
-               RTEMS_DEFAULT_ATTRIBUTES,
-               &id
-            );
-      end_time = Read_timer();
-
-      put_time(
-         "rtems_partition_create",
-         end_time,
-         OPERATION_COUNT,
-         overhead,
-         0
-      );
-
-/* rtems_partition_ident */
-
-      Timer_initialize();
-         for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
-            (void) rtems_partition_ident( name, RTEMS_SEARCH_ALL_NODES, id );
-      end_time = Read_timer();
-
-      put_time(
-         "rtems_partition_ident",
-         end_time,
-         OPERATION_COUNT,
-         overhead,
-         0
-      );
-
-/* rtems_partition_delete */
-
-      Timer_initialize();
-         for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
-            (void) rtems_partition_delete( id );
-      end_time = Read_timer();
-
-      put_time(
-         "rtems_partition_delete",
-         end_time,
-         OPERATION_COUNT,
-         overhead,
-         0
-      );
-
-/* rtems_partition_get_buffer */
-
-      Timer_initialize();
-         for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
-            (void) rtems_partition_get_buffer( id, address_1 );
-      end_time = Read_timer();
-
-      put_time(
-         "rtems_partition_get_buffer",
-         end_time,
-         OPERATION_COUNT,
-         overhead,
-         0
-      );
-
-/* rtems_partition_return_buffer */
-
-      Timer_initialize();
-         for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
-            (void) rtems_partition_return_buffer( id, address_1 );
-      end_time = Read_timer();
-
-      put_time(
-         "rtems_partition_return_buffer",
-         end_time,
-         OPERATION_COUNT,
-         overhead,
-         0
-      );
-
-/* rtems_region_create */
-
-      Timer_initialize();
-         for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
-            (void) rtems_region_create(
-               name,
-               Memory_area,
-               2048,
-               128,
-               RTEMS_DEFAULT_ATTRIBUTES,
-               &id
-            );
-      end_time = Read_timer();
-
-      put_time(
-         "rtems_region_create",
-         end_time,
-         OPERATION_COUNT,
-         overhead,
-         0
-      );
-
-/* rtems_region_ident */
-
-      Timer_initialize();
-         for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
-            (void) rtems_region_ident( name, id );
-      end_time = Read_timer();
-
-      put_time(
-         "rtems_region_ident",
-         end_time,
-         OPERATION_COUNT,
-         overhead,
-         0
-      );
-
-/* rtems_region_delete */
-
-      Timer_initialize();
-         for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
-            (void) rtems_region_delete( id );
-      end_time = Read_timer();
-
-      put_time(
-         "rtems_region_delete",
-         end_time,
-         OPERATION_COUNT,
-         overhead,
-         0
-      );
-
-/* rtems_region_get_segment */
-
-      Timer_initialize();
-         for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
-            (void) rtems_region_get_segment(
-               id,
-               243,
-               RTEMS_DEFAULT_OPTIONS,
-               timeout,
-               &address_1
-            );
-      end_time = Read_timer();
-
-      put_time(
-         "rtems_region_get_segment",
-         end_time,
-         OPERATION_COUNT,
-         overhead,
-         0
-      );
-
-/* rtems_region_return_segment */
-
-      Timer_initialize();
-         for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
-            (void) rtems_region_return_segment( id, address_1 );
-      end_time = Read_timer();
-
-      put_time(
-         "rtems_region_return_segment",
-         end_time,
-         OPERATION_COUNT,
-         overhead,
-         0
-      );
-
-/* rtems_port_create */
-
-      Timer_initialize();
-         for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
-            (void) rtems_port_create(
-               name,
-               Internal_port_area,
-               External_port_area,
-               0xff,
-               &id
-            );
-      end_time = Read_timer();
-
-      put_time(
-         "rtems_port_create",
-         end_time,
-         OPERATION_COUNT,
-         overhead,
-         0
-      );
-
-/* rtems_port_ident */
-
-      Timer_initialize();
-         for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
-            (void) rtems_port_ident( name, id );
-      end_time = Read_timer();
-
-      put_time(
-         "rtems_port_ident",
-         end_time,
-         OPERATION_COUNT,
-         overhead,
-         0
-      );
-
-/* rtems_port_delete */
-
-      Timer_initialize();
-         for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
-            (void) rtems_port_delete( id );
-      end_time = Read_timer();
-
-      put_time(
-         "rtems_port_delete",
-         end_time,
-         OPERATION_COUNT,
-         overhead,
-         0
-      );
-
-/* rtems_port_external_to_internal */
-
-      Timer_initialize();
-         for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
-            (void) rtems_port_external_to_internal(
-               id,
-               &External_port_area[ 7 ],
-               address_1
-            );
-      end_time = Read_timer();
-
-      put_time(
-         "rtems_port_external_to_internal",
-         end_time,
-         OPERATION_COUNT,
-         overhead,
-         0
-      );
-
-/* rtems_port_internal_to_external */
-
-      Timer_initialize();
-         for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
-            (void) rtems_port_internal_to_external(
-               id,
-               &Internal_port_area[ 7 ],
-               address_1
-            );
-      end_time = Read_timer();
-
-      put_time(
-         "rtems_port_internal_to_external",
-         end_time,
-         OPERATION_COUNT,
-         overhead,
-         0
-      );
-
-rtems_test_pause();
-
-/* rtems_io_initialize */
-
-      Timer_initialize();
-         for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
-            (void) rtems_io_initialize(
-               major,
-               minor,
-               address_1,
-               &io_result
-            );
-      end_time = Read_timer();
-
-      put_time(
-         "rtems_io_initialize",
-         end_time,
-         OPERATION_COUNT,
-         overhead,
-         0
-      );
-
-/* rtems_io_open */
-
-      Timer_initialize();
-         for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
-            (void) rtems_io_open(
-               major,
-               minor,
-               address_1,
-               &io_result
-            );
-      end_time = Read_timer();
-
-      put_time(
-         "rtems_io_open",
-         end_time,
-         OPERATION_COUNT,
-         overhead,
-         0
-      );
-
-/* rtems_io_close */
-
-      Timer_initialize();
-         for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
-            (void) rtems_io_close(
-               major,
-               minor,
-               address_1,
-               &io_result
-            );
-      end_time = Read_timer();
-
-      put_time(
-         "rtems_io_close",
-         end_time,
-         OPERATION_COUNT,
-         overhead,
-         0
-      );
-
-/* rtems_io_read */
-
-      Timer_initialize();
-         for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
-            (void) rtems_io_read(
-               major,
-               minor,
-               address_1,
-               &io_result
-            );
-      end_time = Read_timer();
-
-      put_time(
-         "rtems_io_read",
-         end_time,
-         OPERATION_COUNT,
-         overhead,
-         0
-      );
-
-/* rtems_io_write */
-
-      Timer_initialize();
-         for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
-            (void) rtems_io_write(
-               major,
-               minor,
-               address_1,
-               &io_result
-            );
-      end_time = Read_timer();
-
-      put_time(
-         "rtems_io_write",
-         end_time,
-         OPERATION_COUNT,
-         overhead,
-         0
-      );
-
-/* rtems_io_control */
-
-      Timer_initialize();
-         for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
-            (void) rtems_io_control(
-               major,
-               minor,
-               address_1,
-               &io_result
-            );
-      end_time = Read_timer();
-
-      put_time(
-         "rtems_io_control",
-         end_time,
-         OPERATION_COUNT,
-         overhead,
-         0
-      );
-
-/* rtems_fatal_error_occurred */
-
-      Timer_initialize();
-         for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
-            (void) rtems_fatal_error_occurred( error );
-      end_time = Read_timer();
-
-      put_time(
-         "rtems_fatal_error_occurred",
-         end_time,
-         OPERATION_COUNT,
-         overhead,
-         0
-      );
-
-/* rtems_rate_monotonic_create */
-
-      Timer_initialize();
-         for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
-            (void) rtems_rate_monotonic_create( name, &id );
-      end_time = Read_timer();
-
-      put_time(
-         "rtems_rate_monotonic_create",
-         end_time,
-         OPERATION_COUNT,
-         overhead,
-         0
-      );
-
-/* rtems_rate_monotonic_ident */
-
-      Timer_initialize();
-         for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
-            (void) rtems_rate_monotonic_ident( name, id );
-      end_time = Read_timer();
-
-      put_time(
-         "rtems_rate_monotonic_ident",
-         end_time,
-         OPERATION_COUNT,
-         overhead,
-         0
-      );
-
-/* rtems_rate_monotonic_delete */
-
-      Timer_initialize();
-         for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
-            (void) rtems_rate_monotonic_delete( id );
-      end_time = Read_timer();
-
-      put_time(
-         "rtems_rate_monotonic_delete",
-         end_time,
-         OPERATION_COUNT,
-         overhead,
-         0
-      );
-
-/* rtems_rate_monotonic_cancel */
-
-      Timer_initialize();
-         for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
-            (void) rtems_rate_monotonic_cancel( id );
-      end_time = Read_timer();
-
-      put_time(
-         "rtems_rate_monotonic_cancel",
-         end_time,
-         OPERATION_COUNT,
-         overhead,
-         0
-      );
-
-/* rtems_rate_monotonic_period */
-
-      Timer_initialize();
-         for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
-            (void) rtems_rate_monotonic_period( id, timeout );
-      end_time = Read_timer();
-
-      put_time(
-         "rtems_rate_monotonic_period",
-         end_time,
-         OPERATION_COUNT,
-         overhead,
-         0
-      );
-
-/* rtems_multiprocessing_announce */
-
-      Timer_initialize();
-         for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
-            (void) rtems_multiprocessing_announce();
-      end_time = Read_timer();
-
-      put_time(
-         "rtems_multiprocessing_announce",
-         end_time,
-         OPERATION_COUNT,
-         overhead,
-         0
-      );
-
-  puts( "*** END OF TIME OVERHEAD ***" );
-
-  exit( 0 );
-}
diff --git a/testsuites/tmtests/tmoverhd/tmoverhd.doc b/testsuites/tmtests/tmoverhd/tmoverhd.doc
deleted file mode 100644
index 496f3569e5..0000000000
--- a/testsuites/tmtests/tmoverhd/tmoverhd.doc
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-#  $Id$
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-
-
diff --git a/tools/build/Makefile.in b/tools/build/Makefile.in
deleted file mode 100644
index ad819e8214..0000000000
--- a/tools/build/Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/directory.cfg
-
-SUB_DIRS=os scripts src 
diff --git a/tools/build/README b/tools/build/README
deleted file mode 100644
index 0738a5830e..0000000000
--- a/tools/build/README
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-#  $Id$
-#
-
-Misc. support tools for RTEMS workspaces.
-More will be added later as they are converted from Teamware
-to CVS.
-
-install-if-change
-    Smart install script that also can append suffixes as it
-    installs (suffixes used for debug and profile variants).
-    Requires bash or ksh.
-
-rcs-clean
-    deletes all files from the current directory that can be
-    re-created from RCS.  Careful to not delete locked files.
-    May be used by 'gmake clobber'
-
-lock-directory
-unlock-directory
-    traverse a directory structure making it unwritable.
-    Useful to keep people from accidentally overwriting
-    "released" trees if they get confused about which
-    module they have loaded.
diff --git a/tools/build/binpatch.c b/tools/build/binpatch.c
deleted file mode 100644
index ab0900702a..0000000000
--- a/tools/build/binpatch.c
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- *  $Id$
- */
-
-
-#include <stdio.h>
-#include <stdlib.h>
-
-/*
- * This function will patch binary file
- */
-
-
-static char buf[512];
-
-static void 
-usage(void)
-{
-  printf("usage: binpatch [-h] <ofile> <ifile> <reloc> <off> <byte0> "
-         "[<byte1> [<byte2> [<byte3>]]]\n");
-  printf("this function patches binary file at specified offset with\n");
-  printf("up to 4 bytes provided on command line \n");
-  printf("-h       - prints this message\n\n");
-  printf("<ofile>  - output file\n");
-  printf("<ifile>  - input ifile\n");
-  printf("<reloc>  - relocation address of image\n");
-  printf("<off>    - offset of patch, offset in file is at off - reloc\n");
-  printf("<byte0>  - byte 0 of patch\n");
-  printf("<byte1>  - byte 1 of patch\n");
-  printf("<byte2>  - byte 1 of patch\n");
-  printf("<byte3>  - byte 1 of patch\n");
-
-  return;
-}
-
-int
-main(int argc, char **argv)
-{
-  int   c;
-  FILE  *ofp, *ifp;
-  char  patch[4], *end;
-  int   patchLen, tmp, i, off, cnt, patched, len, reloc;
-  
-  
-  /* parse command line options */
-  while ((c = getopt(argc, argv, "h")) >= 0)
-    {
-      switch (c)
-	{
-	case 'h':
-	  usage();
-	  return 0;
-	default:
-	  usage();
-	  return 1;
-	}
-    }
-
-  if(argc < 6)
-    {
-      usage();
-      return 1;
-    }
-
-  /* Let us get offset in file */
-  reloc = strtol(argv[3], &end, 0);
-  if(end == argv[3] || off < 0)
-    {
-      fprintf(stderr, "bad reloc value %s\n", argv[3]);
-      return 1;
-    }
-
-  off = strtol(argv[4], &end, 0);
-  if(end == argv[4] || off < 0 || off < reloc)
-    {
-      fprintf(stderr, "bad offset value %s\n", argv[4]);
-      return 1;
-    }
-
-  off -= reloc;
-
-  /* Let us get patch  */
-  patchLen = argc - 5;
-
-  for(i=0; i<patchLen; i++)
-    {
-      tmp = strtol(argv[5+i], &end, 0);
-
-      if(end == argv[4+i] || tmp < 0 || tmp > 0xff)
-	{
-	  fprintf(stderr, "bad byte value %s\n", argv[5+i]);
-	  return 1;
-	}
-      patch[i] = tmp;
-    }
-      
-  ifp = fopen(argv[2], "r");
-  if(ifp == NULL)
-    {
-      fprintf(stderr, "unable to open file %s\n", argv[2]);
-      return 1;
-    }
-
-  ofp = fopen(argv[1], "w");
-  if(ofp == NULL)
-    {
-      fprintf(stderr, "unable to open file %s\n", argv[1]);
-      return 1;
-    }
-
-  cnt     = 0;
-  patched = 0;
-  for(;;)
-    {
-      len = fread(buf, 1, sizeof(buf), ifp);
-
-      if(len == 0)
-	{
-	  break;
-	}
-
-      if(cnt <= off && (cnt + len) > off)
-	{
-	  /* Perform patch */
-	  for(i=0; i<patchLen && (off+i)<(cnt+len); i++)
-	    {
-	      buf[off-cnt+i] = patch[i];
-	    }
-	  patched = 1;
-	}
-      else if(cnt > off && cnt < (off + patchLen))
-	{
-	  /* Perform patch */
-	  for(i=cnt-off; i<patchLen; i++)
-	    {
-	      buf[off-cnt+i] = patch[i];
-	    }
-	  patched = 1;
-	}
-	  
-      fwrite(buf, 1, len, ofp);
-
-      cnt += len;
-    }
-
-  fclose(ifp);
-  fclose(ofp);
-  
-  if(!patched)
-    {
-      fprintf(stderr, "warning: offset is beyond input file length\n");
-      fprintf(stderr, "         no patch is performed\n");
-    }
-
-  return 0;
-}
-
-      
-
-  
-
-
-
-
-  
-
-
-
diff --git a/tools/build/cklength.c b/tools/build/cklength.c
deleted file mode 100644
index 624bf25e70..0000000000
--- a/tools/build/cklength.c
+++ /dev/null
@@ -1,377 +0,0 @@
-/*
- *  cklength - check the length of lines in a file
- *
- *  This program check to see if the files passed to it on the command line
- *  contain a line which exceeds the maximum allowable length.  The default
- *  maximum line length is 80.
- *
- *  usage:  cklength  [ -v ] [ arg ... ] files...
- *           -l length   -- maximum line length
- *           -v          -- verbose
- *
- * $Id$
- */
-
-#define GETOPTARGS "l:nNv"
-
-char *USAGE = "\
-usage:  cklength  [ -v ] [ arg ... ] files... \n\
-            -l length   -- maximum line length\n\
-            -n          -- report line numbers for offending lines\n\
-            -N          -- report line numbers and length for offending lines\n\
-            -v          -- verbose\n\
-\n\
-Print the name of files which have at least 1 line which exceeds the\n\
-maximum line length.  The default maximum line length is 80.\n\
-";
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <memory.h>
-#include <stdarg.h>
-#include <errno.h>
-
-#include "config.h"
-
-#ifndef VMS
-#ifndef HAVE_STRERROR
-extern int sys_nerr;
-extern char *sys_errlist[];
-
-#define strerror( _err ) \
-  ((_err) < sys_nerr) ? sys_errlist [(_err)] : "unknown error"
-
-#else   /* HAVE_STRERROR */
-char *strerror ();
-#endif
-#else   /* VMS */
-char *strerror (int,...);
-#endif
-
-
-#define BUFFER_SIZE     512
-
-#define SUCCESS         0
-#define FAILURE         -1
-#define Failed(x)       (((int) (x)) == FAILURE)
-#define TRUE    1
-#define FALSE   0
-#define STREQ(a,b)      (strcmp(a,b) == 0)
-#define NUMELEMS(arr)   (sizeof(arr) / sizeof(arr[0]))
-
-/*
- * Definitions for unsigned "ints"; especially for use in data structures
- *  that will be shared among (potentially) different cpu's (we punt on
- *  byte ordering problems tho)
- */
-
-typedef unsigned char   u8;
-typedef unsigned short  u16;
-typedef unsigned long   u32;
-
-/*
- * vars controlled by command line options
- */
-
-int verbose = FALSE;                    /* be verbose */
-int report_line_numbers = FALSE;        /* report line numbers of offenders */
-int report_line_length = FALSE;         /* report line length of offenders */
-
-int line_length = 80;                   /* maximum allowable line length */
-
-extern char *optarg;                    /* getopt(3) control vars */
-extern int optind, opterr;
-
-char *progname;                         /* for error() */
-
-int process(char *arg);
-void error(int errn, ...);
-long getparm(char *s, long min, long max, char *msg);
-
-#define ERR_ERRNO  (1<<((sizeof(int) * 8) - 2)) /* hi bit; use 'errno' */
-#define ERR_FATAL  (ERR_ERRNO / 2)              /* fatal error ; no return */
-#define ERR_ABORT  (ERR_ERRNO / 4)              /* fatal error ; abort */
-#define ERR_MASK   (ERR_ERRNO | ERR_FATAL | ERR_ABORT) /* all */
-
-#define stol(p) strtol(p, (char **) NULL, 0)
-int  Open(), Read(), Write();
-
-int main(
-  int argc,
-  char **argv
-)
-{
-    register int c;
-    int showusage = FALSE;                      /* usage error? */
-    int rc = 0;
-
-    /*
-     * figure out invocation leaf-name
-     */
-
-    if ((progname = strrchr(argv[0], '/')) == (char *) NULL)
-        progname = argv[0];
-    else
-        progname++;
-
-    argv[0] = progname;                         /* for getopt err reporting */
-
-    /*
-     *  Check options and arguments.
-     */
-
-    opterr = 0;                                 /* we'll report all errors */
-    while ((c = getopt(argc, argv, GETOPTARGS)) != EOF)
-        switch (c)
-        {
-            case 'l':                            /* line length */
-                line_length = atoi( optarg );
-                if ( line_length < 0 || line_length > BUFFER_SIZE )
-                  error(ERR_FATAL, "(%d) is illegal line length\n",line_length);
-                break;
-
-            case 'n':                           /* toggle report_line_numbers */
-                report_line_numbers = ! report_line_numbers;
-                break;
-
-            case 'N':                           /* toggle both reports */
-                report_line_numbers = ! report_line_numbers;
-                report_line_length  = ! report_line_length;
-                break;
-
-            case 'v':                           /* toggle verbose */
-                verbose = ! verbose;
-                break;
-
-            case '?':
-                showusage = TRUE;
-        }
-
-    if (showusage)
-    {
-        (void) fprintf(stderr, "%s", USAGE);
-        exit(1);
-    }
-
-    /*
-     *  traverse and process the arguments
-     */
-
-    for ( ; argv[optind]; optind++)
-        if (Failed(process(argv[optind])))
-            rc = FAILURE;
-
-    return rc;
-}
-
-
-/*
- * process(arg)
- */
-
-int
-process(char *arg)
-{
-  FILE   *in;
-  char   *bptr;
-  char    buffer[ BUFFER_SIZE ];
-  int     line_number;
-  int     length;
-  int     count;
-  int     rc = SUCCESS;  /* succeed by default */
-
-  in = fopen( arg, "r" );
-  if (!in)
-    error( ERR_ERRNO | ERR_FATAL, "Unable to open file (%s)\n", arg );
-
-  count = 0;
-
-  for ( line_number=1 ; ; line_number++ ) {
-    bptr = fgets( buffer, BUFFER_SIZE, in );
-    if (!bptr)
-      break;
-
-    /*
-     *  Don't count the carriage return.
-     */
-
-    length = strlen( buffer ) - 1;
-
-    if ( length <= line_length )
-      continue;
-
-    if ( count == 0 ) {
-      fprintf( stderr, "%s\n", arg );
-      if ( !report_line_numbers )
-        break;
-    }
-
-    if ( verbose )
-      fprintf( stderr, "TOO LONG:%d: %s\n", line_number, buffer );
-
-    if ( report_line_numbers ) {
-      if ( report_line_length )
-        fprintf( stderr, "%d: %d\n" , line_number, length );
-      else
-        fprintf( stderr, "%d\n" , line_number );
-    }
-
-    count++;
-
-  }
-
-  fclose( in );
-  return rc;
-}
-
-/*
- * error(errn, arglist)
- *      report an error to stderr using printf(3) conventions.
- *      Any output is preceded by '<progname>: '
- *
- * Uses ERR_FATAL bit to request exit(errn)
- *      ERR_ABORT to request abort()
- *      ERR_ERRNO to indicate use of errno instead of argument.
- *
- * If resulting 'errn' is non-zero, it is assumed to be an 'errno' and its
- *      associated error message is appended to the output.
- */
-
-/*VARARGS*/
-
-void
-error(int error_flag, ...)
-{
-    va_list arglist;
-    register char *format;
-    int local_errno;
-
-    extern int errno;
-
-    (void) fflush(stdout);          /* in case stdout/stderr same */
-
-    local_errno = error_flag & ~ERR_MASK;
-    if (error_flag & ERR_ERRNO)     /* use errno? */
-        local_errno = errno;
-
-    va_start(arglist, error_flag);
-    format = va_arg(arglist, char *);
-    (void) fprintf(stderr, "%s: ", progname);
-    (void) vfprintf(stderr, format, arglist);
-    va_end(arglist);
-
-    if (local_errno)
-      (void) fprintf(stderr, " (%s)\n", strerror(local_errno));
-
-    (void) fflush(stderr);
-
-    if (error_flag & (ERR_FATAL | ERR_ABORT))
-    {
-        if (error_flag & ERR_FATAL)
-        {
-            error(0, "fatal error, exiting");
-            exit(local_errno ? local_errno : 1);
-        }
-        else
-        {
-            error(0, "fatal error, aborting");
-            abort();
-        }
-    }
-}
-
-long
-getparm(char *s,
-        long min,
-        long max,
-        char *msg)
-{
-    long val;
-
-    if ( ! strchr("0123456789-", *s))
-    {
-        error(ERR_FATAL, "'%s' is not a number", s);
-        return min;
-    }
-
-    val = strtol(s, (char **) NULL, 0);
-    if ((val < min) || (val > max))
-    {
-        if (min == max)
-            error(ERR_FATAL, "%s can only be %ld", s, min);
-        else
-            error(ERR_FATAL, "%s must be between %ld and %ld", msg, min, max);
-    }
-
-    return val;
-}
-
-
-/*
- * Open()
- *      Perform open(2), returning the file descriptor.  Prints
- *      error message if open fails.
- */
-
-int
-Open(char *file,
-     int oflag,
-     int mode)
-{
-    int O_fd;
-
-    if (Failed(O_fd = open(file, oflag, mode)))
-        error(
-          ERR_ERRNO | ERR_FATAL,
-          "open('%s', 0x%x, 0%o) failed", file, oflag, mode
-        );
-
-    return O_fd;
-}
-
-/*
- * Read()
- *      Perform read(2); prints error message if fails.
- */
-
-int
-Read(int file,
-     char *buffer,
-     unsigned int count)
-{
-    int nbytes;
-
-    if (Failed(nbytes = read(file, buffer, count)))
-        error(
-          ERR_ERRNO | ERR_FATAL,
-          "read(%d, 0x%x, %d) failed", file, buffer, count
-         );
-
-    return nbytes;
-}
-
-/*
- * Write()
- *      Perform write(2); prints error message if fails.
- */
-
-int
-Write(int file,
-      char *buffer,
-      unsigned int count)
-{
-    int nbytes;
-
-    if (Failed(nbytes = write(file, buffer, count)))
-        error(
-          ERR_ERRNO | ERR_FATAL,
-          "write(%d, 0x%x, %d) failed", file, buffer, count
-        );
-
-    return nbytes;
-}
diff --git a/tools/build/eolstrip.c b/tools/build/eolstrip.c
deleted file mode 100644
index c944ae6663..0000000000
--- a/tools/build/eolstrip.c
+++ /dev/null
@@ -1,366 +0,0 @@
-/*
- *  eolstrip - strip white space from end of lines
- *
- *  This program strips the white space from the end of every line in the
- *  specified program.
- *
- *  usage:  eolstrip  [ -v ] [ arg ... ] files...
- *           -v          -- verbose
- *
- * $Id$
- */
-
-#define GETOPTARGS "vt"
-
-char *USAGE = "\
-usage:  cklength  [ -v ] [ arg ... ] files... \n\
-            -v          -- verbose\n\
-            -t          -- test only .. DO NOT OVERWRITE FILE!!!\n\
-\n\
-Strip the white space from the end of every line on the list of files.\n\
-";
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <memory.h>
-#include <stdarg.h>
-#include <errno.h>
-
-#include "config.h"
-
-#ifndef VMS
-#ifndef HAVE_STRERROR
-extern int sys_nerr;
-extern char *sys_errlist[];
-
-#define strerror( _err ) \
-  ((_err) < sys_nerr) ? sys_errlist [(_err)] : "unknown error"
-
-#else   /* HAVE_STRERROR */
-char *strerror ();
-#endif
-#else   /* VMS */
-char *strerror (int,...);
-#endif
-
-
-#define BUFFER_SIZE     2048
-#define MAX_PATH        2048
-
-#define SUCCESS         0
-#define FAILURE         -1
-#define Failed(x)       (((int) (x)) == FAILURE)
-#define TRUE    1
-#define FALSE   0
-#define STREQ(a,b)      (strcmp(a,b) == 0)
-#define NUMELEMS(arr)   (sizeof(arr) / sizeof(arr[0]))
-
-/*
- * Definitions for unsigned "ints"; especially for use in data structures
- *  that will be shared among (potentially) different cpu's (we punt on
- *  byte ordering problems tho)
- */
-
-typedef unsigned char   u8;
-typedef unsigned short  u16;
-typedef unsigned long   u32;
-
-/*
- * vars controlled by command line options
- */
-
-int verbose = FALSE;                    /* be verbose */
-int test_only = FALSE;                  /* test only */
-
-extern char *optarg;                    /* getopt(3) control vars */
-extern int optind, opterr;
-
-char *progname;                         /* for error() */
-
-int process(char *arg);
-void error(int errn, ...);
-long getparm(char *s, long min, long max, char *msg);
-
-#define ERR_ERRNO  (1<<((sizeof(int) * 8) - 2)) /* hi bit; use 'errno' */
-#define ERR_FATAL  (ERR_ERRNO / 2)              /* fatal error ; no return */
-#define ERR_ABORT  (ERR_ERRNO / 4)              /* fatal error ; abort */
-#define ERR_MASK   (ERR_ERRNO | ERR_FATAL | ERR_ABORT) /* all */
-
-#define stol(p) strtol(p, (char **) NULL, 0)
-int  Open(), Read(), Write();
-
-int main(
-  int argc,
-  char **argv
-)
-{
-    register int c;
-    int showusage = FALSE;                      /* usage error? */
-    int rc = 0;
-
-    /*
-     * figure out invocation leaf-name
-     */
-
-    if ((progname = strrchr(argv[0], '/')) == (char *) NULL)
-        progname = argv[0];
-    else
-        progname++;
-
-    argv[0] = progname;                         /* for getopt err reporting */
-
-    /*
-     *  Check options and arguments.
-     */
-
-    opterr = 0;                                 /* we'll report all errors */
-    while ((c = getopt(argc, argv, GETOPTARGS)) != EOF)
-        switch (c)
-        {
-            case 't':                           /* toggle test only mode */
-                test_only = ! test_only;
-                break;
-
-            case 'v':                           /* toggle verbose */
-                verbose = ! verbose;
-                break;
-
-            case '?':
-                showusage = TRUE;
-        }
-
-    if (showusage)
-    {
-        (void) fprintf(stderr, "%s", USAGE);
-        exit(1);
-    }
-
-    /*
-     *  traverse and process the arguments
-     */
-
-    for ( ; argv[optind]; optind++)
-        if (Failed(process(argv[optind])))
-            rc = FAILURE;
-
-    return rc;
-}
-
-
-/*
- * process(arg)
- */
-
-int
-process(char *arg)
-{
-  FILE   *in;
-  FILE   *out = (FILE *) 0;
-  char    outname[ MAX_PATH ];
-  char   *bptr;
-  char    buffer[ BUFFER_SIZE ];
-  int     length;
-  int     line_number;
-  int     rc = SUCCESS;  /* succeed by default */
-
-  in = fopen( arg, "r" );
-  if (!in)
-    error( ERR_ERRNO | ERR_FATAL, "Unable to open file (%s)\n", arg );
-
-  if ( !test_only ) {
-    sprintf( outname, "%s.eoltmp", arg );
-
-    out = fopen( outname, "w" );
-    if (!out)
-      error( ERR_ERRNO | ERR_FATAL, "Unable to open file (%s)\n", arg );
-  }
-
-  if ( verbose )
-    fprintf( stderr, "Processing %s\n", arg );
-
-  for ( line_number=1 ; ; line_number++ ) {
-    bptr = fgets( buffer, BUFFER_SIZE, in );
-    if (!bptr)
-      break;
-
-    /*
-     *  Don't count the carriage return.
-     */
-
-    length = strlen( buffer ) - 1;
-
-    if ( buffer[ length ] != '\n' )
-      error(ERR_ERRNO|ERR_FATAL, "Line %d too long in %s\n", line_number, arg);
-
-    while ( isspace( (int) buffer[ length ] ) )
-      buffer[ length-- ] = '\0';
-
-    if ( test_only ) {
-      fprintf( stderr, "%s\n", arg );
-      break;
-    }
-
-    fprintf( out, "%s\n", buffer );
-  }
-
-  fclose( in );
-  if ( !test_only ) {
-    fclose( out );
-    rename( outname, arg );
-  }
-  return rc;
-}
-
-/*
- * error(errn, arglist)
- *      report an error to stderr using printf(3) conventions.
- *      Any output is preceded by '<progname>: '
- *
- * Uses ERR_FATAL bit to request exit(errn)
- *      ERR_ABORT to request abort()
- *      ERR_ERRNO to indicate use of errno instead of argument.
- *
- * If resulting 'errn' is non-zero, it is assumed to be an 'errno' and its
- *      associated error message is appended to the output.
- */
-
-/*VARARGS*/
-
-void
-error(int error_flag, ...)
-{
-    va_list arglist;
-    register char *format;
-    int local_errno;
-
-    extern int errno;
-
-    (void) fflush(stdout);          /* in case stdout/stderr same */
-
-    local_errno = error_flag & ~ERR_MASK;
-    if (error_flag & ERR_ERRNO)     /* use errno? */
-        local_errno = errno;
-
-    va_start(arglist, error_flag);
-    format = va_arg(arglist, char *);
-    (void) fprintf(stderr, "%s: ", progname);
-    (void) vfprintf(stderr, format, arglist);
-    va_end(arglist);
-
-    if (local_errno)
-      (void) fprintf(stderr, " (%s)\n", strerror(local_errno));
-    else
-      (void) fprintf(stderr, "\n");
-
-    (void) fflush(stderr);
-
-    if (error_flag & (ERR_FATAL | ERR_ABORT))
-    {
-        if (error_flag & ERR_FATAL)
-        {
-            error(0, "fatal error, exiting");
-            exit(local_errno ? local_errno : 1);
-        }
-        else
-        {
-            error(0, "fatal error, aborting");
-            abort();
-        }
-    }
-}
-
-long
-getparm(char *s,
-        long min,
-        long max,
-        char *msg)
-{
-    long val;
-
-    if ( ! strchr("0123456789-", *s))
-    {
-        error(ERR_FATAL, "'%s' is not a number", s);
-        return min;
-    }
-
-    val = strtol(s, (char **) NULL, 0);
-    if ((val < min) || (val > max))
-    {
-        if (min == max)
-            error(ERR_FATAL, "%s can only be %ld", s, min);
-        else
-            error(ERR_FATAL, "%s must be between %ld and %ld", msg, min, max);
-    }
-
-    return val;
-}
-
-
-/*
- * Open()
- *      Perform open(2), returning the file descriptor.  Prints
- *      error message if open fails.
- */
-
-int
-Open(char *file,
-     int oflag,
-     int mode)
-{
-    int O_fd;
-
-    if (Failed(O_fd = open(file, oflag, mode)))
-        error(
-          ERR_ERRNO | ERR_FATAL,
-          "open('%s', 0x%x, 0%o) failed", file, oflag, mode
-        );
-
-    return O_fd;
-}
-
-/*
- * Read()
- *      Perform read(2); prints error message if fails.
- */
-
-int
-Read(int file,
-     char *buffer,
-     unsigned int count)
-{
-    int nbytes;
-
-    if (Failed(nbytes = read(file, buffer, count)))
-        error(
-          ERR_ERRNO | ERR_FATAL,
-          "read(%d, 0x%x, %d) failed", file, buffer, count
-        );
-
-    return nbytes;
-}
-
-/*
- * Write()
- *      Perform write(2); prints error message if fails.
- */
-
-int
-Write(int file,
-      char *buffer,
-      unsigned int count)
-{
-    int nbytes;
-
-    if (Failed(nbytes = write(file, buffer, count)))
-        error(
-          ERR_ERRNO | ERR_FATAL,
-          "write(%d, 0x%x, %d) failed", file, buffer, count
-        );
-
-    return nbytes;
-}
diff --git a/tools/build/install-if-change.in b/tools/build/install-if-change.in
deleted file mode 100644
index b2f3cb04bb..0000000000
--- a/tools/build/install-if-change.in
+++ /dev/null
@@ -1,142 +0,0 @@
-#!@KSH@ -p
-#
-# Either bash or ksh will be ok for this; requires (( )) arithmetic
-#  (-p above just says to not parse $ENV file; makes it faster for
-#   those of us who set $ENV)
-#
-# install files if they have changed by running 'cmp', then 'install'
-#   as necessary.
-#
-#  Optionally, can append a suffix before last existing suffix (if any)
-#
-# NOTE
-#   We avoid using typical install(1M) programs since they have
-#   large variability across systems and we also need to support ou
-#   -V option.
-#   So we just copy and chmod by hand.
-#
-# $Id$
-#
-
-progname=`basename $0`
-#progname=${0##*/}        # fast basename hack for ksh, bash
-
-USAGE=\
-"usage: $progname [ -vmV ] file [ file ... ] dest-directory-or-file
-	-v	    -- verbose
-        -V suffix   -- suffix to append to targets (before any . suffix)
-                        eg: -V _g would change 'foo' to 'foo_g' and
-                                               'libfoo.a' to 'libfoo_g.a'
-        -m mode     -- mode for new file(s)"
-
-fatal() {
-    if [ "$1" ]
-    then
-        echo $* >&2
-    fi
-    echo "$USAGE" 1>&2
-    exit 1
-}
-
-#
-# process the options
-#
-
-verbose=""
-suffix=""
-mode=""
-
-while getopts vm:V: OPT
-do
-    case "$OPT" in
-	v)
-	    verbose="yes";;
-        V)
-            eval suffix=$OPTARG;;
-        m)
-            mode="$OPTARG";;
-        *)
-            fatal
-    esac
-done
-
-shiftcount=`expr $OPTIND - 1`
-shift $shiftcount
-
-args=$*
-
-#
-# Separate source file(s) from dest directory or file
-#
-
-files=""
-dest=""
-for d in $args
-do
-    files="$files $dest"
-    dest=$d
-done
-
-if [ ! "$files" ] || [ ! "$dest" ]
-then
-    fatal "missing files or invalid destination"
-fi
-
-#
-# Process the arguments
-#
-
-targets=""
-for f in $files
-do
-    # leaf=`basename $f`
-    leaf=${f##*/}        # fast basename hack for ksh, bash
-
-    target=$dest
-    if [ -d $dest ]
-    then
-        # if we were given a suffix, then add it as appropriate
-        if [ "$suffix" ]
-        then
-            case $f in
-                *.*)
-                    # leaf=`echo $leaf |
-                    #   /bin/sed "s/\([~\.]*\)\.\(.*\)$/\1$suffix.\2/"`
-                    # ksh,bash hack for above sed script
-                    leaf=${leaf%%.*}$suffix.${leaf#*.}
-
-                    [ "$verbose" = "yes" ] &&
-                      echo "$progname: $f will be installed as $leaf"
-                    ;;
-                *)
-                    leaf=$leaf$suffix;;
-            esac
-        fi
-        target=$target/$leaf
-    fi
-
-    [ ! -r $f ] && fatal "can not read $f"
-
-    if cmp -s $f $target
-    then
-        [ "$verbose" = "yes" ] && echo "'$f' not newer than '$target'"
-    else
-        [ "$verbose" = "yes" ] && echo "rm -f $target"
-        rm -f $target
-        echo "cp -p $f $target"
-        cp -p $f $target || exit 1
-        targets="$targets $target"    # keep list for chmod below
-    fi
-done
-
-if [ "$mode" -a "$targets" ]
-then
-     [ "$verbose" = "yes" ] && echo "chmod $mode $targets"
-     chmod $mode $targets
-fi
-
-exit 0
-
-# Local Variables: ***
-# mode:ksh ***
-# End: ***
diff --git a/tools/build/lock-directory.in b/tools/build/lock-directory.in
deleted file mode 100644
index 1c205cdec0..0000000000
--- a/tools/build/lock-directory.in
+++ /dev/null
@@ -1,43 +0,0 @@
-#!@KSH@
-#
-# $Id$
-#
-# Make a directory write protected
-# Used to write protect the install point after a build
-# to prevent inadvertant overwriting.
-#
-
-# is a particular command available on this machine?
-#
-cmd_avail()
-{
-    set -- `type $1 2>&1`
-    if [ "$2" = "not" -a "$3" = "found" ] || [ "$3" = "not" -a "$4" = "found" ]
-    then
-        return 1
-    else
-        return 0
-    fi
-}
-
-lock_directory() {
-    l_dir=$1/.			# get any symlink out of the way using '.'
-    if [ -d $l_dir ]
-    then
-        find $l_dir -type d -perm -0200 -print | $XARGS chmod -w
-    fi
-}
-
-# Use gnu xargs if available; faster, more reliable in general
-XARGS=xargs
-cmd_avail gxargs && XARGS=gxargs
-
-for dir
-do
-    lock_directory $dir
-done
-
-# Local Variables: ***
-# mode:ksh ***
-# End: ***
-
diff --git a/tools/build/os/Makefile.in b/tools/build/os/Makefile.in
deleted file mode 100644
index d540e58fa0..0000000000
--- a/tools/build/os/Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/directory.cfg
-
-SUB_DIRS=$(wildcard $(RTEMS_HOST))
diff --git a/tools/build/os/msdos/Makefile.in b/tools/build/os/msdos/Makefile.in
deleted file mode 100644
index 23a840d33a..0000000000
--- a/tools/build/os/msdos/Makefile.in
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-DESTDIR=$(PROJECT_RELEASE)/build-tools
-
-INSTALLED=$(DESTDIR)/ifc.exe \
-          $(DESTDIR)/cklength.exe \
-          $(DESTDIR)/fixtimer.exe
-
-all:	$(DESTDIR) $(PGMS) install
-
-$(DESTDIR):
-	@INSTALL@ $(INSTDIRFLAGS) $@
-
-install:  $(INSTALLED)
-
-# Install the programs
-$(DESTDIR)/ifc.exe: ifc_exe.uue
-	uudecode <ifc_exe.uue
-	mv ifc.exe $(DESTDIR)/ifc.exe
-
-$(DESTDIR)/cklength.exe: cklength.uue
-	uudecode <cklength.uue
-	mv cklength.exe $(DESTDIR)/cklength.exe
-
-$(DESTDIR)/fixtimer.exe: fixtimer.uue
-	uudecode <fixtimer.uue
-	mv fixtimer.exe $(DESTDIR)/fixtimer.exe
-
diff --git a/tools/build/os/msdos/README b/tools/build/os/msdos/README
deleted file mode 100644
index af3b0dfb31..0000000000
--- a/tools/build/os/msdos/README
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-#  $Id$
-#
-
-ifc is an MS-DOS executable which is equivalent to the program
-install-if-change.  It was compiled using Borland C 2.00.
-
-cklength is a precompiled version of the program cklength.c from
-the main source tree.
-
-fixtimer is a program to restore the clock if the program does not
-exit cleanly.
diff --git a/tools/build/os/msdos/cklength.uue b/tools/build/os/msdos/cklength.uue
deleted file mode 100644
index fd8052cd9a..0000000000
--- a/tools/build/os/msdos/cklength.uue
+++ /dev/null
@@ -1,286 +0,0 @@
-#
-#  $Id$
-#
-begin 664 cklength
-M?T5,1@$" 0             "  (    !  $,%    #0  "T8       T "  
-M!0 H !H %P    8    T  $ -         "@    H     4          P  
-M -0              !$         !          !       !           7
-M2P  %TL    %  $       $  !=,  (73         &\   %?     <  0  
-M     @  %U   A=0         (@         !P     O=7-R+VQI8B]L9"YS
-M;RXQ         $,   !6    20                   #P             
-M #@              $4         /0   !P   !#    &@              
-M           A    30   #\         *0   $X   !"               D
-M         $@    W                         $8         )@   "  
-M  !          %(         4P         Z    *@              00  
-M $H         'P   $L   !5    3P         L    .P   %0    H    
-M-@   #$    P    40                                          
-M                                                            
-M                                                            
-M                                                       G    
-M                '0         C               ;               N
-M         "(         -0         E         #D    R    -    !X 
-M             "T         ,P        !$    *P                  
-M       ^         "\         3                    %    !'    
-M                         0#4      ,   $       $ Z      #   "
-M       ! U0      P   P       0BT      ,   0       $*W      #
-M   %       !"S       P  !@       0P4      ,   <       $32   
-M   #   (       !$^       P  "0       1/L      ,   H       $3
-M]      #   +       !%        P  #        A=,      ,   T     
-M  (74      #   .       "%]@      P  #P       ACP      ,  !  
-M      (9"      #   1                 P  $@                , 
-M !,                #   4                 P  %0              
-M  ,  !8                #   7                 P  &           
-M      ,  !D    !  (8.      2        "  !$_0     $0  "P   !8 
-M 0P4    =!(   <    =  (8U      2        (@ "&$0     $@      
-M "<  1/L     !$   H    U  (8O      2        /  "&0@    $$0  
-M$0   $4  AB8     !(       !.  (9#     01   1    5P "',@     
-M$0#_\0   %P  1+     2!(   <   !B  $2>    $@2   '    9P !$8@ 
-M  "H$@  !P   &\  AD8   !0"$  !$   !T  (73      1 /_Q    B@ "
-M&*0     $@       )   A@(     !(       "7  (8%      2        
-MG  !$T@     $@  "    *(  ACT    !!$  !    "J  (9$     01   1
-M    M  "&E@   )@$0  $0   ,   AB      !(       #'  (8\     01
-M   0    S0 "%U      $0#_\0   -8  0[H   !0!(   <   #>  (9&   
-M 4 1   1    Y  "&E@   )@$0  $0   /$  AC@     !(       #W  (8
-M+      2        _P "&"      $@       04  AD,    !"$  !$   $-
-M  (<N     01   1   !$P "&+      $@       1H  1 H   !8!(   < 
-M  $@  (8_     01   0   !,P "'+P    $$0  $0   3H  AC(     !( 
-M      $_  (<P     01   1   !1@ "&&@     $@       4P  AS$    
-M!!$  !$   %3  (8^     01   0   !9P "&0@     $0#_\0   6X  A?8
-M     !$ __$   &(  (87      2       !C@ "&1     $$0  $0   9< 
-M 1,(    /!(   <   &I  $3\      1   *   !M@ !%TL     $0#_\0  
-M ;T  10     !!$   P   '*  $2,    $@2   '   !SP "&(P     $@  
-M     =8  0R(     !(   <   'H  $3^      1   +   !]0 !#10   '4
-M$@  !P   ?H  AD     !!$  !    (&  (8=      2       "#0 !$^  
-M    $@  "0   A,  AA0     !(     9V5T;W!T %]?1%1/4E],25-47U\ 
-M7W-T87)T ')E860 871O:0!?7T-43U)?3$E35%]? '-T<G1O; !P<F]G;F%M
-M90!V9G!R:6YT9@!?96YV:7)O;@!?96YD %=R:71E %)E860 9V5T<&%R;0!?
-M:6]B %]'3$]"04Q?3T9&4T547U1!0DQ%7P!A8F]R= !A=&5X:70 97AI= !?
-M:6YI= !V97)B;W-E %]S>7-?;F5R<@!S>7-?97)R;&ES= !F8VQO<V4 55-!
-M1T4 7T193D%-24, <')O8V5S<P!?7VEO8@!?<WES7V5R<FQI<W0 =W)I=&4 
-M<W1R<F-H<@!?97AI= !E;G9I<F]N &5R<FYO '-T<F-H<@!E<G)O<@!R97!O
-M<G1?;&EN95]L96YG=&@ ;W!T:6YD &]P96X ;W!T87)G &9G971S &]P=&5R
-M<@!R97!O<G1?;&EN95]N=6UB97)S %]E9&%T80!?4%)/0T5$55)%7TQ)3DM!
-M1T5?5$%"3$5? &9O<&5N '-Y<U]N97)R %]?9&]?9VQO8F%L7V1T;W)S %]?
-M0U1/4E]%3D1?7P!?971E>'0 7VQI8E]V97)S:6]N $]P96X 9F9L=7-H %]?
-M9&]?9VQO8F%L7V-T;W)S %]?1%1/4E]%3D1?7P!M86EN &QI;F5?;&5N9W1H
-M '-T<FQE;@!?9FEN:0!F<')I;G1F &QI8F,N<V\N,0       AD,   C$P  
-M     AS$  !#$P       AS   !!$P       AR\   _$P       AD8   U
-M$P   "   AD0  !($P       AI8   P$P       A@(   K%0       A@4
-M   L%0       A@@   Y%0       A@L   X%0       A@X   :%0      
-M AA$   >%0       AA0  !5%0       AA<  !'%0       AAH  !"%0  
-M     AAT  !3%0       AB    Q%0       AB,  !.%0       AB8   B
-M%0       ABD   J%0       ABP   \%0       AB\   @%0       AC(
-M  ! %0       AC4   =%0       AC@   W%0    "\$"  X .@0*(#H$2<
-M(Z @@)   0*   20$  !0 !"]@$    1  !$D!(CX$  0O(!    0  !P $ 
-M  "0$  0DA  $94L( *4 J $E 1 "A<  (:6$N$,U"+  $   "D!    0 !"
-MYP$   !  $+H 0   ('#X @!    $0  1-0"(^R HK__$H  #9(2(^S0 F $
-M@*(@  *   F4$"  E@)@!)(0( "2 F $T ) "X"B(  2O__]E *@ 9*2@  "
-M@  ,$0  1!$  $2B$B/LH2I@ M $ !&?P@   0   *"$/_PRO__]T 0 $1$ 
-M $1  $+!D!(C"(''X B!Z   G>._F*@0 !BB$"  L! @ - &0 !  $+!DA @
-M+Q,  (: HB  $H  !- B80@0@  $T 9  - "80B0 B !T")A"!$  (;0 B$(
-MT"9  !$  (? (B#$(0  AB<  (8E  "&%0  19 0 !22$  90 !"KI02H:" 
-MHC__ H  ,X"B(&PB@  1$0  AQ2   F HB!N@*(@/P*  "J HB!. H  '- $
-M(/@0O__P%0  10*  !. HB!V H  'M $H/00O__J%0  14  0IO0 B# E!  
-M"!$  (: HJ( "+__XM0B(0 3  !%$0@  $   (N2$F&H$+__W14  $70!"#X
-M@*  ")!@/_\0O__7T"0@^("@  B08#__T"0@^- $X/R H  (D& __Q"__\_0
-M).#\@*  ")!@/_\0O__+T"2@]!"__\FB$" !@*1@ "*   L1  "'%0  AA$ 
-M (:0$B$X$P  19(28<A  $)VU *@\$  0F60$" !DA  "- "(+R1*B "T 9 
-M"("B(  "@  1(0  A] "8+R1*B "0   #] &0 B HC__(H   K 0/__0!""\
-MD (@ = D(+R1*B "T 9 "("B(  2O__SDA  $(''X B!Z   G>.]F) 0 !@3
-M  !%0 !"6I(28="JD@  $H  !Z80(  1&   $P  19(28=A   !%E!  &* 0
-M( &H![WX)0  ABT  (:0$  4DA B $  0DV4$  5@*(@  *  #4!    0 !"
-M2Y 0 !2B C__$0  AM "(0" I$ (!(  *X"DX  2@  +$0  AA,  $60%*$X
-MDA)A^$  0C64$  8T 6@^("B(  "@  B$0  AM "(/2 HB   H  !Q,  $60
-M%*$XDA)B )00 !!  $(HE@>]^- %H/B HB   H  $A$  (;0 B#\@*(@  * 
-M  D3  !%D!2A.)(28AB4$  00 !"&Y80 !$0@  (I@3@ 1,  $60%*$XDA)B
-M($  0A24$  0I@3@ 1"__\B@!" !0 !"&Y 0 !6P$"  @<?@"('H  "=X[^0
-M\B>@2/0GH$SV)Z!0^">@5/HGH%@1  "&0 !"$I 2(2@1'   LBX "!$0  " 
-MC@ ( H  !*('H$P1  "'\@(@N. 'H$@5  "&-0  AI 6H3@3  !%DA)B*$  
-M0?/4 J$(D!:A.)(0 !!  $(!E!  $8"F8  "@  :$0  A@2  !*0$B$X$0  
-MAM "(1" ID (-H  #!$  (85  "&E!*B6)<N8 *0%J$X$P  19(28C!  $'=
-MU + "A"   X1  "&D!(A.!,  $62$F(X0 !!UI00 !D0@  '$0  AI 2(3@3
-M  !%0 !!T)(28E 1  "&0 !!W) 2(3@1#   @(X " *  !41"   @(X " * 
-M  R IF   H  !1$  $41  !%$(   Y(2(EB2$B)P?___M) 0( !  $&MD!  
-M&9 0(  3  !%?___KI(28GA  $'+ 0   (''X B!Z   G>._F* 0 !@1  !%
-MD!(BD$  0<;23   @*(@ !*   F0$  0$0@  !,  $62$F*@?___G)00 ! 0
-M@  :L!  &9(0( !  $&\E! @ + 0  B I@ 9!H  !("F !H$@  1 0   ("F
-M0!H2@  ($0@  !,  $62$F*XE!  $'___XF6$  :,(  !Q,  $62$F+0E!  
-M&Y80 !E___^"F!  &H''X B!Z   G>._F* 0 !B0$  0DA  &4  0:*4$  :
-ML!  "("F/_\2@  ($1@  !,  $62$F+PE!  $)80 !E___]PF!  &H''X B!
-MZ   G>._F* 0 !B0$  0DA  &4  09.4$  :L!  "("F/_\2@  ($1@  !, 
-M $62$F,0E!  $)80 !E___]>F!  &H''X B!Z   G>._F* 0 !B0$  0DA  
-M&4  0824$  :L!  "("F/_\2@  ($1@  !,  $62$F,PE!  $)80 !E___],
-MF!  &H''X B!Z   G>._F!$  $32 B/X@*)@  *   F@$B/XT 0  )_"  "@
-M!" $T 0  ("B(  2O__[ 0   (''X B!Z   G>._F)WCOZ"!Z   G>._F!$ 
-M $34 B/L@**__Q*   V2$B/LT )@!("B(  "@  )E! @ )8"8 22$"  D@)@
-M!- "0 N HB  $K___90"H &2DH   H  #!$  $01  !$HA(C[*$J8 +0!  1
-MG\(   $   "@A#_\,K___= $ !$1  !$0 !!$) 2(PB!Q^ (@>@  (''X B!
-MZ   G>._H(''X B!Z   _____P    #_____               !     '5S
-M86=E.B @8VML96YG=&@@(%L@+78@72!;(&%R9R N+BX@72!F:6QE<RXN+B *
-M(" @(" @(" @(" @+6P@;&5N9W1H(" @+2T@;6%X:6UU;2!L:6YE(&QE;F=T
-M: H@(" @(" @(" @(" M;B @(" @(" @(" M+2!R97!O<G0@;&EN92!N=6UB
-M97)S(&9O<B!O9F9E;F1I;F<@;&EN97,*(" @(" @(" @(" @+4X@(" @(" @
-M(" @+2T@<F5P;W)T(&QI;F4@;G5M8F5R<R!A;F0@;&5N9W1H(&9O<B!O9F9E
-M;F1I;F<@;&EN97,*(" @(" @(" @(" @+78@(" @(" @(" @+2T@=F5R8F]S
-M90H*4')I;G0@=&AE(&YA;64@;V8@9FEL97,@=VAI8V@@:&%V92!A="!L96%S
-M=" Q(&QI;F4@=VAI8V@@97AC965D<R!T:&4*;6%X:6UU;2!L:6YE(&QE;F=T
-M:"X@(%1H92!D969A=6QT(&UA>&EM=6T@;&EN92!L96YG=&@@:7,@.# N"@  
-M &PZ;DYV    *"5D*2!I<R!I;&QE9V%L(&QI;F4@;&5N9W1H"@     E<P  
-M     '(         56YA8FQE('1O(&]P96X@9FEL92 H)7,I"@         E
-M<PH      %1/3R!,3TY'.B5D.B E<PH          "5D.B E9 H )60*    
-M   E<SH@     " H)7,I"@  ("AU;FMN;W=N(&5R<FYO/25D*0H     "@  
-M      !F871A;"!E<G)O<BP@97AI=&EN9P    !E>&ET:6YG &9A=&%L(&5R
-M<F]R+"!A8F]R=&EN9P   # Q,C,T-38W.#DM       G)7,G(&ES(&YO="!A
-M(&YU;6)E<@     E<R!C86X@;VYL>2!B92 E;&0        E<R!M=7-T(&)E
-M(&)E='=E96X@)6QD(&%N9" E;&0  &]P96XH)R5S)RP@,'@E>"P@,"5O*2!F
-M86EL960     <F5A9"@E9"P@,'@E>"P@)60I(&9A:6QE9         !W<FET
-M92@E9"P@,'@E>"P@)60I(&9A:6QE9     (74     $   (;    #  !$T@ 
-M   -  $3X     0  0#H    !0 !"+0    *   ")0    8  0-4    "P  
-M !     5          ,  A?8     @   .0    4    !P   !<  0LP    
-M!P !"MP    (   !.     D    ,                                
-M                                           #   P,+__\P$    #
-M   \,+__\ $    #  !(,+__[0$    #  !4,+__Z@$    #  !@,+__YP$ 
-M   #  !L,+__Y $    #  !X,+__X0$    #  "$,+__W@$    #  "0,+__
-MVP$    #  "<,+__V $    #  "H,+__U0$    #  "T,+__T@$    #  # 
-M,+__SP$    #  #,,+__S $    #  #8,+__R0$    #  #D,+__Q@$    #
-M  #P,+__PP$    #  #\,+__P $    #  $(,+__O0$    !      $4"   
-M                 %                                $         
-M  0 __$       $ U      #   !       ! .@      P   @       0-4
-M      ,   ,       $(M      #   $       !"MP      P  !0      
-M 0LP      ,   8       $,%      #   '       !$T@      P  "   
-M     1/@      ,   D       $3[      #   *       !$_0      P  
-M"P       10       ,   P       (73      #   -       "%U      
-M P  #@       A?8      ,   \       (8\      #   0       "&0@ 
-M     P  $0                ,  !(                #   3        
-M         P  %                 ,  !4                #   6    
-M             P  %P                ,  !@                #   9
-M    #P          ! #_\0   !8           0 __$    B           $
-M /_Q    +0 !$U       @  "    $,  0R(          <   !2  (8\   
-M   !   0    8           ! #_\0   &L  0T4          <   !Z    
-M       $ /_Q    A           ! #_\0   (\  1-$      (   <   "E
-M  $31          '    M  "&00      0  $    ,(           0 __$ 
-M  #)  (8.      2        T  !$_0     $0  "P   -X  0P4    =!( 
-M  <   #E  (8U      2        Z@ "&$0     $@       .\  1/L    
-M !$   H   #]  (8O      2       !!  "&0@    $$0  $0   0T  AB8
-M     !(       $6  (9#     01   1   !'P "',@     $0#_\0   20 
-M 1+     2!(   <   $J  $2>    $@2   '   !+P !$8@   "H$@  !P  
-M 3<  AD8   !0"$  !$   $\  (73      1 /_Q   !4@ "&*0     $@  
-M     5@  A@(     !(       %?  (8%      2       !9  !$T@     
-M$@  "    6H  ACT    !!$  !    %R  (9$     01   1   !?  "&E@ 
-M  )@$0  $0   8@  AB      !(       &/  (8\     01   0   !E0 "
-M%U      $0#_\0   9X  0[H   !0!(   <   &F  (9&    4 1   1   !
-MK  "&E@   )@$0  $0   ;D  AC@     !(       &_  (8+      2    
-M   !QP "&"      $@       <T  AD,    !"$  !$   '5  (<N     01
-M   1   !VP "&+      $@       >(  1 H   !8!(   <   'H  (8_   
-M  01   0   !^P "'+P    $$0  $0   @(  AC(     !(       ('  (<
-MP     01   1   "#@ "&&@     $@       A0  AS$    !!$  !$   (;
-M  (8^     01   0   "+P "&0@     $0#_\0   C8  A?8     !$ __$ 
-M  )0  (87      2       "5@ "&1     $$0  $0   E\  1,(    /!( 
-M  <   )Q  $3\      1   *   "?@ !%TL     $0#_\0   H4  10     
-M!!$   P   *2  $2,    $@2   '   "EP "&(P     $@       IX  0R(
-M     !(   <   *P  $3^      1   +   "O0 !#10   '4$@  !P   L( 
-M AD     !!$  !    +.  (8=      2       "U0 !$^      $@  "0  
-M ML  AA0     !(     9V\S,B]C:VQE;F=T: !C<G1I+G, =F%L=65S+5AA
-M+F, 8W)T<W1U9F8N8P!?7V1O7V=L;V)A;%]C=&]R<U]A=7@ 9V-C,E]C;VUP
-M:6QE9"X 9F]R8V5?=&]?9&%T80!C:VQE;F=T:"YC &=C8S)?8V]M<&EL960N
-M &QI8F=C8S(N8P!C<G1S='5F9BYC %]?9&]?9VQO8F%L7V-T;W)S7V%U> !G
-M8V,R7V-O;7!I;&5D+@!F;W)C95]T;U]D871A &-R=&XN<P!G971O<'0 7U]$
-M5$]27TQ)4U1?7P!?<W1A<G0 <F5A9 !A=&]I %]?0U1/4E],25-47U\ <W1R
-M=&]L '!R;V=N86UE '9F<')I;G1F %]E;G9I<F]N %]E;F0 5W)I=&4 4F5A
-M9 !G971P87)M %]I;V( 7T=,3T)!3%]/1D93151?5$%"3$5? &%B;W)T &%T
-M97AI= !E>&ET %]I;FET '9E<F)O<V4 7W-Y<U]N97)R '-Y<U]E<G)L:7-T
-M &9C;&]S90!54T%'10!?1%E.04U)0P!P<F]C97-S %]?:6]B %]S>7-?97)R
-M;&ES= !W<FET90!S=')R8VAR %]E>&ET &5N=FER;VX 97)R;F\ <W1R8VAR
-M &5R<F]R ')E<&]R=%]L:6YE7VQE;F=T: !O<'1I;F0 ;W!E;@!O<'1A<F< 
-M9F=E=', ;W!T97)R ')E<&]R=%]L:6YE7VYU;6)E<G, 7V5D871A %]04D]#
-M14154D5?3$E.2T%'15]404),15\ 9F]P96X <WES7VYE<G( 7U]D;U]G;&]B
-M86Q?9'1O<G, 7U]#5$]27T5.1%]? %]E=&5X= !?;&EB7W9E<G-I;VX 3W!E
-M;@!F9FQU<V@ 7U]D;U]G;&]B86Q?8W1O<G, 7U]$5$]27T5.1%]? &UA:6X 
-M;&EN95]L96YG=&@ <W1R;&5N %]F:6YI &9P<FEN=&8       $    %    
-MFP    UD             "]D   #         %$X             ((X    
-M         $8\          ! *",I4W5N3U,@-2XS($=E;F5R:6,@4V5P=&5M
-M8F5R(#$Y.3,  &%S.B!30S,N,"!E87)L>2!A8V-E<W,@,#$@4V5P(#$Y.3,*
-M $=#0SH@*$=.52D@,BXV+C,  &%S.B!30S,N,"!E87)L>2!A8V-E<W,@,#$@
-M4V5P(#$Y.3,* $=#0SH@*$=.52D@,BXV+C,  &%S.B!30S,N,"!E87)L>2!A
-M8V-E<W,@,#$@4V5P(#$Y.3,* $=#0SH@*$=.52D@,BXV+C,  &%S.B!30S,N
-M,"!E87)L>2!A8V-E<W,@,#$@4V5P(#$Y.3,* $=#0SH@*$=.52D@,BXV+C, 
-M;&0Z("A31U4I(%-U;D]3+T5,1B H3$LM,2XS*0       0   "D   8?    
-M"V0      1,(    (60      1,(    +3P             /(          
-M    7H              <(              EX              L(      
-M        SH             !$H             !5H             !=(  
-M           !EH             !LX             !SX             !
-MX8             !](             "#(             ".8          
-M   "5(             "<(             "D8             "G8      
-M       "R(             #&8             $GH             %+(  
-M &         %.8   )         %0X   -<        %3H   #0        %
-M6H   #4        %9(   #8        %;X   #<        %>8   #@     
-M   %A(   #D        %CX   #H        %FH   $8        %IX      
-M       %T(   &T        %](   "X        &"20 !\L  1,( "YI;G1E
-M<G  +FAA<V@ +F1Y;G-Y;0 N9'EN<W1R "YR96QA+F)S<P N<F5L82YP;'0 
-M+G1E>'0 +FEN:70 +F9I;FD +F-T;W)S "YD=&]R<P N<F]D871A "YG;W0 
-M+F1Y;F%M:6, +G!L=  N9&%T80 N8G-S "YS>6UT86( +G-T<G1A8@ N<W1A
-M8BYI;F1E>  N8V]M;65N=  N<W1A8@ N<VAS=')T86( +G-T86(N:6YD97AS
-M='( +G-T86)S='(  '9A;'5E<RU882YC "\Q,#DS+V]N,3 Y,U]W<R]U<W(O
-M<W)C+VQI8B]L:6)C+P!P;W)T+V=E;B]V86QU97,M6&$N8P   %AT(#L@5CTR
-M+C  +VYE="]M;W)G86YA+W5S<C$O<G1E;7,M,RXU+C P+V,O8G5I;&0M=&]O
-M;',O<W)C "]U<W(O8V-S+VQI8B]V86QU97,M6&$N;P  ;&EB9V-C,BYC "]U
-M<W(T+T=.050O9V-C+3(N-BXS+P N+VQI8F=C8S(N8P!G8V,R7V-O;7!I;&5D
-M+@!I;G0Z=#$]<C$[+3(Q-#<T.#,V-#@[,C$T-S0X,S8T-SL 8VAA<CIT,CUR
-M,CLP.S$R-SL ;&]N9R!I;G0Z=#,]<C$[+3(Q-#<T.#,V-#@[,C$T-S0X,S8T
-M-SL =6YS:6=N960@:6YT.G0T/7(Q.S [+3$[ &QO;F<@=6YS:6=N960@:6YT
-M.G0U/7(Q.S [+3$[ &QO;F<@;&]N9R!I;G0Z=#8]<C$[,#$P,# P,# P,# P
-M,# P,# P,# P,# [,#<W-S<W-S<W-S<W-S<W-S<W-S<W-SL ;&]N9R!L;VYG
-M('5N<VEG;F5D(&EN=#IT-SUR,3LP,# P,# P,# P,# P.S Q-S<W-S<W-S<W
-M-S<W-S<W-S<W-S<W.P!S:&]R="!I;G0Z=#@]<C$[+3,R-S8X.S,R-S8W.P!S
-M:&]R="!U;G-I9VYE9"!I;G0Z=#D]<C$[,#LV-34S-3L <VEG;F5D(&-H87(Z
-M=#$P/7(Q.RTQ,C@[,3(W.P!U;G-I9VYE9"!C:&%R.G0Q,3UR,3LP.S(U-3L 
-M9FQO870Z=#$R/7(Q.S0[,#L 9&]U8FQE.G0Q,SUR,3LX.S [ &QO;F<@9&]U
-M8FQE.G0Q-#UR,3LX.S [ &-O;7!L97@@:6YT.G0Q-3US.')E86PZ,2PP+#,R
-M.VEM86<Z,2PS,BPS,CL[ &-O;7!L97@@9FQO870Z=#$V/7(Q-CLT.S [ &-O
-M;7!L97@@9&]U8FQE.G0Q-SUR,3<[.#LP.P!C;VUP;&5X(&QO;F<@9&]U8FQE
-M.G0Q.#UR,3@[.#LP.P!V;VED.G0Q.3TQ.0!A<F-H7W1Y<&4Z5#(P/65!4D-(
-M7S,R0DE4.C L05)#2%\V-$))5#HQ+#L <F5G7V-L87-S.E0R,3UE3D]?4D5'
-M4SHP+$=%3D5204Q?4D5'4SHQ+$907U)%1U,Z,BQ!3$Q?4D5'4SHS+$Q)35]2
-M14=?0TQ!4U-%4SHT+#L ;6%C:&EN95]M;V1E.E0R,CUE5D])1&UO9&4Z,"Q1
-M26UO9&4Z,2Q(26UO9&4Z,BQ04TEM;V1E.C,L4TEM;V1E.C0L4$1);6]D93HU
-M+$1);6]D93HV+%1);6]D93HW+$]);6]D93HX+%%&;6]D93HY+$A&;6]D93HQ
-M,"Q4449M;V1E.C$Q+%-&;6]D93HQ,BQ$1FUO9&4Z,3,L6$9M;V1E.C$T+%1&
-M;6]D93HQ-2Q30VUO9&4Z,38L1$-M;V1E.C$W+%A#;6]D93HQ."Q40VUO9&4Z
-M,3DL0U%);6]D93HR,"Q#2$EM;V1E.C(Q+$-326UO9&4Z,C(L0T1);6]D93HR
-M,RQ#5$EM;V1E.C(T+$-/26UO9&4Z,C4L0DQ+;6]D93HR-BQ#0VUO9&4Z,C<L
-M0T-8;6]D93HR."Q#0U].3T]6;6]D93HR.2Q#0UA?3D]/5FUO9&4Z,S L0T-&
-M4&UO9&4Z,S$L0T-&4$5M;V1E.C,R+$U!6%]-04-(24Y%7TU/1$4Z,S,L.P!M
-M;V1E7V-L87-S.E0R,SUE34]$15]204Y$3TTZ,"Q-3T1%7TE.5#HQ+$U/1$5?
-M1DQ/050Z,BQ-3T1%7U!!4E1)04Q?24Y4.C,L34]$15]#0SHT+$U/1$5?0T]-
-M4$Q%6%])3E0Z-2Q-3T1%7T-/35!,15A?1DQ/050Z-BQ-05A?34]$15]#3$%3
-M4SHW+#L <'1R9&EF9E]T.G0Q '-I>F5?=#IT- !W8VAA<E]T.G0S %51271Y
-M<&4Z=#$Q %-)='EP93IT,0!54TET>7!E.G0T $1)='EP93IT-@!51$ET>7!E
-M.G0W %-&='EP93IT,3( 1$9T>7!E.G0Q,P!W;W)D7W1Y<&4Z=#$ 1$ES=')U
-M8W0Z5#(T/7,X:&EG:#HQ+# L,S([;&]W.C$L,S(L,S([.P!$275N:6]N.G0R
-M-3UU.',Z,C0L,"PV-#ML;#HV+# L-C0[.P!F=6YC7W!T<CIT,C8]*C(W/68Q
-M.0!?7V1O7V=L;V)A;%]D=&]R<SI&,3D                             
-M                              $    !     @ ! -0   #4    $0  
-M             0         )    !0    (  0#H    Z    FP    #    
-M      0    $    #P    L    "  $#5    U0   5@    !    !H    $
-M    $    !<    #     @ !"+0   BT   ")0               0      
-M   ?    !     (  0K<   *W    %0    #    $0    0    ,    *0  
-M  0    "  $+,   "S    #D     P    \    $    #    #,    !    
-M!@ !#!0   P4   '-               !          Y     0    8  1-(
-M   32    )@               0         /P    $    &  $3X   $^  
-M   ,               $         $4    !    !@ !$^P  !/L    "   
-M            !         !,     0    8  1/T   3]     @         
-M      0         4P    $    "  $4    %     -+               (
-M         %L    !     P "%TP  !=,    !               !     0 
-M  !@    !@    ,  A=0   74    (@    $          0    (    :0  
-M  $    '  (7V   %]@   $8               $    #    &X    !    
-M P "&/   !CP    %               !         !T    "     ,  AD(
-M   9"    \                @         >0    (             &0@ 
-M  90    $P   "D    $    $    ($    #             !]8   "XP  
-M             0        ")     0             B/    $@         
-M      0    ,    E0    $             (H0   $;               !
-M         )X    !             ".@   !^               !     P 
-M  "D     P             EF    ,8               $         K@  
-M  ,             )EX   ";               !         +T    #    
-=         ";Y   &'P               0     !
- 
-end
diff --git a/tools/build/os/msdos/fixtimer.c b/tools/build/os/msdos/fixtimer.c
deleted file mode 100644
index 3b71032550..0000000000
--- a/tools/build/os/msdos/fixtimer.c
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- *  $Id$
- */
-
-#include <stdio.h>
-#include <dos.h>
-
-#define IO_RTC		0x70	/* RTC */
-
-#define RTC_SEC		0x00	/* seconds */
-#define RTC_MIN		0x02	/* minutes */
-#define RTC_HRS		0x04	/* hours */
-#define RTC_WDAY	0x06	/* week day */
-#define RTC_DAY		0x07	/* day of month */
-#define RTC_MONTH	0x08	/* month of year */
-#define RTC_YEAR	0x09	/* month of year */
-#define RTC_STATUSA	0x0a	/* status register A */
-#define  RTCSA_TUP	 0x80	/* time update, don't look now */
-
-#define RTC_STATUSB	0x0b	/* status register B */
-
-#define RTC_DIAG	0x0e	/* status register E - bios diagnostic */
-#define RTCDG_BITS	"\020\010clock_battery\007ROM_cksum\006config_unit\005memory_size\004fixed_disk\003invalid_time"
-
-
-
-/* convert 2 digit BCD number */
-static int bcd( unsigned int i )
-{
-	return ((i/16)*10 + (i%16));
-}
-
-static unsigned int rtcin( unsigned int what )
-{
-    outportb( IO_RTC, what );
-    return inportb( IO_RTC+1 );
-}
-
-
-void fix_date( void )
-{
-    int s;
-    struct date date;
-    struct time time;
-
-    /* initialize brain-dead battery powered clock */
-    outportb( IO_RTC, RTC_STATUSA );
-    outportb( IO_RTC+1, 0x26 );
-    outportb( IO_RTC, RTC_STATUSB );
-    outportb( IO_RTC+1, 2 );
-
-    outportb( IO_RTC, RTC_DIAG );
-    s = inportb( IO_RTC+1 );
-    if (s) printf("RTC BIOS diagnostic error %b\n", s, RTCDG_BITS);
-
-    /* check for presence of clock */
-    s = rtcin(RTC_STATUSA);
-    if ( s == 0xff  ||  s == 0 )  {
-	printf( "Real-time clock not found\n" );
-	return;
-    }
-
-    /* ready for a read? */
-    while ((s & RTCSA_TUP) == RTCSA_TUP)
-	s = rtcin(RTC_STATUSA);
-
-    date.da_year	= bcd(rtcin(RTC_YEAR)) + 1900;	/* year	  */
-    if ( date.da_year < 1970)	date.da_year += 100;
-    date.da_year	-= 1980;
-    date.da_mon		= bcd(rtcin(RTC_MONTH));	/* month   */
-    date.da_day		= bcd(rtcin(RTC_DAY));		/* day	   */
-
-    (void)bcd(rtcin(RTC_WDAY));		/* weekday */
-
-    time.ti_hour	= bcd(rtcin(RTC_HRS));		/* hour    */
-    time.ti_min		= bcd(rtcin(RTC_MIN));		/* minutes */
-    time.ti_sec		= bcd(rtcin(RTC_SEC));		/* seconds */
-    time.ti_hund	= 0;
-
-    setdate( & date );
-    settime( & time );
-}
-
-
-
-
-void fix_timer( void )
-{
-#define PIT_PORT	0x40
-#define TIMER_CNTR0	(PIT_PORT + 0)	/* timer 0 counter port */
-#define TIMER_MODE	(PIT_PORT + 3)	/* timer mode port */
-#define   TIMER_SEL0	0x00		/* select counter 0 */
-#define   TIMER_RATEGEN	0x04		/* mode 2, rate generator */
-#define   TIMER_16BIT	0x30		/* r/w counter 16 bits, LSB first */
-
-    /* set timer 0 to generate interrupts every period */
-    outportb( TIMER_MODE, TIMER_SEL0|TIMER_RATEGEN|TIMER_16BIT );
-    outportb( TIMER_CNTR0, 0 );  /* counter low */
-    outportb( TIMER_CNTR0, 0 );  /* counter high */
-}
-
-int main(void)
-{
-    /* Make timer count at correct pace */
-    fix_timer();
-
-    /* Fix the date */
-    fix_date();
-
-    return 0;
-}
diff --git a/tools/build/os/msdos/fixtimer.uue b/tools/build/os/msdos/fixtimer.uue
deleted file mode 100644
index bc4b10fc72..0000000000
--- a/tools/build/os/msdos/fixtimer.uue
+++ /dev/null
@@ -1,162 +0,0 @@
-#
-#  $Id$
-#
-begin 664 fixtimer.exe
-M35IF 0X  0 @  T __^; 8          (@    $ ^R!R:@$             
-M                                                            
-M                                                            
-M                                                            
-M                                                            
-M                                                            
-M                                                            
-M                                                            
-M                                                            
-M                                                            
-M                                                            
-M                      "Z3 $NB1;X ;0PS2&++@( BQXL ([:HY( C :0
-M (D>C ")+JP QP:6 /__Z#0!Q#Z* (O'B]BY_W\F@3TX-W49)HM5 H#Z/740
-M@.;?_P:6 (#^674$_P:6 /*NXV%#)C@%==: S8#WV8D.B@"Y 0#3XX/#"(/C
-M^(D>C@",VBOJBSY\ H'_  )S![\  HD^? *!Q^P$<B@#/GH"<B*Q!-/O1SOO
-M<AF#/GP" '0'@SYZ @!U#K\ $#OO=P>+_>L#Z2$!B]\#VHD>I ")'J@ H9  
-M*]B.P+1*5\TA7]/G^H[2B^?[,\ NC@;X ;^F!+GL!"O/\ZH._Q:8!.BU NB=
-M [0 S1J)%I@ B0Z: /\6G 3_-H@ _S:& /\VA #H%P)0Z%H"+HX>^ 'H?  .
-M_Q::!#/ B_"Y+P"0_ ($@-0 1N+X+3<-D'0*N1D D+HO .B+ (OLM$R*1@+-
-M(;D. )"Z2 #IAP >N  US2&)'G0 C 9V +@$-<TAB1YX (P&>@"X!37-(8D>
-M? ",!GX N 8US2&)'H  C :" +@ )8S*CMJZ6 '-(1_#'K@ )<46= #-(1\>
-MN 0EQ19X ,TA'QZX!27%%GP S2$?'K@&)<46@ #-(1_#QP:6    R\.T0+L"
-M ,TAP[D> )"Z5@ NCA[X >CI_[@# %#H*?\  %6+[(M&!+$$T^BZ"@#WXHM6
-M!('B#P #PNL 7<-5B^R*1@3F<.1QM #K %W#58OL@^P(5K *YG"P)N9QL OF
-M<+ "YG&P#N9PY'&T (OP"_9T#[BR 5!6N)0!4.B<"8/$!K@* %#HM?]9B_"!
-M_O\ = 0+]G4+N/P!4.A^"5GIJ0#K"K@* %#HE/]9B_"+QB6  #V  '3LN D 
-M4.B _UE0Z%__605L!XE&^(%^^+('?02#1OAD@6[XO >X" !0Z%W_65#H//]9
-MB$;[N < 4.A-_UE0Z"S_68A&^K@& %#H/?]94.@<_UFX! !0Z##_65#H#_]9
-MB$;]N ( 4.@@_UE0Z/_^68A&_#/ 4.@1_UE0Z/#^68A&_\9&_@"-1OA0Z'H1
-M68U&_%#HA1%97HOE7<.P-.9#L #F0+  YD##Z/#_Z.S^,\#K ,-5B^Q6BW8$
-M"_9\%(/^6'8#OE< B388 HJ$&@*8ENL-]]Z#_B-WZL<&& +__XO&HY0 N/__
-MZP!>7<(" ,-5B^SK"HL>?@+1X_^7I@2A?@+_#GX""\!UZ_\6= +_%G8"_Q9X
-M O]V!.AZ_5E=PP       "Z/!JH#+HP>K /\C@:0 +Z  #+D)JQ C,6'UI.+
-M-HH @\8"N0$ @#Z2  -R$8X&C "+_K%_,L#RKN-V@/%_@^P"N $  \,#P27^
-M_XO\*_AR8(OGC,".V(S0CL!12?.D,L"JCMV'\H?9B\.+T$/H&0!W!W) Z!( 
-M=_D\('0(/ UT!#P)=>@RP.OD"\!T!T*J"L!U 4.&X#+ ^>,5K$DL(G0/!"(\
-M7'4'@#PB=0*L20OVP^E^_5D#RBZ.'JP#B1Z$ $,#VXOTB^PKZW+FB^6)+H8 
-MXPZ)=@"#Q0(VK K X/IT\#/ B48 +O\FJ@.+#HH 4>A' 5F+^ O ="0>'@>.
-M'HP ,_;\\Z0?B_@&_S:. .@I 8/$ HO8!Z.(  O =0/I$?TSP+G__XD_@\,"
-M\JXF. 5U](D'PU6+[(,^?@(@=06X 0#K%8M&!(L>?@+1XXF'I@3_!GX",\#K
-M %W#58OL5E>+?@2+10:CZ 0[QW4(QP;H!   ZQ"+=02+'N@$B7<$H>@$B40&
-M7UY=PU6+[%97BWX$BT8&*06+-0/WBT8&0(D$B7P"H>8$.\=U!HDVY@3K"(O^
-M WX&B74"B\8%! #K %]>7<-5B^Q6BT8$,](E__^!X@  4E#H] !968OP@_[_
-M=00SP.L8H>8$B40"BT8$0(D$B3;F!*'F! 4$ .L 7EW#58OL5HM&!#/2)?__
-M@>(  %)0Z+< 65F+\(/^_W4$,\#K%8DVZ@2)-N8$BT8$0(D$B\8%! #K %Y=
-MPU6+[%97BWX$"_]U!#/ ZUJ+QP4+ "7X_XOX@S[J! !U!U?HH?]9ZT*+-N@$
-MB\8+P'0QBP2+UX/"*#O"<@E75N@-_UE9ZR2+!#O'<@Y6Z-'^6?\$B\8%! #K
-M$(MT!CLVZ 1USU?H(O]9ZP!?7EW#58OLBT8$B]2!Z@ !.\)S!Z.> #/ ZPO'
-M!I0 " "X___K %W#58OLBT8$BU8& P:> (/2 (O(@<$  8/2  O2=0H[S',&
-MAP:> .L+QP:4  @ N/__ZP!=PU6+[/]V!.B?_UGK %W#58OLBT8$F5)0Z++_
-MB^7K %W#58OL@^P"5E>+7@2+-XO&B4;^BUX$]T<"0 !T!(O&ZQ^+7@2+?PKK
-M"XO?1X _"G4#_T;^B\9."\!U[HM&_NL 7UZ+Y5W" @!5B^Q6BW8$5NA3!%D+
-MP'0%N/__ZTR#?@H!=1"#/ !^"U;HE?^9*48&&58(@60"7_['!   BT0(B40*
-M_W8*_W8(_W8&BD0$F%#HW *#Q B#^O]U"CW__W4%N/__ZP(SP.L 7EW#58OL
-M@^P$5HMV!%;H[ -9"\!T"+K__[C__^L_N $ 4#/ 4%"*1 284.B8 H/$"(E6
-M_HE&_(,\ 'X9BU;^BT;\4E!6Z!#_F8O8B\I86BO#&]'K!HM6_HM&_.L 7HOE
-M7<-5B^RX $2+7@3-(;@  '($T>+1T.L 7<-5B^Q65XM^"HMV!(M$#CO&=0R#
-M?@@"?P:!__]_=@:X___IJ@"#/NH# '4/N) ".\9U",<&Z@,! .L4@S[H P!U
-M#;B  CO&=0;'!N@# 0"#/ !T#[@! % SP%!05NC&_H/$"/=$ @0 = ?_= CH
-M"PQ9@60"\__'1 8  (O&!04 B40(B40*@WX( G0_"_]V.\<&= +$"(-^!@!U
-M&%?H6?U9B48&"\!T!X%, @0 ZP6X___K&XM&!HE$"HE$"(E\!H-^" %U!8%,
-M @@ ,\#K %]>7<-65[\$ +Z  NL0]T0" P!T!5;HG )93X/&$ O_=>Q?7L-5
-MB^R![(H 5E>+1@A /0( <P4SP.GV (M>!-'C]X?  P" =!+_=@C_=@;_=@3H
-MXP"#Q ;IUP"+7@31XX&GP /__8M&!HF&?/^+1@B)AGC_C;9^_^MM_XYX_XN>
-M?/__AGS_B@>(AGO_/ IU!,8$#4:*AGO_B 1&C89^_XO6*]"!^H  ?#Z-AG[_
-MB_XK^%>-AG[_4/]V!.A[ (/$!HF&=O\[QW0;@[YV_P!S!;C__^L-BT8(*X9X
-M_P.&=O\KQ^M/C;9^_X.^>/\ = /IB?^-AG[_B_XK^(O'"\!V+E>-AG[_4/]V
-M!.@M (/$!HF&=O\[QW07@[YV_P!S!;C__^L)BT8( X9V_RO'ZP6+1@CK %]>
-MB^5=PU6+[(M>!-'C]X?  P (=!"X @!0,\!04/]V!.@H (OEM$"+7@2+3@B+
-M5@;-(7(/4(M>!-'C@8_  P 06.L&4.@%^>L 7<-5B^R+7@31XX&GP /__;1"
-MBD8*BUX$BTX(BU8&S2%R NL'4.C;^)GK %W#58OL@^PB5E<&BWX*'@>+7@B#
-M^R1W6(#[ G)3BT8,BTX."\E]$8!^!@!T"\8%+4?WV??8@]D C7;>XP^1*]+W
-M\Y'W\X@41N,)Z_$KTO?SB!1&"\!U]8U.WO?9 \[\3HH$+ IS! 0ZZP,"1@2J
-MXN^P *H'BT8*ZP!?7HOE7<(, %6+[(-^" IU!HM&!)GK!8M&!#/24E#_=@;_
-M=@BP 5"P85#H7/_K %W#58OL_W8&_W8$_W8(_W8*L !0L&%0Z$#_ZP!=PU6+
-M[/]V!O]V!/]V"/]V"H-^"@IU!;@! .L",\!0L&%0Z!G_ZP!=P[KL ^L#NO$#
-MN04 D+1 NP( S2&Y)P"0NO8#M$#-(>EM]E6+[%97BW8$BT0..\9T!;C__^MF
-M@SP ?"WW1 (( '4,BT0*B]:#P@4[PG46QP0  (M$"HO6@\(%.\)U!HM$"(E$
-M"C/ ZS2+? 8#/$<I/%>+1 B)1 I0BD0$F%#H$OV#Q 8[QW01]T0"  )U"H%,
-M A  N/__ZP0SP.L 7UY=PU6+[+AK#5"XD )0_W8$C48&4.A, NL 7<-5B^R+
-M7@;_#_]V!HI&!)A0Z 8 B^7K %W#58OL@^P"5HMV!HI&!(A&__\$?3:*1O__
-M1 J+7 J(1__W1 (( '0;@'[_"G0&@'[_#74/5N@9_UD+P'0&N/__Z>D BD;_
-MM #IX0#_#/=$ I  =0?W1 (" '4+@4P"$ "X___IQ@"!3 (  8-\!@!T)H,\
-M '015NC7_ED+P'0&N/__Z:< ZPJX__^+5 8KPHD$Z7W_Z94 @S[J P!U.;B0
-M CO&=3**1 284.@)^UD+P'4%@60"__VX  )0]T0"  )T!;@" .L",\!0,\!0
-M5NC]^H/$".F/_X!^_PIU'_=$ D  =1BX 0!0N!X$4(I$!)A0Z.#\@\0&/0$ 
-M=1BX 0!0C48$4(I$!)A0Z,C\@\0&/0$ =!'W1 (  G4*@4P"$ "X___K!XI&
-M_[0 ZP!>B^5=PU6+[%:+=@2XD )05NC!_EE9ZP!>7<-5B^R#[ )65XMV!(M^
-M!D?W1 (( '0CZP+K $^+QPO =!56BUX(_T8(B@>84.B+_EE9/?__=>+I=0#W
-M1 )  '0W@WP& '0QBT0&.\=S*H,\ '0-5NBT_5D+P'0$,\#K4T]7_W8(BD0$
-MF%#H(?R#Q :)1OXK?O[K-^L"ZP!/B\<+P'0L_P1]%8M>"/]&"(H'_T0*BUP*
-MB$?_M #K#E:+7@C_1@C_-^CZ_5E9/?__=<N+Q^L 7UZ+Y5W"!@#_)IX$58OL
-MBU8$N00/NR<$_(K&TNC7JHK&(L77JHK"TNC7JHK"(L77JNL 7<(" %6+[('L
-ME@!65\=&J@  QD:M4.LX5[G__S+ \J[WT4E?PX@%1_Y.K7XB4U%2!HU&KBOX
-MC4:N4%?_=@C_5@K&1JU0 7ZJC7ZN!UI96\,&_(U^KHF^;/^+OFS_BW8&K K 
-M=!$\)700B 5'_DZM?^_HN?_KZNEU!(FV>/^L/"5TYXF^;/\SR8F.=O^)CFK_
-MB(YU_\>&</___\>&<O___^L!K#+DB]"+V(#K((#[8'-'BI\W!(O#/1< =@/I
-M'02+V-'C+O^G& ]C#TL/I ]7#\D/TP\5$!\0+Q"*#V00/Q!#$$<0Z1";$3P1
-M7!'_$BP3+!,L$W8/@ _IX0. _0!W^(..:O\!ZYN _0!W[(..:O\"ZX^ _0!W
-MX("^=?\K= 2(EG7_Z7S_@Z9J_]^U!>ER_X..:O\@M07I:/^ _0!W1/>&:O\"
-M '4A@XYJ_PBU >E1_^F( XM^!(L%@T8$ H#] G,)B89P_[4#Z3?_@/T$=>&)
-MAG+__L7I*?^ _01ST[4$Z1__DBPPF(#] G<;M0*'AG#_"\!\TM'@B]#1X-'@
-M \(!AG#_Z?O^@/T$=:6'AG+_"\!\M-'@B]#1X-'@ \(!AG+_Z=W^@XYJ_Q"U
-M!>G3_H&.:O\  8.F:O_OM07IP_Z#IFK_[X&.:O^  +4%Z;/^MPCK"K<*ZPNW
-M$+/I MK&AG7_ ,:&;_\ B)9N_XM^!(L%,]+K$;<*QH9O_P&(EF[_BWX$BP69
-M1T>)=@;WAFK_$ !T!(L51T>)?@2-OGO_"\!U,PO2=2^#OG+_ '4MB[YL_XN.
-M</_C&X/Y_W06BX9J_R4( '0$LC#K K(@BL+HMOWB^>GI_8..:O\$4E!7BL>8
-M4(J&;_]04^B0^18'BY9R_PO2?P/I% 'I(0&(EF[_B78&C;YZ_XM>!/\W0T.)
-M7@3WAFK_( !T#_\W0T.)7@06!^@7_; ZJA8'Z _]Q@4 QH9O_P"#IFK_^XV.
-M>O\K^8?/BY9R_SO1?P*+T>F^ (EV!HB6;O^+?@2+!8-&! (6!XV^>_\RY(D%
-MN0$ Z=@ B78&B)9N_XM^!/>&:O\@ '4,BSV#1@0"'@<+_^L*Q#V#1@0$C, +
-MQW4%'@>_( 3HVOP[CG+_=@2+CG+_Z9D B78&B)9N_XM^!(N.<O\+R7T#N08 
-M5U&-GGO_4U*X 0 CAFK_4(N&:O^I@ !T"K@" ,=&_@0 ZQ>I  %T"K@( ,=&
-M_@H ZPC'1OX( +@& %#H-_R+1OX!1@06!XV^>__WAFK_" !T$XN6</\+TGX+
-MZ%O\*]%^!(F6=O^*AG7_"L!T%": /2UT#H.N=O\!@Y9V_P!/)H@%Z#3\B_>+
-MOFS_BYYP_[@% ".&:O\]!0!U%HJF;O^ _&]U$(.^=O\ ?P;'AG;_ 0#K'Y" 
-M_'AT!8#\6'44@XYJ_T!+2X.N=O\"?0;'AG;_   #CG;_]X9J_P( =0SK!K @
-MZ.'[2SO9?_;WAFK_0 !T#+ PZ,_[BH9N_^C(^XN6=O\+TGXG*\HKVB:*!#PM
-M= @\('0$/"MU!R:LZ*C[24N'RN,'L##HG?OB^8?*XQ$KV2:LB 5'_DZM?P/H
-MD/OB\0O;?@F+R[ @Z'O[XOGIKON)=@:+?@3WAFK_( !U"HL]@T8$ AX'ZP;$
-M/8-&! 2X4  J1JT#1JHFB07I??N+MGC_B[YL_[ EZ#S[K K =?B ?JU0?0/H
-M-OL'BT:JZP!?7HOE7<(( %6+[%97BW8$@S[H! !T'(L>Z 2+?P:+'N@$B7<&
-MB74$B7P&H>@$B40$ZPJ)-N@$B70$B70&7UY=PU6+[(/L E97BW8&BWX$BP0!
-M!:'F!#O&=0:)/N8$ZPV+! /&B4;^BU[^B7\"5NA-\5E?7HOE7<-6H>H$.P;F
-M!'42_S;J!.C:\EDSP*/F!*/J!.L[BQ[F!(MW O<$ 0!U(E;H&?%9.S;J!'4*
-M,\"CY@2CZ@3K!HM$ J/F!%;HH_)9ZPS_-N8$Z)GR68DVY@1>PU6+[(/L E97
-MBW8$_PR+! /&B4;^BWP"]P4! '44.S;J!'0.BP0!!8M>_HE_ HOWZP56Z +_
-M68M>_O<' 0!U"?]V_E;H*O]965]>B^5=PU6+[%:+=@0+]G4"ZQ>+Q@7\_XOP
-M.S;F!'4%Z#S_ZP56Z(__65Y=PU6+[%:T*XMV!(L,BU0"S2%>7<-5B^Q6M"V+
-M=@2+#(M4 LTA7EW#              !4=7)B;RU#("T@0V]P>7)I9VAT("AC
-M*2 Q.3@X($)O<FQA;F0@26YT;"X 3G5L;"!P;VEN=&5R(&%S<VEG;FUE;G0-
-M"D1I=FED92!E<G)O<@T*06)N;W)M86P@<')O9W)A;2!T97)M:6YA=&EO;@T*
-M                                                     .P$[ 3L
-M!                                                           
-M                                                            
-M                                                            
-M                                                            
-M                                                            
-M                        4E1#($))3U,@9&EA9VYO<W1I8R!E<G)O<B E
-M8@H $ AC;&]C:U]B871T97)Y!U)/35]C:W-U;09C;VYF:6=?=6YI= 5M96UO
-M<GE?<VEZ901F:7AE9%]D:7-K VEN=F%L:61?=&EM90!296%L+71I;64@8VQO
-M8VL@;F]T(&9O=6YD"@      $P("! 4&" @(%!4%$_\6!1$"____________
-M_____P4%_____________________P__(P+_#_____\3__\" @4/ O___Q/_
-M_________R/_____(_\3_P!Z WH#>@,    0      D"             ( "
-M   * @$           "0 @   @("            H (  $," P          
-M + "  !" @0           #  @    #_            T (     _P      
-M     . "     /\           #P @    #_              ,     _P  
-M         ! #     /\            @ P    #_            , ,     
-M_P           $ #     /\           !0 P    #_            8 , 
-M    _P           ' #     /\           "  P    #_            
-MD ,     _P           * #     /\           "P P$@ B "( 2@ J#_
-M______________________________________\     <')I;G0@<V-A;F8@
-M.B!F;&]A=&EN9R!P;VEN="!F;W)M871S(&YO="!L:6YK960-"@ - "AN=6QL
-M*0 P,3(S-#4V-S@Y04)#1$5& !04 105%!04% ( % ,$% D%!04%!04%!044
-M%!04%!04%!04% \7#P@4%!0'%!84%!04%!04%!0-%!04%!04%!04%! *#P\/
-G" H4% 84$@L.%!01% P4% T4%!04%!04 -(!T@'9 50+60M9"UD+
- 
-end
diff --git a/tools/build/os/msdos/ifc.c b/tools/build/os/msdos/ifc.c
deleted file mode 100644
index 091e2dd0ef..0000000000
--- a/tools/build/os/msdos/ifc.c
+++ /dev/null
@@ -1,331 +0,0 @@
-/*
- *  $Id$
- */
-
-#include <stdio.h>
-#include <string.h>
-#include <process.h>
-
-#include <io.h>
-
-void * xmalloc( int size )
-{
-    void * p = (void *)malloc( size );
-    if ( !p )  {
-        fprintf( stderr, "out of memory\n" );
-        exit( 1 );
-    }
-    return p;
-}
-void * xrealloc( void * old, int size )
-{
-    void * p = (void *)realloc( old, size );
-    if ( !p )  {
-        fprintf( stderr, "out of memory\n" );
-        exit( 1 );
-    }
-    return p;
-}
-
-char ** argv_fix( int * argc, char ** argv )
-{
-    char ** new = NULL;
-    int     max = 20;
-    int     cnt = 0;
-    int     j;
-
-    for ( j = 1; argv[j]; ++j )
-        if ( argv[j][0] == '@' && access(argv[j]+1,0)==0 )
-            break;
-    if ( argv[j] == NULL )
-        return argv;
-
-    new = (char **)xmalloc( max * sizeof *new );
-    new[cnt++] = *argv++;
-    for ( ; *argv; ++argv )  {
-        if ( cnt >= max )
-            new = (char **)realloc( new, (max*=2) * sizeof *new );
-            
-        if ( argv[0][0] != '@' || access(argv[0]+1,0) )  {
-            new[cnt++] = *argv;
-        } else {
-            char line[ 1000 ];
-            FILE * f = fopen( argv[0]+1, "r" );
-            if ( !f )  {
-                perror( argv[0]+1 );
-                exit( 2 );
-            }
-            while ( fgets( line, sizeof line, f ) )  {
-                int len = strlen( line );
-                /* delete trailing newlines */
-                while ( line[len-1] == '\n' || line[len-1] == '\r' )
-                    line[--len] = '\0';
-                if ( cnt >= max )
-                    new = (char **)xrealloc( new, (max*=2) * sizeof *new );
-                new[cnt] = (char *)xmalloc( len+1 );
-                strcpy( new[cnt], line );
-                ++cnt;
-            }
-            fclose( f );
-        }       
-    }
-    if ( cnt >= max )
-        new = (char **)xrealloc( new, (max+1) * sizeof *new );
-    new[cnt] = NULL;
-    *argc = cnt;
-    return new;
-}
-
-
-const char * USAGE = 
-"usage: $progname [ -cNvmV ] file [ file ... ] dest-directory-or-file\n"
-"        -v          -- verbose\n"
-"        -V suffix   -- suffix to append to targets (before any . suffix)\n"
-"                        eg: -V _g would change 'foo' to 'foo_g' and\n"
-"                                               'libfoo.a' to 'libfoo_g.a'\n"
-"        -m mode     -- mode for new file(s)\n"
-"        -c          -- copy instead of move (always on)\n"
-"        -N          -- copy only if source is newer than target\n"
-;
-
-void fatal( char * msg )
-{
-    if ( msg )
-        fprintf( stderr, "%s\n", msg );
-    fprintf( stderr, "%s", USAGE );
-    exit( 1 );
-}
-
-char * basename( char * f )
-{
-    char * b = strrchr( f, '/' );
-    if ( b )    ++b;
-    else        b = f;
-    return b;
-}
-
-#include <sys/stat.h>
-int is_dir( char * path )
-{
-    struct stat buf;
-    if ( stat( path, &buf ) )
-        return 0;
-    return buf.st_mode & S_IFDIR;
-}
-int is_file( char * path )
-{
-    struct stat buf;
-    if ( stat( path, &buf ) )
-        return 0;
-    return buf.st_mode & S_IFREG;
-}
-int newer( char * p1, char * p2 )
-{
-    struct stat buf1;
-    struct stat buf2;
-    if ( stat( p1, &buf1 ) )
-        return 0;
-    if ( stat( p2, &buf2 ) )
-        return 0;
-    return buf1.st_mtime > buf2.st_mtime;
-}
-
-int filecopy( char * d, char * s, int preserve_time )
-{
-#if 0
-    int         status;
-    char      * argv[ 5 ];
-    argv[0] = "cp";
-    argv[1] = "-p";
-    argv[2] = s;
-    argv[3] = d;
-    argv[4] = NULL;
-    status = spawnvp( P_WAIT, argv[0], argv );
-    if ( status )
-        perror( "cp" );
-    return status;
-#else
-    FILE      * fs;
-    FILE      * fd;
-    char        buffer[ 8192 ];
-    int         n;
-    struct ftime        When;
-    struct stat         Stat;
-
-    fs = fopen( s, "rb" );
-    if ( fs == NULL )  {
-        perror( s );
-        return 1;
-    }
-    fd = fopen( d, "wb" );
-    if ( fd == NULL )  {
-        perror( d );
-        fclose( fs );
-        return 2;
-    }
-
-    if ( preserve_time )
-        if ( getftime( fileno(fs), &When ) )  {
-            perror( s );
-            preserve_time = 0;
-        }
-
-    do {
-        n = fread( buffer, 1, sizeof buffer, fs );
-        if ( n > 0 )
-            if ( fwrite( buffer, 1, n, fd ) < 0 )  {
-                perror( d );
-                return 3;
-            }
-    } while ( n > 0 );    
-
-    fclose( fs );
-
-    /* Fix time stamp */
-    if ( preserve_time )
-        if ( setftime( fileno(fd), &When ) )  {
-            perror( s );
-            preserve_time = 0;
-        }
-    fclose( fd );
-
-    /* Fix access rights */
-    if ( stat( s, &Stat ) )
-        perror( s );
-    else if ( chmod( d, Stat.st_mode ) )
-        perror( d );
-
-    return 0;
-#endif
-}
-
-
-
-
-
-int main( int argc, char * argv[] )
-{
-    char *      progname;
-    int         verbose = 0;
-    int         only_if_newer= 0;
-    char *      suffix  = NULL;
-    char *      mode    = NULL;
-    char *      dest;
-    char **     pp;
-
-    argv = argv_fix( &argc, argv );
-
-    progname = basename( *argv++ );
-
-    /* process the options */
-    while ( argv[0]  &&  argv[0][0] == '-' )  {
-        switch ( argv[0][1] )  {
-            case 'N':
-                ++argv;
-                only_if_newer = 1;
-                break;
-            case 'c':
-                ++argv;
-                /* We always copy, regardless */
-                break;
-            case 'v':
-                ++argv;
-                verbose = 1;
-                break;
-            case 'V':
-                ++argv;
-                suffix = *argv;
-                ++argv;
-                break;
-            case 'm':
-                ++argv;
-                mode = *argv;
-                ++argv;
-                break;
-            default:
-                fatal( NULL );
-        }
-    }
-
-    /* Separate source file(s) from dest directory or file */
-#if 0
-    if ( !argv[0] || !argv[1] )
-        fatal( "missing files or invalid destination" );
-#else
-    /* We used to require at least one file; not any more */
-    if ( !argv[0] )
-        fatal( "missing files or invalid destination" );
-    if ( !argv[1] )
-        return 0;
-#endif
-    for ( pp = argv; *pp; ++pp )
-        continue;
-    --pp;
-    dest = *pp;
-    *pp = NULL;
-
-    /* Process the arguments */
-    for (; *argv; ++argv )  {
-        char * f = *argv;
-        char * leaf = basename( f );
-        char target[ 128 ];
-
-        strcpy( target, dest );
-
-        if ( is_dir( target ) )  {
-            strcat( target, "/" );
-            /* if we were given a suffix, then add it as appropriate */
-            if ( suffix )  {
-                char * dot = strchr( leaf, '.' );
-                if ( dot )  {
-                    strncat( target, leaf, dot-leaf );
-                    strcat( target, suffix );
-                    strcat( target, dot );
-                    if ( verbose )
-                        printf( "%s: %s will be installed as %s",
-                               progname, f, strrchr(target,'/')+1 );
-                } else {
-                    strcat( target, leaf );
-                    strcat( target, suffix );
-                }
-            } else {
-                strcat( target, leaf );
-            }
-        }
-
-        if ( access( f, 0 ) )  {
-            char buf[200];
-            sprintf( buf, "cannot read %s", f );
-            fatal( buf );
-        }
-
-        if ( only_if_newer && is_file( target ) && !newer( f, target ) )  {
-            if ( verbose )
-                printf( "'%s' not newer than '%s'\n", f, target );
-            continue;
-        }
-
-        if ( verbose )
-            printf( "rm -f %s\n", target );
-        if ( chmod( target, 0777 ) )
-            if ( verbose )
-                perror( target );
-        if ( unlink( target ) )
-            if ( verbose )
-                perror( target );
-        if ( verbose )
-            printf( "cp -p %s %s\n", f, target );
-        if ( filecopy( target, f, 1 ) )
-            return 1;
-        if ( mode )  {
-            char buf[ 255 ];
-            sprintf( buf, "chmod %s %s\n", mode, target );
-            if ( verbose )
-                printf( "%s\n", buf );
-            system( buf );
-        }
-    }
-
-    return 0;
-}
-
diff --git a/tools/build/os/msdos/ifc_exe.uue b/tools/build/os/msdos/ifc_exe.uue
deleted file mode 100644
index cd9f52b8f0..0000000000
--- a/tools/build/os/msdos/ifc_exe.uue
+++ /dev/null
@@ -1,163 +0,0 @@
-#
-#  $Id$
-#
-
-begin 664 ifc.exe
-M(VEN8VQU9&4@/'-T9&EO+F@^#0HC:6YC;'5D92 \<W1R:6YG+F@^#0HC:6YC
-M;'5D92 \<')O8V5S<RYH/@T*#0HC:6YC;'5D92 \:6\N:#X-"@T*=F]I9" J
-M('AM86QL;V,H(&EN="!S:7IE("D-"GL-"B @("!V;VED("H@<" ]("AV;VED
-M("HI;6%L;&]C*"!S:7IE("D[#0H@(" @:68@*" A<" I("![#0H)9G!R:6YT
-M9B@@<W1D97)R+" B;W5T(&]F(&UE;6]R>5QN(B I.PT*"65X:70H(#$@*3L-
-M"B @("!]#0H@(" @<F5T=7)N(' [#0I]#0IV;VED("H@>')E86QL;V,H('9O
-M:60@*B!O;&0L(&EN="!S:7IE("D-"GL-"B @("!V;VED("H@<" ]("AV;VED
-M("HI<F5A;&QO8R@@;VQD+"!S:7IE("D[#0H@(" @:68@*" A<" I("![#0H)
-M9G!R:6YT9B@@<W1D97)R+" B;W5T(&]F(&UE;6]R>5QN(B I.PT*"65X:70H
-M(#$@*3L-"B @("!]#0H@(" @<F5T=7)N(' [#0I]#0H-"F-H87(@*BH@87)G
-M=E]F:7@H(&EN=" J(&%R9V,L(&-H87(@*BH@87)G=B I#0I[#0H@(" @8VAA
-M<B J*B!N97<@/2!.54Q,.PT*(" @(&EN=" @(" @;6%X(#T@,C [#0H@(" @
-M:6YT"2 @("!C;G0@/2 P.PT*(" @(&EN= D@(" @:CL-"@T*(" @(&9O<B H
-M(&H@/2 Q.R!A<F=V6VI=.R K*VH@*0T*"6EF("@@87)G=EMJ75LP72 ]/2 G
-M0"<@)B8@86-C97-S*&%R9W9;:ETK,2PP*3T]," I#0H)(" @(&)R96%K.PT*
-M(" @(&EF("@@87)G=EMJ72 ]/2!.54Q,("D-"@ER971U<FX@87)G=CL-"@T*
-M(" @(&YE=R ]("AC:&%R("HJ*7AM86QL;V,H(&UA>" J('-I>F5O9B J;F5W
-M("D[#0H@(" @;F5W6V-N="LK72 ]("IA<F=V*RL[#0H@(" @9F]R("@@.R J
-M87)G=CL@*RMA<F=V("D@('L-"@EI9B H(&-N=" ^/2!M87@@*0T*"2 @("!N
-M97<@/2 H8VAA<B J*BER96%L;&]C*"!N97<L("AM87@J/3(I("H@<VEZ96]F
-M("IN97<@*3L-"@D@(" @#0H):68@*"!A<F=V6S!=6S!=("$]("= )R!\?"!A
-M8V-E<W,H87)G=ELP72LQ+# I("D@('L-"@D@(" @;F5W6V-N="LK72 ]("IA
-M<F=V.PT*"7T@96QS92![#0H)(" @(&-H87(@;&EN95L@,3 P,"!=.PT*"2 @
-M("!&24Q%("H@9B ](&9O<&5N*"!A<F=V6S!=*S$L(")R(B I.PT*"2 @("!I
-M9B H("%F("D@('L-"@D)<&5R<F]R*"!A<F=V6S!=*S$@*3L-"@D)97AI="@@
-M,B I.PT*"2 @("!]#0H)(" @('=H:6QE("@@9F=E=',H(&QI;F4L('-I>F5O
-M9B!L:6YE+"!F("D@*2 @>PT*"0EI;G0@;&5N(#T@<W1R;&5N*"!L:6YE("D[
-M#0H)"2\J(&1E;&5T92!T<F%I;&EN9R!N97=L:6YE<R J+PT*"0EW:&EL92 H
-M(&QI;F5;;&5N+3%=(#T]("=<;B<@?'P@;&EN95ML96XM,5T@/3T@)UQR)R I
-M#0H)"2 @("!L:6YE6RTM;&5N72 ]("=<,"<[#0H)"6EF("@@8VYT(#X](&UA
-M>" I#0H)"2 @("!N97<@/2 H8VAA<B J*BEX<F5A;&QO8R@@;F5W+" H;6%X
-M*CTR*2 J('-I>F5O9B J;F5W("D[#0H)"6YE=UMC;G1=(#T@*&-H87(@*BEX
-M;6%L;&]C*"!L96XK,2 I.PT*"0ES=')C<'DH(&YE=UMC;G1=+"!L:6YE("D[
-M#0H)"2LK8VYT.PT*"2 @("!]#0H)(" @(&9C;&]S92@@9B I.PT*"7T)#0H@
-M(" @?0T*(" @(&EF("@@8VYT(#X](&UA>" I#0H);F5W(#T@*&-H87(@*BHI
-M>')E86QL;V,H(&YE=RP@*&UA>"LQ*2 J('-I>F5O9B J;F5W("D[#0H@(" @
-M;F5W6V-N=%T@/2!.54Q,.PT*(" @("IA<F=C(#T@8VYT.PT*(" @(')E='5R
-M;B!N97<[#0I]#0H-"@T*8V]N<W0@8VAA<B J(%5304=%(#T@#0HB=7-A9V4Z
-M("1P<F]G;F%M92!;("UC3G9M5B!=(&9I;&4@6R!F:6QE("XN+B!=(&1E<W0M
-M9&ER96-T;W)Y+6]R+69I;&5<;B(-"B(@(" @(" @("UV(" @(" @(" @("TM
-M('9E<F)O<V5<;B(-"B(@(" @(" @("U6('-U9F9I>" @("TM('-U9F9I>"!T
-M;R!A<'!E;F0@=&\@=&%R9V5T<R H8F5F;W)E(&%N>2 N('-U9F9I>"E<;B(-
-M"B(@(" @(" @(" @(" @(" @(" @(" @("!E9SH@+58@7V<@=V]U;&0@8VAA
-M;F=E("=F;V\G('1O("=F;V]?9R<@86YD7&XB#0HB(" @(" @(" @(" @(" @
-M(" @(" @(" @(" @(" @(" @(" @(" @(" @(" @(" G;&EB9F]O+F$G('1O
-M("=L:6)F;V]?9RYA)UQN(@T*(B @(" @(" @+6T@;6]D92 @(" @+2T@;6]D
-M92!F;W(@;F5W(&9I;&4H<RE<;B(-"B(@(" @(" @("UC(" @(" @(" @("TM
-M(&-O<'D@:6YS=&5A9"!O9B!M;W9E("AA;'=A>7,@;VXI7&XB#0HB(" @(" @
-M(" M3B @(" @(" @(" M+2!C;W!Y(&]N;'D@:68@<V]U<F-E(&ES(&YE=V5R
-M('1H86X@=&%R9V5T7&XB#0H[#0H-"G9O:60@9F%T86PH(&-H87(@*B!M<V<@
-M*0T*>PT*(" @(&EF("@@;7-G("D-"@EF<')I;G1F*"!S=&1E<G(L("(E<UQN
-M(BP@;7-G("D[#0H@(" @9G!R:6YT9B@@<W1D97)R+" B)7,B+"!54T%'12 I
-M.PT*(" @(&5X:70H(#$@*3L-"GT-"@T*8VAA<B J(&)A<V5N86UE*"!C:&%R
-M("H@9B I#0I[#0H@(" @8VAA<B J(&(@/2!S=')R8VAR*"!F+" G+R<@*3L-
-M"B @("!I9B H(&(@*0DK*V([#0H@(" @96QS90EB(#T@9CL-"B @("!R971U
-M<FX@8CL-"GT-"@T*(VEN8VQU9&4@/'-Y<R]S=&%T+F@^#0II;G0@:7-?9&ER
-M*"!C:&%R("H@<&%T:" I#0I[#0H@(" @<W1R=6-T('-T870@8G5F.PT*(" @
-M(&EF("@@<W1A="@@<&%T:"P@)F)U9B I("D-"@ER971U<FX@,#L-"B @("!R
-M971U<FX@8G5F+G-T7VUO9&4@)B!37TE&1$E2.PT*?0T*:6YT(&ES7V9I;&4H
-M(&-H87(@*B!P871H("D-"GL-"B @("!S=')U8W0@<W1A="!B=68[#0H@(" @
-M:68@*"!S=&%T*"!P871H+" F8G5F("D@*0T*"7)E='5R;B P.PT*(" @(')E
-M='5R;B!B=68N<W1?;6]D92 F(%-?249214<[#0I]#0II;G0@;F5W97(H(&-H
-M87(@*B!P,2P@8VAA<B J(' R("D-"GL-"B @("!S=')U8W0@<W1A="!B=68Q
-M.PT*(" @('-T<G5C="!S=&%T(&)U9C([#0H@(" @:68@*"!S=&%T*"!P,2P@
-M)F)U9C$@*2 I#0H)<F5T=7)N(# [#0H@(" @:68@*"!S=&%T*"!P,BP@)F)U
-M9C(@*2 I#0H)<F5T=7)N(# [#0H@(" @<F5T=7)N(&)U9C$N<W1?;71I;64@
-M/B!B=68R+G-T7VUT:6UE.PT*?0T*#0II;G0@9FEL96-O<'DH(&-H87(@*B!D
-M+"!C:&%R("H@<RP@:6YT('!R97-E<G9E7W1I;64@*0T*>PT*(VEF(# -"B @
-M("!I;G0)"7-T871U<SL-"B @("!C:&%R(" @(" @*B!A<F=V6R U(%T[#0H@
-M(" @87)G=ELP72 ](")C<"([#0H@(" @87)G=ELQ72 ]("(M<"([#0H@(" @
-M87)G=ELR72 ](',[#0H@(" @87)G=ELS72 ](&0[#0H@(" @87)G=ELT72 ]
-M($Y53$P[#0H@(" @<W1A='5S(#T@<W!A=VYV<"@@4%]704E4+"!A<F=V6S!=
-M+"!A<F=V("D[#0H@(" @:68@*"!S=&%T=7,@*0T*"7!E<G)O<B@@(F-P(B I
-M.PT*(" @(')E='5R;B!S=&%T=7,[#0HC96QS90T*(" @($9)3$4@(" @(" J
-M(&9S.PT*(" @($9)3$4@(" @(" J(&9D.PT*(" @(&-H87()8G5F9F5R6R X
-M,3DR(%T[#0H@(" @:6YT"0EN.PT*(" @('-T<G5C="!F=&EM90E7:&5N.PT*
-M(" @('-T<G5C="!S=&%T"0E3=&%T.PT*#0H@(" @9G,@/2!F;W!E;B@@<RP@
-M(G)B(B I.PT*(" @(&EF("@@9G,@/3T@3E5,3" I("![#0H)<&5R<F]R*"!S
-M("D[#0H)<F5T=7)N(#$[#0H@(" @?0T*(" @(&9D(#T@9F]P96XH(&0L(")W
-M8B(@*3L-"B @("!I9B H(&9D(#T]($Y53$P@*2 @>PT*"7!E<G)O<B@@9" I
-M.PT*"69C;&]S92@@9G,@*3L-"@ER971U<FX@,CL-"B @("!]#0H-"B @("!I
-M9B H('!R97-E<G9E7W1I;64@*0T*"6EF("@@9V5T9G1I;64H(&9I;&5N;RAF
-M<RDL("97:&5N("D@*2 @>PT*"2 @("!P97)R;W(H(',@*3L-"@D@(" @<')E
-M<V5R=F5?=&EM92 ](# [#0H)?0T*#0H@(" @9&\@>PT*"6X@/2!F<F5A9"@@
-M8G5F9F5R+" Q+"!S:7IE;V8@8G5F9F5R+"!F<R I.PT*"6EF("@@;B ^(# @
-M*0T*"2 @("!I9B H(&9W<FET92@@8G5F9F5R+" Q+"!N+"!F9" I(#P@," I
-M("![#0H)"7!E<G)O<B@@9" I.PT*"0ER971U<FX@,SL-"@D@(" @?0T*(" @
-M('T@=VAI;&4@*"!N(#X@," I.R @(" -"@T*(" @(&9C;&]S92@@9G,@*3L-
-M"@T*(" @("\J($9I>"!T:6UE('-T86UP("HO#0H@(" @:68@*"!P<F5S97)V
-M95]T:6UE("D-"@EI9B H('-E=&9T:6UE*"!F:6QE;F\H9F0I+" F5VAE;B I
-M("D@('L-"@D@(" @<&5R<F]R*"!S("D[#0H)(" @('!R97-E<G9E7W1I;64@
-M/2 P.PT*"7T-"B @("!F8VQO<V4H(&9D("D[#0H-"B @(" O*B!&:7@@86-C
-M97-S(')I9VAT<R J+PT*(" @(&EF("@@<W1A="@@<RP@)E-T870@*2 I#0H)
-M<&5R<F]R*"!S("D[#0H@(" @96QS92!I9B H(&-H;6]D*"!D+"!3=&%T+G-T
-M7VUO9&4@*2 I#0H)<&5R<F]R*"!D("D[#0H-"B @("!R971U<FX@,#L-"B-E
-M;F1I9@T*?0T*#0H-"@T*#0H-"FEN="!M86EN*"!I;G0@87)G8RP@8VAA<B J
-M(&%R9W9;72 I#0I[#0H@(" @8VAA<B J"7!R;V=N86UE.PT*(" @(&EN= D)
-M=F5R8F]S92 ](# [#0H@(" @:6YT"0EO;FQY7VEF7VYE=V5R/2 P.PT*(" @
-M(&-H87(@*@ES=69F:7@@(#T@3E5,3#L-"B @("!C:&%R("H);6]D90D]($Y5
-M3$P[#0H@(" @8VAA<B J( ED97-T.PT*(" @(&-H87(@*BH)<' [#0H-"B @
-M("!A<F=V(#T@87)G=E]F:7@H("9A<F=C+"!A<F=V("D[#0H-"B @("!P<F]G
-M;F%M92 ](&)A<V5N86UE*" J87)G=BLK("D[#0H-"B @(" O*B!P<F]C97-S
-M('1H92!O<'1I;VYS("HO#0H@(" @=VAI;&4@*"!A<F=V6S!=(" F)B @87)G
-M=ELP75LP72 ]/2 G+2<@*2 @>PT*"7-W:71C:" H(&%R9W9;,%U;,5T@*2 @
-M>PT*"2 @("!C87-E("=.)SH-"@D@(" @(" @("LK87)G=CL-"@D);VYL>5]I
-M9E]N97=E<B ](#$[#0H)"6)R96%K.PT*"2 @("!C87-E("=C)SH-"@D@(" @
-M(" @("LK87)G=CL-"@D)+RH@5V4@86QW87ES(&-O<'DL(')E9V%R9&QE<W,@
-M*B\-"@D)8G)E86L[#0H)(" @(&-A<V4@)W8G.@T*"0DK*V%R9W8[#0H)"79E
-M<F)O<V4@/2 Q.PT*"0EB<F5A:SL-"@D@(" @8V%S92 G5B<Z#0H)"2LK87)G
-M=CL-"@D)<W5F9FEX(#T@*F%R9W8[#0H)"2LK87)G=CL-"@D)8G)E86L[#0H)
-M(" @(&-A<V4@)VTG.@T*"0DK*V%R9W8[#0H)"6UO9&4@/2 J87)G=CL-"@D)
-M*RMA<F=V.PT*"0EB<F5A:SL-"@D@(" @9&5F875L=#H-"@D)9F%T86PH($Y5
-M3$P@*3L-"@E]#0H@(" @?0T*#0H@(" @+RH@4V5P87)A=&4@<V]U<F-E(&9I
-M;&4H<RD@9G)O;2!D97-T(&1I<F5C=&]R>2!O<B!F:6QE("HO#0HC:68@, T*
-M(" @(&EF("@@(6%R9W9;,%T@?'P@(6%R9W9;,5T@*0T*"69A=&%L*" B;6ES
-M<VEN9R!F:6QE<R!O<B!I;G9A;&ED(&1E<W1I;F%T:6]N(B I.PT*(V5L<V4-
-M"B @(" O*B!792!U<V5D('1O(')E<75I<F4@870@;&5A<W0@;VYE(&9I;&4[
-M(&YO="!A;GD@;6]R92 J+PT*(" @(&EF("@@(6%R9W9;,%T@*0T*"69A=&%L
-M*" B;6ES<VEN9R!F:6QE<R!O<B!I;G9A;&ED(&1E<W1I;F%T:6]N(B I.PT*
-M(" @(&EF("@@(6%R9W9;,5T@*0T*"7)E='5R;B P.PT*(V5N9&EF#0H@(" @
-M9F]R("@@<' @/2!A<F=V.R J<' [("LK<' @*0T*"6-O;G1I;G5E.PT*(" @
-M("TM<' [#0H@(" @9&5S=" ]("IP<#L-"B @(" J<' @/2!.54Q,.PT*#0H@
-M(" @+RH@4')O8V5S<R!T:&4@87)G=6UE;G1S("HO#0H@(" @9F]R("@[("IA
-M<F=V.R K*V%R9W8@*2 @>PT*"6-H87(@*B!F(#T@*F%R9W8[#0H)8VAA<B J
-M(&QE868@/2!B87-E;F%M92@@9B I.PT*"6-H87(@=&%R9V5T6R Q,C@@73L-
-M"@T*"7-T<F-P>2@@=&%R9V5T+"!D97-T("D[#0H-"@EI9B H(&ES7V1I<B@@
-M=&%R9V5T("D@*2 @>PT*"2 @("!S=')C870H('1A<F=E="P@(B\B("D[#0H)
-M(" @("\J(&EF('=E('=E<F4@9VEV96X@82!S=69F:7@L('1H96X@861D(&ET
-M(&%S(&%P<')O<')I871E("HO#0H)(" @(&EF("@@<W5F9FEX("D@('L-"@D)
-M8VAA<B J(&1O=" ]('-T<F-H<B@@;&5A9BP@)RXG("D[#0H)"6EF("@@9&]T
-M("D@('L-"@D)(" @('-T<FYC870H('1A<F=E="P@;&5A9BP@9&]T+6QE868@
-M*3L-"@D)(" @('-T<F-A="@@=&%R9V5T+"!S=69F:7@@*3L-"@D)(" @('-T
-M<F-A="@@=&%R9V5T+"!D;W0@*3L-"@D)(" @(&EF("@@=F5R8F]S92 I#0H)
-M"0EP<FEN=&8H("(E<SH@)7,@=VEL;"!B92!I;G-T86QL960@87,@)7,B+ T*
-M"0D)(" @(" @('!R;V=N86UE+"!F+"!S=')R8VAR*'1A<F=E="PG+R<I*S$@
-M*3L-"@D)?2!E;'-E('L-"@D)(" @('-T<F-A="@@=&%R9V5T+"!L96%F("D[
-M#0H)"2 @("!S=')C870H('1A<F=E="P@<W5F9FEX("D[#0H)"7T-"@D@(" @
-M?2!E;'-E('L-"@D)<W1R8V%T*"!T87)G970L(&QE868@*3L-"@D@(" @?0T*
-M"7T-"@T*"6EF("@@86-C97-S*"!F+" P("D@*2 @>PT*"2 @("!C:&%R(&)U
-M9ELR,#!=.PT*"2 @("!S<')I;G1F*"!B=68L(")C86YN;W0@<F5A9" E<R(L
-M(&8@*3L-"@D@(" @9F%T86PH(&)U9B I.PT*"7T-"@T*"6EF("@@;VYL>5]I
-M9E]N97=E<B F)B!I<U]F:6QE*"!T87)G970@*2 F)B A;F5W97(H(&8L('1A
-M<F=E=" I("D@('L-"@D@(" @:68@*"!V97)B;W-E("D-"@D)<')I;G1F*" B
-M)R5S)R!N;W0@;F5W97(@=&AA;B G)7,G7&XB+"!F+"!T87)G970@*3L-"@D@
-M(" @8V]N=&EN=64[#0H)?0T*#0H):68@*"!V97)B;W-E("D-"@D@(" @<')I
-M;G1F*" B<FT@+68@)7-<;B(L('1A<F=E=" I.PT*"6EF("@@8VAM;V0H('1A
-M<F=E="P@,#<W-R I("D-"@D@(" @:68@*"!V97)B;W-E("D-"@D)<&5R<F]R
-M*"!T87)G970@*3L-"@EI9B H('5N;&EN:R@@=&%R9V5T("D@*0T*"2 @("!I
-M9B H('9E<F)O<V4@*0T*"0EP97)R;W(H('1A<F=E=" I.PT*"6EF("@@=F5R
-M8F]S92 I#0H)(" @('!R:6YT9B@@(F-P("UP("5S("5S7&XB+"!F+"!T87)G
-M970@*3L-"@EI9B H(&9I;&5C;W!Y*"!T87)G970L(&8L(#$@*2 I#0H)(" @
-M(')E='5R;B Q.PT*"6EF("@@;6]D92 I("![#0H)(" @(&-H87(@8G5F6R R
-M-34@73L-"@D@(" @<W!R:6YT9B@@8G5F+" B8VAM;V0@)7,@)7-<;B(L(&UO
-M9&4L('1A<F=E=" I.PT*"2 @("!I9B H('9E<F)O<V4@*0T*"0EP<FEN=&8H
-M("(E<UQN(BP@8G5F("D[#0H)(" @('-Y<W1E;2@@8G5F("D[#0H)?0T*(" @
-:('T-"@T*(" @(')E='5R;B P.PT*?0T*#0IE
- 
-end
diff --git a/tools/build/packhex.c b/tools/build/packhex.c
deleted file mode 100644
index 3b85a7c927..0000000000
--- a/tools/build/packhex.c
+++ /dev/null
@@ -1,565 +0,0 @@
-
-/*****  P A C K H E X . C  ************************************************
- *
- *   Packhex is a hex-file compaction utility.  It attempts to concatenate
- *   hex records to produce more size-efficient packaging.
- *
- *   Limitations: Input files must be correctly formatted.  This utility
- *                is not robust enough to detect hex-record formatting
- *                errors.
- *
- *   Published:   May 1993 Embedded Systems Programming magazine
- *                "Creating Faster Hex Files"
- *
- *   URL:         ESP magazine: http://www.embedded.com
- *                Source Code:  ftp://ftp.mfi.com/pub/espmag/1993/pakhex.zip
- *
- *   Author:      Mark Gringrich
- *
- *   Compiler:    Microsoft C 6.0
- *                cl /F 1000 packhex.c
- *
- *
- *   $Id$
- *
- **************************************************************************/
-
-
-/* #define SMALLER_RECORDS */
-#ifdef SMALLER_RECORDS
-#define MAX_LEN_S1_RECS 128
-#define MAX_LEN_S2_RECS 128
-#define MAX_LEN_S3_RECS 128
-#else
-#define MAX_LEN_S1_RECS 252
-#define MAX_LEN_S2_RECS 251
-#define MAX_LEN_S3_RECS 250
-#endif
-
-
-/*--------------------------------- includes ---------------------------------*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "config.h"
-
-#ifndef VMS
-#ifndef HAVE_STRERROR
-extern int sys_nerr;
-extern char *sys_errlist[];
-
-#define strerror( _err ) \
-  ((_err) < sys_nerr) ? sys_errlist [(_err)] : "unknown error"
-
-#else   /* HAVE_STRERROR */
-char *strerror ();
-#endif
-#else   /* VMS */
-char *strerror (int,...);
-#endif
-
-#if defined(__unix__) && !defined(EXIT_FAILURE)
-#define EXIT_FAILURE -1
-#define EXIT_SUCCESS  0
-#endif
-
-/*--------------------------------- defines ----------------------------------*/
-
-#define YES                   1
-#define MAX_LINE_SIZE       600
-#define EOS                 '\0'
-
-
-/*---------------------------------- macros ----------------------------------*/
-
-/* Convert ASCII hexadecimal digit to value. */
-
-#define HEX_DIGIT( C )   ( ( ( ( C ) > '9' ) ? ( C ) + 25 : ( C ) ) & 0xF )
-
-
-/*--------------------------------- typedefs ---------------------------------*/
-
-typedef unsigned char   Boolean;
-typedef unsigned char   Uchar;
-typedef unsigned int    Uint;
-typedef unsigned long   Ulong;
-
-typedef struct   /* Functions and constant returning Hex-record vital stats. */
-{
-    Boolean    ( *is_data_record  )( char *              );
-    Ulong      ( *get_address     )( char *              );
-    Uint       ( *get_data_count  )( char *              );
-    const Uint    max_data_count;
-    char      *( *get_data_start  )( char *              );
-    void       ( *put_data_record )( Uint, Ulong, char * );
-} Rec_vitals;
-
-
-/*--------------------------- function prototypes ----------------------------*/
-
-Rec_vitals  * identify_first_data_record( char *, int );
-Ulong         get_ndigit_hex( char *, int );
-
-
-/*----------------------------- Intel Hex format -----------------------------*/
-
-/*
- *    Intel Hex data-record layout
- *
- *    :aabbbbccd...dee
- *
- *    :      - header character
- *    aa     - record data byte count, a 2-digit hex value
- *    bbbb   - record address, a 4-digit hex value
- *    cc     - record type, a 2-digit hex value:
- *              "00" is a data record
- *              "01" is an end-of-data record
- *              "02" is an extended-address record
- *              "03" is a start record
- *    d...d  - data (always an even number of chars)
- *    ee     - record checksum, a 2-digit hex value
- *             checksum = 2's complement
- *                 [ (sum of bytes: aabbbbccd...d) modulo 256 ]
- */
-
-
-Boolean is_intel_data_rec( char * rec_str )
-{
-    return( ( rec_str[ 0 ] == ':' )  &&  ( rec_str[ 8 ] == '0' ) );
-}
-
-Uint get_intel_rec_data_count( char * rec_str )
-{
-    return( ( Uint ) get_ndigit_hex( rec_str + 1, 2 ) );
-}
-
-Ulong get_intel_rec_address( char * rec_str )
-{
-    return( get_ndigit_hex( rec_str + 3, 4 ) );
-}
-
-char * get_intel_rec_data_start( char * rec_str )
-{
-    return( rec_str + 9 );
-}
-
-void put_intel_data_rec( Uint count, Ulong address, char * data_str )
-{
-    char    *ptr;
-    Uint    sum = count + ( address >> 8 & 0xff ) + ( address & 0xff );
-
-    for ( ptr = data_str ; *ptr != EOS ; ptr += 2 )
-        sum += ( Uint ) get_ndigit_hex( ptr, 2 );
-
-    printf(
-      ":%02X%04lX00%s%02X\n", count, address, data_str, (~sum + 1) & 0xff
-    );
-}
-
-
-Rec_vitals  intel_hex =
-{
-    is_intel_data_rec,
-    get_intel_rec_address,
-    get_intel_rec_data_count,
-    255,                        /* Maximum data bytes in a record. */
-    get_intel_rec_data_start,
-    put_intel_data_rec
-};
-
-
-/*------------------------- Motorola S1-record format ------------------------*/
-
-/*
- *    Motorola S-record data-record layout
- *
- *    Sabbc...cd...dee
- *
- *    S      - header character
- *    a      - record type, a 1-digit value:
- *               "0" is a header record
- *               "1" is a 2-byte-address data record
- *               "2" is a 3-byte-address data record
- *               "3" is a 4-byte-address data record
- *               "7" is a 4-byte-address end-of-data record
- *               "8" is a 3-byte-address end-of-data record
- *               "9" is a 2-byte-address end-of-data record
- *    bb     - record length in bytes, a 2-digit hex value
- *             (record length doesn't count the header/type
- *              chars and checksum byte)
- *    c...c  - record address, a 4-, 6-, or 8-digit value,
- *               depending on record type
- *    d...d  - data (always an even number of chars)
- *    ee     - record checksum, a 2-digit hex value
- *             checksum = 1's complement
- *             [ (sum of all bytes: bbc..cd...d) modulo 256 ]
- */
-
-#define S1_COUNT_OFFSET         3
-
-
-Boolean is_moto_s1_data_rec( char * rec_str )
-{
-    return ( ( rec_str[ 0 ] == 'S' )  &&  ( rec_str[ 1 ] == '1' ) );
-}
-
-Uint get_moto_s1_rec_data_count( char * rec_str )
-{
-    return( ( Uint ) get_ndigit_hex( rec_str + 2, 2 ) - S1_COUNT_OFFSET );
-}
-
-Ulong get_moto_s1_rec_address( char * rec_str )
-{
-    return( get_ndigit_hex( rec_str + 4, 4 ) );
-}
-
-char * get_moto_s1_rec_data_start( char * rec_str )
-{
-    return( rec_str + 8 );
-}
-
-void put_moto_s1_data_rec( Uint count, Ulong address, char * data_str )
-{
-    char   *ptr;
-    Uint    sum = S1_COUNT_OFFSET + count +
-                    ( address >> 8 & 0xff ) + ( address & 0xff );
-
-    for ( ptr = data_str ; *ptr != EOS ; ptr += 2 )
-        sum += ( Uint ) get_ndigit_hex( ptr, 2 );
-
-    printf(
-      "S1%02X%04lX%s%02X\n",
-      count + S1_COUNT_OFFSET, address, data_str, ~sum & 0xff
-    );
-}
-
-
-Rec_vitals  motorola_s1_rec =
-{
-    is_moto_s1_data_rec,
-    get_moto_s1_rec_address,
-    get_moto_s1_rec_data_count,
-    MAX_LEN_S1_RECS,            /* Maximum data bytes in a record. */
-    get_moto_s1_rec_data_start,
-    put_moto_s1_data_rec
-};
-
-
-/*------------------------- Motorola S2-record format ------------------------*/
-
-#define S2_COUNT_OFFSET         4
-
-Boolean is_moto_s2_data_rec( char * rec_str )
-{
-    return ( ( rec_str[ 0 ] == 'S' )  &&  ( rec_str[ 1 ] == '2' ) );
-}
-
-Uint get_moto_s2_rec_data_count( char * rec_str )
-{
-    return( ( Uint ) get_ndigit_hex( rec_str + 2, 2 ) - S2_COUNT_OFFSET );
-}
-
-Ulong get_moto_s2_rec_address( char * rec_str )
-{
-    return( get_ndigit_hex( rec_str + 4, 6 ) );
-}
-
-char * get_moto_s2_rec_data_start( char * rec_str )
-{
-    return( rec_str + 10 );
-}
-
-void put_moto_s2_data_rec( Uint count, Ulong address, char * data_str )
-{
-    char    *ptr;
-    Uint    sum = S2_COUNT_OFFSET + count + ( address >> 16 & 0xff ) +
-                                            ( address >>  8 & 0xff ) +
-                                            ( address       & 0xff );
-
-    for ( ptr = data_str ; *ptr != EOS ; ptr += 2 )
-        sum += ( Uint ) get_ndigit_hex( ptr, 2 );
-
-    printf(
-      "S2%02X%06lX%s%02X\n",
-      count + S2_COUNT_OFFSET, address, data_str, ~sum & 0xff
-    );
-}
-
-
-Rec_vitals  motorola_s2_rec =
-{
-    is_moto_s2_data_rec,
-    get_moto_s2_rec_address,
-    get_moto_s2_rec_data_count,
-    MAX_LEN_S2_RECS,            /* Maximum data bytes in a record. */
-    get_moto_s2_rec_data_start,
-    put_moto_s2_data_rec
-};
-
-
-/*------------------------- Motorola S3-record format ------------------------*/
-
-#define S3_COUNT_OFFSET         5
-
-Boolean is_moto_s3_data_rec( char * rec_str )
-{
-    return ( ( rec_str[ 0 ] == 'S' )  &&  ( rec_str[ 1 ] == '3' ) );
-}
-
-Uint get_moto_s3_rec_data_count( char * rec_str )
-{
-    return( ( Uint ) get_ndigit_hex( rec_str + 2, 2 ) - S3_COUNT_OFFSET );
-}
-
-Ulong get_moto_s3_rec_address( char * rec_str )
-{
-    return( get_ndigit_hex( rec_str + 4, 8 ) );
-}
-
-char * get_moto_s3_rec_data_start( char * rec_str )
-{
-    return( rec_str + 12 );
-}
-
-void put_moto_s3_data_rec( Uint count, Ulong address, char * data_str )
-{
-    char    *ptr;
-    Uint     sum = S3_COUNT_OFFSET + count + ( address >> 24 & 0xff ) +
-                                             ( address >> 16 & 0xff ) +
-                                             ( address >>  8 & 0xff ) +
-                                             ( address       & 0xff );
-
-    for ( ptr = data_str ; *ptr != EOS ; ptr += 2 )
-        sum += ( Uint ) get_ndigit_hex( ptr, 2 );
-
-    printf(
-      "S3%02X%08lX%s%02X\n",
-      count + S3_COUNT_OFFSET, address, data_str, ~sum & 0xff
-   );
-}
-
-
-Rec_vitals  motorola_s3_rec =
-{
-    is_moto_s3_data_rec,
-    get_moto_s3_rec_address,
-    get_moto_s3_rec_data_count,
-    MAX_LEN_S3_RECS,            /* Maximum data bytes in a record. */
-    get_moto_s3_rec_data_start,
-    put_moto_s3_data_rec
-};
-
-
-/*-------------------- Put your favorite hex format here ---------------------*/
-
-/*
- *    * * *  The following is a template for an additional hex format:  * * *
- *
- *
- *    Boolean is_X_data_rec( char * rec_str ) {}
- *
- *    Uint get_X_rec_data_count( char * rec_str ) {}
- *
- *    Ulong get_X_rec_address( char * rec_str ) {}
- *
- *    char * get_X_rec_data_start( char * rec_str ) {}
- *
- *    void put_X_data_rec( Uint count, Ulong address, char * data_str ) {}
- *
- *    Rec_vitals  X_rec =
- *    {
- *        is_X_data_rec,
- *        get_X_rec_address,
- *        get_X_rec_data_count,
- *        MAXIMUM DATA BYTES IN A RECORD,
- *        get_X_rec_data_start,
- *        put_X_data_rec
- *    };
- *
- */
-
-/*----------------------------------------------------------------------------*/
-
-
-/*
- *   Put address of additional Rec_vitals structures
- *   in this array, before the NULL entry.
- */
-
-Rec_vitals  *formats[] =
-{
-    &intel_hex,
-    &motorola_s1_rec,
-    &motorola_s2_rec,
-    &motorola_s3_rec,
-    ( Rec_vitals * ) NULL
-};
-
-
-/****   main   *****************************************************************
-*
-*
-*       Expects: Nothing (no command-line parameters).
-*
-*       Returns: Exit status (EXIT_SUCCESS or EXIT_FAILURE).
-*
-*       Reads hex records on the standard input and attempts to
-*       splice adjacent data fields together.  Results appear on
-*       the standard output.
-*
-*******************************************************************************/
-
-int main(
-  int argc,
-  char **argv
-)
-{
-
-    char       inbuff[ MAX_LINE_SIZE ], outbuff[ MAX_LINE_SIZE ];
-    char       *in_dptr, *out_dptr;
-    int        d_total, d_count, d_excess, n;
-    int        length;
-    Ulong      in_rec_addr, out_rec_addr = 0;
-    Rec_vitals *rptr;
-
-
-    /* Sift through file until first hex record is identified.    */
-
-    rptr = identify_first_data_record( inbuff, MAX_LINE_SIZE );
-    if ( rptr == NULL )
-    {
-        fputs( "No hex records found.\n", stderr );
-        exit( EXIT_FAILURE );
-    }
-
-
-    /* Attempt data-record splicing until end-of-file is reached. */
-    d_total = 0;
-    for (;;) {
-        if ( rptr->is_data_record( inbuff ) == YES )
-        { /* Input record is a data record. */
-            d_count     = rptr->get_data_count( inbuff );
-            in_rec_addr = rptr->get_address( inbuff );
-            in_dptr     = rptr->get_data_start( inbuff );
-
-            if ( d_total == 0  ||  in_rec_addr != out_rec_addr + d_total )
-            { /* Begin a new output record. */
-                if ( d_total != 0 )
-                    rptr->put_data_record( d_total, out_rec_addr, outbuff );
-                out_dptr     = outbuff;
-                n = d_total  = d_count;
-                out_rec_addr = in_rec_addr;
-            }
-            else if
-              ( ( d_excess = d_total + d_count - rptr->max_data_count ) > 0 )
-            { /* Output a maximum-length record, then start a new record. */
-                strncat( outbuff, in_dptr, 2 * ( d_count - d_excess ) );
-                rptr->put_data_record(
-                  rptr->max_data_count, out_rec_addr, outbuff
-                );
-                in_dptr      += 2 * ( d_count - d_excess );
-                out_dptr      = outbuff;
-                n = d_total   = d_excess;
-                out_rec_addr += rptr->max_data_count;
-            }
-            else
-            { /* Append input record's data field with accumulated data. */
-                out_dptr = outbuff + ( 2 * d_total );
-                d_total += n = d_count;
-            }
-            strncpy( out_dptr, in_dptr, 2 * n );
-            out_dptr[ 2 * n ] = EOS;
-        }
-        else
-        { /* Not a data record;
-           * flush accumulated data then echo non-data record.
-           */
-            if ( d_total != 0 )
-            {
-                rptr->put_data_record( d_total, out_rec_addr, outbuff );
-                d_total = 0;
-            }
-            puts( inbuff );
-        }
-
-        inbuff[ MAX_LINE_SIZE - 1 ] = '\0';
-        if ( !fgets( inbuff, MAX_LINE_SIZE, stdin ) )
-           break;
-        if ( inbuff[ MAX_LINE_SIZE - 1 ] ) {
-           fprintf( stderr, "Input line too long" );
-           exit( 1 );
-        }
-        length = strlen(inbuff);
-        inbuff[length - 1] = '\0';
-        
-    }
-
-
-    return ( EXIT_SUCCESS );
-
-}
-
-
-/****   identify_first_data_record   *******************************************
-*
-*       Expects: Pointer to hex-record line buffer.
-*
-*       Returns: Pointer to hex-record structure (NULL if no match found).
-*
-*       Reads the standard input, line by line, searching for a valid
-*       record header character.  If a valid header is found, a pointer
-*       to the hex-record's type structure is returned, otherwise NULL.
-*
-*       The input-stream pointer is left pointing to the first valid hex record.
-*
-*******************************************************************************/
-
-Rec_vitals * identify_first_data_record( char * buff_ptr, int max_length )
-{
-    Rec_vitals  ** ptr;
-    int            length;
-
-
-
-    for ( ;; ) {
-
-        buff_ptr[ max_length - 1 ] = '\0';
-        if ( !fgets( buff_ptr, max_length, stdin ) )
-           break;
-        if ( buff_ptr[ max_length - 1 ] ) {
-           fprintf( stderr, "Input line too long" );
-           exit( 1 );
-        }
-        length = strlen(buff_ptr);
-        buff_ptr[length - 1] = '\0';
-
-        for ( ptr = formats ; *ptr != ( Rec_vitals * ) NULL ; ptr++ )
-            if ( ( *ptr )->is_data_record( buff_ptr ) == YES )
-                return( *ptr );        /* Successful return.        */
-
-        puts( buff_ptr );              /* Echo non-hex-record line. */
-    }
-
-    return( ( Rec_vitals * ) NULL );   /* Unsuccessful return.      */
-}
-
-
-/****   get_ndigit_hex   *******************************************************
-*
-*       Expects: Pointer to first ASCII hexadecimal digit, number of digits.
-*
-*       Returns: Value of hexadecimal string as an unsigned long.
-*
-*******************************************************************************/
-
-Ulong get_ndigit_hex( char * cptr, int digits )
-{
-    Ulong    value;
-
-    for ( value = 0 ; --digits >= 0 ; cptr++ )
-        value = ( value * 16L ) + HEX_DIGIT( *cptr );
-
-    return( value );
-}
diff --git a/tools/build/rcs-clean.in b/tools/build/rcs-clean.in
deleted file mode 100644
index 83fed05128..0000000000
--- a/tools/build/rcs-clean.in
+++ /dev/null
@@ -1,73 +0,0 @@
-#!@KSH@ -p
-#
-#  $Id$
-#
-# Delete all files from the current directory that can be recreated
-#  via RCS 'co' commonds
-# Used by 'make clobber'
-#
-
-progname=${0##*/}        # fast basename hack for ksh, bash
-
-USAGE=\
-"usage: $progname [ -v ]"
-
-fatal() {
-    if [ "$1" ]
-    then
-        echo $* >&2
-    fi
-    echo "$USAGE" 1>&2
-    exit 1
-}
-
-#
-# process the options
-#
-
-verbose=""
-
-while getopts v OPT
-do
-    case "$OPT" in
-	v)
-	    verbose="yes";;
-        *)
-            fatal
-    esac
-done
-
-let $((shiftcount = $OPTIND - 1))
-shift $shiftcount
-
-args=$*
-[ "$args" ] && fatal
-
-[ -d RCS/. ] || exit 0
-
-# there is probably a better way to do this
-
-rcs_files=`echo RCS/*,v | sed -e 's?RCS/??g' -e's/,v//g'`
-
-kills=""
-for f in $rcs_files
-do
-   # build list of all files in RCS/*,v that are *not* locked
-   if [ -f $f ] && [ ! -w $f ] && [ -f RCS/$f,v ]
-   then
-        locked=`rlog -L -R $f`
-        [ "$locked" = "" ] && kills="$kills $f"
-   fi
-done
-
-if [ "$kills" ]
-then
-     [ "$verbose" ] && echo rm -f $kills
-     rm -f $kills
-fi
-
-exit 0
-
-# Local Variables: ***
-# mode:ksh ***
-# End: ***
diff --git a/tools/build/scripts/Makefile.in b/tools/build/scripts/Makefile.in
deleted file mode 100644
index 753bfafaa5..0000000000
--- a/tools/build/scripts/Makefile.in
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# $Id$
-#
-# RTEMS build tools
-# NOTE: of course we can't use any of these tools
-#		in this Makefile.  Most notably: install-if-change
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-include $(RTEMS_ROOT)/make/rtems.cfg
-
-DESTDIR=$(PROJECT_RELEASE)/build-tools
-
-BUILD_PGMS=install-if-change rcs-clean lock-directory unlock-directory
-PGMS = $(BUILD_PGMS) search-id.sh
-
-CLEAN_ADDITIONS += $(BUILD_PGMS)
-
-INSTALLED_PGMS=$(PGMS:%=$(DESTDIR)/%)
-
-all:	$(DESTDIR) $(PGMS) install
-
-$(DESTDIR):
-	@INSTALL@ $(INSTDIRFLAGS) $@
-
-$(INSTALLED_PGMS): $(PGMS)
-	@INSTALL@ $(INSTBINFLAGS) $^ $(DESTDIR)
-
-install:  $(DESTDIR) $(INSTALLED_PGMS)
diff --git a/tools/build/scripts/README b/tools/build/scripts/README
deleted file mode 100644
index 0738a5830e..0000000000
--- a/tools/build/scripts/README
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-#  $Id$
-#
-
-Misc. support tools for RTEMS workspaces.
-More will be added later as they are converted from Teamware
-to CVS.
-
-install-if-change
-    Smart install script that also can append suffixes as it
-    installs (suffixes used for debug and profile variants).
-    Requires bash or ksh.
-
-rcs-clean
-    deletes all files from the current directory that can be
-    re-created from RCS.  Careful to not delete locked files.
-    May be used by 'gmake clobber'
-
-lock-directory
-unlock-directory
-    traverse a directory structure making it unwritable.
-    Useful to keep people from accidentally overwriting
-    "released" trees if they get confused about which
-    module they have loaded.
diff --git a/tools/build/scripts/install-if-change.in b/tools/build/scripts/install-if-change.in
deleted file mode 100644
index b2f3cb04bb..0000000000
--- a/tools/build/scripts/install-if-change.in
+++ /dev/null
@@ -1,142 +0,0 @@
-#!@KSH@ -p
-#
-# Either bash or ksh will be ok for this; requires (( )) arithmetic
-#  (-p above just says to not parse $ENV file; makes it faster for
-#   those of us who set $ENV)
-#
-# install files if they have changed by running 'cmp', then 'install'
-#   as necessary.
-#
-#  Optionally, can append a suffix before last existing suffix (if any)
-#
-# NOTE
-#   We avoid using typical install(1M) programs since they have
-#   large variability across systems and we also need to support ou
-#   -V option.
-#   So we just copy and chmod by hand.
-#
-# $Id$
-#
-
-progname=`basename $0`
-#progname=${0##*/}        # fast basename hack for ksh, bash
-
-USAGE=\
-"usage: $progname [ -vmV ] file [ file ... ] dest-directory-or-file
-	-v	    -- verbose
-        -V suffix   -- suffix to append to targets (before any . suffix)
-                        eg: -V _g would change 'foo' to 'foo_g' and
-                                               'libfoo.a' to 'libfoo_g.a'
-        -m mode     -- mode for new file(s)"
-
-fatal() {
-    if [ "$1" ]
-    then
-        echo $* >&2
-    fi
-    echo "$USAGE" 1>&2
-    exit 1
-}
-
-#
-# process the options
-#
-
-verbose=""
-suffix=""
-mode=""
-
-while getopts vm:V: OPT
-do
-    case "$OPT" in
-	v)
-	    verbose="yes";;
-        V)
-            eval suffix=$OPTARG;;
-        m)
-            mode="$OPTARG";;
-        *)
-            fatal
-    esac
-done
-
-shiftcount=`expr $OPTIND - 1`
-shift $shiftcount
-
-args=$*
-
-#
-# Separate source file(s) from dest directory or file
-#
-
-files=""
-dest=""
-for d in $args
-do
-    files="$files $dest"
-    dest=$d
-done
-
-if [ ! "$files" ] || [ ! "$dest" ]
-then
-    fatal "missing files or invalid destination"
-fi
-
-#
-# Process the arguments
-#
-
-targets=""
-for f in $files
-do
-    # leaf=`basename $f`
-    leaf=${f##*/}        # fast basename hack for ksh, bash
-
-    target=$dest
-    if [ -d $dest ]
-    then
-        # if we were given a suffix, then add it as appropriate
-        if [ "$suffix" ]
-        then
-            case $f in
-                *.*)
-                    # leaf=`echo $leaf |
-                    #   /bin/sed "s/\([~\.]*\)\.\(.*\)$/\1$suffix.\2/"`
-                    # ksh,bash hack for above sed script
-                    leaf=${leaf%%.*}$suffix.${leaf#*.}
-
-                    [ "$verbose" = "yes" ] &&
-                      echo "$progname: $f will be installed as $leaf"
-                    ;;
-                *)
-                    leaf=$leaf$suffix;;
-            esac
-        fi
-        target=$target/$leaf
-    fi
-
-    [ ! -r $f ] && fatal "can not read $f"
-
-    if cmp -s $f $target
-    then
-        [ "$verbose" = "yes" ] && echo "'$f' not newer than '$target'"
-    else
-        [ "$verbose" = "yes" ] && echo "rm -f $target"
-        rm -f $target
-        echo "cp -p $f $target"
-        cp -p $f $target || exit 1
-        targets="$targets $target"    # keep list for chmod below
-    fi
-done
-
-if [ "$mode" -a "$targets" ]
-then
-     [ "$verbose" = "yes" ] && echo "chmod $mode $targets"
-     chmod $mode $targets
-fi
-
-exit 0
-
-# Local Variables: ***
-# mode:ksh ***
-# End: ***
diff --git a/tools/build/scripts/lock-directory.in b/tools/build/scripts/lock-directory.in
deleted file mode 100644
index 1c205cdec0..0000000000
--- a/tools/build/scripts/lock-directory.in
+++ /dev/null
@@ -1,43 +0,0 @@
-#!@KSH@
-#
-# $Id$
-#
-# Make a directory write protected
-# Used to write protect the install point after a build
-# to prevent inadvertant overwriting.
-#
-
-# is a particular command available on this machine?
-#
-cmd_avail()
-{
-    set -- `type $1 2>&1`
-    if [ "$2" = "not" -a "$3" = "found" ] || [ "$3" = "not" -a "$4" = "found" ]
-    then
-        return 1
-    else
-        return 0
-    fi
-}
-
-lock_directory() {
-    l_dir=$1/.			# get any symlink out of the way using '.'
-    if [ -d $l_dir ]
-    then
-        find $l_dir -type d -perm -0200 -print | $XARGS chmod -w
-    fi
-}
-
-# Use gnu xargs if available; faster, more reliable in general
-XARGS=xargs
-cmd_avail gxargs && XARGS=gxargs
-
-for dir
-do
-    lock_directory $dir
-done
-
-# Local Variables: ***
-# mode:ksh ***
-# End: ***
-
diff --git a/tools/build/scripts/rcs-clean.in b/tools/build/scripts/rcs-clean.in
deleted file mode 100644
index 83fed05128..0000000000
--- a/tools/build/scripts/rcs-clean.in
+++ /dev/null
@@ -1,73 +0,0 @@
-#!@KSH@ -p
-#
-#  $Id$
-#
-# Delete all files from the current directory that can be recreated
-#  via RCS 'co' commonds
-# Used by 'make clobber'
-#
-
-progname=${0##*/}        # fast basename hack for ksh, bash
-
-USAGE=\
-"usage: $progname [ -v ]"
-
-fatal() {
-    if [ "$1" ]
-    then
-        echo $* >&2
-    fi
-    echo "$USAGE" 1>&2
-    exit 1
-}
-
-#
-# process the options
-#
-
-verbose=""
-
-while getopts v OPT
-do
-    case "$OPT" in
-	v)
-	    verbose="yes";;
-        *)
-            fatal
-    esac
-done
-
-let $((shiftcount = $OPTIND - 1))
-shift $shiftcount
-
-args=$*
-[ "$args" ] && fatal
-
-[ -d RCS/. ] || exit 0
-
-# there is probably a better way to do this
-
-rcs_files=`echo RCS/*,v | sed -e 's?RCS/??g' -e's/,v//g'`
-
-kills=""
-for f in $rcs_files
-do
-   # build list of all files in RCS/*,v that are *not* locked
-   if [ -f $f ] && [ ! -w $f ] && [ -f RCS/$f,v ]
-   then
-        locked=`rlog -L -R $f`
-        [ "$locked" = "" ] && kills="$kills $f"
-   fi
-done
-
-if [ "$kills" ]
-then
-     [ "$verbose" ] && echo rm -f $kills
-     rm -f $kills
-fi
-
-exit 0
-
-# Local Variables: ***
-# mode:ksh ***
-# End: ***
diff --git a/tools/build/scripts/search-id.sh b/tools/build/scripts/search-id.sh
deleted file mode 100644
index a94d2d7cc9..0000000000
--- a/tools/build/scripts/search-id.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-#
-#  $Id$
-#
-
-find $1 -type f -a ! -name "*.scn" -a ! -name "bsp_specs" -a \
-	-print  > /tmp/$$.0
-find $1 -type f -a ! -name "*.scn" -a ! -name "bsp_specs" -a \
-	-exec grep -l '$Id' {} \;  > /tmp/$$.1
-
-diff /tmp/$$.0 /tmp/$$.1 > /tmp/$$.2
-
-grep "<" /tmp/$$.2 | sed 's/< //' >&1
-
-rm -f /tmp/$$*
diff --git a/tools/build/scripts/unlock-directory.in b/tools/build/scripts/unlock-directory.in
deleted file mode 100644
index c63ceff881..0000000000
--- a/tools/build/scripts/unlock-directory.in
+++ /dev/null
@@ -1,41 +0,0 @@
-#!@KSH@
-#
-# $Id$
-#
-# Unlock a directory processed by lock_directory
-#
-
-# is a particular command available on this machine?
-#
-cmd_avail()
-{
-    set -- `type $1 2>&1`
-    if [ "$2" = "not" -a "$3" = "found" ] || [ "$3" = "not" -a "$4" = "found" ]
-    then
-        return 1
-    else
-        return 0
-    fi
-}
-
-unlock_directory() {
-    ul_dir=$1/.  		# get any symlink out of the way using '.'
-    if [ -d $ul_dir ]
-    then
-        find $ul_dir -type d ! -perm -0222 -print | $XARGS -t chmod +w
-    fi
-}
-
-# Use gnu xargs if available; faster, more reliable in general
-XARGS=xargs
-cmd_avail gxargs && XARGS=gxargs
-
-for dir
-do
-    unlock_directory $dir
-done
-
-# Local Variables: ***
-# mode:ksh ***
-# End: ***
-
diff --git a/tools/build/search-id.sh b/tools/build/search-id.sh
deleted file mode 100755
index a94d2d7cc9..0000000000
--- a/tools/build/search-id.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-#
-#  $Id$
-#
-
-find $1 -type f -a ! -name "*.scn" -a ! -name "bsp_specs" -a \
-	-print  > /tmp/$$.0
-find $1 -type f -a ! -name "*.scn" -a ! -name "bsp_specs" -a \
-	-exec grep -l '$Id' {} \;  > /tmp/$$.1
-
-diff /tmp/$$.0 /tmp/$$.1 > /tmp/$$.2
-
-grep "<" /tmp/$$.2 | sed 's/< //' >&1
-
-rm -f /tmp/$$*
diff --git a/tools/build/src/Makefile.in b/tools/build/src/Makefile.in
deleted file mode 100644
index 52942d909f..0000000000
--- a/tools/build/src/Makefile.in
+++ /dev/null
@@ -1,70 +0,0 @@
-#
-# $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-exec_prefix = @exec_prefix@
-bindir = @bindir@
-libdir = @libdir@
-includedir = @includedir@
-manext = 1
-mandir = @mandir@/man$(manext)
-
-# FIXME: $EXEEXT should be set in a central cfg-file used for native 
-#        compiling (e.g. gcc.cfg) instead of setting EXEEXE here.
-EXEEXT=@EXEEXT@
-
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-# we use host compiler in this directory
-USE_HOST_COMPILER=yes
-
-# C source names, if any, go here -- minus the .c
-C_PIECES=cklength eolstrip packhex unhex
-C_FILES=$(C_PIECES:%=%.c)
-C_O_FILES=$(C_PIECES:%=$(ARCH)/%.o)
-
-H_FILES=
-
-SRCS=$(C_FILES) $(CC_FILES) $(H_FILES)
-OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
-
-# FIXME: building into $(ARCH) doesn't make sense for host programs
-PGMS=$(ARCH)/cklength$(EXEEXT) $(ARCH)/eolstrip$(EXEEXT) \
-	$(ARCH)/packhex$(EXEEXT) $(ARCH)/unhex$(EXEEXT)
-
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES  +=
-CPPFLAGS += -I.
-CFLAGS   +=
-
-LD_PATHS  +=
-LD_LIBS   +=
-LDFLAGS   +=
-
-#
-# Add your list of files to delete here.  The config files
-#  already know how to delete some stuff, so you may want
-#  to just run 'make clean' first to see what gets missed.
-#  'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS += $(HOST_ARCH)
-CLOBBER_ADDITIONS +=
-
-DESTDIR=${PROJECT_RELEASE}/build-tools
-
-$(DESTDIR):
-	@INSTALL@ $(INSTDIRFLAGS) $@
-
-all:	$(ARCH) $(DESTDIR) $(SRCS) $(PGMS)
-	@INSTALL@ $(INSTBINFLAGS) $(PGMS) $(DESTDIR)
diff --git a/tools/build/src/cklength.c b/tools/build/src/cklength.c
deleted file mode 100644
index 624bf25e70..0000000000
--- a/tools/build/src/cklength.c
+++ /dev/null
@@ -1,377 +0,0 @@
-/*
- *  cklength - check the length of lines in a file
- *
- *  This program check to see if the files passed to it on the command line
- *  contain a line which exceeds the maximum allowable length.  The default
- *  maximum line length is 80.
- *
- *  usage:  cklength  [ -v ] [ arg ... ] files...
- *           -l length   -- maximum line length
- *           -v          -- verbose
- *
- * $Id$
- */
-
-#define GETOPTARGS "l:nNv"
-
-char *USAGE = "\
-usage:  cklength  [ -v ] [ arg ... ] files... \n\
-            -l length   -- maximum line length\n\
-            -n          -- report line numbers for offending lines\n\
-            -N          -- report line numbers and length for offending lines\n\
-            -v          -- verbose\n\
-\n\
-Print the name of files which have at least 1 line which exceeds the\n\
-maximum line length.  The default maximum line length is 80.\n\
-";
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <memory.h>
-#include <stdarg.h>
-#include <errno.h>
-
-#include "config.h"
-
-#ifndef VMS
-#ifndef HAVE_STRERROR
-extern int sys_nerr;
-extern char *sys_errlist[];
-
-#define strerror( _err ) \
-  ((_err) < sys_nerr) ? sys_errlist [(_err)] : "unknown error"
-
-#else   /* HAVE_STRERROR */
-char *strerror ();
-#endif
-#else   /* VMS */
-char *strerror (int,...);
-#endif
-
-
-#define BUFFER_SIZE     512
-
-#define SUCCESS         0
-#define FAILURE         -1
-#define Failed(x)       (((int) (x)) == FAILURE)
-#define TRUE    1
-#define FALSE   0
-#define STREQ(a,b)      (strcmp(a,b) == 0)
-#define NUMELEMS(arr)   (sizeof(arr) / sizeof(arr[0]))
-
-/*
- * Definitions for unsigned "ints"; especially for use in data structures
- *  that will be shared among (potentially) different cpu's (we punt on
- *  byte ordering problems tho)
- */
-
-typedef unsigned char   u8;
-typedef unsigned short  u16;
-typedef unsigned long   u32;
-
-/*
- * vars controlled by command line options
- */
-
-int verbose = FALSE;                    /* be verbose */
-int report_line_numbers = FALSE;        /* report line numbers of offenders */
-int report_line_length = FALSE;         /* report line length of offenders */
-
-int line_length = 80;                   /* maximum allowable line length */
-
-extern char *optarg;                    /* getopt(3) control vars */
-extern int optind, opterr;
-
-char *progname;                         /* for error() */
-
-int process(char *arg);
-void error(int errn, ...);
-long getparm(char *s, long min, long max, char *msg);
-
-#define ERR_ERRNO  (1<<((sizeof(int) * 8) - 2)) /* hi bit; use 'errno' */
-#define ERR_FATAL  (ERR_ERRNO / 2)              /* fatal error ; no return */
-#define ERR_ABORT  (ERR_ERRNO / 4)              /* fatal error ; abort */
-#define ERR_MASK   (ERR_ERRNO | ERR_FATAL | ERR_ABORT) /* all */
-
-#define stol(p) strtol(p, (char **) NULL, 0)
-int  Open(), Read(), Write();
-
-int main(
-  int argc,
-  char **argv
-)
-{
-    register int c;
-    int showusage = FALSE;                      /* usage error? */
-    int rc = 0;
-
-    /*
-     * figure out invocation leaf-name
-     */
-
-    if ((progname = strrchr(argv[0], '/')) == (char *) NULL)
-        progname = argv[0];
-    else
-        progname++;
-
-    argv[0] = progname;                         /* for getopt err reporting */
-
-    /*
-     *  Check options and arguments.
-     */
-
-    opterr = 0;                                 /* we'll report all errors */
-    while ((c = getopt(argc, argv, GETOPTARGS)) != EOF)
-        switch (c)
-        {
-            case 'l':                            /* line length */
-                line_length = atoi( optarg );
-                if ( line_length < 0 || line_length > BUFFER_SIZE )
-                  error(ERR_FATAL, "(%d) is illegal line length\n",line_length);
-                break;
-
-            case 'n':                           /* toggle report_line_numbers */
-                report_line_numbers = ! report_line_numbers;
-                break;
-
-            case 'N':                           /* toggle both reports */
-                report_line_numbers = ! report_line_numbers;
-                report_line_length  = ! report_line_length;
-                break;
-
-            case 'v':                           /* toggle verbose */
-                verbose = ! verbose;
-                break;
-
-            case '?':
-                showusage = TRUE;
-        }
-
-    if (showusage)
-    {
-        (void) fprintf(stderr, "%s", USAGE);
-        exit(1);
-    }
-
-    /*
-     *  traverse and process the arguments
-     */
-
-    for ( ; argv[optind]; optind++)
-        if (Failed(process(argv[optind])))
-            rc = FAILURE;
-
-    return rc;
-}
-
-
-/*
- * process(arg)
- */
-
-int
-process(char *arg)
-{
-  FILE   *in;
-  char   *bptr;
-  char    buffer[ BUFFER_SIZE ];
-  int     line_number;
-  int     length;
-  int     count;
-  int     rc = SUCCESS;  /* succeed by default */
-
-  in = fopen( arg, "r" );
-  if (!in)
-    error( ERR_ERRNO | ERR_FATAL, "Unable to open file (%s)\n", arg );
-
-  count = 0;
-
-  for ( line_number=1 ; ; line_number++ ) {
-    bptr = fgets( buffer, BUFFER_SIZE, in );
-    if (!bptr)
-      break;
-
-    /*
-     *  Don't count the carriage return.
-     */
-
-    length = strlen( buffer ) - 1;
-
-    if ( length <= line_length )
-      continue;
-
-    if ( count == 0 ) {
-      fprintf( stderr, "%s\n", arg );
-      if ( !report_line_numbers )
-        break;
-    }
-
-    if ( verbose )
-      fprintf( stderr, "TOO LONG:%d: %s\n", line_number, buffer );
-
-    if ( report_line_numbers ) {
-      if ( report_line_length )
-        fprintf( stderr, "%d: %d\n" , line_number, length );
-      else
-        fprintf( stderr, "%d\n" , line_number );
-    }
-
-    count++;
-
-  }
-
-  fclose( in );
-  return rc;
-}
-
-/*
- * error(errn, arglist)
- *      report an error to stderr using printf(3) conventions.
- *      Any output is preceded by '<progname>: '
- *
- * Uses ERR_FATAL bit to request exit(errn)
- *      ERR_ABORT to request abort()
- *      ERR_ERRNO to indicate use of errno instead of argument.
- *
- * If resulting 'errn' is non-zero, it is assumed to be an 'errno' and its
- *      associated error message is appended to the output.
- */
-
-/*VARARGS*/
-
-void
-error(int error_flag, ...)
-{
-    va_list arglist;
-    register char *format;
-    int local_errno;
-
-    extern int errno;
-
-    (void) fflush(stdout);          /* in case stdout/stderr same */
-
-    local_errno = error_flag & ~ERR_MASK;
-    if (error_flag & ERR_ERRNO)     /* use errno? */
-        local_errno = errno;
-
-    va_start(arglist, error_flag);
-    format = va_arg(arglist, char *);
-    (void) fprintf(stderr, "%s: ", progname);
-    (void) vfprintf(stderr, format, arglist);
-    va_end(arglist);
-
-    if (local_errno)
-      (void) fprintf(stderr, " (%s)\n", strerror(local_errno));
-
-    (void) fflush(stderr);
-
-    if (error_flag & (ERR_FATAL | ERR_ABORT))
-    {
-        if (error_flag & ERR_FATAL)
-        {
-            error(0, "fatal error, exiting");
-            exit(local_errno ? local_errno : 1);
-        }
-        else
-        {
-            error(0, "fatal error, aborting");
-            abort();
-        }
-    }
-}
-
-long
-getparm(char *s,
-        long min,
-        long max,
-        char *msg)
-{
-    long val;
-
-    if ( ! strchr("0123456789-", *s))
-    {
-        error(ERR_FATAL, "'%s' is not a number", s);
-        return min;
-    }
-
-    val = strtol(s, (char **) NULL, 0);
-    if ((val < min) || (val > max))
-    {
-        if (min == max)
-            error(ERR_FATAL, "%s can only be %ld", s, min);
-        else
-            error(ERR_FATAL, "%s must be between %ld and %ld", msg, min, max);
-    }
-
-    return val;
-}
-
-
-/*
- * Open()
- *      Perform open(2), returning the file descriptor.  Prints
- *      error message if open fails.
- */
-
-int
-Open(char *file,
-     int oflag,
-     int mode)
-{
-    int O_fd;
-
-    if (Failed(O_fd = open(file, oflag, mode)))
-        error(
-          ERR_ERRNO | ERR_FATAL,
-          "open('%s', 0x%x, 0%o) failed", file, oflag, mode
-        );
-
-    return O_fd;
-}
-
-/*
- * Read()
- *      Perform read(2); prints error message if fails.
- */
-
-int
-Read(int file,
-     char *buffer,
-     unsigned int count)
-{
-    int nbytes;
-
-    if (Failed(nbytes = read(file, buffer, count)))
-        error(
-          ERR_ERRNO | ERR_FATAL,
-          "read(%d, 0x%x, %d) failed", file, buffer, count
-         );
-
-    return nbytes;
-}
-
-/*
- * Write()
- *      Perform write(2); prints error message if fails.
- */
-
-int
-Write(int file,
-      char *buffer,
-      unsigned int count)
-{
-    int nbytes;
-
-    if (Failed(nbytes = write(file, buffer, count)))
-        error(
-          ERR_ERRNO | ERR_FATAL,
-          "write(%d, 0x%x, %d) failed", file, buffer, count
-        );
-
-    return nbytes;
-}
diff --git a/tools/build/src/config.h.in b/tools/build/src/config.h.in
deleted file mode 100644
index cebd2bcad4..0000000000
--- a/tools/build/src/config.h.in
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- *  This file is editted automatically by autoconf.
- *
- *  $Id$
- */
-
-/* Define if you have the strerror function.  */
-#undef HAVE_STRERROR
-
diff --git a/tools/build/src/eolstrip.c b/tools/build/src/eolstrip.c
deleted file mode 100644
index c944ae6663..0000000000
--- a/tools/build/src/eolstrip.c
+++ /dev/null
@@ -1,366 +0,0 @@
-/*
- *  eolstrip - strip white space from end of lines
- *
- *  This program strips the white space from the end of every line in the
- *  specified program.
- *
- *  usage:  eolstrip  [ -v ] [ arg ... ] files...
- *           -v          -- verbose
- *
- * $Id$
- */
-
-#define GETOPTARGS "vt"
-
-char *USAGE = "\
-usage:  cklength  [ -v ] [ arg ... ] files... \n\
-            -v          -- verbose\n\
-            -t          -- test only .. DO NOT OVERWRITE FILE!!!\n\
-\n\
-Strip the white space from the end of every line on the list of files.\n\
-";
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <memory.h>
-#include <stdarg.h>
-#include <errno.h>
-
-#include "config.h"
-
-#ifndef VMS
-#ifndef HAVE_STRERROR
-extern int sys_nerr;
-extern char *sys_errlist[];
-
-#define strerror( _err ) \
-  ((_err) < sys_nerr) ? sys_errlist [(_err)] : "unknown error"
-
-#else   /* HAVE_STRERROR */
-char *strerror ();
-#endif
-#else   /* VMS */
-char *strerror (int,...);
-#endif
-
-
-#define BUFFER_SIZE     2048
-#define MAX_PATH        2048
-
-#define SUCCESS         0
-#define FAILURE         -1
-#define Failed(x)       (((int) (x)) == FAILURE)
-#define TRUE    1
-#define FALSE   0
-#define STREQ(a,b)      (strcmp(a,b) == 0)
-#define NUMELEMS(arr)   (sizeof(arr) / sizeof(arr[0]))
-
-/*
- * Definitions for unsigned "ints"; especially for use in data structures
- *  that will be shared among (potentially) different cpu's (we punt on
- *  byte ordering problems tho)
- */
-
-typedef unsigned char   u8;
-typedef unsigned short  u16;
-typedef unsigned long   u32;
-
-/*
- * vars controlled by command line options
- */
-
-int verbose = FALSE;                    /* be verbose */
-int test_only = FALSE;                  /* test only */
-
-extern char *optarg;                    /* getopt(3) control vars */
-extern int optind, opterr;
-
-char *progname;                         /* for error() */
-
-int process(char *arg);
-void error(int errn, ...);
-long getparm(char *s, long min, long max, char *msg);
-
-#define ERR_ERRNO  (1<<((sizeof(int) * 8) - 2)) /* hi bit; use 'errno' */
-#define ERR_FATAL  (ERR_ERRNO / 2)              /* fatal error ; no return */
-#define ERR_ABORT  (ERR_ERRNO / 4)              /* fatal error ; abort */
-#define ERR_MASK   (ERR_ERRNO | ERR_FATAL | ERR_ABORT) /* all */
-
-#define stol(p) strtol(p, (char **) NULL, 0)
-int  Open(), Read(), Write();
-
-int main(
-  int argc,
-  char **argv
-)
-{
-    register int c;
-    int showusage = FALSE;                      /* usage error? */
-    int rc = 0;
-
-    /*
-     * figure out invocation leaf-name
-     */
-
-    if ((progname = strrchr(argv[0], '/')) == (char *) NULL)
-        progname = argv[0];
-    else
-        progname++;
-
-    argv[0] = progname;                         /* for getopt err reporting */
-
-    /*
-     *  Check options and arguments.
-     */
-
-    opterr = 0;                                 /* we'll report all errors */
-    while ((c = getopt(argc, argv, GETOPTARGS)) != EOF)
-        switch (c)
-        {
-            case 't':                           /* toggle test only mode */
-                test_only = ! test_only;
-                break;
-
-            case 'v':                           /* toggle verbose */
-                verbose = ! verbose;
-                break;
-
-            case '?':
-                showusage = TRUE;
-        }
-
-    if (showusage)
-    {
-        (void) fprintf(stderr, "%s", USAGE);
-        exit(1);
-    }
-
-    /*
-     *  traverse and process the arguments
-     */
-
-    for ( ; argv[optind]; optind++)
-        if (Failed(process(argv[optind])))
-            rc = FAILURE;
-
-    return rc;
-}
-
-
-/*
- * process(arg)
- */
-
-int
-process(char *arg)
-{
-  FILE   *in;
-  FILE   *out = (FILE *) 0;
-  char    outname[ MAX_PATH ];
-  char   *bptr;
-  char    buffer[ BUFFER_SIZE ];
-  int     length;
-  int     line_number;
-  int     rc = SUCCESS;  /* succeed by default */
-
-  in = fopen( arg, "r" );
-  if (!in)
-    error( ERR_ERRNO | ERR_FATAL, "Unable to open file (%s)\n", arg );
-
-  if ( !test_only ) {
-    sprintf( outname, "%s.eoltmp", arg );
-
-    out = fopen( outname, "w" );
-    if (!out)
-      error( ERR_ERRNO | ERR_FATAL, "Unable to open file (%s)\n", arg );
-  }
-
-  if ( verbose )
-    fprintf( stderr, "Processing %s\n", arg );
-
-  for ( line_number=1 ; ; line_number++ ) {
-    bptr = fgets( buffer, BUFFER_SIZE, in );
-    if (!bptr)
-      break;
-
-    /*
-     *  Don't count the carriage return.
-     */
-
-    length = strlen( buffer ) - 1;
-
-    if ( buffer[ length ] != '\n' )
-      error(ERR_ERRNO|ERR_FATAL, "Line %d too long in %s\n", line_number, arg);
-
-    while ( isspace( (int) buffer[ length ] ) )
-      buffer[ length-- ] = '\0';
-
-    if ( test_only ) {
-      fprintf( stderr, "%s\n", arg );
-      break;
-    }
-
-    fprintf( out, "%s\n", buffer );
-  }
-
-  fclose( in );
-  if ( !test_only ) {
-    fclose( out );
-    rename( outname, arg );
-  }
-  return rc;
-}
-
-/*
- * error(errn, arglist)
- *      report an error to stderr using printf(3) conventions.
- *      Any output is preceded by '<progname>: '
- *
- * Uses ERR_FATAL bit to request exit(errn)
- *      ERR_ABORT to request abort()
- *      ERR_ERRNO to indicate use of errno instead of argument.
- *
- * If resulting 'errn' is non-zero, it is assumed to be an 'errno' and its
- *      associated error message is appended to the output.
- */
-
-/*VARARGS*/
-
-void
-error(int error_flag, ...)
-{
-    va_list arglist;
-    register char *format;
-    int local_errno;
-
-    extern int errno;
-
-    (void) fflush(stdout);          /* in case stdout/stderr same */
-
-    local_errno = error_flag & ~ERR_MASK;
-    if (error_flag & ERR_ERRNO)     /* use errno? */
-        local_errno = errno;
-
-    va_start(arglist, error_flag);
-    format = va_arg(arglist, char *);
-    (void) fprintf(stderr, "%s: ", progname);
-    (void) vfprintf(stderr, format, arglist);
-    va_end(arglist);
-
-    if (local_errno)
-      (void) fprintf(stderr, " (%s)\n", strerror(local_errno));
-    else
-      (void) fprintf(stderr, "\n");
-
-    (void) fflush(stderr);
-
-    if (error_flag & (ERR_FATAL | ERR_ABORT))
-    {
-        if (error_flag & ERR_FATAL)
-        {
-            error(0, "fatal error, exiting");
-            exit(local_errno ? local_errno : 1);
-        }
-        else
-        {
-            error(0, "fatal error, aborting");
-            abort();
-        }
-    }
-}
-
-long
-getparm(char *s,
-        long min,
-        long max,
-        char *msg)
-{
-    long val;
-
-    if ( ! strchr("0123456789-", *s))
-    {
-        error(ERR_FATAL, "'%s' is not a number", s);
-        return min;
-    }
-
-    val = strtol(s, (char **) NULL, 0);
-    if ((val < min) || (val > max))
-    {
-        if (min == max)
-            error(ERR_FATAL, "%s can only be %ld", s, min);
-        else
-            error(ERR_FATAL, "%s must be between %ld and %ld", msg, min, max);
-    }
-
-    return val;
-}
-
-
-/*
- * Open()
- *      Perform open(2), returning the file descriptor.  Prints
- *      error message if open fails.
- */
-
-int
-Open(char *file,
-     int oflag,
-     int mode)
-{
-    int O_fd;
-
-    if (Failed(O_fd = open(file, oflag, mode)))
-        error(
-          ERR_ERRNO | ERR_FATAL,
-          "open('%s', 0x%x, 0%o) failed", file, oflag, mode
-        );
-
-    return O_fd;
-}
-
-/*
- * Read()
- *      Perform read(2); prints error message if fails.
- */
-
-int
-Read(int file,
-     char *buffer,
-     unsigned int count)
-{
-    int nbytes;
-
-    if (Failed(nbytes = read(file, buffer, count)))
-        error(
-          ERR_ERRNO | ERR_FATAL,
-          "read(%d, 0x%x, %d) failed", file, buffer, count
-        );
-
-    return nbytes;
-}
-
-/*
- * Write()
- *      Perform write(2); prints error message if fails.
- */
-
-int
-Write(int file,
-      char *buffer,
-      unsigned int count)
-{
-    int nbytes;
-
-    if (Failed(nbytes = write(file, buffer, count)))
-        error(
-          ERR_ERRNO | ERR_FATAL,
-          "write(%d, 0x%x, %d) failed", file, buffer, count
-        );
-
-    return nbytes;
-}
diff --git a/tools/build/src/packhex.c b/tools/build/src/packhex.c
deleted file mode 100644
index 3b85a7c927..0000000000
--- a/tools/build/src/packhex.c
+++ /dev/null
@@ -1,565 +0,0 @@
-
-/*****  P A C K H E X . C  ************************************************
- *
- *   Packhex is a hex-file compaction utility.  It attempts to concatenate
- *   hex records to produce more size-efficient packaging.
- *
- *   Limitations: Input files must be correctly formatted.  This utility
- *                is not robust enough to detect hex-record formatting
- *                errors.
- *
- *   Published:   May 1993 Embedded Systems Programming magazine
- *                "Creating Faster Hex Files"
- *
- *   URL:         ESP magazine: http://www.embedded.com
- *                Source Code:  ftp://ftp.mfi.com/pub/espmag/1993/pakhex.zip
- *
- *   Author:      Mark Gringrich
- *
- *   Compiler:    Microsoft C 6.0
- *                cl /F 1000 packhex.c
- *
- *
- *   $Id$
- *
- **************************************************************************/
-
-
-/* #define SMALLER_RECORDS */
-#ifdef SMALLER_RECORDS
-#define MAX_LEN_S1_RECS 128
-#define MAX_LEN_S2_RECS 128
-#define MAX_LEN_S3_RECS 128
-#else
-#define MAX_LEN_S1_RECS 252
-#define MAX_LEN_S2_RECS 251
-#define MAX_LEN_S3_RECS 250
-#endif
-
-
-/*--------------------------------- includes ---------------------------------*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "config.h"
-
-#ifndef VMS
-#ifndef HAVE_STRERROR
-extern int sys_nerr;
-extern char *sys_errlist[];
-
-#define strerror( _err ) \
-  ((_err) < sys_nerr) ? sys_errlist [(_err)] : "unknown error"
-
-#else   /* HAVE_STRERROR */
-char *strerror ();
-#endif
-#else   /* VMS */
-char *strerror (int,...);
-#endif
-
-#if defined(__unix__) && !defined(EXIT_FAILURE)
-#define EXIT_FAILURE -1
-#define EXIT_SUCCESS  0
-#endif
-
-/*--------------------------------- defines ----------------------------------*/
-
-#define YES                   1
-#define MAX_LINE_SIZE       600
-#define EOS                 '\0'
-
-
-/*---------------------------------- macros ----------------------------------*/
-
-/* Convert ASCII hexadecimal digit to value. */
-
-#define HEX_DIGIT( C )   ( ( ( ( C ) > '9' ) ? ( C ) + 25 : ( C ) ) & 0xF )
-
-
-/*--------------------------------- typedefs ---------------------------------*/
-
-typedef unsigned char   Boolean;
-typedef unsigned char   Uchar;
-typedef unsigned int    Uint;
-typedef unsigned long   Ulong;
-
-typedef struct   /* Functions and constant returning Hex-record vital stats. */
-{
-    Boolean    ( *is_data_record  )( char *              );
-    Ulong      ( *get_address     )( char *              );
-    Uint       ( *get_data_count  )( char *              );
-    const Uint    max_data_count;
-    char      *( *get_data_start  )( char *              );
-    void       ( *put_data_record )( Uint, Ulong, char * );
-} Rec_vitals;
-
-
-/*--------------------------- function prototypes ----------------------------*/
-
-Rec_vitals  * identify_first_data_record( char *, int );
-Ulong         get_ndigit_hex( char *, int );
-
-
-/*----------------------------- Intel Hex format -----------------------------*/
-
-/*
- *    Intel Hex data-record layout
- *
- *    :aabbbbccd...dee
- *
- *    :      - header character
- *    aa     - record data byte count, a 2-digit hex value
- *    bbbb   - record address, a 4-digit hex value
- *    cc     - record type, a 2-digit hex value:
- *              "00" is a data record
- *              "01" is an end-of-data record
- *              "02" is an extended-address record
- *              "03" is a start record
- *    d...d  - data (always an even number of chars)
- *    ee     - record checksum, a 2-digit hex value
- *             checksum = 2's complement
- *                 [ (sum of bytes: aabbbbccd...d) modulo 256 ]
- */
-
-
-Boolean is_intel_data_rec( char * rec_str )
-{
-    return( ( rec_str[ 0 ] == ':' )  &&  ( rec_str[ 8 ] == '0' ) );
-}
-
-Uint get_intel_rec_data_count( char * rec_str )
-{
-    return( ( Uint ) get_ndigit_hex( rec_str + 1, 2 ) );
-}
-
-Ulong get_intel_rec_address( char * rec_str )
-{
-    return( get_ndigit_hex( rec_str + 3, 4 ) );
-}
-
-char * get_intel_rec_data_start( char * rec_str )
-{
-    return( rec_str + 9 );
-}
-
-void put_intel_data_rec( Uint count, Ulong address, char * data_str )
-{
-    char    *ptr;
-    Uint    sum = count + ( address >> 8 & 0xff ) + ( address & 0xff );
-
-    for ( ptr = data_str ; *ptr != EOS ; ptr += 2 )
-        sum += ( Uint ) get_ndigit_hex( ptr, 2 );
-
-    printf(
-      ":%02X%04lX00%s%02X\n", count, address, data_str, (~sum + 1) & 0xff
-    );
-}
-
-
-Rec_vitals  intel_hex =
-{
-    is_intel_data_rec,
-    get_intel_rec_address,
-    get_intel_rec_data_count,
-    255,                        /* Maximum data bytes in a record. */
-    get_intel_rec_data_start,
-    put_intel_data_rec
-};
-
-
-/*------------------------- Motorola S1-record format ------------------------*/
-
-/*
- *    Motorola S-record data-record layout
- *
- *    Sabbc...cd...dee
- *
- *    S      - header character
- *    a      - record type, a 1-digit value:
- *               "0" is a header record
- *               "1" is a 2-byte-address data record
- *               "2" is a 3-byte-address data record
- *               "3" is a 4-byte-address data record
- *               "7" is a 4-byte-address end-of-data record
- *               "8" is a 3-byte-address end-of-data record
- *               "9" is a 2-byte-address end-of-data record
- *    bb     - record length in bytes, a 2-digit hex value
- *             (record length doesn't count the header/type
- *              chars and checksum byte)
- *    c...c  - record address, a 4-, 6-, or 8-digit value,
- *               depending on record type
- *    d...d  - data (always an even number of chars)
- *    ee     - record checksum, a 2-digit hex value
- *             checksum = 1's complement
- *             [ (sum of all bytes: bbc..cd...d) modulo 256 ]
- */
-
-#define S1_COUNT_OFFSET         3
-
-
-Boolean is_moto_s1_data_rec( char * rec_str )
-{
-    return ( ( rec_str[ 0 ] == 'S' )  &&  ( rec_str[ 1 ] == '1' ) );
-}
-
-Uint get_moto_s1_rec_data_count( char * rec_str )
-{
-    return( ( Uint ) get_ndigit_hex( rec_str + 2, 2 ) - S1_COUNT_OFFSET );
-}
-
-Ulong get_moto_s1_rec_address( char * rec_str )
-{
-    return( get_ndigit_hex( rec_str + 4, 4 ) );
-}
-
-char * get_moto_s1_rec_data_start( char * rec_str )
-{
-    return( rec_str + 8 );
-}
-
-void put_moto_s1_data_rec( Uint count, Ulong address, char * data_str )
-{
-    char   *ptr;
-    Uint    sum = S1_COUNT_OFFSET + count +
-                    ( address >> 8 & 0xff ) + ( address & 0xff );
-
-    for ( ptr = data_str ; *ptr != EOS ; ptr += 2 )
-        sum += ( Uint ) get_ndigit_hex( ptr, 2 );
-
-    printf(
-      "S1%02X%04lX%s%02X\n",
-      count + S1_COUNT_OFFSET, address, data_str, ~sum & 0xff
-    );
-}
-
-
-Rec_vitals  motorola_s1_rec =
-{
-    is_moto_s1_data_rec,
-    get_moto_s1_rec_address,
-    get_moto_s1_rec_data_count,
-    MAX_LEN_S1_RECS,            /* Maximum data bytes in a record. */
-    get_moto_s1_rec_data_start,
-    put_moto_s1_data_rec
-};
-
-
-/*------------------------- Motorola S2-record format ------------------------*/
-
-#define S2_COUNT_OFFSET         4
-
-Boolean is_moto_s2_data_rec( char * rec_str )
-{
-    return ( ( rec_str[ 0 ] == 'S' )  &&  ( rec_str[ 1 ] == '2' ) );
-}
-
-Uint get_moto_s2_rec_data_count( char * rec_str )
-{
-    return( ( Uint ) get_ndigit_hex( rec_str + 2, 2 ) - S2_COUNT_OFFSET );
-}
-
-Ulong get_moto_s2_rec_address( char * rec_str )
-{
-    return( get_ndigit_hex( rec_str + 4, 6 ) );
-}
-
-char * get_moto_s2_rec_data_start( char * rec_str )
-{
-    return( rec_str + 10 );
-}
-
-void put_moto_s2_data_rec( Uint count, Ulong address, char * data_str )
-{
-    char    *ptr;
-    Uint    sum = S2_COUNT_OFFSET + count + ( address >> 16 & 0xff ) +
-                                            ( address >>  8 & 0xff ) +
-                                            ( address       & 0xff );
-
-    for ( ptr = data_str ; *ptr != EOS ; ptr += 2 )
-        sum += ( Uint ) get_ndigit_hex( ptr, 2 );
-
-    printf(
-      "S2%02X%06lX%s%02X\n",
-      count + S2_COUNT_OFFSET, address, data_str, ~sum & 0xff
-    );
-}
-
-
-Rec_vitals  motorola_s2_rec =
-{
-    is_moto_s2_data_rec,
-    get_moto_s2_rec_address,
-    get_moto_s2_rec_data_count,
-    MAX_LEN_S2_RECS,            /* Maximum data bytes in a record. */
-    get_moto_s2_rec_data_start,
-    put_moto_s2_data_rec
-};
-
-
-/*------------------------- Motorola S3-record format ------------------------*/
-
-#define S3_COUNT_OFFSET         5
-
-Boolean is_moto_s3_data_rec( char * rec_str )
-{
-    return ( ( rec_str[ 0 ] == 'S' )  &&  ( rec_str[ 1 ] == '3' ) );
-}
-
-Uint get_moto_s3_rec_data_count( char * rec_str )
-{
-    return( ( Uint ) get_ndigit_hex( rec_str + 2, 2 ) - S3_COUNT_OFFSET );
-}
-
-Ulong get_moto_s3_rec_address( char * rec_str )
-{
-    return( get_ndigit_hex( rec_str + 4, 8 ) );
-}
-
-char * get_moto_s3_rec_data_start( char * rec_str )
-{
-    return( rec_str + 12 );
-}
-
-void put_moto_s3_data_rec( Uint count, Ulong address, char * data_str )
-{
-    char    *ptr;
-    Uint     sum = S3_COUNT_OFFSET + count + ( address >> 24 & 0xff ) +
-                                             ( address >> 16 & 0xff ) +
-                                             ( address >>  8 & 0xff ) +
-                                             ( address       & 0xff );
-
-    for ( ptr = data_str ; *ptr != EOS ; ptr += 2 )
-        sum += ( Uint ) get_ndigit_hex( ptr, 2 );
-
-    printf(
-      "S3%02X%08lX%s%02X\n",
-      count + S3_COUNT_OFFSET, address, data_str, ~sum & 0xff
-   );
-}
-
-
-Rec_vitals  motorola_s3_rec =
-{
-    is_moto_s3_data_rec,
-    get_moto_s3_rec_address,
-    get_moto_s3_rec_data_count,
-    MAX_LEN_S3_RECS,            /* Maximum data bytes in a record. */
-    get_moto_s3_rec_data_start,
-    put_moto_s3_data_rec
-};
-
-
-/*-------------------- Put your favorite hex format here ---------------------*/
-
-/*
- *    * * *  The following is a template for an additional hex format:  * * *
- *
- *
- *    Boolean is_X_data_rec( char * rec_str ) {}
- *
- *    Uint get_X_rec_data_count( char * rec_str ) {}
- *
- *    Ulong get_X_rec_address( char * rec_str ) {}
- *
- *    char * get_X_rec_data_start( char * rec_str ) {}
- *
- *    void put_X_data_rec( Uint count, Ulong address, char * data_str ) {}
- *
- *    Rec_vitals  X_rec =
- *    {
- *        is_X_data_rec,
- *        get_X_rec_address,
- *        get_X_rec_data_count,
- *        MAXIMUM DATA BYTES IN A RECORD,
- *        get_X_rec_data_start,
- *        put_X_data_rec
- *    };
- *
- */
-
-/*----------------------------------------------------------------------------*/
-
-
-/*
- *   Put address of additional Rec_vitals structures
- *   in this array, before the NULL entry.
- */
-
-Rec_vitals  *formats[] =
-{
-    &intel_hex,
-    &motorola_s1_rec,
-    &motorola_s2_rec,
-    &motorola_s3_rec,
-    ( Rec_vitals * ) NULL
-};
-
-
-/****   main   *****************************************************************
-*
-*
-*       Expects: Nothing (no command-line parameters).
-*
-*       Returns: Exit status (EXIT_SUCCESS or EXIT_FAILURE).
-*
-*       Reads hex records on the standard input and attempts to
-*       splice adjacent data fields together.  Results appear on
-*       the standard output.
-*
-*******************************************************************************/
-
-int main(
-  int argc,
-  char **argv
-)
-{
-
-    char       inbuff[ MAX_LINE_SIZE ], outbuff[ MAX_LINE_SIZE ];
-    char       *in_dptr, *out_dptr;
-    int        d_total, d_count, d_excess, n;
-    int        length;
-    Ulong      in_rec_addr, out_rec_addr = 0;
-    Rec_vitals *rptr;
-
-
-    /* Sift through file until first hex record is identified.    */
-
-    rptr = identify_first_data_record( inbuff, MAX_LINE_SIZE );
-    if ( rptr == NULL )
-    {
-        fputs( "No hex records found.\n", stderr );
-        exit( EXIT_FAILURE );
-    }
-
-
-    /* Attempt data-record splicing until end-of-file is reached. */
-    d_total = 0;
-    for (;;) {
-        if ( rptr->is_data_record( inbuff ) == YES )
-        { /* Input record is a data record. */
-            d_count     = rptr->get_data_count( inbuff );
-            in_rec_addr = rptr->get_address( inbuff );
-            in_dptr     = rptr->get_data_start( inbuff );
-
-            if ( d_total == 0  ||  in_rec_addr != out_rec_addr + d_total )
-            { /* Begin a new output record. */
-                if ( d_total != 0 )
-                    rptr->put_data_record( d_total, out_rec_addr, outbuff );
-                out_dptr     = outbuff;
-                n = d_total  = d_count;
-                out_rec_addr = in_rec_addr;
-            }
-            else if
-              ( ( d_excess = d_total + d_count - rptr->max_data_count ) > 0 )
-            { /* Output a maximum-length record, then start a new record. */
-                strncat( outbuff, in_dptr, 2 * ( d_count - d_excess ) );
-                rptr->put_data_record(
-                  rptr->max_data_count, out_rec_addr, outbuff
-                );
-                in_dptr      += 2 * ( d_count - d_excess );
-                out_dptr      = outbuff;
-                n = d_total   = d_excess;
-                out_rec_addr += rptr->max_data_count;
-            }
-            else
-            { /* Append input record's data field with accumulated data. */
-                out_dptr = outbuff + ( 2 * d_total );
-                d_total += n = d_count;
-            }
-            strncpy( out_dptr, in_dptr, 2 * n );
-            out_dptr[ 2 * n ] = EOS;
-        }
-        else
-        { /* Not a data record;
-           * flush accumulated data then echo non-data record.
-           */
-            if ( d_total != 0 )
-            {
-                rptr->put_data_record( d_total, out_rec_addr, outbuff );
-                d_total = 0;
-            }
-            puts( inbuff );
-        }
-
-        inbuff[ MAX_LINE_SIZE - 1 ] = '\0';
-        if ( !fgets( inbuff, MAX_LINE_SIZE, stdin ) )
-           break;
-        if ( inbuff[ MAX_LINE_SIZE - 1 ] ) {
-           fprintf( stderr, "Input line too long" );
-           exit( 1 );
-        }
-        length = strlen(inbuff);
-        inbuff[length - 1] = '\0';
-        
-    }
-
-
-    return ( EXIT_SUCCESS );
-
-}
-
-
-/****   identify_first_data_record   *******************************************
-*
-*       Expects: Pointer to hex-record line buffer.
-*
-*       Returns: Pointer to hex-record structure (NULL if no match found).
-*
-*       Reads the standard input, line by line, searching for a valid
-*       record header character.  If a valid header is found, a pointer
-*       to the hex-record's type structure is returned, otherwise NULL.
-*
-*       The input-stream pointer is left pointing to the first valid hex record.
-*
-*******************************************************************************/
-
-Rec_vitals * identify_first_data_record( char * buff_ptr, int max_length )
-{
-    Rec_vitals  ** ptr;
-    int            length;
-
-
-
-    for ( ;; ) {
-
-        buff_ptr[ max_length - 1 ] = '\0';
-        if ( !fgets( buff_ptr, max_length, stdin ) )
-           break;
-        if ( buff_ptr[ max_length - 1 ] ) {
-           fprintf( stderr, "Input line too long" );
-           exit( 1 );
-        }
-        length = strlen(buff_ptr);
-        buff_ptr[length - 1] = '\0';
-
-        for ( ptr = formats ; *ptr != ( Rec_vitals * ) NULL ; ptr++ )
-            if ( ( *ptr )->is_data_record( buff_ptr ) == YES )
-                return( *ptr );        /* Successful return.        */
-
-        puts( buff_ptr );              /* Echo non-hex-record line. */
-    }
-
-    return( ( Rec_vitals * ) NULL );   /* Unsuccessful return.      */
-}
-
-
-/****   get_ndigit_hex   *******************************************************
-*
-*       Expects: Pointer to first ASCII hexadecimal digit, number of digits.
-*
-*       Returns: Value of hexadecimal string as an unsigned long.
-*
-*******************************************************************************/
-
-Ulong get_ndigit_hex( char * cptr, int digits )
-{
-    Ulong    value;
-
-    for ( value = 0 ; --digits >= 0 ; cptr++ )
-        value = ( value * 16L ) + HEX_DIGIT( *cptr );
-
-    return( value );
-}
diff --git a/tools/build/src/unhex.c b/tools/build/src/unhex.c
deleted file mode 100644
index 6a75a13ae7..0000000000
--- a/tools/build/src/unhex.c
+++ /dev/null
@@ -1,738 +0,0 @@
-/*
- * unhex
- *      convert a hex file to binary equivalent.  If more than one file name
- *      is given, then the output will be logically concatenated together.
- *      stdin and stdout are defaults. Verbose will enable checksum output.
- *
- *  Supported input formats are Intel hex, Motorola S records, and TI 'B'
- *  records.
- *
- * Intel hex input format is
- *      Byte
- *       1          Colon :
- *       2..3       Record length, eg: "20"
- *       4..7       load address nibbles
- *       8..9       record type: "00" (data) or "02" base addr
- *       10..x      data bytes in ascii-hex
- *       x+1..x+2   cksum (2's compl of (len+addr+data))
- *       x+3        \n -- newline
- *
- *  $Id$
- */
-
-char *USAGE = "\
-usage:    unhex [-va] [ -o file ] [ file [file ... ] ]\n\
-                -v          -- verbose\n\
-                -a base     -- 1st byte of output corresponds to this address\n\
-                -l          -- linear, just writes data out\n\
-                -o file     -- output file; must not be input file\n\
-                -F k_bits   -- \"holes\" in input will be filled with 0xFF's\n\
-                                  up to \"k_bits\" * 1024 bits\n\
-";
-
-#include <stdio.h>
-#include <fcntl.h>
-#include <ctype.h>
-#include <string.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <errno.h>
-
-#include "config.h"
-
-#ifndef VMS
-#ifndef HAVE_STRERROR
-extern int sys_nerr;
-extern char *sys_errlist[];
-
-#define strerror( _err ) \
-  ((_err) < sys_nerr) ? sys_errlist [(_err)] : "unknown error"
-
-#else   /* HAVE_STRERROR */
-char *strerror ();
-#endif
-#else   /* VMS */
-char *strerror (int,...);
-#endif
-
-
-#define OK      0
-#define FAILURE (-1)
-#define Failed(x)       ((x) == FAILURE)
-#define TRUE    1
-#define FALSE   0
-typedef char bool;
-#define STREQ(a,b)      (strcmp(a,b) == 0)
-
-typedef unsigned char u8;
-typedef unsigned short u16;
-typedef unsigned long u32;
-
-/*
- * Pick out designated bytes
- */
-
-#define B0(x)       ((x) & 0xff)
-#define B1(x)       B0((x) >> 8)
-#define B2(x)       B0((x) >> 16)
-#define B3(x)       B0((x) >> 24)
-
-typedef struct buffer_rec {
-    u32 dl_destaddr;
-    u32 dl_jumpaddr;
-    int dl_count;
-    u8  dl_buf[512];
-} buffer_rec;
-
-/*
- * vars controlled by command line options
- */
-
-bool verbose = FALSE;                   /* be verbose */
-bool linear = FALSE;                    /* just write out linear data */
-char *outfilename = "-";                /* default output is stdout */
-u32 base = 0L;                         /* base address */
-u32 FFfill = 0L;                       /* how far to fill w 0xFF's */
-
-extern char *optarg;                    /* getopt(3) control vars */
-extern int optind;
-
-char *progname;                         /* for error() */
-
-void error(int errn, ...);
-#define ERR_ERRNO  (1<<((sizeof(int) * 8) - 2)) /* hi bit; use 'errno' */
-#define ERR_FATAL  (ERR_ERRNO / 2)              /* error is fatal; no return */
-#define ERR_ABORT  (ERR_ERRNO / 4)              /* error is fatal; abort */
-#define ERR_MASK   (ERR_ERRNO | ERR_FATAL | ERR_ABORT) /* all */
-
-#ifdef HAVE_STRTOUL
-#define stol(p) strtoul(p, (char **) NULL, 0)
-#else
-#define stol(p) strtol(p, (char **) NULL, 0)
-#endif
- 
-int   unhex(FILE *ifp, char *inm, FILE *ofp, char *onm);
-int   convert_Intel_records(FILE *ifp, char *inm, FILE *ofp, char *onm);
-int   convert_S_records(FILE *ifp, char *inm, FILE *ofp, char *onm);
-int   convert_TI_records(FILE *ifp, char *inm, FILE *ofp, char *onm);
-void  write_record(buffer_rec *tb, FILE *fp);
-int   getnibble(char **p);
-int   getbyte(char **p);
-long  getNbytes(char **p, int n);
-void  badformat(char *s, char *fname, char *msg);
-
-#define get1bytes(p)    ((int) getbyte(p))
-#define get2bytes(p)    ((int) getNbytes(p, 2))
-#define get3bytes(p)    getNbytes(p, 3)
-#define get4bytes(p)    getNbytes(p, 4)
-
-char *BADADDR = "Invalid record address";
-char *BADLEN  = "Invalid record length";
-char *BADBASE = "Bad base or starting address";
-char *BADFMT =  "Unrecognized record type";
-char *BADDATA = "Invalid data byte";
-char *BADCSUM = "Invalid checksum";
-char *MISCSUM = "Checksum mismatch";
-char *BADTYPE = "Unrecognized record type";
-char *MISTYPE = "Incompatible record types";
-
-int main(
-  int argc,
-  char **argv
-)
-{
-    register int c;
-    bool showusage = FALSE;                     /* usage error? */
-    int rc = 0;
-    FILE *outfp, *infp;
-
-    /*
-     * figure out invocation leaf-name
-     */
-
-    if ((progname = strrchr(argv[0], '/')) == (char *) NULL)
-        progname = argv[0];
-    else
-        progname++;
-
-    argv[0] = progname;                         /* for getopt err reporting */
-
-    /*
-     *  Check options and arguments.
-     */
-
-    progname = argv[0];
-    while ((c = getopt(argc, argv, "F:a:o:vl")) != EOF)
-        switch (c)
-        {
-            case 'a':                           /* base address */
-                base = stol(optarg);
-                break;
-
-            case 'l':                           /* linear output */
-                linear = TRUE;
-                break;
-
-            case 'v':                           /* toggle verbose */
-                verbose = ! verbose;
-                break;
-
-            case 'o':                           /* output file */
-                outfilename = optarg;
-                break;
-
-            case 'F':                           /* 0xFF fill amount (bytes) */
-                FFfill = stol(optarg) * 1024L / 8L;
-                break;
-
-            case '?':
-                showusage = TRUE;
-        }
-
-    if (showusage)
-    {
-        (void) fprintf(stderr, "%s", USAGE);
-        exit(1);
-    }
-
-    if (linear && (base != 0))
-    {
-        error(0, "-l and -a may not be specified in combination");
-        exit(1);
-    }
-
-    if (STREQ(outfilename, "-"))
-    {
-        outfp = stdout;
-        outfilename = "stdout";
-    }
-    else
-        if ((outfp = fopen(outfilename, "w")) == (FILE *) NULL)
-        {
-            error(-1, "couldn't open '%s' for output", outfilename);
-            exit(1);
-        }
-
-    /*
-     * Now process the input files (or stdin, if none specified)
-     */
-
-    if (argv[optind] == (char *) NULL)          /* just stdin */
-        exit(unhex(stdin, "stdin", outfp, outfilename));
-    else
-        for (; (optarg = argv[optind]); optind++)
-        {
-            if (STREQ(optarg, "-"))
-                rc += unhex(stdin, "stdin", outfp, outfilename);
-            else
-            {
-                if ((infp = fopen(optarg, "r")) == (FILE *) NULL)
-                {
-                    error(-1, "couldn't open '%s' for input", optarg);
-                    exit(1);
-                }
-                rc += unhex(infp, optarg, outfp, outfilename);
-            }
-        }
-
-    return(rc);
-}
-
-u16 filesum;
-
-int
-unhex(FILE *ifp,
-      char *inm,
-      FILE *ofp,
-      char *onm)
-{
-    int c;
-
-    filesum = 0;
-
-    /*
-     * Make sure holes will be filled with 0xFF's if requested.  We
-     *  do this the easy way by just filling the file with FF's before
-     *  getting started.  To do it more optimally would be quite a bit
-     *  more difficult since the user can skip around as much as he/she
-     *  likes in the input hex file addressing.
-     *
-     *  We'll clean this up later (after this program has run) with
-     *  'stripffs'
-     */
-
-    if (FFfill)
-    {
-        (void) fseek(ofp, 0, 0);
-        for (c = FFfill; c > 0; c--)
-            (void) fputc(0xFF, ofp);
-    }
-
-    /*
-     * Read the first char from file and determine record types
-     */
-
-    if ((c = getc(ifp)) != EOF)
-    {
-        ungetc(c, ifp);
-        switch(c)
-        {
-            case 'S':
-                convert_S_records(ifp, inm, ofp, onm);
-                break;
-
-            case ':':
-                convert_Intel_records(ifp, inm, ofp, onm);
-                break;
-
-            case '9':
-            case 'B':
-                convert_TI_records(ifp, inm, ofp, onm);
-                break;
-
-            default:
-            {
-                char tmp[2];
-                tmp[0] = c; tmp[1] = 0;
-                badformat(tmp, inm, BADFMT);
-            }
-        }
-    }
-
-    if (verbose)
-        fprintf(stderr, "'%s' checksum is 0x%04x\n", inm, filesum);
-
-    return 0;
-}
-
-int
-convert_Intel_records(
-    FILE *ifp,
-    char *inm,
-    FILE *ofp,
-    char *onm)
-{
-    char buff[512];
-    char *p;
-    u8 cksum;
-    int incksum;
-    int c;
-    int rectype;                    /* record type */
-    int len;                        /* data length of current line */
-    u32 addr;
-    u32 base_address = 0;
-    bool endrecord = FALSE;
-    buffer_rec tb;
-
-    while ( ! endrecord && (fgets(buff, sizeof(buff), ifp)))
-    {
-        p = &buff[0];
-
-        if (p[strlen(p)-1] == '\n')                 /* get rid of newline */
-            p[strlen(p)-1] = '\0';
-
-        if (p[strlen(p)-1] == '\r')                 /* get rid of any CR */
-            p[strlen(p)-1] = '\0';
-
-        tb.dl_count = 0;
-
-        if (*p != ':')
-            badformat(p, inm, BADFMT);
-        p++;
-
-        if ((len = getbyte(&p)) == -1)      /* record len */
-            badformat(buff, inm, BADLEN);
-
-        if ((addr = get2bytes(&p)) == -1L)          /* record addr */
-            badformat(buff, inm, BADADDR);
-
-        rectype = getbyte(&p);
-
-        cksum = len + B0(addr) + B1(addr) + rectype;
-
-        switch (rectype)
-        {
-            case 0x00:                  /* normal data record */
-                tb.dl_destaddr = base_address + addr;
-                while (len--)
-                {
-                    if ((c = getbyte(&p)) == -1)
-                        badformat(buff, inm, BADDATA);
-                    cksum += c;
-                    filesum += c;
-                    tb.dl_buf[tb.dl_count++] = c;
-                }
-                break;
-
-            case 0x01:                  /* execution start address */
-                base_address = addr;
-                endrecord = TRUE;
-                break;
-
-            case 0x02:                  /* new base */
-                if ((base_address = get2bytes(&p)) == -1L)
-                    badformat(buff, inm, BADBASE);
-                cksum += B0(base_address) + B1(base_address);
-                base_address <<= 4;
-                break;
-
-            case 0x03:                  /* seg/off execution start address */
-            {
-                u32 seg, off;
-
-                seg = get2bytes(&p);
-                off = get2bytes(&p);
-                if ((seg == -1L) || (off == -1L))
-                    badformat(buff, inm, BADADDR);
-
-                cksum += B0(seg) + B1(seg) + B0(off) + B1(off);
-
-                tb.dl_jumpaddr = (seg << 4) + off;
-                break;
-            }
-
-            default:
-                error(0, "unknown Intel-hex record type: 0x%02x", rectype);
-                badformat(buff, inm, BADTYPE);
-        }
-
-        /*
-         * Verify checksums are correct in file.
-         */
-
-        cksum = (-cksum) & 0xff;
-        if ((incksum = getbyte(&p)) == -1)
-            badformat(buff, inm, BADCSUM);
-        if (((u8) incksum) != cksum)
-            badformat(buff, inm, MISCSUM);
-
-        if (tb.dl_count)
-            write_record(&tb, ofp);
-    }
-    return 0;
-}
-
-int
-convert_S_records(
-    FILE *ifp,
-    char *inm,
-    FILE *ofp,
-    char *onm)
-{
-    char buff[512];
-    char *p;
-    u8 cksum;
-    int incksum;
-    int c;
-    int len;                        /* data length of current line */
-    int rectype;                    /* record type */
-    u32 addr;
-    bool endrecord = FALSE;
-    buffer_rec tb;
-
-    while ( ! endrecord && (fgets(buff, sizeof(buff), ifp)))
-    {
-        p = &buff[0];
-
-        if (p[strlen(p)-1] == '\n')                 /* get rid of newline */
-            p[strlen(p)-1] = '\0';
-
-        if (p[strlen(p)-1] == '\r')                 /* get rid of any CR */
-            p[strlen(p)-1] = '\0';
-
-        tb.dl_count = 0;
-
-        if (*p != 'S')
-            badformat(p, inm, BADFMT);
-        p++;
-
-        if ((rectype = getnibble(&p)) == -1)        /* record type */
-            badformat(buff, inm, BADTYPE);
-
-        if ((len = getbyte(&p)) == -1)              /* record len */
-            badformat(buff, inm, BADLEN);
-        cksum = len;
-
-        switch (rectype)
-        {
-            case 0x00:                  /* comment field, ignored */
-                goto write_it;
-
-            case 0x01:                          /* data record, 16 bit addr */
-                if ((addr = get2bytes(&p)) == -1L)
-                    badformat(buff, inm, BADADDR);
-                len -= 3;
-                goto doit;
-
-            case 0x02:                          /* ... 24 bit addr */
-                if ((addr = get3bytes(&p)) == -1L)
-                    badformat(buff, inm, BADADDR);
-                len -= 4;
-                goto doit;
-
-            case 0x03:                          /* ... 32 bit addr */
-                if ((addr = get4bytes(&p)) == -1L)
-                    badformat(buff, inm, BADADDR);
-                len -= 5;
-    doit:
-                cksum += B0(addr) + B1(addr) + B2(addr) + B3(addr);
-
-                tb.dl_destaddr = addr;
-                while (len--)
-                {
-                    if ((c = getbyte(&p)) == -1)
-                        badformat(buff, inm, BADDATA);
-                    cksum += c;
-                    filesum += c;
-                    tb.dl_buf[tb.dl_count++] = c;
-                }
-                break;
-
-            case 0x07:                  /* 32 bit end record */
-                if ((addr = get4bytes(&p)) == -1L)
-                    badformat(buff, inm, BADADDR);
-                goto end_rec;
-
-            case 0x08:                  /* 24 bit end record */
-                if ((addr = get3bytes(&p)) == -1L)
-                    badformat(buff, inm, BADADDR);
-                goto end_rec;
-
-            case 0x09:                  /* 16 bit end record */
-                if ((addr = get2bytes(&p)) == -1L)
-                    badformat(buff, inm, BADADDR);
-
-end_rec:
-                cksum += B0(addr) + B1(addr) + B2(addr) + B3(addr);
-                tb.dl_jumpaddr = addr;
-                break;
-
-            default:
-                error(0, "unknown Motorola-S record type: 0x%02x", rectype);
-                badformat(buff, inm, BADTYPE);
-                break;
-        }
-
-        /*
-         * Verify checksums are correct in file.
-         */
-
-        cksum = (~cksum) & 0xff;
-        if ((incksum = getbyte(&p)) == -1)
-            badformat(buff, inm, BADCSUM);
-        if (((u8) incksum) != cksum)
-            badformat(buff, inm, MISCSUM);
-
-write_it:
-        if (tb.dl_count)
-            write_record(&tb, ofp);
-    }
-    return 0;
-}
-
-int
-convert_TI_records(
-    FILE *ifp,
-    char *inm,
-    FILE *ofp,
-    char *onm)
-{
-    char buff[512];
-    char *p;
-    int c;
-    bool endrecord = FALSE;
-    bool eol;
-    buffer_rec tb;
-
-    while ( ! endrecord && (fgets(buff, sizeof(buff), ifp)))
-    {
-        if (p[strlen(p)-1] == '\n')                 /* get rid of newline */
-            p[strlen(p)-1] = '\0';
-
-        if (p[strlen(p)-1] == '\r')                 /* get rid of any CR */
-            p[strlen(p)-1] = '\0';
-
-        tb.dl_count = 0;
-
-        p = &buff[0];
-        eol = FALSE;
-        while ( ! eol && ! endrecord)
-        {
-            switch (*p++)
-            {
-                case '9':
-                    if (tb.dl_count)
-                        write_record(&tb, ofp);
-                    tb.dl_destaddr = get2bytes(&p);
-                    break;
-
-                case 'B':
-                    c = getbyte(&p);
-                    filesum += c;
-                    tb.dl_buf[tb.dl_count++] = c;
-                    c = getbyte(&p);
-                    filesum += c;
-                    tb.dl_buf[tb.dl_count++] = c;
-                    break;
-
-                case 'F':
-                    eol = TRUE;
-                    break;
-
-                case ':':
-                    endrecord = TRUE;
-                    break;
-
-                default:
-                    badformat(p, inm, BADFMT);
-            }
-        }
-        if (tb.dl_count)
-            write_record(&tb, ofp);
-    }
-    return 0;
-}
-
-void
-write_record(buffer_rec *tb,
-             FILE *fp)
-{
-    if ( ! linear)
-    {
-        if (tb->dl_destaddr < base)
-            error(ERR_FATAL, "record at address 0x%x precedes base of 0x%x",
-                     tb->dl_destaddr, base);
-        (void) fseek(fp, tb->dl_destaddr - base, 0);
-    }
-
-    (void) fwrite(tb->dl_buf, tb->dl_count, 1, fp);
-    tb->dl_destaddr += tb->dl_count;
-    tb->dl_count = 0;
-}
-
-int
-getnibble(char **p)
-{
-    register int val;
-
-    **p = toupper(**p);
-    switch (**p)
-    {
-        case '0': case '1': case '2': case '3': case '4':
-        case '5': case '6': case '7': case '8': case '9':
-            val = **p - '0';
-            break;
-
-        case 'A': case 'B': case 'C': case 'D': case 'E': case 'F':
-            val = 10 + (**p - 'A');
-            break;
-
-        default:
-            return(-1);
-    }
-    *p += 1;
-
-    return(val & 0x0f);
-}
-
-int
-getbyte(char **p)
-{
-    int n0, n1;
-
-    if ((n0 = getnibble(p)) == -1)
-        return(-1);
-    if ((n1 = getnibble(p)) == -1)
-        return(-1);
-
-    return(((n0 << 4) + n1) & 0xff);
-}
-
-long
-getNbytes(char **p,
-          int n)
-{
-    int t;
-    u32 val = 0;
-
-    while (n--)
-    {
-        if ((t = getbyte(p)) == -1)
-            return(-1L);
-        val <<= 8;
-        val += t;
-    }
-
-    return(val);
-}
-
-void
-badformat(char *s,
-          char *fname,
-          char *msg)
-{
-    if (s[strlen(s)-1] == '\n')             /* get rid of newline */
-        s[strlen(s)-1] = '\0';
-    error(0, "line '%s'::\n\tfrom file '%s'; %s", s, fname, msg);
-    exit(1);
-}
-
-/*
- * error(errn, arglist)
- *      report an error to stderr using printf(3) conventions.
- *      Any output is preceded by '<progname>: '
- *
- * Uses ERR_EXIT  bit to request exit(errn)
- *      ERR_ABORT to request abort()
- *      ERR_ERRNO to indicate use of errno instead of argument.
- *
- * If resulting 'errn' is non-zero, it is assumed to be an 'errno' and its
- *      associated error message is appended to the output.
- */
-
-/*VARARGS*/
-
-void
-error(int error_flag, ...)
-{
-    va_list arglist;
-    register char *format;
-    int local_errno;
-
-    extern int errno;
-
-    (void) fflush(stdout);          /* in case stdout/stderr same */
-
-    local_errno = error_flag & ~ERR_MASK;
-    if (error_flag & ERR_ERRNO)     /* use errno? */
-        local_errno = errno;
-
-    va_start(arglist, error_flag);
-    format = va_arg(arglist, char *);
-    (void) fprintf(stderr, "%s: ", progname);
-    (void) vfprintf(stderr, format, arglist);
-    va_end(arglist);
-
-    if (local_errno)
-      (void) fprintf(stderr, " (%s)\n", strerror(local_errno));
-    else
-      (void) fprintf(stderr, "\n");
-
-    (void) fflush(stderr);
-
-    if (error_flag & (ERR_FATAL | ERR_ABORT))
-    {
-        if (error_flag & ERR_FATAL)
-        {
-            error(0, "fatal error, exiting");
-            exit(local_errno ? local_errno : 1);
-        }
-        else
-        {
-            error(0, "fatal error, aborting");
-            abort();
-        }
-    }
-}
-
diff --git a/tools/build/unhex.c b/tools/build/unhex.c
deleted file mode 100644
index 6a75a13ae7..0000000000
--- a/tools/build/unhex.c
+++ /dev/null
@@ -1,738 +0,0 @@
-/*
- * unhex
- *      convert a hex file to binary equivalent.  If more than one file name
- *      is given, then the output will be logically concatenated together.
- *      stdin and stdout are defaults. Verbose will enable checksum output.
- *
- *  Supported input formats are Intel hex, Motorola S records, and TI 'B'
- *  records.
- *
- * Intel hex input format is
- *      Byte
- *       1          Colon :
- *       2..3       Record length, eg: "20"
- *       4..7       load address nibbles
- *       8..9       record type: "00" (data) or "02" base addr
- *       10..x      data bytes in ascii-hex
- *       x+1..x+2   cksum (2's compl of (len+addr+data))
- *       x+3        \n -- newline
- *
- *  $Id$
- */
-
-char *USAGE = "\
-usage:    unhex [-va] [ -o file ] [ file [file ... ] ]\n\
-                -v          -- verbose\n\
-                -a base     -- 1st byte of output corresponds to this address\n\
-                -l          -- linear, just writes data out\n\
-                -o file     -- output file; must not be input file\n\
-                -F k_bits   -- \"holes\" in input will be filled with 0xFF's\n\
-                                  up to \"k_bits\" * 1024 bits\n\
-";
-
-#include <stdio.h>
-#include <fcntl.h>
-#include <ctype.h>
-#include <string.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <errno.h>
-
-#include "config.h"
-
-#ifndef VMS
-#ifndef HAVE_STRERROR
-extern int sys_nerr;
-extern char *sys_errlist[];
-
-#define strerror( _err ) \
-  ((_err) < sys_nerr) ? sys_errlist [(_err)] : "unknown error"
-
-#else   /* HAVE_STRERROR */
-char *strerror ();
-#endif
-#else   /* VMS */
-char *strerror (int,...);
-#endif
-
-
-#define OK      0
-#define FAILURE (-1)
-#define Failed(x)       ((x) == FAILURE)
-#define TRUE    1
-#define FALSE   0
-typedef char bool;
-#define STREQ(a,b)      (strcmp(a,b) == 0)
-
-typedef unsigned char u8;
-typedef unsigned short u16;
-typedef unsigned long u32;
-
-/*
- * Pick out designated bytes
- */
-
-#define B0(x)       ((x) & 0xff)
-#define B1(x)       B0((x) >> 8)
-#define B2(x)       B0((x) >> 16)
-#define B3(x)       B0((x) >> 24)
-
-typedef struct buffer_rec {
-    u32 dl_destaddr;
-    u32 dl_jumpaddr;
-    int dl_count;
-    u8  dl_buf[512];
-} buffer_rec;
-
-/*
- * vars controlled by command line options
- */
-
-bool verbose = FALSE;                   /* be verbose */
-bool linear = FALSE;                    /* just write out linear data */
-char *outfilename = "-";                /* default output is stdout */
-u32 base = 0L;                         /* base address */
-u32 FFfill = 0L;                       /* how far to fill w 0xFF's */
-
-extern char *optarg;                    /* getopt(3) control vars */
-extern int optind;
-
-char *progname;                         /* for error() */
-
-void error(int errn, ...);
-#define ERR_ERRNO  (1<<((sizeof(int) * 8) - 2)) /* hi bit; use 'errno' */
-#define ERR_FATAL  (ERR_ERRNO / 2)              /* error is fatal; no return */
-#define ERR_ABORT  (ERR_ERRNO / 4)              /* error is fatal; abort */
-#define ERR_MASK   (ERR_ERRNO | ERR_FATAL | ERR_ABORT) /* all */
-
-#ifdef HAVE_STRTOUL
-#define stol(p) strtoul(p, (char **) NULL, 0)
-#else
-#define stol(p) strtol(p, (char **) NULL, 0)
-#endif
- 
-int   unhex(FILE *ifp, char *inm, FILE *ofp, char *onm);
-int   convert_Intel_records(FILE *ifp, char *inm, FILE *ofp, char *onm);
-int   convert_S_records(FILE *ifp, char *inm, FILE *ofp, char *onm);
-int   convert_TI_records(FILE *ifp, char *inm, FILE *ofp, char *onm);
-void  write_record(buffer_rec *tb, FILE *fp);
-int   getnibble(char **p);
-int   getbyte(char **p);
-long  getNbytes(char **p, int n);
-void  badformat(char *s, char *fname, char *msg);
-
-#define get1bytes(p)    ((int) getbyte(p))
-#define get2bytes(p)    ((int) getNbytes(p, 2))
-#define get3bytes(p)    getNbytes(p, 3)
-#define get4bytes(p)    getNbytes(p, 4)
-
-char *BADADDR = "Invalid record address";
-char *BADLEN  = "Invalid record length";
-char *BADBASE = "Bad base or starting address";
-char *BADFMT =  "Unrecognized record type";
-char *BADDATA = "Invalid data byte";
-char *BADCSUM = "Invalid checksum";
-char *MISCSUM = "Checksum mismatch";
-char *BADTYPE = "Unrecognized record type";
-char *MISTYPE = "Incompatible record types";
-
-int main(
-  int argc,
-  char **argv
-)
-{
-    register int c;
-    bool showusage = FALSE;                     /* usage error? */
-    int rc = 0;
-    FILE *outfp, *infp;
-
-    /*
-     * figure out invocation leaf-name
-     */
-
-    if ((progname = strrchr(argv[0], '/')) == (char *) NULL)
-        progname = argv[0];
-    else
-        progname++;
-
-    argv[0] = progname;                         /* for getopt err reporting */
-
-    /*
-     *  Check options and arguments.
-     */
-
-    progname = argv[0];
-    while ((c = getopt(argc, argv, "F:a:o:vl")) != EOF)
-        switch (c)
-        {
-            case 'a':                           /* base address */
-                base = stol(optarg);
-                break;
-
-            case 'l':                           /* linear output */
-                linear = TRUE;
-                break;
-
-            case 'v':                           /* toggle verbose */
-                verbose = ! verbose;
-                break;
-
-            case 'o':                           /* output file */
-                outfilename = optarg;
-                break;
-
-            case 'F':                           /* 0xFF fill amount (bytes) */
-                FFfill = stol(optarg) * 1024L / 8L;
-                break;
-
-            case '?':
-                showusage = TRUE;
-        }
-
-    if (showusage)
-    {
-        (void) fprintf(stderr, "%s", USAGE);
-        exit(1);
-    }
-
-    if (linear && (base != 0))
-    {
-        error(0, "-l and -a may not be specified in combination");
-        exit(1);
-    }
-
-    if (STREQ(outfilename, "-"))
-    {
-        outfp = stdout;
-        outfilename = "stdout";
-    }
-    else
-        if ((outfp = fopen(outfilename, "w")) == (FILE *) NULL)
-        {
-            error(-1, "couldn't open '%s' for output", outfilename);
-            exit(1);
-        }
-
-    /*
-     * Now process the input files (or stdin, if none specified)
-     */
-
-    if (argv[optind] == (char *) NULL)          /* just stdin */
-        exit(unhex(stdin, "stdin", outfp, outfilename));
-    else
-        for (; (optarg = argv[optind]); optind++)
-        {
-            if (STREQ(optarg, "-"))
-                rc += unhex(stdin, "stdin", outfp, outfilename);
-            else
-            {
-                if ((infp = fopen(optarg, "r")) == (FILE *) NULL)
-                {
-                    error(-1, "couldn't open '%s' for input", optarg);
-                    exit(1);
-                }
-                rc += unhex(infp, optarg, outfp, outfilename);
-            }
-        }
-
-    return(rc);
-}
-
-u16 filesum;
-
-int
-unhex(FILE *ifp,
-      char *inm,
-      FILE *ofp,
-      char *onm)
-{
-    int c;
-
-    filesum = 0;
-
-    /*
-     * Make sure holes will be filled with 0xFF's if requested.  We
-     *  do this the easy way by just filling the file with FF's before
-     *  getting started.  To do it more optimally would be quite a bit
-     *  more difficult since the user can skip around as much as he/she
-     *  likes in the input hex file addressing.
-     *
-     *  We'll clean this up later (after this program has run) with
-     *  'stripffs'
-     */
-
-    if (FFfill)
-    {
-        (void) fseek(ofp, 0, 0);
-        for (c = FFfill; c > 0; c--)
-            (void) fputc(0xFF, ofp);
-    }
-
-    /*
-     * Read the first char from file and determine record types
-     */
-
-    if ((c = getc(ifp)) != EOF)
-    {
-        ungetc(c, ifp);
-        switch(c)
-        {
-            case 'S':
-                convert_S_records(ifp, inm, ofp, onm);
-                break;
-
-            case ':':
-                convert_Intel_records(ifp, inm, ofp, onm);
-                break;
-
-            case '9':
-            case 'B':
-                convert_TI_records(ifp, inm, ofp, onm);
-                break;
-
-            default:
-            {
-                char tmp[2];
-                tmp[0] = c; tmp[1] = 0;
-                badformat(tmp, inm, BADFMT);
-            }
-        }
-    }
-
-    if (verbose)
-        fprintf(stderr, "'%s' checksum is 0x%04x\n", inm, filesum);
-
-    return 0;
-}
-
-int
-convert_Intel_records(
-    FILE *ifp,
-    char *inm,
-    FILE *ofp,
-    char *onm)
-{
-    char buff[512];
-    char *p;
-    u8 cksum;
-    int incksum;
-    int c;
-    int rectype;                    /* record type */
-    int len;                        /* data length of current line */
-    u32 addr;
-    u32 base_address = 0;
-    bool endrecord = FALSE;
-    buffer_rec tb;
-
-    while ( ! endrecord && (fgets(buff, sizeof(buff), ifp)))
-    {
-        p = &buff[0];
-
-        if (p[strlen(p)-1] == '\n')                 /* get rid of newline */
-            p[strlen(p)-1] = '\0';
-
-        if (p[strlen(p)-1] == '\r')                 /* get rid of any CR */
-            p[strlen(p)-1] = '\0';
-
-        tb.dl_count = 0;
-
-        if (*p != ':')
-            badformat(p, inm, BADFMT);
-        p++;
-
-        if ((len = getbyte(&p)) == -1)      /* record len */
-            badformat(buff, inm, BADLEN);
-
-        if ((addr = get2bytes(&p)) == -1L)          /* record addr */
-            badformat(buff, inm, BADADDR);
-
-        rectype = getbyte(&p);
-
-        cksum = len + B0(addr) + B1(addr) + rectype;
-
-        switch (rectype)
-        {
-            case 0x00:                  /* normal data record */
-                tb.dl_destaddr = base_address + addr;
-                while (len--)
-                {
-                    if ((c = getbyte(&p)) == -1)
-                        badformat(buff, inm, BADDATA);
-                    cksum += c;
-                    filesum += c;
-                    tb.dl_buf[tb.dl_count++] = c;
-                }
-                break;
-
-            case 0x01:                  /* execution start address */
-                base_address = addr;
-                endrecord = TRUE;
-                break;
-
-            case 0x02:                  /* new base */
-                if ((base_address = get2bytes(&p)) == -1L)
-                    badformat(buff, inm, BADBASE);
-                cksum += B0(base_address) + B1(base_address);
-                base_address <<= 4;
-                break;
-
-            case 0x03:                  /* seg/off execution start address */
-            {
-                u32 seg, off;
-
-                seg = get2bytes(&p);
-                off = get2bytes(&p);
-                if ((seg == -1L) || (off == -1L))
-                    badformat(buff, inm, BADADDR);
-
-                cksum += B0(seg) + B1(seg) + B0(off) + B1(off);
-
-                tb.dl_jumpaddr = (seg << 4) + off;
-                break;
-            }
-
-            default:
-                error(0, "unknown Intel-hex record type: 0x%02x", rectype);
-                badformat(buff, inm, BADTYPE);
-        }
-
-        /*
-         * Verify checksums are correct in file.
-         */
-
-        cksum = (-cksum) & 0xff;
-        if ((incksum = getbyte(&p)) == -1)
-            badformat(buff, inm, BADCSUM);
-        if (((u8) incksum) != cksum)
-            badformat(buff, inm, MISCSUM);
-
-        if (tb.dl_count)
-            write_record(&tb, ofp);
-    }
-    return 0;
-}
-
-int
-convert_S_records(
-    FILE *ifp,
-    char *inm,
-    FILE *ofp,
-    char *onm)
-{
-    char buff[512];
-    char *p;
-    u8 cksum;
-    int incksum;
-    int c;
-    int len;                        /* data length of current line */
-    int rectype;                    /* record type */
-    u32 addr;
-    bool endrecord = FALSE;
-    buffer_rec tb;
-
-    while ( ! endrecord && (fgets(buff, sizeof(buff), ifp)))
-    {
-        p = &buff[0];
-
-        if (p[strlen(p)-1] == '\n')                 /* get rid of newline */
-            p[strlen(p)-1] = '\0';
-
-        if (p[strlen(p)-1] == '\r')                 /* get rid of any CR */
-            p[strlen(p)-1] = '\0';
-
-        tb.dl_count = 0;
-
-        if (*p != 'S')
-            badformat(p, inm, BADFMT);
-        p++;
-
-        if ((rectype = getnibble(&p)) == -1)        /* record type */
-            badformat(buff, inm, BADTYPE);
-
-        if ((len = getbyte(&p)) == -1)              /* record len */
-            badformat(buff, inm, BADLEN);
-        cksum = len;
-
-        switch (rectype)
-        {
-            case 0x00:                  /* comment field, ignored */
-                goto write_it;
-
-            case 0x01:                          /* data record, 16 bit addr */
-                if ((addr = get2bytes(&p)) == -1L)
-                    badformat(buff, inm, BADADDR);
-                len -= 3;
-                goto doit;
-
-            case 0x02:                          /* ... 24 bit addr */
-                if ((addr = get3bytes(&p)) == -1L)
-                    badformat(buff, inm, BADADDR);
-                len -= 4;
-                goto doit;
-
-            case 0x03:                          /* ... 32 bit addr */
-                if ((addr = get4bytes(&p)) == -1L)
-                    badformat(buff, inm, BADADDR);
-                len -= 5;
-    doit:
-                cksum += B0(addr) + B1(addr) + B2(addr) + B3(addr);
-
-                tb.dl_destaddr = addr;
-                while (len--)
-                {
-                    if ((c = getbyte(&p)) == -1)
-                        badformat(buff, inm, BADDATA);
-                    cksum += c;
-                    filesum += c;
-                    tb.dl_buf[tb.dl_count++] = c;
-                }
-                break;
-
-            case 0x07:                  /* 32 bit end record */
-                if ((addr = get4bytes(&p)) == -1L)
-                    badformat(buff, inm, BADADDR);
-                goto end_rec;
-
-            case 0x08:                  /* 24 bit end record */
-                if ((addr = get3bytes(&p)) == -1L)
-                    badformat(buff, inm, BADADDR);
-                goto end_rec;
-
-            case 0x09:                  /* 16 bit end record */
-                if ((addr = get2bytes(&p)) == -1L)
-                    badformat(buff, inm, BADADDR);
-
-end_rec:
-                cksum += B0(addr) + B1(addr) + B2(addr) + B3(addr);
-                tb.dl_jumpaddr = addr;
-                break;
-
-            default:
-                error(0, "unknown Motorola-S record type: 0x%02x", rectype);
-                badformat(buff, inm, BADTYPE);
-                break;
-        }
-
-        /*
-         * Verify checksums are correct in file.
-         */
-
-        cksum = (~cksum) & 0xff;
-        if ((incksum = getbyte(&p)) == -1)
-            badformat(buff, inm, BADCSUM);
-        if (((u8) incksum) != cksum)
-            badformat(buff, inm, MISCSUM);
-
-write_it:
-        if (tb.dl_count)
-            write_record(&tb, ofp);
-    }
-    return 0;
-}
-
-int
-convert_TI_records(
-    FILE *ifp,
-    char *inm,
-    FILE *ofp,
-    char *onm)
-{
-    char buff[512];
-    char *p;
-    int c;
-    bool endrecord = FALSE;
-    bool eol;
-    buffer_rec tb;
-
-    while ( ! endrecord && (fgets(buff, sizeof(buff), ifp)))
-    {
-        if (p[strlen(p)-1] == '\n')                 /* get rid of newline */
-            p[strlen(p)-1] = '\0';
-
-        if (p[strlen(p)-1] == '\r')                 /* get rid of any CR */
-            p[strlen(p)-1] = '\0';
-
-        tb.dl_count = 0;
-
-        p = &buff[0];
-        eol = FALSE;
-        while ( ! eol && ! endrecord)
-        {
-            switch (*p++)
-            {
-                case '9':
-                    if (tb.dl_count)
-                        write_record(&tb, ofp);
-                    tb.dl_destaddr = get2bytes(&p);
-                    break;
-
-                case 'B':
-                    c = getbyte(&p);
-                    filesum += c;
-                    tb.dl_buf[tb.dl_count++] = c;
-                    c = getbyte(&p);
-                    filesum += c;
-                    tb.dl_buf[tb.dl_count++] = c;
-                    break;
-
-                case 'F':
-                    eol = TRUE;
-                    break;
-
-                case ':':
-                    endrecord = TRUE;
-                    break;
-
-                default:
-                    badformat(p, inm, BADFMT);
-            }
-        }
-        if (tb.dl_count)
-            write_record(&tb, ofp);
-    }
-    return 0;
-}
-
-void
-write_record(buffer_rec *tb,
-             FILE *fp)
-{
-    if ( ! linear)
-    {
-        if (tb->dl_destaddr < base)
-            error(ERR_FATAL, "record at address 0x%x precedes base of 0x%x",
-                     tb->dl_destaddr, base);
-        (void) fseek(fp, tb->dl_destaddr - base, 0);
-    }
-
-    (void) fwrite(tb->dl_buf, tb->dl_count, 1, fp);
-    tb->dl_destaddr += tb->dl_count;
-    tb->dl_count = 0;
-}
-
-int
-getnibble(char **p)
-{
-    register int val;
-
-    **p = toupper(**p);
-    switch (**p)
-    {
-        case '0': case '1': case '2': case '3': case '4':
-        case '5': case '6': case '7': case '8': case '9':
-            val = **p - '0';
-            break;
-
-        case 'A': case 'B': case 'C': case 'D': case 'E': case 'F':
-            val = 10 + (**p - 'A');
-            break;
-
-        default:
-            return(-1);
-    }
-    *p += 1;
-
-    return(val & 0x0f);
-}
-
-int
-getbyte(char **p)
-{
-    int n0, n1;
-
-    if ((n0 = getnibble(p)) == -1)
-        return(-1);
-    if ((n1 = getnibble(p)) == -1)
-        return(-1);
-
-    return(((n0 << 4) + n1) & 0xff);
-}
-
-long
-getNbytes(char **p,
-          int n)
-{
-    int t;
-    u32 val = 0;
-
-    while (n--)
-    {
-        if ((t = getbyte(p)) == -1)
-            return(-1L);
-        val <<= 8;
-        val += t;
-    }
-
-    return(val);
-}
-
-void
-badformat(char *s,
-          char *fname,
-          char *msg)
-{
-    if (s[strlen(s)-1] == '\n')             /* get rid of newline */
-        s[strlen(s)-1] = '\0';
-    error(0, "line '%s'::\n\tfrom file '%s'; %s", s, fname, msg);
-    exit(1);
-}
-
-/*
- * error(errn, arglist)
- *      report an error to stderr using printf(3) conventions.
- *      Any output is preceded by '<progname>: '
- *
- * Uses ERR_EXIT  bit to request exit(errn)
- *      ERR_ABORT to request abort()
- *      ERR_ERRNO to indicate use of errno instead of argument.
- *
- * If resulting 'errn' is non-zero, it is assumed to be an 'errno' and its
- *      associated error message is appended to the output.
- */
-
-/*VARARGS*/
-
-void
-error(int error_flag, ...)
-{
-    va_list arglist;
-    register char *format;
-    int local_errno;
-
-    extern int errno;
-
-    (void) fflush(stdout);          /* in case stdout/stderr same */
-
-    local_errno = error_flag & ~ERR_MASK;
-    if (error_flag & ERR_ERRNO)     /* use errno? */
-        local_errno = errno;
-
-    va_start(arglist, error_flag);
-    format = va_arg(arglist, char *);
-    (void) fprintf(stderr, "%s: ", progname);
-    (void) vfprintf(stderr, format, arglist);
-    va_end(arglist);
-
-    if (local_errno)
-      (void) fprintf(stderr, " (%s)\n", strerror(local_errno));
-    else
-      (void) fprintf(stderr, "\n");
-
-    (void) fflush(stderr);
-
-    if (error_flag & (ERR_FATAL | ERR_ABORT))
-    {
-        if (error_flag & ERR_FATAL)
-        {
-            error(0, "fatal error, exiting");
-            exit(local_errno ? local_errno : 1);
-        }
-        else
-        {
-            error(0, "fatal error, aborting");
-            abort();
-        }
-    }
-}
-
diff --git a/tools/build/unlock-directory.in b/tools/build/unlock-directory.in
deleted file mode 100644
index c63ceff881..0000000000
--- a/tools/build/unlock-directory.in
+++ /dev/null
@@ -1,41 +0,0 @@
-#!@KSH@
-#
-# $Id$
-#
-# Unlock a directory processed by lock_directory
-#
-
-# is a particular command available on this machine?
-#
-cmd_avail()
-{
-    set -- `type $1 2>&1`
-    if [ "$2" = "not" -a "$3" = "found" ] || [ "$3" = "not" -a "$4" = "found" ]
-    then
-        return 1
-    else
-        return 0
-    fi
-}
-
-unlock_directory() {
-    ul_dir=$1/.  		# get any symlink out of the way using '.'
-    if [ -d $ul_dir ]
-    then
-        find $ul_dir -type d ! -perm -0222 -print | $XARGS -t chmod +w
-    fi
-}
-
-# Use gnu xargs if available; faster, more reliable in general
-XARGS=xargs
-cmd_avail gxargs && XARGS=gxargs
-
-for dir
-do
-    unlock_directory $dir
-done
-
-# Local Variables: ***
-# mode:ksh ***
-# End: ***
-
diff --git a/tools/cpu/Makefile.in b/tools/cpu/Makefile.in
deleted file mode 100644
index 6dba1f38f6..0000000000
--- a/tools/cpu/Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/directory.cfg
-
-SUB_DIRS=generic $(wildcard $(RTEMS_CPU))
diff --git a/tools/cpu/generic/Makefile.in b/tools/cpu/generic/Makefile.in
deleted file mode 100644
index 33c2fb81dd..0000000000
--- a/tools/cpu/generic/Makefile.in
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# $Id$
-#
-# RTEMS build tools
-# NOTE: of course we can't use any of these tools
-#		in this Makefile.  Most notably: install-if-change
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-include $(RTEMS_ROOT)/make/rtems.cfg
-
-DESTDIR=$(PROJECT_RELEASE)/bin
-
-BUILD_PGMS=size_rtems
-PGMS=$(BUILD_PGMS)
-
-CLEAN_ADDITIONS += $(BUILD_PGMS)
-
-INSTALLED_PGMS=$(PGMS:%=$(DESTDIR)/%)
-
-all:	$(DESTDIR) $(PGMS) install
-
-$(DESTDIR):
-	@INSTALL@ $(INSTDIRFLAGS) $@
-
-$(INSTALLED_PGMS): $(PGMS)
-	@INSTALL@ $(INSTBINFLAGS) $^ $@
-
-install:  $(DESTDIR) $(INSTALLED_PGMS)
diff --git a/tools/cpu/generic/size_rtems.in b/tools/cpu/generic/size_rtems.in
deleted file mode 100644
index 72c96e842c..0000000000
--- a/tools/cpu/generic/size_rtems.in
+++ /dev/null
@@ -1,276 +0,0 @@
-#!@KSH@ -p
-#
-#  size_rtems
-#
-#  This script gathers information related to the size of RTEMS
-#  using the GNU "size" command.
-#
-#  This script operates by summing up the sizes of the various
-#  object files which constitute a particular configuration of
-#  RTEMS.  This size information is gathered for placement in the
-#  brochure flyers and supplement manuals.
-#
-#  NOTE: The concept of the minimum executive size is buried in this script.
-#
-#  COPYRIGHT (c) 1989-1998.
-#  On-Line Applications Research Corporation (OAR).
-#  Copyright assigned to U.S. Government, 1994.
-#
-#  The license and distribution terms for this file may be
-#  found in the file LICENSE in this distribution or at
-#  http://www.OARcorp.com/rtems/license.html.
-#
-#  $Id$
-#
-
-target=@target@
-program_prefix=@program_prefix@
-
-gnusize=${program_prefix}size
-
-# check usage
-if [ $# -ne 2 ] ; then
-  echo usage ${0}: bsp object_directory
-  exit 1
-fi
-
-bsp=$1
-board=$1
-ARCH=$2
-
-cpu=`echo $target | sed -e 's/-.*//'`
-
-case $target in
-  sparc-sun-solaris*)
-      rtems_cpu=unix
-      bsp=solaris2
-      echo Not supported on unix port.
-      exit 0
-      ;;
-  i[3456]86-pc-linux-gnu)
-      echo linux
-      rtems_cpu=unix
-      bsp=linux1
-      echo Not supported on unix port.
-      exit 0
-      ;;
-  i[3456]86-unknown-freebsd2.[12]*)
-      echo freebsd
-      rtems_cpu=unix
-      bsp=freebsd2
-      echo Not supported on unix port.
-      exit 0
-      ;;
-  *-rtems*)
-    cpu=`echo $target | sed -e 's/-.*//'`
-    rtems_cpu=$cpu
-    ;;
-  *)
-    echo unknown target $target
-    exit 1
-    ;;
-esac
-
-case $ARCH in
-  *debug*)   VARIANT=debug ;;
-  *profile*) VARIANT=profile ;;
-  *)         VARIANT=optimized;;
-esac
-
-echo
-echo Size Information for the Following Configuration:
-echo CPU: ${cpu}
-echo BSP: ${board}
-echo VARIANT: ${VARIANT}
-echo
-
-
-#
-#  KLUDGE to figure out at runtime how to echo a line without a
-#  newline.
-#
-count=`echo "\\c" | wc -c`
-if [ ${count} -ne 0 ] ; then
-  EARG="-n"
-  EOL=""
-else
-  EARG=""
-  EOL="\\c"
-fi
-
-if [ ! -d ${board} ] ; then
-  echo "${board} does not exist ... is the current directory the build directory?"
-  exit 1
-fi
-
-#DIRLIST -- so greps for DIRLIST will find this file
-CPUOBJ=c/src/exec/score/cpu/${rtems_cpu}/${ARCH}
-COREOBJ=c/src/exec/score/src/${ARCH}
-RTEMSOBJ=c/src/exec/rtems/src/${ARCH}
-SAPIOBJ=c/src/exec/sapi/src/${ARCH}
-OPTOBJ=c/src/exec/rtems/optman/${ARCH}
-
-MANLIST=" \
-${RTEMSOBJ}/clock.o \
-${RTEMSOBJ}/dpmem.o \
-${RTEMSOBJ}/event.o \
-${RTEMSOBJ}/intr.o \
-${RTEMSOBJ}/msg.o \
-${RTEMSOBJ}/part.o \
-${RTEMSOBJ}/ratemon.o \
-${RTEMSOBJ}/region.o \
-${RTEMSOBJ}/sem.o \
-${RTEMSOBJ}/signal.o \
-${RTEMSOBJ}/tasks.o \
-${RTEMSOBJ}/timer.o \
-${SAPIOBJ}/debug.o \
-${SAPIOBJ}/extension.o \
-${SAPIOBJ}/fatal.o \
-${SAPIOBJ}/exinit.o \
-${SAPIOBJ}/io.o \
-${SAPIOBJ}/rtemsapi.o \
-"
-MPLIST="\
-${RTEMSOBJ}/mp.o ${RTEMSOBJ}/eventmp.o \
-${COREOBJ}/mpci.o ${RTEMSOBJ}/msgmp.o ${COREOBJ}/objectmp.o \
-${RTEMSOBJ}/partmp.o ${RTEMSOBJ}/regionmp.o ${RTEMSOBJ}/semmp.o \
-${RTEMSOBJ}/signalmp.o ${RTEMSOBJ}/taskmp.o ${COREOBJ}/threadmp.o \
-"
-
-OPTMANLIST="\
-${OPTOBJ}/no-dpmem.rel \
-${OPTOBJ}/no-event.rel \
-${OPTOBJ}/no-mp.rel \
-${OPTOBJ}/no-msg.rel \
-${OPTOBJ}/no-part.rel \
-${OPTOBJ}/no-region.rel \
-${OPTOBJ}/no-rtmon.rel \
-${OPTOBJ}/no-sem.rel \
-${OPTOBJ}/no-signal.rel \
-${OPTOBJ}/no-timer.rel \
-"
-REQMANLIST="\
-${SAPIOBJ}/exinit.o \
-${RTEMSOBJ}/tasks.o \
-${RTEMSOBJ}/intr.o \
-${SAPIOBJ}/fatal.o \
-"
-CORELIST=" \
-${COREOBJ}/apiext.o ${COREOBJ}/chain.o \
-${COREOBJ}/coremsg.o   ${COREOBJ}/coremutex.o ${COREOBJ}/coresem.o \
-${COREOBJ}/heap.o  ${COREOBJ}/interr.o \
-${COREOBJ}/isr.o \
-${COREOBJ}/object.o \
-${SAPIOBJ}/rtemsapi.o \
-${COREOBJ}/thread.o ${COREOBJ}/threadq.o ${COREOBJ}/tod.o \
-${COREOBJ}/userext.o \
-${COREOBJ}/watchdog.o ${COREOBJ}/wkspace.o \
-"
-
-CPULIST="\
-${CPUOBJ}/rtems-cpu.rel \
-"
-
-# check directories
-for i in ${EXECOBJ} ${CPUOBJ} ${OPTOBJ}
-do
-  if [ ! -d ${i} ] ; then
-    echo "${i} does not exist ... is RTEMS compiled and installed?"
-    exit 1
-  fi
-done
-
-for i in ${MANLIST} ${MPLIST} ${OPTMANLIST} ${REQMANLIST} ${CORELIST} ${CPULIST}
-do
-  if [ ! -r ${i} ] ; then
-    echo ${i} does not exist ... is RTEMS compiled and installed?
-    exit 1
-  fi
-done
-
-# "rips" a line of gsize's output and prints size, data, bss
-parse_size()
-{
-  echo $1 $2 $3
-}
-
-# prepares a list of code, data, bss sizes for a directory
-sizedir()
-{
-  ${gnusize} $* | sed -e '1,1d' |
-    while read line
-      do
-        parse_size ${line}
-      done
-}
-
-# adds the numbers passed on the command line
-addit()
-{
-  sumx=0
-  for x in $*
-  do
-    sumx=`expr $sumx + $x`
-  done
-  echo $sumx
-}
-
-# adds a column from the output of sizedir
-addsizes()
-{
-  # dc version is not portable enough -- It can be left out during
-  #  installing linux and may not be available on non-UNIX hosts.
-  #cut -d' ' -f${2} ${1} | sed -e '2,$s/$/ + /' -e '$,$s/$/ p/' | dc
-  
-  #  This may not be as fast but it is probably more portable.
-  addit `cut -d' ' -f${2} ${1}`
-}
-
-# calculates total size of a directory and prints report line
-size_files()
-{
-  trap "rm -f /tmp/size.$$ ; exit 1"  2 3
-
-    for file in $*
-      do
-        parse_size `${gnusize} $file | sed -e '/text/d'`
-      done >/tmp/size.$$
-
-  code=`cat /tmp/size.$$ | addsizes 1`
-  data=`cat /tmp/size.$$ | addsizes 2`
-  bss=` cat /tmp/size.$$ | addsizes 3`
-  echo "${code}	${data}	${bss}"
-  rm /tmp/size.$$
-}
-
-echo
-echo "     RTEMS SIZE REPORT"
-echo
-echo   "          CODE	DATA	BSS"
-echo   "          =================="
-echo ${EARG} "MANAGERS: " ${EOL} ; size_files $MANLIST $MPLIST
-echo ${EARG} "CORE    : " ${EOL} ; size_files $CORELIST $CPULIST
-echo ${EARG} "CPU     : " ${EOL} ; size_files $CPULIST
-echo ${EARG} "OVERALL : " ${EOL} ; size_files $CPULIST $CORELIST $MANLIST \
-                                               $MPLIST
-echo ${EARG} "MINIMUM : " ${EOL} ; size_files $CPULIST $CORELIST \
-                                               $OPTMANLIST $REQMANLIST
-echo
-
-for file in $MANLIST
-do
-  base=`basename ${file}`
-  echo ${EARG}  ""${base}	: " ${EOL} " ; size_files ${file}
-done
-
-echo ${EARG} "MP	 : " ${EOL} ; size_files $MPLIST
-
-echo
-for file in $OPTMANLIST
-do
-  base=`basename ${file}`
-  echo ${EARG} "${base}	: " ${EOL} ; size_files ${file}
-done
-
-echo
-exit 0
diff --git a/tools/cpu/hppa1.1/genoffsets.c b/tools/cpu/hppa1.1/genoffsets.c
deleted file mode 100644
index 9be7884f7b..0000000000
--- a/tools/cpu/hppa1.1/genoffsets.c
+++ /dev/null
@@ -1,348 +0,0 @@
-/*
- *  genoffsets.c
- *
- *  This file generates the offsets.h for the HP PA-RISC port of RTEMS.
- *
- *  NOTE:  It only prints the offset for structures actually used
- *         by the assembly code.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  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.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include <stdio.h>
-
-#if defined(__hpux__) && defined(__hppa__)
-#include <rtems/system.h>
-#endif
-
-void print_information( void );
-
-int main(
-  int argc,
-  char **argv
-)
-{
-#if defined(__hpux__) && defined(__hppa__)
-  unsigned int size = 0;
-#endif
-
-  /*
-   * Print the file header
-   */
-
-printf(
-  "/*  offsets.h\n"
-  " *\n"
-  " *  This include file contains the offsets of elements in the\n"
-  " *  C data structures used by the assembly language code for the\n"
-  " *  HP PA-RISC 1.1 port of RTEMS.\n"
-  " *\n"
-  " *  NOTE:  THIS FILE IS AUTOMATICALLY GENERATED!!!!\n"
-  " *         DO NOT EDIT THIS BY HAND!!!!\n"
-  " *\n"
-  " *  COPYRIGHT (c) 1989-1998.\n"
-  " *  On-Line Applications Research Corporation (OAR).\n"
-  " *  Copyright assigned to U.S. Government, 1994.\n"
-  " *\n"
-  " *  The license and distribution terms for this file may be\n"
-  " *  found in the file LICENSE in this distribution or at\n"
-  " *  http://www.OARcorp.com/rtems/license.html.\n"
-  " */\n"
-  "\n"
-  "#ifndef __OFFSETS_h\n"
-  "#define __OFFSETS_h\n"
-  "\n"
-);
-
-#define PRINT_IT( STRING, TYPE, FIELD ) \
-  printf( "#define\t%s\t0x%p\t\t/* %d */\n", \
-          STRING, \
-          &((TYPE)0)->FIELD, \
-          (int) &((TYPE)0)->FIELD );
-
-#define PRINT_SIZE( STRING, item ) \
-  printf( "#ifdef ASM\n#define\t%s\t%d\t\t/* 0x%x */\n#endif\n", \
-          STRING, \
-          sizeof(item), \
-          sizeof(item) );
-
-#define PRINT_COMMENT( STRING ) \
-  printf(       \
-    "\n"        \
-    "/*\n"      \
-    " * " STRING "\n" \
-    " */\n"     \
-    "\n"        \
-  );
-
-#if defined(__hpux__) && defined(__hppa__)
-
-/*
- *  Offsets of elements in the Context_control structure.
- */
-
-  PRINT_COMMENT("Context_Control information");
-
-  PRINT_IT( "FLAGS_OFFSET", Context_Control *, flags );
-  PRINT_IT( "R1_OFFSET", Context_Control *, gr1 );
-  PRINT_IT( "R2_OFFSET", Context_Control *, gr2 );
-  PRINT_IT( "R3_OFFSET", Context_Control *, gr3 );
-  PRINT_IT( "R4_OFFSET", Context_Control *, gr4 );
-  PRINT_IT( "R5_OFFSET", Context_Control *, gr5 );
-  PRINT_IT( "R6_OFFSET", Context_Control *, gr6 );
-  PRINT_IT( "R7_OFFSET", Context_Control *, gr7 );
-  PRINT_IT( "R8_OFFSET", Context_Control *, gr8 );
-  PRINT_IT( "R9_OFFSET", Context_Control *, gr9 );
-  PRINT_IT( "R10_OFFSET", Context_Control *, gr10 );
-  PRINT_IT( "R11_OFFSET", Context_Control *, gr11 );
-  PRINT_IT( "R12_OFFSET", Context_Control *, gr12 );
-  PRINT_IT( "R13_OFFSET", Context_Control *, gr13 );
-  PRINT_IT( "R14_OFFSET", Context_Control *, gr14 );
-  PRINT_IT( "R15_OFFSET", Context_Control *, gr15 );
-  PRINT_IT( "R16_OFFSET", Context_Control *, gr16 );
-  PRINT_IT( "R17_OFFSET", Context_Control *, gr17 );
-  PRINT_IT( "R18_OFFSET", Context_Control *, gr18 );
-  PRINT_IT( "R19_OFFSET", Context_Control *, gr19 );
-  PRINT_IT( "R20_OFFSET", Context_Control *, gr20 );
-  PRINT_IT( "R21_OFFSET", Context_Control *, gr21 );
-  PRINT_IT( "R22_OFFSET", Context_Control *, gr22 );
-  PRINT_IT( "R23_OFFSET", Context_Control *, gr23 );
-  PRINT_IT( "R24_OFFSET", Context_Control *, gr24 );
-  PRINT_IT( "R25_OFFSET", Context_Control *, gr25 );
-  PRINT_IT( "R26_OFFSET", Context_Control *, gr26 );
-  PRINT_IT( "R27_OFFSET", Context_Control *, gr27 );
-  PRINT_IT( "R28_OFFSET", Context_Control *, gr28 );
-  PRINT_IT( "R29_OFFSET", Context_Control *, gr29 );
-  PRINT_IT( "R30_OFFSET", Context_Control *, sp );
-  PRINT_IT( "R31_OFFSET", Context_Control *, gr31 );
-
-  /*
-   * And common aliases for the above
-   */
-
-  PRINT_COMMENT("Common aliases for above");
-
-  PRINT_IT( "RP_OFFSET",   Context_Control *, gr2 );
-  PRINT_IT( "ARG3_OFFSET", Context_Control *, gr23 );
-  PRINT_IT( "ARG2_OFFSET", Context_Control *, gr24 );
-  PRINT_IT( "ARG1_OFFSET", Context_Control *, gr25 );
-  PRINT_IT( "ARG0_OFFSET", Context_Control *, gr26 );
-  PRINT_IT( "SP_OFFSET",   Context_Control *, sp );
-  PRINT_IT( "DP_OFFSET",   Context_Control *, gr27 );
-  PRINT_IT( "RET0_OFFSET", Context_Control *, gr28 );
-  PRINT_IT( "RET1_OFFSET", Context_Control *, gr29 );
-
-  PRINT_SIZE("CPU_CONTEXT_SIZE", Context_Control);
-
-  PRINT_COMMENT("Context_Control_fp information");
-
-  PRINT_IT( "FR0_OFFSET", Context_Control_fp *, fr0 );
-  PRINT_IT( "FR1_OFFSET", Context_Control_fp *, fr1 );
-  PRINT_IT( "FR2_OFFSET", Context_Control_fp *, fr2 );
-  PRINT_IT( "FR3_OFFSET", Context_Control_fp *, fr3 );
-  PRINT_IT( "FR4_OFFSET", Context_Control_fp *, fr4 );
-  PRINT_IT( "FR5_OFFSET", Context_Control_fp *, fr5 );
-  PRINT_IT( "FR6_OFFSET", Context_Control_fp *, fr6 );
-  PRINT_IT( "FR7_OFFSET", Context_Control_fp *, fr7 );
-  PRINT_IT( "FR8_OFFSET", Context_Control_fp *, fr8 );
-  PRINT_IT( "FR9_OFFSET", Context_Control_fp *, fr9 );
-  PRINT_IT( "FR10_OFFSET", Context_Control_fp *, fr10 );
-  PRINT_IT( "FR11_OFFSET", Context_Control_fp *, fr11 );
-  PRINT_IT( "FR12_OFFSET", Context_Control_fp *, fr12 );
-  PRINT_IT( "FR13_OFFSET", Context_Control_fp *, fr13 );
-  PRINT_IT( "FR14_OFFSET", Context_Control_fp *, fr14 );
-  PRINT_IT( "FR15_OFFSET", Context_Control_fp *, fr15 );
-  PRINT_IT( "FR16_OFFSET", Context_Control_fp *, fr16 );
-  PRINT_IT( "FR17_OFFSET", Context_Control_fp *, fr17 );
-  PRINT_IT( "FR18_OFFSET", Context_Control_fp *, fr18 );
-  PRINT_IT( "FR19_OFFSET", Context_Control_fp *, fr19 );
-  PRINT_IT( "FR20_OFFSET", Context_Control_fp *, fr20 );
-  PRINT_IT( "FR21_OFFSET", Context_Control_fp *, fr21 );
-  PRINT_IT( "FR22_OFFSET", Context_Control_fp *, fr22 );
-  PRINT_IT( "FR23_OFFSET", Context_Control_fp *, fr23 );
-  PRINT_IT( "FR24_OFFSET", Context_Control_fp *, fr24 );
-  PRINT_IT( "FR25_OFFSET", Context_Control_fp *, fr25 );
-  PRINT_IT( "FR26_OFFSET", Context_Control_fp *, fr26 );
-  PRINT_IT( "FR27_OFFSET", Context_Control_fp *, fr27 );
-  PRINT_IT( "FR28_OFFSET", Context_Control_fp *, fr28 );
-  PRINT_IT( "FR29_OFFSET", Context_Control_fp *, fr29 );
-  PRINT_IT( "FR30_OFFSET", Context_Control_fp *, fr30 );
-  PRINT_IT( "FR31_OFFSET", Context_Control_fp *, fr31 );
-
-  PRINT_SIZE("CPU_CONTEXT_FP_SIZE", Context_Control_fp);
-
-  /*
-   *  And the control registers
-   */
-
-  PRINT_COMMENT("Control register portion of context");
-
-  PRINT_IT( "SAR_OFFSET", Context_Control *, sar );
-  PRINT_IT( "IPSW_OFFSET", Context_Control *, ipsw );
-  PRINT_IT( "IIR_OFFSET", Context_Control *, iir );
-  PRINT_IT( "IOR_OFFSET", Context_Control *, ior );
-  PRINT_IT( "ISR_OFFSET", Context_Control *, isr );
-  PRINT_IT( "PCOQFRONT_OFFSET", Context_Control *, pcoqfront );
-  PRINT_IT( "PCOQBACK_OFFSET", Context_Control *, pcoqback );
-  PRINT_IT( "PCSQFRONT_OFFSET", Context_Control *, pcsqfront );
-  PRINT_IT( "PCSQBACK_OFFSET", Context_Control *, pcsqback );
-  PRINT_IT( "ITIMER_OFFSET", Context_Control *, itimer );
-
-  /*
-   *  Full interrupt frame (integer + float)
-   */
-  PRINT_COMMENT("Interrupt frame information");
-
-  PRINT_IT( "INTEGER_CONTEXT_OFFSET", CPU_Interrupt_frame *, Integer );
-  PRINT_IT( "FP_CONTEXT_OFFSET", CPU_Interrupt_frame *, Floating_Point );
-  size = sizeof( CPU_Interrupt_frame );
-
-  if ( size % CPU_STACK_ALIGNMENT )
-    size += CPU_STACK_ALIGNMENT - (size % CPU_STACK_ALIGNMENT);
-
-  printf( "#define\tCPU_INTERRUPT_FRAME_SIZE\t%d\t\t/* 0x%x */\n", size, size );
-
-#else
-
-  print_information();
-
-#endif
-
-#undef PRINT_IT
-#undef PRINT_SIZE
-#undef PRINT_COMMENT
-
-  /*
-   *  Print the end of file stuff
-   */
-
-   printf(
-    "\n"
-    "#endif    /* __OFFSETS_h  */\n"
-    "\n"
-    "/* end of include file */\n"
-  );
-
-  return 0;
-}
-
-void print_information( void )
-{
-
-#define PRINT_IT( STRING, NUMBER ) \
-  printf( "#define\t%s\t0x%x\t\t/* %d */\n", \
-          STRING, \
-          NUMBER, \
-          NUMBER );
-
-#define PRINT_SIZE( STRING, NUMBER ) \
-  printf( "#define\t%s\t0x%x\t\t/* %d */\n", \
-          STRING, \
-          NUMBER, \
-          NUMBER );
-
-#define PRINT_COMMENT( STRING ) \
-  printf(       \
-    "\n"        \
-    "/*\n"      \
-    " * " STRING "\n" \
-    " */\n"     \
-    "\n"        \
-  );
-
-/*
- *  Offsets of elements in the Context_control structure.
- */
-
-  PRINT_COMMENT("Context_Control information");
-
-  PRINT_IT( "FLAGS_OFFSET",  0x00 );
-  PRINT_IT( "R1_OFFSET",     0x04 );
-  PRINT_IT( "R2_OFFSET",     0x08 );
-  PRINT_IT( "R3_OFFSET",     0x0c );
-  PRINT_IT( "R4_OFFSET",     0x00 );
-  PRINT_IT( "R5_OFFSET",     0x14 );
-  PRINT_IT( "R6_OFFSET",     0x18 );
-  PRINT_IT( "R7_OFFSET",     0x1c );
-  PRINT_IT( "R8_OFFSET",     0x20 );
-  PRINT_IT( "R9_OFFSET",     0x24 );
-  PRINT_IT( "R10_OFFSET",    0x28 );
-  PRINT_IT( "R11_OFFSET",    0x2c );
-  PRINT_IT( "R12_OFFSET",    0x30 );
-  PRINT_IT( "R13_OFFSET",    0x34 );
-  PRINT_IT( "R14_OFFSET",    0x38 );
-  PRINT_IT( "R15_OFFSET",    0x3c );
-  PRINT_IT( "R16_OFFSET",    0x40 );
-  PRINT_IT( "R17_OFFSET",    0x44 );
-  PRINT_IT( "R18_OFFSET",    0x48 );
-  PRINT_IT( "R19_OFFSET",    0x4c );
-  PRINT_IT( "R20_OFFSET",    0x50 );
-  PRINT_IT( "R21_OFFSET",    0x54 );
-  PRINT_IT( "R22_OFFSET",    0x58 );
-  PRINT_IT( "R23_OFFSET",    0x5c );
-  PRINT_IT( "R24_OFFSET",    0x60 );
-  PRINT_IT( "R25_OFFSET",    0x64 );
-  PRINT_IT( "R26_OFFSET",    0x68 );
-  PRINT_IT( "R27_OFFSET",    0x6c );
-  PRINT_IT( "R28_OFFSET",    0x70 );
-  PRINT_IT( "R29_OFFSET",    0x74 );
-  PRINT_IT( "R30_OFFSET",    0x78 );
-  PRINT_IT( "R31_OFFSET",    0x7c );
-
-  /*
-   * And common aliases for the above
-   */
-
-  PRINT_COMMENT("Common aliases for above");
-
-  PRINT_IT( "RP_OFFSET",   0x08 );
-  PRINT_IT( "ARG3_OFFSET", 0x5c );
-  PRINT_IT( "ARG2_OFFSET", 0x60 );
-  PRINT_IT( "ARG1_OFFSET", 0x64 );
-  PRINT_IT( "ARG0_OFFSET", 0x68 );
-  PRINT_IT( "SP_OFFSET",   0x78 );
-  PRINT_IT( "DP_OFFSET",   0x6c );
-  PRINT_IT( "RET0_OFFSET", 0x74 );
-  PRINT_IT( "RET1_OFFSET", 0x74 );
-
-  PRINT_SIZE("CPU_CONTEXT_SIZE", 168 );
-
-  PRINT_COMMENT("Context_Control_fp information");
-
-  PRINT_SIZE("CPU_CONTEXT_FP_SIZE", 256);
-
-  /*
-   *  And the control registers
-   */
-
-  PRINT_COMMENT("Control register portion of context");
-
-  PRINT_IT( "SAR_OFFSET",        0x80 );
-  PRINT_IT( "IPSW_OFFSET",       0x84 );
-  PRINT_IT( "IIR_OFFSET",        0x88 );
-  PRINT_IT( "IOR_OFFSET",        0x8c );
-  PRINT_IT( "ISR_OFFSET",        0x90 );
-  PRINT_IT( "PCOQFRONT_OFFSET",  0x94 );
-  PRINT_IT( "PCOQBACK_OFFSET",   0x98 );
-  PRINT_IT( "PCSQFRONT_OFFSET",  0x9c );
-  PRINT_IT( "PCSQBACK_OFFSET",   0xa0 );
-  PRINT_IT( "ITIMER_OFFSET",     0xa4 );
-
-  /*
-   *  Full interrupt frame (integer + float)
-   */
-
-  PRINT_COMMENT("Interrupt frame information");
-
-  PRINT_IT( "INTEGER_CONTEXT_OFFSET",   0x00 );
-  PRINT_IT( "FP_CONTEXT_OFFSET",        0xa8 );
-  PRINT_SIZE( "CPU_INTERRUPT_FRAME_SIZE", 448 );
-
-}
diff --git a/tools/cpu/sh/AUTHORS b/tools/cpu/sh/AUTHORS
deleted file mode 100644
index 225c2fa974..0000000000
--- a/tools/cpu/sh/AUTHORS
+++ /dev/null
@@ -1,3 +0,0 @@
-Ralf Corsepius (corsepiu@faw.uni-ulm.de)
-	* Initial implementation
-	* generator for sci bitrate table
diff --git a/tools/cpu/sh/COPYING b/tools/cpu/sh/COPYING
deleted file mode 100644
index 805cdd8ffc..0000000000
--- a/tools/cpu/sh/COPYING
+++ /dev/null
@@ -1,19 +0,0 @@
-
-    shgen - code generator for the Hitachi SH microcontroller family
-
-    Copyright (C) 1998 Ralf Corsepius (corsepiu@faw.uni-ulm.de)
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or   
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of 
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the  
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  
-
diff --git a/tools/cpu/sh/Makefile.in b/tools/cpu/sh/Makefile.in
deleted file mode 100644
index cbda87fbd8..0000000000
--- a/tools/cpu/sh/Makefile.in
+++ /dev/null
@@ -1,62 +0,0 @@
-#
-#  $Id$
-#
-#  FIXME: $ARCH shouldn't be used inside of host-tools.
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-# we use the host compiler here 
-USE_HOST_COMPILER=yes
-
-# C source names, if any, go here -- minus the .c
-C_PIECES=shgen sci
-C_FILES=$(C_PIECES:%=%.c)
-C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
-
-H_FILES=sci.h
-
-SRCS=$(C_FILES) $(H_FILES)
-OBJS=$(C_O_FILES)
-
-PGMS=${ARCH}/shgen@EXEEXT@
-
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-#
-# Add local stuff here using +=
-#
-
-DEFINES  += -Wall
-CPPFLAGS += -I.
-CFLAGS   +=
-
-LD_PATHS  +=
-LD_LIBS   += -lm
-LDFLAGS   +=
-
-#
-# Add your list of files to delete here.
-#
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
-
-DESTDIR=${PROJECT_RELEASE}/bin
-
-all:	$(ARCH) $(PGMS)
-
-${PGMS}: $(OBJS) $(LINK_FILES)
-	$(make-exe)
-
-$(DESTDIR):
-	@INSTALL@ $(INSTDIRFLAGS) $@
-
-# Install the program
-install:  $(DESTDIR) $(PGMS)
-	@INSTALL@ $(INSTBINFLAGS) ${PGMS} $(DESTDIR)
diff --git a/tools/cpu/sh/TODO b/tools/cpu/sh/TODO
deleted file mode 100644
index bcdd1bf6df..0000000000
--- a/tools/cpu/sh/TODO
+++ /dev/null
@@ -1,13 +0,0 @@
-* Add support for more drivers to shgen !!!!
-
-* shgen relies on having a gnu-compatible getopt, which should be
-  available on all hosts using gcc/egcs/binutils. 
-  Using other getopt-variants may produce faulty results or shgen may also
-  refuse to compile. Probably the easiest solution to this problem would be 
-  to integrate libiberty into rtems.
-
-* shgen uses floating point mathematics. Therefore Makefile.in contains a 
-  reference to libm. In case the host doesn't have its floating point
-  support in libm, shgen will fail to compile. If we should ever meet such 
-  a host, checks for floating point libraries have to be added to rtems'
-  autoconf support.
diff --git a/tools/cpu/sh/sci.c b/tools/cpu/sh/sci.c
deleted file mode 100644
index 3310e7e791..0000000000
--- a/tools/cpu/sh/sci.c
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * Copyright (c) 1998 Ralf Corsepius (corsepiu@faw.uni-ulm.de)
- *
- * See the file COPYING for copyright notice.
- */
-
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "sci.h"
-
-/*
-   n .. baudrate generator source 0,1,2,3
-   
-   N .. BRR setting (0..255)
-   
-   Phi .. processor baud rate
-   
-   B .. bitrate
- */
-
-typedef struct sci_tab {
-  unsigned int  B ;
-  unsigned int  n ;
-  int 		N ;
-  double        err ;
-  } sci_tab_t ;
-
-static unsigned int bitrate [] = {
-  50,
-  75,
-  110,
-  134,
-  150,
-  200,
-  300,
-  600,
-  1200,
-  1800,
-  2400,
-  4800,
-  9600,
-  19200,
-  38400,
-  57600,
-  115200,
-  230400,
-  460800
-};
-
-static sci_tab_t test_array[4] ;
-
-static void Compute( 
-  unsigned int n, 
-  unsigned int B, 
-  double   Phi,
-  struct sci_tab *entry )
-{
-  int    a = ( 32 << ( 2 * n ) ) * B ;
-  
-  entry->n = n ;
-  entry->B = B ;
-  entry->N = rint( ( Phi / a ) - 1.0 ) ;
-
-  if ( ( entry->N > 0 ) && ( entry->N < 256 ) ) 
-    entry->err = 
-      ( ( Phi / ( (entry->N + 1) * a ) - 1.0 ) * 100.0 );
-  else
-    entry->err = 100.0 ;
-}
-
-static sci_tab_t *SelectN( 
-  unsigned int 	B,
-  double 	Phi )
-{
-  unsigned int i ;
-  struct sci_tab* best = NULL ;
-    
-  for ( i = 0 ; i < 4 ; i++ )
-  { 
-    double err ;
-    
-    Compute( i, B, Phi, &test_array[i] );
-    err = fabs( test_array[i].err );
-
-    if ( best )
-    {
-      if ( err < fabs( best->err ) )
-        best = &test_array[i] ;
-    }
-    else
-      best = &test_array[i] ;
-  }
-
-  return best ; 
-}
-
-int shgen_gensci(
-  FILE		*file,
-  double	Phi ) /* Processor frequency [Hz] */
-{
-  unsigned int i ;
-
-  fprintf( file, 
-    "/*\n * Bitrate table for the serial devices (sci) of the SH at %.3f MHz\n"
-    " */\n\n", Phi / 1000000.0 );
-  fprintf( file,
-    "/*\n"
-    " * n     .. SMR bits 0,1 : baud rate generator clock source\n"
-    " * N     .. BRR bits 0..7: setting for baud rate generator\n"
-    " * error .. percentual error to nominal bitrate\n"
-    " *   Hitachi's HW manual recommends bitrates with an error less than 1%%\n"
-    " *   We experienced values less than 2%% to be stable\n"
-    " */\n\n" );
-  fprintf( file, "#include <termios.h>\n\n" );
-  fprintf( file, 
-    "static struct sci_bitrate_t {\n"
-    "  unsigned char n ;\n"
-    "  unsigned char N ;\n"
-    "} _sci_bitrates[] = {\n"
-    "/*  n    N      error */\n" );
-  
-  for ( i = 0 ; i < sizeof(bitrate)/sizeof(int) ; i++ )
-  {
-    struct sci_tab* best = SelectN( bitrate[i], Phi );
-
-    if ( i > 0 )
-      fprintf( file, ",\n" );
-    fprintf( file, "  { %1d, %3d } /* %+7.2f%% ; B%d */",
-      best->n,
-      best->N,
-      best->err,
-      best->B );
-  }
-
-  fprintf( file, "\n};\n\n" );
-
-  fprintf( file, 
-    "int _sci_get_brparms( \n"
-    "  tcflag_t      cflag,\n"
-    "  unsigned char *smr,\n"
-    "  unsigned char *brr )\n"
-    "{\n"
-    "  unsigned int offset ;\n\n"
-    "  offset = ( cflag & ( CBAUD & ~CBAUDEX ) )\n"
-    "    + ( ( cflag & CBAUDEX ) ? B38400 : 0 );\n"
-    "  if ( offset == 0 ) return -1 ;\n"
-    "  offset-- ;\n\n"
-    "  *smr &= ~0x03;\n"
-    "  *smr |= _sci_bitrates[offset].n;\n"
-    "  *brr =  _sci_bitrates[offset].N;\n\n"
-    "  return 0;\n"
-    "}\n" );
-    
-  return 0 ;
-}
diff --git a/tools/cpu/sh/sci.h b/tools/cpu/sh/sci.h
deleted file mode 100644
index b55bbfb670..0000000000
--- a/tools/cpu/sh/sci.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef _shgen_sci_h
-#define _shgen_sci_h
-
-#include <stdio.h>
-
-extern int shgen_gensci(
-  FILE		*file,
-  double	Phi /* Processor frequency [Hz] */
-  );
-
-#endif
diff --git a/tools/cpu/sh/shgen.c b/tools/cpu/sh/shgen.c
deleted file mode 100644
index 15c179a855..0000000000
--- a/tools/cpu/sh/shgen.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 1998 Ralf Corsepius (corsepiu@faw.uni-ulm.de)
- *
- * See the file COPYING for copyright notice.
- */
-
-#include <stdio.h>
-#include <string.h>	/* strcmp, strerror */
-#include <errno.h>
-#include <getopt.h>
-
-#include "sci.h"
-
-static void usage( char *prog )
-{
-  fprintf( stderr, "usage: %s [options] driver\n", prog );
-  fprintf( stderr, "options:\n" );
-  fprintf( stderr, "\t-M Phi      .. processor frequency [MHz] default: 20\n" );
-  fprintf( stderr, "driver:\n" );
-  fprintf( stderr, "\tsci .. bitrate table for sci\n" );
-  exit ( 1 );
-}
-
-static void shgen_header( FILE *file )
-{
-  fprintf( file, 
-    "/*\n * DO NOT EDIT - this file is automatically generated by shgen 0.2\n" );
-  fprintf( file,
-    " * Copyright (c) 1998, Ralf Corsepius (corsepiu@faw.uni-ulm.de)\n */\n" );
-  fprintf( file, 
-    "\n/* This file is not copyrighted */\n\n" );
-}
-
-int main( int argc, char *argv[] )
-{
-  double 	Phi = 20.0 ;
-  
-  while ( ( optopt = getopt( argc, argv, "M:" ) ) > 0 )
-  {
-    switch ( optopt )
-    {
-    case 'M' :
-      sscanf( optarg, "%lf", &Phi ); 
-      Phi = Phi * 1000000.0;
-      break ;
-    default  :
-      usage( argv[0] );
-      break ;
-    }
-  }
-
-  if ( argc - optind != 1 )
-    usage( argv[0] );
-
-  shgen_header( stdout );
-      
-  if ( strcmp( argv[optind], "sci" ) == 0 )
-  {
-    shgen_gensci( stdout, Phi );
-  }
-  else
-    usage( argv[0] );
-      
-  return 0 ;
-}
diff --git a/tools/cpu/unix/Makefile.in b/tools/cpu/unix/Makefile.in
deleted file mode 100644
index 0b8402d15f..0000000000
--- a/tools/cpu/unix/Makefile.in
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-# we use host compiler here for gensize.  Hopefully it has same alignment!!
-USE_HOST_COMPILER=yes
-
-# C source names, if any, go here -- minus the .c
-C_PIECES=gensize
-C_FILES=$(C_PIECES:%=%.c)
-C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
-
-H_FILES=
-
-SRCS=$(C_FILES) $(H_FILES)
-OBJS=$(C_O_FILES)
-
-PGMS=${ARCH}/gensize
-
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-# We use files that have not been installed yet.
-CPU_DIR=../../cpu/$(RTEMS_CPU)
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES  +=
-CPPFLAGS += -I$(PROJECT_INCLUDE) \
-	    -I$(CPU_DIR)
-CFLAGS   +=
-
-LD_PATHS  +=
-LD_LIBS   +=
-LDFLAGS   +=
-
-#
-# Add your list of files to delete here.
-#
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
-
-all:	preinstall
-
-preinstall: ${ARCH} $(SRCS) $(PGMS)
-	@INSTALL@ $(INSTBINFLAGS) $(PGMS) ${PROJECT_RELEASE}/bin
-
-# Install the program(s), appending _g or _p as appropriate.
-# for include files, just use $(INSTALL)
diff --git a/tools/cpu/unix/gensize.c b/tools/cpu/unix/gensize.c
deleted file mode 100644
index 6299479e80..0000000000
--- a/tools/cpu/unix/gensize.c
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- *  gensize.c
- *
- *  This file generates the file unixsize.h
- *
- *  NOTE:  It only prints the minimal information required.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  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.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- *
- */
-
-/* 
- *  This feels like a very crude way to determine if we are on a Solaris
- *  host but it does work.
- */
-
-#if defined(__sun__) && defined(__sparc__) && \
-    defined(__unix__) && defined(__svr4__)
-#undef  _POSIX_C_SOURCE
-#define _POSIX_C_SOURCE 3
-#undef  __STRICT_ANSI__
-#endif
-
-#include <stdio.h>
-#include <unistd.h>
-#include <setjmp.h>
-#include <signal.h>
-
-typedef struct {
-  jmp_buf     regs;
-  int         isr_level;
-} Context_Control;
-
-int main(
-  int argc,
-  char **argv
-)
-{
-  Context_Control *cc = 0;
-
-  /*
-   * Print the file header
-   */
-
-printf(
-  "/*  unixsize.h\n"
-  " *\n"
-  " *  This include file contans the size of the context control block\n"
-  " *  C data structure.  This structure must be defined in such a way\n"
-  " *  that files NOT including the native header files can work.\n"
-  " *\n"
-  " *  NOTE:  THIS FILE IS AUTOMATICALLY GENERATED!!!!\n"
-  " *         DO NOT EDIT THIS BY HAND!!!!\n"
-  " *\n"
-  " *  COPYRIGHT (c) 1989-1998.\n"
-  " *  On-Line Applications Research Corporation (OAR).\n"
-  " *  Copyright assigned to U.S. Government, 1994.\n"
-  " *\n"
-  " *  The license and distribution terms for this file may be\n"
-  " *  found in the file LICENSE in this distribution or at\n"
-  " *  http://www.OARcorp.com/rtems/license.html.\n"
-  " */\n"
-  "\n"
-  "#ifndef __UNIXSIZE_h\n"
-  "#define __UNIXSIZE_h\n"
-  "\n"
-);
-
-#define PRINT_IT( STRING, NUMBER ) \
-  printf( "#define\t%s\t0x%x\t\t/* %d */\n", \
-          STRING, \
-          NUMBER, \
-          NUMBER );
-
-#define PRINT_SIZE( STRING, NUMBER ) \
-  printf( "#define\t%s\t0x%x\t\t/* %d */\n", \
-          STRING, \
-          NUMBER, \
-          NUMBER );
-
-#define PRINT_COMMENT( STRING ) \
-  printf(       \
-    "\n"        \
-    "/*\n"      \
-    " * " STRING "\n" \
-    " */\n"     \
-    "\n"        \
-  );
-
-  PRINT_COMMENT("Context_Control information");
-
-  PRINT_SIZE("CPU_CONTEXT_SIZE_IN_BYTES", sizeof( Context_Control ) );
-  PRINT_SIZE("CPU_CONTEXT_REGISTERS_OFFSET_IN_BYTES", (int) &cc->regs );
-  PRINT_SIZE("CPU_CONTEXT_SIGNALS_OFFSET_IN_BYTES", (int) &cc->isr_level );
-
-  /*
-   *  Print the end of file stuff
-   */
-
-   printf(
-    "\n"
-    "#endif    /* __UNIXSIZE_h  */\n"
-    "\n"
-    "/* end of include file */\n"
-  );
-
-  return 0;
-}
-
diff --git a/tools/update/310_to_320_list b/tools/update/310_to_320_list
deleted file mode 100644
index adb9882a5b..0000000000
--- a/tools/update/310_to_320_list
+++ /dev/null
@@ -1,545 +0,0 @@
-#
-#  External API name
-#
-#  $Id$
-#
-initialize_executive rtems_initialize_executive
-initialize_executive_early rtems_initialize_executive_early
-initialize_executive_late rtems_initialize_executive_late
-shutdown_executive rtems_shutdown_executive
-task_create rtems_task_create
-task_ident rtems_task_ident
-task_start rtems_task_start
-task_restart rtems_task_restart
-task_delete rtems_task_delete
-task_suspend rtems_task_suspend
-task_resume rtems_task_resume
-task_set_priority rtems_task_set_priority
-task_mode rtems_task_mode
-task_get_note rtems_task_get_note
-task_set_note rtems_task_set_note
-task_wake_after rtems_task_wake_after
-task_wake_when rtems_task_wake_when
-interrupt_catch rtems_interrupt_catch
-clock_set rtems_clock_set
-clock_get rtems_clock_get
-clock_tick rtems_clock_tick
-extension_create rtems_extension_create
-extension_ident rtems_extension_ident
-extension_delete rtems_extension_delete
-timer_create rtems_timer_create
-timer_ident rtems_timer_ident
-timer_cancel rtems_timer_cancel
-timer_delete rtems_timer_delete
-timer_fire_after rtems_timer_fire_after
-timer_fire_when rtems_timer_fire_when
-timer_reset rtems_timer_reset
-semaphore_create rtems_semaphore_create
-semaphore_ident rtems_semaphore_ident
-semaphore_delete rtems_semaphore_delete
-semaphore_obtain rtems_semaphore_obtain
-semaphore_release rtems_semaphore_release
-message_queue_create rtems_message_queue_create
-message_queue_ident rtems_message_queue_ident
-message_queue_delete rtems_message_queue_delete
-message_queue_send rtems_message_queue_send
-message_queue_urgent rtems_message_queue_urgent
-message_queue_broadcast rtems_message_queue_broadcast
-message_queue_receive rtems_message_queue_receive
-message_queue_flush rtems_message_queue_flush
-event_send rtems_event_send
-event_receive rtems_event_receive
-signal_catch rtems_signal_catch
-signal_send rtems_signal_send
-partition_create rtems_partition_create
-partition_ident rtems_partition_ident
-partition_delete rtems_partition_delete
-partition_get_buffer rtems_partition_get_buffer
-partition_return_buffer rtems_partition_return_buffer
-region_create rtems_region_create
-region_extend rtems_region_extend
-region_ident rtems_region_ident
-region_delete rtems_region_delete
-region_get_segment rtems_region_get_segment
-region_get_segment_size rtems_region_get_segment_size
-region_return_segment rtems_region_return_segment
-port_create rtems_port_create
-port_ident rtems_port_ident
-port_delete rtems_port_delete
-port_external_to_internal rtems_port_external_to_internal
-port_internal_to_external rtems_port_internal_to_external
-io_initialize rtems_io_initialize
-io_open rtems_io_open
-io_close rtems_io_close
-io_read rtems_io_read
-io_write rtems_io_write
-io_control rtems_io_control
-fatal_error_occurred rtems_fatal_error_occurred
-rate_monotonic_create rtems_rate_monotonic_create
-rate_monotonic_ident rtems_rate_monotonic_ident
-rate_monotonic_delete rtems_rate_monotonic_delete
-rate_monotonic_cancel rtems_rate_monotonic_cancel
-rate_monotonic_period rtems_rate_monotonic_period
-multiprocessing_announce rtems_multiprocessing_announce
-#
-#  Internal Names for API
-#
-_Initialize_Executive rtems_initialize_executive
-_Initialize_Executive_early rtems_initialize_executive_early
-_Initialize_Executive_late rtems_initialize_executive_late
-_Shutdown_Executive rtems_shutdown_executive
-_RTEMS_tasks_Create rtems_task_create
-_RTEMS_tasks_Name_to_id rtems_task_ident
-_RTEMS_tasks_Start rtems_task_start
-_RTEMS_tasks_Restart rtems_task_restart
-_RTEMS_tasks_Delete rtems_task_delete
-_RTEMS_tasks_Suspend rtems_task_suspend
-_RTEMS_tasks_Resume rtems_task_resume
-_RTEMS_tasks_Set_priority rtems_task_set_priority
-_RTEMS_tasks_Mode rtems_task_mode
-_RTEMS_tasks_Get_note rtems_task_get_note
-_RTEMS_tasks_Set_note rtems_task_set_note
-_RTEMS_tasks_Wake_after rtems_task_wake_after
-_RTEMS_tasks_Wake_when rtems_task_wake_when
-_Interrupt_Catch rtems_interrupt_catch
-_Clock_Set rtems_clock_set
-_Clock_Get rtems_clock_get
-_Clock_Tick rtems_clock_tick
-_Extension_Create rtems_extension_create
-_Extension_Name_to_id rtems_extension_ident
-_Extension_Delete rtems_extension_delete
-_Timer_Create rtems_timer_create
-_Timer_Name_to_id rtems_timer_ident
-_Timer_Cancel rtems_timer_cancel
-_Timer_Delete rtems_timer_delete
-_Timer_Fire_after rtems_timer_fire_after
-_Timer_Fire_when rtems_timer_fire_when
-_Timer_Reset rtems_timer_reset
-_Semaphore_Create rtems_semaphore_create
-_Semaphore_Name_to_id rtems_semaphore_ident
-_Semaphore_Delete rtems_semaphore_delete
-_Semaphore_Obtain rtems_semaphore_obtain
-_Semaphore_Release rtems_semaphore_release
-_Message_queue_Create rtems_message_queue_create
-_Message_queue_Name_to_id rtems_message_queue_ident
-_Message_queue_Delete rtems_message_queue_delete
-_Message_queue_Send rtems_message_queue_send
-_Message_queue_Urgent rtems_message_queue_urgent
-_Message_queue_Broadcast rtems_message_queue_broadcast
-_Message_queue_Receive rtems_message_queue_receive
-_Message_queue_Flush rtems_message_queue_flush
-_Event_Send rtems_event_send
-_Event_Receive rtems_event_receive
-_Signal_Catch rtems_signal_catch
-_Signal_Send rtems_signal_send
-_Partition_Create rtems_partition_create
-_Partition_Name_to_id rtems_partition_ident
-_Partition_Delete rtems_partition_delete
-_Partition_Get_buffer rtems_partition_get_buffer
-_Partition_Return_buffer rtems_partition_return_buffer
-_Region_Create rtems_region_create
-_Region_Extend rtems_region_extend
-_Region_Name_to_id rtems_region_ident
-_Region_Delete rtems_region_delete
-_Region_Get_segment rtems_region_get_segment
-_Region_Get_segment_size rtems_region_get_segment_size
-_Region_Return_segment rtems_region_return_segment
-_Dual_ported_memory_Create rtems_port_create
-_Dual_ported_memory_Name_to_id rtems_port_ident
-_Dual_ported_memory_Delete rtems_port_delete
-_Dual_ported_memory_External_to_internal rtems_port_external_to_internal
-_Dual_ported_memory_Internal_to_external rtems_port_internal_to_external
-_IO_Initialize rtems_io_initialize
-_IO_Open rtems_io_open
-_IO_Close rtems_io_close
-_IO_Read rtems_io_read
-_IO_Write rtems_io_write
-_IO_Control rtems_io_control
-_Fatal_Error_occurred rtems_fatal_error_occurred
-_Rate_monotonic_Create rtems_rate_monotonic_create
-_Rate_monotonic_Name_to_id rtems_rate_monotonic_ident
-_Rate_monotonic_Delete rtems_rate_monotonic_delete
-_Rate_monotonic_Cancel rtems_rate_monotonic_cancel
-_Rate_monotonic_Period rtems_rate_monotonic_period
-_Multiprocessing_Announce rtems_multiprocessing_announce
-#
-#  Status (API names)
-#
-SUCCESSFUL RTEMS_SUCCESSFUL
-TASK_EXITTED RTEMS_TASK_EXITTED
-MP_NOT_CONFIGURED RTEMS_MP_NOT_CONFIGURED
-INVALID_NAME RTEMS_INVALID_NAME
-INVALID_ID RTEMS_INVALID_ID
-TOO_MANY RTEMS_TOO_MANY
-TIMEOUT RTEMS_TIMEOUT
-OBJECT_WAS_DELETED RTEMS_OBJECT_WAS_DELETED
-INVALID_SIZE RTEMS_INVALID_SIZE
-INVALID_ADDRESS RTEMS_INVALID_ADDRESS
-INVALID_NUMBER RTEMS_INVALID_NUMBER
-NOT_DEFINED RTEMS_NOT_DEFINED
-RESOURCE_IN_USE RTEMS_RESOURCE_IN_USE
-UNSATISFIED RTEMS_UNSATISFIED
-INCORRECT_STATE RTEMS_INCORRECT_STATE
-ALREADY_SUSPENDED RTEMS_ALREADY_SUSPENDED
-ILLEGAL_ON_SELF RTEMS_ILLEGAL_ON_SELF
-ILLEGAL_ON_REMOTE_OBJECT RTEMS_ILLEGAL_ON_REMOTE_OBJECT
-CALLED_FROM_ISR RTEMS_CALLED_FROM_ISR
-INVALID_PRIORITY RTEMS_INVALID_PRIORITY
-INVALID_CLOCK RTEMS_INVALID_CLOCK
-INVALID_NODE RTEMS_INVALID_NODE
-NOT_CONFIGURED RTEMS_NOT_CONFIGURED
-NOT_OWNER_OF_RESOURCE RTEMS_NOT_OWNER_OF_RESOURCE
-NOT_IMPLEMENTED RTEMS_NOT_IMPLEMENTED
-INTERNAL_ERROR RTEMS_INTERNAL_ERROR
-PROXY_BLOCKING RTEMS_PROXY_BLOCKING
-NO_MEMORY RTEMS_NO_MEMORY
-STATUS_CODES_FIRST RTEMS_STATUS_CODES_FIRST
-STATUS_CODES_LAST RTEMS_STATUS_CODES_LAST
-#
-#  Status (Internal names)
-#
-STATUS_SUCCESSFUL RTEMS_SUCCESSFUL
-STATUS_TASK_EXITTED RTEMS_TASK_EXITTED
-STATUS_MP_NOT_CONFIGURED RTEMS_MP_NOT_CONFIGURED
-STATUS_INVALID_NAME RTEMS_INVALID_NAME
-STATUS_INVALID_ID RTEMS_INVALID_ID
-STATUS_TOO_MANY RTEMS_TOO_MANY
-STATUS_TIMEOUT RTEMS_TIMEOUT
-STATUS_OBJECT_WAS_DELETED RTEMS_OBJECT_WAS_DELETED
-STATUS_INVALID_SIZE RTEMS_INVALID_SIZE
-STATUS_INVALID_ADDRESS RTEMS_INVALID_ADDRESS
-STATUS_INVALID_NUMBER RTEMS_INVALID_NUMBER
-STATUS_NOT_DEFINED RTEMS_NOT_DEFINED
-STATUS_RESOURCE_IN_USE RTEMS_RESOURCE_IN_USE
-STATUS_UNSATISFIED RTEMS_UNSATISFIED
-STATUS_INCORRECT_STATE RTEMS_INCORRECT_STATE
-STATUS_ALREADY_SUSPENDED RTEMS_ALREADY_SUSPENDED
-STATUS_ILLEGAL_ON_SELF RTEMS_ILLEGAL_ON_SELF
-STATUS_ILLEGAL_ON_REMOTE_OBJECT RTEMS_ILLEGAL_ON_REMOTE_OBJECT
-STATUS_CALLED_FROM_ISR RTEMS_CALLED_FROM_ISR
-STATUS_INVALID_PRIORITY RTEMS_INVALID_PRIORITY
-STATUS_INVALID_CLOCK RTEMS_INVALID_CLOCK
-STATUS_INVALID_NODE RTEMS_INVALID_NODE
-STATUS_NOT_CONFIGURED RTEMS_NOT_CONFIGURED
-STATUS_NOT_OWNER_OF_RESOURCE RTEMS_NOT_OWNER_OF_RESOURCE
-STATUS_NOT_IMPLEMENTED RTEMS_NOT_IMPLEMENTED
-STATUS_INTERNAL_ERROR RTEMS_INTERNAL_ERROR
-STATUS_PROXY_BLOCKING RTEMS_PROXY_BLOCKING
-STATUS_NO_MEMORY RTEMS_NO_MEMORY
-#
-#  Attributes (External)
-#
-DEFAULT_ATTRIBUTES RTEMS_DEFAULT_ATTRIBUTES
-NO_FLOATING_POINT RTEMS_NO_FLOATING_POINT
-FLOATING_POINT RTEMS_FLOATING_POINT
-LOCAL RTEMS_LOCAL
-GLOBAL RTEMS_GLOBAL
-FIFO RTEMS_FIFO
-PRIORITY RTEMS_PRIORITY
-NO_LIMIT RTEMS_NO_LIMIT
-LIMIT RTEMS_LIMIT
-COUNTING_SEMAPHORE RTEMS_COUNTING_SEMAPHORE
-BINARY_SEMAPHORE RTEMS_BINARY_SEMAPHORE
-NO_INHERIT_PRIORITY RTEMS_NO_INHERIT_PRIORITY
-INHERIT_PRIORITY RTEMS_INHERIT_PRIORITY
-#
-#  Attributes (Internal)
-#
-ATTRIBUTES_DEFAULTS RTEMS_DEFAULT_ATTRIBUTES
-ATTRIBUTES_NO_FLOATING_POINT RTEMS_NO_FLOATING_POINT
-ATTRIBUTES_FLOATING_POINT RTEMS_FLOATING_POINT
-ATTRIBUTES_LOCAL RTEMS_LOCAL
-ATTRIBUTES_GLOBAL RTEMS_GLOBAL
-ATTRIBUTES_FIFO RTEMS_FIFO
-ATTRIBUTES_PRIORITY RTEMS_PRIORITY
-ATTRIBUTES_NO_LIMIT RTEMS_NO_LIMIT
-ATTRIBUTES_LIMIT RTEMS_LIMIT
-ATTRIBUTES_COUNTING_SEMAPHORE RTEMS_COUNTING_SEMAPHORE
-ATTRIBUTES_BINARY_SEMAPHORE RTEMS_BINARY_SEMAPHORE
-ATTRIBUTES_NO_INHERIT_PRIORITY RTEMS_NO_INHERIT_PRIORITY
-ATTRIBUTES_INHERIT_PRIORITY RTEMS_INHERIT_PRIORITY
-#
-#  Options (External)
-#
-DEFAULT_OPTIONS RTEMS_DEFAULT_OPTIONS
-WAIT RTEMS_WAIT
-NO_WAIT RTEMS_NO_WAIT
-EVENT_ALL RTEMS_EVENT_ALL
-EVENT_ANY RTEMS_EVENT_ANY
-#
-#  Options (Internal)
-#
-OPTIONS_DEFAULT RTEMS_DEFAULT_OPTIONS
-OPTIONS_WAIT RTEMS_WAIT
-OPTIONS_NO_WAIT RTEMS_NO_WAIT
-OPTIONS_EVENT_ALL RTEMS_EVENT_ALL
-OPTIONS_EVENT_ANY RTEMS_EVENT_ANY
-#
-#  Masks (External)
-#
-ALL_MODE_MASKS RTEMS_ALL_MODE_MASKS
-PREEMPT_MASK RTEMS_PREEMPT_MASK
-TIMESLICE_MASK RTEMS_TIMESLICE_MASK
-ASR_MASK RTEMS_ASR_MASK
-INTERRUPT_MASK RTEMS_INTERRUPT_MASK
-#
-#  Masks (Internal)
-#
-MODES_ALL_MASK RTEMS_ALL_MODE_MASKS
-MODES_PREEMPT_MASK RTEMS_PREEMPT_MASK
-MODES_TIMESLICE_MASK RTEMS_TIMESLICE_MASK
-MODES_ASR_MASK RTEMS_ASR_MASK
-MODES_INTERRUPT_MASK RTEMS_INTERRUPT_MASK
-#
-#  Modes (Internal)
-#
-MODES_DEFAULTS RTEMS_DEFAULT_MODES
-MODES_PREEMPT RTEMS_PREEMPT
-MODES_NO_PREEMPT RTEMS_NO_PREEMPT
-MODES_NO_TIMESLICE RTEMS_NO_TIMESLICE
-MODES_TIMESLICE RTEMS_TIMESLICE
-MODES_ASR RTEMS_ASR
-MODES_NO_ASR RTEMS_NO_ASR
-_Modes_Interrupt_level RTEMS_INTERRUPT_LEVEL
-#
-#  Modes (External)
-#
-DEFAULT_MODES RTEMS_DEFAULT_MODES
-PREEMPT RTEMS_PREEMPT
-NO_PREEMPT RTEMS_NO_PREEMPT
-NO_TIMESLICE RTEMS_NO_TIMESLICE
-TIMESLICE RTEMS_TIMESLICE
-ASR RTEMS_ASR
-NO_ASR RTEMS_NO_ASR
-INTERRUPT_LEVEL RTEMS_INTERRUPT_LEVEL
-#
-#  Identification (External)
-#
-SEARCH_ALL_NODES RTEMS_SEARCH_ALL_NODES
-SEARCH_OTHER_NODES RTEMS_SEARCH_OTHER_NODES
-SEARCH_LOCAL_NODE RTEMS_SEARCH_LOCAL_NODE
-WHO_AM_I RTEMS_WHO_AM_I
-#
-#  Identification (Internal)
-#
-OBJECTS_SEARCH_ALL_NODES RTEMS_SEARCH_ALL_NODES
-OBJECTS_SEARCH_OTHER_NODES RTEMS_SEARCH_OTHER_NODES
-OBJECTS_SEARCH_LOCAL_NODE RTEMS_SEARCH_LOCAL_NODE
-OBJECTS_WHO_AM_I RTEMS_WHO_AM_I
-#
-#  Miscellaneous (External API)
-#
-CURRENT_MODE RTEMS_CURRENT_MODE
-CURRENT_PRIORITY RTEMS_CURRENT_PRIORITY
-PENDING_EVENTS RTEMS_PENDING_EVENTS
-NO_TIMEOUT RTEMS_NO_TIMEOUT
-SELF RTEMS_SELF
-PERIOD_STATUS RTEMS_PERIOD_STATUS
-YIELD_PROCESSOR RTEMS_YIELD_PROCESSOR
-MINIMUM_PRIORITY RTEMS_MINIMUM_PRIORITY
-MAXIMUM_PRIORITY RTEMS_MAXIMUM_PRIORITY
-MINIMUM_STACK_SIZE RTEMS_MINIMUM_STACK_SIZE
-#
-#  Miscellaneous (External API)
-#
-MODES_CURRENT RTEMS_CURRENT_MODE
-PRIORITY_CURRENT RTEMS_CURRENT_PRIORITY
-#
-#  Events
-#
-ALL_EVENTS RTEMS_ALL_EVENTS
-EVENT_0 RTEMS_EVENT_0
-EVENT_1 RTEMS_EVENT_1
-EVENT_2 RTEMS_EVENT_2
-EVENT_3 RTEMS_EVENT_3
-EVENT_4 RTEMS_EVENT_4
-EVENT_5 RTEMS_EVENT_5
-EVENT_6 RTEMS_EVENT_6
-EVENT_7 RTEMS_EVENT_7
-EVENT_8 RTEMS_EVENT_8
-EVENT_9 RTEMS_EVENT_9
-EVENT_10 RTEMS_EVENT_10
-EVENT_11 RTEMS_EVENT_11
-EVENT_12 RTEMS_EVENT_12
-EVENT_13 RTEMS_EVENT_13
-EVENT_14 RTEMS_EVENT_14
-EVENT_15 RTEMS_EVENT_15
-EVENT_16 RTEMS_EVENT_16
-EVENT_17 RTEMS_EVENT_17
-EVENT_18 RTEMS_EVENT_18
-EVENT_19 RTEMS_EVENT_19
-EVENT_20 RTEMS_EVENT_20
-EVENT_21 RTEMS_EVENT_21
-EVENT_22 RTEMS_EVENT_22
-EVENT_23 RTEMS_EVENT_23
-EVENT_24 RTEMS_EVENT_24
-EVENT_25 RTEMS_EVENT_25
-EVENT_26 RTEMS_EVENT_26
-EVENT_27 RTEMS_EVENT_27
-EVENT_28 RTEMS_EVENT_28
-EVENT_29 RTEMS_EVENT_29
-EVENT_30 RTEMS_EVENT_30
-EVENT_31 RTEMS_EVENT_31
-#
-#  Signals
-#
-SIGNAL_0 RTEMS_SIGNAL_0
-SIGNAL_1 RTEMS_SIGNAL_1
-SIGNAL_2 RTEMS_SIGNAL_2
-SIGNAL_3 RTEMS_SIGNAL_3
-SIGNAL_4 RTEMS_SIGNAL_4
-SIGNAL_5 RTEMS_SIGNAL_5
-SIGNAL_6 RTEMS_SIGNAL_6
-SIGNAL_7 RTEMS_SIGNAL_7
-SIGNAL_8 RTEMS_SIGNAL_8
-SIGNAL_9 RTEMS_SIGNAL_9
-SIGNAL_10 RTEMS_SIGNAL_10
-SIGNAL_11 RTEMS_SIGNAL_11
-SIGNAL_12 RTEMS_SIGNAL_12
-SIGNAL_13 RTEMS_SIGNAL_13
-SIGNAL_14 RTEMS_SIGNAL_14
-SIGNAL_15 RTEMS_SIGNAL_15
-SIGNAL_16 RTEMS_SIGNAL_16
-SIGNAL_17 RTEMS_SIGNAL_17
-SIGNAL_18 RTEMS_SIGNAL_18
-SIGNAL_19 RTEMS_SIGNAL_19
-SIGNAL_20 RTEMS_SIGNAL_20
-SIGNAL_21 RTEMS_SIGNAL_21
-SIGNAL_22 RTEMS_SIGNAL_22
-SIGNAL_23 RTEMS_SIGNAL_23
-SIGNAL_24 RTEMS_SIGNAL_24
-SIGNAL_25 RTEMS_SIGNAL_25
-SIGNAL_26 RTEMS_SIGNAL_26
-SIGNAL_27 RTEMS_SIGNAL_27
-SIGNAL_28 RTEMS_SIGNAL_28
-SIGNAL_29 RTEMS_SIGNAL_29
-SIGNAL_30 RTEMS_SIGNAL_30
-SIGNAL_31 RTEMS_SIGNAL_31
-#
-#  Notepads
-#
-NOTEPAD_FIRST RTEMS_NOTEPAD_FIRST
-NOTEPAD_0 RTEMS_NOTEPAD_0
-NOTEPAD_1 RTEMS_NOTEPAD_1
-NOTEPAD_2 RTEMS_NOTEPAD_2
-NOTEPAD_3 RTEMS_NOTEPAD_3
-NOTEPAD_4 RTEMS_NOTEPAD_4
-NOTEPAD_5 RTEMS_NOTEPAD_5
-NOTEPAD_6 RTEMS_NOTEPAD_6
-NOTEPAD_7 RTEMS_NOTEPAD_7
-NOTEPAD_8 RTEMS_NOTEPAD_8
-NOTEPAD_9 RTEMS_NOTEPAD_9
-NOTEPAD_10 RTEMS_NOTEPAD_10
-NOTEPAD_11 RTEMS_NOTEPAD_11
-NOTEPAD_12 RTEMS_NOTEPAD_12
-NOTEPAD_13 RTEMS_NOTEPAD_13
-NOTEPAD_14 RTEMS_NOTEPAD_14
-NOTEPAD_15 RTEMS_NOTEPAD_15
-NOTEPAD_LAST RTEMS_NOTEPAD_LAST
-#
-#  Multiprocessing
-#
-MIN_PKTSIZE RTEMS_MINIMUM_PACKET_SIZE
-MIN_HETERO_CONV RTEMS_MINIMUN_HETERO_CONVERSION
-#
-#  Name and ID External
-#
-get_node rtems_get_node
-get_index rtems_get_index
-build_name rtems_build_name
-name_to_characters rtems_name_to_characters
-#
-# Name and ID Internal
-#
-_Objects_Get_node rtems_get_node
-_Objects_Get_index rtems_get_index
-_Objects_Build_name rtems_build_name
-_Objects_Name_to_characters rtems_name_to_characters
-#
-#  clock_get
-#
-CLOCK_GET_TOD RTEMS_CLOCK_GET_TOD
-CLOCK_GET_SECONDS_SINCE_EPOCH RTEMS_CLOCK_GET_SECONDS_SINCE_EPOCH
-CLOCK_GET_TICKS_SINCE_BOOT RTEMS_CLOCK_GET_TICKS_SINCE_BOOT
-CLOCK_GET_TICKS_PER_SECOND RTEMS_CLOCK_GET_TICKS_PER_SECOND
-CLOCK_GET_TIME_VALUE RTEMS_CLOCK_GET_TIME_VALUE
-#
-#  Status Code Support Routines  (External) -- NO CHANGES
-#
-#
-#  Status Code Support Routines  (Internal)
-#
-_Status_Is_successful rtems_is_status_successful
-_Status_Is_equal rtems_are_statuses_equal
-#
-#  Time Conversion Support Routines (External) -- NO CHANGES
-#
-#
-#  Time Conversion Support Routines (Internal)
-#
-_TOD_Milliseconds_to_microseconds RTEMS_MILLISECONDS_TO_MICROSECONDS
-_TOD_Milliseconds_to_ticks RTEMS_MILLISECONDS_TO_MICROSECONDS
-#
-#  MP packet
-#
-MP_PACKET_INTERNAL_THREADS RTEMS_MP_PACKET_INTERNAL_THREADS
-MP_PACKET_RTEMS_TASKS RTEMS_MP_PACKET_TASKS
-MP_PACKET_MESSAGE_QUEUE RTEMS_MP_PACKET_MESSAGE_QUEUE
-MP_PACKET_SEMAPHORE RTEMS_MP_PACKET_SEMAPHORE
-MP_PACKET_PARTITION RTEMS_MP_PACKET_PARTITION
-MP_PACKET_REGION RTEMS_MP_PACKET_REGION
-MP_PACKET_EVENT RTEMS_MP_PACKET_EVENT
-MP_PACKET_SIGNAL RTEMS_MP_PACKET_SIGNAL
-#
-#
-#
-IO_Major_control rtems_device_major_number
-IO_Minor_control rtems_device_minor_number
-#
-#  Configuration Info
-#
-Configuration_Table rtems_configuration_table
-Configuration_Initialization_tasks_table rtems_initialization_tasks_table
-Configuration_Driver_address_table rtems_driver_address_table
-Configuration_Extension_table rtems_extensions_table
-rtems_tasks_create_extension rtems_task_create_extension
-rtems_tasks_start_extension rtems_task_start_extension
-rtems_tasks_restart_extension rtems_task_restart_extension
-rtems_tasks_delete_extension rtems_task_delete_extension
-rtems_tasks_switch_extension rtems_task_switch_extension
-rtems_tasks_begin_extension rtems_task_begin_extension
-rtems_tasks_exitted_extension rtems_task_exitted_extension
-rtems_fatal_extension rtems_fatal_extension
-Configuration_MPCI_table rtems_mpci_table
-Configuration_Multiprocessing_table rtems_multiprocessing_table
-CPU_Table rtems_cpu_table
-#
-Clock_Get_options rtems_clock_get_options
-Clock_Time_value rtems_clock_time_value
-MP_packet_Prefix rtems_packet_prefix
-MP_packet_Classes rtems_mp_packet_classes
-TOD_Control rtems_time_of_day
-ISR_Vector rtems_vector_number
-Watchdog_Interval rtems_interval
-Watchdog_Service rtems_timer_service_routine_entry
-Attributes_Control rtems_attribute
-Modes_Control rtems_mode
-Options_Control rtems_option
-Priority_Control rtems_task_priority
-PRIORITY_MINIMUM RTEMS_MINIMUM_PRIORITY
-PRIORITY_MAXIMUM RTEMS_MAXIMUM_PRIORITY
-Event_sets_Control rtems_event_set
-ASR_Signal_set_control rtems_signal_set
-Status_Codes rtems_status_code
-RTEMS_TASKS_YIELD_PROCESSOR RTEMS_YIELD_PROCESSOR
-RATE_MONOTONIC_PERIOD_STATUS RTEMS_PERIOD_STATUS
-WATCHDOG_FOREVER RTEMS_NO_TIMEOUT
-STACK_MINIMUM_SIZE RTEMS_MINIMUM_STACK_SIZE
-#
-ASR_Handler rtems_asr_entry
-Thread_Entry rtems_task_entry
-#
-disable_intr rtems_interrupt_disable
-enable_intr rtems_interrupt_enable
-flash_intr rtems_interrupt_flash
-
diff --git a/tools/update/Makefile.in b/tools/update/Makefile.in
deleted file mode 100644
index 45e3e63515..0000000000
--- a/tools/update/Makefile.in
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-include $(RTEMS_ROOT)/make/rtems.cfg
-
-DESTDIR=$(PROJECT_RELEASE)/update-tools
-
-BUILD_PGMS = update
-ifneq (@PERL@,)
-BUILD_PGMS += word-replace
-endif
-
-PGMS = $(BUILD_PGMS)
-
-CLEAN_ADDITIONS += $(BUILD_PGMS)
-
-MISC_SUPPORT=310_to_320_list
-
-INSTALLED_PGMS=$(PGMS:%=$(DESTDIR)/%)
-INSTALLED_DATA=$(MISC_SUPPORT:%=$(DESTDIR)/%)
-
-all:  $(PGMS)
-
-$(DESTDIR):
-	@INSTALL@ $(INSTDIRFLAGS) $@
-
-$(INSTALLED_PGMS): $(PGMS)
-	@INSTALL@ $(INSTBINFLAGS) $^ $(DESTDIR)
-
-$(INSTALLED_DATA): $(MISC_SUPPORT)
-	@INSTALL@ $(INSTDATAFLAGS) $^ $(DESTDIR)
-
-install: $(DESTDIR) $(INSTALLED_PGMS) $(INSTALLED_DATA)
-
diff --git a/tools/update/README b/tools/update/README
deleted file mode 100644
index bbf99cb71d..0000000000
--- a/tools/update/README
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-#  $Id$
-#
-
-This directory contains tools which aid in upgrading from RTEMS 3.1.0
-to RTEMS 3.2.0.
-
diff --git a/tools/update/update.in b/tools/update/update.in
deleted file mode 100644
index cdcb07655e..0000000000
--- a/tools/update/update.in
+++ /dev/null
@@ -1,216 +0,0 @@
-#!@KSH@ -p
-#
-# $Id$
-#
-# Either bash or ksh will be ok for this; requires 'test -ot'
-#  (-p above just says to not parse $ENV file; makes it faster for
-#   those of us who set $ENV)
-#
-# Update RTEMS applications for the API changes from 3.1.0 to 3.2.0
-#
-# NOTE
-#
-#   This is potentially a very dangerous program.
-
-# progname=`basename $0`
-progname=${0##*/}        # fast basename hack for ksh, bash
-
-USAGE=\
-"
-usage: $progname [ -vs ] [ -b base_directory ] [-p file] [-f] [files...]
-	-v	    -- verbose
-	-p	    -- file with replacement instructions
-	-s	    -- skip prompt for backup verification
-	-f	    -- do files at end of line
-
-base_directory is the root directory of the source code to update.  It
-defaults to the current directory.
-
-This program updates C, H, and .inl files.
-"
-
-fatal() {
-    if [ "$1" ]
-    then
-        echo    >&2
-        echo $* >&2
-        echo    >&2
-    fi
-    echo "$USAGE" 1>&2
-    exit 1
-}
-
-#
-#  KLUDGE to figure out at runtime how to echo a line without a
-#  newline.
-#
-count=`echo "\\c" | wc -c`
-if [ ${count} -ne 0 ] ; then
-  EARG="-n"
-  EOL=""
-else
-  EARG=""
-  EOL="\\c"
-fi
-
-#
-#  Function to make sure they do a backup
-#
-
-WARNING=\
-"
-
-*******************************************************************************
-*******************************************************************************
-*******************************************************************************
-****                                                                       ****
-****        WARNING!!!          WARNING!!!           WARNING!!!            ****
-****                                                                       ****
-****   ALL SOURCE CODE SHOULD BE BACKED UP BEFORE RUNNING THIS PROGRAM!!   ****
-****                                                                       ****
-****        WARNING!!!          WARNING!!!           WARNING!!!            ****
-****                                                                       ****
-*******************************************************************************
-*******************************************************************************
-*******************************************************************************
-
-"
-
-verify_backup()
-{
-  echo "$WARNING"
-  continue="yes"
-  while [ $continue = "yes" ]
-  do
-echo ${EARG} "Do you wish to update the source tree at this time [y|n]? " ${EOL}
-    read answer
-    case $answer in
-      [yY]*)
-        continue="no"
-        ;;
-      [nN]*)
-        echo
-        echo "Exitting at user request"
-        echo
-        exit 0
-        ;;
-    esac
-  done
-}
-
-#
-#  Default tools to use...
-#
-#  NOTE: The GNU versions of both of these are faster.
-#
-find_prog=find
-xargs_prog=xargs
-
-#
-# process the options
-#
-
-verbose=""
-suffix=""
-mode=""
-base_directory=.
-do_files="no"
-do_prompt="yes"
-replacement_file="${RTEMS_ROOT}/update-tools/310_to_320_list"
-
-while getopts sfp:b:v OPT
-do
-    case "$OPT" in
-        v)
-          verbose="yes";;
-        s)
-          do_prompt="no";;
-        b)
-          base_directory=${OPTARG};;
-        p)
-          replacement_file=${OPTARG};;
-        f)
-          do_files="yes";;
-        *)
-          fatal
-    esac
-done
-
-let $((shiftcount = $OPTIND - 1))
-shift $shiftcount
-
-args=$*
-
-#
-#  Make sure they have done a backup
-#
-
-if [ ${do_prompt} = "yes" ]
-then
-  verify_backup
-fi
-
-#
-# Validate the base directory
-#
-
-if [ ! -d $base_directory ]
-then
-    fatal "${base_directory} does not exist"
-fi
-
-#
-# Validate the replacement file
-#
-
-if [ ! -r $replacement_file ]
-then
-    fatal "${replacement_file} does not exist or is not readable"
-fi
-
-
-#
-#  Verify enough of the RTEMS environment variables are set
-#
-
-if [ ! -d "${RTEMS_ROOT}" ]
-then
-    fatal "RTEMS_ROOT environment variable is not initialized"
-fi
-
-#
-# Update the files
-#
-
-generate_list()
-{
-  if [ ${do_files} = "yes" ]
-  then
-    for i in $args
-    do
-      echo $i
-    done
-  else
-    ${find_prog} ${base_directory} \(  -name "*.[ch]" -o -name "*.inl" \) -print
-  fi
-}
-
-generate_list | ${xargs_prog} |
-  while read line
-  do
-    ${RTEMS_ROOT}/update-tools/word-replace -p ${replacement_file} ${line}
-    if [ $? -ne 0 ]
-    then
-      exit 1
-    fi
-    for file in ${line}
-    do
-      mv ${file}.fixed ${file}
-    done
-  done
-
-exit 0
-
-# Local Variables: ***
-# mode:ksh ***
-# End: ***
diff --git a/tools/update/word-replace.in b/tools/update/word-replace.in
deleted file mode 100644
index 24c7c3a546..0000000000
--- a/tools/update/word-replace.in
+++ /dev/null
@@ -1,89 +0,0 @@
-#!@PERL@
-#
-#  $Id$
-#
-
-eval "exec @PERL@ -S $0 $*"
-    if $running_under_some_shell;
-
-require 'getopts.pl';
-&Getopts("p:vh");		# help, pattern file, verbose,
-
-if ($opt_h || ! $opt_p) {
-    print STDERR <<NO_MORE_HELP;
-word-replace
-
-   Replace *words* with patterns.   Pattern file specifies which patterns
-   to replace on each line.  All patterns are wrapped with perl \\b regexp
-   specifiers.
-
-Usage: $0       [-v] -p pattern-file files to replace
-
-    -v          -- possibly more verbose
-    -p file     -- pattern file
-    -h          -- help
-
-    anything else == this help message
-
-Pattern file looks like this:
-
-# Example:
-# ignores all lines with beginning with # or not exactly 2 fields
-_Dorky_Name  rtems_dorky_name           # comments, and blank lines are cool
-_Dorky_Name2 rtems_dorky_name2          # comments, and blank lines are cool
-NO_MORE_HELP
-    exit 0;
-}
-
-$verbose = $opt_v;
-$pattern_file = $opt_p;
-
-# make standard outputs unbuffered (so the '.'s come out ok)
-$oldfh = select(STDERR); $| = 1; select($oldfh);
-$oldfh = select(STDOUT); $| = 1; select($oldfh);
-
-# pull in the patterns
-open(PATTERNS, "<$pattern_file") ||
-    die "could not open $pattern_file: $!, crapped out at";
-
-foreach (<PATTERNS>)
-{
-    chop;
-    s/#.*//;
-    next if /^$/;
-    ($orig, $new, $junk, @rest) = split;
-    next if ( ! $orig || ! $new || $junk); # <2 or >2 patterns
-    die "pattern appears 2x: '$orig' in '$pattern_file'--" if defined($patterns{$orig});
-    $patterns{$orig} = $new;
-}
-close PATTERNS;
-
-# walk thru each line in each file
-foreach $file (@ARGV)
-{
-    print "$file\t";
-
-    open (INFILE, "<$file") ||
-        die "could not open input file $file: $!";
-
-    $outfile = $file . ".fixed";;
-    open (OUTFILE, ">$outfile") ||
-        die "could not open output file $outfile: $!";
-
-    while (<INFILE>)
-    {
-        study;                  # maybe make s/// faster
-        foreach $key (keys %patterns)
-        {
-            if ( s/\b$key\b/$patterns{$key}/ge )
-            {
-                print ".";
-            }
-        }
-        print OUTFILE $_;
-    }
-    print "\n";
-    close INFILE;
-    close OUTFILE;
-}
-